From 4cc3a3096a5ad28a070db12424db586c40457243 Mon Sep 17 00:00:00 2001
From: Steven <wwjd2@web.de>
Date: Mon, 13 Feb 2012 17:15:31 +0100
Subject: [PATCH 0001/1537] Server verhindert beim OSX Client einen Delete

---
 3rdparty/Sabre/DAV/Server.php         | 2 +-
 apps/calendar/lib/connector_sabre.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
index 3d76d4f191..28c69188a3 100644
--- a/3rdparty/Sabre/DAV/Server.php
+++ b/3rdparty/Sabre/DAV/Server.php
@@ -648,7 +648,7 @@ class Sabre_DAV_Server {
      * @return void
      */
     protected function httpDelete($uri) {
-
+		
         if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
         $this->tree->delete($uri);
 
diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php
index 263fb7ffde..47bf4f202e 100644
--- a/apps/calendar/lib/connector_sabre.php
+++ b/apps/calendar/lib/connector_sabre.php
@@ -206,6 +206,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
 	 * @return void
 	 */
 	public function deleteCalendar($calendarId) {
+	    if(preg_match( '=iCal/[1-4]?.*Mac OS X/10.[1-6](.[0-9])?=', $_SERVER['HTTP_USER_AGENT'] )){
+	    	throw new Sabre_DAV_Exception_Forbidden("Action is not possible with OSX 10.6.x", 403);
+		}
+		
 		OC_Calendar_Calendar::deleteCalendar($calendarId);
 	}
 

From d049d9bd0c70c929c2116cf7d8d088dfa7f9ae62 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 29 Mar 2012 23:16:19 +0200
Subject: [PATCH 0002/1537] initial commit for OC_Exception

---
 config/config.sample.php     |  3 +-
 core/css/styles.css          |  3 ++
 core/templates/exception.php | 30 +++++++++++++++
 lib/exception.php            | 74 ++++++++++++++++++++++++++++++++++++
 4 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 core/templates/exception.php
 create mode 100644 lib/exception.php

diff --git a/config/config.sample.php b/config/config.sample.php
index 199c9248c5..a5feff509b 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -19,6 +19,7 @@ $CONFIG = array(
 "knowledgebaseurl" => "",
 "appstoreenabled" => true,
 "appstoreurl" => "",
-// "datadirectory" => ""
+// "datadirectory" => "",
+"sysinfoexception" => true
 );
 ?>
diff --git a/core/css/styles.css b/core/css/styles.css
index f5a181c452..6c00b571ba 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -131,3 +131,6 @@ li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ff
 .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;}
diff --git a/core/templates/exception.php b/core/templates/exception.php
new file mode 100644
index 0000000000..7f58ce252c
--- /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/lib/exception.php b/lib/exception.php
new file mode 100644
index 0000000000..b4724e7c8c
--- /dev/null
+++ b/lib/exception.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Georg Ehrke
+ * @copyright 2012 georg@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/>.
+ *
+ */
+class OC_Exception extends Exception{
+	
+	function __construct($message = null, $code = 0, $file = null, $line = null){
+		parent::__construct($message, $code);
+		if(!is_null($file)){
+			$this->file = $file;
+		}
+		if(!is_null($line)){
+			$this->line = $line;
+		}
+		$this->writelog();
+	}
+	
+	private function writelog(){
+		@OC_Log::write(OC_App::getCurrentApp(), $this->getMessage() . '-' . $this->getFile() . '-' . $this->getLine(), OC_Log::FATAL);
+	}
+	
+	private function generatesysinfo(){
+		return array('phpversion' => PHP_VERSION,
+					 'os' => php_uname('s'),
+					 'osrelease' => php_uname('r'),
+					 'osarchitecture' => php_uname('m'),
+					 'phpserverinterface' => php_sapi_name(),
+					 'serverprotocol' => $_SERVER['SERVER_PROTOCOL'],
+					 'requestmethod' => $_SERVER['REQUEST_METHOD'],
+					 'https' => ($_SERVER['HTTPS']==''?'false':'true'),
+					 'database'=>(@OC_Config::getValue('dbtype')!=''?@OC_Config::getValue('dbtype'):'')
+					);
+	}
+	
+	function __toString(){
+		$tmpl = new OC_Template('core', 'exception', 'guest');
+		$tmpl->assign('showsysinfo', true);
+		$tmpl->assign('message', $this->getMessage());
+		$tmpl->assign('code', $this->getCode());
+		$tmpl->assign('file', $this->getFile());
+		$tmpl->assign('line', $this->getLine());
+		$tmpl->assign('sysinfo', $this->generatesysinfo());
+		$tmpl->printPage();
+	}
+}
+
+function oc_exceptionhandler($exception){
+	throw new OC_Exception($exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine());
+	return true;
+}
+
+function oc_errorhandler(){
+	
+}
+set_exception_handler('oc_exceptionhandler');
+set_error_handler('oc_errorhandler');
+error_reporting(E_ERROR | E_WARNING | E_PARSE);
\ No newline at end of file

From 926e777061efcc29d293b4af305ca9d0d01f6e22 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 30 Mar 2012 23:37:47 +0200
Subject: [PATCH 0003/1537] filter notice and deprecated errors and write a
 proper error handler function

---
 lib/exception.php | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/exception.php b/lib/exception.php
index b4724e7c8c..db516fc12d 100644
--- a/lib/exception.php
+++ b/lib/exception.php
@@ -62,12 +62,31 @@ class OC_Exception extends Exception{
 }
 
 function oc_exceptionhandler($exception){
-	throw new OC_Exception($exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine());
+	switch($exception->getCode()){
+		case E_NOTICE:
+		case E_DEPRECATED:
+		case E_USER_NOTICE:
+		case E_USER_DEPRECATED:
+			break;
+		default:
+			throw new OC_Exception($exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine());
+			break;
+	}
 	return true;
 }
 
-function oc_errorhandler(){
-	
+function oc_errorhandler($errno , $errstr , $errfile , $errline){
+	switch($errno){
+		case E_NOTICE:
+		case E_DEPRECATED:
+		case E_USER_NOTICE:
+		case E_USER_DEPRECATED:
+			break;
+		default:
+			throw new OC_Exception($errstr, $errno, $errfile, $errline);
+			break;	
+	}
+	return true;
 }
 set_exception_handler('oc_exceptionhandler');
 set_error_handler('oc_errorhandler');

From f75a7c084f0b52cd3e6fa0123ea753eec74b154b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 1 May 2012 16:16:12 +0200
Subject: [PATCH 0004/1537] add class for repeating events

---
 apps/calendar/lib/repeat.php | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 apps/calendar/lib/repeat.php

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
new file mode 100644
index 0000000000..fe2ba7cfa8
--- /dev/null
+++ b/apps/calendar/lib/repeat.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+/*
+ * This class manages the caching of repeating events
+ * Events will be cached for the current year ± 5 years
+ */
+class OC_Calendar_Repeat{
+	/*
+	 * @brief returns the cache of an event
+	 */
+	public static function get();
+	/*
+	 * @brief returns the cache of all events of a calendar
+	 */
+	public static function getcalendar();
+	/*
+	 * @brief generates the cache the first time
+	 */
+	public static function generate();
+	/*
+	 * @brief updates an event that is already cached
+	 */
+	public static function update();
+	/*
+	 * @brief checks if an event is already cached
+	 */
+	public static function is_cached();
+	/*
+	 * @brief removes the cache of an event
+	 */
+	public static function clean();
+	/*
+	 * @brief removes the cache of all events of a calendar
+	 */
+	public static function cleancalendar();
+}
\ No newline at end of file

From d251f3a994e68830095ebb263ae5fc8d83fc7c68 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 1 May 2012 18:20:32 +0200
Subject: [PATCH 0005/1537] create remote directory

---
 remote/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 remote/.gitignore

diff --git a/remote/.gitignore b/remote/.gitignore
new file mode 100644
index 0000000000..c96a04f008
--- /dev/null
+++ b/remote/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file

From 2ad673b7bd1ceae592eb59c87b066d959ae0401b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 1 May 2012 18:22:16 +0200
Subject: [PATCH 0006/1537] revert d251f3a994e68830095ebb263ae5fc8d83fc7c68

---
 remote/.gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 remote/.gitignore

diff --git a/remote/.gitignore b/remote/.gitignore
deleted file mode 100644
index c96a04f008..0000000000
--- a/remote/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file

From 640ba1828f3edfdd2e71825828c51b734fb19d1c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 19 Mar 2012 21:56:07 +0100
Subject: [PATCH 0007/1537] Start of audit app

Audit the filesystem action
---
 apps/admin_audit/appinfo/app.php        | 10 +++++++
 apps/admin_audit/appinfo/info.xml       | 10 +++++++
 apps/admin_audit/lib/hooks_handlers.php | 36 +++++++++++++++++++++++++
 lib/filesystem.php                      |  2 +-
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 apps/admin_audit/appinfo/app.php
 create mode 100644 apps/admin_audit/appinfo/info.xml
 create mode 100644 apps/admin_audit/lib/hooks_handlers.php

diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
new file mode 100644
index 0000000000..b1b986fb7b
--- /dev/null
+++ b/apps/admin_audit/appinfo/app.php
@@ -0,0 +1,10 @@
+<?php
+
+OC::$CLASSPATH['OC_Admin_Audit_Hooks_Handlers'] = 'apps/admin_audit/lib/hooks_handlers.php';
+
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, 'OC_Admin_Audit_Hooks_Handlers', 'rename');
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, 'OC_Admin_Audit_Hooks_Handlers', 'create');
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, 'OC_Admin_Audit_Hooks_Handlers', 'copy');
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, 'OC_Admin_Audit_Hooks_Handlers', 'write');
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_read, 'OC_Admin_Audit_Hooks_Handlers', 'read');
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, 'OC_Admin_Audit_Hooks_Handlers', 'delete');
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
new file mode 100644
index 0000000000..6eb62fbbd1
--- /dev/null
+++ b/apps/admin_audit/appinfo/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<info>
+	<id>admin_audit</id>
+	<name>Log audit info</name>
+	<version>0.1</version>
+	<licence>AGPL</licence>
+	<author>Bart Visscher</author>
+	<require>2</require>
+	<description>Audit user actions in Owncloud</description>
+</info>
diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
new file mode 100644
index 0000000000..924878840a
--- /dev/null
+++ b/apps/admin_audit/lib/hooks_handlers.php
@@ -0,0 +1,36 @@
+<?php
+
+class OC_Admin_Audit_Hooks_Handlers {
+	static public function rename($params) {
+		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
+		$newpath = $params[OC_Filesystem::signal_param_newpath];
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Rename "'.$oldpath.'" to "'.$newpath.'" by '.$user, OCP\Util::INFO);
+	}
+	static public function create($params) {
+		$path = $params[OC_Filesystem::signal_param_path];
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Create "'.$path.'" by '.$user, OCP\Util::INFO);
+	}
+	static public function copy($params) {
+		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
+		$newpath = $params[OC_Filesystem::signal_param_newpath];
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Copy "'.$oldpath.'" to "'.$newpath.'" by '.$user, OCP\Util::INFO);
+	}
+	static public function write($params) {
+		$path = $params[OC_Filesystem::signal_param_path];
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Write "'.$path.'" by '.$user, OCP\Util::INFO);
+	}
+	static public function read($params) {
+		$path = $params[OC_Filesystem::signal_param_path];
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Read "'.$path.'" by '.$user, OCP\Util::INFO);
+	}
+	static public function delete($params) {
+		$path = $params[OC_Filesystem::signal_param_path];
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Delete "'.$path.'" by '.$user, OCP\Util::INFO);
+	}
+}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index cac7e8648e..2b45e66c92 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -25,7 +25,7 @@
 /**
  * Class for abstraction of filesystem functions
  * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
- * this class should also handle all the file premission related stuff
+ * this class should also handle all the file permission related stuff
  *
  * Hooks provided:
  *   read(path)

From 1e12db35ee3b7ec96577129c6895c878e6204666 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 23 Mar 2012 22:34:55 +0100
Subject: [PATCH 0008/1537] Audit: Add user login/logout logging

---
 apps/admin_audit/appinfo/app.php        |  4 ++++
 apps/admin_audit/lib/hooks_handlers.php | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
index b1b986fb7b..27a72de432 100644
--- a/apps/admin_audit/appinfo/app.php
+++ b/apps/admin_audit/appinfo/app.php
@@ -2,6 +2,10 @@
 
 OC::$CLASSPATH['OC_Admin_Audit_Hooks_Handlers'] = 'apps/admin_audit/lib/hooks_handlers.php';
 
+OCP\Util::connectHook('OCP\User', 'pre_login', 'OC_Admin_Audit_Hooks_Handlers', 'pre_login');
+OCP\Util::connectHook('OCP\User', 'post_login', 'OC_Admin_Audit_Hooks_Handlers', 'post_login');
+OCP\Util::connectHook('OCP\User', 'logout', 'OC_Admin_Audit_Hooks_Handlers', 'logout');
+
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, 'OC_Admin_Audit_Hooks_Handlers', 'rename');
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, 'OC_Admin_Audit_Hooks_Handlers', 'create');
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, 'OC_Admin_Audit_Hooks_Handlers', 'copy');
diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
index 924878840a..8ebabbac7b 100644
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ b/apps/admin_audit/lib/hooks_handlers.php
@@ -1,6 +1,19 @@
 <?php
 
 class OC_Admin_Audit_Hooks_Handlers {
+	static public function pre_login($params) {
+		$path = $params['uid'];
+		OCP\Util::writeLog('admin_audit', 'Trying login '.$user, OCP\Util::INFO);
+	}
+	static public function post_login($params) {
+		$path = $params['uid'];
+		OCP\Util::writeLog('admin_audit', 'Login '.$user, OCP\Util::INFO);
+	}
+	static public function logout($params) {
+		$user = OCP\User::getUser();
+		OCP\Util::writeLog('admin_audit', 'Logout '.$user, OCP\Util::INFO);
+	}
+
 	static public function rename($params) {
 		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
 		$newpath = $params[OC_Filesystem::signal_param_newpath];

From a2df8a4746dd9c355541501e78726daaa6dbec43 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 29 Mar 2012 11:24:29 +0200
Subject: [PATCH 0009/1537] Audit: Log messages with separate function

---
 apps/admin_audit/lib/hooks_handlers.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
index 8ebabbac7b..4cc3194eaf 100644
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ b/apps/admin_audit/lib/hooks_handlers.php
@@ -3,47 +3,50 @@
 class OC_Admin_Audit_Hooks_Handlers {
 	static public function pre_login($params) {
 		$path = $params['uid'];
-		OCP\Util::writeLog('admin_audit', 'Trying login '.$user, OCP\Util::INFO);
+		self::log('Trying login '.$user);
 	}
 	static public function post_login($params) {
 		$path = $params['uid'];
-		OCP\Util::writeLog('admin_audit', 'Login '.$user, OCP\Util::INFO);
+		self::log('Login '.$user);
 	}
 	static public function logout($params) {
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Logout '.$user, OCP\Util::INFO);
+		self::log('Logout '.$user);
 	}
 
 	static public function rename($params) {
 		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
 		$newpath = $params[OC_Filesystem::signal_param_newpath];
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Rename "'.$oldpath.'" to "'.$newpath.'" by '.$user, OCP\Util::INFO);
+		self::log('Rename "'.$oldpath.'" to "'.$newpath.'" by '.$user);
 	}
 	static public function create($params) {
 		$path = $params[OC_Filesystem::signal_param_path];
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Create "'.$path.'" by '.$user, OCP\Util::INFO);
+		self::log('Create "'.$path.'" by '.$user);
 	}
 	static public function copy($params) {
 		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
 		$newpath = $params[OC_Filesystem::signal_param_newpath];
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Copy "'.$oldpath.'" to "'.$newpath.'" by '.$user, OCP\Util::INFO);
+		self::log('Copy "'.$oldpath.'" to "'.$newpath.'" by '.$user);
 	}
 	static public function write($params) {
 		$path = $params[OC_Filesystem::signal_param_path];
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Write "'.$path.'" by '.$user, OCP\Util::INFO);
+		self::log('Write "'.$path.'" by '.$user);
 	}
 	static public function read($params) {
 		$path = $params[OC_Filesystem::signal_param_path];
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Read "'.$path.'" by '.$user, OCP\Util::INFO);
+		self::log('Read "'.$path.'" by '.$user);
 	}
 	static public function delete($params) {
 		$path = $params[OC_Filesystem::signal_param_path];
 		$user = OCP\User::getUser();
-		OCP\Util::writeLog('admin_audit', 'Delete "'.$path.'" by '.$user, OCP\Util::INFO);
+		self::log('Delete "'.$path.'" by '.$user);
+	}
+	static protected function log($msg) {
+		OCP\Util::writeLog('admin_audit', $msg, OCP\Util::INFO);
 	}
 }

From 2d581c675fb488df0875e4a489821cf88b7679ac Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 13 Apr 2012 19:40:33 +0200
Subject: [PATCH 0010/1537] Audit: Log sharing actions

---
 apps/admin_audit/appinfo/app.php        |  4 ++++
 apps/admin_audit/lib/hooks_handlers.php | 20 ++++++++++++++++++++
 apps/files_sharing/get.php              |  1 +
 apps/files_sharing/lib_share.php        |  2 ++
 4 files changed, 27 insertions(+)

diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
index 27a72de432..e52f633cf1 100644
--- a/apps/admin_audit/appinfo/app.php
+++ b/apps/admin_audit/appinfo/app.php
@@ -12,3 +12,7 @@ OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, 'OC_
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, 'OC_Admin_Audit_Hooks_Handlers', 'write');
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_read, 'OC_Admin_Audit_Hooks_Handlers', 'read');
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, 'OC_Admin_Audit_Hooks_Handlers', 'delete');
+
+OCP\Util::connectHook('OC_Share', 'public', 'OC_Admin_Audit_Hooks_Handlers', 'share_public');
+OCP\Util::connectHook('OC_Share', 'public-download', 'OC_Admin_Audit_Hooks_Handlers', 'share_public_download');
+OCP\Util::connectHook('OC_Share', 'user', 'OC_Admin_Audit_Hooks_Handlers', 'share_user');
diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
index 4cc3194eaf..c5aec97d93 100644
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ b/apps/admin_audit/lib/hooks_handlers.php
@@ -46,6 +46,26 @@ class OC_Admin_Audit_Hooks_Handlers {
 		$user = OCP\User::getUser();
 		self::log('Delete "'.$path.'" by '.$user);
 	}
+	static public function share_public($params) {
+		$path = $params['source'];
+		$token = $params['token'];
+		$user = OCP\User::getUser();
+		self::log('Shared "'.$path.'" with public, token="'.$token.'" by '.$user);
+	}
+	static public function share_public_download($params) {
+		$path = $params['source'];
+		$token = $params['token'];
+		$user = $_SERVER['REMOTE_ADDR'];
+		self::log('Download of shared "'.$path.'" token="'.$token.'" by '.$user);
+	}
+	static public function share_user($params) {
+		$path = $params['source'];
+		$permissions = $params['permissions'];
+		$with = $params['with'];
+		$user = OCP\User::getUser();
+		$rw = $permissions & OC_Share::WRITE ? 'w' : 'o';
+		self::log('Shared "'.$path.'" (r'.$rw.') with user "'.$with.'" by '.$user);
+	}
 	static protected function log($msg) {
 		OCP\Util::writeLog('admin_audit', $msg, OCP\Util::INFO);
 	}
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index de3bc5f46d..57ff6b6e20 100755
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -74,6 +74,7 @@ if ($source !== false) {
 		header("Content-Length: " . OC_Filesystem::filesize($source));
 		//download the file
 		@ob_clean();
+		OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token);
 		OC_Filesystem::readfile($source);
 	}
 } else {
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index d5cf3d0a1b..14c61c620a 100755
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -43,6 +43,7 @@ class OC_Share {
 		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
 		if ($uid_shared_with == self::PUBLICLINK) {
 			$token = sha1("$uid_shared_with-$source");
+			OCP\Util::emitHook('OC_Share', 'public', array('source'=>$source, 'token'=>$token, 'permissions'=>$permissions));
 			$query->execute(array($uid_owner, self::PUBLICLINK, $source, $token, $permissions));
 			$this->token = $token;
 		} else {
@@ -97,6 +98,7 @@ class OC_Share {
 				if (isset($gid)) {
 					$uid = $uid."@".$gid;
 				}
+				OCP\Util::emitHook('OC_Share', 'user', array('source'=>$source, 'target'=>$target, 'with'=>$uid, 'permissions'=>$permissions));
 				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
 				// Add file to filesystem cache
 				$userDirectory = "/".OCP\USER::getUser()."/files";

From ac2e0cd6e450607585fbac2ec00a952744a4a36b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 8 May 2012 09:07:11 +0200
Subject: [PATCH 0011/1537] Implement default functions in OC_User backend

Simplifies calling these functions, and makes code simpler

functions:
deleteUser
getUsers
userExists
---
 apps/user_openid/user_openid.php |  2 +-
 lib/user.php                     | 20 ++++++----------
 lib/user/backend.php             | 40 +++++++++++++++++++++++++-------
 lib/user/example.php             | 30 ------------------------
 4 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index 8deb42f68c..710d400aa5 100755
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -24,7 +24,7 @@
 require_once('class.openid.v3.php');
 
 /**
- * Class for user management in a SQL Database (e.g. MySQL, SQLite)
+ * Class for user OpenId backend
  */
 class OC_USER_OPENID extends OC_User_Backend {
 	/**
diff --git a/lib/user.php b/lib/user.php
index 816caff8dd..ad5198d037 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -161,9 +161,7 @@ class OC_User {
 		if( $run ){
 			//delete the user from all backends
 			foreach(self::$_usedBackends as $backend){
-				if($backend->implementsActions(OC_USER_BACKEND_DELETE_USER)){
-					$backend->deleteUser($uid);
-				}
+				$backend->deleteUser($uid);
 			}
 			// We have to delete the user from all groups
 			foreach( OC_Group::getUserGroups( $uid ) as $i ){
@@ -323,11 +321,9 @@ class OC_User {
 	public static function getUsers(){
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){
-				$backendUsers=$backend->getUsers();
-				if(is_array($backendUsers)){
-					$users=array_merge($users,$backendUsers);
-				}
+			$backendUsers=$backend->getUsers();
+			if(is_array($backendUsers)){
+				$users=array_merge($users,$backendUsers);
 			}
 		}
 		return $users;
@@ -340,11 +336,9 @@ class OC_User {
 	 */
 	public static function userExists($uid){
 		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_USER_EXISTS)){
-				$result=$backend->userExists($uid);
-				if($result===true){
-					return true;
-				}
+			$result=$backend->userExists($uid);
+			if($result===true){
+				return true;
 			}
 		}
 		return false;
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 4afdf15215..8c954338fb 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -32,11 +32,8 @@ define('OC_USER_BACKEND_NOT_IMPLEMENTED',   -501);
  * actions that user backends can define
  */
 define('OC_USER_BACKEND_CREATE_USER',       0x000001);
-define('OC_USER_BACKEND_DELETE_USER',       0x000010);
-define('OC_USER_BACKEND_SET_PASSWORD',      0x000100);
-define('OC_USER_BACKEND_CHECK_PASSWORD',    0x001000);
-define('OC_USER_BACKEND_GET_USERS',         0x010000);
-define('OC_USER_BACKEND_USER_EXISTS',       0x100000);
+define('OC_USER_BACKEND_SET_PASSWORD',      0x000010);
+define('OC_USER_BACKEND_CHECK_PASSWORD',    0x000100);
 
 
 /**
@@ -47,11 +44,8 @@ abstract class OC_User_Backend {
 
 	protected $possibleActions = array(
 		OC_USER_BACKEND_CREATE_USER => 'createUser',
-		OC_USER_BACKEND_DELETE_USER => 'deleteUser',
 		OC_USER_BACKEND_SET_PASSWORD => 'setPassword',
 		OC_USER_BACKEND_CHECK_PASSWORD => 'checkPassword',
-		OC_USER_BACKEND_GET_USERS => 'getUsers',
-		OC_USER_BACKEND_USER_EXISTS => 'userExists'
 	);
 
 	/**
@@ -83,4 +77,34 @@ abstract class OC_User_Backend {
 	public function implementsActions($actions){
 		return (bool)($this->getSupportedActions() & $actions);
 	}
+
+	/**
+	* @brief delete a user
+	* @param $uid The username of the user to delete
+	* @returns true/false
+	*
+	* Deletes a user
+	*/
+	public function deleteUser( $uid ){
+		return false;
+	}
+
+	/**
+	* @brief Get a list of all users
+	* @returns array with all uids
+	*
+	* Get a list of all users.
+	*/
+	public function getUsers(){
+		return array();
+	}
+
+	/**
+	* @brief check if a user exists
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function userExists($uid){
+		return false;
+	}
 }
diff --git a/lib/user/example.php b/lib/user/example.php
index 7481014de7..270b72e389 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -39,17 +39,6 @@ abstract class OC_User_Example extends OC_User_Backend {
 		return OC_USER_BACKEND_NOT_IMPLEMENTED;
 	}
 
-	/**
-		* @brief delete a user
-		* @param $uid The username of the user to delete
-		* @returns true/false
-		*
-		* Deletes a user
-		*/
-	public function deleteUser( $uid ){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
-
 	/**
 		* @brief Set password
 		* @param $uid The username
@@ -73,23 +62,4 @@ abstract class OC_User_Example extends OC_User_Backend {
 	public function checkPassword($uid, $password){
 		return OC_USER_BACKEND_NOT_IMPLEMENTED;
 	}
-
-	/**
-		* @brief Get a list of all users
-		* @returns array with all uids
-		*
-		* Get a list of all users.
-		*/
-	public function getUsers(){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
-
-	/**
-		* @brief check if a user exists
-		* @param string $uid the username
-		* @return boolean
-		*/
-	public function userExists($uid){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
 }

From e77ba0280a0ebceef348750f5ff9738012e2b8fb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 8 May 2012 17:46:35 +0200
Subject: [PATCH 0012/1537] Implement default functions in OC_Group backend

Simplifies calling these functions, and makes code simpler

functions:
inGroup
getUserGroups
getGroups
usersInGroup
---
 lib/group.php         | 14 +----------
 lib/group/backend.php | 58 +++++++++++++++++++++++++++++++++----------
 lib/group/example.php |  7 ++++++
 3 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/lib/group.php b/lib/group.php
index 9b2959d1f7..bc98e877ad 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -84,7 +84,7 @@ class OC_Group {
 		OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
 
 		if($run){
-			//create the user in the first backend that supports creating users
+			//create the group in the first backend that supports creating groups
 			foreach(self::$_usedBackends as $backend){
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP))
 					continue;
@@ -141,9 +141,6 @@ class OC_Group {
 	 */
 	public static function inGroup( $uid, $gid ){
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_IN_GROUP))
-				continue;
-
 			if($backend->inGroup($uid,$gid)){
 				return true;
 			}
@@ -224,9 +221,6 @@ class OC_Group {
 	public static function getUserGroups( $uid ){
 		$groups=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USER_GROUPS))
-				continue;
-
 			$groups=array_merge($backend->getUserGroups($uid),$groups);
 		}
 		return $groups;
@@ -241,9 +235,6 @@ class OC_Group {
 	public static function getGroups(){
 		$groups=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_GROUPS))
-				continue;
-
 			$groups=array_merge($backend->getGroups(),$groups);
 		}
 		return $groups;
@@ -270,9 +261,6 @@ class OC_Group {
 	public static function usersInGroup($gid){
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USERS))
-				continue;
-
 			$users=array_merge($backend->usersInGroup($gid),$users);
 		}
 		return $users;
diff --git a/lib/group/backend.php b/lib/group/backend.php
index af6c53c803..7984a6a835 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -31,12 +31,8 @@ define('OC_GROUP_BACKEND_NOT_IMPLEMENTED',   -501);
  */
 define('OC_GROUP_BACKEND_CREATE_GROUP',      0x00000001);
 define('OC_GROUP_BACKEND_DELETE_GROUP',      0x00000010);
-define('OC_GROUP_BACKEND_IN_GROUP',          0x00000100);
-define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00001000);
-define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00010000);
-define('OC_GROUP_BACKEND_GET_USER_GROUPS',   0x00100000);
-define('OC_GROUP_BACKEND_GET_USERS',         0x01000000);
-define('OC_GROUP_BACKEND_GET_GROUPS',        0x10000000);
+define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00000100);
+define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00001000);
 
 /**
  * Abstract base class for user management
@@ -45,12 +41,8 @@ abstract class OC_Group_Backend {
 	protected $possibleActions = array(
 		OC_GROUP_BACKEND_CREATE_GROUP => 'createGroup',
 		OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup',
-		OC_GROUP_BACKEND_IN_GROUP => 'inGroup',
 		OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup',
 		OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup',
-		OC_GROUP_BACKEND_GET_USER_GROUPS => 'getUserGroups',
-		OC_GROUP_BACKEND_GET_USERS => 'usersInGroup',
-		OC_GROUP_BACKEND_GET_GROUPS => 'getGroups'
 	);
 	
 	/**
@@ -83,15 +75,55 @@ abstract class OC_Group_Backend {
 		return (bool)($this->getSupportedActions() & $actions);
 	}
 
+	/**
+	 * @brief is user in group?
+	 * @param $uid uid of the user
+	 * @param $gid gid of the group
+	 * @returns true/false
+	 *
+	 * Checks whether the user is member of a group or not.
+	 */
+	public static function inGroup($uid, $gid){
+		return in_array($gid, $this->getUserGroups($uid));
+	}
+
+	/**
+	 * @brief Get all groups a user belongs to
+	 * @param $uid Name of the user
+	 * @returns array with group names
+	 *
+	 * This function fetches all groups a user belongs to. It does not check
+	 * if the user exists at all.
+	 */
+	public static function getUserGroups($uid){
+		return array();
+	}
+
+	/**
+	 * @brief get a list of all groups
+	 * @returns array with group names
+	 *
+	 * Returns a list with all groups
+	 */
+	public static function getGroups(){
+		return array();
+	}
+
 	/**
 	 * check if a group exists
 	 * @param string $gid
 	 * @return bool
 	 */
 	public function groupExists($gid){
-		if(!$this->implementsActions(OC_GROUP_BACKEND_GET_GROUPS)){
-			return false;
-		}
 		return in_array($gid, $this->getGroups());
 	}
+
+	/**
+	 * @brief get a list of all users in a group
+	 * @returns array with user ids
+	 */
+	public static function usersInGroup($gid){
+		return array();
+	}
+
 }
diff --git a/lib/group/example.php b/lib/group/example.php
index a88159f91b..11a14b5e78 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -93,6 +93,13 @@ abstract class OC_Group_Example {
 	 */
 	public static function getGroups(){}
 
+	/**
+	 * check if a group exists
+	 * @param string $gid
+	 * @return bool
+	 */
+	public function groupExists($gid){}
+
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids

From b022ccb86371e774b63a8000f7ea2207c2da225e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 9 May 2012 17:40:59 +0200
Subject: [PATCH 0013/1537] Whitespace fixes

---
 apps/gallery/js/album_cover.js | 16 ++++++++--------
 apps/gallery/lib/album.php     | 26 ++++++++++++--------------
 lib/files.php                  |  4 ++--
 lib/util.php                   |  3 +--
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index d1809462f2..905034f6fd 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -78,14 +78,14 @@ function albumClickHandler(r) {
 		for (var i in r.photos) {
 			Albums.photos.push(r.photos[i]);
 		}
-    Albums.shared = r.shared;
-    if (Albums.shared) {
-      Albums.recursive = r.recursive;
-      Albums.token = r.token;
-    } else {
-      Albums.recursive = false;
-      Albums.token = '';
-    }
+		Albums.shared = r.shared;
+		if (Albums.shared) {
+			Albums.recursive = r.recursive;
+			Albums.token = r.token;
+		} else {
+			Albums.recursive = false;
+			Albums.token = '';
+		}
 		$(document).ready(function(){
 			var targetDiv = $('#gallery_list');
 			targetDiv.html('');
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 27d40cdb91..ac6cacbe01 100755
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -79,7 +79,7 @@ class OC_Gallery_Album {
 			$sql .= ' AND parent_path = ?';
 			$args[] = $parent;
 		}
-    $order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
+		$order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
 		$sql .= ' ORDER BY album_name ' . $order;
 
 		$stmt = OCP\DB::prepare($sql);
@@ -98,19 +98,17 @@ class OC_Gallery_Album {
 	}
 
 	public static function getAlbumSize($id){
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_id = ?';
-    $stmt = OCP\DB::prepare($sql);
-    $result=$stmt->execute(array($id))->fetchRow();
-    return $result['size'];
+		$sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_id = ?';
+		$stmt = OCP\DB::prepare($sql);
+		$result=$stmt->execute(array($id))->fetchRow();
+		return $result['size'];
 	}
 
-  public static function getIntermediateGallerySize($path) {
-    $path .= '%';
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos photos, *PREFIX*gallery_albums albums WHERE photos.album_id = albums.album_id AND uid_owner = ? AND file_path LIKE ?';
-    $stmt = OCP\DB::prepare($sql);
-    $result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
-    return $result['size'];
-  }
+	public static function getIntermediateGallerySize($path) {
+		$path .= '%';
+		$sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos photos, *PREFIX*gallery_albums albums WHERE photos.album_id = albums.album_id AND uid_owner = ? AND file_path LIKE ?';
+		$stmt = OCP\DB::prepare($sql);
+		$result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
+		return $result['size'];
+	}
 }
-
-?>
diff --git a/lib/files.php b/lib/files.php
index 5d4d73630e..d837bf7aa2 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -32,11 +32,11 @@ class OC_Files {
 	* get the content of a directory
 	* @param dir $directory
 	*/
-  public static function getDirectoryContent($directory, $mimetype_filter = ''){
+	public static function getDirectoryContent($directory, $mimetype_filter = ''){
 		if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){
 			$directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY));
 		}
-    $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
+		$files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
 		foreach($files as &$file){
 			$file['directory']=$directory;
 			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';
diff --git a/lib/util.php b/lib/util.php
index e4546d6ac3..ff11799871 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -31,7 +31,7 @@ class OC_Util {
 		// Create root dir.
 		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
 			$success=@mkdir($CONFIG_DATADIRECTORY_ROOT);
-            if(!$success) {
+			if(!$success) {
 				$tmpl = new OC_Template( '', 'error', 'guest' );
 				$tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ")));
 				$tmpl->printPage();
@@ -50,7 +50,6 @@ class OC_Util {
 			self::$rootMounted=true;
 		}
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
-
 			OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
 			if( !is_dir( OC::$CONFIG_DATADIRECTORY )){
 				mkdir( OC::$CONFIG_DATADIRECTORY, 0755, true );

From c2230580c14b08877210a9c0bcfe6f4b0a806bf5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 9 May 2012 17:41:44 +0200
Subject: [PATCH 0014/1537] Remove unused OC static variable
 CONFIG_DATADIRECTORY_ROOT

---
 lib/base.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 14f2439ecb..e7ca51740c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -50,10 +50,6 @@ class OC{
 	 * the folder that stores that data files for the filesystem of the user (e.g. /srv/http/owncloud/data/myusername/files)
 	 */
 	public static $CONFIG_DATADIRECTORY = '';
-	/**
-	 * the folder that stores the data for the root filesystem (e.g. /srv/http/owncloud/data)
-	 */
-	public static $CONFIG_DATADIRECTORY_ROOT = '';
 	/**
 	 * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
 	 */

From 9a66b869c0db189338ccf0333183108bf81a7786 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 9 May 2012 22:47:57 +0200
Subject: [PATCH 0015/1537] Gallery: Use App storage instead of contructing our
 own path

---
 apps/gallery/ajax/galleryOp.php |  3 ++-
 apps/gallery/ajax/sharing.php   |  6 ++++--
 apps/gallery/index.php          |  4 ----
 apps/gallery/lib/album.php      |  5 ++---
 apps/gallery/lib/photo.php      | 20 ++++++++++----------
 apps/gallery/lib/scanner.php    |  3 ++-
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 0cd825f3e5..b49e52f0bd 100755
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -42,7 +42,8 @@ function handleRemove($name) {
 
 function handleGetThumbnails($albumname) {
   OCP\Response::enableCaching(3600 * 24); // 24 hour
-  $thumbnail = OC::$CONFIG_DATADIRECTORY.'/../gallery/'.urldecode($albumname).'.png';
+  $view = OCP\App::getStorage('gallery');
+  $thumbnail = $view->fopen(urldecode($albumname).'.png', 'r');
   header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
   OCP\Response::sendFile($thumbnail);
 }
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
index 1223320120..304757b9e9 100755
--- a/apps/gallery/ajax/sharing.php
+++ b/apps/gallery/ajax/sharing.php
@@ -80,7 +80,8 @@ function handleGetThumbnail($token, $imgpath) {
 function handleGetAlbumThumbnail($token, $albumname)
 {
   $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $file = OCP\Config::getSystemValue("datadirectory").'/'. $owner .'/gallery/'.$albumname.'.png';
+  $view = OCP\App::getStorage('gallery');
+  $file = $view->fopen($albumname.'.png', 'r');
   $image = new OC_Image($file);
   if ($image->valid()) {
     $image->centerCrop();
@@ -93,7 +94,8 @@ function handleGetAlbumThumbnail($token, $albumname)
 
 function handleGetPhoto($token, $photo) {
   $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $file = OCP\Config::getSystemValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$owner.'/files'.urldecode($photo);
+  $view = OCP\App::getStorage('files');
+  $file = $view->fopen(urldecode($photo), 'r');
   header('Content-Type: '.OC_Image::getMimeTypeForFile($file));
   OCP\Response::sendFile($file);
 }
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index e47fb3db5d..a9fe200c4e 100755
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -27,10 +27,6 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
-if (!file_exists(OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery')) {
-  mkdir(OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery');
-}
-
 if (!isset($_GET['view'])) {
   $result = OC_Gallery_Album::find(OCP\USER::getUser());
 
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index ac6cacbe01..7b9036742a 100755
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -92,9 +92,8 @@ class OC_Gallery_Album {
 	}
 
 	public static function changeThumbnailPath($oldname, $newname) {
-		 
-		$thumbpath = OC::$CONFIG_DATADIRECTORY.'/../gallery/';
-		rename($thumbpath.$oldname.'.png', $thumbpath.$newname.'.png');
+		$view = OCP\App::getStorage('gallery');
+		$view->rename($oldname.'.png', $newname.'.png');
 	}
 
 	public static function getAlbumSize($id){
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 99384af621..b4b37236b0 100755
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -68,17 +68,17 @@ class OC_Gallery_Photo {
 
 	public static function getThumbnail($image_name, $owner = null) {
 		if (!$owner) $owner = OCP\USER::getUser();
-		$save_dir = OCP\Config::getSystemValue("datadirectory").'/'. $owner .'/gallery/';
-		$save_dir .= dirname($image_name). '/';
-		$image_path = $image_name;
-		$thumb_file = $save_dir . basename($image_name);
-		if (!is_dir($save_dir)) {
-			mkdir($save_dir, 0777, true);
+		$view = OCP\App::getStorage('gallery');
+		$save_dir = dirname($image_name);
+		if (!$view->is_dir($save_dir)) {
+			$view->mkdir($save_dir);
 		}
-		if (file_exists($thumb_file)) {
-			$image = new OC_Image($thumb_file);
+		$view->chroot($view->getRoot().'/'.$save_dir);
+		$thumb_file = basename($image_name);
+		if ($view->file_exists($thumb_file)) {
+			$image = new OC_Image($view->fopen($thumb_file, 'r'));
 		} else {
-			$image_path = OC_Filesystem::getLocalFile($image_path);
+			$image_path = OC_Filesystem::getLocalFile($image_name);
 			if(!file_exists($image_path)) {
 				return null;
 			}
@@ -86,7 +86,7 @@ class OC_Gallery_Photo {
 			if ($image->valid()) {
 				$image->centerCrop(200);
 				$image->fixOrientation();
-				$image->save($thumb_file);
+				$image->save($view->getLocalFile($thumb_file));
 			}
 		}
 		if ($image->valid()) {
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 7a137cb3f5..e11ba1da45 100755
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -81,7 +81,8 @@ class OC_Gallery_Scanner {
 				$image->destroy();
 			}
 		}
-		imagepng($thumbnail, OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery/' . $albumName.'.png');
+		$view = OCP\App::getStorage('gallery');
+		imagepng($thumbnail, $view->getLocalFile($albumName.'.png'));
 		imagedestroy($thumbnail);
 	}
 

From 97233b77cd0cfb7671e8914fd047642988ea425b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 11 May 2012 21:31:51 +0200
Subject: [PATCH 0016/1537] Remove DOCUMENTROOT static var, and make SUBURI var
 private

---
 lib/base.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index e7ca51740c..f01e1f5be6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -30,10 +30,6 @@ class OC{
 	 * Assoziative array for autoloading. classname => filename
 	 */
 	public static $CLASSPATH = array();
-	/**
-	 * $_SERVER['DOCUMENTROOT'] but without symlinks
-	 */
-	public static $DOCUMENTROOT = '';
 	/**
 	 * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
 	 */
@@ -41,7 +37,7 @@ class OC{
 	/**
 	 * the current request path relative to the owncloud root (e.g. files/index.php)
 	 */
-	public static $SUBURI = '';
+	private static $SUBURI = '';
 	/**
 	 * the owncloud root path for http requests (e.g. owncloud/)
 	 */
@@ -122,7 +118,7 @@ class OC{
 
 	public static function initPaths(){
 		// calculate the documentroot
-		OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
+		$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
 		OC::$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT));
 		$scriptName=$_SERVER["SCRIPT_NAME"];
@@ -138,7 +134,7 @@ class OC{
 		}
                 OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
 		// try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody
-//		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen(OC::$DOCUMENTROOT));
+//		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT));
 
 
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){

From b1cae9651eb1d61b2fe9cc69766c533cb87f46b8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 12 May 2012 23:00:21 +0200
Subject: [PATCH 0017/1537] add functions get cached events in a specific time
 period

---
 apps/calendar/lib/repeat.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index fe2ba7cfa8..af335d4b72 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -14,10 +14,18 @@ class OC_Calendar_Repeat{
 	 * @brief returns the cache of an event
 	 */
 	public static function get();
+	/*
+	* @brief returns the cache of an event in a specific peroid
+	*/
+	public static function get_inperiod();
 	/*
 	 * @brief returns the cache of all events of a calendar
 	 */
 	public static function getcalendar();
+	/*
+	* @brief returns the cache of all events of a calendar in a specific period
+	*/
+	public static function getcalendar_inperiod();
 	/*
 	 * @brief generates the cache the first time
 	 */
@@ -38,4 +46,4 @@ class OC_Calendar_Repeat{
 	 * @brief removes the cache of all events of a calendar
 	 */
 	public static function cleancalendar();
-}
\ No newline at end of file
+}

From dfef36ba2fb61ccc56a0840b63ef0782293927f9 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 12 May 2012 23:16:11 +0200
Subject: [PATCH 0018/1537] some changes for calendar repeat class

---
 apps/calendar/lib/repeat.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index af335d4b72..9a43925e27 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -15,25 +15,33 @@ class OC_Calendar_Repeat{
 	 */
 	public static function get();
 	/*
-	* @brief returns the cache of an event in a specific peroid
-	*/
+	 * @brief returns the cache of an event in a specific peroid
+	 */
 	public static function get_inperiod();
 	/*
-	 * @brief returns the cache of all events of a calendar
+	 * @brief returns the cache of all repeating events of a calendar
 	 */
 	public static function getcalendar();
 	/*
-	* @brief returns the cache of all events of a calendar in a specific period
-	*/
+	 * @brief returns the cache of all repeating events of a calendar in a specific period
+	 */
 	public static function getcalendar_inperiod();
 	/*
 	 * @brief generates the cache the first time
 	 */
 	public static function generate();
+	/*
+	 * @brief generates the cache the first time for all repeating event of an calendar
+	 */
+	public static function generatecalendar();
 	/*
 	 * @brief updates an event that is already cached
 	 */
 	public static function update();
+	/*
+	 * @brief updates all repating events of a calendar that are already cached
+	 */
+	public static function updatecalendar();
 	/*
 	 * @brief checks if an event is already cached
 	 */

From 63a1b066bcebc998bd4a6a4c8cc56f38983b0639 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 15:05:57 +0200
Subject: [PATCH 0019/1537] add first version of drop import

---
 apps/calendar/ajax/import/dropimport.php | 74 ++++++++++++++++++++++++
 apps/calendar/js/calendar.js             | 45 ++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 apps/calendar/ajax/import/dropimport.php

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
new file mode 100644
index 0000000000..e98c282ef4
--- /dev/null
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -0,0 +1,74 @@
+<?php
+$data = $_POST['data'];
+$data = explode(',', $data);
+$data = end($data);
+$data = base64_decode($data);
+OCP\JSON::checkLoggedIn();
+OCP\App::checkAppEnabled('calendar');
+$nl="\r\n";
+$comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
+$data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
+$lines = explode("\n", $data);
+unset($data);
+$comp=$uid=$cal=false;
+$cals=$uids=array();
+$i = 0;
+foreach($lines as $line) {
+	if(strpos($line, ':')!==false) {
+		list($attr, $val) = explode(':', strtoupper($line));
+		if ($attr == 'BEGIN' && $val == 'VCALENDAR') {
+			$cal = $i;
+			$cals[$cal] = array('first'=>$i,'last'=>$i,'end'=>$i);
+		} elseif ($attr =='BEGIN' && $cal!==false && isset($comps[$val])) {
+			$comp = $val;
+			$beginNo = $i;
+		} elseif ($attr == 'END' && $cal!==false && $val == 'VCALENDAR') {
+			if($comp!==false) {
+				unset($cals[$cal]); // corrupt calendar, unset it
+			} else {
+				$cals[$cal]['end'] = $i;
+			}
+			$comp=$uid=$cal=false; // reset calendar
+		} elseif ($attr == 'END' && $comp!==false && $val == $comp) {
+			if(! $uid) {
+				$uid = OC_Calendar_Object::createUID();
+			}
+			$uids[$uid][$beginNo] = array('end'=>$i, 'cal'=>$cal);
+			if ($cals[$cal]['first'] == $cal) {
+				$cals[$cal]['first'] = $beginNo;
+			}
+			$cals[$cal]['last'] = $i;
+			$comp=$uid=false; // reset component
+		} elseif ($attr =="UID" && $comp!==false) {
+			list($attr, $uid) = explode(':', $line);
+		}
+	}
+	$i++;
+}
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+$id = $calendars[0]['id'];
+foreach($uids as $uid) {
+	$prefix=$suffix=$content=array();
+	foreach($uid as $begin=>$details) {
+		$cal = $details['cal'];
+		if(!isset($cals[$cal])) {
+			continue; // from corrupt/incomplete calendar
+		}
+		$cdata = $cals[$cal];
+		// if we have multiple components from different calendar objects,
+		// we should really merge their elements (enhancement?) -- 1st one wins for now.
+		if(! count($prefix)) {
+			$prefix = array_slice($lines, $cal, $cdata['first'] - $cal);
+		}
+		if(! count($suffix)) {
+			$suffix = array_slice($lines, $cdata['last']+1, $cdata['end'] - $cdata['last']);
+		}
+		$content = array_merge($content, array_slice($lines, $begin, $details['end'] - $begin + 1));
+	}
+	if(count($content)) {
+		$import = join($nl, array_merge($prefix, $content, $suffix)) . $nl;
+		OC_Calendar_Object::add($id, $import);
+	}
+}
+OCP\JSON::success();
+?>
\ No newline at end of file
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 80b5dd88c5..8a3f714c5f 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -601,6 +601,50 @@ Calendar={
 				});
 				/*var permissions = (this.checked) ? 1 : 0;*/
 			}
+		},
+		Drop:{
+			init:function(){
+				if (typeof window.FileReader === 'undefined') {
+					console.log('The drop-import feature is not supported in your browser :(');
+					return false;
+				}
+				droparea = document.getElementById('calendar_holder');
+				droparea.ondrop = function(e){
+					e.preventDefault();
+					Calendar.UI.Drop.drop(e);
+				}
+				console.log('Drop initialized successfully');
+			},
+			drop:function(e){
+				var files = e.dataTransfer.files;
+				for(var i = 0;i < files.length;i++){
+					var file = files[i]
+					reader = new FileReader();
+					reader.onload = function(event){
+						if(file.type != 'text/calendar'){
+							$('#notification').html('At least one file don\'t seems to be a calendar file. File skipped.');
+							$('#notification').slideDown();
+							window.setTimeout(function(){$('#notification').slideUp();}, 5000);
+							return false;
+						}else{
+							Calendar.UI.Drop.import(event.target.result);
+						}
+					}
+					reader.readAsDataURL(file);
+				}
+				$('#calendar_holder').fullCalendar('refetchEvents');
+			},
+			import:function(data){
+				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
+					if(result.data == 'success'){
+						return true;
+					}else{
+						$('#notification').html('ownCloud wasn\'t able to import at least one file. File skipped.');
+						$('#notification').slideDown();
+						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
+					}
+				});
+			}
 		}
 	}
 }
@@ -858,4 +902,5 @@ $(document).ready(function(){
 		$('#calendar_holder').fullCalendar('next');
 	});
 	Calendar.UI.Share.init();
+	Calendar.UI.Drop.init();
 });

From 0892abd050afab54e22d7c5516d014ed9145321d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 15:08:27 +0200
Subject: [PATCH 0020/1537] some little js fixes for drop import

---
 apps/calendar/js/calendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 8a3f714c5f..f2e5071ba3 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -628,15 +628,15 @@ Calendar={
 							return false;
 						}else{
 							Calendar.UI.Drop.import(event.target.result);
+							$('#calendar_holder').fullCalendar('refetchEvents');
 						}
 					}
 					reader.readAsDataURL(file);
 				}
-				$('#calendar_holder').fullCalendar('refetchEvents');
 			},
 			import:function(data){
 				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
-					if(result.data == 'success'){
+					if(result.status == 'success'){
 						return true;
 					}else{
 						$('#notification').html('ownCloud wasn\'t able to import at least one file. File skipped.');

From 2ad6b5048e05fd5c28600845bbabde3a3f4537f7 Mon Sep 17 00:00:00 2001
From: Sam Tuke <sam@donttravelempty.com>
Date: Tue, 15 May 2012 16:24:06 +0100
Subject: [PATCH 0021/1537] fixed 'delete' label so it doesn't break
 translations

---
 apps/files/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 72e45d5327..1308645746 100755
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -53,7 +53,7 @@
 				</span>
 			</th>
 			<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
-			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete all')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
+			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
 		</tr>
 	</thead>
 	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">

From a00c5ac78ccbd581ba043d173d3f85aaf21b03dd Mon Sep 17 00:00:00 2001
From: Sam Tuke <sam@donttravelempty.com>
Date: Fri, 11 May 2012 13:17:37 +0100
Subject: [PATCH 0022/1537] fixed some include path issues imroved wording of
 history page revert instructions cleaned up js call to ajax getVersions.php

---
 apps/files_versions/ajax/getVersions.php  | 36 +++--------------
 apps/files_versions/appinfo/app.php       |  3 --
 apps/files_versions/js/versions.js        | 47 +++++++++--------------
 apps/files_versions/templates/history.php |  2 +-
 4 files changed, 25 insertions(+), 63 deletions(-)

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 5949c32ed1..8ef17d5a25 100755
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once('../../../lib/base.php');
+require_once('lib/base.php');
+
 OCP\JSON::checkAppEnabled('files_versions');
-require_once('../versions.php');
+
+require_once('apps/files_versions/versions.php');
 
 $userDirectory = "/".OCP\USER::getUser()."/files";
 $source = $_GET['source'];
@@ -26,36 +28,8 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 		OCP\JSON::encodedPrint($versionsSorted);
 	}
 	
-}else{
+} else {
 
 	return;
 	
 }
-
-// $path = $source;
-// $users = array();
-// if ($users = OC_Share::getMySharedItem($source)) {
-// 	for ($i = 0; $i < count($users); $i++) {
-// 		if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-// 			$users[$i]['token'] = OC_Share::getTokenFromSource($source);
-// 		}
-// 	}
-// }
-// $source = dirname($source);
-// while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
-// 	if ($values = OC_Share::getMySharedItem($source)) {
-// 		$values = array_values($values);
-// 		$parentUsers = array();
-// 		for ($i = 0; $i < count($values); $i++) {
-// 			if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-// 				$values[$i]['token'] = OC_Share::getTokenFromSource($source)."&path=".substr($path, strlen($source));
-// 			}
-// 			$parentUsers[basename($source)."-".$i] = $values[$i];
-// 		}
-// 		$users = array_merge($users, $parentUsers);
-// 	}
-// 	$source = dirname($source);
-// }
-// if (!empty($users)) {
-// 	OCP\JSON::encodedPrint($users);
-// }
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index fd3f78ab57..fd31a0bb67 100755
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -14,7 +14,4 @@ OCP\Util::addscript('files_versions', 'versions');
 // Listen to write signals
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
 
-
-
-
 ?>
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 0508ab4cde..2c92dfa3c6 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -14,28 +14,17 @@ $(document).ready(function(){
 		FileActions.register('file','History',function(){return OC.imagePath('core','actions/history')},function(filename){
 
 			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-
+			
 			var file = $('#dir').val()+'/'+filename;
 
 			createVersionsDropdown(filename, file)
 
-			$.ajax({
-				type: 'GET',
-				url: OC.linkTo('files_versions', 'ajax/getVersions.php'),
-				dataType: 'json',
-				data: {source: file},
-				async: false,
-				success: function(versions) {
-					if (versions) {
-					}
-				}
-			});
-
 		});
 	}
 });
 
 function createVersionsDropdown(filename, files) {
+	
 	var historyUrl = '../apps/files_versions/history.php?path='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 
 	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
@@ -56,24 +45,26 @@ function createVersionsDropdown(filename, files) {
 		$(html).appendTo($('thead .share'));
 	}
 	
-// 	$.getJSON(OC.linkTo('files_sharing', 'ajax/userautocomplete.php'), function(users) {
-// 		if (users) {
-// 			$.each(users, function(index, row) {
-// 				$(row).appendTo('#share_with');
-// 			});
-// 			$('#share_with').trigger('liszt:updated');
-// 		}
-// 	});
-	$.getJSON(OC.linkTo('files_versions', 'ajax/getVersions.php'), { source: files }, function(versions) {
-		if (versions) {
+	$.ajax({
+		type: 'GET',
+		url: OC.linkTo('files_versions', 'ajax/getVersions.php'),
+		dataType: 'json',
+		data: { source: files },
+		async: false,
+		success: function( versions ) {
 			
-			$.each( versions, function(index, row ) {
-					
-					addVersion( row );
-			});
+			//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
+			
+			if (versions) {
+				
+				$.each( versions, function(index, row ) {
+						
+						addVersion( row );
+				});
+				
+			}
 			
 		}
-		
 	});
 	
 	function revertFile() {
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 3b29625b3b..6ef996049f 100755
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -17,7 +17,7 @@ if( isset( $_['message'] ) ) {
 	}
 
 	echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
-	echo('<p><em>You can click on the revert button to revert to the specific verson.</em></p><br />');
+	echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
 	
 	foreach ( $_['versions'] as $v ) {
 	

From 0a46ae4f6dd1f4294f4e90c6049b24bd594226a7 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 16 May 2012 14:56:37 +0100
Subject: [PATCH 0023/1537] added recognition of which version is 'current' -
 which is currently live and in use on history page

---
 apps/files_versions/history.php           |  4 +-
 apps/files_versions/templates/history.php |  6 +-
 apps/files_versions/versions.php          | 69 +++++++++++++++++------
 3 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 4306e41640..7c03ef0e5e 100755
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -54,8 +54,8 @@ if ( isset( $_GET['path'] ) ) {
 	// show the history only if there is something to show
         if( OCA_Versions\Storage::isversioned( $path ) ) {
 	
-		$count=999; //show the newest revisions
-	        $versions=OCA_Versions\Storage::getversions( $path, $count);
+		$count = 999; //show the newest revisions
+	        $versions = OCA_Versions\Storage::getversions( $path, $count);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
 		
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 6ef996049f..891a3720e4 100755
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,8 +22,10 @@ if( isset( $_['message'] ) ) {
 	foreach ( $_['versions'] as $v ) {
 	
 		echo ' ';
-		echo OCP\Util::formatDate( $v );
-		echo ' <a href="history.php?path='.urlencode( $_['path'] ).'&revert='. $v .'" class="button">Revert</a><br /><br />';
+		echo OCP\Util::formatDate( $v['version'] );
+		echo ' <a href="history.php?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a>';
+		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
+		echo '<br /><br />';
 		
 	}
 
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 082dfbf7fd..75a0e1a213 100755
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -35,7 +35,7 @@ class Storage {
 	const DEFAULTFOLDER='versions'; 
 	const DEFAULTBLACKLIST='avi mp3 mpg mp4'; 
 	const DEFAULTMAXFILESIZE=1048576; // 10MB 
-	const DEFAULTMININTERVAL=120; // 2 min
+	const DEFAULTMININTERVAL=1; // 2 min
 	const DEFAULTMAXVERSIONS=50; 
 
 	/**
@@ -168,28 +168,65 @@ class Storage {
          * get a list of old versions of a file.
          */
         public static function getversions($filename,$count=0) {
-                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$versions=array();         
- 
-	              // fetch for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
-			sort($matches);
-			foreach($matches as $ma) {
-				$parts=explode('.v',$ma);
-				$versions[]=(end($parts));
+        
+                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+                
+			$versionsfoldername = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versions = array();         
+			
+			// fetch for old versions
+			$matches = glob( $versionsfoldername.$filename.'.v*' );
+			
+			sort( $matches );
+			
+			$i = 0;
+			
+			foreach( $matches as $ma ) {
+				
+				$i++;
+				$versions[$i]['cur'] = 0;
+				$parts = explode( '.v',$ma );
+				$versions[$i]['version'] = ( end( $parts ) );
+				
+				// if file with modified date exists, flag it in array as currently enabled version
+				$curFile['fileName'] = basename( $parts[0] );
+				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files/'.$curFile['fileName'];
+				
+				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
+				
 			}
 			
+			$versions = array_reverse( $versions );
+			
+			foreach( $versions as $key => $value ) {
+				
+				// flag the first matched file in array (which will have latest modification date) as current version
+				if ( $versions[$key]['fileMatch'] ) {
+				
+					$versions[$key]['cur'] = 1;
+					break;
+					
+				}
+			
+			}
+			
+			$versions = array_reverse( $versions );
+			
 			// only show the newest commits
-			if($count<>0 and (count($versions)>$count)) {
-				$versions=array_slice($versions,count($versions)-$count);
+			if( $count != 0 and ( count( $versions )>$count ) ) {
+			
+				$versions = array_slice( $versions, count( $versions ) - $count );
+				
 			}
 	
-			return($versions);
+			return( $versions );
 
 
-                }else{
-                        return(array());
+                } else {
+                
+			// if versioning isn't enabled then return an empty array
+                        return( array() );
+                        
                 }
         }	
 

From c0df40084a190c3f5b87efdd11b13af42b46fef4 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 16 May 2012 14:56:37 +0100
Subject: [PATCH 0024/1537] added recognition of which version is 'current' -
 which is currently live and in use on history page

---
 apps/files_versions/history.php           |  4 +-
 apps/files_versions/templates/history.php |  6 +-
 apps/files_versions/versions.php          | 69 +++++++++++++++++------
 3 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 4306e41640..7c03ef0e5e 100755
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -54,8 +54,8 @@ if ( isset( $_GET['path'] ) ) {
 	// show the history only if there is something to show
         if( OCA_Versions\Storage::isversioned( $path ) ) {
 	
-		$count=999; //show the newest revisions
-	        $versions=OCA_Versions\Storage::getversions( $path, $count);
+		$count = 999; //show the newest revisions
+	        $versions = OCA_Versions\Storage::getversions( $path, $count);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
 		
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 6ef996049f..891a3720e4 100755
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,8 +22,10 @@ if( isset( $_['message'] ) ) {
 	foreach ( $_['versions'] as $v ) {
 	
 		echo ' ';
-		echo OCP\Util::formatDate( $v );
-		echo ' <a href="history.php?path='.urlencode( $_['path'] ).'&revert='. $v .'" class="button">Revert</a><br /><br />';
+		echo OCP\Util::formatDate( $v['version'] );
+		echo ' <a href="history.php?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a>';
+		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
+		echo '<br /><br />';
 		
 	}
 
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 082dfbf7fd..75a0e1a213 100755
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -35,7 +35,7 @@ class Storage {
 	const DEFAULTFOLDER='versions'; 
 	const DEFAULTBLACKLIST='avi mp3 mpg mp4'; 
 	const DEFAULTMAXFILESIZE=1048576; // 10MB 
-	const DEFAULTMININTERVAL=120; // 2 min
+	const DEFAULTMININTERVAL=1; // 2 min
 	const DEFAULTMAXVERSIONS=50; 
 
 	/**
@@ -168,28 +168,65 @@ class Storage {
          * get a list of old versions of a file.
          */
         public static function getversions($filename,$count=0) {
-                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$versions=array();         
- 
-	              // fetch for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
-			sort($matches);
-			foreach($matches as $ma) {
-				$parts=explode('.v',$ma);
-				$versions[]=(end($parts));
+        
+                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+                
+			$versionsfoldername = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versions = array();         
+			
+			// fetch for old versions
+			$matches = glob( $versionsfoldername.$filename.'.v*' );
+			
+			sort( $matches );
+			
+			$i = 0;
+			
+			foreach( $matches as $ma ) {
+				
+				$i++;
+				$versions[$i]['cur'] = 0;
+				$parts = explode( '.v',$ma );
+				$versions[$i]['version'] = ( end( $parts ) );
+				
+				// if file with modified date exists, flag it in array as currently enabled version
+				$curFile['fileName'] = basename( $parts[0] );
+				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files/'.$curFile['fileName'];
+				
+				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
+				
 			}
 			
+			$versions = array_reverse( $versions );
+			
+			foreach( $versions as $key => $value ) {
+				
+				// flag the first matched file in array (which will have latest modification date) as current version
+				if ( $versions[$key]['fileMatch'] ) {
+				
+					$versions[$key]['cur'] = 1;
+					break;
+					
+				}
+			
+			}
+			
+			$versions = array_reverse( $versions );
+			
 			// only show the newest commits
-			if($count<>0 and (count($versions)>$count)) {
-				$versions=array_slice($versions,count($versions)-$count);
+			if( $count != 0 and ( count( $versions )>$count ) ) {
+			
+				$versions = array_slice( $versions, count( $versions ) - $count );
+				
 			}
 	
-			return($versions);
+			return( $versions );
 
 
-                }else{
-                        return(array());
+                } else {
+                
+			// if versioning isn't enabled then return an empty array
+                        return( array() );
+                        
                 }
         }	
 

From fefa4412c4e4bab82517cca6f92680bcf0c71c2d Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 16 May 2012 15:17:51 +0100
Subject: [PATCH 0025/1537] added phpdoc comment

---
 apps/files_versions/versions.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 75a0e1a213..89f7278dea 100755
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -165,9 +165,12 @@ class Storage {
 
         
         /**
-         * get a list of old versions of a file.
+         * @brief get a list of all available versions of a file in descending chronological order
+         * @param $filename file to find versions of, relative to the user files dir
+         * @param $count number of versions to return
+         * @returns array
          */
-        public static function getversions($filename,$count=0) {
+        public static function getversions( $filename, $count = 0 ) {
         
                 if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
                 

From 6d20fe4012f9572430f993f86eba6640d66cebbc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 14 May 2012 17:38:08 +0200
Subject: [PATCH 0026/1537] Template: Make getFormFactorExtension function
 public

---
 lib/template.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/template.php b/lib/template.php
index 57e9c15f5e..1e8b0adc75 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -163,7 +163,7 @@ class OC_Template{
 	/**
 	 * @brief Returns the formfactor extension for current formfactor
 	 */
-	protected function getFormFactorExtension()
+	static public function getFormFactorExtension()
 	{
 		$formfactor=$_SESSION['formfactor'];
 		if($formfactor=='default') { 
@@ -193,7 +193,7 @@ class OC_Template{
 		$theme=OC_Config::getValue( "theme" );
 
 		// Read the detected formfactor and use the right file name.
-		$fext = $this->getFormFactorExtension();
+		$fext = self::getFormFactorExtension();
 
 		$app = $this->application;
 		// Check if it is a app template or not.
@@ -376,7 +376,7 @@ class OC_Template{
 			$theme=OC_Config::getValue( "theme" );
 
 			// Read the detected formfactor and use the right file name.
-			$fext = $this->getFormFactorExtension();
+			$fext = self::getFormFactorExtension();
 
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){

From 2faae817f183e82975251d5023417e2f331971d3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 14 May 2012 17:38:32 +0200
Subject: [PATCH 0027/1537] Template: Fix var name

---
 lib/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template.php b/lib/template.php
index 1e8b0adc75..641c441c74 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -431,7 +431,7 @@ class OC_Template{
 				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 				}else{
-					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();
 				}
 			}

From f71fec8cdcb5d7d24b7dfa30dfaf24c5115e51c1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 14 May 2012 17:57:43 +0200
Subject: [PATCH 0028/1537] Combine and minimize core and default app css files

---
 3rdparty/mediawiki/CSSMin.php   | 229 ++++++++++++++++++++++++++++++++
 core/minimizer.php              |   5 +
 core/templates/layout.guest.php |   3 +
 core/templates/layout.user.php  |   3 +
 lib/app.php                     |   6 +
 lib/base.php                    |  12 +-
 lib/helper.php                  |   4 +-
 lib/minimizer.php               |  39 ++++++
 lib/minimizer/css.php           |  73 ++++++++++
 lib/util.php                    |   1 +
 remote.php                      |   2 +-
 11 files changed, 367 insertions(+), 10 deletions(-)
 create mode 100644 3rdparty/mediawiki/CSSMin.php
 create mode 100644 core/minimizer.php
 create mode 100644 lib/minimizer.php
 create mode 100644 lib/minimizer/css.php

diff --git a/3rdparty/mediawiki/CSSMin.php b/3rdparty/mediawiki/CSSMin.php
new file mode 100644
index 0000000000..1ee2919140
--- /dev/null
+++ b/3rdparty/mediawiki/CSSMin.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Minification of CSS stylesheets.
+ *
+ * Copyright 2010 Wikimedia Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * @file
+ * @version 0.1.1 -- 2010-09-11
+ * @author Trevor Parscal <tparscal@wikimedia.org>
+ * @copyright Copyright 2010 Wikimedia Foundation
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/**
+ * Transforms CSS data
+ *
+ * This class provides minification, URL remapping, URL extracting, and data-URL embedding.
+ */
+class CSSMin {
+
+	/* Constants */
+
+	/**
+	 * Maximum file size to still qualify for in-line embedding as a data-URI
+	 *
+	 * 24,576 is used because Internet Explorer has a 32,768 byte limit for data URIs,
+	 * which when base64 encoded will result in a 1/3 increase in size.
+	 */
+	const EMBED_SIZE_LIMIT = 24576;
+	const URL_REGEX = 'url\(\s*[\'"]?(?P<file>[^\?\)\'"]*)(?P<query>\??[^\)\'"]*)[\'"]?\s*\)';
+
+	/* Protected Static Members */
+
+	/** @var array List of common image files extensions and mime-types */
+	protected static $mimeTypes = array(
+		'gif' => 'image/gif',
+		'jpe' => 'image/jpeg',
+		'jpeg' => 'image/jpeg',
+		'jpg' => 'image/jpeg',
+		'png' => 'image/png',
+		'tif' => 'image/tiff',
+		'tiff' => 'image/tiff',
+		'xbm' => 'image/x-xbitmap',
+	);
+
+	/* Static Methods */
+
+	/**
+	 * Gets a list of local file paths which are referenced in a CSS style sheet
+	 *
+	 * @param $source string CSS data to remap
+	 * @param $path string File path where the source was read from (optional)
+	 * @return array List of local file references
+	 */
+	public static function getLocalFileReferences( $source, $path = null ) {
+		$files = array();
+		$rFlags = PREG_OFFSET_CAPTURE | PREG_SET_ORDER;
+		if ( preg_match_all( '/' . self::URL_REGEX . '/', $source, $matches, $rFlags ) ) {
+			foreach ( $matches as $match ) {
+				$file = ( isset( $path )
+					? rtrim( $path, '/' ) . '/'
+					: '' ) . "{$match['file'][0]}";
+
+				// Only proceed if we can access the file
+				if ( !is_null( $path ) && file_exists( $file ) ) {
+					$files[] = $file;
+				}
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * @param $file string
+	 * @return bool|string
+	 */
+	protected static function getMimeType( $file ) {
+		$realpath = realpath( $file );
+		// Try a couple of different ways to get the mime-type of a file, in order of
+		// preference
+		if (
+			$realpath
+			&& function_exists( 'finfo_file' )
+			&& function_exists( 'finfo_open' )
+			&& defined( 'FILEINFO_MIME_TYPE' )
+		) {
+			// As of PHP 5.3, this is how you get the mime-type of a file; it uses the Fileinfo
+			// PECL extension
+			return finfo_file( finfo_open( FILEINFO_MIME_TYPE ), $realpath );
+		} elseif ( function_exists( 'mime_content_type' ) ) {
+			// Before this was deprecated in PHP 5.3, this was how you got the mime-type of a file
+			return mime_content_type( $file );
+		} else {
+			// Worst-case scenario has happened, use the file extension to infer the mime-type
+			$ext = strtolower( pathinfo( $file, PATHINFO_EXTENSION ) );
+			if ( isset( self::$mimeTypes[$ext] ) ) {
+				return self::$mimeTypes[$ext];
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Remaps CSS URL paths and automatically embeds data URIs for URL rules
+	 * preceded by an /* @embed * / comment
+	 *
+	 * @param $source string CSS data to remap
+	 * @param $local string File path where the source was read from
+	 * @param $remote string URL path to the file
+	 * @param $embedData bool If false, never do any data URI embedding, even if / * @embed * / is found
+	 * @return string Remapped CSS data
+	 */
+	public static function remap( $source, $local, $remote, $embedData = true ) {
+		$pattern = '/((?P<embed>\s*\/\*\s*\@embed\s*\*\/)(?P<pre>[^\;\}]*))?' .
+			self::URL_REGEX . '(?P<post>[^;]*)[\;]?/';
+		$offset = 0;
+		while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) {
+			// Skip fully-qualified URLs and data URIs
+			$urlScheme = parse_url( $match['file'][0], PHP_URL_SCHEME );
+			if ( $urlScheme ) {
+				// Move the offset to the end of the match, leaving it alone
+				$offset = $match[0][1] + strlen( $match[0][0] );
+				continue;
+			}
+			// URLs with absolute paths like /w/index.php need to be expanded
+			// to absolute URLs but otherwise left alone
+			if ( $match['file'][0] !== '' && $match['file'][0][0] === '/' ) {
+				// Replace the file path with an expanded (possibly protocol-relative) URL
+				// ...but only if wfExpandUrl() is even available.
+				// This will not be the case if we're running outside of MW
+				$lengthIncrease = 0;
+				if ( function_exists( 'wfExpandUrl' ) ) {
+					$expanded = wfExpandUrl( $match['file'][0], PROTO_RELATIVE );
+					$origLength = strlen( $match['file'][0] );
+					$lengthIncrease = strlen( $expanded ) - $origLength;
+					$source = substr_replace( $source, $expanded,
+						$match['file'][1], $origLength
+					);
+				}
+				// Move the offset to the end of the match, leaving it alone
+				$offset = $match[0][1] + strlen( $match[0][0] ) + $lengthIncrease;
+				continue;
+			}
+			// Shortcuts
+			$embed = $match['embed'][0];
+			$pre = $match['pre'][0];
+			$post = $match['post'][0];
+			$query = $match['query'][0];
+			$url = "{$remote}/{$match['file'][0]}";
+			$file = "{$local}/{$match['file'][0]}";
+			// bug 27052 - Guard against double slashes, because foo//../bar
+			// apparently resolves to foo/bar on (some?) clients
+			$url = preg_replace( '#([^:])//+#', '\1/', $url );
+			$replacement = false;
+			if ( $local !== false && file_exists( $file ) ) {
+				// Add version parameter as a time-stamp in ISO 8601 format,
+				// using Z for the timezone, meaning GMT
+				$url .= '?' . gmdate( 'Y-m-d\TH:i:s\Z', round( filemtime( $file ), -2 ) );
+				// Embedding requires a bit of extra processing, so let's skip that if we can
+				if ( $embedData && $embed ) {
+					$type = self::getMimeType( $file );
+					// Detect when URLs were preceeded with embed tags, and also verify file size is
+					// below the limit
+			var_dump($match['embed'], $file, filesize($file));
+					if (
+						$type
+						&& $match['embed'][1] > 0
+						&& filesize( $file ) < self::EMBED_SIZE_LIMIT
+					) {
+						// Strip off any trailing = symbols (makes browsers freak out)
+						$data = base64_encode( file_get_contents( $file ) );
+						// Build 2 CSS properties; one which uses a base64 encoded data URI in place
+						// of the @embed comment to try and retain line-number integrity, and the
+						// other with a remapped an versioned URL and an Internet Explorer hack
+						// making it ignored in all browsers that support data URIs
+						$replacement = "{$pre}url(data:{$type};base64,{$data}){$post};";
+						$replacement .= "{$pre}url({$url}){$post}!ie;";
+					}
+				}
+				if ( $replacement === false ) {
+					// Assume that all paths are relative to $remote, and make them absolute
+					$replacement = "{$embed}{$pre}url({$url}){$post};";
+				}
+			} elseif ( $local === false ) {
+				// Assume that all paths are relative to $remote, and make them absolute
+				$replacement = "{$embed}{$pre}url({$url}{$query}){$post};";
+			}
+			if ( $replacement !== false ) {
+				// Perform replacement on the source
+				$source = substr_replace(
+					$source, $replacement, $match[0][1], strlen( $match[0][0] )
+				);
+				// Move the offset to the end of the replacement in the source
+				$offset = $match[0][1] + strlen( $replacement );
+				continue;
+			}
+			// Move the offset to the end of the match, leaving it alone
+			$offset = $match[0][1] + strlen( $match[0][0] );
+		}
+		return $source;
+	}
+
+	/**
+	 * Removes whitespace from CSS data
+	 *
+	 * @param $css string CSS data to minify
+	 * @return string Minified CSS data
+	 */
+	public static function minify( $css ) {
+		return trim(
+			str_replace(
+				array( '; ', ': ', ' {', '{ ', ', ', '} ', ';}' ),
+				array( ';', ':', '{', '{', ',', '}', '}' ),
+				preg_replace( array( '/\s+/', '/\/\*.*?\*\//s' ), array( ' ', '' ), $css )
+			)
+		);
+	}
+}
diff --git a/core/minimizer.php b/core/minimizer.php
new file mode 100644
index 0000000000..e4e6ff50e6
--- /dev/null
+++ b/core/minimizer.php
@@ -0,0 +1,5 @@
+<?php
+
+$minimizer = new OC_Minimizer_CSS();
+$files = $minimizer->findFiles(OC_Util::$core_styles);
+$minimizer->output($files);
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 86f46d9c7e..37a74f4696 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,6 +4,9 @@
 		<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 (!defined('DEBUG') || !DEBUG): ?>
+		<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; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b832ac2636..e6fa910ce0 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,6 +4,9 @@
 		<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 (!defined('DEBUG') || !DEBUG): ?>
+		<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; ?>
diff --git a/lib/app.php b/lib/app.php
index f274194b25..39e90ada01 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -73,6 +73,12 @@ class OC_App{
 
 		self::$init = true;
 
+		if (!defined('DEBUG') || !DEBUG){
+			if (is_null($types)) {
+				OC_Util::$core_styles = OC_Util::$styles;
+				OC_Util::$styles = array();
+			}
+		}
 		// return
 		return true;
 	}
diff --git a/lib/base.php b/lib/base.php
index f01e1f5be6..673a47ba45 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -230,6 +230,8 @@ class OC{
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			}
 
+			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+
 			OC_App::updateApps();
 		}
 	}
@@ -278,13 +280,9 @@ class OC{
 	public static function loadfile(){
 		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){
 			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
-				$appswebroot = (string) OC::$APPSWEBROOT;
-				$webroot = (string) OC::$WEBROOT;
-				$cssfile = file_get_contents(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
-				$cssfile = str_replace('%appswebroot%', $appswebroot, $cssfile);
-				$cssfile = str_replace('%webroot%', $webroot, $cssfile);
-				header('Content-Type: text/css');
-				echo $cssfile;
+				$file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
+				$minimizer = new OC_Minimizer_CSS();
+				$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)));
 				exit;
 			}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
 				require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
diff --git a/lib/helper.php b/lib/helper.php
index 31819d2e3f..41ff119ff5 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -112,8 +112,8 @@ class OC_Helper {
 	 *
 	 * Returns a absolute url to the given service.
 	 */
-	public static function linkToRemote( $service ) {
-		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . '/';
+	public static function linkToRemote( $service, $add_slash = true ) {
+		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . ($add_slash?'/':'');
 	}
 
 	/**
diff --git a/lib/minimizer.php b/lib/minimizer.php
new file mode 100644
index 0000000000..2d2708c59e
--- /dev/null
+++ b/lib/minimizer.php
@@ -0,0 +1,39 @@
+<?php
+
+abstract class OC_Minimizer
+{
+	protected $files = array();
+
+	protected function appendIfExist($root, $webroot, $file) {
+                if (is_file($root.'/'.$file)) {
+			$this->files[] = array($root, $webroot, $file);
+                        return true;
+                }
+                return false;
+	}
+
+	public function getLastModified($files) {
+		$last_modified = 0;
+		foreach($files as $file_info) {
+			$file = $file_info[0] . '/' . $file_info[2];
+			$filemtime = filemtime($file);
+			if ($filemtime > $last_modified) {
+				$last_modified = $filemtime;
+			}
+		}
+		return $last_modified;
+	}
+
+	abstract public function minimizeFiles($files);
+
+	public function output($files) {
+		header('Content-Type: '.$this->contentType);
+		OC_Response::enableCaching();
+		$last_modified = $this->getLastModified($files);
+		OC_Response::setLastModifiedHeader($last_modified);
+
+		$out = $this->minimizeFiles($files);
+		header('Content-Length: '.strlen($out));
+		echo $out;
+	}
+}
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
new file mode 100644
index 0000000000..3d1196390e
--- /dev/null
+++ b/lib/minimizer/css.php
@@ -0,0 +1,73 @@
+<?php
+
+require_once('mediawiki/CSSMin.php');
+
+class OC_Minimizer_CSS extends OC_Minimizer
+{
+	protected $contentType = 'text/css';
+
+	public function findFiles($styles) {
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( "theme" );
+
+		// Read the detected formfactor and use the right file name.
+		$fext = OC_Template::getFormFactorExtension();
+		foreach($styles as $style){
+			// is it in 3rdparty?
+			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
+
+			// or in apps?
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
+
+			// or in the owncloud root?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
+
+			// or in core ?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
+
+			}else{
+				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+				die();
+			}
+		}
+		// Add the theme css files. you can override the default values here
+		if(!empty($theme)) {
+			foreach($styles as $style){
+				     if($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
+
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
+
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
+				}
+			}
+		}
+		return $this->files;
+	}
+
+	public function minimizeFiles($files) {
+		$css_out = '';
+		$appswebroot = (string) OC::$APPSWEBROOT;
+		$webroot = (string) OC::$WEBROOT;
+		foreach($files as $file_info) {
+			$file = $file_info[0] . '/' . $file_info[2];
+			$css_out .= '/* ' . $file . ' */' . "\n";
+			$css = file_get_contents($file);
+			if (strpos($file, OC::$APPSROOT) == 0) {
+				$css = str_replace('%appswebroot%', $appswebroot, $css);
+				$css = str_replace('%webroot%', $webroot, $css);
+			}
+			$remote = $file_info[1];
+			$remote .= '../';
+			$remote .= dirname($file_info[2]);
+			$css_out .= CSSMin::remap($css, dirname($file), $remote, true);
+		}
+		$css_out = CSSMin::minify($css_out);
+		return $css_out;
+	}
+}
diff --git a/lib/util.php b/lib/util.php
index ff11799871..c7a5a9cfd6 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -10,6 +10,7 @@ class OC_Util {
 	public static $headers=array();
 	private static $rootMounted=false;
 	private static $fsSetup=false;
+	public static $core_styles=array();
 
 	// Can be set up
 	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
diff --git a/remote.php b/remote.php
index 2a7ab167d0..7b36b31d80 100644
--- a/remote.php
+++ b/remote.php
@@ -7,7 +7,7 @@ if (!$pos = strpos($path_info, '/', 1)) {
 	$pos = strlen($path_info);
 }
 $service=substr($path_info, 1, $pos-1);
-$file = OCP\CONFIG::getAppValue('core', 'remote_' . $service);
+$file = OC_AppConfig::getValue('core', 'remote_' . $service);
 if(is_null($file)){
 	header('HTTP/1.0 404 Not Found');
 	exit;

From ce1e4425c2fc96f581428207edab040e42387bbc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 14 May 2012 23:15:53 +0200
Subject: [PATCH 0029/1537] Combine and minimize core and default app js files

---
 3rdparty/mediawiki/JavaScriptMinifier.php | 606 ++++++++++++++++++++++
 core/minimizer.php                        |  13 +-
 core/templates/layout.guest.php           |   3 +
 core/templates/layout.user.php            |   3 +
 lib/app.php                               |   2 +
 lib/base.php                              |   1 +
 lib/minimizer/js.php                      |  62 +++
 lib/util.php                              |   1 +
 8 files changed, 688 insertions(+), 3 deletions(-)
 create mode 100644 3rdparty/mediawiki/JavaScriptMinifier.php
 create mode 100644 lib/minimizer/js.php

diff --git a/3rdparty/mediawiki/JavaScriptMinifier.php b/3rdparty/mediawiki/JavaScriptMinifier.php
new file mode 100644
index 0000000000..db5326c7cf
--- /dev/null
+++ b/3rdparty/mediawiki/JavaScriptMinifier.php
@@ -0,0 +1,606 @@
+<?php
+/**
+ * JavaScript Minifier
+ *
+ * @file
+ * @author Paul Copperman <paul.copperman@gmail.com>
+ * @license Choose any of Apache, MIT, GPL, LGPL
+ */
+
+/**
+ * This class is meant to safely minify javascript code, while leaving syntactically correct
+ * programs intact. Other libraries, such as JSMin require a certain coding style to work
+ * correctly. OTOH, libraries like jsminplus, that do parse the code correctly are rather
+ * slow, because they construct a complete parse tree before outputting the code minified.
+ * So this class is meant to allow arbitrary (but syntactically correct) input, while being
+ * fast enough to be used for on-the-fly minifying.
+ */
+class JavaScriptMinifier {
+
+	/* Class constants */
+	/* Parsing states.
+	 * The state machine is only necessary to decide whether to parse a slash as division
+	 * operator or as regexp literal.
+	 * States are named after the next expected item. We only distinguish states when the
+	 * distinction is relevant for our purpose.
+	 */
+	const STATEMENT                = 0;
+	const CONDITION                = 1;
+	const PROPERTY_ASSIGNMENT      = 2;
+	const EXPRESSION               = 3;
+	const EXPRESSION_NO_NL         = 4; // only relevant for semicolon insertion
+	const EXPRESSION_OP            = 5;
+	const EXPRESSION_FUNC          = 6;
+	const EXPRESSION_TERNARY       = 7; // used to determine the role of a colon
+	const EXPRESSION_TERNARY_OP    = 8;
+	const EXPRESSION_TERNARY_FUNC  = 9;
+	const PAREN_EXPRESSION         = 10; // expression which is not on the top level
+	const PAREN_EXPRESSION_OP      = 11;
+	const PAREN_EXPRESSION_FUNC    = 12;
+	const PROPERTY_EXPRESSION      = 13; // expression which is within an object literal
+	const PROPERTY_EXPRESSION_OP   = 14;
+	const PROPERTY_EXPRESSION_FUNC = 15;
+
+	/* Token types */
+	const TYPE_UN_OP       = 1; // unary operators
+	const TYPE_INCR_OP     = 2; // ++ and --
+	const TYPE_BIN_OP      = 3; // binary operators
+	const TYPE_ADD_OP      = 4; // + and - which can be either unary or binary ops
+	const TYPE_HOOK        = 5; // ?
+	const TYPE_COLON       = 6; // :
+	const TYPE_COMMA       = 7; // ,
+	const TYPE_SEMICOLON   = 8; // ;
+	const TYPE_BRACE_OPEN  = 9; // {
+	const TYPE_BRACE_CLOSE = 10; // }
+	const TYPE_PAREN_OPEN  = 11; // ( and [
+	const TYPE_PAREN_CLOSE = 12; // ) and ]
+	const TYPE_RETURN      = 13; // keywords: break, continue, return, throw
+	const TYPE_IF          = 14; // keywords: catch, for, with, switch, while, if
+	const TYPE_DO          = 15; // keywords: case, var, finally, else, do, try
+	const TYPE_FUNC        = 16; // keywords: function
+	const TYPE_LITERAL     = 17; // all literals, identifiers and unrecognised tokens
+
+	// Sanity limit to avoid excessive memory usage
+	const STACK_LIMIT = 1000;
+
+	/* Static functions */
+
+	/**
+	 * Returns minified JavaScript code.
+	 *
+	 * NOTE: $maxLineLength isn't a strict maximum. Longer lines will be produced when
+	 *       literals (e.g. quoted strings) longer than $maxLineLength are encountered
+	 *       or when required to guard against semicolon insertion.
+	 *
+	 * @param $s String JavaScript code to minify
+	 * @param $statementsOnOwnLine Bool Whether to put each statement on its own line
+	 * @param $maxLineLength Int Maximum length of a single line, or -1 for no maximum.
+	 * @return String Minified code
+	 */
+	public static function minify( $s, $statementsOnOwnLine = false, $maxLineLength = 1000 ) {
+		// First we declare a few tables that contain our parsing rules
+
+		// $opChars : characters, which can be combined without whitespace in between them
+		$opChars = array(
+			'!' => true,
+			'"' => true,
+			'%' => true,
+			'&' => true,
+			"'" => true,
+			'(' => true,
+			')' => true,
+			'*' => true,
+			'+' => true,
+			',' => true,
+			'-' => true,
+			'.' => true,
+			'/' => true,
+			':' => true,
+			';' => true,
+			'<' => true,
+			'=' => true,
+			'>' => true,
+			'?' => true,
+			'[' => true,
+			']' => true,
+			'^' => true,
+			'{' => true,
+			'|' => true,
+			'}' => true,
+			'~' => true
+		);
+
+		// $tokenTypes : maps keywords and operators to their corresponding token type
+		$tokenTypes = array(
+			'!'          => self::TYPE_UN_OP,
+			'~'          => self::TYPE_UN_OP,
+			'delete'     => self::TYPE_UN_OP,
+			'new'        => self::TYPE_UN_OP,
+			'typeof'     => self::TYPE_UN_OP,
+			'void'       => self::TYPE_UN_OP,
+			'++'         => self::TYPE_INCR_OP,
+			'--'         => self::TYPE_INCR_OP,
+			'!='         => self::TYPE_BIN_OP,
+			'!=='        => self::TYPE_BIN_OP,
+			'%'          => self::TYPE_BIN_OP,
+			'%='         => self::TYPE_BIN_OP,
+			'&'          => self::TYPE_BIN_OP,
+			'&&'         => self::TYPE_BIN_OP,
+			'&='         => self::TYPE_BIN_OP,
+			'*'          => self::TYPE_BIN_OP,
+			'*='         => self::TYPE_BIN_OP,
+			'+='         => self::TYPE_BIN_OP,
+			'-='         => self::TYPE_BIN_OP,
+			'.'          => self::TYPE_BIN_OP,
+			'/'          => self::TYPE_BIN_OP,
+			'/='         => self::TYPE_BIN_OP,
+			'<'          => self::TYPE_BIN_OP,
+			'<<'         => self::TYPE_BIN_OP,
+			'<<='        => self::TYPE_BIN_OP,
+			'<='         => self::TYPE_BIN_OP,
+			'='          => self::TYPE_BIN_OP,
+			'=='         => self::TYPE_BIN_OP,
+			'==='        => self::TYPE_BIN_OP,
+			'>'          => self::TYPE_BIN_OP,
+			'>='         => self::TYPE_BIN_OP,
+			'>>'         => self::TYPE_BIN_OP,
+			'>>='        => self::TYPE_BIN_OP,
+			'>>>'        => self::TYPE_BIN_OP,
+			'>>>='       => self::TYPE_BIN_OP,
+			'^'          => self::TYPE_BIN_OP,
+			'^='         => self::TYPE_BIN_OP,
+			'|'          => self::TYPE_BIN_OP,
+			'|='         => self::TYPE_BIN_OP,
+			'||'         => self::TYPE_BIN_OP,
+			'in'         => self::TYPE_BIN_OP,
+			'instanceof' => self::TYPE_BIN_OP,
+			'+'          => self::TYPE_ADD_OP,
+			'-'          => self::TYPE_ADD_OP,
+			'?'          => self::TYPE_HOOK,
+			':'          => self::TYPE_COLON,
+			','          => self::TYPE_COMMA,
+			';'          => self::TYPE_SEMICOLON,
+			'{'          => self::TYPE_BRACE_OPEN,
+			'}'          => self::TYPE_BRACE_CLOSE,
+			'('          => self::TYPE_PAREN_OPEN,
+			'['          => self::TYPE_PAREN_OPEN,
+			')'          => self::TYPE_PAREN_CLOSE,
+			']'          => self::TYPE_PAREN_CLOSE,
+			'break'      => self::TYPE_RETURN,
+			'continue'   => self::TYPE_RETURN,
+			'return'     => self::TYPE_RETURN,
+			'throw'      => self::TYPE_RETURN,
+			'catch'      => self::TYPE_IF,
+			'for'        => self::TYPE_IF,
+			'if'         => self::TYPE_IF,
+			'switch'     => self::TYPE_IF,
+			'while'      => self::TYPE_IF,
+			'with'       => self::TYPE_IF,
+			'case'       => self::TYPE_DO,
+			'do'         => self::TYPE_DO,
+			'else'       => self::TYPE_DO,
+			'finally'    => self::TYPE_DO,
+			'try'        => self::TYPE_DO,
+			'var'        => self::TYPE_DO,
+			'function'   => self::TYPE_FUNC
+		);
+
+		// $goto : This is the main table for our state machine. For every state/token pair
+		//         the following state is defined. When no rule exists for a given pair,
+		//         the state is left unchanged.
+		$goto = array(
+			self::STATEMENT => array(
+				self::TYPE_UN_OP      => self::EXPRESSION,
+				self::TYPE_INCR_OP    => self::EXPRESSION,
+				self::TYPE_ADD_OP     => self::EXPRESSION,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_RETURN     => self::EXPRESSION_NO_NL,
+				self::TYPE_IF         => self::CONDITION,
+				self::TYPE_FUNC       => self::CONDITION,
+				self::TYPE_LITERAL    => self::EXPRESSION_OP
+			),
+			self::CONDITION => array(
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::PROPERTY_ASSIGNMENT => array(
+				self::TYPE_COLON      => self::PROPERTY_EXPRESSION,
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::EXPRESSION => array(
+				self::TYPE_SEMICOLON  => self::STATEMENT,
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_NO_NL => array(
+				self::TYPE_SEMICOLON  => self::STATEMENT,
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_OP => array(
+				self::TYPE_BIN_OP     => self::EXPRESSION,
+				self::TYPE_ADD_OP     => self::EXPRESSION,
+				self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+				self::TYPE_COLON      => self::STATEMENT,
+				self::TYPE_COMMA      => self::EXPRESSION,
+				self::TYPE_SEMICOLON  => self::STATEMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::EXPRESSION_TERNARY => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::EXPRESSION_TERNARY_FUNC,
+				self::TYPE_LITERAL    => self::EXPRESSION_TERNARY_OP
+			),
+			self::EXPRESSION_TERNARY_OP => array(
+				self::TYPE_BIN_OP     => self::EXPRESSION_TERNARY,
+				self::TYPE_ADD_OP     => self::EXPRESSION_TERNARY,
+				self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+				self::TYPE_COMMA      => self::EXPRESSION_TERNARY,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::EXPRESSION_TERNARY_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::PAREN_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::PAREN_EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::PAREN_EXPRESSION_OP
+			),
+			self::PAREN_EXPRESSION_OP => array(
+				self::TYPE_BIN_OP     => self::PAREN_EXPRESSION,
+				self::TYPE_ADD_OP     => self::PAREN_EXPRESSION,
+				self::TYPE_HOOK       => self::PAREN_EXPRESSION,
+				self::TYPE_COLON      => self::PAREN_EXPRESSION,
+				self::TYPE_COMMA      => self::PAREN_EXPRESSION,
+				self::TYPE_SEMICOLON  => self::PAREN_EXPRESSION,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::PAREN_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::PROPERTY_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::PROPERTY_EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::PROPERTY_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION_OP => array(
+				self::TYPE_BIN_OP     => self::PROPERTY_EXPRESSION,
+				self::TYPE_ADD_OP     => self::PROPERTY_EXPRESSION,
+				self::TYPE_HOOK       => self::PROPERTY_EXPRESSION,
+				self::TYPE_COMMA      => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::PROPERTY_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			)
+		);
+
+		// $push : This table contains the rules for when to push a state onto the stack.
+		//         The pushed state is the state to return to when the corresponding
+		//         closing token is found
+		$push = array(
+			self::STATEMENT => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::CONDITION => array(
+				self::TYPE_PAREN_OPEN => self::STATEMENT
+			),
+			self::PROPERTY_ASSIGNMENT => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT
+			),
+			self::EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_NO_NL => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_OP => array(
+				self::TYPE_HOOK       => self::EXPRESSION,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_TERNARY => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
+			),
+			self::EXPRESSION_TERNARY_OP => array(
+				self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
+			),
+			self::EXPRESSION_TERNARY_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP
+			),
+			self::PAREN_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
+			),
+			self::PAREN_EXPRESSION_OP => array(
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
+			),
+			self::PAREN_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION_OP => array(
+				self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP
+			)
+		);
+
+		// $pop : Rules for when to pop a state from the stack
+		$pop = array(
+			self::STATEMENT              => array( self::TYPE_BRACE_CLOSE => true ),
+			self::PROPERTY_ASSIGNMENT    => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION             => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION_NO_NL       => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION_OP          => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION_TERNARY_OP  => array( self::TYPE_COLON       => true ),
+			self::PAREN_EXPRESSION       => array( self::TYPE_PAREN_CLOSE => true ),
+			self::PAREN_EXPRESSION_OP    => array( self::TYPE_PAREN_CLOSE => true ),
+			self::PROPERTY_EXPRESSION    => array( self::TYPE_BRACE_CLOSE => true ),
+			self::PROPERTY_EXPRESSION_OP => array( self::TYPE_BRACE_CLOSE => true )
+		);
+
+		// $semicolon : Rules for when a semicolon insertion is appropriate
+		$semicolon = array(
+			self::EXPRESSION_NO_NL => array(
+				self::TYPE_UN_OP      => true,
+				self::TYPE_INCR_OP    => true,
+				self::TYPE_ADD_OP     => true,
+				self::TYPE_BRACE_OPEN => true,
+				self::TYPE_PAREN_OPEN => true,
+				self::TYPE_RETURN     => true,
+				self::TYPE_IF         => true,
+				self::TYPE_DO         => true,
+				self::TYPE_FUNC       => true,
+				self::TYPE_LITERAL    => true
+			),
+			self::EXPRESSION_OP => array(
+				self::TYPE_UN_OP      => true,
+				self::TYPE_INCR_OP    => true,
+				self::TYPE_BRACE_OPEN => true,
+				self::TYPE_RETURN     => true,
+				self::TYPE_IF         => true,
+				self::TYPE_DO         => true,
+				self::TYPE_FUNC       => true,
+				self::TYPE_LITERAL    => true
+			)
+		);
+
+		// Rules for when newlines should be inserted if
+		// $statementsOnOwnLine is enabled.
+		// $newlineBefore is checked before switching state,
+		// $newlineAfter is checked after
+		$newlineBefore = array(
+			self::STATEMENT => array(
+				self::TYPE_BRACE_CLOSE => true,
+			),
+		);
+		$newlineAfter = array(
+			self::STATEMENT => array(
+				self::TYPE_BRACE_OPEN => true,
+				self::TYPE_PAREN_CLOSE => true,
+				self::TYPE_SEMICOLON => true,
+			),
+		);
+
+		// $divStates : Contains all states that can be followed by a division operator
+		$divStates = array(
+			self::EXPRESSION_OP          => true,
+			self::EXPRESSION_TERNARY_OP  => true,
+			self::PAREN_EXPRESSION_OP    => true,
+			self::PROPERTY_EXPRESSION_OP => true
+		);
+
+		// Here's where the minifying takes place: Loop through the input, looking for tokens
+		// and output them to $out, taking actions to the above defined rules when appropriate.
+		$out = '';
+		$pos = 0;
+		$length = strlen( $s );
+		$lineLength = 0;
+		$newlineFound = true;
+		$state = self::STATEMENT;
+		$stack = array();
+		$last = ';'; // Pretend that we have seen a semicolon yet
+		while( $pos < $length ) {
+			// First, skip over any whitespace and multiline comments, recording whether we
+			// found any newline character
+			$skip = strspn( $s, " \t\n\r\xb\xc", $pos );
+			if( !$skip ) {
+				$ch = $s[$pos];
+				if( $ch === '/' && substr( $s, $pos, 2 ) === '/*' ) {
+					// Multiline comment. Search for the end token or EOT.
+					$end = strpos( $s, '*/', $pos + 2 );
+					$skip = $end === false ? $length - $pos : $end - $pos + 2;
+				}
+			}
+			if( $skip ) {
+				// The semicolon insertion mechanism needs to know whether there was a newline
+				// between two tokens, so record it now.
+				if( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip ) {
+					$newlineFound = true;
+				}
+				$pos += $skip;
+				continue;
+			}
+			// Handle C++-style comments and html comments, which are treated as single line
+			// comments by the browser, regardless of whether the end tag is on the same line.
+			// Handle --> the same way, but only if it's at the beginning of the line
+			if( ( $ch === '/' && substr( $s, $pos, 2 ) === '//' )
+				|| ( $ch === '<' && substr( $s, $pos, 4 ) === '<!--' )
+				|| ( $ch === '-' && $newlineFound && substr( $s, $pos, 3 ) === '-->' )
+			) {
+				$pos += strcspn( $s, "\r\n", $pos );
+				continue;
+			}
+
+			// Find out which kind of token we're handling. $end will point past the end of it.
+			$end = $pos + 1;
+			// Handle string literals
+			if( $ch === "'" || $ch === '"' ) {
+				// Search to the end of the string literal, skipping over backslash escapes
+				$search = $ch . '\\';
+				do{
+					$end += strcspn( $s, $search, $end ) + 2;
+				} while( $end - 2 < $length && $s[$end - 2] === '\\' );
+				$end--;
+			// We have to distinguish between regexp literals and division operators
+			// A division operator is only possible in certain states
+			} elseif( $ch === '/' && !isset( $divStates[$state] ) ) {
+				// Regexp literal, search to the end, skipping over backslash escapes and
+				// character classes
+				for( ; ; ) {
+					do{
+						$end += strcspn( $s, '/[\\', $end ) + 2;
+					} while( $end - 2 < $length && $s[$end - 2] === '\\' );
+					$end--;
+					if( $end - 1 >= $length || $s[$end - 1] === '/' ) {
+						break;
+					}
+					do{
+						$end += strcspn( $s, ']\\', $end ) + 2;
+					} while( $end - 2 < $length && $s[$end - 2] === '\\' );
+					$end--;
+				};
+				// Search past the regexp modifiers (gi)
+				while( $end < $length && ctype_alpha( $s[$end] ) ) {
+					$end++;
+				}
+			} elseif(
+				$ch === '0'
+				&& ($pos + 1 < $length) && ($s[$pos + 1] === 'x' || $s[$pos + 1] === 'X' )
+			) {
+				// Hex numeric literal
+				$end++; // x or X
+				$len = strspn( $s, '0123456789ABCDEFabcdef', $end );
+				if ( !$len ) {
+					return self::parseError($s, $pos, 'Expected a hexadecimal number but found ' . substr( $s, $pos, 5 ) . '...' );
+				}
+				$end += $len;
+			} elseif(
+				ctype_digit( $ch )
+				|| ( $ch === '.' && $pos + 1 < $length && ctype_digit( $s[$pos + 1] ) )
+			) {
+				$end += strspn( $s, '0123456789', $end );
+				$decimal = strspn( $s, '.', $end );
+				if ($decimal) {
+					if ( $decimal > 2 ) {
+						return self::parseError($s, $end, 'The number has too many decimal points' );
+					}
+					$end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
+				}
+				$exponent = strspn( $s, 'eE', $end );
+				if( $exponent ) {
+					if ( $exponent > 1 ) {
+						return self::parseError($s, $end, 'Number with several E' );
+					}
+					$end++;
+
+					// + sign is optional; - sign is required.
+					$end += strspn( $s, '-+', $end );
+					$len = strspn( $s, '0123456789', $end );
+					if ( !$len ) {
+						return self::parseError($s, $pos, 'No decimal digits after e, how many zeroes should be added?' );
+					}
+					$end += $len;
+				}
+			} elseif( isset( $opChars[$ch] ) ) {
+				// Punctuation character. Search for the longest matching operator.
+				while(
+					$end < $length
+					&& isset( $tokenTypes[substr( $s, $pos, $end - $pos + 1 )] )
+				) {
+					$end++;
+				}
+			} else {
+				// Identifier or reserved word. Search for the end by excluding whitespace and
+				// punctuation.
+				$end += strcspn( $s, " \t\n.;,=<>+-{}()[]?:*/%'\"!&|^~\xb\xc\r", $end );
+			}
+
+			// Now get the token type from our type array
+			$token = substr( $s, $pos, $end - $pos ); // so $end - $pos == strlen( $token )
+			$type = isset( $tokenTypes[$token] ) ? $tokenTypes[$token] : self::TYPE_LITERAL;
+
+			if( $newlineFound && isset( $semicolon[$state][$type] ) ) {
+				// This token triggers the semicolon insertion mechanism of javascript. While we
+				// could add the ; token here ourselves, keeping the newline has a few advantages.
+				$out .= "\n";
+				$state = self::STATEMENT;
+				$lineLength = 0;
+			} elseif( $maxLineLength > 0 && $lineLength + $end - $pos > $maxLineLength &&
+					!isset( $semicolon[$state][$type] ) && $type !== self::TYPE_INCR_OP )
+			{
+				// This line would get too long if we added $token, so add a newline first.
+				// Only do this if it won't trigger semicolon insertion and if it won't
+				// put a postfix increment operator on its own line, which is illegal in js.
+				$out .= "\n";
+				$lineLength = 0;
+			// Check, whether we have to separate the token from the last one with whitespace
+			} elseif( !isset( $opChars[$last] ) && !isset( $opChars[$ch] ) ) {
+				$out .= ' ';
+				$lineLength++;
+			// Don't accidentally create ++, -- or // tokens
+			} elseif( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) ) {
+				$out .= ' ';
+				$lineLength++;
+			}
+
+			$out .= $token;
+			$lineLength += $end - $pos; // += strlen( $token )
+			$last = $s[$end - 1];
+			$pos = $end;
+			$newlineFound = false;
+
+			// Output a newline after the token if required
+			// This is checked before AND after switching state
+			$newlineAdded = false;
+			if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineBefore[$state][$type] ) ) {
+				$out .= "\n";
+				$lineLength = 0;
+				$newlineAdded = true;
+			}
+
+			// Now that we have output our token, transition into the new state.
+			if( isset( $push[$state][$type] ) && count( $stack ) < self::STACK_LIMIT ) {
+				$stack[] = $push[$state][$type];
+			}
+			if( $stack && isset( $pop[$state][$type] ) ) {
+				$state = array_pop( $stack );
+			} elseif( isset( $goto[$state][$type] ) ) {
+				$state = $goto[$state][$type];
+			}
+
+			// Check for newline insertion again
+			if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineAfter[$state][$type] ) ) {
+				$out .= "\n";
+				$lineLength = 0;
+			}
+		}
+		return $out;
+	}
+
+	static function parseError($fullJavascript, $position, $errorMsg) {
+		// TODO: Handle the error: trigger_error, throw exception, return false...
+		return false;
+	}
+}
diff --git a/core/minimizer.php b/core/minimizer.php
index e4e6ff50e6..e570305302 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -1,5 +1,12 @@
 <?php
 
-$minimizer = new OC_Minimizer_CSS();
-$files = $minimizer->findFiles(OC_Util::$core_styles);
-$minimizer->output($files);
+if ($service == 'core.css'){
+	$minimizer = new OC_Minimizer_CSS();
+	$files = $minimizer->findFiles(OC_Util::$core_styles);
+	$minimizer->output($files);
+}
+else if ($service == 'core.js'){
+	$minimizer = new OC_Minimizer_JS();
+	$files = $minimizer->findFiles(OC_Util::$core_scripts);
+	$minimizer->output($files);
+}
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 37a74f4696..84422a10b1 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -15,6 +15,9 @@
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 		</script>
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<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 e6fa910ce0..03b07c0728 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -15,6 +15,9 @@
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<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/lib/app.php b/lib/app.php
index 39e90ada01..8bd095d8c6 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -75,6 +75,8 @@ class OC_App{
 
 		if (!defined('DEBUG') || !DEBUG){
 			if (is_null($types)) {
+				OC_Util::$core_scripts = OC_Util::$scripts;
+				OC_Util::$scripts = array();
 				OC_Util::$core_styles = OC_Util::$styles;
 				OC_Util::$styles = array();
 			}
diff --git a/lib/base.php b/lib/base.php
index 673a47ba45..1b3554a42a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -231,6 +231,7 @@ class OC{
 			}
 
 			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
 
 			OC_App::updateApps();
 		}
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
new file mode 100644
index 0000000000..4ddaa79d81
--- /dev/null
+++ b/lib/minimizer/js.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once('mediawiki/JavaScriptMinifier.php');
+
+class OC_Minimizer_JS extends OC_Minimizer
+{
+	protected $contentType = 'application/javascript';
+
+	public function findFiles($scripts) {
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( "theme" );
+
+		// Read the detected formfactor and use the right file name.
+		$fext = OC_Template::getFormFactorExtension();
+		// Add the core js files or the js files provided by the selected theme
+		foreach($scripts as $script){
+			// Is it in 3rd party?
+			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+
+			// Is it in apps and overwritten by the theme?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
+
+			// Is it part of an app?
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
+
+			// Is it in the owncloud root but overwritten by the theme?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
+
+			// Is it in the owncloud root ?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
+
+			// Is in core but overwritten by a theme?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
+
+			// Is it in core?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
+
+			}else{
+				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+				die();
+			}
+		}
+		return $this->files;
+	}
+
+	public function minimizeFiles($files) {
+		$js_out = '';
+		foreach($files as $file_info) {
+			$file = $file_info[0] . '/' . $file_info[2];
+			$js_out .= '/* ' . $file . ' */' . "\n";
+			$js_out .= file_get_contents($file);
+		}
+		$js_out = JavaScriptMinifier::minify($js_out);
+		return $js_out;
+	}
+}
diff --git a/lib/util.php b/lib/util.php
index c7a5a9cfd6..95b5f8df3d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -11,6 +11,7 @@ class OC_Util {
 	private static $rootMounted=false;
 	private static $fsSetup=false;
 	public static $core_styles=array();
+	public static $core_scripts=array();
 
 	// Can be set up
 	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration

From c645a7d0f86baf2baf9777c9350c8cfd8a907084 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 15 May 2012 17:25:11 +0200
Subject: [PATCH 0030/1537] Fix empty jsfiles and cssfiles in layout template

---
 lib/template.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/template.php b/lib/template.php
index 641c441c74..b5805f0096 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -378,6 +378,7 @@ class OC_Template{
 			// Read the detected formfactor and use the right file name.
 			$fext = self::getFormFactorExtension();
 
+			$page->assign('jsfiles', array());
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
 				// Is it in 3rd party?
@@ -414,6 +415,7 @@ class OC_Template{
 				}
 			}
 			// Add the css files
+			$page->assign('cssfiles', array());
 			foreach(OC_Util::$styles as $style){
 				// is it in 3rdparty?
                                 if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {

From 9acd1065b0b96f5e82444e98273cc613872a8e28 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 16 May 2012 18:30:26 +0100
Subject: [PATCH 0031/1537] made initial testing version of expireAll for
 version control \ngave some old vars new camelcase names

---
 apps/files_versions/ajax/getVersions.php |   2 +-
 apps/files_versions/history.php          |   2 +-
 apps/files_versions/js/versions.js       |   4 +-
 apps/files_versions/versions.php         | 118 +++++++++++++++++------
 lib/filesystem.php                       |   4 +-
 5 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 8ef17d5a25..5debb68589 100755
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -13,7 +13,7 @@ $source = strip_tags( $source );
 if( OCA_Versions\Storage::isversioned( $source ) ) {
 
 	$count=5; //show the newest revisions
-	$versions = OCA_Versions\Storage::getversions( $source, $count);
+	$versions = OCA_Versions\Storage::getVersions( $source, $count);
 	$versionsFormatted = array();
 	
 	foreach ( $versions AS $version ) {
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 7c03ef0e5e..ea272e3735 100755
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -55,7 +55,7 @@ if ( isset( $_GET['path'] ) ) {
         if( OCA_Versions\Storage::isversioned( $path ) ) {
 	
 		$count = 999; //show the newest revisions
-	        $versions = OCA_Versions\Storage::getversions( $path, $count);
+	        $versions = OCA_Versions\Storage::getVersions( $path, $count);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
 		
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 2c92dfa3c6..eadf7a5103 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -25,8 +25,8 @@ $(document).ready(function(){
 
 function createVersionsDropdown(filename, files) {
 	
-	var historyUrl = '../apps/files_versions/history.php?path='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
-
+	var historyUrl = OC.linkTo('files_versions', 'history.php?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename ) )
+	
 	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
 	html += '<div id="private">';
 	html += '<select data-placeholder="File Version" id="found_versions" class="chzen-select">';
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 89f7278dea..b9010182c0 100755
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -27,7 +27,6 @@ class Storage {
 	//
 	// todo:
 	//   - port to oc_filesystem to enable network transparency
-	//   - check if it works well together with encryption
 	//   - implement expire all function. And find a place to call it ;-)
 	//   - add transparent compression. first test if it´s worth it.
 
@@ -69,7 +68,7 @@ class Storage {
 	 */
 	public static function store($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files';
 			Storage::init();
 
@@ -95,7 +94,7 @@ class Storage {
 
 
 			// check mininterval
-			$matches=glob($versionsfoldername.$filename.'.v*');
+			$matches=glob($versionsFolderName.$filename.'.v*');
 			sort($matches);
 			$parts=explode('.v',end($matches));
 			if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
@@ -105,13 +104,13 @@ class Storage {
 
 			// create all parent folders
 			$info=pathinfo($filename);	
-			@mkdir($versionsfoldername.$info['dirname'],0700,true);	
+			@mkdir($versionsFolderName.$info['dirname'], 0700, true);	
 
 
 			// store a new version of a file
-			copy($filesfoldername.$filename,$versionsfoldername.$filename.'.v'.time());
+			copy($filesfoldername.$filename,$versionsFolderName.$filename.'.v'.time());
         
-			// expire old revisions
+			// expire old revisions if necessary
 			Storage::expire($filename);
 		}
 	}
@@ -124,12 +123,12 @@ class Storage {
 	
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 		
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 			
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files';
 			
 			// rollback
-			if ( @copy($versionsfoldername.$filename.'.v'.$revision,$filesfoldername.$filename) ) {
+			if ( @copy($versionsFolderName.$filename.'.v'.$revision,$filesfoldername.$filename) ) {
 			
 				return true;
 				
@@ -148,10 +147,10 @@ class Storage {
 	 */
 	public static function isversioned($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
 			// check for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
+			$matches=glob($versionsFolderName.$filename.'.v*');
 			if(count($matches)>1){
 				return true;
 			}else{
@@ -170,15 +169,15 @@ class Storage {
          * @param $count number of versions to return
          * @returns array
          */
-        public static function getversions( $filename, $count = 0 ) {
+        public static function getVersions( $filename, $count = 0 ) {
         
                 if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
                 
-			$versionsfoldername = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 			$versions = array();         
 			
 			// fetch for old versions
-			$matches = glob( $versionsfoldername.$filename.'.v*' );
+			$matches = glob( $versionsFolderName.$filename.'.v*' );
 			
 			sort( $matches );
 			
@@ -188,12 +187,12 @@ class Storage {
 				
 				$i++;
 				$versions[$i]['cur'] = 0;
-				$parts = explode( '.v',$ma );
+				$parts = explode( '.v', $ma );
 				$versions[$i]['version'] = ( end( $parts ) );
 				
 				// if file with modified date exists, flag it in array as currently enabled version
 				$curFile['fileName'] = basename( $parts[0] );
-				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files/'.$curFile['fileName'];
+				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
 				
 				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
 				
@@ -231,7 +230,8 @@ class Storage {
                         return( array() );
                         
                 }
-        }	
+                
+        }
 
 
         
@@ -241,28 +241,92 @@ class Storage {
         public static function expire($filename) {
                 if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
 			// check for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
-			if(count($matches)>\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS)){
-				$numbertodelete=count($matches-\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS));
+			$matches = glob( $versionsFolderName.$filename.'.v*' );
+			
+			if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
+			
+				$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
 
 				// delete old versions of a file
-				$deleteitems=array_slice($matches,0,$numbertodelete);
-				foreach($deleteitems as $de){
-					unlink($versionsfoldername.$filename.'.v'.$de);
+				$deleteItems = array_slice( $matches, 0, $numberToDelete );
+				
+				foreach( $deleteItems as $de ) {
+				
+					unlink( $versionsFolderName.$filename.'.v'.$de );
+					
 				}
 			}
                 }
         }
 
         /**
-         * expire all old versions.
+         * @brief erase all old versions of all user files
+         * @return 
          */
-        public static function expireall($filename) {
-		// todo this should go through all the versions directories and delete all the not needed files and not needed directories.
-		// useful to be included in a cleanup cronjob.
+        public static function expireAll() {
+	
+		function deleteAll($directory, $empty = false) {
+		
+			if(substr($directory,-1) == "/") {
+				$directory = substr($directory,0,-1);
+			}
+
+			if(!file_exists($directory) || !is_dir($directory)) {
+			
+				return false;
+				
+			} elseif(!is_readable($directory)) {
+			
+				return false;
+				
+			} else {
+			
+				$directoryHandle = opendir($directory);
+			
+				while ($contents = readdir($directoryHandle)) {
+				
+					if( $contents != '.' && $contents != '..') {
+						
+						$path = $directory . "/" . $contents;
+					
+						if( is_dir($path) ) {
+							
+							deleteAll($path);
+						
+						} else {
+						
+							unlink($path);
+						
+						}
+					}
+				
+				}
+			
+				closedir( $directoryHandle );
+
+				if( $empty == false ) {
+				
+					if(!rmdir($directory)) {
+					
+						return false;
+						
+					}
+					
+				}
+			
+				return true;
+			}
+			
+		}
+		
+		// FIXME: make this path dynamic
+		$dir = '/home/samtuke/owncloud/git/oc5/data/admin/versions';
+
+		( deleteAll( $dir, 1 ) ? return true : return false );
+		
         }
 
 
diff --git a/lib/filesystem.php b/lib/filesystem.php
index cac7e8648e..4239971d9e 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -290,8 +290,10 @@ class OC_Filesystem{
 	}
 
 	/**
-	 * get the fake root
+	 * @brief get the relative path of the root data directory for the current user
 	 * @return string
+	 *
+	 * Returns path like /admin/files
 	 */
 	static public function getRoot(){
 		return self::$defaultInstance->getRoot();

From 9b3847f49bafd4dfeea954dd011aabc0d5b6a307 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 16 May 2012 21:51:45 -0400
Subject: [PATCH 0032/1537] Initial support for Amazon S3 storage backend

---
 apps/files_external/lib/amazons3.php   | 236 +++++++++++++++++++++++++
 apps/files_external/tests/amazons3.php |  50 ++++++
 apps/files_external/tests/config.php   |   6 +
 3 files changed, 292 insertions(+)
 create mode 100644 apps/files_external/lib/amazons3.php
 create mode 100644 apps/files_external/tests/amazons3.php

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
new file mode 100644
index 0000000000..e847ef143c
--- /dev/null
+++ b/apps/files_external/lib/amazons3.php
@@ -0,0 +1,236 @@
+<?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 'aws-sdk-1.5.5/sdk.class.php';
+
+class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
+
+	private $s3;
+	private $bucket;
+	private $objects = array();
+
+	private static $tempFiles = array();
+	
+	// TODO options: storage class, encryption server side, encrypt before upload?
+
+	public function __construct($params) {
+		$this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
+		$this->bucket = $params['bucket'];
+	}
+
+	private function getObject($path) {
+		if (array_key_exists($path, $this->objects)) {
+			return $this->objects[$path];
+		} else {
+			$response = $this->s3->get_object_metadata($this->bucket, $path);
+			if ($response) {
+				$this->objects[$path] = $response;
+				return $response;
+			// This object could be a folder, a '/' must be at the end of the path
+			} else if (substr($path, -1) != '/') {
+				$response = $this->s3->get_object_metadata($this->bucket, $path.'/');
+				if ($response) {
+					$this->objects[$path] = $response;
+					return $response;
+				}
+			}
+		}
+		return false;
+	}
+
+	public function mkdir($path) {
+		// Folders in Amazon S3 are 0 byte objects with a '/' at the end of the name
+		if (substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		$response = $this->s3->create_object($this->bucket, $path, array('body' => ''));
+		return $response->isOK();
+	}
+
+	public function rmdir($path) {
+		if (substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		return $this->unlink($path);
+	}
+
+	public function opendir($path) {
+		if ($path == '' || $path == '/') {
+			// Use the '/' delimiter to only fetch objects inside the folder
+			$opt = array('delimiter' => '/');
+		} else {
+			if (substr($path, -1) != '/') {
+				$path .= '/';
+			}
+			$opt = array('delimiter' => '/', 'prefix' => $path);
+		}
+		$response = $this->s3->list_objects($this->bucket, $opt);
+		if ($response->isOK()) {
+			$files = array();
+			foreach ($response->body->Contents as $object) {
+				// The folder being opened also shows up in the list of objects, don't add it to the files
+				if ($object->Key != $path) {
+					$files[] = basename($object->Key);
+				}
+			}
+			// Sub folders show up as CommonPrefixes
+			foreach ($response->body->CommonPrefixes as $object) {
+				$files[] = basename($object->Prefix);
+			}
+			OC_FakeDirStream::$dirs['amazons3'] = $files;
+			return opendir('fakedir://amazons3');
+		}
+		return false;
+	}
+
+	public function stat($path) {
+		if ($path == '' || $path == '/') {
+			$stat['size'] = $this->s3->get_bucket_filesize($this->bucket);
+			$stat['atime'] = time();
+			$stat['mtime'] = $stat['atime'];
+			$stat['ctime'] = $stat['atime'];
+		} else if ($object = $this->getObject($path)) {
+			$stat['size'] = $object['Size'];
+			$stat['atime'] = time();
+			$stat['mtime'] = strtotime($object['LastModified']);
+			$stat['ctime'] = $stat['mtime'];
+		}
+		if (isset($stat)) {
+			return $stat;
+		}
+		return false;
+	}
+
+	public function filetype($path) {
+		if ($path == '' || $path == '/') {
+			return 'dir';
+		} else if ($object = $this->getObject($path)) {
+			// Amazon S3 doesn't have typical folders, this is an alternative method to detect a folder
+			if (substr($object['Key'], -1) == '/' && $object['Size'] == 0) {
+				return 'dir';
+			} else {
+				return 'file';
+			}
+		}
+		return false;
+	}
+
+	public function is_readable($path) {
+		// TODO Check acl and determine who grantee is
+		return true;
+	}
+
+	public function is_writable($path) {
+		// TODO Check acl and determine who grantee is
+		return true;
+	}
+
+	public function file_exists($path) {
+		if ($this->filetype($path) == 'dir' && substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		return $this->s3->if_object_exists($this->bucket, $path);
+	}
+
+	public function unlink($path) {
+		$response = $this->s3->delete_object($this->bucket, $path);
+		return $response->isOK();
+	}
+
+	public function fopen($path, $mode) {
+		switch ($mode) {
+			case 'r':
+			case 'rb':
+				$tmpFile = OC_Helper::tmpFile();
+				$handle = fopen($tmpFile, 'w');
+				$response = $this->s3->get_object($this->bucket, $path, array('fileDownload' => $handle));
+				if ($response->isOK()) {
+					return fopen($tmpFile, 'r');
+				}
+				break;
+			case 'w':
+			case 'wb':
+			case 'a':
+			case 'ab':
+			case 'r+':
+			case 'w+':
+			case 'wb+':
+			case 'a+':
+			case 'x':
+			case 'x+':
+			case 'c':
+			case 'c+':
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
+				} else {
+					$ext = '';
+				}
+				$tmpFile = OC_Helper::tmpFile($ext);
+				OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				if ($this->file_exists($path)) {
+					$source = $this->fopen($path, 'r');
+					file_put_contents($tmpFile, $source);
+				}
+				self::$tempFiles[$tmpFile] = $path;
+				return fopen('close://'.$tmpFile, $mode);
+		}
+		return false;
+	}
+
+	public function writeBack($tmpFile) {
+		if (isset(self::$tempFiles[$tmpFile])) {
+			$handle = fopen($tmpFile, 'r');
+			$response = $this->s3->create_object($this->bucket, self::$tempFiles[$tmpFile], array('fileUpload' => $handle));
+			if ($response->isOK()) {
+				unlink($tmpFile);
+			}
+		}
+	}
+
+	public function getMimeType($path) {
+		if ($this->filetype($path) == 'dir') {
+			return 'httpd/unix-directory';
+		} else if ($object = $this->getObject($path)) {
+			return $object['ContentType'];
+		}
+		return false;
+	}
+
+	public function free_space($path) {
+		// Infinite? 
+		return false;
+	}
+
+	public function touch($path, $mtime = null) {
+		if (is_null($mtime)) {
+			$mtime = time();
+		}
+		if ($this->filetype($path) == 'dir' && substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		$response = $this->s3->update_object($this->bucket, $path, array('meta' => array('LastModified' => $mtime)));
+		return $response->isOK();
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
new file mode 100644
index 0000000000..d0084c94af
--- /dev/null
+++ b/apps/files_external/tests/amazons3.php
@@ -0,0 +1,50 @@
+<?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/>.
+*/
+
+$config = include('apps/files_external/tests/config.php');
+if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['run']) {
+	abstract class Test_Filestorage_AmazonS3 extends Test_FileStorage{}
+	return;
+} else {
+	class Test_Filestorage_AmazonS3 extends Test_FileStorage {
+
+		private $config;
+		private $id;
+
+		public function setUp() {
+			$id = uniqid();
+			$this->config = include('apps/files_external/tests/config.php');
+			$this->config['amazons3']['bucket'] = $id; // Make sure we have a new empty bucket to work in
+			$this->instance = new OC_Filestorage_AmazonS3($this->config['amazons3']);
+		}
+
+		public function tearDown() {
+			$s3 = new AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret']));
+			if ($s3->delete_all_objects($this->id)) {
+				$s3->delete_bucket($this->id);
+			}
+		}
+	}
+}
+
+?>
+
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 5b6517755f..2f24824223 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -29,4 +29,10 @@ return array(
 		'host'=>'localhost:8080/auth',
 		'root'=>'/',
 	),
+	'amazons3'=>array(
+		'run'=>false,
+		'key'=>'test',
+		'secret'=>'test',
+		'bucket'=>'bucket',
+	)
 );

From 7d49bf7f6e71f05c69a9aa948b1988358b8b44dd Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 18 May 2012 11:48:18 +0200
Subject: [PATCH 0033/1537] some changes in calendar repeat class

---
 apps/calendar/lib/repeat.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 9a43925e27..6ee2e42c59 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -12,12 +12,28 @@
 class OC_Calendar_Repeat{
 	/*
 	 * @brief returns the cache of an event
+	 * @param (int) $id - id of the event
+	 * @return (array) 
 	 */
-	public static function get();
+	public static function get($id){
+		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE eventid = ?');
+		$result = $stmt->execute(array($id));
+		$return = array();
+		while($row = $result->fetchRow()){
+			$return[] = $row;
+		}
+		return $return;
+	}
 	/*
 	 * @brief returns the cache of an event in a specific peroid
+	 * @param (int) $id - id of the event
+	 * @param (string) $from - start for period in UTC
+	 * @param (string) $until - end for period in UTC
+	 * @return (array)
 	 */
-	public static function get_inperiod();
+	public static function get_inperiod($id, $from, $until){
+		
+	}
 	/*
 	 * @brief returns the cache of all repeating events of a calendar
 	 */

From c0db603d2970301396fe572dca5089a68b8d8147 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 19 May 2012 18:21:33 +0200
Subject: [PATCH 0034/1537] this is 5 pre alpha now

---
 lib/util.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index d8f440c1d2..be7fc00da8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -74,7 +74,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,00,0);
+		return array(4,80,0);
 	}
 
 	/**
@@ -82,7 +82,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4 RC2';
+		return '5 pre alpha';
 	}
 
         /**

From 2f8f7501ef4c315767582c52f6806f0577e5df11 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 20 May 2012 10:58:20 +0200
Subject: [PATCH 0035/1537] add warning

---
 apps/files_encryption/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 06807813ea..ad87763a22 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>Server side encryption of files</description>
+	<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password.</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>4</require>

From f00b57f8be38382b103538813eec9749764658cb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 20 May 2012 18:49:13 +0200
Subject: [PATCH 0036/1537] files app is always enabled

---
 lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index c4cdd21683..e3e9df0e00 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -155,7 +155,7 @@ class OC_App{
 	 * This function checks whether or not an app is enabled.
 	 */
 	public static function isEnabled( $app ){
-		if( 'yes' == OC_Appconfig::getValue( $app, 'enabled' )){
+		if( 'files'==$app or 'yes' == OC_Appconfig::getValue( $app, 'enabled' )){
 			return true;
 		}
 

From cb23bae8d90bc7bbed045e2bf8ef8e38ef232bb3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 20 May 2012 18:51:45 +0200
Subject: [PATCH 0037/1537] dont throw errors when apps dont have types
 configured

---
 lib/app.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index e3e9df0e00..8ec042ddd6 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -114,7 +114,11 @@ class OC_App{
 			self::$appTypes=OC_Appconfig::getValues(false,'types');
 		}
 
-		return explode(',',self::$appTypes[$app]);
+		if(isset(self::$appTypes[$app])){
+			return explode(',',self::$appTypes[$app]);
+		}else{
+			return array();
+		}
 	}
 
 	/**

From ede89ee405c88af2eea3306d226cc8a349eb8a51 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 21 May 2012 09:35:31 +0200
Subject: [PATCH 0038/1537] oc-657: icons for M$ office file types

---
 core/img/filetypes/application-msexcel.png      | Bin 0 -> 566 bytes
 core/img/filetypes/application-mspowerpoint.png | Bin 0 -> 519 bytes
 core/img/filetypes/application-msword.png       | Bin 0 -> 28346 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 core/img/filetypes/application-msexcel.png
 create mode 100644 core/img/filetypes/application-mspowerpoint.png
 create mode 100644 core/img/filetypes/application-msword.png

diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png
new file mode 100644
index 0000000000000000000000000000000000000000..abcd93689a08ec9bdbf0984927e8da06c043c7cd
GIT binary patch
literal 566
zcmV-60?GY}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz$Vo&&R5;6}
zQ_U+xQ565Z58o`v%oMVb<eSnoVnJD05lWGrEbXnt!XKiPC`#;DC}bi<DT!DpA2XA0
zndaRO=f1~#Z)8DE-FNP}@0{QH-E+>>q?GuNnCdgP^*Bj5V_b?dAq2Ppn9^MBB^YUM
zad0N-T<p(`REBK;A?5f$xS;qinWq-c8(ap2W(Tia%u;4XSr{zR7PmZ2XJ7v&T4!Kc
zJj(~*)M2=0^jF#6k_5`QR|9odCG*>{Ujg*A6d~mYV4na=hT4Nz+_}SGTgW|Iir!%$
z;@OGkWI6+j0H}~K4RYR%!7y|zM`O@*K>rL{*&}x3lR**HrMXC1->#slU>X|w!U1xQ
zqc<E(W8k;Xub;t~NM|6)HYwfOL7W&k+IG-A5L2U;)4rx8n-cl~2u)371_gFE2e5IJ
zKv$zT7VC#`M5+o=kYl^!^y&$DS*EXu!a*~1%??)brRj)f0oXcuZ~-d<nQrGC0LGje
z5Z%uDVr(8K&{5|xSdPZg9|^d&Vqoa_Rs*_1U3ork?%z=n%E9IBtNRveOEc{tzX&0P
zuM2W#dj6~_#YLX#uUeeyV%d*}{WwgIFUeJ<wf{cn55JTTC~$R6(EtDd07*qoM6N<$
Eg1A5W5C8xG

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4aaad9a45c9abbee2d47611a6963101b64a8023
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUznMp)JR2Uhh
z!Ox40VI0Qc&-3=6n4`=>l0tqi6&npJ$x10^Z5HznC|jkhtXU{*?AXX+vSK$&lqrKo
z4P`-MYRWlh-uHXoo+plGVQMtjm29&SnPTept1G}>;1qBiY)nF?X%bBWNhny_l)Z3d
z&-N3@T)lWSVVldhUf%V8y7}mh3o^f*rno=*oe{IP>4|aPep(t*WGZ<Ve;nGmg(@Zf
z>D`whRe#WKrpOeww^A5*|8>ZEI3iJG3d@;ddSaaQQiv*3SWXm^*Pk(vkYVP=S<c@(
zN3YjI5|WTaMDTcO1}msCg(a$Q{gyMwb~E$hGgYrQ#=!&osBB}4*K_k!?t-eJuuQc)
z2wIz;!;UIKBoeE25mZt~l_`=$H5|6|+aLxll_YEf1{>Q%7gX+6s4|5yBQ}3^T_6XQ
zZDbP)D!Ze~6zXIkQ9PYpWTZE?jfD>%Y1@{Swk5itNez`{Q)G&e7J>b9cP_BngG&!t
zi|rp2nJV;T^4jymwofAMkUFri0;>ZDmaq-jpk-+0DUxkA;uk8$FcGE_?o$8&002ov
JPDHLkV1i%8-68-0

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7bb520f257aa9762e94e5310cab4ab70025099
GIT binary patch
literal 28346
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%0D^>ZE&)5p}V+MR5`_N7dZj%;ZJvNrJ+6
z)-<#F(@(UCSqN+=(QDUO4Pg8dSO5?pc%SX9*G)K$PR0{}a>~7y>uTSUp(4QVtwo;e
zhdvwXev5_d?0UpbVVZx!drRZpOuU=|)Ye4)EQr|>%25wIta;ZSMcqaZ>cn^2+S-n9
z<CmtWHfdqsQ1gFI1YVi#96OlX0tSzADwF_Oc{L>uNy!TcFX4cI>DUpLX^=duNCo=7
zXMfHX<+0naDg^t?F&%%XdJFc2FdxW>@Q*)2T{xQ+0fXz&MjPjJ&AzX}JE_O;-G*cF
z&F@<z)Q3J$0m;DY;H02PlZ}OU?=h~*Qh1nkz{_wcak`tDhJ-RYLI(scHJLvVf?t0&
zd;)Sc2^#2Y@*S?cd?Pf{w<Rm&6UI2TJnV6bH{YUYkOq+0O5P97SBNjPnCuz1t@;Km
z&Rk*YM4fiUNM%pJ7tSHJWNSF+K!26G{~F+5bP=XOF_|wph_(Mgg(=h~te#(iu*}W(
zFrNFZJt*lrzhWMejfXLw<4tsktJDE<<-8<|fZ(|9ew1YUpMP&^XTiGUFFRqZpFnp3
zj$Ift#noiw9WRHn(&;wN@})~+SmS=|^O9=C<iyMnlyfZgO@AE@O068RmY|NO4fbmM
znOW;DpvTrn7jlBD{os$89ouF+Vt#{1@Uu<Nn~;t|$2oq9mJ6g;?S7_QdKlt%XGQp}
zb_YpQl91!LC5!P#g68ZQcElOjhCm%<d@Dgy$1C?EcVeq3G7w#UUw+(aH1k5PiSmK~
zvIb5)?x*6}cs7?c%QKD|2vOB<7jV&@78kF%kMZ-tMEf^AorXQag<3cH2@-$fTL{_s
zamI=6$D<Xad-<S~TTKfh`1@1GYaNHmwg}RmKmS<V)rJHRg5444Ek{m}2P!YL?anIo
z{Q6;b!OL-)9bCWbr^@EKrVLHSQ&+62?UI#FWexie`Oowrt$WebxD4fFP`rrf7HqDp
z0`68(ly2wgWW$)6r~nm&P7)V@rR76AM_J{8;7_~%Ua`syW6xS>CjWutxsI1xX(xJj
zW2)@TcQ_PvldTP~_%$9B2V|<xUC(;(0gLk9>#mQV^%?{q*DH~~4=}F}NWpPfqq)Qb
z0XLx(0J7##9=a`eXJ9a}J~}g;lYpGrC?m~mv?$b%&nP*NqURpF5zqZ9$=%DKTAMCZ
z(mh@7h0o5v@0S%h4;dQEvhEeRY{-!Ff?m)y3VcKq2~0~y;d%UrS*nl~nL1;8MGF@#
zFDm}lts_q%YHMg|j?I1iR1UPSF%hIdCj)Wr5Zj_h-845Qne%~moW4|AI_-8UDy+HX
zlXQr+G3truw_!KrssX6Ga?U^FMk|~jk^U;kV^9lnN39YtkSul;R&wHj$7~Yk|LeH&
zU-B7<PB-ZWEk-Wjwq4nLQ1t*|L{uvyCrKQPTsrsLfQ`nbhgd>Q3u~%#eQ3=twjINd
zT62==MqoVm5H{E<l1v~6q;Oz-CeMuAF~^Rs+ZiSPK)RylHzU{p1`lj7k-a|$@FF_L
zrtY<zp%Nsl2i*&hqXg)&o`p`J7q*C)XV!$#qtTSq<k<?4<;Uv4x0Fxt&jSF{HhUbk
zq!CO#9{}ban~E_Agp0ymx;2O?Gm!pEX`n-tCLsc?Vn3Cj(ojeHQ{nS{NT>TMQ4(jn
zPJcd-j7bY`iJ^oafx{kxt9NIw`eu!iemI3ZpQ+cJ-$T;}ykaMnS>eG)m~$c2`3z+m
zvBN@~IM)a5^(8KxqxJra<^NMA{)c1~ZWZi$&yX5Oca4L{H#IEsLfK>m0$rO|>pxh$
zjdWN0KuW9g5CyGN@gNJ1P|dM#cXk^Xnx&Frqq!AU5<a|GNol1W)+)tm5gu6NEzP=}
z#AY9P`$SOhT3~n+p*#DH=KX2`$#L;s!;B9X=S5JllkZw3ZadtthFA-T!ZOhp;#i1u
z>M<KY%`Em!bADii^bx#D3td%iSdLI?l1kYD-J#O}tOv@<$iJ0KMb9CLxdOXi$PSyk
z5_~mYF0#P3Y+Hzm#8@hmWt;|K<wL*PcB%(2_m-I&$<`!r1tkj1l-L7K)Ib}S(Y#IU
z^UkK4Ejaf@HZzt%OpSebVA$h^eSZ$ujiwc>sI+&GL=x+y(1;)_#81F$PX@<NfRXZ!
ztKa!A8l<ul;&5*bn<|VjW&PWAKR-Tch`zNqmhUJX7utFkmAnV8PiLL1fOBfX_5AoZ
zJM>5Z*?q!2tVb+r-YO%I-Rp2kqaic=bv8<pPtXum!ou$*Gwy3GdvY!{04xmLA}s`j
zHdOO>#xI6y5T!wROACL1$^Nf;z?@$wDz?%PKKnmbC(AtIKJ-ByDx!5tIrR53@j{cR
z7SFfxF55K91n7ZW)MSe~Hz}|BSiST}hHmY(X|=?>eW^`$`jM@A+Rin<Y@rJN={95k
z*mNXYv-`n<;>o*mLxfvl;PR$%3#)&eZ&Yhu`O%Q?11ihwy?!sDMT;jbC-IB2<NMy|
zZzWYhFzM9NdwzW$eg@DaoJx7t@$RvH_$MDR5?RjIi-$|lCwXLKw21#!U=xD>_Y_!G
zUYbz0@Aupu(so5i-KJc5&Dv|WwXJ|?u~mHmhZ8?k*xTE-*xkN+V<ZHen%ePEn2ClW
z<lo5>0Dp11vyOs8KmjW<m}1n5M?oo>^*N@4q_u^OB#H%)h=ld=BF%rj77f52ts~)r
z?Lgd_EV@$C`q~LjS!n`S3r+@Wo<grkj1tSw%uls0ypjtO5qn5%wyEw>>Do2Z2W@5r
z1Ld}Rt^NwG_NWrSon4M~2c&0Ht&2Z<2A%KqVq%4_^=T{)0ss*){+j}0g!98yOq)+w
z^DiOl*D`JFTVk(?;HO95TbmfIOUzUl5vRV}Id+^vn#yb^e)t%8F$sqJN9PXQzbS+B
zcxOF&#Q81>E@lYfl*fqTT4=Pub2l<!$dUBI2z0cuiHH1~2ieC`wZJzD`O1vFzqfSv
z&vU3}tNYmyx*Wx}0+2%>f_O1VUy29m+f0$RK-sOqgT!r@Upo5UyR3ftz)``K5TOx;
zUxC4L`tDxMFBJM80WkD>*#ztl_yCfbgcf0J>?Ur?U2vZ6uN4rJ2|%`$KlRh{L?z>g
zms1Q3D?QPgje2#QtC22v&>+aa7vE%N4YHa*wc*uW_>E1v1<s1t99qz8x2(<#K;h`2
z3m)JCA#Ph@-)(`w)y`Q1@Eegx*?Kkpd&rKl7kvf;9I4~inTI6HAFYb*YMN^SM<C>$
zr|4}LW+ZC{d-|5~g*>=`?u$b~ZxrtQ-5*kX5Bd=|Q0VGuPq<a{h`T7Z&m5+B5l%u^
z|H8|p{yy1iX8ZRxk&(irE`WxPTsq_%zwt{696twk&w>A1u6GrDfLpl*`&;M{w`b@f
zQ*LQ-e}4~`Z#J$tp&ym>)R)-u4HqAA=$ZI6;El1h$}iWa<nNgk@w<B-;{EG()b-aV
z@kA<=UIBoYq_0pmmUtXC%zMFp9p&>QG$8A$;a2Hba1VWpExR4)WHrmA+t+U1%yL8T
zV*JQud7MxFP9F82n!m@7j{AvSd%6tCHRFZ_SL*=oHb=HZQa^jfJ)A*Ss>f7+n?CD|
zGj`&X528QAvHt<fxqe@sG^o@&PXHBPg_k6NQu&Q@ACxR9odkCKURNnGQBMv0*MNsL
z$HMcXKhvFvgBR+cvCQBzUCN>}DE+p}(t{-LiU1uO#&X<z$2cSj#1EO;;;m^ImStwF
z-5pdSUuUSPm6h?ih1;3#gJD*9g}!U*3{(47@9145{xf>f#bN8K{k;0tV%*;4NvL>R
zW!v;vdGuRix!Hg5=FP75@7S!bo(~<;^qv)~-Se1ZBcj-+<HduV*$p?!pJ6Ca79YI*
zX+YOkI7*@3Q%@HzPSbJBV&z(hq~LRn(gQ7PF9ZiwoGIn6ik^n%vkF^Fm5Pf2Fp7EK
zt}PoA>A#<PGWfDk47_!s3ObewgMF?!@;>Uf8XWUPcn|cRG=}K0s$$j*P;N;f2U2DG
zlL(Y*o&seye`?<0i}l?kI@k0QR;_Nx@^P=SCDACg7@vJ)(o;OReG%K*#iG}9uXGog
z-Ehrxa11MSF0)74?1zh4p=A3?WNcqa_iAUy^q!ytlnnxtQ}+?x%q5~FJF-VMesV8i
zaq-AV+udFBEfC7_4)&sGfYEn^5DOn8g1c90j^rz{Yrg5FPoA>*iphf?vXGLEPbAFu
za80u$F;hK)`M~}zn)RfZ<gjQ;s@MRTk`UGZfqT)O6cj6<5Vj2Y60mj7pK2#gESYyE
z1%a1Kh9S1iMni@Ha;G91zTKq(ZzPEh7ymI6OeNs7e2U~J<d8X!P*{`8fRp57hU0-6
zkfHS!rr_aFESQ`budwd9Zs1#HRoY)#UNL6n$NF#P;oF=y0T@XAQO-*kKyYx7!&j~t
zw&2(YCuP18#^A5%ZA;E9+im5ds0YtP`Kud)_GcyuB<>x9I{GS!Hn5xXG{hfF>AvZS
zdhFdOH>T@wGAx+Reqxg2o}b+Ayw0MzghNj%=<UX(-3zn~=hOw{9rBm&fPK%<{;gWr
zzt7^HnPs~vu?c<X#(7CK3r_vEy|;`I1Mc-Uu3XW4j|J_<(F8g_S^ca>xv2b{wg`33
zV~z{;a1Jm4>e@c_F|*t`NqnZXM+mKlVd*P7N6Q*%k4jGJ_*WyT<vRLFocutcRXuO1
zSHs$$&Efs%wb6hUF|kK<PATptl6un7PTNQx|L)Oj*X;CmFYEdBE8Zhp#<<c8pNbt?
z<zMK!!3$_C(v*a(0@%u)K0`Sp$J(yWx_C=9o0iv%A(Dv|aHItYL+agM1zf;1^|xB(
zv5iJE=EuW5BsN?gC)CRt4_MyxY8uusH|QZ{*Tm8npF-Ui4b_8oW?f`sZ(}PV!y+}d
z)zYr|X35HRfePuy=9l#wH8dM^Fl@{ada-|>g{`1JsLfflR%1d#yYVVJx*ak7hsw(u
zq-k>B!Ay#5Dk<*QRWCX69U}|B=8Eb$N)z(f<@*mbcU=o&D=z=V*Y3;}$Z!BGZKs8~
zZ2BdOF&&Pk-EvY}rQR%A_0sDZCYqYH*wtz@(=Dzy8nC@QYvHWL_{8ocm26#!->^sa
zf9X2iWu<nbj;WEM%!9(;$dBCedomS@bi?v0S{_aslGnZIzBIJl(re56eYKSd0=fL2
zG(2=_CUm&ZrSHe@a2L$;nN8<bL(M97D-PXe<(=-z`v#~TADw%3mssN?=1d4_?!A%O
z&&lf`Fb?_H%tL>J?Z%4*kue<ZTDGkGLc{uz59{pCJy)Ep%L|2z%%tA5Eec(eiC6+Z
zyJA%$g*+cRy{{x74XS+bmQAx!v48!lfhjhH-X~T>uqGW{mqRCQ{suBq^?T)38$qAo
z1|yQ6g8El^y~cP@zgBbl<ALy9sIl_;wL>hM_pdC-KCJl)+uX^jzrad}%SjvSybhZc
zBH4TZj2=dW^b^lT*C*Iy?R1|)y!nvB-WTBw>4`EF6BNxwFqkc(tUghPsF}M;=`pyw
zXdkz*-Hd)>6k{A{K2Tw`HC5h_e^||*oi%lM(lqF8Izy8D&qY3O$=P8th0i;%&+Ms2
zd;VzWw=PmQExC&xp8AR=cX??RhpOC{l~>lztpQ|_ZF%ihR547+%3&Bze7`n4bYY0&
z(%2VaLDhbjmq8Z1-`8KICkJ~%^5kk^59OYg;Gx@MY9+q+6n{4|2{B@yr{uA^!+7oF
z>xg_p0mHFoKTHR-nlwhTMciVQn{LDucq?=^`L8E0Q_Cq8pB^8_40q@gA@0?pZO$``
zjxMC>nCT)|K$TOyOJ@BQ?iDwS-Lk!(<52_q?%5x$LA%@5HdQ40xJ`+h!j!)p{SqJ^
zFBi?LTT7TK_vyxbB&()&8}j(}^?)(^W!mLWj+yz}8lj5i_e$~5Idc?M!z?6F)r6pR
zh6t>30O2Wof5SP=8%Xvpl!32(_15YBl$#Y_fIo_p^1!aq&6Mj5IESYFaF;rOOg`)6
zKsljL5k_0rwC_FBM+qv&Lk4yf0OM+2@O7D&^~7V~8<~dQVe=AaR(}6cq9>_Sez)Qn
zx;^inQ<I5t8%k^+tT9zkAPrcJ0-5;R&hhZ|2LbA>p{FZLr^08X77;x09~E^!)RE8-
zX&uyXQjU$al?g3JG#}PSW`jQ(ATZCw1~gXzC2jHKrm5}MO{8(}gU=EBfkVcXc@CPS
z8#n{3-LA4FeP9po>J7Fo0XZ<OcVVj_Ax_L~5SUE23I=g|6?-0dbLm$llsZ319Q9g0
z;;DA8ZvIPZEEkVOi~er=t|M#E7}Za5h&G3-jlz?T%cNcjQ7&|3f5vXUfluaeq;f||
zZ+inkYO-TKGDkiv2hG>zQg#Dg)YHvb)^x$!%IU+4u=*EEzAHWSlr5H*LhQv{N~{jM
z_mI>pO4j5fxAM+?k|{2aQ9f=<l=8$e?$x-pgg(&v4Ab--Tvl?VP2g#m-s&7!UZm0|
zBCY$+jC5IZcfLJez;U2IfvkR(S&LFGCJ^|Y4-L=Y8=&)7r>V_xS0K7>-^z9HAOz`Z
z3y~I?v?Z6>i9QFF89#-~<3Tp0SmS^&5{B*+<5B6i{~pE5th~9tInz-L^fy9;4vUr4
zq&rJ?+Y=dGaR$fGVQ-uDFK6h+H&Aal7HJG?L&%0;LaRt09RdHAn*ToJ{;?+xFw1xR
zM`v&+@g0HpNTp|OHLx+H-JOpv>Sw-}z66)wok%+qw}@S};{YJ(2AXV)4kroj)A90@
z9#Y2a9sb^}fLi`-=RBL)QfPPvw|6-xJM#8FoeaBRza2isvQQnaj=P4HFL5&1+&=0R
z^)$~vizy{ZO;@C>Z$a!`z<`!nmTCvk;=t>Rb0o4V_YCCJ8b%;^Q%)$Hbkgo}mgfL}
z&kZmjP8;6Hl<sQI<!Z{xkxEG(*?8a7%>CR6U?%x&X1hZKFz_OJziKj|?p;C{np=ul
zQJ0Zeo?Gg||I63_eDQVgEV}JHOfP-yHyW*#eoAoXKEt%_o1j2t+^B>vS-OUeaPO1I
zK|jIQ#|84g<_!YI`vTqM&2!tye2d%Pwag!)W@gBTV3?GOHCUVjk^D;$+CoQObORSq
zFjfWkt<{({2WnRATO+VZ8}V&(ac4_}gD>h!SvnFBw~vaXy+M0c8$zvE3g^JqeC4GP
zFeyS!+S*gut00<UG7?b{gj18pdj<o8i>B+xrTs*_rfj<?_lx%3)fa(Zlv#%HGR-CU
zVwC^-f@g3)aa)qyNhFGXGhNFR`Q9L#Lm$N=iqk2NUH3DE7x+QOJUFrm@qKd$v5{_5
zFBC)ke)0T*kM|h(WI<*&RbkdQ@^aO459z*h+5g<}ZezH-?&bU6Chkv(|0NSQBf@D%
z`1W<v|I0`79UyUTDd(s%Q)P9YK}qxF$4b?J;^R6be?gM=Ti$;j1Ox_yA@1xrybVQ$
zRI{h5<L+*m>*zrioF&(fk3C2i7Z)CZ1D-|fdQ$>=?I2%Y>FG;tr=skHgu~&4-g=h$
z0rE(8IQSANT|q%1aF)!2+$pb|KiaFqGjuZkoPM~?FvD|Ds;2g$##4iN43KZ|UZG#)
ztw(;Oft@}Hg^wqgd#WA0;UGo88@~&=XANTW{(d)K$*@&RHZVn0fzyZH7_uK(I`$tw
zGcJVaW*M@mwCJ{9c1K&Ei6!mr?H$B^2l^CZVCtN}mzfV+$5yh=l<{DFwgJi3)Oa%t
zP$AK74BT8TfMPx0Btq;qNV~E?u=?Bc%H0opPhq<K?=fNo-9^rd6XY*8TT=PKTMmvX
ztRwA1cI!0)H(EY&>KqU{l;*O9!a4`-Red_!+08s@3y@@rp~os@5CE_rCweJQ24qXn
zcjJDR;p2o3ozCjO8X%#~Rn^$K8H~-b)>H`I&%gIjZro~cOJd6^-5D#pSuxvBDyY_K
zznbEN^Y_Py?{N|S;I7$?7W!=5C)vvNa2-7!GHZV#zm2c>*GhqPQfE;^U(nV<*r}wQ
zhpCmHfGk7p4i}gS^SU$NIzXxPL`I+EkYCIg3FyQLJyu5I)f^s`W}X~7@C-<AE8|y1
zTA)dbn|>*XXJuN@r~8gWcKRF8NJ8~Ij?;Wf?kMZ*uUOMC*og~cCT)8w)nEE)rFYHK
z);XDh^qmOLxKo>{jEiRNP>jq}n>xRf0qlhNhk;ohdr_C)6O3wV+kSy4ByT^}(It-v
zH)5%`0kk_jKQm~ZhY4(QmL8W;0rZ7-Q!UL%4UaI7Zu>KP4%YS8>J`o$KbUDC-Fule
zN{A;ZTPr97iGXerGw6)?!)qn0jXCyQjMVqxUZ8#3MOLc+m2*GcqLY^mnr85${>o8>
zdzc!4N49TVe?WQt0SKwg3wd8CCnPc@5-6H73PyxMw1xgMNuI}%v5dFh_He?0I6U0r
zj?ze2(BosCQ``cnMif$FNrX4C$({rzcnX{z@&ZGk-v{LC_0C0FY?<oU2r{ToJ+3Pj
zs9JIV>~k>;Ph4^c$l>sj6Sq@8c&3+>Cki<h><u)Y;sq)rhnp?pMnAlnSFb=J2s5~j
z4A;LY+sU6MLYne%lBlCmNhUZ3rQ~}mJo^F}rOt8>a12gv!qlmKwrhJK-+lu9Plo&#
zSDL<)z4N~g@v>_i;i<9qGqSN+WMt$z|1E?HLjRY9(A2VB$jAF(T9j^gDBW%|y50UK
zQ`H(w-B9?56iI~&R?O7I?Ywgw)=A(}{r?1xQ8!jpJ6aPZJy7S3fi`PmTuc!jtT2y^
zLKu9PiSP_F(dNl8P%UQ$6Q%*Rhkrp=TP6c*K6#Z5;pFQ;laf$k%)WX3j=#S24rJXg
z8;I+ffi|0s69zom(dHxs$~SNpfY>Dgt>^sq5$L&k!o?s41tmZ$F4z&663mP8NpD=%
zn@I>8!r{M$c7gfla{2!ooWB6v#FjQ{&+^%jkzKX?Z}LJJ|KAY&|JS<o!%q*mL~F73
zxG{VKbZR(qF<f3So^EvFy8CG5Zt9Q9$H~8X#B;g6-!I@wd#t2p=Z9#dc%!9WvR5lp
zIIchXGi_K_EDn?PKt$rPsrup?PEA2t%vY>W6^!v7PUj?OA<)l%uX*K_FWmgqc$OUL
zEYWLz`YM$lvZXzvW6I-S`gcs`Ng@;^dIemVNBmv~tyGpBew_qtRo!tncW@h~78ooZ
zFMWr3{z<Q?ov5<C`r_4fqH%_(OAL;ds}G5DJR=oX9hW=&8G^!x0C0of#kdM>^ov4N
z+@}qf3!?j;?VjN0smN?i`p-ZY*wjc6gVV`YkdRao=y`6t3l*EZfpZP%$@no$_*l}R
zy>E668h|s!`JRQnl@*+J)iP|lE<x(-CNDvGyb2XBJJO@P>@&%8txh|yk6{0<rDq6W
zhYOrdxaT)<du-FN=tMk&wI2#7kEL_VF1u-eG(VXR285+UrFUjTP+>!$83w4*yTt-k
zwSnh>JxaL2HPSlnJuzO>tq$t_rTJ$JzD+Z#esV5)$js%U4Zj>TgybpqbB4sEx5L2%
zb>ecI+jW1|_0+Z}AoO_FkY<=D*yn|g0YeE%ZO{hb;q+VEy1nR(MB9ML<cvLX{??1c
zJ$C|z67@K_o%FoTO&)n8UG}{0-++DjwZ?|^hqTR!pm6tV5JhR8$dmRyz$7UqJNAK$
zMZW-TA{0}gM=UV%#Bk4x1^$gSb%uL4<ABN)mbmsRvBK2cwCy>HI?UT|_%@-kSkqr#
z2p?Ga@$W#AG0<4oQ$TC4b@~l)F;#!V8IiS@(Zbs127B6oy!r{Y=c^1y(r&8?7b^>d
z_>HjY)mMc7gJW>PIi#f>^80fG34QcdQAYdjSVzgHJ^t+pcF=3t`F5oKbXgh7|C0V=
z{X@qfYrlW)xc_g%!{fj!qc&CzH3KG>*XQ{d|C`+=4les5|DX1E$!<XY#$BGNvjmlA
zcO$wU$E$ELFkhye@gKPEGDpNjM@PpzO9yG;vi8B?E$jqo;=7T@mV%x?f~ryw-6E*F
zfdWc^$!2Tf1$q!lAH(xHueh3aUw0rwh6Z*XTd*w!-@Hv;f0Jbd%+=w&kT_HIt>bVg
zzyp7%=t7p9x$u&I(oL+s-BFYN{*q7ji)EfI;e$_275o4U)!m$V-DmmcF;^=jgBv|e
zvga1zX=bk+MR@UwcaD?C=;-(-9OiiTm3%cGOP!`zy;mGGmuBc4Q_!Rke(G5AyfIGI
ziJ!Q?<NU*We@>Y(&b_<xJSKgKTu!Sv#Ept>^gb1TMQU}ZN+OWvBDcK5I=6uh<QCUd
z9vJx5m{%}Q+%hCW;@Q+iWA~qquTHdJwrif6Ip^qK(yk`w;{-V&7CIq7E54yoqf6#4
zIPu-z%<Hba_4E(v&$_Y%SSQ&<UH@>?g?p;GeZ10MJ7nIlG`sPKV^XLw9VdZ*&L$T~
z7D`>qE-9(A%@Pb-)>xQ)rG;3Y+B@DU`jzDQZVBTb7mE|`eIod(P@^xBn#n<iiOL~U
z<4>zou=F$?9(9GU$TL{4J3#bT*vu2zQS_bQ%o4UnQ>Eokhy-3Zb+PvUY3?eU;^3Mk
z&f+c!4nc#vFD}7J2oAyB-DT0>ZowfCTprvdEN&sV>*CI0%f7k);(j}yrfR0<R8LpW
z=_Ajmq-(*gW`jH;+4acE<!NV|W}SWi7h|qnFG_NJoU)Q|LVn`+%^oXB=7KmL`?27I
z2mkM#{*Xn1JpXO;D_~j4Cz`A62O|pccN&yxj2a9qLi>W-q7|eP82MEvus?C=`qHJ)
zL68zoYc(KQwa7y-ZyH$*q<1p<Bx9kM&jil?)I;QnV%5bt{y_LzIfKE+Np5e&l0E}m
z5C`US@Em_|&DTJbK!An#62B*m$AYiIFlda$KY0!ow|%wA%l#Ip%r3s)o)NUIaEq&D
zZ#?V5XsBs62SbbzgpunJ>i12F?~qji@hkORY!N~g3dml$1%-CPYH0*NDO_hM8eT=B
z`gpVE&Ike7Dfgv(5-}6doYl6$KR1Y+CQ-*7B!TykG1XQ3OT1<hiO>zaRYo6>L5!Wh
z!WUn(F#NlS4+LTL4w?_bdGc+^PB)Jj_R<<T*9%L}o1xVOl#;=3sZj^(+sjcYooL50
zBF`<m7*SY@Wk|w0wbd$=xUxgu|Jj?L;;CXm4vu8IkuF31>QRfaj;IsF%ACmTu{1ds
zP-(Ls_b%leu1N+@eBO$6;PQimp?r7il>_N18L7g)r#k(SpT=K1JP4CY31bV4BANlX
zkg>wVk78&+=qMhw<O=wER9Y<5D$2DN(4Tr6c@ZO(m>oP=6VGoSRg#`7A(ndaG{$0|
zhD#GKEdVjTAMz{Y=9bzv@$d^ui1fbMEm6~+Ri4h_OF2#^y|_C!IDH7K95GoEnU1*h
zmr<N4DAJN38F9A8-*<?RJ9((F62la)ggug){dtvSZ`my=$g>~0bcp7bDKvCtx!?WJ
zM}^QC4K7Mqdzf^E@nbtryqj?QmaaFF_Jr~5J=5|4Az$J2y;pLMe@Sq0FZ|RSIwMeX
zJ+KW|+NSjS6?=Vh8l9DdWxZWNihaJcWOhcL5fy7_K=w{lQXH%%^{G_k772z_v-{zX
zn=uJuF+z}pQY0z11Ip|h-^e(5=U)BOaZ{&fpH`YgNH`)phR_HYt!1kVc6M^)fio<b
zyjQ~a*m}9SE@=33&L*QW3tL+?VL73y@`<1pNY=)JoxtR?!6_um5G)e_2sf_(gSoVu
zrL&-m)PyaRGtU!Z?+_erm2RQf)#pw+0e+&H-IH79q#%^In^5_0{o)kxTWUjh1Kg-a
zi2TBR5Som<_i_%|@8+I1LR-D@4N1PO^PX|rQa32Ul4L*`!2w0YZ_CJMVdRvvW`uV#
z`7KKac^&{|UQV#|&zx8Wb(LLr!p0hJLa(vf1ABP0K0;vIM!angwC9_w$&Ty7ZHu0c
z<fxPbQU;tdJ)xzS<R}?d*O74vAnngvcVQzSCrQg}<*?&7$G5v1W_291D9hmzMZONk
zgs5(YYE~emd*%Zwq6ZD-76!7ZfCN#~xjrRWMw@}df!<9~lVjG3@Qwb+x^@6CxWl;k
zi(@8@k6P$tc7JkIctK4h=Uv#$_jljfDQY15rfkk)O5p>~Bl4s&BaKm1ix!T3!H?4y
zjYl{W`G%lGE)TOpn|5UqGI;>+0lPo)JkKhbXBdTOs)OptpQGskwBo6A%F!GE-a%=c
zBI_aLLI9!AxXabVZ)eNO$1+IU)lNo$l>5DAwj}<D!=O*R!%|OgF&0BRo`W8lwO<P1
zqC6OyJ1YHaN@h@G&`S-!VQrINQ=-EZ<&R@(@`#OYQr&X&hI$6^UxrLm=bUK8%Q9DF
zS1fjeNNPg3j#r-GXc~0r>(9JD4ebZq@+v7pY=Lbsa^w1d{8u3X1*7AI)~;uNt!0uT
zf4ZG;Fgk`8iBhQK1^o7>muqg*>cjn)mC`O3K26q`$NvnsP5uh*Ew0|~eWT^bwPYgP
zVUuWO9PS^t)=w4hGf4$4w|z4e%&*)U4YZ|dpFBn7TP~Iijo_tyr`d`B>;_*FLMNF?
zY{r89#eHR0_vp3nQpk~zY5D&84Xg4ztT{ur;^qOxE>S0y6;b;*IY~<O_ZHfGT|^u_
zmI|p2T;XIc&P$}Al&0<0&_p@Zq0mEpu=fbnqwKUx*iUS_*Kn#)l!k5Kx82PLiMF!6
z@0}p>!XCCpT^6O18n4z?%Hc%5S-Je)AUJs4-8dweXrFw5SYdIfsNt%?frI~CD@dh8
zHV=DV9}iK<ANzE;rqe%tMk?C*2@LAZ{|+1T7Ps+F+>3{xT+?2|0Xzz9ZcaHIVre+a
zHwnZDLO4L=P3m2ZGZuY!oE1weFy_pd0@^qk&Or{w{PSEnJk$O6vQj2K&BTD&85q1)
z3@Mi+AHhdpFV1MM=Yz*l$ekGg;yUE7$4BZA=iS_{&X$E-DZ+s5pwakEl^V2U=x;{c
z(TWdYVtBjVKx&v)jXQaQV6&?xve36~vz(~*V-tx8^a$9P_ED=TS=4<_Gpkc+1X!|P
zj*o$QuoS!7lo{tp`E8JDtkw%}Do%D_oI^Xo8Q*HJKBBp4=9b38BcuO9b!Jk0w3dsg
zWt&2qHBi;ll&9<XW<cEQK1d!@Zq(m#@cIL>(jNlckC*BIDpL~Pvpx@W3&gd0jvIHS
zl&_pc@0!bF?%u<v7Z#J4LsKr}b0S%Su(n+=n$AUyAvG0if)xt3jy{c1-BR)M{v!c`
zotmaOKy1WT9Qjj<`3>?}+vbvot&URAkax+UN;Njui_9^-+WcFStyurk_4PB^5z1_1
zu}j}6tBp326YbE48i77`+H`r4?<)(iN|dP8reEi@C6Y{`o4+9Eq@NZ8vP}xOZQ1G=
zlIM>PL!--Vb_3!&?q{PX-%Hos<Hi({>i^px^bmE@rmkX9M29yRZ27G!x<!2S;U-{J
z_kVdf+VP6fzvKALlu?lc>8CHz$H$OhR*r&AQ-Or9+92csT{%uM6slao5gkeIK!bE|
zN#GYa=bp@E-S+a_q_jk3!Q)YPqkhf=cA!7X-Ib_yECs`0O^Aza2d|!e*dw@GIgn>@
z*^ZA$nkDe5!W-Y3=QlD@`67<GN@z^3YX4OA`&G`u(?6%cdG{6LAvc-NMJ5a`q&IJz
zj-iYw{z$vKVR1P1!%+SCy<oeT{dACK9YTy7KJ}>=lMqV;D&>=om<&>Jsw1tx!m004
zB3g4;Nt{|9bm9h!Jy6pc`|JH;(St*H3Ui)%=biavI#=-rdG(BrDoiD0=_R|(7cDG_
za4!xTt}lmL(sCkcrIqtGf6sK!ueKTW4KC}9LJL>T7Rt-^1d=ss?cFQ!Cg!exJ$liL
z>@CVH`@4cBYZkp7%WEAaut4}p)Ffl=`ezWZUm?kQuYe~qEb`|(0oIa}JSfb+;Nxo*
z)ukFmV{e>frD~r8SR&5d9h*M^`RVMW;+2@o28Nd_-|tTN)*q}HMgG%SX3Mas&dA1)
zB%ruDI@RWV>7M=?vbT1jE;B_`G-iN;Rf7}H<tAc$02b1QPcJ&MD*UflGL=vz(}$F!
zH{WNA)yJV(?n11v!~*AyhuGV5CW7ZxuisJv9<mT(*}siWKdxznmB>MRR@T>-9V4FD
zsng<`pA6u4i49Vqq|4-|(RDb4s<?}kKVK!VE{WkAE?E$nS)l`gw)!r-h&d}*S%+@W
z;YJrRG)y%<&tU0ZE*nK%C1ao*6*^h0vxkOV`eSAo3fmC-FV|+0@KQC{jK%n%ev?kd
z-W$R)XMF>{rz!30xHD?Il{r8SN|p9ff@&9+6%n9KBO&~?IfZ6lyjP>Sz^W7%ipJK6
zYZDzkA2)<L33{D-KO}B|#rP5rTO>wbFMOzuD}3UesUa`*@W<z*ER?b`K3A2uX|<BF
z)^bo~b-*nrf+toTeKGQ_vuEymAkp?|f~DPcgZZSaVDqg+!?-*~^SdJITI#>Jk?f)6
z6mxYNqnJ%U?zuZ`-@KzI{xOVHF=~m<%X_u2|6Fk%pn2m}G48Jw2>ttm{P{}cI8?&!
z`zs4*DrX6yW4@i|(v)|i<GeVl1Xlf=ziJSdHVV1b#clFW_d$<2%rQU5FQx=bkE0m}
zh7>1x78l!`f-Z_p?CYG*=X?HqhH+!d`Xk1H&sFuJ_+URqbwCdhYGNj+yKg2W!Fm=A
zJ&B=+W{B@0-pGnds9y9tM>ss+ZynT^RA67if$T9WNA4hri}l1Py&yqZ8GK#AwJwBY
zg)Op5qYJ)FrvQFBV-fgHSMAdJCw}K+;$<R%Pk%fje8SgFu&d+>p|+KH;R$!~{tw|@
zt)*KqVR*(irRHh6ah88R+0|_)Pb-CQ`ED>7!fVSXVFrs{#;}=QqPjK<g#gRjEQ*aS
zWU9^{7b<9sl+SPOSS=6D`n?XqTvL+CuxVN#fX`2ccQ`p9uosRh&|J|T9W){78{o!b
z*4MN)7j9MzL=8=xebY)~ys4OU9H@EVzY8y$3HNo<RbGk;RXnf%DGPZ&e|N@1ctV&8
zSR-^;(prSY^Vxl}rC4VN!$Y6<o@3vubmnTuKz|Qkm5>Y%jy{ZPAbxuuJ&GJ}>WWGd
zr@Kus#4l)9_gT4XH5*=kY%MVeP3-rLHPZI<&PALzG5B=8VP?dFI8HrkkfSM|nRE)j
zpym0VyIG1_Y@4_Z%|G))<A#1lNLHmA^~0UgLe|8aEWkf!(3bks$i!c7Rw#mx#LPQ}
zSTG#7-KtDdBM%nV8+%lC|2vGyUrCh7=2rkSr<n<fo9O=Yo{J$C$G2f)Ze47ISNmT*
ztKtyvci%1UXb8=mm)KsW{ms@%yfpz-IH26&bmf-sRj};$7O|Jd6!MZszb>)P$f83<
zSyqz8vM9CqBzxZYcUYepW1bew1uw{Cgb`szMZ`4C2(B&nxnpP5R^lg}=bw)|@RP%r
z&sIPFvG=$dc8!l{2W&BlGrjW+-~+~&0%`))(O6xD2+VU9kU}o@j)4niWp?{=L@m0G
zfRI#D#NwW-7`?1Qq<(`{Nina-eAY4t7i3lj-JQ{?&$-TZ7TP_&cj*C!{T_PWJY_W^
z0<i?9HScS<RgTH;2gtt@wEoQzT9qt7_~KeD5FOXP@?V+bd%p6|uk_3LC#n}cF?z`-
zkw^K}hC2dI55<qT*qwb^2om&OK@TY-t~1$ez6s_Je`7l@_OkXE?9@IsKS^~N&?RHM
zwawH8+i%b7r*G7dkf#*?H~)beDDXX_$O+B!#4E;_HkvU}DiOL7DT>Q)E4&73&o1ur
z^g1Ks>lb^*oKDdw<B{fakLyF}%|XSa7$KO^W)tZD2Wb;$cI!;`3@G~4yrP{S3;--<
zwU&ocTawKFm<7aW5lgE0HTBIkYe;0L(XGFF1Pzks`h^3(QH%&~&?6nh>ml-NnTF!|
zqcY>;Tqtn-f_BX%y#O1Y^-Pd%u%tzSJb)5(vE@lyE*0{EuQJT{=-98`8qS0??`BXG
zKHr3Qk73`Vjg*}<TuyFk1xPs93gz^ZsU6h!`{-#sxxN~CUrwb>YjD9^Ie$N_UUy*L
zC8+bYO)05pUyV6_SIMN$bECq$NvDoA(OpMrwhim%@$r13-Ydegl|o0VsF~xtvLd7r
zd{Yn1OeJd__!Xxt=68{F3#367_B2ET86MN6U_F<&d|;=Uu2ZdTv&y7TLiPW7z^J?#
zC4J(sK1oKPz3)iJ=k+YSy&C36v~>z3GA+>kecZzek~Wu}zdyd$c%pOn?~5=iDHHhI
zIOV*URoWawz%WQG4&&$ZOIjDCuOca$*M^<U-EDzn!@{*t4*HlR+YOVt88BrKl%~Kv
zTLIq1R@<mc4jMyCU&b8WSdw&<kguj%Y?JV?yEf8=@jKb2JR4dbMu+}}tF8sO0{(lK
z@k$fRwahl5N}oV%Y3hefa~V?Tz|Mbxr8t=hn=_Y_WFMH}ba5c0hslXW1qx*va*|NC
z$SumAlS%(5B-m$&wF4g>JHlV<V`mDBl^1JfNpAqVx0^I_eQrI*A2-RZ<S{aCGEJ*F
zIEr#WKe1LDEPheuHA9X<O&<HoRqqJ1-5Pm<2~P24lec8k;OUPAvS}j4i2xh*1cLor
z82sgZ+P%^!im(i+gYC&t^{0VE27@w=Z_i)DTq<(ZCd_C>+{p>ZJ|GZX{Ou%0HsI*C
zy>+m?p~0j9%BFp2!+0^ty!ISUg7%46vZM%;YHmatueRovF8LS|mLU2#k{{2AwZvOy
zEI4N^Mcuhft5ic0ET6EI-v8W;V3B*SkF5Wflk=<cB(2)z-m57K!c$l`?z^k^KT^pr
zt^`;G36;1W?kDx9c%s{B8@03#;~i+&ohKGw^ptvP(Z*x1a8p3z6F_1~IC-w6bs7rd
z5tCqZ$m?s5iF^pjr%b0fLgK1p&&|<*a@nkwyq-zf8YGKvJr^t7<B{If0#rkTzT*3!
zTO$#Dq_z#X#m>vp?0yi>Dz_m0(tmV|Nw<ZkA}5xPqRg4tFFZ>01L8{Rtw>D9Si=G{
z4@rWpB49dF<#Qe}`s6X{#|wR5>6s-Jjx4|X5T`)f5Sm<UOG=y)dgH5^CHUHD2SBHT
z)6AjT#@yV8m%k?ACoCJ(Z_m*|tA$%NIf$TPnaQz;vN#~B{+$@ZQn4ayqFim|t^E4n
z5n8N_@%2$rqFMJbgbvYN@Ho$BPKocfk-UraW!{zknrdk+jtm>Iqd2^j!A6kHw_Jqg
zsxIQvAwVg)PFy#+@&RzZE<>udm7sCdho|-xh2SYNK*jdH&_sMvA%rAW7l%rGzeTk_
z3JeqV`4HIPq96K$L(5p4XuNuAm2QXbprGUBN@0fDO$tAV&$?Lqk&&t^JHdry_+PNZ
z(pfb3db#_X>o>fQ6Y7Cy`cwL^If;TWdx|V~WS%)55(oarXFF!Sv3IZ5AS2OrtGdl@
zDD8T1ho(sG!936TRzgxU<^xR>lTf0tR<W6@)jjz7G79n#BS0(S;_*{$)h`R<UIm3?
zZq4g^nHQ<Z;X1mErLT}u^w*r;#bu_Srg)Y0`E;^3rH+W?HmbO^aBlwC#*j9@&rqcD
zpujh`mF7){*{d_emFG$GIuB7q>rQ5_+1K!XT&lh9W+}QiW5y29x<A8`#PFvw5AZj>
ztPovVD}V6>O=ZO!JlVAHx)<(BDG2{L_@xgE`R^w6i$FV)fK5w=FWe&W{7awW-TI5p
zyE}$@?F9;1*%6?pr7!rOFU+IrxA>7T;fnjyV@n&4FS|fIHNhZuY$VhC+%#I6Orvmz
zl^T@I#{x&s=?KSqkD@qHCwktcJ%KiJL@Og>fYA;1MBe&-fUnt>s!K<l)}IhZO&=AZ
zgtOy+fiB8p5lqb3|I(PgIhwO9^z%dmulr6xXy>=MGkj@O5gYL)LM3YtqF4Bl6Puu+
zA(KuokD8fWH<=D$wt)nQZK$GeJWYfC+rR9b1du>#!RG;=X>9sMoFOUNdYM$RL55G&
zab$(I=o-_WvUyoN47z*}bhg|VQL!E-Q}Sp<;<dH#|CoL#1;%d7ZVx~N!c|jZ;o|&b
zpvxO0bJU+N|0)$lkR=B+wpI)HD##Z8d0#v_Z)MFYCxM&2h^~4WNBX~s<=*b2hsgcn
zhj^8CK%rCF52yTrk*$Ow_qhC?f0CqZT5VbGYd3E!CV&PSvbe(l8gga+@Sj5RM4uGh
zd;oU=+1ChypZdDLmIqy|YT18%XReA<V(#pNemio9@l5ZoLP$Uixl{l8Q~Pt~`we^|
z{m!JVkW>R1s#)9Nz)at!Hl<rB9Kkhxe>+_o#|R%Sq5*6I%AKHaKQ}xwkL}vCX1Z_H
z%{0M&3?&>I<QrIjQ>q@?ij_<BGN8#$ixULIA>D82*OilgGuL5r_l1F%uWZ~dQYB#&
z#%pP@CM@4H@d(D<&Z`GO-mSG()@_K#Gu{`>xf;?EGNCWj@t}=x*ZoV`v`-9}-Ie&*
ziv<Nq6>ztVLxDyd?YW@~vd+-cFrTkX=aH<~3%@`s&Qh)}mkCEr#v79Xd^O&!qFB$k
z<lyI)sLdh$6v&h{o0;zAylFHOGv+4;Zs+pYl6tvzUr5qR2v)igmr~mL<d_`xju-N@
z8=gU?(Q3Tn$AgR(J*<#3gYqwu{>%hIPg>DoZUlJ|9f`diWAW!m3@W?YoHtyuX<g`F
z7uRjTT1%rfl?TUrw=_mryZC3{+S`DZ>uY2@e$D9zUTSNCBQ3%Pdd9*-k0!2>RX$p$
zr1HH-I81=c_~=?5Qfqf2?Ofym6}y+~quCGmie;qJM1QUpHh$zMt$`6|Gsvmq>#uD2
zn8W((1|QSg($K&G-IT<Ljk(m+Vq%NI3Plep7komq4!OjclV0Kg*M}C%@x%j2%tzVE
zkaxLdfE?@u?H#-nsG5JrNYYWC5Cy9<!h9&;*CEQo0<EJwGOi*Oh2NB8PqZlEWC~n4
zVe>rIg{D#FOkCP1F+SHwFv;=?0#o?8?MAabQ#=-_6>GTL!Xxfbd9k5BB)JLC`pg)3
z8a_Rnap{5h#cRaTYT!QAJXbnMy8ZO<oU~x-zc-#e7zKB~bO6nm%2V2SHU;sY&Tdcp
zIrJOwtR<<cvV?m91_54)rnb%P3;5Pl)x2H1x%3$4cfl#XBd~fmIlX|Du3^!zI#yxu
z5a6<Sgymz$gydk7F8h_mQ_A&Km-i2}3HLU@cHTEkDN9k?xd~+|Hr|Q=Mb`Y;7j+@F
zA*||HP;sF77nCZcCP6E5(UMolXmYvQ^2g^CiZKbJE(N3tYqoCg;}k07wNiw2Tn$a+
z<Y%w|i+hB@Rt}M`RtmlWsU)C0Sg}ajidvoHe(woxuYb2Llr`V$EcWaS{L?|N*;em6
zA4D46mhqkxpNeZ+egA<RVN+Lh<2%!TSxdc9E26&i*eA8+b0B=NsA26R;`7Ax4l?Yp
zI*a|h$hn;R#_M$w*ei@o-qA^Mu)<6t35(1Ya6>v+DWhn5=oQ(#r0;BSR$Z&0??HQ~
zbKF8t;;%-*G$A^%q3GO>IOBEBc`v6I`yMnVpyy0XnLAMYfRrb;8PvK^&8VjV><Q*&
zdfHf~yl6*PaJRQFAs{cIiWH8?!}60JAK52kYt+TZASiAoiVgiWkFT6OPmm2oNfY7f
zsPGCmXT1+IXm%tQJ;nCe>BjA#6>b6u^!I<d&y@^@+x-{zBP@CLHd|Rd*&+WNcd!*F
zW~FS;q~!CGZ?0h+1ifj|12?o*QI4#AhqQl>B?{qVY!<zIX-Bh?^J0{=Y2J>JLIak;
zQ_spf#`#H#xYXf!;3k~^TMJ4}jZgj(wQ0bLP%$MXVFy0_-3E8H{yExpom852P<DCi
z82sqBro4T<)99+V=%v;uHC0R>%H{l~yLxZEq0i)9zW+AcL*sV=N<f?iu*9CG5Pm?O
zUXyN}FVxbK1ynJed#{;4$IMRaVZh?@1t&1&WGKyugYg8Cp88@Nk$UC_8hHGDJ8pzw
zp~6LmF;StfxX`tl{1%l!IOoq~L66M_W?|o&3t5M^`JKxby0PT?p=TT3cQ;YGeLFBK
z64D#)-q;SthY!4!^=j9Z&vG4(1=yzAMqW?S|Fn4=dQTwX1IYfzXo_C`X2pDu06zaY
zhEKMpcoC{o*#@lJkm21v13lfU3Sykj*$+y*N(`a;gSV?Lo^Z6{k9VQObk(-jt4Ex?
z#%CKHz-Xq7A3oAM+A;t2Dhv(xp0@T9=vdW;SEDn+@-1g39FZuR?H<G8R^Qy-veZ17
zjs$b`@_a}+n5L;o_0M}F`B=(pa}-5VY62{l!X_7M!2j^za6_!Lr1qH7d-Li!)H#ek
zYZ`!fZr(!G!HUu&4qED+TEC9AGQHwyC82u#;R=C3kAk4pJUn+B3JfV*`g))+SCTR}
z;`hc`>mG^!<~w%7K}I$v%3`!eDG-%hxApDNe1~-ON{+QhI(E+ldnIU7vhR&ge}-})
zgA5>cB+6hbuUfN|Z-}U^VHr10V4`@OE1fX$%X%wVpAI%LyDxumLVgW!CTqjJd*!YV
z{=LmrEseWz6NZ_oa^M6FM{LBGG=XpE>X*1h(YGKH5|!_YlLO|W6uvi2pR!q?cl3z9
z_g(Xe2rQc_@TtvWgjv~Y+cX?3KO-KlA6oW_9R2q?nNc+{<Xynm?~Nm8lapY3Bq<4m
z-|!vB+7{}|IV9W2?y(?`ci<0#sunU5?v_4}A+|-;Ec^(B;1KX?4ZMo*|6;lB0ct1`
zXK3;9N8(tYT39r<YPz^0e+kt$17+&6luFWo;Zn7pdwTpa->&|dG_Dl5W&q;GBKFKK
z_i}$XI8qyx8H$8kyzmO%?&{!%V5<pQvv+>K>7GDf&Lb-$h(s%pon5@<f3y>qgF2%$
zT^2Ju`o3n(HsdJy3mo<08CGF7nf{s?XoFDvr{(!$z$w;SeL~iB^7>m*v@c}tbvGDC
z%^ZN^fk3)MtSRr?6$M_77TfKITIddt#j`mZA!RQDbKpr!ecm8Z4ZwXPpOkek4QOy)
zdxmMmYVGF!mWt#O?1Y+W=(O@f7Cj>RM8KMi<rQ0Paer||-43}gQD1M?ceawK{P3?t
z1wW?WuoAgOiuis3cVKSPQ3xdw-(C46K48)i{vd-P8e++lLT|95@!_M2FVt=_RpQbk
z``}aiTj+w#&zMnc)Zi^ULv4TNDDv)H^btjp0)~3;l&qjt$#S4>uq#cy$4n8h0PfJd
zDGgmx8FK&KGW>hmK`K-EDp1nI_sXLk2s8S7^^IMQ0<wQUnTq%;zTuy4UypvAuZv8U
zwDvk?Qc47QJo@K|EcfSKiyC^&4(X$wwW+W;V<0sGk+A7mPOK}T<}FWD<laSu?pwd3
z(-tT@?YlLQzW~<VCE9Z{8HSf;TDp+#P5Y8W^`f>d=1?H&I<*+mM1#9anP9s3wBupF
zocPZ+=z~IZX%Hp6grv)_8fR(gh25N-`7fkFJ$m|0V!@^3VexK(n;rAM5)AL`+6~Se
zQH!Gn4ZmROXK4QyTh6~L_>nFtJxD6pE84!n!ZTlX;d%RBlk>Me3(Ob3l$cc1v*h0b
z6e8pv(bZE}FYR@qK#r&AX{(Rp^T&+~`yR>-2x%a#!ym8^uGB6)QEV)+p~>Ukejvg|
z`uQbG=k)#KO+-%@N?g8AEj<^1^X6jGKdRb$A=|6<%@8#}qd5(w(_+-Q-Z%rf^<zfB
zT0rel_vYVeEOi39Fusg1@w!d$*Yof*Ki^|^I$6xa9P=j5q7#6l_2SaOz#}tm#QcB}
z?NZ_N%=zA_jTbxqbaz{Ot`7$n>D?CJTKQAw^|^Y(`K}&Io&^pl@z1Wyy&8esRf@;>
zyArcDhF1pe01KRf(f%vO7B4wnSs6s4a)VIm<0%8dF81Z5qZeNo7K;I6bYsi%kx%Gc
z|IT+Mb2Qs8=DbgD;vb+RY!?09hX7{>Xmh$LbSXLGs(KdM#}FX*Q3hW;hi(`A`kAZS
z297+G^zBh3y_VAi-MBDms4!<l_I&cAWX>7iCFo-YDokMH)VK`IEk8P9*!8D9Gp2jJ
zNK3bZ+-MDJuqgH(gs8JHOXQz{>RFmEZ)*7y2ham8)7?yw-p^a7In32eOdAgmsru-j
z?l%njK}I_%U1-Ea_S}(%2?r)H45ObpW2~KXuUc6p^!%4*8SIkkcF<Z|PlrGUZqhVS
zVwLQ5X*nHD;jA0(2Ba*sN+|hty%YNH^M4#_NIjT4{~+^D*ss*0b($b&tHO;aB5<7n
zuqi<Q#5<dU746vK#E=EkiJcqA?K*>5y-t@+e~p?RH78R`CI*#FWurpvr6(<f(0UDM
zF!zlmvG{vz%pWj^NnqFa9vHm3+8!h-Hpu6Kn}EY39A*z;HyR56>n~pn)3x&qeTEUH
zSe4_lL>>iv%M;gi?P04p4C!>v>L2|zQ-@d6iFPptRPb$fn+7(&$j7sz4<Zgcflq<W
z<pIYg+98#48|4!Jp=g(TnfMRYS=6UiG*6<JGs)q0qr@`X3GqLECYkuuL%Efnbk3wy
zeyH<{LUFr`(vaXKe8<8aFf{cu?7R4LYFsh(QeQCjTP%OjY9x8Vxot_qv{?P?jialy
z!PS3^sd@_rq+*_RTEGaRMktgDx8T+<=hA`a<4CiY;2@P@^{>fANEG&t+<lG(f8WTD
z)!W$(Hp_?%83wwbO}LdL*u%`pwzva+qR3}qazuTYCF~_~+uf2uvD+TA6+WYL>=zv^
zBW8_7ub*ruu_#x8B{9BB89u<Da{isEI5Bl|DX>=-mNw7VH4M$QF<uUSeaq9eu}8E0
ztgNSlo0dY)BQ2mn9pcW9wnP~4y0d;Ny`OdLXkX~l{^e?VCv(G7P@L+LOMRe-Ho@qn
z?Ebb|yWA7}f}3p?h&^IgIXNX6`-L-C*X7^i9N+kinfh-1?!(c5qqa5#CwBBtO#wDG
zL1W&*tS82JWOIiebU>d+2vjdGHtZ0RO|6)v&`|D3CzKea^J6hk)_I52`m#AvlvB#d
zjj?V35}n@oZ@T%TjYj4LMCZ&*60L`r$((jCc1}*>$ulTYf^3-m^s40!;9k+6bvyTS
zz~ALq<Fk2rmgZXC#eQvxF|*OF+15;KZgNZLIjWu+O`X9)o+9-~rvZixwq{5j*wC|9
zomU<G@-SNba<h9Eu!(q5ZOvx`jdekqdz+y$!S@k0IqjxL$k+(zAg{7yXeJ@2n~Cz=
z4*JFJJmROTpyCZk8jR3OC*;or1&Y5U$b3X8g47KP$Jj|Eaftl~Xx76Jpmdbr@^w79
zP4vmgJb+R;HyfYPV!qq{_<8M5H+#U}0)%?5+4SA72*od5AH~ISmL~yab^R{1)P=j7
zN05bRD|Oc=6AkzqY4^%gqJ}q?n|3R0DUpv7q5|K`M%b2w3oJ?O^;@t*s`d=BkL=dW
zc~iRA;Lp8x4#oEJ*+hXav2HWJ5*LV3!d1Sq&tPrOu>HHJZ@vyY>p@z{z5_ZP$3$p9
zxYX8OH<5=2cfus{vC957xWanJ4<(MiCj+RbO?;naNGFn@WSgrhzSR|fq^=B;Z>E)V
zdKdI%j7h&#{oE}`M$bt)f<MoxxS@`5BJK2qYA&w%P{6x~{zxkt-R0^I&cuZ+?}|L_
z;m+`Wrf$wUkT!y(=^Opn@{<5pUMbo`dnb><_kT+U)h?vo@5XyBgtta`Bg=*KzJhT5
zr$08WOv>O6cN(=7*1UEP{jG_FuAB-^tU2Tes=l?4|6JAHGIfVJ=Q{@KNYB*cixXg$
zbW8;PY@!Qq7waS(5Y92>S+_a%*i3jDku8jd_wCbSNuGR_i48tvZ|$giS2U4r3TLv;
z+5c<rdd;P~vXC(DV}|ggLED|%poC4xH@5cj){Ch8EqnCFYx#+!>%N`mWU6fJr42AT
z1BHhid^CL;*X_N@s1N-Ae<TToqi^KC%kg3T3H|p+mzA=d^cUYBk!e#Z3)19ZU~?Ba
zi6>;64!?w#A?8D+6Kgo`fg$}udDdsSdptS(g~pgp;=|%fS<Nrx?=fOcP#Ea1@b8cu
zY`^3>b#$KAbzQt#7gP*6(to&*jDBZbaP$&bc$C9aRrO^K%9~JCQWXQJ3iqw83#YAQ
z0UP+3tHvm=`-`GVjg7GCE^f1Vys`nFO2A*)_Qx}6ej~Yb<~EodpNA+{!LaLJoGs$R
zrY|m^fi;c+b-$Y+j&lx6AVjLbdy_P$3LQCqttPk5=tHF>8}dAM*Ecz;CF<b4-7z#y
zqmYq0OEy~pOf<O&6<uefWP6}WiP81hGBL9R?#ZWxg&K2uJ{<mr?LE~H8YKIU7kZrj
z#zat!v2IdT@$HC?`N1GN#p&12Ka#R1Gkt}g;~MKtAym`JQwJjJf%vA=u2o(tnkD0#
zBlo_jI*ggs5w}L(l%WM-1Wdti+gc&HIk9+Wt6#}>KRo&&68u&smvv;KA-A@^O?NL8
z2`)no^(j<n54`^3+N9qdVHbzyL5St^`%}>cMS;xMh1698<o<#YDoV))3Cotu7f><!
z=EqIYZ5VAzVIf-4>%)2>G$P0&w%oODcn+4=NL};!2TQAg485+_SE>_3&xeD_T}kU^
zUk5~Aaehpx&rQ@vbT>NTc+gxj<O}h4C8ZrW$Shw9`GvLU@lte+{+8I|5vr8?U+Xc4
z7TfryA2igvAy0$iCbv-72E$R~=bO4DSu{apSM+qvLNRP9rV3#(4cqA{NojKCu7p_k
xpRk#kviao9uim5gv%{vxTK`OpzmWwadnToAr)AgM{@?zwvb?%noy@oJ{{iP1y#@dP

literal 0
HcmV?d00001


From a896da0d91844ed1332fae4d476582308af7c537 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 21 May 2012 21:47:15 +0200
Subject: [PATCH 0039/1537] Contacts: XSS fix. Still some more to check.

---
 apps/contacts/lib/vcard.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 91ae3a7514..2414efe676 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -188,6 +188,9 @@ class OC_Contacts_VCard{
 			if($upgrade && in_array($property->name, $stringprops)) {
 				self::decodeProperty($property);
 			}
+			if(in_array($property->name, $stringprops)) {
+				$property->value = strip_tags($property->value);
+			}
 			// Fix format of type parameters.
 			if($upgrade && in_array($property->name, $typeprops)) {
 				OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(),OCP\Util::DEBUG);

From 8cd7410447458aa0d30b20c892b812f34c4e54da Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 22 May 2012 12:15:51 +0200
Subject: [PATCH 0040/1537] encryption is not yet compatible with ldap

---
 apps/files_encryption/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index ad87763a22..8e64b0cafd 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password.</description>
+	<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>4</require>

From d2e2a2b2c0a044113082440b60c50f8c3f7bdfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Tue, 22 May 2012 13:10:42 +0200
Subject: [PATCH 0041/1537] prevent apps from printing output from app.php

---
 lib/app.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index 8ec042ddd6..04fc264d11 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -63,11 +63,14 @@ class OC_App{
 
 		// The rest comes here
 		$apps = self::getEnabledApps();
+		// prevent app.php from printing output
+		ob_start();
 		foreach( $apps as $app ){
 			if((is_null($types) or self::isType($app,$types))){
 				self::loadApp($app);
 			}
 		}
+		ob_end_clean();
 
 		self::$init = true;
 

From 27f7dae9325a00ca19a25d56370729b475c5946e Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@jack-laptop.(none)>
Date: Tue, 22 May 2012 13:42:55 +0100
Subject: [PATCH 0042/1537] removed closing php tag

---
 apps/files_versions/appinfo/app.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index fd31a0bb67..457c512535 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -12,6 +12,4 @@ OCP\App::registerAdmin('files_versions', 'settings');
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
-
-?>
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
\ No newline at end of file

From 60fdc13ae60a4d1bb62cbf29a8ab4b5ac1159709 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 22 May 2012 20:22:53 +0200
Subject: [PATCH 0043/1537] enable running unit tests from cli

---
 lib/base.php    | 25 ++++++++++++++++---------
 tests/index.php | 10 ++++++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index fb2d978f44..f3d6689fa2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -78,6 +78,10 @@ class OC{
 	 * requested file of app
 	 */
 	public static $REQUESTEDFILE = '';
+	/**
+	 * check if owncloud runs in cli mode
+	 */
+	public static $CLI = false;
 	/**
 	 * SPL autoload
 	 */
@@ -320,6 +324,7 @@ class OC{
 		if (defined('DEBUG') && DEBUG){
 			ini_set('display_errors', 1);
 		}
+		self::$CLI=(php_sapi_name() == 'cli');
 
 		date_default_timezone_set('Europe/Berlin');
 		ini_set('arg_separator.output','&amp;');
@@ -369,15 +374,17 @@ class OC{
 		self::checkInstalled();
 		self::checkSSL();
 
-                // CSRF protection
-                if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
-                if(isset($_SERVER['HTTPS']) and $_SERVER['HTTPS']<>'') $protocol='https://'; else $protocol='http://';
-                $server=$protocol.$_SERVER['SERVER_NAME'];
-                if(($_SERVER['REQUEST_METHOD']=='POST') and (substr($referer,0,strlen($server))<>$server)) {
-                        $url = $protocol.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
-                        header("Location: $url");
-                        exit();
-                } 
+		// CSRF protection
+		if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
+		if(isset($_SERVER['HTTPS']) and $_SERVER['HTTPS']<>'') $protocol='https://'; else $protocol='http://';
+		if(!self::$CLI){
+			$server=$protocol.$_SERVER['SERVER_NAME'];
+			if(($_SERVER['REQUEST_METHOD']=='POST') and (substr($referer,0,strlen($server))<>$server)) {
+				$url = $protocol.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+				header("Location: $url");
+				exit();
+			}
+		}
 
 		self::initSession();
 		self::initTemplateEngine();
diff --git a/tests/index.php b/tests/index.php
index 6dec1b050f..9c5178f81a 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -38,7 +38,13 @@ foreach($apps as $app){
 }
 
 function loadTests($dir=''){
-	$test=isset($_GET['test'])?$_GET['test']:false;
+	if(OC::$CLI){
+		$reporter='TextReporter';
+		$test=isset($_SERVER['argv'][1])?$_SERVER['argv'][1]:false;
+	}else{
+		$reporter='HtmlReporter';
+		$test=isset($_GET['test'])?$_GET['test']:false;
+	}
 	if($dh=opendir($dir)){
 		while($name=readdir($dh)){
 			if(substr($name,0,1)!='.'){//no hidden files, '.' or '..'
@@ -51,7 +57,7 @@ function loadTests($dir=''){
 						$testCase=new TestSuite($name);
 						$testCase->addFile($file);
 						if($testCase->getSize()>0){
-							$testCase->run(new HtmlReporter());
+							$testCase->run(new $reporter());
 						}
 					}
 				}

From 97d682dc13eac54b4ddebd97e2089c42c4b799e2 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 23 May 2012 21:02:34 +0000
Subject: [PATCH 0044/1537] Correct small style problem with task app fix
 #oc-689

---
 apps/tasks/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
index d78521bc09..3cf175e646 100644
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -32,7 +32,7 @@
 
 .task .completed {position:absolute;left:3em;top:0.3em;}
 
-.task .summary{padding-left:4em;}
+.task .summary{padding-left:4em;height:2em;}
 .task .summary input{position:relative;left:5px;}
 .task.done .summary{text-decoration:line-through;}
 

From 24318354f27978723c55f39106234d8683eebd82 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 24 May 2012 00:49:21 +0200
Subject: [PATCH 0045/1537] changed the default from Berlin to UTC. Greetings
 form Berlin by the way ;-)

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index f3d6689fa2..f4540853ba 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -326,7 +326,7 @@ class OC{
 		}
 		self::$CLI=(php_sapi_name() == 'cli');
 
-		date_default_timezone_set('Europe/Berlin');
+		date_default_timezone_set('UTC');
 		ini_set('arg_separator.output','&amp;');
 
 		//try to configure php to enable big file uploads.

From 970124a90b1d20382699680e90eeb52f70cab62c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 23 May 2012 19:35:29 -0400
Subject: [PATCH 0046/1537] Fix private link sharing via email, fix for bug
 oc-750

---
 apps/files_sharing/js/share.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index a1fa3bb458..96c9017dbf 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -361,7 +361,6 @@ $(document).ready(function() {
 	});
 
 	$('#emailPrivateLink').live('submit', function() {
-		event.preventDefault();
 		OC.Share.emailPrivateLink();
 	});
 });
\ No newline at end of file

From bee724c53e243bda82c9490154fcd13079e41082 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 24 May 2012 11:06:03 -0400
Subject: [PATCH 0047/1537] Initial work on UI for mounting external storage

---
 apps/files_external/appinfo/app.php        |  1 +
 apps/files_external/appinfo/info.xml       |  2 +-
 apps/files_external/css/settings.css       |  6 ++
 apps/files_external/js/settings.js         | 59 +++++++++++++++++
 apps/files_external/settings.php           | 35 ++++++++++
 apps/files_external/templates/settings.php | 74 ++++++++++++++++++++++
 6 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 apps/files_external/css/settings.css
 create mode 100644 apps/files_external/js/settings.js
 create mode 100644 apps/files_external/settings.php
 create mode 100644 apps/files_external/templates/settings.php

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 784ed032d4..2940a07025 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -10,3 +10,4 @@ OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php';
 OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php';
 OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
 OC::$CLASSPATH['OC_Filestorage_SWIFT']='apps/files_external/lib/swift.php';
+OCP\App::registerAdmin('files_external', 'settings');
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index c324730593..e0301365d1 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>External storage support</name>
 	<description>Mount external storage sources</description>
 	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
+	<author>Robin Appelman, Michael Gapczynski</author>
 	<require>4</require>
 	<shipped>true</shipped>
 	<types>
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
new file mode 100644
index 0000000000..b11af752ec
--- /dev/null
+++ b/apps/files_external/css/settings.css
@@ -0,0 +1,6 @@
+.error { color: #FF3B3B; }
+td.type { width:8em; }
+td.mount, td.options, td.applicable { width:10em; }
+#addStorage>td { border:none; }
+#addStorage>td:not(.selectStorage) { visibility:hidden; }
+#selectStorage { margin-left:-10px; }
\ No newline at end of file
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
new file mode 100644
index 0000000000..9a558ad6e4
--- /dev/null
+++ b/apps/files_external/js/settings.js
@@ -0,0 +1,59 @@
+$(document).ready(function(){
+
+	function applicableChange(applicable) {
+		if (applicable == 'Global') {
+			
+		}
+		console.log(applicable);
+	}
+
+	$('#selectStorage').live('change', function() {
+		var tr = $(this).parent().parent();
+		$('#externalStorage tbody').last().append($(tr).clone());
+		var selected = $(this).val();
+		$(this).parent().text(selected);
+		var backends = $(this).data('configurations').split(';');
+		var configuration = [];
+		// Find selected backend configuration parameters
+		$.each(backends, function(index, backend) {
+			if (backend.split(':')[0] == selected) {
+				configuration = backend.split(':')[1].split(',');
+				// 				break;
+			}
+		});
+		var td = $(tr).find('td.configuration');
+		$.each(configuration, function(index, config) {
+			if (config.indexOf('*') != -1) {
+				td.append('<input type="password" placeholder="'+config.substring(1)+'" />');
+			} else {
+				td.append('<input type="text" placeholder="'+config+'" />');
+			}
+		});
+		$(tr).find('td').last().attr('class', 'remove');
+		$(tr).removeAttr('id');
+		$(this).remove();
+	});
+
+	$('td.remove>img').live('click', function() {
+		$(this).parent().parent().remove();
+		// TODO remove storage
+	});
+
+	$('#externalStorage select[multiple]').each(function(index,element){
+		applyMultiplySelect($(element));
+	});
+
+	function applyMultiplySelect(element) {
+		var checkHandeler=false;
+		element.multiSelect({
+			oncheck:applicableChange,
+			onuncheck:applicableChange,
+			minWidth: 120,
+		});
+	}
+
+	$('#allowUserMounting').bind('change', function() {
+		// TODO save setting
+	});
+
+});
\ No newline at end of file
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
new file mode 100644
index 0000000000..ce1b308d75
--- /dev/null
+++ b/apps/files_external/settings.php
@@ -0,0 +1,35 @@
+<?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/>.
+*/
+
+OCP\Util::addscript('files_external', 'settings');
+OCP\Util::addstyle('files_external', 'settings');
+$tmpl = new OCP\Template('files_external', 'settings');
+$tmpl->assign('allowUserMounting', 'yes');
+$tmpl->assign('isAdminPage', true);
+$tmpl->assign('storage', array());
+$tmpl->assign('groups', OC_Group::getGroups());
+$tmpl->assign('backends', array('Amazon S3', 'FTP', 'Google Drive', 'SWIFT', 'WebDAV'));
+$tmpl->assign('configurations', '');
+$tmpl->assign('options', array('Encrypt', 'Version control', 'Allow sharing'));
+return $tmpl->fetchPage();
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
new file mode 100644
index 0000000000..e34c032239
--- /dev/null
+++ b/apps/files_external/templates/settings.php
@@ -0,0 +1,74 @@
+<form id="files_external">
+	<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
+		<?php if (isset($_['storage'])): ?>
+		<table id="externalStorage">
+			<thead>
+				<tr>
+					<th><?php echo $l->t('Type'); ?></th>
+					<th><?php echo $l->t('Configuration'); ?></th>
+					<th><?php echo $l->t('Mount Location'); ?></th>
+					<th><?php echo $l->t('Options'); ?></th>
+					<?php if ($_['isAdminPage'] == true) echo '<th>'.$l->t('Applicable').'</th>'; ?>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php $_['storage'] = array_merge($_['storage'], array(array('id' => 'addStorage', 'mount' => ''))); ?>
+			<?php foreach($_['storage'] as $storage): ?>
+				<tr <?php if ($storage['id'] == 'addStorage') echo 'id="addStorage"'; ?> data-storage-id="<?php echo $storage['id']; ?>">
+					<?php if ($storage['id'] == 'addStorage'): ?>
+						<td class="selectStorage">
+							<select id="selectStorage" data-configurations="<?php echo $_['configurations']; ?>">
+								<option value="" disabled selected style="display:none;"><?php echo $l->t('Add storage'); ?></option>
+								<?php foreach($_['backends'] as $backend): ?>
+									<option value="<?php echo $backend; ?>"><?php echo $backend; ?></option>
+								<?php endforeach; ?>
+							</select>
+						</td>
+					<?php else: ?>
+						<td class="type" <?php if ($storage['status'] == 'error') echo 'class="error"'; ?>><?php echo $storage['type']; ?></td>
+					<?php endif; ?>
+					<td class ="configuration">
+					<?php if (isset($storage['configuration'])): ?>
+						<?php foreach($storage['configuration'] as $parameter => $value): ?>
+							<?php if (strpos($parameter, '*') !== false): ?>
+								<input type="password" value="<?php echo $value; ?>" placeholder="<?php echo $l->t(substr($parameter, 1)); ?>" />
+							<?php else: ?>
+								<input type="text" value="<?php echo $value; ?>" placeholder="<?php echo $l->t($parameter); ?>" />
+							<?php endif; ?>
+						<?php endforeach; ?>
+					<?php endif; ?>
+					</td>
+					<td class="mount"><input type="text" name="storageMountLocation" value="<?php echo $storage['mount']; ?>" placeholder="<?php echo $l->t('Mount Location'); ?>" /></td>
+					<td class="options">
+						<select class="selectOptions" title="<?php echo $l->t('None set')?>" multiple="multiple">
+							<?php if (OCP\App::isEnabled('files_encryption')) echo '<option value="Encrypt">Encrypt</option>'; ?>
+							<?php if (OCP\App::isEnabled('files_versions')) echo '<option value="Version control">Version control</option>'; ?>
+							<?php if (OCP\App::isEnabled('files_sharing')) echo '<option value="Allow sharing">Allow sharing</option>'; ?>
+						</select>
+					</td>
+					<?php if ($_['isAdminPage'] == true): ?>
+						<td class="applicable">
+							<select class="selectApplicable" data-storage-applicable="<?php echo $storage['applicable']; ?>" title="<?php echo $l->t('None set'); ?>" multiple="multiple">
+								<option value="Global"><?php echo $l->t('Global'); ?></option>
+								<?php foreach($_['groups'] as $group): ?>
+									<option value="<?php echo $group; ?>"><?php echo $group; ?></option>
+								<?php endforeach; ?>
+							</select>
+						</td>
+					<?php endif; ?>
+					<td <?php if ($storage['id'] != 'addStorage') echo 'class="remove"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+		<?php if ($_['isAdminPage'] == true): ?>
+			<br />
+			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
+			<label for="allowUserMounting"><?php echo $l->t('Enable User External Storage'); ?></label><br/>
+			<em><?php echo $l->t('Allow users to mount their own external storage'); ?></em>
+		<?php endif; ?>
+	</fieldset>
+</form>
\ No newline at end of file

From 2f40f11c873b22881ad3ed21549253e53b6927ca Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 24 May 2012 18:22:33 +0200
Subject: [PATCH 0048/1537] smb filestorage backend

---
 3rdparty/smb4php/smb.php             | 439 +++++++++++++++++++++++++++
 apps/files_external/appinfo/app.php  |   2 +
 apps/files_external/lib/smb.php      | 120 ++++++++
 apps/files_external/tests/config.php |   7 +
 apps/files_external/tests/smb.php    |  30 ++
 5 files changed, 598 insertions(+)
 create mode 100644 3rdparty/smb4php/smb.php
 create mode 100644 apps/files_external/lib/smb.php
 create mode 100644 apps/files_external/tests/smb.php

diff --git a/3rdparty/smb4php/smb.php b/3rdparty/smb4php/smb.php
new file mode 100644
index 0000000000..69fb2487bc
--- /dev/null
+++ b/3rdparty/smb4php/smb.php
@@ -0,0 +1,439 @@
+<?php
+###################################################################
+# smb.php
+# This class implements a SMB stream wrapper based on 'smbclient'
+#
+# Date: lun oct 22 10:35:35 CEST 2007
+#
+# Homepage: http://www.phpclasses.org/smb4php
+#
+# Copyright (c) 2007 Victor M. Varela <vmvarela@gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+###################################################################
+
+define ('SMB4PHP_VERSION', '0.8');
+
+###################################################################
+# CONFIGURATION SECTION - Change for your needs
+###################################################################
+
+define ('SMB4PHP_SMBCLIENT', 'smbclient');
+define ('SMB4PHP_SMBOPTIONS', 'TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_RCVBUF=8192 SO_SNDBUF=8192');
+define ('SMB4PHP_AUTHMODE', 'arg'); # set to 'env' to use USER enviroment variable
+
+###################################################################
+# SMB - commands that does not need an instance
+###################################################################
+
+$GLOBALS['__smb_cache'] = array ('stat' => array (), 'dir' => array ());
+
+class smb {
+
+	function parse_url ($url) {
+		$pu = parse_url (trim($url));
+		foreach (array ('domain', 'user', 'pass', 'host', 'port', 'path') as $i)
+			if (! isset($pu[$i])) $pu[$i] = '';
+		if (count ($userdomain = explode (';', urldecode ($pu['user']))) > 1)
+			@list ($pu['domain'], $pu['user']) = $userdomain;
+		$path = preg_replace (array ('/^\//', '/\/$/'), '', urldecode ($pu['path']));
+		list ($pu['share'], $pu['path']) = (preg_match ('/^([^\/]+)\/(.*)/', $path, $regs))
+		? array ($regs[1], preg_replace ('/\//', '\\', $regs[2]))
+		: array ($path, '');
+		$pu['type'] = $pu['path'] ? 'path' : ($pu['share'] ? 'share' : ($pu['host'] ? 'host' : '**error**'));
+		if (! ($pu['port'] = intval(@$pu['port']))) $pu['port'] = 139;
+		return $pu;
+	}
+
+
+	function look ($purl) {
+		return smb::client ('-L ' . escapeshellarg ($purl['host']), $purl);
+	}
+
+
+	function execute ($command, $purl) {
+		return smb::client ('-d 0 '
+			. escapeshellarg ('//' . $purl['host'] . '/' . $purl['share'])
+			. ' -c ' . escapeshellarg ($command), $purl
+		);
+	}
+
+	function client ($params, $purl) {
+
+		static $regexp = array (
+		'^added interface ip=(.*) bcast=(.*) nmask=(.*)$' => 'skip',
+		'Anonymous login successful' => 'skip',
+		'^Domain=\[(.*)\] OS=\[(.*)\] Server=\[(.*)\]$' => 'skip',
+		'^\tSharename[ ]+Type[ ]+Comment$' => 'shares',
+		'^\t---------[ ]+----[ ]+-------$' => 'skip',
+		'^\tServer   [ ]+Comment$' => 'servers',
+		'^\t---------[ ]+-------$' => 'skip',
+		'^\tWorkgroup[ ]+Master$' => 'workg',
+		'^\t(.*)[ ]+(Disk|IPC)[ ]+IPC.*$' => 'skip',
+		'^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
+		'^\t(.*)[ ]+(Disk)[ ]+(.*)$' => 'share',
+		'^\t(.*)[ ]+(Printer)[ ]+(.*)$' => 'skip',
+		'([0-9]+) blocks of size ([0-9]+)\. ([0-9]+) blocks available' => 'skip',
+		'Got a positive name query response from ' => 'skip',
+		'^(session setup failed): (.*)$' => 'error',
+		'^(.*): ERRSRV - ERRbadpw' => 'error',
+		'^Error returning browse list: (.*)$' => 'error',
+		'^tree connect failed: (.*)$' => 'error',
+		'^(Connection to .* failed)$' => 'error',
+		'^NT_STATUS_(.*) ' => 'error',
+		'^NT_STATUS_(.*)\$' => 'error',
+		'ERRDOS - ERRbadpath \((.*).\)' => 'error',
+		'cd (.*): (.*)$' => 'error',
+		'^cd (.*): NT_STATUS_(.*)' => 'error',
+		'^\t(.*)$' => 'srvorwg',
+		'^([0-9]+)[ ]+([0-9]+)[ ]+(.*)$' => 'skip',
+		'^Job ([0-9]+) cancelled' => 'skip',
+		'^[ ]+(.*)[ ]+([0-9]+)[ ]+(Mon|Tue|Wed|Thu|Fri|Sat|Sun)[ ](Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]+([0-9]+)[ ]+([0-9]{2}:[0-9]{2}:[0-9]{2})[ ]([0-9]{4})$' => 'files',
+		'^message start: ERRSRV - (ERRmsgoff)' => 'error'
+		);
+
+		if (SMB4PHP_AUTHMODE == 'env') {
+			putenv("USER={$purl['user']}%{$purl['pass']}");
+			$auth = '';
+		} else {
+			$auth = ($purl['user'] <> '' ? (' -U ' . escapeshellarg ($purl['user'] . '%' . $purl['pass'])) : '');
+		}
+		if ($purl['domain'] <> '') {
+			$auth .= ' -W ' . escapeshellarg ($purl['domain']);
+		}
+		$port = ($purl['port'] <> 139 ? ' -p ' . escapeshellarg ($purl['port']) : '');
+		$options = '-O ' . escapeshellarg(SMB4PHP_SMBOPTIONS);
+		$output = popen (SMB4PHP_SMBCLIENT." -N {$auth} {$options} {$port} {$options} {$params} 2>/dev/null", 'r');
+		$info = array ();
+		$info['info']= array ();
+		while ($line = fgets ($output, 4096)) {
+			list ($tag, $regs, $i) = array ('skip', array (), array ());
+			reset ($regexp);
+			foreach ($regexp as $r => $t) if (preg_match ('/'.$r.'/', $line, $regs)) {
+				$tag = $t;
+				break;
+			}
+			switch ($tag) {
+				case 'skip':    continue;
+				case 'shares':  $mode = 'shares';     break;
+				case 'servers': $mode = 'servers';    break;
+				case 'workg':   $mode = 'workgroups'; break;
+				case 'share':
+					list($name, $type) = array (
+						trim(substr($line, 1, 15)),
+						trim(strtolower(substr($line, 17, 10)))
+					);
+					$i = ($type <> 'disk' && preg_match('/^(.*) Disk/', $line, $regs))
+						? array(trim($regs[1]), 'disk')
+						: array($name, 'disk');
+					break;
+				case 'srvorwg':
+					list ($name, $master) = array (
+						strtolower(trim(substr($line,1,21))),
+						strtolower(trim(substr($line, 22)))
+					);
+					$i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master);
+					break;
+				case 'files':
+					list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R]+)$/", trim ($regs[1]), $regs2)
+						? array (trim ($regs2[2]), trim ($regs2[1]))
+						: array ('', trim ($regs[1]));
+					list ($his, $im) = array (
+					explode(':', $regs[6]), 1 + strpos("JanFebMarAprMayJunJulAugSepOctNovDec", $regs[4]) / 3);
+					$i = ($name <> '.' && $name <> '..')
+						? array (
+							$name,
+							(strpos($attr,'D') === FALSE) ? 'file' : 'folder',
+							'attr' => $attr,
+							'size' => intval($regs[2]),
+							'time' => mktime ($his[0], $his[1], $his[2], $im, $regs[5], $regs[7])
+						)
+						: array();
+					break;
+				case 'error':
+					if(substr($regs[0],0,22)=='NT_STATUS_NO_SUCH_FILE'){
+						return false;
+					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_NAME_COLLISION'){
+						return false;
+					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){
+						return false;
+					}
+					trigger_error($regs[0].' params('.$params.')', E_USER_ERROR);
+			}
+			if ($i) switch ($i[1]) {
+				case 'file':
+				case 'folder':    $info['info'][$i[0]] = $i;
+				case 'disk':
+				case 'server':
+				case 'workgroup': $info[$i[1]][] = $i[0];
+			}
+		}
+		pclose($output);
+		return $info;
+	}
+
+
+	# stats
+
+	function url_stat ($url, $flags = STREAM_URL_STAT_LINK) {
+		if ($s = smb::getstatcache($url)) { return $s; }
+		list ($stat, $pu) = array (array (), smb::parse_url ($url));
+		switch ($pu['type']) {
+			case 'host':
+				if ($o = smb::look ($pu))
+				$stat = stat ("/tmp");
+				else
+				trigger_error ("url_stat(): list failed for host '{$host}'", E_USER_WARNING);
+				break;
+			case 'share':
+				if ($o = smb::look ($pu)) {
+				$found = FALSE;
+				$lshare = strtolower ($pu['share']);  # fix by Eric Leung
+				foreach ($o['disk'] as $s) if ($lshare == strtolower($s)) {
+					$found = TRUE;
+					$stat = stat ("/tmp");
+					break;
+				}
+				if (! $found)
+					trigger_error ("url_stat(): disk resource '{$share}' not found in '{$host}'", E_USER_WARNING);
+				}
+				break;
+			case 'path':
+				if ($o = smb::execute ('dir "'.$pu['path'].'"', $pu)) {
+					$p = explode('\\', $pu['path']);
+					$name = $p[count($p)-1];
+					if (isset ($o['info'][$name])) {
+						$stat = smb::addstatcache ($url, $o['info'][$name]);
+					} else {
+						trigger_error ("url_stat(): path '{$pu['path']}' not found", E_USER_WARNING);
+					}
+				} else {
+					return false;
+// 					trigger_error ("url_stat(): dir failed for path '{$pu['path']}'", E_USER_WARNING);
+				}
+				break;
+			default: trigger_error ('error in URL', E_USER_ERROR);
+		}
+		return $stat;
+	}
+
+	function addstatcache ($url, $info) {
+		global $__smb_cache;
+		$is_file = (strpos ($info['attr'],'D') === FALSE);
+		$s = ($is_file) ? stat ('/etc/passwd') : stat ('/tmp');
+		$s[7] = $s['size'] = $info['size'];
+		$s[8] = $s[9] = $s[10] = $s['atime'] = $s['mtime'] = $s['ctime'] = $info['time'];
+		return $__smb_cache['stat'][$url] = $s;
+	}
+
+	function getstatcache ($url) {
+		global $__smb_cache;
+		return isset ($__smb_cache['stat'][$url]) ? $__smb_cache['stat'][$url] : FALSE;
+	}
+
+	function clearstatcache ($url='') {
+		global $__smb_cache;
+		if ($url == '') $__smb_cache['stat'] = array (); else unset ($__smb_cache['stat'][$url]);
+	}
+
+
+	# commands
+
+	function unlink ($url) {
+		$pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('unlink(): error in URL', E_USER_ERROR);
+		smb::clearstatcache ($url);
+		smb_stream_wrapper::cleardircache (dirname($url));
+		return smb::execute ('del "'.$pu['path'].'"', $pu);
+	}
+
+	function rename ($url_from, $url_to) {
+		list ($from, $to) = array (smb::parse_url($url_from), smb::parse_url($url_to));
+		if ($from['host'] <> $to['host'] ||
+			$from['share'] <> $to['share'] ||
+			$from['user'] <> $to['user'] ||
+			$from['pass'] <> $to['pass'] ||
+			$from['domain'] <> $to['domain']) {
+			trigger_error('rename(): FROM & TO must be in same server-share-user-pass-domain', E_USER_ERROR);
+		}
+		if ($from['type'] <> 'path' || $to['type'] <> 'path') {
+			trigger_error('rename(): error in URL', E_USER_ERROR);
+		}
+		smb::clearstatcache ($url_from);
+		return smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+	}
+
+	function mkdir ($url, $mode, $options) {
+		$pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('mkdir(): error in URL', E_USER_ERROR);
+		return smb::execute ('mkdir "'.$pu['path'].'"', $pu)!==false;
+	}
+
+	function rmdir ($url) {
+		$pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('rmdir(): error in URL', E_USER_ERROR);
+		smb::clearstatcache ($url);
+		smb_stream_wrapper::cleardircache (dirname($url));
+		return smb::execute ('rmdir "'.$pu['path'].'"', $pu)!==false;
+	}
+
+}
+
+###################################################################
+# SMB_STREAM_WRAPPER - class to be registered for smb:// URLs
+###################################################################
+
+class smb_stream_wrapper extends smb {
+
+	# variables
+
+	private $stream, $url, $parsed_url = array (), $mode, $tmpfile;
+	private $need_flush = FALSE;
+	private $dir = array (), $dir_index = -1;
+
+
+	# directories
+
+	function dir_opendir ($url, $options) {
+		if ($d = $this->getdircache ($url)) {
+			$this->dir = $d;
+			$this->dir_index = 0;
+			return TRUE;
+		}
+		$pu = smb::parse_url ($url);
+		switch ($pu['type']) {
+			case 'host':
+				if ($o = smb::look ($pu)) {
+					$this->dir = $o['disk'];
+					$this->dir_index = 0;
+				} else {
+					trigger_error ("dir_opendir(): list failed for host '{$pu['host']}'", E_USER_WARNING);
+					return false;
+				}
+				break;
+			case 'share':
+			case 'path':
+				if (is_array($o = smb::execute ('dir "'.$pu['path'].'\*"', $pu))) {
+					$this->dir = array_keys($o['info']);
+					$this->dir_index = 0;
+					$this->adddircache ($url, $this->dir);
+					foreach ($o['info'] as $name => $info) {
+						smb::addstatcache($url . '/' . urlencode($name), $info);
+					}
+				} else {
+					trigger_error ("dir_opendir(): dir failed for path '".$pu['path']."'", E_USER_WARNING);
+					return false;
+				}
+				break;
+			default:
+				trigger_error ('dir_opendir(): error in URL', E_USER_ERROR);
+				return false;
+		}
+		return TRUE;
+	}
+
+	function dir_readdir () {
+		return ($this->dir_index < count($this->dir)) ? $this->dir[$this->dir_index++] : FALSE;
+	}
+
+	function dir_rewinddir () { $this->dir_index = 0; }
+
+	function dir_closedir () { $this->dir = array(); $this->dir_index = -1; return TRUE; }
+
+
+	# cache
+
+	function adddircache ($url, $content) {
+		global $__smb_cache;
+		return $__smb_cache['dir'][$url] = $content;
+	}
+
+	function getdircache ($url) {
+		global $__smb_cache;
+		return isset ($__smb_cache['dir'][$url]) ? $__smb_cache['dir'][$url] : FALSE;
+	}
+
+	function cleardircache ($url='') {
+		global $__smb_cache;
+		if ($url == ''){
+			$__smb_cache['dir'] = array ();
+		}else{
+			unset ($__smb_cache['dir'][$url]);
+		}
+	}
+
+
+	# streams
+
+	function stream_open ($url, $mode, $options, $opened_path) {
+		$this->url = $url;
+		$this->mode = $mode;
+		$this->parsed_url = $pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('stream_open(): error in URL', E_USER_ERROR);
+		switch ($mode) {
+			case 'r':
+			case 'r+':
+			case 'rb':
+			case 'a':
+			case 'a+':  $this->tmpfile = tempnam('/tmp', 'smb.down.');
+						smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+						break;
+			case 'w':
+			case 'w+':
+			case 'wb':
+			case 'x':
+			case 'x+':  $this->cleardircache();
+						$this->tmpfile = tempnam('/tmp', 'smb.up.');
+						$this->need_flush=true;
+		}
+		$this->stream = fopen ($this->tmpfile, $mode);
+		return TRUE;
+	}
+
+	function stream_close () { return fclose($this->stream); }
+
+	function stream_read ($count) { return fread($this->stream, $count); }
+
+	function stream_write ($data) { $this->need_flush = TRUE; return fwrite($this->stream, $data); }
+
+	function stream_eof () { return feof($this->stream); }
+
+	function stream_tell () { return ftell($this->stream); }
+
+	function stream_seek ($offset, $whence=null) { return fseek($this->stream, $offset, $whence); }
+
+	function stream_flush () {
+		if ($this->mode <> 'r' && $this->need_flush) {
+			smb::clearstatcache ($this->url);
+			smb::execute ('put "'.$this->tmpfile.'" "'.$this->parsed_url['path'].'"', $this->parsed_url);
+			$this->need_flush = FALSE;
+		}
+	}
+
+	function stream_stat () { return smb::url_stat ($this->url); }
+
+	function __destruct () {
+		if ($this->tmpfile <> '') {
+			if ($this->need_flush) $this->stream_flush ();
+			unlink ($this->tmpfile);
+
+		}
+	}
+
+}
+
+###################################################################
+# Register 'smb' protocol !
+###################################################################
+
+stream_wrapper_register('smb', 'smb_stream_wrapper')
+	or die ('Failed to register protocol');
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 2940a07025..9aef05b565 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -10,4 +10,6 @@ OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php';
 OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php';
 OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
 OC::$CLASSPATH['OC_Filestorage_SWIFT']='apps/files_external/lib/swift.php';
+OC::$CLASSPATH['OC_Filestorage_SMB']='apps/files_external/lib/smb.php';
+
 OCP\App::registerAdmin('files_external', 'settings');
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
new file mode 100644
index 0000000000..c769d29032
--- /dev/null
+++ b/apps/files_external/lib/smb.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('smb4php/smb.php');
+
+class OC_FileStorage_SMB extends OC_Filestorage_Common{
+	private $password;
+	private $user;
+	private $host;
+	private $root;
+
+	private static $tempFiles=array();
+
+	public function __construct($params){
+		$this->host=$params['host'];
+		$this->user=$params['user'];
+		$this->password=$params['password'];
+		$this->root=isset($params['root'])?$params['root']:'/';
+
+		//create the root folder if necesary
+		$this->mkdir('');
+	}
+
+	public function constructUrl($path){
+		if(substr($path,-1)=='/'){
+			$path=substr($path,0,-1);
+		}
+		return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
+		
+	}
+
+	public function mkdir($path){
+		return mkdir($this->constructUrl($path));
+	}
+
+	public function rmdir($path){
+		if($this->file_exists($path)){
+			$succes=rmdir($this->constructUrl($path));
+			clearstatcache();
+			return $succes;
+		}else{
+			return false;
+		}
+	}
+
+	public function opendir($path){
+		return opendir($this->constructUrl($path));
+	}
+
+	public function filetype($path){
+		return filetype($this->constructUrl($path));
+	}
+
+	public function is_readable($path){
+		return true;//not properly supported
+	}
+
+	public function is_writable($path){
+		return true;//not properly supported
+	}
+
+	public function file_exists($path){
+		return file_exists($this->constructUrl($path));
+	}
+
+	public function unlink($path){
+		$succes=unlink($this->constructUrl($path));
+		clearstatcache();
+		return $succes;
+	}
+
+	public function fopen($path,$mode){
+		return fopen($this->constructUrl($path),$mode);
+	}
+
+	public function writeBack($tmpFile){
+		if(isset(self::$tempFiles[$tmpFile])){
+			$this->uploadFile($tmpFile,self::$tempFiles[$tmpFile]);
+			unlink($tmpFile);
+		}
+	}
+
+	public function free_space($path){
+		return 0;
+	}
+
+	public function touch($path,$mtime=null){
+		if(is_null($mtime)){
+			$fh=$this->fopen($path,'a');
+			fwrite($fh,'');
+			fclose($fh);
+		}else{
+			return false;//not supported
+		}
+	}
+
+	public function getFile($path,$target){
+		return copy($this->constructUrl($path),$target);
+	}
+
+	public function uploadFile($path,$target){
+		return copy($path,$this->constructUrl($target));
+	}
+
+	public function rename($path1,$path2){
+		return rename($this->constructUrl($path1),$this->constructUrl($path2));
+	}
+
+	public function stat($path){
+		return stat($this->constructUrl($path));
+	}
+	
+
+	
+}
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 5b6517755f..35b5fa0386 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -29,4 +29,11 @@ return array(
 		'host'=>'localhost:8080/auth',
 		'root'=>'/',
 	),
+	'smb'=>array(
+		'run'=>false,
+		'user'=>'test',
+		'password'=>'test',
+		'host'=>'localhost',
+		'root'=>'/test',
+	),
 );
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
new file mode 100644
index 0000000000..52e1700b01
--- /dev/null
+++ b/apps/files_external/tests/smb.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$config=include('apps/files_external/tests/config.php');
+
+if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']){
+	abstract class Test_Filestorage_SMB extends Test_FileStorage{}
+	return;
+}else{
+	class Test_Filestorage_SMB extends Test_FileStorage {
+		private $config;
+		private $id;
+
+		public function setUp(){
+			$id=uniqid();
+			$this->config=include('apps/files_external/tests/config.php');
+			$this->config['smb']['root'].='/'.$id;//make sure we have an new empty folder to work in
+			$this->instance=new OC_Filestorage_SMB($this->config['smb']);
+		}
+
+		public function tearDown(){
+			OCP\Files::rmdirr($this->instance->constructUrl(''));
+		}
+	}
+}

From f00a50c76a76f6613ac9c9fcdef57f109e79f003 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 24 May 2012 16:56:01 +0000
Subject: [PATCH 0049/1537] Add pending line in file list before trying to
 upload. Correct indentation

---
 apps/files/js/files.js | 221 ++++++++++++++++++++---------------------
 1 file changed, 110 insertions(+), 111 deletions(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 35d80b3cff..ae6f7ada66 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -213,115 +213,6 @@ $(document).ready(function() {
 						}
 					});
 				}else{
-				if($.support.xhrFileUpload) {
-					for(var i=0;i<files.length;i++){
-						var fileName = files[i].name
-						var dropTarget = $(e.originalEvent.target).closest('tr');
-						if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
-							var dirName = dropTarget.attr('data-file')
-							var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i],
-									formData: function(form) {
-										var formArray = form.serializeArray();
-										formArray[1]['value'] = dirName;
-										return formArray;
-									}}).success(function(result, textStatus, jqXHR) {
-										var response;
-										response=jQuery.parseJSON(result);
-										if(response[0] == undefined || response[0].status != 'success') {
-											$('#notification').text(t('files', response.data.message));
-											$('#notification').fadeIn();
-										}
-										var file=response[0];
-										delete uploadingFiles[dirName][file.name];
-										var currentUploads = parseInt(uploadtext.attr('currentUploads'));
-										currentUploads -= 1;
-										uploadtext.attr('currentUploads', currentUploads);
-										if(currentUploads === 0) {
-											var img = OC.imagePath('core', 'filetypes/folder.png');
-											var tr=$('tr').filterAttr('data-file',dirName);
-											tr.find('td.filename').attr('style','background-image:url('+img+')');
-											uploadtext.text('');
-											uploadtext.hide();
-										} else {
-											uploadtext.text(currentUploads + ' files uploading')
-										}
-									})
-							.error(function(jqXHR, textStatus, errorThrown) {
-								if(errorThrown === 'abort') {
-									var currentUploads = parseInt(uploadtext.attr('currentUploads'));
-									currentUploads -= 1;
-									uploadtext.attr('currentUploads', currentUploads);
-									if(currentUploads === 0) {
-										var img = OC.imagePath('core', 'filetypes/folder.png');
-										var tr=$('tr').filterAttr('data-file',dirName);
-										tr.find('td.filename').attr('style','background-image:url('+img+')');
-										uploadtext.text('');
-										uploadtext.hide();
-									} else {
-										uploadtext.text(currentUploads + ' files uploading')
-									}
-									$('#notification').hide();
-									$('#notification').text(t('files', 'Upload cancelled.'));
-									$('#notification').fadeIn();
-								}
-							});
-							//TODO test with filenames containing slashes
-							if(uploadingFiles[dirName] === undefined) {
-								uploadingFiles[dirName] = {};
-							}
-							uploadingFiles[dirName][fileName] = jqXHR;
-						} else {
-							var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i]})
-									.success(function(result, textStatus, jqXHR) {
-										var response;
-										response=jQuery.parseJSON(result);
-										if(response[0] != undefined && response[0].status == 'success') {
-											var file=response[0];
-											delete uploadingFiles[file.name];
-											$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
-											var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
-											if(size==t('files','Pending')){
-												$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
-											}
-											FileList.loadingDone(file.name);
-										} else {
-											$('#notification').text(t('files', response.data.message));
-											$('#notification').fadeIn();
-											$('#fileList > tr').not('[data-mime]').fadeOut();
-											$('#fileList > tr').not('[data-mime]').remove();
-										}
-									})
-							.error(function(jqXHR, textStatus, errorThrown) {
-								if(errorThrown === 'abort') {
-									$('#notification').hide();
-									$('#notification').text(t('files', 'Upload cancelled.'));
-									$('#notification').fadeIn();
-								}
-							});
-							uploadingFiles[files[i].name] = jqXHR;
-						}
-					}
-				}else{
-					data.submit().success(function(data, status) {
-						response = jQuery.parseJSON(data[0].body.innerText);
-						if(response[0] != undefined && response[0].status == 'success') {
-							var file=response[0];
-							delete uploadingFiles[file.name];
-							$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
-							var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
-							if(size==t('files','Pending')){
-								$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
-							}
-							FileList.loadingDone(file.name);
-						} else {
-							$('#notification').text(t('files', response.data.message));
-							$('#notification').fadeIn();
-							$('#fileList > tr').not('[data-mime]').fadeOut();
-							$('#fileList > tr').not('[data-mime]').remove();
-						}
-					});
-				}
-									
 					var date=new Date();
 					if(files){
 						for(var i=0;i<files.length;i++){
@@ -331,7 +222,7 @@ $(document).ready(function() {
 								var size=t('files','Pending');
 							}
 							if(files && !dirName){
-						FileList.addFile(getUniqueName(files[i].name),size,date,true);
+								FileList.addFile(getUniqueName(files[i].name),size,date,true);
 							} else if(dirName) {
 								var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
 								var currentUploads = parseInt(uploadtext.attr('currentUploads'));
@@ -350,7 +241,115 @@ $(document).ready(function() {
 						}
 					}else{
 						var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
-				FileList.addFile(getUniqueName(filename),'Pending',date,true);
+						FileList.addFile(getUniqueName(filename),'Pending',date,true);
+					}
+					if($.support.xhrFileUpload) {
+						for(var i=0;i<files.length;i++){
+							var fileName = files[i].name
+							var dropTarget = $(e.originalEvent.target).closest('tr');
+							if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
+								var dirName = dropTarget.attr('data-file')
+								var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i],
+										formData: function(form) {
+											var formArray = form.serializeArray();
+											formArray[1]['value'] = dirName;
+											return formArray;
+										}}).success(function(result, textStatus, jqXHR) {
+											var response;
+											response=jQuery.parseJSON(result);
+											if(response[0] == undefined || response[0].status != 'success') {
+												$('#notification').text(t('files', response.data.message));
+												$('#notification').fadeIn();
+											}
+											var file=response[0];
+											delete uploadingFiles[dirName][file.name];
+											var currentUploads = parseInt(uploadtext.attr('currentUploads'));
+											currentUploads -= 1;
+											uploadtext.attr('currentUploads', currentUploads);
+											if(currentUploads === 0) {
+												var img = OC.imagePath('core', 'filetypes/folder.png');
+												var tr=$('tr').filterAttr('data-file',dirName);
+												tr.find('td.filename').attr('style','background-image:url('+img+')');
+												uploadtext.text('');
+												uploadtext.hide();
+											} else {
+												uploadtext.text(currentUploads + ' files uploading')
+											}
+										})
+								.error(function(jqXHR, textStatus, errorThrown) {
+									if(errorThrown === 'abort') {
+										var currentUploads = parseInt(uploadtext.attr('currentUploads'));
+										currentUploads -= 1;
+										uploadtext.attr('currentUploads', currentUploads);
+										if(currentUploads === 0) {
+											var img = OC.imagePath('core', 'filetypes/folder.png');
+											var tr=$('tr').filterAttr('data-file',dirName);
+											tr.find('td.filename').attr('style','background-image:url('+img+')');
+											uploadtext.text('');
+											uploadtext.hide();
+										} else {
+											uploadtext.text(currentUploads + ' files uploading')
+										}
+										$('#notification').hide();
+										$('#notification').text(t('files', 'Upload cancelled.'));
+										$('#notification').fadeIn();
+									}
+								});
+								//TODO test with filenames containing slashes
+								if(uploadingFiles[dirName] === undefined) {
+									uploadingFiles[dirName] = {};
+								}
+								uploadingFiles[dirName][fileName] = jqXHR;
+							} else {
+								var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i]})
+										.success(function(result, textStatus, jqXHR) {
+											var response;
+											response=jQuery.parseJSON(result);
+											if(response[0] != undefined && response[0].status == 'success') {
+												var file=response[0];
+												delete uploadingFiles[file.name];
+												$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
+												var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
+												if(size==t('files','Pending')){
+													$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
+												}
+												FileList.loadingDone(file.name);
+											} else {
+												$('#notification').text(t('files', response.data.message));
+												$('#notification').fadeIn();
+												$('#fileList > tr').not('[data-mime]').fadeOut();
+												$('#fileList > tr').not('[data-mime]').remove();
+											}
+										})
+								.error(function(jqXHR, textStatus, errorThrown) {
+									if(errorThrown === 'abort') {
+										$('#notification').hide();
+										$('#notification').text(t('files', 'Upload cancelled.'));
+										$('#notification').fadeIn();
+									}
+								});
+								uploadingFiles[files[i].name] = jqXHR;
+							}
+						}
+					}else{
+						data.submit().success(function(data, status) {
+							response = jQuery.parseJSON(data[0].body.innerText);
+							if(response[0] != undefined && response[0].status == 'success') {
+								var file=response[0];
+								delete uploadingFiles[file.name];
+								$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
+								var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
+								if(size==t('files','Pending')){
+									$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
+								}
+								FileList.loadingDone(file.name);
+							} else {
+								$('#notification').text(t('files', response.data.message));
+								$('#notification').fadeIn();
+								$('#fileList > tr').not('[data-mime]').fadeOut();
+								$('#fileList > tr').not('[data-mime]').remove();
+							}
+						});
 					}
 				}
 			},

From a1539dace78207076edc4ea42619e9a81dd41fe2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 24 May 2012 19:39:14 +0200
Subject: [PATCH 0050/1537] share code between smb and ftp filestorage backends

---
 apps/files_external/appinfo/app.php       |  1 +
 apps/files_external/lib/ftp.php           | 73 +------------------
 apps/files_external/lib/smb.php           | 86 +---------------------
 apps/files_external/lib/streamwrapper.php | 89 +++++++++++++++++++++++
 4 files changed, 92 insertions(+), 157 deletions(-)
 create mode 100644 apps/files_external/lib/streamwrapper.php

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 9aef05b565..9fd87e3934 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -6,6 +6,7 @@
  * See the COPYING-README file.
  */
 
+ OC::$CLASSPATH['OC_FileStorage_StreamWrapper']='apps/files_external/lib/streamwrapper.php';
 OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php';
 OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php';
 OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 981eeab58b..e9655ebf3a 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class OC_FileStorage_FTP extends OC_Filestorage_Common{
+class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 	private $password;
 	private $user;
 	private $host;
@@ -42,47 +42,6 @@ class OC_FileStorage_FTP extends OC_Filestorage_Common{
 		$url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
 		return $url;
 	}
-
-	public function mkdir($path){
-		return mkdir($this->constructUrl($path));
-	}
-
-	public function rmdir($path){
-		if($this->file_exists($path)){
-			$succes=rmdir($this->constructUrl($path));
-			clearstatcache();
-			return $succes;
-		}else{
-			return false;
-		}
-	}
-
-	public function opendir($path){
-		return opendir($this->constructUrl($path));
-	}
-
-	public function filetype($path){
-		return filetype($this->constructUrl($path));
-	}
-
-	public function is_readable($path){
-		return true;//not properly supported
-	}
-
-	public function is_writable($path){
-		return true;//not properly supported
-	}
-
-	public function file_exists($path){
-		return file_exists($this->constructUrl($path));
-	}
-
-	public function unlink($path){
-		$succes=unlink($this->constructUrl($path));
-		clearstatcache();
-		return $succes;
-	}
-
 	public function fopen($path,$mode){
 		switch($mode){
 			case 'r':
@@ -124,34 +83,4 @@ class OC_FileStorage_FTP extends OC_Filestorage_Common{
 			unlink($tmpFile);
 		}
 	}
-
-	public function free_space($path){
-		return 0;
-	}
-
-	public function touch($path,$mtime=null){
-		if(is_null($mtime)){
-			$fh=$this->fopen($path,'a');
-			fwrite($fh,'');
-			fclose($fh);
-		}else{
-			return false;//not supported
-		}
-	}
-
-	public function getFile($path,$target){
-		return copy($this->constructUrl($path),$target);
-	}
-
-	public function uploadFile($path,$target){
-		return copy($path,$this->constructUrl($target));
-	}
-
-	public function rename($path1,$path2){
-		return rename($this->constructUrl($path1),$this->constructUrl($path2));
-	}
-
-	public function stat($path){
-		return stat($this->constructUrl($path));
-	}
 }
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index c769d29032..f5e6d78e77 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -8,7 +8,7 @@
 
 require_once('smb4php/smb.php');
 
-class OC_FileStorage_SMB extends OC_Filestorage_Common{
+class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	private $password;
 	private $user;
 	private $host;
@@ -33,88 +33,4 @@ class OC_FileStorage_SMB extends OC_Filestorage_Common{
 		return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
 		
 	}
-
-	public function mkdir($path){
-		return mkdir($this->constructUrl($path));
-	}
-
-	public function rmdir($path){
-		if($this->file_exists($path)){
-			$succes=rmdir($this->constructUrl($path));
-			clearstatcache();
-			return $succes;
-		}else{
-			return false;
-		}
-	}
-
-	public function opendir($path){
-		return opendir($this->constructUrl($path));
-	}
-
-	public function filetype($path){
-		return filetype($this->constructUrl($path));
-	}
-
-	public function is_readable($path){
-		return true;//not properly supported
-	}
-
-	public function is_writable($path){
-		return true;//not properly supported
-	}
-
-	public function file_exists($path){
-		return file_exists($this->constructUrl($path));
-	}
-
-	public function unlink($path){
-		$succes=unlink($this->constructUrl($path));
-		clearstatcache();
-		return $succes;
-	}
-
-	public function fopen($path,$mode){
-		return fopen($this->constructUrl($path),$mode);
-	}
-
-	public function writeBack($tmpFile){
-		if(isset(self::$tempFiles[$tmpFile])){
-			$this->uploadFile($tmpFile,self::$tempFiles[$tmpFile]);
-			unlink($tmpFile);
-		}
-	}
-
-	public function free_space($path){
-		return 0;
-	}
-
-	public function touch($path,$mtime=null){
-		if(is_null($mtime)){
-			$fh=$this->fopen($path,'a');
-			fwrite($fh,'');
-			fclose($fh);
-		}else{
-			return false;//not supported
-		}
-	}
-
-	public function getFile($path,$target){
-		return copy($this->constructUrl($path),$target);
-	}
-
-	public function uploadFile($path,$target){
-		return copy($path,$this->constructUrl($target));
-	}
-
-	public function rename($path1,$path2){
-		return rename($this->constructUrl($path1),$this->constructUrl($path2));
-	}
-
-	public function stat($path){
-		return stat($this->constructUrl($path));
-	}
-	
-
-	
 }
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
new file mode 100644
index 0000000000..7d56445361
--- /dev/null
+++ b/apps/files_external/lib/streamwrapper.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{
+	abstract public function constructUrl($path);
+
+	public function mkdir($path){
+		return mkdir($this->constructUrl($path));
+	}
+
+	public function rmdir($path){
+		if($this->file_exists($path)){
+			$succes=rmdir($this->constructUrl($path));
+			clearstatcache();
+			return $succes;
+		}else{
+			return false;
+		}
+	}
+
+	public function opendir($path){
+		return opendir($this->constructUrl($path));
+	}
+
+	public function filetype($path){
+		return filetype($this->constructUrl($path));
+	}
+
+	public function is_readable($path){
+		return true;//not properly supported
+	}
+
+	public function is_writable($path){
+		return true;//not properly supported
+	}
+
+	public function file_exists($path){
+		return file_exists($this->constructUrl($path));
+	}
+
+	public function unlink($path){
+		$succes=unlink($this->constructUrl($path));
+		clearstatcache();
+		return $succes;
+	}
+
+	public function fopen($path,$mode){
+		return fopen($this->constructUrl($path),$mode);
+	}
+
+	public function free_space($path){
+		return 0;
+	}
+
+	public function touch($path,$mtime=null){
+		if(is_null($mtime)){
+			$fh=$this->fopen($path,'a');
+			fwrite($fh,'');
+			fclose($fh);
+		}else{
+			return false;//not supported
+		}
+	}
+
+	public function getFile($path,$target){
+		return copy($this->constructUrl($path),$target);
+	}
+
+	public function uploadFile($path,$target){
+		return copy($path,$this->constructUrl($target));
+	}
+
+	public function rename($path1,$path2){
+		return rename($this->constructUrl($path1),$this->constructUrl($path2));
+	}
+
+	public function stat($path){
+		return stat($this->constructUrl($path));
+	}
+
+
+
+}

From 2c9311cf48baa7bdfe4eae5892017fb0c72ff24f Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 24 May 2012 18:47:05 +0000
Subject: [PATCH 0051/1537] Add error message when uploading folder or null
 files. ref oc-739

---
 apps/files/js/files.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index ae6f7ada66..12a986d9f9 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -194,6 +194,11 @@ $(document).ready(function() {
 				var totalSize=0;
 				if(files){
 					for(var i=0;i<files.length;i++){
+						if(files[i].size ==0 && files[i].type== '')
+						{
+							OC.dialogs.alert('Unable to upload your file as it is a directory or has 0 bytes','Upload Error');
+							return;
+						}
 						totalSize+=files[i].size;
 						if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
 							FileList.finishDelete(function(){

From 5fa14806c8e638143c1b67eb9dc532b255f23bd7 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 24 May 2012 19:16:00 +0000
Subject: [PATCH 0052/1537] Add translation for error message

---
 apps/files/js/files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 12a986d9f9..7d9c53eaa8 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -196,7 +196,7 @@ $(document).ready(function() {
 					for(var i=0;i<files.length;i++){
 						if(files[i].size ==0 && files[i].type== '')
 						{
-							OC.dialogs.alert('Unable to upload your file as it is a directory or has 0 bytes','Upload Error');
+							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
 							return;
 						}
 						totalSize+=files[i].size;

From 9c2a6fb551487dad29cd327a5f357f2ac28e8edd Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 24 May 2012 22:48:10 +0000
Subject: [PATCH 0053/1537] Add HEAD request management for files
 ajax/download.php

---
 apps/files/ajax/download.php | 2 +-
 lib/files.php                | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index fd2d9b891f..e9373f5f6a 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -33,5 +33,5 @@ OCP\User::checkLoggedIn();
 $files = $_GET["files"];
 $dir = $_GET["dir"];
 
-OC_Files::get($dir,$files);
+OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 ?>
diff --git a/lib/files.php b/lib/files.php
index b405cf1749..e0c78d22c2 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -52,8 +52,9 @@ class OC_Files {
 	*
 	* @param dir  $dir
 	* @param file $file ; seperated list of files to download
+	* @param boolean $only_header ; boolean to only send header of the request
 	*/
-	public static function get($dir,$files){
+	public static function get($dir,$files, $only_header = false){
 		if(strpos($files,';')){
 			$files=explode(';',$files);
 		}
@@ -118,6 +119,11 @@ class OC_Files {
 			header("HTTP/1.0 403 Forbidden");
 			die('403 Forbidden');
 		}
+		if($only_header){
+			if(!$zip)
+				header("Content-Length: ".OC_Filesystem::filesize($filename));
+			return ;
+		}
 		if($zip){
 			$handle=fopen($filename,'r');
 			if ($handle) {

From dfd5a9759c591ed92d5e55c59ca98afbb35eed7d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 25 May 2012 11:31:46 +0200
Subject: [PATCH 0054/1537] only enable compatible apps

---
 lib/app.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 04fc264d11..658aba9290 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -189,8 +189,16 @@ class OC_App{
 			}
 		}
 		if($app!==false){
-			OC_Appconfig::setValue( $app, 'enabled', 'yes' );
-			return true;
+             		// check if the app is compatible with this version of ownCloud
+			$info=OC_App::getAppInfo($app);
+			$version=OC_Util::getVersion();	
+	                if(!isset($info['require']) or ($version[0]>$info['require'])){
+				OC_Log::write('core','App can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+				return false;
+			}else{
+				OC_Appconfig::setValue( $app, 'enabled', 'yes' );
+				return true;
+			}
 		}else{
 			return false;
 		}

From c704e8077f40c41c02f0a1644ca84b9b0605dc11 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Fri, 25 May 2012 21:08:04 +0200
Subject: [PATCH 0055/1537] remote.php :: use non apache-only env vars

- fixes following error when using nginx + php-fpm

[error] *6568 FastCGI sent in stderr: "PHP message:
PHP Warning:  strpos(): Offset not contained in string in
/some-path/owncloud/remote.php on line 10"

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 remote.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/remote.php b/remote.php
index 44b85f762f..63a45321eb 100644
--- a/remote.php
+++ b/remote.php
@@ -5,7 +5,7 @@ require_once('lib/base.php');
 if (array_key_exists('PATH_INFO', $_SERVER)){
 	$path_info = $_SERVER['PATH_INFO'];
 }else{
-	$path_info = substr($_SERVER['PHP_SELF'], strpos($_SERVER['PHP_SELF'], basename(__FILE__)) + strlen(basename(__FILE__)));
+	$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
 }
 if (!$pos = strpos($path_info, '/', 1)) {
 	$pos = strlen($path_info);
@@ -22,4 +22,4 @@ $app=$parts[2];
 OC_App::loadApp($app);
 
 $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-require_once(OC::$APPSROOT . $file);
\ No newline at end of file
+require_once(OC::$APPSROOT . $file);

From 85dbfc8165f4249ec0cdf3ab6f8b203ed512b6ca Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 25 May 2012 22:17:38 +0000
Subject: [PATCH 0056/1537] Correct small typo to Crypt_Blowfish 3drparty fix
 oc-810

---
 3rdparty/Crypt_Blowfish/Blowfish.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/Crypt_Blowfish/Blowfish.php b/3rdparty/Crypt_Blowfish/Blowfish.php
index a7b8948f04..4ccacb963e 100644
--- a/3rdparty/Crypt_Blowfish/Blowfish.php
+++ b/3rdparty/Crypt_Blowfish/Blowfish.php
@@ -221,7 +221,7 @@ class Crypt_Blowfish
     function decrypt($cipherText)
     {
         if (!is_string($cipherText)) {
-            PEAR::raiseError('Chiper text must be a string', 1, PEAR_ERROR_DIE);
+            PEAR::raiseError('Cipher text must be a string', 1, PEAR_ERROR_DIE);
         }
 
         if (extension_loaded('mcrypt')) {

From a1c9191006a4dada8adbd00193f95392b36e41b4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 26 May 2012 15:23:46 +0200
Subject: [PATCH 0057/1537] fix share for users with a point within their name

---
 apps/calendar/js/calendar.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 243ce1798b..e27fe49c54 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -506,10 +506,11 @@ Calendar={
 			},
 			dropdown:function(userid, calid){
 				$('.calendar_share_dropdown').remove();
-				$('<div class="calendar_share_dropdown"></div>').appendTo('#'+userid+'_'+calid);
+				var element = document.getElementById(userid+'_'+calid);
+				$('<div class="calendar_share_dropdown"></div>').appendTo(element);
 				$.get(OC.filePath('calendar', 'ajax/share', 'dropdown.php') + '?calid=' + calid, function(data){
-					$('#'+userid+'_'+calid+' > .calendar_share_dropdown').html(data);
-					$('#'+userid+'_'+calid+' > .calendar_share_dropdown').show('blind');
+					$('.calendar_share_dropdown').html(data);
+					$('.calendar_share_dropdown').show('blind');
 					$('#share_user').chosen();
 					$('#share_group').chosen();
 				});

From d2369b6e964f9bc757ce0fed000bf50a03c9d2dc Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 26 May 2012 16:38:37 +0200
Subject: [PATCH 0058/1537] LDAP: support for 'member' as
 group-member-association

---
 apps/user_ldap/group_ldap.php         | 3 ++-
 apps/user_ldap/templates/settings.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 01aa2220df..b3ff6c5388 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -85,7 +85,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		}
 
 		//uniqueMember takes DN, memberuid the uid, so we need to distinguish
-		if(strtolower($this->ldapGroupMemberAssocAttr) == 'uniquemember') {
+		if((strtolower($this->ldapGroupMemberAssocAttr) == 'uniquemember')
+			|| (strtolower($this->ldapGroupMemberAssocAttr) == 'member')) {
 			$uid = $userDN;
 		} else if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
 			$result = OC_LDAP::readAttribute($userDN, 'uid');
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d6c1a8ec0e..ac263ed68c 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -17,7 +17,7 @@
 		<p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
 		<p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><input type="text" id="ldap_base_users" name="ldap_base_users" value="<?php echo $_['ldap_base_users']; ?>" /></p>
 		<p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><input type="text" id="ldap_base_groups" name="ldap_base_groups" value="<?php echo $_['ldap_base_groups']; ?>" /></p>
-		<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option></select></p>
+		<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
 		<p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p>
 		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
 		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />

From a945fa10a639cdee9e5e712cd48e8c911a8d9821 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 26 May 2012 19:14:24 +0200
Subject: [PATCH 0059/1537] update copyright

---
 apps/external/ajax/setsites.php         | 2 +-
 apps/external/appinfo/app.php           | 2 +-
 apps/external/index.php                 | 2 +-
 apps/files/appinfo/remote.php           | 2 +-
 apps/files_encryption/lib/crypt.php     | 2 +-
 apps/files_versions/history.php         | 2 +-
 apps/remoteStorage/WebDAV.php           | 2 +-
 apps/remoteStorage/ajax/revokeToken.php | 2 +-
 apps/remoteStorage/auth.php             | 2 +-
 core/lostpassword/index.php             | 2 +-
 core/lostpassword/resetpassword.php     | 2 +-
 files/webdav.php                        | 2 +-
 index.php                               | 3 ++-
 lib/app.php                             | 2 +-
 lib/appconfig.php                       | 2 +-
 lib/base.php                            | 2 +-
 lib/config.php                          | 2 +-
 lib/db.php                              | 2 +-
 lib/files.php                           | 2 +-
 lib/filestorage.php                     | 2 +-
 lib/filesystem.php                      | 2 +-
 lib/filesystemview.php                  | 2 +-
 lib/group.php                           | 2 +-
 lib/group/backend.php                   | 2 +-
 lib/group/database.php                  | 2 +-
 lib/group/dummy.php                     | 2 +-
 lib/group/example.php                   | 2 +-
 lib/helper.php                          | 2 +-
 lib/installer.php                       | 2 +-
 lib/l10n.php                            | 2 +-
 lib/ocs.php                             | 2 +-
 lib/ocsclient.php                       | 2 +-
 lib/preferences.php                     | 2 +-
 lib/public/app.php                      | 2 +-
 lib/public/config.php                   | 2 +-
 lib/public/db.php                       | 2 +-
 lib/public/files.php                    | 2 +-
 lib/public/json.php                     | 2 +-
 lib/public/response.php                 | 2 +-
 lib/public/template.php                 | 2 +-
 lib/public/user.php                     | 2 +-
 lib/public/util.php                     | 2 +-
 lib/search.php                          | 2 +-
 lib/template.php                        | 2 +-
 lib/updater.php                         | 2 +-
 lib/user.php                            | 2 +-
 lib/user/backend.php                    | 2 +-
 lib/user/database.php                   | 2 +-
 lib/user/dummy.php                      | 2 +-
 lib/user/example.php                    | 2 +-
 ocs/providers.php                       | 2 +-
 ocs/v1.php                              | 2 +-
 settings/apps.php                       | 2 +-
 settings/help.php                       | 2 +-
 settings/templates/help.php             | 2 +-
 status.php                              | 2 +-
 webapps.php                             | 2 +-
 57 files changed, 58 insertions(+), 57 deletions(-)
 mode change 100644 => 100755 index.php

diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
index c14daa258c..c758a3508c 100644
--- a/apps/external/ajax/setsites.php
+++ b/apps/external/ajax/setsites.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (c) 2011, Frank Karlitschek <karlitschek@kde.org>
+ * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php
index b569fc305b..ee5437782c 100644
--- a/apps/external/appinfo/app.php
+++ b/apps/external/appinfo/app.php
@@ -4,7 +4,7 @@
  * ownCloud - External plugin
  *
  * @author Frank Karlitschek
- * @copyright 2011 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/external/index.php b/apps/external/index.php
index d63be3ad1d..81819e76e2 100644
--- a/apps/external/index.php
+++ b/apps/external/index.php
@@ -4,7 +4,7 @@
  * ownCloud - External plugin
  *
  * @author Frank Karlitschek
- * @copyright 2011 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index b66843556b..a84216b61b 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -5,7 +5,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * @copyright 2011 Jakob Sack kde@jakobsack.de
  *
  * This library is free software; you can redistribute it and/or
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 37eaedc3fc..ec27900cbc 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index f12dc618f2..11c07ef86c 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -4,7 +4,7 @@
  * ownCloud - History page of the Versions App
  *
  * @author Frank Karlitschek
- * @copyright 2011 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
index ab498db07d..7a81c18e0a 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -5,7 +5,7 @@
 *
 * Original:
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 * 
 * Adapted:
 * @author Michiel de Jong, 2011
diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
index 699b9e9aee..322d9ed727 100644
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -5,7 +5,7 @@
 *
 * Original:
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 * 
 * Adapted:
 * @author Michiel de Jong, 2012
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index a54be37b2e..ac0e83bb37 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -5,7 +5,7 @@
 *
 * Original:
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 * 
 * Adapted:
 * @author Michiel de Jong, 2012
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 2b87a1eb11..6a4748588f 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.
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 1c78d72094..33be9d7053 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/files/webdav.php b/files/webdav.php
index 7624ccbbc7..53673dbeca 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -5,7 +5,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * @copyright 2011 Jakob Sack kde@jakobsack.de
  *
  * This library is free software; you can redistribute it and/or
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 690fc90e75..d552c149df
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,6 +21,7 @@
 *
 */
 
+
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
 
 require_once('lib/base.php');
diff --git a/lib/app.php b/lib/app.php
index 658aba9290..c639d2c4a5 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 5aaaadd9c4..c6216974dd 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/base.php b/lib/base.php
index f4540853ba..cc715afac5 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/config.php b/lib/config.php
index ad1cd18fa1..e3a9c11f24 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/db.php b/lib/db.php
index 08bd06df95..bcc8657b4a 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/files.php b/lib/files.php
index e0c78d22c2..072de33004 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/filestorage.php b/lib/filestorage.php
index fd6497b947..d05acd3674 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/filesystem.php b/lib/filesystem.php
index cac7e8648e..6b3c254c5e 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek 
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org 
+* @copyright 2012 Frank Karlitschek frank@owncloud.org 
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index b62bb82c69..d893bd4d3d 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/group.php b/lib/group.php
index 1e0216a932..a78eb51fff 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/group/backend.php b/lib/group/backend.php
index af6c53c803..3b65259946 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/group/database.php b/lib/group/database.php
index d401acf43b..af55de1f42 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -4,7 +4,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 5220237ecb..0825b10708 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/group/example.php b/lib/group/example.php
index a88159f91b..b2de119553 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/helper.php b/lib/helper.php
index 31819d2e3f..e3d292737a 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/installer.php b/lib/installer.php
index 6417ed1c7a..5c030d2917 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Robin Appelman
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/l10n.php b/lib/l10n.php
index c0ecdbd1b7..682e15f0e9 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/ocs.php b/lib/ocs.php
index 536ee754e8..e28eb61987 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index aef51f38fb..33308553be 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/preferences.php b/lib/preferences.php
index 75201f455b..89fc73aa23 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/app.php b/lib/public/app.php
index 1a46180bb9..3960db6d89 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/config.php b/lib/public/config.php
index 762fb6b180..9f5abe672c 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/db.php b/lib/public/db.php
index af2e46c9da..f7564c0bb6 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/files.php b/lib/public/files.php
index 24c0193e8a..fc3004434b 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/json.php b/lib/public/json.php
index 439721ac6c..a8554671d1 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/response.php b/lib/public/response.php
index c35c265496..cc2137c5ca 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/template.php b/lib/public/template.php
index 33eefea3b8..b89088bdd0 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/user.php b/lib/public/user.php
index d351b001e8..a0c069f737 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/util.php b/lib/public/util.php
index 3d20c5a463..39a185d02a 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/search.php b/lib/search.php
index 1205541868..f8a4b8e96e 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/template.php b/lib/template.php
index e908c76bfa..a15cfcc457 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -4,7 +4,7 @@
  *
  * @author Frank Karlitschek
  * @author Jakob Sack
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/updater.php b/lib/updater.php
index deb0f05945..bc5ee00b6a 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/user.php b/lib/user.php
index 056d130754..ee2a80b159 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 4afdf15215..3df907226c 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -5,7 +5,7 @@
  *
  * @author Frank Karlitschek
  * @author Dominik Schmidt
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
  *
  * This library is free software; you can redistribute it and/or
diff --git a/lib/user/database.php b/lib/user/database.php
index 894ccffb79..769ba6a792 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -4,7 +4,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index 03d5c3256d..a946d4e621 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/user/example.php b/lib/user/example.php
index b6a2091b68..18bc6bce00 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -4,7 +4,7 @@
  * ownCloud
  *
  * @author Frank Karlitschek
- * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/ocs/providers.php b/ocs/providers.php
index e1d6ef7ee1..397d2f06f5 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek 
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org 
+* @copyright 2012 Frank Karlitschek frank@owncloud.org 
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/ocs/v1.php b/ocs/v1.php
index f5ff6cb605..77dd75b9fc 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek 
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org 
+* @copyright 2012 Frank Karlitschek frank@owncloud.org 
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/settings/apps.php b/settings/apps.php
index 028f00c249..1a829d371a 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/settings/help.php b/settings/help.php
index 48fcec3278..f0abed8f55 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011, Frank Karlitschek karlitschek@kde.org
+ * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
diff --git a/settings/templates/help.php b/settings/templates/help.php
index f9eb861597..a53ec76d68 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,5 +1,5 @@
 <?php /**
- * Copyright (c) 2011, Frank Karlitschek karlitschek@kde.org
+ * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
diff --git a/status.php b/status.php
index 81f339fa53..2d31702ecb 100644
--- a/status.php
+++ b/status.php
@@ -4,7 +4,7 @@
 * ownCloud status page. usefull if you want to check from the outside if an owncloud installation exists
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/webapps.php b/webapps.php
index 99553fa8ef..b5fee9bf85 100644
--- a/webapps.php
+++ b/webapps.php
@@ -4,7 +4,7 @@
 * ownCloud status page. usefull if you want to check from the outside if an owncloud installation exists
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

From 982cde0bb1a9230b793f7341eba5d8117c48ca0b Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 26 May 2012 20:37:10 +0200
Subject: [PATCH 0060/1537] check during ownCloud upgrade if all the installed
 apps are compatible with the new ownCloud version. Disable them if not

---
 lib/app.php         | 24 ++++++++++++++++++++++--
 settings/js/apps.js |  4 ++--
 2 files changed, 24 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 lib/app.php

diff --git a/lib/app.php b/lib/app.php
old mode 100644
new mode 100755
index c639d2c4a5..78de0fa21b
--- a/lib/app.php
+++ b/lib/app.php
@@ -189,11 +189,11 @@ class OC_App{
 			}
 		}
 		if($app!==false){
-             		// check if the app is compatible with this version of ownCloud
+			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			$version=OC_Util::getVersion();	
 	                if(!isset($info['require']) or ($version[0]>$info['require'])){
-				OC_Log::write('core','App can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+				OC_Log::write('core','App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				return false;
 			}else{
 				OC_Appconfig::setValue( $app, 'enabled', 'yes' );
@@ -525,6 +525,26 @@ class OC_App{
 				}
 			}
 		}
+		
+		// check if the current enabled apps are compatible with the current ownCloud version. disable them if not.
+		// this is important if you upgrade ownCloud and have non ported 3rd party apps installed
+		$apps =OC_App::getEnabledApps();
+		$version=OC_Util::getVersion();
+		foreach($apps as $app) {
+		
+			// check if the app is compatible with this version of ownCloud
+			$info=OC_App::getAppInfo($app);
+			if(!isset($info['require']) or ($version[0]>$info['require'])){
+				OC_Log::write('core','App "'.$info['name'].'" can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+				OC_App::disable( $app );
+			}
+
+	
+			
+		}
+		
+		
+		
 	}
 
 	/**
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 8aa54463b3..f6e08b608b 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -41,7 +41,7 @@ $(document).ready(function(){
 			if(active){
 				$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){
 					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error','Error while disabling app');
+						OC.dialogs.alert('Error while disabling app','Error');
 					}
 					else {
 						element.data('active',false);
@@ -54,7 +54,7 @@ $(document).ready(function(){
 			}else{
 				$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){
 					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error','Error while enabling app');
+						OC.dialogs.alert('Error while enabling app','Error');
 					}
 					else {
 						element.data('active',true);

From 143287738ad9415b910240563de71cc7dbd6f2da Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 26 May 2012 21:50:36 +0200
Subject: [PATCH 0061/1537] allow longer paths for gallery

---
 apps/gallery/appinfo/database.xml | 6 +++---
 apps/gallery/appinfo/version      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
index e3b13f7e93..f370e1521e 100644
--- a/apps/gallery/appinfo/database.xml
+++ b/apps/gallery/appinfo/database.xml
@@ -31,13 +31,13 @@
 				<name>album_path</name>
 				<type>text</type>
 				<notnull>true</notnull>
-				<length>100</length>
+				<length>256</length>
 			</field>
 			<field>
 				<name>parent_path</name>
 				<type>text</type>
 				<notnull>true</notnull>
-				<length>100</length>
+				<length>256</length>
 			</field>
 		</declaration>
 	</table>
@@ -63,7 +63,7 @@
 				<name>file_path</name>
 				<type>text</type>
 				<notnull>true</notnull>
-				<length>100</length>
+				<length>256</length>
 			</field>
 		</declaration>
 	</table>
diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version
index 2b7c5ae018..17b2ccd9bf 100644
--- a/apps/gallery/appinfo/version
+++ b/apps/gallery/appinfo/version
@@ -1 +1 @@
-0.4.2
+0.4.3

From b14f2d0388601879b69a0d43a576b068ae412ea8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 27 May 2012 12:31:51 +0200
Subject: [PATCH 0062/1537] update When

---
 3rdparty/when/When.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
index d54f296ed6..5f97f0eb9b 100644
--- a/3rdparty/when/When.php
+++ b/3rdparty/when/When.php
@@ -586,7 +586,7 @@ class When
 				}
 			}
 		}
-		elseif($this->gobyday && $interval == "month")
+		elseif($this->gobyday || $interval == "month")
 		{
 			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
 			foreach($_mdays as $_mday)
@@ -621,13 +621,7 @@ class When
 		
 		if($interval == "month")
 		{
-			
-			$this->try_date->modify('first day of next month');
-			if((int) date('t', $this->try_date->format('U')) > (int) $this->start_date->format('j')){
-				$this->try_date->modify('+' . (int) $this->start_date->format('j') - 1 . ' day'); 
-			}else{
-				$this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); 
-			}
+			$this->try_date->modify('last day of ' . $this->interval . ' ' . $interval);
 		}
 		else
 		{

From 5e7b318e42bf7928f19af2ce023472273bca7608 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 28 May 2012 10:49:27 +0200
Subject: [PATCH 0063/1537] add urlencode for caldav link

---
 apps/calendar/js/calendar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index e27fe49c54..b5411d3fd9 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -207,6 +207,7 @@ Calendar={
 		},
 		showCalDAVUrl:function(username, calname){
 			$('#caldav_url').val(totalurl + '/' + username + '/' + calname);
+			$('#caldav_url').val(encodeURI($('#caldav_url').val()));
 			$('#caldav_url').show();
 			$("#caldav_url_close").show();
 		},

From df5bdc8e42a39ee8c74aac91ddbd03aef2731586 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 28 May 2012 12:58:51 +0200
Subject: [PATCH 0064/1537] Contacts: Double check XSS, and fix a rookie error
 ;-)

---
 apps/contacts/lib/vcard.php               | 2 +-
 apps/contacts/templates/part.contacts.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 2414efe676..a8ad695f62 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -227,7 +227,7 @@ class OC_Contacts_VCard{
 			$vcard->setString('FN', $fn);
 			OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn,OCP\Util::DEBUG);
 		}
-		if(!$n || $n = ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-)
+		if(!$n || $n == ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-)
 			$slice = array_reverse(array_slice(explode(' ', $fn), 0, 2)); // Take 2 first name parts of 'FN' and reverse.
 			if(count($slice) < 2) { // If not enought, add one more...
 				$slice[] = "";
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 00a61f72fd..5751750540 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -8,5 +8,5 @@
 		}
 	}
 ?>
-	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
+	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li>
 <?php endforeach; ?>

From c79a529edda3992bffc9e7dd1c7949f42c3b8f57 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 28 May 2012 13:57:45 +0200
Subject: [PATCH 0065/1537] remove not needed includes

---
 apps/files_sharing/ajax/getitem.php        | 1 -
 apps/files_sharing/ajax/getstatuses.php    | 3 +--
 apps/files_sharing/ajax/setpermissions.php | 1 -
 apps/files_sharing/ajax/share.php          | 1 -
 apps/files_sharing/ajax/unshare.php        | 1 -
 apps/media/ajax/api.php                    | 4 +---
 apps/media/index.php                       | 3 ---
 apps/user_ldap/appinfo/update.php          | 5 +----
 8 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 36ac372cad..94f0890d70 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -1,5 +1,4 @@
 <?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
  
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
diff --git a/apps/files_sharing/ajax/getstatuses.php b/apps/files_sharing/ajax/getstatuses.php
index 8edcb21475..488cab13bc 100644
--- a/apps/files_sharing/ajax/getstatuses.php
+++ b/apps/files_sharing/ajax/getstatuses.php
@@ -1,5 +1,4 @@
 <?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
@@ -22,4 +21,4 @@ if ($rows = OC_Share::getMySharedItems()) {
 
 OCP\JSON::success(array('data' => $items));
 
-?>
\ No newline at end of file
+?>
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
index 2f4c5da978..4d19cd40f2 100644
--- a/apps/files_sharing/ajax/setpermissions.php
+++ b/apps/files_sharing/ajax/setpermissions.php
@@ -1,5 +1,4 @@
 <?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index ec3c25998a..1ee8c3f791 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -1,5 +1,4 @@
 <?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index 9088bf4266..d50e7963a0 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -1,5 +1,4 @@
 <?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 37dc638019..6e269f3bb7 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -24,8 +24,6 @@
 header('Content-type: text/html; charset=UTF-8') ;
 
 OCP\JSON::checkAppEnabled('media');
-require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
-require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php');
 
 error_reporting(E_ALL); //no script error reporting because of getID3
 
@@ -126,4 +124,4 @@ if($arguments['action']){
 			exit;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/apps/media/index.php b/apps/media/index.php
index 906d7bacb6..fb51aa0b17 100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -28,9 +28,6 @@
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('media');
 
-require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
-require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php');
-
 OCP\Util::addscript('media','player');
 OCP\Util::addscript('media','music');
 OCP\Util::addscript('media','playlist');
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index b3f7a397db..dc437ce21c 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -16,9 +16,6 @@ $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doCheck');
 if($state == 'doCheck'){
 	$sqlCleanMap = 'DELETE FROM *PREFIX*ldap_user_mapping';
 
-	require_once(OC::$APPSROOT.'/apps/user_ldap/lib_ldap.php');
-	require_once(OC::$APPSROOT.'/apps/user_ldap/user_ldap.php');
-
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
 	$LDAP_USER = new OC_USER_LDAP();
 	$users_old = $LDAP_USER->getUsers();
@@ -33,4 +30,4 @@ if($state == 'doCheck'){
 		//we don't need to check Groups, because they were not supported in 3'
 		OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
 	}
-}
\ No newline at end of file
+}

From 817f9ff57d127e4f3b4402c05a8628ff8ab6f513 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 28 May 2012 14:38:31 +0200
Subject: [PATCH 0066/1537] Contacts: Fix XSS.

---
 apps/contacts/js/contacts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 256b5ad6d0..34afdcc4e4 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -6,7 +6,7 @@ function ucwords (str) {
 
 String.prototype.strip_tags = function(){
 	tags = this;
-	stripped = tags.replace(/[\<\>]/gi, "");
+	stripped = tags.replace(/<(.|\n)*?>/g, '');
 	return stripped;
 };
 
@@ -159,7 +159,7 @@ Contacts={
 			
 			// Name has changed. Update it and reorder.
 			$('#fn').change(function(){
-				var name = $('#fn').val();
+				var name = $('#fn').val().strip_tags();
 				var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]');
 				$(item).find('a').html(name);
 				var added = false;

From 7b8664bbe5145509a0e38b6291212165931cead9 Mon Sep 17 00:00:00 2001
From: Benjamin Diele <benjamin@diele.be>
Date: Mon, 28 May 2012 17:54:38 +0400
Subject: [PATCH 0067/1537] Check for valid LDAP-resource before querying.

Check if we have get valid link identifier from
self::getConnectionResource() before using ldap_search() and
ldap_get_entries(), otherwise return an empty array.

Signed-off-by: Benjamin Diele <benjamin@diele.be>
---
 apps/user_ldap/lib_ldap.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 5cd7e0241b..6a6d744a0f 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -469,11 +469,23 @@ class OC_LDAP {
 		if(!is_null($attr) && !is_array($attr)) {
 			$attr = array(strtolower($attr));
 		}
-		$sr = @ldap_search(self::getConnectionResource(), $base, $filter, $attr);
-		$findings = @ldap_get_entries(self::getConnectionResource(), $sr );
-		// if we're here, probably no connection ressource is returned.
-		// to make ownCloud behave nicely, we simply give back an empty array.
-		if(is_null($findings)) {
+
+		// See if we have a resource, that way we can get rid of the
+		// error-supressing.
+		$link_resource = self::getConnectionResource();
+		if($link_resource)
+		{
+			$sr = ldap_search($link_resource, $base, $filter, $attr);
+			$findings = ldap_get_entries($link_resource, $sr );
+			// if we're here, probably no connection ressource is returned.
+			// to make ownCloud behave nicely, we simply give back an empty array.
+			if(is_null($findings)) {
+				return array();
+			}
+		} else
+		{
+			// Seems like we didn't find any resource.
+			// Return an empty array just like before.
 			return array();
 		}
 

From 22cd0f1cda83b6ca76e717ff9f8e376a17430740 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 28 May 2012 20:41:39 +0000
Subject: [PATCH 0068/1537] Correct typo in last_insert_id for calendar and pg
 fix #oc-731

---
 apps/calendar/lib/calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 1d00850804..869b35e2e1 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -109,7 +109,7 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
-		return OCP\DB::insertid('*PREFIX*calendar_calendar');
+		return OCP\DB::insertid('*PREFIX*calendar_calendars');
 	}
 
 	/**

From 75afc09b9d0e2dd417ded4d9b84ca745042a0cf3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 29 May 2012 13:12:37 +0200
Subject: [PATCH 0069/1537] fix status of timezone detection

---
 apps/calendar/ajax/settings/timezonedetection.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php
index ba5f2af5fd..5f03f647b3 100644
--- a/apps/calendar/ajax/settings/timezonedetection.php
+++ b/apps/calendar/ajax/settings/timezonedetection.php
@@ -8,13 +8,9 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
-if(array_key_exists('timezonedetection', $_POST)){
-	if($_POST['timezonedetection'] == 'on'){
-		OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'true');
-	}else{
-		OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'false');
-	}
-	OCP\JSON::success();
+if(array_key_exists('timezonedetection', $_POST) && $_POST['timezonedetection'] == 'on'){
+	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'true');
 }else{
-	OCP\JSON::error();
-}
\ No newline at end of file
+	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'false');
+}
+OCP\JSON::success();
\ No newline at end of file

From 482caa04f951c02a9a66f1f6866b79ad4edd5b29 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 29 May 2012 13:34:27 +0200
Subject: [PATCH 0070/1537] add button to clear calendar's cache

---
 apps/calendar/ajax/cache/rescan.php  | 11 +++++++++++
 apps/calendar/appinfo/app.php        |  1 +
 apps/calendar/js/settings.js         |  3 +++
 apps/calendar/templates/settings.php |  6 +++++-
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 apps/calendar/ajax/cache/rescan.php

diff --git a/apps/calendar/ajax/cache/rescan.php b/apps/calendar/ajax/cache/rescan.php
new file mode 100644
index 0000000000..1355179b95
--- /dev/null
+++ b/apps/calendar/ajax/cache/rescan.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <georg@ownCloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('calendar');
+OC_Calendar_Repeat::cleancalendar(OCP\USER::getUser());
+OC_Calendar_Repeat::generatecalendar(OCP\USER::getUser());
\ No newline at end of file
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index b02fc602c6..73480522ea 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -5,6 +5,7 @@ OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
 OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
+OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
 OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index c768a47a79..f42e024d08 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -44,4 +44,7 @@ $(document).ready(function(){
 		$('#' + jsondata.firstday).attr('selected',true);
 		$('#firstday').chosen();
 	});
+	$('#cleancalendarcache').click(function(){
+		$.getJSON(OC.filePath('calendar', 'ajax/cache', 'rescan.php'));
+	});
 });
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 12117750ca..40cef07959 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -44,6 +44,10 @@
                 </select>
             </td></tr>
 
+            <tr><td><label for="" class="bold"><?php echo $l->t('Cache');?></label></td><td>
+                <input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
+            </td></tr>
+
         </table>
 
         <?php echo $l->t('Calendar CalDAV syncing address:');?>

From 29372677aee0c415af7686712ab829e13e309999 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 29 May 2012 13:36:51 +0200
Subject: [PATCH 0071/1537] add lib collection and lib scanner to media's
 appinfo/app.php

---
 apps/media/appinfo/app.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 26cb204554..d6a09c4805 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -23,6 +23,8 @@
 $l=OC_L10N::get('media');
 
 require_once('apps/media/lib_media.php');
+require_once('apps/media/lib_collection.php');
+require_once('apps/media/lib_scanner.php');
 
 OCP\Util::addscript('media','loader');
 OCP\App::registerPersonal('media','settings');

From dff16e70a9e9d26ebc416dcd046e3d65e55c5c35 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 28 May 2012 15:59:58 +0200
Subject: [PATCH 0072/1537] Contacts: Improve loading and cleanup of dialogs.

---
 apps/contacts/ajax/chooseaddressbook.php |  5 ++-
 apps/contacts/ajax/editaddress.php       |  3 +-
 apps/contacts/ajax/editname.php          |  5 +--
 apps/contacts/css/contacts.css           |  5 ++-
 apps/contacts/js/contacts.js             | 55 ++++++++++++++----------
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
index 9088a4e9d7..1ce8dd46ee 100644
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -10,5 +10,6 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$output = new OCP\Template("contacts", "part.chooseaddressbook");
-$output -> printpage();
+$tmpl = new OCP\Template("contacts", "part.chooseaddressbook");
+$page = $tmpl->fetchPage();
+OCP\JSON::success(array('data' => array('page'=>$page)));
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
index 9fb35a0b5f..969aeeba8f 100644
--- a/apps/contacts/ajax/editaddress.php
+++ b/apps/contacts/ajax/editaddress.php
@@ -26,6 +26,7 @@ if($checksum) {
 $tmpl->assign('id',$id);
 $tmpl->assign('adr_types',$adr_types);
 
-$tmpl->printpage();
+$page = $tmpl->fetchPage();
+OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
 
 ?>
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index dc64eeb510..9ba280ae54 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -35,9 +35,8 @@ if($id) {
 	$tmpl->assign('id',$id);
 } else {
 	bailOut(OC_Contacts_App::$l10n->t('Contact ID is missing.'));
-	//$addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
-	//$tmpl->assign('addressbooks', $addressbooks);
 }
-$tmpl->printpage();
+$page = $tmpl->fetchPage();
+OCP\JSON::success(array('data' => array('page'=>$page)));
 
 ?>
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 9aa63f016c..1d02b3722d 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -30,6 +30,7 @@ textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; p
 dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; }
 .form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }
 .form dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0px; white-space: nowrap; vertical-align: text-bottom; }
+label:hover, dt:hover { color: #333; }
 #address.form dt { min-width: 5em; }
 #address.form dl { min-width: 10em; }
 .droptarget { margin: 0.5em; padding: 0.5em; border: thin solid #ccc; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
@@ -65,6 +66,8 @@ dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; }
 .contactsection { position: relative; float: left; /*max-width: 40em;*/ padding: 0.5em; height: auto: border: thin solid lightgray;/* -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; border-radius: 0.5em; background-color: #f8f8f8;*/ }
 
 #cropbox { margin: auto; }
+#contacts_details_photo_wrapper { min-width: 80px; }
+#contacts_details_photo_wrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background: url('%webroot%/core/img/loading.gif') no-repeat center center; cursor: wait; }
 #contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
 #contacts_details_photo:hover { background: #fff; cursor: default; }
 #phototools { position:absolute; margin: 5px 0 0 10px; width:auto; height:22px; padding:0px; background-color:#fff; list-style-type:none; border-radius: 0.5em; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
@@ -76,7 +79,7 @@ dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; }
 #addressdisplay { padding: 0.5em; }
 dl.addresscard { background-color: #fff; float: left; width: auto; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: 0; }
 dl.addresscard dd {}
-dl.addresscard dt { padding: 0.3em; /*border-bottom: thin solid lightgray;*/ font-weight: bold; clear: both; color: #bbb;}
+dl.addresscard dt { padding: 0.3em; font-weight: bold; clear: both; color: #bbb;}
 dl.addresscard dt:hover { color:#777; }
 dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
 dl.addresscard .action { float: right; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 34afdcc4e4..d8aa724a22 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -758,28 +758,29 @@ Contacts={
 				}
 			},
 			editName:function(){
-				var isnew = (this.id == '');
+				var params = {id: this.id};
 				/* Initialize the name edit dialog */
 				if($('#edit_name_dialog').dialog('isOpen') == true){
 					$('#edit_name_dialog').dialog('moveToTop');
 				}else{
-					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(jsondata){
-						if(jsondata.status != 'error'){
-							$('#edit_name_dialog' ).dialog({
+					$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata){
+						if(jsondata.status == 'success'){
+							$('body').append('<div id="name_dialog"></div>');
+							$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
 								modal: true,
-								closeOnEscape: (isnew == '' && false || true),
-								title:  (isnew && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								closeOnEscape: true,
+								title:  t('contacts', 'Edit name'),
 								height: 'auto', width: 'auto',
 								buttons: {
 									'Ok':function() { 
 										Contacts.UI.Card.saveName(this);
-										$(this).dialog('destroy').remove();
+										$(this).dialog('close');
 									},
-									'Cancel':function() { $(this).dialog('destroy').remove(); }
+									'Cancel':function() { $(this).dialog('close'); }
 								},
 								close: function(event, ui) {
 									$(this).dialog('destroy').remove();
-									//return event;
+									$('#name_dialog').remove();
 								},
 								open: function(event, ui) {
 									// load 'N' property - maybe :-P
@@ -881,23 +882,23 @@ Contacts={
 			},
 			editAddress:function(obj, isnew){
 				var container = undefined;
-				var q = q = '?id=' + this.id;
+				var params = {id: this.id};
 				if(obj === 'new') {
 					isnew = true;
 					$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show();
 					container = $('#addressdisplay dl').last();
 					container.removeClass('template').addClass('propertycontainer');
 				} else {
-					q = q + '&checksum='+Contacts.UI.checksumFor(obj);
+					params['checksum'] = Contacts.UI.checksumFor(obj); 
 				}
 				/* Initialize the address edit dialog */
 				if($('#edit_address_dialog').dialog('isOpen') == true){
 					$('#edit_address_dialog').dialog('moveToTop');
 				}else{
-					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editaddress.php')+q, function(jsondata){
-						if(jsondata.status != 'error'){
-							$('#edit_address_dialog' ).dialog({
-								/*modal: true,*/
+					$.getJSON(OC.filePath('contacts', 'ajax', 'editaddress.php'),params,function(jsondata){
+						if(jsondata.status == 'success'){
+							$('body').append('<div id="address_dialog"></div>');
+							$('#address_dialog').html(jsondata.data.page).find('#edit_address_dialog' ).dialog({
 								height: 'auto', width: 'auto',
 								buttons: {
 									'Ok':function() {
@@ -906,10 +907,10 @@ Contacts={
 										} else {
 											Contacts.UI.Card.saveAddress(this, obj, isnew);
 										}
-										$(this).dialog('destroy').remove();
+										$(this).dialog('close');
 									},
 									'Cancel':function() {
-										$(this).dialog('destroy').remove();
+										$(this).dialog('close');
 										if(isnew) {
 											container.remove();
 										}
@@ -917,6 +918,7 @@ Contacts={
 								},
 								close : function(event, ui) {
 									$(this).dialog('destroy').remove();
+									$('#address_dialog').remove();
 									if(isnew) {
 										container.remove();
 									}
@@ -1122,13 +1124,16 @@ Contacts={
 			},
 			loadPhoto:function(refresh){
 				$('#phototools li a').tipsy('hide');
+				var wrapper = $('#contacts_details_photo_wrapper');
+				wrapper.addClass('wait');
 				$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
-						$('#contacts_details_photo_wrapper').html(jsondata.data.page);
+						wrapper.html(jsondata.data.page).ready(function(){ wrapper.removeClass('wait').tipsy() });
 						Contacts.UI.Card.loadPhotoHandlers();
 					}
 					else{
+						wrapper.removeClass('wait');
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
@@ -1143,6 +1148,7 @@ Contacts={
 						$('#edit_photo_dialog_img').html(jsondata.data.page);
 					}
 					else{
+						wrapper.removeClass('wait');
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
@@ -1167,12 +1173,14 @@ Contacts={
 			savePhoto:function(){
 				var target = $('#crop_target');
 				var form = $('#cropform');
+				var wrapper = $('#contacts_details_photo_wrapper');
+				wrapper.addClass('wait');
 				form.submit();
 				target.load(function(){
 					var response=jQuery.parseJSON(target.contents().text());
 					if(response != undefined && response.status == 'success'){
 						// load cropped photo.
-						$('#contacts_details_photo_wrapper').html(response.data.page);
+						wrapper.html(response.data.page).ready(function(){ wrapper.removeClass('wait') });
 						Contacts.UI.Card.data.PHOTO = true;
 						Contacts.UI.Card.loadPhotoHandlers();
 					}else{
@@ -1280,16 +1288,19 @@ Contacts={
 				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
 					$('#chooseaddressbook_dialog').dialog('moveToTop');
 				}else{
-					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
-						if(jsondata.status != 'error'){
-							$('#chooseaddressbook_dialog').dialog({
+					$('body').append('<div id="addressbook_dialog"></div>');
+					$.getJSON(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
+						if(jsondata.status == 'success'){
+							$('#addressbook_dialog').html(jsondata.data.page).find('#chooseaddressbook_dialog').dialog({
 								width : 600,
 								close : function(event, ui) {
 									$(this).dialog('destroy').remove();
+									$('#addressbook_dialog').remove();
 								}
 							}).css('overflow','visible');
 						} else {
 							alert(jsondata.data.message);
+							$('#addressbook_dialog').remove();
 						}
 					});
 				}

From 51aa84e70adaa83ee195c4a187c490b073d16a00 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 29 May 2012 16:42:54 +0200
Subject: [PATCH 0073/1537] Contacts: NOTE wasn't saved properly.

---
 apps/contacts/ajax/saveproperty.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 1af05682b6..e4537cd979 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -102,6 +102,8 @@ switch($element) {
 			$value = $vcard->getAsString('CATEGORIES');
 		}
 		break;*/
+	case 'NOTE':
+		$value = str_replace('\n', '\\n', $value);
 	case 'EMAIL':
 		$value = strtolower($value);
 		break;

From c9df18ed8c62f2d6eb454b2554e6bb40382f3701 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 29 May 2012 16:46:54 +0200
Subject: [PATCH 0074/1537] Forgot a break.

---
 apps/contacts/ajax/saveproperty.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index e4537cd979..6509ac21f2 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -96,14 +96,9 @@ switch($element) {
 			//$value = getOtherValue();
 		}
 		break;
-	//case 'CATEGORIES':
-		/* multi autocomplete triggers an save with empty value
-		if (!$value) {
-			$value = $vcard->getAsString('CATEGORIES');
-		}
-		break;*/
 	case 'NOTE':
 		$value = str_replace('\n', '\\n', $value);
+		break;
 	case 'EMAIL':
 		$value = strtolower($value);
 		break;

From d334f33eba3c1b600f077caa8bbaf8bf872e86cc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 16 May 2012 21:51:45 -0400
Subject: [PATCH 0075/1537] Initial support for Amazon S3 storage backend

Conflicts:

	apps/files_external/tests/config.php
---
 apps/files_external/lib/amazons3.php   | 236 +++++++++++++++++++++++++
 apps/files_external/tests/amazons3.php |  50 ++++++
 apps/files_external/tests/config.php   |   6 +
 3 files changed, 292 insertions(+)
 create mode 100644 apps/files_external/lib/amazons3.php
 create mode 100644 apps/files_external/tests/amazons3.php

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
new file mode 100644
index 0000000000..e847ef143c
--- /dev/null
+++ b/apps/files_external/lib/amazons3.php
@@ -0,0 +1,236 @@
+<?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 'aws-sdk-1.5.5/sdk.class.php';
+
+class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
+
+	private $s3;
+	private $bucket;
+	private $objects = array();
+
+	private static $tempFiles = array();
+	
+	// TODO options: storage class, encryption server side, encrypt before upload?
+
+	public function __construct($params) {
+		$this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
+		$this->bucket = $params['bucket'];
+	}
+
+	private function getObject($path) {
+		if (array_key_exists($path, $this->objects)) {
+			return $this->objects[$path];
+		} else {
+			$response = $this->s3->get_object_metadata($this->bucket, $path);
+			if ($response) {
+				$this->objects[$path] = $response;
+				return $response;
+			// This object could be a folder, a '/' must be at the end of the path
+			} else if (substr($path, -1) != '/') {
+				$response = $this->s3->get_object_metadata($this->bucket, $path.'/');
+				if ($response) {
+					$this->objects[$path] = $response;
+					return $response;
+				}
+			}
+		}
+		return false;
+	}
+
+	public function mkdir($path) {
+		// Folders in Amazon S3 are 0 byte objects with a '/' at the end of the name
+		if (substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		$response = $this->s3->create_object($this->bucket, $path, array('body' => ''));
+		return $response->isOK();
+	}
+
+	public function rmdir($path) {
+		if (substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		return $this->unlink($path);
+	}
+
+	public function opendir($path) {
+		if ($path == '' || $path == '/') {
+			// Use the '/' delimiter to only fetch objects inside the folder
+			$opt = array('delimiter' => '/');
+		} else {
+			if (substr($path, -1) != '/') {
+				$path .= '/';
+			}
+			$opt = array('delimiter' => '/', 'prefix' => $path);
+		}
+		$response = $this->s3->list_objects($this->bucket, $opt);
+		if ($response->isOK()) {
+			$files = array();
+			foreach ($response->body->Contents as $object) {
+				// The folder being opened also shows up in the list of objects, don't add it to the files
+				if ($object->Key != $path) {
+					$files[] = basename($object->Key);
+				}
+			}
+			// Sub folders show up as CommonPrefixes
+			foreach ($response->body->CommonPrefixes as $object) {
+				$files[] = basename($object->Prefix);
+			}
+			OC_FakeDirStream::$dirs['amazons3'] = $files;
+			return opendir('fakedir://amazons3');
+		}
+		return false;
+	}
+
+	public function stat($path) {
+		if ($path == '' || $path == '/') {
+			$stat['size'] = $this->s3->get_bucket_filesize($this->bucket);
+			$stat['atime'] = time();
+			$stat['mtime'] = $stat['atime'];
+			$stat['ctime'] = $stat['atime'];
+		} else if ($object = $this->getObject($path)) {
+			$stat['size'] = $object['Size'];
+			$stat['atime'] = time();
+			$stat['mtime'] = strtotime($object['LastModified']);
+			$stat['ctime'] = $stat['mtime'];
+		}
+		if (isset($stat)) {
+			return $stat;
+		}
+		return false;
+	}
+
+	public function filetype($path) {
+		if ($path == '' || $path == '/') {
+			return 'dir';
+		} else if ($object = $this->getObject($path)) {
+			// Amazon S3 doesn't have typical folders, this is an alternative method to detect a folder
+			if (substr($object['Key'], -1) == '/' && $object['Size'] == 0) {
+				return 'dir';
+			} else {
+				return 'file';
+			}
+		}
+		return false;
+	}
+
+	public function is_readable($path) {
+		// TODO Check acl and determine who grantee is
+		return true;
+	}
+
+	public function is_writable($path) {
+		// TODO Check acl and determine who grantee is
+		return true;
+	}
+
+	public function file_exists($path) {
+		if ($this->filetype($path) == 'dir' && substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		return $this->s3->if_object_exists($this->bucket, $path);
+	}
+
+	public function unlink($path) {
+		$response = $this->s3->delete_object($this->bucket, $path);
+		return $response->isOK();
+	}
+
+	public function fopen($path, $mode) {
+		switch ($mode) {
+			case 'r':
+			case 'rb':
+				$tmpFile = OC_Helper::tmpFile();
+				$handle = fopen($tmpFile, 'w');
+				$response = $this->s3->get_object($this->bucket, $path, array('fileDownload' => $handle));
+				if ($response->isOK()) {
+					return fopen($tmpFile, 'r');
+				}
+				break;
+			case 'w':
+			case 'wb':
+			case 'a':
+			case 'ab':
+			case 'r+':
+			case 'w+':
+			case 'wb+':
+			case 'a+':
+			case 'x':
+			case 'x+':
+			case 'c':
+			case 'c+':
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
+				} else {
+					$ext = '';
+				}
+				$tmpFile = OC_Helper::tmpFile($ext);
+				OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				if ($this->file_exists($path)) {
+					$source = $this->fopen($path, 'r');
+					file_put_contents($tmpFile, $source);
+				}
+				self::$tempFiles[$tmpFile] = $path;
+				return fopen('close://'.$tmpFile, $mode);
+		}
+		return false;
+	}
+
+	public function writeBack($tmpFile) {
+		if (isset(self::$tempFiles[$tmpFile])) {
+			$handle = fopen($tmpFile, 'r');
+			$response = $this->s3->create_object($this->bucket, self::$tempFiles[$tmpFile], array('fileUpload' => $handle));
+			if ($response->isOK()) {
+				unlink($tmpFile);
+			}
+		}
+	}
+
+	public function getMimeType($path) {
+		if ($this->filetype($path) == 'dir') {
+			return 'httpd/unix-directory';
+		} else if ($object = $this->getObject($path)) {
+			return $object['ContentType'];
+		}
+		return false;
+	}
+
+	public function free_space($path) {
+		// Infinite? 
+		return false;
+	}
+
+	public function touch($path, $mtime = null) {
+		if (is_null($mtime)) {
+			$mtime = time();
+		}
+		if ($this->filetype($path) == 'dir' && substr($path, -1) != '/') {
+			$path .= '/';
+		}
+		$response = $this->s3->update_object($this->bucket, $path, array('meta' => array('LastModified' => $mtime)));
+		return $response->isOK();
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
new file mode 100644
index 0000000000..d0084c94af
--- /dev/null
+++ b/apps/files_external/tests/amazons3.php
@@ -0,0 +1,50 @@
+<?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/>.
+*/
+
+$config = include('apps/files_external/tests/config.php');
+if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['run']) {
+	abstract class Test_Filestorage_AmazonS3 extends Test_FileStorage{}
+	return;
+} else {
+	class Test_Filestorage_AmazonS3 extends Test_FileStorage {
+
+		private $config;
+		private $id;
+
+		public function setUp() {
+			$id = uniqid();
+			$this->config = include('apps/files_external/tests/config.php');
+			$this->config['amazons3']['bucket'] = $id; // Make sure we have a new empty bucket to work in
+			$this->instance = new OC_Filestorage_AmazonS3($this->config['amazons3']);
+		}
+
+		public function tearDown() {
+			$s3 = new AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret']));
+			if ($s3->delete_all_objects($this->id)) {
+				$s3->delete_bucket($this->id);
+			}
+		}
+	}
+}
+
+?>
+
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 35b5fa0386..970008d642 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -36,4 +36,10 @@ return array(
 		'host'=>'localhost',
 		'root'=>'/test',
 	),
+	'amazons3'=>array(
+		'run'=>false,
+		'key'=>'test',
+		'secret'=>'test',
+		'bucket'=>'bucket',
+	),
 );

From fbe58755e58675231feb443b52d2f670b8a78434 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 29 May 2012 12:31:47 -0400
Subject: [PATCH 0076/1537] Restrict requested app to apps directory

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index cc715afac5..fdb682bf50 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -437,7 +437,7 @@ class OC{
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
 		
 		//parse the given parameters
-		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace('\0', '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
+		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){
 			$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
 			$param = substr(self::$REQUESTEDAPP, strpos(self::$REQUESTEDAPP, '?') + 1);

From 29b17672b4aca6e49f7b3a9a6c1cf95ff15de12f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 29 May 2012 19:46:17 +0200
Subject: [PATCH 0077/1537] a bit of work for repeating events caching

---
 apps/calendar/lib/repeat.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 6ee2e42c59..38d290ef5e 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -36,12 +36,21 @@ class OC_Calendar_Repeat{
 	}
 	/*
 	 * @brief returns the cache of all repeating events of a calendar
+	 * @param (int) $id - id of the calendar
+	 * @return (array) 
 	 */
-	public static function getcalendar();
+	public static function getcalendar($id){
+
+	}
 	/*
 	 * @brief returns the cache of all repeating events of a calendar in a specific period
+	 * @param (int) $id - id of the event
+	 * @param (string) $from - start for period in UTC
+	 * @param (string) $until - end for period in UTC
 	 */
-	public static function getcalendar_inperiod();
+	public static function getcalendar_inperiod($id, $from, $until){
+		
+	}
 	/*
 	 * @brief generates the cache the first time
 	 */
@@ -70,4 +79,4 @@ class OC_Calendar_Repeat{
 	 * @brief removes the cache of all events of a calendar
 	 */
 	public static function cleancalendar();
-}
+}
\ No newline at end of file

From dbcd26be684461daac7c406cc3f52a2a810d1126 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 29 May 2012 23:40:26 +0200
Subject: [PATCH 0078/1537] Contacts: Rewrote import script.

---
 apps/contacts/import.php | 83 +++++++++++++---------------------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 1a07781b9d..fdea4975d5 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -11,6 +11,7 @@ ob_start();
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 $nl = "\n";
+
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
 
 function writeProgress($pct) {
@@ -48,78 +49,46 @@ if(isset($_POST['method']) && $_POST['method'] == 'new'){
 	OC_Contacts_App::getAddressbook($id); // is owner access check
 }
 //analyse the contacts file
-writeProgress('20');
-$searchfor = array('VCARD');
-$parts = $searchfor;
-$filearr = explode($nl, $file);
+writeProgress('40');
+$lines = explode($nl, $file);
 $inelement = false;
 $parts = array();
-$i = 0;
-foreach($filearr as $line){
-	foreach($searchfor as $search){
-		if(substr_count($line, $search) == 1){
-			list($attr, $val) = explode(':', $line);
-			if($attr == 'BEGIN'){
-				$parts[]['begin'] = $i;
-				$inelement = true;
-			}
-			if($attr == 'END'){
-				$parts[count($parts) - 1]['end'] = $i;
-				$inelement = false;
-			}
-		}
+$card = array();
+foreach($lines as $line){
+	if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
+		$inelement = true;
+	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
+		$card[] = $line;
+		$parts[] = implode($nl, $card);
+		$card = array();
+		$inelement = false;
+	}
+	if ($inelement === true && trim($line) != '') {
+		$card[] = $line;
 	}
-	$i++;
 }
 //import the contacts
-writeProgress('40');
-$start = '';
-for ($i = 0; $i < $parts[0]['begin']; $i++) { 
-	if($i == 0){
-		$start = $filearr[0];
-	}else{
-		$start .= $nl . $filearr[$i];
-	}
-}
-$end = '';
-for($i = $parts[count($parts) - 1]['end'] + 1;$i <= count($filearr) - 1; $i++){
-	if($i == $parts[count($parts) - 1]['end'] + 1){
-		$end = $filearr[$parts[count($parts) - 1]['end'] + 1];
-	}else{
-		$end .= $nl . $filearr[$i];
-	}
-}
-writeProgress('50');
-$importready = array();
-foreach($parts as $part){
-	for($i = $part['begin']; $i <= $part['end'];$i++){
-		if($i == $part['begin']){
-			$content = $filearr[$i];
-		}else{
-			$content .= $nl . $filearr[$i];
-		}
-	}
-	$importready[] = $start . $nl . $content . $nl . $end;
-}
 writeProgress('70');
-if(count($parts) == 1){
-	$importready = array($file);
-}
 $imported = 0;
 $failed = 0;
-if(!count($importready) > 0) {
+if(!count($parts) > 0) {
 	OCP\JSON::error(array('message' => 'No contacts to import in .'.$_POST['file'].' Please check if the file is corrupted.'));
 	exit();
 }
-foreach($importready as $import){
-	$card = OC_VObject::parse($import);
+foreach($parts as $part){
+	$card = OC_VObject::parse($part);
 	if (!$card) {
 		$failed += 1;
-		OCP\Util::writeLog('contacts','Import: skipping card. Error parsing VCard: '.$import, OCP\Util::ERROR);
+		OCP\Util::writeLog('contacts','Import: skipping card. Error parsing VCard: '.$part, OCP\Util::ERROR);
 		continue; // Ditch cards that can't be parsed by Sabre.
 	}
-	$imported += 1;
-	OC_Contacts_VCard::add($id, $card);
+	try {
+		OC_Contacts_VCard::add($id, $card);
+		$imported += 1;
+	} catch (Exception $e) {
+		OCP\Util::writeLog('contacts', 'Error importing vcard: '.$e->getMessage().$nl.$card, OCP\Util::ERROR);
+		$failed += 1;
+	}
 }
 //done the import
 writeProgress('100');

From 22a04d8e938d6f2660e6c88cf954d638fc4321eb Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 30 May 2012 14:14:32 +0200
Subject: [PATCH 0079/1537] =?UTF-8?q?don=C2=B4t=20hardcode=20/tmp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/contacts/ajax/currentphoto.php | 2 +-
 apps/contacts/ajax/oc_photo.php     | 2 +-
 apps/contacts/ajax/savecrop.php     | 2 +-
 apps/contacts/ajax/uploadimport.php | 2 +-
 apps/contacts/ajax/uploadphoto.php  | 4 ++--
 lib/helper.php                      | 2 +-
 lib/migrate.php                     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index d8afa060b1..d0654b17d6 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -40,7 +40,7 @@ if (!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 }
 
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
 $contact = OC_Contacts_App::getContactVCard($_GET['id']);
 $image = new OC_Image();
 if(!$image) {
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 085d2710f5..184217f2b7 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -42,7 +42,7 @@ if(!isset($_GET['path'])) {
 }
 
 $localpath = OC_Filesystem::getLocalFile($_GET['path']);
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
 
 if(!file_exists($localpath)) {
 	bailOut(OC_Contacts_App::$l10n->t('File doesn\'t exist:').$localpath);
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index cd47030712..fe9e5c5b99 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -71,7 +71,7 @@ if(file_exists($tmp_path)) {
 		OCP\Util::writeLog('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OCP\Util::DEBUG);
 		if($image->crop($x1, $y1, $w, $h)) {
 			if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
-				$tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues.
+				$tmpfname = tempnam(get_temp_dir(), "occCropped"); // create a new file because of caching issues.
 				if($image->save($tmpfname)) {
 					unlink($tmp_path);
 					$card = OC_Contacts_App::getContactVCard($id);
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index f4a13e0a4b..b11f380fa8 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -67,7 +67,7 @@ if($error !== UPLOAD_ERR_OK) {
 }
 $file=$_FILES['importfile'];
 
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
 	if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) {
 		debug($fn.' uploaded');
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 99015e2d50..dca8ede6d6 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -46,7 +46,7 @@ if ($fn) {
 		exit();
 	}
 	$id = $_GET['id'];
-	$tmpfname = tempnam('/tmp', 'occOrig');
+	$tmpfname = tempnam(get_temp_dir(), 'occOrig');
 	file_put_contents($tmpfname, file_get_contents('php://input'));
 	debug($tmpfname.' uploaded');
 	$image = new OC_Image();
@@ -93,7 +93,7 @@ if($error !== UPLOAD_ERR_OK) {
 }
 $file=$_FILES['imagefile'];
 
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
 	$image = new OC_Image();
 	if($image->loadFromFile($file['tmp_name'])) {
diff --git a/lib/helper.php b/lib/helper.php
index e3d292737a..537465b15a 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -514,7 +514,7 @@ class OC_Helper {
 	 * remove all files created by self::tmpFile
 	 */
 	public static function cleanTmp(){
-		$leftoversFile='/tmp/oc-not-deleted';
+		$leftoversFile=get_temp_dir().'/oc-not-deleted';
 		if(file_exists($leftoversFile)){
 			$leftovers=file($leftoversFile);
 			foreach($leftovers as $file) {
diff --git a/lib/migrate.php b/lib/migrate.php
index 8fb949d66e..f9cab915d0 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -146,7 +146,7 @@ class OC_Migrate{
 	 		case 'instance':
 	 			self::$content = new OC_Migration_Content( self::$zip );
 				// Creates a zip that is compatable with the import function
-				$dbfile = tempnam( "/tmp", "owncloud_export_data_" );
+				$dbfile = tempnam( get_temp_dir(), "owncloud_export_data_" );
 				OC_DB::getDbStructure( $dbfile, 'MDB2_SCHEMA_DUMP_ALL');
 
 				// Now add in *dbname* and *dbprefix*

From 8b4e16ec77f69c47d7bb29c340539f96f7944017 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 30 May 2012 22:34:51 +0200
Subject: [PATCH 0080/1537] LDAP: fix wrong value for input type

---
 apps/user_ldap/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index ac263ed68c..34c4f8f9d9 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -17,7 +17,7 @@
 		<p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
 		<p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><input type="text" id="ldap_base_users" name="ldap_base_users" value="<?php echo $_['ldap_base_users']; ?>" /></p>
 		<p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><input type="text" id="ldap_base_groups" name="ldap_base_groups" value="<?php echo $_['ldap_base_groups']; ?>" /></p>
-		<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
+		<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
 		<p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p>
 		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
 		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />

From d98a0a1bb9c52f18c716267682644e2d2b43659d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 30 May 2012 23:55:27 +0200
Subject: [PATCH 0081/1537] fix for pgsql database migration

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index a7b776cc1b..f2c2137dc8 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -410,6 +410,9 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
                     }
                     $db->loadModule('Datatype', null, true);
                     $type = $db->datatype->getTypeDeclaration($field['definition']);
+                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table, since serials arent a real type
+						$type='INTEGER';//use integer instead
+                    }
                     $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
                     $result = $db->exec("ALTER TABLE $name $query");
                     if (PEAR::isError($result)) {

From 4434016a8bcb815b3cc61e5f0f8157e60db6e710 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 29 May 2012 17:02:32 +0200
Subject: [PATCH 0082/1537] Whitespace fixes

---
 lib/files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/files.php b/lib/files.php
index 072de33004..79d214665d 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -32,11 +32,11 @@ class OC_Files {
 	* get the content of a directory
 	* @param dir $directory
 	*/
-  public static function getDirectoryContent($directory, $mimetype_filter = ''){
+	public static function getDirectoryContent($directory, $mimetype_filter = ''){
 		if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){
 			$directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY));
 		}
-    $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
+		$files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
 		foreach($files as &$file){
 			$file['directory']=$directory;
 			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';

From 0934a975b2bfb7582fd32d9f067ee1bf2cd5bf81 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 30 May 2012 17:47:31 +0200
Subject: [PATCH 0083/1537] Remove unused L10N variable

---
 apps/tasks/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/tasks/index.php b/apps/tasks/index.php
index 5e17ca454e..4ff304a560 100644
--- a/apps/tasks/index.php
+++ b/apps/tasks/index.php
@@ -26,7 +26,6 @@ OCP\Util::addScript('','oc-vcategories');
 OCP\App::setActiveNavigationEntry('tasks_index');
 
 $categories = OC_Calendar_App::getCategoryOptions();
-$l10n = new OC_L10N('tasks');
 $priority_options = OC_Task_App::getPriorityOptions();
 $output = new OCP\Template('tasks', 'tasks', 'user');
 $output->assign('priority_options', $priority_options);

From 2ae58ee6c01f2ba3a97f6d2741c46ea5dda68792 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 30 May 2012 18:23:23 +0200
Subject: [PATCH 0084/1537] Calendar: small cleanup of import progress writing

---
 apps/calendar/ajax/import/import.php | 39 +++++++++++-----------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 202af1eb46..904c07c52e 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -7,16 +7,23 @@
  */
 //check for calendar rights or create new one
 ob_start();
+
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
+
 $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
+
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
-if(is_writable('import_tmp/')){
-	$progressfopen = fopen($progressfile, 'w');
-	fwrite($progressfopen, '10');
-	fclose($progressfopen);
+
+function writeProgress($pct) {
+	if(is_writable('import_tmp/')){
+		$progressfopen = fopen($progressfile, 'w');
+		fwrite($progressfopen, $pct);
+		fclose($progressfopen);
+	}
 }
+writeProgress('10');
 $file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
 if($_POST['method'] == 'new'){
 	$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), $_POST['calname']);
@@ -29,20 +36,12 @@ if($_POST['method'] == 'new'){
 	}
 	$id = $_POST['id'];
 }
-if(is_writable('import_tmp/')){
-	$progressfopen = fopen($progressfile, 'w');
-	fwrite($progressfopen, '20');
-	fclose($progressfopen);
-}
+writeProgress('20');
 // normalize the newlines
 $file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
 $lines = explode("\n", $file);
 unset($file);
-if(is_writable('import_tmp/')){
-	$progressfopen = fopen($progressfile, 'w');
-	fwrite($progressfopen, '30');
-	fclose($progressfopen);
-}
+writeProgress('30');
 // analyze the file, group components by uid, and keep refs to originating calendar object
 // $cals is array calendar objects, keys are 1st line# $cal, ie array( $cal => $caldata )
 //   $caldata is array( 'first' => 1st component line#, 'last' => last comp line#, 'end' => end line# )
@@ -86,11 +85,7 @@ foreach($lines as $line) {
 	$i++;
 }
 // import the calendar
-if(is_writable('import_tmp/')){
-	$progressfopen = fopen($progressfile, 'w');
-	fwrite($progressfopen, '60');
-	fclose($progressfopen);
-}
+writeProgress('60');
 foreach($uids as $uid) {
 	
 	$prefix=$suffix=$content=array();
@@ -117,11 +112,7 @@ foreach($uids as $uid) {
 	}
 }
 // finished import
-if(is_writable('import_tmp/')){
-	$progressfopen = fopen($progressfile, 'w');
-	fwrite($progressfopen, '100');
-	fclose($progressfopen);
-}
+writeProgress('100');
 sleep(3);
 if(is_writable('import_tmp/')){
 	unlink($progressfile);

From a33f580db10483f6daa6142923633a3b1d808794 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 31 May 2012 13:00:58 +0200
Subject: [PATCH 0085/1537] Remove OC_App::register function

The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
---
 apps/admin_dependencies_chk/appinfo/app.php |  5 ---
 apps/bookmarks/appinfo/app.php              |  2 --
 apps/calendar/appinfo/app.php               |  4 ---
 apps/contacts/appinfo/app.php               |  5 ---
 apps/external/appinfo/app.php               |  2 --
 apps/files/appinfo/app.php                  |  1 -
 apps/files_versions/appinfo/app.php         |  8 +----
 apps/gallery/appinfo/app.php                |  5 ---
 apps/media/appinfo/app.php                  |  2 --
 apps/remoteStorage/appinfo/app.php          |  4 ---
 apps/tasks/appinfo/app.php                  |  5 ---
 apps/user_webfinger/appinfo/app.php         |  4 ---
 lib/app.php                                 | 40 +--------------------
 lib/public/app.php                          |  1 -
 search/appinfo/app.php                      |  5 ---
 settings/appinfo/app.php                    |  7 ----
 16 files changed, 2 insertions(+), 98 deletions(-)
 delete mode 100644 search/appinfo/app.php
 delete mode 100644 settings/appinfo/app.php

diff --git a/apps/admin_dependencies_chk/appinfo/app.php b/apps/admin_dependencies_chk/appinfo/app.php
index 72d368a085..62b26342d2 100644
--- a/apps/admin_dependencies_chk/appinfo/app.php
+++ b/apps/admin_dependencies_chk/appinfo/app.php
@@ -1,9 +1,4 @@
 <?php
 $l=OC_L10N::get('admin_dependencies_chk');
 
-OCP\App::register( array( 
-  'order' => 14,
-  'id' => 'admin_dependencies_chk',
-  'name' => 'Owncloud Install Info' ));
-
 OCP\App::registerAdmin('admin_dependencies_chk','settings');
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
index 8a8f443891..f4bca9df70 100644
--- a/apps/bookmarks/appinfo/app.php
+++ b/apps/bookmarks/appinfo/app.php
@@ -10,8 +10,6 @@
 OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php';
 OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php';
 
-OCP\App::register( array( 'order' => 70, 'id' => 'bookmark', 'name' => 'Bookmarks' ));
-
 $l = new OC_l10n('bookmarks');
 OCP\App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OCP\Util::linkTo( 'bookmarks', 'index.php' ), 'icon' => OCP\Util::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => $l->t('Bookmarks')));
 
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index b02fc602c6..886c218f7c 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -11,10 +11,6 @@ OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'delete
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
-OCP\App::register( array(
-  'order' => 10,
-  'id' => 'calendar',
-  'name' => 'Calendar' ));
 OCP\App::addNavigationEntry( array(
   'id' => 'calendar_index',
   'order' => 10,
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 20d97697bf..7a04ec7ff5 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -9,11 +9,6 @@ OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'delete
 OCP\Util::connectHook('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
 OCP\Util::connectHook('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
 
-OCP\App::register( array(
-  'order' => 10,
-  'id' => 'contacts',
-  'name' => 'Contacts' ));
-
 OCP\App::addNavigationEntry( array(
   'id' => 'contacts_index',
   'order' => 10,
diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php
index ee5437782c..1a02f3a1be 100644
--- a/apps/external/appinfo/app.php
+++ b/apps/external/appinfo/app.php
@@ -26,8 +26,6 @@ OCP\Util::addStyle( 'external', 'style');
 
 OCP\App::registerAdmin('external', 'settings');
 
-OCP\App::register(array('order' => 70, 'id' => 'external', 'name' => 'External'));
-
 $sites = OC_External::getSites();
 for ($i = 0; $i < sizeof($sites); $i++) {
 	OCP\App::addNavigationEntry(
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 5c0d3c8db8..db3b213ab8 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -1,7 +1,6 @@
 <?php
 $l=OC_L10N::get('files');
 
-OCP\App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
 OCP\App::registerAdmin('files','admin');
 
 OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 457c512535..49f1573f7c 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -2,14 +2,8 @@
 
 require_once('apps/files_versions/versions.php');
 
-// Add an entry in the app list
-OCP\App::register( array(
-  'order' => 10,
-  'id' => 'files_versions',
-  'name' => 'Versioning' ));
-
 OCP\App::registerAdmin('files_versions', 'settings');
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
\ No newline at end of file
+OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 878da48698..e1db33eb31 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -29,11 +29,6 @@ OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.p
 
 $l = OC_L10N::get('gallery');
 
-OCP\App::register(array(
-  'order' => 20,
-  'id' => 'gallery',
-  'name' => 'Pictures'));
-
 OCP\App::addNavigationEntry( array(
  'id' => 'gallery_index',
  'order' => 20,
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index d6a09c4805..869bc34402 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -29,8 +29,6 @@ require_once('apps/media/lib_scanner.php');
 OCP\Util::addscript('media','loader');
 OCP\App::registerPersonal('media','settings');
 
-OCP\App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
-
 OCP\App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OCP\Util::linkTo('media', 'index.php'), 'icon' => OCP\Util::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
 
 OC_Search::registerProvider('OC_MediaSearchProvider');
diff --git a/apps/remoteStorage/appinfo/app.php b/apps/remoteStorage/appinfo/app.php
index 14b8a3d11d..c278fd7305 100644
--- a/apps/remoteStorage/appinfo/app.php
+++ b/apps/remoteStorage/appinfo/app.php
@@ -1,6 +1,2 @@
 <?php
-OCP\App::register( array( 
-  'order' => 10,
-  'id' => 'remoteStorage',
-  'name' => 'remoteStorage compatibility' ));
 OCP\App::registerPersonal('remoteStorage','settings');
diff --git a/apps/tasks/appinfo/app.php b/apps/tasks/appinfo/app.php
index f346e2aa4c..e7c82d6f24 100644
--- a/apps/tasks/appinfo/app.php
+++ b/apps/tasks/appinfo/app.php
@@ -3,11 +3,6 @@ $l=new OC_L10N('tasks');
 OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Task_App'] = 'apps/tasks/lib/app.php';
 
-OCP\App::register( array(
-  'order' => 11,
-  'id' => 'tasks',
-  'name' => 'Tasks' ));
-
 OCP\App::addNavigationEntry( array(
   'id' => 'tasks_index',
   'order' => 11,
diff --git a/apps/user_webfinger/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
index a45efd96a4..3336af6682 100644
--- a/apps/user_webfinger/appinfo/app.php
+++ b/apps/user_webfinger/appinfo/app.php
@@ -1,7 +1,3 @@
 <?php
-OCP\App::register( array( 
-  'order' => 11,
-  'id' => 'user_webfinger',
-  'name' => 'Webfinger' ));
 OCP\CONFIG::setAppValue('core', 'public_host-meta', '/apps/user_webfinger/host-meta.php');
 OCP\CONFIG::setAppValue('core', 'public_webfinger', '/apps/user_webfinger/webfinger.php');
diff --git a/lib/app.php b/lib/app.php
index 78de0fa21b..124b76cdc3 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -28,7 +28,6 @@
  */
 class OC_App{
 	static private $init = false;
-	static private $apps = array();
 	static private $activeapp = '';
 	static private $navigation = array();
 	static private $settingsForms = array();
@@ -54,14 +53,7 @@ class OC_App{
 			return true;
 		}
 
-		// Our very own core apps are hardcoded
-		foreach( array( 'settings') as $app ){
-			if(is_null($types)){
-				require( $app.'/appinfo/app.php' );
-			}
-		}
-
-		// The rest comes here
+		// Load the enabled apps here
 		$apps = self::getEnabledApps();
 		// prevent app.php from printing output
 		ob_start();
@@ -216,36 +208,6 @@ class OC_App{
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 	}
 
-	/**
-	 * @brief makes owncloud aware of this app
-	 * @param $data array with all information
-	 * @returns true/false
-	 *
-	 * This function registers the application. $data is an associative array.
-	 * The following keys are required:
-	 *   - id: id of the application, has to be unique ('addressbook')
-	 *   - name: Human readable name ('Addressbook')
-	 *   - version: array with Version (major, minor, bugfix) ( array(1, 0, 2))
-	 *
-	 * The following keys are optional:
-	 *   - order: integer, that influences the position of your application in
-	 *     a list of applications. Lower values come first.
-	 *
-	 */
-	public static function register( $data ){
-		OC_App::$apps[] = $data;
-	}
-
-	/**
-	 * @brief returns information of all apps
-	 * @return array with all information
-	 *
-	 * This function returns all data it got via register().
-	 */
-	public static function get(){
-		return OC_App::$apps;
-	}
-
 	/**
 	 * @brief adds an entry to the navigation
 	 * @param $data array containing the data
diff --git a/lib/public/app.php b/lib/public/app.php
index 3960db6d89..1f84087f07 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -52,7 +52,6 @@ class App {
          *
          */
         public static function register( $data ){
-		return \OC_App::register( $data );
         }
 
 
diff --git a/search/appinfo/app.php b/search/appinfo/app.php
deleted file mode 100644
index b91341643f..0000000000
--- a/search/appinfo/app.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-OC_App::register( array( 'order' => 2, "id" => 'search', 'name' => 'Search' ));
-
-?>
diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
deleted file mode 100644
index d18bcdbff0..0000000000
--- a/settings/appinfo/app.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-OC_App::register( array( "id" => "settings", "name" => "Settings" ));
-OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
-OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
-
-?>

From 3b36a9b704339b409c1065e843d33e3b8c8dc213 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 31 May 2012 13:06:27 +0200
Subject: [PATCH 0086/1537] LDAP: make queries compatible also with PostgreSQL

---
 apps/user_ldap/lib_ldap.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 5cd7e0241b..b900a67ec3 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -366,19 +366,24 @@ class OC_LDAP {
 		$table = self::getMapTable($isUser);
 		$dn = self::sanitizeDN($dn);
 
-		$sqliteAdjustment = '';
+		$sqlAdjustment = '';
 		$dbtype = OCP\Config::getSystemValue('dbtype');
-		if(($dbtype == 'sqlite') || ($dbtype == 'sqlite3')) {
-			$sqliteAdjustment = 'OR';
+		if($dbtype == 'mysql') {
+			$sqlAdjustment = 'FROM dual';
 		}
 
 		$insert = OCP\DB::prepare('
-			INSERT '.$sqliteAdjustment.' IGNORE INTO '.$table.'
-			(ldap_dn, owncloud_name)
-			VALUES (?,?)
+			INSERT INTO '.$table.' (ldap_dn, owncloud_name)
+				SELECT ?,?
+				'.$sqlAdjustment.'
+				WHERE NOT EXISTS (
+					SELECT 1
+					FROM '.$table.'
+					WHERE ldap_dn = ?
+						AND owncloud_name = ? )
 		');
 
-		$res = $insert->execute(array($dn, $ocname));
+		$res = $insert->execute(array($dn, $ocname, $dn, $ocname));
 
 		return !OCP\DB::isError($res);
 	}

From e93bb5135d0d12d3811f8c1eeaf162a613a3d98d Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 12:25:07 +0100
Subject: [PATCH 0087/1537] Applied fix from kalassico for "Chiper text must be
 a string" bug (http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094)

---
 apps/files_encryption/lib/crypt.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ec27900cbc..d2b8ad145a 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -43,16 +43,23 @@ class OC_Crypt {
 		self::init($params['uid'],$params['password']);
 	}
 
-	public static function init($login,$password) {
-		$view=new OC_FilesystemView('/'.$login);
-		OC_FileProxy::$enabled=false;
-		if(!$view->file_exists('/encryption.key')){// does key exist?
-			OC_Crypt::createkey($login,$password);
-		}
-		$key=$view->file_get_contents('/encryption.key');
-		OC_FileProxy::$enabled=true;
-		$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
-	}
+       public static function init($login,$password) {      
+          $view1=new OC_FilesystemView('/');
+          if(!$view1->file_exists('/'.$login)){
+             $view1->mkdir('/'.$login);
+          }
+
+          $view=new OC_FilesystemView('/'.$login);      
+          
+          OC_FileProxy::$enabled=false;
+          if(!$view->file_exists('/encryption.key')){// does key exist?
+             OC_Crypt::createkey($login,$password);
+          }
+          $key=$view->file_get_contents('/encryption.key');
+          OC_FileProxy::$enabled=true;
+          $_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
+       }
+
 
 	/**
 	 * get the blowfish encryption handeler for a key

From 43fcae0409d558cbbbd7571fa731391e20c4b5d9 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 14:50:41 +0100
Subject: [PATCH 0088/1537] clarified comment

---
 lib/filesystemview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index d893bd4d3d..105ffb80af 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -103,7 +103,7 @@ class OC_FilesystemView {
 	}
 
 	/**
-	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
+	 * the following functions operate with arguments and return values identical to those of their PHP built-in equivalents
 	 */
 	public function mkdir($path){
 		return $this->basicOperation('mkdir',$path,array('create','write'));

From fc400e06c339f41b25ac5fe158c37c473634f39e Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 14:53:52 +0100
Subject: [PATCH 0089/1537] fixed typos in var names

---
 lib/filesystemview.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 105ffb80af..a55a3a70de 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -345,7 +345,7 @@ class OC_FilesystemView {
 	 */
 	private function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
 		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and OC_Filesystem::isValidPath($path)){
-			$interalPath=$this->getInternalPath($path);
+			$internalPath=$this->getInternalPath($path);
 			$run=true;
 			if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
 				foreach($hooks as $hook){
@@ -358,9 +358,9 @@ class OC_FilesystemView {
 			}
 			if($run and $storage=$this->getStorage($path)){
 				if(!is_null($extraParam)){
-					$result=$storage->$operation($interalPath,$extraParam);
+					$result=$storage->$operation($internalPath,$extraParam);
 				}else{
-					$result=$storage->$operation($interalPath);
+					$result=$storage->$operation($internalPath);
 				}
 				$result=OC_FileProxy::runPostProxies($operation,$path,$result);
 				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){

From 8744b09959de4bfff523555f77c76a0a2153e338 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 17:02:35 +0100
Subject: [PATCH 0090/1537] added extensive class comment based on icewind's
 January list email

---
 lib/filesystemview.php | 52 +++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index a55a3a70de..dcbdd1ae12 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -1,25 +1,39 @@
 <?php
 
 /**
-* ownCloud
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* 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/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * 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/>.
+ */
+
+
+/**
+ * Class to provide app access to files outside of the currently logged in user's data
+ * folder. Functions are provided to create a "view" into ownCloud's virtual file  
+ * system, and an API similar to the oc_filesystem class is available for manipulating
+ * those files (including the ability to read, write, and delete files).
+ * 
+ * Every view can have it's own chroot, giving it access to a part of the 
+ * filesystem and will provide the same functionality as oc_filesystem.
+
+ * For instance an app can create a new filesystem view on a data folder belonging
+ * to a user other than the one logged in, so that it may change the files there 
+ * (use case: enabling sharing of files).
+ */
 
 class OC_FilesystemView {
 	private $fakeRoot='';

From 6b3df8ae9c61ce6badc653d293eac7d61820f144 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 17:32:34 +0100
Subject: [PATCH 0091/1537] Improved class comment block

---
 lib/filesystemview.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index dcbdd1ae12..c62c48d528 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -22,17 +22,18 @@
 
 
 /**
- * Class to provide app access to files outside of the currently logged in user's data
- * folder. Functions are provided to create a "view" into ownCloud's virtual file  
- * system, and an API similar to the oc_filesystem class is available for manipulating
- * those files (including the ability to read, write, and delete files).
+ * Class to provide access to ownCloud filesystem via a "view", and methods for 
+ * working with files within that view (e.g. read, write, delete, etc.). Each 
+ * view is restricted to a set of directories via a virtual root. The default view 
+ * uses the currently logged in user's data directory as root (parts of 
+ * OC_Filesystem are merely a wrapper for OC_FilesystemView).
+ * 
+ * Apps that need to access files outside of the user data folders (to modify files
+ * belonging to a user other than the one currently logged in, for example) should
+ * use this class directly rather than using OC_Filesystem, or making use of PHP's
+ * built-in file manipulation functions. This will ensure all hooks and proxies 
+ * are triggered correctly.
  * 
- * Every view can have it's own chroot, giving it access to a part of the 
- * filesystem and will provide the same functionality as oc_filesystem.
-
- * For instance an app can create a new filesystem view on a data folder belonging
- * to a user other than the one logged in, so that it may change the files there 
- * (use case: enabling sharing of files).
  */
 
 class OC_FilesystemView {

From ef60dcc23e0c751dbcc9f6dfc4f1277cf30db82b Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 17:38:35 +0100
Subject: [PATCH 0092/1537] fixed typo

---
 lib/filestorage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filestorage.php b/lib/filestorage.php
index d05acd3674..1d7e004af3 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -21,7 +21,7 @@
 */
 
 /**
- * Privde a common interface to all different storage options
+ * Provde a common interface to all different storage options
  */
 abstract class OC_Filestorage{
 	public function __construct($parameters){}

From ec0c0f3907d08c886f392eb99da19d5a39bf48cf Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 31 May 2012 17:57:34 +0100
Subject: [PATCH 0093/1537] Added & improved documentation

---
 lib/filesystemview.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index c62c48d528..c8df59cf82 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -33,7 +33,9 @@
  * use this class directly rather than using OC_Filesystem, or making use of PHP's
  * built-in file manipulation functions. This will ensure all hooks and proxies 
  * are triggered correctly.
- * 
+ *
+ * Filesystem functions are not called directly; they are passed to the correct 
+ * OC_Filestorage object
  */
 
 class OC_FilesystemView {
@@ -118,7 +120,9 @@ class OC_FilesystemView {
 	}
 
 	/**
-	 * the following functions operate with arguments and return values identical to those of their PHP built-in equivalents
+	 * the following functions operate with arguments and return values identical 
+	 * to those of their PHP built-in equivalents. Mostly they are merely wrappers 
+	 * for OC_Filestorage via basicOperation().
 	 */
 	public function mkdir($path){
 		return $this->basicOperation('mkdir',$path,array('create','write'));
@@ -351,12 +355,16 @@ class OC_FilesystemView {
 	}
 
 	/**
-	 * abstraction for running most basic operations
+	 * @brief abstraction layer for basic filesystem functions: wrapper for OC_Filestorage
 	 * @param string $operation
 	 * @param string #path
 	 * @param array (optional) hooks
 	 * @param mixed (optional) $extraParam
 	 * @return mixed
+	 * 
+	 * This method takes requests for basic filesystem functions (e.g. reading & writing 
+	 * files), processes hooks and proxies, sanitises paths, and finally passes them on to 
+	 * OC_Filestorage for delegation to a storage backend for execution
 	 */
 	private function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
 		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and OC_Filesystem::isValidPath($path)){

From 3db28d7616ffcc09aa23e4ab50bf6b5224c98a7c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 31 May 2012 19:46:32 +0200
Subject: [PATCH 0094/1537] linkTo instead of hard links in Files and
 Files_Archive. Hope that makes sense.

---
 apps/files/js/fileactions.js     | 2 +-
 apps/files/js/filelist.js        | 4 ++--
 apps/files_archive/js/archive.js | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 68268a7d3a..19978b61a7 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -161,7 +161,7 @@ FileActions.register('all','Rename',function(){return OC.imagePath('core','actio
 });
 
 FileActions.register('dir','Open','',function(filename){
-	window.location='index.php?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
+	window.location=OC.linkTo('files', 'index.php') + '&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 });
 
 FileActions.setDefault('dir','Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 31fb5f892e..e6a9a6883a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -41,7 +41,7 @@ FileList={
 		html = $('<tr></tr>').attr({ "data-type": "dir", "data-size": size, "data-file": name});
 		td = $('<td></td>').attr({"class": "filename", "style": 'background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')' });
 		td.append('<input type="checkbox" />');
-		var link_elem = $('<a></a>').attr({ "class": "name", "href": "index.php?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
+		var link_elem = $('<a></a>').attr({ "class": "name", "href": OC.linkTo('files', 'index.php')+"&dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
 		link_elem.append($('<span></span>').addClass('nametext').text(name));
 		link_elem.append($('<span></span>').attr({'class': 'uploadtext', 'currentUploads': 0}));
 		td.append(link_elem);
@@ -56,7 +56,7 @@ FileList={
 		modifiedColor=Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
 		td = $('<td></td>').attr({ "class": "filesize", "title": humanFileSize(size), "style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'}).text(simpleSize);
 		html.append(td);
-		
+
 		td = $('<td></td>').attr({ "class": "date" });
 		td.append($('<span></span>').attr({ "class": "modified", "title": formatDate(lastModified), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' }).text( relative_modified_date(lastModified.getTime() / 1000) ));
 		html.append(td);
diff --git a/apps/files_archive/js/archive.js b/apps/files_archive/js/archive.js
index 531eb61c01..9fb9853e29 100644
--- a/apps/files_archive/js/archive.js
+++ b/apps/files_archive/js/archive.js
@@ -8,11 +8,11 @@
 $(document).ready(function() {
 	if(typeof FileActions!=='undefined'){
 		FileActions.register('application/zip','Open','',function(filename){
-			window.location='index.php?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
+			window.location=OC.linkTo('files', 'index.php')+'&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 		});
 		FileActions.setDefault('application/zip','Open');
 		FileActions.register('application/x-gzip','Open','',function(filename){
-			window.location='index.php?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
+			window.location=OC.linkTo('files', 'index.php')+'&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 		});
 		FileActions.setDefault('application/x-gzip','Open');
 	}

From f0bd57186686689d0f65c356cd7f226c045dd6e3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 31 May 2012 20:00:46 +0200
Subject: [PATCH 0095/1537] fix potential XSS

---
 apps/calendar/templates/part.choosecalendar.rowfields.php       | 2 +-
 .../calendar/templates/part.choosecalendar.rowfields.shared.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index 965523f847..bad268897b 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -1,6 +1,6 @@
 <?php
 echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . $_['calendar']['displayname'] . '</label></td>';
+echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . htmlspecialchars($_['calendar']['displayname']) . '</label></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img  class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
 echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>';
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
index a23266da0c..6a212858a2 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
@@ -1,4 +1,4 @@
 <?php
 echo '<td width="20px"><input id="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Share.activation(this,\'' . $_['share']['owner'] . '\',' . $_['share']['calendar']['id'] . ')"' . ($_['share']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . $_['share']['calendar']['displayname'] . '</label></td>';
+echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . htmlspecialchars($_['share']['calendar']['displayname']) . '</label></td>';
 echo '<td style="font-style: italic;">' .  $l->t('shared with you by') . ' ' . $_['share']['owner'] . '</td>';
\ No newline at end of file

From d4ea853fcf3b3f82e2e489c81280b27bfbd62bf3 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 20:26:09 +0200
Subject: [PATCH 0096/1537] use our own serverHost call so that ownCloud works
 with reverse proxy servers

---
 apps/files_sharing/ajax/email.php | 4 ++--
 apps/user_openid/phpmyid.php      | 2 +-
 apps/user_openid/user_openid.php  | 4 ++--
 core/lostpassword/index.php       | 2 +-
 lib/ocs.php                       | 4 ++--
 ocs/providers.php                 | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 163683cd0e..523c3d2078 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -7,7 +7,7 @@ $type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
 $subject = $user.' shared a '.$type.' with you';
 $link = $_POST['link'];
 $text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
-$fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.$_SERVER['HTTP_HOST']);
+$fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
 OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
 
-?>
\ No newline at end of file
+?>
diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php
index 137daa485a..5aaab64285 100644
--- a/apps/user_openid/phpmyid.php
+++ b/apps/user_openid/phpmyid.php
@@ -1624,7 +1624,7 @@ if (! array_key_exists('idp_url', $profile))
 //Determine the requested URL - DO NOT OVERRIDE
 $profile['req_url'] = sprintf("%s://%s%s",
 		      $proto,
-		      $_SERVER['HTTP_HOST'],
+		      OCP\Util::getServerHost(),
 // 		      $port,//host  already includes the path
 		      $_SERVER["REQUEST_URI"]);
 
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index 8deb42f68c..3267db3fa0 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -39,9 +39,9 @@ class OC_USER_OPENID extends OC_User_Backend {
 		// Get identity from user and redirect browser to OpenID Server
 		$openid = new SimpleOpenID;
 		$openid->SetIdentity($uid);
-		$openid->SetTrustRoot('http://' . $_SERVER["HTTP_HOST"]);
+		$openid->SetTrustRoot('http://' . OCP\Util::getServerHost());
 		if ($openid->GetOpenIDServer()){
-			$openid->SetApprovedURL('http://' . $_SERVER["HTTP_HOST"] . OC::$WEBROOT);      // Send Response from OpenID server to this script
+			$openid->SetApprovedURL('http://' . OCP\Util::getServerHost() . OC::$WEBROOT);      // Send Response from OpenID server to this script
 			$openid->Redirect();     // This will redirect user to OpenID Server
 			exit;
 		}else{
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 6a4748588f..f1d90eaeff 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -22,7 +22,7 @@ if (isset($_POST['user'])) {
 			$tmpl->assign('link', $link);
 			$msg = $tmpl->fetchPage();
 			$l = OC_L10N::get('core');
-			$from = 'lostpassword-noreply@' . $_SERVER['HTTP_HOST'];
+			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
 			$r=mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from);
 			OC_MAIL::send($email,$_POST['user'],$l->t('ownCloud password reset'),$msg,$from,'ownCloud');
 			echo('sent');
diff --git a/lib/ocs.php b/lib/ocs.php
index e28eb61987..1be41202d7 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -357,11 +357,11 @@ class OC_OCS {
    */
   private static function apiConfig($format) {
     $user=OC_OCS::checkpassword(false);
-    $url=substr($_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'],0,-11).'';
+    $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
 
     $xml['version']='1.5';
     $xml['website']='ownCloud';
-    $xml['host']=$_SERVER['HTTP_HOST'];
+    $xml['host']=OCP\Util::getServerHost();
     $xml['contact']='';
     $xml['ssl']='false';
     echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1));
diff --git a/ocs/providers.php b/ocs/providers.php
index 397d2f06f5..adaa28db6c 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -23,7 +23,7 @@
 
 require_once('../lib/base.php');
 
-$url='http://'.substr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],0,-17).'ocs/v1.php/';
+$url='http://'.substr(OCP\Util::getServerHost().$_SERVER['REQUEST_URI'],0,-17).'ocs/v1.php/';
 
 echo('
 <providers>

From 57a56299d8a216cad170e0510167d0d7777f1f8a Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:10:03 +0200
Subject: [PATCH 0097/1537] =?UTF-8?q?more=20fixes=20i=20don=C2=B4t=20under?=
 =?UTF-8?q?stand=20why=20this=20worked=20before.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/files_versions/versions.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 8a88808f54..ed4fd97e51 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -96,14 +96,14 @@ class Storage {
 			}
 			
 			// check filesize
-			if(filesize($filesfoldername.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
+			if(filesize($filesfoldername.'/'.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
 				return false;
 			}
 
 
 			// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
 			if ($uid == \OCP\User::getUser()) {
-				$matches=glob($versionsfoldername.$filename.'.v*');
+				$matches=glob($versionsfoldername.'/'.$filename.'.v*');
 				sort($matches);
 				$parts=explode('.v',end($matches));
 				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
@@ -114,10 +114,10 @@ class Storage {
 
 			// create all parent folders
 			$info=pathinfo($filename);	
-			@mkdir($versionsfoldername.$info['dirname'],0700,true);	
+			if(!file_exists($versionsfoldername.'/'.$info['dirname'])) mkdir($versionsfoldername.'/'.$info['dirname'],0700,true);	
 
 			// store a new version of a file
-			copy($filesfoldername.$filename,$versionsfoldername.$filename.'.v'.time());
+			copy($filesfoldername.'/'.$filename,$versionsfoldername.'/'.$filename.'.v'.time());
         
 			// expire old revisions
 			Storage::expire($filename);
@@ -143,7 +143,7 @@ class Storage {
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
 			
 			// rollback
-			if ( @copy($versionsfoldername.$filename.'.v'.$revision,$filesfoldername.$filename) ) {
+			if ( @copy($versionsfoldername.'/'.$filename.'.v'.$revision,$filesfoldername.$filename) ) {
 			
 				return true;
 				
@@ -172,7 +172,7 @@ class Storage {
 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
 			// check for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
+			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
 			if(count($matches)>1){
 				return true;
 			}else{
@@ -201,7 +201,7 @@ class Storage {
 			$versions=array();         
  
 	              // fetch for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
+			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
 			sort($matches);
 			foreach($matches as $ma) {
 				$parts=explode('.v',$ma);
@@ -238,14 +238,14 @@ class Storage {
 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
 			// check for old versions
-			$matches=glob($versionsfoldername.$filename.'.v*');
+			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
 			if(count($matches)>\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS)){
 				$numbertodelete=count($matches-\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS));
 
 				// delete old versions of a file
 				$deleteitems=array_slice($matches,0,$numbertodelete);
 				foreach($deleteitems as $de){
-					unlink($versionsfoldername.$filename.'.v'.$de);
+					unlink($versionsfoldername.'/'.$filename.'.v'.$de);
 				}
 			}
                 }

From 5f4132d6badc660267d41098e673e30f62f8028e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:16:36 +0200
Subject: [PATCH 0098/1537] more fixes

---
 apps/files_versions/versions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index ed4fd97e51..f39b5a7f4e 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -81,7 +81,7 @@ class Storage {
 			Storage::init();
 
 			// check if filename is a directory
-			if(is_dir($filesfoldername.$filename)){
+			if(is_dir($filesfoldername.'/'.$filename)){
 				return false;
 			}
 
@@ -143,7 +143,7 @@ class Storage {
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
 			
 			// rollback
-			if ( @copy($versionsfoldername.'/'.$filename.'.v'.$revision,$filesfoldername.$filename) ) {
+			if ( @copy($versionsfoldername.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
 			
 				return true;
 				

From a72e6cc113656aa343c2bc738fba9e617a262d80 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:28:58 +0200
Subject: [PATCH 0099/1537] fix oc-780

---
 config/config.sample.php | 2 +-
 lib/mail.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index e46c3cacd7..e86dc05cb0 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -22,7 +22,7 @@ $CONFIG = array(
 "appstoreurl" => "",
 "mail_smtpmode" => "sendmail",
 "mail_smtphost" => "127.0.0.1",
-"mail_smtpauth" => "false",
+"mail_smtpauth" => false,
 "mail_smtpname" => "",
 "mail_smtppassword" => "",
 "appcodechecker" => "",
diff --git a/lib/mail.php b/lib/mail.php
index 0045f8de6d..b46f73bd94 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -31,7 +31,7 @@ class OC_Mail {
 
 		$SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' );
 		$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
-		$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', 'false' ); 
+		$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false ); 
 		$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' ); 
 		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );  
 

From baae4c741ded1c702369c1a513b08324a63985f5 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:44:05 +0200
Subject: [PATCH 0100/1537] fix the breadcrumb

---
 apps/files/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index a2fae12d94..60a3836cb5 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -74,11 +74,11 @@ foreach( explode( '/', $dir ) as $i ){
 // make breadcrumb und filelist markup
 $list = new OCP\Template( 'files', 'part.list', '' );
 $list->assign( 'files', $files );
-$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=');
+$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
 $list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
 $breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
 $breadcrumbNav->assign( 'breadcrumb', $breadcrumb );
-$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=');
+$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));

From 24d14783d7b4706a3ad374a2229271f8f422e9cd Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 10:38:44 +0200
Subject: [PATCH 0101/1537] added a serverProtocol function that correctly
 returns the used protocol even if the ssl connection is terminated at a
 reverse_proxy or at a load balancer

---
 lib/base.php        | 10 +++++-----
 lib/helper.php      | 25 ++++++++++++++++++++++---
 lib/public/util.php | 10 ++++++++++
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index fdb682bf50..cb98a6c9e0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -214,8 +214,8 @@ class OC{
 		// redirect to https site if configured
 		if( OC_Config::getValue( "forcessl", false )){
 			ini_set("session.cookie_secure", "on");
-			if(!isset($_SERVER['HTTPS']) or $_SERVER['HTTPS'] != 'on') {
-				$url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+			if(OC_Helper::serverProtocol()<>'https') {
+				$url = "https://". OC_Helper::serverHost() . $_SERVER['REQUEST_URI'];
 				header("Location: $url");
 				exit();
 			}
@@ -376,11 +376,11 @@ class OC{
 
 		// CSRF protection
 		if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
-		if(isset($_SERVER['HTTPS']) and $_SERVER['HTTPS']<>'') $protocol='https://'; else $protocol='http://';
+		$protocol=OC_Helper::serverProtocol().'://'; 
 		if(!self::$CLI){
-			$server=$protocol.$_SERVER['SERVER_NAME'];
+			$server=$protocol.OC_Helper::serverHost();
 			if(($_SERVER['REQUEST_METHOD']=='POST') and (substr($referer,0,strlen($server))<>$server)) {
-				$url = $protocol.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+				$url = $protocol.OC_Helper::serverProtocol().OC::$WEBROOT.'/index.php';
 				header("Location: $url");
 				exit();
 			}
diff --git a/lib/helper.php b/lib/helper.php
index 537465b15a..f8f84b91ae 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -89,6 +89,27 @@ class OC_Helper {
 		return $host;
 	}
 
+
+        /**
+         * @brief Returns the server protocol
+         * @returns the server protocol
+         *
+         * Returns the server protocol. It respects reverse proxy servers and load balancers
+         */
+	public static function serverProtocol() {
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+			$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
+		}else{
+			if(isset($_SERVER['HTTPS']) and !empty($_SERVER['HTTPS']) and ($_SERVER['HTTPS']!='off')) {
+				$proto = 'https';
+			}else{
+				$proto = 'http';
+			}
+		}
+		return($proto);
+	}
+
+
 	/**
 	 * @brief Creates an absolute url
 	 * @param $app app
@@ -99,9 +120,7 @@ class OC_Helper {
 	 */
 	public static function linkToAbsolute( $app, $file ) {
 		$urlLinkTo = self::linkTo( $app, $file );
-		// Checking if the request was made through HTTPS. The last in line is for IIS
-		$protocol = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
-		$urlLinkTo = ($protocol?'https':'http') . '://'  . self::serverHost() . $urlLinkTo;
+		$urlLinkTo = OC_Helper::serverProtocol(). '://'  . self::serverHost() . $urlLinkTo;
 		return $urlLinkTo;
 	}
 
diff --git a/lib/public/util.php b/lib/public/util.php
index 39a185d02a..9b499574da 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -168,6 +168,16 @@ class Util {
 		return(\OC_Helper::serverHost());
 	}
 
+	/**
+	 * @brief Returns the server protocol
+	 * @returns the server protocol
+	 *
+	 * Returns the server protocol. It respects reverse proxy servers and load balancers
+	 */
+	public static function getServerProtocol() {
+		return(\OC_Helper::serverProtocol());
+	}
+
 	/**
 	 * @brief Creates path to an image
 	 * @param $app app

From 83c6714c723a1e224f2477192ca88bd6144b76e7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 11:12:50 +0200
Subject: [PATCH 0102/1537] =?UTF-8?q?don=C2=B4t=20start=20a=20session=20he?=
 =?UTF-8?q?re.=20I=20don=C2=B4t=20think=20it=C2=B4s=20needed.=20Let=C2=B4s?=
 =?UTF-8?q?=20see=20if=20it=20breaks=20something?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/files/ajax/timezone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php
index 8e1d2aa1ec..cafb5074ec 100644
--- a/apps/files/ajax/timezone.php
+++ b/apps/files/ajax/timezone.php
@@ -1,6 +1,6 @@
 <?php
 	// FIXME: this should start a secure session if forcessl is enabled
 	// see lib/base.php for an example
-	session_start();
+	//session_start();
 	$_SESSION['timezone'] = $_GET['time'];
 ?>

From 7a8e3226793aebdbd4bcf12ef6c7d020c8cd378d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 1 Jun 2012 11:30:54 +0200
Subject: [PATCH 0103/1537] some work for repeating events caching

---
 apps/calendar/lib/repeat.php | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 38d290ef5e..89cafa388c 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -54,29 +54,49 @@ class OC_Calendar_Repeat{
 	/*
 	 * @brief generates the cache the first time
 	 */
-	public static function generate();
+	public static function generate($id){
+
+	}
 	/*
 	 * @brief generates the cache the first time for all repeating event of an calendar
 	 */
-	public static function generatecalendar();
+	public static function generatecalendar($id){
+
+	}
 	/*
 	 * @brief updates an event that is already cached
 	 */
-	public static function update();
+	public static function update($id){
+
+	}
 	/*
 	 * @brief updates all repating events of a calendar that are already cached
 	 */
-	public static function updatecalendar();
+	public static function updatecalendar($id){
+
+	}
 	/*
 	 * @brief checks if an event is already cached
 	 */
-	public static function is_cached();
+	public static function is_cached($id){
+
+	}
+	/*
+	 * @brief checks if a whole calendar is already cached
+	 */
+	public static function is_calendar_cached($id){
+
+	}
 	/*
 	 * @brief removes the cache of an event
 	 */
-	public static function clean();
+	public static function clean($id){
+
+	}
 	/*
 	 * @brief removes the cache of all events of a calendar
 	 */
-	public static function cleancalendar();
+	public static function cleancalendar($id){
+		
+	}
 }
\ No newline at end of file

From a2b41a140ea7e29c27261b264dd39c21170f3fa7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 11:46:18 +0200
Subject: [PATCH 0104/1537] correctly detect https

---
 apps/user_openid/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php
index 731a2c57e9..b2bbe5a46a 100644
--- a/apps/user_openid/templates/settings.php
+++ b/apps/user_openid/templates/settings.php
@@ -1,7 +1,7 @@
 <form id="openidform">
 	<fieldset class="personalblock">
 		<strong>OpenID</strong>
-		<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.OCP\Util::getServerHost().OC::$WEBROOT.'/?'; echo OCP\USER::getUser(); ?><br /><em><?php echo $l->t('you can authenticate to other sites with this address');?></em><br />
+		<?php echo (OCP\Util::getServerProtocol()).'://'.OCP\Util::getServerHost().OC::$WEBROOT.'/?'; echo OCP\USER::getUser(); ?><br /><em><?php echo $l->t('you can authenticate to other sites with this address');?></em><br />
 		<label for="identity"><?php echo $l->t('Authorized OpenID provider');?></label>
 		<input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="<?php echo $l->t('Your address at Wordpress, Identi.ca, &hellip;');?>" /><span class="msg"></span>
 	</fieldset>

From 93295994dc951e02405930dfbe8eca18bb4d9b07 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 12:15:03 +0200
Subject: [PATCH 0105/1537] fix oc-769

---
 lib/vcategories.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vcategories.php b/lib/vcategories.php
index d6351e2858..ddcec1b6a4 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -136,7 +136,7 @@ class OC_VCategories {
 			if(!is_null($vobject)) {
 				$this->loadFromVObject($vobject, $sync);
 			} else {
-				OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG);
+				OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);
 			}
 		}
 		$this->save();

From 75d56f24f23efbafb9cc5c8f779ba020e0bb3c51 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 12:41:38 +0200
Subject: [PATCH 0106/1537] =?UTF-8?q?try=20to=20switch=20magic=20quotes=20?=
 =?UTF-8?q?off.=20it=C2=B4s=20evil=20and=20deprecated?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/base.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index cb98a6c9e0..e6fcb9ec4d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -329,6 +329,11 @@ class OC{
 		date_default_timezone_set('UTC');
 		ini_set('arg_separator.output','&amp;');
 
+		// try to switch magic quotes off.
+		if(function_exists('set_magic_quotes_runtime')) {
+			@set_magic_quotes_runtime(false);
+		}
+
 		//try to configure php to enable big file uploads.
 		//this doesn´t work always depending on the webserver and php configuration.
 		//Let´s try to overwrite some defaults anyways

From 46b3b30d46c39ca5ce7e18035f228c88f170ab43 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 1 Jun 2012 13:47:48 +0200
Subject: [PATCH 0107/1537] add status file for repeating events caching

---
 apps/calendar/ajax/cache/status.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/calendar/ajax/cache/status.php

diff --git a/apps/calendar/ajax/cache/status.php b/apps/calendar/ajax/cache/status.php
new file mode 100644
index 0000000000..e69de29bb2

From a4f177d75d28649af21bc33975259e6d19cae634 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 1 Jun 2012 13:49:11 +0200
Subject: [PATCH 0108/1537] LDAP group backend: If a group filter is not
 configured, do not do anything. Fixes oc-867

---
 apps/user_ldap/group_ldap.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index b3ff6c5388..2c16bf312f 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -25,10 +25,15 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 // 	//group specific settings
 	protected $ldapGroupFilter;
 	protected $ldapGroupMemberAssocAttr;
+	protected $configured = false;
 
 	public function __construct() {
 		$this->ldapGroupFilter          = OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
 		$this->ldapGroupMemberAssocAttr = OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
+
+		if(empty($this->ldapGroupFilter) || empty($this->ldapGroupMemberAssocAttr)) {
+			$this->configured = false;
+		}
 	}
 
 	/**
@@ -40,6 +45,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 	 * Checks whether the user is member of a group or not.
 	 */
 	public function inGroup($uid, $gid) {
+		if(!$this->configured) {
+			return false;
+		}
 		$dn_user = OC_LDAP::username2dn($uid);
 		$dn_group = OC_LDAP::groupname2dn($gid);
 		// just in case
@@ -79,6 +87,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 	 * if the user exists at all.
 	 */
 	public function getUserGroups($uid) {
+		if(!$this->configured) {
+			return array();
+		}
 		$userDN = OC_LDAP::username2dn($uid);
 		if(!$userDN) {
 			return array();
@@ -111,6 +122,10 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 	 * @returns array with user ids
 	 */
 	public function usersInGroup($gid) {
+		if(!$this->configured) {
+			return array();
+		}
+
 		$groupDN = OC_LDAP::groupname2dn($gid);
 		if(!$groupDN) {
 			return array();
@@ -149,6 +164,10 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 	 * Returns a list with all groups
 	 */
 	public function getGroups() {
+		if(!$this->configured) {
+			return array();
+		}
+
 		$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
 		$groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
 		return $groups;

From ad6562d14fabb0822e197e2ed70e4a3f8c02e23f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 14:18:14 +0200
Subject: [PATCH 0109/1537] sort users and groups.  fixes oc-779

---
 lib/group.php | 2 ++
 lib/user.php  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lib/group.php b/lib/group.php
index a78eb51fff..7967e1a581 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -233,6 +233,7 @@ class OC_Group {
 
 			$groups=array_merge($backend->getUserGroups($uid),$groups);
 		}
+		asort($groups);
 		return $groups;
 	}
 
@@ -250,6 +251,7 @@ class OC_Group {
 
 			$groups=array_merge($backend->getGroups(),$groups);
 		}
+		asort($groups);
 		return $groups;
 	}
 	
diff --git a/lib/user.php b/lib/user.php
index ee2a80b159..d7e9bf1a64 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -336,6 +336,7 @@ class OC_User {
 				}
 			}
 		}
+		asort($users);
 		return $users;
 	}
 

From e58efd78777d3f1955aabcc4ff35c44595f3489d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 1 Jun 2012 16:02:04 +0200
Subject: [PATCH 0110/1537] LDAP group backend: Set configured true when it
 is... fixe oc-887

---
 apps/user_ldap/group_ldap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 2c16bf312f..baca1d32ba 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -31,8 +31,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		$this->ldapGroupFilter          = OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
 		$this->ldapGroupMemberAssocAttr = OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
 
-		if(empty($this->ldapGroupFilter) || empty($this->ldapGroupMemberAssocAttr)) {
-			$this->configured = false;
+		if(!empty($this->ldapGroupFilter) && !empty($this->ldapGroupMemberAssocAttr)) {
+			$this->configured = true;
 		}
 	}
 

From dcb06393a86eee01e64df4c9092efcf3b0af2d8d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 16:30:47 +0200
Subject: [PATCH 0111/1537] fix propper error reporting

---
 lib/setup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/setup.php b/lib/setup.php
index 8c2d523121..a096fdbb4c 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -94,6 +94,7 @@ class OC_Setup {
 						'error' => 'MySQL username and/or password not valid',
 						'hint' => 'You need to enter either an existing account or the administrator.'
 					);
+					return($error);
 				}
 				else {
 					$oldUser=OC_Config::getValue('dbuser', false);

From e6b0eb3423ff0346fce64aadc1b33d481be7761f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 16:48:42 +0200
Subject: [PATCH 0112/1537] prevend a division by zero problem

---
 settings/personal.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/personal.php b/settings/personal.php
index 41499657ac..64e08be89e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -20,6 +20,7 @@ $rootInfo=OC_FileCache::get('');
 $used=$rootInfo['size'];
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
+if($total==0) $total=1;  // prevent division by zero
 $relative=round(($used/$total)*10000)/100;
 
 $email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');

From 7203f6951efbb56fcd300900e541c198cd994667 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Fri, 1 Jun 2012 16:34:09 +0100
Subject: [PATCH 0113/1537] Extended class comment

---
 lib/user.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index d7e9bf1a64..be349aeb05 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -21,7 +21,9 @@
  */
 
 /**
- * This class provides all methods for user management.
+ * This class provides wrapper methods for user management. Multiple backends are 
+ * supported. User management operations are delegated to the configured backend for
+ * execution.
  *
  * Hooks provided:
  *   pre_createUser(&run, uid, password)

From 4b4d13165a1698a19ad6726d634b8880e1405fea Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Fri, 1 Jun 2012 16:46:18 +0100
Subject: [PATCH 0114/1537] Minor change to comment

---
 lib/user/backend.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/user/backend.php b/lib/user/backend.php
index 3df907226c..c31d4b5785 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -40,8 +40,10 @@ define('OC_USER_BACKEND_USER_EXISTS',       0x100000);
 
 
 /**
- * abstract base class for user management
- * subclass this for your own backends and see OC_User_Example for descriptions
+ * Abstract base class for user management. Provides methods for querying backend
+ * capabilities.
+ *
+ * Subclass this for your own backends, and see OC_User_Example for descriptions
  */
 abstract class OC_User_Backend {
 

From 07e1e3a9454df55d27e3c52e6345a6a3aee1344a Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 19:54:07 +0200
Subject: [PATCH 0115/1537] check if apps folder is writable

---
 lib/util.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/util.php b/lib/util.php
index be7fc00da8..628c23f4cb 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -28,6 +28,14 @@ class OC_Util {
 			exit;
 		}
 		
+		// Check if apps folder is writable.
+		if(!is_writable(OC::$SERVERROOT."/apps/")) {
+			$tmpl = new OC_Template( '', 'error', 'guest' );
+			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+			$tmpl->printPage();
+			exit;
+		}
+		
 		// Create root dir.
 		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
 			$success=@mkdir($CONFIG_DATADIRECTORY_ROOT);

From 410b556a8651695dd15e742e0501d4da341ef594 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Fri, 1 Jun 2012 18:59:57 +0100
Subject: [PATCH 0116/1537] Added class comment block

---
 tests/lib/user/backend.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index 5dab5afb18..984249e84e 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -20,6 +20,16 @@
 *
 */
 
+/**
+ * Abstract class to provide the basis of backend-specific unit test classes.
+ *
+ * All subclasses MUST assign a backend property in setUp() which implements 
+ * user operations (add, remove, etc.). Test methods in this class will then be
+ * run on each separate subclass and backend therein.
+ * 
+ * For an example see /tests/lib/user/dummy.php
+ */
+
 abstract class Test_User_Backend extends UnitTestCase {
 	/**
 	 * @var OC_User_Backend $backend

From 4aa96de53784e2765943df9fb6d7a2b87c87036f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 20:00:33 +0200
Subject: [PATCH 0117/1537] add a check for pdo

---
 lib/util.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/util.php b/lib/util.php
index 628c23f4cb..fda60587b8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -264,6 +264,9 @@ class OC_Util {
 		if(floatval(phpversion())<5.3){
 			$errors[]=array('error'=>'PHP 5.3 is required.<br/>','hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.');
 		}
+		if(!defined('PDO::ATTR_DRIVER_NAME')){
+			$errors[]=array('error'=>'PHP PDO module is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+		}
 
 		return $errors;
 	}

From 66f1957e3b82400a04bbd20c5b5ce3ae9d4334c8 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 1 Jun 2012 14:38:25 -0400
Subject: [PATCH 0118/1537] Improve efficiency of retrieving log file entries

---
 lib/log/owncloud.php | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 0b7a231d30..5913d8b5b8 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -62,23 +62,26 @@ class OC_Log_Owncloud {
 	public static function getEntries($limit=50, $offset=0){
 		self::init();
 		$minLevel=OC_Config::getValue( "loglevel", OC_Log::WARN );
-		$entries=array();
-		if(!file_exists(self::$logFile)) {
-			return array();
-		}
-		$contents=file(self::$logFile);
-		if(!$contents) {//error while reading log
-			return array();
-		}
-		$end=max(count($contents)-$offset-1, 0);
-		$start=max($end-$limit,0);
-		$i=$end;
-		while($i>$start){
-			$entry=json_decode($contents[$i]);
-			if($entry->level>=$minLevel){
-				$entries[]=$entry;
+		$entries = array();
+		$handle = fopen(self::$logFile, 'r');
+		if ($handle) {
+			// Just a guess to set the file pointer to the right spot
+			$maxLineLength = 150;
+			fseek($handle, -($limit * $maxLineLength + $offset * $maxLineLength), SEEK_END);
+			// Skip first line, because it is most likely a partial line
+			fgets($handle);
+			while (!feof($handle)) {
+				$line = fgets($handle);
+				if (!empty($line)) {
+					$entry = json_decode($line);
+					if ($entry->level >= $minLevel) {
+						$entries[] = $entry;
+					}
+				}
 			}
-			$i--;
+			fclose($handle);
+			// Extract the needed entries and reverse the order
+			$entries = array_reverse(array_slice($entries, -($limit + $offset), $limit));
 		}
 		return $entries;
 	}

From cc84bd2993b4f5049076dc4d12d6dada9d1a4f85 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 1 Jun 2012 15:15:05 -0400
Subject: [PATCH 0119/1537] Fix typo in log message

---
 lib/filecache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index a94349e19c..a29e29928a 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -419,7 +419,7 @@ class OC_FileCache{
 			}
 			return $result;
 		}else{
-			OC_Log::write('files','getChached(): file not found in cache ('.$path.')',OC_Log::DEBUG);
+			OC_Log::write('files','getCached(): file not found in cache ('.$path.')',OC_Log::DEBUG);
 			if(isset(self::$savedData[$path])){
 				return self::$savedData[$path];
 			}else{

From 993ebc4c902965e4612207fef9e5b04fe0838a59 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 2 Jun 2012 20:06:52 -0400
Subject: [PATCH 0120/1537] Verify user exists when checking if logged in, fix
 for bug oc-863

---
 lib/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index be349aeb05..17c11322b8 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -242,7 +242,7 @@ class OC_User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn(){
-		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ){
+		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] AND self::userExists($_SESSION['user_id']) ){
 			return true;
 		}
 		else{

From e90cbcaf5b5f2f1d39947d16dc3927550874f4d9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 3 Jun 2012 02:50:34 +0200
Subject: [PATCH 0121/1537] http user backend

---
 lib/user/http.php | 93 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 lib/user/http.php

diff --git a/lib/user/http.php b/lib/user/http.php
new file mode 100644
index 0000000000..009aa30c6f
--- /dev/null
+++ b/lib/user/http.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @copyright 2012 Robin Appelman icewind@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/>.
+*
+*/
+
+/**
+ * user backend using http auth requests
+ */
+class OC_User_HTTP extends OC_User_Backend {
+	/**
+	 * split http://user@host/path into a user and url part
+	 * @param string path
+	 * @return array
+	 */
+	private function parseUrl($url){
+		$parts=parse_url($url);
+		$url=$parts['scheme'].'://'.$parts['host'];
+		if(isset($parts['port'])){
+			$url.=':'.$parts['port'];
+		}
+		$url.=$parts['path'];
+		if(isset($parts['query'])){
+			$url.='?'.$parts['query'];
+		}
+		return array($parts['user'],$url);
+		
+	}
+	
+	/**
+	 * check if an url is a valid login
+	 * @param string url
+	 * @return boolean
+	 */
+	private function matchUrl($url){
+		return ! is_null(parse_url($url,PHP_URL_USER));
+	}
+	
+	/**
+	 * @brief Check if the password is correct
+	 * @param $uid The username
+	 * @param $password The password
+	 * @returns string
+	 *
+	 * Check if the password is correct without logging in the user
+	 * returns the user id or false
+	 */
+	public function checkPassword($uid, $password){
+		if(!$this->matchUrl($uid)){
+			return false;
+		}
+		list($user,$url)=$this->parseUrl($uid);
+		
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_USERPWD, $user.':'.$password);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+		curl_exec($ch);
+
+		$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		
+		curl_close($ch);
+
+		return $status==200;
+	}
+
+	/**
+	 * @brief check if a user exists
+	 * @param string $uid the username
+	 * @return boolean
+	 */
+	public function userExists($uid){
+		return $this->matchUrl($uid);
+	}
+}
\ No newline at end of file

From c2a51d1f48acca035abc46b6607dac27dac757d3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 3 Jun 2012 14:54:53 +0200
Subject: [PATCH 0122/1537] proper export for calendar app - doesn't work with
 apple ical yet - even though a ics validator says it's valid

---
 apps/calendar/appinfo/app.php |  3 +-
 apps/calendar/export.php      | 17 +++--------
 apps/calendar/lib/export.php  | 56 +++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 apps/calendar/lib/export.php

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 886c218f7c..48192be6e7 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -7,6 +7,7 @@ OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
 OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
+OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
@@ -18,4 +19,4 @@ OCP\App::addNavigationEntry( array(
   'icon' => OCP\Util::imagePath( 'calendar', 'icon.svg' ),
   'name' => $l->t('Calendar')));
 OCP\App::registerPersonal('calendar', 'settings');
-OC_Search::registerProvider('OC_Search_Provider_Calendar');
+OC_Search::registerProvider('OC_Search_Provider_Calendar');
\ No newline at end of file
diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 5780d191a5..5ed7092cbf 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -5,35 +5,26 @@
  * later.
  * See the COPYING-README file.
  */
-
- 
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
 $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
-$nl = "\r\n";
 if(isset($cal)){
 	$calendar = OC_Calendar_App::getCalendar($cal, true);
 	if(!$calendar){
 		header('HTTP/1.0 404 Not Found');
 		exit;
 	}
-	$calobjects = OC_Calendar_Object::all($cal);
 	header('Content-Type: text/Calendar');
 	header('Content-Disposition: inline; filename=' . $calendar['displayname'] . '.ics'); 
-	foreach($calobjects as $calobject){
-		echo $calobject['calendardata'] . $nl;
-	}
+	echo OC_Calendar_Export::export($cal, OC_Calendar_Export::CALENDAR);
 }elseif(isset($event)){
 	$data = OC_Calendar_App::getEventObject($_GET['eventid'], true);
 	if(!$data){
 		header('HTTP/1.0 404 Not Found');
 		exit;
 	}
-	$calendarid = $data['calendarid'];
-	$calendar = OC_Calendar_App::getCalendar($calendarid);
 	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . $data['summary'] . '.ics'); 
-	echo $data['calendardata'];
-}
-?>
+	header('Content-Disposition: inline; filename=' . $data['summary'] . '.ics');
+	echo OC_Calendar_Export::export($event, OC_Calendar_Export::EVENT);
+}
\ No newline at end of file
diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
new file mode 100644
index 0000000000..552515461b
--- /dev/null
+++ b/apps/calendar/lib/export.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+/*
+ * This class does export
+ */
+class OC_Calendar_Export{
+	const CALENDAR = 'calendar';
+	const EVENT = 'event';
+
+	/*
+	 * @brief export a calendar or an event
+	 * @param (int) $id - id of calendar / event
+	 * @param (const) $type - use OC_Calendar_Export constants
+	 * @return (string)
+	 */
+	public static function export($id, $type){
+		if($type == self::EVENT){
+			$data = OC_Calendar_App::getEventObject($_GET['eventid'], false);
+			$return = $data['calendardata'];
+		}else{
+			$return = self::calendar($id);
+		}
+		return $return;
+	}
+
+	/*
+	 * @brief export a calendar and convert all times to UTC
+	 * @param (int) $id - id of the calendar
+	 * @return (string)
+	 */
+	private static function calendar($id){
+		$events = OC_Calendar_Object::all($id);
+		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar\n";
+		foreach($events as $event){
+			$object = OC_VObject::parse($event['calendardata']);
+			$dtstart = $object->VEVENT->DTSTART;
+			$start_dt = $dtstart->getDateTime();
+			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object->VEVENT);
+			$end_dt = $dtend->getDateTime();
+			if($dtstart->getDateType() !== Sabre_VObject_Element_DateTime::DATE){
+				$start_dt->setTimezone(new DateTimeZone('UTC'));
+				$end_dt->setTimezone(new DateTimeZone('UTC'));
+				$object->VEVENT->setDateTime('DTSTART', $start_dt, Sabre_VObject_Property_DateTime::UTC);
+				$object->VEVENT->setDateTime('DTEND', $end_dt, Sabre_VObject_Property_DateTime::UTC);
+			}
+			$return .= $object->VEVENT->serialize();
+		}
+		$return .= "END:VCALENDAR";
+		return $return;
+	}
+}
\ No newline at end of file

From f3c1d1eded96e948b2ddc608de48778b62232231 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 3 Jun 2012 23:48:59 +0200
Subject: [PATCH 0123/1537] link to apps.owncloud.com thanks to guillaume for
 the patch

---
 settings/js/apps.js         | 6 +++++-
 settings/templates/apps.php | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index f6e08b608b..5ac7d80b94 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
 	});
 	$('#leftcontent li').click(function(){
 		var app=$(this).data('app');
-		$('#rightcontent p').show();
+		$('#rightcontent p.license').show();
 		$('#rightcontent span.name').text(app.name);
 		$('#rightcontent small.externalapp').text(app.internallabel);
 		$('#rightcontent span.version').text(app.version);
@@ -31,6 +31,10 @@ $(document).ready(function(){
 		$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
 		$('#rightcontent input.enable').data('appid',app.id);
 		$('#rightcontent input.enable').data('active',app.active);
+		if ( app.internal == false ) {
+			$('#rightcontent p.appslink').show();
+			$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
+		}
 		return false;
 	});
 	$('#rightcontent input.enable').click(function(){
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 7642ab7fb8..c620f796e0 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -22,6 +22,7 @@
 	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<p class="description"></p>
 	<img src="" class="preview" />
-	<p class="hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
+	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
+	<p class="license hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
 	<input class="enable hidden" type="submit" />
 </div>

From 2d80c148ba8c1e83508a4c9e7318fa388740c9ff Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 10:42:09 +0200
Subject: [PATCH 0124/1537] Don't allow user to delete, rename and re-share the
 "Shared" directory

---
 apps/files/js/fileactions.js | 6 ++++--
 apps/files/js/files.js       | 2 +-
 lib/files.php                | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 19978b61a7..0c672cd670 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -51,7 +51,7 @@ FileActions={
 		var actions=this.get(mime,type);
 		return actions[name];
 	},
-	display:function(parent){
+	display:function(parent, filename, type){
 		FileActions.currentFile=parent;
 		$('#fileList span.fileactions, #fileList td.date a.action').remove();
 		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
@@ -62,6 +62,8 @@ FileActions={
 		parent.children('a.name').append('<span class="fileactions" />');
 		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
 		for(name in actions){
+			// no rename and share action for the 'Shared' dir
+			if((name=='Rename' || name =='Share') && type=='dir' && filename=='Shared') { continue; }
 			if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
 				var img=FileActions.icons[name];
 				if(img.call){
@@ -84,7 +86,7 @@ FileActions={
 				parent.find('a.name>span.fileactions').append(element);
 			}
 		}
-		if(actions['Delete']){
+		if(actions['Delete'] && (type!='dir' || filename != 'Shared')){ // no delete action for the 'Shared' dir
 			var img=FileActions.icons['Delete'];
 			if(img.call){
 				img=img(file);
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7d9c53eaa8..7cd0f388a3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -56,7 +56,7 @@ $(document).ready(function() {
 
 	// Sets the file-action buttons behaviour :
 	$('tr').live('mouseenter',function(event) {
-		FileActions.display($(this).children('td.filename'));
+		FileActions.display($(this).children('td.filename'), $(this).attr('data-file'), $(this).attr('data-type'));
 	});
 	$('tr').live('mouseleave',function(event) {
 		FileActions.hide();
diff --git a/lib/files.php b/lib/files.php
index 79d214665d..1e88a7b608 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -224,7 +224,7 @@ class OC_Files {
 	* @param file $name
 	*/
 	public static function delete($dir,$file){
-		if(OC_User::isLoggedIn()){
+		if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) {
 			$file=$dir.'/'.$file;
 			return OC_Filesystem::unlink($file);
 		}

From 4eba41a2a04d119b4d73f62f32daaa2f707cd1d9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 11:04:05 +0200
Subject: [PATCH 0125/1537] no move (rename) operation for "Shared" directory

---
 lib/files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/files.php b/lib/files.php
index 1e88a7b608..885f6977fb 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -170,7 +170,7 @@ class OC_Files {
 	* @param file $target
 	*/
 	public static function move($sourceDir,$source,$targetDir,$target){
-		if(OC_User::isLoggedIn()){
+		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){
 			$targetFile=self::normalizePath($targetDir.'/'.$target);
 			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);

From 6560f1d89472c8261e4044cc337bfd52c455a687 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 4 Jun 2012 12:28:05 +0200
Subject: [PATCH 0126/1537] don't change events timezone and remove the DTSTART
 value tag

---
 apps/calendar/lib/export.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
index 552515461b..63f7b9e6c6 100644
--- a/apps/calendar/lib/export.php
+++ b/apps/calendar/lib/export.php
@@ -43,14 +43,12 @@ class OC_Calendar_Export{
 			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object->VEVENT);
 			$end_dt = $dtend->getDateTime();
 			if($dtstart->getDateType() !== Sabre_VObject_Element_DateTime::DATE){
-				$start_dt->setTimezone(new DateTimeZone('UTC'));
-				$end_dt->setTimezone(new DateTimeZone('UTC'));
-				$object->VEVENT->setDateTime('DTSTART', $start_dt, Sabre_VObject_Property_DateTime::UTC);
-				$object->VEVENT->setDateTime('DTEND', $end_dt, Sabre_VObject_Property_DateTime::UTC);
+				$object->VEVENT->DTSTART->offsetUnset('VALUE');
+				$object->VEVENT->DTEND->offsetUnset('VALUE');
 			}
 			$return .= $object->VEVENT->serialize();
 		}
 		$return .= "END:VCALENDAR";
 		return $return;
 	}
-}
\ No newline at end of file
+}

From 1e6802e5678ed832bcdba8bcc9beb86ecabeecf2 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 4 Jun 2012 12:45:45 +0200
Subject: [PATCH 0127/1537] add deprecated warning

---
 lib/public/app.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/public/app.php b/lib/public/app.php
index 1f84087f07..9e2108818b 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -36,7 +36,8 @@ namespace OCP;
 class App {
 
         /**
-         * @brief makes owncloud aware of this app
+         * @brief Makes owncloud aware of this app
+         * @brief This call is deprecated and not necessary to use.
          * @param $data array with all information
          * @returns true/false
          *

From 59bbf0acee01b64991cbda73270adffe9ff9006b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 13:04:18 +0200
Subject: [PATCH 0128/1537] LDAP: link to documentation on settings page

---
 apps/user_ldap/templates/settings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 34c4f8f9d9..a0e5c15f3a 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,6 +4,7 @@
 		<li><a href="#ldapSettings-1">LDAP Basic</a></li>
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
+	<p style="text-align:right; float:right; margin: 2ex 1em;"><a href="http://owncloud.org/support/ldap-backend/" target="_blank">How to configure the LDAP backend <img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" /></a></p>
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_host"><?php echo $l->t('Host');?><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>"></label> <label for="ldap_base"><?php echo $l->t('Base');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" /></p>
 		<p><label for="ldap_dn"><?php echo $l->t('Name');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" />
@@ -26,7 +27,7 @@
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
 	</fieldset>
-	<input type="submit" value="Save" />
+	<input type="submit" value="Save" /> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>
 
 </form>

From 855f404e5c2ea1cee67b5261b66eed2d7c3514de Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 4 Jun 2012 12:52:04 +0200
Subject: [PATCH 0129/1537] Contacts: Temporary files weren't deleted if crop
 window was closed without saving.

---
 apps/contacts/ajax/cleanupphoto.php | 41 +++++++++++++++++++++++++++++
 apps/contacts/ajax/savecrop.php     |  5 ----
 apps/contacts/js/contacts.js        | 19 ++++++++++++-
 3 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 apps/contacts/ajax/cleanupphoto.php

diff --git a/apps/contacts/ajax/cleanupphoto.php b/apps/contacts/ajax/cleanupphoto.php
new file mode 100644
index 0000000000..6fd2c35156
--- /dev/null
+++ b/apps/contacts/ajax/cleanupphoto.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * 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/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+
+$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
+
+// give some time to save the photo
+sleep(5);
+
+if($tmp_path != '' && file_exists($tmp_path)) {
+	unlink($tmp_path);
+	OCP\JSON::success();
+	exit();
+} else {
+	error_log('Couldn\'t find: '.$tmp_path);
+	OCP\JSON::error();
+}
+?>
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index fe9e5c5b99..e335c76fd9 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -19,12 +19,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  * TODO: Translatable strings.
- *       Remember to delete tmp file at some point.
  */
-// Init owncloud
- 
-OCP\Util::writeLog('contacts','ajax/savecrop.php: Huzzah!!!', OCP\Util::DEBUG);
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d8aa724a22..6159178206 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -134,7 +134,15 @@ Contacts={
 			$('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
 			
 			/* Initialize the photo edit dialog */
-			$('#edit_photo_dialog').dialog({ autoOpen: false, modal: true, height: 'auto', width: 'auto' });
+			$('#edit_photo_dialog').dialog({ 
+				autoOpen: false, 
+				modal: true, 
+				height: 'auto', width: 'auto',
+				beforeClose: function(event, ui) {
+					Contacts.UI.Card.cleanupPhoto(this);
+					return true;
+				}
+			});
 			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
 				{
 					text: "Ok",
@@ -1189,6 +1197,15 @@ Contacts={
 				});
 				Contacts.UI.Contacts.refreshThumbnail(this.id);
 			},
+			cleanupPhoto:function(){
+				var tmp_path = $('#cropform').find('#tmp_path').val();
+				console.log('Trying to remove: ' + tmp_path);
+				$.post(OC.filePath('contacts', 'ajax', 'cleanupphoto.php'), {tmp_path: tmp_path}, function(data){
+					if(data.status != 'success'){
+						console.log('Error deleting ' + tmp_path);
+					}
+				});
+			},
 			addMail:function() {
 				//alert('addMail');
 				$('#emaillist li.template:first-child').clone(true).appendTo($('#emaillist')).show().find('a .tip').tipsy();

From 2842088b755af8aac1b3896a9cff2a53049b44ce Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 4 Jun 2012 12:56:48 +0200
Subject: [PATCH 0130/1537] Contacts: When editing photo on a newly created
 contact the name in the contact list was cleared.

---
 apps/contacts/js/contacts.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6159178206..df3b59c349 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -170,6 +170,7 @@ Contacts={
 				var name = $('#fn').val().strip_tags();
 				var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]');
 				$(item).find('a').html(name);
+				Contacts.UI.Card.fn = name;
 				var added = false;
 				$('#contacts li').each(function(){
 					if ($(this).text().toLowerCase() > name.toLowerCase()) {

From 782d82730a3641599edec8d0b70f96c5f37ee49c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 13:27:55 +0200
Subject: [PATCH 0131/1537] commited a bit too much before

---
 apps/user_ldap/templates/settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index a0e5c15f3a..3462f2473f 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,7 +4,6 @@
 		<li><a href="#ldapSettings-1">LDAP Basic</a></li>
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
-	<p style="text-align:right; float:right; margin: 2ex 1em;"><a href="http://owncloud.org/support/ldap-backend/" target="_blank">How to configure the LDAP backend <img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" /></a></p>
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_host"><?php echo $l->t('Host');?><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>"></label> <label for="ldap_base"><?php echo $l->t('Base');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" /></p>
 		<p><label for="ldap_dn"><?php echo $l->t('Name');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" />

From 3b9bf83fe7833c2cf8d1d9fc2f0f2a41b2a92ebc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 4 Jun 2012 13:38:11 +0200
Subject: [PATCH 0132/1537] Contacts: Make tmp file cleaup a bit safer.

---
 apps/contacts/ajax/cleanupphoto.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/contacts/ajax/cleanupphoto.php b/apps/contacts/ajax/cleanupphoto.php
index 6fd2c35156..2bb4bd6584 100644
--- a/apps/contacts/ajax/cleanupphoto.php
+++ b/apps/contacts/ajax/cleanupphoto.php
@@ -17,9 +17,6 @@
  *
  * 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/>.
- *
- * TODO: Translatable strings.
- *       Remember to delete tmp file at some point.
  */
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
@@ -30,7 +27,7 @@ $tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
 // give some time to save the photo
 sleep(5);
 
-if($tmp_path != '' && file_exists($tmp_path)) {
+if($tmp_path != '' && file_exists($tmp_path) && !is_dir($tmp_path) && dirname($tmp_path)==get_temp_dir()) {
 	unlink($tmp_path);
 	OCP\JSON::success();
 	exit();
@@ -38,4 +35,3 @@ if($tmp_path != '' && file_exists($tmp_path)) {
 	error_log('Couldn\'t find: '.$tmp_path);
 	OCP\JSON::error();
 }
-?>

From 1d6ca084a6f5414ae3bb0753500ad386c86d087c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 16:20:03 +0200
Subject: [PATCH 0133/1537] prevent xss attacks by manipulating text file names

---
 apps/files_texteditor/js/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 9d168c1c4f..70bb74a910 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -67,7 +67,7 @@ function setSyntaxMode(ext){
 function showControls(filename,writeperms){
 	// Loads the control bar at the top.
 	// Load the new toolbar.
-	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename+'</p></div>';
+	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename.replace(/</, "&lt;").replace(/>/, "&gt;")+'</p></div>';
 	if(writeperms=="true"){
 		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
 	}

From f291a843bf1258a71943aca824c281540c636c1c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 16:22:25 +0200
Subject: [PATCH 0134/1537] prevent xss attacks by manipulating image file
 names

---
 apps/files_imageviewer/js/lightbox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index fe8b975309..7a7fb66385 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -25,7 +25,7 @@ function viewImage(dir, file) {
 	var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
 	$.fancybox({
 		"href": location,
-		"title": file,
+		"title": file.replace(/</, "&lt;").replace(/>/, "&gt;"),
 		"titlePosition": "inside"
 	});
 }

From 59086fe08224d772af3a13d8c2f83990acd77ce6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 4 Jun 2012 17:59:21 +0200
Subject: [PATCH 0135/1537] update file paths in filecache when the parent is
 renamed

---
 lib/filecache.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/filecache.php b/lib/filecache.php
index a29e29928a..3fb8e4113c 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -169,6 +169,15 @@ class OC_FileCache{
 		$newParent=self::getParentId($newPath);
 		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET parent=? ,name=?, path=?, path_hash=? WHERE path_hash=?');
 		$query->execute(array($newParent,basename($newPath),$newPath,md5($newPath),md5($oldPath)));
+
+		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE path LIKE ?');
+		$oldLength=strlen($oldPath);
+		$updateQuery=OC_DB::prepare('UPDATE *PREFIX*fscache SET path=?, path_hash=? WHERE path_hash=?');
+		while($row= $query->execute(array($oldPath.'/%'))->fetchRow()){
+			$old=$row['path'];
+			$new=$newPath.substr($old,$oldLength);
+			$updateQuery->execute(array($new,md5($new),md5($old)));
+		}
 	}
 
 	/**

From c6a1d9491bd859e7b97296d9f3b2d4020e89c212 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 18:03:16 +0200
Subject: [PATCH 0136/1537] don't allow user to delete Shared dir via webdav
 and sync client (bug #774)

---
 lib/connector/sabre/directory.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 935d3b0abe..e74d832cb0 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -118,8 +118,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function delete() {
 
-		foreach($this->getChildren() as $child) $child->delete();
-		OC_Filesystem::rmdir($this->path);
+		if ($this->path != "/Shared") {
+			foreach($this->getChildren() as $child) $child->delete();
+			OC_Filesystem::rmdir($this->path);
+		}
 
 	}
 

From adc200c1f38754a3d78d0405825ee22368c0c140 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 4 Jun 2012 14:26:03 -0400
Subject: [PATCH 0137/1537] Hide app page link for internal apps, fixes bug
 oc-913

---
 settings/js/apps.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 5ac7d80b94..224076aba4 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -34,6 +34,8 @@ $(document).ready(function(){
 		if ( app.internal == false ) {
 			$('#rightcontent p.appslink').show();
 			$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
+		} else {
+			$('#rightcontent p.appslink').hide();
 		}
 		return false;
 	});

From 55e88120cdad9dc3b5b62cac81b637e921dcdf15 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 4 Jun 2012 18:42:25 +0000
Subject: [PATCH 0138/1537] Validate email on save

---
 settings/ajax/lostpassword.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 5874dec964..9c31c9ce8d 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -8,12 +8,11 @@ OC_JSON::checkLoggedIn();
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) ){
-	$email=trim($_POST['email']);
+if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){
	$email=trim($_POST['email']);
 	OC_Preferences::setValue(OC_User::getUser(),'settings','email',$email);
-	OC_JSON::success(array("data" => array( "message" => $l->t("email Changed") )));
+	OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
 }else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
 }
 
-?>
+?>
\ No newline at end of file

From b0d83d6d8d123171d97ac48e2fdb16d99093ca57 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 21:40:18 +0200
Subject: [PATCH 0139/1537] make it possible to load apps seperately. needed to
 fix oc-910 without breaking oc-863

---
 lib/app.php | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 124b76cdc3..17e0e47903 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -35,6 +35,7 @@ class OC_App{
 	static private $personalForms = array();
 	static private $appInfo = array();
 	static private $appTypes = array();
+	static private $loadedApps = array();
 
 	/**
 	 * @brief loads all apps
@@ -48,24 +49,18 @@ class OC_App{
 	 * if $types is set, only apps of those types will be loaded
 	 */
 	public static function loadApps($types=null){
-		// Did we already load everything?
-		if( self::$init ){
-			return true;
-		}
-
 		// Load the enabled apps here
 		$apps = self::getEnabledApps();
 		// prevent app.php from printing output
 		ob_start();
 		foreach( $apps as $app ){
-			if((is_null($types) or self::isType($app,$types))){
+			if((is_null($types) or self::isType($app,$types)) && !in_array($app, self::$loadedApps)){
 				self::loadApp($app);
+				self::$loadedApps[] = $app;
 			}
 		}
 		ob_end_clean();
 
-		self::$init = true;
-
 		// return
 		return true;
 	}
@@ -121,7 +116,7 @@ class OC_App{
 	 */
 	public static function setAppTypes($app){
 		$appData=self::getAppInfo($app);
-		
+
 		if(isset($appData['types'])){
 			$appTypes=implode(',',$appData['types']);
 		}else{
@@ -183,7 +178,7 @@ class OC_App{
 		if($app!==false){
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
-			$version=OC_Util::getVersion();	
+			$version=OC_Util::getVersion();
 	                if(!isset($info['require']) or ($version[0]>$info['require'])){
 				OC_Log::write('core','App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				return false;
@@ -487,13 +482,13 @@ class OC_App{
 				}
 			}
 		}
-		
+
 		// check if the current enabled apps are compatible with the current ownCloud version. disable them if not.
 		// this is important if you upgrade ownCloud and have non ported 3rd party apps installed
 		$apps =OC_App::getEnabledApps();
 		$version=OC_Util::getVersion();
 		foreach($apps as $app) {
-		
+
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			if(!isset($info['require']) or ($version[0]>$info['require'])){
@@ -501,12 +496,12 @@ class OC_App{
 				OC_App::disable( $app );
 			}
 
-	
-			
+
+
 		}
-		
-		
-		
+
+
+
 	}
 
 	/**

From dfc90021cacb5b9da3bf06e705133f18b13df583 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 21:31:35 +0200
Subject: [PATCH 0140/1537] load authentication apps before checking wether
 user exists. fixes oc-910

---
 lib/user.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 17c11322b8..9bfbfd8ee7 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -129,7 +129,7 @@ class OC_User {
 		if(trim($password) == ''){
 			throw new Exception('A valid password must be provided');
 		}
-		
+
 		// Check if user already exists
 		if( self::userExists($uid) ){
 			throw new Exception('The username is already being used');
@@ -242,12 +242,13 @@ class OC_User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn(){
-		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] AND self::userExists($_SESSION['user_id']) ){
-			return true;
-		}
-		else{
-			return false;
+		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
+			OC_App::loadApps(array('authentication'));
+			if (self::userExists($_SESSION['user_id']) ){
+				return true;
+			}
 		}
+		return false;
 	}
 
 	/**

From 091b343d5cc2766eb84d49b5f2c3c691b5d41a18 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 4 Jun 2012 17:42:59 +0200
Subject: [PATCH 0141/1537] Calendar & Contacts: Store import progress in
 OC_Cache

Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
---
 apps/calendar/ajax/import/import.php    | 20 +++++-----
 apps/calendar/import_tmp/Info           |  2 -
 apps/calendar/js/loader.js              | 12 +++---
 apps/calendar/templates/part.import.php |  2 +-
 apps/contacts/import.php                | 21 ++++++-----
 apps/contacts/import_tmp/Info           |  2 -
 apps/contacts/js/loader.js              | 12 +++---
 apps/contacts/templates/part.import.php |  2 +-
 lib/cache.php                           | 40 ++++++++++++++++++++
 lib/cache/file.php                      | 50 +++++++++++++++++++++++++
 10 files changed, 127 insertions(+), 36 deletions(-)
 delete mode 100644 apps/calendar/import_tmp/Info
 delete mode 100644 apps/contacts/import_tmp/Info
 create mode 100644 lib/cache.php
 create mode 100644 lib/cache/file.php

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 904c07c52e..a3eaed844a 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -10,18 +10,22 @@ ob_start();
 
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
+session_write_close();
 
 $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
 
-$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+global $progresskey;
+$progresskey = 'calendar.import-' . $_GET['progresskey'];
+
+if (isset($_GET['progress']) && $_GET['progress']) {
+	echo OC_Cache::get($progresskey);
+	die;
+}
 
 function writeProgress($pct) {
-	if(is_writable('import_tmp/')){
-		$progressfopen = fopen($progressfile, 'w');
-		fwrite($progressfopen, $pct);
-		fclose($progressfopen);
-	}
+	global $progresskey;
+	OC_Cache::set($progresskey, $pct, 300);
 }
 writeProgress('10');
 $file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
@@ -114,7 +118,5 @@ foreach($uids as $uid) {
 // finished import
 writeProgress('100');
 sleep(3);
-if(is_writable('import_tmp/')){
-	unlink($progressfile);
-}
+OC_Cache::remove($progresskey);
 OCP\JSON::success();
diff --git a/apps/calendar/import_tmp/Info b/apps/calendar/import_tmp/Info
deleted file mode 100644
index abafbce435..0000000000
--- a/apps/calendar/import_tmp/Info
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains static files with the percentage of the import.
-Requires write permission
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 60d92f448e..838521ec7f 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -43,8 +43,8 @@ Calendar_Import={
 			}
 			$('#newcalendar').attr('readonly', 'readonly');
 			$('#calendar').attr('disabled', 'disabled');
-			var progressfile = $('#progressfile').val();
-			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
+			var progresskey = $('#progresskey').val();
+			$.post(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progresskey='+progresskey, {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
 				if(data.status == 'success'){
 					$('#progressbar').progressbar('option', 'value', 100);
 					$('#import_done').css('display', 'block');
@@ -52,7 +52,7 @@ Calendar_Import={
 			});
 			$('#form_container').css('display', 'none');
 			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
 		});
 		$('#calendar').change(function(){
 			if($('#calendar option:selected').val() == 'newcal'){
@@ -62,11 +62,11 @@ Calendar_Import={
 			}
 		});
 	},
-	getimportstatus: function(progressfile){
-		$.get(OC.filePath('calendar', 'import_tmp', progressfile), function(percent){
+	getimportstatus: function(progresskey){
+		$.get(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
 			$('#progressbar').progressbar('option', 'value', parseInt(percent));
 			if(percent < 100){
-				window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
+				window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
 			}else{
 				$('#import_done').css('display', 'block');
 			}
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index e93ea1af4c..39cda29c20 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -2,7 +2,7 @@
 <div id="form_container">
 <input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
 <input type="hidden" id="path" value="<?php echo $_['path'];?>">
-<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+<input type="hidden" id="progresskey" value="<?php echo rand() ?>">
 <p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b></p>
 <select style="width:100%;" id="calendar" name="calendar">
 <?php
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index fdea4975d5..0ee35f9fd8 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -10,16 +10,21 @@ ob_start();
  
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
+session_write_close();
+
 $nl = "\n";
 
-$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+global $progresskey;
+$progresskey = 'contacts.import-' . $_GET['progresskey'];
+
+if (isset($_GET['progress']) && $_GET['progress']) {
+	echo OC_Cache::get($progresskey);
+	die;
+}
 
 function writeProgress($pct) {
-	if(is_writable('import_tmp/')){
-		$progressfopen = fopen($progressfile, 'w');
-		fwrite($progressfopen, $pct);
-		fclose($progressfopen);
-	}
+	global $progresskey;
+	OC_Cache::set($progresskey, $pct, 300);
 }
 writeProgress('10');
 $view = $file = null;
@@ -93,9 +98,7 @@ foreach($parts as $part){
 //done the import
 writeProgress('100');
 sleep(3);
-if(is_writable('import_tmp/')){
-	unlink($progressfile);
-}
+OC_Cache::remove($progresskey);
 if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
 	if(!$view->unlink('/' . $_POST['file'])) {
 		OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
diff --git a/apps/contacts/import_tmp/Info b/apps/contacts/import_tmp/Info
deleted file mode 100644
index abafbce435..0000000000
--- a/apps/contacts/import_tmp/Info
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains static files with the percentage of the import.
-Requires write permission
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 8c79ea8a1d..961e0f425c 100644
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -42,8 +42,8 @@ Contacts_Import={
 			}
 			$('#newaddressbook').attr('readonly', 'readonly');
 			$('#contacts').attr('disabled', 'disabled');
-			var progressfile = $('#progressfile').val();
-			$.post(OC.filePath('contacts', '', 'import.php'), {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
+			var progresskey = $('#progresskey').val();
+			$.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
 				if(jsondata.status == 'success'){
 					$('#progressbar').progressbar('option', 'value', 100);
 					$('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));
@@ -55,7 +55,7 @@ Contacts_Import={
 			});
 			$('#form_container').css('display', 'none');
 			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
 		});
 		$('#contacts').change(function(){
 			if($('#contacts option:selected').val() == 'newaddressbook'){
@@ -65,11 +65,11 @@ Contacts_Import={
 			}
 		});
 	},
-	getimportstatus: function(progressfile){
-		$.get(OC.filePath('contacts', 'import_tmp', progressfile), function(percent){
+	getimportstatus: function(progresskey){
+		$.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
 			$('#progressbar').progressbar('option', 'value', parseInt(percent));
 			if(percent < 100){
-				window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+				window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
 			}else{
 				$('#import_done').css('display', 'block');
 			}
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
index b879304299..32c8dc50dd 100644
--- a/apps/contacts/templates/part.import.php
+++ b/apps/contacts/templates/part.import.php
@@ -2,7 +2,7 @@
 	<div id="form_container">
 		<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
 		<input type="hidden" id="path" value="<?php echo $_['path'];?>">
-		<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+		<input type="hidden" id="progresskey" value="<?php echo rand() ?>">
 		<p class="bold" style="text-align:center;"><?php echo $l->t('Please choose the addressbook'); ?></p>
 		<select style="width:100%;" id="contacts" name="contacts">
 		<?php
diff --git a/lib/cache.php b/lib/cache.php
new file mode 100644
index 0000000000..a4fb244843
--- /dev/null
+++ b/lib/cache.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache {
+	static protected $cache;
+
+	static protected function init() {
+		self::$cache = new OC_Cache_File();
+	}
+
+	static public function get($key) {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->get($key);
+	}
+
+	static public function set($key, $value, $ttl=0) {
+		if (empty($key)) {
+			return false;
+		}
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->set($key, $value, $ttl);
+	}
+
+	static public function remove($key) {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->remove($key);
+	}
+
+}
diff --git a/lib/cache/file.php b/lib/cache/file.php
new file mode 100644
index 0000000000..02aad5187e
--- /dev/null
+++ b/lib/cache/file.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+class OC_Cache_File {
+	protected function getStorage() {
+		if(OC_User::isLoggedIn()){
+			$subdir = 'cache';
+			$view = new OC_FilesystemView('/'.OC_User::getUser());
+			if(!$view->file_exists($subdir)) {
+				$view->mkdir($subdir);
+			}
+			return new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
+		}else{
+			OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
+			return false;
+		}
+	}
+
+	public function get($key) {
+		$storage = $this->getStorage();
+		if ($storage->is_file($key)) {
+			$mtime = $storage->filemtime($key);
+			if ($mtime < time()) {
+				$storage->unlink($key);
+				return false;
+			}
+			return $storage->file_get_contents($key);
+		}
+		return false;
+	}
+
+	public function set($key, $value, $ttl) {
+		$storage = $this->getStorage();
+		if ($storage->file_put_contents($key, $value)) {
+			return $storage->touch($key, time() + $ttl);
+		}
+		return false;
+	}
+
+	public function remove($key) {
+		$storage = $this->getStorage();
+		return $storage->unlink($key);
+	}
+}

From 786325a4bb976d92de54c472c2c3bd8a73cbef22 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 4 Jun 2012 22:24:13 +0200
Subject: [PATCH 0142/1537] Fix newline in code

---
 settings/ajax/lostpassword.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 9c31c9ce8d..c6df8551f5 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -8,11 +8,12 @@ OC_JSON::checkLoggedIn();
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){
	$email=trim($_POST['email']);
+if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){
+	$email=trim($_POST['email']);
 	OC_Preferences::setValue(OC_User::getUser(),'settings','email',$email);
 	OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
 }
 
-?>
\ No newline at end of file
+?>

From 64f6534f51788d1f2e67c72567818a84b89b71ae Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 4 Jun 2012 23:04:22 +0200
Subject: [PATCH 0143/1537] Tasks: styling fixes

---
 apps/tasks/css/style.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
index 3cf175e646..23aac4e9ca 100644
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -9,7 +9,7 @@
 #tasks_lists .active{font-weight:bold;}
 #tasks_list h1{background-color:#1D2D44;color:white;font-size:120%;padding:0 0.5em;}
 
-.task{border-radius:0.4em;position:relative;padding:0.5em 1em;}
+.task{border-radius:0.4em;position:relative;padding:0.4em 1em;}
 .task:nth-child(odd){background-color:#F4F4F4;}
 .task:hover {background-color:#DDDDDD;}
 
@@ -33,7 +33,7 @@
 .task .completed {position:absolute;left:3em;top:0.3em;}
 
 .task .summary{padding-left:4em;height:2em;}
-.task .summary input{position:relative;left:5px;}
+.task .summary input{position:relative;left:5px;top:0.5em;}
 .task.done .summary{text-decoration:line-through;}
 
 .task .tag{border-radius:0.4em;display:inline-block;opacity:0.2;margin:0 0.2em;border:1px solid transparent;padding:0 0.4em;cursor:pointer;}
@@ -42,18 +42,19 @@
 .task:hover .tag{opacity:0.5}
 .task:hover .tag:hover{opacity:0.8;}
 
-.task .categories{position:absolute;right:12em;text-align:right;top:0.4em}
+.task .categories{position:absolute;right:12em;text-align:right;top:0.5em}
 .task .categories a{background-color:#1d2d44;color:white;}
 .task .categories .tag.active{display:none;}
 .task input.categories{display:none;top:0;text-align:left;}
 
-.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.4em}
+.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.5em}
 .task input.location{display:none;top:0;text-align:left;right:0.3em;background-color:white;color:#333333;}
 
 .task .more{display:none;margin-top:0.5em;}
 .task_less{display:none;}
 
 .task .description{position:relative;left:4em;}
+.task textarea.description{width:35em;height:4em;}
 .task .due{position:absolute;right:0.3em;}
 .task .due .date{width:6em;}
 .task .due .time{width:6em;}

From 7e017253f5a42b470eb9db75e8271b1bb238b5be Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 4 Jun 2012 23:17:50 +0200
Subject: [PATCH 0144/1537] Load apps before minimizing the core css and js

---
 core/minimizer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/minimizer.php b/core/minimizer.php
index e570305302..6828acc87d 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+OC_App::loadApps();
+
 if ($service == 'core.css'){
 	$minimizer = new OC_Minimizer_CSS();
 	$files = $minimizer->findFiles(OC_Util::$core_styles);

From 7e931575b4502e538ef28efbcff664cd935f94ad Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 5 Jun 2012 09:28:51 +0200
Subject: [PATCH 0145/1537] comment out non working code

---
 apps/files_versions/versions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index bc57901465..44ce7c635a 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -356,12 +356,13 @@ class Storage {
 			}
 			
 		}
-		
+	
+		/*	
 		// FIXME: make this path dynamic
 		$dir = '/home/samtuke/owncloud/git/oc5/data/admin/versions';
 
 		( deleteAll( $dir, 1 ) ? return true : return false );
-		
+		*/
         }
 
 

From d194132b6f9f348daec310be2b0db7c43d4b8629 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 10:32:12 +0200
Subject: [PATCH 0146/1537] Contacts: Cache standard photo less aggressively

---
 apps/contacts/photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 729c2dfbcf..4660d61f61 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -14,7 +14,7 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 
 function getStandardImage(){
-	OCP\Response::setExpiresHeader('P10D');
+	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person_large.png'));
 }

From dcc5b5ca0a67d4e21442bb96d67d9d23fc7f1647 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 10:37:22 +0200
Subject: [PATCH 0147/1537] xss vulnerability fixed

---
 apps/calendar/lib/object.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index f0a9bf050f..cc80a0bb70 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -600,8 +600,8 @@ class OC_Calendar_Object{
 
 	public static function updateVCalendarFromRequest($request, $vcalendar)
 	{
-		$title = $request["title"];
-		$location = $request["location"];
+		$title = strip_tags($request["title"]);
+		$location = strip_tags($request["location"]);
 		$categories = $request["categories"];
 		$allday = isset($request["allday"]);
 		$from = $request["from"];
@@ -611,7 +611,7 @@ class OC_Calendar_Object{
 			$totime = $request['totime'];
 		}
 		$vevent = $vcalendar->VEVENT;
-		$description = $request["description"];
+		$description = strip_tags($request["description"]);
 		$repeat = $request["repeat"];
 		if($repeat != 'doesnotrepeat'){
 			$rrule = '';

From d71c4db10aad0b1684087c745dcd10560351efb2 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 10:46:28 +0200
Subject: [PATCH 0148/1537] xss vulnerability fixed

---
 apps/media/lib_scanner.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index dc2a8a9beb..82170e5ca8 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -79,19 +79,19 @@ class OC_MEDIA_SCANNER{
 			OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN);
 			$artist='unknown';
 		}else{
-			$artist=stripslashes($data['comments']['artist'][0]);
+			$artist=strip_tags(stripslashes($data['comments']['artist'][0]));
 		}
 		if(!isset($data['comments']['album'])){
 			OCP\Util::writeLog('media',"error reading album tag in '$file'",OCP\Util::WARN);
 			$album='unknown';
 		}else{
-			$album=stripslashes($data['comments']['album'][0]);
+			$album=strip_tags(stripslashes($data['comments']['album'][0]));
 		}
 		if(!isset($data['comments']['title'])){
 			OCP\Util::writeLog('media',"error reading title tag in '$file'",OCP\Util::WARN);
 			$title='unknown';
 		}else{
-			$title=stripslashes($data['comments']['title'][0]);
+			$title=strip_tags(stripslashes($data['comments']['title'][0]));
 		}
 		$size=$data['filesize'];
 		if (isset($data['comments']['track']))

From 061abb88b568c4cdc35266fb8c32d1bfabcb8c8f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 11:50:21 +0200
Subject: [PATCH 0149/1537] write a warning to the log file if .htaccess is not
 writable instead of failing silently

---
 lib/files.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/files.php b/lib/files.php
index 885f6977fb..705b7a6ca6 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -373,10 +373,12 @@ class OC_Files {
 			}
 		}
 
-		//supress errors in case we don't have permissions for it
-		if(@file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess)) {
-			return OC_Helper::computerFileSize($size);
-		}
+		//check for write permissions
+		if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
+			file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
+			return OC_Helper::computerFileSize($size);	
+		} else { OC_Log::write('files','Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions',OC_Log::WARN); }
+		
 		return false;
 	}
 

From e3031ae28be12b377f6a570f8048512b744d5951 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 5 Jun 2012 12:52:23 +0200
Subject: [PATCH 0150/1537] more reliable host detection for reverse proxy
 servers

---
 lib/base.php   | 12 +++++++-----
 lib/helper.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index bdfd05e8f1..b9c28119e3 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -367,16 +367,18 @@ class OC{
 
 		// CSRF protection
 		if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
-		$protocol=OC_Helper::serverProtocol().'://'; 
+		$refererhost=parse_url($referer);
+		if(isset($refererhost['host'])) $refererhost=$refererhost['host']; else $refererhost='';
+		$server=OC_Helper::serverHost();
+		$serverhost=parse_url($server);
+		if(isset($serverhost['host'])) $serverhost=$serverhost['host']; else $serverhost='';
 		if(!self::$CLI){
-			$server=$protocol.OC_Helper::serverHost();
-			if(($_SERVER['REQUEST_METHOD']=='POST') and (substr($referer,0,strlen($server))<>$server)) {
-				$url = $protocol.OC_Helper::serverProtocol().OC::$WEBROOT.'/index.php';
+			if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
+				$url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';
 				header("Location: $url");
 				exit();
 			}
 		}
-
 		self::initSession();
 		self::initTemplateEngine();
 		self::checkUpgrade();
diff --git a/lib/helper.php b/lib/helper.php
index aedac20405..decc1d6133 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -120,7 +120,7 @@ class OC_Helper {
 	 */
 	public static function linkToAbsolute( $app, $file ) {
 		$urlLinkTo = self::linkTo( $app, $file );
-		$urlLinkTo = OC_Helper::serverProtocol(). '://'  . self::serverHost() . $urlLinkTo;
+		$urlLinkTo = self::serverProtocol(). '://'  . self::serverHost() . $urlLinkTo;
 		return $urlLinkTo;
 	}
 

From 7621559d00efa5d55ec6543e50a4b0ae39d8c7df Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 5 Jun 2012 14:02:00 +0200
Subject: [PATCH 0151/1537] make groups not static, fixes oc-919

---
 lib/group/backend.php  | 12 ++++++------
 lib/group/database.php | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/group/backend.php b/lib/group/backend.php
index 1b0b663f2e..24778afd1e 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -44,7 +44,7 @@ abstract class OC_Group_Backend {
 		OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup',
 		OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup',
 	);
-	
+
 	/**
 	* @brief Get all supported actions
 	* @returns bitwise-or'ed actions
@@ -62,7 +62,7 @@ abstract class OC_Group_Backend {
 
 		return $actions;
 	}
-	
+
 	/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions
@@ -83,7 +83,7 @@ abstract class OC_Group_Backend {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup($uid, $gid){
+	public function inGroup($uid, $gid){
 		return in_array($gid, $this->getUserGroups($uid));
 	}
 
@@ -95,7 +95,7 @@ abstract class OC_Group_Backend {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public static function getUserGroups($uid){
+	public function getUserGroups($uid){
 		return array();
 	}
 
@@ -105,7 +105,7 @@ abstract class OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){
+	public function getGroups(){
 		return array();
 	}
 
@@ -122,7 +122,7 @@ abstract class OC_Group_Backend {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){
+	public function usersInGroup($gid){
 		return array();
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index af55de1f42..fb173665eb 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -41,7 +41,7 @@
  * Class for group management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_Group_Database extends OC_Group_Backend {
-	static private $userGroupCache=array();
+	private $userGroupCache=array();
 
 	/**
 	 * @brief Try to create a new group
@@ -51,7 +51,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * Trys to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public static function createGroup( $gid ){
+	public function createGroup( $gid ){
 		// Check for existence
 		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups` WHERE gid = ?" );
 		$result = $query->execute( array( $gid ));
@@ -76,7 +76,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public static function deleteGroup( $gid ){
+	public function deleteGroup( $gid ){
 		// Delete the group
 		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*groups` WHERE gid = ?" );
 		$result = $query->execute( array( $gid ));
@@ -96,7 +96,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup( $uid, $gid ){
+	public function inGroup( $uid, $gid ){
 		// check
 		$query = OC_DB::prepare( "SELECT uid FROM `*PREFIX*group_user` WHERE gid = ? AND uid = ?" );
 		$result = $query->execute( array( $gid, $uid ));
@@ -112,9 +112,9 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Adds a user to a group.
 	 */
-	public static function addToGroup( $uid, $gid ){
+	public function addToGroup( $uid, $gid ){
 		// No duplicate entries!
-		if( !self::inGroup( $uid, $gid )){
+		if( !$this->inGroup( $uid, $gid )){
 			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" );
 			$result = $query->execute( array( $uid, $gid ));
 			return true;
@@ -131,7 +131,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * removes the user from a group.
 	 */
-	public static function removeFromGroup( $uid, $gid ){
+	public function removeFromGroup( $uid, $gid ){
 		$query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" );
 		$result = $query->execute( array( $uid, $gid ));
 
@@ -146,7 +146,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public static function getUserGroups( $uid ){
+	public function getUserGroups( $uid ){
 		// No magic!
 		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*group_user` WHERE uid = ?" );
 		$result = $query->execute( array( $uid ));
@@ -165,7 +165,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){
+	public function getGroups(){
 		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups`" );
 		$result = $query->execute();
 
@@ -176,12 +176,12 @@ class OC_Group_Database extends OC_Group_Backend {
 
 		return $groups;
 	}
-	
+
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){
+	public function usersInGroup($gid){
 		$query=OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid=?');
 		$users=array();
 		$result=$query->execute(array($gid));

From 6c4231b3d356241ca0e261ae03fcd54b33e656b5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 14:16:26 +0200
Subject: [PATCH 0152/1537] Per user quota didn't show in FF (and possibly IE)
 http://forum.owncloud.org/viewtopic.php?f=4&t=2716&p=5373#p5324.

---
 settings/css/settings.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 36d9b8d26f..b5a3c0f03b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,7 +34,7 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:relative }
+td.quota { position:absolute; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }

From e747fd794ec90afe5808e8082298870f4ab53140 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 5 Jun 2012 15:26:31 +0200
Subject: [PATCH 0153/1537] fix login for hosts running on port 80

---
 lib/base.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index b9c28119e3..641005c57c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -370,8 +370,8 @@ class OC{
 		$refererhost=parse_url($referer);
 		if(isset($refererhost['host'])) $refererhost=$refererhost['host']; else $refererhost='';
 		$server=OC_Helper::serverHost();
-		$serverhost=parse_url($server);
-		if(isset($serverhost['host'])) $serverhost=$serverhost['host']; else $serverhost='';
+		$serverhost=explode(':',$server);
+		$serverhost=$serverhost['0']; 
 		if(!self::$CLI){
 			if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
 				$url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';

From 0d1a07d4ae5f3023ff2a8c3c530a28ac97d7797f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 16:36:05 +0200
Subject: [PATCH 0154/1537] show pictures in folder with special characters,
 e.g. '+'

---
 apps/files_imageviewer/js/lightbox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 7a7fb66385..69cda7a0ec 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -22,7 +22,7 @@ function viewImage(dir, file) {
 	if(file.indexOf('.psd')>0){//can't view those
 		return;
 	}
-	var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
+	var location=OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 	$.fancybox({
 		"href": location,
 		"title": file.replace(/</, "&lt;").replace(/>/, "&gt;"),

From 57326ea1f87f9f2d2884fc87c556fec3c6bc378e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 17:45:09 +0200
Subject: [PATCH 0155/1537] Move setting remote_core.* to after setup of OC,
 also check if it is not set yet

---
 lib/base.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 641005c57c..a439651f4a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -235,9 +235,6 @@ class OC{
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			}
 
-			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-
 			OC_App::updateApps();
 		}
 	}
@@ -428,7 +425,12 @@ class OC{
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
-		
+
+		if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+		}
+
 		//parse the given parameters
 		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){

From 9d936976a9c89f183ad7258ac04e047d27900b5e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 17:51:41 +0200
Subject: [PATCH 0156/1537] Make check for writable apps dir configurable

---
 config/config.sample.php | 5 +++++
 lib/util.php             | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index e86dc05cb0..7ab327e2bc 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -29,6 +29,11 @@ $CONFIG = array(
 "log_type" => "",
 "logfile" => "",
 "loglevel" => "",
+/* Set this to false to disable the check for writable apps dir.
+ * If the apps dir is not writable, you can't download&install extra apps
+ * in the admin apps menu.
+ */
+"writable_appsdir" => true,
 // "datadirectory" => ""
 );
 ?>
diff --git a/lib/util.php b/lib/util.php
index 9a1fb7ac37..7a9545e365 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -31,7 +31,7 @@ class OC_Util {
 		}
 		
 		// Check if apps folder is writable.
-		if(!is_writable(OC::$SERVERROOT."/apps/")) {
+		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
 			$tmpl = new OC_Template( '', 'error', 'guest' );
 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 			$tmpl->printPage();

From eed0450351451fa409b8d2c81b8dde9e8702036a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 18:09:32 +0200
Subject: [PATCH 0157/1537] Fix remap dir for CSS minimizer

---
 core/css/styles.css   | 2 +-
 lib/minimizer/css.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 186c11b4ff..b6b5918d65 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -134,7 +134,7 @@ 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 }
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 3d1196390e..4637417579 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -63,7 +63,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 				$css = str_replace('%webroot%', $webroot, $css);
 			}
 			$remote = $file_info[1];
-			$remote .= '../';
+			$remote .= '/';
 			$remote .= dirname($file_info[2]);
 			$css_out .= CSSMin::remap($css, dirname($file), $remote, true);
 		}

From dcf1eed8164c8ab7490c82157d70d95f51aaddd4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jun 2012 19:32:48 +0200
Subject: [PATCH 0158/1537] add unique instance id

---
 lib/util.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/util.php b/lib/util.php
index 7a9545e365..20888fa71f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -330,4 +330,17 @@ class OC_Util {
 		}
 		exit();
 	}
+
+	/**
+	 * get an id unqiue for this instance
+	 * @return string
+	 */
+	public static function getInstanceId(){
+		$id=OC_Config::getValue('instanceid',null);
+		if(is_null($id)){
+			$id=uniqid();
+			OC_Config::setValue('instanceid',$id);
+		}
+		return $id;
+	}
 }

From 10eef49c3cf4636416a29427999d1a65a0aa1f0b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jun 2012 19:33:15 +0200
Subject: [PATCH 0159/1537] return null when a cache variable is not set

---
 lib/cache/file.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cache/file.php b/lib/cache/file.php
index 02aad5187e..a724b9682a 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -7,7 +7,7 @@
  */
 
 
-class OC_Cache_File {
+class OC_Cache_File extends OC_Cache {
 	protected function getStorage() {
 		if(OC_User::isLoggedIn()){
 			$subdir = 'cache';
@@ -28,11 +28,11 @@ class OC_Cache_File {
 			$mtime = $storage->filemtime($key);
 			if ($mtime < time()) {
 				$storage->unlink($key);
-				return false;
+				return null;
 			}
 			return $storage->file_get_contents($key);
 		}
-		return false;
+		return null;
 	}
 
 	public function set($key, $value, $ttl) {

From e11bf460e06fdafe04cc3bd7436725c40a71ffac Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jun 2012 19:57:49 +0200
Subject: [PATCH 0160/1537] add OC_Cache::clear

---
 lib/cache.php      |  7 +++++++
 lib/cache/file.php | 23 +++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lib/cache.php b/lib/cache.php
index a4fb244843..36cec63aa5 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -37,4 +37,11 @@ class OC_Cache {
 		return self::$cache->remove($key);
 	}
 
+	static public function clear() {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->clear();
+	}
+
 }
diff --git a/lib/cache/file.php b/lib/cache/file.php
index a724b9682a..1c97c5be4e 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -7,7 +7,7 @@
  */
 
 
-class OC_Cache_File extends OC_Cache {
+class OC_Cache_File{
 	protected function getStorage() {
 		if(OC_User::isLoggedIn()){
 			$subdir = 'cache';
@@ -24,7 +24,7 @@ class OC_Cache_File extends OC_Cache {
 
 	public function get($key) {
 		$storage = $this->getStorage();
-		if ($storage->is_file($key)) {
+		if ($storage and $storage->is_file($key)) {
 			$mtime = $storage->filemtime($key);
 			if ($mtime < time()) {
 				$storage->unlink($key);
@@ -35,9 +35,9 @@ class OC_Cache_File extends OC_Cache {
 		return null;
 	}
 
-	public function set($key, $value, $ttl) {
+	public function set($key, $value, $ttl=0) {
 		$storage = $this->getStorage();
-		if ($storage->file_put_contents($key, $value)) {
+		if ($storage and $storage->file_put_contents($key, $value)) {
 			return $storage->touch($key, time() + $ttl);
 		}
 		return false;
@@ -45,6 +45,21 @@ class OC_Cache_File extends OC_Cache {
 
 	public function remove($key) {
 		$storage = $this->getStorage();
+		if(!$storage){
+			return false;
+		}
 		return $storage->unlink($key);
 	}
+
+	public function clear(){
+		$storage = $this->getStorage();
+		if($storage and $storage->is_dir('/')){
+			$dh=$storage->opendir('/');
+			while($file=readdir($dh)){
+				if($file!='.' and $file!='..'){
+					$storage->unlink('/'.$file);
+				}
+			}
+		}
+	}
 }

From 301a14dcd6502f3eaaa621476c1fd788727f60ec Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jun 2012 19:58:30 +0200
Subject: [PATCH 0161/1537] add XCache backend and testcases for OC_Cache

---
 lib/cache/xcache.php       | 37 +++++++++++++++++++++++++++++++++
 tests/lib/cache.php        | 42 ++++++++++++++++++++++++++++++++++++++
 tests/lib/cache/file.php   | 27 ++++++++++++++++++++++++
 tests/lib/cache/xcache.php | 27 ++++++++++++++++++++++++
 4 files changed, 133 insertions(+)
 create mode 100644 lib/cache/xcache.php
 create mode 100644 tests/lib/cache.php
 create mode 100644 tests/lib/cache/file.php
 create mode 100644 tests/lib/cache/xcache.php

diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
new file mode 100644
index 0000000000..a1f4d905b8
--- /dev/null
+++ b/lib/cache/xcache.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+class OC_Cache_XCache{
+	/**
+	 * entries in XCache gets namespaced to prevent collisions between owncloud instaces and users
+	 */
+	protected function getNameSpace() {
+		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
+	}
+
+	public function get($key) {
+		return xcache_get($this->getNamespace().$key);
+	}
+
+	public function set($key, $value, $ttl=0) {
+		if($ttl>0){
+			return xcache_set($this->getNamespace().$key,$value,$ttl);
+		}else{
+			return xcache_set($this->getNamespace().$key,$value);
+		}
+	}
+
+	public function remove($key) {
+		return xcache_unset($this->getNamespace().$key);
+	}
+
+	public function clear(){
+		return xcache_unset_by_prefix($this->getNamespace());
+	}
+}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
new file mode 100644
index 0000000000..35e83a9ddc
--- /dev/null
+++ b/tests/lib/cache.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+abstract class Test_Cache extends UnitTestCase {
+	/**
+	 * @var OC_Cache cache;
+	 */
+	protected $instance;
+
+	public function tearDown(){
+		$this->instance->clear();
+	}
+
+	function testSimple(){
+		$this->assertNull($this->instance->get('value1'));
+		
+		$value='foobar';
+		$this->instance->set('value1',$value);
+		$received=$this->instance->get('value1');
+		$this->assertEqual($value,$received,'Value recieved from cache not equal to the original');
+		$value='ipsum lorum';
+		$this->instance->set('value1',$value);
+		$received=$this->instance->get('value1');
+		$this->assertEqual($value,$received,'Value not overwritten by seccond set');
+
+		$value2='foobar';
+		$this->instance->set('value2',$value2);
+		$received2=$this->instance->get('value2');
+		$this->assertEqual($value,$received,'Value changed while setting other variable');
+		$this->assertEqual($value2,$received2,'Seccond value not equal to original');
+
+		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
+	}
+
+	function testTTL(){
+	}
+}
\ No newline at end of file
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
new file mode 100644
index 0000000000..226e5068c4
--- /dev/null
+++ b/tests/lib/cache/file.php
@@ -0,0 +1,27 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@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/>.
+*
+*/
+
+class Test_Cache_File extends Test_Cache {
+	public function setUp(){
+		$this->instance=new OC_Cache_File();
+	}
+}
diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
new file mode 100644
index 0000000000..9ec80ff83c
--- /dev/null
+++ b/tests/lib/cache/xcache.php
@@ -0,0 +1,27 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@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/>.
+*
+*/
+
+class Test_Cache_XCache extends Test_Cache {
+	public function setUp(){
+		$this->instance=new OC_Cache_XCache();
+	}
+}

From 9dbb07b806c3795d1910f6998c644977d06746e2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 20:19:27 +0200
Subject: [PATCH 0162/1537] Added data() method to OC_Image to return raw image
 data.

---
 lib/image.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 4c53dc32f5..a6bb92cea2 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -187,15 +187,22 @@ class OC_Image {
 	}
 
 	/**
-	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	* @returns Returns the raw image data.
 	*/
-	function __toString() {
+	function data() {
 		ob_start();
 		$res = imagepng($this->resource);
 		if (!$res) {
-			OC_Log::write('core','OC_Image->__toString. Error writing image',OC_Log::ERROR);
+			OC_Log::write('core','OC_Image->data. Error getting image data.',OC_Log::ERROR);
 		}
-		return base64_encode(ob_get_clean());
+		return ob_get_clean();
+	}
+
+	/**
+	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	*/
+	function __toString() {
+		return base64_encode($this->data());
 	}
 
 	/**

From 098beae751e5bf5995d3afc5b01ed6ca67676f64 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 20:21:06 +0200
Subject: [PATCH 0163/1537] Added hasKey() method to OC_Cache.

---
 lib/cache.php      |  7 +++++++
 lib/cache/file.php | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lib/cache.php b/lib/cache.php
index 36cec63aa5..70f11f3551 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -30,6 +30,13 @@ class OC_Cache {
 		return self::$cache->set($key, $value, $ttl);
 	}
 
+	static public function hasKey($key) {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->hasKey($key);
+	}
+
 	static public function remove($key) {
 		if (!self::$cache) {
 			self::init();
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 1c97c5be4e..348389e9ff 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -23,13 +23,8 @@ class OC_Cache_File{
 	}
 
 	public function get($key) {
-		$storage = $this->getStorage();
-		if ($storage and $storage->is_file($key)) {
-			$mtime = $storage->filemtime($key);
-			if ($mtime < time()) {
-				$storage->unlink($key);
-				return null;
-			}
+		if ($this->hasKey($key)) {
+			$storage = $this->getStorage();
 			return $storage->file_get_contents($key);
 		}
 		return null;
@@ -43,6 +38,19 @@ class OC_Cache_File{
 		return false;
 	}
 
+	public function hasKey($key) {
+		$storage = $this->getStorage();
+		if ($storage->is_file($key)) {
+			$mtime = $storage->filemtime($key);
+			if ($mtime < time()) {
+				$storage->unlink($key);
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
 	public function remove($key) {
 		$storage = $this->getStorage();
 		if(!$storage){

From cb941996c042fc8bd22422bd928ce8fc8b6b25ca Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 20:30:22 +0200
Subject: [PATCH 0164/1537] Contacts: Use OC_Cache for contact photo handling
 instead of temp dir.

---
 apps/contacts/ajax/cropphoto.php             |   6 +-
 apps/contacts/ajax/currentphoto.php          |  17 +--
 apps/contacts/ajax/savecrop.php              | 108 ++++++++-----------
 apps/contacts/ajax/uploadphoto.php           |  53 ++++-----
 apps/contacts/js/contacts.js                 |   7 +-
 apps/contacts/templates/part.cropphoto.php   |  16 +--
 apps/contacts/{dynphoto.php => tmpphoto.php} |   9 +-
 7 files changed, 90 insertions(+), 126 deletions(-)
 rename apps/contacts/{dynphoto.php => tmpphoto.php} (82%)

diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
index 7b286dbdb5..63c9eb8f2d 100644
--- a/apps/contacts/ajax/cropphoto.php
+++ b/apps/contacts/ajax/cropphoto.php
@@ -27,11 +27,11 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$tmp_path = $_GET['tmp_path'];
+$tmpkey = $_GET['tmpkey'];
 $id = $_GET['id'];
-OCP\Util::writeLog('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+//OCP\Util::writeLog('contacts','ajax/cropphoto.php: tmpkey: '.$tmpkey.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
 $tmpl = new OCP\Template("contacts", "part.cropphoto");
-$tmpl->assign('tmp_path', $tmp_path);
+$tmpl->assign('tmpkey', $tmpkey);
 $tmpl->assign('id', $id);
 $page = $tmpl->fetchPage();
 
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index d0654b17d6..e4d69eeb87 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -19,10 +19,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
-//require_once('../../../lib/base.php');
 
-// Check if we are a user
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
@@ -32,30 +29,24 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::ERROR);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::DEBUG);
-}
 
 if (!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 }
 
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
 $contact = OC_Contacts_App::getContactVCard($_GET['id']);
-$image = new OC_Image();
-if(!$image) {
-	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-}
 // invalid vcard
 if( is_null($contact)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error reading contact photo.'));
 } else {
+	$image = new OC_Image();
 	if(!$image->loadFromBase64($contact->getAsString('PHOTO'))) {
 		$image->loadFromBase64($contact->getAsString('LOGO'));
 	}
 	if($image->valid()) {
-		if($image->save($tmpfname)) {
-			OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname)));
+		$tmpkey = 'contact-photo-'.md5($contact->getAsString('FN'));
+		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+			OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
 			exit();
 		} else {
 			bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.'));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index e335c76fd9..b3aab6a881 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -18,16 +18,11 @@
  * 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/>.
  *
- * TODO: Translatable strings.
  */
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-// foreach ($_POST as $key=>$element) {
-// 	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
-// }
-
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
@@ -45,88 +40,71 @@ $y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : 0;
 //$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
 $w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
 $h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
-$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
+$tmpkey = isset($_POST['tmpkey']) ? $_POST['tmpkey'] : '';
 $id = isset($_POST['id']) ? $_POST['id'] : '';
 
-if($tmp_path == '') {
-	bailOut('Missing path to temporary file.');
+if($tmpkey == '') {
+	bailOut('Missing key to temporary file.');
 }
 
 if($id == '') {
 	bailOut('Missing contact id.');
 }
 
-OCP\Util::writeLog('contacts','savecrop.php: files: '.$tmp_path.'  exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+OCP\Util::writeLog('contacts','savecrop.php: key: '.$tmpkey, OCP\Util::DEBUG);
 
-if(file_exists($tmp_path)) {
+$data = OC_Cache::get($tmpkey);
+if($data) {
 	$image = new OC_Image();
-	if($image->loadFromFile($tmp_path)) {
+	if($image->loadFromdata($data)) {
 		$w = ($w != -1 ? $w : $image->width());
 		$h = ($h != -1 ? $h : $image->height());
 		OCP\Util::writeLog('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OCP\Util::DEBUG);
 		if($image->crop($x1, $y1, $w, $h)) {
 			if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
-				$tmpfname = tempnam(get_temp_dir(), "occCropped"); // create a new file because of caching issues.
-				if($image->save($tmpfname)) {
-					unlink($tmp_path);
-					$card = OC_Contacts_App::getContactVCard($id);
-					if(!$card) {
-						unlink($tmpfname);
-						bailOut('Error getting contact object.');
-					}
-					if($card->__isset('PHOTO')) {
-						OCP\Util::writeLog('contacts','savecrop.php: PHOTO property exists.', OCP\Util::DEBUG);
-						$property = $card->__get('PHOTO');
-						if(!$property) {
-							unlink($tmpfname);
-							bailOut('Error getting PHOTO property.');
-						}
-						$property->setValue($image->__toString());
-						$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
-						$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
-						$card->__set('PHOTO', $property);
-					} else {
-						OCP\Util::writeLog('contacts','savecrop.php: files: Adding PHOTO property.', OCP\Util::DEBUG);
-						$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
-					}
-					$now = new DateTime;
-					$card->setString('REV', $now->format(DateTime::W3C));
-					if(!OC_Contacts_VCard::edit($id,$card)) {
-						bailOut('Error saving contact.');
-					}
-					unlink($tmpfname);
-					//$result=array( "status" => "success", 'mime'=>$image->mimeType(), 'tmp'=>$tmp_path);
-					$tmpl = new OCP\Template("contacts", "part.contactphoto");
-					$tmpl->assign('tmp_path', $tmpfname);
-					$tmpl->assign('mime', $image->mimeType());
-					$tmpl->assign('id', $id);
-					$tmpl->assign('refresh', true);
-					$tmpl->assign('width', $image->width());
-					$tmpl->assign('height', $image->height());
-					$page = $tmpl->fetchPage();
-					OCP\JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
-					exit();
-				} else {
-					if(file_exists($tmpfname)) {
-						unlink($tmpfname);
-					}
-					bailOut('Error saving temporary image');
+				$card = OC_Contacts_App::getContactVCard($id);
+				if(!$card) {
+					OC_Cache::remove($tmpkey);
+					bailOut(OC_Contacts_App::$l10n->t('Error getting contact object.'));
 				}
+				if($card->__isset('PHOTO')) {
+					OCP\Util::writeLog('contacts','savecrop.php: PHOTO property exists.', OCP\Util::DEBUG);
+					$property = $card->__get('PHOTO');
+					if(!$property) {
+						OC_Cache::remove($tmpkey);
+						bailOut(OC_Contacts_App::$l10n->t('Error getting PHOTO property.'));
+					}
+					$property->setValue($image->__toString());
+					$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
+					$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+					$card->__set('PHOTO', $property);
+				} else {
+					OCP\Util::writeLog('contacts','savecrop.php: files: Adding PHOTO property.', OCP\Util::DEBUG);
+					$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
+				}
+				$now = new DateTime;
+				$card->setString('REV', $now->format(DateTime::W3C));
+				if(!OC_Contacts_VCard::edit($id,$card)) {
+					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
+				}
+				$tmpl = new OCP\Template("contacts", "part.contactphoto");
+				$tmpl->assign('id', $id);
+				$tmpl->assign('refresh', true);
+				$tmpl->assign('width', $image->width());
+				$tmpl->assign('height', $image->height());
+				$page = $tmpl->fetchPage();
+				OCP\JSON::success(array('data' => array('page'=>$page)));
 			} else {
-				bailOut('Error resizing image');
+				bailOut(OC_Contacts_App::$l10n->t('Error resizing image'));
 			}
 		} else {
-			bailOut('Error cropping image');
+			bailOut(OC_Contacts_App::$l10n->t('Error cropping image'));
 		}
 	} else {
-		bailOut('Error creating temporary image');
+		bailOut(OC_Contacts_App::$l10n->t('Error creating temporary image'));
 	}
 } else {
-	bailOut('Error finding image: '.$tmp_path);
+	bailOut(OC_Contacts_App::$l10n->t('Error finding image: ').$tmpkey);
 }
 
-if($tmp_path != '' && file_exists($tmp_path)) {
-	unlink($tmp_path);
-}
-
-?>
+OC_Cache::remove($tmpkey);
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index dca8ede6d6..09c4e55d4a 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -19,14 +19,12 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
- 
 
 // Check if we are a user
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
@@ -39,46 +37,40 @@ function debug($msg) {
 // If it is a Drag'n'Drop transfer it's handled here.
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
 if ($fn) {
-	// AJAX call
 	if (!isset($_GET['id'])) {
-		OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG);
-		OCP\JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
-		exit();
+		bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 	}
 	$id = $_GET['id'];
-	$tmpfname = tempnam(get_temp_dir(), 'occOrig');
-	file_put_contents($tmpfname, file_get_contents('php://input'));
-	debug($tmpfname.' uploaded');
+	$tmpkey = 'contact-photo-'.md5($fn);
+	$data = file_get_contents('php://input');
 	$image = new OC_Image();
-	if($image->loadFromFile($tmpfname)) {
+	sleep(1); // Apparently it needs time to load the data.
+	if($image->loadFromData($data)) {
 		if($image->width() > 400 || $image->height() > 400) {
 			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 		}
 		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+			debug('Couldn\'t save correct image orientation: '.$tmpkey);
 		}
-		if($image->save($tmpfname)) {
-			OCP\JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
+		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+			OCP\JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpkey)));
 			exit();
 		} else {
-			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey.$data);
 	}
 }
 
-
+// Uploads from file dialog are handled here.
 if (!isset($_POST['id'])) {
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG);
-	OCP\JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 }
 if (!isset($_FILES['imagefile'])) {
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG);
-	OCP\JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('No file was uploaded. Unknown error'));
 }
+
 $error = $_FILES['imagefile']['error'];
 if($error !== UPLOAD_ERR_OK) {
 	$errors = array(
@@ -93,27 +85,26 @@ if($error !== UPLOAD_ERR_OK) {
 }
 $file=$_FILES['imagefile'];
 
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
+	$tmpkey = 'contact-photo-'.md5(basename($file['tmp_name']));
 	$image = new OC_Image();
 	if($image->loadFromFile($file['tmp_name'])) {
 		if($image->width() > 400 || $image->height() > 400) {
 			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 		}
 		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+			debug('Couldn\'t save correct image orientation: '.$tmpkey);
 		}
-		if($image->save($tmpfname)) {
-			OCP\JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
+		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+			OCP\JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpkey)));
 			exit();
 		} else {
-			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$file['tmp_name']);
 	}
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-
 ?>
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index df3b59c349..8b9a80c952 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1162,9 +1162,9 @@ Contacts={
 					}
 				});
 			},
-			editPhoto:function(id, tmp_path){
-				//alert('editPhoto: ' + tmp_path);
-				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmp_path':tmp_path,'id':this.id},function(jsondata){
+			editPhoto:function(id, tmpkey){
+				//alert('editPhoto: ' + tmpkey);
+				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id},function(jsondata){
 					if(jsondata.status == 'success'){
 						//alert(jsondata.data.page);
 						$('#edit_photo_dialog_img').html(jsondata.data.page);
@@ -1194,6 +1194,7 @@ Contacts={
 						Contacts.UI.Card.loadPhotoHandlers();
 					}else{
 						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
+						wrapper.removeClass('wait');
 					}
 				});
 				Contacts.UI.Contacts.refreshThumbnail(this.id);
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 599951d9a9..d7f0efc57d 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -1,7 +1,7 @@
 <?php 
 $id = $_['id'];
-$tmp_path = $_['tmp_path'];
-OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+$tmpkey = $_['tmpkey'];
+OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 ?>
 <script language="Javascript">
 	jQuery(function($) {
@@ -38,7 +38,8 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_pa
 		return true;
 	});*/
 </script>
-<img id="cropbox" src="<?php echo OCP\Util::linkToAbsolute('contacts', 'dynphoto.php'); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
+<?php if(OC_Cache::hasKey($tmpkey)) { ?>
+<img id="cropbox" src="<?php echo OCP\Util::linkToAbsolute('contacts', 'tmpphoto.php'); ?>?tmpkey=<?php echo $tmpkey; ?>" />
 <form id="cropform"
 	class="coords"
 	method="post"
@@ -47,7 +48,7 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_pa
 	action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
 
 	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
-	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
+	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
 	<fieldset id="coords">
 	<input type="hidden" id="x1" name="x1" value="" />
 	<input type="hidden" id="y1" name="y1" value="" />
@@ -58,5 +59,8 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_pa
 	</fieldset>
 	<iframe name="crop_target" id='crop_target' src=""></iframe>
 </form>
-
-
+<?php
+} else { 
+	echo $l->t('The temporary image has been removed from cache.');
+}
+?>
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/tmpphoto.php
similarity index 82%
rename from apps/contacts/dynphoto.php
rename to apps/contacts/tmpphoto.php
index ea6cef227e..5fde8de997 100644
--- a/apps/contacts/dynphoto.php
+++ b/apps/contacts/tmpphoto.php
@@ -20,15 +20,14 @@
  *
  */
 
-// Init owncloud
-
-$tmp_path = $_GET['tmp_path'];
+$tmpkey = $_GET['tmpkey'];
 $maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
 header("Cache-Control: no-cache, no-store, must-revalidate");
 
-OCP\Util::writeLog('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+OCP\Util::writeLog('contacts','tmpphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 
-$image = new OC_Image($tmp_path);
+$image = new OC_Image();
+$image->loadFromData(OC_Cache::get($tmpkey));
 if($maxsize != -1) {
 	$image->resize($maxsize);
 }

From f6298cb74fe7485856e2353e371f2923d5d47890 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jun 2012 20:54:07 +0200
Subject: [PATCH 0165/1537] add hasKey for XCache backend

---
 lib/cache/xcache.php | 4 ++++
 tests/lib/cache.php  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index a1f4d905b8..ad1e3e2c1f 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -27,6 +27,10 @@ class OC_Cache_XCache{
 		}
 	}
 
+	public function hasKey($key) {
+		return xcache_isset($this->getNamespace().$key);
+	}
+
 	public function remove($key) {
 		return xcache_unset($this->getNamespace().$key);
 	}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 35e83a9ddc..23cbd3506e 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -18,9 +18,11 @@ abstract class Test_Cache extends UnitTestCase {
 
 	function testSimple(){
 		$this->assertNull($this->instance->get('value1'));
+		$this->assertFalse($this->instance->hasKey('value1'));
 		
 		$value='foobar';
 		$this->instance->set('value1',$value);
+		$this->assertTrue($this->instance->hasKey('value1'));
 		$received=$this->instance->get('value1');
 		$this->assertEqual($value,$received,'Value recieved from cache not equal to the original');
 		$value='ipsum lorum';
@@ -31,9 +33,12 @@ abstract class Test_Cache extends UnitTestCase {
 		$value2='foobar';
 		$this->instance->set('value2',$value2);
 		$received2=$this->instance->get('value2');
+		$this->assertTrue($this->instance->hasKey('value1'));
+		$this->assertTrue($this->instance->hasKey('value2'));
 		$this->assertEqual($value,$received,'Value changed while setting other variable');
 		$this->assertEqual($value2,$received2,'Seccond value not equal to original');
 
+		$this->assertFalse($this->instance->hasKey('not_set'));
 		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
 	}
 

From 86ddf386d981341224bbb64635d140fbfe6b5c2b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jun 2012 20:59:52 +0200
Subject: [PATCH 0166/1537] add TTL tests for OC_Cache

---
 tests/lib/cache.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 23cbd3506e..fdc39aec18 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -43,5 +43,14 @@ abstract class Test_Cache extends UnitTestCase {
 	}
 
 	function testTTL(){
+		$value='foobar';
+		$this->instance->set('value1',$value,1);
+		$value2='foobar';
+		$this->instance->set('value2',$value2);
+		sleep(2);
+		$this->assertFalse($this->instance->hasKey('value1'));
+		$this->assertNull($this->instance->get('value1'));
+		$this->assertTrue($this->instance->hasKey('value2'));
+		$this->assertEqual($value2,$this->instance->get('value2'));
 	}
 }
\ No newline at end of file

From 20aee83d07b67b484ca447b004d91ae188b2ec07 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 21:19:46 +0200
Subject: [PATCH 0167/1537] Use UID for cache key.

---
 apps/contacts/ajax/currentphoto.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index e4d69eeb87..5f90128f32 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -44,7 +44,7 @@ if( is_null($contact)) {
 		$image->loadFromBase64($contact->getAsString('LOGO'));
 	}
 	if($image->valid()) {
-		$tmpkey = 'contact-photo-'.md5($contact->getAsString('FN'));
+		$tmpkey = 'contact-photo-'.$contact->getAsString('UID');
 		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
 			OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
 			exit();

From 9984c2a5937b38d6bed294c12f58d3a62730c6c8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 21:11:18 +0200
Subject: [PATCH 0168/1537] Spelling fixes in XCache files

---
 lib/cache/xcache.php | 5 ++---
 tests/lib/cache.php  | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index ad1e3e2c1f..b57338929e 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -6,10 +6,9 @@
  * See the COPYING-README file.
  */
 
-
-class OC_Cache_XCache{
+class OC_Cache_XCache {
 	/**
-	 * entries in XCache gets namespaced to prevent collisions between owncloud instaces and users
+	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
 	 */
 	protected function getNameSpace() {
 		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index fdc39aec18..e90826b85f 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -28,7 +28,7 @@ abstract class Test_Cache extends UnitTestCase {
 		$value='ipsum lorum';
 		$this->instance->set('value1',$value);
 		$received=$this->instance->get('value1');
-		$this->assertEqual($value,$received,'Value not overwritten by seccond set');
+		$this->assertEqual($value,$received,'Value not overwritten by second set');
 
 		$value2='foobar';
 		$this->instance->set('value2',$value2);
@@ -36,7 +36,7 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertTrue($this->instance->hasKey('value1'));
 		$this->assertTrue($this->instance->hasKey('value2'));
 		$this->assertEqual($value,$received,'Value changed while setting other variable');
-		$this->assertEqual($value2,$received2,'Seccond value not equal to original');
+		$this->assertEqual($value2,$received2,'Second value not equal to original');
 
 		$this->assertFalse($this->instance->hasKey('not_set'));
 		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
@@ -53,4 +53,4 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertTrue($this->instance->hasKey('value2'));
 		$this->assertEqual($value2,$this->instance->get('value2'));
 	}
-}
\ No newline at end of file
+}

From ab788eaa232db0016b759de0eb3e14647f6581be Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 23:09:49 +0200
Subject: [PATCH 0169/1537] OC_Cache_File ttl=0 indicates forever, but expire
 in a day to keep the cache clean

---
 lib/cache/file.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/cache/file.php b/lib/cache/file.php
index 348389e9ff..0b7d3e3050 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -33,6 +33,9 @@ class OC_Cache_File{
 	public function set($key, $value, $ttl=0) {
 		$storage = $this->getStorage();
 		if ($storage and $storage->file_put_contents($key, $value)) {
+			if ($ttl === 0) {
+				$ttl = 86400; // 60*60*24
+			}
 			return $storage->touch($key, time() + $ttl);
 		}
 		return false;
@@ -40,7 +43,7 @@ class OC_Cache_File{
 
 	public function hasKey($key) {
 		$storage = $this->getStorage();
-		if ($storage->is_file($key)) {
+		if ($storage && $storage->is_file($key)) {
 			$mtime = $storage->filemtime($key);
 			if ($mtime < time()) {
 				$storage->unlink($key);

From 86961b64451ac45270274d4de07cd7fc1122521b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 23:10:51 +0200
Subject: [PATCH 0170/1537] Skip test for XCache when the module is not there

---
 tests/lib/cache/xcache.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index 9ec80ff83c..a5e954f827 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -21,6 +21,10 @@
 */
 
 class Test_Cache_XCache extends Test_Cache {
+	function skip() {
+		$this->skipUnless(function_exists('xcache_get'));
+	}
+
 	public function setUp(){
 		$this->instance=new OC_Cache_XCache();
 	}

From fc56a668ce756811f8b98557548fff2bf34799a4 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 23:19:28 +0200
Subject: [PATCH 0171/1537] Add OC_Cache implementation for APC

---
 lib/cache/apc.php       | 46 +++++++++++++++++++++++++++++++++++++++++
 tests/lib/cache.php     |  2 ++
 tests/lib/cache/apc.php | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 lib/cache/apc.php
 create mode 100644 tests/lib/cache/apc.php

diff --git a/lib/cache/apc.php b/lib/cache/apc.php
new file mode 100644
index 0000000000..f814afbe49
--- /dev/null
+++ b/lib/cache/apc.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache_APC {
+	/**
+	 * entries in APC gets namespaced to prevent collisions between owncloud instances and users
+	 */
+	protected function getNameSpace() {
+		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
+	}
+
+	public function get($key) {
+		$result = apc_fetch($this->getNamespace().$key, $success);
+		if (!$success) {
+			return null;
+		}
+		return $result;
+	}
+
+	public function set($key, $value, $ttl=0) {
+		return apc_store($this->getNamespace().$key, $value, $ttl);
+	}
+
+	public function hasKey($key) {
+		return apc_exists($this->getNamespace().$key);
+	}
+
+	public function remove($key) {
+		return apc_delete($this->getNamespace().$key);
+	}
+
+	public function clear(){
+		$ns = $this->getNamespace();
+		$cache = apc_cache_info('user');
+		foreach($cache['cache_list'] as $entry) {
+			if (strpos($entry['info'], $ns) === 0) {
+				apc_delete($entry['info']);
+			}
+		}
+	}
+}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index e90826b85f..bb5cfc6ee1 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -40,6 +40,8 @@ abstract class Test_Cache extends UnitTestCase {
 
 		$this->assertFalse($this->instance->hasKey('not_set'));
 		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
+
+		$this->assertTrue($this->instance->remove('value1'));
 	}
 
 	function testTTL(){
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
new file mode 100644
index 0000000000..ab8eb18866
--- /dev/null
+++ b/tests/lib/cache/apc.php
@@ -0,0 +1,36 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@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/>.
+*
+*/
+
+class Test_Cache_APC extends Test_Cache {
+	function skip() {
+		$this->skipUnless(function_exists('apc_store'));
+	}
+
+	public function setUp(){
+		$this->instance=new OC_Cache_APC();
+	}
+
+	function testTTL(){
+		// ttl doesn't work correctly in the same request
+		// see https://bugs.php.net/bug.php?id=58084
+	}
+}

From 3ce6344d40385e38335fb9716233cbf7c5241860 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 5 Jun 2012 17:44:07 -0400
Subject: [PATCH 0172/1537] Supress any warnings if log file does not exist

---
 lib/log/owncloud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 5913d8b5b8..92914af8fc 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -63,7 +63,7 @@ class OC_Log_Owncloud {
 		self::init();
 		$minLevel=OC_Config::getValue( "loglevel", OC_Log::WARN );
 		$entries = array();
-		$handle = fopen(self::$logFile, 'r');
+		$handle = @fopen(self::$logFile, 'r');
 		if ($handle) {
 			// Just a guess to set the file pointer to the right spot
 			$maxLineLength = 150;

From e6c4e53486b7c1a2f9da7b3ebca3b2581406fb92 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 6 Jun 2012 00:02:13 +0200
Subject: [PATCH 0173/1537] prevent creating files with a / the name

---
 apps/files/ajax/newfile.php   | 4 ++++
 apps/files/ajax/newfolder.php | 4 ++++
 apps/files/js/files.js        | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 316eac0562..edb7841487 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -15,6 +15,10 @@ if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
 	exit();
 }
+if(strpos($filename,'/')!==false){
+	OCP\JSON::error(array("data" => array( "message" => "Invalid Filename" )));
+	exit();
+}
 
 if($source){
 	if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index 512e0e1f6d..0668a6191f 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -13,6 +13,10 @@ if(trim($foldername) == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
+if(strpos($filename,'/')!==false){
+	OCP\JSON::error(array("data" => array( "message" => "Invalid Foldername" )));
+	exit();
+}
 
 if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
 	OCP\JSON::success(array("data" => array()));
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7cd0f388a3..a079deb953 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -452,6 +452,11 @@ $(document).ready(function() {
 		input.focus();
 		input.change(function(){
 			var name=$(this).val();
+			if(name.indexOf('/')!=-1){
+				$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
+				$('#notification').fadeIn();
+				return;
+			}
 			switch(type){
 				case 'file':
 					$.post(

From 549889d3cbc75e184f27973d7e020b7985189af1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 6 Jun 2012 00:11:45 +0200
Subject: [PATCH 0174/1537] update l10n script to better read js files

---
 l10n/l10n.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 27b14c41be..0f75cc5c7e 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -101,7 +101,7 @@ if( $task eq 'read' ){
 		foreach my $file ( @totranslate ){
 			next if $ignore{$file};
 			my $keyword = ( $file =~ /\.js$/ ? 't:2' : 't');
-			my $language = ( $file =~ /\.js$/ ? 'C' : 'PHP');
+			my $language = ( $file =~ /\.js$/ ? 'Perl' : 'PHP');
 			my $joinexisting = ( -e $output ? '--join-existing' : '');
 			print "    Reading $file\n";
 			`xgettext --output="$output" $joinexisting --keyword=$keyword --language=$language "$file"`;

From a3c1f70be423eb4e6bc76164da9d080ffe66305c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 6 Jun 2012 00:24:15 +0200
Subject: [PATCH 0175/1537] dont show config option for file upload size if we
 cant write the new value

---
 apps/files/admin.php           | 4 +++-
 apps/files/templates/admin.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files/admin.php b/apps/files/admin.php
index b0c2b35c69..d05eb7267b 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -51,8 +51,10 @@ $allowZipDownload = intval(OCP\Config::getSystemValue('allowZipDownload', true))
 
 OCP\App::setActiveNavigationEntry( "files_administration" );
 
+$htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
+
 $tmpl = new OCP\Template( 'files', 'admin' );
-$tmpl->assign( 'htaccessWorking', $htaccessWorking );
+$tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
 $tmpl->assign( 'allowZipDownload', $allowZipDownload);
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index c89070ce52..23021ec664 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -3,7 +3,7 @@
 <form name="filesForm" action='#' method='post'>
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
-		<?php if($_['htaccessWorking']):?>
+		<?php if($_['uploadChangable']):?>
 			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/>
 		<?php endif;?>
 		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/>

From f7d221f5f0aadedf80ebb477c623612545c7be08 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 6 Jun 2012 00:29:28 +0200
Subject: [PATCH 0176/1537] update translations

---
 .htaccess                    |   4 +-
 apps/calendar/l10n/da.php    |  29 ++-
 apps/calendar/l10n/de.php    |  26 +-
 apps/calendar/l10n/fi_FI.php | 138 ++++++++++
 apps/calendar/l10n/gl.php    |  29 ++-
 apps/calendar/l10n/he.php    |  98 ++++++-
 apps/calendar/l10n/hr.php    | 103 +++++++-
 apps/calendar/l10n/ja_JP.php |  69 +++--
 apps/calendar/l10n/lb.php    |  53 ++++
 apps/calendar/l10n/lt_LT.php |  26 +-
 apps/calendar/l10n/nb_NO.php |   2 +-
 apps/calendar/l10n/pl.php    |  29 ++-
 apps/calendar/l10n/pt_PT.php |  29 ++-
 apps/calendar/l10n/ro.php    |  29 ++-
 apps/calendar/l10n/ru.php    |  26 +-
 apps/calendar/l10n/sv.php    |  29 ++-
 apps/calendar/l10n/zh_CN.php |   4 +
 apps/calendar/l10n/zh_TW.php |  28 +-
 apps/contacts/l10n/ca.php    |   7 +-
 apps/contacts/l10n/cs_CZ.php |  10 +-
 apps/contacts/l10n/da.php    | 101 +++++++-
 apps/contacts/l10n/de.php    |  18 +-
 apps/contacts/l10n/el.php    |   7 +-
 apps/contacts/l10n/eo.php    |  28 +-
 apps/contacts/l10n/es.php    |   7 +-
 apps/contacts/l10n/et_EE.php |   7 +-
 apps/contacts/l10n/eu.php    |   7 +-
 apps/contacts/l10n/fa.php    |   7 +-
 apps/contacts/l10n/fi_FI.php | 109 ++++++++
 apps/contacts/l10n/fr.php    |   8 +-
 apps/contacts/l10n/he.php    |  38 ++-
 apps/contacts/l10n/hr.php    |  36 ++-
 apps/contacts/l10n/hu_HU.php |  41 ++-
 apps/contacts/l10n/ia.php    |   5 +-
 apps/contacts/l10n/it.php    |   7 +-
 apps/contacts/l10n/ja_JP.php | 122 ++++++++-
 apps/contacts/l10n/ko.php    |   2 +-
 apps/contacts/l10n/lb.php    |  17 +-
 apps/contacts/l10n/mk.php    |   7 +-
 apps/contacts/l10n/nb_NO.php |  20 +-
 apps/contacts/l10n/nl.php    |   7 +-
 apps/contacts/l10n/pl.php    | 103 +++++++-
 apps/contacts/l10n/pt_BR.php |  84 +++++-
 apps/contacts/l10n/pt_PT.php |  73 +++++-
 apps/contacts/l10n/ro.php    |  34 +++
 apps/contacts/l10n/ru.php    |  71 ++++-
 apps/contacts/l10n/sk_SK.php |   7 +-
 apps/contacts/l10n/sl.php    |   7 +-
 apps/contacts/l10n/sv.php    |  87 ++++++-
 apps/contacts/l10n/th_TH.php |   7 +-
 apps/contacts/l10n/tr.php    |   7 +-
 apps/contacts/l10n/zh_CN.php |  23 +-
 apps/contacts/l10n/zh_TW.php |  27 ++
 apps/files/l10n/ar.php       |   4 +-
 apps/files/l10n/bg_BG.php    |   4 +-
 apps/files/l10n/ca.php       |   5 +-
 apps/files/l10n/cs_CZ.php    |   5 +-
 apps/files/l10n/da.php       |  18 +-
 apps/files/l10n/de.php       |  20 +-
 apps/files/l10n/el.php       |   5 +-
 apps/files/l10n/eo.php       |   5 +-
 apps/files/l10n/es.php       |   5 +-
 apps/files/l10n/et_EE.php    |   5 +-
 apps/files/l10n/eu.php       |   5 +-
 apps/files/l10n/fa.php       |   5 +-
 apps/files/l10n/fi_FI.php    |  32 +++
 apps/files/l10n/fr.php       |   5 +-
 apps/files/l10n/gl.php       |  18 +-
 apps/files/l10n/he.php       |  27 +-
 apps/files/l10n/hr.php       |  27 +-
 apps/files/l10n/hu_HU.php    |   5 +-
 apps/files/l10n/ia.php       |   4 +-
 apps/files/l10n/id.php       |  31 ++-
 apps/files/l10n/it.php       |   5 +-
 apps/files/l10n/ja_JP.php    |  32 ++-
 apps/files/l10n/ko.php       |   5 +-
 apps/files/l10n/lb.php       |  27 +-
 apps/files/l10n/lt_LT.php    |   8 +-
 apps/files/l10n/mk.php       |   5 +-
 apps/files/l10n/ms_MY.php    |   4 +-
 apps/files/l10n/nb_NO.php    |   5 +-
 apps/files/l10n/nl.php       |   5 +-
 apps/files/l10n/nn_NO.php    |   4 +-
 apps/files/l10n/pl.php       |  18 +-
 apps/files/l10n/pt_BR.php    |   5 +-
 apps/files/l10n/pt_PT.php    |  18 +-
 apps/files/l10n/ro.php       |  18 +-
 apps/files/l10n/ru.php       |  18 +-
 apps/files/l10n/sk_SK.php    |   5 +-
 apps/files/l10n/sl.php       |   5 +-
 apps/files/l10n/sr.php       |   4 +-
 apps/files/l10n/sr@latin.php |   4 +-
 apps/files/l10n/sv.php       |  20 +-
 apps/files/l10n/th_TH.php    |   5 +-
 apps/files/l10n/tr.php       |   5 +-
 apps/files/l10n/uk.php       |   4 +-
 apps/files/l10n/zh_CN.php    |   5 +-
 apps/files/l10n/zh_TW.php    |  15 +-
 apps/gallery/l10n/ca.php     |   2 +-
 apps/gallery/l10n/cs_CZ.php  |   2 +-
 apps/gallery/l10n/da.php     |  10 +-
 apps/gallery/l10n/de.php     |   4 +-
 apps/gallery/l10n/el.php     |   6 +-
 apps/gallery/l10n/eo.php     |  10 +-
 apps/gallery/l10n/es.php     |   2 +-
 apps/gallery/l10n/et_EE.php  |   2 +-
 apps/gallery/l10n/eu.php     |   2 +-
 apps/gallery/l10n/fa.php     |   2 +-
 apps/gallery/l10n/fi_FI.php  |  12 +
 apps/gallery/l10n/fr.php     |   2 +-
 apps/gallery/l10n/gl.php     |  10 +-
 apps/gallery/l10n/hr.php     |  12 +
 apps/gallery/l10n/hu_HU.php  |   2 +-
 apps/gallery/l10n/id.php     |  12 +
 apps/gallery/l10n/it.php     |   2 +-
 apps/gallery/l10n/ja_JP.php  |  10 +-
 apps/gallery/l10n/ko.php     |   2 +-
 apps/gallery/l10n/lb.php     |  12 +
 apps/gallery/l10n/lt_LT.php  |  10 +-
 apps/gallery/l10n/mk.php     |   2 +-
 apps/gallery/l10n/nb_NO.php  |   2 +-
 apps/gallery/l10n/nl.php     |   2 +-
 apps/gallery/l10n/pl.php     |  10 +-
 apps/gallery/l10n/pt_BR.php  |   2 +-
 apps/gallery/l10n/pt_PT.php  |  10 +-
 apps/gallery/l10n/ro.php     |  10 +-
 apps/gallery/l10n/ru.php     |  10 +-
 apps/gallery/l10n/sk_SK.php  |   2 +-
 apps/gallery/l10n/sl.php     |   2 +-
 apps/gallery/l10n/sv.php     |  10 +-
 apps/gallery/l10n/th_TH.php  |   2 +-
 apps/gallery/l10n/tr.php     |   2 +-
 apps/gallery/l10n/zh_CN.php  |   2 +-
 apps/gallery/l10n/zh_TW.php  |   2 +-
 apps/media/l10n/fi_FI.php    |  13 +
 apps/media/l10n/ja_JP.php    |   2 +-
 core/l10n/da.php             |   7 +
 core/l10n/de.php             |   4 +-
 core/l10n/fi_FI.php          |  42 ++-
 core/l10n/gl.php             |   7 +
 core/l10n/he.php             |  16 +-
 core/l10n/hr.php             |  42 +--
 core/l10n/id.php             |  19 ++
 core/l10n/ja_JP.php          |  17 +-
 core/l10n/lb.php             |  12 +
 core/l10n/lt_LT.php          |   5 +
 core/l10n/nb_NO.php          |   7 +
 core/l10n/pl.php             |   7 +
 core/l10n/pt_PT.php          |   7 +
 core/l10n/ro.php             |   7 +
 core/l10n/ru.php             |   7 +
 core/l10n/sv.php             |   7 +
 l10n/af/calendar.po          |  34 ++-
 l10n/af/contacts.po          | 259 +++++++++++++++----
 l10n/af/core.po              |  88 ++++++-
 l10n/af/files.po             |  72 ++++--
 l10n/af/gallery.po           |  52 +++-
 l10n/af/media.po             |  10 +-
 l10n/af/settings.po          |  37 ++-
 l10n/ar/calendar.po          |  66 +++--
 l10n/ar/contacts.po          | 259 +++++++++++++++----
 l10n/ar/core.po              |  88 ++++++-
 l10n/ar/files.po             |  72 ++++--
 l10n/ar/gallery.po           |  52 +++-
 l10n/ar/media.po             |  18 +-
 l10n/ar/settings.po          |  41 ++-
 l10n/bg_BG/calendar.po       |  78 ++++--
 l10n/bg_BG/contacts.po       | 259 +++++++++++++++----
 l10n/bg_BG/core.po           |  88 ++++++-
 l10n/bg_BG/files.po          |  72 ++++--
 l10n/bg_BG/gallery.po        |  52 +++-
 l10n/bg_BG/media.po          |  18 +-
 l10n/bg_BG/settings.po       |  39 ++-
 l10n/ca/calendar.po          |  34 ++-
 l10n/ca/contacts.po          | 261 +++++++++++++++----
 l10n/ca/core.po              |  88 ++++++-
 l10n/ca/files.po             |  72 ++++--
 l10n/ca/gallery.po           |  52 +++-
 l10n/ca/media.po             |  18 +-
 l10n/ca/settings.po          |  41 ++-
 l10n/cs_CZ/calendar.po       |  34 ++-
 l10n/cs_CZ/contacts.po       | 269 +++++++++++++++----
 l10n/cs_CZ/core.po           |  88 ++++++-
 l10n/cs_CZ/files.po          |  72 ++++--
 l10n/cs_CZ/gallery.po        |  52 +++-
 l10n/cs_CZ/media.po          |  20 +-
 l10n/cs_CZ/settings.po       |  41 ++-
 l10n/da/calendar.po          | 121 +++++----
 l10n/da/contacts.po          | 448 +++++++++++++++++++++-----------
 l10n/da/core.po              | 103 +++++++-
 l10n/da/files.po             |  97 +++++--
 l10n/da/gallery.po           |  66 ++++-
 l10n/da/media.po             |  18 +-
 l10n/da/settings.po          |  60 +++--
 l10n/de/calendar.po          |  62 +++--
 l10n/de/contacts.po          | 288 ++++++++++++++++-----
 l10n/de/core.po              |  93 ++++++-
 l10n/de/files.po             |  89 +++++--
 l10n/de/gallery.po           |  55 +++-
 l10n/de/media.po             |  20 +-
 l10n/de/settings.po          |  46 +++-
 l10n/el/calendar.po          |  34 ++-
 l10n/el/contacts.po          | 261 +++++++++++++++----
 l10n/el/core.po              |  88 ++++++-
 l10n/el/files.po             |  72 ++++--
 l10n/el/gallery.po           |  57 +++-
 l10n/el/media.po             |  18 +-
 l10n/el/settings.po          |  41 ++-
 l10n/eo/calendar.po          |  34 ++-
 l10n/eo/contacts.po          | 307 ++++++++++++++++------
 l10n/eo/core.po              |  88 ++++++-
 l10n/eo/files.po             |  72 ++++--
 l10n/eo/gallery.po           |  64 ++++-
 l10n/eo/media.po             |  10 +-
 l10n/eo/settings.po          |  41 ++-
 l10n/es/calendar.po          |  34 ++-
 l10n/es/contacts.po          | 261 +++++++++++++++----
 l10n/es/core.po              |  88 ++++++-
 l10n/es/files.po             |  72 ++++--
 l10n/es/gallery.po           |  52 +++-
 l10n/es/media.po             |  10 +-
 l10n/es/settings.po          |  41 ++-
 l10n/et_EE/calendar.po       |  34 ++-
 l10n/et_EE/contacts.po       | 261 +++++++++++++++----
 l10n/et_EE/core.po           |  88 ++++++-
 l10n/et_EE/files.po          |  72 ++++--
 l10n/et_EE/gallery.po        |  52 +++-
 l10n/et_EE/media.po          |  18 +-
 l10n/et_EE/settings.po       |  41 ++-
 l10n/eu/calendar.po          |  34 ++-
 l10n/eu/contacts.po          | 263 +++++++++++++++----
 l10n/eu/core.po              |  88 ++++++-
 l10n/eu/files.po             |  72 ++++--
 l10n/eu/gallery.po           |  52 +++-
 l10n/eu/media.po             |  18 +-
 l10n/eu/settings.po          |  41 ++-
 l10n/fa/calendar.po          |  34 ++-
 l10n/fa/contacts.po          | 263 +++++++++++++++----
 l10n/fa/core.po              |  88 ++++++-
 l10n/fa/files.po             |  72 ++++--
 l10n/fa/gallery.po           |  52 +++-
 l10n/fa/media.po             |  10 +-
 l10n/fa/settings.po          |  41 ++-
 l10n/fi_FI/calendar.po       | 347 +++++++++++++------------
 l10n/fi_FI/contacts.po       | 489 +++++++++++++++++++++++------------
 l10n/fi_FI/core.po           | 170 ++++++++----
 l10n/fi_FI/files.po          | 130 +++++++---
 l10n/fi_FI/gallery.po        |  70 +++--
 l10n/fi_FI/media.po          |  41 +--
 l10n/fi_FI/settings.po       | 115 ++++----
 l10n/fr/calendar.po          |  34 ++-
 l10n/fr/contacts.po          | 266 +++++++++++++++----
 l10n/fr/core.po              |  88 ++++++-
 l10n/fr/files.po             |  72 ++++--
 l10n/fr/gallery.po           |  52 +++-
 l10n/fr/media.po             |  18 +-
 l10n/fr/settings.po          |  41 ++-
 l10n/gl/calendar.po          | 120 +++++----
 l10n/gl/contacts.po          | 259 +++++++++++++++----
 l10n/gl/core.po              | 100 ++++++-
 l10n/gl/files.po             |  96 +++++--
 l10n/gl/gallery.po           |  64 ++++-
 l10n/gl/media.po             |  20 +-
 l10n/gl/settings.po          |  59 +++--
 l10n/he/calendar.po          | 260 ++++++++++---------
 l10n/he/contacts.po          | 332 +++++++++++++++++-------
 l10n/he/core.po              | 116 +++++++--
 l10n/he/files.po             | 103 +++++---
 l10n/he/gallery.po           |  52 +++-
 l10n/he/media.po             |  18 +-
 l10n/he/settings.po          |  70 +++--
 l10n/hr/calendar.po          | 250 ++++++++++--------
 l10n/hr/contacts.po          | 326 +++++++++++++++++------
 l10n/hr/core.po              | 143 +++++++---
 l10n/hr/files.po             | 103 +++++---
 l10n/hr/gallery.po           |  69 +++--
 l10n/hr/media.po             |  18 +-
 l10n/hr/settings.po          |  70 +++--
 l10n/hu_HU/calendar.po       |  34 ++-
 l10n/hu_HU/contacts.po       | 300 +++++++++++++++------
 l10n/hu_HU/core.po           |  88 ++++++-
 l10n/hu_HU/files.po          |  72 ++++--
 l10n/hu_HU/gallery.po        |  52 +++-
 l10n/hu_HU/media.po          |  10 +-
 l10n/hu_HU/settings.po       |  41 ++-
 l10n/hy/calendar.po          |  80 ++++--
 l10n/hy/contacts.po          | 259 +++++++++++++++----
 l10n/hy/core.po              |  88 ++++++-
 l10n/hy/files.po             |  72 ++++--
 l10n/hy/gallery.po           |  52 +++-
 l10n/hy/media.po             |  18 +-
 l10n/hy/settings.po          |  37 ++-
 l10n/ia/calendar.po          |  34 ++-
 l10n/ia/contacts.po          | 261 +++++++++++++++----
 l10n/ia/core.po              |  88 ++++++-
 l10n/ia/files.po             |  72 ++++--
 l10n/ia/gallery.po           |  52 +++-
 l10n/ia/media.po             |  18 +-
 l10n/ia/settings.po          |  39 ++-
 l10n/id/calendar.po          |  78 ++++--
 l10n/id/contacts.po          | 259 +++++++++++++++----
 l10n/id/core.po              | 125 +++++++--
 l10n/id/files.po             | 111 +++++---
 l10n/id/gallery.po           |  69 +++--
 l10n/id/media.po             |  18 +-
 l10n/id/settings.po          |  70 +++--
 l10n/it/calendar.po          |  34 ++-
 l10n/it/contacts.po          | 261 +++++++++++++++----
 l10n/it/core.po              |  88 ++++++-
 l10n/it/files.po             |  72 ++++--
 l10n/it/gallery.po           |  52 +++-
 l10n/it/media.po             |  20 +-
 l10n/it/settings.po          |  41 ++-
 l10n/ja_JP/calendar.po       | 161 +++++++-----
 l10n/ja_JP/contacts.po       | 464 ++++++++++++++++++++++-----------
 l10n/ja_JP/core.po           | 111 ++++++--
 l10n/ja_JP/files.po          | 103 +++++---
 l10n/ja_JP/gallery.po        |  65 ++++-
 l10n/ja_JP/media.po          |  21 +-
 l10n/ja_JP/settings.po       |  86 +++---
 l10n/ko/calendar.po          |  34 ++-
 l10n/ko/contacts.po          | 259 +++++++++++++++----
 l10n/ko/core.po              |  88 ++++++-
 l10n/ko/files.po             |  72 ++++--
 l10n/ko/gallery.po           |  52 +++-
 l10n/ko/media.po             |  20 +-
 l10n/ko/settings.po          |  41 ++-
 l10n/lb/calendar.po          | 174 +++++++------
 l10n/lb/contacts.po          | 291 ++++++++++++++++-----
 l10n/lb/core.po              | 112 ++++++--
 l10n/lb/files.po             | 104 +++++---
 l10n/lb/gallery.po           |  69 +++--
 l10n/lb/media.po             |  18 +-
 l10n/lb/settings.po          |  71 +++--
 l10n/lt_LT/calendar.po       | 114 ++++----
 l10n/lt_LT/contacts.po       | 259 +++++++++++++++----
 l10n/lt_LT/core.po           |  96 ++++++-
 l10n/lt_LT/files.po          |  80 ++++--
 l10n/lt_LT/gallery.po        |  64 ++++-
 l10n/lt_LT/media.po          |  18 +-
 l10n/lt_LT/settings.po       |  55 ++--
 l10n/mk/calendar.po          |  34 ++-
 l10n/mk/contacts.po          | 261 +++++++++++++++----
 l10n/mk/core.po              |  88 ++++++-
 l10n/mk/files.po             |  72 ++++--
 l10n/mk/gallery.po           |  52 +++-
 l10n/mk/media.po             |  20 +-
 l10n/mk/settings.po          |  41 ++-
 l10n/ms_MY/calendar.po       |  66 +++--
 l10n/ms_MY/contacts.po       | 259 +++++++++++++++----
 l10n/ms_MY/core.po           |  88 ++++++-
 l10n/ms_MY/files.po          |  72 ++++--
 l10n/ms_MY/gallery.po        |  52 +++-
 l10n/ms_MY/media.po          |  18 +-
 l10n/ms_MY/settings.po       |  41 ++-
 l10n/nb_NO/calendar.po       |  37 ++-
 l10n/nb_NO/contacts.po       | 285 +++++++++++++++-----
 l10n/nb_NO/core.po           | 102 +++++++-
 l10n/nb_NO/files.po          |  72 ++++--
 l10n/nb_NO/gallery.po        |  52 +++-
 l10n/nb_NO/media.po          |  18 +-
 l10n/nb_NO/settings.po       |  41 ++-
 l10n/nl/calendar.po          |  34 ++-
 l10n/nl/contacts.po          | 263 +++++++++++++++----
 l10n/nl/core.po              |  88 ++++++-
 l10n/nl/files.po             |  72 ++++--
 l10n/nl/gallery.po           |  52 +++-
 l10n/nl/media.po             |  18 +-
 l10n/nl/settings.po          |  41 ++-
 l10n/nn_NO/calendar.po       |  66 +++--
 l10n/nn_NO/contacts.po       | 259 +++++++++++++++----
 l10n/nn_NO/core.po           |  88 ++++++-
 l10n/nn_NO/files.po          |  72 ++++--
 l10n/nn_NO/gallery.po        |  52 +++-
 l10n/nn_NO/media.po          |  18 +-
 l10n/nn_NO/settings.po       |  41 ++-
 l10n/pl/calendar.po          | 120 +++++----
 l10n/pl/contacts.po          | 452 +++++++++++++++++++++-----------
 l10n/pl/core.po              | 100 ++++++-
 l10n/pl/files.po             |  97 +++++--
 l10n/pl/gallery.po           |  64 ++++-
 l10n/pl/media.po             |  20 +-
 l10n/pl/settings.po          |  59 +++--
 l10n/pt_BR/calendar.po       |  34 ++-
 l10n/pt_BR/contacts.po       | 407 ++++++++++++++++++++---------
 l10n/pt_BR/core.po           |  88 ++++++-
 l10n/pt_BR/files.po          |  72 ++++--
 l10n/pt_BR/gallery.po        |  52 +++-
 l10n/pt_BR/media.po          |  18 +-
 l10n/pt_BR/settings.po       |  41 ++-
 l10n/pt_PT/calendar.po       | 121 +++++----
 l10n/pt_PT/contacts.po       | 395 +++++++++++++++++++---------
 l10n/pt_PT/core.po           | 101 +++++++-
 l10n/pt_PT/files.po          |  97 +++++--
 l10n/pt_PT/gallery.po        |  65 ++++-
 l10n/pt_PT/media.po          |  20 +-
 l10n/pt_PT/settings.po       |  59 +++--
 l10n/ro/calendar.po          | 121 +++++----
 l10n/ro/contacts.po          | 324 +++++++++++++++++------
 l10n/ro/core.po              | 101 +++++++-
 l10n/ro/files.po             |  97 +++++--
 l10n/ro/gallery.po           |  65 ++++-
 l10n/ro/media.po             |  20 +-
 l10n/ro/settings.po          |  60 +++--
 l10n/ru/calendar.po          | 116 +++++----
 l10n/ru/contacts.po          | 392 +++++++++++++++++++---------
 l10n/ru/core.po              | 101 +++++++-
 l10n/ru/files.po             |  97 +++++--
 l10n/ru/gallery.po           |  65 ++++-
 l10n/ru/media.po             |  18 +-
 l10n/ru/settings.po          |  62 +++--
 l10n/sk_SK/calendar.po       |  34 ++-
 l10n/sk_SK/contacts.po       | 263 +++++++++++++++----
 l10n/sk_SK/core.po           |  88 ++++++-
 l10n/sk_SK/files.po          |  72 ++++--
 l10n/sk_SK/gallery.po        |  52 +++-
 l10n/sk_SK/media.po          |  20 +-
 l10n/sk_SK/settings.po       |  41 ++-
 l10n/sl/calendar.po          |  34 ++-
 l10n/sl/contacts.po          | 261 +++++++++++++++----
 l10n/sl/core.po              |  88 ++++++-
 l10n/sl/files.po             |  72 ++++--
 l10n/sl/gallery.po           |  52 +++-
 l10n/sl/media.po             |  20 +-
 l10n/sl/settings.po          |  41 ++-
 l10n/sr/calendar.po          |  66 +++--
 l10n/sr/contacts.po          | 259 +++++++++++++++----
 l10n/sr/core.po              |  88 ++++++-
 l10n/sr/files.po             |  72 ++++--
 l10n/sr/gallery.po           |  52 +++-
 l10n/sr/media.po             |  18 +-
 l10n/sr/settings.po          |  39 ++-
 l10n/sr@latin/calendar.po    |  66 +++--
 l10n/sr@latin/contacts.po    | 259 +++++++++++++++----
 l10n/sr@latin/core.po        |  88 ++++++-
 l10n/sr@latin/files.po       |  72 ++++--
 l10n/sr@latin/gallery.po     |  52 +++-
 l10n/sr@latin/media.po       |  18 +-
 l10n/sr@latin/settings.po    |  39 ++-
 l10n/sv/calendar.po          | 121 +++++----
 l10n/sv/contacts.po          | 421 ++++++++++++++++++++----------
 l10n/sv/core.po              | 101 +++++++-
 l10n/sv/files.po             | 100 ++++---
 l10n/sv/gallery.po           |  65 ++++-
 l10n/sv/media.po             |  18 +-
 l10n/sv/settings.po          |  60 +++--
 l10n/templates/bookmarks.pot |   4 +-
 l10n/templates/calendar.pot  |  30 ++-
 l10n/templates/contacts.pot  | 256 ++++++++++++++----
 l10n/templates/core.pot      |  84 +++++-
 l10n/templates/files.pot     |  68 ++++-
 l10n/templates/gallery.pot   |  48 +++-
 l10n/templates/media.pot     |   6 +-
 l10n/templates/settings.pot  |  33 ++-
 l10n/th_TH/calendar.po       |  34 ++-
 l10n/th_TH/contacts.po       | 261 +++++++++++++++----
 l10n/th_TH/core.po           |  88 ++++++-
 l10n/th_TH/files.po          |  72 ++++--
 l10n/th_TH/gallery.po        |  52 +++-
 l10n/th_TH/media.po          |  24 +-
 l10n/th_TH/settings.po       |  41 ++-
 l10n/tr/calendar.po          |  34 ++-
 l10n/tr/contacts.po          | 261 +++++++++++++++----
 l10n/tr/core.po              |  88 ++++++-
 l10n/tr/files.po             |  72 ++++--
 l10n/tr/gallery.po           |  52 +++-
 l10n/tr/media.po             |  18 +-
 l10n/tr/settings.po          |  41 ++-
 l10n/uk/calendar.po          |  66 +++--
 l10n/uk/contacts.po          | 259 +++++++++++++++----
 l10n/uk/core.po              |  88 ++++++-
 l10n/uk/files.po             |  72 ++++--
 l10n/uk/gallery.po           |  52 +++-
 l10n/uk/media.po             |  24 +-
 l10n/uk/settings.po          |  37 ++-
 l10n/zh_CN/calendar.po       |  42 ++-
 l10n/zh_CN/contacts.po       | 296 ++++++++++++++++-----
 l10n/zh_CN/core.po           |  88 ++++++-
 l10n/zh_CN/files.po          |  72 ++++--
 l10n/zh_CN/gallery.po        |  52 +++-
 l10n/zh_CN/media.po          |  18 +-
 l10n/zh_CN/settings.po       |  60 +++--
 l10n/zh_TW/calendar.po       |  85 +++---
 l10n/zh_TW/contacts.po       | 314 ++++++++++++++++------
 l10n/zh_TW/core.po           |  88 ++++++-
 l10n/zh_TW/files.po          |  89 +++++--
 l10n/zh_TW/gallery.po        |  52 +++-
 l10n/zh_TW/media.po          |  20 +-
 l10n/zh_TW/settings.po       |  41 ++-
 settings/l10n/ar.php         |   3 +-
 settings/l10n/bg_BG.php      |   2 +-
 settings/l10n/ca.php         |   3 +-
 settings/l10n/cs_CZ.php      |   3 +-
 settings/l10n/da.php         |  12 +-
 settings/l10n/de.php         |   7 +-
 settings/l10n/el.php         |   3 +-
 settings/l10n/eo.php         |   3 +-
 settings/l10n/es.php         |   3 +-
 settings/l10n/et_EE.php      |   3 +-
 settings/l10n/eu.php         |   3 +-
 settings/l10n/fa.php         |   3 +-
 settings/l10n/fi_FI.php      |  42 +++
 settings/l10n/fr.php         |   3 +-
 settings/l10n/gl.php         |  12 +-
 settings/l10n/he.php         |  17 +-
 settings/l10n/hr.php         |  17 +-
 settings/l10n/hu_HU.php      |   3 +-
 settings/l10n/ia.php         |   2 +-
 settings/l10n/id.php         |  17 +-
 settings/l10n/it.php         |   3 +-
 settings/l10n/ja_JP.php      |  36 ++-
 settings/l10n/ko.php         |   3 +-
 settings/l10n/lb.php         |  17 +-
 settings/l10n/lt_LT.php      |  10 +-
 settings/l10n/mk.php         |   3 +-
 settings/l10n/ms_MY.php      |   3 +-
 settings/l10n/nb_NO.php      |   3 +-
 settings/l10n/nl.php         |   3 +-
 settings/l10n/nn_NO.php      |   3 +-
 settings/l10n/pl.php         |  12 +-
 settings/l10n/pt_BR.php      |   3 +-
 settings/l10n/pt_PT.php      |  12 +-
 settings/l10n/ro.php         |  12 +-
 settings/l10n/ru.php         |  12 +-
 settings/l10n/sk_SK.php      |   3 +-
 settings/l10n/sl.php         |   3 +-
 settings/l10n/sr.php         |   2 +-
 settings/l10n/sr@latin.php   |   2 +-
 settings/l10n/sv.php         |  12 +-
 settings/l10n/th_TH.php      |   3 +-
 settings/l10n/tr.php         |   3 +-
 settings/l10n/zh_CN.php      |  12 +-
 settings/l10n/zh_TW.php      |   3 +-
 533 files changed, 27428 insertions(+), 8219 deletions(-)
 mode change 100644 => 100755 .htaccess
 create mode 100644 apps/calendar/l10n/fi_FI.php
 create mode 100644 apps/contacts/l10n/fi_FI.php
 create mode 100644 apps/files/l10n/fi_FI.php
 create mode 100644 apps/gallery/l10n/fi_FI.php
 create mode 100644 apps/gallery/l10n/hr.php
 create mode 100644 apps/gallery/l10n/id.php
 create mode 100644 apps/gallery/l10n/lb.php
 create mode 100644 apps/media/l10n/fi_FI.php
 create mode 100644 settings/l10n/fi_FI.php

diff --git a/.htaccess b/.htaccess
old mode 100644
new mode 100755
index 095a0cc637..11ee1d59f8
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,8 @@
 ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
-php_value upload_max_filesize 512M
-php_value post_max_size 512M
+php_value upload_max_filesize 513M
+php_value post_max_size 513M
 php_value memory_limit 512M
 <IfModule env_module>
   SetEnv htaccessWorking true
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index 5154ef1096..36551a2a93 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Der blev ikke fundet nogen kalendere.",
+"No events found." => "Der blev ikke fundet nogen begivenheder.",
 "Wrong calendar" => "Forkert kalender",
 "New Timezone:" => "Ny tidszone:",
 "Timezone changed" => "Tidszone ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Calendar" => "Kalender",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}",
 "Birthday" => "Fødselsdag",
 "Business" => "Forretning",
 "Call" => "Ring",
@@ -19,6 +22,7 @@
 "Projects" => "Projekter",
 "Questions" => "Spørgsmål",
 "Work" => "Arbejde",
+"unnamed" => "unavngivet",
 "Does not repeat" => "Gentages ikke",
 "Daily" => "Daglig",
 "Weekly" => "Ugentlig",
@@ -80,10 +84,15 @@
 "Calendars" => "Kalendere",
 "There was a fail, while parsing the file." => "Der opstod en fejl under gennemlæsning af filen.",
 "Choose active calendars" => "Vælg aktive kalendere",
+"Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-link",
+"Shared calendars" => "Delte kalendere",
+"No shared calendars" => "Ingen delte kalendere",
+"Share Calendar" => "Del kalender",
 "Download" => "Hent",
 "Edit" => "Rediger",
 "Delete" => "Slet",
+"shared with you by" => "delt af dig",
 "New calendar" => "Ny kalender",
 "Edit calendar" => "Rediger kalender",
 "Displayname" => "Vist navn",
@@ -94,8 +103,15 @@
 "Cancel" => "Annuller",
 "Edit an event" => "Redigér en begivenhed",
 "Export" => "Eksporter",
+"Eventinfo" => "Begivenhedsinfo",
+"Repeating" => "Gentagende",
+"Alarm" => "Alarm",
+"Attendees" => "Deltagere",
+"Share" => "Del",
 "Title of the Event" => "Titel på begivenheden",
 "Category" => "Kategori",
+"Separate categories with commas" => "Opdel kategorier med kommaer",
+"Edit categories" => "Rediger kategorier",
 "All Day Event" => "Heldagsarrangement",
 "From" => "Fra",
 "To" => "Til",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Kalender importeret korrekt",
 "Close Dialog" => "Luk dialog",
 "Create a new event" => "Opret en ny begivenhed",
+"View an event" => "Vis en begivenhed",
+"No categories selected" => "Ingen categorier valgt",
 "Select category" => "Vælg kategori",
+"of" => "fra",
+"at" => "kl.",
 "Timezone" => "Tidszone",
 "Check always for changes of the timezone" => "Check altid efter ændringer i tidszone",
 "Timeformat" => "Tidsformat",
 "24h" => "24T",
 "12h" => "12T",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:"
+"First day of the week" => "Ugens første dag",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:",
+"Users" => "Brugere",
+"select users" => "Vælg brugere",
+"Editable" => "Redigerbar",
+"Groups" => "Grupper",
+"select groups" => "Vælg grupper",
+"make public" => "Offentliggør"
 );
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 34e6f05f10..f12a18baad 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -4,8 +4,9 @@
 "Wrong calendar" => "Falscher Kalender",
 "New Timezone:" => "Neue Zeitzone:",
 "Timezone changed" => "Zeitzone geändert",
-"Invalid request" => "Anfragefehler",
+"Invalid request" => "Fehlerhafte Anfrage",
 "Calendar" => "Kalender",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}",
 "Birthday" => "Geburtstag",
 "Business" => "Geschäftlich",
 "Call" => "Anruf",
@@ -30,7 +31,7 @@
 "Monthly" => "monatlich",
 "Yearly" => "jährlich",
 "never" => "niemals",
-"by occurrences" => "nach Vorkommen",
+"by occurrences" => "nach Terminen",
 "by date" => "nach Datum",
 "by monthday" => "an einem Monatstag",
 "by weekday" => "an einem Wochentag",
@@ -60,10 +61,10 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
-"by events date" => "bei Tag des Termins",
-"by yearday(s)" => "an einem Tag des Jahres",
-"by weeknumber(s)" => "an einer Wochennummer",
-"by day and month" => "an einer Tag und Monats Kombination",
+"by events date" => "nach Tag des Termins",
+"by yearday(s)" => "nach Tag des Jahres",
+"by weeknumber(s)" => "nach Wochennummer",
+"by day and month" => "nach Tag und Monat",
 "Date" => "Datum",
 "Cal." => "Kal.",
 "All day" => "Ganztags",
@@ -91,7 +92,7 @@
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
 "Delete" => "Löschen",
-"shared with you by" => "Von dir geteilt mit",
+"shared with you by" => "Geteilt mit dir von",
 "New calendar" => "Neuer Kalender",
 "Edit calendar" => "Kalender bearbeiten",
 "Displayname" => "Anzeigename",
@@ -109,7 +110,7 @@
 "Share" => "Teilen",
 "Title of the Event" => "Name",
 "Category" => "Kategorie",
-"Separate categories with commas" => "Kategorien trennen mittels Komma",
+"Separate categories with commas" => "Kategorien mit Kommas trennen",
 "Edit categories" => "Kategorien ändern",
 "All Day Event" => "Ganztägiges Ereignis",
 "From" => "von",
@@ -130,8 +131,8 @@
 "and the events week of year." => "und den Tag des Jahres vom Termin",
 "Interval" => "Intervall",
 "End" => "Ende",
-"occurrences" => "Vorkommen",
-"Import a calendar file" => "Kalender Datei Importieren",
+"occurrences" => "Termine",
+"Import a calendar file" => "Kalenderdatei Importieren",
 "Please choose the calendar" => "Bitte wählen Sie den Kalender.",
 "create a new calendar" => "Neuen Kalender anlegen",
 "Name of new calendar" => "Kalendername",
@@ -144,6 +145,7 @@
 "No categories selected" => "Keine Kategorie ausgewählt",
 "Select category" => "Kategorie auswählen",
 "of" => "von",
+"at" => "um",
 "Timezone" => "Zeitzone",
 "Check always for changes of the timezone" => "immer die Zeitzone überprüfen",
 "Timeformat" => "Zeitformat",
@@ -152,9 +154,9 @@
 "First day of the week" => "erster Wochentag",
 "Calendar CalDAV syncing address:" => "Kalender CalDAV Synchronisationsadresse:",
 "Users" => "Nutzer",
-"select users" => "gewählte Nutzer",
+"select users" => "Nutzer auswählen",
 "Editable" => "editierbar",
 "Groups" => "Gruppen",
-"select groups" => "Wähle Gruppen",
+"select groups" => "Gruppen auswählen",
 "make public" => "Veröffentlichen"
 );
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
new file mode 100644
index 0000000000..4de94b7b7b
--- /dev/null
+++ b/apps/calendar/l10n/fi_FI.php
@@ -0,0 +1,138 @@
+<?php $TRANSLATIONS = array(
+"No calendars found." => "Kalentereita ei löytynyt",
+"No events found." => "Tapahtumia ei löytynyt.",
+"Wrong calendar" => "Väärä kalenteri",
+"New Timezone:" => "Uusi aikavyöhyke:",
+"Timezone changed" => "Aikavyöhyke vaihdettu",
+"Invalid request" => "Virheellinen pyyntö",
+"Calendar" => "Kalenteri",
+"Birthday" => "Syntymäpäivä",
+"Call" => "Ota yhteyttä",
+"Clients" => "Asiakkaat",
+"Deliverer" => "Toimittaja",
+"Holidays" => "Vapaapäivät",
+"Ideas" => "Ideat",
+"Journey" => "Matkustus",
+"Jubilee" => "Vuosipäivät",
+"Meeting" => "Tapaamiset",
+"Other" => "Muut",
+"Personal" => "Henkilökohtainen",
+"Projects" => "Projektit",
+"Questions" => "Kysymykset",
+"Work" => "Työ",
+"unnamed" => "nimetön",
+"Does not repeat" => "Ei toistoa",
+"Daily" => "Päivittäin",
+"Weekly" => "Viikottain",
+"Every Weekday" => "Arkipäivisin",
+"Bi-Weekly" => "Joka toinen viikko",
+"Monthly" => "Kuukausittain",
+"Yearly" => "Vuosittain",
+"never" => "Ei koskaan",
+"Monday" => "Maanantai",
+"Tuesday" => "Tiistai",
+"Wednesday" => "Keskiviikko",
+"Thursday" => "Torstai",
+"Friday" => "Perjantai",
+"Saturday" => "Lauantai",
+"Sunday" => "Sunnuntai",
+"first" => "ensimmäinen",
+"second" => "toinen",
+"third" => "kolmas",
+"fourth" => "neljäs",
+"fifth" => "viides",
+"last" => "viimeinen",
+"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",
+"Date" => "Päivämäärä",
+"All day" => "Koko päivä",
+"New Calendar" => "Uusi kalenteri",
+"Missing fields" => "Puuttuvat kentät",
+"Title" => "Otsikko",
+"The event ends before it starts" => "Tapahtuma päättyy ennen alkamistaan",
+"There was a database fail" => "Tapahtui tietokantavirhe",
+"Week" => "Viikko",
+"Month" => "Kuukausi",
+"List" => "Lista",
+"Today" => "Tänään",
+"Calendars" => "Kalenterit",
+"There was a fail, while parsing the file." => "Tiedostoa jäsennettäessä tapahtui virhe.",
+"Choose active calendars" => "Valitse aktiiviset kalenterit",
+"Your calendars" => "Omat kalenterisi",
+"CalDav Link" => "CalDav-linkki",
+"Shared calendars" => "Jaetut kalenterit",
+"No shared calendars" => "Ei jaettuja kalentereita",
+"Share Calendar" => "Jaa kalenteri",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"Delete" => "Poista",
+"shared with you by" => "kanssasi jaettu",
+"New calendar" => "Uusi kalenteri",
+"Edit calendar" => "Muokkaa kalenteria",
+"Displayname" => "Kalenterin nimi",
+"Active" => "Aktiivinen",
+"Calendar color" => "Kalenterin väri",
+"Save" => "Tallenna",
+"Submit" => "Talleta",
+"Cancel" => "Peru",
+"Edit an event" => "Muokkaa tapahtumaa",
+"Export" => "Vie",
+"Eventinfo" => "Tapahtumatiedot",
+"Repeating" => "Toisto",
+"Alarm" => "Hälytys",
+"Attendees" => "Osallistujat",
+"Share" => "Jaa",
+"Title of the Event" => "Tapahtuman otsikko",
+"Category" => "Luokka",
+"Separate categories with commas" => "Erota luokat pilkuilla",
+"Edit categories" => "Muokkaa luokkia",
+"All Day Event" => "Koko päivän tapahtuma",
+"From" => "Alkaa",
+"To" => "Päättyy",
+"Advanced options" => "Tarkemmat asetukset",
+"Location" => "Sijainti",
+"Location of the Event" => "Tapahtuman sijainti",
+"Description" => "Kuvaus",
+"Description of the Event" => "Tapahtuman kuvaus",
+"Repeat" => "Toisto",
+"Select weekdays" => "Valitse viikonpäivät",
+"Select days" => "Valitse päivät",
+"Select months" => "Valitse kuukaudet",
+"Select weeks" => "Valitse viikot",
+"Interval" => "Intervalli",
+"Import a calendar file" => "Tuo kalenteritiedosto",
+"Please choose the calendar" => "Valitse kalenteri",
+"create a new calendar" => "luo uusi kalenteri",
+"Name of new calendar" => "Uuden kalenterin nimi",
+"Import" => "Tuo",
+"Importing calendar" => "Tuodaan kalenteria",
+"Calendar imported successfully" => "Kalenteri tuotu onnistuneesti",
+"Close Dialog" => "Sulje ikkuna",
+"Create a new event" => "Luo uusi tapahtuma",
+"View an event" => "Avaa tapahtuma",
+"No categories selected" => "Luokkia ei ole valittu",
+"Select category" => "Valitse luokka",
+"Timezone" => "Aikavyöhyke",
+"Check always for changes of the timezone" => "Tarkista aina aikavyöhykkeen muutokset",
+"Timeformat" => "Ajan esitysmuoto",
+"24h" => "24 tuntia",
+"12h" => "12 tuntia",
+"First day of the week" => "Viikon ensimmäinen päivä",
+"Calendar CalDAV syncing address:" => "Kalenterin CalDAV-synkronointiosoite:",
+"Users" => "Käyttäjät",
+"select users" => "valitse käyttäjät",
+"Editable" => "Muoktattava",
+"Groups" => "Ryhmät",
+"select groups" => "valitse ryhmät",
+"make public" => "aseta julkiseksi"
+);
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
index 7c747be26f..3178b1819e 100644
--- a/apps/calendar/l10n/gl.php
+++ b/apps/calendar/l10n/gl.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Non se atoparon calendarios.",
+"No events found." => "Non se atoparon eventos.",
 "Wrong calendar" => "Calendario equivocado",
 "New Timezone:" => "Novo fuso horario:",
 "Timezone changed" => "Fuso horario trocado",
 "Invalid request" => "Petición non válida",
 "Calendar" => "Calendario",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}",
 "Birthday" => "Aniversario",
 "Business" => "Traballo",
 "Call" => "Chamada",
@@ -19,6 +22,7 @@
 "Projects" => "Proxectos",
 "Questions" => "Preguntas",
 "Work" => "Traballo",
+"unnamed" => "sen nome",
 "Does not repeat" => "Non se repite",
 "Daily" => "A diario",
 "Weekly" => "Semanalmente",
@@ -80,10 +84,15 @@
 "Calendars" => "Calendarios",
 "There was a fail, while parsing the file." => "Produciuse un erro ao procesar o ficheiro",
 "Choose active calendars" => "Escolla os calendarios activos",
+"Your calendars" => "Os seus calendarios",
 "CalDav Link" => "Ligazón CalDav",
+"Shared calendars" => "Calendarios compartidos",
+"No shared calendars" => "Sen calendarios compartidos",
+"Share Calendar" => "Compartir calendario",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Borrar",
+"shared with you by" => "compartido con vostede por",
 "New calendar" => "Novo calendario",
 "Edit calendar" => "Editar calendario",
 "Displayname" => "Mostrar nome",
@@ -94,8 +103,15 @@
 "Cancel" => "Cancelar",
 "Edit an event" => "Editar un evento",
 "Export" => "Exportar",
+"Eventinfo" => "Info do evento",
+"Repeating" => "Repetido",
+"Alarm" => "Alarma",
+"Attendees" => "Participantes",
+"Share" => "Compartir",
 "Title of the Event" => "Título do evento",
 "Category" => "Categoría",
+"Separate categories with commas" => "Separe as categorías con comas",
+"Edit categories" => "Editar categorías",
 "All Day Event" => "Eventos do día",
 "From" => "Desde",
 "To" => "a",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Calendario importado correctamente",
 "Close Dialog" => "Pechar diálogo",
 "Create a new event" => "Crear un novo evento",
+"View an event" => "Ver un evento",
+"No categories selected" => "Non seleccionou as categorías",
 "Select category" => "Seleccionar categoría",
+"of" => "de",
+"at" => "a",
 "Timezone" => "Fuso horario",
 "Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
 "Timeformat" => "Formato de hora",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Enderezo de sincronización do calendario CalDAV:"
+"First day of the week" => "Primeiro día da semana",
+"Calendar CalDAV syncing address:" => "Enderezo de sincronización do calendario CalDAV:",
+"Users" => "Usuarios",
+"select users" => "escoller usuarios",
+"Editable" => "Editable",
+"Groups" => "Grupos",
+"select groups" => "escoller grupos",
+"make public" => "facer público"
 );
diff --git a/apps/calendar/l10n/he.php b/apps/calendar/l10n/he.php
index d8bd1c5f00..c161d3be2e 100644
--- a/apps/calendar/l10n/he.php
+++ b/apps/calendar/l10n/he.php
@@ -1,8 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "לא נמצאו לוחות שנה.",
+"No events found." => "לא נמצאו אירועים.",
 "Wrong calendar" => "לוח שנה לא נכון",
+"New Timezone:" => "אזור זמן חדש:",
 "Timezone changed" => "אזור זמן השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Calendar" => "ח שנה",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}",
 "Birthday" => "יום הולדת",
 "Business" => "עסקים",
 "Call" => "שיחה",
@@ -18,6 +22,7 @@
 "Projects" => "פרוייקטים",
 "Questions" => "שאלות",
 "Work" => "עבודה",
+"unnamed" => "ללא שם",
 "Does not repeat" => "ללא חזרה",
 "Daily" => "יומי",
 "Weekly" => "שבועי",
@@ -25,9 +30,53 @@
 "Bi-Weekly" => "דו שבועי",
 "Monthly" => "חודשי",
 "Yearly" => "שנתי",
+"never" => "לעולם לא",
+"by occurrences" => "לפי מופעים",
+"by date" => "לפי תאריך",
+"by monthday" => "לפי היום בחודש",
+"by weekday" => "לפי היום בשבוע",
+"Monday" => "יום שני",
+"Tuesday" => "יום שלישי",
+"Wednesday" => "יום רביעי",
+"Thursday" => "יום חמישי",
+"Friday" => "יום שישי",
+"Saturday" => "שבת",
+"Sunday" => "יום ראשון",
+"events week of month" => "שבוע בחודש לציון הפעילות",
+"first" => "ראשון",
+"second" => "שני",
+"third" => "שלישי",
+"fourth" => "רביעי",
+"fifth" => "חמישי",
+"last" => "אחרון",
+"January" => "ינואר",
+"February" => "פברואר",
+"March" => "מרץ",
+"April" => "אפריל",
+"May" => "מאי",
+"June" => "יוני",
+"July" => "יולי",
+"August" => "אוגוסט",
+"September" => "ספטמבר",
+"October" => "אוקטובר",
+"November" => "נובמבר",
+"December" => "דצמבר",
+"by events date" => "לפי תאריכי האירועים",
+"by yearday(s)" => "לפי ימים בשנה",
+"by weeknumber(s)" => "לפי מספרי השבועות",
+"by day and month" => "לפי יום וחודש",
+"Date" => "תאריך",
+"Cal." => "לוח שנה",
 "All day" => "היום",
 "New Calendar" => "לוח שנה חדש",
+"Missing fields" => "שדות חסרים",
 "Title" => "כותרת",
+"From Date" => "מתאריך",
+"From Time" => "משעה",
+"To Date" => "עד תאריך",
+"To Time" => "עד שעה",
+"The event ends before it starts" => "האירוע מסתיים עוד לפני שהתחיל",
+"There was a database fail" => "אירע כשל במסד הנתונים",
 "Week" => "שבוע",
 "Month" => "חודש",
 "List" => "רשימה",
@@ -35,10 +84,15 @@
 "Calendars" => "לוחות שנה",
 "There was a fail, while parsing the file." => "אירעה שגיאה בעת פענוח הקובץ.",
 "Choose active calendars" => "בחר לוחות שנה פעילים",
+"Your calendars" => "לוחות השנה שלך",
 "CalDav Link" => "קישור CalDav",
+"Shared calendars" => "לוחות שנה מושתפים",
+"No shared calendars" => "אין לוחות שנה משותפים",
+"Share Calendar" => "שיתוף לוח שנה",
 "Download" => "הורדה",
 "Edit" => "עריכה",
 "Delete" => "מחיקה",
+"shared with you by" => "שותף אתך על ידי",
 "New calendar" => "לוח שנה חדש",
 "Edit calendar" => "עריכת לוח שנה",
 "Displayname" => "שם תצוגה",
@@ -49,18 +103,60 @@
 "Cancel" => "ביטול",
 "Edit an event" => "עריכת אירוע",
 "Export" => "יצוא",
+"Eventinfo" => "פרטי האירוע",
+"Repeating" => "חוזר",
+"Alarm" => "תזכורת",
+"Attendees" => "משתתפים",
+"Share" => "שיתוף",
 "Title of the Event" => "כותרת האירוע",
 "Category" => "קטגוריה",
+"Separate categories with commas" => "הפרדת קטגוריות בפסיק",
+"Edit categories" => "עריכת קטגוריות",
 "All Day Event" => "אירוע של כל היום",
 "From" => "מאת",
 "To" => "עבור",
+"Advanced options" => "אפשרויות מתקדמות",
 "Location" => "מיקום",
 "Location of the Event" => "מיקום האירוע",
 "Description" => "תיאור",
 "Description of the Event" => "תיאור האירוע",
 "Repeat" => "חזרה",
+"Advanced" => "מתקדם",
+"Select weekdays" => "יש לבחור ימים בשבוע",
+"Select days" => "יש לבחור בימים",
+"and the events day of year." => "ויום האירוע בשנה.",
+"and the events day of month." => "ויום האירוע בחודש.",
+"Select months" => "יש לבחור בחודשים",
+"Select weeks" => "יש לבחור בשבועות",
+"and the events week of year." => "ומספור השבוע הפעיל בשנה.",
+"Interval" => "משך",
+"End" => "סיום",
+"occurrences" => "מופעים",
+"Import a calendar file" => "יבוא קובץ לוח שנה",
+"Please choose the calendar" => "נא לבחור את לוח השנה",
+"create a new calendar" => "יצירת לוח שנה חדש",
+"Name of new calendar" => "שם לוח השנה החדש",
 "Import" => "יבוא",
+"Importing calendar" => "היומן מייובא",
+"Calendar imported successfully" => "היומן ייובא בהצלחה",
+"Close Dialog" => "סגירת הדו־שיח",
 "Create a new event" => "יצירת אירוע חדש",
+"View an event" => "צפייה באירוע",
+"No categories selected" => "לא נבחרו קטגוריות",
 "Select category" => "בחר קטגוריה",
-"Timezone" => "אזור זמן"
+"of" => "מתוך",
+"at" => "בשנה",
+"Timezone" => "אזור זמן",
+"Check always for changes of the timezone" => "יש לבדוק תמיד אם יש הבדלים באזורי הזמן",
+"Timeformat" => "מבנה התאריך",
+"24h" => "24 שעות",
+"12h" => "12 שעות",
+"First day of the week" => "היום הראשון בשבוע",
+"Calendar CalDAV syncing address:" => "כתובת הסנכרון ללוח שנה מסוג CalDAV:",
+"Users" => "משתמשים",
+"select users" => "נא לבחור במשתמשים",
+"Editable" => "ניתן לעריכה",
+"Groups" => "קבוצות",
+"select groups" => "בחירת קבוצות",
+"make public" => "הפיכה לציבורי"
 );
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
index 2b2efacd31..551bb4abbc 100644
--- a/apps/calendar/l10n/hr.php
+++ b/apps/calendar/l10n/hr.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Nisu pronađeni kalendari",
+"No events found." => "Događaj nije pronađen.",
 "Wrong calendar" => "Pogrešan kalendar",
+"New Timezone:" => "Nova vremenska zona:",
 "Timezone changed" => "Vremenska zona promijenjena",
 "Invalid request" => "Neispravan zahtjev",
 "Calendar" => "Kalendar",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Rođendan",
 "Business" => "Poslovno",
 "Call" => "Poziv",
 "Clients" => "Klijenti",
 "Deliverer" => "Dostavljač",
-"Holidays" => "Odmori",
+"Holidays" => "Praznici",
 "Ideas" => "Ideje",
 "Journey" => "Putovanje",
 "Jubilee" => "Obljetnica",
@@ -18,6 +22,7 @@
 "Projects" => "Projekti",
 "Questions" => "Pitanja",
 "Work" => "Posao",
+"unnamed" => "bezimeno",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "Dnevno",
 "Weekly" => "Tjedno",
@@ -25,14 +30,50 @@
 "Bi-Weekly" => "Dvotjedno",
 "Monthly" => "Mjesečno",
 "Yearly" => "Godišnje",
+"never" => "nikad",
+"by occurrences" => "po pojavama",
+"by date" => "po datum",
+"by monthday" => "po dana mjeseca",
+"by weekday" => "po tjednu",
+"Monday" => "ponedeljak",
+"Tuesday" => "utorak",
+"Wednesday" => "srijeda",
+"Thursday" => "četvrtak",
+"Friday" => "petak",
+"Saturday" => "subota",
+"Sunday" => "nedelja",
+"first" => "prvi",
+"second" => "drugi",
+"third" => "treći",
+"fourth" => "četvrti",
+"fifth" => "peti",
+"last" => "zadnji",
+"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",
+"by events date" => "po datumu događaja",
+"by yearday(s)" => "po godini(-nama)",
+"by weeknumber(s)" => "po broju tjedna(-ana)",
+"by day and month" => "po danu i mjeseca",
+"Date" => "datum",
+"Cal." => "Kal.",
 "All day" => "Cijeli dan",
-"New Calendar" => "Novi Kalendar",
+"New Calendar" => "Novi kalendar",
 "Missing fields" => "Nedostaju polja",
 "Title" => "Naslov",
-"From Date" => "Datum Od",
-"From Time" => "Vrijeme Od",
-"To Date" => "Datum Do",
-"To Time" => "Vrijeme Do",
+"From Date" => "Datum od",
+"From Time" => "Vrijeme od",
+"To Date" => "Datum do",
+"To Time" => "Vrijeme do",
 "The event ends before it starts" => "Događaj završava prije nego počinje",
 "There was a database fail" => "Pogreška u bazi podataka",
 "Week" => "Tjedan",
@@ -41,11 +82,16 @@
 "Today" => "Danas",
 "Calendars" => "Kalendari",
 "There was a fail, while parsing the file." => "Pogreška pri čitanju datoteke.",
-"Choose active calendars" => "Odaberite aktive kalendare",
-"CalDav Link" => "CalDav Poveznica",
+"Choose active calendars" => "Odabir aktivnih kalendara",
+"Your calendars" => "Vaši kalendari",
+"CalDav Link" => "CalDav poveznica",
+"Shared calendars" => "Podijeljeni kalendari",
+"No shared calendars" => "Nema zajedničkih kalendara",
+"Share Calendar" => "Podjeli kalendar",
 "Download" => "Spremi lokalno",
 "Edit" => "Uredi",
 "Delete" => "Briši",
+"shared with you by" => "podijeljeno s vama od ",
 "New calendar" => "Novi kalendar",
 "Edit calendar" => "Uredi kalendar",
 "Displayname" => "Naziv",
@@ -56,24 +102,57 @@
 "Cancel" => "Odustani",
 "Edit an event" => "Uredi događaj",
 "Export" => "Izvoz",
-"Title of the Event" => "Naslov Događaja",
+"Eventinfo" => "Informacije o događaju",
+"Repeating" => "Ponavljanje",
+"Alarm" => "Alarm",
+"Attendees" => "Polaznici",
+"Share" => "Podijeli",
+"Title of the Event" => "Naslov događaja",
 "Category" => "Kategorija",
+"Separate categories with commas" => "Odvoji kategorije zarezima",
+"Edit categories" => "Uredi kategorije",
 "All Day Event" => "Cjelodnevni događaj",
 "From" => "Od",
 "To" => "Za",
 "Advanced options" => "Napredne mogućnosti",
 "Location" => "Lokacija",
-"Location of the Event" => "Lokacija Događaja",
+"Location of the Event" => "Lokacija događaja",
 "Description" => "Opis",
 "Description of the Event" => "Opis događaja",
 "Repeat" => "Ponavljanje",
-"Please choose the calendar" => "Odaberite kalendar",
+"Advanced" => "Napredno",
+"Select weekdays" => "Odaberi dane u tjednu",
+"Select days" => "Odaberi dane",
+"Select months" => "Odaberi mjesece",
+"Select weeks" => "Odaberi tjedne",
+"Interval" => "Interval",
+"End" => "Kraj",
+"occurrences" => "pojave",
+"Import a calendar file" => "Uvozite datoteku kalendara",
+"Please choose the calendar" => "Odaberi kalendar",
+"create a new calendar" => "stvori novi kalendar",
+"Name of new calendar" => "Ime novog kalendara",
 "Import" => "Uvoz",
+"Importing calendar" => "Uvoz kalendara",
+"Calendar imported successfully" => "Kalendar je uspješno uvezen",
+"Close Dialog" => "Zatvori dijalog",
 "Create a new event" => "Unesi novi događaj",
+"View an event" => "Vidjeti događaj",
+"No categories selected" => "Nema odabranih kategorija",
 "Select category" => "Odabir kategorije",
+"of" => "od",
+"at" => "na",
 "Timezone" => "Vremenska zona",
+"Check always for changes of the timezone" => "Provjerite uvijek za promjene vremenske zone",
 "Timeformat" => "Format vremena",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara"
+"First day of the week" => "Prvi dan tjedna",
+"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara:",
+"Users" => "Korisnici",
+"select users" => "odaberi korisnike",
+"Editable" => "Može se uređivati",
+"Groups" => "Grupe",
+"select groups" => "izaberite grupe",
+"make public" => "podjeli s javnošću"
 );
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index d4a4b5f018..c533a9bd1a 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "カレンダーが見つかりませんでした。",
+"No events found." => "イベントが見つかりませんでした。",
 "Wrong calendar" => "誤ったカレンダーです",
 "New Timezone:" => "新しいタイムゾーン:",
 "Timezone changed" => "タイムゾーンが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Calendar" => "カレンダー",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "誕生日",
 "Business" => "ビジネス",
 "Call" => "電話をかける",
@@ -18,7 +21,7 @@
 "Personal" => "個人",
 "Projects" => "プロジェクト",
 "Questions" => "質問事項",
-"Work" => "仕事",
+"Work" => "週の始まり",
 "Does not repeat" => "繰り返さない",
 "Daily" => "毎日",
 "Weekly" => "毎週",
@@ -31,13 +34,13 @@
 "by date" => "日付で指定",
 "by monthday" => "日にちで指定",
 "by weekday" => "曜日で指定",
-"Monday" => "月曜日",
-"Tuesday" => "火曜日",
-"Wednesday" => "水曜日",
-"Thursday" => "木曜日",
-"Friday" => "金曜日",
-"Saturday" => "土曜日",
-"Sunday" => "日曜日",
+"Monday" => "月曜",
+"Tuesday" => "火曜",
+"Wednesday" => "水曜",
+"Thursday" => "木曜",
+"Friday" => "金曜",
+"Saturday" => "土曜",
+"Sunday" => "日曜",
 "events week of month" => "予定のある週を指定",
 "first" => "１週目",
 "second" => "２週目",
@@ -64,7 +67,7 @@
 "Date" => "日付",
 "Cal." => "カレンダー",
 "All day" => "終日",
-"New Calendar" => "新しくカレンダーを作成する",
+"New Calendar" => "新しくカレンダーを作成",
 "Missing fields" => "項目がありません",
 "Title" => "タイトル",
 "From Date" => "開始日",
@@ -72,19 +75,23 @@
 "To Date" => "終了日",
 "To Time" => "終了時間",
 "The event ends before it starts" => "イベント終了時間が開始時間より先です",
-"There was a database fail" => "データベースフェイルがありました",
+"There was a database fail" => "データベースのエラーがありました",
 "Week" => "週",
 "Month" => "月",
 "List" => "リスト",
 "Today" => "今日",
 "Calendars" => "カレンダー",
-"There was a fail, while parsing the file." => "ファイルを構文解析する際に失敗しました",
-"Choose active calendars" => "アクティブなカレンダーを選択してください",
+"There was a fail, while parsing the file." => "ファイルの構文解析に失敗しました。",
+"Choose active calendars" => "アクティブなカレンダーを選択",
+"Your calendars" => "あなたのカレンダー",
 "CalDav Link" => "CalDavへのリンク",
+"Shared calendars" => "共有カレンダー",
+"No shared calendars" => "共有カレンダーはありません",
+"Share Calendar" => "カレンダーを共有する",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
-"New calendar" => "新しくカレンダーを作成する",
+"New calendar" => "新しいカレンダー",
 "Edit calendar" => "カレンダーを編集",
 "Displayname" => "表示名",
 "Active" => "アクティブ",
@@ -94,8 +101,15 @@
 "Cancel" => "キャンセル",
 "Edit an event" => "イベントを編集",
 "Export" => "エクスポート",
+"Eventinfo" => "イベント情報",
+"Repeating" => "繰り返し",
+"Alarm" => "アラーム",
+"Attendees" => "参加者",
+"Share" => "共有",
 "Title of the Event" => "イベントのタイトル",
 "Category" => "カテゴリー",
+"Separate categories with commas" => "カテゴリをコンマで区切る",
+"Edit categories" => "カテゴリを編集",
 "All Day Event" => "終日イベント",
 "From" => "開始",
 "To" => "終了",
@@ -103,8 +117,8 @@
 "Location" => "場所",
 "Location of the Event" => "イベントの場所",
 "Description" => "メモ",
-"Description of the Event" => "イベントのメモ",
-"Repeat" => "繰り返す",
+"Description of the Event" => "イベントの説明",
+"Repeat" => "繰り返し",
 "Advanced" => "詳細設定",
 "Select weekdays" => "曜日を指定",
 "Select days" => "日付を指定",
@@ -113,7 +127,7 @@
 "Select months" => "月を指定する",
 "Select weeks" => "週を指定する",
 "and the events week of year." => "対象の週を選択する。",
-"Interval" => "周期",
+"Interval" => "間隔",
 "End" => "繰り返す期間",
 "occurrences" => "回繰り返す",
 "Import a calendar file" => "カレンダーファイルをインポート",
@@ -123,13 +137,24 @@
 "Import" => "インポート",
 "Importing calendar" => "カレンダーを取り込み中",
 "Calendar imported successfully" => "カレンダーの取り込みに成功しました",
-"Close Dialog" => "閉じる",
-"Create a new event" => "新しいイベントを作成する",
+"Close Dialog" => "ダイアログを閉じる",
+"Create a new event" => "新しいイベントを作成",
+"View an event" => "イベントを閲覧",
+"No categories selected" => "カテゴリが選択されていません",
 "Select category" => "カテゴリーを選択してください",
+"of" => "of",
+"at" => "at",
 "Timezone" => "タイムゾーン",
-"Check always for changes of the timezone" => "タイムゾーン変更を常に確認する",
+"Check always for changes of the timezone" => "タイムゾーンの変更を常に確認",
 "Timeformat" => "時刻のフォーマット",
-"24h" => "24時間制",
-"12h" => "12時間制",
-"Calendar CalDAV syncing address:" => "カレンダーのCalDAVシンクアドレス"
+"24h" => "24h",
+"12h" => "12h",
+"First day of the week" => "週の始まり",
+"Calendar CalDAV syncing address:" => "CalDAVカレンダーの同期アドレス:",
+"Users" => "ユーザ",
+"select users" => "ユーザを選択",
+"Editable" => "編集可能",
+"Groups" => "グループ",
+"select groups" => "グループを選択",
+"make public" => "公開する"
 );
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
index 23e94d1cd1..b40f652cc5 100644
--- a/apps/calendar/l10n/lb.php
+++ b/apps/calendar/l10n/lb.php
@@ -1,8 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Keng Kalenner fonnt.",
+"No events found." => "Keng Evenementer fonnt.",
 "Wrong calendar" => "Falschen Kalenner",
+"New Timezone:" => "Nei Zäitzone:",
 "Timezone changed" => "Zäitzon geännert",
 "Invalid request" => "Ongülteg Requête",
 "Calendar" => "Kalenner",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Gebuertsdag",
 "Business" => "Geschäftlech",
 "Call" => "Uruff",
@@ -25,6 +29,38 @@
 "Bi-Weekly" => "All zweet Woch",
 "Monthly" => "All Mount",
 "Yearly" => "All Joer",
+"never" => "ni",
+"by occurrences" => "no Virkommes",
+"by date" => "no Datum",
+"by monthday" => "no Mount-Dag",
+"by weekday" => "no Wochendag",
+"Monday" => "Méindes",
+"Tuesday" => "Dënschdes",
+"Wednesday" => "Mëttwoch",
+"Thursday" => "Donneschdes",
+"Friday" => "Freides",
+"Saturday" => "Samschdes",
+"Sunday" => "Sonndes",
+"first" => "éischt",
+"second" => "Sekonn",
+"third" => "Drëtt",
+"fourth" => "Féiert",
+"fifth" => "Fënneft",
+"last" => "Läscht",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mäerz",
+"April" => "Abrëll",
+"May" => "Mee",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Date" => "Datum",
+"Cal." => "Cal.",
 "All day" => "All Dag",
 "New Calendar" => "Neien Kalenner",
 "Missing fields" => "Felder déi feelen",
@@ -42,7 +78,10 @@
 "Calendars" => "Kalenneren",
 "There was a fail, while parsing the file." => "Feeler beim lueden vum Fichier.",
 "Choose active calendars" => "Wiel aktiv Kalenneren aus",
+"Your calendars" => "Deng Kalenneren",
 "CalDav Link" => "CalDav Link",
+"Shared calendars" => "Gedeelte Kalenneren",
+"No shared calendars" => "Keng gedeelten Kalenneren",
 "Download" => "Eroflueden",
 "Edit" => "Editéieren",
 "Delete" => "Läschen",
@@ -67,8 +106,22 @@
 "Description" => "Beschreiwung",
 "Description of the Event" => "Beschreiwung vum Evenement",
 "Repeat" => "Widderhuelen",
+"Advanced" => "Erweidert",
+"Select weekdays" => "Wochendeeg auswielen",
+"Select days" => "Deeg auswielen",
+"Select months" => "Méint auswielen",
+"Select weeks" => "Wochen auswielen",
+"Interval" => "Intervall",
+"End" => "Enn",
+"occurrences" => "Virkommes",
+"Import a calendar file" => "E Kalenner Fichier importéieren",
 "Please choose the calendar" => "Wiel den Kalenner aus",
+"create a new calendar" => "E neie Kalenner uleeën",
+"Name of new calendar" => "Numm vum neie Kalenner",
 "Import" => "Import",
+"Importing calendar" => "Importéiert Kalenner",
+"Calendar imported successfully" => "Kalenner erfollegräich importéiert",
+"Close Dialog" => "Dialog zoumaachen",
 "Create a new event" => "En Evenement maachen",
 "Select category" => "Kategorie auswielen",
 "Timezone" => "Zäitzon",
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
index 3edf7b5469..d7e15fb438 100644
--- a/apps/calendar/l10n/lt_LT.php
+++ b/apps/calendar/l10n/lt_LT.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Kalendorių nerasta.",
+"No events found." => "Įvykių nerasta.",
 "Wrong calendar" => "Ne tas kalendorius",
 "New Timezone:" => "Nauja laiko juosta:",
 "Timezone changed" => "Laiko zona pakeista",
 "Invalid request" => "Klaidinga užklausa",
 "Calendar" => "Kalendorius",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Gimtadienis",
 "Business" => "Verslas",
 "Call" => "Skambučiai",
@@ -19,6 +22,7 @@
 "Projects" => "Projektai",
 "Questions" => "Klausimai",
 "Work" => "Darbas",
+"unnamed" => "be pavadinimo",
 "Does not repeat" => "Nekartoti",
 "Daily" => "Kasdien",
 "Weekly" => "Kiekvieną savaitę",
@@ -68,7 +72,11 @@
 "Calendars" => "Kalendoriai",
 "There was a fail, while parsing the file." => "Apdorojant failą įvyko klaida.",
 "Choose active calendars" => "Pasirinkite naudojamus kalendorius",
+"Your calendars" => "Jūsų kalendoriai",
 "CalDav Link" => "CalDav adresas",
+"Shared calendars" => "Bendri kalendoriai",
+"No shared calendars" => "Bendrų kalendorių nėra",
+"Share Calendar" => "Dalintis kalendoriumi",
 "Download" => "Atsisiųsti",
 "Edit" => "Keisti",
 "Delete" => "Trinti",
@@ -82,8 +90,14 @@
 "Cancel" => "Atšaukti",
 "Edit an event" => "Taisyti įvykį",
 "Export" => "Eksportuoti",
+"Eventinfo" => "Informacija",
+"Repeating" => "Pasikartojantis",
+"Attendees" => "Dalyviai",
+"Share" => "Dalintis",
 "Title of the Event" => "Įvykio pavadinimas",
 "Category" => "Kategorija",
+"Separate categories with commas" => "Atskirkite kategorijas kableliais",
+"Edit categories" => "Redaguoti kategorijas",
 "All Day Event" => "Visos dienos įvykis",
 "From" => "Nuo",
 "To" => "Iki",
@@ -95,6 +109,8 @@
 "Repeat" => "Kartoti",
 "Select weekdays" => "Pasirinkite savaitės dienas",
 "Select days" => "Pasirinkite dienas",
+"Select months" => "Pasirinkite mėnesius",
+"Select weeks" => "Pasirinkite savaites",
 "Interval" => "Intervalas",
 "End" => "Pabaiga",
 "Import a calendar file" => "Importuoti kalendoriaus failą",
@@ -106,11 +122,19 @@
 "Calendar imported successfully" => "Kalendorius sėkmingai importuotas",
 "Close Dialog" => "Uždaryti",
 "Create a new event" => "Sukurti naują įvykį",
+"View an event" => "Peržiūrėti įvykį",
+"No categories selected" => "Nepasirinktos jokios katagorijos",
 "Select category" => "Pasirinkite kategoriją",
 "Timezone" => "Laiko juosta",
 "Check always for changes of the timezone" => "Visada tikrinti laiko zonos pasikeitimus",
 "Timeformat" => "Laiko formatas",
 "24h" => "24val",
 "12h" => "12val",
-"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:"
+"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:",
+"Users" => "Vartotojai",
+"select users" => "pasirinkti vartotojus",
+"Editable" => "Redaguojamas",
+"Groups" => "Grupės",
+"select groups" => "pasirinkti grupes",
+"make public" => "viešinti"
 );
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
index b9a7bf4cb1..95ba5a9dba 100644
--- a/apps/calendar/l10n/nb_NO.php
+++ b/apps/calendar/l10n/nb_NO.php
@@ -147,7 +147,7 @@
 "24h" => "24 t",
 "12h" => "12 t",
 "First day of the week" => "Ukens første dag",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV synkroniseringsadresse",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadresse fo kalender CalDAV:",
 "Users" => "Brukere",
 "select users" => "valgte brukere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
index 520c67d424..e582cdbb9b 100644
--- a/apps/calendar/l10n/pl.php
+++ b/apps/calendar/l10n/pl.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Brak kalendarzy",
+"No events found." => "Brak wydzarzeń",
 "Wrong calendar" => "Nieprawidłowy kalendarz",
 "New Timezone:" => "Nowa strefa czasowa:",
 "Timezone changed" => "Zmieniono strefę czasową",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Calendar" => "Kalendarz",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Urodziny",
 "Business" => "Interesy",
 "Call" => "Rozmowy",
@@ -19,6 +22,7 @@
 "Projects" => "Projekty",
 "Questions" => "Pytania",
 "Work" => "Zawodowe",
+"unnamed" => "nienazwany",
 "Does not repeat" => "Brak",
 "Daily" => "Codziennie",
 "Weekly" => "Tygodniowo",
@@ -80,10 +84,15 @@
 "Calendars" => "Kalendarze",
 "There was a fail, while parsing the file." => "Nie udało się przetworzyć pliku.",
 "Choose active calendars" => "Wybór aktywnych kalendarzy",
+"Your calendars" => "Twoje kalendarze",
 "CalDav Link" => "Wyświetla odnośnik CalDAV",
+"Shared calendars" => "Współdzielone kalendarze",
+"No shared calendars" => "Brak współdzielonych kalendarzy",
+"Share Calendar" => "Współdziel kalendarz",
 "Download" => "Pobiera kalendarz",
 "Edit" => "Edytuje kalendarz",
 "Delete" => "Usuwa kalendarz",
+"shared with you by" => "współdzielisz z",
 "New calendar" => "Nowy kalendarz",
 "Edit calendar" => "Edytowanie kalendarza",
 "Displayname" => "Wyświetlana nazwa",
@@ -94,8 +103,15 @@
 "Cancel" => "Anuluj",
 "Edit an event" => "Edytowanie wydarzenia",
 "Export" => "Wyeksportuj",
+"Eventinfo" => "Informacja o wydarzeniach",
+"Repeating" => "Powtarzanie",
+"Alarm" => "Alarm",
+"Attendees" => "Uczestnicy",
+"Share" => "Współdziel",
 "Title of the Event" => "Nazwa wydarzenia",
 "Category" => "Kategoria",
+"Separate categories with commas" => "Oddziel kategorie przecinkami",
+"Edit categories" => "Edytuj kategorie",
 "All Day Event" => "Wydarzenie całodniowe",
 "From" => "Od",
 "To" => "Do",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Zaimportowano kalendarz",
 "Close Dialog" => "Zamknij okno",
 "Create a new event" => "Tworzenie nowego wydarzenia",
+"View an event" => "Zobacz wydarzenie",
+"No categories selected" => "nie zaznaczono kategorii",
 "Select category" => "Wybierz kategorię",
+"of" => "z",
+"at" => "w",
 "Timezone" => "Strefa czasowa",
 "Check always for changes of the timezone" => "Zawsze sprawdzaj zmiany strefy czasowej",
 "Timeformat" => "Format czasu",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:"
+"First day of the week" => "Pierwszy dzień tygodnia",
+"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:",
+"Users" => "Użytkownicy",
+"select users" => "wybierz użytkowników",
+"Editable" => "Edytowalne",
+"Groups" => "Grupy",
+"select groups" => "wybierz grupy",
+"make public" => "uczyń publicznym"
 );
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
index 867a10a70b..33f85569cc 100644
--- a/apps/calendar/l10n/pt_PT.php
+++ b/apps/calendar/l10n/pt_PT.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Nenhum calendário encontrado.",
+"No events found." => "Nenhum evento encontrado.",
 "Wrong calendar" => "Calendário errado",
 "New Timezone:" => "Nova zona horária",
 "Timezone changed" => "Zona horária alterada",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Dia de anos",
 "Business" => "Negócio",
 "Call" => "Telefonar",
@@ -19,6 +22,7 @@
 "Projects" => "Projetos",
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
+"unnamed" => "não definido",
 "Does not repeat" => "Não repete",
 "Daily" => "Diário",
 "Weekly" => "Semanal",
@@ -80,10 +84,15 @@
 "Calendars" => "Calendários",
 "There was a fail, while parsing the file." => "Houve uma falha durante a análise do ficheiro",
 "Choose active calendars" => "Escolhe calendários ativos",
+"Your calendars" => "Os seus calendários",
 "CalDav Link" => "Endereço CalDav",
+"Shared calendars" => "Calendários partilhados",
+"No shared calendars" => "Nenhum calendário partilhado",
+"Share Calendar" => "Partilhar calendário",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "Delete" => "Apagar",
+"shared with you by" => "Partilhado consigo por",
 "New calendar" => "Novo calendário",
 "Edit calendar" => "Editar calendário",
 "Displayname" => "Nome de exibição",
@@ -94,8 +103,15 @@
 "Cancel" => "Cancelar",
 "Edit an event" => "Editar um evento",
 "Export" => "Exportar",
+"Eventinfo" => "Informação do evento",
+"Repeating" => "Repetição",
+"Alarm" => "Alarme",
+"Attendees" => "Participantes",
+"Share" => "Partilhar",
 "Title of the Event" => "Título do evento",
 "Category" => "Categoria",
+"Separate categories with commas" => "Separe categorias por virgulas",
+"Edit categories" => "Editar categorias",
 "All Day Event" => "Evento de dia inteiro",
 "From" => "De",
 "To" => "Para",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Calendário importado com sucesso",
 "Close Dialog" => "Fechar diálogo",
 "Create a new event" => "Criar novo evento",
+"View an event" => "Ver um evento",
+"No categories selected" => "Nenhuma categoria seleccionada",
 "Select category" => "Selecionar categoria",
+"of" => "de",
+"at" => "em",
 "Timezone" => "Zona horária",
 "Check always for changes of the timezone" => "Verificar sempre por alterações na zona horária",
 "Timeformat" => "Formato da hora",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Endereço de sincronização CalDav do calendário"
+"First day of the week" => "Primeiro dia da semana",
+"Calendar CalDAV syncing address:" => "Endereço de sincronização CalDav do calendário",
+"Users" => "Utilizadores",
+"select users" => "Selecione utilizadores",
+"Editable" => "Editavel",
+"Groups" => "Grupos",
+"select groups" => "Selecione grupos",
+"make public" => "Tornar público"
 );
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index f2b7707186..550afcd102 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Nici un calendar găsit.",
+"No events found." => "Nici un eveniment găsit.",
 "Wrong calendar" => "Calendar greșit",
 "New Timezone:" => "Fus orar nou:",
 "Timezone changed" => "Fus orar schimbat",
 "Invalid request" => "Cerere eronată",
 "Calendar" => "Calendar",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}",
 "Birthday" => "Zi de naștere",
 "Business" => "Afaceri",
 "Call" => "Sună",
@@ -19,6 +22,7 @@
 "Projects" => "Proiecte",
 "Questions" => "Întrebări",
 "Work" => "Servici",
+"unnamed" => "fără nume",
 "Does not repeat" => "Nerepetabil",
 "Daily" => "Zilnic",
 "Weekly" => "Săptămânal",
@@ -80,10 +84,15 @@
 "Calendars" => "Calendare",
 "There was a fail, while parsing the file." => "A fost întâmpinată o eroare în procesarea fișierului",
 "Choose active calendars" => "Alege calendarele active",
+"Your calendars" => "Calendarele tale",
 "CalDav Link" => "Legătură CalDav",
+"Shared calendars" => "Calendare partajate",
+"No shared calendars" => "Nici un calendar partajat",
+"Share Calendar" => "Partajați calendarul",
 "Download" => "Descarcă",
 "Edit" => "Modifică",
 "Delete" => "Șterge",
+"shared with you by" => "Partajat cu tine de",
 "New calendar" => "Calendar nou",
 "Edit calendar" => "Modifică calendarul",
 "Displayname" => "Nume afișat",
@@ -94,8 +103,15 @@
 "Cancel" => "Anulează",
 "Edit an event" => "Modifică un eveniment",
 "Export" => "Exportă",
+"Eventinfo" => "Informații despre eveniment",
+"Repeating" => "Ciclic",
+"Alarm" => "Alarmă",
+"Attendees" => "Participanți",
+"Share" => "Partajează",
 "Title of the Event" => "Numele evenimentului",
 "Category" => "Categorie",
+"Separate categories with commas" => "Separă categoriile prin virgule",
+"Edit categories" => "Editează categorii",
 "All Day Event" => "Toată ziua",
 "From" => "De la",
 "To" => "Către",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Calendarul a fost importat cu succes",
 "Close Dialog" => "Închide",
 "Create a new event" => "Crează un eveniment nou",
+"View an event" => "Vizualizează un eveniment",
+"No categories selected" => "Nici o categorie selectată",
 "Select category" => "Selecteză categoria",
+"of" => "din",
+"at" => "la",
 "Timezone" => "Fus orar",
 "Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
 "Timeformat" => "Forma de afișare a orei",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV"
+"First day of the week" => "Prima zi a săptămînii",
+"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV",
+"Users" => "Utilizatori",
+"select users" => "utilizatori selectați",
+"Editable" => "Editabil",
+"Groups" => "Grupuri",
+"select groups" => "grupuri selectate",
+"make public" => "fă public"
 );
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index ff33dd6663..af40b06b9f 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Календари не найдены.",
+"No events found." => "События не найдены.",
 "Wrong calendar" => "Неверный календарь",
 "New Timezone:" => "Новый часовой пояс:",
 "Timezone changed" => "Часовой пояс изменён",
@@ -19,6 +21,7 @@
 "Projects" => "Проекты",
 "Questions" => "Вопросы",
 "Work" => "Работа",
+"unnamed" => "без имени",
 "Does not repeat" => "Не повторяется",
 "Daily" => "Ежедневно",
 "Weekly" => "Еженедельно",
@@ -80,10 +83,15 @@
 "Calendars" => "Календари",
 "There was a fail, while parsing the file." => "Не удалось обработать файл.",
 "Choose active calendars" => "Выберите активные календари",
+"Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
+"Shared calendars" => "Общие календари",
+"No shared calendars" => "Нет общих календарей",
+"Share Calendar" => "Сделать календарь общим",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
+"shared with you by" => "с вами поделился",
 "New calendar" => "Новый календарь",
 "Edit calendar" => "Редактировать календарь",
 "Displayname" => "Отображаемое имя",
@@ -94,8 +102,15 @@
 "Cancel" => "Отмена",
 "Edit an event" => "Редактировать событие",
 "Export" => "Экспортировать",
+"Eventinfo" => "Информация о событии",
+"Repeating" => "Повторение",
+"Alarm" => "Сигнал",
+"Attendees" => "Участники",
+"Share" => "Поделиться",
 "Title of the Event" => "Название событие",
 "Category" => "Категория",
+"Separate categories with commas" => "Разделяйте категории запятыми",
+"Edit categories" => "Редактировать категории",
 "All Day Event" => "Событие на весь день",
 "From" => "От",
 "To" => "До",
@@ -125,11 +140,20 @@
 "Calendar imported successfully" => "Календарь успешно импортирован",
 "Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое событие",
+"View an event" => "Показать событие",
+"No categories selected" => "Категории не выбраны",
 "Select category" => "Выбрать категорию",
 "Timezone" => "Часовой пояс",
 "Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
 "Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
-"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:"
+"First day of the week" => "Первый день недели",
+"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:",
+"Users" => "Пользователи",
+"select users" => "выбрать пользователей",
+"Editable" => "Редактируемо",
+"Groups" => "Группы",
+"select groups" => "выбрать группы",
+"make public" => "селать публичным"
 );
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
index ee19c6b737..59f8c6e6b5 100644
--- a/apps/calendar/l10n/sv.php
+++ b/apps/calendar/l10n/sv.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Inga kalendrar funna",
+"No events found." => "Inga händelser funna.",
 "Wrong calendar" => "Fel kalender",
 "New Timezone:" => "Ny tidszon:",
 "Timezone changed" => "Tidszon ändrad",
 "Invalid request" => "Ogiltig begäran",
 "Calendar" => "Kalender",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Födelsedag",
 "Business" => "Företag",
 "Call" => "Ringa",
@@ -19,6 +22,7 @@
 "Projects" => "Projekt",
 "Questions" => "Frågor",
 "Work" => "Arbetet",
+"unnamed" => "Namn saknas",
 "Does not repeat" => "Upprepas inte",
 "Daily" => "Dagligen",
 "Weekly" => "Varje vecka",
@@ -80,10 +84,15 @@
 "Calendars" => "Kalendrar",
 "There was a fail, while parsing the file." => "Det blev ett fel medan filen analyserades.",
 "Choose active calendars" => "Välj aktiva kalendrar",
+"Your calendars" => "Dina kalendrar",
 "CalDav Link" => "CalDAV-länk",
+"Shared calendars" => "Delade kalendrar",
+"No shared calendars" => "Inga delade kalendrar",
+"Share Calendar" => "Dela kalender",
 "Download" => "Ladda ner",
 "Edit" => "Redigera",
 "Delete" => "Radera",
+"shared with you by" => "delad med dig av",
 "New calendar" => "Nya kalender",
 "Edit calendar" => "Redigera kalender",
 "Displayname" => "Visningsnamn",
@@ -94,8 +103,15 @@
 "Cancel" => "Avbryt",
 "Edit an event" => "Redigera en händelse",
 "Export" => "Exportera",
+"Eventinfo" => "Händelseinfo",
+"Repeating" => "Repetera",
+"Alarm" => "Alarm",
+"Attendees" => "Deltagare",
+"Share" => "Dela",
 "Title of the Event" => "Rubrik för händelsen",
 "Category" => "Kategori",
+"Separate categories with commas" => "Separera kategorier med komman",
+"Edit categories" => "Redigera kategorier",
 "All Day Event" => "Hela dagen",
 "From" => "Från",
 "To" => "Till",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Kalender importerades utan problem",
 "Close Dialog" => "Stäng ",
 "Create a new event" => "Skapa en ny händelse",
+"View an event" => "Visa en händelse",
+"No categories selected" => "Inga kategorier valda",
 "Select category" => "Välj kategori",
+"of" => "av",
+"at" => "på",
 "Timezone" => "Tidszon",
 "Check always for changes of the timezone" => "Kontrollera alltid ändringar i tidszon.",
 "Timeformat" => "Tidsformat",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:"
+"First day of the week" => "Första dagen av veckan",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:",
+"Users" => "Användare",
+"select users" => "välj användare",
+"Editable" => "Redigerbar",
+"Groups" => "Grupper",
+"select groups" => "Välj grupper",
+"make public" => "Gör offentlig"
 );
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index 129aa8d8e8..bb7e0a2872 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -6,6 +6,7 @@
 "Timezone changed" => "时区已修改",
 "Invalid request" => "非法请求",
 "Calendar" => "日历",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "生日",
 "Business" => "商务",
 "Call" => "呼叫",
@@ -104,6 +105,7 @@
 "Export" => "导出",
 "Eventinfo" => "事件信息",
 "Repeating" => "重复",
+"Alarm" => "提醒",
 "Attendees" => "参加者",
 "Share" => "共享",
 "Title of the Event" => "事件标题",
@@ -142,6 +144,8 @@
 "View an event" => "查看事件",
 "No categories selected" => "无选中分类",
 "Select category" => "选择分类",
+"of" => "在",
+"at" => "在",
 "Timezone" => "时区",
 "Check always for changes of the timezone" => "选中则总是按照时区变化",
 "Timeformat" => "时间格式",
diff --git a/apps/calendar/l10n/zh_TW.php b/apps/calendar/l10n/zh_TW.php
index b4f1d4e9b8..746594462c 100644
--- a/apps/calendar/l10n/zh_TW.php
+++ b/apps/calendar/l10n/zh_TW.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "沒有找到行事曆",
+"No events found." => "沒有找到活動",
 "Wrong calendar" => "錯誤日曆",
 "New Timezone:" => "新時區：",
 "Timezone changed" => "時區已變更",
 "Invalid request" => "無效請求",
 "Calendar" => "日曆",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "生日",
 "Business" => "商業",
 "Call" => "呼叫",
@@ -19,6 +22,7 @@
 "Projects" => "計畫",
 "Questions" => "問題",
 "Work" => "工作",
+"unnamed" => "無名稱的",
 "Does not repeat" => "不重覆",
 "Daily" => "每日",
 "Weekly" => "每週",
@@ -29,6 +33,7 @@
 "never" => "絕不",
 "by occurrences" => "由事件",
 "by date" => "由日期",
+"by monthday" => "依月份日期",
 "by weekday" => "由平日",
 "Monday" => "週一",
 "Tuesday" => "週二",
@@ -37,6 +42,7 @@
 "Friday" => "週五",
 "Saturday" => "週六",
 "Sunday" => "週日",
+"events week of month" => "月份中活動週",
 "first" => "第一",
 "second" => "第二",
 "third" => "第三",
@@ -56,9 +62,11 @@
 "November" => "十一月",
 "December" => "十二月",
 "by events date" => "由事件日期",
+"by yearday(s)" => "依年份日期",
 "by weeknumber(s)" => "由週數",
 "by day and month" => "由日與月",
 "Date" => "日期",
+"Cal." => "行事曆",
 "All day" => "整天",
 "New Calendar" => "新日曆",
 "Missing fields" => "遺失欄位",
@@ -76,10 +84,15 @@
 "Calendars" => "日曆",
 "There was a fail, while parsing the file." => "解析檔案時失敗。",
 "Choose active calendars" => "選擇一個作用中的日曆",
+"Your calendars" => "你的行事曆",
 "CalDav Link" => "CalDav 聯結",
+"Shared calendars" => "分享的行事曆",
+"No shared calendars" => "不分享的行事曆",
+"Share Calendar" => "分享行事曆",
 "Download" => "下載",
 "Edit" => "編輯",
 "Delete" => "刪除",
+"shared with you by" => "分享給你由",
 "New calendar" => "新日曆",
 "Edit calendar" => "編輯日曆",
 "Displayname" => "顯示名稱",
@@ -90,11 +103,15 @@
 "Cancel" => "取消",
 "Edit an event" => "編輯事件",
 "Export" => "匯出",
+"Eventinfo" => "活動資訊",
+"Repeating" => "重覆中",
 "Alarm" => "鬧鐘",
 "Attendees" => "出席者",
 "Share" => "分享",
 "Title of the Event" => "事件標題",
 "Category" => "分類",
+"Separate categories with commas" => "用逗點分隔分類",
+"Edit categories" => "編輯分類",
 "All Day Event" => "全天事件",
 "From" => "自",
 "To" => "至",
@@ -107,8 +124,11 @@
 "Advanced" => "進階",
 "Select weekdays" => "選擇平日",
 "Select days" => "選擇日",
+"and the events day of year." => "以及年中的活動日",
+"and the events day of month." => "以及月中的活動日",
 "Select months" => "選擇月",
 "Select weeks" => "選擇週",
+"and the events week of year." => "以及年中的活動週",
 "Interval" => "間隔",
 "End" => "結束",
 "occurrences" => "事件",
@@ -121,16 +141,22 @@
 "Calendar imported successfully" => "已成功匯入日曆",
 "Close Dialog" => "關閉對話",
 "Create a new event" => "建立一個新事件",
+"View an event" => "觀看一個活動",
+"No categories selected" => "沒有選擇分類",
 "Select category" => "選擇分類",
+"of" => "於",
+"at" => "於",
 "Timezone" => "時區",
 "Check always for changes of the timezone" => "總是檢查是否變更了時區",
 "Timeformat" => "日期格式",
 "24h" => "24小時制",
 "12h" => "12小時制",
+"First day of the week" => "每週的第一天",
 "Calendar CalDAV syncing address:" => "CalDAV 的日曆同步地址：",
 "Users" => "使用者",
 "select users" => "選擇使用者",
 "Editable" => "可編輯",
 "Groups" => "群組",
-"select groups" => "選擇群組"
+"select groups" => "選擇群組",
+"make public" => "公開"
 );
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index d2d96dfbac..0c95b83d5e 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
 "Error activating addressbook." => "Error en activar la llibreta d'adreces.",
 "No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
-"Error loading image." => "Error en carregar la imatge.",
 "Error reading contact photo." => "Error en llegir la foto del contacte.",
 "Error saving temporary file." => "Error en desar el fitxer temporal.",
 "The loading photo is not valid." => "La foto carregada no és vàlida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Falta la id del contacte.",
 "No photo path was submitted." => "No heu tramès el camí de la foto.",
 "File doesn't exist:" => "El fitxer no existeix:",
+"Error loading image." => "Error en carregar la imatge.",
 "element name is not set." => "no s'ha establert el nom de l'element.",
 "checksum is not set." => "no s'ha establert la suma de verificació.",
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "No s'ha carregat cap fitxer",
 "Missing a temporary folder" => "Falta un fitxer temporal",
 "Contacts" => "Contactes",
+"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
 "Addressbook not found." => "No s'ha trobat la llibreta d'adreces.",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Nom de la nova llibreta d'adreces",
 "Import" => "Importa",
 "Importing contacts" => "S'estan important contactes",
-"Contacts imported successfully" => "Els contactes s'han importat correctament",
-"Close Dialog" => "Tanca el diàleg",
-"Import Addressbook" => "Importa la llibreta d'adreces",
 "Select address book to import to:" => "Seleccioneu la llibreta d'adreces a la que voleu importar:",
-"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
 "Select from HD" => "Selecciona de HD",
 "You have no contacts in your addressbook." => "No teniu contactes a la llibreta d'adreces.",
 "Add contact" => "Afegeix un contacte",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index b510f68c1c..391a62010b 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Chyba při přidávání adresáře.",
 "Error activating addressbook." => "Chyba při aktivaci adresáře.",
 "No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
-"Error loading image." => "Chyba při načítání obrázku.",
 "Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
 "Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Chybí id kontaktu.",
 "No photo path was submitted." => "Žádná fotka nebyla nahrána.",
 "File doesn't exist:" => "Soubor neexistuje:",
+"Error loading image." => "Chyba při načítání obrázku.",
 "element name is not set." => "jméno elementu není nastaveno.",
 "checksum is not set." => "kontrolní součet není nastaven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Žádný soubor nebyl nahrán",
 "Missing a temporary folder" => "Chybí dočasný adresář",
 "Contacts" => "Kontakty",
+"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
 "Addressbook not found." => "Adresář nenalezen.",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
@@ -114,6 +115,7 @@
 "Addressbook" => "Adresář",
 "Hon. prefixes" => "Tituly před",
 "Miss" => "Slečna",
+"Ms" => "Ms",
 "Mr" => "Pan",
 "Sir" => "Sir",
 "Mrs" => "Paní",
@@ -124,6 +126,8 @@
 "Hon. suffixes" => "Tituly za",
 "J.D." => "JUDr.",
 "M.D." => "MUDr.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
 "Ph.D." => "Ph.D.",
 "Esq." => "Esq.",
 "Jr." => "ml.",
@@ -141,11 +145,7 @@
 "Name of new addressbook" => "Jméno nového adresáře",
 "Import" => "Import",
 "Importing contacts" => "Importování kontaktů",
-"Contacts imported successfully" => "Kontakty úspěšně importovány",
-"Close Dialog" => "Zavírací dialog",
-"Import Addressbook" => "Importovat adresář",
 "Select address book to import to:" => "Vyberte adresář do kterého chcete importovat:",
-"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
 "Select from HD" => "Vybrat z disku",
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 9e82d1967a..28753edda4 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -3,14 +3,47 @@
 "There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
 "Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
 "At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
+"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
 "Error adding contact property." => "Fejl ved tilføjelse af egenskab.",
+"No ID provided" => "Intet ID medsendt",
+"Error setting checksum." => "Kunne ikke sætte checksum.",
+"No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
+"No address books found." => "Der blev ikke fundet nogen adressebøger.",
+"No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
+"Missing ID" => "Manglende ID",
+"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'en: \"",
+"Cannot add addressbook with an empty name." => "Kan ikke tilføje adressebog uden et navn.",
 "Error adding addressbook." => "Fejl ved tilføjelse af adressebog.",
 "Error activating addressbook." => "Fejl ved aktivering af adressebog.",
+"No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
+"Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
+"Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
+"The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
+"id is not set." => "Intet ID medsendt.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
 "Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
+"Contact ID is missing." => "Kontaktperson ID mangler.",
+"Missing contact id." => "Kontaktperson ID mangler.",
+"No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
+"File doesn't exist:" => "Filen eksisterer ikke:",
+"Error loading image." => "Kunne ikke indlæse billede.",
+"element name is not set." => "Element navnet er ikke medsendt.",
+"checksum is not set." => "Checksum er ikke medsendt.",
+"Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
+"Something went FUBAR. " => "Noget gik grueligt galt. ",
 "Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
+"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
 "Error updating addressbook." => "Fejl ved opdatering af adressebog",
+"Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
+"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
+"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
+"No file was uploaded" => "Ingen fil uploadet",
+"Missing a temporary folder" => "Manglende midlertidig mappe.",
 "Contacts" => "Kontaktpersoner",
+"Drop a VCF file to import contacts." => "Drop en VCF fil for at importere kontaktpersoner.",
+"Addressbook not found." => "Adressebogen blev ikke fundet.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
 "Address" => "Adresse",
@@ -22,22 +55,53 @@
 "Mobile" => "Mobil",
 "Text" => "SMS",
 "Voice" => "Telefonsvarer",
+"Message" => "Besked",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Personsøger",
+"Internet" => "Internet",
+"{name}'s Birthday" => "{name}'s fødselsdag",
 "Contact" => "Kontaktperson",
 "Add Contact" => "Tilføj kontaktperson",
 "Addressbooks" => "Adressebøger",
+"Configure Address Books" => "Konfigurer adressebøger",
 "New Address Book" => "Ny adressebog",
+"Import from VCF" => "Importer fra VCF",
 "CardDav Link" => "CardDav-link",
 "Download" => "Download",
 "Edit" => "Rediger",
 "Delete" => "Slet",
 "Download contact" => "Download kontaktperson",
 "Delete contact" => "Slet kontaktperson",
+"Drop photo to upload" => "Drop foto for at uploade",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
+"Edit name details" => "Rediger navnedetaljer.",
+"Nickname" => "Øgenavn",
+"Enter nickname" => "Indtast øgenavn",
 "Birthday" => "Fødselsdag",
+"dd-mm-yyyy" => "dd-mm-åååå",
+"Groups" => "Grupper",
+"Separate groups with commas" => "Opdel gruppenavne med kommaer",
+"Edit groups" => "Rediger grupper",
 "Preferred" => "Foretrukken",
+"Please specify a valid email address." => "Indtast venligst en gyldig email-adresse.",
+"Enter email address" => "Indtast email-adresse",
+"Mail to address" => "Send mail til adresse",
+"Delete email address" => "Slet email-adresse",
+"Enter phone number" => "Indtast telefonnummer",
+"Delete phone number" => "Slet telefonnummer",
+"View on map" => "Vis på kort",
+"Edit address details" => "Rediger adresse detaljer",
+"Add notes here." => "Tilføj noter her.",
+"Add field" => "Tilfæj element",
+"Profile picture" => "Profilbillede",
 "Phone" => "Telefon",
+"Note" => "Note",
+"Delete current photo" => "Slet nuværende foto",
+"Edit current photo" => "Rediger nuværende foto",
+"Upload new photo" => "Upload nyt foto",
+"Select photo from ownCloud" => "Vælg foto fra ownCloud",
+"Edit address" => "Rediger adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
@@ -46,13 +110,48 @@
 "Region" => "Region",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
+"Edit categories" => "Rediger grupper",
 "Add" => "Tilføj",
 "Addressbook" => "Adressebog",
+"Hon. prefixes" => "Foranstillede titler",
+"Miss" => "Frøken",
+"Ms" => "Fru",
+"Mr" => "Hr.",
+"Sir" => "Sir",
+"Mrs" => "Fru",
+"Dr" => "Dr",
+"Given name" => "Fornavn",
+"Additional names" => "Mellemnavne",
+"Family name" => "Efternavn",
+"Hon. suffixes" => "Efterstillede titler",
+"J.D." => "Cand. Jur.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Ny adressebog",
 "Edit Addressbook" => "Rediger adressebog",
 "Displayname" => "Vist navn",
 "Active" => "Aktiv",
 "Save" => "Gem",
 "Submit" => "Gem",
-"Cancel" => "Fortryd"
+"Cancel" => "Fortryd",
+"Import a contacts file" => "Importer fil med kontaktpersoner",
+"Please choose the addressbook" => "Vælg venligst adressebog",
+"create a new addressbook" => "Opret ny adressebog",
+"Name of new addressbook" => "Navn på ny adressebog",
+"Import" => "Importer",
+"Importing contacts" => "Importerer kontaktpersoner",
+"Select address book to import to:" => "Vælg hvilken adressebog, der skal importeres til:",
+"Select from HD" => "Vælg fra harddisk.",
+"You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
+"Add contact" => "Tilføj kontaktpeson.",
+"Configure addressbooks" => "Konfigurer adressebøger",
+"CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
+"more info" => "mere info",
+"Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 222d856090..3a1013eb4f 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Adressbuch hinzufügen fehlgeschlagen",
 "Error activating addressbook." => "Adressbuchaktivierung fehlgeschlagen",
 "No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
-"Error loading image." => "Fehler beim Laden des Bildes.",
 "Error reading contact photo." => "Fehler beim auslesen des Kontaktfotos.",
 "Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
 "The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Fehlende Kontakt-ID.",
 "No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
 "File doesn't exist:" => "Datei existiert nicht: ",
+"Error loading image." => "Fehler beim Laden des Bildes.",
 "element name is not set." => "Kein Name für das Element angegeben.",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Contacts" => "Kontakte",
+"Drop a VCF file to import contacts." => "Zieh' eine VCF Datei hierher zum Kontaktimport",
 "Addressbook not found." => "Adressbuch nicht gefunden.",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
@@ -80,7 +81,7 @@
 "Birthday" => "Geburtstag",
 "dd-mm-yyyy" => "TT-MM-JJJJ",
 "Groups" => "Gruppen",
-"Separate groups with commas" => "Gruppen mit Komma trennen",
+"Separate groups with commas" => "Gruppen mit Komma trennt",
 "Edit groups" => "Gruppen editieren",
 "Preferred" => "Bevorzugt",
 "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
@@ -123,6 +124,14 @@
 "Additional names" => "Zusätzliche Namen",
 "Family name" => "Familienname",
 "Hon. suffixes" => "Höflichkeitssuffixe",
+"J.D." => "Dr. Jur",
+"M.D." => "Dr. med.",
+"D.O." => "DGOM",
+"D.C." => "MChiro",
+"Ph.D." => "Dr.",
+"Esq." => "Hochwohlgeborenen",
+"Jr." => "Jr.",
+"Sn." => "Senior",
 "New Addressbook" => "Neues Adressbuch",
 "Edit Addressbook" => "Adressbuch editieren",
 "Displayname" => "Anzeigename",
@@ -136,11 +145,8 @@
 "Name of new addressbook" => "Name des neuen Adressbuchs",
 "Import" => "Importieren",
 "Importing contacts" => "Kontakte werden importiert",
-"Contacts imported successfully" => "Kontaktimport erfolgreich",
-"Close Dialog" => "Dialog schließen",
-"Import Addressbook" => "Adressbuch importieren",
 "Select address book to import to:" => "Adressbuch, in das importiert werden soll",
-"Drop a VCF file to import contacts." => "Zieh' eine VCF Datei hierher zum Kontaktimport",
+"Select from HD" => "Von der Festplatte auswählen",
 "You have no contacts in your addressbook." => "Du hast keine Kontakte im Adressbuch.",
 "Add contact" => "Kontakt hinzufügen",
 "Configure addressbooks" => "Adressbücher konfigurieren",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index fb115a0d4a..f015f0ca36 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Σφάλμα προσθήκης βιβλίου διευθύνσεων.",
 "Error activating addressbook." => "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων",
 "No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
-"Error loading image." => "Σφάλμα φόρτωσης εικόνας",
 "Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
 "Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
 "The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Απουσιαζει ID επαφής",
 "No photo path was submitted." => "Δε δόθηκε διαδρομή εικόνας",
 "File doesn't exist:" => "Το αρχείο δεν υπάρχει:",
+"Error loading image." => "Σφάλμα φόρτωσης εικόνας",
 "element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
 "checksum is not set." => "δε ορίστηκε checksum ",
 "Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Δεν ανέβηκε κάποιο αρχείο",
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
 "Contacts" => "Επαφές",
+"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
 "Addressbook not found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Όνομα νέου βιβλίου διευθύνσεων",
 "Import" => "Εισαγωγή",
 "Importing contacts" => "Εισαγωγή επαφών",
-"Contacts imported successfully" => "Οι επαφές εισήχθησαν επιτυχώς",
-"Close Dialog" => "Κλείσιμο διαλόγου",
-"Import Addressbook" => "Εισαγωγή βιβλίου διευθύνσεων",
 "Select address book to import to:" => "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:",
-"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
 "Select from HD" => "Επιλογή από HD",
 "You have no contacts in your addressbook." => "Δεν έχεις επαφές στο βιβλίο διευθύνσεων",
 "Add contact" => "Προσθήκη επαφής",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index faba034681..ffc885a41a 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -6,6 +6,7 @@
 "Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
 "Error adding contact property." => "Eraro dum aldono de kontaktopropraĵo.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
+"Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
 "No address books found." => "Neniu adresaro troviĝis.",
 "No contacts found." => "Neniu kontakto troviĝis.",
@@ -15,7 +16,6 @@
 "Error adding addressbook." => "Eraro dum aldono de adresaro.",
 "Error activating addressbook." => "Eraro dum aktivigo de adresaro.",
 "No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
-"Error loading image." => "Eraro dum ŝargado de bildo.",
 "Error reading contact photo." => "Eraro dum lego de kontakta foto.",
 "Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
 "The loading photo is not valid." => "La alŝutata foto ne validas.",
@@ -26,7 +26,10 @@
 "Missing contact id." => "Mankas kontaktidentigilo.",
 "No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
 "File doesn't exist:" => "Dosiero ne ekzistas:",
+"Error loading image." => "Eraro dum ŝargado de bildo.",
 "element name is not set." => "eronomo ne agordiĝis.",
+"checksum is not set." => "kontrolsumo ne agordiĝis.",
+"Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
 "Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
@@ -36,6 +39,7 @@
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Contacts" => "Kontaktoj",
+"Drop a VCF file to import contacts." => "Demetu VCF-dosieron por enporti kontaktojn.",
 "Addressbook not found." => "Adresaro ne troviĝis.",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
@@ -87,6 +91,7 @@
 "Edit address details" => "Redakti detalojn de adreso",
 "Add notes here." => "Aldoni notojn ĉi tie.",
 "Add field" => "Aldoni kampon",
+"Profile picture" => "Profila bildo",
 "Phone" => "Telefono",
 "Note" => "Noto",
 "Delete current photo" => "Forigi nunan foton",
@@ -105,8 +110,17 @@
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Addressbook" => "Adresaro",
+"Hon. prefixes" => "Honoraj antaŭmetaĵoj",
+"Miss" => "f-ino",
+"Ms" => "s-ino",
+"Mr" => "s-ro",
+"Sir" => "s-ro",
+"Mrs" => "s-ino",
+"Dr" => "d-ro",
 "Given name" => "Persona nomo",
+"Additional names" => "Pliaj nomoj",
 "Family name" => "Familia nomo",
+"Hon. suffixes" => "Honoraj postmetaĵoj",
 "New Addressbook" => "Nova adresaro",
 "Edit Addressbook" => "Redakti adresaron",
 "Displayname" => "Montronomo",
@@ -120,7 +134,13 @@
 "Name of new addressbook" => "Nomo de nova adresaro",
 "Import" => "Enporti",
 "Importing contacts" => "Enportante kontaktojn",
-"Contacts imported successfully" => "Kontaktoj enportiĝis sukcese",
-"Close Dialog" => "Fermi dialogon",
-"Import Addressbook" => "Enporti adresaron"
+"Select address book to import to:" => "Elektu adresaron kien enporti:",
+"Select from HD" => "Elekti el malmoldisko",
+"You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
+"Add contact" => "Aldoni kontakton",
+"Configure addressbooks" => "Agordi adresarojn",
+"CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
+"more info" => "pli da informo",
+"Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 98b6aaa803..2bdb300aa8 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Error al añadir la libreta de direcciones.",
 "Error activating addressbook." => "Error al activar la libreta de direcciones.",
 "No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
-"Error loading image." => "Error cargando imagen.",
 "Error reading contact photo." => "Error leyendo fotografía del contacto.",
 "Error saving temporary file." => "Error al guardar archivo temporal.",
 "The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Falta la id del contacto.",
 "No photo path was submitted." => "No se ha introducido la ruta de la foto.",
 "File doesn't exist:" => "Archivo inexistente:",
+"Error loading image." => "Error cargando imagen.",
 "element name is not set." => "no se ha puesto ningún nombre de elemento.",
 "checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "No se ha subido ningún archivo",
 "Missing a temporary folder" => "Falta la carpeta temporal",
 "Contacts" => "Contactos",
+"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
 "Addressbook not found." => "Libreta de direcciones no encontrada.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Nombre de la nueva agenda",
 "Import" => "Importar",
 "Importing contacts" => "Importando contactos",
-"Contacts imported successfully" => "Contactos importados correctamente",
-"Close Dialog" => "Cerrar Diálogo",
-"Import Addressbook" => "Importar agenda",
 "Select address book to import to:" => "Selecciona una agenda para importar a:",
-"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
 "Select from HD" => "Seleccionar del disco duro",
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 2baad89521..39a287c961 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Viga aadressiraamatu lisamisel.",
 "Error activating addressbook." => "Viga aadressiraamatu aktiveerimisel.",
 "No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
-"Error loading image." => "Viga pildi laadimisel.",
 "Error reading contact photo." => "Viga kontakti foto lugemisel.",
 "Error saving temporary file." => "Viga ajutise faili salvestamisel.",
 "The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Puuduv kontakti ID.",
 "No photo path was submitted." => "Foto asukohta pole määratud.",
 "File doesn't exist:" => "Faili pole olemas:",
+"Error loading image." => "Viga pildi laadimisel.",
 "element name is not set." => "elemendi nime pole määratud.",
 "checksum is not set." => "kontrollsummat pole määratud.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Contacts" => "Kontaktid",
+"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
 "Addressbook not found." => "Aadressiraamatut ei leitud",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
 "Import" => "Impordi",
 "Importing contacts" => "Kontaktide importimine",
-"Contacts imported successfully" => "Kontaktid on imporditud",
-"Close Dialog" => "Sulge dialoog",
-"Import Addressbook" => "Impordi aadressiraamat",
 "Select address book to import to:" => "Vali aadressiraamat, millesse importida:",
-"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
 "Select from HD" => "Vali kõvakettalt",
 "You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
 "Add contact" => "Lisa kontakt",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 8366c2b4b5..6dfbf0a7b2 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -11,7 +11,6 @@
 "Missing ID" => "ID falta da",
 "Error adding addressbook." => "Errore bat egon da helbide liburua gehitzean.",
 "Error activating addressbook." => "Errore bat egon da helbide-liburua aktibatzen.",
-"Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
 "Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
 "The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
 "id is not set." => "IDa ez da ezarri.",
@@ -20,6 +19,7 @@
 "Contact ID is missing." => "Kontaktuaren IDa falta da.",
 "Missing contact id." => "Kontaktuaren IDa falta da.",
 "File doesn't exist:" => "Fitxategia ez da existitzen:",
+"Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
 "element name is not set." => "elementuaren izena ez da ezarri.",
 "Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
@@ -29,6 +29,7 @@
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
 "No file was uploaded" => "Ez da fitxategirik igo",
 "Contacts" => "Kontaktuak",
+"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
 "Addressbook not found." => "Helbide liburua ez da aurkitu",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
@@ -111,11 +112,7 @@
 "Name of new addressbook" => "Helbide liburuaren izena",
 "Import" => "Inportatu",
 "Importing contacts" => "Kontaktuak inportatzen",
-"Contacts imported successfully" => "Kontaktuak ongi inportatu dira",
-"Close Dialog" => "Dialogoa itxi",
-"Import Addressbook" => "Inporatu helbide liburua",
 "Select address book to import to:" => "Hautau helburuko helbide liburua:",
-"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
 "Select from HD" => "Hautatu disko gogorretik",
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 2a50742b66..9278975c40 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "خطا درهنگام افزودن کتابچه نشانی ها",
 "Error activating addressbook." => "خطا درهنگام فعال سازیکتابچه نشانی ها",
 "No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
-"Error loading image." => "خطا در بارگزاری تصویر",
 "Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
 "Error saving temporary file." => "خطا در ذخیره پرونده موقت",
 "The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
@@ -27,6 +26,7 @@
 "Missing contact id." => "شما اطلاعات شناسه را فراموش کرده اید",
 "No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
 "File doesn't exist:" => "پرونده وجود ندارد",
+"Error loading image." => "خطا در بارگزاری تصویر",
 "element name is not set." => "نام اصلی تنظیم نشده است",
 "checksum is not set." => "checksum تنظیم شده نیست",
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
 "Missing a temporary folder" => "یک پوشه موقت گم شده",
 "Contacts" => "اشخاص",
+"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
 "Addressbook not found." => "کتابچه نشانی ها یافت نشد",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "نام کتابچه نشانی جدید",
 "Import" => "وارد کردن",
 "Importing contacts" => "وارد کردن اشخاص",
-"Contacts imported successfully" => "اشخاص با موفقیت افزوده شدند",
-"Close Dialog" => "بستن دیالوگ",
-"Import Addressbook" => "وارد کردن کتابچه نشانی",
 "Select address book to import to:" => "یک کتابچه نشانی انتخاب کنید تا وارد شود",
-"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
 "Select from HD" => "انتخاب از دیسک سخت",
 "You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
 "Add contact" => "افزودن اطلاعات شخص مورد نظر",
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
new file mode 100644
index 0000000000..2e3e91611b
--- /dev/null
+++ b/apps/contacts/l10n/fi_FI.php
@@ -0,0 +1,109 @@
+<?php $TRANSLATIONS = array(
+"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
+"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
+"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
+"Error adding contact property." => "Virhe lisättäessä ominaisuutta yhteystietoon.",
+"No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
+"No address books found." => "Osoitekirjoja ei löytynyt.",
+"No contacts found." => "Yhteystietoja ei löytynyt.",
+"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
+"Cannot add addressbook with an empty name." => "Ilman nimeä olevaa osoitekirjaa ei voi lisätä.",
+"Error adding addressbook." => "Virhe lisättäessä osoitekirjaa.",
+"Error activating addressbook." => "Virhe aktivoitaessa osoitekirjaa.",
+"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"Error deleting contact property." => "Virhe poistettaessa yhteystiedon ominaisuutta.",
+"File doesn't exist:" => "Tiedostoa ei ole olemassa:",
+"Error loading image." => "Virhe kuvaa ladatessa.",
+"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
+"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
+"There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
+"The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
+"No file was uploaded" => "Tiedostoa ei lähetetty",
+"Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"Contacts" => "Yhteystiedot",
+"Addressbook not found." => "Osoitekirjaa ei löytynyt.",
+"This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
+"Contact could not be found." => "Yhteystietoa ei löytynyt.",
+"Address" => "Osoite",
+"Telephone" => "Puhelin",
+"Email" => "Sähköposti",
+"Organization" => "Organisaatio",
+"Work" => "Työ",
+"Home" => "Koti",
+"Mobile" => "Mobiili",
+"Text" => "Teksti",
+"Voice" => "Ääni",
+"Message" => "Viesti",
+"Fax" => "Faksi",
+"Video" => "Video",
+"Pager" => "Hakulaite",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
+"Contact" => "Yhteystieto",
+"Add Contact" => "Lisää yhteystieto",
+"Addressbooks" => "Osoitekirjat",
+"Configure Address Books" => "Muokkaa osoitekirjoja",
+"New Address Book" => "Uusi osoitekirja",
+"Import from VCF" => "Tuo VCF-tiedostosta",
+"CardDav Link" => "CardDav-linkki",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"Delete" => "Poista",
+"Download contact" => "Lataa yhteystieto",
+"Delete contact" => "Poista yhteystieto",
+"Nickname" => "Kutsumanimi",
+"Enter nickname" => "Anna kutsumanimi",
+"Birthday" => "Syntymäpäivä",
+"Groups" => "Ryhmät",
+"Separate groups with commas" => "Erota ryhmät pilkuilla",
+"Edit groups" => "Muokkaa ryhmiä",
+"Please specify a valid email address." => "Anna kelvollinen sähköpostiosoite.",
+"Enter email address" => "Anna sähköpostiosoite",
+"Delete email address" => "Poista sähköpostiosoite",
+"Enter phone number" => "Anna puhelinnumero",
+"Delete phone number" => "Poista puhelinnumero",
+"View on map" => "Näytä kartalla",
+"Add notes here." => "Lisää huomiot tähän.",
+"Add field" => "Lisää kenttä",
+"Profile picture" => "Profiilikuva",
+"Phone" => "Puhelin",
+"Note" => "Huomio",
+"Delete current photo" => "Poista nykyinen valokuva",
+"Edit current photo" => "Muokkaa nykyistä valokuvaa",
+"Upload new photo" => "Lähetä uusi valokuva",
+"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
+"Edit address" => "Muokkaa osoitetta",
+"Type" => "Tyyppi",
+"PO Box" => "Postilokero",
+"Extended" => "Laajennettu",
+"Street" => "Katuosoite",
+"City" => "Paikkakunta",
+"Region" => "Alue",
+"Zipcode" => "Postinumero",
+"Country" => "Maa",
+"Edit categories" => "Muokkaa luokkia",
+"Add" => "Lisää",
+"Addressbook" => "Osoitekirja",
+"Given name" => "Etunimi",
+"Additional names" => "Lisänimet",
+"Family name" => "Sukunimi",
+"New Addressbook" => "Uusi osoitekirja",
+"Edit Addressbook" => "Muokkaa osoitekirjaa",
+"Active" => "Aktiivinen",
+"Save" => "Tallenna",
+"Submit" => "Lähetä",
+"Cancel" => "Peru",
+"Import a contacts file" => "Tuo yhteystiedon sisältävä tiedosto",
+"Please choose the addressbook" => "Valitse osoitekirja",
+"create a new addressbook" => "luo uusi osoitekirja",
+"Name of new addressbook" => "Uuden osoitekirjan nimi",
+"Import" => "Tuo",
+"Importing contacts" => "Tuodaan yhteystietoja",
+"Select address book to import to:" => "Valitse osoitekirja, johon yhteystiedot tuodaan:",
+"You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
+"Add contact" => "Lisää yhteystieto",
+"Configure addressbooks" => "Muokkaa osoitekirjoja",
+"CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
+"iOS/OS X" => "iOS/OS X"
+);
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 6b753dcec9..0a2a4e58b9 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
 "Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
 "No contact ID was submitted." => "Aucun ID de contact envoyé",
-"Error loading image." => "Erreur lors du chargement de l'image.",
 "Error reading contact photo." => "Erreur de lecture de la photo du contact.",
 "Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
 "The loading photo is not valid." => "La photo chargée est invalide.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "ID contact manquant.",
 "No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
 "File doesn't exist:" => "Fichier inexistant:",
+"Error loading image." => "Erreur lors du chargement de l'image.",
 "element name is not set." => "Le champ Nom n'est pas défini.",
 "checksum is not set." => "L'hachage n'est pas défini.",
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Pas de fichier envoyé.",
 "Missing a temporary folder" => "Absence de dossier temporaire.",
 "Contacts" => "Contacts",
+"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
 "Addressbook not found." => "Carnet d'adresses introuvable.",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
@@ -122,6 +123,7 @@
 "Additional names" => "Nom supplémentaires",
 "Family name" => "Nom de famille",
 "Hon. suffixes" => "Suffixes hon.",
+"Ph.D." => "Dr",
 "New Addressbook" => "Nouveau carnet d'adresses",
 "Edit Addressbook" => "Éditer le carnet d'adresses",
 "Displayname" => "Nom",
@@ -135,11 +137,7 @@
 "Name of new addressbook" => "Nom du nouveau carnet d'adresses",
 "Import" => "Importer",
 "Importing contacts" => "Importation des contacts",
-"Contacts imported successfully" => "Contacts importés avec succes",
-"Close Dialog" => "Fermer la boite de dialogue",
-"Import Addressbook" => "Importer un carnet d'adresses.",
 "Select address book to import to:" => "Selectionner le carnet d'adresses à importer vers:",
-"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
 "Select from HD" => "Selectionner depuis le disque dur",
 "You have no contacts in your addressbook." => "Il n'y a pas de contact dans votre carnet d'adresses.",
 "Add contact" => "Ajouter un contact",
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 28640e0ea4..6e40ad71e1 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,5 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
+"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
+"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
+"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
+"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
+"Error adding contact property." => "שגיאה בהוספת מאפיין לאיש הקשר.",
+"No ID provided" => "לא צוין מזהה",
+"Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
+"No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
+"No address books found." => "לא נמצאו פנקסי כתובות.",
+"No contacts found." => "לא נמצאו אנשי קשר.",
+"Missing ID" => "מזהה חסר",
+"Error adding addressbook." => "שגיאה בהוספת פנקס הכתובות.",
+"Error activating addressbook." => "שגיאה בהפעלת פנקס הכתובות.",
 "Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
+"Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
+"Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
+"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
+"Contacts" => "אנשי קשר",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -14,16 +32,34 @@
 "Fax" => "פקס",
 "Video" => "וידאו",
 "Pager" => "זימונית",
+"Contact" => "איש קשר",
 "Add Contact" => "הוספת איש קשר",
+"Addressbooks" => "פנקסי כתובות",
+"New Address Book" => "פנקס כתובות חדש",
+"CardDav Link" => "קישור ",
+"Download" => "הורדה",
 "Edit" => "עריכה",
 "Delete" => "מחיקה",
+"Download contact" => "הורדת איש קשר",
+"Delete contact" => "מחיקת איש קשר",
 "Birthday" => "יום הולדת",
+"Preferred" => "מועדף",
 "Phone" => "טלפון",
+"Type" => "סוג",
 "PO Box" => "תא דואר",
 "Extended" => "מורחב",
 "Street" => "רחוב",
 "City" => "עיר",
 "Region" => "אזור",
 "Zipcode" => "מיקוד",
-"Country" => "מדינה"
+"Country" => "מדינה",
+"Add" => "הוספה",
+"Addressbook" => "פנקס כתובות",
+"New Addressbook" => "פנקס כתובות חדש",
+"Edit Addressbook" => "עריכת פנקס הכתובות",
+"Displayname" => "שם התצוגה",
+"Active" => "פעיל",
+"Save" => "שמירה",
+"Submit" => "ביצוע",
+"Cancel" => "ביטול"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index 9950b512fc..d381bf4fa9 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
+"File doesn't exist:" => "Datoteka ne postoji:",
+"Contacts" => "Kontakti",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
 "Address" => "Adresa",
@@ -14,16 +16,48 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
+"Addressbooks" => "Adresari",
+"New Address Book" => "Novi adresar",
+"CardDav Link" => "CardDav poveznica",
+"Download" => "Preuzimanje",
 "Edit" => "Uredi",
 "Delete" => "Obriši",
+"Download contact" => "Preuzmi kontakt",
+"Delete contact" => "Izbriši kontakt",
+"Edit name details" => "Uredi detalje imena",
+"Nickname" => "Nadimak",
+"Enter nickname" => "Unesi nadimank",
 "Birthday" => "Rođendan",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Grupe",
+"Edit groups" => "Uredi grupe",
+"Enter email address" => "Unesi email adresu",
+"Enter phone number" => "Unesi broj telefona",
+"View on map" => "Prikaži na karti",
+"Edit address details" => "Uredi detalje adrese",
+"Add notes here." => "Dodaj bilješke ovdje.",
+"Add field" => "Dodaj polje",
 "Phone" => "Telefon",
+"Note" => "Bilješka",
+"Edit current photo" => "Uredi trenutnu sliku",
+"Edit address" => "Uredi adresu",
+"Type" => "Tip",
 "PO Box" => "Poštanski Pretinac",
 "Extended" => "Prošireno",
 "Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Poštanski broj",
-"Country" => "Država"
+"Country" => "Država",
+"Edit categories" => "Uredi kategorije",
+"Add" => "Dodaj",
+"Addressbook" => "Adresar",
+"New Addressbook" => "Novi adresar",
+"Edit Addressbook" => "Uredi adresar",
+"Save" => "Spremi",
+"Submit" => "Pošalji",
+"Cancel" => "Prekini",
+"Import" => "Uvezi"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 9f392bc8a5..68f7b2607e 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
-"There was an error adding the contact." => "Hiba a kontakt hozzáadásakor",
+"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
 "Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
 "At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
 "Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
-"Error adding contact property." => "Hiba a kontakt-tulajdonság hozzáadásakor",
+"Error adding contact property." => "Hiba a kapcsolat-tulajdonság hozzáadásakor",
 "No ID provided" => "Nincs ID megadva",
 "Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
@@ -16,32 +16,33 @@
 "Error adding addressbook." => "Hiba a címlista hozzáadásakor",
 "Error activating addressbook." => "Címlista aktiválása sikertelen",
 "No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
-"Error loading image." => "Kép betöltése sikertelen",
 "Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
 "Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
 "The loading photo is not valid." => "A kép érvénytelen",
 "id is not set." => "ID nincs beállítva",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
-"Error deleting contact property." => "Hiba a kontakt-tulajdonság törlésekor",
-"Contact ID is missing." => "Hiányzik a kontakt ID",
+"Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
+"Contact ID is missing." => "Hiányzik a kapcsolat ID",
 "Missing contact id." => "Hiányzik a kontakt ID",
 "No photo path was submitted." => "Nincs fénykép-útvonal megadva",
 "File doesn't exist:" => "A fájl nem létezik:",
+"Error loading image." => "Kép betöltése sikertelen",
 "element name is not set." => "az elem neve nincs beállítva",
 "checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
-"Error updating contact property." => "Hiba a kontakt-tulajdonság frissítésekor",
+"Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
 "Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
 "Error updating addressbook." => "Hiba a címlista frissítésekor",
-"Error uploading contacts to storage." => "Hiba a kontaktok feltöltésekor",
+"Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket",
 "The uploaded file was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
 "No file was uploaded" => "Nincs feltöltött fájl",
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
-"Contacts" => "Kontaktok",
+"Contacts" => "Kapcsolatok",
+"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kapcsolatok importálásához",
 "Addressbook not found." => "Címlista nem található",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
@@ -60,8 +61,8 @@
 "Pager" => "Személyhívó",
 "Internet" => "Internet",
 "{name}'s Birthday" => "{name} születésnapja",
-"Contact" => "Kontakt",
-"Add Contact" => "Kontakt hozzáadása",
+"Contact" => "Kapcsolat",
+"Add Contact" => "Kapcsolat hozzáadása",
 "Addressbooks" => "Címlisták",
 "Configure Address Books" => "Címlisták beállítása",
 "New Address Book" => "Új címlista",
@@ -70,8 +71,8 @@
 "Download" => "Letöltés",
 "Edit" => "Szerkesztés",
 "Delete" => "Törlés",
-"Download contact" => "Kontakt letöltése",
-"Delete contact" => "Kontakt törlése",
+"Download contact" => "Kapcsolat letöltése",
+"Delete contact" => "Kapcsolat törlése",
 "Drop photo to upload" => "Húzza ide a feltöltendő képet",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
@@ -118,7 +119,7 @@
 "Mr" => "Mr",
 "Sir" => "Sir",
 "Mrs" => "Mrs",
-"Dr" => "Dr",
+"Dr" => "Dr.",
 "Given name" => "Teljes név",
 "Additional names" => "További nevek",
 "Family name" => "Családnév",
@@ -138,23 +139,19 @@
 "Save" => "Mentés",
 "Submit" => "Elküld",
 "Cancel" => "Mégsem",
-"Import a contacts file" => "Kontakt-fájl importálása",
+"Import a contacts file" => "Kapcsolat-fájl importálása",
 "Please choose the addressbook" => "Válassza ki a címlistát",
 "create a new addressbook" => "Címlista létrehozása",
 "Name of new addressbook" => "Új címlista neve",
 "Import" => "Import",
-"Importing contacts" => "Kontaktok importálása",
-"Contacts imported successfully" => "Kontaktok importálása sikeres",
-"Close Dialog" => "Párbeszédablak bezárása",
-"Import Addressbook" => "Címlista importálása",
+"Importing contacts" => "Kapcsolatok importálása",
 "Select address book to import to:" => "Melyik címlistába történjen az importálás:",
-"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kontaktok importálásához",
 "Select from HD" => "Kiválasztás merevlemezről",
-"You have no contacts in your addressbook." => "Nincs kontakt a címlistában",
-"Add contact" => "Kontakt hozzáadása",
+"You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
+"Add contact" => "Kapcsolat hozzáadása",
 "Configure addressbooks" => "Címlisták beállítása",
 "CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
-"more info" => "további infó",
+"more info" => "további információ",
 "Primary address (Kontact et al)" => "Elsődleges cím",
 "iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index be4f8267a9..f420b48d84 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -4,8 +4,8 @@
 "No contacts found." => "Nulle contactos trovate.",
 "Error adding addressbook." => "Error durante que il addeva le adressario.",
 "Error activating addressbook." => "Error in activar adressario",
-"Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "Error saving temporary file." => "Error durante le scriptura in le file temporari",
+"Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
@@ -88,9 +88,6 @@
 "create a new addressbook" => "Crear un nove adressario",
 "Name of new addressbook" => "Nomine del nove gruppo:",
 "Import" => "Importar",
-"Contacts imported successfully" => "Contactos importate con successo.",
-"Close Dialog" => "Clauder dialogo",
-"Import Addressbook" => "Importar adressario.",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
 "iOS/OS X" => "iOS/OS X"
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index ce016063ea..2a5478e6c4 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Errore durante l'aggiunta della rubrica.",
 "Error activating addressbook." => "Errore durante l'attivazione della rubrica.",
 "No contact ID was submitted." => "Nessun ID di contatto inviato.",
-"Error loading image." => "Errore di caricamento immagine.",
 "Error reading contact photo." => "Errore di lettura della foto del contatto.",
 "Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
 "The loading photo is not valid." => "La foto caricata non è valida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "ID di contatto mancante.",
 "No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
 "File doesn't exist:" => "Il file non esiste:",
+"Error loading image." => "Errore di caricamento immagine.",
 "element name is not set." => "il nome dell'elemento non è impostato.",
 "checksum is not set." => "il codice di controllo non è impostato.",
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Nessun file è stato inviato",
 "Missing a temporary folder" => "Manca una cartella temporanea",
 "Contacts" => "Contatti",
+"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
 "Addressbook not found." => "Rubrica non trovata.",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Nome della nuova rubrica",
 "Import" => "Importa",
 "Importing contacts" => "Importazione contatti",
-"Contacts imported successfully" => "Contatti importati correttamente",
-"Close Dialog" => "Chiudi finestra",
-"Import Addressbook" => "Importa rubrica",
 "Select address book to import to:" => "Seleziona la rubrica di destinazione:",
-"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
 "Select from HD" => "Seleziona da disco",
 "You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
 "Add contact" => "Aggiungi contatto",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 8091aff9c8..d98e58f94d 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,16 +1,46 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "電話帳の有効/無効化に失敗しました。",
+"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
-"At least one of the address fields has to be filled out." => "アドレス項目の１つは記入して下さい。",
+"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
 "Error adding contact property." => "連絡先の追加に失敗しました。",
-"Error adding addressbook." => "電話帳の追加に失敗しました。",
-"Error activating addressbook." => "電話帳の有効化に失敗しました。",
+"No ID provided" => "IDが提供されていません",
+"Error setting checksum." => "チェックサムの設定エラー。",
+"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
+"No address books found." => "アドレスブックが見つかりません。",
+"No contacts found." => "連絡先が見つかりません。",
+"Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
+"Cannot add addressbook with an empty name." => "名前を空白にしたままでアドレスブックを追加することはできません。",
+"Error adding addressbook." => "アドレスブックの追加に失敗しました。",
+"Error activating addressbook." => "アドレスブックの有効化に失敗しました。",
+"No contact ID was submitted." => "連絡先IDは登録されませんでした。",
+"Error reading contact photo." => "連絡先写真の読み込みエラー。",
+"Error saving temporary file." => "一時ファイルの保存エラー。",
+"The loading photo is not valid." => "写真の読み込みは無効です。",
+"id is not set." => "idが設定されていません。",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
 "Error deleting contact property." => "連絡先の削除に失敗しました。",
+"Contact ID is missing." => "コンタクトIDが見つかりません。",
+"Missing contact id." => "コンタクトIDが設定されていません。",
+"No photo path was submitted." => "写真のパスが登録されていません。",
+"File doesn't exist:" => "ファイルが存在しません:",
+"Error loading image." => "画像の読み込みエラー。",
+"element name is not set." => "要素名が設定されていません。",
+"checksum is not set." => "チェックサムが設定されていません。",
+"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
-"Error updating addressbook." => "電話帳の更新に失敗しました。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
+"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
+"Error uploading contacts to storage." => "ストレージへの連絡先のアップロードエラー。",
+"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
+"No file was uploaded" => "ファイルはアップロードされませんでした",
+"Missing a temporary folder" => "一時保存フォルダが見つかりません",
 "Contacts" => "連絡先",
+"Drop a VCF file to import contacts." => "連絡先をインポートするVCFファイルをドロップしてください。",
+"Addressbook not found." => "アドレスブックが見つかりませんでした。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -22,37 +52,101 @@
 "Mobile" => "携帯電話",
 "Text" => "TTY TDD",
 "Voice" => "音声番号",
+"Message" => "メッセージ",
 "Fax" => "FAX",
 "Video" => "テレビ電話",
 "Pager" => "ポケベル",
+"Internet" => "インターネット",
+"{name}'s Birthday" => "{name}の誕生日",
 "Contact" => "連絡先",
 "Add Contact" => "連絡先の追加",
 "Addressbooks" => "電話帳",
+"Configure Address Books" => "アドレスブックを設定",
 "New Address Book" => "新規電話帳",
-"CardDav Link" => "CardDAV リンク",
+"Import from VCF" => "VCFからインポート",
+"CardDav Link" => "CardDAVリンク",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
 "Download contact" => "連絡先のダウンロード",
 "Delete contact" => "連絡先の削除",
-"Birthday" => "生年月日",
+"Drop photo to upload" => "写真をドロップしてアップロード",
+"Edit name details" => "名前の詳細を編集",
+"Nickname" => "ニックネーム",
+"Enter nickname" => "ニックネームを入力",
+"Birthday" => "誕生日",
+"dd-mm-yyyy" => "yyyy-mm-dd",
+"Groups" => "グループ",
+"Separate groups with commas" => "コンマでグループを分割",
+"Edit groups" => "グループを編集",
 "Preferred" => "推奨",
+"Please specify a valid email address." => "連絡先を追加",
+"Enter email address" => "メールアドレスを入力",
+"Mail to address" => "アドレスへメールを送る",
+"Delete email address" => "メールアドレスを削除",
+"Enter phone number" => "電話番号を入力",
+"Delete phone number" => "電話番号を削除",
+"View on map" => "地図で表示",
+"Edit address details" => "住所の詳細を編集",
+"Add notes here." => "ここにメモを追加。",
+"Add field" => "項目を追加",
+"Profile picture" => "プロフィール写真",
 "Phone" => "電話番号",
+"Note" => "メモ",
+"Delete current photo" => "現在の写真を削除",
+"Edit current photo" => "現在の写真を編集",
+"Upload new photo" => "新しい写真をアップロード",
+"Select photo from ownCloud" => "ownCloudから写真を選択",
+"Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
-"Extended" => "拡張番地",
-"Street" => "街路番地",
+"Extended" => "番地2",
+"Street" => "番地1",
 "City" => "都市",
-"Region" => "地域",
+"Region" => "都道府県",
 "Zipcode" => "郵便番号",
 "Country" => "国名",
+"Edit categories" => "カテゴリを編集",
 "Add" => "追加",
-"Addressbook" => "電話帳",
-"New Addressbook" => "電話帳の新規作成",
-"Edit Addressbook" => "電話帳の編集",
+"Addressbook" => "アドレスブック",
+"Miss" => "Miss",
+"Ms" => "Ms",
+"Mr" => "Mr",
+"Sir" => "Sir",
+"Mrs" => "Mrs",
+"Dr" => "Dr",
+"Given name" => "名",
+"Additional names" => "ミドルネーム",
+"Family name" => "姓",
+"Hon. suffixes" => "ストレージへの連絡先のアップロードエラー。",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"New Addressbook" => "アドレスブックの新規作成",
+"Edit Addressbook" => "アドレスブックを編集",
 "Displayname" => "表示名",
 "Active" => "アクティブ",
 "Save" => "保存",
 "Submit" => "送信",
-"Cancel" => "取り消し"
+"Cancel" => "取り消し",
+"Import a contacts file" => "コンタクトファイルをインポート",
+"Please choose the addressbook" => "アドレスブックを選択してください",
+"create a new addressbook" => "新しいアドレスブックを作成",
+"Name of new addressbook" => "新しいアドレスブックの名前",
+"Import" => "インポート",
+"Importing contacts" => "コンタクトをインポート",
+"Select address book to import to:" => "インポートするアドレスブックを選択:",
+"Select from HD" => "HDから選択",
+"You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
+"Add contact" => "連絡先を追加",
+"Configure addressbooks" => "アドレス帳を設定",
+"CardDAV syncing addresses" => "CardDAV同期アドレス",
+"more info" => "詳細情報",
+"Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index bba3e29d2e..fcdc1d08c6 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -14,7 +14,6 @@
 "Error adding addressbook." => "주소록을 추가할 수 없습니다.",
 "Error activating addressbook." => "주소록을 활성화할 수 없습니다.",
 "No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
-"Error loading image." => "로딩 이미지 오류입니다.",
 "Error reading contact photo." => "사진 읽기 오류",
 "Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
 "The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
@@ -24,6 +23,7 @@
 "Contact ID is missing." => "접속 아이디가 없습니다. ",
 "Missing contact id." => "접속 아이디 분실",
 "File doesn't exist:" => "파일이 존재하지 않습니다. ",
+"Error loading image." => "로딩 이미지 오류입니다.",
 "Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
 "Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
 "No file was uploaded" => "파일이 업로드 되어있지 않습니다",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 82b84b09d7..361e1cb93e 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -14,16 +14,31 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "Add Contact" => "Kontakt bäisetzen",
+"Addressbooks" => "Adressbicher ",
+"New Address Book" => "Neit Adressbuch",
+"CardDav Link" => "CardDav Link",
+"Download" => "Download",
 "Edit" => "Editéieren",
 "Delete" => "Läschen",
+"Delete contact" => "Kontakt läschen",
 "Birthday" => "Gebuertsdag",
 "Phone" => "Telefon",
+"Type" => "Typ",
 "PO Box" => "Postleetzuel",
 "Extended" => "Erweidert",
 "Street" => "Strooss",
 "City" => "Staat",
 "Region" => "Regioun",
 "Zipcode" => "Postleetzuel",
-"Country" => "Land"
+"Country" => "Land",
+"Add" => "Dobäisetzen",
+"Addressbook" => "Adressbuch",
+"New Addressbook" => "Neit Adressbuch",
+"Edit Addressbook" => "Adressbuch editéieren",
+"Displayname" => "Ugewisene Numm",
+"Save" => "Späicheren",
+"Submit" => "Fortschécken",
+"Cancel" => "Ofbriechen"
 );
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 4e9b2cc0d7..2b81a5d877 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Грешки при додавање на адресарот.",
 "Error activating addressbook." => "Грешка при активирање на адресарот.",
 "No contact ID was submitted." => "Не беше доставено ИД за контакт.",
-"Error loading image." => "Грешка во вчитување на слика.",
 "Error reading contact photo." => "Грешка во читање на контакт фотографија.",
 "Error saving temporary file." => "Грешка во снимање на привремена датотека.",
 "The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Недостасува ид за контакт.",
 "No photo path was submitted." => "Не беше поднесена патека за фотографија.",
 "File doesn't exist:" => "Не постои датотеката:",
+"Error loading image." => "Грешка во вчитување на слика.",
 "element name is not set." => "име за елементот не е поставена.",
 "checksum is not set." => "сумата за проверка не е поставена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Не беше подигната датотека.",
 "Missing a temporary folder" => "Недостасува привремена папка",
 "Contacts" => "Контакти",
+"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
 "Addressbook not found." => "Адресарот не е најден.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Име на новиот адресар",
 "Import" => "Внеси",
 "Importing contacts" => "Внесување контакти",
-"Contacts imported successfully" => "Контаките беа внесени успешно",
-"Close Dialog" => "Дијалог за затварање",
-"Import Addressbook" => "Внеси адресар",
 "Select address book to import to:" => "Изберете адресар да се внесе:",
-"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
 "Select from HD" => "Изберете од хард диск",
 "You have no contacts in your addressbook." => "Немате контакти во Вашиот адресар.",
 "Add contact" => "Додади контакт",
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 7b78456fef..3f7731bede 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -4,6 +4,7 @@
 "Cannot add empty property." => "Kan ikke legge til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
 "Error adding contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
+"No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
 "No contacts found." => "Ingen kontakter funnet.",
@@ -11,14 +12,16 @@
 "Cannot add addressbook with an empty name." => "Kan ikke legge til en adressebok uten navn.",
 "Error adding addressbook." => "Et problem oppsto med å legge til adresseboken.",
 "Error activating addressbook." => "Et problem oppsto med å aktivere adresseboken.",
-"Error loading image." => "Klarte ikke å laste bilde.",
 "Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
 "Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
+"The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
+"id is not set." => "id er ikke satt.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
 "Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
 "Missing contact id." => "Mangler kontakt-id.",
 "No photo path was submitted." => "Ingen filsti ble lagt inn.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
+"Error loading image." => "Klarte ikke å laste bilde.",
 "Something went FUBAR. " => "Noe gikk fryktelig galt.",
 "Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
@@ -70,7 +73,9 @@
 "Separate groups with commas" => "Skill gruppene med komma",
 "Edit groups" => "Endre grupper",
 "Preferred" => "Foretrukket",
+"Please specify a valid email address." => "Vennligst angi en gyldig e-postadresse.",
 "Enter email address" => "Skriv inn e-postadresse",
+"Mail to address" => "Send e-post til adresse",
 "Delete email address" => "Fjern e-postadresse",
 "Enter phone number" => "Skriv inn telefonnummer",
 "Delete phone number" => "Fjern telefonnummer",
@@ -80,6 +85,7 @@
 "Add field" => "Legg til felt",
 "Profile picture" => "Profilbilde",
 "Phone" => "Telefon",
+"Note" => "Notat",
 "Delete current photo" => "Fjern nåværende bilde",
 "Edit current photo" => "Rediger nåværende bilde",
 "Upload new photo" => "Last opp nytt bilde",
@@ -104,6 +110,7 @@
 "Additional names" => "Ev. mellomnavn",
 "Family name" => "Etternavn",
 "Hon. suffixes" => "Titler",
+"Ph.D." => "Stipendiat",
 "Jr." => "Jr.",
 "Sn." => "Sr.",
 "New Addressbook" => "Ny adressebok",
@@ -111,7 +118,7 @@
 "Displayname" => "Visningsnavn",
 "Active" => "Aktiv",
 "Save" => "Lagre",
-"Submit" => "Send inn",
+"Submit" => "Lagre",
 "Cancel" => "Avbryt",
 "Import a contacts file" => "Importer en fil med kontakter.",
 "Please choose the addressbook" => "Vennligst velg adressebok",
@@ -119,9 +126,10 @@
 "Name of new addressbook" => "Navn på ny adressebok",
 "Import" => "Importer",
 "Importing contacts" => "Importerer kontakter",
-"Contacts imported successfully" => "Kontaktene ble importert uten feil",
-"Close Dialog" => "Lukk dialog",
-"Import Addressbook" => "Importer adressebok",
+"You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
 "Add contact" => "Ny kontakt",
-"more info" => "mer info"
+"Configure addressbooks" => "Konfigurer adressebøker",
+"CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
+"more info" => "mer info",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index f0b603e583..fd7e50ba4d 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Fout bij het toevoegen van het adresboek.",
 "Error activating addressbook." => "Fout bij het activeren van het adresboek.",
 "No contact ID was submitted." => "Geen contact ID opgestuurd.",
-"Error loading image." => "Fout bij laden plaatje.",
 "Error reading contact photo." => "Lezen van contact foto mislukt.",
 "Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
 "The loading photo is not valid." => "De geladen foto is niet goed.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Ontbrekende contact id.",
 "No photo path was submitted." => "Geen fotopad opgestuurd.",
 "File doesn't exist:" => "Bestand bestaat niet:",
+"Error loading image." => "Fout bij laden plaatje.",
 "element name is not set." => "onderdeel naam is niet opgegeven.",
 "checksum is not set." => "controlegetal is niet opgegeven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Er is geen bestand geüpload",
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
+"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
 "Addressbook not found." => "Adresboek niet gevonden.",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
@@ -129,11 +130,7 @@
 "Name of new addressbook" => "Naam van nieuw adresboek",
 "Import" => "Importeer",
 "Importing contacts" => "Importeren van contacten",
-"Contacts imported successfully" => "Contacten zijn geïmporteerd",
-"Close Dialog" => "Sluit venster",
-"Import Addressbook" => "Importeer adresboek",
 "Select address book to import to:" => "Selecteer adresboek voor import:",
-"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
 "Select from HD" => "Selecteer van schijf",
 "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
 "Add contact" => "Contactpersoon toevoegen",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 31d0689359..a99f190695 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -3,15 +3,48 @@
 "There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
 "Cannot add empty property." => "Nie można dodać pustego elementu.",
 "At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
+"Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
 "Error adding contact property." => "Błąd dodawania elementu.",
+"No ID provided" => "Brak opatrzonego ID ",
+"Error setting checksum." => "Błąd ustawień sumy kontrolnej",
+"No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
+"No address books found." => "Nie znaleziono książek adresowych",
+"No contacts found." => "Nie znaleziono kontaktów.",
+"Missing ID" => "Brak ID",
+"Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
+"Cannot add addressbook with an empty name." => "Nie można dodać książki adresowej z pusta nazwą",
 "Error adding addressbook." => "Błąd dodawania książki adresowej.",
 "Error activating addressbook." => "Błąd aktywowania książki adresowej.",
+"No contact ID was submitted." => "ID kontaktu nie został utworzony.",
+"Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
+"Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
+"The loading photo is not valid." => "Wczytywane zdjęcie nie jest poprawne.",
+"id is not set." => "id nie ustawione.",
 "Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
 "Error deleting contact property." => "Błąd usuwania elementu.",
+"Contact ID is missing." => "Brak kontaktu id.",
+"Missing contact id." => "Brak kontaktu id.",
+"No photo path was submitted." => "Ścieżka do zdjęcia nie została podana.",
+"File doesn't exist:" => "Plik nie istnieje:",
+"Error loading image." => "Błąd ładowania obrazu.",
+"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"checksum is not set." => "checksum-a nie ustawiona",
+"Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
+"Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
 "Error updating contact property." => "Błąd uaktualniania elementu.",
+"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
 "Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
+"Error uploading contacts to storage." => "Wystąpił błąd podczas wysyłania kontaktów do magazynu.",
+"There is no error, the file uploaded with success" => "Nie było błędów, plik wyczytano poprawnie.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Załadowany plik przekracza wielkość upload_max_filesize w php.ini ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML",
+"The uploaded file was only partially uploaded" => "Załadowany plik tylko częściowo został wysłany.",
+"No file was uploaded" => "Plik nie został załadowany",
+"Missing a temporary folder" => "Brak folderu tymczasowego",
 "Contacts" => "Kontakty",
-"This is not your addressbook." => "To nie jest twoja książka adresowa.",
+"Drop a VCF file to import contacts." => "Upuść plik VCF do importu kontaktów.",
+"Addressbook not found." => "Nie znaleziono książki adresowej",
+"This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
 "Address" => "Adres",
 "Telephone" => "Telefon",
@@ -22,22 +55,53 @@
 "Mobile" => "Komórka",
 "Text" => "Połączenie tekstowe",
 "Voice" => "Połączenie głosowe",
+"Message" => "Wiadomość",
 "Fax" => "Faks",
 "Video" => "Połączenie wideo",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "{name} Urodzony",
 "Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
 "Addressbooks" => "Książki adresowe",
+"Configure Address Books" => "Konfiguruj książkę adresową",
 "New Address Book" => "Nowa książka adresowa",
+"Import from VCF" => "Importuj z VFC",
 "CardDav Link" => "Wyświetla odnośnik CardDav",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
 "Delete" => "Usuwa książkę adresową",
 "Download contact" => "Pobiera kontakt",
 "Delete contact" => "Usuwa kontakt",
+"Drop photo to upload" => "Upuść fotografię aby załadować",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
+"Edit name details" => "Edytuj szczegóły nazwy",
+"Nickname" => "Nazwa",
+"Enter nickname" => "Wpisz nazwę",
 "Birthday" => "Urodziny",
+"dd-mm-yyyy" => "dd-mm-rrrr",
+"Groups" => "Grupy",
+"Separate groups with commas" => "Oddziel grupy przecinkami",
+"Edit groups" => "Edytuj grupy",
 "Preferred" => "Preferowane",
+"Please specify a valid email address." => "Określ prawidłowy adres e-mail.",
+"Enter email address" => "Wpisz adres email",
+"Mail to address" => "Mail na adres",
+"Delete email address" => "Usuń adres mailowy",
+"Enter phone number" => "Wpisz numer telefonu",
+"Delete phone number" => "Usuń numer telefonu",
+"View on map" => "Zobacz na mapie",
+"Edit address details" => "Edytuj szczegóły adresu",
+"Add notes here." => "Dodaj notatkę tutaj.",
+"Add field" => "Dodaj pole",
+"Profile picture" => "Zdjęcie profilu",
 "Phone" => "Telefon",
+"Note" => "Uwaga",
+"Delete current photo" => "Usuń aktualne zdjęcie",
+"Edit current photo" => "Edytuj aktualne zdjęcie",
+"Upload new photo" => "Wczytaj nowe zdjęcie",
+"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
+"Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
 "Extended" => "Rozszerzony",
@@ -46,13 +110,48 @@
 "Region" => "Region",
 "Zipcode" => "Kod pocztowy",
 "Country" => "Kraj",
+"Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Addressbook" => "Książka adresowa",
+"Hon. prefixes" => "Prefiksy Hon.",
+"Miss" => "Panna",
+"Ms" => "Ms",
+"Mr" => "Pan",
+"Sir" => "Sir",
+"Mrs" => "Pani",
+"Dr" => "Dr",
+"Given name" => "Podaj imię",
+"Additional names" => "Dodatkowe nazwy",
+"Family name" => "Nazwa rodziny",
+"Hon. suffixes" => "Sufiksy Hon.",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Nowa książka adresowa",
 "Edit Addressbook" => "Edytowanie książki adresowej",
 "Displayname" => "Wyświetlana nazwa",
 "Active" => "Aktywna",
 "Save" => "Zapisz",
 "Submit" => "Potwierdź",
-"Cancel" => "Anuluj"
+"Cancel" => "Anuluj",
+"Import a contacts file" => "Importuj plik z kontaktami",
+"Please choose the addressbook" => "Proszę wybrać książkę adresową",
+"create a new addressbook" => "utwórz nową książkę adresową",
+"Name of new addressbook" => "Nazwa nowej książki adresowej",
+"Import" => "Import",
+"Importing contacts" => "importuj kontakty",
+"Select address book to import to:" => "Zaznacz książkę adresową do importu do:",
+"Select from HD" => "Wybierz z HD",
+"You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
+"Add contact" => "Dodaj kontakt",
+"Configure addressbooks" => "Konfiguruj książkę adresową",
+"CardDAV syncing addresses" => "adres do synchronizacji CardDAV",
+"more info" => "więcej informacji",
+"Primary address (Kontact et al)" => "Pierwszy adres",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 7890ebf0b7..e0da0a771a 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Erro ao adicionar agenda.",
 "Error activating addressbook." => "Erro ao ativar agenda.",
 "No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
-"Error loading image." => "Erro ao carregar imagem.",
 "Error reading contact photo." => "Erro de leitura na foto do contato.",
 "Error saving temporary file." => "Erro ao salvar arquivo temporário.",
 "The loading photo is not valid." => "Foto carregada não é válida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Faltando ID do contato.",
 "No photo path was submitted." => "Nenhum caminho para foto foi submetido.",
 "File doesn't exist:" => "Arquivo não existe:",
+"Error loading image." => "Erro ao carregar imagem.",
 "element name is not set." => "nome do elemento não definido.",
 "checksum is not set." => "checksum não definido.",
 "Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
@@ -37,7 +37,13 @@
 "Error uploading contacts to storage." => "Erro enviando contatos para armazenamento.",
 "There is no error, the file uploaded with success" => "Arquivo enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O arquivo enviado excede a diretiva upload_max_filesize em php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente carregado",
+"No file was uploaded" => "Nenhum arquivo carregado",
+"Missing a temporary folder" => "Diretório temporário não encontrado",
 "Contacts" => "Contatos",
+"Drop a VCF file to import contacts." => "Arraste um arquivo VCF para importar contatos.",
+"Addressbook not found." => "Lista de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
 "Address" => "Endereço",
@@ -49,22 +55,53 @@
 "Mobile" => "Móvel",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensagem",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Aniversário de {name}",
 "Contact" => "Contato",
 "Add Contact" => "Adicionar Contato",
-"Addressbooks" => "Agendas",
+"Addressbooks" => "Agendas de Endereço",
+"Configure Address Books" => "Configurar Livro de Endereços",
 "New Address Book" => "Nova agenda",
+"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Link CardDav",
 "Download" => "Baixar",
 "Edit" => "Editar",
 "Delete" => "Excluir",
 "Download contact" => "Baixar contato",
 "Delete contact" => "Apagar contato",
+"Drop photo to upload" => "Arraste a foto para ser carregada",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
+"Edit name details" => "Editar detalhes do nome",
+"Nickname" => "Apelido",
+"Enter nickname" => "Digite o apelido",
 "Birthday" => "Aniversário",
+"dd-mm-yyyy" => "dd-mm-aaaa",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe grupos por virgula",
+"Edit groups" => "Editar grupos",
 "Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor, especifique um email válido.",
+"Enter email address" => "Digite um endereço de email",
+"Mail to address" => "Correio para endereço",
+"Delete email address" => "Remover endereço de email",
+"Enter phone number" => "Digite um número de telefone",
+"Delete phone number" => "Remover número de telefone",
+"View on map" => "Visualizar no mapa",
+"Edit address details" => "Editar detalhes de endereço",
+"Add notes here." => "Adicionar notas",
+"Add field" => "Adicionar campo",
+"Profile picture" => "Imagem do Perfil",
 "Phone" => "Telefone",
+"Note" => "Nota",
+"Delete current photo" => "Deletar imagem atual",
+"Edit current photo" => "Editar imagem atual",
+"Upload new photo" => "Carregar nova foto",
+"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
+"Edit address" => "Editar endereço",
 "Type" => "Digite",
 "PO Box" => "Caixa Postal",
 "Extended" => "Estendido",
@@ -73,13 +110,48 @@
 "Region" => "Região",
 "Zipcode" => "CEP",
 "Country" => "País",
+"Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
-"Addressbook" => "Agenda",
-"New Addressbook" => "Nova agenda",
-"Edit Addressbook" => "Editar agenda",
+"Addressbook" => "Agenda de Endereço",
+"Hon. prefixes" => "Exmo. Prefixos ",
+"Miss" => "Senhorita",
+"Ms" => "Srta.",
+"Mr" => "Sr.",
+"Sir" => "Senhor",
+"Mrs" => "Sra.",
+"Dr" => "Dr",
+"Given name" => "Primeiro Nome",
+"Additional names" => "Segundo Nome",
+"Family name" => "Sobrenome",
+"Hon. suffixes" => "Exmo. Sufixos",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"New Addressbook" => "Nova Agenda de Endereço",
+"Edit Addressbook" => "Editar Agenda de Endereço",
 "Displayname" => "Nome de exibição",
 "Active" => "Ativo",
 "Save" => "Salvar",
 "Submit" => "Enviar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"Import a contacts file" => "Importar arquivos de contato.",
+"Please choose the addressbook" => "Por favor, selecione uma agenda de endereços",
+"create a new addressbook" => "Criar nova agenda de endereços",
+"Name of new addressbook" => "Nome da nova agenda de endereços",
+"Import" => "Importar",
+"Importing contacts" => "Importar contatos",
+"Select address book to import to:" => "Selecione agenda de endereços para importar ao destino:",
+"Select from HD" => "Selecione do disco rigído",
+"You have no contacts in your addressbook." => "Voce não tem contatos em sua agenda de endereços.",
+"Add contact" => "Adicionar contatos",
+"Configure addressbooks" => "Configurar agenda de endereços",
+"CardDAV syncing addresses" => "Sincronizando endereços CardDAV",
+"more info" => "leia mais",
+"Primary address (Kontact et al)" => "Endereço primário(Kontact et al)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 82a2a9f0ff..7a4861abf9 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -3,14 +3,42 @@
 "There was an error adding the contact." => "Erro ao adicionar contato",
 "Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
+"Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
 "Error adding contact property." => "Erro ao adicionar propriedade do contato",
+"No ID provided" => "Nenhum ID inserido",
+"Error setting checksum." => "Erro a definir checksum.",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
+"No address books found." => "Nenhum livro de endereços encontrado.",
+"No contacts found." => "Nenhum contacto encontrado.",
+"Missing ID" => "Falta ID",
+"Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
+"Cannot add addressbook with an empty name." => "Não é possivel adicionar Livro de endereços com nome vazio.",
 "Error adding addressbook." => "Erro ao adicionar livro de endereços",
 "Error activating addressbook." => "Erro ao ativar livro de endereços",
+"No contact ID was submitted." => "Nenhum ID de contacto definido.",
+"Error reading contact photo." => "Erro a ler a foto do contacto.",
+"Error saving temporary file." => "Erro a guardar ficheiro temporário.",
+"The loading photo is not valid." => "A foto carregada não é valida.",
+"id is not set." => "id não está definido",
 "Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
 "Error deleting contact property." => "Erro ao apagar propriedade do contato",
+"Contact ID is missing." => "Falta o ID do contacto.",
+"Missing contact id." => "Falta o ID do contacto.",
+"No photo path was submitted." => "Nenhum caminho da foto definido.",
+"File doesn't exist:" => "O ficheiro não existe:",
+"Error loading image." => "Erro a carregar a imagem.",
+"element name is not set." => "o nome do elemento não está definido.",
+"checksum is not set." => "Checksum não está definido.",
+"Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
+"Something went FUBAR. " => "Algo provocou um FUBAR. ",
 "Error updating contact property." => "Erro ao atualizar propriedade do contato",
+"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
 "Error updating addressbook." => "Erro a atualizar o livro de endereços",
+"Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
+"There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
+"No file was uploaded" => "Nenhum ficheiro foi submetido",
 "Contacts" => "Contactos",
+"Addressbook not found." => "Livro de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
 "Address" => "Morada",
@@ -22,22 +50,50 @@
 "Mobile" => "Telemovel",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensagem",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Aniversário de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Adicionar Contacto",
 "Addressbooks" => "Livros de endereços",
+"Configure Address Books" => "Configurar livros de endereços",
 "New Address Book" => "Novo livro de endereços",
+"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Endereço CardDav",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "Delete" => "Apagar",
 "Download contact" => "Transferir contacto",
 "Delete contact" => "Apagar contato",
+"Edit name details" => "Editar detalhes do nome",
+"Nickname" => "Alcunha",
+"Enter nickname" => "Introduza alcunha",
 "Birthday" => "Aniversário",
+"dd-mm-yyyy" => "dd-mm-aaaa",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe os grupos usando virgulas",
+"Edit groups" => "Editar grupos",
 "Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor indique um endereço de correio válido",
+"Enter email address" => "Introduza endereço de email",
+"Mail to address" => "Enviar correio para o endereço",
+"Delete email address" => "Eliminar o endereço de correio",
+"Enter phone number" => "Insira o número de telefone",
+"Delete phone number" => "Eliminar o número de telefone",
+"View on map" => "Ver no mapa",
+"Edit address details" => "Editar os detalhes do endereço",
+"Add notes here." => "Insira notas aqui.",
+"Add field" => "Adicionar campo",
+"Profile picture" => "Foto do perfil",
 "Phone" => "Telefone",
+"Note" => "Nota",
+"Delete current photo" => "Eliminar a foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
+"Edit address" => "Editar endereço",
 "Type" => "Tipo",
 "PO Box" => "Apartado",
 "Extended" => "Extendido",
@@ -46,13 +102,28 @@
 "Region" => "Região",
 "Zipcode" => "Código Postal",
 "Country" => "País",
+"Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Addressbook" => "Livro de endereços",
+"Ms" => "Sra",
+"Mr" => "Sr",
+"Sir" => "Sr",
+"Dr" => "Dr",
+"Additional names" => "Nomes adicionais",
+"Family name" => "Nome de familia",
 "New Addressbook" => "Novo livro de endereços",
 "Edit Addressbook" => "Editar livro de endereços",
 "Displayname" => "Nome de exibição",
 "Active" => "Ativo",
 "Save" => "Guardar",
 "Submit" => "Submeter",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"Import a contacts file" => "Importar um ficheiro de contactos",
+"Please choose the addressbook" => "Por favor seleccione o livro de endereços",
+"create a new addressbook" => "Criar um novo livro de endereços",
+"Import" => "Importar",
+"Importing contacts" => "A importar os contactos",
+"Add contact" => "Adicionar contacto",
+"more info" => "mais informação",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index a62cd6b24e..0160975671 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -4,10 +4,30 @@
 "Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
 "At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
 "Error adding contact property." => "Contactul nu a putut fi adăugat.",
+"No ID provided" => "Nici un ID nu a fost furnizat",
+"Error setting checksum." => "Eroare la stabilirea sumei de control",
+"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
+"No address books found." => "Nici o carte de adrese găsită",
+"No contacts found." => "Nici un contact găsit",
+"Missing ID" => "ID lipsă",
+"Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
+"Cannot add addressbook with an empty name." => "Nu e posibil de adăugat o carte de adrese fără nume",
 "Error adding addressbook." => "Agenda nu a putut fi adăugată.",
 "Error activating addressbook." => "Eroare la activarea agendei.",
+"No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
+"Error reading contact photo." => "Eroare la citerea fotografiei de contact",
+"Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
+"The loading photo is not valid." => "Fotografia care se încarcă nu este validă.",
+"id is not set." => "ID-ul nu este stabilit",
 "Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
 "Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
+"Contact ID is missing." => "ID-ul de contact lipsește.",
+"Missing contact id." => "ID de contact lipsă.",
+"No photo path was submitted." => "Nici o adresă către fotografie nu a fost transmisă",
+"File doesn't exist:" => "Fișierul nu există:",
+"Error loading image." => "Eroare la încărcarea imaginii.",
+"element name is not set." => "numele elementului nu este stabilit.",
+"checksum is not set." => "suma de control nu este stabilită.",
 "Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "Error updating addressbook." => "Eroare la actualizarea agendei.",
 "Contacts" => "Contacte",
@@ -22,9 +42,12 @@
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Voce",
+"Message" => "Mesaj",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Ziua de naștere a {name}",
 "Contact" => "Contact",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
@@ -35,8 +58,19 @@
 "Delete" => "Șterge",
 "Download contact" => "Descarcă acest contact",
 "Delete contact" => "Șterge contact",
+"Edit name details" => "Introdu detalii despre nume",
+"Nickname" => "Pseudonim",
+"Enter nickname" => "Introdu pseudonim",
 "Birthday" => "Zi de naștere",
+"dd-mm-yyyy" => "zz-ll-aaaa",
+"Groups" => "Grupuri",
+"Separate groups with commas" => "Separă grupurile cu virgule",
+"Edit groups" => "Editează grupuri",
 "Preferred" => "Preferat",
+"Please specify a valid email address." => "Te rog să specifici un e-mail corect",
+"Enter email address" => "Introdu adresa de e-mail",
+"Mail to address" => "Trimite mesaj la e-mail",
+"Delete email address" => "Șterge e-mail",
 "Phone" => "Telefon",
 "Type" => "Tip",
 "PO Box" => "CP",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 62e595c3c2..01a0e2642b 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -4,13 +4,40 @@
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
 "Error adding contact property." => "Ошибка добавления информации к контакту.",
+"No ID provided" => "ID не предоставлен",
+"Error setting checksum." => "Ошибка установки контрольной суммы.",
+"No categories selected for deletion." => "Категории для удаления не установлены.",
+"No address books found." => "Адресные книги не найдены.",
+"No contacts found." => "Контакты не найдены.",
+"Missing ID" => "Отсутствует ID",
+"Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
+"Cannot add addressbook with an empty name." => "Нельзя добавить адресную книгу без имени.",
 "Error adding addressbook." => "Ошибка добавления адресной книги.",
 "Error activating addressbook." => "Ошибка активации адресной книги.",
+"Error reading contact photo." => "Ошибка чтения фотографии контакта.",
+"Error saving temporary file." => "Ошибка сохранения временного файла.",
+"The loading photo is not valid." => "Загружаемая фотография испорчена.",
+"id is not set." => "id не установлен.",
 "Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
 "Error deleting contact property." => "Ошибка удаления информации из контакта.",
+"Contact ID is missing." => "ID контакта отсутствует.",
+"File doesn't exist:" => "Файл не существует:",
+"Error loading image." => "Ошибка загрузки картинки.",
+"element name is not set." => "имя элемента не установлено.",
+"checksum is not set." => "контрольная сумма не установлена.",
+"Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
 "Error updating contact property." => "Ошибка обновления информации контакта.",
+"Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
 "Error updating addressbook." => "Ошибка обновления адресной книги.",
+"Error uploading contacts to storage." => "Ошибка загрузки контактов в хранилище.",
+"There is no error, the file uploaded with success" => "Файл загружен успешно.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
+"The uploaded file was only partially uploaded" => "Файл загружен частично",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "Отсутствует временная папка",
 "Contacts" => "Контакты",
+"Addressbook not found." => "Адресная книга не найдена.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
 "Address" => "Адрес",
@@ -22,22 +49,50 @@
 "Mobile" => "Мобильный",
 "Text" => "Текст",
 "Voice" => "Голос",
+"Message" => "Сообщение",
 "Fax" => "Факс",
 "Video" => "Видео",
 "Pager" => "Пейджер",
+"Internet" => "Интернет",
+"{name}'s Birthday" => "День рождения {name}",
 "Contact" => "Контакт",
 "Add Contact" => "Добавить Контакт",
 "Addressbooks" => "Адресные книги",
+"Configure Address Books" => "Настроить Адресную книгу",
 "New Address Book" => "Новая адресная книга",
+"Import from VCF" => "Импортировать из VCF",
 "CardDav Link" => "Ссылка CardDAV",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
 "Download contact" => "Скачать контакт",
 "Delete contact" => "Удалить контакт",
+"Drop photo to upload" => "Перетяните фотографии для загрузки",
+"Nickname" => "Псевдоним",
+"Enter nickname" => "Введите псевдоним",
 "Birthday" => "День рождения",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Группы",
+"Edit groups" => "Редактировать группы",
 "Preferred" => "Предпочитаемый",
+"Please specify a valid email address." => "Укажите действительный адрес электронной почты.",
+"Enter email address" => "Укажите адрес электронной почты",
+"Mail to address" => "Написать по адресу",
+"Delete email address" => "Удалить адрес электронной почты",
+"Enter phone number" => "Ввести номер телефона",
+"Delete phone number" => "Удалить номер телефона",
+"View on map" => "Показать на карте",
+"Edit address details" => "Ввести детали адреса",
+"Add notes here." => "Добавьте заметки здесь.",
+"Add field" => "Добавить поле",
+"Profile picture" => "Фото профиля",
 "Phone" => "Телефон",
+"Note" => "Заметка",
+"Delete current photo" => "Удалить текущую фотографию",
+"Edit current photo" => "Редактировать текущую фотографию",
+"Upload new photo" => "Загрузить новую фотографию",
+"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
+"Edit address" => "Редактировать адрес",
 "Type" => "Тип",
 "PO Box" => "АО",
 "Extended" => "Расширенный",
@@ -46,13 +101,27 @@
 "Region" => "Область",
 "Zipcode" => "Почтовый индекс",
 "Country" => "Страна",
+"Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
 "Addressbook" => "Адресная книга",
+"Given name" => "Имя",
+"Additional names" => "Дополнительные имена (отчество)",
+"Family name" => "Фамилия",
 "New Addressbook" => "Новая адресная книга",
 "Edit Addressbook" => "Редактировать адресную книгу",
 "Displayname" => "Отображаемое имя",
 "Active" => "Активно",
 "Save" => "Сохранить",
 "Submit" => "Отправить",
-"Cancel" => "Отменить"
+"Cancel" => "Отменить",
+"Import a contacts file" => "Загрузить файл контактов",
+"Please choose the addressbook" => "Выберите адресную книгу",
+"create a new addressbook" => "создать новую адресную книгу",
+"Name of new addressbook" => "Имя новой адресной книги",
+"Import" => "Импорт",
+"Importing contacts" => "Импорт контактов",
+"You have no contacts in your addressbook." => "В адресной книге есть контакты.",
+"Add contact" => "Добавить контакт",
+"Configure addressbooks" => "Настроить адресную книгу",
+"more info" => "дополнительная информация"
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index c43a7e7767..6e5ebe3bd3 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Chyba počas pridávania adresára.",
 "Error activating addressbook." => "Chyba aktivovania adresára.",
 "No contact ID was submitted." => "Nebolo nastavené ID kontaktu.",
-"Error loading image." => "Chyba pri nahrávaní obrázka.",
 "Error reading contact photo." => "Chyba pri čítaní fotky kontaktu.",
 "Error saving temporary file." => "Chyba pri ukladaní dočasného súboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Chýba ID kontaktu.",
 "No photo path was submitted." => "Žiadna fotka nebola poslaná.",
 "File doesn't exist:" => "Súbor neexistuje:",
+"Error loading image." => "Chyba pri nahrávaní obrázka.",
 "element name is not set." => "meno elementu nie je nastavené.",
 "checksum is not set." => "kontrolný súčet nie je nastavený.",
 "Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Žiadny súbor nebol uložený",
 "Missing a temporary folder" => "Chýba dočasný priečinok",
 "Contacts" => "Kontakty",
+"Drop a VCF file to import contacts." => "Pretiahnite VCF súbor pre import kontaktov.",
 "Addressbook not found." => "Adresár sa nenašiel.",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
@@ -142,11 +143,7 @@
 "Name of new addressbook" => "Meno nového adresára",
 "Import" => "Importovať",
 "Importing contacts" => "Importovanie kontaktov",
-"Contacts imported successfully" => "Kontakty úspešne importované",
-"Close Dialog" => "Zatvoriť ponuku",
-"Import Addressbook" => "Importovanie adresára",
 "Select address book to import to:" => "Vyberte adresár, do ktorého chcete importovať:",
-"Drop a VCF file to import contacts." => "Pretiahnite VCF súbor pre import kontaktov.",
 "Select from HD" => "Vyberte z pevného disku",
 "You have no contacts in your addressbook." => "Nemáte žiadne kontakty v adresári.",
 "Add contact" => "Pridať kontakt",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index ceb26967e5..bfba23fabc 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Napaka pri dodajanju imenika.",
 "Error activating addressbook." => "Napaka pri aktiviranju imenika.",
 "No contact ID was submitted." => "ID stika ni bil poslan.",
-"Error loading image." => "Napaka pri nalaganju slike.",
 "Error reading contact photo." => "Napaka pri branju slike stika.",
 "Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
 "The loading photo is not valid." => "Slika, ki se nalaga ni veljavna.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Manjka id stika.",
 "No photo path was submitted." => "Pot slike ni bila poslana.",
 "File doesn't exist:" => "Datoteka ne obstaja:",
+"Error loading image." => "Napaka pri nalaganju slike.",
 "element name is not set." => "ime elementa ni nastavljeno.",
 "checksum is not set." => "nadzorna vsota ni nastavljena.",
 "Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Nobena datoteka ni bila naložena",
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Contacts" => "Stiki",
+"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
 "Addressbook not found." => "Imenik ni bil najden.",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Ime novega imenika",
 "Import" => "Uvozi",
 "Importing contacts" => "Uvažam stike",
-"Contacts imported successfully" => "Stiki so bili uspešno uvoženi",
-"Close Dialog" => "Zapri dialog",
-"Import Addressbook" => "Uvozi imenik",
 "Select address book to import to:" => "Izberite imenik v katerega boste uvažali:",
-"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
 "Select from HD" => "Izberi iz HD",
 "You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
 "Add contact" => "Dodaj stik",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index cee9682b84..8d5d37d248 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -4,13 +4,42 @@
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
 "Error adding contact property." => "Fel när kontaktegenskap skulle läggas till",
+"No ID provided" => "Inget ID angett",
+"Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
+"No categories selected for deletion." => "Inga kategorier valda för borttaging",
+"No address books found." => "Ingen adressbok funnen.",
+"No contacts found." => "Inga kontakter funna.",
+"Missing ID" => "ID saknas",
+"Cannot add addressbook with an empty name." => "Kan inte lägga till adressbok med ett tomt namn.",
 "Error adding addressbook." => "Fel när adressbok skulle läggas till",
 "Error activating addressbook." => "Fel uppstod när adressbok skulle aktiveras",
+"No contact ID was submitted." => "Inget kontakt-ID angavs.",
+"Error reading contact photo." => "Fel uppstod när ",
+"Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
+"The loading photo is not valid." => "Det laddade fotot är inte giltigt.",
+"id is not set." => "ID är inte satt.",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
 "Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort",
+"Contact ID is missing." => "Kontakt-ID saknas.",
+"Missing contact id." => "Saknar kontakt-ID.",
+"No photo path was submitted." => "Ingen sökväg till foto angavs.",
+"File doesn't exist:" => "Filen existerar inte.",
+"Error loading image." => "Fel uppstod när bild laddades.",
+"checksum is not set." => "kontrollsumma är inte satt.",
+"Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
 "Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
+"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
 "Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
+"Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
+"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
+"The uploaded file was only partially uploaded" => "Den uppladdade filen var bara delvist uppladdad",
+"No file was uploaded" => "Ingen fil laddades upp",
+"Missing a temporary folder" => "En temporär mapp saknas",
 "Contacts" => "Kontakter",
+"Drop a VCF file to import contacts." => "Släpp en VCF-fil för att importera kontakter.",
+"Addressbook not found." => "Hittade inte adressboken",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
 "Address" => "Adress",
@@ -22,22 +51,53 @@
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Röst",
+"Message" => "Meddelande",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Personsökare",
+"Internet" => "Internet",
+"{name}'s Birthday" => "{name}'s födelsedag",
 "Contact" => "Kontakt",
 "Add Contact" => "Lägg till kontakt",
 "Addressbooks" => "Adressböcker",
+"Configure Address Books" => "Konfigurera adressböcker",
 "New Address Book" => "Ny adressbok",
+"Import from VCF" => "Importera från VCF",
 "CardDav Link" => "CardDAV länk",
 "Download" => "Nedladdning",
 "Edit" => "Redigera",
 "Delete" => "Radera",
 "Download contact" => "Ladda ner kontakt",
 "Delete contact" => "Radera kontakt",
+"Drop photo to upload" => "Släpp foto för att ladda upp",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
+"Edit name details" => "Redigera detaljer för namn",
+"Nickname" => "Smeknamn",
+"Enter nickname" => "Ange smeknamn",
 "Birthday" => "Födelsedag",
+"dd-mm-yyyy" => "dd-mm-åååå",
+"Groups" => "Grupper",
+"Separate groups with commas" => "Separera grupperna med kommatecken",
+"Edit groups" => "Editera grupper",
 "Preferred" => "Föredragen",
+"Please specify a valid email address." => "Vänligen ange en giltig e-postadress",
+"Enter email address" => "Ange e-postadress",
+"Mail to address" => "Posta till adress.",
+"Delete email address" => "Ta bort e-postadress",
+"Enter phone number" => "Ange ett telefonnummer",
+"Delete phone number" => "Ta bort telefonnummer",
+"View on map" => "Visa på karta",
+"Edit address details" => "Redigera detaljer för adress",
+"Add notes here." => "Lägg till noteringar här.",
+"Add field" => "Lägg till fält",
+"Profile picture" => "Profilbild",
 "Phone" => "Telefon",
+"Note" => "Notering",
+"Delete current photo" => "Ta bort aktuellt foto",
+"Edit current photo" => "Redigera aktuellt foto",
+"Upload new photo" => "Ladda upp ett nytt foto",
+"Select photo from ownCloud" => "Välj foto från ownCloud",
+"Edit address" => "Editera adress",
 "Type" => "Typ",
 "PO Box" => "Postbox",
 "Extended" => "Utökad",
@@ -46,13 +106,38 @@
 "Region" => "Län",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
+"Edit categories" => "Editera kategorier",
 "Add" => "Ny",
 "Addressbook" => "Adressbok",
+"Miss" => "Herr",
+"Ms" => "Ingen adressbok funnen.",
+"Mr" => "Fru",
+"Mrs" => "Fröken",
+"Dr" => "Dr",
+"Given name" => "Förnamn",
+"Additional names" => "Mellannamn",
+"Family name" => "Efternamn",
+"Ph.D." => "Fil.dr.",
 "New Addressbook" => "Ny adressbok",
 "Edit Addressbook" => "Redigera adressbok",
 "Displayname" => "Visningsnamn",
 "Active" => "Aktiv",
 "Save" => "Spara",
 "Submit" => "Skicka in",
-"Cancel" => "Avbryt"
+"Cancel" => "Avbryt",
+"Import a contacts file" => "Importera en kontaktfil",
+"Please choose the addressbook" => "Vänligen välj adressboken",
+"create a new addressbook" => "skapa en ny adressbok",
+"Name of new addressbook" => "Namn för ny adressbok",
+"Import" => "Importera",
+"Importing contacts" => "Importerar kontakter",
+"Select address book to import to:" => "Importera till adressbok:",
+"Select from HD" => "Välj från hårddisk",
+"You have no contacts in your addressbook." => "Du har inga kontakter i din adressbok.",
+"Add contact" => "Lägg till en kontakt",
+"Configure addressbooks" => "Konfigurera adressböcker",
+"CardDAV syncing addresses" => "CardDAV synkningsadresser",
+"more info" => "mera information",
+"Primary address (Kontact et al)" => "Primär adress (Kontakt o.a.)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index cb1beb1044..acf382c6a4 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "เกิดข้อผิดพลาดในการเพิ่มสมุดบันทึกที่อยู่ใหม่",
 "Error activating addressbook." => "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่",
 "No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
-"Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
 "Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
 "Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
 "The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
@@ -27,6 +26,7 @@
 "Missing contact id." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
 "No photo path was submitted." => "ไม่พบตำแหน่งพาธของรูปภาพ",
 "File doesn't exist:" => "ไม่มีไฟล์ดังกล่าว",
+"Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
 "element name is not set." => "ยังไม่ได้กำหนดชื่อ",
 "checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
 "Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
 "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
 "Contacts" => "ข้อมูลการติดต่อ",
+"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
 "Addressbook not found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่",
 "Import" => "นำเข้า",
 "Importing contacts" => "นำเข้าข้อมูลการติดต่อ",
-"Contacts imported successfully" => "ข้อมูลการติดต่อถูกนำเข้าข้อมูลเรียบร้อยแล้ว",
-"Close Dialog" => "ปิดกล่องข้อความ",
-"Import Addressbook" => "นำเข้าข้อมูลสมุดบันทึกที่อยู่",
 "Select address book to import to:" => "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:",
-"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
 "Select from HD" => "เลือกจากฮาร์ดดิส",
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 298477c681..65e8e34c30 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Adres defteri eklenirken hata oluştu.",
 "Error activating addressbook." => "Adres defteri etkinleştirilirken hata oluştu.",
 "No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
-"Error loading image." => "İmaj yükleme hatası.",
 "Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
 "Error saving temporary file." => "Geçici dosya kaydetme hatası.",
 "The loading photo is not valid." => "Yüklenecek fotograf geçerli değil.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Eksik bağlantı id'si.",
 "No photo path was submitted." => "Fotoğraf girilmedi.",
 "File doesn't exist:" => "Dosya mevcut değil:",
+"Error loading image." => "İmaj yükleme hatası.",
 "element name is not set." => "eleman ismi atanmamış.",
 "checksum is not set." => "checksum atanmamış.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Hiç dosya gönderilmedi",
 "Missing a temporary folder" => "Geçici dizin eksik",
 "Contacts" => "Kişiler",
+"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
 "Addressbook not found." => "Adres defteri bulunamadı.",
 "This is not your addressbook." => "Bu sizin adres defteriniz değil.",
 "Contact could not be found." => "Kişi bulunamadı.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Yeni adres defteri için isim",
 "Import" => "İçe aktar",
 "Importing contacts" => "Bağlantıları içe aktar",
-"Contacts imported successfully" => "Bağlantılar başarıyla içe aktarıldı",
-"Close Dialog" => "Diyaloğu kapat",
-"Import Addressbook" => "Adres defterini içeri aktar",
 "Select address book to import to:" => "İçe aktarılacak adres defterini seçin:",
-"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
 "Select from HD" => "HD'den seç",
 "You have no contacts in your addressbook." => "Adres defterinizde hiç bağlantı yok.",
 "Add contact" => "Bağlatı ekle",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index d2cbf5570e..dcf9b99bc8 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -3,27 +3,36 @@
 "There was an error adding the contact." => "添加联系人时出错。",
 "Cannot add empty property." => "无法添加空属性。",
 "At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
+"Trying to add duplicate property: " => "试图添加重复属性： ",
 "Error adding contact property." => "添加联系人属性错误。",
+"No ID provided" => "未提供 ID",
 "Error setting checksum." => "设置校验值错误。",
+"No categories selected for deletion." => "未选中要删除的分类。",
 "No address books found." => "找不到地址簿。",
 "No contacts found." => "找不到联系人。",
 "Missing ID" => "缺少 ID",
+"Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
+"Cannot add addressbook with an empty name." => "无法无姓名的地址簿。",
 "Error adding addressbook." => "添加地址簿错误。",
 "Error activating addressbook." => "激活地址簿错误。",
-"Error loading image." => "加载图片错误。",
+"No contact ID was submitted." => "未提交联系人 ID。",
 "Error reading contact photo." => "读取联系人照片错误。",
 "Error saving temporary file." => "保存临时文件错误。",
+"The loading photo is not valid." => "装入的照片不正确。",
 "id is not set." => "没有设置 id。",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
 "Error deleting contact property." => "删除联系人属性错误。",
 "Contact ID is missing." => "缺少联系人 ID。",
 "Missing contact id." => "缺少联系人 ID。",
+"No photo path was submitted." => "未提供照片路径。",
 "File doesn't exist:" => "文件不存在:",
+"Error loading image." => "加载图片错误。",
 "checksum is not set." => "未设置校验值。",
 "Error updating contact property." => "更新联系人属性错误。",
 "Error updating addressbook." => "更新地址簿错误",
 "The uploaded file was only partially uploaded" => "已上传文件只上传了部分",
 "No file was uploaded" => "没有文件被上传",
+"Missing a temporary folder" => "缺少临时目录",
 "Contacts" => "联系人",
 "Addressbook not found." => "未找到地址簿。",
 "This is not your addressbook." => "这不是您的地址簿。",
@@ -37,6 +46,7 @@
 "Mobile" => "移动电话",
 "Text" => "文本",
 "Voice" => "语音",
+"Message" => "消息",
 "Fax" => "传真",
 "Video" => "视频",
 "Pager" => "传呼机",
@@ -54,6 +64,8 @@
 "Delete" => "删除",
 "Download contact" => "下载联系人",
 "Delete contact" => "删除联系人",
+"Drop photo to upload" => "拖拽图片进行上传",
+"Edit name details" => "编辑名称详情",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
 "Birthday" => "生日",
@@ -70,7 +82,11 @@
 "Delete phone number" => "删除电话号码",
 "View on map" => "在地图上显示",
 "Edit address details" => "编辑地址细节。",
+"Add notes here." => "添加注释。",
+"Add field" => "添加字段",
+"Profile picture" => "联系人图片",
 "Phone" => "电话",
+"Note" => "注释",
 "Delete current photo" => "删除当前照片",
 "Edit current photo" => "编辑当前照片",
 "Upload new photo" => "上传新照片",
@@ -102,8 +118,9 @@
 "Name of new addressbook" => "新地址簿名称",
 "Import" => "导入",
 "Importing contacts" => "导入联系人",
-"Contacts imported successfully" => "联系人导入成功",
-"Close Dialog" => "关闭对话框",
+"Add contact" => "添加联系人",
+"Configure addressbooks" => "配置地址簿",
+"CardDAV syncing addresses" => "CardDAV 同步地址",
 "more info" => "更多信息",
 "Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
 "iOS/OS X" => "iOS/OS X"
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index da2d0b46f5..d4c2efc47a 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -5,13 +5,17 @@
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
 "Error adding contact property." => "添加通訊錄內容中發生錯誤",
 "No ID provided" => "未提供 ID",
+"No contacts found." => "沒有找到聯絡人",
+"Missing ID" => "遺失ID",
 "Error adding addressbook." => "添加電話簿中發生錯誤",
 "Error activating addressbook." => "啟用電話簿中發生錯誤",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
 "Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "Error updating addressbook." => "電話簿更新中發生錯誤",
+"No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
+"Addressbook not found." => "找不到通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
 "Address" => "地址",
@@ -28,24 +32,40 @@
 "Video" => "影片",
 "Pager" => "呼叫器",
 "Internet" => "網際網路",
+"{name}'s Birthday" => "{name}的生日",
 "Contact" => "通訊錄",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
+"Configure Address Books" => "設定通訊錄",
 "New Address Book" => "新電話簿",
+"Import from VCF" => "從VCF匯入",
 "CardDav Link" => "CardDav 聯結",
 "Download" => "下載",
 "Edit" => "編輯",
 "Delete" => "刪除",
 "Download contact" => "下載通訊錄",
 "Delete contact" => "刪除通訊錄",
+"Edit name details" => "編輯姓名詳細資訊",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
 "Birthday" => "生日",
+"dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "群組",
+"Separate groups with commas" => "用逗號分隔群組",
 "Edit groups" => "編輯群組",
 "Preferred" => "首選",
+"Please specify a valid email address." => "註填入合法的電子郵件住址",
 "Enter email address" => "輸入電子郵件地址",
+"Mail to address" => "寄送住址",
+"Delete email address" => "刪除電子郵件住址",
+"Enter phone number" => "輸入電話號碼",
+"Delete phone number" => "刪除電話號碼",
+"Edit address details" => "電子郵件住址詳細資訊",
+"Add notes here." => "在這裡新增註解",
+"Add field" => "新增欄位",
+"Profile picture" => "個人資料照片",
 "Phone" => "電話",
+"Note" => "註解",
 "Type" => "類型",
 "PO Box" => "通訊地址",
 "Extended" => "分機",
@@ -56,6 +76,13 @@
 "Country" => "國家",
 "Add" => "添加",
 "Addressbook" => "電話簿",
+"Mr" => "先生",
+"Sir" => "先生",
+"Mrs" => "小姐",
+"Dr" => "博士（醫生）",
+"Given name" => "給定名（名）",
+"Additional names" => "額外名",
+"Family name" => "家族名（姓）",
 "New Addressbook" => "新電話簿",
 "Edit Addressbook" => "編輯電話簿",
 "Displayname" => "顯示名稱",
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 45de516f9d..91e748e300 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "لم يتم ترفيع أي من الملفات",
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Files" => "الملفات",
+"Size" => "حجم",
+"Modified" => "معدل",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
 "New" => "جديد",
 "Text file" => "ملف",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
 "Name" => "الاسم",
 "Download" => "تحميل",
-"Size" => "حجم",
-"Modified" => "معدل",
 "Delete" => "محذوف",
 "Upload too large" => "حجم الترفيع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 027a769820..83b3608731 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -6,13 +6,13 @@
 "No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временната папка",
 "Files" => "Файлове",
+"Size" => "Размер",
+"Modified" => "Променено",
 "Maximum upload size" => "Макс. размер за качване",
 "Upload" => "Качване",
 "Nothing in here. Upload something!" => "Няма нищо, качете нещо!",
 "Name" => "Име",
 "Download" => "Изтегляне",
-"Size" => "Размер",
-"Modified" => "Променено",
 "Delete" => "Изтриване",
 "Upload too large" => "Файлът е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 9cbc606021..baa6b3b7d4 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Files" => "Fitxers",
+"Size" => "Mida",
+"Modified" => "Modificat",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
 "max. possible: " => "màxim possible:",
@@ -24,9 +26,6 @@
 "Name" => "Nom",
 "Share" => "Comparteix",
 "Download" => "Baixa",
-"Size" => "Mida",
-"Modified" => "Modificat",
-"Delete all" => "Esborra-ho tot",
 "Delete" => "Suprimeix",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 033fbfca11..9a4be26dad 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
 "Failed to write to disk" => "Zápis na disk se nezdařil",
 "Files" => "Soubory",
+"Size" => "Velikost",
+"Modified" => "Změněno",
 "File handling" => "Nastavení chování k souborům",
 "Maximum upload size" => "Maximální velikost ukládaných souborů",
 "max. possible: " => "největší možná:",
@@ -24,9 +26,6 @@
 "Name" => "Název",
 "Share" => "Sdílet",
 "Download" => "Stáhnout",
-"Size" => "Velikost",
-"Modified" => "Změněno",
-"Delete all" => "Smazat vše",
 "Delete" => "Vymazat",
 "Upload too large" => "Příliš velký soubor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte uložit, překračují maximální velikosti uploadu na tomto serveru.",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 5d199ce806..3683ab8484 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
 "No file was uploaded" => "Ingen fil blev uploadet",
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
+"Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Files" => "Filer",
+"Size" => "Størrelse",
+"Modified" => "Ændret",
+"File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
+"max. possible: " => "max. mulige: ",
+"Needed for multi-file and folder downloads." => "Nødvendigt for at kunne downloade mapper og flere filer ad gangen.",
+"Enable ZIP-download" => "Muliggør ZIP-download",
+"0 is unlimited" => "0 er ubegrænset",
+"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
+"From url" => "Fra URL",
 "Upload" => "Upload",
+"Cancel upload" => "Fortryd upload",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Name" => "Navn",
+"Share" => "Del",
 "Download" => "Download",
-"Size" => "Størrelse",
-"Modified" => "Ændret",
 "Delete" => "Slet",
 "Upload too large" => "Upload for stor",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
+"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
+"Current scanning" => "Indlæser"
 );
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 078cb8e902..9c5310c43b 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,20 +1,23 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Datei hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die hochgeladene Datei ist zu groß.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die hochgeladene Datei ist zu groß.",
+"There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
 "The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf Festplatte",
-"Files" => "Dateien",
-"Maximum upload size" => "Maximale Größe",
+"Files" => "Files",
+"Size" => "Größe",
+"Modified" => "Bearbeitet",
+"File handling" => "Dateibehandlung",
+"Maximum upload size" => "Maximum upload size",
 "max. possible: " => "maximal möglich:",
-"Needed for multi-file and folder downloads." => "Für Mehrfachdateien- und Ordnerupload benötigt:",
+"Needed for multi-file and folder downloads." => "Für Mehrfachdateien- und Ordnerdownloads benötigt:",
 "Enable ZIP-download" => "ZIP-Download aktivieren",
 "0 is unlimited" => "0 bedeutet unbegrenzt",
 "Maximum input size for ZIP files" => "Maximale Größe für ZIP Dateien",
 "New" => "Neu",
-"Text file" => "Text Datei",
+"Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From url" => "Von der URL",
 "Upload" => "Hochladen",
@@ -23,9 +26,6 @@
 "Name" => "Name",
 "Share" => "Teilen",
 "Download" => "Herunterladen",
-"Size" => "Größe",
-"Modified" => "Bearbeitet",
-"Delete all" => "Alle löschen",
 "Delete" => "Löschen",
 "Upload too large" => "Upload zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index de16f97eed..93be024615 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος",
 "Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε",
 "Files" => "Αρχεία",
+"Size" => "Μέγεθος",
+"Modified" => "Τροποποιήθηκε",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος μεταφόρτωσης",
 "max. possible: " => "μέγιστο δυνατό:",
@@ -24,9 +26,6 @@
 "Name" => "Όνομα",
 "Share" => "Διαμοίρασε",
 "Download" => "Λήψη",
-"Size" => "Μέγεθος",
-"Modified" => "Τροποποιήθηκε",
-"Delete all" => "Διαγραφή όλων",
 "Delete" => "Διαγραφή",
 "Upload too large" => "Πολύ μεγάλο το αρχείο προς μεταφόρτωση",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index b38bd9df0f..64c380d600 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Files" => "Dosieroj",
+"Size" => "Grando",
+"Modified" => "Modifita",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
 "max. possible: " => "maks. ebla: ",
@@ -24,9 +26,6 @@
 "Name" => "Nomo",
 "Share" => "Kunhavigi",
 "Download" => "Elŝuti",
-"Size" => "Grando",
-"Modified" => "Modifita",
-"Delete all" => "Forigi ĉion",
 "Delete" => "Forigi",
 "Upload too large" => "Elŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index e51a9f325b..67bfb4702e 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
@@ -24,9 +26,6 @@
 "Name" => "Nombre",
 "Share" => "Compartir",
 "Download" => "Descargar",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"Delete all" => "Eliminar todo",
 "Delete" => "Eliminado",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index cdac89e66e..89bb96581c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
+"Size" => "Suurus",
+"Modified" => "Muudetud",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "max. possible: " => "maks. võimalik: ",
@@ -24,9 +26,6 @@
 "Name" => "Nimi",
 "Share" => "Jaga",
 "Download" => "Lae alla",
-"Size" => "Suurus",
-"Modified" => "Muudetud",
-"Delete all" => "Kustuta kõik",
 "Delete" => "Kustuta",
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 1f780b9d90..a7ca21f496 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
+"Size" => "Tamaina",
+"Modified" => "Aldatuta",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -24,9 +26,6 @@
 "Name" => "Izena",
 "Share" => "Elkarbanatu",
 "Download" => "Deskargatu",
-"Size" => "Tamaina",
-"Modified" => "Aldatuta",
-"Delete all" => "Ezabatu dena",
 "Delete" => "Ezabatu",
 "Upload too large" => "Igotakoa handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 5c5c32c0eb..4bb46e1fcf 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "یک پوشه موقت گم شده است",
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
+"Size" => "اندازه",
+"Modified" => "تغییر یافته",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
 "max. possible: " => "حداکثرمقدارممکن:",
@@ -24,9 +26,6 @@
 "Name" => "نام",
 "Share" => "به اشتراک گذاری",
 "Download" => "بارگیری",
-"Size" => "اندازه",
-"Modified" => "تغییر یافته",
-"Delete all" => "پاک کردن همه",
 "Delete" => "پاک کردن",
 "Upload too large" => "حجم بارگذاری بسیار زیاد است",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
new file mode 100644
index 0000000000..c99d4408f6
--- /dev/null
+++ b/apps/files/l10n/fi_FI.php
@@ -0,0 +1,32 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetty tiedosto ylittää upload_max_filesize-arvon rajan php.ini-tiedostossa",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan",
+"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
+"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
+"Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
+"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
+"Files" => "Tiedostot",
+"Size" => "Koko",
+"Modified" => "Muutettu",
+"File handling" => "Tiedostonhallinta",
+"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
+"Needed for multi-file and folder downloads." => "Tarvitaan useampien tiedostojen ja kansioiden latausta varten.",
+"Enable ZIP-download" => "Ota ZIP-paketin lataaminen käytöön",
+"0 is unlimited" => "0 on rajoittamaton",
+"Maximum input size for ZIP files" => "ZIP-tiedostojen enimmäiskoko",
+"New" => "Uusi",
+"Text file" => "Tekstitiedosto",
+"Folder" => "Kansio",
+"From url" => "Verkko-osoitteesta",
+"Upload" => "Lähetä",
+"Cancel upload" => "Peru lähetys",
+"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
+"Name" => "Nimi",
+"Share" => "Jaa",
+"Download" => "Lataa",
+"Delete" => "Poista",
+"Upload too large" => "Lähetettävä tiedosto on liian suuri",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
+"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki."
+);
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 6b16e8ac13..ab2f4ea13d 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Files" => "Fichiers",
+"Size" => "Taille",
+"Modified" => "Modifié",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
 "max. possible: " => "Max. possible :",
@@ -24,9 +26,6 @@
 "Name" => "Nom",
 "Share" => "Partager",
 "Download" => "Téléchargement",
-"Size" => "Taille",
-"Modified" => "Modifié",
-"Delete all" => "Supprimer tout",
 "Delete" => "Supprimer",
 "Upload too large" => "Fichier trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index e0e90f114b..36eafaefe2 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
 "No file was uploaded" => "Non se enviou ningún ficheiro",
 "Missing a temporary folder" => "Falta un cartafol temporal",
+"Failed to write to disk" => "Erro ao escribir no disco",
 "Files" => "Ficheiros",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
+"File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo de envío",
+"max. possible: " => "máx. posible: ",
+"Needed for multi-file and folder downloads." => "Preciso para descarga de varios ficheiros e cartafoles.",
+"Enable ZIP-download" => "Habilitar a descarga-ZIP",
+"0 is unlimited" => "0 significa ilimitado",
+"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ZIP",
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
+"From url" => "Desde url",
 "Upload" => "Enviar",
+"Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "Nada por aquí. Envíe algo.",
 "Name" => "Nome",
+"Share" => "Compartir",
 "Download" => "Descargar",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
 "Delete" => "Eliminar",
 "Upload too large" => "Envío demasiado grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor",
+"Files are being scanned, please wait." => "Estanse analizando os ficheiros, espere por favor.",
+"Current scanning" => "Análise actual."
 );
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 79ae1edb7a..0876eb952c 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "הקובץ שהועלה הועלה בצורה חלקית",
 "No file was uploaded" => "לא הועלו קבצים",
 "Missing a temporary folder" => "תיקייה זמנית חסרה",
+"Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
-"Maximum upload size" => "גודל העלאה מקסימלי",
-"Upload" => "העלאה",
-"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
-"Name" => "שם",
-"Download" => "הורדה",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
+"File handling" => "טיפול בקבצים",
+"Maximum upload size" => "גודל העלאה מקסימלי",
+"max. possible: " => "המרבי האפשרי: ",
+"Needed for multi-file and folder downloads." => "נחוץ להורדה של ריבוי קבצים או תיקיות.",
+"Enable ZIP-download" => "הפעלת הורדת ZIP",
+"0 is unlimited" => "0 - ללא הגבלה",
+"Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
+"New" => "חדש",
+"Text file" => "קובץ טקסט",
+"Folder" => "תיקייה",
+"From url" => "מכתובת",
+"Upload" => "העלאה",
+"Cancel upload" => "ביטול ההעלאה",
+"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
+"Name" => "שם",
+"Share" => "שיתוף",
+"Download" => "הורדה",
 "Delete" => "מחיקה",
 "Upload too large" => "העלאה גדולה מידי",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
+"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
+"Current scanning" => "הסריקה הנוכחית"
 );
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 670e87f655..3281d20a61 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomično",
 "No file was uploaded" => "Ni jedna datoteka nije poslana",
 "Missing a temporary folder" => "Nedostaje privremena mapa",
+"Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
-"Maximum upload size" => "Maksimalna veličina prijenosa",
-"Upload" => "Pošalji",
-"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
-"Name" => "Naziv",
-"Download" => "Preuzmi",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
+"File handling" => "datoteka za rukovanje",
+"Maximum upload size" => "Maksimalna veličina prijenosa",
+"max. possible: " => "maksimalna moguća: ",
+"Needed for multi-file and folder downloads." => "Potrebno za preuzimanje više datoteke i mape",
+"Enable ZIP-download" => "Omogući ZIP-preuzimanje",
+"0 is unlimited" => "0 je \"bez limita\"",
+"Maximum input size for ZIP files" => "Maksimalna veličina za ZIP datoteke",
+"New" => "novo",
+"Text file" => "tekstualna datoteka",
+"Folder" => "mapa",
+"From url" => "od URL-a",
+"Upload" => "Pošalji",
+"Cancel upload" => "Prekini upload",
+"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
+"Name" => "Naziv",
+"Share" => "podjeli",
+"Download" => "Preuzmi",
 "Delete" => "Briši",
 "Upload too large" => "Prijenos je preobiman",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
+"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
+"Current scanning" => "Trenutno skeniranje"
 );
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 6d9e67794b..41255cb409 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
+"Size" => "Méret",
+"Modified" => "Módosítva",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
 "max. possible: " => "max. lehetséges",
@@ -24,9 +26,6 @@
 "Name" => "Név",
 "Share" => "Megosztás",
 "Download" => "Letöltés",
-"Size" => "Méret",
-"Modified" => "Módosítva",
-"Delete all" => "Mindent töröl",
 "Delete" => "Törlés",
 "Upload too large" => "Feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 8753b871c9..645eba48a1 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -2,6 +2,8 @@
 "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
 "No file was uploaded" => "Nulle file esseva incargate",
 "Files" => "Files",
+"Size" => "Dimension",
+"Modified" => "Modificate",
 "Maximum upload size" => "Dimension maxime de incargamento",
 "New" => "Nove",
 "Text file" => "File de texto",
@@ -10,8 +12,6 @@
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
 "Name" => "Nomine",
 "Download" => "Discargar",
-"Size" => "Dimension",
-"Modified" => "Modificate",
 "Delete" => "Deler",
 "Upload too large" => "Incargamento troppo longe"
 );
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 902eeeb4ec..1f9dc3290a 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,13 +1,32 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
+"The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
+"No file was uploaded" => "Tidak ada berkas yang diunggah",
+"Missing a temporary folder" => "Kehilangan folder temporer",
+"Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
-"Maximum upload size" => "Ukuran unggah maksimum",
-"Upload" => "Unggah",
-"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
-"Name" => "Nama",
-"Download" => "Unduh",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"File handling" => "Penanganan berkas",
+"Maximum upload size" => "Ukuran unggah maksimum",
+"max. possible: " => "Kemungkinan maks:",
+"Needed for multi-file and folder downloads." => "Dibutuhkan untuk multi-berkas dan unduhan folder",
+"Enable ZIP-download" => "Aktifkan unduhan ZIP",
+"0 is unlimited" => "0 adalah tidak terbatas",
+"Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP",
+"New" => "Baru",
+"Text file" => "Berkas teks",
+"Folder" => "Folder",
+"From url" => "Dari url",
+"Upload" => "Unggah",
+"Cancel upload" => "Batal mengunggah",
+"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
+"Name" => "Nama",
+"Share" => "Bagikan",
+"Download" => "Unduh",
 "Delete" => "Hapus",
 "Upload too large" => "Unggahan terlalu besar",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini.",
+"Files are being scanned, please wait." => "Berkas sedang dipindai, silahkan tunggu.",
+"Current scanning" => "Sedang memindai"
 );
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 53642636ed..82871826c1 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Files" => "File",
+"Size" => "Dimensione",
+"Modified" => "Modificato",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
 "max. possible: " => "numero mass.: ",
@@ -24,9 +26,6 @@
 "Name" => "Nome",
 "Share" => "Condividi",
 "Download" => "Scarica",
-"Size" => "Dimensione",
-"Modified" => "Modificato",
-"Delete all" => "Elimina tutto",
 "Delete" => "Elimina",
 "Upload too large" => "Il file caricato è troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index cd89423b74..c04d0836df 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,22 +1,34 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました。",
+"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードされたファイルはphp.iniのupload_max_filesizeに設定されたサイズを超えています",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています",
 "The uploaded file was only partially uploaded" => "ファイルは一部分しかアップロードされませんでした",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
 "Missing a temporary folder" => "テンポラリフォルダが見つかりません",
+"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Files" => "ファイル",
-"Maximum upload size" => "最大アップロードサイズ",
-"New" => "新規作成",
-"Text file" => "テキストファイル",
-"Folder" => "フォルダ",
-"Upload" => "アップロード",
-"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
-"Name" => "名前",
-"Download" => "ダウンロード",
 "Size" => "サイズ",
 "Modified" => "更新日時",
+"File handling" => "ファイル操作",
+"Maximum upload size" => "最大アップロードサイズ",
+"max. possible: " => "最大容量: ",
+"Needed for multi-file and folder downloads." => "複数ファイルおよびフォルダのダウンロードに必要",
+"Enable ZIP-download" => "ZIP形式のダウンロードを有効にする",
+"0 is unlimited" => "0を指定した場合は無制限",
+"Maximum input size for ZIP files" => "ZIPファイルへの最大入力サイズ",
+"New" => "新規",
+"Text file" => "テキストファイル",
+"Folder" => "フォルダ",
+"From url" => "URL",
+"Upload" => "アップロード",
+"Cancel upload" => "アップロードをキャンセル",
+"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
+"Name" => "名前",
+"Share" => "共有",
+"Download" => "ダウンロード",
 "Delete" => "削除",
 "Upload too large" => "ファイルサイズが大きすぎます",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルはサーバで規定された最大サイズを超えています"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
+"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
+"Current scanning" => "スキャン中"
 );
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index d519df714e..70575f0975 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "임시 폴더가 사라짐",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Files" => "파일",
+"Size" => "크기",
+"Modified" => "수정됨",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
 "max. possible: " => "최대. 가능한:",
@@ -24,9 +26,6 @@
 "Name" => "이름",
 "Share" => "공유",
 "Download" => "다운로드",
-"Size" => "크기",
-"Modified" => "수정됨",
-"Delete all" => "모두 삭제",
 "Delete" => "삭제",
 "Upload too large" => "업로드 용량 초과",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 43956fcd63..548ef4895d 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
 "No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
 "Missing a temporary folder" => "Et feelt en temporären Dossier",
+"Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
-"Maximum upload size" => "Maximum Upload Gréisst ",
-"Upload" => "Eroplueden",
-"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Name" => "Numm",
-"Download" => "Eroflueden",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
+"File handling" => "Fichier handling",
+"Maximum upload size" => "Maximum Upload Gréisst ",
+"max. possible: " => "max. méiglech:",
+"Needed for multi-file and folder downloads." => "Gett gebraucht fir multi-Fichier an Dossier Downloads.",
+"Enable ZIP-download" => "ZIP-download erlaben",
+"0 is unlimited" => "0 ass onlimitéiert",
+"Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren",
+"New" => "Nei",
+"Text file" => "Text Fichier",
+"Folder" => "Dossier",
+"From url" => "From URL",
+"Upload" => "Eroplueden",
+"Cancel upload" => "Upload ofbriechen",
+"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
+"Name" => "Numm",
+"Share" => "Share",
+"Download" => "Eroflueden",
 "Delete" => "Läschen",
 "Upload too large" => "Upload ze grouss",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
+"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
+"Current scanning" => "Momentane Scan"
 );
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 24a16515f6..e876e743a4 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -5,17 +5,21 @@
 "The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
 "No file was uploaded" => "Nebuvo įkeltas nė vienas failas",
 "Missing a temporary folder" => "Nėra laikinojo katalogo",
+"Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Files" => "Failai",
+"Size" => "Dydis",
+"Modified" => "Pakeista",
 "Maximum upload size" => "Maksimalus failo dydis",
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
+"From url" => "Iš adreso",
 "Upload" => "Įkelti",
+"Cancel upload" => "Atšaukti siuntimą",
 "Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
 "Name" => "Pavadinimas",
+"Share" => "Dalintis",
 "Download" => "Atsisiųsti",
-"Size" => "Dydis",
-"Modified" => "Pakeista",
 "Delete" => "Ištrinti",
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index f32d6a237e..d3efa4d022 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Не постои привремена папка",
 "Failed to write to disk" => "Неуспеав да запишам на диск",
 "Files" => "Датотеки",
+"Size" => "Големина",
+"Modified" => "Променето",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
 "max. possible: " => "макс. можно:",
@@ -24,9 +26,6 @@
 "Name" => "Име",
 "Share" => "Сподели",
 "Download" => "Преземи",
-"Size" => "Големина",
-"Modified" => "Променето",
-"Delete all" => "Избриши сѐ",
 "Delete" => "Избриши",
 "Upload too large" => "Датотеката е премногу голема",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 432079baec..1a1d72a01b 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Tiada fail yang dimuat naik",
 "Missing a temporary folder" => "Folder sementara hilang",
 "Files" => "fail",
+"Size" => "Saiz",
+"Modified" => "Dimodifikasi",
 "Maximum upload size" => "Saiz maksimum muat naik",
 "New" => "Baru",
 "Text file" => "Fail teks",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
 "Name" => "Nama ",
 "Download" => "Muat turun",
-"Size" => "Saiz",
-"Modified" => "Dimodifikasi",
 "Delete" => "Padam",
 "Upload too large" => "Muat naik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 70ed95019b..0f4cc33ae3 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
+"Size" => "Størrelse",
+"Modified" => "Endret",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
 "max. possible: " => "max. mulige:",
@@ -24,9 +26,6 @@
 "Name" => "Navn",
 "Share" => "Del",
 "Download" => "Last ned",
-"Size" => "Størrelse",
-"Modified" => "Endret",
-"Delete all" => "Slett alle",
 "Delete" => "Slett",
 "Upload too large" => "Opplasting for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index e7f32b835b..119f6034f1 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
+"Size" => "Bestandsgrootte",
+"Modified" => "Laatst aangepast",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
@@ -24,9 +26,6 @@
 "Name" => "Naam",
 "Share" => "Delen",
 "Download" => "Download",
-"Size" => "Bestandsgrootte",
-"Modified" => "Laatst aangepast",
-"Delete all" => "Alles verwijderen",
 "Delete" => "Verwijder",
 "Upload too large" => "Bestanden te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index f3302b7a53..002e85de5c 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Ingen filer vart lasta opp",
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Files" => "Filer",
+"Size" => "Storleik",
+"Modified" => "Endra",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
 "New" => "Ny",
 "Text file" => "Tekst fil",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Name" => "Namn",
 "Download" => "Last ned",
-"Size" => "Storleik",
-"Modified" => "Endra",
 "Delete" => "Slett",
 "Upload too large" => "For stor opplasting",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 80b35f0825..bfdd04659d 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Plik przesłano tylko częściowo",
 "No file was uploaded" => "Nie przesłano żadnego pliku",
 "Missing a temporary folder" => "Brak katalogu tymczasowego",
+"Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
+"Size" => "Rozmiar",
+"Modified" => "Czas modyfikacji",
+"File handling" => "Zarządzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
+"max. possible: " => "max. możliwych",
+"Needed for multi-file and folder downloads." => "Wymagany do pobierania wielu plików i folderów",
+"Enable ZIP-download" => "Włącz pobieranie ZIP-paczki",
+"0 is unlimited" => "0 jest nielimitowane",
+"Maximum input size for ZIP files" => "Maksymalna wielkość pliku wejściowego ZIP ",
 "New" => "Nowy",
 "Text file" => "Plik tekstowy",
 "Folder" => "Katalog",
+"From url" => "Z adresu",
 "Upload" => "Prześlij",
+"Cancel upload" => "Przestań wysyłać",
 "Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!",
 "Name" => "Nazwa",
+"Share" => "Współdziel",
 "Download" => "Pobiera element",
-"Size" => "Rozmiar",
-"Modified" => "Czas modyfikacji",
 "Delete" => "Usuwa element",
 "Upload too large" => "Wysyłany plik ma za duży rozmiar",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość.",
+"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
+"Current scanning" => "Aktualnie skanowane"
 );
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index e4bb5e1f26..b70406f517 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Pasta temporária não encontrada",
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Files" => "Arquivos",
+"Size" => "Tamanho",
+"Modified" => "Modificado",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
@@ -24,9 +26,6 @@
 "Name" => "Nome",
 "Share" => "Compartilhar",
 "Download" => "Baixar",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
-"Delete all" => "Deletar Tudo",
 "Delete" => "Excluir",
 "Upload too large" => "Arquivo muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 9ac764d959..ac22430282 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
 "No file was uploaded" => "Não foi enviado nenhum ficheiro",
 "Missing a temporary folder" => "Falta uma pasta temporária",
+"Failed to write to disk" => "Falhou a escrita no disco",
 "Files" => "Ficheiros",
+"Size" => "Tamanho",
+"Modified" => "Modificado",
+"File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
+"max. possible: " => "max. possivel: ",
+"Needed for multi-file and folder downloads." => "Necessário para multi download de ficheiros e pastas",
+"Enable ZIP-download" => "Ativar dowload de ficheiros ZIP",
+"0 is unlimited" => "0 é ilimitado",
+"Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
+"From url" => "Do endereço",
 "Upload" => "Enviar",
+"Cancel upload" => "Cancelar upload",
 "Nothing in here. Upload something!" => "Vazio. Envia alguma coisa!",
 "Name" => "Nome",
+"Share" => "Partilhar",
 "Download" => "Transferir",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
 "Delete" => "Apagar",
 "Upload too large" => "Envio muito grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor.",
+"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
+"Current scanning" => "Análise actual"
 );
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 307d67d66c..e6f0294fd3 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
 "No file was uploaded" => "Niciun fișier încărcat",
 "Missing a temporary folder" => "Lipsește un dosar temporar",
+"Failed to write to disk" => "Eroare la scriere pe disc",
 "Files" => "Fișiere",
+"Size" => "Dimensiune",
+"Modified" => "Modificat",
+"File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
+"max. possible: " => "max. posibil:",
+"Needed for multi-file and folder downloads." => "Necesar pentru descărcarea mai multor fișiere și a dosarelor",
+"Enable ZIP-download" => "Activează descărcare fișiere compresate",
+"0 is unlimited" => "0 e nelimitat",
+"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
 "New" => "Nou",
 "Text file" => "Fișier text",
 "Folder" => "Dosar",
+"From url" => "De la URL",
 "Upload" => "Încarcă",
+"Cancel upload" => "Anulează încărcarea",
 "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
 "Name" => "Nume",
+"Share" => "Partajează",
 "Download" => "Descarcă",
-"Size" => "Dimensiune",
-"Modified" => "Modificat",
 "Delete" => "Șterge",
 "Upload too large" => "Fișierul încărcat este prea mare",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
+"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
+"Current scanning" => "În curs de scanare"
 );
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index d531d2589c..45648012a1 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Файл был загружен не полностью",
 "No file was uploaded" => "Файл не был загружен",
 "Missing a temporary folder" => "Невозможно найти временную папку",
+"Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Size" => "Размер",
+"Modified" => "Изменен",
+"File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер файла",
+"max. possible: " => "макс. возможно: ",
+"Needed for multi-file and folder downloads." => "Требуется для загрузки нескольких файорв и папок",
+"Enable ZIP-download" => "Включить ZIP-загрузку",
+"0 is unlimited" => "0 - без ограничений",
+"Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
+"From url" => "С url",
 "Upload" => "Закачать",
+"Cancel upload" => "Отмена закачки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Закачайте что-нибудь!",
 "Name" => "Название",
+"Share" => "Поделиться",
 "Download" => "Скачать",
-"Size" => "Размер",
-"Modified" => "Изменен",
 "Delete" => "Удалить",
 "Upload too large" => "Файл слишком большой",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь закачать, превышают лимит для файлов на этом сервере."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь закачать, превышают лимит для файлов на этом сервере.",
+"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
+"Current scanning" => "Текущее сканирование"
 );
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index a4e14e6bb8..2a7e84af6c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Chýbajúci dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Files" => "Súbory",
+"Size" => "Veľkosť",
+"Modified" => "Upravené",
 "File handling" => "Nastavenie správanie k súborom",
 "Maximum upload size" => "Maximálna veľkosť nahratia",
 "max. possible: " => "najväčšie možné:",
@@ -24,9 +26,6 @@
 "Name" => "Meno",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
-"Size" => "Veľkosť",
-"Modified" => "Upravené",
-"Delete all" => "Odstrániť všetko",
 "Delete" => "Odstrániť",
 "Upload too large" => "Nahrávanie príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 8969a3f092..b0ea2dc373 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Files" => "Datoteke",
+"Size" => "Velikost",
+"Modified" => "Spremenjeno",
 "File handling" => "Rokovanje z datotekami",
 "Maximum upload size" => "Največja velikost za nalaganje",
 "max. possible: " => "največ mogoče:",
@@ -24,9 +26,6 @@
 "Name" => "Ime",
 "Share" => "Souporaba",
 "Download" => "Prejmi",
-"Size" => "Velikost",
-"Modified" => "Spremenjeno",
-"Delete all" => "Izbriši vse",
 "Delete" => "Izbriši",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index bd70ab02c8..68c50d5282 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Ниједан фајл није послат",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Files" => "Фајлови",
+"Size" => "Величина",
+"Modified" => "Задња измена",
 "Maximum upload size" => "Максимална величина пошиљке",
 "New" => "Нови",
 "Text file" => "текстуални фајл",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
 "Name" => "Име",
 "Download" => "Преузми",
-"Size" => "Величина",
-"Modified" => "Задња измена",
 "Delete" => "Обриши",
 "Upload too large" => "Пошиљка је превелика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index 1b5addbc57..63843fc8b5 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,13 +6,13 @@
 "No file was uploaded" => "Nijedan fajl nije poslat",
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
+"Size" => "Veličina",
+"Modified" => "Zadnja izmena",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
 "Upload" => "Pošalji",
 "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
 "Name" => "Ime",
 "Download" => "Preuzmi",
-"Size" => "Veličina",
-"Modified" => "Zadnja izmena",
 "Delete" => "Obriši",
 "Upload too large" => "Pošiljka je prevelika",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 1c83ab6c0b..f508f22f3c 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvist uppladdad",
 "No file was uploaded" => "Ingen fil blev uppladdad",
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
+"Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
-"Maximum upload size" => "Maximal storlek att lägga upp",
+"Size" => "Storlek",
+"Modified" => "Ändrad",
+"File handling" => "Filhantering",
+"Maximum upload size" => "Maximal storlek att ladda upp",
+"max. possible: " => "max. möjligt:",
+"Needed for multi-file and folder downloads." => "Krävs för nerladdning av flera mappar och filer",
+"Enable ZIP-download" => "Aktivera ZIP-nerladdning",
+"0 is unlimited" => "0 är lika med oändligt",
+"Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP filer",
 "New" => "Ny",
 "Text file" => "Textfil",
 "Folder" => "Mapp",
+"From url" => "Från webbadress",
 "Upload" => "Ladda upp",
+"Cancel upload" => "Avbryt uppladdning",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Name" => "Namn",
+"Share" => "Dela",
 "Download" => "Ladda ned",
-"Size" => "Storlek",
-"Modified" => "Ändrad",
 "Delete" => "Ta bort",
 "Upload too large" => "För stor uppladdning",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
+"Files are being scanned, please wait." => "Filerna skannas, var god vänta",
+"Current scanning" => "Aktuell avsökning"
 );
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 9b446125a3..ec538262e0 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Size" => "ขนาด",
+"Modified" => "ปรับปรุงล่าสุด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
 "max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ",
@@ -24,9 +26,6 @@
 "Name" => "ชื่อ",
 "Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
-"Size" => "ขนาด",
-"Modified" => "ปรับปรุงล่าสุด",
-"Delete all" => "ลบทั้งหมด",
 "Delete" => "ลบ",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index d8d32e226c..b8de8249a1 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Size" => "Boyut",
+"Modified" => "Değiştirilme",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
 "max. possible: " => "mümkün olan en fazla: ",
@@ -24,9 +26,6 @@
 "Name" => "Ad",
 "Share" => "Paylaş",
 "Download" => "İndir",
-"Size" => "Boyut",
-"Modified" => "Değiştirilme",
-"Delete all" => "Hepsini sil",
 "Delete" => "Sil",
 "Upload too large" => "Yüklemeniz çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 37e1c4b838..8b21cb26a3 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
+"Size" => "Розмір",
+"Modified" => "Змінено",
 "Maximum upload size" => "Максимальний розмір відвантажень",
 "New" => "Створити",
 "Text file" => "Текстовий файл",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Name" => "Ім'я",
 "Download" => "Завантажити",
-"Size" => "Розмір",
-"Modified" => "Змінено",
 "Delete" => "Видалити",
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 748c789799..c2e6541f2a 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Files" => "文件",
+"Size" => "大小",
+"Modified" => "修改日期",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能: ",
@@ -24,9 +26,6 @@
 "Name" => "名称",
 "Share" => "共享",
 "Download" => "下载",
-"Size" => "大小",
-"Modified" => "修改日期",
-"Delete all" => "删除所有",
 "Delete" => "删除",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大大小",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 2ff343b0f3..91a1344ca3 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -7,7 +7,15 @@
 "Missing a temporary folder" => "遺失暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
+"Size" => "大小",
+"Modified" => "修改",
+"File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳容量",
+"max. possible: " => "最大允許: ",
+"Needed for multi-file and folder downloads." => "針對多檔案和目錄下載是必填的",
+"Enable ZIP-download" => "啟用 Zip 下載",
+"0 is unlimited" => "0代表沒有限制",
+"Maximum input size for ZIP files" => "針對ZIP檔案最大輸入大小",
 "New" => "新增",
 "Text file" => "文字檔",
 "Folder" => "資料夾",
@@ -18,10 +26,9 @@
 "Name" => "名稱",
 "Share" => "分享",
 "Download" => "下載",
-"Size" => "大小",
-"Modified" => "修改",
-"Delete all" => "全部刪除",
 "Delete" => "刪除",
 "Upload too large" => "上傳過大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　",
+"Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
+"Current scanning" => "目前掃描"
 );
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
index cbb0d8b6c5..165414fba2 100644
--- a/apps/gallery/l10n/ca.php
+++ b/apps/gallery/l10n/ca.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Fotos",
+"Settings" => "Arranjament",
 "Rescan" => "Escaneja de nou",
 "Stop" => "Atura",
 "Share" => "Comparteix",
-"Settings" => "Arranjament",
 "Back" => "Enrera",
 "Remove confirmation" => "Elimina la confirmació",
 "Do you want to remove album" => "Voleu eliminar l'àlbum",
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
index 4d6394cbb3..d008e9d28b 100644
--- a/apps/gallery/l10n/cs_CZ.php
+++ b/apps/gallery/l10n/cs_CZ.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Obrázky",
+"Settings" => "Nastavení",
 "Rescan" => "Znovu prohledat",
 "Stop" => "Zastavit",
 "Share" => "Sdílet",
-"Settings" => "Nastavení",
 "Back" => "Zpět",
 "Remove confirmation" => "Potvrzení odebrání",
 "Do you want to remove album" => "Chcete odstranit album?",
diff --git a/apps/gallery/l10n/da.php b/apps/gallery/l10n/da.php
index b13b16350e..172f3c95e8 100644
--- a/apps/gallery/l10n/da.php
+++ b/apps/gallery/l10n/da.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Billeder",
+"Settings" => "Indstillinger",
 "Rescan" => "Genindlæs",
-"Back" => "Tilbage"
+"Stop" => "Stop",
+"Share" => "Del",
+"Back" => "Tilbage",
+"Remove confirmation" => "Fjern bekræftelse",
+"Do you want to remove album" => "Ønsker du at fjerne albummet",
+"Change album name" => "Ændre albummets navn",
+"New album name" => "Nyt album navn"
 );
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index f760022ba2..6c3d9fc738 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
-"Rescan" => "Rescan",
+"Settings" => "Einstellungen",
+"Rescan" => "Erneut Scannen",
 "Stop" => "Stopp",
 "Share" => "Teilen",
-"Settings" => "Einstellungen",
 "Back" => "Zurück",
 "Remove confirmation" => "Bestätigung entfernen",
 "Do you want to remove album" => "Soll das Album entfernt werden",
diff --git a/apps/gallery/l10n/el.php b/apps/gallery/l10n/el.php
index 461bd34670..3983011a0c 100644
--- a/apps/gallery/l10n/el.php
+++ b/apps/gallery/l10n/el.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Εικόνες",
-"Rescan" => "Επανασάρωση",
-"Stop" => "Σταμάτησε",
-"Share" => "Κοινοποίησε",
 "Settings" => "Ρυθμίσεις",
+"Rescan" => "Επανασάρωση",
+"Stop" => "Διακοπή",
+"Share" => "Κοινοποίηση",
 "Back" => "Επιστροφή",
 "Remove confirmation" => "Αφαίρεση επιβεβαίωσης",
 "Do you want to remove album" => "Θέλετε να αφαιρέσετε το άλμπουμ",
diff --git a/apps/gallery/l10n/eo.php b/apps/gallery/l10n/eo.php
index 7958d04f1b..254010b788 100644
--- a/apps/gallery/l10n/eo.php
+++ b/apps/gallery/l10n/eo.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Bildoj",
+"Settings" => "Agordo",
 "Rescan" => "Reskani",
-"Back" => "Antaŭen"
+"Stop" => "Halti",
+"Share" => "Kunhavigi",
+"Back" => "Antaŭen",
+"Remove confirmation" => "Forigi konfirmadon",
+"Do you want to remove album" => "Ĉu vi volas forigi la albumon?",
+"Change album name" => "Ŝanĝi albumnomon",
+"New album name" => "Nova albumnomo"
 );
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
index 098a92b5c5..03e8d6a456 100644
--- a/apps/gallery/l10n/es.php
+++ b/apps/gallery/l10n/es.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Imágenes",
+"Settings" => "Preferencias",
 "Rescan" => "Refrescar",
 "Stop" => "Parar",
 "Share" => "Compartir",
-"Settings" => "Preferencias",
 "Back" => "Atrás",
 "Remove confirmation" => "Borrar confirmación",
 "Do you want to remove album" => "¿Quieres eliminar el álbum",
diff --git a/apps/gallery/l10n/et_EE.php b/apps/gallery/l10n/et_EE.php
index e386274bc5..06bd3a5b8f 100644
--- a/apps/gallery/l10n/et_EE.php
+++ b/apps/gallery/l10n/et_EE.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Pildid",
+"Settings" => "Seaded",
 "Rescan" => "Skänni uuesti",
 "Stop" => "Peata",
 "Share" => "Jaga",
-"Settings" => "Seaded",
 "Back" => "Tagasi",
 "Remove confirmation" => "Eemaldamise kinnitus",
 "Do you want to remove album" => "Kas sa soovid albumit eemaldada",
diff --git a/apps/gallery/l10n/eu.php b/apps/gallery/l10n/eu.php
index 9942183523..f406730a8e 100644
--- a/apps/gallery/l10n/eu.php
+++ b/apps/gallery/l10n/eu.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Argazkiak",
+"Settings" => "Ezarpenak",
 "Rescan" => "Bireskaneatu",
 "Stop" => "Gelditu",
 "Share" => "Elkarbanatu",
-"Settings" => "Ezarpenak",
 "Back" => "Atzera",
 "Remove confirmation" => "Ezabatu konfirmazioa",
 "Do you want to remove album" => "Albuma ezabatu nahi al duzu",
diff --git a/apps/gallery/l10n/fa.php b/apps/gallery/l10n/fa.php
index 4ddf28b015..97d47047eb 100644
--- a/apps/gallery/l10n/fa.php
+++ b/apps/gallery/l10n/fa.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "تصاویر",
+"Settings" => "تنظیمات",
 "Rescan" => "بازرسی دوباره",
 "Stop" => "توقف",
 "Share" => "به اشتراک گذاری",
-"Settings" => "تنظیمات",
 "Back" => "بازگشت",
 "Remove confirmation" => "پاک کردن تصدیق",
 "Do you want to remove album" => "آیا مایل به پاک کردن آلبوم هستید؟",
diff --git a/apps/gallery/l10n/fi_FI.php b/apps/gallery/l10n/fi_FI.php
new file mode 100644
index 0000000000..267bb5e547
--- /dev/null
+++ b/apps/gallery/l10n/fi_FI.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Kuvat",
+"Settings" => "Asetukset",
+"Rescan" => "Etsi uusia",
+"Stop" => "Pysäytä",
+"Share" => "Jaa",
+"Back" => "Takaisin",
+"Remove confirmation" => "Poiston vahvistus",
+"Do you want to remove album" => "Tahdotko poistaa albumin",
+"Change album name" => "Muuta albumin nimeä",
+"New album name" => "Uuden albumin nimi"
+);
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
index 4cbd42f1b3..dfd668ebe8 100644
--- a/apps/gallery/l10n/fr.php
+++ b/apps/gallery/l10n/fr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Images",
+"Settings" => "Préférences",
 "Rescan" => "Analyser à nouveau",
 "Stop" => "Arrêter",
 "Share" => "Partager",
-"Settings" => "Préférences",
 "Back" => "Retour",
 "Remove confirmation" => "Enlever la confirmation",
 "Do you want to remove album" => "Voulez-vous supprimer l'album",
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
index b06a159822..b7993ff5c8 100644
--- a/apps/gallery/l10n/gl.php
+++ b/apps/gallery/l10n/gl.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Fotografías",
+"Settings" => "Configuración",
 "Rescan" => "Analizar de novo",
-"Back" => "Atrás"
+"Stop" => "Parar",
+"Share" => "Compartir",
+"Back" => "Atrás",
+"Remove confirmation" => "Eliminar confirmación",
+"Do you want to remove album" => "Quere eliminar o album",
+"Change album name" => "Trocar o nome do album",
+"New album name" => "Novo nome do album"
 );
diff --git a/apps/gallery/l10n/hr.php b/apps/gallery/l10n/hr.php
new file mode 100644
index 0000000000..edc11ebd9d
--- /dev/null
+++ b/apps/gallery/l10n/hr.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Slike",
+"Settings" => "Postavke",
+"Rescan" => "Ponovo očitaj",
+"Stop" => "Zaustavi",
+"Share" => "Podijeli",
+"Back" => "Natrag",
+"Remove confirmation" => "Ukloni potvrdu",
+"Do you want to remove album" => "Želite li ukloniti album",
+"Change album name" => "Promijeni ime albuma",
+"New album name" => "Novo ime albuma"
+);
diff --git a/apps/gallery/l10n/hu_HU.php b/apps/gallery/l10n/hu_HU.php
index bd30fe20f2..34adf7719c 100644
--- a/apps/gallery/l10n/hu_HU.php
+++ b/apps/gallery/l10n/hu_HU.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Képek",
+"Settings" => "Beállítások",
 "Rescan" => "Újravizsgálás",
 "Stop" => "Állj",
 "Share" => "Megosztás",
-"Settings" => "Beállítások",
 "Back" => "Vissza",
 "Remove confirmation" => "Megerősítés eltávolítása",
 "Do you want to remove album" => "El akarja távolítani az albumot?",
diff --git a/apps/gallery/l10n/id.php b/apps/gallery/l10n/id.php
new file mode 100644
index 0000000000..7a977b3c9a
--- /dev/null
+++ b/apps/gallery/l10n/id.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Gambar",
+"Settings" => "Setting",
+"Rescan" => "Scan ulang",
+"Stop" => "Berhenti",
+"Share" => "Bagikan",
+"Back" => "Kembali",
+"Remove confirmation" => "Hapus konfirmasi",
+"Do you want to remove album" => "Apakah anda ingin menghapus album",
+"Change album name" => "Ubah nama album",
+"New album name" => "Nama album baru"
+);
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
index 1ca8712926..e21a1d6524 100644
--- a/apps/gallery/l10n/it.php
+++ b/apps/gallery/l10n/it.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Immagini",
+"Settings" => "Impostazioni",
 "Rescan" => "Nuova scansione",
 "Stop" => "Ferma",
 "Share" => "Condividi",
-"Settings" => "Impostazioni",
 "Back" => "Indietro",
 "Remove confirmation" => "Rimuovi conferma",
 "Do you want to remove album" => "Vuoi rimuovere l'album",
diff --git a/apps/gallery/l10n/ja_JP.php b/apps/gallery/l10n/ja_JP.php
index 70d4efa53a..4ef4510bab 100644
--- a/apps/gallery/l10n/ja_JP.php
+++ b/apps/gallery/l10n/ja_JP.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "写真",
+"Settings" => "設定",
 "Rescan" => "再スキャン",
-"Back" => "戻る"
+"Stop" => "停止",
+"Share" => "共有",
+"Back" => "戻る",
+"Remove confirmation" => "承認を取りやめ",
+"Do you want to remove album" => "アルバムを削除しますか？",
+"Change album name" => "アルバム名を変更する",
+"New album name" => "新しいアルバム名"
 );
diff --git a/apps/gallery/l10n/ko.php b/apps/gallery/l10n/ko.php
index b6d37796a0..1900049f87 100644
--- a/apps/gallery/l10n/ko.php
+++ b/apps/gallery/l10n/ko.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "사진",
+"Settings" => "세팅",
 "Rescan" => "재검색",
 "Stop" => "정지",
 "Share" => "공유",
-"Settings" => "세팅",
 "Back" => "뒤로",
 "Remove confirmation" => "삭제 승인",
 "Do you want to remove album" => "앨범을 삭제하시겠습니까",
diff --git a/apps/gallery/l10n/lb.php b/apps/gallery/l10n/lb.php
new file mode 100644
index 0000000000..136acedc65
--- /dev/null
+++ b/apps/gallery/l10n/lb.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Fotoen",
+"Settings" => "Astellungen",
+"Rescan" => "Nei scannen",
+"Stop" => "Stop",
+"Share" => "Deelen",
+"Back" => "Zeréck",
+"Remove confirmation" => "Konfirmatioun läschen",
+"Do you want to remove album" => "Wëlls de den Album läschen",
+"Change album name" => "Album Numm änneren",
+"New album name" => "Neien Numm fir den Album"
+);
diff --git a/apps/gallery/l10n/lt_LT.php b/apps/gallery/l10n/lt_LT.php
index 1d8e064982..89c1a92d0c 100644
--- a/apps/gallery/l10n/lt_LT.php
+++ b/apps/gallery/l10n/lt_LT.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Nuotraukos",
+"Settings" => "Nustatymai",
 "Rescan" => "Atnaujinti",
-"Back" => "Atgal"
+"Stop" => "Sustabdyti",
+"Share" => "Dalintis",
+"Back" => "Atgal",
+"Remove confirmation" => "Išjungti patvirtinimą",
+"Do you want to remove album" => "Ar tikrai norite pašalinti albumą",
+"Change album name" => "Keisti albumo pavadinimą",
+"New album name" => "Naujo albumo pavadinimas"
 );
diff --git a/apps/gallery/l10n/mk.php b/apps/gallery/l10n/mk.php
index 59bef78bec..97f85de7ab 100644
--- a/apps/gallery/l10n/mk.php
+++ b/apps/gallery/l10n/mk.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Слики",
+"Settings" => "Параметри",
 "Rescan" => "Рескенирај",
 "Stop" => "Стоп",
 "Share" => "Сподели",
-"Settings" => "Параметри",
 "Back" => "Назад",
 "Remove confirmation" => "Тргни потврда",
 "Do you want to remove album" => "Дали сакате да го отстраните албумот",
diff --git a/apps/gallery/l10n/nb_NO.php b/apps/gallery/l10n/nb_NO.php
index e3f35ea393..93dcb8372d 100644
--- a/apps/gallery/l10n/nb_NO.php
+++ b/apps/gallery/l10n/nb_NO.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
+"Settings" => "Innstillinger",
 "Rescan" => "Les inn på nytt",
 "Stop" => "Stopp",
 "Share" => "Del",
-"Settings" => "Innstillinger",
 "Back" => "Tilbake",
 "Remove confirmation" => "Fjern bekreftelse",
 "Do you want to remove album" => "Ønsker du å slette albumet?",
diff --git a/apps/gallery/l10n/nl.php b/apps/gallery/l10n/nl.php
index b4bd0eb8ea..8c987a03d6 100644
--- a/apps/gallery/l10n/nl.php
+++ b/apps/gallery/l10n/nl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Plaatjes",
+"Settings" => "Instellingen",
 "Rescan" => "Opnieuw doorzoeken",
 "Stop" => "Stop",
 "Share" => "Deel",
-"Settings" => "Instellingen",
 "Back" => "Terug",
 "Remove confirmation" => "Verwijder bevestiging",
 "Do you want to remove album" => "Wil je het album verwijderen: ",
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index 36004daa25..1ff636ac2a 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Zdjęcia",
+"Settings" => "Ustawienia",
 "Rescan" => "Przeszukaj",
-"Back" => "Wróć"
+"Stop" => "Stop",
+"Share" => "Współdziel",
+"Back" => "Wróć",
+"Remove confirmation" => "Usuń potwierdzenie",
+"Do you want to remove album" => "Czy chcesz usunąć album",
+"Change album name" => "Zmień nazwę albumu",
+"New album name" => "Nowa nazwa albumu"
 );
diff --git a/apps/gallery/l10n/pt_BR.php b/apps/gallery/l10n/pt_BR.php
index 6fb47e4f84..7b45df444e 100644
--- a/apps/gallery/l10n/pt_BR.php
+++ b/apps/gallery/l10n/pt_BR.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Fotos",
+"Settings" => "Configuração",
 "Rescan" => "Atualizar",
 "Stop" => "Parar",
 "Share" => "Compartilhar",
-"Settings" => "Configuração",
 "Back" => "Voltar",
 "Remove confirmation" => "Confirmar apagar",
 "Do you want to remove album" => "Voçe dezeja remover o album",
diff --git a/apps/gallery/l10n/pt_PT.php b/apps/gallery/l10n/pt_PT.php
index 5d704b824c..54e99cf245 100644
--- a/apps/gallery/l10n/pt_PT.php
+++ b/apps/gallery/l10n/pt_PT.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Imagens",
+"Settings" => "Definições",
 "Rescan" => "Atualizar",
-"Back" => "Voltar"
+"Stop" => "Parar",
+"Share" => "Partilhar",
+"Back" => "Voltar",
+"Remove confirmation" => "Remove confirmação",
+"Do you want to remove album" => "Deseja remover o album",
+"Change album name" => "Mudar o nome do album",
+"New album name" => "Novo nome do album"
 );
diff --git a/apps/gallery/l10n/ro.php b/apps/gallery/l10n/ro.php
index 624e73659b..3537c68b17 100644
--- a/apps/gallery/l10n/ro.php
+++ b/apps/gallery/l10n/ro.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Imagini",
+"Settings" => "Setări",
 "Rescan" => "Re-scanează",
-"Back" => "Înapoi"
+"Stop" => "Stop",
+"Share" => "Partajează",
+"Back" => "Înapoi",
+"Remove confirmation" => "Șterge confirmarea",
+"Do you want to remove album" => "Vrei să ștergi albumul",
+"Change album name" => "Schimbă numele albumului",
+"New album name" => "Nume nou album"
 );
diff --git a/apps/gallery/l10n/ru.php b/apps/gallery/l10n/ru.php
index 177d5fd3f3..f1c530ed28 100644
--- a/apps/gallery/l10n/ru.php
+++ b/apps/gallery/l10n/ru.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Рисунки",
+"Settings" => "Настройки",
 "Rescan" => "Обновить",
-"Back" => "Назад"
+"Stop" => "Остановить",
+"Share" => "Поделиться",
+"Back" => "Назад",
+"Remove confirmation" => "Подтверждение удаления",
+"Do you want to remove album" => "Вы хотите удалить альбом?",
+"Change album name" => "Изменить имя альбома",
+"New album name" => "Новое имя альбома"
 );
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
index 9c18cb49cd..e3e3be7881 100644
--- a/apps/gallery/l10n/sk_SK.php
+++ b/apps/gallery/l10n/sk_SK.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Obrázky",
+"Settings" => "nastavenia",
 "Rescan" => "Znovu oskenovať",
 "Stop" => "Zastaviť",
 "Share" => "Zdielať",
-"Settings" => "nastavenia",
 "Back" => "Späť",
 "Remove confirmation" => "Potvrdenie odstránenia",
 "Do you want to remove album" => "Chcete odstrániť album?",
diff --git a/apps/gallery/l10n/sl.php b/apps/gallery/l10n/sl.php
index 671e730636..5e06123986 100644
--- a/apps/gallery/l10n/sl.php
+++ b/apps/gallery/l10n/sl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Slike",
+"Settings" => "Nastavitve",
 "Rescan" => "Ponovno preišči",
 "Stop" => "Stop",
 "Share" => "Deli",
-"Settings" => "Nastavitve",
 "Back" => "Nazaj",
 "Remove confirmation" => "Odstrani potrditev",
 "Do you want to remove album" => "Ali želite odstraniti album",
diff --git a/apps/gallery/l10n/sv.php b/apps/gallery/l10n/sv.php
index c1568e348d..520d271df1 100644
--- a/apps/gallery/l10n/sv.php
+++ b/apps/gallery/l10n/sv.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Bilder",
+"Settings" => "Inställningar",
 "Rescan" => "Sök igen",
-"Back" => "Tillbaka"
+"Stop" => "Stoppa",
+"Share" => "Dela",
+"Back" => "Tillbaka",
+"Remove confirmation" => "Vill du säkert ta bort",
+"Do you want to remove album" => "Vill du ta bort albumet",
+"Change album name" => "Ändra albumnamnet",
+"New album name" => "Albumnamn"
 );
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
index 39d43dcdc4..34da8dc57f 100644
--- a/apps/gallery/l10n/th_TH.php
+++ b/apps/gallery/l10n/th_TH.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "รูปภาพ",
+"Settings" => "ตั้งค่า",
 "Rescan" => "ตรวจสอบอีกครั้ง",
 "Stop" => "หยุด",
 "Share" => "แชร์",
-"Settings" => "ตั้งค่า",
 "Back" => "ย้อนกลับ",
 "Remove confirmation" => "การยืนยันการลบ",
 "Do you want to remove album" => "คุณต้องการลบอัลบั้มออกหรือไม่",
diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php
index 07d853998b..c42592448c 100644
--- a/apps/gallery/l10n/tr.php
+++ b/apps/gallery/l10n/tr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Resimler",
+"Settings" => "Ayarlar",
 "Rescan" => "Yeniden Tara ",
 "Stop" => "Durdur",
 "Share" => "Paylaş",
-"Settings" => "Ayarlar",
 "Back" => "Geri",
 "Remove confirmation" => "Doğrulamayı kaldır",
 "Do you want to remove album" => "Albümü silmek istiyor musunuz",
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
index 006c64c32b..ffa321f7de 100644
--- a/apps/gallery/l10n/zh_CN.php
+++ b/apps/gallery/l10n/zh_CN.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "图片",
+"Settings" => "设置",
 "Rescan" => "重新扫描",
 "Stop" => "停止",
 "Share" => "分享",
-"Settings" => "设置",
 "Back" => "返回",
 "Remove confirmation" => "移除确认",
 "Do you want to remove album" => "您是否想要移除相册",
diff --git a/apps/gallery/l10n/zh_TW.php b/apps/gallery/l10n/zh_TW.php
index 3e633bd792..eb4577affc 100644
--- a/apps/gallery/l10n/zh_TW.php
+++ b/apps/gallery/l10n/zh_TW.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "圖片",
+"Settings" => "設定",
 "Rescan" => "重新掃描",
 "Stop" => "停止",
 "Share" => "分享",
-"Settings" => "設定",
 "Back" => "返回",
 "Remove confirmation" => "移除確認",
 "Do you want to remove album" => "你確定要移除相簿嗎",
diff --git a/apps/media/l10n/fi_FI.php b/apps/media/l10n/fi_FI.php
new file mode 100644
index 0000000000..2426f6a220
--- /dev/null
+++ b/apps/media/l10n/fi_FI.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musiikki",
+"Play" => "Toista",
+"Pause" => "Tauko",
+"Previous" => "Edellinen",
+"Next" => "Seuraava",
+"Mute" => "Mykistä",
+"Unmute" => "Palauta äänet",
+"Rescan Collection" => "Etsi uusia kappaleita",
+"Artist" => "Esittäjä",
+"Album" => "Albumi",
+"Title" => "Nimi"
+);
diff --git a/apps/media/l10n/ja_JP.php b/apps/media/l10n/ja_JP.php
index 395ebe792e..7faa098250 100644
--- a/apps/media/l10n/ja_JP.php
+++ b/apps/media/l10n/ja_JP.php
@@ -6,7 +6,7 @@
 "Next" => "次",
 "Mute" => "ミュート",
 "Unmute" => "ミュート解除",
-"Rescan Collection" => "コレクションを再読み込みする",
+"Rescan Collection" => "コレクションの再スキャン",
 "Artist" => "アーティスト",
 "Album" => "アルバム",
 "Title" => "曲名"
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 97ebb27bac..f7b5b48f6f 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
 "Requested" => "Forespugt",
@@ -15,7 +19,10 @@
 "Apps" => "Apps",
 "Admin" => "Admin",
 "Help" => "Hjælp",
+"Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
+"Edit categories" => "Rediger kategorier",
+"Add" => "Tilføj",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Password" => "Kodeord",
 "Advanced" => "Avanceret",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index f29382f8ef..9fcd5c8496 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Application name not provided." => "Applikationsname nicht angegeben",
-"No category to add?" => "Keine Kategorie hinzufügen?",
+"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",
 "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}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 5d2e3310c3..6dc65ed495 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,6 +1,46 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
+"Requested" => "Tilattu",
+"Login failed!" => "Kirjautuminen epäonnistui!",
 "Username" => "Käyttäjätunnus",
+"Request reset" => "Tilaus lähetetty",
+"Your password was reset" => "Salasanasi nollattiin",
+"To login page" => "Kirjautumissivulle",
+"New password" => "Uusi salasana",
+"Reset password" => "Palauta salasana",
+"Personal" => "Henkilökohtaiset",
+"Users" => "Käyttäjät",
+"Apps" => "Sovellukset",
+"Admin" => "Hallinta",
+"Help" => "Ohje",
+"Access forbidden" => "Pääsy estetty",
+"Cloud not found" => "Pilveä ei löydy",
+"Edit categories" => "Muokkaa luokkia",
+"Add" => "Lisää",
+"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
 "Password" => "Salasana",
+"Advanced" => "Lisäasetukset",
+"Data folder" => "Datakansio",
+"Configure the database" => "Muokkaa tietokantaa",
+"will be used" => "käytetään",
+"Database user" => "Tietokannan käyttäjä",
+"Database password" => "Tietokannan salasana",
+"Database name" => "Tietokannan nimi",
+"Database host" => "Tietokantapalvelin",
+"Finish setup" => "Viimeistele asennus",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
-"You are logged out." => "Olet kirjautunut ulos."
+"Settings" => "Asetukset",
+"Lost your password?" => "Unohditko salasanasi?",
+"remember" => "muista",
+"Log in" => "Kirjaudu sisään",
+"You are logged out." => "Olet kirjautunut ulos.",
+"prev" => "edellinen",
+"next" => "seuraava"
 );
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index ae080dc4bc..8d839a6ac6 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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",
 "Requested" => "Solicitado",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicativos",
 "Admin" => "Admin",
 "Help" => "Axuda",
+"Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
+"Edit categories" => "Editar categorias",
+"Add" => "Engadir",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Password" => "Contrasinal",
 "Advanced" => "Avanzado",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f91d283118..1929681e06 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "שם היישום לא סופק.",
+"No category to add?" => "אין קטגוריה להוספה?",
+"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
+"Owncloud password reset" => "איפוס הססמה של ownCloud",
+"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." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
 "Requested" => "נדרש",
 "Login failed!" => "הכניסה נכשלה!",
 "Username" => "שם משתמש",
 "Request reset" => "בקשת איפוס",
 "Your password was reset" => "הססמה שלך אופסה",
+"To login page" => "לדף הכניסה",
 "New password" => "ססמה חדשה",
 "Reset password" => "איפוס ססמה",
 "Personal" => "אישי",
@@ -12,7 +19,10 @@
 "Apps" => "יישומים",
 "Admin" => "מנהל",
 "Help" => "עזרה",
+"Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
+"Edit categories" => "עריכת הקטגוריות",
+"Add" => "הוספה",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
 "Password" => "ססמה",
 "Advanced" => "מתקדם",
@@ -24,11 +34,13 @@
 "Database name" => "שם מסד הנתונים",
 "Database host" => "שרת בסיס נתונים",
 "Finish setup" => "סיום התקנה",
+"web services under your control" => "שירותי רשת בשליטתך",
 "Log out" => "התנתקות",
 "Settings" => "הגדרות",
 "Lost your password?" => "שכחת את ססמתך?",
 "remember" => "שמירת הססמה",
-"You are logged out." => "אינך מחובר.",
-"prev" => "קודם",
+"Log in" => "כניסה",
+"You are logged out." => "לא התחברת.",
+"prev" => "הקודם",
 "next" => "הבא"
 );
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index f129ca7060..92be804804 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,34 +1,46 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
 "Requested" => "Zahtijevano",
 "Login failed!" => "Prijava nije uspjela!",
 "Username" => "Korisničko ime",
 "Request reset" => "Zahtjev za resetiranjem",
 "Your password was reset" => "Vaša lozinka je resetirana",
-"New password" => "nova lozinka",
-"Reset password" => "poništavanje lozinke",
+"To login page" => "Idi na stranicu za prijavu",
+"New password" => "Nova lozinka",
+"Reset password" => "Poništavanje lozinke",
 "Personal" => "Osobno",
-"Users" => "korisnici",
-"Apps" => "aplikacije",
-"Admin" => "administrator",
-"Help" => "pomoć",
+"Users" => "Korisnici",
+"Apps" => "Aplikacije",
+"Admin" => "Administrator",
+"Help" => "Pomoć",
+"Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
-"Create an <strong>admin account</strong>" => "stvoriti <strong>Administratorski račun</strong>",
+"Edit categories" => "Uredi kategorije",
+"Add" => "Dodaj",
+"Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
 "Password" => "Lozinka",
 "Advanced" => "Dodatno",
 "Data folder" => "Mapa baze podataka",
-"Configure the database" => "konfigurirati baze podataka",
+"Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
-"Database user" => "korisnik baze podataka",
-"Database password" => "lozinka baze podataka",
-"Database name" => "ime baze podataka",
+"Database user" => "Korisnik baze podataka",
+"Database password" => "Lozinka baze podataka",
+"Database name" => "Ime baze podataka",
 "Database host" => "Poslužitelj baze podataka",
-"Finish setup" => "završiti postavljanje",
-"Log out" => "odjaviti",
-"Settings" => "postavke",
+"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",
-"You are logged out." => "Vi ste odjavljeni.",
+"Log in" => "Prijava",
+"You are logged out." => "Odjavljeni ste.",
 "prev" => "prethodan",
 "next" => "sljedeći"
 );
diff --git a/core/l10n/id.php b/core/l10n/id.php
index eb20a4209c..f9fa7d2bb9 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,11 +1,28 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
+"Requested" => "Telah diminta",
+"Login failed!" => "Login gagal!",
 "Username" => "Username",
+"Request reset" => "Meminta reset",
+"Your password was reset" => "Password anda telah direset",
+"To login page" => "Ke halaman login",
+"New password" => "Password baru",
+"Reset password" => "Reset password",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
+"Access forbidden" => "Akses Ditiadakan",
 "Cloud not found" => "Cloud tidak ditemukan",
+"Edit categories" => "Edit kategori",
+"Add" => "Tambahkan",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Password" => "Password",
 "Advanced" => "Tingkat Lanjut",
@@ -17,10 +34,12 @@
 "Database name" => "Nama database",
 "Database host" => "Host database",
 "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",
 "You are logged out." => "Anda telah keluar.",
 "prev" => "sebelum",
 "next" => "selanjutnya"
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 3584bf6732..50b8e9e616 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,11 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "アプリケーション名は提供されていません。",
+"No category to add?" => "追加するカテゴリはありませんか？",
+"This category already exists: " => "このカテゴリはすでに存在します: ",
 "Owncloud password reset" => "Owncloud のパスワードをリセット",
+"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." => "パスワードをリセットするリンクがメールで届きます。",
+"You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
 "Requested" => "送信されました",
-"Login failed!" => "ログインに失敗しました。",
+"Login failed!" => "ログインに失敗しました！",
 "Username" => "ユーザ名",
-"Request reset" => "リセットを要求する。",
+"Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
 "To login page" => "ログインページへ戻る",
 "New password" => "新しいパスワードを入力",
@@ -15,7 +19,10 @@
 "Apps" => "アプリ",
 "Admin" => "管理者",
 "Help" => "ヘルプ",
-"Cloud not found" => "見つけられません",
+"Access forbidden" => "アクセスが禁止されています",
+"Cloud not found" => "見つかりません",
+"Edit categories" => "カテゴリを編集",
+"Add" => "追加",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
 "Password" => "パスワード",
 "Advanced" => "詳細設定",
@@ -30,7 +37,7 @@
 "web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
 "Settings" => "設定",
-"Lost your password?" => "パスワードがわからなくなりましたか？",
+"Lost your password?" => "パスワードを忘れましたか？",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
 "You are logged out." => "ログアウトしました。",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index d663b6dc42..dd94201138 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
 "Requested" => "Gefrot",
 "Login failed!" => "Falschen Login!",
 "Username" => "Benotzernumm",
 "Request reset" => "Reset ufroen",
 "Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
+"To login page" => "Op d'Login Säit",
 "New password" => "Neit Passwuert",
 "Reset password" => "Passwuert zeréck setzen",
 "Personal" => "Perséinlech",
@@ -12,7 +19,10 @@
 "Apps" => "Applicatiounen",
 "Admin" => "Admin",
 "Help" => "Hëllef",
+"Access forbidden" => "Access net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
+"Edit categories" => "Kategorien editéieren",
+"Add" => "Bäisetzen",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
 "Password" => "Passwuert",
 "Advanced" => "Erweidert",
@@ -24,10 +34,12 @@
 "Database name" => "Datebank Numm",
 "Database host" => "Datebank Server",
 "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",
 "You are logged out." => "Du bass ausgeloggt.",
 "prev" => "zeréck",
 "next" => "weider"
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 6828a07886..5dedfffabd 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
+"This category already exists: " => "Tokia kategorija jau yra:",
 "Owncloud password reset" => "Owncloud slaptažodžio atkūrimas",
+"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į.",
 "Requested" => "Užklausta",
@@ -15,7 +17,10 @@
 "Apps" => "Programos",
 "Admin" => "Administravimas",
 "Help" => "Pagalba",
+"Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
+"Edit categories" => "Redaguoti kategorijas",
+"Add" => "Pridėti",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
 "Password" => "Slaptažodis",
 "Advanced" => "Išplėstiniai",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 9222a4f703..80b9da0e1e 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
 "Requested" => "Anmodning",
@@ -15,7 +19,10 @@
 "Apps" => "Apper",
 "Admin" => "Admin",
 "Help" => "Hjelp",
+"Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
+"Edit categories" => "Rediger kategorier",
+"Add" => "Legg til",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
 "Password" => "Passord",
 "Advanced" => "Avansert",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 47ad9d0a40..3c6f28c856 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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.",
 "Requested" => "Żądane",
@@ -15,7 +19,10 @@
 "Apps" => "Programy",
 "Admin" => "Administrator",
 "Help" => "Pomoc",
+"Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
+"Edit categories" => "Edytuj kategorię",
+"Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Password" => "Hasło",
 "Advanced" => "Zaawansowane",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 93cd551976..55c4c96e5c 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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",
 "Requested" => "Pedido",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicações",
 "Admin" => "Admin",
 "Help" => "Ajuda",
+"Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
+"Edit categories" => "Editar categorias",
+"Add" => "Adicionar",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
 "Password" => "Palavra chave",
 "Advanced" => "Avançado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 6f8256cea4..b6170d8e96 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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",
 "Requested" => "Solicitat",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicații",
 "Admin" => "Administrator",
 "Help" => "Ajutor",
+"Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
+"Edit categories" => "Editează categoriile",
+"Add" => "Adaugă",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
 "Password" => "Parola",
 "Advanced" => "Avansat",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 0fe8c079f2..ff86f29b26 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Имя приложения не установлено.",
+"No category to add?" => "Нет категорий для добавления?",
+"This category already exists: " => "Эта категория уже существует: ",
 "Owncloud password reset" => "Сброс пароля OwnCloud",
+"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 выслана ссылка для сброса пароля.",
 "Requested" => "Запрошено",
@@ -15,7 +19,10 @@
 "Apps" => "Приложения",
 "Admin" => "Администратор",
 "Help" => "Помощь",
+"Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
+"Edit categories" => "Редактировать категории",
+"Add" => "Добавить",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Password" => "Пароль",
 "Advanced" => "Дополнительно",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 99fca3619f..fd53952184 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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",
@@ -15,7 +19,10 @@
 "Apps" => "Program",
 "Admin" => "Admin",
 "Help" => "Hjälp",
+"Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
+"Edit categories" => "Redigera kategorier",
+"Add" => "Lägg till",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Password" => "Lösenord",
 "Advanced" => "Avancerat",
diff --git a/l10n/af/calendar.po b/l10n/af/calendar.po
index 1ab9a09ac7..80a29a27bf 100644
--- a/l10n/af/calendar.po
+++ b/l10n/af/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,16 +41,40 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr ""
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 5bb8d1af22..c71bea4932 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/af/core.po b/l10n/af/core.po
index bebd27cfa2..ad5808d2ff 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,6 +29,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -159,15 +235,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/af/files.po b/l10n/af/files.po
index d2ea9dc44c..142439d4d9 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,10 +47,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr ""
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -119,18 +171,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr ""
diff --git a/l10n/af/gallery.po b/l10n/af/gallery.po
index 0c8fe687eb..4b3c3a0b90 100644
--- a/l10n/af/gallery.po
+++ b/l10n/af/gallery.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/af/media.po b/l10n/af/media.po
index bca7b9059b..6ef8fb9064 100644
--- a/l10n/af/media.po
+++ b/l10n/af/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,10 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 7429b43477..c861f1ae1c 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index 8d457e0e30..ac28bf5223 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "تم تغيير المنطقة الزمنية"
 msgid "Invalid request"
 msgstr "طلب غير مفهوم"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "الجدول الزمني"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "عيد ميلاد"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "عمل"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "إتصال"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "الزبائن"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "المرسل"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "عطلة"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "أفكار"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "رحلة"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "يوبيل"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "إجتماع"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "شيء آخر"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "شخصي"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "مشاريع"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "اسئلة"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "العمل"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index cf44000cd9..518656c953 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "خطء خلال اضافة كتاب عناوين."
 msgid "Error activating addressbook."
 msgstr "خطء خلال تفعيل كتاب العناوين."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
@@ -162,102 +191,229 @@ msgstr "خطء خلال تعديل كتاب العناوين"
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "المعارف"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 05a0ed7c96..049f3ebca5 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "استرجاع كلمة السر"
@@ -160,15 +236,15 @@ msgstr "خادم قاعدة البيانات"
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "تعديلات"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index a3423d18db..eaf684ef80 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "المجلد المؤقت غير موجود"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "الملفات"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "حجم"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "معدل"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "حجم"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "معدل"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "محذوف"
diff --git a/l10n/ar/gallery.po b/l10n/ar/gallery.po
index 1a2fab06f7..ad8e0279b3 100644
--- a/l10n/ar/gallery.po
+++ b/l10n/ar/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "اعادة البحث"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "رجوع"
diff --git a/l10n/ar/media.po b/l10n/ar/media.po
index 994a68fb37..60e237f0d3 100644
--- a/l10n/ar/media.po
+++ b/l10n/ar/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "الموسيقى"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "إلعب"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "تجميد"
 
@@ -34,7 +38,7 @@ msgstr "تجميد"
 msgid "Previous"
 msgstr "السابق"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "التالي"
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 7ce9b5bb7e..60fc1db8e1 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "تم تغير العنوان البريدي"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "طلبك غير مفهوم"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "تم تغيير ال OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "طلبك غير مفهوم"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-مسجل"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "من قبل"
 
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index 8dabe1dddc..7edfe71490 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Часовата зона е сменена"
 msgid "Invalid request"
 msgstr "Невалидна заявка"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
+msgid "Birthday"
 msgstr ""
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
+msgid "Call"
 msgstr ""
 
 #: lib/app.php:128
-msgid "Ideas"
+msgid "Clients"
 msgstr ""
 
 #: lib/app.php:129
-msgid "Journey"
+msgid "Deliverer"
 msgstr ""
 
 #: lib/app.php:130
-msgid "Jubilee"
+msgid "Holidays"
 msgstr ""
 
 #: lib/app.php:131
-msgid "Meeting"
+msgid "Ideas"
 msgstr ""
 
 #: lib/app.php:132
-msgid "Other"
+msgid "Journey"
 msgstr ""
 
 #: lib/app.php:133
-msgid "Personal"
+msgid "Jubilee"
 msgstr ""
 
 #: lib/app.php:134
-msgid "Projects"
+msgid "Meeting"
 msgstr ""
 
 #: lib/app.php:135
-msgid "Questions"
+msgid "Other"
 msgstr ""
 
 #: lib/app.php:136
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:139
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 635458a04e..40582ffea9 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index c1f2d0277f..477b4f2e81 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -162,15 +238,15 @@ msgstr "Хост за базата"
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Изход"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Настройки"
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index a9471ab914..e81c2f2a9c 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "Липсва временната папка"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Файлове"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Размер"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Променено"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Размер"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Променено"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/bg_BG/gallery.po b/l10n/bg_BG/gallery.po
index 16afafc20f..2bf1a654c1 100644
--- a/l10n/bg_BG/gallery.po
+++ b/l10n/bg_BG/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/bg_BG/media.po b/l10n/bg_BG/media.po
index ae35b6d25e..16a6c478ec 100644
--- a/l10n/bg_BG/media.po
+++ b/l10n/bg_BG/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Пусни"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Пауза"
 
@@ -34,7 +38,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Предишна"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следваща"
 
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index fcba03ef49..b997c96de7 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Невалидна заявка"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID е сменено"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Невалидна заявка"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Езика е сменен"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Изберете програма"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-лицензирано"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "от"
 
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index 09d8ca6da7..f4527ce92e 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:26+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "La zona horària ha canviat"
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendari"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Aniversari"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index d551cb21cb..cc7086cd14 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Error en afegir la llibreta d'adreces."
 msgid "Error activating addressbook."
 msgstr "Error en activar la llibreta d'adreces."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "No s'ha tramès cap ID de contacte."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Error en carregar la imatge."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Error en llegir la foto del contacte."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Error en desar el fitxer temporal."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La foto carregada no és vàlida."
 
@@ -123,14 +120,46 @@ msgstr "falta la ID del contacte."
 msgid "Missing contact id."
 msgstr "Falta la id del contacte."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "No heu tramès el camí de la foto."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "El fitxer no existeix:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Error en carregar la imatge."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "no s'ha establert el nom de l'element."
@@ -147,7 +176,7 @@ msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
@@ -163,102 +192,229 @@ msgstr "Error en actualitzar la llibreta d'adreces."
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer carregat supera la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactes"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Elimina un fitxer VCF per importar contactes."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "No s'ha trobat la llibreta d'adreces."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -429,6 +585,10 @@ msgstr "Carrega una foto nova"
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Edita l'adreça"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Envia"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -613,27 +773,22 @@ msgstr "Importa"
 msgid "Importing contacts"
 msgstr "S'estan important contactes"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Els contactes s'han importat correctament"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Tanca el diàleg"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importa la llibreta d'adreces"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Seleccioneu la llibreta d'adreces a la que voleu importar:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Elimina un fitxer VCF per importar contactes."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Selecciona de HD"
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 83fd152249..361164d2ef 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:23+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "No voleu afegir cap categoria?"
 msgid "This category already exists: "
 msgstr "Aquesta categoria ja existeix:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Restableix la contrasenya d'Owncloud"
@@ -161,15 +237,15 @@ msgstr "Ordinador central de la base de dades"
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Arranjament"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 9fa0e17c56..0d3c2693b4 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:30+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "S'ha perdut un fitxer temporal"
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fitxers"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Mida"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestió de fitxers"
@@ -121,18 +173,6 @@ msgstr "Comparteix"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Mida"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificat"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Esborra-ho tot"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index 6cdc8d07e4..72f3cf5c80 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 13:38+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Fotos"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Arranjament"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Escaneja de nou"
@@ -34,10 +74,6 @@ msgstr "Atura"
 msgid "Share"
 msgstr "Comparteix"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Arranjament"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Enrera"
diff --git a/l10n/ca/media.po b/l10n/ca/media.po
index 1889e043b9..4d41f39ffe 100644
--- a/l10n/ca/media.po
+++ b/l10n/ca/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reprodueix"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +38,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Següent"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4c4063a5b8..62b4b97539 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:28+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "el correu electrònic ha canviat"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Sol.licitud no vàlida"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ha canviat"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Sol.licitud no vàlida"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Català"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "- amb llicència"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "de"
 
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 5dca39cef6..4bc27d16c6 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 08:18+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Časová zóna byla změněna"
 msgid "Invalid request"
 msgstr "Chybný požadavek"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Narozeniny"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 96ed72095b..6c392a1f09 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 08:20+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,23 +84,20 @@ msgstr "Chyba při přidávání adresáře."
 msgid "Error activating addressbook."
 msgstr "Chyba při aktivaci adresáře."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nebylo nastaveno ID kontaktu."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Chyba při načítání obrázku."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Chyba při načítání fotky kontaktu."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Chyba při ukládání dočasného souboru."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
@@ -124,14 +121,46 @@ msgstr "Chybí ID kontaktu."
 msgid "Missing contact id."
 msgstr "Chybí id kontaktu."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Žádná fotka nebyla nahrána."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Soubor neexistuje:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Chyba při načítání obrázku."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "jméno elementu není nastaveno."
@@ -148,7 +177,7 @@ msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
@@ -164,102 +193,229 @@ msgstr "Chyba při aktualizaci adresáře."
 msgid "Error uploading contacts to storage."
 msgstr "Chyba při nahrávání kontaktů do úložiště."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný soubor se nahrál pouze z části"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl nahrán"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chybí dočasný adresář"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Pro import kontaktů sem přetáhněte soubor VCF"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresář nenalezen."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -430,6 +586,10 @@ msgstr "Nahrát novou fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Upravit adresu"
@@ -495,7 +655,7 @@ msgstr "Slečna"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
@@ -539,11 +699,11 @@ msgstr "MUDr."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Potvrdit"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Storno"
 
@@ -614,27 +774,22 @@ msgstr "Import"
 msgid "Importing contacts"
 msgstr "Importování kontaktů"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontakty úspěšně importovány"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Zavírací dialog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importovat adresář"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Vyberte adresář do kterého chcete importovat:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Pro import kontaktů sem přetáhněte soubor VCF"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Vybrat z disku"
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index baf8d5f7c9..594e0635dc 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:06+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Žádná kategorie k přidání?"
 msgid "This category already exists: "
 msgstr "Tato kategorie již existuje:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Reset hesla Owncloud"
@@ -162,15 +238,15 @@ msgstr "Hostitel databáze"
 msgid "Finish setup"
 msgstr "Dokončit instalaci"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nastavení"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index fed33acacd..23b3d0b036 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 21:11+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Chybí adresář pro sočasné soubory"
 msgid "Failed to write to disk"
 msgstr "Zápis na disk se nezdařil"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Soubory"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Velikost"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Změněno"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Nastavení chování k souborům"
@@ -121,18 +173,6 @@ msgstr "Sdílet"
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Velikost"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Změněno"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Smazat vše"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Vymazat"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index e2c673ccec..08c9c2054b 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 15:21+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Obrázky"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Nastavení"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Znovu prohledat"
@@ -36,10 +76,6 @@ msgstr "Zastavit"
 msgid "Share"
 msgstr "Sdílet"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Nastavení"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Zpět"
diff --git a/l10n/cs_CZ/media.po b/l10n/cs_CZ/media.po
index d3b8f82371..adefdadc3b 100644
--- a/l10n/cs_CZ/media.po
+++ b/l10n/cs_CZ/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-06 17:13+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Hudba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Přehrát"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauza"
 
@@ -36,7 +40,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Předchozí"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Další"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 4852d3dfe6..360a7fe9d9 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 16:13+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email změněn"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Chybný dotaz"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID změněn"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Chybný dotaz"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencováno"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "podle"
 
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index d1b46364a7..7207ff883e 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -6,12 +6,13 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen kalendere."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen begivenheder."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -44,79 +45,103 @@ msgstr "Tidszone ændret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Leverance"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Helligdage"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Rejse"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubilæum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Møde"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Andet"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekter"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Spørgsmål"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "unavngivet"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -365,7 +390,7 @@ msgstr "Vælg aktive kalendere"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Dine kalendere"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -374,15 +399,15 @@ msgstr "CalDav-link"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Delte kalendere"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Ingen delte kalendere"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Del kalender"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -399,7 +424,7 @@ msgstr "Slet"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "delt af dig"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -444,23 +469,23 @@ msgstr "Eksporter"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Begivenhedsinfo"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Gentagende"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Deltagere"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Del"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -472,11 +497,11 @@ msgstr "Kategori"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Opdel kategorier med kommaer"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger kategorier"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -597,11 +622,11 @@ msgstr "Opret en ny begivenhed"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Vis en begivenhed"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Ingen categorier valgt"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -609,11 +634,11 @@ msgstr "Vælg kategori"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "fra"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "kl."
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -637,7 +662,7 @@ msgstr "12T"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Ugens første dag"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -645,24 +670,24 @@ msgstr "Synkroniseringsadresse til CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Brugere"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "Vælg brugere"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Redigerbar"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "Vælg grupper"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "Offentliggør"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 03977ebbdd..be2ce3917f 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -6,12 +6,13 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +39,7 @@ msgstr "Der skal udfyldes mindst et adressefelt."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Kan ikke tilføje overlappende element."
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -46,35 +47,35 @@ msgstr "Fejl ved tilføjelse af egenskab."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Intet ID medsendt"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Kunne ikke sætte checksum."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Der ikke valgt nogle grupper at slette."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen adressebøger."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen kontaktpersoner."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Manglende ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Kunne ikke indlæse VCard med ID'en: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Kan ikke tilføje adressebog uden et navn."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +85,26 @@ msgstr "Fejl ved tilføjelse af adressebog."
 msgid "Error activating addressbook."
 msgstr "Fejl ved aktivering af adressebog."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Ingen ID for kontakperson medsendt."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Kunne ikke indlæse foto for kontakperson."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Kunne ikke gemme midlertidig fil."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Billedet under indlæsning er ikke gyldigt."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "Intet ID medsendt."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +116,75 @@ msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontaktperson ID mangler."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Kontaktperson ID mangler."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Der blev ikke medsendt en sti til fotoet."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Filen eksisterer ikke:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Kunne ikke indlæse billede."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "Element navnet er ikke medsendt."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "Checksum er ikke medsendt."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Noget gik grueligt galt. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Kan ikke opdatére adressebogen med et tomt navn."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +192,237 @@ msgstr "Fejl ved opdatering af adressebog"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ingen fil uploadet"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Manglende midlertidig mappe."
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Drop en VCF fil for at importere kontaktpersoner."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Adressebogen blev ikke fundet."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Besked"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Personsøger"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}'s fødselsdag"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +438,7 @@ msgstr "Adressebøger"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigurer adressebøger"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +446,7 @@ msgstr "Ny adressebog"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importer fra VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,23 +477,23 @@ msgstr "Slet kontaktperson"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Drop foto for at uploade"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Rediger navnedetaljer."
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Øgenavn"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Indtast øgenavn"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +501,19 @@ msgstr "Fødselsdag"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-åååå"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Opdel gruppenavne med kommaer"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Rediger grupper"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +521,47 @@ msgstr "Foretrukken"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Indtast venligst en gyldig email-adresse."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Indtast email-adresse"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Send mail til adresse"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Slet email-adresse"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Indtast telefonnummer"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Slet telefonnummer"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Vis på kort"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Rediger adresse detaljer"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Tilføj noter her."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Tilfæj element"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profilbillede"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +569,31 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Slet nuværende foto"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Rediger nuværende foto"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Upload nyt foto"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Vælg foto fra ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Rediger adresse"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +636,7 @@ msgstr "Land"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger grupper"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -487,79 +648,79 @@ msgstr "Adressebog"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Foranstillede titler"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Frøken"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Hr."
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Fornavn"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Mellemnavne"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Efternavn"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Efterstillede titler"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Cand. Jur."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -586,82 +747,77 @@ msgid "Submit"
 msgstr "Gem"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Fortryd"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importer fil med kontaktpersoner"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Vælg venligst adressebog"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Opret ny adressebog"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Navn på ny adressebog"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importer"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Importerer kontaktpersoner"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Vælg hvilken adressebog, der skal importeres til:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Vælg fra harddisk."
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Du har ingen kontaktpersoner i din adressebog."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Tilføj kontaktpeson."
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfigurer adressebøger"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV synkroniserings adresse"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "mere info"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primær adresse (Kontak m. fl.)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 9ca4c3a10c..045cd42915 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mikkelbjerglarsen@gmail.com>, 2011.
+#   <mikkelbjerglarsen@gmail.com>, 2011, 2012.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +23,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Applikationens navn ikke medsendt"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategori at tilføje?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Denne kategori eksisterer allerede: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -38,7 +115,7 @@ msgstr "Nulstil adgangskode til Owncloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Nulstil ownCloud kodeord"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -103,7 +180,7 @@ msgstr "Hjælp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Adgang forbudt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -111,11 +188,11 @@ msgstr "Sky ikke fundet"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger kategorier"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Tilføj"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -162,15 +239,15 @@ msgstr "Databasehost"
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Indstillinger"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 09238a2d64..d7990d5d94 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -5,12 +5,13 @@
 # Translators:
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +48,67 @@ msgstr "Mangler en midlertidig mappe"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Fejl ved skrivning til disk."
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Størrelse"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Ændret"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Filhåndtering"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -63,23 +116,23 @@ msgstr "Maksimal upload-størrelse"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. mulige: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Nødvendigt for at kunne downloade mapper og flere filer ad gangen."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Muliggør ZIP-download"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 er ubegrænset"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksimal størrelse på ZIP filer"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +148,7 @@ msgstr "Mappe"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Fra URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +156,7 @@ msgstr "Upload"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Fortryd upload"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +168,12 @@ msgstr "Navn"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Del"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Størrelse"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Ændret"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Slet"
@@ -149,8 +190,8 @@ msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Filerne bliver indlæst, vent venligst."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Indlæser"
diff --git a/l10n/da/gallery.po b/l10n/da/gallery.po
index d9d17dc547..43c5fd2a9e 100644
--- a/l10n/da/gallery.po
+++ b/l10n/da/gallery.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mikkelbjerglarsen@gmail.com>, 2012.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +20,48 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Billeder"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -28,15 +70,11 @@ msgstr "Genindlæs"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Del"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -44,16 +82,16 @@ msgstr "Tilbage"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Fjern bekræftelse"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Ønsker du at fjerne albummet"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ændre albummets navn"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nyt album navn"
diff --git a/l10n/da/media.po b/l10n/da/media.po
index ebb2017f78..ba051b121a 100644
--- a/l10n/da/media.po
+++ b/l10n/da/media.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Afspil"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -35,7 +39,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Forrige"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Næste"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 68c535fa05..deab93e2ed 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -7,12 +7,13 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,57 +23,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email ændret"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ugyldig forespørgsel"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ændret"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ugyldig forespørgsel"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Sprog ændret"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Dansk"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mere"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Tilføj din App"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Vælg en App"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenseret"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "af"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentation"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Håndter store filer"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -100,11 +120,11 @@ msgstr "af det tilgængelige"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Synkroniserings programmer for desktop og mobil"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -172,11 +192,11 @@ msgstr "Ny"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Standard kvote"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Andet"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 863356c452..2e5af84f5a 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -7,13 +7,15 @@
 #   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+#   <peddn@web.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:43+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +45,40 @@ msgstr "Zeitzone geändert"
 
 #: ajax/settings/settimezone.php:24
 msgid "Invalid request"
-msgstr "Anfragefehler"
+msgstr "Fehlerhafte Anfrage"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
@@ -153,7 +179,7 @@ msgstr "niemals"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr "nach Vorkommen"
+msgstr "nach Terminen"
 
 #: lib/object.php:345
 msgid "by date"
@@ -273,19 +299,19 @@ msgstr "Dezember"
 
 #: lib/object.php:418
 msgid "by events date"
-msgstr "bei Tag des Termins"
+msgstr "nach Tag des Termins"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr "an einem Tag des Jahres"
+msgstr "nach Tag des Jahres"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
-msgstr "an einer Wochennummer"
+msgstr "nach Wochennummer"
 
 #: lib/object.php:421
 msgid "by day and month"
-msgstr "an einer Tag und Monats Kombination"
+msgstr "nach Tag und Monat"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
@@ -400,7 +426,7 @@ msgstr "Löschen"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr "Von dir geteilt mit"
+msgstr "Geteilt mit dir von"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -473,7 +499,7 @@ msgstr "Kategorie"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr "Kategorien trennen mittels Komma"
+msgstr "Kategorien mit Kommas trennen"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
@@ -558,11 +584,11 @@ msgstr "Ende"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr "Vorkommen"
+msgstr "Termine"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr "Kalender Datei Importieren"
+msgstr "Kalenderdatei Importieren"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -614,7 +640,7 @@ msgstr "von"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "um"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -650,7 +676,7 @@ msgstr "Nutzer"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr "gewählte Nutzer"
+msgstr "Nutzer auswählen"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
@@ -662,7 +688,7 @@ msgstr "Gruppen"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr "Wähle Gruppen"
+msgstr "Gruppen auswählen"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 3b1c71d642..067ce64126 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -5,18 +5,23 @@
 # Translators:
 #   <admin@s-goecker.de>, 2012.
 #   <fh@cbix.de>, 2012.
+#   <florian.ruechel+owncloud@gmail.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Melvin Gundlach <mail@melvin-gundlach.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
+#   <mi.sc@gmx.net>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+# Susi  <>, 2012.
+# Thomas Müller <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 17:10+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,23 +93,20 @@ msgstr "Adressbuch hinzufügen fehlgeschlagen"
 msgid "Error activating addressbook."
 msgstr "Adressbuchaktivierung fehlgeschlagen"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Es wurde keine Kontakt-ID übermittelt."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Fehler beim Laden des Bildes."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Fehler beim auslesen des Kontaktfotos."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Fehler beim Speichern der temporären Datei."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Das Kontaktfoto ist fehlerhaft."
 
@@ -128,14 +130,46 @@ msgstr "Keine Kontakt-ID angegeben."
 msgid "Missing contact id."
 msgstr "Fehlende Kontakt-ID."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Kein Foto-Pfad übermittelt."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Datei existiert nicht: "
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Fehler beim Laden des Bildes."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "Kein Name für das Element angegeben."
@@ -152,7 +186,7 @@ msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
@@ -168,102 +202,229 @@ msgstr "Adressbuch aktualisieren fehlgeschlagen"
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Alles bestens, Datei erfolgreich übertragen."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datei konnte nur teilweise übertragen werden"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Zieh' eine VCF Datei hierher zum Kontaktimport"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adressbuch nicht gefunden."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -356,7 +517,7 @@ msgstr "Gruppen"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr "Gruppen mit Komma trennen"
+msgstr "Gruppen mit Komma trennt"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
@@ -434,6 +595,10 @@ msgstr "Neues Foto hochladen"
 msgid "Select photo from ownCloud"
 msgstr "Foto aus ownCloud auswählen"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Adresse ändern"
@@ -535,35 +700,35 @@ msgstr "Höflichkeitssuffixe"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Dr. Jur"
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "Dr. med."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "DGOM"
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "MChiro"
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Hochwohlgeborenen"
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Senior"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -590,7 +755,7 @@ msgid "Submit"
 msgstr "Eintragen"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -618,29 +783,24 @@ msgstr "Importieren"
 msgid "Importing contacts"
 msgstr "Kontakte werden importiert"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktimport erfolgreich"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Dialog schließen"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Adressbuch importieren"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Adressbuch, in das importiert werden soll"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Zieh' eine VCF Datei hierher zum Kontaktimport"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Von der Festplatte auswählen"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index c1287e768a..2d88b3ef59 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -7,13 +7,14 @@
 #   <alex.hotz@gmail.com>, 2011.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 07:32+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,15 +28,91 @@ msgstr "Applikationsname nicht angegeben"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr "Keine Kategorie hinzufügen?"
+msgstr "Keine Kategorie hinzuzufügen?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
 msgstr "Kategorie existiert bereits:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr "OwnCloud Passwort zurücksetzen"
+msgstr "ownCloud Passwort zurücksetzen"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
@@ -163,15 +240,15 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Einstellungen"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index d2126f7d14..b7f6cb08c3 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -6,6 +6,7 @@
 #   <admin@s-goecker.de>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 # Thomas Müller <>, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:55+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +26,17 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr "Datei hochgeladen."
+msgstr "Datei fehlerfrei hochgeladen."
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Die hochgeladene Datei ist zu groß."
+msgstr "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini"
 
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Die hochgeladene Datei ist zu groß."
+msgstr "Die größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
@@ -53,17 +54,69 @@ msgstr "Temporärer Ordner fehlt."
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
-msgstr "Dateien"
+msgstr "Files"
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Größe"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Bearbeitet"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Dateibehandlung"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maximale Größe"
+msgstr "Maximum upload size"
 
 #: templates/admin.php:7
 msgid "max. possible: "
@@ -71,7 +124,7 @@ msgstr "maximal möglich:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr "Für Mehrfachdateien- und Ordnerupload benötigt:"
+msgstr "Für Mehrfachdateien- und Ordnerdownloads benötigt:"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -91,7 +144,7 @@ msgstr "Neu"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr "Text Datei"
+msgstr "Textdatei"
 
 #: templates/index.php:10
 msgid "Folder"
@@ -125,18 +178,6 @@ msgstr "Teilen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Größe"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Bearbeitet"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Alle löschen"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 09a14f9b75..5015175600 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <admin@s-goecker.de>, 2012.
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 07:29+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,53 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Bilder"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
-msgstr "Rescan"
+msgstr "Erneut Scannen"
 
 #: templates/index.php:17
 msgid "Stop"
@@ -35,10 +76,6 @@ msgstr "Stopp"
 msgid "Share"
 msgstr "Teilen"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Zurück"
diff --git a/l10n/de/media.po b/l10n/de/media.po
index 360b8b153a..4cb691b5ff 100644
--- a/l10n/de/media.po
+++ b/l10n/de/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Abspielen"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -35,7 +39,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Nächstes"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 89f3794977..f80377f656 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -6,14 +6,15 @@
 #   <admin@s-goecker.de>, 2011, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 07:34+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "E-Mail wurde geändert"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ungültige Anfrage"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID geändert"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ungültige Anfrage"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Sprache geändert"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Deutsch"
 
@@ -59,10 +75,14 @@ msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lizenziert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "von"
 
@@ -100,7 +120,7 @@ msgstr "der verfügbaren"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop und mobile Syncing Clienten"
+msgstr "Desktop und mobile synchronierungs Clients"
 
 #: templates/personal.php:13
 msgid "Download"
@@ -152,7 +172,7 @@ msgstr "Hilf bei der Übersetzung!"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden."
+msgstr "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden."
 
 #: templates/users.php:15 templates/users.php:44
 msgid "Name"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index ae438dca15..6b6a6acedb 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 08:20+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Η ζώνη ώρας άλλαξε"
 msgid "Invalid request"
 msgstr "Μη έγκυρο αίτημα"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Γενέθλια"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 11c4beb7b5..c5718b30c8 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -85,23 +85,20 @@ msgstr "Σφάλμα προσθήκης βιβλίου διευθύνσεων."
 msgid "Error activating addressbook."
 msgstr "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Δε υπεβλήθει ID επαφής"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Σφάλμα φόρτωσης εικόνας"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
 
@@ -125,14 +122,46 @@ msgstr "Λείπει ID επαφής"
 msgid "Missing contact id."
 msgstr "Απουσιαζει ID επαφής"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Δε δόθηκε διαδρομή εικόνας"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Το αρχείο δεν υπάρχει:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Σφάλμα φόρτωσης εικόνας"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "δεν ορίστηκε όνομα στοιχείου"
@@ -149,7 +178,7 @@ msgstr "Οι πληροφορίες για τη vCard είναι λανθασμ
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο"
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
@@ -165,102 +194,229 @@ msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία "
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο ανέβηκε μερικώς"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Δεν ανέβηκε κάποιο αρχείο"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Μήνυμα "
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
@@ -431,6 +587,10 @@ msgstr "Ανέβασε νέα φωτογραφία"
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -587,7 +747,7 @@ msgid "Submit"
 msgstr "Καταχώρηση"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -615,27 +775,22 @@ msgstr "Εισαγωγή"
 msgid "Importing contacts"
 msgstr "Εισαγωγή επαφών"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Οι επαφές εισήχθησαν επιτυχώς"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Κλείσιμο διαλόγου"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Εισαγωγή βιβλίου διευθύνσεων"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Επιλογή από HD"
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 343b0692cd..c383ae1a88 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 16:35+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Δεν έχετε να προστέσθέσεται μια κα"
 msgid "This category already exists: "
 msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Επανέκδοση κωδικού για το Owncloud"
@@ -162,15 +238,15 @@ msgstr "Διακομιστής βάσης δεδομένων"
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index c564866ebc..87cbcd3e9b 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 16:48+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Λείπει ένας προσωρινός φάκελος"
 msgid "Failed to write to disk"
 msgstr "Η εγγραφή στο δίσκο απέτυχε"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Αρχεία"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Μέγεθος"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Τροποποιήθηκε"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Διαχείριση αρχείων"
@@ -121,18 +173,6 @@ msgstr "Διαμοίρασε"
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Τροποποιήθηκε"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Διαγραφή όλων"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/el/gallery.po b/l10n/el/gallery.po
index 85d5d3d404..71bb2bf4bc 100644
--- a/l10n/el/gallery.po
+++ b/l10n/el/gallery.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:56+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,25 +20,61 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Εικόνες"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Επανασάρωση"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr "Σταμάτησε"
+msgstr "Διακοπή"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr "Κοινοποίησε"
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Ρυθμίσεις"
+msgstr "Κοινοποίηση"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/el/media.po b/l10n/el/media.po
index 3688478b76..4d82e044e3 100644
--- a/l10n/el/media.po
+++ b/l10n/el/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Μουσική"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Παύση"
 
@@ -34,7 +38,7 @@ msgstr "Παύση"
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Επόμενο"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f757374f53..50279c5c14 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 23:36+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "το email άλλαξε"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Μη έγκυρο αίτημα"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Το OpenID άλλαξε"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Μη έγκυρο αίτημα"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Επιλέξτε μια εφαρμογή"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-με άδεια"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "από"
 
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index 6b95d99dfb..d01d9bb11b 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:05+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "La horozono estas ŝanĝita"
 msgid "Invalid request"
 msgstr "Nevalida peto"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendaro"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Naskiĝotago"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index f9ab4efffb..7b4b003e48 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:35+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@ msgstr "Neniu identigilo proviziĝis."
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Eraro dum agordado de kontrolsumo."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
@@ -82,23 +82,20 @@ msgstr "Eraro dum aldono de adresaro."
 msgid "Error activating addressbook."
 msgstr "Eraro dum aktivigo de adresaro."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Neniu kontaktidentigilo sendiĝis."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Eraro dum ŝargado de bildo."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Eraro dum lego de kontakta foto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Eraro dum konservado de provizora dosiero."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La alŝutata foto ne validas."
 
@@ -122,31 +119,63 @@ msgstr "Kontaktidentigilo mankas."
 msgid "Missing contact id."
 msgstr "Mankas kontaktidentigilo."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Neniu vojo al foto sendiĝis."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Dosiero ne ekzistas:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Eraro dum ŝargado de bildo."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "eronomo ne agordiĝis."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "kontrolsumo ne agordiĝis."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
@@ -162,102 +191,229 @@ msgstr "Eraro dum ĝisdatigo de adresaro."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Demetu VCF-dosieron por enporti kontaktojn."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresaro ne troviĝis."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Interreto"
 
@@ -402,7 +558,7 @@ msgstr "Aldoni kampon"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profila bildo"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -428,6 +584,10 @@ msgstr "Alŝuti novan foton"
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Redakti adreson"
@@ -485,31 +645,31 @@ msgstr "Adresaro"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Honoraj antaŭmetaĵoj"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "f-ino"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "s-ino"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "s-ro"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "s-ro"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "s-ino"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "d-ro"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -517,7 +677,7 @@ msgstr "Persona nomo"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Pliaj nomoj"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
@@ -525,7 +685,7 @@ msgstr "Familia nomo"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Honoraj postmetaĵoj"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Sendi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -612,54 +772,49 @@ msgstr "Enporti"
 msgid "Importing contacts"
 msgstr "Enportante kontaktojn"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktoj enportiĝis sukcese"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Fermi dialogon"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Enporti adresaron"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Elektu adresaron kien enporti:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Elekti el malmoldisko"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Vi ne havas kontaktojn en via adresaro"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Aldoni kontakton"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Agordi adresarojn"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "adresoj por CardDAV-sinkronigo"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "pli da informo"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index df23dfe161..4adb4f254f 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "La pasvorto de Owncloud estas restarigita"
@@ -161,15 +237,15 @@ msgstr "Datumbaza gastigo"
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Agordo"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index e51a5621f5..70c2cce272 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:16+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "Mankas tempa dosierujo"
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Dosieroj"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Grando"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modifita"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dosieradministro"
@@ -120,18 +172,6 @@ msgstr "Kunhavigi"
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Grando"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modifita"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Forigi ĉion"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/eo/gallery.po b/l10n/eo/gallery.po
index 97f4e281e8..df1ecedeaf 100644
--- a/l10n/eo/gallery.po
+++ b/l10n/eo/gallery.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,48 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Bildoj"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Agordo"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +69,11 @@ msgstr "Reskani"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Halti"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Kunhavigi"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +81,16 @@ msgstr "Antaŭen"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Forigi konfirmadon"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Ĉu vi volas forigi la albumon?"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ŝanĝi albumnomon"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nova albumnomo"
diff --git a/l10n/eo/media.po b/l10n/eo/media.po
index ebae5495d2..cc7a61cea5 100644
--- a/l10n/eo/media.po
+++ b/l10n/eo/media.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 13:20+0000\n"
-"Last-Translator: Michael Moroni <haikara90@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,10 @@ msgstr ""
 msgid "Music"
 msgstr "Muziko"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Ludi"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index a3cfe311be..eadd0fca66 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:11+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "La retpoŝtadreso estas ŝanĝita"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Nevalida peto"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "La agordo de OpenID estas ŝanĝita"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Nevalida peto"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-permesila"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "de"
 
diff --git a/l10n/es/calendar.po b/l10n/es/calendar.po
index 77ae9d0ad9..4306d405f6 100644
--- a/l10n/es/calendar.po
+++ b/l10n/es/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:24+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,16 +45,40 @@ msgstr "Zona horaria cambiada"
 msgid "Invalid request"
 msgstr "Petición no válida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Cumpleaños"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index fb6ad1c86e..ec82648c8b 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -85,23 +85,20 @@ msgstr "Error al añadir la libreta de direcciones."
 msgid "Error activating addressbook."
 msgstr "Error al activar la libreta de direcciones."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "No se ha mandado ninguna ID de contacto."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Error cargando imagen."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Error leyendo fotografía del contacto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Error al guardar archivo temporal."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La foto que se estaba cargando no es válida."
 
@@ -125,14 +122,46 @@ msgstr "Falta la ID del contacto."
 msgid "Missing contact id."
 msgstr "Falta la id del contacto."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "No se ha introducido la ruta de la foto."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Archivo inexistente:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Error cargando imagen."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "no se ha puesto ningún nombre de elemento."
@@ -149,7 +178,7 @@ msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la pág
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
@@ -165,102 +194,229 @@ msgstr "Error al actualizar la libreta de direcciones."
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo se ha subido parcialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Suelta un archivo VCF para importar contactos."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Libreta de direcciones no encontrada."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Localizador"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -431,6 +587,10 @@ msgstr "Subir nueva fotografía"
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Editar dirección"
@@ -587,7 +747,7 @@ msgid "Submit"
 msgstr "Aceptar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -615,27 +775,22 @@ msgstr "Importar"
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contactos importados correctamente"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Cerrar Diálogo"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importar agenda"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Selecciona una agenda para importar a:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Suelta un archivo VCF para importar contactos."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Seleccionar del disco duro"
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e5c8d5775b..1e802ebc93 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:32+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,82 @@ msgstr "¿Ninguna categoría para agregar?"
 msgid "This category already exists: "
 msgstr "Esta categoría ya existe: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Restablecer contraseña de ownCloud"
@@ -164,15 +240,15 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ajustes"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index dbedafbf25..4e4b0b0c2d 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:34+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Falta un directorio temporal"
 msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Archivos"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamiento de archivos"
@@ -121,18 +173,6 @@ msgstr "Compartir"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamaño"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Eliminar todo"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Eliminado"
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
index 9486008860..94068028c6 100644
--- a/l10n/es/gallery.po
+++ b/l10n/es/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:29+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Imágenes"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Preferencias"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Refrescar"
@@ -36,10 +76,6 @@ msgstr "Parar"
 msgid "Share"
 msgstr "Compartir"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Preferencias"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Atrás"
diff --git a/l10n/es/media.po b/l10n/es/media.po
index eedcf2da4b..d1c84d0e8b 100644
--- a/l10n/es/media.po
+++ b/l10n/es/media.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:21+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,10 @@ msgstr ""
 msgid "Music"
 msgstr "Música"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproducir"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 225a2169d7..a8cb655556 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:30+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +24,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "correo electrónico actualizado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Solicitud no válida"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID cambiado"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Solicitud no válida"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -61,10 +76,14 @@ msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-autorizado"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
diff --git a/l10n/et_EE/calendar.po b/l10n/et_EE/calendar.po
index 5fd1bfb92f..2cca9be319 100644
--- a/l10n/et_EE/calendar.po
+++ b/l10n/et_EE/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:56+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "Ajavöönd on muudetud"
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Sünnipäev"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index a93421ea9a..c78d9e4307 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Viga aadressiraamatu lisamisel."
 msgid "Error activating addressbook."
 msgstr "Viga aadressiraamatu aktiveerimisel."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Kontakti ID-d pole sisestatud."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Viga pildi laadimisel."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Viga kontakti foto lugemisel."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Viga ajutise faili salvestamisel."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Laetav pilt pole korrektne pildifail."
 
@@ -122,14 +119,46 @@ msgstr "Kontakti ID puudub."
 msgid "Missing contact id."
 msgstr "Puuduv kontakti ID."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Foto asukohta pole määratud."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Faili pole olemas:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Viga pildi laadimisel."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "elemendi nime pole määratud."
@@ -146,7 +175,7 @@ msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
@@ -162,102 +191,229 @@ msgstr "Viga aadressiraamatu uuendamisel."
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Lohista siia VCF-fail, millest kontakte importida."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Aadressiraamatut ei leitud"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -428,6 +584,10 @@ msgstr "Lae üles uus foto"
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Muuda aadressi"
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Saada"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -612,27 +772,22 @@ msgstr "Impordi"
 msgid "Importing contacts"
 msgstr "Kontaktide importimine"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktid on imporditud"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Sulge dialoog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Impordi aadressiraamat"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Vali aadressiraamat, millesse importida:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Lohista siia VCF-fail, millest kontakte importida."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Vali kõvakettalt"
 
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 9b5a48bbe2..7ef4059934 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:53+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "Pole kategooriat, mida lisada?"
 msgid "This category already exists: "
 msgstr "See kategooria on juba olemas: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud parooli taastamine"
@@ -160,15 +236,15 @@ msgstr "Andmebaasi host"
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Seaded"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 6045145acd..8e2e2f4090 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 15:03+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "Ajutiste failide kaust puudub"
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Failid"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Suurus"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Muudetud"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Failide käsitlemine"
@@ -120,18 +172,6 @@ msgstr "Jaga"
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Suurus"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Muudetud"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Kustuta kõik"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/et_EE/gallery.po b/l10n/et_EE/gallery.po
index 93abfcda3a..1b844f2ca9 100644
--- a/l10n/et_EE/gallery.po
+++ b/l10n/et_EE/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:59+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Pildid"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Seaded"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Skänni uuesti"
@@ -34,10 +74,6 @@ msgstr "Peata"
 msgid "Share"
 msgstr "Jaga"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Seaded"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Tagasi"
diff --git a/l10n/et_EE/media.po b/l10n/et_EE/media.po
index 3591a13cae..8be81b35e4 100644
--- a/l10n/et_EE/media.po
+++ b/l10n/et_EE/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muusika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Esita"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +38,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Eelmine"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Järgmine"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index ff5dc06701..6b303c8c23 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:57+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "e-posti on muudetud"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Vigane päring"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID on muudetud"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Vigane päring"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Vali programm"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-litsenseeritud"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "kelle poolt"
 
diff --git a/l10n/eu/calendar.po b/l10n/eu/calendar.po
index 3ba3f9b004..15d3461f55 100644
--- a/l10n/eu/calendar.po
+++ b/l10n/eu/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 10:07+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Ordu-zonaldea aldatuta"
 msgid "Invalid request"
 msgstr "Baliogabeko eskaera"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Jaioteguna"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index eaf9bc62e4..1009fa2d06 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:58+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,23 +84,20 @@ msgstr "Errore bat egon da helbide liburua gehitzean."
 msgid "Error activating addressbook."
 msgstr "Errore bat egon da helbide-liburua aktibatzen."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Errore bat izan da irudia kargatzearkoan."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Errore bat izan da kontaktuaren argazkia igotzerakoan."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Kargatzen ari den argazkia ez da egokia."
 
@@ -124,14 +121,46 @@ msgstr "Kontaktuaren IDa falta da."
 msgid "Missing contact id."
 msgstr "Kontaktuaren IDa falta da."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Fitxategia ez da existitzen:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Errore bat izan da irudia kargatzearkoan."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "elementuaren izena ez da ezarri."
@@ -148,7 +177,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
@@ -164,102 +193,229 @@ msgstr "Errore bat egon da helbide liburua eguneratzen."
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Askatu VCF fitxategia kontaktuak inportatzeko."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Helbide liburua ez da aurkitu"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mezua"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -430,6 +586,10 @@ msgstr "Igo argazki berria"
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Editatu helbidea"
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Bidali"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -614,27 +774,22 @@ msgstr "Inportatu"
 msgid "Importing contacts"
 msgstr "Kontaktuak inportatzen"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktuak ongi inportatu dira"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Dialogoa itxi"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Inporatu helbide liburua"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Hautau helburuko helbide liburua:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Askatu VCF fitxategia kontaktuak inportatzeko."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Hautatu disko gogorretik"
 
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 35e7f5afb6..070d14864c 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:40+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "Ez dago gehitzeko kategoriarik?"
 msgid "This category already exists: "
 msgstr "Kategoria hau dagoeneko existitzen da:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloudeko pasahitza berrezarri"
@@ -161,15 +237,15 @@ msgstr "Datubasearen hostalaria"
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ezarpenak"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 04dbf77f53..28b55a998c 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:42+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Aldi baterako karpeta falta da"
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fitxategiak"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamaina"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Aldatuta"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Fitxategien kudeaketa"
@@ -121,18 +173,6 @@ msgstr "Elkarbanatu"
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamaina"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Aldatuta"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Ezabatu dena"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu/gallery.po b/l10n/eu/gallery.po
index 3f8cf59267..e9794f69fa 100644
--- a/l10n/eu/gallery.po
+++ b/l10n/eu/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:59+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Argazkiak"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Bireskaneatu"
@@ -34,10 +74,6 @@ msgstr "Gelditu"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Ezarpenak"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Atzera"
diff --git a/l10n/eu/media.po b/l10n/eu/media.po
index c70fbc6fa1..468d2fba32 100644
--- a/l10n/eu/media.po
+++ b/l10n/eu/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausarazi"
 
@@ -34,7 +38,7 @@ msgstr "Pausarazi"
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Hurrengoa"
 
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 3982dd46b3..cca5da2a9c 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:44+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "e-posta aldatuta"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Baliogabeko eskaria"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID aldatuta"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Baliogabeko eskaria"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "lizentziarekin"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr " Egilea:"
 
diff --git a/l10n/fa/calendar.po b/l10n/fa/calendar.po
index 6dbb4fdd41..36e72a9262 100644
--- a/l10n/fa/calendar.po
+++ b/l10n/fa/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 17:11+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "زمان محلی تغییر یافت"
 msgid "Invalid request"
 msgstr "درخواست نامعتبر"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "تقویم"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "روزتولد"
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 288ff30380..15075e66e4 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 17:44+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,23 +82,20 @@ msgstr "خطا درهنگام افزودن کتابچه نشانی ها"
 msgid "Error activating addressbook."
 msgstr "خطا درهنگام فعال سازیکتابچه نشانی ها"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "هیچ اطلاعاتی راجع به شناسه ارسال نشده"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "خطا در بارگزاری تصویر"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "خطا در خواندن اطلاعات تصویر"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "خطا در ذخیره پرونده موقت"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "بارگزاری تصویر امکان پذیر نیست"
 
@@ -122,14 +119,46 @@ msgstr "اطلاعات شناسه گم شده"
 msgid "Missing contact id."
 msgstr "شما اطلاعات شناسه را فراموش کرده اید"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "هیچ نشانی از تصویرارسال نشده"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "پرونده وجود ندارد"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "خطا در بارگزاری تصویر"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "نام اصلی تنظیم نشده است"
@@ -146,7 +175,7 @@ msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
@@ -162,102 +191,229 @@ msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
 msgid "Error uploading contacts to storage."
 msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حجم آپلود از طریق Php.ini تعیین می شود"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "کتابچه نشانی ها یافت نشد"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "این کتابچه ی نشانه های شما نیست"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "نشانی"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "تلفن"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "نشانی پست الکترنیک"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "نهاد(ارگان)"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "موبایل"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "متن"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "صدا"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "پیغام"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "دورنگار:"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "رسانه تصویری"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "صفحه"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "اینترنت"
 
@@ -428,6 +584,10 @@ msgstr "بار گذاری یک تصویر جدید"
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "ویرایش نشانی"
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -612,27 +772,22 @@ msgstr "وارد کردن"
 msgid "Importing contacts"
 msgstr "وارد کردن اشخاص"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "اشخاص با موفقیت افزوده شدند"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "بستن دیالوگ"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "وارد کردن کتابچه نشانی"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "یک کتابچه نشانی انتخاب کنید تا وارد شود"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "انتخاب از دیسک سخت"
 
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index ab6eb385a8..6930fb647c 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 14:05+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "آیا گروه دیگری برای افزودن ندارید"
 msgid "This category already exists: "
 msgstr "این گروه از قبل اضافه شده"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "گذرواژه ابرهای شما تغییرکرد"
@@ -160,15 +236,15 @@ msgstr "هاست پایگاه داده"
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "تنظیمات"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 3de912cfea..b58f617676 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 14:23+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "یک پوشه موقت گم شده است"
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "فایل ها"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "اندازه"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "تغییر یافته"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "اداره پرونده ها"
@@ -120,18 +172,6 @@ msgstr "به اشتراک گذاری"
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "اندازه"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "تغییر یافته"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "پاک کردن همه"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "پاک کردن"
diff --git a/l10n/fa/gallery.po b/l10n/fa/gallery.po
index 0377100229..72ce435195 100644
--- a/l10n/fa/gallery.po
+++ b/l10n/fa/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 16:59+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "تصاویر"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "بازرسی دوباره"
@@ -34,10 +74,6 @@ msgstr "توقف"
 msgid "Share"
 msgstr "به اشتراک گذاری"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "تنظیمات"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "بازگشت"
diff --git a/l10n/fa/media.po b/l10n/fa/media.po
index af18cfd0cc..bd920337ba 100644
--- a/l10n/fa/media.po
+++ b/l10n/fa/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 14:28+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,10 @@ msgstr ""
 msgid "Music"
 msgstr "موسیقی"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "پخش کردن"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index e75bed6f8e..1ee3d62cdb 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 15:00+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "پست الکترونیکی تغییر کرد"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "درخواست غیر قابل قبول"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID تغییر کرد"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "درخواست غیر قابل قبول"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "زبان تغییر کرد"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "مجوزنامه"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "به وسیله"
 
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index fd1a9967ec..17475e37a0 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -3,12 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -19,133 +22,157 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Kalentereita ei löytynyt"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Tapahtumia ei löytynyt."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
-msgstr ""
+msgstr "Väärä kalenteri"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Uusi aikavyöhyke:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
-msgstr ""
+msgstr "Aikavyöhyke vaihdettu"
 
 #: ajax/settings/settimezone.php:24
 msgid "Invalid request"
-msgstr ""
+msgstr "Virheellinen pyyntö"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
+msgstr "Kalenteri"
+
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: js/calendar.js:788
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
-msgstr ""
+msgid "Birthday"
+msgstr "Syntymäpäivä"
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
-msgstr ""
+msgid "Call"
+msgstr "Ota yhteyttä"
 
 #: lib/app.php:128
-msgid "Ideas"
-msgstr ""
+msgid "Clients"
+msgstr "Asiakkaat"
 
 #: lib/app.php:129
-msgid "Journey"
-msgstr ""
+msgid "Deliverer"
+msgstr "Toimittaja"
 
 #: lib/app.php:130
-msgid "Jubilee"
-msgstr ""
+msgid "Holidays"
+msgstr "Vapaapäivät"
 
 #: lib/app.php:131
-msgid "Meeting"
-msgstr ""
+msgid "Ideas"
+msgstr "Ideat"
 
 #: lib/app.php:132
-msgid "Other"
-msgstr ""
+msgid "Journey"
+msgstr "Matkustus"
 
 #: lib/app.php:133
-msgid "Personal"
-msgstr ""
+msgid "Jubilee"
+msgstr "Vuosipäivät"
 
 #: lib/app.php:134
-msgid "Projects"
-msgstr ""
+msgid "Meeting"
+msgstr "Tapaamiset"
 
 #: lib/app.php:135
-msgid "Questions"
-msgstr ""
+msgid "Other"
+msgstr "Muut"
 
 #: lib/app.php:136
-msgid "Work"
-msgstr ""
+msgid "Personal"
+msgstr "Henkilökohtainen"
 
-#: lib/app.php:377
+#: lib/app.php:137
+msgid "Projects"
+msgstr "Projektit"
+
+#: lib/app.php:138
+msgid "Questions"
+msgstr "Kysymykset"
+
+#: lib/app.php:139
+msgid "Work"
+msgstr "Työ"
+
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "nimetön"
 
 #: lib/object.php:330
 msgid "Does not repeat"
-msgstr ""
+msgstr "Ei toistoa"
 
 #: lib/object.php:331
 msgid "Daily"
-msgstr ""
+msgstr "Päivittäin"
 
 #: lib/object.php:332
 msgid "Weekly"
-msgstr ""
+msgstr "Viikottain"
 
 #: lib/object.php:333
 msgid "Every Weekday"
-msgstr ""
+msgstr "Arkipäivisin"
 
 #: lib/object.php:334
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "Joka toinen viikko"
 
 #: lib/object.php:335
 msgid "Monthly"
-msgstr ""
+msgstr "Kuukausittain"
 
 #: lib/object.php:336
 msgid "Yearly"
-msgstr ""
+msgstr "Vuosittain"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "Ei koskaan"
 
 #: lib/object.php:344
 msgid "by occurrences"
@@ -165,31 +192,31 @@ msgstr ""
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "Maanantai"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "Tiistai"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "Keskiviikko"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "Torstai"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "Perjantai"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "Lauantai"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "Sunnuntai"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -197,75 +224,75 @@ msgstr ""
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "ensimmäinen"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "toinen"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "kolmas"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "neljäs"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "viides"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "viimeinen"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #: lib/object.php:418
 msgid "by events date"
@@ -285,7 +312,7 @@ msgstr ""
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Päivämäärä"
 
 #: lib/search.php:40
 msgid "Cal."
@@ -293,20 +320,20 @@ msgstr ""
 
 #: templates/calendar.php:11
 msgid "All day"
-msgstr ""
+msgstr "Koko päivä"
 
 #: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr ""
+msgstr "Uusi kalenteri"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "Puuttuvat kentät"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
 msgid "Title"
-msgstr ""
+msgstr "Otsikko"
 
 #: templates/calendar.php:16
 msgid "From Date"
@@ -326,190 +353,190 @@ msgstr ""
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "Tapahtuma päättyy ennen alkamistaan"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "Tapahtui tietokantavirhe"
 
 #: templates/calendar.php:40
 msgid "Week"
-msgstr ""
+msgstr "Viikko"
 
 #: templates/calendar.php:41
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #: templates/calendar.php:42
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: templates/calendar.php:48
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #: templates/calendar.php:49
 msgid "Calendars"
-msgstr ""
+msgstr "Kalenterit"
 
 #: templates/calendar.php:67
 msgid "There was a fail, while parsing the file."
-msgstr ""
+msgstr "Tiedostoa jäsennettäessä tapahtui virhe."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr ""
+msgstr "Valitse aktiiviset kalenterit"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Omat kalenterisi"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav-linkki"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Jaetut kalenterit"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Ei jaettuja kalentereita"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Jaa kalenteri"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/part.choosecalendar.rowfields.php:7
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #: templates/part.choosecalendar.rowfields.php:8
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "kanssasi jaettu"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Uusi kalenteri"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "Muokkaa kalenteria"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Kalenterin nimi"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "Kalenterin väri"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Talleta"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Peru"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "Muokkaa tapahtumaa"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Vie"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Tapahtumatiedot"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Toisto"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Hälytys"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Osallistujat"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
-msgstr ""
+msgstr "Tapahtuman otsikko"
 
 #: templates/part.eventform.php:27 templates/part.showevent.php:19
 msgid "Category"
-msgstr ""
+msgstr "Luokka"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Erota luokat pilkuilla"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Muokkaa luokkia"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
-msgstr ""
+msgstr "Koko päivän tapahtuma"
 
 #: templates/part.eventform.php:60 templates/part.showevent.php:59
 msgid "From"
-msgstr ""
+msgstr "Alkaa"
 
 #: templates/part.eventform.php:68 templates/part.showevent.php:67
 msgid "To"
-msgstr ""
+msgstr "Päättyy"
 
 #: templates/part.eventform.php:76 templates/part.showevent.php:75
 msgid "Advanced options"
-msgstr ""
+msgstr "Tarkemmat asetukset"
 
 #: templates/part.eventform.php:81 templates/part.showevent.php:80
 msgid "Location"
-msgstr ""
+msgstr "Sijainti"
 
 #: templates/part.eventform.php:83
 msgid "Location of the Event"
-msgstr ""
+msgstr "Tapahtuman sijainti"
 
 #: templates/part.eventform.php:89 templates/part.showevent.php:88
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #: templates/part.eventform.php:91
 msgid "Description of the Event"
-msgstr ""
+msgstr "Tapahtuman kuvaus"
 
 #: templates/part.eventform.php:100 templates/part.showevent.php:98
 msgid "Repeat"
-msgstr ""
+msgstr "Toisto"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
@@ -517,12 +544,12 @@ msgstr ""
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "Valitse viikonpäivät"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "Valitse päivät"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
@@ -534,11 +561,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Valitse kuukaudet"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Valitse viikot"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -546,7 +573,7 @@ msgstr ""
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "Intervalli"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
@@ -558,51 +585,51 @@ msgstr ""
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Tuo kalenteritiedosto"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr ""
+msgstr "Valitse kalenteri"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "luo uusi kalenteri"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Uuden kalenterin nimi"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Tuo"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Tuodaan kalenteria"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalenteri tuotu onnistuneesti"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Sulje ikkuna"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "Luo uusi tapahtuma"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Avaa tapahtuma"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Luokkia ei ole valittu"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
-msgstr ""
+msgstr "Valitse luokka"
 
 #: templates/part.showevent.php:37
 msgid "of"
@@ -614,52 +641,52 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Timezone"
-msgstr ""
+msgstr "Aikavyöhyke"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Tarkista aina aikavyöhykkeen muutokset"
 
 #: templates/settings.php:33
 msgid "Timeformat"
-msgstr ""
+msgstr "Ajan esitysmuoto"
 
 #: templates/settings.php:35
 msgid "24h"
-msgstr ""
+msgstr "24 tuntia"
 
 #: templates/settings.php:36
 msgid "12h"
-msgstr ""
+msgstr "12 tuntia"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Viikon ensimmäinen päivä"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "Kalenterin CalDAV-synkronointiosoite:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "valitse käyttäjät"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Muoktattava"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "valitse ryhmät"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "aseta julkiseksi"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 8dbd3939d8..4748623176 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -3,12 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -23,15 +27,15 @@ msgstr ""
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Virhe yhteystietoa lisättäessä."
 
 #: ajax/addproperty.php:40
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Tyhjää ominaisuutta ei voi lisätä."
 
 #: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Vähintään yksi osoitekenttä tulee täyttää."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
@@ -39,7 +43,7 @@ msgstr ""
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Virhe lisättäessä ominaisuutta yhteystietoon."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
@@ -51,15 +55,15 @@ msgstr ""
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Luokkia ei ole valittu poistettavaksi."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Osoitekirjoja ei löytynyt."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Yhteystietoja ei löytynyt."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
@@ -67,37 +71,34 @@ msgstr ""
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Ilman nimeä olevaa osoitekirjaa ei voi lisätä."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Virhe lisättäessä osoitekirjaa."
 
 #: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Virhe aktivoitaessa osoitekirjaa."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Virhe tallennettaessa tilapäistiedostoa."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
@@ -121,12 +122,44 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
+msgstr "Tiedostoa ei ole olemassa:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Virhe kuvaa ladatessa."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
@@ -145,9 +178,9 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
@@ -155,165 +188,292 @@ msgstr ""
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Virhe päivitettäessä osoitekirjaa."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ei virhettä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Lähetetty tiedosto lähetettiin vain osittain"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Tiedostoa ei lähetetty"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Tilapäiskansio puuttuu"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Osoitekirjaa ei löytynyt."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
-msgstr ""
+msgstr "Osoite"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
-msgstr ""
+msgstr "Puhelin"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
-msgstr ""
+msgstr "Organisaatio"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
-msgstr ""
+msgstr "Työ"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
-msgstr ""
-
-#: lib/app.php:115
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:117
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:118
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:119
-msgid "Message"
-msgstr ""
-
-#: lib/app.php:120
-msgid "Fax"
-msgstr ""
-
-#: lib/app.php:121
-msgid "Video"
-msgstr ""
+msgstr "Koti"
 
 #: lib/app.php:122
-msgid "Pager"
-msgstr ""
+msgid "Mobile"
+msgstr "Mobiili"
+
+#: lib/app.php:124
+msgid "Text"
+msgstr "Teksti"
+
+#: lib/app.php:125
+msgid "Voice"
+msgstr "Ääni"
+
+#: lib/app.php:126
+msgid "Message"
+msgstr "Viesti"
+
+#: lib/app.php:127
+msgid "Fax"
+msgstr "Faksi"
 
 #: lib/app.php:128
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:129
+msgid "Pager"
+msgstr "Hakulaite"
+
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Henkilön {name} syntymäpäivä"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Yhteystieto"
 
 #: templates/index.php:13
 msgid "Add Contact"
-msgstr ""
+msgstr "Lisää yhteystieto"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "Osoitekirjat"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Muokkaa osoitekirjoja"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Uusi osoitekirja"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Tuo VCF-tiedostosta"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav-linkki"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
 #: templates/part.contact.php:34 templates/part.contact.php:36
 #: templates/part.contact.php:38 templates/part.contact.php:42
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr ""
+msgstr "Lataa yhteystieto"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "Poista yhteystieto"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -329,15 +489,15 @@ msgstr ""
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Kutsumanimi"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Anna kutsumanimi"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
-msgstr ""
+msgstr "Syntymäpäivä"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
@@ -345,15 +505,15 @@ msgstr ""
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Erota ryhmät pilkuilla"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Muokkaa ryhmiä"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -361,11 +521,11 @@ msgstr ""
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Anna kelvollinen sähköpostiosoite."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Anna sähköpostiosoite"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
@@ -373,19 +533,19 @@ msgstr ""
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Poista sähköpostiosoite"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Anna puhelinnumero"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Poista puhelinnumero"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Näytä kartalla"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
@@ -393,94 +553,98 @@ msgstr ""
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Lisää huomiot tähän."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Lisää kenttä"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profiilikuva"
 
 #: templates/part.contact.php:107
 msgid "Phone"
-msgstr ""
+msgstr "Puhelin"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Huomio"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Poista nykyinen valokuva"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Muokkaa nykyistä valokuvaa"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Lähetä uusi valokuva"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Valitse valokuva ownCloudista"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Muokkaa osoitetta"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
 msgid "PO Box"
-msgstr ""
+msgstr "Postilokero"
 
 #: templates/part.edit_address_dialog.php:29
 #: templates/part.edit_address_dialog.php:32
 msgid "Extended"
-msgstr ""
+msgstr "Laajennettu"
 
 #: templates/part.edit_address_dialog.php:35
 #: templates/part.edit_address_dialog.php:38
 msgid "Street"
-msgstr ""
+msgstr "Katuosoite"
 
 #: templates/part.edit_address_dialog.php:41
 #: templates/part.edit_address_dialog.php:44
 msgid "City"
-msgstr ""
+msgstr "Paikkakunta"
 
 #: templates/part.edit_address_dialog.php:47
 #: templates/part.edit_address_dialog.php:50
 msgid "Region"
-msgstr ""
+msgstr "Alue"
 
 #: templates/part.edit_address_dialog.php:53
 #: templates/part.edit_address_dialog.php:56
 msgid "Zipcode"
-msgstr ""
+msgstr "Postinumero"
 
 #: templates/part.edit_address_dialog.php:59
 #: templates/part.edit_address_dialog.php:62
 msgid "Country"
-msgstr ""
+msgstr "Maa"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Muokkaa luokkia"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "Osoitekirja"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -512,15 +676,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Etunimi"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Lisänimet"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Sukunimi"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -560,11 +724,11 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Uusi osoitekirja"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Muokkaa osoitekirjaa"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -572,84 +736,79 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Lähetä"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "Peru"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Tuo yhteystiedon sisältävä tiedosto"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Valitse osoitekirja"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "luo uusi osoitekirja"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Uuden osoitekirjan nimi"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Tuo"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Tuodaan yhteystietoja"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Valitse osoitekirja, johon yhteystiedot tuodaan:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Osoitekirjassasi ei ole yhteystietoja."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Lisää yhteystieto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Muokkaa osoitekirjoja"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV-synkronointiosoitteet"
 
 #: templates/settings.php:4
 msgid "more info"
@@ -661,4 +820,4 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index a92f341d79..a770488ca3 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
 # Pekka Sutela <pekka.sutela@gmail.com>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 11:34+0000\n"
-"Last-Translator: Pekka Sutela <pekka.sutela@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,39 +24,115 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Sovelluksen nimeä ei määritelty."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ei lisättävää luokkaa?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Tämä luokka on jo olemassa: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Owncloud-salasanan nollaus"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud-salasanan nollaus"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Tilattu"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "Kirjautuminen epäonnistui!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -61,63 +141,63 @@ msgstr "Käyttäjätunnus"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr ""
+msgstr "Tilaus lähetetty"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Salasanasi nollattiin"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Kirjautumissivulle"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Uusi salasana"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Palauta salasana"
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Henkilökohtaiset"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "Sovellukset"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Hallinta"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "Ohje"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Pääsy estetty"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Pilveä ei löydy"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Muokkaa luokkia"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -125,64 +205,64 @@ msgstr "Salasana"
 
 #: templates/installation.php:35
 msgid "Advanced"
-msgstr ""
+msgstr "Lisäasetukset"
 
 #: templates/installation.php:37
 msgid "Data folder"
-msgstr ""
+msgstr "Datakansio"
 
 #: templates/installation.php:44
 msgid "Configure the database"
-msgstr ""
+msgstr "Muokkaa tietokantaa"
 
 #: templates/installation.php:49 templates/installation.php:60
 #: templates/installation.php:70
 msgid "will be used"
-msgstr ""
+msgstr "käytetään"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr ""
+msgstr "Tietokannan käyttäjä"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr ""
+msgstr "Tietokannan salasana"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr ""
+msgstr "Tietokannan nimi"
 
 #: templates/installation.php:96
 msgid "Database host"
-msgstr ""
+msgstr "Tietokantapalvelin"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr ""
+msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
-msgstr ""
+msgstr "Asetukset"
 
 #: templates/login.php:6
 msgid "Lost your password?"
-msgstr ""
+msgstr "Unohditko salasanasi?"
 
 #: templates/login.php:17
 msgid "remember"
-msgstr ""
+msgstr "muista"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Kirjaudu sisään"
 
 #: templates/logout.php:1
 msgid "You are logged out."
@@ -190,8 +270,8 @@ msgstr "Olet kirjautunut ulos."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "edellinen"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "seuraava"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 8dd4764cd5..529f183e46 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -3,12 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -19,45 +23,97 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Lähetetty tiedosto ylittää upload_max_filesize-arvon rajan php.ini-tiedostossa"
 
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Tiedoston lähetys onnistui vain osittain"
 
 #: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Yhtäkään tiedostoa ei lähetetty"
 
 #: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Väliaikaiskansiota ei ole olemassa"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
+msgstr "Levylle kirjoitus epäonnistui"
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "Tiedostot"
+
+#: js/filelist.js:186
+msgid "undo deletion"
 msgstr ""
 
-#: appinfo/app.php:7
-msgid "Files"
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Koko"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Muutettu"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
 msgstr ""
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Tiedostonhallinta"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr ""
+msgstr "Lähetettävän tiedoston suurin sallittu koko"
 
 #: templates/admin.php:7
 msgid "max. possible: "
@@ -65,89 +121,77 @@ msgstr ""
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Tarvitaan useampien tiedostojen ja kansioiden latausta varten."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Ota ZIP-paketin lataaminen käytöön"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 on rajoittamaton"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ZIP-tiedostojen enimmäiskoko"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Tekstitiedosto"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Kansio"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Verkko-osoitteesta"
 
 #: templates/index.php:21
 msgid "Upload"
-msgstr ""
+msgstr "Lähetä"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Peru lähetys"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
 #: templates/index.php:47
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/index.php:51
 msgid "Download"
-msgstr ""
-
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/index.php:56
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/index.php:64
 msgid "Upload too large"
-msgstr ""
+msgstr "Lähetettävä tiedosto on liian suuri"
 
 #: templates/index.php:66
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Tiedostoja tarkistetaan, odota hetki."
 
 #: templates/index.php:74
 msgid "Current scanning"
diff --git a/l10n/fi_FI/gallery.po b/l10n/fi_FI/gallery.po
index 52bdc097bf..b4ea780216 100644
--- a/l10n/fi_FI/gallery.po
+++ b/l10n/fi_FI/gallery.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +19,78 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Kuvat"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Asetukset"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Etsi uusia"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Pysäytä"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Takaisin"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Poiston vahvistus"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Tahdotko poistaa albumin"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Muuta albumin nimeä"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Uuden albumin nimi"
diff --git a/l10n/fi_FI/media.po b/l10n/fi_FI/media.po
index 1ef1da9b45..86efa19e5d 100644
--- a/l10n/fi_FI/media.po
+++ b/l10n/fi_FI/media.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,46 +18,50 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
+msgstr "Musiikki"
+
+#: js/music.js:18
+msgid "Add album to playlist"
 msgstr ""
 
-#: templates/music.php:3 templates/player.php:13
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
-msgstr ""
+msgstr "Toista"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
-msgstr ""
+msgstr "Tauko"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Mykistä"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "Palauta äänet"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "Etsi uusia kappaleita"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "Esittäjä"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "Albumi"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Nimi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 01ffececf9..4034113155 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,166 +20,185 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID on vaihdettu"
+
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Virheellinen pyyntö"
 
 #: ajax/setlanguage.php:17
 msgid "Language changed"
+msgstr "Kieli on vaihdettu"
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
 msgstr ""
 
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "_kielen_nimi_"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Loki"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Lisää"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Lisää ohjelmasi"
 
 #: templates/apps.php:22
 msgid "Select an App"
-msgstr ""
+msgstr "Valitse ohjelma"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
-msgstr ""
+msgstr "-lisenssöity"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
-msgstr ""
+msgstr "henkilölle"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentaatio"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Suurten tiedostojen hallinta"
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr ""
+msgstr "Kysy jotain"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Virhe yhdistettäessä tietokantaan."
 
 #: templates/help.php:23
 msgid "Go there manually."
-msgstr ""
+msgstr "Ohje löytyy sieltä."
 
 #: templates/help.php:31
 msgid "Answer"
-msgstr ""
+msgstr "Vastaus"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "Olet käyttänyt"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "käytettävissäsi on yhteensä"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Tietokoneen ja mobiililaitteiden synkronointisovellukset"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr ""
+msgstr "Salasanasi on vaihdettu"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Salasanaasi ei voitu vaihtaa"
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr ""
+msgstr "Nykyinen salasana"
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "Uusi salasana"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr ""
+msgstr "näytä"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr ""
+msgstr "Vaihda salasana"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Sähköpostiosoitteesi"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
-msgstr ""
+msgstr "Kieli"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Auta kääntämisessä"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta"
 
 #: templates/users.php:15 templates/users.php:44
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: templates/users.php:16 templates/users.php:45
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
 #: templates/users.php:17 templates/users.php:46 templates/users.php:60
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/users.php:22
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Oletuskiintiö"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Muu"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "Kiintiö"
 
 #: templates/users.php:80
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 84be2c67d3..b9d0abab86 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 17:01+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,16 +47,40 @@ msgstr "Fuseau horaire modifié"
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Anniversaire"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index fe2b333ea1..4702c3bc4a 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Borjan Tchakaloff <borjan@tchaka.fr>, 2012.
 #   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
 #   <guiguidu31300@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 22:26+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,23 +87,20 @@ msgstr "Erreur lors de l'ajout du carnet d'adresses."
 msgid "Error activating addressbook."
 msgstr "Erreur lors de l'activation du carnet d'adresses."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Aucun ID de contact envoyé"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Erreur lors du chargement de l'image."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Erreur de lecture de la photo du contact."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Erreur de sauvegarde du fichier temporaire."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La photo chargée est invalide."
 
@@ -126,14 +124,46 @@ msgstr "L'ID du contact est manquant."
 msgid "Missing contact id."
 msgstr "ID contact manquant."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Le chemin de la photo n'a pas été envoyé."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Fichier inexistant:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Erreur lors du chargement de l'image."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "Le champ Nom n'est pas défini."
@@ -150,7 +180,7 @@ msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
@@ -166,102 +196,229 @@ msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacts"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Glisser un fichier VCF pour importer des contacts."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Carnet d'adresses introuvable."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -432,6 +589,10 @@ msgstr "Envoyer une nouvelle photo"
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Editer l'adresse"
@@ -549,7 +710,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -588,7 +749,7 @@ msgid "Submit"
 msgstr "Envoyer"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -616,27 +777,22 @@ msgstr "Importer"
 msgid "Importing contacts"
 msgstr "Importation des contacts"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contacts importés avec succes"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Fermer la boite de dialogue"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importer un carnet d'adresses."
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Selectionner le carnet d'adresses à importer vers:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Glisser un fichier VCF pour importer des contacts."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Selectionner depuis le disque dur"
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 40e9c70c9e..b2609663ea 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 16:44+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "Pas de catégorie à ajouter ?"
 msgid "This category already exists: "
 msgstr "Cette catégorie existe déjà : "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
@@ -160,15 +236,15 @@ msgstr "Serveur de la base de données"
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Paramètres"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index ff22b000dc..b510e4ac0d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 16:58+0000\n"
-"Last-Translator: guiguidu31300 <guiguidu31300@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Il manque un répertoire temporaire"
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fichiers"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Taille"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modifié"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestion des fichiers"
@@ -121,18 +173,6 @@ msgstr "Partager"
 msgid "Download"
 msgstr "Téléchargement"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Taille"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modifié"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Supprimer tout"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index f7e7eb78e1..1bd0947079 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 17:04+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Images"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Préférences"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Analyser à nouveau"
@@ -35,10 +75,6 @@ msgstr "Arrêter"
 msgid "Share"
 msgstr "Partager"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Préférences"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Retour"
diff --git a/l10n/fr/media.po b/l10n/fr/media.po
index ef6fcb0aae..e8dc770632 100644
--- a/l10n/fr/media.po
+++ b/l10n/fr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musique"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Play"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -34,7 +38,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Suivant"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 0e1f6da4e0..5184f5e460 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 21:39+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "e-mail modifié"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Requête invalide"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Identifiant OpenID changé"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Requête invalide"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Langue changée"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Français"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Sélectionner une Application"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "sous licence"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "par"
 
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index a0889618e6..64798f954a 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Non se atoparon calendarios."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Non se atoparon eventos."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +43,103 @@ msgstr "Fuso horario trocado"
 msgid "Invalid request"
 msgstr "Petición non válida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Traballo"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Chamada"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Remitente"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Vacacións"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Viaxe"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Aniversario especial"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Persoal"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Proxectos"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "sen nome"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +388,7 @@ msgstr "Escolla os calendarios activos"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Os seus calendarios"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +397,15 @@ msgstr "Ligazón CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Calendarios compartidos"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Sen calendarios compartidos"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Compartir calendario"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +422,7 @@ msgstr "Borrar"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "compartido con vostede por"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +467,23 @@ msgstr "Exportar"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Info do evento"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Repetido"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Participantes"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +495,11 @@ msgstr "Categoría"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separe as categorías con comas"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorías"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +620,11 @@ msgstr "Crear un novo evento"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Ver un evento"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Non seleccionou as categorías"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +632,11 @@ msgstr "Seleccionar categoría"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "a"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +660,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Primeiro día da semana"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +668,24 @@ msgstr "Enderezo de sincronización do calendario CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "escoller usuarios"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Editable"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "escoller grupos"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "facer público"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 375b79dd7b..2ee23b52a1 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Produciuse un erro engadindo a axenda."
 msgid "Error activating addressbook."
 msgstr "Produciuse un erro activando a axenda."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -123,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
@@ -163,102 +192,229 @@ msgstr "Produciuse un erro actualizando a axenda."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta non é a súa axenda."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Enderezo"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Paxinador"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -429,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -613,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index f3d4afcbf6..97abae0775 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Non se indicou o nome do aplicativo."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Sen categoría que engadir?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Esta categoría xa existe: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +113,7 @@ msgstr "Restablecemento do contrasinal de Owncloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Restablecer contrasinal de ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +178,7 @@ msgstr "Axuda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Acceso denegado"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +186,11 @@ msgstr "Nube non atopada"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Engadir"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +237,15 @@ msgstr "Servidor da base de datos"
 msgid "Finish setup"
 msgstr "Rematar configuración"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Preferencias"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 0352347501..971843534c 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,67 @@ msgstr "Falta un cartafol temporal"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Erro ao escribir no disco"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Manexo de ficheiro"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -63,23 +115,23 @@ msgstr "Tamaño máximo de envío"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "máx. posible: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Preciso para descarga de varios ficheiros e cartafoles."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Habilitar a descarga-ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 significa ilimitado"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Tamaño máximo de descarga para os ZIP"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +147,7 @@ msgstr "Cartafol"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Desde url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +155,7 @@ msgstr "Enviar"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Cancelar subida"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +167,12 @@ msgstr "Nome"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamaño"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Eliminar"
@@ -149,8 +189,8 @@ msgstr "Os ficheiros que trata de subir superan o tamaño máximo permitido nest
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Estanse analizando os ficheiros, espere por favor."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Análise actual."
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
index 49c0b36d3d..2a62856bb0 100644
--- a/l10n/gl/gallery.po
+++ b/l10n/gl/gallery.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,48 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Fotografías"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Configuración"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +69,11 @@ msgstr "Analizar de novo"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +81,16 @@ msgstr "Atrás"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Eliminar confirmación"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Quere eliminar o album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Trocar o nome do album"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Novo nome do album"
diff --git a/l10n/gl/media.po b/l10n/gl/media.po
index 10932ea508..16f55e5225 100644
--- a/l10n/gl/media.po
+++ b/l10n/gl/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-06 12:06+0000\n"
-"Last-Translator: antiparvos <marcoslansgarza@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproducir"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausar"
 
@@ -35,7 +39,7 @@ msgstr "Pausar"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Seguinte"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index ae37989e17..2d3b9ac338 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Correo electrónico mudado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Petición incorrecta"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Mudou o OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Petición incorrecta"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "O idioma mudou"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Galego"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Conectar"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Máis"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Engade o teu aplicativo"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Escolla un Aplicativo"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documentación"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Xestionar Grandes Ficheiros"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -98,11 +117,11 @@ msgstr "dun total de"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Cliente de sincronización de escritorio e móbil"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -170,11 +189,11 @@ msgstr "Crear"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Cuota por omisión"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/he/calendar.po b/l10n/he/calendar.po
index bc4728f8fd..a29ec43433 100644
--- a/l10n/he/calendar.po
+++ b/l10n/he/calendar.po
@@ -5,13 +5,13 @@
 # Translators:
 # Elad Alfassa <elad@fedoraproject.org>, 2011.
 #   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "לא נמצאו לוחות שנה."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "לא נמצאו אירועים."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -34,7 +34,7 @@ msgstr "לוח שנה לא נכון"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "אזור זמן חדש:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
@@ -44,79 +44,103 @@ msgstr "אזור זמן השתנה"
 msgid "Invalid request"
 msgstr "בקשה לא חוקית"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "ח שנה"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "עסקים"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "שיחה"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "לקוחות"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "משלוח"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "חגים"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "רעיונות"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "מסע"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "יובל"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "פגישה"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "אחר"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "אישי"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "פרוייקטים"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "שאלות"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "ללא שם"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -148,151 +172,151 @@ msgstr "שנתי"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "לעולם לא"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr ""
+msgstr "לפי מופעים"
 
 #: lib/object.php:345
 msgid "by date"
-msgstr ""
+msgstr "לפי תאריך"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "לפי היום בחודש"
 
 #: lib/object.php:353
 msgid "by weekday"
-msgstr ""
+msgstr "לפי היום בשבוע"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "יום שני"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "יום שלישי"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "יום רביעי"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "יום חמישי"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "יום שישי"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "שבת"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "יום ראשון"
 
 #: lib/object.php:373
 msgid "events week of month"
-msgstr ""
+msgstr "שבוע בחודש לציון הפעילות"
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "ראשון"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "שני"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "שלישי"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "רביעי"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "חמישי"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "אחרון"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "ינואר"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "פברואר"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "מרץ"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "אפריל"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "מאי"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "יוני"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "יולי"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "אוגוסט"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "ספטמבר"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "אוקטובר"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "נובמבר"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "דצמבר"
 
 #: lib/object.php:418
 msgid "by events date"
-msgstr ""
+msgstr "לפי תאריכי האירועים"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr ""
+msgstr "לפי ימים בשנה"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "לפי מספרי השבועות"
 
 #: lib/object.php:421
 msgid "by day and month"
-msgstr ""
+msgstr "לפי יום וחודש"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "תאריך"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "לוח שנה"
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -304,7 +328,7 @@ msgstr "לוח שנה חדש"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "שדות חסרים"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
@@ -313,27 +337,27 @@ msgstr "כותרת"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr ""
+msgstr "מתאריך"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr ""
+msgstr "משעה"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr ""
+msgstr "עד תאריך"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr ""
+msgstr "עד שעה"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "האירוע מסתיים עוד לפני שהתחיל"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "אירע כשל במסד הנתונים"
 
 #: templates/calendar.php:40
 msgid "Week"
@@ -365,7 +389,7 @@ msgstr "בחר לוחות שנה פעילים"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "לוחות השנה שלך"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -374,15 +398,15 @@ msgstr "קישור CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "לוחות שנה מושתפים"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "אין לוחות שנה משותפים"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "שיתוף לוח שנה"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -399,7 +423,7 @@ msgstr "מחיקה"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "שותף אתך על ידי"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -444,23 +468,23 @@ msgstr "יצוא"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "פרטי האירוע"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "חוזר"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "תזכורת"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "משתתפים"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "שיתוף"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -472,11 +496,11 @@ msgstr "קטגוריה"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "הפרדת קטגוריות בפסיק"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "עריכת קטגוריות"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -492,7 +516,7 @@ msgstr "עבור"
 
 #: templates/part.eventform.php:76 templates/part.showevent.php:75
 msgid "Advanced options"
-msgstr ""
+msgstr "אפשרויות מתקדמות"
 
 #: templates/part.eventform.php:81 templates/part.showevent.php:80
 msgid "Location"
@@ -516,64 +540,64 @@ msgstr "חזרה"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
-msgstr ""
+msgstr "מתקדם"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "יש לבחור ימים בשבוע"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "יש לבחור בימים"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
-msgstr ""
+msgstr "ויום האירוע בשנה."
 
 #: templates/part.eventform.php:182 templates/part.showevent.php:180
 msgid "and the events day of month."
-msgstr ""
+msgstr "ויום האירוע בחודש."
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "יש לבחור בחודשים"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "יש לבחור בשבועות"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
-msgstr ""
+msgstr "ומספור השבוע הפעיל בשנה."
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "משך"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
-msgstr ""
+msgstr "סיום"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr ""
+msgstr "מופעים"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "יבוא קובץ לוח שנה"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr ""
+msgstr "נא לבחור את לוח השנה"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "יצירת לוח שנה חדש"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "שם לוח השנה החדש"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -581,15 +605,15 @@ msgstr "יבוא"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "היומן מייובא"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "היומן ייובא בהצלחה"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "סגירת הדו־שיח"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -597,11 +621,11 @@ msgstr "יצירת אירוע חדש"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "צפייה באירוע"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "לא נבחרו קטגוריות"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -609,11 +633,11 @@ msgstr "בחר קטגוריה"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "מתוך"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "בשנה"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -621,48 +645,48 @@ msgstr "אזור זמן"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "יש לבדוק תמיד אם יש הבדלים באזורי הזמן"
 
 #: templates/settings.php:33
 msgid "Timeformat"
-msgstr ""
+msgstr "מבנה התאריך"
 
 #: templates/settings.php:35
 msgid "24h"
-msgstr ""
+msgstr "24 שעות"
 
 #: templates/settings.php:36
 msgid "12h"
-msgstr ""
+msgstr "12 שעות"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "היום הראשון בשבוע"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "כתובת הסנכרון ללוח שנה מסוג CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "משתמשים"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "נא לבחור במשתמשים"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "ניתן לעריכה"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "קבוצות"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "בחירת קבוצות"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "הפיכה לציבורי"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 8ba27a195b..76473c1487 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -20,51 +21,51 @@ msgstr ""
 
 #: ajax/activation.php:19 ajax/updateaddressbook.php:32
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
 #: ajax/addproperty.php:40
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "לא ניתן להוסיף מאפיין ריק."
 
 #: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "יש למלא לפחות אחד משדות הכתובת."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "ניסיון להוספת מאפיין כפול: "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
-msgstr ""
+msgstr "שגיאה בהוספת מאפיין לאיש הקשר."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "לא צוין מזהה"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "שגיאה בהגדרת נתוני הביקורת."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "לא נבחור קטגוריות למחיקה."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "לא נמצאו פנקסי כתובות."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "לא נמצאו אנשי קשר."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "מזהה חסר"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
@@ -76,29 +77,26 @@ msgstr ""
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "שגיאה בהוספת פנקס הכתובות."
 
 #: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "שגיאה בהפעלת פנקס הכתובות."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -112,7 +110,7 @@ msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
@@ -122,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,9 +176,9 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
-msgstr ""
+msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
@@ -156,108 +186,235 @@ msgstr ""
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "שגיאה בעדכון פנקס הכתובות."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
-msgid "Contacts"
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: lib/app.php:23
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
+msgid "Contacts"
+msgstr "אנשי קשר"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -267,7 +424,7 @@ msgstr ""
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "איש קשר"
 
 #: templates/index.php:13
 msgid "Add Contact"
@@ -275,7 +432,7 @@ msgstr "הוספת איש קשר"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "פנקסי כתובות"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
@@ -283,7 +440,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "פנקס כתובות חדש"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
@@ -292,11 +449,11 @@ msgstr ""
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "קישור "
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "הורדה"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
@@ -310,11 +467,11 @@ msgstr "מחיקה"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr ""
+msgstr "הורדת איש קשר"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "מחיקת איש קשר"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -358,7 +515,7 @@ msgstr ""
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
-msgstr ""
+msgstr "מועדף"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
@@ -428,13 +585,17 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "סוג"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
@@ -477,11 +638,11 @@ msgstr ""
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "הוספה"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "פנקס כתובות"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -561,32 +722,32 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "פנקס כתובות חדש"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "עריכת פנקס הכתובות"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "שם התצוגה"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "פעיל"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "שמירה"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "ביצוע"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "ביטול"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
@@ -612,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index c701a244b4..4d10be3cda 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "שם היישום לא סופק."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "אין קטגוריה להוספה?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "קטגוריה זאת כבר קיימת: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "איפוס הססמה של ownCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "איפוס הססמה של ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -70,7 +146,7 @@ msgstr "הססמה שלך אופסה"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "לדף הכניסה"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -102,7 +178,7 @@ msgstr "עזרה"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "הגישה נחסמה"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +186,11 @@ msgstr "ענן לא נמצא"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "עריכת הקטגוריות"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "הוספה"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +237,15 @@ msgstr "שרת בסיס נתונים"
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -183,15 +259,15 @@ msgstr "שמירת הססמה"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "כניסה"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "אינך מחובר."
+msgstr "לא התחברת."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr "קודם"
+msgstr "הקודם"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 5e823f58a6..12ed075b22 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +47,67 @@ msgstr "תיקייה זמנית חסרה"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "הכתיבה לכונן נכשלה"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "קבצים"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "גודל"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "זמן שינוי"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "טיפול בקבצים"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +115,39 @@ msgstr "גודל העלאה מקסימלי"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "המרבי האפשרי: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "נחוץ להורדה של ריבוי קבצים או תיקיות."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "הפעלת הורדת ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 - ללא הגבלה"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "גודל הקלט המרבי לקובצי ZIP"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "חדש"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "קובץ טקסט"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "תיקייה"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "מכתובת"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "העלאה"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "ביטול ההעלאה"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "שם"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "שיתוף"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "גודל"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "זמן שינוי"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "מחיקה"
@@ -148,8 +189,8 @@ msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסי
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "הקבצים נסרקים, נא להמתין."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "הסריקה הנוכחית"
diff --git a/l10n/he/gallery.po b/l10n/he/gallery.po
index 0db626f9e5..d2e1ed419a 100644
--- a/l10n/he/gallery.po
+++ b/l10n/he/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/he/media.po b/l10n/he/media.po
index a94d7e5ee1..993c46955b 100644
--- a/l10n/he/media.po
+++ b/l10n/he/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "מוזיקה"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "נגן"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "השהה"
 
@@ -34,7 +38,7 @@ msgstr "השהה"
 msgid "Previous"
 msgstr "קודם"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "הבא"
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index ce7584db69..c98f33ca80 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "בקשה לא חוקית"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID השתנה"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "בקשה לא חוקית"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "עברית"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "יומן"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "עוד"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "הוספת היישום שלך"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "בחירת יישום"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "רשיון"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "מאת"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "תיעוד"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "ניהול קבצים גדולים"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "מתוך "
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "לקוחות סנכרון למחשב שולחני ולנייד"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "הורדה"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +149,15 @@ msgstr "שינוי ססמה"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "דוא״ל"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "כתובת הדוא״ל שלך"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +165,7 @@ msgstr "פה"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "עזרה בתרגום"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +189,15 @@ msgstr "יצירה"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "מכסת בררת המחדל"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "אחר"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "מכסה"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/hr/calendar.po b/l10n/hr/calendar.po
index 3511ae27a0..3623524514 100644
--- a/l10n/hr/calendar.po
+++ b/l10n/hr/calendar.po
@@ -4,12 +4,14 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Nisu pronađeni kalendari"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Događaj nije pronađen."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -32,7 +34,7 @@ msgstr "Pogrešan kalendar"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Nova vremenska zona:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
@@ -42,79 +44,103 @@ msgstr "Vremenska zona promijenjena"
 msgid "Invalid request"
 msgstr "Neispravan zahtjev"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
-msgstr "Odmori"
+msgstr "Praznici"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Putovanje"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Obljetnica"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Ostalo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Osobno"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "bezimeno"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -146,51 +172,51 @@ msgstr "Godišnje"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "nikad"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr ""
+msgstr "po pojavama"
 
 #: lib/object.php:345
 msgid "by date"
-msgstr ""
+msgstr "po datum"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "po dana mjeseca"
 
 #: lib/object.php:353
 msgid "by weekday"
-msgstr ""
+msgstr "po tjednu"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "ponedeljak"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "utorak"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "srijeda"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "četvrtak"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "petak"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "subota"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "nedelja"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -198,99 +224,99 @@ msgstr ""
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "prvi"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "drugi"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "treći"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "četvrti"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "peti"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "zadnji"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "siječanj"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "veljača"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "ožujak"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "travanj"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "svibanj"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "lipanj"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "srpanj"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "kolovoz"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "rujan"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "listopad"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "studeni"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "prosinac"
 
 #: lib/object.php:418
 msgid "by events date"
-msgstr ""
+msgstr "po datumu događaja"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr ""
+msgstr "po godini(-nama)"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "po broju tjedna(-ana)"
 
 #: lib/object.php:421
 msgid "by day and month"
-msgstr ""
+msgstr "po danu i mjeseca"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "datum"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Kal."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -298,7 +324,7 @@ msgstr "Cijeli dan"
 
 #: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr "Novi Kalendar"
+msgstr "Novi kalendar"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
@@ -311,19 +337,19 @@ msgstr "Naslov"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr "Datum Od"
+msgstr "Datum od"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr "Vrijeme Od"
+msgstr "Vrijeme od"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr "Datum Do"
+msgstr "Datum do"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr "Vrijeme Do"
+msgstr "Vrijeme do"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
@@ -359,28 +385,28 @@ msgstr "Pogreška pri čitanju datoteke."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr "Odaberite aktive kalendare"
+msgstr "Odabir aktivnih kalendara"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Vaši kalendari"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
 msgid "CalDav Link"
-msgstr "CalDav Poveznica"
+msgstr "CalDav poveznica"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Podijeljeni kalendari"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Nema zajedničkih kalendara"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Podjeli kalendar"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -397,7 +423,7 @@ msgstr "Briši"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "podijeljeno s vama od "
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -442,27 +468,27 @@ msgstr "Izvoz"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informacije o događaju"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Ponavljanje"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Polaznici"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Podijeli"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
-msgstr "Naslov Događaja"
+msgstr "Naslov događaja"
 
 #: templates/part.eventform.php:27 templates/part.showevent.php:19
 msgid "Category"
@@ -470,11 +496,11 @@ msgstr "Kategorija"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Odvoji kategorije zarezima"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Uredi kategorije"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -498,7 +524,7 @@ msgstr "Lokacija"
 
 #: templates/part.eventform.php:83
 msgid "Location of the Event"
-msgstr "Lokacija Događaja"
+msgstr "Lokacija događaja"
 
 #: templates/part.eventform.php:89 templates/part.showevent.php:88
 msgid "Description"
@@ -514,16 +540,16 @@ msgstr "Ponavljanje"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "Odaberi dane u tjednu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "Odaberi dane"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
@@ -535,11 +561,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Odaberi mjesece"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Odaberi tjedne"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -547,31 +573,31 @@ msgstr ""
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "Interval"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
-msgstr ""
+msgstr "Kraj"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr ""
+msgstr "pojave"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Uvozite datoteku kalendara"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr "Odaberite kalendar"
+msgstr "Odaberi kalendar"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "stvori novi kalendar"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Ime novog kalendara"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -579,15 +605,15 @@ msgstr "Uvoz"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Uvoz kalendara"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalendar je uspješno uvezen"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Zatvori dijalog"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -595,11 +621,11 @@ msgstr "Unesi novi događaj"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Vidjeti događaj"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nema odabranih kategorija"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -607,11 +633,11 @@ msgstr "Odabir kategorije"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "od"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "na"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -619,7 +645,7 @@ msgstr "Vremenska zona"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Provjerite uvijek za promjene vremenske zone"
 
 #: templates/settings.php:33
 msgid "Timeformat"
@@ -635,32 +661,32 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Prvi dan tjedna"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa za CalDAV sinkronizaciju kalendara"
+msgstr "Adresa za CalDAV sinkronizaciju kalendara:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "odaberi korisnike"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Može se uređivati"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "izaberite grupe"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "podjeli s javnošću"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 88f340006f..14ede506d8 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +83,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,12 +120,44 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
+msgstr "Datoteka ne postoji:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
@@ -146,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +192,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
-msgid "Contacts"
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: lib/app.php:23
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -267,7 +424,7 @@ msgstr ""
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #: templates/index.php:13
 msgid "Add Contact"
@@ -275,7 +432,7 @@ msgstr "Dodaj kontakt"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adresari"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
@@ -283,7 +440,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Novi adresar"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
@@ -292,11 +449,11 @@ msgstr ""
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav poveznica"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "Preuzimanje"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
@@ -310,11 +467,11 @@ msgstr "Obriši"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr ""
+msgstr "Preuzmi kontakt"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "Izbriši kontakt"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -326,15 +483,15 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Uredi detalje imena"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Nadimak"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Unesi nadimank"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -342,11 +499,11 @@ msgstr "Rođendan"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-yyyy"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
@@ -354,7 +511,7 @@ msgstr ""
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Uredi grupe"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -366,7 +523,7 @@ msgstr ""
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Unesi email adresu"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
@@ -378,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Unesi broj telefona"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
@@ -386,19 +543,19 @@ msgstr ""
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Prikaži na karti"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Uredi detalje adrese"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Dodaj bilješke ovdje."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Dodaj polje"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
@@ -410,7 +567,7 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -418,7 +575,7 @@ msgstr ""
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Uredi trenutnu sliku"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
@@ -428,13 +585,17 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Uredi adresu"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
@@ -473,15 +634,15 @@ msgstr "Država"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Uredi kategorije"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "Adresar"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -561,11 +722,11 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Novi adresar"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Uredi adresar"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -577,16 +738,16 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Spremi"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Pošalji"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "Prekini"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
@@ -606,33 +767,28 @@ msgstr ""
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Uvezi"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 628afec783..fb3ceb0808 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
-# Thomas Silađi <thomas.siladi@net.hr>, 2011.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +22,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Ime aplikacije nije pribavljeno."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nemate kategorija koje možete dodati?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Ova kategorija već postoji: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "ownCloud resetiranje lozinke"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud resetiranje lozinke"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Koristite ovaj link da biste poništili lozinku: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -70,15 +147,15 @@ msgstr "Vaša lozinka je resetirana"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Idi na stranicu za prijavu"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "nova lozinka"
+msgstr "Nova lozinka"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "poništavanje lozinke"
+msgstr "Poništavanje lozinke"
 
 #: strings.php:5
 msgid "Personal"
@@ -86,23 +163,23 @@ msgstr "Osobno"
 
 #: strings.php:6
 msgid "Users"
-msgstr "korisnici"
+msgstr "Korisnici"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "aplikacije"
+msgstr "Aplikacije"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "administrator"
+msgstr "Administrator"
 
 #: strings.php:9
 msgid "Help"
-msgstr "pomoć"
+msgstr "Pomoć"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Pristup zabranjen"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,15 +187,15 @@ msgstr "Cloud nije pronađen"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Uredi kategorije"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr "stvoriti <strong>Administratorski račun</strong>"
+msgstr "Stvori <strong>administratorski račun</strong>"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -134,7 +211,7 @@ msgstr "Mapa baze podataka"
 
 #: templates/installation.php:44
 msgid "Configure the database"
-msgstr "konfigurirati baze podataka"
+msgstr "Konfiguriraj bazu podataka"
 
 #: templates/installation.php:49 templates/installation.php:60
 #: templates/installation.php:70
@@ -143,15 +220,15 @@ msgstr "će se koristiti"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "korisnik baze podataka"
+msgstr "Korisnik baze podataka"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr "lozinka baze podataka"
+msgstr "Lozinka baze podataka"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr "ime baze podataka"
+msgstr "Ime baze podataka"
 
 #: templates/installation.php:96
 msgid "Database host"
@@ -159,19 +236,19 @@ msgstr "Poslužitelj baze podataka"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr "završiti postavljanje"
+msgstr "Završi postavljanje"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
-msgstr "odjaviti"
+msgstr "Odjava"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
-msgstr "postavke"
+msgstr "Postavke"
 
 #: templates/login.php:6
 msgid "Lost your password?"
@@ -183,11 +260,11 @@ msgstr "zapamtiti"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Prijava"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Vi ste odjavljeni."
+msgstr "Odjavljeni ste."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 0c126c2581..e9ae4069b9 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +47,67 @@ msgstr "Nedostaje privremena mapa"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Neuspjelo pisanje na disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Veličina"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Zadnja promjena"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "datoteka za rukovanje"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +115,39 @@ msgstr "Maksimalna veličina prijenosa"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "maksimalna moguća: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Potrebno za preuzimanje više datoteke i mape"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Omogući ZIP-preuzimanje"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 je \"bez limita\""
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksimalna veličina za ZIP datoteke"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "novo"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "tekstualna datoteka"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "mapa"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "od URL-a"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "Pošalji"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Prekini upload"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "Naziv"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "podjeli"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Zadnja promjena"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Briši"
@@ -148,8 +189,8 @@ msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prij
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Datoteke se skeniraju, molimo pričekajte."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/gallery.po b/l10n/hr/gallery.po
index 70bde91e1d..3bfe413c28 100644
--- a/l10n/hr/gallery.po
+++ b/l10n/hr/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +18,78 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Slike"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Postavke"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Ponovo očitaj"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Zaustavi"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Podijeli"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Natrag"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Ukloni potvrdu"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Želite li ukloniti album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Promijeni ime albuma"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Novo ime albuma"
diff --git a/l10n/hr/media.po b/l10n/hr/media.po
index 5159479c67..aa4711f5d5 100644
--- a/l10n/hr/media.po
+++ b/l10n/hr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Glazba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reprodukcija"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauza"
 
@@ -34,7 +38,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Sljedeća"
 
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index fc581b6447..8d0166d701 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neispravan zahtjev"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID promijenjen"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neispravan zahtjev"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "__ime_jezika__"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "dnevnik"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "više"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Dodajte vašu aplikaciju"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencirano"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "od"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "dokumentacija"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Upravljanje velikih datoteka"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "od dostupno"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Desktop i Mobile sinkronizaciji klijenti"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "preuzimanje"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +149,15 @@ msgstr "Izmjena lozinke"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "e-mail adresa"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Vaša e-mail adresa"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +165,7 @@ msgstr "Jezik"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Pomoć prevesti"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +189,15 @@ msgstr "Izradi"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "standardni kvota"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "ostali"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "kvota"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/hu_HU/calendar.po b/l10n/hu_HU/calendar.po
index e3dacabef1..3922bbb27e 100644
--- a/l10n/hu_HU/calendar.po
+++ b/l10n/hu_HU/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 21:58+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "Időzóna megváltozott"
 msgid "Invalid request"
 msgstr "Érvénytelen kérés"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Naptár"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Születésap"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 7cc910a4ca..bff0548d69 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -6,13 +6,14 @@
 # Adam Toth <adazlord@gmail.com>, 2012.
 #   <mail@tamas-nagy.net>, 2011.
 # Peter Borsa <peter.borsa@gmail.com>, 2011.
+# Tamas Nagy <mail@tamas-nagy.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:02+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "Címlista (de)aktiválása sikertelen"
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
-msgstr "Hiba a kontakt hozzáadásakor"
+msgstr "Hiba a kapcsolat hozzáadásakor"
 
 #: ajax/addproperty.php:40
 msgid "Cannot add empty property."
@@ -42,7 +43,7 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
-msgstr "Hiba a kontakt-tulajdonság hozzáadásakor"
+msgstr "Hiba a kapcsolat-tulajdonság hozzáadásakor"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
@@ -84,23 +85,20 @@ msgstr "Hiba a címlista hozzáadásakor"
 msgid "Error activating addressbook."
 msgstr "Címlista aktiválása sikertelen"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nincs ID megadva a kontakthoz"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Kép betöltése sikertelen"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "A kontakt képének beolvasása sikertelen"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Ideiglenes fájl mentése sikertelen"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "A kép érvénytelen"
 
@@ -114,24 +112,56 @@ msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr "Hiba a kontakt-tulajdonság törlésekor"
+msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr "Hiányzik a kontakt ID"
+msgstr "Hiányzik a kapcsolat ID"
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
 msgstr "Hiányzik a kontakt ID"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Nincs fénykép-útvonal megadva"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "A fájl nem létezik:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Kép betöltése sikertelen"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "az elem neve nincs beállítva"
@@ -148,9 +178,9 @@ msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
-msgstr "Hiba a kontakt-tulajdonság frissítésekor"
+msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
@@ -162,104 +192,231 @@ msgstr "Hiba a címlista frissítésekor"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr "Hiba a kontaktok feltöltésekor"
+msgstr "Hiba a kapcsolatok feltöltésekor"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nincs hiba, a fájl sikeresen feltöltődött"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "A fájl csak részlegesen lett feltöltve"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nincs feltöltött fájl"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Hiányzik az ideiglenes könyvtár"
 
-#: appinfo/app.php:22 templates/settings.php:3
-msgid "Contacts"
-msgstr "Kontaktok"
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
 
-#: lib/app.php:23
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
+msgid "Contacts"
+msgstr "Kapcsolatok"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Húzza ide a VCF fájlt a kapcsolatok importálásához"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Címlista nem található"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Szervezet"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -269,11 +426,11 @@ msgstr "{name} születésnapja"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "Kapcsolat"
 
 #: templates/index.php:13
 msgid "Add Contact"
-msgstr "Kontakt hozzáadása"
+msgstr "Kapcsolat hozzáadása"
 
 #: templates/index.php:14
 msgid "Addressbooks"
@@ -312,11 +469,11 @@ msgstr "Törlés"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr "Kontakt letöltése"
+msgstr "Kapcsolat letöltése"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr "Kontakt törlése"
+msgstr "Kapcsolat törlése"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -430,6 +587,10 @@ msgstr "Új kép feltöltése"
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Cím szerkesztése"
@@ -511,7 +672,7 @@ msgstr "Mrs"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr "Dr"
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -586,13 +747,13 @@ msgid "Submit"
 msgstr "Elküld"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Mégsem"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr "Kontakt-fájl importálása"
+msgstr "Kapcsolat-fájl importálása"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
@@ -612,39 +773,34 @@ msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr "Kontaktok importálása"
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktok importálása sikeres"
+msgstr "Kapcsolatok importálása"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Párbeszédablak bezárása"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Címlista importálása"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Melyik címlistába történjen az importálás:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Húzza ide a VCF fájlt a kontaktok importálásához"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Kiválasztás merevlemezről"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr "Nincs kontakt a címlistában"
+msgstr "Nincsenek kapcsolatok a címlistában"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr "Kontakt hozzáadása"
+msgstr "Kapcsolat hozzáadása"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
@@ -656,7 +812,7 @@ msgstr "CardDAV szinkronizációs címek"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr "további infó"
+msgstr "további információ"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 72f237d2d1..7aba93b972 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:46+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Nincs hozzáadandó kategória?"
 msgid "This category already exists: "
 msgstr "Ez a kategória már létezik"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
@@ -162,15 +238,15 @@ msgstr "Adatbázis szerver"
 msgid "Finish setup"
 msgstr "Beállítások befejezése"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webszolgáltatások az irányításod alatt"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Beállítások"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index c846e2e6c5..12a4d449b2 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:33+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Hiányzik az ideiglenes könyvtár"
 msgid "Failed to write to disk"
 msgstr "Nem írható lemezre"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fájlok"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Méret"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Módosítva"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Fájlkezelés"
@@ -122,18 +174,6 @@ msgstr "Megosztás"
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Méret"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Módosítva"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Mindent töröl"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hu_HU/gallery.po b/l10n/hu_HU/gallery.po
index a732dbfcda..2953d7adda 100644
--- a/l10n/hu_HU/gallery.po
+++ b/l10n/hu_HU/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 21:43+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Képek"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Beállítások"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Újravizsgálás"
@@ -34,10 +74,6 @@ msgstr "Állj"
 msgid "Share"
 msgstr "Megosztás"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Beállítások"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Vissza"
diff --git a/l10n/hu_HU/media.po b/l10n/hu_HU/media.po
index bd041974a0..aead2550d9 100644
--- a/l10n/hu_HU/media.po
+++ b/l10n/hu_HU/media.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:27+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,10 @@ msgstr ""
 msgid "Music"
 msgstr "Zene"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Lejátszás"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 56c5d55264..76b3a2b040 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:56+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Email megváltozott"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Érvénytelen kérés"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID megváltozott"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Érvénytelen kérés"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Egy App kiválasztása"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencelt"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ":"
 
diff --git a/l10n/hy/calendar.po b/l10n/hy/calendar.po
index 2a56e7e748..fa2e38c97a 100644
--- a/l10n/hy/calendar.po
+++ b/l10n/hy/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Օրացույց"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
+msgid "Birthday"
 msgstr ""
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
+msgid "Call"
 msgstr ""
 
 #: lib/app.php:128
-msgid "Ideas"
+msgid "Clients"
 msgstr ""
 
 #: lib/app.php:129
-msgid "Journey"
+msgid "Deliverer"
 msgstr ""
 
 #: lib/app.php:130
-msgid "Jubilee"
+msgid "Holidays"
 msgstr ""
 
 #: lib/app.php:131
-msgid "Meeting"
+msgid "Ideas"
 msgstr ""
 
 #: lib/app.php:132
-msgid "Other"
-msgstr "Այլ"
+msgid "Journey"
+msgstr ""
 
 #: lib/app.php:133
-msgid "Personal"
+msgid "Jubilee"
 msgstr ""
 
 #: lib/app.php:134
-msgid "Projects"
+msgid "Meeting"
 msgstr ""
 
 #: lib/app.php:135
+msgid "Other"
+msgstr "Այլ"
+
+#: lib/app.php:136
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:138
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index aa1f44970c..824bab0c47 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 5cf9a7c6de..0880df331a 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -159,15 +235,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index d3fe3e8be5..e0a959181a 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -47,10 +47,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr ""
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -119,18 +171,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr ""
diff --git a/l10n/hy/gallery.po b/l10n/hy/gallery.po
index 91c06fde01..c9eb3b260a 100644
--- a/l10n/hy/gallery.po
+++ b/l10n/hy/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/hy/media.po b/l10n/hy/media.po
index bb8443a3e7..fb40ed0755 100644
--- a/l10n/hy/media.po
+++ b/l10n/hy/media.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,19 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr ""
 
@@ -33,7 +37,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr ""
 
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 59b841098f..36ffa29c8e 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/ia/calendar.po b/l10n/ia/calendar.po
index 6b9b70f7c1..125085ee3a 100644
--- a/l10n/ia/calendar.po
+++ b/l10n/ia/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 03:44+0000\n"
-"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr ""
 msgid "Invalid request"
 msgstr "Requesta invalide."
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Anniversario de nativitate"
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 33da0ad226..7c0c0d4b01 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Error durante que il addeva le adressario."
 msgid "Error activating addressbook."
 msgstr "Error in activar adressario"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Il habeva un error durante le cargamento del imagine."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Error durante le scriptura in le file temporari"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -123,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Il habeva un error durante le cargamento del imagine."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -163,102 +192,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adressario non trovate."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -429,6 +585,10 @@ msgstr "Incargar nove photo"
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Modificar adresses"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Submitter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -613,27 +773,22 @@ msgstr "Importar"
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contactos importate con successo."
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Clauder dialogo"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importar adressario."
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 08b5615cb9..e81a57a40b 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 03:49+0000\n"
-"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr "Iste categoria jam existe:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Reinitialisation del contrasigno de Owncloud"
@@ -160,15 +236,15 @@ msgstr "Hospite de base de datos"
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Configurationes"
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 48a885f455..6d9a5ffc3f 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Files"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dimension"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificate"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dimension"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificate"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/ia/gallery.po b/l10n/ia/gallery.po
index da4c273778..3e8249066f 100644
--- a/l10n/ia/gallery.po
+++ b/l10n/ia/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Rescannar"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Retro"
diff --git a/l10n/ia/media.po b/l10n/ia/media.po
index 283d694f4c..4da59fbd03 100644
--- a/l10n/ia/media.po
+++ b/l10n/ia/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproducer"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +38,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Previe"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Proxime"
 
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 352f0ac127..304d175a07 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 03:49+0000\n"
-"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Requesta invalide"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID cambiate"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Requesta invalide"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Selectionar un app"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "per"
 
diff --git a/l10n/id/calendar.po b/l10n/id/calendar.po
index 204a1e4980..021c23176e 100644
--- a/l10n/id/calendar.po
+++ b/l10n/id/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Zona waktu telah diubah"
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
+msgid "Birthday"
 msgstr ""
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
+msgid "Call"
 msgstr ""
 
 #: lib/app.php:128
-msgid "Ideas"
+msgid "Clients"
 msgstr ""
 
 #: lib/app.php:129
-msgid "Journey"
+msgid "Deliverer"
 msgstr ""
 
 #: lib/app.php:130
-msgid "Jubilee"
+msgid "Holidays"
 msgstr ""
 
 #: lib/app.php:131
-msgid "Meeting"
+msgid "Ideas"
 msgstr ""
 
 #: lib/app.php:132
-msgid "Other"
+msgid "Journey"
 msgstr ""
 
 #: lib/app.php:133
-msgid "Personal"
+msgid "Jubilee"
 msgstr ""
 
 #: lib/app.php:134
-msgid "Projects"
+msgid "Meeting"
 msgstr ""
 
 #: lib/app.php:135
-msgid "Questions"
+msgid "Other"
 msgstr ""
 
 #: lib/app.php:136
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:139
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 94c1539c37..0a3d9aab36 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 6cb907c557..04caad7d31 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -20,39 +21,115 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nama aplikasi tidak diberikan."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Tidak ada kategori yang akan ditambahkan?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Kategori ini sudah ada:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Reset password Owncloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "reset password ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Gunakan tautan berikut untuk mereset password anda: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Anda akan mendapatkan link untuk mereset password anda lewat Email."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Telah diminta"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "Login gagal!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -61,23 +138,23 @@ msgstr "Username"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr ""
+msgstr "Meminta reset"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Password anda telah direset"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Ke halaman login"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Password baru"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Reset password"
 
 #: strings.php:5
 msgid "Personal"
@@ -101,7 +178,7 @@ msgstr "Bantuan"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Akses Ditiadakan"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -109,11 +186,11 @@ msgstr "Cloud tidak ditemukan"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edit kategori"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Tambahkan"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -160,15 +237,15 @@ msgstr "Host database"
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Setelan"
 
@@ -182,7 +259,7 @@ msgstr "selalu login"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Masuk"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index ed604497d0..8e1f3da575 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Tidak ada galat, berkas sukses diunggah"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
@@ -34,27 +35,79 @@ msgstr ""
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Berkas hanya diunggah sebagian"
 
 #: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Tidak ada berkas yang diunggah"
 
 #: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Kehilangan folder temporer"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Gagal menulis ke disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Berkas"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Ukuran"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Dimodifikasi"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Penanganan berkas"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +115,39 @@ msgstr "Ukuran unggah maksimum"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "Kemungkinan maks:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Dibutuhkan untuk multi-berkas dan unduhan folder"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Aktifkan unduhan ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 adalah tidak terbatas"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Ukuran masukan maksimal untuk berkas ZIP"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Baru"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Berkas teks"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Folder"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Dari url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "Unggah"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Batal mengunggah"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "Nama"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Bagikan"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Ukuran"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Dimodifikasi"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Hapus"
@@ -148,8 +189,8 @@ msgstr "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Berkas sedang dipindai, silahkan tunggu."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Sedang memindai"
diff --git a/l10n/id/gallery.po b/l10n/id/gallery.po
index 3836746cef..6b4c75eae9 100644
--- a/l10n/id/gallery.po
+++ b/l10n/id/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +18,78 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Gambar"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Setting"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Scan ulang"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Berhenti"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Bagikan"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Kembali"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Hapus konfirmasi"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Apakah anda ingin menghapus album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ubah nama album"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nama album baru"
diff --git a/l10n/id/media.po b/l10n/id/media.po
index 77057473f1..5d6c3e38ec 100644
--- a/l10n/id/media.po
+++ b/l10n/id/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Mainkan"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Jeda"
 
@@ -34,7 +38,7 @@ msgstr "Jeda"
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Selanjutnya"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 9e9b82b838..f0fe672de8 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Permintaan tidak valid"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID telah dirubah"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Permintaan tidak valid"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "__language_name__"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Lebih"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Tambahkan App anda"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Pilih satu aplikasi"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-terlisensi"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "oleh"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentasi"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Mengelola berkas besar"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "dari yang tersedia"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Klien sync Desktop dan Mobile"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Unduh"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +149,15 @@ msgstr "Rubah password"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Alamat email anda"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +165,7 @@ msgstr "Bahasa"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Bantu menerjemahkan"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +189,15 @@ msgstr "Buat"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Kuota default"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Lain-lain"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index dcc55dbfef..ed36e36d84 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 12:54+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,16 +49,40 @@ msgstr "Fuso orario cambiato"
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Compleanno"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 88873e6864..0e1a62a6f9 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -85,23 +85,20 @@ msgstr "Errore durante l'aggiunta della rubrica."
 msgid "Error activating addressbook."
 msgstr "Errore durante l'attivazione della rubrica."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nessun ID di contatto inviato."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Errore di caricamento immagine."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Errore di lettura della foto del contatto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Errore di salvataggio del file temporaneo."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La foto caricata non è valida."
 
@@ -125,14 +122,46 @@ msgstr "Manca l'ID del contatto."
 msgid "Missing contact id."
 msgstr "ID di contatto mancante."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Non è stato inviato alcun percorso a una foto."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Il file non esiste:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Errore di caricamento immagine."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "il nome dell'elemento non è impostato."
@@ -149,7 +178,7 @@ msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
@@ -165,102 +194,229 @@ msgstr "Errore durante l'aggiornamento della rubrica."
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato inviato correttamente"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file inviato supera la direttiva upload_max_filesize nel php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato inviato solo parzialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nessun file è stato inviato"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contatti"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Rilascia un file VCF per importare i contatti."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Rubrica non trovata."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -431,6 +587,10 @@ msgstr "Invia una nuova foto"
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Modifica indirizzo"
@@ -587,7 +747,7 @@ msgid "Submit"
 msgstr "Invia"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -615,27 +775,22 @@ msgstr "Importa"
 msgid "Importing contacts"
 msgstr "Importazione contatti"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contatti importati correttamente"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Chiudi finestra"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importa rubrica"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Seleziona la rubrica di destinazione:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Rilascia un file VCF per importare i contatti."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Seleziona da disco"
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 550381b026..c2d63be3c9 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 10:44+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,82 @@ msgstr "Nessuna categoria da aggiungere?"
 msgid "This category already exists: "
 msgstr "Questa categoria esiste già: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ripristino password di Owncloud"
@@ -164,15 +240,15 @@ msgstr "Host del database"
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Impostazioni"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 4b76071bb8..8db41dc647 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 12:55+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,10 +51,62 @@ msgstr "Cartella temporanea mancante"
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "File"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dimensione"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificato"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestione file"
@@ -123,18 +175,6 @@ msgstr "Condividi"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dimensione"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificato"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Elimina tutto"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 17d761b0da..794458ec1f 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 10:42+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Immagini"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Nuova scansione"
@@ -36,10 +76,6 @@ msgstr "Ferma"
 msgid "Share"
 msgstr "Condividi"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Impostazioni"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Indietro"
diff --git a/l10n/it/media.po b/l10n/it/media.po
index b87e35f551..054877623e 100644
--- a/l10n/it/media.po
+++ b/l10n/it/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Riproduci"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -36,7 +40,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Precedente"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Successivo"
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index dd27799948..56936ed81f 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 10:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,23 +25,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Email modificata"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Richiesta non valida"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID modificato"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Richiesta non valida"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Lingua modificata"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -62,10 +77,14 @@ msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-rilasciato"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "da"
 
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 1d6ed9e4cb..6062061a4f 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "カレンダーが見つかりませんでした。"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "イベントが見つかりませんでした。"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -41,77 +42,101 @@ msgstr "タイムゾーンが変更されました"
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "電話をかける"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "ミーティング"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "その他"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "質問事項"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
-msgstr "仕事"
+msgstr "週の始まり"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
@@ -165,31 +190,31 @@ msgstr "曜日で指定"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr "月曜日"
+msgstr "月曜"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr "火曜日"
+msgstr "火曜"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr "水曜日"
+msgstr "水曜"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr "木曜日"
+msgstr "木曜"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr "金曜日"
+msgstr "金曜"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr "土曜日"
+msgstr "土曜"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr "日曜日"
+msgstr "日曜"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -297,7 +322,7 @@ msgstr "終日"
 
 #: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr "新しくカレンダーを作成する"
+msgstr "新しくカレンダーを作成"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
@@ -330,7 +355,7 @@ msgstr "イベント終了時間が開始時間より先です"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr "データベースフェイルがありました"
+msgstr "データベースのエラーがありました"
 
 #: templates/calendar.php:40
 msgid "Week"
@@ -354,15 +379,15 @@ msgstr "カレンダー"
 
 #: templates/calendar.php:67
 msgid "There was a fail, while parsing the file."
-msgstr "ファイルを構文解析する際に失敗しました"
+msgstr "ファイルの構文解析に失敗しました。"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr "アクティブなカレンダーを選択してください"
+msgstr "アクティブなカレンダーを選択"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "あなたのカレンダー"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -371,15 +396,15 @@ msgstr "CalDavへのリンク"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "共有カレンダー"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "共有カレンダーはありません"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "カレンダーを共有する"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -400,7 +425,7 @@ msgstr ""
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr "新しくカレンダーを作成する"
+msgstr "新しいカレンダー"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -441,23 +466,23 @@ msgstr "エクスポート"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "イベント情報"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "繰り返し"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "アラーム"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "参加者"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "共有"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -469,11 +494,11 @@ msgstr "カテゴリー"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "カテゴリをコンマで区切る"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "カテゴリを編集"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -505,11 +530,11 @@ msgstr "メモ"
 
 #: templates/part.eventform.php:91
 msgid "Description of the Event"
-msgstr "イベントのメモ"
+msgstr "イベントの説明"
 
 #: templates/part.eventform.php:100 templates/part.showevent.php:98
 msgid "Repeat"
-msgstr "繰り返す"
+msgstr "繰り返し"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
@@ -546,7 +571,7 @@ msgstr "対象の週を選択する。"
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr "周期"
+msgstr "間隔"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
@@ -586,19 +611,19 @@ msgstr "カレンダーの取り込みに成功しました"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr "閉じる"
+msgstr "ダイアログを閉じる"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr "新しいイベントを作成する"
+msgstr "新しいイベントを作成"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "イベントを閲覧"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "カテゴリが選択されていません"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -606,11 +631,11 @@ msgstr "カテゴリーを選択してください"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "of"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "at"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -618,7 +643,7 @@ msgstr "タイムゾーン"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr "タイムゾーン変更を常に確認する"
+msgstr "タイムゾーンの変更を常に確認"
 
 #: templates/settings.php:33
 msgid "Timeformat"
@@ -626,40 +651,40 @@ msgstr "時刻のフォーマット"
 
 #: templates/settings.php:35
 msgid "24h"
-msgstr "24時間制"
+msgstr "24h"
 
 #: templates/settings.php:36
 msgid "12h"
-msgstr "12時間制"
+msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "週の始まり"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr "カレンダーのCalDAVシンクアドレス"
+msgstr "CalDAVカレンダーの同期アドレス:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "ユーザを選択"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "編集可能"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "グループを選択"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "公開する"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 6d85c9569f..f48c9cc75b 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/activation.php:19 ajax/updateaddressbook.php:32
 msgid "Error (de)activating addressbook."
-msgstr "電話帳の有効/無効化に失敗しました。"
+msgstr "アドレスブックの有効/無効化に失敗しました。"
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
@@ -31,7 +32,7 @@ msgstr "項目の新規追加に失敗しました。"
 
 #: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
-msgstr "アドレス項目の１つは記入して下さい。"
+msgstr "住所の項目のうち１つは入力して下さい。"
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
@@ -43,23 +44,23 @@ msgstr "連絡先の追加に失敗しました。"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "IDが提供されていません"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "チェックサムの設定エラー。"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "削除するカテゴリが選択されていません。"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "アドレスブックが見つかりません。"
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "連絡先が見つかりません。"
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
@@ -67,43 +68,40 @@ msgstr ""
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "VCardからIDの抽出エラー: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "名前を空白にしたままでアドレスブックを追加することはできません。"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
-msgstr "電話帳の追加に失敗しました。"
+msgstr "アドレスブックの追加に失敗しました。"
 
 #: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
-msgstr "電話帳の有効化に失敗しました。"
+msgstr "アドレスブックの有効化に失敗しました。"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "連絡先IDは登録されませんでした。"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "連絡先写真の読み込みエラー。"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "一時ファイルの保存エラー。"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "写真の読み込みは無効です。"
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "idが設定されていません。"
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -115,154 +113,313 @@ msgstr "連絡先の削除に失敗しました。"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "コンタクトIDが見つかりません。"
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "コンタクトIDが設定されていません。"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "写真のパスが登録されていません。"
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "ファイルが存在しません:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "画像の読み込みエラー。"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "要素名が設定されていません。"
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "チェックサムが設定されていません。"
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "空白の名前でアドレスブックを更新することはできません。"
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
-msgstr "電話帳の更新に失敗しました。"
+msgstr "アドレスブックの更新に失敗しました。"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "ストレージへの連絡先のアップロードエラー。"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "一時保存フォルダが見つかりません"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "連絡先"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "連絡先をインポートするVCFファイルをドロップしてください。"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "アドレスブックが見つかりませんでした。"
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "これはあなたの電話帳ではありません。"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "住所"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "電話番号"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "メッセージ"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "インターネット"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}の誕生日"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -278,7 +435,7 @@ msgstr "電話帳"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "アドレスブックを設定"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -286,12 +443,12 @@ msgstr "新規電話帳"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "VCFからインポート"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr "CardDAV リンク"
+msgstr "CardDAVリンク"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
@@ -317,7 +474,7 @@ msgstr "連絡先の削除"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "写真をドロップしてアップロード"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -325,35 +482,35 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "名前の詳細を編集"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "ニックネーム"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "ニックネームを入力"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
-msgstr "生年月日"
+msgstr "誕生日"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "yyyy-mm-dd"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "コンマでグループを分割"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "グループを編集"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -361,47 +518,47 @@ msgstr "推奨"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "連絡先を追加"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "メールアドレスを入力"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "アドレスへメールを送る"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "メールアドレスを削除"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "電話番号を入力"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "電話番号を削除"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "地図で表示"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "住所の詳細を編集"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "ここにメモを追加。"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "項目を追加"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "プロフィール写真"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -409,27 +566,31 @@ msgstr "電話番号"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "メモ"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "現在の写真を削除"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "現在の写真を編集"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "新しい写真をアップロード"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "ownCloudから写真を選択"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "住所を編集"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -443,12 +604,12 @@ msgstr "私書箱"
 #: templates/part.edit_address_dialog.php:29
 #: templates/part.edit_address_dialog.php:32
 msgid "Extended"
-msgstr "拡張番地"
+msgstr "番地2"
 
 #: templates/part.edit_address_dialog.php:35
 #: templates/part.edit_address_dialog.php:38
 msgid "Street"
-msgstr "街路番地"
+msgstr "番地1"
 
 #: templates/part.edit_address_dialog.php:41
 #: templates/part.edit_address_dialog.php:44
@@ -458,7 +619,7 @@ msgstr "都市"
 #: templates/part.edit_address_dialog.php:47
 #: templates/part.edit_address_dialog.php:50
 msgid "Region"
-msgstr "地域"
+msgstr "都道府県"
 
 #: templates/part.edit_address_dialog.php:53
 #: templates/part.edit_address_dialog.php:56
@@ -472,7 +633,7 @@ msgstr "国名"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "カテゴリを編集"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -480,7 +641,7 @@ msgstr "追加"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr "電話帳"
+msgstr "アドレスブック"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -488,83 +649,83 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Miss"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Mr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mrs"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "名"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "ミドルネーム"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "姓"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "ストレージへの連絡先のアップロードエラー。"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr "電話帳の新規作成"
+msgstr "アドレスブックの新規作成"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr "電話帳の編集"
+msgstr "アドレスブックを編集"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -583,82 +744,77 @@ msgid "Submit"
 msgstr "送信"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取り消し"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "コンタクトファイルをインポート"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "アドレスブックを選択してください"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックを作成"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックの名前"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "インポート"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "コンタクトをインポート"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "インポートするアドレスブックを選択:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "HDから選択"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "アドレスブックに連絡先が登録されていません。"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "連絡先を追加"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "アドレス帳を設定"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV同期アドレス"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "詳細情報"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "プライマリアドレス（Kontact 他）"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 0f3163a4e0..f0a07c435a 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "アプリケーション名は提供されていません。"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "追加するカテゴリはありませんか？"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "このカテゴリはすでに存在します: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -35,7 +112,7 @@ msgstr "Owncloud のパスワードをリセット"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloudのパスワードをリセットします"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -43,7 +120,7 @@ msgstr "パスワードをリセットするには次のリンクをクリック
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "パスワードをリセットするリンクがメールで届きます。"
+msgstr "メールでパスワードをリセットするリンクが届きます。"
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -51,7 +128,7 @@ msgstr "送信されました"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr "ログインに失敗しました。"
+msgstr "ログインに失敗しました！"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -60,7 +137,7 @@ msgstr "ユーザ名"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr "リセットを要求する。"
+msgstr "リセットを要求します。"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -100,19 +177,19 @@ msgstr "ヘルプ"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "アクセスが禁止されています"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "見つけられません"
+msgstr "見つかりません"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "カテゴリを編集"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -159,21 +236,21 @@ msgstr "データベースのホスト名"
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "管理下にあるウェブサービス"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "設定"
 
 #: templates/login.php:6
 msgid "Lost your password?"
-msgstr "パスワードがわからなくなりましたか？"
+msgstr "パスワードを忘れましたか？"
 
 #: templates/login.php:17
 msgid "remember"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 7da1f666d4..6e34a2dc60 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr "エラーはありません。ファイルのアップロードは成功しました。"
+msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
@@ -45,15 +46,67 @@ msgstr "テンポラリフォルダが見つかりません"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "ディスクへの書き込みに失敗しました"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "ファイル"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "サイズ"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "更新日時"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "ファイル操作"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -61,27 +114,27 @@ msgstr "最大アップロードサイズ"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "最大容量: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "複数ファイルおよびフォルダのダウンロードに必要"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "ZIP形式のダウンロードを有効にする"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0を指定した場合は無制限"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ZIPファイルへの最大入力サイズ"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "新規作成"
+msgstr "新規"
 
 #: templates/index.php:9
 msgid "Text file"
@@ -93,7 +146,7 @@ msgstr "フォルダ"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -101,7 +154,7 @@ msgstr "アップロード"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "アップロードをキャンセル"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -113,24 +166,12 @@ msgstr "名前"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "共有"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "サイズ"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "更新日時"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "削除"
@@ -143,12 +184,12 @@ msgstr "ファイルサイズが大きすぎます"
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "アップロードしようとしているファイルはサーバで規定された最大サイズを超えています"
+msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "スキャン中"
diff --git a/l10n/ja_JP/gallery.po b/l10n/ja_JP/gallery.po
index a11164c197..75913ac9a7 100644
--- a/l10n/ja_JP/gallery.po
+++ b/l10n/ja_JP/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +18,48 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "写真"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "設定"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -27,15 +68,11 @@ msgstr "再スキャン"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "停止"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "共有"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -43,16 +80,16 @@ msgstr "戻る"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "承認を取りやめ"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "アルバムを削除しますか？"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "アルバム名を変更する"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "新しいアルバム名"
diff --git a/l10n/ja_JP/media.po b/l10n/ja_JP/media.po
index 95f6294acc..ef58f5e087 100644
--- a/l10n/ja_JP/media.po
+++ b/l10n/ja_JP/media.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +18,19 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "ミュージック"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "再生"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "一時停止"
 
@@ -33,7 +38,7 @@ msgstr "一時停止"
 msgid "Previous"
 msgstr "前"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "次"
 
@@ -47,7 +52,7 @@ msgstr "ミュート解除"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr "コレクションを再読み込みする"
+msgstr "コレクションの再スキャン"
 
 #: templates/music.php:37
 msgid "Artist"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index f8340f239a..e0b699f743 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,57 +19,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "メールアドレスを変更しました"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "無効なリクエストです"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenIDが変更されました"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "無効なリクエストです"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "言語が変更されました"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
-msgstr "Japanese(日本語)"
+msgstr "Japanese (日本語)"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "ログ"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "もっと"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "アプリを追加"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
 #: templates/apps.php:25
-msgid "-licensed"
-msgstr "権利を保持されています"
+msgid "See application page at apps.owncloud.com"
+msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
+msgid "-licensed"
+msgstr "ライセンス"
+
+#: templates/apps.php:26
 msgid "by"
-msgstr "によって"
+msgstr "@"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "ドキュメント"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "大きなファイルを扱うには"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -76,11 +96,11 @@ msgstr "質問してください"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr "ヘルプ用データベース接続に問題が生じました"
+msgstr "ヘルプデータベースへの接続時に問題が発生しました"
 
 #: templates/help.php:23
 msgid "Go there manually."
-msgstr "手動で移動してください"
+msgstr "手動で移動してください。"
 
 #: templates/help.php:31
 msgid "Answer"
@@ -88,19 +108,19 @@ msgstr "解答"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr "あなたが使っているのは"
+msgstr "あなたは"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "です。利用可能容量は"
+msgstr "を利用しています。利用可能容量："
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "デスクトップおよびモバイル用の同期クライアント"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "ダウンロード"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -124,11 +144,11 @@ msgstr "表示"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr "パスワードを変更する"
+msgstr "パスワードを変更"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr "メールアドレス"
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
@@ -136,7 +156,7 @@ msgstr "あなたのメールアドレス"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "パスワードの回復を有効にするにはメールアドレスを入力してください"
+msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -144,11 +164,11 @@ msgstr "言語"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "翻訳を手伝う"
+msgstr "翻訳に協力する"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "ファイルマネージャーであなたのownCloudに接続するときはこのアドレスを使用してください"
+msgstr "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください"
 
 #: templates/users.php:15 templates/users.php:44
 msgid "Name"
@@ -168,11 +188,11 @@ msgstr "作成"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "デフォルトのクォータサイズ"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/ko/calendar.po b/l10n/ko/calendar.po
index a901c6fcce..f433b04414 100644
--- a/l10n/ko/calendar.po
+++ b/l10n/ko/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:41+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "시간대 변경됨"
 msgid "Invalid request"
 msgstr "잘못된 요청"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "달력"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "생일"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index d577b36173..77bb4f1a39 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "주소록을 추가할 수 없습니다."
 msgid "Error activating addressbook."
 msgstr "주소록을 활성화할 수 없습니다."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "접속 아이디가 기입되지 않았습니다."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "로딩 이미지 오류입니다."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "사진 읽기 오류"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "임시 파일을 저장하는 동안 오류가 발생했습니다. "
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "로딩 사진이 유효하지 않습니다. "
 
@@ -123,14 +120,46 @@ msgstr "접속 아이디가 없습니다. "
 msgid "Missing contact id."
 msgstr "접속 아이디 분실"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "파일이 존재하지 않습니다. "
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "로딩 이미지 오류입니다."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
@@ -163,102 +192,229 @@ msgstr "주소록을 업데이트할 수 없습니다."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "파일이 업로드 되어있지 않습니다"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "임시 폴더 분실"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "연락처"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "주소록을 찾을 수 없습니다."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "내 주소록이 아닙니다."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "주소"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "전화 번호"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "전자 우편"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "조직"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "휴대폰"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "문자 번호"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "음성 번호"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "메세지"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "팩스 번호"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "영상 번호"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "호출기"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "인터넷"
 
@@ -429,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "보내기"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "취소"
 
@@ -613,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 79f253c0f7..22330d05c9 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:54+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "추가할 카테고리가 없습니까?"
 msgid "This category already exists: "
 msgstr "이 카테고리는 이미 존재합니다:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud 암호 재설정"
@@ -161,15 +237,15 @@ msgstr "데이터베이스 호스트"
 msgid "Finish setup"
 msgstr "설치 완료"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "설정"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 67ff7b80f9..07ce95f06a 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:11+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "임시 폴더가 사라짐"
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "파일"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "크기"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "수정됨"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "파일 처리"
@@ -121,18 +173,6 @@ msgstr "공유"
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "크기"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "수정됨"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "모두 삭제"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/ko/gallery.po b/l10n/ko/gallery.po
index 301a0a524e..8a972e4ec9 100644
--- a/l10n/ko/gallery.po
+++ b/l10n/ko/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:26+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "사진"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "세팅"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "재검색"
@@ -35,10 +75,6 @@ msgstr "정지"
 msgid "Share"
 msgstr "공유"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "세팅"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "뒤로"
diff --git a/l10n/ko/media.po b/l10n/ko/media.po
index 8edb3f9992..5b1734b807 100644
--- a/l10n/ko/media.po
+++ b/l10n/ko/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-14 15:40+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "음악"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "재생"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "일시 정지"
 
@@ -34,7 +38,7 @@ msgstr "일시 정지"
 msgid "Previous"
 msgstr "이전"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "다음"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 2c6d73a8a8..1e84863d07 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:00+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "전자 우편 주소 변경됨"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "잘못된 요청"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID 변경됨"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "잘못된 요청"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "언어가 변경되었습니다"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "프로그램 선택"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr " 라이선스 사용"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr " by "
 
diff --git a/l10n/lb/calendar.po b/l10n/lb/calendar.po
index e2eb0878a1..8436a2126d 100644
--- a/l10n/lb/calendar.po
+++ b/l10n/lb/calendar.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Keng Kalenner fonnt."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Keng Evenementer fonnt."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -32,7 +32,7 @@ msgstr "Falschen Kalenner"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Nei Zäitzone:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
@@ -42,77 +42,101 @@ msgstr "Zäitzon geännert"
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalenner"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Geschäftlech"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Uruff"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clienten"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Liwwerant"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Vakanzen"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideeën"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Dag"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Meeting"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Aner"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projeten"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Froen"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
@@ -146,51 +170,51 @@ msgstr "All Joer"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "ni"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr ""
+msgstr "no Virkommes"
 
 #: lib/object.php:345
 msgid "by date"
-msgstr ""
+msgstr "no Datum"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "no Mount-Dag"
 
 #: lib/object.php:353
 msgid "by weekday"
-msgstr ""
+msgstr "no Wochendag"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "Méindes"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "Dënschdes"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "Mëttwoch"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "Donneschdes"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "Freides"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "Samschdes"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "Sonndes"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -198,75 +222,75 @@ msgstr ""
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "éischt"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "Sekonn"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "Drëtt"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "Féiert"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "Fënneft"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "Läscht"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "Mäerz"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "Abrëll"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "Mee"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "Dezember"
 
 #: lib/object.php:418
 msgid "by events date"
@@ -286,11 +310,11 @@ msgstr ""
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Cal."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -363,7 +387,7 @@ msgstr "Wiel aktiv Kalenneren aus"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Deng Kalenneren"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -372,11 +396,11 @@ msgstr "CalDav Link"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Gedeelte Kalenneren"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Keng gedeelten Kalenneren"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
@@ -514,16 +538,16 @@ msgstr "Widderhuelen"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
-msgstr ""
+msgstr "Erweidert"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "Wochendeeg auswielen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "Deeg auswielen"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
@@ -535,11 +559,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Méint auswielen"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Wochen auswielen"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -547,19 +571,19 @@ msgstr ""
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "Intervall"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
-msgstr ""
+msgstr "Enn"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr ""
+msgstr "Virkommes"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "E Kalenner Fichier importéieren"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -567,11 +591,11 @@ msgstr "Wiel den Kalenner aus"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "E neie Kalenner uleeën"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Numm vum neie Kalenner"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -579,15 +603,15 @@ msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importéiert Kalenner"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalenner erfollegräich importéiert"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Dialog zoumaachen"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index e30e74d4b7..752a81e3f7 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -267,7 +423,7 @@ msgstr ""
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #: templates/index.php:13
 msgid "Add Contact"
@@ -275,7 +431,7 @@ msgstr "Kontakt bäisetzen"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adressbicher "
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
@@ -283,7 +439,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Neit Adressbuch"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
@@ -292,11 +448,11 @@ msgstr ""
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav Link"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
@@ -314,7 +470,7 @@ msgstr ""
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "Kontakt läschen"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -428,13 +584,17 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
@@ -477,11 +637,11 @@ msgstr ""
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dobäisetzen"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "Adressbuch"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -561,15 +721,15 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Neit Adressbuch"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Adressbuch editéieren"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Ugewisene Numm"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
@@ -577,16 +737,16 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Späicheren"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Fortschécken"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "Ofbriechen"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 8ec45ed94b..0304df227c 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Numm vun der Applikatioun ass net uginn."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Keng Kategorie fir bäizesetzen?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Des Kategorie existéiert schonn:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Owncloud Passwuert reset"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud Passwuert reset"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Benotz folgende Link fir däi Passwuert ze reseten: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -69,7 +145,7 @@ msgstr "Dän Passwuert ass zeréck gesat gin"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Op d'Login Säit"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -101,7 +177,7 @@ msgstr "Hëllef"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Access net erlaabt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -109,11 +185,11 @@ msgstr "Cloud net fonnt"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Kategorien editéieren"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Bäisetzen"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -160,15 +236,15 @@ msgstr "Datebank Server"
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Ausloggen"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Astellungen"
 
@@ -182,7 +258,7 @@ msgstr "verhalen"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Log dech an"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index b4cea9cd52..5936d91124 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +46,67 @@ msgstr "Et feelt en temporären Dossier"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Konnt net op den Disk schreiwen"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Dateien"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Gréisst"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Geännert"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Fichier handling"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +114,39 @@ msgstr "Maximum Upload Gréisst "
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. méiglech:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Gett gebraucht fir multi-Fichier an Dossier Downloads."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "ZIP-download erlaben"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 ass onlimitéiert"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maximal Gréisst fir ZIP Fichieren"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nei"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Text Fichier"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Dossier"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "From URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +154,7 @@ msgstr "Eroplueden"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Upload ofbriechen"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +166,12 @@ msgstr "Numm"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Share"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Gréisst"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Geännert"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Läschen"
@@ -148,8 +188,8 @@ msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei dé
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Fichieren gi gescannt, war weg."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Momentane Scan"
diff --git a/l10n/lb/gallery.po b/l10n/lb/gallery.po
index 8d6b4b465e..933f322891 100644
--- a/l10n/lb/gallery.po
+++ b/l10n/lb/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sim0n@trypill.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +18,78 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Fotoen"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Astellungen"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Nei scannen"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Deelen"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Zeréck"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Konfirmatioun läschen"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Wëlls de den Album läschen"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Album Numm änneren"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Neien Numm fir den Album"
diff --git a/l10n/lb/media.po b/l10n/lb/media.po
index 6949c8fad1..cd44542ece 100644
--- a/l10n/lb/media.po
+++ b/l10n/lb/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musek"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Ofspillen"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +38,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Zeréck"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Weider"
 
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 40038bf0bf..533133695f 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +19,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ongülteg Requête"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID huet geännert"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ongülteg Requête"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "__language_name__"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Méi"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Setz deng App bei"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-Lizenséiert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "vun"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentatioun"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Grouss Fichieren verwalten"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +116,11 @@ msgstr "vun den disponibelen"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Desktop an Mobile Syncing Clienten"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +148,15 @@ msgstr "Passwuert änneren"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Deng Email Adress"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +164,7 @@ msgstr "Sprooch"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Hëllef iwwersetzen"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +188,15 @@ msgstr "Erstellen"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Standard Quota"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Aner"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/lt_LT/calendar.po b/l10n/lt_LT/calendar.po
index a84045b15a..33742c956e 100644
--- a/l10n/lt_LT/calendar.po
+++ b/l10n/lt_LT/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Kalendorių nerasta."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Įvykių nerasta."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -42,79 +42,103 @@ msgstr "Laiko zona pakeista"
 msgid "Invalid request"
 msgstr "Klaidinga užklausa"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Verslas"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Skambučiai"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klientai"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Vykdytojas"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Išeiginės"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idėjos"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Kelionė"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubiliejus"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Kiti"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projektai"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Klausimai"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Darbas"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "be pavadinimo"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -363,7 +387,7 @@ msgstr "Pasirinkite naudojamus kalendorius"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Jūsų kalendoriai"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -372,15 +396,15 @@ msgstr "CalDav adresas"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Bendri kalendoriai"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Bendrų kalendorių nėra"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Dalintis kalendoriumi"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -442,11 +466,11 @@ msgstr "Eksportuoti"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informacija"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Pasikartojantis"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
@@ -454,11 +478,11 @@ msgstr ""
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Dalyviai"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Dalintis"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -470,11 +494,11 @@ msgstr "Kategorija"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Atskirkite kategorijas kableliais"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Redaguoti kategorijas"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -535,11 +559,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Pasirinkite mėnesius"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Pasirinkite savaites"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -595,11 +619,11 @@ msgstr "Sukurti naują įvykį"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Peržiūrėti įvykį"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nepasirinktos jokios katagorijos"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -643,24 +667,24 @@ msgstr "CalDAV kalendoriaus synchronizavimo adresas:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Vartotojai"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "pasirinkti vartotojus"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Redaguojamas"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupės"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "pasirinkti grupes"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "viešinti"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 089033219d..7191a75575 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Klaida pridedant adresų knygą."
 msgid "Error activating addressbook."
 msgstr "Klaida aktyvuojant adresų knygą."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 593a254cc5..c2bd15b3ef 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -28,6 +28,82 @@ msgstr ""
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Tokia kategorija jau yra:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -36,7 +112,7 @@ msgstr "Owncloud slaptažodžio atkūrimas"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud slaptažodžio atkūrimas"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -101,7 +177,7 @@ msgstr "Pagalba"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Priėjimas draudžiamas"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -109,11 +185,11 @@ msgstr "Negalima rasti"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Redaguoti kategorijas"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Pridėti"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -160,15 +236,15 @@ msgstr "Duomenų bazės serveris"
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nustatymai"
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index ed72ca74ae..b1643eeead 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -46,12 +46,64 @@ msgstr "Nėra laikinojo katalogo"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Nepavyko įrašyti į diską"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Failai"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dydis"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Pakeista"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -94,7 +146,7 @@ msgstr "Katalogas"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Iš adreso"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +154,7 @@ msgstr "Įkelti"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Atšaukti siuntimą"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +166,12 @@ msgstr "Pavadinimas"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Dalintis"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dydis"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Pakeista"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lt_LT/gallery.po b/l10n/lt_LT/gallery.po
index dfd32c38c3..383e3cf66f 100644
--- a/l10n/lt_LT/gallery.po
+++ b/l10n/lt_LT/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,48 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Nuotraukos"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -28,15 +68,11 @@ msgstr "Atnaujinti"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Sustabdyti"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Dalintis"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -44,16 +80,16 @@ msgstr "Atgal"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Išjungti patvirtinimą"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Ar tikrai norite pašalinti albumą"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Keisti albumo pavadinimą"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Naujo albumo pavadinimas"
diff --git a/l10n/lt_LT/media.po b/l10n/lt_LT/media.po
index 8e88b2f52c..c466de33be 100644
--- a/l10n/lt_LT/media.po
+++ b/l10n/lt_LT/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Groti"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pristabdyti"
 
@@ -34,7 +38,7 @@ msgstr "Pristabdyti"
 msgid "Previous"
 msgstr "Atgal"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Kitas"
 
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 208e58cc62..c39cde8a33 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,53 +19,72 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "el. paštas pakeistas"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Klaidinga užklausa"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID pakeistas"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Klaidinga užklausa"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Kalba"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Žurnalas"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Daugiau"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Pridėti programėlę"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencijuota"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentacija"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
@@ -101,7 +120,7 @@ msgstr ""
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Atsisiųsti"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -169,11 +188,11 @@ msgstr "Sukurti"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Numatytoji kvota"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Kita"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/mk/calendar.po b/l10n/mk/calendar.po
index 67387ce375..547898941b 100644
--- a/l10n/mk/calendar.po
+++ b/l10n/mk/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:07+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "Временската зона е променета"
 msgid "Invalid request"
 msgstr "Неправилно барање"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Роденден"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index e7c5f9c32f..6d30f17cb1 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Грешки при додавање на адресарот."
 msgid "Error activating addressbook."
 msgstr "Грешка при активирање на адресарот."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Не беше доставено ИД за контакт."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Грешка во вчитување на слика."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Грешка во читање на контакт фотографија."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Грешка во снимање на привремена датотека."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Фотографијата која се вчитува е невалидна."
 
@@ -122,14 +119,46 @@ msgstr "ИД за контакт недостасува."
 msgid "Missing contact id."
 msgstr "Недостасува ид за контакт."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Не беше поднесена патека за фотографија."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Не постои датотеката:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Грешка во вчитување на слика."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "име за елементот не е поставена."
@@ -146,7 +175,7 @@ msgstr "Информацијата за vCard не е точна. Ве мола
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
@@ -162,102 +191,229 @@ msgstr "Грешка при ажурирање на адресарот."
 msgid "Error uploading contacts to storage."
 msgstr "Грешка во снимање на контактите на диск."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Контакти"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Довлечкај VCF датотека да се внесат контакти."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Адресарот не е најден."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ова не е во Вашиот адресар."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Е-пошта"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Порака"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Интернет"
 
@@ -428,6 +584,10 @@ msgstr "Подигни нова фотографија"
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Уреди адреса"
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Прати"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -612,27 +772,22 @@ msgstr "Внеси"
 msgid "Importing contacts"
 msgstr "Внесување контакти"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Контаките беа внесени успешно"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Дијалог за затварање"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Внеси адресар"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Изберете адресар да се внесе:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Довлечкај VCF датотека да се внесат контакти."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Изберете од хард диск"
 
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 9dfaa37708..c6179ebf6f 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:06+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "Нема категорија да се додаде?"
 msgid "This category already exists: "
 msgstr "Оваа категорија веќе постои:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ресетирање на Owncloud лозинка"
@@ -161,15 +237,15 @@ msgstr "Сервер со база"
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Поставки"
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index ebd16f87ac..e4ad1541e9 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:07+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Не постои привремена папка"
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Датотеки"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Големина"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Променето"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ракување со датотеки"
@@ -121,18 +173,6 @@ msgstr "Сподели"
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Големина"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Променето"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Избриши сѐ"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/mk/gallery.po b/l10n/mk/gallery.po
index a65786dd39..ec987f8a1d 100644
--- a/l10n/mk/gallery.po
+++ b/l10n/mk/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:08+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Слики"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Параметри"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Рескенирај"
@@ -34,10 +74,6 @@ msgstr "Стоп"
 msgid "Share"
 msgstr "Сподели"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Параметри"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Назад"
diff --git a/l10n/mk/media.po b/l10n/mk/media.po
index 85aaeb4dda..70a02ba7a6 100644
--- a/l10n/mk/media.po
+++ b/l10n/mk/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-27 19:55+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Пушти"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Пауза"
 
@@ -36,7 +40,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Претходно"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следно"
 
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 04a9829988..3f9e5cf176 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:07+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "е-пошта е сменета"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "неправилно барање"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID сменето"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "неправилно барање"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Јазикот е сменет"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Избери аппликација"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licensed"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "од"
 
diff --git a/l10n/ms_MY/calendar.po b/l10n/ms_MY/calendar.po
index 00c9005cda..76a0bb2ba1 100644
--- a/l10n/ms_MY/calendar.po
+++ b/l10n/ms_MY/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -43,77 +43,101 @@ msgstr "Zon waktu diubah"
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Perniagaan"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Panggilan"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klien"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Penghantar"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Cuti"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idea"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Perjalanan"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubli"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Perjumpaan"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Lain"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Peribadi"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projek"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Soalan"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 3362ec4541..8c1d5f72ca 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -84,23 +84,20 @@ msgstr "Masalah menambah buku alamat."
 msgid "Error activating addressbook."
 msgstr "Masalah mengaktifkan buku alamat."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -124,14 +121,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -148,7 +177,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
@@ -164,102 +193,229 @@ msgstr "Masalah mengemaskini buku alamat."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ini bukan buku alamat anda."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Alamat"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Emel"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisasi"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mudah alih"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Teks"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Suara"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Alat Kelui"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -430,6 +586,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Hantar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Batal"
 
@@ -614,27 +774,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 027aeb64eb..1e876b63d1 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 10:33+0000\n"
-"Last-Translator: Hadri Hilmi <hadri.hilmi@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Penetapan kata laluan Owncloud"
@@ -161,15 +237,15 @@ msgstr "Hos pangkalan data"
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Tetapan"
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 0cee8ab4ba..3720c95152 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr "Folder sementara hilang"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "fail"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Saiz"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Dimodifikasi"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Saiz"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Dimodifikasi"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/ms_MY/gallery.po b/l10n/ms_MY/gallery.po
index 312df278be..7dbe8487c1 100644
--- a/l10n/ms_MY/gallery.po
+++ b/l10n/ms_MY/gallery.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Imbas semula"
@@ -35,10 +75,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Kembali"
diff --git a/l10n/ms_MY/media.po b/l10n/ms_MY/media.po
index 0f564619d9..50375f61fe 100644
--- a/l10n/ms_MY/media.po
+++ b/l10n/ms_MY/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Main"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Jeda"
 
@@ -34,7 +38,7 @@ msgstr "Jeda"
 msgid "Previous"
 msgstr "Sebelum"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Seterus"
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 9ef34556dc..9a11c70825 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Emel berubah"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Permintaan tidak sah"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ditukar"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Permintaan tidak sah"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Bahasa ditukar"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Pilih aplikasi"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-dilesen"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "oleh"
 
diff --git a/l10n/nb_NO/calendar.po b/l10n/nb_NO/calendar.po
index f9b15afa19..09f790c740 100644
--- a/l10n/nb_NO/calendar.po
+++ b/l10n/nb_NO/calendar.po
@@ -6,14 +6,15 @@
 #   <ajarmund@gmail.com>, 2011, 2012.
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
+#   <itssmail@yahoo.no>, 2012.
 #   <sondre@nettfrihet.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 08:30+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,16 +46,40 @@ msgstr "Tidssone endret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Bursdag"
@@ -642,7 +667,7 @@ msgstr "Ukens første dag"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr "Kalender CalDAV synkroniseringsadresse"
+msgstr "Synkroniseringsadresse fo kalender CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 359ffe19b0..3c4fd0d429 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Ingen ID angitt"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
@@ -85,29 +85,26 @@ msgstr "Et problem oppsto med å legge til adresseboken."
 msgid "Error activating addressbook."
 msgstr "Et problem oppsto med å aktivere adresseboken."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Klarte ikke å laste bilde."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Klarte ikke å lese kontaktbilde."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Klarte ikke å lagre midlertidig fil."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Bildet som lastes inn er ikke gyldig."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id er ikke satt."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -125,14 +122,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr "Mangler kontakt-id."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Ingen filsti ble lagt inn."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Filen eksisterer ikke:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Klarte ikke å laste bilde."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -149,7 +178,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
@@ -165,102 +194,229 @@ msgstr "Et problem oppsto med å oppdatere adresseboken."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresseboken ble ikke funnet."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internett"
 
@@ -365,7 +521,7 @@ msgstr "Foretrukket"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Vennligst angi en gyldig e-postadresse."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
@@ -373,7 +529,7 @@ msgstr "Skriv inn e-postadresse"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Send e-post til adresse"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
@@ -413,7 +569,7 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Notat"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -431,6 +587,10 @@ msgstr "Last opp nytt bilde"
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Endre adresse"
@@ -548,7 +708,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Stipendiat"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -584,10 +744,10 @@ msgstr "Lagre"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr "Send inn"
+msgstr "Lagre"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -615,33 +775,28 @@ msgstr "Importer"
 msgid "Importing contacts"
 msgstr "Importerer kontakter"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktene ble importert uten feil"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Lukk dialog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importer adressebok"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Du har ingen kontakter i din adressebok"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -649,11 +804,11 @@ msgstr "Ny kontakt"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfigurer adressebøker"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "Synkroniseringsadresse for CardDAV"
 
 #: templates/settings.php:4
 msgid "more info"
@@ -665,4 +820,4 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 567def3384..235bd24a6b 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ajarmund@gmail.com>, 2011.
+#   <ajarmund@gmail.com>, 2011, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 11:04+0000\n"
-"Last-Translator: owncloud <itssmail@yahoo.no>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,14 +23,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Applikasjonsnavn ikke angitt."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategorier å legge til?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Denne kategorien finnes allerede:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -39,7 +115,7 @@ msgstr "OwnCloud passordtilbakestilling"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Tilbakestill ownCloud passord"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -104,7 +180,7 @@ msgstr "Hjelp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Tilgang nektet"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -112,11 +188,11 @@ msgstr "Sky ikke funnet"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger kategorier"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -163,15 +239,15 @@ msgstr "Databasevert"
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Innstillinger"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index e777435c9d..ced2b12359 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 08:20+0000\n"
-"Last-Translator: anjar <ajarmund@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Mangler en midlertidig mappe"
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Størrelse"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Endret"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Filhåndtering"
@@ -122,18 +174,6 @@ msgstr "Del"
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Størrelse"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Endret"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Slett alle"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
index d112af5146..4ebdedf453 100644
--- a/l10n/nb_NO/gallery.po
+++ b/l10n/nb_NO/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 07:59+0000\n"
-"Last-Translator: anjar <ajarmund@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Bilder"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Les inn på nytt"
@@ -36,10 +76,6 @@ msgstr "Stopp"
 msgid "Share"
 msgstr "Del"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Innstillinger"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Tilbake"
diff --git a/l10n/nb_NO/media.po b/l10n/nb_NO/media.po
index 3dbdfecc10..b6d932f877 100644
--- a/l10n/nb_NO/media.po
+++ b/l10n/nb_NO/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musikk"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Spill"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -34,7 +38,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Forrige"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Neste"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 245e72ba7c..0b26d8f505 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 10:18+0000\n"
-"Last-Translator: owncloud <itssmail@yahoo.no>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +22,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Epostadresse endret"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ugyldig forespørsel"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID endret"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ugyldig forespørsel"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Språk endret"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -59,10 +74,14 @@ msgid "Select an App"
 msgstr "Velg en app"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "av"
 
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index 741d950425..1d7f622b14 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:37+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,16 +46,40 @@ msgstr "Tijdzone is veranderd"
 msgid "Invalid request"
 msgstr "Ongeldige aanvraag"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;' d[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Verjaardag"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 7118f749a3..af8b706fd4 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 08:05+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,23 +86,20 @@ msgstr "Fout bij het toevoegen van het adresboek."
 msgid "Error activating addressbook."
 msgstr "Fout bij het activeren van het adresboek."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Geen contact ID opgestuurd."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Fout bij laden plaatje."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Lezen van contact foto mislukt."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Tijdelijk bestand opslaan mislukt."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "De geladen foto is niet goed."
 
@@ -126,14 +123,46 @@ msgstr "Contact ID ontbreekt."
 msgid "Missing contact id."
 msgstr "Ontbrekende contact id."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Geen fotopad opgestuurd."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Bestand bestaat niet:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Fout bij laden plaatje."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "onderdeel naam is niet opgegeven."
@@ -150,7 +179,7 @@ msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
@@ -166,102 +195,229 @@ msgstr "Fout bij het updaten van het adresboek."
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Het bestand overschrijdt de upload_max_filesize instelling in php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacten"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Sleep een VCF bestand om de contacten te importeren."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresboek niet gevonden."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -432,6 +588,10 @@ msgstr "Upload nieuwe foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Wijzig adres"
@@ -588,7 +748,7 @@ msgid "Submit"
 msgstr "Opslaan"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuleren"
 
@@ -616,27 +776,22 @@ msgstr "Importeer"
 msgid "Importing contacts"
 msgstr "Importeren van contacten"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contacten zijn geïmporteerd"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Sluit venster"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importeer adresboek"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Selecteer adresboek voor import:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Sleep een VCF bestand om de contacten te importeren."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Selecteer van schijf"
 
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 6a1a51ac9e..1bdd585b7e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:48+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,82 @@ msgstr "Geen categorie toevoegen?"
 msgid "This category already exists: "
 msgstr "De categorie bestaat al."
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Reset je ownCloud wachtwoord"
@@ -164,15 +240,15 @@ msgstr "Database server"
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webdiensten die je beheerst"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Instellingen"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f32f2338a7..d6e80473b0 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:21+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,10 +53,62 @@ msgstr "Een tijdelijke map mist"
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Bestanden"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Bestandsgrootte"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Laatst aangepast"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Bestand"
@@ -125,18 +177,6 @@ msgstr "Delen"
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Bestandsgrootte"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Laatst aangepast"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Alles verwijderen"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Verwijder"
diff --git a/l10n/nl/gallery.po b/l10n/nl/gallery.po
index bea85f9005..8548603b7b 100644
--- a/l10n/nl/gallery.po
+++ b/l10n/nl/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:42+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Plaatjes"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Instellingen"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Opnieuw doorzoeken"
@@ -35,10 +75,6 @@ msgstr "Stop"
 msgid "Share"
 msgstr "Deel"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Instellingen"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Terug"
diff --git a/l10n/nl/media.po b/l10n/nl/media.po
index 54b630298a..f06251189b 100644
--- a/l10n/nl/media.po
+++ b/l10n/nl/media.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muziek"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Afspelen"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauzeer"
 
@@ -36,7 +40,7 @@ msgstr "Pauzeer"
 msgid "Previous"
 msgstr "Vorige"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Volgende"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 5d66cda928..977be9bdbc 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:27+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "mailadres aangepast"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ongeldig verzoek"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID is aangepast"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ongeldig verzoek"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Taal aangepast"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Selecteer een app"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-gelicentieerd"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "door"
 
diff --git a/l10n/nn_NO/calendar.po b/l10n/nn_NO/calendar.po
index df9ebffb13..420f41350e 100644
--- a/l10n/nn_NO/calendar.po
+++ b/l10n/nn_NO/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -43,77 +43,101 @@ msgstr "Endra tidssone"
 msgid "Invalid request"
 msgstr "Ugyldig førespurnad"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Telefonsamtale"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klientar"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Forsending"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Høgtid"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idear"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Møte"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Anna"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Personleg"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Prosjekt"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Spørsmål"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 4f4fe975b0..93385875c2 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Eit problem oppstod ved å leggja til adresseboka."
 msgid "Error activating addressbook."
 msgstr "Eit problem oppstod ved aktivering av adresseboka."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -123,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
@@ -163,102 +192,229 @@ msgstr "Eit problem oppstod ved å oppdatere adresseboka."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -429,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Send"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Kanseller"
 
@@ -613,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 316407b172..f8af21ff3e 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud Passord tilbakestilling"
@@ -161,15 +237,15 @@ msgstr "Databasetenar"
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Innstillingar"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 606fd10a11..c5cc1159e3 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr "Manglar ei mellombels mappe"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Storleik"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Endra"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Storleik"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Endra"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nn_NO/gallery.po b/l10n/nn_NO/gallery.po
index 9af44a6fd4..3d4eedd0ef 100644
--- a/l10n/nn_NO/gallery.po
+++ b/l10n/nn_NO/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Søk på nytt"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Tilbake"
diff --git a/l10n/nn_NO/media.po b/l10n/nn_NO/media.po
index 047e10a6ae..a5f4d0d1d3 100644
--- a/l10n/nn_NO/media.po
+++ b/l10n/nn_NO/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musikk"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Spel"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -34,7 +38,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Førre"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Neste"
 
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f195f04acf..f8c099c030 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "epost endra"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ugyldig førespurnad"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID endra"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ugyldig førespurnad"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Språk endra"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Vel ein applikasjon"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "av"
 
diff --git a/l10n/pl/calendar.po b/l10n/pl/calendar.po
index 05a9d3112b..1a335acb35 100644
--- a/l10n/pl/calendar.po
+++ b/l10n/pl/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Brak kalendarzy"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Brak wydzarzeń"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +43,103 @@ msgstr "Zmieniono strefę czasową"
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Interesy"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Rozmowy"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klienci"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Dostawcy"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Święta"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Pomysły"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Podróże"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubileusze"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Spotkania"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Inne"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Osobiste"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Pytania"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Zawodowe"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "nienazwany"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +388,7 @@ msgstr "Wybór aktywnych kalendarzy"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Twoje kalendarze"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +397,15 @@ msgstr "Wyświetla odnośnik CalDAV"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Współdzielone kalendarze"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Brak współdzielonych kalendarzy"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Współdziel kalendarz"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +422,7 @@ msgstr "Usuwa kalendarz"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "współdzielisz z"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +467,23 @@ msgstr "Wyeksportuj"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informacja o wydarzeniach"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Powtarzanie"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Uczestnicy"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Współdziel"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +495,11 @@ msgstr "Kategoria"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Oddziel kategorie przecinkami"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Edytuj kategorie"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +620,11 @@ msgstr "Tworzenie nowego wydarzenia"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Zobacz wydarzenie"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "nie zaznaczono kategorii"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +632,11 @@ msgstr "Wybierz kategorię"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "z"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "w"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +660,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Pierwszy dzień tygodnia"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +668,24 @@ msgstr "Adres synchronizacji kalendarza CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "wybierz użytkowników"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Edytowalne"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupy"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "wybierz grupy"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "uczyń publicznym"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 6c063d3d2e..2219380006 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +39,7 @@ msgstr "Należy wypełnić przynajmniej jedno pole adresu."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Próba dodania z duplikowanej właściwości:"
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -46,35 +47,35 @@ msgstr "Błąd dodawania elementu."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Brak opatrzonego ID "
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Błąd ustawień sumy kontrolnej"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nie zaznaczono kategorii do usunięcia"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Nie znaleziono książek adresowych"
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Nie znaleziono kontaktów."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Brak ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Nie można dodać książki adresowej z pusta nazwą"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +85,26 @@ msgstr "Błąd dodawania książki adresowej."
 msgid "Error activating addressbook."
 msgstr "Błąd aktywowania książki adresowej."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "ID kontaktu nie został utworzony."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Błąd odczytu zdjęcia kontaktu."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Wystąpił błąd podczas zapisywania pliku tymczasowego."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Wczytywane zdjęcie nie jest poprawne."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id nie ustawione."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +116,75 @@ msgstr "Błąd usuwania elementu."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Brak kontaktu id."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Brak kontaktu id."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Ścieżka do zdjęcia nie została podana."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Plik nie istnieje:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Błąd ładowania obrazu."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "nazwa elementu nie jest ustawiona."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "checksum-a nie ustawiona"
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +192,237 @@ msgstr "Błąd uaktualniania książki adresowej."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nie było błędów, plik wyczytano poprawnie."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Załadowany plik przekracza wielkość upload_max_filesize w php.ini "
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Załadowany plik tylko częściowo został wysłany."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Plik nie został załadowany"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Brak folderu tymczasowego"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
-msgid "This is not your addressbook."
-msgstr "To nie jest twoja książka adresowa."
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
 
-#: lib/app.php:38
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Upuść plik VCF do importu kontaktów."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Nie znaleziono książki adresowej"
+
+#: lib/app.php:34
+msgid "This is not your addressbook."
+msgstr "To nie jest Twoja książka adresowa."
+
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Połączenie tekstowe"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name} Urodzony"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +438,7 @@ msgstr "Książki adresowe"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfiguruj książkę adresową"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +446,7 @@ msgstr "Nowa książka adresowa"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importuj z VFC"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,23 +477,23 @@ msgstr "Usuwa kontakt"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Upuść fotografię aby załadować"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Edytuj szczegóły nazwy"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Nazwa"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Wpisz nazwę"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +501,19 @@ msgstr "Urodziny"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-rrrr"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupy"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Oddziel grupy przecinkami"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Edytuj grupy"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +521,47 @@ msgstr "Preferowane"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Określ prawidłowy adres e-mail."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Wpisz adres email"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Mail na adres"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Usuń adres mailowy"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Wpisz numer telefonu"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Usuń numer telefonu"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Zobacz na mapie"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Edytuj szczegóły adresu"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Dodaj notatkę tutaj."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Dodaj pole"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Zdjęcie profilu"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +569,31 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Uwaga"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Usuń aktualne zdjęcie"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Edytuj aktualne zdjęcie"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Wczytaj nowe zdjęcie"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Wybierz zdjęcie z ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Edytuj adres"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +636,7 @@ msgstr "Kraj"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edytuj kategorie"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -487,79 +648,79 @@ msgstr "Książka adresowa"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Prefiksy Hon."
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Panna"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Pan"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Pani"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Podaj imię"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Dodatkowe nazwy"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nazwa rodziny"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Sufiksy Hon."
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -586,82 +747,77 @@ msgid "Submit"
 msgstr "Potwierdź"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importuj plik z kontaktami"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Proszę wybrać książkę adresową"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "utwórz nową książkę adresową"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Nazwa nowej książki adresowej"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "importuj kontakty"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Zaznacz książkę adresową do importu do:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Wybierz z HD"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Dodaj kontakt"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfiguruj książkę adresową"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "adres do synchronizacji CardDAV"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "więcej informacji"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Pierwszy adres"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 282ad5585f..905b545290 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Brak nazwy dla aplikacji"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Brak kategorii"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Ta kategoria już istnieje"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -40,7 +116,7 @@ msgstr "Resetowanie hasła"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "restart hasła"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -105,7 +181,7 @@ msgstr "Pomoc"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Dostęp zabroniony"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -113,11 +189,11 @@ msgstr "Nie odnaleziono chmury"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edytuj kategorię"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -164,15 +240,15 @@ msgstr "Komputer bazy danych"
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ustawienia"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 265c64e67d..b37c9903ee 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 #   <mosslar@gmail.com>, 2011.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +49,67 @@ msgstr "Brak katalogu tymczasowego"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Błąd zapisu na dysk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Pliki"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Rozmiar"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Czas modyfikacji"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Zarządzanie plikami"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -64,23 +117,23 @@ msgstr "Maksymalny rozmiar wysyłanego pliku"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. możliwych"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Wymagany do pobierania wielu plików i folderów"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Włącz pobieranie ZIP-paczki"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 jest nielimitowane"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 
 #: templates/index.php:7
 msgid "New"
@@ -96,7 +149,7 @@ msgstr "Katalog"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Z adresu"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -104,7 +157,7 @@ msgstr "Prześlij"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Przestań wysyłać"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -116,24 +169,12 @@ msgstr "Nazwa"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Współdziel"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Pobiera element"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Rozmiar"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Czas modyfikacji"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Usuwa element"
@@ -150,8 +191,8 @@ msgstr "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszcza
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Skanowanie plików, proszę czekać."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index daa6a4ac54..b53b2545d6 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Zdjęcia"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -30,15 +70,11 @@ msgstr "Przeszukaj"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Współdziel"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -46,16 +82,16 @@ msgstr "Wróć"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Usuń potwierdzenie"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Czy chcesz usunąć album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Zmień nazwę albumu"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nowa nazwa albumu"
diff --git a/l10n/pl/media.po b/l10n/pl/media.po
index 74433240bf..d8f1ee9e41 100644
--- a/l10n/pl/media.po
+++ b/l10n/pl/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-16 21:16+0000\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzyka"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Wstrzymaj"
 
@@ -36,7 +40,7 @@ msgstr "Wstrzymaj"
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Następny"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 7eb252abe6..25b7eda775 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -12,9 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,57 +24,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "zmieniono adres e-mail"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Nieprawidłowe żądanie"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Zmieniono OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Nieprawidłowe żądanie"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Język zmieniony"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Polski"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Więcej"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Dodaj aplikacje"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Zaznacz aplikacje"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencjonowany"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "przez"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentacja"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Zarządzanie dużymi plikami"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -102,11 +121,11 @@ msgstr "z dostępnych"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Klienci synchronizacji"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Ściągnij"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -174,11 +193,11 @@ msgstr "Utwórz"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Domyślny udział"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Inne"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/pt_BR/calendar.po b/l10n/pt_BR/calendar.po
index 5283c3162a..9d5c771269 100644
--- a/l10n/pt_BR/calendar.po
+++ b/l10n/pt_BR/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:59+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Fuso horário alterado"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Aniversário"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 1da3cea497..f2be42ae68 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:43+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,23 +84,20 @@ msgstr "Erro ao adicionar agenda."
 msgid "Error activating addressbook."
 msgstr "Erro ao ativar agenda."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nenhum ID do contato foi submetido."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Erro ao carregar imagem."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Erro de leitura na foto do contato."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Erro ao salvar arquivo temporário."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Foto carregada não é válida."
 
@@ -124,14 +121,46 @@ msgstr "ID do contato está faltando."
 msgid "Missing contact id."
 msgstr "Faltando ID do contato."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Nenhum caminho para foto foi submetido."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Arquivo não existe:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Erro ao carregar imagem."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "nome do elemento não definido."
@@ -148,7 +177,7 @@ msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
@@ -164,108 +193,235 @@ msgstr "Erro ao atualizar agenda."
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Arquivo enviado com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O arquivo foi parcialmente carregado"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nenhum arquivo carregado"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Diretório temporário não encontrado"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contatos"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Arraste um arquivo VCF para importar contatos."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Lista de endereços não encontrado."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua agenda de endereços."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Aniversário de {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -277,11 +433,11 @@ msgstr "Adicionar Contato"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr "Agendas"
+msgstr "Agendas de Endereço"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Configurar Livro de Endereços"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +445,7 @@ msgstr "Nova agenda"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importar de VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,23 +476,23 @@ msgstr "Apagar contato"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Arraste a foto para ser carregada"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Editar detalhes do nome"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Apelido"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Digite o apelido"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +500,19 @@ msgstr "Aniversário"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-aaaa"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separe grupos por virgula"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editar grupos"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +520,47 @@ msgstr "Preferido"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Por favor, especifique um email válido."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Digite um endereço de email"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Correio para endereço"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Remover endereço de email"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Digite um número de telefone"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Remover número de telefone"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Visualizar no mapa"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Editar detalhes de endereço"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Adicionar notas"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Adicionar campo"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Imagem do Perfil"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +568,31 @@ msgstr "Telefone"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Deletar imagem atual"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Editar imagem atual"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Carregar nova foto"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Selecionar foto do OwnCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Editar endereço"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +635,7 @@ msgstr "País"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -483,91 +643,91 @@ msgstr "Adicionar"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr "Agenda"
+msgstr "Agenda de Endereço"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Exmo. Prefixos "
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Senhorita"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Srta."
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Sr."
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Senhor"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Sra."
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Primeiro Nome"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Segundo Nome"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Sobrenome"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Exmo. Sufixos"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr "Nova agenda"
+msgstr "Nova Agenda de Endereço"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr "Editar agenda"
+msgstr "Editar Agenda de Endereço"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -586,82 +746,77 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importar arquivos de contato."
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Por favor, selecione uma agenda de endereços"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Criar nova agenda de endereços"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Nome da nova agenda de endereços"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Importar contatos"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Selecione agenda de endereços para importar ao destino:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Selecione do disco rigído"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Voce não tem contatos em sua agenda de endereços."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Adicionar contatos"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Configurar agenda de endereços"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "Sincronizando endereços CardDAV"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "leia mais"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Endereço primário(Kontact et al)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index be83e6bfe4..0c9e514fdb 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:50+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,6 +33,82 @@ msgstr "Nenhuma categoria adicionada?"
 msgid "This category already exists: "
 msgstr "Essa categoria já existe"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Mudar senha do Owncloud"
@@ -163,15 +239,15 @@ msgstr "Banco de dados do host"
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Configurações"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 588b33fb73..ef9cf274d9 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:18+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Pasta temporária não encontrada"
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Arquivos"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamanho"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamento de Arquivo"
@@ -122,18 +174,6 @@ msgstr "Compartilhar"
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamanho"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Deletar Tudo"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Excluir"
diff --git a/l10n/pt_BR/gallery.po b/l10n/pt_BR/gallery.po
index da803b0599..1c68432fb0 100644
--- a/l10n/pt_BR/gallery.po
+++ b/l10n/pt_BR/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 00:52+0000\n"
-"Last-Translator: Van Der Fran <transifex@vanderland.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Fotos"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Configuração"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Atualizar"
@@ -35,10 +75,6 @@ msgstr "Parar"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Configuração"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Voltar"
diff --git a/l10n/pt_BR/media.po b/l10n/pt_BR/media.po
index 76b0263bb5..7791374917 100644
--- a/l10n/pt_BR/media.po
+++ b/l10n/pt_BR/media.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Tocar"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -35,7 +39,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Próximo"
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 5043a358e3..88a8425439 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:01+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +22,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email Alterado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Pedido inválido"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Mudou OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Pedido inválido"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Português"
 
@@ -59,10 +74,14 @@ msgid "Select an App"
 msgstr "Selecione uma Aplicação"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciados"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
diff --git a/l10n/pt_PT/calendar.po b/l10n/pt_PT/calendar.po
index 5d7d95b0ab..02385945ce 100644
--- a/l10n/pt_PT/calendar.po
+++ b/l10n/pt_PT/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <helder.meneses@gmail.com>, 2011.
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Nenhum calendário encontrado."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Nenhum evento encontrado."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +44,103 @@ msgstr "Zona horária alterada"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Dia de anos"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Negócio"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Telefonar"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Entregar"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Férias"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideias"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jublieu"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Encontro"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Pessoal"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projetos"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Perguntas"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "não definido"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +389,7 @@ msgstr "Escolhe calendários ativos"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Os seus calendários"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +398,15 @@ msgstr "Endereço CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Calendários partilhados"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Nenhum calendário partilhado"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Partilhar calendário"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +423,7 @@ msgstr "Apagar"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "Partilhado consigo por"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +468,23 @@ msgstr "Exportar"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informação do evento"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Repetição"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarme"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Participantes"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +496,11 @@ msgstr "Categoria"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separe categorias por virgulas"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +621,11 @@ msgstr "Criar novo evento"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Ver um evento"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nenhuma categoria seleccionada"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +633,11 @@ msgstr "Selecionar categoria"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +661,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Primeiro dia da semana"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +669,24 @@ msgstr "Endereço de sincronização CalDav do calendário"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Utilizadores"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "Selecione utilizadores"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Editavel"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "Selecione grupos"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "Tornar público"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 908fc259a2..4b0f48cbee 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "A tentar adicionar propriedade duplicada: "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -46,35 +46,35 @@ msgstr "Erro ao adicionar propriedade do contato"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Nenhum ID inserido"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Erro a definir checksum."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nenhuma categoria selecionada para eliminar."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Nenhum livro de endereços encontrado."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Nenhum contacto encontrado."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Falta ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Erro a analisar VCard para o ID: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Não é possivel adicionar Livro de endereços com nome vazio."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +84,26 @@ msgstr "Erro ao adicionar livro de endereços"
 msgid "Error activating addressbook."
 msgstr "Erro ao ativar livro de endereços"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Nenhum ID de contacto definido."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Erro a ler a foto do contacto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Erro a guardar ficheiro temporário."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "A foto carregada não é valida."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id não está definido"
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +115,75 @@ msgstr "Erro ao apagar propriedade do contato"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Falta o ID do contacto."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Falta o ID do contacto."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Nenhum caminho da foto definido."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "O ficheiro não existe:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Erro a carregar a imagem."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "o nome do elemento não está definido."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "Checksum não está definido."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Algo provocou um FUBAR. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +191,237 @@ msgstr "Erro a atualizar o livro de endereços"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Erro a carregar os contactos para o armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Não ocorreu erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Livro de endereços não encontrado."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Aniversário de {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +437,7 @@ msgstr "Livros de endereços"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Configurar livros de endereços"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +445,7 @@ msgstr "Novo livro de endereços"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importar de VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -328,15 +484,15 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Editar detalhes do nome"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Alcunha"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Introduza alcunha"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +500,19 @@ msgstr "Aniversário"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-aaaa"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separe os grupos usando virgulas"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editar grupos"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +520,47 @@ msgstr "Preferido"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Por favor indique um endereço de correio válido"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Introduza endereço de email"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Enviar correio para o endereço"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Eliminar o endereço de correio"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Insira o número de telefone"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Eliminar o número de telefone"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Ver no mapa"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Editar os detalhes do endereço"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Insira notas aqui."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Adicionar campo"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Foto do perfil"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,15 +568,15 @@ msgstr "Telefone"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Eliminar a foto actual"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Editar a foto actual"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
@@ -428,11 +584,15 @@ msgstr ""
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Selecionar uma foto da ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Editar endereço"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +635,7 @@ msgstr "País"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -495,15 +655,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Sra"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
@@ -511,7 +671,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -519,11 +679,11 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Nomes adicionais"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nome de familia"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -586,21 +746,21 @@ msgid "Submit"
 msgstr "Submeter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importar um ficheiro de contactos"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Por favor seleccione o livro de endereços"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Criar um novo livro de endereços"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
@@ -608,33 +768,28 @@ msgstr ""
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "A importar os contactos"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
@@ -644,7 +799,7 @@ msgstr ""
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Adicionar contacto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
@@ -656,7 +811,7 @@ msgstr ""
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "mais informação"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
@@ -664,4 +819,4 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 6bfda24464..c1427407a8 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <helder.meneses@gmail.com>, 2011, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nome da aplicação não definida."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nenhuma categoria para adicionar?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Esta categoria já existe:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +114,7 @@ msgstr "Redefinir palavra-chave ownCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Reposição da password ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +179,7 @@ msgstr "Ajuda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Acesso interdito"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +187,11 @@ msgstr "Cloud nao encontrada"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +238,15 @@ msgstr "Host da base de dados"
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Definições"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 7b8597d2e9..8779bcac2b 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +47,67 @@ msgstr "Falta uma pasta temporária"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Falhou a escrita no disco"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamanho"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Manuseamento de ficheiros"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,23 +115,23 @@ msgstr "Tamanho máximo de envio"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. possivel: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Necessário para multi download de ficheiros e pastas"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Ativar dowload de ficheiros ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 é ilimitado"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Tamanho máximo para ficheiros ZIP"
 
 #: templates/index.php:7
 msgid "New"
@@ -94,7 +147,7 @@ msgstr "Pasta"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Do endereço"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "Enviar"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Cancelar upload"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "Nome"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamanho"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Apagar"
@@ -148,8 +189,8 @@ msgstr "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envi
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Análise actual"
diff --git a/l10n/pt_PT/gallery.po b/l10n/pt_PT/gallery.po
index 14a2a55e87..5a8f443a91 100644
--- a/l10n/pt_PT/gallery.po
+++ b/l10n/pt_PT/gallery.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <helder.meneses@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +20,48 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Imagens"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Definições"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +70,11 @@ msgstr "Atualizar"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +82,16 @@ msgstr "Voltar"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Remove confirmação"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Deseja remover o album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Mudar o nome do album"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Novo nome do album"
diff --git a/l10n/pt_PT/media.po b/l10n/pt_PT/media.po
index 8cc68c028b..ca25576702 100644
--- a/l10n/pt_PT/media.po
+++ b/l10n/pt_PT/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
-"Last-Translator: rjgpp1994 <rjgpp.1994@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproduzir"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +38,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Próximo"
 
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index f69a3f1fe1..9a87a9c31f 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "endereço de email alterado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Pedido inválido"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID alterado"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Pedido inválido"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Idioma alterado"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mais"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Adicione a sua aplicação"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documentação"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Gestão de ficheiros grandes"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -98,11 +117,11 @@ msgstr "do disponível"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Clientes de sincronização desktop e movel"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Transferir"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -170,11 +189,11 @@ msgstr "Criar"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Quota por defeito"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/ro/calendar.po b/l10n/ro/calendar.po
index a1f91c1b97..0521a803f4 100644
--- a/l10n/ro/calendar.po
+++ b/l10n/ro/calendar.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 # Ovidiu Tache <ovidiutache@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Nici un calendar găsit."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Nici un eveniment găsit."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -44,79 +45,103 @@ msgstr "Fus orar schimbat"
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendar"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Afaceri"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Sună"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clienți"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Curier"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Sărbători"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idei"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Călătorie"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Aniversare"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Altele"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Proiecte"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Întrebări"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Servici"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "fără nume"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -365,7 +390,7 @@ msgstr "Alege calendarele active"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Calendarele tale"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -374,15 +399,15 @@ msgstr "Legătură CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Calendare partajate"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Nici un calendar partajat"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Partajați calendarul"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -399,7 +424,7 @@ msgstr "Șterge"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "Partajat cu tine de"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -444,23 +469,23 @@ msgstr "Exportă"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informații despre eveniment"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Ciclic"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarmă"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Participanți"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Partajează"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -472,11 +497,11 @@ msgstr "Categorie"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separă categoriile prin virgule"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Editează categorii"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -597,11 +622,11 @@ msgstr "Crează un eveniment nou"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Vizualizează un eveniment"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nici o categorie selectată"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -609,11 +634,11 @@ msgstr "Selecteză categoria"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "din"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "la"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -637,7 +662,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Prima zi a săptămînii"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -645,24 +670,24 @@ msgstr "Adresa pentru sincronizarea calendarului CalDAV"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "utilizatori selectați"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Editabil"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupuri"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "grupuri selectate"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "fă public"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index d4d9f15b1c..1a257a7947 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -45,35 +46,35 @@ msgstr "Contactul nu a putut fi adăugat."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Nici un ID nu a fost furnizat"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Eroare la stabilirea sumei de control"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nici o categorie selectată pentru ștergere"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Nici o carte de adrese găsită"
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Nici un contact găsit"
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "ID lipsă"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Nu e posibil de adăugat o carte de adrese fără nume"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -83,29 +84,26 @@ msgstr "Agenda nu a putut fi adăugată."
 msgid "Error activating addressbook."
 msgstr "Eroare la activarea agendei."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Nici un ID de contact nu a fost transmis"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Eroare la citerea fotografiei de contact"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Eroare la salvarea fișierului temporar."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Fotografia care se încarcă nu este validă."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "ID-ul nu este stabilit"
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -117,27 +115,59 @@ msgstr "Eroare la ștergerea proprietăților contactului."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID-ul de contact lipsește."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "ID de contact lipsă."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Nici o adresă către fotografie nu a fost transmisă"
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Fișierul nu există:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Eroare la încărcarea imaginii."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "numele elementului nu este stabilit."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "suma de control nu este stabilită."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
@@ -147,7 +177,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
@@ -163,108 +193,235 @@ msgstr "Eroare la actualizarea agendei."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacte"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Ziua de naștere a {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -327,15 +484,15 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Introdu detalii despre nume"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Pseudonim"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Introdu pseudonim"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -343,19 +500,19 @@ msgstr "Zi de naștere"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "zz-ll-aaaa"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupuri"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separă grupurile cu virgule"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editează grupuri"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -363,19 +520,19 @@ msgstr "Preferat"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Te rog să specifici un e-mail corect"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Introdu adresa de e-mail"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Trimite mesaj la e-mail"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Șterge e-mail"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
@@ -429,6 +586,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +746,7 @@ msgid "Submit"
 msgstr "Trimite"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -613,27 +774,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 71bfdc95d9..3aed0fedf4 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Numele aplicație nu este furnizat."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nici o categorie de adăugat?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Această categorie deja există:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +114,7 @@ msgstr "Resetarea parolei ownCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Resetarea parolei ownCloud "
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +179,7 @@ msgstr "Ajutor"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Acces interzis"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +187,11 @@ msgstr "Nu s-a găsit"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editează categoriile"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Adaugă"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +238,15 @@ msgstr "Bază date"
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Configurări"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index c0d85daecd..06c259c228 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +48,67 @@ msgstr "Lipsește un dosar temporar"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Eroare la scriere pe disc"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fișiere"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dimensiune"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Manipulare fișiere"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -63,23 +116,23 @@ msgstr "Dimensiune maximă admisă la încărcare"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. posibil:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Activează descărcare fișiere compresate"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 e nelimitat"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +148,7 @@ msgstr "Dosar"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "De la URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +156,7 @@ msgstr "Încarcă"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Anulează încărcarea"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +168,12 @@ msgstr "Nume"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Partajează"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dimensiune"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificat"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Șterge"
@@ -149,8 +190,8 @@ msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la 
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Fișierele sunt scanate, te rog așteptă."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "În curs de scanare"
diff --git a/l10n/ro/gallery.po b/l10n/ro/gallery.po
index ffdf7bbf5d..4bf7a3d271 100644
--- a/l10n/ro/gallery.po
+++ b/l10n/ro/gallery.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +20,48 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Imagini"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Setări"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +70,11 @@ msgstr "Re-scanează"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Partajează"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +82,16 @@ msgstr "Înapoi"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Șterge confirmarea"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Vrei să ștergi albumul"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Schimbă numele albumului"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nume nou album"
diff --git a/l10n/ro/media.po b/l10n/ro/media.po
index a3c7b97b6f..8ad58147fa 100644
--- a/l10n/ro/media.po
+++ b/l10n/ro/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-19 20:29+0000\n"
-"Last-Translator: Eugen Mihalache <eugemjj@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzică"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Redă"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauză"
 
@@ -35,7 +39,7 @@ msgstr "Pauză"
 msgid "Previous"
 msgstr "Precedent"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Următor"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 12a1a43875..542bfa8f1c 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,57 +22,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email schimbat"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Cerere eronată"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID schimbat"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Cerere eronată"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_language_name_"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Jurnal de activitate"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mai mult"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Adaugă aplicația ta"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-autorizat"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "de"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documetație"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Gestionînd fișiere mari"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -99,11 +119,11 @@ msgstr "din cele diponibile"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Clienți de sincronizare pentru telefon mobil și desktop"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Descărcări"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -171,11 +191,11 @@ msgstr "Crează"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Cotă implicită"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Altele"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index bf5d91bd80..32c4700f8d 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +23,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Календари не найдены."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "События не найдены."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +45,103 @@ msgstr "Часовой пояс изменён"
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календарь"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Бизнес"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Звонить"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Клиенты"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Доставщик"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Праздники"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Поездка"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Юбилей"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Встреча"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Другое"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Личное"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Проекты"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Вопросы"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "без имени"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +390,7 @@ msgstr "Выберите активные календари"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Ваши календари"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +399,15 @@ msgstr "Ссылка для CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Общие календари"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Нет общих календарей"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Сделать календарь общим"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +424,7 @@ msgstr "Удалить"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "с вами поделился"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +469,23 @@ msgstr "Экспортировать"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Информация о событии"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Повторение"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Сигнал"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Участники"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Поделиться"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +497,11 @@ msgstr "Категория"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Разделяйте категории запятыми"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактировать категории"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +622,11 @@ msgstr "Создать новое событие"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Показать событие"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Категории не выбраны"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -636,7 +662,7 @@ msgstr "12ч"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Первый день недели"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +670,24 @@ msgstr "Адрес синхронизации календаря CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "выбрать пользователей"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Редактируемо"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Группы"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "выбрать группы"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "селать публичным"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index aac272f8b9..f44e9700f0 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <ideamk@gmail.com>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -46,35 +49,35 @@ msgstr "Ошибка добавления информации к контакт
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "ID не предоставлен"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Ошибка установки контрольной суммы."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Категории для удаления не установлены."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Адресные книги не найдены."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Контакты не найдены."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Отсутствует ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Ошибка обработки VCard для ID: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Нельзя добавить адресную книгу без имени."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +87,26 @@ msgstr "Ошибка добавления адресной книги."
 msgid "Error activating addressbook."
 msgstr "Ошибка активации адресной книги."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Ошибка чтения фотографии контакта."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Ошибка сохранения временного файла."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Загружаемая фотография испорчена."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id не установлен."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +118,75 @@ msgstr "Ошибка удаления информации из контакта
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID контакта отсутствует."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
+msgstr "Файл не существует:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Ошибка загрузки картинки."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "имя элемента не установлено."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "контрольная сумма не установлена."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Нельзя обновить адресную книгу с пустым именем."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +194,237 @@ msgstr "Ошибка обновления адресной книги."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Ошибка загрузки контактов в хранилище."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Файл загружен успешно."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Файл загружен частично"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Файл не был загружен"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Отсутствует временная папка"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Контакты"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Адресная книга не найдена."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Это не ваша адресная книга."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адрес"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Ящик эл. почты"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Организация"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Сообщение"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Интернет"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "День рождения {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +440,7 @@ msgstr "Адресные книги"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Настроить Адресную книгу"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +448,7 @@ msgstr "Новая адресная книга"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Импортировать из VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,7 +479,7 @@ msgstr "Удалить контакт"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Перетяните фотографии для загрузки"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -332,11 +491,11 @@ msgstr ""
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Псевдоним"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Введите псевдоним"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,11 +503,11 @@ msgstr "День рождения"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-yyyy"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Группы"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
@@ -356,7 +515,7 @@ msgstr ""
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Редактировать группы"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +523,47 @@ msgstr "Предпочитаемый"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Укажите действительный адрес электронной почты."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Укажите адрес электронной почты"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Написать по адресу"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Удалить адрес электронной почты"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Ввести номер телефона"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Удалить номер телефона"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Показать на карте"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Ввести детали адреса"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Добавьте заметки здесь."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Добавить поле"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Фото профиля"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +571,31 @@ msgstr "Телефон"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Заметка"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Удалить текущую фотографию"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Редактировать текущую фотографию"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Загрузить новую фотографию"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Выбрать фотографию из ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Редактировать адрес"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +638,7 @@ msgstr "Страна"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактировать категрии"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -515,15 +678,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Имя"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Дополнительные имена (отчество)"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Фамилия"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -586,69 +749,64 @@ msgid "Submit"
 msgstr "Отправить"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Отменить"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Загрузить файл контактов"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Выберите адресную книгу"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "создать новую адресную книгу"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Имя новой адресной книги"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Импорт"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Импорт контактов"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "В адресной книге есть контакты."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Добавить контакт"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Настроить адресную книгу"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
@@ -656,7 +814,7 @@ msgstr ""
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "дополнительная информация"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 68495024b9..315d1deac6 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Имя приложения не установлено."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Нет категорий для добавления?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Эта категория уже существует: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +114,7 @@ msgstr "Сброс пароля OwnCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Сброс пароля "
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +179,7 @@ msgstr "Помощь"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Доступ запрещён"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +187,11 @@ msgstr "Облако не найдено"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактировать категории"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +238,15 @@ msgstr "Хост базы данных"
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Настройки"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index acfd4fa635..bda5204072 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +49,67 @@ msgstr "Невозможно найти временную папку"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Ошибка записи на диск"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Файлы"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Размер"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Изменен"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Управление файлами"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -64,23 +117,23 @@ msgstr "Максимальный размер файла"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "макс. возможно: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Требуется для загрузки нескольких файорв и папок"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Включить ZIP-загрузку"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 - без ограничений"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Максимальный исходный размер для ZIP файлов"
 
 #: templates/index.php:7
 msgid "New"
@@ -96,7 +149,7 @@ msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "С url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -104,7 +157,7 @@ msgstr "Закачать"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Отмена закачки"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -116,24 +169,12 @@ msgstr "Название"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Поделиться"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Размер"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Изменен"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
@@ -150,8 +191,8 @@ msgstr "Файлы, которые Вы пытаетесь закачать, п
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Подождите, файлы сканируются."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Текущее сканирование"
diff --git a/l10n/ru/gallery.po b/l10n/ru/gallery.po
index cdec0268d9..34a7474dd4 100644
--- a/l10n/ru/gallery.po
+++ b/l10n/ru/gallery.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +21,48 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Рисунки"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Настройки"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -30,15 +71,11 @@ msgstr "Обновить"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Остановить"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Поделиться"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -46,16 +83,16 @@ msgstr "Назад"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Подтверждение удаления"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Вы хотите удалить альбом?"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Изменить имя альбома"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Новое имя альбома"
diff --git a/l10n/ru/media.po b/l10n/ru/media.po
index f4f92b42e0..ed56405523 100644
--- a/l10n/ru/media.po
+++ b/l10n/ru/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музыка"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Проиграть"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Пауза"
 
@@ -34,7 +38,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следующий"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index f5e3ebb05f..05b03aad0b 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
@@ -10,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -22,57 +23,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "адрес электронной почты изменён"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Неверный запрос"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
-msgstr "OpenID был изменён"
+msgstr "OpenID изменён"
+
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Неверный запрос"
 
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Язык изменён"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Русский "
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Журнал"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Ещё"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Добавить приложение"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Выберите приложение"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-лицензия"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "от"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Документация"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Управление большими файлами"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -100,11 +120,11 @@ msgstr "из доступных"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Клиенты синхронизации для рабочих станций и мобильных устройств"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Загрузка"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -172,11 +192,11 @@ msgstr "Создать"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Квота по умолчанию"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Другое"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
index e853dfa3fa..3092e784c2 100644
--- a/l10n/sk_SK/calendar.po
+++ b/l10n/sk_SK/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:21+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "Časové pásmo zmenené"
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Narodeniny"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index a28db46e37..5f8e53bfa1 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 18:38+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,23 +83,20 @@ msgstr "Chyba počas pridávania adresára."
 msgid "Error activating addressbook."
 msgstr "Chyba aktivovania adresára."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nebolo nastavené ID kontaktu."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Chyba pri nahrávaní obrázka."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Chyba pri čítaní fotky kontaktu."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Chyba pri ukladaní dočasného súboru."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
@@ -123,14 +120,46 @@ msgstr "Chýba ID kontaktu."
 msgid "Missing contact id."
 msgstr "Chýba ID kontaktu."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Žiadna fotka nebola poslaná."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Súbor neexistuje:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Chyba pri nahrávaní obrázka."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "meno elementu nie je nastavené."
@@ -147,7 +176,7 @@ msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
@@ -163,102 +192,229 @@ msgstr "Chyba aktualizácie adresára."
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla sa žiadna chyba, súbor úspešne uložené."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Pretiahnite VCF súbor pre import kontaktov."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresár sa nenašiel."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -429,6 +585,10 @@ msgstr "Nahrať novú fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Upraviť adresu"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Odoslať"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -613,27 +773,22 @@ msgstr "Importovať"
 msgid "Importing contacts"
 msgstr "Importovanie kontaktov"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontakty úspešne importované"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Zatvoriť ponuku"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importovanie adresára"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Vyberte adresár, do ktorého chcete importovať:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Pretiahnite VCF súbor pre import kontaktov."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Vyberte z pevného disku"
 
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 3bd9097321..bff7d669a1 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:12+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "Žiadna kategória pre pridanie?"
 msgid "This category already exists: "
 msgstr "Táto kategória už existuje:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Obnova Owncloud hesla"
@@ -161,15 +237,15 @@ msgstr "Server databázy"
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nastavenia"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 42e440e484..4b6d83e8ca 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:28+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Chýbajúci dočasný priečinok"
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Súbory"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Veľkosť"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Upravené"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Nastavenie správanie k súborom"
@@ -121,18 +173,6 @@ msgstr "Zdielať"
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Veľkosť"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Upravené"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Odstrániť všetko"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Odstrániť"
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index e74a7b52c1..2f6336c77c 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 18:31+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Obrázky"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "nastavenia"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Znovu oskenovať"
@@ -35,10 +75,6 @@ msgstr "Zastaviť"
 msgid "Share"
 msgstr "Zdielať"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "nastavenia"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Späť"
diff --git a/l10n/sk_SK/media.po b/l10n/sk_SK/media.po
index 523e59157b..1c692c89de 100644
--- a/l10n/sk_SK/media.po
+++ b/l10n/sk_SK/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-06 15:17+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Hudba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Prehrať"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauza"
 
@@ -34,7 +38,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Predchádzajúce"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Ďalšie"
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 28ec32ee4a..bbf5f21cce 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:32+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email zmenený"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neplatná požiadavka"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID zmenené"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neplatná požiadavka"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencované"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "od"
 
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index 3d500321bf..d4f7e0cf0d 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 11:19+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,16 +45,40 @@ msgstr "Časovni pas je bil spremenjen"
 msgid "Invalid request"
 msgstr "Neveljaven zahtevek"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Koledar"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Rojstni dan"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 8f8a78a9df..cdcf17de4e 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -84,23 +84,20 @@ msgstr "Napaka pri dodajanju imenika."
 msgid "Error activating addressbook."
 msgstr "Napaka pri aktiviranju imenika."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "ID stika ni bil poslan."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Napaka pri nalaganju slike."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Napaka pri branju slike stika."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Napaka pri shranjevanju začasne datoteke."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Slika, ki se nalaga ni veljavna."
 
@@ -124,14 +121,46 @@ msgstr "Manjka ID stika."
 msgid "Missing contact id."
 msgstr "Manjka id stika."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Pot slike ni bila poslana."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Datoteka ne obstaja:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Napaka pri nalaganju slike."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "ime elementa ni nastavljeno."
@@ -148,7 +177,7 @@ msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
@@ -164,102 +193,229 @@ msgstr "Napaka pri posodabljanju imenika."
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je bila uspešno naložena."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je bila le delno naložena"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Stiki"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Za uvoz stikov spustite VCF datoteko tukaj."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Imenik ni bil najden."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "To ni vaš imenik."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-pošta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -430,6 +586,10 @@ msgstr "Naloži novo sliko"
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Uredi naslov"
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Potrdi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -614,27 +774,22 @@ msgstr "Uvozi"
 msgid "Importing contacts"
 msgstr "Uvažam stike"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Stiki so bili uspešno uvoženi"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Zapri dialog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Uvozi imenik"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Izberite imenik v katerega boste uvažali:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Za uvoz stikov spustite VCF datoteko tukaj."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Izberi iz HD"
 
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index eea2558280..18d08e1a93 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 11:20+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Ni kategorije za dodajanje?"
 msgid "This category already exists: "
 msgstr "Ta kategorija že obstaja:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ponastavi ownCloud geslo"
@@ -162,15 +238,15 @@ msgstr "Gostitelj podatkovne zbirke"
 msgid "Finish setup"
 msgstr "Dokončaj namestitev"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nastavitve"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 9169710bee..7c9c372c04 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 11:20+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Manjka začasna mapa"
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Velikost"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Rokovanje z datotekami"
@@ -122,18 +174,6 @@ msgstr "Souporaba"
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Velikost"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Spremenjeno"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Izbriši vse"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/sl/gallery.po b/l10n/sl/gallery.po
index 9e3e07ca7f..1fe6c5af7b 100644
--- a/l10n/sl/gallery.po
+++ b/l10n/sl/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 18:08+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Slike"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Ponovno preišči"
@@ -36,10 +76,6 @@ msgstr "Stop"
 msgid "Share"
 msgstr "Deli"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Nastavitve"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Nazaj"
diff --git a/l10n/sl/media.po b/l10n/sl/media.po
index 254d97af95..f33402c979 100644
--- a/l10n/sl/media.po
+++ b/l10n/sl/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-04 08:31+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Glasba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Predvajaj"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Premor"
 
@@ -35,7 +39,7 @@ msgstr "Premor"
 msgid "Previous"
 msgstr "Prejšnja"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Naslednja"
 
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2652ed92e4..b5b8a14fb3 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 18:12+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "E-poštni naslov je bil spremenjen"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neveljaven zahtevek"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID je bil spremenjen"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neveljaven zahtevek"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "Izberite aplikacijo"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencirana"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "s strani"
 
diff --git a/l10n/sr/calendar.po b/l10n/sr/calendar.po
index 6144b6c4c4..4245b5f8f0 100644
--- a/l10n/sr/calendar.po
+++ b/l10n/sr/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Временска зона је промењена"
 msgid "Invalid request"
 msgstr "Неисправан захтев"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Посао"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Позив"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Клијенти"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Достављач"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Празници"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Идеје"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "путовање"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "јубилеј"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Састанак"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Друго"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Лично"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Пројекти"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Питања"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 8ccf3378e0..2ab147d01c 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Контакти"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Пошаљи"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 966c3dc555..a6aac06e0f 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ресетовање лозинке за Оунклауд"
@@ -160,15 +236,15 @@ msgstr "Домаћин базе"
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Подешавања"
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 3940cf3425..af2fa73a8c 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "Недостаје привремена фасцикла"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Фајлови"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Величина"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Задња измена"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Величина"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Задња измена"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
index beceed21ff..befc9958cc 100644
--- a/l10n/sr/gallery.po
+++ b/l10n/sr/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Претражи поново"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Назад"
diff --git a/l10n/sr/media.po b/l10n/sr/media.po
index e487a3d17c..49f28998de 100644
--- a/l10n/sr/media.po
+++ b/l10n/sr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Пусти"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Паузирај"
 
@@ -34,7 +38,7 @@ msgstr "Паузирај"
 msgid "Previous"
 msgstr "Претходна"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следећа"
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 3854f74607..f6582fdc74 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Неисправан захтев"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID је измењен"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Неисправан захтев"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Језик је измењен"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Изаберите програм"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-лиценциран"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "од"
 
diff --git a/l10n/sr@latin/calendar.po b/l10n/sr@latin/calendar.po
index 3a4d5f595b..cfea90215c 100644
--- a/l10n/sr@latin/calendar.po
+++ b/l10n/sr@latin/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Vremenska zona je promenjena"
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Posao"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Praznici"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "putovanje"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "jubilej"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Drugo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Lično"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index cc66bf04f1..612bae6687 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 9a4c9d2a9e..c11fdd41d6 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -160,15 +236,15 @@ msgstr "Domaćin baze"
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Podešavanja"
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 1326b77a53..1f04e28190 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "Nedostaje privremena fascikla"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fajlovi"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Veličina"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Zadnja izmena"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Zadnja izmena"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sr@latin/gallery.po b/l10n/sr@latin/gallery.po
index df212fab85..7ff467f683 100644
--- a/l10n/sr@latin/gallery.po
+++ b/l10n/sr@latin/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/sr@latin/media.po b/l10n/sr@latin/media.po
index 212ff5d5df..4bbe1bb1bc 100644
--- a/l10n/sr@latin/media.po
+++ b/l10n/sr@latin/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Pusti"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauziraj"
 
@@ -34,7 +38,7 @@ msgstr "Pauziraj"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Sledeća"
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 6d153cdb7b..cd74e98410 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neispravan zahtev"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID je izmenjen"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neispravan zahtev"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Izaberite program"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciran"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "od"
 
diff --git a/l10n/sv/calendar.po b/l10n/sv/calendar.po
index 0eb940c3a4..f8c88e6587 100644
--- a/l10n/sv/calendar.po
+++ b/l10n/sv/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Inga kalendrar funna"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Inga händelser funna."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +44,103 @@ msgstr "Tidszon ändrad"
 msgid "Invalid request"
 msgstr "Ogiltig begäran"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Ringa"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klienter"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Leverantör"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Semester"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Resa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Möte"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Annat"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Personlig"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Frågor"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Arbetet"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "Namn saknas"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +389,7 @@ msgstr "Välj aktiva kalendrar"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Dina kalendrar"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +398,15 @@ msgstr "CalDAV-länk"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Delade kalendrar"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Inga delade kalendrar"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Dela kalender"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +423,7 @@ msgstr "Radera"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "delad med dig av"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +468,23 @@ msgstr "Exportera"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Händelseinfo"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Repetera"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Deltagare"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Dela"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +496,11 @@ msgstr "Kategori"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separera kategorier med komman"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Redigera kategorier"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +621,11 @@ msgstr "Skapa en ny händelse"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Visa en händelse"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Inga kategorier valda"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +633,11 @@ msgstr "Välj kategori"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "av"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "på"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +661,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Första dagen av veckan"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +669,24 @@ msgstr "Synkroniseringsadress för CalDAV kalender:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "välj användare"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Redigerbar"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "Välj grupper"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "Gör offentlig"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index fe61cfd8bf..0de8591cea 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -45,27 +47,27 @@ msgstr "Fel när kontaktegenskap skulle läggas till"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Inget ID angett"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Fel uppstod när kontrollsumma skulle sättas."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Inga kategorier valda för borttaging"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Ingen adressbok funnen."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Inga kontakter funna."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "ID saknas"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
@@ -73,7 +75,7 @@ msgstr ""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Kan inte lägga till adressbok med ett tomt namn."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -83,29 +85,26 @@ msgstr "Fel när adressbok skulle läggas till"
 msgid "Error activating addressbook."
 msgstr "Fel uppstod när adressbok skulle aktiveras"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Inget kontakt-ID angavs."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Fel uppstod när "
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Fel uppstod när temporär fil skulle sparas."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Det laddade fotot är inte giltigt."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "ID är inte satt."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -117,18 +116,50 @@ msgstr "Fel uppstod när kontaktegenskap skulle tas bort"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontakt-ID saknas."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Saknar kontakt-ID."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Ingen sökväg till foto angavs."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Filen existerar inte."
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Fel uppstod när bild laddades."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
@@ -137,23 +168,23 @@ msgstr ""
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "kontrollsumma är inte satt."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Kan inte uppdatera adressboken med ett tomt namn."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -161,110 +192,237 @@ msgstr "Fel uppstod när adressbok skulle uppdateras"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Fel uppstod när kontakt skulle lagras."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Den uppladdade filen var bara delvist uppladdad"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ingen fil laddades upp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "En temporär mapp saknas"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Släpp en VCF-fil för att importera kontakter."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Hittade inte adressboken"
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}'s födelsedag"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -280,7 +438,7 @@ msgstr "Adressböcker"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigurera adressböcker"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -288,7 +446,7 @@ msgstr "Ny adressbok"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importera från VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -319,23 +477,23 @@ msgstr "Radera kontakt"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Släpp foto för att ladda upp"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Redigera detaljer för namn"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Smeknamn"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Ange smeknamn"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -343,19 +501,19 @@ msgstr "Födelsedag"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-åååå"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separera grupperna med kommatecken"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editera grupper"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -363,47 +521,47 @@ msgstr "Föredragen"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Vänligen ange en giltig e-postadress"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Ange e-postadress"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Posta till adress."
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Ta bort e-postadress"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Ange ett telefonnummer"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Ta bort telefonnummer"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Visa på karta"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Redigera detaljer för adress"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Lägg till noteringar här."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Lägg till fält"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profilbild"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -411,27 +569,31 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Notering"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Ta bort aktuellt foto"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Redigera aktuellt foto"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Ladda upp ett nytt foto"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Välj foto från ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Editera adress"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -474,7 +636,7 @@ msgstr "Land"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editera kategorier"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -490,15 +652,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Herr"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ingen adressbok funnen."
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
@@ -506,23 +668,23 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Fröken"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Förnamn"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Mellannamn"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Efternamn"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -546,7 +708,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Fil.dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -585,82 +747,77 @@ msgid "Submit"
 msgstr "Skicka in"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importera en kontaktfil"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Vänligen välj adressboken"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "skapa en ny adressbok"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Namn för ny adressbok"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importera"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Importerar kontakter"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Importera till adressbok:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Välj från hårddisk"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Du har inga kontakter i din adressbok."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Lägg till en kontakt"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfigurera adressböcker"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV synkningsadresser"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "mera information"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primär adress (Kontakt o.a.)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index aa826461e9..2dc7248b2f 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +23,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Programnamn har inte angetts"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategori att lägga till?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Denna kategori finns redan:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -38,7 +115,7 @@ msgstr "Owncloud lösenordsåterställning"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud lösenordsåterställning"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -103,7 +180,7 @@ msgstr "Hjälp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Åtkomst förbjuden"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -111,11 +188,11 @@ msgstr "Hittade inget moln"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Redigera kategorier"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Lägg till"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -162,15 +239,15 @@ msgstr "Databasserver"
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Inställningar"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index aacfdc05d8..60c136d611 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,39 +49,91 @@ msgstr "Saknar en tillfällig mapp"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Misslyckades spara till disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Storlek"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Ändrad"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Filhantering"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maximal storlek att lägga upp"
+msgstr "Maximal storlek att ladda upp"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. möjligt:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Krävs för nerladdning av flera mappar och filer"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Aktivera ZIP-nerladdning"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 är lika med oändligt"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Största tillåtna storlek för ZIP filer"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +149,7 @@ msgstr "Mapp"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Från webbadress"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +157,7 @@ msgstr "Ladda upp"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Avbryt uppladdning"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +169,12 @@ msgstr "Namn"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Dela"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Ladda ned"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Storlek"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Ändrad"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Ta bort"
@@ -149,8 +191,8 @@ msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Filerna skannas, var god vänta"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Aktuell avsökning"
diff --git a/l10n/sv/gallery.po b/l10n/sv/gallery.po
index c8542142b5..8af72bc519 100644
--- a/l10n/sv/gallery.po
+++ b/l10n/sv/gallery.po
@@ -5,12 +5,13 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 #   <revoltism@gmail.com>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +20,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Bilder"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Inställningar"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +70,11 @@ msgstr "Sök igen"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stoppa"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Dela"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +82,16 @@ msgstr "Tillbaka"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Vill du säkert ta bort"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Vill du ta bort albumet"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ändra albumnamnet"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Albumnamn"
diff --git a/l10n/sv/media.po b/l10n/sv/media.po
index e3cf2e1778..b5dc072040 100644
--- a/l10n/sv/media.po
+++ b/l10n/sv/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Spela"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +38,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Föregående"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Nästa"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 18a6cffa3f..557d08cbe8 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -6,12 +6,13 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
 #   <revoltism@gmail.com>, 2011, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -21,57 +22,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Epost ändrad"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ogiltig begäran"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ändrat"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ogiltig begäran"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Språk ändrades"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Logg"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mera"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Lägg till din applikation"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Välj en App"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licensierat"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "av"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentation"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Hantering av stora filer"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -99,11 +119,11 @@ msgstr "av tillgängliga"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Synkroniseringsklienter för dator och mobil"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Ladda ner"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -171,11 +191,11 @@ msgstr "Skapa"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Förvald datakvot"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Annat"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 8fd8f393f2..a55aacd870 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:16
+#: appinfo/app.php:14
 msgid "Bookmarks"
 msgstr ""
 
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index c1ec762cb1..bab1046758 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,16 +41,40 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr ""
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 84598402cd..15859a85e5 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at bugs."
+"owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,21 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br /"
+">Please upload your VCF file with the file manager and click on it to import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 18d15c38dc..46ee521dfa 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,6 +29,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -159,15 +235,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d3d0f0a57d..d38e5942c2 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,10 +47,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr ""
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -119,18 +171,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index b81b86d3c0..0cf2a7db97 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 94331c8a87..b722f87d43 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,6 +21,10 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c349a9548f..85b693c5c0 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index e79d87ac5c..85bdc87fc0 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:30+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "โซนเวลาถูกเปลี่ยนแล้ว"
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถูกต้อง"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "ปฏิทิน"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "วันเกิด"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 57e3930907..c97c27d4e9 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "เกิดข้อผิดพลาดในการเพิ่ม
 msgid "Error activating addressbook."
 msgstr "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "โหลดรูปภาพไม่ถูกต้อง"
 
@@ -123,14 +120,46 @@ msgstr "รหัสข้อมูลการติดต่อเกิดก
 msgid "Missing contact id."
 msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "ไม่พบตำแหน่งพาธของรูปภาพ"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "ไม่มีไฟล์ดังกล่าว"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "ยังไม่ได้กำหนดชื่อ"
@@ -147,7 +176,7 @@ msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณา
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
@@ -163,102 +192,229 @@ msgstr "เกิดข้อผิดพลาดในการอัพเด
 msgid "Error uploading contacts to storage."
 msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "หน่วยงาน"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "มือถือ"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "ข้อความ"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "เสียงพูด"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "ข้อความ"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "วีดีโอ"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "เพจเจอร์"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
@@ -429,6 +585,10 @@ msgstr "อัพโหลดรูปภาพใหม่"
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "แก้ไขที่อยู่"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "ส่งข้อมูล"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -613,27 +773,22 @@ msgstr "นำเข้า"
 msgid "Importing contacts"
 msgstr "นำเข้าข้อมูลการติดต่อ"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "ข้อมูลการติดต่อถูกนำเข้าข้อมูลเรียบร้อยแล้ว"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "ปิดกล่องข้อความ"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "นำเข้าข้อมูลสมุดบันทึกที่อยู่"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "เลือกจากฮาร์ดดิส"
 
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 54854376e7..43e255b71f 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:35+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "ไม่มีหมวดหมู่ที่ต้องการเ
 msgid "This category already exists: "
 msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "เปลี่ยนรหัสผ่านใน Owncloud"
@@ -161,15 +237,15 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "ตั้งค่า"
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 74001582a8..5e8c76459a 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:33+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "แฟ้มเอกสารชั่วคราวเกิดกา
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "ไฟล์"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "ขนาด"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "ปรับปรุงล่าสุด"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "การจัดกาไฟล์"
@@ -121,18 +173,6 @@ msgstr "แชร์"
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "ขนาด"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "ปรับปรุงล่าสุด"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "ลบทั้งหมด"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 277830cd2b..1a8ef7a619 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:24+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "รูปภาพ"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "ตั้งค่า"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "ตรวจสอบอีกครั้ง"
@@ -35,10 +75,6 @@ msgstr "หยุด"
 msgid "Share"
 msgstr "แชร์"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "ตั้งค่า"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "ย้อนกลับ"
diff --git a/l10n/th_TH/media.po b/l10n/th_TH/media.po
index f486a4609f..d59e3cc7c0 100644
--- a/l10n/th_TH/media.po
+++ b/l10n/th_TH/media.po
@@ -7,26 +7,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-16 17:33+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "เพลง"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "เล่น"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "หยุดชั่วคราว"
 
@@ -34,7 +38,7 @@ msgstr "หยุดชั่วคราว"
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -61,5 +65,3 @@ msgstr "อัลบั้ม"
 #: templates/music.php:39
 msgid "Title"
 msgstr "ชื่อ"
-
-
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b726c8143f..b753a75150 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:26+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "อีเมล์ถูกเปลี่ยนแล้ว"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "คำร้องขอไม่ถูกต้อง"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "เปลี่ยนชื่อบัญชี OpenID แล้ว"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "คำร้องขอไม่ถูกต้อง"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "เลือก App"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-ได้รับอนุญาติแล้ว"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "โดย"
 
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 31f3d4b68c..65932f70ee 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 11:01+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Zaman dilimi değiştirildi"
 msgid "Invalid request"
 msgstr "Geçersiz istek"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Takvim"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Doğum günü"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 462a165eb2..ca306b53c2 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Adres defteri eklenirken hata oluştu."
 msgid "Error activating addressbook."
 msgstr "Adres defteri etkinleştirilirken hata oluştu."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Bağlantı ID'si girilmedi."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "İmaj yükleme hatası."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Bağlantı fotoğrafı okunamadı."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Geçici dosya kaydetme hatası."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Yüklenecek fotograf geçerli değil."
 
@@ -123,14 +120,46 @@ msgstr "Bağlantı ID'si eksik."
 msgid "Missing contact id."
 msgstr "Eksik bağlantı id'si."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Fotoğraf girilmedi."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Dosya mevcut değil:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "İmaj yükleme hatası."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "eleman ismi atanmamış."
@@ -147,7 +176,7 @@ msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
@@ -163,102 +192,229 @@ msgstr "Adres defteri güncellenirken hata oluştu."
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Bağlantıları içe aktarmak için bir VCF dosyası bırakın."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adres defteri bulunamadı."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz değil."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "mesaj"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "İnternet"
 
@@ -429,6 +585,10 @@ msgstr "Yeni fotoğraf yükle"
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Adresi düzenle"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Gönder"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "İptal"
 
@@ -613,27 +773,22 @@ msgstr "İçe aktar"
 msgid "Importing contacts"
 msgstr "Bağlantıları içe aktar"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Bağlantılar başarıyla içe aktarıldı"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Diyaloğu kapat"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Adres defterini içeri aktar"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "İçe aktarılacak adres defterini seçin:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Bağlantıları içe aktarmak için bir VCF dosyası bırakın."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "HD'den seç"
 
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 97183a80b4..ac6e6dec29 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:54+0000\n"
-"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "Eklenecek kategori yok?"
 msgid "This category already exists: "
 msgstr "Bu kategori zaten mevcut: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud parola sıfırlama"
@@ -160,15 +236,15 @@ msgstr "Veritabanı sunucusu"
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "kontrolünüzdeki web servisleri"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ayarlar"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 3c400f699c..94f7c3d109 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 09:42+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Geçici bir klasör eksik"
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Dosyalar"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Boyut"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Değiştirilme"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dosya taşıma"
@@ -121,18 +173,6 @@ msgstr "Paylaş"
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Boyut"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Değiştirilme"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Hepsini sil"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
index 90a706647b..d13585d1eb 100644
--- a/l10n/tr/gallery.po
+++ b/l10n/tr/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:53+0000\n"
-"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Resimler"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Yeniden Tara "
@@ -35,10 +75,6 @@ msgstr "Durdur"
 msgid "Share"
 msgstr "Paylaş"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Ayarlar"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Geri"
diff --git a/l10n/tr/media.po b/l10n/tr/media.po
index 1c235dd80d..0d9a91d218 100644
--- a/l10n/tr/media.po
+++ b/l10n/tr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Müzik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Oynat"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Beklet"
 
@@ -34,7 +38,7 @@ msgstr "Beklet"
 msgid "Previous"
 msgstr "Önceki"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Sonraki"
 
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 06d49d28e2..3ffe00954d 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:55+0000\n"
-"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "eposta Değiştirildi"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Geçersiz istek"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID Değiştirildi"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Geçersiz istek"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__dil_adı__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Bir uygulama seçin"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lisanslı"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "yapan"
 
diff --git a/l10n/uk/calendar.po b/l10n/uk/calendar.po
index e4e6c62963..f2eab41a95 100644
--- a/l10n/uk/calendar.po
+++ b/l10n/uk/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Часовий пояс змінено"
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Справи"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Подзвонити"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Клієнти"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Свята"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ідеї"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Поїздка"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Ювілей"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Зустріч"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Інше"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Особисте"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Проекти"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Запитання"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Робота"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 3112261ed7..e284cb8b0f 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Помилка при додаванні адресної книги."
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 167fc45cdc..fe1c962318 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -161,15 +237,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Налаштування"
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 58f45d3ac5..4019b885f5 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr "Відсутній тимчасовий каталог"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Файли"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Розмір"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Змінено"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Розмір"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Змінено"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Видалити"
diff --git a/l10n/uk/gallery.po b/l10n/uk/gallery.po
index 12fdf9a330..a29e3a1312 100644
--- a/l10n/uk/gallery.po
+++ b/l10n/uk/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Оновити"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Назад"
diff --git a/l10n/uk/media.po b/l10n/uk/media.po
index 5f7b442b17..5df57e8565 100644
--- a/l10n/uk/media.po
+++ b/l10n/uk/media.po
@@ -6,26 +6,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:25+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr ""
 
@@ -33,7 +37,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr ""
 
@@ -60,5 +64,3 @@ msgstr ""
 #: templates/music.php:39
 msgid "Title"
 msgstr ""
-
-
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 92adb4dc7d..3e271d5055 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index 743ec435b1..5353f15cdb 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
+# 冰 蓝 <lanbing89@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 23:50+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,14 +44,38 @@ msgstr "时区已修改"
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "日历"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
@@ -450,7 +476,7 @@ msgstr "重复"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "提醒"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
@@ -607,11 +633,11 @@ msgstr "选择分类"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "在"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "在"
 
 #: templates/settings.php:14
 msgid "Timezone"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index f7e92dfd66..7d48fb931a 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +37,7 @@ msgstr "至少需要填写一项地址。"
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "试图添加重复属性： "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -44,7 +45,7 @@ msgstr "添加联系人属性错误。"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "未提供 ID"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
@@ -52,7 +53,7 @@ msgstr "设置校验值错误。"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "未选中要删除的分类。"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
@@ -68,11 +69,11 @@ msgstr "缺少 ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "无法解析如下ID的 VCard：“"
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "无法无姓名的地址簿。"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -82,25 +83,22 @@ msgstr "添加地址簿错误。"
 msgid "Error activating addressbook."
 msgstr "激活地址簿错误。"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "未提交联系人 ID。"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "加载图片错误。"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "读取联系人照片错误。"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "保存临时文件错误。"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "装入的照片不正确。"
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
@@ -122,14 +120,46 @@ msgstr "缺少联系人 ID。"
 msgid "Missing contact id."
 msgstr "缺少联系人 ID。"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "未提供照片路径。"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "文件不存在:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "加载图片错误。"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
@@ -162,102 +192,229 @@ msgstr "更新地址簿错误"
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "缺少临时目录"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "联系人"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "未找到地址簿。"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "传呼机"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "互联网"
 
@@ -318,7 +475,7 @@ msgstr "删除联系人"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "拖拽图片进行上传"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -326,7 +483,7 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "编辑名称详情"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
@@ -394,15 +551,15 @@ msgstr "编辑地址细节。"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "添加注释。"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "添加字段"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "联系人图片"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -410,7 +567,7 @@ msgstr "电话"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "注释"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -428,6 +585,10 @@ msgstr "上传新照片"
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "编辑地址"
@@ -584,7 +745,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -612,27 +773,22 @@ msgstr "导入"
 msgid "Importing contacts"
 msgstr "导入联系人"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "联系人导入成功"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "关闭对话框"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
@@ -642,15 +798,15 @@ msgstr ""
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "添加联系人"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "配置地址簿"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV 同步地址"
 
 #: templates/settings.php:4
 msgid "more info"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index e9f69c4c79..54f452ded2 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 20:53+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "没有可添加分类？"
 msgid "This category already exists: "
 msgstr "此分类已存在: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "重置 Owncloud 密码"
@@ -160,15 +236,15 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "设置"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 5d85d3c8a9..7410d7462d 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 21:07+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "缺少临时目录"
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "文件"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "大小"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "修改日期"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "文件处理"
@@ -120,18 +172,6 @@ msgstr "共享"
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "大小"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "修改日期"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "删除所有"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index f6c2a58818..23d106c760 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 20:55+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "图片"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "设置"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "重新扫描"
@@ -35,10 +75,6 @@ msgstr "停止"
 msgid "Share"
 msgstr "分享"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "设置"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "返回"
diff --git a/l10n/zh_CN/media.po b/l10n/zh_CN/media.po
index f59cf4210d..1990c3e2be 100644
--- a/l10n/zh_CN/media.po
+++ b/l10n/zh_CN/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "音乐"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "播放"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "暂停"
 
@@ -34,7 +38,7 @@ msgstr "暂停"
 msgid "Previous"
 msgstr "前一首"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "后一首"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index a9cd39e03e..c566e5d060 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "电子邮件已修改"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "非法请求"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID 已修改"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "非法请求"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "语言已修改"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "简体中文"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "日志"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "更多"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "添加应用"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "选择一个应用"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-许可证"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "由"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "文档"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "管理大文件"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "的空间，总容量为"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "桌面和移动设备同步程序"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -169,11 +189,11 @@ msgstr "创建"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "默认配额"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/zh_TW/calendar.po b/l10n/zh_TW/calendar.po
index 9f25d33271..60f1e1c802 100644
--- a/l10n/zh_TW/calendar.po
+++ b/l10n/zh_TW/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Eddy Chang <taiwanmambo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:34+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +21,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "沒有找到行事曆"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "沒有找到活動"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -42,14 +43,38 @@ msgstr "時區已變更"
 msgid "Invalid request"
 msgstr "無效請求"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "日曆"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
@@ -114,7 +139,7 @@ msgstr "工作"
 
 #: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "無名稱的"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -158,7 +183,7 @@ msgstr "由日期"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "依月份日期"
 
 #: lib/object.php:353
 msgid "by weekday"
@@ -194,7 +219,7 @@ msgstr "週日"
 
 #: lib/object.php:373
 msgid "events week of month"
-msgstr ""
+msgstr "月份中活動週"
 
 #: lib/object.php:374
 msgid "first"
@@ -274,7 +299,7 @@ msgstr "由事件日期"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr ""
+msgstr "依年份日期"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
@@ -290,7 +315,7 @@ msgstr "日期"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "行事曆"
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -363,7 +388,7 @@ msgstr "選擇一個作用中的日曆"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "你的行事曆"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -372,15 +397,15 @@ msgstr "CalDav 聯結"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "分享的行事曆"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "不分享的行事曆"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "分享行事曆"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -397,7 +422,7 @@ msgstr "刪除"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "分享給你由"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -442,11 +467,11 @@ msgstr "匯出"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "活動資訊"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "重覆中"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
@@ -470,11 +495,11 @@ msgstr "分類"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "用逗點分隔分類"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "編輯分類"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -527,11 +552,11 @@ msgstr "選擇日"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
-msgstr ""
+msgstr "以及年中的活動日"
 
 #: templates/part.eventform.php:182 templates/part.showevent.php:180
 msgid "and the events day of month."
-msgstr ""
+msgstr "以及月中的活動日"
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
@@ -543,7 +568,7 @@ msgstr "選擇週"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
-msgstr ""
+msgstr "以及年中的活動週"
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
@@ -595,11 +620,11 @@ msgstr "建立一個新事件"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "觀看一個活動"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "沒有選擇分類"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -607,11 +632,11 @@ msgstr "選擇分類"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "於"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "於"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -635,7 +660,7 @@ msgstr "12小時制"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "每週的第一天"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -663,4 +688,4 @@ msgstr "選擇群組"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "公開"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 0e0a28e549..9d49e670c5 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Eddy Chang <taiwanmambo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -60,11 +61,11 @@ msgstr ""
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "沒有找到聯絡人"
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "遺失ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
@@ -82,23 +83,20 @@ msgstr "添加電話簿中發生錯誤"
 msgid "Error activating addressbook."
 msgstr "啟用電話簿中發生錯誤"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
@@ -162,108 +192,235 @@ msgstr "電話簿更新中發生錯誤"
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "沒有已上傳的檔案"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "找不到通訊錄"
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "網際網路"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}的生日"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -279,7 +436,7 @@ msgstr "電話簿"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "設定通訊錄"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -287,7 +444,7 @@ msgstr "新電話簿"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "從VCF匯入"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -326,7 +483,7 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "編輯姓名詳細資訊"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
@@ -342,7 +499,7 @@ msgstr "生日"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-yyyy"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
@@ -350,7 +507,7 @@ msgstr "群組"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "用逗號分隔群組"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
@@ -362,7 +519,7 @@ msgstr "首選"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "註填入合法的電子郵件住址"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
@@ -370,19 +527,19 @@ msgstr "輸入電子郵件地址"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "寄送住址"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "刪除電子郵件住址"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "輸入電話號碼"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "刪除電話號碼"
 
 #: templates/part.contact.php:84
 msgid "View on map"
@@ -390,19 +547,19 @@ msgstr ""
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "電子郵件住址詳細資訊"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "在這裡新增註解"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "新增欄位"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "個人資料照片"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -410,7 +567,7 @@ msgstr "電話"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "註解"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -428,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -497,31 +658,31 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "小姐"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "博士（醫生）"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "給定名（名）"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "額外名"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "家族名（姓）"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -584,7 +745,7 @@ msgid "Submit"
 msgstr "提出"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -612,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 6a60cc71fe..5f3860d447 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:41+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "無分類添加?"
 msgid "This category already exists: "
 msgstr "此分類已經存在:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "私有雲重設密碼"
@@ -160,15 +236,15 @@ msgstr "資料庫主機"
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "網路服務已在你控制"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "登出"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "設定"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 390457c114..4af073269d 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Eddy Chang <taiwanmambo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:37+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,13 +49,65 @@ msgstr "遺失暫存資料夾"
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "檔案"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "大小"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "修改"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "檔案處理"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,23 +115,23 @@ msgstr "最大上傳容量"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "最大允許: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "針對多檔案和目錄下載是必填的"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "啟用 Zip 下載"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0代表沒有限制"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "針對ZIP檔案最大輸入大小"
 
 #: templates/index.php:7
 msgid "New"
@@ -120,18 +173,6 @@ msgstr "分享"
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "大小"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "修改"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "全部刪除"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "刪除"
@@ -148,8 +189,8 @@ msgstr "你試圖上傳的檔案已超過伺服器的最大容量限制。　"
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "正在掃描檔案，請稍等。"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "目前掃描"
diff --git a/l10n/zh_TW/gallery.po b/l10n/zh_TW/gallery.po
index b428d045e3..6f7fa99d1e 100644
--- a/l10n/zh_TW/gallery.po
+++ b/l10n/zh_TW/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:36+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "圖片"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "設定"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "重新掃描"
@@ -34,10 +74,6 @@ msgstr "停止"
 msgid "Share"
 msgstr "分享"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "設定"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "返回"
diff --git a/l10n/zh_TW/media.po b/l10n/zh_TW/media.po
index 90d3a07591..eb9a0eb114 100644
--- a/l10n/zh_TW/media.po
+++ b/l10n/zh_TW/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-18 19:51+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "音樂"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "播放"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "暫停"
 
@@ -34,7 +38,7 @@ msgstr "暫停"
 msgid "Previous"
 msgstr "上一首"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "下一首"
 
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 8f19b70306..bcbaafd6e8 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:33+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "電子郵件已變更"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "無效請求"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID 已變更"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "無效請求"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "語言已變更"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "選擇一個應用程式"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-已許可"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "由"
 
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 2161e15787..ff711e7ccc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "تم تغير العنوان البريدي",
-"Invalid request" => "طلبك غير مفهوم",
 "OpenID Changed" => "تم تغيير ال OpenID",
+"Invalid request" => "طلبك غير مفهوم",
 "Language changed" => "تم تغيير اللغة",
 "__language_name__" => "__language_name__",
 "Select an App" => "إختر تطبيقاً",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 9774883930..6e0c6e2fee 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Невалидна заявка",
 "OpenID Changed" => "OpenID е сменено",
+"Invalid request" => "Невалидна заявка",
 "Language changed" => "Езика е сменен",
 "Select an App" => "Изберете програма",
 "-licensed" => "-лицензирано",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 89558041ae..56e67c1a13 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "el correu electrònic ha canviat",
-"Invalid request" => "Sol.licitud no vàlida",
 "OpenID Changed" => "OpenID ha canviat",
+"Invalid request" => "Sol.licitud no vàlida",
 "Language changed" => "S'ha canviat l'idioma",
 "__language_name__" => "Català",
 "Log" => "Registre",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 9beb4215e0..bef172a9f5 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email změněn",
-"Invalid request" => "Chybný dotaz",
 "OpenID Changed" => "OpenID změněn",
+"Invalid request" => "Chybný dotaz",
 "Language changed" => "Jazyk byl změněn",
 "__language_name__" => "Česky",
 "Log" => "Log",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index a50aacd4cc..4cd7abfc90 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email ændret",
-"Invalid request" => "Ugyldig forespørgsel",
 "OpenID Changed" => "OpenID ændret",
+"Invalid request" => "Ugyldig forespørgsel",
 "Language changed" => "Sprog ændret",
 "__language_name__" => "Dansk",
+"Log" => "Log",
+"More" => "Mere",
+"Add your App" => "Tilføj din App",
 "Select an App" => "Vælg en App",
 "-licensed" => "-licenseret",
 "by" => "af",
+"Documentation" => "Dokumentation",
+"Managing Big Files" => "Håndter store filer",
 "Ask a question" => "Stil et spørgsmål",
 "Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
 "Go there manually." => "Gå derhen manuelt.",
 "Answer" => "Svar",
 "You use" => "Du benytter",
 "of the available" => "af det tilgængelige",
+"Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil",
+"Download" => "Download",
 "Your password got changed" => "Din adgangskode er blevet ændret",
 "Unable to change your password" => "Ude af stand til at ændre dit kodeord",
 "Current password" => "Nuværende adgangskode",
@@ -29,6 +35,8 @@
 "Password" => "Kodeord",
 "Groups" => "Grupper",
 "Create" => "Ny",
+"Default Quota" => "Standard kvote",
+"Other" => "Andet",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 6c4cbc52c6..d1659e4d18 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "E-Mail wurde geändert",
-"Invalid request" => "Ungültige Anfrage",
 "OpenID Changed" => "OpenID geändert",
+"Invalid request" => "Ungültige Anfrage",
 "Language changed" => "Sprache geändert",
 "__language_name__" => "Deutsch",
 "Log" => "Log",
@@ -18,7 +17,7 @@
 "Answer" => "Antwort",
 "You use" => "Du nutzt",
 "of the available" => "der verfügbaren",
-"Desktop and Mobile Syncing Clients" => "Desktop und mobile Syncing Clienten",
+"Desktop and Mobile Syncing Clients" => "Desktop und mobile synchronierungs Clients",
 "Download" => "Download",
 "Your password got changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
@@ -31,7 +30,7 @@
 "Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung!",
-"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden.",
+"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 44875b8ef7..3d063daa3b 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "το email άλλαξε",
-"Invalid request" => "Μη έγκυρο αίτημα",
 "OpenID Changed" => "Το OpenID άλλαξε",
+"Invalid request" => "Μη έγκυρο αίτημα",
 "Language changed" => "Η γλώσσα άλλαξε",
 "__language_name__" => "__όνομα_γλώσσας__",
 "Log" => "Αρχείο καταγραφής",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 15010b47c9..c79817a272 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "La retpoŝtadreso estas ŝanĝita",
-"Invalid request" => "Nevalida peto",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
+"Invalid request" => "Nevalida peto",
 "Language changed" => "La lingvo estas ŝanĝita",
 "__language_name__" => "Esperanto",
 "Log" => "Registro",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index adc1b5ff96..c8ddb412ec 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "correo electrónico actualizado",
-"Invalid request" => "Solicitud no válida",
 "OpenID Changed" => "OpenID cambiado",
+"Invalid request" => "Solicitud no válida",
 "Language changed" => "Idioma cambiado",
 "__language_name__" => "Castellano",
 "Log" => "Registro",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 905f02fcb7..75ba2b72f0 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "e-posti on muudetud",
-"Invalid request" => "Vigane päring",
 "OpenID Changed" => "OpenID on muudetud",
+"Invalid request" => "Vigane päring",
 "Language changed" => "Keel on muudetud",
 "__language_name__" => "Eesti",
 "Log" => "Logi",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 015746c61c..4ef58dd112 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "e-posta aldatuta",
-"Invalid request" => "Baliogabeko eskaria",
 "OpenID Changed" => "OpenID aldatuta",
+"Invalid request" => "Baliogabeko eskaria",
 "Language changed" => "Hizkuntza aldatuta",
 "__language_name__" => "Euskera",
 "More" => "Gehiago",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 745a6332a1..892de2d9ec 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "پست الکترونیکی تغییر کرد",
-"Invalid request" => "درخواست غیر قابل قبول",
 "OpenID Changed" => "OpenID تغییر کرد",
+"Invalid request" => "درخواست غیر قابل قبول",
 "Language changed" => "زبان تغییر کرد",
 "__language_name__" => "__language_name__",
 "Log" => "کارنامه",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
new file mode 100644
index 0000000000..76964b3080
--- /dev/null
+++ b/settings/l10n/fi_FI.php
@@ -0,0 +1,42 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID on vaihdettu",
+"Invalid request" => "Virheellinen pyyntö",
+"Language changed" => "Kieli on vaihdettu",
+"__language_name__" => "_kielen_nimi_",
+"Log" => "Loki",
+"More" => "Lisää",
+"Add your App" => "Lisää ohjelmasi",
+"Select an App" => "Valitse ohjelma",
+"-licensed" => "-lisenssöity",
+"by" => "henkilölle",
+"Documentation" => "Dokumentaatio",
+"Managing Big Files" => "Suurten tiedostojen hallinta",
+"Ask a question" => "Kysy jotain",
+"Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.",
+"Go there manually." => "Ohje löytyy sieltä.",
+"Answer" => "Vastaus",
+"You use" => "Olet käyttänyt",
+"of the available" => "käytettävissäsi on yhteensä",
+"Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
+"Download" => "Lataa",
+"Your password got changed" => "Salasanasi on vaihdettu",
+"Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
+"Current password" => "Nykyinen salasana",
+"New password" => "Uusi salasana",
+"show" => "näytä",
+"Change password" => "Vaihda salasana",
+"Email" => "Sähköposti",
+"Your email address" => "Sähköpostiosoitteesi",
+"Fill in an email address to enable password recovery" => "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa",
+"Language" => "Kieli",
+"Help translate" => "Auta kääntämisessä",
+"use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
+"Name" => "Nimi",
+"Password" => "Salasana",
+"Groups" => "Ryhmät",
+"Create" => "Luo",
+"Default Quota" => "Oletuskiintiö",
+"Other" => "Muu",
+"Quota" => "Kiintiö",
+"Delete" => "Poista"
+);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 33e035b89f..7e9a92f6bb 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "e-mail modifié",
-"Invalid request" => "Requête invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
+"Invalid request" => "Requête invalide",
 "Language changed" => "Langue changée",
 "__language_name__" => "Français",
 "Log" => "Journaux",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 51c5c93f58..0459d940b4 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Correo electrónico mudado",
-"Invalid request" => "Petición incorrecta",
 "OpenID Changed" => "Mudou o OpenID",
+"Invalid request" => "Petición incorrecta",
 "Language changed" => "O idioma mudou",
 "__language_name__" => "Galego",
+"Log" => "Conectar",
+"More" => "Máis",
+"Add your App" => "Engade o teu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
 "-licensed" => "-licenciado",
 "by" => "por",
+"Documentation" => "Documentación",
+"Managing Big Files" => "Xestionar Grandes Ficheiros",
 "Ask a question" => "Pregunte",
 "Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
 "Go there manually." => "Ir manualmente.",
 "Answer" => "Resposta",
 "You use" => "Vostede usa",
 "of the available" => "dun total de",
+"Desktop and Mobile Syncing Clients" => "Cliente de sincronización de escritorio e móbil",
+"Download" => "Descargar",
 "Your password got changed" => "O seu contrasinal mudou",
 "Unable to change your password" => "Incapaz de trocar o seu contrasinal",
 "Current password" => "Contrasinal actual",
@@ -29,6 +35,8 @@
 "Password" => "Contrasinal",
 "Groups" => "Grupos",
 "Create" => "Crear",
+"Default Quota" => "Cuota por omisión",
+"Other" => "Outro",
 "Quota" => "Cota",
 "Delete" => "Borrar"
 );
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 93aab932b9..39055c2139 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "בקשה לא חוקית",
 "OpenID Changed" => "OpenID השתנה",
+"Invalid request" => "בקשה לא חוקית",
 "Language changed" => "שפה השתנתה",
+"__language_name__" => "עברית",
+"Log" => "יומן",
+"More" => "עוד",
+"Add your App" => "הוספת היישום שלך",
 "Select an App" => "בחירת יישום",
 "-licensed" => "רשיון",
 "by" => "מאת",
+"Documentation" => "תיעוד",
+"Managing Big Files" => "ניהול קבצים גדולים",
 "Ask a question" => "שאל שאלה",
 "Problems connecting to help database." => "בעיות בהתחברות לבסיס נתוני העזרה",
 "Go there manually." => "גש לשם באופן ידני",
 "Answer" => "מענה",
 "You use" => "הנך משתמש ",
 "of the available" => "מתוך ",
+"Desktop and Mobile Syncing Clients" => "לקוחות סנכרון למחשב שולחני ולנייד",
+"Download" => "הורדה",
 "Your password got changed" => "הססמה שלך שונתה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
 "Current password" => "ססמה נוכחית",
 "New password" => "ססמה חדשה",
 "show" => "הצגה",
 "Change password" => "שינוי ססמה",
+"Email" => "דוא״ל",
+"Your email address" => "כתובת הדוא״ל שלך",
+"Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
 "Language" => "פה",
+"Help translate" => "עזרה בתרגום",
 "use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים",
 "Name" => "שם",
 "Password" => "ססמה",
 "Groups" => "קבוצות",
 "Create" => "יצירה",
+"Default Quota" => "מכסת בררת המחדל",
+"Other" => "אחר",
+"Quota" => "מכסה",
 "Delete" => "מחיקה"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 96181d737c..5f357a85d2 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Neispravan zahtjev",
 "OpenID Changed" => "OpenID promijenjen",
+"Invalid request" => "Neispravan zahtjev",
 "Language changed" => "Jezik promijenjen",
+"__language_name__" => "__ime_jezika__",
+"Log" => "dnevnik",
+"More" => "više",
+"Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
 "-licensed" => "-licencirano",
 "by" => "od",
+"Documentation" => "dokumentacija",
+"Managing Big Files" => "Upravljanje velikih datoteka",
 "Ask a question" => "Postavite pitanje",
 "Problems connecting to help database." => "Problem pri spajanju na bazu podataka pomoći",
 "Go there manually." => "Idite tamo ručno.",
 "Answer" => "Odgovor",
 "You use" => "Koristite",
 "of the available" => "od dostupno",
+"Desktop and Mobile Syncing Clients" => "Desktop i Mobile sinkronizaciji klijenti",
+"Download" => "preuzimanje",
 "Your password got changed" => "Vaša lozinka je promijenjena",
 "Unable to change your password" => "Nemoguće promijeniti lozinku",
 "Current password" => "Trenutna lozinka",
 "New password" => "Nova lozinka",
 "show" => "prikaz",
 "Change password" => "Izmjena lozinke",
+"Email" => "e-mail adresa",
+"Your email address" => "Vaša e-mail adresa",
+"Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
 "Language" => "Jezik",
+"Help translate" => "Pomoć prevesti",
 "use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka",
 "Name" => "Ime",
 "Password" => "Lozinka",
 "Groups" => "Grupe",
 "Create" => "Izradi",
+"Default Quota" => "standardni kvota",
+"Other" => "ostali",
+"Quota" => "kvota",
 "Delete" => "Obriši"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 704ccf7b58..7eb7772f6d 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Email megváltozott",
-"Invalid request" => "Érvénytelen kérés",
 "OpenID Changed" => "OpenID megváltozott",
+"Invalid request" => "Érvénytelen kérés",
 "Language changed" => "A nyelv megváltozott",
 "__language_name__" => "__language_name__",
 "Log" => "Napló",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index ad1360f176..7b2b631b68 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Requesta invalide",
 "OpenID Changed" => "OpenID cambiate",
+"Invalid request" => "Requesta invalide",
 "Language changed" => "Linguage cambiate",
 "__language_name__" => "Interlingua",
 "Log" => "Registro",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 4a0bd17eaf..bf35b79240 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Permintaan tidak valid",
 "OpenID Changed" => "OpenID telah dirubah",
+"Invalid request" => "Permintaan tidak valid",
 "Language changed" => "Bahasa telah diganti",
+"__language_name__" => "__language_name__",
+"Log" => "Log",
+"More" => "Lebih",
+"Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
 "-licensed" => "-terlisensi",
 "by" => "oleh",
+"Documentation" => "Dokumentasi",
+"Managing Big Files" => "Mengelola berkas besar",
 "Ask a question" => "Ajukan pertanyaan",
 "Problems connecting to help database." => "Bermasalah saat menghubungi database bantuan.",
 "Go there manually." => "Pergi kesana secara manual.",
 "Answer" => "Jawab",
 "You use" => "Anda menggunakan",
 "of the available" => "dari yang tersedia",
+"Desktop and Mobile Syncing Clients" => "Klien sync Desktop dan Mobile",
+"Download" => "Unduh",
 "Your password got changed" => "Password anda telah dirubah",
 "Unable to change your password" => "Tidak dapat merubah password anda",
 "Current password" => "Password saat ini",
 "New password" => "Password baru",
 "show" => "perlihatkan",
 "Change password" => "Rubah password",
+"Email" => "Email",
+"Your email address" => "Alamat email anda",
+"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
 "Language" => "Bahasa",
+"Help translate" => "Bantu menerjemahkan",
 "use this address to connect to your ownCloud in your file manager" => "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda",
 "Name" => "Nama",
 "Password" => "Password",
 "Groups" => "Group",
 "Create" => "Buat",
+"Default Quota" => "Kuota default",
+"Other" => "Lain-lain",
+"Quota" => "Quota",
 "Delete" => "Hapus"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 6d746e76d7..a4b255546a 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Email modificata",
-"Invalid request" => "Richiesta non valida",
 "OpenID Changed" => "OpenID modificato",
+"Invalid request" => "Richiesta non valida",
 "Language changed" => "Lingua modificata",
 "__language_name__" => "Italiano",
 "Log" => "Registro",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 6c0ce8ee15..69e5698374 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,34 +1,42 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "メールアドレスを変更しました",
-"Invalid request" => "無効なリクエストです",
 "OpenID Changed" => "OpenIDが変更されました",
+"Invalid request" => "無効なリクエストです",
 "Language changed" => "言語が変更されました",
-"__language_name__" => "Japanese(日本語)",
+"__language_name__" => "Japanese (日本語)",
+"Log" => "ログ",
+"More" => "もっと",
+"Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
-"-licensed" => "権利を保持されています",
-"by" => "によって",
+"-licensed" => "ライセンス",
+"by" => "@",
+"Documentation" => "ドキュメント",
+"Managing Big Files" => "大きなファイルを扱うには",
 "Ask a question" => "質問してください",
-"Problems connecting to help database." => "ヘルプ用データベース接続に問題が生じました",
-"Go there manually." => "手動で移動してください",
+"Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
+"Go there manually." => "手動で移動してください。",
 "Answer" => "解答",
-"You use" => "あなたが使っているのは",
-"of the available" => "です。利用可能容量は",
+"You use" => "あなたは",
+"of the available" => "を利用しています。利用可能容量：",
+"Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
+"Download" => "ダウンロード",
 "Your password got changed" => "パスワードは変更されました",
 "Unable to change your password" => "パスワードを変更することができません",
 "Current password" => "現在のパスワード",
 "New password" => "新しいパスワード",
 "show" => "表示",
-"Change password" => "パスワードを変更する",
-"Email" => "メールアドレス",
+"Change password" => "パスワードを変更",
+"Email" => "Email",
 "Your email address" => "あなたのメールアドレス",
-"Fill in an email address to enable password recovery" => "パスワードの回復を有効にするにはメールアドレスを入力してください",
+"Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です",
 "Language" => "言語",
-"Help translate" => "翻訳を手伝う",
-"use this address to connect to your ownCloud in your file manager" => "ファイルマネージャーであなたのownCloudに接続するときはこのアドレスを使用してください",
+"Help translate" => "翻訳に協力する",
+"use this address to connect to your ownCloud in your file manager" => "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください",
 "Name" => "名前",
 "Password" => "パスワード",
 "Groups" => "グループ",
 "Create" => "作成",
+"Default Quota" => "デフォルトのクォータサイズ",
+"Other" => "その他",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index cd17cba4ee..a2c1210af6 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "전자 우편 주소 변경됨",
-"Invalid request" => "잘못된 요청",
 "OpenID Changed" => "OpenID 변경됨",
+"Invalid request" => "잘못된 요청",
 "Language changed" => "언어가 변경되었습니다",
 "__language_name__" => "한국어",
 "Log" => "로그",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 30ad3947b9..29072720a0 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Ongülteg Requête",
 "OpenID Changed" => "OpenID huet geännert",
+"Invalid request" => "Ongülteg Requête",
 "Language changed" => "Sprooch huet geännert",
+"__language_name__" => "__language_name__",
+"Log" => "Log",
+"More" => "Méi",
+"Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
 "-licensed" => "-Lizenséiert",
 "by" => "vun",
+"Documentation" => "Dokumentatioun",
+"Managing Big Files" => "Grouss Fichieren verwalten",
 "Ask a question" => "Stell eng Fro",
 "Problems connecting to help database." => "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen.",
 "Go there manually." => "Gei manuell dohinner.",
 "Answer" => "Äntwert",
 "You use" => "Du benotz",
 "of the available" => "vun den disponibelen",
+"Desktop and Mobile Syncing Clients" => "Desktop an Mobile Syncing Clienten",
+"Download" => "Download",
 "Your password got changed" => "Däin Passwuert ass geännert ginn",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
 "New password" => "Neit Passwuert",
 "show" => "weisen",
 "Change password" => "Passwuert änneren",
+"Email" => "Email",
+"Your email address" => "Deng Email Adress",
+"Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
 "Language" => "Sprooch",
+"Help translate" => "Hëllef iwwersetzen",
 "use this address to connect to your ownCloud in your file manager" => "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen",
 "Name" => "Numm",
 "Password" => "Passwuert",
 "Groups" => "Gruppen",
 "Create" => "Erstellen",
+"Default Quota" => "Standard Quota",
+"Other" => "Aner",
+"Quota" => "Quota",
 "Delete" => "Läschen"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 3fd97c1388..504217a9db 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,16 +1,20 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "el. paštas pakeistas",
-"Invalid request" => "Klaidinga užklausa",
 "OpenID Changed" => "OpenID pakeistas",
+"Invalid request" => "Klaidinga užklausa",
 "Language changed" => "Kalba pakeista",
 "__language_name__" => "Kalba",
+"Log" => "Žurnalas",
+"More" => "Daugiau",
+"Add your App" => "Pridėti programėlę",
 "Select an App" => "Pasirinkite programą",
 "-licensed" => "-licencijuota",
+"Documentation" => "Dokumentacija",
 "Ask a question" => "Užduoti klausimą",
 "Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
 "Answer" => "Atsakyti",
 "You use" => "Jūs naudojate",
 "of the available" => "iš galimų",
+"Download" => "Atsisiųsti",
 "Your password got changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
 "Current password" => "Dabartinis slaptažodis",
@@ -27,6 +31,8 @@
 "Password" => "Slaptažodis",
 "Groups" => "Grupės",
 "Create" => "Sukurti",
+"Default Quota" => "Numatytoji kvota",
+"Other" => "Kita",
 "Quota" => "Limitas",
 "Delete" => "Ištrinti"
 );
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index bf24e9e44b..4a61ba9d51 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "е-пошта е сменета",
-"Invalid request" => "неправилно барање",
 "OpenID Changed" => "OpenID сменето",
+"Invalid request" => "неправилно барање",
 "Language changed" => "Јазикот е сменет",
 "__language_name__" => "__language_name__",
 "Log" => "Записник",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index e763f76245..f0fba7a7c0 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Emel berubah",
-"Invalid request" => "Permintaan tidak sah",
 "OpenID Changed" => "OpenID ditukar",
+"Invalid request" => "Permintaan tidak sah",
 "Language changed" => "Bahasa ditukar",
 "__language_name__" => "_nama_bahasa_",
 "Select an App" => "Pilih aplikasi",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 8a633ef431..1379bb9c2e 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Epostadresse endret",
-"Invalid request" => "Ugyldig forespørsel",
 "OpenID Changed" => "OpenID endret",
+"Invalid request" => "Ugyldig forespørsel",
 "Language changed" => "Språk endret",
 "__language_name__" => "__language_name__",
 "Log" => "Logg",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index cca0067a2d..939907ef71 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "mailadres aangepast",
-"Invalid request" => "Ongeldig verzoek",
 "OpenID Changed" => "OpenID is aangepast",
+"Invalid request" => "Ongeldig verzoek",
 "Language changed" => "Taal aangepast",
 "__language_name__" => "Nederlands",
 "Log" => "Log",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 8b7adcd3b5..87c9cecb24 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "epost endra",
-"Invalid request" => "Ugyldig førespurnad",
 "OpenID Changed" => "OpenID endra",
+"Invalid request" => "Ugyldig førespurnad",
 "Language changed" => "Språk endra",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index a3603bcbc6..d9dac06c00 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "zmieniono adres e-mail",
-"Invalid request" => "Nieprawidłowe żądanie",
 "OpenID Changed" => "Zmieniono OpenID",
+"Invalid request" => "Nieprawidłowe żądanie",
 "Language changed" => "Język zmieniony",
 "__language_name__" => "Polski",
+"Log" => "Log",
+"More" => "Więcej",
+"Add your App" => "Dodaj aplikacje",
 "Select an App" => "Zaznacz aplikacje",
 "-licensed" => "-licencjonowany",
 "by" => "przez",
+"Documentation" => "Dokumentacja",
+"Managing Big Files" => "Zarządzanie dużymi plikami",
 "Ask a question" => "Zadaj pytanie",
 "Problems connecting to help database." => "Problem z połączeniem z bazą danych.",
 "Go there manually." => "Przejdź na stronę ręcznie.",
 "Answer" => "Odpowiedź",
 "You use" => "Używane",
 "of the available" => "z dostępnych",
+"Desktop and Mobile Syncing Clients" => "Klienci synchronizacji",
+"Download" => "Ściągnij",
 "Your password got changed" => "Zmieniono hasło",
 "Unable to change your password" => "Nie można zmienić hasła",
 "Current password" => "Bieżące hasło",
@@ -29,6 +35,8 @@
 "Password" => "Hasło",
 "Groups" => "Grupy",
 "Create" => "Utwórz",
+"Default Quota" => "Domyślny udział",
+"Other" => "Inne",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 51b99382a4..35cf507194 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email Alterado",
-"Invalid request" => "Pedido inválido",
 "OpenID Changed" => "Mudou OpenID",
+"Invalid request" => "Pedido inválido",
 "Language changed" => "Mudou Idioma",
 "__language_name__" => "Português",
 "Log" => "Log",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 20eaa7324d..af7088daa1 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "endereço de email alterado",
-"Invalid request" => "Pedido inválido",
 "OpenID Changed" => "OpenID alterado",
+"Invalid request" => "Pedido inválido",
 "Language changed" => "Idioma alterado",
 "__language_name__" => "__language_name__",
+"Log" => "Log",
+"More" => "Mais",
+"Add your App" => "Adicione a sua aplicação",
 "Select an App" => "Selecione uma aplicação",
 "-licensed" => "-licenciado",
 "by" => "por",
+"Documentation" => "Documentação",
+"Managing Big Files" => "Gestão de ficheiros grandes",
 "Ask a question" => "Coloque uma questão",
 "Problems connecting to help database." => "Problemas ao conectar à base de dados de ajuda",
 "Go there manually." => "Vá lá manualmente",
 "Answer" => "Resposta",
 "You use" => "Está a usar",
 "of the available" => "do disponível",
+"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e movel",
+"Download" => "Transferir",
 "Your password got changed" => "A sua palavra-chave foi alterada",
 "Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
 "Current password" => "Palavra-chave atual",
@@ -29,6 +35,8 @@
 "Password" => "Palavra-chave",
 "Groups" => "Grupos",
 "Create" => "Criar",
+"Default Quota" => "Quota por defeito",
+"Other" => "Outro",
 "Quota" => "Quota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 9a7510d12c..1b69b7a84f 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email schimbat",
-"Invalid request" => "Cerere eronată",
 "OpenID Changed" => "OpenID schimbat",
+"Invalid request" => "Cerere eronată",
 "Language changed" => "Limba a fost schimbată",
 "__language_name__" => "_language_name_",
+"Log" => "Jurnal de activitate",
+"More" => "Mai mult",
+"Add your App" => "Adaugă aplicația ta",
 "Select an App" => "Selectează o aplicație",
 "-licensed" => "-autorizat",
 "by" => "de",
+"Documentation" => "Documetație",
+"Managing Big Files" => "Gestionînd fișiere mari",
 "Ask a question" => "Întreabă",
 "Problems connecting to help database." => "Probleme de conectare la baza de date.",
 "Go there manually." => "Pe cale manuală.",
 "Answer" => "Răspuns",
 "You use" => "Utilizezi",
 "of the available" => "din cele diponibile",
+"Desktop and Mobile Syncing Clients" => "Clienți de sincronizare pentru telefon mobil și desktop",
+"Download" => "Descărcări",
 "Your password got changed" => "Parola ta s-a schimbat",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
 "Current password" => "Parola curentă",
@@ -29,6 +35,8 @@
 "Password" => "Parolă",
 "Groups" => "Grupuri",
 "Create" => "Crează",
+"Default Quota" => "Cotă implicită",
+"Other" => "Altele",
 "Quota" => "Cotă",
 "Delete" => "Șterge"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index dfe75e5e52..4ab514815c 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "адрес электронной почты изменён",
+"OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
-"OpenID Changed" => "OpenID был изменён",
 "Language changed" => "Язык изменён",
 "__language_name__" => "Русский ",
+"Log" => "Журнал",
+"More" => "Ещё",
+"Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
 "-licensed" => "-лицензия",
 "by" => "от",
+"Documentation" => "Документация",
+"Managing Big Files" => "Управление большими файлами",
 "Ask a question" => "Задать вопрос",
 "Problems connecting to help database." => "Проблема соединения с базой данных помощи.",
 "Go there manually." => "Войти самостоятельно.",
 "Answer" => "Ответ",
 "You use" => "Вы используете",
 "of the available" => "из доступных",
+"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации для рабочих станций и мобильных устройств",
+"Download" => "Загрузка",
 "Your password got changed" => "Ваш пароль был изменён",
 "Unable to change your password" => "Невозможно сменить пароль",
 "Current password" => "Текущий пароль",
@@ -29,6 +35,8 @@
 "Password" => "Пароль",
 "Groups" => "Группы",
 "Create" => "Создать",
+"Default Quota" => "Квота по умолчанию",
+"Other" => "Другое",
 "Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index e465a149cf..fe755aecb4 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email zmenený",
-"Invalid request" => "Neplatná požiadavka",
 "OpenID Changed" => "OpenID zmenené",
+"Invalid request" => "Neplatná požiadavka",
 "Language changed" => "Jazyk zmenený",
 "__language_name__" => "Slovensky",
 "Log" => "Záznam",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index b83a3f343e..58afe21f45 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "E-poštni naslov je bil spremenjen",
-"Invalid request" => "Neveljaven zahtevek",
 "OpenID Changed" => "OpenID je bil spremenjen",
+"Invalid request" => "Neveljaven zahtevek",
 "Language changed" => "Jezik je bil spremenjen",
 "__language_name__" => "__ime_jezika__",
 "Log" => "Dnevnik",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index c1e24be67c..7dede8fdc7 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Неисправан захтев",
 "OpenID Changed" => "OpenID је измењен",
+"Invalid request" => "Неисправан захтев",
 "Language changed" => "Језик је измењен",
 "Select an App" => "Изаберите програм",
 "-licensed" => "-лиценциран",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 8638a6436b..0229a76361 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Neispravan zahtev",
 "OpenID Changed" => "OpenID je izmenjen",
+"Invalid request" => "Neispravan zahtev",
 "Language changed" => "Jezik je izmenjen",
 "Select an App" => "Izaberite program",
 "-licensed" => "-licenciran",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 52dd29c56b..40a370aabe 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Epost ändrad",
-"Invalid request" => "Ogiltig begäran",
 "OpenID Changed" => "OpenID ändrat",
+"Invalid request" => "Ogiltig begäran",
 "Language changed" => "Språk ändrades",
 "__language_name__" => "__language_name__",
+"Log" => "Logg",
+"More" => "Mera",
+"Add your App" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
 "-licensed" => "-licensierat",
 "by" => "av",
+"Documentation" => "Dokumentation",
+"Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
 "Problems connecting to help database." => "Problem med att ansluta till hjälp-databasen.",
 "Go there manually." => "Gå dit manuellt",
 "Answer" => "Svar",
 "You use" => "Du använder",
 "of the available" => "av tillgängliga",
+"Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
+"Download" => "Ladda ner",
 "Your password got changed" => "Ditt lösenord ändrades",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
@@ -29,6 +35,8 @@
 "Password" => "Lösenord",
 "Groups" => "Grupper",
 "Create" => "Skapa",
+"Default Quota" => "Förvald datakvot",
+"Other" => "Annat",
 "Quota" => "Kvot",
 "Delete" => "Ta bort"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 47c20bd911..5b744cb6be 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "อีเมล์ถูกเปลี่ยนแล้ว",
-"Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
+"Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
 "__language_name__" => "ภาษาไทย",
 "Log" => "บันทึกการเปลี่ยนแปลง",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 8c065575e9..01ad142a3d 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "eposta Değiştirildi",
-"Invalid request" => "Geçersiz istek",
 "OpenID Changed" => "OpenID Değiştirildi",
+"Invalid request" => "Geçersiz istek",
 "Language changed" => "Dil değiştirildi",
 "__language_name__" => "__dil_adı__",
 "Log" => "Günlük",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 9e89be0dcb..d274b372ee 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "电子邮件已修改",
-"Invalid request" => "非法请求",
 "OpenID Changed" => "OpenID 已修改",
+"Invalid request" => "非法请求",
 "Language changed" => "语言已修改",
 "__language_name__" => "简体中文",
+"Log" => "日志",
+"More" => "更多",
+"Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
 "-licensed" => "-许可证",
 "by" => "由",
+"Documentation" => "文档",
+"Managing Big Files" => "管理大文件",
 "Ask a question" => "提问",
 "Problems connecting to help database." => "连接帮助数据库错误 ",
 "Go there manually." => "手动访问",
 "Answer" => "回答",
 "You use" => "您使用了",
 "of the available" => "的空间，总容量为",
+"Desktop and Mobile Syncing Clients" => "桌面和移动设备同步程序",
+"Download" => "下载",
 "Your password got changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
 "Current password" => "当前密码",
@@ -29,6 +35,8 @@
 "Password" => "密码",
 "Groups" => "组",
 "Create" => "创建",
+"Default Quota" => "默认配额",
+"Other" => "其它",
 "Quota" => "配额",
 "Delete" => "删除"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 2132bef03e..aeb1db4871 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "電子郵件已變更",
-"Invalid request" => "無效請求",
 "OpenID Changed" => "OpenID 已變更",
+"Invalid request" => "無效請求",
 "Language changed" => "語言已變更",
 "__language_name__" => "__語言_名稱__",
 "Log" => "紀錄",

From 80de23d08b8021709adceac626bbac5aab45d86a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 23:58:46 +0200
Subject: [PATCH 0177/1537] Contacts: Removed temp dir cleanup after using
 OC_Cache.

---
 apps/contacts/ajax/cleanupphoto.php | 37 -----------------------------
 apps/contacts/js/contacts.js        | 17 +------------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 apps/contacts/ajax/cleanupphoto.php

diff --git a/apps/contacts/ajax/cleanupphoto.php b/apps/contacts/ajax/cleanupphoto.php
deleted file mode 100644
index 2bb4bd6584..0000000000
--- a/apps/contacts/ajax/cleanupphoto.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- */
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
-
-// give some time to save the photo
-sleep(5);
-
-if($tmp_path != '' && file_exists($tmp_path) && !is_dir($tmp_path) && dirname($tmp_path)==get_temp_dir()) {
-	unlink($tmp_path);
-	OCP\JSON::success();
-	exit();
-} else {
-	error_log('Couldn\'t find: '.$tmp_path);
-	OCP\JSON::error();
-}
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 8b9a80c952..458c9ab8fc 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -135,13 +135,7 @@ Contacts={
 			
 			/* Initialize the photo edit dialog */
 			$('#edit_photo_dialog').dialog({ 
-				autoOpen: false, 
-				modal: true, 
-				height: 'auto', width: 'auto',
-				beforeClose: function(event, ui) {
-					Contacts.UI.Card.cleanupPhoto(this);
-					return true;
-				}
+				autoOpen: false, modal: true, height: 'auto', width: 'auto'
 			});
 			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
 				{
@@ -1199,15 +1193,6 @@ Contacts={
 				});
 				Contacts.UI.Contacts.refreshThumbnail(this.id);
 			},
-			cleanupPhoto:function(){
-				var tmp_path = $('#cropform').find('#tmp_path').val();
-				console.log('Trying to remove: ' + tmp_path);
-				$.post(OC.filePath('contacts', 'ajax', 'cleanupphoto.php'), {tmp_path: tmp_path}, function(data){
-					if(data.status != 'success'){
-						console.log('Error deleting ' + tmp_path);
-					}
-				});
-			},
 			addMail:function() {
 				//alert('addMail');
 				$('#emaillist li.template:first-child').clone(true).appendTo($('#emaillist')).show().find('a .tip').tipsy();

From 624f8ae36dc7f61db07da30644e2ca88b0a0de5e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 00:22:03 +0200
Subject: [PATCH 0178/1537] Also use OC_Cache here.

---
 apps/contacts/ajax/oc_photo.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 184217f2b7..ea25ebf176 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -20,8 +20,6 @@
  *
  */
 // Check if we are a user
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 function bailOut($msg) {
@@ -29,9 +27,6 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::ERROR);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::DEBUG);
-}
 
 if(!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
@@ -42,31 +37,30 @@ if(!isset($_GET['path'])) {
 }
 
 $localpath = OC_Filesystem::getLocalFile($_GET['path']);
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
+$tmpkey = 'contact-photo-'.$_GET['id'];
 
 if(!file_exists($localpath)) {
 	bailOut(OC_Contacts_App::$l10n->t('File doesn\'t exist:').$localpath);
 }
-file_put_contents($tmpfname, file_get_contents($localpath));
 
 $image = new OC_Image();
 if(!$image) {
 	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
 }
-if(!$image->loadFromFile($tmpfname)) {
+if(!$image->loadFromFile($localpath)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
 }
 if($image->width() > 400 || $image->height() > 400) {
 	$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 }
 if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-	debug('Couldn\'t save correct image orientation: '.$tmpfname);
+	OCP\Util::writeLog('contacts','ajax/oc_photo.php: Couldn\'t save correct image orientation: '.$localpath, OCP\Util::DEBUG);
 }
-if($image->save($tmpfname)) {
-	OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname)));
+if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+	OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
 	exit();
 } else {
-	bailOut('Couldn\'t save temporary image: '.$tmpfname);
+	bailOut('Couldn\'t save temporary image: '.$tmpkey);
 }
 
 ?>

From 68670bcc66603540e39c055b8fe8c6a75055b5b0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 00:26:21 +0200
Subject: [PATCH 0179/1537] Cleanup.

---
 apps/contacts/ajax/addcontact.php     | 17 +----------------
 apps/contacts/ajax/addproperty.php    |  3 ---
 apps/contacts/ajax/contactdetails.php | 14 --------------
 apps/contacts/ajax/cropphoto.php      |  4 ----
 apps/contacts/ajax/deletebook.php     |  3 ---
 apps/contacts/ajax/deletecard.php     |  3 ---
 apps/contacts/ajax/deleteproperty.php |  3 ---
 apps/contacts/ajax/editname.php       |  5 +----
 apps/contacts/ajax/loadcard.php       | 14 --------------
 apps/contacts/ajax/loadphoto.php      |  7 -------
 apps/contacts/ajax/saveproperty.php   | 12 ------------
 apps/contacts/ajax/uploadimport.php   |  5 -----
 12 files changed, 2 insertions(+), 88 deletions(-)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index ee451098f1..af9b2bbcc0 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -20,25 +20,10 @@
  *
  */
 
-// Init owncloud
- 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG);
-}
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.$element);
-}
-
 $aid = isset($_POST['aid'])?$_POST['aid']:null;
 if(!$aid) {
 	$aid = min(OC_Contacts_Addressbook::activeIds()); // first active addressbook.
@@ -54,7 +39,7 @@ $vcard->setUID();
 $vcard->setString('FN',$fn);
 $vcard->setString('N',$n);
 
-$id = OC_Contacts_VCard::add($aid,$vcard, null, $isnew);
+$id = OC_Contacts_VCard::add($aid, $vcard, null, $isnew);
 if(!$id) {
 	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
 	OCP\Util::writeLog('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR);
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index bf23df6758..4668c0d3a6 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index 657dc5d586..a6ca10f9c9 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -19,8 +19,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-// Init owncloud
  
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
@@ -42,18 +40,6 @@ if(is_null($vcard)) {
 }
 $details = OC_Contacts_VCard::structureContact($vcard);
 
-// Some Google exported files have no FN field.
-/*if(!isset($details['FN'])) {
-	$fn = '';
-	if(isset($details['N'])) {
-		$details['FN'] = array(implode(' ', $details['N'][0]['value']));
-	} elseif(isset($details['EMAIL'])) {
-		$details['FN'] = array('value' => $details['EMAIL'][0]['value']);
-	} else {
-		$details['FN'] = array('value' => OC_Contacts_App::$l10n->t('Unknown'));
-	}
-}*/
-
 // Make up for not supporting the 'N' field in earlier version.
 if(!isset($details['N'])) {
 	$details['N'] = array();
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
index 63c9eb8f2d..caba7c8c4e 100644
--- a/apps/contacts/ajax/cropphoto.php
+++ b/apps/contacts/ajax/cropphoto.php
@@ -20,16 +20,12 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
 $tmpkey = $_GET['tmpkey'];
 $id = $_GET['id'];
-//OCP\Util::writeLog('contacts','ajax/cropphoto.php: tmpkey: '.$tmpkey.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
 $tmpl = new OCP\Template("contacts", "part.cropphoto");
 $tmpl->assign('tmpkey', $tmpkey);
 $tmpl->assign('id', $id);
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
index bcf6aa4432..fe582daa00 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
index 46fd8252d4..6414fda93c 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -25,9 +25,6 @@ function bailOut($msg) {
 	exit();
 }
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 9bb1208cdd..b0746d18a7 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 9ba280ae54..d06d416b7e 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -14,14 +14,11 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG);
-}
 
 $tmpl = new OCP\Template("contacts", "part.edit_name_dialog");
 
 $id = isset($_GET['id'])?$_GET['id']:'';
-debug('id: '.$id);
+
 if($id) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
 	$name = array('', '', '', '', '');
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index 4e6f2206fe..fbb831f4a1 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -20,20 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG);
-}
-// foreach ($_POST as $key=>$element) {
-// 	debug('_POST: '.$key.'=>'.$element);
-// }
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
index ef429e8289..eac7ca7d02 100644
--- a/apps/contacts/ajax/loadphoto.php
+++ b/apps/contacts/ajax/loadphoto.php
@@ -19,24 +19,17 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
  
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-// foreach ($_POST as $key=>$element) {
-// 	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
-// }
-
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	OCP\Util::writeLog('contacts','ajax/loadphoto.php: '.$msg, OCP\Util::DEBUG);
 	exit();
 }
 
-$image = null;
-
 $id = isset($_GET['id']) ? $_GET['id'] : '';
 $refresh = isset($_GET['refresh']) ? true : false;
 
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 6509ac21f2..8409ffe47f 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
@@ -35,21 +32,12 @@ function bailOut($msg) {
 function debug($msg) {
 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
 }
-// foreach ($_POST as $key=>$element) {
-// 	debug('_POST: '.$key.'=>'.print_r($element, true));
-// }
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
 $value = isset($_POST['value'])?$_POST['value']:null;
 $parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
 $checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
-// if(!is_null($parameters)) {
-// 	debug('parameters: '.count($parameters));
-// 	foreach($parameters as $key=>$val ) {
-// 		debug('parameter: '.$key.'=>'.implode('/',$val));
-// 	}
-// }
 
 if(!$name) {
 	bailOut(OC_Contacts_App::$l10n->t('element name is not set.'));
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index b11f380fa8..463ca161e5 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -28,9 +28,6 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::ERROR);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::DEBUG);
-}
 
 $view = OCP\Files::getStorage('contacts');
 $tmpfile = md5(rand());
@@ -39,7 +36,6 @@ $tmpfile = md5(rand());
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
 if($fn) {
 	if($view->file_put_contents('/'.$tmpfile, file_get_contents('php://input'))) {
-		debug($fn.' uploaded');
 		OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
 		exit();
 	} else {
@@ -70,7 +66,6 @@ $file=$_FILES['importfile'];
 $tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
 	if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) {
-		debug($fn.' uploaded');
 		OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
 	} else {
 		bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));

From fce614b82c61a0d2e45ffe05bbe030d842f3ca16 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 01:04:59 +0200
Subject: [PATCH 0180/1537] Less aggressive caching on thumbnails too.

---
 apps/contacts/thumbnail.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 5b340042a2..da4e930f3e 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -20,14 +20,12 @@
  *
  */
 
-// Init owncloud
-
 OCP\JSON::checkLoggedIn();
 //OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 
 function getStandardImage(){
-	OCP\Response::setExpiresHeader('P10D');
+	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person.png'));
 }
@@ -59,12 +57,10 @@ $image = new OC_Image();
 $photo = $contact->getAsString('PHOTO');
 if($photo) {
 	OCP\Response::setETagHeader(md5($photo));
-
 	if($image->loadFromBase64($photo)) {
 		if($image->centerCrop()) {
 			if($image->resize($thumbnail_size)) {
 				if($image->show()) {
-					// done
 					exit();
 				} else {
 					OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OCP\Util::ERROR);

From 6abe8f9e2e6e11304b22085157674023cd1c185b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 6 Jun 2012 10:40:22 +0200
Subject: [PATCH 0181/1537] fixed wrong function call

---
 apps/gallery/ajax/galleryOp.php | 2 +-
 apps/gallery/ajax/sharing.php   | 4 ++--
 apps/gallery/lib/album.php      | 2 +-
 apps/gallery/lib/photo.php      | 2 +-
 apps/gallery/lib/scanner.php    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index b49e52f0bd..7cbe3e46e2 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -42,7 +42,7 @@ function handleRemove($name) {
 
 function handleGetThumbnails($albumname) {
   OCP\Response::enableCaching(3600 * 24); // 24 hour
-  $view = OCP\App::getStorage('gallery');
+  $view = OCP\Files::getStorage('gallery');
   $thumbnail = $view->fopen(urldecode($albumname).'.png', 'r');
   header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
   OCP\Response::sendFile($thumbnail);
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
index 304757b9e9..7134d19e78 100644
--- a/apps/gallery/ajax/sharing.php
+++ b/apps/gallery/ajax/sharing.php
@@ -80,7 +80,7 @@ function handleGetThumbnail($token, $imgpath) {
 function handleGetAlbumThumbnail($token, $albumname)
 {
   $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $view = OCP\App::getStorage('gallery');
+  $view = OCP\Files::getStorage('gallery');
   $file = $view->fopen($albumname.'.png', 'r');
   $image = new OC_Image($file);
   if ($image->valid()) {
@@ -94,7 +94,7 @@ function handleGetAlbumThumbnail($token, $albumname)
 
 function handleGetPhoto($token, $photo) {
   $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $view = OCP\App::getStorage('files');
+  $view = OCP\Files::getStorage('files');
   $file = $view->fopen(urldecode($photo), 'r');
   header('Content-Type: '.OC_Image::getMimeTypeForFile($file));
   OCP\Response::sendFile($file);
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 8ac27b1a70..39d6d3aded 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -90,7 +90,7 @@ class OC_Gallery_Album {
 	}
 
 	public static function changeThumbnailPath($oldname, $newname) {
-		$view = OCP\App::getStorage('gallery');
+		$view = OCP\Files::getStorage('gallery');
 		$view->rename($oldname.'.png', $newname.'.png');
 	}
 
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index b4b37236b0..f9527cb5fd 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -68,7 +68,7 @@ class OC_Gallery_Photo {
 
 	public static function getThumbnail($image_name, $owner = null) {
 		if (!$owner) $owner = OCP\USER::getUser();
-		$view = OCP\App::getStorage('gallery');
+		$view = OCP\Files::getStorage('gallery');
 		$save_dir = dirname($image_name);
 		if (!$view->is_dir($save_dir)) {
 			$view->mkdir($save_dir);
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index e11ba1da45..233fa20bca 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -81,7 +81,7 @@ class OC_Gallery_Scanner {
 				$image->destroy();
 			}
 		}
-		$view = OCP\App::getStorage('gallery');
+		$view = OCP\Files::getStorage('gallery');
 		imagepng($thumbnail, $view->getLocalFile($albumName.'.png'));
 		imagedestroy($thumbnail);
 	}

From ca0108aabf0c922d44c0a9ae984e479278909bcb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 11:46:11 +0200
Subject: [PATCH 0182/1537] Corrected typos.

---
 apps/calendar/ajax/share/share.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
index 3ce2bf1e21..629a7b6b79 100644
--- a/apps/calendar/ajax/share/share.php
+++ b/apps/calendar/ajax/share/share.php
@@ -13,7 +13,7 @@ switch($idtype){
 	case 'event':
 		break;
 	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
+		OCP\JSON::error(array('message'=>'unexpected parameter'));
 		exit;
 }
 if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
@@ -32,7 +32,7 @@ switch($sharetype){
 	case 'public':
 		break;
 	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
+		OCP\JSON::error(array('message'=>'unexpected parameter'));
 		exit;
 }
 if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
@@ -44,7 +44,7 @@ if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
 	exit;
 }
 if($sharetype == 'user' && OCP\USER::getUser() == $sharewith){
-	OCP\JSON::error(array('meesage'=>'you can not share with yourself'));
+	OCP\JSON::error(array('message'=>'you can not share with yourself'));
 }
 $success = OC_Calendar_Share::share(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
 if($success){

From 190fca1121d4b37d7c4b2f96204daf7d8d0dded6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 6 Jun 2012 12:29:48 +0200
Subject: [PATCH 0183/1537] LDPA: don't drop legal whitespaces when sanitizing
 DN. Fixes oc-914

---
 apps/user_ldap/lib_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index b900a67ec3..f6942ad326 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -530,7 +530,7 @@ class OC_LDAP {
 
 	static private function sanitizeDN($dn) {
 		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
-		$dn = preg_replace('/,\s+/',',',$dn);
+		$dn = preg_replace('/([^\\\]),(\s+)/','\1,',$dn);
 
 		//make comparisons and everything work
 		$dn = strtolower($dn);

From 2ddb72bb58eac5d5cfb97d50a15069d2ed18a898 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 6 Jun 2012 14:18:30 +0200
Subject: [PATCH 0184/1537] fix wrong documentation

---
 lib/mail.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/mail.php b/lib/mail.php
index b46f73bd94..7343f5f0d9 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -88,19 +88,8 @@ class OC_Mail {
 
 
 	/**
-	 * sending a mail based on a template
+	 * return the footer for a mail
 	 *
-	 * @param texttemplate $texttemplate
-	 * @param htmltemplate $htmltemplate
-	 * @param data $data
-	 * @param To $toaddress
-	 * @param ToName $toname
-	 * @param Subject $subject
-	 * @param From $fromaddress
-	 * @param FromName $fromname
-	 * @param ccaddress $ccaddress
-	 * @param ccname $ccname
-	 * @param bcc $bcc
 	 */
 	public static function getfooter() {
 

From ed950e3ba2a0fcce09cd101a547b1818094d0de5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 13:18:33 +0200
Subject: [PATCH 0185/1537] Correct mime type.

---
 apps/contacts/export.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 4e4ade2f2b..f84a10c138 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -23,7 +23,7 @@ if(isset($bookid)){
 	}
 }elseif(isset($contactid)){
 	$data = OC_Contacts_App::getContactObject($contactid);
-	header('Content-Type: text/directory');
+	header('Content-Type: text/vcard');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
 }

From 5c17338ac7e59889dec6fbddd511c1271176bcad Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 15:28:39 +0200
Subject: [PATCH 0186/1537] Contacts: Make js a tad DRYer. Added URL property.

---
 apps/contacts/ajax/addproperty.php       |  2 +-
 apps/contacts/ajax/saveproperty.php      | 13 ++----
 apps/contacts/js/contacts.js             | 58 +++++++++++-------------
 apps/contacts/templates/part.contact.php |  3 ++
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 4668c0d3a6..2f932d752a 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -33,7 +33,7 @@ $vcard = OC_Contacts_App::getContactVCard($id);
 
 if(!is_array($value)){
 	$value = trim($value);
-	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'NICKNAME', 'NOTE'))) {
+	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))) {
 		OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add empty property.'))));
 		exit();
 	}
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 8409ffe47f..d840073471 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -98,15 +98,6 @@ if(!$value) {
 } else {
 	/* setting value */
 	switch($element) {
-		case 'BDAY':
-		case 'FN':
-		case 'N':
-		case 'ORG':
-		case 'NOTE':
-		case 'NICKNAME':
-			debug('Setting string:'.$name.' '.$value);
-			$vcard->setString($name, $value);
-			break;
 		case 'CATEGORIES':
 			debug('Setting string:'.$name.' '.$value);
 			$vcard->children[$line]->setValue($value);
@@ -128,6 +119,10 @@ if(!$value) {
 				}
 			}
 			break;
+		default:
+			debug('Setting string:'.$name.' '.$value);
+			$vcard->setString($name, $value);
+			break;
 	}
 	// Do checksum and be happy
 	$checksum = md5($vcard->children[$line]->serialize());
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 458c9ab8fc..e15dc0278f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -110,10 +110,21 @@ Contacts={
 				obj.tipsy('hide');
 				Contacts.UI.Card.deleteProperty(obj, 'single');
 			}
+			
+			var goToUrl = function(obj) {
+				var url = Contacts.UI.propertyContainerFor(obj).find('#url').val();
+				if(url != '') {
+					var newWindow = window.open(url,'_blank');
+					newWindow.focus();
+				}
+			}
+			
 			$('#identityprops a.delete').click( function() { deleteItem($(this)) });
 			$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
 			$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
 			$('#categories_value a.edit').keydown( function() { $(this).tipsy('hide');OCCategories.edit(); } );
+			$('#url_value a.globe').click( function() { $(this).tipsy('hide');goToUrl($(this)); } );
+			$('#url_value a.globe').keydown( function() { $(this).tipsy('hide');goToUrl($(this)); } );
 			$('#fn_select').combobox({
 				'id': 'fn',
 				'name': 'value',
@@ -427,7 +438,7 @@ Contacts={
 				}
 			},
 			loadSingleProperties:function() {
-				var props = ['BDAY', 'NICKNAME', 'ORG', 'CATEGORIES'];
+				var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
 				// Clear all elements
 				$('#ident .propertycontainer').each(function(){
 					if(props.indexOf($(this).data('element')) > -1) {
@@ -438,40 +449,22 @@ Contacts={
 					}
 				});
 				for(var prop in props) {
-					if(this.data[props[prop]] != undefined) {
-						$('#contacts_propertymenu_dropdown a[data-type="'+props[prop]+'"]').parent().hide();
-						var property = this.data[props[prop]][0];
+					var propname = props[prop];
+					if(this.data[propname] != undefined) {
+						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
+						var property = this.data[propname][0];
 						var value = property['value'], checksum = property['checksum'];
-						switch(props[prop]) {
-							case 'BDAY':
-								var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
-								value = $.datepicker.formatDate('dd-mm-yy', val);
-								$('#contact_identity').find('#bday').val(value);
-								$('#contact_identity').find('#bday_value').data('checksum', checksum);
-								$('#contact_identity').find('#bday_label').show();
-								$('#contact_identity').find('#bday_value').show();
-								break;
-							case 'NICKNAME':
-								$('#contact_identity').find('#nickname').val(value);
-								$('#contact_identity').find('#nickname_value').data('checksum', checksum);
-								$('#contact_identity').find('#nickname_label').show();
-								$('#contact_identity').find('#nickname_value').show();
-								break;
-							case 'ORG':
-								$('#contact_identity').find('#org').val(value);
-								$('#contact_identity').find('#org_value').data('checksum', checksum);
-								$('#contact_identity').find('#org_label').show();
-								$('#contact_identity').find('#org_value').show();
-								break;
-							case 'CATEGORIES':
-								$('#contact_identity').find('#categories').val(value);
-								$('#contact_identity').find('#categories_value').data('checksum', checksum);
-								$('#contact_identity').find('#categories_label').show();
-								$('#contact_identity').find('#categories_value').show();
-								break;
+						
+						if(propname == 'BDAY') {
+							var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
+							value = $.datepicker.formatDate('dd-mm-yy', val);
 						}
+						$('#contact_identity').find('#'+propname.toLowerCase()).val(value);
+						$('#contact_identity').find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
+						$('#contact_identity').find('#'+propname.toLowerCase()+'_label').show();
+						$('#contact_identity').find('#'+propname.toLowerCase()+'_value').show();
 					} else {
-						$('#contacts_propertymenu_dropdown a[data-type="'+props[prop]+'"]').parent().show();
+						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
 					}
 				}
 			},
@@ -700,6 +693,7 @@ Contacts={
 						Contacts.UI.Card.editAddress('new', true);
 						break;
 					case 'NICKNAME':
+					case 'URL':
 					case 'ORG':
 					case 'BDAY':
 					case 'CATEGORIES':
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 74522be37c..fee5be0800 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -34,6 +34,8 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<dd class="propertycontainer hidden" id="org_value" data-element="ORG"><input id="org" required="required" name="value[ORG]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt class="hidden" id="url_label" data-element="URL"><label for="nickname"><?php echo $l->t('Web site'); ?></label></dt>
+		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" name="value[URL]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property big" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Groups'); ?></label></dt>
@@ -108,6 +110,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
 		<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
 		<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
+		<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>
 		<li><a role="menuitem" data-type="CATEGORIES"><?php echo $l->t('Groups'); ?></a></li>
 	</ul>
 	</div>

From 6ca2b49292b610febf1e867e41f220dfa4e74a1e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 6 Jun 2012 17:29:57 +0200
Subject: [PATCH 0187/1537] avoid too-early database access and thus make
 owncloud installable again

---
 lib/base.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index a439651f4a..a65a33b166 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -271,7 +271,7 @@ class OC{
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 	}
-	
+
 	public static function loadapp(){
 		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php')){
 			require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php');
@@ -279,7 +279,7 @@ class OC{
 			trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead?
 		}
 	}
-	
+
 	public static function loadfile(){
 		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){
 			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
@@ -289,7 +289,7 @@ class OC{
 				exit;
 			}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
 				require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
-			}	
+			}
 		}else{
 			header('HTTP/1.0 404 Not Found');
 			exit;
@@ -300,7 +300,7 @@ class OC{
 		// register autoloader
 		spl_autoload_register(array('OC','autoload'));
 		setlocale(LC_ALL, 'en_US.UTF-8');
-		
+
 		// set some stuff
 		//ob_start();
 		error_reporting(E_ALL | E_STRICT);
@@ -320,7 +320,7 @@ class OC{
 		//try to configure php to enable big file uploads.
 		//this doesn´t work always depending on the webserver and php configuration.
 		//Let´s try to overwrite some defaults anyways
-		
+
 		//try to set the maximum execution time to 60min
 		@set_time_limit(3600);
 		@ini_set('max_execution_time',3600);
@@ -350,7 +350,7 @@ class OC{
 			$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
 			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
 		}
-		
+
 		self::initPaths();
 
 		// register the stream wrappers
@@ -368,7 +368,7 @@ class OC{
 		if(isset($refererhost['host'])) $refererhost=$refererhost['host']; else $refererhost='';
 		$server=OC_Helper::serverHost();
 		$serverhost=explode(':',$server);
-		$serverhost=$serverhost['0']; 
+		$serverhost=$serverhost['0'];
 		if(!self::$CLI){
 			if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
 				$url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';
@@ -419,16 +419,18 @@ class OC{
 				OC_App::loadApps();
 			}
 		}
-		
+
 		// Check for blacklisted files
 		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
 
-		if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
-			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+		if (OC_Config::getValue('installed', false)) {
+			if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+				OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+				OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+			}
 		}
 
 		//parse the given parameters
@@ -482,7 +484,7 @@ if(!function_exists('get_temp_dir')) {
 			return dirname($temp);
 		}
 		if( $temp=sys_get_temp_dir())    return $temp;
-		
+
 		return null;
 	}
 }

From c960e42a1723a3ddc1a703724a6863b3a2d5fa8e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 6 Jun 2012 18:08:51 +0200
Subject: [PATCH 0188/1537] fixed var name, $filename should be $foldername

---
 apps/files/ajax/newfolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index 0668a6191f..c5c37914c6 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -13,7 +13,7 @@ if(trim($foldername) == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
-if(strpos($filename,'/')!==false){
+if(strpos($foldername,'/')!==false){
 	OCP\JSON::error(array("data" => array( "message" => "Invalid Foldername" )));
 	exit();
 }

From 6d211155ab505c99dd7a723a011a755c2c038bc8 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 2 Jun 2012 15:25:50 +0200
Subject: [PATCH 0189/1537] git status

---
 apps/gallery/ajax/thumbnail.php  |   7 +-
 apps/gallery/lib/managers.php    |  94 ++++++++++++++++
 apps/gallery/lib/testimg.jpg     | Bin 0 -> 839297 bytes
 apps/gallery/lib/tiles.php       | 183 +++++++++++++++++++++++++++++++
 apps/gallery/lib/tiles_test.php  |  87 +++++++++++++++
 apps/gallery/templates/index.php | 111 ++++++++++++++-----
 lib/image.php                    |  32 +++++-
 7 files changed, 481 insertions(+), 33 deletions(-)
 create mode 100644 apps/gallery/lib/managers.php
 create mode 100644 apps/gallery/lib/testimg.jpg
 create mode 100644 apps/gallery/lib/tiles.php
 create mode 100644 apps/gallery/lib/tiles_test.php

diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index ff0cb44022..4fc9eba992 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -20,14 +20,15 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 * 
 */
-
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('gallery');
+require_once('apps/gallery/lib/managers.php');
 
-$img = $_GET['img'];
 
-$image = OC_Gallery_Photo::getThumbnail($img);
+$img = $_GET['filepath'];
+
+$image = \OC\Pictures\ThumbnailsManager::getInstance()->getThumbnail($img);
 if ($image) {
 	OCP\Response::enableCaching(3600 * 24); // 24 hour
 	$image->show();
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
new file mode 100644
index 0000000000..96669da272
--- /dev/null
+++ b/apps/gallery/lib/managers.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace OC\Pictures;
+
+require_once('lib/base.php');
+
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::checkAppEnabled('gallery');
+
+class DatabaseManager {
+	private static $instance = null;
+	const TAG = 'DatabaseManager';
+	
+	public static function getInstance() {
+		if (self::$instance === null)
+			self::$instance = new DatabaseManager();
+		return self::$instance;
+	}
+	
+	public function getFileData($path) {
+		$gallery_path = \OCP\Config::getSystemValue( 'datadirectory' ).'/'.\OC_User::getUser().'/gallery';
+		$path = $gallery_path.$path;
+		$stmt = \OCP\DB::prepare('SELECT * FROM *PREFIX*pictures_images_cache WHERE uid_owner LIKE ? AND path = ?');
+		$result = $stmt->execute(array(\OCP\USER::getUser(), $path));
+		if (($row = $result->fetchRow()) != false) {
+			return $row;
+		}
+		$image = new \OC_Image();
+		if (!$image->loadFromFile($path)) {
+			return false;
+		}
+		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
+		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
+		unset($image);
+		return $this->getFileData($path);
+	}
+	
+	private function __construct() {}
+}
+
+class ThumbnailsManager {
+	
+	private static $instance = null;
+	const TAG = 'ThumbnailManager';
+	
+	public static function getInstance() {
+		if (self::$instance === null)
+			self::$instance = new ThumbnailsManager();
+		return self::$instance;
+	}
+
+	public function getThumbnail($path) {
+		$gallery_path = \OCP\Config::getSystemValue( 'datadirectory' ).'/'.\OC_User::getUser().'/gallery';
+		if (file_exists($gallery_path.$path)) {
+			return new \OC_Image($gallery_path.$path);
+		}
+		if (!\OC_Filesystem::file_exists($path)) {
+			\OC_Log::write(self::TAG, 'File '.$path.' don\'t exists', \OC_Log::WARN);
+			return false;
+		}
+		$image = new \OC_Image();
+		$image->loadFromFile(\OC_Filesystem::getLocalFile($path));
+		if (!$image->valid()) return false;
+
+		$image->fixOrientation();
+
+		$ret = $image->preciseResize(floor((200*$image->width())/$image->height()), 200);
+		
+		if (!$ret) {
+			\OC_Log::write(self::TAG, 'Couldn\'t resize image', \OC_Log::ERROR);
+			unset($image);
+			return false;
+		}
+
+		$image->save($gallery_path.'/'.$path);
+		return $image;
+	}
+	
+	public function getThumbnailInfo($path) {
+		$arr = DatabaseManager::getInstance()->getFileData($path);
+		$ret = array('filepath' => $arr['path'],
+		             'width' => $arr['width'],
+		             'height' => $arr['height']);
+		return $ret;
+	}
+	
+	public function delete($path) {
+		unlink(\OC::$CONFIG_DATADIRECTORY_ROOT.'/'.\OC_User::getUser()."/gallery".$path);
+	}
+	
+	private function __construct() {}
+
+}
+?>
\ No newline at end of file
diff --git a/apps/gallery/lib/testimg.jpg b/apps/gallery/lib/testimg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0d9a2bd8812f7b1d0b492821054eb9a4a3b7ada9
GIT binary patch
literal 839297
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%0Ahl$9nw(rOCVCJikSa<5eQ
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%0A;x4#d&X-{tCuOFM&gN~Giv*C53J8iBro&h|ZH
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

literal 0
HcmV?d00001

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
new file mode 100644
index 0000000000..d7f5208ff8
--- /dev/null
+++ b/apps/gallery/lib/tiles.php
@@ -0,0 +1,183 @@
+<?php
+
+namespace OC\Pictures;
+
+require_once('lib/base.php');
+require_once('managers.php');
+
+const TILE_PROPORTION_HORIZONTAL = 0;
+const TILE_PROPORTION_VERTICAL = 0;
+const GET_THUMBNAIL_PATH = '?app=gallery&getfile=ajax/thumbnail.php&filepath=';
+const TAG = 'Pictures';
+
+class TileBase {
+  public function getWidth() { return false; }
+
+  public function getHeight() { return 200; }
+
+  public function getOnHoverAction() { return false; }
+  
+  public function getOnOutAction() { return false; }
+  
+  public function getOnClickAction() { return false; }
+
+  public function getDisplayedLayer() { return false; }
+
+  public function getTileProportion() { return false; }
+  
+  public function get() { return false; }
+}
+
+class TilesLine {
+
+  public function __construct() {
+    $this->tiles_array = array();
+  }
+
+  public function setAvailableSpace($space) {
+    $available_space = $space;
+  }
+
+  public function getTilesCount() {
+    return count($this->tiles_array);
+  }
+
+  public function addTile($tile) {
+    array_push($this->tiles_array, $tile);
+  }
+
+  public function getLeftSpace() {
+    $occupied_space = 0;
+    for ($i = 0; $i < count($this->tiles_array); $i++) {
+      $occupied_space += $this->tiles_array[$i]->getWidth();
+    }
+    return $this->available_space - $occupied_space;
+  }
+
+  public function tileWillFit($tile) {
+    return $this->getLeftSpace() > $tile->getWidth();
+  }
+  
+  public function get() {
+	  $r = '<div class="line gallery_div">';
+	  
+	  for ($i = 0; $i < count($this->tiles_array); $i++) {
+	  	  $img_w = $this->tiles_array[$i]->getWidth();
+	  	  $extra = '';
+	  	  if ($img_w != 200) $extra = ' style="width:'.$img_w.'px"';
+		  $r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'">'.$this->tiles_array[$i]->get().'</div>';
+	  }
+	  
+	  $r .= '</div>';
+	  return $r;
+  }
+
+  private $tiles_array;
+  private $available_space;
+}
+
+class TileSingle extends TileBase {
+
+  public function __construct($path) {
+    \OC_Log::write(TAG, 'Loading file from path '.$path, \OC_Log::DEBUG);
+    $this->file_path = $path;
+/*    $this->image = new \OC_Image();
+    if (!$this->image->loadFromFile($this->file_path)) {
+      \OC_Log::write(TAG, 'Loading file filed', \OC_Log::ERROR);
+      return;
+    }
+    $this->image->fixOrientation();*/
+  }
+
+  public function getWidth() {
+    $a = ThumbnailsManager::getInstance()->getThumbnailInfo($this->file_path);
+    return $a['width'];
+  }
+
+  public function forceSize($width_must_fit=false) {
+      $current_height = $this->image->height();
+      $current_width = $this->image->width();
+      
+      // we need height of 250px but not for tiles stack
+      if ($current_width > $current_height && !$width_must_fit) {
+	      $this->image->resize(floor((250*$current_width)/$current_height));
+      } else {
+		  $this->image->resize(200);
+	  }
+  }
+  
+  public function get($extra = '') {
+	  return '<img src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'>';
+  }
+  
+  public function getMiniatureSrc() {
+	  return GET_THUMBNAIL_PATH.urlencode($this->getPath());
+  }
+
+  public function getPath() {
+	  return $this->file_path;
+  }
+
+  private $file_path;
+  private $image;
+}
+
+class TileStack extends TileBase {
+
+  const STACK_REPRESENTATIVES = 3;
+
+  public function __construct($path_array, $stack_name) {
+    $this->tiles_array = array();
+    $this->stack_name = $stack_name;
+    for ($i = 0; $i < count($path_array) && $i < self::STACK_REPRESENTATIVES; $i++) {
+	  $tile = new TileSingle($path_array[$i]);
+      array_push($this->tiles_array, $tile);
+    }
+  }
+  
+  public function forceSize($width_must_fit=false) {
+	  for ($i = 0; $i < count($this->tiles_array); $i++)
+	    $this->tiles_array[$i]->forceSize(true);
+  }
+
+  public function getWidth() {
+    $max = 0;
+    for ($i = 0; $i < count($this->tiles_array); $i++) {
+	    $max = max($max, $this->tiles_array[$i]->getWidth());
+    }
+    return min(200, $max);
+  }
+
+  public function get() {
+    $r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
+    for ($i = 0; $i < count($this->tiles_array); $i++) {
+      $top = rand(-5, 5);
+      $left = rand(-5, 5);
+      $img_w = $this->tiles_array[$i]->getWidth();
+      $extra = '';
+      if ($img_w < 200) {
+	      $extra = 'width:'.$img_w.'px;';
+      }
+      $r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
+//      $r .= $this->tiles_array[$i]->get(' style="margin-top:'.$top.'px; margin-left:'.$left.'px; "');
+    }
+    return $r;
+  }
+
+  public function getOnHoverAction() {
+	  return 'javascript:t(this);return false;';
+  }
+  
+  public function getOnOutAction() {
+	  return 'javascript:o(this);return false;';
+  }
+
+  public function getCount() {
+	  return count($this->tiles_array);
+  }
+
+  private $tiles_array;
+  private $stack_name;
+}
+
+?>
diff --git a/apps/gallery/lib/tiles_test.php b/apps/gallery/lib/tiles_test.php
new file mode 100644
index 0000000000..022a88f75c
--- /dev/null
+++ b/apps/gallery/lib/tiles_test.php
@@ -0,0 +1,87 @@
+<?php
+$l = OC_L10N::get('gallery');
+?>
+<style>
+div.gallery_div {position:relative; display: inline-block; height: 202px; width: 200px; margin: 5px;}
+div.miniature_border {position:absolute; height: 200px; -webkit-transition-duration: .2s; background-position: 50%;}
+div.line {display:inline-block; border: 0; width: auto; height: 210px}
+div.gallery_div img{position:absolute; top: 1; left: 0; -webkit-transition-duration: 0.3s; height:200px; width: auto;}
+div.gallery_div img.shrinker {width:80px !important;}
+div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:10px; height:auto; padding: 5px; width: 170px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
+div.visible { opacity: 0.8;}
+</style>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+function t(element) {
+	$('div', element).each(function(index, elem) {
+	 	if ($(elem).hasClass('title')) {
+		 	$(elem).addClass('visible');
+	 	} else {
+			$(elem).css('margin-top', Math.floor(30-(Math.random()*60)) + 'px')
+			       .css('margin-left', Math.floor(30-(Math.random()*60))+ 'px')
+			       .css('z-index', '999');
+		}
+	});
+}
+
+function o(element) {
+	$('div', element).each(function(index, elem) {
+	 	if ($(elem).hasClass('title')) {
+		 	$(elem).removeClass('visible');
+	 	} else {
+			$(elem).css('margin-top', Math.floor(5-(Math.random()*10)) + 'px')
+		    	   .css('margin-left', Math.floor(5-(Math.random()*10))+ 'px')
+		    	   .css('z-index', '3');
+		}
+	});
+}
+
+</script>
+
+<?php
+
+include('apps/gallery/lib/tiles.php');
+$root = empty($_GET['root'])?'/':$_GET['root'];
+
+$images = \OC_FileCache::searchByMime('image', null, '/bartek/files'.$root);
+sort($images);
+
+$arr = array();
+$tl = new \OC\Pictures\TilesLine();
+$ts = new \OC\Pictures\TileStack(array(), '');
+$previous_element = $images[0];
+for($i = 0; $i < count($images); $i++) {
+    error_log($images[$i]);
+	$prev_dir_arr = explode('/', $previous_element);
+	$dir_arr = explode('/', $images[$i]);
+
+	if (count($dir_arr)==1) {
+		$tl->addTile(new \OC\Pictures\TileSingle($images[$i]));
+		continue;
+	}
+	if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
+		$tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
+		$arr = array();
+	}
+	$arr[] = $root.$images[$i];
+	$previous_element = $images[$i];
+}
+
+$dir_arr = explode('/', $previous_element);
+
+if (count($dir_arr)==0) {
+	$tl->addTile(new \OC\Pictures\TileSingle($previous_element));
+} else if (count($dir_arr) && $ts->getCount() == 0){
+    $ts = new \OC\Pictures\TileStack(array($previous_element), $dir_arr[0]);
+} else {
+	$arr[] = $previous_element;
+	$ts->addTile($arr);
+}
+
+if ($ts->getCount() != 0) {
+	$tl->addTile($ts);
+}
+
+echo $tl->get();
+
+?>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 99af3bda0a..55710038c0 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,31 +1,86 @@
 <?php
-OCP\Util::addStyle('gallery', 'styles');
-OCP\Util::addscript('gallery', 'albums');
-OCP\Util::addscript('gallery', 'scanner');
-OCP\Util::addscript('gallery', 'album_cover');
-OCP\Util::addStyle('files', 'files');
-OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
-OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
 $l = OC_L10N::get('gallery');
 ?>
-<script type="text/javascript">var gallery_scanning_root='<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '/'); ?>'; var gallery_default_order = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'order', 'ASC'); ?>';</script>
-<div id="controls">
-	<div id="scan">
-		<div id="scanprogressbar"></div>
-		<input type="button" class="start" value="<?php echo $l->t('Rescan');?>" onclick="javascript:scanForAlbums();" />
-    <input type="button" class="stop" style="display:none" value="<?php echo $l->t('Stop');?>" onclick="javascript:Scanner.stop();" />
-    <input type="button" id="g-share-button" value="<?php echo $l->t('Share'); ?>" onclick="javascript:shareGallery();" />
-		<input type="button" id="g-settings-button" value="<?php echo $l->t('Settings');?>" onclick="javascript:settings();"/>
-	</div>
-	<div id="g-album-navigation">
-		<div class="crumb last" style="background-image:url('<?php echo OC::$WEBROOT;?>/core/img/breadcrumb.png')">
-			<a href="javascript:returnToElement(0);">main</a>
-		</div>
-	</div>
-	<div id="g-album-loading" class="crumb" style="display:none">
-		<img src="<?php echo OCP\Util::linkTo('gallery', 'img/loading.gif'); ?>">
-	</div>
-</div>
-<div id="gallery_list">
-</div>
+<style>
+div.gallery_div {position:relative; display: inline-block; height: 202px; width: 200px; margin: 5px;}
+div.miniature_border {position:absolute; height: 200px; -webkit-transition-duration: .2s; background-position: 50%;}
+div.line {display:inline-block; border: 0; width: auto; height: 210px}
+div.gallery_div img{position:absolute; top: 1; left: 0; -webkit-transition-duration: 0.3s; height:200px; width: auto;}
+div.gallery_div img.shrinker {width:80px !important;}
+div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:10px; height:auto; padding: 5px; width: 170px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
+div.visible { opacity: 0.8;}
+</style>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+function t(element) {
+	$('div', element).each(function(index, elem) {
+	 	if ($(elem).hasClass('title')) {
+		 	$(elem).addClass('visible');
+	 	} else {
+			$(elem).css('margin-top', Math.floor(30-(Math.random()*60)) + 'px')
+			       .css('margin-left', Math.floor(30-(Math.random()*60))+ 'px')
+			       .css('z-index', '999');
+		}
+	});
+}
+
+function o(element) {
+	$('div', element).each(function(index, elem) {
+	 	if ($(elem).hasClass('title')) {
+		 	$(elem).removeClass('visible');
+	 	} else {
+			$(elem).css('margin-top', Math.floor(5-(Math.random()*10)) + 'px')
+		    	   .css('margin-left', Math.floor(5-(Math.random()*10))+ 'px')
+		    	   .css('z-index', '3');
+		}
+	});
+}
+
+</script>
+
+<?php
+
+include('apps/gallery/lib/tiles.php');
+$root = empty($_GET['root'])?'/':$_GET['root'];
+
+$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER\getUser().'/files'.$root);
+sort($images);
+
+$arr = array();
+$tl = new \OC\Pictures\TilesLine();
+$ts = new \OC\Pictures\TileStack(array(), '');
+$previous_element = $images[0];
+for($i = 0; $i < count($images); $i++) {
+	$prev_dir_arr = explode('/', $previous_element);
+	$dir_arr = explode('/', $images[$i]);
+
+	if (count($dir_arr)==1) {
+		$tl->addTile(new \OC\Pictures\TileSingle($root.$images[$i]));
+		continue;
+	}
+	if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
+		$tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
+		$arr = array();
+	}
+	$arr[] = $root.$images[$i];
+	$previous_element = $images[$i];
+}
+
+$dir_arr = explode('/', $previous_element);
+
+if (count($dir_arr)==0) {
+	$tl->addTile(new \OC\Pictures\TileSingle($previous_element));
+} else if (count($dir_arr) && $ts->getCount() == 0){
+    $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
+} else {
+	$arr[] = $previous_element;
+	$ts->addTile($arr);
+}
+
+if ($ts->getCount() != 0) {
+	$tl->addTile($ts);
+}
+
+echo $tl->get();
+
+?>
diff --git a/lib/image.php b/lib/image.php
index a6bb92cea2..af61f9424e 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -136,6 +136,8 @@ class OC_Image {
 	*/
 	private function _output($filepath=null) {
 		if($filepath) {
+			if (!file_exists(dirname($filepath)))
+				mkdir(dirname($filepath), 0777, true);
 			if(!is_writable(dirname($filepath))) {
 				OC_Log::write('core',__METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
 				return false;
@@ -426,7 +428,7 @@ class OC_Image {
 		if(is_resource($str)) {
 			return false;
 		}
-		$this->resource = imagecreatefromstring($str);
+		$this->resource = @imagecreatefromstring($str);
 		if(!$this->resource) {
 			OC_Log::write('core','OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
 			return false;
@@ -445,7 +447,7 @@ class OC_Image {
 		}
 		$data = base64_decode($str);
 		if($data) { // try to load from string data
-			$this->resource = imagecreatefromstring($data);
+			$this->resource = @imagecreatefromstring($data);
 			if(!$this->resource) {
 				OC_Log::write('core','OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG);
 				return false;
@@ -496,6 +498,32 @@ class OC_Image {
 		return true;
 	}
 
+	public function preciseResize($width, $height) {
+		if (!$this->valid()) {
+			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
+			return false;			
+		}
+		$width_orig=imageSX($this->resource);
+		$height_orig=imageSY($this->resource);
+		$process = imagecreatetruecolor($width, $height);
+
+		if ($process == false) {
+			OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+
+		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
+		if ($process == false) {
+			OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagedestroy($this->resource);
+		$this->resource = $process;
+		return true;
+	}
+
 	/**
 	* @brief Crops the image to the middle square. If the image is already square it just returns.
 	* @param int maximum size for the result (optional)

From 34a21a63ce5730a4f45af6745b4acd6f702e6e79 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 2 Jun 2012 15:30:30 +0200
Subject: [PATCH 0190/1537] new db scheme

---
 apps/gallery/appinfo/database.xml | 46 ++++---------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
index f370e1521e..d1ccd6b5a2 100644
--- a/apps/gallery/appinfo/database.xml
+++ b/apps/gallery/appinfo/database.xml
@@ -5,16 +5,8 @@
 	 <overwrite>false</overwrite>
 	 <charset>latin1</charset>
 	 <table>
-		<name>*dbprefix*gallery_albums</name>
+		<name>*dbprefix*pictures_images_cache</name>
 		<declaration>
-			<field>
-				<name>album_id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<length>4</length>
-			</field>
 			<field>
 				<name>uid_owner</name>
 				<type>text</type>
@@ -22,48 +14,22 @@
 				<length>64</length>
 			</field>
 			<field>
-				<name>album_name</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>100</length>
-			</field>
-			<field>
-				<name>album_path</name>
+				<name>path</name>
 				<type>text</type>
 				<notnull>true</notnull>
 				<length>256</length>
 			</field>
 			<field>
-				<name>parent_path</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>256</length>
-			</field>
-		</declaration>
-	</table>
-	<table>
-		<name>*dbprefix*gallery_photos</name>
-		<declaration>
-			<field>
-				<name>photo_id</name>
+				<name>width</name>
 				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<length>4</length>
-			</field>
-			<field>
-				<name>album_id</name>
-				<type>integer</type>
-				<default>0</default>
 				<notnull>true</notnull>
 				<length>4</length>
 			</field>
 			<field>
-				<name>file_path</name>
-				<type>text</type>
+				<name>height</name>
+				<type>integer</type>
 				<notnull>true</notnull>
-				<length>256</length>
+				<length>4</length>
 			</field>
 		</declaration>
 	</table>

From 76e7e361aef51badd048727db7ffc104e19e231a Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 3 Jun 2012 00:29:10 +0200
Subject: [PATCH 0191/1537] navigate on galleries

---
 apps/gallery/lib/managers.php    |  4 +++-
 apps/gallery/lib/tiles.php       | 32 +++++++++++++-----------------
 apps/gallery/templates/index.php | 34 ++++++++++++++++++++++++++------
 3 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 96669da272..6cb9b420ac 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -29,9 +29,11 @@ class DatabaseManager {
 		if (!$image->loadFromFile($path)) {
 			return false;
 		}
+		\OCP\DB::beginTransaction();
 		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
 		unset($image);
+		\OCP\DB::commit();
 		return $this->getFileData($path);
 	}
 	
@@ -64,7 +66,7 @@ class ThumbnailsManager {
 
 		$image->fixOrientation();
 
-		$ret = $image->preciseResize(floor((200*$image->width())/$image->height()), 200);
+		$ret = $image->preciseResize(floor((150*$image->width())/$image->height()), 150);
 		
 		if (!$ret) {
 			\OC_Log::write(self::TAG, 'Couldn\'t resize image', \OC_Log::ERROR);
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index d7f5208ff8..26ff3cbb9f 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -9,11 +9,12 @@ const TILE_PROPORTION_HORIZONTAL = 0;
 const TILE_PROPORTION_VERTICAL = 0;
 const GET_THUMBNAIL_PATH = '?app=gallery&getfile=ajax/thumbnail.php&filepath=';
 const TAG = 'Pictures';
+const IMAGE_WIDTH = 150;
 
 class TileBase {
   public function getWidth() { return false; }
 
-  public function getHeight() { return 200; }
+  public function getHeight() { return 150; }
 
   public function getOnHoverAction() { return false; }
   
@@ -64,8 +65,8 @@ class TilesLine {
 	  for ($i = 0; $i < count($this->tiles_array); $i++) {
 	  	  $img_w = $this->tiles_array[$i]->getWidth();
 	  	  $extra = '';
-	  	  if ($img_w != 200) $extra = ' style="width:'.$img_w.'px"';
-		  $r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'">'.$this->tiles_array[$i]->get().'</div>';
+	  	  if ($img_w != 150) $extra = ' style="width:'.$img_w.'px"';
+		  $r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
 	  }
 	  
 	  $r .= '</div>';
@@ -93,18 +94,6 @@ class TileSingle extends TileBase {
     $a = ThumbnailsManager::getInstance()->getThumbnailInfo($this->file_path);
     return $a['width'];
   }
-
-  public function forceSize($width_must_fit=false) {
-      $current_height = $this->image->height();
-      $current_width = $this->image->width();
-      
-      // we need height of 250px but not for tiles stack
-      if ($current_width > $current_height && !$width_must_fit) {
-	      $this->image->resize(floor((250*$current_width)/$current_height));
-      } else {
-		  $this->image->resize(200);
-	  }
-  }
   
   public function get($extra = '') {
 	  return '<img src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'>';
@@ -117,6 +106,10 @@ class TileSingle extends TileBase {
   public function getPath() {
 	  return $this->file_path;
   }
+  
+  public function getOnClickAction() {
+	  return 'javascript:openFile(\''.$this->file_path.'\');';
+  }
 
   private $file_path;
   private $image;
@@ -145,7 +138,7 @@ class TileStack extends TileBase {
     for ($i = 0; $i < count($this->tiles_array); $i++) {
 	    $max = max($max, $this->tiles_array[$i]->getWidth());
     }
-    return min(200, $max);
+    return min(IMAGE_WIDTH, $max);
   }
 
   public function get() {
@@ -155,11 +148,10 @@ class TileStack extends TileBase {
       $left = rand(-5, 5);
       $img_w = $this->tiles_array[$i]->getWidth();
       $extra = '';
-      if ($img_w < 200) {
+      if ($img_w < IMAGE_WIDTH) {
 	      $extra = 'width:'.$img_w.'px;';
       }
       $r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
-//      $r .= $this->tiles_array[$i]->get(' style="margin-top:'.$top.'px; margin-left:'.$left.'px; "');
     }
     return $r;
   }
@@ -175,6 +167,10 @@ class TileStack extends TileBase {
   public function getCount() {
 	  return count($this->tiles_array);
   }
+  
+  public function getOnClickAction() {
+	  return 'javascript:openNewGal(\''.$this->stack_name.'\');';
+  }
 
   private $tiles_array;
   private $stack_name;
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 55710038c0..d3b281a2c3 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,17 +1,25 @@
 <?php
+OCP\Util::addStyle('files', 'files');
+OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
+OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
+OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
+
 $l = OC_L10N::get('gallery');
 ?>
 <style>
-div.gallery_div {position:relative; display: inline-block; height: 202px; width: 200px; margin: 5px;}
-div.miniature_border {position:absolute; height: 200px; -webkit-transition-duration: .2s; background-position: 50%;}
-div.line {display:inline-block; border: 0; width: auto; height: 210px}
-div.gallery_div img{position:absolute; top: 1; left: 0; -webkit-transition-duration: 0.3s; height:200px; width: auto;}
+div.gallery_div {position:relative; display: inline-block; height: 152px; width: 150px; margin: 5px;}
+div.miniature_border {position:absolute; height: 150px; -webkit-transition-duration: .2s; background-position: 50%;}
+div.line {display:inline-block; border: 0; width: auto; height: 160px}
+div.gallery_div img{position:absolute; top: 1; left: 0; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
 div.gallery_div img.shrinker {width:80px !important;}
-div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:10px; height:auto; padding: 5px; width: 170px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
+div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
 div.visible { opacity: 0.8;}
 </style>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
 <script type="text/javascript">
+
+var root = "<?php echo !empty($_GET['root']) ? $_GET['root'] : '/'; ?>";
+
 function t(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -36,6 +44,20 @@ function o(element) {
 	});
 }
 
+function openNewGal(album_name) {
+	root = root + album_name + "/";
+	var url = window.location.toString().replace(window.location.search, '');
+	url = url + "?app=gallery&root="+root;
+	
+	window.location = url;
+}
+
+function openFile(file_path) {
+	var url = window.location.toString().replace(window.location.search, '');
+	url = url + "?app=files&getfile=download.php?file="+file_path;
+	window.location = url;
+}
+
 </script>
 
 <?php
@@ -43,7 +65,7 @@ function o(element) {
 include('apps/gallery/lib/tiles.php');
 $root = empty($_GET['root'])?'/':$_GET['root'];
 
-$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER\getUser().'/files'.$root);
+$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
 sort($images);
 
 $arr = array();

From 671fe4980939841d15c642bad4957c223931aa1f Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 5 Jun 2012 18:32:42 +0200
Subject: [PATCH 0192/1537] use fancybox to display image preview

---
 apps/gallery/lib/tiles.php       |  4 ++--
 apps/gallery/templates/index.php | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 26ff3cbb9f..c2d7fede78 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -96,7 +96,7 @@ class TileSingle extends TileBase {
   }
   
   public function get($extra = '') {
-	  return '<img src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'>';
+    return '<a rel="images" href="?app=files&getfile=download.php?file='.urlencode($this->getPath()).'"><img rel="images" src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'></a>';
   }
   
   public function getMiniatureSrc() {
@@ -108,7 +108,7 @@ class TileSingle extends TileBase {
   }
   
   public function getOnClickAction() {
-	  return 'javascript:openFile(\''.$this->file_path.'\');';
+	  return '';//'javascript:openFile(\''.$this->file_path.'\');';
   }
 
   private $file_path;
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index d3b281a2c3..3dc722f066 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,8 +1,4 @@
 <?php
-OCP\Util::addStyle('files', 'files');
-OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
-OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
 
 $l = OC_L10N::get('gallery');
 ?>
@@ -15,7 +11,6 @@ div.gallery_div img.shrinker {width:80px !important;}
 div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
 div.visible { opacity: 0.8;}
 </style>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
 <script type="text/javascript">
 
 var root = "<?php echo !empty($_GET['root']) ? $_GET['root'] : '/'; ?>";
@@ -52,11 +47,11 @@ function openNewGal(album_name) {
 	window.location = url;
 }
 
-function openFile(file_path) {
-	var url = window.location.toString().replace(window.location.search, '');
-	url = url + "?app=files&getfile=download.php?file="+file_path;
-	window.location = url;
-}
+$(document).ready(function() {
+		$("a[rel=images]").fancybox({
+			'titlePosition': 'inside'
+		});
+});
 
 </script>
 

From aa0fc3c69a9a92cd041c329bf228ba6d30daff20 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 6 Jun 2012 22:10:09 +0200
Subject: [PATCH 0193/1537] aviod incorrect image size returning in gallery
 listing

---
 apps/gallery/lib/managers.php    |  7 ++++---
 apps/gallery/templates/index.php | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 6cb9b420ac..2444659d0a 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -32,9 +32,10 @@ class DatabaseManager {
 		\OCP\DB::beginTransaction();
 		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
-		unset($image);
 		\OCP\DB::commit();
-		return $this->getFileData($path);
+    $ret = array('filepath' => $path, 'width' => $image->width(), 'height' => $image->height());
+		unset($image);
+    return $ret;
 	}
 	
 	private function __construct() {}
@@ -93,4 +94,4 @@ class ThumbnailsManager {
 	private function __construct() {}
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 3dc722f066..39e3bbf47b 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -42,7 +42,7 @@ function o(element) {
 function openNewGal(album_name) {
 	root = root + album_name + "/";
 	var url = window.location.toString().replace(window.location.search, '');
-	url = url + "?app=gallery&root="+root;
+  url = url + "?app=gallery&root="+encodeURIComponent(root);
 	
 	window.location = url;
 }
@@ -85,13 +85,15 @@ for($i = 0; $i < count($images); $i++) {
 
 $dir_arr = explode('/', $previous_element);
 
-if (count($dir_arr)==0) {
-	$tl->addTile(new \OC\Pictures\TileSingle($previous_element));
-} else if (count($dir_arr) && $ts->getCount() == 0){
-    $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
-} else {
-	$arr[] = $previous_element;
-	$ts->addTile($arr);
+if (count($images)>1) {
+  if (count($dir_arr)==0) {
+    $tl->addTile(new \OC\Pictures\TileSingle($previous_element));
+  } else if (count($dir_arr) && $ts->getCount() == 0){
+      $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
+  } else {
+    $arr[] = $previous_element;
+    $ts->addTile($arr);
+  }
 }
 
 if ($ts->getCount() != 0) {

From 7c88081acb3c7b4d3b88fe4d151fb10a200a9502 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 6 Jun 2012 22:13:25 +0200
Subject: [PATCH 0194/1537] removing test image

---
 apps/gallery/lib/testimg.jpg | Bin 839297 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 apps/gallery/lib/testimg.jpg

diff --git a/apps/gallery/lib/testimg.jpg b/apps/gallery/lib/testimg.jpg
deleted file mode 100644
index 0d9a2bd8812f7b1d0b492821054eb9a4a3b7ada9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 839297
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%0Ahl$9nw(rOCVCJikSa<5eQ
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%0A;x4#d&X-{tCuOFM&gN~Giv*C53J8iBro&h|ZH
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


From a90089c79200c4665e28acb07215f08c2039c1a1 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 6 Jun 2012 22:20:56 +0200
Subject: [PATCH 0195/1537] hack for file download

---
 apps/gallery/lib/tiles.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index c2d7fede78..3805b6dd25 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -96,7 +96,9 @@ class TileSingle extends TileBase {
   }
   
   public function get($extra = '') {
-    return '<a rel="images" href="?app=files&getfile=download.php?file='.urlencode($this->getPath()).'"><img rel="images" src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'></a>';
+    //  !HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
+    //  !HACK! will result in failing of opening them 
+    return '<a rel="images" href="?app=files&getfile=download.php?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'></a>';
   }
   
   public function getMiniatureSrc() {

From b6c5ca126b802354c44a374e72b2e0b677b2af90 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 1 Jun 2012 22:05:20 +0000
Subject: [PATCH 0196/1537] First almost working version

---
 lib/app.php      | 38 ++++++++++++++------
 lib/base.php     | 31 ++++++++--------
 lib/helper.php   |  4 +--
 lib/l10n.php     |  4 +--
 lib/template.php | 94 +++++++++++++++++++++++++++---------------------
 5 files changed, 100 insertions(+), 71 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 667633e264..13b6617b23 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -78,7 +78,7 @@ class OC_App{
 	 * @param string app
 	 */
 	public static function loadApp($app){
-		if(is_file(OC::$APPSROOT.'/apps/'.$app.'/appinfo/app.php')){
+		if(is_file(self::getAppPath($app).'/appinfo/app.php')){
 			require_once( $app.'/appinfo/app.php' );
 		}
 	}
@@ -322,11 +322,25 @@ class OC_App{
 		return $list;
 	}
 
+	/**
+	* Get the directory for the given app.
+	* If the app is defined in multiple directory, the first one is taken. (false if not found)
+	*/
+	public static function getAppPath($appid) {
+		foreach(OC::$APPSROOTS as $dir) {
+			if(file_exists($dir.'/'.$appid)) {
+				return $dir.'/'.$appid;
+			}
+		}
+// 		OC_Log::write('core','Unable to find app "'.$appid.'"',OC_Log::ERROR);
+		return false;
+	}
+
 	/**
 	 * get the last version of the app, either from appinfo/version or from appinfo/info.xml
 	 */
 	public static function getAppVersion($appid){
-		$file=OC::$APPSROOT.'/apps/'.$appid.'/appinfo/version';
+		$file= self::getAppPath($appid).'/appinfo/version';
 		$version=@file_get_contents($file);
 		if($version){
 			return $version;
@@ -349,7 +363,7 @@ class OC_App{
 			if(isset(self::$appInfo[$appid])){
 				return self::$appInfo[$appid];
 			}
-			$file=OC::$APPSROOT.'/apps/'.$appid.'/appinfo/info.xml';
+			$file= self::getAppPath($appid).'/appinfo/info.xml';
 		}
 		$data=array();
 		$content=@file_get_contents($file);
@@ -462,10 +476,12 @@ class OC_App{
 	 */
 	public static function getAllApps(){
 		$apps=array();
-		$dh=opendir(OC::$APPSROOT.'/apps');
-		while($file=readdir($dh)){
-			if(substr($file,0,1)!='.' and is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
-				$apps[]=$file;
+		foreach(OC::$APPSROOTS as $apps_dir) {
+			$dh=opendir($apps_dir);
+			while($file=readdir($dh)){
+				if(substr($file,0,1)!='.' and is_file($apps_dir.'/'.$file.'/appinfo/app.php')){
+					$apps[]=$file;
+				}
 			}
 		}
 		return $apps;
@@ -530,14 +546,14 @@ class OC_App{
 	 * @param string appid
 	 */
 	public static function updateApp($appid){
-		if(file_exists(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml')){
-			OC_DB::updateDbFromStructure(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml');
+		if(file_exists(self::getAppPath($appid).'/appinfo/database.xml')){
+			OC_DB::updateDbFromStructure(self::getAppPath($appid).'/appinfo/database.xml');
 		}
 		if(!self::isEnabled($appid)){
 			return;
 		}
-		if(file_exists(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php')){
-			include OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php';
+		if(file_exists(self::getAppPath($appid).'/appinfo/update.php')){
+			include self::getAppPath($appid).'/appinfo/update.php';
 		}
 
 		//set remote/public handelers
diff --git a/lib/base.php b/lib/base.php
index a65a33b166..b494bbcabc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -57,7 +57,7 @@ class OC{
 	/**
 	 * The installation path of the apps folder on the server (e.g. /srv/http/owncloud)
 	 */
-	public static $APPSROOT = '';
+	public static $APPSROOTS = array();
 	/**
 	 * the root path of the apps folder for http requests (e.g. owncloud)
 	 */
@@ -168,15 +168,17 @@ class OC{
 
 		// search the apps folder
 		if(OC_Config::getValue('appsroot', '')<>''){
-			OC::$APPSROOT=OC_Config::getValue('appsroot', '');
+			OC::$APPSROOTS=explode(':',OC_Config::getValue('appsroot', ''));
 			OC::$APPSWEBROOT=OC_Config::getValue('appsurl', '');
 		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
-			OC::$APPSROOT=OC::$SERVERROOT;
-			OC::$APPSWEBROOT=OC::$WEBROOT;
-		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
-			OC::$APPSWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
-		}else{
+			OC::$APPSROOTS= array(OC::$SERVERROOT.'/apps');
+ 			OC::$APPSWEBROOT=OC::$WEBROOT;
+		}
+		if(file_exists(OC::$SERVERROOT.'/../apps')){
+			OC::$APPSROOTS[] = rtrim(realpath(OC::$SERVERROOT.'/../apps'), '/');
+// 			OC::$APPSWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
+		}
+		if(empty(OC::$APPSROOTS)){
 			echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
 			exit;
 		}
@@ -186,8 +188,7 @@ class OC{
 			OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.
 			OC::$SERVERROOT.'/config'.PATH_SEPARATOR.
 			OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.
-			OC::$APPSROOT.PATH_SEPARATOR.
-			OC::$APPSROOT.'/apps'.PATH_SEPARATOR.
+			implode(OC::$APPSROOTS,PATH_SEPARATOR).PATH_SEPARATOR.
 			get_include_path().PATH_SEPARATOR.
 			OC::$SERVERROOT
 		);
@@ -273,15 +274,15 @@ class OC{
 	}
 
 	public static function loadapp(){
-		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php')){
-			require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php');
+		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')){
+			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
 		}else{
 			trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead?
 		}
 	}
 
 	public static function loadfile(){
-		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){
+		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . OC::$REQUESTEDFILE)){
 			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
 				$file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
 				$minimizer = new OC_Minimizer_CSS();
@@ -453,8 +454,8 @@ class OC{
 			$_GET['getfile'] = $file;
 		}
 		if(!is_null(self::$REQUESTEDFILE)){
-			$subdir = OC::$APPSROOT . '/apps/' . self::$REQUESTEDAPP . '/' . self::$REQUESTEDFILE;
-			$parent = OC::$APPSROOT . '/apps/' . self::$REQUESTEDAPP;
+			$subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
+			$parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
 			if(!OC_Helper::issubdirectory($subdir, $parent)){
 				self::$REQUESTEDFILE = null;
 				header('HTTP/1.0 404 Not Found');
diff --git a/lib/helper.php b/lib/helper.php
index decc1d6133..72ae98222d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -40,7 +40,7 @@ class OC_Helper {
 		if( $app != '' ){
 			$app .= '/';
 			// Check if the app is in the app folder
-			if( file_exists( OC::$APPSROOT . '/apps/'. $app.$file )){
+			if( file_exists( OC_App::getAppPath($app).$file )){
 				if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){	
 					if(substr($app, -1, 1) == '/'){
 						$app = substr($app, 0, strlen($app) - 1);
@@ -150,7 +150,7 @@ class OC_Helper {
 		// Check if the app is in the app folder
 		if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )){
 			return OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
-		}elseif( file_exists( OC::$APPSROOT."/apps/$app/img/$image" )){
+		}elseif( file_exists(OC_App::getAppPath($app)."/img/$image" )){
 			return OC::$APPSWEBROOT."/apps/$app/img/$image";
 		}elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/themes/$theme/$app/img/$image" )){
 			return OC::$WEBROOT."/themes/$theme/$app/img/$image";
diff --git a/lib/l10n.php b/lib/l10n.php
index 682e15f0e9..70b32b9298 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -263,8 +263,8 @@ class OC_L10N{
 		$i18ndir = OC::$SERVERROOT.'/core/l10n/';
 		if($app != ''){
 			// Check if the app is in the app folder
-			if(file_exists(OC::$APPSROOT.'/apps/'.$app.'/l10n/')){
-				$i18ndir = OC::$APPSROOT.'/apps/'.$app.'/l10n/';
+			if(file_exists(OC_App::getAppPath($app).'/l10n/')){
+				$i18ndir = OC_App::getAppPath($app).'/l10n/';
 			}
 			else{
 				$i18ndir = OC::$SERVERROOT.'/'.$app.'/l10n/';
diff --git a/lib/template.php b/lib/template.php
index 14833a1e5b..a354d58a4b 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -202,10 +202,10 @@ class OC_Template{
 		// Check if it is a app template or not.
 		if( $app != "" ){
 			// Check if the app is in the app folder or in the root
-			if( file_exists( OC::$APPSROOT."/apps/$app/templates/" )){
+			if( file_exists(OC_App::getAppPath($app)."/templates/" )){
 				// Check if the template is overwritten by the selected theme
 				if ($this->checkPathForTemplate(OC::$SERVERROOT."/themes/$theme/apps/$app/templates/", $name, $fext)) {
-				}elseif ($this->checkPathForTemplate(OC::$APPSROOT."/apps/$app/templates/", $name, $fext)) {
+				}elseif ($this->checkPathForTemplate(OC_App::getAppPath($app)."/templates/", $name, $fext)) {
 				}
 			}else{
 				// Check if the template is overwritten by the selected theme
@@ -317,29 +317,32 @@ class OC_Template{
 		}
 	}
 
-	/*
+	/**
 	 * @brief append the $file-url if exist at $root
 	 * @param $type of collection to use when appending
 	 * @param $root path to check
 	 * @param $web base for path
 	 * @param $file the filename
+	 * @param $in_app boolean is part of an app? (default false)
 	 */
-        public function appendIfExist($type, $root, $web, $file) {
-                if (is_file($root.'/'.$file)) {
-                		$pathes = explode('/', $file);
-                		if($type == 'cssfiles' && $root == OC::$APPSROOT && $pathes[0] == 'apps'){
-                				$app = $pathes[1];
-                				unset($pathes[0]);
-                				unset($pathes[1]);
-                				$path = implode('/', $pathes);
-                				$this->append( $type, OC_Helper::linkTo($app, $path));
-                		}else{
-                				$this->append( $type, $web.'/'.$file);
-                		}
-                        return true;
-                }
-                return false;
-        }
+	public function appendIfExist($type, $root, $web, $file, $in_app = false) {
+		
+		if (is_file($root.'/'.$file)) {
+				$pathes = explode('/', $file);
+				if($type == 'cssfiles' && $root == OC::$APPSROOTS[0] && $in_app){
+						$app = $pathes[0];
+						unset($pathes[0]);
+// 						unset($pathes[1]);
+						$path = implode('/', $pathes);
+						$this->append( $type, OC_Helper::linkTo($app, $path));
+				}else{
+						$this->append( $type, $web.'/'.$file);
+ 				}
+						return true;
+		}
+		return false;
+	}
+
 	/**
 	 * @brief Proceeds the template
 	 * @returns content
@@ -385,16 +388,12 @@ class OC_Template{
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
 				// Is it in 3rd party?
-                                if($page->appendIfExist('jsfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+				if($page->appendIfExist('jsfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
 
 				// Is it in apps and overwritten by the theme?
 				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
 				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
 
-				// Is it part of an app?
-				}elseif($page->appendIfExist('jsfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
-
 				// Is it in the owncloud root but overwritten by the theme?
 				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
 				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
@@ -412,20 +411,24 @@ class OC_Template{
 				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
 
 				}else{
-					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
-
+					// Is it part of an app?
+					$append = false;
+					foreach( OC::$APPSROOTS as $apps_dir)
+					{
+						if($page->appendIfExist('jsfiles', $apps_dir, OC::$APPSWEBROOT.'/apps/', "$script$fext.js" , true)) { $append =true; break; }
+						elseif($page->appendIfExist('jsfiles', $apps_dir, OC::$APPSWEBROOT.'/apps/', "$script.js", true )) { $append =true; break; }
+					}
+					if(! $append) {
+						echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+						die();
+					}
 				}
 			}
 			// Add the css files
 			$page->assign('cssfiles', array());
 			foreach(OC_Util::$styles as $style){
 				// is it in 3rdparty?
-                                if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
-
-				// or in apps?
-				}elseif($page->appendIfExist('cssfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
-				}elseif($page->appendIfExist('cssfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
+				if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
 
 				// or in the owncloud root?
 				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
@@ -436,22 +439,31 @@ class OC_Template{
 				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 				}else{
-					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
+					// or in apps?
+					$append = false;
+					foreach( OC::$APPSROOTS as $apps_dir)
+					{
+						if($page->appendIfExist('cssfiles', $apps_dir, OC::$APPSWEBROOT, "$style$fext.css", true)) { $append =true; break; }
+						elseif($page->appendIfExist('cssfiles', $apps_dir, OC::$APPSWEBROOT, "$style.css", true )) { $append =true; break; }
+					}
+					if(! $append) {
+						echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+						die();
+					}
 				}
 			}
 			// Add the theme css files. you can override the default values here
 			if(!empty($theme)) {
 				foreach(OC_Util::$styles as $style){
-                                             if($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
+					if($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
+					}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
 
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
+					}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
+					}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
 
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
-                                        }
+					}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
+					}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
+					}
 				}
 			}
 

From 6832aec60fcdcc7e8b6433d8f9103cdf347f32ed Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 1 Jun 2012 22:11:03 +0000
Subject: [PATCH 0197/1537] Correct installer

---
 lib/installer.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index 5c030d2917..afe0b9e1bb 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -126,7 +126,7 @@ class OC_Installer{
 			return false;
 		}
 		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true);
-		$basedir=OC::$APPSROOT.'/apps/'.$info['id'];
+		$basedir=OC_App::getAppPath($info['id']);
 
                 // check the code for not allowed calls
                 if(!OC_Installer::checkCode($info['id'],$extractDir)){
@@ -312,13 +312,13 @@ class OC_Installer{
 	 */
 	public static function installShippedApp($app){
 		//install the database
-		if(is_file(OC::$APPSROOT."/apps/$app/appinfo/database.xml")){
-			OC_DB::createDbFromStructure(OC::$APPSROOT."/apps/$app/appinfo/database.xml");
+		if(is_file(OC_App::getAppPath($app)."/appinfo/database.xml")){
+			OC_DB::createDbFromStructure(OC_App::getAppPath($app)."/appinfo/database.xml");
 		}
 
 		//run appinfo/install.php
-		if(is_file(OC::$APPSROOT."/apps/$app/appinfo/install.php")){
-			include(OC::$APPSROOT."/apps/$app/appinfo/install.php");
+		if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")){
+			include(OC_App::getAppPath($app)."/appinfo/install.php");
 		}
 		$info=OC_App::getAppInfo($app);
 		OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));

From cc494259d3e1fc60e82452dfdc1d0e0e0cd848e9 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 3 Jun 2012 21:13:30 +0000
Subject: [PATCH 0198/1537] Unit path and webpath, correct some more

---
 apps/bookmarks/templates/list.php |  2 +-
 core/templates/layout.user.php    |  3 ++-
 lib/app.php                       | 22 +++++++++++++++++-----
 lib/base.php                      | 31 ++++++++++++++++---------------
 lib/helper.php                    |  4 ++--
 lib/template.php                  |  8 ++++----
 6 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index fdd2b19f79..84436ae740 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -20,7 +20,7 @@
 <div id="firstrun" style="display: none;">
 	<?php
 		echo $l->t('You have no bookmarks');
-		require_once(OC::$APPSROOT . '/apps/bookmarks/templates/bookmarklet.php');
+		require_once(OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php');
 		createBookmarklet(); 
 	?>
 </div>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8f6c029007..5f00a884a0 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -12,7 +12,8 @@
 		<?php endforeach; ?>
 		<script type="text/javascript">
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
+			var oc_appswebroot = '<?php //echo OC::$APPSWEBROOT; ?>';
+			// TODO: PATH
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
 		<?php if (!defined('DEBUG') || !DEBUG): ?>
diff --git a/lib/app.php b/lib/app.php
index 13b6617b23..5883a29bb0 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -328,11 +328,23 @@ class OC_App{
 	*/
 	public static function getAppPath($appid) {
 		foreach(OC::$APPSROOTS as $dir) {
-			if(file_exists($dir.'/'.$appid)) {
-				return $dir.'/'.$appid;
+			if(file_exists($dir['path'].'/'.$appid)) {
+				return $dir['path'].'/'.$appid;
+			}
+		}
+		return false;
+	}
+
+	/**
+	* Get the path for the given app on the access
+	* If the app is defined in multiple directory, the first one is taken. (false if not found)
+	*/
+	public static function getAppWebPath($appid) {
+		foreach(OC::$APPSROOTS as $dir) {
+			if(file_exists($dir['path'].'/'.$appid)) {
+				return $dir['web'].'/'.$appid;
 			}
 		}
-// 		OC_Log::write('core','Unable to find app "'.$appid.'"',OC_Log::ERROR);
 		return false;
 	}
 
@@ -477,9 +489,9 @@ class OC_App{
 	public static function getAllApps(){
 		$apps=array();
 		foreach(OC::$APPSROOTS as $apps_dir) {
-			$dh=opendir($apps_dir);
+			$dh=opendir($apps_dir['path']);
 			while($file=readdir($dh)){
-				if(substr($file,0,1)!='.' and is_file($apps_dir.'/'.$file.'/appinfo/app.php')){
+				if(substr($file,0,1)!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')){
 					$apps[]=$file;
 				}
 			}
diff --git a/lib/base.php b/lib/base.php
index b494bbcabc..131485961a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -55,13 +55,9 @@ class OC{
 	 */
 	public static $THIRDPARTYWEBROOT = '';
 	/**
-	 * The installation path of the apps folder on the server (e.g. /srv/http/owncloud)
+	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'real' and web path in 'web'
 	 */
 	public static $APPSROOTS = array();
-	/**
-	 * the root path of the apps folder for http requests (e.g. owncloud)
-	 */
-	public static $APPSWEBROOT = '';
 	/*
 	 * requested app
 	 */
@@ -168,27 +164,31 @@ class OC{
 
 		// search the apps folder
 		if(OC_Config::getValue('appsroot', '')<>''){
-			OC::$APPSROOTS=explode(':',OC_Config::getValue('appsroot', ''));
-			OC::$APPSWEBROOT=OC_Config::getValue('appsurl', '');
-		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
-			OC::$APPSROOTS= array(OC::$SERVERROOT.'/apps');
- 			OC::$APPSWEBROOT=OC::$WEBROOT;
-		}
-		if(file_exists(OC::$SERVERROOT.'/../apps')){
-			OC::$APPSROOTS[] = rtrim(realpath(OC::$SERVERROOT.'/../apps'), '/');
-// 			OC::$APPSWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
+			$real_a = explode(':',OC_Config::getValue('appsroot', ''));
+			$web_a = explode(':',OC_Config::getValue('appsurl', ''));
+			foreach($real_a as $k => $path) {
+				if(!isset($web_a[$k])){
+					echo("Apps root and appsurl not mathing. You need to have the same number of paths");
+					exit;
+				}
+				OC::$APPSROOTS[] = array('path'=> $path, 'web' => $web_a[$k]);
+			}
 		}
+
 		if(empty(OC::$APPSROOTS)){
 			echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
 			exit;
 		}
+		$paths = array();
+		foreach( OC::$APPSROOTS as $path)
+			$paths[] = $path['path'];
 
 		// set the right include path
 		set_include_path(
 			OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.
 			OC::$SERVERROOT.'/config'.PATH_SEPARATOR.
 			OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.
-			implode(OC::$APPSROOTS,PATH_SEPARATOR).PATH_SEPARATOR.
+			implode($paths,PATH_SEPARATOR).PATH_SEPARATOR.
 			get_include_path().PATH_SEPARATOR.
 			OC::$SERVERROOT
 		);
@@ -292,6 +292,7 @@ class OC{
 				require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
 			}
 		}else{
+			die();
 			header('HTTP/1.0 404 Not Found');
 			exit;
 		}
diff --git a/lib/helper.php b/lib/helper.php
index 72ae98222d..550bf9771e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -48,7 +48,7 @@ class OC_Helper {
 					$urlLinkTo =  OC::$WEBROOT . '/?app=' . $app;
 					$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
 				}else{
-					$urlLinkTo =  OC::$APPSWEBROOT . '/apps/' . $app . $file;
+					$urlLinkTo =  OC_App::getAppWebPath($app) . $file;
 				}
 			}
 			else{
@@ -151,7 +151,7 @@ class OC_Helper {
 		if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )){
 			return OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
 		}elseif( file_exists(OC_App::getAppPath($app)."/img/$image" )){
-			return OC::$APPSWEBROOT."/apps/$app/img/$image";
+			return OC_App::getAppWebPath($app)."/img/$image";
 		}elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/themes/$theme/$app/img/$image" )){
 			return OC::$WEBROOT."/themes/$theme/$app/img/$image";
 		}elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/$app/img/$image" )){
diff --git a/lib/template.php b/lib/template.php
index a354d58a4b..e6525ec633 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -415,8 +415,8 @@ class OC_Template{
 					$append = false;
 					foreach( OC::$APPSROOTS as $apps_dir)
 					{
-						if($page->appendIfExist('jsfiles', $apps_dir, OC::$APPSWEBROOT.'/apps/', "$script$fext.js" , true)) { $append =true; break; }
-						elseif($page->appendIfExist('jsfiles', $apps_dir, OC::$APPSWEBROOT.'/apps/', "$script.js", true )) { $append =true; break; }
+						if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
+						elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
 					}
 					if(! $append) {
 						echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -443,8 +443,8 @@ class OC_Template{
 					$append = false;
 					foreach( OC::$APPSROOTS as $apps_dir)
 					{
-						if($page->appendIfExist('cssfiles', $apps_dir, OC::$APPSWEBROOT, "$style$fext.css", true)) { $append =true; break; }
-						elseif($page->appendIfExist('cssfiles', $apps_dir, OC::$APPSWEBROOT, "$style.css", true )) { $append =true; break; }
+						if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
+						elseif($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
 					}
 					if(! $append) {
 						echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

From 6a250d0d20c92513a883a7103885712127b51cc8 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 4 Jun 2012 19:52:44 +0000
Subject: [PATCH 0199/1537] Correct css file inclusion

---
 lib/template.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/template.php b/lib/template.php
index e6525ec633..fdd608fdc7 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -329,10 +329,16 @@ class OC_Template{
 		
 		if (is_file($root.'/'.$file)) {
 				$pathes = explode('/', $file);
-				if($type == 'cssfiles' && $root == OC::$APPSROOTS[0] && $in_app){
+				$in_root = false;
+				foreach(OC::$APPSROOTS as $app_root) {
+					if($root == $app_root['path']) {
+						$in_root = true;
+						break;
+					}
+				}
+				if($type == 'cssfiles' && $in_root && $in_app){
 						$app = $pathes[0];
 						unset($pathes[0]);
-// 						unset($pathes[1]);
 						$path = implode('/', $pathes);
 						$this->append( $type, OC_Helper::linkTo($app, $path));
 				}else{

From 6a812644e4d0f6eed8dca4e20c6f7135d881012a Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 4 Jun 2012 20:37:00 +0000
Subject: [PATCH 0200/1537] Correct remote and public, and last occurence of
 OC::

---
 apps/bookmarks/ajax/addBookmark.php |  2 +-
 apps/calendar/appinfo/remote.php    |  4 ++--
 apps/media/remote.php               |  4 ++--
 apps/media/server/xml.server.php    |  4 ++--
 apps/user_webfinger/webfinger.php   |  2 +-
 lib/app.php                         |  4 ++--
 lib/helper.php                      |  2 +-
 lib/installer.php                   | 32 +++++++++++++++--------------
 public.php                          |  6 +++---
 remote.php                          |  6 +++---
 10 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 9241dc8ddf..d66aab5896 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -30,6 +30,6 @@ $RUNTIME_NOSETUPFS=true;
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
 
-require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php');
+require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
 $id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']);
 OCP\JSON::success(array('data' => $id));
\ No newline at end of file
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 3bd8737ee9..7ab546245f 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -7,8 +7,8 @@
  */
 OCP\App::checkAppEnabled('calendar');
 
-if(substr($_SERVER["REQUEST_URI"],0,strlen(OC::$APPSWEBROOT . '/apps/calendar/caldav.php')) == OC::$APPSWEBROOT . '/apps/calendar/caldav.php'){
-	$baseuri = OC::$APPSWEBROOT . '/apps/calendar/caldav.php';
+if(substr($_SERVER["REQUEST_URI"],0,strlen(OC_App::getAppWebPath('calendar').'/caldav.php')) == OC_App::getAppWebPath('calendar'). '/caldav.php'){
+	$baseuri = OC_App::getAppWebPath('calendar').'/caldav.php';
 }
 
 // only need authentication apps
diff --git a/apps/media/remote.php b/apps/media/remote.php
index 01add42b31..0535077cef 100644
--- a/apps/media/remote.php
+++ b/apps/media/remote.php
@@ -5,7 +5,7 @@ $RUNTIME_APPTYPES=array('filesystem','authentication');
 OC_App::loadApps($RUNTIME_APPTYPES);
 
 if($path_info == '/ampache' || $path_info == '/ampache/'){
-	require_once(OC::$APPSROOT . '/apps/media/index.php');
+	require_once(OC_App::getAppPath('media').'/index.php');
 }else{
-	require_once(OC::$APPSROOT . '/apps/media/server/xml.server.php');
+	require_once(OC_App::getAppPath('media').'/server/xml.server.php');
 }
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index 6cb6c91ca0..796da130a4 100644
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -22,8 +22,8 @@
 */
 
 OCP\App::checkAppEnabled('media');
- require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
- require_once(OC::$APPSROOT . '/apps/media/lib_ampache.php');
+ require_once(OC_App::getAppPath('media').'/lib_collection.php');
+ require_once(OC_App::getAppPath('media').'/lib_ampache.php');
 
 $arguments=$_POST;
 if(!isset($_POST['action']) and isset($_GET['action'])){
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index e75c546c2c..67cbba54a4 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -59,7 +59,7 @@ echo "{\"links\":[";
 $apps = OC_Appconfig::getApps();
 foreach($apps as $app) {
 	if(OCP\App::isEnabled($app)) {
-		if(is_file(OC::$APPSROOT . '/apps/' . $app . '/appinfo/webfinger.php')) {
+		if(is_file(OC_App::getAppPath($app). '/appinfo/webfinger.php')) {
 			require($app . '/appinfo/webfinger.php');
 		}
 	}
diff --git a/lib/app.php b/lib/app.php
index 5883a29bb0..43d60f3a68 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -571,10 +571,10 @@ class OC_App{
 		//set remote/public handelers
 		$appData=self::getAppInfo($appid);
 		foreach($appData['remote'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'remote_'.$name, '/apps/'.$appid.'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $path);
 		}
 		foreach($appData['public'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'public_'.$name, '/apps/'.$appid.'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'public_'.$name, $appid.'/'.$path);
 		}
 
 		self::setAppTypes($appid);
diff --git a/lib/helper.php b/lib/helper.php
index 550bf9771e..3cf5107eea 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -40,7 +40,7 @@ class OC_Helper {
 		if( $app != '' ){
 			$app .= '/';
 			// Check if the app is in the app folder
-			if( file_exists( OC_App::getAppPath($app).$file )){
+			if( file_exists( OC_App::getAppPath($app).'/'.$file )){
 				if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){	
 					if(substr($app, -1, 1) == '/'){
 						$app = substr($app, 0, strlen($app) - 1);
diff --git a/lib/installer.php b/lib/installer.php
index afe0b9e1bb..bfa34de2a7 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -197,10 +197,10 @@ class OC_Installer{
 
 		//set remote/public handelers
 		foreach($info['remote'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'remote_'.$name, '/apps/'.$info['id'].'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
 		foreach($info['public'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'public_'.$name, '/apps/'.$info['id'].'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);
@@ -287,22 +287,24 @@ class OC_Installer{
 	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
 	 */
 	public static function installShippedApps(){
-		$dir = opendir( OC::$APPSROOT."/apps" );
-		while( false !== ( $filename = readdir( $dir ))){
-			if( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$APPSROOT."/apps/$filename") ){
-				if( file_exists( OC::$APPSROOT."/apps/$filename/appinfo/app.php" )){
-					if(!OC_Installer::isInstalled($filename)){
-						$info=OC_App::getAppInfo($filename);
-						$enabled = isset($info['default_enable']);
-						if( $enabled ){
-							OC_Installer::installShippedApp($filename);
-							OC_Appconfig::setValue($filename,'enabled','yes');
+		foreach(OC::$APPSROOTS as $app_dir) {
+			$dir = opendir( $app_dir['path'] );
+			while( false !== ( $filename = readdir( $dir ))){
+				if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ){
+					if( file_exists( $app_dir['path']."/$filename/appinfo/app.php" )){
+						if(!OC_Installer::isInstalled($filename)){
+							$info=OC_App::getAppInfo($filename);
+							$enabled = isset($info['default_enable']);
+							if( $enabled ){
+								OC_Installer::installShippedApp($filename);
+								OC_Appconfig::setValue($filename,'enabled','yes');
+							}
 						}
 					}
 				}
 			}
+			closedir( $dir );
 		}
-		closedir( $dir );
 	}
 
 	/**
@@ -325,10 +327,10 @@ class OC_Installer{
 		
 		//set remote/public handelers
 		foreach($info['remote'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'remote_'.$name, '/apps/'.$app.'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
 		foreach($info['public'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'public_'.$name, '/apps/'.$app.'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 		
 		OC_App::setAppTypes($info['id']);
diff --git a/public.php b/public.php
index f974e1c50d..19c02a7a02 100644
--- a/public.php
+++ b/public.php
@@ -8,8 +8,8 @@ if(is_null($file)){
 	exit;
 }
 
-$parts=explode('/',$file);
-$app=$parts[2];
+$parts=explode('/',$file,2);
+$app=$parts[0];
 OC_App::loadApp($app);
 
-require_once(OC::$APPSROOT . $file);
+require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
diff --git a/remote.php b/remote.php
index 7131dfc940..55b088d775 100644
--- a/remote.php
+++ b/remote.php
@@ -17,9 +17,9 @@ if(is_null($file)){
 	exit;
 }
 
-$parts=explode('/',$file);
-$app=$parts[2];
+$parts=explode('/', $file, 2);
+$app=$parts[0];
 OC_App::loadApp($app);
 
 $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-require_once(OC::$APPSROOT . $file);
\ No newline at end of file
+require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
\ No newline at end of file

From 5c2b2fc8425e7fa52945b53058ac67f67d228409 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 6 Jun 2012 19:54:57 +0000
Subject: [PATCH 0201/1537] Change app path logic in templates

---
 apps/contacts/appinfo/remote.php | 4 ++--
 core/js/js.js                    | 8 +++-----
 core/templates/layout.guest.php  | 2 +-
 core/templates/layout.user.php   | 3 +--
 lib/template.php                 | 5 +++++
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index ef50e4ad39..5add3bc688 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -22,8 +22,8 @@
 
 OCP\App::checkAppEnabled('contacts');
 
-if(substr($_SERVER["REQUEST_URI"],0,strlen(OC::$APPSWEBROOT . '/apps/contacts/carddav.php')) == OC::$APPSWEBROOT . '/apps/contacts/carddav.php'){
-	$baseuri = OC::$APPSWEBROOT . '/apps/contacts/carddav.php';
+if(substr($_SERVER["REQUEST_URI"],0,strlen(OC_App::getAppWebPath('contacts').'/carddav.php')) == OC_App::getAppWebPath('contacts').'/carddav.php'){
+	$baseuri = OC_App::getAppWebPath('contacts').'/carddav.php';
 }
 
 // only need authentication apps
diff --git a/core/js/js.js b/core/js/js.js
index 89a20a529f..a1ad0c7718 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,10 +63,8 @@ OC={
 				link+= file;
 			}
 		}else if(file.substring(file.length-3) != 'php' && !isCore){
-			link=OC.appswebroot;
-			link+='/';
-			link+='apps/';
-			link+=app+'/';
+			link=OC.appswebroots[app];
+			link+='/'+app+'/';
 			if(type){
 				link+=type+'/';
 			}
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7f5a4d50fc..7a96891771 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -12,7 +12,7 @@
 		<?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 (!defined('DEBUG') || !DEBUG): ?>
 		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 5f00a884a0..91cfa1a87a 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -12,8 +12,7 @@
 		<?php endforeach; ?>
 		<script type="text/javascript">
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroot = '<?php //echo OC::$APPSWEBROOT; ?>';
-			// TODO: PATH
+			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
 		<?php if (!defined('DEBUG') || !DEBUG): ?>
diff --git a/lib/template.php b/lib/template.php
index fdd608fdc7..6fe0710203 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -383,6 +383,11 @@ class OC_Template{
 			}else{
 				$page = new OC_Template( "core", "layout.guest" );
 			}
+			$apps_paths = array();
+			foreach(OC_App::getEnabledApps() as $app){
+				$apps_paths[$app] = OC_App::getAppWebPath($app);
+			}
+			$page->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)) ); // Ugly unescape slashes waiting for better solution
 
 			// Read the selected theme from the config file
 			$theme=OC_Config::getValue( "theme" );

From 8dba47d466d3c5f411c4abe42f292c277cf8267f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 6 Jun 2012 21:58:36 +0200
Subject: [PATCH 0202/1537] Add layer to select fast or slow cache for storing
 values

---
 lib/cache.php        | 10 ++++++++
 lib/cache/broker.php | 55 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 lib/cache/broker.php

diff --git a/lib/cache.php b/lib/cache.php
index 70f11f3551..55d5b064c4 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -10,7 +10,17 @@ class OC_Cache {
 	static protected $cache;
 
 	static protected function init() {
+		$fast_cache = null;
+		if (!$fast_cache && function_exists('xcache_set')) {
+			$fast_cache = new OC_Cache_XCache();
+		}
+		if (!$fast_cache && function_exists('apc_store')) {
+			$fast_cache = new OC_Cache_APC();
+		}
 		self::$cache = new OC_Cache_File();
+		if ($fast_cache) {
+			self::$cache = new OC_Cache_Broker($fast_cache, self::$cache);
+		}
 	}
 
 	static public function get($key) {
diff --git a/lib/cache/broker.php b/lib/cache/broker.php
new file mode 100644
index 0000000000..62a7cd96d1
--- /dev/null
+++ b/lib/cache/broker.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache_Broker {
+	protected $fast_cache;
+	protected $slow_cache;
+
+	public function __construct($fast_cache, $slow_cache) {
+		$this->fast_cache = $fast_cache;
+		$this->slow_cache = $slow_cache;
+	}
+
+	public function get($key) {
+		if ($r = $this->fast_cache->get($key)) {
+			return $r;
+		}
+		return $this->slow_cache->get($key);
+	}
+
+	public function set($key, $value, $ttl=0) {
+		$set_slow = strlen($value) > 8192;
+		if ($set_slow) {
+			if ($this->fast_cache->hasKey($key)) {
+				$this->fast_cache->remove($key);
+			}
+			$this->slow_cache->set($key, $value, $ttl);
+		} else {
+			$this->fast_cache->set($key, $value, $ttl);
+		}
+	}
+
+	public function hasKey($key) {
+		if ($this->fast_cache->hasKey($key)) {
+			return true;
+		}
+		return $this->slow_cache->hasKey($key);
+	}
+
+	public function remove($key) {
+		if ($this->fast_cache->remove($key)) {
+			return true;
+		}
+		return $this->slow_cache->remove($key);
+	}
+
+	public function clear(){
+		$this->fast_cache->clear();
+		$this->slow_cache->clear();
+	}
+}

From e8447e0bda25744c4836a8fdf009a98174264eda Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 6 Jun 2012 21:11:15 +0000
Subject: [PATCH 0203/1537] Rework to fit with minizer

---
 lib/base.php          |  6 +++---
 lib/minimizer/css.php | 29 ++++++++++++++++++++---------
 lib/minimizer/js.php  | 17 +++++++++++------
 remote.php            | 18 +++++++++++++-----
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 131485961a..0d205c8f78 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -284,12 +284,12 @@ class OC{
 	public static function loadfile(){
 		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . OC::$REQUESTEDFILE)){
 			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
-				$file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
+				$file = OC_App::getAppWebPath(OC::$REQUESTEDAPP). '/' . OC::$REQUESTEDFILE;
 				$minimizer = new OC_Minimizer_CSS();
-				$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)));
+				$minimizer->output(array(array(OC_App::getAppPath(OC::$REQUESTEDAPP), OC_App::getAppWebPath(OC::$REQUESTEDAPP), OC::$REQUESTEDFILE)));
 				exit;
 			}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
-				require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
+				require_once(OC_App::getAppPath(OC::$REQUESTEDAPP). '/' . OC::$REQUESTEDFILE);
 			}
 		}else{
 			die();
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 4637417579..76dc99b335 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -16,10 +16,6 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			// is it in 3rdparty?
 			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
 
-			// or in apps?
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
-
 			// or in the owncloud root?
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
@@ -29,8 +25,16 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 			}else{
-				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
+				$append = false;
+				foreach( OC::$APPSROOTS as $apps_dir)
+				{
+					if($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
+					elseif($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
+				}
+				if(! $append) {
+					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					die();
+				}
 			}
 		}
 		// Add the theme css files. you can override the default values here
@@ -52,14 +56,21 @@ class OC_Minimizer_CSS extends OC_Minimizer
 
 	public function minimizeFiles($files) {
 		$css_out = '';
-		$appswebroot = (string) OC::$APPSWEBROOT;
 		$webroot = (string) OC::$WEBROOT;
 		foreach($files as $file_info) {
 			$file = $file_info[0] . '/' . $file_info[2];
 			$css_out .= '/* ' . $file . ' */' . "\n";
 			$css = file_get_contents($file);
-			if (strpos($file, OC::$APPSROOT) == 0) {
-				$css = str_replace('%appswebroot%', $appswebroot, $css);
+
+			$in_root = false;
+			foreach(OC::$APPSROOTS as $app_root) {
+				if(strpos($file, $app_root['path']) == 0) {
+					$in_root = $app_root['web'];
+					break;
+				}
+			}
+			if ($in_root !== false) {
+				$css = str_replace('%appswebroot%', $in_root, $css);
 				$css = str_replace('%webroot%', $webroot, $css);
 			}
 			$remote = $file_info[1];
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index 4ddaa79d81..aea8b66f91 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -21,10 +21,6 @@ class OC_Minimizer_JS extends OC_Minimizer
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
 
-			// Is it part of an app?
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
-
 			// Is it in the owncloud root but overwritten by the theme?
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
@@ -42,8 +38,17 @@ class OC_Minimizer_JS extends OC_Minimizer
 			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
 
 			}else{
-				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
+				// Is it part of an app?
+				$append = false;
+				foreach( OC::$APPSROOTS as $apps_dir)
+				{
+					if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
+					elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
+				}
+				if(! $append) {
+					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					die();
+				}
 			}
 		}
 		return $this->files;
diff --git a/remote.php b/remote.php
index 55b088d775..e1e11c5773 100644
--- a/remote.php
+++ b/remote.php
@@ -17,9 +17,17 @@ if(is_null($file)){
 	exit;
 }
 
-$parts=explode('/', $file, 2);
-$app=$parts[0];
-OC_App::loadApp($app);
+if(count(explode('/',$file)) == 3) {
+	$parts=explode('/',$file);
+	$app=$parts[2];
+	OC_App::loadApp($app);
+	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	require_once( OC::$SERVERROOT.$file);
 
-$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
\ No newline at end of file
+} else {
+	$parts=explode('/', $file, 2);
+	$app=$parts[0];
+	OC_App::loadApp($app);
+	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
+}

From 5417d803c454a60c83e55ab574f56b88c8dba2a1 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 6 Jun 2012 23:23:23 +0200
Subject: [PATCH 0204/1537] replace spaces with tabs, use const and linkTo
 instead of static path

---
 apps/gallery/lib/tiles.php | 269 ++++++++++++++++++-------------------
 1 file changed, 133 insertions(+), 136 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 3805b6dd25..6f8b8aa7fe 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -5,177 +5,174 @@ namespace OC\Pictures;
 require_once('lib/base.php');
 require_once('managers.php');
 
-const TILE_PROPORTION_HORIZONTAL = 0;
-const TILE_PROPORTION_VERTICAL = 0;
-const GET_THUMBNAIL_PATH = '?app=gallery&getfile=ajax/thumbnail.php&filepath=';
 const TAG = 'Pictures';
 const IMAGE_WIDTH = 150;
 
 class TileBase {
-  public function getWidth() { return false; }
+	public function getWidth() { return false; }
 
-  public function getHeight() { return 150; }
+	public function getHeight() { return IMAGE_WIDTH; }
 
-  public function getOnHoverAction() { return false; }
-  
-  public function getOnOutAction() { return false; }
-  
-  public function getOnClickAction() { return false; }
+	public function getOnHoverAction() { return false; }
+	
+	public function getOnOutAction() { return false; }
+	
+	public function getOnClickAction() { return false; }
 
-  public function getDisplayedLayer() { return false; }
+	public function getDisplayedLayer() { return false; }
 
-  public function getTileProportion() { return false; }
-  
-  public function get() { return false; }
+	public function getTileProportion() { return false; }
+	
+	public function get() { return false; }
 }
 
 class TilesLine {
 
-  public function __construct() {
-    $this->tiles_array = array();
-  }
+	public function __construct() {
+		$this->tiles_array = array();
+	}
 
-  public function setAvailableSpace($space) {
-    $available_space = $space;
-  }
+	public function setAvailableSpace($space) {
+		$available_space = $space;
+	}
 
-  public function getTilesCount() {
-    return count($this->tiles_array);
-  }
+	public function getTilesCount() {
+		return count($this->tiles_array);
+	}
 
-  public function addTile($tile) {
-    array_push($this->tiles_array, $tile);
-  }
+	public function addTile($tile) {
+		array_push($this->tiles_array, $tile);
+	}
 
-  public function getLeftSpace() {
-    $occupied_space = 0;
-    for ($i = 0; $i < count($this->tiles_array); $i++) {
-      $occupied_space += $this->tiles_array[$i]->getWidth();
-    }
-    return $this->available_space - $occupied_space;
-  }
+	public function getLeftSpace() {
+		$occupied_space = 0;
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$occupied_space += $this->tiles_array[$i]->getWidth();
+		}
+		return $this->available_space - $occupied_space;
+	}
 
-  public function tileWillFit($tile) {
-    return $this->getLeftSpace() > $tile->getWidth();
-  }
-  
-  public function get() {
-	  $r = '<div class="line gallery_div">';
-	  
-	  for ($i = 0; $i < count($this->tiles_array); $i++) {
-	  	  $img_w = $this->tiles_array[$i]->getWidth();
-	  	  $extra = '';
-	  	  if ($img_w != 150) $extra = ' style="width:'.$img_w.'px"';
-		  $r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
-	  }
-	  
-	  $r .= '</div>';
-	  return $r;
-  }
+	public function tileWillFit($tile) {
+		return $this->getLeftSpace() > $tile->getWidth();
+	}
+	
+	public function get() {
+		$r = '<div class="line gallery_div">';
+		
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+				$img_w = $this->tiles_array[$i]->getWidth();
+				$extra = '';
+				if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
+			$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
+		}
+		
+		$r .= '</div>';
+		return $r;
+	}
 
-  private $tiles_array;
-  private $available_space;
+	private $tiles_array;
+	private $available_space;
 }
 
 class TileSingle extends TileBase {
 
-  public function __construct($path) {
-    \OC_Log::write(TAG, 'Loading file from path '.$path, \OC_Log::DEBUG);
-    $this->file_path = $path;
-/*    $this->image = new \OC_Image();
-    if (!$this->image->loadFromFile($this->file_path)) {
-      \OC_Log::write(TAG, 'Loading file filed', \OC_Log::ERROR);
-      return;
-    }
-    $this->image->fixOrientation();*/
-  }
+	public function __construct($path) {
+		\OC_Log::write(TAG, 'Loading file from path '.$path, \OC_Log::DEBUG);
+		$this->file_path = $path;
+/*		$this->image = new \OC_Image();
+		if (!$this->image->loadFromFile($this->file_path)) {
+			\OC_Log::write(TAG, 'Loading file filed', \OC_Log::ERROR);
+			return;
+		}
+		$this->image->fixOrientation();*/
+	}
 
-  public function getWidth() {
-    $a = ThumbnailsManager::getInstance()->getThumbnailInfo($this->file_path);
-    return $a['width'];
-  }
-  
-  public function get($extra = '') {
-    //  !HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
-    //  !HACK! will result in failing of opening them 
-    return '<a rel="images" href="?app=files&getfile=download.php?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'></a>';
-  }
-  
-  public function getMiniatureSrc() {
-	  return GET_THUMBNAIL_PATH.urlencode($this->getPath());
-  }
+	public function getWidth() {
+		$a = ThumbnailsManager::getInstance()->getThumbnailInfo($this->file_path);
+		return $a['width'];
+	}
+	
+	public function get($extra = '') {
+		//	!HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
+		//	!HACK! will result in failing of opening them 
+    return '<a rel="images" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
+	}
+	
+	public function getMiniatureSrc() {
+		return \OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath());
+	}
 
-  public function getPath() {
-	  return $this->file_path;
-  }
-  
-  public function getOnClickAction() {
-	  return '';//'javascript:openFile(\''.$this->file_path.'\');';
-  }
+	public function getPath() {
+		return $this->file_path;
+	}
+	
+	public function getOnClickAction() {
+		return '';//'javascript:openFile(\''.$this->file_path.'\');';
+	}
 
-  private $file_path;
-  private $image;
+	private $file_path;
+	private $image;
 }
 
 class TileStack extends TileBase {
 
-  const STACK_REPRESENTATIVES = 3;
+	const STACK_REPRESENTATIVES = 3;
 
-  public function __construct($path_array, $stack_name) {
-    $this->tiles_array = array();
-    $this->stack_name = $stack_name;
-    for ($i = 0; $i < count($path_array) && $i < self::STACK_REPRESENTATIVES; $i++) {
-	  $tile = new TileSingle($path_array[$i]);
-      array_push($this->tiles_array, $tile);
-    }
-  }
-  
-  public function forceSize($width_must_fit=false) {
-	  for ($i = 0; $i < count($this->tiles_array); $i++)
-	    $this->tiles_array[$i]->forceSize(true);
-  }
+	public function __construct($path_array, $stack_name) {
+		$this->tiles_array = array();
+		$this->stack_name = $stack_name;
+		for ($i = 0; $i < count($path_array) && $i < self::STACK_REPRESENTATIVES; $i++) {
+		$tile = new TileSingle($path_array[$i]);
+			array_push($this->tiles_array, $tile);
+		}
+	}
+	
+	public function forceSize($width_must_fit=false) {
+		for ($i = 0; $i < count($this->tiles_array); $i++)
+			$this->tiles_array[$i]->forceSize(true);
+	}
 
-  public function getWidth() {
-    $max = 0;
-    for ($i = 0; $i < count($this->tiles_array); $i++) {
-	    $max = max($max, $this->tiles_array[$i]->getWidth());
-    }
-    return min(IMAGE_WIDTH, $max);
-  }
+	public function getWidth() {
+		$max = 0;
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$max = max($max, $this->tiles_array[$i]->getWidth());
+		}
+		return min(IMAGE_WIDTH, $max);
+	}
 
-  public function get() {
-    $r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
-    for ($i = 0; $i < count($this->tiles_array); $i++) {
-      $top = rand(-5, 5);
-      $left = rand(-5, 5);
-      $img_w = $this->tiles_array[$i]->getWidth();
-      $extra = '';
-      if ($img_w < IMAGE_WIDTH) {
-	      $extra = 'width:'.$img_w.'px;';
-      }
-      $r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
-    }
-    return $r;
-  }
+	public function get() {
+		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$top = rand(-5, 5);
+			$left = rand(-5, 5);
+			$img_w = $this->tiles_array[$i]->getWidth();
+			$extra = '';
+			if ($img_w < IMAGE_WIDTH) {
+				$extra = 'width:'.$img_w.'px;';
+			}
+			$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
+		}
+		return $r;
+	}
 
-  public function getOnHoverAction() {
-	  return 'javascript:t(this);return false;';
-  }
-  
-  public function getOnOutAction() {
-	  return 'javascript:o(this);return false;';
-  }
+	public function getOnHoverAction() {
+		return 'javascript:t(this);return false;';
+	}
+	
+	public function getOnOutAction() {
+		return 'javascript:o(this);return false;';
+	}
 
-  public function getCount() {
-	  return count($this->tiles_array);
-  }
-  
-  public function getOnClickAction() {
-	  return 'javascript:openNewGal(\''.$this->stack_name.'\');';
-  }
+	public function getCount() {
+		return count($this->tiles_array);
+	}
+	
+	public function getOnClickAction() {
+		return 'javascript:openNewGal(\''.$this->stack_name.'\');';
+	}
 
-  private $tiles_array;
-  private $stack_name;
+	private $tiles_array;
+	private $stack_name;
 }
 
 ?>

From 8fd6cdf4074a568c188191d1f5bfe2bd64789f1b Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 6 Jun 2012 23:29:23 +0200
Subject: [PATCH 0205/1537] adding title when fancybox is displayed

---
 apps/gallery/lib/tiles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 6f8b8aa7fe..ff9519142a 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -95,7 +95,7 @@ class TileSingle extends TileBase {
 	public function get($extra = '') {
 		//	!HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
 		//	!HACK! will result in failing of opening them 
-    return '<a rel="images" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
+		return '<a rel="images" title="'.basename($this->getPath()).'" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
 	}
 	
 	public function getMiniatureSrc() {

From 9c841491192ddf249b73107346949be1889f4440 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 19:13:57 +0200
Subject: [PATCH 0206/1537] A bit of pixel-pushing.

---
 apps/contacts/css/contacts.css                  | 14 +++++++++++---
 .../templates/part.edit_address_dialog.php      | 17 ++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 1d02b3722d..8de68fbf05 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -31,8 +31,9 @@ dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; }
 .form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }
 .form dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0px; white-space: nowrap; vertical-align: text-bottom; }
 label:hover, dt:hover { color: #333; }
-#address.form dt { min-width: 5em; }
-#address.form dl { min-width: 10em; }
+/*::-webkit-input-placeholder { color: #bbb; }
+:-moz-placeholder { color: #bbb; }
+:-ms-input-placeholder { color: #bbb; }*/
 .droptarget { margin: 0.5em; padding: 0.5em; border: thin solid #ccc; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
 .droppable { margin: 0.5em; padding: 0.5em; border: thin dashed #333; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
 .loading { background: url('%webroot%/core/img/loading.gif') no-repeat center !important; /*cursor: progress; */ cursor: wait; }
@@ -79,10 +80,17 @@ label:hover, dt:hover { color: #333; }
 #addressdisplay { padding: 0.5em; }
 dl.addresscard { background-color: #fff; float: left; width: auto; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: 0; }
 dl.addresscard dd {}
-dl.addresscard dt { padding: 0.3em; font-weight: bold; clear: both; color: #bbb;}
+dl.addresscard dt { padding: 0.3em; font-weight: bold; clear: both; color: #aaa; }
 dl.addresscard dt:hover { color:#777; }
 dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
 dl.addresscard .action { float: right; }
+#address dt { width: 30%; white-space:nowrap; }
+#address dd { width: 66%; }
+#address input { width: 12em; padding: 0.6em 0.5em 0.4em; }
+#address input:-moz-placeholder { color: #aaa; }
+#address input::-webkit-input-placeholder { color: #aaa; }
+#address input:-ms-input-placeholder { color: #aaa; }
+#address input:placeholder { color: #aaa; }
 #adr_type {} /* Select */
 #adr_pobox {}
 #adr_extended {}
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
index 8b3425033c..7684795f34 100644
--- a/apps/contacts/templates/part.edit_address_dialog.php
+++ b/apps/contacts/templates/part.edit_address_dialog.php
@@ -24,18 +24,17 @@ foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):arra
 			<dd>
 				<input type="text" id="adr_pobox" name="value[ADR][0]" placeholder="<?php echo $l->t('PO Box'); ?>" value="<?php echo isset($adr['value'][0])?$adr['value'][0]:''; ?>">
 			</dd>
+			<dt>
+				<label class="label" for="adr_street"><?php echo $l->t('Street address'); ?></label>
+			</dt>
 			<dd>
+				<input type="text" id="adr_street" name="value[ADR][2]" placeholder="<?php echo $l->t('Street and number'); ?>" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
+			</dd>
 			<dt>
 				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_extended" name="value[ADR][1]" placeholder="<?php echo $l->t('Extended'); ?>" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_street" name="value[ADR][2]" placeholder="<?php echo $l->t('Street'); ?>" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
+				<input type="text" id="adr_extended" name="value[ADR][1]" placeholder="<?php echo $l->t('Apartment number etc.'); ?>" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
@@ -47,13 +46,13 @@ foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):arra
 				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_region" name="value[ADR][4]" placeholder="<?php echo $l->t('Region'); ?>" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
+				<input type="text" id="adr_region" name="value[ADR][4]" placeholder="<?php echo $l->t('E.g. state or province'); ?>" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_zipcode" name="value[ADR][5]" placeholder="<?php echo $l->t('Zipcode'); ?>" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
+				<input type="text" id="adr_zipcode" name="value[ADR][5]" placeholder="<?php echo $l->t('Postal code'); ?>" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>

From 3804f68ff568bf0d219502b5aa4e3979484581e6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 10:54:25 +0200
Subject: [PATCH 0207/1537] Contacts: Import upload button was obscured on
 Android browser.

---
 apps/contacts/js/contacts.js                       | 2 +-
 apps/contacts/templates/part.importaddressbook.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index e15dc0278f..6c9c1a5262 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1290,7 +1290,7 @@ Contacts={
 					$.getJSON(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
 						if(jsondata.status == 'success'){
 							$('#addressbook_dialog').html(jsondata.data.page).find('#chooseaddressbook_dialog').dialog({
-								width : 600,
+								minWidth : 600,
 								close : function(event, ui) {
 									$(this).dialog('destroy').remove();
 									$('#addressbook_dialog').remove();
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
index 6702262f23..cb5d68149e 100644
--- a/apps/contacts/templates/part.importaddressbook.php
+++ b/apps/contacts/templates/part.importaddressbook.php
@@ -22,7 +22,7 @@ if(OCP\App::isEnabled('files_encryption')) {
 			echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 			?>
 			</select>
-			<span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file to import contacts."); ?> (Max. <?php echo  $_['uploadMaxHumanFilesize']; ?>)</span>
+			<span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file<br />to import contacts."); ?> (Max. <?php echo  $_['uploadMaxHumanFilesize']; ?>)</span>
 			<a class="svg upload float" title="<?php echo $l->t('Select from HD'); ?>">
 			<input class="float" id="import_upload_start" type="file" accept="text/*" name="importfile" /></a>
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">

From e1f4978150a836ac9c7b2cb71e875fce32759b3f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 12:21:24 +0200
Subject: [PATCH 0208/1537] Calendar: Added more explicit sync links and fixed
 indentation.

---
 apps/calendar/templates/settings.php | 73 +++++++++++++++-------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 12117750ca..feb0665512 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -8,45 +8,50 @@
  */
 ?>
 <form id="calendar">
-        <fieldset class="personalblock">
+	<fieldset class="personalblock">
 	<legend><?php echo $l->t('Calendar'); ?></legend>
-        <table class="nostyle">
-            <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
-                <?php
-                $continent = '';
-                foreach($_['timezones'] as $timezone):
-                    $ex=explode('/', $timezone, 2);//obtain continent,city
-                    if (!isset($ex[1])) {
-                            $ex[1] = $ex[0];
-                            $ex[0] = "Other";
-                    }
-                    if ($continent!=$ex[0]):
-                        if ($continent!="") echo '</optgroup>';
-                        echo '<optgroup label="'.$ex[0].'">';
-                    endif;
+		<table class="nostyle">
+			<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
+				<?php
+				$continent = '';
+				foreach($_['timezones'] as $timezone):
+					$ex=explode('/', $timezone, 2);//obtain continent,city
+					if (!isset($ex[1])) {
+						$ex[1] = $ex[0];
+						$ex[0] = "Other";
+					}
+					if ($continent!=$ex[0]):
+						if ($continent!="") echo '</optgroup>';
+						echo '<optgroup label="'.$ex[0].'">';
+					endif;
 					$city=strtr($ex[1], '_', ' ');
-                    $continent=$ex[0];
-                    echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
-                endforeach;?>
-            </select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
+					$continent=$ex[0];
+					echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
+				endforeach;?>
+			</select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
 
-            <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
-                <select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
-                    <option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
-                    <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
-                </select>
-            </td></tr>
+			<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
+				<select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
+					<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
+					<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
+				</select>
+			</td></tr>
 
-            <tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
-                <select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
-                    <option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
-                    <option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
-                </select>
-            </td></tr>
+			<tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
+				<select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
+					<option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
+					<option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
+				</select>
+			</td></tr>
 
-        </table>
+		</table>
 
-        <?php echo $l->t('Calendar CalDAV syncing address:');?>
-        <code><?php echo OCP\Util::linkToRemote('caldav'); ?></code><br />
+		<?php echo $l->t('Calendar CalDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
+		<dl>
+		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
+		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?></code></dd>
+		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
+		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
+		</dl>
         </fieldset>
 </form>

From 312536dbf951a72ff849cdd57138eded6c4668e6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 13:08:42 +0200
Subject: [PATCH 0209/1537] Migration: Fixed wrong download URL:
 http://forum.owncloud.org/viewtopic.php?f=4&t=2511

---
 apps/user_migrate/js/export.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_migrate/js/export.js b/apps/user_migrate/js/export.js
index 2d660b2de6..aef45c45a7 100644
--- a/apps/user_migrate/js/export.js
+++ b/apps/user_migrate/js/export.js
@@ -9,7 +9,7 @@ $(document).ready(function(){
 			function(result){
 				if(result.status == 'success'){
 					// Download the file
-					window.location = OC.filePath('user_migrate','ajax','export.php?operation=download')	;
+					window.location = OC.linkTo('user_migrate','ajax/export.php') + '?operation=download';
 					$('.loading').hide();
 					$('#exportbtn').val(t('user_migrate', 'Export'));
 				} else {

From 470cb17f90840e9bb997d30c0e4575384fc5df72 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 12:44:59 +0200
Subject: [PATCH 0210/1537] ldap: check index carefully, can be 0

---
 apps/user_ldap/lib_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index f6942ad326..6f4c0b0aad 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -258,7 +258,7 @@ class OC_LDAP {
 			$key = self::recursiveArraySearch($knownObjects, $ldapObject['dn']);
 
 			//everything is fine when we know the group
-			if($key) {
+			if($key !== false) {
 				$ownCloudNames[] = $knownObjects[$key]['owncloud_name'];
 				continue;
 			}

From 6894882ca95033882526306b6a6794f41706eec2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 13:36:34 +0200
Subject: [PATCH 0211/1537] ldap: correct query condition and determining of
 success

---
 apps/user_ldap/lib_ldap.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 6f4c0b0aad..753243f2c4 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -380,12 +380,22 @@ class OC_LDAP {
 					SELECT 1
 					FROM '.$table.'
 					WHERE ldap_dn = ?
-						AND owncloud_name = ? )
+						OR owncloud_name = ? )
 		');
 
 		$res = $insert->execute(array($dn, $ocname, $dn, $ocname));
 
-		return !OCP\DB::isError($res);
+		if(OCP\DB::isError($res)) {
+			return false;
+		}
+
+		$insRows = $res->numRows();
+
+		if($insRows == 0) {
+			return false;
+		}
+
+		return true;
 	}
 
 	static public function fetchListOfUsers($filter, $attr) {

From 44880ab3fa31d8b0ad1475d277315e57407f9341 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 13:39:15 +0200
Subject: [PATCH 0212/1537] ldap: remove unused private functions

---
 apps/user_ldap/lib_ldap.php | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 753243f2c4..8ca5c978b3 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -329,30 +329,6 @@ class OC_LDAP {
 		return $query->execute()->fetchAll();
 	}
 
-	/**
-	 * @brief inserts a new group into the mappings table
-	 * @param $dn the record in question
-	 * @param $ocname the name to use in ownCloud
-	 * @returns true on success, false otherwise
-	 *
-	 * inserts a new group into the mappings table
-	 */
-	static private function mapGroup($dn, $ocname) {
-		return self::mapComponent($dn, $ocname, false);
-	}
-
-	/**
-	 * @brief inserts a new user into the mappings table
-	 * @param $dn the record in question
-	 * @param $ocname the name to use in ownCloud
-	 * @returns true on success, false otherwise
-	 *
-	 * inserts a new user into the mappings table
-	 */
-	static private function mapUser($dn, $ocname) {
-		return self::mapComponent($dn, $ocname, true);
-	}
-
 	/**
 	 * @brief inserts a new user or group into the mappings table
 	 * @param $dn the record in question

From 3c3a2b9b271ca64df2b7b7713585351d5d8cbeaf Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 7 Jun 2012 09:25:50 -0400
Subject: [PATCH 0213/1537] Remove old internal mail call for password reset,
 fixes bug oc-934

---
 core/lostpassword/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index f1d90eaeff..6bed7bdd93 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -23,7 +23,6 @@ if (isset($_POST['user'])) {
 			$msg = $tmpl->fetchPage();
 			$l = OC_L10N::get('core');
 			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
-			$r=mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from);
 			OC_MAIL::send($email,$_POST['user'],$l->t('ownCloud password reset'),$msg,$from,'ownCloud');
 			echo('sent');
 

From d2a8746c49884e6757338d2dbcf90e90dea62e35 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 12 May 2012 13:42:41 +0200
Subject: [PATCH 0214/1537] Edited combobox to adhere to coding standards and
 added a dblclick handler.

---
 apps/contacts/js/jquery.combobox.js | 43 ++++++++++++++++-------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/apps/contacts/js/jquery.combobox.js b/apps/contacts/js/jquery.combobox.js
index f12d1d7dd2..d9959eb6cd 100644
--- a/apps/contacts/js/jquery.combobox.js
+++ b/apps/contacts/js/jquery.combobox.js
@@ -23,16 +23,16 @@
 					minLength: 0,
 					source: function( request, response ) {
 						var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-						response( select.children( "option" ).map(function() {
+						response( select.children('option').map(function() {
 							var text = $( this ).text();
 							if ( this.value && ( !request.term || matcher.test(text) ) )
 								return {
 									label: text.replace(
 										new RegExp(
-											"(?![^&;]+;)(?!<[^<>]*)(" +
+											'(?![^&;]+;)(?!<[^<>]*)(' +
 											$.ui.autocomplete.escapeRegex(request.term) +
-											")(?![^<>]*>)(?![^&;]+;)", "gi"
-										), "<strong>$1</strong>" ),
+											')(?![^<>]*>)(?![^&;]+;)', 'gi'
+										), '<strong>$1</strong>'),
 									value: text,
 									option: this
 								};
@@ -42,17 +42,17 @@
 						self.input.val($(ui.item.option).text());
 						self.input.trigger('change');
 						ui.item.option.selected = true;
-						self._trigger( "selected", event, {
+						self._trigger('selected', event, {
 							item: ui.item.option
 						});
 					},
 					change: function( event, ui ) {
 						if ( !ui.item ) {
-							var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
+							var matcher = new RegExp( '^' + $.ui.autocomplete.escapeRegex( $(this).val() ) + '$', 'i' ),
 								valid = false;
 							self.input.val($(this).val());
 							//self.input.trigger('change');
-							select.children( "option" ).each(function() {
+							select.children('option').each(function() {
 								if ( $( this ).text().match( matcher ) ) {
 									this.selected = valid = true;
 									return false;
@@ -62,36 +62,41 @@
 								// remove invalid value, as it didn't match anything
 								$( this ).val( "" );
 								select.val( "" );
-								input.data( "autocomplete" ).term = "";
+								input.data('autocomplete').term = '';
 								return false;
 							}
 						}
 					}
 				})
-				.addClass( "ui-widget ui-widget-content ui-corner-left" );
+				.addClass('ui-widget ui-widget-content ui-corner-left');
 
-			input.data( "autocomplete" )._renderItem = function( ul, item ) {
-				return $( "<li></li>" )
-					.data( "item.autocomplete", item )
-					.append( "<a>" + item.label + "</a>" )
+			input.data('autocomplete')._renderItem = function( ul, item ) {
+				return $('<li></li>')
+					.data('item.autocomplete', item )
+					.append('<a>' + item.label + '</a>')
 					.appendTo( ul );
 			};
 			$.each(this.options, function(key, value) {
 				self._setOption(key, value);
 			});
 
+			input.dblclick(function() {
+				// pass empty string as value to search for, displaying all results
+				input.autocomplete('search', '');
+			});
+			
 			if(this.options['showButton']) {
-				this.button = $( "<button type='button'>&nbsp;</button>" )
-					.attr( "tabIndex", -1 )
-					.attr( "title", "Show All Items" )
+				this.button = $('<button type="button">&nbsp;</button>')
+					.attr('tabIndex', -1 )
+					.attr('title', 'Show All Items')
 					.insertAfter( input )
 					.addClass('svg')
 					.addClass('action')
 					.addClass('combo-button')
 					.click(function() {
 						// close if already visible
-						if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
-							input.autocomplete( "close" );
+						if ( input.autocomplete('widget').is(':visible') ) {
+							input.autocomplete('close');
 							return;
 						}
 
@@ -99,7 +104,7 @@
 						$( this ).blur();
 
 						// pass empty string as value to search for, displaying all results
-						input.autocomplete( "search", "" );
+						input.autocomplete('search', '');
 						input.focus();
 					});
 			}

From 14e1be56a0927db5344af062a06839f08f674805 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Thu, 7 Jun 2012 17:07:51 +0200
Subject: [PATCH 0215/1537] pictures: update script and removal some all stuff

---
 apps/gallery/appinfo/update.php |  9 +++++++++
 apps/gallery/appinfo/version    |  2 +-
 apps/gallery/index.php          | 24 ++----------------------
 3 files changed, 12 insertions(+), 23 deletions(-)
 create mode 100644 apps/gallery/appinfo/update.php

diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
new file mode 100644
index 0000000000..dd248e21b3
--- /dev/null
+++ b/apps/gallery/appinfo/update.php
@@ -0,0 +1,9 @@
+<?php
+
+$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_photos');
+$stmt->execute();
+$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_albums');
+$stmt->execute();
+
+\OC_DB::createDbFromStructure('./database.xml');
+
diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version
index 17b2ccd9bf..8f0916f768 100644
--- a/apps/gallery/appinfo/version
+++ b/apps/gallery/appinfo/version
@@ -1 +1 @@
-0.4.3
+0.5.0
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index a9fe200c4e..9d4654a7cc 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -27,26 +27,6 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
-if (!isset($_GET['view'])) {
-  $result = OC_Gallery_Album::find(OCP\USER::getUser());
-
-  $r = array();
-  while ($row = $result->fetchRow())
-    $r[] = $row;
-
-  $tmpl = new OCP\Template( 'gallery', 'index', 'user' );
-  $tmpl->assign('r', $r);
-  $tmpl->printPage();
-} else {
-  $result = OC_Gallery_Photo::findForAlbum(OCP\USER::getUser(), $_GET['view']);
-
-  $photos = array();
-  while ($p = $result->fetchRow())
-    $photos[] = $p['file_path'];
-  
-  $tmpl = new OCP\Template( 'gallery', 'view_album', 'user' );
-  $tmpl->assign('photos', $photos);
-  $tmpl->assign('albumName', $_GET['view']);
-  $tmpl->printPage();
-}
+$tmpl = new OCP\Template( 'gallery', 'index', 'user' );
+$tmpl->printPage();
 ?>

From c696f449a223442e8a11b30a6d4004585ceca478 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 17:25:25 +0200
Subject: [PATCH 0216/1537] Make it easier to subclass OC_L10N.

---
 lib/l10n.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/l10n.php b/lib/l10n.php
index 682e15f0e9..3596c992ba 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -77,6 +77,10 @@ class OC_L10N{
 	 * language.
 	 */
 	public function __construct($app, $lang = null){
+		$this->init($app, $lang);
+	}
+		
+	protected function init($app, $lang = null){
 		// Find the right language
 		if(is_null($lang)){
 			$lang = self::findLanguage($app);

From 66265984352850c4045fb5e921ebc1322aa471cd Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 18:13:41 +0200
Subject: [PATCH 0217/1537] ldap: enable the destructor

---
 apps/user_ldap/lib_ldap.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 8ca5c978b3..22d464b65a 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -52,6 +52,8 @@ class OC_LDAP {
 	static protected $ldapGroupDisplayName;
 	static protected $ldapLoginFilter;
 
+	static protected $__d;
+
 	/**
 	 * @brief initializes the LDAP backend
 	 * @param $force read the config settings no matter what
@@ -59,6 +61,9 @@ class OC_LDAP {
 	 * initializes the LDAP backend
 	 */
 	static public function init($force = false) {
+		if(is_null(self::$__d)) {
+			self::$__d = new OC_LDAP_DESTRUCTOR();
+		}
 		self::readConfiguration($force);
 		self::establishConnection();
 	}

From c2f557f1dd89b2ca5a612d7cbf7ab940ea8d1b68 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 18:55:32 +0200
Subject: [PATCH 0218/1537] LDAP: cache the results, reduce LDAP searches

---
 apps/user_ldap/group_ldap.php | 40 ++++++++++++++++++++++++++---------
 apps/user_ldap/user_ldap.php  | 13 ++++++++----
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index baca1d32ba..62e7c8ca6b 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -27,6 +27,11 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 	protected $ldapGroupMemberAssocAttr;
 	protected $configured = false;
 
+	protected $_group_user = array();
+	protected $_user_groups = array();
+	protected $_group_users = array();
+	protected $_groups = array();
+
 	public function __construct() {
 		$this->ldapGroupFilter          = OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
 		$this->ldapGroupMemberAssocAttr = OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
@@ -48,6 +53,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return false;
 		}
+		if(isset($this->_group_user[$gid][$uid])) {
+			return $this->_group_user[$gid][$uid];
+		}
 		$dn_user = OC_LDAP::username2dn($uid);
 		$dn_group = OC_LDAP::groupname2dn($gid);
 		// just in case
@@ -64,8 +72,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		//TODO: this can be done with one LDAP query
 		if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
 			$dns = array();
-			foreach($members as $uid) {
-				$filter = str_replace('%uid', $uid, OC_LDAP::conf('ldapLoginFilter'));
+			foreach($members as $mid) {
+				$filter = str_replace('%uid', $mid, OC_LDAP::conf('ldapLoginFilter'));
 				$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
 				if(count($ldap_users) < 1) {
 					continue;
@@ -75,7 +83,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 			$members = $dns;
 		}
 
-		return in_array($dn_user, $members);
+		$this->_group_user[$gid][$uid] = in_array($dn_user, $members);
+		return $this->_group_user[$gid][$uid];
 	}
 
 	/**
@@ -90,8 +99,12 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return array();
 		}
+		if(isset($this->_user_groups[$uid])) {
+			return $this->_user_groups[$uid];
+		}
 		$userDN = OC_LDAP::username2dn($uid);
 		if(!$userDN) {
+			$this->_user_groups[$uid] = array();
 			return array();
 		}
 
@@ -112,9 +125,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 			$this->ldapGroupMemberAssocAttr.'='.$uid
 		));
 		$groups = OC_LDAP::fetchListOfGroups($filter, array(OC_LDAP::conf('ldapGroupDisplayName'),'dn'));
-		$userGroups = OC_LDAP::ownCloudGroupNames($groups);
+		$this->_user_groups[$uid] = array_unique(OC_LDAP::ownCloudGroupNames($groups), SORT_LOCALE_STRING);
 
-		return array_unique($userGroups, SORT_LOCALE_STRING);
+		return $this->_user_groups[$uid];
 	}
 
 	/**
@@ -125,14 +138,19 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return array();
 		}
+		if(isset($this->_group_users[$gid])) {
+			return $this->_group_users[$gid];
+		}
 
 		$groupDN = OC_LDAP::groupname2dn($gid);
 		if(!$groupDN) {
+			$this->_group_users[$gid] = array();
 			return array();
 		}
 
 		$members = OC_LDAP::readAttribute($groupDN, $this->ldapGroupMemberAssocAttr);
 		if(!$members) {
+			$this->_group_users[$gid] = array();
 			return array();
 		}
 
@@ -154,7 +172,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$isMemberUid) {
 			$result = array_intersect($result, OCP\User::getUsers());
 		}
-		return array_unique($result, SORT_LOCALE_STRING);
+		$this->_group_users[$gid] = array_unique($result, SORT_LOCALE_STRING);
+		return $this->_group_users[$gid];
 	}
 
 	/**
@@ -167,10 +186,11 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return array();
 		}
-
-		$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
-		$groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
-		return $groups;
+		if(is_null($this->_groups)) {
+			$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
+			$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
+		}
+		return $this->groups;
 	}
 
 	/**
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index ba66c7a9ca..9281aebe81 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -34,6 +34,9 @@ class OC_USER_LDAP extends OC_User_Backend {
 	// will be retrieved from LDAP server
 	protected $ldap_dc = false;
 
+	// cache getUsers()
+	protected $_users = null;
+
 	public function __construct() {
 		$this->ldapUserFilter      = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter', '(objectClass=posixAccount)');
 		$this->ldapQuotaAttribute  = OCP\Config::getAppValue('user_ldap', 'ldap_quota_attr', '');
@@ -108,9 +111,11 @@ class OC_USER_LDAP extends OC_User_Backend {
 	 * Get a list of all users.
 	 */
 	public function getUsers(){
-		$ldap_users = OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
-		$users = OC_LDAP::ownCloudUserNames($ldap_users);
-		return $users;
+		if(is_null($this->_users)) {
+			$ldap_users = OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
+			$this->_users = OC_LDAP::ownCloudUserNames($ldap_users);
+		}
+		return $this->_users;
 	}
 
 	/**
@@ -119,7 +124,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 	 * @return boolean
 	 */
 	public function userExists($uid){
-		return in_array($uid, self::getUsers());
+		return in_array($uid, $this->getUsers());
 	}
 
 }

From 1f409ec524c86570f8d4755f95789e1c0f149190 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Thu, 7 Jun 2012 17:43:26 +0000
Subject: [PATCH 0219/1537] Protect the help page

---
 settings/templates/help.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/templates/help.php b/settings/templates/help.php
index a53ec76d68..cf61207e60 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -26,9 +26,9 @@
 	<?php foreach($_["kbe"] as $kb): ?>
 	<div class="helpblock">
 		<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
-		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
-		<p><?php echo $kb['description'];?></p>
-		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
+		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.htmlentities($kb["name"]).'</strong></a></p>');?>
+		<p><?php echo htmlentities($kb['description']);?></p>
+		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.htmlentities($kb['answer']).'</p>');?>
 	</div>
 	<?php endforeach;
 endif?>

From 33c802dcaa77a1e30a8ca5223be817f81679747e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 20:27:53 +0200
Subject: [PATCH 0220/1537] Break text to fit in dialog.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6c9c1a5262..35d4a4a216 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1281,7 +1281,7 @@ Contacts={
 		},
 		Addressbooks:{
 			droptarget:undefined,
-			droptext:t('contacts', 'Drop a VCF file to import contacts.'),
+			droptext:t('contacts', 'Drop a VCF file<br />to import contacts.'),
 			overview:function(){
 				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
 					$('#chooseaddressbook_dialog').dialog('moveToTop');

From d4f6f3e9355979aedb174d6f9b5f60380934aca9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 20:28:28 +0200
Subject: [PATCH 0221/1537] Contacts: Attempt to make file upload work in ICS
 Chrome.

---
 apps/contacts/templates/part.importaddressbook.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
index cb5d68149e..0e2956ddaf 100644
--- a/apps/contacts/templates/part.importaddressbook.php
+++ b/apps/contacts/templates/part.importaddressbook.php
@@ -36,5 +36,7 @@ if(OCP\App::isEnabled('files_encryption')) {
 <?php } ?>
 </td>
 <script type="text/javascript">
-Contacts.UI.Addressbooks.loadImportHandlers();
+$(document).ready(function(){
+	Contacts.UI.Addressbooks.loadImportHandlers();
+});
 </script>
\ No newline at end of file

From 0f7fdd414896ddfd1a5cd600d982f38c2b926ed8 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 7 Jun 2012 19:15:31 +0000
Subject: [PATCH 0222/1537] ReAdd possibility to load existing app folders

---
 lib/base.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 0d205c8f78..9f2925fa31 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -173,6 +173,11 @@ class OC{
 				}
 				OC::$APPSROOTS[] = array('path'=> $path, 'web' => $web_a[$k]);
 			}
+		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
+			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'web' => OC::$WEBROOT.'/apps/');
+		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
+			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'web' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/');
+			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}
 
 		if(empty(OC::$APPSROOTS)){

From 9f1c46b6f6faebaebf555e0d26bcdef9e49daccc Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 7 Jun 2012 19:22:43 +0000
Subject: [PATCH 0223/1537] Correct Minizer inclusions

---
 lib/minimizer/css.php | 4 ++--
 lib/minimizer/js.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 76dc99b335..5ba557c4cd 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -28,8 +28,8 @@ class OC_Minimizer_CSS extends OC_Minimizer
 				$append = false;
 				foreach( OC::$APPSROOTS as $apps_dir)
 				{
-					if($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
-					elseif($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
+					if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
+					elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
 				}
 				if(! $append) {
 					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index aea8b66f91..4002b11538 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -42,8 +42,8 @@ class OC_Minimizer_JS extends OC_Minimizer
 				$append = false;
 				foreach( OC::$APPSROOTS as $apps_dir)
 				{
-					if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
-					elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
+					if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
+					elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
 				}
 				if(! $append) {
 					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

From 4260dce826cc0572371d5ab0d30ecf5f1ecb072a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 17:28:39 +0200
Subject: [PATCH 0224/1537] Better handling of core.css and core.js

Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
---
 core/templates/layout.guest.php | 4 ++--
 core/templates/layout.user.php  | 4 ++--
 lib/app.php                     | 5 +++++
 lib/base.php                    | 7 -------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7f5a4d50fc..55cc8008d9 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,7 +4,7 @@
 		<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 (!defined('DEBUG') || !DEBUG): ?>
+		<?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): ?>
@@ -14,7 +14,7 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 		</script>
-		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<?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): ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8f6c029007..e04fcabf13 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,7 +4,7 @@
 		<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 (!defined('DEBUG') || !DEBUG): ?>
+		<?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): ?>
@@ -15,7 +15,7 @@
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
-		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<?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): ?>
diff --git a/lib/app.php b/lib/app.php
index 667633e264..e8a5a1291d 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -67,6 +67,11 @@ class OC_App{
 				OC_Util::$scripts = array();
 				OC_Util::$core_styles = OC_Util::$styles;
 				OC_Util::$styles = array();
+
+				if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+					OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+					OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+				}
 			}
 		}
 		// return
diff --git a/lib/base.php b/lib/base.php
index a65a33b166..4bd165862b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -426,13 +426,6 @@ class OC{
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
 
-		if (OC_Config::getValue('installed', false)) {
-			if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
-				OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-				OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-			}
-		}
-
 		//parse the given parameters
 		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){

From 9ec68c819bf409905e3e3ab17cb4b2dd925cbde7 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 7 Jun 2012 20:36:55 +0000
Subject: [PATCH 0225/1537] Change parameter 'web' to 'url' and take array of
 array in config instead of : separated values

---
 lib/app.php           |  2 +-
 lib/base.php          | 21 ++++++++-------------
 lib/minimizer/css.php |  6 +++---
 lib/minimizer/js.php  |  4 ++--
 lib/template.php      |  8 ++++----
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 43d60f3a68..79a0a2e053 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -342,7 +342,7 @@ class OC_App{
 	public static function getAppWebPath($appid) {
 		foreach(OC::$APPSROOTS as $dir) {
 			if(file_exists($dir['path'].'/'.$appid)) {
-				return $dir['web'].'/'.$appid;
+				return $dir['url'].'/'.$appid;
 			}
 		}
 		return false;
diff --git a/lib/base.php b/lib/base.php
index 9f2925fa31..6e85f1a734 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -55,7 +55,7 @@ class OC{
 	 */
 	public static $THIRDPARTYWEBROOT = '';
 	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'real' and web path in 'web'
+	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and web path in 'url'
 	 */
 	public static $APPSROOTS = array();
 	/*
@@ -161,22 +161,17 @@ class OC{
 			echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
 			exit;
 		}
-
 		// search the apps folder
-		if(OC_Config::getValue('appsroot', '')<>''){
-			$real_a = explode(':',OC_Config::getValue('appsroot', ''));
-			$web_a = explode(':',OC_Config::getValue('appsurl', ''));
-			foreach($real_a as $k => $path) {
-				if(!isset($web_a[$k])){
-					echo("Apps root and appsurl not mathing. You need to have the same number of paths");
-					exit;
-				}
-				OC::$APPSROOTS[] = array('path'=> $path, 'web' => $web_a[$k]);
+		$config_paths = OC_Config::getValue('apps_paths', array());
+		if(! empty($config_paths)){
+			foreach($config_paths as $paths) {
+				if( isset($paths['url']) && isset($paths['path']))
+					OC::$APPSROOTS[] = $paths;	
 			}
 		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
-			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'web' => OC::$WEBROOT.'/apps/');
+			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => OC::$WEBROOT.'/apps/');
 		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'web' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/');
+			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/');
 			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}
 
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 5ba557c4cd..c7e5d96e06 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -28,8 +28,8 @@ class OC_Minimizer_CSS extends OC_Minimizer
 				$append = false;
 				foreach( OC::$APPSROOTS as $apps_dir)
 				{
-					if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
-					elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
+					if($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; }
+					elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style.css", true )) { $append =true; break; }
 				}
 				if(! $append) {
 					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -65,7 +65,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			$in_root = false;
 			foreach(OC::$APPSROOTS as $app_root) {
 				if(strpos($file, $app_root['path']) == 0) {
-					$in_root = $app_root['web'];
+					$in_root = $app_root['url'];
 					break;
 				}
 			}
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index 4002b11538..dd7d15de06 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -42,8 +42,8 @@ class OC_Minimizer_JS extends OC_Minimizer
 				$append = false;
 				foreach( OC::$APPSROOTS as $apps_dir)
 				{
-					if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
-					elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
+					if($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$script$fext.js" , true)) { $append =true; break; }
+					elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$script.js", true )) { $append =true; break; }
 				}
 				if(! $append) {
 					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
diff --git a/lib/template.php b/lib/template.php
index 6fe0710203..b99d492a53 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -426,8 +426,8 @@ class OC_Template{
 					$append = false;
 					foreach( OC::$APPSROOTS as $apps_dir)
 					{
-						if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
-						elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
+						if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['url'], "$script$fext.js" , true)) { $append =true; break; }
+						elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['url'], "$script.js", true )) { $append =true; break; }
 					}
 					if(! $append) {
 						echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -454,8 +454,8 @@ class OC_Template{
 					$append = false;
 					foreach( OC::$APPSROOTS as $apps_dir)
 					{
-						if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
-						elseif($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
+						if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; }
+						elseif($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['url'], "$style.css", true )) { $append =true; break; }
 					}
 					if(! $append) {
 						echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

From e867edd1c8ac2cdac6f300908b8de55dded9dc05 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 22:47:18 +0200
Subject: [PATCH 0226/1537] Add help texts to config options in
 config.sample.php

---
 config/config.sample.php | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 7ab327e2bc..c81e4a34eb 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -3,37 +3,66 @@
 define("DEBUG", true);
 
 $CONFIG = array(
+/* Flag to indicate OwnCloud is successfully installed (true = installed) */
 "installed" => false,
+/* Type of database, can be sqlite, mysql or pgsql */
 "dbtype" => "sqlite",
+/* Name of the OwnCloud database */
 "dbname" => "owncloud",
+/* User to access the OwnCloud database */
 "dbuser" => "",
+/* Password to access the OwnCloud database */
 "dbpassword" => "",
+/* Host running the OwnCloud database */
 "dbhost" => "",
+/* Prefix for the OwnCloud tables in the database */
 "dbtableprefix" => "",
+/* Force use of HTTPS connection (true = use HTTPS) */
 "forcessl" => false,
-"enablebackup" => false,
+/* Theme to use for OwnCloud */
 "theme" => "",
+/* Path to the 3rdparty directory */
 "3rdpartyroot" => "",
+/* URL to the 3rdparty directory, as seen by the browser */
 "3rdpartyurl" => "",
+/* Default app to load on login */
 "defaultapp" => "files",
+/* Enable the help menu item in the settings */
 "knowledgebaseenabled" => true,
-"knowledgebaseurl" => "",
+/* URL to use for the help page, server should understand OCS */
+"knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
+/* Enable installing apps from the appstore */
 "appstoreenabled" => true,
-"appstoreurl" => "",
+/* URL of the appstore to use, server should understand OCS */
+"appstoreurl" => "http://api.apps.owncloud.com/v1",
+/* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
 "mail_smtpmode" => "sendmail",
+/* Host to use for sending mail, depends on mail_smtpmode if this is used */
 "mail_smtphost" => "127.0.0.1",
+/* authentication needed to send mail, depends on mail_smtpmode if this is used
+ * (false = disable authentication)
+ */
 "mail_smtpauth" => false,
+/* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtpname" => "",
+/* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtppassword" => "",
+/* Check 3rdparty apps for malicious code fragments */
 "appcodechecker" => "",
-"log_type" => "",
+/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+"log_type" => "owncloud",
+/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
 "logfile" => "",
+/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 /* Set this to false to disable the check for writable apps dir.
  * If the apps dir is not writable, you can't download&install extra apps
  * in the admin apps menu.
  */
 "writable_appsdir" => true,
+/* The directory where the user data is stored, default to data in the owncloud
+ * directory. The sqlite database is also stored here, when sqlite is used.
+ */
 // "datadirectory" => ""
 );
 ?>

From 0575d149b4c0b83383395b931b418612a6e85a3b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 22:49:50 +0200
Subject: [PATCH 0227/1537] Use the default parameter of OC_Config::getValue to
 set defaults

---
 lib/ocsclient.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 33308553be..8e976171e9 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -35,12 +35,7 @@ class OC_OCSClient{
 	 * This function returns the url of the OCS AppStore server. It´s possible to set it in the config file or it will fallback to the default
 	 */
 	private static function getAppStoreURL(){
-		$configurl=OC_Config::getValue('appstoreurl', '');
-		if($configurl<>'') {
-			$url=$configurl;
-		}else{
-			$url='http://api.apps.owncloud.com/v1';
-		}
+		$url = OC_Config::getValue('appstoreurl', 'http://api.apps.owncloud.com/v1');
 		return($url);
 	}
 
@@ -50,12 +45,7 @@ class OC_OCSClient{
          * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
          */
         private static function getKBURL(){
-                $configurl=OC_Config::getValue('knowledgebaseurl', '');
-                if($configurl<>'') {
-                        $url=$configurl;
-                }else{
-                        $url='http://api.apps.owncloud.com/v1';
-                }
+                $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
                 return($url);
         }
 

From dd98afc56c4356a06fb5afef39da916a97bae90b Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 7 Jun 2012 20:56:21 +0000
Subject: [PATCH 0228/1537] Add doc about multi app dir in sample config

---
 config/config.sample.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 7ab327e2bc..bc66e9ebc0 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -34,6 +34,17 @@ $CONFIG = array(
  * in the admin apps menu.
  */
 "writable_appsdir" => true,
-// "datadirectory" => ""
+// "datadirectory" => "",
+"apps_paths" => array(
+
+/* Set an array of path for your apps directories
+ key 'path' is for the fs path an the key url is for the http path to your
+ applications paths
+*/
+  array(
+    'path'=> '/var/www/owncloud/apps',
+    'url' => '/apps',
+  ),
+ ),
 );
 ?>

From 4afcae8d56e880288124605a7b2a9890081601d5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 23:38:50 +0200
Subject: [PATCH 0229/1537] Gallery: Fix database creation on update, also only
 from version less then 0.5

---
 apps/gallery/appinfo/update.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
index dd248e21b3..a0997ab5e8 100644
--- a/apps/gallery/appinfo/update.php
+++ b/apps/gallery/appinfo/update.php
@@ -1,9 +1,11 @@
 <?php
 
-$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_photos');
-$stmt->execute();
-$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_albums');
-$stmt->execute();
-
-\OC_DB::createDbFromStructure('./database.xml');
+$currentVersion=OC_Appconfig::getValue('gallery', 'installed_version');
+if (version_compare($currentVersion, '0.5.0', '<')) {
+	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_photos');
+	$stmt->execute();
+	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_albums');
+	$stmt->execute();
 
+	\OC_DB::createDbFromStructure(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml');
+}

From 4768510923f6bfa3f3473874395a7a61872f1df0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 8 Jun 2012 01:29:46 +0200
Subject: [PATCH 0230/1537] split share and root config for smb backend, also
 sanitize config a bit more

---
 apps/files_external/lib/smb.php      | 20 ++++++++++++++++++--
 apps/files_external/tests/config.php |  3 ++-
 apps/files_external/tests/smb.php    |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index f5e6d78e77..f594fbb880 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -13,6 +13,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	private $user;
 	private $host;
 	private $root;
+	private $share;
 
 	private static $tempFiles=array();
 
@@ -20,17 +21,32 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->password=$params['password'];
+		$this->share=$params['share'];
 		$this->root=isset($params['root'])?$params['root']:'/';
+		if(substr($this->root,-1,1)!='/'){
+			$this->root.='/';
+		}
+		if(substr($this->root,0,1)!='/'){
+			$this->root='/'.$this->root;
+		}
+		if(substr($this->share,0,1)!='/'){
+			$this->share='/'.$this->share;
+		}
+		if(substr($this->share,-1,1)=='/'){
+			$this->share=substr($this->share,0,-1);
+		}
 
 		//create the root folder if necesary
-		$this->mkdir('');
+		if(!$this->is_dir('')){
+			$this->mkdir('');
+		}
 	}
 
 	public function constructUrl($path){
 		if(substr($path,-1)=='/'){
 			$path=substr($path,0,-1);
 		}
-		return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
+		return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path;
 		
 	}
 }
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 970008d642..e58a87fabd 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -34,7 +34,8 @@ return array(
 		'user'=>'test',
 		'password'=>'test',
 		'host'=>'localhost',
-		'root'=>'/test',
+		'share'=>'/test',
+		'root'=>'/test/',
 	),
 	'amazons3'=>array(
 		'run'=>false,
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index 52e1700b01..e1495b7480 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -19,7 +19,7 @@ if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']){
 		public function setUp(){
 			$id=uniqid();
 			$this->config=include('apps/files_external/tests/config.php');
-			$this->config['smb']['root'].='/'.$id;//make sure we have an new empty folder to work in
+			$this->config['smb']['root'].=$id;//make sure we have an new empty folder to work in
 			$this->instance=new OC_Filestorage_SMB($this->config['smb']);
 		}
 

From f91ad08613bf2554f689da7d71a8d79a272bafeb Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 8 Jun 2012 11:37:04 +0200
Subject: [PATCH 0231/1537] fixed broken lines in user table

---
 settings/css/settings.css    | 3 ++-
 settings/templates/users.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index b5a3c0f03b..d408385797 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,9 +34,10 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:absolute; }
+td.quota { position:relative; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
+select.quota-user { position:relative; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
 div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a23a5bafe6..1951f17a0b 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -64,7 +64,7 @@ foreach($_["groups"] as $group) {
 				</select>
 			</td>
 			<td class="quota">
-				<select class='quota'>
+				<select class='quota-user'>
 					<?php foreach($_['quota_preset'] as $preset):?>
 						<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
 					<?php endforeach;?>

From f568b7ccb4a7ee4231aec4569443939878fa204c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 8 Jun 2012 11:49:14 +0200
Subject: [PATCH 0232/1537] add spacing lines to our awesome new sample config
 file. readability++

---
 config/config.sample.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index c81e4a34eb..6ea23ee4bc 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -5,61 +5,87 @@ define("DEBUG", true);
 $CONFIG = array(
 /* Flag to indicate OwnCloud is successfully installed (true = installed) */
 "installed" => false,
+
 /* Type of database, can be sqlite, mysql or pgsql */
 "dbtype" => "sqlite",
+
 /* Name of the OwnCloud database */
 "dbname" => "owncloud",
+
 /* User to access the OwnCloud database */
 "dbuser" => "",
+
 /* Password to access the OwnCloud database */
 "dbpassword" => "",
+
 /* Host running the OwnCloud database */
 "dbhost" => "",
+
 /* Prefix for the OwnCloud tables in the database */
 "dbtableprefix" => "",
+
 /* Force use of HTTPS connection (true = use HTTPS) */
 "forcessl" => false,
+
 /* Theme to use for OwnCloud */
 "theme" => "",
+
 /* Path to the 3rdparty directory */
 "3rdpartyroot" => "",
+
 /* URL to the 3rdparty directory, as seen by the browser */
 "3rdpartyurl" => "",
+
 /* Default app to load on login */
 "defaultapp" => "files",
+
 /* Enable the help menu item in the settings */
 "knowledgebaseenabled" => true,
+
 /* URL to use for the help page, server should understand OCS */
 "knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
+
 /* Enable installing apps from the appstore */
 "appstoreenabled" => true,
+
 /* URL of the appstore to use, server should understand OCS */
 "appstoreurl" => "http://api.apps.owncloud.com/v1",
+
 /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
 "mail_smtpmode" => "sendmail",
+
 /* Host to use for sending mail, depends on mail_smtpmode if this is used */
 "mail_smtphost" => "127.0.0.1",
+
 /* authentication needed to send mail, depends on mail_smtpmode if this is used
  * (false = disable authentication)
  */
 "mail_smtpauth" => false,
+
 /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtpname" => "",
+
 /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtppassword" => "",
+
 /* Check 3rdparty apps for malicious code fragments */
 "appcodechecker" => "",
+
 /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
 "log_type" => "owncloud",
+
 /* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
 "logfile" => "",
+
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
+
 /* Set this to false to disable the check for writable apps dir.
  * If the apps dir is not writable, you can't download&install extra apps
  * in the admin apps menu.
  */
 "writable_appsdir" => true,
+
 /* The directory where the user data is stored, default to data in the owncloud
  * directory. The sqlite database is also stored here, when sqlite is used.
  */

From 4d3b7574f3dcab1c79c27e93122dcc7d1ac103b2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 8 Jun 2012 11:55:16 +0200
Subject: [PATCH 0233/1537] Sharing, fix: connect to hooks from the correct
 classes

---
 apps/files_sharing/appinfo/app.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index ea3a9da6f7..b59c90b877 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -8,8 +8,8 @@ OCP\Util::connectHook("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OCP\Util::connectHook("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
 OCP\Util::connectHook("OC_Filesystem", "post_write", "OC_Share", "updateItem");
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Share', 'removeUser');
-OCP\Util::connectHook('OC_User', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
-OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
+OCP\Util::connectHook('OC_Group', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
+OCP\Util::connectHook('OC_Group', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
 if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') {
 	OCP\Util::addscript("files_sharing", "share");

From 6119f05ac015b71d94318bf759b4fcaefe4650af Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 8 Jun 2012 12:31:37 +0200
Subject: [PATCH 0234/1537] generate a random salt during installation and
 store it in the config.php. use it to salt the password hashing.

---
 config/config.sample.php | 3 +++
 lib/setup.php            | 4 ++++
 lib/user/database.php    | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 6ea23ee4bc..0c0ace521e 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -24,6 +24,9 @@ $CONFIG = array(
 /* Prefix for the OwnCloud tables in the database */
 "dbtableprefix" => "",
 
+/* Define the salt used to hash the user passwords. All your user passwords are lost if you lose this string. */
+"passwordsalt" => "",
+
 /* Force use of HTTPS connection (true = use HTTPS) */
 "forcessl" => false,
 
diff --git a/lib/setup.php b/lib/setup.php
index a096fdbb4c..5f1fb1525e 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -73,6 +73,10 @@ class OC_Setup {
 				$dbtype='sqlite3';
 			}
 
+			//generate a random salt that is used to salt the local user passwords
+			$salt=mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000);
+			OC_Config::setValue('passwordsalt', $salt);
+
 			//write the config file
 			OC_Config::setValue('datadirectory', $datadir);
  			OC_Config::setValue('dbtype', $dbtype);
diff --git a/lib/user/database.php b/lib/user/database.php
index 769ba6a792..bb077c8364 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -69,7 +69,7 @@ class OC_User_Database extends OC_User_Backend {
 			return false;
 		}else{
 			$hasher=$this->getHasher();
-			$hash = $hasher->HashPassword($password);
+			$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" );
 			$result = $query->execute( array( $uid, $hash));
 
@@ -102,7 +102,7 @@ class OC_User_Database extends OC_User_Backend {
 	public function setPassword( $uid, $password ){
 		if( $this->userExists($uid) ){
 			$hasher=$this->getHasher();
-			$hash = $hasher->HashPassword($password);
+			$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare( "UPDATE *PREFIX*users SET password = ? WHERE uid = ?" );
 			$result = $query->execute( array( $hash, $uid ));
 
@@ -131,7 +131,7 @@ class OC_User_Database extends OC_User_Backend {
 			$storedHash=$row['password'];
 			if (substr($storedHash,0,1)=='$'){//the new phpass based hashing
 				$hasher=$this->getHasher();
-				if($hasher->CheckPassword($password, $storedHash)){
+				if($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash)){
 					return $row['uid'];
 				}else{
 					return false;

From f70615106f3aca819a9e2356d8e6bbff18437188 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 8 Jun 2012 14:57:01 +0200
Subject: [PATCH 0235/1537] typo in var

---
 apps/user_ldap/group_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 62e7c8ca6b..d2404a80aa 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -190,7 +190,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 			$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
 			$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
 		}
-		return $this->groups;
+		return $this->_groups;
 	}
 
 	/**

From 4b3ae60558a5d9d18cdd7be0d844d577785f46fb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 8 Jun 2012 11:42:00 -0400
Subject: [PATCH 0236/1537] Working UI for external storage mount configuration

---
 apps/files_external/ajax/addMountPoint.php    |  13 +
 apps/files_external/ajax/removeMountPoint.php |  13 +
 apps/files_external/appinfo/app.php           |   7 +-
 apps/files_external/css/settings.css          |   9 +-
 apps/files_external/js/settings.js            | 166 +++++++++----
 apps/files_external/lib/config.php            | 231 ++++++++++++++++++
 apps/files_external/personal.php              |  34 +++
 apps/files_external/settings.php              |  13 +-
 apps/files_external/templates/settings.php    |  94 +++----
 9 files changed, 485 insertions(+), 95 deletions(-)
 create mode 100644 apps/files_external/ajax/addMountPoint.php
 create mode 100644 apps/files_external/ajax/removeMountPoint.php
 create mode 100755 apps/files_external/lib/config.php
 create mode 100755 apps/files_external/personal.php

diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
new file mode 100644
index 0000000000..549cb6a342
--- /dev/null
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -0,0 +1,13 @@
+<?php
+
+OCP\JSON::checkAppEnabled('files_external');
+if ($_POST['isPersonal'] == 'true') {
+	OCP\JSON::checkLoggedIn();
+	$isPersonal = true;
+} else {
+	OCP\JSON::checkAdminUser();
+	$isPersonal = false;
+}
+OC_Mount_Config::addMountPoint($_POST['mountPoint'], $_POST['class'], $_POST['classOptions'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
+
+?>
diff --git a/apps/files_external/ajax/removeMountPoint.php b/apps/files_external/ajax/removeMountPoint.php
new file mode 100644
index 0000000000..b77b306bcb
--- /dev/null
+++ b/apps/files_external/ajax/removeMountPoint.php
@@ -0,0 +1,13 @@
+<?php
+
+OCP\JSON::checkAppEnabled('files_external');
+if ($_POST['isPersonal'] == 'true') {
+	OCP\JSON::checkLoggedIn();
+	$isPersonal = true;
+} else {
+	OCP\JSON::checkAdminUser();
+	$isPersonal = false;
+}
+OC_Mount_Config::removeMountPoint($_POST['mountPoint'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
+
+?>
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 9fd87e3934..b7a07b4aac 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -6,11 +6,16 @@
  * See the COPYING-README file.
  */
 
- OC::$CLASSPATH['OC_FileStorage_StreamWrapper']='apps/files_external/lib/streamwrapper.php';
+OC::$CLASSPATH['OC_FileStorage_StreamWrapper']='apps/files_external/lib/streamwrapper.php';
 OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php';
 OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php';
 OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
 OC::$CLASSPATH['OC_Filestorage_SWIFT']='apps/files_external/lib/swift.php';
 OC::$CLASSPATH['OC_Filestorage_SMB']='apps/files_external/lib/smb.php';
+OC::$CLASSPATH['OC_Filestorage_AmazonS3']='apps/files_external/lib/amazons3.php';
+OC::$CLASSPATH['OC_Mount_Config']='apps/files_external/lib/config.php';
 
 OCP\App::registerAdmin('files_external', 'settings');
+if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') {
+	OCP\App::registerPersonal('files_external', 'personal');
+}
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index b11af752ec..d8575c49e3 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,6 +1,5 @@
 .error { color: #FF3B3B; }
-td.type { width:8em; }
-td.mount, td.options, td.applicable { width:10em; }
-#addStorage>td { border:none; }
-#addStorage>td:not(.selectStorage) { visibility:hidden; }
-#selectStorage { margin-left:-10px; }
\ No newline at end of file
+td.mountPoint, td.backend { width:10em; }
+#addMountPoint>td { border:none; }
+#addMountPoint>td.applicable { visibility:hidden; }
+#selectBackend { margin-left:-10px; }
\ No newline at end of file
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 9a558ad6e4..38291d5f7e 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1,59 +1,143 @@
-$(document).ready(function(){
+$(document).ready(function() {
 
-	function applicableChange(applicable) {
-		if (applicable == 'Global') {
-			
-		}
-		console.log(applicable);
-	}
-
-	$('#selectStorage').live('change', function() {
+	$('.chzn-select').chosen();
+	
+	$('#selectBackend').live('change', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').last().append($(tr).clone());
-		var selected = $(this).val();
+		var selected = $(this).find('option:selected').text();
+		var backendClass = $(this).val();
 		$(this).parent().text(selected);
-		var backends = $(this).data('configurations').split(';');
-		var configuration = [];
-		// Find selected backend configuration parameters
-		$.each(backends, function(index, backend) {
-			if (backend.split(':')[0] == selected) {
-				configuration = backend.split(':')[1].split(',');
-				// 				break;
-			}
-		});
+		$(tr).find('.backend').data('class', $(this).val());
+		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
-		$.each(configuration, function(index, config) {
-			if (config.indexOf('*') != -1) {
-				td.append('<input type="password" placeholder="'+config.substring(1)+'" />');
-			} else {
-				td.append('<input type="text" placeholder="'+config+'" />');
+		$.each(configurations, function(backend, parameters) {
+			if (backend == backendClass) {
+				$.each(parameters['configuration'], function(parameter, placeholder) {
+					if (placeholder.indexOf('*') != -1) {
+						td.append('<input type="password" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
+					} else if (placeholder.indexOf('!') != -1) {
+						td.append('<label><input type="checkbox" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>');
+					} else if (placeholder.indexOf('&') != -1) {
+						td.append('<input type="text" class="optional" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
+					} else {
+						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
+					}
+				});
+				return false;
 			}
 		});
+		$('.chz-select').chosen();
 		$(tr).find('td').last().attr('class', 'remove');
 		$(tr).removeAttr('id');
 		$(this).remove();
 	});
 
-	$('td.remove>img').live('click', function() {
-		$(this).parent().parent().remove();
-		// TODO remove storage
-	});
-
-	$('#externalStorage select[multiple]').each(function(index,element){
-		applyMultiplySelect($(element));
-	});
-
-	function applyMultiplySelect(element) {
-		var checkHandeler=false;
-		element.multiSelect({
-			oncheck:applicableChange,
-			onuncheck:applicableChange,
-			minWidth: 120,
+	$('#externalStorage td').live('change', function() {
+		var tr = $(this).parent();
+		var mountPoint = $(tr).find('.mountPoint input').val();
+		if (mountPoint == '') {
+			return false;
+		}
+		var backendClass = $(tr).find('.backend').data('class');
+		var configuration = $(tr).find('.configuration input');
+		var addMountPoint = true;
+		if (configuration.length < 1) {
+			return false;
+		}
+		var classOptions = {};
+		$.each(configuration, function(index, input) {
+			if ($(input).val() == '' && !$(input).hasClass('optional')) {
+				addMountPoint = false;
+				return false;
+			}
+			if ($(input).is(':checkbox')) {
+				if ($(input).is(':checked')) {
+					classOptions[$(input).data('parameter')] = true;
+				} else {
+					classOptions[$(input).data('parameter')] = false;
+				}
+			} else {
+				classOptions[$(input).data('parameter')] = $(input).val();
+			}
 		});
-	}
+		if (addMountPoint) {
+			if ($('#externalStorage').data('admin')) {
+				var isPersonal = false;
+				var multiselect = $(tr).find('.chzn-select').val();
+				var oldGroups = $(tr).find('.applicable').data('applicable-groups');
+				var oldUsers = $(tr).find('.applicable').data('applicable-users');
+				$.each(multiselect, function(index, value) {
+					var pos = value.indexOf('(group)');
+					if (pos != -1) {
+						var mountType = 'group';
+						var applicable = value.substr(0, pos);
+						if ($.inArray(applicable, oldGroups) != -1) {
+							oldGroups.splice($.inArray(applicable, oldGroups), 1);
+						}
+					} else {
+						var mountType = 'user';
+						var applicable = value;
+						if ($.inArray(applicable, oldUsers) != -1) {
+							oldUsers.splice($.inArray(applicable, oldUsers), 1);
+						}
+					}
+					$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				});
+				var mountType = 'group';
+				$.each(oldGroups, function(index, applicable) {
+					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				});
+				var mountType = 'user';
+				$.each(oldUsers, function(index, applicable) {
+					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				});
+			} else {
+				var isPersonal = true;
+				var mountType = 'user';
+				var applicable = OC.currentUser;
+				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+			}
+		}
+	});
+
+	$('td.remove>img').live('click', function() {
+		var tr = $(this).parent().parent();
+		var mountPoint = $(tr).find('.mountPoint input').val();
+		if (mountPoint == '') {
+			return false;
+		}
+		if ($('#externalStorage').data('admin')) {
+			var isPersonal = false;
+			var multiselect = $(tr).find('.chzn-select').val();
+			$.each(multiselect, function(index, value) {
+				var pos = value.indexOf('(group)');
+				if (pos != -1) {
+					var mountType = 'group';
+					var applicable = value.substr(0, pos);
+				} else {
+					var mountType = 'user';
+					var applicable = value;
+				}
+				$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+			});
+		} else {
+			var mountType = 'user';
+			var applicable = OC.currentUser;
+			var isPersonal = true;
+		}
+		$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+		$(tr).remove();
+	});
+
+	
 
 	$('#allowUserMounting').bind('change', function() {
-		// TODO save setting
+		if (this.checked) {
+			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes');
+		} else {
+			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no');
+		}
 	});
 
 });
\ No newline at end of file
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
new file mode 100755
index 0000000000..a87319d33b
--- /dev/null
+++ b/apps/files_external/lib/config.php
@@ -0,0 +1,231 @@
+<?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/>.
+*/
+
+/**
+* Class to configure the config/mount.php and data/$user/mount.php files
+*/
+class OC_Mount_Config {
+
+	const MOUNT_TYPE_GLOBAL = 'global';
+	const MOUNT_TYPE_GROUP = 'group';
+	const MOUNT_TYPE_USER = 'user';
+
+	/**
+	* Get details on each of the external storage backends, used for the mount config UI
+	* If the configuration parameter should be secret, add a '*' to the beginning of the value
+	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
+	* If the configuration parameter is optional, add a '&' to the beginning of the value
+	* @return array
+	*/
+	public static function getBackends() {
+		return array(
+			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
+			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
+			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
+			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
+			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root')),
+			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
+		);
+	}
+
+	/**
+	* Get the system mount points
+	* The returned array is not in the same format as getUserMountPoints()
+	* @return array
+	*/
+	public static function getSystemMountPoints() {
+		$mountPoints = self::readData(false);
+		$backends = self::getBackends();
+		$system = array();
+		if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {
+			foreach ($mountPoints[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
+				foreach ($mounts as $mountPoint => $mount) {
+					// Remove '/$user/files/' from mount point
+					$mountPoint = substr($mountPoint, 13);
+					// Merge the mount point into the current mount points
+					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
+						$system[$mountPoint]['applicable']['groups'] = array_merge($system[$mountPoint]['applicable']['groups'], array($group));
+					} else {
+						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array($group), 'users' => array()));
+					}
+				}
+			}
+		}
+		if (isset($mountPoints[self::MOUNT_TYPE_USER])) {
+			foreach ($mountPoints[self::MOUNT_TYPE_USER] as $user => $mounts) {
+				foreach ($mounts as $mountPoint => $mount) {
+					// Remove '/$user/files/' from mount point
+					$mountPoint = substr($mountPoint, 13);
+					// Merge the mount point into the current mount points
+					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
+						$system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user));
+					} else {
+						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array(), 'users' => array($user)));
+					}
+				}
+			}
+		}
+		return $system;
+	}
+
+	/**
+	* Get the personal mount points of the current user
+	* The returned array is not in the same format as getUserMountPoints()
+	* @return array
+	*/
+	public static function getPersonalMountPoints() {
+		$mountPoints = self::readData(true);
+		$backends = self::getBackends();
+		$uid = OCP\User::getUser();
+		$personal = array();
+		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
+			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
+				// Remove '/$user/files/' from mount point
+				$personal[substr($mountPoint, 13)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
+			}
+		}
+		return $personal;
+	}
+
+	
+	/**
+	* Add a mount point to the filesystem
+	* @param string Mount point
+	* @param string Backend class
+	* @param array Backend parameters for the class
+	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
+	* @param string User or group to apply mount to
+	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page
+	* @return bool
+	*/
+	public static function addMountPoint($mountPoint, $class, $classOptions, $mountType, $applicable, $isPersonal = false) {
+		if ($isPersonal) {
+			// Verify that the mount point applies for the current user
+			// Prevent non-admin users from mounting local storage
+			if ($applicable != OCP\User::getUser() || $class == 'OC_Filestorage_Local') {
+				return false;
+			}
+		}
+		$mount = array($applicable => array('/$user/files/'.$mountPoint => array('class' => $class, 'options' => $classOptions)));
+		$mountPoints = self::readData($isPersonal);
+		// Merge the new mount point into the current mount points
+		if (isset($mountPoints[$mountType])) {
+			if (isset($mountPoints[$mountType][$applicable])) {
+				$mountPoints[$mountType][$applicable] = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
+			} else {
+				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
+			}
+		} else {
+			$mountPoints[$mountType] = $mount;
+		}
+		self::writeData($isPersonal, $mountPoints);
+		return true;
+	}
+
+	/**
+	*
+	* @param string Mount point
+	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
+	* @param string User or group to remove mount from
+	* @param bool Personal or system mount point
+	* @return bool
+	*/
+	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
+		// Verify that the mount point applies for the current user
+		if ($isPersonal && $applicable != OCP\User::getUser()) {
+			return false;
+		}
+		$mountPoints = self::readData($isPersonal);
+		// Remove mount point
+		unset($mountPoints[$mountType][$applicable]['/$user/files/'.$mountPoint]);
+		// Unset parent arrays if empty
+		if (empty($mountPoints[$mountType][$applicable])) {
+			unset($mountPoints[$mountType][$applicable]);
+			if (empty($mountPoints[$mountType])) {
+				unset($mountPoints[$mountType]);
+			}
+		}
+		self::writeData($isPersonal, $mountPoints);
+		return true;
+	}
+
+	/**
+	* Read the mount points in the config file into an array
+	* @param bool Personal or system config file
+	* @return array
+	*/
+	private static function readData($isPersonal) {
+		if ($isPersonal) {
+			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
+		} else {
+			$file = OC::$SERVERROOT.'/config/mount.php';
+		}
+		if (is_file($file)) {
+			$mountPoints = include($file);
+			if (is_array($mountPoints)) {
+				return $mountPoints;
+			}
+		}
+		return array();
+	}
+
+	/**
+	* Write the mount points to the config file
+	* @param bool Personal or system config file
+	* @param array Mount points
+	*/
+	private static function writeData($isPersonal, $data) {
+		if ($isPersonal) {
+			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
+		} else {
+			$file = OC::$SERVERROOT.'/config/mount.php';
+		}
+		$content = "<?php return array (\n";
+		if (isset($data[self::MOUNT_TYPE_GROUP])) {
+			$content .= "\t'group' => array (\n";
+			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
+				$content .= "\t\t'".$group."' => array (\n";
+				foreach ($mounts as $mountPoint => $mount) {
+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+					
+				}
+				$content .= "\t\t),\n";
+			}
+			$content .= "\t),\n";
+		}
+		if (isset($data[self::MOUNT_TYPE_USER])) {
+			$content .= "\t'user' => array (\n";
+			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
+				$content .= "\t\t'".$user."' => array (\n";
+				foreach ($mounts as $mountPoint => $mount) {
+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+				}
+				$content .= "\t\t),\n";
+			}
+			$content .= "\t),\n";
+		}
+		$content .= ");\n?>";
+		@file_put_contents($file, $content);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
new file mode 100755
index 0000000000..32e0874244
--- /dev/null
+++ b/apps/files_external/personal.php
@@ -0,0 +1,34 @@
+<?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/>.
+*/
+
+OCP\Util::addScript('files_external', 'settings');
+OCP\Util::addStyle('files_external', 'settings');
+$backends = OC_Mount_Config::getBackends();
+// Remove local storage
+unset($backends['OC_Filestorage_Local']);
+$tmpl = new OCP\Template('files_external', 'settings');
+$tmpl->assign('isAdminPage', false);
+$tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
+$tmpl->assign('backends', $backends);
+return $tmpl->fetchPage();
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index ce1b308d75..983855ecdc 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -20,16 +20,15 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-OCP\Util::addscript('files_external', 'settings');
-OCP\Util::addstyle('files_external', 'settings');
+OCP\Util::addScript('files_external', 'settings');
+OCP\Util::addStyle('files_external', 'settings');
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('allowUserMounting', 'yes');
 $tmpl->assign('isAdminPage', true);
-$tmpl->assign('storage', array());
+$tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
+$tmpl->assign('backends', OC_Mount_Config::getBackends());
 $tmpl->assign('groups', OC_Group::getGroups());
-$tmpl->assign('backends', array('Amazon S3', 'FTP', 'Google Drive', 'SWIFT', 'WebDAV'));
-$tmpl->assign('configurations', '');
-$tmpl->assign('options', array('Encrypt', 'Version control', 'Allow sharing'));
+$tmpl->assign('users', OCP\User::getUsers());
+$tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
 
 ?>
\ No newline at end of file
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index e34c032239..9f65cfca96 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,70 +1,82 @@
 <form id="files_external">
 	<fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
-		<?php if (isset($_['storage'])): ?>
-		<table id="externalStorage">
+		<table id="externalStorage" data-admin="<?php echo json_encode($_['isAdminPage']); ?>">
 			<thead>
 				<tr>
-					<th><?php echo $l->t('Type'); ?></th>
+					<th><?php echo $l->t('Mount point'); ?></th>
+					<th><?php echo $l->t('Backend'); ?></th>
 					<th><?php echo $l->t('Configuration'); ?></th>
-					<th><?php echo $l->t('Mount Location'); ?></th>
-					<th><?php echo $l->t('Options'); ?></th>
-					<?php if ($_['isAdminPage'] == true) echo '<th>'.$l->t('Applicable').'</th>'; ?>
+					<!--<th><?php echo $l->t('Options'); ?></th> -->
+					<?php if ($_['isAdminPage']) echo '<th>'.$l->t('Applicable').'</th>'; ?>
 					<th>&nbsp;</th>
 				</tr>
 			</thead>
-			<tbody>
-			<?php $_['storage'] = array_merge($_['storage'], array(array('id' => 'addStorage', 'mount' => ''))); ?>
-			<?php foreach($_['storage'] as $storage): ?>
-				<tr <?php if ($storage['id'] == 'addStorage') echo 'id="addStorage"'; ?> data-storage-id="<?php echo $storage['id']; ?>">
-					<?php if ($storage['id'] == 'addStorage'): ?>
-						<td class="selectStorage">
-							<select id="selectStorage" data-configurations="<?php echo $_['configurations']; ?>">
-								<option value="" disabled selected style="display:none;"><?php echo $l->t('Add storage'); ?></option>
-								<?php foreach($_['backends'] as $backend): ?>
-									<option value="<?php echo $backend; ?>"><?php echo $backend; ?></option>
+			<tbody width="100%">
+			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
+			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
+				<tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>>
+					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+					<?php if ($mountPoint == ''): ?>
+						<td class="backend">
+							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
+								<option value="" disabled selected style="display:none;"><?php echo $l->t('Add mount point'); ?></option>
+								<?php foreach ($_['backends'] as $class => $backend): ?>
+									<option value="<?php echo $class; ?>"><?php echo $backend['backend']; ?></option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php else: ?>
-						<td class="type" <?php if ($storage['status'] == 'error') echo 'class="error"'; ?>><?php echo $storage['type']; ?></td>
-					<?php endif; ?>
-					<td class ="configuration">
-					<?php if (isset($storage['configuration'])): ?>
-						<?php foreach($storage['configuration'] as $parameter => $value): ?>
-							<?php if (strpos($parameter, '*') !== false): ?>
-								<input type="password" value="<?php echo $value; ?>" placeholder="<?php echo $l->t(substr($parameter, 1)); ?>" />
-							<?php else: ?>
-								<input type="text" value="<?php echo $value; ?>" placeholder="<?php echo $l->t($parameter); ?>" />
-							<?php endif; ?>
-						<?php endforeach; ?>
+						<td class="backend" data-class="<?php echo $mount['class']; ?>"><?php echo $mount['backend']; ?></td>
 					<?php endif; ?>
+					<td class ="configuration" width="100%">
+						<?php if (isset($mount['configuration'])): ?>
+							<?php foreach ($mount['configuration'] as $parameter => $value): ?>
+								<?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
+									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
+									<?php if (strpos($placeholder, '*') !== false): ?>
+										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+									<?php elseif(strpos($placeholder, '!') !== false): ?>
+										<label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" <?php if ($value == 'true') echo ' checked="checked"'; ?>  /><?php echo substr($placeholder, 1); ?></label>
+									<?php elseif (strpos($placeholder, '&') !== false): ?>
+										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+									<?php else: ?>
+										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo $placeholder; ?>" />
+									<?php endif; ?>
+								<?php endif; ?>
+							<?php endforeach; ?>
+						<?php endif; ?>
 					</td>
-					<td class="mount"><input type="text" name="storageMountLocation" value="<?php echo $storage['mount']; ?>" placeholder="<?php echo $l->t('Mount Location'); ?>" /></td>
-					<td class="options">
-						<select class="selectOptions" title="<?php echo $l->t('None set')?>" multiple="multiple">
+					<!--<td class="options">
+						<select class="selectOptions" title="<?php echo $l->t('None set')?>" multiple="multiple" disabled>
 							<?php if (OCP\App::isEnabled('files_encryption')) echo '<option value="Encrypt">Encrypt</option>'; ?>
 							<?php if (OCP\App::isEnabled('files_versions')) echo '<option value="Version control">Version control</option>'; ?>
 							<?php if (OCP\App::isEnabled('files_sharing')) echo '<option value="Allow sharing">Allow sharing</option>'; ?>
 						</select>
-					</td>
-					<?php if ($_['isAdminPage'] == true): ?>
-						<td class="applicable">
-							<select class="selectApplicable" data-storage-applicable="<?php echo $storage['applicable']; ?>" title="<?php echo $l->t('None set'); ?>" multiple="multiple">
-								<option value="Global"><?php echo $l->t('Global'); ?></option>
-								<?php foreach($_['groups'] as $group): ?>
-									<option value="<?php echo $group; ?>"><?php echo $group; ?></option>
-								<?php endforeach; ?>
+					</td>-->
+					<?php if ($_['isAdminPage']): ?>
+					<td class="applicable" align="right" data-applicable-groups='<?php if (isset($mount['applicable']['groups'])) echo json_encode($mount['applicable']['groups']); ?>' data-applicable-users='<?php if (isset($mount['applicable']['users'])) echo json_encode($mount['applicable']['users']); ?>'>
+							<select class="chzn-select" multiple style="width:20em;" data-placeholder="<?php echo $l->t('None set'); ?>">
+								<option value="all"><?php echo $l->t('All Users'); ?></option>
+								<optgroup label="<?php echo $l->t('Groups'); ?>">
+									<?php foreach ($_['groups'] as $group): ?>
+										<option value="<?php echo $group; ?>(group)" <?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])) echo 'selected="selected"'; ?>><?php echo $group; ?></option>
+									<?php endforeach; ?>
+								</optgroup>
+								<optgroup label="<?php echo $l->t('Users'); ?>">
+									<?php foreach ($_['users'] as $user): ?>
+										<option value="<?php echo $user; ?>" <?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])) echo 'selected="selected"'; ?>"><?php echo $user; ?></option>
+									<?php endforeach; ?>
+								</optgroup>
 							</select>
 						</td>
 					<?php endif; ?>
-					<td <?php if ($storage['id'] != 'addStorage') echo 'class="remove"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+					<td <?php if ($mountPoint != '') echo 'class="remove"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>
 		</table>
-		<?php endif; ?>
-		<?php if ($_['isAdminPage'] == true): ?>
+		<?php if ($_['isAdminPage']): ?>
 			<br />
 			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
 			<label for="allowUserMounting"><?php echo $l->t('Enable User External Storage'); ?></label><br/>

From 8fcdccdcdccf6e6fe43995fd08a30731aada9f4e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 8 Jun 2012 13:48:38 -0400
Subject: [PATCH 0237/1537] Add Amazon Web Services SDK to 3rdparty for Amazon
 S3 external storage

---
 3rdparty/aws-sdk/README.md                    |  136 +
 .../aws-sdk/_compatibility_test/README.md     |   37 +
 .../sdk_compatibility.inc.php                 |   75 +
 .../sdk_compatibility_test.php                |  789 ++++
 .../sdk_compatibility_test_cli.php            |  186 +
 3rdparty/aws-sdk/_docs/CHANGELOG.md           | 1405 ++++++
 3rdparty/aws-sdk/_docs/CONTRIBUTORS.md        |   64 +
 .../aws-sdk/_docs/DYNAMODBSESSIONHANDLER.html |  235 +
 3rdparty/aws-sdk/_docs/KNOWNISSUES.md         |   65 +
 3rdparty/aws-sdk/_docs/LICENSE.md             |  151 +
 3rdparty/aws-sdk/_docs/NOTICE.md              |  444 ++
 .../aws-sdk/_docs/STREAMWRAPPER_README.html   |  243 +
 .../_docs/WHERE_IS_THE_API_REFERENCE.md       |    2 +
 .../authentication/signable.interface.php     |   48 +
 .../signature_v2query.class.php               |  163 +
 .../authentication/signature_v3json.class.php |  235 +
 .../signature_v3query.class.php               |  192 +
 .../authentication/signature_v4json.class.php |  353 ++
 .../signature_v4query.class.php               |  345 ++
 .../authentication/signer.abstract.php        |   68 +
 3rdparty/aws-sdk/config-sample.inc.php        |   83 +
 .../aws-sdk/lib/dom/ArrayToDOMDocument.php    |  181 +
 3rdparty/aws-sdk/lib/requestcore/LICENSE      |   25 +
 3rdparty/aws-sdk/lib/requestcore/README.md    |   15 +
 3rdparty/aws-sdk/lib/requestcore/cacert.pem   | 3390 ++++++++++++++
 .../lib/requestcore/requestcore.class.php     | 1028 +++++
 3rdparty/aws-sdk/lib/yaml/LICENSE             |   19 +
 3rdparty/aws-sdk/lib/yaml/README.markdown     |   15 +
 3rdparty/aws-sdk/lib/yaml/lib/sfYaml.php      |  135 +
 .../aws-sdk/lib/yaml/lib/sfYamlDumper.php     |   60 +
 .../aws-sdk/lib/yaml/lib/sfYamlInline.php     |  442 ++
 .../aws-sdk/lib/yaml/lib/sfYamlParser.php     |  612 +++
 3rdparty/aws-sdk/sdk.class.php                | 1434 ++++++
 3rdparty/aws-sdk/services/s3.class.php        | 3979 +++++++++++++++++
 3rdparty/aws-sdk/utilities/array.class.php    |  312 ++
 .../aws-sdk/utilities/batchrequest.class.php  |  126 +
 .../aws-sdk/utilities/complextype.class.php   |  123 +
 .../aws-sdk/utilities/credential.class.php    |  157 +
 .../aws-sdk/utilities/credentials.class.php   |  125 +
 .../aws-sdk/utilities/gzipdecode.class.php    |  377 ++
 .../aws-sdk/utilities/hadoopbase.class.php    |   67 +
 .../utilities/hadoopbootstrap.class.php       |  127 +
 .../aws-sdk/utilities/hadoopstep.class.php    |   98 +
 3rdparty/aws-sdk/utilities/info.class.php     |   69 +
 3rdparty/aws-sdk/utilities/json.class.php     |   89 +
 3rdparty/aws-sdk/utilities/manifest.class.php |   54 +
 .../aws-sdk/utilities/mimetypes.class.php     |  223 +
 3rdparty/aws-sdk/utilities/policy.class.php   |  134 +
 3rdparty/aws-sdk/utilities/request.class.php  |   70 +
 3rdparty/aws-sdk/utilities/response.class.php |   29 +
 .../aws-sdk/utilities/simplexml.class.php     |  248 +
 .../aws-sdk/utilities/stacktemplate.class.php |   52 +
 .../aws-sdk/utilities/stepconfig.class.php    |   91 +
 .../aws-sdk/utilities/utilities.class.php     |  399 ++
 apps/files_external/lib/amazons3.php          |    2 +-
 55 files changed, 19625 insertions(+), 1 deletion(-)
 create mode 100644 3rdparty/aws-sdk/README.md
 create mode 100644 3rdparty/aws-sdk/_compatibility_test/README.md
 create mode 100644 3rdparty/aws-sdk/_compatibility_test/sdk_compatibility.inc.php
 create mode 100644 3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test.php
 create mode 100755 3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php
 create mode 100644 3rdparty/aws-sdk/_docs/CHANGELOG.md
 create mode 100644 3rdparty/aws-sdk/_docs/CONTRIBUTORS.md
 create mode 100644 3rdparty/aws-sdk/_docs/DYNAMODBSESSIONHANDLER.html
 create mode 100644 3rdparty/aws-sdk/_docs/KNOWNISSUES.md
 create mode 100644 3rdparty/aws-sdk/_docs/LICENSE.md
 create mode 100644 3rdparty/aws-sdk/_docs/NOTICE.md
 create mode 100644 3rdparty/aws-sdk/_docs/STREAMWRAPPER_README.html
 create mode 100644 3rdparty/aws-sdk/_docs/WHERE_IS_THE_API_REFERENCE.md
 create mode 100644 3rdparty/aws-sdk/authentication/signable.interface.php
 create mode 100644 3rdparty/aws-sdk/authentication/signature_v2query.class.php
 create mode 100644 3rdparty/aws-sdk/authentication/signature_v3json.class.php
 create mode 100644 3rdparty/aws-sdk/authentication/signature_v3query.class.php
 create mode 100644 3rdparty/aws-sdk/authentication/signature_v4json.class.php
 create mode 100644 3rdparty/aws-sdk/authentication/signature_v4query.class.php
 create mode 100644 3rdparty/aws-sdk/authentication/signer.abstract.php
 create mode 100755 3rdparty/aws-sdk/config-sample.inc.php
 create mode 100644 3rdparty/aws-sdk/lib/dom/ArrayToDOMDocument.php
 create mode 100755 3rdparty/aws-sdk/lib/requestcore/LICENSE
 create mode 100755 3rdparty/aws-sdk/lib/requestcore/README.md
 create mode 100755 3rdparty/aws-sdk/lib/requestcore/cacert.pem
 create mode 100755 3rdparty/aws-sdk/lib/requestcore/requestcore.class.php
 create mode 100644 3rdparty/aws-sdk/lib/yaml/LICENSE
 create mode 100644 3rdparty/aws-sdk/lib/yaml/README.markdown
 create mode 100644 3rdparty/aws-sdk/lib/yaml/lib/sfYaml.php
 create mode 100644 3rdparty/aws-sdk/lib/yaml/lib/sfYamlDumper.php
 create mode 100644 3rdparty/aws-sdk/lib/yaml/lib/sfYamlInline.php
 create mode 100644 3rdparty/aws-sdk/lib/yaml/lib/sfYamlParser.php
 create mode 100755 3rdparty/aws-sdk/sdk.class.php
 create mode 100755 3rdparty/aws-sdk/services/s3.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/array.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/batchrequest.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/complextype.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/credential.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/credentials.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/gzipdecode.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/hadoopbase.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/hadoopbootstrap.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/hadoopstep.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/info.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/json.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/manifest.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/mimetypes.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/policy.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/request.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/response.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/simplexml.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/stacktemplate.class.php
 create mode 100644 3rdparty/aws-sdk/utilities/stepconfig.class.php
 create mode 100755 3rdparty/aws-sdk/utilities/utilities.class.php

diff --git a/3rdparty/aws-sdk/README.md b/3rdparty/aws-sdk/README.md
new file mode 100644
index 0000000000..7e55f76b3b
--- /dev/null
+++ b/3rdparty/aws-sdk/README.md
@@ -0,0 +1,136 @@
+# AWS SDK for PHP
+
+The AWS SDK for PHP enables developers to build solutions for Amazon Simple Storage Service (Amazon S3),
+Amazon Elastic Compute Cloud (Amazon EC2), Amazon SimpleDB, and more. With the AWS SDK for PHP, developers
+can get started in minutes with a single, downloadable package.
+
+The SDK features:
+
+* **AWS PHP Libraries:** Build PHP applications on top of APIs that take the complexity out of coding directly
+  against a web service interface. The toolkit provides APIs that hide much of the lower-level implementation.
+* **Code Samples:** Practical examples for how to use the toolkit to build applications.
+* **Documentation:** Complete SDK reference documentation with samples demonstrating how to use the SDK.
+* **PEAR package:** The ability to install the AWS SDK for PHP as a PEAR package.
+* **SDK Compatibility Test:** Includes both an HTML-based and a CLI-based SDK Compatibility Test that you can
+  run on your server to determine whether or not your PHP environment meets the minimum requirements.
+
+For more information about the AWS SDK for PHP, including a complete list of supported services, see
+[aws.amazon.com/sdkforphp](http://aws.amazon.com/sdkforphp).
+
+
+## Signing up for Amazon Web Services
+
+Before you can begin, you must sign up for each service you want to use.
+
+To sign up for a service:
+
+* Go to the home page for the service. You can find a list of services on
+  [aws.amazon.com/products](http://aws.amazon.com/products).
+* Click the Sign Up button on the top right corner of the page. If you don't already have an AWS account, you
+  are prompted to create one as part of the sign up process.
+* Follow the on-screen instructions.
+* AWS sends you a confirmation e-mail after the sign-up process is complete. At any time, you can view your
+  current account activity and manage your account by going to [aws.amazon.com](http://aws.amazon.com) and
+  clicking "Your Account".
+
+
+## Source
+The source tree for includes the following files and directories:
+
+* `_compatibility_test` -- Includes both an HTML-based and a CLI-based SDK Compatibility Test that you can
+  run on your server to determine whether or not your PHP environment meets the minimum requirements.
+* `_docs` -- Informational documents, the contents of which should be fairly self-explanatory.
+* `_samples` -- Code samples that you can run out of the box.
+* `extensions` -- Extra code that can be used to enhance usage of the SDK, but isn't a service class or a
+  third-party library.
+* `lib` -- Contains any third-party libraries that the SDK depends on. The licenses for these projects will
+  always be Apache 2.0-compatible.
+* `services` -- Contains the service-specific classes that communicate with AWS. These classes are always
+  prefixed with `Amazon`.
+* `utilities` -- Contains any utility-type methods that the SDK uses. Includes extensions to built-in PHP
+  classes, as well as new functionality that is entirely custom. These classes are always prefixed with `CF`.
+* `README` -- The document you're reading right now.
+* `config-sample.inc.php` -- A sample configuration file that should be filled out and renamed to `config.inc.php`.
+* `sdk.class.php` -- The SDK loader that you would include in your projects. Contains the base functionality
+  that the rest of the SDK depends on.
+
+
+## Minimum Requirements in a nutshell
+
+* You are at least an intermediate-level PHP developer and have a basic understanding of object-oriented PHP.
+* You have a valid AWS account, and you've already signed up for the services you want to use.
+* The PHP interpreter, version 5.2 or newer. PHP 5.2.17 or 5.3.x is highly recommended for use with the AWS SDK for PHP.
+* The cURL PHP extension (compiled with the [OpenSSL](http://openssl.org) libraries for HTTPS support).
+* The ability to read from and write to the file system via [file_get_contents()](http://php.net/file_get_contents) and [file_put_contents()](http://php.net/file_put_contents).
+
+If you're not sure whether your PHP environment meets these requirements, run the
+[SDK Compatibility Test](http://github.com/amazonwebservices/aws-sdk-for-php/tree/master/_compatibility_test/) script
+included in the SDK download.
+
+
+## Installation
+
+### Via GitHub
+
+[Git](http://git-scm.com) is an extremely fast, efficient, distributed version control system ideal for the
+collaborative development of software. [GitHub](http://github.com/amazonwebservices) is the best way to
+collaborate with others. Fork, send pull requests and manage all your public and private git repositories.
+We believe that GitHub is the ideal service for working collaboratively with the open source PHP community.
+
+Git is primarily a command-line tool. GitHub provides instructions for installing Git on
+[Mac OS X](http://help.github.com/mac-git-installation/), [Windows](http://help.github.com/win-git-installation/),
+and [Linux](http://help.github.com/linux-git-installation/). If you're unfamiliar with Git, there are a variety
+of resources on the net that will help you learn more:
+
+* [Git Immersion](http://gitimmersion.com) is a guided tour that walks through the fundamentals of Git, inspired
+  by the premise that to know a thing is to do it.
+* The [PeepCode screencast on Git](https://peepcode.com/products/git) ($12) will teach you how to install and
+  use Git. You'll learn how to create a repository, use branches, and work with remote repositories.
+* [Git Reference](http://gitref.org) is meant to be a quick reference for learning and remembering the most
+  important and commonly used Git commands.
+* [Git Ready](http://gitready.com) provides a collection of Git tips and tricks.
+* If you want to dig even further, I've [bookmarked other Git references](http://pinboard.in/u:skyzyx/t:git).
+
+If you're comfortable working with Git and/or GitHub, you can pull down the source code as follows:
+
+    git clone git://github.com/amazonwebservices/aws-sdk-for-php.git AWSSDKforPHP
+    cd ./AWSSDKforPHP
+
+### Via PEAR
+
+[PEAR](http://pear.php.net) stands for the _PHP Extension and Application Repository_ and is a framework and
+distribution system for reusable PHP components. It is the PHP equivalent to package management software such as
+[MacPorts](http://macports.org) and [Homebrew](https://github.com/mxcl/homebrew) for Mac OS X,
+[Yum](http://fedoraproject.org/wiki/Tools/yum) and [Apt](http://wiki.debian.org/Apt) for GNU/Linux,
+[RubyGems](http://rubygems.org) for Ruby, [Easy Install](http://packages.python.org/distribute/easy_install.html)
+for Python, [Maven](http://maven.apache.org) for Java, and [NPM](http://npm.mape.me) for Node.js.
+
+PEAR packages are very easy to install, and are available in your PHP environment path so that they are accessible
+to any PHP project. PEAR packages are not specific to your project, but rather to the machine that they're
+installed on.
+
+From the command-line, you can install the SDK with PEAR as follows:
+
+    pear channel-discover pear.amazonwebservices.com
+    pear install aws/sdk
+
+You may need to use `sudo` for the above commands. Once the SDK has been installed via PEAR, you can load it into
+your project with:
+
+	require_once 'AWSSDKforPHP/sdk.class.php';
+
+### Configuration
+
+1. Copy the contents of [config-sample.inc.php](https://github.com/amazonwebservices/aws-sdk-for-php/raw/master/config-sample.inc.php)
+   and add your credentials as instructed in the file.
+2. Move your file to `~/.aws/sdk/config.inc.php`.
+3. Make sure that `getenv('HOME')` points to your user directory. If not you'll need to set
+   `putenv('HOME=<your-user-directory>')`.
+
+
+## Additional Information
+
+* AWS SDK for PHP: <http://aws.amazon.com/sdkforphp>
+* Documentation: <http://docs.amazonwebservices.com/AWSSDKforPHP/latest/>
+* License: <http://aws.amazon.com/apache2.0/>
+* Discuss: <http://aws.amazon.com/forums>
diff --git a/3rdparty/aws-sdk/_compatibility_test/README.md b/3rdparty/aws-sdk/_compatibility_test/README.md
new file mode 100644
index 0000000000..9e2f2d8940
--- /dev/null
+++ b/3rdparty/aws-sdk/_compatibility_test/README.md
@@ -0,0 +1,37 @@
+# Compatibility Test
+
+## Via your web browser
+
+1. Upload `sdk_compatibility_test.php` to the web-accessible root of your website.
+For example, if your website is `www.example.com`, upload it so that you can get
+to it at `www.example.com/sdk_compatibility_test.php`
+
+2. Open your web browser and go to the page you just uploaded.
+
+
+## Via the command line
+
+### Windows
+
+1. Upload `sdk_compatibility_test_cli.php` to your server via SFTP.
+
+2. SSH/RDP into the machine, and find the directory where you uploaded the test.
+
+3. Run the test, and review the results:
+
+	php .\sdk_compatibility_test_cli.php
+
+
+### Non-Windows (Mac or *nix)
+
+1. Upload `sdk_compatibility_test_cli.php` to your server via SFTP.
+
+2. SSH into the machine, and find the directory where you uploaded the test.
+
+3. Set the executable bit:
+
+	chmod +x ./sdk_compatibility_test_cli.php
+
+4. Run the test, and review the results:
+
+	./sdk_compatibility_test_cli.php
diff --git a/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility.inc.php b/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility.inc.php
new file mode 100644
index 0000000000..c17ec33d72
--- /dev/null
+++ b/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility.inc.php
@@ -0,0 +1,75 @@
+<?php
+
+define('REQUIREMENTS_ALL_MET', 100);
+define('REQUIREMENTS_MIN_MET', 10);
+define('REQUIREMENTS_NOT_MET', 0);
+
+// Required
+$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.2.0', '>='));
+$simplexml_ok = extension_loaded('simplexml');
+$dom_ok = extension_loaded('dom');
+$json_ok = (extension_loaded('json') && function_exists('json_encode') && function_exists('json_decode'));
+$spl_ok = extension_loaded('spl');
+$pcre_ok = extension_loaded('pcre');
+$curl_ok = false;
+if (function_exists('curl_version'))
+{
+	$curl_version = curl_version();
+	$curl_ok = (function_exists('curl_exec') && in_array('https', $curl_version['protocols'], true));
+}
+$file_ok = (function_exists('file_get_contents') && function_exists('file_put_contents'));
+
+// Optional, but recommended
+$openssl_ok = (extension_loaded('openssl') && function_exists('openssl_sign'));
+$zlib_ok = extension_loaded('zlib');
+
+// Optional
+$apc_ok = extension_loaded('apc');
+$xcache_ok = extension_loaded('xcache');
+$memcached_ok = extension_loaded('memcached');
+$memcache_ok = extension_loaded('memcache');
+$mc_ok = ($memcache_ok || $memcached_ok);
+$pdo_ok = extension_loaded('pdo');
+$pdo_sqlite_ok = extension_loaded('pdo_sqlite');
+$sqlite2_ok = extension_loaded('sqlite');
+$sqlite3_ok = extension_loaded('sqlite3');
+$sqlite_ok = ($pdo_ok && $pdo_sqlite_ok && ($sqlite2_ok || $sqlite3_ok));
+
+// Other
+$int64_ok = (PHP_INT_MAX === 9223372036854775807);
+$ini_memory_limit = get_ini('memory_limit');
+$ini_open_basedir = get_ini('open_basedir');
+$ini_safe_mode = get_ini('safe_mode');
+$ini_zend_enable_gc = get_ini('zend.enable_gc');
+
+if ($php_ok && $int64_ok && $curl_ok && $simplexml_ok && $dom_ok && $spl_ok && $json_ok && $pcre_ok && $file_ok && $openssl_ok && $zlib_ok && ($apc_ok || $xcache_ok || $mc_ok || $sqlite_ok))
+{
+	$compatiblity = REQUIREMENTS_ALL_MET;
+}
+elseif ($php_ok && $curl_ok && $simplexml_ok && $dom_ok && $spl_ok && $json_ok && $pcre_ok && $file_ok)
+{
+	$compatiblity = REQUIREMENTS_MIN_MET;
+}
+else
+{
+	$compatiblity = REQUIREMENTS_NOT_MET;
+}
+
+function get_ini($config)
+{
+	$cfg_value = ini_get($config);
+
+	if ($cfg_value === false || $cfg_value === '' || $cfg_value === 0)
+	{
+		return false;
+	}
+	elseif ($cfg_value === true || $cfg_value === '1' || $cfg_value === 1)
+	{
+		return true;
+	}
+}
+
+function is_windows()
+{
+	return strtolower(substr(PHP_OS, 0, 3)) === 'win';
+}
diff --git a/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test.php b/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test.php
new file mode 100644
index 0000000000..b36a38ab35
--- /dev/null
+++ b/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test.php
@@ -0,0 +1,789 @@
+<?php
+if (isset($_GET['logopng']))
+{
+	$data = <<<IMAGE
+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
+l/8Df+8XDp+g0JUAAAAASUVORK5CYII=
+IMAGE;
+
+
+	header('Content-type: image/png');
+	echo base64_decode($data);
+	exit;
+}
+elseif (isset($_GET['background']))
+{
+	$data = <<<IMAGE
+R0lGODlhMAEeAeYAAP///8ni6cTf5+72+PD3+c3k6+nz9ufy9ev099Pn7bnZ48bg6LfY4uHv8/r8
+/f3+/v7//7bX4cjh6fj7/Mvj6vz9/rva4+z19/X6+/f7/Pn8/fb6+7jZ4vv9/bra473b5Lzb5LXX
+4b7c5b/c5e31+NTo7tvs8dfq7/H3+bjY4tnq79Hm7c/l69nr8PL4+t7t8sDd5cLe5uPw9Nvr8Mri
+6fP4+tLn7er099Hm7O/2+dDm7OTw9OXx9Nbp7tbp7+Lv8+Du8szj6sXg57bY4d3s8djq7+jz9tzs
+8cPe58fh6M7k68Pf5+by9fz+/sDd5vT5+vT5+97t8bbY4trr8P7+/v7+/+Pw8+Xx9dXo7sHe5vH4
++fP5+sHd5t/u8s/l7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5
+BAAAAAAALAAAAAAwAR4BAAf/gCGCg4SFhoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnp+goaKNEaWm
+p6ipqqusra6vsLGys7S1tre4ubq7vL2+v8DBwsPExbBDyMnKy8zNzs/Q0dLT1NXW19jZ2tvc3d7K
+UuHi4+Tl5ufo6err7O3u7/Dx8vP09fb34wz6+/z9/v8AAwocSLCgwYMIEypcyLChw4cQI0qcSLGi
+xYsYM2osmKKjx48gQ4ocSbKkyZMoU6pcybKly5cwY8qc+ZGDzZs4c+rcybOnz59AgwodSrSo0aNI
+kypdyrSp06dQo0qdSrWq1aAKsmrdyrWr169gw4odS7as2bNo06pdy7at27dw/+PKnUu3rt27ePOS
+9cC3r9+/gAMLHky4sOHDiBMrXsy4sePHkCNLnky5suXLmDNr3sz5sIXPoEOLHk26tOnTqFOrXs26
+tevXsGPLnk27tu3buHPr3s27t+/fqkEIH068uPHjyJMrX868ufPn0KNLn069uvXr2LNr3869u/fv
+4MOLb/6hvPnz6NOrX8++vfv38OPLn0+/vv37+PPr38+/v///AAYo4IAEFgifCAgmqOCCDDbo4IMQ
+RijhhBRWaOGFGGao4YYcdujhhyCGKOKIJJZo4okoTjjCiiy26OKLMMYo44w01mjjjTjmqOOOPPbo
+449ABinkkEQWaeSRSCap5P+SNsLg5JNQRinllFRWaeWVWGap5ZZcdunll2CGKeaYZELpxJlopqnm
+mmy26eabcMYp55x01mnnnXjmqeeefPaZJheABirooIQWauihiCaq6KKMNuroo5BGKumklFZqqaBZ
+ZKrpppx26umnoIYq6qiklmrqqaimquqqrLbq6qubxiDrrLTWauutuOaq66689urrr8AGK+ywxBZr
+7LHI0orEssw26+yz0EYr7bTUVmvttdhmq+223Hbr7bfghtvsEuSWa+656Kar7rrstuvuu/DGK++8
+9NZr77345quvuQL06++/AAcs8MAEF2zwwQgnrPDCDDfs8MMQRyzxxBRXbPH/xRhnrPHGHHeMsBAg
+hyzyyCSXbPLJKKes8sost+zyyzDHLPPMNNdss8gL5Kzzzjz37PPPQAct9NBEF2300UgnrfTSTDft
+9NNQRy311FRXbfXVWGdNdBJcd+3112CHLfbYZJdt9tlop6322my37fbbcMctt9cS1G333Xjnrffe
+fPft99+ABy744IQXbvjhiCeu+OKMN+7445BHLvnklFcOeACYZ6755px37vnnoIcu+uikl2766ain
+rvrqrLfu+uuwxy777LTXbvvtuI9Ow+689+7778AHL/zwxBdv/PHIJ6/88sw37/zz0EffOwXUV2/9
+9dhnr/323Hfv/ffghy/+//jkl2/++einr/767Lfv/vvwxy///PR/H8T9+Oev//789+///wAMoAAH
+SMACGvCACEygAhfIwAbmrwAQjKAEJ0jBClrwghjMoAY3yMEOevCDIAyhCEdIwhKa8IQoTKEKV8jC
+FrrwhTDcoBJmSMMa2vCGOMyhDnfIwx768IdADKIQh0jEIhrxiEhMYg1ZwMQmOvGJUIyiFKdIxSpa
+8YpYzKIWt8jFLnrxi2AMoxid6IUymvGMaEyjGtfIxja68Y1wjKMc50jHOtrxjnjMox73eEYd+PGP
+gAykIAdJyEIa8pCITKQiF8nIRjrykZCMpCQnSUlA4uCSmMykJjfJyU568v+ToAylKEdJylKa8pSo
+TKUqV8nKVmZyBbCMpSxnScta2vKWuMylLnfJy1768pfADKYwh0nMYhpTljZIpjKXycxmOvOZ0Iym
+NKdJzWpa85rYzKY2t8nNbnrzm8tMgDjHSc5ymvOc6EynOtfJzna6853wjKc850nPetrznvjMpz73
+yc9++vOfAA2oQNtZgoIa9KAITahCF8rQhjr0oRCNqEQnStGKWvSiGM2oRjd6UCx49KMgDalIR0rS
+kpr0pChNqUpXytKWuvSlMI2pTGdKU5D24KY4zalOd8rTnvr0p0ANqlCHStSiGvWoSE2qUpfK1Kbm
+1AdQjapUp0rVqlr1qlj/zapWt8rVrnr1q2ANq1jHStaymlWqJ0irWtfK1ra69a1wjatc50rXutr1
+rnjNq173yte++vWvay2CYAdL2MIa9rCITaxiF8vYxjr2sZCNrGQnS9nKWvaymCWsCjbL2c569rOg
+Da1oR0va0pr2tKhNrWpXy9rWuva1sI1tZ1tA29ra9ra4za1ud8vb3vr2t8ANrnCHS9ziGve4yE2u
+cm07heY697nQja50p0vd6lr3utjNrna3y93ueve74A2veMf73BmY97zoTa9618ve9rr3vfCNr3zn
+S9/62ve++M2vfvfLX/Sa4L8ADrCAB0zgAhv4wAhOsIIXzOAGO/jBEI6w/4QnTOEKB/gIGM6whjfM
+4Q57+MMgDrGIR0ziEpv4xChOsYpXzOIWu1jDRIixjGdM4xrb+MY4zrGOd8zjHvv4x0AOspCHTOQi
+G/nIM46CkpfM5CY7+clQjrKUp0zlKlv5yljOspa3zOUue/nLYGbyC8ZM5jKb+cxoTrOa18zmNrv5
+zXCOs5znTOc62/nOeM5zmbvA5z77+c+ADrSgB03oQhv60IhOtKIXzehGO/rRkI60pP0MhEpb+tKY
+zrSmN83pTnv606AOtahHTepSm/rUqE61qld96Qa4+tWwjrWsZ03rWtv61rjOta53zete+/rXwA62
+sIdN7GIb+9jITrayl//N7GY7O9c/iLa0p03talv72tjOtra3ze1ue/vb4A63uMdN7nKb+9zTtoK6
+183udrv73fCOt7znTe962/ve+M63vvfN7377+98AZ7cMBk7wghv84AhPuMIXzvCGO/zhEI+4xCdO
+8Ypb/OIYz3jBd8Dxjnv84yAPuchHTvKSm/zkKE+5ylfO8pa7/OUwj7nMPc6Dmtv85jjPuc53zvOe
++/znQA+60IdO9KIb/ehIT7rSl37zKzj96VCPutSnTvWqW/3qWM+61rfO9a57/etgD7vYx052qDPh
+7GhPu9rXzva2u/3tcI+73OdO97rb/e54z7ve9873vqf9AIAPvOAHT/j/whv+8IhPvOIXz/jGO/7x
+kI+85CdP+cpb/vKYz7zmN8/5znv+86BfvBFGT/rSm/70qE+96lfP+ta7/vWwj73sZ0/72tv+9rjP
+fekNwPve+/73wA++8IdP/OIb//jIT77yl8/85jv/+dCPvvSnT/3qW//62M++9rfP/ePf4PvgD7/4
+x0/+8pv//OhPv/rXz/72u//98I+//OdP//qHHwH4z7/+98///vv//wAYgAI4gARYgAZ4gAiYgAq4
+gAzYgA74gBAYgRI4gRRYgRZ4gRg4gBewgRzYgR74gSAYgiI4giRYgiZ4giiYgiq4gizYgi74gjAY
+gzI4gzRYgzZ4gziY/4M6uIMmSAI++INAGIRCOIREWIRGeIRImIRKuIRM2IRO+IRQGIVSOIVUCIQD
+cIVYmIVauIVc2IVe+IVgGIZiOIZkWIZmeIZomIZquIZs2IZu+IZwGIdyOId0WId2eIdimAN6uId8
+2Id++IeAGIiCOIiEWIiGeIiImIiKuIiM2IiO+IiQyIcEMImUWImWeImYmImauImc2Ime+ImgGIqi
+OIqkWIqmeIqomIqquIqs2Iqu+IqwGIuyOIueiAK2eIu4mIu6uIu82Iu++IvAGIzCOIzEWIzGeIzI
+mIzKuIzMiIta8IzQGI3SOI3UWI3WeI3YmI3auI3c2I3e+I3gGI7iOP+O5FiO0egC6JiO6riO7NiO
+7viO8BiP8jiP9FiP9niP+JiP+riP/NiP/qiONRCQAjmQBFmQBnmQCJmQCrmQDNmQDvmQEBmREjmR
+FFmRFnmRA7kFGrmRHNmRHvmRIBmSIjmSJFmSJnmSKJmSKrmSLNmSLvmSMMmRTzCTNFmTNnmTOJmT
+OrmTPNmTPvmTQBmUQjmURFmURnmUSJmUNQkFTNmUTvmUUBmVUjmVVFmVVnmVWJmVWrmVXNmVXvmV
+YBmWYumUGFCWZnmWaJmWarmWbNmWbvmWcBmXcjmXdFmXdnmXeJmXermXfNmXfvmXgBmYgjmYhFmY
+cLkBiJmYirmYjNn/mI75mJAZmZI5mZRZmZZ5mZiZmZq5mZzZmZ75maAZmqI5mqRZmqZ5mqg5mRmw
+mqzZmq75mrAZm7I5m7RZm7Z5m7iZm7q5m7zZm775m8AZnMI5nMRZnMZ5nMiZnMq5nLY5Ac75nNAZ
+ndI5ndRZndZ5ndiZndq5ndzZnd75neAZnuI5nuRZnuZ5nuiZnuq5nuzZnu6ZnRoQn/I5n/RZn/Z5
+n/iZn/q5n/zZn/75nwAaoAI6oARaoAZ6oAiaoAq6oAzaoA76oBAaofzpABRaoRZ6oRiaoRq6oRza
+oR76oSAaoiI6oiRaoiZ6oiiaoiq6oizaoi76ojAaozI6ozT6oR1w/6M4mqM6uqM82qM++qNAGqRC
+OqREWqRGeqRImqRKuqRM2qRO+qRQGqVSOqVUWqVWeqVCWgFauqVc2qVe+qVgGqZiOqZkWqZmeqZo
+mqZquqZs2qZu+qZwGqdyOqd0Wqd2eqd4mqd6WqZN0Kd++qeAGqiCOqiEWqiGeqiImqiKuqiM2qiO
++qiQGqmSOql/+gCWeqmYmqmauqmc2qme+qmgGqqiOqqkWqqmeqqomqqquqqs2qqu+qqwGquyOqu0
+Wqu2GqpUkKu6uqu82qu++qvAGqzCOqzEWqzGeqzImqzKuqzM2qzO+qy7WgXSOq3UWq3Weq3Ymq3a
+uq3c2q3e+q3gGv+u4jqu5Fqu5nqu6EqtELCu7Nqu7vqu8Bqv8jqv9Fqv9nqv+Jqv+rqv/Nqv/vqv
+ABuwAjuwBFuwBnuwCJuwCruw9goADvuwEBuxEjuxFFuxFnuxGJuxGruxHNuxHvuxIBuyIjuyJFuy
+JnuyKJuyKruyLNuyLvuyMBuzMjuzNFuzNnuzOJuzOruzPNuzPvuzQBu0Qju0RFu0Rnu0SJu0Sru0
+TNu0Tvu0UBu1Uju1VFu1Vnu1WJu1Wru1XNu1Xvu1YBu2Yju2ZFu2Znu2aJu2aru2bNu2bvu2cBu3
+cju3dFu3dnu3eJu3eru3fNu3fvu3gBu4gju4hFu4hnu4iJu4irv/uIzbuI77uJAbuZI7uZRbuZZ7
+uZibuZq7uZzbuZ77uaAbuqI7uqRbuqZ7uqibuqq7uqzbuq77urAbu7I7u7Rbu7Z7u7ibu7q7u7zb
+u777u8AbvMI7vMRbvMZ7vMibvMq7vMzbvM77vNAbvdI7vdRbvdZ7vdibvdq7vdzbvd77veAbvuI7
+vuRbvuZ7vuibvuq7vuzbvu77vvAbv/I7v/Rbv/Z7v/ibv/q7v/zbv/77vwAcwAI8wARcwAZ8wAic
+wAq8wAzcwA78wBAcwRI8wRRcwRZ8wRicwRq8wRzcwR78wSAcwiI8wiRcwiZ8wiicwiq8wizcwi78
+wjAcwzI8wzRcFcM2fMM4nMM6vMM83MM+/MNArLmBAAA7
+IMAGE;
+
+	header('Content-type: image/gif');
+	echo base64_decode($data);
+	exit;
+}
+elseif (isset($_GET['loader']))
+{
+	$data = <<<IMAGE
+R0lGODlhEAALAPQAAP///wBmzNro9tDi9Ory+gZpzQBmzC6B1YKz5WCf3rrV8CJ60kqS2oq452Sh
+377X8SZ80wRozE6U2+bv+djn9vT4/DiH19zp9/L2+7bS76DF68re8+70+gAAAAAAAAAAACH/C05F
+VFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAA
+EAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJ
+CwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJ
+CwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHT
+uBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V5
+5zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme
+1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAA
+ABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2
+y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2
+isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0
+DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA
+IMAGE;
+	header('Content-type: image/gif');
+	echo base64_decode($data);
+	exit;
+}
+elseif (isset($_GET['ssl_check']))
+{
+	header('Content-type: text/plain; charset=utf-8');
+
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, 'https://email.us-east-1.amazonaws.com');
+	curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+	curl_setopt($ch, CURLOPT_HEADER, false);
+	curl_setopt($ch, CURLOPT_NOBODY, true);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_TIMEOUT, 5184000);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 120);
+	curl_setopt($ch, CURLOPT_NOSIGNAL, true);
+	curl_setopt($ch, CURLOPT_USERAGENT, 'aws-sdk-php/compat-www');
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+	curl_setopt($ch, CURLOPT_VERBOSE, true);
+
+	curl_exec($ch);
+	echo (curl_getinfo($ch, CURLINFO_SSL_VERIFYRESULT) === 0) ? 'false' : 'true';
+	curl_close($ch);
+
+	exit;
+}
+
+// Include the compatibility test logic
+require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'sdk_compatibility.inc.php';
+
+header('Content-type: text/html; charset=UTF-8');
+
+?><!DOCTYPE html>
+
+<html lang="en">
+<head>
+<title>AWS SDK for PHP: Environment Compatibility Test</title>
+<meta name="ROBOTS" content="NOINDEX, NOFOLLOW, NOARCHIVE" />
+
+<script type="text/javascript" charset="utf-8">
+/*!
+  * Reqwest! A x-browser general purpose XHR connection manager
+  * copyright Dustin Diaz 2011
+  * https://github.com/ded/reqwest
+  * license MIT
+  */
+!function(window){function serial(a){var b=a.name;if(a.disabled||!b)return"";b=enc(b);switch(a.tagName.toLowerCase()){case"input":switch(a.type){case"reset":case"button":case"image":case"file":return"";case"checkbox":case"radio":return a.checked?b+"="+(a.value?enc(a.value):!0)+"&":"";default:return b+"="+(a.value?enc(a.value):"")+"&"}break;case"textarea":return b+"="+enc(a.value)+"&";case"select":return b+"="+enc(a.options[a.selectedIndex].value)+"&"}return""}function enc(a){return encodeURIComponent(a)}function reqwest(a,b){return new Reqwest(a,b)}function init(o,fn){function error(a){o.error&&o.error(a),complete(a)}function success(resp){o.timeout&&clearTimeout(self.timeout)&&(self.timeout=null);var r=resp.responseText;if(r)switch(type){case"json":resp=window.JSON?window.JSON.parse(r):eval("("+r+")");break;case"js":resp=eval(r);break;case"html":resp=r}fn(resp),o.success&&o.success(resp),complete(resp)}function complete(a){o.complete&&o.complete(a)}this.url=typeof o=="string"?o:o.url,this.timeout=null;var type=o.type||setType(this.url),self=this;fn=fn||function(){},o.timeout&&(this.timeout=setTimeout(function(){self.abort(),error()},o.timeout)),this.request=getRequest(o,success,error)}function setType(a){return/\.json$/.test(a)?"json":/\.jsonp$/.test(a)?"jsonp":/\.js$/.test(a)?"js":/\.html?$/.test(a)?"html":/\.xml$/.test(a)?"xml":"js"}function Reqwest(a,b){this.o=a,this.fn=b,init.apply(this,arguments)}function getRequest(a,b,c){if(a.type!="jsonp"){var f=xhr();f.open(a.method||"GET",typeof a=="string"?a:a.url,!0),setHeaders(f,a),f.onreadystatechange=readyState(f,b,c),a.before&&a.before(f),f.send(a.data||null);return f}var d=doc.createElement("script");window[getCallbackName(a)]=generalCallback,d.type="text/javascript",d.src=a.url,d.async=!0;var e=function(){a.success&&a.success(lastValue),lastValue=undefined,head.removeChild(d)};d.onload=e,d.onreadystatechange=function(){/^loaded|complete$/.test(d.readyState)&&e()},head.appendChild(d)}function generalCallback(a){lastValue=a}function getCallbackName(a){var b=a.jsonpCallback||"callback";if(a.url.slice(-(b.length+2))==b+"=?"){var c="reqwest_"+uniqid++;a.url=a.url.substr(0,a.url.length-1)+c;return c}var d=new RegExp(b+"=([\\w]+)");return a.url.match(d)[1]}function setHeaders(a,b){var c=b.headers||{};c.Accept=c.Accept||"text/javascript, text/html, application/xml, text/xml, */*",b.crossOrigin||(c["X-Requested-With"]=c["X-Requested-With"]||"XMLHttpRequest");if(b.data){c["Content-type"]=c["Content-type"]||"application/x-www-form-urlencoded";for(var d in c)c.hasOwnProperty(d)&&a.setRequestHeader(d,c[d],!1)}}function readyState(a,b,c){return function(){a&&a.readyState==4&&(twoHundo.test(a.status)?b(a):c(a))}}var v=window.v;!v&&typeof require!="undefined"&&(v=require("valentine"));var twoHundo=/^20\d$/,doc=document,byTag="getElementsByTagName",head=doc[byTag]("head")[0],xhr="XMLHttpRequest"in window?function(){return new XMLHttpRequest}:function(){return new ActiveXObject("Microsoft.XMLHTTP")},uniqid=0,lastValue;Reqwest.prototype={abort:function(){this.request.abort()},retry:function(){init.call(this,this.o,this.fn)}},reqwest.serialize=function(a){var b=a[byTag]("input"),c=a[byTag]("select"),d=a[byTag]("textarea");return(v(b).chain().toArray().map(serial).value().join("")+v(c).chain().toArray().map(serial).value().join("")+v(d).chain().toArray().map(serial).value().join("")).replace(/&$/,"")},reqwest.serializeArray=function(a){for(var b=this.serialize(a).split("&"),c=0,d=b.length,e=[],f;c<d;c++)b[c]&&(f=b[c].split("="))&&e.push({name:f[0],value:f[1]});return e};var old=window.reqwest;reqwest.noConflict=function(){window.reqwest=old;return this},window.reqwest=reqwest}(this)
+</script>
+
+<style type="text/css">
+body {
+	font:14px/1.4em "Helvetica Neue", Helvetica, "Lucida Grande", Roboto, "Droid Sans", Ubuntu, Verdana, Arial, Clean, Sans, sans-serif;
+	letter-spacing:0px;
+	color:#333;
+	margin:0;
+	padding:0;
+	background:#fff url(<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>?background) repeat-x top left;
+}
+
+div#site {
+	width:650px;
+	margin:20px auto 0 auto;
+}
+
+a {
+	color: #326EA1;
+	text-decoration: underline;
+	padding: 1px 2px;
+	-webkit-transition: background-color 0.15s;
+	-webkit-transition: color 0.15s;
+	-moz-transition: background-color 0.15s;
+	-moz-transition: color 0.15s;
+	transition: background-color 0.15s;
+	transition: color 0.15s;
+	-webkit-border-radius: 2px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+}
+
+a:hover, a.hover {
+	color: #fff;
+	background-color: #333;
+	text-decoration: none;
+	padding: 1px 2px;
+}
+
+p {
+	margin:0;
+	padding:5px 0;
+}
+
+em {
+	font-style:normal;
+	background-color:#ffc;
+}
+
+ul, ol {
+	margin:10px 0 10px 20px;
+	padding:0 0 0 15px;
+}
+
+ul li, ol li {
+	margin:0 0 4px 0;
+	padding:0 0 0 3px;
+}
+
+h2 {
+	font-size:18px;
+	padding:0;
+	margin:0 0 10px 0;
+}
+
+h3 {
+	font-size:16px;
+	padding:0;
+	margin:20px 0 5px 0;
+}
+
+h4 {
+	font-size:14px;
+	padding:0;
+	margin:15px 0 5px 0;
+}
+
+pre, code {
+    font-family: "Panic Sans", "Bitstream Vera Sans Mono", Monaco, Consolas, "Andale Mono", monospace;
+	background-color: #F0F0F0;
+	border-radius: 3px 3px 3px 3px;
+	padding: 0 3px;
+	font-size: 1em;
+}
+
+em strong {
+    text-transform: uppercase;
+}
+
+table.chart {
+	border-collapse:collapse;
+}
+
+table.chart th {
+	background-color:#eee;
+	padding:2px 3px;
+	border:1px solid #fff;
+}
+
+table.chart td {
+	text-align:center;
+	padding:2px 3px;
+	border:1px solid #eee;
+}
+
+table.chart tr.enabled td {
+	/* Leave this alone */
+}
+
+table.chart tr.disabled td,
+table.chart tr.disabled td a {
+	color:#999;
+	font-style:italic;
+}
+
+table.chart tr.disabled td a {
+	text-decoration:underline;
+}
+
+div.chunk {
+	margin:0;
+	padding:10px;
+	border-bottom:1px solid #ccc;
+}
+
+div.important {
+	background-color:#ffc;
+}
+
+div.ok {
+	background-color:#cfc;
+}
+
+div.error {
+	background-color:#fcc;
+}
+
+div.important h3 {
+	margin: 7px 0 5px 0;
+}
+
+.footnote,
+.footnote a {
+	font:12px/1.4em "Helvetica Neue", Helvetica, "Lucida Grande", Verdana, Arial, Clean, Sans, sans-serif;
+	color:#aaa;
+}
+
+.footnote em {
+	background-color:transparent;
+	font-style:italic;
+}
+</style>
+
+</head>
+
+<body>
+
+<div id="site">
+	<div id="content">
+
+		<div class="chunk">
+			<h2 style="text-align:center;"><img src="<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>?logopng" alt="SDK Compatibility Test" title="SDK Compatibility Test" /></h2>
+
+			<h3>Minimum Requirements</h3>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%" class="chart">
+				<thead>
+					<tr>
+						<th>Test</th>
+						<th>Should Be</th>
+						<th>What You Have</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr class="<?php echo ($php_ok) ? 'enabled' : 'disabled'; ?>">
+						<td>PHP</td>
+						<td>5.2 or newer</td>
+						<td><?php echo phpversion(); ?></td>
+					</tr>
+					<tr class="<?php echo ($curl_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/curl">cURL</a></td>
+						<td>7.15.0 or newer, with SSL</td>
+						<td><?php echo ($curl_ok) ? ($curl_version['version'] . ' (' . $curl_version['ssl_version'] . ')') : ($curl_version['version'] . (in_array('https', $curl_version['protocols'], true) ? ' (with ' . $curl_version['ssl_version'] . ')' : ' (without SSL)')); ?></td>
+					</tr>
+					<tr class="<?php echo ($simplexml_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/simplexml">SimpleXML</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($simplexml_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($dom_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/dom">DOM</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($dom_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($spl_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/spl">SPL</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($spl_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($json_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/json">JSON</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($json_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($pcre_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/pcre">PCRE</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($pcre_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($file_ok) ? 'enabled' : 'disabled'; ?>">
+						<td>File System <a href="http://php.net/file_get_contents">Read</a>/<a href="http://php.net/file_put_contents">Write</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($file_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+				</tbody>
+			</table>
+
+			<h3>Optional Extensions</h3>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%" class="chart">
+				<thead>
+					<tr>
+						<th>Test</th>
+						<th>Would Like To Be</th>
+						<th>What You Have</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr class="<?php echo ($openssl_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/openssl">OpenSSL</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($openssl_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($zlib_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/zlib">Zlib</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($zlib_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($apc_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/apc">APC</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($apc_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($xcache_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://xcache.lighttpd.net">XCache</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($xcache_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($memcache_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/memcache">Memcache</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($memcache_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($memcached_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/memcached">Memcached</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($memcached_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($pdo_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/pdo">PDO</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($pdo_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($pdo_sqlite_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/pdo-sqlite">PDO-SQLite</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($pdo_sqlite_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($sqlite2_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/sqlite">SQLite 2</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($sqlite2_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+					<tr class="<?php echo ($sqlite3_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/sqlite3">SQLite 3</a></td>
+						<td>Enabled</td>
+						<td><?php echo ($sqlite3_ok) ? 'Enabled' : 'Disabled'; ?></td>
+					</tr>
+				</tbody>
+			</table>
+
+			<h3>Settings for php.ini</h3>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%" class="chart">
+				<thead>
+					<tr>
+						<th>Test</th>
+						<th>Would Like To Be</th>
+						<th>What You Have</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr class="<?php echo (!$ini_open_basedir) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/open_basedir">open_basedir</a></td>
+						<td>off</td>
+						<td><?php echo ($ini_open_basedir) ? 'on' : 'off'; ?></td>
+					</tr>
+					<tr class="<?php echo (!$ini_safe_mode) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/safe_mode">safe_mode</a></td>
+						<td>off</td>
+						<td><?php echo ($ini_safe_mode) ? 'on' : 'off'; ?></td>
+					</tr>
+					<tr class="<?php echo ($ini_zend_enable_gc) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/zend.enable_gc">zend.enable_gc</a></td>
+						<td>on</td>
+						<td><?php echo ($ini_zend_enable_gc) ? 'on' : 'off'; ?></td>
+					</tr>
+				</tbody>
+			</table>
+
+			<h3>Other</h3>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%" class="chart">
+				<thead>
+					<tr>
+						<th>Test</th>
+						<th>Would Like To Be</th>
+						<th>What You Have</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr class="<?php echo ($int64_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="https://aws.amazon.com/amis/4158">Architecture</a></td>
+						<td>64-bit</td>
+						<td><?php echo ($int64_ok) ? '64-bit' : '32-bit'; ?><?php if (is_windows()): ?>
+						(<a href="#win64">why?</a>)
+						<?php endif; ?></td>
+					</tr>
+				</tbody>
+			</table>
+
+			<br>
+		</div>
+
+		<?php if ($compatiblity == REQUIREMENTS_ALL_MET): ?>
+		<div class="chunk important ok">
+			<h3>Bottom Line: Yes, you can!</h3>
+			<p>Your PHP environment is ready to go, and can take advantage of all possible features!</p>
+		</div>
+		<div class="chunk">
+			<h3>What's Next?</h3>
+			<p>You can download the latest version of the <a href="http://aws.amazon.com/sdkforphp"><strong>AWS SDK for PHP</strong></a> and install it by <a href="http://aws.amazon.com/articles/4261">following the instructions</a>. Also, check out our library of <a href="http://aws.amazon.com/articles/4262">screencasts and tutorials</a>.</p>
+			<p>Take the time to read <a href="http://aws.amazon.com/articles/4261">"Getting Started"</a> to make sure you're prepared to use the AWS SDK for PHP. No seriously, read it.</p>
+		</div>
+		<?php elseif ($compatiblity == REQUIREMENTS_MIN_MET): ?>
+		<div class="chunk important ok">
+			<h3>Bottom Line: Yes, you can!</h3>
+			<p>Your PHP environment is ready to go! <i>There are a couple of minor features that you won't be able to take advantage of, but nothing that's a show-stopper.</i></p>
+		</div>
+		<div class="chunk">
+			<h3>What's Next?</h3>
+			<p>You can download the latest version of the <a href="http://aws.amazon.com/sdkforphp"><strong>AWS SDK for PHP</strong></a> and install it by <a href="http://aws.amazon.com/articles/4261">following the instructions</a>. Also, check out our library of <a href="http://aws.amazon.com/articles/4262">screencasts and tutorials</a>.</p>
+			<p>Take the time to read <a href="http://aws.amazon.com/articles/4261">"Getting Started"</a> to make sure you're prepared to use the AWS SDK for PHP. No seriously, read it.</p>
+		</div>
+		<?php else: ?>
+		<div class="chunk important error">
+			<h3>Bottom Line: We're sorry&hellip;</h3>
+			<p>Your PHP environment does not support the minimum requirements for the <strong>AWS SDK for PHP</strong>.</p>
+		</div>
+		<div class="chunk">
+			<h3>What's Next?</h3>
+			<p>If you're using a shared hosting plan, it may be a good idea to contact your web host and ask them to install a more recent version of PHP and relevant extensions.</p>
+			<p>If you have control over your PHP environment, we recommended that you upgrade your PHP environment. Check out the "Set Up Your Environment" section of the <a href="http://aws.amazon.com/articles/4261">Getting Started Guide</a> for more information.</p>
+		</div>
+		<?php endif; ?>
+
+		<?php if ($compatiblity >= REQUIREMENTS_MIN_MET): ?>
+		<div class="chunk">
+			<h3>Recommended settings for config.inc.php</h3>
+			<p>Based on your particular server configuration, the following settings are recommended.</p>
+			<br>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%" class="chart">
+				<thead>
+					<tr>
+						<th>Configuration Setting</th>
+						<th>Recommended Value</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>default_cache_config</code></td>
+						<?php if ($apc_ok): ?>
+						<td><code>apc</code></td>
+						<?php elseif ($xcache_ok): ?>
+						<td><code>xcache</code></td>
+						<?php elseif ($file_ok): ?>
+						<td>Any valid, server-writable file system path</td>
+						<?php endif; ?>
+					</tr>
+					<tr>
+						<td><code>certificate_authority</code></td>
+						<?php if (is_windows()): ?>
+						<td id="ssl_check"><code>true</code></td>
+						<?php else: ?>
+						<td id="ssl_check"><img src="<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>?loader" alt="Loading..."></td>
+						<?php endif; ?>
+					</tr>
+				</tbody>
+			</table>
+			<br>
+		</div>
+		<?php endif; ?>
+
+		<div class="chunk">
+			<h3>Give me the details!</h3>
+			<?php if ($compatiblity >= REQUIREMENTS_MIN_MET): ?>
+			<ol>
+				<li><em>Your environment meets the minimum requirements for using the <strong>AWS SDK for PHP</strong>!</em></li>
+
+				<?php if (version_compare(PHP_VERSION, '5.3.0') < 0): ?>
+				<li>You're still running <strong>PHP <?php echo PHP_VERSION; ?></strong>. The PHP 5.2 family is no longer supported by the PHP team, and future versions of the AWS SDK for PHP will <i>require</i> PHP 5.3 or newer.</li>
+				<?php endif; ?>
+
+				<?php if ($openssl_ok): ?>
+				<li>The <a href="http://php.net/openssl">OpenSSL</a> extension is installed. This will allow you to use <a href="http://docs.amazonwebservices.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html">CloudFront Private URLs</a> and decrypt Microsoft&reg; Windows&reg; instance passwords.</li>
+				<?php endif; ?>
+
+				<?php if ($zlib_ok): ?>
+				<li>The <a href="http://php.net/zlib">Zlib</a> extension is installed. The SDK will request gzipped data whenever possible.</li>
+				<?php endif; ?>
+
+				<?php if (!$int64_ok): ?>
+				<li>You're running on a <strong>32-bit</strong> system. This means that PHP does not correctly handle files larger than 2GB (this is a <a href="http://www.google.com/search?q=php+2gb+32-bit">well-known PHP issue</a>). For more information, please see: <a href="http://docs.php.net/manual/en/function.filesize.php#refsect1-function.filesize-returnvalues">PHP filesize: Return values</a>.</li>
+				<?php if (is_windows()): ?>
+				<li id="win64"><em>Note that PHP on Microsoft® Windows® <a href="http://j.mp/php64win">does not support 64-bit integers at all</a>, even if both the hardware and PHP are 64-bit.</em></li>
+				<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($ini_open_basedir || $ini_safe_mode): ?>
+				<li>You have <a href="http://php.net/open_basedir">open_basedir</a> or <a href="http://php.net/safe_mode">safe_mode</a> enabled in your <code>php.ini</code> file. Sometimes PHP behaves strangely when these settings are enabled. Disable them if you can.</li>
+				<?php endif; ?>
+
+				<?php if (!$ini_zend_enable_gc): ?>
+				<li>The PHP garbage collector (available in PHP 5.3+) is not enabled in your <code>php.ini</code> file. Enabling <a href="http://php.net/zend.enable_gc">zend.enable_gc</a> will provide better memory management in the PHP core.</li>
+				<?php endif; ?>
+
+				<?php
+				$storage_types = array();
+				if ($file_ok) { $storage_types[] = '<a href="http://php.net/file_put_contents">The file system</a>'; }
+				if ($apc_ok) { $storage_types[] = '<a href="http://php.net/apc">APC</a>'; }
+				if ($xcache_ok) { $storage_types[] = '<a href="http://xcache.lighttpd.net">XCache</a>'; }
+				if ($sqlite_ok && $sqlite3_ok) { $storage_types[] = '<a href="http://php.net/sqlite3">SQLite 3</a>'; }
+				elseif ($sqlite_ok && $sqlite2_ok) { $storage_types[] = '<a href="http://php.net/sqlite">SQLite 2</a>'; }
+				if ($memcached_ok) { $storage_types[] = '<a href="http://php.net/memcached">Memcached</a>'; }
+				elseif ($memcache_ok) { $storage_types[] = '<a href="http://php.net/memcache">Memcache</a>'; }
+				?>
+				<li>Storage types available for response caching: <?php echo implode(', ', $storage_types); ?></li>
+			</ol>
+
+				<?php if (!$openssl_ok && !$zlib_ok): ?>
+				<p class="footnote"><strong>NOTE:</strong> You're missing the <a href="http://php.net/openssl">OpenSSL</a> extension, which means that you won't be able to take advantage of <a href="http://docs.amazonwebservices.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html">CloudFront Private URLs</a> or decrypt Microsoft&reg; Windows&reg; instance passwords. You're also missing the <a href="http://php.net/zlib">Zlib</a> extension, which means that the SDK will be unable to request gzipped data from Amazon and you won't be able to take advantage of compression with the <i>response caching</i> feature.</p>
+				<?php elseif (!$zlib_ok): ?>
+				<p class="footnote"><strong>NOTE:</strong> You're missing the <a href="http://php.net/zlib">Zlib</a> extension, which means that the SDK will be unable to request gzipped data from Amazon and you won't be able to take advantage of compression with the <i>response caching</i> feature.</p>
+				<?php elseif (!$openssl_ok): ?>
+				<p class="footnote"><strong>NOTE:</strong> You're missing the <a href="http://php.net/openssl">OpenSSL</a> extension, which means that you won't be able to take advantage of <a href="http://docs.amazonwebservices.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html">CloudFront Private URLs</a> or decrypt Microsoft&reg; Windows&reg; instance passwords.</p>
+				<?php endif; ?>
+
+			<?php else: ?>
+			<ol>
+				<?php if (!$php_ok): ?>
+					<li><strong>PHP:</strong> You are running an unsupported version of PHP.</li>
+				<?php endif; ?>
+
+				<?php if (!$curl_ok): ?>
+					<li><strong>cURL:</strong> The <a href="http://php.net/curl">cURL</a> extension is not available. Without cURL, the SDK cannot connect to &mdash; or authenticate with &mdash; Amazon's services.</li>
+				<?php endif; ?>
+
+				<?php if (!$simplexml_ok): ?>
+					<li><strong>SimpleXML:</strong> The <a href="http://php.net/simplexml">SimpleXML</a> extension is not available. Without SimpleXML, the SDK cannot parse the XML responses from Amazon's services.</li>
+				<?php endif; ?>
+
+				<?php if (!$dom_ok): ?>
+					<li><strong>DOM:</strong> The <a href="http://php.net/dom">DOM</a> extension is not available. Without DOM, the SDK cannot transliterate JSON responses from Amazon's services into the common SimpleXML-based pattern used throughout the SDK.</li>
+				<?php endif; ?>
+
+				<?php if (!$spl_ok): ?>
+					<li><strong>SPL:</strong> <a href="http://php.net/spl">Standard PHP Library</a> support is not available. Without SPL support, the SDK cannot autoload the required PHP classes.</li>
+				<?php endif; ?>
+
+				<?php if (!$json_ok): ?>
+					<li><strong>JSON:</strong> <a href="http://php.net/json">JSON</a> support is not available. AWS leverages JSON heavily in many of its services.</li>
+				<?php endif; ?>
+
+				<?php if (!$pcre_ok): ?>
+					<li><strong>PCRE:</strong> Your PHP installation doesn't support Perl-Compatible Regular Expressions (PCRE). Without PCRE, the SDK cannot do any filtering via regular expressions.</li>
+				<?php endif; ?>
+
+				<?php if (!$file_ok): ?>
+					<li><strong>File System Read/Write:</strong> The <a href="http://php.net/file_get_contents">file_get_contents()</a> and/or <a href="http://php.net/file_put_contents">file_put_contents()</a> functions have been disabled. Without them, the SDK cannot read from, or write to, the file system.</li>
+				<?php endif; ?>
+			</ol>
+			<?php endif; ?>
+		</div>
+
+		<div class="chunk">
+			<p class="footnote"><strong>NOTE</strong>: Passing this test does not guarantee that the AWS SDK for PHP will run on your web server &mdash; it only ensures that the requirements have been addressed.</p>
+		</div>
+	</div>
+
+</div>
+
+<?php if (!is_windows()): ?>
+<script type="text/javascript" charset="utf-8">
+reqwest('<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>?ssl_check', function(resp) {
+	$sslCheck = document.getElementById('ssl_check');
+	$sslCheck.innerHTML = '';
+	$sslCheck.innerHTML = '<code>' + resp + '</code>';
+});
+</script>
+<?php endif; ?>
+
+</body>
+</html>
diff --git a/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php b/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php
new file mode 100755
index 0000000000..a6632d8978
--- /dev/null
+++ b/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php
@@ -0,0 +1,186 @@
+#! /usr/bin/env php
+<?php
+
+//Prevent script from being called via browser
+if (PHP_SAPI !== 'cli')
+{
+	die('ERROR: You may only run the compatibility test from the command line.');
+}
+
+// Include the compatibility test logic
+require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'sdk_compatibility.inc.php';
+
+// CLI display
+function success($s = 'Yes')
+{
+	return is_windows() ? $s : "\033[1;37m\033[42m " . $s . " \033[0m";
+}
+
+function info($s = 'Info')
+{
+	return is_windows() ? $s : "\033[1;37m\033[44m " . $s . " \033[0m";
+}
+
+function failure($s = 'No ')
+{
+	return is_windows() ? $s : "\033[1;37m\033[41m " . $s . " \033[0m";
+}
+
+/////////////////////////////////////////////////////////////////////////
+
+echo PHP_EOL;
+
+echo info('AWS SDK for PHP') . PHP_EOL;
+echo 'PHP Environment Compatibility Test (CLI)' . PHP_EOL;
+echo '----------------------------------------' . PHP_EOL;
+echo PHP_EOL;
+
+echo 'PHP 5.2 or newer............ ' . ($php_ok ? (success() . ' ' . phpversion()) : failure()) . PHP_EOL;
+echo '64-bit architecture......... ' . ($int64_ok ? success() : failure()) . (is_windows() ? ' (see note below)' : '') . PHP_EOL;
+echo 'cURL with SSL............... ' . ($curl_ok ? (success() . ' ' . $curl_version['version'] . ' (' . $curl_version['ssl_version'] . ')') : failure($curl_version['version'] . (in_array('https', $curl_version['protocols'], true) ? ' (with ' . $curl_version['ssl_version'] . ')' : ' (without SSL)'))) . PHP_EOL;
+echo 'Standard PHP Library........ ' . ($spl_ok ? success() : failure()) . PHP_EOL;
+echo 'SimpleXML................... ' . ($simplexml_ok ? success() : failure()) . PHP_EOL;
+echo 'DOM......................... ' . ($dom_ok ? success() : failure()) . PHP_EOL;
+echo 'JSON........................ ' . ($json_ok ? success() : failure()) . PHP_EOL;
+echo 'PCRE........................ ' . ($pcre_ok ? success() : failure()) . PHP_EOL;
+echo 'File system read/write...... ' . ($file_ok ? success() : failure()) . PHP_EOL;
+echo 'OpenSSL extension........... ' . ($openssl_ok ? success() : failure()) . PHP_EOL;
+echo 'Zlib........................ ' . ($zlib_ok ? success() : failure()) . PHP_EOL;
+echo 'APC......................... ' . ($apc_ok ? success() : failure()) . PHP_EOL;
+echo 'XCache...................... ' . ($xcache_ok ? success() : failure()) . PHP_EOL;
+echo 'Memcache.................... ' . ($memcache_ok ? success() : failure()) . PHP_EOL;
+echo 'Memcached................... ' . ($memcached_ok ? success() : failure()) . PHP_EOL;
+echo 'PDO......................... ' . ($pdo_ok ? success() : failure()) . PHP_EOL;
+echo 'SQLite 2.................... ' . ($sqlite2_ok ? success() : failure()) . PHP_EOL;
+echo 'SQLite 3.................... ' . ($sqlite3_ok ? success() : failure()) . PHP_EOL;
+echo 'PDO-SQLite driver........... ' . ($pdo_sqlite_ok ? success() : failure()) . PHP_EOL;
+echo 'open_basedir disabled....... ' . (!$ini_open_basedir ? success() : failure()) . PHP_EOL;
+echo 'safe_mode disabled.......... ' . (!$ini_safe_mode ? success() : failure()) . PHP_EOL;
+echo 'Garbage Collector enabled... ' . ($ini_zend_enable_gc ? success() : failure()) . PHP_EOL;
+
+// Test SSL cert
+if (!is_windows())
+{
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, 'https://email.us-east-1.amazonaws.com');
+	curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+	curl_setopt($ch, CURLOPT_HEADER, false);
+	curl_setopt($ch, CURLOPT_NOBODY, true);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, false);
+	curl_setopt($ch, CURLOPT_TIMEOUT, 5184000);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 120);
+	curl_setopt($ch, CURLOPT_NOSIGNAL, true);
+	curl_setopt($ch, CURLOPT_USERAGENT, 'aws-sdk-php/compat-cli');
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+	curl_setopt($ch, CURLOPT_VERBOSE, false);
+	curl_exec($ch);
+	$ssl_result = !(curl_getinfo($ch, CURLINFO_SSL_VERIFYRESULT) === 0);
+	curl_close($ch);
+
+	echo 'Valid SSL certificate....... ' . ($ssl_result ? failure() : success()) . PHP_EOL;
+}
+else
+{
+	$ssl_result = false;
+	echo 'Valid SSL certificate....... ' . failure() . ' (will use the bundled certificate instead)' . PHP_EOL;
+}
+
+echo PHP_EOL;
+
+echo '----------------------------------------' . PHP_EOL;
+echo PHP_EOL;
+
+if ($compatiblity >= REQUIREMENTS_MIN_MET)
+{
+	echo success('Your environment meets the minimum requirements for using the AWS SDK for PHP!') . PHP_EOL . PHP_EOL;
+	if (version_compare(PHP_VERSION, '5.3.0') < 0) { echo '* You\'re still running PHP ' . PHP_VERSION . '. The PHP 5.2 family is no longer supported' . PHP_EOL . '  by the PHP team, and future versions of the AWS SDK for PHP will *require*' . PHP_EOL . '  PHP 5.3 or newer.' . PHP_EOL . PHP_EOL; }
+	if ($openssl_ok) { echo '* The OpenSSL extension is installed. This will allow you to use CloudFront' . PHP_EOL . '  Private URLs and decrypt Windows instance passwords.' . PHP_EOL . PHP_EOL; }
+	if ($zlib_ok) {    echo '* The Zlib extension is installed. The SDK will request gzipped data' . PHP_EOL . '  whenever possible.' . PHP_EOL . PHP_EOL; }
+	if (!$int64_ok) {  echo '* You\'re running on a 32-bit system. This means that PHP does not correctly' . PHP_EOL . '  handle files larger than 2GB (this is a well-known PHP issue).' . PHP_EOL . PHP_EOL; }
+	if (!$int64_ok && is_windows()) {  echo '* Note that PHP on Microsoft(R) Windows(R) does not support 64-bit integers' . PHP_EOL . '  at all, even if both the hardware and PHP are 64-bit. http://j.mp/php64win' . PHP_EOL . PHP_EOL; }
+
+	if ($ini_open_basedir || $ini_safe_mode) { echo '* You have open_basedir or safe_mode enabled in your php.ini file. Sometimes' . PHP_EOL . '  PHP behaves strangely when these settings are enabled. Disable them if you can.' . PHP_EOL . PHP_EOL; }
+	if (!$ini_zend_enable_gc) { echo '* The PHP garbage collector (available in PHP 5.3+) is not enabled in your' . PHP_EOL . '  php.ini file. Enabling zend.enable_gc will provide better memory management' . PHP_EOL . '  in the PHP core.' . PHP_EOL . PHP_EOL; }
+
+	$storage_types = array();
+	if ($file_ok) { $storage_types[] = 'The file system'; }
+	if ($apc_ok) { $storage_types[] = 'APC'; }
+	if ($xcache_ok) { $storage_types[] = 'XCache'; }
+	if ($sqlite_ok && $sqlite3_ok) { $storage_types[] = 'SQLite 3'; }
+	elseif ($sqlite_ok && $sqlite2_ok) { $storage_types[] = 'SQLite 2'; }
+	if ($memcached_ok) { $storage_types[] = 'Memcached'; }
+	elseif ($memcache_ok) { $storage_types[] = 'Memcache'; }
+	echo '* Storage types available for response caching:' . PHP_EOL . '  ' . implode(', ', $storage_types) . PHP_EOL . PHP_EOL;
+
+	if (!$openssl_ok) { echo '* You\'re missing the OpenSSL extension, which means that you won\'t be able' . PHP_EOL . '  to take advantage of CloudFront Private URLs or Windows password decryption.' . PHP_EOL . PHP_EOL; }
+	if (!$zlib_ok) {    echo '* You\'re missing the Zlib extension, which means that the SDK will be unable' . PHP_EOL . '  to request gzipped data from Amazon and you won\'t be able to take advantage' . PHP_EOL . '  of compression with the response caching feature.' . PHP_EOL . PHP_EOL; }
+}
+else
+{
+	if (!$php_ok) {       echo '* ' . failure('PHP:') . ' You are running an unsupported version of PHP.' . PHP_EOL . PHP_EOL; }
+	if (!$curl_ok) {      echo '* ' . failure('cURL:') . ' The cURL extension is not available. Without cURL, the SDK cannot' . PHP_EOL . '  connect to -- or authenticate with -- Amazon\'s services.' . PHP_EOL . PHP_EOL; }
+	if (!$simplexml_ok) { echo '* ' . failure('SimpleXML:') . ': The SimpleXML extension is not available. Without SimpleXML,' . PHP_EOL . '  the SDK cannot parse the XML responses from Amazon\'s services.' . PHP_EOL . PHP_EOL; }
+	if (!$dom_ok) {       echo '* ' . failure('DOM:') . ': The DOM extension is not available. Without DOM, the SDK' . PHP_EOL . '  Without DOM, the SDK cannot transliterate JSON responses from Amazon\'s' . PHP_EOL . '  services into the common SimpleXML-based pattern used throughout the SDK.' . PHP_EOL . PHP_EOL; }
+	if (!$spl_ok) {       echo '* ' . failure('SPL:') . ' Standard PHP Library support is not available. Without SPL support,' . PHP_EOL . '  the SDK cannot autoload the required PHP classes.' . PHP_EOL . PHP_EOL; }
+	if (!$json_ok) {      echo '* ' . failure('JSON:') . ' JSON support is not available. AWS leverages JSON heavily in many' . PHP_EOL . '  of its services.' . PHP_EOL . PHP_EOL; }
+	if (!$pcre_ok) {      echo '* ' . failure('PCRE:') . ' Your PHP installation doesn\'t support Perl-Compatible Regular' . PHP_EOL . '  Expressions (PCRE). Without PCRE, the SDK cannot do any filtering via' . PHP_EOL . '  regular expressions.' . PHP_EOL . PHP_EOL; }
+	if (!$file_ok) {      echo '* ' . failure('File System Read/Write:') . ' The file_get_contents() and/or file_put_contents()' . PHP_EOL . '  functions have been disabled. Without them, the SDK cannot read from,' . PHP_EOL . '  or write to, the file system.' . PHP_EOL . PHP_EOL; }
+}
+
+echo '----------------------------------------' . PHP_EOL;
+echo PHP_EOL;
+
+if ($compatiblity === REQUIREMENTS_ALL_MET)
+{
+	echo success('Bottom Line: Yes, you can!') . PHP_EOL;
+	echo PHP_EOL;
+	echo 'Your PHP environment is ready to go, and can take advantage of all possible features!' . PHP_EOL;
+
+	echo PHP_EOL;
+	echo info('Recommended settings for config.inc.php') . PHP_EOL;
+	echo PHP_EOL;
+
+	echo "CFCredentials::set(array(" . PHP_EOL;
+	echo "    '@default' => array(" . PHP_EOL;
+	echo "        'key' => 'aws-key'," . PHP_EOL;
+	echo "        'secret' => 'aws-secret'," . PHP_EOL;
+	echo "        'default_cache_config' => ";
+	if ($apc_ok) echo success('\'apc\'');
+	elseif ($xcache_ok) echo success('\'xcache\'');
+	elseif ($file_ok) echo success('\'/path/to/cache/folder\'');
+	echo "," . PHP_EOL;
+	echo "        'certificate_authority' => " . success($ssl_result ? 'true' : 'false') . PHP_EOL;
+	echo "    )" . PHP_EOL;
+	echo "));" . PHP_EOL;
+}
+elseif ($compatiblity === REQUIREMENTS_MIN_MET)
+{
+	echo success('Bottom Line: Yes, you can!') . PHP_EOL;
+	echo PHP_EOL;
+	echo 'Your PHP environment is ready to go! There are a couple of minor features that' . PHP_EOL . 'you won\'t be able to take advantage of, but nothing that\'s a show-stopper.' . PHP_EOL;
+
+	echo PHP_EOL;
+	echo info('Recommended settings for config.inc.php') . PHP_EOL;
+	echo PHP_EOL;
+
+	echo "CFCredentials::set(array(" . PHP_EOL;
+	echo "    '@default' => array(" . PHP_EOL;
+	echo "        'key' => 'aws-key'," . PHP_EOL;
+	echo "        'secret' => 'aws-secret'," . PHP_EOL;
+	echo "        'default_cache_config' => ";
+	if ($apc_ok) echo success('\'apc\'');
+	elseif ($xcache_ok) echo success('\'xcache\'');
+	elseif ($file_ok) echo success('\'/path/to/cache/folder\'');
+	echo "," . PHP_EOL;
+	echo "        'certificate_authority' => " . ($ssl_result ? 'false' : 'true') . PHP_EOL;
+	echo "    )" . PHP_EOL;
+	echo "));" . PHP_EOL;
+}
+else
+{
+	echo failure('Bottom Line: We\'re sorry...') . PHP_EOL;
+	echo 'Your PHP environment does not support the minimum requirements for the ' . PHP_EOL . 'AWS SDK for PHP.' . PHP_EOL;
+}
+
+echo PHP_EOL;
diff --git a/3rdparty/aws-sdk/_docs/CHANGELOG.md b/3rdparty/aws-sdk/_docs/CHANGELOG.md
new file mode 100644
index 0000000000..52db66f4f6
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/CHANGELOG.md
@@ -0,0 +1,1405 @@
+# Changelog: 1.5.6.2 "Gershwin"
+Code name for Apple's never-released successor to the never-released Copeland. <http://en.wikipedia.org/wiki/Gershwin_operating_system>
+
+Launched Tuesday, May 29th, 2012.
+
+## Services
+### AmazonDynamoDB
+- **Fixed:** STS credentials were not always being cached correctly.
+
+----
+
+# Changelog: 1.5.6.1 "Gershwin"
+Code name for Apple's never-released successor to the never-released Copeland. <http://en.wikipedia.org/wiki/Gershwin_operating_system>
+
+Launched Tuesday, May 24th, 2012.
+
+## Services
+### AmazonDynamoDB
+- **Fixed:** STS credentials were not always being cached correctly.
+
+----
+
+# Changelog: 1.5.6 "Gershwin"
+Code name for Apple's never-released successor to the never-released Copeland. <http://en.wikipedia.org/wiki/Gershwin_operating_system>
+
+Launched Tuesday, May 15th, 2012.
+
+## Services
+### AmazonSES
+- **New:** Support for domain verification has been added to the SDK, which enables customers to verify an entire email domain.
+- **New:** Requests to this service are now signed with Signature V4.
+
+----
+
+# Changelog: 1.5.5 "Fishhead"
+Code name for the Apple II File Mangement Utility. <http://applemuseum.bott.org/sections/codenames.html>
+
+Launched Wednesday, May 9, 2012.
+
+## Services
+### AmazonCloudFormation
+* **New:** Requests to this service are now signed with Signature V4.
+
+### AmazonCloudFront
+* **New:** Updated the supported API version to `2012-03-15`.
+
+### AmazonDynamoDB
+* **New:** Support for the US West (Northern California), US West (Oregon), Asia Pacific "Southeast" (Signapore) endpoints have been added.
+
+### AmazonElasticBeanstalk
+* **New:** Support for the new Asia Pacific "Northeast" (Japan) endpoint has been added.
+
+### AmazonStorageGateway
+* **New:** Support for the AWS Storage Gateway service has been added to the SDK.
+
+---
+
+# Changelog: 1.5.4 "Enterprise"
+Code name for Mac OS X Server 1.0 (Rhapsody CR1). <http://en.wikipedia.org/wiki/Rhapsody_(operating_system)>
+
+Launched Thursday, April 19, 2012.
+
+## Bug fixes and enhancements
+* [PHP SDK Bug - Memory leak](https://forums.aws.amazon.com/thread.jspa?threadID=72310)
+* [Does update_object work in 1.5.3?](https://forums.aws.amazon.com/thread.jspa?threadID=89297)
+* [The value of CURLOPT_SSL_VERIFYHOST](https://forums.aws.amazon.com/thread.jspa?threadID=86186)
+* [PHP SDK BUG: s3.class.php Line 2396 on 1.5.2](https://forums.aws.amazon.com/thread.jspa?threadID=86779)
+* [first create_bucket(), then get_bucket_list()](https://forums.aws.amazon.com/thread.jspa?messageID=318885)
+* [Issue with AmazonS3::get_object_list() max-keys](https://forums.aws.amazon.com/thread.jspa?threadID=85878)
+* [Correct the "Bottom line" minimum requirements check](https://github.com/amazonwebservices/aws-sdk-for-php/pull/23)
+* [S3 PHP SDK: copy_object() fails to update the header](http://stackoverflow.com/questions/7677837/s3-php-sdk-copy-object-fails-to-update-the-header)
+* [Adds the following utility methods to simplexml.class.php](https://github.com/amazonwebservices/aws-sdk-for-php/pull/22)
+* [Adding the ability to name a 'rule' for Object Expiration (suggested tweak)](https://forums.aws.amazon.com/thread.jspa?messageID=328023)
+
+## Runtime
+* **New:** Support for Signature Version 4 has been added to the SDK. Signature Version 4 is now the default authentication method for AWS Identity and Access Management, AWS Security Token Service and Amazon CloudSearch.
+
+## Services
+### AmazonCloudFront
+* **New:** Support for a Minimum TTL of zero has been added to the SDK.
+
+### AmazonCloudSearch
+* **New:** Support for Amazon CloudSearch has been added to the SDK. This includes only the Configuration API.
+
+### AmazonDynamoDB
+* **New:** Support for BatchWriteItem API has been added to the SDK.
+* **New:** Support for the European (Ireland) endpoint has been added.
+* **New:** Support for the Asia Pacific "Northeast" (Tokyo) endpoint has been added.
+* **New:** Amazon DynamoDB Session Handler has been added to the SDK.
+* **New:** A simplified interface for adding attributes has been added to the SDK.
+
+### AmazonEC2
+* **New:** The new "m1.medium" instance type is now supported.
+* **New:** Amazon EBS support for Volume Status and Volume Attributes have been added to the SDK.
+* **New:** Amazon EBS support for Conversion Tasks has been added to the SDK.
+* **New:** Amazon EC2 support for the Report Instance Status feature has been added to the SDK.
+* **New:** Amazon VPC support for Network Interfaces has been added to the SDK.
+* **Fixed:** Various parameter fixes have been applied.
+
+### AmazonIAM
+* **New:** Support for Password Policies and the ability to change passwords has been added to the SDK.
+
+### AmazonS3
+* **New:** Support for pre-signed URLs using temporary credentials has been added to the SDK.
+* **New:** Support for setting a custom name to Lifecycle (i.e., Object Expiration) rules has been added to the SDK.
+* **New:** Support for pre-signed URLs with https has been added to the SDK.
+* **Fixed:** Resolved an issue where setting a custom XML parsing class was not being respected.
+* **Fixed:** Resolved an issue where the `get_object_list()` method would return an incorrect number of entries.
+* **Fixed:** Resolved an issue where `update_object()` was attempting to COPY instead of REPLACE.
+* **Fixed:** Resolved an issue stemming from using path-style URLs, `create_bucket()` + `list_bucket()` and the EU-West region.
+* **Fixed:** Resolved an issue where XML responses were not being parsed consistently.
+* **Fixed:** Resolved an issue where Private Streaming URLs contained a double-encoded signature.
+* **Fixed:** The `Expect: 100-continue` HTTP header is now only sent during `create_object()` and `upload_part()` requests.
+
+## Utilities
+### CFRuntime
+* **Fixed:** Resolved an issue where `CURLOPT_SSL_VERIFYHOST` was not set strictly enough.
+* **Fixed:** The `Expect: 100-continue` HTTP header is no longer set on every request.
+
+### CFSimpleXML
+* **New:** Support for `matches()`, `starts_with()` and `ends_with()` methods have been added to the SDK. (Thanks [Wil Moore III](https://github.com/wilmoore)!)
+
+## Compatibility Test
+* **New:** SDK Compatibility Test pages are marked up as to not be indexed by search engines. (Thanks [Eric Caron](http://www.ericcaron.com)!)
+* **Fixed:** Duplicate code between the CLI and web versions of the SDK has been refactored. (Thanks [Jimmy Berry](https://github.com/boombatower)!)
+
+---
+
+# Changelog: 1.5.3 "Darwin"
+UNIX foundation upon which Mac OS X, Apple TV, and iOS are based. <http://en.wikipedia.org/wiki/Darwin_operating_system>
+
+Launched Wednesday, Tuesday, February 21, 2012.
+
+## Bug fixes and enhancements
+* [Fixing Issue with set_distribution_config](https://github.com/amazonwebservices/aws-sdk-for-php/pull/20)
+
+## Services
+### AmazonCloudFront
+* **Fixed:** Resolved an issue where the `set_distribution_config()` method could fail to satisfy an API constraint when using a custom origin server. (Thanks [zoxa](https://github.com/zoxa)!)
+
+### AmazonSWF
+* **New:** Support for the new Amazon Simple Workflow Service has been added to the SDK.
+
+----
+
+# Changelog: 1.5.2 "Copland"
+Code name for Apple's never-released successor to System 7. <http://en.wikipedia.org/wiki/Copland_(operating_system)>
+
+Launched Wednesday, Febraury 1, 2012.
+
+## Bug fixes and enhancements
+* [SSL Cert on PHP SDK 1.5.0.1 ](https://forums.aws.amazon.com/thread.jspa?threadID=84947)
+* [Stream Wrapper need a buffer !](https://forums.aws.amazon.com/thread.jspa?threadID=85436)
+* [Fixing Issue with set_distribution_config](https://github.com/amazonwebservices/aws-sdk-for-php/pull/20)
+* [[Bug] SDK Autoloader Interferes with PHPExcel Autoloader](https://forums.aws.amazon.com/thread.jspa?threadID=85239)
+* [get_object query does not always return the same content type](https://forums.aws.amazon.com/thread.jspa?threadID=84148)
+* [AWSSDKforPHP/authentication/swift_transport_esmtp_signature_handler.class.p ](https://forums.aws.amazon.com/thread.jspa?threadID=85087)
+
+## Runtime
+* **New:** Updated the CA Root Certificates file to version 1.81.
+* **Fixed:** Resolved an issue in the autoloader where the matching logic was too aggressive in certain cases, causing subsequent autoloaders to never trigger.
+
+## Services
+### AmazonAS
+* **New:** Support for Auto Scaling Resource Tagging has been added to the SDK.
+
+### AmazonS3
+* **Fixed:** Resolved an issue where `delete_all_objects()` and `delete_all_object_versions()` was being limited to 1000 items.
+* **Fixed:** Resolved an issue where `delete_bucket()` would fail to delete a bucket with the "force" option enabled if the bucket contained more than 1000 items.
+* **Fixed:** Resolved an issue where JSON documents stored in Amazon S3 would be parsed into a native PHP object when retrieved.
+
+## Utilities
+### S3StreamWrapper
+* **New:** Support for multiple stream wrappers (e.g., one per region) has been added to the SDK.
+* **Fixed:** Writes to Amazon S3 are now buffered, resolving issues with pushing more than 8k of data at a time.
+
+### CFJSON
+* **Fixed:** The JSON-to-XML conversion code is now substantially more robust and better handles encoded characters.
+
+### CacheCore
+* **Changed:** Formerly, attempting to cache to a file system location that didn't exist or was not writable by the PHP process would fail silently. This behavior has been changed to throw a `CacheFile_Exception`.
+
+----
+
+# Changelog: 1.5.1 "Blue"
+Code name for Macintosh System 7. <http://en.wikipedia.org/wiki/System_7>
+
+Launched Wednesday, January 18, 2012.
+
+## Bug fixes and enhancements
+* [Documentation patch](https://github.com/amazonwebservices/aws-sdk-for-php/pull/13)
+* [Removed duplicate comment line.](https://github.com/amazonwebservices/aws-sdk-for-php/pull/17)
+* [CFRuntime credentials handling issue](https://forums.aws.amazon.com/thread.jspa?messageID=310388)
+* [PHP 5.2 bug in AWS SDK for PHP 1.5.x](https://forums.aws.amazon.com/thread.jspa?messageID=311543)
+* [[Bug] Custom Curl Opts Lost During Retry](https://forums.aws.amazon.com/thread.jspa?threadID=84835)
+* [json_last_error doesn't exist before php v 5.3.0](https://github.com/amazonwebservices/aws-sdk-for-php/pull/12)
+* [XML still being parsed when use_cache_flow is false](https://github.com/amazonwebservices/aws-sdk-for-php/pull/15)
+* [Bug ssl_verification option not respected for AmazonS3 ](https://forums.aws.amazon.com/thread.jspa?threadID=83710)
+* [[Bug] Compatibility test for Garbage Collector enabled should use ini_get](https://forums.aws.amazon.com/thread.jspa?threadID=84156)
+
+## Runtime
+* **Fixed:** Corrected an issue where calling `AmazonS3->get_object()` would continue to parse the content if caching was being leveraged. (Thanks [Eric Caron](http://www.ericcaron.com)!)
+* **Fixed:** The autoloader now returns `false` for any class it doesn't match, allowing subsequent autoloaders to catch the class name. (Thanks [Eric Caron](http://www.ericcaron.com)!)
+* **Fixed:** An issue that caused CloudWatch to fail to decompress gzipped data correctly has been resolved.
+* **Fixed:** Resolved an issue with passing explicit credentials without requiring a config file or a `CFCredentials` declaration.
+* **Fixed:** Resolved an issue which causes custom cURL options to be unset from the payload when retrying.
+
+## Services
+### AmazonAS
+* **New:** Support for Amazon SNS notifications and Tagging have been added to the SDK.
+
+### AmazonCloudFront
+* **Fixed:** Resolved an issue with disabling SSL verification.
+* **Fixed:** Resolved an issue where `AmazonCloudFront` were throwing warnings in `E_STRICT` mode.
+
+### AmazonCloudWatch
+* **Fixed:** Resolved an issue with decompressing gzipped data.
+
+### AmazonDynamoDB
+* **New:** Support for Amazon DynamoDB has been added to the SDK.
+* **New:** Amazon DynamoDB requires a default cache configuration to be set in the credential set, otherwise it will not function properly.
+
+### AmazonS3
+* **Fixed:** Resolved an issue with disabling SSL verification.
+* **Fixed:** Resolved multiple documentation issues. (Thanks [Aizat Faiz](http://aizatto.com) and [Jason Ardell](http://ardell.posterous.com/)!)
+* **Fixed:** Resolved an issue where `AmazonS3` were throwing warnings in `E_STRICT` mode.
+
+### AmazonSNS
+* **New:** Support for Short Messaging Service (SMS) endpoints has been added to the SDK.
+* **New:** Support for Subscription Attributes has been added to the SDK.
+
+## Utilities
+### CFJSON
+* **Fixed:** Support for the handling of JSON nulls in PHP 5.2 has been improved. (Thanks [David Chan](http://www.chandeeland.org)!)
+
+## Compatibility Test
+* **Fixed:** The SDK compatibility test now uses `ini_get()` instead of `get_cfg_var()` and `get_cfg_ini()` for more accurate test results.
+
+
+----
+
+# Changelog: 1.5 "Allegro"
+Code name for Mac OS 8.5. <http://en.wikipedia.org/wiki/Mac_OS_8#Mac_OS_8.5>
+
+Launched Wednesday, December 14, 2011
+
+## Credentials
+* !! BACKWARDS-INCOMPATIBLE CHANGE !! - The function signature of all service constructors has changed. Instead of passing a key and secret as the first and second parameters, the constructor now accepts a hash (associative array) containing `key` and `secret` keys. Please see the API reference documentation
+
+## Runtime
+* !! BACKWARDS-INCOMPATIBLE CHANGE !! - The function signature of all service constructors has changed. Instead of passing a key and secret as the first and second parameters, the constructor now accepts a hash (associative array) containing `key` and `secret` keys. If you are explicitly passing a key and secret to the constructor, you will need to change your code. If you are simply inheriting your default credentials from a config file, you don't need to make any changes beyond upgrading your config file to the new 1.5 format. Please see the API reference documentation for more information.
+* !! BACKWARDS-INCOMPATIBLE CHANGE !! - The method by which the `config.inc.php` file maintains its list of credentials has been re-factored and updated to support managing multiple sets of credentials in a single location (e.g., development, staging, production).
+* !! BACKWARDS-INCOMPATIBLE CHANGE !! - The `init()` method has been renamed to `factory()` to better reflect what it actually does.
+* !! BACKWARDS-INCOMPATIBLE CHANGE !! - The `adjust_offset()` method has been removed. Instead, please ensure that the machine's time is set correctly using an [NTP server](https://secure.wikimedia.org/wikipedia/en/wiki/Network_Time_Protocol).
+* !! BACKWARDS-INCOMPATIBLE CHANGE !! - In version 1.4 we enabled a mode where -- for services that supported it -- a set of temporary credentials were fetched and cached before the first request. This functionality has been reverted. The use of short-term credentials must be explicitly enabled by instantiating the `AmazonSTS` class and passing those credentials into the service constructor.
+* **New:** Improved the user directory lookup for the config file.
+* **Changed:** Made `set_region()` an alias of `set_hostname()`.
+
+## Services
+### AmazonAS
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+
+### AmazonCloudFormation
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+* **New:** Support for cost estimation of CloudFormation templates has been added to the SDK.
+
+### AmazonCloudWatch
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+
+### AmazonEC2
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+* **New:** Support for 24x7 Reserved Instances has been added to the SDK. For more information, please see [New Amazon EC2 Reserved Instance Options Now Available](https://aws.amazon.com/about-aws/whats-new/2011/12/01/New-Amazon-EC2-Reserved-Instances-Options-Now-Available/).
+* **New:** Support for VPC Spot Instances has been added to the SDK. For more information, please see [Announcing Amazon EC2 Spot Integration with Amazon VPC](https://aws.amazon.com/about-aws/whats-new/2011/10/11/announcing-amazon-ec2-spot-integration-with-amazon-vpc/).
+* **New:** Support for VPC Everywhere has been added to the SDK. For more information, please see [Amazon VPC Generally Available in Multiple AZs in All Regions](https://aws.amazon.com/about-aws/whats-new/2011/08/03/Announcing-VPC-GA/).
+* **New:** Instance Type-related constants have been added to the SDK: `INSTANCE_MICRO`, `INSTANCE_SMALL`, `INSTANCE_LARGE`, `INSTANCE_XLARGE`, `INSTANCE_HIGH_MEM_XLARGE`, `INSTANCE_HIGH_MEM_2XLARGE`, `INSTANCE_HIGH_MEM_4XLARGE`, `INSTANCE_HIGH_CPU_MEDIUM`, `INSTANCE_HIGH_CPU_XLARGE`, `INSTANCE_CLUSTER_4XLARGE`, `INSTANCE_CLUSTER_8XLARGE`, `INSTANCE_CLUSTER_GPU_XLARGE`.
+
+### AmazonElastiCache
+* **New:** Support for US-West 1 (California), EU-West (Ireland), Asia Pacific Southeast (Singapore), and Asia Pacific Northeast (Tokyo) regions has been added to the SDK. For more information, please see [Amazon ElastiCache is now available in four additional AWS Regions and as a CloudFormation template](https://aws.amazon.com/about-aws/whats-new/2011/12/05/amazon-elasticache-new-regions/).
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`
+
+### AmazonElasticBeanstalk
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`
+
+### AmazonELB
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+* **New:** Support for ELBs running in VPC has been added to the SDK. For more information, please see [Announcing Elastic Load Balancing in Amazon VPC](https://aws.amazon.com/about-aws/whats-new/2011/11/21/announcing-elastic-load-balancing-in-amazon-vpc/).
+
+### AmazonEMR
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+* **New:** Support for EMR AMI Versioning, new Hadoop and Pig versions, and EMR running in VPC has been added to the SDK. For more information, please see [Amazon Elastic MapReduce Announces Support for New Hadoop and Pig Versions, AMI Versioning, and Amazon VPC](https://aws.amazon.com/about-aws/whats-new/2011/12/11/amazon-elastic-mapreduce-ami-versioning-vpc/).
+
+### AmazonIAM
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`
+
+### AmazonImportExport
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`
+
+### AmazonRDS
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+
+### AmazonS3
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+* **New:** Support for an S3 Stream Wrapper has been added to the SDK. This enables users to read/write to Amazon S3 as though it were the local file system.
+**Fixed:** The `get_object()` method no longer attempts to parse XML/JSON content.
+**Fixed:** Simplified S3 region logic. Now uses fully-qualified domain names across the board.
+
+### AmazonSES
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`
+
+### AmazonSDB
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+
+### AmazonSNS
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+
+### AmazonSQS
+* **New:** Support for the South American (São Paulo) region has been added to the SDK.
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`, `REGION_CALIFORNIA`, `REGION_OREGON`, `REGION_IRELAND`, `REGION_SINGAPORE`, `REGION_TOKYO`, `REGION_SAO_PAULO`
+
+### AmazonSTS
+* **New:** Plain english aliases have been added to the SDK: `REGION_VIRGINA`
+
+
+----
+
+# Changelog: 1.4.8 "Zanarkand"
+<http://finalfantasy.wikia.com/wiki/Zanarkand>
+
+Launched Wednesday, December 7, 2011
+
+## Services
+### AmazonCloudFront
+* **Fixed:** Merged in a pull request contributed by Ben Lumley: <https://github.com/amazonwebservices/aws-sdk-for-php/pull/11>
+
+### AmazonEC2
+* **Fixed:** Resolved an issue where `set_region()` was not setting the correct endpoint for the region.
+
+### AmazonS3
+* **New:** Support for S3-side multi-object delete has been added to the SDK as the `delete_objects()` method. The implementations of `delete_all_objects()` and `delete_all_object_versions()` have been updated to use this new functionality.
+* **Changed:** XML and JSON responses from `get_object()` are no longer parsed. The raw XML and JSON string content is now returned.
+
+
+----
+
+# Changelog: 1.4.7 "Yuna"
+<http://finalfantasy.wikia.com/wiki/Yuna>
+
+Launched Wednesday, November 9, 2011
+
+## Service Classes
+### AmazonAS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonCloudFormation
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonCloudWatch
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+* **New:** Support for the US GovCloud region has been added to the SDK.
+
+### AmazonEC2
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+* **New:** Support for the US GovCloud region has been added to the SDK.
+
+### AmazonELB
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonEMR
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonIAM
+* **New:** Support for the US GovCloud region has been added to the SDK.
+
+### AmazonRDS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonS3
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+* **Fixed:** Resolved an issue where certain bits of metadata were not maintained during a copy operation. <https://forums.aws.amazon.com/thread.jspa?threadID=77630>
+* **Fixed:** Resolved an issue where an unsuccessful lookup of an existing content-type would throw a warning. <https://forums.aws.amazon.com/thread.jspa?threadID=78121>
+* **Fixed:** Resolved an issue where an exception would be thrown when a filesize lookup was attempted on an object that didn't exist. <https://forums.aws.amazon.com/thread.jspa?threadID=78197>
+
+### AmazonSDB
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonSNS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonSQS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+
+----
+
+# Changelog: 1.4.6 "Xezat"
+<http://finalfantasy.wikia.com/wiki/Xezat>
+
+Launched Thursday, November 3, 2011
+
+## Service Classes
+### AmazonIAM
+* **New:** Support for a virtual MFA device. A virtual MFA device uses a software application that can generate six-digit authentication codes that are Open AuTHentication Time-based One-Time Password (OATHTOTP)-compatible. The software application can run on any mobile hardware device, including a smartphone.
+
+
+----
+
+# Changelog: 1.4.5 "Weiss"
+<http://finalfantasy.wikia.com/wiki/Weiss>
+
+Launched Friday, October 21, 2011
+
+## Service Classes
+### AmazonSQS
+* **New:** Support for delayed queues and batch operations has been added to the SDK.
+
+
+----
+
+# Changelog: 1.4.4 "Vaan"
+<http://finalfantasy.wikia.com/wiki/Vaan>
+
+Launched Tuesday, October 12, 2011
+
+## Runtime
+* **Fixed:** Resolved an issue where a segmentation fault is triggererd when there are multiple autoloaders in the stack and one of them doesn't return a value.
+
+## Service Classes
+### AmazonS3
+* **New:** Support for server-side encryption has been added to the SDK.
+
+
+----
+
+# Changelog: 1.4.3 "Ultros"
+<http://finalfantasy.wikia.com/wiki/Ultros>
+
+Launched Friday, September 30, 2011
+
+## Service Classes
+### AmazonCloudFormation
+* **New:** Support for new features in CloudFormation have been added to the SDK.
+
+### AmazonS3
+* **Fixed:** Setting the default cache configuration no longer causes authentication errors in `AmazonS3`.
+
+
+----
+
+# Changelog: 1.4.2.1 "Tiamat, Part II"
+<http://finalfantasy.wikia.com/wiki/Tiamat>
+
+Launched Wednesday, September 7, 2011
+
+## Utility Classes
+### RequestCore
+* **Fixed:** RequestCore has updated the `cacert.pem` file from Mozilla. This update revokes trust from the DigiNotar and Staat der Nederlanden root certificates.
+
+
+----
+
+# Changelog: 1.4.2 "Tiamat"
+<http://finalfantasy.wikia.com/wiki/Tiamat>
+
+Launched Thursday, September 1, 2011
+
+## Service Classes
+### AmazonEC2
+* **Fixed:** Requests made to Amazon EC2 now use the correct API version (2011-07-15).
+
+### AmazonELB
+* **New:** A pre-defined set of ciphers may now be used for SSL termination at the Elastic Load Balancer.
+* **New:** Application servers can now accept secure communication from the corresponding Elastic Load Balancer.
+* **New:** In cases where HTTPS is required for all traffic entering the back-end server, Elastic Load Balancing can now perform health checks using HTTPS.
+* **New:** White list of public keys can now be associated with back-end servers. Elastic Load Balancing authenticates back-end servers with the public keys in the white list and communicates only with back-end servers that pass this authentication check.
+
+## Utility Classes
+### RequestCore
+* **Fixed:** RequestCore has updated the `cacert.pem` file from Mozilla. This update revokes trust from the DigiNotar root certificate.
+
+
+----
+
+# Changelog: 1.4.1 "Sephiroth"
+<http://finalfantasy.wikia.com/wiki/Sephiroth>
+
+Launched Tuesday, August 23, 2011
+
+## Service Classes
+### AmazonElastiCache
+* **New:** Support for Amazon ElastiCache has been added to the SDK.
+
+### AmazonEMR
+* **New:** Support for Hadoop Bootstrap Actions has been added to the SDK.
+* **New:** Support for Amazon Elastic MapReduce on Spot Instances has been added to the SDK.
+* **New:** Support for Termination Protection has been added to the SDK.
+* **Changed:** For the <code>add_instance_groups()</code> method, the <code>$instance_groups</code> and <code>$job_flow_id</code> parameters have been reversed.
+
+## Utility Classes
+### CFHadoopBootstrap
+* **New:** The `CFHadoopBootstrap` class has been added to the SDK. Simplifies the process of working with Hadoop system and daemon configurations in Amazon EMR.
+* **New:** This class extends from the `CFHadoopBase` class.
+
+
+----
+
+# Changelog: 1.4 "Rikku"
+<http://finalfantasy.wikia.com/wiki/Rikku>
+
+Launched Wednesday, August 3, 2011
+
+## Bug fixes and enhancements
+
+## Service Classes
+### AmazonEC2
+* **New:** Support for Session-Based Authentication (SBA) leveraging Amazon Secure Token Service (STS) has been added to the SDK.
+
+### AmazonS3
+* **New:** Support for Session-Based Authentication (SBA) leveraging Amazon Secure Token Service (STS) has been added to the SDK.
+
+### AmazonSNS
+* **New:** Support for Session-Based Authentication (SBA) leveraging Amazon Secure Token Service (STS) has been added to the SDK.
+
+### AmazonSQS
+* **New:** Support for Session-Based Authentication (SBA) leveraging Amazon Secure Token Service (STS) has been added to the SDK.
+
+### AmazonSTS
+* **New:** Support for the Amazon Secure Token Service (STS) has been added to the SDK.
+
+## Utility Classes
+### CFRuntime
+* **New:** The following anonymous datapoints are now collected in aggregate so that we can make more informed decisions about future SDK features: `memory_limit`, `date.timezone`, `open_basedir`, `safe_mode`, `zend.enable_gc`.
+
+## Compatibility Test
+* **New:** Support for verifying the installed SSL certificate has been added to the compatibility test.
+* **New:** Support for verifying the status of `open_basedir` and `safe_mode` has been added to the compatibility test.
+* **New:** Support for verifying the status of the PHP 5.3 garbage collector has been added to the compatibility test.
+* **New:** The compatibility test now recommends optimal values for the `AWS_CERTIFICATE_AUTHORITY` and `AWS_DEFAULT_CACHE_CONFIG` configuration options based on the system's configuration.
+
+
+----
+
+# Changelog: 1.3.7 "Quistis"
+<http://finalfantasy.wikia.com/wiki/Quistis_Trepe>
+
+Launched Monday, July 25, 2011
+
+## Bug fixes and enhancements
+* Addressed minor bug fixes reported via the feedback form in the API Reference.
+
+## Service Classes
+### AmazonAS
+* **Changed:** Introduced backwards-incompatible changes to the <code>put_scheduled_update_group_action()</code> method.
+
+
+----
+
+# Changelog: 1.3.6 "Penelo"
+<http://finalfantasy.wikia.com/wiki/Penelo>
+
+Launched Tuesday, July 12, 2011
+
+## Bug fixes and enhancements
+* [[Bug Report] rawurlencode error when using SES and curlopts](https://forums.aws.amazon.com/thread.jspa?threadID=68484)
+
+## Service Classes
+### AmazonCloudFormation
+* **New:** Support for the `list_stacks()` method has been added to the SDK.
+
+### AmazonElasticBeanstalk
+* **New:** Support for the `swap_environment_cnames()` method has been added to the SDK.
+
+### AmazonS3
+* **Fixed:** Additional information about maximum open connections has been added to the `create_mpu_object()` method.
+
+## Compatibility Test
+* **New:** Now tests whether the system is 64- or 32-bit.
+
+
+----
+
+# Changelog: 1.3.5 "Occuria"
+<http://finalfantasy.wikia.com/wiki/Occuria>
+
+Launched Tuesday, June 21, 2011
+
+## Service Classes
+### AmazonS3
+* **New:** Support for S3 copy part has been added to the SDK.
+
+
+----
+
+# Changelog: 1.3.4 "Nero"
+<http://finalfantasy.wikia.com/wiki/Nero>
+
+Launched Tuesday, June 7, 2011
+
+## Bug fixes and enhancements
+* [Bug in PHP SDK](https://forums.aws.amazon.com/thread.jspa?threadID=67502)
+* [cURL error: SSL certificate problem (60) with aws-sdk-for-php 1.3.3](https://forums.aws.amazon.com/thread.jspa?threadID=68349)
+
+
+## Service Classes
+### AmazonEC2
+* **New:** Support for Local Availability Zone Pricing has been added to the SDK.
+
+### AmazonELB
+* **New:** Elastic Load Balancing provides a special Amazon EC2 security group that you can use to ensure that a back-end Amazon EC2 instance receives traffic only from its load balancer.
+
+### AmazonRDS
+* **New:** Support for Oracle databases has been added to the SDK.
+
+
+## Utility Classes
+### CFArray
+* **New:** Added the init() method which simplifies the process of instantiating and chaining a class.
+* **New:** Added support for associative arrays to `each()`, `map()` and `filter()`.
+
+### CFRequest
+* **New:** Now supports the `AWS_CERTIFICATE_AUTHORITY` configuration option.
+
+
+----
+
+# Changelog: 1.3.3 "Moogle"
+<http://finalfantasy.wikia.com/wiki/Moogle>
+
+Launched Tuesday, May 10, 2011
+
+## Bug fixes and enhancements
+* [Bug in AmazonCloudFront::get_private_object_url](https://forums.aws.amazon.com/thread.jspa?threadID=64004)
+* [SDK 1.3.2 - Call to undefined function json_last_error()](https://forums.aws.amazon.com/thread.jspa?threadID=64767)
+* [CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir](https://forums.aws.amazon.com/thread.jspa?threadID=61333)
+
+
+## Service Classes
+### AmazonCloudFront
+* **Fixed:** Resolved an issue where the expires value for `get_private_object_url()` only accepted a string instead of a string or integer.
+
+### AmazonCloudWatch
+* **New:** Support for CloudWatch custom user metrics has been added to the SDK.
+
+
+## Extensions
+### S3BrowserUpload
+* **New:** Added the `S3BrowserUpload` class to the SDK. This class assists in generating the correct HTML/XHTML markup for uploading files to S3 via an HTML <form> element.
+
+
+## Utility Classes
+### CFArray
+* **New:** Added the `init()` method which simplifies the process of instantiating and chaining a class.
+
+### CFHadoopBase
+* **New:** The `CFHadoopBase` class has been extracted out of `CFHadoopStep` as a shared library.
+
+### CFHadoopStep
+* **New:** The `CFHadoopBase` class has been extracted out of `CFHadoopStep` as a shared library.
+* **New:** This class now extends from the `CFHadoopBase` class.
+
+### CFJSON
+* **Fixed:** Resolved an issue where a PHP 5.3-specific function was being used.
+
+### CFPolicy
+* **New:** Added the init() method which simplifies the process of instantiating and chaining a class.
+
+### CFSimpleXML
+* **New:** Added the init() method which simplifies the process of instantiating and chaining a class.
+
+### RequestCore
+* **Fixed:** Improvements to running in PHP environments with open_basedir enabled.
+* **Fixed:** RequestCore now uses an up-to-date `cacert.pem` file from Mozilla instead of the Certificate Authority that libcurl or libopenssl was compiled with, which should resolve certain issues with making SSL connections to AWS services.
+
+
+----
+
+# Changelog: 1.3.2 "Luna"
+<http://finalfantasy.wikia.com/wiki/Luna_Wolf>
+
+Launched Tuesday, April 5, 2011
+
+## New Features & Highlights (Summary)
+* Support for Dedicated Instances within a Virtual Private Cloud on single-tenant hardware has been added to the SDK.
+* Bug fixes and enhancements:
+	* [AmazonCloudWatch get_metric_statistics returns gzipped body](https://forums.aws.amazon.com/thread.jspa?threadID=62625)
+
+
+## Service Classes
+### AmazonCloudWatch
+* **Fixed:** Worked around an issue where when CloudWatch sends back `Content-Encoding: gzip`, it really means `deflate`. When CloudWatch sends back `Content-Encoding: deflate`, it really means the data isn't encoded at all.
+
+### AmazonEC2
+* **New:** Support for Dedicated Instances within a Virtual Private Cloud on single-tenant hardware has been added to the SDK.
+
+
+----
+
+# Changelog: 1.3.1 "Kraken"
+<http://finalfantasy.wikia.com/wiki/Kraken>
+
+Launched Friday, March 25, 2011
+
+## New Features & Highlights (Summary)
+* Fixed issues with Signature v3 authentication (SES).
+* Added gzip decoding.
+* Added support for converting data to more alternate formats.
+* Bug fixes and enhancements:
+	* [Cannot send email](https://forums.aws.amazon.com/thread.jspa?threadID=62833)
+	* [AmazonCloudWatch get_metric_statistics returns gzipped body](https://forums.aws.amazon.com/thread.jspa?threadID=62625)
+
+
+## Utility Classes
+### CFArray
+* **New:** The `to_json()` and `to_yaml()` methoda have been added to the class.
+
+### CFGzipDecode
+* **New:** Handles a variety of primary and edge cases around gzip/deflate decoding in PHP.
+
+### CFRuntime
+* **New:** Gzip decoding has been added to the SDK.
+* **Fixed:** The previous release contained a regression in the Signature v3 support that affected AmazonSES. This has been resolved.
+* **Fixed:** Completed support for Signature v3 over HTTP connections.
+
+### CFSimpleXML
+* **New:** The `to_stdClass()` and `to_yaml()` methoda have been added to the class.
+
+
+----
+
+# Changelog: 1.3 "Jecht"
+<http://finalfantasy.wikia.com/wiki/Jecht>
+
+Launched Tuesday, March 15, 2011
+
+## New Features & Highlights (Summary)
+* Support for VPC Internet Access has been added to the SDK.
+* Bug fixes and enhancements:
+	* [AmazonEC2::register_image issue](https://forums.aws.amazon.com/thread.jspa?threadID=52499)
+	* [Automatic Parseing of XML objects](https://forums.aws.amazon.com/thread.jspa?threadID=61882)
+
+## Service Classes
+### AmazonEC2
+* **New:** Support for VPC Internet Access has been added to the SDK.
+* **Fixed:** The `$image_location` parameter in the `register_image()` method is no longer required. This is a backwards-incompatible change.
+
+### AmazonS3
+* **Fixed:** Resolved an issue in `get_object()` where using the `lastmodified` and `etag` parameters required both to be set before taking effect. They can now be set independently from each other.
+
+
+## Utility classes
+### CFArray
+* **Changed:** The `reduce()` method has been renamed to `filter()`. `reduce()` is now simply an alias for `filter()`.
+
+### CFJSON
+* **New:** Simplifies the task of normalizing XML and JSON responses as `CFSimpleXML` objects.
+
+### CFRuntime
+* **New:** Preliminary support for Signature v3 over HTTP has been added to the SDK. This is useful for debugging Signature v3 issues over non-HTTPS connections.
+* **Changed:** Classes that use the shared authentication method (i.e., NOT `AmazonS3` or `AmazonCloudFront`) will automatically convert JSON service responses into a `CFSimpleXML` object.
+* **Changed:** Formerly, the SDK would attempt to sniff the content to determine the type. Now, the SDK will check the HTTP response headers for `text/xml`, `application/xml` or `application/json` to determine whether or not to parse the content. If the HTTP response headers are not available, the SDK will still attempt content sniffing.
+
+### CFSimpleXML
+* **New:** The `to_json()` method has been added to the class.
+
+### CFUtilities
+* **New:** The `is_json()` method has been added to the class.
+
+
+----
+
+# Changelog: 1.2.6 "Ifrit"
+<http://finalfantasy.wikia.com/wiki/Ifrit>
+
+Launched Wednesday, March 2, 2011
+
+## New Features & Highlights (Summary)
+* **New:** Support for the new Asia Pacific "Northeast" (Japan) endpoint has been added for all relevant services.
+* **New:** Support for registering callback functions for read/write streams has been added to the SDK. Includes a runnable sample.
+* **Fixed:** Improvements to avoid triggering warnings when PHP is in Safe Mode.
+
+
+## Service Classes
+### AmazonAS
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonCloudFormation
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonCloudWatch
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonEC2
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonELB
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonRDS
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonS3
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+* **New:** Added support for `ap-northeast-1` as a location constraint when creating a new bucket.
+
+### AmazonSDB
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonSNS
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+### AmazonSQS
+* **New:** Added a new _class_ constant: `REGION_APAC_NE1`.
+
+## Utility classes
+### CFRuntime
+* **New:** Support for registering callback functions for read/write streams has been added to the SDK.
+* **New:** Future-proofed for future regional endpoints.
+
+### RequestCore
+* **New:** Support for registering callback functions for read/write streams has been added to the SDK.
+* **Fixed:** Improvements to avoid triggering warnings when PHP is in Safe Mode.
+
+## Samples
+* **New:** A sample demonstrating how to add a command-line progress bar for S3 transfers has been added to the SDK.
+
+
+----
+
+# Changelog: 1.2.5 "Heidegger"
+<http://finalfantasy.wikia.com/wiki/Heidegger>
+
+Launched Thursday, February 24, 2011
+
+## New Features & Highlights (Summary)
+* Support for AWS CloudFormation has been added to the SDK.
+* Bug fixes and enhancements:
+	* [PHP API change_content_type() broken](https://forums.aws.amazon.com/thread.jspa?threadID=59532)
+	* [Bug setting OriginAccessIdentity for a Cloudfront distribution config](https://forums.aws.amazon.com/thread.jspa?threadID=60989)
+
+## Service Classes
+### AmazonCloudFormation
+* **New:** Support for AWS CloudFormation has been added to the SDK.
+
+### AmazonCloudFront
+* **Fixed:** Issues around `update_xml_config()` have been resolved.
+
+### AmazonS3
+* **Fixed:** Issues around `change_content_type()` have been resolved.
+
+
+----
+
+# Changelog: 1.2.4 "Goltanna"
+<http://finalfantasy.wikia.com/wiki/Druksmald_Goltanna>
+
+Launched Wednesday, February 16, 2011
+
+## New Features & Highlights (Summary)
+* Support for IAM account aliases and server certificates has been added to the SDK.
+* Support for Amazon S3 Website Configuration has been added to the SDK.
+* Documentation updates for Amazon RDS and AWS Import/Export.
+* Updated all documentation blocks to adhere to the PHPDoc format. This enables a greater number of tools to take advantage of the SDK documentation.
+* Rolled out a major update to the SDK API Reference.
+
+## Service Classes
+### AmazonIAM
+* **New:** Support for IAM account aliases and server certificates has been added to the SDK.
+
+### AmazonImportExport
+* **New:** Documentation has been updated to note the new US West region support.
+
+### AmazonRDS
+* **New:** Documentation has been updated to note the new support for MySQL 5.5.
+
+### AmazonS3
+* **New:** Support for Amazon S3 Website Configuration has been added to the SDK.
+
+
+----
+
+# Changelog: 1.2.3 "Fayth"
+<http://finalfantasy.wikia.com/wiki/Fayth>
+
+Launched Tuesday, January 25, 2010
+
+## New Features & Highlights (Summary)
+* Support for Amazon Simple Email Service has been added to the SDK.
+
+## Service Classes
+### AmazonSES
+* **New:** Support for Amazon Simple Email Service has been added to the SDK.
+
+
+----
+
+# Changelog: 1.2.2 "Esper"
+<http://finalfantasy.wikia.com/wiki/Esper>
+
+Launched Tuesday, January 18, 2011
+
+## New Features & Highlights (Summary)
+* Support for Amazon Elastic Beanstalk has been added to the SDK.
+* Bug fixes and enhancements:
+	* [AWS PHP S3 Library is not working out of the box](https://forums.aws.amazon.com/thread.jspa?threadID=55174)
+	* [Problem with create_mpu_object() and streaming_read_callback() in S3](https://forums.aws.amazon.com/thread.jspa?threadID=54541)
+	* [Integrated Uranium235's GitHub contributions](https://github.com/Uranium235/aws-sdk-for-php/compare/Streaming)
+
+## Service Classes
+### AmazonElasticBeanstalk
+* **New:** Support for AWS Elastic Beanstalk has been added to the SDK.
+
+### AmazonS3
+* **Fixed:** Major improvements to transferring data over streams.
+
+## Utility classes
+###RequestCore
+* **New:** Upgraded to version 1.4.
+* **Fixed:** Major improvements to transferring data over streams.
+
+
+----
+
+# Changelog: 1.2.1 "Dio"
+<http://finalfantasy.wikia.com/wiki/Dio>
+
+Launched Friday, January 14, 2011
+
+
+## New Features & Highlights (Summary)
+* Support for S3 Response Headers has been added to the SDK.
+* Bug fixes and enhancements:
+	* [copy_object failed between regions](https://forums.aws.amazon.com/thread.jspa?threadID=56893)
+	* [Possible S3 bug with multiple buckets?](https://forums.aws.amazon.com/thread.jspa?threadID=56561)
+
+## Service Classes
+### AmazonS3
+* **New:** Support for S3 Response Headers has been added to the SDK.
+* **New:** Documentation for Amazon S3 has been updated to include large object support details.
+* **New:** The `abort_multipart_uploads_by_date()` method has been added to the SDK, which aborts multipart uploads that were initiated before a specific date.
+* **Fixed:** Resolved an issue where the resource prefix wasn't being reset correctly.
+
+## Utility classes
+### CFArray
+* **New:** Instantiating the class without passing an array will use an empty array instead.
+* **New:** Added the `compress()` method which removes null values from the array.
+* **New:** Added the `reindex()` method which reindexes all array elements starting at zero.
+
+## Compatibility Test
+* **New:** The command-line compatibility test now color-codes the responses.
+
+
+----
+
+# Changelog: 1.2 "Cloud"
+<http://finalfantasy.wikia.com/wiki/Cloud_Strife>
+
+Launched Friday, December 3, 2010
+
+
+## New Features & Highlights (Summary)
+* Support for Amazon AutoScaling, Amazon Elastic MapReduce, and Amazon Import/Export Service has been added to the SDK.
+* Support for metric alarms has been added to Amazon CloudWatch.
+* Support for batch deletion has been added to Amazon SimpleDB.
+* Bug fixes and enhancements:
+	* [EU Region DNS problem](https://forums.aws.amazon.com/thread.jspa?threadID=53028)
+	* [[SimpleDB] Conditional PUT](https://forums.aws.amazon.com/thread.jspa?threadID=55884)
+	* [Suggestions for the PHP SDK](https://forums.aws.amazon.com/thread.jspa?threadID=55210)
+	* [Updating a distribution config](https://forums.aws.amazon.com/thread.jspa?threadID=54888)
+	* [Problem with curlopt parameter in S3](https://forums.aws.amazon.com/thread.jspa?threadID=54532)
+	* [AmazonS3::get_object_list() doesn't consider max-keys option](https://forums.aws.amazon.com/thread.jspa?threadID=55169)
+
+## Base/Runtime class
+* **New:** Added support for an alternate approach to instantiating classes which allows for method chaining (PHP 5.3+).
+* **Changed:** Moved `CHANGELOG.md`, `CONTRIBUTORS.md`, `LICENSE.md` and `NOTICE.md` into a new `_docs` folder.
+* **Changed:** Renamed the `samples` directory to `_samples`.
+* **Changed:** Changed the permissions for the SDK files from `0755` to `0644`.
+* **Fixed:** Resolved an issue where attempting to merge cURL options would fail.
+
+## Service Classes
+### AmazonAS
+* **New:** Support for the Amazon AutoScaling Service has been added to the SDK.
+
+### AmazonCloudFront
+* **Fixed:** Resolved an issue where the incorrect formatting of an XML element prevented the ability to update the list of trusted signers.
+
+### AmazonCloudWatch
+* **New:** Support for the Amazon CloudWatch `2010-08-01` service release expands Amazon's cloud monitoring offerings with custom alarms.
+* **Changed:** The changes made to the `get_metric_statistics()` method are backwards-incompatible with the previous release. The `Namespace` and `Period` parameters are now required and the parameter order has changed.
+
+### AmazonEMR
+* **New:** Support for the Amazon Elastic MapReduce Service has been added to the SDK.
+
+### AmazonImportExport
+* **New:** Support for the Amazon Import/Export Service has been added to the SDK.
+
+### AmazonS3
+* **Fixed:** Resolved an issue in the `create_bucket()` method that caused the regional endpoint to be reset to US-Standard.
+* **Fixed:** Resolved an issue in the `get_object_list()` method where the `max-keys` parameter was ignored.
+
+### AmazonSDB
+* **New:** Support for `BatchDeleteAttributes` has been added to the SDK.
+* **Fixed:** Resolved an issue where the `Expected` condition was not respected by `put_attributes()` or `delete_attributes()`.
+
+
+## Utility classes
+### CFComplexType
+* **New:** You can now assign a `member` parameter to prefix all list identifiers.
+* **Changed:** The `option_group()` method is now `public` instead of `private`.
+* **Changed:** Rewrote the `to_query_string()` method to avoid the use of PHP's `http_build_query()` function because it uses `urlencode()` internally instead of `rawurlencode()`.
+
+### CFHadoopStep
+* **New:** Simplifies the process of working with Hadoop steps in Amazon EMR.
+
+### CFManifest
+* **New:** Simplifies the process of constructing YAML manifest documents for Amazon Import/Export Service.
+
+### CFStepConfig
+* **New:** Simplifies the process of working with step configuration in Amazon EMR.
+
+
+## Third-party Libraries
+### CacheCore
+* **Changed:** The `generate_timestamp()` method is now `protected` instead of `private`.
+
+
+----
+
+# Changelog: 1.1 "Barret"
+<http://finalfantasy.wikia.com/wiki/Barret_Wallace>
+
+Launched Wednesday, November 10, 2010
+
+
+## New Features & Highlights (Summary)
+* Support for Amazon ELB, Amazon RDS and Amazon VPC has been added to the SDK.
+* Support for the Amazon S3 multipart upload feature has been added to the SDK. This feature enables developers upload large objects in a series of requests for improved upload reliability.
+* Support for the Amazon CloudFront custom origin (2010-11-01 release) feature has been added to the SDK. This feature enables developers to use custom domains as sources for Amazon CloudFront distributions.
+* The `AmazonS3` class now supports reading from and writing to open file resources in addition to the already-supported file system paths.
+* You can now seek to a specific byte-position within a file or file resource and begin streaming from that point when uploading or downloading objects.
+* The methods `get_bucket_filesize()`, `get_object_list()`, `delete_all_objects()` and `delete_all_object_versions()` are no longer limited to 1000 entries and will work correctly for all entries.
+* Requests that have errors at the cURL level now throw exceptions containing the error message and error code returned by cURL.
+* Bug fixes and enhancements:
+	* [Bug in Samples](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52748)
+	* [EU Region DNS problem](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=53028)
+	* [AmazonS3 get_bucket_object_count](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52976)
+	* [S3: get_object_list() fatal error](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=53418)
+	* [S3 get_object_metadata() problems](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=54244)
+	* [Bug in authenticate in sdk.class.php](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=53117)
+	* [How to use Prefix with "get_object_list"?](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52987)
+	* [SignatureDoesNotMatch with utf-8 in SimpleDB](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52798)
+	* [Suggestion for the PHP SDK concerning streaming](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52787)
+	* [get_bucket_filesize only returns filesize for first 1000 objects](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=53786)
+
+
+## Base/Runtime class
+* **Changed:** Port numbers other than 80 and 443 are now part of the signature.
+* **Changed:** When putting UTF-8 characters via HTTP `POST`, a `SignatureDoesNotMatch` error would be returned. This was resolved by specifying the character set in the `Content-Type` header.
+
+
+## Service Classes
+### AmazonCloudFront
+* **New:** Support for the Amazon CloudFront non-S3 origin feature (2010-11-01 release) has been added to the SDK. This feature enables developers to use non-S3 domains as sources for Amazon CloudFront distributions.
+
+### AmazonEC2
+* **New:** Support for Amazon Virtual Private Cloud has been added to the SDK.
+
+### AmazonELB
+* **New:** Support for Amazon Elastic Load Balancing Service has been added to the SDK.
+
+### AmazonIAM
+* **Fixed:** Removed `set_region()` as IAM only supports a single endpoint.
+
+### AmazonRDS
+* **New:** Support for Amazon Relational Database Service has been added to the SDK.
+
+### AmazonS3
+* **New:** Support for the Amazon S3 multipart upload feature has been added to the SDK. This feature enables developers upload large objects in a series of requests for improved upload reliability.
+* **New:** The `fileUpload` and `fileDownload` options now support reading from and writing to open file resources in addition to the already-supported file system paths.
+* **Fixed:** In Amazon S3, requests directly to the eu-west endpoint must use the path-style URI. The set_region() method now takes this into account.
+* **Fixed:** As of version 1.0.1, CFSimpleXML extends SimpleXMLIterator instead of SimpleXMLElement. This prevented the `__call()` magic method from firing when `get_object_list()` was used.
+* **Fixed:** The `preauth` option for the `get_object_list()` method has been removed from the documentation as it is not supported.
+* **Fixed:** The methods `get_bucket_filesize()`, `get_object_list()`, `delete_all_objects()` and `delete_all_object_versions()` are no longer limited to 1000 entries and will work correctly for all entries.
+* **Fixed:** Using `delete_bucket()` to force-delete a bucket now works correctly for buckets with more than 1000 versions.
+* **Fixed:** The response from the `get_object_metadata()` method now includes all supported HTTP headers, including metadata stored in `x-amz-meta-` headers.
+* **Fixed:** Previously, if the `get_object_metadata()` method was called on a non-existant object, metadata for the alphabetically-next object would be returned.
+
+### AmazonSQS
+* **New:** The `get_queue_arn()` method has been added to the `AmazonSQS` class, which converts a queue URI to a queue ARN.
+
+
+## Utility classes
+### CFSimpleXML
+* **New:** Added `to_string()` and `to_array()` methods.
+
+
+## Third-party Libraries
+### RequestCore
+* **New:** Upgraded to version 1.3.
+* **New:** Added `set_seek_position()` for seeking to a byte-position in a file or file resource before starting an upload.
+* **New:** Added support for reading from and writing to open file resources.
+* **Fixed:** Improved the reporting for cURL errors.
+
+
+## Compatibility Test
+* **Fixed:** Fixed the links to the Getting Started Guide.
+
+
+----
+
+# Changelog: 1.0.1 "Aeris"
+<http://finalfantasy.wikia.com/wiki/Aerith_Gainsborough>
+
+Launched Tuesday, October 12, 2010
+
+
+## New Features & Highlights (Summary)
+* Improved support for running XPath queries against the service response bodies.
+* Added support for request retries and exponential backoff.
+* Added support for HTTP request/response header logging.
+* Bug fixes and enhancements:
+	* [Bug in Samples](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52748)
+	* [Can't set ACL on object using the SDK](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52305)
+	* [Range requests for S3 - status codes 200, 206](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52738)
+	* [S3 change_storage_redundancy() function clears public-read ACL](http://developer.amazonwebservices.com/connect/thread.jspa?threadID=52652)
+
+
+## Base/Runtime class
+* **New:** Added support for request retries and exponential backoff for all `500` and `503` HTTP status codes.
+* **New:** Added the `enable_debug_mode()` method to enable HTTP request/response header logging to `STDERR`.
+
+
+## Service Classes
+### AmazonS3
+* **Fixed:** Lots of tweaks to the documentation.
+* **Fixed:** The `change_content_type()`, `change_storage_redundancy()`, `set_object_acl()`, and `update_object()` methods now respect the existing content-type, storage redundancy, and ACL settings when updating.
+* **New:** Added the `get_object_metadata()` method has been added as a singular interface for obtaining all available metadata for an object.
+
+
+## Utility Classes
+### CFArray
+* **New:** Added the `each()` method which accepts a callback function to execute for each entry in the array. Works similarly to [jQuery's each()](http://api.jquery.com/each).
+* **New:** Added the `map()` method which accepts a callback function to execute for each entry in the array. Works similarly to [jQuery's map()](http://api.jquery.com/map).
+* **New:** Added the `reduce()` method which accepts a callback function to execute for each entry in the array. Works similarly to [DomCrawler reduce()](http://github.com/symfony/symfony/blob/master/src/Symfony/Component/DomCrawler/Crawler.php) from the [Symfony 2](http://symfony-reloaded.org) Preview Release.
+* **New:** Added the `first()` and `last()` methods to return the first and last nodes in the array, respectively.
+
+### CFInfo
+* **New:** Retrieves information about the current installation of the AWS SDK for PHP.
+
+### CFSimpleXML
+* **New:** Added the `query()` method, which allows for XPath queries while the results are wrapped in a `CFArray` response.
+* **New:** Added the `parent()` method, which allows for traversing back up the document tree.
+* **New:** Added the `stringify()` method, which typecasts the value as a string.
+* **New:** Added the `is()` and `contains()` methods, which allow for testing whether the XML value is or contains a given value, respectively.
+* **Changed:** Now extends the `SimpleXMLIterator` class, which in-turn extends the `SimpleXMLElement` class. This adds new iterator methods to the `CFSimpleXML` class.
+
+
+## Third-party Libraries
+### CacheCore
+* **New:** Upgraded to version 1.2.
+* **New:** Added a static `init` method that allows for chainable cache initialization (5.3+).
+
+### RequestCore
+* **New:** Added `206` as a successful status code (i.e., Range GET).
+
+
+## Compatibility Test
+* **Fixed:** Some of the links in the compatibility test were missing. These have been fixed.
+
+
+----
+
+# Changelog: AWS SDK for PHP 1.0
+
+Launched Tuesday, September 28, 2010
+
+This is a complete list of changes since we forked from the CloudFusion 2.5.x trunk build.
+
+
+## New Features & Highlights (Summary)
+* The new file to include is `sdk.class.php` rather than `cloudfusion.class.php`.
+* Because of the increased reliance on [JSON](http://json.org) across AWS services, the minimum supported version is now PHP 5.2 ([Released in November 2006](http://www.php.net/ChangeLog-5.php#5.2.0); Justified by these [WordPress usage statistics](http://wpdevel.wordpress.com/2010/07/09/suggest-topics-for-the-july-15-2010-dev/comment-page-1/#comment-8542) and the fact that [PHP 5.2 has been end-of-life'd](http://www.php.net/archive/2010.php#id2010-07-22-1) in favor of 5.3).
+* Up-to-date service support for [EC2](http://aws.amazon.com/ec2), [S3](http://aws.amazon.com/s3), [SQS](http://aws.amazon.com/sqs), [SimpleDB](http://aws.amazon.com/simpledb), [CloudWatch](http://aws.amazon.com/cloudwatch), and [CloudFront](http://aws.amazon.com/cloudfront).
+* Added service support for [SNS](http://aws.amazon.com/sns).
+* Limited testing for third-party API-compatible services such as [Eucalyptus](http://open.eucalyptus.com), [Walrus](http://open.eucalyptus.com) and [Google Storage](http://sandbox.google.com/storage).
+* Improved the consistency of setting complex data types across services. (Required some backwards-incompatible changes.)
+* Added new APIs and syntactic sugar for SimpleXML responses, batch requests and response caching.
+* Moved away from _global_ constants in favor of _class_ constants.
+* Minor, but notable improvements to the monkey patching support.
+* Added a complete list of bug fix and patch contributors. Give credit where credit is due. ;)
+
+**Note: ALL backwards-incompatible changes are noted below. Please review the changes if you are upgrading.** We're making a small number of backwards-incompatible changes in order to improve the consistency across services. We're making these changes _now_ so that we can ensure that future versions will always be backwards-compatible with the next major version change.
+
+
+## File structure
+The package file structure has been refined in a few ways:
+
+* All service-specific classes are inside the `/services/` directory.
+* All utility-specific classes are inside the `/utilities/` directory.
+* All third-party classes are inside the `/lib/` directory.
+
+
+## Base/Runtime class
+* **Fixed:** Resolved issues: [#206](http://code.google.com/p/tarzan-aws/issues/detail?id=206).
+* **New:** The following global constants have been added: `CFRUNTIME_NAME`, `CFRUNTIME_VERSION`, `CFRUNTIME_BUILD`, `CFRUNTIME_URL`, and `CFRUNTIME_USERAGENT`
+* **New:** Now supports camelCase versions of the snake_case method names. (e.g. `getObjectList()` will get translated to `get_object_list()` behind the scenes.)
+* **New:** Added `set_resource_prefix()` and `allow_hostname_override()` (in addition to `set_hostname()`) to support third-party, API-compatible services.
+* **New:** Added new caching APIs: `cache()` and `delete_cache()`, which work differently from the methods they replace. See docs for more information.
+* **New:** Added new batch request APIs, `batch()` and `CFBatchRequest` which are intended to replace the old `returnCurlHandle` optional parameter.
+* **New:** Will look for the `config.inc.php` file first in the same directory (`./config.inc.php`), and then fallback to `~/.aws/sdk/config.inc.php`.
+* **Changed:** Renamed the `CloudFusion` base class to `CFRuntime`.
+* **Changed:** `CloudFusion_Exception` has been renamed as `CFRuntime_Exception`.
+* **Changed:** Renamed the `CloudFusion::$enable_ssl` property to `CFRuntime::$use_ssl`.
+* **Changed:** Renamed the `CloudFusion::$set_proxy` property to `CFRuntime::$proxy`.
+* **Changed:** `CFRuntime::disable_ssl()` no longer takes any parameters. Once SSL is off, it is always off for that class instance.
+* **Changed:** All date-related constants are now class constants of the `CFUtilities` class (e.g. `CFUtilities::DATE_FORMAT_ISO8601`).
+	* Use `CFUtilities::konst()` if you're extending classes and need to do something such as `$this->util::DATE_FORMAT_ISO8601` but keep getting the `T_PAAMAYIM_NEKUDOTAYIMM` error.
+* **Changed:** All `x-cloudfusion-` and `x-tarzan-` HTTP headers are now `x-aws-`.
+* **Changed:** `CloudFusion::autoloader()` is now in its own separate class: `CFLoader::autoloader()`. This prevents it from being incorrectly inherited by extending classes.
+* **Changed:** `RequestCore`, `ResponseCore` and `SimpleXMLElement` are now extended by `CFRequest`, `CFResponse` and `CFSimpleXML`, respectively. These new classes are now used by default.
+* **Changed:** Changes to monkey patching:
+	* You must now extend `CFRequest` instead of `RequestCore`, and then pass that class name to `set_request_class()`.
+	* You must now extend `CFResponse` instead of `ResponseCore`, and then pass that class name to `set_response_class()`.
+	* You can now monkey patch `CFSimpleXML` (extended from `SimpleXMLElement`) with `set_parser_class()`.
+	* You can now monkey patch `CFBatchRequest` with `set_batch_class()`.
+	* No changes for monkey patching `CFUtilities` with `set_utilities_class()`.
+* **Removed:** Removed ALL existing _global_ constants and replaced them with _class_ constants.
+* **Removed:** Removed `cache_response()` and `delete_cache_response()`.
+
+
+## Service classes
+
+### AmazonCloudFront
+* **Fixed:** Resolved issues: [#124](http://code.google.com/p/tarzan-aws/issues/detail?id=124), [#225](http://code.google.com/p/tarzan-aws/issues/detail?id=225), [#229](http://code.google.com/p/tarzan-aws/issues/detail?id=229), [#232](http://code.google.com/p/tarzan-aws/issues/detail?id=232), [#239](http://code.google.com/p/tarzan-aws/issues/detail?id=239).
+* **Fixed:** Fixed an issue where `AmazonCloudFront` sent a `RequestCore` user agent in requests.
+* **New:** Class is now up-to-date with the [2010-07-15](http://docs.amazonwebservices.com/AmazonCloudFront/2010-07-15/APIReference/) API release.
+* **New:** Added _class_ constants for deployment states: `STATE_INPROGRESS` and `STATE_DEPLOYED`.
+* **New:** Now supports streaming distributions.
+* **New:** Now supports HTTPS (as well as HTTPS-only) access.
+* **New:** Now supports Origin Access Identities. Added `create_oai()`, `list_oais()`, `get_oai()`, `delete_oai()`, `generate_oai_xml()` and `update_oai_xml()`.
+* **New:** Now supports private (signed) URLs. Added `get_private_object_url()`.
+* **New:** Now supports default root objects.
+* **New:** Now supports invalidation.
+* **New:** Added `get_distribution_list()`, `get_streaming_distribution_list()` and `get_oai_list()` which return simplified arrays of identifiers.
+* **Changed:** Replaced all of the remaining `CDN_*` constants with _class_ constants.
+
+### AmazonCloudWatch
+* **New:** Added new _class_ constants: `DEFAULT_URL`, `REGION_US_E1`, `REGION_US_W1`, `REGION_EU_W1`, and `REGION_APAC_SE1`.
+* **New:** Now supports the _Northern California_, _European_ and _Asia-Pacific_ regions.
+* **New:** The _global_ `CW_DEFAULT_URL` constant has been replaced by `AmazonCloudFront::DEFAULT_URL`.
+
+### AmazonEC2
+* **Fixed:** Resolved issues: [#124](http://code.google.com/p/tarzan-aws/issues/detail?id=124), [#131](http://code.google.com/p/tarzan-aws/issues/detail?id=131), [#138](http://code.google.com/p/tarzan-aws/issues/detail?id=138), [#139](http://code.google.com/p/tarzan-aws/issues/detail?id=139), [#154](http://code.google.com/p/tarzan-aws/issues/detail?id=154), [#173](http://code.google.com/p/tarzan-aws/issues/detail?id=173), [#200](http://code.google.com/p/tarzan-aws/issues/detail?id=200), [#233](http://code.google.com/p/tarzan-aws/issues/detail?id=233).
+* **New:** Class is now up-to-date with the [2010-06-15](http://docs.amazonwebservices.com/AWSEC2/2010-06-15/APIReference/) API release.
+* **New:** Now supports [Paid AMIs](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=865&categoryID=87).
+* **New:** Now supports [Multiple instance types](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=992&categoryID=87).
+* **New:** Now supports [Elastic IPs](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1344&categoryID=87).
+* **New:** Now supports [Availability Zones](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1344&categoryID=87).
+* **New:** Now supports [Elastic Block Store](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1665&categoryID=87).
+* **New:** Now supports [Windows instances](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1765&categoryID=87).
+* **New:** Now supports the [European region](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1926&categoryID=87).
+* **New:** Now supports the _Northern California_ and _Asia-Pacific_ regions.
+* **New:** Now supports [Reserved instances](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=2213&categoryID=87).
+* **New:** Now supports [Shared snapshots](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=2843&categoryID=87).
+* **New:** Now supports [EBS AMIs](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3105&categoryID=87).
+* **New:** Now supports [Spot instances](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3215&categoryID=87).
+* **New:** Now supports [Cluster Compute Instances](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3965&categoryID=87).
+* **New:** Now supports [Placement Groups](http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3965&categoryID=87).
+* **New:** Added new _class_ constants for regions: `REGION_US_E1`, `REGION_US_W1`, `REGION_EU_W1`, `REGION_APAC_SE1`.
+* **New:** Added new _class_ constants for run-state codes: `STATE_PENDING`, `STATE_RUNNING`, `STATE_SHUTTING_DOWN`, `STATE_TERMINATED`, `STATE_STOPPING`, `STATE_STOPPED`.
+* **New:** Added support for decrypting the Administrator password for Microsoft Windows instances.
+* **New:** Instead of needing to pass `Parameter.0`, `Parameter.1`, ...`Parameter.n` individually to certain methods, you can now reliably pass a string for a single value or an indexed array for a list of values.
+* **New:** Limited tested has been done with the Eucalyptus EC2-clone.
+* **Changed:** The `$account_id` parameter has been removed from the constructor.
+* **Changed:** The _global_ `EC2_LOCATION_US` and `EC2_LOCATION_EU` constants have been replaced.
+* **Changed:** The `set_locale()` method has been renamed to `set_region()`. It accepts any of the region constants.
+
+### AmazonIAM
+* **New:** Up-to-date with the [2010-03-31](http://docs.amazonwebservices.com/sns/2010-03-31/api/) API release.
+
+### AmazonS3
+* **Fixed:** Resolved issues: [#31](http://code.google.com/p/tarzan-aws/issues/detail?id=31), [#72](http://code.google.com/p/tarzan-aws/issues/detail?id=72), [#123](http://code.google.com/p/tarzan-aws/issues/detail?id=123), [#156](http://code.google.com/p/tarzan-aws/issues/detail?id=156), [#199](http://code.google.com/p/tarzan-aws/issues/detail?id=199), [#201](http://code.google.com/p/tarzan-aws/issues/detail?id=201), [#203](http://code.google.com/p/tarzan-aws/issues/detail?id=203), [#207](http://code.google.com/p/tarzan-aws/issues/detail?id=207), [#208](http://code.google.com/p/tarzan-aws/issues/detail?id=208), [#209](http://code.google.com/p/tarzan-aws/issues/detail?id=209), [#210](http://code.google.com/p/tarzan-aws/issues/detail?id=210), [#212](http://code.google.com/p/tarzan-aws/issues/detail?id=212), [#216](http://code.google.com/p/tarzan-aws/issues/detail?id=216), [#217](http://code.google.com/p/tarzan-aws/issues/detail?id=217), [#226](http://code.google.com/p/tarzan-aws/issues/detail?id=226), [#228](http://code.google.com/p/tarzan-aws/issues/detail?id=228), [#234](http://code.google.com/p/tarzan-aws/issues/detail?id=234), [#235](http://code.google.com/p/tarzan-aws/issues/detail?id=235).
+* **Fixed:** Fixed an issue where `AmazonS3` sent a `RequestCore` user agent in requests.
+* **New:** Now supports the _Northern California_ and _Asia-Pacific_ regions.
+* **New:** Now supports the new _EU (Ireland)_ REST endpoint.
+* **New:** Now supports MFA Delete.
+* **New:** Now supports Conditional Copy.
+* **New:** Now supports Reduced Redundancy Storage (RRS). Added `change_storage_redundancy()`.
+* **New:** Now supports Object Versioning. Added `enable_versioning()`, `disable_versioning`, `get_versioning_status()`, and `list_bucket_object_versions()`.
+* **New:** Now supports Bucket Policies. Added `set_bucket_policy()`, `get_bucket_policy()`, and `delete_bucket_policy()`.
+* **New:** Now supports Bucket Notifications. Added `create_bucket_notification()`, `get_bucket_notifications()`, and `delete_bucket_notification()`.
+* **New:** Added _class_ constants for regions: `REGION_US_E1`, `REGION_US_W1`, `REGION_EU_W1`, `REGION_APAC_SE1`.
+* **New:** Added _class_ constants for storage types: `STORAGE_STANDARD` and `STORAGE_REDUCED`.
+* **New:** Enhanced `create_object()` with the ability to upload a file from the file system.
+* **New:** Enhanced `get_object()` with the ability to download a file to the file system.
+* **New:** Enhanced `get_bucket_list()` and `get_object_list()` with performance improvements.
+* **New:** Enhanced all GET operations with the ability to generate pre-authenticated URLs. This is the same feature as `get_object_url()` has had, applied to all GET operations.
+* **New:** Limited testing with Walrus, the Eucalyptus S3-clone.
+* **New:** Limited testing with Google Storage.
+* **Changed:** Replaced all of the remaining `S3_*` constants with _class_ constants: `self::ACL_*`, `self::GRANT_*`, `self::USERS_*`, and `self::PCRE_ALL`.
+* **Changed:** Changed the function signature for `create_object()`. The filename is now passed as the second parameter, while the remaining options are now passed as the third parameter. This behavior now matches all of the other object-related methods.
+* **Changed:** Changed the function signature for `head_object()`, `delete_object()`, and `get_object_acl()`. The methods now accept optional parameters as the third parameter instead of simply `returnCurlHandle`.
+* **Changed:** Changed the function signature for `get_object_url()` and `get_torrent_url()`. Instead of passing a number of seconds until the URL expires, you now pass a string that `strtotime()` understands (including `60 seconds`).
+* **Changed:** Changed the function signature for `get_object_url()`. Instead of passing a boolean value for `$torrent`, the last parameter is now an `$opt` variable which allows you to set `torrent` and `method` parameters.
+* **Changed:** Changed how `returnCurlHandle` is used. Instead of passing `true` as the last parameter to most methods, you now need to explicitly set `array('returnCurlHandle' => true)`. This behavior is consistent with the implementation in other classes.
+* **Changed:** Optional parameter names changed in `list_objects()`: `maxKeys` is now `max-keys`.
+* **Changed:** `get_bucket_locale()` is now called `get_bucket_region()`, and returns the response body as a _string_ for easier comparison with class constants.
+* **Changed:** `get_bucket_size()` is now called `get_bucket_object_count()`. Everything else about it is identical.
+* **Changed:** `head_bucket()` is now called `get_bucket_headers()`. Everything else about it is identical.
+* **Changed:** `head_object()` is now called `get_object_headers()`. Everything else about it is identical.
+* **Changed:** `create_bucket()` has two backward-incompatible changes:
+	* Method now **requires** the region (formerly _locale_) to be set.
+	* Method takes an `$acl` parameter so that the ACL can be set directly when creating a new bucket.
+* **Changed:** Bucket names are now validated. Creating a new bucket now requires the more stringent DNS-valid guidelines, while the process of reading existing buckets follows the looser path-style guidelines. This change also means that the reading of path-style bucket names is now supported, when previously they weren’t.
+* **Removed:** Removed `store_remote_file()` because its intended usage repeatedly confused users, and had potential for misuse. If you were using it to upload from the local file system, you should be using `create_object` instead.
+* **Removed:** Removed `copy_bucket()`, `replace_bucket()`, `duplicate_object()`, `move_object()`, and `rename_object()` because only a small number of users used them, and they weren't very robust anyway.
+* **Removed:** Removed `get_bucket()` because it was just an alias for `list_objects()` anyway. Use the latter from now on -- it's identical.
+
+### AmazonSDB
+* **Fixed:** Resolved issues: [#205](http://code.google.com/p/tarzan-aws/issues/detail?id=205).
+* **New:** Class is now up-to-date with the [2009-04-15](http://docs.amazonwebservices.com/AmazonSimpleDB/2009-04-15/DeveloperGuide/) API release.
+* **Changed:** Changed the function signatures for `get_attributes()` and `delete_attributes()` to improve consistency.
+
+### AmazonSNS
+* **New:** Up-to-date with the [2010-03-31](http://docs.amazonwebservices.com/sns/2010-03-31/api/) API release.
+
+### AmazonSQS
+* **Fixed:** Resolved issues: [#137](http://code.google.com/p/tarzan-aws/issues/detail?id=137), [#213](http://code.google.com/p/tarzan-aws/issues/detail?id=213), [#219](http://code.google.com/p/tarzan-aws/issues/detail?id=219), [#220](http://code.google.com/p/tarzan-aws/issues/detail?id=220), [#221](http://code.google.com/p/tarzan-aws/issues/detail?id=221), [#222](http://code.google.com/p/tarzan-aws/issues/detail?id=222).
+* **Fixed:** In CloudFusion 2.5, neither `add_permission()` nor `remove_permission()` were functional. They are now working.
+* **New:** Now supports the _Northern California_ and _Asia-Pacific_ regions.
+* **New:** Now supports the new _US-East (N. Virginia)_ endpoint.
+* **New:** Now supports the new _EU (Ireland)_ endpoint.
+* **New:** Added new _class_ constants for regions: `REGION_US_E1`, `REGION_US_W1`, `REGION_EU_W1`, and `REGION_APAC_SE1`.
+* **Changed:** Because we now support multiple region endpoints, queue names alone are no longer sufficient for referencing your queues. As such, you must now use a full-queue URL instead of just the queue name.
+* **Changed:** The _global_ `SQS_LOCATION_US` and `SQS_LOCATION_EU` constants have been replaced.
+* **Changed:** Renamed `set_locale()` as `set_region()`. It accepts any of the region constants.
+* **Changed:** Changed the function signature for `list_queues()`. See the updated API reference.
+* **Changed:** Changed the function signature for `set_queue_attributes()`. See the updated API reference.
+* **Changed:** Changed how `returnCurlHandle` is used. Instead of passing `true` as the last parameter to most methods, you now need to explicitly set `array('returnCurlHandle' => true)`. This behavior is consistent with the implementation in other classes.
+* **Changed:** Function signature changed in `get_queue_attributes()`. The `$attribute_name` parameter is now passed as a value in the `$opt` parameter.
+
+### AmazonSQSQueue
+* **Removed:** `AmazonSQSQueue` was a simple wrapper around the AmazonSDB class. It generally failed as an object-centric approach to working with SQS, and as such, has been eliminated. Use the `AmazonSQS` class instead.
+
+
+## Utility Classes
+### CFArray
+* **New:** Extends `ArrayObject`.
+* **New:** Simplified typecasting of SimpleXML nodes to native types (e.g. integers, strings).
+
+### CFBatchRequest
+* **New:** Provides a higher-level API for executing batch requests.
+
+### CFComplexType
+* **New:** Used internally by several classes to handle various complex data-types (e.g. single or multiple values, `Key.x.Subkey.y.Value` combinations).
+* **New:** Introduces a way to convert between JSON, YAML, and the PHP equivalent of Lists and Maps (nested associative arrays).
+
+### CFRequest
+* **New:** Sets some project-specific settings and passes them to the lower-level RequestCore.
+
+### CFResponse
+* **New:** No additional changes from the base `ResponseCore` class.
+
+### CFPolicy
+* **New:** Used for constructing Base64-encoded, JSON policy documents to be passed around to other methods.
+
+### CFSimpleXML
+* **New:** Extends `SimpleXMLElement`.
+* **New:** Simplified node retrieval. All SimpleXML-based objects (e.g. `$response->body`) now have magic methods that allow you to quickly retrieve nodes with the same name
+	* e.g. `$response->body->Name()` will return an array of all SimpleXML nodes that match the `//Name` XPath expression.
+
+### CFUtilities
+* **Fixed:** `to_query_string()` now explicitly passes a `&` character to `http_build_query()` to avoid configuration issues with MAMP/WAMP/XAMP installations.
+* **Fixed:** `convert_response_to_array()` has been fixed to correctly return an all-array response under both PHP 5.2 and 5.3. Previously, PHP 5.3 returned a mix of `array`s and `stdClass` objects.
+* **New:** Added `konst()` to retrieve the value of a class constant, while avoiding the `T_PAAMAYIM_NEKUDOTAYIM` error. Misspelled because `const` is a reserved word.
+* **New:** Added `is_base64()` to determine whether or not a string is Base64-encoded data.
+* **New:** Added `decode_uhex()` to decode `\uXXXX` entities back into their unicode equivalents.
+* **Changed:** Changed `size_readable()`. Now supports units up to exabytes.
+* **Changed:** Moved the `DATE_FORMAT_*` _global_ constants into this class as _class_ constants.
+* **Removed:** Removed `json_encode_php51()` now that the minimum required version is PHP 5.2 (which includes the JSON extension by default).
+* **Removed:** Removed `hex_to_base64()`.
+
+
+## Third-party Libraries
+### CacheCore
+* **New:** Upgraded to version 1.1.1.
+* **New:** Now supports both the [memcache](http://php.net/memcache) extension, but also the newer, faster [memcached](http://php.net/memcached) extension. Prefers `memcached` if both are installed.
+* **Deprecated:** Support for MySQL and PostgreSQL as storage mechanisms has been **deprecated**. Since they're using PDO, they'll continue to function (as we're maintaining SQLite support via PDO), but we recommend migrating to using APC, XCache, Memcache or SQLite if you'd like to continue using response caching.
+* New BSD licensed
+* <http://github.com/skyzyx/cachecore>
+
+### RequestCore
+* **New:** Upgraded to version 1.2.
+* **New:** Now supports streaming up and down.
+* **New:** Now supports "rolling" requests for better scalability.
+* New BSD licensed
+* <http://github.com/skyzyx/requestcore>
diff --git a/3rdparty/aws-sdk/_docs/CONTRIBUTORS.md b/3rdparty/aws-sdk/_docs/CONTRIBUTORS.md
new file mode 100644
index 0000000000..3523bf6723
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/CONTRIBUTORS.md
@@ -0,0 +1,64 @@
+# Contributors
+
+## AWS SDK for PHP Contributors
+
+Contributions were provided under the Apache 2.0 License, as appropriate.
+
+The following people have provided ideas, support and bug fixes:
+
+* [arech8](http://developer.amazonwebservices.com/connect/profile.jspa?userID=154435) (bug fixes)
+* [Aizat Faiz](http://aizatto.com) (bug fixes)
+* [Ben Lumley](http://github.com/benlumley) (bug fixes)
+* [David Chan](http://www.chandeeland.org) (bug fixes)
+* [Eric Caron](http://www.ericcaron.com) (bug fixes)
+* [Jason Ardell](http://ardell.posterous.com/) (bug fixes)
+* [Jeremy Archuleta](http://code.google.com/u/jeremy.archuleta/) (bug fixes)
+* [Jimmy Berry](http://blog.boombatower.com/) (bug fixes, patches)
+* [Paul Voegler](mailto:voegler@gmx.de) (bug fixes, bug reports, patches)
+* [Peter Bowen](http://github.com/pzb) (feedback, bug reports)
+* [zoxa](https://github.com/zoxa) (bug fixes)
+
+
+## CloudFusion/CacheCore/RequestCore Contributors
+
+Contributions were provided under the New BSD License, as appropriate.
+
+The following people have provided ideas, support and bug fixes:
+
+* [Aaron Collegeman](http://blog.aaroncollegeman.com) (bug fixes)
+* [Alex Schenkel](http://code.google.com/u/alex.schenkel/) (bug fixes)
+* [Andrzej Bednarczyk](http://kreo-consulting.com) (bug fixes)
+* [bprater](http://code.google.com/u/bprater/) (bug fixes)
+* [castoware](http://code.google.com/u/castoware/) (bug fixes)
+* [Chris Chen](http://github.com/chrischen) (bug fixes, patches, support)
+* [Chris Mytton](http://hecticjeff.net) (bug fixes)
+* [evgen.dm](http://code.google.com/u/evgen.dm/) (bug fixes)
+* [gafitescu](http://code.google.com/u/gafitescu/) (bug fixes)
+* [Gary Richardson](http://code.google.com/u/gary.richardson/) (bug fixes)
+* [Gil Hildebrand](http://squidoo.com) (bug fixes)
+* [Guilherme Blanco](http://blog.bisna.com) (bug fixes)
+* [hammjazz](http://code.google.com/u/hammjazz/) (bug fixes)
+* [HelloBunty](http://code.google.com/u/HelloBunty/) (bug fixes)
+* [inputrequired](http://code.google.com/u/inputrequired/) (bug fixes)
+* [Ivo Beckers](http://infopractica.nl) (bug fixes)
+* [Jason Litka](http://jasonlitka.com) (bug fixes, patches)
+* [Jeremy Archuleta](http://code.google.com/u/jeremy.archuleta/) (bug fixes)
+* [John Beales](http://johnbeales.com) (bug fixes)
+* [John Parker](http://code.google.com/u/john3parker/) (bug fixes)
+* [Jon Cianciullo](http://code.google.com/u/jon.cianciullo/) (bug fixes)
+* [kris0476](http://code.google.com/u/kris0476/) (bug fixes)
+* [Matt Terenzio](http://jour.nali.st/blog) (bug fixes, patches)
+* [Mike Jetter](http://mbjetter.com) (bug fixes)
+* [Morten Blinksbjerg Nielsen](http://mbn.dk) (bug fixes)
+* [nathell](http://code.google.com/u/nathell/) (bug fixes)
+* [nickgsuperstar](http://code.google.com/u/nickgsuperstar/) (bug fixes)
+* [ofpichon](http://code.google.com/u/ofpichon/) (bug fixes)
+* [Otavio Ferreira](http://otaviofff.me) (bug fixes)
+* [Paul Voegler](mailto:voegler@gmx.de) (bug fixes, bug reports, patches)
+* [Steve Brozosky](http://code.google.com/u/@UBZWSlJVBxhHXAN1/) (bug fixes)
+* [Steve Chu](http://stevechu.org) (bug fixes)
+* [tommusic](http://code.google.com/u/tommusic/) (bug fixes)
+* [Tyler Hall](http://clickontyler.com) (bug fixes)
+* [webcentrica.co.uk](http://code.google.com/u/@VhBQQldUBBBEXAF1/) (bug fixes)
+* [worden341](http://github.com/worden341) (bug fixes)
+* [yakkyjunk](http://code.google.com/u/yakkyjunk/) (bug fixes)
diff --git a/3rdparty/aws-sdk/_docs/DYNAMODBSESSIONHANDLER.html b/3rdparty/aws-sdk/_docs/DYNAMODBSESSIONHANDLER.html
new file mode 100644
index 0000000000..8b1545db50
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/DYNAMODBSESSIONHANDLER.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>README</title>
+		<style type="text/css" media="screen">
+		body {
+			font: 18px/1.5em 'Book Antiqua', 'Palatino Linotype', Palatino, 'Minion Pro', Cambria, Georgia, serif;
+			padding: 50px 10%;
+			max-width: 1000px;
+			margin: 0 auto;
+			color: #080000;
+			background-color: #fbfbf9;
+		}
+		code {
+			font: 13px/1.4em Monaco, monospace;
+			background-color: #f3f3f3;
+			color: #444;
+			padding: 1px 2px;
+
+			border-radius: 2px;
+			-webkit-border-radius: 2px;
+			-moz-border-radius: 2px;
+		}
+		pre {
+			border: 1px solid #ddd;
+			border-left: 6px solid #c0c0c0;
+			background-color: #f3f3f3;
+			color: #444;
+			font: 13px/1.4em Monaco, monospace;
+			overflow: auto;
+
+			margin: 1em 0 1.5em 0;
+			padding: 1em;
+			text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+
+			-webkit-border-top-right-radius: 5px;
+			-webkit-border-bottom-right-radius: 5px;
+			-moz-border-radius-topright: 5px;
+			-moz-border-radius-bottomright: 5px;
+			border-top-right-radius: 5px;
+			border-bottom-right-radius: 5px;
+		}
+		pre code {
+			font-family: inherit;
+			font-size: inherit;
+			background-color: inherit;
+			color: inherit;
+			padding: 0;
+
+			border-radius: none;
+			-webkit-border-radius: none;
+			-moz-border-radius: none;
+		}
+		a {
+			color: #326EA1;
+			text-decoration: underline;
+			padding: 1px 2px;
+			-webkit-transition: background-color 0.15s;
+			-webkit-transition: color 0.15s;
+			-moz-transition: background-color 0.15s;
+			-moz-transition: color 0.15s;
+			transition: background-color 0.15s;
+			transition: color 0.15s;
+			-webkit-border-radius: 2px;
+			-moz-border-radius: 2px;
+			border-radius: 2px;
+		}
+		a:hover, a.hover {
+			color: #fff;
+			background-color: #333;
+			text-decoration: none;
+			padding: 1px 2px;
+		}
+		a.active {
+			font-weight: bold;
+		}
+		h1, h2, h3, h4, h5, h6 {
+			padding: 0.8em 0 0.2em 0;
+			margin: 0;
+		}
+		h1 {
+			margin-top: 30px;
+			padding: 15px 0 5px 5px;
+			font-size: 2em;
+			line-height: 1.3em;
+			border-bottom: 3px solid #cdcdcc;
+		}
+		h2 {
+			margin-top: 30px;
+			padding: 15px 0 5px 5px;
+			font-size: 1.5em;
+			line-height: 1.3em;
+			border-bottom: 1px solid #cdcdcc;
+		}
+		li {
+			margin: 0;
+			padding: 0;
+		}
+		em, i {
+			font-style: italic;
+		}
+		strong, b {
+			font-weight: bold;
+			color: #000;
+		}
+		p {
+			margin: 0;
+			padding: 0.5em 0;
+		}
+		ul.columns {
+			-moz-column-count: 3;
+			-moz-column-gap: 20px;
+			-webkit-column-count: 3;
+			-webkit-column-gap: 20px;
+			column-count: 3;
+			column-gap: 20px;
+		}
+		dl dt {
+			font: 13px/1.4em Monaco, monospace;
+			font-weight: bold;
+		}
+		dl dd {
+			margin-bottom: 0.5em;
+		}
+		</style>
+	</head>
+	<body>
+		<h1>DynamoDB Session Handler</h1>
+		<p>The <strong>DynamoDB Session Handler</strong> is a custom session handler for PHP that allows Amazon DynamoDB to be used as a session store while still using PHP&rsquo;s native session functions.</p>
+
+		<h2>What issues does this address?</h2>
+		<p>The native PHP session handler stores sessions on the local file system. This is unreliable in distributed web applications, because the user may be routed to servers that do not contain the session data. To solve this problem, PHP developers have implemented custom solutions for storing user session data using databases, shared file systems, Memcache servers, tamper-proof cookies, etc., by taking advantage of the interface provided by PHP via the <code>session_set_save_handler()</code> function. Unfortunately, most of these solutions require a lot of configuration or prior knowledge about the storage mechanism in order to setup. Some of them also require the provisioning or management of additional servers.</p>
+
+		<h2>Proposed solution</h2>
+		<p>The DynamoDB Session Handler uses Amazon DynamoDB as a session store, which alleviates many of the problems with existing solutions. There are no additional servers to manage, and there is very little configuration required. The Amazon DynamoDB is also fundamentally designed for low latency (the data is even stored on <abbr title="Solid State Drive">SSD</abbr>s), so the performance impact is much smaller when compared to other databases. Since the Session Handler is designed to be a drop in replacement for the default PHP session handler, it also implements session locking in a familiar way.</p>
+
+		<h2>How do I use it?</h2>
+		<p>The first step is to instantiate the Amazon DynamoDB client and register the session handler.</p>
+		<pre>require_once 'AWSSDKforPHP/sdk.class.php';
+
+// Instantiate the Amazon DynamoDB client.
+// REMEMBER: You need to set 'default_cache_config' in your config.inc.php.
+$dynamodb = new AmazonDynamoDB();
+
+// Register the DynamoDB Session Handler.
+$handler = $dynamodb->register_session_handler(array(
+    'table_name' => 'my-sessions-table'
+));</pre>
+		<p>Before you can use the session handler, you need to create a table to store the sessions in. This can be done through the <a href="https://console.aws.amazon.com/dynamodb/home">AWS Console for Amazon DynamoDB</a>, or using the session handler class (which you must configure with the table name like in the example above).</p>
+		<pre>// Create a table for session storage with default settings.
+$handler->create_sessions_table();</pre>
+		<p>If you create the table via the AWS Console, you need to make sure the primary key is a string. By default the DynamoDB Session Handler looks for a key named "id", so if you name the key something else, you will need to specify that when you configure the session handler (see the <a href="#configuration">Configuration section</a> below).</p>
+		<p>Once the session handler is registered with a valid table, you can write to (and read from) the session using the standard <code>$_SESSION</code> superglobal.</p>
+		<pre>// Start the session. This will acquire a lock if session locking is enabled.
+session_start();
+
+// Alter the session data.
+$_SESSION['username'] = 'jeremy';
+$_SESSION['role'] = 'admin';
+
+// Close and write to the session.
+// REMEMBER: You should close the session ASAP to release the session lock.
+session_write_close();</pre>
+
+        <h3>Removing expired sessions</h3>
+        <p>The session handler ties into PHP's native session garbage collection functionality, so expired sessions will be deleted periodically and automatically based on how you configure PHP to do the garbage collection. See the PHP manual for the following PHP INI settings: <a href="http://www.php.net/manual/en/session.configuration.php#ini.session.gc-probability">session.gc_probability</a>, <a href="http://www.php.net/manual/en/session.configuration.php#ini.session.gc-divisor">session.gc_divisor</a>, and <a href="http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a>. You may also manually call the <code>DynamoDBSessionHandler::garbage_collect()</code> to clean up the expired sessions.</p>
+
+		<h2 id="configuration">Configuring the DynamoDB Session Handler</h2>
+		<p>You may configure the behavior of the session handler using a the following settings:</p>
+		<dl>
+			<dt>table_name</dt>
+			<dd>The name of the DynamoDB table in which to store sessions.</dd>
+
+			<dt>hash_key</dt>
+			<dd>The name of the primary hash key in the DynamoDB sessions table.</dd>
+
+			<dt>session_lifetime</dt>
+			<dd>The lifetime of an inactive session before it should be garbage collected. If <code>0</code> is used, then the actual lifetime value that will be used is <code>ini_get('session.gc_maxlifetime')</code>.</dd>
+
+			<dt>consistent_reads</dt>
+			<dd>Whether or not the session handler should do consistent reads from DynamoDB.</dd>
+
+			<dt>session_locking</dt>
+			<dd>Whether or not the session handler should do session locking (see the <a href="#session_locking">Session locking section</a> for more information).</dd>
+
+			<dt>max_lock_wait_time</dt>
+			<dd>Maximum time, in seconds, that the session handler should take to acquire a lock before giving up. Only used if <code>session_locking</code> is <code>true</code>.</dd>
+
+			<dt>min_lock_retry_utime</dt>
+			<dd>Minimum time, in microseconds, that the session handler should wait to retry acquiring a lock. Only used if <code>session_locking</code> is <code>true</code>.</dd>
+
+			<dt>max_lock_retry_utime</dt>
+			<dd>Maximum time, in microseconds, that the session handler should wait to retry acquiring a lock. Only used if <code>session_locking</code> is <code>true</code>.</dd>
+		</dl>
+
+		<p>To configure the Session Handle, you must pass the configuration data into the constructor. (<strong>Note</strong>: The values used below are actually the default settings.)</p>
+		<pre>$dynamodb = new AmazonDynamoDB();
+$handler = $dynamodb->register_session_handler(array(
+    'table_name'           => 'sessions',
+    'hash_key'             => 'id',
+    'session_lifetime'     => 0,
+    'consistent_reads'     => true,
+    'session_locking'      => true,
+    'max_lock_wait_time'   => 15,
+    'min_lock_retry_utime' => 5000,
+    'max_lock_retry_utime' => 50000,
+));</pre>
+
+		<h2 id="session_locking">Session locking</h2>
+		<p>The default session handler for PHP locks sessions using a pessimistic locking algorithm. If a request (process) opens a session for reading using the <code>session_start()</code> function, it first acquires a lock. The lock is closed when that request writes back to the session, either when the request is complete, or via the <code>session_write_close()</code> function. Since the DynamoDB Session Handler is meant to be a drop in replacement for the default session handler, it also implements the same locking scheme. However, this can be slow, undesirable, and costly when multiple, simultaneous requests from the same user occur, particularly with ajax requests or HTML iframes. In some cases, you may not want or need the session to be locked. After evaluating whether or not your application actually requires session locking, you may turn off locking when you configure the session handler by setting <code>session_locking</code> to <code>false</code>.</p>
+
+		<h2 id="pricing">Pricing</h2>
+		<p>Aside from nominal data storage and data transfer fees, the costs associated with using Amazon DynamoDB are calculated based on provisioned throughput capacity and item size (see the <a href="http://aws.amazon.com/dynamodb/#pricing">Amazon DynamoDB pricing</a> details). Throughput is measured in units of Read Capacity and Write Capacity. Ultimately, the throughput and costs required for your sessions table is going to be based on your website traffic, but the following is a list of the capacity units required for each session-related operation:</p>
+		<ul>
+			<li><strong>Reading</strong> via <code>session_start()</code>
+				<p>With locking enabled: 1 unit of Write Capacity + 1 unit of Write Capacity for each time it must retry acquiring the lock</p>
+				<p>With locking disabed: 1 unit of Read Capacity (or 0.5 units of Read Capacity if <i>consistent reads</i> are disabled)</p>
+			</li>
+			<li><strong>Writing</strong> via <code>session_write_close()</code>
+				<p>1 unit of Write Capacity</p>
+			</li>
+			<li><strong>Deleting</strong> via <code>session_destroy()</code>
+				<p>1 unit of Write Capacity</p>
+			</li>
+			<li><strong>Garbage Collecting</strong> via <code>DyanamoDBSessionHandler::garbage_collect()</code>
+				<p>0.5 units of Read Capacity per KB of data in the sessions table + 1 unit of Write Capacity per expired item</p>
+			</li>
+		</ul>
+
+		<h2 id="more_information">More information</h2>
+		<p>For more information on the Amazon DynamoDB service please visit the <a href="http://aws.amazon.com/dynamodb">Amazon DynamoDB homepage</a>.</p>
+
+	</body>
+</html>
diff --git a/3rdparty/aws-sdk/_docs/KNOWNISSUES.md b/3rdparty/aws-sdk/_docs/KNOWNISSUES.md
new file mode 100644
index 0000000000..9773c3932b
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/KNOWNISSUES.md
@@ -0,0 +1,65 @@
+# Known Issues
+
+## 2GB limit for 32-bit stacks; all Windows stacks.
+
+Because PHP's integer type is signed and many platforms use 32-bit integers, the AWS SDK for PHP does not correctly
+handle files larger than 2GB on a 32-bit stack (where "stack" includes CPU, OS, web server, and PHP binary). This is a
+[well-known PHP issue]. In the case of Microsoft® Windows®, there are no official builds of PHP that support 64-bit
+integers.
+
+The recommended solution is to use a 64-bit Linux stack, such as the [64-bit Amazon Linux AMI] with the latest version of
+PHP installed.
+
+For more information, please see: [PHP filesize: Return values]. A workaround is suggested in
+`AmazonS3::create_mpu_object()` [with files bigger than 2GB].
+
+   [well-known PHP issue]: http://www.google.com/search?q=php+2gb+32-bit
+   [64-bit Amazon Linux AMI]: http://aws.amazon.com/amazon-linux-ami/
+   [PHP filesize: Return values]: http://docs.php.net/manual/en/function.filesize.php#refsect1-function.filesize-returnvalues
+   [with files bigger than 2GB]: https://forums.aws.amazon.com/thread.jspa?messageID=215487#215487
+
+
+## Amazon S3 Buckets containing periods
+
+Amazon S3's SSL certificate covers domains that match `*.s3.amazonaws.com`. When buckets (e.g., `my-bucket`) are accessed
+using DNS-style addressing (e.g., `my-bucket.s3.amazonaws.com`), those SSL/HTTPS connections are covered by the certificate.
+
+However, when a bucket name contains one or more periods (e.g., `s3.my-domain.com`) and is accessed using DNS-style
+addressing (e.g., `s3.my-domain.com.s3.amazonaws.com`), that SSL/HTTPS connection will fail because the certificate
+doesn't match.
+
+The most secure workaround is to change the bucket name to one that does not contain periods. Less secure workarounds
+are to use `disable_ssl()` or `disable_ssl_verification()`. Because of the security implications, calling either of
+these methods will throw a warning. You can avoid the warning by adjusting your `error_reporting()` settings.
+
+
+## Expiring request signatures
+
+When leveraging `AmazonS3::create_mpu_object()`, it's possible that later parts of the multipart upload will fail if
+the upload takes more than 15 minutes.
+
+
+## Too many open file connections
+
+When leveraging `AmazonS3::create_mpu_object()`, it's possible that the SDK will attempt to open too many file resources
+at once. Because the file connection limit is not available to the PHP environment, the SDK is unable to automatically
+adjust the number of connections it attempts to open.
+
+A workaround is to increase the part size so that fewer file connections are opened.
+
+
+## Exceptionally large batch requests
+
+When leveraging the batch request feature to execute multiple requests in parallel, it's possible that the SDK will
+throw a fatal exception if a particular batch pool is exceptionally large and a service gets overloaded with requests.
+
+This seems to be most common when attempting to send a large number of emails with the SES service.
+
+
+## Long-running processes using SSL leak memory
+
+When making requests with the SDK over SSL during long-running processes, there will be a gradual memory leak that can
+eventually cause a crash. The leak occurs within the PHP bindings for cURL when attempting to verify the peer during an
+SSL handshake. See <https://bugs.php.net/61030> for details about the bug.
+
+A workaround is to disable SSL for requests executed in long-running processes.
diff --git a/3rdparty/aws-sdk/_docs/LICENSE.md b/3rdparty/aws-sdk/_docs/LICENSE.md
new file mode 100644
index 0000000000..853ab3bae8
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/LICENSE.md
@@ -0,0 +1,151 @@
+# Apache License
+Version 2.0, January 2004
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+## 1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1
+through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the
+License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled
+by, or are under common control with that entity. For the purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract
+or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software
+source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form,
+including but not limited to compiled object code, generated documentation, and conversions to other media
+types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License,
+as indicated by a copyright notice that is included in or attached to the work (an example is provided in the
+Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from)
+the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent,
+as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not
+include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work
+and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any
+modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to
+Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to
+submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to the Licensor or its representatives, including but not
+limited to communication on electronic mailing lists, source code control systems, and issue tracking systems
+that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been
+received by Licensor and subsequently incorporated within the Work.
+
+
+## 2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
+Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+
+## 3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such
+license applies only to those patent claims licensable by such Contributor that are necessarily infringed by
+their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim
+or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work
+constitutes direct or contributory patent infringement, then any patent licenses granted to You under this
+License for that Work shall terminate as of the date such litigation is filed.
+
+
+## 4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You meet the following conditions:
+
+   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+   3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent,
+	  trademark, and attribution notices from the Source form of the Work, excluding those notices that do
+	  not pertain to any part of the Derivative Works; and
+
+   4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that
+	  You distribute must include a readable copy of the attribution notices contained within such NOTICE
+	  file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one
+	  of the following places: within a NOTICE text file distributed as part of the Derivative Works; within
+	  the Source form or documentation, if provided along with the Derivative Works; or, within a display
+	  generated by the Derivative Works, if and wherever such third-party notices normally appear. The
+	  contents of the NOTICE file are for informational purposes only and do not modify the License. You may
+	  add Your own attribution notices within Derivative Works that You distribute, alongside or as an
+	  addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be
+	  construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license
+terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative
+Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the
+conditions stated in this License.
+
+
+## 5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by
+You to the Licensor shall be under the terms and conditions of this License, without any additional terms or
+conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate
+license agreement you may have executed with Licensor regarding such Contributions.
+
+
+## 6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of
+the Licensor, except as required for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+
+## 7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor
+provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+
+## 8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless
+required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any
+Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential
+damages of any character arising as a result of this License or out of the use or inability to use the Work
+(including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has been advised of the possibility
+of such damages.
+
+
+## 9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for,
+acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole
+responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold
+each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+
+END OF TERMS AND CONDITIONS
diff --git a/3rdparty/aws-sdk/_docs/NOTICE.md b/3rdparty/aws-sdk/_docs/NOTICE.md
new file mode 100644
index 0000000000..780c2e4c9d
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/NOTICE.md
@@ -0,0 +1,444 @@
+# AWS SDK for PHP
+
+Based on [CloudFusion](http://getcloudfusion.com). Includes other third-party software.
+
+See below for complete copyright and licensing notices.
+
+
+## AWS SDK for PHP
+
+<http://aws.amazon.com/php>
+
+Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License").
+You may not use this file except in compliance with the License.
+A copy of the License is located at
+
+<http://aws.amazon.com/apache2.0>
+
+or in the "license" file accompanying this file. This file is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing
+permissions and limitations under the License.
+
+
+## CloudFusion
+
+<http://getcloudfusion.com>
+
+* Copyright 2005-2010 [Ryan Parman](http://ryanparman.com)
+* Copyright 2007-2010 [Foleeo Inc.](http://warpshare.com)
+* Copyright 2007-2010 "CONTRIBUTORS" (see [CONTRIBUTORS.md](CONTRIBUTORS.md) for a list)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the organization nor the names of its contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+<http://opensource.org/licenses/bsd-license.php>
+
+
+## CacheCore
+
+<http://github.com/skyzyx/cachecore>
+
+* Copyright 2007-2010 [Ryan Parman](http://ryanparman.com)
+* Copyright 2007-2010 [Foleeo Inc.](http://warpshare.com)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the organization nor the names of its contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+<http://opensource.org/licenses/bsd-license.php>
+
+
+## RequestCore
+
+<http://github.com/skyzyx/requestcore>
+
+* Copyright 2007-2010 [Ryan Parman](http://ryanparman.com)
+* Copyright 2007-2010 [Foleeo Inc.](http://warpshare.com)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the organization nor the names of its contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+<http://opensource.org/licenses/bsd-license.php>
+
+
+## SimplePie
+
+<http://simplepie.org>
+
+* Copyright 2004-2010 [Ryan Parman](http://ryanparman.com)
+* Copyright 2005-2010 [Geoffrey Sneddon](http://gsnedders.com)
+* Copyright 2008-2011 [Ryan McCue](http://ryanmccue.info)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the organization nor the names of its contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+<http://opensource.org/licenses/bsd-license.php>
+
+
+## Reqwest
+
+<https://github.com/ded/reqwest>
+
+* Copyright 2011 [Dustin Diaz](http://dustindiaz.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+<http://www.opensource.org/licenses/mit-license.php>
+
+
+## Human readable file sizes
+
+<http://aidanlister.com/2004/04/human-readable-file-sizes/>
+
+* Copyright 2004-2010 [Aidan Lister](http://aidanlister.com)
+* Copyright 2007-2010 [Ryan Parman](http://ryanparman.com)
+
+Redistribution and use in source and binary forms, with or without
+modification, is permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group@php.net.
+
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group@php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
+ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+<http://www.php.net/license/3_01.txt>
+
+
+## Snippets from PHP.net documentation
+
+* `CFUtilities::is_base64()` - Copyright 2008 "debug" <http://us.php.net/manual/en/function.base64-decode.php#81425>
+
+Redistribution and use in source and binary forms, with or without
+modification, is permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group@php.net.
+
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group@php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
+ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+<http://www.php.net/license/3_01.txt>
+
+
+## phunction PHP framework
+
+<http://sourceforge.net/projects/phunction/>
+
+* Copyright 2010 [Alix Axel](mailto:alix-axel@users.sf.net)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+<http://www.opensource.org/licenses/mit-license.php>
+
+
+## Symfony YAML Component
+
+<http://components.symfony-project.org/yaml/>
+
+Copyright 2008-2009 [Fabien Potencier](http://fabien.potencier.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+<http://opensource.org/licenses/mit-license.php>
+
+
+## PEAR Console_ProgressBar
+
+<http://pear.php.net/package/Console_ProgressBar/>
+
+Copyright 2003-2007 [Stefan Walk](http://pear.php.net/user/et)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+<http://opensource.org/licenses/mit-license.php>
+
+
+## Mozilla Certificate Authority
+
+* <http://curl.haxx.se/ca/cacert.pem>
+* <https://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1>
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the Netscape security libraries.
+
+The Initial Developer of the Original Code is Netscape Communications
+Corporation. Portions created by the Initial Developer are Copyright
+(C) 1994-2000 the Initial Developer. All Rights Reserved.
+
+<http://www.mozilla.org/MPL/>
+
+
+## array-to-domdocument
+
+<https://code.google.com/p/array-to-domdocument/>
+
+* Copyright 2010-2011 [Omer Hassan](https://code.google.com/u/113495690012051782542/)
+* Portions copyright 2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+<http://opensource.org/licenses/mit-license.php>
diff --git a/3rdparty/aws-sdk/_docs/STREAMWRAPPER_README.html b/3rdparty/aws-sdk/_docs/STREAMWRAPPER_README.html
new file mode 100644
index 0000000000..5d91068aa2
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/STREAMWRAPPER_README.html
@@ -0,0 +1,243 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>README</title>
+		<style type="text/css" media="screen">
+		body {
+			font: 18px/1.5em 'Book Antiqua', 'Palatino Linotype', Palatino, 'Minion Pro', Cambria, Georgia, serif;
+			padding: 50px 10%;
+			max-width: 1000px;
+			margin: 0 auto;
+			color: #080000;
+			background-color: #fbfbf9;
+		}
+		code {
+			font: 13px/1.4em Monaco, monospace;
+			background-color: #f3f3f3;
+			color: #444;
+			padding: 1px 2px;
+
+			border-radius: 2px;
+			-webkit-border-radius: 2px;
+			-moz-border-radius: 2px;
+		}
+		pre {
+			border: 1px solid #ddd;
+			border-left: 6px solid #c0c0c0;
+			background-color: #f3f3f3;
+			color: #444;
+			font: 13px/1.4em Monaco, monospace;
+			overflow: auto;
+
+			margin: 1em 0 1.5em 0;
+			padding: 1em;
+			text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+
+			-webkit-border-top-right-radius: 5px;
+			-webkit-border-bottom-right-radius: 5px;
+			-moz-border-radius-topright: 5px;
+			-moz-border-radius-bottomright: 5px;
+			border-top-right-radius: 5px;
+			border-bottom-right-radius: 5px;
+		}
+		pre code {
+			font-family: inherit;
+			font-size: inherit;
+			background-color: inherit;
+			color: inherit;
+			padding: 0;
+
+			border-radius: none;
+			-webkit-border-radius: none;
+			-moz-border-radius: none;
+		}
+		a {
+			color: #326EA1;
+			text-decoration: underline;
+			padding: 1px 2px;
+			-webkit-transition: background-color 0.15s;
+			-webkit-transition: color 0.15s;
+			-moz-transition: background-color 0.15s;
+			-moz-transition: color 0.15s;
+			transition: background-color 0.15s;
+			transition: color 0.15s;
+			-webkit-border-radius: 2px;
+			-moz-border-radius: 2px;
+			border-radius: 2px;
+		}
+		a:hover, a.hover {
+			color: #fff;
+			background-color: #333;
+			text-decoration: none;
+			padding: 1px 2px;
+		}
+		a.active {
+			font-weight: bold;
+		}
+		h1, h2, h3, h4, h5, h6 {
+			padding: 0.8em 0 0.2em 0;
+			margin: 0;
+		}
+		h1 {
+			margin-top: 30px;
+			padding: 15px 0 5px 5px;
+			font-size: 2em;
+			line-height: 1.3em;
+			border-bottom: 3px solid #cdcdcc;
+		}
+		h2 {
+			margin-top: 30px;
+			padding: 15px 0 5px 5px;
+			font-size: 1.5em;
+			line-height: 1.3em;
+			border-bottom: 1px solid #cdcdcc;
+		}
+		li {
+			margin: 0;
+			padding: 0;
+		}
+		em, i {
+			font-style: italic;
+		}
+		strong, b {
+			font-weight: bold;
+			color: #000;
+		}
+		p {
+			margin: 0;
+			padding: 0.5em 0;
+		}
+		ul.columns {
+			-moz-column-count: 3;
+			-moz-column-gap: 20px;
+			-webkit-column-count: 3;
+			-webkit-column-gap: 20px;
+			column-count: 3;
+			column-gap: 20px;
+		}
+		</style>
+	</head>
+	<body>
+		<h1>S3 Stream Wrapper</h1>
+		<p>The <strong>S3 Stream Wrapper</strong> is a stream wrapper interface for PHP that provides access to Amazon S3 using PHP&#8217;s standard File System API functions.</p>
+
+		<h2>What issues does this address?</h2>
+		<p>There are a large number of existing applications, code snippets and other bits of PHP that are designed to read and write from the local file system as part of their normal operations. Many of these apps could benefit from moving into the cloud, but doing so would require rewriting a substantial amount of code.</p>
+		<p>What if we could simplify this process so that the updates required to make an existing application cloud-backed would be very minimal?</p>
+
+		<h2>Proposed solution</h2>
+		<p>PHP provides an interface for solving this exact kind of problem, called the <a href="http://php.net/streamwrapper">Stream Wrapper</a> interface. By writing a class that implements this interface and <a href="http://php.net/manual/en/function.stream-wrapper-register.php">registering it as a handler</a> we can reduce both the amount of rewriting that needs to be done for existing applications, as well as substantially lower the learning curve for reading and writing from Amazon S3.</p>
+
+		<h2>How do I use it?</h2>
+		<p>After including the AWS SDK for PHP in your project, use the <code>AmazonS3::register_stream_wrapper()</code> method to register <code>s3://</code> as a <a href="http://php.net/manual/en/wrappers.php">supported stream wrapper</a> for Amazon S3. <em>It's that simple</em>. Amazon S3 file patterns take the following form: <code>s3://bucket/object</code>.</p>
+
+		<pre><code>require_once 'AWSSDKforPHP/sdk.class.php';
+
+$s3 = new AmazonS3();
+$s3->register_stream_wrapper();
+
+$directory = 's3://my-new-bucket';
+$filename = $directory . '/put.txt';
+$contents = '';
+
+if (mkdir($directory))
+{
+    if (file_put_contents($filename, 'This is some sample data.'))
+    {
+        $handle = fopen($filename, 'rb+');
+        $contents = stream_get_contents($handle);
+        fclose($handle);
+    }
+
+    rmdir($directory);
+}
+
+echo $contents;</code></pre>
+
+		<p>You may also pass a different protocol name as a parameter to <code>AmazonS3::register_stream_wrapper()</code> if you want to use something besides <code>s3://</code>. Using this technique you can create more than one stream wrapper with different configurations (e.g. for different regions). To do that you just need to create separate instances of the <code>AmazonS3</code> class, configure them, and then register a stream wrapper for each of them with different protocol names.</p>
+
+		<pre><code>require_once 'AWSSDKforPHP/sdk.class.php';
+
+$s3east = new AmazonS3();
+$s3east->set_region(AmazonS3::REGION_US_E1);
+$s3east->register_stream_wrapper('s3east');
+mkdir('s3east://my-easterly-bucket');
+
+$s3west = new AmazonS3();
+$s3west->set_region(AmazonS3::REGION_US_W1);
+$s3west->register_stream_wrapper('s3west');
+mkdir('s3west://my-westerly-bucket');</code></pre>
+
+		<h2>Tests and usage examples</h2>
+		<p>We are also including tests written in the <a href="http://qa.php.net/phpt_details.php">PHPT</a> format. Not only do these tests show how the software can be used, but any tests submitted back to us should be in this format. These tests will likely fail for you unless you change the bucket names to be globally unique across S3. You can run the tests with <code>pear</code>.</p>
+		<pre><code>cd S3StreamWrapper/tests;
+pear run-tests;</code></pre>
+		<p>If you have <a href="http://phpunit.de">PHPUnit</a> 3.6+ and <a href="http://xdebug.org">Xdebug</a> installed, you can generate a code coverage report as follows:</p>
+		<pre><code>cd S3StreamWrapper/tests && \
+phpunit --colors --coverage-html ./_coverage_report . && \
+open ./_coverage_report/index.html;</code></pre>
+
+		<h2>Notes and Known Issues</h2>
+		<ul>
+			<li><p><code>stream_lock()</code> and <code>stream_cast()</code> are not currently implemented, and likely won't be.</p></li>
+			<li><p>Strangely <code>touch()</code> doesn&#8217;t seem to work. I think this is because of an issue with my implementation of <code>url_stat()</code>, but I can&#8217;t find any information on the magical combination of parameters that will make this work.</p></li>
+			<li><p>Using <code>fopen()</code> will always open in <code>rb+</code> mode. Amazon S3 as a service doesn&#8217;t support anything else.</p></li>
+			<li><p>Because of the way that PHP interacts with the <a href="http://php.net/manual/en/class.streamwrapper.php">StreamWrapper</a> interface, it&#8217;s difficult to optimize for batch requests under the hood. If you need to push or pull data from several objects, you may find that using <a href="http://docs.amazonwebservices.com/AWSSDKforPHP/latest/#m=CFRuntime/batch">batch requests</a> with the <a href="http://docs.amazonwebservices.com/AWSSDKforPHP/latest/#i=AmazonS3">standard interface</a> has better latency.</p></li>
+			<li><p><code>rmdir()</code> does not do a force-delete, so you will need to iterate over the files to delete them one-by-one.</p></li>
+			<li><p><code>realpath()</code>, <code>glob()</code>, <code>chmod()</code>, <code>chown()</code>, <code>chgrp()</code>, <code>tempnam()</code> and a few other functions don&#8217;t support the StreamWrapper interface at the PHP-level because they're designed to work with the (no/low-latency) local file system.</p></li>
+			<li><p>Support for <code>ftruncate()</code> does not exist in any current release of PHP, but is implemented on the PHP trunk for a future release. <a href="http://bugs.php.net/53888">http://bugs.php.net/53888</a>.</p></li>
+			<li><p>Since <a href="http://docs.amazonwebservices.com/AmazonS3/latest/gsg/WorkingWithS3.html#WriteObject">Amazon S3 doesn&#8217;t support appending data</a>, it is best to avoid functions that expect or rely on that functionality (e.g. <a href="http://php.net/fputcsv">fputcsv()</a>).</p></li>
+		</ul>
+
+		<h2>Successfully tested with</h2>
+		<ul class="columns">
+			<li><a href="http://php.net/close_dir">close_dir()</a></li>
+			<li><a href="http://php.net/file_exists">file_exists()</a></li>
+			<li><a href="http://php.net/file_get_contents">file_get_contents()</a></li>
+			<li><a href="http://php.net/file_put_contents">file_put_contents()</a></li>
+			<li><a href="http://php.net/fclose">fclose()</a></li>
+			<li><a href="http://php.net/feof">feof()</a></li>
+			<li><a href="http://php.net/fflush">fflush()</a></li>
+			<li><a href="http://php.net/fgetc">fgetc()</a></li>
+			<li><a href="http://php.net/fgetcsv">fgetcsv()</a></li>
+			<li><a href="http://php.net/fgets">fgets()</a></li>
+			<li><a href="http://php.net/fgetss">fgetss()</a></li>
+			<li><a href="http://php.net/fopen">fopen()</a></li>
+			<li><a href="http://php.net/fpassthru">fpassthru()</a></li>
+			<li><a href="http://php.net/fputs">fputs()</a></li>
+			<li><a href="http://php.net/fread">fread()</a></li>
+			<li><a href="http://php.net/fseek">fseek()</a></li>
+			<li><a href="http://php.net/fstat">fstat()</a></li>
+			<li><a href="http://php.net/ftell">ftell()</a></li>
+			<li><a href="http://php.net/fwrite">fwrite()</a></li>
+			<li><a href="http://php.net/is_dir">is_dir()</a></li>
+			<li><a href="http://php.net/is_file">is_file()</a></li>
+			<li><a href="http://php.net/is_readable">is_readable()</a></li>
+			<li><a href="http://php.net/is_writable">is_writable()</a></li>
+			<li><a href="http://php.net/mkdir">mkdir()</a></li>
+			<li><a href="http://php.net/open_dir">open_dir()</a></li>
+			<li><a href="http://php.net/read_dir">read_dir()</a></li>
+			<li><a href="http://php.net/rewind">rewind()</a></li>
+			<li><a href="http://php.net/rewinddir">rewinddir()</a></li>
+			<li><a href="http://php.net/rmdir">rmdir()</a></li>
+			<li><a href="http://php.net/scandir">scandir()</a></li>
+			<li><a href="http://php.net/stream_get_contents">stream_get_contents()</a></li>
+			<li><a href="http://php.net/unlink">unlink()</a></li>
+		</ul>
+
+		<h2>Known issues with</h2>
+		<ul>
+			<li><a href="http://php.net/chgrp">chgrp()</a></li>
+			<li><a href="http://php.net/chmod">chmod()</a></li>
+			<li><a href="http://php.net/chown">chown()</a></li>
+			<li><a href="http://php.net/fputcsv">fputcsv()</a></li>
+			<li><a href="http://php.net/glob">glob()</a></li>
+			<li><a href="http://php.net/realpath">realpath()</a></li>
+			<li><a href="http://php.net/tempnam">tempnam()</a></li>
+			<li><a href="http://php.net/touch">touch()</a></li>
+		</ul>
+
+		<p>A future version <em>may</em> provide S3-specific implementations of some of these functions (e.g., <code>s3chmod()</code>, <code>s3glob()</code>, <code>s3touch()</code>).</p>
+	</body>
+</html>
diff --git a/3rdparty/aws-sdk/_docs/WHERE_IS_THE_API_REFERENCE.md b/3rdparty/aws-sdk/_docs/WHERE_IS_THE_API_REFERENCE.md
new file mode 100644
index 0000000000..7ad235576b
--- /dev/null
+++ b/3rdparty/aws-sdk/_docs/WHERE_IS_THE_API_REFERENCE.md
@@ -0,0 +1,2 @@
+You can find the API Reference at:
+http://docs.amazonwebservices.com/AWSSDKforPHP/latest/
diff --git a/3rdparty/aws-sdk/authentication/signable.interface.php b/3rdparty/aws-sdk/authentication/signable.interface.php
new file mode 100644
index 0000000000..5316d16a81
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signable.interface.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// INTERFACE
+
+/**
+ * The interface implemented by all signing classes.
+ *
+ * @version 2011.11.22
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+interface Signable
+{
+	/**
+	 * Constructs a new instance of the implementing class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials);
+
+	/**
+	 * Generates a cURL handle with all of the required authentication bits set.
+	 *
+	 * @return resource A cURL handle ready for executing.
+	 */
+	public function authenticate();
+}
diff --git a/3rdparty/aws-sdk/authentication/signature_v2query.class.php b/3rdparty/aws-sdk/authentication/signature_v2query.class.php
new file mode 100644
index 0000000000..a91190e1a2
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signature_v2query.class.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Implements support for Signature v2 (AWS Query).
+ *
+ * @version 2011.11.22
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class AuthV2Query extends Signer implements Signable
+{
+	/**
+	 * Constructs a new instance of the <AuthV2Query> class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials)
+	{
+		parent::__construct($endpoint, $operation, $payload, $credentials);
+	}
+
+	/**
+	 * Generates a cURL handle with all of the required authentication bits set.
+	 *
+	 * @return resource A cURL handle ready for executing.
+	 */
+	public function authenticate()
+	{
+		// Determine signing values
+		$current_time = time();
+		$date = gmdate(CFUtilities::DATE_FORMAT_RFC2616, $current_time);
+		$timestamp = gmdate(CFUtilities::DATE_FORMAT_ISO8601, $current_time);
+		$query = array();
+
+		// Do we have an authentication token?
+		if ($this->auth_token)
+		{
+			$headers['X-Amz-Security-Token'] = $this->auth_token;
+			$query['SecurityToken'] = $this->auth_token;
+		}
+
+		// Only add it if it exists.
+		if ($this->api_version)
+		{
+			$query['Version'] = $this->api_version;
+		}
+
+		$query['Action'] = $this->operation;
+		$query['AWSAccessKeyId'] = $this->key;
+		$query['SignatureMethod'] = 'HmacSHA256';
+		$query['SignatureVersion'] = 2;
+		$query['Timestamp'] = $timestamp;
+
+		// Merge in any options that were passed in
+		if (is_array($this->payload))
+		{
+			$query = array_merge($query, $this->payload);
+		}
+
+		// Do a case-sensitive, natural order sort on the array keys.
+		uksort($query, 'strcmp');
+
+		// Create the string that needs to be hashed.
+		$canonical_query_string = $this->util->to_signable_string($query);
+
+		// Remove the default scheme from the domain.
+		$domain = str_replace(array('http://', 'https://'), '', $this->endpoint);
+
+		// Parse our request.
+		$parsed_url = parse_url('http://' . $domain);
+
+		// Set the proper host header.
+		if (isset($parsed_url['port']) && (integer) $parsed_url['port'] !== 80 && (integer) $parsed_url['port'] !== 443)
+		{
+			$host_header = strtolower($parsed_url['host']) . ':' . $parsed_url['port'];
+		}
+		else
+		{
+			$host_header = strtolower($parsed_url['host']);
+		}
+
+		// Set the proper request URI.
+		$request_uri = isset($parsed_url['path']) ? $parsed_url['path'] : '/';
+
+		// Prepare the string to sign
+		$this->string_to_sign = "POST\n$host_header\n$request_uri\n$canonical_query_string";
+
+		// Hash the AWS secret key and generate a signature for the request.
+		$query['Signature'] = base64_encode(hash_hmac('sha256', $this->string_to_sign, $this->secret_key, true));
+
+		// Generate the querystring from $query
+		$this->querystring = $this->util->to_query_string($query);
+
+		// Gather information to pass along to other classes.
+		$helpers = array(
+			'utilities' => $this->utilities_class,
+			'request' => $this->request_class,
+			'response' => $this->response_class,
+		);
+
+		// Compose the request.
+		$request_url = ($this->use_ssl ? 'https://' : 'http://') . $domain;
+		$request_url .= !isset($parsed_url['path']) ? '/' : '';
+
+		// Instantiate the request class
+		$request = new $this->request_class($request_url, $this->proxy, $helpers, $this->credentials);
+		$request->set_method('POST');
+		$request->set_body($this->querystring);
+		$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+
+		// Pass along registered stream callbacks
+		if ($this->registered_streaming_read_callback)
+		{
+			$request->register_streaming_read_callback($this->registered_streaming_read_callback);
+		}
+
+		if ($this->registered_streaming_write_callback)
+		{
+			$request->register_streaming_write_callback($this->registered_streaming_write_callback);
+		}
+
+		// Sort headers
+		uksort($headers, 'strnatcasecmp');
+
+		// Add headers to request and compute the string to sign
+		foreach ($headers as $header_key => $header_value)
+		{
+			// Strip linebreaks from header values as they're illegal and can allow for security issues
+			$header_value = str_replace(array("\r", "\n"), '', $header_value);
+
+			// Add the header if it has a value
+			if ($header_value !== '')
+			{
+				$request->add_header($header_key, $header_value);
+			}
+		}
+
+		return $request;
+	}
+}
diff --git a/3rdparty/aws-sdk/authentication/signature_v3json.class.php b/3rdparty/aws-sdk/authentication/signature_v3json.class.php
new file mode 100644
index 0000000000..d07f554d1f
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signature_v3json.class.php
@@ -0,0 +1,235 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Implements support for Signature v3 (JSON).
+ *
+ * @version 2011.12.08
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class AuthV3JSON extends Signer implements Signable
+{
+	/**
+	 * Constructs a new instance of the <AuthV3JSON> class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials)
+	{
+		parent::__construct($endpoint, $operation, $payload, $credentials);
+	}
+
+	/**
+	 * Generates a cURL handle with all of the required authentication bits set.
+	 *
+	 * @return resource A cURL handle ready for executing.
+	 */
+	public function authenticate()
+	{
+		// Determine signing values
+		$current_time = time();
+		$date = gmdate(CFUtilities::DATE_FORMAT_RFC2616, $current_time);
+		$timestamp = gmdate(CFUtilities::DATE_FORMAT_ISO8601, $current_time);
+		$nonce = $this->util->generate_guid();
+		$curlopts = array();
+		$signed_headers = array();
+		$return_curl_handle = false;
+		$x_amz_target = null;
+		$query = array('body' => $this->payload);
+
+		// Do we have an authentication token?
+		if ($this->auth_token)
+		{
+			$headers['X-Amz-Security-Token'] = $this->auth_token;
+			$query['SecurityToken'] = $this->auth_token;
+		}
+
+		// Manage the key-value pairs that are used in the query.
+		if (stripos($this->operation, 'x-amz-target') !== false)
+		{
+			$x_amz_target = trim(str_ireplace('x-amz-target:', '', $this->operation));
+		}
+		else
+		{
+			$query['Action'] = $this->operation;
+		}
+
+		// Only add it if it exists.
+		if ($this->api_version)
+		{
+			$query['Version'] = $this->api_version;
+		}
+
+		$curlopts = array();
+
+		// Set custom CURLOPT settings
+		if (is_array($this->payload) && isset($this->payload['curlopts']))
+		{
+			$curlopts = $this->payload['curlopts'];
+			unset($this->payload['curlopts']);
+		}
+
+		// Merge in any options that were passed in
+		if (is_array($this->payload))
+		{
+			$query = array_merge($query, $this->payload);
+		}
+
+		$return_curl_handle = isset($query['returnCurlHandle']) ? $query['returnCurlHandle'] : false;
+		unset($query['returnCurlHandle']);
+
+		// Do a case-sensitive, natural order sort on the array keys.
+		uksort($query, 'strcmp');
+
+		// Normalize JSON input
+		if (isset($query['body']) && $query['body'] === '[]')
+		{
+			$query['body'] = '{}';
+		}
+
+		// Create the string that needs to be hashed.
+		$canonical_query_string = $this->util->encode_signature2($query['body']);
+
+		// Remove the default scheme from the domain.
+		$domain = str_replace(array('http://', 'https://'), '', $this->endpoint);
+
+		// Parse our request.
+		$parsed_url = parse_url('http://' . $domain);
+
+		// Set the proper host header.
+		if (isset($parsed_url['port']) && (integer) $parsed_url['port'] !== 80 && (integer) $parsed_url['port'] !== 443)
+		{
+			$host_header = strtolower($parsed_url['host']) . ':' . $parsed_url['port'];
+		}
+		else
+		{
+			$host_header = strtolower($parsed_url['host']);
+		}
+
+		// Set the proper request URI.
+		$request_uri = isset($parsed_url['path']) ? $parsed_url['path'] : '/';
+
+		// Generate the querystring from $query
+		$this->querystring = $this->util->to_query_string($query);
+
+		// Gather information to pass along to other classes.
+		$helpers = array(
+			'utilities' => $this->utilities_class,
+			'request' => $this->request_class,
+			'response' => $this->response_class,
+		);
+
+		// Compose the request.
+		$request_url = ($this->use_ssl ? 'https://' : 'http://') . $domain;
+		$request_url .= !isset($parsed_url['path']) ? '/' : '';
+
+		// Instantiate the request class
+		$request = new $this->request_class($request_url, $this->proxy, $helpers, $this->credentials);
+		$request->set_method('POST');
+		//$request->set_body($this->querystring);
+		//$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+
+		// Signing using X-Amz-Target is handled differently.
+		$headers['X-Amz-Target'] = $x_amz_target;
+		$headers['Content-Type'] = 'application/x-amz-json-1.0';
+		$request->set_body($query['body']);
+		$this->querystring = $query['body'];
+
+		// Pass along registered stream callbacks
+		if ($this->registered_streaming_read_callback)
+		{
+			$request->register_streaming_read_callback($this->registered_streaming_read_callback);
+		}
+
+		if ($this->registered_streaming_write_callback)
+		{
+			$request->register_streaming_write_callback($this->registered_streaming_write_callback);
+		}
+
+		// Add authentication headers
+		// $headers['X-Amz-Nonce'] = $nonce;
+		$headers['Date'] = $date;
+		$headers['Content-Length'] = strlen($this->querystring);
+		$headers['Content-MD5'] = $this->util->hex_to_base64(md5($this->querystring));
+		$headers['Host'] = $host_header;
+
+		// Sort headers
+		uksort($headers, 'strnatcasecmp');
+
+		// Prepare the string to sign (HTTP)
+		$this->string_to_sign = "POST\n$request_uri\n\n";
+
+		// Add headers to request and compute the string to sign
+		foreach ($headers as $header_key => $header_value)
+		{
+			// Strip linebreaks from header values as they're illegal and can allow for security issues
+			$header_value = str_replace(array("\r", "\n"), '', $header_value);
+
+			// Add the header if it has a value
+			if ($header_value !== '')
+			{
+				$request->add_header($header_key, $header_value);
+			}
+
+			// Generate the string to sign
+			if (
+				substr(strtolower($header_key), 0, 8) === 'content-' ||
+				strtolower($header_key) === 'date' ||
+				strtolower($header_key) === 'expires' ||
+				strtolower($header_key) === 'host' ||
+				substr(strtolower($header_key), 0, 6) === 'x-amz-'
+			)
+			{
+				$this->string_to_sign .= strtolower($header_key) . ':' . $header_value . "\n";
+				$signed_headers[] = $header_key;
+			}
+		}
+
+		$this->string_to_sign .= "\n";
+
+		if (isset($query['body']) && $query['body'] !== '')
+		{
+			$this->string_to_sign .= $query['body'];
+		}
+
+		// Convert from string-to-sign to bytes-to-sign
+		$bytes_to_sign = hash('sha256', $this->string_to_sign, true);
+
+		// Hash the AWS secret key and generate a signature for the request.
+		$signature = base64_encode(hash_hmac('sha256', $bytes_to_sign, $this->secret_key, true));
+
+		$headers['X-Amzn-Authorization'] = 'AWS3'
+			. ' AWSAccessKeyId=' . $this->key
+			. ',Algorithm=HmacSHA256'
+			. ',SignedHeaders=' . implode(';', $signed_headers)
+			. ',Signature=' . $signature;
+
+		$request->add_header('X-Amzn-Authorization', $headers['X-Amzn-Authorization']);
+		$request->request_headers = $headers;
+
+		return $request;
+	}
+}
diff --git a/3rdparty/aws-sdk/authentication/signature_v3query.class.php b/3rdparty/aws-sdk/authentication/signature_v3query.class.php
new file mode 100644
index 0000000000..04565f928e
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signature_v3query.class.php
@@ -0,0 +1,192 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Implements support for Signature v3 (AWS Query).
+ *
+ * @version 2011.11.22
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class AuthV3Query extends Signer implements Signable
+{
+	/**
+	 * Constructs a new instance of the <AuthV3Query> class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials)
+	{
+		parent::__construct($endpoint, $operation, $payload, $credentials);
+	}
+
+	/**
+	 * Generates a cURL handle with all of the required authentication bits set.
+	 *
+	 * @return resource A cURL handle ready for executing.
+	 */
+	public function authenticate()
+	{
+		// Determine signing values
+		$current_time = time();
+		$date = gmdate(CFUtilities::DATE_FORMAT_RFC2616, $current_time);
+		$timestamp = gmdate(CFUtilities::DATE_FORMAT_ISO8601, $current_time);
+		$nonce = $this->util->generate_guid();
+		$curlopts = array();
+		$signed_headers = array();
+
+		// Do we have an authentication token?
+		if ($this->auth_token)
+		{
+			$headers['X-Amz-Security-Token'] = $this->auth_token;
+			$query['SecurityToken'] = $this->auth_token;
+		}
+
+		$query['Action'] = $this->operation;
+		$query['Version'] = $this->api_version;
+
+		// Set custom CURLOPT settings
+		if (is_array($this->payload) && isset($this->payload['curlopts']))
+		{
+			$curlopts = $this->payload['curlopts'];
+			unset($this->payload['curlopts']);
+		}
+
+		// Merge in any options that were passed in
+		if (is_array($this->payload))
+		{
+			$query = array_merge($query, $this->payload);
+		}
+
+		$return_curl_handle = isset($query['returnCurlHandle']) ? $query['returnCurlHandle'] : false;
+		unset($query['returnCurlHandle']);
+
+		// Do a case-sensitive, natural order sort on the array keys.
+		uksort($query, 'strcmp');
+		$canonical_query_string = $this->util->to_signable_string($query);
+
+		// Remove the default scheme from the domain.
+		$domain = str_replace(array('http://', 'https://'), '', $this->endpoint);
+
+		// Parse our request.
+		$parsed_url = parse_url('http://' . $domain);
+
+		// Set the proper host header.
+		if (isset($parsed_url['port']) && (integer) $parsed_url['port'] !== 80 && (integer) $parsed_url['port'] !== 443)
+		{
+			$host_header = strtolower($parsed_url['host']) . ':' . $parsed_url['port'];
+		}
+		else
+		{
+			$host_header = strtolower($parsed_url['host']);
+		}
+
+		// Set the proper request URI.
+		$request_uri = isset($parsed_url['path']) ? $parsed_url['path'] : '/';
+
+		// Generate the querystring from $query
+		$this->querystring = $this->util->to_query_string($query);
+
+		// Gather information to pass along to other classes.
+		$helpers = array(
+			'utilities' => $this->utilities_class,
+			'request' => $this->request_class,
+			'response' => $this->response_class,
+		);
+
+		// Compose the request.
+		$request_url = ($this->use_ssl ? 'https://' : 'http://') . $domain;
+		$request_url .= !isset($parsed_url['path']) ? '/' : '';
+
+		// Instantiate the request class
+		$request = new $this->request_class($request_url, $this->proxy, $helpers, $this->credentials);
+		$request->set_method('POST');
+		$request->set_body($this->querystring);
+		$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+
+		// Pass along registered stream callbacks
+		if ($this->registered_streaming_read_callback)
+		{
+			$request->register_streaming_read_callback($this->registered_streaming_read_callback);
+		}
+
+		if ($this->registered_streaming_write_callback)
+		{
+			$request->register_streaming_write_callback($this->registered_streaming_write_callback);
+		}
+
+		// Add authentication headers
+		$headers['X-Amz-Nonce'] = $nonce;
+		$headers['Date'] = $date;
+		$headers['Content-Length'] = strlen($this->querystring);
+		$headers['Content-MD5'] = $this->util->hex_to_base64(md5($this->querystring));
+		$headers['Host'] = $host_header;
+
+		// Sort headers
+		uksort($headers, 'strnatcasecmp');
+
+		// Prepare the string to sign (HTTPS)
+		$this->string_to_sign = $date . $nonce;
+
+		// Add headers to request and compute the string to sign
+		foreach ($headers as $header_key => $header_value)
+		{
+			// Strip linebreaks from header values as they're illegal and can allow for security issues
+			$header_value = str_replace(array("\r", "\n"), '', $header_value);
+
+			// Add the header if it has a value
+			if ($header_value !== '')
+			{
+				$request->add_header($header_key, $header_value);
+			}
+
+			// Generate the string to sign
+			if (
+				substr(strtolower($header_key), 0, 8) === 'content-' ||
+				strtolower($header_key) === 'date' ||
+				strtolower($header_key) === 'expires' ||
+				strtolower($header_key) === 'host' ||
+				substr(strtolower($header_key), 0, 6) === 'x-amz-'
+			)
+			{
+				$signed_headers[] = $header_key;
+			}
+		}
+
+		// Hash the AWS secret key and generate a signature for the request.
+		$signature = base64_encode(hash_hmac('sha256', $this->string_to_sign, $this->secret_key, true));
+
+		$headers['X-Amzn-Authorization'] = 'AWS3-HTTPS'
+			. ' AWSAccessKeyId=' . $this->key
+			. ',Algorithm=HmacSHA256'
+			. ',SignedHeaders=' . implode(';', $signed_headers)
+			. ',Signature=' . $signature;
+
+		$request->add_header('X-Amzn-Authorization', $headers['X-Amzn-Authorization']);
+		$request->request_headers = $headers;
+
+		return $request;
+	}
+}
diff --git a/3rdparty/aws-sdk/authentication/signature_v4json.class.php b/3rdparty/aws-sdk/authentication/signature_v4json.class.php
new file mode 100644
index 0000000000..d3ab07ad8b
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signature_v4json.class.php
@@ -0,0 +1,353 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Implements support for Signature v4 (Query).
+ *
+ * @version 2011.01.03
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class AuthV4JSON extends Signer implements Signable
+{
+	/**
+	 * Constructs a new instance of the <AuthV4Query> class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials)
+	{
+		parent::__construct($endpoint, $operation, $payload, $credentials);
+	}
+
+	/**
+	 * Generates a cURL handle with all of the required authentication bits set.
+	 *
+	 * @return resource A cURL handle ready for executing.
+	 */
+	public function authenticate()
+	{
+		// Determine signing values
+		$current_time = time();
+		$timestamp = gmdate(CFUtilities::DATE_FORMAT_SIGV4, $current_time);
+
+		// Initialize
+		$x_amz_target = null;
+
+		$this->headers = array();
+		$this->signed_headers = array();
+		$this->canonical_headers = array();
+		$this->query = array();
+
+		// Prepare JSON structure
+		$decoded = json_decode($this->payload, true);
+		$data = (array) (is_array($decoded) ? $decoded : $this->payload);
+		unset($data['curlopts']);
+		unset($data['returnCurlHandle']);
+		$this->body = json_encode($data);
+		if ($this->body === '' || $this->body === '[]')
+		{
+			$this->body = '{}';
+		}
+
+		// Do we have an authentication token?
+		if ($this->auth_token)
+		{
+			$this->headers['X-Amz-Security-Token'] = $this->auth_token;
+			$this->query['SecurityToken'] = $this->auth_token;
+		}
+
+		// Manage the key-value pairs that are used in the query.
+		if (stripos($this->operation, 'x-amz-target') !== false)
+		{
+			$x_amz_target = trim(str_ireplace('x-amz-target:', '', $this->operation));
+		}
+		else
+		{
+			$this->query['Action'] = $this->operation;
+		}
+
+		// Only add it if it exists.
+		if ($this->api_version)
+		{
+			$this->query['Version'] = $this->api_version;
+		}
+
+		// Do a case-sensitive, natural order sort on the array keys.
+		uksort($this->query, 'strcmp');
+
+		// Remove the default scheme from the domain.
+		$domain = str_replace(array('http://', 'https://'), '', $this->endpoint);
+
+		// Parse our request.
+		$parsed_url = parse_url('http://' . $domain);
+
+		// Set the proper host header.
+		if (isset($parsed_url['port']) && (integer) $parsed_url['port'] !== 80 && (integer) $parsed_url['port'] !== 443)
+		{
+			$host_header = strtolower($parsed_url['host']) . ':' . $parsed_url['port'];
+		}
+		else
+		{
+			$host_header = strtolower($parsed_url['host']);
+		}
+
+		// Generate the querystring from $this->query
+		$this->querystring = $this->util->to_query_string($this->query);
+
+		// Gather information to pass along to other classes.
+		$helpers = array(
+			'utilities' => $this->utilities_class,
+			'request' => $this->request_class,
+			'response' => $this->response_class,
+		);
+
+		// Compose the request.
+		$request_url = ($this->use_ssl ? 'https://' : 'http://') . $domain;
+		$request_url .= !isset($parsed_url['path']) ? '/' : '';
+
+		// Instantiate the request class
+		$request = new $this->request_class($request_url, $this->proxy, $helpers, $this->credentials);
+		$request->set_method('POST');
+		$request->set_body($this->body);
+		$this->querystring = $this->body;
+		$this->headers['Content-Type'] = 'application/x-amz-json-1.1';
+		$this->headers['X-Amz-Target'] = $x_amz_target;
+
+		// Pass along registered stream callbacks
+		if ($this->registered_streaming_read_callback)
+		{
+			$request->register_streaming_read_callback($this->registered_streaming_read_callback);
+		}
+
+		if ($this->registered_streaming_write_callback)
+		{
+			$request->register_streaming_write_callback($this->registered_streaming_write_callback);
+		}
+
+		// Add authentication headers
+		$this->headers['X-Amz-Date'] = $timestamp;
+		$this->headers['Content-Length'] = strlen($this->querystring);
+		$this->headers['Host'] = $host_header;
+
+		// Sort headers
+		uksort($this->headers, 'strnatcasecmp');
+
+		// Add headers to request and compute the string to sign
+		foreach ($this->headers as $header_key => $header_value)
+		{
+			// Strip linebreaks from header values as they're illegal and can allow for security issues
+			$header_value = str_replace(array("\r", "\n"), '', $header_value);
+
+			$request->add_header($header_key, $header_value);
+			$this->canonical_headers[] = strtolower($header_key) . ':' . $header_value;
+
+			$this->signed_headers[] = strtolower($header_key);
+		}
+
+		$this->headers['Authorization'] = $this->authorization($timestamp);
+		$request->add_header('Authorization', $this->headers['Authorization']);
+		$request->request_headers = $this->headers;
+
+		return $request;
+	}
+
+	/**
+	 * Generates the authorization string to use for the request.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The authorization string.
+	 */
+	protected function authorization($datetime)
+	{
+		$access_key_id = $this->key;
+
+		$parts = array();
+		$parts[] = "AWS4-HMAC-SHA256 Credential=${access_key_id}/" . $this->credential_string($datetime);
+		$parts[] = 'SignedHeaders=' . implode(';', $this->signed_headers);
+		$parts[] = 'Signature=' . $this->hex16($this->signature($datetime));
+
+		return implode(',', $parts);
+	}
+
+	/**
+	 * Calculate the signature.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The signature.
+	 */
+	protected function signature($datetime)
+	{
+		$k_date        = $this->hmac('AWS4' . $this->secret_key, substr($datetime, 0, 8));
+		$k_region      = $this->hmac($k_date, $this->region());
+		$k_service     = $this->hmac($k_region, $this->service());
+		$k_credentials = $this->hmac($k_service, 'aws4_request');
+		$signature     = $this->hmac($k_credentials, $this->string_to_sign($datetime));
+
+		return $signature;
+	}
+
+	/**
+	 * Calculate the string to sign.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The string to sign.
+	 */
+	protected function string_to_sign($datetime)
+	{
+		$parts = array();
+		$parts[] = 'AWS4-HMAC-SHA256';
+		$parts[] = $datetime;
+		$parts[] = $this->credential_string($datetime);
+		$parts[] = $this->hex16($this->hash($this->canonical_request()));
+
+		$this->string_to_sign = implode("\n", $parts);
+
+		return $this->string_to_sign;
+	}
+
+	/**
+	 * Generates the credential string to use for signing.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The credential string.
+	 */
+	protected function credential_string($datetime)
+	{
+		$parts = array();
+		$parts[] = substr($datetime, 0, 8);
+		$parts[] = $this->region();
+		$parts[] = $this->service();
+		$parts[] = 'aws4_request';
+
+		return implode('/', $parts);
+	}
+
+	/**
+	 * Calculate the canonical request.
+	 *
+	 * @return string The canonical request.
+	 */
+	protected function canonical_request()
+	{
+		$parts = array();
+		$parts[] = 'POST';
+		$parts[] = $this->canonical_uri();
+		$parts[] = ''; // $parts[] = $this->canonical_querystring();
+		$parts[] = implode("\n", $this->canonical_headers) . "\n";
+		$parts[] = implode(';', $this->signed_headers);
+		$parts[] = $this->hex16($this->hash($this->body));
+
+		$this->canonical_request = implode("\n", $parts);
+
+		return $this->canonical_request;
+	}
+
+	/**
+	 * The region ID to use in the signature.
+	 *
+	 * @return return The region ID.
+	 */
+	protected function region()
+	{
+		$pieces = explode('.', $this->endpoint);
+
+		// Handle cases with single/no region (i.e. service.region.amazonaws.com vs. service.amazonaws.com)
+		if (count($pieces < 4))
+		{
+			return 'us-east-1';
+		}
+
+		return $pieces[1];
+	}
+
+	/**
+	 * The service ID to use in the signature.
+	 *
+	 * @return return The service ID.
+	 */
+	protected function service()
+	{
+		$pieces = explode('.', $this->endpoint);
+		return $pieces[0];
+	}
+
+	/**
+	 * The request URI path.
+	 *
+	 * @return string The request URI path.
+	 */
+	protected function canonical_uri()
+	{
+		return '/';
+	}
+
+	/**
+	 * The canonical query string.
+	 *
+	 * @return string The canonical query string.
+	 */
+	protected function canonical_querystring()
+	{
+		if (!isset($this->canonical_querystring))
+		{
+			$this->canonical_querystring = $this->util->to_signable_string($this->query);
+		}
+
+		return $this->canonical_querystring;
+	}
+
+	/**
+	 * Hex16-pack the data.
+	 *
+	 * @param string $value (Required) The data to hex16 pack.
+	 * @return string The hex16-packed data.
+	 */
+	protected function hex16($value)
+	{
+		$result = unpack('H*', $value);
+		return reset($result);
+	}
+
+	/**
+	 * Applies HMAC SHA-256 encryption to the string, salted by the key.
+	 *
+	 * @return string Raw HMAC SHA-256 hashed string.
+	 */
+	protected function hmac($key, $string)
+	{
+		return hash_hmac('sha256', $string, $key, true);
+	}
+
+	/**
+	 * SHA-256 hashes the string.
+	 *
+	 * @return string Raw SHA-256 hashed string.
+	 */
+	protected function hash($string)
+	{
+		return hash('sha256', $string, true);
+	}
+}
diff --git a/3rdparty/aws-sdk/authentication/signature_v4query.class.php b/3rdparty/aws-sdk/authentication/signature_v4query.class.php
new file mode 100644
index 0000000000..bd5a3fbf5b
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signature_v4query.class.php
@@ -0,0 +1,345 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Implements support for Signature v4 (Query).
+ *
+ * @version 2011.01.03
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class AuthV4Query extends Signer implements Signable
+{
+	/**
+	 * Constructs a new instance of the <AuthV4Query> class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials)
+	{
+		parent::__construct($endpoint, $operation, $payload, $credentials);
+	}
+
+	/**
+	 * Generates a cURL handle with all of the required authentication bits set.
+	 *
+	 * @return resource A cURL handle ready for executing.
+	 */
+	public function authenticate()
+	{
+		// Determine signing values
+		$current_time = time();
+		$timestamp = gmdate(CFUtilities::DATE_FORMAT_SIGV4, $current_time);
+
+		// Initialize
+		$x_amz_target = null;
+
+		$this->headers = array();
+		$this->signed_headers = array();
+		$this->canonical_headers = array();
+		$this->query = array('body' => is_array($this->payload) ? $this->payload : array());
+
+		// Do we have an authentication token?
+		if ($this->auth_token)
+		{
+			$this->headers['X-Amz-Security-Token'] = $this->auth_token;
+			$this->query['body']['SecurityToken'] = $this->auth_token;
+		}
+
+		// Manage the key-value pairs that are used in the query.
+		if (stripos($this->operation, 'x-amz-target') !== false)
+		{
+			$x_amz_target = trim(str_ireplace('x-amz-target:', '', $this->operation));
+		}
+		else
+		{
+			$this->query['body']['Action'] = $this->operation;
+		}
+
+		// Only add it if it exists.
+		if ($this->api_version)
+		{
+			$this->query['body']['Version'] = $this->api_version;
+		}
+
+		// Do a case-sensitive, natural order sort on the array keys.
+		uksort($this->query['body'], 'strcmp');
+
+		// Remove the default scheme from the domain.
+		$domain = str_replace(array('http://', 'https://'), '', $this->endpoint);
+
+		// Parse our request.
+		$parsed_url = parse_url('http://' . $domain);
+
+		// Set the proper host header.
+		if (isset($parsed_url['port']) && (integer) $parsed_url['port'] !== 80 && (integer) $parsed_url['port'] !== 443)
+		{
+			$host_header = strtolower($parsed_url['host']) . ':' . $parsed_url['port'];
+		}
+		else
+		{
+			$host_header = strtolower($parsed_url['host']);
+		}
+
+		// Generate the querystring from $this->query
+		$this->querystring = $this->util->to_query_string($this->query);
+
+		// Gather information to pass along to other classes.
+		$helpers = array(
+			'utilities' => $this->utilities_class,
+			'request' => $this->request_class,
+			'response' => $this->response_class,
+		);
+
+		// Compose the request.
+		$request_url = ($this->use_ssl ? 'https://' : 'http://') . $domain;
+		$request_url .= !isset($parsed_url['path']) ? '/' : '';
+
+		// Instantiate the request class
+		$request = new $this->request_class($request_url, $this->proxy, $helpers, $this->credentials);
+		$request->set_method('POST');
+		$request->set_body($this->canonical_querystring());
+		$this->querystring = $this->canonical_querystring();
+
+		$this->headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+		$this->headers['X-Amz-Target'] = $x_amz_target;
+
+		// Pass along registered stream callbacks
+		if ($this->registered_streaming_read_callback)
+		{
+			$request->register_streaming_read_callback($this->registered_streaming_read_callback);
+		}
+
+		if ($this->registered_streaming_write_callback)
+		{
+			$request->register_streaming_write_callback($this->registered_streaming_write_callback);
+		}
+
+		// Add authentication headers
+		$this->headers['X-Amz-Date'] = $timestamp;
+		$this->headers['Content-Length'] = strlen($this->querystring);
+		$this->headers['Content-MD5'] = $this->util->hex_to_base64(md5($this->querystring));
+		$this->headers['Host'] = $host_header;
+
+		// Sort headers
+		uksort($this->headers, 'strnatcasecmp');
+
+		// Add headers to request and compute the string to sign
+		foreach ($this->headers as $header_key => $header_value)
+		{
+			// Strip linebreaks from header values as they're illegal and can allow for security issues
+			$header_value = str_replace(array("\r", "\n"), '', $header_value);
+
+			$request->add_header($header_key, $header_value);
+			$this->canonical_headers[] = strtolower($header_key) . ':' . $header_value;
+
+			$this->signed_headers[] = strtolower($header_key);
+		}
+
+		$this->headers['Authorization'] = $this->authorization($timestamp);
+
+		$request->add_header('Authorization', $this->headers['Authorization']);
+		$request->request_headers = $this->headers;
+
+		return $request;
+	}
+
+	/**
+	 * Generates the authorization string to use for the request.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The authorization string.
+	 */
+	protected function authorization($datetime)
+	{
+		$access_key_id = $this->key;
+
+		$parts = array();
+		$parts[] = "AWS4-HMAC-SHA256 Credential=${access_key_id}/" . $this->credential_string($datetime);
+		$parts[] = 'SignedHeaders=' . implode(';', $this->signed_headers);
+		$parts[] = 'Signature=' . $this->hex16($this->signature($datetime));
+
+		return implode(',', $parts);
+	}
+
+	/**
+	 * Calculate the signature.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The signature.
+	 */
+	protected function signature($datetime)
+	{
+		$k_date        = $this->hmac('AWS4' . $this->secret_key, substr($datetime, 0, 8));
+		$k_region      = $this->hmac($k_date, $this->region());
+		$k_service     = $this->hmac($k_region, $this->service());
+		$k_credentials = $this->hmac($k_service, 'aws4_request');
+		$signature     = $this->hmac($k_credentials, $this->string_to_sign($datetime));
+
+		return $signature;
+	}
+
+	/**
+	 * Calculate the string to sign.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The string to sign.
+	 */
+	protected function string_to_sign($datetime)
+	{
+		$parts = array();
+		$parts[] = 'AWS4-HMAC-SHA256';
+		$parts[] = $datetime;
+		$parts[] = $this->credential_string($datetime);
+		$parts[] = $this->hex16($this->hash($this->canonical_request()));
+
+		$this->string_to_sign = implode("\n", $parts);
+
+		return $this->string_to_sign;
+	}
+
+	/**
+	 * Generates the credential string to use for signing.
+	 *
+	 * @param string $datetime (Required) The current timestamp.
+	 * @return string The credential string.
+	 */
+	protected function credential_string($datetime)
+	{
+		$parts = array();
+		$parts[] = substr($datetime, 0, 8);
+		$parts[] = $this->region();
+		$parts[] = $this->service();
+		$parts[] = 'aws4_request';
+
+		return implode('/', $parts);
+	}
+
+	/**
+	 * Calculate the canonical request.
+	 *
+	 * @return string The canonical request.
+	 */
+	protected function canonical_request()
+	{
+		$parts = array();
+		$parts[] = 'POST';
+		$parts[] = $this->canonical_uri();
+		$parts[] = ''; // $parts[] = $this->canonical_querystring();
+		$parts[] = implode("\n", $this->canonical_headers) . "\n";
+		$parts[] = implode(';', $this->signed_headers);
+		$parts[] = $this->hex16($this->hash($this->canonical_querystring()));
+
+		$this->canonical_request = implode("\n", $parts);
+
+		return $this->canonical_request;
+	}
+
+	/**
+	 * The region ID to use in the signature.
+	 *
+	 * @return return The region ID.
+	 */
+	protected function region()
+	{
+		$pieces = explode('.', $this->endpoint);
+
+		// Handle cases with single/no region (i.e. service.region.amazonaws.com vs. service.amazonaws.com)
+		if (count($pieces < 4))
+		{
+			return 'us-east-1';
+		}
+
+		return $pieces[1];
+	}
+
+	/**
+	 * The service ID to use in the signature.
+	 *
+	 * @return return The service ID.
+	 */
+	protected function service()
+	{
+		$pieces = explode('.', $this->endpoint);
+		return ($pieces[0] === 'email') ? 'ses' : $pieces[0];
+	}
+
+	/**
+	 * The request URI path.
+	 *
+	 * @return string The request URI path.
+	 */
+	protected function canonical_uri()
+	{
+		return '/';
+	}
+
+	/**
+	 * The canonical query string.
+	 *
+	 * @return string The canonical query string.
+	 */
+	protected function canonical_querystring()
+	{
+		if (!isset($this->canonical_querystring))
+		{
+			$this->canonical_querystring = $this->util->to_signable_string($this->query['body']);
+		}
+
+		return $this->canonical_querystring;
+	}
+
+	/**
+	 * Hex16-pack the data.
+	 *
+	 * @param string $value (Required) The data to hex16 pack.
+	 * @return string The hex16-packed data.
+	 */
+	protected function hex16($value)
+	{
+		$result = unpack('H*', $value);
+		return reset($result);
+	}
+
+	/**
+	 * Applies HMAC SHA-256 encryption to the string, salted by the key.
+	 *
+	 * @return string Raw HMAC SHA-256 hashed string.
+	 */
+	protected function hmac($key, $string)
+	{
+		return hash_hmac('sha256', $string, $key, true);
+	}
+
+	/**
+	 * SHA-256 hashes the string.
+	 *
+	 * @return string Raw SHA-256 hashed string.
+	 */
+	protected function hash($string)
+	{
+		return hash('sha256', $string, true);
+	}
+}
diff --git a/3rdparty/aws-sdk/authentication/signer.abstract.php b/3rdparty/aws-sdk/authentication/signer.abstract.php
new file mode 100644
index 0000000000..f6bf7912f7
--- /dev/null
+++ b/3rdparty/aws-sdk/authentication/signer.abstract.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * The abstract class that serves as the base class that signer classes extend.
+ *
+ * @version 2011.11.22
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+abstract class Signer
+{
+	/**
+	 * The endpoint to direct the request to.
+	 */
+	public $endpoint;
+
+	/**
+	 * The operation to execute as a result of this request.
+	 */
+	public $operation;
+
+	/**
+	 * The options to use as part of the payload in the request.
+	 */
+	public $payload;
+
+	/**
+	 * The credentials to use for signing and making requests.
+	 */
+	public $credentials;
+
+
+	/**
+	 * Constructs a new instance of the implementing class.
+	 *
+	 * @param string $endpoint (Required) The endpoint to direct the request to.
+	 * @param string $operation (Required) The operation to execute as a result of this request.
+	 * @param array $payload (Required) The options to use as part of the payload in the request.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return void
+	 */
+	public function __construct($endpoint, $operation, $payload, CFCredential $credentials)
+	{
+		$this->endpoint = $endpoint;
+		$this->operation = $operation;
+		$this->payload = $payload;
+		$this->credentials = $credentials;
+	}
+}
diff --git a/3rdparty/aws-sdk/config-sample.inc.php b/3rdparty/aws-sdk/config-sample.inc.php
new file mode 100755
index 0000000000..93d2315b2f
--- /dev/null
+++ b/3rdparty/aws-sdk/config-sample.inc.php
@@ -0,0 +1,83 @@
+<?php if (!class_exists('CFRuntime')) die('No direct access allowed.');
+/**
+ * Stores your AWS account information. Add your account information, and then rename this file
+ * to 'config.inc.php'.
+ *
+ * @version 2011.12.14
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link http://aws.amazon.com/security-credentials AWS Security Credentials
+ */
+
+
+/*###################################################################################################
+
+	As of version 1.5, the AWS SDK for PHP uses the CFCredentials class to handle credentials.
+	This class has the advantage of being able to support multiple sets of credentials at a time,
+	including the ability for credential sets to inherit settings from other credential sets.
+
+	Some example uses are noted at https://gist.github.com/1478912
+
+	Notes:
+
+	* You can define one or more credential sets.
+
+	* Credential sets can be named anything that PHP allows for an associative array key;
+	  "production", "staging", etc., are just sample values. Feel free to rename them.
+
+	* A credential set only has four required entries: key, secret, default_cache_config and
+	  certificate_authority. Aside from these, you can add any additional bits of information
+	  you'd like to keep easily accessible (e.g., multi-factor authentication device key, your
+	  AWS Account ID, your canonical identifiers).
+
+	* Additional credential sets can inherit the properties of another credential set using the
+	  @inherit keyword.
+
+	* If more than one credential set is provided, a default credential set must be specified
+	  using the @default keyword.
+
+	* If you only have one credential set, you can set it to the @default keyword.
+
+	* View the documentation for the CFCredentials::set() method to view usage examples.
+
+###################################################################################################*/
+
+
+/**
+ * Create a list of credential sets that can be used with the SDK.
+ */
+CFCredentials::set(array(
+
+	// Credentials for the development environment.
+	'development' => array(
+
+		// Amazon Web Services Key. Found in the AWS Security Credentials. You can also pass
+		// this value as the first parameter to a service constructor.
+		'key' => 'development-key',
+
+		// Amazon Web Services Secret Key. Found in the AWS Security Credentials. You can also
+		// pass this value as the second parameter to a service constructor.
+		'secret' => 'development-secret',
+
+		// This option allows you to configure a preferred storage type to use for caching by
+		// default. This can be changed later using the set_cache_config() method.
+		//
+		// Valid values are: `apc`, `xcache`, or a file system path such as `./cache` or
+		// `/tmp/cache/`.
+		'default_cache_config' => '',
+
+		// Determines which Cerificate Authority file to use.
+		//
+		// A value of boolean `false` will use the Certificate Authority file available on the
+		// system. A value of boolean `true` will use the Certificate Authority provided by the
+		// SDK. Passing a file system path to a Certificate Authority file (chmodded to `0755`)
+		// will use that.
+		//
+		// Leave this set to `false` if you're not sure.
+		'certificate_authority' => false
+	),
+
+	// Specify a default credential set to use if there are more than one.
+	'@default' => 'development'
+));
diff --git a/3rdparty/aws-sdk/lib/dom/ArrayToDOMDocument.php b/3rdparty/aws-sdk/lib/dom/ArrayToDOMDocument.php
new file mode 100644
index 0000000000..06ad502eeb
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/dom/ArrayToDOMDocument.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @author Omer Hassan
+ * @author Ryan Parman
+ * @license MIT
+ */
+class Array2DOM
+{
+	const ATTRIBUTES = '__attributes__';
+	const CONTENT = '__content__';
+
+	/**
+	 * @param array $source
+	 * @param string $rootTagName
+	 * @return DOMDocument
+	 */
+	public static function arrayToDOMDocument(array $source, $rootTagName = 'root')
+	{
+		$document = new DOMDocument();
+		$document->appendChild(self::createDOMElement($source, $rootTagName, $document));
+
+		return $document;
+	}
+
+	/**
+	 * @param array $source
+	 * @param string $rootTagName
+	 * @param bool $formatOutput
+	 * @return string
+	 */
+	public static function arrayToXMLString(array $source, $rootTagName = 'root', $formatOutput = true)
+	{
+		$document = self::arrayToDOMDocument($source, $rootTagName);
+		$document->formatOutput = $formatOutput;
+
+		return $document->saveXML();
+	}
+
+	/**
+	 * @param DOMDocument $document
+	 * @return array
+	 */
+	public static function domDocumentToArray(DOMDocument $document)
+	{
+		return self::createArray($document->documentElement);
+	}
+
+	/**
+	 * @param string $xmlString
+	 * @return array
+	 */
+	public static function xmlStringToArray($xmlString)
+	{
+		$document = new DOMDocument();
+
+		return $document->loadXML($xmlString) ? self::domDocumentToArray($document) : array();
+	}
+
+	/**
+	 * @param mixed $source
+	 * @param string $tagName
+	 * @param DOMDocument $document
+	 * @return DOMNode
+	 */
+	private static function createDOMElement($source, $tagName, DOMDocument $document)
+	{
+		if (!is_array($source))
+		{
+			$element = $document->createElement($tagName);
+			$element->appendChild($document->createCDATASection($source));
+
+			return $element;
+		}
+
+		$element = $document->createElement($tagName);
+
+		foreach ($source as $key => $value)
+		{
+			if (is_string($key) && !is_numeric($key))
+			{
+				if ($key === self::ATTRIBUTES)
+				{
+					foreach ($value as $attributeName => $attributeValue)
+					{
+						 $element->setAttribute($attributeName, $attributeValue);
+					}
+				}
+				elseif ($key === self::CONTENT)
+				{
+					$element->appendChild($document->createCDATASection($value));
+				}
+				elseif (is_string($value) && !is_numeric($value))
+				{
+					$element->appendChild(self::createDOMElement($value, $key, $document));
+				}
+				elseif (is_array($value) && count($value))
+				{
+					$keyNode = $document->createElement($key);
+
+					foreach ($value as $elementKey => $elementValue)
+					{
+						if (is_string($elementKey) && !is_numeric($elementKey))
+						{
+							$keyNode->appendChild(self::createDOMElement($elementValue, $elementKey, $document));
+						}
+						else
+						{
+							$element->appendChild(self::createDOMElement($elementValue, $key, $document));
+						}
+					}
+
+					if ($keyNode->hasChildNodes())
+					{
+						$element->appendChild($keyNode);
+					}
+				}
+				else
+				{
+					if (is_bool($value))
+					{
+						$value = $value ? 'true' : 'false';
+					}
+
+					$element->appendChild(self::createDOMElement($value, $key, $document));
+				}
+			}
+			else
+			{
+				$element->appendChild(self::createDOMElement($value, $tagName, $document));
+			}
+		}
+
+		return $element;
+	}
+
+	/**
+	 * @param DOMNode $domNode
+	 * @return array
+	 */
+	private static function createArray(DOMNode $domNode)
+	{
+		$array = array();
+
+		for ($i = 0; $i < $domNode->childNodes->length; $i++)
+		{
+			$item = $domNode->childNodes->item($i);
+
+			if ($item->nodeType === XML_ELEMENT_NODE)
+			{
+				$arrayElement = array();
+
+				for ($attributeIndex = 0; !is_null($attribute = $item->attributes->item($attributeIndex)); $attributeIndex++)
+				{
+					if ($attribute->nodeType === XML_ATTRIBUTE_NODE)
+					{
+						$arrayElement[self::ATTRIBUTES][$attribute->nodeName] = $attribute->nodeValue;
+					}
+				}
+
+				$children = self::createArray($item);
+
+				if (is_array($children))
+				{
+					$arrayElement = array_merge($arrayElement, $children);
+				}
+				else
+				{
+					$arrayElement[self::CONTENT] = $children;
+				}
+
+				$array[$item->nodeName][] = $arrayElement;
+			}
+			elseif ($item->nodeType === XML_CDATA_SECTION_NODE || ($item->nodeType === XML_TEXT_NODE && trim($item->nodeValue) !== ''))
+			{
+				return $item->nodeValue;
+			}
+		}
+
+		return $array;
+	}
+}
diff --git a/3rdparty/aws-sdk/lib/requestcore/LICENSE b/3rdparty/aws-sdk/lib/requestcore/LICENSE
new file mode 100755
index 0000000000..49b38bd620
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/requestcore/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2006-2010 Ryan Parman, Foleeo Inc., and contributors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of
+	  conditions and the following disclaimer.
+
+	* Redistributions in binary form must reproduce the above copyright notice, this list
+	  of conditions and the following disclaimer in the documentation and/or other materials
+	  provided with the distribution.
+
+	* Neither the name of Ryan Parman, Foleeo Inc. nor the names of its contributors may be used to
+	  endorse or promote products derived from this software without specific prior written
+	  permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/3rdparty/aws-sdk/lib/requestcore/README.md b/3rdparty/aws-sdk/lib/requestcore/README.md
new file mode 100755
index 0000000000..373ea4dcca
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/requestcore/README.md
@@ -0,0 +1,15 @@
+# RequestCore
+
+RequestCore is a lightweight cURL-based HTTP request/response class that leverages MultiCurl for parallel requests.
+
+### PEAR HTTP_Request?
+
+RequestCore was written as a replacement for [PEAR HTTP_Request](http://pear.php.net/http_request/). While PEAR HTTP_Request is full-featured and heavy, RequestCore features only the essentials and is very lightweight. It also leverages the batch request support in cURL's `curl_multi_exec()` to enable multi-threaded requests that fire in parallel.
+
+### Reference and Download
+
+You can find the class reference at <http://skyzyx.github.com/requestcore/>. You can get the code from <http://github.com/skyzyx/requestcore>.
+
+### License and Copyright
+
+This code is Copyright (c) 2008-2010, Ryan Parman. However, I'm licensing this code for others to use under the [Simplified BSD license](http://www.opensource.org/licenses/bsd-license.php).
diff --git a/3rdparty/aws-sdk/lib/requestcore/cacert.pem b/3rdparty/aws-sdk/lib/requestcore/cacert.pem
new file mode 100755
index 0000000000..80bff62fd2
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/requestcore/cacert.pem
@@ -0,0 +1,3390 @@
+##
+## ca-bundle.crt -- Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Wed Jan 18 00:04:16 2012
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.81 $ $Date: 2012/01/17 22:02:37 $
+
+GTE CyberTrust Global Root
+==========================
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
+Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
+A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
+MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
+Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
+IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
+sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
+HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
+AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
+M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
+NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+Thawte Server CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
+dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
+AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
+b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
+BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
+c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
+A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
+/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
+1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
+GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
+GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+Thawte Premium Server CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
+dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
+AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
+ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
+AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
+VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
+aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
+cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
+Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
+qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
+SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
+8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
+UCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+Equifax Secure CA
+=================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
+ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
+MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
+B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
+fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
+8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
+A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
+CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
+A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
+spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
+Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
+zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
+BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
+70+sB3c4
+-----END CERTIFICATE-----
+
+Digital Signature Trust Co. Global CA 1
+=======================================
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
+ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
+MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
+NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
+o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
+BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
+IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
+MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
+BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
+kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
+RbyhkwS7hp86W0N6w4pl
+-----END CERTIFICATE-----
+
+Digital Signature Trust Co. Global CA 3
+=======================================
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
+ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
+MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
+VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
+xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
+BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
+IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
+MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
+BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
+up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
+mPnHfxsb1gYgAlihw6ID
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
+TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
+WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
+Tqj/ZA1k
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G2
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
+FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
+lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
+1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
+Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
+-----END CERTIFICATE-----
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+ValiCert Class 1 VA
+===================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
+MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
+GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
+DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
+lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
+icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
+Orf1LXLI
+-----END CERTIFICATE-----
+
+ValiCert Class 2 VA
+===================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
+MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
+CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
+ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
+SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
+UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
+W9ViH0Pd
+-----END CERTIFICATE-----
+
+RSA Root Certificate 1
+======================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
+MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
+3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
+BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
+3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
+V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
+on+jjBXu
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Verisign Class 4 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
+tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
+8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
+Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
+Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
+mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
+RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
+UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+Entrust.net Secure Server CA
+============================
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
+BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
+cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
+ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
+A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
+eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
+dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
+aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
+gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
+ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
+CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
+dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
+NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
+HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
+BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
+Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
+n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
+AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
+gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
+AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
+oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
+o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
+2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
+OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+Equifax Secure Global eBusiness CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
+bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
+HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
+b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
+PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
+qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
+hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
+BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
+MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
+I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
+NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 1
+=============================
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
+LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
+ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
+IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
+1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
+IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
+MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
+Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
+AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
+lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 2
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
+ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
+MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
+DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
+2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
+BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
+A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
+JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
+A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
+uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
+Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
+jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
+78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
+V+GRMOrN
+-----END CERTIFICATE-----
+
+AddTrust Low-Value Services Root
+================================
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
+cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
+CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
+ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
+54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
+oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
+Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
+GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
+HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
+RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
+HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
+ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
+iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
+mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
+ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+AddTrust Public Services Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
+cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
+BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
+dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
+nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
+d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
+Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
+HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
+A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
+A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
+JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
+Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
+EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+AddTrust Qualified Certificates Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
+cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
+CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
+IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
+64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
+KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
+L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
+wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
+MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
+BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
+azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
+GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
+RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
+iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+RSA Security 2048 v3
+====================
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
+ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
+MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
+BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
+Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
+WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
+KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
+MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
+FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
+v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
+0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
+VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
+nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
+pKnXwiJPZ9d37CAFYd4=
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Global CA 2
+====================
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
+MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
+NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
+LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
+Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
+HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
+K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
+srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
+ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
+OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
+x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
+H4z1Ir+rzoPz4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+America Online Root Certification Authority 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
+A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
+T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
+v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
+DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
+sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
+8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
+o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
+GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
+VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
+3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
+Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
+-----END CERTIFICATE-----
+
+America Online Root Certification Authority 2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
+A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
+T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
+fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
+f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
+qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
+RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
+gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
+6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
+FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
+Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
+B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
+aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
+T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
++DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
+JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
+zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
+ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
+1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
+GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
+Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
+cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Certum Root CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
+ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
+Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
+by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
+wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
+kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
+89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
+Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
+NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
+GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
+0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
+qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+Comodo Secure Services root
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
+MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
+Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
+BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
+9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
+rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
+oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
+p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
+FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
+YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
+aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
+4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
+DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
+pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
+RR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+Comodo Trusted Services root
+============================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
+MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
+bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
+IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
+3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
+/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
+juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
+ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
+DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
+ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
+cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
+uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
+BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
+R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
+9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
+ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
+HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
+bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
+vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
+jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
+C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
+vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
+22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
+HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
+dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
+BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
+EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
+MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
+nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+TDC Internet Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE
+ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx
+NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu
+ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j
+xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL
+znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc
+5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6
+otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI
+AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM
+VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM
+MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC
+AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe
+UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G
+CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m
+gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb
+O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU
+Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+TDC OCES Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UE
+ChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5
+MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuH
+nEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0
+zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvV
+iGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBde
+dObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO
+3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB
+5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5k
+ay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBm
+cmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZp
+Y2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4x
+LjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEM
+MAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYm
+aHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
+MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647
++RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6
+NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4
+A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYsc
+A+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9
+AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1
+AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw==
+-----END CERTIFICATE-----
+
+UTN DATACorp SGC Root CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
+BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
+MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
+HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
+dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
+raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
+wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
+9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
+33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
+DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
+BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
+LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
+DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
+I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
+EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
+DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+UTN USERFirst Hardware Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
+BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
+OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
+eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
+ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
+wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
+tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
+i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
+Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
+gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
+UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
+BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
+XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
+lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
+iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
+nfhmqA==
+-----END CERTIFICATE-----
+
+Camerfirma Chambers of Commerce Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
+NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
+cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
+MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
+AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
+xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
+NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
+DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
+d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
+cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
+AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
+bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
+VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
+fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
+L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
+UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
+ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
+erfutGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+Camerfirma Global Chambersign Root
+==================================
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
+NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
+YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
+MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
+ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
+1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
+by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
+6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
+8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
+BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
+aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
+Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
+aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
+ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
+PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
+gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
+PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
+IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
+t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+NetLock Notary (Class A) Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
+EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
+ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
+DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
+EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
+VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
+cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
+D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
+z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
+/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
+tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
+4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
+A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
+Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
+bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
+LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
+ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
+IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
+IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
+b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
+Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
+bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
+ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
+ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
+CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
+KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
+8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+NetLock Business (Class B) Root
+===============================
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
+VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
+VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
+bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
+VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
+o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
+1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
+HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
+RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
+dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
+ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
+c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
+YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
+Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
+bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
+IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
+YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
+cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
+43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
+stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+NetLock Express (Class C) Root
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
+BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
+ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
+W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
+euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
+DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
+RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
+YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
+IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
+aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
+ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
+emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
+IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
+UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
+YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
+xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
+gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
+YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
+AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
+Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
+U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
+LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
+cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
+dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
+AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
+3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
+vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
+fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
+fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
+EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
+1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
+lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
+g14=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+Firmaprofesional Root CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT
+GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp
+Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA
+ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL
+MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT
+OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2
+ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V
+j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH
+lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf
+3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8
+NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww
+KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG
+AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD
+ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf
+wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
+7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG
+VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+Wells Fargo Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
+BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
+bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
+MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
+x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
+E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
+OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
+sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
+YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
+BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
+ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
+m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
+OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
+x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
+tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 1
+==================
+-----BEGIN CERTIFICATE-----
+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
+NY6E0F/6MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+DST ACES CA X6
+==============
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
+MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
+MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
+CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
+DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
+pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
+GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
+MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
+Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
+dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
+CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
+5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
+Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
+vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
+oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 1
+==============================================
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
+MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
+MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
+TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
+aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
+yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
+Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
+8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
+W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
+BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
+sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
+q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
+nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
+MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
+dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
+LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
+x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
+QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
+5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
+AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
+Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
+9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
+UrbnBEI=
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+WellsSecure Public Root Certificate Authority
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
+F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
+NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
+bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
+VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
+iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
+i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
+bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
+K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
+AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
+cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
+lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
+i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
+GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
+K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
+bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
+qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
+E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
+tylv2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+IGC/A
+=====
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
+VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
+Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
+MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
+EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
+STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
+TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
+So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
+HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
+frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
+tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
+egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
+iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
+q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
+MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
+lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
+0mBWWg==
+-----END CERTIFICATE-----
+
+Security Communication EV RootCA1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
+BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
+Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
+/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
+WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
+ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
+bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
+9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
+iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
+Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
+mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
+T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
+BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
+EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
+MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
+dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
+GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
+d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
+oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
+QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
+PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
+MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
+IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
+VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
+LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
+dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
+4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
+AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
+egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
+Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
+PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
+c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
+cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
+IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
+WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
+MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
+Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
+HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
+nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
+aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
+yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
+S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
+======================================
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
+AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
+LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
+HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
+U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
+IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
+yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
+2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
+4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
+2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
+8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
+HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
+Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
+5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
+czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
+ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
+BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
+cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
+AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
+EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
+/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
+MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
+3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
+eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
+/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
+RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
+Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+TC TrustCenter Class 2 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
+MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
+IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
+xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
+Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
+SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
+dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
+KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
+TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
+JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
+vQ==
+-----END CERTIFICATE-----
+
+TC TrustCenter Class 3 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
+MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
+yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
+6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
+uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
+2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
+O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
+yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
+IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
+092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
+5A==
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA I
+=============================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
+MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
+VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
+JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
+qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
+xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
+ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
+gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
+BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
+1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
+vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
+ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
+7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+ComSign Secured CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
+AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
+NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
+QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
+49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
+7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
+kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
+9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
+AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
+U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
+j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
+AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
+BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
+FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
+51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+Buypass Class 3 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
+MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
+ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
+n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
+AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
+1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
+pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
+EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
+htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
+el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+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
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
+CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
+bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
+D/xwzoiQ
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+===================================================
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
+ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
+MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
+cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
+aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
+8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
+jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
+JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
+9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
+SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
+F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
+D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
+Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA III
+===============================
+-----BEGIN CERTIFICATE-----
+MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
+Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
+QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
+KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
+QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
+juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
+CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
+M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
+A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
+g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
+KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
+BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
+CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
+woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - Autorité Racine
+=============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+Root CA Generalitat Valenciana
+==============================
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
+ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
+IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
+WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
+CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
+F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
+ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
+D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
+JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
+AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
+dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
+ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
+AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
+YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
+AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
+AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
+YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
+AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
+OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
+dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
+BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
+b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
+TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
+Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
+NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
+iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+A-Trust-nQual-03
+================
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
+Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
+a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
+dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
+RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
+ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
+c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
+zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
+yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
+SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
+iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
+cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
+eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
+ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
+sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
+JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
+ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
diff --git a/3rdparty/aws-sdk/lib/requestcore/requestcore.class.php b/3rdparty/aws-sdk/lib/requestcore/requestcore.class.php
new file mode 100755
index 0000000000..087694f08c
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/requestcore/requestcore.class.php
@@ -0,0 +1,1028 @@
+<?php
+/**
+ * Handles all HTTP requests using cURL and manages the responses.
+ *
+ * @version 2012.01.17
+ * @copyright 2006-2011 Ryan Parman
+ * @copyright 2006-2010 Foleeo Inc.
+ * @copyright 2010-2011 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2011 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ */
+class RequestCore
+{
+	/**
+	 * The URL being requested.
+	 */
+	public $request_url;
+
+	/**
+	 * The headers being sent in the request.
+	 */
+	public $request_headers;
+
+	/**
+	 * The body being sent in the request.
+	 */
+	public $request_body;
+
+	/**
+	 * The response returned by the request.
+	 */
+	public $response;
+
+	/**
+	 * The headers returned by the request.
+	 */
+	public $response_headers;
+
+	/**
+	 * The body returned by the request.
+	 */
+	public $response_body;
+
+	/**
+	 * The HTTP status code returned by the request.
+	 */
+	public $response_code;
+
+	/**
+	 * Additional response data.
+	 */
+	public $response_info;
+
+	/**
+	 * The handle for the cURL object.
+	 */
+	public $curl_handle;
+
+	/**
+	 * The method by which the request is being made.
+	 */
+	public $method;
+
+	/**
+	 * Stores the proxy settings to use for the request.
+	 */
+	public $proxy = null;
+
+	/**
+	 * The username to use for the request.
+	 */
+	public $username = null;
+
+	/**
+	 * The password to use for the request.
+	 */
+	public $password = null;
+
+	/**
+	 * Custom CURLOPT settings.
+	 */
+	public $curlopts = null;
+
+	/**
+	 * The state of debug mode.
+	 */
+	public $debug_mode = false;
+
+	/**
+	 * The default class to use for HTTP Requests (defaults to <RequestCore>).
+	 */
+	public $request_class = 'RequestCore';
+
+	/**
+	 * The default class to use for HTTP Responses (defaults to <ResponseCore>).
+	 */
+	public $response_class = 'ResponseCore';
+
+	/**
+	 * Default useragent string to use.
+	 */
+	public $useragent = 'RequestCore/1.4.4';
+
+	/**
+	 * File to read from while streaming up.
+	 */
+	public $read_file = null;
+
+	/**
+	 * The resource to read from while streaming up.
+	 */
+	public $read_stream = null;
+
+	/**
+	 * The size of the stream to read from.
+	 */
+	public $read_stream_size = null;
+
+	/**
+	 * The length already read from the stream.
+	 */
+	public $read_stream_read = 0;
+
+	/**
+	 * File to write to while streaming down.
+	 */
+	public $write_file = null;
+
+	/**
+	 * The resource to write to while streaming down.
+	 */
+	public $write_stream = null;
+
+	/**
+	 * Stores the intended starting seek position.
+	 */
+	public $seek_position = null;
+
+	/**
+	 * The location of the cacert.pem file to use.
+	 */
+	public $cacert_location = false;
+
+	/**
+	 * The state of SSL certificate verification.
+	 */
+	public $ssl_verification = true;
+
+	/**
+	 * The user-defined callback function to call when a stream is read from.
+	 */
+	public $registered_streaming_read_callback = null;
+
+	/**
+	 * The user-defined callback function to call when a stream is written to.
+	 */
+	public $registered_streaming_write_callback = null;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTANTS
+
+	/**
+	 * GET HTTP Method
+	 */
+	const HTTP_GET = 'GET';
+
+	/**
+	 * POST HTTP Method
+	 */
+	const HTTP_POST = 'POST';
+
+	/**
+	 * PUT HTTP Method
+	 */
+	const HTTP_PUT = 'PUT';
+
+	/**
+	 * DELETE HTTP Method
+	 */
+	const HTTP_DELETE = 'DELETE';
+
+	/**
+	 * HEAD HTTP Method
+	 */
+	const HTTP_HEAD = 'HEAD';
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR/DESTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $url (Optional) The URL to request or service endpoint to query.
+	 * @param string $proxy (Optional) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
+	 * @param array $helpers (Optional) An associative array of classnames to use for request, and response functionality. Gets passed in automatically by the calling class.
+	 * @return $this A reference to the current instance.
+	 */
+	public function __construct($url = null, $proxy = null, $helpers = null)
+	{
+		// Set some default values.
+		$this->request_url = $url;
+		$this->method = self::HTTP_GET;
+		$this->request_headers = array();
+		$this->request_body = '';
+
+		// Set a new Request class if one was set.
+		if (isset($helpers['request']) && !empty($helpers['request']))
+		{
+			$this->request_class = $helpers['request'];
+		}
+
+		// Set a new Request class if one was set.
+		if (isset($helpers['response']) && !empty($helpers['response']))
+		{
+			$this->response_class = $helpers['response'];
+		}
+
+		if ($proxy)
+		{
+			$this->set_proxy($proxy);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Destructs the instance. Closes opened file handles.
+	 *
+	 * @return $this A reference to the current instance.
+	 */
+	public function __destruct()
+	{
+		if (isset($this->read_file) && isset($this->read_stream))
+		{
+			fclose($this->read_stream);
+		}
+
+		if (isset($this->write_file) && isset($this->write_stream))
+		{
+			fclose($this->write_stream);
+		}
+
+		return $this;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// REQUEST METHODS
+
+	/**
+	 * Sets the credentials to use for authentication.
+	 *
+	 * @param string $user (Required) The username to authenticate with.
+	 * @param string $pass (Required) The password to authenticate with.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_credentials($user, $pass)
+	{
+		$this->username = $user;
+		$this->password = $pass;
+		return $this;
+	}
+
+	/**
+	 * Adds a custom HTTP header to the cURL request.
+	 *
+	 * @param string $key (Required) The custom HTTP header to set.
+	 * @param mixed $value (Required) The value to assign to the custom HTTP header.
+	 * @return $this A reference to the current instance.
+	 */
+	public function add_header($key, $value)
+	{
+		$this->request_headers[$key] = $value;
+		return $this;
+	}
+
+	/**
+	 * Removes an HTTP header from the cURL request.
+	 *
+	 * @param string $key (Required) The custom HTTP header to set.
+	 * @return $this A reference to the current instance.
+	 */
+	public function remove_header($key)
+	{
+		if (isset($this->request_headers[$key]))
+		{
+			unset($this->request_headers[$key]);
+		}
+		return $this;
+	}
+
+	/**
+	 * Set the method type for the request.
+	 *
+	 * @param string $method (Required) One of the following constants: <HTTP_GET>, <HTTP_POST>, <HTTP_PUT>, <HTTP_HEAD>, <HTTP_DELETE>.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_method($method)
+	{
+		$this->method = strtoupper($method);
+		return $this;
+	}
+
+	/**
+	 * Sets a custom useragent string for the class.
+	 *
+	 * @param string $ua (Required) The useragent string to use.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_useragent($ua)
+	{
+		$this->useragent = $ua;
+		return $this;
+	}
+
+	/**
+	 * Set the body to send in the request.
+	 *
+	 * @param string $body (Required) The textual content to send along in the body of the request.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_body($body)
+	{
+		$this->request_body = $body;
+		return $this;
+	}
+
+	/**
+	 * Set the URL to make the request to.
+	 *
+	 * @param string $url (Required) The URL to make the request to.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_request_url($url)
+	{
+		$this->request_url = $url;
+		return $this;
+	}
+
+	/**
+	 * Set additional CURLOPT settings. These will merge with the default settings, and override if
+	 * there is a duplicate.
+	 *
+	 * @param array $curlopts (Optional) A set of key-value pairs that set `CURLOPT` options. These will merge with the existing CURLOPTs, and ones passed here will override the defaults. Keys should be the `CURLOPT_*` constants, not strings.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_curlopts($curlopts)
+	{
+		$this->curlopts = $curlopts;
+		return $this;
+	}
+
+	/**
+	 * Sets the length in bytes to read from the stream while streaming up.
+	 *
+	 * @param integer $size (Required) The length in bytes to read from the stream.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_read_stream_size($size)
+	{
+		$this->read_stream_size = $size;
+
+		return $this;
+	}
+
+	/**
+	 * Sets the resource to read from while streaming up. Reads the stream from its current position until
+	 * EOF or `$size` bytes have been read. If `$size` is not given it will be determined by <php:fstat()> and
+	 * <php:ftell()>.
+	 *
+	 * @param resource $resource (Required) The readable resource to read from.
+	 * @param integer $size (Optional) The size of the stream to read.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_read_stream($resource, $size = null)
+	{
+		if (!isset($size) || $size < 0)
+		{
+			$stats = fstat($resource);
+
+			if ($stats && $stats['size'] >= 0)
+			{
+				$position = ftell($resource);
+
+				if ($position !== false && $position >= 0)
+				{
+					$size = $stats['size'] - $position;
+				}
+			}
+		}
+
+		$this->read_stream = $resource;
+
+		return $this->set_read_stream_size($size);
+	}
+
+	/**
+	 * Sets the file to read from while streaming up.
+	 *
+	 * @param string $location (Required) The readable location to read from.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_read_file($location)
+	{
+		$this->read_file = $location;
+		$read_file_handle = fopen($location, 'r');
+
+		return $this->set_read_stream($read_file_handle);
+	}
+
+	/**
+	 * Sets the resource to write to while streaming down.
+	 *
+	 * @param resource $resource (Required) The writeable resource to write to.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_write_stream($resource)
+	{
+		$this->write_stream = $resource;
+
+		return $this;
+	}
+
+	/**
+	 * Sets the file to write to while streaming down.
+	 *
+	 * @param string $location (Required) The writeable location to write to.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_write_file($location)
+	{
+		$this->write_file = $location;
+		$write_file_handle = fopen($location, 'w');
+
+		return $this->set_write_stream($write_file_handle);
+	}
+
+	/**
+	 * Set the proxy to use for making requests.
+	 *
+	 * @param string $proxy (Required) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_proxy($proxy)
+	{
+		$proxy = parse_url($proxy);
+		$proxy['user'] = isset($proxy['user']) ? $proxy['user'] : null;
+		$proxy['pass'] = isset($proxy['pass']) ? $proxy['pass'] : null;
+		$proxy['port'] = isset($proxy['port']) ? $proxy['port'] : null;
+		$this->proxy = $proxy;
+		return $this;
+	}
+
+	/**
+	 * Set the intended starting seek position.
+	 *
+	 * @param integer $position (Required) The byte-position of the stream to begin reading from.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_seek_position($position)
+	{
+		$this->seek_position = isset($position) ? (integer) $position : null;
+
+		return $this;
+	}
+
+	/**
+	 * Register a callback function to execute whenever a data stream is read from using
+	 * <CFRequest::streaming_read_callback()>.
+	 *
+	 * The user-defined callback function should accept three arguments:
+	 *
+	 * <ul>
+	 * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
+	 * 	<li><code>$file_handle</code> - <code>resource</code> - Required - The file handle resource that represents the file on the local file system.</li>
+	 * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
+	 * </ul>
+	 *
+	 * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
+	 * 	<li>The name of a global function to execute, passed as a string.</li>
+	 * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
+	 * 	<li>An anonymous function (PHP 5.3+).</li></ul>
+	 * @return $this A reference to the current instance.
+	 */
+	public function register_streaming_read_callback($callback)
+	{
+		$this->registered_streaming_read_callback = $callback;
+
+		return $this;
+	}
+
+	/**
+	 * Register a callback function to execute whenever a data stream is written to using
+	 * <CFRequest::streaming_write_callback()>.
+	 *
+	 * The user-defined callback function should accept two arguments:
+	 *
+	 * <ul>
+	 * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
+	 * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
+	 * </ul>
+	 *
+	 * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
+	 * 	<li>The name of a global function to execute, passed as a string.</li>
+	 * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
+	 * 	<li>An anonymous function (PHP 5.3+).</li></ul>
+	 * @return $this A reference to the current instance.
+	 */
+	public function register_streaming_write_callback($callback)
+	{
+		$this->registered_streaming_write_callback = $callback;
+
+		return $this;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// PREPARE, SEND, AND PROCESS REQUEST
+
+	/**
+	 * A callback function that is invoked by cURL for streaming up.
+	 *
+	 * @param resource $curl_handle (Required) The cURL handle for the request.
+	 * @param resource $file_handle (Required) The open file handle resource.
+	 * @param integer $length (Required) The maximum number of bytes to read.
+	 * @return binary Binary data from a stream.
+	 */
+	public function streaming_read_callback($curl_handle, $file_handle, $length)
+	{
+		// Once we've sent as much as we're supposed to send...
+		if ($this->read_stream_read >= $this->read_stream_size)
+		{
+			// Send EOF
+			return '';
+		}
+
+		// If we're at the beginning of an upload and need to seek...
+		if ($this->read_stream_read == 0 && isset($this->seek_position) && $this->seek_position !== ftell($this->read_stream))
+		{
+			if (fseek($this->read_stream, $this->seek_position) !== 0)
+			{
+				throw new RequestCore_Exception('The stream does not support seeking and is either not at the requested position or the position is unknown.');
+			}
+		}
+
+		$read = fread($this->read_stream, min($this->read_stream_size - $this->read_stream_read, $length)); // Remaining upload data or cURL's requested chunk size
+		$this->read_stream_read += strlen($read);
+
+		$out = $read === false ? '' : $read;
+
+		// Execute callback function
+		if ($this->registered_streaming_read_callback)
+		{
+			call_user_func($this->registered_streaming_read_callback, $curl_handle, $file_handle, $out);
+		}
+
+		return $out;
+	}
+
+	/**
+	 * A callback function that is invoked by cURL for streaming down.
+	 *
+	 * @param resource $curl_handle (Required) The cURL handle for the request.
+	 * @param binary $data (Required) The data to write.
+	 * @return integer The number of bytes written.
+	 */
+	public function streaming_write_callback($curl_handle, $data)
+	{
+		$length = strlen($data);
+		$written_total = 0;
+		$written_last = 0;
+
+		while ($written_total < $length)
+		{
+			$written_last = fwrite($this->write_stream, substr($data, $written_total));
+
+			if ($written_last === false)
+			{
+				return $written_total;
+			}
+
+			$written_total += $written_last;
+		}
+
+		// Execute callback function
+		if ($this->registered_streaming_write_callback)
+		{
+			call_user_func($this->registered_streaming_write_callback, $curl_handle, $written_total);
+		}
+
+		return $written_total;
+	}
+
+	/**
+	 * Prepares and adds the details of the cURL request. This can be passed along to a <php:curl_multi_exec()>
+	 * function.
+	 *
+	 * @return resource The handle for the cURL object.
+	 */
+	public function prep_request()
+	{
+		$curl_handle = curl_init();
+
+		// Set default options.
+		curl_setopt($curl_handle, CURLOPT_URL, $this->request_url);
+		curl_setopt($curl_handle, CURLOPT_FILETIME, true);
+		curl_setopt($curl_handle, CURLOPT_FRESH_CONNECT, false);
+		curl_setopt($curl_handle, CURLOPT_CLOSEPOLICY, CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
+		curl_setopt($curl_handle, CURLOPT_MAXREDIRS, 5);
+		curl_setopt($curl_handle, CURLOPT_HEADER, true);
+		curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl_handle, CURLOPT_TIMEOUT, 5184000);
+		curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 120);
+		curl_setopt($curl_handle, CURLOPT_NOSIGNAL, true);
+		curl_setopt($curl_handle, CURLOPT_REFERER, $this->request_url);
+		curl_setopt($curl_handle, CURLOPT_USERAGENT, $this->useragent);
+		curl_setopt($curl_handle, CURLOPT_READFUNCTION, array($this, 'streaming_read_callback'));
+
+		// Verification of the SSL cert
+		if ($this->ssl_verification)
+		{
+			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, true);
+			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, 2);
+		}
+		else
+		{
+			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, false);
+		}
+
+		// chmod the file as 0755
+		if ($this->cacert_location === true)
+		{
+			curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem');
+		}
+		elseif (is_string($this->cacert_location))
+		{
+			curl_setopt($curl_handle, CURLOPT_CAINFO, $this->cacert_location);
+		}
+
+		// Debug mode
+		if ($this->debug_mode)
+		{
+			curl_setopt($curl_handle, CURLOPT_VERBOSE, true);
+		}
+
+		// Handle open_basedir & safe mode
+		if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+		{
+			curl_setopt($curl_handle, CURLOPT_FOLLOWLOCATION, true);
+		}
+
+		// Enable a proxy connection if requested.
+		if ($this->proxy)
+		{
+			curl_setopt($curl_handle, CURLOPT_HTTPPROXYTUNNEL, true);
+
+			$host = $this->proxy['host'];
+			$host .= ($this->proxy['port']) ? ':' . $this->proxy['port'] : '';
+			curl_setopt($curl_handle, CURLOPT_PROXY, $host);
+
+			if (isset($this->proxy['user']) && isset($this->proxy['pass']))
+			{
+				curl_setopt($curl_handle, CURLOPT_PROXYUSERPWD, $this->proxy['user'] . ':' . $this->proxy['pass']);
+			}
+		}
+
+		// Set credentials for HTTP Basic/Digest Authentication.
+		if ($this->username && $this->password)
+		{
+			curl_setopt($curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+			curl_setopt($curl_handle, CURLOPT_USERPWD, $this->username . ':' . $this->password);
+		}
+
+		// Handle the encoding if we can.
+		if (extension_loaded('zlib'))
+		{
+			curl_setopt($curl_handle, CURLOPT_ENCODING, 'gzip, deflate');
+		}
+
+		// Process custom headers
+		if (isset($this->request_headers) && count($this->request_headers))
+		{
+			$temp_headers = array();
+
+			foreach ($this->request_headers as $k => $v)
+			{
+				$temp_headers[] = $k . ': ' . $v;
+			}
+
+			curl_setopt($curl_handle, CURLOPT_HTTPHEADER, $temp_headers);
+		}
+
+		switch ($this->method)
+		{
+			case self::HTTP_PUT:
+				curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, 'PUT');
+				if (isset($this->read_stream))
+				{
+					if (!isset($this->read_stream_size) || $this->read_stream_size < 0)
+					{
+						throw new RequestCore_Exception('The stream size for the streaming upload cannot be determined.');
+					}
+
+					curl_setopt($curl_handle, CURLOPT_INFILESIZE, $this->read_stream_size);
+					curl_setopt($curl_handle, CURLOPT_UPLOAD, true);
+				}
+				else
+				{
+					curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
+				}
+				break;
+
+			case self::HTTP_POST:
+				curl_setopt($curl_handle, CURLOPT_POST, true);
+				curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
+				break;
+
+			case self::HTTP_HEAD:
+				curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, self::HTTP_HEAD);
+				curl_setopt($curl_handle, CURLOPT_NOBODY, 1);
+				break;
+
+			default: // Assumed GET
+				curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, $this->method);
+				if (isset($this->write_stream))
+				{
+					curl_setopt($curl_handle, CURLOPT_WRITEFUNCTION, array($this, 'streaming_write_callback'));
+					curl_setopt($curl_handle, CURLOPT_HEADER, false);
+				}
+				else
+				{
+					curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
+				}
+				break;
+		}
+
+		// Merge in the CURLOPTs
+		if (isset($this->curlopts) && sizeof($this->curlopts) > 0)
+		{
+			foreach ($this->curlopts as $k => $v)
+			{
+				curl_setopt($curl_handle, $k, $v);
+			}
+		}
+
+		return $curl_handle;
+	}
+
+	/**
+	 * Take the post-processed cURL data and break it down into useful header/body/info chunks. Uses the
+	 * data stored in the `curl_handle` and `response` properties unless replacement data is passed in via
+	 * parameters.
+	 *
+	 * @param resource $curl_handle (Optional) The reference to the already executed cURL request.
+	 * @param string $response (Optional) The actual response content itself that needs to be parsed.
+	 * @return ResponseCore A <ResponseCore> object containing a parsed HTTP response.
+	 */
+	public function process_response($curl_handle = null, $response = null)
+	{
+		// Accept a custom one if it's passed.
+		if ($curl_handle && $response)
+		{
+			$this->curl_handle = $curl_handle;
+			$this->response = $response;
+		}
+
+		// As long as this came back as a valid resource...
+		if (is_resource($this->curl_handle))
+		{
+			// Determine what's what.
+			$header_size = curl_getinfo($this->curl_handle, CURLINFO_HEADER_SIZE);
+			$this->response_headers = substr($this->response, 0, $header_size);
+			$this->response_body = substr($this->response, $header_size);
+			$this->response_code = curl_getinfo($this->curl_handle, CURLINFO_HTTP_CODE);
+			$this->response_info = curl_getinfo($this->curl_handle);
+
+			// Parse out the headers
+			$this->response_headers = explode("\r\n\r\n", trim($this->response_headers));
+			$this->response_headers = array_pop($this->response_headers);
+			$this->response_headers = explode("\r\n", $this->response_headers);
+			array_shift($this->response_headers);
+
+			// Loop through and split up the headers.
+			$header_assoc = array();
+			foreach ($this->response_headers as $header)
+			{
+				$kv = explode(': ', $header);
+				$header_assoc[strtolower($kv[0])] = $kv[1];
+			}
+
+			// Reset the headers to the appropriate property.
+			$this->response_headers = $header_assoc;
+			$this->response_headers['_info'] = $this->response_info;
+			$this->response_headers['_info']['method'] = $this->method;
+
+			if ($curl_handle && $response)
+			{
+				return new $this->response_class($this->response_headers, $this->response_body, $this->response_code, $this->curl_handle);
+			}
+		}
+
+		// Return false
+		return false;
+	}
+
+	/**
+	 * Sends the request, calling necessary utility functions to update built-in properties.
+	 *
+	 * @param boolean $parse (Optional) Whether to parse the response with ResponseCore or not.
+	 * @return string The resulting unparsed data from the request.
+	 */
+	public function send_request($parse = false)
+	{
+		set_time_limit(0);
+
+		$curl_handle = $this->prep_request();
+		$this->response = curl_exec($curl_handle);
+
+		if ($this->response === false)
+		{
+			throw new cURL_Exception('cURL resource: ' . (string) $curl_handle . '; cURL error: ' . curl_error($curl_handle) . ' (cURL error code ' . curl_errno($curl_handle) . '). See http://curl.haxx.se/libcurl/c/libcurl-errors.html for an explanation of error codes.');
+		}
+
+		$parsed_response = $this->process_response($curl_handle, $this->response);
+
+		curl_close($curl_handle);
+
+		if ($parse)
+		{
+			return $parsed_response;
+		}
+
+		return $this->response;
+	}
+
+	/**
+	 * Sends the request using <php:curl_multi_exec()>, enabling parallel requests. Uses the "rolling" method.
+	 *
+	 * @param array $handles (Required) An indexed array of cURL handles to process simultaneously.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>callback</code> - <code>string|array</code> - Optional - The string name of a function to pass the response data to. If this is a method, pass an array where the <code>[0]</code> index is the class and the <code>[1]</code> index is the method name.</li>
+	 * 	<li><code>limit</code> - <code>integer</code> - Optional - The number of simultaneous requests to make. This can be useful for scaling around slow server responses. Defaults to trusting cURLs judgement as to how many to use.</li></ul>
+	 * @return array Post-processed cURL responses.
+	 */
+	public function send_multi_request($handles, $opt = null)
+	{
+		set_time_limit(0);
+
+		// Skip everything if there are no handles to process.
+		if (count($handles) === 0) return array();
+
+		if (!$opt) $opt = array();
+
+		// Initialize any missing options
+		$limit = isset($opt['limit']) ? $opt['limit'] : -1;
+
+		// Initialize
+		$handle_list = $handles;
+		$http = new $this->request_class();
+		$multi_handle = curl_multi_init();
+		$handles_post = array();
+		$added = count($handles);
+		$last_handle = null;
+		$count = 0;
+		$i = 0;
+
+		// Loop through the cURL handles and add as many as it set by the limit parameter.
+		while ($i < $added)
+		{
+			if ($limit > 0 && $i >= $limit) break;
+			curl_multi_add_handle($multi_handle, array_shift($handles));
+			$i++;
+		}
+
+		do
+		{
+			$active = false;
+
+			// Start executing and wait for a response.
+			while (($status = curl_multi_exec($multi_handle, $active)) === CURLM_CALL_MULTI_PERFORM)
+			{
+				// Start looking for possible responses immediately when we have to add more handles
+				if (count($handles) > 0) break;
+			}
+
+			// Figure out which requests finished.
+			$to_process = array();
+
+			while ($done = curl_multi_info_read($multi_handle))
+			{
+				// Since curl_errno() isn't reliable for handles that were in multirequests, we check the 'result' of the info read, which contains the curl error number, (listed here http://curl.haxx.se/libcurl/c/libcurl-errors.html )
+				if ($done['result'] > 0)
+				{
+					throw new cURL_Multi_Exception('cURL resource: ' . (string) $done['handle'] . '; cURL error: ' . curl_error($done['handle']) . ' (cURL error code ' . $done['result'] . '). See http://curl.haxx.se/libcurl/c/libcurl-errors.html for an explanation of error codes.');
+				}
+
+				// Because curl_multi_info_read() might return more than one message about a request, we check to see if this request is already in our array of completed requests
+				elseif (!isset($to_process[(int) $done['handle']]))
+				{
+					$to_process[(int) $done['handle']] = $done;
+				}
+			}
+
+			// Actually deal with the request
+			foreach ($to_process as $pkey => $done)
+			{
+				$response = $http->process_response($done['handle'], curl_multi_getcontent($done['handle']));
+				$key = array_search($done['handle'], $handle_list, true);
+				$handles_post[$key] = $response;
+
+				if (count($handles) > 0)
+				{
+					curl_multi_add_handle($multi_handle, array_shift($handles));
+				}
+
+				curl_multi_remove_handle($multi_handle, $done['handle']);
+				curl_close($done['handle']);
+			}
+		}
+		while ($active || count($handles_post) < $added);
+
+		curl_multi_close($multi_handle);
+
+		ksort($handles_post, SORT_NUMERIC);
+		return $handles_post;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// RESPONSE METHODS
+
+	/**
+	 * Get the HTTP response headers from the request.
+	 *
+	 * @param string $header (Optional) A specific header value to return. Defaults to all headers.
+	 * @return string|array All or selected header values.
+	 */
+	public function get_response_header($header = null)
+	{
+		if ($header)
+		{
+			return $this->response_headers[strtolower($header)];
+		}
+		return $this->response_headers;
+	}
+
+	/**
+	 * Get the HTTP response body from the request.
+	 *
+	 * @return string The response body.
+	 */
+	public function get_response_body()
+	{
+		return $this->response_body;
+	}
+
+	/**
+	 * Get the HTTP response code from the request.
+	 *
+	 * @return string The HTTP response code.
+	 */
+	public function get_response_code()
+	{
+		return $this->response_code;
+	}
+}
+
+
+/**
+ * Container for all response-related methods.
+ */
+class ResponseCore
+{
+	/**
+	 * Stores the HTTP header information.
+	 */
+	public $header;
+
+	/**
+	 * Stores the SimpleXML response.
+	 */
+	public $body;
+
+	/**
+	 * Stores the HTTP response code.
+	 */
+	public $status;
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param array $header (Required) Associative array of HTTP headers (typically returned by <RequestCore::get_response_header()>).
+	 * @param string $body (Required) XML-formatted response from AWS.
+	 * @param integer $status (Optional) HTTP response status code from the request.
+	 * @return object Contains an <php:array> `header` property (HTTP headers as an associative array), a <php:SimpleXMLElement> or <php:string> `body` property, and an <php:integer> `status` code.
+	 */
+	public function __construct($header, $body, $status = null)
+	{
+		$this->header = $header;
+		$this->body = $body;
+		$this->status = $status;
+
+		return $this;
+	}
+
+	/**
+	 * Did we receive the status code we expected?
+	 *
+	 * @param integer|array $codes (Optional) The status code(s) to expect. Pass an <php:integer> for a single acceptable value, or an <php:array> of integers for multiple acceptable values.
+	 * @return boolean Whether we received the expected status code or not.
+	 */
+	public function isOK($codes = array(200, 201, 204, 206))
+	{
+		if (is_array($codes))
+		{
+			return in_array($this->status, $codes);
+		}
+
+		return $this->status === $codes;
+	}
+}
+
+class cURL_Exception extends Exception {}
+class cURL_Multi_Exception extends cURL_Exception {}
+class RequestCore_Exception extends Exception {}
diff --git a/3rdparty/aws-sdk/lib/yaml/LICENSE b/3rdparty/aws-sdk/lib/yaml/LICENSE
new file mode 100644
index 0000000000..3cef853170
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/yaml/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2008-2009 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/3rdparty/aws-sdk/lib/yaml/README.markdown b/3rdparty/aws-sdk/lib/yaml/README.markdown
new file mode 100644
index 0000000000..e4f80cfbac
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/yaml/README.markdown
@@ -0,0 +1,15 @@
+Symfony YAML: A PHP library that speaks YAML
+============================================
+
+Symfony YAML is a PHP library that parses YAML strings and converts them to
+PHP arrays. It can also converts PHP arrays to YAML strings. Its official
+website is at http://components.symfony-project.org/yaml/.
+
+The documentation is to be found in the `doc/` directory.
+
+Symfony YAML is licensed under the MIT license (see LICENSE file).
+
+The Symfony YAML library is developed and maintained by the
+[symfony](http://www.symfony-project.org/) project team. It has been extracted
+from symfony to be used as a standalone library. Symfony YAML is part of the
+[symfony components project](http://components.symfony-project.org/).
diff --git a/3rdparty/aws-sdk/lib/yaml/lib/sfYaml.php b/3rdparty/aws-sdk/lib/yaml/lib/sfYaml.php
new file mode 100644
index 0000000000..1d89ccc973
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/yaml/lib/sfYaml.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfYaml offers convenience methods to load and dump YAML.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYaml.class.php 8988 2008-05-15 20:24:26Z fabien $
+ */
+class sfYaml
+{
+  static protected
+    $spec = '1.2';
+
+  /**
+   * Sets the YAML specification version to use.
+   *
+   * @param string $version The YAML specification version
+   */
+  static public function setSpecVersion($version)
+  {
+    if (!in_array($version, array('1.1', '1.2')))
+    {
+      throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
+    }
+
+    self::$spec = $version;
+  }
+
+  /**
+   * Gets the YAML specification version to use.
+   *
+   * @return string The YAML specification version
+   */
+  static public function getSpecVersion()
+  {
+    return self::$spec;
+  }
+
+  /**
+   * Loads YAML into a PHP array.
+   *
+   * The load method, when supplied with a YAML stream (string or file),
+   * will do its best to convert YAML in a file into a PHP array.
+   *
+   *  Usage:
+   *  <code>
+   *   $array = sfYaml::load('config.yml');
+   *   print_r($array);
+   *  </code>
+   *
+   * @param string $input Path of YAML file or string containing YAML
+   *
+   * @return array The YAML converted to a PHP array
+   *
+   * @throws InvalidArgumentException If the YAML is not valid
+   */
+  public static function load($input)
+  {
+    $file = '';
+
+    // if input is a file, process it
+    if (strpos($input, "\n") === false && is_file($input))
+    {
+      $file = $input;
+
+      ob_start();
+      $retval = include($input);
+      $content = ob_get_clean();
+
+      // if an array is returned by the config file assume it's in plain php form else in YAML
+      $input = is_array($retval) ? $retval : $content;
+    }
+
+    // if an array is returned by the config file assume it's in plain php form else in YAML
+    if (is_array($input))
+    {
+      return $input;
+    }
+
+    require_once dirname(__FILE__).'/sfYamlParser.php';
+
+    $yaml = new sfYamlParser();
+
+    try
+    {
+      $ret = $yaml->parse($input);
+    }
+    catch (Exception $e)
+    {
+      throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
+    }
+
+    return $ret;
+  }
+
+  /**
+   * Dumps a PHP array to a YAML string.
+   *
+   * The dump method, when supplied with an array, will do its best
+   * to convert the array into friendly YAML.
+   *
+   * @param array   $array PHP array
+   * @param integer $inline The level where you switch to inline YAML
+   *
+   * @return string A YAML string representing the original PHP array
+   */
+  public static function dump($array, $inline = 2)
+  {
+    require_once dirname(__FILE__).'/sfYamlDumper.php';
+
+    $yaml = new sfYamlDumper();
+
+    return $yaml->dump($array, $inline);
+  }
+}
+
+/**
+ * Wraps echo to automatically provide a newline.
+ *
+ * @param string $string The string to echo with new line
+ */
+function echoln($string)
+{
+  echo $string."\n";
+}
diff --git a/3rdparty/aws-sdk/lib/yaml/lib/sfYamlDumper.php b/3rdparty/aws-sdk/lib/yaml/lib/sfYamlDumper.php
new file mode 100644
index 0000000000..0ada2b37d2
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/yaml/lib/sfYamlDumper.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(dirname(__FILE__).'/sfYamlInline.php');
+
+/**
+ * sfYamlDumper dumps PHP variables to YAML strings.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYamlDumper.class.php 10575 2008-08-01 13:08:42Z nicolas $
+ */
+class sfYamlDumper
+{
+  /**
+   * Dumps a PHP value to YAML.
+   *
+   * @param  mixed   $input  The PHP value
+   * @param  integer $inline The level where you switch to inline YAML
+   * @param  integer $indent The level o indentation indentation (used internally)
+   *
+   * @return string  The YAML representation of the PHP value
+   */
+  public function dump($input, $inline = 0, $indent = 0)
+  {
+    $output = '';
+    $prefix = $indent ? str_repeat(' ', $indent) : '';
+
+    if ($inline <= 0 || !is_array($input) || empty($input))
+    {
+      $output .= $prefix.sfYamlInline::dump($input);
+    }
+    else
+    {
+      $isAHash = array_keys($input) !== range(0, count($input) - 1);
+
+      foreach ($input as $key => $value)
+      {
+        $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+
+        $output .= sprintf('%s%s%s%s',
+          $prefix,
+          $isAHash ? sfYamlInline::dump($key).':' : '-',
+          $willBeInlined ? ' ' : "\n",
+          $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
+        ).($willBeInlined ? "\n" : '');
+      }
+    }
+
+    return $output;
+  }
+}
diff --git a/3rdparty/aws-sdk/lib/yaml/lib/sfYamlInline.php b/3rdparty/aws-sdk/lib/yaml/lib/sfYamlInline.php
new file mode 100644
index 0000000000..66edb4f07a
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/yaml/lib/sfYamlInline.php
@@ -0,0 +1,442 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once dirname(__FILE__).'/sfYaml.php';
+
+/**
+ * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYamlInline.class.php 16177 2009-03-11 08:32:48Z fabien $
+ */
+class sfYamlInline
+{
+  const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+
+  /**
+   * Convert a YAML string to a PHP array.
+   *
+   * @param string $value A YAML string
+   *
+   * @return array A PHP array representing the YAML string
+   */
+  static public function load($value)
+  {
+    $value = trim($value);
+
+    if (0 == strlen($value))
+    {
+      return '';
+    }
+
+    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
+    {
+      $mbEncoding = mb_internal_encoding();
+      mb_internal_encoding('ASCII');
+    }
+
+    switch ($value[0])
+    {
+      case '[':
+        $result = self::parseSequence($value);
+        break;
+      case '{':
+        $result = self::parseMapping($value);
+        break;
+      default:
+        $result = self::parseScalar($value);
+    }
+
+    if (isset($mbEncoding))
+    {
+      mb_internal_encoding($mbEncoding);
+    }
+
+    return $result;
+  }
+
+  /**
+   * Dumps a given PHP variable to a YAML string.
+   *
+   * @param mixed $value The PHP variable to convert
+   *
+   * @return string The YAML string representing the PHP array
+   */
+  static public function dump($value)
+  {
+    if ('1.1' === sfYaml::getSpecVersion())
+    {
+      $trueValues = array('true', 'on', '+', 'yes', 'y');
+      $falseValues = array('false', 'off', '-', 'no', 'n');
+    }
+    else
+    {
+      $trueValues = array('true');
+      $falseValues = array('false');
+    }
+
+    switch (true)
+    {
+      case is_resource($value):
+        throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
+      case is_object($value):
+        return '!!php/object:'.serialize($value);
+      case is_array($value):
+        return self::dumpArray($value);
+      case null === $value:
+        return 'null';
+      case true === $value:
+        return 'true';
+      case false === $value:
+        return 'false';
+      case ctype_digit($value):
+        return is_string($value) ? "'$value'" : (int) $value;
+      case is_numeric($value):
+        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
+      case false !== strpos($value, "\n") || false !== strpos($value, "\r"):
+        return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value));
+      case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
+        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
+      case '' == $value:
+        return "''";
+      case preg_match(self::getTimestampRegex(), $value):
+        return "'$value'";
+      case in_array(strtolower($value), $trueValues):
+        return "'$value'";
+      case in_array(strtolower($value), $falseValues):
+        return "'$value'";
+      case in_array(strtolower($value), array('null', '~')):
+        return "'$value'";
+      default:
+        return $value;
+    }
+  }
+
+  /**
+   * Dumps a PHP array to a YAML string.
+   *
+   * @param array $value The PHP array to dump
+   *
+   * @return string The YAML string representing the PHP array
+   */
+  static protected function dumpArray($value)
+  {
+    // array
+    $keys = array_keys($value);
+    if (
+      (1 == count($keys) && '0' == $keys[0])
+      ||
+      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
+    {
+      $output = array();
+      foreach ($value as $val)
+      {
+        $output[] = self::dump($val);
+      }
+
+      return sprintf('[%s]', implode(', ', $output));
+    }
+
+    // mapping
+    $output = array();
+    foreach ($value as $key => $val)
+    {
+      $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
+    }
+
+    return sprintf('{ %s }', implode(', ', $output));
+  }
+
+  /**
+   * Parses a scalar to a YAML string.
+   *
+   * @param scalar  $scalar
+   * @param string  $delimiters
+   * @param array   $stringDelimiter
+   * @param integer $i
+   * @param boolean $evaluate
+   *
+   * @return string A YAML string
+   */
+  static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
+  {
+    if (in_array($scalar[$i], $stringDelimiters))
+    {
+      // quoted scalar
+      $output = self::parseQuotedScalar($scalar, $i);
+    }
+    else
+    {
+      // "normal" string
+      if (!$delimiters)
+      {
+        $output = substr($scalar, $i);
+        $i += strlen($output);
+
+        // remove comments
+        if (false !== $strpos = strpos($output, ' #'))
+        {
+          $output = rtrim(substr($output, 0, $strpos));
+        }
+      }
+      else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match))
+      {
+        $output = $match[1];
+        $i += strlen($output);
+      }
+      else
+      {
+        throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
+      }
+
+      $output = $evaluate ? self::evaluateScalar($output) : $output;
+    }
+
+    return $output;
+  }
+
+  /**
+   * Parses a quoted scalar to YAML.
+   *
+   * @param string  $scalar
+   * @param integer $i
+   *
+   * @return string A YAML string
+   */
+  static protected function parseQuotedScalar($scalar, &$i)
+  {
+    if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/A', substr($scalar, $i), $match))
+    {
+      throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
+    }
+
+    $output = substr($match[0], 1, strlen($match[0]) - 2);
+
+    if ('"' == $scalar[$i])
+    {
+      // evaluate the string
+      $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
+    }
+    else
+    {
+      // unescape '
+      $output = str_replace('\'\'', '\'', $output);
+    }
+
+    $i += strlen($match[0]);
+
+    return $output;
+  }
+
+  /**
+   * Parses a sequence to a YAML string.
+   *
+   * @param string  $sequence
+   * @param integer $i
+   *
+   * @return string A YAML string
+   */
+  static protected function parseSequence($sequence, &$i = 0)
+  {
+    $output = array();
+    $len = strlen($sequence);
+    $i += 1;
+
+    // [foo, bar, ...]
+    while ($i < $len)
+    {
+      switch ($sequence[$i])
+      {
+        case '[':
+          // nested sequence
+          $output[] = self::parseSequence($sequence, $i);
+          break;
+        case '{':
+          // nested mapping
+          $output[] = self::parseMapping($sequence, $i);
+          break;
+        case ']':
+          return $output;
+        case ',':
+        case ' ':
+          break;
+        default:
+          $isQuoted = in_array($sequence[$i], array('"', "'"));
+          $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
+
+          if (!$isQuoted && false !== strpos($value, ': '))
+          {
+            // embedded mapping?
+            try
+            {
+              $value = self::parseMapping('{'.$value.'}');
+            }
+            catch (InvalidArgumentException $e)
+            {
+              // no, it's not
+            }
+          }
+
+          $output[] = $value;
+
+          --$i;
+      }
+
+      ++$i;
+    }
+
+    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
+  }
+
+  /**
+   * Parses a mapping to a YAML string.
+   *
+   * @param string  $mapping
+   * @param integer $i
+   *
+   * @return string A YAML string
+   */
+  static protected function parseMapping($mapping, &$i = 0)
+  {
+    $output = array();
+    $len = strlen($mapping);
+    $i += 1;
+
+    // {foo: bar, bar:foo, ...}
+    while ($i < $len)
+    {
+      switch ($mapping[$i])
+      {
+        case ' ':
+        case ',':
+          ++$i;
+          continue 2;
+        case '}':
+          return $output;
+      }
+
+      // key
+      $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
+
+      // value
+      $done = false;
+      while ($i < $len)
+      {
+        switch ($mapping[$i])
+        {
+          case '[':
+            // nested sequence
+            $output[$key] = self::parseSequence($mapping, $i);
+            $done = true;
+            break;
+          case '{':
+            // nested mapping
+            $output[$key] = self::parseMapping($mapping, $i);
+            $done = true;
+            break;
+          case ':':
+          case ' ':
+            break;
+          default:
+            $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i);
+            $done = true;
+            --$i;
+        }
+
+        ++$i;
+
+        if ($done)
+        {
+          continue 2;
+        }
+      }
+    }
+
+    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
+  }
+
+  /**
+   * Evaluates scalars and replaces magic values.
+   *
+   * @param string $scalar
+   *
+   * @return string A YAML string
+   */
+  static protected function evaluateScalar($scalar)
+  {
+    $scalar = trim($scalar);
+
+    if ('1.1' === sfYaml::getSpecVersion())
+    {
+      $trueValues = array('true', 'on', '+', 'yes', 'y');
+      $falseValues = array('false', 'off', '-', 'no', 'n');
+    }
+    else
+    {
+      $trueValues = array('true');
+      $falseValues = array('false');
+    }
+
+    switch (true)
+    {
+      case 'null' == strtolower($scalar):
+      case '' == $scalar:
+      case '~' == $scalar:
+        return null;
+      case 0 === strpos($scalar, '!str'):
+        return (string) substr($scalar, 5);
+      case 0 === strpos($scalar, '! '):
+        return intval(self::parseScalar(substr($scalar, 2)));
+      case 0 === strpos($scalar, '!!php/object:'):
+        return unserialize(substr($scalar, 13));
+      case ctype_digit($scalar):
+        $raw = $scalar;
+        $cast = intval($scalar);
+        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
+      case in_array(strtolower($scalar), $trueValues):
+        return true;
+      case in_array(strtolower($scalar), $falseValues):
+        return false;
+      case is_numeric($scalar):
+        return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar);
+      case 0 == strcasecmp($scalar, '.inf'):
+      case 0 == strcasecmp($scalar, '.NaN'):
+        return -log(0);
+      case 0 == strcasecmp($scalar, '-.inf'):
+        return log(0);
+      case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
+        return floatval(str_replace(',', '', $scalar));
+      case preg_match(self::getTimestampRegex(), $scalar):
+        return strtotime($scalar);
+      default:
+        return (string) $scalar;
+    }
+  }
+
+  static protected function getTimestampRegex()
+  {
+    return <<<EOF
+    ~^
+    (?P<year>[0-9][0-9][0-9][0-9])
+    -(?P<month>[0-9][0-9]?)
+    -(?P<day>[0-9][0-9]?)
+    (?:(?:[Tt]|[ \t]+)
+    (?P<hour>[0-9][0-9]?)
+    :(?P<minute>[0-9][0-9])
+    :(?P<second>[0-9][0-9])
+    (?:\.(?P<fraction>[0-9]*))?
+    (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+    (?::(?P<tz_minute>[0-9][0-9]))?))?)?
+    $~x
+EOF;
+  }
+}
diff --git a/3rdparty/aws-sdk/lib/yaml/lib/sfYamlParser.php b/3rdparty/aws-sdk/lib/yaml/lib/sfYamlParser.php
new file mode 100644
index 0000000000..4c56a56db0
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/yaml/lib/sfYamlParser.php
@@ -0,0 +1,612 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(dirname(__FILE__).'/sfYamlInline.php');
+
+if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
+{
+  define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
+}
+
+/**
+ * sfYamlParser parses YAML strings to convert them to PHP arrays.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYamlParser.class.php 10832 2008-08-13 07:46:08Z fabien $
+ */
+class sfYamlParser
+{
+  protected
+    $offset        = 0,
+    $lines         = array(),
+    $currentLineNb = -1,
+    $currentLine   = '',
+    $refs          = array();
+
+  /**
+   * Constructor
+   *
+   * @param integer $offset The offset of YAML document (used for line numbers in error messages)
+   */
+  public function __construct($offset = 0)
+  {
+    $this->offset = $offset;
+  }
+
+  /**
+   * Parses a YAML string to a PHP value.
+   *
+   * @param  string $value A YAML string
+   *
+   * @return mixed  A PHP value
+   *
+   * @throws InvalidArgumentException If the YAML is not valid
+   */
+  public function parse($value)
+  {
+    $value = str_replace("\t", '  ', $value); // Convert tabs to spaces.
+
+    $this->currentLineNb = -1;
+    $this->currentLine = '';
+    $this->lines = explode("\n", $this->cleanup($value));
+
+    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
+    {
+      $mbEncoding = mb_internal_encoding();
+      mb_internal_encoding('ASCII');
+    }
+
+    $data = array();
+    while ($this->moveToNextLine())
+    {
+      if ($this->isCurrentLineEmpty())
+      {
+        continue;
+      }
+
+      // tab?
+      if (preg_match('#^\t+#', $this->currentLine))
+      {
+        throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+
+      $isRef = $isInPlace = $isProcessed = false;
+      if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#', $this->currentLine, $values))
+      {
+        if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#', $values['value'], $matches))
+        {
+          $isRef = $matches['ref'];
+          $values['value'] = $matches['value'];
+        }
+
+        // array
+        if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
+        {
+          $c = $this->getRealCurrentLineNb() + 1;
+          $parser = new sfYamlParser($c);
+          $parser->refs =& $this->refs;
+          $data[] = $parser->parse($this->getNextEmbedBlock());
+        }
+        else
+        {
+          if (isset($values['leadspaces'])
+            && ' ' == $values['leadspaces']
+            && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#', $values['value'], $matches))
+          {
+            // this is a compact notation element, add to next block and parse
+            $c = $this->getRealCurrentLineNb();
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+
+            $block = $values['value'];
+            if (!$this->isNextLineIndented())
+            {
+              $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
+            }
+
+            $data[] = $parser->parse($block);
+          }
+          else
+          {
+            $data[] = $this->parseValue($values['value']);
+          }
+        }
+      }
+      else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#', $this->currentLine, $values))
+      {
+        $key = sfYamlInline::parseScalar($values['key']);
+
+        if ('<<' === $key)
+        {
+          if (isset($values['value']) && '*' === substr($values['value'], 0, 1))
+          {
+            $isInPlace = substr($values['value'], 1);
+            if (!array_key_exists($isInPlace, $this->refs))
+            {
+              throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+          }
+          else
+          {
+            if (isset($values['value']) && $values['value'] !== '')
+            {
+              $value = $values['value'];
+            }
+            else
+            {
+              $value = $this->getNextEmbedBlock();
+            }
+            $c = $this->getRealCurrentLineNb() + 1;
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+            $parsed = $parser->parse($value);
+
+            $merged = array();
+            if (!is_array($parsed))
+            {
+              throw new InvalidArgumentException(sprintf("YAML merge keys used with a scalar value instead of an array at line %s (%s)", $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+            else if (isset($parsed[0]))
+            {
+              // Numeric array, merge individual elements
+              foreach (array_reverse($parsed) as $parsedItem)
+              {
+                if (!is_array($parsedItem))
+                {
+                  throw new InvalidArgumentException(sprintf("Merge items must be arrays at line %s (%s).", $this->getRealCurrentLineNb() + 1, $parsedItem));
+                }
+                $merged = array_merge($parsedItem, $merged);
+              }
+            }
+            else
+            {
+              // Associative array, merge
+              $merged = array_merge($merge, $parsed);
+            }
+
+            $isProcessed = $merged;
+          }
+        }
+        else if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#', $values['value'], $matches))
+        {
+          $isRef = $matches['ref'];
+          $values['value'] = $matches['value'];
+        }
+
+        if ($isProcessed)
+        {
+          // Merge keys
+          $data = $isProcessed;
+        }
+        // hash
+        else if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
+        {
+          // if next line is less indented or equal, then it means that the current value is null
+          if ($this->isNextLineIndented())
+          {
+            $data[$key] = null;
+          }
+          else
+          {
+            $c = $this->getRealCurrentLineNb() + 1;
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+            $data[$key] = $parser->parse($this->getNextEmbedBlock());
+          }
+        }
+        else
+        {
+          if ($isInPlace)
+          {
+            $data = $this->refs[$isInPlace];
+          }
+          else
+          {
+            $data[$key] = $this->parseValue($values['value']);
+          }
+        }
+      }
+      else
+      {
+        // 1-liner followed by newline
+        if (2 == count($this->lines) && empty($this->lines[1]))
+        {
+          $value = sfYamlInline::load($this->lines[0]);
+          if (is_array($value))
+          {
+            $first = reset($value);
+            if ('*' === substr($first, 0, 1))
+            {
+              $data = array();
+              foreach ($value as $alias)
+              {
+                $data[] = $this->refs[substr($alias, 1)];
+              }
+              $value = $data;
+            }
+          }
+
+          if (isset($mbEncoding))
+          {
+            mb_internal_encoding($mbEncoding);
+          }
+
+          return $value;
+        }
+
+        switch (preg_last_error())
+        {
+          case PREG_INTERNAL_ERROR:
+            $error = 'Internal PCRE error on line';
+            break;
+          case PREG_BACKTRACK_LIMIT_ERROR:
+            $error = 'pcre.backtrack_limit reached on line';
+            break;
+          case PREG_RECURSION_LIMIT_ERROR:
+            $error = 'pcre.recursion_limit reached on line';
+            break;
+          case PREG_BAD_UTF8_ERROR:
+            $error = 'Malformed UTF-8 data on line';
+            break;
+          case PREG_BAD_UTF8_OFFSET_ERROR:
+            $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point on line';
+            break;
+          default:
+            $error = 'Unable to parse line';
+        }
+
+        throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+
+      if ($isRef)
+      {
+        $this->refs[$isRef] = end($data);
+      }
+    }
+
+    if (isset($mbEncoding))
+    {
+      mb_internal_encoding($mbEncoding);
+    }
+
+    return empty($data) ? null : $data;
+  }
+
+  /**
+   * Returns the current line number (takes the offset into account).
+   *
+   * @return integer The current line number
+   */
+  protected function getRealCurrentLineNb()
+  {
+    return $this->currentLineNb + $this->offset;
+  }
+
+  /**
+   * Returns the current line indentation.
+   *
+   * @return integer The current line indentation
+   */
+  protected function getCurrentLineIndentation()
+  {
+    return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
+  }
+
+  /**
+   * Returns the next embed block of YAML.
+   *
+   * @param integer $indentation The indent level at which the block is to be read, or null for default
+   *
+   * @return string A YAML string
+   */
+  protected function getNextEmbedBlock($indentation = null)
+  {
+    $this->moveToNextLine();
+
+    if (null === $indentation)
+    {
+      $newIndent = $this->getCurrentLineIndentation();
+
+      if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
+      {
+        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+    }
+    else
+    {
+      $newIndent = $indentation;
+    }
+
+    $data = array(substr($this->currentLine, $newIndent));
+
+    while ($this->moveToNextLine())
+    {
+      if ($this->isCurrentLineEmpty())
+      {
+        if ($this->isCurrentLineBlank())
+        {
+          $data[] = substr($this->currentLine, $newIndent);
+        }
+
+        continue;
+      }
+
+      $indent = $this->getCurrentLineIndentation();
+
+      if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match))
+      {
+        // empty line
+        $data[] = $match['text'];
+      }
+      else if ($indent >= $newIndent)
+      {
+        $data[] = substr($this->currentLine, $newIndent);
+      }
+      else if (0 == $indent)
+      {
+        $this->moveToPreviousLine();
+
+        break;
+      }
+      else
+      {
+        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+    }
+
+    return implode("\n", $data);
+  }
+
+  /**
+   * Moves the parser to the next line.
+   */
+  protected function moveToNextLine()
+  {
+    if ($this->currentLineNb >= count($this->lines) - 1)
+    {
+      return false;
+    }
+
+    $this->currentLine = $this->lines[++$this->currentLineNb];
+
+    return true;
+  }
+
+  /**
+   * Moves the parser to the previous line.
+   */
+  protected function moveToPreviousLine()
+  {
+    $this->currentLine = $this->lines[--$this->currentLineNb];
+  }
+
+  /**
+   * Parses a YAML value.
+   *
+   * @param  string $value A YAML value
+   *
+   * @return mixed  A PHP value
+   */
+  protected function parseValue($value)
+  {
+    if ('*' === substr($value, 0, 1))
+    {
+      if (false !== $pos = strpos($value, '#'))
+      {
+        $value = substr($value, 1, $pos - 2);
+      }
+      else
+      {
+        $value = substr($value, 1);
+      }
+
+      if (!array_key_exists($value, $this->refs))
+      {
+        throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
+      }
+      return $this->refs[$value];
+    }
+
+    if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches))
+    {
+      $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
+
+      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers)));
+    }
+    else
+    {
+      return sfYamlInline::load($value);
+    }
+  }
+
+  /**
+   * Parses a folded scalar.
+   *
+   * @param  string  $separator   The separator that was used to begin this folded scalar (| or >)
+   * @param  string  $indicator   The indicator that was used to begin this folded scalar (+ or -)
+   * @param  integer $indentation The indentation that was used to begin this folded scalar
+   *
+   * @return string  The text value
+   */
+  protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
+  {
+    $separator = '|' == $separator ? "\n" : ' ';
+    $text = '';
+
+    $notEOF = $this->moveToNextLine();
+
+    while ($notEOF && $this->isCurrentLineBlank())
+    {
+      $text .= "\n";
+
+      $notEOF = $this->moveToNextLine();
+    }
+
+    if (!$notEOF)
+    {
+      return '';
+    }
+
+    if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#', $this->currentLine, $matches))
+    {
+      $this->moveToPreviousLine();
+
+      return '';
+    }
+
+    $textIndent = $matches['indent'];
+    $previousIndent = 0;
+
+    $text .= $matches['text'].$separator;
+    while ($this->currentLineNb + 1 < count($this->lines))
+    {
+      $this->moveToNextLine();
+
+      if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#', $this->currentLine, $matches))
+      {
+        if (' ' == $separator && $previousIndent != $matches['indent'])
+        {
+          $text = substr($text, 0, -1)."\n";
+        }
+        $previousIndent = $matches['indent'];
+
+        $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
+      }
+      else if (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches))
+      {
+        $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
+      }
+      else
+      {
+        $this->moveToPreviousLine();
+
+        break;
+      }
+    }
+
+    if (' ' == $separator)
+    {
+      // replace last separator by a newline
+      $text = preg_replace('/ (\n*)$/', "\n$1", $text);
+    }
+
+    switch ($indicator)
+    {
+      case '':
+        $text = preg_replace('#\n+$#s', "\n", $text);
+        break;
+      case '+':
+        break;
+      case '-':
+        $text = preg_replace('#\n+$#s', '', $text);
+        break;
+    }
+
+    return $text;
+  }
+
+  /**
+   * Returns true if the next line is indented.
+   *
+   * @return Boolean Returns true if the next line is indented, false otherwise
+   */
+  protected function isNextLineIndented()
+  {
+    $currentIndentation = $this->getCurrentLineIndentation();
+    $notEOF = $this->moveToNextLine();
+
+    while ($notEOF && $this->isCurrentLineEmpty())
+    {
+      $notEOF = $this->moveToNextLine();
+    }
+
+    if (false === $notEOF)
+    {
+      return false;
+    }
+
+    $ret = false;
+    if ($this->getCurrentLineIndentation() <= $currentIndentation)
+    {
+      $ret = true;
+    }
+
+    $this->moveToPreviousLine();
+
+    return $ret;
+  }
+
+  /**
+   * Returns true if the current line is blank or if it is a comment line.
+   *
+   * @return Boolean Returns true if the current line is empty or if it is a comment line, false otherwise
+   */
+  protected function isCurrentLineEmpty()
+  {
+    return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
+  }
+
+  /**
+   * Returns true if the current line is blank.
+   *
+   * @return Boolean Returns true if the current line is blank, false otherwise
+   */
+  protected function isCurrentLineBlank()
+  {
+    return '' == trim($this->currentLine, ' ');
+  }
+
+  /**
+   * Returns true if the current line is a comment line.
+   *
+   * @return Boolean Returns true if the current line is a comment line, false otherwise
+   */
+  protected function isCurrentLineComment()
+  {
+    //checking explicitly the first char of the trim is faster than loops or strpos
+    $ltrimmedLine = ltrim($this->currentLine, ' ');
+    return $ltrimmedLine[0] === '#';
+  }
+
+  /**
+   * Cleanups a YAML string to be parsed.
+   *
+   * @param  string $value The input YAML string
+   *
+   * @return string A cleaned up YAML string
+   */
+  protected function cleanup($value)
+  {
+    $value = str_replace(array("\r\n", "\r"), "\n", $value);
+
+    if (!preg_match("#\n$#", $value))
+    {
+      $value .= "\n";
+    }
+
+    // strip YAML header
+    $count = 0;
+    $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#s', '', $value, -1, $count);
+    $this->offset += $count;
+
+    // remove leading comments and/or ---
+    $trimmedValue = preg_replace('#^((\#.*?\n)|(\-\-\-.*?\n))*#s', '', $value, -1, $count);
+    if ($count == 1)
+    {
+      // items have been removed, update the offset
+      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+      $value = $trimmedValue;
+    }
+
+    return $value;
+  }
+}
diff --git a/3rdparty/aws-sdk/sdk.class.php b/3rdparty/aws-sdk/sdk.class.php
new file mode 100755
index 0000000000..4e171b027c
--- /dev/null
+++ b/3rdparty/aws-sdk/sdk.class.php
@@ -0,0 +1,1434 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+/**
+ * Default CFRuntime Exception.
+ */
+class CFRuntime_Exception extends Exception {}
+
+/**
+ * Parsing Exception.
+ */
+class Parser_Exception extends Exception {}
+
+
+/*%******************************************************************************************%*/
+// DETERMINE WHAT ENVIRONMENT DATA TO ADD TO THE USERAGENT FOR METRIC TRACKING
+
+/*
+	Define a temporary callback function for this calculation. Get the PHP version and any
+	required/optional extensions that are leveraged.
+
+	Tracking this data gives Amazon better metrics about what configurations are being used
+	so that forward-looking plans for the code can be made with more certainty (e.g. What
+	version of PHP are most people running? Do they tend to have the latest PCRE?).
+*/
+function __aws_sdk_ua_callback()
+{
+	$ua_append = '';
+	$extensions = get_loaded_extensions();
+	$sorted_extensions = array();
+
+	if ($extensions)
+	{
+		foreach ($extensions as $extension)
+		{
+			if ($extension === 'curl' && function_exists('curl_version'))
+			{
+				$curl_version = curl_version();
+				$sorted_extensions[strtolower($extension)] = $curl_version['version'];
+			}
+			elseif ($extension === 'pcre' && defined('PCRE_VERSION'))
+			{
+				$pcre_version = explode(' ', PCRE_VERSION);
+				$sorted_extensions[strtolower($extension)] = $pcre_version[0];
+			}
+			elseif ($extension === 'openssl' && defined('OPENSSL_VERSION_TEXT'))
+			{
+				$openssl_version = explode(' ', OPENSSL_VERSION_TEXT);
+				$sorted_extensions[strtolower($extension)] = $openssl_version[1];
+			}
+			else
+			{
+				$sorted_extensions[strtolower($extension)] = phpversion($extension);
+			}
+		}
+	}
+
+	foreach (array('simplexml', 'json', 'pcre', 'spl', 'curl', 'openssl', 'apc', 'xcache', 'memcache', 'memcached', 'pdo', 'pdo_sqlite', 'sqlite', 'sqlite3', 'zlib', 'xdebug') as $ua_ext)
+	{
+		if (isset($sorted_extensions[$ua_ext]) && $sorted_extensions[$ua_ext])
+		{
+			$ua_append .= ' ' . $ua_ext . '/' . $sorted_extensions[$ua_ext];
+		}
+		elseif (isset($sorted_extensions[$ua_ext]))
+		{
+			$ua_append .= ' ' . $ua_ext . '/0';
+		}
+	}
+
+	foreach (array('memory_limit', 'date.timezone', 'open_basedir', 'safe_mode', 'zend.enable_gc') as $cfg)
+	{
+		$cfg_value = ini_get($cfg);
+
+		if (in_array($cfg, array('memory_limit', 'date.timezone'), true))
+		{
+			$ua_append .= ' ' . $cfg . '/' . str_replace('/', '.', $cfg_value);
+		}
+		elseif (in_array($cfg, array('open_basedir', 'safe_mode', 'zend.enable_gc'), true))
+		{
+			if ($cfg_value === false || $cfg_value === '' || $cfg_value === 0)
+			{
+				$cfg_value = 'off';
+			}
+			elseif ($cfg_value === true || $cfg_value === '1' || $cfg_value === 1)
+			{
+				$cfg_value = 'on';
+			}
+
+			$ua_append .= ' ' . $cfg . '/' . $cfg_value;
+		}
+	}
+
+	return $ua_append;
+}
+
+
+/*%******************************************************************************************%*/
+// INTERMEDIARY CONSTANTS
+
+define('CFRUNTIME_NAME', 'aws-sdk-php');
+define('CFRUNTIME_VERSION', '1.5.6.2');
+define('CFRUNTIME_BUILD', '20120529180000');
+define('CFRUNTIME_USERAGENT', CFRUNTIME_NAME . '/' . CFRUNTIME_VERSION . ' PHP/' . PHP_VERSION . ' ' . str_replace(' ', '_', php_uname('s')) . '/' . str_replace(' ', '_', php_uname('r')) . ' Arch/' . php_uname('m') . ' SAPI/' . php_sapi_name() . ' Integer/' . PHP_INT_MAX . ' Build/' . CFRUNTIME_BUILD . __aws_sdk_ua_callback());
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Core functionality and default settings shared across all SDK classes. All methods and properties in this
+ * class are inherited by the service-specific classes.
+ *
+ * @version 2012.05.29
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFRuntime
+{
+	/*%******************************************************************************************%*/
+	// CONSTANTS
+
+	/**
+	 * Name of the software.
+	 */
+	const NAME = CFRUNTIME_NAME;
+
+	/**
+	 * Version of the software.
+	 */
+	const VERSION = CFRUNTIME_VERSION;
+
+	/**
+	 * Build ID of the software.
+	 */
+	const BUILD = CFRUNTIME_BUILD;
+
+	/**
+	 * User agent string used to identify the software.
+	 */
+	const USERAGENT = CFRUNTIME_USERAGENT;
+
+
+	/*%******************************************************************************************%*/
+	// PROPERTIES
+
+	/**
+	 * The Amazon API Key.
+	 */
+	public $key;
+
+	/**
+	 * The Amazon API Secret Key.
+	 */
+	public $secret_key;
+
+	/**
+	 * The Amazon Authentication Token.
+	 */
+	public $auth_token;
+
+	/**
+	 * Handle for the utility functions.
+	 */
+	public $util;
+
+	/**
+	 * An identifier for the current AWS service.
+	 */
+	public $service = null;
+
+	/**
+	 * The supported API version.
+	 */
+	public $api_version = null;
+
+	/**
+	 * The state of whether auth should be handled as AWS Query.
+	 */
+	public $use_aws_query = true;
+
+	/**
+	 * The default class to use for utilities (defaults to <CFUtilities>).
+	 */
+	public $utilities_class = 'CFUtilities';
+
+	/**
+	 * The default class to use for HTTP requests (defaults to <CFRequest>).
+	 */
+	public $request_class = 'CFRequest';
+
+	/**
+	 * The default class to use for HTTP responses (defaults to <CFResponse>).
+	 */
+	public $response_class = 'CFResponse';
+
+	/**
+	 * The default class to use for parsing XML (defaults to <CFSimpleXML>).
+	 */
+	public $parser_class = 'CFSimpleXML';
+
+	/**
+	 * The default class to use for handling batch requests (defaults to <CFBatchRequest>).
+	 */
+	public $batch_class = 'CFBatchRequest';
+
+	/**
+	 * The state of SSL/HTTPS use.
+	 */
+	public $use_ssl = true;
+
+	/**
+	 * The state of SSL certificate verification.
+	 */
+	public $ssl_verification = true;
+
+	/**
+	 * The proxy to use for connecting.
+	 */
+	public $proxy = null;
+
+	/**
+	 * The alternate hostname to use, if any.
+	 */
+	public $hostname = null;
+
+	/**
+	 * The state of the capability to override the hostname with <set_hostname()>.
+	 */
+	public $override_hostname = true;
+
+	/**
+	 * The alternate port number to use, if any.
+	 */
+	public $port_number = null;
+
+	/**
+	 * The alternate resource prefix to use, if any.
+	 */
+	public $resource_prefix = null;
+
+	/**
+	 * The state of cache flow usage.
+	 */
+	public $use_cache_flow = false;
+
+	/**
+	 * The caching class to use.
+	 */
+	public $cache_class = null;
+
+	/**
+	 * The caching location to use.
+	 */
+	public $cache_location = null;
+
+	/**
+	 * When the cache should be considered stale.
+	 */
+	public $cache_expires = null;
+
+	/**
+	 * The state of cache compression.
+	 */
+	public $cache_compress = null;
+
+	/**
+	 * The current instantiated cache object.
+	 */
+	public $cache_object = null;
+
+	/**
+	 * The current instantiated batch request object.
+	 */
+	public $batch_object = null;
+
+	/**
+	 * The internally instantiated batch request object.
+	 */
+	public $internal_batch_object = null;
+
+	/**
+	 * The state of batch flow usage.
+	 */
+	public $use_batch_flow = false;
+
+	/**
+	 * The state of the cache deletion setting.
+	 */
+	public $delete_cache = false;
+
+	/**
+	 * The state of the debug mode setting.
+	 */
+	public $debug_mode = false;
+
+	/**
+	 * The number of times to retry failed requests.
+	 */
+	public $max_retries = 3;
+
+	/**
+	 * The user-defined callback function to call when a stream is read from.
+	 */
+	public $registered_streaming_read_callback = null;
+
+	/**
+	 * The user-defined callback function to call when a stream is written to.
+	 */
+	public $registered_streaming_write_callback = null;
+
+	/**
+	 * The credentials to use for authentication.
+	 */
+	public $credentials = array();
+
+	/**
+	 * The authentication class to use.
+	 */
+	public $auth_class = null;
+
+	/**
+	 * The operation to execute.
+	 */
+	public $operation = null;
+
+	/**
+	 * The payload to send.
+	 */
+	public $payload = array();
+
+	/**
+	 * The string prefix to prepend to the operation name.
+	 */
+	public $operation_prefix = '';
+
+	/**
+	 * The number of times a request has been retried.
+	 */
+	public $redirects = 0;
+
+	/**
+	 * The state of whether the response should be parsed or not.
+	 */
+	public $parse_the_response = true;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * The constructor. This class should not be instantiated directly. Rather, a service-specific class
+	 * should be instantiated.
+	 *
+	 * @param array $options (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>certificate_authority</code> - <code>boolean</code> - Optional - Determines which Cerificate Authority file to use. A value of boolean <code>false</code> will use the Certificate Authority file available on the system. A value of boolean <code>true</code> will use the Certificate Authority provided by the SDK. Passing a file system path to a Certificate Authority file (chmodded to <code>0755</code>) will use that. Leave this set to <code>false</code> if you're not sure.</li>
+	 * 	<li><code>credentials</code> - <code>string</code> - Optional - The name of the credential set to use for authentication.</li>
+	 * 	<li><code>default_cache_config</code> - <code>string</code> - Optional - This option allows a preferred storage type to be configured for long-term caching. This can be changed later using the <set_cache_config()> method. Valid values are: <code>apc</code>, <code>xcache</code>, or a file system path such as <code>./cache</code> or <code>/tmp/cache/</code>.</li>
+	 * 	<li><code>key</code> - <code>string</code> - Optional - Your AWS key, or a session key. If blank, the default credential set will be used.</li>
+	 * 	<li><code>secret</code> - <code>string</code> - Optional - Your AWS secret key, or a session secret key. If blank, the default credential set will be used.</li>
+	 * 	<li><code>token</code> - <code>string</code> - Optional - An AWS session token.</li></ul>
+	 * @return void
+	 */
+	public function __construct(array $options = array())
+	{
+		// Instantiate the utilities class.
+		$this->util = new $this->utilities_class();
+
+		// Determine the current service.
+		$this->service = get_class($this);
+
+		// Create credentials based on the options
+		$instance_credentials = new CFCredential($options);
+
+		// Retreive a credential set from config.inc.php if it exists
+		if (isset($options['credentials']))
+		{
+			// Use a specific credential set and merge with the instance credentials
+			$this->credentials = CFCredentials::get($options['credentials'])
+				->merge($instance_credentials);
+		}
+		else
+		{
+			try
+			{
+				// Use the default credential set and merge with the instance credentials
+				$this->credentials = CFCredentials::get(CFCredentials::DEFAULT_KEY)
+					->merge($instance_credentials);
+			}
+			catch (CFCredentials_Exception $e)
+			{
+				if (isset($options['key']) && isset($options['secret']))
+				{
+					// Only the instance credentials were provided
+					$this->credentials = $instance_credentials;
+				}
+				else
+				{
+					// No credentials provided in the config file or constructor
+					throw new CFCredentials_Exception('No credentials were provided to ' . $this->service . '.');
+				}
+			}
+		}
+
+		// Set internal credentials after they are resolved
+		$this->key = $this->credentials->key;
+		$this->secret_key = $this->credentials->secret;
+		$this->auth_token = $this->credentials->token;
+
+		// Automatically enable whichever caching mechanism is set to default.
+		$this->set_cache_config($this->credentials->default_cache_config);
+	}
+
+	/**
+	 * Alternate approach to constructing a new instance. Supports chaining.
+	 *
+	 * @param array $options (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>certificate_authority</code> - <code>boolean</code> - Optional - Determines which Cerificate Authority file to use. A value of boolean <code>false</code> will use the Certificate Authority file available on the system. A value of boolean <code>true</code> will use the Certificate Authority provided by the SDK. Passing a file system path to a Certificate Authority file (chmodded to <code>0755</code>) will use that. Leave this set to <code>false</code> if you're not sure.</li>
+	 * 	<li><code>credentials</code> - <code>string</code> - Optional - The name of the credential set to use for authentication.</li>
+	 * 	<li><code>default_cache_config</code> - <code>string</code> - Optional - This option allows a preferred storage type to be configured for long-term caching. This can be changed later using the <set_cache_config()> method. Valid values are: <code>apc</code>, <code>xcache</code>, or a file system path such as <code>./cache</code> or <code>/tmp/cache/</code>.</li>
+	 * 	<li><code>key</code> - <code>string</code> - Optional - Your AWS key, or a session key. If blank, the default credential set will be used.</li>
+	 * 	<li><code>secret</code> - <code>string</code> - Optional - Your AWS secret key, or a session secret key. If blank, the default credential set will be used.</li>
+	 * 	<li><code>token</code> - <code>string</code> - Optional - An AWS session token.</li></ul>
+	 * @return void
+	 */
+	public static function factory(array $options = array())
+	{
+		if (version_compare(PHP_VERSION, '5.3.0', '<'))
+		{
+			throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::factory().');
+		}
+
+		$self = get_called_class();
+		return new $self($options);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// MAGIC METHODS
+
+	/**
+	 * A magic method that allows `camelCase` method names to be translated into `snake_case` names.
+	 *
+	 * @param string $name (Required) The name of the method.
+	 * @param array $arguments (Required) The arguments passed to the method.
+	 * @return mixed The results of the intended method.
+	 */
+	public function  __call($name, $arguments)
+	{
+		// Convert camelCase method calls to snake_case.
+		$method_name = strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $name));
+
+		if (method_exists($this, $method_name))
+		{
+			return call_user_func_array(array($this, $method_name), $arguments);
+		}
+
+		throw new CFRuntime_Exception('The method ' . $name . '() is undefined. Attempted to map to ' . $method_name . '() which is also undefined. Error occurred');
+	}
+
+
+	/*%******************************************************************************************%*/
+	// SET CUSTOM SETTINGS
+
+	/**
+	 * Set the proxy settings to use.
+	 *
+	 * @param string $proxy (Required) Accepts proxy credentials in the following format: `proxy://user:pass@hostname:port`
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_proxy($proxy)
+	{
+		$this->proxy = $proxy;
+		return $this;
+	}
+
+	/**
+	 * Set the hostname to connect to. This is useful for alternate services that are API-compatible with
+	 * AWS, but run from a different hostname.
+	 *
+	 * @param string $hostname (Required) The alternate hostname to use in place of the default one. Useful for mock or test applications living on different hostnames.
+	 * @param integer $port_number (Optional) The alternate port number to use in place of the default one. Useful for mock or test applications living on different port numbers.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_hostname($hostname, $port_number = null)
+	{
+		if ($this->override_hostname)
+		{
+			$this->hostname = $hostname;
+
+			if ($port_number)
+			{
+				$this->port_number = $port_number;
+				$this->hostname .= ':' . (string) $this->port_number;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the resource prefix to use. This method is useful for alternate services that are API-compatible
+	 * with AWS.
+	 *
+	 * @param string $prefix (Required) An alternate prefix to prepend to the resource path. Useful for mock or test applications.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_resource_prefix($prefix)
+	{
+		$this->resource_prefix = $prefix;
+		return $this;
+	}
+
+	/**
+	 * Disables any subsequent use of the <set_hostname()> method.
+	 *
+	 * @param boolean $override (Optional) Whether or not subsequent calls to <set_hostname()> should be obeyed. A `false` value disables the further effectiveness of <set_hostname()>. Defaults to `true`.
+	 * @return $this A reference to the current instance.
+	 */
+	public function allow_hostname_override($override = true)
+	{
+		$this->override_hostname = $override;
+		return $this;
+	}
+
+	/**
+	 * Disables SSL/HTTPS connections for hosts that don't support them. Some services, however, still
+	 * require SSL support.
+	 *
+	 * This method will throw a user warning when invoked, which can be hidden by changing your
+	 * <php:error_reporting()> settings.
+	 *
+	 * @return $this A reference to the current instance.
+	 */
+	public function disable_ssl()
+	{
+		trigger_error('Disabling SSL connections is potentially unsafe and highly discouraged.', E_USER_WARNING);
+		$this->use_ssl = false;
+		return $this;
+	}
+
+	/**
+	 * Disables the verification of the SSL Certificate Authority. Doing so can enable an attacker to carry
+	 * out a man-in-the-middle attack.
+	 *
+	 * https://secure.wikimedia.org/wikipedia/en/wiki/Man-in-the-middle_attack
+	 *
+	 * This method will throw a user warning when invoked, which can be hidden by changing your
+	 * <php:error_reporting()> settings.
+	 *
+	 * @return $this A reference to the current instance.
+	 */
+	public function disable_ssl_verification($ssl_verification = false)
+	{
+		trigger_error('Disabling the verification of SSL certificates can lead to man-in-the-middle attacks. It is potentially unsafe and highly discouraged.', E_USER_WARNING);
+		$this->ssl_verification = $ssl_verification;
+		return $this;
+	}
+
+	/**
+	 * Enables HTTP request/response header logging to `STDERR`.
+	 *
+	 * @param boolean $enabled (Optional) Whether or not to enable debug mode. Defaults to `true`.
+	 * @return $this A reference to the current instance.
+	 */
+	public function enable_debug_mode($enabled = true)
+	{
+		$this->debug_mode = $enabled;
+		return $this;
+	}
+
+	/**
+	 * Sets the maximum number of times to retry failed requests.
+	 *
+	 * @param integer $retries (Optional) The maximum number of times to retry failed requests. Defaults to `3`.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_max_retries($retries = 3)
+	{
+		$this->max_retries = $retries;
+		return $this;
+	}
+
+	/**
+	 * Set the caching configuration to use for response caching.
+	 *
+	 * @param string $location (Required) <p>The location to store the cache object in. This may vary by cache method.</p><ul><li>File - The local file system paths such as <code>./cache</code> (relative) or <code>/tmp/cache/</code> (absolute). The location must be server-writable.</li><li>APC - Pass in <code>apc</code> to use this lightweight cache. You must have the <a href="http://php.net/apc">APC extension</a> installed.</li><li>XCache - Pass in <code>xcache</code> to use this lightweight cache. You must have the <a href="http://xcache.lighttpd.net">XCache</a> extension installed.</li><li>Memcached - Pass in an indexed array of associative arrays. Each associative array should have a <code>host</code> and a <code>port</code> value representing a <a href="http://php.net/memcached">Memcached</a> server to connect to.</li><li>PDO - A URL-style string (e.g. <code>pdo.mysql://user:pass@localhost/cache</code>) or a standard DSN-style string (e.g. <code>pdo.sqlite:/sqlite/cache.db</code>). MUST be prefixed with <code>pdo.</code>. See <code>CachePDO</code> and <a href="http://php.net/pdo">PDO</a> for more details.</li></ul>
+	 * @param boolean $gzip (Optional) Whether or not data should be gzipped before being stored. A value of `true` will compress the contents before caching them. A value of `false` will leave the contents uncompressed. Defaults to `true`.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_cache_config($location, $gzip = true)
+	{
+		// If we have an array, we're probably passing in Memcached servers and ports.
+		if (is_array($location))
+		{
+			$this->cache_class = 'CacheMC';
+		}
+		else
+		{
+			// I would expect locations like `/tmp/cache`, `pdo.mysql://user:pass@hostname:port`, `pdo.sqlite:memory:`, and `apc`.
+			$type = strtolower(substr($location, 0, 3));
+			switch ($type)
+			{
+				case 'apc':
+					$this->cache_class = 'CacheAPC';
+					break;
+
+				case 'xca': // First three letters of `xcache`
+					$this->cache_class = 'CacheXCache';
+					break;
+
+				case 'pdo':
+					$this->cache_class = 'CachePDO';
+					$location = substr($location, 4);
+					break;
+
+				default:
+					$this->cache_class = 'CacheFile';
+					break;
+			}
+		}
+
+		// Set the remaining cache information.
+		$this->cache_location = $location;
+		$this->cache_compress = $gzip;
+
+		return $this;
+	}
+
+	/**
+	 * Register a callback function to execute whenever a data stream is read from using
+	 * <CFRequest::streaming_read_callback()>.
+	 *
+	 * The user-defined callback function should accept three arguments:
+	 *
+	 * <ul>
+	 * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
+	 * 	<li><code>$file_handle</code> - <code>resource</code> - Required - The file handle resource that represents the file on the local file system.</li>
+	 * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
+	 * </ul>
+	 *
+	 * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
+	 * 	<li>The name of a global function to execute, passed as a string.</li>
+	 * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
+	 * 	<li>An anonymous function (PHP 5.3+).</li></ul>
+	 * @return $this A reference to the current instance.
+	 */
+	public function register_streaming_read_callback($callback)
+	{
+		$this->registered_streaming_read_callback = $callback;
+		return $this;
+	}
+
+	/**
+	 * Register a callback function to execute whenever a data stream is written to using
+	 * <CFRequest::streaming_write_callback()>.
+	 *
+	 * The user-defined callback function should accept two arguments:
+	 *
+	 * <ul>
+	 * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
+	 * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
+	 * </ul>
+	 *
+	 * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
+	 * 	<li>The name of a global function to execute, passed as a string.</li>
+	 * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
+	 * 	<li>An anonymous function (PHP 5.3+).</li></ul>
+	 * @return $this A reference to the current instance.
+	 */
+	public function register_streaming_write_callback($callback)
+	{
+		$this->registered_streaming_write_callback = $callback;
+		return $this;
+	}
+
+	/**
+	 * Fetches and caches STS credentials. This is meant to be used by the constructor, and is not to be
+	 * manually invoked.
+	 *
+	 * @param CacheCore $cache (Required) The a reference to the cache object that is being used to handle the caching.
+	 * @param array $options (Required) The options that were passed into the constructor.
+	 * @return mixed The data to be cached, or NULL.
+	 */
+	public function cache_sts_credentials($cache, $options)
+	{
+		$token = new AmazonSTS($options);
+		$response = $token->get_session_token();
+
+		if ($response->isOK())
+		{
+			// Update the expiration
+			$expiration_time = strtotime((string) $response->body->GetSessionTokenResult->Credentials->Expiration);
+			$expiration_duration = round(($expiration_time - time()) * 0.85);
+			$cache->expire_in($expiration_duration);
+
+			// Return the important data
+			return array(
+				'key'     => (string) $response->body->GetSessionTokenResult->Credentials->AccessKeyId,
+				'secret'  => (string) $response->body->GetSessionTokenResult->Credentials->SecretAccessKey,
+				'token'   => (string) $response->body->GetSessionTokenResult->Credentials->SessionToken,
+				'expires' => (string) $response->body->GetSessionTokenResult->Credentials->Expiration,
+			);
+		}
+
+		return null;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// SET CUSTOM CLASSES
+
+	/**
+	 * Set a custom class for this functionality. Use this method when extending/overriding existing classes
+	 * with new functionality.
+	 *
+	 * The replacement class must extend from <CFUtilities>.
+	 *
+	 * @param string $class (Optional) The name of the new class to use for this functionality.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_utilities_class($class = 'CFUtilities')
+	{
+		$this->utilities_class = $class;
+		$this->util = new $this->utilities_class();
+		return $this;
+	}
+
+	/**
+	 * Set a custom class for this functionality. Use this method when extending/overriding existing classes
+	 * with new functionality.
+	 *
+	 * The replacement class must extend from <CFRequest>.
+	 *
+	 * @param string $class (Optional) The name of the new class to use for this functionality.
+	 * @param $this A reference to the current instance.
+	 */
+	public function set_request_class($class = 'CFRequest')
+	{
+		$this->request_class = $class;
+		return $this;
+	}
+
+	/**
+	 * Set a custom class for this functionality. Use this method when extending/overriding existing classes
+	 * with new functionality.
+	 *
+	 * The replacement class must extend from <CFResponse>.
+	 *
+	 * @param string $class (Optional) The name of the new class to use for this functionality.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_response_class($class = 'CFResponse')
+	{
+		$this->response_class = $class;
+		return $this;
+	}
+
+	/**
+	 * Set a custom class for this functionality. Use this method when extending/overriding existing classes
+	 * with new functionality.
+	 *
+	 * The replacement class must extend from <CFSimpleXML>.
+	 *
+	 * @param string $class (Optional) The name of the new class to use for this functionality.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_parser_class($class = 'CFSimpleXML')
+	{
+		$this->parser_class = $class;
+		return $this;
+	}
+
+	/**
+	 * Set a custom class for this functionality. Use this method when extending/overriding existing classes
+	 * with new functionality.
+	 *
+	 * The replacement class must extend from <CFBatchRequest>.
+	 *
+	 * @param string $class (Optional) The name of the new class to use for this functionality.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_batch_class($class = 'CFBatchRequest')
+	{
+		$this->batch_class = $class;
+		return $this;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// AUTHENTICATION
+
+	/**
+	 * Default, shared method for authenticating a connection to AWS.
+	 *
+	 * @param string $operation (Required) Indicates the operation to perform.
+	 * @param array $payload (Required) An associative array of parameters for authenticating. See the individual methods for allowed keys.
+	 * @return CFResponse Object containing a parsed HTTP response.
+	 */
+	public function authenticate($operation, $payload)
+	{
+		$original_payload = $payload;
+		$method_arguments = func_get_args();
+		$curlopts = array();
+		$return_curl_handle = false;
+
+		if (substr($operation, 0, strlen($this->operation_prefix)) !== $this->operation_prefix)
+		{
+			$operation = $this->operation_prefix . $operation;
+		}
+
+		// Extract the custom CURLOPT settings from the payload
+		if (is_array($payload) && isset($payload['curlopts']))
+		{
+			$curlopts = $payload['curlopts'];
+			unset($payload['curlopts']);
+		}
+
+		// Determine whether the response or curl handle should be returned
+		if (is_array($payload) && isset($payload['returnCurlHandle']))
+		{
+			$return_curl_handle = isset($payload['returnCurlHandle']) ? $payload['returnCurlHandle'] : false;
+			unset($payload['returnCurlHandle']);
+		}
+
+		// Use the caching flow to determine if we need to do a round-trip to the server.
+		if ($this->use_cache_flow)
+		{
+			// Generate an identifier specific to this particular set of arguments.
+			$cache_id = $this->key . '_' . get_class($this) . '_' . $operation . '_' . sha1(serialize($method_arguments));
+
+			// Instantiate the appropriate caching object.
+			$this->cache_object = new $this->cache_class($cache_id, $this->cache_location, $this->cache_expires, $this->cache_compress);
+
+			if ($this->delete_cache)
+			{
+				$this->use_cache_flow = false;
+				$this->delete_cache = false;
+				return $this->cache_object->delete();
+			}
+
+			// Invoke the cache callback function to determine whether to pull data from the cache or make a fresh request.
+			$data = $this->cache_object->response_manager(array($this, 'cache_callback'), $method_arguments);
+
+			// Parse the XML body
+			$data = $this->parse_callback($data);
+
+			// End!
+			return $data;
+		}
+
+		/*%******************************************************************************************%*/
+
+		// Signer
+		$signer = new $this->auth_class($this->hostname, $operation, $payload, $this->credentials);
+		$signer->key = $this->key;
+		$signer->secret_key = $this->secret_key;
+		$signer->auth_token = $this->auth_token;
+		$signer->api_version = $this->api_version;
+		$signer->utilities_class = $this->utilities_class;
+		$signer->request_class = $this->request_class;
+		$signer->response_class = $this->response_class;
+		$signer->use_ssl = $this->use_ssl;
+		$signer->proxy = $this->proxy;
+		$signer->util = $this->util;
+		$signer->registered_streaming_read_callback = $this->registered_streaming_read_callback;
+		$signer->registered_streaming_write_callback = $this->registered_streaming_write_callback;
+		$request = $signer->authenticate();
+
+		// Update RequestCore settings
+		$request->request_class = $this->request_class;
+		$request->response_class = $this->response_class;
+		$request->ssl_verification = $this->ssl_verification;
+
+		/*%******************************************************************************************%*/
+
+		// Debug mode
+		if ($this->debug_mode)
+		{
+			$request->debug_mode = $this->debug_mode;
+		}
+
+		// Set custom CURLOPT settings
+		if (count($curlopts))
+		{
+			$request->set_curlopts($curlopts);
+		}
+
+		// Manage the (newer) batch request API or the (older) returnCurlHandle setting.
+		if ($this->use_batch_flow)
+		{
+			$handle = $request->prep_request();
+			$this->batch_object->add($handle);
+			$this->use_batch_flow = false;
+
+			return $handle;
+		}
+		elseif ($return_curl_handle)
+		{
+			return $request->prep_request();
+		}
+
+		// Send!
+		$request->send_request();
+
+		// Prepare the response.
+		$headers = $request->get_response_header();
+		$headers['x-aws-stringtosign'] = $signer->string_to_sign;
+
+		if (isset($signer->canonical_request))
+		{
+			$headers['x-aws-canonicalrequest'] = $signer->canonical_request;
+		}
+
+		$headers['x-aws-request-headers'] = $request->request_headers;
+		$headers['x-aws-body'] = $signer->querystring;
+
+		$data = new $this->response_class($headers, ($this->parse_the_response === true) ? $this->parse_callback($request->get_response_body()) : $request->get_response_body(), $request->get_response_code());
+
+		// Was it Amazon's fault the request failed? Retry the request until we reach $max_retries.
+		if (
+		    (integer) $request->get_response_code() === 500 || // Internal Error (presumably transient)
+		    (integer) $request->get_response_code() === 503)   // Service Unavailable (presumably transient)
+		{
+			if ($this->redirects <= $this->max_retries)
+			{
+				// Exponential backoff
+				$delay = (integer) (pow(4, $this->redirects) * 100000);
+				usleep($delay);
+				$this->redirects++;
+				$data = $this->authenticate($operation, $original_payload);
+			}
+		}
+
+		// DynamoDB has custom logic
+		elseif (
+			(integer) $request->get_response_code() === 400 &&
+			 stripos((string) $request->get_response_body(), 'com.amazonaws.dynamodb.') !== false && (
+				stripos((string) $request->get_response_body(), 'ProvisionedThroughputExceededException') !== false
+			)
+		)
+		{
+			if ($this->redirects === 0)
+			{
+				$this->redirects++;
+				$data = $this->authenticate($operation, $original_payload);
+			}
+			elseif ($this->redirects <= max($this->max_retries, 10))
+			{
+				// Exponential backoff
+				$delay = (integer) (pow(2, ($this->redirects - 1)) * 50000);
+				usleep($delay);
+				$this->redirects++;
+				$data = $this->authenticate($operation, $original_payload);
+			}
+		}
+
+		$this->redirects = 0;
+		return $data;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// BATCH REQUEST LAYER
+
+	/**
+	 * Specifies that the intended request should be queued for a later batch request.
+	 *
+	 * @param CFBatchRequest $queue (Optional) The <CFBatchRequest> instance to use for managing batch requests. If not available, it generates a new instance of <CFBatchRequest>.
+	 * @return $this A reference to the current instance.
+	 */
+	public function batch(CFBatchRequest &$queue = null)
+	{
+		if ($queue)
+		{
+			$this->batch_object = $queue;
+		}
+		elseif ($this->internal_batch_object)
+		{
+			$this->batch_object = &$this->internal_batch_object;
+		}
+		else
+		{
+			$this->internal_batch_object = new $this->batch_class();
+			$this->batch_object = &$this->internal_batch_object;
+		}
+
+		$this->use_batch_flow = true;
+
+		return $this;
+	}
+
+	/**
+	 * Executes the batch request queue by sending all queued requests.
+	 *
+	 * @param boolean $clear_after_send (Optional) Whether or not to clear the batch queue after sending a request. Defaults to `true`. Set this to `false` if you are caching batch responses and want to retrieve results later.
+	 * @return array An array of <CFResponse> objects.
+	 */
+	public function send($clear_after_send = true)
+	{
+		if ($this->use_batch_flow)
+		{
+			// When we send the request, disable batch flow.
+			$this->use_batch_flow = false;
+
+			// If we're not caching, simply send the request.
+			if (!$this->use_cache_flow)
+			{
+				$response = $this->batch_object->send();
+				$parsed_data = array_map(array($this, 'parse_callback'), $response);
+				$parsed_data = new CFArray($parsed_data);
+
+				// Clear the queue
+				if ($clear_after_send)
+				{
+					$this->batch_object->queue = array();
+				}
+
+				return $parsed_data;
+			}
+
+			// Generate an identifier specific to this particular set of arguments.
+			$cache_id = $this->key . '_' . get_class($this) . '_' . sha1(serialize($this->batch_object));
+
+			// Instantiate the appropriate caching object.
+			$this->cache_object = new $this->cache_class($cache_id, $this->cache_location, $this->cache_expires, $this->cache_compress);
+
+			if ($this->delete_cache)
+			{
+				$this->use_cache_flow = false;
+				$this->delete_cache = false;
+				return $this->cache_object->delete();
+			}
+
+			// Invoke the cache callback function to determine whether to pull data from the cache or make a fresh request.
+			$data_set = $this->cache_object->response_manager(array($this, 'cache_callback_batch'), array($this->batch_object));
+			$parsed_data = array_map(array($this, 'parse_callback'), $data_set);
+			$parsed_data = new CFArray($parsed_data);
+
+			// Clear the queue
+			if ($clear_after_send)
+			{
+				$this->batch_object->queue = array();
+			}
+
+			// End!
+			return $parsed_data;
+		}
+
+		// Load the class
+		$null = new CFBatchRequest();
+		unset($null);
+
+		throw new CFBatchRequest_Exception('You must use $object->batch()->send()');
+	}
+
+	/**
+	 * Parses a response body into a PHP object if appropriate.
+	 *
+	 * @param CFResponse|string $response (Required) The <CFResponse> object to parse, or an XML string that would otherwise be a response body.
+	 * @param string $content_type (Optional) The content-type to use when determining how to parse the content.
+	 * @return CFResponse|string A parsed <CFResponse> object, or parsed XML.
+	 */
+	public function parse_callback($response, $headers = null)
+	{
+		// Bail out
+		if (!$this->parse_the_response) return $response;
+
+		// Shorten this so we have a (mostly) single code path
+		if (isset($response->body))
+		{
+			if (is_string($response->body))
+			{
+				$body = $response->body;
+			}
+			else
+			{
+				return $response;
+			}
+		}
+		elseif (is_string($response))
+		{
+			$body = $response;
+		}
+		else
+		{
+			return $response;
+		}
+
+		// Decompress gzipped content
+		if (isset($headers['content-encoding']))
+		{
+			switch (strtolower(trim($headers['content-encoding'], "\x09\x0A\x0D\x20")))
+			{
+				case 'gzip':
+				case 'x-gzip':
+					$decoder = new CFGzipDecode($body);
+					if ($decoder->parse())
+					{
+						$body = $decoder->data;
+					}
+					break;
+
+				case 'deflate':
+					if (($uncompressed = gzuncompress($body)) !== false)
+					{
+						$body = $uncompressed;
+					}
+					elseif (($uncompressed = gzinflate($body)) !== false)
+					{
+						$body = $uncompressed;
+					}
+					break;
+			}
+		}
+
+		// Look for XML cues
+		if (
+			(isset($headers['content-type']) && ($headers['content-type'] === 'text/xml' || $headers['content-type'] === 'application/xml')) || // We know it's XML
+			(!isset($headers['content-type']) && (stripos($body, '<?xml') === 0 || strpos($body, '<Error>') === 0) || preg_match('/^<(\w*) xmlns="http(s?):\/\/(\w*).amazon(aws)?.com/im', $body)) // Sniff for XML
+		)
+		{
+			// Strip the default XML namespace to simplify XPath expressions
+			$body = str_replace("xmlns=", "ns=", $body);
+
+			try {
+				// Parse the XML body
+				$body = new $this->parser_class($body);
+			}
+			catch (Exception $e)
+			{
+				throw new Parser_Exception($e->getMessage());
+			}
+		}
+		// Look for JSON cues
+		elseif (
+			(isset($headers['content-type']) && ($headers['content-type'] === 'application/json') || $headers['content-type'] === 'application/x-amz-json-1.0') || // We know it's JSON
+			(!isset($headers['content-type']) && $this->util->is_json($body)) // Sniff for JSON
+		)
+		{
+			// Normalize JSON to a CFSimpleXML object
+			$body = CFJSON::to_xml($body, $this->parser_class);
+		}
+
+		// Put the parsed data back where it goes
+		if (isset($response->body))
+		{
+			$response->body = $body;
+		}
+		else
+		{
+			$response = $body;
+		}
+
+		return $response;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// CACHING LAYER
+
+	/**
+	 * Specifies that the resulting <CFResponse> object should be cached according to the settings from
+	 * <set_cache_config()>.
+	 *
+	 * @param string|integer $expires (Required) The time the cache is to expire. Accepts a number of seconds as an integer, or an amount of time, as a string, that is understood by <php:strtotime()> (e.g. "1 hour").
+	 * @param $this A reference to the current instance.
+	 * @return $this
+	 */
+	public function cache($expires)
+	{
+		// Die if they haven't used set_cache_config().
+		if (!$this->cache_class)
+		{
+			throw new CFRuntime_Exception('Must call set_cache_config() before using cache()');
+		}
+
+		if (is_string($expires))
+		{
+			$expires = strtotime($expires);
+			$this->cache_expires = $expires - time();
+		}
+		elseif (is_int($expires))
+		{
+			$this->cache_expires = $expires;
+		}
+
+		$this->use_cache_flow = true;
+
+		return $this;
+	}
+
+	/**
+	 * The callback function that is executed when the cache doesn't exist or has expired. The response of
+	 * this method is cached. Accepts identical parameters as the <authenticate()> method. Never call this
+	 * method directly -- it is used internally by the caching system.
+	 *
+	 * @param string $operation (Required) Indicates the operation to perform.
+	 * @param array $payload (Required) An associative array of parameters for authenticating. See the individual methods for allowed keys.
+	 * @return CFResponse A parsed HTTP response.
+	 */
+	public function cache_callback($operation, $payload)
+	{
+		// Disable the cache flow since it's already been handled.
+		$this->use_cache_flow = false;
+
+		// Make the request
+		$response = $this->authenticate($operation, $payload);
+
+		// If this is an XML document, convert it back to a string.
+		if (isset($response->body) && ($response->body instanceof SimpleXMLElement))
+		{
+			$response->body = $response->body->asXML();
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Used for caching the results of a batch request. Never call this method directly; it is used
+	 * internally by the caching system.
+	 *
+	 * @param CFBatchRequest $batch (Required) The batch request object to send.
+	 * @return CFResponse A parsed HTTP response.
+	 */
+	public function cache_callback_batch(CFBatchRequest $batch)
+	{
+		return $batch->send();
+	}
+
+	/**
+	 * Deletes a cached <CFResponse> object using the specified cache storage type.
+	 *
+	 * @return boolean A value of `true` if cached object exists and is successfully deleted, otherwise `false`.
+	 */
+	public function delete_cache()
+	{
+		$this->use_cache_flow = true;
+		$this->delete_cache = true;
+
+		return $this;
+	}
+}
+
+
+/**
+ * Contains the functionality for auto-loading service classes.
+ */
+class CFLoader
+{
+	/*%******************************************************************************************%*/
+	// AUTO-LOADER
+
+	/**
+	 * Automatically load classes that aren't included.
+	 *
+	 * @param string $class (Required) The classname to load.
+	 * @return boolean Whether or not the file was successfully loaded.
+	 */
+	public static function autoloader($class)
+	{
+		$path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+
+		// Amazon SDK classes
+		if (strstr($class, 'Amazon'))
+		{
+			if (file_exists($require_this = $path . 'services' . DIRECTORY_SEPARATOR . str_ireplace('Amazon', '', strtolower($class)) . '.class.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Utility classes
+		elseif (strstr($class, 'CF'))
+		{
+			if (file_exists($require_this = $path . 'utilities' . DIRECTORY_SEPARATOR . str_ireplace('CF', '', strtolower($class)) . '.class.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Load CacheCore
+		elseif (strstr($class, 'Cache'))
+		{
+			if (file_exists($require_this = $path . 'lib' . DIRECTORY_SEPARATOR . 'cachecore' . DIRECTORY_SEPARATOR . strtolower($class) . '.class.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Load RequestCore
+		elseif (strstr($class, 'RequestCore') || strstr($class, 'ResponseCore'))
+		{
+			if (file_exists($require_this = $path . 'lib' . DIRECTORY_SEPARATOR . 'requestcore' . DIRECTORY_SEPARATOR . 'requestcore.class.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Load array-to-domdocument
+		elseif (strstr($class, 'Array2DOM'))
+		{
+			if (file_exists($require_this = $path . 'lib' . DIRECTORY_SEPARATOR . 'dom' . DIRECTORY_SEPARATOR . 'ArrayToDOMDocument.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Load Authentication Signers
+		elseif (strstr($class, 'Auth'))
+		{
+			if (file_exists($require_this = $path . 'authentication' . DIRECTORY_SEPARATOR . str_replace('auth', 'signature_', strtolower($class)) . '.class.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Load Signer interface
+		elseif ($class === 'Signer')
+		{
+			if (!interface_exists('Signable', false) &&
+			    file_exists($require_this = $path . 'authentication' . DIRECTORY_SEPARATOR . 'signable.interface.php'))
+			{
+				require_once $require_this;
+			}
+
+			if (file_exists($require_this = $path . 'authentication' . DIRECTORY_SEPARATOR . 'signer.abstract.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Load Symfony YAML classes
+		elseif (strstr($class, 'sfYaml'))
+		{
+			if (file_exists($require_this = $path . 'lib' . DIRECTORY_SEPARATOR . 'yaml' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'sfYaml.php'))
+			{
+				require_once $require_this;
+				return true;
+			}
+
+			return false;
+		}
+
+		return false;
+	}
+}
+
+// Register the autoloader.
+spl_autoload_register(array('CFLoader', 'autoloader'));
+
+
+/*%******************************************************************************************%*/
+// CONFIGURATION
+
+// Look for include file in the same directory (e.g. `./config.inc.php`).
+if (file_exists(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.inc.php'))
+{
+	include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.inc.php';
+}
+// Fallback to `~/.aws/sdk/config.inc.php`
+else
+{
+	if (!isset($_ENV['HOME']) && isset($_SERVER['HOME']))
+	{
+		$_ENV['HOME'] = $_SERVER['HOME'];
+	}
+	elseif (!isset($_ENV['HOME']) && !isset($_SERVER['HOME']))
+	{
+		$_ENV['HOME'] = `cd ~ && pwd`;
+		if (!$_ENV['HOME'])
+		{
+			switch (strtolower(PHP_OS))
+			{
+				case 'darwin':
+					$_ENV['HOME'] = '/Users/' . get_current_user();
+					break;
+
+				case 'windows':
+				case 'winnt':
+				case 'win32':
+					$_ENV['HOME'] = 'c:' . DIRECTORY_SEPARATOR . 'Documents and Settings' . DIRECTORY_SEPARATOR . get_current_user();
+					break;
+
+				default:
+					$_ENV['HOME'] = '/home/' . get_current_user();
+					break;
+			}
+		}
+	}
+
+	if (getenv('HOME') && file_exists(getenv('HOME') . DIRECTORY_SEPARATOR . '.aws' . DIRECTORY_SEPARATOR . 'sdk' . DIRECTORY_SEPARATOR . 'config.inc.php'))
+	{
+		include_once getenv('HOME') . DIRECTORY_SEPARATOR . '.aws' . DIRECTORY_SEPARATOR . 'sdk' . DIRECTORY_SEPARATOR . 'config.inc.php';
+	}
+}
diff --git a/3rdparty/aws-sdk/services/s3.class.php b/3rdparty/aws-sdk/services/s3.class.php
new file mode 100755
index 0000000000..2e9e1cd52b
--- /dev/null
+++ b/3rdparty/aws-sdk/services/s3.class.php
@@ -0,0 +1,3979 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+/**
+ * Default S3 Exception.
+ */
+class S3_Exception extends Exception {}
+
+
+/*%******************************************************************************************%*/
+// MAIN CLASS
+
+/**
+ * Amazon S3 is a web service that enables you to store data in the cloud. You can then download the data
+ * or use the data with other AWS services, such as Amazon Elastic Cloud Computer (EC2).
+ *
+ * Amazon Simple Storage Service (Amazon S3) is storage for the Internet. You can use Amazon S3 to store
+ * and retrieve any amount of data at any time, from anywhere on the web. You can accomplish these tasks
+ * using the AWS Management Console, which is a simple and intuitive web interface.
+ *
+ * To get the most out of Amazon S3, you need to understand a few simple concepts. Amazon S3 stores data
+ * as objects in buckets. An object is comprised of a file and optionally any metadata that describes
+ * that file.
+ *
+ * To store an object in Amazon S3, you upload the file you want to store to a bucket. When you upload a
+ * file, you can set permissions on the object as well as any metadata.
+ *
+ * Buckets are the containers for objects. You can have one or more buckets. For each bucket, you can control
+ * access to the bucket (who can create, delete, and list objects in the bucket), view access logs for the
+ * bucket and its objects, and choose the geographical region where Amazon S3 will store the bucket and its
+ * contents.
+ *
+ * Visit <http://aws.amazon.com/s3/> for more information.
+ *
+ * @version 2012.01.17
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/s3/ Amazon Simple Storage Service
+ * @link http://aws.amazon.com/documentation/s3/ Amazon Simple Storage Service documentation
+ */
+class AmazonS3 extends CFRuntime
+{
+	/*%******************************************************************************************%*/
+	// REGIONAL ENDPOINTS
+
+	/**
+	 * Specify the queue URL for the US-Standard (Northern Virginia & Washington State) Region.
+	 */
+	const REGION_US_E1 = 's3.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the US-Standard (Northern Virginia & Washington State) Region.
+	 */
+	const REGION_VIRGINIA = self::REGION_US_E1;
+
+	/**
+	 * Specify the queue URL for the US-Standard (Northern Virginia & Washington State) Region.
+	 */
+	const REGION_US_STANDARD = self::REGION_US_E1;
+
+	/**
+	 * Specify the queue URL for the US-West 1 (Northern California) Region.
+	 */
+	const REGION_US_W1 = 's3-us-west-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the US-West 1 (Northern California) Region.
+	 */
+	const REGION_CALIFORNIA = self::REGION_US_W1;
+
+	/**
+	 * Specify the queue URL for the US-West 2 (Oregon) Region.
+	 */
+	const REGION_US_W2 = 's3-us-west-2.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the US-West 2 (Oregon) Region.
+	 */
+	const REGION_OREGON = self::REGION_US_W2;
+
+	/**
+	 * Specify the queue URL for the EU (Ireland) Region.
+	 */
+	const REGION_EU_W1 = 's3-eu-west-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the EU (Ireland) Region.
+	 */
+	const REGION_IRELAND = self::REGION_EU_W1;
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Singapore) Region.
+	 */
+	const REGION_APAC_SE1 = 's3-ap-southeast-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Singapore) Region.
+	 */
+	const REGION_SINGAPORE = self::REGION_APAC_SE1;
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Japan) Region.
+	 */
+	const REGION_APAC_NE1 = 's3-ap-northeast-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Japan) Region.
+	 */
+	const REGION_TOKYO = self::REGION_APAC_NE1;
+
+	/**
+	 * Specify the queue URL for the South America (Sao Paulo) Region.
+	 */
+	const REGION_SA_E1 = 's3-sa-east-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the South America (Sao Paulo) Region.
+	 */
+	const REGION_SAO_PAULO = self::REGION_SA_E1;
+
+	/**
+	 * Specify the queue URL for the United States GovCloud Region.
+	 */
+	const REGION_US_GOV1 = 's3-us-gov-west-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the United States GovCloud FIPS 140-2 Region.
+	 */
+	const REGION_US_GOV1_FIPS = 's3-fips-us-gov-west-1.amazonaws.com';
+
+	/**
+	 * The default endpoint.
+	 */
+	const DEFAULT_URL = self::REGION_US_E1;
+
+
+	/*%******************************************************************************************%*/
+	// REGIONAL WEBSITE ENDPOINTS
+
+	/**
+	 * Specify the queue URL for the US-Standard (Northern Virginia & Washington State) Website Region.
+	 */
+	const REGION_US_E1_WEBSITE = 's3-website-us-east-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the US-Standard (Northern Virginia & Washington State) Website Region.
+	 */
+	const REGION_VIRGINIA_WEBSITE = self::REGION_US_E1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the US-Standard (Northern Virginia & Washington State) Website Region.
+	 */
+	const REGION_US_STANDARD_WEBSITE = self::REGION_US_E1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the US-West 1 (Northern California) Website Region.
+	 */
+	const REGION_US_W1_WEBSITE = 's3-website-us-west-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the US-West 1 (Northern California) Website Region.
+	 */
+	const REGION_CALIFORNIA_WEBSITE = self::REGION_US_W1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the US-West 2 (Oregon) Website Region.
+	 */
+	const REGION_US_W2_WEBSITE = 's3-website-us-west-2.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the US-West 2 (Oregon) Website Region.
+	 */
+	const REGION_OREGON_WEBSITE = self::REGION_US_W2_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the EU (Ireland) Website Region.
+	 */
+	const REGION_EU_W1_WEBSITE = 's3-website-eu-west-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the EU (Ireland) Website Region.
+	 */
+	const REGION_IRELAND_WEBSITE = self::REGION_EU_W1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Singapore) Website Region.
+	 */
+	const REGION_APAC_SE1_WEBSITE = 's3-website-ap-southeast-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Singapore) Website Region.
+	 */
+	const REGION_SINGAPORE_WEBSITE = self::REGION_APAC_SE1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Japan) Website Region.
+	 */
+	const REGION_APAC_NE1_WEBSITE = 's3-website-ap-northeast-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the Asia Pacific (Japan) Website Region.
+	 */
+	const REGION_TOKYO_WEBSITE = self::REGION_APAC_NE1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the South America (Sao Paulo) Website Region.
+	 */
+	const REGION_SA_E1_WEBSITE = 's3-website-sa-east-1.amazonaws.com';
+
+	/**
+	 * Specify the queue URL for the South America (Sao Paulo) Website Region.
+	 */
+	const REGION_SAO_PAULO_WEBSITE = self::REGION_SA_E1_WEBSITE;
+
+	/**
+	 * Specify the queue URL for the United States GovCloud Website Region.
+	 */
+	const REGION_US_GOV1_WEBSITE = 's3-website-us-gov-west-1.amazonaws.com';
+
+
+	/*%******************************************************************************************%*/
+	// ACL
+
+	/**
+	 * ACL: Owner-only read/write.
+	 */
+	const ACL_PRIVATE = 'private';
+
+	/**
+	 * ACL: Owner read/write, public read.
+	 */
+	const ACL_PUBLIC = 'public-read';
+
+	/**
+	 * ACL: Public read/write.
+	 */
+	const ACL_OPEN = 'public-read-write';
+
+	/**
+	 * ACL: Owner read/write, authenticated read.
+	 */
+	const ACL_AUTH_READ = 'authenticated-read';
+
+	/**
+	 * ACL: Bucket owner read.
+	 */
+	const ACL_OWNER_READ = 'bucket-owner-read';
+
+	/**
+	 * ACL: Bucket owner full control.
+	 */
+	const ACL_OWNER_FULL_CONTROL = 'bucket-owner-full-control';
+
+
+	/*%******************************************************************************************%*/
+	// GRANTS
+
+	/**
+	 * When applied to a bucket, grants permission to list the bucket. When applied to an object, this
+	 * grants permission to read the object data and/or metadata.
+	 */
+	const GRANT_READ = 'READ';
+
+	/**
+	 * When applied to a bucket, grants permission to create, overwrite, and delete any object in the
+	 * bucket. This permission is not supported for objects.
+	 */
+	const GRANT_WRITE = 'WRITE';
+
+	/**
+	 * Grants permission to read the ACL for the applicable bucket or object. The owner of a bucket or
+	 * object always has this permission implicitly.
+	 */
+	const GRANT_READ_ACP = 'READ_ACP';
+
+	/**
+	 * Gives permission to overwrite the ACP for the applicable bucket or object. The owner of a bucket
+	 * or object always has this permission implicitly. Granting this permission is equivalent to granting
+	 * FULL_CONTROL because the grant recipient can make any changes to the ACP.
+	 */
+	const GRANT_WRITE_ACP = 'WRITE_ACP';
+
+	/**
+	 * Provides READ, WRITE, READ_ACP, and WRITE_ACP permissions. It does not convey additional rights and
+	 * is provided only for convenience.
+	 */
+	const GRANT_FULL_CONTROL = 'FULL_CONTROL';
+
+
+	/*%******************************************************************************************%*/
+	// USERS
+
+	/**
+	 * The "AuthenticatedUsers" group for access control policies.
+	 */
+	const USERS_AUTH = 'http://acs.amazonaws.com/groups/global/AuthenticatedUsers';
+
+	/**
+	 * The "AllUsers" group for access control policies.
+	 */
+	const USERS_ALL = 'http://acs.amazonaws.com/groups/global/AllUsers';
+
+	/**
+	 * The "LogDelivery" group for access control policies.
+	 */
+	const USERS_LOGGING = 'http://acs.amazonaws.com/groups/s3/LogDelivery';
+
+
+	/*%******************************************************************************************%*/
+	// PATTERNS
+
+	/**
+	 * PCRE: Match all items
+	 */
+	const PCRE_ALL = '/.*/i';
+
+
+	/*%******************************************************************************************%*/
+	// STORAGE
+
+	/**
+	 * Standard storage redundancy.
+	 */
+	const STORAGE_STANDARD = 'STANDARD';
+
+	/**
+	 * Reduced storage redundancy.
+	 */
+	const STORAGE_REDUCED = 'REDUCED_REDUNDANCY';
+
+
+	/*%******************************************************************************************%*/
+	// PROPERTIES
+
+	/**
+	 * The request URL.
+	 */
+	public $request_url;
+
+	/**
+	 * The virtual host setting.
+	 */
+	public $vhost;
+
+	/**
+	 * The base XML elements to use for access control policy methods.
+	 */
+	public $base_acp_xml;
+
+	/**
+	 * The base XML elements to use for creating buckets in regions.
+	 */
+	public $base_location_constraint;
+
+	/**
+	 * The base XML elements to use for logging methods.
+	 */
+	public $base_logging_xml;
+
+	/**
+	 * The base XML elements to use for notifications.
+	 */
+	public $base_notification_xml;
+
+	/**
+	 * The base XML elements to use for versioning.
+	 */
+	public $base_versioning_xml;
+
+	/**
+	 * The base XML elements to use for completing a multipart upload.
+	 */
+	public $complete_mpu_xml;
+
+	/**
+	 * The base XML elements to use for website support.
+	 */
+	public $website_config_xml;
+
+	/**
+	 * The base XML elements to use for multi-object delete support.
+	 */
+	public $multi_object_delete_xml;
+
+	/**
+	 * The base XML elements to use for object expiration support.
+	 */
+	public $object_expiration_xml;
+
+	/**
+	 * The DNS vs. Path-style setting.
+	 */
+	public $path_style = false;
+
+	/**
+	 * The state of whether the prefix change is temporary or permanent.
+	 */
+	public $temporary_prefix = false;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of <AmazonS3>.
+	 *
+	 * @param array $options (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>certificate_authority</code> - <code>boolean</code> - Optional - Determines which Cerificate Authority file to use. A value of boolean <code>false</code> will use the Certificate Authority file available on the system. A value of boolean <code>true</code> will use the Certificate Authority provided by the SDK. Passing a file system path to a Certificate Authority file (chmodded to <code>0755</code>) will use that. Leave this set to <code>false</code> if you're not sure.</li>
+	 * 	<li><code>credentials</code> - <code>string</code> - Optional - The name of the credential set to use for authentication.</li>
+	 * 	<li><code>default_cache_config</code> - <code>string</code> - Optional - This option allows a preferred storage type to be configured for long-term caching. This can be changed later using the <set_cache_config()> method. Valid values are: <code>apc</code>, <code>xcache</code>, or a file system path such as <code>./cache</code> or <code>/tmp/cache/</code>.</li>
+	 * 	<li><code>key</code> - <code>string</code> - Optional - Your AWS key, or a session key. If blank, the default credential set will be used.</li>
+	 * 	<li><code>secret</code> - <code>string</code> - Optional - Your AWS secret key, or a session secret key. If blank, the default credential set will be used.</li>
+	 * 	<li><code>token</code> - <code>string</code> - Optional - An AWS session token.</li></ul>
+	 * @return void
+	 */
+	public function __construct(array $options = array())
+	{
+		$this->vhost = null;
+		$this->api_version = '2006-03-01';
+		$this->hostname = self::DEFAULT_URL;
+
+		$this->base_acp_xml             = '<?xml version="1.0" encoding="UTF-8"?><AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/latest/"></AccessControlPolicy>';
+		$this->base_location_constraint = '<?xml version="1.0" encoding="UTF-8"?><CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/' . $this->api_version . '/"><LocationConstraint></LocationConstraint></CreateBucketConfiguration>';
+		$this->base_logging_xml         = '<?xml version="1.0" encoding="utf-8"?><BucketLoggingStatus xmlns="http://doc.s3.amazonaws.com/' . $this->api_version . '"></BucketLoggingStatus>';
+		$this->base_notification_xml    = '<?xml version="1.0" encoding="utf-8"?><NotificationConfiguration></NotificationConfiguration>';
+		$this->base_versioning_xml      = '<?xml version="1.0" encoding="utf-8"?><VersioningConfiguration xmlns="http://s3.amazonaws.com/doc/' . $this->api_version . '/"></VersioningConfiguration>';
+		$this->complete_mpu_xml         = '<?xml version="1.0" encoding="utf-8"?><CompleteMultipartUpload></CompleteMultipartUpload>';
+		$this->website_config_xml       = '<?xml version="1.0" encoding="utf-8"?><WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/' . $this->api_version . '/"><IndexDocument><Suffix>index.html</Suffix></IndexDocument><ErrorDocument><Key>error.html</Key></ErrorDocument></WebsiteConfiguration>';
+		$this->multi_object_delete_xml  = '<?xml version="1.0" encoding="utf-8"?><Delete></Delete>';
+		$this->object_expiration_xml    = '<?xml version="1.0" encoding="utf-8"?><LifecycleConfiguration></LifecycleConfiguration>';
+
+		parent::__construct($options);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// AUTHENTICATION
+
+	/**
+	 * Authenticates a connection to Amazon S3. Do not use directly unless implementing custom methods for
+	 * this class.
+	 *
+	 * @param string $operation (Required) The name of the bucket to operate on (S3 Only).
+	 * @param array $payload (Required) An associative array of parameters for authenticating. See inline comments for allowed keys.
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_Authentication.html REST authentication
+	 */
+	public function authenticate($operation, $payload)
+	{
+		/*
+		 * Overriding or extending this class? You can pass the following "magic" keys into $opt.
+		 *
+		 * ## verb, resource, sub_resource and query_string ##
+		 * 	<verb> /<resource>?<sub_resource>&<query_string>
+		 * 	GET /filename.txt?versions&prefix=abc&max-items=1
+		 *
+		 * ## versionId, uploadId, partNumber, response-* ##
+		 * 	These don't follow the same rules as above, in that the they needs to be signed, while
+		 * 	other query_string values do not.
+		 *
+		 * ## curlopts ##
+		 * 	These values get passed directly to the cURL methods in RequestCore.
+		 *
+		 * ## fileUpload, fileDownload, seekTo ##
+		 * 	These are slightly modified and then passed to the cURL methods in RequestCore.
+		 *
+		 * ## headers ##
+		 * 	$opt['headers'] is an array, whose keys are HTTP headers to be sent.
+		 *
+		 * ## body ##
+		 * 	This is the request body that is sent to the server via PUT/POST.
+		 *
+		 * ## preauth ##
+		 * 	This is a hook that tells authenticate() to generate a pre-authenticated URL.
+		 *
+		 * ## returnCurlHandle ##
+		 * 	Tells authenticate() to return the cURL handle for the request instead of executing it.
+		 */
+
+		// Rename variables (to overcome inheritence issues)
+		$bucket = $operation;
+		$opt = $payload;
+
+		// Validate the S3 bucket name
+		if (!$this->validate_bucketname_support($bucket))
+		{
+			// @codeCoverageIgnoreStart
+			throw new S3_Exception('S3 does not support "' . $bucket . '" as a valid bucket name. Review "Bucket Restrictions and Limitations" in the S3 Developer Guide for more information.');
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Die if $opt isn't set.
+		if (!$opt) return false;
+
+		$method_arguments = func_get_args();
+
+		// Use the caching flow to determine if we need to do a round-trip to the server.
+		if ($this->use_cache_flow)
+		{
+			// Generate an identifier specific to this particular set of arguments.
+			$cache_id = $this->key . '_' . get_class($this) . '_' . $bucket . '_' . sha1(serialize($method_arguments));
+
+			// Instantiate the appropriate caching object.
+			$this->cache_object = new $this->cache_class($cache_id, $this->cache_location, $this->cache_expires, $this->cache_compress);
+
+			if ($this->delete_cache)
+			{
+				$this->use_cache_flow = false;
+				$this->delete_cache = false;
+				return $this->cache_object->delete();
+			}
+
+			// Invoke the cache callback function to determine whether to pull data from the cache or make a fresh request.
+			$data = $this->cache_object->response_manager(array($this, 'cache_callback'), $method_arguments);
+
+			if ($this->parse_the_response)
+			{
+				// Parse the XML body
+				$data = $this->parse_callback($data);
+			}
+
+			// End!
+			return $data;
+		}
+
+		// If we haven't already set a resource prefix and the bucket name isn't DNS-valid...
+		if ((!$this->resource_prefix && !$this->validate_bucketname_create($bucket)) || $this->path_style)
+		{
+			// Fall back to the older path-style URI
+			$this->set_resource_prefix('/' . $bucket);
+			$this->temporary_prefix = true;
+		}
+
+		// Determine hostname
+		$scheme = $this->use_ssl ? 'https://' : 'http://';
+		if ($this->resource_prefix || $this->path_style) // Use bucket-in-path method.
+		{
+			$hostname = $this->hostname . $this->resource_prefix . (($bucket === '' || $this->resource_prefix === '/' . $bucket) ? '' : ('/' . $bucket));
+		}
+		else
+		{
+			$hostname = $this->vhost ? $this->vhost : (($bucket === '') ? $this->hostname : ($bucket . '.') . $this->hostname);
+		}
+
+		// Get the UTC timestamp in RFC 2616 format
+		$date = gmdate(CFUtilities::DATE_FORMAT_RFC2616, time());
+
+		// Storage for request parameters.
+		$resource = '';
+		$sub_resource = '';
+		$querystringparams = array();
+		$signable_querystringparams = array();
+		$string_to_sign = '';
+		$headers = array(
+			'Content-MD5' => '',
+			'Content-Type' => 'application/x-www-form-urlencoded',
+			'Date' => $date
+		);
+
+		/*%******************************************************************************************%*/
+
+		// Do we have an authentication token?
+		if ($this->auth_token)
+		{
+			$headers['X-Amz-Security-Token'] = $this->auth_token;
+		}
+
+		// Handle specific resources
+		if (isset($opt['resource']))
+		{
+			$resource .= $opt['resource'];
+		}
+
+		// Merge query string values
+		if (isset($opt['query_string']))
+		{
+			$querystringparams = array_merge($querystringparams, $opt['query_string']);
+		}
+		$query_string = $this->util->to_query_string($querystringparams);
+
+		// Merge the signable query string values. Must be alphabetical.
+		$signable_list = array(
+			'partNumber',
+			'response-cache-control',
+			'response-content-disposition',
+			'response-content-encoding',
+			'response-content-language',
+			'response-content-type',
+			'response-expires',
+			'uploadId',
+			'versionId'
+		);
+		foreach ($signable_list as $item)
+		{
+			if (isset($opt[$item]))
+			{
+				$signable_querystringparams[$item] = $opt[$item];
+			}
+		}
+		$signable_query_string = $this->util->to_query_string($signable_querystringparams);
+
+		// Merge the HTTP headers
+		if (isset($opt['headers']))
+		{
+			$headers = array_merge($headers, $opt['headers']);
+		}
+
+		// Compile the URI to request
+		$conjunction = '?';
+		$signable_resource = '/' . str_replace('%2F', '/', rawurlencode($resource));
+		$non_signable_resource = '';
+
+		if (isset($opt['sub_resource']))
+		{
+			$signable_resource .= $conjunction . rawurlencode($opt['sub_resource']);
+			$conjunction = '&';
+		}
+		if ($signable_query_string !== '')
+		{
+			$signable_query_string = $conjunction . $signable_query_string;
+			$conjunction = '&';
+		}
+		if ($query_string !== '')
+		{
+			$non_signable_resource .= $conjunction . $query_string;
+			$conjunction = '&';
+		}
+		if (substr($hostname, -1) === substr($signable_resource, 0, 1))
+		{
+			$signable_resource = ltrim($signable_resource, '/');
+		}
+
+		$this->request_url = $scheme . $hostname . $signable_resource . $signable_query_string . $non_signable_resource;
+
+		if (isset($opt['location']))
+		{
+			$this->request_url = $opt['location'];
+		}
+
+		// Gather information to pass along to other classes.
+		$helpers = array(
+			'utilities' => $this->utilities_class,
+			'request' => $this->request_class,
+			'response' => $this->response_class,
+		);
+
+		// Instantiate the request class
+		$request = new $this->request_class($this->request_url, $this->proxy, $helpers, $this->credentials);
+
+		// Update RequestCore settings
+		$request->request_class = $this->request_class;
+		$request->response_class = $this->response_class;
+		$request->ssl_verification = $this->ssl_verification;
+
+		// Pass along registered stream callbacks
+		if ($this->registered_streaming_read_callback)
+		{
+			$request->register_streaming_read_callback($this->registered_streaming_read_callback);
+		}
+
+		if ($this->registered_streaming_write_callback)
+		{
+			$request->register_streaming_write_callback($this->registered_streaming_write_callback);
+		}
+
+		// Streaming uploads
+		if (isset($opt['fileUpload']))
+		{
+			if (is_resource($opt['fileUpload']))
+			{
+				// Determine the length to read from the stream
+				$length = null; // From current position until EOF by default, size determined by set_read_stream()
+
+				if (isset($headers['Content-Length']))
+				{
+					$length = $headers['Content-Length'];
+				}
+				elseif (isset($opt['seekTo']))
+				{
+					// Read from seekTo until EOF by default
+					$stats = fstat($opt['fileUpload']);
+
+					if ($stats && $stats['size'] >= 0)
+					{
+						$length = $stats['size'] - (integer) $opt['seekTo'];
+					}
+				}
+
+				$request->set_read_stream($opt['fileUpload'], $length);
+
+				if ($headers['Content-Type'] === 'application/x-www-form-urlencoded')
+				{
+					$headers['Content-Type'] = 'application/octet-stream';
+				}
+			}
+			else
+			{
+				$request->set_read_file($opt['fileUpload']);
+
+				// Determine the length to read from the file
+				$length = $request->read_stream_size; // The file size by default
+
+				if (isset($headers['Content-Length']))
+				{
+					$length = $headers['Content-Length'];
+				}
+				elseif (isset($opt['seekTo']) && isset($length))
+				{
+					// Read from seekTo until EOF by default
+					$length -= (integer) $opt['seekTo'];
+				}
+
+				$request->set_read_stream_size($length);
+
+				// Attempt to guess the correct mime-type
+				if ($headers['Content-Type'] === 'application/x-www-form-urlencoded')
+				{
+					$extension = explode('.', $opt['fileUpload']);
+					$extension = array_pop($extension);
+					$mime_type = CFMimeTypes::get_mimetype($extension);
+					$headers['Content-Type'] = $mime_type;
+				}
+			}
+
+			$headers['Content-Length'] = $request->read_stream_size;
+			$headers['Content-MD5'] = '';
+		}
+
+		// Handle streaming file offsets
+		if (isset($opt['seekTo']))
+		{
+			// Pass the seek position to RequestCore
+			$request->set_seek_position((integer) $opt['seekTo']);
+		}
+
+		// Streaming downloads
+		if (isset($opt['fileDownload']))
+		{
+			if (is_resource($opt['fileDownload']))
+			{
+				$request->set_write_stream($opt['fileDownload']);
+			}
+			else
+			{
+				$request->set_write_file($opt['fileDownload']);
+			}
+		}
+
+		$curlopts = array();
+
+		// Set custom CURLOPT settings
+		if (isset($opt['curlopts']))
+		{
+			$curlopts = $opt['curlopts'];
+		}
+
+		// Debug mode
+		if ($this->debug_mode)
+		{
+			$curlopts[CURLOPT_VERBOSE] = true;
+		}
+
+		// Set the curl options.
+		if (count($curlopts))
+		{
+			$request->set_curlopts($curlopts);
+		}
+
+		// Do we have a verb?
+		if (isset($opt['verb']))
+		{
+			$request->set_method($opt['verb']);
+			$string_to_sign .= $opt['verb'] . "\n";
+		}
+
+		// Add headers and content when we have a body
+		if (isset($opt['body']))
+		{
+			$request->set_body($opt['body']);
+			$headers['Content-Length'] = strlen($opt['body']);
+
+			if ($headers['Content-Type'] === 'application/x-www-form-urlencoded')
+			{
+				$headers['Content-Type'] = 'application/octet-stream';
+			}
+
+			if (!isset($opt['NoContentMD5']) || $opt['NoContentMD5'] !== true)
+			{
+				$headers['Content-MD5'] = $this->util->hex_to_base64(md5($opt['body']));
+			}
+		}
+
+		// Handle query-string authentication
+		if (isset($opt['preauth']) && (integer) $opt['preauth'] > 0)
+		{
+			unset($headers['Date']);
+			$headers['Content-Type'] = '';
+			$headers['Expires'] = is_int($opt['preauth']) ? $opt['preauth'] : strtotime($opt['preauth']);
+		}
+
+		// Sort headers
+		uksort($headers, 'strnatcasecmp');
+
+		// Add headers to request and compute the string to sign
+		foreach ($headers as $header_key => $header_value)
+		{
+			// Strip linebreaks from header values as they're illegal and can allow for security issues
+			$header_value = str_replace(array("\r", "\n"), '', $header_value);
+
+			// Add the header if it has a value
+			if ($header_value !== '')
+			{
+				$request->add_header($header_key, $header_value);
+			}
+
+			// Generate the string to sign
+			if (
+				strtolower($header_key) === 'content-md5' ||
+				strtolower($header_key) === 'content-type' ||
+				strtolower($header_key) === 'date' ||
+				(strtolower($header_key) === 'expires' && isset($opt['preauth']) && (integer) $opt['preauth'] > 0)
+			)
+			{
+				$string_to_sign .= $header_value . "\n";
+			}
+			elseif (substr(strtolower($header_key), 0, 6) === 'x-amz-')
+			{
+				$string_to_sign .= strtolower($header_key) . ':' . $header_value . "\n";
+			}
+		}
+
+		// Add the signable resource location
+		$string_to_sign .= ($this->resource_prefix ? $this->resource_prefix : '');
+		$string_to_sign .= (($bucket === '' || $this->resource_prefix === '/' . $bucket) ? '' : ('/' . $bucket)) . $signable_resource . urldecode($signable_query_string);
+
+		// Hash the AWS secret key and generate a signature for the request.
+		$signature = base64_encode(hash_hmac('sha1', $string_to_sign, $this->secret_key, true));
+		$request->add_header('Authorization', 'AWS ' . $this->key . ':' . $signature);
+
+		// If we're generating a URL, return the URL to the calling method.
+		if (isset($opt['preauth']) && (integer) $opt['preauth'] > 0)
+		{
+			$query_params = array(
+				'AWSAccessKeyId' => $this->key,
+				'Expires' => $headers['Expires'],
+				'Signature' => $signature,
+			);
+
+			// If using short-term credentials, add the token to the query string
+			if ($this->auth_token)
+			{
+				$query_params['x-amz-security-token'] = $this->auth_token;
+			}
+
+			return $this->request_url . $conjunction . http_build_query($query_params, '', '&');
+		}
+		elseif (isset($opt['preauth']))
+		{
+			return $this->request_url;
+		}
+
+		/*%******************************************************************************************%*/
+
+		// If our changes were temporary, reset them.
+		if ($this->temporary_prefix)
+		{
+			$this->temporary_prefix = false;
+			$this->resource_prefix = null;
+		}
+
+		// Manage the (newer) batch request API or the (older) returnCurlHandle setting.
+		if ($this->use_batch_flow)
+		{
+			$handle = $request->prep_request();
+			$this->batch_object->add($handle);
+			$this->use_batch_flow = false;
+
+			return $handle;
+		}
+		elseif (isset($opt['returnCurlHandle']) && $opt['returnCurlHandle'] === true)
+		{
+			return $request->prep_request();
+		}
+
+		// Send!
+		$request->send_request();
+
+		// Prepare the response
+		$headers = $request->get_response_header();
+		$headers['x-aws-request-url'] = $this->request_url;
+		$headers['x-aws-redirects'] = $this->redirects;
+		$headers['x-aws-stringtosign'] = $string_to_sign;
+		$headers['x-aws-requestheaders'] = $request->request_headers;
+
+		// Did we have a request body?
+		if (isset($opt['body']))
+		{
+			$headers['x-aws-requestbody'] = $opt['body'];
+		}
+
+		$data = new $this->response_class($headers, $this->parse_callback($request->get_response_body()), $request->get_response_code());
+
+		// Did Amazon tell us to redirect? Typically happens for multiple rapid requests EU datacenters.
+		// @see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/Redirects.html
+		// @codeCoverageIgnoreStart
+		if ((integer) $request->get_response_code() === 307) // Temporary redirect to new endpoint.
+		{
+			$this->redirects++;
+			$opt['location'] = $headers['location'];
+			$data = $this->authenticate($bucket, $opt);
+		}
+
+		// Was it Amazon's fault the request failed? Retry the request until we reach $max_retries.
+		elseif ((integer) $request->get_response_code() === 500 || (integer) $request->get_response_code() === 503)
+		{
+			if ($this->redirects <= $this->max_retries)
+			{
+				// Exponential backoff
+				$delay = (integer) (pow(4, $this->redirects) * 100000);
+				usleep($delay);
+				$this->redirects++;
+				$data = $this->authenticate($bucket, $opt);
+			}
+		}
+		// @codeCoverageIgnoreEnd
+
+		// Return!
+		$this->redirects = 0;
+		return $data;
+	}
+
+	/**
+	 * Validates whether or not the specified Amazon S3 bucket name is valid for DNS-style access. This
+	 * method is leveraged by any method that creates buckets.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to validate.
+	 * @return boolean Whether or not the specified Amazon S3 bucket name is valid for DNS-style access. A value of <code>true</code> means that the bucket name is valid. A value of <code>false</code> means that the bucket name is invalid.
+	 */
+	public function validate_bucketname_create($bucket)
+	{
+		// list_buckets() uses this. Let it pass.
+		if ($bucket === '') return true;
+
+		if (
+			($bucket === null || $bucket === false) ||                  // Must not be null or false
+			preg_match('/[^(a-z0-9\-\.)]/', $bucket) ||                 // Must be in the lowercase Roman alphabet, period or hyphen
+			!preg_match('/^([a-z]|\d)/', $bucket) ||                    // Must start with a number or letter
+			!(strlen($bucket) >= 3 && strlen($bucket) <= 63) ||         // Must be between 3 and 63 characters long
+			(strpos($bucket, '..') !== false) ||                        // Bucket names cannot contain two, adjacent periods
+			(strpos($bucket, '-.') !== false) ||                        // Bucket names cannot contain dashes next to periods
+			(strpos($bucket, '.-') !== false) ||                        // Bucket names cannot contain dashes next to periods
+			preg_match('/(-|\.)$/', $bucket) ||                         // Bucket names should not end with a dash or period
+			preg_match('/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/', $bucket)    // Must not be formatted as an IP address
+		) return false;
+
+		return true;
+	}
+
+	/**
+	 * Validates whether or not the specified Amazon S3 bucket name is valid for path-style access. This
+	 * method is leveraged by any method that reads from buckets.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to validate.
+	 * @return boolean Whether or not the bucket name is valid. A value of <code>true</code> means that the bucket name is valid. A value of <code>false</code> means that the bucket name is invalid.
+	 */
+	public function validate_bucketname_support($bucket)
+	{
+		// list_buckets() uses this. Let it pass.
+		if ($bucket === '') return true;
+
+		// Validate
+		if (
+			($bucket === null || $bucket === false) ||                  // Must not be null or false
+			preg_match('/[^(a-z0-9_\-\.)]/i', $bucket) ||               // Must be in the Roman alphabet, period, hyphen or underscore
+			!preg_match('/^([a-z]|\d)/i', $bucket) ||                   // Must start with a number or letter
+			!(strlen($bucket) >= 3 && strlen($bucket) <= 255) ||        // Must be between 3 and 255 characters long
+			preg_match('/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/', $bucket)    // Must not be formatted as an IP address
+		) return false;
+
+		return true;
+	}
+
+	/*%******************************************************************************************%*/
+	// SETTERS
+
+	/**
+	 * Sets the region to use for subsequent Amazon S3 operations. This will also reset any prior use of
+	 * <enable_path_style()>.
+	 *
+	 * @param string $region (Required) The region to use for subsequent Amazon S3 operations. For a complete list of REGION constants, see the <code>AmazonS3</code> Constants page in the API reference.
+	 * @return $this A reference to the current instance.
+	 */
+	public function set_region($region)
+	{
+		// @codeCoverageIgnoreStart
+		$this->set_hostname($region);
+
+		switch ($region)
+		{
+			case self::REGION_US_E1: // Northern Virginia
+				$this->enable_path_style(false);
+				break;
+
+			case self::REGION_EU_W1: // Ireland
+				$this->enable_path_style(); // Always use path-style access for EU endpoint.
+				break;
+
+			default:
+				$this->enable_path_style(false);
+				break;
+
+		}
+		// @codeCoverageIgnoreEnd
+
+		return $this;
+	}
+
+	/**
+	 * Sets the virtual host to use in place of the default `bucket.s3.amazonaws.com` domain.
+	 *
+	 * @param string $vhost (Required) The virtual host to use in place of the default `bucket.s3.amazonaws.com` domain.
+	 * @return $this A reference to the current instance.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/VirtualHosting.html Virtual Hosting of Buckets
+	 */
+	public function set_vhost($vhost)
+	{
+		$this->vhost = $vhost;
+		return $this;
+	}
+
+	/**
+	 * Enables the use of the older path-style URI access for all requests.
+	 *
+	 * @param string $style (Optional) Whether or not to enable path-style URI access for all requests. The default value is <code>true</code>.
+	 * @return $this A reference to the current instance.
+	 */
+	public function enable_path_style($style = true)
+	{
+		$this->path_style = $style;
+		return $this;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// BUCKET METHODS
+
+	/**
+	 * Creates an Amazon S3 bucket.
+	 *
+	 * Every object stored in Amazon S3 is contained in a bucket. Buckets partition the namespace of
+	 * objects stored in Amazon S3 at the top level. in a bucket, any name can be used for objects.
+	 * However, bucket names must be unique across all of Amazon S3.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to create.
+	 * @param string $region (Required) The preferred geographical location for the bucket. [Allowed values: `AmazonS3::REGION_US_E1 `, `AmazonS3::REGION_US_W1`, `AmazonS3::REGION_EU_W1`, `AmazonS3::REGION_APAC_SE1`, `AmazonS3::REGION_APAC_NE1`]
+	 * @param string $acl (Optional) The ACL settings for the specified bucket. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <ACL_PRIVATE>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/UsingBucket.html Working with Amazon S3 Buckets
+	 */
+	public function create_bucket($bucket, $region, $acl = self::ACL_PRIVATE, $opt = null)
+	{
+		// If the bucket contains uppercase letters...
+		if (preg_match('/[A-Z]/', $bucket))
+		{
+			// Throw a warning
+			trigger_error('Since DNS-valid bucket names cannot contain uppercase characters, "' . $bucket . '" has been automatically converted to "' . strtolower($bucket) . '"', E_USER_WARNING);
+
+			// Force the bucketname to lowercase
+			$bucket = strtolower($bucket);
+		}
+
+		// Validate the S3 bucket name for creation
+		if (!$this->validate_bucketname_create($bucket))
+		{
+			// @codeCoverageIgnoreStart
+			throw new S3_Exception('"' . $bucket . '" is not DNS-valid (i.e., <bucketname>.s3.amazonaws.com), and cannot be used as an S3 bucket name. Review "Bucket Restrictions and Limitations" in the S3 Developer Guide for more information.');
+			// @codeCoverageIgnoreEnd
+		}
+
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml',
+			'x-amz-acl' => $acl
+		);
+
+		// Defaults
+		$this->set_region($region); // Also sets path-style
+		$xml = simplexml_load_string($this->base_location_constraint);
+
+		switch ($region)
+		{
+			case self::REGION_US_E1: // Northern Virginia
+				$opt['body'] = '';
+				break;
+
+			case self::REGION_EU_W1:    // Ireland
+				$xml->LocationConstraint = 'EU';
+				$opt['body'] = $xml->asXML();
+				break;
+
+			default:
+				$xml->LocationConstraint = str_replace(array('s3-', '.amazonaws.com'), '', $region);
+				$opt['body'] = $xml->asXML();
+				break;
+		}
+
+		$response = $this->authenticate($bucket, $opt);
+
+		// Make sure we're set back to DNS-style URLs
+		$this->enable_path_style(false);
+
+		return $response;
+	}
+
+	/**
+	 * Gets the region in which the specified Amazon S3 bucket is located.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_bucket_region($bucket, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'location';
+
+		// Authenticate to S3
+		$response = $this->authenticate($bucket, $opt);
+
+		if ($response->isOK())
+		{
+			// Handle body
+			$response->body = (string) $response->body;
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Gets the HTTP headers for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_bucket_headers($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'HEAD';
+
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Deletes a bucket from an Amazon S3 account. A bucket must be empty before the bucket itself can be deleted.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param boolean $force (Optional) Whether to force-delete the bucket and all of its contents. The default value is <code>false</code>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return mixed A <CFResponse> object if the bucket was deleted successfully. Returns boolean <code>false</code> if otherwise.
+	 */
+	public function delete_bucket($bucket, $force = false, $opt = null)
+	{
+		// Set default value
+		$success = true;
+
+		if ($force)
+		{
+			// Delete all of the items from the bucket.
+			$success = $this->delete_all_object_versions($bucket);
+		}
+
+		// As long as we were successful...
+		if ($success)
+		{
+			if (!$opt) $opt = array();
+			$opt['verb'] = 'DELETE';
+
+			return $this->authenticate($bucket, $opt);
+		}
+
+		// @codeCoverageIgnoreStart
+		return false;
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Gets a list of all buckets contained in the caller's Amazon S3 account.
+	 *
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function list_buckets($opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+
+		return $this->authenticate('', $opt);
+	}
+
+	/**
+	 * Gets the access control list (ACL) settings for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function get_bucket_acl($bucket, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'acl';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Sets the access control list (ACL) settings for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $acl (Optional) The ACL settings for the specified bucket. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. Alternatively, an array of associative arrays. Each associative array contains an `id` and a `permission` key. The default value is <ACL_PRIVATE>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function set_bucket_acl($bucket, $acl = self::ACL_PRIVATE, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'acl';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		// Make sure these are defined.
+		// @codeCoverageIgnoreStart
+		if (!$this->credentials->canonical_id || !$this->credentials->canonical_name)
+		{
+			// Fetch the data live.
+			$canonical = $this->get_canonical_user_id();
+			$this->credentials->canonical_id = $canonical['id'];
+			$this->credentials->canonical_name = $canonical['display_name'];
+		}
+		// @codeCoverageIgnoreEnd
+
+		if (is_array($acl))
+		{
+			$opt['body'] = $this->generate_access_policy($this->credentials->canonical_id, $this->credentials->canonical_name, $acl);
+		}
+		else
+		{
+			$opt['body'] = '';
+			$opt['headers']['x-amz-acl'] = $acl;
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// OBJECT METHODS
+
+	/**
+	 * Creates an Amazon S3 object. After an Amazon S3 bucket is created, objects can be stored in it.
+	 *
+	 * Each standard object can hold up to 5 GB of data. When an object is stored in Amazon S3, the data is streamed
+	 * to multiple storage servers in multiple data centers. This ensures the data remains available in the
+	 * event of internal network or hardware failure.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>body</code> - <code>string</code> - Required; Conditional - The data to be stored in the object. Either this parameter or <code>fileUpload</code> must be specified.</li>
+	 * 	<li><code>fileUpload</code> - <code>string|resource</code> - Required; Conditional - The URL/path for the file to upload, or an open resource. Either this parameter or <code>body</code> is required.</li>
+	 * 	<li><code>acl</code> - <code>string</code> - Optional - The ACL settings for the specified object. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <code>ACL_PRIVATE</code>.</li>
+	 * 	<li><code>contentType</code> - <code>string</code> - Optional - The type of content that is being sent in the body. If a file is being uploaded via <code>fileUpload</code> as a file system path, it will attempt to determine the correct mime-type based on the file extension. The default value is <code>application/octet-stream</code>.</li>
+	 * 	<li><code>encryption</code> - <code>string</code> - Optional - The algorithm to use for encrypting the object. [Allowed values: <code>AES256</code>]</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>length</code> - <code>integer</code> - Optional - The size of the object in bytes. For more information, see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13">RFC 2616, section 14.13</a>. The value can also be passed to the <code>header</code> option as <code>Content-Length</code>.</li>
+	 * 	<li><code>meta</code> - <code>array</code> - Optional - An associative array of key-value pairs. Represented by <code>x-amz-meta-:</code>. Any header starting with this prefix is considered user metadata. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
+	 * 	<li><code>seekTo</code> - <code>integer</code> - Optional - The starting position in bytes within the file/stream to upload from.</li>
+	 * 	<li><code>storage</code> - <code>string</code> - Optional - Whether to use Standard or Reduced Redundancy storage. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]. The default value is <code>STORAGE_STANDARD</code>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function create_object($bucket, $filename, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'PUT';
+		$opt['resource'] = $filename;
+
+		// Handle content length. Can also be passed as an HTTP header.
+		if (isset($opt['length']))
+		{
+			$opt['headers']['Content-Length'] = $opt['length'];
+			unset($opt['length']);
+		}
+
+		// Handle content type. Can also be passed as an HTTP header.
+		if (isset($opt['contentType']))
+		{
+			$opt['headers']['Content-Type'] = $opt['contentType'];
+			unset($opt['contentType']);
+		}
+
+		// Handle Access Control Lists. Can also be passed as an HTTP header.
+		if (isset($opt['acl']))
+		{
+			$opt['headers']['x-amz-acl'] = $opt['acl'];
+			unset($opt['acl']);
+		}
+
+		// Handle storage settings. Can also be passed as an HTTP header.
+		if (isset($opt['storage']))
+		{
+			$opt['headers']['x-amz-storage-class'] = $opt['storage'];
+			unset($opt['storage']);
+		}
+
+		// Handle encryption settings. Can also be passed as an HTTP header.
+		if (isset($opt['encryption']))
+		{
+			$opt['headers']['x-amz-server-side-encryption'] = $opt['encryption'];
+			unset($opt['encryption']);
+		}
+
+		// Handle meta tags. Can also be passed as an HTTP header.
+		if (isset($opt['meta']))
+		{
+			foreach ($opt['meta'] as $meta_key => $meta_value)
+			{
+				// e.g., `My Meta Header` is converted to `x-amz-meta-my-meta-header`.
+				$opt['headers']['x-amz-meta-' . strtolower(str_replace(' ', '-', $meta_key))] = $meta_value;
+			}
+			unset($opt['meta']);
+		}
+
+		$opt['headers']['Expect'] = '100-continue';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Gets the contents of an Amazon S3 object in the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>etag</code> - <code>string</code> - Optional - The <code>ETag</code> header passed in from a previous request. If specified, request <code>LastModified</code> option must be specified as well. Will trigger a <code>304 Not Modified</code> status code if the file hasn't changed.</li>
+	 * 	<li><code>fileDownload</code> - <code>string|resource</code> - Optional - The file system location to download the file to, or an open file resource. Must be a server-writable location.</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>lastmodified</code> - <code>string</code> - Optional - The <code>LastModified</code> header passed in from a previous request. If specified, request <code>ETag</code> option must be specified as well. Will trigger a <code>304 Not Modified</code> status code if the file hasn't changed.</li>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>range</code> - <code>string</code> - Optional - The range of bytes to fetch from the object. Specify this parameter when downloading partial bits or completing incomplete object downloads. The specified range must be notated with a hyphen (e.g., 0-10485759). Defaults to the byte range of the complete Amazon S3 object.</li>
+	 * 	<li><code>response</code> - <code>array</code> - Optional - Allows adjustments to specific response headers. Pass an associative array where each key is one of the following: <code>cache-control</code>, <code>content-disposition</code>, <code>content-encoding</code>, <code>content-language</code>, <code>content-type</code>, <code>expires</code>. The <code>expires</code> value should use <php:gmdate()> and be formatted with the <code>DATE_RFC2822</code> constant.</li>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_object($bucket, $filename, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'GET';
+		$opt['resource'] = $filename;
+
+		if (!isset($opt['headers']) || !is_array($opt['headers']))
+		{
+			$opt['headers'] = array();
+		}
+
+		if (isset($opt['lastmodified']))
+		{
+			$opt['headers']['If-Modified-Since'] = $opt['lastmodified'];
+		}
+
+		if (isset($opt['etag']))
+		{
+			$opt['headers']['If-None-Match'] = $opt['etag'];
+		}
+
+		// Partial content range
+		if (isset($opt['range']))
+		{
+			$opt['headers']['Range'] = 'bytes=' . $opt['range'];
+		}
+
+		// GET responses
+		if (isset($opt['response']))
+		{
+			foreach ($opt['response'] as $key => $value)
+			{
+				$opt['response-' . $key] = $value;
+				unset($opt['response'][$key]);
+			}
+		}
+
+		// Authenticate to S3
+		$this->parse_the_response = false;
+		$response = $this->authenticate($bucket, $opt);
+		$this->parse_the_response = true;
+
+		return $response;
+	}
+
+	/**
+	 * Gets the HTTP headers for the specified Amazon S3 object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_object_headers($bucket, $filename, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'HEAD';
+		$opt['resource'] = $filename;
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Deletes an Amazon S3 object from the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to delete. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>MFASerial</code> - <code>string</code> - Optional - The serial number on the back of the Gemalto device. <code>MFASerial</code> and <code>MFAToken</code> must both be set for MFA to work.</li>
+	 * 	<li><code>MFAToken</code> - <code>string</code> - Optional - The current token displayed on the Gemalto device. <code>MFASerial</code> and <code>MFAToken</code> must both be set for MFA to work.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
+	 */
+	public function delete_object($bucket, $filename, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'DELETE';
+		$opt['resource'] = $filename;
+
+		// Enable MFA delete?
+		// @codeCoverageIgnoreStart
+		if (isset($opt['MFASerial']) && isset($opt['MFAToken']))
+		{
+			$opt['headers'] = array(
+				'x-amz-mfa' => ($opt['MFASerial'] . ' ' . $opt['MFAToken'])
+			);
+		}
+		// @codeCoverageIgnoreEnd
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Deletes two or more specified Amazon S3 objects from the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>objects</code> - <code>array</code> - Required - The object references to delete from the bucket. <ul>
+	 * 		<li><code>key</code> - <code>string</code> - Required - The name of the object (e.g., the "key") to delete. This should include the entire file path including all "subdirectories".</li>
+	 * 		<li><code>version_id</code> - <code>string</code> - Optional - If the object is versioned, include the version ID to delete.</li>
+	 * 	</ul></li>
+	 * 	<li><code>quiet</code> - <code>boolean</code> - Optional - Whether or not Amazon S3 should use "Quiet" mode for this operation. A value of <code>true</code> will enable Quiet mode. A value of <code>false</code> will use Verbose mode. The default value is <code>false</code>.</li>
+	 * 	<li><code>MFASerial</code> - <code>string</code> - Optional - The serial number on the back of the Gemalto device. <code>MFASerial</code> and <code>MFAToken</code> must both be set for MFA to work.</li>
+	 * 	<li><code>MFAToken</code> - <code>string</code> - Optional - The current token displayed on the Gemalto device. <code>MFASerial</code> and <code>MFAToken</code> must both be set for MFA to work.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
+	 */
+	public function delete_objects($bucket, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'POST';
+		$opt['sub_resource'] = 'delete';
+		$opt['body'] = '';
+
+		// Bail out
+		if (!isset($opt['objects']) || !is_array($opt['objects']))
+		{
+			throw new S3_Exception('The ' . __FUNCTION__ . ' method requires the "objects" option to be set as an array.');
+		}
+
+		$xml = new SimpleXMLElement($this->multi_object_delete_xml);
+
+		// Add the objects
+		foreach ($opt['objects'] as $object)
+		{
+			$xobject = $xml->addChild('Object');
+			$xobject->addChild('Key', $object['key']);
+
+			if (isset($object['version_id']))
+			{
+				$xobject->addChild('VersionId', $object['version_id']);
+			}
+		}
+
+		// Quiet mode?
+		if (isset($opt['quiet']))
+		{
+			$quiet = 'false';
+			if (is_bool($opt['quiet'])) // Boolean
+			{
+				$quiet = $opt['quiet'] ? 'true' : 'false';
+			}
+			elseif (is_string($opt['quiet'])) // String
+			{
+				$quiet = ($opt['quiet'] === 'true') ? 'true' : 'false';
+			}
+
+			$xml->addChild('Quiet', $quiet);
+		}
+
+		// Enable MFA delete?
+		// @codeCoverageIgnoreStart
+		if (isset($opt['MFASerial']) && isset($opt['MFAToken']))
+		{
+			$opt['headers'] = array(
+				'x-amz-mfa' => ($opt['MFASerial'] . ' ' . $opt['MFAToken'])
+			);
+		}
+		// @codeCoverageIgnoreEnd
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Gets a list of all Amazon S3 objects in the specified bucket.
+	 *
+	 * NOTE: <strong>This method is paginated</strong>, and will not return more than <code>max-keys</code> keys. If you want to retrieve a list of all keys, you will need to make multiple calls to this function using the <code>marker</code> option to specify the pagination offset (the key of the last processed key--lexically ordered) and the <code>IsTruncated</code> response key to detect when all results have been processed. See: <a href="http://docs.amazonwebservices.com/AmazonS3/latest/API/index.html?RESTBucketGET.html">the S3 REST documentation for get_bucket</a> for more information.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>delimiter</code> - <code>string</code> - Optional - Keys that contain the same string between the prefix and the first occurrence of the delimiter will be rolled up into a single result element in the CommonPrefixes collection.</li>
+	 * 	<li><code>marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the marker.</li>
+	 * 	<li><code>max-keys</code> - <code>string</code> - Optional - The maximum number of results returned by the method call. The returned list will contain no more results than the specified value, but may return fewer. The default value is 1000.</li>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>prefix</code> - <code>string</code> - Optional - Restricts the response to contain results that begin only with the specified prefix.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function list_objects($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'GET';
+
+		foreach (array('delimiter', 'marker', 'max-keys', 'prefix') as $param)
+		{
+			if (isset($opt[$param]))
+			{
+				$opt['query_string'][$param] = $opt[$param];
+				unset($opt[$param]);
+			}
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Copies an Amazon S3 object to a new location, whether in the same Amazon S3 region, bucket, or otherwise.
+	 *
+	 * @param array $source (Required) The bucket and file name to copy from. The following keys must be set: <ul>
+	 * 	<li><code>bucket</code> - <code>string</code> - Required - Specifies the name of the bucket containing the source object.</li>
+	 * 	<li><code>filename</code> - <code>string</code> - Required - Specifies the file name of the source object to copy.</li></ul>
+	 * @param array $dest (Required) The bucket and file name to copy to. The following keys must be set: <ul>
+	 * 	<li><code>bucket</code> - <code>string</code> - Required - Specifies the name of the bucket to copy the object to.</li>
+	 * 	<li><code>filename</code> - <code>string</code> - Required - Specifies the file name to copy the object to.</li></ul>
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>acl</code> - <code>string</code> - Optional - The ACL settings for the specified object. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. Alternatively, an array of associative arrays. Each associative array contains an <code>id</code> and a <code>permission</code> key. The default value is <code>ACL_PRIVATE</code>.</li>
+	 * 	<li><code>encryption</code> - <code>string</code> - Optional - The algorithm to use for encrypting the object. [Allowed values: <code>AES256</code>]</li>
+	 * 	<li><code>storage</code> - <code>string</code> - Optional - Whether to use Standard or Reduced Redundancy storage. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]. The default value is <code>STORAGE_STANDARD</code>.</li>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to copy. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>ifMatch</code> - <code>string</code> - Optional - The ETag header from a previous request. Copies the object if its entity tag (ETag) matches the specified tag; otherwise, the request returns a <code>412</code> HTTP status code error (precondition failed). Used in conjunction with <code>ifUnmodifiedSince</code>.</li>
+	 * 	<li><code>ifUnmodifiedSince</code> - <code>string</code> - Optional - The LastModified header from a previous request. Copies the object if it hasn't been modified since the specified time; otherwise, the request returns a <code>412</code> HTTP status code error (precondition failed). Used in conjunction with <code>ifMatch</code>.</li>
+	 * 	<li><code>ifNoneMatch</code> - <code>string</code> - Optional - The ETag header from a previous request. Copies the object if its entity tag (ETag) is different than the specified ETag; otherwise, the request returns a <code>412</code> HTTP status code error (failed condition). Used in conjunction with <code>ifModifiedSince</code>.</li>
+	 * 	<li><code>ifModifiedSince</code> - <code>string</code> - Optional - The LastModified header from a previous request. Copies the object if it has been modified since the specified time; otherwise, the request returns a <code>412</code> HTTP status code error (failed condition). Used in conjunction with <code>ifNoneMatch</code>.</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>meta</code> - <code>array</code> - Optional - Associative array of key-value pairs. Represented by <code>x-amz-meta-:</code> Any header starting with this prefix is considered user metadata. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
+	 * 	<li><code>metadataDirective</code> - <code>string</code> - Optional - Accepts either COPY or REPLACE. You will likely never need to use this, as it manages itself with no issues.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/API/RESTObjectCOPY.html Copying Amazon S3 Objects
+	 */
+	public function copy_object($source, $dest, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$batch = array();
+
+		// Add this to our request
+		$opt['verb'] = 'PUT';
+		$opt['resource'] = $dest['filename'];
+		$opt['body'] = '';
+
+		// Handle copy source
+		if (isset($source['bucket']) && isset($source['filename']))
+		{
+			$opt['headers']['x-amz-copy-source'] = '/' . $source['bucket'] . '/' . rawurlencode($source['filename'])
+				. (isset($opt['versionId']) ? ('?' . 'versionId=' . rawurlencode($opt['versionId'])) : ''); // Append the versionId to copy, if available
+			unset($opt['versionId']);
+
+			// Determine if we need to lookup the pre-existing content-type.
+			if (
+				(!$this->use_batch_flow && !isset($opt['returnCurlHandle'])) &&
+				!in_array(strtolower('content-type'), array_map('strtolower', array_keys($opt['headers'])))
+			)
+			{
+				$response = $this->get_object_headers($source['bucket'], $source['filename']);
+				if ($response->isOK())
+				{
+					$opt['headers']['Content-Type'] = $response->header['content-type'];
+				}
+			}
+		}
+
+		// Handle metadata directive
+		$opt['headers']['x-amz-metadata-directive'] = 'COPY';
+		if ($source['bucket'] === $dest['bucket'] && $source['filename'] === $dest['filename'])
+		{
+			$opt['headers']['x-amz-metadata-directive'] = 'REPLACE';
+		}
+		if (isset($opt['metadataDirective']))
+		{
+			$opt['headers']['x-amz-metadata-directive'] = $opt['metadataDirective'];
+			unset($opt['metadataDirective']);
+		}
+
+		// Handle Access Control Lists. Can also pass canned ACLs as an HTTP header.
+		if (isset($opt['acl']) && is_array($opt['acl']))
+		{
+			$batch[] = $this->set_object_acl($dest['bucket'], $dest['filename'], $opt['acl'], array(
+				'returnCurlHandle' => true
+			));
+			unset($opt['acl']);
+		}
+		elseif (isset($opt['acl']))
+		{
+			$opt['headers']['x-amz-acl'] = $opt['acl'];
+			unset($opt['acl']);
+		}
+
+		// Handle storage settings. Can also be passed as an HTTP header.
+		if (isset($opt['storage']))
+		{
+			$opt['headers']['x-amz-storage-class'] = $opt['storage'];
+			unset($opt['storage']);
+		}
+
+		// Handle encryption settings. Can also be passed as an HTTP header.
+		if (isset($opt['encryption']))
+		{
+			$opt['headers']['x-amz-server-side-encryption'] = $opt['encryption'];
+			unset($opt['encryption']);
+		}
+
+		// Handle conditional-copy parameters
+		if (isset($opt['ifMatch']))
+		{
+			$opt['headers']['x-amz-copy-source-if-match'] = $opt['ifMatch'];
+			unset($opt['ifMatch']);
+		}
+		if (isset($opt['ifNoneMatch']))
+		{
+			$opt['headers']['x-amz-copy-source-if-none-match'] = $opt['ifNoneMatch'];
+			unset($opt['ifNoneMatch']);
+		}
+		if (isset($opt['ifUnmodifiedSince']))
+		{
+			$opt['headers']['x-amz-copy-source-if-unmodified-since'] = $opt['ifUnmodifiedSince'];
+			unset($opt['ifUnmodifiedSince']);
+		}
+		if (isset($opt['ifModifiedSince']))
+		{
+			$opt['headers']['x-amz-copy-source-if-modified-since'] = $opt['ifModifiedSince'];
+			unset($opt['ifModifiedSince']);
+		}
+
+		// Handle meta tags. Can also be passed as an HTTP header.
+		if (isset($opt['meta']))
+		{
+			foreach ($opt['meta'] as $meta_key => $meta_value)
+			{
+				// e.g., `My Meta Header` is converted to `x-amz-meta-my-meta-header`.
+				$opt['headers']['x-amz-meta-' . strtolower(str_replace(' ', '-', $meta_key))] = $meta_value;
+			}
+			unset($opt['meta']);
+		}
+
+		// Authenticate to S3
+		$response = $this->authenticate($dest['bucket'], $opt);
+
+		// Attempt to reset ACLs
+		$http = new RequestCore();
+		$http->send_multi_request($batch);
+
+		return $response;
+	}
+
+	/**
+	 * Updates an Amazon S3 object with new headers or other metadata. To replace the content of the
+	 * specified Amazon S3 object, call <create_object()> with the same bucket and file name parameters.
+	 *
+	 * @param string $bucket (Required) The name of the bucket that contains the source file.
+	 * @param string $filename (Required) The source file name that you want to update.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>acl</code> - <code>string</code> - Optional - The ACL settings for the specified object. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <ACL_PRIVATE>.</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>meta</code> - <code>array</code> - Optional - An associative array of key-value pairs. Any header with the <code>x-amz-meta-</code> prefix is considered user metadata and is stored with the Amazon S3 object. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/API/RESTObjectCOPY.html Copying Amazon S3 Objects
+	 */
+	public function update_object($bucket, $filename, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['metadataDirective'] = 'REPLACE';
+
+		// Authenticate to S3
+		return $this->copy_object(
+			array('bucket' => $bucket, 'filename' => $filename),
+			array('bucket' => $bucket, 'filename' => $filename),
+			$opt
+		);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// ACCESS CONTROL LISTS
+
+	/**
+	 * Gets the access control list (ACL) settings for the specified Amazon S3 object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function get_object_acl($bucket, $filename, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['resource'] = $filename;
+		$opt['sub_resource'] = 'acl';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Sets the access control list (ACL) settings for the specified Amazon S3 object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $acl (Optional) The ACL settings for the specified object. Accepts any of the following constants: [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. Alternatively, an array of associative arrays. Each associative array contains an <code>id</code> and a <code>permission</code> key. The default value is <code>ACL_PRIVATE</code>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function set_object_acl($bucket, $filename, $acl = self::ACL_PRIVATE, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['resource'] = $filename;
+		$opt['sub_resource'] = 'acl';
+
+		// Retrieve the original metadata
+		$metadata = $this->get_object_metadata($bucket, $filename);
+		if ($metadata && $metadata['ContentType'])
+		{
+			$opt['headers']['Content-Type'] = $metadata['ContentType'];
+		}
+		if ($metadata && $metadata['StorageClass'])
+		{
+			$opt['headers']['x-amz-storage-class'] = $metadata['StorageClass'];
+		}
+
+		// Make sure these are defined.
+		// @codeCoverageIgnoreStart
+		if (!$this->credentials->canonical_id || !$this->credentials->canonical_name)
+		{
+			// Fetch the data live.
+			$canonical = $this->get_canonical_user_id();
+			$this->credentials->canonical_id = $canonical['id'];
+			$this->credentials->canonical_name = $canonical['display_name'];
+		}
+		// @codeCoverageIgnoreEnd
+
+		if (is_array($acl))
+		{
+			$opt['body'] = $this->generate_access_policy($this->credentials->canonical_id, $this->credentials->canonical_name, $acl);
+		}
+		else
+		{
+			$opt['body'] = '';
+			$opt['headers']['x-amz-acl'] = $acl;
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Generates the XML to be used for the Access Control Policy.
+	 *
+	 * @param string $canonical_id (Required) The canonical ID for the bucket owner. This is provided as the `id` return value from <get_canonical_user_id()>.
+	 * @param string $canonical_name (Required) The canonical display name for the bucket owner. This is provided as the `display_name` value from <get_canonical_user_id()>.
+	 * @param array $users (Optional) An array of associative arrays. Each associative array contains an `id` value and a `permission` value.
+	 * @return string Access Control Policy XML.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_ACLs.html Access Control Lists
+	 */
+	public function generate_access_policy($canonical_id, $canonical_name, $users)
+	{
+		$xml = simplexml_load_string($this->base_acp_xml);
+		$owner = $xml->addChild('Owner');
+		$owner->addChild('ID', $canonical_id);
+		$owner->addChild('DisplayName', $canonical_name);
+		$acl = $xml->addChild('AccessControlList');
+
+		foreach ($users as $user)
+		{
+			$grant = $acl->addChild('Grant');
+			$grantee = $grant->addChild('Grantee');
+
+			switch ($user['id'])
+			{
+				// Authorized Users
+				case self::USERS_AUTH:
+					$grantee->addAttribute('xsi:type', 'Group', 'http://www.w3.org/2001/XMLSchema-instance');
+					$grantee->addChild('URI', self::USERS_AUTH);
+					break;
+
+				// All Users
+				case self::USERS_ALL:
+					$grantee->addAttribute('xsi:type', 'Group', 'http://www.w3.org/2001/XMLSchema-instance');
+					$grantee->addChild('URI', self::USERS_ALL);
+					break;
+
+				// The Logging User
+				case self::USERS_LOGGING:
+					$grantee->addAttribute('xsi:type', 'Group', 'http://www.w3.org/2001/XMLSchema-instance');
+					$grantee->addChild('URI', self::USERS_LOGGING);
+					break;
+
+				// Email Address or Canonical Id
+				default:
+					if (strpos($user['id'], '@'))
+					{
+						$grantee->addAttribute('xsi:type', 'AmazonCustomerByEmail', 'http://www.w3.org/2001/XMLSchema-instance');
+						$grantee->addChild('EmailAddress', $user['id']);
+					}
+					else
+					{
+						// Assume Canonical Id
+						$grantee->addAttribute('xsi:type', 'CanonicalUser', 'http://www.w3.org/2001/XMLSchema-instance');
+						$grantee->addChild('ID', $user['id']);
+					}
+					break;
+			}
+
+			$grant->addChild('Permission', $user['permission']);
+		}
+
+		return $xml->asXML();
+	}
+
+
+	/*%******************************************************************************************%*/
+	// LOGGING METHODS
+
+	/**
+	 * Gets the access logs associated with the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use. Pass a `null` value when using the <set_vhost()> method.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/ServerLogs.html Server Access Logging
+	 */
+	public function get_logs($bucket, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'logging';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Enables access logging for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to enable logging for. Pass a `null` value when using the <set_vhost()> method.
+	 * @param string $target_bucket (Required) The name of the bucket to store the logs in.
+	 * @param string $target_prefix (Required) The prefix to give to the log file names.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>users</code> - <code>array</code> - Optional - An array of associative arrays specifying any user to give access to. Each associative array contains an <code>id</code> and <code>permission</code> value.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/LoggingAPI.html Server Access Logging Configuration API
+	 */
+	public function enable_logging($bucket, $target_bucket, $target_prefix, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'logging';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		$xml = simplexml_load_string($this->base_logging_xml);
+		$LoggingEnabled = $xml->addChild('LoggingEnabled');
+		$LoggingEnabled->addChild('TargetBucket', $target_bucket);
+		$LoggingEnabled->addChild('TargetPrefix', $target_prefix);
+		$TargetGrants = $LoggingEnabled->addChild('TargetGrants');
+
+		if (isset($opt['users']) && is_array($opt['users']))
+		{
+			foreach ($opt['users'] as $user)
+			{
+				$grant = $TargetGrants->addChild('Grant');
+				$grantee = $grant->addChild('Grantee');
+
+				switch ($user['id'])
+				{
+					// Authorized Users
+					case self::USERS_AUTH:
+						$grantee->addAttribute('xsi:type', 'Group', 'http://www.w3.org/2001/XMLSchema-instance');
+						$grantee->addChild('URI', self::USERS_AUTH);
+						break;
+
+					// All Users
+					case self::USERS_ALL:
+						$grantee->addAttribute('xsi:type', 'Group', 'http://www.w3.org/2001/XMLSchema-instance');
+						$grantee->addChild('URI', self::USERS_ALL);
+						break;
+
+					// The Logging User
+					case self::USERS_LOGGING:
+						$grantee->addAttribute('xsi:type', 'Group', 'http://www.w3.org/2001/XMLSchema-instance');
+						$grantee->addChild('URI', self::USERS_LOGGING);
+						break;
+
+					// Email Address or Canonical Id
+					default:
+						if (strpos($user['id'], '@'))
+						{
+							$grantee->addAttribute('xsi:type', 'AmazonCustomerByEmail', 'http://www.w3.org/2001/XMLSchema-instance');
+							$grantee->addChild('EmailAddress', $user['id']);
+						}
+						else
+						{
+							// Assume Canonical Id
+							$grantee->addAttribute('xsi:type', 'CanonicalUser', 'http://www.w3.org/2001/XMLSchema-instance');
+							$grantee->addChild('ID', $user['id']);
+						}
+						break;
+				}
+
+				$grant->addChild('Permission', $user['permission']);
+			}
+		}
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Disables access logging for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use. Pass `null` if using <set_vhost()>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/LoggingAPI.html Server Access Logging Configuration API
+	 */
+	public function disable_logging($bucket, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'logging';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+		$opt['body'] = $this->base_logging_xml;
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// CONVENIENCE METHODS
+
+	/**
+	 * Gets whether or not the specified Amazon S3 bucket exists in Amazon S3. This includes buckets
+	 * that do not belong to the caller.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @return boolean A value of <code>true</code> if the bucket exists, or a value of <code>false</code> if it does not.
+	 */
+	public function if_bucket_exists($bucket)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		$header = $this->get_bucket_headers($bucket);
+		return (bool) $header->isOK();
+	}
+
+	/**
+	 * Gets whether or not the specified Amazon S3 object exists in the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @return boolean A value of <code>true</code> if the object exists, or a value of <code>false</code> if it does not.
+	 */
+	public function if_object_exists($bucket, $filename)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		$header = $this->get_object_headers($bucket, $filename);
+
+		if ($header->isOK()) { return true; }
+		elseif ($header->status === 404) { return false; }
+
+		// @codeCoverageIgnoreStart
+		return null;
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Gets whether or not the specified Amazon S3 bucket has a bucket policy associated with it.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @return boolean A value of <code>true</code> if a bucket policy exists, or a value of <code>false</code> if one does not.
+	 */
+	public function if_bucket_policy_exists($bucket)
+	{
+		if ($this->use_batch_flow)
+		{
+			// @codeCoverageIgnoreStart
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$response = $this->get_bucket_policy($bucket);
+
+		if ($response->isOK()) { return true; }
+		elseif ($response->status === 404) { return false; }
+
+		// @codeCoverageIgnoreStart
+		return null;
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Gets the number of Amazon S3 objects in the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @return integer The number of Amazon S3 objects in the bucket.
+	 */
+	public function get_bucket_object_count($bucket)
+	{
+		if ($this->use_batch_flow)
+		{
+			// @codeCoverageIgnoreStart
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+			// @codeCoverageIgnoreEnd
+		}
+
+		return count($this->get_object_list($bucket));
+	}
+
+	/**
+	 * Gets the cumulative file size of the contents of the Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param boolean $friendly_format (Optional) A value of <code>true</code> will format the return value to 2 decimal points using the largest possible unit (i.e., 3.42 GB). A value of <code>false</code> will format the return value as the raw number of bytes.
+	 * @return integer|string The number of bytes as an integer, or the friendly format as a string.
+	 */
+	public function get_bucket_filesize($bucket, $friendly_format = false)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		$filesize = 0;
+		$list = $this->list_objects($bucket);
+
+		foreach ($list->body->Contents as $filename)
+		{
+			$filesize += (integer) $filename->Size;
+		}
+
+		while ((string) $list->body->IsTruncated === 'true')
+		{
+			$body = (array) $list->body;
+			$list = $this->list_objects($bucket, array(
+				'marker' => (string) end($body['Contents'])->Key
+			));
+
+			foreach ($list->body->Contents as $object)
+			{
+				$filesize += (integer) $object->Size;
+			}
+		}
+
+		if ($friendly_format)
+		{
+			$filesize = $this->util->size_readable($filesize);
+		}
+
+		return $filesize;
+	}
+
+	/**
+	 * Gets the file size of the specified Amazon S3 object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param boolean $friendly_format (Optional) A value of <code>true</code> will format the return value to 2 decimal points using the largest possible unit (i.e., 3.42 GB). A value of <code>false</code> will format the return value as the raw number of bytes.
+	 * @return integer|string The number of bytes as an integer, or the friendly format as a string.
+	 */
+	public function get_object_filesize($bucket, $filename, $friendly_format = false)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		$object = $this->get_object_headers($bucket, $filename);
+		$filesize = (integer) $object->header['content-length'];
+
+		if ($friendly_format)
+		{
+			$filesize = $this->util->size_readable($filesize);
+		}
+
+		return $filesize;
+	}
+
+	/**
+	 * Changes the content type for an existing Amazon S3 object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $contentType (Required) The content-type to apply to the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function change_content_type($bucket, $filename, $contentType, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Retrieve the original metadata
+		$metadata = $this->get_object_metadata($bucket, $filename);
+		if ($metadata && $metadata['ACL'])
+		{
+			$opt['acl'] = $metadata['ACL'];
+		}
+		if ($metadata && $metadata['StorageClass'])
+		{
+			$opt['headers']['x-amz-storage-class'] = $metadata['StorageClass'];
+		}
+
+		// Merge optional parameters
+		$opt = array_merge_recursive(array(
+			'headers' => array(
+				'Content-Type' => $contentType
+			),
+			'metadataDirective' => 'COPY'
+		), $opt);
+
+		return $this->copy_object(
+			array('bucket' => $bucket, 'filename' => $filename),
+			array('bucket' => $bucket, 'filename' => $filename),
+			$opt
+		);
+	}
+
+	/**
+	 * Changes the storage redundancy for an existing object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $storage (Required) The storage setting to apply to the object. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function change_storage_redundancy($bucket, $filename, $storage, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Retrieve the original metadata
+		$metadata = $this->get_object_metadata($bucket, $filename);
+		if ($metadata && $metadata['ACL'])
+		{
+			$opt['acl'] = $metadata['ACL'];
+		}
+		if ($metadata && $metadata['ContentType'])
+		{
+			$opt['headers']['Content-Type'] = $metadata['ContentType'];
+		}
+
+		// Merge optional parameters
+		$opt = array_merge(array(
+			'storage' => $storage,
+			'metadataDirective' => 'COPY',
+		), $opt);
+
+		return $this->copy_object(
+			array('bucket' => $bucket, 'filename' => $filename),
+			array('bucket' => $bucket, 'filename' => $filename),
+			$opt
+		);
+	}
+
+	/**
+	 * Gets a simplified list of bucket names on an Amazon S3 account.
+	 *
+	 * @param string $pcre (Optional) A Perl-Compatible Regular Expression (PCRE) to filter the bucket names against.
+	 * @return array The list of matching bucket names. If there are no results, the method will return an empty array.
+	 * @link http://php.net/pcre Regular Expressions (Perl-Compatible)
+	 */
+	public function get_bucket_list($pcre = null)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		// Get a list of buckets.
+		$list = $this->list_buckets();
+		if ($list = $list->body->query('descendant-or-self::Name'))
+		{
+			$list = $list->map_string($pcre);
+			return $list;
+		}
+
+		// @codeCoverageIgnoreStart
+		return array();
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Gets a simplified list of Amazon S3 object file names contained in a bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>delimiter</code> - <code>string</code> - Optional - Keys that contain the same string between the prefix and the first occurrence of the delimiter will be rolled up into a single result element in the CommonPrefixes collection.</li>
+	 * 	<li><code>marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the marker.</li>
+	 * 	<li><code>max-keys</code> - <code>integer</code> - Optional - The maximum number of results returned by the method call. The returned list will contain no more results than the specified value, but may return less. A value of zero is treated as if you did not specify max-keys.</li>
+	 * 	<li><code>pcre</code> - <code>string</code> - Optional - A Perl-Compatible Regular Expression (PCRE) to filter the names against. This is applied only AFTER any native Amazon S3 filtering from specified <code>prefix</code>, <code>marker</code>, <code>max-keys</code>, or <code>delimiter</code> values are applied.</li>
+	 * 	<li><code>prefix</code> - <code>string</code> - Optional - Restricts the response to contain results that begin only with the specified prefix.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * @return array The list of matching object names. If there are no results, the method will return an empty array.
+	 * @link http://php.net/pcre Regular Expressions (Perl-Compatible)
+	 */
+	public function get_object_list($bucket, $opt = null)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		if (!$opt) $opt = array();
+		unset($opt['returnCurlHandle']); // This would cause problems
+
+		// Set some default values
+		$pcre = isset($opt['pcre']) ? $opt['pcre'] : null;
+		$max_keys = (isset($opt['max-keys']) && is_int($opt['max-keys'])) ? $opt['max-keys'] : null;
+		$objects = array();
+
+		if (!$max_keys)
+		{
+			// No max-keys specified. Get everything.
+			do
+			{
+				$list = $this->list_objects($bucket, $opt);
+				if ($keys = $list->body->query('descendant-or-self::Key')->map_string($pcre))
+				{
+					$objects = array_merge($objects, $keys);
+				}
+
+				$body = (array) $list->body;
+				$opt = array_merge($opt, array(
+					'marker' => (isset($body['Contents']) && is_array($body['Contents'])) ?
+						((string) end($body['Contents'])->Key) :
+						((string) $list->body->Contents->Key)
+				));
+			}
+			while ((string) $list->body->IsTruncated === 'true');
+		}
+		else
+		{
+			// Max-keys specified. Approximate number of loops and make the requests.
+
+			$max_keys = $opt['max-keys'];
+			$loops = ceil($max_keys / 1000);
+
+			do
+			{
+				$list = $this->list_objects($bucket, $opt);
+				$keys = $list->body->query('descendant-or-self::Key')->map_string($pcre);
+
+				if ($count = count($keys))
+				{
+					$objects = array_merge($objects, $keys);
+
+					if ($count < 1000)
+					{
+						break;
+					}
+				}
+
+				if ($max_keys > 1000)
+				{
+					$max_keys -= 1000;
+				}
+
+				$body = (array) $list->body;
+				$opt = array_merge($opt, array(
+					'max-keys' => $max_keys,
+					'marker' => (isset($body['Contents']) && is_array($body['Contents'])) ?
+						((string) end($body['Contents'])->Key) :
+						((string) $list->body->Contents->Key)
+				));
+			}
+			while (--$loops);
+		}
+
+		return $objects;
+	}
+
+	/**
+	 * Deletes all Amazon S3 objects inside the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $pcre (Optional) A Perl-Compatible Regular Expression (PCRE) to filter the names against. The default value is <PCRE_ALL>.
+	 * @return boolean A value of <code>true</code> means that all objects were successfully deleted. A value of <code>false</code> means that at least one object failed to delete.
+	 * @link http://php.net/pcre Regular Expressions (Perl-Compatible)
+	 */
+	public function delete_all_objects($bucket, $pcre = self::PCRE_ALL)
+	{
+		// Collect all matches
+		$list = $this->get_object_list($bucket, array('pcre' => $pcre));
+
+		// As long as we have at least one match...
+		if (count($list) > 0)
+		{
+			$objects = array();
+
+			foreach ($list as $object)
+			{
+				$objects[] = array('key' => $object);
+			}
+
+			$batch = new CFBatchRequest();
+			$batch->use_credentials($this->credentials);
+
+			foreach (array_chunk($objects, 1000) as $object_set)
+			{
+				$this->batch($batch)->delete_objects($bucket, array(
+					'objects' => $object_set
+				));
+			}
+
+			$responses = $this->batch($batch)->send();
+			$is_ok = true;
+
+			foreach ($responses as $response)
+			{
+				if (!$response->isOK() || isset($response->body->Error))
+				{
+					$is_ok = false;
+				}
+			}
+
+			return $is_ok;
+		}
+
+		// If there are no matches, return true
+		return true;
+	}
+
+	/**
+	 * Deletes all of the versions of all Amazon S3 objects inside the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $pcre (Optional) A Perl-Compatible Regular Expression (PCRE) to filter the names against. The default value is <PCRE_ALL>.
+	 * @return boolean A value of <code>true</code> means that all object versions were successfully deleted. A value of <code>false</code> means that at least one object/version failed to delete.
+	 * @link http://php.net/pcre Regular Expressions (Perl-Compatible)
+	 */
+	public function delete_all_object_versions($bucket, $pcre = null)
+	{
+		// Instantiate
+		$versions = $this->list_bucket_object_versions($bucket);
+
+		// Gather all nodes together into a single array
+		if ($versions->body->DeleteMarker() && $versions->body->Version())
+		{
+			$markers = array_merge($versions->body->DeleteMarker()->getArrayCopy(), $versions->body->Version()->getArrayCopy());
+		}
+		elseif ($versions->body->DeleteMarker())
+		{
+			$markers = $versions->body->DeleteMarker()->getArrayCopy();
+		}
+		elseif ($versions->body->Version())
+		{
+			$markers = $versions->body->Version()->getArrayCopy();
+		}
+		else
+		{
+			$markers = array();
+		}
+
+		while ((string) $versions->body->IsTruncated === 'true')
+		{
+			$versions = $this->list_bucket_object_versions($bucket, array(
+				'key-marker' => (string) $versions->body->NextKeyMarker
+			));
+
+			// Gather all nodes together into a single array
+			if ($versions->body->DeleteMarker() && $versions->body->Version())
+			{
+				$markers = array_merge($markers, $versions->body->DeleteMarker()->getArrayCopy(), $versions->body->Version()->getArrayCopy());
+			}
+			elseif ($versions->body->DeleteMarker())
+			{
+				$markers = array_merge($markers, $versions->body->DeleteMarker()->getArrayCopy());
+			}
+			elseif ($versions->body->Version())
+			{
+				$markers = array_merge($markers, $versions->body->Version()->getArrayCopy());
+			}
+		}
+
+		$objects = array();
+
+		// Loop through markers
+		foreach ($markers as $marker)
+		{
+			if ($pcre)
+			{
+				if (preg_match($pcre, (string) $marker->Key))
+				{
+					$xx = array('key' => (string) $marker->Key);
+					if ((string) $marker->VersionId !== 'null')
+					{
+						$xx['version_id'] = (string) $marker->VersionId;
+					}
+					$objects[] = $xx;
+					unset($xx);
+				}
+			}
+			else
+			{
+				$xx = array('key' => (string) $marker->Key);
+				if ((string) $marker->VersionId !== 'null')
+				{
+					$xx['version_id'] = (string) $marker->VersionId;
+				}
+				$objects[] = $xx;
+				unset($xx);
+			}
+		}
+
+		$batch = new CFBatchRequest();
+		$batch->use_credentials($this->credentials);
+
+		foreach (array_chunk($objects, 1000) as $object_set)
+		{
+			$this->batch($batch)->delete_objects($bucket, array(
+				'objects' => $object_set
+			));
+		}
+
+		$responses = $this->batch($batch)->send();
+		$is_ok = true;
+
+		foreach ($responses as $response)
+		{
+			if (!$response->isOK() || isset($response->body->Error))
+			{
+				$is_ok = false;
+			}
+		}
+
+		return $is_ok;
+	}
+
+	/**
+	 * Gets the collective metadata for the given Amazon S3 object.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the Amazon S3 object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return mixed If the object exists, the method returns the collective metadata for the Amazon S3 object. If the object does not exist, the method returns boolean <code>false</code>.
+	 */
+	public function get_object_metadata($bucket, $filename, $opt = null)
+	{
+		$batch = new CFBatchRequest();
+		$this->batch($batch)->get_object_acl($bucket, $filename); // Get ACL info
+		$this->batch($batch)->get_object_headers($bucket, $filename); // Get content-type
+		$this->batch($batch)->list_objects($bucket, array( // Get other metadata
+			'max-keys' => 1,
+			'prefix' => $filename
+		));
+		$response = $this->batch($batch)->send();
+
+		// Fail if any requests were unsuccessful
+		if (!$response->areOK())
+		{
+			return false;
+		}
+
+		$data = array(
+			'ACL' => array(),
+			'ContentType' => null,
+			'ETag' => null,
+			'Headers' => null,
+			'Key' => null,
+			'LastModified' => null,
+			'Owner' => array(),
+			'Size' => null,
+			'StorageClass' => null,
+		);
+
+		// Add the content type
+		$data['ContentType'] = (string) $response[1]->header['content-type'];
+
+		// Add the other metadata (including storage type)
+		$contents = json_decode(json_encode($response[2]->body->query('descendant-or-self::Contents')->first()), true);
+		$data = array_merge($data, (is_array($contents) ? $contents : array()));
+
+		// Add ACL info
+		$grants = $response[0]->body->query('descendant-or-self::Grant');
+		$max = count($grants);
+
+		// Add raw header info
+		$data['Headers'] = $response[1]->header;
+		foreach (array('_info', 'x-amz-id-2', 'x-amz-request-id', 'cneonction', 'server', 'content-length', 'content-type', 'etag') as $header)
+		{
+			unset($data['Headers'][$header]);
+		}
+		ksort($data['Headers']);
+
+		if (count($grants) > 0)
+		{
+			foreach ($grants as $grant)
+			{
+				$dgrant = array(
+					'id' => (string) $this->util->try_these(array('ID', 'URI'), $grant->Grantee),
+					'permission' => (string) $grant->Permission
+				);
+
+				$data['ACL'][] = $dgrant;
+			}
+		}
+
+		return $data;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// URLS
+
+	/**
+	 * Gets the web-accessible URL for the Amazon S3 object or generates a time-limited signed request for
+	 * a private file.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the Amazon S3 object.
+	 * @param integer|string $preauth (Optional) Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>https</code> - <code>boolean</code> - Optional - Set to <code>true</code> if you would like the URL be in https mode. Otherwise, the default behavior is always to use http regardless of your SSL settings.
+	 * 	<li><code>method</code> - <code>string</code> - Optional - The HTTP method to use for the request. Defaults to a value of <code>GET</code>.</li>
+	 * 	<li><code>response</code> - <code>array</code> - Optional - Allows adjustments to specific response headers. Pass an associative array where each key is one of the following: <code>cache-control</code>, <code>content-disposition</code>, <code>content-encoding</code>, <code>content-language</code>, <code>content-type</code>, <code>expires</code>. The <code>expires</code> value should use <php:gmdate()> and be formatted with the <code>DATE_RFC2822</code> constant.</li>
+	 * 	<li><code>torrent</code> - <code>boolean</code> - Optional - A value of <code>true</code> will return a URL to a torrent of the Amazon S3 object. A value of <code>false</code> will return a non-torrent URL. Defaults to <code>false</code>.</li>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return string The file URL, with authentication and/or torrent parameters if requested.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html Using Query String Authentication
+	 */
+	public function get_object_url($bucket, $filename, $preauth = 0, $opt = null)
+	{
+		// Add this to our request
+		if (!$opt) $opt = array();
+		$opt['verb'] = isset($opt['method']) ? $opt['method'] : 'GET';
+		$opt['resource'] = $filename;
+		$opt['preauth'] = $preauth;
+
+		if (isset($opt['torrent']) && $opt['torrent'])
+		{
+			$opt['sub_resource'] = 'torrent';
+			unset($opt['torrent']);
+		}
+
+		// GET responses
+		if (isset($opt['response']))
+		{
+			foreach ($opt['response'] as $key => $value)
+			{
+				$opt['response-' . $key] = $value;
+				unset($opt['response'][$key]);
+			}
+		}
+
+		// Determine whether or not to use SSL
+		$use_ssl = isset($opt['https']) ? (bool) $opt['https'] : false;
+		unset($opt['https']);
+		$current_use_ssl_setting = $this->use_ssl;
+
+		// Authenticate to S3
+		$this->use_ssl = $use_ssl;
+		$response = $this->authenticate($bucket, $opt);
+		$this->use_ssl = $current_use_ssl_setting;
+
+		return $response;
+	}
+
+	/**
+	 * Gets the web-accessible URL to a torrent of the Amazon S3 object. The Amazon S3 object's access
+	 * control list settings (ACL) MUST be set to <ACL_PUBLIC> for a valid URL to be returned.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param integer|string $preauth (Optional) Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.
+	 * @return string The torrent URL, with authentication parameters if requested.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?S3TorrentRetrieve.html Using BitTorrent to Retrieve Objects Stored in Amazon S3
+	 */
+	public function get_torrent_url($bucket, $filename, $preauth = 0)
+	{
+		return $this->get_object_url($bucket, $filename, $preauth, array(
+			'torrent' => true
+		));
+	}
+
+
+	/*%******************************************************************************************%*/
+	// VERSIONING
+
+	/**
+	 * Enables versioning support for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>MFASerial</code> - string (Optional) The serial number on the back of the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
+	 * 	<li><code>MFAToken</code> - string (Optional) The current token displayed on the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
+	 * 	<li><code>MFAStatus</code> - string (Optional) The MFA Delete status. Can be <code>Enabled</code> or <code>Disabled</code>. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
+	 */
+	public function enable_versioning($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'versioning';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		$xml = simplexml_load_string($this->base_versioning_xml);
+		$xml->addChild('Status', 'Enabled');
+
+		// Enable MFA delete?
+		// @codeCoverageIgnoreStart
+		if (isset($opt['MFASerial']) && isset($opt['MFAToken']) && isset($opt['MFAStatus']))
+		{
+			$xml->addChild('MfaDelete', $opt['MFAStatus']);
+			$opt['headers']['x-amz-mfa'] = ($opt['MFASerial'] . ' ' . $opt['MFAToken']);
+		}
+		// @codeCoverageIgnoreEnd
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Disables versioning support for the specified Amazon S3 bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>MFASerial</code> - <code>string</code> - Optional - The serial number on the back of the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
+	 * 	<li><code>MFAToken</code> - <code>string</code> - Optional - The current token displayed on the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
+	 * 	<li><code>MFAStatus</code> - <code>string</code> - Optional - The MFA Delete status. Can be <code>Enabled</code> or <code>Disabled</code>. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
+	 */
+	public function disable_versioning($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'versioning';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		$xml = simplexml_load_string($this->base_versioning_xml);
+		$xml->addChild('Status', 'Suspended');
+
+		// Enable MFA delete?
+		// @codeCoverageIgnoreStart
+		if (isset($opt['MFASerial']) && isset($opt['MFAToken']) && isset($opt['MFAStatus']))
+		{
+			$xml->addChild('MfaDelete', $opt['MFAStatus']);
+			$opt['headers']['x-amz-mfa'] = ($opt['MFASerial'] . ' ' . $opt['MFAToken']);
+		}
+		// @codeCoverageIgnoreEnd
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Gets an Amazon S3 bucket's versioning status.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_versioning_status($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'versioning';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Gets a list of all the versions of Amazon S3 objects in the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>delimiter</code> - <code>string</code> - Optional - Unicode string parameter. Keys that contain the same string between the prefix and the first occurrence of the delimiter will be rolled up into a single result element in the CommonPrefixes collection.</li>
+	 * 	<li><code>key-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>key-marker</code>.</li>
+	 * 	<li><code>max-keys</code> - <code>string</code> - Optional - Limits the number of results returned in response to your query. Will return no more than this number of results, but possibly less.</li>
+	 * 	<li><code>prefix</code> - <code>string</code> - Optional - Restricts the response to only contain results that begin with the specified prefix.</li>
+	 * 	<li><code>version-id-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>version-id-marker</code>.</li>
+	 * 	<li><code>preauth</code> - <code>integer|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function list_bucket_object_versions($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'versions';
+
+		foreach (array('delimiter', 'key-marker', 'max-keys', 'prefix', 'version-id-marker') as $param)
+		{
+			if (isset($opt[$param]))
+			{
+				$opt['query_string'][$param] = $opt[$param];
+				unset($opt[$param]);
+			}
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// BUCKET POLICIES
+
+	/**
+	 * Sets the policy sub-resource for the specified Amazon S3 bucket. The specified policy replaces any
+	 * policy the bucket already has.
+	 *
+	 * To perform this operation, the caller must be authorized to set a policy for the bucket and have
+	 * PutPolicy permissions. If the caller does not have PutPolicy permissions for the bucket, Amazon S3
+	 * returns a `403 Access Denied` error. If the caller has the correct permissions but has not been
+	 * authorized by the bucket owner, Amazon S3 returns a `405 Method Not Allowed` error.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param CFPolicy $policy (Required) The JSON policy to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/AccessPolicyLanguage.html Appendix: The Access Policy Language
+	 */
+	public function set_bucket_policy($bucket, CFPolicy $policy, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'policy';
+		$opt['body'] = $policy->get_json();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Gets the policy of the specified Amazon S3 bucket.
+	 *
+	 * To use this operation, the caller must have GetPolicy permissions for the specified bucket and must be
+	 * the bucket owner. If the caller does not have GetPolicy permissions, this method will generate a
+	 * `403 Access Denied` error. If the caller has the correct permissions but is not the bucket owner, this
+	 * method will generate a `405 Method Not Allowed` error. If the bucket does not have a policy defined for
+	 * it, this method will generate a `404 Policy Not Found` error.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_bucket_policy($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'policy';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Deletes the bucket policy for the specified Amazon S3 bucket. To delete the policy, the caller must
+	 * be the bucket owner and have `DeletePolicy` permissions for the specified bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response. If you do not have `DeletePolicy` permissions, Amazon S3 returns a `403 Access Denied` error. If you have the correct permissions, but are not the bucket owner, Amazon S3 returns a `405 Method Not Allowed` error. If the bucket doesn't have a policy, Amazon S3 returns a `204 No Content` error.
+	 */
+	public function delete_bucket_policy($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'DELETE';
+		$opt['sub_resource'] = 'policy';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// BUCKET NOTIFICATIONS
+
+	/**
+	 * Enables notifications of specified events for an Amazon S3 bucket. Currently, the
+	 * `s3:ReducedRedundancyLostObject` event is the only event supported for notifications. The
+	 * `s3:ReducedRedundancyLostObject` event is triggered when Amazon S3 detects that it has lost all
+	 * copies of an Amazon S3 object and can no longer service requests for that object.
+	 *
+	 * If the bucket owner and Amazon SNS topic owner are the same, the bucket owner has permission to
+	 * publish notifications to the topic by default. Otherwise, the owner of the topic must create a
+	 * policy to enable the bucket owner to publish to the topic.
+	 *
+	 * By default, only the bucket owner can configure notifications on a bucket. However, bucket owners
+	 * can use bucket policies to grant permission to other users to set this configuration with the
+	 * `s3:PutBucketNotification` permission.
+	 *
+	 * After a PUT operation is called to configure notifications on a bucket, Amazon S3 publishes a test
+	 * notification to ensure that the topic exists and that the bucket owner has permission to publish
+	 * to the specified topic. If the notification is successfully published to the SNS topic, the PUT
+	 * operation updates the bucket configuration and returns the 200 OK responses with a
+	 * `x-amz-sns-test-message-id` header containing the message ID of the test notification sent to topic.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to create bucket notifications for.
+	 * @param string $topic_arn (Required) The SNS topic ARN to send notifications to.
+	 * @param string $event (Required) The event type to listen for.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/NotificationHowTo.html Setting Up Notification of Bucket Events
+	 */
+	public function create_bucket_notification($bucket, $topic_arn, $event, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'notification';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		$xml = simplexml_load_string($this->base_notification_xml);
+		$topic_config = $xml->addChild('TopicConfiguration');
+		$topic_config->addChild('Topic', $topic_arn);
+		$topic_config->addChild('Event', $event);
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Gets the notification configuration of a bucket. Currently, the `s3:ReducedRedundancyLostObject` event
+	 * is the only event supported for notifications. The `s3:ReducedRedundancyLostObject` event is triggered
+	 * when Amazon S3 detects that it has lost all replicas of a Reduced Redundancy Storage object and can no
+	 * longer service requests for that object.
+	 *
+	 * If notifications are not enabled on the bucket, the operation returns an empty
+	 * `NotificatonConfiguration` element.
+	 *
+	 * By default, you must be the bucket owner to read the notification configuration of a bucket. However,
+	 * the bucket owner can use a bucket policy to grant permission to other users to read this configuration
+	 * with the `s3:GetBucketNotification` permission.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/NotificationHowTo.html Setting Up Notification of Bucket Events
+	 */
+	public function get_bucket_notifications($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'notification';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Empties the list of SNS topics to send notifications to.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/NotificationHowTo.html Setting Up Notification of Bucket Events
+	 */
+	public function delete_bucket_notification($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'notification';
+		$opt['body'] = $this->base_notification_xml;
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// MULTIPART UPLOAD
+
+	/**
+	 * Calculates the correct values for sequentially reading a file for multipart upload. This method should
+	 * be used in conjunction with <upload_part()>.
+	 *
+	 * @param integer $filesize (Required) The size in bytes of the entire file.
+	 * @param integer $part_size (Required) The size in bytes of the part of the file to send.
+	 * @return array An array containing key-value pairs. The keys are `seekTo` and `length`.
+	 */
+	public function get_multipart_counts($filesize, $part_size)
+	{
+		$i = 0;
+		$sizecount = $filesize;
+		$values = array();
+
+		while ($sizecount > 0)
+		{
+			$sizecount -= $part_size;
+			$values[] = array(
+				'seekTo' => ($part_size * $i),
+				'length' => (($sizecount > 0) ? $part_size : ($sizecount + $part_size)),
+			);
+			$i++;
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Initiates a multipart upload and returns an `UploadId`.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>acl</code> - <code>string</code> - Optional - The ACL settings for the specified object. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <code>ACL_PRIVATE</code>.</li>
+	 * 	<li><code>contentType</code> - <code>string</code> - Optional - The type of content that is being sent. The default value is <code>application/octet-stream</code>.</li>
+	 * 	<li><code>encryption</code> - <code>string</code> - Optional - The algorithm to use for encrypting the object. [Allowed values: <code>AES256</code>]</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>meta</code> - <code>array</code> - Optional - An associative array of key-value pairs. Any header starting with <code>x-amz-meta-:</code> is considered user metadata. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
+	 * 	<li><code>storage</code> - <code>string</code> - Optional - Whether to use Standard or Reduced Redundancy storage. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]. The default value is <code>STORAGE_STANDARD</code>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function initiate_multipart_upload($bucket, $filename, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'POST';
+		$opt['resource'] = $filename;
+		$opt['sub_resource'] = 'uploads';
+		$opt['body'] = '';
+
+		// Handle content type. Can also be passed as an HTTP header.
+		if (isset($opt['contentType']))
+		{
+			$opt['headers']['Content-Type'] = $opt['contentType'];
+			unset($opt['contentType']);
+		}
+
+		// Set a default content type.
+		if (!isset($opt['headers']['Content-Type']))
+		{
+			$opt['headers']['Content-Type'] = 'application/octet-stream';
+		}
+
+		// Handle Access Control Lists. Can also be passed as an HTTP header.
+		if (isset($opt['acl']))
+		{
+			$opt['headers']['x-amz-acl'] = $opt['acl'];
+			unset($opt['acl']);
+		}
+
+		// Handle storage settings. Can also be passed as an HTTP header.
+		if (isset($opt['storage']))
+		{
+			$opt['headers']['x-amz-storage-class'] = $opt['storage'];
+			unset($opt['storage']);
+		}
+
+		// Handle encryption settings. Can also be passed as an HTTP header.
+		if (isset($opt['encryption']))
+		{
+			$opt['headers']['x-amz-server-side-encryption'] = $opt['encryption'];
+			unset($opt['encryption']);
+		}
+
+		// Handle meta tags. Can also be passed as an HTTP header.
+		if (isset($opt['meta']))
+		{
+			foreach ($opt['meta'] as $meta_key => $meta_value)
+			{
+				// e.g., `My Meta Header` is converted to `x-amz-meta-my-meta-header`.
+				$opt['headers']['x-amz-meta-' . strtolower(str_replace(' ', '-', $meta_key))] = $meta_value;
+			}
+			unset($opt['meta']);
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Uploads a single part of a multipart upload. The part size cannot be smaller than 5 MB
+	 * or larger than 5 TB. A multipart upload can have no more than 10,000 parts.
+	 *
+	 * Amazon S3 charges for storage as well as requests to the service. Smaller part sizes (and more
+	 * requests) allow for faster failures and better upload reliability. Larger part sizes (and fewer
+	 * requests) costs slightly less but has lower upload reliability.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>fileUpload</code> - <code>string|resource</code> - Required - The URL/path for the file to upload or an open resource.</li>
+	 * 	<li><code>partNumber</code> - <code>integer</code> - Required - The part number order of the multipart upload.</li>
+	 * 	<li><code>expect</code> - <code>string</code> - Optional - Specifies that the SDK not send the request body until it receives an acknowledgement. If the message is rejected based on the headers, the body of the message is not sent. For more information, see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.20">RFC 2616, section 14.20</a>. The value can also be passed to the <code>header</code> option as <code>Expect</code>. [Allowed values: <code>100-continue</code>]</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>length</code> - <code>integer</code> - Optional - The size of the part in bytes. For more information, see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13">RFC 2616, section 14.13</a>. The value can also be passed to the <code>header</code> option as <code>Content-Length</code>.</li>
+	 * 	<li><code>md5</code> - <code>string</code> - Optional - The base64 encoded 128-bit MD5 digest of the part data. This header can be used as a message integrity check to verify that the part data is the same data that was originally sent. Although it is optional, we recommend using this mechanism as an end-to-end integrity check. For more information, see <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC 1864</a>. The value can also be passed to the <code>header</code> option as <code>Content-MD5</code>.</li>
+	 * 	<li><code>seekTo</code> - <code>integer</code> - Optional - The starting position in bytes for the piece of the file/stream to upload.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function upload_part($bucket, $filename, $upload_id, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'PUT';
+		$opt['resource'] = $filename;
+		$opt['uploadId'] = $upload_id;
+
+		if (!isset($opt['fileUpload']) || !isset($opt['partNumber']))
+		{
+			throw new S3_Exception('The `fileUpload` and `partNumber` options are both required in ' . __FUNCTION__ . '().');
+		}
+
+		// Handle expectation. Can also be passed as an HTTP header.
+		if (isset($opt['expect']))
+		{
+			$opt['headers']['Expect'] = $opt['expect'];
+			unset($opt['expect']);
+		}
+
+		// Handle content length. Can also be passed as an HTTP header.
+		if (isset($opt['length']))
+		{
+			$opt['headers']['Content-Length'] = $opt['length'];
+			unset($opt['length']);
+		}
+
+		// Handle content md5. Can also be passed as an HTTP header.
+		if (isset($opt['md5']))
+		{
+			$opt['headers']['Content-MD5'] = $opt['md5'];
+			unset($opt['md5']);
+		}
+
+		$opt['headers']['Expect'] = '100-continue';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Lists the completed parts of an in-progress multipart upload.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>max-parts</code> - <code>integer</code> - Optional - The maximum number of parts to return in the response body.</li>
+	 * 	<li><code>part-number-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur numerically after the value of the <code>part-number-marker</code>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function list_parts($bucket, $filename, $upload_id, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'GET';
+		$opt['resource'] = $filename;
+		$opt['uploadId'] = $upload_id;
+		$opt['query_string'] = array();
+
+		foreach (array('max-parts', 'part-number-marker') as $param)
+		{
+			if (isset($opt[$param]))
+			{
+				$opt['query_string'][$param] = $opt[$param];
+				unset($opt[$param]);
+			}
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Aborts an in-progress multipart upload. This operation cannot be reversed.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function abort_multipart_upload($bucket, $filename, $upload_id, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'DELETE';
+		$opt['resource'] = $filename;
+		$opt['uploadId'] = $upload_id;
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Completes an in-progress multipart upload. A multipart upload is completed by describing the part
+	 * numbers and corresponding ETag values in order, and submitting that data to Amazon S3 as an XML document.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
+	 * @param string|array|SimpleXMLElement|CFResponse $parts (Required) The completion XML document. This document can be provided in multiple ways; as a string of XML, as a <php:SimpleXMLElement> object representing the XML document, as an indexed array of associative arrays where the keys are <code>PartNumber</code> and <code>ETag</code>, or as a <CFResponse> object returned by <list_parts()>.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function complete_multipart_upload($bucket, $filename, $upload_id, $parts, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'POST';
+		$opt['resource'] = $filename;
+		$opt['uploadId'] = $upload_id;
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		// Disable Content-MD5 calculation for this operation
+		$opt['NoContentMD5'] = true;
+
+		if (is_string($parts))
+		{
+			// Assume it's the intended XML.
+			$opt['body'] = $parts;
+		}
+		elseif ($parts instanceof SimpleXMLElement)
+		{
+			// Assume it's a SimpleXMLElement object representing the XML.
+			$opt['body'] = $parts->asXML();
+		}
+		elseif (is_array($parts) || $parts instanceof CFResponse)
+		{
+			$xml = simplexml_load_string($this->complete_mpu_xml);
+
+			if (is_array($parts))
+			{
+				// Generate the appropriate XML.
+				foreach ($parts as $node)
+				{
+					$part = $xml->addChild('Part');
+					$part->addChild('PartNumber', $node['PartNumber']);
+					$part->addChild('ETag', $node['ETag']);
+				}
+
+			}
+			elseif ($parts instanceof CFResponse)
+			{
+				// Assume it's a response from list_parts().
+				foreach ($parts->body->Part as $node)
+				{
+					$part = $xml->addChild('Part');
+					$part->addChild('PartNumber', (string) $node->PartNumber);
+					$part->addChild('ETag', (string) $node->ETag);
+				}
+			}
+
+			$opt['body'] = $xml->asXML();
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Lists the in-progress multipart uploads.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>delimiter</code> - <code>string</code> - Optional - Keys that contain the same string between the prefix and the first occurrence of the delimiter will be rolled up into a single result element in the CommonPrefixes collection.</li>
+	 * 	<li><code>key-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>key-marker</code>. If used in conjunction with <code>upload-id-marker</code>, the results will be filtered to include keys whose upload ID is alphabetically after the value of <code>upload-id-marker</code>.</li>
+	 * 	<li><code>upload-id-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>upload-id-marker</code>. Must be used in conjunction with <code>key-marker</code>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function list_multipart_uploads($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'uploads';
+
+		foreach (array('key-marker', 'max-uploads', 'upload-id-marker') as $param)
+		{
+			if (isset($opt[$param]))
+			{
+				$opt['query_string'][$param] = $opt[$param];
+				unset($opt[$param]);
+			}
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Since Amazon S3's standard <copy_object()> operation only supports copying objects that are smaller than
+	 * 5 GB, the ability to copy large objects (greater than 5 GB) requires the use of "Multipart Copy".
+	 *
+	 * Copying large objects requires the developer to initiate a new multipart "upload", copy pieces of the
+	 * large object (specifying a range of bytes up to 5 GB from the large source file), then complete the
+	 * multipart "upload".
+	 *
+	 * NOTE: <strong>This is a synchronous operation</strong>, not an <em>asynchronous</em> operation, which means
+	 * that Amazon S3 will not return a response for this operation until the copy has completed across the Amazon
+	 * S3 server fleet. Copying objects within a single region will complete more quickly than copying objects
+	 * <em>across</em> regions. The synchronous nature of this operation is different from other services where
+	 * responses are typically returned immediately, even if the operation itself has not yet been completed on
+	 * the server-side.
+	 *
+	 * @param array $source (Required) The bucket and file name to copy from. The following keys must be set: <ul>
+	 * 	<li><code>bucket</code> - <code>string</code> - Required - Specifies the name of the bucket containing the source object.</li>
+	 * 	<li><code>filename</code> - <code>string</code> - Required - Specifies the file name of the source object to copy.</li></ul>
+	 * @param array $dest (Required) The bucket and file name to copy to. The following keys must be set: <ul>
+	 * 	<li><code>bucket</code> - <code>string</code> - Required - Specifies the name of the bucket to copy the object to.</li>
+	 * 	<li><code>filename</code> - <code>string</code> - Required - Specifies the file name to copy the object to.</li></ul>
+	 * @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
+	 * @param integer $part_number (Required) A part number uniquely identifies a part and defines its position within the destination object. When you complete a multipart upload, a complete object is created by concatenating parts in ascending order based on part number. If you copy a new part using the same part number as a previously copied/uploaded part, the previously written part is overwritten.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>ifMatch</code> - <code>string</code> - Optional - The ETag header from a previous request. Copies the object if its entity tag (ETag) matches the specified tag; otherwise, the request returns a <code>412</code> HTTP status code error (precondition failed). Used in conjunction with <code>ifUnmodifiedSince</code>.</li>
+	 * 	<li><code>ifUnmodifiedSince</code> - <code>string</code> - Optional - The LastModified header from a previous request. Copies the object if it hasn't been modified since the specified time; otherwise, the request returns a <code>412</code> HTTP status code error (precondition failed). Used in conjunction with <code>ifMatch</code>.</li>
+	 * 	<li><code>ifNoneMatch</code> - <code>string</code> - Optional - The ETag header from a previous request. Copies the object if its entity tag (ETag) is different than the specified ETag; otherwise, the request returns a <code>412</code> HTTP status code error (failed condition). Used in conjunction with <code>ifModifiedSince</code>.</li>
+	 * 	<li><code>ifModifiedSince</code> - <code>string</code> - Optional - The LastModified header from a previous request. Copies the object if it has been modified since the specified time; otherwise, the request returns a <code>412</code> HTTP status code error (failed condition). Used in conjunction with <code>ifNoneMatch</code>.</li>
+	 * 	<li><code>range</code> - <code>string</code> - Optional - The range of bytes to copy from the object. Specify this parameter when copying partial bits. The specified range must be notated with a hyphen (e.g., 0-10485759). Defaults to the byte range of the complete Amazon S3 object.</li>
+	 * 	<li><code>versionId</code> - <code>string</code> - Optional - The version of the object to copy. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function copy_part($source, $dest, $upload_id, $part_number, $opt = null)
+	{
+		if (!$opt) $opt = array();
+
+		// Add this to our request
+		$opt['verb'] = 'PUT';
+		$opt['resource'] = $dest['filename'];
+		$opt['uploadId'] = $upload_id;
+		$opt['partNumber'] = $part_number;
+
+		// Handle copy source
+		if (isset($source['bucket']) && isset($source['filename']))
+		{
+			$opt['headers']['x-amz-copy-source'] = '/' . $source['bucket'] . '/' . rawurlencode($source['filename'])
+				. (isset($opt['versionId']) ? ('?' . 'versionId=' . rawurlencode($opt['versionId'])) : ''); // Append the versionId to copy, if available
+			unset($opt['versionId']);
+		}
+
+		// Handle conditional-copy parameters
+		if (isset($opt['ifMatch']))
+		{
+			$opt['headers']['x-amz-copy-source-if-match'] = $opt['ifMatch'];
+			unset($opt['ifMatch']);
+		}
+		if (isset($opt['ifNoneMatch']))
+		{
+			$opt['headers']['x-amz-copy-source-if-none-match'] = $opt['ifNoneMatch'];
+			unset($opt['ifNoneMatch']);
+		}
+		if (isset($opt['ifUnmodifiedSince']))
+		{
+			$opt['headers']['x-amz-copy-source-if-unmodified-since'] = $opt['ifUnmodifiedSince'];
+			unset($opt['ifUnmodifiedSince']);
+		}
+		if (isset($opt['ifModifiedSince']))
+		{
+			$opt['headers']['x-amz-copy-source-if-modified-since'] = $opt['ifModifiedSince'];
+			unset($opt['ifModifiedSince']);
+		}
+
+		// Partial content range
+		if (isset($opt['range']))
+		{
+			$opt['headers']['x-amz-copy-source-range'] = 'bytes=' . $opt['range'];
+		}
+
+		// Authenticate to S3
+		return $this->authenticate($dest['bucket'], $opt);
+	}
+
+	/**
+	 * Creates an Amazon S3 object using the multipart upload APIs. It is analogous to <create_object()>.
+	 *
+	 * While each individual part of a multipart upload can hold up to 5 GB of data, this method limits the
+	 * part size to a maximum of 500 MB. The combined size of all parts can not exceed 5 TB of data. When an
+	 * object is stored in Amazon S3, the data is streamed to multiple storage servers in multiple data
+	 * centers. This ensures the data remains available in the event of internal network or hardware failure.
+	 *
+	 * Amazon S3 charges for storage as well as requests to the service. Smaller part sizes (and more
+	 * requests) allow for faster failures and better upload reliability. Larger part sizes (and fewer
+	 * requests) costs slightly less but has lower upload reliability.
+	 *
+	 * In certain cases with large objects, it's possible for this method to attempt to open more file system
+	 * connections than allowed by the OS. In this case, either
+	 * <a href="https://forums.aws.amazon.com/thread.jspa?threadID=70216">increase the number of connections
+	 * allowed</a> or increase the value of the <code>partSize</code> parameter to use a larger part size.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string $filename (Required) The file name for the object.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>fileUpload</code> - <code>string|resource</code> - Required - The URL/path for the file to upload, or an open resource.</li>
+	 * 	<li><code>acl</code> - <code>string</code> - Optional - The ACL settings for the specified object. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <code>ACL_PRIVATE</code>.</li>
+	 * 	<li><code>contentType</code> - <code>string</code> - Optional - The type of content that is being sent in the body. The default value is <code>application/octet-stream</code>.</li>
+	 * 	<li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request. Accepts an associative array of key-value pairs.</li>
+	 * 	<li><code>length</code> - <code>integer</code> - Optional - The size of the object in bytes. For more information, see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13">RFC 2616, section 14.13</a>. The value can also be passed to the <code>header</code> option as <code>Content-Length</code>.</li>
+	 * 	<li><code>limit</code> - <code>integer</code> - Optional - The maximum number of concurrent uploads done by cURL. Gets passed to <code>CFBatchRequest</code>.</li>
+	 * 	<li><code>meta</code> - <code>array</code> - Optional - An associative array of key-value pairs. Any header starting with <code>x-amz-meta-:</code> is considered user metadata. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
+	 * 	<li><code>partSize</code> - <code>integer</code> - Optional - The size of an individual part. The size may not be smaller than 5 MB or larger than 500 MB. The default value is 50 MB.</li>
+	 * 	<li><code>seekTo</code> - <code>integer</code> - Optional - The starting position in bytes for the first piece of the file/stream to upload.</li>
+	 * 	<li><code>storage</code> - <code>string</code> - Optional - Whether to use Standard or Reduced Redundancy storage. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]. The default value is <code>STORAGE_STANDARD</code>.</li>
+	 * 	<li><code>uploadId</code> - <code>string</code> - Optional - An upload ID identifying an existing multipart upload to use. If this option is not set, one will be created automatically.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
+	 */
+	public function create_mpu_object($bucket, $filename, $opt = null)
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		if (!$opt) $opt = array();
+
+		// Handle content length. Can also be passed as an HTTP header.
+		if (isset($opt['length']))
+		{
+			$opt['headers']['Content-Length'] = $opt['length'];
+			unset($opt['length']);
+		}
+
+		if (!isset($opt['fileUpload']))
+		{
+			throw new S3_Exception('The `fileUpload` option is required in ' . __FUNCTION__ . '().');
+		}
+		elseif (is_resource($opt['fileUpload']))
+		{
+			$opt['limit'] = 1; // We can only read from this one resource.
+			$upload_position = isset($opt['seekTo']) ? (integer) $opt['seekTo'] : ftell($opt['fileUpload']);
+			$upload_filesize = isset($opt['headers']['Content-Length']) ? (integer) $opt['headers']['Content-Length'] : null;
+
+			if (!isset($upload_filesize) && $upload_position !== false)
+			{
+				$stats = fstat($opt['fileUpload']);
+
+				if ($stats && $stats['size'] >= 0)
+				{
+					$upload_filesize = $stats['size'] - $upload_position;
+				}
+			}
+		}
+		else
+		{
+			$upload_position = isset($opt['seekTo']) ? (integer) $opt['seekTo'] : 0;
+
+			if (isset($opt['headers']['Content-Length']))
+			{
+				$upload_filesize = (integer) $opt['headers']['Content-Length'];
+			}
+			else
+			{
+				$upload_filesize = filesize($opt['fileUpload']);
+
+				if ($upload_filesize !== false)
+				{
+					$upload_filesize -= $upload_position;
+				}
+			}
+		}
+
+		if ($upload_position === false || !isset($upload_filesize) || $upload_filesize === false || $upload_filesize < 0)
+		{
+			throw new S3_Exception('The size of `fileUpload` cannot be determined in ' . __FUNCTION__ . '().');
+		}
+
+		// Handle part size
+		if (isset($opt['partSize']))
+		{
+			// If less that 5 MB...
+			if ((integer) $opt['partSize'] < 5242880)
+			{
+				$opt['partSize'] = 5242880; // 5 MB
+			}
+			// If more than 500 MB...
+			elseif ((integer) $opt['partSize'] > 524288000)
+			{
+				$opt['partSize'] = 524288000; // 500 MB
+			}
+		}
+		else
+		{
+			$opt['partSize'] = 52428800; // 50 MB
+		}
+
+		// If the upload size is smaller than the piece size, failover to create_object().
+		if ($upload_filesize < $opt['partSize'] && !isset($opt['uploadId']))
+		{
+			return $this->create_object($bucket, $filename, $opt);
+		}
+
+		// Initiate multipart upload
+		if (isset($opt['uploadId']))
+		{
+			$upload_id = $opt['uploadId'];
+		}
+		else
+		{
+			// Compose options for initiate_multipart_upload().
+			$_opt = array();
+			foreach (array('contentType', 'acl', 'storage', 'headers', 'meta') as $param)
+			{
+				if (isset($opt[$param]))
+				{
+					$_opt[$param] = $opt[$param];
+				}
+			}
+
+			$upload = $this->initiate_multipart_upload($bucket, $filename, $_opt);
+			if (!$upload->isOK())
+			{
+				return $upload;
+			}
+
+			// Fetch the UploadId
+			$upload_id = (string) $upload->body->UploadId;
+		}
+
+		// Get the list of pieces
+		$pieces = $this->get_multipart_counts($upload_filesize, (integer) $opt['partSize']);
+
+		// Queue batch requests
+		$batch = new CFBatchRequest(isset($opt['limit']) ? (integer) $opt['limit'] : null);
+		foreach ($pieces as $i => $piece)
+		{
+			$this->batch($batch)->upload_part($bucket, $filename, $upload_id, array(
+				'expect' => '100-continue',
+				'fileUpload' => $opt['fileUpload'],
+				'partNumber' => ($i + 1),
+				'seekTo' => $upload_position + (integer) $piece['seekTo'],
+				'length' => (integer) $piece['length'],
+			));
+		}
+
+		// Send batch requests
+		$batch_responses = $this->batch($batch)->send();
+		if (!$batch_responses->areOK())
+		{
+			return $batch_responses;
+		}
+
+		// Compose completion XML
+		$parts = array();
+		foreach ($batch_responses as $i => $response)
+		{
+			$parts[] = array('PartNumber' => ($i + 1), 'ETag' => $response->header['etag']);
+		}
+
+		return $this->complete_multipart_upload($bucket, $filename, $upload_id, $parts);
+	}
+
+	/**
+	 * Aborts all multipart uploads initiated before the specified date. This operation cannot be reversed.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param string|integer $when (Optional) The time and date to use for comparison. Accepts any value that <php:strtotime()> understands.
+	 * @return CFArray A <CFArray> containing a series of 0 or more <CFResponse> objects, containing a parsed HTTP response.
+	 */
+	public function abort_multipart_uploads_by_date($bucket, $when = null)
+	{
+		if ($this->use_batch_flow)
+		{
+			// @codeCoverageIgnoreStart
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$when = $when ? $when : time();
+		$handles = array();
+		$data = $this->list_multipart_uploads($bucket)->body;
+		$when = is_int($when) ? $when : strtotime($when);
+
+		if (!($data instanceof CFSimpleXML))
+		{
+			return false;
+		}
+
+		$list = $data->query('descendant-or-self::Upload/Initiated');
+
+		if (count($list) > 0)
+		{
+			foreach ($list as $node)
+			{
+				if (strtotime((string) $node) < $when)
+				{
+					$q = new CFBatchRequest();
+					$parent = $node->parent();
+
+					$upload_id = $parent
+						->query('descendant-or-self::UploadId')
+						->first()
+						->to_string();
+
+					$filename = $parent
+						->query('descendant-or-self::Key')
+						->first()
+						->to_string();
+
+					$handles[] = $this->abort_multipart_upload($bucket, $filename, $upload_id, array(
+						'returnCurlHandle' => true
+					));
+				}
+			}
+
+			$http = new CFRequest();
+			$responses = $http->send_multi_request($handles);
+
+			if (is_array($responses) && count($responses) > 0)
+			{
+				return new CFArray($responses);
+			}
+		}
+
+		return new CFArray();
+	}
+
+
+	/*%******************************************************************************************%*/
+	// WEBSITE CONFIGURATION
+
+	/**
+	 * Enables and configures an Amazon S3 website using the corresponding bucket as the content source.
+	 * The website will have one default domain name associated with it, which is the bucket name. If you
+	 * attempt to configure an Amazon S3 website for a bucket whose name is not compatible with DNS,
+	 * Amazon S3 returns an <code>InvalidBucketName</code> error. For more information on bucket names and DNS,
+	 * refer to <a href="http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html">Bucket Restrictions and Limitations.</a>
+	 *
+	 * To visit the bucket as a website a new endpoint is created in the following pattern:
+	 * <code>http://&lt;bucketName&gt;.s3-website-&lt;region&gt;.amazonaws.com</code>. This is a sample URL
+	 * for a bucket called <code>example-bucket</code> in the <code>us-east-1</code> region.
+	 * (e.g., <code>http://example-bucket.s3-website-us-east-1.amazonaws.com</code>)
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>indexDocument</code> - <code>string</code> - Optional - The file path to use as the root document. The default value is <code>index.html</code>.</li>
+	 * 	<li><code>errorDocument</code> - <code>string</code> - Optional - The file path to use as the error document. The default value is <code>error.html</code>.</li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function create_website_config($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'website';
+
+		$xml = simplexml_load_string($this->website_config_xml);
+		if (isset($opt['indexDocument']))
+		{
+			$xml->IndexDocument->Suffix = $opt['indexDocument'];
+		}
+		if (isset($opt['errorDocument']))
+		{
+			$xml->ErrorDocument->Key = $opt['errorDocument'];
+		}
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Retrieves the website configuration for a bucket. The contents of this response are identical to the
+	 * content submitted by the user during the website creation operation. If a website configuration has
+	 * never been set, Amazon S3 will return a 404 error.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function get_website_config($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'website';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	/**
+	 * Removes the website configuration for a bucket.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function delete_website_config($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'DELETE';
+		$opt['sub_resource'] = 'website';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// OBJECT EXPIRATION
+
+	/**
+	 * Enables the ability to specify an expiry period for objects when an object should be deleted,
+	 * measured as number of days from creation time. Amazon S3 guarantees that the object will be
+	 * deleted when the expiration time is passed.
+	 *
+	 * @param string $bucket (Required) The name of the bucket to use.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>rules</code> - <code>string</code> - Required - The object expiration rule-sets to apply to the bucket. <ul>
+	 * 		<li><code>x</code> - <code>array</code> - Required - This represents a simple array index. <ul>
+	 * 			<li><code>id</code> - <code>string</code> - Optional - Unique identifier for the rule. The value cannot be longer than 255 characters.
+	 * 			<li><code>prefix</code> - <code>string</code> - Required - The Amazon S3 object prefix which targets the file(s) for expiration.</li>
+	 * 			<li><code>expiration</code> - <code>array</code> - Required - The container for the unit of measurement by which the expiration time is calculated. <ul>
+	 * 				<li><code>days</code> - <code>integer</code> - Required - The number of days until the targetted objects expire from the bucket.</li>
+	 * 			</ul></li>
+	 * 			<li><code>enabled</code> - <code>boolean</code> - Optional - Whether or not to enable this rule-set. A value of <code>true</code> enables the rule-set. A value of <code>false</code> disables the rule-set. The default value is <code>true</code>.</li>
+	 * 		</ul></li>
+	 * 	</ul></li>
+	 * 	<li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
+	 * 	<li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
+	 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
+	 */
+	public function create_object_expiration_config($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'PUT';
+		$opt['sub_resource'] = 'lifecycle';
+		$opt['headers'] = array(
+			'Content-Type' => 'application/xml'
+		);
+
+		$xml = simplexml_load_string($this->object_expiration_xml, $this->parser_class);
+
+		if (isset($opt['rules']) && is_array($opt['rules']) && count($opt['rules']))
+		{
+			foreach ($opt['rules'] as $rule)
+			{
+				$xrule = $xml->addChild('Rule');
+
+				// ID
+				if (isset($rule['id']))
+				{
+					if (strlen($rule['id']) > 255)
+					{
+						throw new S3_Exception('The "id" for a rule must not be more than 255 characters in the ' . __FUNCTION__ . ' method.');
+					}
+
+					$xrule->addChild('ID', $rule['id']);
+				}
+
+				// Prefix
+				if (isset($rule['prefix']))
+				{
+					$xrule->addChild('Prefix', $rule['prefix']);
+				}
+				else
+				{
+					throw new S3_Exception('Each rule requires a "prefix" in the ' . __FUNCTION__ . ' method.');
+				}
+
+				// Status
+				$enabled = 'Enabled';
+				if (isset($rule['enabled']))
+				{
+					if (is_bool($rule['enabled'])) // Boolean
+					{
+						$enabled = $rule['enabled'] ? 'Enabled' : 'Disabled';
+					}
+					elseif (is_string($rule['enabled'])) // String
+					{
+						$enabled = (strtolower($rule['enabled']) === 'true') ? 'Enabled' : 'Disabled';
+					}
+
+					$xrule->addChild('Status', $enabled);
+				}
+				else
+				{
+					$xrule->addChild('Status', 'Enabled');
+				}
+
+				// Expiration
+				if (isset($rule['expiration']))
+				{
+					$xexpiration = $xrule->addChild('Expiration');
+
+					if (isset($rule['expiration']['days']))
+					{
+						$xexpiration->addChild('Days', $rule['expiration']['days']);
+					}
+				}
+				else
+				{
+					throw new S3_Exception('Each rule requires a "expiration" in the ' . __FUNCTION__ . ' method.');
+				}
+			}
+		}
+
+		$opt['body'] = $xml->asXML();
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	public function get_object_expiration_config($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'GET';
+		$opt['sub_resource'] = 'lifecycle';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+	public function delete_object_expiration_config($bucket, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$opt['verb'] = 'DELETE';
+		$opt['sub_resource'] = 'lifecycle';
+
+		// Authenticate to S3
+		return $this->authenticate($bucket, $opt);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// MISCELLANEOUS
+
+	/**
+	 * Gets the canonical user ID and display name from the Amazon S3 server.
+	 *
+	 * @return array An associative array containing the `id` and `display_name` values.
+	 */
+	public function get_canonical_user_id()
+	{
+		if ($this->use_batch_flow)
+		{
+			throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
+		}
+
+		$id = $this->list_buckets();
+
+		return array(
+			'id' => (string) $id->body->Owner->ID,
+			'display_name' => (string) $id->body->Owner->DisplayName
+		);
+	}
+
+	/**
+	 * Loads and registers the S3StreamWrapper class as a stream wrapper.
+	 *
+	 * @param string $protocol (Optional) The name of the protocol to register.
+	 * @return boolean Whether or not the registration succeeded.
+	 */
+	public function register_stream_wrapper($protocol = 's3')
+	{
+		require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'extensions'
+			. DIRECTORY_SEPARATOR . 's3streamwrapper.class.php';
+
+		return S3StreamWrapper::register($this, $protocol);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/array.class.php b/3rdparty/aws-sdk/utilities/array.class.php
new file mode 100644
index 0000000000..dea673546f
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/array.class.php
@@ -0,0 +1,312 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * The <CFArray> object extends PHP's built-in <php:ArrayObject> object by providing convenience methods for
+ * rapidly manipulating array data. Specifically, the `CFArray` object is intended for working with
+ * <CFResponse> and <CFSimpleXML> objects that are returned by AWS services.
+ *
+ * @version 2012.01.17
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link http://php.net/ArrayObject ArrayObject
+ */
+class CFArray extends ArrayObject
+{
+	/**
+	 * Constructs a new instance of <CFArray>.
+	 *
+	 * @param mixed $input (Optional) The input parameter accepts an array or an Object. The default value is an empty array.
+	 * @param integer $flags (Optional) Flags to control the behavior of the ArrayObject object. Defaults to <STD_PROP_LIST>.
+	 * @param string $iterator_class (Optional) Specify the class that will be used for iteration of the <php:ArrayObject> object. <php:ArrayIterator> is the default class used.
+	 * @return mixed Either an array of matches, or a single <CFSimpleXML> element.
+	 */
+	public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iterator_class = 'ArrayIterator')
+	{
+		// Provide a default value
+		$input = $input ? $input : array();
+
+		try {
+			return parent::__construct($input, $flags, $iterator_class);
+		}
+		catch (InvalidArgumentException $e)
+		{
+			throw new CFArray_Exception($e->getMessage());
+		}
+	}
+
+	/**
+	 * Alternate approach to constructing a new instance. Supports chaining.
+	 *
+	 * @param mixed $input (Optional) The input parameter accepts an array or an Object. The default value is an empty array.
+	 * @param integer $flags (Optional) Flags to control the behavior of the ArrayObject object. Defaults to <STD_PROP_LIST>.
+	 * @param string $iterator_class (Optional) Specify the class that will be used for iteration of the <php:ArrayObject> object. <php:ArrayIterator> is the default class used.
+	 * @return mixed Either an array of matches, or a single <CFSimpleXML> element.
+	 */
+	public static function init($input = array(), $flags = self::STD_PROP_LIST, $iterator_class = 'ArrayIterator')
+	{
+		if (version_compare(PHP_VERSION, '5.3.0', '<'))
+		{
+			throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
+		}
+
+		$self = get_called_class();
+		return new $self($input, $flags, $iterator_class);
+	}
+
+	/**
+	 * Handles how the object is rendered when cast as a string.
+	 *
+	 * @return string The word "Array".
+	 */
+	public function __toString()
+	{
+		return 'Array';
+	}
+
+
+	/*%******************************************************************************************%*/
+	// REFORMATTING
+
+	/**
+	 * Maps each element in the <CFArray> object as an integer.
+	 *
+	 * @return array The contents of the <CFArray> object mapped as integers.
+	 */
+	public function map_integer()
+	{
+		return array_map('intval', $this->getArrayCopy());
+	}
+
+	/**
+	 * Maps each element in the CFArray object as a string.
+	 *
+	 * @param string $pcre (Optional) A Perl-Compatible Regular Expression (PCRE) to filter the names against.
+	 * @return array The contents of the <CFArray> object mapped as strings. If there are no results, the method will return an empty array.
+	 */
+	public function map_string($pcre = null)
+	{
+		$list = array_map('strval', $this->getArrayCopy());
+		$dlist = array();
+
+		if ($pcre)
+		{
+			foreach ($list as $item)
+			{
+				$dlist[] = preg_match($pcre, $item) ? $item : null;
+			}
+
+			$list = array_values(array_filter($dlist));
+		}
+
+		return $list;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// CONFIRMATION
+
+	/**
+	 * Verifies that _all_ responses were successful. A single failed request will cause <areOK()> to return false. Equivalent to <CFResponse::isOK()>, except it applies to all responses.
+	 *
+	 * @return boolean Whether _all_ requests were successful or not.
+	 */
+	public function areOK()
+	{
+		$dlist = array();
+		$list = $this->getArrayCopy();
+
+		foreach ($list as $response)
+		{
+			if ($response instanceof CFResponse)
+			{
+				$dlist[] = $response->isOK();
+			}
+		}
+
+		return (array_search(false, $dlist, true) !== false) ? false : true;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// ITERATING AND EXECUTING
+
+	/**
+	 * Iterates over a <CFArray> object, and executes a function for each matched element.
+	 *
+	 * The callback function takes three parameters: <ul>
+	 * 	<li><code>$item</code> - <code>mixed</code> - Optional - The individual node in the array.</li>
+	 * 	<li><code>$key</code> - <code>mixed</code> - Optional - The key for the array node.</li>
+	 * 	<li><code>$bind</code> - <code>mixed</code> - Optional - The variable that was passed into the $bind parameter.</li></ul>
+	 *
+	 * @param string|function $callback (Required) The callback function to execute. PHP 5.3 or newer can use an anonymous function.
+	 * @param mixed $bind (Optional) A variable from the calling scope to pass-by-reference into the local scope of the callback function.
+	 * @return CFArray The original <CFArray> object.
+	 */
+	public function each($callback, &$bind = null)
+	{
+		$items = $this->getArrayCopy();
+
+		foreach ($items as $key => &$item)
+		{
+			$callback($item, $key, $bind);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Passes each element in the current <CFArray> object through a function, and produces a new <CFArray> object containing the return values.
+	 *
+	 * The callback function takes three parameters: <ul>
+	 * 	<li><code>$item</code> - <code>mixed</code> - Optional - The individual node in the array.</li>
+	 * 	<li><code>$key</code> - <code>mixed</code> - Optional - The key for the array node.</li>
+	 * 	<li><code>$bind</code> - <code>mixed</code> - Optional - The variable that was passed into the $bind parameter.</li></ul>
+	 *
+	 * @param string|function $callback (Required) The callback function to execute. PHP 5.3 or newer can use an anonymous function.
+	 * @param mixed $bind (Optional) A variable from the calling scope to pass-by-reference into the local scope of the callback function.
+	 * @return CFArray A new <CFArray> object containing the return values.
+	 */
+	public function map($callback, &$bind = null)
+	{
+		$items = $this->getArrayCopy();
+		$collect = array();
+
+		foreach ($items as $key => &$item)
+		{
+			$collect[] = $callback($item, $key, $bind);
+		}
+
+		return new CFArray($collect);
+	}
+
+	/**
+	 * Filters the list of nodes by passing each value in the current <CFArray> object through a function. The node will be removed if the function returns `false`.
+	 *
+	 * The callback function takes three parameters: <ul>
+	 * 	<li><code>$item</code> - <code>mixed</code> - Optional - The individual node in the array.</li>
+	 * 	<li><code>$key</code> - <code>mixed</code> - Optional - The key for the array node.</li>
+	 * 	<li><code>$bind</code> - <code>mixed</code> - Optional - The variable that was passed into the $bind parameter.</li></ul>
+	 *
+	 * @param string|function $callback (Required) The callback function to execute. PHP 5.3 or newer can use an anonymous function.
+	 * @param mixed $bind (Optional) A variable from the calling scope to pass-by-reference into the local scope of the callback function.
+	 * @return CFArray A new <CFArray> object containing the return values.
+	 */
+	public function filter($callback, &$bind = null)
+	{
+		$items = $this->getArrayCopy();
+		$collect = array();
+
+		foreach ($items as $key => &$item)
+		{
+			if ($callback($item, $key, $bind) !== false)
+			{
+				$collect[] = $item;
+			}
+		}
+
+		return new CFArray($collect);
+	}
+
+	/**
+	 * Alias for <filter()>. This functionality was incorrectly named _reduce_ in earlier versions of the SDK.
+	 *
+	 * @param string|function $callback (Required) The callback function to execute. PHP 5.3 or newer can use an anonymous function.
+	 * @param mixed $bind (Optional) A variable from the calling scope to pass-by-reference into the local scope of the callback function.
+	 * @return CFArray A new <CFArray> object containing the return values.
+	 */
+	public function reduce($callback, &$bind = null)
+	{
+		return $this->filter($callback, $bind);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// TRAVERSAL
+
+	/**
+	 * Gets the first result in the array.
+	 *
+	 * @return mixed The first result in the <CFArray> object. Returns `false` if there are no items in the array.
+	 */
+	public function first()
+	{
+		$items = $this->getArrayCopy();
+		return count($items) ? $items[0] : false;
+	}
+
+	/**
+	 * Gets the last result in the array.
+	 *
+	 * @return mixed The last result in the <CFArray> object. Returns `false` if there are no items in the array.
+	 */
+	public function last()
+	{
+		$items = $this->getArrayCopy();
+		return count($items) ? end($items) : false;
+	}
+
+	/**
+	 * Removes all `null` values from an array.
+	 *
+	 * @return CFArray A new <CFArray> object containing the non-null values.
+	 */
+	public function compress()
+	{
+		return new CFArray(array_filter($this->getArrayCopy()));
+	}
+
+	/**
+	 * Reindexes the array, starting from zero.
+	 *
+	 * @return CFArray A new <CFArray> object with indexes starting at zero.
+	 */
+	public function reindex()
+	{
+		return new CFArray(array_values($this->getArrayCopy()));
+	}
+
+
+	/*%******************************************************************************************%*/
+	// ALTERNATE FORMATS
+
+	/**
+	 * Gets the current XML node as a JSON string.
+	 *
+	 * @return string The current XML node as a JSON string.
+	 */
+	public function to_json()
+	{
+		return json_encode($this->getArrayCopy());
+	}
+
+	/**
+	 * Gets the current XML node as a YAML string.
+	 *
+	 * @return string The current XML node as a YAML string.
+	 */
+	public function to_yaml()
+	{
+		return sfYaml::dump($this->getArrayCopy(), 5);
+	}
+}
+
+class CFArray_Exception extends Exception {}
diff --git a/3rdparty/aws-sdk/utilities/batchrequest.class.php b/3rdparty/aws-sdk/utilities/batchrequest.class.php
new file mode 100644
index 0000000000..978283471a
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/batchrequest.class.php
@@ -0,0 +1,126 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+/**
+ * Default CFBatchRequest Exception.
+ */
+class CFBatchRequest_Exception extends Exception {}
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Simplifies the flow involved with managing and executing a batch request queue. Batch requesting is the
+ * ability to queue up a series of requests and execute them all in parallel. This allows for faster
+ * application performance when a lot of requests are involved.
+ *
+ * @version 2011.12.02
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFBatchRequest extends CFRuntime
+{
+	/**
+	 * Stores the cURL handles that are to be processed.
+	 */
+	public $queue;
+
+	/**
+	 * Stores the size of the request window.
+	 */
+	public $limit;
+
+	/**
+	 * The proxy to use for connecting.
+	 */
+	public $proxy = null;
+
+	/**
+	 * The helpers to use when connecting.
+	 */
+	public $helpers = null;
+
+	/**
+	 * The active credential set.
+	 */
+	public $credentials;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param integer $limit (Optional) The size of the request window. Defaults to unlimited.
+	 * @return boolean `false` if no valid values are set, otherwise `true`.
+	 */
+	public function __construct($limit = null)
+	{
+		$this->queue = array();
+		$this->limit = $limit ? $limit : -1;
+		$this->credentials = new CFCredential(array());
+		return $this;
+	}
+
+	/**
+	 * Sets the AWS credentials to use for the batch request.
+	 *
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return $this A reference to the current instance.
+	 */
+	public function use_credentials(CFCredential $credentials)
+	{
+		$this->credentials = $credentials;
+		return $this;
+	}
+
+	/**
+	 * Adds a new cURL handle to the request queue.
+	 *
+	 * @param resource $handle (Required) A cURL resource to add to the queue.
+	 * @return $this A reference to the current instance.
+	 */
+	public function add($handle)
+	{
+		$this->queue[] = $handle;
+		return $this;
+	}
+
+	/**
+	 * Executes the batch request queue.
+	 *
+	 * @param array $opt (DO NOT USE) Enabled for compatibility with the method this overrides, although any values passed will be ignored.
+	 * @return array An indexed array of <CFResponse> objects.
+	 */
+	public function send($opt = null)
+	{
+		$http = new $this->request_class(null, $this->proxy, null, $this->credentials);
+
+		// Make the request
+		$response = $http->send_multi_request($this->queue, array(
+			'limit' => $this->limit
+		));
+
+		return $response;
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/complextype.class.php b/3rdparty/aws-sdk/utilities/complextype.class.php
new file mode 100644
index 0000000000..e0509b9e36
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/complextype.class.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains utility methods used for converting array, JSON, and YAML data types into query string keys.
+ *
+ * @version 2010.11.11
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFComplexType
+{
+	/**
+	 * Takes a JSON object, as a string, to convert to query string keys.
+	 *
+	 * @param string $json (Required) A JSON object. The JSON string should use canonical rules (e.g., double quotes, quoted keys) as is required by PHP's <php:json_encode()> function.
+	 * @param string $member (Optional) The name of the "member" property that AWS uses for lists in certain services. Defaults to an empty string.
+	 * @param string $default_key (Optional) The default key to use when the value for `$data` is a string. Defaults to an empty string.
+	 * @return array The option group parameters to merge into another method's `$opt` parameter.
+	 */
+	public static function json($json, $member = '', $default_key = '')
+	{
+		return self::option_group(json_decode($json, true), $member, $default_key);
+	}
+
+	/**
+	 * Takes a YAML object, as a string, to convert to query string keys.
+	 *
+	 * @param string $yaml (Required) A YAML object.
+	 * @param string $member (Optional) The name of the "member" property that AWS uses for lists in certain services. Defaults to an empty string.
+	 * @param string $default_key (Optional) The default key to use when the value for `$data` is a string. Defaults to an empty string.
+	 * @return array The option group parameters to merge into another method's `$opt` parameter.
+	 */
+	public static function yaml($yaml, $member = '', $default_key = '')
+	{
+		return self::option_group(sfYaml::load($yaml), $member, $default_key);
+	}
+
+	/**
+	 * Takes an associative array to convert to query string keys.
+	 *
+	 * @param array $map (Required) An associative array.
+	 * @param string $member (Optional) The name of the "member" property that AWS uses for lists in certain services. Defaults to an empty string.
+	 * @param string $default_key (Optional) The default key to use when the value for `$data` is a string. Defaults to an empty string.
+	 * @return array The option group parameters to merge into another method's `$opt` parameter.
+	 */
+	public static function map($map, $member = '', $default_key = '')
+	{
+		return self::option_group($map, $member, $default_key);
+	}
+
+	/**
+	 * A protected method that is used by <json()>, <yaml()> and <map()>.
+	 *
+	 * @param string|array $data (Required) The data to iterate over.
+	 * @param string $member (Optional) The name of the "member" property that AWS uses for lists in certain services. Defaults to an empty string.
+	 * @param string $key (Optional) The default key to use when the value for `$data` is a string. Defaults to an empty string.
+	 * @param array $out (Optional) INTERNAL ONLY. The array that contains the calculated values up to this point.
+	 * @return array The option group parameters to merge into another method's `$opt` parameter.
+	 */
+	public static function option_group($data, $member = '', $key = '', &$out = array())
+	{
+		$reset = $key;
+
+		if (is_array($data))
+		{
+			foreach ($data as $k => $v)
+			{
+				// Avoid 0-based indexes.
+				if (is_int($k))
+				{
+					$k = $k + 1;
+
+					if ($member !== '')
+					{
+						$key .= '.' . $member;
+					}
+				}
+
+				$key .= ($key === '' ? $k : '.' . $k);
+
+				if (is_array($v))
+				{
+					self::option_group($v, $member, $key, $out);
+				}
+				elseif ($v instanceof CFStepConfig)
+				{
+					self::option_group($v->get_config(), $member, $key, $out);
+				}
+				else
+				{
+					$out[$key] = $v;
+				}
+
+				$key = $reset;
+			}
+		}
+		else
+		{
+			$out[$key] = $data;
+		}
+
+		return $out;
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/credential.class.php b/3rdparty/aws-sdk/utilities/credential.class.php
new file mode 100644
index 0000000000..05c0ffcf6d
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/credential.class.php
@@ -0,0 +1,157 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * The <CFCredential> class represents an individual credential set.
+ *
+ * @version 2011.11.15
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFCredential implements ArrayAccess
+{
+	/**
+	 * Stores the internal <php:ArrayObject> representation of the collection.
+	 */
+	private $collection;
+
+	/**
+	* Default getter. Enables syntax such as $object->method->chained_method();. Also supports
+	* $object->key. Matching methods are prioritized over matching keys.
+	*
+	* @param string $name (Required) The name of the method to execute or key to retrieve.
+	* @return mixed The results of calling the function <code>$name()</code>, or the value of the key <code>$object[$name]</code>.
+	*/
+	public function __get($name)
+	{
+		return $this[$name];
+	}
+
+	/**
+	* Default setter.
+	*
+	* @param string $name (Required) The name of the method to execute.
+	* @param string $value (Required) The value to pass to the method.
+	* @return mixed The results of calling the function, <code>$name</code>.
+	*/
+	public function __set($name, $value)
+	{
+		$this[$name] = $value;
+		return $this;
+	}
+
+	/**
+	 * Create a clone of the object.
+	 *
+	 * @return CFCredential A clone of the current instance.
+	 */
+	public function __clone()
+	{
+		$this->collection = clone $this->collection;
+	}
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of the <CFCredential> class.
+	 */
+	public function __construct($value = array())
+	{
+		$this->collection = new ArrayObject($value, ArrayObject::ARRAY_AS_PROPS);
+	}
+
+	/**
+	 * Check whether or not a specific offset exists.
+	 *
+	 * @param integer $offset (Required) The location in the collection to verify the existence of.
+	 * @return boolean A value of <code>true</code> indicates that the collection offset exists. A value of <code>false</code> indicates that it does not.
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->collection->offsetExists($offset);
+	}
+
+	/**
+	 * Get the value for a specific offset.
+	 *
+	 * @param integer $offset (Required) The location in the collection to retrieve the value for.
+	 * @return mixed The value of the collection offset. <code>NULL</code> is returned if the offset does not exist.
+	 */
+	public function offsetGet($offset)
+	{
+		if ($this->collection->offsetExists($offset))
+		{
+			return $this->collection->offsetGet($offset);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Set the value for a specific offset.
+	 *
+	 * @param integer $offset (Required) The location in the collection to set a new value for.
+	 * @param mixed $value (Required) The new value for the collection location.
+	 * @return CFCredential A reference to the current collection.
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->collection->offsetSet($offset, $value);
+		return $this;
+	}
+
+	/**
+	 * Unset the value for a specific offset.
+	 *
+	 * @param integer $offset (Required) The location in the collection to unset.
+	 * @return CFCredential A reference to the current collection.
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->collection->offsetUnset($offset);
+		return $this;
+	}
+
+	/**
+	 * Merge another instance of <CFCredential> onto this one.
+	 *
+	 * @param CFCredential $credential (Required) Another instance of <CFCredential>.
+	 * @return CFCredential A reference to the current collection.
+	 */
+	public function merge(CFCredential $credential)
+	{
+		$merged = array_merge($this->to_array(), $credential->to_array());
+		$this->collection->exchangeArray($merged);
+		return $this;
+	}
+
+	/**
+	 * Retrieves the data as a standard array.
+	 *
+	 * @return array The data as an array.
+	 */
+	public function to_array()
+	{
+		return $this->collection->getArrayCopy();
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/credentials.class.php b/3rdparty/aws-sdk/utilities/credentials.class.php
new file mode 100644
index 0000000000..2504a081b2
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/credentials.class.php
@@ -0,0 +1,125 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * The <CFCredentials> class enables developers to easily switch between multiple sets of credentials.
+ *
+ * @version 2011.11.15
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFCredentials
+{
+	/**
+	 * The key used to specify the default credential set
+	 */
+	const DEFAULT_KEY = '@default';
+
+	/**
+	 * The key used to identify inherited credentials
+	 */
+	const INHERIT_KEY = '@inherit';
+
+	/**
+	 * Stores the credentials
+	 */
+	protected static $credentials = array();
+
+	/**
+	 * Prevents this class from being constructed
+	 */
+	final private function __construct() {}
+
+	/**
+	 * Stores the credentials for re-use.
+	 *
+	 * @param array $credential_sets (Required) The named credential sets that should be made available to the application.
+	 * @return void
+	 */
+	public static function set(array $credential_sets)
+	{
+		// Make sure a default credential set is specified or can be inferred
+		if (count($credential_sets) === 1)
+		{
+			$credential_sets[self::DEFAULT_KEY] = reset($credential_sets);
+		}
+		elseif (!isset($credential_sets[self::DEFAULT_KEY]))
+		{
+			throw new CFCredentials_Exception('If more than one credential set is provided, a default credential set (identified by the key "' . self::DEFAULT_KEY . '") must be specified.');
+		}
+
+		// Resolve any @inherit tags
+		foreach ($credential_sets as $credential_name => &$credential_set)
+		{
+			if (is_array($credential_set))
+			{
+				foreach ($credential_set as $credential_key => &$credential_value)
+				{
+					if ($credential_key === self::INHERIT_KEY)
+					{
+						if (!isset($credential_sets[$credential_value]))
+						{
+							throw new CFCredentials_Exception('The credential set, "' . $credential_value . '", does not exist and cannot be inherited.');
+						}
+
+						$credential_set = array_merge($credential_sets[$credential_value], $credential_set);
+						unset($credential_set[self::INHERIT_KEY]);
+					}
+				}
+			}
+		}
+
+		// Normalize the value of the @default credential set
+		$default = $credential_sets[self::DEFAULT_KEY];
+		if (is_string($default))
+		{
+			if (!isset($credential_sets[$default]))
+			{
+				throw new CFCredentials_Exception('The credential set, "' . $default . '", does not exist and cannot be used as the default credential set.');
+			}
+
+			$credential_sets[self::DEFAULT_KEY] = $credential_sets[$default];
+		}
+
+		// Store the credentials
+		self::$credentials = $credential_sets;
+	}
+
+	/**
+	 * Retrieves the requested credentials from the internal credential store.
+	 *
+	 * @param string $credential_set (Optional) The name of the credential set to retrieve. The default value is set in DEFAULT_KEY.
+	 * @return stdClass A stdClass object where the properties represent the keys that were provided.
+	 */
+	public static function get($credential_name = self::DEFAULT_KEY)
+	{
+		// Make sure the credential set exists
+		if (!isset(self::$credentials[$credential_name]))
+		{
+			throw new CFCredentials_Exception('The credential set, "' . $credential_name . '", does not exist and cannot be retrieved.');
+		}
+
+		// Return the credential set as an object
+		return new CFCredential(self::$credentials[$credential_name]);
+	}
+}
+
+class CFCredentials_Exception extends Exception {}
diff --git a/3rdparty/aws-sdk/utilities/gzipdecode.class.php b/3rdparty/aws-sdk/utilities/gzipdecode.class.php
new file mode 100644
index 0000000000..f80822a704
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/gzipdecode.class.php
@@ -0,0 +1,377 @@
+<?php
+/*
+ * Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2010, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3-dev
+ * @copyright 2004-2010 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @todo phpDoc comments
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Handles a variety of primary and edge cases around gzip/deflate decoding in PHP.
+ *
+ * @version 2011.02.21
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link https://github.com/simplepie/simplepie/blob/master/SimplePie/gzdecode.php SimplePie_gzdecode
+ */
+class CFGzipDecode
+{
+	/**
+	 * Compressed data
+	 *
+	 * @access private
+	 * @see gzdecode::$data
+	 */
+	public $compressed_data;
+
+	/**
+	 * Size of compressed data
+	 *
+	 * @access private
+	 */
+	public $compressed_size;
+
+	/**
+	 * Minimum size of a valid gzip string
+	 *
+	 * @access private
+	 */
+	public $min_compressed_size = 18;
+
+	/**
+	 * Current position of pointer
+	 *
+	 * @access private
+	 */
+	public $position = 0;
+
+	/**
+	 * Flags (FLG)
+	 *
+	 * @access private
+	 */
+	public $flags;
+
+	/**
+	 * Uncompressed data
+	 *
+	 * @access public
+	 * @see gzdecode::$compressed_data
+	 */
+	public $data;
+
+	/**
+	 * Modified time
+	 *
+	 * @access public
+	 */
+	public $MTIME;
+
+	/**
+	 * Extra Flags
+	 *
+	 * @access public
+	 */
+	public $XFL;
+
+	/**
+	 * Operating System
+	 *
+	 * @access public
+	 */
+	public $OS;
+
+	/**
+	 * Subfield ID 1
+	 *
+	 * @access public
+	 * @see gzdecode::$extra_field
+	 * @see gzdecode::$SI2
+	 */
+	public $SI1;
+
+	/**
+	 * Subfield ID 2
+	 *
+	 * @access public
+	 * @see gzdecode::$extra_field
+	 * @see gzdecode::$SI1
+	 */
+	public $SI2;
+
+	/**
+	 * Extra field content
+	 *
+	 * @access public
+	 * @see gzdecode::$SI1
+	 * @see gzdecode::$SI2
+	 */
+	public $extra_field;
+
+	/**
+	 * Original filename
+	 *
+	 * @access public
+	 */
+	public $filename;
+
+	/**
+	 * Human readable comment
+	 *
+	 * @access public
+	 */
+	public $comment;
+
+	/**
+	 * Don't allow anything to be set
+	 *
+	 * @access public
+	 */
+	public function __set($name, $value)
+	{
+		trigger_error("Cannot write property $name", E_USER_ERROR);
+	}
+
+	/**
+	 * Set the compressed string and related properties
+	 *
+	 * @access public
+	 */
+	public function __construct($data)
+	{
+		$this->compressed_data = $data;
+		$this->compressed_size = strlen($data);
+	}
+
+	/**
+	 * Decode the GZIP stream
+	 *
+	 * @access public
+	 */
+	public function parse()
+	{
+		if ($this->compressed_size >= $this->min_compressed_size)
+		{
+			// Check ID1, ID2, and CM
+			if (substr($this->compressed_data, 0, 3) !== "\x1F\x8B\x08")
+			{
+				return false;
+			}
+
+			// Get the FLG (FLaGs)
+			$this->flags = ord($this->compressed_data[3]);
+
+			// FLG bits above (1 << 4) are reserved
+			if ($this->flags > 0x1F)
+			{
+				return false;
+			}
+
+			// Advance the pointer after the above
+			$this->position += 4;
+
+			// MTIME
+			$mtime = substr($this->compressed_data, $this->position, 4);
+			// Reverse the string if we're on a big-endian arch because l is the only signed long and is machine endianness
+			if (current(unpack('S', "\x00\x01")) === 1)
+			{
+				$mtime = strrev($mtime);
+			}
+			$this->MTIME = current(unpack('l', $mtime));
+			$this->position += 4;
+
+			// Get the XFL (eXtra FLags)
+			$this->XFL = ord($this->compressed_data[$this->position++]);
+
+			// Get the OS (Operating System)
+			$this->OS = ord($this->compressed_data[$this->position++]);
+
+			// Parse the FEXTRA
+			if ($this->flags & 4)
+			{
+				// Read subfield IDs
+				$this->SI1 = $this->compressed_data[$this->position++];
+				$this->SI2 = $this->compressed_data[$this->position++];
+
+				// SI2 set to zero is reserved for future use
+				if ($this->SI2 === "\x00")
+				{
+					return false;
+				}
+
+				// Get the length of the extra field
+				$len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+				$position += 2;
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 4;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the extra field to the given data
+					$this->extra_field = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FNAME
+			if ($this->flags & 8)
+			{
+				// Get the length of the filename
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 1;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the original filename to the given string
+					$this->filename = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len + 1;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FCOMMENT
+			if ($this->flags & 16)
+			{
+				// Get the length of the comment
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 1;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the original comment to the given string
+					$this->comment = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len + 1;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FHCRC
+			if ($this->flags & 2)
+			{
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 2;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Read the CRC
+					$crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+
+					// Check the CRC matches
+					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
+					{
+						$this->position += 2;
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Decompress the actual data
+			if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
+			{
+				return false;
+			}
+			else
+			{
+				$this->position = $this->compressed_size - 8;
+			}
+
+			// Check CRC of data
+			$crc = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+			$this->position += 4;
+			/*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc))
+			{
+				return false;
+			}*/
+
+			// Check ISIZE of data
+			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+			$this->position += 4;
+			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
+			{
+				return false;
+			}
+
+			// Wow, against all odds, we've actually got a valid gzip string
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/hadoopbase.class.php b/3rdparty/aws-sdk/utilities/hadoopbase.class.php
new file mode 100644
index 0000000000..eb8bc5c3a8
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/hadoopbase.class.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains core functionality for Hadoop helpers.
+ *
+ * @version 2011.05.03
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link http://hadoop.apache.org Apache Hadoop
+ */
+class CFHadoopBase
+{
+	/**
+	 * Runs a specified script on the master node of your cluster.
+	 *
+	 * @param string $script (Required) The script to run with `script-runner.jar`.
+	 * @param array $args (Optional) An indexed array of arguments to pass to the script.
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 */
+	public static function script_runner($script, $args = null)
+	{
+		if (!$args) $args = array();
+		array_unshift($args, $script);
+
+		return array(
+			'Jar' => 's3://us-east-1.elasticmapreduce/libs/script-runner/script-runner.jar',
+			'Args' => $args
+		);
+	}
+
+	/**
+	 * Prepares a Hive or Pig script before passing it to the script runner.
+	 *
+	 * @param string $type (Required) The type of script to run. [Allowed values: `hive`, `pig`].
+	 * @param array $args (Optional) An indexed array of arguments to pass to the script.
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 * @link http://hive.apache.org Apache Hive
+	 * @link http://pig.apache.org Apache Pig
+	 */
+	public static function hive_pig_script($type, $args = null)
+	{
+		if (!$args) $args = array();
+		$args = is_array($args) ? $args : array($args);
+		$args = array_merge(array('--base-path', 's3://us-east-1.elasticmapreduce/libs/' . $type . '/'), $args);
+
+        return self::script_runner('s3://us-east-1.elasticmapreduce/libs/' . $type . '/' . $type . '-script', $args);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/hadoopbootstrap.class.php b/3rdparty/aws-sdk/utilities/hadoopbootstrap.class.php
new file mode 100644
index 0000000000..baaa0c08d4
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/hadoopbootstrap.class.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains a set of pre-built Amazon EMR Hadoop Bootstrap Actions.
+ *
+ * @version 2011.05.03
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link http://hadoop.apache.org Apache Hadoop
+ */
+class CFHadoopBootstrap extends CFHadoopBase
+{
+	// Config file types
+	const CONFIG_SITE = 'S';
+	const CONFIG_DEFAULT = 'D';
+	const CONFIG_CORE = 'C';
+	const CONFIG_HDFS = 'H';
+	const CONFIG_MAPREDUCE = 'M';
+
+	// Daemon types
+	const DAEMON_NAME_NODE = 'namenode';
+	const DAEMON_DATA_NODE = 'datanode';
+	const DAEMON_JOB_TRACKER = 'jobtracker';
+	const DAEMON_TASK_TRACKER = 'tasktracker';
+	const DAEMON_CLIENT = 'client';
+
+	/**
+	 * Create a new run-if bootstrap action which lets you conditionally run bootstrap actions.
+	 *
+	 * @param string $condition (Required) The condition to evaluate. If <code>true</code>, the bootstrap action executes.
+	 * @param array $args (Optional) An indexed array of arguments to pass to the script.
+	 * @return array A configuration set to be provided when running a job flow.
+	 */
+	public static function run_if($condition, $args = null)
+	{
+		if (!$args) $args = array();
+		$args = is_array($args) ? $args : array($args);
+
+        return self::script_runner('s3://us-east-1.elasticmapreduce/bootstrap-actions/run-if', $args);
+	}
+
+	/**
+	 * Specify options to merge with Hadoop's default configuration.
+	 *
+	 * @param string $file (Required) The Hadoop configuration file to merge with. [Allowed values: <code>CFHadoopBootstrap::CONFIG_SITE</code>, <code>CFHadoopBootstrap::CONFIG_DEFAULT</code>, <code>CFHadoopBootstrap::CONFIG_CORE</code>, <code>CFHadoopBootstrap::CONFIG_HDFS</code>, <code>CFHadoopBootstrap::CONFIG_MAPREDUCE</code>]
+	 * @param string|array $config (Required) This can either be an XML file in S3 (as <code>s3://bucket/path</code>), or an associative array of key-value pairs.
+	 * @return array A configuration set to be provided when running a job flow.
+	 */
+	public static function configure($file, $config)
+	{
+		$args = array();
+		$file_arg = '-' . $file;
+
+		if (is_string($config))
+		{
+			$args[] = $file_arg;
+			$args[] = $config;
+		}
+		elseif (is_array($config))
+		{
+			foreach ($config as $key => $value)
+			{
+				$args[] = $file_arg;
+				$args[] = $key . '=' . $value;
+			}
+		}
+
+        return self::script_runner('s3://us-east-1.elasticmapreduce/bootstrap-actions/configure-hadoop', $args);
+	}
+
+    /**
+     * Create a new bootstrap action which lets you configure Hadoop's daemons. The options are written to
+     * the <code>hadoop-user-env.sh</code> file.
+     *
+     * @param string $daemon_type (Required) The Hadoop daemon to configure.
+	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+	 * 	<li><code>HeapSize</code> - <code>integer</code> - Optional - The requested heap size of the daemon, in megabytes.</li>
+	 * 	<li><code>CLIOptions</code> - <code>string</code> - Optional - Additional Java command line arguments to pass to the daemon.</li>
+	 * 	<li><code>Replace</code> - <code>boolean</code> - Optional - Whether or not the file should be replaced. A value of <code>true</code> will replace the existing configuration file. A value of <code>false</code> will append the options to the configuration file.</li></ul>
+	 * @return array A configuration set to be provided when running a job flow.
+     */
+	public static function daemon($daemon_type, $opt = null)
+	{
+		if (!$opt) $opt = array();
+		$args = array();
+
+		foreach ($opt as $key => $value)
+		{
+			switch ($key)
+			{
+				case 'HeapSize':
+					$args[] = '--' . $daemon_type . '-heap-size=' . $value;
+					break;
+				case 'CLIOptions':
+					$args[] = '--' . $daemon_type . '-opts="' . $value . '"';
+					break;
+				case 'Replace':
+					if ((is_string($value) && $value === 'true') || (is_bool($value) && $value === true))
+					{
+						$args[] = '--replace';
+					}
+					break;
+			}
+		}
+
+        return self::script_runner('s3://us-east-1.elasticmapreduce/bootstrap-actions/configure-daemons', $args);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/hadoopstep.class.php b/3rdparty/aws-sdk/utilities/hadoopstep.class.php
new file mode 100644
index 0000000000..2371e00748
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/hadoopstep.class.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains a set of pre-built Amazon EMR Hadoop steps.
+ *
+ * @version 2011.05.03
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link http://hadoop.apache.org Apache Hadoop
+ */
+class CFHadoopStep extends CFHadoopBase
+{
+	/**
+	 * When ran as the first step in your job flow, enables the Hadoop debugging UI in the AWS
+	 * Management Console.
+	 *
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 */
+	public static function enable_debugging()
+	{
+		return self::script_runner('s3://us-east-1.elasticmapreduce/libs/state-pusher/0.1/fetch');
+	}
+
+	/**
+	 * Step that installs Hive on your job flow.
+	 *
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 * @link http://hive.apache.org Apache Hive
+	 */
+	public static function install_hive()
+	{
+		return self::hive_pig_script('hive', '--install-hive');
+	}
+
+	/**
+	 * Step that runs a Hive script on your job flow.
+	 *
+	 * @param string $script (Required) The script to run with `script-runner.jar`.
+	 * @param array $args (Optional) An indexed array of arguments to pass to the script.
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 * @link http://hive.apache.org Apache Hive
+	 */
+	public static function run_hive_script($script, $args = null)
+	{
+		if (!$args) $args = array();
+		$args = is_array($args) ? $args : array($args);
+		$args = array_merge(array('--run-hive-script', '--args', '-f', $script), $args);
+
+        return self::hive_pig_script('hive', $args);
+	}
+
+	/**
+	 * Step that installs Pig on your job flow.
+	 *
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 * @link http://pig.apache.org Apache Pig
+	 */
+	public static function install_pig()
+	{
+		return self::hive_pig_script('pig', '--install-pig');
+	}
+
+	/**
+	 * Step that runs a Pig script on your job flow.
+	 *
+	 * @param string $script (Required) The script to run with `script-runner.jar`.
+	 * @param array $args (Optional) An indexed array of arguments to pass to the script.
+	 * @return array A standard array that is intended to be passed into a <CFStepConfig> object.
+	 * @link http://pig.apache.org Apache Pig
+	 */
+	public static function run_pig_script($script, $args = null)
+	{
+		if (!$args) $args = array();
+		$args = is_array($args) ? $args : array($args);
+		$args = array_merge(array('--run-pig-script', '--args', '-f', $script), $args);
+
+        return self::hive_pig_script('pig', $args);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/info.class.php b/3rdparty/aws-sdk/utilities/info.class.php
new file mode 100644
index 0000000000..2ba289a5f0
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/info.class.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains a series of methods that provide information about the SDK.
+ *
+ * @version 2010.10.01
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFInfo
+{
+	/**
+	 * Gets information about the web service APIs that the SDK supports.
+	 *
+	 * @return array An associative array containing service classes and API versions.
+	 */
+	public static function api_support()
+	{
+		$existing_classes = get_declared_classes();
+
+		foreach (glob(dirname(dirname(__FILE__)) . '/services/*.class.php') as $file)
+		{
+			include $file;
+		}
+
+		$with_sdk_classes = get_declared_classes();
+		$new_classes = array_diff($with_sdk_classes, $existing_classes);
+		$filtered_classes = array();
+		$collect = array();
+
+		foreach ($new_classes as $class)
+		{
+			if (strpos($class, 'Amazon') !== false)
+			{
+				$filtered_classes[] = $class;
+			}
+		}
+
+		$filtered_classes = array_values($filtered_classes);
+
+		foreach ($filtered_classes as $class)
+		{
+			$obj = new $class();
+			$collect[get_class($obj)] = $obj->api_version;
+			unset($obj);
+		}
+
+		return $collect;
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/json.class.php b/3rdparty/aws-sdk/utilities/json.class.php
new file mode 100644
index 0000000000..dfa8383986
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/json.class.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Handles the conversion of data from JSON to other formats.
+ *
+ * @version 2012.01.27
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFJSON
+{
+	/**
+	 * Converts a JSON string to a CFSimpleXML object.
+	 *
+	 * @param string|array $json (Required) Pass either a valid JSON-formatted string, or an associative array.
+	 * @param string $parser (Optional) The name of the class to use to parse the XML. This class should extend <code>SimpleXMLElement</code>. Has a default value of <code>CFSimpleXML</code>.
+	 * @return CFSimpleXML An XML representation of the data.
+	 */
+	public static function to_xml($json, $parser = 'CFSimpleXML')
+	{
+		// If we haven't parsed the JSON, do it
+		if (!is_array($json))
+		{
+			// Handle the case of JSON-encoded NULL value
+			if ($json === 'null')
+			{
+				$json = null;
+			}
+			else
+			{
+				$json = json_decode($json, true);
+
+				if (function_exists('json_last_error'))
+				{
+					// Did we encounter an error?
+					switch (json_last_error())
+					{
+						case JSON_ERROR_DEPTH:
+							throw new JSON_Exception('Maximum stack depth exceeded.');
+
+						case JSON_ERROR_CTRL_CHAR:
+							throw new JSON_Exception('Unexpected control character found.');
+
+						case JSON_ERROR_SYNTAX:
+							throw new JSON_Exception('Syntax error; Malformed JSON.');
+
+						case JSON_ERROR_STATE_MISMATCH:
+							throw new JSON_Exception('Invalid or malformed JSON.');
+					}
+				}
+				// json_last_error() not available?
+				elseif ($json === null)
+				{
+					throw new JSON_Exception('Unknown JSON error. Be sure to validate your JSON and read the notes on http://php.net/json_decode.');
+				}
+			}
+		}
+
+		// Hand off for the recursive work
+		$string = Array2DOM::arrayToXMLString($json, 'rootElement', true);
+
+		return simplexml_load_string($string, $parser, LIBXML_NOCDATA);
+	}
+}
+
+
+/**
+ * Default JSON Exception.
+ */
+class JSON_Exception extends Exception {}
diff --git a/3rdparty/aws-sdk/utilities/manifest.class.php b/3rdparty/aws-sdk/utilities/manifest.class.php
new file mode 100644
index 0000000000..82410a328d
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/manifest.class.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Simplifies the process of generating manifests for the AWS Import/Export service.
+ *
+ * @version 2010.11.22
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFManifest
+{
+
+	/**
+	 * Takes a JSON object as a string to convert to a YAML manifest.
+	 *
+	 * @param string $json (Required) A JSON object. The JSON string should use canonical rules (e.g., double quotes, quoted keys) as is required by PHP's <php:json_encode()> function.
+	 * @return string A YAML manifest document.
+	 */
+	public static function json($json)
+	{
+		$map = json_decode($json, true);
+		return sfYaml::dump($map);
+	}
+
+	/**
+	 * Takes an associative array to convert to a YAML manifest.
+	 *
+	 * @param array $map (Required) An associative array.
+	 * @return string A YAML manifest document.
+	 */
+	public static function map($map)
+	{
+		return sfYaml::dump($map);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/mimetypes.class.php b/3rdparty/aws-sdk/utilities/mimetypes.class.php
new file mode 100644
index 0000000000..5fa23d3942
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/mimetypes.class.php
@@ -0,0 +1,223 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Simplifies the process of looking up the content-types for a variety of file extensions.
+ *
+ * @version 2010.07.20
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFMimeTypes
+{
+	/**
+	 * Map of the extension-to-mime-types that we support.
+	 */
+	public static $mime_types = array(
+		'3gp' => 'video/3gpp',
+		'ai' => 'application/postscript',
+		'aif' => 'audio/x-aiff',
+		'aifc' => 'audio/x-aiff',
+		'aiff' => 'audio/x-aiff',
+		'asc' => 'text/plain',
+		'atom' => 'application/atom+xml',
+		'au' => 'audio/basic',
+		'avi' => 'video/x-msvideo',
+		'bcpio' => 'application/x-bcpio',
+		'bin' => 'application/octet-stream',
+		'bmp' => 'image/bmp',
+		'cdf' => 'application/x-netcdf',
+		'cgm' => 'image/cgm',
+		'class' => 'application/octet-stream',
+		'cpio' => 'application/x-cpio',
+		'cpt' => 'application/mac-compactpro',
+		'csh' => 'application/x-csh',
+		'css' => 'text/css',
+		'dcr' => 'application/x-director',
+		'dif' => 'video/x-dv',
+		'dir' => 'application/x-director',
+		'djv' => 'image/vnd.djvu',
+		'djvu' => 'image/vnd.djvu',
+		'dll' => 'application/octet-stream',
+		'dmg' => 'application/octet-stream',
+		'dms' => 'application/octet-stream',
+		'doc' => 'application/msword',
+		'dtd' => 'application/xml-dtd',
+		'dv' => 'video/x-dv',
+		'dvi' => 'application/x-dvi',
+		'dxr' => 'application/x-director',
+		'eps' => 'application/postscript',
+		'etx' => 'text/x-setext',
+		'exe' => 'application/octet-stream',
+		'ez' => 'application/andrew-inset',
+		'flv' => 'video/x-flv',
+		'gif' => 'image/gif',
+		'gram' => 'application/srgs',
+		'grxml' => 'application/srgs+xml',
+		'gtar' => 'application/x-gtar',
+		'gz' => 'application/x-gzip',
+		'hdf' => 'application/x-hdf',
+		'hqx' => 'application/mac-binhex40',
+		'htm' => 'text/html',
+		'html' => 'text/html',
+		'ice' => 'x-conference/x-cooltalk',
+		'ico' => 'image/x-icon',
+		'ics' => 'text/calendar',
+		'ief' => 'image/ief',
+		'ifb' => 'text/calendar',
+		'iges' => 'model/iges',
+		'igs' => 'model/iges',
+		'jnlp' => 'application/x-java-jnlp-file',
+		'jp2' => 'image/jp2',
+		'jpe' => 'image/jpeg',
+		'jpeg' => 'image/jpeg',
+		'jpg' => 'image/jpeg',
+		'js' => 'application/x-javascript',
+		'kar' => 'audio/midi',
+		'latex' => 'application/x-latex',
+		'lha' => 'application/octet-stream',
+		'lzh' => 'application/octet-stream',
+		'm3u' => 'audio/x-mpegurl',
+		'm4a' => 'audio/mp4a-latm',
+		'm4p' => 'audio/mp4a-latm',
+		'm4u' => 'video/vnd.mpegurl',
+		'm4v' => 'video/x-m4v',
+		'mac' => 'image/x-macpaint',
+		'man' => 'application/x-troff-man',
+		'mathml' => 'application/mathml+xml',
+		'me' => 'application/x-troff-me',
+		'mesh' => 'model/mesh',
+		'mid' => 'audio/midi',
+		'midi' => 'audio/midi',
+		'mif' => 'application/vnd.mif',
+		'mov' => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie',
+		'mp2' => 'audio/mpeg',
+		'mp3' => 'audio/mpeg',
+		'mp4' => 'video/mp4',
+		'mpe' => 'video/mpeg',
+		'mpeg' => 'video/mpeg',
+		'mpg' => 'video/mpeg',
+		'mpga' => 'audio/mpeg',
+		'ms' => 'application/x-troff-ms',
+		'msh' => 'model/mesh',
+		'mxu' => 'video/vnd.mpegurl',
+		'nc' => 'application/x-netcdf',
+		'oda' => 'application/oda',
+		'ogg' => 'application/ogg',
+		'ogv' => 'video/ogv',
+		'pbm' => 'image/x-portable-bitmap',
+		'pct' => 'image/pict',
+		'pdb' => 'chemical/x-pdb',
+		'pdf' => 'application/pdf',
+		'pgm' => 'image/x-portable-graymap',
+		'pgn' => 'application/x-chess-pgn',
+		'pic' => 'image/pict',
+		'pict' => 'image/pict',
+		'png' => 'image/png',
+		'pnm' => 'image/x-portable-anymap',
+		'pnt' => 'image/x-macpaint',
+		'pntg' => 'image/x-macpaint',
+		'ppm' => 'image/x-portable-pixmap',
+		'ppt' => 'application/vnd.ms-powerpoint',
+		'ps' => 'application/postscript',
+		'qt' => 'video/quicktime',
+		'qti' => 'image/x-quicktime',
+		'qtif' => 'image/x-quicktime',
+		'ra' => 'audio/x-pn-realaudio',
+		'ram' => 'audio/x-pn-realaudio',
+		'ras' => 'image/x-cmu-raster',
+		'rdf' => 'application/rdf+xml',
+		'rgb' => 'image/x-rgb',
+		'rm' => 'application/vnd.rn-realmedia',
+		'roff' => 'application/x-troff',
+		'rtf' => 'text/rtf',
+		'rtx' => 'text/richtext',
+		'sgm' => 'text/sgml',
+		'sgml' => 'text/sgml',
+		'sh' => 'application/x-sh',
+		'shar' => 'application/x-shar',
+		'silo' => 'model/mesh',
+		'sit' => 'application/x-stuffit',
+		'skd' => 'application/x-koan',
+		'skm' => 'application/x-koan',
+		'skp' => 'application/x-koan',
+		'skt' => 'application/x-koan',
+		'smi' => 'application/smil',
+		'smil' => 'application/smil',
+		'snd' => 'audio/basic',
+		'so' => 'application/octet-stream',
+		'spl' => 'application/x-futuresplash',
+		'src' => 'application/x-wais-source',
+		'sv4cpio' => 'application/x-sv4cpio',
+		'sv4crc' => 'application/x-sv4crc',
+		'svg' => 'image/svg+xml',
+		'swf' => 'application/x-shockwave-flash',
+		't' => 'application/x-troff',
+		'tar' => 'application/x-tar',
+		'tcl' => 'application/x-tcl',
+		'tex' => 'application/x-tex',
+		'texi' => 'application/x-texinfo',
+		'texinfo' => 'application/x-texinfo',
+		'tif' => 'image/tiff',
+		'tiff' => 'image/tiff',
+		'tr' => 'application/x-troff',
+		'tsv' => 'text/tab-separated-values',
+		'txt' => 'text/plain',
+		'ustar' => 'application/x-ustar',
+		'vcd' => 'application/x-cdlink',
+		'vrml' => 'model/vrml',
+		'vxml' => 'application/voicexml+xml',
+		'wav' => 'audio/x-wav',
+		'wbmp' => 'image/vnd.wap.wbmp',
+		'wbxml' => 'application/vnd.wap.wbxml',
+		'webm' => 'video/webm',
+		'wml' => 'text/vnd.wap.wml',
+		'wmlc' => 'application/vnd.wap.wmlc',
+		'wmls' => 'text/vnd.wap.wmlscript',
+		'wmlsc' => 'application/vnd.wap.wmlscriptc',
+		'wmv' => 'video/x-ms-wmv',
+		'wrl' => 'model/vrml',
+		'xbm' => 'image/x-xbitmap',
+		'xht' => 'application/xhtml+xml',
+		'xhtml' => 'application/xhtml+xml',
+		'xls' => 'application/vnd.ms-excel',
+		'xml' => 'application/xml',
+		'xpm' => 'image/x-xpixmap',
+		'xsl' => 'application/xml',
+		'xslt' => 'application/xslt+xml',
+		'xul' => 'application/vnd.mozilla.xul+xml',
+		'xwd' => 'image/x-xwindowdump',
+		'xyz' => 'chemical/x-xyz',
+		'zip' => 'application/zip',
+	);
+
+	/**
+	 * Attempt to match the file extension to a known mime-type.
+	 *
+	 * @param string $ext (Required) The file extension to attempt to map.
+	 * @return string The mime-type to use for the file extension.
+	 */
+	public static function get_mimetype($ext)
+	{
+		return (isset(self::$mime_types[$ext]) ? self::$mime_types[$ext] : 'application/octet-stream');
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/policy.class.php b/3rdparty/aws-sdk/utilities/policy.class.php
new file mode 100644
index 0000000000..9c53fee0d7
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/policy.class.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Simplifies the process of signing JSON policy documents.
+ *
+ * @version 2011.04.25
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFPolicy
+{
+	/**
+	 * Stores the object that contains the authentication credentials.
+	 */
+	public $auth;
+
+	/**
+	 * Stores the policy object that we're working with.
+	 */
+	public $json_policy;
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param CFRuntime $auth (Required) An instance of any authenticated AWS object that is an instance of <CFRuntime> (e.g. <AmazonEC2>, <AmazonS3>).
+	 * @param string|array $policy (Required) The associative array representing the S3 policy to use, or a string of JSON content.
+	 * @return $this A reference to the current instance.
+	 * @link http://docs.amazonwebservices.com/AmazonS3/2006-03-01/dev/index.html?HTTPPOSTForms.html S3 Policies
+	 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?AccessPolicyLanguage.html Access Policy Language
+	 */
+	public function __construct($auth, $policy)
+	{
+		$this->auth = $auth;
+
+		if (is_array($policy)) // We received an associative array...
+		{
+			$this->json_policy = json_encode($policy);
+		}
+		else // We received a valid, parseable JSON string...
+		{
+			$this->json_policy = json_encode(json_decode($policy, true));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Alternate approach to constructing a new instance. Supports chaining.
+	 *
+	 * @param CFRuntime $auth (Required) An instance of any authenticated AWS object that is an instance of <CFRuntime> (e.g. <AmazonEC2>, <AmazonS3>).
+	 * @param string|array $policy (Required) The associative array representing the S3 policy to use, or a string of JSON content.
+	 * @return $this A reference to the current instance.
+	 */
+	public static function init($auth, $policy)
+	{
+		if (version_compare(PHP_VERSION, '5.3.0', '<'))
+		{
+			throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
+		}
+
+		$self = get_called_class();
+		return new $self($auth, $policy);
+	}
+
+	/**
+	 * Get the key from the authenticated instance.
+	 *
+	 * @return string The key from the authenticated instance.
+	 */
+	public function get_key()
+	{
+		return $this->auth->key;
+	}
+
+	/**
+	 * Base64-encodes the JSON string.
+	 *
+	 * @return string The Base64-encoded version of the JSON string.
+	 */
+	public function get_policy()
+	{
+		return base64_encode($this->json_policy);
+	}
+
+	/**
+	 * Gets the JSON string with the whitespace removed.
+	 *
+	 * @return string The JSON string without extraneous whitespace.
+	 */
+	public function get_json()
+	{
+		return $this->json_policy;
+	}
+
+	/**
+	 * Gets the JSON string with the whitespace removed.
+	 *
+	 * @return string The Base64-encoded, signed JSON string.
+	 */
+	public function get_policy_signature()
+	{
+		return base64_encode(hash_hmac('sha1', $this->get_policy(), $this->auth->secret_key));
+	}
+
+	/**
+	 * Decode a policy that was returned from the service.
+	 *
+	 * @param string $response (Required) The policy returned by AWS that you want to decode into an object.
+	 * @return string The Base64-encoded, signed JSON string.
+	 */
+	public static function decode_policy($response)
+	{
+		return json_decode(urldecode($response), true);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/request.class.php b/3rdparty/aws-sdk/utilities/request.class.php
new file mode 100644
index 0000000000..8e049fb516
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/request.class.php
@@ -0,0 +1,70 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Wraps the underlying `RequestCore` class with some AWS-specific customizations.
+ *
+ * @version 2011.12.02
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFRequest extends RequestCore
+{
+	/**
+	 * The default class to use for HTTP Requests (defaults to <CFRequest>).
+	 */
+	public $request_class = 'CFRequest';
+
+	/**
+	 * The default class to use for HTTP Responses (defaults to <CFResponse>).
+	 */
+	public $response_class = 'CFResponse';
+
+	/**
+	 * The active credential set.
+	 */
+	public $credentials;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $url (Optional) The URL to request or service endpoint to query.
+	 * @param string $proxy (Optional) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
+	 * @param array $helpers (Optional) An associative array of classnames to use for request, and response functionality. Gets passed in automatically by the calling class.
+	 * @param CFCredential $credentials (Required) The credentials to use for signing and making requests.
+	 * @return $this A reference to the current instance.
+	 */
+	public function __construct($url = null, $proxy = null, $helpers = null, CFCredential $credentials = null)
+	{
+		parent::__construct($url, $proxy, $helpers);
+
+		// Standard settings for all requests
+		$this->set_useragent(CFRUNTIME_USERAGENT);
+		$this->credentials = $credentials;
+		$this->cacert_location = ($this->credentials['certificate_authority'] ? $this->credentials['certificate_authority'] : false);
+
+		return $this;
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/response.class.php b/3rdparty/aws-sdk/utilities/response.class.php
new file mode 100644
index 0000000000..740d55d5d9
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/response.class.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Wraps the underlying `ResponseCore` class with some AWS-specific customizations.
+ *
+ * @version 2010.10.11
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFResponse extends ResponseCore {}
diff --git a/3rdparty/aws-sdk/utilities/simplexml.class.php b/3rdparty/aws-sdk/utilities/simplexml.class.php
new file mode 100644
index 0000000000..ba93b9ea3c
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/simplexml.class.php
@@ -0,0 +1,248 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Wraps the underlying `SimpleXMLIterator` class with enhancements for rapidly traversing the DOM tree,
+ * converting types, and comparisons.
+ *
+ * @version 2012.01.17
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ * @link http://php.net/SimpleXML SimpleXML
+ */
+class CFSimpleXML extends SimpleXMLIterator
+{
+	/**
+	 * Stores the namespace name to use in XPath queries.
+	 */
+	public $xml_ns;
+
+	/**
+	 * Stores the namespace URI to use in XPath queries.
+	 */
+	public $xml_ns_url;
+
+	/**
+	 * Catches requests made to methods that don't exist. Specifically, looks for child nodes via XPath.
+	 *
+	 * @param string $name (Required) The name of the method.
+	 * @param array $arguments (Required) The arguments passed to the method.
+	 * @return mixed Either an array of matches, or a single <CFSimpleXML> element.
+	 */
+	public function __call($name, $arguments)
+	{
+		// Remap $this
+		$self = $this;
+
+		// Re-base the XML
+		$self = new CFSimpleXML($self->asXML());
+
+		// Determine XPath query
+		$self->xpath_expression = 'descendant-or-self::' . $name;
+
+		// Get the results and augment with CFArray
+		$results = $self->xpath($self->xpath_expression);
+		if (!count($results)) return false;
+		$results = new CFArray($results);
+
+		// If an integer was passed, return only that result
+		if (isset($arguments[0]) && is_int($arguments[0]))
+		{
+			if (isset($results[$arguments[0]]))
+			{
+				return $results[$arguments[0]];
+			}
+
+			return false;
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Alternate approach to constructing a new instance. Supports chaining.
+	 *
+	 * @param string $data (Required) A well-formed XML string or the path or URL to an XML document if $data_is_url is <code>true</code>.
+	 * @param integer $options (Optional) Used to specify additional LibXML parameters. The default value is <code>0</code>.
+	 * @param boolean $data_is_url (Optional) Specify a value of <code>true</code> to specify that data is a path or URL to an XML document instead of string data. The default value is <code>false</code>.
+	 * @param string $ns (Optional) The XML namespace to return values for.
+	 * @param boolean $is_prefix (Optional) (No description provided by PHP.net.)
+	 * @return CFSimpleXML Creates a new <CFSimpleXML> element.
+	 */
+	public static function init($data, $options = 0, $data_is_url, $ns, $is_prefix = false)
+	{
+		if (version_compare(PHP_VERSION, '5.3.0', '<'))
+		{
+			throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
+		}
+
+		$self = get_called_class();
+		return new $self($data, $options, $data_is_url, $ns, $is_prefix);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// TRAVERSAL
+
+	/**
+	 * Wraps the results of an XPath query in a <CFArray> object.
+	 *
+	 * @param string $expr (Required) The XPath expression to use to query the XML response.
+	 * @return CFArray A <CFArray> object containing the results of the XPath query.
+	 */
+	public function query($expr)
+	{
+		return new CFArray($this->xpath($expr));
+	}
+
+	/**
+	 * Gets the parent or a preferred ancestor of the current element.
+	 *
+	 * @param string $node (Optional) Name of the ancestor element to match and return.
+	 * @return CFSimpleXML A <CFSimpleXML> object containing the requested node.
+	 */
+	public function parent($node = null)
+	{
+		if ($node)
+		{
+			$parents = $this->xpath('ancestor-or-self::' . $node);
+		}
+		else
+		{
+			$parents = $this->xpath('parent::*');
+		}
+
+		return $parents[0];
+	}
+
+
+	/*%******************************************************************************************%*/
+	// ALTERNATE FORMATS
+
+	/**
+	 * Gets the current XML node as a true string.
+	 *
+	 * @return string The current XML node as a true string.
+	 */
+	public function to_string()
+	{
+		return (string) $this;
+	}
+
+	/**
+	 * Gets the current XML node as <CFArray>, a child class of PHP's <php:ArrayObject> class.
+	 *
+	 * @return CFArray The current XML node as a <CFArray> object.
+	 */
+	public function to_array()
+	{
+		return new CFArray(json_decode(json_encode($this), true));
+	}
+
+	/**
+	 * Gets the current XML node as a stdClass object.
+	 *
+	 * @return array The current XML node as a stdClass object.
+	 */
+	public function to_stdClass()
+	{
+		return json_decode(json_encode($this));
+	}
+
+	/**
+	 * Gets the current XML node as a JSON string.
+	 *
+	 * @return string The current XML node as a JSON string.
+	 */
+	public function to_json()
+	{
+		return json_encode($this);
+	}
+
+	/**
+	 * Gets the current XML node as a YAML string.
+	 *
+	 * @return string The current XML node as a YAML string.
+	 */
+	public function to_yaml()
+	{
+		return sfYaml::dump(json_decode(json_encode($this), true), 5);
+	}
+
+
+	/*%******************************************************************************************%*/
+	// COMPARISONS
+
+	/**
+	 * Whether or not the current node exactly matches the compared value.
+	 *
+	 * @param string $value (Required) The value to compare the current node to.
+	 * @return boolean Whether or not the current node exactly matches the compared value.
+	 */
+	public function is($value)
+	{
+		return ((string) $this === $value);
+	}
+
+	/**
+	 * Whether or not the current node contains the compared value.
+	 *
+	 * @param string $value (Required) The value to use to determine whether it is contained within the node.
+	 * @return boolean Whether or not the current node contains the compared value.
+	 */
+	public function contains($value)
+	{
+		return (stripos((string) $this, $value) !== false);
+	}
+
+	/**
+	 * Whether or not the current node matches the regular expression pattern.
+	 *
+	 * @param string $pattern (Required) The pattern to match the current node against.
+	 * @return boolean Whether or not the current node matches the pattern.
+	 */
+	public function matches($pattern)
+	{
+		return (bool) preg_match($pattern, (string) $this);
+	}
+
+	/**
+	 * Whether or not the current node starts with the compared value.
+	 *
+	 * @param string $value (Required) The value to compare the current node to.
+	 * @return boolean Whether or not the current node starts with the compared value.
+	 */
+	public function starts_with($value)
+	{
+		return $this->matches("@^$value@u");
+	}
+
+	/**
+	 * Whether or not the current node ends with the compared value.
+	 *
+	 * @param string $value (Required) The value to compare the current node to.
+	 * @return boolean Whether or not the current node ends with the compared value.
+	 */
+	public function ends_with($value)
+	{
+		return $this->matches("@$value$@u");
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/stacktemplate.class.php b/3rdparty/aws-sdk/utilities/stacktemplate.class.php
new file mode 100644
index 0000000000..1e29ef3403
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/stacktemplate.class.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Simplifies the process of preparing JSON stack templates.
+ *
+ * @version 2011.02.03
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFStackTemplate
+{
+	/**
+	 * Removes whitespace from a JSON template.
+	 *
+	 * @param string $template (Required) A JSON representation of the stack template. Must have <a href="http://docs.php.net/manual/en/function.json-decode.php#refsect1-function.json-decode-examples">strict JSON-specific formatting</a>.
+	 * @return string A JSON representation of the template.
+	 */
+	public static function json($template)
+	{
+		return json_encode(json_decode($template, true));
+	}
+
+	/**
+	 * Converts an associative array (map) of the template into a JSON string.
+	 *
+	 * @param array $template (Required) An associative array that maps directly to its JSON counterpart.
+	 * @return string A JSON representation of the template.
+	 */
+	public static function map($template)
+	{
+		return json_encode($template);
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/stepconfig.class.php b/3rdparty/aws-sdk/utilities/stepconfig.class.php
new file mode 100644
index 0000000000..71492995f4
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/stepconfig.class.php
@@ -0,0 +1,91 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains functionality for simplifying Amazon EMR Hadoop steps.
+ *
+ * @version 2010.11.16
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFStepConfig
+{
+
+	/**
+	 * Stores the configuration map.
+	 */
+	public $config;
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param array $config (Required) An associative array representing the Hadoop step configuration.
+	 * @return $this A reference to the current instance.
+	 */
+	public function __construct($config)
+	{
+		// Handle Hadoop jar arguments
+		if (isset($config['HadoopJarStep']['Args']) && $args = $config['HadoopJarStep']['Args'])
+		{
+			$config['HadoopJarStep']['Args'] = is_array($args) ? $args : array($args);
+		}
+
+		$this->config = $config;
+	}
+
+	/**
+	 * Constructs a new instance of this class, and allows chaining.
+	 *
+	 * @param array $config (Required) An associative array representing the Hadoop step configuration.
+	 * @return $this A reference to the current instance.
+	 */
+	public static function init($config)
+	{
+		if (version_compare(PHP_VERSION, '5.3.0', '<'))
+		{
+			throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
+		}
+
+		$self = get_called_class();
+		return new $self($config);
+	}
+
+	/**
+	 * Returns a JSON representation of the object when typecast as a string.
+	 *
+	 * @return string A JSON representation of the object.
+	 * @link http://www.php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring PHP Magic Methods
+	 */
+	public function __toString()
+	{
+		return json_encode($this->config);
+	}
+
+	/**
+	 * Returns the configuration data.
+	 *
+	 * @return array The configuration data.
+	 */
+	public function get_config()
+	{
+		return $this->config;
+	}
+}
diff --git a/3rdparty/aws-sdk/utilities/utilities.class.php b/3rdparty/aws-sdk/utilities/utilities.class.php
new file mode 100755
index 0000000000..d4d1120abf
--- /dev/null
+++ b/3rdparty/aws-sdk/utilities/utilities.class.php
@@ -0,0 +1,399 @@
+<?php
+/*
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+/*%******************************************************************************************%*/
+// CLASS
+
+/**
+ * Contains a set of utility methods for connecting to, and working with, AWS.
+ *
+ * @version 2010.09.30
+ * @license See the included NOTICE.md file for more information.
+ * @copyright See the included NOTICE.md file for more information.
+ * @link http://aws.amazon.com/php/ PHP Developer Center
+ */
+class CFUtilities
+{
+
+	/*%******************************************************************************************%*/
+	// CONSTANTS
+
+	/**
+	 * Define the RFC 2616-compliant date format.
+	 */
+	const DATE_FORMAT_RFC2616 = 'D, d M Y H:i:s \G\M\T';
+
+	/**
+	 * Define the ISO-8601-compliant date format.
+	 */
+	const DATE_FORMAT_ISO8601 = 'Y-m-d\TH:i:s\Z';
+
+	/**
+	 * Define the MySQL-compliant date format.
+	 */
+	const DATE_FORMAT_MYSQL = 'Y-m-d H:i:s';
+
+	/**
+	 * Define the Signature v4 date format.
+	 */
+	const DATE_FORMAT_SIGV4 = 'Ymd\THis\Z';
+
+
+	/*%******************************************************************************************%*/
+	// METHODS
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @return $this A reference to the current instance.
+	 */
+	public function __construct()
+	{
+		return $this;
+	}
+
+	/**
+	 * Retrieves the value of a class constant, while avoiding the `T_PAAMAYIM_NEKUDOTAYIM` error. Misspelled because `const` is a reserved word.
+	 *
+	 * @param object $class (Required) An instance of the class containing the constant.
+	 * @param string $const (Required) The name of the constant to retrieve.
+	 * @return mixed The value of the class constant.
+	 */
+	public function konst($class, $const)
+	{
+		if (is_string($class))
+		{
+			$ref = new ReflectionClass($class);
+		}
+		else
+		{
+			$ref = new ReflectionObject($class);
+		}
+
+		return $ref->getConstant($const);
+	}
+
+	/**
+	 * Convert a HEX value to Base64.
+	 *
+	 * @param string $str (Required) Value to convert.
+	 * @return string Base64-encoded string.
+	 */
+	public function hex_to_base64($str)
+	{
+		$raw = '';
+
+		for ($i = 0; $i < strlen($str); $i += 2)
+		{
+			$raw .= chr(hexdec(substr($str, $i, 2)));
+		}
+
+		return base64_encode($raw);
+	}
+
+	/**
+	 * Convert an associative array into a query string.
+	 *
+	 * @param array $array (Required) Array to convert.
+	 * @return string URL-friendly query string.
+	 */
+	public function to_query_string($array)
+	{
+		$temp = array();
+
+		foreach ($array as $key => $value)
+		{
+			if (is_string($key) && !is_array($value))
+			{
+				$temp[] = rawurlencode($key) . '=' . rawurlencode($value);
+			}
+		}
+
+		return implode('&', $temp);
+	}
+
+	/**
+	 * Convert an associative array into a sign-able string.
+	 *
+	 * @param array $array (Required) Array to convert.
+	 * @return string URL-friendly sign-able string.
+	 */
+	public function to_signable_string($array)
+	{
+		$t = array();
+
+		foreach ($array as $k => $v)
+		{
+			$t[] = $this->encode_signature2($k) . '=' . $this->encode_signature2($v);
+		}
+
+		return implode('&', $t);
+	}
+
+	/**
+	 * Encode the value according to RFC 3986.
+	 *
+	 * @param string $string (Required) String to convert.
+	 * @return string URL-friendly sign-able string.
+	 */
+	public function encode_signature2($string)
+	{
+		$string = rawurlencode($string);
+		return str_replace('%7E', '~', $string);
+	}
+
+	/**
+	 * Convert a query string into an associative array. Multiple, identical keys will become an indexed array.
+	 *
+	 * @param string $qs (Required) Query string to convert.
+	 * @return array Associative array of keys and values.
+	 */
+	public function query_to_array($qs)
+	{
+		$query = explode('&', $qs);
+		$data = array();
+
+		foreach ($query as $q)
+		{
+			$q = explode('=', $q);
+
+			if (isset($data[$q[0]]) && is_array($data[$q[0]]))
+			{
+				$data[$q[0]][] = urldecode($q[1]);
+			}
+			else if (isset($data[$q[0]]) && !is_array($data[$q[0]]))
+			{
+				$data[$q[0]] = array($data[$q[0]]);
+				$data[$q[0]][] = urldecode($q[1]);
+			}
+			else
+			{
+				$data[urldecode($q[0])] = urldecode($q[1]);
+			}
+		}
+		return $data;
+	}
+
+	/**
+	 * Return human readable file sizes.
+	 *
+	 * @author Aidan Lister <aidan@php.net>
+	 * @author Ryan Parman <ryan@getcloudfusion.com>
+	 * @license http://www.php.net/license/3_01.txt PHP License
+	 * @param integer $size (Required) Filesize in bytes.
+	 * @param string $unit (Optional) The maximum unit to use. Defaults to the largest appropriate unit.
+	 * @param string $default (Optional) The format for the return string. Defaults to `%01.2f %s`.
+	 * @return string The human-readable file size.
+	 * @link http://aidanlister.com/repos/v/function.size_readable.php Original Function
+	 */
+	public function size_readable($size, $unit = null, $default = null)
+	{
+		// Units
+		$sizes = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB');
+		$mod = 1024;
+		$ii = count($sizes) - 1;
+
+		// Max unit
+		$unit = array_search((string) $unit, $sizes);
+		if ($unit === null || $unit === false)
+		{
+			$unit = $ii;
+		}
+
+		// Return string
+		if ($default === null)
+		{
+			$default = '%01.2f %s';
+		}
+
+		// Loop
+		$i = 0;
+		while ($unit != $i && $size >= 1024 && $i < $ii)
+		{
+			$size /= $mod;
+			$i++;
+		}
+
+		return sprintf($default, $size, $sizes[$i]);
+	}
+
+	/**
+	 * Convert a number of seconds into Hours:Minutes:Seconds.
+	 *
+	 * @param integer $seconds (Required) The number of seconds to convert.
+	 * @return string The formatted time.
+	 */
+	public function time_hms($seconds)
+	{
+		$time = '';
+
+		// First pass
+		$hours = (int) ($seconds / 3600);
+		$seconds = $seconds % 3600;
+		$minutes = (int) ($seconds / 60);
+		$seconds = $seconds % 60;
+
+		// Cleanup
+		$time .= ($hours) ? $hours . ':' : '';
+		$time .= ($minutes < 10 && $hours > 0) ? '0' . $minutes : $minutes;
+		$time .= ':';
+		$time .= ($seconds < 10) ? '0' . $seconds : $seconds;
+
+		return $time;
+	}
+
+	/**
+	 * Returns the first value that is set. Based on [Try.these()](http://api.prototypejs.org/language/Try/these/) from [Prototype](http://prototypejs.org).
+	 *
+	 * @param array $attrs (Required) The attributes to test, as strings. Intended for testing properties of the $base object, but also works with variables if you place an @ symbol at the beginning of the command.
+	 * @param object $base (Optional) The base object to use, if any.
+	 * @param mixed $default (Optional) What to return if there are no matches. Defaults to `null`.
+	 * @return mixed Either a matching property of a given object, boolean `false`, or any other data type you might choose.
+	 */
+	public function try_these($attrs, $base = null, $default = null)
+	{
+		if ($base)
+		{
+			foreach ($attrs as $attr)
+			{
+				if (isset($base->$attr))
+				{
+					return $base->$attr;
+				}
+			}
+		}
+		else
+		{
+			foreach ($attrs as $attr)
+			{
+				if (isset($attr))
+				{
+					return $attr;
+				}
+			}
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Can be removed once all calls are updated.
+	 *
+	 * @deprecated Use <php:json_encode()> instead.
+	 * @param mixed $obj (Required) The PHP object to convert into a JSON string.
+	 * @return string A JSON string.
+	 */
+	public function json_encode($obj)
+	{
+		return json_encode($obj);
+	}
+
+	/**
+	 * Converts a SimpleXML response to an array structure.
+	 *
+	 * @param ResponseCore $response (Required) A response value.
+	 * @return array The response value as a standard, multi-dimensional array.
+	 */
+	public function convert_response_to_array(ResponseCore $response)
+	{
+		return json_decode(json_encode($response), true);
+	}
+
+	/**
+	 * Checks to see if a date stamp is ISO-8601 formatted, and if not, makes it so.
+	 *
+	 * @param string $datestamp (Required) A date stamp, or a string that can be parsed into a date stamp.
+	 * @return string An ISO-8601 formatted date stamp.
+	 */
+	public function convert_date_to_iso8601($datestamp)
+	{
+		if (!preg_match('/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}((\+|-)\d{2}:\d{2}|Z)/m', $datestamp))
+		{
+			return gmdate(self::DATE_FORMAT_ISO8601, strtotime($datestamp));
+		}
+
+		return $datestamp;
+	}
+
+	/**
+	 * Determines whether the data is Base64 encoded or not.
+	 *
+	 * @license http://us.php.net/manual/en/function.base64-decode.php#81425 PHP License
+	 * @param string $s (Required) The string to test.
+	 * @return boolean Whether the string is Base64 encoded or not.
+	 */
+	public function is_base64($s)
+	{
+		return (bool) preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $s);
+	}
+
+	/**
+	 * Determines whether the data is a JSON string or not.
+	 *
+	 * @param string $s (Required) The string to test.
+	 * @return boolean Whether the string is a valid JSON object or not.
+	 */
+	public function is_json($s)
+	{
+		return !!(json_decode($s) instanceof stdClass);
+	}
+
+	/**
+	 * Decodes `\uXXXX` entities into their real unicode character equivalents.
+	 *
+	 * @param string $s (Required) The string to decode.
+	 * @return string The decoded string.
+	 */
+	public function decode_uhex($s)
+	{
+		preg_match_all('/\\\u([0-9a-f]{4})/i', $s, $matches);
+		$matches = $matches[count($matches) - 1];
+		$map = array();
+
+		foreach ($matches as $match)
+		{
+			if (!isset($map[$match]))
+			{
+				$map['\u' . $match] = html_entity_decode('&#' . hexdec($match) . ';', ENT_NOQUOTES, 'UTF-8');
+			}
+		}
+
+		return str_replace(array_keys($map), $map, $s);
+	}
+
+	/**
+	 * Generates a random GUID.
+	 *
+	 * @author Alix Axel <http://www.php.net/manual/en/function.com-create-guid.php#99425>
+	 * @license http://www.php.net/license/3_01.txt PHP License
+	 * @return string A random GUID.
+	 */
+	public function generate_guid()
+	{
+	    return sprintf(
+			'%04X%04X-%04X-%04X-%04X-%04X%04X%04X',
+			mt_rand(0, 65535),
+			mt_rand(0, 65535),
+			mt_rand(0, 65535),
+			mt_rand(16384, 20479),
+			mt_rand(32768, 49151),
+			mt_rand(0, 65535),
+			mt_rand(0, 65535),
+			mt_rand(0, 65535)
+		);
+	}
+}
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index e847ef143c..b8e5b9b079 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -20,7 +20,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-require_once 'aws-sdk-1.5.5/sdk.class.php';
+require_once 'aws-sdk/sdk.class.php';
 
 class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 

From 4f2993cb1d94b4136a7a429e8edf082f7b559ddc Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 8 Jun 2012 19:59:12 +0200
Subject: [PATCH 0238/1537] remove buggy when

---
 3rdparty/when/MIT-LICENSE.txt |   9 -
 3rdparty/when/When.php        | 725 ----------------------------------
 2 files changed, 734 deletions(-)
 delete mode 100644 3rdparty/when/MIT-LICENSE.txt
 delete mode 100644 3rdparty/when/When.php

diff --git a/3rdparty/when/MIT-LICENSE.txt b/3rdparty/when/MIT-LICENSE.txt
deleted file mode 100644
index b4429c89ac..0000000000
--- a/3rdparty/when/MIT-LICENSE.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-License
-
-Copyright (c) 2010 Thomas Planer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
deleted file mode 100644
index 5f97f0eb9b..0000000000
--- a/3rdparty/when/When.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-/**
- * Name: When
- * Author: Thomas Planer <tplaner@gmail.com>
- * Location: http://github.com/tplaner/When
- * Created: September 2010
- * Description: Determines the next date of recursion given an iCalendar "rrule" like pattern.
- * Requirements: PHP 5.3+ - makes extensive use of the Date and Time library (http://us2.php.net/manual/en/book.datetime.php)
- */
-class When
-{
-	protected $frequency;
-	
-	protected $start_date;
-	protected $try_date;
-	
-	protected $end_date;
-	
-	protected $gobymonth;
-	protected $bymonth;
-	
-	protected $gobyweekno;
-	protected $byweekno;
-	
-	protected $gobyyearday;
-	protected $byyearday;
-	
-	protected $gobymonthday;
-	protected $bymonthday;
-	
-	protected $gobyday;
-	protected $byday;
-	
-	protected $gobysetpos;
-	protected $bysetpos;
-		
-	protected $suggestions;
-	
-	protected $count;
-	protected $counter;
-	
-	protected $goenddate;
-	
-	protected $interval;
-	
-	protected $wkst;
-	
-	protected $valid_week_days;
-	protected $valid_frequency;
-		
-	/**
-	 * __construct
-	 */
-	public function __construct()
-	{
-		$this->frequency = null;
-		
-		$this->gobymonth = false;
-		$this->bymonth = range(1,12);
-		
-		$this->gobymonthday = false;
-		$this->bymonthday = range(1,31);
-		
-		$this->gobyday = false;
-		// setup the valid week days (0 = sunday)
-		$this->byday = range(0,6);
-		
-		$this->gobyyearday = false;
-		$this->byyearday = range(0,366);
-		
-		$this->gobysetpos = false;
-		$this->bysetpos = range(1,366);
-		
-		$this->gobyweekno = false;
-		// setup the range for valid weeks
-		$this->byweekno = range(0,54);
-		
-		$this->suggestions = array();
-		
-		// this will be set if a count() is specified
-		$this->count = 0;
-		// how many *valid* results we returned
-		$this->counter = 0;
-		
-		// max date we'll return
-		$this->end_date = new DateTime('9999-12-31');
-		
-		// the interval to increase the pattern by
-		$this->interval = 1;
-		
-		// what day does the week start on? (0 = sunday)
-		$this->wkst = 0;
-		
-		$this->valid_week_days = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
-		
-		$this->valid_frequency = array('SECONDLY', 'MINUTELY', 'HOURLY', 'DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY');
-	}
-	
-	/**
-	 * @param DateTime|string $start_date of the recursion - also is the first return value.
-	 * @param string $frequency of the recrusion, valid frequencies: secondly, minutely, hourly, daily, weekly, monthly, yearly
-	 */
-	public function recur($start_date, $frequency = "daily")
-	{
-		try
-		{
-			if(is_object($start_date))
-			{
-				$this->start_date = clone $start_date;
-			}
-			else
-			{
-				// timestamps within the RFC have a 'Z' at the end of them, remove this.
-				$start_date = trim($start_date, 'Z');
-				$this->start_date = new DateTime($start_date);
-			}
-			
-			$this->try_date = clone $this->start_date;
-		}
-		catch(Exception $e)
-		{
-			throw new InvalidArgumentException('Invalid start date DateTime: ' . $e);
-		}
-		
-		$this->freq($frequency);
-		
-		return $this;
-	}
-
-	public function freq($frequency)
-	{
-		if(in_array(strtoupper($frequency), $this->valid_frequency))
-		{
-			$this->frequency = strtoupper($frequency);
-		}
-		else
-		{
-			throw new InvalidArgumentException('Invalid frequency type.');
-		}
-
-		return $this;
-	}
-
-	// accepts an rrule directly
-	public function rrule($rrule)
-	{
-		// strip off a trailing semi-colon
-		$rrule = trim($rrule, ";");
-		
-		$parts = explode(";", $rrule);
-
-		foreach($parts as $part)
-		{
-			list($rule, $param) = explode("=", $part);
-
-			$rule = strtoupper($rule);
-			$param = strtoupper($param);
-
-			switch($rule)
-			{
-				case "FREQ":
-					$this->frequency = $param;
-					break;
-				case "UNTIL":
-					$this->until($param);
-					break;
-				case "COUNT":
-					$this->count($param);
-					break;
-				case "INTERVAL":
-					$this->interval($param);
-					break;
-				case "BYDAY":
-					$params = explode(",", $param);
-					$this->byday($params);
-					break;
-				case "BYMONTHDAY":
-					$params = explode(",", $param);
-					$this->bymonthday($params);
-					break;
-				case "BYYEARDAY":
-					$params = explode(",", $param);
-					$this->byyearday($params);
-					break;
-				case "BYWEEKNO":
-					$params = explode(",", $param);
-					$this->byweekno($params);
-					break;
-				case "BYMONTH":
-					$params = explode(",", $param);
-					$this->bymonth($params);
-					break;
-				case "BYSETPOS":
-					$params = explode(",", $param);
-					$this->bysetpos($params);
-					break;
-				case "WKST":
-					$this->wkst($param);
-					break;
-			}
-		}
-
-		return $this;
-	}
-	
-	//max number of items to return based on the pattern
-	public function count($count)
-	{
-		$this->count = (int)$count;
-		
-		return $this;
-	}
-	
-	// how often the recurrence rule repeats
-	public function interval($interval)
-	{
-		$this->interval = (int)$interval;
-		
-		return $this;
-	}
-	
-	// starting day of the week
-	public function wkst($day)
-	{
-		switch($day)
-		{
-			case 'SU':
-				$this->wkst = 0;
-				break;
-			case 'MO':
-				$this->wkst = 1;
-				break;
-			case 'TU':
-				$this->wkst = 2;
-				break;
-			case 'WE':
-				$this->wkst = 3;
-				break;
-			case 'TH':
-				$this->wkst = 4;
-				break;
-			case 'FR':
-				$this->wkst = 5;
-				break;
-			case 'SA':
-				$this->wkst = 6;
-				break;
-		}
-		
-		return $this;
-	}
-	
-	// max date
-	public function until($end_date)
-	{		
-		try
-		{
-			if(is_object($end_date))
-			{
-				$this->end_date = clone $end_date;
-			}
-			else
-			{
-				// timestamps within the RFC have a 'Z' at the end of them, remove this.
-				$end_date = trim($end_date, 'Z');
-				$this->end_date = new DateTime($end_date);
-			}
-		}
-		catch(Exception $e)
-		{
-			throw new InvalidArgumentException('Invalid end date DateTime: ' . $e);
-		}
-		
-		return $this;
-	}
-
-	public function bymonth($months)
-	{	
-		if(is_array($months))
-		{
-			$this->gobymonth = true;
-			$this->bymonth = $months;
-		}
-		
-		return $this;
-	}
-	
-	public function bymonthday($days)
-	{	
-		if(is_array($days))
-		{
-			$this->gobymonthday = true;
-			$this->bymonthday = $days;
-		}
-		
-		return $this;
-	}
-	
-	public function byweekno($weeks)
-	{
-		$this->gobyweekno = true;
-		
-		if(is_array($weeks))
-		{
-			$this->byweekno = $weeks;
-		}
-		
-		return $this;
-	}
-	
-	public function bysetpos($days)
-	{
-		$this->gobysetpos = true;
-		
-		if(is_array($days))
-		{
-			$this->bysetpos = $days;
-		}
-		
-		return $this;
-	}
-	
-	public function byday($days)
-	{		
-		$this->gobyday = true;
-		
-		if(is_array($days))
-		{
-			$this->byday = array();
-			foreach($days as $day)
-			{
-				$len = strlen($day);
-				
-				$as = '+';
-				
-				// 0 mean no occurence is set
-				$occ = 0;
-				
-				if($len == 3)
-				{
-					$occ = substr($day, 0, 1);
-				}
-				if($len == 4)
-				{
-					$as = substr($day, 0, 1);
-					$occ = substr($day, 1, 1);
-				}
-				
-				if($as == '-')
-				{
-					$occ = '-' . $occ;
-				}
-				else
-				{
-					$occ = '+' . $occ;
-				}
-				
-				$day = substr($day, -2, 2);
-				switch($day)
-				{
-					case 'SU':
-						$this->byday[] = $occ . 'SU';
-						break;
-					case 'MO':
-						$this->byday[] = $occ . 'MO';
-						break;
-					case 'TU':
-						$this->byday[] = $occ . 'TU';
-						break;
-					case 'WE':
-						$this->byday[] = $occ . 'WE';
-						break;
-					case 'TH':
-						$this->byday[] = $occ . 'TH';
-						break;
-					case 'FR':
-						$this->byday[] = $occ . 'FR';
-						break;
-					case 'SA':
-						$this->byday[] = $occ . 'SA';
-						break;
-				}
-			}
-		}
-		
-		return $this;
-	}
-	
-	public function byyearday($days)
-	{
-		$this->gobyyearday = true;
-		
-		if(is_array($days))
-		{
-			$this->byyearday = $days;
-		}
-		
-		return $this;
-	}
-	
-	// this creates a basic list of dates to "try"
-	protected function create_suggestions()
-	{
-		switch($this->frequency)
-		{
-			case "YEARLY":
-				$interval = 'year';
-				break;
-			case "MONTHLY":
-				$interval = 'month';
-				break;
-			case "WEEKLY":
-				$interval = 'week';
-				break;
-			case "DAILY":
-				$interval = 'day';
-				break;
-			case "HOURLY":
-				$interval = 'hour';
-				break;
-			case "MINUTELY":
-				$interval = 'minute';
-				break;
-			case "SECONDLY":
-				$interval = 'second';
-				break;
-		}
-					
-		$month_day = $this->try_date->format('j');
-		$month = $this->try_date->format('n');
-		$year = $this->try_date->format('Y');
-		
-		$timestamp = $this->try_date->format('H:i:s');
-					
-		if($this->gobysetpos)
-		{				
-			if($this->try_date == $this->start_date)
-			{
-				$this->suggestions[] = clone $this->try_date;
-			}
-			else
-			{
-				if($this->gobyday)
-				{
-					foreach($this->bysetpos as $_pos)
-					{
-						$tmp_array = array();
-						$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
-						foreach($_mdays as $_mday)
-						{
-							$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
-							
-							$occur = ceil($_mday / 7);
-							
-							$day_of_week = $date_time->format('l');
-							$dow_abr = strtoupper(substr($day_of_week, 0, 2));
-							
-							// set the day of the month + (positive)
-							$occur = '+' . $occur . $dow_abr;
-							$occur_zero = '+0' . $dow_abr;
-							
-							// set the day of the month - (negative)
-							$total_days = $date_time->format('t') - $date_time->format('j');
-							$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
-							
-							$day_from_end_of_month = $date_time->format('t') + 1 - $_mday;
-							
-							if(in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday))
-							{								
-								$tmp_array[] = clone $date_time;
-							}
-						}
-						
-						if($_pos > 0)
-						{
-							$this->suggestions[] = clone $tmp_array[$_pos - 1];
-						}
-						else
-						{
-							$this->suggestions[] = clone $tmp_array[count($tmp_array) + $_pos];
-						}
-						
-					}
-				}
-			}
-		}
-		elseif($this->gobyyearday)
-		{
-			foreach($this->byyearday as $_day)
-			{
-				if($_day >= 0)
-				{
-					$_day--;
-					
-					$_time = strtotime('+' . $_day . ' days', mktime(0, 0, 0, 1, 1, $year));
-					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
-				}
-				else
-				{
-					$year_day_neg = 365 + $_day;
-					$leap_year = $this->try_date->format('L');
-					if($leap_year == 1)
-					{
-						$year_day_neg = 366 + $_day;
-					}
-					
-					$_time = strtotime('+' . $year_day_neg . ' days', mktime(0, 0, 0, 1, 1, $year));
-					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
-				}					
-			}
-		}
-		// special case because for years you need to loop through the months too
-		elseif($this->gobyday && $interval == "year")
-		{
-			foreach($this->bymonth as $_month)
-			{
-				// this creates an array of days of the month
-				$_mdays = range(1, date('t',mktime(0,0,0,$_month,1,$year)));
-				foreach($_mdays as $_mday)
-				{
-					$date_time = new DateTime($year . '-' . $_month . '-' . $_mday . ' ' . $timestamp);
-					
-					// get the week of the month (1, 2, 3, 4, 5, etc)
-					$week = $date_time->format('W');
-					
-					if($date_time >= $this->start_date && in_array($week, $this->byweekno))
-					{
-						$this->suggestions[] = clone $date_time;
-					}
-				}
-			}
-		}
-		elseif($interval == "day")
-		{
-			$this->suggestions[] = clone $this->try_date;
-		}
-		elseif($interval == "week")
-		{
-			$this->suggestions[] = clone $this->try_date;
-			
-			if($this->gobyday)
-			{
-				$week_day = $this->try_date->format('w');
-				
-				$days_in_month = $this->try_date->format('t');
-				
-				$overflow_count = 1;
-				$_day = $month_day;
-				
-				$run = true;
-				while($run)
-				{
-					$_day++;
-					if($_day <= $days_in_month)
-					{
-						$tmp_date = new DateTime($year . '-' . $month . '-' . $_day . ' ' . $timestamp);
-					}
-					else
-					{
-						//$tmp_month = $month+1;
-						$tmp_date = new DateTime($year . '-' . $month . '-' . $overflow_count . ' ' . $timestamp);
-						$tmp_date->modify('+1 month');
-						$overflow_count++;
-					}
-					
-					$week_day = $tmp_date->format('w');
-					
-					if($this->try_date == $this->start_date)
-					{
-						if($week_day == $this->wkst)
-						{
-							$this->try_date = clone $tmp_date;
-							$this->try_date->modify('-7 days');
-							$run = false;
-						}
-					}
-
-					if($week_day != $this->wkst)
-					{
-						$this->suggestions[] = clone $tmp_date;
-					}
-					else
-					{
-						$run = false;
-					}
-				}
-			}
-		}
-		elseif($this->gobyday || $interval == "month")
-		{
-			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
-			foreach($_mdays as $_mday)
-			{
-				$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
-				
-				// get the week of the month (1, 2, 3, 4, 5, etc)
-				$week = $date_time->format('W');
-				
-				if($date_time >= $this->start_date && in_array($week, $this->byweekno))
-				{
-					$this->suggestions[] = clone $date_time;
-				}
-			}
-		}
-		elseif($this->gobymonth)
-		{
-			foreach($this->bymonth as $_month)
-			{
-				$date_time = new DateTime($year . '-' . $_month . '-' . $month_day . ' ' . $timestamp);
-				
-				if($date_time >= $this->start_date)
-				{
-					$this->suggestions[] = clone $date_time;
-				}
-			}
-		} 
-		else 
-		{
-			$this->suggestions[] = clone $this->try_date;
-		}
-		
-		if($interval == "month")
-		{
-			$this->try_date->modify('last day of ' . $this->interval . ' ' . $interval);
-		}
-		else
-		{
-			$this->try_date->modify($this->interval . ' ' . $interval);
-		}
-	}
-	
-	protected function valid_date($date)
-	{
-		$year = $date->format('Y');
-		$month = $date->format('n');
-		$day = $date->format('j');
-		
-		$year_day = $date->format('z') + 1;
-		
-		$year_day_neg = -366 + $year_day;
-		$leap_year = $date->format('L');
-		if($leap_year == 1)
-		{
-			$year_day_neg = -367 + $year_day;
-		}
-		
-		// this is the nth occurence of the date
-		$occur = ceil($day / 7);
-		
-		$week = $date->format('W');
-		
-		$day_of_week = $date->format('l');
-		$dow_abr = strtoupper(substr($day_of_week, 0, 2));
-		
-		// set the day of the month + (positive)
-		$occur = '+' . $occur . $dow_abr;
-		$occur_zero = '+0' . $dow_abr;
-		
-		// set the day of the month - (negative)
-		$total_days = $date->format('t') - $date->format('j');
-		$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
-		
-		$day_from_end_of_month = $date->format('t') + 1 - $day;
-		
-		if(in_array($month, $this->bymonth) && 
-		   (in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday)) && 
-		   in_array($week, $this->byweekno) &&
-		   (in_array($day, $this->bymonthday) || in_array(-$day_from_end_of_month, $this->bymonthday)) &&
-		   (in_array($year_day, $this->byyearday) || in_array($year_day_neg, $this->byyearday)))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	// return the next valid DateTime object which matches the pattern and follows the rules
-	public function next()
-	{		
-		// check the counter is set
-		if($this->count !== 0)
-		{
-			if($this->counter >= $this->count)
-			{
-				return false;
-			}
-		}
-		
-		// create initial set of suggested dates
-		if(count($this->suggestions) === 0)
-		{
-			$this->create_suggestions();
-		}
-		
-		// loop through the suggested dates
-		while(count($this->suggestions) > 0)
-		{
-			// get the first one on the array
-			$try_date = array_shift($this->suggestions);
-			
-			// make sure the date doesn't exceed the max date
-			if($try_date > $this->end_date)
-			{
-				return false;
-			}
-			
-			// make sure it falls within the allowed days
-			if($this->valid_date($try_date) === true)
-			{
-				$this->counter++;
-				return $try_date;
-			}
-			else
-			{
-				// we might be out of suggested days, so load some more
-				if(count($this->suggestions) === 0)
-				{
-					$this->create_suggestions();
-				}
-			}
-		}
-	}
-}

From 0a49bae87aecef9f6d51007fe02a5071b2f662a4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 8 Jun 2012 20:38:06 +0200
Subject: [PATCH 0239/1537] Contacts: Closed stupid XSS hole. Thanks
 AnybodyElse ;-)

---
 apps/contacts/ajax/uploadphoto.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 09c4e55d4a..32abc6c285 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -59,7 +59,7 @@ if ($fn) {
 			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey.$data);
+		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey);
 	}
 }
 

From 7c5c257bf69f77cea599bdf641676977009ee162 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 16:39:21 +0200
Subject: [PATCH 0240/1537] Comment layout and spelling fixes

---
 lib/connector/sabre/node.php |  6 ++++--
 lib/fileproxy.php            | 15 +++++++++------
 lib/filesystem.php           |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index a7d1de8b95..bb367a18c4 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -137,7 +137,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	/**
 	 * Returns a list of properties for this nodes.;
 	 *
-	 * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
+	 * The properties list is a list of propertynames the client requested,
+	 * encoded as xmlnamespace#tagName, for example:
+	 * http://www.example.org/namespace#author
 	 * If the array is empty, all properties should be returned
 	 *
 	 * @param array $properties
@@ -153,11 +155,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 			$existing[$row['propertyname']] = $row['propertyvalue'];
 		}
 
+		// if the array was empty, we need to return everything
 		if(count($properties) == 0){
 			return $existing;
 		}
 		
-		// if the array was empty, we need to return everything
 		$props = array();
 		foreach($properties as $property) {
 			if (isset($existing[$property])) $props[$property] = $existing[$property];
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 70db9cca23..180284f73d 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -27,14 +27,17 @@
  * Manipulation happens by using 2 kind of proxy operations, pre and post proxies
  * that manipulate the filesystem call and the result of the call respectively
  *
- * A pre-proxy recieves the filepath as arugments (or 2 filespaths in case of operations like copy or move) and return a boolean
- * If a pre-proxy returnes false the file operation will be canceled
+ * A pre-proxy recieves the filepath as arugments (or 2 filespaths in case of
+ * operations like copy or move) and return a boolean
+ * If a pre-proxy returns false the file operation will be canceled
  * All filesystem operations have a pre-proxy
  *
  * A post-proxy recieves 2 arguments, the filepath and the result of the operation.
- * The return calue of the post-proxy will be used as the new result of the operation
- * The operations that have a post-proxy are
- * file_get_contents, is_file, is_dir, file_exists, stat, is_readable, is_writable, fileatime, filemtime, filectime, file_get_contents, getMimeType, hash, fopen, free_space and search
+ * The return value of the post-proxy will be used as the new result of the operation
+ * The operations that have a post-proxy are:
+ * file_get_contents, is_file, is_dir, file_exists, stat, is_readable,
+ * is_writable, fileatime, filemtime, filectime, file_get_contents,
+ * getMimeType, hash, fopen, free_space and search
  */
 
 class OC_FileProxy{
@@ -51,7 +54,7 @@ class OC_FileProxy{
 	}
 	
 	/**
-	 * fallback function when a proxy operation is not implement
+	 * fallback function when a proxy operation is not implemented
 	 * @param string $function the name of the proxy operation
 	 * @param mixed
 	 *
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 84d45f5f24..43d743b639 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -281,7 +281,7 @@ class OC_Filesystem{
 	}
 	
 	/**
-	* change the root to a fake toor
+	* change the root to a fake root
 	* @param  string  fakeRoot
 	* @return bool
 	*/

From d9d6876be9bbf32c39f676e3d6cbab85e57abd34 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 20:26:08 +0200
Subject: [PATCH 0241/1537] Add stat cache to OC_Connector_Sabre_Node and
 OC_Connector_Sabre_File

Speeds up access of directories with large number of files.
---
 lib/connector/sabre/file.php |  4 ++--
 lib/connector/sabre/node.php | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index f2efe0a5ac..3ba1b3355f 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -63,8 +63,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * @return int
 	 */
 	public function getSize() {
-	
-		return OC_Filesystem::filesize($this->path);
+		$this->stat();
+		return $this->stat_cache['size'];
 
 	}
 
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index bb367a18c4..e7bcea3171 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -29,6 +29,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @var string
 	 */
 	protected $path;
+	/**
+	 * file stat cache
+	 * @var array
+	 */
+	protected $stat_cache;
 
 	/**
 	 * Sets up the node, expects a full path name
@@ -77,7 +82,14 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	}
 
-
+	/**
+	 * Set the stat cache
+	 */
+	protected function stat() {
+		if (!isset($this->stat_cache)) {
+			$this->stat_cache = OC_Filesystem::stat($this->path);
+		}
+	}
 
 	/**
 	 * Returns the last modification time, as a unix timestamp
@@ -85,8 +97,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @return int
 	 */
 	public function getLastModified() {
-
-		return OC_Filesystem::filemtime($this->path);
+		$this->stat();
+		return $this->stat_cache['mtime'];
 
 	}
 

From 6af980c20c99e31629f283dae39161ece8a415fc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 20:47:11 +0200
Subject: [PATCH 0242/1537] Add cache for getStorage and getInternalPath
 functions.

These are called for almost every file operation.
---
 lib/filesystemview.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index c8df59cf82..8aa7b49f41 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -40,6 +40,8 @@
 
 class OC_FilesystemView {
 	private $fakeRoot='';
+	private $internal_path_cache=array();
+	private $storage_cache=array();
 
 	public function __construct($root){
 		$this->fakeRoot=$root;
@@ -84,7 +86,10 @@ class OC_FilesystemView {
 	* @return bool
 	*/
 	public function getInternalPath($path){
-		return OC_Filesystem::getInternalPath($this->getAbsolutePath($path));
+		if (!isset($this->internal_path_cache[$path])) {
+			$this->internal_path_cache[$path] = OC_Filesystem::getInternalPath($this->getAbsolutePath($path));
+		}
+		return $this->internal_path_cache[$path];
 	}
 	/**
 	* get the storage object for a path
@@ -92,7 +97,10 @@ class OC_FilesystemView {
 	* @return OC_Filestorage
 	*/
 	public function getStorage($path){
-		return OC_Filesystem::getStorage($this->getAbsolutePath($path));
+		if (!isset($this->storage_cache[$path])) {
+			$this->storage_cache[$path] = OC_Filesystem::getStorage($this->getAbsolutePath($path));
+		}
+		return $this->storage_cache[$path];
 	}
 
 	/**

From b9a152450837c90ab3463c0d00ff05219d4b875e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 21:08:38 +0200
Subject: [PATCH 0243/1537] Smarter code for OC_FileProxy

---
 lib/fileproxy.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 180284f73d..82c9298788 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -44,15 +44,6 @@ class OC_FileProxy{
 	private static $proxies=array();
 	public static $enabled=true;
 	
-	/**
-	 * check if this proxy implments a specific proxy operation
-	 * @param string #proxy name of the proxy operation
-	 * @return bool
-	 */
-	public function provides($operation){
-		return method_exists($this,$operation);
-	}
-	
 	/**
 	 * fallback function when a proxy operation is not implemented
 	 * @param string $function the name of the proxy operation
@@ -76,11 +67,10 @@ class OC_FileProxy{
 		self::$proxies[]=$proxy;
 	}
 	
-	public static function getProxies($operation,$post){
-		$operation=(($post)?'post':'pre').$operation;
+	public static function getProxies($operation){
 		$proxies=array();
 		foreach(self::$proxies as $proxy){
-			if($proxy->provides($operation)){
+			if(method_exists($proxy,$operation)){
 				$proxies[]=$proxy;
 			}
 		}
@@ -91,8 +81,8 @@ class OC_FileProxy{
 		if(!self::$enabled){
 			return true;
 		}
-		$proxies=self::getProxies($operation,false);
 		$operation='pre'.$operation;
+		$proxies=self::getProxies($operation);
 		foreach($proxies as $proxy){
 			if(!is_null($filepath2)){
 				if($proxy->$operation($filepath,$filepath2)===false){
@@ -111,8 +101,8 @@ class OC_FileProxy{
 		if(!self::$enabled){
 			return $result;
 		}
-		$proxies=self::getProxies($operation,true);
 		$operation='post'.$operation;
+		$proxies=self::getProxies($operation);
 		foreach($proxies as $proxy){
 			$result=$proxy->$operation($path,$result);
 		}

From ac365121022f8b03ac47c41f8b3e32f9ba3f90e6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 21:23:25 +0200
Subject: [PATCH 0244/1537] Don't use substr to get first char of string

---
 apps/files_archive/lib/storage.php |  2 +-
 apps/files_external/lib/ftp.php    |  2 +-
 apps/files_external/lib/smb.php    |  8 ++++----
 apps/files_external/lib/swift.php  |  2 +-
 apps/files_external/lib/webdav.php |  4 ++--
 apps/user_ldap/lib_ldap.php        |  4 ++--
 lib/app.php                        |  2 +-
 lib/archive/tar.php                |  4 ++--
 lib/archive/zip.php                |  2 +-
 lib/filesystem.php                 | 10 +++++-----
 lib/filesystemview.php             |  2 +-
 lib/installer.php                  |  2 +-
 lib/user/database.php              |  2 +-
 tests/index.php                    |  2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index b8f7d46838..8676166361 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -18,7 +18,7 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 	private static $rootView;
 	
 	private function stripPath($path){//files should never start with /
-		if(substr($path,0,1)=='/'){
+		if(!$path || $path[0]=='/'){
 			$path=substr($path,1);
 		}
 		return $path;
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index e9655ebf3a..4d5ae670de 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -21,7 +21,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 		$this->password=$params['password'];
 		$this->secure=isset($params['secure'])?(bool)$params['secure']:false;
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(substr($this->root,0,1)!='/'){
+		if(!$this->root || $this->root[0]!='/'){
 			$this->root='/'.$this->root;
 		}
 		
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index f594fbb880..9112655194 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -23,13 +23,13 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 		$this->password=$params['password'];
 		$this->share=$params['share'];
 		$this->root=isset($params['root'])?$params['root']:'/';
+		if(!$this->root || $this->root[0]!='/'){
+			$this->root='/'.$this->root;
+		}
 		if(substr($this->root,-1,1)!='/'){
 			$this->root.='/';
 		}
-		if(substr($this->root,0,1)!='/'){
-			$this->root='/'.$this->root;
-		}
-		if(substr($this->share,0,1)!='/'){
+		if(!$this->share || $this->share[0]!='/'){
 			$this->share='/'.$this->share;
 		}
 		if(substr($this->share,-1,1)=='/'){
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index e3ba9c240c..58b95a6ae0 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -269,7 +269,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		$this->user=$params['user'];
 		$this->root=isset($params['root'])?$params['root']:'/';
 		$this->secure=isset($params['secure'])?(bool)$params['secure']:true;
-		if(substr($this->root,0,1)!='/'){
+		if(!$this->root || $this->root[0]!='/'){
 			$this->root='/'.$this->root;
 		}
 		$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 07c90d4878..d136f04f3e 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -25,7 +25,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$this->password=$params['password'];
 		$this->secure=isset($params['secure'])?(bool)$params['secure']:false;
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(substr($this->root,0,1)!='/'){
+		if(!$this->root || $this->root[0]!='/'){
 			$this->root='/'.$this->root;
 		}
 		if(substr($this->root,-1,1)!='/'){
@@ -273,7 +273,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	}
 
 	private function cleanPath($path){
-		if(substr($path,0,1)=='/'){
+		if(!$path || $path[0]=='/'){
 			return substr($path,1);
 		}else{
 			return $path;
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 22d464b65a..befdf267bc 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -576,7 +576,7 @@ class OC_LDAP {
 	static private function combineFilter($filters, $operator) {
 		$combinedFilter = '('.$operator;
 		foreach($filters as $filter) {
-		    if(substr($filter,0,1) != '(') {
+		    if($filter[0] != '(') {
 				$filter = '('.$filter.')';
 		    }
 		    $combinedFilter.=$filter;
@@ -692,4 +692,4 @@ class OC_LDAP {
 		return false;
 	}
 
- }
\ No newline at end of file
+ }
diff --git a/lib/app.php b/lib/app.php
index e8a5a1291d..0c51e3c553 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -469,7 +469,7 @@ class OC_App{
 		$apps=array();
 		$dh=opendir(OC::$APPSROOT.'/apps');
 		while($file=readdir($dh)){
-			if(substr($file,0,1)!='.' and is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
+			if($file[0]!='.' and is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
 				$apps[]=$file;
 			}
 		}
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 4ff7877983..944a0ac4ba 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -150,7 +150,7 @@ class OC_Archive_TAR extends OC_Archive{
 		$folderContent=array();
 		$pathLength=strlen($path);
 		foreach($files as $file){
-			if(substr($file,0,1)=='/'){
+			if($file[0]=='/'){
 				$file=substr($file,1);
 			}
 			if(substr($file,0,$pathLength)==$path and $file!=$path){
@@ -241,7 +241,7 @@ class OC_Archive_TAR extends OC_Archive{
 				}
 			}
 		}
-		if(substr($path,0,1)!='/'){//not all programs agree on the use of a leading /
+		if($path[0]!='/'){//not all programs agree on the use of a leading /
 			return $this->fileExists('/'.$path);
 		}else{
 			return false;
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 22ab48937e..6631a649b1 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -191,7 +191,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	}
 
 	private function stripPath($path){
-		if(substr($path,0,1)=='/'){
+		if(!$path || $path[0]=='/'){
 			return substr($path,1);
 		}else{
 			return $path;
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 43d743b639..337b0f1464 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -150,7 +150,7 @@ class OC_Filesystem{
 		if(!$path){
 			$path='/';
 		}
-		if(substr($path,0,1)!=='/'){
+		if($path[0]!=='/'){
 			$path='/'.$path;
 		}
 		$foundMountPoint='';
@@ -313,12 +313,12 @@ class OC_Filesystem{
 	* @param string mountpoint
 	*/
 	static public function mount($class,$arguments,$mountpoint){
+		if($mountpoint[0]!='/'){
+			$mountpoint='/'.$mountpoint;
+		}
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
-		if(substr($mountpoint,0,1)!=='/'){
-			$mountpoint='/'.$mountpoint;
-		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
 
@@ -349,7 +349,7 @@ class OC_Filesystem{
 	 * @return bool
 	 */
 	static public function isValidPath($path){
-		if(substr($path,0,1)!=='/'){
+		if(!$path || $path[0]!=='/'){
 			$path='/'.$path;
 		}
 		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 8aa7b49f41..6e34257a46 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -51,7 +51,7 @@ class OC_FilesystemView {
 		if(!$path){
 			$path='/';
 		}
-		if(substr($path,0,1)!=='/'){
+		if($path[0]!=='/'){
 			$path='/'.$path;
 		}
 		return $this->fakeRoot.$path;
diff --git a/lib/installer.php b/lib/installer.php
index 5c030d2917..34c6f8c7bb 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -110,7 +110,7 @@ class OC_Installer{
 			//try to find it in a subdir
 			$dh=opendir($extractDir);
 			while($folder=readdir($dh)){
-				if(substr($folder,0,1)!='.' and is_dir($extractDir.'/'.$folder)){
+				if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)){
 					if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')){
 						$extractDir.='/'.$folder;
 					}
diff --git a/lib/user/database.php b/lib/user/database.php
index bb077c8364..a48b8357d6 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -129,7 +129,7 @@ class OC_User_Database extends OC_User_Backend {
 		$row=$result->fetchRow();
 		if($row){
 			$storedHash=$row['password'];
-			if (substr($storedHash,0,1)=='$'){//the new phpass based hashing
+			if ($storedHash[0]=='$'){//the new phpass based hashing
 				$hasher=$this->getHasher();
 				if($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash)){
 					return $row['uid'];
diff --git a/tests/index.php b/tests/index.php
index 9c5178f81a..691bf2a5d4 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -47,7 +47,7 @@ function loadTests($dir=''){
 	}
 	if($dh=opendir($dir)){
 		while($name=readdir($dh)){
-			if(substr($name,0,1)!='.'){//no hidden files, '.' or '..'
+			if($name[0]!='.'){//no hidden files, '.' or '..'
 				$file=$dir.'/'.$name;
 				if(is_dir($file)){
 					loadTests($file);

From 9e434dea605b029d56f1bed01d87c26a0c7f4ebb Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 8 Jun 2012 20:26:17 +0200
Subject: [PATCH 0245/1537] tabs for spaces, removing thumbnail on file removal

---
 apps/gallery/appinfo/app.php        |   2 +
 apps/gallery/css/styles.css         |  18 +--
 apps/gallery/index.php              |   3 +
 apps/gallery/js/album_cover.js      | 138 -------------------
 apps/gallery/lib/hooks_handlers.php | 198 +++++++++++++---------------
 apps/gallery/lib/managers.php       |   2 +-
 apps/gallery/lib/tiles.php          |   4 +-
 apps/gallery/templates/index.php    |   9 +-
 8 files changed, 108 insertions(+), 266 deletions(-)
 delete mode 100644 apps/gallery/js/album_cover.js

diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index e1db33eb31..2aa6a9e8f9 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -26,6 +26,8 @@ OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
 OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
 OC::$CLASSPATH['OC_Gallery_Sharing'] = 'apps/gallery/lib/sharing.php';
 OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php';
+OC::$CLASSPATH['Pictures_Managers'] = 'apps/gallery/lib/managers.php';
+OC::$CLASSPATH['Pictures_Tiles'] = 'apps/gallery/lib/tiles.php';
 
 $l = OC_L10N::get('gallery');
 
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index fbf54e43db..98d3651549 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,20 +1,6 @@
-div#gallery_list { margin: 4.5em 2em 0 2em; }
-div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: auto; }
-div.gallery_box { width: 200px; position:relative; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 5px 5px 5px 5px; position: relative; -webkit-transition: color 0.5s ease-in-out; -o-transition: color 0.5s ease-in-out; -moz-transition: color 0.5s ease-in-out;color: #BBB;}
-div.album {border: 1px solid #e0e0e0; border-radius: 7px;}
-div.gallery_box h1 { font-size: 9pt; font-family: Verdana; }
-div.gallery_album_decoration { width: 200px; position: absolute; border: 0; height: 20px; top: 5px; text-align:right; vertical-align:middle; background-color: #eee; opacity: 0; -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; }
-div.gallery_box:hover { color: black; }
-div.gallery_box:hover div.gallery_album_decoration { opacity: 0.7;}
-div.gallery_album_decoration a {padding: 0 4pt; cursor: pointer;}
-div.gallery_album_cover { width: 200px; height: 200px; border: 0; padding: 0; position:relative;}
-div.gallery_box:hover div.gallery_control_overlay { opacity:0.5 }
-div.gallery_control_overlay a { color:white; }
-#gallery_images.rightcontent { padding:10px 5px; bottom: 0px; overflow: auto; right:0px}
-#scan { position:absolute; right:13.5em; top:0em; }
-#scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
+#gallerycontent { margin-top: 2.8em; overflow: visible; }
 #g-settings {position: absolute; left 13.5em; top: 0;}
-input[type=button] { -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; opacity: 1}
+div#controls input[type=button] { -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; opacity: 1; position:absolute; right:13.5em; top:0em; }
 input[type=button]:disabled { opacity: 0.5 }
 .ui-dialog tr {background-color: #eee;}
 .ui-dialog input {width: 90%;}
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 9d4654a7cc..740f4bf04f 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -27,6 +27,9 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
+OCP\Util::addStyle('gallery', 'styles');
+OCP\Util::addScript('gallery', 'pictures');
+
 $tmpl = new OCP\Template( 'gallery', 'index', 'user' );
 $tmpl->printPage();
 ?>
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
deleted file mode 100644
index 905034f6fd..0000000000
--- a/apps/gallery/js/album_cover.js
+++ /dev/null
@@ -1,138 +0,0 @@
-var actual_cover;
-var paths = [];
-var crumbCount = 0;
-$(document).ready(returnToElement(0));
-
-function returnToElement(num) {
-	while (crumbCount != num) {
-		$('#g-album-navigation .last').remove();
-		$('#g-album-navigation .crumb :last').parent().addClass('last');
-		crumbCount--;
-		paths.pop();
-	}
-	var p='';
-	for (var i in paths) p += paths[i]+'/';
-	$('#g-album-loading').show();
-	$.getJSON(OC.filePath('gallery','ajax','galleryOp.php'), {operation: 'get_gallery', path: p }, albumClickHandler);
-}
-
-function albumClick(title) {
-	paths.push(title);
-	crumbCount++;
-	var p = '';
-	for (var i in paths) p += paths[i]+'/';
-	$('#g-album-loading').show();
-	$.getJSON(OC.filePath('gallery','ajax','galleryOp.php'), {operation: 'get_gallery', path: p }, function(r) {
-		albumClickHandler(r);
-	if ($('#g-album-navigation :last-child'))
-		$('#g-album-navigation :last-child').removeClass('last');
-	$('#g-album-navigation').append('<div class="crumb last real" style="background-image:url(\''+OC.imagePath('core','breadcrumb')+'\')"><a href=\"javascript:returnToElement('+crumbCount+');\">'+decodeURIComponent(escape(title))+'</a></div>');
-	});
-}
-
-function constructSharingPath() {
-  return document.location.protocol + '//' + document.location.host + OC.linkTo('', 'public.php') + '?service=gallery&token=' + Albums.token;
-}
-
-function shareGallery() {
-  var existing_token = '';
-  if (Albums.token)
-    existing_token = constructSharingPath();
-  var form_fields = [{text: 'Share', name: 'share', type: 'checkbox', value: Albums.shared},
-                     {text: 'Share recursive', name: 'recursive', type: 'checkbox', value: Albums.recursive},
-                     {text: 'Shared gallery address', name: 'address', type: 'text', value: existing_token}];
-    OC.dialogs.form(form_fields, t('gallery', 'Share gallery'), function(values){
-    var p = '';
-    for (var i in paths) p += paths[i]+'/';
-    if (p == '') p = '/';
-    alert(p);
-    $.getJSON(OC.filePath('gallery', 'ajax', 'galleryOp.php'), {operation: 'share', path: p, share: values[0].value, recursive: values[1].value}, function(r) {
-      if (r.status == 'success') {
-        Albums.shared = r.sharing;
-        if (Albums.shared) {
-          Albums.token = r.token;
-          Albums.recursive = r.recursive;
-        } else {
-          Albums.token = '';
-          Albums.recursive = false;
-        }
-        var actual_addr = '';
-        if (Albums.token)
-          actual_addr = constructSharingPath();
-        $('input[name="address"]').val(actual_addr);
-      } else {
-        OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Internal error'));
-      }
-    });
-  });
-}
-
-function albumClickHandler(r) {
-	Albums.photos = [];
-	Albums.albums = [];
-	if (r.status == 'success') {
-		for (var i in r.albums) {
-		var a = r.albums[i];
-			Albums.add(a.name, a.numOfItems, a.path, a.shared, a.recursive, a.token);
-		}
-		for (var i in r.photos) {
-			Albums.photos.push(r.photos[i]);
-		}
-		Albums.shared = r.shared;
-		if (Albums.shared) {
-			Albums.recursive = r.recursive;
-			Albums.token = r.token;
-		} else {
-			Albums.recursive = false;
-			Albums.token = '';
-		}
-		$(document).ready(function(){
-			var targetDiv = $('#gallery_list');
-			targetDiv.html('');
-			Albums.display(targetDiv);
-			//$('#gallery_list').sortable({revert:true});
-			$('.album').each(function(i, el) {
-				$(el).click(albumClick.bind(null,$(el).attr('title')));
-				//$(el).draggable({connectToSortable: '#gallery_list', handle: '.dummy'});
-			});
-		});
-	} else {
-		OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Internal error'));
-	}
-	$('#g-album-loading').hide();
-}
-
-var albumCounter = 0;
-var totalAlbums = 0;
-
-function scanForAlbums(cleanup) {
-	Scanner.scanAlbums();
-	return;
-}
-
-function settings() {
-  OC.dialogs.form([{text: t('gallery', 'Scanning root'), name: 'root', type:'text', value:gallery_scanning_root},
-                  {text: t('gallery', 'Default order'), name: 'order', type:'select', value:gallery_default_order, options:[
-                      {text:t('gallery', 'Ascending'), value:'ASC'}, {text: t('gallery', 'Descending'), value:'DESC'} ]}],
-                  t('gallery', 'Settings'),
-                  function(values) {
-                    var scanning_root = values[0].value;
-                    var disp_order = values[1].value;
-					if (scanning_root == '') {
-            OC.dialogs.alert(t('gallery', 'Scanning root cannot be empty'), t('gallery', 'Error'));
-						return;
-					}
-					$.getJSON(OC.filePath('gallery','ajax','galleryOp.php'), {operation: 'store_settings', root: scanning_root, order: disp_order}, function(r) {
-						if (r.status == 'success') {
-              if (r.rescan == 'yes') {
-                Albums.clear(document.getElementById('gallery_list'));
-                scanForAlbums(true);
-              }
-              gallery_scanning_root = scanning_root;
-						} else {
-              OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Error'));
-              return;
-						}
-					});
-				});
-}
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 6391e9f4e5..30c4b50577 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -13,136 +13,120 @@
 * 
 * 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
+* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* License along with this library.	If not, see <http://www.gnu.org/licenses/>.
 * 
 */
 
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OC_Gallery_Hooks_Handlers", "addPhotoFromPath");
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, "OC_Gallery_Hooks_Handlers", "removePhoto");
 //OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, "OC_Gallery_Hooks_Handlers", "renamePhoto");
 
-require_once(OC::$CLASSPATH['OC_Gallery_Album']);
-require_once(OC::$CLASSPATH['OC_Gallery_Photo']);
+require_once(OC::$CLASSPATH['Pictures_Managers']);
 
 class OC_Gallery_Hooks_Handlers {
-  private static $APP_TAG = "Gallery";
+	private static $APP_TAG = "Gallery";
 
-  private static function isPhoto($filename) {
-    $ext = strtolower(substr($filename, strrpos($filename, '.')+1));
-    return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
-  }
+	private static function isPhoto($filename) {
+		$ext = strtolower(substr($filename, strrpos($filename, '.')+1));
+		return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
+	}
 
-  private static function directoryContainsPhotos($dirpath) {
-    $dirhandle = OC_Filesystem::opendir($dirpath.'/');
-    if ($dirhandle != FALSE) {
-      while (($filename = readdir($dirhandle)) != FALSE) {
-        if ($filename[0] == '.') continue;
-        if (self::isPhoto($dirpath.'/'.$filename)) return true;
-      }
-    }
-    return false;
-  }
+	private static function directoryContainsPhotos($dirpath) {
+		$dirhandle = OC_Filesystem::opendir($dirpath.'/');
+		if ($dirhandle != FALSE) {
+			while (($filename = readdir($dirhandle)) != FALSE) {
+				if ($filename[0] == '.') continue;
+				if (self::isPhoto($dirpath.'/'.$filename)) return true;
+			}
+		}
+		return false;
+	}
 
-  private static function createAlbum($path) {
-    $new_album_name = trim(str_replace('/', '.', $path), '.');
-    if ($new_album_name == '')
-      $new_album_name = 'main';
+	private static function createAlbum($path) {
+		$new_album_name = trim(str_replace('/', '.', $path), '.');
+		if ($new_album_name == '')
+			$new_album_name = 'main';
 
-    OCP\Util::writeLog(self::$APP_TAG, 'Creating new album '.$new_album_name, OCP\Util::DEBUG);
-    OC_Gallery_Album::create(OCP\USER::getUser(), $new_album_name, $path);
+		OCP\Util::writeLog(self::$APP_TAG, 'Creating new album '.$new_album_name, OCP\Util::DEBUG);
+		OC_Gallery_Album::create(OCP\USER::getUser(), $new_album_name, $path);
 
-    return OC_Gallery_Album::find(OCP\USER::getUser(), null, $path);
-  }
+		return OC_Gallery_Album::find(OCP\USER::getUser(), null, $path);
+	}
 
-  public static function pathInRoot($path) {
-    $root = OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '/');
-    return substr($path, 0, strlen($path)>strlen($root)?strlen($root):strlen($path)) == $root;
-  }
+	public static function pathInRoot($path) {
+		$root = OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '/');
+		return substr($path, 0, strlen($path)>strlen($root)?strlen($root):strlen($path)) == $root;
+	}
 
-  public static function addPhotoFromPath($params) {
-    $fullpath = $params[OC_Filesystem::signal_param_path];
-    $fullpath = rtrim(dirname($fullpath),'/').'/'.basename($fullpath);
+	public static function addPhotoFromPath($params) {
+		$fullpath = $params[OC_Filesystem::signal_param_path];
+		$fullpath = rtrim(dirname($fullpath),'/').'/'.basename($fullpath);
 
-    if (!self::isPhoto($fullpath)) return;
+		if (!self::isPhoto($fullpath)) return;
 
-    $a = OC_Gallery_Album::find(OCP\USER::getUser(), null, dirname($fullpath));
-    if (!($r = $a->fetchRow())) {
-      OC_Gallery_Album::create(OCP\USER::getUser(), basename(dirname($fullpath)), dirname($fullpath));
-      $a = OC_Gallery_Album::find(OCP\USER::getUser(), null, dirname($fullpath));
-      $r = $a->fetchRow();
-    }
-    $albumId = $r['album_id'];
-    $p = OC_Gallery_Album::find($albumId, $fullpath);
-    if (!($p->fetchRow()))
-      OC_Gallery_Photo::create($albumId, $fullpath);
-  }
+		$a = OC_Gallery_Album::find(OCP\USER::getUser(), null, dirname($fullpath));
+		if (!($r = $a->fetchRow())) {
+			OC_Gallery_Album::create(OCP\USER::getUser(), basename(dirname($fullpath)), dirname($fullpath));
+			$a = OC_Gallery_Album::find(OCP\USER::getUser(), null, dirname($fullpath));
+			$r = $a->fetchRow();
+		}
+		$albumId = $r['album_id'];
+		$p = OC_Gallery_Album::find($albumId, $fullpath);
+		if (!($p->fetchRow()))
+			OC_Gallery_Photo::create($albumId, $fullpath);
+	}
 
-  public static function removePhoto($params) {
-    $fullpath = $params[OC_Filesystem::signal_param_path];
-    $fullpath = rtrim(dirname($fullpath),'/').'/'.basename($fullpath);
+	public static function removePhoto($params) {
+		\OC\Pictures\ThumbnailsManager::getInstance()->delete($params[OC_Filesystem::signal_param_path]);
+	}
 
-    if (OC_Filesystem::is_dir($fullpath)) {
-      OC_Gallery_Album::remove(OCP\USER::getUser(), null, $fullpath);
-    } elseif (self::isPhoto($fullpath)) {
-      $a = OC_Gallery_Album::find(OCP\USER::getUser(), null, rtrim(dirname($fullpath),'/'));
-      if (($r = $a->fetchRow())) {
-        OC_Gallery_Photo::removeByPath($fullpath, $r['album_id']);
-        $p = OC_Gallery_Photo::findForAlbum(OCP\USER::getUser(), $r['album_name']);
-        if (!($p->fetchRow())) {
-          OC_Gallery_Album::remove(OCP\USER::getUser(), null, dirname($fullpath));
-        }
-      }
-    }
-  }
+	public static function renamePhoto($params) {
+		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
+		$newpath = $params[OC_Filesystem::signal_param_newpath];
+		if (OC_Filesystem::is_dir($newpath.'/') && self::directoryContainsPhotos($newpath)) {
+			OC_Gallery_Album::changePath($oldpath, $newpath, OCP\USER::getUser());
+		} elseif (self::isPhoto($newpath)) {
+			$olddir = dirname($oldpath);
+			$newdir = dirname($newpath);
+			if ($olddir == '') $olddir = '/';
+			if ($newdir == '') $newdir = '/';
+			if (!self::isPhoto($newpath)) return;
+			OCP\Util::writeLog(self::$APP_TAG, 'Moving photo from '.$oldpath.' to '.$newpath, OCP\Util::DEBUG);
+			$album;
+			$newAlbumId;
+			$oldAlbumId;
+			if ($olddir == $newdir) {
+				// album changing is not needed
+				$albums = OC_Gallery_Album::find(OCP\USER::getUser(), null, $olddir);
+				$album = $albums->fetchRow();
+				if (!$album) {
+					$albums = self::createAlbum($newdir);
+					$album = $albums->fetchRow();
+				}
+				$newAlbumId = $oldAlbumId = $album['album_id'];
+			} else {
+				$newalbum = OC_Gallery_Album::find(OCP\USER::getUser(), null, $newdir);
+				$oldalbum = OC_Gallery_Album::find(OCP\USER::getUser(), null, $olddir);
 
-  public static function renamePhoto($params) {
-    $oldpath = $params[OC_Filesystem::signal_param_oldpath];
-    $newpath = $params[OC_Filesystem::signal_param_newpath];
-    if (OC_Filesystem::is_dir($newpath.'/') && self::directoryContainsPhotos($newpath)) {
-      OC_Gallery_Album::changePath($oldpath, $newpath, OCP\USER::getUser());
-    } elseif (self::isPhoto($newpath)) {
-      $olddir = dirname($oldpath);
-      $newdir = dirname($newpath);
-      if ($olddir == '') $olddir = '/';
-      if ($newdir == '') $newdir = '/';
-      if (!self::isPhoto($newpath)) return;
-      OCP\Util::writeLog(self::$APP_TAG, 'Moving photo from '.$oldpath.' to '.$newpath, OCP\Util::DEBUG);
-      $album;
-      $newAlbumId;
-      $oldAlbumId;
-      if ($olddir == $newdir) {
-        // album changing is not needed
-        $albums = OC_Gallery_Album::find(OCP\USER::getUser(), null, $olddir);
-        $album = $albums->fetchRow();
-        if (!$album) {
-          $albums = self::createAlbum($newdir);
-          $album = $albums->fetchRow();
-        }
-        $newAlbumId = $oldAlbumId = $album['album_id'];
-      } else {
-        $newalbum = OC_Gallery_Album::find(OCP\USER::getUser(), null, $newdir);
-        $oldalbum = OC_Gallery_Album::find(OCP\USER::getUser(), null, $olddir);
+				if (!($newalbum = $newalbum->fetchRow())) {
+					$newalbum = self::createAlbum($newdir);
+					$newalbum = $newalbum->fetchRow();
+				}
+				$oldalbum = $oldalbum->fetchRow();
+				if (!$oldalbum) {
+					OC_Gallery_Photo::create($newalbum['album_id'], $newpath);
+					return;
+				}
+				$newAlbumId = $newalbum['album_id'];
+				$oldAlbumId = $oldalbum['album_id'];
 
-        if (!($newalbum = $newalbum->fetchRow())) {
-          $newalbum = self::createAlbum($newdir);
-          $newalbum = $newalbum->fetchRow();
-        }
-        $oldalbum = $oldalbum->fetchRow();
-        if (!$oldalbum) {
-          OC_Gallery_Photo::create($newalbum['album_id'], $newpath);
-          return;
-        }
-        $newAlbumId = $newalbum['album_id'];
-        $oldAlbumId = $oldalbum['album_id'];
-
-      }
-      OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath);
-    }
-  }
+			}
+			OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath);
+		}
+	}
 }
 
 ?>
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 2444659d0a..2d2bdd2734 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -88,7 +88,7 @@ class ThumbnailsManager {
 	}
 	
 	public function delete($path) {
-		unlink(\OC::$CONFIG_DATADIRECTORY_ROOT.'/'.\OC_User::getUser()."/gallery".$path);
+		unlink(\OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path);
 	}
 	
 	private function __construct() {}
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index ff9519142a..f1961cb72e 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -156,11 +156,11 @@ class TileStack extends TileBase {
 	}
 
 	public function getOnHoverAction() {
-		return 'javascript:t(this);return false;';
+		return 'javascript:explode(this);return false;';
 	}
 	
 	public function getOnOutAction() {
-		return 'javascript:o(this);return false;';
+		return 'javascript:deplode(this);return false;';
 	}
 
 	public function getCount() {
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 39e3bbf47b..88cf0912cb 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -15,7 +15,7 @@ div.visible { opacity: 0.8;}
 
 var root = "<?php echo !empty($_GET['root']) ? $_GET['root'] : '/'; ?>";
 
-function t(element) {
+function explode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
 		 	$(elem).addClass('visible');
@@ -27,7 +27,7 @@ function t(element) {
 	});
 }
 
-function o(element) {
+function deplode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
 		 	$(elem).removeClass('visible');
@@ -55,6 +55,10 @@ $(document).ready(function() {
 
 </script>
 
+<div id="controls">
+	<a href="javascript:shareGallery();"><input type="button" value="<?php echo $l->t('Share');?>" /></a><br/>
+</div>
+<div id="gallerycontent">
 <?php
 
 include('apps/gallery/lib/tiles.php');
@@ -103,3 +107,4 @@ if ($ts->getCount() != 0) {
 echo $tl->get();
 
 ?>
+</div>

From 71b04717ab2331b616d9040c48cbaebc5044f5c0 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 8 Jun 2012 20:27:08 +0200
Subject: [PATCH 0246/1537] adding missing file

---
 apps/gallery/js/pictures.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 apps/gallery/js/pictures.js

diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js
new file mode 100644
index 0000000000..678c9bcbf5
--- /dev/null
+++ b/apps/gallery/js/pictures.js
@@ -0,0 +1,37 @@
+
+function constructSharingPath() {
+  return document.location.protocol + '//' + document.location.host + OC.linkTo('', 'public.php') + '?service=gallery&token=' + Albums.token;
+}
+
+function shareGallery() {
+  var existing_token = '';
+  //if (Albums.token)
+  //  existing_token = constructSharingPath();
+  var form_fields = [{text: 'Share', name: 'share', type: 'checkbox', value: false},
+                     {text: 'Share recursive', name: 'recursive', type: 'checkbox', value: false},
+                     {text: 'Shared gallery address', name: 'address', type: 'text', value: ''}];
+    OC.dialogs.form(form_fields, t('gallery', 'Share gallery'), function(values){
+    var p = '';
+    for (var i in paths) p += paths[i]+'/';
+    if (p == '') p = '/';
+    alert(p);
+    $.getJSON(OC.filePath('gallery', 'ajax', 'galleryOp.php'), {operation: 'share', path: p, share: values[0].value, recursive: values[1].value}, function(r) {
+      if (r.status == 'success') {
+        Albums.shared = r.sharing;
+        if (Albums.shared) {
+          Albums.token = r.token;
+          Albums.recursive = r.recursive;
+        } else {
+          Albums.token = '';
+          Albums.recursive = false;
+        }
+        var actual_addr = '';
+        if (Albums.token)
+          actual_addr = constructSharingPath();
+        $('input[name="address"]').val(actual_addr);
+      } else {
+        OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Internal error'));
+      }
+    });
+  });
+}

From 6b0a2ae60eb8d3beb5adad7022ce4f9ba9e25aee Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 8 Jun 2012 20:34:10 +0200
Subject: [PATCH 0247/1537] remove old code

---
 apps/gallery/lib/hooks_handlers.php | 92 +----------------------------
 1 file changed, 1 insertion(+), 91 deletions(-)

diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 30c4b50577..a9f4dc6aff 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -27,57 +27,6 @@ OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, "O
 require_once(OC::$CLASSPATH['Pictures_Managers']);
 
 class OC_Gallery_Hooks_Handlers {
-	private static $APP_TAG = "Gallery";
-
-	private static function isPhoto($filename) {
-		$ext = strtolower(substr($filename, strrpos($filename, '.')+1));
-		return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
-	}
-
-	private static function directoryContainsPhotos($dirpath) {
-		$dirhandle = OC_Filesystem::opendir($dirpath.'/');
-		if ($dirhandle != FALSE) {
-			while (($filename = readdir($dirhandle)) != FALSE) {
-				if ($filename[0] == '.') continue;
-				if (self::isPhoto($dirpath.'/'.$filename)) return true;
-			}
-		}
-		return false;
-	}
-
-	private static function createAlbum($path) {
-		$new_album_name = trim(str_replace('/', '.', $path), '.');
-		if ($new_album_name == '')
-			$new_album_name = 'main';
-
-		OCP\Util::writeLog(self::$APP_TAG, 'Creating new album '.$new_album_name, OCP\Util::DEBUG);
-		OC_Gallery_Album::create(OCP\USER::getUser(), $new_album_name, $path);
-
-		return OC_Gallery_Album::find(OCP\USER::getUser(), null, $path);
-	}
-
-	public static function pathInRoot($path) {
-		$root = OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '/');
-		return substr($path, 0, strlen($path)>strlen($root)?strlen($root):strlen($path)) == $root;
-	}
-
-	public static function addPhotoFromPath($params) {
-		$fullpath = $params[OC_Filesystem::signal_param_path];
-		$fullpath = rtrim(dirname($fullpath),'/').'/'.basename($fullpath);
-
-		if (!self::isPhoto($fullpath)) return;
-
-		$a = OC_Gallery_Album::find(OCP\USER::getUser(), null, dirname($fullpath));
-		if (!($r = $a->fetchRow())) {
-			OC_Gallery_Album::create(OCP\USER::getUser(), basename(dirname($fullpath)), dirname($fullpath));
-			$a = OC_Gallery_Album::find(OCP\USER::getUser(), null, dirname($fullpath));
-			$r = $a->fetchRow();
-		}
-		$albumId = $r['album_id'];
-		$p = OC_Gallery_Album::find($albumId, $fullpath);
-		if (!($p->fetchRow()))
-			OC_Gallery_Photo::create($albumId, $fullpath);
-	}
 
 	public static function removePhoto($params) {
 		\OC\Pictures\ThumbnailsManager::getInstance()->delete($params[OC_Filesystem::signal_param_path]);
@@ -86,46 +35,7 @@ class OC_Gallery_Hooks_Handlers {
 	public static function renamePhoto($params) {
 		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
 		$newpath = $params[OC_Filesystem::signal_param_newpath];
-		if (OC_Filesystem::is_dir($newpath.'/') && self::directoryContainsPhotos($newpath)) {
-			OC_Gallery_Album::changePath($oldpath, $newpath, OCP\USER::getUser());
-		} elseif (self::isPhoto($newpath)) {
-			$olddir = dirname($oldpath);
-			$newdir = dirname($newpath);
-			if ($olddir == '') $olddir = '/';
-			if ($newdir == '') $newdir = '/';
-			if (!self::isPhoto($newpath)) return;
-			OCP\Util::writeLog(self::$APP_TAG, 'Moving photo from '.$oldpath.' to '.$newpath, OCP\Util::DEBUG);
-			$album;
-			$newAlbumId;
-			$oldAlbumId;
-			if ($olddir == $newdir) {
-				// album changing is not needed
-				$albums = OC_Gallery_Album::find(OCP\USER::getUser(), null, $olddir);
-				$album = $albums->fetchRow();
-				if (!$album) {
-					$albums = self::createAlbum($newdir);
-					$album = $albums->fetchRow();
-				}
-				$newAlbumId = $oldAlbumId = $album['album_id'];
-			} else {
-				$newalbum = OC_Gallery_Album::find(OCP\USER::getUser(), null, $newdir);
-				$oldalbum = OC_Gallery_Album::find(OCP\USER::getUser(), null, $olddir);
-
-				if (!($newalbum = $newalbum->fetchRow())) {
-					$newalbum = self::createAlbum($newdir);
-					$newalbum = $newalbum->fetchRow();
-				}
-				$oldalbum = $oldalbum->fetchRow();
-				if (!$oldalbum) {
-					OC_Gallery_Photo::create($newalbum['album_id'], $newpath);
-					return;
-				}
-				$newAlbumId = $newalbum['album_id'];
-				$oldAlbumId = $oldalbum['album_id'];
-
-			}
-			OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath);
-		}
+		//TODO: implement this
 	}
 }
 

From 8bc22907b86905bf60bb558eccaacfd61bcd7b72 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 8 Jun 2012 21:31:31 +0200
Subject: [PATCH 0248/1537] adding navigation bar to gallery

---
 apps/gallery/index.php           |  1 +
 apps/gallery/templates/index.php | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 740f4bf04f..b87d99bb6c 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -27,6 +27,7 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
+OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('gallery', 'styles');
 OCP\Util::addScript('gallery', 'pictures');
 
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 88cf0912cb..94d370f2e8 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,19 +1,20 @@
 <?php
 
 $l = OC_L10N::get('gallery');
+$root = !empty($_GET['root']) ? $_GET['root'] : '/';
 ?>
 <style>
 div.gallery_div {position:relative; display: inline-block; height: 152px; width: 150px; margin: 5px;}
-div.miniature_border {position:absolute; height: 150px; -webkit-transition-duration: .2s; background-position: 50%;}
+div.miniature_border {position:absolute; height: 150px; -moz-transition-duration: 0.2s; -o-transition-duration:0.2s;  -webkit-transition-duration: .2s; background-position: 50%;}
 div.line {display:inline-block; border: 0; width: auto; height: 160px}
-div.gallery_div img{position:absolute; top: 1; left: 0; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
+div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
 div.gallery_div img.shrinker {width:80px !important;}
 div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
 div.visible { opacity: 0.8;}
 </style>
 <script type="text/javascript">
 
-var root = "<?php echo !empty($_GET['root']) ? $_GET['root'] : '/'; ?>";
+var root = "<?php echo $root; ?>";
 
 function explode(element) {
 	$('div', element).each(function(index, elem) {
@@ -55,8 +56,19 @@ $(document).ready(function() {
 
 </script>
 
-<div id="controls">
-	<a href="javascript:shareGallery();"><input type="button" value="<?php echo $l->t('Share');?>" /></a><br/>
+<div id="controls"><?php
+	$sr = trim($root, '/');
+	if (!empty($sr)) {
+		$paths = explode('/', $sr);
+		$path = '/';
+		for ($i = 0; $i < count($paths); $i++) {
+			$path .= urlencode($paths[$i]).'/';
+			$classess = 'crumb'.($i == count($paths)-1?' last':'');
+			echo '<div class="'.$classess.'" style="background-image:url(\''.\OCP\image_path('core','breadcrumb.png').'\')"><a href="'.\OCP\Util::linkTo('gallery', 'index.php').'&root='.$path.'">'.$paths[$i].'</a></div>';
+		}
+	}
+		
+?>	<a href="javascript:shareGallery();"><input type="button" value="<?php echo $l->t('Share');?>" /></a><br/>
 </div>
 <div id="gallerycontent">
 <?php

From 0c7431e57d0982a35c59e55c5ca11782950b111f Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 8 Jun 2012 21:44:05 +0200
Subject: [PATCH 0249/1537] hide share button until sharing wont be fixed

---
 apps/gallery/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 94d370f2e8..e761cb5472 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -68,7 +68,7 @@ $(document).ready(function() {
 		}
 	}
 		
-?>	<a href="javascript:shareGallery();"><input type="button" value="<?php echo $l->t('Share');?>" /></a><br/>
+?>	<!--<a href="javascript:shareGallery();"><input type="button" value="<?php echo $l->t('Share');?>" /></a>--><br/>
 </div>
 <div id="gallerycontent">
 <?php

From 201a40a1a31825a47784ba08159a540832eec27e Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 8 Jun 2012 21:55:28 +0200
Subject: [PATCH 0250/1537] tabs for spaces, fix array key name

---
 apps/gallery/lib/managers.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 2d2bdd2734..4130005893 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -33,9 +33,9 @@ class DatabaseManager {
 		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
 		\OCP\DB::commit();
-    $ret = array('filepath' => $path, 'width' => $image->width(), 'height' => $image->height());
+		$ret = array('path' => $path, 'width' => $image->width(), 'height' => $image->height());
 		unset($image);
-    return $ret;
+		return $ret;
 	}
 	
 	private function __construct() {}
@@ -82,8 +82,8 @@ class ThumbnailsManager {
 	public function getThumbnailInfo($path) {
 		$arr = DatabaseManager::getInstance()->getFileData($path);
 		$ret = array('filepath' => $arr['path'],
-		             'width' => $arr['width'],
-		             'height' => $arr['height']);
+								 'width' => $arr['width'],
+								 'height' => $arr['height']);
 		return $ret;
 	}
 	

From ac74d87e3eef1e53f168d350f7e38e495e0746f0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 8 Jun 2012 22:22:16 +0200
Subject: [PATCH 0251/1537] some work on repeating events caching

---
 apps/calendar/appinfo/database.xml | 52 ++++++++++++++++++++++++++++++
 apps/calendar/lib/repeat.php       | 47 ++++++++++++++++++++++++---
 2 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml
index b065ab3f94..5d2f415c7b 100644
--- a/apps/calendar/appinfo/database.xml
+++ b/apps/calendar/appinfo/database.xml
@@ -290,4 +290,56 @@
 
  </table>
  
+ <table>
+
+  <name>*dbprefix*calendar_repeat</name>
+
+  <declaration>
+
+   <field>
+    <name>id</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <autoincrement>1</autoincrement>
+    <unsigned>true</unsigned>
+    <length>4</length>
+   </field>
+  
+   <field>
+    <name>eventid</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <unsigned>true</unsigned>
+    <length>4</length>
+   </field>
+  
+   <field>
+    <name>calid</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <unsigned>true</unsigned>
+    <length>4</length>
+   </field>
+
+   <field>
+    <name>startdate</name>
+    <type>timestamp</type>
+    <default>0000-00-00 00:00:00</default>
+    <notnull>false</notnull>
+   </field>
+
+   <field>
+    <name>enddate</name>
+    <type>timestamp</type>
+    <default>0000-00-00 00:00:00</default>
+    <notnull>false</notnull>
+   </field>
+
+  </declaration>
+
+ </table>
+ 
 </database>
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 89cafa388c..3117d306c8 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -32,7 +32,17 @@ class OC_Calendar_Repeat{
 	 * @return (array)
 	 */
 	public static function get_inperiod($id, $from, $until){
-		
+		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE eventid = ?'
+		.' AND ((startdate >= ? AND startdate <= ?)'
+		.' OR (enddate >= ? AND enddate <= ?)');
+		$result = $stmt->execute(array($id,
+					$from, $until,
+					$from, $until));
+		$return = array();
+		while($row = $result->fetchRow()){
+			$return[] = $row;
+		}
+		return $return;
 	}
 	/*
 	 * @brief returns the cache of all repeating events of a calendar
@@ -40,22 +50,51 @@ class OC_Calendar_Repeat{
 	 * @return (array) 
 	 */
 	public static function getcalendar($id){
-
+		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?');
+		$result = $stmt->execute(array($id));
+		$return = array();
+		while($row = $result->fetchRow()){
+			$return[] = $row;
+		}
+		return $return;
 	}
 	/*
 	 * @brief returns the cache of all repeating events of a calendar in a specific period
 	 * @param (int) $id - id of the event
 	 * @param (string) $from - start for period in UTC
 	 * @param (string) $until - end for period in UTC
+	 * @return (array)
 	 */
 	public static function getcalendar_inperiod($id, $from, $until){
-		
+		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?'
+		.' AND ((startdate >= ? AND startdate <= ?)'
+		.' OR (enddate >= ? AND enddate <= ?)');
+		$result = $stmt->execute(array($id,
+					$from, $until,
+					$from, $until));
+		$return = array();
+		while($row = $result->fetchRow()){
+			$return[] = $row;
+		}
+		return $return;
 	}
 	/*
 	 * @brief generates the cache the first time
+	 * @param (int) id - id of the event
+	 * @return (bool)
 	 */
 	public static function generate($id){
-
+		$event = OC_Calendar_Object::find(id);
+		if($event['repeating'] == 0){
+			return false;
+		}
+		$object = OC_VObject::parse($event['calendardata']);
+		$start = new DateTime('first day of January', new DateTimeZone('UTC'));
+		$start->modify('-5 years');
+		$end = new DateTime('last day of December', new DateTimeZone('UTC'));
+		$end->modify('+5 years');
+		$object->expand($start, $end);
+		
 	}
 	/*
 	 * @brief generates the cache the first time for all repeating event of an calendar

From bdd12df4a2907060f599f999077f0d8bcb3ed636 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 8 Jun 2012 22:30:02 +0200
Subject: [PATCH 0252/1537] fix loading of OC::$REQUESTEDAPP if WTFE the app
 parameter is given but empty aka /?app

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 4bd165862b..d86a39966e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -427,7 +427,7 @@ class OC{
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
 
 		//parse the given parameters
-		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
+		self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){
 			$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
 			$param = substr(self::$REQUESTEDAPP, strpos(self::$REQUESTEDAPP, '?') + 1);

From cac995ee9fde613e8e80186a505daa97025a7ae8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 11:49:25 +0200
Subject: [PATCH 0253/1537] some more work on repeating events caching

---
 apps/calendar/lib/repeat.php | 55 +++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 3117d306c8..dd3967c899 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -94,48 +94,89 @@ class OC_Calendar_Repeat{
 		$end = new DateTime('last day of December', new DateTimeZone('UTC'));
 		$end->modify('+5 years');
 		$object->expand($start, $end);
+
 		
 	}
 	/*
 	 * @brief generates the cache the first time for all repeating event of an calendar
+	 * @param (int) id - id of the calendar
+	 * @return (bool)
 	 */
 	public static function generatecalendar($id){
-
+		$allobjects = OC_Calendar_Object::all($id);
+		foreach($allobjects['id'] as $eventid){
+			self::generate($eventid);
+		}
+		return true;
 	}
 	/*
 	 * @brief updates an event that is already cached
+	 * @param (int) id - id of the event
+	 * @return (bool)
 	 */
 	public static function update($id){
-
+		self::clean($id);
+		self::generate($id);
+		return true;
 	}
 	/*
 	 * @brief updates all repating events of a calendar that are already cached
+	 * @param (int) id - id of the calendar
+	 * @return (bool)
 	 */
 	public static function updatecalendar($id){
-
+		self::cleancalendar($id);
+		self::generatecalendar($id);
+		return true;
 	}
 	/*
 	 * @brief checks if an event is already cached
+	 * @param (int) id - id of the event
+	 * @return (bool)
 	 */
 	public static function is_cached($id){
-
+		if(count(self::get($id)) === 1){
+			return true;
+		}else{
+			return false;
+		}
 	}
 	/*
 	 * @brief checks if a whole calendar is already cached
+	 * @param (int) id - id of the calendar
+	 * @return (bool)
 	 */
 	public static function is_calendar_cached($id){
-
+		$cachedevents = count(self::getcalendar($id));
+		$repeatingevents = 0;
+		$allevents = OC_Calendar_Object::all($id);
+		foreach($allevents['repeating'] as $repeating){
+			if($repeating === 1){
+				$repeatingevents++;
+			}
+		}
+		if($cachedevents < $repeatingevents){
+			return false;
+		}else{
+			return true;
+		}
 	}
 	/*
 	 * @brief removes the cache of an event
+	 * @param (int) id - id of the event
+	 * @return (bool)
 	 */
 	public static function clean($id){
-
+		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE eventid = ?');
+		$stmt->execute(array($id));
 	}
 	/*
 	 * @brief removes the cache of all events of a calendar
+	 * @param (int) id - id of the calendar
+	 * @return (bool)
 	 */
 	public static function cleancalendar($id){
-		
+		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE calid = ?');
+		$stmt->execute(array($id));
 	}
 }
\ No newline at end of file

From 7ed30649bb7753fbc86e0538bfa5817ffcca1b57 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 12:18:25 +0200
Subject: [PATCH 0254/1537] add hooks for calendars

---
 apps/calendar/lib/calendar.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 869b35e2e1..0655a7f2d7 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -109,7 +109,10 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
-		return OCP\DB::insertid('*PREFIX*calendar_calendars');
+		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
+		OCP\Util::emitHook('OC_Calendar', 'addCalendar', array('calendar_id' => $insertid));
+
+		return $insertid;
 	}
 
 	/**
@@ -129,7 +132,10 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
-		return OCP\DB::insertid('*PREFIX*calendar_calendars');
+		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
+		OCP\Util::emitHook('OC_Calendar', 'addCalendar', array('calendar_id' => $insertid));
+
+		return $insertid;
 	}
 
 	/**
@@ -158,6 +164,7 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' );
 		$result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
 
+		OCP\Util::emitHook('OC_Calendar', 'editCalendar', array('calendar_id' => $id));
 		return true;
 	}
 
@@ -198,6 +205,8 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
 		$stmt->execute(array($id));
 
+		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', array('calendar_id' => $id));
+
 		return true;
 	}
 

From a9b561430abc5c55d195e3bb1efe4d0dc2227f6e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 12:30:09 +0200
Subject: [PATCH 0255/1537] add hooks for events

---
 apps/calendar/lib/object.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index cc80a0bb70..8b0d6093b6 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -108,7 +108,7 @@ class OC_Calendar_Object{
 		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
 
 		OC_Calendar_Calendar::touchCalendar($id);
-
+		OCP\Util::emitHook('OC_Calendar', 'addEvent', array('event_id' => $object_id));
 		return $object_id;
 	}
 
@@ -128,7 +128,7 @@ class OC_Calendar_Object{
 		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
 
 		OC_Calendar_Calendar::touchCalendar($id);
-
+		OCP\Util::emitHook('OC_Calendar', 'addEvent', array('event_id' => $object_id));
 		return $object_id;
 	}
 
@@ -149,6 +149,7 @@ class OC_Calendar_Object{
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
+		OCP\Util::emitHook('OC_Calendar', 'editEvent', array('event_id' => $id));
 
 		return true;
 	}
@@ -170,6 +171,7 @@ class OC_Calendar_Object{
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
+		OCP\Util::emitHook('OC_Calendar', 'editEvent', array('event_id' => $oldobject['id']));
 
 		return true;
 	}
@@ -184,6 +186,7 @@ class OC_Calendar_Object{
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE id = ?' );
 		$stmt->execute(array($id));
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
+		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', array('event_id' => $id));
 
 		return true;
 	}
@@ -195,9 +198,11 @@ class OC_Calendar_Object{
 	 * @return boolean
 	 */
 	public static function deleteFromDAVData($cid,$uri){
+		$oldobject = self::findWhereDAVDataIs($cid, $uri);
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri=?' );
 		$stmt->execute(array($cid,$uri));
 		OC_Calendar_Calendar::touchCalendar($cid);
+		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', array('event_id' => $oldobject['id']));
 
 		return true;
 	}
@@ -207,6 +212,7 @@ class OC_Calendar_Object{
 		$stmt->execute(array($calendarid,$id));
 
 		OC_Calendar_Calendar::touchCalendar($id);
+		OCP\Util::emitHook('OC_Calendar', 'moveEvent', array('event_id' => $id));
 
 		return true;
 	}

From 76de92477f42a9c52ce5f55fc8e91e19d4b3513d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 14:37:52 +0200
Subject: [PATCH 0256/1537] fix infinite redirect during setup for windows
 hosts

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index d86a39966e..f85710ddfc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -124,7 +124,7 @@ class OC{
 		// calculate the documentroot
 		$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
-		OC::$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT));
+		OC::$SUBURI= str_replace("\\","/",substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT)));
 		$scriptName=$_SERVER["SCRIPT_NAME"];
 		if(substr($scriptName,-1)=='/'){
 			$scriptName.='index.php';

From 014895aeab547ce30b91c291b3d517d2dcc1c047 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 9 Jun 2012 14:32:02 +0200
Subject: [PATCH 0257/1537] Check for missing path_info, also use OC_Response
 for 404 error

---
 remote.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/remote.php b/remote.php
index 7131dfc940..b1be50f36a 100644
--- a/remote.php
+++ b/remote.php
@@ -7,13 +7,17 @@ if (array_key_exists('PATH_INFO', $_SERVER)){
 }else{
 	$path_info = substr($_SERVER['PHP_SELF'], strpos($_SERVER['PHP_SELF'], basename(__FILE__)) + strlen(basename(__FILE__)));
 }
+if ($path_info === false) {
+	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+	exit;
+}
 if (!$pos = strpos($path_info, '/', 1)) {
 	$pos = strlen($path_info);
 }
 $service=substr($path_info, 1, $pos-1);
 $file = OC_AppConfig::getValue('core', 'remote_' . $service);
 if(is_null($file)){
-	header('HTTP/1.0 404 Not Found');
+	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
 
@@ -22,4 +26,4 @@ $app=$parts[2];
 OC_App::loadApp($app);
 
 $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-require_once(OC::$APPSROOT . $file);
\ No newline at end of file
+require_once(OC::$APPSROOT . $file);

From 4aee5a7ce43cb6d4c64838aa20d5f09adeba57ca Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 9 Jun 2012 14:32:51 +0200
Subject: [PATCH 0258/1537] Tasks: Use POST for ajax calls that change data

---
 apps/tasks/ajax/addtask.php | 2 +-
 apps/tasks/ajax/delete.php  | 2 +-
 apps/tasks/js/tasks.js      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/tasks/ajax/addtask.php b/apps/tasks/ajax/addtask.php
index d6e313bd08..9f35e7f21e 100644
--- a/apps/tasks/ajax/addtask.php
+++ b/apps/tasks/ajax/addtask.php
@@ -8,7 +8,7 @@ $calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
 $first_calendar = reset($calendars);
 $cid = $first_calendar['id'];
 
-$input = $_GET['text'];
+$input = $_POST['text'];
 $request = array();
 $request['summary'] = $input;
 $request["categories"] = null;
diff --git a/apps/tasks/ajax/delete.php b/apps/tasks/ajax/delete.php
index 6d2868748d..e29add9b55 100644
--- a/apps/tasks/ajax/delete.php
+++ b/apps/tasks/ajax/delete.php
@@ -24,7 +24,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('tasks');
 
-$id = $_GET['id'];
+$id = $_POST['id'];
 $task = OC_Calendar_App::getEventObject( $id );
 
 OC_Calendar_Object::delete($id);
diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index 60d2a523be..d1e3a9969b 100644
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -440,7 +440,7 @@ $(document).ready(function(){
 
 	$('#tasks_delete').live('click',function(){
 		var id = $('#task_details').data('id');
-		$.getJSON('ajax/delete.php',{'id':id},function(jsondata){
+		$.post('ajax/delete.php',{'id':id},function(jsondata){
 			if(jsondata.status == 'success'){
 				$('#tasks [data-id="'+jsondata.data.id+'"]').remove();
 				$('#task_details').data('id','');
@@ -455,7 +455,7 @@ $(document).ready(function(){
 
 	$('#tasks_addtask').click(function(){
 		var input = $('#tasks_newtask').val();
-		$.getJSON(OC.filePath('tasks', 'ajax', 'addtask.php'),{text:input},function(jsondata){
+		$.post(OC.filePath('tasks', 'ajax', 'addtask.php'),{text:input},function(jsondata){
 			if(jsondata.status == 'success'){
 				$('#tasks_list').append(OC.Tasks.create_task_div(jsondata.task));
 			}

From 28ab92ee76c3528637f543c45644e26859fcdb60 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 14:40:15 +0200
Subject: [PATCH 0259/1537] make use of post instead of get

---
 apps/calendar/ajax/calendar/edit.form.php     |  2 +-
 apps/calendar/ajax/changeview.php             |  2 +-
 apps/calendar/ajax/event/edit.form.php        |  2 +-
 apps/calendar/ajax/import/import.php          |  4 ++--
 apps/calendar/ajax/settings/guesstimezone.php |  4 ++--
 apps/calendar/ajax/share/activation.php       |  4 ++--
 apps/calendar/ajax/share/changepermission.php | 10 +++++-----
 apps/calendar/ajax/share/dropdown.php         |  2 +-
 apps/calendar/ajax/share/share.php            |  8 ++++----
 apps/calendar/ajax/share/unshare.php          |  8 ++++----
 apps/calendar/js/calendar.js                  | 16 ++++++++--------
 apps/calendar/js/geo.js                       |  2 +-
 apps/calendar/js/loader.js                    |  2 +-
 13 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php
index 7736680931..036ed12bb7 100644
--- a/apps/calendar/ajax/calendar/edit.form.php
+++ b/apps/calendar/ajax/calendar/edit.form.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 
 $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);
+$calendar = OC_Calendar_App::getCalendar($_POST['calendarid']);
 $tmpl = new OCP\Template("calendar", "part.editcalendar");
 $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index 2c2d09ccb1..0099fd5ec2 100644
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -7,7 +7,7 @@
  */
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
-$view = $_GET['v'];
+$view = $_POST['v'];
 switch($view){
 	case 'agendaWeek':
 	case 'month';
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
index f2ea84dd20..dbb78edb79 100644
--- a/apps/calendar/ajax/event/edit.form.php
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -13,7 +13,7 @@ if(!OCP\User::isLoggedIn()) {
 }
 OCP\JSON::checkAppEnabled('calendar');
 
-$id = $_GET['id'];
+$id = $_POST['id'];
 $data = OC_Calendar_App::getEventObject($id, true, true);
 
 if(!$data){
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index a3eaed844a..6fdad12c08 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -16,9 +16,9 @@ $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
 
 global $progresskey;
-$progresskey = 'calendar.import-' . $_GET['progresskey'];
+$progresskey = 'calendar.import-' . $_POST['progresskey'];
 
-if (isset($_GET['progress']) && $_GET['progress']) {
+if (isset($_POST['progress']) && $_POST['progress']) {
 	echo OC_Cache::get($progresskey);
 	die;
 }
diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
index 13092777b7..f36f3bf061 100644
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -12,8 +12,8 @@ OCP\JSON::checkAppEnabled('calendar');
 
 $l = OC_L10N::get('calendar');
 
-$lat = $_GET['lat'];
-$lng = $_GET['long'];
+$lat = $_POST['lat'];
+$lng = $_POST['lng'];
 
 $timezone =  OC_Geo::timezone($lat, $lng);
 
diff --git a/apps/calendar/ajax/share/activation.php b/apps/calendar/ajax/share/activation.php
index 7d6b8fcb16..bce8693577 100644
--- a/apps/calendar/ajax/share/activation.php
+++ b/apps/calendar/ajax/share/activation.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
-$id = strip_tags($_GET['id']);
-$activation = strip_tags($_GET['activation']);
+$id = strip_tags($_POST['id']);
+$activation = strip_tags($_POST['activation']);
 OC_Calendar_Share::set_active(OCP\USER::getUser(), $id, $activation);
 OCP\JSON::success();
diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
index 2737420c94..e807c164a2 100644
--- a/apps/calendar/ajax/share/changepermission.php
+++ b/apps/calendar/ajax/share/changepermission.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
  
-$id = strip_tags($_GET['id']);
-$idtype = strip_tags($_GET['idtype']);
-$permission = (int) strip_tags($_GET['permission']);
+$id = strip_tags($_POST['id']);
+$idtype = strip_tags($_POST['idtype']);
+$permission = (int) strip_tags($_POST['permission']);
 switch($idtype){
 	case 'calendar':
 	case 'event':
@@ -25,8 +25,8 @@ if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
 	OCP\JSON::error(array('message'=>'permission denied'));
 	exit;
 }
-$sharewith = $_GET['sharewith'];
-$sharetype = strip_tags($_GET['sharetype']);
+$sharewith = $_POST['sharewith'];
+$sharetype = strip_tags($_POST['sharetype']);
 switch($sharetype){
 	case 'user':
 	case 'group':
diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php
index a3b0faca4b..86cf4ac090 100644
--- a/apps/calendar/ajax/share/dropdown.php
+++ b/apps/calendar/ajax/share/dropdown.php
@@ -7,7 +7,7 @@
  */
  
 $user = OCP\USER::getUser();
-$calid = $_GET['calid'];
+$calid = $_POST['calid'];
 $calendar = OC_Calendar_Calendar::find($calid);
 if($calendar['userid'] != $user){
 	OCP\JSON::error();
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
index 629a7b6b79..838db619f6 100644
--- a/apps/calendar/ajax/share/share.php
+++ b/apps/calendar/ajax/share/share.php
@@ -6,8 +6,8 @@
  * See the COPYING-README file.
  */
  
-$id = strip_tags($_GET['id']);
-$idtype = strip_tags($_GET['idtype']);
+$id = strip_tags($_POST['id']);
+$idtype = strip_tags($_POST['idtype']);
 switch($idtype){
 	case 'calendar':
 	case 'event':
@@ -24,8 +24,8 @@ if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
 	OCP\JSON::error(array('message'=>'permission denied'));
 	exit;
 }
-$sharewith = $_GET['sharewith'];
-$sharetype = strip_tags($_GET['sharetype']);
+$sharewith = $_POST['sharewith'];
+$sharetype = strip_tags($_POST['sharetype']);
 switch($sharetype){
 	case 'user':
 	case 'group':
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
index fe7c98452d..1ce04677fb 100644
--- a/apps/calendar/ajax/share/unshare.php
+++ b/apps/calendar/ajax/share/unshare.php
@@ -6,8 +6,8 @@
  * See the COPYING-README file.
  */
  
-$id = strip_tags($_GET['id']);
-$idtype = strip_tags($_GET['idtype']);
+$id = strip_tags($_POST['id']);
+$idtype = strip_tags($_POST['idtype']);
 switch($idtype){
 	case 'calendar':
 	case 'event':
@@ -24,8 +24,8 @@ if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
 	OCP\JSON::error(array('message'=>'permission denied'));
 	exit;
 }
-$sharewith = $_GET['sharewith'];
-$sharetype = strip_tags($_GET['sharetype']);
+$sharewith = $_POST['sharewith'];
+$sharetype = strip_tags($_POST['sharetype']);
 switch($sharetype){
 	case 'user':
 	case 'group':
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index b5411d3fd9..f869fcf2ad 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -77,7 +77,7 @@ Calendar={
 				$('#event').dialog('destroy').remove();
 			}else{
 				Calendar.UI.loading(true);
-				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'edit.form.php') + '?id=' + id, Calendar.UI.startEventDialog);
+				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'edit.form.php'), {id: id}, Calendar.UI.startEventDialog);
 			}
 		},
 		submitDeleteEventForm:function(url){
@@ -413,7 +413,7 @@ Calendar={
 			},
 			edit:function(object, calendarid){
 				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax/calendar', 'edit.form.php') + "?calendarid="+calendarid,
+					.load(OC.filePath('calendar', 'ajax/calendar', 'edit.form.php'), {calendarid: calendarid},
 						function(){Calendar.UI.Calendar.colorPicker(this)});
 				$(object).closest('tr').after(tr).hide();
 			},
@@ -502,14 +502,14 @@ Calendar={
 			currentid: 'false',
 			idtype: '',
 			activation:function(object,owner,id){
-				$.getJSON(OC.filePath('calendar', 'ajax/share', 'activation.php'),{id:id, idtype:'calendar', activation:object.checked?1:0});
+				$.post(OC.filePath('calendar', 'ajax/share', 'activation.php'),{id:id, idtype:'calendar', activation:object.checked?1:0});
 				$('#calendar_holder').fullCalendar('refetchEvents');
 			},
 			dropdown:function(userid, calid){
 				$('.calendar_share_dropdown').remove();
 				var element = document.getElementById(userid+'_'+calid);
 				$('<div class="calendar_share_dropdown"></div>').appendTo(element);
-				$.get(OC.filePath('calendar', 'ajax/share', 'dropdown.php') + '?calid=' + calid, function(data){
+				$.post(OC.filePath('calendar', 'ajax/share', 'dropdown.php'), {calid: calid}, function(data){
 					$('.calendar_share_dropdown').html(data);
 					$('.calendar_share_dropdown').show('blind');
 					$('#share_user').chosen();
@@ -519,7 +519,7 @@ Calendar={
 				Calendar.UI.Share.idtype = 'calendar';
 			},
 			share:function(id, idtype, sharewith, sharetype){
-				$.getJSON(OC.filePath('calendar', 'ajax/share', 'share.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(data){
+				$.post(OC.filePath('calendar', 'ajax/share', 'share.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(data){
 					if(sharetype == 'public'){
 						$('#public_token').val(parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=calendar&t='+data.message);
 						$('#public_token').css('display', 'block');
@@ -527,7 +527,7 @@ Calendar={
 				});
 			},
 			unshare:function(id, idtype, sharewith, sharetype){
-				$.getJSON(OC.filePath('calendar', 'ajax/share', 'unshare.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(){
+				$.post(OC.filePath('calendar', 'ajax/share', 'unshare.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(){
 					if(sharetype == 'public'){
 						$('#public_token').val('');
 						$('#public_token').css('display', 'none');
@@ -535,7 +535,7 @@ Calendar={
 				});
 			},
 			changepermission:function(id, idtype, sharewith, sharetype, permission){
-				$.getJSON(OC.filePath('calendar', 'ajax/share', 'changepermission.php'),{id:id, idtype:idtype, sharewith: sharewith, sharetype:sharetype, permission: (permission?1:0)});
+				$.post(OC.filePath('calendar', 'ajax/share', 'changepermission.php'),{id:id, idtype:idtype, sharewith: sharewith, sharetype:sharetype, permission: (permission?1:0)});
 			},
 			init:function(){
 				$('.calendar_share_dropdown').live('mouseleave', function(){
@@ -846,7 +846,7 @@ $(document).ready(function(){
 		viewDisplay: function(view) {
 			$('#datecontrol_date').html(view.title);
 			if (view.name != defaultView) {
-				$.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name);
+				$.post(OC.filePath('calendar', 'ajax', 'changeview.php'), {v:view.name});
 				defaultView = view.name;
 			}
 			Calendar.UI.setViewActive(view.name);
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
index 092d854746..99290d940e 100644
--- a/apps/calendar/js/geo.js
+++ b/apps/calendar/js/geo.js
@@ -6,7 +6,7 @@
  */
 if (navigator.geolocation) { 
 	navigator.geolocation.getCurrentPosition(function(position) {
-		$.getJSON(OC.filePath('calendar', 'ajax/settings', 'guesstimezone.php') + '?lat=' + position.coords.latitude + '&long=' + position.coords.longitude,
+		$.post(OC.filePath('calendar', 'ajax/settings', 'guesstimezone.php'), {lat: position.coords.latitude, lng: position.coords.longitude},
 		function(data){
 			if (data.status == 'success' && typeof(data.message) != 'undefined'){
 				$('#notification').html(data.message);
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 838521ec7f..0fc5018e89 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -63,7 +63,7 @@ Calendar_Import={
 		});
 	},
 	getimportstatus: function(progresskey){
-		$.get(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
+		$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progress:1,progresskey: progresskey}, function(percent){
 			$('#progressbar').progressbar('option', 'value', parseInt(percent));
 			if(percent < 100){
 				window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);

From 88341e5797c09d5cdb3c8b7ff713b4a62d51bd60 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 14:53:35 +0200
Subject: [PATCH 0260/1537] Code cleanup.

---
 apps/contacts/ajax/addproperty.php | 31 ++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 2f932d752a..42b0c78203 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -24,6 +24,12 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
+function bailOut($msg) {
+	OCP\JSON::error(array('data' => array('message' => $msg)));
+	OCP\Util::writeLog('contacts','ajax/addproperty.php: '.$msg, OCP\Util::DEBUG);
+	exit();
+}
+
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
 $value = isset($_POST['value'])?$_POST['value']:null;
@@ -31,11 +37,21 @@ $parameters = isset($_POST['parameters'])?$_POST['parameters']:array();
 
 $vcard = OC_Contacts_App::getContactVCard($id);
 
+if(!$name) {
+	bailOut(OC_Contacts_App::$l10n->t('element name is not set.'));
+}
+if(!$id) {
+	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
+}
+
+if(!$vcard) {
+	bailOut(OC_Contacts_App::$l10n->t('Could not parse contact: ').$id);
+}
+
 if(!is_array($value)){
 	$value = trim($value);
 	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))) {
-		OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add empty property.'))));
-		exit();
+		bailOut(OC_Contacts_App::$l10n->t('Cannot add empty property.'));
 	}
 } elseif($name === 'ADR') { // only add if non-empty elements.
 	$empty = true;
@@ -46,8 +62,7 @@ if(!is_array($value)){
 		}
 	}
 	if($empty) {
-		OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('At least one of the address fields has to be filled out.'))));
-		exit();
+		bailOut(OC_Contacts_App::$l10n->t('At least one of the address fields has to be filled out.'));
 	}
 }
 
@@ -56,9 +71,7 @@ $current = $vcard->select($name);
 foreach($current as $item) {
 	$tmpvalue = (is_array($value)?implode(';', $value):$value);
 	if($tmpvalue == $item->value) {
-		OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Trying to add duplicate property: ').$name.': '.$tmpvalue)));
-		OCP\Util::writeLog('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OCP\Util::DEBUG);
-		exit();
+		bailOut(OC_Contacts_App::$l10n->t('Trying to add duplicate property: '.$name.': '.$tmpvalue));
 	}
 }
 
@@ -114,9 +127,7 @@ foreach ($parameters as $key=>$element) {
 $checksum = md5($vcard->children[$line]->serialize());
 
 if(!OC_Contacts_VCard::edit($id,$vcard)) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding contact property.'))));
-	OCP\Util::writeLog('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OCP\Util::ERROR);
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('Error adding contact property: '.$name));
 }
 
 OCP\JSON::success(array('data' => array( 'checksum' => $checksum )));

From 081e1874cb476a16d7fd2d6ed5dabaeca61fffae Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 15:00:18 +0200
Subject: [PATCH 0261/1537] Contacts: Use POST instead of GET.

---
 apps/contacts/ajax/deletecard.php     | 2 +-
 apps/contacts/ajax/deleteproperty.php | 4 ++--
 apps/contacts/js/contacts.js          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
index 6414fda93c..e6d0405a24 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -29,7 +29,7 @@ function bailOut($msg) {
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$id = isset($_GET['id'])?$_GET['id']:null;
+$id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
 	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
 }
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index b0746d18a7..e6c2bd9f80 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -24,8 +24,8 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$id = $_GET['id'];
-$checksum = $_GET['checksum'];
+$id = $_POST['id'];
+$checksum = $_POST['checksum'];
 
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 35d4a4a216..a241856300 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -368,7 +368,7 @@ Contacts={
 				$('#contacts_deletecard').tipsy('hide');
 				OC.dialogs.confirm(t('contacts', 'Are you sure you want to delete this contact?'), t('contacts', 'Warning'), function(answer) {
 					if(answer == true) {
-						$.getJSON(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':Contacts.UI.Card.id},function(jsondata){
+						$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':Contacts.UI.Card.id},function(jsondata){
 							if(jsondata.status == 'success'){
 								var newid = '';
 								var curlistitem = $('#leftcontent [data-id="'+jsondata.data.id+'"]');
@@ -707,7 +707,7 @@ Contacts={
 				Contacts.UI.loading(obj, true);
 				var checksum = Contacts.UI.checksumFor(obj);
 				if(checksum) {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
+					$.post(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
 						if(jsondata.status == 'success'){
 							if(type == 'list') {
 								Contacts.UI.propertyContainerFor(obj).remove();

From 344299a074e135140262d051531f723be69c786f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 15:05:14 +0200
Subject: [PATCH 0262/1537] =?UTF-8?q?add=20two=20csrf=20check=20calls.=20R?=
 =?UTF-8?q?eview=20and=20lot=C2=B4s=20of=20porting=20needed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/public/util.php | 20 ++++++++++++++++
 lib/util.php        | 56 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/lib/public/util.php b/lib/public/util.php
index 9b499574da..995161e2ab 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -248,6 +248,26 @@ class Util {
 	}
 
 
+	/**
+ 	 * Register an get/post call. This is important to prevent CSRF attacks
+	 * TODO: write example
+	 */
+	public static function callRegister(){
+		return(\OC_Util::callRegister());
+	}
+
+
+	/**
+	 * Check an ajax get/post call if the request token is valid. exit if not.
+	 * Todo: Write howto
+	 */
+	public static function callCheck(){
+		return(\OC_Util::callCheck());
+	}
+
+
+
+
 }
 
 ?>
diff --git a/lib/util.php b/lib/util.php
index 20888fa71f..ef8ba8efe7 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -343,4 +343,60 @@ class OC_Util {
 		}
 		return $id;
 	}
+
+	/**
+	 * Register an get/post call. This is important to prevent CSRF attacks
+	 * Todo: Write howto
+	 */
+	public static function callRegister(){
+		// generate a random token.
+		$token=mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000);
+
+		// store the token together with a timestamp in the session.
+		$_SESSION['requesttoken-'.$token]=time();
+
+		// return the token
+		return($token);
+	}
+
+
+	/**
+	 * Check an ajax get/post call if the request token is valid. exit if not.
+	 * Todo: Write howto
+	 */
+	public static function callCheck(){
+		//mamimum time before token exires
+		$maxtime=(60*60);  // 1 hour
+
+		// searches in the get and post arrays for the token.
+		if(isset($_GET['requesttoken'])) {
+			$token=$_GET['requesttoken'];
+		}elseif(isset($_POST['requesttoken'])){
+			$token=$_POST['requesttoken'];
+		}else{
+			//no token found. exiting
+			exit;
+		}
+
+		// check if the token is in the user session and if the timestamp is from the last hour.
+		if(isset($_SESSION['requesttoken-'.$token])) {
+			$timestamp=$_SESSION['requesttoken-'.$token];
+			if($timestamp+$maxtime<time){
+				//token exired. exiting
+				exit;
+
+			}else{
+				//token valid
+				return;
+			}
+		}else{
+			//no token found. exiting
+			exit;
+		}
+	}
+
+
+
+
+
 }

From cfe219fbb9f2f734b063041ae420400044f90000 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 15:07:09 +0200
Subject: [PATCH 0263/1537] fix potential xss in multiselect

---
 core/js/multiselect.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 541dddf0f7..5f339006d2 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -57,8 +57,11 @@
 				element=$(element);
 				var item=element.val();
 				var id='ms'+multiSelectId+'-option-'+item;
-				var input=$('<input id="'+id+'" type="checkbox"/>');
-				var label=$('<label for="'+id+'">'+item+'</label>');
+				var input=$('<input type="checkbox"/>');
+				input.attr('id',id);
+				var label=$('<label/>');
+				label.attr('for',id);
+				label.text(item);
 				if(settings.checked.indexOf(item)!=-1 || checked){
 					input.attr('checked',true);
 				}
@@ -130,7 +133,10 @@
 							li.text('+ '+settings.createText);
 							li.before(createItem(this));
 							var select=button.parent().next();
-							select.append($('<option selected="selected" value="'+$(this).val()+'">'+$(this).val()+'</option>'));
+							var option=$('<option selected="selected"/>');
+							option.attr('value',$(this).val());
+							option.text($(this).val());
+							select.append(optione);
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
 							if(settings.createCallback){

From 001293a702be1373c327bc8d5222df3924a7f66a Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 9 Jun 2012 15:12:28 +0200
Subject: [PATCH 0264/1537] removing app access check, fix title for links in
 tiles

---
 apps/gallery/lib/managers.php | 3 ---
 apps/gallery/lib/tiles.php    | 2 +-
 lib/image.php                 | 6 +++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 4130005893..f9a67b8b11 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -4,9 +4,6 @@ namespace OC\Pictures;
 
 require_once('lib/base.php');
 
-\OCP\JSON::checkLoggedIn();
-\OCP\JSON::checkAppEnabled('gallery');
-
 class DatabaseManager {
 	private static $instance = null;
 	const TAG = 'DatabaseManager';
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index f1961cb72e..e43c99bb76 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -95,7 +95,7 @@ class TileSingle extends TileBase {
 	public function get($extra = '') {
 		//	!HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
 		//	!HACK! will result in failing of opening them 
-		return '<a rel="images" title="'.basename($this->getPath()).'" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
+		return '<a rel="images" title="'.htmlentities(basename($this->getPath())).'" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
 	}
 	
 	public function getMiniatureSrc() {
diff --git a/lib/image.php b/lib/image.php
index af61f9424e..5a2e820248 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -407,7 +407,11 @@ class OC_Image {
 				break;
 			*/
 			default:
-				$this->resource = imagecreatefromstring(file_get_contents($imagepath));
+			error_log($imagepath);
+			error_log(\OC_Filesystem::getInternalPath($imagepath));
+			error_log(\OC_Filesystem::getLocalFile($imagepath));
+				// this is mostly file created from encrypted file
+				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getInternalPath($imagepath)));
 				$itype = IMAGETYPE_PNG;
 				OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
 				break;

From cfb9c764ca06ad431925aaa4dcf8dc35ed3fb394 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 15:13:09 +0200
Subject: [PATCH 0265/1537] fix creation of monthly repeated events

---
 apps/calendar/lib/object.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index cc80a0bb70..9e4806227b 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -665,6 +665,9 @@ class OC_Calendar_Object{
 								$byday .= ',' . $weekofmonth . $days[$day];
 							}
 						}
+						if($byday == ''){
+							$byday = 'MO,TU,WE,TH,FR,SA,SU';
+						}
 						$rrule .= ';BYDAY=' . $byday;
 					}
 					break;

From 531132d64f7eab2e5f175164b0b0c6d322145d10 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 15:14:49 +0200
Subject: [PATCH 0266/1537] fix a bug in when

---
 3rdparty/when/When.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
index 5f97f0eb9b..185836bf0c 100644
--- a/3rdparty/when/When.php
+++ b/3rdparty/when/When.php
@@ -586,7 +586,7 @@ class When
 				}
 			}
 		}
-		elseif($this->gobyday || $interval == "month")
+		elseif($this->gobyday && $interval == "month")
 		{
 			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
 			foreach($_mdays as $_mday)
@@ -621,7 +621,13 @@ class When
 		
 		if($interval == "month")
 		{
-			$this->try_date->modify('last day of ' . $this->interval . ' ' . $interval);
+			
+			$this->try_date->modify('first day of next month');
+			if((int) date('t', $this->try_date->format('U')) > (int) $this->start_date->format('j')){
+				$this->try_date->modify('+' . (int) $this->start_date->format('j') - 1 . ' day'); 
+			}else{
+				$this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); 
+			}
 		}
 		else
 		{
@@ -722,4 +728,4 @@ class When
 			}
 		}
 	}
-}
+}
\ No newline at end of file

From 120997112c7acf490171d07ec32cdd6d091db9c2 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 9 Jun 2012 15:22:02 +0200
Subject: [PATCH 0267/1537] handle encrypted images files in oc_image

---
 lib/image.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 5a2e820248..41e8c744d8 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -407,11 +407,14 @@ class OC_Image {
 				break;
 			*/
 			default:
-			error_log($imagepath);
-			error_log(\OC_Filesystem::getInternalPath($imagepath));
-			error_log(\OC_Filesystem::getLocalFile($imagepath));
+			
 				// this is mostly file created from encrypted file
-				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getInternalPath($imagepath)));
+				$datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
+				$newimgpath = $imagepath;
+				if (strncmp($newimgpath, $datadir, strlen($datadir)) == 0) {
+					$newimgpath = substr($imagepath, strlen($datadir));
+				}
+				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents($newimgpath));
 				$itype = IMAGETYPE_PNG;
 				OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
 				break;

From 43501309e336ac0268b6e9b4b3c6f5b0f05f7056 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 9 Jun 2012 15:26:26 +0200
Subject: [PATCH 0268/1537] add function in filesystem to strip webroot

---
 lib/filesystem.php | 14 ++++++++++++++
 lib/image.php      |  7 +------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 337b0f1464..454bb1aa81 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -343,6 +343,20 @@ class OC_Filesystem{
 		return self::$defaultInstance->getLocalFile($path);
 	}
 	
+	/**
+	* return path to file which reflects one visible in browser
+	* @param string path
+	* @return string
+	*/
+	static public function getLocalPath($path) {
+		$datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
+		$newpath = $path;
+		if (strncmp($newpath, $datadir, strlen($datadir)) == 0) {
+			$newpath = substr($path, strlen($datadir));
+		}
+		return $newpath;
+	}
+	
 	/**
 	 * check if the requested path is valid
 	 * @param string path
diff --git a/lib/image.php b/lib/image.php
index 41e8c744d8..d72960101f 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -409,12 +409,7 @@ class OC_Image {
 			default:
 			
 				// this is mostly file created from encrypted file
-				$datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
-				$newimgpath = $imagepath;
-				if (strncmp($newimgpath, $datadir, strlen($datadir)) == 0) {
-					$newimgpath = substr($imagepath, strlen($datadir));
-				}
-				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents($newimgpath));
+				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($newimgpath)));
 				$itype = IMAGETYPE_PNG;
 				OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
 				break;

From ec55eaef5bf5f198dd9fdc46d41fa9e62105f281 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 15:25:00 +0200
Subject: [PATCH 0269/1537] dont load apps when displaying the login page

and only load authentication apps during login
---
 index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index d552c149df..940bb79720 100755
--- a/index.php
+++ b/index.php
@@ -69,10 +69,10 @@ elseif(OC_User::isLoggedIn()) {
 
 // For all others cases, we display the guest page :
 } else {
-	OC_App::loadApps();
 	$error = false;
 	// remember was checked after last login
 	if(isset($_COOKIE["oc_remember_login"]) && isset($_COOKIE["oc_token"]) && isset($_COOKIE["oc_username"]) && $_COOKIE["oc_remember_login"]) {
+		OC_App::loadApps(array('authentication'));
 		if(defined("DEBUG") && DEBUG) {
 			OC_Log::write('core','Trying to login from cookie',OC_Log::DEBUG);
 		}
@@ -88,6 +88,7 @@ elseif(OC_User::isLoggedIn()) {
 
 	// Someone wants to log in :
 	} elseif(isset($_POST["user"]) and isset($_POST['password']) and isset($_SESSION['sectoken']) and isset($_POST['sectoken']) and ($_SESSION['sectoken']==$_POST['sectoken']) ) {
+		OC_App::loadApps(array('authentication'));
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
 			if(!empty($_POST["remember_login"])){
 				if(defined("DEBUG") && DEBUG) {
@@ -107,6 +108,7 @@ elseif(OC_User::isLoggedIn()) {
 	
 	// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
 	} elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){
+		OC_App::loadApps(array('authentication'));
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
 			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();

From 6e9fea341b98e4964f404fe5bc773e6f161999ec Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 15:33:38 +0200
Subject: [PATCH 0270/1537] Changed preferences configvalue to clob. Fixes
 several bugs e.g. oc-825 and oc-743.

---
 db_structure.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index d29dcb46f8..94567b4d53 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -432,10 +432,8 @@
 
    <field>
     <name>configvalue</name>
-    <type>text</type>
-    <default></default>
+    <type>clob</type>
     <notnull>true</notnull>
-    <length>255</length>
    </field>
 
   </declaration>

From 28627406740e3b9e2aa51006f344d9f0e79b3f93 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 15:38:03 +0200
Subject: [PATCH 0271/1537] increase height of event dialog

---
 apps/calendar/js/calendar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index f869fcf2ad..7ae4a3a6eb 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -49,6 +49,7 @@ Calendar={
 			$( "#event" ).tabs({ selected: 0});
 			$('#event').dialog({
 				width : 500,
+				height: 600,
 				close : function(event, ui) {
 					$(this).dialog('destroy').remove();
 				}

From ba1dec64c174793a714346871c58387cb2578527 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 15:57:57 +0200
Subject: [PATCH 0272/1537] load all apps when loging in, needed for apps
 listening to login hooks

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 940bb79720..07f8436720 100755
--- a/index.php
+++ b/index.php
@@ -88,7 +88,7 @@ elseif(OC_User::isLoggedIn()) {
 
 	// Someone wants to log in :
 	} elseif(isset($_POST["user"]) and isset($_POST['password']) and isset($_SESSION['sectoken']) and isset($_POST['sectoken']) and ($_SESSION['sectoken']==$_POST['sectoken']) ) {
-		OC_App::loadApps(array('authentication'));
+		OC_App::loadApps();
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
 			if(!empty($_POST["remember_login"])){
 				if(defined("DEBUG") && DEBUG) {

From b16136642b7b2629d1105ebe02af6313904bd837 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 16:04:47 +0200
Subject: [PATCH 0273/1537] Bump version to trigger db update.

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index ef8ba8efe7..53096f029a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -83,7 +83,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,80,0);
+		return array(4,80,1);
 	}
 
 	/**

From c9214afff804ec60f90b514159520355aa6e80c6 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 16:34:43 +0200
Subject: [PATCH 0274/1537] fix XSS in Calendar

---
 apps/calendar/templates/part.choosecalendar.rowfields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index bad268897b..268c335601 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -2,7 +2,7 @@
 echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>';
 echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . htmlspecialchars($_['calendar']['displayname']) . '</label></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img  class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>';
-echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
+echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . htmlentities($_['calendar']['uri']) . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
 echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>';
 echo '<td width="20px"><a  href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/rename.svg').'"></a></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></td>';

From e7f6f7e452131320a73861ad975c3d7961074190 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 16:44:48 +0200
Subject: [PATCH 0275/1537] fix another XSS

---
 apps/calendar/templates/part.import.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index 39cda29c20..b966100cc1 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -8,6 +8,9 @@
 <?php
 $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
 $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
+for($i = 0;$i<count($calendar_options);$i++){
+	$calendar_options[$i]['displayname'] = htmlspecialchars($calendar_options[$i]['displayname']);
+}
 echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 ?>
 </select>

From 601bac746d62540425f7a9e13ffbbc61e12eaca2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 17:33:57 +0200
Subject: [PATCH 0276/1537] use absolute path for file proxies

---
 apps/files_encryption/lib/cryptstream.php |  6 +++-
 apps/files_encryption/lib/proxy.php       |  2 +-
 apps/files_encryption/tests/proxy.php     | 15 ++++++++
 lib/filesystemview.php                    | 44 ++++++++++++++++++++---
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index d6643f3268..a698ee0033 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -35,8 +35,12 @@ class OC_CryptStream{
 	private $meta=array();//header/meta for source stream
 	private $count;
 	private $writeCache;
+	private static $rootView;
 
 	public function stream_open($path, $mode, $options, &$opened_path){
+		if(!self::$rootView){
+			self::$rootView=new OC_FilesystemView('');
+		}
 		$path=str_replace('crypt://','',$path);
 		if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])){
 			$this->source=self::$sourceStreams[basename($path)]['stream'];
@@ -45,7 +49,7 @@ class OC_CryptStream{
 			$this->path=$path;
 			OCP\Util::writeLog('files_encryption','open encrypted '.$path. ' in '.$mode,OCP\Util::DEBUG);
 			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
-			$this->source=OC_FileSystem::fopen($path,$mode);
+			$this->source=self::$rootView->fopen($path,$mode);
 			OC_FileProxy::$enabled=true;
 			if(!is_resource($this->source)){
 				OCP\Util::writeLog('files_encryption','failed to open '.$path,OCP\Util::ERROR);
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 06f963fc98..9fd57c0f02 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @return bool
 	 */
 	private static function isEncrypted($path){
-		$metadata=OC_FileCache::getCached($path);
+		$metadata=OC_FileCache::getCached($path,'');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
 	
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 0450de82ac..f36b219343 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -30,6 +30,9 @@ class Test_CryptProxy extends UnitTestCase {
 	}
 
 	public function testSimple(){
+		$oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
+		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+	
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$original=file_get_contents($file);
 
@@ -42,5 +45,17 @@ class Test_CryptProxy extends UnitTestCase {
 		$fromFile=OC_Filesystem::file_get_contents('/file');
 		$this->assertNotEqual($original,$stored);
 		$this->assertEqual($original,$fromFile);
+
+		$rootView=new OC_FilesystemView('');
+		$view=new OC_FilesystemView('/'.OC_User::getUser());
+		$userDir='/'.OC_User::getUser().'/files';
+
+		$fromFile=$rootView->file_get_contents($userDir.'/file');
+		$this->assertEqual($original,$fromFile);
+
+		$fromFile=$view->file_get_contents('files/file');
+		$this->assertEqual($original,$fromFile);
+
+		OCP\Config::setAppValue('files_encryption','enable_encryption',$oldConfig);
 	}
 }
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 6e34257a46..58657671b9 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -91,6 +91,23 @@ class OC_FilesystemView {
 		}
 		return $this->internal_path_cache[$path];
 	}
+
+	/**
+	 * get path relative to the root of the view
+	 * @param string path
+	 * @return string
+	 */
+	public function getRelativePath($path){
+		if($this->fakeRoot==''){
+			return $path;
+		}
+		if(strpos($path,$this->fakeRoot)!==0){
+			return null;
+		}else{
+			return substr($path,strlen($this->fakeRoot));
+		}
+	}
+	
 	/**
 	* get the storage object for a path
 	* @param string path
@@ -232,7 +249,14 @@ class OC_FilesystemView {
 		return $this->basicOperation('unlink',$path,array('delete'));
 	}
 	public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and OC_Filesystem::isValidPath($path2)){
+		$absolutePath1=$this->getAbsolutePath($path1);
+		$absolutePath2=$this->getAbsolutePath($path2);
+		if(OC_FileProxy::runPreProxies('rename',$absolutePath1,$absolutePath2) and OC_Filesystem::isValidPath($path2)){
+			$path1=$this->getRelativePath($absolutePath1);
+			$path2=$this->getRelativePath($absolutePath2);
+			if($path1==null or $path2==null){
+				return false;
+			}
 			$run=true;
 			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
 			if($run){
@@ -256,7 +280,14 @@ class OC_FilesystemView {
 		}
 	}
 	public function copy($path1,$path2){
-		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and $this->is_readable($path1) and OC_Filesystem::isValidPath($path2)){
+		$absolutePath1=$this->getAbsolutePath($path1);
+		$absolutePath2=$this->getAbsolutePath($path2);
+		if(OC_FileProxy::runPreProxies('copy',$absolutePath1,$absolutePath2) and OC_Filesystem::isValidPath($path2)){
+			$path1=$this->getRelativePath($absolutePath1);
+			$path2=$this->getRelativePath($absolutePath2);
+			if($path1==null or $path2==null){
+				return false;
+			}
 			$run=true;
 			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
 			$exists=$this->file_exists($path2);
@@ -375,7 +406,12 @@ class OC_FilesystemView {
 	 * OC_Filestorage for delegation to a storage backend for execution
 	 */
 	private function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and OC_Filesystem::isValidPath($path)){
+		$absolutePath=$this->getAbsolutePath($path);
+		if(OC_FileProxy::runPreProxies($operation,$absolutePath, $extraParam) and OC_Filesystem::isValidPath($path)){
+			$path=$this->getRelativePath($absolutePath);
+			if($path==null){
+				return false;
+			}
 			$internalPath=$this->getInternalPath($path);
 			$run=true;
 			if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
@@ -393,7 +429,7 @@ class OC_FilesystemView {
 				}else{
 					$result=$storage->$operation($internalPath);
 				}
-				$result=OC_FileProxy::runPostProxies($operation,$path,$result);
+				$result=OC_FileProxy::runPostProxies($operation,$this->getAbsolutePath($path),$result);
 				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
 					if($operation!='fopen'){//no post hooks for fopen, the file stream is still open
 						foreach($hooks as $hook){

From d065b2d29edb4bb72492dde46293e77fa03b50d6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 17:39:14 +0200
Subject: [PATCH 0277/1537] prevent opening non-music files through the media
 ajax api

---
 apps/media/ajax/api.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 6e269f3bb7..a229c17e80 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -103,6 +103,10 @@ if($arguments['action']){
 			@ob_end_clean();
 			
 			$ftype=OC_Filesystem::getMimeType( $arguments['path'] );
+			if(substr($ftype,0,5)!='audio' and $ftype!='application/ogg'){
+				echo 'Not an audio file';
+				exit();
+			}
 			
 			$songId=OC_MEDIA_COLLECTION::getSongByPath($arguments['path']);
 			OC_MEDIA_COLLECTION::registerPlay($songId);

From 897bfa8814eaebe6d0d44b8554b99725819214e7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 17:43:02 +0200
Subject: [PATCH 0278/1537] finally fix the updater. next is an automatic
 updater. but this is a bit more tricky.

---
 config/config.sample.php |  3 +++
 lib/updater.php          | 17 +++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 0c0ace521e..bb13b1f8ea 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -74,6 +74,9 @@ $CONFIG = array(
 /* Check 3rdparty apps for malicious code fragments */
 "appcodechecker" => "",
 
+/* Check if ownCloud is up to date */
+"updatechecker" => true,
+
 /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
 "log_type" => "owncloud",
 
diff --git a/lib/updater.php b/lib/updater.php
index bc5ee00b6a..5d97178c30 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -30,11 +30,12 @@ class OC_Updater{
 	 */
 	public static function check(){
 		OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
+		if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat',microtime(true));
 
 		$updaterurl='http://apps.owncloud.com/updater.php';
 		$version=OC_Util::getVersion();
-		$version['installed']=OC_Config::getValue('installedat');
-		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat', OC_Config::getValue( 'lastupdatedat'));
+		$version['installed']=OC_Appconfig::getValue('core', 'installedat');
+		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat');
 		$version['updatechannel']='stable';
 		$version['edition']=OC_Util::getEditionString();
 		$versionstring=implode('x',$version);
@@ -57,11 +58,15 @@ class OC_Updater{
 	}
 
 	public static function ShowUpdatingHint(){
-		$data=OC_Updater::check();
-		if(isset($data['version']) and $data['version']<>'') {
-			$txt='<span style="color:#AA0000; font-weight:bold;">'.$data['versionstring'].' is available. Get <a href="'.$data['web'].'">more information</a></span>';
+		if(OC_Config::getValue('updatechecker', true)==true){
+			$data=OC_Updater::check();
+			if(isset($data['version']) and $data['version']<>'') {
+				$txt='<span style="color:#AA0000; font-weight:bold;">'.$data['versionstring'].' is available. Get <a href="'.$data['web'].'">more information</a></span>';
+			}else{
+				$txt='up to date';
+			}
 		}else{
-			$txt='up to date';
+			$txt='updates check is disabled';
 		}
 		return($txt);
 	}

From b46903fa767eae1152bcd285250556ebf13130b9 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 9 Jun 2012 20:39:24 +0200
Subject: [PATCH 0279/1537] sanitize  when logged in as another user

---
 apps/remoteStorage/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index ac0e83bb37..f508983d05 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -112,7 +112,7 @@ if($userId && $appUrl && $categories) {
 		}//end 'need to click Allow still'
 	} else {//login not ok
 		if($currUser) {
-			die('You are logged in as '.$currUser.' instead of '.$userId);
+			die('You are logged in as '.$currUser.' instead of '.htmlentities($userId));
 		} else {
 			header('Location: /?redirect_url='.urlencode('/apps/remoteStorage/auth.php'.$_SERVER['PATH_INFO'].'?'.$_SERVER['QUERY_STRING']));
 		}

From ab41b57f6266200e1b1c94d45487975163deb560 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 9 Jun 2012 15:02:26 -0400
Subject: [PATCH 0280/1537] Add Dropbox storage backend

---
 3rdparty/Dropbox/API.php                    | 380 ++++++++++++++++++++
 3rdparty/Dropbox/Exception.php              |  15 +
 3rdparty/Dropbox/Exception/Forbidden.php    |  18 +
 3rdparty/Dropbox/Exception/NotFound.php     |  20 ++
 3rdparty/Dropbox/Exception/OverQuota.php    |  20 ++
 3rdparty/Dropbox/Exception/RequestToken.php |  18 +
 3rdparty/Dropbox/LICENSE.txt                |  19 +
 3rdparty/Dropbox/OAuth.php                  | 151 ++++++++
 3rdparty/Dropbox/OAuth/Consumer/Dropbox.php |  37 ++
 3rdparty/Dropbox/OAuth/Curl.php             | 282 +++++++++++++++
 3rdparty/Dropbox/README.md                  |  31 ++
 3rdparty/Dropbox/autoload.php               |  29 ++
 apps/files_external/appinfo/app.php         |   1 +
 apps/files_external/lib/dropbox.php         | 203 +++++++++++
 14 files changed, 1224 insertions(+)
 create mode 100644 3rdparty/Dropbox/API.php
 create mode 100644 3rdparty/Dropbox/Exception.php
 create mode 100644 3rdparty/Dropbox/Exception/Forbidden.php
 create mode 100644 3rdparty/Dropbox/Exception/NotFound.php
 create mode 100644 3rdparty/Dropbox/Exception/OverQuota.php
 create mode 100644 3rdparty/Dropbox/Exception/RequestToken.php
 create mode 100644 3rdparty/Dropbox/LICENSE.txt
 create mode 100644 3rdparty/Dropbox/OAuth.php
 create mode 100644 3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
 create mode 100644 3rdparty/Dropbox/OAuth/Curl.php
 create mode 100644 3rdparty/Dropbox/README.md
 create mode 100644 3rdparty/Dropbox/autoload.php
 create mode 100755 apps/files_external/lib/dropbox.php

diff --git a/3rdparty/Dropbox/API.php b/3rdparty/Dropbox/API.php
new file mode 100644
index 0000000000..cff6c35c7f
--- /dev/null
+++ b/3rdparty/Dropbox/API.php
@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * Dropbox API class 
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+class Dropbox_API {
+
+    /**
+     * Sandbox root-path
+     */
+    const ROOT_SANDBOX = 'sandbox';
+
+    /**
+     * Dropbox root-path
+     */
+    const ROOT_DROPBOX = 'dropbox';
+    
+    /**
+     * API URl
+     */
+    protected $api_url = 'https://api.dropbox.com/1/';
+    
+    /**
+     * Content API URl
+     */
+    protected $api_content_url = 'https://api-content.dropbox.com/1/';
+
+    /**
+     * OAuth object 
+     * 
+     * @var Dropbox_OAuth
+     */
+    protected $oauth;
+    
+    /**
+     * Default root-path, this will most likely be 'sandbox' or 'dropbox' 
+     * 
+     * @var string 
+     */
+    protected $root;
+    protected $useSSL;
+
+    /**
+     * Constructor 
+     * 
+     * @param Dropbox_OAuth Dropbox_Auth object
+     * @param string $root default root path (sandbox or dropbox) 
+     */
+    public function __construct(Dropbox_OAuth $oauth, $root = self::ROOT_DROPBOX, $useSSL = true) {
+
+        $this->oauth = $oauth;
+        $this->root = $root;
+        $this->useSSL = $useSSL;
+        if (!$this->useSSL)
+        {
+            throw new Dropbox_Exception('Dropbox REST API now requires that all requests use SSL');
+        }
+
+    }
+
+    /**
+     * Returns information about the current dropbox account 
+     * 
+     * @return stdclass 
+     */
+    public function getAccountInfo() {
+
+        $data = $this->oauth->fetch($this->api_url . 'account/info');
+        return json_decode($data['body'],true);
+
+    }
+
+    /**
+     * Returns a file's contents 
+     * 
+     * @param string $path path 
+     * @param string $root Use this to override the default root path (sandbox/dropbox) 
+     * @return string 
+     */
+    public function getFile($path = '', $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $result = $this->oauth->fetch($this->api_content_url . 'files/' . $root . '/' . ltrim($path,'/'));
+        return $result['body'];
+
+    }
+
+    /**
+     * Uploads a new file
+     *
+     * @param string $path Target path (including filename) 
+     * @param string $file Either a path to a file or a stream resource 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return bool 
+     */
+    public function putFile($path, $file, $root = null) {
+
+        $directory = dirname($path);
+        $filename = basename($path);
+
+        if($directory==='.') $directory = '';
+        $directory = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($directory));
+//         $filename = str_replace('~', '%7E', rawurlencode($filename));
+        if (is_null($root)) $root = $this->root;
+
+        if (is_string($file)) {
+
+            $file = fopen($file,'rb');
+
+        } elseif (!is_resource($file)) {
+            throw new Dropbox_Exception('File must be a file-resource or a string');
+        }
+        $result=$this->multipartFetch($this->api_content_url . 'files/' . 
+                $root . '/' . trim($directory,'/'), $file, $filename);
+        
+        if(!isset($result["httpStatus"]) || $result["httpStatus"] != 200) 
+            throw new Dropbox_Exception("Uploading file to Dropbox failed");
+
+        return true;
+    }
+
+
+    /**
+     * Copies a file or directory from one location to another 
+     *
+     * This method returns the file information of the newly created file.
+     *
+     * @param string $from source path 
+     * @param string $to destination path 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return stdclass 
+     */
+    public function copy($from, $to, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root));
+
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+     * Creates a new folder 
+     *
+     * This method returns the information from the newly created directory
+     *
+     * @param string $path 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return stdclass 
+     */
+    public function createFolder($path, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+
+        // Making sure the path starts with a /
+//         $path = '/' . ltrim($path,'/');
+
+        $response = $this->oauth->fetch($this->api_url . 'fileops/create_folder', array('path' => $path, 'root' => $root),'POST');
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+     * Deletes a file or folder.
+     *
+     * This method will return the metadata information from the deleted file or folder, if successful.
+     * 
+     * @param string $path Path to new folder 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return array 
+     */
+    public function delete($path, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root));
+        return json_decode($response['body']);
+
+    }
+
+    /**
+     * Moves a file or directory to a new location 
+     *
+     * This method returns the information from the newly created directory
+     *
+     * @param mixed $from Source path 
+     * @param mixed $to destination path
+     * @param string $root Use this to override the default root path (sandbox/dropbox) 
+     * @return stdclass 
+     */
+    public function move($from, $to, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root));
+
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+     * Returns file and directory information
+     * 
+     * @param string $path Path to receive information from 
+     * @param bool $list When set to true, this method returns information from all files in a directory. When set to false it will only return infromation from the specified directory.
+     * @param string $hash If a hash is supplied, this method simply returns true if nothing has changed since the last request. Good for caching.
+     * @param int $fileLimit Maximum number of file-information to receive 
+     * @param string $root Use this to override the default root path (sandbox/dropbox) 
+     * @return array|true 
+     */
+    public function getMetaData($path, $list = true, $hash = null, $fileLimit = null, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+
+        $args = array(
+            'list' => $list,
+        );
+
+        if (!is_null($hash)) $args['hash'] = $hash; 
+        if (!is_null($fileLimit)) $args['file_limit'] = $fileLimit; 
+
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $response = $this->oauth->fetch($this->api_url . 'metadata/' . $root . '/' . ltrim($path,'/'), $args);
+
+        /* 304 is not modified */
+        if ($response['httpStatus']==304) {
+            return true; 
+        } else {
+            return json_decode($response['body'],true);
+        }
+
+    } 
+
+    /**
+    * A way of letting you keep up with changes to files and folders in a user's Dropbox. You can periodically call /delta to get a list of "delta entries", which are instructions on how to update your local state to match the server's state.
+    *
+    * This method returns the information from the newly created directory
+    *
+    * @param string $cursor A string that is used to keep track of your current state. On the next call pass in this value to return delta entries that have been recorded since the cursor was returned.
+    * @return stdclass
+    */
+    public function delta($cursor) {
+    
+    	$arg['cursor'] = $cursor;
+    
+    	$response = $this->oauth->fetch($this->api_url . 'delta', $arg, 'POST');
+    	return json_decode($response['body'],true);
+    
+    }
+
+    /**
+     * Returns a thumbnail (as a string) for a file path. 
+     * 
+     * @param string $path Path to file 
+     * @param string $size small, medium or large 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return string 
+     */
+    public function getThumbnail($path, $size = 'small', $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $response = $this->oauth->fetch($this->api_content_url . 'thumbnails/' . $root . '/' . ltrim($path,'/'),array('size' => $size));
+
+        return $response['body'];
+
+    }
+
+    /**
+     * This method is used to generate multipart POST requests for file upload 
+     * 
+     * @param string $uri 
+     * @param array $arguments 
+     * @return bool 
+     */
+    protected function multipartFetch($uri, $file, $filename) {
+
+        /* random string */
+        $boundary = 'R50hrfBj5JYyfR3vF3wR96GPCC9Fd2q2pVMERvEaOE3D8LZTgLLbRpNwXek3';
+
+        $headers = array(
+            'Content-Type' => 'multipart/form-data; boundary=' . $boundary,
+        );
+
+        $body="--" . $boundary . "\r\n";
+        $body.="Content-Disposition: form-data; name=file; filename=".rawurldecode($filename)."\r\n";
+        $body.="Content-type: application/octet-stream\r\n";
+        $body.="\r\n";
+        $body.=stream_get_contents($file);
+        $body.="\r\n";
+        $body.="--" . $boundary . "--";
+
+        // Dropbox requires the filename to also be part of the regular arguments, so it becomes
+        // part of the signature. 
+        $uri.='?file=' . $filename;
+
+        return $this->oauth->fetch($uri, $body, 'POST', $headers);
+
+    }
+	
+	
+	/**
+     * Search
+     *
+     * Returns metadata for all files and folders that match the search query.
+     *
+	 * @added by: diszo.sasil 
+	 *
+     * @param string $query	 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)
+	 * @param string $path
+     * @return array
+     */
+	public function search($query = '', $root = null, $path = ''){
+		if (is_null($root)) $root = $this->root;
+		if(!empty($path)){
+			$path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+		}
+        $response = $this->oauth->fetch($this->api_url . 'search/' . $root . '/' . ltrim($path,'/'),array('query' => $query));
+        return json_decode($response['body'],true);
+	}
+
+    /**
+     * Creates and returns a shareable link to files or folders.
+     * 
+     * Note: Links created by the /shares API call expire after thirty days.
+     * 
+     * @param type $path
+     * @param type $root
+     * @return type 
+     */
+    public function share($path, $root = null) {
+        if (is_null($root)) $root = $this->root;
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $response = $this->oauth->fetch($this->api_url.  'shares/'. $root . '/' . ltrim($path, '/'), array(), 'POST');
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+    * Returns a link directly to a file.
+    * Similar to /shares. The difference is that this bypasses the Dropbox webserver, used to provide a preview of the file, so that you can effectively stream the contents of your media.
+    *
+    * Note: The /media link expires after four hours, allotting enough time to stream files, but not enough to leave a connection open indefinitely.
+    *
+    * @param type $path
+    * @param type $root
+    * @return type
+    */
+    public function media($path, $root = null) {
+
+    	if (is_null($root)) $root = $this->root;
+    	$path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+    	$response = $this->oauth->fetch($this->api_url.  'media/'. $root . '/' . ltrim($path, '/'), array(), 'POST');
+    	return json_decode($response['body'],true);
+    
+    }
+
+    /**
+    * Creates and returns a copy_ref to a file. This reference string can be used to copy that file to another user's Dropbox by passing it in as the from_copy_ref parameter on /fileops/copy.
+    *
+    * @param type $path
+    * @param type $root
+    * @return type
+    */
+    public function copy_ref($path, $root = null) {
+
+    	if (is_null($root)) $root = $this->root;
+    	$path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+    	$response = $this->oauth->fetch($this->api_url.  'copy_ref/'. $root . '/' . ltrim($path, '/'));
+    	return json_decode($response['body'],true);
+    
+    }
+    
+
+}
diff --git a/3rdparty/Dropbox/Exception.php b/3rdparty/Dropbox/Exception.php
new file mode 100644
index 0000000000..50cbc4c791
--- /dev/null
+++ b/3rdparty/Dropbox/Exception.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Dropbox base exception 
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * Base exception class
+ */
+class Dropbox_Exception extends Exception { }
diff --git a/3rdparty/Dropbox/Exception/Forbidden.php b/3rdparty/Dropbox/Exception/Forbidden.php
new file mode 100644
index 0000000000..5f0378cfc7
--- /dev/null
+++ b/3rdparty/Dropbox/Exception/Forbidden.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Dropbox Forbidden exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when we receive the 403 forbidden response
+ */
+class Dropbox_Exception_Forbidden extends Dropbox_Exception {
+
+
+}
diff --git a/3rdparty/Dropbox/Exception/NotFound.php b/3rdparty/Dropbox/Exception/NotFound.php
new file mode 100644
index 0000000000..3deaf90d76
--- /dev/null
+++ b/3rdparty/Dropbox/Exception/NotFound.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Dropbox Not Found exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when a non-existant uri is accessed.
+ * 
+ * Basically, this exception is used when we get back a 404.
+ */
+class Dropbox_Exception_NotFound extends Dropbox_Exception {
+
+
+}
diff --git a/3rdparty/Dropbox/Exception/OverQuota.php b/3rdparty/Dropbox/Exception/OverQuota.php
new file mode 100644
index 0000000000..86e5425dbd
--- /dev/null
+++ b/3rdparty/Dropbox/Exception/OverQuota.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Dropbox Over Quota exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when the operation required more space than the available quota.
+ * 
+ * Basically, this exception is used when we get back a 507.
+ */
+class Dropbox_Exception_OverQuota extends Dropbox_Exception {
+
+
+}
diff --git a/3rdparty/Dropbox/Exception/RequestToken.php b/3rdparty/Dropbox/Exception/RequestToken.php
new file mode 100644
index 0000000000..5b117f2c6b
--- /dev/null
+++ b/3rdparty/Dropbox/Exception/RequestToken.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Dropbox RequestToken exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when an error occured during the request_token process.
+ */
+class Dropbox_Exception_RequestToken extends Dropbox_Exception {
+
+
+}
diff --git a/3rdparty/Dropbox/LICENSE.txt b/3rdparty/Dropbox/LICENSE.txt
new file mode 100644
index 0000000000..cd3512acee
--- /dev/null
+++ b/3rdparty/Dropbox/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2010 Rooftop Solutions
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/3rdparty/Dropbox/OAuth.php b/3rdparty/Dropbox/OAuth.php
new file mode 100644
index 0000000000..905cc2da1c
--- /dev/null
+++ b/3rdparty/Dropbox/OAuth.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Dropbox OAuth
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+
+/**
+ * This class is an abstract OAuth class.
+ *
+ * It must be extended by classes who wish to provide OAuth functionality
+ * using different libraries.
+ */
+abstract class Dropbox_OAuth {
+
+    /**
+     * After a user has authorized access, dropbox can redirect the user back
+     * to this url.
+     * 
+     * @var string
+     */
+    public $authorizeCallbackUrl = null; 
+   
+    /**
+     * Uri used to fetch request tokens 
+     * 
+     * @var string
+     */
+    const URI_REQUEST_TOKEN = 'https://api.dropbox.com/1/oauth/request_token';
+
+    /**
+     * Uri used to redirect the user to for authorization.
+     * 
+     * @var string
+     */
+    const URI_AUTHORIZE = 'https://www.dropbox.com/1/oauth/authorize';
+
+    /**
+     * Uri used to 
+     * 
+     * @var string
+     */
+    const URI_ACCESS_TOKEN = 'https://api.dropbox.com/1/oauth/access_token';
+
+    /**
+     * An OAuth request token. 
+     * 
+     * @var string 
+     */
+    protected $oauth_token = null;
+
+    /**
+     * OAuth token secret 
+     * 
+     * @var string 
+     */
+    protected $oauth_token_secret = null;
+
+
+    /**
+     * Constructor
+     * 
+     * @param string $consumerKey 
+     * @param string $consumerSecret 
+     */
+    abstract public function __construct($consumerKey, $consumerSecret);
+
+    /**
+     * Sets the request token and secret.
+     *
+     * The tokens can also be passed as an array into the first argument.
+     * The array must have the elements token and token_secret.
+     * 
+     * @param string|array $token 
+     * @param string $token_secret 
+     * @return void
+     */
+    public function setToken($token, $token_secret = null) {
+
+        if (is_array($token)) {
+            $this->oauth_token = $token['token'];
+            $this->oauth_token_secret = $token['token_secret'];
+        } else {
+            $this->oauth_token = $token;
+            $this->oauth_token_secret = $token_secret;
+        }
+
+    }
+
+    /**
+     * Returns the oauth request tokens as an associative array.
+     *
+     * The array will contain the elements 'token' and 'token_secret'.
+     * 
+     * @return array 
+     */
+    public function getToken() {
+
+        return array(
+            'token' => $this->oauth_token,
+            'token_secret' => $this->oauth_token_secret,
+        );
+
+    }
+
+    /**
+     * Returns the authorization url
+     * 
+     * @param string $callBack Specify a callback url to automatically redirect the user back 
+     * @return string 
+     */
+    public function getAuthorizeUrl($callBack = null) {
+        
+        // Building the redirect uri
+        $token = $this->getToken();
+        $uri = self::URI_AUTHORIZE . '?oauth_token=' . $token['token'];
+        if ($callBack) $uri.='&oauth_callback=' . $callBack;
+        return $uri;
+    }
+
+    /**
+     * Fetches a secured oauth url and returns the response body. 
+     * 
+     * @param string $uri 
+     * @param mixed $arguments 
+     * @param string $method 
+     * @param array $httpHeaders 
+     * @return string 
+     */
+    public abstract function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()); 
+
+    /**
+     * Requests the OAuth request token.
+     * 
+     * @return array 
+     */
+    abstract public function getRequestToken(); 
+
+    /**
+     * Requests the OAuth access tokens.
+     *
+     * @return array
+     */
+    abstract public function getAccessToken(); 
+
+}
diff --git a/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php b/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
new file mode 100644
index 0000000000..204a659de0
--- /dev/null
+++ b/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * HTTP OAuth Consumer
+ * 
+ * Adapted from halldirector's code in 
+ * http://code.google.com/p/dropbox-php/issues/detail?id=36#c5
+ * 
+ * @package Dropbox
+ * @copyright Copyright (C) 2011 Joe Constant / halldirector. All rights reserved.
+ * @author Joe Constant / halldirector
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+require_once 'HTTP/OAuth.php';
+require_once 'HTTP/OAuth/Consumer.php';
+
+/* 
+ * This class is to help work around aomw ssl issues.
+ */
+class Dropbox_OAuth_Consumer_Dropbox extends  HTTP_OAuth_Consumer
+{
+    public function getOAuthConsumerRequest()
+    {
+        if (!$this->consumerRequest instanceof HTTP_OAuth_Consumer_Request) {
+            $this->consumerRequest = new HTTP_OAuth_Consumer_Request;
+        }
+        
+        // TODO: Change this and add in code to validate the SSL cert.
+        // see https://github.com/bagder/curl/blob/master/lib/mk-ca-bundle.pl
+        $this->consumerRequest->setConfig(array(
+                    'ssl_verify_peer' => false, 
+                    'ssl_verify_host' => false
+                ));
+        
+        return $this->consumerRequest;
+    }
+}
diff --git a/3rdparty/Dropbox/OAuth/Curl.php b/3rdparty/Dropbox/OAuth/Curl.php
new file mode 100644
index 0000000000..b75b27bb36
--- /dev/null
+++ b/3rdparty/Dropbox/OAuth/Curl.php
@@ -0,0 +1,282 @@
+<?php
+
+/**
+ * Dropbox OAuth
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2011 Daniel Huesken
+ * @author Daniel Huesken (http://www.danielhuesken.de/)
+ * @license MIT
+ */
+
+/**
+ * This class is used to sign all requests to dropbox.
+ *
+ * This specific class uses WordPress WP_Http to authenticate.
+ */
+class Dropbox_OAuth_Curl extends Dropbox_OAuth {
+
+    /**
+     *
+     * @var string ConsumerKey
+     */
+    protected $consumerKey = null;
+    /**
+     *
+     * @var string ConsumerSecret
+     */
+    protected $consumerSecret = null;
+    /**
+     *
+     * @var string ProzessCallBack
+     */
+    public $ProgressFunction = false;
+	
+    /**
+     * Constructor
+     * 
+     * @param string $consumerKey 
+     * @param string $consumerSecret 
+     */
+    public function __construct($consumerKey, $consumerSecret) {
+        if (!function_exists('curl_exec')) 
+            throw new Dropbox_Exception('The PHP curl functions not available!');
+
+        $this->consumerKey = $consumerKey;
+        $this->consumerSecret = $consumerSecret;
+    }
+
+    /**
+     * Fetches a secured oauth url and returns the response body. 
+     * 
+     * @param string $uri 
+     * @param mixed $arguments 
+     * @param string $method 
+     * @param array $httpHeaders 
+     * @return string 
+     */
+    public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) {
+		
+		$uri=str_replace('http://', 'https://', $uri); // all https, upload makes problems if not
+		if (is_string($arguments) and strtoupper($method) == 'POST') {
+		    preg_match("/\?file=(.*)$/i", $uri, $matches);
+			if (isset($matches[1])) {
+                $uri = str_replace($matches[0], "", $uri);
+                $filename = $matches[1];
+				$httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, array("file" => $filename), $method));
+            }
+		} else {
+			$httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, $arguments, $method));
+		}
+		$ch = curl_init();	
+		if (strtoupper($method) == 'POST') {
+			curl_setopt($ch, CURLOPT_URL, $uri);
+			curl_setopt($ch, CURLOPT_POST, true);
+// 			if (is_array($arguments))
+// 				$arguments=http_build_query($arguments);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $arguments);
+// 			$httpHeaders['Content-Length']=strlen($arguments);
+		} else {
+			curl_setopt($ch, CURLOPT_URL, $uri.'?'.http_build_query($arguments));
+			curl_setopt($ch, CURLOPT_POST, false);
+		}
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+//         curl_setopt($ch, CURLOPT_CAINFO, "rootca");
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+		//Build header
+		$headers = array();
+		foreach ($httpHeaders as $name => $value) {
+			$headers[] = "{$name}: $value";
+		}
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+		if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true );
+		if (function_exists($this->ProgressFunction) and defined('CURLOPT_PROGRESSFUNCTION')) {
+			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, $this->ProgressFunction);
+			curl_setopt($ch, CURLOPT_BUFFERSIZE, 512);
+		}
+		$response=curl_exec($ch);
+		$errorno=curl_errno($ch);
+		$error=curl_error($ch);
+		$status=curl_getinfo($ch,CURLINFO_HTTP_CODE);
+		curl_close($ch);
+		
+		
+		if (!empty($errorno))
+			throw new Dropbox_Exception_NotFound('Curl error: ('.$errorno.') '.$error."\n");
+						
+		if ($status>=300) {
+			$body = json_decode($response,true);
+			switch ($status) {
+				// Not modified
+				case 304 :
+					return array(
+						'httpStatus' => 304,
+						'body' => null,
+					);
+					break;
+				case 403 :
+					throw new Dropbox_Exception_Forbidden('Forbidden.
+						This could mean a bad OAuth request, or a file or folder already existing at the target location.
+						' . $body["error"] . "\n");
+				case 404 :
+					throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found. ' .
+							$body["error"] . "\n");
+				case 507 :
+					throw new Dropbox_Exception_OverQuota('This dropbox is full. ' .
+							$body["error"] . "\n");
+			}
+			if (!empty($body["error"]))
+				throw new Dropbox_Exception_RequestToken('Error: ('.$status.') '.$body["error"]."\n");	
+		}
+
+		return array(
+			'body' => $response,
+            'httpStatus' => $status
+        );
+    }
+
+    /**
+     * Returns named array with oauth parameters for further use
+     * @return array Array with oauth_ parameters
+     */
+    private function getOAuthBaseParams() {
+        $params['oauth_version'] = '1.0';
+        $params['oauth_signature_method'] = 'HMAC-SHA1';
+
+        $params['oauth_consumer_key'] = $this->consumerKey;
+        $tokens = $this->getToken();
+        if (isset($tokens['token']) && $tokens['token']) {
+            $params['oauth_token'] = $tokens['token'];
+        }
+        $params['oauth_timestamp'] = time();
+        $params['oauth_nonce'] = md5(microtime() . mt_rand());
+        return $params;
+    }
+
+    /**
+     * Creates valid Authorization header for OAuth, based on URI and Params
+     *
+     * @param string $uri
+     * @param array $params
+     * @param string $method GET or POST, standard is GET
+     * @param array $oAuthParams optional, pass your own oauth_params here
+     * @return array Array for request's headers section like
+     * array('Authorization' => 'OAuth ...');
+     */
+    private function getOAuthHeader($uri, $params, $method = 'GET', $oAuthParams = null) {
+        $oAuthParams = $oAuthParams ? $oAuthParams : $this->getOAuthBaseParams();
+
+        // create baseString to encode for the sent parameters
+        $baseString = $method . '&';
+        $baseString .= $this->oauth_urlencode($uri) . "&";
+
+        // OAuth header does not include GET-Parameters
+        $signatureParams = array_merge($params, $oAuthParams);
+
+        // sorting the parameters
+        ksort($signatureParams);
+
+        $encodedParams = array();
+        foreach ($signatureParams as $key => $value) {
+            $encodedParams[] = $this->oauth_urlencode($key) . '=' . $this->oauth_urlencode($value);
+        }
+
+        $baseString .= $this->oauth_urlencode(implode('&', $encodedParams));
+
+        // encode the signature
+        $tokens = $this->getToken();
+        $hash = $this->hash_hmac_sha1($this->consumerSecret.'&'.$tokens['token_secret'], $baseString);
+        $signature = base64_encode($hash);
+
+        // add signature to oAuthParams
+        $oAuthParams['oauth_signature'] = $signature;
+
+        $oAuthEncoded = array();
+        foreach ($oAuthParams as $key => $value) {
+            $oAuthEncoded[] = $key . '="' . $this->oauth_urlencode($value) . '"';
+        }
+
+        return array('Authorization' => 'OAuth ' . implode(', ', $oAuthEncoded));
+    }
+
+    /**
+     * Requests the OAuth request token.
+     *
+     * @return void 
+     */
+    public function getRequestToken() {
+        $result = $this->fetch(self::URI_REQUEST_TOKEN, array(), 'POST');
+        if ($result['httpStatus'] == "200") {
+            $tokens = array();
+            parse_str($result['body'], $tokens);
+            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
+            return $this->getToken();
+        } else {
+            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
+        }
+    }
+
+    /**
+     * Requests the OAuth access tokens.
+     *
+     * This method requires the 'unauthorized' request tokens
+     * and, if successful will set the authorized request tokens.
+     * 
+     * @return void 
+     */
+    public function getAccessToken() {
+        $result = $this->fetch(self::URI_ACCESS_TOKEN, array(), 'POST');
+        if ($result['httpStatus'] == "200") {
+            $tokens = array();
+            parse_str($result['body'], $tokens);
+            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
+            return $this->getToken();
+        } else {
+            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
+        }
+    }
+
+    /**
+     * Helper function to properly urlencode parameters.
+     * See http://php.net/manual/en/function.oauth-urlencode.php
+     *
+     * @param string $string
+     * @return string
+     */
+    private function oauth_urlencode($string) {
+        return str_replace('%E7', '~', rawurlencode($string));
+    }
+
+    /**
+     * Hash function for hmac_sha1; uses native function if available.
+     *
+     * @param string $key
+     * @param string $data
+     * @return string
+     */
+    private function hash_hmac_sha1($key, $data) {
+        if (function_exists('hash_hmac') && in_array('sha1', hash_algos())) {
+            return hash_hmac('sha1', $data, $key, true);
+        } else {
+            $blocksize = 64;
+            $hashfunc = 'sha1';
+            if (strlen($key) > $blocksize) {
+                $key = pack('H*', $hashfunc($key));
+            }
+
+            $key = str_pad($key, $blocksize, chr(0x00));
+            $ipad = str_repeat(chr(0x36), $blocksize);
+            $opad = str_repeat(chr(0x5c), $blocksize);
+            $hash = pack('H*', $hashfunc(( $key ^ $opad ) . pack('H*', $hashfunc(($key ^ $ipad) . $data))));
+
+            return $hash;
+        }
+    }
+	
+
+}
\ No newline at end of file
diff --git a/3rdparty/Dropbox/README.md b/3rdparty/Dropbox/README.md
new file mode 100644
index 0000000000..54e05db762
--- /dev/null
+++ b/3rdparty/Dropbox/README.md
@@ -0,0 +1,31 @@
+Dropbox-php
+===========
+
+This PHP library allows you to easily integrate dropbox with PHP.
+
+The following PHP extension is required:
+
+* json
+
+The library makes use of OAuth. At the moment you can use either of these libraries:
+
+[PHP OAuth extension](http://pecl.php.net/package/oauth)  
+[PEAR's HTTP_OAUTH package](http://pear.php.net/package/http_oauth)  
+
+The extension is recommended, but if you can't install php extensions you should go for the pear package.  
+Installing
+----------
+
+    pear channel-discover pear.dropbox-php.com
+    pear install dropbox-php/Dropbox-alpha
+
+Documentation
+-------------
+Check out the [documentation](http://www.dropbox-php.com/docs).  
+
+Questions?
+----------
+
+[Dropbox-php Mailing list](http://groups.google.com/group/dropbox-php)  
+[Official Dropbox developer forum](http://forums.dropbox.com/forum.php?id=5)
+ 
diff --git a/3rdparty/Dropbox/autoload.php b/3rdparty/Dropbox/autoload.php
new file mode 100644
index 0000000000..5388ea6334
--- /dev/null
+++ b/3rdparty/Dropbox/autoload.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file registers a new autoload function using spl_autoload_register. 
+ *
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * Autoloader function
+ *
+ * @param $className string
+ * @return void
+ */
+function Dropbox_autoload($className) {
+
+    if(strpos($className,'Dropbox_')===0) {
+
+        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,8)) . '.php';
+
+    }
+
+}
+
+spl_autoload_register('Dropbox_autoload');
+
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index b7a07b4aac..837d35c9c6 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -13,6 +13,7 @@ OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
 OC::$CLASSPATH['OC_Filestorage_SWIFT']='apps/files_external/lib/swift.php';
 OC::$CLASSPATH['OC_Filestorage_SMB']='apps/files_external/lib/smb.php';
 OC::$CLASSPATH['OC_Filestorage_AmazonS3']='apps/files_external/lib/amazons3.php';
+OC::$CLASSPATH['OC_Filestorage_Dropbox']='apps/files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC_Mount_Config']='apps/files_external/lib/config.php';
 
 OCP\App::registerAdmin('files_external', 'settings');
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
new file mode 100755
index 0000000000..5e94277c6d
--- /dev/null
+++ b/apps/files_external/lib/dropbox.php
@@ -0,0 +1,203 @@
+<?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 'Dropbox/autoload.php';
+
+class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
+
+	private $dropbox;
+	private $metaData = array();
+
+	private static $tempFiles = array();
+
+	public function __construct($params) {
+		$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+		$oauth->setToken($params['token'], $params['token_secret']);
+		$this->dropbox = new Dropbox_API($oauth, 'dropbox');
+		
+	}
+
+	private function getMetaData($path, $list = false) {
+		if (!$list && isset($this->metaData[$path])) {
+			return $this->metaData[$path];
+		} else {
+			if ($list) {
+				$response = $this->dropbox->getMetaData($path);
+				if ($response && isset($response['contents'])) {
+					$contents = $response['contents'];
+					// Cache folder's contents
+					foreach ($contents as $file) {
+						$this->metaData[$path.'/'.basename($file['path'])] = $file;
+					}
+					unset($response['contents']);
+					$this->metaData[$path] = $response;
+				}
+				$this->metaData[$path] = $response;
+				// Return contents of folder only
+				return $contents;
+			} else {
+				try {
+					$response = $this->dropbox->getMetaData($path, 'false');
+					$this->metaData[$path] = $response;
+					return $response;
+				} catch (Exception $exception) {
+					return false;
+				}
+			}
+		}
+	}
+
+	public function mkdir($path) {
+		return $this->dropbox->createFolder($path);
+	}
+
+	public function rmdir($path) {
+		return $this->dropbox->delete($path);
+	}
+
+	public function opendir($path) {
+		if ($contents = $this->getMetaData($path, true)) {
+			$files = array();
+			foreach ($contents as $file) {
+				$files[] = basename($file['path']);
+			}
+			OC_FakeDirStream::$dirs['dropbox'] = $files;
+			return opendir('fakedir://dropbox');
+		}
+		return false;
+	}
+
+	public function stat($path) {
+		if ($metaData = $this->getMetaData($path)) {
+			$stat['size'] = $metaData['bytes'];
+			$stat['atime'] = time();
+			$stat['mtime'] = strtotime($metaData['modified']);
+			$stat['ctime'] = $stat['mtime'];
+			return $stat;
+		}
+		return false;
+	}
+
+	public function filetype($path) {
+		if ($path == '' || $path == '/') {
+			return 'dir';
+		} else if ($metaData = $this->getMetaData($path)) {
+			if ($metaData['is_dir'] == 'true') {
+				return 'dir';
+			} else {
+				return 'file';
+			}
+		}
+		return false;
+	}
+
+	public function is_readable($path) {
+		return true;
+	}
+
+	public function is_writable($path) {
+		return true;
+	}
+
+	public function file_exists($path) {
+		if ($path == '' || $path == '/') {
+			return true;
+		}
+		if ($this->getMetaData($path)) {
+			return true;
+		}
+		return false;
+	}
+
+	public function unlink($path) {
+		return $this->dropbox->delete($path);
+	}
+
+	public function fopen($path, $mode) {
+		switch ($mode) {
+			case 'r':
+			case 'rb':
+				$tmpFile = OC_Helper::tmpFile();
+				file_put_contents($tmpFile, $this->dropbox->getFile($path));
+				return fopen($tmpFile, 'r');
+			case 'w':
+			case 'wb':
+			case 'a':
+			case 'ab':
+			case 'r+':
+			case 'w+':
+			case 'wb+':
+			case 'a+':
+			case 'x':
+			case 'x+':
+			case 'c':
+			case 'c+':
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
+				} else {
+					$ext = '';
+				}
+				$tmpFile = OC_Helper::tmpFile($ext);
+				OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				if ($this->file_exists($path)) {
+					$source = $this->fopen($path, 'r');
+					file_put_contents($tmpFile, $source);
+				}
+				self::$tempFiles[$tmpFile] = $path;
+				return fopen('close://'.$tmpFile, $mode);
+		}
+		return false;
+	}
+
+	public function writeBack($tmpFile) {
+		if (isset(self::$tempFiles[$tmpFile])) {
+			$handle = fopen($tmpFile, 'r');
+			$response = $this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
+			if ($response) {
+				unlink($tmpFile);
+			}
+		}
+	}
+
+	public function getMimeType($path) {
+		if ($this->filetype($path) == 'dir') {
+			return 'httpd/unix-directory';
+		} else if ($metaData = $this->getMetaData($path)) {
+			return $metaData['mime_type'];
+		}
+		return false;
+	}
+
+	public function free_space($path) {
+		if ($info = $this->dropbox->getAccountInfo()) {
+			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
+		}
+		return false;
+	}
+
+	public function touch($path, $mtime = null) {
+		return false;
+	}
+
+}
+
+?>
\ No newline at end of file

From 322fd512612d569c75ebbf515e5d5d9d9d5578ea Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 9 Jun 2012 21:01:12 +0200
Subject: [PATCH 0281/1537] avoid clickjacking

---
 apps/remoteStorage/auth.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index f508983d05..8cbd4aa20f 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -25,6 +25,7 @@
 *
 */
 
+header("X-Frame-Options: Sameorigin");
 
 // Do not load FS ...
 $RUNTIME_NOSETUPFS = true;

From 995f9c7348fcc6dd25a95f81030e7d3b6f04d6c3 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 9 Jun 2012 21:03:50 +0200
Subject: [PATCH 0282/1537] sanitize scope and host

---
 apps/remoteStorage/auth.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 8cbd4aa20f..99e2272d3a 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -44,9 +44,9 @@ foreach($_GET as $k => $v) {
     $userId=$v;
   } else if($k=='redirect_uri'){
     $appUrlParts=explode('/', $v);
-    $appUrl = $appUrlParts[2];//bit dodgy i guess
+    $appUrl = htmlentities($appUrlParts[2]);//TODO: check if this is equal to client_id
   } else if($k=='scope'){
-    $categories=$v;
+    $categories=htmlentities($v);
   }
 }
 $currUser = OCP\USER::getUser();

From 3947aa3ef7320805545e5339c605cf8cb81475dd Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 22:00:28 +0200
Subject: [PATCH 0283/1537] apps paging is not yet implemented. increase
 pagesize to 100 as a quickfix

---
 lib/ocsclient.php | 4 ++--
 settings/apps.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 8e976171e9..2888569ad1 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -85,7 +85,7 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the applications on the OCS server
 	 */
-	public static function getApplications($categories){
+	public static function getApplications($categories,$page){
 		if(OC_Config::getValue('appstoreenabled', true)==false){
 			return(array());
 		}
@@ -95,7 +95,7 @@ class OC_OCSClient{
 		}else{
 			$categoriesstring=$categories;
 		}
-		$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page=0&pagesize=10';
+		$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100';
 		$apps=array();
 		$xml=@file_get_contents($url);
 		if($xml==FALSE){
diff --git a/settings/apps.php b/settings/apps.php
index 1a829d371a..7908e6cc18 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -63,7 +63,8 @@ usort($apps, 'app_sort');
  $catagoryNames=OC_OCSClient::getCategories();
  if(is_array($catagoryNames)){
  	$categories=array_keys($catagoryNames);
- 	$externalApps=OC_OCSClient::getApplications($categories);
+	$page=0;
+ 	$externalApps=OC_OCSClient::getApplications($categories,$page);
  	foreach($externalApps as $app){
 		// show only external apps that are not exist yet
 		$local=false;

From 0838b4c22597156dba8744a7d5de99043fe539d4 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 10 Jun 2012 09:52:01 +0200
Subject: [PATCH 0284/1537] gallery: removing search provider for now

---
 apps/gallery/appinfo/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 2aa6a9e8f9..e3a8dbd588 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -50,6 +50,6 @@ class OC_GallerySearchProvider extends OC_Search_Provider{
 	}
 }
 
-OC_Search::registerProvider('OC_GallerySearchProvider');
+//OC_Search::registerProvider('OC_GallerySearchProvider');
 
 require_once('apps/gallery/lib/hooks_handlers.php');

From f90c8738ab79a6fc76d9482f44a199963fb27ba1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 10 Jun 2012 12:47:47 +0200
Subject: [PATCH 0285/1537] Contacts: Used non-existent var.

---
 apps/contacts/js/loader.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 961e0f425c..577ad10306 100644
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -42,20 +42,20 @@ Contacts_Import={
 			}
 			$('#newaddressbook').attr('readonly', 'readonly');
 			$('#contacts').attr('disabled', 'disabled');
-			var progresskey = $('#progresskey').val();
-			$.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
+			var progresskey = $('#progresskey').val();
+			$.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
 				if(jsondata.status == 'success'){
 					$('#progressbar').progressbar('option', 'value', 100);
 					$('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));
 				} else {
-					$('#import_done').find('p').html(jsondata.data.message);
+					$('#import_done').find('p').html(jsondata.message);
 				}
 				$('#import_done').show().find('p').addClass('bold');
 				$('#progressbar').fadeOut('slow');
 			});
 			$('#form_container').css('display', 'none');
 			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
+			window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
 		});
 		$('#contacts').change(function(){
 			if($('#contacts option:selected').val() == 'newaddressbook'){
@@ -65,11 +65,11 @@ Contacts_Import={
 			}
 		});
 	},
-	getimportstatus: function(progresskey){
-		$.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
+	getimportstatus: function(progresskey){
+		$.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
 			$('#progressbar').progressbar('option', 'value', parseInt(percent));
 			if(percent < 100){
-				window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
+				window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
 			}else{
 				$('#import_done').css('display', 'block');
 			}

From 76f20eb57c4089b51ee506a000a21ab95727da43 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 10 Jun 2012 13:04:42 +0200
Subject: [PATCH 0286/1537] fix first time image loading error

---
 apps/gallery/lib/managers.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index f9a67b8b11..9a2dbd3bae 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -26,10 +26,8 @@ class DatabaseManager {
 		if (!$image->loadFromFile($path)) {
 			return false;
 		}
-		\OCP\DB::beginTransaction();
 		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
-		\OCP\DB::commit();
 		$ret = array('path' => $path, 'width' => $image->width(), 'height' => $image->height());
 		unset($image);
 		return $ret;
@@ -78,9 +76,14 @@ class ThumbnailsManager {
 	
 	public function getThumbnailInfo($path) {
 		$arr = DatabaseManager::getInstance()->getFileData($path);
+		if (!$arr) {
+			$thubnail = $this->getThumbnail($path);
+			unset($thubnail);
+			$arr = DatabaseManager::getInstance()->getFileData($path);
+		}
 		$ret = array('filepath' => $arr['path'],
-								 'width' => $arr['width'],
-								 'height' => $arr['height']);
+					 'width' => $arr['width'],
+					 'height' => $arr['height']);
 		return $ret;
 	}
 	

From c11f6cc3f9121fbb337c248807b802c72b18087b Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 10 Jun 2012 17:25:19 +0200
Subject: [PATCH 0287/1537] fix variable name and undefined index notice

---
 apps/gallery/templates/index.php | 2 +-
 lib/image.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index e761cb5472..fd83490d60 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -82,7 +82,7 @@ sort($images);
 $arr = array();
 $tl = new \OC\Pictures\TilesLine();
 $ts = new \OC\Pictures\TileStack(array(), '');
-$previous_element = $images[0];
+$previous_element = @$images[0];
 for($i = 0; $i < count($images); $i++) {
 	$prev_dir_arr = explode('/', $previous_element);
 	$dir_arr = explode('/', $images[$i]);
diff --git a/lib/image.php b/lib/image.php
index d72960101f..e5c59bacdc 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -409,7 +409,7 @@ class OC_Image {
 			default:
 			
 				// this is mostly file created from encrypted file
-				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($newimgpath)));
+				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($imagepath)));
 				$itype = IMAGETYPE_PNG;
 				OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
 				break;

From c6a03ec6d895ba134f7b47bae403b45822c56152 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 10 Jun 2012 18:41:17 +0200
Subject: [PATCH 0288/1537] remove include command for when

---
 apps/calendar/ajax/events.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 56fa51aaff..5c7baa568a 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -5,10 +5,6 @@
  * later.
  * See the COPYING-README file.
  */
-
- 
-require_once('when/When.php');
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 

From bf4626da931b5120762f899cbcb42034244856ed Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 10 Jun 2012 19:52:23 +0200
Subject: [PATCH 0289/1537] prevent XSS

---
 apps/external/ajax/setsites.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
index c758a3508c..772863974a 100644
--- a/apps/external/ajax/setsites.php
+++ b/apps/external/ajax/setsites.php
@@ -12,7 +12,7 @@ OCP\User::checkAdminUser();
 $sites = array();
 for ($i = 0; $i < sizeof($_POST['site_name']); $i++) {
 	if (!empty($_POST['site_name'][$i]) && !empty($_POST['site_url'][$i])) {
-		array_push($sites, array($_POST['site_name'][$i], $_POST['site_url'][$i]));
+		array_push($sites, array(strip_tags($_POST['site_name'][$i]), strip_tags($_POST['site_url'][$i])));
 	}
 }
 

From 40f8419fdf5891ca419d20699b7fc89cd3472afb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 10 Jun 2012 20:54:52 +0200
Subject: [PATCH 0290/1537] Contacts: 11th hour fix for invalid VCARD from
 CardDAV.

---
 apps/contacts/lib/vcard.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index a8ad695f62..20a9e4afc9 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -373,6 +373,10 @@ class OC_Contacts_VCard{
 	public static function editFromDAVData($aid,$uri,$data){
 		$oldcard = self::findWhereDAVDataIs($aid,$uri);
 		$card = OC_VObject::parse($data);
+		if(!$card) {
+			OCP\Util::writeLog('contacts','OC_Contacts_VCard::editFromDAVData. Unable to parse VCARD, uri: '.$uri,OCP\Util::ERROR);
+			return false;
+		}
 		return self::edit($oldcard['id'], $card);
 	}
 

From dd8303b9752cec02fa26b190c24a578fddc4e9c0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 10 Jun 2012 14:46:15 -0400
Subject: [PATCH 0291/1537] Stop AWS SDK from looking for configuration files,
 forgot to include lib/cachecore

---
 3rdparty/aws-sdk/config-sample.inc.php        |  83 -----
 3rdparty/aws-sdk/lib/cachecore/LICENSE        |  25 ++
 3rdparty/aws-sdk/lib/cachecore/README         |   1 +
 3rdparty/aws-sdk/lib/cachecore/_sql/README    |   5 +
 3rdparty/aws-sdk/lib/cachecore/_sql/mysql.sql |   7 +
 3rdparty/aws-sdk/lib/cachecore/_sql/pgsql.sql |   6 +
 .../aws-sdk/lib/cachecore/_sql/sqlite3.sql    |   2 +
 .../aws-sdk/lib/cachecore/cacheapc.class.php  | 126 ++++++++
 .../aws-sdk/lib/cachecore/cachecore.class.php | 160 ++++++++++
 .../aws-sdk/lib/cachecore/cachefile.class.php | 189 +++++++++++
 .../aws-sdk/lib/cachecore/cachemc.class.php   | 183 +++++++++++
 .../aws-sdk/lib/cachecore/cachepdo.class.php  | 297 ++++++++++++++++++
 .../lib/cachecore/cachexcache.class.php       | 129 ++++++++
 .../lib/cachecore/icachecore.interface.php    |  66 ++++
 3rdparty/aws-sdk/sdk.class.php                |  89 +++---
 15 files changed, 1241 insertions(+), 127 deletions(-)
 delete mode 100755 3rdparty/aws-sdk/config-sample.inc.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/LICENSE
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/README
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/_sql/README
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/_sql/mysql.sql
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/_sql/pgsql.sql
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/_sql/sqlite3.sql
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/cacheapc.class.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/cachecore.class.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/cachefile.class.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/cachemc.class.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/cachepdo.class.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/cachexcache.class.php
 create mode 100755 3rdparty/aws-sdk/lib/cachecore/icachecore.interface.php

diff --git a/3rdparty/aws-sdk/config-sample.inc.php b/3rdparty/aws-sdk/config-sample.inc.php
deleted file mode 100755
index 93d2315b2f..0000000000
--- a/3rdparty/aws-sdk/config-sample.inc.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php if (!class_exists('CFRuntime')) die('No direct access allowed.');
-/**
- * Stores your AWS account information. Add your account information, and then rename this file
- * to 'config.inc.php'.
- *
- * @version 2011.12.14
- * @license See the included NOTICE.md file for more information.
- * @copyright See the included NOTICE.md file for more information.
- * @link http://aws.amazon.com/php/ PHP Developer Center
- * @link http://aws.amazon.com/security-credentials AWS Security Credentials
- */
-
-
-/*###################################################################################################
-
-	As of version 1.5, the AWS SDK for PHP uses the CFCredentials class to handle credentials.
-	This class has the advantage of being able to support multiple sets of credentials at a time,
-	including the ability for credential sets to inherit settings from other credential sets.
-
-	Some example uses are noted at https://gist.github.com/1478912
-
-	Notes:
-
-	* You can define one or more credential sets.
-
-	* Credential sets can be named anything that PHP allows for an associative array key;
-	  "production", "staging", etc., are just sample values. Feel free to rename them.
-
-	* A credential set only has four required entries: key, secret, default_cache_config and
-	  certificate_authority. Aside from these, you can add any additional bits of information
-	  you'd like to keep easily accessible (e.g., multi-factor authentication device key, your
-	  AWS Account ID, your canonical identifiers).
-
-	* Additional credential sets can inherit the properties of another credential set using the
-	  @inherit keyword.
-
-	* If more than one credential set is provided, a default credential set must be specified
-	  using the @default keyword.
-
-	* If you only have one credential set, you can set it to the @default keyword.
-
-	* View the documentation for the CFCredentials::set() method to view usage examples.
-
-###################################################################################################*/
-
-
-/**
- * Create a list of credential sets that can be used with the SDK.
- */
-CFCredentials::set(array(
-
-	// Credentials for the development environment.
-	'development' => array(
-
-		// Amazon Web Services Key. Found in the AWS Security Credentials. You can also pass
-		// this value as the first parameter to a service constructor.
-		'key' => 'development-key',
-
-		// Amazon Web Services Secret Key. Found in the AWS Security Credentials. You can also
-		// pass this value as the second parameter to a service constructor.
-		'secret' => 'development-secret',
-
-		// This option allows you to configure a preferred storage type to use for caching by
-		// default. This can be changed later using the set_cache_config() method.
-		//
-		// Valid values are: `apc`, `xcache`, or a file system path such as `./cache` or
-		// `/tmp/cache/`.
-		'default_cache_config' => '',
-
-		// Determines which Cerificate Authority file to use.
-		//
-		// A value of boolean `false` will use the Certificate Authority file available on the
-		// system. A value of boolean `true` will use the Certificate Authority provided by the
-		// SDK. Passing a file system path to a Certificate Authority file (chmodded to `0755`)
-		// will use that.
-		//
-		// Leave this set to `false` if you're not sure.
-		'certificate_authority' => false
-	),
-
-	// Specify a default credential set to use if there are more than one.
-	'@default' => 'development'
-));
diff --git a/3rdparty/aws-sdk/lib/cachecore/LICENSE b/3rdparty/aws-sdk/lib/cachecore/LICENSE
new file mode 100755
index 0000000000..49b38bd620
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2006-2010 Ryan Parman, Foleeo Inc., and contributors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of
+	  conditions and the following disclaimer.
+
+	* Redistributions in binary form must reproduce the above copyright notice, this list
+	  of conditions and the following disclaimer in the documentation and/or other materials
+	  provided with the distribution.
+
+	* Neither the name of Ryan Parman, Foleeo Inc. nor the names of its contributors may be used to
+	  endorse or promote products derived from this software without specific prior written
+	  permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/3rdparty/aws-sdk/lib/cachecore/README b/3rdparty/aws-sdk/lib/cachecore/README
new file mode 100755
index 0000000000..07e00267cb
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/README
@@ -0,0 +1 @@
+A simple caching system for PHP5 that provides a single interface for a variety of storage types.
diff --git a/3rdparty/aws-sdk/lib/cachecore/_sql/README b/3rdparty/aws-sdk/lib/cachecore/_sql/README
new file mode 100755
index 0000000000..e25d53d120
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/_sql/README
@@ -0,0 +1,5 @@
+The .sql files in this directory contain the code to create the tables for database caching.
+
+If you're not using database caching, you can safely ignore these.
+
+If you ARE using database caching, simply load the correct *.sql file into your database to set up the required tables.
diff --git a/3rdparty/aws-sdk/lib/cachecore/_sql/mysql.sql b/3rdparty/aws-sdk/lib/cachecore/_sql/mysql.sql
new file mode 100755
index 0000000000..2efee3a732
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/_sql/mysql.sql
@@ -0,0 +1,7 @@
+CREATE TABLE `cache` (
+  `id` char(40) NOT NULL default '',
+  `expires` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `data` longtext,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
\ No newline at end of file
diff --git a/3rdparty/aws-sdk/lib/cachecore/_sql/pgsql.sql b/3rdparty/aws-sdk/lib/cachecore/_sql/pgsql.sql
new file mode 100755
index 0000000000..f2bdd86a52
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/_sql/pgsql.sql
@@ -0,0 +1,6 @@
+CREATE TABLE "cache" (
+	expires timestamp without time zone NOT NULL,
+	id character(40) NOT NULL,
+	data text NOT NULL
+)
+WITH (OIDS=TRUE);
\ No newline at end of file
diff --git a/3rdparty/aws-sdk/lib/cachecore/_sql/sqlite3.sql b/3rdparty/aws-sdk/lib/cachecore/_sql/sqlite3.sql
new file mode 100755
index 0000000000..590f45e4ff
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/_sql/sqlite3.sql
@@ -0,0 +1,2 @@
+CREATE TABLE cache (id TEXT, expires NUMERIC, data BLOB);
+CREATE UNIQUE INDEX idx ON cache(id ASC);
\ No newline at end of file
diff --git a/3rdparty/aws-sdk/lib/cachecore/cacheapc.class.php b/3rdparty/aws-sdk/lib/cachecore/cacheapc.class.php
new file mode 100755
index 0000000000..59f5e88f39
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/cacheapc.class.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Container for all APC-based cache methods. Inherits additional methods from <CacheCore>. Adheres
+ * to the ICacheCore interface.
+ *
+ * @version 2012.04.17
+ * @copyright 2006-2012 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2012 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ * @link http://php.net/apc APC
+ */
+class CacheAPC extends CacheCore implements ICacheCore
+{
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public function __construct($name, $location = null, $expires = 0, $gzip = true)
+	{
+		parent::__construct($name, null, $expires, $gzip);
+		$this->id = $this->name;
+	}
+
+	/**
+	 * Creates a new cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function create($data)
+	{
+		$data = serialize($data);
+		$data = $this->gzip ? gzcompress($data) : $data;
+
+		return apc_add($this->id, $data, $this->expires);
+	}
+
+	/**
+	 * Reads a cache.
+	 *
+	 * @return mixed Either the content of the cache object, or boolean `false`.
+	 */
+	public function read()
+	{
+		if ($data = apc_fetch($this->id))
+		{
+			$data = $this->gzip ? gzuncompress($data) : $data;
+			return unserialize($data);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Updates an existing cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function update($data)
+	{
+		$data = serialize($data);
+		$data = $this->gzip ? gzcompress($data) : $data;
+
+		return apc_store($this->id, $data, $this->expires);
+	}
+
+	/**
+	 * Deletes a cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function delete()
+	{
+		return apc_delete($this->id);
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. APC manages its own expirations.
+	 *
+	 * @return boolean Whether the cache is expired or not.
+	 */
+	public function is_expired()
+	{
+		return false;
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. APC manages its own expirations.
+	 *
+	 * @return mixed Either the Unix time stamp of the cache creation, or boolean `false`.
+	 */
+	public function timestamp()
+	{
+		return false;
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. APC manages its own expirations.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function reset()
+	{
+		return false;
+	}
+}
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+class CacheAPC_Exception extends CacheCore_Exception {}
diff --git a/3rdparty/aws-sdk/lib/cachecore/cachecore.class.php b/3rdparty/aws-sdk/lib/cachecore/cachecore.class.php
new file mode 100755
index 0000000000..1670d31640
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/cachecore.class.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Container for all shared caching methods. This is not intended to be instantiated directly, but is
+ * extended by the cache-specific classes.
+ *
+ * @version 2012.04.17
+ * @copyright 2006-2012 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2012 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ */
+class CacheCore
+{
+	/**
+	 * A name to uniquely identify the cache object by.
+	 */
+	var $name;
+
+	/**
+	 * Where to store the cache.
+	 */
+	var $location;
+
+	/**
+	 * The number of seconds before a cache object is considered stale.
+	 */
+	var $expires;
+
+	/**
+	 * Used internally to uniquely identify the location + name of the cache object.
+	 */
+	var $id;
+
+	/**
+	 * Stores the time when the cache object was created.
+	 */
+	var $timestamp;
+
+	/**
+	 * Stores whether or not the content should be gzipped when stored
+	 */
+	var $gzip;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public function __construct($name, $location = null, $expires = 0, $gzip = true)
+	{
+		if (!extension_loaded('zlib'))
+		{
+			$gzip = false;
+		}
+
+		$this->name = $name;
+		$this->location = $location;
+		$this->expires = $expires;
+		$this->gzip = $gzip;
+
+		return $this;
+	}
+
+	/**
+	 * Allows for chaining from the constructor. Requires PHP 5.3 or newer.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public static function init($name, $location = null, $expires = 0, $gzip = true)
+	{
+		if (version_compare(PHP_VERSION, '5.3.0', '<'))
+		{
+			throw new Exception('PHP 5.3 or newer is required to use CacheCore::init().');
+		}
+
+		$self = get_called_class();
+		return new $self($name, $location, $expires, $gzip);
+	}
+
+	/**
+	 * Set the number of seconds until a cache expires.
+	 *
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @return $this
+	 */
+	public function expire_in($seconds)
+	{
+		$this->expires = $seconds;
+		return $this;
+	}
+
+	/**
+	 * Provides a simple, straightforward cache-logic mechanism. Useful for non-complex response caches.
+	 *
+	 * @param string|function $callback (Required) The name of the function to fire when we need to fetch new data to cache.
+	 * @param array params (Optional) Parameters to pass into the callback function, as an array.
+	 * @return array The cached data being requested.
+	 */
+	public function response_manager($callback, $params = null)
+	{
+		// Automatically handle $params values.
+		$params = is_array($params) ? $params : array($params);
+
+		if ($data = $this->read())
+		{
+			if ($this->is_expired())
+			{
+				if ($data = call_user_func_array($callback, $params))
+				{
+					$this->update($data);
+				}
+				else
+				{
+					$this->reset();
+					$data = $this->read();
+				}
+			}
+		}
+		else
+		{
+			if ($data = call_user_func_array($callback, $params))
+			{
+				$this->create($data);
+			}
+		}
+
+		return $data;
+	}
+}
+
+
+/*%******************************************************************************************%*/
+// CORE DEPENDENCIES
+
+// Include the ICacheCore interface.
+if (file_exists(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'icachecore.interface.php'))
+{
+	include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'icachecore.interface.php';
+}
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+class CacheCore_Exception extends Exception {}
diff --git a/3rdparty/aws-sdk/lib/cachecore/cachefile.class.php b/3rdparty/aws-sdk/lib/cachecore/cachefile.class.php
new file mode 100755
index 0000000000..3df240151f
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/cachefile.class.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Container for all file-based cache methods. Inherits additional methods from <CacheCore>. Adheres
+ * to the ICacheCore interface.
+ *
+ * @version 2012.04.17
+ * @copyright 2006-2012 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2012 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ */
+class CacheFile extends CacheCore implements ICacheCore
+{
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public function __construct($name, $location = null, $expires = 0, $gzip = true)
+	{
+		parent::__construct($name, $location, $expires, $gzip);
+		$this->id = $this->location . '/' . $this->name . '.cache';
+	}
+
+	/**
+	 * Creates a new cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function create($data)
+	{
+		if (file_exists($this->id))
+		{
+			return false;
+		}
+		elseif (realpath($this->location) && file_exists($this->location) && is_writeable($this->location))
+		{
+			$data = serialize($data);
+			$data = $this->gzip ? gzcompress($data) : $data;
+
+			return (bool) file_put_contents($this->id, $data);
+		}
+		elseif (realpath($this->location) && file_exists($this->location))
+		{
+			throw new CacheFile_Exception('The file system location "' . $this->location . '" is not writable. Check the file system permissions for this directory.');
+		}
+		else
+		{
+			throw new CacheFile_Exception('The file system location "' . $this->location . '" does not exist. Create the directory, or double-check any relative paths that may have been set.');
+		}
+
+		return false;
+	}
+
+	/**
+	 * Reads a cache.
+	 *
+	 * @return mixed Either the content of the cache object, or boolean `false`.
+	 */
+	public function read()
+	{
+		if (file_exists($this->id) && is_readable($this->id))
+		{
+			$data = file_get_contents($this->id);
+			$data = $this->gzip ? gzuncompress($data) : $data;
+			$data = unserialize($data);
+
+			if ($data === false)
+			{
+				/*
+					This should only happen when someone changes the gzip settings and there is
+					existing data or someone has been mucking about in the cache folder manually.
+					Delete the bad entry since the file cache doesn't clean up after itself and
+					then return false so fresh data will be retrieved.
+				 */
+				$this->delete();
+				return false;
+			}
+
+			return $data;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Updates an existing cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function update($data)
+	{
+		if (file_exists($this->id) && is_writeable($this->id))
+		{
+			$data = serialize($data);
+			$data = $this->gzip ? gzcompress($data) : $data;
+
+			return (bool) file_put_contents($this->id, $data);
+		}
+		else
+		{
+			throw new CacheFile_Exception('The file system location is not writeable. Check your file system permissions and ensure that the cache directory exists.');
+		}
+
+		return false;
+	}
+
+	/**
+	 * Deletes a cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function delete()
+	{
+		if (file_exists($this->id))
+		{
+			return unlink($this->id);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks whether the cache object is expired or not.
+	 *
+	 * @return boolean Whether the cache is expired or not.
+	 */
+	public function is_expired()
+	{
+		if ($this->timestamp() + $this->expires < time())
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retrieves the timestamp of the cache.
+	 *
+	 * @return mixed Either the Unix time stamp of the cache creation, or boolean `false`.
+	 */
+	public function timestamp()
+	{
+		clearstatcache();
+
+		if (file_exists($this->id))
+		{
+			$this->timestamp = filemtime($this->id);
+			return $this->timestamp;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Resets the freshness of the cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function reset()
+	{
+		if (file_exists($this->id))
+		{
+			return touch($this->id);
+		}
+
+		return false;
+	}
+}
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+class CacheFile_Exception extends CacheCore_Exception {}
diff --git a/3rdparty/aws-sdk/lib/cachecore/cachemc.class.php b/3rdparty/aws-sdk/lib/cachecore/cachemc.class.php
new file mode 100755
index 0000000000..5b0f8a9306
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/cachemc.class.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Container for all Memcache-based cache methods. Inherits additional methods from <CacheCore>. Adheres
+ * to the ICacheCore interface.
+ *
+ * @version 2012.04.17
+ * @copyright 2006-2012 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2012 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ * @link http://php.net/memcache Memcache
+ * @link http://php.net/memcached Memcached
+ */
+class CacheMC extends CacheCore implements ICacheCore
+{
+	/**
+	 * Holds the Memcache object.
+	 */
+	var $memcache = null;
+
+	/**
+	 * Whether the Memcached extension is being used (as opposed to Memcache).
+	 */
+	var $is_memcached = false;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public function __construct($name, $location = null, $expires = 0, $gzip = true)
+	{
+		parent::__construct($name, null, $expires, $gzip);
+		$this->id = $this->name;
+
+		// Prefer Memcached over Memcache.
+		if (class_exists('Memcached'))
+		{
+			$this->memcache = new Memcached();
+			$this->is_memcached = true;
+		}
+		elseif (class_exists('Memcache'))
+		{
+			$this->memcache = new Memcache();
+		}
+		else
+		{
+			return false;
+		}
+
+		// Enable compression, if available
+		if ($this->gzip)
+		{
+			if ($this->is_memcached)
+			{
+				$this->memcache->setOption(Memcached::OPT_COMPRESSION, true);
+			}
+			else
+			{
+				$this->gzip = MEMCACHE_COMPRESSED;
+			}
+		}
+
+		// Process Memcached servers.
+		if (isset($location) && sizeof($location) > 0)
+		{
+			foreach ($location as $loc)
+			{
+				if (isset($loc['port']) && !empty($loc['port']))
+				{
+					$this->memcache->addServer($loc['host'], $loc['port']);
+				}
+				else
+				{
+					$this->memcache->addServer($loc['host'], 11211);
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Creates a new cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function create($data)
+	{
+		if ($this->is_memcached)
+		{
+			return $this->memcache->set($this->id, $data, $this->expires);
+		}
+		return $this->memcache->set($this->id, $data, $this->gzip, $this->expires);
+	}
+
+	/**
+	 * Reads a cache.
+	 *
+	 * @return mixed Either the content of the cache object, or boolean `false`.
+	 */
+	public function read()
+	{
+		if ($this->is_memcached)
+		{
+			return $this->memcache->get($this->id);
+		}
+		return $this->memcache->get($this->id, $this->gzip);
+	}
+
+	/**
+	 * Updates an existing cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function update($data)
+	{
+		if ($this->is_memcached)
+		{
+			return $this->memcache->replace($this->id, $data, $this->expires);
+		}
+		return $this->memcache->replace($this->id, $data, $this->gzip, $this->expires);
+	}
+
+	/**
+	 * Deletes a cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function delete()
+	{
+		return $this->memcache->delete($this->id);
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. Memcache manages its own expirations.
+	 *
+	 * @return boolean Whether the cache is expired or not.
+	 */
+	public function is_expired()
+	{
+		return false;
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. Memcache manages its own expirations.
+	 *
+	 * @return mixed Either the Unix time stamp of the cache creation, or boolean `false`.
+	 */
+	public function timestamp()
+	{
+		return false;
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. Memcache manages its own expirations.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function reset()
+	{
+		return false;
+	}
+}
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+class CacheMC_Exception extends CacheCore_Exception {}
diff --git a/3rdparty/aws-sdk/lib/cachecore/cachepdo.class.php b/3rdparty/aws-sdk/lib/cachecore/cachepdo.class.php
new file mode 100755
index 0000000000..5716021d8f
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/cachepdo.class.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Container for all PDO-based cache methods. Inherits additional methods from <CacheCore>. Adheres
+ * to the ICacheCore interface.
+ *
+ * @version 2012.04.17
+ * @copyright 2006-2012 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2012 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ * @link http://php.net/pdo PDO
+ */
+class CachePDO extends CacheCore implements ICacheCore
+{
+	/**
+	 * Reference to the PDO connection object.
+	 */
+	var $pdo = null;
+
+	/**
+	 * Holds the parsed URL components.
+	 */
+	var $dsn = null;
+
+	/**
+	 * Holds the PDO-friendly version of the connection string.
+	 */
+	var $dsn_string = null;
+
+	/**
+	 * Holds the prepared statement for creating an entry.
+	 */
+	var $create = null;
+
+	/**
+	 * Holds the prepared statement for reading an entry.
+	 */
+	var $read = null;
+
+	/**
+	 * Holds the prepared statement for updating an entry.
+	 */
+	var $update = null;
+
+	/**
+	 * Holds the prepared statement for resetting the expiry of an entry.
+	 */
+	var $reset = null;
+
+	/**
+	 * Holds the prepared statement for deleting an entry.
+	 */
+	var $delete = null;
+
+	/**
+	 * Holds the response of the read so we only need to fetch it once instead of doing
+	 * multiple queries.
+	 */
+	var $store_read = null;
+
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * Tested with [MySQL 5.0.x](http://mysql.com), [PostgreSQL](http://postgresql.com), and
+	 * [SQLite 3.x](http://sqlite.org). SQLite 2.x is assumed to work. No other PDO-supported databases have
+	 * been tested (e.g. Oracle, Microsoft SQL Server, IBM DB2, ODBC, Sybase, Firebird). Feel free to send
+	 * patches for additional database support.
+	 *
+	 * See <http://php.net/pdo> for more information.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public function __construct($name, $location = null, $expires = 0, $gzip = true)
+	{
+		// Make sure the name is no longer than 40 characters.
+		$name = sha1($name);
+
+		// Call parent constructor and set id.
+		parent::__construct($name, $location, $expires, $gzip);
+		$this->id = $this->name;
+		$options = array();
+
+		// Check if the location contains :// (e.g. mysql://user:pass@hostname:port/table)
+		if (stripos($location, '://') === false)
+		{
+			// No? Just pass it through.
+			$this->dsn = parse_url($location);
+			$this->dsn_string = $location;
+		}
+		else
+		{
+			// Yes? Parse and set the DSN
+			$this->dsn = parse_url($location);
+			$this->dsn_string = $this->dsn['scheme'] . ':host=' . $this->dsn['host'] . ((isset($this->dsn['port'])) ? ';port=' . $this->dsn['port'] : '') . ';dbname=' . substr($this->dsn['path'], 1);
+		}
+
+		// Make sure that user/pass are defined.
+		$user = isset($this->dsn['user']) ? $this->dsn['user'] : null;
+		$pass = isset($this->dsn['pass']) ? $this->dsn['pass'] : null;
+
+		// Set persistence for databases that support it.
+		switch ($this->dsn['scheme'])
+		{
+			case 'mysql': // MySQL
+			case 'pgsql': // PostgreSQL
+				$options[PDO::ATTR_PERSISTENT] = true;
+				break;
+		}
+
+		// Instantiate a new PDO object with a persistent connection.
+		$this->pdo = new PDO($this->dsn_string, $user, $pass, $options);
+
+		// Define prepared statements for improved performance.
+		$this->create = $this->pdo->prepare("INSERT INTO cache (id, expires, data) VALUES (:id, :expires, :data)");
+		$this->read = $this->pdo->prepare("SELECT id, expires, data FROM cache WHERE id = :id");
+		$this->reset = $this->pdo->prepare("UPDATE cache SET expires = :expires WHERE id = :id");
+		$this->delete = $this->pdo->prepare("DELETE FROM cache WHERE id = :id");
+	}
+
+	/**
+	 * Creates a new cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function create($data)
+	{
+		$data = serialize($data);
+		$data = $this->gzip ? gzcompress($data) : $data;
+
+		$this->create->bindParam(':id', $this->id);
+		$this->create->bindParam(':data', $data);
+		$this->create->bindParam(':expires', $this->generate_timestamp());
+
+		return (bool) $this->create->execute();
+	}
+
+	/**
+	 * Reads a cache.
+	 *
+	 * @return mixed Either the content of the cache object, or boolean `false`.
+	 */
+	public function read()
+	{
+		if (!$this->store_read)
+		{
+			$this->read->bindParam(':id', $this->id);
+			$this->read->execute();
+			$this->store_read = $this->read->fetch(PDO::FETCH_ASSOC);
+		}
+
+		if ($this->store_read)
+		{
+			$data = $this->store_read['data'];
+			$data = $this->gzip ? gzuncompress($data) : $data;
+
+			return unserialize($data);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Updates an existing cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function update($data)
+	{
+		$this->delete();
+		return $this->create($data);
+	}
+
+	/**
+	 * Deletes a cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function delete()
+	{
+		$this->delete->bindParam(':id', $this->id);
+		return $this->delete->execute();
+	}
+
+	/**
+	 * Checks whether the cache object is expired or not.
+	 *
+	 * @return boolean Whether the cache is expired or not.
+	 */
+	public function is_expired()
+	{
+		if ($this->timestamp() + $this->expires < time())
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retrieves the timestamp of the cache.
+	 *
+	 * @return mixed Either the Unix time stamp of the cache creation, or boolean `false`.
+	 */
+	public function timestamp()
+	{
+		if (!$this->store_read)
+		{
+			$this->read->bindParam(':id', $this->id);
+			$this->read->execute();
+			$this->store_read = $this->read->fetch(PDO::FETCH_ASSOC);
+		}
+
+		if ($this->store_read)
+		{
+			$value = $this->store_read['expires'];
+
+			// If 'expires' isn't yet an integer, convert it into one.
+			if (!is_numeric($value))
+			{
+				$value = strtotime($value);
+			}
+
+			$this->timestamp = date('U', $value);
+			return $this->timestamp;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Resets the freshness of the cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function reset()
+	{
+		$this->reset->bindParam(':id', $this->id);
+		$this->reset->bindParam(':expires', $this->generate_timestamp());
+		return (bool) $this->reset->execute();
+	}
+
+	/**
+	 * Returns a list of supported PDO database drivers. Identical to <PDO::getAvailableDrivers()>.
+	 *
+	 * @return array The list of supported database drivers.
+	 * @link http://php.net/pdo.getavailabledrivers PHP Method
+	 */
+	public function get_drivers()
+	{
+		return PDO::getAvailableDrivers();
+	}
+
+	/**
+	 * Returns a timestamp value apropriate to the current database type.
+	 *
+	 * @return mixed Timestamp for MySQL and PostgreSQL, integer value for SQLite.
+	 */
+	protected function generate_timestamp()
+	{
+		// Define 'expires' settings differently.
+		switch ($this->dsn['scheme'])
+		{
+			// These support timestamps.
+			case 'mysql': // MySQL
+			case 'pgsql': // PostgreSQL
+				$expires = date(DATE_FORMAT_MYSQL, time());
+				break;
+
+			// These support integers.
+			case 'sqlite': // SQLite 3
+			case 'sqlite2': // SQLite 2
+				$expires = time();
+				break;
+		}
+
+		return $expires;
+	}
+}
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+class CachePDO_Exception extends CacheCore_Exception {}
diff --git a/3rdparty/aws-sdk/lib/cachecore/cachexcache.class.php b/3rdparty/aws-sdk/lib/cachecore/cachexcache.class.php
new file mode 100755
index 0000000000..a0f279aaea
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/cachexcache.class.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Container for all XCache-based cache methods. Inherits additional methods from <CacheCore>. Adheres
+ * to the ICacheCore interface.
+ *
+ * @version 2012.04.17
+ * @copyright 2006-2012 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2012 Amazon.com, Inc. or its affiliates.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ * @link http://xcache.lighttpd.net XCache
+ */
+class CacheXCache extends CacheCore implements ICacheCore
+{
+
+	/*%******************************************************************************************%*/
+	// CONSTRUCTOR
+
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param string $name (Required) A name to uniquely identify the cache object.
+	 * @param string $location (Optional) The location to store the cache object in. This may vary by cache method. The default value is NULL.
+	 * @param integer $expires (Optional) The number of seconds until a cache object is considered stale. The default value is 0.
+	 * @param boolean $gzip (Optional) Whether data should be gzipped before being stored. The default value is true.
+	 * @return object Reference to the cache object.
+	 */
+	public function __construct($name, $location = null, $expires = 0, $gzip = true)
+	{
+		parent::__construct($name, null, $expires, $gzip);
+		$this->id = $this->name;
+	}
+
+	/**
+	 * Creates a new cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function create($data)
+	{
+		$data = serialize($data);
+		$data = $this->gzip ? gzcompress($data) : $data;
+
+		return xcache_set($this->id, $data, $this->expires);
+	}
+
+	/**
+	 * Reads a cache.
+	 *
+	 * @return mixed Either the content of the cache object, or boolean `false`.
+	 */
+	public function read()
+	{
+		if ($data = xcache_get($this->id))
+		{
+			$data = $this->gzip ? gzuncompress($data) : $data;
+			return unserialize($data);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Updates an existing cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function update($data)
+	{
+		$data = serialize($data);
+		$data = $this->gzip ? gzcompress($data) : $data;
+
+		return xcache_set($this->id, $data, $this->expires);
+	}
+
+	/**
+	 * Deletes a cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function delete()
+	{
+		return xcache_unset($this->id);
+	}
+
+	/**
+	 * Defined here, but always returns false. XCache manages it's own expirations. It's worth
+	 * mentioning that if the server is configured for a long xcache.var_gc_interval then it IS
+	 * possible for expired data to remain in the var cache, though it is not possible to access
+	 * it.
+	 *
+	 * @return boolean Whether the cache is expired or not.
+	 */
+	public function is_expired()
+	{
+		return false;
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. XCache manages its own expirations.
+	 *
+	 * @return mixed Either the Unix time stamp of the cache creation, or boolean `false`.
+	 */
+	public function timestamp()
+	{
+		return false;
+	}
+
+	/**
+	 * Implemented here, but always returns `false`. XCache manages its own expirations.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function reset()
+	{
+		return false;
+	}
+}
+
+
+/*%******************************************************************************************%*/
+// EXCEPTIONS
+
+class CacheXCache_Exception extends CacheCore_Exception {}
diff --git a/3rdparty/aws-sdk/lib/cachecore/icachecore.interface.php b/3rdparty/aws-sdk/lib/cachecore/icachecore.interface.php
new file mode 100755
index 0000000000..8d49f5bf49
--- /dev/null
+++ b/3rdparty/aws-sdk/lib/cachecore/icachecore.interface.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Defines the methods that all implementing classes MUST have. Covers CRUD (create, read, update,
+ * delete) methods, as well as others that are used in the base <CacheCore> class.
+ *
+ * @version 2009.03.22
+ * @copyright 2006-2010 Ryan Parman
+ * @copyright 2006-2010 Foleeo, Inc.
+ * @copyright 2008-2010 Contributors
+ * @license http://opensource.org/licenses/bsd-license.php Simplified BSD License
+ * @link http://github.com/skyzyx/cachecore CacheCore
+ * @link http://getcloudfusion.com CloudFusion
+ */
+interface ICacheCore
+{
+	/**
+	 * Creates a new cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function create($data);
+
+	/**
+	 * Reads a cache.
+	 *
+	 * @return mixed Either the content of the cache object, or boolean `false`.
+	 */
+	public function read();
+
+	/**
+	 * Updates an existing cache.
+	 *
+	 * @param mixed $data (Required) The data to cache.
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function update($data);
+
+	/**
+	 * Deletes a cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function delete();
+
+	/**
+	 * Checks whether the cache object is expired or not.
+	 *
+	 * @return boolean Whether the cache is expired or not.
+	 */
+	public function is_expired();
+
+	/**
+	 * Retrieves the timestamp of the cache.
+	 *
+	 * @return mixed Either the Unix time stamp of the cache creation, or boolean `false`.
+	 */
+	public function timestamp();
+
+	/**
+	 * Resets the freshness of the cache.
+	 *
+	 * @return boolean Whether the operation was successful.
+	 */
+	public function reset();
+}
diff --git a/3rdparty/aws-sdk/sdk.class.php b/3rdparty/aws-sdk/sdk.class.php
index 4e171b027c..8dcb7bf252 100755
--- a/3rdparty/aws-sdk/sdk.class.php
+++ b/3rdparty/aws-sdk/sdk.class.php
@@ -1387,48 +1387,49 @@ class CFLoader
 // Register the autoloader.
 spl_autoload_register(array('CFLoader', 'autoloader'));
 
+// Don't look for any configuration files, the Amazon S3 storage backend handles configuration
 
-/*%******************************************************************************************%*/
-// CONFIGURATION
-
-// Look for include file in the same directory (e.g. `./config.inc.php`).
-if (file_exists(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.inc.php'))
-{
-	include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.inc.php';
-}
-// Fallback to `~/.aws/sdk/config.inc.php`
-else
-{
-	if (!isset($_ENV['HOME']) && isset($_SERVER['HOME']))
-	{
-		$_ENV['HOME'] = $_SERVER['HOME'];
-	}
-	elseif (!isset($_ENV['HOME']) && !isset($_SERVER['HOME']))
-	{
-		$_ENV['HOME'] = `cd ~ && pwd`;
-		if (!$_ENV['HOME'])
-		{
-			switch (strtolower(PHP_OS))
-			{
-				case 'darwin':
-					$_ENV['HOME'] = '/Users/' . get_current_user();
-					break;
-
-				case 'windows':
-				case 'winnt':
-				case 'win32':
-					$_ENV['HOME'] = 'c:' . DIRECTORY_SEPARATOR . 'Documents and Settings' . DIRECTORY_SEPARATOR . get_current_user();
-					break;
-
-				default:
-					$_ENV['HOME'] = '/home/' . get_current_user();
-					break;
-			}
-		}
-	}
-
-	if (getenv('HOME') && file_exists(getenv('HOME') . DIRECTORY_SEPARATOR . '.aws' . DIRECTORY_SEPARATOR . 'sdk' . DIRECTORY_SEPARATOR . 'config.inc.php'))
-	{
-		include_once getenv('HOME') . DIRECTORY_SEPARATOR . '.aws' . DIRECTORY_SEPARATOR . 'sdk' . DIRECTORY_SEPARATOR . 'config.inc.php';
-	}
-}
+// /*%******************************************************************************************%*/
+// // CONFIGURATION
+// 
+// // Look for include file in the same directory (e.g. `./config.inc.php`).
+// if (file_exists(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.inc.php'))
+// {
+// 	include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.inc.php';
+// }
+// // Fallback to `~/.aws/sdk/config.inc.php`
+// else
+// {
+// 	if (!isset($_ENV['HOME']) && isset($_SERVER['HOME']))
+// 	{
+// 		$_ENV['HOME'] = $_SERVER['HOME'];
+// 	}
+// 	elseif (!isset($_ENV['HOME']) && !isset($_SERVER['HOME']))
+// 	{
+// 		$_ENV['HOME'] = `cd ~ && pwd`;
+// 		if (!$_ENV['HOME'])
+// 		{
+// 			switch (strtolower(PHP_OS))
+// 			{
+// 				case 'darwin':
+// 					$_ENV['HOME'] = '/Users/' . get_current_user();
+// 					break;
+// 
+// 				case 'windows':
+// 				case 'winnt':
+// 				case 'win32':
+// 					$_ENV['HOME'] = 'c:' . DIRECTORY_SEPARATOR . 'Documents and Settings' . DIRECTORY_SEPARATOR . get_current_user();
+// 					break;
+// 
+// 				default:
+// 					$_ENV['HOME'] = '/home/' . get_current_user();
+// 					break;
+// 			}
+// 		}
+// 	}
+// 
+// 	if (getenv('HOME') && file_exists(getenv('HOME') . DIRECTORY_SEPARATOR . '.aws' . DIRECTORY_SEPARATOR . 'sdk' . DIRECTORY_SEPARATOR . 'config.inc.php'))
+// 	{
+// 		include_once getenv('HOME') . DIRECTORY_SEPARATOR . '.aws' . DIRECTORY_SEPARATOR . 'sdk' . DIRECTORY_SEPARATOR . 'config.inc.php';
+// 	}
+// }

From 3c57fb935bec7b431596c8aec3f344df7dba354a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 10 Jun 2012 16:34:21 -0400
Subject: [PATCH 0292/1537] Mount personal mount points into filesystem

---
 apps/files_external/lib/config.php | 9 ++++++---
 lib/util.php                       | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index a87319d33b..56a61e9ab8 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -98,8 +98,8 @@ class OC_Mount_Config {
 		$personal = array();
 		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
 			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
-				// Remove '/$user/files/' from mount point
-				$personal[substr($mountPoint, 13)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
+				// Remove '/uid/files/' from mount point
+				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
 			}
 		}
 		return $personal;
@@ -123,8 +123,11 @@ class OC_Mount_Config {
 			if ($applicable != OCP\User::getUser() || $class == 'OC_Filestorage_Local') {
 				return false;
 			}
+			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
+		} else {
+			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
 		}
-		$mount = array($applicable => array('/$user/files/'.$mountPoint => array('class' => $class, 'options' => $classOptions)));
+		$mount = array($applicable => array($mountPoint => array('class' => $class, 'options' => $classOptions)));
 		$mountPoints = self::readData($isPersonal);
 		// Merge the new mount point into the current mount points
 		if (isset($mountPoints[$mountType])) {
diff --git a/lib/util.php b/lib/util.php
index 53096f029a..7c85db71f5 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -70,6 +70,15 @@ class OC_Util {
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
+			// Load personal mount config
+			if (is_file($CONFIG_DATADIRECTORY_ROOT.'/'.$user.'/mount.php')) {
+				$mountConfig = include($CONFIG_DATADIRECTORY_ROOT.'/'.$user.'/mount.php');
+				if (isset($mountConfig['user'][$user])) {
+					foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
+						OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
+					}
+				}
+			}
 		}
 	}
 

From 380aab470ff375a8f898b3b9b8375236130209d0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 10 Jun 2012 23:16:59 +0200
Subject: [PATCH 0293/1537] Sanitzing user input

---
 apps/user_ldap/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 9c0620578b..f1a474ff27 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -47,7 +47,7 @@ if ($_POST) {
 // fill template
 $tmpl = new OCP\Template( 'user_ldap', 'settings');
 foreach($params as $param){
-		$value = OCP\Config::getAppValue('user_ldap', $param,'');
+		$value = htmlentities(OCP\Config::getAppValue('user_ldap', $param,''));
 		$tmpl->assign($param, $value);
 }
 

From 9f276729c2a44151c29754e816fb002502222b1d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 10 Jun 2012 23:38:26 +0200
Subject: [PATCH 0294/1537] Using POST instead of GET.

---
 apps/bookmarks/addBm.php             | 2 +-
 apps/bookmarks/ajax/addBookmark.php  | 2 +-
 apps/bookmarks/ajax/delBookmark.php  | 2 +-
 apps/bookmarks/ajax/editBookmark.php | 8 ++++----
 apps/bookmarks/ajax/recordClick.php  | 2 +-
 apps/bookmarks/ajax/updateList.php   | 6 +++---
 apps/bookmarks/js/addBm.js           | 1 +
 apps/bookmarks/js/bookmarks.js       | 5 +++++
 apps/bookmarks/js/bookmarksearch.js  | 1 +
 9 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index 313489d22f..866fa1e7b1 100644
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -28,6 +28,6 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');
-addBookmark($_GET['url'], '', 'Read-Later');
+addBookmark($_POST['url'], '', 'Read-Later');
 
 include 'templates/addBm.php';
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 9241dc8ddf..a2eb506f85 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -31,5 +31,5 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
 
 require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php');
-$id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']);
+$id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
 OCP\JSON::success(array('data' => $id));
\ No newline at end of file
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index 0b5689811a..5a067701c9 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -30,7 +30,7 @@ $RUNTIME_NOSETUPFS=true;
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
 
-$id = $_GET['id'];
+$id = $_POST['id'];
 if (!OC_Bookmarks_Bookmarks::deleteUrl($id)){
 	OC_JSON::error();
 	exit();
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index db349af35c..fcec2e1ced 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -39,7 +39,7 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
 	$_ut = "UNIX_TIMESTAMP()";
 }
 
-$bookmark_id = (int)$_GET["id"];
+$bookmark_id = (int)$_POST["id"];
 
 $query = OCP\DB::prepare("
 	UPDATE *PREFIX*bookmarks
@@ -48,8 +48,8 @@ $query = OCP\DB::prepare("
 	");
 
 $params=array(
-	htmlspecialchars_decode($_GET["url"]),
-	htmlspecialchars_decode($_GET["title"]),
+	htmlspecialchars_decode($_POST["url"]),
+	htmlspecialchars_decode($_POST["title"]),
 	);
 $query->execute($params);
 
@@ -67,7 +67,7 @@ $query = OCP\DB::prepare("
 	VALUES (?, ?)
 	");
 	
-$tags = explode(' ', urldecode($_GET["tags"]));
+$tags = explode(' ', urldecode($_POST["tags"]));
 foreach ($tags as $tag) {
 	if(empty($tag)) {
 		//avoid saving blankspaces
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
index 2bd91f232a..1eee1718d1 100644
--- a/apps/bookmarks/ajax/recordClick.php
+++ b/apps/bookmarks/ajax/recordClick.php
@@ -37,7 +37,7 @@ $query = OCP\DB::prepare("
 		AND url LIKE ?
 	");
 	
-$params=array(OCP\USER::getUser(), htmlspecialchars_decode($_GET["url"]));
+$params=array(OCP\USER::getUser(), htmlspecialchars_decode($_POST["url"]));
 $bookmarks = $query->execute($params);
 
 header( "HTTP/1.1 204 No Content" );
diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php
index c919a5fc43..4de2475d06 100644
--- a/apps/bookmarks/ajax/updateList.php
+++ b/apps/bookmarks/ajax/updateList.php
@@ -33,11 +33,11 @@ OCP\JSON::checkAppEnabled('bookmarks');
 
 
 //Filter for tag?
-$filterTag = isset($_GET['tag']) ? htmlspecialchars_decode($_GET['tag']) : false;
+$filterTag = isset($_POST['tag']) ? htmlspecialchars_decode($_POST['tag']) : false;
 
-$offset = isset($_GET['page']) ? intval($_GET['page']) * 10 : 0;
+$offset = isset($_POST['page']) ? intval($_POST['page']) * 10 : 0;
 
-$sort = isset($_GET['sort']) ? ($_GET['sort']) : 'bookmarks_sorting_recent';
+$sort = isset($_POST['sort']) ? ($_POST['sort']) : 'bookmarks_sorting_recent';
 if($sort == 'bookmarks_sorting_clicks') {
 	$sqlSortColumn = 'clickcount';
 } else {
diff --git a/apps/bookmarks/js/addBm.js b/apps/bookmarks/js/addBm.js
index d64e55e892..625ac8420a 100644
--- a/apps/bookmarks/js/addBm.js
+++ b/apps/bookmarks/js/addBm.js
@@ -6,6 +6,7 @@ function addBookmark(event) {
 	var url = $('#bookmark_add_url').val();
 	var tags = $('#bookmark_add_tags').val();
 	$.ajax({
+		type: 'POST',
 		url: 'ajax/addBookmark.php',
 		data: 'url=' + encodeURI(url) + '&tags=' + encodeURI(tags),
 		success: function(data){ 
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index a746cf437b..7f3104e812 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -20,6 +20,7 @@ function getBookmarks() {
 	}
 
 	$.ajax({
+		  type: 'POST',
 		url: OC.filePath('bookmarks', 'ajax', 'updateList.php'),
 		data: 'tag=' + encodeURIComponent($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting,
 		success: function(bookmarks){
@@ -70,6 +71,7 @@ function addOrEditBookmark(event) {
 	}
 	if (id == 0) {
 		$.ajax({
+			type: 'POST',
 			url: OC.filePath('bookmarks', 'ajax', 'addBookmark.php'),
 			data: 'url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags),
 			success: function(response){
@@ -82,6 +84,7 @@ function addOrEditBookmark(event) {
 	}
 	else {
 		$.ajax({
+			type: 'POST',
 			url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'),
 			data: 'id=' + id + '&url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags),
 			success: function(){
@@ -99,6 +102,7 @@ function addOrEditBookmark(event) {
 function delBookmark(event) {
 	var record = $(this).parent().parent();
 	$.ajax({
+		type: 'POST',
 		url: OC.filePath('bookmarks', 'ajax', 'delBookmark.php'),
 		data: 'id=' + record.data('id'),
 		success: function(data){
@@ -177,6 +181,7 @@ function updateOnBottom() {
 
 function recordClick(event) {
 	$.ajax({
+		type: 'POST',
 		url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'),
 		data: 'url=' + encodeURIComponent($(this).attr('href')),
 	});
diff --git a/apps/bookmarks/js/bookmarksearch.js b/apps/bookmarks/js/bookmarksearch.js
index e7a4fb1839..e8f5363c93 100644
--- a/apps/bookmarks/js/bookmarksearch.js
+++ b/apps/bookmarks/js/bookmarksearch.js
@@ -16,6 +16,7 @@ function recordClick(event) {
 	var jsFileLocation = $('script[src*=bookmarksearch]').attr('src');
 	jsFileLocation = jsFileLocation.replace('js/bookmarksearch.js', '');
 	$.ajax({
+		type: 'POST',
 		url: jsFileLocation + 'ajax/recordClick.php',
 		data: 'url=' + encodeURI($(this).attr('href')),
 	});	

From 27d1c1bb947a7fc6f26e8574a2c7602154d56525 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 00:14:28 +0200
Subject: [PATCH 0295/1537] Sanitize user input

---
 apps/files_external/templates/settings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 9f65cfca96..af185c2803 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -16,7 +16,7 @@
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
 				<tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>>
-					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo htmlentities($mountPoint); ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
@@ -35,13 +35,13 @@
 								<?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
 									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
 									<?php if (strpos($placeholder, '*') !== false): ?>
-										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
 									<?php elseif(strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" <?php if ($value == 'true') echo ' checked="checked"'; ?>  /><?php echo substr($placeholder, 1); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
-										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
 									<?php else: ?>
-										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo $placeholder; ?>" />
+										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo $placeholder; ?>" />
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>

From f8d2e21c66e68d1786f203a8eb7e8cb38b4e670e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 00:23:35 +0200
Subject: [PATCH 0296/1537] Sanitize user input

---
 apps/user_openid/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php
index 921fa371dd..062322f6fe 100644
--- a/apps/user_openid/settings.php
+++ b/apps/user_openid/settings.php
@@ -2,7 +2,7 @@
 
 $tmpl = new OCP\Template( 'user_openid', 'settings');
 $identity=OCP\Config::getUserValue(OCP\USER::getUser(),'user_openid','identity','');
-$tmpl->assign('identity',$identity);
+$tmpl->assign('identity',htmlentities($identity));
 
 OCP\Util::addscript('user_openid','settings');
 

From 3f9b967be72ed6271921c5a18042ea2d3c15d6fe Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 00:36:58 +0200
Subject: [PATCH 0297/1537] Sanitizing user input

---
 apps/gallery/lib/tiles.php       | 4 ++--
 apps/gallery/templates/index.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index e43c99bb76..5837c752ef 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -141,7 +141,7 @@ class TileStack extends TileBase {
 	}
 
 	public function get() {
-		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
+		$r = '<div class="title gallery_div">'.htmlentities($this->stack_name).'</div>';
 		for ($i = 0; $i < count($this->tiles_array); $i++) {
 			$top = rand(-5, 5);
 			$left = rand(-5, 5);
@@ -168,7 +168,7 @@ class TileStack extends TileBase {
 	}
 	
 	public function getOnClickAction() {
-		return 'javascript:openNewGal(\''.$this->stack_name.'\');';
+		return 'javascript:openNewGal(\''.htmlentities($this->stack_name).'\');';
 	}
 
 	private $tiles_array;
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index fd83490d60..f992604549 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -14,7 +14,7 @@ div.visible { opacity: 0.8;}
 </style>
 <script type="text/javascript">
 
-var root = "<?php echo $root; ?>";
+var root = "<?php echo htmlentities($root); ?>";
 
 function explode(element) {
 	$('div', element).each(function(index, elem) {

From e79e18d86633e4b83eec926d470c318c4f5101d6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 02:40:26 +0200
Subject: [PATCH 0298/1537] Copy/paste error.

---
 apps/contacts/templates/part.contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index fee5be0800..c1ba1ccdc2 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -34,7 +34,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<dd class="propertycontainer hidden" id="org_value" data-element="ORG"><input id="org" required="required" name="value[ORG]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
-		<dt class="hidden" id="url_label" data-element="URL"><label for="nickname"><?php echo $l->t('Web site'); ?></label></dt>
+		<dt class="hidden" id="url_label" data-element="URL"><label for="url"><?php echo $l->t('Web site'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" name="value[URL]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property big" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>

From 1cb1980d6200a18c288d5db3d0dadebd65ae894b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 03:05:33 +0200
Subject: [PATCH 0299/1537] Categories: Turned the debugging down a bit.

---
 lib/vcategories.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/vcategories.php b/lib/vcategories.php
index ddcec1b6a4..1e79b62f0d 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -63,7 +63,7 @@ class OC_VCategories {
 	* @returns array containing the categories as strings.
 	*/
 	public function categories() {
-		OC_Log::write('core','OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG);
+		//OC_Log::write('core','OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG);
 		usort($this->categories, 'strnatcasecmp'); // usort to also renumber the keys
 		return $this->categories;
 	}
@@ -169,7 +169,7 @@ class OC_VCategories {
 		foreach($names as $name) {
 			OC_Log::write('core','OC_VCategories::delete: '.$name, OC_Log::DEBUG);
 			if($this->hasCategory($name)) {
-				OC_Log::write('core','OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG);
+				//OC_Log::write('core','OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG);
 				unset($this->categories[$this->array_searchi($name, $this->categories)]);
 			}
 		}
@@ -183,14 +183,14 @@ class OC_VCategories {
 					//OC_Log::write('core','OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
 					foreach($names as $name) {
 						$idx = $this->array_searchi($name, $categories);
-						OC_Log::write('core','OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG);
+						//OC_Log::write('core','OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG);
 						if($idx !== false) {
 							OC_Log::write('core','OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG);
 							unset($categories[$this->array_searchi($name, $categories)]);
 							//unset($categories[$idx]);
 						}
 					}
-					OC_Log::write('core','OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
+					//OC_Log::write('core','OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
 					$vobject->setString('CATEGORIES', implode(',', $categories));
 					$value[1] = $vobject->serialize();
 					$objects[$key] = $value;

From ece11629490407bac9489919171ed08b8452515d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 10:55:26 +0200
Subject: [PATCH 0300/1537] use native sabredav functions to generate repeating
 events

---
 apps/calendar/lib/app.php | 81 +++++++++++++--------------------------
 1 file changed, 26 insertions(+), 55 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 2cd28c0f78..b5667070d9 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -380,64 +380,35 @@ class OC_Calendar_App{
 						'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')),
 						'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
 						'lastmodified'=>$lastmodified);
-		
-		$dtstart = $vevent->DTSTART;
-		$start_dt = $dtstart->getDateTime();
-		$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-		$end_dt = $dtend->getDateTime();
-		
-		if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
-			$output['allDay'] = true;
-		}else{
-			$output['allDay'] = false;
-			$start_dt->setTimezone(new DateTimeZone(self::$tz));
-			$end_dt->setTimezone(new DateTimeZone(self::$tz));
-		}
 
-		// Handle exceptions to recurring events
-		$exceptionDateObjects = $vevent->select('EXDATE');
-		$exceptionDateMap = Array();
-		foreach ($exceptionDateObjects as $exceptionObject) {
-			foreach($exceptionObject->getDateTimes() as $datetime) {
-				$ts = $datetime->getTimestamp();
-				$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
+		$object->expand($start, $end);
+		foreach($object->getComponents() as $child){
+			if(get_class($child) != 'Sabre_VObject_Component_VEvent'){
+				continue;
 			}
-		}
-
-		$return = array();
-		if($event['repeating'] == 1){
-			$duration = (double) $end_dt->format('U') - (double) $start_dt->format('U');
-			$r = new When();
-			$r->recur($start_dt)->rrule((string) $vevent->RRULE);
-			/*$r = new iCal_Repeat_Generator(array('RECUR'  => $start_dt,
-			 *									   'RRULE'  => (string)$vevent->RRULE
-			 *									   'RDATE'  => (string)$vevent->RDATE						
-			 *									   'EXRULE' => (string)$vevent->EXRULE
-			 *									   'EXDATE' => (string)$vevent->EXDATE));*/
-			while($result = $r->next()){
-				if($result < $start){
-					continue;
-				}
-				if($result > $end){
-					break;
-				}
-				// Check for exceptions to recurring events
-				$ts = $result->getTimestamp();
-				if (isset($exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)])) {
-					continue;
-				}
-				unset($ts);
-
-				if($output['allDay'] == true){
-					$output['start'] = $result->format('Y-m-d');
-					$output['end'] = date('Y-m-d', $result->format('U') + --$duration);
-				}else{
-					$output['start'] = $result->format('Y-m-d H:i:s');
-					$output['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
-				}
-				$return[] = $output;
+			$vevent = $child;
+			$dtstart = $vevent->DTSTART;
+			$start_dt = $dtstart->getDateTime();
+			$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+			$end_dt = $dtend->getDateTime();
+			
+			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
+				$output['allDay'] = true;
+			}else{
+				$output['allDay'] = false;
+				$start_dt->setTimezone(new DateTimeZone(self::$tz));
+				$end_dt->setTimezone(new DateTimeZone(self::$tz));
 			}
-		}else{
+
+			// Handle exceptions to recurring events
+			/*$exceptionDateObjects = $vevent->select('EXDATE');
+			$exceptionDateMap = Array();
+			foreach ($exceptionDateObjects as $exceptionObject) {
+				foreach($exceptionObject->getDateTimes() as $datetime) {
+					$ts = $datetime->getTimestamp();
+					$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
+				}
+			}*/
 			if($output['allDay'] == true){
 				$output['start'] = $start_dt->format('Y-m-d');
 				$end_dt->modify('-1 sec');

From cd16c5e4796204c993d5f8c76d6c9c684cd0705c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 11 Jun 2012 12:13:08 +0200
Subject: [PATCH 0301/1537] implement a simple request token session garbage
 collector

---
 lib/util.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 mode change 100644 => 100755 lib/util.php

diff --git a/lib/util.php b/lib/util.php
old mode 100644
new mode 100755
index 7c85db71f5..b6f3cb5df4
--- a/lib/util.php
+++ b/lib/util.php
@@ -358,12 +358,30 @@ class OC_Util {
 	 * Todo: Write howto
 	 */
 	public static function callRegister(){
+		//mamimum time before token exires
+		$maxtime=(60*60);  // 1 hour
+
 		// generate a random token.
 		$token=mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000);
 
 		// store the token together with a timestamp in the session.
 		$_SESSION['requesttoken-'.$token]=time();
 
+		// cleanup old tokens garbage collector
+		// only run every 20th time so we don�t waste cpu cycles
+		if(rand(0,20)==0) {  
+			foreach($_SESSION as $key=>$value) {
+				// search all tokens in the session
+				if(substr($key,0,12)=='requesttoken') {
+					if($value+$maxtime<time()){
+						// remove outdated tokens
+						unset($_SESSION[$key]);						
+					}
+				}	
+			}
+		}
+
+
 		// return the token
 		return($token);
 	}

From 0df67aeae97747cc776acbbd479471979cfcb48b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 11 Jun 2012 12:13:55 +0200
Subject: [PATCH 0302/1537] ldap: check array for emptiness, not nullness

---
 apps/user_ldap/group_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index d2404a80aa..78bc5b4656 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -186,7 +186,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return array();
 		}
-		if(is_null($this->_groups)) {
+		if(empty($this->_groups)) {
 			$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
 			$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
 		}

From 6817a6b10286b0ba7d7b8b9b56cdb23c47e93c81 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 12:45:07 +0200
Subject: [PATCH 0303/1537] First try of implementing assignHTML

---
 apps/calendar/index.php                       |  6 +--
 apps/contacts/ajax/addbook.php                |  4 +-
 apps/contacts/ajax/createaddressbook.php      |  2 +-
 apps/contacts/ajax/editaddressbook.php        |  4 +-
 apps/contacts/ajax/loadcard.php               | 12 ++---
 apps/contacts/index.php                       | 20 ++++----
 .../templates/part.chooseaddressbook.php      |  4 +-
 apps/files/admin.php                          | 10 ++--
 apps/files/index.php                          | 26 +++++-----
 apps/user_ldap/group_ldap.php                 |  2 +-
 lib/template.php                              | 47 +++++++++++++------
 11 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index cf03a7a3cd..803f973d6e 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -54,9 +54,9 @@ OCP\Util::addscript('contacts','jquery.multi-autocomplete');
 OCP\Util::addscript('','oc-vcategories');
 OCP\App::setActiveNavigationEntry('calendar_index');
 $tmpl = new OCP\Template('calendar', 'calendar', 'user');
-$tmpl->assign('eventSources', $eventSources);
-$tmpl->assign('categories', $categories);
+$tmpl->assignHTML('eventSources', $eventSources);
+$tmpl->assignHTML('categories', $categories);
 if(array_key_exists('showevent', $_GET)){
-	$tmpl->assign('showevent', $_GET['showevent']);
+	$tmpl->assignHTML('showevent', $_GET['showevent']);
 }
 $tmpl->printPage();
diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
index 70f47cc812..0b075a0e47 100644
--- a/apps/contacts/ajax/addbook.php
+++ b/apps/contacts/ajax/addbook.php
@@ -14,7 +14,7 @@ $book = array(
 	'displayname' => '',
 );
 $tmpl = new OCP\Template('contacts', 'part.editaddressbook');
-$tmpl->assign('new', true);
-$tmpl->assign('addressbook', $book);
+$tmpl->assignHTML('new', true);
+$tmpl->assignHTML('addressbook', $book);
 $tmpl->printPage();
 ?>
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index af7c19eef5..4a256458ca 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -33,7 +33,7 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
 }
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('addressbook', $addressbook);
+$tmpl->assignHTML('addressbook', $addressbook);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'addressbook' => $addressbook,
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
index 7a9b757ae0..18ddfef6dd 100644
--- a/apps/contacts/ajax/editaddressbook.php
+++ b/apps/contacts/ajax/editaddressbook.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 $addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
 $tmpl = new OCP\Template("contacts", "part.editaddressbook");
-$tmpl->assign('new', false);
-$tmpl->assign('addressbook', $addressbook);
+$tmpl->assignHTML('new', false);
+$tmpl->assignHTML('addressbook', $addressbook);
 $tmpl->printPage();
 ?>
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index fbb831f4a1..a07120a33f 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -36,12 +36,12 @@ $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
 
 $tmpl = new OCP\Template('contacts','part.contact');
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('adr_types',$adr_types);
-$tmpl->assign('phone_types',$phone_types);
-$tmpl->assign('email_types',$email_types);
-$tmpl->assign('id','');
+$tmpl->assignHTML('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assignHTML('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assignHTML('adr_types',$adr_types);
+$tmpl->assignHTML('phone_types',$phone_types);
+$tmpl->assignHTML('email_types',$email_types);
+$tmpl->assignHTML('id','');
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 74b7c43c55..865a0cc35f 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -59,16 +59,16 @@ OCP\Util::addStyle('contacts','jquery.Jcrop');
 OCP\Util::addStyle('contacts','contacts');
 
 $tmpl = new OCP\Template( "contacts", "index", "user" );
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('property_types', $property_types);
-$tmpl->assign('phone_types', $phone_types);
-$tmpl->assign('email_types', $email_types);
-$tmpl->assign('categories', $categories);
-$tmpl->assign('addressbooks', $addressbooks);
-$tmpl->assign('contacts', $contacts);
-$tmpl->assign('details', $details );
-$tmpl->assign('id',$id);
+$tmpl->assignHTML('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assignHTML('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assignHTML('property_types', $property_types);
+$tmpl->assignHTML('phone_types', $phone_types);
+$tmpl->assignHTML('email_types', $email_types);
+$tmpl->assignHTML('categories', $categories);
+$tmpl->assignHTML('addressbooks', $addressbooks);
+$tmpl->assignHTML('contacts', $contacts);
+$tmpl->assignHTML('details', $details );
+$tmpl->assignHTML('id',$id);
 $tmpl->printPage();
 
 ?>
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index a0ec053ab9..74fab99010 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -5,8 +5,8 @@ $option_addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
 for($i = 0; $i < count($option_addressbooks); $i++){
 	echo "<tr>";
 	$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-	$tmpl->assign('addressbook', $option_addressbooks[$i]);
-	$tmpl->assign('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
+	$tmpl->assignHTML('addressbook', $option_addressbooks[$i]);
+	$tmpl->assignHTML('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
 	$tmpl->printpage();
 	echo "</tr>";
 }
diff --git a/apps/files/admin.php b/apps/files/admin.php
index d05eb7267b..5534c5545e 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -54,9 +54,9 @@ OCP\App::setActiveNavigationEntry( "files_administration" );
 $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
 
 $tmpl = new OCP\Template( 'files', 'admin' );
-$tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable );
-$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
-$tmpl->assign( 'allowZipDownload', $allowZipDownload);
-$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
+$tmpl->assignHTML( 'uploadChangable', $htaccessWorking and $htaccessWritable );
+$tmpl->assignHTML( 'uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assignHTML( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
+$tmpl->assignHTML( 'allowZipDownload', $allowZipDownload);
+$tmpl->assignHTML( 'maxZipInputSize', $maxZipInputSize);
 return $tmpl->fetchPage();
\ No newline at end of file
diff --git a/apps/files/index.php b/apps/files/index.php
index 60a3836cb5..8f98f34794 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -73,12 +73,12 @@ foreach( explode( '/', $dir ) as $i ){
 
 // make breadcrumb und filelist markup
 $list = new OCP\Template( 'files', 'part.list', '' );
-$list->assign( 'files', $files );
-$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
-$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
+$list->assignHTML( 'files', $files );
+$list->assignHTML( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
+$list->assignHTML( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
 $breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
-$breadcrumbNav->assign( 'breadcrumb', $breadcrumb );
-$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
+$breadcrumbNav->assignHTML( 'breadcrumb', $breadcrumb );
+$breadcrumbNav->assignHTML( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
@@ -89,14 +89,14 @@ $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
-$tmpl->assign( 'fileList', $list->fetchPage() );
-$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage() );
-$tmpl->assign( 'dir', $dir);
-$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
-$tmpl->assign( 'files', $files );
-$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->assignHTML( 'fileList', $list->fetchPage() );
+$tmpl->assignHTML( 'breadcrumb', $breadcrumbNav->fetchPage() );
+$tmpl->assignHTML( 'dir', $dir);
+$tmpl->assignHTML( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
+$tmpl->assignHTML( 'files', $files );
+$tmpl->assignHTML( 'uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assignHTML( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assignHTML( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 $tmpl->printPage();
 
 ?>
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 78bc5b4656..d2404a80aa 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -186,7 +186,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return array();
 		}
-		if(empty($this->_groups)) {
+		if(is_null($this->_groups)) {
 			$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
 			$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
 		}
diff --git a/lib/template.php b/lib/template.php
index 14833a1e5b..5230ad031f 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -156,9 +156,11 @@ class OC_Template{
 		$this->application = $app;
 		$this->vars = array();
 		$this->l10n = OC_L10N::get($app);
-                header('X-Frame-Options: Sameorigin');
-                header('X-XSS-Protection: 1; mode=block');
-                header('X-Content-Type-Options: nosniff');
+        
+        // Some security settings
+        header('X-Frame-Options: Sameorigin');
+        header('X-XSS-Protection: 1; mode=block');
+        header('X-Content-Type-Options: nosniff');
  
 		$this->findTemplate($name);
 	}
@@ -256,7 +258,7 @@ class OC_Template{
 	}
 
 	/**
-	 * @brief Assign variables
+	 * @brief Assign variables and sanitizes the data
 	 * @param $key key
 	 * @param $value value
 	 * @returns true
@@ -267,6 +269,23 @@ class OC_Template{
 	 * If the key existed before, it will be overwritten
 	 */
 	public function assign( $key, $value ){
+		$this->vars[$key] = htmlentities($value);
+		return true;
+	}
+
+
+	/**
+	 * @brief Assign variables
+	 * @param $key key
+	 * @param $value value
+	 * @returns true
+	 *
+	 * This function assigns a variable. It can be accessed via $_[$key] in
+	 * the template.
+	 *
+	 * If the key existed before, it will be overwritten
+	 */
+	public function assignHTML( $key, $value ){
 		$this->vars[$key] = $value;
 		return true;
 	}
@@ -354,20 +373,20 @@ class OC_Template{
 			// Decide which page we show
 			if( $this->renderas == "user" ){
 				$page = new OC_Template( "core", "layout.user" );
-				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
+				$page->assignHTML('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
 				if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
-					$page->assign('bodyid','body-settings');
+					$page->assignHTML('bodyid','body-settings');
 				}else{
-					$page->assign('bodyid','body-user');
+					$page->assignHTML('bodyid','body-user');
 				}
 
 				// Add navigation entry
 				$navigation = OC_App::getNavigation();
-				$page->assign( "navigation", $navigation);
-				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
+				$page->assignHTML( "navigation", $navigation);
+				$page->assignHTML( "settingsnavigation", OC_App::getSettingsNavigation());
 				foreach($navigation as $entry) {
 					if ($entry['active']) {
-						$page->assign( 'application', $entry['name'] );
+						$page->assignHTML( 'application', $entry['name'] );
 						break;
 					}
 				}
@@ -381,7 +400,7 @@ class OC_Template{
 			// Read the detected formfactor and use the right file name.
 			$fext = self::getFormFactorExtension();
 
-			$page->assign('jsfiles', array());
+			$page->assignHTML('jsfiles', array());
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
 				// Is it in 3rd party?
@@ -418,7 +437,7 @@ class OC_Template{
 				}
 			}
 			// Add the css files
-			$page->assign('cssfiles', array());
+			$page->assignHTML('cssfiles', array());
 			foreach(OC_Util::$styles as $style){
 				// is it in 3rdparty?
                                 if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
@@ -456,13 +475,13 @@ class OC_Template{
 			}
 
 			// Add custom headers
-			$page->assign('headers',$this->headers);
+			$page->assignHTML('headers',$this->headers);
 			foreach(OC_Util::$headers as $header){
 				$page->append('headers',$header);
 			}
 
 			// Add css files and js files
-			$page->assign( "content", $data );
+			$page->assignHTML( "content", $data );
 			return $page->fetchPage();
 		}
 		else{

From ec4c373eaaf279e7a7d441ec52ec40a7a4886a53 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 12:48:47 +0200
Subject: [PATCH 0304/1537] Settings...

---
 settings/admin.php    |  4 ++--
 settings/apps.php     |  2 +-
 settings/help.php     |  6 +++---
 settings/personal.php | 12 ++++++------
 settings/users.php    |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index a997bad4e3..d160b3dcfd 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -23,8 +23,8 @@ function compareEntries($a,$b){
 usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',$entries);
-$tmpl->assign('forms',array());
+$tmpl->assignHTML('entries',$entries);
+$tmpl->assignHTML('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
 }
diff --git a/settings/apps.php b/settings/apps.php
index 7908e6cc18..4f51a286ea 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -92,7 +92,7 @@ usort($apps, 'app_sort');
 
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps',$apps);
+$tmpl->assignHTML('apps',$apps);
 
 $tmpl->printPage();
 
diff --git a/settings/help.php b/settings/help.php
index f0abed8f55..e75607cd69 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -21,9 +21,9 @@ unset($kbe['totalitems']);
 $pagecount=ceil($totalitems/$pagesize);
 
 $tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "kbe", $kbe );
-$tmpl->assign( "pagecount", $pagecount );
-$tmpl->assign( "page", $page );
+$tmpl->assignHTML( "kbe", $kbe );
+$tmpl->assignHTML( "pagecount", $pagecount );
+$tmpl->assignHTML( "page", $page );
 $tmpl->printPage();
 
 ?>
diff --git a/settings/personal.php b/settings/personal.php
index 64e08be89e..927d9a407c 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -48,14 +48,14 @@ foreach($languageCodes as $lang){
 
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage',OC_Helper::humanFileSize($used));
-$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
-$tmpl->assign('usage_relative',$relative);
-$tmpl->assign('email',$email);
-$tmpl->assign('languages',$languages);
+$tmpl->assignHTML('usage',OC_Helper::humanFileSize($used));
+$tmpl->assignHTML('total_space',OC_Helper::humanFileSize($total));
+$tmpl->assignHTML('usage_relative',$relative);
+$tmpl->assignHTML('email',$email);
+$tmpl->assignHTML('languages',$languages);
 
 $forms=OC_App::getForms('personal');
-$tmpl->assign('forms',array());
+$tmpl->assignHTML('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
 }
diff --git a/settings/users.php b/settings/users.php
index 96515a90ce..1003ca8112 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -34,10 +34,10 @@ foreach($quotaPreset as &$preset){
 $defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
 
 $tmpl = new OC_Template( "settings", "users", "user" );
-$tmpl->assign( "users", $users );
-$tmpl->assign( "groups", $groups );
-$tmpl->assign( 'quota_preset', $quotaPreset);
-$tmpl->assign( 'default_quota', $defaultQuota);
+$tmpl->assignHTML( "users", $users );
+$tmpl->assignHTML( "groups", $groups );
+$tmpl->assignHTML( 'quota_preset', $quotaPreset);
+$tmpl->assignHTML( 'default_quota', $defaultQuota);
 $tmpl->printPage();
 
 ?>

From 6d9947b3ff7cb3d6d67b538dc3e522fd1f8ccaa1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 12:55:01 +0200
Subject: [PATCH 0305/1537] Contacts: Fix NOTE also on add, not just save.

---
 apps/contacts/ajax/addproperty.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 42b0c78203..94e09bac19 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -82,6 +82,7 @@ if(is_array($value)) {
 	$value = strip_tags($value);
 }
 
+/* preprocessing value */
 switch($name) {
 	case 'BDAY':
 		$date = New DateTime($value);
@@ -94,6 +95,8 @@ switch($name) {
 	case 'N':
 	case 'ORG':
 	case 'NOTE':
+		$value = str_replace('\n', ' \\n', $value);
+		break;
 	case 'NICKNAME':
 		// TODO: Escape commas and semicolons.
 		break;
@@ -105,8 +108,14 @@ switch($name) {
 		break;
 }
 
-
-$property = $vcard->addProperty($name, $value); //, $parameters);
+switch($name) {
+	case 'NOTE':
+		$vcard->setString('NOTE', $value);
+		break;
+	default:
+		$property = $vcard->addProperty($name, $value); //, $parameters);
+		break;
+}
 
 $line = count($vcard->children) - 1;
 

From c009bc4b87fcbb34b71ba04a5c7d043e4ea5abdc Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 13:27:32 +0200
Subject: [PATCH 0306/1537] Revert

---
 apps/calendar/index.php                       |  6 +--
 apps/contacts/ajax/addbook.php                |  4 +-
 apps/contacts/ajax/createaddressbook.php      |  2 +-
 apps/contacts/ajax/editaddressbook.php        |  4 +-
 apps/contacts/ajax/loadcard.php               | 12 ++---
 apps/contacts/index.php                       | 20 ++++----
 .../templates/part.chooseaddressbook.php      |  4 +-
 apps/files/admin.php                          | 10 ++--
 apps/files/index.php                          | 26 +++++-----
 lib/template.php                              | 51 +++++++------------
 lib/util.php                                  | 18 -------
 settings/admin.php                            |  4 +-
 settings/apps.php                             |  2 +-
 settings/help.php                             |  6 +--
 settings/personal.php                         | 12 ++---
 settings/users.php                            |  8 +--
 16 files changed, 78 insertions(+), 111 deletions(-)
 mode change 100755 => 100644 lib/util.php

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 803f973d6e..cf03a7a3cd 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -54,9 +54,9 @@ OCP\Util::addscript('contacts','jquery.multi-autocomplete');
 OCP\Util::addscript('','oc-vcategories');
 OCP\App::setActiveNavigationEntry('calendar_index');
 $tmpl = new OCP\Template('calendar', 'calendar', 'user');
-$tmpl->assignHTML('eventSources', $eventSources);
-$tmpl->assignHTML('categories', $categories);
+$tmpl->assign('eventSources', $eventSources);
+$tmpl->assign('categories', $categories);
 if(array_key_exists('showevent', $_GET)){
-	$tmpl->assignHTML('showevent', $_GET['showevent']);
+	$tmpl->assign('showevent', $_GET['showevent']);
 }
 $tmpl->printPage();
diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
index 0b075a0e47..70f47cc812 100644
--- a/apps/contacts/ajax/addbook.php
+++ b/apps/contacts/ajax/addbook.php
@@ -14,7 +14,7 @@ $book = array(
 	'displayname' => '',
 );
 $tmpl = new OCP\Template('contacts', 'part.editaddressbook');
-$tmpl->assignHTML('new', true);
-$tmpl->assignHTML('addressbook', $book);
+$tmpl->assign('new', true);
+$tmpl->assign('addressbook', $book);
 $tmpl->printPage();
 ?>
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index 4a256458ca..af7c19eef5 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -33,7 +33,7 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
 }
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assignHTML('addressbook', $addressbook);
+$tmpl->assign('addressbook', $addressbook);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'addressbook' => $addressbook,
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
index 18ddfef6dd..7a9b757ae0 100644
--- a/apps/contacts/ajax/editaddressbook.php
+++ b/apps/contacts/ajax/editaddressbook.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 $addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
 $tmpl = new OCP\Template("contacts", "part.editaddressbook");
-$tmpl->assignHTML('new', false);
-$tmpl->assignHTML('addressbook', $addressbook);
+$tmpl->assign('new', false);
+$tmpl->assign('addressbook', $addressbook);
 $tmpl->printPage();
 ?>
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index a07120a33f..fbb831f4a1 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -36,12 +36,12 @@ $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
 
 $tmpl = new OCP\Template('contacts','part.contact');
-$tmpl->assignHTML('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assignHTML('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assignHTML('adr_types',$adr_types);
-$tmpl->assignHTML('phone_types',$phone_types);
-$tmpl->assignHTML('email_types',$email_types);
-$tmpl->assignHTML('id','');
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
+$tmpl->assign('email_types',$email_types);
+$tmpl->assign('id','');
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 865a0cc35f..74b7c43c55 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -59,16 +59,16 @@ OCP\Util::addStyle('contacts','jquery.Jcrop');
 OCP\Util::addStyle('contacts','contacts');
 
 $tmpl = new OCP\Template( "contacts", "index", "user" );
-$tmpl->assignHTML('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assignHTML('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assignHTML('property_types', $property_types);
-$tmpl->assignHTML('phone_types', $phone_types);
-$tmpl->assignHTML('email_types', $email_types);
-$tmpl->assignHTML('categories', $categories);
-$tmpl->assignHTML('addressbooks', $addressbooks);
-$tmpl->assignHTML('contacts', $contacts);
-$tmpl->assignHTML('details', $details );
-$tmpl->assignHTML('id',$id);
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assign('property_types', $property_types);
+$tmpl->assign('phone_types', $phone_types);
+$tmpl->assign('email_types', $email_types);
+$tmpl->assign('categories', $categories);
+$tmpl->assign('addressbooks', $addressbooks);
+$tmpl->assign('contacts', $contacts);
+$tmpl->assign('details', $details );
+$tmpl->assign('id',$id);
 $tmpl->printPage();
 
 ?>
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index 74fab99010..a0ec053ab9 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -5,8 +5,8 @@ $option_addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
 for($i = 0; $i < count($option_addressbooks); $i++){
 	echo "<tr>";
 	$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-	$tmpl->assignHTML('addressbook', $option_addressbooks[$i]);
-	$tmpl->assignHTML('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
+	$tmpl->assign('addressbook', $option_addressbooks[$i]);
+	$tmpl->assign('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
 	$tmpl->printpage();
 	echo "</tr>";
 }
diff --git a/apps/files/admin.php b/apps/files/admin.php
index 5534c5545e..d05eb7267b 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -54,9 +54,9 @@ OCP\App::setActiveNavigationEntry( "files_administration" );
 $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
 
 $tmpl = new OCP\Template( 'files', 'admin' );
-$tmpl->assignHTML( 'uploadChangable', $htaccessWorking and $htaccessWritable );
-$tmpl->assignHTML( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assignHTML( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
-$tmpl->assignHTML( 'allowZipDownload', $allowZipDownload);
-$tmpl->assignHTML( 'maxZipInputSize', $maxZipInputSize);
+$tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable );
+$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
+$tmpl->assign( 'allowZipDownload', $allowZipDownload);
+$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
 return $tmpl->fetchPage();
\ No newline at end of file
diff --git a/apps/files/index.php b/apps/files/index.php
index 8f98f34794..60a3836cb5 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -73,12 +73,12 @@ foreach( explode( '/', $dir ) as $i ){
 
 // make breadcrumb und filelist markup
 $list = new OCP\Template( 'files', 'part.list', '' );
-$list->assignHTML( 'files', $files );
-$list->assignHTML( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
-$list->assignHTML( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
+$list->assign( 'files', $files );
+$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
+$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
 $breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
-$breadcrumbNav->assignHTML( 'breadcrumb', $breadcrumb );
-$breadcrumbNav->assignHTML( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
+$breadcrumbNav->assign( 'breadcrumb', $breadcrumb );
+$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
@@ -89,14 +89,14 @@ $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
-$tmpl->assignHTML( 'fileList', $list->fetchPage() );
-$tmpl->assignHTML( 'breadcrumb', $breadcrumbNav->fetchPage() );
-$tmpl->assignHTML( 'dir', $dir);
-$tmpl->assignHTML( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
-$tmpl->assignHTML( 'files', $files );
-$tmpl->assignHTML( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assignHTML( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assignHTML( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->assign( 'fileList', $list->fetchPage() );
+$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage() );
+$tmpl->assign( 'dir', $dir);
+$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
+$tmpl->assign( 'files', $files );
+$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 $tmpl->printPage();
 
 ?>
diff --git a/lib/template.php b/lib/template.php
index 5230ad031f..1e01b41159 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -156,11 +156,9 @@ class OC_Template{
 		$this->application = $app;
 		$this->vars = array();
 		$this->l10n = OC_L10N::get($app);
-        
-        // Some security settings
-        header('X-Frame-Options: Sameorigin');
-        header('X-XSS-Protection: 1; mode=block');
-        header('X-Content-Type-Options: nosniff');
+                header('X-Frame-Options: Sameorigin');
+                header('X-XSS-Protection: 1; mode=block');
+                header('X-Content-Type-Options: nosniff');
  
 		$this->findTemplate($name);
 	}
@@ -257,27 +255,11 @@ class OC_Template{
 		return false;
 	}
 
-	/**
-	 * @brief Assign variables and sanitizes the data
-	 * @param $key key
-	 * @param $value value
-	 * @returns true
-	 *
-	 * This function assigns a variable. It can be accessed via $_[$key] in
-	 * the template.
-	 *
-	 * If the key existed before, it will be overwritten
-	 */
-	public function assign( $key, $value ){
-		$this->vars[$key] = htmlentities($value);
-		return true;
-	}
-
-
 	/**
 	 * @brief Assign variables
 	 * @param $key key
 	 * @param $value value
+	 * @param $sanitizeHTML false, if data shouldn't get passed through htmlentities
 	 * @returns true
 	 *
 	 * This function assigns a variable. It can be accessed via $_[$key] in
@@ -285,7 +267,10 @@ class OC_Template{
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
-	public function assignHTML( $key, $value ){
+	public function assign( $key, $value, $sanitizeHTML=true ){
+		if($sanitizeHTML) { 
+			$this->vars[$key] = htmlentities($value);
+		}
 		$this->vars[$key] = $value;
 		return true;
 	}
@@ -373,20 +358,20 @@ class OC_Template{
 			// Decide which page we show
 			if( $this->renderas == "user" ){
 				$page = new OC_Template( "core", "layout.user" );
-				$page->assignHTML('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
+				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
 				if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
-					$page->assignHTML('bodyid','body-settings');
+					$page->assign('bodyid','body-settings');
 				}else{
-					$page->assignHTML('bodyid','body-user');
+					$page->assign('bodyid','body-user');
 				}
 
 				// Add navigation entry
 				$navigation = OC_App::getNavigation();
-				$page->assignHTML( "navigation", $navigation);
-				$page->assignHTML( "settingsnavigation", OC_App::getSettingsNavigation());
+				$page->assign( "navigation", $navigation);
+				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
 				foreach($navigation as $entry) {
 					if ($entry['active']) {
-						$page->assignHTML( 'application', $entry['name'] );
+						$page->assign( 'application', $entry['name'] );
 						break;
 					}
 				}
@@ -400,7 +385,7 @@ class OC_Template{
 			// Read the detected formfactor and use the right file name.
 			$fext = self::getFormFactorExtension();
 
-			$page->assignHTML('jsfiles', array());
+			$page->assign('jsfiles', array());
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
 				// Is it in 3rd party?
@@ -437,7 +422,7 @@ class OC_Template{
 				}
 			}
 			// Add the css files
-			$page->assignHTML('cssfiles', array());
+			$page->assign('cssfiles', array());
 			foreach(OC_Util::$styles as $style){
 				// is it in 3rdparty?
                                 if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
@@ -475,13 +460,13 @@ class OC_Template{
 			}
 
 			// Add custom headers
-			$page->assignHTML('headers',$this->headers);
+			$page->assign('headers',$this->headers);
 			foreach(OC_Util::$headers as $header){
 				$page->append('headers',$header);
 			}
 
 			// Add css files and js files
-			$page->assignHTML( "content", $data );
+			$page->assign( "content", $data );
 			return $page->fetchPage();
 		}
 		else{
diff --git a/lib/util.php b/lib/util.php
old mode 100755
new mode 100644
index b6f3cb5df4..7c85db71f5
--- a/lib/util.php
+++ b/lib/util.php
@@ -358,30 +358,12 @@ class OC_Util {
 	 * Todo: Write howto
 	 */
 	public static function callRegister(){
-		//mamimum time before token exires
-		$maxtime=(60*60);  // 1 hour
-
 		// generate a random token.
 		$token=mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000);
 
 		// store the token together with a timestamp in the session.
 		$_SESSION['requesttoken-'.$token]=time();
 
-		// cleanup old tokens garbage collector
-		// only run every 20th time so we don�t waste cpu cycles
-		if(rand(0,20)==0) {  
-			foreach($_SESSION as $key=>$value) {
-				// search all tokens in the session
-				if(substr($key,0,12)=='requesttoken') {
-					if($value+$maxtime<time()){
-						// remove outdated tokens
-						unset($_SESSION[$key]);						
-					}
-				}	
-			}
-		}
-
-
 		// return the token
 		return($token);
 	}
diff --git a/settings/admin.php b/settings/admin.php
index d160b3dcfd..a997bad4e3 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -23,8 +23,8 @@ function compareEntries($a,$b){
 usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assignHTML('entries',$entries);
-$tmpl->assignHTML('forms',array());
+$tmpl->assign('entries',$entries);
+$tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
 }
diff --git a/settings/apps.php b/settings/apps.php
index 4f51a286ea..7908e6cc18 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -92,7 +92,7 @@ usort($apps, 'app_sort');
 
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assignHTML('apps',$apps);
+$tmpl->assign('apps',$apps);
 
 $tmpl->printPage();
 
diff --git a/settings/help.php b/settings/help.php
index e75607cd69..f0abed8f55 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -21,9 +21,9 @@ unset($kbe['totalitems']);
 $pagecount=ceil($totalitems/$pagesize);
 
 $tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assignHTML( "kbe", $kbe );
-$tmpl->assignHTML( "pagecount", $pagecount );
-$tmpl->assignHTML( "page", $page );
+$tmpl->assign( "kbe", $kbe );
+$tmpl->assign( "pagecount", $pagecount );
+$tmpl->assign( "page", $page );
 $tmpl->printPage();
 
 ?>
diff --git a/settings/personal.php b/settings/personal.php
index 927d9a407c..64e08be89e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -48,14 +48,14 @@ foreach($languageCodes as $lang){
 
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assignHTML('usage',OC_Helper::humanFileSize($used));
-$tmpl->assignHTML('total_space',OC_Helper::humanFileSize($total));
-$tmpl->assignHTML('usage_relative',$relative);
-$tmpl->assignHTML('email',$email);
-$tmpl->assignHTML('languages',$languages);
+$tmpl->assign('usage',OC_Helper::humanFileSize($used));
+$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
+$tmpl->assign('usage_relative',$relative);
+$tmpl->assign('email',$email);
+$tmpl->assign('languages',$languages);
 
 $forms=OC_App::getForms('personal');
-$tmpl->assignHTML('forms',array());
+$tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
 }
diff --git a/settings/users.php b/settings/users.php
index 1003ca8112..96515a90ce 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -34,10 +34,10 @@ foreach($quotaPreset as &$preset){
 $defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
 
 $tmpl = new OC_Template( "settings", "users", "user" );
-$tmpl->assignHTML( "users", $users );
-$tmpl->assignHTML( "groups", $groups );
-$tmpl->assignHTML( 'quota_preset', $quotaPreset);
-$tmpl->assignHTML( 'default_quota', $defaultQuota);
+$tmpl->assign( "users", $users );
+$tmpl->assign( "groups", $groups );
+$tmpl->assign( 'quota_preset', $quotaPreset);
+$tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->printPage();
 
 ?>

From b63795ccb8565197aae8578f7e71ad2f7c15256d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 14:36:11 +0200
Subject: [PATCH 0307/1537] Handling arrays

---
 lib/template.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/template.php b/lib/template.php
index 1e01b41159..d7a87705e3 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -268,13 +268,28 @@ class OC_Template{
 	 * If the key existed before, it will be overwritten
 	 */
 	public function assign( $key, $value, $sanitizeHTML=true ){
+		if(is_array($value) && $sanitizeHTML) { 
+			array_walk_recursive($value,'OC_Template::sanitizeHTML');
+			$this->vars[$key] = $value;
+			return true;
+		}
 		if($sanitizeHTML) { 
-			$this->vars[$key] = htmlentities($value);
+			$this->vars[$key] = htmlentities($value, ENT_QUOTES);
+			return true;
 		}
 		$this->vars[$key] = $value;
 		return true;
 	}
 
+	/**
+	 * @brief Internaly used to sanitze HTML
+	 *
+	 * This function is internally used to sanitize HTML.
+	 */
+ 	private function sanitizeHTML( &$value ){
+        $value = htmlentities( $value, ENT_QUOTES );
+    }
+
 	/**
 	 * @brief Appends a variable
 	 * @param $key key

From 40459c8c66d0e97930d9efc84ff41ea54510ac96 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:00:51 +0200
Subject: [PATCH 0308/1537] some work on repeating events caching - basic class
 should work now :)

---
 apps/calendar/lib/repeat.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index dd3967c899..e85d04b93f 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -89,13 +89,33 @@ class OC_Calendar_Repeat{
 			return false;
 		}
 		$object = OC_VObject::parse($event['calendardata']);
-		$start = new DateTime('first day of January', new DateTimeZone('UTC'));
+		$start = new DateTime('first day of this year', new DateTimeZone('UTC'));
 		$start->modify('-5 years');
-		$end = new DateTime('last day of December', new DateTimeZone('UTC'));
+		$end = new DateTime('last day of this year', new DateTimeZone('UTC'));
 		$end->modify('+5 years');
 		$object->expand($start, $end);
-
-		
+		foreach($object->getComponents() as $vevent){
+			if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
+				continue;
+			}
+			$dtstart = $vevent->DTSTART;
+			$start_dt = $dtstart->getDateTime();
+			$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+			$end_dt = $dtend->getDateTime();
+			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
+				$startdate = $start_dt->format('Y-m-d');
+				$enddate = $end_dt->format('Y-m-d');
+			}else{
+				$start_dt->setTimezone(new DateTimeZone('UTC'));
+				$end_dt->setTimezone(new DateTimeZone('UTC'));
+				$startdate = $start_dt->format('Y-m-d H:i:s');
+				$enddate = $end_dt->format('Y-m-d H:i:s');
+			}
+			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_repeat (eventid,calid,startdate,enddate) VALUES(?,?,?,?)');
+			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startdate,$enddate));
+			$object_id = OCP\DB::insertid('*PREFIX*calendar_repeat');
+		}
+		return true;
 	}
 	/*
 	 * @brief generates the cache the first time for all repeating event of an calendar

From 01bd048bb31aa262986e080bc614f450ee478a06 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:01:48 +0200
Subject: [PATCH 0309/1537] remove insert id

---
 apps/calendar/lib/repeat.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index e85d04b93f..36e56a2f70 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -113,7 +113,6 @@ class OC_Calendar_Repeat{
 			}
 			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_repeat (eventid,calid,startdate,enddate) VALUES(?,?,?,?)');
 			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startdate,$enddate));
-			$object_id = OCP\DB::insertid('*PREFIX*calendar_repeat');
 		}
 		return true;
 	}

From 18e44ba2f38c67c43b64f0f753472407f30c98e0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 15:03:45 +0200
Subject: [PATCH 0310/1537] Some updates...

---
 lib/template.php | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/lib/template.php b/lib/template.php
index d7a87705e3..35b941794b 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -267,27 +267,41 @@ class OC_Template{
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
-	public function assign( $key, $value, $sanitizeHTML=true ){
-		if(is_array($value) && $sanitizeHTML) { 
+		public function assign( $key, $value, $sanitizeHTML=true ){
+		if($sanitizeHTML == true) {
+			if(is_array($value)) {
+				array_walk_recursive($value,'OC_Template::sanitizeHTML');
+			} else {
+				$value = OC_Template::sanitizeHTML($value);
+			}
+		}
+		$this->vars[$key] = $value;
+		return true;
+	}
+
+
+/*	public function assign( $key, $value, $sanitizeHTML = true ){
+		if(is_array($value) && $sanitizeHTML == true) { 
 			array_walk_recursive($value,'OC_Template::sanitizeHTML');
 			$this->vars[$key] = $value;
 			return true;
 		}
-		if($sanitizeHTML) { 
+		if($sanitizeHTML == true) { 
 			$this->vars[$key] = htmlentities($value, ENT_QUOTES);
 			return true;
 		}
 		$this->vars[$key] = $value;
 		return true;
-	}
+	}*/
 
 	/**
 	 * @brief Internaly used to sanitze HTML
 	 *
 	 * This function is internally used to sanitize HTML.
 	 */
- 	private function sanitizeHTML( &$value ){
+ 	private static function sanitizeHTML( &$value ){
         $value = htmlentities( $value, ENT_QUOTES );
+        return $value;
     }
 
 	/**
@@ -373,20 +387,20 @@ class OC_Template{
 			// Decide which page we show
 			if( $this->renderas == "user" ){
 				$page = new OC_Template( "core", "layout.user" );
-				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
+				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
 				if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
-					$page->assign('bodyid','body-settings');
+					$page->assign('bodyid','body-settings', false);
 				}else{
-					$page->assign('bodyid','body-user');
+					$page->assign('bodyid','body-user', false);
 				}
 
 				// Add navigation entry
 				$navigation = OC_App::getNavigation();
-				$page->assign( "navigation", $navigation);
-				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
+				$page->assign( "navigation", $navigation, false);
+				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation(), false);
 				foreach($navigation as $entry) {
 					if ($entry['active']) {
-						$page->assign( 'application', $entry['name'] );
+						$page->assign( 'application', $entry['name'], false );
 						break;
 					}
 				}
@@ -400,7 +414,7 @@ class OC_Template{
 			// Read the detected formfactor and use the right file name.
 			$fext = self::getFormFactorExtension();
 
-			$page->assign('jsfiles', array());
+			$page->assign('jsfiles', array(), false);
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
 				// Is it in 3rd party?
@@ -475,13 +489,13 @@ class OC_Template{
 			}
 
 			// Add custom headers
-			$page->assign('headers',$this->headers);
+			$page->assign('headers',$this->headers, false);
 			foreach(OC_Util::$headers as $header){
 				$page->append('headers',$header);
 			}
 
 			// Add css files and js files
-			$page->assign( "content", $data );
+			$page->assign( "content", $data, false );
 			return $page->fetchPage();
 		}
 		else{

From eb3605aa63cf6d6da80a65d96f413d18aa51f82d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:15:13 +0200
Subject: [PATCH 0311/1537] modify hooks in OC_Calendar_Object

---
 apps/calendar/lib/object.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 546cc4a509..b21ab3fe00 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -108,7 +108,7 @@ class OC_Calendar_Object{
 		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
 
 		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'addEvent', array('event_id' => $object_id));
+		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
 		return $object_id;
 	}
 
@@ -128,7 +128,7 @@ class OC_Calendar_Object{
 		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
 
 		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'addEvent', array('event_id' => $object_id));
+		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
 		return $object_id;
 	}
 
@@ -149,7 +149,7 @@ class OC_Calendar_Object{
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'editEvent', array('event_id' => $id));
+		OCP\Util::emitHook('OC_Calendar', 'editEvent', $id);
 
 		return true;
 	}
@@ -171,7 +171,7 @@ class OC_Calendar_Object{
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'editEvent', array('event_id' => $oldobject['id']));
+		OCP\Util::emitHook('OC_Calendar', 'editEvent', $oldobject['id']);
 
 		return true;
 	}
@@ -186,7 +186,7 @@ class OC_Calendar_Object{
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE id = ?' );
 		$stmt->execute(array($id));
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', array('event_id' => $id));
+		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', $id);
 
 		return true;
 	}
@@ -202,7 +202,7 @@ class OC_Calendar_Object{
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri=?' );
 		$stmt->execute(array($cid,$uri));
 		OC_Calendar_Calendar::touchCalendar($cid);
-		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', array('event_id' => $oldobject['id']));
+		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', $oldobject['id']);
 
 		return true;
 	}
@@ -212,7 +212,7 @@ class OC_Calendar_Object{
 		$stmt->execute(array($calendarid,$id));
 
 		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'moveEvent', array('event_id' => $id));
+		OCP\Util::emitHook('OC_Calendar', 'moveEvent', $id);
 
 		return true;
 	}

From 5cb9d82b45456b505d3a81f9c4edf12f4a128356 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:16:59 +0200
Subject: [PATCH 0312/1537] modify hooks in OC_Calendar_Calendar

---
 apps/calendar/lib/calendar.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 0655a7f2d7..9af5c0ca81 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -110,7 +110,7 @@ class OC_Calendar_Calendar{
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
 		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
-		OCP\Util::emitHook('OC_Calendar', 'addCalendar', array('calendar_id' => $insertid));
+		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
 
 		return $insertid;
 	}
@@ -133,7 +133,7 @@ class OC_Calendar_Calendar{
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
 		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
-		OCP\Util::emitHook('OC_Calendar', 'addCalendar', array('calendar_id' => $insertid));
+		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
 
 		return $insertid;
 	}
@@ -164,7 +164,7 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' );
 		$result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
 
-		OCP\Util::emitHook('OC_Calendar', 'editCalendar', array('calendar_id' => $id));
+		OCP\Util::emitHook('OC_Calendar', 'editCalendar', $id);
 		return true;
 	}
 
@@ -205,7 +205,7 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
 		$stmt->execute(array($id));
 
-		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', array('calendar_id' => $id));
+		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', $id);
 
 		return true;
 	}

From e6c8febafce03ccae90e280803842ea18a3a62db Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:18:46 +0200
Subject: [PATCH 0313/1537] add hooks to connect calendar / event changes with
 OC_Calendar_Repeat

---
 apps/calendar/appinfo/app.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 253844c1f0..89821d37d8 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -9,6 +9,11 @@ OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
 OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
+OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate');
+OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update');
+OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean');
+OCP\Util::connectHook('OC_Calendar', 'moveEvent', 'OC_Calendar_Repeat', 'update');
+OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleancalendar');
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle("3rdparty", "chosen/chosen");

From 2ee809fd8636643c0ccc69bcf023ce2c404143e2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 15:21:37 +0200
Subject: [PATCH 0314/1537] Allow same host redirects (/somepath).

---
 lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index b6f3cb5df4..d1d5983dcf 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -332,7 +332,8 @@ class OC_Util {
 	* Redirect to the user default page
 	*/
 	public static function redirectToDefaultPage(){
-		if(isset($_REQUEST['redirect_url']) && substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT) {
+		OC_Log::write('core','redirectToDefaultPage',OC_Log::DEBUG);
+		if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
 			header( 'Location: '.$_REQUEST['redirect_url']);
 		} else {
 			header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));

From 4f6978c30f5e64c4194ebe46c8c78d8ef1c002fd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 15:22:58 +0200
Subject: [PATCH 0315/1537] Redirect HTTP Auth requests to REQUEST_URI. Partial
 fix for http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-874

---
 index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.php b/index.php
index 07f8436720..b90b1b310a 100755
--- a/index.php
+++ b/index.php
@@ -112,6 +112,7 @@ elseif(OC_User::isLoggedIn()) {
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
 			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();
+			$_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
 			OC_Util::redirectToDefaultPage();
 		}else{
 			$error = true;

From 32b366585db05fce17e6e99e53445fa15f341611 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:36:48 +0200
Subject: [PATCH 0316/1537] some fixes for repeating events caching

---
 apps/calendar/lib/repeat.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 36e56a2f70..f1323a9cb5 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -84,14 +84,14 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function generate($id){
-		$event = OC_Calendar_Object::find(id);
+		$event = OC_Calendar_Object::find($id);
 		if($event['repeating'] == 0){
 			return false;
 		}
 		$object = OC_VObject::parse($event['calendardata']);
-		$start = new DateTime('first day of this year', new DateTimeZone('UTC'));
+		$start = new DateTime('first day of January ' . date('Y') . ' 00:00:00', new DateTimeZone('UTC'));
 		$start->modify('-5 years');
-		$end = new DateTime('last day of this year', new DateTimeZone('UTC'));
+		$end = new DateTime('last day of December ' . date('Y') . ' 23:59:59', new DateTimeZone('UTC'));
 		$end->modify('+5 years');
 		$object->expand($start, $end);
 		foreach($object->getComponents() as $vevent){
@@ -104,6 +104,7 @@ class OC_Calendar_Repeat{
 			$end_dt = $dtend->getDateTime();
 			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 				$startdate = $start_dt->format('Y-m-d');
+				$end_dt->modify('-1 sec');
 				$enddate = $end_dt->format('Y-m-d');
 			}else{
 				$start_dt->setTimezone(new DateTimeZone('UTC'));

From 44e62c03e2c3dc03534e1065a7b9b8790b0f75e6 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 15:37:19 +0200
Subject: [PATCH 0317/1537] increase version number of calendar

---
 apps/calendar/appinfo/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
index e6adf3fc7b..ea2303bc03 100644
--- a/apps/calendar/appinfo/version
+++ b/apps/calendar/appinfo/version
@@ -1 +1 @@
-0.4
\ No newline at end of file
+0.5
\ No newline at end of file

From 739589f4853fa1c7caab15150fa8d4a98fe94663 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 11 Jun 2012 16:26:21 +0200
Subject: [PATCH 0318/1537] make sure that contact data are always utf8 encoded
 to avoid encoding problems

---
 apps/contacts/import.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 0ee35f9fd8..232de8233a 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -63,13 +63,13 @@ foreach($lines as $line){
 	if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
 		$inelement = true;
 	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
-		$card[] = $line;
+		$card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line);
 		$parts[] = implode($nl, $card);
 		$card = array();
 		$inelement = false;
 	}
 	if ($inelement === true && trim($line) != '') {
-		$card[] = $line;
+		$card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line);
 	}
 }
 //import the contacts

From fcc9a5c8d4f0388ea8cf12cbaaac0038f6e29458 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 11 Jun 2012 16:48:43 +0200
Subject: [PATCH 0319/1537] LDAP: offer config option for Group Display Name
 attribute

---
 apps/user_ldap/settings.php           | 3 ++-
 apps/user_ldap/templates/settings.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index f1a474ff27..0c29e70b5a 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute');
 
 OCP\Util::addscript('user_ldap', 'settings');
 
@@ -54,6 +54,7 @@ foreach($params as $param){
 // settings with default values
 $tmpl->assign( 'ldap_port', OCP\Config::getAppValue('user_ldap', 'ldap_port', '389'));
 $tmpl->assign( 'ldap_display_name', OCP\Config::getAppValue('user_ldap', 'ldap_display_name', 'uid'));
+$tmpl->assign( 'ldap_group_display_name', OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', 'cn'));
 $tmpl->assign( 'ldap_group_member_assoc_attribute', OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember'));
 $tmpl->assign( 'ldap_agent_password', base64_decode(OCP\Config::getAppValue('user_ldap', 'ldap_agent_password')));
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 3462f2473f..31f453b5a5 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -22,6 +22,7 @@
 		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
 		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />
 		<small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p>
+		<p><label for="ldap_group_display_name"><?php echo $l->t('Group Display Name Field');?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" value="<?php echo $_['ldap_group_display_name']; ?>" /></p>
 		<p><label for="ldap_quota_attr">Quota Attribute</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" />
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>

From 2dd84373c15cd2f696aaf1ea51028cdcb9caba56 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 17:13:20 +0200
Subject: [PATCH 0320/1537] fix bug in OC_Calendar_Repeat

---
 apps/calendar/lib/repeat.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index f1323a9cb5..585fc56008 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -34,7 +34,7 @@ class OC_Calendar_Repeat{
 	public static function get_inperiod($id, $from, $until){
 		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE eventid = ?'
 		.' AND ((startdate >= ? AND startdate <= ?)'
-		.' OR (enddate >= ? AND enddate <= ?)');
+		.' OR (enddate >= ? AND enddate <= ?))');
 		$result = $stmt->execute(array($id,
 					$from, $until,
 					$from, $until));
@@ -68,7 +68,7 @@ class OC_Calendar_Repeat{
 	public static function getcalendar_inperiod($id, $from, $until){
 		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?'
 		.' AND ((startdate >= ? AND startdate <= ?)'
-		.' OR (enddate >= ? AND enddate <= ?)');
+		.' OR (enddate >= ? AND enddate <= ?))');
 		$result = $stmt->execute(array($id,
 					$from, $until,
 					$from, $until));
@@ -155,12 +155,27 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function is_cached($id){
-		if(count(self::get($id)) === 1){
+		if(count(self::get($id)) != 0){
 			return true;
 		}else{
 			return false;
 		}
 	}
+	/*
+	 * @brief checks if an event is already cached in a specific period
+	 * @param (int) id - id of the event
+	 * @param (string) $from - start for period in UTC
+	 * @param (string) $until - end for period in UTC
+	 * @return (bool)
+	 */
+	public static function is_cached_inperiod($id, $start, $end){
+		if(count(self::get_inperiod($id, $start, $end)) != 0){
+			return true;
+		}else{
+			return false;
+		}
+
+	}
 	/*
 	 * @brief checks if a whole calendar is already cached
 	 * @param (int) id - id of the calendar

From 009c4c9045f7df0f497682bbee6e55b7664f36e2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 17:15:50 +0200
Subject: [PATCH 0321/1537] add function isrepeating to OC_Calendar_Object
 class and change OC_Calendar_Object::getUTCforMDB from protected to public

---
 apps/calendar/lib/object.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index b21ab3fe00..ba3fa814f3 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -300,7 +300,7 @@ class OC_Calendar_Object{
 	 * This function creates a date string that can be used by MDB2.
 	 * Furthermore it converts the time to UTC.
 	 */
-	protected static function getUTCforMDB($datetime){
+	public static function getUTCforMDB($datetime){
 		return date('Y-m-d H:i', $datetime->format('U') - $datetime->getOffset());
 	}
 
@@ -802,4 +802,9 @@ class OC_Calendar_Object{
 		$event = self::find($id);
 		return $event['calendarid'];
 	}
+
+	public static function isrepeating($id){
+		$event = self::find($id);
+		return ($event['repeating'] == 1)?true:false;
+	}
 }

From 09e744b79374c69ae15ea1c613b817bdc97bc79e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 17:25:03 +0200
Subject: [PATCH 0322/1537] connect OC_Calendar_repeat to events.php

---
 apps/calendar/lib/app.php | 117 ++++++++++++++++++++++----------------
 1 file changed, 67 insertions(+), 50 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index b5667070d9..4bd1e1b711 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -119,8 +119,7 @@ class OC_Calendar_App{
 	 * @brief returns the default categories of ownCloud
 	 * @return (array) $categories
 	 */
-	protected static function getDefaultCategories()
-	{
+	protected static function getDefaultCategories(){
 		return array(
 			self::$l10n->t('Birthday'),
 			self::$l10n->t('Business'),
@@ -155,8 +154,7 @@ class OC_Calendar_App{
 	 * @brief returns the categories of the vcategories object
 	 * @return (array) $categories
 	 */
-	public static function getCategoryOptions()
-	{
+	public static function getCategoryOptions(){
 		$categories = self::getVCategories()->categories();
 		return $categories;
 	}
@@ -359,65 +357,84 @@ class OC_Calendar_App{
 	/*
 	 * @brief generates the output for an event which will be readable for our js
 	 * @param (mixed) $event - event object / array
-	 * @param (int) $start - unixtimestamp of start
-	 * @param (int) $end - unixtimestamp of end
+	 * @param (int) $start - DateTime object of start
+	 * @param (int) $end - DateTime object of end
 	 * @return (array) $output - readable output
 	 */
 	public static function generateEventOutput($event, $start, $end){
-		$output = array();
-		
-		if(isset($event['calendardata'])){
+		// Why is the following code necessary ? //
+		/*if(isset($event['calendardata'])){
 			$object = OC_VObject::parse($event['calendardata']);
 			$vevent = $object->VEVENT;
 		}else{
 			$vevent = $event['vevent'];
-		}
-		
+		}*/
+		$return = array();
+		$id = $event['id'];
+		$object = $object = OC_VObject::parse($event['calendardata']);
+		$vevent = $object->VEVENT;
+		$allday = ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false;
 		$last_modified = @$vevent->__get('LAST-MODIFIED');
 		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
-		
-		$output = array('id'=>(int)$event['id'],
+		$staticoutput = array('id'=>(int)$event['id'],
 						'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')),
 						'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
-						'lastmodified'=>$lastmodified);
-
-		$object->expand($start, $end);
-		foreach($object->getComponents() as $child){
-			if(get_class($child) != 'Sabre_VObject_Component_VEvent'){
-				continue;
-			}
-			$vevent = $child;
-			$dtstart = $vevent->DTSTART;
-			$start_dt = $dtstart->getDateTime();
-			$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-			$end_dt = $dtend->getDateTime();
-			
-			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
-				$output['allDay'] = true;
-			}else{
-				$output['allDay'] = false;
-				$start_dt->setTimezone(new DateTimeZone(self::$tz));
-				$end_dt->setTimezone(new DateTimeZone(self::$tz));
-			}
-
-			// Handle exceptions to recurring events
-			/*$exceptionDateObjects = $vevent->select('EXDATE');
-			$exceptionDateMap = Array();
-			foreach ($exceptionDateObjects as $exceptionObject) {
-				foreach($exceptionObject->getDateTimes() as $datetime) {
-					$ts = $datetime->getTimestamp();
-					$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
+						'lastmodified'=>$lastmodified,
+						'allDay'=>$allday);
+		if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end))){
+			$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end));
+			foreach($cachedinperiod as $cachedevent){
+				$dynamicoutput = array();
+				if($allday){
+					$start_dt = new DateTime($cachedevent['startdate'], new DateTimeZone('UTC'));
+					$end_dt = new DateTime($cachedevent['enddate'], new DateTimeZone('UTC'));
+					$dynamicoutput['start'] = $start_dt->format('Y-m-d');
+					$dynamicoutput['end'] = $end_dt->format('Y-m-d');
+				}else{
+					$start_dt = new DateTime($cachedevent['startdate'], new DateTimeZone('UTC'));
+					$end_dt = new DateTime($cachedevent['enddate'], new DateTimeZone('UTC'));
+					$start_dt->setTimezone(new DateTimeZone(self::$tz));
+					$end_dt->setTimezone(new DateTimeZone(self::$tz));
+					$dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
+					$dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
 				}
-			}*/
-			if($output['allDay'] == true){
-				$output['start'] = $start_dt->format('Y-m-d');
-				$end_dt->modify('-1 sec');
-				$output['end'] = $end_dt->format('Y-m-d');
-			}else{
-				$output['start'] = $start_dt->format('Y-m-d H:i:s');
-				$output['end'] = $end_dt->format('Y-m-d H:i:s');
+				$return[] = array_merge($staticoutput, $dynamicoutput);
+			}
+		}else{
+			$object->expand($start, $end);
+			foreach($object->getComponents() as $vevent){
+				if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
+					continue;
+				}
+				$dynamicoutput = array();
+				$dtstart = $vevent->DTSTART;
+				$start_dt = $dtstart->getDateTime();
+				$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+				$end_dt = $dtend->getDateTime();
+				
+				if($allday){
+					$dynamicoutput['start'] = $start_dt->format('Y-m-d');
+					$end_dt->modify('-1 sec');
+					$dynamicoutput['end'] = $end_dt->format('Y-m-d');
+				}else{
+					$start_dt->setTimezone(new DateTimeZone(self::$tz));
+					$end_dt->setTimezone(new DateTimeZone(self::$tz));
+					$dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
+					$dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
+				}
+
+				// Handle exceptions to recurring events
+				/*$exceptionDateObjects = $vevent->select('EXDATE');
+				$exceptionDateMap = Array();
+				foreach ($exceptionDateObjects as $exceptionObject) {
+					foreach($exceptionObject->getDateTimes() as $datetime) {
+						$ts = $datetime->getTimestamp();
+						$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
+					}
+				}*/
+
+				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
-			$return[] = $output;
 		}
 		return $return;
 	}

From 6d68b7620cd38fda23d2d5dec73a80818035c38d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 18:12:46 +0200
Subject: [PATCH 0323/1537] Check for string

---
 lib/template.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/lib/template.php b/lib/template.php
index 35b941794b..688199a878 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -280,28 +280,16 @@ class OC_Template{
 	}
 
 
-/*	public function assign( $key, $value, $sanitizeHTML = true ){
-		if(is_array($value) && $sanitizeHTML == true) { 
-			array_walk_recursive($value,'OC_Template::sanitizeHTML');
-			$this->vars[$key] = $value;
-			return true;
-		}
-		if($sanitizeHTML == true) { 
-			$this->vars[$key] = htmlentities($value, ENT_QUOTES);
-			return true;
-		}
-		$this->vars[$key] = $value;
-		return true;
-	}*/
-
 	/**
 	 * @brief Internaly used to sanitze HTML
 	 *
 	 * This function is internally used to sanitize HTML.
 	 */
  	private static function sanitizeHTML( &$value ){
+ 		if(is_string($value)) {
         $value = htmlentities( $value, ENT_QUOTES );
         return $value;
+        }
     }
 
 	/**

From 1d493a70e7fd967bce3cdf1a31ebe3ba1942c48f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 11 Jun 2012 18:13:12 +0200
Subject: [PATCH 0324/1537] replace "=0D=0A" (\r\n) with a simple "\n" in vards
 during import

---
 apps/contacts/import.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 232de8233a..9d5504563f 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -63,13 +63,13 @@ foreach($lines as $line){
 	if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
 		$inelement = true;
 	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
-		$card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line);
+		$card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
 		$parts[] = implode($nl, $card);
 		$card = array();
 		$inelement = false;
 	}
 	if ($inelement === true && trim($line) != '') {
-		$card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line);
+		$card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
 	}
 }
 //import the contacts

From 2b22c538c8cafafedb057947ff90abb5d219c903 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 19:07:51 +0200
Subject: [PATCH 0325/1537] Make some apps compatible

---
 apps/calendar/index.php                   |  4 ++--
 apps/contacts/ajax/addproperty.php        | 13 +++++++++++--
 apps/contacts/templates/part.contacts.php |  2 +-
 apps/files/ajax/list.php                  |  2 +-
 apps/files/index.php                      | 14 +++++++-------
 apps/gallery/lib/tiles.php                |  4 ++--
 apps/user_ldap/group_ldap.php             |  2 +-
 apps/user_ldap/settings.php               |  5 +++--
 apps/user_ldap/templates/settings.php     |  1 +
 core/templates/login.php                  |  2 +-
 index.php                                 |  1 +
 lib/template.php                          | 16 +++++++---------
 lib/util.php                              | 21 ++++++++++++++++++++-
 settings/admin.php                        |  2 +-
 settings/apps.php                         |  2 +-
 settings/templates/admin.php              |  2 +-
 settings/templates/help.php               |  6 +++---
 17 files changed, 64 insertions(+), 35 deletions(-)
 mode change 100644 => 100755 lib/util.php

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index cf03a7a3cd..05a808a5ae 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -54,9 +54,9 @@ OCP\Util::addscript('contacts','jquery.multi-autocomplete');
 OCP\Util::addscript('','oc-vcategories');
 OCP\App::setActiveNavigationEntry('calendar_index');
 $tmpl = new OCP\Template('calendar', 'calendar', 'user');
-$tmpl->assign('eventSources', $eventSources);
+$tmpl->assign('eventSources', $eventSources,false);
 $tmpl->assign('categories', $categories);
 if(array_key_exists('showevent', $_GET)){
-	$tmpl->assign('showevent', $_GET['showevent']);
+	$tmpl->assign('showevent', $_GET['showevent'], false);
 }
 $tmpl->printPage();
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 42b0c78203..94e09bac19 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -82,6 +82,7 @@ if(is_array($value)) {
 	$value = strip_tags($value);
 }
 
+/* preprocessing value */
 switch($name) {
 	case 'BDAY':
 		$date = New DateTime($value);
@@ -94,6 +95,8 @@ switch($name) {
 	case 'N':
 	case 'ORG':
 	case 'NOTE':
+		$value = str_replace('\n', ' \\n', $value);
+		break;
 	case 'NICKNAME':
 		// TODO: Escape commas and semicolons.
 		break;
@@ -105,8 +108,14 @@ switch($name) {
 		break;
 }
 
-
-$property = $vcard->addProperty($name, $value); //, $parameters);
+switch($name) {
+	case 'NOTE':
+		$vcard->setString('NOTE', $value);
+		break;
+	default:
+		$property = $vcard->addProperty($name, $value); //, $parameters);
+		break;
+}
 
 $line = count($vcard->children) - 1;
 
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 5751750540..00a61f72fd 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -8,5 +8,5 @@
 		}
 	}
 ?>
-	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li>
+	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
 <?php endforeach; ?>
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index ceb8d15858..f0600a179d 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -38,7 +38,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 }
 
 $list = new OCP\Template( "files", "part.list", "" );
-$list->assign( "files", $files );
+$list->assign( "files", $files, false );
 $data = array('files' => $list->fetchPage());
 
 OCP\JSON::success(array('data' => $data));
diff --git a/apps/files/index.php b/apps/files/index.php
index 60a3836cb5..ed36c5edab 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -73,12 +73,12 @@ foreach( explode( '/', $dir ) as $i ){
 
 // make breadcrumb und filelist markup
 $list = new OCP\Template( 'files', 'part.list', '' );
-$list->assign( 'files', $files );
-$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
-$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
+$list->assign( 'files', $files, false );
+$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=', false);
+$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=', false);
 $breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
-$breadcrumbNav->assign( 'breadcrumb', $breadcrumb );
-$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
+$breadcrumbNav->assign( 'breadcrumb', $breadcrumb, false );
+$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=', false);
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
@@ -89,8 +89,8 @@ $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
-$tmpl->assign( 'fileList', $list->fetchPage() );
-$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage() );
+$tmpl->assign( 'fileList', $list->fetchPage(), false );
+$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
 $tmpl->assign( 'dir', $dir);
 $tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
 $tmpl->assign( 'files', $files );
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 5837c752ef..e43c99bb76 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -141,7 +141,7 @@ class TileStack extends TileBase {
 	}
 
 	public function get() {
-		$r = '<div class="title gallery_div">'.htmlentities($this->stack_name).'</div>';
+		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
 		for ($i = 0; $i < count($this->tiles_array); $i++) {
 			$top = rand(-5, 5);
 			$left = rand(-5, 5);
@@ -168,7 +168,7 @@ class TileStack extends TileBase {
 	}
 	
 	public function getOnClickAction() {
-		return 'javascript:openNewGal(\''.htmlentities($this->stack_name).'\');';
+		return 'javascript:openNewGal(\''.$this->stack_name.'\');';
 	}
 
 	private $tiles_array;
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index d2404a80aa..78bc5b4656 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -186,7 +186,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(!$this->configured) {
 			return array();
 		}
-		if(is_null($this->_groups)) {
+		if(empty($this->_groups)) {
 			$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
 			$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
 		}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index f1a474ff27..42084855e8 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute');
 
 OCP\Util::addscript('user_ldap', 'settings');
 
@@ -47,13 +47,14 @@ if ($_POST) {
 // fill template
 $tmpl = new OCP\Template( 'user_ldap', 'settings');
 foreach($params as $param){
-		$value = htmlentities(OCP\Config::getAppValue('user_ldap', $param,''));
+		$value = OCP\Config::getAppValue('user_ldap', $param,'');
 		$tmpl->assign($param, $value);
 }
 
 // settings with default values
 $tmpl->assign( 'ldap_port', OCP\Config::getAppValue('user_ldap', 'ldap_port', '389'));
 $tmpl->assign( 'ldap_display_name', OCP\Config::getAppValue('user_ldap', 'ldap_display_name', 'uid'));
+$tmpl->assign( 'ldap_group_display_name', OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', 'cn'));
 $tmpl->assign( 'ldap_group_member_assoc_attribute', OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember'));
 $tmpl->assign( 'ldap_agent_password', base64_decode(OCP\Config::getAppValue('user_ldap', 'ldap_agent_password')));
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 3462f2473f..31f453b5a5 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -22,6 +22,7 @@
 		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
 		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />
 		<small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p>
+		<p><label for="ldap_group_display_name"><?php echo $l->t('Group Display Name Field');?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" value="<?php echo $_['ldap_group_display_name']; ?>" /></p>
 		<p><label for="ldap_quota_attr">Quota Attribute</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" />
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
diff --git a/core/templates/login.php b/core/templates/login.php
index 41d6ba41ef..a40bf5c330 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,7 +1,7 @@
 <!--[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(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
 		<?php if($_['error']): ?>
 			<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
 		<?php endif; ?>
diff --git a/index.php b/index.php
index 07f8436720..b90b1b310a 100755
--- a/index.php
+++ b/index.php
@@ -112,6 +112,7 @@ elseif(OC_User::isLoggedIn()) {
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
 			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();
+			$_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
 			OC_Util::redirectToDefaultPage();
 		}else{
 			$error = true;
diff --git a/lib/template.php b/lib/template.php
index 688199a878..ba82b21774 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -286,10 +286,8 @@ class OC_Template{
 	 * This function is internally used to sanitize HTML.
 	 */
  	private static function sanitizeHTML( &$value ){
- 		if(is_string($value)) {
-        $value = htmlentities( $value, ENT_QUOTES );
-        return $value;
-        }
+ 			$value = htmlentities( $value );
+ 			return $value;
     }
 
 	/**
@@ -528,13 +526,13 @@ class OC_Template{
 			$_ = array_merge( $additionalparams, $this->vars );
 		}
 
-		// Einbinden
+		// Include
 		ob_start();
 		include( $this->path.$file.'.php' );
 		$data = ob_get_contents();
 		@ob_end_clean();
 
-		// Daten zurückgeben
+		// Return data
 		return $data;
 	}
 
@@ -548,7 +546,7 @@ class OC_Template{
 	public static function printUserPage( $application, $name, $parameters = array() ){
 		$content = new OC_Template( $application, $name, "user" );
 		foreach( $parameters as $key => $value ){
-			$content->assign( $key, $value );
+			$content->assign( $key, $value, false );
 		}
 		print $content->printPage();
 	}
@@ -563,7 +561,7 @@ class OC_Template{
 	public static function printAdminPage( $application, $name, $parameters = array() ){
 		$content = new OC_Template( $application, $name, "admin" );
 		foreach( $parameters as $key => $value ){
-			$content->assign( $key, $value );
+			$content->assign( $key, $value, false );
 		}
 		return $content->printPage();
 	}
@@ -578,7 +576,7 @@ class OC_Template{
 	public static function printGuestPage( $application, $name, $parameters = array() ){
 		$content = new OC_Template( $application, $name, "guest" );
 		foreach( $parameters as $key => $value ){
-			$content->assign( $key, $value );
+			$content->assign( $key, $value,false );
 		}
 		return $content->printPage();
 	}
diff --git a/lib/util.php b/lib/util.php
old mode 100644
new mode 100755
index 7c85db71f5..d1d5983dcf
--- a/lib/util.php
+++ b/lib/util.php
@@ -332,7 +332,8 @@ class OC_Util {
 	* Redirect to the user default page
 	*/
 	public static function redirectToDefaultPage(){
-		if(isset($_REQUEST['redirect_url']) && substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT) {
+		OC_Log::write('core','redirectToDefaultPage',OC_Log::DEBUG);
+		if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
 			header( 'Location: '.$_REQUEST['redirect_url']);
 		} else {
 			header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));
@@ -358,12 +359,30 @@ class OC_Util {
 	 * Todo: Write howto
 	 */
 	public static function callRegister(){
+		//mamimum time before token exires
+		$maxtime=(60*60);  // 1 hour
+
 		// generate a random token.
 		$token=mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000);
 
 		// store the token together with a timestamp in the session.
 		$_SESSION['requesttoken-'.$token]=time();
 
+		// cleanup old tokens garbage collector
+		// only run every 20th time so we don�t waste cpu cycles
+		if(rand(0,20)==0) {  
+			foreach($_SESSION as $key=>$value) {
+				// search all tokens in the session
+				if(substr($key,0,12)=='requesttoken') {
+					if($value+$maxtime<time()){
+						// remove outdated tokens
+						unset($_SESSION[$key]);						
+					}
+				}	
+			}
+		}
+
+
 		// return the token
 		return($token);
 	}
diff --git a/settings/admin.php b/settings/admin.php
index a997bad4e3..fed0fe9ff8 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -22,7 +22,7 @@ function compareEntries($a,$b){
 }
 usort($entries, 'compareEntries');
 
-$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
+$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ), false);
 $tmpl->assign('entries',$entries);
 $tmpl->assign('forms',array());
 foreach($forms as $form){
diff --git a/settings/apps.php b/settings/apps.php
index 7908e6cc18..f85b28158f 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -92,7 +92,7 @@ usort($apps, 'app_sort');
 
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps',$apps);
+$tmpl->assign('apps',$apps, false);
 
 $tmpl->printPage();
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d167f2780e..38c6042c82 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,7 +29,7 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
 				<?php echo $entry->app;?>
 			</td>
 			<td>
-				<?php echo htmlentities($entry->message);?>
+				<?php echo $entry->message;?>
 			</td>
 			<td>
 				<?php echo OC_Util::formatDate($entry->time);?>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index cf61207e60..a53ec76d68 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -26,9 +26,9 @@
 	<?php foreach($_["kbe"] as $kb): ?>
 	<div class="helpblock">
 		<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
-		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.htmlentities($kb["name"]).'</strong></a></p>');?>
-		<p><?php echo htmlentities($kb['description']);?></p>
-		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.htmlentities($kb['answer']).'</p>');?>
+		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
+		<p><?php echo $kb['description'];?></p>
+		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
 	</div>
 	<?php endforeach;
 endif?>

From 6defbc7f4d2573178ccf1b157e6ac37aa1db41d4 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 19:20:48 +0200
Subject: [PATCH 0326/1537] Removed some unessecary sanitizations

---
 apps/calendar/templates/part.choosecalendar.rowfields.php | 2 +-
 apps/files/templates/index.php                            | 2 +-
 apps/files_external/templates/settings.php                | 8 ++++----
 apps/user_openid/settings.php                             | 2 +-
 core/templates/404.php                                    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index 268c335601..bad268897b 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -2,7 +2,7 @@
 echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>';
 echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . htmlspecialchars($_['calendar']['displayname']) . '</label></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img  class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>';
-echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . htmlentities($_['calendar']['uri']) . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
+echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
 echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>';
 echo '<td width="20px"><a  href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/rename.svg').'"></a></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></td>';
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 3bd5a1ceef..44000171a1 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -15,7 +15,7 @@
 				<form data-upload-id='1' class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-					<input type="hidden" name="dir" value="<?php echo htmlentities($_['dir'],ENT_COMPAT,'utf-8') ?>" id="dir">
+					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload-white.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
 						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index af185c2803..9f65cfca96 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -16,7 +16,7 @@
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
 				<tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>>
-					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo htmlentities($mountPoint); ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
@@ -35,13 +35,13 @@
 								<?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
 									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
 									<?php if (strpos($placeholder, '*') !== false): ?>
-										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
 									<?php elseif(strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" <?php if ($value == 'true') echo ' checked="checked"'; ?>  /><?php echo substr($placeholder, 1); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
-										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
 									<?php else: ?>
-										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo $placeholder; ?>" />
+										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo $placeholder; ?>" />
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php
index 062322f6fe..921fa371dd 100644
--- a/apps/user_openid/settings.php
+++ b/apps/user_openid/settings.php
@@ -2,7 +2,7 @@
 
 $tmpl = new OCP\Template( 'user_openid', 'settings');
 $identity=OCP\Config::getUserValue(OCP\USER::getUser(),'user_openid','identity','');
-$tmpl->assign('identity',htmlentities($identity));
+$tmpl->assign('identity',$identity);
 
 OCP\Util::addscript('user_openid','settings');
 
diff --git a/core/templates/404.php b/core/templates/404.php
index cd4f2b40bb..13a8101034 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>

From d2a34f4b358627ae8b0077399b800d2296e84514 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 19:33:16 +0200
Subject: [PATCH 0327/1537] Fixes a issue with the log

---
 settings/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index fed0fe9ff8..4cbd67c367 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -22,8 +22,8 @@ function compareEntries($a,$b){
 }
 usort($entries, 'compareEntries');
 
-$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ), false);
-$tmpl->assign('entries',$entries);
+$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
+$tmpl->assign('entries',$entries,false);
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);

From ad36fc8938409975df61c00953555b3e11435a76 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 19:43:37 +0200
Subject: [PATCH 0328/1537] Fix double sanitization

---
 apps/calendar/templates/part.choosecalendar.rowfields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index bad268897b..965523f847 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -1,6 +1,6 @@
 <?php
 echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . htmlspecialchars($_['calendar']['displayname']) . '</label></td>';
+echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . $_['calendar']['displayname'] . '</label></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img  class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>';
 echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
 echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>';

From 68f819ee2077717bdbd1c9cd9a8e4c22e6685368 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 19:47:42 +0200
Subject: [PATCH 0329/1537] Removed double sanitization

---
 apps/calendar/lib/app.php                                 | 4 ++--
 .../templates/part.choosecalendar.rowfields.shared.php    | 2 +-
 apps/calendar/templates/part.eventform.php                | 8 ++++----
 apps/calendar/templates/part.import.php                   | 2 +-
 apps/calendar/templates/part.showevent.php                | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 2cd28c0f78..ff7ad1cb93 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -377,8 +377,8 @@ class OC_Calendar_App{
 		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
 		
 		$output = array('id'=>(int)$event['id'],
-						'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')),
-						'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
+						'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
+						'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
 						'lastmodified'=>$lastmodified);
 		
 		$dtstart = $vevent->DTSTART;
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
index 6a212858a2..a23266da0c 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
@@ -1,4 +1,4 @@
 <?php
 echo '<td width="20px"><input id="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Share.activation(this,\'' . $_['share']['owner'] . '\',' . $_['share']['calendar']['id'] . ')"' . ($_['share']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . htmlspecialchars($_['share']['calendar']['displayname']) . '</label></td>';
+echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . $_['share']['calendar']['displayname'] . '</label></td>';
 echo '<td style="font-style: italic;">' .  $l->t('shared with you by') . ' ' . $_['share']['owner'] . '</td>';
\ No newline at end of file
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index 2d86ce4d31..95eecf2622 100644
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -18,7 +18,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
 		<tr>
 			<th width="75px"><?php echo $l->t("Title");?>:</th>
 			<td>
-				<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?>" maxlength="100" name="title"/>
+				<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
 			</td>
 		</tr>
 	</table>
@@ -26,7 +26,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
 		<tr>
 			<th width="75px"><?php echo $l->t("Category");?>:</th>
 			<td>
-				<input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>">
+				<input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
 				<a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
 			</td>
 			<?php if(count($_['calendar_options']) > 1) { ?>
@@ -80,7 +80,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
 			<tr>
 				<th width="85px"><?php echo $l->t("Location");?>:</th>
 				<td>
-					<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?>" maxlength="100"  name="location" />
+					<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
 				</td>
 			</tr>
 		</table>
@@ -88,7 +88,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
 			<tr>
 				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
 				<td>
-					<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea>
+					<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
 				</td>
 			</tr>
 		</table>
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index b966100cc1..70ff961215 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -9,7 +9,7 @@
 $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
 $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
 for($i = 0;$i<count($calendar_options);$i++){
-	$calendar_options[$i]['displayname'] = htmlspecialchars($calendar_options[$i]['displayname']);
+	$calendar_options[$i]['displayname'] = $calendar_options[$i]['displayname'];
 }
 echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 ?>
diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
index 3646baf5bb..a5bbfd5b8f 100644
--- a/apps/calendar/templates/part.showevent.php
+++ b/apps/calendar/templates/part.showevent.php
@@ -10,7 +10,7 @@
 		<tr>
 			<th width="75px"><?php echo $l->t("Title");?>:</th>
 			<td>
-				<?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?>
+				<?php echo isset($_['title']) ? $_['title'] : '' ?>
 			</td>
 		</tr>
 	</table>
@@ -79,7 +79,7 @@
 			<tr>
 				<th width="85px"><?php echo $l->t("Location");?>:</th>
 				<td>
-					<?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?>
+					<?php echo isset($_['location']) ? $_['location'] : '' ?>
 				</td>
 			</tr>
 		</table>
@@ -87,7 +87,7 @@
 			<tr>
 				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
 				<td>
-					<?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea>
+					<?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
 			</tr>
 		</table>
 	</div>

From f9bf34340c7618a90f8ac3452b7d89085882cab3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 19:49:24 +0200
Subject: [PATCH 0330/1537] Removed unecessary sanitization

---
 apps/tasks/templates/part.taskform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tasks/templates/part.taskform.php b/apps/tasks/templates/part.taskform.php
index c00560903b..0a25ed33c9 100644
--- a/apps/tasks/templates/part.taskform.php
+++ b/apps/tasks/templates/part.taskform.php
@@ -5,7 +5,7 @@
 	<input type="text" id="location" name="location" placeholder="<?php echo $l->t('Location of the task');?>" value="<?php echo isset($_['details']->LOCATION) ? $_['details']->LOCATION[0]->value : '' ?>">
 	<br>
 	<label for="categories"><?php echo $l->t('Categories'); ?></label>
-	<input id="categories" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>">
+	<input id="categories" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
 	<a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
 	<br>
 	<label for="due"><?php echo $l->t('Due'); ?></label>

From eddad8bedbea4ec655d6835b9a8d0678a81eb850 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 9 Jun 2012 16:15:25 +0200
Subject: [PATCH 0331/1537] Calendar: remove unused markup from #controls

---
 apps/calendar/templates/calendar.php | 38 +++++++++++-----------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 832194f0fe..b0cb20f2f1 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -34,29 +34,21 @@
 				});
 				</script>
 				<div id="controls">
-					<div>
-						<form>
-							<div id="view">
-								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
-								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>&nbsp;&nbsp;
-								<img id="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
-							</div>
-						</form>
-						<form>
-							<div id="choosecalendar">
-								<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>
-								<input type="button" id="choosecalendar_input" value="<?php echo $l->t("Calendars");?>" onclick="Calendar.UI.Calendar.overview();" />
-							</div>
-						</form>
-						<form>
-							<div id="datecontrol">
-								<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
-								<span class="button" id="datecontrol_date"></span>
-								<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
-							</div>
-						</form>
-					</div>
+					<form id="view">
+						<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
+						<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
+						<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>&nbsp;&nbsp;
+						<img id="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
+					</form>
+					<form id="choosecalendar">
+						<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>
+						<input type="button" id="choosecalendar_input" value="<?php echo $l->t("Calendars");?>" onclick="Calendar.UI.Calendar.overview();" />
+					</form>
+					<form id="datecontrol">
+						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
+						<span class="button" id="datecontrol_date"></span>
+						<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
+					</form>
 				</div>
 				<div id="notification" style="display:none;"></div>
 				<div id="calendar_holder">

From 0eee140eafd128190aab6fce85ae4fb357e18f73 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 9 Jun 2012 16:45:53 +0200
Subject: [PATCH 0332/1537] Gallery: remove extra include of lib/base.php

---
 apps/gallery/lib/managers.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 9a2dbd3bae..d4d978dbdd 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -2,8 +2,6 @@
 
 namespace OC\Pictures;
 
-require_once('lib/base.php');
-
 class DatabaseManager {
 	private static $instance = null;
 	const TAG = 'DatabaseManager';

From 759ddcbf32d4b6b9149b9c03259408933448c129 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 11 Jun 2012 17:38:40 +0200
Subject: [PATCH 0333/1537] Tasks: Fix resizing of the content part

---
 apps/tasks/js/tasks.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index d1e3a9969b..6547b80981 100644
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -310,8 +310,11 @@ OC.Tasks = {
 };
 
 $(document).ready(function(){
-	fillHeight($('#tasks_lists'));
-	fillWindow($('#tasks_list'));
+	$(window).resize(function () {
+		fillHeight($('#tasks_lists'));
+		fillWindow($('#tasks_list'));
+	});
+	$(window).trigger('resize');
 
 	/*-------------------------------------------------------------------------
 	 * Actions for startup

From 08a3a4f1859851496d7cd975d7bc2b3256a998b1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 21:43:24 +0200
Subject: [PATCH 0334/1537] fix a bug in OC_Calendar_Repeat

---
 apps/calendar/lib/repeat.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 585fc56008..de13f1eb21 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -185,8 +185,8 @@ class OC_Calendar_Repeat{
 		$cachedevents = count(self::getcalendar($id));
 		$repeatingevents = 0;
 		$allevents = OC_Calendar_Object::all($id);
-		foreach($allevents['repeating'] as $repeating){
-			if($repeating === 1){
+		foreach($allevents as $event){
+			if($event['repeating'] === 1){
 				$repeatingevents++;
 			}
 		}

From 8af53829d572fd1796304a33fc3dbfe9bce84305 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:00:06 +0200
Subject: [PATCH 0335/1537] Contacts: Fix encoding errors, import errors,
 developer headache, paint cute kittens and pink clouds ;-)

---
 apps/contacts/lib/vcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 20a9e4afc9..168e8af3e5 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -131,7 +131,7 @@ class OC_Contacts_VCard{
 		foreach($property->parameters as $key=>&$parameter){
 			if(strtoupper($parameter->name) == 'ENCODING') {
 				if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used?
-					$property->value = quoted_printable_decode($property->value);
+					$property->value = str_replace("\r\n", "\n", mb_convert_encoding(quoted_printable_decode($property->value), 'utf-8', 'auto'));
 					unset($property->parameters[$key]);
 				}
 			} elseif(strtoupper($parameter->name) == 'CHARSET') {

From c75f9f9397a3b21a5165a4f2632882fdc1d894c3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:05:15 +0200
Subject: [PATCH 0336/1537] Encoding conversion moved to
 OC_Contacts_VCard::decodeProperty in commit
 95cc9730aa49963a69e46154b0cba19232219d2e

---
 apps/contacts/import.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 9d5504563f..0ee35f9fd8 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -63,13 +63,13 @@ foreach($lines as $line){
 	if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
 		$inelement = true;
 	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
-		$card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
+		$card[] = $line;
 		$parts[] = implode($nl, $card);
 		$card = array();
 		$inelement = false;
 	}
 	if ($inelement === true && trim($line) != '') {
-		$card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
+		$card[] = $line;
 	}
 }
 //import the contacts

From 4b86cbcb6f36b1ee545b00695c01817eb1780157 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:12:06 +0200
Subject: [PATCH 0337/1537] Quick fix for index errors when not importing from
 files.

---
 apps/contacts/import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 0ee35f9fd8..c95fd970fe 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -15,7 +15,7 @@ session_write_close();
 $nl = "\n";
 
 global $progresskey;
-$progresskey = 'contacts.import-' . $_GET['progresskey'];
+$progresskey = 'contacts.import-' . (isset($_GET['progresskey'])?$_GET['progresskey']:'');
 
 if (isset($_GET['progress']) && $_GET['progress']) {
 	echo OC_Cache::get($progresskey);

From ac11647d7a3e45b8eea08c4883375c095018e509 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:13:45 +0200
Subject: [PATCH 0338/1537] Fix js for missing address fields.

---
 apps/contacts/js/contacts.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index a241856300..6b83504c9c 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -839,22 +839,22 @@ Contacts={
 					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
 					var adrarray = this.data.ADR[adr]['value'];
 					var adrtxt = '';
-					if(adrarray[0].length > 0) {
+					if(adrarray[0] && adrarray[0].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
 					}
-					if(adrarray[1].length > 0) {
+					if(adrarray[1] && adrarray[1].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
 					}
-					if(adrarray[2].length > 0) {
+					if(adrarray[2] && adrarray[2].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
 					}
-					if(adrarray[3].length > 0 || adrarray[5].length > 0) {
+					if((adrarray[3] && adrarray[5]) && adrarray[3].length > 0 || adrarray[5].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
 					}
-					if(adrarray[4].length > 0) {
+					if(adrarray[4] && adrarray[4].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
 					}
-					if(adrarray[6].length > 0) {
+					if(adrarray[6] && adrarray[6].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
 					}
 					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);

From 3c9be43aa45d0d25b070289607bb78e38d7bc35c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 22:16:26 +0200
Subject: [PATCH 0339/1537] add some information about repeating events caching
 on personal settings page

---
 apps/calendar/ajax/cache/rescan.php |  8 ++++++--
 apps/calendar/ajax/cache/status.php | 22 ++++++++++++++++++++++
 apps/calendar/js/settings.js        | 19 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/ajax/cache/rescan.php b/apps/calendar/ajax/cache/rescan.php
index 1355179b95..3417f1ae4b 100644
--- a/apps/calendar/ajax/cache/rescan.php
+++ b/apps/calendar/ajax/cache/rescan.php
@@ -7,5 +7,9 @@
  */
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
-OC_Calendar_Repeat::cleancalendar(OCP\USER::getUser());
-OC_Calendar_Repeat::generatecalendar(OCP\USER::getUser());
\ No newline at end of file
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+foreach($calendars as $calendar){
+	OC_Calendar_Repeat::cleancalendar($calendar['id']);
+	OC_Calendar_Repeat::generatecalendar($calendar['id']);
+}
+OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/cache/status.php b/apps/calendar/ajax/cache/status.php
index e69de29bb2..d2806d4789 100644
--- a/apps/calendar/ajax/cache/status.php
+++ b/apps/calendar/ajax/cache/status.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <georg@ownCloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('calendar');
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+$allcached = true;
+foreach($calendars as $calendar){
+	if(!OC_Calendar_Repeat::is_calendar_cached($calendar['id'])){
+		$allcached = false;
+	}
+}
+$l = new OC_L10N('calendar');
+if(!$allcached){
+	OCP\JSON::error(array('message'=>'Not all calendars are completely cached', 'l10n'=>$l->t('Not all calendars are completely cached')));
+}else{
+	OCP\JSON::success(array('message'=>'Everything seems to be completely cached', 'l10n'=>$l->t('Everything seems to be completely cached')));
+}
\ No newline at end of file
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index f42e024d08..eafd503c99 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -45,6 +45,23 @@ $(document).ready(function(){
 		$('#firstday').chosen();
 	});
 	$('#cleancalendarcache').click(function(){
-		$.getJSON(OC.filePath('calendar', 'ajax/cache', 'rescan.php'));
+		$.getJSON(OC.filePath('calendar', 'ajax/cache', 'rescan.php'), function(){
+			calendarcachecheck();
+		});
 	});
+	calendarcachecheck();
 });
+function calendarcachecheck(){
+	$.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) {
+		$('#cleancalendarcache').attr('title', jsondata.l10n);
+		if(jsondata.status == 'success'){
+			$('#cleancalendarcache').css('background', '#90EE90');
+			$('#cleancalendarcache').css('color', '#333');
+			$('#cleancalendarcache').css('text-shadow', '#fff 0 1px 0');
+		}else{
+			$('#cleancalendarcache').css('background', '#DC143C');
+			$('#cleancalendarcache').css('color', '#FFFFFF');
+			$('#cleancalendarcache').css('text-shadow', '0px 0px 0px #fff, 0px 0px #fff');
+		}
+	});
+}
\ No newline at end of file

From d623deb2989f69c968a4331b55681efe7e476d5a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:53:20 +0200
Subject: [PATCH 0340/1537] Add .vimrc to .gitignore.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index ac58f3e6a6..e2ff07d14d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,9 @@ nbproject
 # Cloud9IDE
 .settings.xml
 
+# vim ex mode
+.vimrc
+	
 # Mac OS
 .DS_Store
 

From 3be5e2af26af9c759cbff2bf0e4f9eaf149239c0 Mon Sep 17 00:00:00 2001
From: Marco B <beinbrech@solutica.de>
Date: Tue, 5 Jun 2012 17:23:22 +0200
Subject: [PATCH 0341/1537] utf8 in der DB config

---
 apps/bookmarks/appinfo/database.xml     | 2 +-
 apps/files_sharing/appinfo/database.xml | 2 +-
 apps/gallery/appinfo/database.xml       | 2 +-
 apps/media/appinfo/database.xml         | 2 +-
 apps/remoteStorage/appinfo/database.xml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/bookmarks/appinfo/database.xml b/apps/bookmarks/appinfo/database.xml
index f2fc68e4b5..b03c1fb2c8 100644
--- a/apps/bookmarks/appinfo/database.xml
+++ b/apps/bookmarks/appinfo/database.xml
@@ -3,7 +3,7 @@
 	<name>*dbname*</name>
 	<create>true</create>
 	<overwrite>false</overwrite>
-	<charset>latin1</charset>
+	<charset>utf8</charset>
 	<table>
 		<name>*dbprefix*bookmarks</name>
 		<declaration>
diff --git a/apps/files_sharing/appinfo/database.xml b/apps/files_sharing/appinfo/database.xml
index 3378b6b09e..c5cb632d4f 100644
--- a/apps/files_sharing/appinfo/database.xml
+++ b/apps/files_sharing/appinfo/database.xml
@@ -3,7 +3,7 @@
 	 <name>*dbname*</name>
 	 <create>true</create>
 	 <overwrite>false</overwrite>
-	 <charset>latin1</charset>
+	 <charset>utf8</charset>
 	 <table>
 		<name>*dbprefix*sharing</name>
 		<declaration>
diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
index d1ccd6b5a2..1683e0ca2c 100644
--- a/apps/gallery/appinfo/database.xml
+++ b/apps/gallery/appinfo/database.xml
@@ -3,7 +3,7 @@
 	 <name>*dbname*</name>
 	 <create>true</create>
 	 <overwrite>false</overwrite>
-	 <charset>latin1</charset>
+	 <charset>utf8</charset>
 	 <table>
 		<name>*dbprefix*pictures_images_cache</name>
 		<declaration>
diff --git a/apps/media/appinfo/database.xml b/apps/media/appinfo/database.xml
index 702ae9c28b..9b942d282b 100644
--- a/apps/media/appinfo/database.xml
+++ b/apps/media/appinfo/database.xml
@@ -5,7 +5,7 @@
  <create>true</create>
  <overwrite>false</overwrite>
 
- <charset>latin1</charset>
+ <charset>utf8</charset>
 
  <table>
 
diff --git a/apps/remoteStorage/appinfo/database.xml b/apps/remoteStorage/appinfo/database.xml
index 00ee494274..d48f9f747b 100644
--- a/apps/remoteStorage/appinfo/database.xml
+++ b/apps/remoteStorage/appinfo/database.xml
@@ -3,7 +3,7 @@
 	 <name>*dbname*</name>
 	 <create>true</create>
 	 <overwrite>false</overwrite>
-	 <charset>latin1</charset>
+	 <charset>utf8</charset>
 	 <table>
 		<name>*dbprefix*authtoken</name>
 		<declaration>

From 5e37a103349006c1b29a2f8585a416baab7ee187 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 12 Jun 2012 00:49:40 +0200
Subject: [PATCH 0342/1537] PDF.JS updated, compatibility.js added for browser
 support, should fix: oc-395

---
 apps/files_pdfviewer/appinfo/app.php          |    3 +-
 apps/files_pdfviewer/appinfo/info.xml         |    2 +-
 apps/files_pdfviewer/css/viewer.css           |    1 -
 apps/files_pdfviewer/js/pdfjs/build/pdf.js    | 2830 +++++++++++++----
 .../files_pdfviewer/js/pdfjs/compatibility.js |  340 ++
 apps/files_pdfviewer/js/pdfjs/update.sh       |    3 +
 apps/files_pdfviewer/js/pdfjs/viewer.js       | 1936 +++++++++++
 apps/files_pdfviewer/js/viewer.js             |   19 +-
 8 files changed, 4470 insertions(+), 664 deletions(-)
 create mode 100644 apps/files_pdfviewer/js/pdfjs/compatibility.js
 create mode 100644 apps/files_pdfviewer/js/pdfjs/viewer.js

diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
index 06b1567067..f700d004dc 100644
--- a/apps/files_pdfviewer/appinfo/app.php
+++ b/apps/files_pdfviewer/appinfo/app.php
@@ -3,5 +3,6 @@
 OCP\Util::addscript( 'files_pdfviewer', 'viewer');
 OCP\Util::addStyle( 'files_pdfviewer', 'viewer');
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/build/pdf');
-OCP\Util::addscript( 'files_pdfviewer', 'pdfview');
+OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/compatibility');
+OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/viewer');
 ?>
diff --git a/apps/files_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml
index e3813be100..074962f57f 100644
--- a/apps/files_pdfviewer/appinfo/info.xml
+++ b/apps/files_pdfviewer/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>PDF Viewer</name>
 	<description>Inline PDF viewer (pdfjs-based)</description>
 	<licence>GPL</licence>
-	<author>Joan Creus</author>
+	<author>Joan Creus, Thomas Müller</author>
 	<require>4</require>
 	<shipped>true</shipped>
 	<default_enable/>
diff --git a/apps/files_pdfviewer/css/viewer.css b/apps/files_pdfviewer/css/viewer.css
index b735dbfedf..f9ce929d8b 100644
--- a/apps/files_pdfviewer/css/viewer.css
+++ b/apps/files_pdfviewer/css/viewer.css
@@ -2,7 +2,6 @@
 /* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
 
 #viewer {
-  background-color: #929292;
   font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
   /*margin: 0px;*/
   padding: 0px;
diff --git a/apps/files_pdfviewer/js/pdfjs/build/pdf.js b/apps/files_pdfviewer/js/pdfjs/build/pdf.js
index a19a9b75fe..b1fc9d9747 100644
--- a/apps/files_pdfviewer/js/pdfjs/build/pdf.js
+++ b/apps/files_pdfviewer/js/pdfjs/build/pdf.js
@@ -7,10 +7,9 @@ var PDFJS = {};
   // Use strict in our context only - users might not want it
   'use strict';
 
-  PDFJS.build = 'd823592';
+  PDFJS.build = '2aae4fd';
 
   // Files are inserted below - see Makefile
-  /* PDFJSSCRIPT_INCLUDE_ALL */
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -20,7 +19,7 @@ var globalScope = (typeof window === 'undefined') ? this : window;
 
 var isWorker = (typeof window == 'undefined');
 
-var ERRORS = 0, WARNINGS = 1, TODOS = 5;
+var ERRORS = 0, WARNINGS = 1, INFOS = 5;
 var verbosity = WARNINGS;
 
 // The global PDFJS object exposes the API
@@ -44,7 +43,19 @@ function getPdf(arg, callback) {
     params = { url: arg };
 
   var xhr = new XMLHttpRequest();
+
   xhr.open('GET', params.url);
+
+  var headers = params.headers;
+  if (headers) {
+    for (var property in headers) {
+      if (typeof headers[property] === 'undefined')
+        continue;
+
+      xhr.setRequestHeader(property, params.headers[property]);
+    }
+  }
+
   xhr.mozResponseType = xhr.responseType = 'arraybuffer';
   var protocol = params.url.indexOf(':') < 0 ? window.location.protocol :
     params.url.substring(0, params.url.indexOf(':') + 1);
@@ -76,8 +87,6 @@ var Page = (function PageClosure() {
   function Page(xref, pageNumber, pageDict, ref) {
     this.pageNumber = pageNumber;
     this.pageDict = pageDict;
-    this.stats = new StatTimer();
-    this.stats.enabled = !!globalScope.PDFJS.enableStats;
     this.xref = xref;
     this.ref = ref;
 
@@ -113,18 +122,10 @@ var Page = (function PageClosure() {
       return shadow(this, 'mediaBox', obj);
     },
     get view() {
-      var cropBox = this.inheritPageProp('CropBox');
-      var view = {
-        x: 0,
-        y: 0,
-        width: this.width,
-        height: this.height
-      };
-      if (!isArray(cropBox) || cropBox.length !== 4)
-        return shadow(this, 'view', view);
-
       var mediaBox = this.mediaBox;
-      var offsetX = mediaBox[0], offsetY = mediaBox[1];
+      var cropBox = this.inheritPageProp('CropBox');
+      if (!isArray(cropBox) || cropBox.length !== 4)
+        return shadow(this, 'view', mediaBox);
 
       // From the spec, 6th ed., p.963:
       // "The crop, bleed, trim, and art boxes should not ordinarily
@@ -132,42 +133,13 @@ var Page = (function PageClosure() {
       // effectively reduced to their intersection with the media box."
       cropBox = Util.intersect(cropBox, mediaBox);
       if (!cropBox)
-        return shadow(this, 'view', view);
+        return shadow(this, 'view', mediaBox);
 
-      var tl = this.rotatePoint(cropBox[0] - offsetX, cropBox[1] - offsetY);
-      var br = this.rotatePoint(cropBox[2] - offsetX, cropBox[3] - offsetY);
-      view.x = Math.min(tl.x, br.x);
-      view.y = Math.min(tl.y, br.y);
-      view.width = Math.abs(tl.x - br.x);
-      view.height = Math.abs(tl.y - br.y);
-
-      return shadow(this, 'view', view);
+      return shadow(this, 'view', cropBox);
     },
     get annotations() {
       return shadow(this, 'annotations', this.inheritPageProp('Annots'));
     },
-    get width() {
-      var mediaBox = this.mediaBox;
-      var rotate = this.rotate;
-      var width;
-      if (rotate == 0 || rotate == 180) {
-        width = (mediaBox[2] - mediaBox[0]);
-      } else {
-        width = (mediaBox[3] - mediaBox[1]);
-      }
-      return shadow(this, 'width', width);
-    },
-    get height() {
-      var mediaBox = this.mediaBox;
-      var rotate = this.rotate;
-      var height;
-      if (rotate == 0 || rotate == 180) {
-        height = (mediaBox[3] - mediaBox[1]);
-      } else {
-        height = (mediaBox[2] - mediaBox[0]);
-      }
-      return shadow(this, 'height', height);
-    },
     get rotate() {
       var rotate = this.inheritPageProp('Rotate') || 0;
       // Normalize rotation so it's a multiple of 90 and between 0 and 270
@@ -183,43 +155,20 @@ var Page = (function PageClosure() {
       return shadow(this, 'rotate', rotate);
     },
 
-    startRenderingFromOperatorList:
-      function Page_startRenderingFromOperatorList(operatorList, fonts) {
-      var self = this;
-      this.operatorList = operatorList;
-
-      var displayContinuation = function pageDisplayContinuation() {
-        // Always defer call to display() to work around bug in
-        // Firefox error reporting from XHR callbacks.
-        setTimeout(function pageSetTimeout() {
-          self.displayReadyPromise.resolve();
-        });
-      };
-
-      this.ensureFonts(fonts,
-        function pageStartRenderingFromOperatorListEnsureFonts() {
-          displayContinuation();
-        }
-      );
-    },
-
     getOperatorList: function Page_getOperatorList(handler, dependency) {
-      if (this.operatorList) {
-        // content was compiled
-        return this.operatorList;
-      }
-
-      this.stats.time('Build IR Queue');
-
       var xref = this.xref;
       var content = this.content;
       var resources = this.resources;
       if (isArray(content)) {
         // fetching items
+        var streams = [];
         var i, n = content.length;
+        var streams = [];
         for (i = 0; i < n; ++i)
-          content[i] = xref.fetchIfRef(content[i]);
-        content = new StreamsSequenceStream(content);
+          streams.push(xref.fetchIfRef(content[i]));
+        content = new StreamsSequenceStream(streams);
+      } else if (isStream(content)) {
+        content.reset();
       } else if (!content) {
         // replacing non-existent page content with empty one
         content = new Stream(new Uint8Array(0));
@@ -228,9 +177,31 @@ var Page = (function PageClosure() {
       var pe = this.pe = new PartialEvaluator(
                                 xref, handler, 'p' + this.pageNumber + '_');
 
-      this.operatorList = pe.getOperatorList(content, resources, dependency);
-      this.stats.timeEnd('Build IR Queue');
-      return this.operatorList;
+      return pe.getOperatorList(content, resources, dependency);
+    },
+    extractTextContent: function Page_extractTextContent() {
+      var handler = {
+        on: function nullHandlerOn() {},
+        send: function nullHandlerSend() {}
+      };
+
+      var xref = this.xref;
+      var content = xref.fetchIfRef(this.content);
+      var resources = xref.fetchIfRef(this.resources);
+      if (isArray(content)) {
+        // fetching items
+        var i, n = content.length;
+        var streams = [];
+        for (i = 0; i < n; ++i)
+          streams.push(xref.fetchIfRef(content[i]));
+        content = new StreamsSequenceStream(streams);
+      } else if (isStream(content)) {
+        content.reset();
+      }
+
+      var pe = new PartialEvaluator(
+                     xref, handler, 'p' + this.pageNumber + '_');
+      return pe.getTextContent(content, resources);
     },
 
     ensureFonts: function Page_ensureFonts(fonts, callback) {
@@ -250,60 +221,6 @@ var Page = (function PageClosure() {
         }.bind(this)
       );
     },
-
-    display: function Page_display(gfx, callback) {
-      var stats = this.stats;
-      stats.time('Rendering');
-      var xref = this.xref;
-      var resources = this.resources;
-      var mediaBox = this.mediaBox;
-      assertWellFormed(isDict(resources), 'invalid page resources');
-
-      gfx.xref = xref;
-      gfx.res = resources;
-      gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1],
-            width: this.width,
-            height: this.height,
-            rotate: this.rotate });
-
-      var startIdx = 0;
-      var length = this.operatorList.fnArray.length;
-      var operatorList = this.operatorList;
-      var stepper = null;
-      if (PDFJS.pdfBug && StepperManager.enabled) {
-        stepper = StepperManager.create(this.pageNumber);
-        stepper.init(operatorList);
-        stepper.nextBreakPoint = stepper.getNextBreakPoint();
-      }
-
-      var self = this;
-      function next() {
-        startIdx =
-          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
-        if (startIdx == length) {
-          gfx.endDrawing();
-          stats.timeEnd('Rendering');
-          stats.timeEnd('Overall');
-          if (callback) callback();
-        }
-      }
-      next();
-    },
-    rotatePoint: function Page_rotatePoint(x, y, reverse) {
-      var rotate = reverse ? (360 - this.rotate) : this.rotate;
-      switch (rotate) {
-        case 180:
-          return {x: this.width - x, y: y};
-        case 90:
-          return {x: this.width - y, y: this.height - x};
-        case 270:
-          return {x: y, y: x};
-        case 360:
-        case 0:
-        default:
-          return {x: x, y: this.height - y};
-      }
-    },
     getLinks: function Page_getLinks() {
       var links = [];
       var annotations = pageGetAnnotations();
@@ -337,6 +254,7 @@ var Page = (function PageClosure() {
           case 'http':
           case 'https':
           case 'ftp':
+          case 'mailto':
             return true;
           default:
             return false;
@@ -355,15 +273,10 @@ var Page = (function PageClosure() {
         if (!isName(subtype))
           continue;
         var rect = annotation.get('Rect');
-        var topLeftCorner = this.rotatePoint(rect[0], rect[1]);
-        var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
 
         var item = {};
         item.type = subtype.name;
-        item.x = Math.min(topLeftCorner.x, bottomRightCorner.x);
-        item.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
-        item.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
-        item.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
+        item.rect = rect;
         switch (subtype.name) {
           case 'Link':
             var a = annotation.get('A');
@@ -437,7 +350,8 @@ var Page = (function PageClosure() {
             var title = annotation.get('T');
             item.content = stringToPDFString(content || '');
             item.title = stringToPDFString(title || '');
-            item.name = annotation.get('Name').name;
+            item.name = !annotation.has('Name') ? 'Note' :
+              annotation.get('Name').name;
             break;
           default:
             TODO('unimplemented annotation type: ' + subtype.name);
@@ -446,37 +360,6 @@ var Page = (function PageClosure() {
         items.push(item);
       }
       return items;
-    },
-    startRendering: function Page_startRendering(ctx, callback, textLayer)  {
-      var stats = this.stats;
-      stats.time('Overall');
-      // If there is no displayReadyPromise yet, then the operatorList was never
-      // requested before. Make the request and create the promise.
-      if (!this.displayReadyPromise) {
-        this.pdf.startRendering(this);
-        this.displayReadyPromise = new Promise();
-      }
-
-      // Once the operatorList and fonts are loaded, do the actual rendering.
-      this.displayReadyPromise.then(
-        function pageDisplayReadyPromise() {
-          var gfx = new CanvasGraphics(ctx, this.objs, textLayer);
-          try {
-            this.display(gfx, callback);
-          } catch (e) {
-            if (callback)
-              callback(e);
-            else
-              error(e);
-          }
-        }.bind(this),
-        function pageDisplayReadPromiseError(reason) {
-          if (callback)
-            callback(reason);
-          else
-            error(reason);
-        }
-      );
     }
   };
 
@@ -484,26 +367,26 @@ var Page = (function PageClosure() {
 })();
 
 /**
- * The `PDFDocModel` holds all the data of the PDF file. Compared to the
+ * The `PDFDocument` holds all the data of the PDF file. Compared to the
  * `PDFDoc`, this one doesn't have any job management code.
- * Right now there exists one PDFDocModel on the main thread + one object
+ * Right now there exists one PDFDocument on the main thread + one object
  * for each worker. If there is no worker support enabled, there are two
- * `PDFDocModel` objects on the main thread created.
+ * `PDFDocument` objects on the main thread created.
  */
-var PDFDocModel = (function PDFDocModelClosure() {
-  function PDFDocModel(arg, callback) {
+var PDFDocument = (function PDFDocumentClosure() {
+  function PDFDocument(arg, password) {
     if (isStream(arg))
-      init.call(this, arg);
+      init.call(this, arg, password);
     else if (isArrayBuffer(arg))
-      init.call(this, new Stream(arg));
+      init.call(this, new Stream(arg), password);
     else
-      error('PDFDocModel: Unknown argument type');
+      error('PDFDocument: Unknown argument type');
   }
 
-  function init(stream) {
+  function init(stream, password) {
     assertWellFormed(stream.length > 0, 'stream must have data');
     this.stream = stream;
-    this.setup();
+    this.setup(password);
     this.acroForm = this.catalog.catDict.get('AcroForm');
   }
 
@@ -523,7 +406,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
     return true; /* found */
   }
 
-  PDFDocModel.prototype = {
+  PDFDocument.prototype = {
     get linearization() {
       var length = this.stream.length;
       var linearization = false;
@@ -584,7 +467,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
     },
     // Find the header, remove leading garbage and setup the stream
     // starting from the header.
-    checkHeader: function PDFDocModel_checkHeader() {
+    checkHeader: function PDFDocument_checkHeader() {
       var stream = this.stream;
       stream.reset();
       if (find(stream, '%PDF-', 1024)) {
@@ -594,11 +477,12 @@ var PDFDocModel = (function PDFDocModelClosure() {
       }
       // May not be a PDF file, continue anyway.
     },
-    setup: function PDFDocModel_setup(ownerPassword, userPassword) {
+    setup: function PDFDocument_setup(password) {
       this.checkHeader();
       var xref = new XRef(this.stream,
                           this.startXRef,
-                          this.mainXRefEntriesOffset);
+                          this.mainXRefEntriesOffset,
+                          password);
       this.xref = xref;
       this.catalog = new Catalog(xref);
     },
@@ -608,7 +492,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
       // shadow the prototype getter
       return shadow(this, 'numPages', num);
     },
-    getDocumentInfo: function PDFDocModel_getDocumentInfo() {
+    getDocumentInfo: function PDFDocument_getDocumentInfo() {
       var info;
       if (this.xref.trailer.has('Info')) {
         var infoDict = this.xref.trailer.get('Info');
@@ -622,7 +506,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
 
       return shadow(this, 'getDocumentInfo', info);
     },
-    getFingerprint: function PDFDocModel_getFingerprint() {
+    getFingerprint: function PDFDocument_getFingerprint() {
       var xref = this.xref, fileID;
       if (xref.trailer.has('ID')) {
         fileID = '';
@@ -643,259 +527,22 @@ var PDFDocModel = (function PDFDocModelClosure() {
 
       return shadow(this, 'getFingerprint', fileID);
     },
-    getPage: function PDFDocModel_getPage(n) {
+    getPage: function PDFDocument_getPage(n) {
       return this.catalog.getPage(n);
     }
   };
 
-  return PDFDocModel;
+  return PDFDocument;
 })();
 
-var PDFDoc = (function PDFDocClosure() {
-  function PDFDoc(arg, callback) {
-    var stream = null;
-    var data = null;
-
-    if (isStream(arg)) {
-      stream = arg;
-      data = arg.bytes;
-    } else if (isArrayBuffer(arg)) {
-      stream = new Stream(arg);
-      data = arg;
-    } else {
-      error('PDFDoc: Unknown argument type');
-    }
-
-    this.data = data;
-    this.stream = stream;
-    this.pdfModel = new PDFDocModel(stream);
-    this.fingerprint = this.pdfModel.getFingerprint();
-    this.info = this.pdfModel.getDocumentInfo();
-    this.catalog = this.pdfModel.catalog;
-    this.objs = new PDFObjects();
-
-    this.pageCache = [];
-    this.fontsLoading = {};
-    this.workerReadyPromise = new Promise('workerReady');
-
-    // If worker support isn't disabled explicit and the browser has worker
-    // support, create a new web worker and test if it/the browser fullfills
-    // all requirements to run parts of pdf.js in a web worker.
-    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
-    // as it arrives on the worker. Chrome added this with version 15.
-    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
-      var workerSrc = PDFJS.workerSrc;
-      if (typeof workerSrc === 'undefined') {
-        error('No PDFJS.workerSrc specified');
-      }
-
-      try {
-        var worker;
-        if (PDFJS.isFirefoxExtension) {
-          // The firefox extension can't load the worker from the resource://
-          // url so we have to inline the script and then use the blob loader.
-          var bb = new MozBlobBuilder();
-          bb.append(document.querySelector('#PDFJS_SCRIPT_TAG').textContent);
-          var blobUrl = window.URL.createObjectURL(bb.getBlob());
-          worker = new Worker(blobUrl);
-        } else {
-          // Some versions of FF can't create a worker on localhost, see:
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
-          worker = new Worker(workerSrc);
-        }
-
-        var messageHandler = new MessageHandler('main', worker);
-
-        messageHandler.on('test', function pdfDocTest(supportTypedArray) {
-          if (supportTypedArray) {
-            this.worker = worker;
-            this.setupMessageHandler(messageHandler);
-          } else {
-            globalScope.PDFJS.disableWorker = true;
-            this.setupFakeWorker();
-          }
-        }.bind(this));
-
-        var testObj = new Uint8Array(1);
-        // Some versions of Opera throw a DATA_CLONE_ERR on
-        // serializing the typed array.
-        messageHandler.send('test', testObj);
-        return;
-      } catch (e) {
-        warn('The worker has been disabled.');
-      }
-    }
-    // Either workers are disabled, not supported or have thrown an exception.
-    // Thus, we fallback to a faked worker.
-    globalScope.PDFJS.disableWorker = true;
-    this.setupFakeWorker();
-  }
-
-  PDFDoc.prototype = {
-    setupFakeWorker: function PDFDoc_setupFakeWorker() {
-      // If we don't use a worker, just post/sendMessage to the main thread.
-      var fakeWorker = {
-        postMessage: function PDFDoc_postMessage(obj) {
-          fakeWorker.onmessage({data: obj});
-        },
-        terminate: function PDFDoc_terminate() {}
-      };
-
-      var messageHandler = new MessageHandler('main', fakeWorker);
-      this.setupMessageHandler(messageHandler);
-
-      // If the main thread is our worker, setup the handling for the messages
-      // the main thread sends to it self.
-      WorkerMessageHandler.setup(messageHandler);
-    },
-
-
-    setupMessageHandler: function PDFDoc_setupMessageHandler(messageHandler) {
-      this.messageHandler = messageHandler;
-
-      messageHandler.on('page', function pdfDocPage(data) {
-        var pageNum = data.pageNum;
-        var page = this.pageCache[pageNum];
-        var depFonts = data.depFonts;
-
-        page.stats.timeEnd('Page Request');
-        page.startRenderingFromOperatorList(data.operatorList, depFonts);
-      }, this);
-
-      messageHandler.on('obj', function pdfDocObj(data) {
-        var id = data[0];
-        var type = data[1];
-
-        switch (type) {
-          case 'JpegStream':
-            var imageData = data[2];
-            loadJpegStream(id, imageData, this.objs);
-            break;
-          case 'Image':
-            var imageData = data[2];
-            this.objs.resolve(id, imageData);
-            break;
-          case 'Font':
-            var name = data[2];
-            var file = data[3];
-            var properties = data[4];
-
-            if (file) {
-              // Rewrap the ArrayBuffer in a stream.
-              var fontFileDict = new Dict();
-              file = new Stream(file, 0, file.length, fontFileDict);
-            }
-
-            // At this point, only the font object is created but the font is
-            // not yet attached to the DOM. This is done in `FontLoader.bind`.
-            var font = new Font(name, file, properties);
-            this.objs.resolve(id, font);
-            break;
-          default:
-            error('Got unkown object type ' + type);
-        }
-      }, this);
-
-      messageHandler.on('page_error', function pdfDocError(data) {
-        var page = this.pageCache[data.pageNum];
-        if (page.displayReadyPromise)
-          page.displayReadyPromise.reject(data.error);
-        else
-          error(data.error);
-      }, this);
-
-      messageHandler.on('jpeg_decode', function(data, promise) {
-        var imageData = data[0];
-        var components = data[1];
-        if (components != 3 && components != 1)
-          error('Only 3 component or 1 component can be returned');
-
-        var img = new Image();
-        img.onload = (function messageHandler_onloadClosure() {
-          var width = img.width;
-          var height = img.height;
-          var size = width * height;
-          var rgbaLength = size * 4;
-          var buf = new Uint8Array(size * components);
-          var tmpCanvas = createScratchCanvas(width, height);
-          var tmpCtx = tmpCanvas.getContext('2d');
-          tmpCtx.drawImage(img, 0, 0);
-          var data = tmpCtx.getImageData(0, 0, width, height).data;
-
-          if (components == 3) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
-              buf[j] = data[i];
-              buf[j + 1] = data[i + 1];
-              buf[j + 2] = data[i + 2];
-            }
-          } else if (components == 1) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j++) {
-              buf[j] = data[i];
-            }
-          }
-          promise.resolve({ data: buf, width: width, height: height});
-        }).bind(this);
-        var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-        img.src = src;
-      });
-
-      setTimeout(function pdfDocFontReadySetTimeout() {
-        messageHandler.send('doc', this.data);
-        this.workerReadyPromise.resolve(true);
-      }.bind(this));
-    },
-
-    get numPages() {
-      return this.pdfModel.numPages;
-    },
-
-    startRendering: function PDFDoc_startRendering(page) {
-      // The worker might not be ready to receive the page request yet.
-      this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
-        page.stats.time('Page Request');
-        this.messageHandler.send('page_request', page.pageNumber + 1);
-      }.bind(this));
-    },
-
-    getPage: function PDFDoc_getPage(n) {
-      if (this.pageCache[n])
-        return this.pageCache[n];
-
-      var page = this.pdfModel.getPage(n);
-      // Add a reference to the objects such that Page can forward the reference
-      // to the CanvasGraphics and so on.
-      page.objs = this.objs;
-      page.pdf = this;
-      return (this.pageCache[n] = page);
-    },
-
-    destroy: function PDFDoc_destroy() {
-      if (this.worker)
-        this.worker.terminate();
-
-      if (this.fontWorker)
-        this.fontWorker.terminate();
-
-      for (var n in this.pageCache)
-        delete this.pageCache[n];
-
-      delete this.data;
-      delete this.stream;
-      delete this.pdf;
-      delete this.catalog;
-    }
-  };
-
-  return PDFDoc;
-})();
-
-globalScope.PDFJS.PDFDoc = PDFDoc;
 
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
 
+// Use only for debugging purposes. This should not be used in any code that is
+// in mozilla master.
 function log(msg) {
   if (console && console.log)
     console.log(msg);
@@ -903,9 +550,36 @@ function log(msg) {
     print(msg);
 }
 
+// A notice for devs that will not trigger the fallback UI.  These are good
+// for things that are helpful to devs, such as warning that Workers were
+// disabled, which is important to devs but not end users.
+function info(msg) {
+  if (verbosity >= INFOS) {
+    log('Info: ' + msg);
+    PDFJS.LogManager.notify('info', msg);
+  }
+}
+
+// Non-fatal warnings that should trigger the fallback UI.
 function warn(msg) {
-  if (verbosity >= WARNINGS)
+  if (verbosity >= WARNINGS) {
     log('Warning: ' + msg);
+    PDFJS.LogManager.notify('warn', msg);
+  }
+}
+
+// Fatal errors that should trigger the fallback UI and halt execution by
+// throwing an exception.
+function error(msg) {
+  log('Error: ' + msg);
+  log(backtrace());
+  PDFJS.LogManager.notify('error', msg);
+  throw new Error(msg);
+}
+
+// Missing features that should trigger the fallback UI.
+function TODO(what) {
+  warn('TODO: ' + what);
 }
 
 function backtrace() {
@@ -916,21 +590,6 @@ function backtrace() {
   }
 }
 
-function error(msg) {
-  log('Error: ' + msg);
-  log(backtrace());
-  throw new Error(msg);
-}
-
-function TODO(what) {
-  if (verbosity >= TODOS)
-    log('TODO: ' + what);
-}
-
-function malformed(msg) {
-  error('Malformed PDF: ' + msg);
-}
-
 function assert(cond, msg) {
   if (!cond)
     error(msg);
@@ -940,9 +599,25 @@ function assert(cond, msg) {
 // behavior is undefined.
 function assertWellFormed(cond, msg) {
   if (!cond)
-    malformed(msg);
+    error(msg);
 }
 
+var LogManager = PDFJS.LogManager = (function LogManagerClosure() {
+  var loggers = [];
+  return {
+    addLogger: function logManager_addLogger(logger) {
+      loggers.push(logger);
+    },
+    notify: function(type, message) {
+      for (var i = 0, ii = loggers.length; i < ii; i++) {
+        var logger = loggers[i];
+        if (logger[type])
+          logger[type](message);
+      }
+    }
+  };
+})();
+
 function shadow(obj, prop, value) {
   Object.defineProperty(obj, prop, { value: value,
                                      enumerable: true,
@@ -951,6 +626,19 @@ function shadow(obj, prop, value) {
   return value;
 }
 
+var PasswordException = (function PasswordExceptionClosure() {
+  function PasswordException(msg, code) {
+    this.name = 'PasswordException';
+    this.message = msg;
+    this.code = code;
+  }
+
+  PasswordException.prototype = new Error();
+  PasswordException.constructor = PasswordException;
+
+  return PasswordException;
+})();
+
 function bytesToString(bytes) {
   var str = '';
   var length = bytes.length;
@@ -969,7 +657,7 @@ function stringToBytes(str) {
 
 var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
 
-var Util = (function UtilClosure() {
+var Util = PDFJS.Util = (function UtilClosure() {
   function Util() {}
 
   Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
@@ -990,6 +678,19 @@ var Util = (function UtilClosure() {
     return [xt, yt];
   };
 
+  Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
+    var d = m[0] * m[3] - m[1] * m[2];
+    var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
+    var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
+    return [xt, yt];
+  };
+
+  Util.inverseTransform = function Util_inverseTransform(m) {
+    var d = m[0] * m[3] - m[1] * m[2];
+    return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d,
+      (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
+  };
+
   // Apply a generic 3d matrix M on a 3-vector v:
   //   | a b c |   | X |
   //   | d e f | x | Y |
@@ -1058,7 +759,7 @@ var Util = (function UtilClosure() {
     }
 
     return result;
-  }
+  };
 
   Util.sign = function Util_sign(num) {
     return num < 0 ? -1 : 1;
@@ -1067,6 +768,80 @@ var Util = (function UtilClosure() {
   return Util;
 })();
 
+var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
+  function PageViewport(viewBox, scale, rotate, offsetX, offsetY) {
+    // creating transform to convert pdf coordinate system to the normal
+    // canvas like coordinates taking in account scale and rotation
+    var centerX = (viewBox[2] + viewBox[0]) / 2;
+    var centerY = (viewBox[3] + viewBox[1]) / 2;
+    var rotateA, rotateB, rotateC, rotateD;
+    switch (rotate) {
+      case -180:
+      case 180:
+        rotateA = -1; rotateB = 0; rotateC = 0; rotateD = 1;
+        break;
+      case -270:
+      case 90:
+        rotateA = 0; rotateB = 1; rotateC = 1; rotateD = 0;
+        break;
+      case -90:
+      case 270:
+        rotateA = 0; rotateB = -1; rotateC = -1; rotateD = 0;
+        break;
+      case 360:
+      case 0:
+      default:
+        rotateA = 1; rotateB = 0; rotateC = 0; rotateD = -1;
+        break;
+    }
+    var offsetCanvasX, offsetCanvasY;
+    var width, height;
+    if (rotateA == 0) {
+      offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
+      offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
+      width = Math.abs(viewBox[3] - viewBox[1]) * scale;
+      height = Math.abs(viewBox[2] - viewBox[0]) * scale;
+    } else {
+      offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
+      offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
+      width = Math.abs(viewBox[2] - viewBox[0]) * scale;
+      height = Math.abs(viewBox[3] - viewBox[1]) * scale;
+    }
+    // creating transform for the following operations:
+    // translate(-centerX, -centerY), rotate and flip vertically,
+    // scale, and translate(offsetCanvasX, offsetCanvasY)
+    this.transform = [
+      rotateA * scale,
+      rotateB * scale,
+      rotateC * scale,
+      rotateD * scale,
+      offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY,
+      offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY
+    ];
+
+    this.offsetX = offsetX;
+    this.offsetY = offsetY;
+    this.width = width;
+    this.height = height;
+    this.fontScale = scale;
+  }
+  PageViewport.prototype = {
+    convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
+      return Util.applyTransform([x, y], this.transform);
+    },
+    convertToViewportRectangle:
+      function PageViewport_convertToViewportRectangle(rect) {
+      var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
+      var br = Util.applyTransform([rect[2], rect[3]], this.transform);
+      return [tl[0], tl[1], br[0], br[1]];
+    },
+    convertToPdfPoint: function PageViewport_convertToPdfPoint(x, y) {
+      return Util.applyInverseTransform([x, y], this.transform);
+    }
+  };
+  return PageViewport;
+})();
+
 var PDFStringTranslateTable = [
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
@@ -1095,6 +870,10 @@ function stringToPDFString(str) {
   return str2;
 }
 
+function stringToUTF8String(str) {
+  return decodeURIComponent(escape(str));
+}
+
 function isBool(v) {
   return typeof v == 'boolean';
 }
@@ -1168,7 +947,7 @@ function isPDFFunction(v) {
  * can be set. If any of these happens twice or the data is required before
  * it was set, an exception is throw.
  */
-var Promise = (function PromiseClosure() {
+var Promise = PDFJS.Promise = (function PromiseClosure() {
   var EMPTY_PROMISE = {};
 
   /**
@@ -1190,6 +969,7 @@ var Promise = (function PromiseClosure() {
     }
     this.callbacks = [];
     this.errbacks = [];
+    this.progressbacks = [];
   };
   /**
    * Builds a promise that is resolved when all the passed in promises are
@@ -1205,7 +985,7 @@ var Promise = (function PromiseClosure() {
       deferred.resolve(results);
       return deferred;
     }
-    for (var i = 0; i < unresolved; ++i) {
+    for (var i = 0, ii = promises.length; i < ii; ++i) {
       var promise = promises[i];
       promise.then((function(i) {
         return function(value) {
@@ -1261,7 +1041,7 @@ var Promise = (function PromiseClosure() {
       }
 
       this.isResolved = true;
-      this.data = data || null;
+      this.data = (typeof data !== 'undefined') ? data : null;
       var callbacks = this.callbacks;
 
       for (var i = 0, ii = callbacks.length; i < ii; i++) {
@@ -1269,7 +1049,14 @@ var Promise = (function PromiseClosure() {
       }
     },
 
-    reject: function Promise_reject(reason) {
+    progress: function Promise_progress(data) {
+      var callbacks = this.progressbacks;
+      for (var i = 0, ii = callbacks.length; i < ii; i++) {
+        callbacks[i].call(null, data);
+      }
+    },
+
+    reject: function Promise_reject(reason, exception) {
       if (this.isRejected) {
         error('A Promise can be rejected only once ' + this.name);
       }
@@ -1282,11 +1069,11 @@ var Promise = (function PromiseClosure() {
       var errbacks = this.errbacks;
 
       for (var i = 0, ii = errbacks.length; i < ii; i++) {
-        errbacks[i].call(null, reason);
+        errbacks[i].call(null, reason, exception);
       }
     },
 
-    then: function Promise_then(callback, errback) {
+    then: function Promise_then(callback, errback, progressback) {
       if (!callback) {
         error('Requiring callback' + this.name);
       }
@@ -1303,6 +1090,9 @@ var Promise = (function PromiseClosure() {
         if (errback)
           this.errbacks.push(errback);
       }
+
+      if (progressback)
+        this.progressbacks.push(progressback);
     }
   };
 
@@ -1361,6 +1151,659 @@ var StatTimer = (function StatTimerClosure() {
   };
   return StatTimer;
 })();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+/**
+ * This is the main entry point for loading a PDF and interacting with it.
+ * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
+ * is used, which means it must follow the same origin rules that any XHR does
+ * e.g. No cross domain requests without CORS.
+ *
+ * @param {string|TypedAray|object} source Can be an url to where a PDF is
+ * located, a typed array (Uint8Array) already populated with data or
+ * and parameter object with the following possible fields:
+ *  - url   - The URL of the PDF.
+ *  - data  - A typed array with PDF data.
+ *  - httpHeaders - Basic authentication headers.
+ *  - password - For decrypting password-protected PDFs.
+ *
+ * @return {Promise} A promise that is resolved with {PDFDocumentProxy} object.
+ */
+PDFJS.getDocument = function getDocument(source) {
+  var url, data, headers, password, parameters = {};
+  if (typeof source === 'string') {
+    url = source;
+  } else if (isArrayBuffer(source)) {
+    data = source;
+  } else if (typeof source === 'object') {
+    url = source.url;
+    data = source.data;
+    headers = source.httpHeaders;
+    password = source.password;
+    parameters.password = password || null;
+
+    if (!url && !data)
+      error('Invalid parameter array, need either .data or .url');
+  } else {
+    error('Invalid parameter in getDocument, need either Uint8Array, ' +
+          'string or a parameter object');
+  }
+
+  var promise = new PDFJS.Promise();
+  var transport = new WorkerTransport(promise);
+  if (data) {
+    // assuming the data is array, instantiating directly from it
+    transport.sendData(data, parameters);
+  } else if (url) {
+    // fetch url
+    PDFJS.getPdf(
+      {
+        url: url,
+        progress: function getPDFProgress(evt) {
+          if (evt.lengthComputable)
+            promise.progress({
+              loaded: evt.loaded,
+              total: evt.total
+            });
+        },
+        error: function getPDFError(e) {
+          promise.reject('Unexpected server response of ' +
+            e.target.status + '.');
+        },
+        headers: headers
+      },
+      function getPDFLoad(data) {
+        transport.sendData(data, parameters);
+      });
+  }
+
+  return promise;
+};
+
+/**
+ * Proxy to a PDFDocument in the worker thread. Also, contains commonly used
+ * properties that can be read synchronously.
+ */
+var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
+  function PDFDocumentProxy(pdfInfo, transport) {
+    this.pdfInfo = pdfInfo;
+    this.transport = transport;
+  }
+  PDFDocumentProxy.prototype = {
+    /**
+     * @return {number} Total number of pages the PDF contains.
+     */
+    get numPages() {
+      return this.pdfInfo.numPages;
+    },
+    /**
+     * @return {string} A unique ID to identify a PDF. Not guaranteed to be
+     * unique.
+     */
+    get fingerprint() {
+      return this.pdfInfo.fingerprint;
+    },
+    /**
+     * @param {number} The page number to get. The first page is 1.
+     * @return {Promise} A promise that is resolved with a {PDFPageProxy}
+     * object.
+     */
+    getPage: function PDFDocumentProxy_getPage(number) {
+      return this.transport.getPage(number);
+    },
+    /**
+     * @return {Promise} A promise that is resolved with a lookup table for
+     * mapping named destinations to reference numbers.
+     */
+    getDestinations: function PDFDocumentProxy_getDestinations() {
+      var promise = new PDFJS.Promise();
+      var destinations = this.pdfInfo.destinations;
+      promise.resolve(destinations);
+      return promise;
+    },
+    /**
+     * @return {Promise} A promise that is resolved with an {array} that is a
+     * tree outline (if it has one) of the PDF. The tree is in the format of:
+     * [
+     *  {
+     *   title: string,
+     *   bold: boolean,
+     *   italic: boolean,
+     *   color: rgb array,
+     *   dest: dest obj,
+     *   items: array of more items like this
+     *  },
+     *  ...
+     * ].
+     */
+    getOutline: function PDFDocumentProxy_getOutline() {
+      var promise = new PDFJS.Promise();
+      var outline = this.pdfInfo.outline;
+      promise.resolve(outline);
+      return promise;
+    },
+    /**
+     * @return {Promise} A promise that is resolved with an {object} that has
+     * info and metadata properties.  Info is an {object} filled with anything
+     * available in the information dictionary and similarly metadata is a
+     * {Metadata} object with information from the metadata section of the PDF.
+     */
+    getMetadata: function PDFDocumentProxy_getMetadata() {
+      var promise = new PDFJS.Promise();
+      var info = this.pdfInfo.info;
+      var metadata = this.pdfInfo.metadata;
+      promise.resolve({
+        info: info,
+        metadata: metadata ? new PDFJS.Metadata(metadata) : null
+      });
+      return promise;
+    },
+    isEncrypted: function PDFDocumentProxy_isEncrypted() {
+      var promise = new PDFJS.Promise();
+      promise.resolve(this.pdfInfo.encrypted);
+      return promise;
+    },
+    /**
+     * @return {Promise} A promise that is resolved with a TypedArray that has
+     * the raw data from the PDF.
+     */
+    getData: function PDFDocumentProxy_getData() {
+      var promise = new PDFJS.Promise();
+      this.transport.getData(promise);
+      return promise;
+    },
+    destroy: function PDFDocumentProxy_destroy() {
+      this.transport.destroy();
+    }
+  };
+  return PDFDocumentProxy;
+})();
+
+var PDFPageProxy = (function PDFPageProxyClosure() {
+  function PDFPageProxy(pageInfo, transport) {
+    this.pageInfo = pageInfo;
+    this.transport = transport;
+    this.stats = new StatTimer();
+    this.stats.enabled = !!globalScope.PDFJS.enableStats;
+    this.objs = transport.objs;
+    this.renderInProgress = false;
+  }
+  PDFPageProxy.prototype = {
+    /**
+     * @return {number} Page number of the page. First page is 1.
+     */
+    get pageNumber() {
+      return this.pageInfo.pageIndex + 1;
+    },
+    /**
+     * @return {number} The number of degrees the page is rotated clockwise.
+     */
+    get rotate() {
+      return this.pageInfo.rotate;
+    },
+    /**
+     * @return {object} The reference that points to this page. It has 'num' and
+     * 'gen' properties.
+     */
+    get ref() {
+      return this.pageInfo.ref;
+    },
+    /**
+     * @return {array} An array of the visible portion of the PDF page in the
+     * user space units - [x1, y1, x2, y2].
+     */
+    get view() {
+      return this.pageInfo.view;
+    },
+    /**
+     * @param {number} scale The desired scale of the viewport.
+     * @param {number} rotate Degrees to rotate the viewport. If omitted this
+     * defaults to the page rotation.
+     * @return {PageViewport} Contains 'width' and 'height' properties along
+     * with transforms required for rendering.
+     */
+    getViewport: function PDFPageProxy_getViewport(scale, rotate) {
+      if (arguments.length < 2)
+        rotate = this.rotate;
+      return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
+    },
+    /**
+     * @return {Promise} A promise that is resolved with an {array} of the
+     * annotation objects.
+     */
+    getAnnotations: function PDFPageProxy_getAnnotations() {
+      if (this.annotationsPromise)
+        return this.annotationsPromise;
+
+      var promise = new PDFJS.Promise();
+      this.annotationsPromise = promise;
+      this.transport.getAnnotations(this.pageInfo.pageIndex);
+      return promise;
+    },
+    /**
+     * Begins the process of rendering a page to the desired context.
+     * @param {object} params A parameter object that supports:
+     * {
+     *   canvasContext(required): A 2D context of a DOM Canvas object.,
+     *   textLayer(optional): An object that has beginLayout, endLayout, and
+     *                        appendText functions.
+     * }.
+     * @return {Promise} A promise that is resolved when the page finishes
+     * rendering.
+     */
+    render: function PDFPageProxy_render(params) {
+      this.renderInProgress = true;
+
+      var promise = new Promise();
+      var stats = this.stats;
+      stats.time('Overall');
+      // If there is no displayReadyPromise yet, then the operatorList was never
+      // requested before. Make the request and create the promise.
+      if (!this.displayReadyPromise) {
+        this.displayReadyPromise = new Promise();
+        this.destroyed = false;
+
+        this.stats.time('Page Request');
+        this.transport.messageHandler.send('RenderPageRequest', {
+          pageIndex: this.pageNumber - 1
+        });
+      }
+
+      var self = this;
+      function complete(error) {
+        self.renderInProgress = false;
+        if (self.destroyed) {
+          delete self.operatorList;
+          delete self.displayReadyPromise;
+        }
+
+        if (error)
+          promise.reject(error);
+        else
+          promise.resolve();
+      };
+
+      // Once the operatorList and fonts are loaded, do the actual rendering.
+      this.displayReadyPromise.then(
+        function pageDisplayReadyPromise() {
+          if (self.destroyed) {
+            complete();
+            return;
+          }
+
+          var gfx = new CanvasGraphics(params.canvasContext,
+            this.objs, params.textLayer);
+          try {
+            this.display(gfx, params.viewport, complete);
+          } catch (e) {
+            complete(e);
+          }
+        }.bind(this),
+        function pageDisplayReadPromiseError(reason) {
+          complete(reason);
+        }
+      );
+
+      return promise;
+    },
+    /**
+     * For internal use only.
+     */
+    startRenderingFromOperatorList:
+      function PDFPageProxy_startRenderingFromOperatorList(operatorList,
+                                                           fonts) {
+      var self = this;
+      this.operatorList = operatorList;
+
+      var displayContinuation = function pageDisplayContinuation() {
+        // Always defer call to display() to work around bug in
+        // Firefox error reporting from XHR callbacks.
+        setTimeout(function pageSetTimeout() {
+          self.displayReadyPromise.resolve();
+        });
+      };
+
+      this.ensureFonts(fonts,
+        function pageStartRenderingFromOperatorListEnsureFonts() {
+          displayContinuation();
+        }
+      );
+    },
+    /**
+     * For internal use only.
+     */
+    ensureFonts: function PDFPageProxy_ensureFonts(fonts, callback) {
+      this.stats.time('Font Loading');
+      // Convert the font names to the corresponding font obj.
+      for (var i = 0, ii = fonts.length; i < ii; i++) {
+        fonts[i] = this.objs.objs[fonts[i]].data;
+      }
+
+      // Load all the fonts
+      FontLoader.bind(
+        fonts,
+        function pageEnsureFontsFontObjs(fontObjs) {
+          this.stats.timeEnd('Font Loading');
+
+          callback.call(this);
+        }.bind(this)
+      );
+    },
+    /**
+     * For internal use only.
+     */
+    display: function PDFPageProxy_display(gfx, viewport, callback) {
+      var stats = this.stats;
+      stats.time('Rendering');
+
+      gfx.beginDrawing(viewport);
+
+      var startIdx = 0;
+      var length = this.operatorList.fnArray.length;
+      var operatorList = this.operatorList;
+      var stepper = null;
+      if (PDFJS.pdfBug && StepperManager.enabled) {
+        stepper = StepperManager.create(this.pageNumber - 1);
+        stepper.init(operatorList);
+        stepper.nextBreakPoint = stepper.getNextBreakPoint();
+      }
+
+      var self = this;
+      function next() {
+        startIdx =
+          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
+        if (startIdx == length) {
+          gfx.endDrawing();
+          stats.timeEnd('Rendering');
+          stats.timeEnd('Overall');
+          if (callback) callback();
+        }
+      }
+      next();
+    },
+    /**
+     * @return {Promise} That is resolved with the a {string} that is the text
+     * content from the page.
+     */
+    getTextContent: function PDFPageProxy_getTextContent() {
+      var promise = new PDFJS.Promise();
+      this.transport.messageHandler.send('GetTextContent', {
+          pageIndex: this.pageNumber - 1
+        },
+        function textContentCallback(textContent) {
+          promise.resolve(textContent);
+        }
+      );
+      return promise;
+    },
+    /**
+     * Stub for future feature.
+     */
+    getOperationList: function PDFPageProxy_getOperationList() {
+      var promise = new PDFJS.Promise();
+      var operationList = { // not implemented
+        dependencyFontsID: null,
+        operatorList: null
+      };
+      promise.resolve(operationList);
+      return promise;
+    },
+    /**
+     * Destroys resources allocated by the page.
+     */
+    destroy: function PDFPageProxy_destroy() {
+      this.destroyed = true;
+
+      if (!this.renderInProgress) {
+        delete this.operatorList;
+        delete this.displayReadyPromise;
+      }
+    }
+  };
+  return PDFPageProxy;
+})();
+/**
+ * For internal use only.
+ */
+var WorkerTransport = (function WorkerTransportClosure() {
+  function WorkerTransport(promise) {
+    this.workerReadyPromise = promise;
+    this.objs = new PDFObjects();
+
+    this.pageCache = [];
+    this.pagePromises = [];
+    this.fontsLoading = {};
+
+    // If worker support isn't disabled explicit and the browser has worker
+    // support, create a new web worker and test if it/the browser fullfills
+    // all requirements to run parts of pdf.js in a web worker.
+    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
+    // as it arrives on the worker. Chrome added this with version 15.
+    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
+      var workerSrc = PDFJS.workerSrc;
+      if (typeof workerSrc === 'undefined') {
+        error('No PDFJS.workerSrc specified');
+      }
+
+      try {
+        var worker;
+        if (PDFJS.isFirefoxExtension) {
+          // The firefox extension can't load the worker from the resource://
+          // url so we have to inline the script and then use the blob loader.
+          var bb = new MozBlobBuilder();
+          bb.append(document.querySelector('#PDFJS_SCRIPT_TAG').textContent);
+          var blobUrl = window.URL.createObjectURL(bb.getBlob());
+          worker = new Worker(blobUrl);
+        } else {
+          // Some versions of FF can't create a worker on localhost, see:
+          // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
+          worker = new Worker(workerSrc);
+        }
+
+        var messageHandler = new MessageHandler('main', worker);
+        this.messageHandler = messageHandler;
+
+        messageHandler.on('test', function transportTest(supportTypedArray) {
+          if (supportTypedArray) {
+            this.worker = worker;
+            this.setupMessageHandler(messageHandler);
+          } else {
+            globalScope.PDFJS.disableWorker = true;
+            this.setupFakeWorker();
+          }
+        }.bind(this));
+
+        var testObj = new Uint8Array(1);
+        // Some versions of Opera throw a DATA_CLONE_ERR on
+        // serializing the typed array.
+        messageHandler.send('test', testObj);
+        return;
+      } catch (e) {
+        info('The worker has been disabled.');
+      }
+    }
+    // Either workers are disabled, not supported or have thrown an exception.
+    // Thus, we fallback to a faked worker.
+    globalScope.PDFJS.disableWorker = true;
+    this.setupFakeWorker();
+  }
+  WorkerTransport.prototype = {
+    destroy: function WorkerTransport_destroy() {
+      if (this.worker)
+        this.worker.terminate();
+
+      this.pageCache = [];
+      this.pagePromises = [];
+    },
+    setupFakeWorker: function WorkerTransport_setupFakeWorker() {
+      // If we don't use a worker, just post/sendMessage to the main thread.
+      var fakeWorker = {
+        postMessage: function WorkerTransport_postMessage(obj) {
+          fakeWorker.onmessage({data: obj});
+        },
+        terminate: function WorkerTransport_terminate() {}
+      };
+
+      var messageHandler = new MessageHandler('main', fakeWorker);
+      this.setupMessageHandler(messageHandler);
+
+      // If the main thread is our worker, setup the handling for the messages
+      // the main thread sends to it self.
+      WorkerMessageHandler.setup(messageHandler);
+    },
+
+    setupMessageHandler:
+      function WorkerTransport_setupMessageHandler(messageHandler) {
+      this.messageHandler = messageHandler;
+
+      messageHandler.on('GetDoc', function transportDoc(data) {
+        var pdfInfo = data.pdfInfo;
+        var pdfDocument = new PDFDocumentProxy(pdfInfo, this);
+        this.pdfDocument = pdfDocument;
+        this.workerReadyPromise.resolve(pdfDocument);
+      }, this);
+
+      messageHandler.on('NeedPassword', function transportPassword(data) {
+        this.workerReadyPromise.reject(data.exception.message, data.exception);
+      }, this);
+
+      messageHandler.on('IncorrectPassword', function transportBadPass(data) {
+        this.workerReadyPromise.reject(data.exception.message, data.exception);
+      }, this);
+
+      messageHandler.on('GetPage', function transportPage(data) {
+        var pageInfo = data.pageInfo;
+        var page = new PDFPageProxy(pageInfo, this);
+        this.pageCache[pageInfo.pageIndex] = page;
+        var promise = this.pagePromises[pageInfo.pageIndex];
+        promise.resolve(page);
+      }, this);
+
+      messageHandler.on('GetAnnotations', function transportAnnotations(data) {
+        var annotations = data.annotations;
+        var promise = this.pageCache[data.pageIndex].annotationsPromise;
+        promise.resolve(annotations);
+      }, this);
+
+      messageHandler.on('RenderPage', function transportRender(data) {
+        var page = this.pageCache[data.pageIndex];
+        var depFonts = data.depFonts;
+
+        page.stats.timeEnd('Page Request');
+        page.startRenderingFromOperatorList(data.operatorList, depFonts);
+      }, this);
+
+      messageHandler.on('obj', function transportObj(data) {
+        var id = data[0];
+        var type = data[1];
+        if (this.objs.hasData(id))
+          return;
+
+        switch (type) {
+          case 'JpegStream':
+            var imageData = data[2];
+            loadJpegStream(id, imageData, this.objs);
+            break;
+          case 'Image':
+            var imageData = data[2];
+            this.objs.resolve(id, imageData);
+            break;
+          case 'Font':
+            var name = data[2];
+            var file = data[3];
+            var properties = data[4];
+
+            if (file) {
+              // Rewrap the ArrayBuffer in a stream.
+              var fontFileDict = new Dict();
+              file = new Stream(file, 0, file.length, fontFileDict);
+            }
+
+            // At this point, only the font object is created but the font is
+            // not yet attached to the DOM. This is done in `FontLoader.bind`.
+            var font = new Font(name, file, properties);
+            this.objs.resolve(id, font);
+            break;
+          default:
+            error('Got unkown object type ' + type);
+        }
+      }, this);
+
+      messageHandler.on('PageError', function transportError(data) {
+        var page = this.pageCache[data.pageNum - 1];
+        if (page.displayReadyPromise)
+          page.displayReadyPromise.reject(data.error);
+        else
+          error(data.error);
+      }, this);
+
+      messageHandler.on('JpegDecode', function(data, promise) {
+        var imageData = data[0];
+        var components = data[1];
+        if (components != 3 && components != 1)
+          error('Only 3 component or 1 component can be returned');
+
+        var img = new Image();
+        img.onload = (function messageHandler_onloadClosure() {
+          var width = img.width;
+          var height = img.height;
+          var size = width * height;
+          var rgbaLength = size * 4;
+          var buf = new Uint8Array(size * components);
+          var tmpCanvas = createScratchCanvas(width, height);
+          var tmpCtx = tmpCanvas.getContext('2d');
+          tmpCtx.drawImage(img, 0, 0);
+          var data = tmpCtx.getImageData(0, 0, width, height).data;
+
+          if (components == 3) {
+            for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
+              buf[j] = data[i];
+              buf[j + 1] = data[i + 1];
+              buf[j + 2] = data[i + 2];
+            }
+          } else if (components == 1) {
+            for (var i = 0, j = 0; i < rgbaLength; i += 4, j++) {
+              buf[j] = data[i];
+            }
+          }
+          promise.resolve({ data: buf, width: width, height: height});
+        }).bind(this);
+        var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
+        img.src = src;
+      });
+    },
+
+    sendData: function WorkerTransport_sendData(data, params) {
+      this.messageHandler.send('GetDocRequest', {data: data, params: params});
+    },
+
+    getData: function WorkerTransport_sendData(promise) {
+      this.messageHandler.send('GetData', null, function(data) {
+        promise.resolve(data);
+      });
+    },
+
+    getPage: function WorkerTransport_getPage(pageNumber, promise) {
+      var pageIndex = pageNumber - 1;
+      if (pageIndex in this.pagePromises)
+        return this.pagePromises[pageIndex];
+      var promise = new PDFJS.Promise('Page ' + pageNumber);
+      this.pagePromises[pageIndex] = promise;
+      this.messageHandler.send('GetPageRequest', { pageIndex: pageIndex });
+      return promise;
+    },
+
+    getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
+      this.messageHandler.send('GetAnnotationsRequest',
+        { pageIndex: pageIndex });
+    }
+  };
+  return WorkerTransport;
+
+})();
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -1604,27 +2047,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       'shadingFill': true
     },
 
-    beginDrawing: function CanvasGraphics_beginDrawing(mediaBox) {
-      var cw = this.ctx.canvas.width, ch = this.ctx.canvas.height;
+    beginDrawing: function CanvasGraphics_beginDrawing(viewport) {
+      var transform = viewport.transform;
       this.ctx.save();
-      switch (mediaBox.rotate) {
-        case 0:
-          this.ctx.transform(1, 0, 0, -1, 0, ch);
-          break;
-        case 90:
-          this.ctx.transform(0, 1, 1, 0, 0, 0);
-          break;
-        case 180:
-          this.ctx.transform(-1, 0, 0, 1, cw, 0);
-          break;
-        case 270:
-          this.ctx.transform(0, -1, -1, 0, cw, ch);
-          break;
-      }
-      // Scale so that canvas units are the same as PDF user space units
-      this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
-      // Move the media left-top corner to the (0,0) canvas position
-      this.ctx.translate(-mediaBox.x, -mediaBox.y);
+      this.ctx.transform.apply(this.ctx, transform);
 
       if (this.textLayer)
         this.textLayer.beginLayout();
@@ -1723,10 +2149,13 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       this.ctx.webkitLineDashOffset = dashPhase;
     },
     setRenderingIntent: function CanvasGraphics_setRenderingIntent(intent) {
-      TODO('set rendering intent: ' + intent);
+      // Maybe if we one day fully support color spaces this will be important
+      // for now we can ignore.
+      // TODO set rendering intent?
     },
     setFlatness: function CanvasGraphics_setFlatness(flatness) {
-      TODO('set flatness: ' + flatness);
+      // There's no way to control this with canvas, but we can safely ignore.
+      // TODO set flatness?
     },
     setGState: function CanvasGraphics_setGState(states) {
       for (var i = 0, ii = states.length; i < ii; i++) {
@@ -2221,7 +2650,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
             text.length += shownText.length;
           }
         } else {
-          malformed('TJ array element ' + e + ' is not string or num');
+          error('TJ array element ' + e + ' is not string or num');
         }
       }
 
@@ -2474,6 +2903,40 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
           }
         }
       }
+      function rescaleImage(pixels, widthScale, heightScale) {
+        var scaledWidth = Math.ceil(width / widthScale);
+        var scaledHeight = Math.ceil(height / heightScale);
+
+        var itemsSum = new Uint32Array(scaledWidth * scaledHeight * 4);
+        var itemsCount = new Uint32Array(scaledWidth * scaledHeight);
+        for (var i = 0, position = 0; i < height; i++) {
+          var lineOffset = (0 | (i / heightScale)) * scaledWidth;
+          for (var j = 0; j < width; j++) {
+            var countOffset = lineOffset + (0 | (j / widthScale));
+            var sumOffset = countOffset << 2;
+            itemsSum[sumOffset] += pixels[position];
+            itemsSum[sumOffset + 1] += pixels[position + 1];
+            itemsSum[sumOffset + 2] += pixels[position + 2];
+            itemsSum[sumOffset + 3] += pixels[position + 3];
+            itemsCount[countOffset]++;
+            position += 4;
+          }
+        }
+        var tmpCanvas = createScratchCanvas(scaledWidth, scaledHeight);
+        var tmpCtx = tmpCanvas.getContext('2d');
+        var imgData = tmpCtx.getImageData(0, 0, scaledWidth, scaledHeight);
+        pixels = imgData.data;
+        for (var i = 0, j = 0, ii = scaledWidth * scaledHeight; i < ii; i++) {
+          var count = itemsCount[i];
+          pixels[j] = itemsSum[j] / count;
+          pixels[j + 1] = itemsSum[j + 1] / count;
+          pixels[j + 2] = itemsSum[j + 2] / count;
+          pixels[j + 3] = itemsSum[j + 3] / count;
+          j += 4;
+        }
+        tmpCtx.putImageData(imgData, 0, 0);
+        return tmpCanvas;
+      }
 
       this.save();
 
@@ -2496,8 +2959,19 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
 
       applyStencilMask(pixels, inverseDecode);
 
-      tmpCtx.putImageData(imgData, 0, 0);
-      ctx.drawImage(tmpCanvas, 0, -h);
+      var currentTransform = ctx.mozCurrentTransformInverse;
+      var widthScale = Math.max(Math.abs(currentTransform[0]), 1);
+      var heightScale = Math.max(Math.abs(currentTransform[3]), 1);
+      if (widthScale >= 2 || heightScale >= 2) {
+        // canvas does not resize well large images to small -- using simple
+        // algorithm to perform pre-scaling
+        tmpCanvas = rescaleImage(imgData.data, widthScale, heightScale);
+        ctx.scale(widthScale, heightScale);
+        ctx.drawImage(tmpCanvas, 0, -h / heightScale);
+      } else {
+        tmpCtx.putImageData(imgData, 0, 0);
+        ctx.drawImage(tmpCanvas, 0, -h);
+      }
       this.restore();
     },
 
@@ -2624,6 +3098,7 @@ if (!isWorker) {
       };
   }
 }
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -2663,51 +3138,55 @@ var Dict = (function DictClosure() {
   // xref is optional
   function Dict(xref) {
     // Map should only be used internally, use functions below to access.
-    this.map = Object.create(null);
-    this.xref = xref;
-  }
+    var map = Object.create(null);
+
+    this.assignXref = function Dict_assignXref(newXref) {
+      xref = newXref;
+    };
 
-  Dict.prototype = {
     // automatically dereferences Ref objects
-    get: function Dict_get(key1, key2, key3) {
+    this.get = function Dict_get(key1, key2, key3) {
       var value;
-      var xref = this.xref;
-      if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
+      if (typeof (value = map[key1]) != 'undefined' || key1 in map ||
           typeof key2 == 'undefined') {
-        return xref ? this.xref.fetchIfRef(value) : value;
+        return xref ? xref.fetchIfRef(value) : value;
       }
-      if (typeof (value = this.map[key2]) != 'undefined' || key2 in this.map ||
+      if (typeof (value = map[key2]) != 'undefined' || key2 in map ||
           typeof key3 == 'undefined') {
-        return xref ? this.xref.fetchIfRef(value) : value;
+        return xref ? xref.fetchIfRef(value) : value;
       }
-      value = this.map[key3] || null;
-      return xref ? this.xref.fetchIfRef(value) : value;
-    },
+      value = map[key3] || null;
+      return xref ? xref.fetchIfRef(value) : value;
+    };
+
     // no dereferencing
-    getRaw: function Dict_getRaw(key) {
-      return this.map[key];
-    },
+    this.getRaw = function Dict_getRaw(key) {
+      return map[key];
+    };
+
     // creates new map and dereferences all Refs
-    getAll: function Dict_getAll() {
+    this.getAll = function Dict_getAll() {
       var all = {};
-      for (var key in this.map)
-        all[key] = this.get(key);
+      for (var key in map) {
+        var obj = this.get(key);
+        all[key] = obj instanceof Dict ? obj.getAll() : obj;
+      }
       return all;
-    },
+    };
 
-    set: function Dict_set(key, value) {
-      this.map[key] = value;
-    },
+    this.set = function Dict_set(key, value) {
+      map[key] = value;
+    };
 
-    has: function Dict_has(key) {
-      return key in this.map;
-    },
+    this.has = function Dict_has(key) {
+      return key in map;
+    };
 
-    forEach: function Dict_forEach(callback) {
-      for (var key in this.map) {
+    this.forEach = function Dict_forEach(callback) {
+      for (var key in map) {
         callback(key, this.get(key));
       }
-    }
+    };
   };
 
   return Dict;
@@ -2754,7 +3233,14 @@ var Catalog = (function CatalogClosure() {
 
   Catalog.prototype = {
     get metadata() {
-      var stream = this.catDict.get('Metadata');
+      var streamRef = this.catDict.getRaw('Metadata');
+      if (!isRef(streamRef))
+        return shadow(this, 'metadata', null);
+
+      var encryptMetadata = !this.xref.encrypt ? false :
+        this.xref.encrypt.encryptMetadata;
+
+      var stream = this.xref.fetch(streamRef, !encryptMetadata);
       var metadata;
       if (stream && isDict(stream.dict)) {
         var type = stream.dict.get('Type');
@@ -2762,7 +3248,16 @@ var Catalog = (function CatalogClosure() {
 
         if (isName(type) && isName(subtype) &&
             type.name === 'Metadata' && subtype.name === 'XML') {
-          metadata = stringToPDFString(bytesToString(stream.getBytes()));
+          // XXX: This should examine the charset the XML document defines,
+          // however since there are currently no real means to decode
+          // arbitrary charsets, let's just hope that the author of the PDF
+          // was reasonable enough to stick with the XML default charset,
+          // which is UTF-8.
+          try {
+            metadata = stringToUTF8String(bytesToString(stream.getBytes()));
+          } catch (e) {
+            info('Skipping invalid metadata.');
+          }
         }
       }
 
@@ -2920,12 +3415,12 @@ var Catalog = (function CatalogClosure() {
 })();
 
 var XRef = (function XRefClosure() {
-  function XRef(stream, startXRef, mainXRefEntriesOffset) {
+  function XRef(stream, startXRef, mainXRefEntriesOffset, password) {
     this.stream = stream;
     this.entries = [];
     this.xrefstms = {};
     var trailerDict = this.readXRef(startXRef);
-    trailerDict.xref = this;
+    trailerDict.assignXref(this);
     this.trailer = trailerDict;
     // prepare the XRef cache
     this.cache = [];
@@ -2933,8 +3428,7 @@ var XRef = (function XRefClosure() {
     var encrypt = trailerDict.get('Encrypt');
     if (encrypt) {
       var fileId = trailerDict.get('ID');
-      this.encrypt = new CipherTransformFactory(encrypt,
-                                                fileId[0] /*, password */);
+      this.encrypt = new CipherTransformFactory(encrypt, fileId[0], password);
     }
 
     // get the root dictionary (catalog) object
@@ -2986,9 +3480,8 @@ var XRef = (function XRefClosure() {
         }
       }
 
-      // Sanity check: as per spec, first object must have these properties
-      if (this.entries[0] &&
-          !(this.entries[0].gen === 65535 && this.entries[0].free))
+      // Sanity check: as per spec, first object must be free
+      if (this.entries[0] && !this.entries[0].free)
         error('Invalid XRef table: unexpected first object');
 
       // Sanity check
@@ -3147,7 +3640,7 @@ var XRef = (function XRefClosure() {
       }
       // reading XRef streams
       for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
-          this.readXRef(xrefStms[i]);
+          this.readXRef(xrefStms[i], true);
       }
       // finding main trailer
       var dict;
@@ -3170,7 +3663,7 @@ var XRef = (function XRefClosure() {
       // nothing helps
       error('Invalid PDF structure');
     },
-    readXRef: function XRef_readXRef(startXRef) {
+    readXRef: function XRef_readXRef(startXRef, recoveryMode) {
       var stream = this.stream;
       stream.pos = startXRef;
 
@@ -3203,16 +3696,18 @@ var XRef = (function XRefClosure() {
             error('Invalid XRef stream');
           }
           dict = this.readXRefStream(obj);
+          if (!dict)
+            error('Failed to read XRef stream');
         }
 
         // Recursively get previous dictionary, if any
         obj = dict.get('Prev');
         if (isInt(obj))
-          this.readXRef(obj);
+          this.readXRef(obj, recoveryMode);
         else if (isRef(obj)) {
           // The spec says Prev must not be a reference, i.e. "/Prev NNN"
           // This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R"
-          this.readXRef(obj.num);
+          this.readXRef(obj.num, recoveryMode);
         }
 
         return dict;
@@ -3220,6 +3715,9 @@ var XRef = (function XRefClosure() {
         log('(while reading XRef): ' + e);
       }
 
+      if (recoveryMode)
+        return;
+
       warn('Indexing all PDF objects');
       return this.indexObjects();
     },
@@ -3432,6 +3930,7 @@ var PDFObjects = (function PDFObjectsClosure() {
   return PDFObjects;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -4270,7 +4769,10 @@ var PostScriptLexer = (function PostScriptLexerClosure() {
       // operator
       var str = ch.toLowerCase();
       while (true) {
-        ch = stream.lookChar().toLowerCase();
+        ch = stream.lookChar();
+        if (ch === null)
+          break;
+        ch = ch.toLowerCase();
         if (ch >= 'a' && ch <= 'z')
           str += ch;
         else
@@ -4306,6 +4808,7 @@ var PostScriptLexer = (function PostScriptLexerClosure() {
   return PostScriptLexer;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -4411,6 +4914,7 @@ var ExpertSubsetCharset = [
   'periodinferior', 'commainferior'
 ];
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -11344,6 +11848,7 @@ var CIDToUnicodeMaps = {
     {f: 7, c: 19887}]
 };
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -11797,12 +12302,12 @@ var LabCS = (function LabCSClosure() {
       error('Invalid WhitePoint components, no fallback available');
 
     if (this.XB < 0 || this.YB < 0 || this.ZB < 0) {
-      warn('Invalid BlackPoint, falling back to default');
+      info('Invalid BlackPoint, falling back to default');
       this.XB = this.YB = this.ZB = 0;
     }
 
     if (this.amin > this.amax || this.bmin > this.bmax) {
-      warn('Invalid Range, falling back to defaults');
+      info('Invalid Range, falling back to defaults');
       this.amin = -100;
       this.amax = 100;
       this.bmin = -100;
@@ -11876,6 +12381,7 @@ var LabCS = (function LabCSClosure() {
   };
   return LabCS;
 })();
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -12297,13 +12803,14 @@ var CipherTransform = (function CipherTransformClosure() {
 })();
 
 var CipherTransformFactory = (function CipherTransformFactoryClosure() {
+  var defaultPasswordBytes = new Uint8Array([
+    0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
+    0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
+    0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
+    0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
+
   function prepareKeyData(fileId, password, ownerPassword, userPassword,
                           flags, revision, keyLength, encryptMetadata) {
-    var defaultPasswordBytes = new Uint8Array([
-      0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
-      0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
-      0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
-      0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
     var hashData = new Uint8Array(100), i = 0, j, n;
     if (password) {
       n = Math.min(32, password.length);
@@ -12340,9 +12847,8 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
     var cipher, checkData;
 
     if (revision >= 3) {
-      // padded password in hashData, we can use this array for user
-      // password check
-      i = 32;
+      for (i = 0; i < 32; ++i)
+        hashData[i] = defaultPasswordBytes[i];
       for (j = 0, n = fileId.length; j < n; ++j)
         hashData[i++] = fileId[j];
       cipher = new ARCFourCipher(encryptionKey);
@@ -12355,16 +12861,53 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
         cipher = new ARCFourCipher(derivedKey);
         checkData = cipher.encryptBlock(checkData);
       }
+      for (j = 0, n = checkData.length; j < n; ++j) {
+        if (userPassword[j] != checkData[j])
+          return null;
+      }
     } else {
       cipher = new ARCFourCipher(encryptionKey);
-      checkData = cipher.encryptBlock(hashData.subarray(0, 32));
-    }
-    for (j = 0, n = checkData.length; j < n; ++j) {
-      if (userPassword[j] != checkData[j])
-        error('incorrect password');
+      checkData = cipher.encryptBlock(defaultPasswordBytes);
+      for (j = 0, n = checkData.length; j < n; ++j) {
+        if (userPassword[j] != checkData[j])
+          return null;
+      }
     }
     return encryptionKey;
   }
+  function decodeUserPassword(password, ownerPassword, revision, keyLength) {
+    var hashData = new Uint8Array(32), i = 0, j, n;
+    n = Math.min(32, password.length);
+    for (; i < n; ++i)
+      hashData[i] = password[i];
+    j = 0;
+    while (i < 32) {
+      hashData[i++] = defaultPasswordBytes[j++];
+    }
+    var hash = calculateMD5(hashData, 0, i);
+    var keyLengthInBytes = keyLength >> 3;
+    if (revision >= 3) {
+      for (j = 0; j < 50; ++j) {
+         hash = calculateMD5(hash, 0, hash.length);
+      }
+    }
+
+    var cipher, userPassword;
+    if (revision >= 3) {
+      userPassword = ownerPassword;
+      var derivedKey = new Uint8Array(keyLengthInBytes), k;
+      for (j = 19; j >= 0; j--) {
+        for (k = 0; k < keyLengthInBytes; ++k)
+          derivedKey[k] = hash[k] ^ j;
+        cipher = new ARCFourCipher(derivedKey);
+        userPassword = cipher.encryptBlock(userPassword);
+      }
+    } else {
+      cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
+      userPassword = cipher.encryptBlock(ownerPassword);
+    }
+    return userPassword;
+  }
 
   var identityName = new Name('Identity');
 
@@ -12387,17 +12930,34 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
     var userPassword = stringToBytes(dict.get('U'));
     var flags = dict.get('P');
     var revision = dict.get('R');
-    var encryptMetadata =
+    var encryptMetadata = algorithm == 4 &&  // meaningful when V is 4
       dict.get('EncryptMetadata') !== false; // makes true as default value
+    this.encryptMetadata = encryptMetadata;
+
     var fileIdBytes = stringToBytes(fileId);
     var passwordBytes;
     if (password)
       passwordBytes = stringToBytes(password);
 
-    this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
-                                        ownerPassword, userPassword,
-                                        flags, revision,
-                                        keyLength, encryptMetadata);
+    var encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
+                                       ownerPassword, userPassword, flags,
+                                       revision, keyLength, encryptMetadata);
+    if (!encryptionKey && !password) {
+      throw new PasswordException('No password given', 'needpassword');
+    } else if (!encryptionKey && password) {
+      // Attempting use the password as an owner password
+      var decodedPassword = decodeUserPassword(passwordBytes, ownerPassword,
+                                               revision, keyLength);
+      encryptionKey = prepareKeyData(fileIdBytes, decodedPassword,
+                                     ownerPassword, userPassword, flags,
+                                     revision, keyLength, encryptMetadata);
+    }
+
+    if (!encryptionKey)
+      throw new PasswordException('Incorrect Password', 'incorrectpassword');
+
+    this.encryptionKey = encryptionKey;
+
     if (algorithm == 4) {
       this.cf = dict.get('CF');
       this.stmf = dict.get('StmF') || identityName;
@@ -12472,6 +13032,7 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
   return CipherTransformFactory;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -12582,19 +13143,20 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
 
     // Compatibility
     BX: 'beginCompat',
-    EX: 'endCompat'
-  };
+    EX: 'endCompat',
 
-  function splitCombinedOperations(operations) {
-    // Two operations can be combined together, trying to find which two
-    // operations were concatenated.
-    for (var i = operations.length - 1; i > 0; i--) {
-      var op1 = operations.substring(0, i), op2 = operations.substring(i);
-      if (op1 in OP_MAP && op2 in OP_MAP)
-        return [op1, op2]; // operations found
-    }
-    return null;
-  }
+    // (reserved partial commands for the lexer)
+    BM: null,
+    BD: null,
+    'true': null,
+    fa: null,
+    fal: null,
+    fals: null,
+    'false': null,
+    nu: null,
+    nul: null,
+    'null': null
+  };
 
   PartialEvaluator.prototype = {
     getOperatorList: function PartialEvaluator_getOperatorList(stream,
@@ -12627,13 +13189,15 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
 
         font = xref.fetchIfRef(font) || fontRes.get(fontName);
         assertWellFormed(isDict(font));
-        if (!font.translated) {
+
+        ++self.objIdCounter;
+        if (!font.loadedName) {
           font.translated = self.translateFont(font, xref, resources,
                                                dependency);
           if (font.translated) {
             // keep track of each font we translated so the caller can
             // load them asynchronously before calling display on a page
-            loadedName = 'font_' + uniquePrefix + (++self.objIdCounter);
+            loadedName = 'font_' + uniquePrefix + self.objIdCounter;
             font.translated.properties.loadedName = loadedName;
             font.loadedName = loadedName;
 
@@ -12738,36 +13302,19 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       resources = resources || new Dict();
       var xobjs = resources.get('XObject') || new Dict();
       var patterns = resources.get('Pattern') || new Dict();
-      var parser = new Parser(new Lexer(stream), false, xref);
+      var parser = new Parser(new Lexer(stream, OP_MAP), false, xref);
       var res = resources;
-      var hasNextObj = false, nextObj;
       var args = [], obj;
       var TILING_PATTERN = 1, SHADING_PATTERN = 2;
 
       while (true) {
-        if (hasNextObj) {
-          obj = nextObj;
-          hasNextObj = false;
-        } else {
-          obj = parser.getObj();
-          if (isEOF(obj))
-            break;
-        }
+        obj = parser.getObj();
+        if (isEOF(obj))
+          break;
 
         if (isCmd(obj)) {
           var cmd = obj.cmd;
           var fn = OP_MAP[cmd];
-          if (!fn) {
-            // invalid content command, trying to recover
-            var cmds = splitCombinedOperations(cmd);
-            if (cmds) {
-              cmd = cmds[0];
-              fn = OP_MAP[cmd];
-              // feeding other command on the next interation
-              hasNextObj = true;
-              nextObj = Cmd.get(cmds[1]);
-            }
-          }
           assertWellFormed(fn, 'Unknown command "' + cmd + '"');
           // TODO figure out how to type-check vararg functions
 
@@ -12907,6 +13454,18 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
                         value[1]
                       ]);
                       break;
+                    case 'BM':
+                      // We support the default so don't trigger the TODO.
+                      if (!isName(value) || value.name != 'Normal')
+                        TODO('graphic state operator ' + key);
+                      break;
+                    case 'SMask':
+                      // We support the default so don't trigger the TODO.
+                      if (!isName(value) || value.name != 'None')
+                        TODO('graphic state operator ' + key);
+                      break;
+                    // Only generate info log messages for the following since
+                    // they are unlikey to have a big impact on the rendering.
                     case 'OP':
                     case 'op':
                     case 'OPM':
@@ -12919,14 +13478,13 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
                     case 'HT':
                     case 'SM':
                     case 'SA':
-                    case 'BM':
-                    case 'SMask':
                     case 'AIS':
                     case 'TK':
-                      TODO('graphic state operator ' + key);
+                      // TODO implement these operators.
+                      info('graphic state operator ' + key);
                       break;
                     default:
-                      warn('Unknown graphic state operator ' + key);
+                      info('Unknown graphic state operator ' + key);
                       break;
                   }
                 }
@@ -12940,13 +13498,88 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
           args = [];
         } else if (obj != null) {
           assertWellFormed(args.length <= 33, 'Too many arguments');
-          args.push(obj);
+          args.push(obj instanceof Dict ? obj.getAll() : obj);
         }
       }
 
       return queue;
     },
 
+    getTextContent: function partialEvaluatorGetIRQueue(stream, resources) {
+
+      var self = this;
+      var xref = this.xref;
+
+      function handleSetFont(fontName, fontRef) {
+        var fontRes = resources.get('Font');
+
+        // TODO: TOASK: Is it possible to get here? If so, what does
+        // args[0].name should be like???
+        assert(fontRes, 'fontRes not available');
+
+        fontRes = xref.fetchIfRef(fontRes);
+        fontRef = fontRef || fontRes.get(fontName);
+        var font = xref.fetchIfRef(fontRef), tra;
+        assertWellFormed(isDict(font));
+        if (!font.translated) {
+          font.translated = self.translateFont(font, xref, resources);
+        }
+        return font;
+      }
+
+      resources = xref.fetchIfRef(resources) || new Dict();
+
+      var parser = new Parser(new Lexer(stream), false);
+      var res = resources;
+      var args = [], obj;
+
+      var text = '';
+      var chunk = '';
+      var font = null;
+      while (!isEOF(obj = parser.getObj())) {
+        if (isCmd(obj)) {
+          var cmd = obj.cmd;
+          switch (cmd) {
+            case 'Tf':
+              font = handleSetFont(args[0].name);
+              break;
+            case 'TJ':
+              var items = args[0];
+              for (var j = 0, jj = items.length; j < jj; j++) {
+                if (typeof items[j] === 'string') {
+                  chunk += items[j];
+                } else if (items[j] < 0) {
+                  // making all negative offsets a space - better to have
+                  // a space in incorrect place than not have them at all
+                  chunk += ' ';
+                }
+              }
+              break;
+            case 'Tj':
+              chunk += args[0];
+              break;
+            case "'":
+              chunk += args[0] + ' ';
+              break;
+            case '"':
+              chunk += args[2] + ' ';
+              break;
+          } // switch
+          if (chunk !== '') {
+            text += fontCharsToUnicode(chunk, font.translated.properties);
+            chunk = '';
+          }
+
+          args = [];
+        } else if (obj != null) {
+          assertWellFormed(args.length <= 33, 'Too many arguments');
+          args.push(obj);
+        }
+      }
+
+      return text;
+    },
+
     extractDataStructures: function
       partialEvaluatorExtractDataStructures(dict, baseDict,
                                             xref, properties) {
@@ -12954,7 +13587,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       var toUnicode = dict.get('ToUnicode') ||
         baseDict.get('ToUnicode');
       if (toUnicode)
-        properties.toUnicode = this.readToUnicode(toUnicode, xref);
+        properties.toUnicode = this.readToUnicode(toUnicode, xref, properties);
 
       if (properties.composite) {
         // CIDSystemInfo helps to match CID to glyphs
@@ -13010,7 +13643,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       properties.hasEncoding = hasEncoding;
     },
 
-    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref) {
+    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref,
+                                                           properties) {
       var cmapObj = toUnicode;
       var charToUnicode = [];
       if (isName(cmapObj)) {
@@ -13099,6 +13733,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
             }
           } else if (octet == 0x3E) {
             if (token.length) {
+              // Heuristic: guessing chars size by checking numbers sizes
+              // in the CMap entries.
+              if (token.length == 2 && properties.composite)
+                properties.wideChars = false;
+
               if (token.length <= 4) {
                 // parsing hex number
                 tokens.push(parseInt(token, 16));
@@ -13316,6 +13955,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
         length1: length1,
         length2: length2,
         composite: composite,
+        wideChars: composite,
         fixedPitch: false,
         fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
         firstChar: firstChar || 0,
@@ -13336,7 +13976,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
         properties.coded = true;
         var charProcs = dict.get('CharProcs').getAll();
         var fontResources = dict.get('Resources') || resources;
-        properties.resources = fontResources;
         properties.charProcOperatorList = {};
         for (var key in charProcs) {
           var glyphStream = charProcs[key];
@@ -13380,6 +14019,7 @@ var EvalState = (function EvalStateClosure() {
   return EvalState;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -14135,6 +14775,736 @@ function isSpecialUnicode(unicode) {
     unicode < kCmapGlyphOffset + kSizeOfGlyphArea);
 }
 
+// The normalization table is obtained by filtering the Unicode characters
+// database with <compat> entries.
+var NormalizedUnicodes = {
+  '\u00A8': '\u0020\u0308',
+  '\u00AF': '\u0020\u0304',
+  '\u00B4': '\u0020\u0301',
+  '\u00B5': '\u03BC',
+  '\u00B8': '\u0020\u0327',
+  '\u0132': '\u0049\u004A',
+  '\u0133': '\u0069\u006A',
+  '\u013F': '\u004C\u00B7',
+  '\u0140': '\u006C\u00B7',
+  '\u0149': '\u02BC\u006E',
+  '\u017F': '\u0073',
+  '\u01C4': '\u0044\u017D',
+  '\u01C5': '\u0044\u017E',
+  '\u01C6': '\u0064\u017E',
+  '\u01C7': '\u004C\u004A',
+  '\u01C8': '\u004C\u006A',
+  '\u01C9': '\u006C\u006A',
+  '\u01CA': '\u004E\u004A',
+  '\u01CB': '\u004E\u006A',
+  '\u01CC': '\u006E\u006A',
+  '\u01F1': '\u0044\u005A',
+  '\u01F2': '\u0044\u007A',
+  '\u01F3': '\u0064\u007A',
+  '\u02D8': '\u0020\u0306',
+  '\u02D9': '\u0020\u0307',
+  '\u02DA': '\u0020\u030A',
+  '\u02DB': '\u0020\u0328',
+  '\u02DC': '\u0020\u0303',
+  '\u02DD': '\u0020\u030B',
+  '\u037A': '\u0020\u0345',
+  '\u0384': '\u0020\u0301',
+  '\u03D0': '\u03B2',
+  '\u03D1': '\u03B8',
+  '\u03D2': '\u03A5',
+  '\u03D5': '\u03C6',
+  '\u03D6': '\u03C0',
+  '\u03F0': '\u03BA',
+  '\u03F1': '\u03C1',
+  '\u03F2': '\u03C2',
+  '\u03F4': '\u0398',
+  '\u03F5': '\u03B5',
+  '\u03F9': '\u03A3',
+  '\u0587': '\u0565\u0582',
+  '\u0675': '\u0627\u0674',
+  '\u0676': '\u0648\u0674',
+  '\u0677': '\u06C7\u0674',
+  '\u0678': '\u064A\u0674',
+  '\u0E33': '\u0E4D\u0E32',
+  '\u0EB3': '\u0ECD\u0EB2',
+  '\u0EDC': '\u0EAB\u0E99',
+  '\u0EDD': '\u0EAB\u0EA1',
+  '\u0F77': '\u0FB2\u0F81',
+  '\u0F79': '\u0FB3\u0F81',
+  '\u1E9A': '\u0061\u02BE',
+  '\u1FBD': '\u0020\u0313',
+  '\u1FBF': '\u0020\u0313',
+  '\u1FC0': '\u0020\u0342',
+  '\u1FFE': '\u0020\u0314',
+  '\u2002': '\u0020',
+  '\u2003': '\u0020',
+  '\u2004': '\u0020',
+  '\u2005': '\u0020',
+  '\u2006': '\u0020',
+  '\u2008': '\u0020',
+  '\u2009': '\u0020',
+  '\u200A': '\u0020',
+  '\u2017': '\u0020\u0333',
+  '\u2024': '\u002E',
+  '\u2025': '\u002E\u002E',
+  '\u2026': '\u002E\u002E\u002E',
+  '\u2033': '\u2032\u2032',
+  '\u2034': '\u2032\u2032\u2032',
+  '\u2036': '\u2035\u2035',
+  '\u2037': '\u2035\u2035\u2035',
+  '\u203C': '\u0021\u0021',
+  '\u203E': '\u0020\u0305',
+  '\u2047': '\u003F\u003F',
+  '\u2048': '\u003F\u0021',
+  '\u2049': '\u0021\u003F',
+  '\u2057': '\u2032\u2032\u2032\u2032',
+  '\u205F': '\u0020',
+  '\u20A8': '\u0052\u0073',
+  '\u2100': '\u0061\u002F\u0063',
+  '\u2101': '\u0061\u002F\u0073',
+  '\u2103': '\u00B0\u0043',
+  '\u2105': '\u0063\u002F\u006F',
+  '\u2106': '\u0063\u002F\u0075',
+  '\u2107': '\u0190',
+  '\u2109': '\u00B0\u0046',
+  '\u2116': '\u004E\u006F',
+  '\u2121': '\u0054\u0045\u004C',
+  '\u2135': '\u05D0',
+  '\u2136': '\u05D1',
+  '\u2137': '\u05D2',
+  '\u2138': '\u05D3',
+  '\u213B': '\u0046\u0041\u0058',
+  '\u2160': '\u0049',
+  '\u2161': '\u0049\u0049',
+  '\u2162': '\u0049\u0049\u0049',
+  '\u2163': '\u0049\u0056',
+  '\u2164': '\u0056',
+  '\u2165': '\u0056\u0049',
+  '\u2166': '\u0056\u0049\u0049',
+  '\u2167': '\u0056\u0049\u0049\u0049',
+  '\u2168': '\u0049\u0058',
+  '\u2169': '\u0058',
+  '\u216A': '\u0058\u0049',
+  '\u216B': '\u0058\u0049\u0049',
+  '\u216C': '\u004C',
+  '\u216D': '\u0043',
+  '\u216E': '\u0044',
+  '\u216F': '\u004D',
+  '\u2170': '\u0069',
+  '\u2171': '\u0069\u0069',
+  '\u2172': '\u0069\u0069\u0069',
+  '\u2173': '\u0069\u0076',
+  '\u2174': '\u0076',
+  '\u2175': '\u0076\u0069',
+  '\u2176': '\u0076\u0069\u0069',
+  '\u2177': '\u0076\u0069\u0069\u0069',
+  '\u2178': '\u0069\u0078',
+  '\u2179': '\u0078',
+  '\u217A': '\u0078\u0069',
+  '\u217B': '\u0078\u0069\u0069',
+  '\u217C': '\u006C',
+  '\u217D': '\u0063',
+  '\u217E': '\u0064',
+  '\u217F': '\u006D',
+  '\u222C': '\u222B\u222B',
+  '\u222D': '\u222B\u222B\u222B',
+  '\u222F': '\u222E\u222E',
+  '\u2230': '\u222E\u222E\u222E',
+  '\u2474': '\u0028\u0031\u0029',
+  '\u2475': '\u0028\u0032\u0029',
+  '\u2476': '\u0028\u0033\u0029',
+  '\u2477': '\u0028\u0034\u0029',
+  '\u2478': '\u0028\u0035\u0029',
+  '\u2479': '\u0028\u0036\u0029',
+  '\u247A': '\u0028\u0037\u0029',
+  '\u247B': '\u0028\u0038\u0029',
+  '\u247C': '\u0028\u0039\u0029',
+  '\u247D': '\u0028\u0031\u0030\u0029',
+  '\u247E': '\u0028\u0031\u0031\u0029',
+  '\u247F': '\u0028\u0031\u0032\u0029',
+  '\u2480': '\u0028\u0031\u0033\u0029',
+  '\u2481': '\u0028\u0031\u0034\u0029',
+  '\u2482': '\u0028\u0031\u0035\u0029',
+  '\u2483': '\u0028\u0031\u0036\u0029',
+  '\u2484': '\u0028\u0031\u0037\u0029',
+  '\u2485': '\u0028\u0031\u0038\u0029',
+  '\u2486': '\u0028\u0031\u0039\u0029',
+  '\u2487': '\u0028\u0032\u0030\u0029',
+  '\u2488': '\u0031\u002E',
+  '\u2489': '\u0032\u002E',
+  '\u248A': '\u0033\u002E',
+  '\u248B': '\u0034\u002E',
+  '\u248C': '\u0035\u002E',
+  '\u248D': '\u0036\u002E',
+  '\u248E': '\u0037\u002E',
+  '\u248F': '\u0038\u002E',
+  '\u2490': '\u0039\u002E',
+  '\u2491': '\u0031\u0030\u002E',
+  '\u2492': '\u0031\u0031\u002E',
+  '\u2493': '\u0031\u0032\u002E',
+  '\u2494': '\u0031\u0033\u002E',
+  '\u2495': '\u0031\u0034\u002E',
+  '\u2496': '\u0031\u0035\u002E',
+  '\u2497': '\u0031\u0036\u002E',
+  '\u2498': '\u0031\u0037\u002E',
+  '\u2499': '\u0031\u0038\u002E',
+  '\u249A': '\u0031\u0039\u002E',
+  '\u249B': '\u0032\u0030\u002E',
+  '\u249C': '\u0028\u0061\u0029',
+  '\u249D': '\u0028\u0062\u0029',
+  '\u249E': '\u0028\u0063\u0029',
+  '\u249F': '\u0028\u0064\u0029',
+  '\u24A0': '\u0028\u0065\u0029',
+  '\u24A1': '\u0028\u0066\u0029',
+  '\u24A2': '\u0028\u0067\u0029',
+  '\u24A3': '\u0028\u0068\u0029',
+  '\u24A4': '\u0028\u0069\u0029',
+  '\u24A5': '\u0028\u006A\u0029',
+  '\u24A6': '\u0028\u006B\u0029',
+  '\u24A7': '\u0028\u006C\u0029',
+  '\u24A8': '\u0028\u006D\u0029',
+  '\u24A9': '\u0028\u006E\u0029',
+  '\u24AA': '\u0028\u006F\u0029',
+  '\u24AB': '\u0028\u0070\u0029',
+  '\u24AC': '\u0028\u0071\u0029',
+  '\u24AD': '\u0028\u0072\u0029',
+  '\u24AE': '\u0028\u0073\u0029',
+  '\u24AF': '\u0028\u0074\u0029',
+  '\u24B0': '\u0028\u0075\u0029',
+  '\u24B1': '\u0028\u0076\u0029',
+  '\u24B2': '\u0028\u0077\u0029',
+  '\u24B3': '\u0028\u0078\u0029',
+  '\u24B4': '\u0028\u0079\u0029',
+  '\u24B5': '\u0028\u007A\u0029',
+  '\u2A0C': '\u222B\u222B\u222B\u222B',
+  '\u2A74': '\u003A\u003A\u003D',
+  '\u2A75': '\u003D\u003D',
+  '\u2A76': '\u003D\u003D\u003D',
+  '\u2E9F': '\u6BCD',
+  '\u2EF3': '\u9F9F',
+  '\u2F00': '\u4E00',
+  '\u2F01': '\u4E28',
+  '\u2F02': '\u4E36',
+  '\u2F03': '\u4E3F',
+  '\u2F04': '\u4E59',
+  '\u2F05': '\u4E85',
+  '\u2F06': '\u4E8C',
+  '\u2F07': '\u4EA0',
+  '\u2F08': '\u4EBA',
+  '\u2F09': '\u513F',
+  '\u2F0A': '\u5165',
+  '\u2F0B': '\u516B',
+  '\u2F0C': '\u5182',
+  '\u2F0D': '\u5196',
+  '\u2F0E': '\u51AB',
+  '\u2F0F': '\u51E0',
+  '\u2F10': '\u51F5',
+  '\u2F11': '\u5200',
+  '\u2F12': '\u529B',
+  '\u2F13': '\u52F9',
+  '\u2F14': '\u5315',
+  '\u2F15': '\u531A',
+  '\u2F16': '\u5338',
+  '\u2F17': '\u5341',
+  '\u2F18': '\u535C',
+  '\u2F19': '\u5369',
+  '\u2F1A': '\u5382',
+  '\u2F1B': '\u53B6',
+  '\u2F1C': '\u53C8',
+  '\u2F1D': '\u53E3',
+  '\u2F1E': '\u56D7',
+  '\u2F1F': '\u571F',
+  '\u2F20': '\u58EB',
+  '\u2F21': '\u5902',
+  '\u2F22': '\u590A',
+  '\u2F23': '\u5915',
+  '\u2F24': '\u5927',
+  '\u2F25': '\u5973',
+  '\u2F26': '\u5B50',
+  '\u2F27': '\u5B80',
+  '\u2F28': '\u5BF8',
+  '\u2F29': '\u5C0F',
+  '\u2F2A': '\u5C22',
+  '\u2F2B': '\u5C38',
+  '\u2F2C': '\u5C6E',
+  '\u2F2D': '\u5C71',
+  '\u2F2E': '\u5DDB',
+  '\u2F2F': '\u5DE5',
+  '\u2F30': '\u5DF1',
+  '\u2F31': '\u5DFE',
+  '\u2F32': '\u5E72',
+  '\u2F33': '\u5E7A',
+  '\u2F34': '\u5E7F',
+  '\u2F35': '\u5EF4',
+  '\u2F36': '\u5EFE',
+  '\u2F37': '\u5F0B',
+  '\u2F38': '\u5F13',
+  '\u2F39': '\u5F50',
+  '\u2F3A': '\u5F61',
+  '\u2F3B': '\u5F73',
+  '\u2F3C': '\u5FC3',
+  '\u2F3D': '\u6208',
+  '\u2F3E': '\u6236',
+  '\u2F3F': '\u624B',
+  '\u2F40': '\u652F',
+  '\u2F41': '\u6534',
+  '\u2F42': '\u6587',
+  '\u2F43': '\u6597',
+  '\u2F44': '\u65A4',
+  '\u2F45': '\u65B9',
+  '\u2F46': '\u65E0',
+  '\u2F47': '\u65E5',
+  '\u2F48': '\u66F0',
+  '\u2F49': '\u6708',
+  '\u2F4A': '\u6728',
+  '\u2F4B': '\u6B20',
+  '\u2F4C': '\u6B62',
+  '\u2F4D': '\u6B79',
+  '\u2F4E': '\u6BB3',
+  '\u2F4F': '\u6BCB',
+  '\u2F50': '\u6BD4',
+  '\u2F51': '\u6BDB',
+  '\u2F52': '\u6C0F',
+  '\u2F53': '\u6C14',
+  '\u2F54': '\u6C34',
+  '\u2F55': '\u706B',
+  '\u2F56': '\u722A',
+  '\u2F57': '\u7236',
+  '\u2F58': '\u723B',
+  '\u2F59': '\u723F',
+  '\u2F5A': '\u7247',
+  '\u2F5B': '\u7259',
+  '\u2F5C': '\u725B',
+  '\u2F5D': '\u72AC',
+  '\u2F5E': '\u7384',
+  '\u2F5F': '\u7389',
+  '\u2F60': '\u74DC',
+  '\u2F61': '\u74E6',
+  '\u2F62': '\u7518',
+  '\u2F63': '\u751F',
+  '\u2F64': '\u7528',
+  '\u2F65': '\u7530',
+  '\u2F66': '\u758B',
+  '\u2F67': '\u7592',
+  '\u2F68': '\u7676',
+  '\u2F69': '\u767D',
+  '\u2F6A': '\u76AE',
+  '\u2F6B': '\u76BF',
+  '\u2F6C': '\u76EE',
+  '\u2F6D': '\u77DB',
+  '\u2F6E': '\u77E2',
+  '\u2F6F': '\u77F3',
+  '\u2F70': '\u793A',
+  '\u2F71': '\u79B8',
+  '\u2F72': '\u79BE',
+  '\u2F73': '\u7A74',
+  '\u2F74': '\u7ACB',
+  '\u2F75': '\u7AF9',
+  '\u2F76': '\u7C73',
+  '\u2F77': '\u7CF8',
+  '\u2F78': '\u7F36',
+  '\u2F79': '\u7F51',
+  '\u2F7A': '\u7F8A',
+  '\u2F7B': '\u7FBD',
+  '\u2F7C': '\u8001',
+  '\u2F7D': '\u800C',
+  '\u2F7E': '\u8012',
+  '\u2F7F': '\u8033',
+  '\u2F80': '\u807F',
+  '\u2F81': '\u8089',
+  '\u2F82': '\u81E3',
+  '\u2F83': '\u81EA',
+  '\u2F84': '\u81F3',
+  '\u2F85': '\u81FC',
+  '\u2F86': '\u820C',
+  '\u2F87': '\u821B',
+  '\u2F88': '\u821F',
+  '\u2F89': '\u826E',
+  '\u2F8A': '\u8272',
+  '\u2F8B': '\u8278',
+  '\u2F8C': '\u864D',
+  '\u2F8D': '\u866B',
+  '\u2F8E': '\u8840',
+  '\u2F8F': '\u884C',
+  '\u2F90': '\u8863',
+  '\u2F91': '\u897E',
+  '\u2F92': '\u898B',
+  '\u2F93': '\u89D2',
+  '\u2F94': '\u8A00',
+  '\u2F95': '\u8C37',
+  '\u2F96': '\u8C46',
+  '\u2F97': '\u8C55',
+  '\u2F98': '\u8C78',
+  '\u2F99': '\u8C9D',
+  '\u2F9A': '\u8D64',
+  '\u2F9B': '\u8D70',
+  '\u2F9C': '\u8DB3',
+  '\u2F9D': '\u8EAB',
+  '\u2F9E': '\u8ECA',
+  '\u2F9F': '\u8F9B',
+  '\u2FA0': '\u8FB0',
+  '\u2FA1': '\u8FB5',
+  '\u2FA2': '\u9091',
+  '\u2FA3': '\u9149',
+  '\u2FA4': '\u91C6',
+  '\u2FA5': '\u91CC',
+  '\u2FA6': '\u91D1',
+  '\u2FA7': '\u9577',
+  '\u2FA8': '\u9580',
+  '\u2FA9': '\u961C',
+  '\u2FAA': '\u96B6',
+  '\u2FAB': '\u96B9',
+  '\u2FAC': '\u96E8',
+  '\u2FAD': '\u9751',
+  '\u2FAE': '\u975E',
+  '\u2FAF': '\u9762',
+  '\u2FB0': '\u9769',
+  '\u2FB1': '\u97CB',
+  '\u2FB2': '\u97ED',
+  '\u2FB3': '\u97F3',
+  '\u2FB4': '\u9801',
+  '\u2FB5': '\u98A8',
+  '\u2FB6': '\u98DB',
+  '\u2FB7': '\u98DF',
+  '\u2FB8': '\u9996',
+  '\u2FB9': '\u9999',
+  '\u2FBA': '\u99AC',
+  '\u2FBB': '\u9AA8',
+  '\u2FBC': '\u9AD8',
+  '\u2FBD': '\u9ADF',
+  '\u2FBE': '\u9B25',
+  '\u2FBF': '\u9B2F',
+  '\u2FC0': '\u9B32',
+  '\u2FC1': '\u9B3C',
+  '\u2FC2': '\u9B5A',
+  '\u2FC3': '\u9CE5',
+  '\u2FC4': '\u9E75',
+  '\u2FC5': '\u9E7F',
+  '\u2FC6': '\u9EA5',
+  '\u2FC7': '\u9EBB',
+  '\u2FC8': '\u9EC3',
+  '\u2FC9': '\u9ECD',
+  '\u2FCA': '\u9ED1',
+  '\u2FCB': '\u9EF9',
+  '\u2FCC': '\u9EFD',
+  '\u2FCD': '\u9F0E',
+  '\u2FCE': '\u9F13',
+  '\u2FCF': '\u9F20',
+  '\u2FD0': '\u9F3B',
+  '\u2FD1': '\u9F4A',
+  '\u2FD2': '\u9F52',
+  '\u2FD3': '\u9F8D',
+  '\u2FD4': '\u9F9C',
+  '\u2FD5': '\u9FA0',
+  '\u3036': '\u3012',
+  '\u3038': '\u5341',
+  '\u3039': '\u5344',
+  '\u303A': '\u5345',
+  '\u309B': '\u0020\u3099',
+  '\u309C': '\u0020\u309A',
+  '\u3131': '\u1100',
+  '\u3132': '\u1101',
+  '\u3133': '\u11AA',
+  '\u3134': '\u1102',
+  '\u3135': '\u11AC',
+  '\u3136': '\u11AD',
+  '\u3137': '\u1103',
+  '\u3138': '\u1104',
+  '\u3139': '\u1105',
+  '\u313A': '\u11B0',
+  '\u313B': '\u11B1',
+  '\u313C': '\u11B2',
+  '\u313D': '\u11B3',
+  '\u313E': '\u11B4',
+  '\u313F': '\u11B5',
+  '\u3140': '\u111A',
+  '\u3141': '\u1106',
+  '\u3142': '\u1107',
+  '\u3143': '\u1108',
+  '\u3144': '\u1121',
+  '\u3145': '\u1109',
+  '\u3146': '\u110A',
+  '\u3147': '\u110B',
+  '\u3148': '\u110C',
+  '\u3149': '\u110D',
+  '\u314A': '\u110E',
+  '\u314B': '\u110F',
+  '\u314C': '\u1110',
+  '\u314D': '\u1111',
+  '\u314E': '\u1112',
+  '\u314F': '\u1161',
+  '\u3150': '\u1162',
+  '\u3151': '\u1163',
+  '\u3152': '\u1164',
+  '\u3153': '\u1165',
+  '\u3154': '\u1166',
+  '\u3155': '\u1167',
+  '\u3156': '\u1168',
+  '\u3157': '\u1169',
+  '\u3158': '\u116A',
+  '\u3159': '\u116B',
+  '\u315A': '\u116C',
+  '\u315B': '\u116D',
+  '\u315C': '\u116E',
+  '\u315D': '\u116F',
+  '\u315E': '\u1170',
+  '\u315F': '\u1171',
+  '\u3160': '\u1172',
+  '\u3161': '\u1173',
+  '\u3162': '\u1174',
+  '\u3163': '\u1175',
+  '\u3164': '\u1160',
+  '\u3165': '\u1114',
+  '\u3166': '\u1115',
+  '\u3167': '\u11C7',
+  '\u3168': '\u11C8',
+  '\u3169': '\u11CC',
+  '\u316A': '\u11CE',
+  '\u316B': '\u11D3',
+  '\u316C': '\u11D7',
+  '\u316D': '\u11D9',
+  '\u316E': '\u111C',
+  '\u316F': '\u11DD',
+  '\u3170': '\u11DF',
+  '\u3171': '\u111D',
+  '\u3172': '\u111E',
+  '\u3173': '\u1120',
+  '\u3174': '\u1122',
+  '\u3175': '\u1123',
+  '\u3176': '\u1127',
+  '\u3177': '\u1129',
+  '\u3178': '\u112B',
+  '\u3179': '\u112C',
+  '\u317A': '\u112D',
+  '\u317B': '\u112E',
+  '\u317C': '\u112F',
+  '\u317D': '\u1132',
+  '\u317E': '\u1136',
+  '\u317F': '\u1140',
+  '\u3180': '\u1147',
+  '\u3181': '\u114C',
+  '\u3182': '\u11F1',
+  '\u3183': '\u11F2',
+  '\u3184': '\u1157',
+  '\u3185': '\u1158',
+  '\u3186': '\u1159',
+  '\u3187': '\u1184',
+  '\u3188': '\u1185',
+  '\u3189': '\u1188',
+  '\u318A': '\u1191',
+  '\u318B': '\u1192',
+  '\u318C': '\u1194',
+  '\u318D': '\u119E',
+  '\u318E': '\u11A1',
+  '\u3200': '\u0028\u1100\u0029',
+  '\u3201': '\u0028\u1102\u0029',
+  '\u3202': '\u0028\u1103\u0029',
+  '\u3203': '\u0028\u1105\u0029',
+  '\u3204': '\u0028\u1106\u0029',
+  '\u3205': '\u0028\u1107\u0029',
+  '\u3206': '\u0028\u1109\u0029',
+  '\u3207': '\u0028\u110B\u0029',
+  '\u3208': '\u0028\u110C\u0029',
+  '\u3209': '\u0028\u110E\u0029',
+  '\u320A': '\u0028\u110F\u0029',
+  '\u320B': '\u0028\u1110\u0029',
+  '\u320C': '\u0028\u1111\u0029',
+  '\u320D': '\u0028\u1112\u0029',
+  '\u320E': '\u0028\u1100\u1161\u0029',
+  '\u320F': '\u0028\u1102\u1161\u0029',
+  '\u3210': '\u0028\u1103\u1161\u0029',
+  '\u3211': '\u0028\u1105\u1161\u0029',
+  '\u3212': '\u0028\u1106\u1161\u0029',
+  '\u3213': '\u0028\u1107\u1161\u0029',
+  '\u3214': '\u0028\u1109\u1161\u0029',
+  '\u3215': '\u0028\u110B\u1161\u0029',
+  '\u3216': '\u0028\u110C\u1161\u0029',
+  '\u3217': '\u0028\u110E\u1161\u0029',
+  '\u3218': '\u0028\u110F\u1161\u0029',
+  '\u3219': '\u0028\u1110\u1161\u0029',
+  '\u321A': '\u0028\u1111\u1161\u0029',
+  '\u321B': '\u0028\u1112\u1161\u0029',
+  '\u321C': '\u0028\u110C\u116E\u0029',
+  '\u321D': '\u0028\u110B\u1169\u110C\u1165\u11AB\u0029',
+  '\u321E': '\u0028\u110B\u1169\u1112\u116E\u0029',
+  '\u3220': '\u0028\u4E00\u0029',
+  '\u3221': '\u0028\u4E8C\u0029',
+  '\u3222': '\u0028\u4E09\u0029',
+  '\u3223': '\u0028\u56DB\u0029',
+  '\u3224': '\u0028\u4E94\u0029',
+  '\u3225': '\u0028\u516D\u0029',
+  '\u3226': '\u0028\u4E03\u0029',
+  '\u3227': '\u0028\u516B\u0029',
+  '\u3228': '\u0028\u4E5D\u0029',
+  '\u3229': '\u0028\u5341\u0029',
+  '\u322A': '\u0028\u6708\u0029',
+  '\u322B': '\u0028\u706B\u0029',
+  '\u322C': '\u0028\u6C34\u0029',
+  '\u322D': '\u0028\u6728\u0029',
+  '\u322E': '\u0028\u91D1\u0029',
+  '\u322F': '\u0028\u571F\u0029',
+  '\u3230': '\u0028\u65E5\u0029',
+  '\u3231': '\u0028\u682A\u0029',
+  '\u3232': '\u0028\u6709\u0029',
+  '\u3233': '\u0028\u793E\u0029',
+  '\u3234': '\u0028\u540D\u0029',
+  '\u3235': '\u0028\u7279\u0029',
+  '\u3236': '\u0028\u8CA1\u0029',
+  '\u3237': '\u0028\u795D\u0029',
+  '\u3238': '\u0028\u52B4\u0029',
+  '\u3239': '\u0028\u4EE3\u0029',
+  '\u323A': '\u0028\u547C\u0029',
+  '\u323B': '\u0028\u5B66\u0029',
+  '\u323C': '\u0028\u76E3\u0029',
+  '\u323D': '\u0028\u4F01\u0029',
+  '\u323E': '\u0028\u8CC7\u0029',
+  '\u323F': '\u0028\u5354\u0029',
+  '\u3240': '\u0028\u796D\u0029',
+  '\u3241': '\u0028\u4F11\u0029',
+  '\u3242': '\u0028\u81EA\u0029',
+  '\u3243': '\u0028\u81F3\u0029',
+  '\u32C0': '\u0031\u6708',
+  '\u32C1': '\u0032\u6708',
+  '\u32C2': '\u0033\u6708',
+  '\u32C3': '\u0034\u6708',
+  '\u32C4': '\u0035\u6708',
+  '\u32C5': '\u0036\u6708',
+  '\u32C6': '\u0037\u6708',
+  '\u32C7': '\u0038\u6708',
+  '\u32C8': '\u0039\u6708',
+  '\u32C9': '\u0031\u0030\u6708',
+  '\u32CA': '\u0031\u0031\u6708',
+  '\u32CB': '\u0031\u0032\u6708',
+  '\u3358': '\u0030\u70B9',
+  '\u3359': '\u0031\u70B9',
+  '\u335A': '\u0032\u70B9',
+  '\u335B': '\u0033\u70B9',
+  '\u335C': '\u0034\u70B9',
+  '\u335D': '\u0035\u70B9',
+  '\u335E': '\u0036\u70B9',
+  '\u335F': '\u0037\u70B9',
+  '\u3360': '\u0038\u70B9',
+  '\u3361': '\u0039\u70B9',
+  '\u3362': '\u0031\u0030\u70B9',
+  '\u3363': '\u0031\u0031\u70B9',
+  '\u3364': '\u0031\u0032\u70B9',
+  '\u3365': '\u0031\u0033\u70B9',
+  '\u3366': '\u0031\u0034\u70B9',
+  '\u3367': '\u0031\u0035\u70B9',
+  '\u3368': '\u0031\u0036\u70B9',
+  '\u3369': '\u0031\u0037\u70B9',
+  '\u336A': '\u0031\u0038\u70B9',
+  '\u336B': '\u0031\u0039\u70B9',
+  '\u336C': '\u0032\u0030\u70B9',
+  '\u336D': '\u0032\u0031\u70B9',
+  '\u336E': '\u0032\u0032\u70B9',
+  '\u336F': '\u0032\u0033\u70B9',
+  '\u3370': '\u0032\u0034\u70B9',
+  '\u33E0': '\u0031\u65E5',
+  '\u33E1': '\u0032\u65E5',
+  '\u33E2': '\u0033\u65E5',
+  '\u33E3': '\u0034\u65E5',
+  '\u33E4': '\u0035\u65E5',
+  '\u33E5': '\u0036\u65E5',
+  '\u33E6': '\u0037\u65E5',
+  '\u33E7': '\u0038\u65E5',
+  '\u33E8': '\u0039\u65E5',
+  '\u33E9': '\u0031\u0030\u65E5',
+  '\u33EA': '\u0031\u0031\u65E5',
+  '\u33EB': '\u0031\u0032\u65E5',
+  '\u33EC': '\u0031\u0033\u65E5',
+  '\u33ED': '\u0031\u0034\u65E5',
+  '\u33EE': '\u0031\u0035\u65E5',
+  '\u33EF': '\u0031\u0036\u65E5',
+  '\u33F0': '\u0031\u0037\u65E5',
+  '\u33F1': '\u0031\u0038\u65E5',
+  '\u33F2': '\u0031\u0039\u65E5',
+  '\u33F3': '\u0032\u0030\u65E5',
+  '\u33F4': '\u0032\u0031\u65E5',
+  '\u33F5': '\u0032\u0032\u65E5',
+  '\u33F6': '\u0032\u0033\u65E5',
+  '\u33F7': '\u0032\u0034\u65E5',
+  '\u33F8': '\u0032\u0035\u65E5',
+  '\u33F9': '\u0032\u0036\u65E5',
+  '\u33FA': '\u0032\u0037\u65E5',
+  '\u33FB': '\u0032\u0038\u65E5',
+  '\u33FC': '\u0032\u0039\u65E5',
+  '\u33FD': '\u0033\u0030\u65E5',
+  '\u33FE': '\u0033\u0031\u65E5',
+  '\uFB00': '\u0066\u0066',
+  '\uFB01': '\u0066\u0069',
+  '\uFB02': '\u0066\u006C',
+  '\uFB03': '\u0066\u0066\u0069',
+  '\uFB04': '\u0066\u0066\u006C',
+  '\uFB05': '\u017F\u0074',
+  '\uFB06': '\u0073\u0074',
+  '\uFB13': '\u0574\u0576',
+  '\uFB14': '\u0574\u0565',
+  '\uFB15': '\u0574\u056B',
+  '\uFB16': '\u057E\u0576',
+  '\uFB17': '\u0574\u056D',
+  '\uFB4F': '\u05D0\u05DC',
+  '\uFE49': '\u203E',
+  '\uFE4A': '\u203E',
+  '\uFE4B': '\u203E',
+  '\uFE4C': '\u203E',
+  '\uFE4D': '\u005F',
+  '\uFE4E': '\u005F',
+  '\uFE4F': '\u005F'
+};
+
+function fontCharsToUnicode(charCodes, fontProperties) {
+  var toUnicode = fontProperties.toUnicode;
+  var composite = fontProperties.composite;
+  var encoding, differences, cidToUnicode;
+  var result = '';
+  if (composite) {
+    cidToUnicode = fontProperties.cidToUnicode;
+    for (var i = 0, ii = charCodes.length; i < ii; i += 2) {
+      var charCode = (charCodes.charCodeAt(i) << 8) |
+        charCodes.charCodeAt(i + 1);
+      if (toUnicode && charCode in toUnicode) {
+        var unicode = toUnicode[charCode];
+        result += typeof unicode !== 'number' ? unicode :
+          String.fromCharCode(unicode);
+        continue;
+      }
+      result += String.fromCharCode(!cidToUnicode ? charCode :
+        cidToUnicode[charCode] || charCode);
+    }
+  } else {
+    differences = fontProperties.differences;
+    encoding = fontProperties.baseEncoding;
+    for (var i = 0, ii = charCodes.length; i < ii; i++) {
+      var charCode = charCodes.charCodeAt(i);
+      var unicode;
+      if (toUnicode && charCode in toUnicode) {
+        var unicode = toUnicode[charCode];
+        result += typeof unicode !== 'number' ? unicode :
+          String.fromCharCode(unicode);
+        continue;
+      }
+
+      var glyphName = charCode in differences ? differences[charCode] :
+        encoding[charCode];
+      if (glyphName in GlyphsUnicode) {
+        result += String.fromCharCode(GlyphsUnicode[glyphName]);
+        continue;
+      }
+      result += String.fromCharCode(charCode);
+    }
+  }
+  // normalizing the unicode characters
+  for (var i = 0, ii = result.length; i < ii; i++) {
+    if (!(result[i] in NormalizedUnicodes))
+      continue;
+    result = result.substring(0, i) + NormalizedUnicodes[result[i]] +
+      result.substring(i + 1);
+    ii = result.length;
+  }
+  return result;
+}
+
 /**
  * 'Font' is the class the outside world should use, it encapsulate all the font
  * decoding logics whatever type it is (assuming the font type is supported).
@@ -14148,7 +15518,6 @@ var Font = (function FontClosure() {
     this.name = name;
     this.coded = properties.coded;
     this.charProcOperatorList = properties.charProcOperatorList;
-    this.resources = properties.resources;
     this.sizes = [];
 
     var names = name.split('+');
@@ -14172,6 +15541,7 @@ var Font = (function FontClosure() {
     this.widths = properties.widths;
     this.defaultWidth = properties.defaultWidth;
     this.composite = properties.composite;
+    this.wideChars = properties.wideChars;
     this.hasEncoding = properties.hasEncoding;
 
     this.fontMatrix = properties.fontMatrix;
@@ -15109,6 +16479,16 @@ var Font = (function FontClosure() {
         properties.glyphNames = glyphNames;
       }
 
+      function isOS2Valid(os2Table) {
+        var data = os2Table.data;
+        // usWinAscent == 0 makes font unreadable by windows
+        var usWinAscent = (data[74] << 8) | data[75];
+        if (usWinAscent == 0)
+          return false;
+
+        return true;
+      }
+
       // Check that required tables are present
       var requiredTables = ['OS/2', 'cmap', 'head', 'hhea',
                              'hmtx', 'maxp', 'name', 'post'];
@@ -15116,7 +16496,7 @@ var Font = (function FontClosure() {
       var header = readOpenTypeHeader(font);
       var numTables = header.numTables;
 
-      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf;
+      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf, os2;
       var tables = [];
       for (var i = 0; i < numTables; i++) {
         var table = readTableEntry(font);
@@ -15134,6 +16514,8 @@ var Font = (function FontClosure() {
             hmtx = table;
           else if (table.tag == 'head')
             head = table;
+          else if (table.tag == 'OS/2')
+            os2 = table;
 
           requiredTables.splice(index, 1);
         } else {
@@ -15149,7 +16531,7 @@ var Font = (function FontClosure() {
         tables.push(table);
       }
 
-      var numTables = header.numTables + requiredTables.length;
+      var numTables = tables.length + requiredTables.length;
 
       // header and new offsets. Table entry information is appended to the
       // end of file. The virtualOffset represents where to put the actual
@@ -15163,21 +16545,10 @@ var Font = (function FontClosure() {
       // of missing tables
       createOpenTypeHeader(header.version, ttf, numTables);
 
-      if (requiredTables.indexOf('OS/2') != -1) {
-        // extract some more font properties from the OpenType head and
-        // hhea tables; yMin and descent value are always negative
-        var override = {
-          unitsPerEm: int16([head.data[18], head.data[19]]),
-          yMax: int16([head.data[42], head.data[43]]),
-          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
-          ascent: int16([hhea.data[4], hhea.data[5]]),
-          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
-        };
-
-        tables.push({
-          tag: 'OS/2',
-          data: stringToArray(createOS2Table(properties, null, override))
-        });
+      // Invalid OS/2 can break the font for the Windows
+      if (os2 && !isOS2Valid(os2)) {
+        tables.splice(tables.indexOf(os2), 1);
+        os2 = null;
       }
 
       // Ensure the [h/v]mtx tables contains the advance width and
@@ -15357,9 +16728,9 @@ var Font = (function FontClosure() {
             this.isSymbolicFont = false;
         }
 
-        // heuristics: if removed more than 2 glyphs encoding WinAnsiEncoding
-        // does not set properly
-        if (glyphsRemoved > 2) {
+        // heuristics: if removed more than 10 glyphs encoding WinAnsiEncoding
+        // does not set properly (broken PDFs have about 100 removed glyphs)
+        if (glyphsRemoved > 10) {
           warn('Switching TrueType encoding to MacRomanEncoding for ' +
                this.name + ' font');
           encoding = Encodings.MacRomanEncoding;
@@ -15458,6 +16829,23 @@ var Font = (function FontClosure() {
       }
       this.unicodeIsEnabled = unicodeIsEnabled;
 
+      if (!os2) {
+        // extract some more font properties from the OpenType head and
+        // hhea tables; yMin and descent value are always negative
+        var override = {
+          unitsPerEm: int16([head.data[18], head.data[19]]),
+          yMax: int16([head.data[42], head.data[43]]),
+          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
+          ascent: int16([hhea.data[4], hhea.data[5]]),
+          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
+        };
+
+        tables.push({
+          tag: 'OS/2',
+          data: stringToArray(createOS2Table(properties, glyphs, override))
+        });
+      }
+
       // Rewrite the 'post' table if needed
       if (requiredTables.indexOf('post') != -1) {
         tables.push({
@@ -15842,6 +17230,7 @@ var Font = (function FontClosure() {
           }
 
           // MacRoman encoding address by re-encoding the cmap table
+
           fontCharCode = glyphName in this.glyphNameMap ?
             this.glyphNameMap[glyphName] : GlyphsUnicode[glyphName];
           break;
@@ -15885,7 +17274,7 @@ var Font = (function FontClosure() {
 
       glyphs = [];
 
-      if (this.composite) {
+      if (this.wideChars) {
         // composite fonts have multi-byte strings convert the string from
         // single-byte to multi-byte
         // XXX assuming CIDFonts are two-byte - later need to extract the
@@ -16841,7 +18230,7 @@ var CFFFont = (function CFFFontClosure() {
     this.properties = properties;
 
     var parser = new CFFParser(file, properties);
-    var cff = parser.parse();
+    var cff = parser.parse(true);
     var compiler = new CFFCompiler(cff);
     this.readExtra(cff);
     try {
@@ -16932,7 +18321,7 @@ var CFFParser = (function CFFParserClosure() {
     this.properties = properties;
   }
   CFFParser.prototype = {
-    parse: function CFFParser_parse() {
+    parse: function CFFParser_parse(normalizeCIDData) {
       var properties = this.properties;
       var cff = new CFF();
       this.cff = cff;
@@ -16987,6 +18376,21 @@ var CFFParser = (function CFFParserClosure() {
       cff.charset = charset;
       cff.encoding = encoding;
 
+      if (!cff.isCIDFont || !normalizeCIDData)
+        return cff;
+
+      // DirectWrite does not like CID fonts data. Trying to convert/flatten
+      // the font data and remove CID properties.
+      if (cff.fdArray.length !== 1)
+        error('Unable to normalize CID font in CFF data');
+
+      var fontDict = cff.fdArray[0];
+      fontDict.setByKey(17, topDict.getByName('CharStrings'));
+      cff.topDict = fontDict;
+      cff.isCIDFont = false;
+      delete cff.fdArray;
+      delete cff.fdSelect;
+
       return cff;
     },
     parseHeader: function CFFParser_parseHeader() {
@@ -16997,7 +18401,7 @@ var CFFParser = (function CFFParserClosure() {
         ++offset;
 
       if (offset != 0) {
-        warn('cff data is shifted');
+        info('cff data is shifted');
         bytes = bytes.subarray(offset);
         this.bytes = bytes;
       }
@@ -17585,9 +18989,9 @@ var CFFPrivateDict = (function CFFPrivateDictClosure() {
     [[12, 17], 'LanguageGroup', 'num', 0],
     [[12, 18], 'ExpansionFactor', 'num', 0.06],
     [[12, 19], 'initialRandomSeed', 'num', 0],
-    [19, 'Subrs', 'offset', null],
     [20, 'defaultWidthX', 'num', 0],
-    [21, 'nominalWidthX', 'num', 0]
+    [21, 'nominalWidthX', 'num', 0],
+    [19, 'Subrs', 'offset', null]
   ];
   var tables = null;
   function CFFPrivateDict(strings) {
@@ -18045,6 +19449,7 @@ var CFFCompiler = (function CFFCompilerClosure() {
   return CFFCompiler;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -22257,6 +23662,7 @@ var GlyphsUnicode = {
   '.notdef': 0x0000
 };
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -22274,7 +23680,7 @@ var PDFImage = (function PDFImageClosure() {
       var colorSpace = dict.get('ColorSpace', 'CS');
       colorSpace = ColorSpace.parse(colorSpace, xref, res);
       var numComps = colorSpace.numComps;
-      handler.send('jpeg_decode', [image.getIR(), numComps], function(message) {
+      handler.send('JpegDecode', [image.getIR(), numComps], function(message) {
         var data = message.data;
         var stream = new Stream(data, 0, data.length, image.dict);
         promise.resolve(stream);
@@ -22632,6 +24038,7 @@ function loadJpegStream(id, imageData, objs) {
   img.src = 'data:image/jpeg;base64,' + window.btoa(imageData);
 }
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -25579,6 +26986,7 @@ var Metrics = {
   }
 };
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -25830,9 +27238,12 @@ var Parser = (function ParserClosure() {
       if (name == 'CCITTFaxDecode' || name == 'CCF') {
         return new CCITTFaxStream(stream, params);
       }
-      if (name == 'RunLengthDecode') {
+      if (name == 'RunLengthDecode' || name == 'RL') {
         return new RunLengthStream(stream);
       }
+      if (name == 'JBIG2Decode') {
+        error('JBIG2 image format is not currently supprted.');
+      }
       warn('filter "' + name + '" not supported yet');
       return stream;
     }
@@ -25842,8 +27253,16 @@ var Parser = (function ParserClosure() {
 })();
 
 var Lexer = (function LexerClosure() {
-  function Lexer(stream) {
+  function Lexer(stream, knownCommands) {
     this.stream = stream;
+    // The PDFs might have "glued" commands with other commands, operands or
+    // literals, e.g. "q1". The knownCommands is a dictionary of the valid
+    // commands and their prefixes. The prefixes are built the following way:
+    // if there a command that is a prefix of the other valid command or
+    // literal (e.g. 'f' and 'false') the following prefixes must be included,
+    // 'fa', 'fal', 'fals'. The prefixes are not needed, if the command has no
+    // other commands or literals as a prefix. The knowCommands is optional.
+    this.knownCommands = knownCommands;
   }
 
   Lexer.isSpace = function Lexer_isSpace(ch) {
@@ -26107,12 +27526,18 @@ var Lexer = (function LexerClosure() {
 
       // command
       var str = ch;
+      var knownCommands = this.knownCommands;
+      var knownCommandFound = knownCommands && (str in knownCommands);
       while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
+        // stop if known command is found and next character does not make
+        // the str a command
+        if (knownCommandFound && !((str + ch) in knownCommands))
+          break;
         stream.skip();
         if (str.length == 128)
           error('Command token too long: ' + str.length);
-
         str += ch;
+        knownCommandFound = knownCommands && (str in knownCommands);
       }
       if (str == 'true')
         return true;
@@ -26218,6 +27643,7 @@ var Linearization = (function LinearizationClosure() {
   return Linearization;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -26330,7 +27756,7 @@ Shadings.RadialAxial = (function RadialAxialClosure() {
     var r1 = raw[6];
     return {
       type: 'Pattern',
-      getPattern: function(ctx) {
+      getPattern: function RadialAxial_getPattern(ctx) {
         var curMatrix = ctx.mozCurrentTransform;
         if (curMatrix) {
           var userMatrix = ctx.mozCurrentTransformInverse;
@@ -26521,6 +27947,7 @@ var TilingPattern = (function TilingPatternClosure() {
   return TilingPattern;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -28210,7 +29637,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
 
     if (a1 > codingLine[codingPos]) {
       if (a1 > this.columns) {
-        warn('row is wrong length');
+        info('row is wrong length');
         this.err = true;
         a1 = this.columns;
       }
@@ -28230,7 +29657,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
 
     if (a1 > codingLine[codingPos]) {
       if (a1 > this.columns) {
-        warn('row is wrong length');
+        info('row is wrong length');
         this.err = true;
         a1 = this.columns;
       }
@@ -28240,7 +29667,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
       codingLine[codingPos] = a1;
     } else if (a1 < codingLine[codingPos]) {
       if (a1 < 0) {
-        warn('invalid code');
+        info('invalid code');
         this.err = true;
         a1 = 0;
       }
@@ -28402,7 +29829,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
               this.eof = true;
               break;
             default:
-              warn('bad 2d code');
+              info('bad 2d code');
               this.addPixels(columns, 0);
               this.err = true;
           }
@@ -28465,7 +29892,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
             for (var i = 0; i < 4; ++i) {
               code1 = this.lookBits(12);
               if (code1 != 1)
-                warn('bad rtc code: ' + code1);
+                info('bad rtc code: ' + code1);
               this.eatBits(12);
               if (this.encoding > 0) {
                 this.lookBits(1);
@@ -28588,7 +30015,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
       if (result[0] && result[2])
         return result[1];
     }
-    warn('Bad two dim code');
+    info('Bad two dim code');
     return EOF;
   };
 
@@ -28621,7 +30048,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
       if (result[0])
         return result[1];
     }
-    warn('bad white code');
+    info('bad white code');
     this.eatBits(1);
     return 1;
   };
@@ -28658,7 +30085,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
       if (result[0])
         return result[1];
     }
-    warn('bad black code');
+    info('bad black code');
     this.eatBits(1);
     return 1;
   };
@@ -28815,6 +30242,7 @@ var LZWStream = (function LZWStreamClosure() {
   return LZWStream;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -28828,10 +30256,13 @@ function MessageHandler(name, comObj) {
   var ah = this.actionHandler = {};
 
   ah['console_log'] = [function ahConsoleLog(data) {
-      console.log.apply(console, data);
+    console.log.apply(console, data);
   }];
   ah['console_error'] = [function ahConsoleError(data) {
-      console.error.apply(console, data);
+    console.error.apply(console, data);
+  }];
+  ah['_warn'] = [function ah_Warn(data) {
+    warn(data);
   }];
 
   comObj.onmessage = function messageHandlerComObjOnMessage(event) {
@@ -28902,15 +30333,68 @@ var WorkerMessageHandler = {
       handler.send('test', data instanceof Uint8Array);
     });
 
-    handler.on('doc', function wphSetupDoc(data) {
+    handler.on('GetDocRequest', function wphSetupDoc(data) {
       // Create only the model of the PDFDoc, which is enough for
       // processing the content of the pdf.
-      pdfModel = new PDFDocModel(new Stream(data));
+      var pdfData = data.data;
+      var pdfPassword = data.params.password;
+      try {
+        pdfModel = new PDFDocument(new Stream(pdfData), pdfPassword);
+      } catch (e) {
+        if (e instanceof PasswordException) {
+          if (e.code === 'needpassword') {
+            handler.send('NeedPassword', {
+              exception: e
+            });
+          } else if (e.code === 'incorrectpassword') {
+            handler.send('IncorrectPassword', {
+              exception: e
+            });
+          }
+
+          return;
+        } else {
+          throw e;
+        }
+      }
+      var doc = {
+        numPages: pdfModel.numPages,
+        fingerprint: pdfModel.getFingerprint(),
+        destinations: pdfModel.catalog.destinations,
+        outline: pdfModel.catalog.documentOutline,
+        info: pdfModel.getDocumentInfo(),
+        metadata: pdfModel.catalog.metadata,
+        encrypted: !!pdfModel.xref.encrypt
+      };
+      handler.send('GetDoc', {pdfInfo: doc});
     });
 
-    handler.on('page_request', function wphSetupPageRequest(pageNum) {
-      pageNum = parseInt(pageNum);
+    handler.on('GetPageRequest', function wphSetupGetPage(data) {
+      var pageNumber = data.pageIndex + 1;
+      var pdfPage = pdfModel.getPage(pageNumber);
+      var page = {
+        pageIndex: data.pageIndex,
+        rotate: pdfPage.rotate,
+        ref: pdfPage.ref,
+        view: pdfPage.view
+      };
+      handler.send('GetPage', {pageInfo: page});
+    });
 
+    handler.on('GetData', function wphSetupGetData(data, promise) {
+      promise.resolve(pdfModel.stream.bytes);
+    });
+
+    handler.on('GetAnnotationsRequest', function wphSetupGetAnnotations(data) {
+      var pdfPage = pdfModel.getPage(data.pageIndex + 1);
+      handler.send('GetAnnotations', {
+        pageIndex: data.pageIndex,
+        annotations: pdfPage.getAnnotations()
+      });
+    });
+
+    handler.on('RenderPageRequest', function wphSetupRenderPage(data) {
+      var pageNum = data.pageIndex + 1;
 
       // The following code does quite the same as
       // Page.prototype.startRendering, but stops at one point and sends the
@@ -28947,7 +30431,7 @@ var WorkerMessageHandler = {
           };
         }
 
-        handler.send('page_error', {
+        handler.send('PageError', {
           pageNum: pageNum,
           error: e
         });
@@ -28965,13 +30449,30 @@ var WorkerMessageHandler = {
           fonts[dep] = true;
         }
       }
-
-      handler.send('page', {
-        pageNum: pageNum,
+      handler.send('RenderPage', {
+        pageIndex: data.pageIndex,
         operatorList: operatorList,
         depFonts: Object.keys(fonts)
       });
     }, this);
+
+    handler.on('GetTextContent', function wphExtractText(data, promise) {
+      var pageNum = data.pageIndex + 1;
+      var start = Date.now();
+
+      var textContent = '';
+      try {
+        var page = pdfModel.getPage(pageNum);
+        textContent = page.extractTextContent();
+        promise.resolve(textContent);
+      } catch (e) {
+        // Skip errored pages
+        promise.reject(e);
+      }
+
+      console.log('text indexing: page=%d - time=%dms',
+                      pageNum, Date.now() - start);
+    });
   }
 };
 
@@ -29012,10 +30513,22 @@ var workerConsole = {
 if (typeof window === 'undefined') {
   globalScope.console = workerConsole;
 
+  // Add a logger so we can pass warnings on to the main thread, errors will
+  // throw an exception which will be forwarded on automatically.
+  PDFJS.LogManager.addLogger({
+    warn: function(msg) {
+      postMessage({
+        action: '_warn',
+        data: msg
+      });
+    }
+  });
+
   var handler = new MessageHandler('worker_processor', this);
   WorkerMessageHandler.setup(handler);
 }
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -29655,7 +31168,10 @@ var JpegImage = (function jpegImage() {
                   tableData[z] = data[offset++];
                 }
               } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
-                  tableData[j] = readUint16();
+                for (j = 0; j < 64; j++) {
+                  var z = dctZigZag[j];
+                  tableData[z] = readUint16();
+                }
               } else
                 throw "DQT: invalid table spec";
               quantizationTables[quantizationTableSpec & 15] = tableData;
@@ -29670,7 +31186,8 @@ var JpegImage = (function jpegImage() {
             frame.precision = data[offset++];
             frame.scanLines = readUint16();
             frame.samplesPerLine = readUint16();
-            frame.components = [];
+            frame.components = {};
+            frame.componentsOrder = [];
             var componentsCount = data[offset++], componentId;
             var maxH = 0, maxV = 0;
             for (i = 0; i < componentsCount; i++) {
@@ -29678,6 +31195,7 @@ var JpegImage = (function jpegImage() {
               var h = data[offset + 1] >> 4;
               var v = data[offset + 1] & 15;
               var qId = data[offset + 2];
+              frame.componentsOrder.push(componentId);
               frame.components[componentId] = {
                 h: h,
                 v: v,
@@ -29746,14 +31264,13 @@ var JpegImage = (function jpegImage() {
       this.jfif = jfif;
       this.adobe = adobe;
       this.components = [];
-      for (var id in frame.components) {
-        if (frame.components.hasOwnProperty(id)) {
-          this.components.push({
-            lines: buildComponentData(frame, frame.components[id]),
-            scaleX: frame.components[id].h / frame.maxH,
-            scaleY: frame.components[id].v / frame.maxV
-          });
-        }
+      for (var i = 0; i < frame.componentsOrder.length; i++) {
+        var component = frame.components[frame.componentsOrder[i]];
+        this.components.push({
+          lines: buildComponentData(frame, component),
+          scaleX: component.h / frame.maxH,
+          scaleY: component.v / frame.maxV
+        });
       }
     },
     getData: function getData(width, height) {
@@ -29926,7 +31443,8 @@ var JpegImage = (function jpegImage() {
   };
 
   return constructor;
-})();/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+})();
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
@@ -31788,6 +33306,7 @@ var JpxImage = (function JpxImageClosure() {
   return JpxImage;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -32220,14 +33739,35 @@ var bidi = PDFJS.bidi = (function bidiClosure() {
   return bidi;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
 
 var Metadata = PDFJS.Metadata = (function MetadataClosure() {
+  function fixMetadata(meta) {
+    return meta.replace(/>\\376\\377([^<]+)/g, function(all, codes) {
+      var bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g,
+                                function(code, d1, d2, d3) {
+        return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1);
+      });
+      var chars = '';
+      for (var i = 0; i < bytes.length; i += 2) {
+        var code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
+        chars += code >= 32 && code < 127 && code != 60 && code != 62 &&
+          code != 38 && false ? String.fromCharCode(code) :
+          '&#x' + (0x10000 + code).toString(16).substring(1) + ';';
+      }
+      return '>' + chars;
+    });
+  }
+
   function Metadata(meta) {
     if (typeof meta === 'string') {
+      // Ghostscript produces invalid metadata
+      meta = fixMetadata(meta);
+
       var parser = new DOMParser();
       meta = parser.parseFromString(meta, 'application/xml');
     } else if (!(meta instanceof Document)) {
diff --git a/apps/files_pdfviewer/js/pdfjs/compatibility.js b/apps/files_pdfviewer/js/pdfjs/compatibility.js
new file mode 100644
index 0000000000..528841bb61
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/compatibility.js
@@ -0,0 +1,340 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+// Checking if the typed arrays are supported
+(function checkTypedArrayCompatibility() {
+  if (typeof Uint8Array !== 'undefined') {
+    // some mobile version might not support Float64Array
+    if (typeof Float64Array === 'undefined')
+      window.Float64Array = Float32Array;
+
+    return;
+  }
+
+  function subarray(start, end) {
+    return new TypedArray(this.slice(start, end));
+  }
+
+  function setArrayOffset(array, offset) {
+    if (arguments.length < 2)
+      offset = 0;
+    for (var i = 0, n = array.length; i < n; ++i, ++offset)
+      this[offset] = array[i] & 0xFF;
+  }
+
+  function TypedArray(arg1) {
+    var result;
+    if (typeof arg1 === 'number') {
+      result = [];
+      for (var i = 0; i < arg1; ++i)
+        result[i] = 0;
+    } else
+      result = arg1.slice(0);
+
+    result.subarray = subarray;
+    result.buffer = result;
+    result.byteLength = result.length;
+    result.set = setArrayOffset;
+
+    if (typeof arg1 === 'object' && arg1.buffer)
+      result.buffer = arg1.buffer;
+
+    return result;
+  }
+
+  window.Uint8Array = TypedArray;
+
+  // we don't need support for set, byteLength for 32-bit array
+  // so we can use the TypedArray as well
+  window.Uint32Array = TypedArray;
+  window.Int32Array = TypedArray;
+  window.Uint16Array = TypedArray;
+  window.Float32Array = TypedArray;
+  window.Float64Array = TypedArray;
+})();
+
+// Object.create() ?
+(function checkObjectCreateCompatibility() {
+  if (typeof Object.create !== 'undefined')
+    return;
+
+  Object.create = function objectCreate(proto) {
+    var constructor = function objectCreateConstructor() {};
+    constructor.prototype = proto;
+    return new constructor();
+  };
+})();
+
+// Object.defineProperty() ?
+(function checkObjectDefinePropertyCompatibility() {
+  if (typeof Object.defineProperty !== 'undefined')
+    return;
+
+  Object.defineProperty = function objectDefineProperty(obj, name, def) {
+    delete obj[name];
+    if ('get' in def)
+      obj.__defineGetter__(name, def['get']);
+    if ('set' in def)
+      obj.__defineSetter__(name, def['set']);
+    if ('value' in def) {
+      obj.__defineSetter__(name, function objectDefinePropertySetter(value) {
+        this.__defineGetter__(name, function objectDefinePropertyGetter() {
+          return value;
+        });
+        return value;
+      });
+      obj[name] = def.value;
+    }
+  };
+})();
+
+// Object.keys() ?
+(function checkObjectKeysCompatibility() {
+  if (typeof Object.keys !== 'undefined')
+    return;
+
+  Object.keys = function objectKeys(obj) {
+    var result = [];
+    for (var i in obj) {
+      if (obj.hasOwnProperty(i))
+        result.push(i);
+    }
+    return result;
+  };
+})();
+
+// No XMLHttpRequest.response ?
+(function checkXMLHttpRequestResponseCompatibility() {
+  var xhrPrototype = XMLHttpRequest.prototype;
+  if ('response' in xhrPrototype ||
+      'mozResponseArrayBuffer' in xhrPrototype ||
+      'mozResponse' in xhrPrototype ||
+      'responseArrayBuffer' in xhrPrototype)
+    return;
+  // IE ?
+  if (typeof VBArray !== 'undefined') {
+    Object.defineProperty(xhrPrototype, 'response', {
+      get: function xmlHttpRequestResponseGet() {
+        return new Uint8Array(new VBArray(this.responseBody).toArray());
+      }
+    });
+    Object.defineProperty(xhrPrototype, 'overrideMimeType', {
+      value: function xmlHttpRequestOverrideMimeType(mimeType) {}
+    });
+    return;
+  }
+
+  // other browsers
+  function responseTypeSetter() {
+    // will be only called to set "arraybuffer"
+    this.overrideMimeType('text/plain; charset=x-user-defined');
+  }
+  if (typeof xhrPrototype.overrideMimeType === 'function') {
+    Object.defineProperty(xhrPrototype, 'responseType',
+                          { set: responseTypeSetter });
+  }
+  function responseGetter() {
+    var text = this.responseText;
+    var i, n = text.length;
+    var result = new Uint8Array(n);
+    for (i = 0; i < n; ++i)
+      result[i] = text.charCodeAt(i) & 0xFF;
+    return result;
+  }
+  Object.defineProperty(xhrPrototype, 'response', { get: responseGetter });
+})();
+
+// window.btoa (base64 encode function) ?
+(function checkWindowBtoaCompatibility() {
+  if ('btoa' in window)
+    return;
+
+  var digits =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+  window.btoa = function windowBtoa(chars) {
+    var buffer = '';
+    var i, n;
+    for (i = 0, n = chars.length; i < n; i += 3) {
+      var b1 = chars.charCodeAt(i) & 0xFF;
+      var b2 = chars.charCodeAt(i + 1) & 0xFF;
+      var b3 = chars.charCodeAt(i + 2) & 0xFF;
+      var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
+      var d3 = i + 1 < n ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
+      var d4 = i + 2 < n ? (b3 & 0x3F) : 64;
+      buffer += (digits.charAt(d1) + digits.charAt(d2) +
+                 digits.charAt(d3) + digits.charAt(d4));
+    }
+    return buffer;
+  };
+})();
+
+// Function.prototype.bind ?
+(function checkFunctionPrototypeBindCompatibility() {
+  if (typeof Function.prototype.bind !== 'undefined')
+    return;
+
+  Function.prototype.bind = function functionPrototypeBind(obj) {
+    var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
+    var bound = function functionPrototypeBindBound() {
+      var args = Array.prototype.concat.apply(headArgs, arguments);
+      return fn.apply(obj, args);
+    };
+    return bound;
+  };
+})();
+
+// IE9 text/html data URI
+(function checkDocumentDocumentModeCompatibility() {
+  if (!('documentMode' in document) || document.documentMode !== 9)
+    return;
+  // overriding the src property
+  var originalSrcDescriptor = Object.getOwnPropertyDescriptor(
+    HTMLIFrameElement.prototype, 'src');
+  Object.defineProperty(HTMLIFrameElement.prototype, 'src', {
+    get: function htmlIFrameElementPrototypeSrcGet() { return this.$src; },
+    set: function htmlIFrameElementPrototypeSrcSet(src) {
+      this.$src = src;
+      if (src.substr(0, 14) != 'data:text/html') {
+        originalSrcDescriptor.set.call(this, src);
+        return;
+      }
+      // for text/html, using blank document and then
+      // document's open, write, and close operations
+      originalSrcDescriptor.set.call(this, 'about:blank');
+      setTimeout((function htmlIFrameElementPrototypeSrcOpenWriteClose() {
+        var doc = this.contentDocument;
+        doc.open('text/html');
+        doc.write(src.substr(src.indexOf(',') + 1));
+        doc.close();
+      }).bind(this), 0);
+    },
+    enumerable: true
+  });
+})();
+
+// HTMLElement dataset property
+(function checkDatasetProperty() {
+  var div = document.createElement('div');
+  if ('dataset' in div)
+    return; // dataset property exists
+
+  Object.defineProperty(HTMLElement.prototype, 'dataset', {
+    get: function() {
+      if (this._dataset)
+        return this._dataset;
+
+      var dataset = {};
+      for (var j = 0, jj = this.attributes.length; j < jj; j++) {
+        var attribute = this.attributes[j];
+        if (attribute.name.substring(0, 5) != 'data-')
+          continue;
+        var key = attribute.name.substring(5).replace(/\-([a-z])/g,
+          function(all, ch) { return ch.toUpperCase(); });
+        dataset[key] = attribute.value;
+      }
+
+      Object.defineProperty(this, '_dataset', {
+        value: dataset,
+        writable: false,
+        enumerable: false
+      });
+      return dataset;
+    },
+    enumerable: true
+  });
+})();
+
+// HTMLElement classList property
+(function checkClassListProperty() {
+  var div = document.createElement('div');
+  if ('classList' in div)
+    return; // classList property exists
+
+  function changeList(element, itemName, add, remove) {
+    var s = element.className || '';
+    var list = s.split(/\s+/g);
+    if (list[0] == '') list.shift();
+    var index = list.indexOf(itemName);
+    if (index < 0 && add)
+      list.push(itemName);
+    if (index >= 0 && remove)
+      list.splice(index, 1);
+    element.className = list.join(' ');
+  }
+
+  var classListPrototype = {
+    add: function(name) {
+      changeList(this.element, name, true, false);
+    },
+    remove: function(name) {
+      changeList(this.element, name, false, true);
+    },
+    toggle: function(name) {
+      changeList(this.element, name, true, true);
+    }
+  };
+
+  Object.defineProperty(HTMLElement.prototype, 'classList', {
+    get: function() {
+      if (this._classList)
+        return this._classList;
+
+      var classList = Object.create(classListPrototype, {
+        element: {
+          value: this,
+          writable: false,
+          enumerable: true
+        }
+      });
+      Object.defineProperty(this, '_classList', {
+        value: classList,
+        writable: false,
+        enumerable: false
+      });
+      return classList;
+    },
+    enumerable: true
+  });
+})();
+
+// Check console compatability
+(function checkConsoleCompatibility() {
+  if (typeof console == 'undefined') {
+    console = {log: function() {}};
+  }
+})();
+
+// Check onclick compatibility in Opera
+(function checkOnClickCompatibility() {
+  // workaround for reported Opera bug DSK-354448:
+  // onclick fires on disabled buttons with opaque content
+  function ignoreIfTargetDisabled(event) {
+    if (isDisabled(event.target)) {
+      event.stopPropagation();
+    }
+  }
+  function isDisabled(node) {
+    return node.disabled || (node.parentNode && isDisabled(node.parentNode));
+  }
+  if (navigator.userAgent.indexOf('Opera') != -1) {
+    // use browser detection since we cannot feature-check this bug
+    document.addEventListener('click', ignoreIfTargetDisabled, true);
+  }
+})();
+
+// Checks if navigator.language is supported
+(function checkNavigatorLanguage() {
+  if ('language' in navigator)
+    return;
+  Object.defineProperty(navigator, 'language', {
+    get: function navigatorLanguage() {
+      var language = navigator.userLanguage || 'en-US';
+      return language.substring(0, 2).toLowerCase() +
+        language.substring(2).toUpperCase();
+    },
+    enumerable: true
+  });
+})();
diff --git a/apps/files_pdfviewer/js/pdfjs/update.sh b/apps/files_pdfviewer/js/pdfjs/update.sh
index 599f633860..df100e780b 100755
--- a/apps/files_pdfviewer/js/pdfjs/update.sh
+++ b/apps/files_pdfviewer/js/pdfjs/update.sh
@@ -1,3 +1,6 @@
 cd build
 rm pdf.js
 wget http://mozilla.github.com/pdf.js/build/pdf.js
+wget http://mozilla.github.com/pdf.js/web/compatibility.js
+wget http://mozilla.github.com/pdf.js/web/viewer.js
+
diff --git a/apps/files_pdfviewer/js/pdfjs/viewer.js b/apps/files_pdfviewer/js/pdfjs/viewer.js
new file mode 100644
index 0000000000..ff4f2452b6
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/viewer.js
@@ -0,0 +1,1936 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var kDefaultURL = 'compressed.tracemonkey-pldi-09.pdf';
+var kDefaultScale = 'auto';
+var kDefaultScaleDelta = 1.1;
+var kUnknownScale = 0;
+var kCacheSize = 20;
+var kCssUnits = 96.0 / 72.0;
+var kScrollbarPadding = 40;
+var kMinScale = 0.25;
+var kMaxScale = 4.0;
+var kImageDirectory = './images/';
+var kSettingsMemory = 20;
+
+var mozL10n = document.mozL10n || document.webL10n;
+
+function getFileName(url) {
+  var anchor = url.indexOf('#');
+  var query = url.indexOf('?');
+  var end = Math.min(
+    anchor > 0 ? anchor : url.length,
+    query > 0 ? query : url.length);
+  return url.substring(url.lastIndexOf('/', end) + 1, end);
+}
+
+var Cache = function cacheCache(size) {
+  var data = [];
+  this.push = function cachePush(view) {
+    var i = data.indexOf(view);
+    if (i >= 0)
+      data.splice(i);
+    data.push(view);
+    if (data.length > size)
+      data.shift().destroy();
+  };
+};
+
+var ProgressBar = (function ProgressBarClosure() {
+
+  function clamp(v, min, max) {
+    return Math.min(Math.max(v, min), max);
+  }
+
+  function ProgressBar(id, opts) {
+
+    // Fetch the sub-elements for later
+    this.div = document.querySelector(id + ' .progress');
+
+    // Get options, with sensible defaults
+    this.height = opts.height || 100;
+    this.width = opts.width || 100;
+    this.units = opts.units || '%';
+    this.percent = opts.percent || 0;
+
+    // Initialize heights
+    this.div.style.height = this.height + this.units;
+  }
+
+  ProgressBar.prototype = {
+
+    updateBar: function ProgressBar_updateBar() {
+      var progressSize = this.width * this._percent / 100;
+
+      if (this._percent > 95)
+        this.div.classList.add('full');
+
+      this.div.style.width = progressSize + this.units;
+    },
+
+    get percent() {
+      return this._percent;
+    },
+
+    set percent(val) {
+      this._percent = clamp(val, 0, 100);
+      this.updateBar();
+    }
+  };
+
+  return ProgressBar;
+})();
+
+var RenderingQueue = (function RenderingQueueClosure() {
+  function RenderingQueue() {
+    this.items = [];
+  }
+
+  RenderingQueue.prototype = {
+    enqueueDraw: function RenderingQueueEnqueueDraw(item) {
+      if (!item.drawingRequired())
+        return; // as no redraw required, no need for queueing.
+
+      this.items.push(item);
+      if (this.items.length > 1)
+        return; // not first item
+
+      item.draw(this.continueExecution.bind(this));
+    },
+    continueExecution: function RenderingQueueContinueExecution() {
+      var item = this.items.shift();
+
+      if (this.items.length == 0)
+        return; // queue is empty
+
+      item = this.items[0];
+      item.draw(this.continueExecution.bind(this));
+    }
+  };
+
+  return RenderingQueue;
+})();
+
+var FirefoxCom = (function FirefoxComClosure() {
+  return {
+    /**
+     * Creates an event that the extension is listening for and will
+     * synchronously respond to.
+     * NOTE: It is reccomended to use request() instead since one day we may not
+     * be able to synchronously reply.
+     * @param {String} action The action to trigger.
+     * @param {String} data Optional data to send.
+     * @return {*} The response.
+     */
+    requestSync: function(action, data) {
+      var request = document.createTextNode('');
+      request.setUserData('action', action, null);
+      request.setUserData('data', data, null);
+      request.setUserData('sync', true, null);
+      document.documentElement.appendChild(request);
+
+      var sender = document.createEvent('Events');
+      sender.initEvent('pdf.js.message', true, false);
+      request.dispatchEvent(sender);
+      var response = request.getUserData('response');
+      document.documentElement.removeChild(request);
+      return response;
+    },
+    /**
+     * Creates an event that the extension is listening for and will
+     * asynchronously respond by calling the callback.
+     * @param {String} action The action to trigger.
+     * @param {String} data Optional data to send.
+     * @param {Function} callback Optional response callback that will be called
+     * with one data argument.
+     */
+    request: function(action, data, callback) {
+      var request = document.createTextNode('');
+      request.setUserData('action', action, null);
+      request.setUserData('data', data, null);
+      request.setUserData('sync', false, null);
+      if (callback) {
+        request.setUserData('callback', callback, null);
+
+        document.addEventListener('pdf.js.response', function listener(event) {
+          var node = event.target,
+              callback = node.getUserData('callback'),
+              response = node.getUserData('response');
+
+          document.documentElement.removeChild(node);
+
+          document.removeEventListener('pdf.js.response', listener, false);
+          return callback(response);
+        }, false);
+      }
+      document.documentElement.appendChild(request);
+
+      var sender = document.createEvent('HTMLEvents');
+      sender.initEvent('pdf.js.message', true, false);
+      return request.dispatchEvent(sender);
+    }
+  };
+})();
+
+// Settings Manager - This is a utility for saving settings
+// First we see if localStorage is available
+// If not, we use FUEL in FF
+var Settings = (function SettingsClosure() {
+  var isLocalStorageEnabled = (function localStorageEnabledTest() {
+    // Feature test as per http://diveintohtml5.info/storage.html
+    // The additional localStorage call is to get around a FF quirk, see
+    // bug #495747 in bugzilla
+    try {
+      return 'localStorage' in window && window['localStorage'] !== null &&
+          localStorage;
+    } catch (e) {
+      return false;
+    }
+  })();
+
+  var isFirefoxExtension = PDFJS.isFirefoxExtension;
+
+  function Settings(fingerprint) {
+    var database = null;
+    var index;
+    if (isFirefoxExtension)
+      database = FirefoxCom.requestSync('getDatabase', null) || '{}';
+    else if (isLocalStorageEnabled)
+      database = localStorage.getItem('database') || '{}';
+    else
+      return false;
+
+    database = JSON.parse(database);
+    if (!('files' in database))
+      database.files = [];
+    if (database.files.length >= kSettingsMemory)
+      database.files.shift();
+    for (var i = 0, length = database.files.length; i < length; i++) {
+      var branch = database.files[i];
+      if (branch.fingerprint == fingerprint) {
+        index = i;
+        break;
+      }
+    }
+    if (typeof index != 'number')
+      index = database.files.push({fingerprint: fingerprint}) - 1;
+    this.file = database.files[index];
+    this.database = database;
+  }
+
+  Settings.prototype = {
+    set: function settingsSet(name, val) {
+      if (!('file' in this))
+        return false;
+
+      var file = this.file;
+      file[name] = val;
+      var database = JSON.stringify(this.database);
+      if (isFirefoxExtension)
+        FirefoxCom.requestSync('setDatabase', database);
+      else if (isLocalStorageEnabled)
+        localStorage.setItem('database', database);
+    },
+
+    get: function settingsGet(name, defaultValue) {
+      if (!('file' in this))
+        return defaultValue;
+
+      return this.file[name] || defaultValue;
+    }
+  };
+
+  return Settings;
+})();
+
+var cache = new Cache(kCacheSize);
+var renderingQueue = new RenderingQueue();
+var currentPageNumber = 1;
+
+var PDFView = {
+  pages: [],
+  thumbnails: [],
+  currentScale: kUnknownScale,
+  currentScaleValue: null,
+  initialBookmark: document.location.hash.substring(1),
+  startedTextExtraction: false,
+  pageText: [],
+  container: null,
+  initialized: false,
+  fellback: false,
+  pdfDocument: null,
+  // called once when the document is loaded
+  initialize: function pdfViewInitialize() {
+    this.container = document.getElementById('viewer');
+    this.initialized = true;
+  },
+
+  setScale: function pdfViewSetScale(val, resetAutoSettings) {
+    if (val == this.currentScale)
+      return;
+
+    var pages = this.pages;
+    for (var i = 0; i < pages.length; i++)
+      pages[i].update(val * kCssUnits);
+
+    if (this.currentScale != val)
+      this.pages[this.page - 1].scrollIntoView();
+    this.currentScale = val;
+
+    var event = document.createEvent('UIEvents');
+    event.initUIEvent('scalechange', false, false, window, 0);
+    event.scale = val;
+    event.resetAutoSettings = resetAutoSettings;
+    window.dispatchEvent(event);
+  },
+
+  parseScale: function pdfViewParseScale(value, resetAutoSettings) {
+    if ('custom' == value)
+      return;
+
+    var scale = parseFloat(value);
+    this.currentScaleValue = value;
+    if (scale) {
+      this.setScale(scale, true);
+      return;
+    }
+
+    var container = this.container;
+    var currentPage = this.pages[this.page - 1];
+    var pageWidthScale = (container.clientWidth - kScrollbarPadding) /
+                          currentPage.width * currentPage.scale / kCssUnits;
+    var pageHeightScale = (container.clientHeight - kScrollbarPadding) /
+                           currentPage.height * currentPage.scale / kCssUnits;
+    switch (value) {
+      case 'page-actual':
+        this.setScale(1, resetAutoSettings);
+        break;
+      case 'page-width':
+        this.setScale(pageWidthScale, resetAutoSettings);
+        break;
+      case 'page-height':
+        this.setScale(pageHeightScale, resetAutoSettings);
+        break;
+      case 'page-fit':
+        this.setScale(
+            Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
+        break;
+      case 'auto':
+        this.setScale(Math.min(1.0, pageWidthScale), resetAutoSettings);
+        break;
+    }
+
+    selectScaleOption(value);
+  },
+
+  zoomIn: function pdfViewZoomIn() {
+    var newScale = (this.currentScale * kDefaultScaleDelta).toFixed(2);
+    newScale = Math.min(kMaxScale, newScale);
+    this.parseScale(newScale, true);
+  },
+
+  zoomOut: function pdfViewZoomOut() {
+    var newScale = (this.currentScale / kDefaultScaleDelta).toFixed(2);
+    newScale = Math.max(kMinScale, newScale);
+    this.parseScale(newScale, true);
+  },
+
+  set page(val) {
+    var pages = this.pages;
+    var input = document.getElementById('pageNumber');
+    if (!(0 < val && val <= pages.length)) {
+      var event = document.createEvent('UIEvents');
+      event.initUIEvent('pagechange', false, false, window, 0);
+      event.pageNumber = this.page;
+      window.dispatchEvent(event);
+      return;
+    }
+
+    pages[val - 1].updateStats();
+    currentPageNumber = val;
+    var event = document.createEvent('UIEvents');
+    event.initUIEvent('pagechange', false, false, window, 0);
+    event.pageNumber = val;
+    window.dispatchEvent(event);
+
+    // checking if the this.page was called from the updateViewarea function:
+    // avoiding the creation of two "set page" method (internal and public)
+    if (updateViewarea.inProgress)
+      return;
+
+    // Avoid scrolling the first page during loading
+    if (this.loading && val == 1)
+      return;
+
+    pages[val - 1].scrollIntoView();
+  },
+
+  get page() {
+    return currentPageNumber;
+  },
+
+  open: function pdfViewOpen(url, scale, password) {
+    var parameters = {password: password};
+    if (typeof url === 'string') { // URL
+      this.url = url;
+      document.title = decodeURIComponent(getFileName(url)) || url;
+      parameters.url = url;
+    } else if (url && 'byteLength' in url) { // ArrayBuffer
+      parameters.data = url;
+    }
+
+//    if (!PDFView.loadingBar) {
+//      PDFView.loadingBar = new ProgressBar('#loadingBar', {});
+//    }
+
+    this.container = document.getElementById('viewer');
+
+    this.pdfDocument = null;
+    var self = this;
+    self.loading = true;
+    PDFJS.getDocument(parameters).then(
+      function getDocumentCallback(pdfDocument) {
+        self.load(pdfDocument, scale);
+        self.loading = false;
+      },
+      function getDocumentError(message, exception) {
+        if (exception.name === 'PasswordException') {
+          if (exception.code === 'needpassword') {
+            var promptString = mozL10n.get('request_password', null,
+                                      'PDF is protected by a password:');
+            password = prompt(promptString);
+            if (password && password.length > 0) {
+              return PDFView.open(url, scale, password);
+            }
+          }
+        }
+
+        var loadingIndicator = document.getElementById('loading');
+        loadingIndicator.textContent = mozL10n.get('loading_error_indicator',
+          null, 'Error');
+        var moreInfo = {
+          message: message
+        };
+        self.error(mozL10n.get('loading_error', null,
+          'An error occurred while loading the PDF.'), moreInfo);
+        self.loading = false;
+      },
+      function getDocumentProgress(progressData) {
+        self.progress(progressData.loaded / progressData.total);
+      }
+    );
+  },
+
+  download: function pdfViewDownload() {
+    function noData() {
+      FirefoxCom.request('download', { originalUrl: url });
+    }
+
+    var url = this.url.split('#')[0];
+    if (PDFJS.isFirefoxExtension) {
+      // Document isn't ready just try to download with the url.
+      if (!this.pdfDocument) {
+        noData();
+        return;
+      }
+      this.pdfDocument.getData().then(
+        function getDataSuccess(data) {
+          var bb = new MozBlobBuilder();
+          bb.append(data.buffer);
+          var blobUrl = window.URL.createObjectURL(
+                          bb.getBlob('application/pdf'));
+
+          FirefoxCom.request('download', { blobUrl: blobUrl, originalUrl: url },
+            function response(err) {
+              if (err) {
+                // This error won't really be helpful because it's likely the
+                // fallback won't work either (or is already open).
+                PDFView.error('PDF failed to download.');
+              }
+              window.URL.revokeObjectURL(blobUrl);
+            }
+          );
+        },
+        noData // Error ocurred try downloading with just the url.
+      );
+    } else {
+      url += '#pdfjs.action=download', '_parent';
+      window.open(url, '_parent');
+    }
+  },
+
+  fallback: function pdfViewFallback() {
+    if (!PDFJS.isFirefoxExtension)
+      return;
+    // Only trigger the fallback once so we don't spam the user with messages
+    // for one PDF.
+    if (this.fellback)
+      return;
+    this.fellback = true;
+    var url = this.url.split('#')[0];
+    FirefoxCom.request('fallback', url, function response(download) {
+      if (!download)
+        return;
+      PDFView.download();
+    });
+  },
+
+  navigateTo: function pdfViewNavigateTo(dest) {
+    if (typeof dest === 'string')
+      dest = this.destinations[dest];
+    if (!(dest instanceof Array))
+      return; // invalid destination
+    // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
+    var destRef = dest[0];
+    var pageNumber = destRef instanceof Object ?
+      this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
+    if (pageNumber > this.pages.length)
+      pageNumber = this.pages.length;
+    if (pageNumber) {
+      this.page = pageNumber;
+      var currentPage = this.pages[pageNumber - 1];
+      currentPage.scrollIntoView(dest);
+    }
+  },
+
+  getDestinationHash: function pdfViewGetDestinationHash(dest) {
+    if (typeof dest === 'string')
+      return PDFView.getAnchorUrl('#' + escape(dest));
+    if (dest instanceof Array) {
+      var destRef = dest[0]; // see navigateTo method for dest format
+      var pageNumber = destRef instanceof Object ?
+        this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+        (destRef + 1);
+      if (pageNumber) {
+        var pdfOpenParams = PDFView.getAnchorUrl('#page=' + pageNumber);
+        var destKind = dest[1];
+        if (typeof destKind === 'object' && 'name' in destKind &&
+            destKind.name == 'XYZ') {
+          var scale = (dest[4] || this.currentScale);
+          pdfOpenParams += '&zoom=' + (scale * 100);
+          if (dest[2] || dest[3]) {
+            pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0);
+          }
+        }
+        return pdfOpenParams;
+      }
+    }
+    return '';
+  },
+
+  /**
+   * For the firefox extension we prefix the full url on anchor links so they
+   * don't come up as resource:// urls and so open in new tab/window works.
+   * @param {String} anchor The anchor hash include the #.
+   */
+  getAnchorUrl: function getAnchorUrl(anchor) {
+    if (PDFJS.isFirefoxExtension)
+      return this.url.split('#')[0] + anchor;
+    return anchor;
+  },
+
+  /**
+   * Show the error box.
+   * @param {String} message A message that is human readable.
+   * @param {Object} moreInfo (optional) Further information about the error
+   *                            that is more technical.  Should have a 'message'
+   *                            and optionally a 'stack' property.
+   */
+  error: function pdfViewError(message, moreInfo) {
+    var moreInfoText = mozL10n.get('error_build', {build: PDFJS.build},
+      'PDF.JS Build: {{build}}') + '\n';
+    if (moreInfo) {
+      moreInfoText +=
+        mozL10n.get('error_message', {message: moreInfo.message},
+        'Message: {{message}}');
+      if (moreInfo.stack) {
+        moreInfoText += '\n' +
+          mozL10n.get('error_stack', {stack: moreInfo.stack},
+          'Stack: {{stack}}');
+      } else {
+        if (moreInfo.filename) {
+          moreInfoText += '\n' +
+            mozL10n.get('error_file', {file: moreInfo.filename},
+            'File: {{file}}');
+        }
+        if (moreInfo.lineNumber) {
+          moreInfoText += '\n' +
+            mozL10n.get('error_line', {line: moreInfo.lineNumber},
+            'Line: {{line}}');
+        }
+      }
+    }
+    if (PDFJS.isFirefoxExtension) {
+      console.error(message + '\n' + moreInfoText);
+      this.fallback();
+      return;
+    }
+    var errorWrapper = document.getElementById('errorWrapper');
+    errorWrapper.removeAttribute('hidden');
+
+    var errorMessage = document.getElementById('errorMessage');
+    errorMessage.textContent = message;
+
+    var closeButton = document.getElementById('errorClose');
+    closeButton.onclick = function() {
+      errorWrapper.setAttribute('hidden', 'true');
+    };
+
+    var errorMoreInfo = document.getElementById('errorMoreInfo');
+    var moreInfoButton = document.getElementById('errorShowMore');
+    var lessInfoButton = document.getElementById('errorShowLess');
+    moreInfoButton.onclick = function() {
+      errorMoreInfo.removeAttribute('hidden');
+      moreInfoButton.setAttribute('hidden', 'true');
+      lessInfoButton.removeAttribute('hidden');
+    };
+    lessInfoButton.onclick = function() {
+      errorMoreInfo.setAttribute('hidden', 'true');
+      moreInfoButton.removeAttribute('hidden');
+      lessInfoButton.setAttribute('hidden', 'true');
+    };
+    moreInfoButton.removeAttribute('hidden');
+    lessInfoButton.setAttribute('hidden', 'true');
+    errorMoreInfo.value = moreInfoText;
+
+    errorMoreInfo.rows = moreInfoText.split('\n').length - 1;
+  },
+
+  progress: function pdfViewProgress(level) {
+    var percent = Math.round(level * 100);
+    var loadingIndicator = document.getElementById('loading');
+    loadingIndicator.textContent = mozL10n.get('loading', {percent: percent},
+      'Loading... {{percent}}%');
+
+//    PDFView.loadingBar.percent = percent;
+  },
+
+  load: function pdfViewLoad(pdfDocument, scale) {
+    function bindOnAfterDraw(pageView, thumbnailView) {
+      // when page is painted, using the image as thumbnail base
+      pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() {
+        thumbnailView.setImage(pageView.canvas);
+        preDraw();
+      };
+    }
+
+    this.pdfDocument = pdfDocument;
+
+//    var errorWrapper = document.getElementById('errorWrapper');
+//    errorWrapper.setAttribute('hidden', 'true');
+
+    var loadingBox = document.getElementById('loading');
+    loadingBox.setAttribute('hidden', 'true');
+
+//    var loadingBox = document.getElementById('loadingBox');
+//    loadingBox.setAttribute('hidden', 'true');
+
+//    var thumbsView = document.getElementById('thumbnailView');
+//    thumbsView.parentNode.scrollTop = 0;
+
+//    while (thumbsView.hasChildNodes())
+//      thumbsView.removeChild(thumbsView.lastChild);
+
+//    if ('_loadingInterval' in thumbsView)
+//      clearInterval(thumbsView._loadingInterval);
+
+    var container = document.getElementById('viewer');
+    while (container.hasChildNodes())
+      container.removeChild(container.lastChild);
+
+    var pagesCount = pdfDocument.numPages;
+    var id = pdfDocument.fingerprint;
+    var storedHash = null;
+//    document.getElementById('numPages').textContent =
+//      mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
+    document.getElementById('numPages').innerHTML = pagesCount;
+    document.getElementById('pageNumber').max = pagesCount;
+    PDFView.documentFingerprint = id;
+    var store = PDFView.store = new Settings(id);
+    if (store.get('exists', false)) {
+      var page = store.get('page', '1');
+      var zoom = store.get('zoom', PDFView.currentScale);
+      var left = store.get('scrollLeft', '0');
+      var top = store.get('scrollTop', '0');
+
+      storedHash = 'page=' + page + '&zoom=' + zoom + ',' + left + ',' + top;
+    }
+
+    var pages = this.pages = [];
+    this.pageText = [];
+    this.startedTextExtraction = false;
+    var pagesRefMap = {};
+    var thumbnails = this.thumbnails = [];
+    var pagePromises = [];
+    for (var i = 1; i <= pagesCount; i++)
+      pagePromises.push(pdfDocument.getPage(i));
+    var self = this;
+    var pagesPromise = PDFJS.Promise.all(pagePromises);
+    pagesPromise.then(function(promisedPages) {
+      for (var i = 1; i <= pagesCount; i++) {
+        var page = promisedPages[i - 1];
+        var pageView = new PageView(container, page, i, scale,
+                                    page.stats, self.navigateTo.bind(self));
+//        var thumbnailView = new ThumbnailView(thumbsView, page, i);
+//        bindOnAfterDraw(pageView, thumbnailView);
+
+        pages.push(pageView);
+//        thumbnails.push(thumbnailView);
+        var pageRef = page.ref;
+        pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
+      }
+
+      self.pagesRefMap = pagesRefMap;
+    });
+
+    var destinationsPromise = pdfDocument.getDestinations();
+    destinationsPromise.then(function(destinations) {
+      self.destinations = destinations;
+    });
+
+    // outline and initial view depends on destinations and pagesRefMap
+    PDFJS.Promise.all([pagesPromise, destinationsPromise]).then(function() {
+      pdfDocument.getOutline().then(function(outline) {
+        self.outline = new DocumentOutlineView(outline);
+      });
+
+      self.setInitialView(storedHash, scale);
+    });
+
+    pdfDocument.getMetadata().then(function(data) {
+      var info = data.info, metadata = data.metadata;
+      self.documentInfo = info;
+      self.metadata = metadata;
+
+      var pdfTitle;
+      if (metadata) {
+        if (metadata.has('dc:title'))
+          pdfTitle = metadata.get('dc:title');
+      }
+
+      if (!pdfTitle && info && info['Title'])
+        pdfTitle = info['Title'];
+
+      if (pdfTitle)
+        document.title = pdfTitle + ' - ' + document.title;
+    });
+  },
+
+  setInitialView: function pdfViewSetInitialView(storedHash, scale) {
+    // Reset the current scale, as otherwise the page's scale might not get
+    // updated if the zoom level stayed the same.
+    this.currentScale = 0;
+    this.currentScaleValue = null;
+    if (this.initialBookmark) {
+      this.setHash(this.initialBookmark);
+      this.initialBookmark = null;
+    }
+    else if (storedHash)
+      this.setHash(storedHash);
+    else if (scale) {
+      this.parseScale(scale, true);
+      this.page = 1;
+    }
+
+    if (PDFView.currentScale === kUnknownScale) {
+      // Scale was not initialized: invalid bookmark or scale was not specified.
+      // Setting the default one.
+      this.parseScale(kDefaultScale, true);
+    }
+  },
+
+  search: function pdfViewStartSearch() {
+    // Limit this function to run every <SEARCH_TIMEOUT>ms.
+    var SEARCH_TIMEOUT = 250;
+    var lastSeach = this.lastSearch;
+    var now = Date.now();
+    if (lastSeach && (now - lastSeach) < SEARCH_TIMEOUT) {
+      if (!this.searchTimer) {
+        this.searchTimer = setTimeout(function resumeSearch() {
+            PDFView.search();
+          },
+          SEARCH_TIMEOUT - (now - lastSeach)
+        );
+      }
+      return;
+    }
+    this.searchTimer = null;
+    this.lastSearch = now;
+
+    function bindLink(link, pageNumber) {
+      link.href = '#' + pageNumber;
+      link.onclick = function searchBindLink() {
+        PDFView.page = pageNumber;
+        return false;
+      };
+    }
+
+    var searchResults = document.getElementById('searchResults');
+
+    var searchTermsInput = document.getElementById('searchTermsInput');
+    searchResults.removeAttribute('hidden');
+    searchResults.textContent = '';
+
+    var terms = searchTermsInput.value;
+
+    if (!terms)
+      return;
+
+    // simple search: removing spaces and hyphens, then scanning every
+    terms = terms.replace(/\s-/g, '').toLowerCase();
+    var index = PDFView.pageText;
+    var pageFound = false;
+    for (var i = 0, ii = index.length; i < ii; i++) {
+      var pageText = index[i].replace(/\s-/g, '').toLowerCase();
+      var j = pageText.indexOf(terms);
+      if (j < 0)
+        continue;
+
+      var pageNumber = i + 1;
+      var textSample = index[i].substr(j, 50);
+      var link = document.createElement('a');
+      bindLink(link, pageNumber);
+      link.textContent = 'Page ' + pageNumber + ': ' + textSample;
+      searchResults.appendChild(link);
+
+      pageFound = true;
+    }
+    if (!pageFound) {
+      searchResults.textContent = mozL10n.get('search_terms_not_found', null,
+                                              '(Not found)');
+    }
+  },
+
+  setHash: function pdfViewSetHash(hash) {
+    if (!hash)
+      return;
+
+    if (hash.indexOf('=') >= 0) {
+      var params = PDFView.parseQueryString(hash);
+      // borrowing syntax from "Parameters for Opening PDF Files"
+      if ('nameddest' in params) {
+        PDFView.navigateTo(params.nameddest);
+        return;
+      }
+      if ('page' in params) {
+        var pageNumber = (params.page | 0) || 1;
+        this.page = pageNumber;
+        if ('zoom' in params) {
+          var zoomArgs = params.zoom.split(','); // scale,left,top
+          // building destination array
+
+          // If the zoom value, it has to get divided by 100. If it is a string,
+          // it should stay as it is.
+          var zoomArg = zoomArgs[0];
+          var zoomArgNumber = parseFloat(zoomArg);
+          if (zoomArgNumber)
+            zoomArg = zoomArgNumber / 100;
+
+          var dest = [null, {name: 'XYZ'}, (zoomArgs[1] | 0),
+            (zoomArgs[2] | 0), zoomArg];
+          var currentPage = this.pages[pageNumber - 1];
+          currentPage.scrollIntoView(dest);
+        } else
+          this.page = params.page; // simple page
+        return;
+      }
+    } else if (/^\d+$/.test(hash)) // page number
+      this.page = hash;
+    else // named destination
+      PDFView.navigateTo(unescape(hash));
+  },
+
+  switchSidebarView: function pdfViewSwitchSidebarView(view) {
+    var thumbsView = document.getElementById('thumbnailView');
+    var outlineView = document.getElementById('outlineView');
+    var searchView = document.getElementById('searchView');
+
+    var thumbsButton = document.getElementById('viewThumbnail');
+    var outlineButton = document.getElementById('viewOutline');
+    var searchButton = document.getElementById('viewSearch');
+
+    switch (view) {
+      case 'thumbs':
+        thumbsButton.classList.add('toggled');
+        outlineButton.classList.remove('toggled');
+        searchButton.classList.remove('toggled');
+        thumbsView.classList.remove('hidden');
+        outlineView.classList.add('hidden');
+        searchView.classList.add('hidden');
+
+        updateThumbViewArea();
+        break;
+
+      case 'outline':
+        thumbsButton.classList.remove('toggled');
+        outlineButton.classList.add('toggled');
+        searchButton.classList.remove('toggled');
+        thumbsView.classList.add('hidden');
+        outlineView.classList.remove('hidden');
+        searchView.classList.add('hidden');
+
+        if (outlineButton.getAttribute('disabled'))
+          return;
+        break;
+
+      case 'search':
+        thumbsButton.classList.remove('toggled');
+        outlineButton.classList.remove('toggled');
+        searchButton.classList.add('toggled');
+        thumbsView.classList.add('hidden');
+        outlineView.classList.add('hidden');
+        searchView.classList.remove('hidden');
+
+        var searchTermsInput = document.getElementById('searchTermsInput');
+        searchTermsInput.focus();
+        // Start text extraction as soon as the search gets displayed.
+        this.extractText();
+        break;
+    }
+  },
+
+  extractText: function() {
+    if (this.startedTextExtraction)
+      return;
+    this.startedTextExtraction = true;
+    var self = this;
+    function extractPageText(pageIndex) {
+      self.pages[pageIndex].pdfPage.getTextContent().then(
+        function textContentResolved(textContent) {
+          self.pageText[pageIndex] = textContent;
+          self.search();
+          if ((pageIndex + 1) < self.pages.length)
+            extractPageText(pageIndex + 1);
+        }
+      );
+    };
+    extractPageText(0);
+  },
+
+  getVisiblePages: function pdfViewGetVisiblePages() {
+    var pages = this.pages;
+    var kBottomMargin = 10;
+    var kTopPadding = 30;
+    var visiblePages = [];
+
+    var currentHeight = kTopPadding + kBottomMargin;
+    //var container = this.container;
+    var container = document.getElementById('viewer');
+
+    // Add 1px to the scrolltop to give a little wiggle room if the math is off,
+    // this won't be needed if we calc current page number based off the middle
+    // of the screen instead of the top.
+    var containerTop = container.scrollTop + 1;
+    for (var i = 1; i <= pages.length; ++i) {
+      var page = pages[i - 1];
+      var pageHeight = page.height + kBottomMargin;
+      if (currentHeight + pageHeight > containerTop)
+        break;
+
+      currentHeight += pageHeight;
+    }
+
+    var containerBottom = containerTop + container.clientHeight;
+    for (; i <= pages.length && currentHeight < containerBottom; ++i) {
+      var singlePage = pages[i - 1];
+      visiblePages.push({ id: singlePage.id, y: currentHeight,
+                          view: singlePage });
+      currentHeight += page.height + kBottomMargin;
+    }
+    return visiblePages;
+  },
+
+  getVisibleThumbs: function pdfViewGetVisibleThumbs() {
+    var thumbs = this.thumbnails;
+    var kBottomMargin = 15;
+    var visibleThumbs = [];
+
+    var view = document.getElementById('thumbnailView');
+    var currentHeight = kBottomMargin;
+
+    var top = view.scrollTop;
+    for (var i = 1; i <= thumbs.length; ++i) {
+      var thumb = thumbs[i - 1];
+      var thumbHeight = thumb.height * thumb.scaleY + kBottomMargin;
+      if (currentHeight + thumbHeight > top)
+        break;
+
+      currentHeight += thumbHeight;
+    }
+
+    var bottom = top + view.clientHeight;
+    for (; i <= thumbs.length && currentHeight < bottom; ++i) {
+      var singleThumb = thumbs[i - 1];
+      visibleThumbs.push({ id: singleThumb.id, y: currentHeight,
+                          view: singleThumb });
+      currentHeight += singleThumb.height * singleThumb.scaleY + kBottomMargin;
+    }
+
+    return visibleThumbs;
+  },
+
+  // Helper function to parse query string (e.g. ?param1=value&parm2=...).
+  parseQueryString: function pdfViewParseQueryString(query) {
+    var parts = query.split('&');
+    var params = {};
+    for (var i = 0, ii = parts.length; i < parts.length; ++i) {
+      var param = parts[i].split('=');
+      var key = param[0];
+      var value = param.length > 1 ? param[1] : null;
+      params[unescape(key)] = unescape(value);
+    }
+    return params;
+  }
+};
+
+var PageView = function pageView(container, pdfPage, id, scale,
+                                 stats, navigateTo) {
+  this.id = id;
+  this.pdfPage = pdfPage;
+
+  this.scale = scale || 1.0;
+  this.viewport = this.pdfPage.getViewport(this.scale);
+
+  var anchor = document.createElement('a');
+  anchor.name = '' + this.id;
+
+  var div = document.createElement('div');
+  div.id = 'pageContainer' + this.id;
+  div.className = 'page';
+
+  container.appendChild(anchor);
+  container.appendChild(div);
+
+  this.destroy = function pageViewDestroy() {
+    this.update();
+    this.pdfPage.destroy();
+  };
+
+  this.update = function pageViewUpdate(scale) {
+    this.scale = scale || this.scale;
+    var viewport = this.pdfPage.getViewport(this.scale);
+
+    this.viewport = viewport;
+    div.style.width = viewport.width + 'px';
+    div.style.height = viewport.height + 'px';
+
+    while (div.hasChildNodes())
+      div.removeChild(div.lastChild);
+    div.removeAttribute('data-loaded');
+
+    delete this.canvas;
+
+    this.loadingIconDiv = document.createElement('div');
+    this.loadingIconDiv.className = 'loadingIcon';
+    div.appendChild(this.loadingIconDiv);
+  };
+
+  Object.defineProperty(this, 'width', {
+    get: function PageView_getWidth() {
+      return this.viewport.width;
+    },
+    enumerable: true
+  });
+
+  Object.defineProperty(this, 'height', {
+    get: function PageView_getHeight() {
+      return this.viewport.height;
+    },
+    enumerable: true
+  });
+
+  function setupAnnotations(pdfPage, viewport) {
+    function bindLink(link, dest) {
+      link.href = PDFView.getDestinationHash(dest);
+      link.onclick = function pageViewSetupLinksOnclick() {
+        if (dest)
+          PDFView.navigateTo(dest);
+        return false;
+      };
+    }
+    function createElementWithStyle(tagName, item) {
+      var rect = viewport.convertToViewportRectangle(item.rect);
+      rect = PDFJS.Util.normalizeRect(rect);
+      var element = document.createElement(tagName);
+      element.style.left = Math.floor(rect[0]) + 'px';
+      element.style.top = Math.floor(rect[1]) + 'px';
+      element.style.width = Math.ceil(rect[2] - rect[0]) + 'px';
+      element.style.height = Math.ceil(rect[3] - rect[1]) + 'px';
+      return element;
+    }
+    function createCommentAnnotation(type, item) {
+      var container = document.createElement('section');
+      container.className = 'annotComment';
+
+      var image = createElementWithStyle('img', item);
+      var type = item.type;
+      var rect = viewport.convertToViewportRectangle(item.rect);
+      rect = PDFJS.Util.normalizeRect(rect);
+      image.src = kImageDirectory + 'annotation-' + type.toLowerCase() + '.svg';
+      image.alt = mozL10n.get('text_annotation_type', {type: type},
+        '[{{type}} Annotation]');
+      var content = document.createElement('div');
+      content.setAttribute('hidden', true);
+      var title = document.createElement('h1');
+      var text = document.createElement('p');
+      content.style.left = Math.floor(rect[2]) + 'px';
+      content.style.top = Math.floor(rect[1]) + 'px';
+      title.textContent = item.title;
+
+      if (!item.content && !item.title) {
+        content.setAttribute('hidden', true);
+      } else {
+        var e = document.createElement('span');
+        var lines = item.content.split('\n');
+        for (var i = 0, ii = lines.length; i < ii; ++i) {
+          var line = lines[i];
+          e.appendChild(document.createTextNode(line));
+          if (i < (ii - 1))
+            e.appendChild(document.createElement('br'));
+        }
+        text.appendChild(e);
+        image.addEventListener('mouseover', function annotationImageOver() {
+           content.removeAttribute('hidden');
+        }, false);
+
+        image.addEventListener('mouseout', function annotationImageOut() {
+           content.setAttribute('hidden', true);
+        }, false);
+      }
+
+      content.appendChild(title);
+      content.appendChild(text);
+      container.appendChild(image);
+      container.appendChild(content);
+
+      return container;
+    }
+
+    pdfPage.getAnnotations().then(function(items) {
+      for (var i = 0; i < items.length; i++) {
+        var item = items[i];
+        switch (item.type) {
+          case 'Link':
+            var link = createElementWithStyle('a', item);
+            link.href = item.url || '';
+            if (!item.url)
+              bindLink(link, ('dest' in item) ? item.dest : null);
+            div.appendChild(link);
+            break;
+          case 'Text':
+            var comment = createCommentAnnotation(item.name, item);
+            if (comment)
+              div.appendChild(comment);
+            break;
+          case 'Widget':
+            // TODO: support forms
+            PDFView.fallback();
+            break;
+        }
+      }
+    });
+  }
+
+  this.getPagePoint = function pageViewGetPagePoint(x, y) {
+    return this.viewport.convertToPdfPoint(x, y);
+  };
+
+  this.scrollIntoView = function pageViewScrollIntoView(dest) {
+      if (!dest) {
+        div.scrollIntoView(true);
+        return;
+      }
+
+      var x = 0, y = 0;
+      var width = 0, height = 0, widthScale, heightScale;
+      var scale = 0;
+      switch (dest[1].name) {
+        case 'XYZ':
+          x = dest[2];
+          y = dest[3];
+          scale = dest[4];
+          break;
+        case 'Fit':
+        case 'FitB':
+          scale = 'page-fit';
+          break;
+        case 'FitH':
+        case 'FitBH':
+          y = dest[2];
+          scale = 'page-width';
+          break;
+        case 'FitV':
+        case 'FitBV':
+          x = dest[2];
+          scale = 'page-height';
+          break;
+        case 'FitR':
+          x = dest[2];
+          y = dest[3];
+          width = dest[4] - x;
+          height = dest[5] - y;
+          widthScale = (this.container.clientWidth - kScrollbarPadding) /
+            width / kCssUnits;
+          heightScale = (this.container.clientHeight - kScrollbarPadding) /
+            height / kCssUnits;
+          scale = Math.min(widthScale, heightScale);
+          break;
+        default:
+          return;
+      }
+
+      if (scale && scale !== PDFView.currentScale)
+        PDFView.parseScale(scale, true);
+      else if (PDFView.currentScale === kUnknownScale)
+        PDFView.parseScale(kDefaultScale, true);
+
+      var boundingRect = [
+        this.viewport.convertToViewportPoint(x, y),
+        this.viewport.convertToViewportPoint(x + width, y + height)
+      ];
+      setTimeout(function pageViewScrollIntoViewRelayout() {
+        // letting page to re-layout before scrolling
+        var scale = PDFView.currentScale;
+        var x = Math.min(boundingRect[0][0], boundingRect[1][0]);
+        var y = Math.min(boundingRect[0][1], boundingRect[1][1]);
+        var width = Math.abs(boundingRect[0][0] - boundingRect[1][0]);
+        var height = Math.abs(boundingRect[0][1] - boundingRect[1][1]);
+
+        // using temporary div to scroll it into view
+        var tempDiv = document.createElement('div');
+        tempDiv.style.position = 'absolute';
+        tempDiv.style.left = Math.floor(x) + 'px';
+        tempDiv.style.top = Math.floor(y) + 'px';
+        tempDiv.style.width = Math.ceil(width) + 'px';
+        tempDiv.style.height = Math.ceil(height) + 'px';
+        div.appendChild(tempDiv);
+        tempDiv.scrollIntoView(true);
+        div.removeChild(tempDiv);
+      }, 0);
+  };
+
+  this.drawingRequired = function() {
+    return !div.querySelector('canvas');
+  };
+
+  this.draw = function pageviewDraw(callback) {
+    if (!this.drawingRequired()) {
+      this.updateStats();
+      callback();
+      return;
+    }
+
+    var canvas = document.createElement('canvas');
+    canvas.id = 'page' + this.id;
+    canvas.mozOpaque = true;
+    div.appendChild(canvas);
+    this.canvas = canvas;
+
+    var textLayerDiv = null;
+    if (!PDFJS.disableTextLayer) {
+      textLayerDiv = document.createElement('div');
+      textLayerDiv.className = 'textLayer';
+      div.appendChild(textLayerDiv);
+    }
+    var textLayer = textLayerDiv ? new TextLayerBuilder(textLayerDiv) : null;
+
+    var scale = this.scale, viewport = this.viewport;
+    canvas.width = viewport.width;
+    canvas.height = viewport.height;
+
+    var ctx = canvas.getContext('2d');
+    ctx.save();
+    ctx.fillStyle = 'rgb(255, 255, 255)';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    ctx.restore();
+
+    // Rendering area
+
+    var self = this;
+    function pageViewDrawCallback(error) {
+      if (self.loadingIconDiv) {
+        div.removeChild(self.loadingIconDiv);
+        delete self.loadingIconDiv;
+      }
+
+      if (error) {
+        PDFView.error(mozL10n.get('rendering_error', null,
+          'An error occurred while rendering the page.'), error);
+      }
+
+      self.stats = pdfPage.stats;
+      self.updateStats();
+      if (self.onAfterDraw)
+        self.onAfterDraw();
+
+      cache.push(self);
+      callback();
+    }
+
+    var renderContext = {
+      canvasContext: ctx,
+      viewport: this.viewport,
+      textLayer: textLayer
+    };
+    this.pdfPage.render(renderContext).then(
+      function pdfPageRenderCallback() {
+        pageViewDrawCallback(null);
+      },
+      function pdfPageRenderError(error) {
+        pageViewDrawCallback(error);
+      }
+    );
+
+    setupAnnotations(this.pdfPage, this.viewport);
+    div.setAttribute('data-loaded', true);
+  };
+
+  this.updateStats = function pageViewUpdateStats() {
+    if (PDFJS.pdfBug && Stats.enabled) {
+      var stats = this.stats;
+      Stats.add(this.id, stats);
+    }
+  };
+};
+
+var ThumbnailView = function thumbnailView(container, pdfPage, id) {
+  var anchor = document.createElement('a');
+  anchor.href = PDFView.getAnchorUrl('#page=' + id);
+  anchor.title = mozL10n.get('thumb_page_title', {page: id}, 'Page {{page}}');
+  anchor.onclick = function stopNavigation() {
+    PDFView.page = id;
+    return false;
+  };
+
+  var viewport = pdfPage.getViewport(1);
+  var pageWidth = this.width = viewport.width;
+  var pageHeight = this.height = viewport.height;
+  var pageRatio = pageWidth / pageHeight;
+  this.id = id;
+
+  var canvasWidth = 98;
+  var canvasHeight = canvasWidth / this.width * this.height;
+  var scaleX = this.scaleX = (canvasWidth / pageWidth);
+  var scaleY = this.scaleY = (canvasHeight / pageHeight);
+
+  var div = document.createElement('div');
+  div.id = 'thumbnailContainer' + id;
+  div.className = 'thumbnail';
+
+  anchor.appendChild(div);
+  container.appendChild(anchor);
+
+  this.hasImage = false;
+
+  function getPageDrawContext() {
+    var canvas = document.createElement('canvas');
+    canvas.id = 'thumbnail' + id;
+    canvas.mozOpaque = true;
+
+    canvas.width = canvasWidth;
+    canvas.height = canvasHeight;
+    canvas.className = 'thumbnailImage';
+    canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
+      {page: id}, 'Thumbnail of Page {{page}}'));
+
+    div.setAttribute('data-loaded', true);
+
+    var ring = document.createElement('div');
+    ring.className = 'thumbnailSelectionRing';
+    ring.appendChild(canvas);
+    div.appendChild(ring);
+
+    var ctx = canvas.getContext('2d');
+    ctx.save();
+    ctx.fillStyle = 'rgb(255, 255, 255)';
+    ctx.fillRect(0, 0, canvasWidth, canvasHeight);
+    ctx.restore();
+    return ctx;
+  }
+
+  this.drawingRequired = function thumbnailViewDrawingRequired() {
+    return !this.hasImage;
+  };
+
+  this.draw = function thumbnailViewDraw(callback) {
+    if (this.hasImage) {
+      callback();
+      return;
+    }
+
+    var ctx = getPageDrawContext();
+    var drawViewport = pdfPage.getViewport(scaleX);
+    var renderContext = {
+      canvasContext: ctx,
+      viewport: drawViewport
+    };
+    pdfPage.render(renderContext).then(
+      function pdfPageRenderCallback() {
+        callback();
+      },
+      function pdfPageRenderError(error) {
+        callback();
+      }
+    );
+    this.hasImage = true;
+  };
+
+  this.setImage = function thumbnailViewSetImage(img) {
+    if (this.hasImage || !img)
+      return;
+
+    var ctx = getPageDrawContext();
+    ctx.drawImage(img, 0, 0, img.width, img.height,
+                  0, 0, ctx.canvas.width, ctx.canvas.height);
+
+    this.hasImage = true;
+  };
+};
+
+var DocumentOutlineView = function documentOutlineView(outline) {
+  var outlineView = document.getElementById('outlineView');
+//  while (outlineView.firstChild)
+//    outlineView.removeChild(outlineView.firstChild);
+
+  function bindItemLink(domObj, item) {
+    domObj.href = PDFView.getDestinationHash(item.dest);
+    domObj.onclick = function documentOutlineViewOnclick(e) {
+      PDFView.navigateTo(item.dest);
+      return false;
+    };
+  }
+
+  if (!outline) {
+    var noOutline = document.createElement('div');
+    noOutline.classList.add('noOutline');
+    //noOutline.textContent = mozL10n.get('no_outline', null,
+    //  'No Outline Available');
+    noOutline.textContent = 'No Outline Available';
+    //outlineView.appendChild(noOutline);
+    return;
+  }
+
+  var queue = [{parent: outlineView, items: outline}];
+  while (queue.length > 0) {
+    var levelData = queue.shift();
+    var i, n = levelData.items.length;
+    for (i = 0; i < n; i++) {
+      var item = levelData.items[i];
+      var div = document.createElement('div');
+      div.className = 'outlineItem';
+      var a = document.createElement('a');
+      bindItemLink(a, item);
+      a.textContent = item.title;
+      div.appendChild(a);
+
+      if (item.items.length > 0) {
+        var itemsDiv = document.createElement('div');
+        itemsDiv.className = 'outlineItems';
+        div.appendChild(itemsDiv);
+        queue.push({parent: itemsDiv, items: item.items});
+      }
+
+      levelData.parent.appendChild(div);
+    }
+  }
+};
+
+// optimised CSS custom property getter/setter
+var CustomStyle = (function CustomStyleClosure() {
+
+  // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
+  //              animate-css-transforms-firefox-webkit.html
+  // in some versions of IE9 it is critical that ms appear in this list
+  // before Moz
+  var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
+  var _cache = { };
+
+  function CustomStyle() {
+  }
+
+  CustomStyle.getProp = function get(propName, element) {
+    // check cache only when no element is given
+    if (arguments.length == 1 && typeof _cache[propName] == 'string') {
+      return _cache[propName];
+    }
+
+    element = element || document.documentElement;
+    var style = element.style, prefixed, uPropName;
+
+    // test standard property first
+    if (typeof style[propName] == 'string') {
+      return (_cache[propName] = propName);
+    }
+
+    // capitalize
+    uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
+
+    // test vendor specific properties
+    for (var i = 0, l = prefixes.length; i < l; i++) {
+      prefixed = prefixes[i] + uPropName;
+      if (typeof style[prefixed] == 'string') {
+        return (_cache[propName] = prefixed);
+      }
+    }
+
+    //if all fails then set to undefined
+    return (_cache[propName] = 'undefined');
+  }
+
+  CustomStyle.setProp = function set(propName, element, str) {
+    var prop = this.getProp(propName);
+    if (prop != 'undefined')
+      element.style[prop] = str;
+  }
+
+  return CustomStyle;
+})();
+
+var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
+  this.textLayerDiv = textLayerDiv;
+
+  this.beginLayout = function textLayerBuilderBeginLayout() {
+    this.textDivs = [];
+    this.textLayerQueue = [];
+  };
+
+  this.endLayout = function textLayerBuilderEndLayout() {
+    var self = this;
+    var textDivs = this.textDivs;
+    var textLayerDiv = this.textLayerDiv;
+    var renderTimer = null;
+    var renderingDone = false;
+    var renderInterval = 0;
+    var resumeInterval = 500; // in ms
+
+    // Render the text layer, one div at a time
+    function renderTextLayer() {
+      if (textDivs.length === 0) {
+        clearInterval(renderTimer);
+        renderingDone = true;
+        return;
+      }
+      var textDiv = textDivs.shift();
+      if (textDiv.dataset.textLength > 0) {
+        textLayerDiv.appendChild(textDiv);
+
+        if (textDiv.dataset.textLength > 1) { // avoid div by zero
+          // Adjust div width to match canvas text
+          // Due to the .offsetWidth calls, this is slow
+          // This needs to come after appending to the DOM
+          var textScale = textDiv.dataset.canvasWidth / textDiv.offsetWidth;
+          CustomStyle.setProp('transform' , textDiv,
+            'scale(' + textScale + ', 1)');
+          CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
+        }
+      } // textLength > 0
+    }
+    renderTimer = setInterval(renderTextLayer, renderInterval);
+
+    // Stop rendering when user scrolls. Resume after XXX milliseconds
+    // of no scroll events
+    var scrollTimer = null;
+    function textLayerOnScroll() {
+      if (renderingDone) {
+        window.removeEventListener('scroll', textLayerOnScroll, false);
+        return;
+      }
+
+      // Immediately pause rendering
+      clearInterval(renderTimer);
+
+      clearTimeout(scrollTimer);
+      scrollTimer = setTimeout(function textLayerScrollTimer() {
+        // Resume rendering
+        renderTimer = setInterval(renderTextLayer, renderInterval);
+      }, resumeInterval);
+    }; // textLayerOnScroll
+
+    window.addEventListener('scroll', textLayerOnScroll, false);
+  }; // endLayout
+
+  this.appendText = function textLayerBuilderAppendText(text,
+                                                        fontName, fontSize) {
+    var textDiv = document.createElement('div');
+
+    // vScale and hScale already contain the scaling to pixel units
+    var fontHeight = fontSize * text.geom.vScale;
+    textDiv.dataset.canvasWidth = text.canvasWidth * text.geom.hScale;
+    textDiv.dataset.fontName = fontName;
+
+    textDiv.style.fontSize = fontHeight + 'px';
+    textDiv.style.left = text.geom.x + 'px';
+    textDiv.style.top = (text.geom.y - fontHeight) + 'px';
+    textDiv.textContent = PDFJS.bidi(text, -1);
+    textDiv.dir = text.direction;
+    textDiv.dataset.textLength = text.length;
+    this.textDivs.push(textDiv);
+  };
+};
+
+window.addEventListener('load', function webViewerLoad(evt) {
+  PDFView.initialize();
+  var params = PDFView.parseQueryString(document.location.search.substring(1));
+
+  var file = PDFJS.isFirefoxExtension ?
+              window.location.toString() : params.file || kDefaultURL;
+
+/*  if (PDFJS.isFirefoxExtension || !window.File || !window.FileReader ||
+      !window.FileList || !window.Blob) {
+    document.getElementById('openFile').setAttribute('hidden', 'true');
+  } else {
+    document.getElementById('fileInput').value = null;
+  }
+*/
+  // Special debugging flags in the hash section of the URL.
+  var hash = document.location.hash.substring(1);
+  var hashParams = PDFView.parseQueryString(hash);
+
+  if ('disableWorker' in hashParams)
+    PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
+
+/*  if (!PDFJS.isFirefoxExtension) {
+    var locale = navigator.language;
+    if ('locale' in hashParams)
+      locale = hashParams['locale'];
+    mozL10n.language.code = locale;
+  }
+*/
+  if ('disableTextLayer' in hashParams)
+    PDFJS.disableTextLayer = (hashParams['disableTextLayer'] === 'true');
+
+  if ('pdfBug' in hashParams &&
+      (!PDFJS.isFirefoxExtension || FirefoxCom.requestSync('pdfBugEnabled'))) {
+    PDFJS.pdfBug = true;
+    var pdfBug = hashParams['pdfBug'];
+    var enabled = pdfBug.split(',');
+    PDFBug.enable(enabled);
+    PDFBug.init();
+  }
+
+/*  if (!PDFJS.isFirefoxExtension ||
+    (PDFJS.isFirefoxExtension && FirefoxCom.requestSync('searchEnabled'))) {
+    document.querySelector('#viewSearch').classList.remove('hidden');
+  }
+*/
+  // Listen for warnings to trigger the fallback UI.  Errors should be caught
+  // and call PDFView.error() so we don't need to listen for those.
+  PDFJS.LogManager.addLogger({
+    warn: function() {
+      PDFView.fallback();
+    }
+  });
+
+//  var thumbsView = document.getElementById('thumbnailView');
+//  thumbsView.addEventListener('scroll', updateThumbViewArea, true);
+/*
+  var mainContainer = document.getElementById('mainContainer');
+  var outerContainer = document.getElementById('outerContainer');
+  mainContainer.addEventListener('transitionend', function(e) {
+    if (e.target == mainContainer) {
+      var event = document.createEvent('UIEvents');
+      event.initUIEvent('resize', false, false, window, 0);
+      window.dispatchEvent(event);
+      outerContainer.classList.remove('sidebarMoving');
+    }
+  }, true);
+
+  document.getElementById('sidebarToggle').addEventListener('click',
+    function() {
+      this.classList.toggle('toggled');
+      outerContainer.classList.add('sidebarMoving');
+      outerContainer.classList.toggle('sidebarOpen');
+      updateThumbViewArea();
+    });
+
+  PDFView.open(file, 0);
+*/
+}, true);
+
+/**
+ * Render the next not yet visible page already such that it is
+ * hopefully ready once the user scrolls to it.
+ */
+function preDraw() {
+  var pages = PDFView.pages;
+  var visible = PDFView.getVisiblePages();
+  var last = visible[visible.length - 1];
+  // PageView.id is the actual page number, which is + 1 compared
+  // to the index in `pages`. That means, pages[last.id] is the next
+  // PageView instance.
+  if (pages[last.id] && pages[last.id].drawingRequired()) {
+    renderingQueue.enqueueDraw(pages[last.id]);
+    return;
+  }
+  // If there is nothing to draw on the next page, maybe the user
+  // is scrolling up, so, let's try to render the next page *before*
+  // the first visible page
+  if (pages[visible[0].id - 2]) {
+    renderingQueue.enqueueDraw(pages[visible[0].id - 2]);
+  }
+}
+
+function updateViewarea() {
+  if (!PDFView.initialized)
+    return;
+  var visiblePages = PDFView.getVisiblePages();
+  var pageToDraw;
+  for (var i = 0; i < visiblePages.length; i++) {
+    var page = visiblePages[i];
+    var pageObj = PDFView.pages[page.id - 1];
+
+    pageToDraw |= pageObj.drawingRequired();
+    renderingQueue.enqueueDraw(pageObj);
+  }
+
+  if (!visiblePages.length)
+    return;
+
+  // If there is no need to draw a page that is currenlty visible, preDraw the
+  // next page the user might scroll to.
+  if (!pageToDraw) {
+    preDraw();
+  }
+
+  updateViewarea.inProgress = true; // used in "set page"
+  var currentId = PDFView.page;
+  var firstPage = visiblePages[0];
+  PDFView.page = firstPage.id;
+  updateViewarea.inProgress = false;
+
+  var currentScale = PDFView.currentScale;
+  var currentScaleValue = PDFView.currentScaleValue;
+  var normalizedScaleValue = currentScaleValue == currentScale ?
+    currentScale * 100 : currentScaleValue;
+
+  var pageNumber = firstPage.id;
+  var pdfOpenParams = '#page=' + pageNumber;
+  pdfOpenParams += '&zoom=' + normalizedScaleValue;
+  var currentPage = PDFView.pages[pageNumber - 1];
+  var topLeft = currentPage.getPagePoint(PDFView.container.scrollLeft,
+    (PDFView.container.scrollTop - firstPage.y));
+  pdfOpenParams += ',' + Math.round(topLeft[0]) + ',' + Math.round(topLeft[1]);
+
+  var store = PDFView.store;
+  store.set('exists', true);
+  store.set('page', pageNumber);
+  store.set('zoom', normalizedScaleValue);
+  store.set('scrollLeft', Math.round(topLeft[0]));
+  store.set('scrollTop', Math.round(topLeft[1]));
+//  var href = PDFView.getAnchorUrl(pdfOpenParams);
+//  document.getElementById('viewBookmark').href = href;
+}
+
+window.addEventListener('scroll', function webViewerScroll(evt) {
+  updateViewarea();
+}, true);
+
+var thumbnailTimer;
+
+function updateThumbViewArea() {
+  // Only render thumbs after pausing scrolling for this amount of time
+  // (makes UI more responsive)
+  var delay = 50; // in ms
+
+  if (thumbnailTimer)
+    clearTimeout(thumbnailTimer);
+
+  thumbnailTimer = setTimeout(function() {
+    var visibleThumbs = PDFView.getVisibleThumbs();
+    for (var i = 0; i < visibleThumbs.length; i++) {
+      var thumb = visibleThumbs[i];
+      renderingQueue.enqueueDraw(PDFView.thumbnails[thumb.id - 1]);
+    }
+  }, delay);
+}
+
+window.addEventListener('resize', function webViewerResize(evt) {
+  if (PDFView.initialized &&
+      (document.getElementById('pageWidthOption').selected ||
+      document.getElementById('pageFitOption').selected ||
+      document.getElementById('pageAutoOption').selected))
+      PDFView.parseScale(document.getElementById('scaleSelect').value);
+  updateViewarea();
+});
+
+window.addEventListener('hashchange', function webViewerHashchange(evt) {
+  PDFView.setHash(document.location.hash.substring(1));
+});
+
+window.addEventListener('change', function webViewerChange(evt) {
+  var files = evt.target.files;
+  if (!files || files.length == 0)
+    return;
+
+  // Read the local file into a Uint8Array.
+  var fileReader = new FileReader();
+  fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
+    var data = evt.target.result;
+    var buffer = new ArrayBuffer(data.length);
+    var uint8Array = new Uint8Array(buffer);
+
+    for (var i = 0; i < data.length; i++)
+      uint8Array[i] = data.charCodeAt(i);
+
+    PDFView.open(uint8Array, 0);
+  };
+
+  // Read as a binary string since "readAsArrayBuffer" is not yet
+  // implemented in Firefox.
+  var file = files[0];
+  fileReader.readAsBinaryString(file);
+  document.title = file.name;
+
+  // URL does not reflect proper document location - hiding some icons.
+  document.getElementById('viewBookmark').setAttribute('hidden', 'true');
+  document.getElementById('download').setAttribute('hidden', 'true');
+}, true);
+
+function selectScaleOption(value) {
+  var options = document.getElementById('scaleSelect').options;
+  var predefinedValueFound = false;
+  for (var i = 0; i < options.length; i++) {
+    var option = options[i];
+    if (option.value != value) {
+      option.selected = false;
+      continue;
+    }
+    option.selected = true;
+    predefinedValueFound = true;
+  }
+  return predefinedValueFound;
+}
+
+window.addEventListener('localized', function localized(evt) {
+  document.getElementsByTagName('html')[0].dir = mozL10n.language.direction;
+}, true);
+
+window.addEventListener('scalechange', function scalechange(evt) {
+  var customScaleOption = document.getElementById('customScaleOption');
+  customScaleOption.selected = false;
+
+  if (!evt.resetAutoSettings &&
+       (document.getElementById('pageWidthOption').selected ||
+        document.getElementById('pageFitOption').selected ||
+        document.getElementById('pageAutoOption').selected)) {
+      updateViewarea();
+      return;
+  }
+
+  var predefinedValueFound = selectScaleOption('' + evt.scale);
+  if (!predefinedValueFound) {
+    customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
+    customScaleOption.selected = true;
+  }
+
+  updateViewarea();
+}, true);
+
+window.addEventListener('pagechange', function pagechange(evt) {
+  var page = evt.pageNumber;
+  if (document.getElementById('pageNumber').value != page) {
+    document.getElementById('pageNumber').value = page;
+    var selected = document.querySelector('.thumbnail.selected');
+    if (selected)
+      selected.classList.remove('selected');
+/*
+    var thumbnail = document.getElementById('thumbnailContainer' + page);
+    thumbnail.classList.add('selected');
+    var visibleThumbs = PDFView.getVisibleThumbs();
+    var numVisibleThumbs = visibleThumbs.length;
+    // If the thumbnail isn't currently visible scroll it into view.
+    if (numVisibleThumbs > 0) {
+      var first = visibleThumbs[0].id;
+      // Account for only one thumbnail being visible.
+      var last = numVisibleThumbs > 1 ?
+                  visibleThumbs[numVisibleThumbs - 1].id : first;
+      if (page <= first || page >= last)
+        thumbnail.scrollIntoView();
+    }
+*/
+  }
+  document.getElementById('previous').disabled = (page <= 1);
+  document.getElementById('next').disabled = (page >= PDFView.pages.length);
+}, true);
+
+// Firefox specific event, so that we can prevent browser from zooming
+window.addEventListener('DOMMouseScroll', function(evt) {
+  if (evt.ctrlKey) {
+    evt.preventDefault();
+
+    var ticks = evt.detail;
+    var direction = (ticks > 0) ? 'zoomOut' : 'zoomIn';
+    for (var i = 0, length = Math.abs(ticks); i < length; i++)
+      PDFView[direction]();
+  }
+}, false);
+
+window.addEventListener('keydown', function keydown(evt) {
+  var handled = false;
+  var cmd = (evt.ctrlKey ? 1 : 0) |
+            (evt.altKey ? 2 : 0) |
+            (evt.shiftKey ? 4 : 0) |
+            (evt.metaKey ? 8 : 0);
+
+  // First, handle the key bindings that are independent whether an input
+  // control is selected or not.
+  if (cmd == 1 || cmd == 8) { // either CTRL or META key.
+    switch (evt.keyCode) {
+      case 61: // FF/Mac '='
+      case 107: // FF '+' and '='
+      case 187: // Chrome '+'
+        PDFView.zoomIn();
+        handled = true;
+        break;
+      case 109: // FF '-'
+      case 189: // Chrome '-'
+        PDFView.zoomOut();
+        handled = true;
+        break;
+      case 48: // '0'
+        PDFView.parseScale(kDefaultScale, true);
+        handled = true;
+        break;
+    }
+  }
+
+  if (handled) {
+    evt.preventDefault();
+    return;
+  }
+
+  // Some shortcuts should not get handled if a control/input element
+  // is selected.
+  var curElement = document.activeElement;
+  if (curElement && curElement.tagName == 'INPUT')
+    return;
+  var controlsElement = document.getElementById('controls');
+  while (curElement) {
+    if (curElement === controlsElement)
+      return; // ignoring if the 'controls' element is focused
+    curElement = curElement.parentNode;
+  }
+
+  if (cmd == 0) { // no control key pressed at all.
+    switch (evt.keyCode) {
+      case 37: // left arrow
+      case 75: // 'k'
+      case 80: // 'p'
+        PDFView.page--;
+        handled = true;
+        break;
+      case 39: // right arrow
+      case 74: // 'j'
+      case 78: // 'n'
+        PDFView.page++;
+        handled = true;
+        break;
+    }
+  }
+
+  if (handled) {
+    evt.preventDefault();
+  }
+});
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 85bbf09362..d98bedc5c0 100644
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -24,21 +24,9 @@ function showPDFviewer(dir,filename){
 		var oldcontent = $("#content").html();
 		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
 		showPDFviewer.lastTitle = document.title;
-		if(!showPDFviewer.loaded){
-			OC.addScript( 'files_pdfviewer', 'pdfjs/build/pdf',function(){
-				OC.addScript( 'files_pdfviewer', 'pdfview',function(){
-					showPDFviewer.loaded=true;
-					PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
-					PDFView.Ptitle = filename;
-					PDFView.open(url,1.00);
-					PDFView.active=true;
-				});
-			});
-		}else{
-			PDFView.Ptitle = filename;
-			PDFView.open(url,1.00);
-			PDFView.active=true;
-		}
+		PDFView.Ptitle = filename;
+		PDFView.open(url,1.00);
+		PDFView.active=true;
 		$("#pageWidthOption").attr("selected","selected");
 		showPDFviewer.shown = true;
 	}
@@ -46,7 +34,6 @@ function showPDFviewer(dir,filename){
 showPDFviewer.shown=false;
 showPDFviewer.oldCode='';
 showPDFviewer.lastTitle='';
-showPDFviewer.loaded=false;
 
 $(document).ready(function(){
 	if(!$.browser.msie){//doesnt work on IE

From 1b6dd6628a690cdbc36855ef5b1ff3926023001b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiesbn@woody.(none)>
Date: Tue, 12 Jun 2012 11:18:34 +0200
Subject: [PATCH 0343/1537] applied patch provided by bug #966 to fix broken
 user specific quota settings

---
 settings/css/settings.css    |   2 +-
 settings/js/users.js         |  12 ++--
 settings/templates/users.php | 110 ++++++++++++++++++++++-------------
 3 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index d408385797..df1e3cfd3c 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,8 +34,8 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:relative; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
+div.quota-select-wrapper { position: relative; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 7c3c3d37b1..f173357749 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -95,9 +95,9 @@ $(document).ready(function(){
 		$(this).children('img').click();
 	});
 	
-	$('select.quota').live('change',function(){
+	$('select.quota, select.quota-user').live('change',function(){
 		var select=$(this);
-		var uid=$(this).parent().parent().data('uid');
+		var uid=$(this).parent().parent().parent().data('uid');
 		var quota=$(this).val();
 		var other=$(this).next();
 		if(quota!='other'){
@@ -110,7 +110,7 @@ $(document).ready(function(){
 			other.focus();
 		}
 	});
-	$('select.quota').each(function(i,select){
+	$('select.quota, select.quota-user').each(function(i,select){
 		$(select).data('previous',$(select).val());
 	})
 	
@@ -207,9 +207,9 @@ $(document).ready(function(){
 					applyMultiplySelect(select);
 					$('#content table tbody').last().append(tr);
 
-					tr.find('select.quota option').attr('selected',null);
-					tr.find('select.quota option').first().attr('selected','selected');
-					tr.find('select.quota').data('previous','default');
+					tr.find('select.quota-user option').attr('selected',null);
+					tr.find('select.quota-user option').first().attr('selected','selected');
+					tr.find('select.quota-user').data('previous','default');
 				}
 			}
 		);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 1951f17a0b..ea3fe777ff 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -12,29 +12,43 @@ foreach($_["groups"] as $group) {
 
 <div id="controls">
 	<form id="newuser">
-		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" />
-		<input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" />
-		<select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
-		<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
-		<?php endforeach;?>
-		</select>
-		<input type="submit" value="<?php echo $l->t('Create')?>" />
+		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+			type="password" id="newuserpassword"
+			placeholder="<?php echo $l->t('Password')?>" /> <select
+			id="newusergroups" data-placeholder="groups"
+			title="<?php echo $l->t('Groups')?>" multiple="multiple">
+			<?php foreach($_["groups"] as $group): ?>
+			<option value="<?php echo $group['name'];?>">
+				<?php echo $group['name'];?>
+			</option>
+			<?php endforeach;?>
+		</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
 	</form>
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
-		<select class='quota'>
-			<?php foreach($_['quota_preset'] as $preset):?>
+		<div class="quota-select-wrapper">
+			<select class='quota'>
+				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
-					<option <?php if($_['default_quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
+				<option
+				<?php if($_['default_quota']==$preset) echo 'selected="selected"';?>
+					value='<?php echo $preset;?>'>
+					<?php echo $preset;?>
+				</option>
 				<?php endif;?>
-			<?php endforeach;?>
-			<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
-				<option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option>
-			<?php endif;?>
-			<option value='other'><?php echo $l->t('Other');?>...</option>
-		</select>
-		<input class='quota-other'></input>
+				<?php endforeach;?>
+				<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+				<option selected="selected"
+					value='<?php echo $_['default_quota'];?>'>
+					<?php echo $_['default_quota'];?>
+				</option>
+				<?php endif;?>
+				<option value='other'>
+					<?php echo $l->t('Other');?>
+					...
+				</option>
+			</select> <input class='quota-other'></input>
+		</div>
 	</div>
 </div>
 
@@ -49,38 +63,52 @@ foreach($_["groups"] as $group) {
 		</tr>
 	</thead>
 	<tbody>
-	<?php foreach($_["users"] as $user): ?>
+		<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php echo $user["name"] ?>">
 			<td class="name"><?php echo $user["name"]; ?></td>
-			<td class="password">
-				<span>●●●●●●●</span>
-				<img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" />
+			<td class="password"><span>●●●●●●●</span> <img class="svg action"
+				src="<?php echo image_path('core','actions/rename.svg')?>"
+				alt="set new password" title="set new password" />
 			</td>
-			<td class="groups">
-				<select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
+			<td class="groups"><select
+				data-username="<?php echo $user['name'] ;?>"
+				data-user-groups="<?php echo $user['groups'] ;?>"
+				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
+				multiple="multiple">
 					<?php foreach($_["groups"] as $group): ?>
-						<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
+					<option value="<?php echo $group['name'];?>">
+						<?php echo $group['name'];?>
+					</option>
 					<?php endforeach;?>
-				</select>
+			</select>
 			</td>
 			<td class="quota">
-				<select class='quota-user'>
-					<?php foreach($_['quota_preset'] as $preset):?>
-						<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
-					<?php endforeach;?>
-					<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
-						<option selected="selected" value='<?php echo $user['quota'];?>'><?php echo $user['quota'];?></option>
-					<?php endif;?>
-					<option value='other'><?php echo $l->t('Other');?>...</option>
-				</select>
-				<input class='quota-other'></input>
+				<div class="quota-select-wrapper">
+					<select class='quota-user'>
+						<?php foreach($_['quota_preset'] as $preset):?>
+						<option
+						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
+							value='<?php echo $preset;?>'>
+							<?php echo $preset;?>
+						</option>
+						<?php endforeach;?>
+						<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
+						<option selected="selected" value='<?php echo $user['quota'];?>'>
+							<?php echo $user['quota'];?>
+						</option>
+						<?php endif;?>
+						<option value='other'>
+							<?php echo $l->t('Other');?>
+							...
+						</option>
+					</select> <input class='quota-other'></input>
+				</div>
 			</td>
-			<td class="remove">
-				<?php if($user['name']!=OC_User::getUser()):?>
-					<img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" />
-				<?php endif;?>
+			<td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
+				alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
+				src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
 			</td>
 		</tr>
-	<?php endforeach; ?>
+		<?php endforeach; ?>
 	</tbody>
 </table>

From b38ce8adfd29f4d5c70d8fc243c8dce24b9f1f25 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 11:39:03 +0200
Subject: [PATCH 0344/1537] committed patch (bug #967) to add missing
 translations for file actions

---
 apps/files/js/fileactions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 0c672cd670..7414c1f339 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -71,7 +71,7 @@ FileActions={
 				}
 				var html='<a href="#" class="action" style="display:none">';
 				if(img) { html+='<img src="'+img+'"/> '; }
-				html += name+'</a>';
+				html += t('files', name) +'</a>';
 				var element=$(html);
 				element.data('action',name);
 				element.click(function(event){
@@ -91,7 +91,7 @@ FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" original-title="Delete" class="action delete" style="display:none" />';
+			var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));

From c44591e27a4f7a2dbe3a9e1cfa5e0ff53404126d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 12 Jun 2012 12:31:28 +0200
Subject: [PATCH 0345/1537] Contacts: Final (for now) fix to encoding probs on
 import.

---
 apps/contacts/lib/vcard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 168e8af3e5..71a874d783 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -131,7 +131,7 @@ class OC_Contacts_VCard{
 		foreach($property->parameters as $key=>&$parameter){
 			if(strtoupper($parameter->name) == 'ENCODING') {
 				if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used?
-					$property->value = str_replace("\r\n", "\n", mb_convert_encoding(quoted_printable_decode($property->value), 'utf-8', 'auto'));
+					$property->value = quoted_printable_decode($property->value);
 					unset($property->parameters[$key]);
 				}
 			} elseif(strtoupper($parameter->name) == 'CHARSET') {
@@ -188,6 +188,7 @@ class OC_Contacts_VCard{
 			if($upgrade && in_array($property->name, $stringprops)) {
 				self::decodeProperty($property);
 			}
+			$property->value = str_replace("\r\n", "\n", iconv(mb_detect_encoding($property->value, 'UTF-8, ISO-8859-1'), 'utf-8', $property->value));
 			if(in_array($property->name, $stringprops)) {
 				$property->value = strip_tags($property->value);
 			}

From f6e7c633a0045b51d22deb2dcba256e44aecbc7b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 14:11:28 +0200
Subject: [PATCH 0346/1537] block slashes only for new files and new folders
 but not for file upload from url (bug #964)

---
 apps/files/js/files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a079deb953..3ba473e023 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -452,7 +452,7 @@ $(document).ready(function() {
 		input.focus();
 		input.change(function(){
 			var name=$(this).val();
-			if(name.indexOf('/')!=-1){
+			if(type != 'web' && name.indexOf('/')!=-1){
 				$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
 				$('#notification').fadeIn();
 				return;

From c9d408ff8cc73a2a58adb7fd3f93b85513d8e17c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 12 Jun 2012 15:56:51 +0200
Subject: [PATCH 0347/1537] automatic cache repeating events after an update

---
 apps/calendar/appinfo/update.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
index ce7f304a49..a26c23f9ad 100644
--- a/apps/calendar/appinfo/update.php
+++ b/apps/calendar/appinfo/update.php
@@ -14,4 +14,9 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
 		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET calendarcolor=? WHERE id=?' );
 		$r = $stmt->execute(array($color,$id));
 	}
+}
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+foreach($calendars as $calendar){
+	OC_Calendar_Repeat::cleancalendar($calendar['id']);
+	OC_Calendar_Repeat::generatecalendar($calendar['id']);
 }
\ No newline at end of file

From 8626f04f5d9e591cf616c7a3b536409319f5718c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 16:27:24 +0200
Subject: [PATCH 0348/1537] Label the delete operation "unshare" for files in
 the "Shared" folder to reduce confusion about the operation.

---
 apps/files/js/fileactions.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 7414c1f339..deec640bc1 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -91,7 +91,11 @@ FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
+			if ($('#dir').val().indexOf('Shared') != -1) {
+				var html='<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" style="display:none" />';
+			} else  {
+				var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
+			}
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));

From 5f80be7664f86115caad1ceac9ea670a7b033029 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 12 Jun 2012 11:36:25 -0400
Subject: [PATCH 0349/1537] Add support for mounting Dropbox in external
 storage UI

---
 apps/files_external/ajax/dropbox.php       | 41 +++++++++++
 apps/files_external/js/dropbox.js          | 53 +++++++++++++
 apps/files_external/js/settings.js         | 86 ++++++++++++----------
 apps/files_external/lib/config.php         |  3 +
 apps/files_external/templates/settings.php |  9 ++-
 5 files changed, 150 insertions(+), 42 deletions(-)
 create mode 100644 apps/files_external/ajax/dropbox.php
 create mode 100644 apps/files_external/js/dropbox.js

diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
new file mode 100644
index 0000000000..5f2ff17e62
--- /dev/null
+++ b/apps/files_external/ajax/dropbox.php
@@ -0,0 +1,41 @@
+<?php
+
+require_once 'Dropbox/autoload.php';
+
+OCP\JSON::checkAppEnabled('files_external');
+OCP\JSON::checkLoggedIn();
+if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
+	$oauth = new Dropbox_OAuth_Curl($_POST['app_key'], $_POST['app_secret']);
+	if (isset($_POST['step'])) {
+		switch ($_POST['step']) {
+			case 1:
+				try {
+					if (isset($_POST['callback'])) {
+						$callback = $_POST['callback'];
+					} else {
+						$callback = null;
+					}
+					$token = $oauth->getRequestToken();
+					OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), 'request_token' => $token['token'], 'request_token_secret' => $token['token_secret'])));
+				} catch (Exception $exception) {
+					OCP\JSON::error(array('data' => array('message' => 'Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.')));
+				}
+				break;
+			case 2:
+				if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) {
+					try {
+						$oauth->setToken($_POST['request_token'], $_POST['request_token_secret']);
+						$token = $oauth->getAccessToken();
+						OCP\JSON::success(array('access_token' => $token['token'], 'access_token_secret' => $token['token_secret']));
+					} catch (Exception $exception) {
+						OCP\JSON::error(array('data' => array('message' => 'Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.')));
+					}
+				}
+				break;
+		}
+	}
+} else {
+	OCP\JSON::error(array('data' => array('message' => 'Please provide a valid Dropbox app key and secret.')));
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
new file mode 100644
index 0000000000..67f3c46a6e
--- /dev/null
+++ b/apps/files_external/js/dropbox.js
@@ -0,0 +1,53 @@
+$(document).ready(function() {
+
+	$('#externalStorage tbody tr').each(function() {
+		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Dropbox') {
+			var app_key = $(this).find('.configuration [data-parameter="app_key"]').val();
+			var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
+			if (app_key == '' && app_secret == '') {
+				$(this).find('.configuration').append('<a class="button dropbox">Grant access</a>');
+			} else  {
+				var pos = window.location.search.indexOf('oauth_token') + 12
+				var token = $(this).find('.configuration [data-parameter="token"]');
+				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
+					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
+					var tr = $(this);
+					$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
+						if (result && result.status == 'success') {
+							$(token).val(result.access_token);
+							$(token_secret).val(result.access_token_secret);
+							OC.MountConfig.saveStorage(tr);
+						} else {
+							OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
+						}
+					});
+				}
+			}
+			return false;
+		}
+	});
+
+	$('.dropbox').live('click', function(event) {
+		event.preventDefault();
+		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
+		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
+		if (app_key != '' && app_secret != '') {
+			var tr = $(this).parent().parent();
+			var token = $(this).parent().find('[data-parameter="token"]');
+			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
+			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: window.location.href }, function(result) {
+				if (result && result.status == 'success') {
+					$(token).val(result.data.request_token);
+					$(token_secret).val(result.data.request_token_secret);
+					OC.MountConfig.saveStorage(tr);
+					window.location = result.data.url;
+				} else {
+					OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
+				}
+			});
+		} else {
+			OC.dialogs.alert('Please provide a valid Dropbox app key and secret.', 'Error configuring Dropbox storage')
+		}
+	});
+
+});
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 38291d5f7e..57188a6a26 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1,40 +1,5 @@
-$(document).ready(function() {
-
-	$('.chzn-select').chosen();
-	
-	$('#selectBackend').live('change', function() {
-		var tr = $(this).parent().parent();
-		$('#externalStorage tbody').last().append($(tr).clone());
-		var selected = $(this).find('option:selected').text();
-		var backendClass = $(this).val();
-		$(this).parent().text(selected);
-		$(tr).find('.backend').data('class', $(this).val());
-		var configurations = $(this).data('configurations');
-		var td = $(tr).find('td.configuration');
-		$.each(configurations, function(backend, parameters) {
-			if (backend == backendClass) {
-				$.each(parameters['configuration'], function(parameter, placeholder) {
-					if (placeholder.indexOf('*') != -1) {
-						td.append('<input type="password" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
-					} else if (placeholder.indexOf('!') != -1) {
-						td.append('<label><input type="checkbox" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>');
-					} else if (placeholder.indexOf('&') != -1) {
-						td.append('<input type="text" class="optional" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
-					} else {
-						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
-					}
-				});
-				return false;
-			}
-		});
-		$('.chz-select').chosen();
-		$(tr).find('td').last().attr('class', 'remove');
-		$(tr).removeAttr('id');
-		$(this).remove();
-	});
-
-	$('#externalStorage td').live('change', function() {
-		var tr = $(this).parent();
+OC.MountConfig={
+	saveStorage:function(tr) {
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if (mountPoint == '') {
 			return false;
@@ -99,6 +64,51 @@ $(document).ready(function() {
 				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 			}
 		}
+	}
+}
+
+$(document).ready(function() {
+
+	$('.chzn-select').chosen();
+	
+	$('#selectBackend').live('change', function() {
+		var tr = $(this).parent().parent();
+		$('#externalStorage tbody').last().append($(tr).clone());
+		var selected = $(this).find('option:selected').text();
+		var backendClass = $(this).val();
+		$(this).parent().text(selected);
+		$(tr).find('.backend').data('class', backendClass);
+		var configurations = $(this).data('configurations');
+		var td = $(tr).find('td.configuration');
+		$.each(configurations, function(backend, parameters) {
+			if (backend == backendClass) {
+				$.each(parameters['configuration'], function(parameter, placeholder) {
+					if (placeholder.indexOf('*') != -1) {
+						td.append('<input type="password" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
+					} else if (placeholder.indexOf('!') != -1) {
+						td.append('<label><input type="checkbox" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>');
+					} else if (placeholder.indexOf('&') != -1) {
+						td.append('<input type="text" class="optional" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
+					} else if (placeholder.indexOf('#') != -1) {
+						td.append('<input type="hidden" data-parameter="'+parameter+'" />');
+					} else {
+						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
+					}
+				});
+				if (parameters['custom']) {
+					OC.addScript('files_external', parameters['custom']);
+				}
+				return false;
+			}
+		});
+		$('.chz-select').chosen();
+		$(tr).find('td').last().attr('class', 'remove');
+		$(tr).removeAttr('id');
+		$(this).remove();
+	});
+
+	$('#externalStorage td').live('change', function() {
+		OC.MountConfig.saveStorage($(this).parent());
 	});
 
 	$('td.remove>img').live('click', function() {
@@ -130,8 +140,6 @@ $(document).ready(function() {
 		$(tr).remove();
 	});
 
-	
-
 	$('#allowUserMounting').bind('change', function() {
 		if (this.checked) {
 			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes');
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 56a61e9ab8..b2ebcd96fc 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -30,15 +30,18 @@ class OC_Mount_Config {
 
 	/**
 	* Get details on each of the external storage backends, used for the mount config UI
+	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded
 	* If the configuration parameter should be secret, add a '*' to the beginning of the value
 	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
 	* If the configuration parameter is optional, add a '&' to the beginning of the value
+	* If the configuration parameter is hidden, add a '#' to the begining of the value
 	* @return array
 	*/
 	public static function getBackends() {
 		return array(
 			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
 			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
+			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret' ), 'custom' => 'dropbox'),
 			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
 			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
 			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root')),
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index af185c2803..a995ee3419 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -35,16 +35,19 @@
 								<?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
 									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
 									<?php if (strpos($placeholder, '*') !== false): ?>
-										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
 									<?php elseif(strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" <?php if ($value == 'true') echo ' checked="checked"'; ?>  /><?php echo substr($placeholder, 1); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
-										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+									<?php elseif (strpos($placeholder, '#') !== false): ?>
+										<input type="hidden" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" />
 									<?php else: ?>
-										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo htmlentities($value); ?>" placeholder="<?php echo $placeholder; ?>" />
+										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo $placeholder; ?>" />
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
+							<?php if (isset($_['backends'][$mount['class']]['custom'])) OCP\Util::addScript('files_external', $_['backends'][$mount['class']]['custom']); ?>
 						<?php endif; ?>
 					</td>
 					<!--<td class="options">

From dc0adbad02f614eb0a94db2732dc893e7cb5aa5a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 12 Jun 2012 19:52:25 +0200
Subject: [PATCH 0350/1537] increase possible size of uri in database - fix
 oc-140

---
 apps/calendar/appinfo/database.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml
index b065ab3f94..5a3ad32dc2 100644
--- a/apps/calendar/appinfo/database.xml
+++ b/apps/calendar/appinfo/database.xml
@@ -81,7 +81,7 @@
     <type>text</type>
     <default></default>
     <notnull>false</notnull>
-    <length>100</length>
+    <length>255</length>
    </field>
 
    <field>
@@ -133,7 +133,7 @@
     <type>text</type>
     <default></default>
     <notnull>false</notnull>
-    <length>100</length>
+    <length>255</length>
    </field>
 
    <field>

From deb2f87556fc850632e52dda42462dedde2304ef Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 12 Jun 2012 19:53:26 +0200
Subject: [PATCH 0351/1537] increase version of calendar app to force db
 upgrade

---
 apps/calendar/appinfo/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
index e6adf3fc7b..267577d47e 100644
--- a/apps/calendar/appinfo/version
+++ b/apps/calendar/appinfo/version
@@ -1 +1 @@
-0.4
\ No newline at end of file
+0.4.1

From 790ae70e321713007863705d4a444edc2e53791e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 12 Jun 2012 15:25:13 -0400
Subject: [PATCH 0352/1537] Create directory for mount point if it doesn't
 already exist

---
 lib/filesystem.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 454bb1aa81..ccbb431975 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -319,6 +319,9 @@ class OC_Filesystem{
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
+		if ($mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
+			self::mkdir(basename($mountpoint));
+		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
 

From 521294d0bf9803cb4ffdc6fb43bd9b9253fece40 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 12 Jun 2012 23:15:44 +0200
Subject: [PATCH 0353/1537] fixes
 http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987

---
 lib/config.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/config.php b/lib/config.php
index e3a9c11f24..9279549b1b 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -170,14 +170,18 @@ class OC_Config{
 		}
 		$content .= ");\n?>\n";
 
+		$filename = OC::$SERVERROOT."/config/config.php";
 		// Write the file
-		$result=@file_put_contents( OC::$SERVERROOT."/config/config.php", $content );
+		$result=@file_put_contents( $filename, $content );
 		if(!$result) {
 			$tmpl = new OC_Template( '', 'error', 'guest' );
 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 			$tmpl->printPage();
 			exit;
 		}
+		// Prevent others not to read the config
+		@chmod($filename, 0640);
+
 		return true;
 	}
 }

From db1353655b1d27c545e438e3d36b0d5889a91668 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 13 Jun 2012 00:32:44 +0200
Subject: [PATCH 0354/1537] check for view before trying to invoke method on
 object

---
 lib/filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index ccbb431975..dd74daffa4 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -319,7 +319,7 @@ class OC_Filesystem{
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
-		if ($mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
+    if (self::getView() != null && $mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
 			self::mkdir(basename($mountpoint));
 		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);

From 6f55a528581f5e6ef830cb107f2cdf756ad2f79e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 12 Jun 2012 21:33:05 -0400
Subject: [PATCH 0355/1537] Fix incorrect creation of filesystem for user@group
 in data folder during shares

---
 apps/files_sharing/lib_share.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index cf5456d704..356c958b6c 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -104,10 +104,6 @@ class OC_Share {
 						$counter++;
 					}
 				}
-				if (isset($gid)) {
-					$uid = $uid."@".$gid;
-				}
-				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
 				// Update mtime of shared folder to invoke a file cache rescan
 				$rootView=new OC_FilesystemView('/');
 				if (!$rootView->is_dir($sharedFolder)) {
@@ -119,6 +115,10 @@ class OC_Share {
 					$rootView->mkdir($sharedFolder);
 				}
 				$rootView->touch($sharedFolder);
+				if (isset($gid)) {
+					$uid = $uid."@".$gid;
+				}
+				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
 			}
 		}
 	}

From b9d5f510c37b3591cb969132d3099561dc55a89f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 13 Jun 2012 17:22:28 +0200
Subject: [PATCH 0356/1537] urlencode link fort password reset (bug #970)

---
 core/lostpassword/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 6bed7bdd93..bd2a3e897e 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -17,7 +17,7 @@ if (isset($_POST['user'])) {
 		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
 		$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
 		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='.$_POST['user'].'&token='.$token;
+			$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);
 			$msg = $tmpl->fetchPage();

From 9e9c40eabd07cc4b44f2a9ae3d7935ad2a07b9fa Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 13 Jun 2012 17:27:49 +0200
Subject: [PATCH 0357/1537] fix time call

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index d1d5983dcf..e4efd953ec 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -409,7 +409,7 @@ class OC_Util {
 		// check if the token is in the user session and if the timestamp is from the last hour.
 		if(isset($_SESSION['requesttoken-'.$token])) {
 			$timestamp=$_SESSION['requesttoken-'.$token];
-			if($timestamp+$maxtime<time){
+			if($timestamp+$maxtime<time()){
 				//token exired. exiting
 				exit;
 

From 89464721c7aa4464419cbcbedc658843f6c4696d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 13 Jun 2012 17:33:19 +0200
Subject: [PATCH 0358/1537] Added JSON methods for CSRF prevention. Make
 request token accessible from template and add js var.

---
 core/templates/layout.user.php | 10 ++++++++
 lib/json.php                   | 12 ++++++++++
 lib/public/json.php            |  7 ++++++
 lib/template.php               |  4 ++++
 lib/util.php                   | 43 +++++++++++++++++-----------------
 5 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e04fcabf13..6f9b02237c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -30,6 +30,16 @@
 				echo '/>';
 			?>
 		<?php endforeach; ?>
+		<script type="text/javascript">
+			$(function() {
+				var requesttoken = '<?php echo $_['requesttoken']; ?>';
+				$(document).bind('ajaxSend', function(elm, xhr, s){
+					if(requesttoken) {
+						xhr.setRequestHeader('requesttoken', requesttoken);
+					}
+				});
+			});
+		</script>
 	</head>
 
 	<body id="<?php echo $_['bodyid'];?>">
diff --git a/lib/json.php b/lib/json.php
index f3bbe9ac89..dfc0a7b894 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -41,6 +41,18 @@ class OC_JSON{
 		}
 	}
 
+	/**
+	 * @brief Check an ajax get/post call if the request token is valid.
+	 * @return json Error msg if not valid.
+	 */
+	public static function callCheck(){
+		if( !OC_Util::isCallRegistered()){
+			$l = OC_L10N::get('core');
+			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.') )));
+			exit();
+		}
+	}
+        
 	/**
 	* Check if the user is a admin, send json error msg if not
 	*/
diff --git a/lib/public/json.php b/lib/public/json.php
index a8554671d1..b6edbd65bd 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -53,6 +53,13 @@ class JSON {
 		return(\OC_JSON::checkLoggedIn());
 	}
 
+	/**
+	 * @brief Check an ajax get/post call if the request token is valid.
+	 * @return json Error msg if not valid.
+	 */
+	public static function callCheck(){
+		return(\OC_JSON::callCheck());
+	}
 
 	/**
 	* @brief Send json success msg
diff --git a/lib/template.php b/lib/template.php
index 14833a1e5b..9ce041a71c 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -155,6 +155,9 @@ class OC_Template{
 		$this->renderas = $renderas;
 		$this->application = $app;
 		$this->vars = array();
+		if($renderas == 'user') {
+			$this->vars['requesttoken'] = OC_Util::callRegister();
+		}
 		$this->l10n = OC_L10N::get($app);
                 header('X-Frame-Options: Sameorigin');
                 header('X-XSS-Protection: 1; mode=block');
@@ -355,6 +358,7 @@ class OC_Template{
 			if( $this->renderas == "user" ){
 				$page = new OC_Template( "core", "layout.user" );
 				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
+				$page->assign('requesttoken', $this->vars['requesttoken']);
 				if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
 					$page->assign('bodyid','body-settings');
 				}else{
diff --git a/lib/util.php b/lib/util.php
index e4efd953ec..0266a8ecc5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -355,8 +355,9 @@ class OC_Util {
 	}
 
 	/**
-	 * Register an get/post call. This is important to prevent CSRF attacks
+	 * @brief Register an get/post call. This is important to prevent CSRF attacks
 	 * Todo: Write howto
+	 * @return $token Generated token.
 	 */
 	public static function callRegister(){
 		//mamimum time before token exires
@@ -381,50 +382,48 @@ class OC_Util {
 				}	
 			}
 		}
-
-
 		// return the token
 		return($token);
 	}
 
 
 	/**
-	 * Check an ajax get/post call if the request token is valid. exit if not.
-	 * Todo: Write howto
+	 * @brief Check an ajax get/post call if the request token is valid.
+	 * @return boolean False if request token is not set or is invalid.
 	 */
-	public static function callCheck(){
+	public static function isCallRegistered(){
 		//mamimum time before token exires
 		$maxtime=(60*60);  // 1 hour
-
-		// searches in the get and post arrays for the token.
 		if(isset($_GET['requesttoken'])) {
 			$token=$_GET['requesttoken'];
 		}elseif(isset($_POST['requesttoken'])){
 			$token=$_POST['requesttoken'];
+		}elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])){
+			$token=$_SERVER['HTTP_REQUESTTOKEN'];
 		}else{
-			//no token found. exiting
-			exit;
+			//no token found.
+			return false;
 		}
-
-		// check if the token is in the user session and if the timestamp is from the last hour.
 		if(isset($_SESSION['requesttoken-'.$token])) {
 			$timestamp=$_SESSION['requesttoken-'.$token];
 			if($timestamp+$maxtime<time()){
-				//token exired. exiting
-				exit;
-
+				return false;
 			}else{
 				//token valid
-				return;
+				return true;
 			}
 		}else{
-			//no token found. exiting
-			exit;
+			return false;
 		}
 	}
 
-
-
-
-
+	/**
+	 * @brief Check an ajax get/post call if the request token is valid. exit if not.
+	 * Todo: Write howto
+	 */
+	public static function callCheck(){
+		if(!OC_Util::isCallRegistered()) {
+			exit;
+		}
+	}
 }

From bc1e8cb0a2ef634949ae520c6aedab435eaf5b80 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 13 Jun 2012 17:35:42 +0200
Subject: [PATCH 0359/1537] Contacts: implemented CSRF prevention.

---
 apps/contacts/ajax/activation.php          |  1 +
 apps/contacts/ajax/addcontact.php          |  1 +
 apps/contacts/ajax/addproperty.php         | 10 ++++++++++
 apps/contacts/ajax/createaddressbook.php   |  1 +
 apps/contacts/ajax/cropphoto.php           |  2 ++
 apps/contacts/ajax/deletebook.php          |  1 +
 apps/contacts/ajax/deletecard.php          | 11 +++++++++++
 apps/contacts/ajax/deleteproperty.php      |  1 +
 apps/contacts/ajax/savecrop.php            |  1 +
 apps/contacts/ajax/saveproperty.php        | 19 +++++++++++++++----
 apps/contacts/ajax/uploadphoto.php         |  2 ++
 apps/contacts/js/contacts.js               |  4 ++--
 apps/contacts/templates/part.contact.php   |  2 ++
 apps/contacts/templates/part.cropphoto.php |  2 ++
 14 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
index 388a3b5438..74cb738ab8 100644
--- a/apps/contacts/ajax/activation.php
+++ b/apps/contacts/ajax/activation.php
@@ -10,6 +10,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 $bookid = $_POST['bookid'];
 $book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index af9b2bbcc0..e45072c954 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -23,6 +23,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 $aid = isset($_POST['aid'])?$_POST['aid']:null;
 if(!$aid) {
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 94e09bac19..c1fca9abea 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -23,6 +23,16 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+foreach($_SERVER as $key=>$value) {
+	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _SERVER: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
+}
+foreach($_POST as $key=>$value) {
+	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _POST: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
+}
+foreach($_GET as $key=>$value) {
+	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _GET: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
+}
+OCP\JSON::callCheck();
 
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index af7c19eef5..616766bb1a 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -11,6 +11,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 $userid = OCP\USER::getUser();
 $name = trim(strip_tags($_POST['name']));
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
index caba7c8c4e..eb9f1fcdb5 100644
--- a/apps/contacts/ajax/cropphoto.php
+++ b/apps/contacts/ajax/cropphoto.php
@@ -25,10 +25,12 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
 $tmpkey = $_GET['tmpkey'];
+$requesttoken = $_GET['requesttoken'];
 $id = $_GET['id'];
 $tmpl = new OCP\Template("contacts", "part.cropphoto");
 $tmpl->assign('tmpkey', $tmpkey);
 $tmpl->assign('id', $id);
+$tmpl->assign('requesttoken', $requesttoken);
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
index fe582daa00..1b86ecf223 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -23,6 +23,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 //$id = $_GET['id'];
 $id = $_POST['id'];
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
index e6d0405a24..2a6bd277d1 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -28,6 +28,17 @@ function bailOut($msg) {
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
+
+// foreach($_SERVER as $key=>$value) {
+// 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _SERVER: '.$key.'=>'.$value, OCP\Util::DEBUG);
+// }
+foreach($_POST as $key=>$value) {
+	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _POST: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
+}
+foreach($_GET as $key=>$value) {
+	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _GET: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
+}
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index e6c2bd9f80..55f7e32308 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -23,6 +23,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 $checksum = $_POST['checksum'];
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index b3aab6a881..6faf6a173d 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -22,6 +22,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index d840073471..c779c49611 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -20,10 +20,6 @@
  *
  */
 
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
@@ -33,6 +29,21 @@ function debug($msg) {
 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
 }
 
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+
+foreach($_SERVER as $key=>$value) {
+	debug('_SERVER: '.$key.'=>'.print_r($value, true));
+}
+foreach($_POST as $key=>$value) {
+	debug('_POST: '.$key.'=>'.print_r($value, true));
+}
+foreach($_GET as $key=>$value) {
+	debug('_GET: '.$key.'=>'.print_r($value, true));
+}
+OCP\JSON::callCheck();
+
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
 $value = isset($_POST['value'])?$_POST['value']:null;
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 32abc6c285..889de6a1f8 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -23,6 +23,8 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
+
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 function bailOut($msg) {
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6b83504c9c..45509a7f9d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -622,7 +622,7 @@ Contacts={
 				q = q + '&id=' + this.id + '&name=' + name;
 				if(checksum != undefined && checksum != '') { // save
 					q = q + '&checksum=' + checksum;
-					//console.log('Saving: ' + q);
+					console.log('Saving: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'saveproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
@@ -640,7 +640,7 @@ Contacts={
 						}
 					},'json');
 				} else { // add
-					//console.log('Adding: ' + q);
+					console.log('Adding: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'addproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index c1ba1ccdc2..ca682baaf8 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -3,6 +3,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 ?>
 <div id="card">
 	<form class="float" id="file_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadphoto.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target">
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
 		<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
 		<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
@@ -23,6 +24,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 	<div id="contact_identity" class="contactsection">
 	<form method="post">
 	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
 	<fieldset id="ident" class="contactpart">
 	<span class="propertycontainer" data-element="N"><input type="hidden" id="n" class="contacts_property" name="value" value="" /></span>
 	<span id="name" class="propertycontainer" data-element="FN">
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index d7f0efc57d..1e025ef4e0 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -1,6 +1,7 @@
 <?php 
 $id = $_['id'];
 $tmpkey = $_['tmpkey'];
+$csrf_token = $_GET['csrf_token'];
 OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 ?>
 <script language="Javascript">
@@ -48,6 +49,7 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey,
 	action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
 
 	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
+	<input type="hidden" name="requesttoken" value="<?php echo $csrf_token; ?>">
 	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
 	<fieldset id="coords">
 	<input type="hidden" id="x1" name="x1" value="" />

From d33d599b1b05d7c267fed48cabe63461cd62db9f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 13 Jun 2012 18:57:12 +0200
Subject: [PATCH 0360/1537] Remove debug statements.

---
 apps/contacts/ajax/addproperty.php  |  9 ---------
 apps/contacts/ajax/saveproperty.php | 10 ----------
 2 files changed, 19 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index c1fca9abea..f888b94e38 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -23,15 +23,6 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-foreach($_SERVER as $key=>$value) {
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _SERVER: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
-}
-foreach($_POST as $key=>$value) {
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _POST: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
-}
-foreach($_GET as $key=>$value) {
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _GET: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
-}
 OCP\JSON::callCheck();
 
 function bailOut($msg) {
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index c779c49611..6ee9ec90b5 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -32,16 +32,6 @@ function debug($msg) {
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-
-foreach($_SERVER as $key=>$value) {
-	debug('_SERVER: '.$key.'=>'.print_r($value, true));
-}
-foreach($_POST as $key=>$value) {
-	debug('_POST: '.$key.'=>'.print_r($value, true));
-}
-foreach($_GET as $key=>$value) {
-	debug('_GET: '.$key.'=>'.print_r($value, true));
-}
 OCP\JSON::callCheck();
 
 $id = isset($_POST['id'])?$_POST['id']:null;

From 613a122437a5fff0eb8c502719f8203ea0a61e81 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 13 Jun 2012 19:03:34 +0200
Subject: [PATCH 0361/1537] Remove check for encryption.

---
 apps/contacts/templates/part.importaddressbook.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
index 0e2956ddaf..01f8dd77d0 100644
--- a/apps/contacts/templates/part.importaddressbook.php
+++ b/apps/contacts/templates/part.importaddressbook.php
@@ -7,10 +7,6 @@
  */
 ?>
 <td id="importaddressbook_dialog" colspan="6">
-<?php 
-if(OCP\App::isEnabled('files_encryption')) { 
-	echo '<strong>'.$l->t('Currently this import function doesn\'t work while encryption is enabled.<br />Please upload your VCF file with the file manager and click on it to import.').'</strong>';
-} else { ?>
 <table>
 <tr>
 	<th><?php echo $l->t('Select address book to import to:') ?></th>
@@ -33,7 +29,6 @@ if(OCP\App::isEnabled('files_encryption')) {
 
 <input id="close_button" style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this);" value="<?php echo $l->t("Cancel"); ?>">
 <iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
-<?php } ?>
 </td>
 <script type="text/javascript">
 $(document).ready(function(){

From bd01e9346941fa85b4bb96a42cecdbc50e51c368 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 13 Jun 2012 13:54:32 -0400
Subject: [PATCH 0362/1537] Add support for mounting Google Drive in external
 storage UI

---
 3rdparty/Google/LICENSE.txt         |  21 +
 3rdparty/Google/OAuth.php           | 751 ++++++++++++++++++++++++++++
 3rdparty/Google/common.inc.php      | 185 +++++++
 apps/files_external/ajax/google.php |  51 ++
 apps/files_external/js/google.js    |  48 ++
 apps/files_external/lib/config.php  |   3 +-
 apps/files_external/lib/google.php  |   2 +-
 7 files changed, 1059 insertions(+), 2 deletions(-)
 create mode 100644 3rdparty/Google/LICENSE.txt
 create mode 100755 3rdparty/Google/OAuth.php
 create mode 100755 3rdparty/Google/common.inc.php
 create mode 100644 apps/files_external/ajax/google.php
 create mode 100644 apps/files_external/js/google.js

diff --git a/3rdparty/Google/LICENSE.txt b/3rdparty/Google/LICENSE.txt
new file mode 100644
index 0000000000..8891c7ddc9
--- /dev/null
+++ b/3rdparty/Google/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2007 Andy Smith
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/3rdparty/Google/OAuth.php b/3rdparty/Google/OAuth.php
new file mode 100755
index 0000000000..c7e75dd826
--- /dev/null
+++ b/3rdparty/Google/OAuth.php
@@ -0,0 +1,751 @@
+<?php
+// vim: foldmethod=marker
+
+/* Generic exception class
+ */
+class OAuthException extends Exception {/*{{{*/
+  // pass
+}/*}}}*/
+
+class OAuthConsumer {/*{{{*/
+  public $key;
+  public $secret;
+
+  public function __construct($key, $secret, $callback_url=NULL) {/*{{{*/
+    $this->key = $key;
+    $this->secret = $secret;
+    $this->callback_url = $callback_url;
+  }/*}}}*/
+}/*}}}*/
+
+class OAuthToken {/*{{{*/
+  // access tokens and request tokens
+  public $key;
+  public $secret;
+
+  /**
+   * key = the token
+   * secret = the token secret
+   */
+  function __construct($key, $secret) {/*{{{*/
+    $this->key = $key;
+    $this->secret = $secret;
+  }/*}}}*/
+
+  /**
+   * generates the basic string serialization of a token that a server
+   * would respond to request_token and access_token calls with
+   */
+  function to_string() {/*{{{*/
+    return "oauth_token=" . OAuthUtil::urlencodeRFC3986($this->key) . 
+        "&oauth_token_secret=" . OAuthUtil::urlencodeRFC3986($this->secret);
+  }/*}}}*/
+
+  function __toString() {/*{{{*/
+    return $this->to_string();
+  }/*}}}*/
+}/*}}}*/
+
+class OAuthSignatureMethod {/*{{{*/
+  public function check_signature(&$request, $consumer, $token, $signature) {
+    $built = $this->build_signature($request, $consumer, $token);
+    return $built == $signature;
+  }
+}/*}}}*/
+
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {/*{{{*/
+  function get_name() {/*{{{*/
+    return "HMAC-SHA1";
+  }/*}}}*/
+
+  public function build_signature($request, $consumer, $token, $privKey=NULL) {/*{{{*/
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    $key_parts = array(
+      $consumer->secret,
+      ($token) ? $token->secret : ""
+    );
+
+    $key_parts = array_map(array('OAuthUtil','urlencodeRFC3986'), $key_parts);
+    $key = implode('&', $key_parts);
+
+    return base64_encode( hash_hmac('sha1', $base_string, $key, true));
+  }/*}}}*/
+}/*}}}*/
+
+class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {/*{{{*/
+  public function get_name() {/*{{{*/
+    return "RSA-SHA1";
+  }/*}}}*/
+
+  protected function fetch_public_cert(&$request) {/*{{{*/
+    // not implemented yet, ideas are:
+    // (1) do a lookup in a table of trusted certs keyed off of consumer
+    // (2) fetch via http using a url provided by the requester
+    // (3) some sort of specific discovery code based on request
+    //
+    // either way should return a string representation of the certificate
+    throw Exception("fetch_public_cert not implemented");
+  }/*}}}*/
+
+  protected function fetch_private_cert($privKey) {//&$request) {/*{{{*/
+    // not implemented yet, ideas are:
+    // (1) do a lookup in a table of trusted certs keyed off of consumer
+    //
+    // either way should return a string representation of the certificate
+    throw Exception("fetch_private_cert not implemented");
+  }/*}}}*/
+
+  public function build_signature(&$request, $consumer, $token, $privKey) {/*{{{*/
+    $base_string = $request->get_signature_base_string();
+
+    // Fetch the private key cert based on the request
+    //$cert = $this->fetch_private_cert($consumer->privKey);
+
+    //Pull the private key ID from the certificate
+    //$privatekeyid = openssl_get_privatekey($cert);
+
+    // hacked in 
+    if ($privKey == '') {
+      $fp = fopen($GLOBALS['PRIV_KEY_FILE'], "r");
+      $privKey = fread($fp, 8192);
+      fclose($fp); 
+    }
+    $privatekeyid = openssl_get_privatekey($privKey);
+
+    //Check the computer signature against the one passed in the query
+    $ok = openssl_sign($base_string, $signature, $privatekeyid);   
+
+    //Release the key resource
+    openssl_free_key($privatekeyid);
+
+    return base64_encode($signature);
+  } /*}}}*/
+
+  public function check_signature(&$request, $consumer, $token, $signature) {/*{{{*/
+    $decoded_sig = base64_decode($signature);
+
+    $base_string = $request->get_signature_base_string();
+
+    // Fetch the public key cert based on the request
+    $cert = $this->fetch_public_cert($request);
+
+    //Pull the public key ID from the certificate
+    $publickeyid = openssl_get_publickey($cert);
+
+    //Check the computer signature against the one passed in the query
+    $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);   
+
+    //Release the key resource
+    openssl_free_key($publickeyid);
+
+    return $ok == 1;
+  } /*}}}*/
+}/*}}}*/
+
+class OAuthRequest {/*{{{*/
+  private $parameters;
+  private $http_method;
+  private $http_url;
+  // for debug purposes
+  public $base_string;
+  public static $version = '1.0';
+
+  function __construct($http_method, $http_url, $parameters=NULL) {/*{{{*/
+    @$parameters or $parameters = array();
+    $this->parameters = $parameters;
+    $this->http_method = $http_method;
+    $this->http_url = $http_url;
+  }/*}}}*/
+
+
+  /**
+   * attempt to build up a request from what was passed to the server
+   */
+  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {/*{{{*/
+    $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
+    @$http_url or $http_url = $scheme . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
+
+    $request_headers = OAuthRequest::get_headers();
+
+    // let the library user override things however they'd like, if they know
+    // which parameters to use then go for it, for example XMLRPC might want to
+    // do this
+    if ($parameters) {
+      $req = new OAuthRequest($http_method, $http_url, $parameters);
+    }
+    // next check for the auth header, we need to do some extra stuff
+    // if that is the case, namely suck in the parameters from GET or POST
+    // so that we can include them in the signature
+    else if (@substr($request_headers['Authorization'], 0, 5) == "OAuth") {
+      $header_parameters = OAuthRequest::split_header($request_headers['Authorization']);
+      if ($http_method == "GET") {
+        $req_parameters = $_GET;
+      } 
+      else if ($http_method = "POST") {
+        $req_parameters = $_POST;
+      } 
+      $parameters = array_merge($header_parameters, $req_parameters);
+      $req = new OAuthRequest($http_method, $http_url, $parameters);
+    }
+    else if ($http_method == "GET") {
+      $req = new OAuthRequest($http_method, $http_url, $_GET);
+    }
+    else if ($http_method == "POST") {
+      $req = new OAuthRequest($http_method, $http_url, $_POST);
+    }
+    return $req;
+  }/*}}}*/
+
+  /**
+   * pretty much a helper function to set up the request
+   */
+  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {/*{{{*/
+    @$parameters or $parameters = array();
+    $defaults = array("oauth_version" => OAuthRequest::$version,
+                      "oauth_nonce" => OAuthRequest::generate_nonce(),
+                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+                      "oauth_consumer_key" => $consumer->key);
+    $parameters = array_merge($defaults, $parameters);
+
+    if ($token) {
+      $parameters['oauth_token'] = $token->key;
+    }
+
+    // oauth v1.0a
+    /*if (isset($_REQUEST['oauth_verifier'])) {
+      $parameters['oauth_verifier'] = $_REQUEST['oauth_verifier'];
+    }*/
+
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }/*}}}*/
+
+  public function set_parameter($name, $value) {/*{{{*/
+    $this->parameters[$name] = $value;
+  }/*}}}*/
+
+  public function get_parameter($name) {/*{{{*/
+    return $this->parameters[$name];
+  }/*}}}*/
+
+  public function get_parameters() {/*{{{*/
+    return $this->parameters;
+  }/*}}}*/
+
+  /**
+   * Returns the normalized parameters of the request
+   * 
+   * This will be all (except oauth_signature) parameters,
+   * sorted first by key, and if duplicate keys, then by
+   * value.
+   *
+   * The returned string will be all the key=value pairs
+   * concated by &.
+   * 
+   * @return string
+   */
+  public function get_signable_parameters() {/*{{{*/
+    // Grab all parameters
+    $params = $this->parameters;
+		
+    // Remove oauth_signature if present
+    if (isset($params['oauth_signature'])) {
+      unset($params['oauth_signature']);
+    }
+		
+    // Urlencode both keys and values
+    $keys = array_map(array('OAuthUtil', 'urlencodeRFC3986'), array_keys($params));
+    $values = array_map(array('OAuthUtil', 'urlencodeRFC3986'), array_values($params));
+    $params = array_combine($keys, $values);
+
+    // Sort by keys (natsort)
+    uksort($params, 'strnatcmp');
+
+if(isset($params['title']) && isset($params['title-exact'])) {
+    $temp = $params['title-exact'];
+    $title = $params['title'];
+
+    unset($params['title']);
+    unset($params['title-exact']);
+
+    $params['title-exact'] = $temp;
+    $params['title'] = $title;
+}
+
+    // Generate key=value pairs
+    $pairs = array();
+    foreach ($params as $key=>$value ) {
+      if (is_array($value)) {
+        // If the value is an array, it's because there are multiple 
+        // with the same key, sort them, then add all the pairs
+        natsort($value);
+        foreach ($value as $v2) {
+          $pairs[] = $key . '=' . $v2;
+        }
+      } else {
+        $pairs[] = $key . '=' . $value;
+      }
+    }
+		
+    // Return the pairs, concated with &
+    return implode('&', $pairs);
+  }/*}}}*/
+
+  /**
+   * Returns the base string of this request
+   *
+   * The base string defined as the method, the url
+   * and the parameters (normalized), each urlencoded
+   * and the concated with &.
+   */
+  public function get_signature_base_string() {/*{{{*/
+    $parts = array(
+      $this->get_normalized_http_method(),
+      $this->get_normalized_http_url(),
+      $this->get_signable_parameters()
+    );
+
+    $parts = array_map(array('OAuthUtil', 'urlencodeRFC3986'), $parts);
+
+    return implode('&', $parts);
+  }/*}}}*/
+
+  /**
+   * just uppercases the http method
+   */
+  public function get_normalized_http_method() {/*{{{*/
+    return strtoupper($this->http_method);
+  }/*}}}*/
+
+/**
+   * parses the url and rebuilds it to be
+   * scheme://host/path
+   */
+  public function get_normalized_http_url() {
+    $parts = parse_url($this->http_url);
+
+    $scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http';
+    $port = (isset($parts['port'])) ? $parts['port'] : (($scheme == 'https') ? '443' : '80');
+    $host = (isset($parts['host'])) ? strtolower($parts['host']) : '';
+    $path = (isset($parts['path'])) ? $parts['path'] : '';
+
+    if (($scheme == 'https' && $port != '443')
+        || ($scheme == 'http' && $port != '80')) {
+      $host = "$host:$port";
+    }
+    return "$scheme://$host$path";
+  }
+
+  /**
+   * builds a url usable for a GET request
+   */
+  public function to_url() {/*{{{*/
+    $out = $this->get_normalized_http_url() . "?";
+    $out .= $this->to_postdata();
+    return $out;
+  }/*}}}*/
+
+  /**
+   * builds the data one would send in a POST request
+   */
+  public function to_postdata() {/*{{{*/
+    $total = array();
+    foreach ($this->parameters as $k => $v) {
+      $total[] = OAuthUtil::urlencodeRFC3986($k) . "=" . OAuthUtil::urlencodeRFC3986($v);
+    }
+    $out = implode("&", $total);
+    return $out;
+  }/*}}}*/
+
+  /**
+   * builds the Authorization: header
+   */
+  public function to_header() {/*{{{*/
+    $out ='Authorization: OAuth ';
+    $total = array();
+    
+    /*
+    $sig = $this->parameters['oauth_signature'];  
+    unset($this->parameters['oauth_signature']); 
+    uksort($this->parameters, 'strnatcmp');  
+    $this->parameters['oauth_signature'] = $sig;
+    */
+    
+    foreach ($this->parameters as $k => $v) {
+      if (substr($k, 0, 5) != "oauth") continue;
+      $out .= OAuthUtil::urlencodeRFC3986($k) . '="' . OAuthUtil::urlencodeRFC3986($v) . '", ';
+    }
+    $out = substr_replace($out, '', strlen($out) - 2);
+    
+    return $out;
+  }/*}}}*/
+
+  public function __toString() {/*{{{*/
+    return $this->to_url();
+  }/*}}}*/
+
+
+  public function sign_request($signature_method, $consumer, $token, $privKey=NULL) {/*{{{*/
+    $this->set_parameter("oauth_signature_method", $signature_method->get_name());
+    $signature = $this->build_signature($signature_method, $consumer, $token, $privKey);
+    $this->set_parameter("oauth_signature", $signature);
+  }/*}}}*/
+
+  public function build_signature($signature_method, $consumer, $token, $privKey=NULL) {/*{{{*/
+    $signature = $signature_method->build_signature($this, $consumer, $token, $privKey);
+    return $signature;
+  }/*}}}*/
+
+  /**
+   * util function: current timestamp
+   */
+  private static function generate_timestamp() {/*{{{*/
+    return time();
+  }/*}}}*/
+
+  /**
+   * util function: current nonce
+   */
+  private static function generate_nonce() {/*{{{*/
+    $mt = microtime();
+    $rand = mt_rand();
+
+    return md5($mt . $rand); // md5s look nicer than numbers
+  }/*}}}*/
+
+  /**
+   * util function for turning the Authorization: header into
+   * parameters, has to do some unescaping
+   */
+  private static function split_header($header) {/*{{{*/
+    // this should be a regex
+    // error cases: commas in parameter values
+    $parts = explode(",", $header);
+    $out = array();
+    foreach ($parts as $param) {
+      $param = ltrim($param);
+      // skip the "realm" param, nobody ever uses it anyway
+      if (substr($param, 0, 5) != "oauth") continue;
+
+      $param_parts = explode("=", $param);
+
+      // rawurldecode() used because urldecode() will turn a "+" in the
+      // value into a space
+      $out[$param_parts[0]] = rawurldecode(substr($param_parts[1], 1, -1));
+    }
+    return $out;
+  }/*}}}*/
+
+  /**
+   * helper to try to sort out headers for people who aren't running apache
+   */
+  private static function get_headers() {/*{{{*/
+    if (function_exists('apache_request_headers')) {
+      // we need this to get the actual Authorization: header
+      // because apache tends to tell us it doesn't exist
+      return apache_request_headers();
+    }
+    // otherwise we don't have apache and are just going to have to hope
+    // that $_SERVER actually contains what we need
+    $out = array();
+    foreach ($_SERVER as $key => $value) {
+      if (substr($key, 0, 5) == "HTTP_") {
+        // this is chaos, basically it is just there to capitalize the first
+        // letter of every word that is not an initial HTTP and strip HTTP
+        // code from przemek
+        $key = str_replace(" ", "-", ucwords(strtolower(str_replace("_", " ", substr($key, 5)))));
+        $out[$key] = $value;
+      }
+    }
+    return $out;
+  }/*}}}*/
+}/*}}}*/
+
+class OAuthServer {/*{{{*/
+  protected $timestamp_threshold = 300; // in seconds, five minutes
+  protected $version = 1.0;             // hi blaine
+  protected $signature_methods = array();
+
+  protected $data_store;
+
+  function __construct($data_store) {/*{{{*/
+    $this->data_store = $data_store;
+  }/*}}}*/
+
+  public function add_signature_method($signature_method) {/*{{{*/
+    $this->signature_methods[$signature_method->get_name()] = 
+        $signature_method;
+  }/*}}}*/
+
+  // high level functions
+
+  /**
+   * process a request_token request
+   * returns the request token on success
+   */
+  public function fetch_request_token(&$request) {/*{{{*/
+    $this->get_version($request);
+
+    $consumer = $this->get_consumer($request);
+
+    // no token required for the initial token request
+    $token = NULL;
+
+    $this->check_signature($request, $consumer, $token);
+
+    $new_token = $this->data_store->new_request_token($consumer);
+
+    return $new_token;
+  }/*}}}*/
+
+  /**
+   * process an access_token request
+   * returns the access token on success
+   */
+  public function fetch_access_token(&$request) {/*{{{*/
+    $this->get_version($request);
+
+    $consumer = $this->get_consumer($request);
+
+    // requires authorized request token
+    $token = $this->get_token($request, $consumer, "request");
+
+    $this->check_signature($request, $consumer, $token);
+
+    $new_token = $this->data_store->new_access_token($token, $consumer);
+
+    return $new_token;
+  }/*}}}*/
+
+  /**
+   * verify an api call, checks all the parameters
+   */
+  public function verify_request(&$request) {/*{{{*/
+    $this->get_version($request);
+    $consumer = $this->get_consumer($request);
+    $token = $this->get_token($request, $consumer, "access");
+    $this->check_signature($request, $consumer, $token);
+    return array($consumer, $token);
+  }/*}}}*/
+
+  // Internals from here
+  /**
+   * version 1
+   */
+  private function get_version(&$request) {/*{{{*/
+    $version = $request->get_parameter("oauth_version");
+    if (!$version) {
+      $version = 1.0;
+    }
+    if ($version && $version != $this->version) {
+      throw new OAuthException("OAuth version '$version' not supported");
+    }
+    return $version;
+  }/*}}}*/
+
+  /**
+   * figure out the signature with some defaults
+   */
+  private function get_signature_method(&$request) {/*{{{*/
+    $signature_method =  
+        @$request->get_parameter("oauth_signature_method");
+    if (!$signature_method) {
+      $signature_method = "PLAINTEXT";
+    }
+    if (!in_array($signature_method, 
+                  array_keys($this->signature_methods))) {
+      throw new OAuthException(
+        "Signature method '$signature_method' not supported try one of the following: " . implode(", ", array_keys($this->signature_methods))
+      );      
+    }
+    return $this->signature_methods[$signature_method];
+  }/*}}}*/
+
+  /**
+   * try to find the consumer for the provided request's consumer key
+   */
+  private function get_consumer(&$request) {/*{{{*/
+    $consumer_key = @$request->get_parameter("oauth_consumer_key");
+    if (!$consumer_key) {
+      throw new OAuthException("Invalid consumer key");
+    }
+
+    $consumer = $this->data_store->lookup_consumer($consumer_key);
+    if (!$consumer) {
+      throw new OAuthException("Invalid consumer");
+    }
+
+    return $consumer;
+  }/*}}}*/
+
+  /**
+   * try to find the token for the provided request's token key
+   */
+  private function get_token(&$request, $consumer, $token_type="access") {/*{{{*/
+    $token_field = @$request->get_parameter('oauth_token');
+    $token = $this->data_store->lookup_token(
+      $consumer, $token_type, $token_field
+    );
+    if (!$token) {
+      throw new OAuthException("Invalid $token_type token: $token_field");
+    }
+    return $token;
+  }/*}}}*/
+
+  /**
+   * all-in-one function to check the signature on a request
+   * should guess the signature method appropriately
+   */
+  private function check_signature(&$request, $consumer, $token) {/*{{{*/
+    // this should probably be in a different method
+    $timestamp = @$request->get_parameter('oauth_timestamp');
+    $nonce = @$request->get_parameter('oauth_nonce');
+
+    $this->check_timestamp($timestamp);
+    $this->check_nonce($consumer, $token, $nonce, $timestamp);
+
+    $signature_method = $this->get_signature_method($request);
+
+    $signature = $request->get_parameter('oauth_signature');    
+    $valid_sig = $signature_method->check_signature(
+      $request, 
+      $consumer, 
+      $token, 
+      $signature
+    );
+
+    if (!$valid_sig) {
+      throw new OAuthException("Invalid signature");
+    }
+  }/*}}}*/
+
+  /**
+   * check that the timestamp is new enough
+   */
+  private function check_timestamp($timestamp) {/*{{{*/
+    // verify that timestamp is recentish
+    $now = time();
+    if ($now - $timestamp > $this->timestamp_threshold) {
+      throw new OAuthException("Expired timestamp, yours $timestamp, ours $now");
+    }
+  }/*}}}*/
+
+  /**
+   * check that the nonce is not repeated
+   */
+  private function check_nonce($consumer, $token, $nonce, $timestamp) {/*{{{*/
+    // verify that the nonce is uniqueish
+    $found = $this->data_store->lookup_nonce($consumer, $token, $nonce, $timestamp);
+    if ($found) {
+      throw new OAuthException("Nonce already used: $nonce");
+    }
+  }/*}}}*/
+
+
+
+}/*}}}*/
+
+class OAuthDataStore {/*{{{*/
+  function lookup_consumer($consumer_key) {/*{{{*/
+    // implement me
+  }/*}}}*/
+
+  function lookup_token($consumer, $token_type, $token) {/*{{{*/
+    // implement me
+  }/*}}}*/
+
+  function lookup_nonce($consumer, $token, $nonce, $timestamp) {/*{{{*/
+    // implement me
+  }/*}}}*/
+
+  function fetch_request_token($consumer) {/*{{{*/
+    // return a new token attached to this consumer
+  }/*}}}*/
+
+  function fetch_access_token($token, $consumer) {/*{{{*/
+    // return a new access token attached to this consumer
+    // for the user associated with this token if the request token
+    // is authorized
+    // should also invalidate the request token
+  }/*}}}*/
+
+}/*}}}*/
+
+
+/*  A very naive dbm-based oauth storage
+ */
+class SimpleOAuthDataStore extends OAuthDataStore {/*{{{*/
+  private $dbh;
+
+  function __construct($path = "oauth.gdbm") {/*{{{*/
+    $this->dbh = dba_popen($path, 'c', 'gdbm');
+  }/*}}}*/
+
+  function __destruct() {/*{{{*/
+    dba_close($this->dbh);
+  }/*}}}*/
+
+  function lookup_consumer($consumer_key) {/*{{{*/
+    $rv = dba_fetch("consumer_$consumer_key", $this->dbh);
+    if ($rv === FALSE) {
+      return NULL;
+    }
+    $obj = unserialize($rv);
+    if (!($obj instanceof OAuthConsumer)) {
+      return NULL;
+    }
+    return $obj;
+  }/*}}}*/
+
+  function lookup_token($consumer, $token_type, $token) {/*{{{*/
+    $rv = dba_fetch("${token_type}_${token}", $this->dbh);
+    if ($rv === FALSE) {
+      return NULL;
+    }
+    $obj = unserialize($rv);
+    if (!($obj instanceof OAuthToken)) {
+      return NULL;
+    }
+    return $obj;
+  }/*}}}*/
+
+  function lookup_nonce($consumer, $token, $nonce, $timestamp) {/*{{{*/
+    return dba_exists("nonce_$nonce", $this->dbh);
+  }/*}}}*/
+
+  function new_token($consumer, $type="request") {/*{{{*/
+    $key = md5(time());
+    $secret = time() + time();
+    $token = new OAuthToken($key, md5(md5($secret)));
+    if (!dba_insert("${type}_$key", serialize($token), $this->dbh)) {
+      throw new OAuthException("doooom!");
+    }
+    return $token;
+  }/*}}}*/
+
+  function new_request_token($consumer) {/*{{{*/
+    return $this->new_token($consumer, "request");
+  }/*}}}*/
+
+  function new_access_token($token, $consumer) {/*{{{*/
+
+    $token = $this->new_token($consumer, 'access');
+    dba_delete("request_" . $token->key, $this->dbh);
+    return $token;
+  }/*}}}*/
+}/*}}}*/
+
+class OAuthUtil {/*{{{*/
+  public static function urlencodeRFC3986($string) {/*{{{*/
+    return str_replace('%7E', '~', rawurlencode($string));
+  }/*}}}*/
+    
+  public static function urldecodeRFC3986($string) {/*{{{*/
+    return rawurldecode($string);
+  }/*}}}*/
+}/*}}}*/
+
+?>
\ No newline at end of file
diff --git a/3rdparty/Google/common.inc.php b/3rdparty/Google/common.inc.php
new file mode 100755
index 0000000000..57185cdc4d
--- /dev/null
+++ b/3rdparty/Google/common.inc.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (c) 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Author: Eric Bidelman <e.bidelman@google.com>
+ */
+
+$PRIV_KEY_FILE = '/path/to/your/rsa_private_key.pem';
+
+// OAuth library - http://oauth.googlecode.com/svn/code/php/
+require_once('OAuth.php');
+
+// Google's accepted signature methods
+$hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
+$rsa_method = new OAuthSignatureMethod_RSA_SHA1();
+$SIG_METHODS = array($rsa_method->get_name() => $rsa_method,
+                     $hmac_method->get_name() => $hmac_method);
+
+/**
+ * Makes an HTTP request to the specified URL
+ *
+ * @param string $http_method The HTTP method (GET, POST, PUT, DELETE)
+ * @param string $url Full URL of the resource to access
+ * @param array $extraHeaders (optional) Additional headers to include in each
+ *     request. Elements are header/value pair strings ('Host: example.com')
+ * @param string $postData (optional) POST/PUT request body
+ * @param bool $returnResponseHeaders True if resp. headers should be returned.
+ * @return string Response body from the server
+ */
+function send_signed_request($http_method, $url, $extraHeaders=null,
+                             $postData=null, $returnResponseHeaders=true) {
+  $curl = curl_init($url);
+  curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($curl, CURLOPT_FAILONERROR, false);
+  curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+
+  // Return request headers in the reponse
+//   curl_setopt($curl, CURLINFO_HEADER_OUT, true);
+
+  // Return response headers ni the response?
+  if ($returnResponseHeaders) {
+    curl_setopt($curl, CURLOPT_HEADER, true);
+  }
+
+  $headers = array();
+  //$headers[] = 'GData-Version: 2.0';  // use GData v2 by default
+  if (is_array($extraHeaders)) {
+    $headers = array_merge($headers, $extraHeaders);
+  }
+
+  // Setup default curl options for each type of HTTP request.
+  // This is also a great place to add additional headers for each request.
+  switch($http_method) {
+    case 'GET':
+      curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+      break;
+    case 'POST':
+      curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+      curl_setopt($curl, CURLOPT_POST, 1);
+      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+      break;
+    case 'PUT':
+      $headers[] = 'If-Match: *';
+      curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $http_method);
+      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+      break;
+    case 'DELETE':
+      $headers[] = 'If-Match: *';
+      curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $http_method);
+      break;
+    default:
+      curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+  }
+
+  // Execute the request.  If an error occures, fill the response body with it.
+  $response = curl_exec($curl);
+  if (!$response) {
+    $response = curl_error($curl);
+  }
+
+  // Add server's response headers to our response body
+ $response = curl_getinfo($curl, CURLINFO_HEADER_OUT) . $response;
+
+  curl_close($curl);
+
+  return $response;
+}
+
+/**
+* Takes XML as a string and returns it nicely indented
+*
+* @param string $xml The xml to beautify
+* @param boolean $html_output True if returned XML should be escaped for HTML.
+* @return string The beautified xml
+*/
+function xml_pretty_printer($xml, $html_output=false) {
+  $xml_obj = new SimpleXMLElement($xml);
+  $level = 2;
+
+  // Get an array containing each XML element
+  $xml = explode("\n", preg_replace('/>\s*</', ">\n<", $xml_obj->asXML()));
+
+  // Hold current indentation level
+  $indent = 0;
+
+  $pretty = array();
+
+  // Shift off opening XML tag if present
+  if (count($xml) && preg_match('/^<\?\s*xml/', $xml[0])) {
+    $pretty[] = array_shift($xml);
+  }
+
+  foreach ($xml as $el) {
+    if (preg_match('/^<([\w])+[^>\/]*>$/U', $el)) {
+      // opening tag, increase indent
+      $pretty[] = str_repeat(' ', $indent) . $el;
+      $indent += $level;
+    } else {
+      if (preg_match('/^<\/.+>$/', $el)) {
+        $indent -= $level;  // closing tag, decrease indent
+      }
+      if ($indent < 0) {
+        $indent += $level;
+      }
+      $pretty[] = str_repeat(' ', $indent) . $el;
+    }
+  }
+
+  $xml = implode("\n", $pretty);
+  return $html_output ? htmlentities($xml) : $xml;
+}
+
+/**
+ * Joins key/value pairs by $inner_glue and each pair together by $outer_glue.
+ *
+ * Example: implode_assoc('=', '&', array('a' => 1, 'b' => 2)) === 'a=1&b=2'
+ *
+ * @param string $inner_glue What to implode each key/value pair with
+ * @param string $outer_glue What to impode each key/value string subset with
+ * @param array $array Associative array of query parameters
+ * @return string Urlencoded string of query parameters
+ */
+function implode_assoc($inner_glue, $outer_glue, $array) {
+  $output = array();
+  foreach($array as $key => $item) {
+    $output[] = $key . $inner_glue . urlencode($item);
+  }
+  return implode($outer_glue, $output);
+}
+
+/**
+ * Explodes a string of key/value url parameters into an associative array.
+ * This method performs the compliment operations of implode_assoc().
+ *
+ * Example: explode_assoc('=', '&', 'a=1&b=2') === array('a' => 1, 'b' => 2)
+ *
+ * @param string $inner_glue What each key/value pair is joined with
+ * @param string $outer_glue What each set of key/value pairs is joined with.
+ * @param array $array Associative array of query parameters
+ * @return array Urlencoded string of query parameters
+ */
+function explode_assoc($inner_glue, $outer_glue, $params) {
+  $tempArr = explode($outer_glue, $params);
+  foreach($tempArr as $val) {
+    $pos = strpos($val, $inner_glue);
+    $key = substr($val, 0, $pos);
+    $array2[$key] = substr($val, $pos + 1, strlen($val));
+  }
+  return $array2;
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
new file mode 100644
index 0000000000..23ecfc3708
--- /dev/null
+++ b/apps/files_external/ajax/google.php
@@ -0,0 +1,51 @@
+<?php
+
+require_once 'Google/common.inc.php';
+
+OCP\JSON::checkAppEnabled('files_external');
+OCP\JSON::checkLoggedIn();
+$consumer = new OAuthConsumer('anonymous', 'anonymous');
+$sigMethod = new OAuthSignatureMethod_HMAC_SHA1();
+if (isset($_POST['step'])) {
+	switch ($_POST['step']) {
+		case 1:
+			if (isset($_POST['callback'])) {
+				$callback = $_POST['callback'];
+			} else {
+				$callback = null;
+			}
+			$scope = 'https://docs.google.com/feeds/ https://docs.googleusercontent.com/ https://spreadsheets.google.com/feeds/';
+			$url = 'https://www.google.com/accounts/OAuthGetRequestToken?scope='.urlencode($scope);
+			$params = array('scope' => $scope, 'oauth_callback' => $callback);
+			$request = OAuthRequest::from_consumer_and_token($consumer, null, 'GET', $url, $params);
+			$request->sign_request($sigMethod, $consumer, null);
+			$response = send_signed_request('GET', $url, array($request->to_header()), null, false);
+			$token = array();
+			parse_str($response, $token);
+			if (isset($token['oauth_token']) && isset($token['oauth_token_secret'])) {
+				$authUrl = 'https://www.google.com/accounts/OAuthAuthorizeToken?oauth_token='.$token['oauth_token'];
+				OCP\JSON::success(array('data' => array('url' => $authUrl, 'request_token' => $token['oauth_token'], 'request_token_secret' => $token['oauth_token_secret'])));
+			} else {
+				OCP\JSON::error(array('data' => array('message' => 'Fetching request tokens failed. Error: '.$response)));
+			}
+			break;
+		case 2:
+			if (isset($_POST['oauth_verifier']) && isset($_POST['request_token']) && isset($_POST['request_token_secret'])) {
+				$token = new OAuthToken($_POST['request_token'], $_POST['request_token_secret']);
+				$url = 'https://www.google.com/accounts/OAuthGetAccessToken';
+				$request = OAuthRequest::from_consumer_and_token($consumer, $token, 'GET', $url, array('oauth_verifier' => $_POST['oauth_verifier']));
+				$request->sign_request($sigMethod, $consumer, $token);
+				$response = send_signed_request('GET', $url, array($request->to_header()), null, false);
+				$token = array();
+				parse_str($response, $token);
+				if (isset($token['oauth_token']) && isset($token['oauth_token_secret'])) {
+					OCP\JSON::success(array('access_token' => $token['oauth_token'], 'access_token_secret' => $token['oauth_token_secret']));
+				} else {
+					OCP\JSON::error(array('data' => array('message' => 'Fetching access tokens failed. Error: '.$response)));
+				}
+			}
+			break;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
new file mode 100644
index 0000000000..0d65cfda01
--- /dev/null
+++ b/apps/files_external/js/google.js
@@ -0,0 +1,48 @@
+$(document).ready(function() {
+	
+	$('#externalStorage tbody tr').each(function() {
+		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Google') {
+			var token = $(this).find('[data-parameter="token"]');
+			var token_secret = $(this).find('[data-parameter="token_secret"]');
+			if ($(token).val() == '' && $(token).val() == '') {
+				$(this).find('.configuration').append('<a class="button google">Grant access</a>');
+			} else  {
+				var params = {};
+				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
+					params[key] = value;
+				});
+				if (params['oauth_token'].length > 1 && decodeURIComponent(params['oauth_token']) == $(token).val() && params['oauth_verifier'].length > 1) {
+					var tr = $(this);
+					$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
+						if (result && result.status == 'success') {
+							$(token).val(result.access_token);
+							$(token_secret).val(result.access_token_secret);
+							OC.MountConfig.saveStorage(tr);
+						} else {
+							OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
+						}
+					});
+				}
+			}
+			return false;
+		}
+	});
+	
+	$('.google').live('click', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		var token = $(this).parent().find('[data-parameter="token"]');
+		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
+		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: window.location.href }, function(result) {
+			if (result && result.status == 'success') {
+				$(token).val(result.data.request_token);
+				$(token_secret).val(result.data.request_token_secret);
+				OC.MountConfig.saveStorage(tr);
+				window.location = result.data.url;
+			} else {
+				OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
+			}
+		});
+	});
+	
+});
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index b2ebcd96fc..870c13b5ae 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -41,8 +41,9 @@ class OC_Mount_Config {
 		return array(
 			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
 			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
-			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret' ), 'custom' => 'dropbox'),
+			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret'), 'custom' => 'dropbox'),
 			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
+			'OC_Filestorage_Google' => array('backend' => 'Google Drive', 'configuration' => array('token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),
 			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
 			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root')),
 			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index d2285a6d82..c2a4af0ff8 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -20,7 +20,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-require_once 'common.inc.php';
+require_once 'Google/common.inc.php';
 
 class OC_Filestorage_Google extends OC_Filestorage_Common {
 

From 4da6b3a3916ce4d986275a1f7f90e7fb0984b822 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 13 Jun 2012 09:05:00 +0200
Subject: [PATCH 0363/1537] Calendar: Make button of #datecontrol_date

---
 apps/calendar/js/calendar.js         | 2 +-
 apps/calendar/templates/calendar.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 7ae4a3a6eb..0d44722abb 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -845,7 +845,7 @@ $(document).ready(function(){
 		dayNamesShort: dayNamesShort,
 		allDayText: allDayText,
 		viewDisplay: function(view) {
-			$('#datecontrol_date').html(view.title);
+			$('#datecontrol_date').val(view.title);
 			if (view.name != defaultView) {
 				$.post(OC.filePath('calendar', 'ajax', 'changeview.php'), {v:view.name});
 				defaultView = view.name;
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index b0cb20f2f1..2246a0178e 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -46,7 +46,7 @@
 					</form>
 					<form id="datecontrol">
 						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
-						<span class="button" id="datecontrol_date"></span>
+						<input type="button" value="" id="datecontrol_date"/>
 						<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
 					</form>
 				</div>

From 7a8e7f18dbb473552c1427c24402104d9bc181a4 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 13 Jun 2012 09:05:35 +0200
Subject: [PATCH 0364/1537] Calendar: Clicking #datecontrol_date gives
 datepicker to jump to date

---
 apps/calendar/js/calendar.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 0d44722abb..1cbe5c6764 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -845,7 +845,7 @@ $(document).ready(function(){
 		dayNamesShort: dayNamesShort,
 		allDayText: allDayText,
 		viewDisplay: function(view) {
-			$('#datecontrol_date').val(view.title);
+			$('#datecontrol_date').val($('<p>').html(view.title).text());
 			if (view.name != defaultView) {
 				$.post(OC.filePath('calendar', 'ajax', 'changeview.php'), {v:view.name});
 				defaultView = view.name;
@@ -884,6 +884,22 @@ $(document).ready(function(){
 		loading: Calendar.UI.loading,
 		eventSources: eventSources
 	});
+	$('#datecontrol_date').datepicker({
+		changeMonth: true,
+		changeYear: true,
+		showButtonPanel: true,
+		beforeShow: function(input, inst) {
+			var calendar_holder = $('#calendar_holder');
+			var date = calendar_holder.fullCalendar('getDate');
+			inst.input.datepicker('setDate', date);
+			inst.input.val(calendar_holder.fullCalendar('getView').title);
+			return inst;
+		},
+		onSelect: function(value, inst) {
+			var date = inst.input.datepicker('getDate');
+			$('#calendar_holder').fullCalendar('gotoDate', date);
+		}
+	});
 	fillWindow($('#content'));
 	OCCategories.changed = Calendar.UI.categoriesChanged;
 	OCCategories.app = 'calendar';

From 61b044e00e8f0bf155f57d71924efb66547ccbf5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 13 Jun 2012 21:16:14 +0200
Subject: [PATCH 0365/1537] Files Texteditor: Use our own "Droid Sans Mono"
 font-face and fonts

---
 apps/files_texteditor/appinfo/app.php         |   1 +
 .../DroidSansMono/DroidSansMono-webfont.eot   | Bin 0 -> 78034 bytes
 .../DroidSansMono/DroidSansMono-webfont.svg   | 630 ++++++++++++++++++
 .../DroidSansMono/DroidSansMono-webfont.ttf   | Bin 0 -> 77800 bytes
 .../DroidSansMono/DroidSansMono-webfont.woff  | Bin 0 -> 46192 bytes
 .../DroidSansMono/Google Android License.txt  |  18 +
 .../css/DroidSansMono/demo.html               |  33 +
 .../css/DroidSansMono/stylesheet.css          |  15 +
 apps/files_texteditor/js/aceeditor/ace.js     |   3 +-
 9 files changed, 698 insertions(+), 2 deletions(-)
 create mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot
 create mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
 create mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf
 create mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff
 create mode 100644 apps/files_texteditor/css/DroidSansMono/Google Android License.txt
 create mode 100644 apps/files_texteditor/css/DroidSansMono/demo.html
 create mode 100644 apps/files_texteditor/css/DroidSansMono/stylesheet.css

diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php
index a08077ebb6..c745170018 100644
--- a/apps/files_texteditor/appinfo/app.php
+++ b/apps/files_texteditor/appinfo/app.php
@@ -1,5 +1,6 @@
 <?php
 //load the required files
+OCP\Util::addStyle( 'files_texteditor', 'DroidSansMono/stylesheet' );
 OCP\Util::addStyle( 'files_texteditor', 'style' );
 OCP\Util::addscript( 'files_texteditor', 'editor');
 OCP\Util::addscript( 'files_texteditor', 'aceeditor/ace');
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot
new file mode 100644
index 0000000000000000000000000000000000000000..bc2d524aa76ff0076e9ccb518ead122edbded050
GIT binary patch
literal 78034
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
AWB>pF

literal 0
HcmV?d00001

diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
new file mode 100644
index 0000000000..4ca5fc20dc
--- /dev/null
+++ b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
@@ -0,0 +1,630 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright   : Digitized data copyright  2006 Google Corporation
+Foundry     : Ascender Corporation
+Foundry URL : httpwwwascendercorpcom
+</metadata>
+<defs>
+<font id="webfontq63XZdUr" horiz-adv-x="1228" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="500" />
+<glyph unicode=" " />
+<glyph unicode="!" d="M487 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM504 1462h223l-51 -1048h-121z" />
+<glyph unicode="&#x22;" d="M285 1462h237l-41 -528h-155zM707 1462h237l-41 -528h-155z" />
+<glyph unicode="#" d="M45 428v137h244l65 328h-233v137h258l82 432h147l-82 -432h293l84 432h144l-84 -432h221v-137h-248l-64 -328h240v-137h-266l-82 -428h-148l84 428h-290l-82 -428h-144l78 428h-217zM436 565h291l64 328h-291z" />
+<glyph unicode="$" d="M182 172v172q197 -92 365 -92v434q-197 66 -271 145q-78 84 -77 220q0 131 92 217q90 84 256 106v180h137v-176q182 -8 336 -78l-66 -145q-143 63 -270 72v-422q199 -68 279 -148q82 -82 81 -211q0 -281 -360 -335v-230h-137v221q-228 0 -365 70zM375 1049q0 -76 41 -121 q41 -43 131 -74v369q-172 -27 -172 -174zM684 262q184 28 184 184q0 127 -184 189v-373z" />
+<glyph unicode="%" d="M0 1133q0 164 80 256q78 90 215 90q131 0 211 -92.5t80 -253.5q0 -166 -78 -256q-80 -92 -217 -93q-131 0 -211 95q-80 96 -80 254zM152 1133q0 -229 141 -230q139 0 139 230q0 225 -139 225q-141 0 -141 -225zM170 0l729 1462h158l-729 -1462h-158zM643 330 q0 164 80 256q78 90 215 90q131 0 211 -92t80 -254q0 -164 -78 -254q-82 -94 -217 -94q-131 0 -211 94q-80 96 -80 254zM795 330q0 -229 141 -230q139 0 139 230q0 225 -139 225q-141 0 -141 -225z" />
+<glyph unicode="&#x26;" d="M61 381q0 133 64 229q63 98 235 199q-164 193 -163 356q0 147 96 233.5t274 86.5q168 0 260.5 -86t92.5 -234q0 -203 -318 -389l281 -348q70 119 104 266h184q-53 -236 -178 -403l234 -291h-217l-131 166q-174 -186 -412 -186q-190 0 -297 106q-109 109 -109 295z M252 387q0 -104 67 -176q68 -70 160 -70q162 0 299 146l-323 401q-203 -123 -203 -301zM375 1165q0 -117 133 -268q133 80 184 139q49 57 49 133q0 72 -49 119q-51 47 -131 47q-86 0 -137 -45q-49 -43 -49 -125z" />
+<glyph unicode="'" d="M496 1462h237l-41 -528h-155z" />
+<glyph unicode="(" d="M295 567q0 532 444 895h193q-449 -375 -449 -893q0 -522 447 -893h-191q-444 352 -444 891z" />
+<glyph unicode=")" d="M297 1462h192q444 -362 445 -895q0 -541 -445 -891h-190q446 373 446 893q1 518 -448 893z" />
+<glyph unicode="*" d="M133 1081l29 193l391 -111l-43 393h205l-43 -393l397 111l27 -193l-379 -28l246 -326l-179 -96l-176 358l-157 -358l-185 96l242 326z" />
+<glyph unicode="+" d="M152 647v150h387v389h149v-389h387v-150h-387v-385h-149v385h-387z" />
+<glyph unicode="," d="M440 -289q76 322 111 551h219l16 -24q-59 -229 -194 -527h-152z" />
+<glyph unicode="-" d="M285 465v168h659v-168h-659z" />
+<glyph unicode="." d="M463 135q0 166 151.5 166t151.5 -166t-151.5 -166t-151.5 166z" />
+<glyph unicode="/" d="M211 0l627 1462h178l-627 -1462h-178z" />
+<glyph unicode="0" d="M147 733q0 752 465 752q231 0 350 -192.5t119 -559.5q0 -754 -469 -753q-231 0 -348 194q-117 193 -117 559zM332 733q0 -317 67 -459q68 -139 213 -139q147 0 215 141q70 145 70 457q0 309 -70 455q-68 141 -215 141q-145 0 -213 -139q-67 -138 -67 -457z" />
+<glyph unicode="1" d="M225 1163l383 299h150v-1462h-176v913q0 147 8 361q-43 -47 -121 -113l-147 -121z" />
+<glyph unicode="2" d="M158 0v156l350 381q201 219 258 317q61 104 61 231q0 115 -63 179q-66 66 -172 65q-162 0 -318 -137l-102 119q190 172 422 172q197 0 305 -107q113 -109 113 -284q0 -115 -59.5 -244t-290.5 -375l-281 -299v-8h688v-166h-911z" />
+<glyph unicode="3" d="M131 59v170q186 -96 383 -96q354 0 354 289q0 258 -381 258h-133v151h133q160 0 248 76t88 201q0 104 -67 162q-70 59 -183 59q-176 0 -344 -121l-92 125q186 150 436 150q205 0 322 -99q115 -96 115 -264q0 -141 -82 -231q-86 -94 -234 -119v-6q360 -45 361 -348 q0 -203 -137 -320q-138 -117 -400 -116q-243 -1 -387 79z" />
+<glyph unicode="4" d="M61 328v159l664 983h188v-976h213v-166h-213v-328h-176v328h-676zM240 494h497v356q0 178 13 432h-9q-41 -111 -90 -180z" />
+<glyph unicode="5" d="M172 59v172q145 -96 360 -96q336 0 336 314q0 295 -344 294q-78 0 -231 -26l-90 57l55 688h690v-166h-532l-39 -419q102 20 209 20q209 0 340 -115q129 -114 129 -313q0 -233 -137 -363q-135 -127 -390 -126q-224 -1 -356 79z" />
+<glyph unicode="6" d="M154 625q0 858 639 858q104 0 172 -19v-155q-71 25 -166 24q-221 0 -336 -141t-123 -447h12q96 170 307 170q195 0 306 -118q111 -120 110 -326q0 -227 -121 -360q-119 -131 -323 -131q-219 0 -348 170t-129 475zM336 506q0 -150 82 -262q80 -111 211 -111q129 0 198 88 q72 90 72 250q0 147 -68 223q-68 78 -196 78q-125 0 -213 -82q-86 -80 -86 -184z" />
+<glyph unicode="7" d="M143 1296v166h940v-145l-555 -1317h-194l563 1296h-754z" />
+<glyph unicode="8" d="M156 373q0 258 282 393q-236 150 -235 369q0 160 116 256q115 94 295 94q184 0 297 -94q115 -96 115 -258q0 -229 -262 -359q309 -160 309 -393q0 -180 -127 -291q-126 -111 -332 -110q-217 0 -337.5 104.5t-120.5 288.5zM334 371q0 -240 276 -240q135 0 211 66 q74 66 74 182q0 90 -63.5 159.5t-213.5 143.5l-30 14q-254 -118 -254 -325zM381 1126q0 -92 49 -153q47 -57 186 -125q231 104 232 278q0 102 -64 154q-66 53 -172 53q-104 0 -167.5 -53.5t-63.5 -153.5z" />
+<glyph unicode="9" d="M154 991q0 227 120 361q119 131 324 131q221 0 348 -170q129 -172 129 -475q0 -858 -639 -858q-104 0 -172 18v156q68 -25 166 -25q221 0 336 141.5t123 446.5h-12q-96 -170 -308 -170q-193 0 -305 119q-110 116 -110 325zM330 991q0 -143 69 -223q68 -78 195 -78 q129 0 213 82q86 84 86 184q0 152 -80 262.5t-213 110.5q-127 0 -198.5 -88t-71.5 -250z" />
+<glyph unicode=":" d="M487 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM487 987q0 139 127 139t127 -139t-127 -139t-127 139z" />
+<glyph unicode=";" d="M410 -264q66 276 100 502h199l14 -23q-55 -209 -176 -479h-137zM494 987q0 139 127 139t127 -139t-127 -139t-127 139z" />
+<glyph unicode="&#x3c;" d="M152 672v102l923 451v-160l-715 -342l715 -342v-160z" />
+<glyph unicode="=" d="M152 442v150h923v-150h-923zM152 852v149h923v-149h-923z" />
+<glyph unicode="&#x3e;" d="M152 221v160l714 342l-714 342v160l923 -451v-102z" />
+<glyph unicode="?" d="M168 1386q205 96 426 97q217 0 340 -97q125 -98 125 -262q0 -133 -53 -217q-52 -83 -197 -190q-119 -88 -151.5 -141.5t-32.5 -143.5v-18h-160v37q0 119 47 194.5t160 157.5q131 100 172 155.5t41 157.5q0 92 -74 150q-72 57 -207 57q-172 0 -371 -90zM426 110.5 q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5z" />
+<glyph unicode="@" d="M31 602q0 395 168 629q166 231 454 231q248 0 396 -196q150 -199 149 -535q0 -236 -63 -371q-66 -139 -179 -139q-131 0 -157 180h-4q-74 -180 -230 -180q-120 0 -190 105q-70 102 -70 280q0 209 96 332q98 127 256 127q133 0 256 -47l-22 -416q-2 -25 -2 -70v-6 q0 -176 72 -176q100 0 100 383q0 279 -110.5 436.5t-299.5 157.5q-225 0 -352 -192.5t-127 -526.5q0 -311 129 -483q127 -170 369 -170q178 0 346 78v-133q-156 -82 -352 -82q-295 0 -465 207q-168 204 -168 577zM465 602q0 -252 127 -252q131 0 145 312l15 253 q-53 20 -103 21q-90 0 -137 -94.5t-47 -239.5z" />
+<glyph unicode="A" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183z" />
+<glyph unicode="B" d="M135 0v1462h440q272 0 398 -88q123 -86 123 -282q0 -129 -78 -213t-213 -103v-10q332 -55 332 -342q0 -199 -127 -311.5t-348 -112.5h-527zM322 158h307q311 0 311 274q0 254 -324 254h-294v-528zM322 842h284q157 0 228 55q72 55 71 182q0 121 -75.5 172.5t-243.5 51.5 h-264v-461z" />
+<glyph unicode="C" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557z" />
+<glyph unicode="D" d="M135 0v1462h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301zM322 160h96q532 0 532 579q0 563 -493 564h-135v-1143z" />
+<glyph unicode="E" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842z" />
+<glyph unicode="F" d="M244 0v1462h841v-164h-655v-516h617v-164h-617v-618h-186z" />
+<glyph unicode="G" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553z" />
+<glyph unicode="H" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187z" />
+<glyph unicode="I" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776z" />
+<glyph unicode="J" d="M137 39v166q162 -61 309 -62q162 0 254.5 80t92.5 226v1013h186v-1011q0 -215 -141 -345q-139 -127 -377 -126q-215 0 -324 59z" />
+<glyph unicode="K" d="M211 0v1462h186v-731l121 168l453 563h209l-521 -637l539 -825h-211l-450 698l-140 -114v-584h-186z" />
+<glyph unicode="L" d="M233 0v1462h187v-1296h635v-166h-822z" />
+<glyph unicode="M" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151z" />
+<glyph unicode="N" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172z" />
+<glyph unicode="O" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
+<glyph unicode="P" d="M176 0v1462h404q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-569h-186zM362 727h170q195 0 283 72q86 70 86 225q0 279 -338 279h-201v-576z" />
+<glyph unicode="Q" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -526 -285 -694q86 -180 279 -311l-121 -142q-238 172 -328 400q-37 -6 -76 -6q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
+<glyph unicode="R" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541z" />
+<glyph unicode="S" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69z" />
+<glyph unicode="T" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418z" />
+<glyph unicode="U" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540z" />
+<glyph unicode="V" d="M33 1462h196l295 -927q45 -143 88 -334q33 152 93 340l292 921h199l-489 -1462h-187z" />
+<glyph unicode="W" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190z" />
+<glyph unicode="X" d="M53 0l453 764l-422 698h199l331 -559l334 559h191l-422 -692l457 -770h-211l-355 635l-366 -635h-189z" />
+<glyph unicode="Y" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559z" />
+<glyph unicode="Z" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022z" />
+<glyph unicode="[" d="M412 -324v1786h528v-149h-346v-1487h346v-150h-528z" />
+<glyph unicode="\" d="M211 1462h178l627 -1462h-178z" />
+<glyph unicode="]" d="M289 -174h346v1487h-346v149h528v-1786h-528v150z" />
+<glyph unicode="^" d="M111 549l424 924h102l481 -924h-162l-368 735l-318 -735h-159z" />
+<glyph unicode="_" d="M-16 -184h1259v-140h-1259v140z" />
+<glyph unicode="`" d="M418 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="a" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164z" />
+<glyph unicode="b" d="M158 0v1556h182v-376q0 -96 -8 -226h8q109 164 322 164q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12l-37 -139h-133zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-154 0 -221.5 -94.5t-67.5 -321.5 z" />
+<glyph unicode="c" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418z" />
+<glyph unicode="d" d="M137 547q0 268 115 419.5t315 151.5q205 0 322 -160h12q-12 129 -12 162v436h182v-1556h-147l-27 147h-8q-115 -168 -322 -167q-203 0 -315 149q-115 152 -115 418zM326 545q0 -414 274 -414q152 0 219 88q66 88 70 287v41q0 229 -70 323q-72 96 -221 97 q-272 0 -272 -422z" />
+<glyph unicode="e" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305z" />
+<glyph unicode="f" d="M156 961v110l317 33v96q0 195 90 281q88 86 299 86q125 0 252 -35l-41 -143q-109 29 -207 28q-123 0 -168 -51q-43 -49 -43 -164v-104h389v-137h-389v-961h-182v961h-317z" />
+<glyph unicode="g" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5z" />
+<glyph unicode="h" d="M160 0v1556h182v-462l-8 -144h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
+<glyph unicode="i" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM526 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5z" />
+<glyph unicode="j" d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154zM637 1435.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="k" d="M215 0v1556h180v-714l-16 -289h4l135 152l395 393h222l-494 -475l522 -623h-213l-426 504l-129 -82v-422h-180z" />
+<glyph unicode="l" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879z" />
+<glyph unicode="m" d="M92 0v1098h127l27 -148h10q68 168 201 168q164 0 213 -182h6q78 182 219 182q129 0 186 -92q57 -90 58 -309v-717h-162v707q0 147 -27 202q-27 57 -88 58q-88 0 -127 -82q-39 -80 -39 -279v-606h-161v707q0 260 -125 260q-82 0 -119 -80t-37 -318v-569h-162z" />
+<glyph unicode="n" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
+<glyph unicode="o" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416z" />
+<glyph unicode="p" d="M158 -492v1590h147l27 -148h8q111 168 322 168q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12q12 -129 12 -162v-469h-182zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-152 0 -219.5 -88t-69.5 -287 v-41z" />
+<glyph unicode="q" d="M137 547q0 268 115 419.5t315 151.5q209 0 322 -168h8l27 148h147v-1590h-182v469q0 41 12 170h-12q-115 -168 -322 -167q-203 0 -315 149q-115 152 -115 418zM326 545q0 -414 274 -414q152 0 219 88q66 88 70 287v41q0 229 -70 323q-72 96 -221 97q-272 0 -272 -422z " />
+<glyph unicode="r" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182z" />
+<glyph unicode="s" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69z" />
+<glyph unicode="t" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-637q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v637h-267z" />
+<glyph unicode="u" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401z" />
+<glyph unicode="v" d="M82 1098h188l240 -652q84 -225 100 -325h6q8 53 101 325l239 652h189l-416 -1098h-231z" />
+<glyph unicode="w" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189z" />
+<glyph unicode="x" d="M96 0l414 563l-393 535h207l290 -410l291 410h207l-395 -535l413 -563h-206l-310 436l-311 -436h-207z" />
+<glyph unicode="y" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150z" />
+<glyph unicode="z" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862z" />
+<glyph unicode="{" d="M225 492v155q338 0 338 189v333q0 287 438 293v-149q-147 -4 -200 -39q-55 -37 -56 -119v-332q0 -209 -233 -248v-12q233 -39 233 -248v-331q0 -82 56 -119q53 -35 200 -39v-150q-438 6 -438 293v334q0 189 -338 189z" />
+<glyph unicode="|" d="M539 -492v2048h149v-2048h-149z" />
+<glyph unicode="}" d="M227 -174q141 0 198.5 39t57.5 119v331q0 209 234 248v12q-233 39 -234 248v332q0 80 -57 119t-199 39v149q438 -6 439 -293v-333q0 -188 338 -189v-155q-338 0 -338 -189v-334q0 -287 -439 -293v150z" />
+<glyph unicode="~" d="M152 586v162q98 109 247 108q102 0 248 -63q129 -55 201 -56q106 0 227 121v-162q-98 -109 -248 -108q-102 0 -247 63q-133 55 -201 56q-106 0 -227 -121z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#xa1;" d="M487 979q0 139 127 139t127 -139t-127 -139t-127 139zM502 -373l51 1049h121l51 -1049h-223z" />
+<glyph unicode="&#xa2;" d="M172 743q0 494 434 568v172h137v-164q158 -2 318 -59l-62 -158q-147 57 -268 57q-371 0 -371 -414q0 -406 361 -405q152 0 321 61v-159q-123 -59 -299 -62v-200h-137v206q-434 68 -434 557z" />
+<glyph unicode="&#xa3;" d="M119 0v154q201 49 200 284v213h-198v137h198v324q0 166 109 268q106 100 289 101q193 0 346 -80l-66 -144q-143 72 -272 72q-223 0 -223 -246v-295h377v-137h-377v-211q0 -199 -140 -274h748v-166h-991z" />
+<glyph unicode="&#xa4;" d="M174 1065l98 98l127 -129q101 68 215 68q115 0 213 -68l129 129l99 -96l-129 -129q68 -101 67 -215q0 -120 -67 -215l127 -127l-97 -96l-129 127q-100 -66 -213 -66q-117 0 -215 68l-127 -127l-96 96l127 127q-66 96 -65 213q0 113 65 213zM375 723q0 -98 71 -170 q70 -70 168 -70q102 0 172 70q72 72 72 170q0 100 -71.5 172t-172 72t-170 -70t-69.5 -174z" />
+<glyph unicode="&#xa5;" d="M78 1462h192l342 -739l346 739h191l-385 -768h240v-137h-302v-158h302v-137h-302v-262h-178v262h-301v137h301v158h-301v137h234z" />
+<glyph unicode="&#xa6;" d="M539 289h149v-781h-149v781zM539 776v780h149v-780h-149z" />
+<glyph unicode="&#xa7;" d="M244 55v158q170 -82 323 -82q240 0 240 141q0 55 -43 97q-45 41 -195 102q-197 82 -254 160q-55 74 -55 178q0 178 160 258q-160 80 -160 236q0 123 105 192q106 72 276 72q160 0 326 -72l-56 -139q-157 68 -276 67q-201 0 -201 -116q0 -53 49 -93q47 -37 197 -100 q158 -61 231 -139q74 -77 74 -191q0 -180 -145 -270q145 -80 145 -225q0 -139 -110.5 -219t-307.5 -80q-202 -1 -323 65zM414 831q0 -74 57 -126q55 -51 207 -117l35 -15q115 78 114 185q0 90 -73 145q-68 51 -207 103q-133 -50 -133 -175z" />
+<glyph unicode="&#xa8;" d="M330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xa9;" d="M6 731q0 342 160 547t448 205q283 0 447 -203q162 -201 162 -549t-162 -549q-164 -203 -447 -202q-285 0 -446.5 204.5t-161.5 546.5zM115 731q0 -301 129 -473q127 -170 370 -170q242 0 369 170q131 174 131 473t-131 473q-127 170 -368.5 170t-370.5 -172t-129 -471z M248 733q0 209 110.5 332t300.5 123q127 0 254 -62l-61 -127q-106 53 -193 54q-123 0 -186 -86q-66 -88 -65 -236q0 -324 251 -323q98 0 215 45v-131q-108 -49 -221 -50q-197 0 -301 123t-104 338z" />
+<glyph unicode="&#xaa;" d="M276 989q0 117 84 168t277 57l125 5v10q0 133 -152 133q-117 0 -245 -51l-41 110q135 57 294 58q291 0 291 -238v-444h-110l-33 118q-104 -131 -268 -131q-222 0 -222 205zM428 987q0 -90 104 -90q106 0 168 55.5t62 145.5v20l-100 -2q-111 -2 -175 -29q-59 -24 -59 -100 z" />
+<glyph unicode="&#xab;" d="M197 526v27l309 414l117 -78l-238 -348l238 -348l-117 -78zM604 526v27l309 414l117 -78l-237 -348l237 -348l-117 -78z" />
+<glyph unicode="&#xac;" d="M152 647v150h923v-535h-149v385h-774z" />
+<glyph unicode="&#xad;" d="M285 465v168h659v-168h-659z" />
+<glyph unicode="&#xae;" d="M6 731q0 342 160 547t448 205q283 0 447 -203q162 -201 162 -549t-162 -549q-164 -203 -447 -202q-285 0 -446.5 204.5t-161.5 546.5zM115 731q0 -301 129 -473q127 -170 370 -170q242 0 369 170q131 174 131 473t-131 473q-127 170 -368.5 170t-370.5 -172t-129 -471z M348 285v893h234q326 0 325 -265q0 -163 -159 -233l237 -395h-178l-207 352h-94v-352h-158zM506 768h72q170 0 170 141q0 74 -41 103q-43 31 -132 30h-69v-274z" />
+<glyph unicode="&#xaf;" d="M-20 1556v140h1269v-140h-1269z" />
+<glyph unicode="&#xb0;" d="M299 1167q0 129 92 222q94 94 223 94q127 0 221.5 -94.5t94.5 -221.5q0 -129 -92.5 -221t-223.5 -92t-223 92t-92 221zM422 1167q0 -80 55 -135t137 -55q78 0 135.5 55t57.5 135t-57.5 137.5t-135.5 57.5q-80 0 -135 -57q-57 -62 -57 -138z" />
+<glyph unicode="&#xb1;" d="M152 0v150h923v-150h-923zM152 647v150h387v389h149v-389h387v-150h-387v-385h-149v385h-387z" />
+<glyph unicode="&#xb2;" d="M348 672v102l187 199q106 113 141 168q31 49 31 108q0 115 -111 115q-82 0 -164 -76l-78 86q115 102 248 103q121 0 182 -60q66 -61 66 -164q0 -66 -35 -135q-33 -66 -164 -196l-135 -136h363v-114h-531z" />
+<glyph unicode="&#xb3;" d="M342 705v124q113 -66 203 -65q150 0 149 137q0 125 -147 125h-72v104h70q123 0 123 127q0 111 -97 111q-74 0 -161 -70l-66 86q111 92 238 93q113 0 174 -54q63 -55 63 -149q0 -139 -149 -189q176 -41 176 -186q0 -117 -74 -180q-72 -63 -215 -64q-132 1 -215 50z" />
+<glyph unicode="&#xb4;" d="M418 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xb5;" d="M180 -492v1590h182v-707q0 -260 218 -260q152 0 217 90q70 94 69 307v570h183v-1098h-148l-27 147h-10q-96 -168 -295 -167q-139 0 -213 88q6 -154 6 -240v-320h-182z" />
+<glyph unicode="&#xb6;" d="M66 1042q0 256 108 388q106 127 342 126h563v-1816h-121v1657h-206v-1657h-121v819q-61 -18 -146 -18q-419 -1 -419 501z" />
+<glyph unicode="&#xb7;" d="M487 723q0 139 127 139t127 -139t-127 -139t-127 139z" />
+<glyph unicode="&#xb8;" d="M428 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
+<glyph unicode="&#xb9;" d="M367 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51z" />
+<glyph unicode="&#xba;" d="M281 1133q0 160 90 253q88 92 245 93q145 0 238 -93q94 -94 94 -253q0 -164 -92 -256.5t-244 -92.5q-145 0 -237 93q-94 94 -94 256zM432 1133q0 -229 182 -230q180 0 181 230q0 225 -181 225q-182 0 -182 -225z" />
+<glyph unicode="&#xbb;" d="M197 193l237 348l-237 348l116 78l310 -414v-27l-310 -411zM604 193l238 348l-238 348l117 78l309 -414v-27l-309 -411z" />
+<glyph unicode="&#xbc;" d="M23 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51zM170 0l729 1462h158l-729 -1462h-158zM606 174v98l377 523h141v-508h84v-113h-84v-174h-143v174h-375zM751 287h230v176q0 83 6 172q-37 -70 -80 -131z" />
+<glyph unicode="&#xbd;" d="M2 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51zM104 0l729 1462h158l-729 -1462h-158zM694 0v102l187 199q106 113 141 168q31 49 31 108q0 115 -111 115q-82 0 -164 -76l-78 86q115 102 248 103q121 0 182 -60q66 -61 66 -164q0 -66 -35 -135 q-33 -66 -164 -196l-135 -136h363v-114h-531z" />
+<glyph unicode="&#xbe;" d="M20 705v124q113 -66 203 -65q150 0 149 137q0 125 -147 125h-72v104h70q123 0 123 127q0 111 -97 111q-74 0 -161 -70l-66 86q111 92 238 93q113 0 174 -54q63 -55 63 -149q0 -139 -149 -189q176 -41 176 -186q0 -117 -74 -180q-72 -63 -215 -64q-132 1 -215 50zM223 0 l729 1462h158l-729 -1462h-158zM627 174v98l377 523h141v-508h84v-113h-84v-174h-143v174h-375zM772 287h230v176q0 83 6 172q-37 -70 -80 -131z" />
+<glyph unicode="&#xbf;" d="M168 -35q0 133 53 217q52 83 197 191q113 80 151 141q33 51 33 143v19h160v-37q0 -115 -45 -193q-45 -76 -162 -159q-127 -96 -170 -156q-43 -57 -43 -158q0 -94 74 -149q76 -57 207 -57q178 0 370 90l62 -144q-215 -106 -422 -106q-217 0 -340 98q-125 100 -125 260z M547 979q0 139 127 139t127 -139t-127 -139t-127 139z" />
+<glyph unicode="&#xc0;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM340 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xc1;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM520 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xc2;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xc3;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM254 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56 q-82 0 -107 -115h-104z" />
+<glyph unicode="&#xc4;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM330 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xc5;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM387 1581q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158z M498 1581q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
+<glyph unicode="&#xc6;" d="M0 0l338 1462h872v-164h-477v-452h438v-162h-438v-520h477v-164h-653v453h-289l-96 -453h-172zM305 618h252v680h-106z" />
+<glyph unicode="&#xc7;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM508 -375q34 -6 80 -6q152 0 151 92 q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
+<glyph unicode="&#xc8;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM344 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xc9;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM481 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xca;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM318 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xcb;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM355 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM730 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xcc;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM309 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xcd;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM537 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xce;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xcf;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xd0;" d="M0 659v162h135v641h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301v659h-135zM322 160h96q532 0 532 579q0 563 -493 564h-135v-482h380v-162h-380v-499z" />
+<glyph unicode="&#xd1;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM258 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#xd2;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM336 1886v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
+<glyph unicode="&#xd3;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM508 1579v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xd4;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM283 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xd5;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM262 1579q25 264 211 264q57 0 162 -55 q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#xd6;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM332 1732.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xd7;" d="M190 1042l105 105l317 -318l322 318l104 -103l-321 -321l319 -320l-102 -102l-322 317l-317 -315l-102 103l315 317z" />
+<glyph unicode="&#xd8;" d="M80 2l121 197q-117 184 -117 536q0 750 534 750q186 0 310 -105l92 152l137 -78l-125 -201q115 -188 115 -520q0 -362 -137 -557q-138 -197 -394 -196q-193 0 -307 94l-92 -150zM281 733q0 -205 38 -342l515 836q-80 94 -216 94q-337 0 -337 -588zM403 229 q80 -86 213 -86q174 0 254 145.5t80 444.5q0 205 -35 328z" />
+<glyph unicode="&#xd9;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM348 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xda;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM494 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xdb;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xdc;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xdd;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM494 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xde;" d="M176 0v1462h186v-252h218q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-317h-186zM362 475h170q195 0 283 72q86 72 86 225q0 279 -338 279h-201v-576z" />
+<glyph unicode="&#xdf;" d="M164 0v1200q0 367 424 367q195 0 303 -80t108 -227q0 -131 -133 -248q-80 -72 -108 -107q-25 -31 -25 -63q0 -37 29 -70q27 -29 151 -110q144 -95 191 -173t47 -176q0 -162 -100.5 -247.5t-282.5 -85.5q-178 0 -289 69v166q143 -86 277 -86q213 0 213 174q0 80 -45 131 t-144 113q-125 78 -174 139.5t-49 147.5q0 117 129 223q129 108 129 196q0 164 -227 164q-242 0 -242 -215v-1202h-182z" />
+<glyph unicode="&#xe0;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM332 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xe1;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM502 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xe2;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM291 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xe3;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM264 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#xe4;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM342 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM717 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xe5;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM387 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158zM498 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31 q-49 0 -80 -31q-32 -33 -32 -82z" />
+<glyph unicode="&#xe6;" d="M45 307q0 334 328 348l149 7v69q0 236 -139 236q-109 0 -211 -82l-57 137q133 96 276 96q187 0 246 -178q77 178 240 178q137 0 223 -135t86 -356v-113h-496q3 -190 68 -283q66 -92 168 -92q113 0 233 76v-162q-106 -74 -241 -73q-221 0 -316 229q-104 -229 -301 -229 q-117 0 -186 86q-70 83 -70 241zM215 305q0 -82 33 -131q31 -47 86 -47q84 0 135 82t51 229v99l-88 -7q-217 -18 -217 -225zM694 662h316q0 137 -41 223q-39 82 -111 82q-66 0 -113 -78q-45 -75 -51 -227z" />
+<glyph unicode="&#xe7;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM477 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115 q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
+<glyph unicode="&#xe8;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM375 1548v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
+<glyph unicode="&#xe9;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM500 1241v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xea;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM299 1241v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xeb;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM348 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM723 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xec;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM332 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xed;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM531 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xee;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM283 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xef;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xf0;" d="M135 477.5q0 233.5 121 364.5q121 129 334 129q211 0 299 -119l8 4q-57 225 -242 391l-256 -153l-73 114l217 131q-113 76 -172 109l69 123q135 -66 246 -148l227 138l74 -113l-194 -117q301 -291 301 -758q0 -279 -129 -436t-353 -157q-213 0 -346 133 q-131 131 -131 364.5zM328 471q0 -340 288 -340q152 0 222 100q68 98 67 295q0 129 -77.5 213t-213.5 84q-286 0 -286 -352z" />
+<glyph unicode="&#xf1;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM260 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115 h-104z" />
+<glyph unicode="&#xf2;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM377 1548v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
+<glyph unicode="&#xf3;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM498 1241v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xf4;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM279 1241v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xf5;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM254 1241q25 264 211 264q57 0 162 -55 q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#xf6;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM324 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM699 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#xf7;" d="M152 647v150h923v-150h-923zM498 373q0 125 114.5 125t114.5 -125t-114.5 -125t-114.5 125zM498 1071q0 125 114.5 125t114.5 -125t-114.5 -125t-114.5 125z" />
+<glyph unicode="&#xf8;" d="M115 551q0 264 133 415.5t368 151.5q129 0 236 -57l76 119l131 -84l-84 -131q137 -156 137 -414q0 -272 -135 -421.5t-367 -149.5q-127 0 -233 53l-76 -119l-131 84l84 131q-139 158 -139 422zM303 551q0 -178 53 -275l406 656q-66 35 -156 35q-162 0 -231 -103 q-72 -106 -72 -313zM467 164q59 -33 154 -33q162 0 233 105q70 102 70 315q0 166 -52 266z" />
+<glyph unicode="&#xf9;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM340 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#xfa;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM500 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xfb;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM291 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#xfc;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM332 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z " />
+<glyph unicode="&#xfd;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM494 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#xfe;" d="M158 -492v2048h182v-458l-8 -148h8q111 168 322 168q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12q12 -129 12 -162v-469h-182zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-152 0 -219.5 -88 t-69.5 -287v-41z" />
+<glyph unicode="&#xff;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM338 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM713 1394.5 q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x100;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM326 1579v150h575v-150h-575z" />
+<glyph unicode="&#x101;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM318 1241v150h575v-150h-575z" />
+<glyph unicode="&#x102;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM311 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x103;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM303 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x104;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM813 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x105;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM705 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x106;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM660 1579v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x107;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM578 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x108;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM443 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x109;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM367 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121 q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x10a;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM672 1732.5q0 114.5 106.5 114.5 t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x10b;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM592 1394.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5 t-106.5 114.5z" />
+<glyph unicode="&#x10c;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM437 1880v27h120q82 -55 211 -187 q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x10d;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM375 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67 q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x10e;" d="M135 0v1462h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301zM322 160h96q532 0 532 579q0 563 -493 564h-135v-1143zM275 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z " />
+<glyph unicode="&#x10f;" d="M80 547q0 268 115 419.5t315 151.5q205 0 322 -160h12q-12 129 -12 162v436h182v-1556h-147l-27 147h-8q-115 -168 -322 -167q-203 0 -315 149q-115 152 -115 418zM269 545q0 -414 274 -414q152 0 219 88q66 88 70 287v41q0 229 -70 323q-72 96 -221 97q-272 0 -272 -422 zM1074 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
+<glyph unicode="&#x110;" d="M0 659v162h135v641h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301v659h-135zM322 160h96q532 0 532 579q0 563 -493 564h-135v-482h380v-162h-380v-499z" />
+<glyph unicode="&#x111;" d="M137 526q0 260 115 405.5t315 145.5q207 0 322 -159h12q-12 127 -12 161v158h-379v137h379v182h182v-182h156v-137h-156v-1237h-147l-27 147h-8q-115 -168 -322 -167q-201 0 -315.5 145t-114.5 401zM326 524q0 -393 274 -393q150 0 217 82q70 84 72 274v39q0 217 -70 308 q-71 92 -221 92q-272 -1 -272 -402z" />
+<glyph unicode="&#x112;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM336 1579v150h575v-150h-575z" />
+<glyph unicode="&#x113;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM346 1241v150h575v-150h-575z" />
+<glyph unicode="&#x114;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM342 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x115;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM329 1518h109q6 -76 47 -101q39 -25 143 -24 q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x116;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM543 1703.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x117;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM531 1394.5q0 114.5 106.5 114.5 t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x118;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM619 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x119;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM641 -221q0 144 190 252h131 q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x11a;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM318 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x11b;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM308 1542v27h120q82 -55 211 -187 q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x11c;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM363 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x11d;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM275 1241v27l59 67 q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x11e;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM411 1856h109q6 -76 47 -101 q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x11f;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM301 1518h109 q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x120;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM617 1732.5q0 114.5 106.5 114.5 t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x121;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM508 1394.5 q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x122;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM540 -426q63 145 84 301h178v-20 q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x123;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM528 1241v21 q0 20 45 118q45 100 119 189h98v-27q-61 -145 -83 -301h-179z" />
+<glyph unicode="&#x124;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x125;" d="M160 0v1556h182v-462l-8 -144h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM297 1634v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x126;" d="M0 1069v150h135v243h187v-243h585v243h187v-243h135v-150h-135v-1069h-187v682h-585v-682h-187v1069h-135zM322 846h585v223h-585v-223z" />
+<glyph unicode="&#x127;" d="M4 1237v137h156v182h184v-182h418v-137h-420v-184l-10 -144h10q106 168 346 168q190 0 287 -96q94 -94 94 -305v-676h-182v666q0 260 -236 260q-160 0 -235 -95q-74 -92 -74 -303v-528h-182v1237h-156z" />
+<glyph unicode="&#x128;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM254 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#x129;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM252 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#x12a;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM328 1579v150h575v-150h-575z" />
+<glyph unicode="&#x12b;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM326 1241v150h575v-150h-575z" />
+<glyph unicode="&#x12c;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM313 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x12d;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM338 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x12e;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM422 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x12f;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM526 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5zM439 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23 q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x130;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM508 1732.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x131;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878z" />
+<glyph unicode="&#x132;" d="M156 0v1462h186v-1462h-186zM492 23v163q90 -45 186 -45q195 0 194 283v1038h187v-1026q0 -457 -365 -456q-134 0 -202 43z" />
+<glyph unicode="&#x133;" d="M188 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5zM203 0v1098h182v-1098h-182zM502 -303q86 -39 190 -39q164 0 164 215v1081l-215 21v123h397v-1215q0 -182 -86 -278.5t-235 -96.5q-121 0 -215 35v154zM821 1435.5 q0 114.5 106.5 114.5t106.5 -114q0 -58 -30 -86q-33 -29 -76 -29q-107 0 -107 114.5z" />
+<glyph unicode="&#x134;" d="M137 39v166q162 -61 309 -62q162 0 254.5 80t92.5 226v1013h186v-1011q0 -215 -141 -345q-139 -127 -377 -126q-215 0 -324 59zM551 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x135;" d="M303 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120zM135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154z" />
+<glyph unicode="&#x136;" d="M211 0v1462h186v-731l121 168l453 563h209l-521 -637l539 -825h-211l-450 698l-140 -114v-584h-186zM510 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x137;" d="M215 0v1556h180v-714l-16 -289h4l135 152l395 393h222l-494 -475l522 -623h-213l-426 504l-129 -82v-422h-180zM485 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x138;" d="M215 0v1098h180v-291l-16 -299h4l137 166l402 424h213l-494 -510l522 -588h-213l-426 469l-129 -82v-387h-180z" />
+<glyph unicode="&#x139;" d="M233 0v1462h187v-1296h635v-166h-822zM262 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x13a;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM496 1636v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x13b;" d="M233 0v1462h187v-1296h635v-166h-822zM491 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x13c;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM460 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x13d;" d="M233 0v1462h187v-1296h635v-166h-822zM750 1137v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
+<glyph unicode="&#x13e;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM865 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
+<glyph unicode="&#x13f;" d="M233 0v1462h187v-1296h635v-166h-822zM750 773.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x140;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM866 681.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x141;" d="M72 539l198 125v798h187v-680l299 189l78 -125l-377 -238v-442h635v-166h-822v492l-125 -78z" />
+<glyph unicode="&#x142;" d="M188 0v123l344 20v449l-141 -92l-78 121l219 143v649l-268 21v122h451v-673l164 108l77 -121l-241 -159v-568l352 -20v-123h-879z" />
+<glyph unicode="&#x143;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM516 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x144;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM529 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x145;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM434 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x146;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM454 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x147;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM281 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x148;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM295 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x149;" d="M-16 961q59 231 100 501h199l14 -22q-47 -190 -176 -479h-137zM262 0v1098h148l26 -148h10q43 77 129 123q84 45 189 45q367 0 366 -401v-717h-182v707q0 260 -219 260q-285 0 -285 -398v-569h-182z" />
+<glyph unicode="&#x14a;" d="M135 0v1462h213l578 -1128h10q-18 272 -18 403v725h174v-1442q0 -201 -101 -303q-102 -106 -286 -106q-94 0 -156 24v160q74 -20 158 -20q211 0 211 225l-621 1210h-8q18 -276 18 -417v-793h-172z" />
+<glyph unicode="&#x14b;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-875q0 -334 -291 -334q-82 0 -133 25v148q53 -20 115 -21q127 0 127 170v877q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
+<glyph unicode="&#x14c;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM330 1579v150h575v-150h-575z" />
+<glyph unicode="&#x14d;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM326 1241v150h575v-150h-575z" />
+<glyph unicode="&#x14e;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM313 1856h109q6 -76 47 -101q39 -25 143 -24 q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x14f;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM313 1518h109q6 -76 47 -101q39 -25 143 -24 q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x150;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM326 1579v27q92 127 174 301h198v-21 q-109 -168 -272 -307h-100zM688 1579v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
+<glyph unicode="&#x151;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM328 1241v27q92 127 174 301h198v-21 q-109 -168 -272 -307h-100zM690 1241v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
+<glyph unicode="&#x152;" d="M20 735q0 750 512 750q80 0 154 -23h541v-164h-398v-452h359v-162h-359v-520h398v-164h-574l-49 -10q-57 -10 -96 -10q-488 -1 -488 755zM209 733q0 -590 309 -590q70 0 133 33v1112q-57 33 -131 33q-311 0 -311 -588z" />
+<glyph unicode="&#x153;" d="M57 551q0 268 88 417.5t242 149.5q172 0 260 -217q82 217 242 217q131 0 209 -133q76 -131 76 -358v-113h-439q2 -375 189 -375q111 0 204 76v-162q-96 -74 -217 -73q-88 0 -159 59q-70 57 -101 162q-90 -221 -266 -221q-145 0 -238 153q-90 150 -90 418zM227 551 q0 -213 39 -315q41 -104 131 -105q168 0 168 410q0 426 -170 426q-90 0 -129 -102.5t-39 -313.5zM737 662h260q0 305 -123 305q-125 0 -137 -305z" />
+<glyph unicode="&#x154;" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541zM447 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x155;" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182zM510 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x156;" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541zM481 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x157;" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182zM186 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x158;" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541zM252 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234 h-193q-33 74 -176 234z" />
+<glyph unicode="&#x159;" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182zM295 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x15a;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM514 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x15b;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM512 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x15c;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM303 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x15d;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM306 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x15e;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM405 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
+<glyph unicode="&#x15f;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM420 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
+<glyph unicode="&#x160;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM314 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x161;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM293 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x162;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418zM448 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x163;" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-637q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v637h-267zM489 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x164;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418zM283 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x165;" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-637q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v637h-267zM799 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
+<glyph unicode="&#x166;" d="M102 1298v164h1022v-164h-417v-479h294v-149h-294v-670h-187v670h-297v149h297v479h-418z" />
+<glyph unicode="&#x167;" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-248h307v-138h-307v-251q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v251h-162v138h162v248h-267z" />
+<glyph unicode="&#x168;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM260 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56 q-82 0 -107 -115h-104z" />
+<glyph unicode="&#x169;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM256 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56 q-82 0 -107 -115h-104z" />
+<glyph unicode="&#x16a;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM326 1579v150h575v-150h-575z" />
+<glyph unicode="&#x16b;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM328 1241v150h575v-150h-575z" />
+<glyph unicode="&#x16c;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM313 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x16d;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM313 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x16e;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM389 1794q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158z M500 1794q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
+<glyph unicode="&#x16f;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM385 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57 q-62 58 -62 158zM496 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
+<glyph unicode="&#x170;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM322 1579v27q92 127 174 301h198v-21q-109 -168 -272 -307h-100zM684 1579v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
+<glyph unicode="&#x171;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM326 1241v27q92 127 174 301h198v-21q-109 -168 -272 -307h-100zM688 1241v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z " />
+<glyph unicode="&#x172;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM441 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x173;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM723 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54 q-63 55 -63 149z" />
+<glyph unicode="&#x174;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM285 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x175;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM281 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121 q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x176;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x177;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM285 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121 q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x178;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x179;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022zM475 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x17a;" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862zM496 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x17b;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022zM524 1732.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x17c;" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862zM524 1394.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x17d;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022zM283 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x17e;" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862zM295 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x17f;" d="M356 0v1200q0 188 90 279q88 88 299 88q121 0 273 -35l-41 -143q-109 29 -227.5 28.5t-163.5 -49.5q-47 -51 -47 -166v-1202h-183z" />
+<glyph unicode="&#x192;" d="M215 -324q59 -18 115 -18q92 0 123 51q33 55 32 164v963h-194v75l194 68v137q0 190 76 278.5t256 88.5q96 0 197 -37l-47 -141q-82 29 -144 28q-92 0 -123 -51q-33 -55 -32 -164v-145h245v-137h-245v-961q0 -190 -76 -278.5t-256 -88.5q-55 0 -121 15v153z" />
+<glyph unicode="&#x1f0;" d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154zM275 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x1fa;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM389 1581q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158z M500 1581q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82zM490 1835v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1fb;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM387 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158zM498 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31 q-49 0 -80 -31q-32 -33 -32 -82zM512 1720v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1fc;" d="M0 0l338 1462h872v-164h-477v-452h438v-162h-438v-520h477v-164h-653v453h-289l-96 -453h-172zM305 618h252v680h-106zM631 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1fd;" d="M45 307q0 334 328 348l149 7v69q0 236 -139 236q-109 0 -211 -82l-57 137q133 96 276 96q187 0 246 -178q77 178 240 178q137 0 223 -135t86 -356v-113h-496q3 -190 68 -283q66 -92 168 -92q113 0 233 76v-162q-106 -74 -241 -73q-221 0 -316 229q-104 -229 -301 -229 q-117 0 -186 86q-70 83 -70 241zM215 305q0 -82 33 -131q31 -47 86 -47q84 0 135 82t51 229v99l-88 -7q-217 -18 -217 -225zM694 662h316q0 137 -41 223q-39 82 -111 82q-66 0 -113 -78q-45 -75 -51 -227zM531 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z " />
+<glyph unicode="&#x1fe;" d="M80 2l121 197q-117 184 -117 536q0 750 534 750q186 0 310 -105l92 152l137 -78l-125 -201q115 -188 115 -520q0 -362 -137 -557q-138 -197 -394 -196q-193 0 -307 94l-92 -150zM281 733q0 -205 38 -342l515 836q-80 94 -216 94q-337 0 -337 -588zM403 229 q80 -86 213 -86q174 0 254 145.5t80 444.5q0 205 -35 328zM475 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1ff;" d="M115 551q0 264 133 415.5t368 151.5q129 0 236 -57l76 119l131 -84l-84 -131q137 -156 137 -414q0 -272 -135 -421.5t-367 -149.5q-127 0 -233 53l-76 -119l-131 84l84 131q-139 158 -139 422zM303 551q0 -178 53 -275l406 656q-66 35 -156 35q-162 0 -231 -103 q-72 -106 -72 -313zM467 164q59 -33 154 -33q162 0 233 105q70 102 70 315q0 166 -52 266zM498 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x218;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM483 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x219;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM454 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph unicode="&#x2bc;" d="M446 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158z" />
+<glyph unicode="&#x2c6;" d="M283 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
+<glyph unicode="&#x2c7;" d="M283 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
+<glyph unicode="&#x2c9;" d="M326 1241v150h575v-150h-575z" />
+<glyph unicode="&#x2d8;" d="M313 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
+<glyph unicode="&#x2d9;" d="M508 1394.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x2da;" d="M387 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158zM498 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
+<glyph unicode="&#x2db;" d="M414 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
+<glyph unicode="&#x2dc;" d="M254 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
+<glyph unicode="&#x2dd;" d="M246 1241v27q92 127 174 301h198v-21q-109 -168 -272 -307h-100zM608 1241v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
+<glyph unicode="&#x2f3;" d="M387 -340q0 47 16 90q16 41 46 68q31 29 69 43q37 14 92 14q49 0 90 -14q39 -14 72 -43t49 -66q18 -39 19 -90q0 -57 -17 -92q-18 -40 -49 -67.5t-74 -43.5q-41 -14 -90 -14q-55 0 -92 14q-39 14 -69 43q-29 27 -46 68q-16 43 -16 90zM498 -340q0 -51 28 -84 q27 -29 84 -29q53 0 82 29q31 31 31 84t-31 84q-29 29 -82 29q-51 0 -80 -29q-32 -33 -32 -84z" />
+<glyph unicode="&#x384;" d="M479 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x385;" d="M299 1394.5q0 102.5 96.5 102.5t96.5 -102q0 -49 -27 -76t-70 -27q-96 0 -96 102.5zM532 1389v26q53 147 91 301h206v-20q-92 -163 -215 -307h-82zM735 1394.5q0 102.5 96.5 102.5t96.5 -102.5t-96.5 -102.5t-96.5 102.5z" />
+<glyph unicode="&#x386;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM37 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x387;" d="M487 723q0 139 127 139t127 -139t-127 -139t-127 139z" />
+<glyph unicode="&#x388;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM-115 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x389;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187zM-156 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x38a;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM-92 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x38c;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM-131 1137v27l31 106q29 106 39 195h199v-21 q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x38e;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM-238 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x38f;" d="M74 0v164h266q-254 233 -254 661q0 313 139 486q141 174 391 174q248 0 390 -174q141 -176 141 -486q0 -428 -256 -661h268v-164h-469v147q260 229 260 674q0 500 -335.5 500t-335.5 -500q0 -442 262 -674v-147h-467zM-133 1137v27l31 106q29 106 39 195h199v-21 q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x390;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344zM242 1394.5q0 102.5 96.5 102.5t96.5 -102q0 -49 -27 -76t-70 -27q-96 0 -96 102.5zM475 1389v26q53 147 91 301h206v-20q-92 -163 -215 -307h-82zM678 1394.5 q0 102.5 96.5 102.5t96.5 -102.5t-96.5 -102.5t-96.5 102.5z" />
+<glyph unicode="&#x391;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183z" />
+<glyph unicode="&#x392;" d="M135 0v1462h440q272 0 398 -88q123 -86 123 -282q0 -129 -78 -213t-213 -103v-10q332 -55 332 -342q0 -199 -127 -311.5t-348 -112.5h-527zM322 158h307q311 0 311 274q0 254 -324 254h-294v-528zM322 842h284q157 0 228 55q72 55 71 182q0 121 -75.5 172.5t-243.5 51.5 h-264v-461z" />
+<glyph unicode="&#x393;" d="M233 0v1462h826v-166h-639v-1296h-187z" />
+<glyph unicode="&#x394;" d="M68 0v133l450 1329h187l454 -1337v-125h-1091zM268 166h686l-252 752q-51 150 -92 339q-53 -231 -88 -333z" />
+<glyph unicode="&#x395;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842z" />
+<glyph unicode="&#x396;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022z" />
+<glyph unicode="&#x397;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187z" />
+<glyph unicode="&#x398;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM410 664v161h411v-161h-411z" />
+<glyph unicode="&#x399;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776z" />
+<glyph unicode="&#x39a;" d="M211 0v1462h186v-731l121 168l453 563h209l-521 -637l539 -825h-211l-450 698l-140 -114v-584h-186z" />
+<glyph unicode="&#x39b;" d="M33 0l487 1462h187l489 -1462h-199l-292 922q-55 172 -93 340q-47 -207 -88 -334l-295 -928h-196z" />
+<glyph unicode="&#x39c;" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151z" />
+<glyph unicode="&#x39d;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172z" />
+<glyph unicode="&#x39e;" d="M111 0v164h1005v-164h-1005zM152 1298v164h923v-164h-923zM233 684v162h760v-162h-760z" />
+<glyph unicode="&#x39f;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
+<glyph unicode="&#x3a0;" d="M135 0v1462h959v-1462h-187v1298h-585v-1298h-187z" />
+<glyph unicode="&#x3a1;" d="M176 0v1462h404q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-569h-186zM362 727h170q195 0 283 72q86 70 86 225q0 279 -338 279h-201v-576z" />
+<glyph unicode="&#x3a3;" d="M131 0v152l414 614l-402 549v147h893v-164h-680l389 -530l-409 -604h760v-164h-965z" />
+<glyph unicode="&#x3a4;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418z" />
+<glyph unicode="&#x3a5;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559z" />
+<glyph unicode="&#x3a6;" d="M27 758q0 238 122.5 391.5t335.5 153.5h47v180h166v-180h47q213 0 336 -154t123 -391q0 -233 -127 -396q-125 -158 -354 -157h-25v-225h-166v225h-24q-230 0 -356 160q-125 157 -125 393zM199 762q0 -184 86 -293q86 -106 241 -107h6v781h-32q-141 0 -221 -104.5 t-80 -276.5zM698 362h7q156 0 241 107q86 109 86 293q0 172 -80 276.5t-221 104.5h-33v-781z" />
+<glyph unicode="&#x3a7;" d="M53 0l453 764l-422 698h199l331 -559l334 559h191l-422 -692l457 -770h-211l-355 635l-366 -635h-189z" />
+<glyph unicode="&#x3a8;" d="M57 979v483h172v-479q0 -229 70 -305q68 -74 217 -74h16v858h166v-858h17q150 0 217 72q70 74 69 303v483h173v-479q0 -289 -115 -412q-117 -125 -344 -125h-17v-446h-166v446h-16q-231 0 -344 125q-115 127 -115 408z" />
+<glyph unicode="&#x3a9;" d="M74 0v164h266q-254 233 -254 661q0 313 139 486q141 174 391 174q248 0 390 -174q141 -176 141 -486q0 -428 -256 -661h268v-164h-469v147q260 229 260 674q0 500 -335.5 500t-335.5 -500q0 -442 262 -674v-147h-467z" />
+<glyph unicode="&#x3aa;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x3ab;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x3ac;" d="M121 547q0 270 115 422q113 150 321 149q211 0 305 -168h12q29 100 68 148h143q-51 -162 -51 -439v-419q0 -111 84 -111q25 0 60 10v-133q-57 -27 -115 -26q-158 0 -199 167h-12q-109 -168 -313 -167q-193 0 -305.5 149.5t-112.5 417.5zM309 545q0 -414 264 -414 q147 0 211 92q66 92 68 309v15q0 227 -67.5 323.5t-213.5 96.5q-262 0 -262 -422zM495 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3ad;" d="M201 299q0 195 237 268v11q-203 66 -202 249q0 135 112.5 213t300.5 78q219 0 383 -76l-63 -147q-162 72 -316 72q-244 0 -243 -154q0 -166 276 -166h154v-153h-160q-301 0 -301 -185q0 -180 283 -180q199 0 366 86v-160q-139 -76 -377 -75q-211 0 -332 83 q-118 82 -118 236zM575 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3ae;" d="M160 0v1098h147l27 -148h10q100 168 336 168q389 0 389 -401v-1209h-182v1199q0 260 -238 260q-307 0 -307 -398v-569h-182zM559 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3af;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344zM471 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3b0;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518zM297 1394.5q0 102.5 96.5 102.5t96.5 -102q0 -49 -27 -76t-70 -27q-96 0 -96 102.5zM530 1389v26 q53 147 91 301h206v-20q-92 -163 -215 -307h-82zM733 1394.5q0 102.5 96.5 102.5t96.5 -102.5t-96.5 -102.5t-96.5 102.5z" />
+<glyph unicode="&#x3b1;" d="M121 547q0 270 115 422q113 150 321 149q211 0 305 -168h12q29 100 68 148h143q-51 -162 -51 -439v-419q0 -111 84 -111q25 0 60 10v-133q-57 -27 -115 -26q-158 0 -199 167h-12q-109 -168 -313 -167q-193 0 -305.5 149.5t-112.5 417.5zM309 545q0 -414 264 -414 q147 0 211 92q66 92 68 309v15q0 227 -67.5 323.5t-213.5 96.5q-262 0 -262 -422z" />
+<glyph unicode="&#x3b2;" d="M158 -492v1588q0 227 118 348q121 123 328 123q199 0 316 -105q119 -106 118 -288q0 -135 -80 -228q-76 -88 -235 -117v-6q381 -49 381 -409q0 -206 -123 -320q-125 -115 -338 -114q-188 0 -303 63v-535h-182zM340 209q135 -80 289 -80q293 0 293 299q0 147 -94.5 229 t-254.5 82h-94v152h70q141 0 223 76q80 74 80 200q0 119 -68 185q-70 66 -180 65q-264 0 -264 -330v-878z" />
+<glyph unicode="&#x3b3;" d="M82 1098h192l242 -592q70 -174 107 -320h6q18 82 98 295l229 617h189l-406 -1035q-111 -281 -110 -555h-191q0 209 101 504z" />
+<glyph unicode="&#x3b4;" d="M135 438q0 371 422 500q-254 143 -254 348q0 135 90 207q92 74 252 74q199 0 393 -109l-73 -145q-168 106 -328 106q-74 0 -117 -36.5t-43 -100.5q0 -66 41 -115q39 -49 215 -151q360 -205 361 -518q0 -246 -129 -381q-131 -137 -355 -137q-209 0 -344 124 q-131 123 -131 334zM328 434q0 -137 75 -219q78 -84 207 -84q295 0 295 350q0 244 -221 373q-356 -101 -356 -420z" />
+<glyph unicode="&#x3b5;" d="M201 299q0 195 237 268v11q-203 66 -202 249q0 135 112.5 213t300.5 78q219 0 383 -76l-63 -147q-162 72 -316 72q-244 0 -243 -154q0 -166 276 -166h154v-153h-160q-301 0 -301 -185q0 -180 283 -180q199 0 366 86v-160q-139 -76 -377 -75q-211 0 -332 83 q-118 82 -118 236z" />
+<glyph unicode="&#x3b6;" d="M162 469q0 254 162 477q160 223 536 469q-215 -12 -352 -12h-285v153h838v-141q-396 -289 -553 -485q-158 -199 -158 -453q0 -154 82 -217q83 -65 313 -104q168 -31 246 -80q76 -49 76 -162q0 -147 -121 -315h-170q121 164 121 260q0 57 -51 90q-52 34 -246 61 q-227 33 -334 146q-104 110 -104 313z" />
+<glyph unicode="&#x3b7;" d="M160 0v1098h147l27 -148h10q100 168 336 168q389 0 389 -401v-1209h-182v1199q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
+<glyph unicode="&#x3b8;" d="M147 729q0 381 113 563.5t352 182.5q230 0 351 -191q119 -188 118 -555q0 -750 -469 -749q-229 0 -348 192q-117 190 -117 557zM332 670q6 -276 71.5 -407.5t209 -131.5t208.5 127q68 129 74 412h-563zM332 807h563q-6 258 -73.5 387t-209.5 129q-139 0 -206 -125 q-64 -121 -74 -391z" />
+<glyph unicode="&#x3b9;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344z" />
+<glyph unicode="&#x3ba;" d="M215 0v1098h180v-291l-16 -299h4l137 166l402 424h213l-494 -510l522 -588h-213l-426 469l-129 -82v-387h-180z" />
+<glyph unicode="&#x3bb;" d="M61 0l504 1083l-53 160q-33 100 -78 139q-43 37 -115 37q-55 0 -104 -12v145q57 16 127 17q141 0 213 -67.5t141 -278.5l326 -983q37 -111 102 -111q25 0 60 10v-133q-53 -27 -115 -26q-80 0 -125 40q-43 41 -72 127l-135 418q-74 238 -94 336h-6q-37 -141 -119 -321 l-268 -580h-189z" />
+<glyph unicode="&#x3bc;" d="M160 -492v1590h182v-707q0 -260 238 -260q160 0 233.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-100 -168 -301 -167q-174 0 -248 88q6 -154 6 -240v-320h-182z" />
+<glyph unicode="&#x3bd;" d="M61 1098h189l223 -586q106 -276 121 -358h6q156 162 235.5 368.5t79.5 575.5h183q0 -367 -100.5 -610.5t-325.5 -487.5h-187z" />
+<glyph unicode="&#x3be;" d="M172 422q0 137 76 240q78 104 207 147v12q-215 59 -215 279q0 113 75 188q74 74 260 127q-174 -12 -280 -12h-62v153h764v-153h-69q-217 0 -364.5 -80t-147.5 -219q0 -114 92 -166q90 -51 287 -51h190v-137h-201q-209 0 -315 -82q-109 -84 -109 -230q0 -90 37 -143 q39 -55 109 -82q76 -31 248 -59q158 -27 237 -78q76 -49 76 -162q0 -147 -121 -315h-170q121 164 121 262q0 52 -49 86q-49 33 -238 61q-438 68 -438 414z" />
+<glyph unicode="&#x3bf;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416z" />
+<glyph unicode="&#x3c0;" d="M14 944v74l138 80h1062v-154h-210v-690q0 -125 90 -125q49 0 90 21v-144q-57 -27 -137 -26q-225 0 -226 262v702h-403v-944h-182v944h-222z" />
+<glyph unicode="&#x3c1;" d="M158 -492v1043q0 264 127 415.5t344 151.5q207 0 329 -153q125 -156 125 -414q0 -268 -122.5 -419.5t-339.5 -151.5q-166 0 -281 90h-6q6 -176 6 -271v-291h-182zM340 231q109 -100 283 -100q144 0 208 105q63 102 64 315q0 207 -66 313q-63 102 -208 103 q-281 0 -281 -396v-340z" />
+<glyph unicode="&#x3c2;" d="M172 516q0 602 567 602q162 0 322 -59l-62 -158q-154 57 -272 57q-367 0 -367 -440q0 -186 78 -254q78 -70 269 -102q358 -63 358 -252q0 -143 -125 -311h-166q121 164 121 262q0 59 -66 90q-59 29 -229 57q-428 72 -428 508z" />
+<glyph unicode="&#x3c3;" d="M129 524q0 573 555 574h490v-154h-267q178 -195 178 -440q0 -233 -129 -378.5t-352 -145.5t-348 143q-127 145 -127 401zM317 524q0 -186 76 -288q78 -104 219 -105q137 0 211 96.5t74 268.5q0 270 -154 448h-59q-200 0 -283 -98q-84 -101 -84 -322z" />
+<glyph unicode="&#x3c4;" d="M106 944v74l134 80h841v-154h-475v-606q0 -215 209 -215q111 0 191 20v-135q-86 -35 -220 -35q-362 0 -362 344v627h-318z" />
+<glyph unicode="&#x3c5;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518z" />
+<glyph unicode="&#x3c6;" d="M74 547q0 311 207 559l120 -90q-98 -129 -131 -232q-35 -109 -34 -237q0 -383 288 -416v606q0 381 281 381q166 0 258 -147.5t92 -399.5q0 -264 -125 -419.5t-348 -169.5v-474h-158v474q-450 24 -450 565zM682 131q305 29 305 438q0 397 -176 398q-129 0 -129 -228v-608z " />
+<glyph unicode="&#x3c7;" d="M43 -492l475 830l-180 446q-68 168 -152 168q-27 0 -63 -10v143q47 16 129 17q80 0 135 -55.5t111 -192.5l139 -348l311 592h178l-417 -776l186 -461q47 -115 86 -158q41 -45 104 -45q47 0 80 8v-139q-63 -18 -118 -19q-104 0 -170 46q-68 47 -138 221l-147 377 l-354 -644h-195z" />
+<glyph unicode="&#x3c8;" d="M80 555v543h172v-529q0 -424 272 -438v1423h158v-1421q301 28 301 436q0 254 -63 529h172q63 -272 63 -523q0 -569 -473 -593v-474h-158v474q-233 10 -338 143q-106 137 -106 430z" />
+<glyph unicode="&#x3c9;" d="M90 532q0 301 105 566h165q-104 -261 -104 -566q0 -401 139 -401q68 0 105 72q37 71 37 196v306h157v-306q0 -133 39 -198q41 -70 103 -70q139 0 139 401q0 303 -105 566h166q104 -258 105 -566q0 -553 -289 -552q-182 0 -231 178h-11q-49 -178 -231 -178 q-289 -1 -289 552z" />
+<glyph unicode="&#x3ca;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344zM258 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM633 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x3cb;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x3cc;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM551 1241v27l31 106q29 106 39 195h199v-21 q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3cd;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518zM518 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3ce;" d="M90 532q0 301 105 566h165q-104 -261 -104 -566q0 -401 139 -401q68 0 105 72q37 71 37 196v306h157v-306q0 -133 39 -198q41 -70 103 -70q139 0 139 401q0 303 -105 566h166q104 -258 105 -566q0 -553 -289 -552q-182 0 -231 178h-11q-49 -178 -231 -178 q-289 -1 -289 552zM530 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
+<glyph unicode="&#x3d1;" d="M10 825q29 14 86.5 28.5t104.5 14.5q53 0 84 -14q39 -18 57 -39q20 -25 31 -59q10 -37 10 -74q0 -49 -4 -78q-2 -25 -6 -48.5t-6 -41.5q-2 -16 -5.5 -47t-5.5 -47q-4 -33 -4 -94q0 -37 10 -78q8 -37 35 -66q23 -25 64 -41q43 -16 96 -16q163 0 246 154q82 152 82 456v53 q0 23 -4 52q-178 4 -295 39q-125 39 -197 98q-76 63 -108.5 137t-32.5 158q0 61 20 123q18 59 60 98q43 43 104 63q68 23 152 23q104 0 184 -43q82 -45 139 -119q59 -78 97 -190q37 -111 55 -250h143v-137h-137q2 -14 2 -52q0 -8 1 -28.5t1 -30.5q0 -150 -33 -297 q-29 -133 -96 -237q-63 -98 -162 -158q-96 -57 -229 -57q-109 0 -184 28q-70 27 -115 74q-41 45 -62 111q-16 55 -16 131q0 55 4 86q2 10 4 29.5t4 34.5t4 28l11 82q4 25 4 61q0 47 -15 62q-16 16 -47 16q-14 0 -51 -8q-25 -6 -43 -17zM426 1272q0 -53 23 -109 q23 -53 76 -94t139 -65q94 -27 210 -27q-10 90 -43 192q-29 90 -65 144q-41 59 -84 88q-47 31 -94 31q-76 0 -119 -43t-43 -117z" />
+<glyph unicode="&#x3d2;" d="M31 1462h202l379 -731q29 86 62 160q18 41 78 164q39 80 75 147l32.5 63.5t27.5 49.5q16 31 45 71q22 31 49 50q29 20 59 28q35 10 74 11q27 0 55 -5q20 -2 39 -12v-145q-8 2 -28 6q-10 2 -29 2q-31 0 -59 -23q-35 -29 -66 -84q-6 -8 -9 -15t-10.5 -19.5t-15.5 -28.5 l-21.5 -37t-31.5 -59l-61 -119q-39 -72 -66 -133q-41 -90 -59 -135q-35 -82 -47 -127v-541h-187v559z" />
+<glyph unicode="&#x3d6;" d="M18 944v74l134 80h1052v-154h-155q12 -33 41 -123q18 -61 30 -112q8 -39 17 -113q4 -39 4 -125q0 -121 -14.5 -205t-51.5 -153q-33 -63 -90 -98t-133 -35q-94 0 -150 43q-57 45 -81 135h-11q-25 -90 -82 -135q-55 -43 -149 -43q-76 0 -133.5 34.5t-89.5 98.5 q-34 65 -50 153q-16 94 -16 205q0 86 4 125q8 74 17 113q16 74 28 112q18 58 43 123h-164zM256 471q0 -98 8 -156q10 -74 25 -104q20 -43 44.5 -61.5t61.5 -18.5t64 21q23 18 43 57q18 35 26 84q8 43 9 106v203h157v-203q0 -133 39 -198q41 -70 103 -70q37 0 61.5 18.5 t44.5 61.5q14 31 25 104q8 57 8 156q0 80 -4 119q-8 74 -17 112q-12 59 -30 115l-41 127h-535q-23 -61 -43 -127q-10 -35 -29 -115q-8 -39 -16 -112q-4 -39 -4 -119z" />
+<glyph unicode="&#x401;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM355 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM730 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x402;" d="M23 1298v164h841v-164h-356v-401h264q184 0 291 -96q102 -94 102 -275v-137q0 -197 -94 -303t-266 -106q-89 0 -141 24v160q63 -20 135 -21q180 0 180 226v133q0 231 -227 231h-244v-733h-186v1298h-299z" />
+<glyph unicode="&#x403;" d="M233 0v1462h826v-166h-639v-1296h-187zM508 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x404;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-188 0 -314 -125q-123 -125 -151 -348h629v-162h-635q23 -541 471 -541q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557z" />
+<glyph unicode="&#x405;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69z" />
+<glyph unicode="&#x406;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776z" />
+<glyph unicode="&#x407;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x408;" d="M137 39v166q162 -61 309 -62q162 0 254.5 80t92.5 226v1013h186v-1011q0 -215 -141 -345q-139 -127 -377 -126q-215 0 -324 59z" />
+<glyph unicode="&#x409;" d="M0 -2v145q29 -14 68 -14q33 0 61 35q27 33 39 127q10 80 33 524q23 434 24 647h498v-616h39q446 0 446 -418q0 -207 -114.5 -317.5t-329.5 -110.5h-207v1298h-182l-21 -548q-23 -580 -82 -672q-63 -98 -176 -98q-55 0 -96 18zM723 160h45q268 0 268 268q0 131 -69 195 q-66 59 -224 59h-20v-522z" />
+<glyph unicode="&#x40a;" d="M66 0v1462h165v-616h318v616h166v-616h39q221 0 333.5 -106.5t112.5 -311.5q0 -207 -114.5 -317.5t-329.5 -110.5h-207v682h-318v-682h-165zM715 160h45q268 0 268 268q0 131 -70 195q-66 59 -223 59h-20v-522z" />
+<glyph unicode="&#x40b;" d="M23 1298v164h841v-164h-356v-401h264q184 0 291 -96q102 -94 102 -275v-526h-186v502q0 231 -227 231h-244v-733h-186v1298h-299z" />
+<glyph unicode="&#x40c;" d="M211 0v1462h186v-708l566 708h206l-565 -702l594 -760h-219l-582 741v-741h-186zM574 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x40e;" d="M27 1462h204l383 -809q2 -4 21 -47l7 -21.5t9 -23.5h2l39 109l312 792h196l-428 -1030q-80 -190 -135 -268q-61 -86 -150 -135t-215 -49q-104 0 -178 30v185q84 -45 178 -45q111 0 170 51q59 49 115 174zM237 1897h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174 q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
+<glyph unicode="&#x40f;" d="M135 0v1462h187v-1296h585v1296h187v-1462h-394v-385h-176v385h-389z" />
+<glyph unicode="&#x410;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183z" />
+<glyph unicode="&#x411;" d="M135 0v1462h912v-164h-725v-452h272q541 0 541 -418q0 -207 -131.5 -317.5t-382.5 -110.5h-486zM322 160h282q338 0 338 268q0 131 -86 192.5t-283 61.5h-251v-522z" />
+<glyph unicode="&#x412;" d="M135 0v1462h440q272 0 398 -88q123 -86 123 -282q0 -129 -78 -213t-213 -103v-10q332 -55 332 -342q0 -199 -127 -311.5t-348 -112.5h-527zM322 158h307q311 0 311 274q0 254 -324 254h-294v-528zM322 842h284q157 0 228 55q72 55 71 182q0 121 -75.5 172.5t-243.5 51.5 h-264v-461z" />
+<glyph unicode="&#x413;" d="M233 0v1462h826v-166h-639v-1296h-187z" />
+<glyph unicode="&#x414;" d="M6 166h113q133 246 217 594q86 360 98 702h592v-1296h195v-551h-177v385h-862v-385h-176v551zM311 166h529v1130h-242q-18 -281 -98 -596q-85 -339 -189 -534z" />
+<glyph unicode="&#x415;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842z" />
+<glyph unicode="&#x416;" d="M0 0l373 754l-361 708h178l349 -708v708h155v-708l342 708h178l-356 -708l371 -754h-185l-350 741v-741h-155v741l-357 -741h-182z" />
+<glyph unicode="&#x417;" d="M139 59v170q186 -96 383 -96q354 0 355 283q0 264 -394 264h-190v151h176q178 0 281 74q100 74 100 199q0 102 -70 164q-72 61 -188 61q-184 0 -354 -121l-93 125q193 150 455 150q209 0 326 -99q119 -100 118 -264q0 -135 -90 -229t-252 -121v-6q176 -20 273 -115 q96 -92 96 -233q0 -203 -141.5 -319.5t-403.5 -116.5q-243 -1 -387 79z" />
+<glyph unicode="&#x418;" d="M137 0v1462h174v-800q0 -106 -8 -254l-6 -150h6l578 1204h213v-1462h-172v793q0 141 18 417h-8l-580 -1210h-215z" />
+<glyph unicode="&#x419;" d="M137 0v1462h174v-800q0 -106 -8 -254l-6 -150h6l578 1204h213v-1462h-172v793q0 141 18 417h-8l-580 -1210h-215zM231 1897h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
+<glyph unicode="&#x41a;" d="M211 0v1462h186v-708l566 708h206l-565 -702l594 -760h-219l-582 741v-741h-186z" />
+<glyph unicode="&#x41b;" d="M4 2v150q57 -25 113 -25q102 0 157 180q53 176 181 1155h639v-1462h-187v1298h-297q-117 -979 -204 -1148q-89 -172 -265 -173q-71 0 -137 25z" />
+<glyph unicode="&#x41c;" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151z" />
+<glyph unicode="&#x41d;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187z" />
+<glyph unicode="&#x41e;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
+<glyph unicode="&#x41f;" d="M135 0v1462h959v-1462h-187v1298h-585v-1298h-187z" />
+<glyph unicode="&#x420;" d="M176 0v1462h404q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-569h-186zM362 727h170q195 0 283 72q86 70 86 225q0 279 -338 279h-201v-576z" />
+<glyph unicode="&#x421;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557z" />
+<glyph unicode="&#x422;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418z" />
+<glyph unicode="&#x423;" d="M27 1462h204l383 -809q2 -4 21 -47l7 -21.5t9 -23.5h2l39 109l312 792h196l-428 -1030q-80 -190 -135 -268q-61 -86 -150 -135t-215 -49q-104 0 -178 30v185q84 -45 178 -45q111 0 170 51q59 49 115 174z" />
+<glyph unicode="&#x424;" d="M27 758q0 238 122.5 391.5t335.5 153.5h47v180h166v-180h47q213 0 336 -154t123 -391q0 -233 -127 -396q-125 -158 -354 -157h-25v-225h-166v225h-24q-230 0 -356 160q-125 157 -125 393zM199 762q0 -184 86 -293q86 -106 241 -107h6v781h-32q-141 0 -221 -104.5 t-80 -276.5zM698 362h7q156 0 241 107q86 109 86 293q0 172 -80 276.5t-221 104.5h-33v-781z" />
+<glyph unicode="&#x425;" d="M53 0l453 764l-422 698h199l331 -559l334 559h191l-422 -692l457 -770h-211l-355 635l-366 -635h-189z" />
+<glyph unicode="&#x426;" d="M135 0v1462h187v-1296h526v1296h186v-1296h176v-551h-176v385h-899z" />
+<glyph unicode="&#x427;" d="M135 879v583h187v-559q0 -131 51 -180q55 -51 162 -51q154 0 372 80v710h187v-1462h-187v598q-229 -90 -393 -90q-379 0 -379 371z" />
+<glyph unicode="&#x428;" d="M121 0v1462h166v-1296h245v1296h166v-1296h246v1296h166v-1462h-989z" />
+<glyph unicode="&#x429;" d="M61 0v1462h166v-1296h246v1296h166v-1296h246v1296h166v-1296h178v-551h-176v385h-992z" />
+<glyph unicode="&#x42a;" d="M27 1298v164h485v-616h68q270 0 415.5 -108.5t145.5 -309.5q0 -203 -137.5 -315.5t-397.5 -112.5h-280v1298h-299zM512 160h98q338 0 338 268q0 131 -86 192.5t-282 61.5h-68v-522z" />
+<glyph unicode="&#x42b;" d="M96 0v1462h166v-616h47q541 0 541 -418q0 -207 -131 -317q-133 -111 -383 -111h-240zM262 160h78q338 0 338 268q0 131 -86 192.5t-283 61.5h-47v-522zM967 0v1462h166v-1462h-166z" />
+<glyph unicode="&#x42c;" d="M176 0v1462h186v-616h191q541 0 541 -418q0 -207 -131.5 -317.5t-382.5 -110.5h-404zM362 160h201q338 0 338 268q0 131 -86 192.5t-283 61.5h-170v-522z" />
+<glyph unicode="&#x42d;" d="M68 1397q160 86 383 86q305 0 477 -194.5t172 -530.5q0 -375 -170 -576q-172 -203 -488 -202q-209 0 -358 59v162q193 -57 328 -58q473 0 489 541h-629v162h625q-18 223 -137 348t-309 125q-150 0 -306 -78z" />
+<glyph unicode="&#x42e;" d="M98 0v1462h166v-616h144q18 346 106 493q86 145 270 146q190 0 283 -176q92 -174 92 -576q0 -397 -92 -575t-285 -178q-190 0 -280 157q-88 156 -99 545h-139v-682h-166zM580 733q0 -346 47 -469q47 -121 155 -121t154 117q47 119 47 473q0 365 -47 473q-49 115 -154 115 q-111 0 -155 -119q-47 -123 -47 -469z" />
+<glyph unicode="&#x42f;" d="M57 0l381 655q-272 98 -272 408q0 399 504 399h372v-1462h-186v604h-246l-334 -604h-219zM358 1047q0 -137 82 -211q84 -74 236 -74h180v541h-188q-310 0 -310 -256z" />
+<glyph unicode="&#x430;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164z" />
+<glyph unicode="&#x431;" d="M143 659q0 212 31 357q31 143 82 231q49 84 123 142q72 55 170 81q90 25 491 101l33 -160q-408 -70 -500 -100q-102 -35 -165 -140q-61 -104 -72 -319h12q117 170 336 170q186 0 292.5 -131t106.5 -361q0 -262 -125 -405q-127 -145 -346 -145t-344 180t-125 499zM332 655 q0 -524 293 -524q266 0 266 375q0 365 -240 364q-96 0 -184 -63q-90 -66 -135 -152z" />
+<glyph unicode="&#x432;" d="M176 0v1098h510q387 0 387 -277q0 -197 -229 -239v-7q264 -34 264 -258q0 -152 -107 -233q-109 -84 -313 -84h-512zM358 150h318q254 0 254 180q0 92 -66 129q-61 35 -192 35h-314v-344zM358 647h293q135 0 191 35q57 37 57 121q0 141 -217 141h-324v-297z" />
+<glyph unicode="&#x433;" d="M291 0v1098h747v-154h-565v-944h-182z" />
+<glyph unicode="&#x434;" d="M33 154h86q264 393 266 944h592v-944h151v-535h-174v381h-747v-381h-174v535zM311 154h484v804h-250q-37 -481 -234 -804z" />
+<glyph unicode="&#x435;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305z" />
+<glyph unicode="&#x436;" d="M0 1098h184l351 -533v533h159v-533l350 533h185l-367 -533l365 -565h-195l-338 557v-557h-159v557l-338 -557h-195l367 565z" />
+<glyph unicode="&#x437;" d="M201 1042q158 76 370 76q205 0 315.5 -73.5t110.5 -215.5q0 -184 -192 -243v-11q227 -63 227 -272q0 -152 -121 -237q-120 -86 -344 -86q-233 0 -362 69v166q180 -86 366 -86q283 0 283 180q0 184 -311 185h-150v153h113q172 0 244 39q74 39 73 127q0 154 -250 154 q-131 0 -309 -72z" />
+<glyph unicode="&#x438;" d="M160 0v1098h172v-668l-13 -252l517 920h233v-1098h-172v647l10 271l-514 -918h-233z" />
+<glyph unicode="&#x439;" d="M160 0v1098h172v-668l-13 -252l517 920h233v-1098h-172v647l10 271l-514 -918h-233zM268 1559h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
+<glyph unicode="&#x43a;" d="M215 0v1098h180v-533l518 533h222l-527 -527l566 -571h-232l-547 557v-557h-180z" />
+<glyph unicode="&#x43b;" d="M31 -2v131q22 -6 49 -6q111 0 178 237q68 237 104 738h678v-1098h-182v944h-340q-37 -487 -127 -725q-88 -233 -268 -233q-61 0 -92 12z" />
+<glyph unicode="&#x43c;" d="M115 0v1098h211l215 -656q23 -72 73 -268q2 4 54 191q10 47 20 73l219 660h207v-1098h-151v897q-8 -23 -33 -127q-18 -74 -35 -123l-213 -647h-135l-213 647q-2 6 -10.5 35t-24.5 91.5l-33 123.5v-897h-151z" />
+<glyph unicode="&#x43d;" d="M160 0v1098h182v-455h545v455h182v-1098h-182v489h-545v-489h-182z" />
+<glyph unicode="&#x43e;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416z" />
+<glyph unicode="&#x43f;" d="M160 0v1098h909v-1098h-182v944h-545v-944h-182z" />
+<glyph unicode="&#x440;" d="M158 -492v1590h147l27 -148h8q111 168 322 168q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12q12 -129 12 -162v-469h-182zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-152 0 -219.5 -88t-69.5 -287 v-41z" />
+<glyph unicode="&#x441;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418z" />
+<glyph unicode="&#x442;" d="M121 944v154h985v-154h-401v-944h-183v944h-401z" />
+<glyph unicode="&#x443;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150z" />
+<glyph unicode="&#x444;" d="M74 551q0 524 463 563v442h157v-442q459 -49 459 -563q0 -524 -459 -567v-476h-157v476q-463 45 -463 567zM242 551q0 -385 295 -416v828q-295 -28 -295 -412zM694 135q291 33 291 416q0 377 -291 410v-826z" />
+<glyph unicode="&#x445;" d="M96 0l414 563l-393 535h207l290 -410l291 410h207l-395 -535l413 -563h-206l-310 436l-311 -436h-207z" />
+<glyph unicode="&#x446;" d="M152 0v1098h182v-944h504v944h182v-944h160v-535h-183v381h-845z" />
+<glyph unicode="&#x447;" d="M152 676v422h182v-410q0 -174 205 -174q170 0 340 115v469h182v-1098h-182v489q-182 -127 -381 -127q-160 0 -252 87q-94 88 -94 227z" />
+<glyph unicode="&#x448;" d="M125 0v1098h162v-944h248v944h161v-944h248v944h162v-1098h-981z" />
+<glyph unicode="&#x449;" d="M109 0v1098h161v-944h248v944h162v-944h248v944h162v-944h118v-535h-161v381h-938z" />
+<glyph unicode="&#x44a;" d="M43 944v154h543v-451h153q416 0 416 -311q0 -336 -420 -336h-332v944h-360zM586 150h137q254 0 254 172q0 90 -59.5 131t-198.5 41h-133v-344z" />
+<glyph unicode="&#x44b;" d="M113 0v1098h161v-451h134q416 0 415 -311q0 -336 -420 -336h-290zM274 150h138q254 0 254 172q0 90 -59.5 131t-198.5 41h-134v-344zM952 0v1098h162v-1098h-162z" />
+<glyph unicode="&#x44c;" d="M217 0v1098h182v-451h277q416 0 416 -311q0 -336 -420 -336h-455zM399 150h260q254 0 254 172q0 90 -59 131t-199 41h-256v-344z" />
+<glyph unicode="&#x44d;" d="M184 1059q156 59 332 59q268 0 406 -145q139 -150 139 -430q0 -270 -143 -416q-143 -147 -408 -147q-187 0 -320 61v160q162 -61 316 -62q350 0 368 348h-538v154h536q-29 317 -364 317q-111 0 -262 -57z" />
+<glyph unicode="&#x44e;" d="M123 0v1098h162v-455h151q33 475 367 475q172 0 266 -147q96 -150 96 -420q0 -571 -368 -571q-335 0 -363 509h-149v-489h-162zM602 551q0 -219 47 -319.5t151.5 -100.5t149.5 98q47 100 47 322q0 217 -47 317q-45 98 -151 99q-102 0 -150 -97q-47 -98 -47 -319z" />
+<glyph unicode="&#x44f;" d="M115 0l291 461q-233 68 -234 315q0 150 102.5 236t274.5 86h485v-1098h-182v432h-285l-254 -432h-198zM346 772q0 -186 238 -186h268v358h-295q-211 0 -211 -172z" />
+<glyph unicode="&#x451;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM348 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM723 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x452;" d="M4 1237v137h156v182h182v-182h379v-137h-379v-184l-8 -144h10q106 168 334 168q391 0 391 -401v-834q0 -334 -291 -334q-82 0 -133 25v148q53 -20 115 -21q127 0 127 170v836q0 260 -236 260q-160 0 -235 -95q-74 -92 -74 -303v-528h-182v1237h-156z" />
+<glyph unicode="&#x453;" d="M291 0v1098h747v-154h-565v-944h-182zM522 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x454;" d="M172 543q0 281 145 430q143 145 414 145q176 0 330 -59l-62 -158q-147 57 -262 57q-346 0 -377 -317h537v-154h-539q23 -348 369 -348q154 0 315 62v-160q-132 -61 -319 -61q-264 0 -408 147q-143 146 -143 416z" />
+<glyph unicode="&#x455;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69z" />
+<glyph unicode="&#x456;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM526 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5z" />
+<glyph unicode="&#x457;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x458;" d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154zM637 1435.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
+<glyph unicode="&#x459;" d="M0 -2v131q22 -6 49 -6q41 0 66 43q27 45 47 231q27 233 57 701h494v-451h51q416 0 416 -311q0 -336 -420 -336h-209v944h-186q-33 -463 -60 -663q-25 -188 -72 -241.5t-141 -53.5q-61 0 -92 12zM713 150h55q254 0 254 172q0 90 -59.5 131t-198.5 41h-51v-344z" />
+<glyph unicode="&#x45a;" d="M106 0v1098h162v-455h299v455h162v-451h51q416 0 416 -311q0 -336 -420 -336h-209v489h-299v-489h-162zM729 150h55q254 0 254 172q0 90 -59 131t-199 41h-51v-344z" />
+<glyph unicode="&#x45b;" d="M4 1237v137h156v182h184v-182h418v-137h-420v-184l-10 -144h10q106 168 346 168q190 0 287 -96q94 -94 94 -305v-676h-182v666q0 260 -236 260q-160 0 -235 -95q-74 -92 -74 -303v-528h-182v1237h-156z" />
+<glyph unicode="&#x45c;" d="M215 0v1098h180v-291l-16 -299h4l137 166l402 424h213l-494 -510l522 -588h-213l-426 469l-129 -82v-387h-180zM508 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x45e;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM241 1559h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174 q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
+<glyph unicode="&#x45f;" d="M160 0v1098h182v-944h545v944h182v-1098h-354v-381h-183v381h-372z" />
+<glyph unicode="&#x490;" d="M233 0v1462h637v301h177v-467h-627v-1296h-187z" />
+<glyph unicode="&#x491;" d="M291 0v1098h545v319h182v-456h-545v-961h-182z" />
+<glyph unicode="&#x1e00;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM389 -340q0 47 16 90q16 41 46 68q31 29 69 43q37 14 92 14q49 0 90 -14q39 -14 72 -43t49 -66q18 -39 19 -90q0 -57 -17 -92 q-18 -40 -49 -67.5t-74 -43.5q-41 -14 -90 -14q-55 0 -92 14q-39 14 -69 43q-29 27 -46 68q-16 43 -16 90zM500 -340q0 -51 28 -84q27 -29 84 -29q53 0 82 29q31 31 31 84t-31 84q-29 29 -82 29q-51 0 -80 -29q-32 -33 -32 -84z" />
+<glyph unicode="&#x1e01;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM383 -340q0 47 16 90q16 41 46 68q31 29 69 43q37 14 92 14q49 0 90 -14q39 -14 72 -43t49 -66q18 -39 19 -90q0 -57 -17 -92q-18 -40 -49 -67.5t-74 -43.5q-41 -14 -90 -14q-55 0 -92 14q-39 14 -69 43q-29 27 -46 68 q-16 43 -16 90zM494 -340q0 -51 28 -84q27 -29 84 -29q53 0 82 29q31 31 31 84t-31 84q-29 29 -82 29q-51 0 -80 -29q-32 -33 -32 -84z" />
+<glyph unicode="&#x1e3e;" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151zM518 1581v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1e3f;" d="M92 0v1098h127l27 -148h10q68 168 201 168q164 0 213 -182h6q78 182 219 182q129 0 186 -92q57 -90 58 -309v-717h-162v707q0 147 -27 202q-27 57 -88 58q-88 0 -127 -82q-39 -80 -39 -279v-606h-161v707q0 260 -125 260q-82 0 -119 -80t-37 -318v-569h-162zM545 1241v27 q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1e80;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM336 1886v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
+<glyph unicode="&#x1e81;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM303 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#x1e82;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM500 1579v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1e83;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM522 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
+<glyph unicode="&#x1e84;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM334 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5 t-96 102.5zM709 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x1e85;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5 q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
+<glyph unicode="&#x1ef2;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM303 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#x1ef3;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM314 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
+<glyph unicode="&#x1f4d;" d="M229 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM426 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM-311 1255q0 78 59 136q61 57 183 88v-76 q-55 -18 -88 -45q-29 -23 -29 -47q0 -18 16 -29l33 -16q18 -10 33 -21q16 -12 16 -41q0 -39 -24.5 -57.5t-71.5 -18.5q-57 0 -92 35t-35 92zM-2 1135v26l23 68l24 76l25 81q4 16 10 44t8 32h207v-20l-43 -70l-51 -80q-6 -10 -59 -80q-31 -41 -62 -77h-82z" />
+<glyph unicode="&#x2000;" />
+<glyph unicode="&#x2001;" />
+<glyph unicode="&#x2002;" />
+<glyph unicode="&#x2003;" />
+<glyph unicode="&#x2004;" />
+<glyph unicode="&#x2005;" />
+<glyph unicode="&#x2006;" />
+<glyph unicode="&#x2007;" />
+<glyph unicode="&#x2008;" />
+<glyph unicode="&#x2009;" />
+<glyph unicode="&#x200a;" />
+<glyph unicode="&#x200b;" />
+<glyph unicode="&#x2010;" d="M285 465v168h659v-168h-659z" />
+<glyph unicode="&#x2011;" d="M285 465v168h659v-168h-659z" />
+<glyph unicode="&#x2012;" d="M285 465v168h659v-168h-659z" />
+<glyph unicode="&#x2013;" d="M184 465v168h860v-168h-860z" />
+<glyph unicode="&#x2014;" d="M-6 465v168h1241v-168h-1241z" />
+<glyph unicode="&#x2015;" d="M-6 465v168h1241v-168h-1241z" />
+<glyph unicode="&#x2017;" d="M-20 -45h1269v-139h-1269v139zM-20 -324h1269v-139h-1269v139z" />
+<glyph unicode="&#x2018;" d="M446 983q57 217 177 479h157q-66 -276 -100 -501h-219z" />
+<glyph unicode="&#x2019;" d="M446 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158z" />
+<glyph unicode="&#x201a;" d="M457 -264q76 309 100 502h199l14 -23q-53 -207 -176 -479h-137z" />
+<glyph unicode="&#x201b;" d="M446 1440l15 22h219q41 -270 100 -501h-157q-126 278 -177 479z" />
+<glyph unicode="&#x201c;" d="M233 983q57 217 177 479h157q-66 -276 -100 -501h-219zM659 983q57 217 177 479h157q-66 -276 -100 -501h-219z" />
+<glyph unicode="&#x201d;" d="M233 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158zM659 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158z" />
+<glyph unicode="&#x201e;" d="M244 -264q76 309 100 502h199l14 -23q-53 -207 -176 -479h-137zM670 -264q76 309 100 502h199l14 -23q-55 -209 -176 -479h-137z" />
+<glyph unicode="&#x2020;" d="M240 989v180l311 -30l-55 417h217l-56 -417l332 30v-180l-332 31l56 -1020h-217l55 1020z" />
+<glyph unicode="&#x2021;" d="M229 346v180l332 -30l-47 290l47 275l-332 -31v180l332 -30l-55 376h217l-55 -376l331 30v-180l-331 31l47 -275l-47 -290l331 30v-180l-331 31l55 -377h-217l55 377z" />
+<glyph unicode="&#x2022;" d="M379 748q0 262 235.5 262t235.5 -262q0 -129 -64 -195q-65 -68 -172 -68q-113 0 -174 68t-61 195z" />
+<glyph unicode="&#x2026;" d="M78 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM487 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM897 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5z" />
+<glyph unicode="&#x202f;" horiz-adv-x="430" />
+<glyph unicode="&#x2030;" d="M4 655l698 289l41 -100l-698 -287zM20 1171q0 309 244 310q113 0 176 -80q63 -78 64 -230q0 -311 -244 -311q-113 0 -176.5 82t-63.5 229zM156 1171q0 -102 22.5 -153t84 -51t83.5 51q20 47 21 153q0 119 -23 158q-25 43 -82 43q-55 0 -82 -45q-24 -43 -24 -156zM195 311 q0 309 243 310q111 0 176 -80q63 -78 64 -230q0 -311 -244 -311q-115 0 -176 82q-63 86 -63 229zM330 311q0 -104 22 -155q20 -49 84 -49.5t84 49.5q20 47 21 155q0 119 -23 158q-25 43 -82 43q-55 0 -82 -45q-24 -43 -24 -156zM725 311q0 309 244 310q113 0 176 -80 q63 -78 63 -230q0 -311 -243 -311q-115 0 -177 82q-63 86 -63 229zM860 311q0 -104 23 -155q23 -49 84 -49.5t84 49.5q20 47 20 155q0 113 -22 158q-20 43 -82 43q-59 0 -84 -43q-23 -39 -23 -158z" />
+<glyph unicode="&#x2032;" d="M496 1462h237l-41 -528h-155z" />
+<glyph unicode="&#x2033;" d="M285 1462h237l-41 -528h-155zM707 1462h237l-41 -528h-155z" />
+<glyph unicode="&#x2039;" d="M401 526v27l310 414l116 -78l-237 -348l237 -348l-116 -78z" />
+<glyph unicode="&#x203a;" d="M401 193l238 348l-238 348l117 78l309 -414v-27l-309 -411z" />
+<glyph unicode="&#x203c;" d="M718 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM735 1462h223l-51 -1048h-121zM256 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM273 1462h223l-51 -1048h-121z" />
+<glyph unicode="&#x2044;" d="M170 0l729 1462h158l-729 -1462h-158z" />
+<glyph unicode="&#x205f;" horiz-adv-x="538" />
+<glyph unicode="&#x207f;" d="M317 797v665h125l17 -104h8q68 121 207 121q109 0 174 -66q63 -63 63 -184v-432h-147v413q0 150 -127 150q-98 0 -135 -53q-37 -52 -37 -172v-338h-148z" />
+<glyph unicode="&#x20a3;" d="M129 262v137h176v1063h752v-164h-574v-516h535v-164h-535v-219h293v-137h-293v-262h-178v262h-176z" />
+<glyph unicode="&#x20a4;" d="M119 0v154q201 49 200 284v21h-198v137h198v158h-198v137h198v221q0 166 109 268q106 100 289 101q193 0 346 -80l-66 -144q-143 72 -272 72q-223 0 -223 -246v-192h377v-137h-377v-158h377v-137h-377v-19q0 -199 -140 -274h748v-166h-991z" />
+<glyph unicode="&#x20a7;" d="M82 0v1462h205q451 0 450 -428q0 -219 -114 -344q-113 -121 -342 -121h-41v-569h-158zM240 715h41q293 0 292 309q0 291 -268 291h-65v-600zM688 618v70l115 51l65 215h86v-211h209v-125h-209v-348q0 -154 113 -153q63 0 123 20v-125q-70 -33 -166 -32q-221 0 -221 282 v356h-115z" />
+<glyph unicode="&#x20ac;" d="M96 502v137h148l-2 39l2 119h-148v137h160q41 262 180 405q141 143 359 144q193 0 335 -92l-79 -146q-123 74 -242 74q-133 0 -234 -100q-96 -96 -133 -285h432v-137h-446q0 -6 -1 -14.5t-1 -14.5v-25v-61q0 -29 2 -43h385v-137h-367q74 -358 369 -359q139 0 268 58v-162 q-125 -59 -282 -59q-444 0 -541 522h-164z" />
+<glyph unicode="&#x2105;" d="M8 1126q0 168 90 258q88 88 252 89q100 0 182 -37l-32 -107q-80 33 -150 33q-199 0 -198 -234q0 -229 194 -229q104 0 176 33v-107q-74 -37 -182 -37q-156 0 -244 86t-88 252zM156 0l729 1462h157l-729 -1462h-157zM616 334q0 164 82 252q84 90 224 90q129 0 217 -94 q84 -90 84 -248q0 -160 -82 -250q-84 -92 -223 -92q-131 0 -218 92q-84 90 -84 250zM762 334q0 -233 158 -234q156 0 155 234q0 231 -155 231q-158 0 -158 -231z" />
+<glyph unicode="&#x2113;" d="M227 510v121q66 16 193 59v494q0 137 69 219q68 80 201 80q109 0 172.5 -82t63.5 -219q0 -354 -340 -541v-301q0 -221 145 -221q143 0 154 213h114q-18 -352 -286 -352q-138 0 -215 92q-78 94 -78 264v231q-105 -37 -193 -57zM586 770q207 121 207 406q0 188 -103 188 q-53 0 -78 -41q-27 -43 -26 -147v-406z" />
+<glyph unicode="&#x2116;" d="M25 0v1462h176l323 -1163h6q-14 285 -14 403v760h133v-1462h-174l-325 1169h-9q18 -252 19 -417v-752h-135zM705 623q0 346 253 346q115 0 182.5 -92.5t67.5 -253.5q0 -168 -65.5 -258.5t-188.5 -90.5q-115 0 -182 92.5t-67 256.5zM745 0v147h414v-147h-414zM844 623 q0 -111 24 -170q25 -57 88 -58q61 0 86 58q25 59 25 170q0 113 -24.5 168t-86.5 55q-63 0 -87.5 -55t-24.5 -168z" />
+<glyph unicode="&#x2122;" d="M0 1354v108h481v-108h-178v-613h-127v613h-176zM526 741v721h187l139 -534l149 534h179v-721h-127v342q0 74 10 207h-12l-154 -549h-100l-146 549h-12l10 -180v-369h-123z" />
+<glyph unicode="&#x2126;" d="M74 0v164h266q-254 233 -254 661q0 313 139 486q141 174 391 174q248 0 390 -174q141 -176 141 -486q0 -428 -256 -661h268v-164h-469v147q260 229 260 674q0 500 -335.5 500t-335.5 -500q0 -442 262 -674v-147h-467z" />
+<glyph unicode="&#x212e;" d="M82 530q0 260 154 414q152 152 376 152q229 0 381 -156q150 -152 150 -405v-5h-828v-356q123 -123 297 -123q254 0 396 234l71 -41q-98 -158 -207 -217q-111 -61 -260 -62q-242 0 -385 162q-145 163 -145 403zM315 616h596v277q-119 119 -301 119q-172 0 -295 -117v-279z " />
+<glyph unicode="&#x215b;" d="M19 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51zM115 0l729 1462h158l-729 -1462h-158zM647 211q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207 q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM793 211q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6q-118 -65 -118 -153zM819 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
+<glyph unicode="&#x215c;" d="M10 705v124q113 -66 203 -65q150 0 149 137q0 125 -147 125h-72v104h70q123 0 123 127q0 111 -97 111q-74 0 -161 -70l-66 86q111 92 238 93q113 0 174 -54q63 -55 63 -149q0 -139 -149 -189q176 -41 176 -186q0 -117 -74 -180q-72 -63 -215 -64q-132 1 -215 50zM154 0 l729 1462h158l-729 -1462h-158zM667 211q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM813 211q0 -117 131 -117 q135 0 135 117q0 89 -135 147l-13 6q-118 -65 -118 -153zM839 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
+<glyph unicode="&#x215d;" d="M25 705v129q102 -68 207 -68q162 0 162 147q0 145 -166 146q-59 0 -125 -17l-62 39l31 381h397v-110h-288l-17 -193q33 6 96 6q115 0 191 -65q74 -63 74 -174q0 -127 -74 -199q-72 -70 -221 -70q-129 1 -205 48zM154 0l729 1462h158l-729 -1462h-158zM667 211 q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM813 211q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6 q-118 -65 -118 -153zM839 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
+<glyph unicode="&#x215e;" d="M27 1341v121h548v-100l-309 -690h-155l309 669h-393zM88 0l729 1462h158l-729 -1462h-158zM667 211q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62 q-133 0 -209 60q-74 60 -74 162zM813 211q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6q-118 -65 -118 -153zM839 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
+<glyph unicode="&#x2202;" d="M121 375q0 250 137 442.5t383 192.5q184 0 283 -148l2 39q10 184 -58 303q-68 121 -219 121q-131 0 -258 -84v174q135 61 283 62q432 0 432 -543q0 -391 -168 -672q-169 -283 -455 -282q-362 0 -362 395zM309 369q0 -236 187 -236q137 0 247.5 153.5t147.5 393.5 q-20 84 -86 137t-139 53q-160 0 -258.5 -159.5t-98.5 -341.5z" />
+<glyph unicode="&#x2206;" d="M74 0v113l446 1349h187l448 -1351v-111h-1081zM274 164h678l-247 758q-57 176 -93 340q-47 -207 -88 -334z" />
+<glyph unicode="&#x220f;" d="M156 -492v1954h956v-1954h-186v1788h-584v-1788h-186z" />
+<glyph unicode="&#x2211;" d="M74 -377l583 914l-567 811v114h1014v-164h-754l529 -759l-555 -867h845v-164h-1095v115z" />
+<glyph unicode="&#x2212;" d="M152 647v150h923v-150h-923z" />
+<glyph unicode="&#x221a;" d="M23 764v143h296l230 -663l512 1452h145l-594 -1710h-133l-276 778h-180z" />
+<glyph unicode="&#x221e;" d="M70 723q0 133 75 225q74 90 193 90q166 0 274 -219q117 213 281 213q117 0 190.5 -86t73.5 -229q0 -133 -76 -223q-78 -92 -188 -93q-172 0 -283 220q-117 -213 -272 -213q-117 0 -192.5 88t-75.5 227zM205 721q0 -80 41 -131t106 -51q102 0 189 184q-83 184 -191 184 q-63 0 -104 -53t-41 -133zM684 717q86 -184 193 -185q66 0 104 54q41 57 41 133q0 82 -41 131q-43 51 -107 51q-104 0 -190 -184z" />
+<glyph unicode="&#x222b;" d="M236 -326q61 -25 116 -24q180 0 180 233v1319q0 354 330 354q88 0 131 -18v-147q-59 27 -114 26q-172 0 -172 -233v-1321q0 -176 -89 -264q-90 -90 -249 -91q-78 0 -133 19v147z" />
+<glyph unicode="&#x2248;" d="M152 379v162q98 109 247 108q102 0 248 -63q129 -55 201 -56q106 0 227 121v-162q-98 -109 -248 -108q-102 0 -247 63q-133 55 -201 56q-106 0 -227 -121zM152 788v162q98 109 247 109q100 0 248 -64q127 -55 201 -55q111 0 227 121v-162q-98 -109 -248 -108 q-102 0 -247 63q-129 55 -201 55q-112 0 -227 -121z" />
+<glyph unicode="&#x2260;" d="M152 442v150h317l121 260h-438v149h507l134 283l137 -59l-105 -224h250v-149h-319l-123 -260h442v-150h-512l-129 -278l-137 57l102 221h-247z" />
+<glyph unicode="&#x2264;" d="M152 0v150h923v-150h-923zM152 672v102l923 451v-160l-715 -342l715 -342v-160z" />
+<glyph unicode="&#x2265;" d="M152 0v150h923v-150h-923zM152 221v160l714 342l-714 342v160l923 -451v-102z" />
+<glyph unicode="&#x25ca;" d="M125 735l450 740h76l453 -738l-453 -737h-76zM309 737l305 -514l306 514l-306 512z" />
+<glyph unicode="&#xe000;" horiz-adv-x="1100" d="M0 1100h1100v-1100h-1100v1100z" />
+<glyph unicode="&#xfb01;" d="M49 961v75l195 68v96q0 190 75.5 278.5t255.5 88.5q96 0 197 -37l-47 -141q-82 29 -143 28q-90 0 -123 -51q-33 -53 -33 -164v-104h246v-137h-246v-961h-182v961h-195zM854 1394.5q0 114.5 106.5 114.5t106.5 -114q0 -58 -31 -86q-33 -29 -75 -29q-107 0 -107 114.5z M868 0v1098h183v-1098h-183z" />
+<glyph unicode="&#xfb02;" d="M49 961v75l195 68v96q0 190 75.5 278.5t255.5 88.5q96 0 197 -37l-47 -141q-82 29 -143 28q-90 0 -123 -51q-33 -53 -33 -164v-104h246v-137h-246v-961h-182v961h-195zM868 0v1556h183v-1556h-183z" />
+<glyph unicode="&#xfb03;" d="M66 971v65l100 62v82q0 109 20 176q23 76 58 112q37 39 96 60q55 18 127 18q57 0 92 -10q47 -14 78 -25q43 33 88 43q53 12 115 13q59 0 98 -11q49 -14 82 -26l-41 -131q-18 8 -64 20q-31 8 -71 8q-37 0 -66 -12q-27 -12 -45 -37q-16 -23 -26 -69q-8 -39 -9 -107v-104 h367v-1098h-164v971h-203v-971h-163v971h-205v-971h-164v971h-100zM330 1098h205v102q0 115 24 193q-29 8 -43 10q-29 4 -45 4q-39 0 -61 -10q-27 -12 -45 -37q-14 -18 -25 -70q-10 -47 -10 -108v-84z" />
+<glyph unicode="&#xfb04;" d="M66 971v65l100 62v82q0 109 20 176q23 76 58 112q37 39 96 60q55 18 127 18q57 0 92 -10q47 -14 78 -25q43 33 88 43q53 12 115 13q55 0 94 -11h131v-1556h-164v1421q-20 4 -29 4q-4 0 -14 1t-14 1q-37 0 -66 -12q-27 -12 -45 -37q-16 -23 -26 -69q-8 -39 -9 -107v-104 h142v-127h-142v-971h-163v971h-205v-971h-164v971h-100zM330 1098h205v102q0 115 24 193q-29 8 -43 10q-29 4 -45 4q-39 0 -61 -10q-27 -12 -45 -37q-14 -18 -25 -70q-10 -47 -10 -108v-84z" />
+<glyph unicode="&#xfeff;" />
+<glyph unicode="&#xfffc;" d="M55 39v270h111v-270h-111zM55 -80h111v-194h192v-109h-303v303zM55 430v272h111v-272h-111zM55 823v271h111v-271h-111zM55 1214v304h303v-111h-192v-193h-111zM254 1083.5q0 55.5 12 98.5q12 45 39 78q23 29 64 47t94 18t92 -18q45 -20 66 -47q27 -33 38 -78 q12 -43 12.5 -98.5t-12 -98.5t-38.5 -76q-25 -31 -66 -49q-39 -18 -92 -18t-94 18q-39 18 -64 49q-27 33 -39 76t-12 98.5zM354 1083.5q0 -75.5 27 -116.5t82 -41q59 0 82 41q27 47 26.5 116.5t-26.5 116.5q-23 41 -82 41q-55 0 -82 -41t-27 -116.5zM479 -274h271v-109h-271 v109zM479 1407v111h271v-111h-271zM535 326v469h137q92 0 133 -27q43 -28 43 -92q0 -40 -19 -68q-18 -27 -53 -33v-4q12 -2 33 -10q10 -4 27 -20q12 -12 18 -31q8 -25 8 -47q0 -63 -43 -100t-119 -37h-165zM633 408h59q37 0 53 18q14 16 15 47q0 27 -15 41q-16 16 -57 16 h-55v-122zM633 610h51q37 0 51.5 12.5t14.5 39t-16.5 39t-53.5 12.5h-47v-103zM709 -111q4 -2 15 -3t17 -1q12 -2 43 -2t47 15q20 16 21 55v244h-94v77h266v-77h-72v-242q0 -80 -45 -119q-43 -37 -112 -37q-37 0 -52 2q-25 4 -34 6v82zM870 -274h195v194h109v-303h-304v109z M870 1407v111h304v-304h-109v193h-195zM1065 39v270h109v-270h-109zM1065 430v272h109v-272h-109zM1065 823v271h109v-271h-109z" />
+<glyph unicode="&#xfffd;" d="M4 618l610 938l613 -938l-613 -937zM342 1014l66 -160q51 29 106 51q49 20 96 21q53 0 78 -27t25 -68q0 -25 -6.5 -47t-16.5 -36q-12 -18 -31 -37q-10 -10 -47 -43q-31 -29 -53 -54q-23 -27 -35 -53q-16 -39 -20 -55q-6 -31 -6 -66v-55h170v43q0 16 4 41q2 16 12 33 q6 10 29 33q27 27 45 40l61 62q25 23 45 59q18 29 27 66q8 33 8 82q0 125 -76 192q-78 68 -211 68q-35 0 -71 -6q-29 -4 -72 -21q-12 -4 -66 -28q-28 -12 -61 -35zM477 139.5q0 -67.5 33 -94.5q35 -29 82 -29q18 0 41 7q20 6 37 22q18 18 26 39q8 23 9 55q0 35 -9 58 q-8 20 -26 39q-14 14 -37 20t-41 6q-47 0 -82 -29q-33 -26 -33 -93.5z" />
+<glyph d="M231 1559h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
+<glyph d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154z" />
+<glyph d="M494 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
+<glyph d="M483 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
+<glyph d="M483 1241v21q0 20 45 118q45 100 119 189h98v-27q-61 -145 -83 -301h-179z" />
+<glyph d="M313 1026q0 453 299 453q150 0 226 -117q78 -119 77 -336q0 -457 -303 -457q-141 0 -221 117q-78 115 -78 340zM461 1026q0 -326 151 -326q156 0 156 326q0 324 -156 324q-151 0 -151 -324z" />
+<glyph d="M293 854v98l377 523h141v-508h84v-113h-84v-174h-143v174h-375zM438 967h230v176q0 83 6 172q-37 -70 -80 -131z" />
+<glyph d="M336 705v129q102 -68 207 -68q162 0 162 147q0 145 -166 146q-59 0 -125 -17l-62 39l31 381h397v-110h-288l-17 -193q33 6 96 6q115 0 191 -65q74 -63 74 -174q0 -127 -74 -199q-72 -70 -221 -70q-129 1 -205 48z" />
+<glyph d="M313 913q0 408 484 580l45 -109q-329 -111 -381 -325h10q61 92 201 92q115 0 178 -76q66 -78 65 -205q0 -133 -83.5 -217t-215.5 -84q-137 0 -219 93q-84 93 -84 251zM455 889q0 -84 47 -141.5t121 -57.5q68 0 110 45q41 43 41 133q0 172 -147 172q-74 0 -123 -42.5 t-49 -108.5z" />
+<glyph d="M367 1341v121h548v-100l-309 -690h-155l309 669h-393z" />
+<glyph d="M305 877q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM451 877q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6 q-118 -65 -118 -153zM477 1272q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
+<glyph d="M313 1178q0 133 80 219q78 84 211 84q141 0 227 -103q84 -98 84 -288q0 -520 -413 -521q-66 0 -111 15v125q41 -23 101 -23q272 0 286 315h-8q-71 -98 -197 -98q-123 0 -190 74q-70 76 -70 201zM453 1180q0 -164 149 -164q72 0 121 43t49 100q0 78 -45 141 q-43 61 -121 62q-68 0 -110 -47q-43 -46 -43 -135z" />
+<glyph d="M158 547q0 268 112 422q111 150 305 149q203 0 314 -168h8l27 148h147v-1121q0 -225 -119 -346q-121 -123 -336 -123q-195 0 -352 76v170q186 -96 350 -96q274 0 275 309v10q0 41 12 170h-12q-109 -168 -314 -167q-193 0 -305 149.5t-112 417.5zM346 545q0 -414 264 -414 q147 0 211 88q66 90 68 287v41q0 227 -67.5 323.5t-213.5 96.5q-262 0 -262 -422z" />
+<glyph d="M-18 735q0 362 163 557q162 193 473 193q299 0 465 -199q166 -200 166 -553q0 -549 -379 -708l338 -373l-153 -109l-367 441q-41 -4 -72 -4q-309 0 -471 196q-163 199 -163 559zM178 733q0 -590 438 -590q436 0 437 590q0 588 -435 588q-440 0 -440 -588z" />
+<glyph d="M348 1163l383 299h150v-1462h-176v913q0 147 8 361q-43 -47 -121 -113l-148 -121z" />
+<glyph d="M346 946v193q236 111 369 323h166v-1462h-179v823l5 408q-119 -154 -361 -285z" />
+<glyph d="M371 1092v127l301 34l71 209h113v-1462h-176v909q0 111 8 183h-317z" />
+<glyph d="M301 1255q0 78 59 136q61 57 183 88v-76q-55 -18 -88 -45q-29 -23 -29 -47q0 -18 16 -29l33 -16q18 -10 33 -21q16 -12 16 -41q0 -39 -24.5 -57.5t-71.5 -18.5q-57 0 -92 35t-35 92zM610 1135v26l23 68l24 76l25 81q4 16 10 44t8 32h207v-20l-43 -70l-51 -80 q-6 -10 -59 -80q-31 -41 -62 -77h-82z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e125bc1f314316f8f1cb856b9ddeb6c781820f76
GIT binary patch
literal 77800
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

literal 0
HcmV?d00001

diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..31d51be4a70549ed180284e9310313a8423c55ce
GIT binary patch
literal 46192
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

literal 0
HcmV?d00001

diff --git a/apps/files_texteditor/css/DroidSansMono/Google Android License.txt b/apps/files_texteditor/css/DroidSansMono/Google Android License.txt
new file mode 100644
index 0000000000..0a010886a1
--- /dev/null
+++ b/apps/files_texteditor/css/DroidSansMono/Google Android License.txt	
@@ -0,0 +1,18 @@
+Copyright (C) 2008 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+##########
+
+This directory contains the fonts for the platform. They are licensed
+under the Apache 2 license.
diff --git a/apps/files_texteditor/css/DroidSansMono/demo.html b/apps/files_texteditor/css/DroidSansMono/demo.html
new file mode 100644
index 0000000000..e305598817
--- /dev/null
+++ b/apps/files_texteditor/css/DroidSansMono/demo.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+	<title>Font Face Demo</title>
+	<link rel="stylesheet" href="stylesheet.css" type="text/css" charset="utf-8">
+	<style type="text/css" media="screen">
+		h1.fontface {font: 60px/68px 'DroidSansMonoRegular', Arial, sans-serif;letter-spacing: 0;}
+
+		p.style1 {font: 18px/27px 'DroidSansMonoRegular', Arial, sans-serif;}
+
+		#container {
+			width: 800px;
+			margin-left: auto;
+			margin-right: auto;
+		}
+	</style>
+</head>
+
+<body>
+	<div id="container">
+		<h1 class="fontface">Font-face Demo for the Droid Sans Mono Font</h1>
+
+
+
+	<p class="style1">Droid Sans Mono Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+		</div>
+</body>
+</html>
diff --git a/apps/files_texteditor/css/DroidSansMono/stylesheet.css b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
new file mode 100644
index 0000000000..5bf9122ed7
--- /dev/null
+++ b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
@@ -0,0 +1,15 @@
+/* Generated by Font Squirrel (http://www.fontsquirrel.com) on June 13, 2012 02:50:54 PM America/New_York */
+
+
+
+@font-face {
+    font-family: 'Droid Sans Mono';
+    src: url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot');
+    src: url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot?#iefix') format('embedded-opentype'),
+         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff') format('woff'),
+         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf') format('truetype'),
+         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg#DroidSansMonoRegular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
diff --git a/apps/files_texteditor/js/aceeditor/ace.js b/apps/files_texteditor/js/aceeditor/ace.js
index 6043589ac1..679230926e 100644
--- a/apps/files_texteditor/js/aceeditor/ace.js
+++ b/apps/files_texteditor/js/aceeditor/ace.js
@@ -1,4 +1,4 @@
-(function(){function g(a){if(typeof requirejs!="undefined"){var e=b.define;b.define=function(a,b,c){return typeof c!="function"?e.apply(this,arguments):e(a,b,function(a,d,e){return b[2]=="module"&&(e.packaged=!0),c.apply(this,arguments)})},b.define.packaged=!0;return}var f=function(a,b){return d("",a,b)};f.packaged=!0;var g=b;a&&(b[a]||(b[a]={}),g=b[a]),g.define&&(c.original=g.define),g.define=c,g.require&&(d.original=g.require),g.require=f}var a="",b=function(){return this}(),c=function(a,b,d){if(typeof a!="string"){c.original?c.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(d=b),c.modules||(c.modules={}),c.modules[a]=d},d=function(a,b,c){if(Object.prototype.toString.call(b)==="[object Array]"){var e=[];for(var g=0,h=b.length;g<h;++g){var i=f(a,b[g]);if(!i&&d.original)return d.original.apply(window,arguments);e.push(i)}c&&c.apply(null,e)}else{if(typeof b=="string"){var j=f(a,b);return!j&&d.original?d.original.apply(window,arguments):(c&&c(),j)}if(d.original)return d.original.apply(window,arguments)}},e=function(a,b){if(b.indexOf("!")!==-1){var c=b.split("!");return e(a,c[0])+"!"+e(a,c[1])}if(b.charAt(0)=="."){var d=a.split("/").slice(0,-1).join("/");b=d+"/"+b;while(b.indexOf(".")!==-1&&f!=b){var f=b;b=b.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return b},f=function(a,b){b=e(a,b);var f=c.modules[b];if(!f)return null;if(typeof f=="function"){var g={},h={id:b,uri:"",exports:g,packaged:!0},i=function(a,c){return d(b,a,c)},j=f(i,g,h);return g=j||h.exports,c.modules[b]=g,g}return f};g(a)})(),define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/multi_select","ace/worker/worker_client","ace/keyboard/hash_handler","ace/keyboard/state_handler","ace/placeholder","ace/config","ace/theme/textmate"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/dom"),e=a("./lib/event"),f=a("./editor").Editor,g=a("./edit_session").EditSession,h=a("./undomanager").UndoManager,i=a("./virtual_renderer").VirtualRenderer,j=a("./multi_select").MultiSelect;a("./worker/worker_client"),a("./keyboard/hash_handler"),a("./keyboard/state_handler"),a("./placeholder"),a("./config").init(),b.edit=function(b){typeof b=="string"&&(b=document.getElementById(b));var c=new g(d.getInnerText(b));c.setUndoManager(new h),b.innerHTML="";var k=new f(new i(b,a("./theme/textmate")));new j(k),k.setSession(c);var l={};return l.document=c,l.editor=k,k.resize(),e.addListener(window,"resize",function(){k.resize()}),b.env=l,k.env=l,k}}),define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(a,b,c){"use strict",a("./regexp"),a("./es5-shim")}),define("ace/lib/regexp",["require","exports","module"],function(a,b,c){function g(a){return(a.global?"g":"")+(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.extended?"x":"")+(a.sticky?"y":"")}function h(a,b,c){if(Array.prototype.indexOf)return a.indexOf(b,c);for(var d=c||0;d<a.length;d++)if(a[d]===b)return d;return-1}"use strict";var d={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},e=d.exec.call(/()??/,"")[1]===undefined,f=function(){var a=/^/g;return d.test.call(a,""),!a.lastIndex}();RegExp.prototype.exec=function(a){var b=d.exec.apply(this,arguments),c,i;if(typeof a=="string"&&b){!e&&b.length>1&&h(b,"")>-1&&(i=RegExp(this.source,d.replace.call(g(this),"g","")),d.replace.call(a.slice(b.index),i,function(){for(var a=1;a<arguments.length-2;a++)arguments[a]===undefined&&(b[a]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var j=1;j<b.length;j++)c=this._xregexp.captureNames[j-1],c&&(b[c]=b[j]);!f&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--}return b},f||(RegExp.prototype.test=function(a){var b=d.exec.call(this,a);return b&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--,!!b})}),define("ace/lib/es5-shim",["require","exports","module"],function(a,b,c){function p(a){try{return Object.defineProperty(a,"sentinel",{}),"sentinel"in a}catch(b){}}Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=g.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,h=c.apply(f,d.concat(g.call(arguments)));return h!==null&&Object(h)===h?h:f}return c.apply(b,d.concat(g.call(arguments)))};return e});var d=Function.prototype.call,e=Array.prototype,f=Object.prototype,g=e.slice,h=d.bind(f.toString),i=d.bind(f.hasOwnProperty),j,k,l,m,n;if(n=i(f,"__defineGetter__"))j=d.bind(f.__defineGetter__),k=d.bind(f.__defineSetter__),l=d.bind(f.__lookupGetter__),m=d.bind(f.__lookupSetter__);Array.isArray||(Array.isArray=function(b){return h(b)=="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(b){var c=G(this),d=arguments[1],e=0,f=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;while(e<f)e in c&&b.call(d,c[e],e,c),e++}),Array.prototype.map||(Array.prototype.map=function(b){var c=G(this),d=c.length>>>0,e=Array(d),f=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var g=0;g<d;g++)g in c&&(e[g]=b.call(f,c[g],g,c));return e}),Array.prototype.filter||(Array.prototype.filter=function(b){var c=G(this),d=c.length>>>0,e=[],f=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var g=0;g<d;g++)g in c&&b.call(f,c[g],g,c)&&e.push(c[g]);return e}),Array.prototype.every||(Array.prototype.every=function(b){var c=G(this),d=c.length>>>0,e=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var f=0;f<d;f++)if(f in c&&!b.call(e,c[f],f,c))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(b){var c=G(this),d=c.length>>>0,e=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var f=0;f<d;f++)if(f in c&&b.call(e,c[f],f,c))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(b){var c=G(this),d=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;if(!d&&arguments.length==1)throw new TypeError;var e=0,f;if(arguments.length>=2)f=arguments[1];else do{if(e in c){f=c[e++];break}if(++e>=d)throw new TypeError}while(!0);for(;e<d;e++)e in c&&(f=b.call(void 0,f,c[e],e,c));return f}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(b){var c=G(this),d=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;if(!d&&arguments.length==1)throw new TypeError;var e,f=d-1;if(arguments.length>=2)e=arguments[1];else do{if(f in c){e=c[f--];break}if(--f<0)throw new TypeError}while(!0);do f in this&&(e=b.call(void 0,e,c[f],f,c));while(f--);return e}),Array.prototype.indexOf||(Array.prototype.indexOf=function(b){var c=G(this),d=c.length>>>0;if(!d)return-1;var e=0;arguments.length>1&&(e=E(arguments[1])),e=e>=0?e:Math.max(0,d+e);for(;e<d;e++)if(e in c&&c[e]===b)return e;return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(b){var c=G(this),d=c.length>>>0;if(!d)return-1;var e=d-1;arguments.length>1&&(e=Math.min(e,E(arguments[1]))),e=e>=0?e:d-Math.abs(e);for(;e>=0;e--)if(e in c&&b===c[e])return e;return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(b){return b.__proto__||(b.constructor?b.constructor.prototype:f)});if(!Object.getOwnPropertyDescriptor){var o="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(b,c){if(typeof b!="object"&&typeof b!="function"||b===null)throw new TypeError(o+b);if(!i(b,c))return;var d,e,g;d={enumerable:!0,configurable:!0};if(n){var h=b.__proto__;b.__proto__=f;var e=l(b,c),g=m(b,c);b.__proto__=h;if(e||g)return e&&(d.get=e),g&&(d.set=g),d}return d.value=b[c],d}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(b){return Object.keys(b)}),Object.create||(Object.create=function(b,c){var d;if(b===null)d={__proto__:null};else{if(typeof b!="object")throw new TypeError("typeof prototype["+typeof b+"] != 'object'");var e=function(){};e.prototype=b,d=new e,d.__proto__=b}return c!==void 0&&Object.defineProperties(d,c),d});if(Object.defineProperty){var q=p({}),r=typeof document=="undefined"||p(document.createElement("div"));if(!q||!r)var s=Object.defineProperty}if(!Object.defineProperty||s){var t="Property description must be an object: ",u="Object.defineProperty called on non-object: ",v="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(b,c,d){if(typeof b!="object"&&typeof b!="function"||b===null)throw new TypeError(u+b);if(typeof d!="object"&&typeof d!="function"||d===null)throw new TypeError(t+d);if(s)try{return s.call(Object,b,c,d)}catch(e){}if(i(d,"value"))if(n&&(l(b,c)||m(b,c))){var g=b.__proto__;b.__proto__=f,delete b[c],b[c]=d.value,b.__proto__=g}else b[c]=d.value;else{if(!n)throw new TypeError(v);i(d,"get")&&j(b,c,d.get),i(d,"set")&&k(b,c,d.set)}return b}}Object.defineProperties||(Object.defineProperties=function(b,c){for(var d in c)i(c,d)&&Object.defineProperty(b,d,c[d]);return b}),Object.seal||(Object.seal=function(b){return b}),Object.freeze||(Object.freeze=function(b){return b});try{Object.freeze(function(){})}catch(w){Object.freeze=function(b){return function(c){return typeof c=="function"?c:b(c)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(b){return b}),Object.isSealed||(Object.isSealed=function(b){return!1}),Object.isFrozen||(Object.isFrozen=function(b){return!1}),Object.isExtensible||(Object.isExtensible=function(b){if(Object(b)===b)throw new TypeError;var c="";while(i(b,c))c+="?";b[c]=!0;var d=i(b,c);return delete b[c],d});if(!Object.keys){var x=!0,y=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],z=y.length;for(var A in{toString:null})x=!1;Object.keys=function H(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var H=[];for(var b in a)i(a,b)&&H.push(b);if(x)for(var c=0,d=z;c<d;c++){var e=y[c];i(a,e)&&H.push(e)}return H}}if(!Date.prototype.toISOString||(new Date(-621987552e5)).toISOString().indexOf("-000001")===-1)Date.prototype.toISOString=function(){var b,c,d,e;if(!isFinite(this))throw new RangeError;b=[this.getUTCMonth()+1,this.getUTCDate(),this.getUTCHours(),this.getUTCMinutes(),this.getUTCSeconds()],e=this.getUTCFullYear(),e=(e<0?"-":e>9999?"+":"")+("00000"+Math.abs(e)).slice(0<=e&&e<=9999?-4:-6),c=b.length;while(c--)d=b[c],d<10&&(b[c]="0"+d);return e+"-"+b.slice(0,2).join("-")+"T"+b.slice(2).join(":")+"."+("000"+this.getUTCMilliseconds()).slice(-3)+"Z"};Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(b){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),Date.parse("+275760-09-13T00:00:00.000Z")!==864e13&&(Date=function(a){var b=function e(b,c,d,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j==1&&String(b)===b?new a(e.parse(b)):j>=7?new a(b,c,d,f,g,h,i):j>=6?new a(b,c,d,f,g,h):j>=5?new a(b,c,d,f,g):j>=4?new a(b,c,d,f):j>=3?new a(b,c,d):j>=2?new a(b,c):j>=1?new a(b):new a;return k.constructor=e,k}return a.apply(this,arguments)},c=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{3}))?)?(?:Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$");for(var d in a)b[d]=a[d];return b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function(d){var e=c.exec(d);if(e){e.shift();for(var f=1;f<7;f++)e[f]=+(e[f]||(f<3?1:0)),f==1&&e[f]--;var g=+e.pop(),h=+e.pop(),i=e.pop(),j=0;if(i){if(h>23||g>59)return NaN;j=(h*60+g)*6e4*(i=="+"?-1:1)}var k=+e[0];return 0<=k&&k<=99?(e[0]=k+400,a.UTC.apply(this,e)+j-126227808e5):a.UTC.apply(this,e)+j}return a.parse.apply(this,arguments)},b}(Date));var B="	\n\f\r   ᠎             　\u2028\u2029";if(!String.prototype.trim||B.trim()){B="["+B+"]";var C=new RegExp("^"+B+B+"*"),D=new RegExp(B+B+"*$");String.prototype.trim=function(){return String(this).replace(C,"").replace(D,"")}}var E=function(a){return a=+a,a!==a?a=0:a!==0&&a!==1/0&&a!==-Infinity&&(a=(a>0||-1)*Math.floor(Math.abs(a))),a},F="a"[0]!="a",G=function(a){if(a==null)throw new TypeError;return F&&typeof a=="string"&&a?a.split(""):Object(a)}}),define("ace/lib/dom",["require","exports","module"],function(a,b,c){"use strict";var d="http://www.w3.org/1999/xhtml";b.createElement=function(a,b){return document.createElementNS?document.createElementNS(b||d,a):document.createElement(a)},b.setText=function(a,b){a.innerText!==undefined&&(a.innerText=b),a.textContent!==undefined&&(a.textContent=b)},b.hasCssClass=function(a,b){var c=a.className.split(/\s+/g);return c.indexOf(b)!==-1},b.addCssClass=function(a,c){b.hasCssClass(a,c)||(a.className+=" "+c)},b.removeCssClass=function(a,b){var c=a.className.split(/\s+/g);for(;;){var d=c.indexOf(b);if(d==-1)break;c.splice(d,1)}a.className=c.join(" ")},b.toggleCssClass=function(a,b){var c=a.className.split(/\s+/g),d=!0;for(;;){var e=c.indexOf(b);if(e==-1)break;d=!1,c.splice(e,1)}return d&&c.push(b),a.className=c.join(" "),d},b.setCssClass=function(a,c,d){d?b.addCssClass(a,c):b.removeCssClass(a,c)},b.hasCssString=function(a,b){var c=0,d;b=b||document;if(b.createStyleSheet&&(d=b.styleSheets)){while(c<d.length)if(d[c++].owningElement.id===a)return!0}else if(d=b.getElementsByTagName("style"))while(c<d.length)if(d[c++].id===a)return!0;return!1},b.importCssString=function(c,e,f){f=f||document;if(e&&b.hasCssString(e,f))return null;var g;if(f.createStyleSheet)g=f.createStyleSheet(),g.cssText=c,e&&(g.owningElement.id=e);else{g=f.createElementNS?f.createElementNS(d,"style"):f.createElement("style"),g.appendChild(f.createTextNode(c)),e&&(g.id=e);var h=f.getElementsByTagName("head")[0]||f.documentElement;h.appendChild(g)}},b.importCssStylsheet=function(a,c){if(c.createStyleSheet)c.createStyleSheet(a);else{var d=b.createElement("link");d.rel="stylesheet",d.href=a;var e=c.getElementsByTagName("head")[0]||c.documentElement;e.appendChild(d)}},b.getInnerWidth=function(a){return parseInt(b.computedStyle(a,"paddingLeft"),10)+parseInt(b.computedStyle(a,"paddingRight"),10)+a.clientWidth},b.getInnerHeight=function(a){return parseInt(b.computedStyle(a,"paddingTop"),10)+parseInt(b.computedStyle(a,"paddingBottom"),10)+a.clientHeight},window.pageYOffset!==undefined?(b.getPageScrollTop=function(){return window.pageYOffset},b.getPageScrollLeft=function(){return window.pageXOffset}):(b.getPageScrollTop=function(){return document.body.scrollTop},b.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?b.computedStyle=function(a,b){return b?(window.getComputedStyle(a,"")||{})[b]||"":window.getComputedStyle(a,"")||{}}:b.computedStyle=function(a,b){return b?a.currentStyle[b]:a.currentStyle},b.scrollbarWidth=function(a){var c=b.createElement("p");c.style.width="100%",c.style.minWidth="0px",c.style.height="200px";var d=b.createElement("div"),e=d.style;e.position="absolute",e.left="-10000px",e.overflow="hidden",e.width="200px",e.minWidth="0px",e.height="150px",d.appendChild(c);var f=a.body||a.documentElement;f.appendChild(d);var g=c.offsetWidth;e.overflow="scroll";var h=c.offsetWidth;return g==h&&(h=d.clientWidth),f.removeChild(d),g-h},b.setInnerHtml=function(a,b){var c=a.cloneNode(!1);return c.innerHTML=b,a.parentNode.replaceChild(c,a),c},b.setInnerText=function(a,b){var c=a.ownerDocument;c.body&&"textContent"in c.body?a.textContent=b:a.innerText=b},b.getInnerText=function(a){var b=a.ownerDocument;return b.body&&"textContent"in b.body?a.textContent:a.innerText||a.textContent||""},b.getParentWindow=function(a){return a.defaultView||a.parentWindow}}),define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent","ace/lib/dom"],function(a,b,c){function g(a,b,c){var f=0;e.isOpera&&e.isMac?f=0|(b.metaKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.ctrlKey?8:0):f=0|(b.ctrlKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.metaKey?8:0);if(c in d.MODIFIER_KEYS){switch(d.MODIFIER_KEYS[c]){case"Alt":f=2;break;case"Shift":f=4;break;case"Ctrl":f=1;break;default:f=8}c=0}return f&8&&(c==91||c==93)&&(c=0),!!f||c in d.FUNCTION_KEYS||c in d.PRINTABLE_KEYS?a(b,f,c):!1}"use strict";var d=a("./keys"),e=a("./useragent"),f=a("./dom");b.addListener=function(a,b,c){if(a.addEventListener)return a.addEventListener(b,c,!1);if(a.attachEvent){var d=function(){c(window.event)};c._wrapper=d,a.attachEvent("on"+b,d)}},b.removeListener=function(a,b,c){if(a.removeEventListener)return a.removeEventListener(b,c,!1);a.detachEvent&&a.detachEvent("on"+b,c._wrapper||c)},b.stopEvent=function(a){return b.stopPropagation(a),b.preventDefault(a),!1},b.stopPropagation=function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},b.preventDefault=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},b.getDocumentX=function(a){return a.clientX?a.clientX+f.getPageScrollLeft():a.pageX},b.getDocumentY=function(a){return a.clientY?a.clientY+f.getPageScrollTop():a.pageY},b.getButton=function(a){return a.type=="dblclick"?0:a.type=="contextmenu"?2:a.preventDefault?a.button:{1:0,2:2,4:1}[a.button]},document.documentElement.setCapture?b.capture=function(a,c,d){function e(a){return c(a),b.stopPropagation(a)}function g(e){c(e),f||(f=!0,d(e)),b.removeListener(a,"mousemove",c),b.removeListener(a,"mouseup",g),b.removeListener(a,"losecapture",g),a.releaseCapture()}var f=!1;b.addListener(a,"mousemove",c),b.addListener(a,"mouseup",g),b.addListener(a,"losecapture",g),a.setCapture()}:b.capture=function(a,b,c){function d(a){b(a),a.stopPropagation()}function e(a){b&&b(a),c&&c(a),document.removeEventListener("mousemove",d,!0),document.removeEventListener("mouseup",e,!0),a.stopPropagation()}document.addEventListener("mousemove",d,!0),document.addEventListener("mouseup",e,!0)},b.addMouseWheelListener=function(a,c){var d=8,e=function(a){a.wheelDelta!==undefined?a.wheelDeltaX!==undefined?(a.wheelX=-a.wheelDeltaX/d,a.wheelY=-a.wheelDeltaY/d):(a.wheelX=0,a.wheelY=-a.wheelDelta/d):a.axis&&a.axis==a.HORIZONTAL_AXIS?(a.wheelX=(a.detail||0)*5,a.wheelY=0):(a.wheelX=0,a.wheelY=(a.detail||0)*5),c(a)};b.addListener(a,"DOMMouseScroll",e),b.addListener(a,"mousewheel",e)},b.addMultiMouseDownListener=function(a,c,d,f,g){var h=0,i,j,k=function(a){h+=1,h==1&&(i=a.clientX,j=a.clientY,setTimeout(function(){h=0},f||600));var e=b.getButton(a)==c;if(!e||Math.abs(a.clientX-i)>5||Math.abs(a.clientY-j)>5)h=0;h==d&&(h=0,g(a));if(e)return b.preventDefault(a)};b.addListener(a,"mousedown",k),e.isOldIE&&b.addListener(a,"dblclick",k)},b.addCommandKeyListener=function(a,c){var d=b.addListener;if(e.isOldGecko||e.isOpera){var f=null;d(a,"keydown",function(a){f=a.keyCode}),d(a,"keypress",function(a){return g(c,a,f)})}else{var h=null;d(a,"keydown",function(a){return h=a.keyIdentifier||a.keyCode,g(c,a,a.keyCode)})}};if(window.postMessage){var h=1;b.nextTick=function(a,c){c=c||window;var d="zero-timeout-message-"+h;b.addListener(c,"message",function e(f){f.data==d&&(b.stopPropagation(f),b.removeListener(c,"message",e),a())}),c.postMessage(d,"*")}}else b.nextTick=function(a,b){b=b||window,window.setTimeout(a,0)}}),define("ace/lib/keys",["require","exports","module","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./oop"),e=function(){var a={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,meta:8,command:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",188:",",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:'"'}};for(var b in a.FUNCTION_KEYS){var c=a.FUNCTION_KEYS[b].toUpperCase();a[c]=parseInt(b,10)}return d.mixin(a,a.MODIFIER_KEYS),d.mixin(a,a.PRINTABLE_KEYS),d.mixin(a,a.FUNCTION_KEYS),a}();d.mixin(b,e),b.keyCodeToString=function(a){return(e[a]||String.fromCharCode(a)).toLowerCase()}}),define("ace/lib/oop",["require","exports","module"],function(a,b,c){"use strict",b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/lib/useragent",["require","exports","module"],function(a,b,c){"use strict";var d=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),e=navigator.userAgent;b.isWin=d=="win",b.isMac=d=="mac",b.isLinux=d=="linux",b.isIE=navigator.appName=="Microsoft Internet Explorer"&&parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]),b.isOldIE=b.isIE&&b.isIE<9,b.isGecko=b.isMozilla=window.controllers&&window.navigator.product==="Gecko",b.isOldGecko=b.isGecko&&parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1],10)<4,b.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",b.isWebKit=parseFloat(e.split("WebKit/")[1])||undefined,b.isChrome=parseFloat(e.split(" Chrome/")[1])||undefined,b.isAIR=e.indexOf("AdobeAIR")>=0,b.isIPad=e.indexOf("iPad")>=0,b.isTouchPad=e.indexOf("TouchPad")>=0,b.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},b.getOS=function(){return b.isMac?b.OS.MAC:b.isLinux?b.OS.LINUX:b.OS.WINDOWS}}),define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/useragent"),g=a("./keyboard/textinput").TextInput,h=a("./mouse/mouse_handler").MouseHandler,i=a("./mouse/fold_handler").FoldHandler,j=a("./keyboard/keybinding").KeyBinding,k=a("./edit_session").EditSession,l=a("./search").Search,m=a("./range").Range,n=a("./lib/event_emitter").EventEmitter,o=a("./commands/command_manager").CommandManager,p=a("./commands/default_commands").commands,q=function(a,b){var c=a.getContainerElement();this.container=c,this.renderer=a,this.textInput=new g(a.getTextAreaContainer(),this),this.keyBinding=new j(this),f.isIPad||(this.$mouseHandler=new h(this),new i(this)),this.$blockScrolling=0,this.$search=(new l).set({wrap:!0}),this.commands=new o(f.isMac?"mac":"win",p),this.setSession(b||new k(""))};(function(){d.implement(this,n),this.setKeyboardHandler=function(a){this.keyBinding.setKeyboardHandler(a)},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(a){if(this.session==a)return;if(this.session){var b=this.session;this.session.removeEventListener("change",this.$onDocumentChange),this.session.removeEventListener("changeMode",this.$onChangeMode),this.session.removeEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.session.removeEventListener("changeTabSize",this.$onChangeTabSize),this.session.removeEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.session.removeEventListener("changeWrapMode",this.$onChangeWrapMode),this.session.removeEventListener("onChangeFold",this.$onChangeFold),this.session.removeEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.session.removeEventListener("changeBackMarker",this.$onChangeBackMarker),this.session.removeEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.session.removeEventListener("changeAnnotation",this.$onChangeAnnotation),this.session.removeEventListener("changeOverwrite",this.$onCursorChange),this.session.removeEventListener("changeScrollTop",this.$onScrollTopChange),this.session.removeEventListener("changeLeftTop",this.$onScrollLeftChange);var c=this.session.getSelection();c.removeEventListener("changeCursor",this.$onCursorChange),c.removeEventListener("changeSelection",this.$onSelectionChange)}this.session=a,this.$onDocumentChange=this.onDocumentChange.bind(this),a.addEventListener("change",this.$onDocumentChange),this.renderer.setSession(a),this.$onChangeMode=this.onChangeMode.bind(this),a.addEventListener("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),a.addEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.updateText.bind(this.renderer),a.addEventListener("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),a.addEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),a.addEventListener("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),a.addEventListener("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.addEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.addEventListener("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.addEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.addEventListener("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.addEventListener("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.addEventListener("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.addEventListener("changeScrollLeft",this.$onScrollLeftChange),this.selection=a.getSelection(),this.selection.addEventListener("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.addEventListener("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.$blockScrolling+=1,this.onCursorChange(),this.$blockScrolling-=1,this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull(),this._emit("changeSession",{session:a,oldSession:b})},this.getSession=function(){return this.session},this.getSelection=function(){return this.selection},this.resize=function(){this.renderer.onResize()},this.setTheme=function(a){this.renderer.setTheme(a)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(a){this.renderer.setStyle(a)},this.unsetStyle=function(a){this.renderer.unsetStyle(a)},this.setFontSize=function(a){this.container.style.fontSize=a,this.renderer.updateFontSize()},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var a=this;this.$highlightPending=!0,setTimeout(function(){a.$highlightPending=!1;var b=a.session.findMatchingBracket(a.getCursorPosition());if(b){var c=new m(b.row,b.column,b.row,b.column+1);a.session.$bracketHighlight=a.session.addMarker(c,"ace_bracket","text")}},10)},this.focus=function(){var a=this;setTimeout(function(){a.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(){this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus")},this.onBlur=function(){this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur")},this.onDocumentChange=function(a){var b=a.data,c=b.range,d;c.start.row==c.end.row&&b.action!="insertLines"&&b.action!="removeLines"?d=c.end.row:d=Infinity,this.renderer.updateLines(c.start.row,d),this._emit("change",a),this.onCursorChange()},this.onTokenizerUpdate=function(a){var b=a.data;this.renderer.updateLines(b.first,b.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.renderer.updateCursor(),this.$blockScrolling||this.renderer.scrollCursorIntoView(),this.renderer.moveTextAreaToCursor(this.textInput.getElement()),this.$highlightBrackets(),this.$updateHighlightActiveLine()},this.$updateHighlightActiveLine=function(){var a=this.getSession();a.$highlightLineMarker&&a.removeMarker(a.$highlightLineMarker),typeof this.$lastrow=="number"&&this.renderer.removeGutterDecoration(this.$lastrow,"ace_gutter_active_line"),a.$highlightLineMarker=null,this.$lastrow=null;if(this.getHighlightActiveLine()){var b=this.getCursorPosition(),c=this.session.getFoldLine(b.row);if(this.getSelectionStyle()!="line"||!this.selection.isMultiLine()){var d;c?d=new m(c.start.row,0,c.end.row+1,0):d=new m(b.row,0,b.row+1,0),a.$highlightLineMarker=a.addMarker(d,"ace_active_line","background")}this.renderer.addGutterDecoration(this.$lastrow=b.row,"ace_gutter_active_line")}},this.onSelectionChange=function(a){var b=this.getSession();b.$selectionMarker&&b.removeMarker(b.$selectionMarker),b.$selectionMarker=null;if(!this.selection.isEmpty()){var c=this.selection.getRange(),d=this.getSelectionStyle();b.$selectionMarker=b.addMarker(c,"ace_selection",d)}else this.$updateHighlightActiveLine();this.$highlightSelectedWord&&this.session.getMode().highlightSelection(this)},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.setBreakpoints(this.session.getBreakpoints())},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(){this.renderer.updateText()},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getCopyText=function(){var a="";return this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange())),this._emit("copy",a),a},this.onCut=function(){this.commands.exec("cut",this)},this.insert=function(a){var b=this.session,c=b.getMode(),d=this.getCursorPosition();if(this.getBehavioursEnabled()){var e=c.transformAction(b.getState(d.row),"insertion",this,b,a);e&&(a=e.text)}a=a.replace("	",this.session.getTabString());if(!this.selection.isEmpty())d=this.session.remove(this.getSelectionRange()),this.clearSelection();else if(this.session.getOverwrite()){var f=new m.fromPoints(d,d);f.end.column+=a.length,this.session.remove(f)}this.clearSelection();var g=d.column,h=b.getState(d.row),i=c.checkOutdent(h,b.getLine(d.row),a),j=b.getLine(d.row),k=c.getNextLineIndent(h,j.slice(0,d.column),b.getTabString()),l=b.insert(d,a);e&&e.selection&&(e.selection.length==2?this.selection.setSelectionRange(new m(d.row,g+e.selection[0],d.row,g+e.selection[1])):this.selection.setSelectionRange(new m(d.row+e.selection[0],e.selection[1],d.row+e.selection[2],e.selection[3])));var h=b.getState(d.row);if(b.getDocument().isNewLine(a)){this.moveCursorTo(d.row+1,0);var n=b.getTabSize(),o=Number.MAX_VALUE;for(var p=d.row+1;p<=l.row;++p){var q=0;j=b.getLine(p);for(var r=0;r<j.length;++r)if(j.charAt(r)=="	")q+=n;else{if(j.charAt(r)!=" ")break;q+=1}/[^\s]/.test(j)&&(o=Math.min(q,o))}for(var p=d.row+1;p<=l.row;++p){var s=o;j=b.getLine(p);for(var r=0;r<j.length&&s>0;++r)j.charAt(r)=="	"?s-=n:j.charAt(r)==" "&&(s-=1);b.remove(new m(p,0,p,r))}b.indentRows(d.row+1,l.row,k)}i&&c.autoOutdent(h,b,d.row)},this.onTextInput=function(a,b){b&&this._emit("paste",a),this.keyBinding.onTextInput(a,b)},this.onCommandKey=function(a,b,c){this.keyBinding.onCommandKey(a,b,c)},this.setOverwrite=function(a){this.session.setOverwrite(a)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(a){this.$mouseHandler.setScrollSpeed(a)},this.getScrollSpeed=function(){return this.$mouseHandler.getScrollSpeed()},this.setDragDelay=function(a){this.$mouseHandler.setDragDelay(a)},this.getDragDelay=function(){return this.$mouseHandler.getDragDelay()},this.$selectionStyle="line",this.setSelectionStyle=function(a){if(this.$selectionStyle==a)return;this.$selectionStyle=a,this.onSelectionChange(),this._emit("changeSelectionStyle",{data:a})},this.getSelectionStyle=function(){return this.$selectionStyle},this.$highlightActiveLine=!0,this.setHighlightActiveLine=function(a){if(this.$highlightActiveLine==a)return;this.$highlightActiveLine=a,this.$updateHighlightActiveLine()},this.getHighlightActiveLine=function(){return this.$highlightActiveLine},this.$highlightSelectedWord=!0,this.setHighlightSelectedWord=function(a){if(this.$highlightSelectedWord==a)return;this.$highlightSelectedWord=a,a?this.session.getMode().highlightSelection(this):this.session.getMode().clearSelectionHighlight(this)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(a){this.renderer.setAnimatedScroll(a)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(a){if(this.getShowInvisibles()==a)return;this.renderer.setShowInvisibles(a)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setShowPrintMargin=function(a){this.renderer.setShowPrintMargin(a)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(a){this.renderer.setPrintMarginColumn(a)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.$readOnly=!1,this.setReadOnly=function(a){this.$readOnly=a},this.getReadOnly=function(){return this.$readOnly},this.$modeBehaviours=!0,this.setBehavioursEnabled=function(a){this.$modeBehaviours=a},this.getBehavioursEnabled=function(){return this.$modeBehaviours},this.setShowFoldWidgets=function(a){var b=this.renderer.$gutterLayer;if(b.getShowFoldWidgets()==a)return;this.renderer.$gutterLayer.setShowFoldWidgets(a),this.$showFoldWidgets=a,this.renderer.updateFull()},this.getShowFoldWidgets=function(){return this.renderer.$gutterLayer.getShowFoldWidgets()},this.remove=function(a){this.selection.isEmpty()&&(a=="left"?this.selection.selectLeft():this.selection.selectRight());var b=this.getSelectionRange();if(this.getBehavioursEnabled()){var c=this.session,d=c.getState(b.start.row),e=c.getMode().transformAction(d,"deletion",this,c,b);e&&(b=e)}this.session.remove(b),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var a=this.getSelectionRange();a.start.column==a.end.column&&a.start.row==a.end.row&&(a.end.column=0,a.end.row++),this.session.remove(a),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var a=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(a)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var a=this.getCursorPosition(),b=a.column;if(b===0)return;var c=this.session.getLine(a.row),d,e;b<c.length?(d=c.charAt(b)+c.charAt(b-1),e=new m(a.row,b-1,a.row,b+1)):(d=c.charAt(b-1)+c.charAt(b-2),e=new m(a.row,b-2,a.row,b)),this.session.replace(e,d)},this.toLowerCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toLowerCase()),this.selection.setSelectionRange(a)},this.toUpperCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toUpperCase()),this.selection.setSelectionRange(a)},this.indent=function(){var a=this.session,b=this.getSelectionRange();if(!(b.start.row<b.end.row||b.start.column<b.end.column)){var d;if(this.session.getUseSoftTabs()){var f=a.getTabSize(),g=this.getCursorPosition(),h=a.documentToScreenColumn(g.row,g.column),i=f-h%f;d=e.stringRepeat(" ",i)}else d="	";return this.insert(d)}var c=this.$getSelectedRows();a.indentRows(c.first,c.last,"	")},this.blockOutdent=function(){var a=this.session.getSelection();this.session.outdentRows(a.getRange())},this.toggleCommentLines=function(){var a=this.session.getState(this.getCursorPosition().row),b=this.$getSelectedRows();this.session.getMode().toggleCommentLines(a,this.session,b.first,b.last)},this.removeLines=function(){var a=this.$getSelectedRows(),b;a.first===0||a.last+1<this.session.getLength()?b=new m(a.first,0,a.last+1,0):b=new m(a.first-1,this.session.getLine(a.first-1).length,a.last,this.session.getLine(a.last).length),this.session.remove(b),this.clearSelection()},this.moveLinesDown=function(){this.$moveLines(function(a,b){return this.session.moveLinesDown(a,b)})},this.moveLinesUp=function(){this.$moveLines(function(a,b){return this.session.moveLinesUp(a,b)})},this.moveText=function(a,b){return this.$readOnly?null:this.session.moveText(a,b)},this.copyLinesUp=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b),0})},this.copyLinesDown=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b)})},this.$moveLines=function(a){var b=this.$getSelectedRows(),c=this.selection;if(!c.isMultiLine())var d=c.getRange(),e=c.isBackwards();var f=a.call(this,b.first,b.last);d?(d.start.row+=f,d.end.row+=f,c.setSelectionRange(d,e)):(c.setSelectionAnchor(b.last+f+1,0),c.$moveSelection(function(){c.moveCursorTo(b.first+f,0)}))},this.$getSelectedRows=function(){var a=this.getSelectionRange().collapseRows();return{first:a.start.row,last:a.end.row}},this.onCompositionStart=function(a){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(a){this.renderer.setCompositionText(a)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(a){return a>=this.getFirstVisibleRow()&&a<=this.getLastVisibleRow()},this.isRowFullyVisible=function(a){return a>=this.renderer.getFirstFullyVisibleRow()&&a<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$getPageDownRow=function(){return this.renderer.getScrollBottomRow()},this.$getPageUpRow=function(){var a=this.renderer.getScrollTopRow(),b=this.renderer.getScrollBottomRow();return a-(b-a)},this.selectPageDown=function(){var a=this.$getPageDownRow()+Math.floor(this.$getVisibleRowCount()/2);this.scrollPageDown();var b=this.getSelection(),c=this.session.documentToScreenPosition(b.getSelectionLead()),d=this.session.screenToDocumentPosition(a,c.column);b.selectTo(d.row,d.column)},this.selectPageUp=function(){var a=this.renderer.getScrollTopRow()-this.renderer.getScrollBottomRow(),b=this.$getPageUpRow()+Math.round(a/2);this.scrollPageUp();var c=this.getSelection(),d=this.session.documentToScreenPosition(c.getSelectionLead()),e=this.session.screenToDocumentPosition(b,d.column);c.selectTo(e.row,e.column)},this.gotoPageDown=function(){var a=this.$getPageDownRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.gotoPageUp=function(){var a=this.$getPageUpRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.scrollPageDown=function(){this.scrollToRow(this.$getPageDownRow())},this.scrollPageUp=function(){this.renderer.scrollToRow(this.$getPageUpRow())},this.scrollToRow=function(a){this.renderer.scrollToRow(a)},this.scrollToLine=function(a,b){this.renderer.scrollToLine(a,b)},this.centerSelection=function(){var a=this.getSelectionRange(),b=Math.floor(a.start.row+(a.end.row-a.start.row)/2);this.renderer.scrollToLine(b,!0)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(a,b){this.selection.moveCursorTo(a,b)},this.moveCursorToPosition=function(a){this.selection.moveCursorToPosition(a)},this.jumpToMatching=function(){var a=this.getCursorPosition(),b=this.session.findMatchingBracket(a);b||(a.column+=1,b=this.session.findMatchingBracket(a)),b||(a.column-=2,b=this.session.findMatchingBracket(a)),b&&(this.clearSelection(),this.moveCursorTo(b.row,b.column))},this.gotoLine=function(a,b){this.selection.clearSelection(),this.session.unfold({row:a-1,column:b||0}),this.$blockScrolling+=1,this.moveCursorTo(a-1,b||0),this.$blockScrolling-=1,this.isRowFullyVisible(this.getCursorPosition().row)||this.scrollToLine(a,!0)},this.navigateTo=function(a,b){this.clearSelection(),this.moveCursorTo(a,b)},this.navigateUp=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(-a,0)},this.navigateDown=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(a,0)},this.navigateLeft=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().start;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().end;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(a,b){b&&this.$search.set(b);var c=this.$search.find(this.session),d=0;return c?(this.$tryReplace(c,a)&&(d=1),c!==null&&(this.selection.setSelectionRange(c),this.renderer.scrollSelectionIntoView(c.start,c.end)),d):d},this.replaceAll=function(a,b){b&&this.$search.set(b);var c=this.$search.findAll(this.session),d=0;if(!c.length)return d;var e=this.getSelectionRange();this.clearSelection(),this.selection.moveCursorTo(0,0),this.$blockScrolling+=1;for(var f=c.length-1;f>=0;--f)this.$tryReplace(c[f],a)&&d++;return this.selection.setSelectionRange(e),this.$blockScrolling-=1,d},this.$tryReplace=function(a,b){var c=this.session.getTextRange(a);return b=this.$search.replace(c,b),b!==null?(a.end=this.session.replace(a,b),a):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(a,b){this.clearSelection(),b=b||{},b.needle=a,this.$search.set(b),this.$find()},this.findNext=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!1),this.$search.set(a),this.$find()},this.findPrevious=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!0),this.$search.set(a),this.$find()},this.$find=function(a){this.selection.isEmpty()||this.$search.set({needle:this.session.getTextRange(this.getSelectionRange())}),typeof a!="undefined"&&this.$search.set({backwards:a});var b=this.$search.find(this.session);if(b){this.session.unfold(b),this.$blockScrolling+=1,this.selection.setSelectionRange(b),this.$blockScrolling-=1;if(this.getAnimatedScroll()){var c=this.getCursorPosition();this.isRowFullyVisible(c.row)||this.scrollToLine(c.row,!0)}else this.renderer.scrollSelectionIntoView(b.start,b.end)}},this.undo=function(){this.session.getUndoManager().undo()},this.redo=function(){this.session.getUndoManager().redo()},this.destroy=function(){this.renderer.destroy()}}).call(q.prototype),b.Editor=q}),define("ace/lib/lang",["require","exports","module"],function(a,b,c){"use strict",b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return(new Array(b+1)).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(var c=0,d=a.length;c<d;c++)a[c]&&typeof a[c]=="object"?b[c]=this.copyObject(a[c]):b[c]=a[c];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){return d.cancel(),b=setTimeout(c,a||0),d};return d.schedule=d,d.call=function(){return this.cancel(),a(),d},d.cancel=function(){return clearTimeout(b),b=null,d},d}}),define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("../lib/useragent"),f=a("../lib/dom"),g=function(a,b){function l(){try{c.select()}catch(a){}}function m(a){if(!i){var d=a||c.value;if(d){d.charCodeAt(d.length-1)==g.charCodeAt(0)?(d=d.slice(0,-1),d&&b.onTextInput(d,j)):b.onTextInput(d,j);if(!v())return!1}}i=!1,j=!1,c.value=g,l()}function v(){return document.activeElement===c}var c=f.createElement("textarea");e.isTouchPad&&c.setAttribute("x-palm-disable-auto-cap",!0),c.style.left="-10000px",c.style.position="fixed",a.insertBefore(c,a.firstChild);var g=String.fromCharCode(0);m();var h=!1,i=!1,j=!1,k="",n=function(a){setTimeout(function(){h||m(a.data)},0)},o=function(a){if(e.isOldIE&&c.value.charCodeAt(0)>128)return;setTimeout(function(){h||m()},0)},p=function(a){h=!0,b.onCompositionStart(),e.isGecko||setTimeout(q,0)},q=function(){if(!h)return;b.onCompositionUpdate(c.value)},r=function(a){h=!1,b.onCompositionEnd()},s=function(a){i=!0;var d=b.getCopyText();d?c.value=d:a.preventDefault(),l(),setTimeout(function(){m()},0)},t=function(a){i=!0;var d=b.getCopyText();d?(c.value=d,b.onCut()):a.preventDefault(),l(),setTimeout(function(){m()},0)};d.addCommandKeyListener(c,b.onCommandKey.bind(b));if(e.isOldIE){var u={13:1,27:1};d.addListener(c,"keyup",function(a){h&&(!c.value||u[a.keyCode])&&setTimeout(r,0);if((c.value.charCodeAt(0)|0)<129)return;h?q():p()})}"onpropertychange"in c&&!("oninput"in c)?d.addListener(c,"propertychange",o):d.addListener(c,"input",n),d.addListener(c,"paste",function(a){j=!0,a.clipboardData&&a.clipboardData.getData?(m(a.clipboardData.getData("text/plain")),a.preventDefault()):o()}),"onbeforecopy"in c&&typeof clipboardData!="undefined"?(d.addListener(c,"beforecopy",function(a){var c=b.getCopyText();c?clipboardData.setData("Text",c):a.preventDefault()}),d.addListener(a,"keydown",function(a){if(a.ctrlKey&&a.keyCode==88){var c=b.getCopyText();c&&(clipboardData.setData("Text",c),b.onCut()),d.preventDefault(a)}})):(d.addListener(c,"copy",s),d.addListener(c,"cut",t)),d.addListener(c,"compositionstart",p),e.isGecko&&d.addListener(c,"text",q),e.isWebKit&&d.addListener(c,"keyup",q),d.addListener(c,"compositionend",r),d.addListener(c,"blur",function(){b.onBlur()}),d.addListener(c,"focus",function(){b.onFocus(),l()}),this.focus=function(){b.onFocus(),l(),c.focus()},this.blur=function(){c.blur()},this.isFocused=v,this.getElement=function(){return c},this.onContextMenu=function(a,b){a&&(k||(k=c.style.cssText),c.style.cssText="position:fixed; z-index:1000;left:"+(a.x-2)+"px; top:"+(a.y-2)+"px;"),b&&(c.value="")},this.onContextMenuClose=function(){setTimeout(function(){k&&(c.style.cssText=k,k=""),m()},0)}};b.TextInput=g}),define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("./default_handlers").DefaultHandlers,f=a("./default_gutter_handler").GutterHandler,g=a("./mouse_event").MouseEvent,h=function(a){this.editor=a,new e(a),new f(a),d.addListener(a.container,"mousedown",function(b){return a.focus(),d.preventDefault(b)}),d.addListener(a.container,"selectstart",function(a){return d.preventDefault(a)});var b=a.renderer.getMouseEventTarget();d.addListener(b,"mousedown",this.onMouseEvent.bind(this,"mousedown")),d.addListener(b,"click",this.onMouseEvent.bind(this,"click")),d.addListener(b,"mousemove",this.onMouseMove.bind(this,"mousemove")),d.addMultiMouseDownListener(b,0,2,500,this.onMouseEvent.bind(this,"dblclick")),d.addMultiMouseDownListener(b,0,3,600,this.onMouseEvent.bind(this,"tripleclick")),d.addMultiMouseDownListener(b,0,4,600,this.onMouseEvent.bind(this,"quadclick")),d.addMouseWheelListener(a.container,this.onMouseWheel.bind(this,"mousewheel"));var c=a.renderer.$gutter;d.addListener(c,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),d.addListener(c,"click",this.onMouseEvent.bind(this,"gutterclick")),d.addListener(c,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),d.addListener(c,"mousemove",this.onMouseMove.bind(this,"gutter"))};(function(){this.$scrollSpeed=1,this.setScrollSpeed=function(a){this.$scrollSpeed=a},this.getScrollSpeed=function(){return this.$scrollSpeed},this.onMouseEvent=function(a,b){this.editor._emit(a,new g(b,this.editor))},this.$dragDelay=250,this.setDragDelay=function(a){this.$dragDelay=a},this.getDragDelay=function(){return this.$dragDelay},this.onMouseMove=function(a,b){var c=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!c||!c.length)return;this.editor._emit(a,new g(b,this.editor))},this.onMouseWheel=function(a,b){var c=new g(b,this.editor);c.speed=this.$scrollSpeed*2,c.wheelX=b.wheelX,c.wheelY=b.wheelY,this.editor._emit(a,c)}}).call(h.prototype),b.MouseHandler=h}),define("ace/mouse/default_handlers",["require","exports","module","ace/lib/event","ace/lib/dom","ace/lib/browser_focus"],function(a,b,c){function k(a){this.editor=a,this.$clickSelection=null,this.browserFocus=new f,a.setDefaultHandler("mousedown",this.onMouseDown.bind(this)),a.setDefaultHandler("dblclick",this.onDoubleClick.bind(this)),a.setDefaultHandler("tripleclick",this.onTripleClick.bind(this)),a.setDefaultHandler("quadclick",this.onQuadClick.bind(this)),a.setDefaultHandler("mousewheel",this.onScroll.bind(this))}function l(a,b,c,d){return Math.sqrt(Math.pow(c-a,2)+Math.pow(d-b,2))}"use strict";var d=a("../lib/event"),e=a("../lib/dom"),f=a("../lib/browser_focus").BrowserFocus,g=0,h=1,i=2,j=5;(function(){this.onMouseDown=function(a){function C(b){a.getShiftKey()?m.selection.selectToPosition(b):n.$clickSelection||(m.moveCursorToPosition(b),m.selection.clearSelection()),q=h}var b=a.inSelection(),c=a.pageX,f=a.pageY,k=a.getDocumentPosition(),m=this.editor,n=this,o=m.getSelectionRange(),p=o.isEmpty(),q=g;if(b&&(!this.browserFocus.isFocused()||(new Date).getTime()-this.browserFocus.lastFocus<20||!m.isFocused())){m.focus();return}var r=a.getButton();if(r!==0){p&&m.moveCursorToPosition(k),r==2&&(m.textInput.onContextMenu({x:a.clientX,y:a.clientY},p),d.capture(m.container,function(){},m.textInput.onContextMenuClose));return}b||C(k);var s=c,t=f,u=(new Date).getTime(),v,w,x,y=function(a){s=d.getDocumentX(a),t=d.getDocumentY(a)},z=function(a){clearInterval(F),q==g?C(k):q==i&&A(a),n.$clickSelection=null,q=g},A=function(a){e.removeCssClass(m.container,"ace_dragging"),m.session.removeMarker(x),m.$mouseHandler.$clickSelection||v||(m.moveCursorToPosition(k),m.selection.clearSelection());if(!v)return;if(w.contains(v.row,v.column)){v=null;return}m.clearSelection();if(a&&(a.ctrlKey||a.altKey))var b=m.session,c=b.insert(v,b.getTextRange(w));else var c=m.moveText(w,v);if(!c){v=null;return}m.selection.setSelectionRange(c)},B=function(){if(q==g){var a=l(c,f,s,t),b=(new Date).getTime();if(a>j){q=h;var d=m.renderer.screenToTextCoordinates(s,t);C(d)}else if(b-u>m.getDragDelay()){q=i,w=m.getSelectionRange();var k=m.getSelectionStyle();x=m.session.addMarker(w,"ace_selection",k),m.clearSelection(),e.addCssClass(m.container,"ace_dragging")}}q==i?E():q==h&&D()},D=function(){var a,b=m.renderer.screenToTextCoordinates(s,t);n.$clickSelection?n.$clickSelection.contains(b.row,b.column)?m.selection.setSelectionRange(n.$clickSelection):(n.$clickSelection.compare(b.row,b.column)==-1?a=n.$clickSelection.end:a=n.$clickSelection.start,m.selection.setSelectionAnchor(a.row,a.column),m.selection.selectToPosition(b)):m.selection.selectToPosition(b),m.renderer.scrollCursorIntoView()},E=function(){v=m.renderer.screenToTextCoordinates(s,t),m.moveCursorToPosition(v)};d.capture(m.container,y,z);var F=setInterval(B,20);return a.preventDefault()},this.onDoubleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectWord(),this.$clickSelection=c.getSelectionRange()},this.onTripleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectLine(),this.$clickSelection=c.getSelectionRange()},this.onQuadClick=function(a){var b=this.editor;b.selectAll(),this.$clickSelection=b.getSelectionRange()},this.onScroll=function(a){var b=this.editor;b.renderer.scrollBy(a.wheelX*a.speed,a.wheelY*a.speed);if(b.renderer.isScrollableBy(a.wheelX*a.speed,a.wheelY*a.speed))return a.preventDefault()}}).call(k.prototype),b.DefaultHandlers=k}),define("ace/lib/browser_focus",["require","exports","module","ace/lib/oop","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./oop"),e=a("./event"),f=a("./event_emitter").EventEmitter,g=function(a){a=a||window,this.lastFocus=(new Date).getTime(),this._isFocused=!0;var b=this;"onfocusin"in a.document?(e.addListener(a.document,"focusin",function(a){b._setFocused(!0)}),e.addListener(a.document,"focusout",function(a){b._setFocused(!!a.toElement)})):(e.addListener(a,"blur",function(a){b._setFocused(!1)}),e.addListener(a,"focus",function(a){b._setFocused(!0)}))};(function(){d.implement(this,f),this.isFocused=function(){return this._isFocused},this._setFocused=function(a){if(this._isFocused==a)return;a&&(this.lastFocus=(new Date).getTime()),this._isFocused=a,this._emit("changeFocus")}}).call(g.prototype),b.BrowserFocus=g}),define("ace/lib/event_emitter",["require","exports","module"],function(a,b,c){"use strict";var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{},this._defaultHandlers=this._defaultHandlers||{};var c=this._eventRegistry[a]||[],d=this._defaultHandlers[a];if(!c.length&&!d)return;b=b||{},b.type=a,b.stopPropagation||(b.stopPropagation=function(){this.propagationStopped=!0}),b.preventDefault||(b.preventDefault=function(){this.defaultPrevented=!0});for(var e=0;e<c.length;e++){c[e](b);if(b.propagationStopped)break}d&&!b.defaultPrevented&&d(b)},d.setDefaultHandler=function(a,b){this._defaultHandlers=this._defaultHandlers||{};if(this._defaultHandlers[a])throw new Error("The default handler for '"+a+"' is already set");this._defaultHandlers[a]=b},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)return;var d=c.indexOf(b);d!==-1&&c.splice(d,1)},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("ace/mouse/default_gutter_handler",["require","exports","module"],function(a,b,c){function d(a){a.setDefaultHandler("gutterclick",function(b){var c=b.getDocumentPosition().row,d=a.session.selection;d.moveCursorTo(c,0),d.selectLine()})}"use strict",b.GutterHandler=d}),define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=b.MouseEvent=function(a,b){this.domEvent=a,this.editor=b,this.pageX=d.getDocumentX(a),this.pageY=d.getDocumentY(a),this.clientX=a.clientX,this.clientY=a.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){d.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){d.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){if(this.$pos)return this.$pos;var a=d.getDocumentX(this.domEvent),b=d.getDocumentY(this.domEvent);return this.$pos=this.editor.renderer.screenToTextCoordinates(a,b),this.$pos},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var a=this.editor;if(a.getReadOnly())this.$inSelection=!1;else{var b=a.getSelectionRange();if(b.isEmpty())this.$inSelection=!1;else{var c=this.getDocumentPosition();this.$inSelection=b.contains(c.row,c.column)}}return this.$inSelection},this.getButton=function(){return d.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=function(){return this.domEvent.ctrlKey||this.domEvent.metaKey}}).call(e.prototype)}),define("ace/mouse/fold_handler",["require","exports","module"],function(a,b,c){function d(a){a.on("click",function(b){var c=b.getDocumentPosition(),d=a.session,e=d.getFoldAt(c.row,c.column,1);e&&(b.getAccelKey()?d.removeFold(e):d.expandFold(e),b.stop())}),a.on("gutterclick",function(b){if(b.domEvent.target.className.indexOf("ace_fold-widget")!=-1){var c=b.getDocumentPosition().row;a.session.onFoldWidgetClick(c,b.domEvent),b.stop()}})}"use strict",b.FoldHandler=d}),define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event","ace/commands/default_commands"],function(a,b,c){"use strict";var d=a("../lib/keys"),e=a("../lib/event");a("../commands/default_commands");var f=function(a){this.$editor=a,this.$data={},this.$handlers=[this]};(function(){this.setKeyboardHandler=function(a){if(this.$handlers[this.$handlers.length-1]==a)return;this.$data={},this.$handlers=a?[this,a]:[this]},this.addKeyboardHandler=function(a){this.removeKeyboardHandler(a),this.$handlers.push(a)},this.removeKeyboardHandler=function(a){var b=this.$handlers.indexOf(a);return b==-1?!1:(this.$handlers.splice(b,1),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.$callKeyboardHandlers=function(a,b,c,d){var f;for(var g=this.$handlers.length;g--;){f=this.$handlers[g].handleKeyboard(this.$data,a,b,c,d);if(f&&f.command)break}if(!f||!f.command)return!1;var h=!1,i=this.$editor.commands;return f.command!="null"?h=i.exec(f.command,this.$editor,f.args):h=!0,h&&d&&e.stopEvent(d),h},this.handleKeyboard=function(a,b,c){return{command:this.$editor.commands.findKeyCommand(b,c)}},this.onCommandKey=function(a,b,c){var e=d.keyCodeToString(c);this.$callKeyboardHandlers(b,e,c,a)},this.onTextInput=function(a,b){var c=!1;!b&&a.length==1&&(c=this.$callKeyboardHandlers(0,a)),c||this.$editor.commands.exec("insertstring",this.$editor,a)}}).call(f.prototype),b.KeyBinding=f}),define("ace/commands/default_commands",["require","exports","module","ace/lib/lang"],function(a,b,c){function e(a,b){return{win:a,mac:b}}"use strict";var d=a("../lib/lang");b.commands=[{name:"selectall",bindKey:e("Ctrl-A","Command-A"),exec:function(a){a.selectAll()},readOnly:!0},{name:"centerselection",bindKey:e(null,"Ctrl-L"),exec:function(a){a.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:e("Ctrl-L","Command-L"),exec:function(a){var b=parseInt(prompt("Enter line number:"),10);isNaN(b)||a.gotoLine(b)},readOnly:!0},{name:"fold",bindKey:e("Alt-L","Alt-L"),exec:function(a){a.session.toggleFold(!1)},readOnly:!0},{name:"unfold",bindKey:e("Alt-Shift-L","Alt-Shift-L"),exec:function(a){a.session.toggleFold(!0)},readOnly:!0},{name:"foldall",bindKey:e("Alt-0","Alt-0"),exec:function(a){a.session.foldAll()},readOnly:!0},{name:"unfoldall",bindKey:e("Alt-Shift-0","Alt-Shift-0"),exec:function(a){a.session.unfold()},readOnly:!0},{name:"findnext",bindKey:e("Ctrl-K","Command-G"),exec:function(a){a.findNext()},readOnly:!0},{name:"findprevious",bindKey:e("Ctrl-Shift-K","Command-Shift-G"),exec:function(a){a.findPrevious()},readOnly:!0},{name:"find",bindKey:e("Ctrl-F","Command-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());a.find(b)},readOnly:!0},{name:"overwrite",bindKey:e("Insert","Insert"),exec:function(a){a.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:e("Ctrl-Shift-Home|Alt-Shift-Up","Command-Shift-Up"),exec:function(a){a.getSelection().selectFileStart()},readOnly:!0},{name:"gotostart",bindKey:e("Ctrl-Home|Ctrl-Up","Command-Home|Command-Up"),exec:function(a){a.navigateFileStart()},readOnly:!0},{name:"selectup",bindKey:e("Shift-Up","Shift-Up"),exec:function(a){a.getSelection().selectUp()},multiSelectAction:"forEach",readOnly:!0},{name:"golineup",bindKey:e("Up","Up|Ctrl-P"),exec:function(a,b){a.navigateUp(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selecttoend",bindKey:e("Ctrl-Shift-End|Alt-Shift-Down","Command-Shift-Down"),exec:function(a){a.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoend",bindKey:e("Ctrl-End|Ctrl-Down","Command-End|Command-Down"),exec:function(a){a.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"selectdown",bindKey:e("Shift-Down","Shift-Down"),exec:function(a){a.getSelection().selectDown()},multiSelectAction:"forEach",readOnly:!0},{name:"golinedown",bindKey:e("Down","Down|Ctrl-N"),exec:function(a,b){a.navigateDown(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectwordleft",bindKey:e("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(a){a.getSelection().selectWordLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"gotowordleft",bindKey:e("Ctrl-Left","Option-Left"),exec:function(a){a.navigateWordLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"selecttolinestart",bindKey:e("Alt-Shift-Left","Command-Shift-Left"),exec:function(a){a.getSelection().selectLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"gotolinestart",bindKey:e("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(a){a.navigateLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"selectleft",bindKey:e("Shift-Left","Shift-Left"),exec:function(a){a.getSelection().selectLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoleft",bindKey:e("Left","Left|Ctrl-B"),exec:function(a,b){a.navigateLeft(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectwordright",bindKey:e("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(a){a.getSelection().selectWordRight()},multiSelectAction:"forEach",readOnly:!0},{name:"gotowordright",bindKey:e("Ctrl-Right","Option-Right"),exec:function(a){a.navigateWordRight()},multiSelectAction:"forEach",readOnly:!0},{name:"selecttolineend",bindKey:e("Alt-Shift-Right","Command-Shift-Right"),exec:function(a){a.getSelection().selectLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"gotolineend",bindKey:e("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(a){a.navigateLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"selectright",bindKey:e("Shift-Right","Shift-Right"),exec:function(a){a.getSelection().selectRight()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoright",bindKey:e("Right","Right|Ctrl-F"),exec:function(a,b){a.navigateRight(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectpagedown",bindKey:e("Shift-PageDown","Shift-PageDown"),exec:function(a){a.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:e(null,"PageDown"),exec:function(a){a.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:e("PageDown","Option-PageDown|Ctrl-V"),exec:function(a){a.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:e("Shift-PageUp","Shift-PageUp"),exec:function(a){a.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:e(null,"PageUp"),exec:function(a){a.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:e("PageUp","Option-PageUp"),exec:function(a){a.gotoPageUp()},readOnly:!0},{name:"selectlinestart",bindKey:e("Shift-Home","Shift-Home"),exec:function(a){a.getSelection().selectLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"selectlineend",bindKey:e("Shift-End","Shift-End"),exec:function(a){a.getSelection().selectLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"togglerecording",bindKey:e("Ctrl-Alt-E","Command-Option-E"),exec:function(a){a.commands.toggleRecording()},readOnly:!0},{name:"replaymacro",bindKey:e("Ctrl-Shift-E","Command-Shift-E"),exec:function(a){a.commands.replay(a)},readOnly:!0},{name:"jumptomatching",bindKey:e("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(a){a.jumpToMatching()},multiSelectAction:"forEach",readOnly:!0},{name:"cut",exec:function(a){var b=a.getSelectionRange();a._emit("cut",b),a.selection.isEmpty()||(a.session.remove(b),a.clearSelection())},multiSelectAction:"forEach"},{name:"removeline",bindKey:e("Ctrl-D","Command-D"),exec:function(a){a.removeLines()},multiSelectAction:"forEach"},{name:"togglecomment",bindKey:e("Ctrl-7","Command-7"),exec:function(a){a.toggleCommentLines()},multiSelectAction:"forEach"},{name:"replace",bindKey:e("Ctrl-R","Command-Option-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replace(c,{needle:b})}},{name:"replaceall",bindKey:e("Ctrl-Shift-R","Command-Shift-Option-F"),exec:function(a){var b=prompt("Find:");if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replaceAll(c,{needle:b})}},{name:"undo",bindKey:e("Ctrl-Z","Command-Z"),exec:function(a){a.undo()}},{name:"redo",bindKey:e("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(a){a.redo()}},{name:"copylinesup",bindKey:e("Ctrl-Alt-Up","Command-Option-Up"),exec:function(a){a.copyLinesUp()}},{name:"movelinesup",bindKey:e("Alt-Up","Option-Up"),exec:function(a){a.moveLinesUp()}},{name:"copylinesdown",bindKey:e("Ctrl-Alt-Down","Command-Option-Down"),exec:function(a){a.copyLinesDown()}},{name:"movelinesdown",bindKey:e("Alt-Down","Option-Down"),exec:function(a){a.moveLinesDown()}},{name:"del",bindKey:e("Delete","Delete|Ctrl-D"),exec:function(a){a.remove("right")},multiSelectAction:"forEach"},{name:"backspace",bindKey:e("Command-Backspace|Option-Backspace|Shift-Backspace|Backspace","Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(a){a.remove("left")},multiSelectAction:"forEach"},{name:"removetolinestart",bindKey:e("Alt-Backspace","Command-Backspace"),exec:function(a){a.removeToLineStart()},multiSelectAction:"forEach"},{name:"removetolineend",bindKey:e("Alt-Delete","Ctrl-K"),exec:function(a){a.removeToLineEnd()},multiSelectAction:"forEach"},{name:"removewordleft",bindKey:e("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(a){a.removeWordLeft()},multiSelectAction:"forEach"},{name:"removewordright",bindKey:e("Ctrl-Delete","Alt-Delete"),exec:function(a){a.removeWordRight()},multiSelectAction:"forEach"},{name:"outdent",bindKey:e("Shift-Tab","Shift-Tab"),exec:function(a){a.blockOutdent()},multiSelectAction:"forEach"},{name:"indent",bindKey:e("Tab","Tab"),exec:function(a){a.indent()},multiSelectAction:"forEach"},{name:"insertstring",exec:function(a,b){a.insert(b)},multiSelectAction:"forEach"},{name:"inserttext",exec:function(a,b){a.insert(d.stringRepeat(b.text||"",b.times||1))},multiSelectAction:"forEach"},{name:"splitline",bindKey:e(null,"Ctrl-O"),exec:function(a){a.splitLine()},multiSelectAction:"forEach"},{name:"transposeletters",bindKey:e("Ctrl-T","Ctrl-T"),exec:function(a){a.transposeLetters()},multiSelectAction:function(a){a.transposeSelections(1)}},{name:"touppercase",bindKey:e("Ctrl-U","Ctrl-U"),exec:function(a){a.toUpperCase()},multiSelectAction:"forEach"},{name:"tolowercase",bindKey:e("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(a){a.toLowerCase()},multiSelectAction:"forEach"}]}),define("ace/edit_session",["require","exports","module","ace/config","ace/lib/oop","ace/lib/lang","ace/lib/net","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/edit_session/folding","ace/edit_session/bracket_match"],function(a,b,c){"use strict";var d=a("./config"),e=a("./lib/oop"),f=a("./lib/lang"),g=a("./lib/net"),h=a("./lib/event_emitter").EventEmitter,i=a("./selection").Selection,j=a("./mode/text").Mode,k=a("./range").Range,l=a("./document").Document,m=a("./background_tokenizer").BackgroundTokenizer,n=function(a,b){this.$modified=!0,this.$breakpoints=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$rowCache=[],this.$wrapData=[],this.$foldData=[],this.$undoSelect=!0,this.$foldData.toString=function(){var a="";return this.forEach(function(b){a+="\n"+b.toString()}),a},a instanceof l?this.setDocument(a):this.setDocument(new l(a)),this.selection=new i(this),b?this.setMode(b):this.setMode(new j)};(function(){function q(a){return a<4352?!1:a>=4352&&a<=4447||a>=4515&&a<=4519||a>=4602&&a<=4607||a>=9001&&a<=9002||a>=11904&&a<=11929||a>=11931&&a<=12019||a>=12032&&a<=12245||a>=12272&&a<=12283||a>=12288&&a<=12350||a>=12353&&a<=12438||a>=12441&&a<=12543||a>=12549&&a<=12589||a>=12593&&a<=12686||a>=12688&&a<=12730||a>=12736&&a<=12771||a>=12784&&a<=12830||a>=12832&&a<=12871||a>=12880&&a<=13054||a>=13056&&a<=19903||a>=19968&&a<=42124||a>=42128&&a<=42182||a>=43360&&a<=43388||a>=44032&&a<=55203||a>=55216&&a<=55238||a>=55243&&a<=55291||a>=63744&&a<=64255||a>=65040&&a<=65049||a>=65072&&a<=65106||a>=65108&&a<=65126||a>=65128&&a<=65131||a>=65281&&a<=65376||a>=65504&&a<=65510}e.implement(this,h),this.setDocument=function(a){if(this.doc)throw new Error("Document is already set");this.doc=a,a.on("change",this.onChange.bind(this)),this.on("changeFold",this.onChangeFold.bind(this)),this.bgTokenizer&&(this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0))},this.getDocument=function(){return this.doc},this.$resetRowCache=function(a){if(a==0){this.$rowCache=[];return}var b=this.$rowCache;for(var c=0;c<b.length;c++)if(b[c].docRow>=a){b.splice(c,b.length);return}},this.onChangeFold=function(a){var b=a.data;this.$resetRowCache(b.start.row)},this.onChange=function(a){var b=a.data;this.$modified=!0,this.$resetRowCache(b.range.start.row);var c=this.$updateInternalDataOnChange(a);!this.$fromUndo&&this.$undoManager&&!b.ignore&&(this.$deltasDoc.push(b),c&&c.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:c}),this.$informUndoManager.schedule()),this.bgTokenizer.start(b.range.start.row),this._emit("change",a)},this.setValue=function(a){this.doc.setValue(a),this.selection.moveCursorTo(0,0),this.selection.clearSelection(),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(a){return this.bgTokenizer.getState(a)},this.getTokens=function(a,b){return this.bgTokenizer.getTokens(a,b)},this.getTokenAt=function(a,b){var c=this.bgTokenizer.getTokens(a,a)[0].tokens,d,e=0;if(b==null)f=c.length-1,e=this.getLine(a).length;else for(var f=0;f<c.length;f++){e+=c[f].value.length;if(e>=b)break}return d=c[f],d?(d.index=f,d.start=e-d.value.length,d):null},this.setUndoManager=function(a){this.$undoManager=a,this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(a){var b=this;this.$syncInformUndoManager=function(){b.$informUndoManager.cancel(),b.$deltasFold.length&&(b.$deltas.push({group:"fold",deltas:b.$deltasFold}),b.$deltasFold=[]),b.$deltasDoc.length&&(b.$deltas.push({group:"doc",deltas:b.$deltasDoc}),b.$deltasDoc=[]),b.$deltas.length>0&&a.execute({action:"aceupdate",args:[b.$deltas,b]}),b.$deltas=[]},this.$informUndoManager=f.deferredCall(this.$syncInformUndoManager)}},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?f.stringRepeat(" ",this.getTabSize()):"	"},this.$useSoftTabs=!0,this.setUseSoftTabs=function(a){if(this.$useSoftTabs===a)return;this.$useSoftTabs=a},this.getUseSoftTabs=function(){return this.$useSoftTabs},this.$tabSize=4,this.setTabSize=function(a){if(isNaN(a)||this.$tabSize===a)return;this.$modified=!0,this.$tabSize=a,this._emit("changeTabSize")},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(a){return this.$useSoftTabs&&a.column%this.$tabSize==0},this.$overwrite=!1,this.setOverwrite=function(a){if(this.$overwrite==a)return;this.$overwrite=a,this._emit("changeOverwrite")},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(a){this.$breakpoints=[];for(var b=0;b<a.length;b++)this.$breakpoints[a[b]]=!0;this._emit("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._emit("changeBreakpoint",{})},this.setBreakpoint=function(a){this.$breakpoints[a]=!0,this._emit("changeBreakpoint",{})},this.clearBreakpoint=function(a){delete this.$breakpoints[a],this._emit("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.addMarker=function(a,b,c,d){var e=this.$markerId++,f={range:a,type:c||"line",renderer:typeof c=="function"?c:null,clazz:b,inFront:!!d};return d?(this.$frontMarkers[e]=f,this._emit("changeFrontMarker")):(this.$backMarkers[e]=f,this._emit("changeBackMarker")),e},this.removeMarker=function(a){var b=this.$frontMarkers[a]||this.$backMarkers[a];if(!b)return;var c=b.inFront?this.$frontMarkers:this.$backMarkers;b&&(delete c[a],this._emit(b.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(a){return a?this.$frontMarkers:this.$backMarkers},this.setAnnotations=function(a){this.$annotations={};for(var b=0;b<a.length;b++){var c=a[b],d=c.row;this.$annotations[d]?this.$annotations[d].push(c):this.$annotations[d]=[c]}this._emit("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||{}},this.clearAnnotations=function(){this.$annotations={},this._emit("changeAnnotation",{})},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getWordRange=function(a,b){var c=this.getLine(a),d=!1;b>0&&(d=!!c.charAt(b-1).match(this.tokenRe)),d||(d=!!c.charAt(b).match(this.tokenRe));var e=d?this.tokenRe:this.nonTokenRe,f=b;if(f>0){do f--;while(f>=0&&c.charAt(f).match(e));f++}var g=b;while(g<c.length&&c.charAt(g).match(e))g++;return new k(a,f,a,g)},this.getAWordRange=function(a,b){var c=this.getWordRange(a,b),d=this.getLine(c.end.row);while(d.charAt(c.end.column).match(/[ \t]/))c.end.column+=1;return c},this.setNewLineMode=function(a){this.doc.setNewLineMode(a)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.$useWorker=!0,this.setUseWorker=function(a){if(this.$useWorker==a)return;this.$useWorker=a,this.$stopWorker(),a&&this.$startWorker()},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(a){var b=a.data;this.bgTokenizer.start(b.first),this._emit("tokenizerUpdate",a)},this.$modes={},this._loadMode=function(b,c){function i(a){if(e.$modes[b])return c(e.$modes[b]);e.$modes[b]=new a.Mode,e._emit("loadmode",{name:b,mode:e.$modes[b]}),c(e.$modes[b])}function j(a){if(!d.get("packaged"))return a();var c=b.split("/").pop(),e=d.get("modePath")+"/mode-"+c+d.get("suffix");g.loadScript(e,a)}if(this.$modes[b])return c(this.$modes[b]);var e=this,f;try{f=a(b)}catch(h){}if(f)return i(f);j(function(){a([b],i)})},this.$mode=null,this.$origMode=null,this.setMode=function(a){this.$origMode=a;if(typeof a=="string"){var b=this;this._loadMode(a,function(c){if(b.$origMode!==a)return;b.setMode(c)});return}if(this.$mode===a)return;this.$mode=a,this.$stopWorker(),this.$useWorker&&this.$startWorker();var c=a.getTokenizer();if(c.addEventListener!==undefined){var d=this.onReloadTokenizer.bind(this);c.addEventListener("update",d)}if(!this.bgTokenizer){this.bgTokenizer=new m(c);var b=this;this.bgTokenizer.addEventListener("update",function(a){b._emit("tokenizerUpdate",a)})}else this.bgTokenizer.setTokenizer(c);this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0),this.tokenRe=a.tokenRe,this.nonTokenRe=a.nonTokenRe,this.$setFolding(a.foldingRules),this._emit("changeMode")},this.$stopWorker=function(){this.$worker&&this.$worker.terminate(),this.$worker=null},this.$startWorker=function(){if(typeof Worker!="undefined"&&!a.noWorker)try{this.$worker=this.$mode.createWorker(this)}catch(b){console.log("Could not load worker"),console.log(b),this.$worker=null}else this.$worker=null},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(a){a=Math.round(Math.max(0,a));if(this.$scrollTop===a)return;this.$scrollTop=a,this._emit("changeScrollTop",a)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(a){a=Math.round(Math.max(0,a));if(this.$scrollLeft===a)return;this.$scrollLeft=a,this._emit("changeScrollLeft",a)},this.getScrollLeft=function(){return this.$scrollLeft},this.getWidth=function(){return this.$computeWidth(),this.width},this.getScreenWidth=function(){return this.$computeWidth(),this.screenWidth},this.$computeWidth=function(a){if(this.$modified||a){this.$modified=!1;var b=this.doc.getAllLines(),c=0,d=0;for(var e=0;e<b.length;e++){var f=this.getFoldLine(e),g,h;g=b[e];if(f){var i=f.range.end;g=this.getFoldDisplayLine(f),e=i.row}h=g.length,c=Math.max(c,h),this.$useWrapMode||(d=Math.max(d,this.$getStringScreenWidth(g)[0]))}this.width=c,this.$useWrapMode?this.screenWidth=this.$wrapLimit:this.screenWidth=d}},this.getLine=function(a){return this.doc.getLine(a)},this.getLines=function(a,b){return this.doc.getLines(a,b)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(a){return this.doc.getTextRange(a)},this.insert=function(a,b){return this.doc.insert(a,b)},this.remove=function(a){return this.doc.remove(a)},this.undoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=a.length-1;d!=-1;d--){var e=a[d];e.group=="doc"?(this.doc.revertDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!0,c)):e.deltas.forEach(function(a){this.addFolds(a.folds)},this)}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.redoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=0;d<a.length;d++){var e=a[d];e.group=="doc"&&(this.doc.applyDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!1,c))}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.setUndoSelect=function(a){this.$undoSelect=a},this.$getUndoSelection=function(a,b,c){function d(a){var c=a.action=="insertText"||a.action=="insertLines";return b?!c:c}var e=a[0],f,g,h=!1;d(e)?(f=e.range.clone(),h=!0):(f=k.fromPoints(e.range.start,e.range.start),h=!1);for(var i=1;i<a.length;i++)e=a[i],d(e)?(g=e.range.start,f.compare(g.row,g.column)==-1&&f.setStart(e.range.start),g=e.range.end,f.compare(g.row,g.column)==1&&f.setEnd(e.range.end),h=!0):(g=e.range.start,f.compare(g.row,g.column)==-1&&(f=k.fromPoints(e.range.start,e.range.start)),h=!1);if(c!=null){var j=c.compareRange(f);j==1?f.setStart(c.start):j==-1&&f.setEnd(c.end)}return f},this.replace=function(a,b){return this.doc.replace(a,b)},this.moveText=function(a,b){var c=this.getTextRange(a);this.remove(a);var d=b.row,e=b.column;!a.isMultiLine()&&a.start.row==d&&a.end.column<e&&(e-=c.length);if(a.isMultiLine()&&a.end.row<d){var f=this.doc.$split(c);d-=f.length-1}var g=d+a.end.row-a.start.row,h=a.isMultiLine()?a.end.column:e+a.end.column-a.start.column,i=new k(d,e,g,h);return this.insert(i.start,c),i},this.indentRows=function(a,b,c){c=c.replace(/\t/g,this.getTabString());for(var d=a;d<=b;d++)this.insert({row:d,column:0},c)},this.outdentRows=function(a){var b=a.collapseRows(),c=new k(0,0,0,0),d=this.getTabSize();for(var e=b.start.row;e<=b.end.row;++e){var f=this.getLine(e);c.start.row=e,c.end.row=e;for(var g=0;g<d;++g)if(f.charAt(g)!=" ")break;g<d&&f.charAt(g)=="	"?(c.start.column=g,c.end.column=g+1):(c.start.column=0,c.end.column=g),this.remove(c)}},this.moveLinesUp=function(a,b){if(a<=0)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a-1,c),-1},this.moveLinesDown=function(a,b){if(b>=this.doc.getLength()-1)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a+1,c),1},this.duplicateLines=function(a,b){var a=this.$clipRowToDocument(a),b=this.$clipRowToDocument(b),c=this.getLines(a,b);this.doc.insertLines(a,c);var d=b-a+1;return d},this.$clipRowToDocument=function(a){return Math.max(0,Math.min(a,this.doc.getLength()-1))},this.$clipColumnToRow=function(a,b){return b<0?0:Math.min(this.doc.getLine(a).length,b)},this.$clipPositionToDocument=function(a,b){b=Math.max(0,b);if(a<0)a=0,b=0;else{var c=this.doc.getLength();a>=c?(a=c-1,b=this.doc.getLine(c-1).length):b=Math.min(this.doc.getLine(a).length,b)}return{row:a,column:b}},this.$clipRangeToDocument=function(a){a.start.row<0?(a.start.row=0,a.start.column=0):a.start.column=this.$clipColumnToRow(a.start.row,a.start.column);var b=this.doc.getLength()-1;return a.end.row>b?(a.end.row=b,a.end.column=this.doc.getLine(b).length):a.end.column=this.$clipColumnToRow(a.end.row,a.end.column),a},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(a){if(a!=this.$useWrapMode){this.$useWrapMode=a,this.$modified=!0,this.$resetRowCache(0);if(a){var b=this.getLength();this.$wrapData=[];for(var c=0;c<b;c++)this.$wrapData.push([]);this.$updateWrapData(0,b-1)}this._emit("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(a,b){if(this.$wrapLimitRange.min!==a||this.$wrapLimitRange.max!==b)this.$wrapLimitRange.min=a,this.$wrapLimitRange.max=b,this.$modified=!0,this._emit("changeWrapMode")},this.adjustWrapLimit=function(a){var b=this.$constrainWrapLimit(a);return b!=this.$wrapLimit&&b>0?(this.$wrapLimit=b,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._emit("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(a){var b=this.$wrapLimitRange.min;b&&(a=Math.max(b,a));var c=this.$wrapLimitRange.max;return c&&(a=Math.min(c,a)),Math.max(1,a)},this.getWrapLimit=function(){return this.$wrapLimit},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(a){var b=this.$useWrapMode,c,d=a.data.action,e=a.data.range.start.row,f=a.data.range.end.row,g=a.data.range.start,h=a.data.range.end,i=null;d.indexOf("Lines")!=-1?(d=="insertLines"?f=e+a.data.lines.length:f=e,c=a.data.lines?a.data.lines.length:f-e):c=f-e;if(c!=0)if(d.indexOf("remove")!=-1){b&&this.$wrapData.splice(e,c);var j=this.$foldData;i=this.getFoldsInRange(a.data.range),this.removeFolds(i);var k=this.getFoldLine(h.row),l=0;if(k){k.addRemoveChars(h.row,h.column,g.column-h.column),k.shiftRow(-c);var m=this.getFoldLine(e);m&&m!==k&&(m.merge(k),k=m),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=h.row&&k.shiftRow(-c)}f=e}else{var n;if(b){n=[e,0];for(var o=0;o<c;o++)n.push([]);this.$wrapData.splice.apply(this.$wrapData,n)}var j=this.$foldData,k=this.getFoldLine(e),l=0;if(k){var p=k.range.compareInside(g.row,g.column);p==0?(k=k.split(g.row,g.column),k.shiftRow(c),k.addRemoveChars(f,0,h.column-g.column)):p==-1&&(k.addRemoveChars(e,0,h.column-g.column),k.shiftRow(c)),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=e&&k.shiftRow(c)}}else{c=Math.abs(a.data.range.start.column-a.data.range.end.column),d.indexOf("remove")!=-1&&(i=this.getFoldsInRange(a.data.range),this.removeFolds(i),c=-c);var k=this.getFoldLine(e);k&&k.addRemoveChars(e,g.column,c)}return b&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),b&&this.$updateWrapData(e,f),i},this.$updateWrapData=function(a,b){var c=this.doc.getAllLines(),d=this.getTabSize(),e=this.$wrapData,g=this.$wrapLimit,h,k,l=a;b=Math.min(b,c.length-1);while(l<=b){k=this.getFoldLine(l,k);if(!k)h=this.$getDisplayTokens(f.stringTrimRight(c[l])),e[l]=this.$computeWrapSplits(h,g,d),l++;else{h=[],k.walk(function(a,b,d,e){var f;if(a){f=this.$getDisplayTokens(a,h.length),f[0]=i;for(var g=1;g<f.length;g++)f[g]=j}else f=this.$getDisplayTokens(c[b].substring(e,d),h.length);h=h.concat(f)}.bind(this),k.end.row,c[k.end.row].length+1);while(h.length!=0&&h[h.length-1]>=n)h.pop();e[k.start.row]=this.$computeWrapSplits(h,g,d),l=k.end.row+1}}};var b=1,c=2,i=3,j=4,l=9,n=10,o=11,p=12;this.$computeWrapSplits=function(a,b){function g(b){var d=a.slice(e,b),g=d.length;d.join("").replace(/12/g,function(){g-=1}).replace(/2/g,function(){g-=1}),f+=g,c.push(f),e=b}if(a.length==0)return[];var c=[],d=a.length,e=0,f=0;while(d-e>b){var h=e+b;if(a[h]>=n){while(a[h]>=n)h++;g(h);continue}if(a[h]==i||a[h]==j){for(h;h!=e-1;h--)if(a[h]==i)break;if(h>e){g(h);continue}h=e+b;for(h;h<a.length;h++)if(a[h]!=j)break;if(h==a.length)break;g(h);continue}var k=Math.max(h-10,e-1);while(h>k&&a[h]<i)h--;while(h>k&&a[h]==l)h--;if(h>k){g(++h);continue}h=e+b,g(h)}return c},this.$getDisplayTokens=function(a,d){var e=[],f;d=d||0;for(var g=0;g<a.length;g++){var h=a.charCodeAt(g);if(h==9){f=this.getScreenTabSize(e.length+d),e.push(o);for(var i=1;i<f;i++)e.push(p)}else h==32?e.push(n):h>39&&h<48||h>57&&h<64?e.push(l):h>=4352&&q(h)?e.push(b,c):e.push(b)}return e},this.$getStringScreenWidth=function(a,b,c){if(b==0)return[0,0];b==null&&(b=c+a.length*Math.max(this.getTabSize(),2)),c=c||0;var d,e;for(e=0;e<a.length;e++){d=a.charCodeAt(e),d==9?c+=this.getScreenTabSize(c):d>=4352&&q(d)?c+=2:c+=1;if(c>b)break}return[c,e]},this.getRowLength=function(a){return!this.$useWrapMode||!this.$wrapData[a]?1:this.$wrapData[a].length+1},this.getRowHeight=function(a,b){return this.getRowLength(b)*a.lineHeight},this.getScreenLastRowColumn=function(a){var b=this.screenToDocumentPosition(a,Number.MAX_VALUE);return this.documentToScreenColumn(b.row,b.column)},this.getDocumentLastRowColumn=function(a,b){var c=this.documentToScreenRow(a,b);return this.getScreenLastRowColumn(c)},this.getDocumentLastRowColumnPosition=function(a,b){var c=this.documentToScreenRow(a,b);return this.screenToDocumentPosition(c,Number.MAX_VALUE/10)},this.getRowSplitData=function(a){return this.$useWrapMode?this.$wrapData[a]:undefined},this.getScreenTabSize=function(a){return this.$tabSize-a%this.$tabSize},this.screenToDocumentRow=function(a,b){return this.screenToDocumentPosition(a,b).row},this.screenToDocumentColumn=function(a,b){return this.screenToDocumentPosition(a,b).column},this.screenToDocumentPosition=function(a,b){if(a<0)return{row:0,column:0};var c,d=0,e=0,f,g=0,h=0,i=this.$rowCache;for(var j=0;j<i.length;j++){if(!(i[j].screenRow<a))break;g=i[j].screenRow,d=i[j].docRow}var k=!i.length||j==i.length,l=this.getLength()-1,m=this.getNextFoldLine(d),n=m?m.start.row:Infinity;while(g<=a){h=this.getRowLength(d);if(g+h-1>=a||d>=l)break;g+=h,d++,d>n&&(d=m.end.row+1,m=this.getNextFoldLine(d,m),n=m?m.start.row:Infinity),k&&i.push({docRow:d,screenRow:g})}if(m&&m.start.row<=d)c=this.getFoldDisplayLine(m),d=m.start.row;else{if(g+h<=a||d>l)return{row:l,column:this.getLine(l).length};c=this.getLine(d),m=null}if(this.$useWrapMode){var o=this.$wrapData[d];o&&(f=o[a-g],a>g&&o.length&&(e=o[a-g-1]||o[o.length-1],c=c.substring(e)))}return e+=this.$getStringScreenWidth(c,b)[1],this.$useWrapMode&&e>=f&&(e=f-1),m?m.idxToPosition(e):{row:d,column:e}},this.documentToScreenPosition=function(a,b){if(typeof b=="undefined")var c=this.$clipPositionToDocument(a.row,a.column);else c=this.$clipPositionToDocument(a,b);a=c.row,b=c.column;var d;if(this.$useWrapMode){d=this.$wrapData;if(a>d.length-1)return{row:this.getScreenLength(),column:d.length==0?0:d[d.length-1].length-1}}var e=0,f=null,g=null;g=this.getFoldAt(a,b,1),g&&(a=g.start.row,b=g.start.column);var h,i=0,j=this.$rowCache;for(var k=0;k<j.length;k++){if(!(j[k].docRow<a))break;e=j[k].screenRow,i=j[k].docRow}var l=!j.length||k==j.length,m=this.getNextFoldLine(i),n=m?m.start.row:Infinity;while(i<a){if(i>=n){h=m.end.row+1;if(h>a)break;m=this.getNextFoldLine(h,m),n=m?m.start.row:Infinity}else h=i+1;e+=this.getRowLength(i),i=h,l&&j.push({docRow:i,screenRow:e})}var o="";m&&i>=n?(o=this.getFoldDisplayLine(m,a,b),f=m.start.row):(o=this.getLine(a).substring(0,b),f=a);if(this.$useWrapMode){var p=d[f],q=0;while(o.length>=p[q])e++,q++;o=o.substring(p[q-1]||0,o.length)}return{row:e,column:this.$getStringScreenWidth(o)[0]}},this.documentToScreenColumn=function(a,b){return this.documentToScreenPosition(a,b).column},this.documentToScreenRow=function(a,b){return this.documentToScreenPosition(a,b).row},this.getScreenLength=function(){var a=0,b=null;if(!this.$useWrapMode){a=this.getLength();var c=this.$foldData;for(var d=0;d<c.length;d++)b=c[d],a-=b.end.row-b.start.row}else{var e=this.$wrapData.length,f=0,d=0,b=this.$foldData[d++],g=b?b.start.row:Infinity;while(f<e)a+=this.$wrapData[f].length+1,f++,f>g&&(f=b.end.row+1,b=this.$foldData[d++],g=b?b.start.row:Infinity)}return a}}).call(n.prototype),a("./edit_session/folding").Folding.call(n.prototype),a("./edit_session/bracket_match").BracketMatch.call(n.prototype),b.EditSession=n}),define("ace/config",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return a.replace(/-(.)/g,function(a,b){return b.toUpperCase()})}"no use strict";var d=a("./lib/lang"),e=function(){return this}(),f={packaged:!1,workerPath:"",modePath:"",themePath:"",suffix:".js"};b.get=function(a){if(!f.hasOwnProperty(a))throw new Error("Unknown confik key: "+a);return f[a]},b.set=function(a,b){if(!f.hasOwnProperty(a))throw new Error("Unknown confik key: "+a);f[a]=b},b.all=function(){return d.copyObject(f)},b.init=function(){f.packaged=a.packaged||c.packaged||e.define&&define.packaged;if(!e.document)return"";var d={},h="",i,j=document.getElementsByTagName("script");for(var k=0;k<j.length;k++){var l=j[k],m=l.src||l.getAttribute("src");if(!m)continue;var n=l.attributes;for(var o=0,p=n.length;o<p;o++){var q=n[o];q.name.indexOf("data-ace-")===0&&(d[g(q.name.replace(/^data-ace-/,""))]=q.value)}var r=m.match(/^(?:(.*\/)ace\.js|(.*\/)ace((-uncompressed)?(-noconflict)?\.js))(?:\?|$)/);r&&(h=r[1]||r[2],i=r[3])}h&&(d.base=d.base||h,d.packaged=!0),d.suffix=d.suffix||i,d.workerPath=d.workerPath||d.base,d.modePath=d.modePath||d.base,d.themePath=d.themePath||d.base,delete d.base;for(var s in d)typeof d[s]!="undefined"&&b.set(s,d[s])}}),define("ace/lib/net",["require","exports","module"],function(a,b,c){"use strict",b.get=function(a,c){var d=b.createXhr();d.open("GET",a,!0),d.onreadystatechange=function(a){d.readyState===4&&c(d.responseText)},d.send(null)};var d=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];b.createXhr=function(){var a,b,c;if(typeof XMLHttpRequest!="undefined")return new XMLHttpRequest;for(b=0;b<3;b++){c=d[b];try{a=new ActiveXObject(c)}catch(e){}if(a){d=[c];break}}if(!a)throw new Error("createXhr(): XMLHttpRequest not available");return a},b.loadScript=function(a,b){var c=document.getElementsByTagName("head")[0],d=document.createElement("script");d.src=a,c.appendChild(d),d.onload=b}}),define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/event_emitter").EventEmitter,g=a("./range").Range,h=function(a){this.session=a,this.doc=a.getDocument(),this.clearSelection(),this.selectionLead=this.doc.createAnchor(0,0),this.selectionAnchor=this.doc.createAnchor(0,0);var b=this;this.selectionLead.on("change",function(a){b._emit("changeCursor"),b.$isEmpty||b._emit("changeSelection"),!b.$keepDesiredColumnOnChange&&a.old.column!=a.value.column&&(b.$desiredColumn=null)}),this.selectionAnchor.on("change",function(){b.$isEmpty||b._emit("changeSelection")})};(function(){d.implement(this,f),this.isEmpty=function(){return this.$isEmpty||this.selectionAnchor.row==this.selectionLead.row&&this.selectionAnchor.column==this.selectionLead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.selectionLead.getPosition()},this.setSelectionAnchor=function(a,b){this.selectionAnchor.setPosition(a,b),this.$isEmpty&&(this.$isEmpty=!1,this._emit("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.selectionAnchor.getPosition()},this.getSelectionLead=function(){return this.selectionLead.getPosition()},this.shiftSelection=function(a){if(this.$isEmpty){this.moveCursorTo(this.selectionLead.row,this.selectionLead.column+a);return}var b=this.getSelectionAnchor(),c=this.getSelectionLead(),d=this.isBackwards();(!d||b.column!==0)&&this.setSelectionAnchor(b.row,b.column+a),(d||c.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(c.row,c.column+a)})},this.isBackwards=function(){var a=this.selectionAnchor,b=this.selectionLead;return a.row>b.row||a.row==b.row&&a.column>b.column},this.getRange=function(){var a=this.selectionAnchor,b=this.selectionLead;return this.isEmpty()?g.fromPoints(b,b):this.isBackwards()?g.fromPoints(b,a):g.fromPoints(a,b)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){var a=this.doc.getLength()-1;this.setSelectionAnchor(a,this.doc.getLine(a).length),this.moveCursorTo(0,0)},this.setSelectionRange=function(a,b){b?(this.setSelectionAnchor(a.end.row,a.end.column),this.selectTo(a.start.row,a.start.column)):(this.setSelectionAnchor(a.start.row,a.start.column),this.selectTo(a.end.row,a.end.column)),this.$desiredColumn=null},this.$moveSelection=function(a){var b=this.selectionLead;this.$isEmpty&&this.setSelectionAnchor(b.row,b.column),a.call(this)},this.selectTo=function(a,b){this.$moveSelection(function(){this.moveCursorTo(a,b)})},this.selectToPosition=function(a){this.$moveSelection(function(){this.moveCursorToPosition(a)})},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.selectWord=function(){var a=this.getCursor(),b=this.session.getWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectAWord=function(){var a=this.getCursor(),b=this.session.getAWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectLine=function(){var a=this.selectionLead.row,b,c=this.session.getFoldLine(a);c?(a=c.start.row,b=c.end.row):b=a,this.setSelectionAnchor(a,0),this.$moveSelection(function(){this.moveCursorTo(b+1,0)})},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.moveCursorLeft=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,-1))this.moveCursorTo(b.start.row,b.start.column);else if(a.column==0)a.row>0&&this.moveCursorTo(a.row-1,this.doc.getLine(a.row-1).length);else{var c=this.session.getTabSize();this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column-c,a.column).split(" ").length-1==c?this.moveCursorBy(0,-c):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,1))this.moveCursorTo(b.end.row,b.end.column);else if(this.selectionLead.column==this.doc.getLine(this.selectionLead.row).length)this.selectionLead.row<this.doc.getLength()-1&&this.moveCursorTo(this.selectionLead.row+1,0);else{var c=this.session.getTabSize(),a=this.selectionLead;this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column,a.column+c).split(" ").length-1==c?this.moveCursorBy(0,c):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.session.documentToScreenRow(a,b),d=this.session.screenToDocumentPosition(c,0),e=this.session.getDisplayLine(a,null,d.row,d.column),f=e.match(/^\s*/);f[0].length==b?this.moveCursorTo(d.row,d.column):this.moveCursorTo(d.row,d.column+f[0].length)},this.moveCursorLineEnd=function(){var a=this.selectionLead,b=this.session.getDocumentLastRowColumnPosition(a.row,a.column);this.moveCursorTo(b.row,b.column)},this.moveCursorFileEnd=function(){var a=this.doc.getLength()-1,b=this.doc.getLine(a).length;this.moveCursorTo(a,b)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorWordRight=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.doc.getLine(a),d=c.substring(b),e;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var f=this.session.getFoldAt(a,b,1);if(f){this.moveCursorTo(f.end.row,f.end.column);return}if(e=this.session.nonTokenRe.exec(d))b+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,d=c.substring(b);if(b>=c.length){this.moveCursorTo(a,c.length),this.moveCursorRight(),a<this.doc.getLength()-1&&this.moveCursorWordRight();return}if(e=this.session.tokenRe.exec(d))b+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorWordLeft=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c;if(c=this.session.getFoldAt(a,b,-1)){this.moveCursorTo(c.start.row,c.start.column);return}var d=this.session.getFoldStringAt(a,b,-1);d==null&&(d=this.doc.getLine(a).substring(0,b));var f=e.stringReverse(d),g;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(g=this.session.nonTokenRe.exec(f))b-=this.session.nonTokenRe.lastIndex,f=f.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0;if(b<=0){this.moveCursorTo(a,0),this.moveCursorLeft(),a>0&&this.moveCursorWordLeft();return}if(g=this.session.tokenRe.exec(f))b-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorBy=function(a,b){var c=this.session.documentToScreenPosition(this.selectionLead.row,this.selectionLead.column);b===0&&(this.$desiredColumn?c.column=this.$desiredColumn:this.$desiredColumn=c.column);var d=this.session.screenToDocumentPosition(c.row+a,c.column);this.moveCursorTo(d.row,d.column+b,b===0)},this.moveCursorToPosition=function(a){this.moveCursorTo(a.row,a.column)},this.moveCursorTo=function(a,b,c){var d=this.session.getFoldAt(a,b,1);d&&(a=d.start.row,b=d.start.column),this.$keepDesiredColumnOnChange=!0,this.selectionLead.setPosition(a,b),this.$keepDesiredColumnOnChange=!1,c||(this.$desiredColumn=null)},this.moveCursorToScreen=function(a,b,c){var d=this.session.screenToDocumentPosition(a,b);this.moveCursorTo(d.row,d.column,c)},this.detach=function(){this.selectionLead.detach(),this.selectionAnchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(a){this.setSelectionRange(a,a.cursor==a.start),this.$desiredColumn=a.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(a){var b=this.getRange();return a?(a.start.column=b.start.column,a.start.row=b.start.row,a.end.column=b.end.column,a.end.row=b.end.row):a=b,a.cursor=this.isBackwards()?a.start:a.end,a.desiredColumn=this.$desiredColumn,a}}).call(h.prototype),b.Selection=h}),define("ace/range",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.isEqual=function(a){return this.start.row==a.start.row&&this.end.row==a.end.row&&this.start.column==a.start.column&&this.end.column==a.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;return b=this.compare(c.row,c.column),b==1?(b=this.compare(d.row,d.column),b==1?2:b==0?1:0):b==-1?-2:(b=this.compare(d.row,d.column),b==-1?-1:b==1?42:0)},this.comparePoint=function(a){return this.compare(a.row,a.column)},this.containsRange=function(a){return this.comparePoint(a.start)==0&&this.comparePoint(a.end)==0},this.intersectsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)||this.isStart(a,b)?!1:!0:!1},this.insideStart=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)?!1:!0:!1},this.insideEnd=function(a,b){return this.compare(a,b)==0?this.isStart(a,b)?!1:!0:!1},this.compare=function(a,b){return!this.isMultiLine()&&a===this.start.row?b<this.start.column?-1:b>this.end.column?1:0:a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.fixOrientation=function(){if(this.start.row<this.end.row||this.start.row==this.end.row&&this.start.column<this.end.column)return!1;var a=this.start;return this.end=this.start,this.start=a,!0},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour","ace/unicode"],function(a,b,c){"use strict";var d=a("../tokenizer").Tokenizer,e=a("./text_highlight_rules").TextHighlightRules,f=a("./behaviour").Behaviour,g=a("../unicode"),h=function(){this.$tokenizer=new d((new e).getRules()),this.$behaviour=new f};(function(){this.tokenRe=new RegExp("^["+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]|s])+","g"),this.getTokenizer=function(){return this.$tokenizer},this.toggleCommentLines=function(a,b,c,d){},this.getNextLineIndent=function(a,b,c){return""},this.checkOutdent=function(a,b,c){return!1},this.autoOutdent=function(a,b,c){},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.createWorker=function(a){return null},this.highlightSelection=function(a){var b=a.session;b.$selectionOccurrences||(b.$selectionOccurrences=[]),b.$selectionOccurrences.length&&this.clearSelectionHighlight(a);var c=a.getSelectionRange();if(c.isEmpty()||c.isMultiLine())return;var d=c.start.column-1,e=c.end.column+1,f=b.getLine(c.start.row),g=f.length,h=f.substring(Math.max(d,0),Math.min(e,g));if(d>=0&&/^[\w\d]/.test(h)||e<=g&&/[\w\d]$/.test(h))return;h=f.substring(c.start.column,c.end.column);if(!/^[\w\d]+$/.test(h))return;var i=a.getCursorPosition(),j={wrap:!0,wholeWord:!0,caseSensitive:!0,needle:h},k=a.$search.getOptions();a.$search.set(j);var l=a.$search.findAll(b);l.forEach(function(a){if(!a.contains(i.row,i.column)){var c=b.addMarker(a,"ace_selected_word","text");b.$selectionOccurrences.push(c)}}),a.$search.set(k)},this.clearSelectionHighlight=function(a){if(!a.session.$selectionOccurrences)return;a.session.$selectionOccurrences.forEach(function(b){a.session.removeMarker(b)}),a.session.$selectionOccurrences=[]},this.createModeDelegates=function(a){if(!this.$embeds)return;this.$modes={};for(var b=0;b<this.$embeds.length;b++)a[this.$embeds[b]]&&(this.$modes[this.$embeds[b]]=new a[this.$embeds[b]]);var c=["toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction"];for(var b=0;b<c.length;b++)(function(a){var d=c[b],e=a[d];a[c[b]]=function(){return this.$delegator(d,arguments,e)}})(this)},this.$delegator=function(a,b,c){var d=b[0];for(var e=0;e<this.$embeds.length;e++){if(!this.$modes[this.$embeds[e]])continue;var f=d.split(this.$embeds[e]);if(!f[0]&&f[1]){b[0]=f[1];var g=this.$modes[this.$embeds[e]];return g[a].apply(g,b)}}var h=c.apply(this,b);return c?h:undefined},this.transformAction=function(a,b,c,d,e){if(this.$behaviour){var f=this.$behaviour.getBehaviours();for(var g in f)if(f[g][b]){var h=f[g][b].apply(this,arguments);if(h)return h}}}}).call(h.prototype),b.Mode=h}),define("ace/tokenizer",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b){b=b?"g"+b:"g",this.rules=a,this.regExps={},this.matchMappings={};for(var c in this.rules){var d=this.rules[c],e=d,f=[],g=0,h=this.matchMappings[c]={};for(var i=0;i<e.length;i++){e[i].regex instanceof RegExp&&(e[i].regex=e[i].regex.toString().slice(1,-1));var j=(new RegExp("(?:("+e[i].regex+")|(.))")).exec("a").length-2,k=e[i].regex.replace(/\\([0-9]+)/g,function(a,b){return"\\"+(parseInt(b,10)+g+1)});if(j>1&&e[i].token.length!==j-1)throw new Error("Matching groups and length of the token array don't match in rule #"+i+" of state "+c);h[g]={rule:i,len:j},g+=j,f.push(k)}this.regExps[c]=new RegExp("(?:("+f.join(")|(")+")|(.))",b)}};(function(){this.getLineTokens=function(a,b){var c=b,d=this.rules[c],e=this.matchMappings[c],f=this.regExps[c];f.lastIndex=0;var g,h=[],i=0,j={type:null,value:""};while(g=f.exec(a)){var k="text",l=null,m=[g[0]];for(var n=0;n<g.length-2;n++){if(g[n+1]===undefined)continue;l=d[e[n].rule],e[n].len>1&&(m=g.slice(n+2,n+1+e[n].len)),typeof l.token=="function"?k=l.token.apply(this,m):k=l.token;var o=l.next;o&&o!==c&&(c=o,d=this.rules[c],e=this.matchMappings[c],i=f.lastIndex,f=this.regExps[c],f.lastIndex=i);break}if(m[0]){typeof k=="string"&&(m=[m.join("")],k=[k]);for(var n=0;n<m.length;n++){if(!m[n])continue;(!l||l.merge||k[n]==="text")&&j.type===k[n]?j.value+=m[n]:(j.type&&h.push(j),j={type:k[n],value:m[n]})}}if(i==a.length)break;i=f.lastIndex}return j.type&&h.push(j),{tokens:h,state:c}}}).call(d.prototype),b.Tokenizer=d}),define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(a,b,c){"use strict";var d=a("../lib/lang"),e=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:"text",regex:".+"}]}};(function(){this.addRules=function(a,b){for(var c in a){var d=a[c];for(var e=0;e<d.length;e++){var f=d[e];f.next?f.next=b+f.next:f.next=b+c}this.$rules[b+c]=d}},this.getRules=function(){return this.$rules},this.embedRules=function(a,b,c,e){var f=(new a).getRules();if(e)for(var g=0;g<e.length;g++)e[g]=b+e[g];else{e=[];for(var h in f)e.push(b+h)}this.addRules(f,b);for(var g=0;g<e.length;g++)Array.prototype.unshift.apply(this.$rules[e[g]],d.deepCopy(c));this.$embeds||(this.$embeds=[]),this.$embeds.push(b)},this.getEmbeds=function(){return this.$embeds}}).call(e.prototype),b.TextHighlightRules=e}),define("ace/mode/behaviour",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.$behaviours={}};(function(){this.add=function(a,b,c){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[a]:this.$behaviours[a]={}}this.$behaviours[a][b]=c},this.addBehaviours=function(a){for(var b in a)for(var c in a[b])this.add(b,c,a[b][c])},this.remove=function(a){this.$behaviours&&this.$behaviours[a]&&delete this.$behaviours[a]},this.inherit=function(a,b){if(typeof a=="function")var c=(new a).getBehaviours(b);else var c=a.getBehaviours(b);this.addBehaviours(c)},this.getBehaviours=function(a){if(!a)return this.$behaviours;var b={};for(var c=0;c<a.length;c++)this.$behaviours[a[c]]&&(b[a[c]]=this.$behaviours[a[c]]);return b}}).call(d.prototype),b.Behaviour=d}),define("ace/unicode",["require","exports","module"],function(a,b,c){function d(a){var c=/\w{4}/g;for(var d in a)b.packages[d]=a[d].replace(c,"\\u$&")}"use strict",b.packages={},d({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),define("ace/document",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/range","ace/anchor"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=a("./range").Range,g=a("./anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r\n|\r|\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){if(this.$newLineMode===a)return;this.$newLineMode=a},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];return b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column)),b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();return a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length),a},this.insert=function(a,b){if(!b||b.length===0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];return a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||"")),a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};return this._emit("change",{data:e}),d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};return this._emit("change",{data:d}),c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};return this._emit("change",{data:e}),d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b==c)return;var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};return this._emit("change",{data:i}),d.start},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};return this._emit("change",{data:e}),d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._emit("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row==c.end.row&&c.start.row!=this.row)return;if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row==d.row&&this.column==d.column)return;var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._emit("change",{old:e,value:d})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};return a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0),c}}).call(f.prototype)}),define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=function(a,b){this.running=!1,this.lines=[],this.currentLine=0,this.tokenizer=a;var c=this;this.$worker=function(){if(!c.running)return;var a=new Date,b=c.currentLine,d=c.doc,e=0,f=d.getLength();while(c.currentLine<f){c.lines[c.currentLine]=c.$tokenizeRows(c.currentLine,c.currentLine)[0],c.currentLine++,e+=1;if(e%5==0&&new Date-a>20){c.fireUpdateEvent(b,c.currentLine-1),c.running=setTimeout(c.$worker,20);return}}c.running=!1,c.fireUpdateEvent(b,f-1)}};(function(){d.implement(this,e),this.setTokenizer=function(a){this.tokenizer=a,this.lines=[],this.start(0)},this.setDocument=function(a){this.doc=a,this.lines=[],this.stop()},this.fireUpdateEvent=function(a,b){var c={first:a,last:b};this._emit("update",{data:c})},this.start=function(a){this.currentLine=Math.min(a||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(a,b){return this.$tokenizeRows(a,b)},this.getState=function(a){return this.$tokenizeRows(a,a)[0].state},this.$tokenizeRows=function(a,b){if(!this.doc||isNaN(a)||isNaN(b))return[{state:"start",tokens:[]}];var c=[],d="start",e=!1;a>0&&this.lines[a-1]?(d=this.lines[a-1].state,e=!0):a==0?(d="start",e=!0):this.lines.length>0&&(d=this.lines[this.lines.length-1].state);var f=this.doc.getLines(a,b);for(var g=a;g<=b;g++)if(!this.lines[g]){var h=this.tokenizer.getLineTokens(f[g-a]||"",d),d=h.state;c.push(h),e&&(this.lines[g]=h)}else{var h=this.lines[g];d=h.state,c.push(h)}return c}}).call(f.prototype),b.BackgroundTokenizer=f}),define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(a,b,c){function h(){this.getFoldAt=function(a,b,c){var d=this.getFoldLine(a);if(!d)return null;var e=d.folds;for(var f=0;f<e.length;f++){var g=e[f];if(g.range.contains(a,b)){if(c==1&&g.range.isEnd(a,b))continue;if(c==-1&&g.range.isStart(a,b))continue;return g}}},this.getFoldsInRange=function(a){a=a.clone();var b=a.start,c=a.end,d=this.$foldData,e=[];b.column+=1,c.column-=1;for(var f=0;f<d.length;f++){var g=d[f].range.compareRange(a);if(g==2)continue;if(g==-2)break;var h=d[f].folds;for(var i=0;i<h.length;i++){var j=h[i];g=j.range.compareRange(a);if(g==-2)break;if(g==2)continue;if(g==42)break;e.push(j)}}return e},this.getAllFolds=function(){function c(b){a.push(b);if(!b.subFolds)return;for(var d=0;d<b.subFolds.length;d++)c(b.subFolds[d])}var a=[],b=this.$foldData;for(var d=0;d<b.length;d++)for(var e=0;e<b[d].folds.length;e++)c(b[d].folds[e]);return a},this.getFoldStringAt=function(a,b,c,d){d=d||this.getFoldLine(a);if(!d)return null;var e={end:{column:0}},f,g;for(var h=0;h<d.folds.length;h++){g=d.folds[h];var i=g.range.compareEnd(a,b);if(i==-1){f=this.getLine(g.start.row).substring(e.end.column,g.start.column);break}if(i===0)return null;e=g}return f||(f=this.getLine(g.start.row).substring(e.end.column)),c==-1?f.substring(0,b-e.end.column):c==1?f.substring(b-e.end.column):f},this.getFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.start.row<=a&&e.end.row>=a)return e;if(e.end.row>a)return null}return null},this.getNextFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.end.row>=a)return e}return null},this.getFoldedRowCount=function(a,b){var c=this.$foldData,d=b-a+1;for(var e=0;e<c.length;e++){var f=c[e],g=f.end.row,h=f.start.row;if(g>=b){h<b&&(h>=a?d-=b-h:d=0);break}g>=a&&(h>=a?d-=g-h:d-=g-a+1)}return d},this.$addFoldLine=function(a){return this.$foldData.push(a),this.$foldData.sort(function(a,b){return a.start.row-b.start.row}),a},this.addFold=function(a,b){var c=this.$foldData,d=!1,g;a instanceof f?g=a:g=new f(b,a),this.$clipRangeToDocument(g.range);var h=g.start.row,i=g.start.column,j=g.end.row,k=g.end.column;if(g.placeholder.length<2)throw"Placeholder has to be at least 2 characters";if(h==j&&k-i<2)throw"The range has to be at least 2 characters width";var l=this.getFoldAt(h,i,1),m=this.getFoldAt(j,k,-1);if(l&&m==l)return l.addSubFold(g);if(l&&!l.range.isStart(h,i)||m&&!m.range.isEnd(j,k))throw"A fold can't intersect already existing fold"+g.range+l.range;var n=this.getFoldsInRange(g.range);n.length>0&&(this.removeFolds(n),g.subFolds=n);for(var o=0;o<c.length;o++){var p=c[o];if(j==p.start.row){p.addFold(g),d=!0;break}if(h==p.end.row){p.addFold(g),d=!0;if(!g.sameRow){var q=c[o+1];if(q&&q.start.row==j){p.merge(q);break}}break}if(j<=p.start.row)break}return d||(p=this.$addFoldLine(new e(this.$foldData,g))),this.$useWrapMode&&this.$updateWrapData(p.start.row,p.start.row),this.$modified=!0,this._emit("changeFold",{data:g}),g},this.addFolds=function(a){a.forEach(function(a){this.addFold(a)},this)},this.removeFold=function(a){var b=a.foldLine,c=b.start.row,d=b.end.row,e=this.$foldData,f=b.folds;if(f.length==1)e.splice(e.indexOf(b),1);else if(b.range.isEnd(a.end.row,a.end.column))f.pop(),b.end.row=f[f.length-1].end.row,b.end.column=f[f.length-1].end.column;else if(b.range.isStart(a.start.row,a.start.column))f.shift(),b.start.row=f[0].start.row,b.start.column=f[0].start.column;else if(a.sameRow)f.splice(f.indexOf(a),1);else{var g=b.split(a.start.row,a.start.column);f=g.folds,f.shift(),g.start.row=f[0].start.row,g.start.column=f[0].start.column}this.$useWrapMode&&this.$updateWrapData(c,d),this.$modified=!0,this._emit("changeFold",{data:a})},this.removeFolds=function(a){var b=[];for(var c=0;c<a.length;c++)b.push(a[c]);b.forEach(function(a){this.removeFold(a)},this),this.$modified=!0},this.expandFold=function(a){this.removeFold(a),a.subFolds.forEach(function(a){this.addFold(a)},this),a.subFolds=[]},this.expandFolds=function(a){a.forEach(function(a){this.expandFold(a)},this)},this.unfold=function(a,b){var c,e;a==null?c=new d(0,0,this.getLength(),0):typeof a=="number"?c=new d(a,0,a,this.getLine(a).length):"row"in a?c=d.fromPoints(a,a):c=a,e=this.getFoldsInRange(c);if(b)this.removeFolds(e);else while(e.length)this.expandFolds(e),e=this.getFoldsInRange(c)},this.isRowFolded=function(a,b){return!!this.getFoldLine(a,b)},this.getRowFoldEnd=function(a,b){var c=this.getFoldLine(a,b);return c?c.end.row:a},this.getFoldDisplayLine=function(a,b,c,d,e){d==null&&(d=a.start.row,e=0),b==null&&(b=a.end.row,c=this.getLine(b).length);var f=this.doc,g="";return a.walk(function(a,b,c,h){if(b<d)return;if(b==d){if(c<e)return;h=Math.max(e,h)}a?g+=a:g+=f.getLine(b).substring(h,c)}.bind(this),b,c),g},this.getDisplayLine=function(a,b,c,d){var e=this.getFoldLine(a);if(!e){var f;return f=this.doc.getLine(a),f.substring(d||0,b||f.length)}return this.getFoldDisplayLine(e,a,b,c,d)},this.$cloneFoldData=function(){var a=[];return a=this.$foldData.map(function(b){var c=b.folds.map(function(a){return a.clone()});return new e(a,c)}),a},this.toggleFold=function(a){var b=this.selection,c=b.getRange(),d,e;if(c.isEmpty()){var f=c.start;d=this.getFoldAt(f.row,f.column);if(d){this.expandFold(d);return}(e=this.findMatchingBracket(f))?c.comparePoint(e)==1?c.end=e:(c.start=e,c.start.column++,c.end.column--):(e=this.findMatchingBracket({row:f.row,column:f.column+1}))?(c.comparePoint(e)==1?c.end=e:c.start=e,c.start.column++):c=this.getCommentFoldRange(f.row,f.column)||c}else{var g=this.getFoldsInRange(c);if(a&&g.length){this.expandFolds(g);return}g.length==1&&(d=g[0])}d||(d=this.getFoldAt(c.start.row,c.start.column));if(d&&d.range.toString()==c.toString()){this.expandFold(d);return}var h="...";if(!c.isMultiLine()){h=this.getTextRange(c);if(h.length<4)return;h=h.trim().substring(0,2)+".."}this.addFold(h,c)},this.getCommentFoldRange=function(a,b){var c=new g(this,a,b),e=c.getCurrentToken();if(e&&/^comment|string/.test(e.type)){var f=new d,h=new RegExp(e.type.replace(/\..*/,"\\."));do e=c.stepBackward();while(e&&h.test(e.type));c.stepForward(),f.start.row=c.getCurrentTokenRow(),f.start.column=c.getCurrentTokenColumn()+2,c=new g(this,a,b);do e=c.stepForward();while(e&&h.test(e.type));return e=c.stepBackward(),f.end.row=c.getCurrentTokenRow(),f.end.column=c.getCurrentTokenColumn()+e.value.length,f}},this.foldAll=function(a,b){var c=this.foldWidgets;b=b||this.getLength();for(var d=a||0;d<b;d++){c[d]==null&&(c[d]=this.getFoldWidget(d));if(c[d]!="start")continue;var e=this.getFoldWidgetRange(d);if(e&&e.end.row<b)try{this.addFold("...",e)}catch(f){}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(a){if(!this.$foldStyles[a])throw new Error("invalid fold style: "+a+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==a)return;this.$foldStyle=a,a=="manual"&&this.unfold();var b=this.$foldMode;this.$setFolding(null),this.$setFolding(b)},this.$setFolding=function(a){if(this.$foldMode==a)return;this.$foldMode=a,this.removeListener("change",this.$updateFoldWidgets),this._emit("changeAnnotation");if(!a||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=a.getFoldWidget.bind(a,this,this.$foldStyle),this.getFoldWidgetRange=a.getFoldWidgetRange.bind(a,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets)},this.onFoldWidgetClick=function(a,b){var c=this.getFoldWidget(a),d=this.getLine(a),e=b.shiftKey,f=e||b.ctrlKey||b.altKey||b.metaKey,g;c=="end"?g=this.getFoldAt(a,0,-1):g=this.getFoldAt(a,d.length,1);if(g){f?this.removeFold(g):this.expandFold(g);return}var h=this.getFoldWidgetRange(a);if(h){if(!h.isMultiLine()){g=this.getFoldAt(h.start.row,h.start.column,1);if(g&&h.isEqual(g.range)){this.removeFold(g);return}}e||this.addFold("...",h),f&&this.foldAll(h.start.row+1,h.end.row)}else f&&this.foldAll(a+1,this.getLength()),b.target.className+=" invalid"},this.updateFoldWidgets=function(a){var b=a.data,c=b.range,d=c.start.row,e=c.end.row-d;if(e===0)this.foldWidgets[d]=null;else if(b.action=="removeText"||b.action=="removeLines")this.foldWidgets.splice(d,e+1,null);else{var f=Array(e+1);f.unshift(d,1),this.foldWidgets.splice.apply(this.foldWidgets,f)}}}"use strict";var d=a("../range").Range,e=a("./fold_line").FoldLine,f=a("./fold").Fold,g=a("../token_iterator").TokenIterator;b.Folding=h}),define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(a,b,c){function e(a,b){this.foldData=a,Array.isArray(b)?this.folds=b:b=this.folds=[b];var c=b[b.length-1];this.range=new d(b[0].start.row,b[0].start.column,c.end.row,c.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(a){a.setFoldLine(this)},this)}"use strict";var d=a("../range").Range;(function(){this.shiftRow=function(a){this.start.row+=a,this.end.row+=a,this.folds.forEach(function(b){b.start.row+=a,b.end.row+=a})},this.addFold=function(a){if(a.sameRow){if(a.start.row<this.startRow||a.endRow>this.endRow)throw"Can't add a fold to this FoldLine as it has no connection";this.folds.push(a),this.folds.sort(function(a,b){return-a.range.compareEnd(b.start.row,b.start.column)}),this.range.compareEnd(a.start.row,a.start.column)>0?(this.end.row=a.end.row,this.end.column=a.end.column):this.range.compareStart(a.end.row,a.end.column)<0&&(this.start.row=a.start.row,this.start.column=a.start.column)}else if(a.start.row==this.end.row)this.folds.push(a),this.end.row=a.end.row,this.end.column=a.end.column;else{if(a.end.row!=this.start.row)throw"Trying to add fold to FoldRow that doesn't have a matching row";this.folds.unshift(a),this.start.row=a.start.row,this.start.column=a.start.column}a.foldLine=this},this.containsRow=function(a){return a>=this.start.row&&a<=this.end.row},this.walk=function(a,b,c){var d=0,e=this.folds,f,g,h,i=!0;b==null&&(b=this.end.row,c=this.end.column);for(var j=0;j<e.length;j++){f=e[j],g=f.range.compareStart(b,c);if(g==-1){a(null,b,c,d,i);return}h=a(null,f.start.row,f.start.column,d,i),h=!h&&a(f.placeholder,f.start.row,f.start.column,d);if(h||g==0)return;i=!f.sameRow,d=f.end.column}a(null,b,c,d,i)},this.getNextFoldTo=function(a,b){var c,d;for(var e=0;e<this.folds.length;e++){c=this.folds[e],d=c.range.compareEnd(a,b);if(d==-1)return{fold:c,kind:"after"};if(d==0)return{fold:c,kind:"inside"}}return null},this.addRemoveChars=function(a,b,c){var d=this.getNextFoldTo(a,b),e,f;if(d){e=d.fold;if(d.kind=="inside"&&e.start.column!=b&&e.start.row!=a)throw"Moving characters inside of a fold should never be reached";if(e.start.row==a){f=this.folds;var g=f.indexOf(e);g==0&&(this.start.column+=c);for(g;g<f.length;g++){e=f[g],e.start.column+=c;if(!e.sameRow)return;e.end.column+=c}this.end.column+=c}}},this.split=function(a,b){var c=this.getNextFoldTo(a,b).fold,d=this.folds,f=this.foldData;if(!c)return null;var g=d.indexOf(c),h=d[g-1];this.end.row=h.end.row,this.end.column=h.end.column,d=d.splice(g,d.length-g);var i=new e(f,d);return f.splice(f.indexOf(this)+1,0,i),i},this.merge=function(a){var b=a.folds;for(var c=0;c<b.length;c++)this.addFold(b[c]);var d=this.foldData;d.splice(d.indexOf(a),1)},this.toString=function(){var a=[this.range.toString()+": ["];return this.folds.forEach(function(b){a.push("  "+b.toString())}),a.push("]"),a.join("\n")},this.idxToPosition=function(a){var b=0,c;for(var d=0;d<this.folds.length;d++){var c=this.folds[d];a-=c.start.column-b;if(a<0)return{row:c.start.row,column:c.start.column+a};a-=c.placeholder.length;if(a<0)return c.start;b=c.end.column}return{row:this.end.row,column:this.end.column+a}}}).call(e.prototype),b.FoldLine=e}),define("ace/edit_session/fold",["require","exports","module"],function(a,b,c){"use strict";var d=b.Fold=function(a,b){this.foldLine=null,this.placeholder=b,this.range=a,this.start=a.start,this.end=a.end,this.sameRow=a.start.row==a.end.row,this.subFolds=[]};(function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(a){this.foldLine=a,this.subFolds.forEach(function(b){b.setFoldLine(a)})},this.clone=function(){var a=this.range.clone(),b=new d(a,this.placeholder);return this.subFolds.forEach(function(a){b.subFolds.push(a.clone())}),b},this.addSubFold=function(a){if(this.range.isEqual(a))return this;if(!this.range.containsRange(a))throw"A fold can't intersect already existing fold"+a.range+this.range;var b=a.range.start.row,c=a.range.start.column;for(var d=0,e=-1;d<this.subFolds.length;d++){e=this.subFolds[d].range.compare(b,c);if(e!=1)break}var f=this.subFolds[d];if(e==0)return f.addSubFold(a);var b=a.range.end.row,c=a.range.end.column;for(var g=d,e=-1;g<this.subFolds.length;g++){e=this.subFolds[g].range.compare(b,c);if(e!=1)break}var h=this.subFolds[g];if(e==0)throw"A fold can't intersect already existing fold"+a.range+this.range;var i=this.subFolds.splice(d,g-d,a);return a.setFoldLine(this.foldLine),a}}).call(d.prototype)}),define("ace/token_iterator",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c){this.$session=a,this.$row=b,this.$rowTokens=a.getTokens(b,b)[0].tokens;var d=a.getTokenAt(b,c);this.$tokenIndex=d?d.index:-1};(function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){var a=this.$session.getLength();this.$tokenIndex+=1;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1;if(this.$row>=a)return this.$row=a-1,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var a=this.$rowTokens,b=this.$tokenIndex,c=a[b].start;if(c!==undefined)return c;c=0;while(b>0)b-=1,c+=a[b].value.length;return c}}).call(d.prototype),b.TokenIterator=d}),define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator"],function(a,b,c){function e(){this.findMatchingBracket=function(a){if(a.column==0)return null;var b=this.getLine(a.row).charAt(a.column-1);if(b=="")return null;var c=b.match(/([\(\[\{])|([\)\]\}])/);return c?c[1]?this.$findClosingBracket(c[1],a):this.$findOpeningBracket(c[2],a):null},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("rparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn()-2,j=g.value;for(;;){while(i>=0){var k=j.charAt(i);if(k==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else k==a&&(e+=1);i-=1}do g=f.stepBackward();while(g&&!h.test(g.type));if(g==null)break;j=g.value,i=j.length-1}return null},this.$findClosingBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("lparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn();for(;;){var j=g.value,k=j.length;while(i<k){var l=j.charAt(i);if(l==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else l==a&&(e+=1);i+=1}do g=f.stepForward();while(g&&!h.test(g.type));if(g==null)break;i=0}return null}}"use strict";var d=a("../token_iterator").TokenIterator;b.BracketMatch=e}),define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(a,b,c){"use strict";var d=a("./lib/lang"),e=a("./lib/oop"),f=a("./range").Range,g=function(){this.$options={needle:"",backwards:!1,wrap:!1,caseSensitive:!1,wholeWord:!1,scope:g.ALL,regExp:!1}};g.ALL=1,g.SELECTION=2,function(){this.set=function(a){return e.mixin(this.$options,a),this},this.getOptions=function(){return d.copyObject(this.$options)},this.find=function(a){if(!this.$options.needle)return null;if(this.$options.backwards)var b=this.$backwardMatchIterator(a);else b=this.$forwardMatchIterator(a);var c=null;return b.forEach(function(a){return c=a,!0}),c},this.findAll=function(a){var b=this.$options;if(!b.needle)return[];if(b.backwards)var c=this.$backwardMatchIterator(a);else c=this.$forwardMatchIterator(a);var d=!b.start&&b.wrap&&b.scope==g.ALL;d&&(b.start={row:0,column:0});var e=[];return c.forEach(function(a){e.push(a)}),d&&(b.start=null),e},this.replace=function(a,b){var c=this.$assembleRegExp(),d=c.exec(a);return d&&d[0].length==a.length?this.$options.regExp?a.replace(c,b):b:null},this.$forwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$forwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a){var b=arguments[arguments.length-2];return g.push({str:a,offset:e+b}),a});for(var h=0;h<g.length;h++){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$backwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$backwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a,b){return g.push({str:a,offset:e+b}),a});for(var h=g.length-1;h>=0;h--){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$rangeFromMatch=function(a,b,c){return new f(a,b,a,b+c)},this.$assembleRegExp=function(){if(this.$options.regExp)var a=this.$options.needle;else a=d.escapeRegExp(this.$options.needle);this.$options.wholeWord&&(a="\\b"+a+"\\b");var b="g";this.$options.caseSensitive||(b+="i");var c=new RegExp(a,b);return c},this.$forwardLineIterator=function(a){function k(e){var f=a.getLine(e);return b&&e==c.end.row&&(f=f.substring(0,c.end.column)),j&&e==d.row&&(f=f.substring(0,d.column)),f}var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"start":"end"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap,j=!1;return{forEach:function(a){var b=d.row,c=k(b),g=d.column,l=!1;j=!1;while(!a(c,g,b)){if(l)return;b++,g=0;if(b>h){if(!i)return;b=e,g=f,j=!0}b==d.row&&(l=!0),c=k(b)}}}},this.$backwardLineIterator=function(a){var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"end":"start"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap;return{forEach:function(g){var j=d.row,k=a.getLine(j).substring(0,d.column),l=0,m=!1,n=!1;while(!g(k,l,j)){if(m)return;j--,l=0;if(j<e){if(!i)return;j=h,n=!0}j==d.row&&(m=!0),k=a.getLine(j),b&&(j==e?l=f:j==h&&(k=k.substring(0,c.end.column))),n&&j==d.row&&(l=d.column)}}}}}.call(g.prototype),b.Search=g}),define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../keyboard/hash_handler").HashHandler,f=a("../lib/event_emitter").EventEmitter,g=function(a,b){this.platform=a,this.commands={},this.commmandKeyBinding={},this.addCommands(b),this.setDefaultHandler("exec",function(a){a.command.exec(a.editor,a.args||{})})};d.inherits(g,e),function(){d.implement(this,f),this.exec=function(a,b,c){return typeof a=="string"&&(a=this.commands[a]),a?b&&b.$readOnly&&!a.readOnly?!1:(this._emit("exec",{editor:b,command:a,args:c}),!0):!1},this.toggleRecording=function(){if(this.$inReplay)return;return this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(a){this.macro.push([a.command,a.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(a){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording();try{this.$inReplay=!0,this.macro.forEach(function(b){typeof b=="string"?this.exec(b,a):this.exec(b[0],a,b[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(a){return a.map(function(a){return typeof a[0]!="string"&&(a[0]=a[0].name),a[1]||(a=a[0]),a})}}.call(g.prototype),b.CommandManager=g}),define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys"],function(a,b,c){function e(a,b){this.platform=b,this.commands={},this.commmandKeyBinding={},this.addCommands(a)}"use strict";var d=a("../lib/keys");(function(){function a(a,c,e){var f,g=0,h=b(a.toLowerCase());for(var i=0,j=h.length;i<j;i++)d.KEY_MODS[h[i]]?g|=d.KEY_MODS[h[i]]:f=h[i]||"-";return{key:f,hashId:g}}function b(a){return a.trim().split(new RegExp("[\\s ]*\\-[\\s ]*","g"),999)}this.addCommand=function(a){this.commands[a.name]&&this.removeCommand(a),this.commands[a.name]=a,a.bindKey&&this._buildKeyHash(a)},this.removeCommand=function(a){var b=typeof a=="string"?a:a.name;a=this.commands[b],delete this.commands[b];var c=this.commmandKeyBinding;for(var d in c)for(var e in c[d])c[d][e]==a&&delete c[d][e]},this.addCommands=function(a){a&&Object.keys(a).forEach(function(b){var c=a[b];if(typeof c=="string")return this.bindKey(c,b);typeof c=="function"&&(c={exec:c}),c.name||(c.name=b),this.addCommand(c)},this)},this.removeCommands=function(a){Object.keys(a).forEach(function(b){this.removeCommand(a[b])},this)},this.bindKey=function(b,c){if(!b)return;var d=this.commmandKeyBinding;b.split("|").forEach(function(b){var e=a(b,c),f=e.hashId;(d[f]||(d[f]={}))[e.key]=c})},this.bindKeys=function(a){Object.keys(a).forEach(function(b){this.bindKey(b,a[b])},this)},this._buildKeyHash=function(a){var b=a.bindKey;if(!b)return;var c=typeof b=="string"?b:b[this.platform];this.bindKey(c,a)},this.findKeyCommand=function(b,c){var d=this.commmandKeyBinding;return d[b]&&d[b][c.toLowerCase()]},this.handleKeyboard=function(a,b,c,d){return{command:this.findKeyCommand(b,c)}}}).call(e.prototype),b.HashHandler=e}),define("ace/undomanager",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.reset()};(function(){this.execute=function(a){var b=a.args[0];this.$doc=a.args[1],this.$undoStack.push(b),this.$redoStack=[]},this.undo=function(a){var b=this.$undoStack.pop(),c=null;return b&&(c=this.$doc.undoChanges(b,a),this.$redoStack.push(b)),c},this.redo=function(a){var b=this.$redoStack.pop(),c=null;return b&&(c=this.$doc.redoChanges(b,a),this.$undoStack.push(b)),c},this.reset=function(){this.$undoStack=[],this.$redoStack=[]},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0}}).call(d.prototype),b.UndoManager=d}),define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/useragent","ace/config","ace/lib/net","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/renderloop","ace/lib/event_emitter","text!ace/css/editor.css"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/useragent"),h=a("./config"),i=a("./lib/net"),j=a("./layer/gutter").Gutter,k=a("./layer/marker").Marker,l=a("./layer/text").Text,m=a("./layer/cursor").Cursor,n=a("./scrollbar").ScrollBar,o=a("./renderloop").RenderLoop,p=a("./lib/event_emitter").EventEmitter,q=a("text!./css/editor.css");e.importCssString(q,"ace_editor");var r=function(a,b){var c=this;this.container=a,e.addCssClass(a,"ace_editor"),this.setTheme(b),this.$gutter=e.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=e.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=e.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new j(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onResize.bind(this,!0)),this.$markerBack=new k(this.content);var d=this.$textLayer=new l(this.content);this.canvas=d.element,this.$markerFront=new k(this.content),this.characterWidth=d.getCharacterWidth(),this.lineHeight=d.getLineHeight(),this.$cursorLayer=new m(this.content),this.$cursorPadding=8,this.$horizScroll=!0,this.$horizScrollAlwaysVisible=!0,this.$animatedScroll=!1,this.scrollBar=new n(a),this.scrollBar.addEventListener("scroll",function(a){c.session.setScrollTop(a.data)}),this.scrollTop=0,this.scrollLeft=0,f.addListener(this.scroller,"scroll",function(){var a=c.scroller.scrollLeft;c.scrollLeft=a,c.session.setScrollLeft(a),a==0?c.$gutter.className="ace_gutter":c.$gutter.className="ace_gutter horscroll"}),this.cursorPos={row:0,column:0},this.$textLayer.addEventListener("changeCharacterSize",function(){c.characterWidth=d.getCharacterWidth(),c.lineHeight=d.getLineHeight(),c.$updatePrintMargin(),c.onResize(!0),c.$loop.schedule(c.CHANGE_FULL)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:1,characterWidth:1,minHeight:1,maxHeight:1,offset:0,height:1},this.$loop=new o(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.setPadding(4),this.$updatePrintMargin()};(function(){this.showGutter=!0,this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,d.implement(this,p),this.setSession=function(a){this.session=a,this.$cursorLayer.setSession(a),this.$markerBack.setSession(a),this.$markerFront.setSession(a),this.$gutterLayer.setSession(a),this.$textLayer.setSession(a),this.$loop.schedule(this.CHANGE_FULL)},this.updateLines=function(a,b){b===undefined&&(b=Infinity),this.$changedLines?(this.$changedLines.firstRow>a&&(this.$changedLines.firstRow=a),this.$changedLines.lastRow<b&&(this.$changedLines.lastRow=b)):this.$changedLines={firstRow:a,lastRow:b},this.$loop.schedule(this.CHANGE_LINES)},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(){this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.onResize=function(a){var b=this.CHANGE_SIZE,c=this.$size,d=e.getInnerHeight(this.container);if(a||c.height!=d)c.height=d,this.scroller.style.height=d+"px",c.scrollerHeight=this.scroller.clientHeight,this.scrollBar.setHeight(c.scrollerHeight),this.session&&(this.session.setScrollTop(this.getScrollTop()),b|=this.CHANGE_FULL);var f=e.getInnerWidth(this.container);if(a||c.width!=f){c.width=f;var g=this.showGutter?this.$gutter.offsetWidth:0;this.scroller.style.left=g+"px",c.scrollerWidth=Math.max(0,f-g-this.scrollBar.getWidth()),this.scroller.style.width=c.scrollerWidth+"px";if(this.session.getUseWrapMode()&&this.adjustWrapLimit()||a)b|=this.CHANGE_FULL}this.$loop.schedule(b)},this.adjustWrapLimit=function(){var a=this.$size.scrollerWidth-this.$padding*2,b=Math.floor(a/this.characterWidth);return this.session.adjustWrapLimit(b)},this.setAnimatedScroll=function(a){this.$animatedScroll=a},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(a){this.$textLayer.setShowInvisibles(a)&&this.$loop.schedule(this.CHANGE_TEXT)},this.getShowInvisibles=function(){return this.$textLayer.showInvisibles},this.$showPrintMargin=!0,this.setShowPrintMargin=function(a){this.$showPrintMargin=a,this.$updatePrintMargin()},this.getShowPrintMargin=function(){return this.$showPrintMargin},this.$printMarginColumn=80,this.setPrintMarginColumn=function(a){this.$printMarginColumn=a,this.$updatePrintMargin()},this.getPrintMarginColumn=function(){return this.$printMarginColumn},this.getShowGutter=function(){return this.showGutter},this.setShowGutter=function(a){if(this.showGutter===a)return;this.$gutter.style.display=a?"block":"none",this.showGutter=a,this.onResize(!0)},this.$updatePrintMargin=function(){var a;if(!this.$showPrintMargin&&!this.$printMarginEl)return;this.$printMarginEl||(a=e.createElement("div"),a.className="ace_print_margin_layer",this.$printMarginEl=e.createElement("div"),this.$printMarginEl.className="ace_print_margin",a.appendChild(this.$printMarginEl),this.content.insertBefore(a,this.$textLayer.element));var b=this.$printMarginEl.style;b.left=this.characterWidth*this.$printMarginColumn+this.$padding+"px",b.visibility=this.$showPrintMargin?"visible":"hidden"},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.content},this.getTextAreaContainer=function(){return this.container},this.moveTextAreaToCursor=function(a){if(g.isIE)return;if(this.layerConfig.lastRow===0)return;var b=this.$cursorLayer.getPixelPosition();if(!b)return;var c=this.content.getBoundingClientRect(),d=this.layerConfig.offset;a.style.left=c.left+b.left+"px",a.style.top=c.top+b.top-this.scrollTop+d+"px"},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var a=Math.floor((this.layerConfig.height+this.layerConfig.offset)/this.layerConfig.lineHeight);return this.layerConfig.firstRow-1+a},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(a){this.$padding=a,this.$textLayer.setPadding(a),this.$cursorLayer.setPadding(a),this.$markerFront.setPadding(a),this.$markerBack.setPadding(a),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.getHScrollBarAlwaysVisible=function(){return this.$horizScrollAlwaysVisible},this.setHScrollBarAlwaysVisible=function(a){this.$horizScrollAlwaysVisible!=a&&(this.$horizScrollAlwaysVisible=a,(!this.$horizScrollAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL))},this.$updateScrollBar=function(){this.scrollBar.setInnerHeight(this.layerConfig.maxHeight),this.scrollBar.setScrollTop(this.scrollTop)},this.$renderChanges=function(a){if(!a||!this.session||!this.container.offsetWidth)return;(a&this.CHANGE_FULL||a&this.CHANGE_SIZE||a&this.CHANGE_TEXT||a&this.CHANGE_LINES||a&this.CHANGE_SCROLL)&&this.$computeLayerConfig();if(a&this.CHANGE_H_SCROLL){this.scroller.scrollLeft=this.scrollLeft;var b=this.scroller.scrollLeft;this.scrollLeft=b,this.session.setScrollLeft(b)}if(a&this.CHANGE_FULL){this.$textLayer.checkForSizeChanges(),this.$updateScrollBar(),this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig);return}if(a&this.CHANGE_SCROLL){this.$updateScrollBar(),a&this.CHANGE_TEXT||a&this.CHANGE_LINES?this.$textLayer.update(this.layerConfig):this.$textLayer.scrollLines(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig);return}a&this.CHANGE_TEXT?(this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_LINES?this.$updateLines()&&(this.$updateScrollBar(),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_GUTTER&&this.showGutter&&this.$gutterLayer.update(this.layerConfig),a&this.CHANGE_CURSOR&&this.$cursorLayer.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(this.layerConfig),a&this.CHANGE_SIZE&&this.$updateScrollBar()},this.$computeLayerConfig=function(){var a=this.session,b=this.scrollTop%this.lineHeight,c=this.$size.scrollerHeight+this.lineHeight,d=this.$getLongestLine(),e=this.$horizScrollAlwaysVisible||this.$size.scrollerWidth-d<0,f=this.$horizScroll!==e;this.$horizScroll=e,f&&(this.scroller.style.overflowX=e?"scroll":"hidden",e||this.session.setScrollLeft(0));var g=this.session.getScreenLength()*this.lineHeight;this.session.setScrollTop(Math.max(0,Math.min(this.scrollTop,g-this.$size.scrollerHeight)));var h=Math.ceil(c/this.lineHeight)-1,i=Math.max(0,Math.round((this.scrollTop-b)/this.lineHeight)),j=i+h,k,l,m={lineHeight:this.lineHeight};i=a.screenToDocumentRow(i,0);var n=a.getFoldLine(i);n&&(i=n.start.row),k=a.documentToScreenRow(i,0),l=a.getRowHeight(m,i),j=Math.min(a.screenToDocumentRow(j,0),a.getLength()-1),c=this.$size.scrollerHeight+a.getRowHeight(m,j)+l,b=this.scrollTop-k*this.lineHeight,this.layerConfig={width:d,padding:this.$padding,firstRow:i,firstRowScreen:k,lastRow:j,lineHeight:this.lineHeight,characterWidth:this.characterWidth,minHeight:c,maxHeight:g,offset:b,height:this.$size.scrollerHeight},this.$gutterLayer.element.style.marginTop=-b+"px",this.content.style.marginTop=-b+"px",this.content.style.width=d+2*this.$padding+"px",this.content.style.height=c+"px",f&&this.onResize(!0)},this.$updateLines=function(){var a=this.$changedLines.firstRow,b=this.$changedLines.lastRow;this.$changedLines=null;var c=this.layerConfig;if(c.width!=this.$getLongestLine())return this.$textLayer.update(c);if(a>c.lastRow+1)return;if(b<c.firstRow)return;if(b===Infinity){this.showGutter&&this.$gutterLayer.update(c),this.$textLayer.update(c);return}return this.$textLayer.updateLines(c,a,b),!0},this.$getLongestLine=function(){var a=this.session.getScreenWidth();return this.$textLayer.showInvisibles&&(a+=1),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(a*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(a,b){this.$gutterLayer.addGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.removeGutterDecoration=function(a,b){this.$gutterLayer.removeGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.setBreakpoints=function(a){this.$gutterLayer.setBreakpoints(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(a){this.$gutterLayer.setAnnotations(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(a,b){this.scrollCursorIntoView(a),this.scrollCursorIntoView(b)},this.scrollCursorIntoView=function(a){if(this.$size.scrollerHeight===0)return;var b=this.$cursorLayer.getPixelPosition(a),c=b.left,d=b.top;this.scrollTop>d&&this.session.setScrollTop(d),this.scrollTop+this.$size.scrollerHeight<d+this.lineHeight&&this.session.setScrollTop(d+this.lineHeight-this.$size.scrollerHeight);var e=this.scrollLeft;e>c&&(c<this.$padding+2*this.layerConfig.characterWidth&&(c=0),this.session.setScrollLeft(c)),e+this.$size.scrollerWidth<c+this.characterWidth&&this.session.setScrollLeft(Math.round(c+this.characterWidth-this.$size.scrollerWidth))},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(a){this.session.setScrollTop(a*this.lineHeight)},this.STEPS=10,this.$calcSteps=function(a,b){var c=0,d=this.STEPS,e=[],f=function(a,b,c){return(a/=.5)<1?c/2*Math.pow(a,3)+b:c/2*(Math.pow(a-2,3)+2)+b};for(c=0;c<d;++c)e.push(f(c/this.STEPS,a,b-a));return e.push(b),e},this.scrollToLine=function(a,b){var c=this.$cursorLayer.getPixelPosition({row:a,column:0}),d=c.top;b&&(d-=this.$size.scrollerHeight/2);if(this.$animatedScroll&&Math.abs(d-this.scrollTop)<1e4){var e=this,f=e.$calcSteps(this.scrollTop,d);clearInterval(this.$timer),this.$timer=setInterval(function(){e.session.setScrollTop(f.shift()),f.length||clearInterval(e.$timer)},10)}else this.session.setScrollTop(d)},this.scrollToY=function(a){this.scrollTop!==a&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=a)},this.scrollToX=function(a){a<=this.$padding&&(a=0),this.scrollLeft!==a&&(this.scrollLeft=a),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollBy=function(a,b){b&&this.session.setScrollTop(this.session.getScrollTop()+b),a&&this.session.setScrollLeft(this.session.getScrollLeft()+a)},this.isScrollableBy=function(a,b){if(b<0&&this.session.getScrollTop()>0)return!0;if(b>0&&this.session.getScrollTop()+this.$size.scrollerHeight<this.layerConfig.maxHeight)return!0},this.pixelToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return{row:f,column:d}},this.screenToTextCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return this.session.screenToDocumentPosition(f,Math.max(d,0))},this.textToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=this.session.documentToScreenPosition(a,b),e=this.$padding+Math.round(d.column*this.characterWidth),f=d.row*this.lineHeight;return{pageX:c.left+e-this.scrollLeft,pageY:c.top+f-this.scrollTop}},this.visualizeFocus=function(){e.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){e.removeCssClass(this.container,"ace_focus")},this.showComposition=function(a){this.$composition||(this.$composition=e.createElement("div"),this.$composition.className="ace_composition",this.content.appendChild(this.$composition)),this.$composition.innerHTML="&#160;";var b=this.$cursorLayer.getPixelPosition(),c=this.$composition.style;c.top=b.top+"px",c.left=b.left+this.$padding+"px",c.height=this.lineHeight+"px",this.hideCursor()},this.setCompositionText=function(a){e.setInnerText(this.$composition,a)},this.hideComposition=function(){this.showCursor();if(!this.$composition)return;var a=this.$composition.style;a.top="-10000px",a.left="-10000px"},this._loadTheme=function(a,b){if(!h.get("packaged"))return b();var c=a.split("/").pop(),d=h.get("themePath")+"/theme-"+c+h.get("suffix");i.loadScript(d,b)},this.setTheme=function(b){function h(a){e.importCssString(a.cssText,a.cssClass,c.container.ownerDocument),c.$theme&&e.removeCssClass(c.container,c.$theme),c.$theme=a?a.cssClass:null,c.$theme&&e.addCssClass(c.container,c.$theme),a&&a.isDark?e.addCssClass(c.container,"ace_dark"):e.removeCssClass(c.container,"ace_dark"),c.$size&&(c.$size.width=0,c.onResize())}var c=this;this.$themeValue=b;if(!b||typeof b=="string"){var d=b||"ace/theme/textmate",f;try{f=a(d)}catch(g){}if(f)return h(f);c._loadTheme(d,function(){a([d],function(a){if(c.$themeValue!==b)return;h(a)})})}else h(b)},this.getTheme=function(){return this.$themeValue},this.setStyle=function(b){e.addCssClass(this.container,b)},this.unsetStyle=function(b){e.removeCssClass(this.container,b)},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}}).call(r.prototype),b.VirtualRenderer=r}),define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=a("../lib/oop"),f=a("../lib/event_emitter").EventEmitter,g=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_gutter-layer",a.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$breakpoints=[],this.$annotations=[],this.$decorations=[]};(function(){e.implement(this,f),this.setSession=function(a){this.session=a},this.addGutterDecoration=function(a,b){this.$decorations[a]||(this.$decorations[a]=""),this.$decorations[a]+=" "+b},this.removeGutterDecoration=function(a,b){this.$decorations[a]=this.$decorations[a].replace(" "+b,"")},this.setBreakpoints=function(a){this.$breakpoints=a.concat()},this.setAnnotations=function(a){this.$annotations=[];for(var b in a)if(a.hasOwnProperty(b)){var c=a[b];if(!c)continue;var d=this.$annotations[b]={text:[]};for(var e=0;e<c.length;e++){var f=c[e],g=f.text.replace(/"/g,"&quot;").replace(/'/g,"&#8217;").replace(/</,"&lt;");d.text.indexOf(g)===-1&&d.text.push(g);var h=f.type;h=="error"?d.className="ace_error":h=="warning"&&d.className!="ace_error"?d.className="ace_warning":h=="info"&&!d.className&&(d.className="ace_info")}}},this.update=function(a){this.$config=a;var b={className:"",text:[]},c=[],e=a.firstRow,f=a.lastRow,g=this.session.getNextFoldLine(e),h=g?g.start.row:Infinity,i=this.$showFoldWidgets&&this.session.foldWidgets;for(;;){e>h&&(e=g.end.row+1,g=this.session.getNextFoldLine(e,g),h=g?g.start.row:Infinity);if(e>f)break;var j=this.$annotations[e]||b;c.push("<div class='ace_gutter-cell",this.$decorations[e]||"",this.$breakpoints[e]?" ace_breakpoint ":" ",j.className,"' title='",j.text.join("\n"),"' style='height:",a.lineHeight,"px;'>",e+1);if(i){var k=i[e];k==null&&(k=i[e]=this.session.getFoldWidget(e)),k&&c.push("<span class='ace_fold-widget ",k,k=="start"&&e==h&&e<g.end.row?" closed":" open","'></span>")}var l=this.session.getRowLength(e)-1;while(l--)c.push("</div><div class='ace_gutter-cell' style='height:",a.lineHeight,"px'>¦");c.push("</div>"),e++}this.element=d.setInnerHtml(this.element,c.join("")),this.element.style.height=a.minHeight+"px";var m=this.element.offsetWidth;m!==this.gutterWidth&&(this.gutterWidth=m,this._emit("changeGutterWidth",m))},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(a){a?d.addCssClass(this.element,"ace_folding-enabled"):d.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=a},this.getShowFoldWidgets=function(){return this.$showFoldWidgets}}).call(g.prototype),b.Gutter=g}),define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../range").Range,e=a("../lib/dom"),f=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_marker-layer",a.appendChild(this.element)};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.setMarkers=function(a){this.markers=a},this.update=function(a){var a=a||this.config;if(!a)return;this.config=a;var b=[];for(var c in this.markers){var d=this.markers[c],f=d.range.clipRows(a.firstRow,a.lastRow);if(f.isEmpty())continue;f=f.toScreenRange(this.session);if(d.renderer){var g=this.$getTop(f.start.row,a),h=Math.round(this.$padding+f.start.column*a.characterWidth);d.renderer(b,f,h,g,a)}else f.isMultiLine()?d.type=="text"?this.drawTextMarker(b,f,d.clazz,a):this.drawMultiLineMarker(b,f,d.clazz,a,d.type):this.drawSingleLineMarker(b,f,d.clazz,a,null,d.type)}this.element=e.setInnerHtml(this.element,b.join(""))},this.$getTop=function(a,b){return(a-b.firstRowScreen)*b.lineHeight},this.drawTextMarker=function(a,b,c,e){var f=b.start.row,g=new d(f,b.start.column,f,this.session.getScreenLastRowColumn(f));this.drawSingleLineMarker(a,g,c,e,1,"text"),f=b.end.row,g=new d(f,0,f,b.end.column),this.drawSingleLineMarker(a,g,c,e,0,"text");for(f=b.start.row+1;f<b.end.row;f++)g.start.row=f,g.end.row=f,g.end.column=this.session.getScreenLastRowColumn(f),this.drawSingleLineMarker(a,g,c,e,1,"text")},this.drawMultiLineMarker=function(a,b,c,d,e){var f=e==="background"?0:this.$padding,g=d.width+2*this.$padding-f,h=d.lineHeight,i=Math.round(g-b.start.column*d.characterWidth),j=this.$getTop(b.start.row,d),k=Math.round(f+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>"),j=this.$getTop(b.end.row,d),i=Math.round(b.end.column*d.characterWidth),a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",f,"px;'></div>"),h=(b.end.row-b.start.row-1)*d.lineHeight;if(h<0)return;j=this.$getTop(b.start.row+1,d),a.push("<div class='",c,"' style='","height:",h,"px;","width:",g,"px;","top:",j,"px;","left:",f,"px;'></div>")},this.drawSingleLineMarker=function(a,b,c,d,e,f){var g=f==="background"?0:this.$padding,h=d.lineHeight;if(f==="background")var i=d.width;else i=Math.round((b.end.column+(e||0)-b.start.column)*d.characterWidth);var j=this.$getTop(b.start.row,d),k=Math.round(g+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>")}}).call(f.prototype),b.Marker=f}),define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/dom"),f=a("../lib/lang"),g=a("../lib/useragent"),h=a("../lib/event_emitter").EventEmitter,i=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_text-layer",a.appendChild(this.element),this.$characterSize=this.$measureSizes()||{width:0,height:0},this.$pollSizeChanges()};(function(){d.implement(this,h),this.EOF_CHAR="¶",this.EOL_CHAR="¬",this.TAB_CHAR="→",this.SPACE_CHAR="·",this.$padding=0,this.setPadding=function(a){this.$padding=a,this.element.style.padding="0 "+a+"px"},this.getLineHeight=function(){return this.$characterSize.height||1},this.getCharacterWidth=function(){return this.$characterSize.width||1},this.checkForSizeChanges=function(){var a=this.$measureSizes();a&&(this.$characterSize.width!==a.width||this.$characterSize.height!==a.height)&&(this.$characterSize=a,this._emit("changeCharacterSize",{data:a}))},this.$pollSizeChanges=function(){var a=this;this.$pollSizeChangesTimer=setInterval(function(){a.checkForSizeChanges()},500)},this.$fontStyles={fontFamily:1,fontSize:1,fontWeight:1,fontStyle:1,lineHeight:1},this.$measureSizes=g.isIE||g.isOldGecko?function(){var a=1e3;if(!this.$measureNode){var b=this.$measureNode=e.createElement("div"),c=b.style;c.width=c.height="auto",c.left=c.top=-a*40+"px",c.visibility="hidden",c.position="fixed",c.overflow="visible",c.whiteSpace="nowrap",b.innerHTML=f.stringRepeat("Xy",a);if(this.element.ownerDocument.body)this.element.ownerDocument.body.appendChild(b);else{var d=this.element.parentNode;while(!e.hasCssClass(d,"ace_editor"))d=d.parentNode;d.appendChild(b)}}if(!this.element.offsetWidth)return null;var c=this.$measureNode.style,g=e.computedStyle(this.element);for(var h in this.$fontStyles)c[h]=g[h];var i={height:this.$measureNode.offsetHeight,width:this.$measureNode.offsetWidth/(a*2)};return i.width==0||i.height==0?null:i}:function(){if(!this.$measureNode){var a=this.$measureNode=e.createElement("div"),b=a.style;b.width=b.height="auto",b.left=b.top="-100px",b.visibility="hidden",b.position="fixed",b.overflow="visible",b.whiteSpace="nowrap",a.innerHTML="X";var c=this.element.parentNode;while(c&&!e.hasCssClass(c,"ace_editor"))c=c.parentNode;if(!c)return this.$measureNode=null;c.appendChild(a)}var d=this.$measureNode.getBoundingClientRect(),f={height:d.height,width:d.width};return f.width==0||f.height==0?null:f},this.setSession=function(a){this.session=a},this.showInvisibles=!1,this.setShowInvisibles=function(a){return this.showInvisibles==a?!1:(this.showInvisibles=a,!0)},this.$tabStrings=[],this.$computeTabString=function(){var a=this.session.getTabSize(),b=this.$tabStrings=[0];for(var c=1;c<a+1;c++)this.showInvisibles?b.push("<span class='ace_invisible'>"+this.TAB_CHAR+(new Array(c)).join("&#160;")+"</span>"):b.push((new Array(c+1)).join("&#160;"))},this.updateLines=function(a,b,c){this.$computeTabString(),(this.config.lastRow!=a.lastRow||this.config.firstRow!=a.firstRow)&&this.scrollLines(a),this.config=a;var d=Math.max(b,a.firstRow),f=Math.min(c,a.lastRow),g=this.element.childNodes,h=0;for(var i=a.firstRow;i<d;i++){var j=this.session.getFoldLine(i);if(j){if(j.containsRow(d)){d=j.start.row;break}i=j.end.row}h++}for(var k=d;k<=f;k++){var l=g[h++];if(!l)continue;var m=[],n=this.session.getTokens(k,k);this.$renderLine(m,k,n[0].tokens,!this.$useLineGroups()),l=e.setInnerHtml(l,m.join("")),k=this.session.getRowFoldEnd(k)}},this.scrollLines=function(a){this.$computeTabString();var b=this.config;this.config=a;if(!b||b.lastRow<a.firstRow)return this.update(a);if(a.lastRow<b.firstRow)return this.update(a);var c=this.element;if(b.firstRow<a.firstRow)for(var d=this.session.getFoldedRowCount(b.firstRow,a.firstRow-1);d>0;d--)c.removeChild(c.firstChild);if(b.lastRow>a.lastRow)for(var d=this.session.getFoldedRowCount(a.lastRow+1,b.lastRow);d>0;d--)c.removeChild(c.lastChild);if(a.firstRow<b.firstRow){var e=this.$renderLinesFragment(a,a.firstRow,b.firstRow-1);c.firstChild?c.insertBefore(e,c.firstChild):c.appendChild(e)}if(a.lastRow>b.lastRow){var e=this.$renderLinesFragment(a,b.lastRow+1,a.lastRow);c.appendChild(e)}},this.$renderLinesFragment=function(a,b,c){var d=this.element.ownerDocument.createDocumentFragment(),f=b,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>c)break;var i=e.createElement("div"),j=[],k=this.session.getTokens(f,f);k.length==1&&this.$renderLine(j,f,k[0].tokens,!1),i.innerHTML=j.join("");if(this.$useLineGroups())i.className="ace_line_group",d.appendChild(i);else{var l=i.childNodes;while(l.length)d.appendChild(l[0])}f++}return d},this.update=function(a){this.$computeTabString(),this.config=a;var b=[],c=a.firstRow,d=a.lastRow,f=c,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>d)break;this.$useLineGroups()&&b.push("<div class='ace_line_group'>");var i=this.session.getTokens(f,f);i.length==1&&this.$renderLine(b,f,i[0].tokens,!1),this.$useLineGroups()&&b.push("</div>"),f++}this.element=e.setInnerHtml(this.element,b.join(""))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(a,b,c,d){var e=this,f=/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g,h=function(a,c,d,f,h){if(a.charCodeAt(0)==32)return(new Array(a.length+1)).join("&#160;");if(a=="	"){var i=e.session.getScreenTabSize(b+f);return b+=i-1,e.$tabStrings[i]}if(a=="&")return g.isOldGecko?"&":"&amp;";if(a=="<")return"&lt;";if(a=="　"){var j=e.showInvisibles?"ace_cjk ace_invisible":"ace_cjk",k=e.showInvisibles?e.SPACE_CHAR:"";return b+=1,"<span class='"+j+"' style='width:"+e.config.characterWidth*2+"px'>"+k+"</span>"}if(a.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)){if(e.showInvisibles){var k=(new Array(a.length+1)).join(e.SPACE_CHAR);return"<span class='ace_invisible'>"+k+"</span>"}return"&#160;"}return b+=1,"<span class='ace_cjk' style='width:"+e.config.characterWidth*2+"px'>"+a+"</span>"},i=d.replace(f,h);if(!this.$textToken[c.type]){var j="ace_"+c.type.replace(/\./g," ace_"),k="";c.type=="fold"&&(k=" style='width:"+c.value.length*this.config.characterWidth+"px;' "),a.push("<span class='",j,"'",k,">",i,"</span>")}else a.push(i);return b+d.length},this.$renderLineCore=function(a,b,c,d,e){var f=0,g=0,h,i=0,j=this;!d||d.length==0?h=Number.MAX_VALUE:h=d[0],e||a.push("<div class='ace_line' style='height:",this.config.lineHeight,"px","'>");for(var k=0;k<c.length;k++){var l=c[k],m=l.value;if(f+m.length<h)i=j.$renderToken(a,i,l,m),f+=m.length;else{while(f+m.length>=h)i=j.$renderToken(a,i,l,m.substring(0,h-f)),m=m.substring(h-f),f=h,e||a.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px","'>"),g++,i=0,h=d[g]||Number.MAX_VALUE;m.length!=0&&(f+=m.length,i=j.$renderToken(a,i,l,m))}}this.showInvisibles&&(b!==this.session.getLength()-1?a.push("<span class='ace_invisible'>"+this.EOL_CHAR+"</span>"):a.push("<span class='ace_invisible'>"+this.EOF_CHAR+"</span>")),e||a.push("</div>")},this.$renderLine=function(a,b,c,d){if(!this.session.isRowFolded(b)){var e=this.session.getRowSplitData(b);this.$renderLineCore(a,b,c,e,d)}else this.$renderFoldLine(a,b,c,d)},this.$renderFoldLine=function(a,b,c,d){function h(a,b,c){var d=0,e=0;while(e+a[d].value.length<b){e+=a[d].value.length,d++;if(d==a.length)return}if(e!=b){var f=a[d].value.substring(b-e);f.length>c-b&&(f=f.substring(0,c-b)),g.push({type:a[d].type,value:f}),e=b+f.length,d+=1}while(e<c){var f=a[d].value;f.length+e>c&&(f=f.substring(0,c-e)),g.push({type:a[d].type,value:f}),e+=f.length,d+=1}}var e=this.session,f=e.getFoldLine(b),g=[];f.walk(function(a,b,d,e,f){a?g.push({type:"fold",value:a}):(f&&(c=this.session.getTokens(b,b)[0].tokens),c.length!=0&&h(c,e,d))}.bind(this),f.end.row,this.session.getLine(f.end.row).length);var i=this.session.$useWrapMode?this.session.$wrapData[b]:null;this.$renderLineCore(a,b,g,i,d)},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(i.prototype),b.Text=i}),define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_cursor-layer",a.appendChild(this.element),this.isVisible=!1,this.cursors=[],this.cursor=this.addCursor()};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.addCursor=function(){var a=d.createElement("div"),b="ace_cursor";return this.isVisible||(b+=" ace_hidden"),this.overwrite&&(b+=" ace_overwrite"),a.className=b,this.element.appendChild(a),this.cursors.push(a),a},this.removeCursor=function(){if(this.cursors.length>1){var a=this.cursors.pop();return a.parentNode.removeChild(a),a}},this.hideCursor=function(){this.isVisible=!1;for(var a=this.cursors.length;a--;)d.addCssClass(this.cursors[a],"ace_hidden");clearInterval(this.blinkId)},this.showCursor=function(){this.isVisible=!0;for(var a=this.cursors.length;a--;)d.removeCssClass(this.cursors[a],"ace_hidden");this.element.style.visibility="",this.restartTimer()},this.restartTimer=function(){clearInterval(this.blinkId);if(!this.isVisible)return;var a=this.element;this.blinkId=setInterval(function(){a.style.visibility="hidden",setTimeout(function(){a.style.visibility="visible"},400)},1e3)},this.getPixelPosition=function(a,b){if(!this.config||!this.session)return{left:0,top:0};a||(a=this.session.selection.getCursor());var c=this.session.documentToScreenPosition(a),d=Math.round(this.$padding+c.column*this.config.characterWidth),e=(c.row-(b?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:d,top:e}},this.update=function(a){this.config=a;if(this.session.selectionMarkerCount>1){var b=this.session.$selectionMarkers,c=0,d,e=0;for(var c=b.length;c--;){d=b[c];var f=this.getPixelPosition(d.cursor,!0),g=(this.cursors[e++]||this.addCursor()).style;g.left=f.left+"px",g.top=f.top+"px",g.width=a.characterWidth+"px",g.height=a.lineHeight+"px"}if(e>1)while(this.cursors.length>e)this.removeCursor()}else{var f=this.getPixelPosition(null,!0),g=this.cursor.style;g.left=f.left+"px",g.top=f.top+"px",g.width=a.characterWidth+"px",g.height=a.lineHeight+"px";while(this.cursors.length>1)this.removeCursor()}var h=this.session.getOverwrite();h!=this.overwrite&&this.$setOverite(h),this.restartTimer()},this.$setOverite=function(a){this.overwrite=a;for(var b=this.cursors.length;b--;)a?d.addCssClass(this.cursors[b],"ace_overwrite"):d.removeCssClass(this.cursors[b],"ace_overwrite")},this.destroy=function(){clearInterval(this.blinkId)}}).call(e.prototype),b.Cursor=e}),define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/event_emitter").EventEmitter,h=function(a){this.element=e.createElement("div"),this.element.className="ace_sb",this.inner=e.createElement("div"),this.element.appendChild(this.inner),a.appendChild(this.element),this.width=e.scrollbarWidth(a.ownerDocument),this.element.style.width=(this.width||15)+5+"px",f.addListener(this.element,"scroll",this.onScroll.bind(this))};(function(){d.implement(this,g),this.onScroll=function(){this._emit("scroll",{data:this.element.scrollTop})},this.getWidth=function(){return this.width},this.setHeight=function(a){this.element.style.height=a+"px"},this.setInnerHeight=function(a){this.inner.style.height=a+"px"},this.setScrollTop=function(a){this.element.scrollTop=a}}).call(h.prototype),b.ScrollBar=h}),define("ace/renderloop",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("./lib/event"),e=function(a,b){this.onRender=a,this.pending=!1,this.changes=0,this.window=b||window};(function(){this.schedule=function(a){this.changes=this.changes|a;if(!this.pending){this.pending=!0;var b=this;d.nextTick(function(){b.pending=!1;var a;while(a=b.changes)b.changes=0,b.onRender(a)},this.window)}}}).call(e.prototype),b.RenderLoop=e}),define("text!ace/css/editor.css",[],"@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n\n.ace_editor {\n    position: absolute;\n    overflow: hidden;\n    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Consolas', monospace;\n    font-size: 12px;\n}\n\n.ace_scroller {\n    position: absolute;\n    overflow-x: scroll;\n    overflow-y: hidden;\n}\n\n.ace_content {\n    position: absolute;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    cursor: text;\n}\n\n.ace_composition {\n    position: absolute;\n    background: #555;\n    color: #DDD;\n    z-index: 4;\n}\n\n.ace_gutter {\n    position: absolute;\n    overflow : hidden;\n    height: 100%;\n    width: auto;\n    cursor: default;\n    z-index: 1000;\n}\n\n.ace_gutter.horscroll {\n    box-shadow: 0px 0px 20px rgba(0,0,0,0.4);\n}\n\n.ace_gutter-cell {\n    padding-left: 19px;\n    padding-right: 6px;\n}\n\n.ace_gutter-cell.ace_error {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_warning {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_info {\n    background-image: url(\"data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_editor .ace_sb {\n    position: absolute;\n    overflow-x: hidden;\n    overflow-y: scroll;\n    right: 0;\n}\n\n.ace_editor .ace_sb div {\n    position: absolute;\n    width: 1px;\n    left: 0;\n}\n\n.ace_editor .ace_print_margin_layer {\n    z-index: 0;\n    position: absolute;\n    overflow: hidden;\n    margin: 0;\n    left: 0;\n    height: 100%;\n    width: 100%;\n}\n\n.ace_editor .ace_print_margin {\n    position: absolute;\n    height: 100%;\n}\n\n.ace_editor textarea {\n    position: fixed;\n    z-index: 0;\n    width: 10px;\n    height: 30px;\n    opacity: 0;\n    background: transparent;\n    appearance: none;\n    -moz-appearance: none;\n    border: none;\n    resize: none;\n    outline: none;\n    overflow: hidden;\n}\n\n.ace_layer {\n    z-index: 1;\n    position: absolute;\n    overflow: hidden;\n    white-space: nowrap;\n    height: 100%;\n    width: 100%;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    /* setting pointer-events: auto; on node under the mouse, which changes\n        during scroll, will break mouse wheel scrolling in Safari */\n    pointer-events: none;\n}\n\n.ace_gutter .ace_layer {\n    position: relative;\n    min-width: 40px;\n    text-align: right;\n    pointer-events: auto;\n}\n\n.ace_text-layer {\n    color: black;\n}\n\n.ace_cjk {\n    display: inline-block;\n    text-align: center;\n}\n\n.ace_cursor-layer {\n    z-index: 4;\n}\n\n.ace_cursor {\n    z-index: 4;\n    position: absolute;\n}\n\n.ace_cursor.ace_hidden {\n    opacity: 0.2;\n}\n\n.ace_line {\n    white-space: nowrap;\n}\n\n.ace_marker-layer .ace_step {\n    position: absolute;\n    z-index: 3;\n}\n\n.ace_marker-layer .ace_selection {\n    position: absolute;\n    z-index: 5;\n}\n\n.ace_marker-layer .ace_bracket {\n    position: absolute;\n    z-index: 6;\n}\n\n.ace_marker-layer .ace_active_line {\n    position: absolute;\n    z-index: 2;\n}\n\n.ace_gutter .ace_gutter_active_line{\n    background-color : #dcdcdc;\n}\n\n.ace_marker-layer .ace_selected_word {\n    position: absolute;\n    z-index: 4;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n}\n\n.ace_line .ace_fold {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    \n    display: inline-block;\n    height: 11px;\n    margin-top: -2px;\n    vertical-align: middle;\n\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n    color: transparent;\n\n    border: 1px solid black;\n    -moz-border-radius: 2px;\n    -webkit-border-radius: 2px;\n    border-radius: 2px;\n    \n    cursor: pointer;\n    pointer-events: auto;\n}\n\n.ace_dark .ace_fold {\n}\n\n.ace_fold:hover{\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%003IDAT8%11c%FC%FF%FF%7F%3E%03%1A%60%01%F2%3F%A3%891%80%04%FFQ%26%F8w%C0%B43%A1%DB%0C%E2%8F%0A%A2%85%CAh%80%8C%06%08%3C%04%E8%96%18%00%A3S%0D%CD%CF%D8%C1%9D%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n}\n\n.ace_dragging .ace_content {\n    cursor: move;\n}\n\n.ace_folding-enabled > .ace_gutter-cell {\n    padding-right: 13px;\n}\n\n.ace_fold-widget {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n\n    margin: 0 -12px 1px 1px;\n    display: inline-block;\n    height: 14px;\n    width: 11px;\n    vertical-align: text-bottom;\n    \n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat;\n    background-position: center 5px;\n\n    border-radius: 3px;\n}\n\n.ace_fold-widget.end {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget.closed {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget:hover {\n    border: 1px solid rgba(0, 0, 0, 0.3);\n    background-color: rgba(255, 255, 255, 0.2);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    background-position: center 4px;\n}\n\n.ace_fold-widget:active {\n    border: 1px solid rgba(0, 0, 0, 0.4);\n    background-color: rgba(0, 0, 0, 0.05);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n}\n\n.ace_fold-widget.invalid {\n    background-color: #FFB4B4;\n    border-color: #DE5555;\n}\n"),define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor"],function(a,b,c){function j(a,b,c){return i.$options.wrap=!0,i.$options.needle=b,i.$options.backwards=c==-1,i.find(a)}function m(a,b){return a.row==b.row&&a.column==b.column}function n(a){a.$onAddRange=a.$onAddRange.bind(a),a.$onRemoveRange=a.$onRemoveRange.bind(a),a.$onMultiSelect=a.$onMultiSelect.bind(a),a.$onSingleSelect=a.$onSingleSelect.bind(a),b.onSessionChange.call(a,a),a.on("changeSession",b.onSessionChange.bind(a)),a.on("mousedown",g),a.commands.addCommands(b.commands.defaultCommands)}var d=a("./range_list").RangeList,e=a("./range").Range,f=a("./selection").Selection,g=a("./mouse/multi_select_handler").onMouseDown;b.commands=a("./commands/multi_select_commands");var h=a("./search").Search,i=new h,k=a("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(k.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(a){if(!this.inMultiSelectMode&&this.rangeCount==0){var b=this.toOrientedRange();if(!a||!a.isEqual(b))this.rangeList.add(b),this.$onAddRange(b)}if(!a)return;a.cursor||(a.cursor=a.end);var c=this.rangeList.add(a);this.$onAddRange(a),c.length&&this.$onRemoveRange(c),this.rangeCount>0&&!this.inMultiSelectMode&&(this._emit("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session))},this.toSingleRange=function(a){a=a||this.ranges[0];var b=this.rangeList.removeAll();b.length&&this.$onRemoveRange(b),a&&this.fromOrientedRange(a)},this.substractPoint=function(a){var b=this.rangeList.substractPoint(a);if(b)return this.$onRemoveRange(b),b[0]},this.mergeOverlappingRanges=function(){var a=this.rangeList.merge();a.length?this.$onRemoveRange(a):this.ranges[0]&&this.fromOrientedRange(this.ranges[0])},this.$onAddRange=function(a){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(a),this.fromOrientedRange(a),this._emit("addRange",{range:a})},this.$onRemoveRange=function(a){this.rangeCount=this.rangeList.ranges.length;if(this.rangeCount==1&&this.inMultiSelectMode){var b=this.rangeList.ranges.pop();a.push(b),this.rangeCount=0}for(var c=a.length;c--;){var d=this.ranges.indexOf(a[c]);this.ranges.splice(d,1)}this._emit("removeRange",{ranges:a}),this.rangeCount==0&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._emit("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),b=b||this.ranges[0],b&&!b.isEqual(this.getRange())&&this.fromOrientedRange(b)},this.$initRangeList=function(){if(this.rangeList)return;this.rangeList=new d,this.ranges=[],this.rangeCount=0},this.getAllRanges=function(){return this.rangeList.ranges.concat()},this.splitIntoLines=function(){if(this.rangeCount>1){var a=this.rangeList.ranges,b=a[a.length-1],c=e.fromPoints(a[0].start,b.end);this.toSingleRange(),this.setSelectionRange(c,b.cursor==b.start)}else{var d=this.session.documentToScreenPosition(this.selectionLead),f=this.session.documentToScreenPosition(this.selectionAnchor),g=this.rectangularRangeBlock(d,f);g.forEach(this.addRange,this)}},this.rectangularRangeBlock=function(a,b,c){var d=[],f=a.column<b.column;if(f)var g=a.column,h=b.column;else var g=b.column,h=a.column;var i=a.row<b.row;if(i)var j=a.row,k=b.row;else var j=b.row,k=a.row;g<0&&(g=0),j<0&&(j=0),j==k&&(c=!0);for(var l=j;l<=k;l++){var n=e.fromPoints(this.session.screenToDocumentPosition(l,g),this.session.screenToDocumentPosition(l,h));if(n.isEmpty()){if(o&&m(n.end,o))break;var o=n.end}n.cursor=f?n.start:n.end,d.push(n)}i&&d.reverse();if(!c){var p=d.length-1;while(d[p].isEmpty()&&p>0)p--;if(p>0){var q=0;while(d[q].isEmpty())q++}for(var r=p;r>=q;r--)d[r].isEmpty()&&d.splice(r,1)}return d}}.call(f.prototype);var l=a("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(a){a.cursor||(a.cursor=a.end);var b=this.getSelectionStyle();return a.marker=this.session.addMarker(a,"ace_selection",b),this.session.$selectionMarkers.push(a),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,a},this.removeSelectionMarkers=function(a){for(var b=a.length;b--;){var c=a[b];if(!c.marker)continue;this.session.removeMarker(c.marker);var d=this.session.$selectionMarkers.indexOf(c);d!=-1&&this.session.$selectionMarkers.splice(d,1)}this.session.selectionMarkerCount=this.session.$selectionMarkers.length},this.$onAddRange=function(a){this.addSelectionMarker(a.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(a){this.removeSelectionMarkers(a.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(a){if(this.inMultiSelectMode)return;this.inMultiSelectMode=!0,this.setStyle("multiselect"),this.keyBinding.addKeyboardHandler(b.commands.keyboardHandler),this.commands.on("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onSingleSelect=function(a){if(this.session.multiSelect.inVirtualMode)return;this.inMultiSelectMode=!1,this.unsetStyle("multiselect"),this.keyBinding.removeKeyboardHandler(b.commands.keyboardHandler),this.commands.removeEventListener("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelectExec=function(a){var b=a.command,c=a.editor;b.multiSelectAction?b.multiSelectAction=="forEach"?c.forEachSelection(b,a.args):b.multiSelectAction=="single"?(c.exitMultiSelectMode(),b.exec(c,a.args||{})):b.multiSelectAction(c,a.args||{}):(b.exec(c,a.args||{}),c.multiSelect.addRange(c.multiSelect.toOrientedRange()),c.multiSelect.mergeOverlappingRanges()),a.preventDefault()},this.forEachSelection=function(a,b){if(this.inVirtualSelectionMode)return;var c=this.session,d=this.selection,e=d.rangeList,g=d._eventRegistry;d._eventRegistry={};var h=new f(c);this.inVirtualSelectionMode=!0;for(var i=e.ranges.length;i--;)h.fromOrientedRange(e.ranges[i]),this.selection=c.selection=h,a.exec(this,b||{}),h.toOrientedRange(e.ranges[i]);h.detach(),this.selection=c.selection=d,this.inVirtualSelectionMode=!1,d._eventRegistry=g,d.mergeOverlappingRanges(),this.onCursorChange(),this.onSelectionChange()},this.exitMultiSelectMode=function(){if(this.inVirtualSelectionMode)return;this.multiSelect.toSingleRange()},this.getCopyText=function(){var a="";if(this.inMultiSelectMode){var b=this.multiSelect.rangeList.ranges;a=[];for(var c=0;c<b.length;c++)a.push(this.session.getTextRange(b[c]));a=a.join(this.session.getDocument().getNewLineCharacter())}else this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange()));return a},this.selectMoreLines=function(a,b){var c=this.selection.toOrientedRange(),d=c.cursor==c.end,f=this.session.documentToScreenPosition(c.cursor);this.selection.$desiredColumn&&(f.column=this.selection.$desiredColumn);var g=this.session.screenToDocumentPosition(f.row+a,f.column);if(!c.isEmpty())var h=this.session.documentToScreenPosition(d?c.end:c.start),i=this.session.screenToDocumentPosition(h.row+a,h.column);else var i=g;if(d){var j=e.fromPoints(g,i);j.cursor=j.start}else{var j=e.fromPoints(i,g);j.cursor=j.end}j.desiredColumn=f.column;if(!this.selection.inMultiSelectMode)this.selection.addRange(c);else if(b)var k=c.cursor;this.selection.addRange(j),k&&this.selection.substractPoint(k)},this.transposeSelections=function(a){var b=this.session,c=b.multiSelect,d=c.ranges;for(var e=d.length;e--;){var f=d[e];if(f.isEmpty()){var g=b.getWordRange(f.start.row,f.start.column);f.start.row=g.start.row,f.start.column=g.start.column,f.end.row=g.end.row,f.end.column=g.end.column}}c.mergeOverlappingRanges();var h=[];for(var e=d.length;e--;){var f=d[e];h.unshift(b.getTextRange(f))}a<0?h.unshift(h.pop()):h.push(h.shift());for(var e=d.length;e--;){var f=d[e],g=f.clone();b.replace(f,h[e]),f.start.row=g.start.row,f.start.column=g.start.column}},this.selectMore=function(a,b){var c=this.session,d=c.multiSelect,e=d.toOrientedRange();if(e.isEmpty()){var e=c.getWordRange(e.start.row,e.start.column);e.cursor=e.end,this.multiSelect.addRange(e)}var f=c.getTextRange(e),g=j(c,f,a);g&&(g.cursor=a==-1?g.start:g.end,this.multiSelect.addRange(g)),b&&this.multiSelect.substractPoint(e.cursor)}}).call(l.prototype),b.onSessionChange=function(a){var b=a.session;b.multiSelect||(b.$selectionMarkers=[],b.selection.$initRangeList(),b.multiSelect=b.selection),this.multiSelect=b.multiSelect;var c=a.oldSession;c&&(c.multiSelect&&c.multiSelect.editor==this&&(c.multiSelect.editor=null),b.multiSelect.removeEventListener("addRange",this.$onAddRange),b.multiSelect.removeEventListener("removeRange",this.$onRemoveRange),b.multiSelect.removeEventListener("multiSelect",this.$onMultiSelect),b.multiSelect.removeEventListener("singleSelect",this.$onSingleSelect)),b.multiSelect.on("addRange",this.$onAddRange),b.multiSelect.on("removeRange",this.$onRemoveRange),b.multiSelect.on("multiSelect",this.$onMultiSelect),b.multiSelect.on("singleSelect",this.$onSingleSelect),this.inMultiSelectMode!=b.selection.inMultiSelectMode&&(b.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},b.MultiSelect=n}),define("ace/range_list",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.ranges=[]};(function(){this.comparePoints=function(a,b){return a.row-b.row||a.column-b.column},this.pointIndex=function(a,b){var c=this.ranges;for(var d=b||0;d<c.length;d++){var e=c[d],f=this.comparePoints(a,e.end);if(f>0)continue;return f==0?d:(f=this.comparePoints(a,e.start),f>=0?d:-d-1)}return-d-1},this.add=function(a){var b=this.pointIndex(a.start);b<0&&(b=-b-1);var c=this.pointIndex(a.end,b);return c<0?c=-c-1:c++,this.ranges.splice(b,c-b,a)},this.addList=function(a){var b=[];for(var c=a.length;c--;)b.push.call(b,this.add(a[c]));return b},this.substractPoint=function(a){var b=this.pointIndex(a);if(b>=0)return this.ranges.splice(b,1)},this.merge=function(){var a=[],b=this.ranges,c=b[0],d;for(var e=1;e<b.length;e++){d=c,c=b[e];var f=this.comparePoints(d.end,c.start);if(f<0)continue;if(f==0&&!d.isEmpty()&&!c.isEmpty())continue;this.comparePoints(d.end,c.end)<0&&(d.end.row=c.end.row,d.end.column=c.end.column),b.splice(e,1),a.push(c),c=d,e--}return a},this.contains=function(a,b){return this.pointIndex({row:a,column:b})>=0},this.containsPoint=function(a){return this.pointIndex(a)>=0},this.rangeAtPoint=function(a){var b=this.pointIndex(a);if(b>=0)return this.ranges[b]},this.clipRows=function(a,b){var c=this.ranges;if(c[0].start.row>b||c[c.length-1].start.row<a)return[];var d=this.pointIndex({row:a,column:0});d<0&&(d=-d-1);var e=this.pointIndex({row:b,column:0},d);e<0&&(e=-e-1);var f=[];for(var g=d;g<e;g++)f.push(c[g]);return f},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(a){this.session&&this.detach(),this.session=a,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){if(!this.session)return;this.session.removeListener("change",this.onChange),this.session=null},this.$onChange=function(a){var b=a.data.range;if(a.data.action[0]=="i")var c=b.start,d=b.end;else var d=b.start,c=b.end;var e=c.row,f=d.row,g=f-e,h=-c.column+d.column,i=this.ranges;for(var j=0,k=i.length;j<k;j++){var l=i[j];if(l.end.row<e)continue;if(l.start.row>e)break;l.start.row==e&&l.start.column>=c.column&&(l.start.column+=h,l.start.row+=g),l.end.row==e&&l.end.column>=c.column&&(l.end.column+=h,l.end.row+=g)}if(g!=0&&j<k)for(;j<k;j++){var l=i[j];l.start.row+=g,l.end.row+=g}}}).call(d.prototype),b.RangeList=d}),define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event"],function(a,b,c){function e(a,b){return a.row==b.row&&a.column==b.column}function f(a){var b=a.domEvent,c=b.altKey,f=b.shiftKey,g=a.getAccelKey(),h=a.getButton();if(!g&&!c){if(a.editor.inMultiSelectMode)if(h==0)a.editor.exitMultiSelectMode();else if(h==2){var i=a.editor,j=i.selection.isEmpty();i.textInput.onContextMenu({x:a.clientX,y:a.clientY},j),d.capture(i.container,function(){},i.textInput.onContextMenuClose),a.stop()}return}var i=a.editor,k=i.selection,l=i.inMultiSelectMode,m=a.getDocumentPosition(),n=k.getCursor(),o=a.inSelection()||k.isEmpty()&&e(m,n),p=a.pageX,q=a.pageY,r=function(a){p=d.getDocumentX(a),q=d.getDocumentY(a)},s=function(){var a=i.renderer.pixelToScreenCoordinates(p,q),b=t.screenToDocumentPosition(a.row,a.column);if(e(v,a)&&e(b,k.selectionLead))return;v=a,i.selection.moveCursorToPosition(b),i.selection.clearSelection(),i.renderer.scrollCursorIntoView(),i.removeSelectionMarkers(x),x=k.rectangularRangeBlock(v,u),x.forEach(i.addSelectionMarker,i),i.updateSelectionMarkers()},t=i.session,u=i.renderer.pixelToScreenCoordinates(p,q),v=u;if(g&&!f&&!c&&h==0){if(!l&&o)return;l||k.addRange(k.toOrientedRange());var w=k.rangeList.rangeAtPoint(m);d.capture(i.container,function(){},function(){var a=k.toOrientedRange();w&&a.isEmpty()&&e(w.cursor,a.cursor)?k.substractPoint(a.cursor):k.addRange(a)})}else if(!f&&c&&h==0){a.stop(),l&&!g?k.toSingleRange():!l&&g&&k.addRange(),k.moveCursorToPosition(m),k.clearSelection();var x=[],y=function(a){clearInterval(A),i.removeSelectionMarkers(x);for(var b=0;b<x.length;b++)k.addRange(x[b])},z=s;d.capture(i.container,r,y);var A=setInterval(function(){z()},20);return a.preventDefault()}}var d=a("../lib/event");b.onMouseDown=f}),define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],function(a,b,c){b.defaultCommands=[{name:"addCursorAbove",exec:function(a){a.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},readonly:!0},{name:"addCursorBelow",exec:function(a){a.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},readonly:!0},{name:"addCursorAboveSkipCurrent",exec:function(a){a.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},readonly:!0},{name:"addCursorBelowSkipCurrent",exec:function(a){a.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},readonly:!0},{name:"selectMoreBefore",exec:function(a){a.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},readonly:!0},{name:"selectMoreAfter",exec:function(a){a.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},readonly:!0},{name:"selectNextBefore",exec:function(a){a.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},readonly:!0},{name:"selectNextAfter",exec:function(a){a.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},readonly:!0},{name:"splitIntoLines",exec:function(a){a.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Shift-L",mac:"Ctrl-Shift-L"},readonly:!0}],b.multiEditCommands=[{name:"singleSelection",bindKey:"esc",exec:function(a){a.exitMultiSelectMode()},readonly:!0}];var d=a("../keyboard/hash_handler").HashHandler;b.keyboardHandler=new d(b.multiEditCommands)}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/config"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=a("../config"),g=function(b,c,d,e){this.changeListener=this.changeListener.bind(this);if(f.get("packaged"))this.$worker=new Worker(f.get("workerPath")+"/"+c);else{var g=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(g);var h={};for(var i=0;i<b.length;i++){var j=b[i],k=this.$normalizePath(a.nameToUrl(j,null,"_").replace(/.js$/,""));h[j]=k}}this.$worker.postMessage({init:!0,tlns:h,module:d,classname:e}),this.callbackId=1,this.callbacks={};var l=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":l._emit(b.name,{data:b.data});break;case"call":var c=l.callbacks[b.id];c&&(c(b.data),delete l.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+/,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}}).call(g.prototype),b.WorkerClient=g}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e}),define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./range").Range,e=a("./lib/event_emitter").EventEmitter,f=a("./lib/oop"),g=function(a,b,c,d,e,f){var g=this;this.length=b,this.session=a,this.doc=a.getDocument(),this.mainClass=e,this.othersClass=f,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=d,this.$onCursorChange=function(){setTimeout(function(){g.onCursorChange()})},this.$pos=c;var h=a.getUndoManager().$undoStack||a.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=h.length,this.setup(),a.selection.on("changeCursor",this.$onCursorChange)};(function(){f.implement(this,e),this.setup=function(){var a=this,b=this.doc,c=this.session,e=this.$pos;this.pos=b.createAnchor(e.row,e.column),this.markerId=c.addMarker(new d(e.row,e.column,e.row,e.column+this.length),this.mainClass,null,!1),this.pos.on("change",function(b){c.removeMarker(a.markerId),a.markerId=c.addMarker(new d(b.value.row,b.value.column,b.value.row,b.value.column+a.length),a.mainClass,null,!1)}),this.others=[],this.$others.forEach(function(c){var d=b.createAnchor(c.row,c.column);a.others.push(d)}),c.setUndoSelect(!1)},this.showOtherMarkers=function(){if(this.othersActive)return;var a=this.session,b=this;this.othersActive=!0,this.others.forEach(function(c){c.markerId=a.addMarker(new d(c.row,c.column,c.row,c.column+b.length),b.othersClass,null,!1),c.on("change",function(e){a.removeMarker(c.markerId),c.markerId=a.addMarker(new d(e.value.row,e.value.column,e.value.row,e.value.column+b.length),b.othersClass,null,!1)})})},this.hideOtherMarkers=function(){if(!this.othersActive)return;this.othersActive=!1;for(var a=0;a<this.others.length;a++)this.session.removeMarker(this.others[a].markerId)},this.onUpdate=function(a){var b=a.data,c=b.range;if(c.start.row!==c.end.row)return;if(c.start.row!==this.pos.row)return;if(this.$updating)return;this.$updating=!0;var e=b.action==="insertText"?c.end.column-c.start.column:c.start.column-c.end.column;if(c.start.column>=this.pos.column&&c.start.column<=this.pos.column+this.length+1){var f=c.start.column-this.pos.column;this.length+=e;if(!this.session.$fromUndo){if(b.action==="insertText")for(var g=this.others.length-1;g>=0;g--){var h=this.others[g],i={row:h.row,column:h.column+f};h.row===c.start.row&&c.start.column<h.column&&(i.column+=e),this.doc.insert(i,b.text)}else if(b.action==="removeText")for(var g=this.others.length-1;g>=0;g--){var h=this.others[g],i={row:h.row,column:h.column+f};h.row===c.start.row&&c.start.column<h.column&&(i.column+=e),this.doc.remove(new d(i.row,i.column,i.row,i.column-e))}c.start.column===this.pos.column&&b.action==="insertText"?setTimeout(function(){this.pos.setPosition(this.pos.row,this.pos.column-e);for(var a=0;a<this.others.length;a++){var b=this.others[a],d={row:b.row,column:b.column-e};b.row===c.start.row&&c.start.column<b.column&&(d.column+=e),b.setPosition(d.row,d.column)}}.bind(this),0):c.start.column===this.pos.column&&b.action==="removeText"&&setTimeout(function(){for(var a=0;a<this.others.length;a++){var b=this.others[a];b.row===c.start.row&&c.start.column<b.column&&b.setPosition(b.row,b.column-e)}}.bind(this),0)}this.pos._emit("change",{value:this.pos});for(var g=0;g<this.others.length;g++)this.others[g]._emit("change",{value:this.others[g]})}this.$updating=!1},this.onCursorChange=function(a){if(this.$updating)return;var b=this.session.selection.getCursor();b.row===this.pos.row&&b.column>=this.pos.column&&b.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",a)):(this.hideOtherMarkers(),this._emit("cursorLeave",a))},this.detach=function(){this.session.removeMarker(this.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.pos.detach();for(var a=0;a<this.others.length;a++)this.others[a].detach();this.session.setUndoSelect(!0)},this.cancel=function(){if(this.$undoStackDepth===-1)throw Error("Canceling placeholders only supported with undo manager attached to session.");var a=this.session.getUndoManager(),b=(a.$undoStack||a.$undostack).length-this.$undoStackDepth;for(var c=0;c<b;c++)a.undo(!0)}}).call(g.prototype),b.PlaceHolder=g}),define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict",b.isDark=!1,b.cssClass="ace-tm",b.cssText=".ace-tm .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tm .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tm .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tm .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tm .ace_fold {    background-color: #6B72E6;}.ace-tm .ace_text-layer {  cursor: text;}.ace-tm .ace_cursor {  border-left: 1px solid black;}.ace-tm .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}        .ace-tm .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-tm .ace_line .ace_storage,.ace-tm .ace_line .ace_keyword {  color: blue;}.ace-tm .ace_line .ace_constant {  color: rgb(197, 6, 11);}.ace-tm .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-tm .ace_line .ace_constant.ace_language {  color: rgb(88, 92, 246);}.ace-tm .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_invalid {  background-color: rgb(153, 0, 0);  color: white;}.ace-tm .ace_line .ace_support.ace_function {  color: rgb(60, 76, 114);}.ace-tm .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_support.ace_type,.ace-tm .ace_line .ace_support.ace_class {  color: rgb(109, 121, 222);}.ace-tm .ace_line .ace_keyword.ace_operator {  color: rgb(104, 118, 135);}.ace-tm .ace_line .ace_string {  color: rgb(3, 106, 7);}.ace-tm .ace_line .ace_comment {  color: rgb(76, 136, 107);}.ace-tm .ace_line .ace_comment.ace_doc {  color: rgb(0, 102, 255);}.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(128, 159, 191);}.ace-tm .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 205);}.ace-tm .ace_line .ace_variable {  color: rgb(49, 132, 149);}.ace-tm .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {  color: #0000A2;}.ace-tm .ace_markup.ace_markupine {    text-decoration:underline;}.ace-tm .ace_markup.ace_heading {  color: rgb(12, 7, 255);}.ace-tm .ace_markup.ace_list {  color:rgb(185, 6, 144);}.ace-tm .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-tm .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_meta.ace_tag {  color:rgb(28, 2, 255);}.ace-tm .ace_string.ace_regex {  color: rgb(255, 0, 0)}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)});
+(function(){function g(a){if(typeof requirejs!="undefined"){var e=b.define;b.define=function(a,b,c){return typeof c!="function"?e.apply(this,arguments):e(a,b,function(a,d,e){return b[2]=="module"&&(e.packaged=!0),c.apply(this,arguments)})},b.define.packaged=!0;return}var f=function(a,b){return d("",a,b)};f.packaged=!0;var g=b;a&&(b[a]||(b[a]={}),g=b[a]),g.define&&(c.original=g.define),g.define=c,g.require&&(d.original=g.require),g.require=f}var a="",b=function(){return this}(),c=function(a,b,d){if(typeof a!="string"){c.original?c.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(d=b),c.modules||(c.modules={}),c.modules[a]=d},d=function(a,b,c){if(Object.prototype.toString.call(b)==="[object Array]"){var e=[];for(var g=0,h=b.length;g<h;++g){var i=f(a,b[g]);if(!i&&d.original)return d.original.apply(window,arguments);e.push(i)}c&&c.apply(null,e)}else{if(typeof b=="string"){var j=f(a,b);return!j&&d.original?d.original.apply(window,arguments):(c&&c(),j)}if(d.original)return d.original.apply(window,arguments)}},e=function(a,b){if(b.indexOf("!")!==-1){var c=b.split("!");return e(a,c[0])+"!"+e(a,c[1])}if(b.charAt(0)=="."){var d=a.split("/").slice(0,-1).join("/");b=d+"/"+b;while(b.indexOf(".")!==-1&&f!=b){var f=b;b=b.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return b},f=function(a,b){b=e(a,b);var f=c.modules[b];if(!f)return null;if(typeof f=="function"){var g={},h={id:b,uri:"",exports:g,packaged:!0},i=function(a,c){return d(b,a,c)},j=f(i,g,h);return g=j||h.exports,c.modules[b]=g,g}return f};g(a)})(),define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/multi_select","ace/worker/worker_client","ace/keyboard/hash_handler","ace/keyboard/state_handler","ace/placeholder","ace/config","ace/theme/textmate"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/dom"),e=a("./lib/event"),f=a("./editor").Editor,g=a("./edit_session").EditSession,h=a("./undomanager").UndoManager,i=a("./virtual_renderer").VirtualRenderer,j=a("./multi_select").MultiSelect;a("./worker/worker_client"),a("./keyboard/hash_handler"),a("./keyboard/state_handler"),a("./placeholder"),a("./config").init(),b.edit=function(b){typeof b=="string"&&(b=document.getElementById(b));var c=new g(d.getInnerText(b));c.setUndoManager(new h),b.innerHTML="";var k=new f(new i(b,a("./theme/textmate")));new j(k),k.setSession(c);var l={};return l.document=c,l.editor=k,k.resize(),e.addListener(window,"resize",function(){k.resize()}),b.env=l,k.env=l,k}}),define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(a,b,c){"use strict",a("./regexp"),a("./es5-shim")}),define("ace/lib/regexp",["require","exports","module"],function(a,b,c){function g(a){return(a.global?"g":"")+(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.extended?"x":"")+(a.sticky?"y":"")}function h(a,b,c){if(Array.prototype.indexOf)return a.indexOf(b,c);for(var d=c||0;d<a.length;d++)if(a[d]===b)return d;return-1}"use strict";var d={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},e=d.exec.call(/()??/,"")[1]===undefined,f=function(){var a=/^/g;return d.test.call(a,""),!a.lastIndex}();RegExp.prototype.exec=function(a){var b=d.exec.apply(this,arguments),c,i;if(typeof a=="string"&&b){!e&&b.length>1&&h(b,"")>-1&&(i=RegExp(this.source,d.replace.call(g(this),"g","")),d.replace.call(a.slice(b.index),i,function(){for(var a=1;a<arguments.length-2;a++)arguments[a]===undefined&&(b[a]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var j=1;j<b.length;j++)c=this._xregexp.captureNames[j-1],c&&(b[c]=b[j]);!f&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--}return b},f||(RegExp.prototype.test=function(a){var b=d.exec.call(this,a);return b&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--,!!b})}),define("ace/lib/es5-shim",["require","exports","module"],function(a,b,c){function p(a){try{return Object.defineProperty(a,"sentinel",{}),"sentinel"in a}catch(b){}}Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=g.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,h=c.apply(f,d.concat(g.call(arguments)));return h!==null&&Object(h)===h?h:f}return c.apply(b,d.concat(g.call(arguments)))};return e});var d=Function.prototype.call,e=Array.prototype,f=Object.prototype,g=e.slice,h=d.bind(f.toString),i=d.bind(f.hasOwnProperty),j,k,l,m,n;if(n=i(f,"__defineGetter__"))j=d.bind(f.__defineGetter__),k=d.bind(f.__defineSetter__),l=d.bind(f.__lookupGetter__),m=d.bind(f.__lookupSetter__);Array.isArray||(Array.isArray=function(b){return h(b)=="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(b){var c=G(this),d=arguments[1],e=0,f=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;while(e<f)e in c&&b.call(d,c[e],e,c),e++}),Array.prototype.map||(Array.prototype.map=function(b){var c=G(this),d=c.length>>>0,e=Array(d),f=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var g=0;g<d;g++)g in c&&(e[g]=b.call(f,c[g],g,c));return e}),Array.prototype.filter||(Array.prototype.filter=function(b){var c=G(this),d=c.length>>>0,e=[],f=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var g=0;g<d;g++)g in c&&b.call(f,c[g],g,c)&&e.push(c[g]);return e}),Array.prototype.every||(Array.prototype.every=function(b){var c=G(this),d=c.length>>>0,e=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var f=0;f<d;f++)if(f in c&&!b.call(e,c[f],f,c))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(b){var c=G(this),d=c.length>>>0,e=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var f=0;f<d;f++)if(f in c&&b.call(e,c[f],f,c))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(b){var c=G(this),d=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;if(!d&&arguments.length==1)throw new TypeError;var e=0,f;if(arguments.length>=2)f=arguments[1];else do{if(e in c){f=c[e++];break}if(++e>=d)throw new TypeError}while(!0);for(;e<d;e++)e in c&&(f=b.call(void 0,f,c[e],e,c));return f}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(b){var c=G(this),d=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;if(!d&&arguments.length==1)throw new TypeError;var e,f=d-1;if(arguments.length>=2)e=arguments[1];else do{if(f in c){e=c[f--];break}if(--f<0)throw new TypeError}while(!0);do f in this&&(e=b.call(void 0,e,c[f],f,c));while(f--);return e}),Array.prototype.indexOf||(Array.prototype.indexOf=function(b){var c=G(this),d=c.length>>>0;if(!d)return-1;var e=0;arguments.length>1&&(e=E(arguments[1])),e=e>=0?e:Math.max(0,d+e);for(;e<d;e++)if(e in c&&c[e]===b)return e;return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(b){var c=G(this),d=c.length>>>0;if(!d)return-1;var e=d-1;arguments.length>1&&(e=Math.min(e,E(arguments[1]))),e=e>=0?e:d-Math.abs(e);for(;e>=0;e--)if(e in c&&b===c[e])return e;return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(b){return b.__proto__||(b.constructor?b.constructor.prototype:f)});if(!Object.getOwnPropertyDescriptor){var o="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(b,c){if(typeof b!="object"&&typeof b!="function"||b===null)throw new TypeError(o+b);if(!i(b,c))return;var d,e,g;d={enumerable:!0,configurable:!0};if(n){var h=b.__proto__;b.__proto__=f;var e=l(b,c),g=m(b,c);b.__proto__=h;if(e||g)return e&&(d.get=e),g&&(d.set=g),d}return d.value=b[c],d}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(b){return Object.keys(b)}),Object.create||(Object.create=function(b,c){var d;if(b===null)d={__proto__:null};else{if(typeof b!="object")throw new TypeError("typeof prototype["+typeof b+"] != 'object'");var e=function(){};e.prototype=b,d=new e,d.__proto__=b}return c!==void 0&&Object.defineProperties(d,c),d});if(Object.defineProperty){var q=p({}),r=typeof document=="undefined"||p(document.createElement("div"));if(!q||!r)var s=Object.defineProperty}if(!Object.defineProperty||s){var t="Property description must be an object: ",u="Object.defineProperty called on non-object: ",v="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(b,c,d){if(typeof b!="object"&&typeof b!="function"||b===null)throw new TypeError(u+b);if(typeof d!="object"&&typeof d!="function"||d===null)throw new TypeError(t+d);if(s)try{return s.call(Object,b,c,d)}catch(e){}if(i(d,"value"))if(n&&(l(b,c)||m(b,c))){var g=b.__proto__;b.__proto__=f,delete b[c],b[c]=d.value,b.__proto__=g}else b[c]=d.value;else{if(!n)throw new TypeError(v);i(d,"get")&&j(b,c,d.get),i(d,"set")&&k(b,c,d.set)}return b}}Object.defineProperties||(Object.defineProperties=function(b,c){for(var d in c)i(c,d)&&Object.defineProperty(b,d,c[d]);return b}),Object.seal||(Object.seal=function(b){return b}),Object.freeze||(Object.freeze=function(b){return b});try{Object.freeze(function(){})}catch(w){Object.freeze=function(b){return function(c){return typeof c=="function"?c:b(c)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(b){return b}),Object.isSealed||(Object.isSealed=function(b){return!1}),Object.isFrozen||(Object.isFrozen=function(b){return!1}),Object.isExtensible||(Object.isExtensible=function(b){if(Object(b)===b)throw new TypeError;var c="";while(i(b,c))c+="?";b[c]=!0;var d=i(b,c);return delete b[c],d});if(!Object.keys){var x=!0,y=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],z=y.length;for(var A in{toString:null})x=!1;Object.keys=function H(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var H=[];for(var b in a)i(a,b)&&H.push(b);if(x)for(var c=0,d=z;c<d;c++){var e=y[c];i(a,e)&&H.push(e)}return H}}if(!Date.prototype.toISOString||(new Date(-621987552e5)).toISOString().indexOf("-000001")===-1)Date.prototype.toISOString=function(){var b,c,d,e;if(!isFinite(this))throw new RangeError;b=[this.getUTCMonth()+1,this.getUTCDate(),this.getUTCHours(),this.getUTCMinutes(),this.getUTCSeconds()],e=this.getUTCFullYear(),e=(e<0?"-":e>9999?"+":"")+("00000"+Math.abs(e)).slice(0<=e&&e<=9999?-4:-6),c=b.length;while(c--)d=b[c],d<10&&(b[c]="0"+d);return e+"-"+b.slice(0,2).join("-")+"T"+b.slice(2).join(":")+"."+("000"+this.getUTCMilliseconds()).slice(-3)+"Z"};Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(b){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),Date.parse("+275760-09-13T00:00:00.000Z")!==864e13&&(Date=function(a){var b=function e(b,c,d,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j==1&&String(b)===b?new a(e.parse(b)):j>=7?new a(b,c,d,f,g,h,i):j>=6?new a(b,c,d,f,g,h):j>=5?new a(b,c,d,f,g):j>=4?new a(b,c,d,f):j>=3?new a(b,c,d):j>=2?new a(b,c):j>=1?new a(b):new a;return k.constructor=e,k}return a.apply(this,arguments)},c=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{3}))?)?(?:Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$");for(var d in a)b[d]=a[d];return b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function(d){var e=c.exec(d);if(e){e.shift();for(var f=1;f<7;f++)e[f]=+(e[f]||(f<3?1:0)),f==1&&e[f]--;var g=+e.pop(),h=+e.pop(),i=e.pop(),j=0;if(i){if(h>23||g>59)return NaN;j=(h*60+g)*6e4*(i=="+"?-1:1)}var k=+e[0];return 0<=k&&k<=99?(e[0]=k+400,a.UTC.apply(this,e)+j-126227808e5):a.UTC.apply(this,e)+j}return a.parse.apply(this,arguments)},b}(Date));var B="	\n\f\r   ᠎             　\u2028\u2029";if(!String.prototype.trim||B.trim()){B="["+B+"]";var C=new RegExp("^"+B+B+"*"),D=new RegExp(B+B+"*$");String.prototype.trim=function(){return String(this).replace(C,"").replace(D,"")}}var E=function(a){return a=+a,a!==a?a=0:a!==0&&a!==1/0&&a!==-Infinity&&(a=(a>0||-1)*Math.floor(Math.abs(a))),a},F="a"[0]!="a",G=function(a){if(a==null)throw new TypeError;return F&&typeof a=="string"&&a?a.split(""):Object(a)}}),define("ace/lib/dom",["require","exports","module"],function(a,b,c){"use strict";var d="http://www.w3.org/1999/xhtml";b.createElement=function(a,b){return document.createElementNS?document.createElementNS(b||d,a):document.createElement(a)},b.setText=function(a,b){a.innerText!==undefined&&(a.innerText=b),a.textContent!==undefined&&(a.textContent=b)},b.hasCssClass=function(a,b){var c=a.className.split(/\s+/g);return c.indexOf(b)!==-1},b.addCssClass=function(a,c){b.hasCssClass(a,c)||(a.className+=" "+c)},b.removeCssClass=function(a,b){var c=a.className.split(/\s+/g);for(;;){var d=c.indexOf(b);if(d==-1)break;c.splice(d,1)}a.className=c.join(" ")},b.toggleCssClass=function(a,b){var c=a.className.split(/\s+/g),d=!0;for(;;){var e=c.indexOf(b);if(e==-1)break;d=!1,c.splice(e,1)}return d&&c.push(b),a.className=c.join(" "),d},b.setCssClass=function(a,c,d){d?b.addCssClass(a,c):b.removeCssClass(a,c)},b.hasCssString=function(a,b){var c=0,d;b=b||document;if(b.createStyleSheet&&(d=b.styleSheets)){while(c<d.length)if(d[c++].owningElement.id===a)return!0}else if(d=b.getElementsByTagName("style"))while(c<d.length)if(d[c++].id===a)return!0;return!1},b.importCssString=function(c,e,f){f=f||document;if(e&&b.hasCssString(e,f))return null;var g;if(f.createStyleSheet)g=f.createStyleSheet(),g.cssText=c,e&&(g.owningElement.id=e);else{g=f.createElementNS?f.createElementNS(d,"style"):f.createElement("style"),g.appendChild(f.createTextNode(c)),e&&(g.id=e);var h=f.getElementsByTagName("head")[0]||f.documentElement;h.appendChild(g)}},b.importCssStylsheet=function(a,c){if(c.createStyleSheet)c.createStyleSheet(a);else{var d=b.createElement("link");d.rel="stylesheet",d.href=a;var e=c.getElementsByTagName("head")[0]||c.documentElement;e.appendChild(d)}},b.getInnerWidth=function(a){return parseInt(b.computedStyle(a,"paddingLeft"),10)+parseInt(b.computedStyle(a,"paddingRight"),10)+a.clientWidth},b.getInnerHeight=function(a){return parseInt(b.computedStyle(a,"paddingTop"),10)+parseInt(b.computedStyle(a,"paddingBottom"),10)+a.clientHeight},window.pageYOffset!==undefined?(b.getPageScrollTop=function(){return window.pageYOffset},b.getPageScrollLeft=function(){return window.pageXOffset}):(b.getPageScrollTop=function(){return document.body.scrollTop},b.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?b.computedStyle=function(a,b){return b?(window.getComputedStyle(a,"")||{})[b]||"":window.getComputedStyle(a,"")||{}}:b.computedStyle=function(a,b){return b?a.currentStyle[b]:a.currentStyle},b.scrollbarWidth=function(a){var c=b.createElement("p");c.style.width="100%",c.style.minWidth="0px",c.style.height="200px";var d=b.createElement("div"),e=d.style;e.position="absolute",e.left="-10000px",e.overflow="hidden",e.width="200px",e.minWidth="0px",e.height="150px",d.appendChild(c);var f=a.body||a.documentElement;f.appendChild(d);var g=c.offsetWidth;e.overflow="scroll";var h=c.offsetWidth;return g==h&&(h=d.clientWidth),f.removeChild(d),g-h},b.setInnerHtml=function(a,b){var c=a.cloneNode(!1);return c.innerHTML=b,a.parentNode.replaceChild(c,a),c},b.setInnerText=function(a,b){var c=a.ownerDocument;c.body&&"textContent"in c.body?a.textContent=b:a.innerText=b},b.getInnerText=function(a){var b=a.ownerDocument;return b.body&&"textContent"in b.body?a.textContent:a.innerText||a.textContent||""},b.getParentWindow=function(a){return a.defaultView||a.parentWindow}}),define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent","ace/lib/dom"],function(a,b,c){function g(a,b,c){var f=0;e.isOpera&&e.isMac?f=0|(b.metaKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.ctrlKey?8:0):f=0|(b.ctrlKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.metaKey?8:0);if(c in d.MODIFIER_KEYS){switch(d.MODIFIER_KEYS[c]){case"Alt":f=2;break;case"Shift":f=4;break;case"Ctrl":f=1;break;default:f=8}c=0}return f&8&&(c==91||c==93)&&(c=0),!!f||c in d.FUNCTION_KEYS||c in d.PRINTABLE_KEYS?a(b,f,c):!1}"use strict";var d=a("./keys"),e=a("./useragent"),f=a("./dom");b.addListener=function(a,b,c){if(a.addEventListener)return a.addEventListener(b,c,!1);if(a.attachEvent){var d=function(){c(window.event)};c._wrapper=d,a.attachEvent("on"+b,d)}},b.removeListener=function(a,b,c){if(a.removeEventListener)return a.removeEventListener(b,c,!1);a.detachEvent&&a.detachEvent("on"+b,c._wrapper||c)},b.stopEvent=function(a){return b.stopPropagation(a),b.preventDefault(a),!1},b.stopPropagation=function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},b.preventDefault=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},b.getDocumentX=function(a){return a.clientX?a.clientX+f.getPageScrollLeft():a.pageX},b.getDocumentY=function(a){return a.clientY?a.clientY+f.getPageScrollTop():a.pageY},b.getButton=function(a){return a.type=="dblclick"?0:a.type=="contextmenu"?2:a.preventDefault?a.button:{1:0,2:2,4:1}[a.button]},document.documentElement.setCapture?b.capture=function(a,c,d){function e(a){return c(a),b.stopPropagation(a)}function g(e){c(e),f||(f=!0,d(e)),b.removeListener(a,"mousemove",c),b.removeListener(a,"mouseup",g),b.removeListener(a,"losecapture",g),a.releaseCapture()}var f=!1;b.addListener(a,"mousemove",c),b.addListener(a,"mouseup",g),b.addListener(a,"losecapture",g),a.setCapture()}:b.capture=function(a,b,c){function d(a){b(a),a.stopPropagation()}function e(a){b&&b(a),c&&c(a),document.removeEventListener("mousemove",d,!0),document.removeEventListener("mouseup",e,!0),a.stopPropagation()}document.addEventListener("mousemove",d,!0),document.addEventListener("mouseup",e,!0)},b.addMouseWheelListener=function(a,c){var d=8,e=function(a){a.wheelDelta!==undefined?a.wheelDeltaX!==undefined?(a.wheelX=-a.wheelDeltaX/d,a.wheelY=-a.wheelDeltaY/d):(a.wheelX=0,a.wheelY=-a.wheelDelta/d):a.axis&&a.axis==a.HORIZONTAL_AXIS?(a.wheelX=(a.detail||0)*5,a.wheelY=0):(a.wheelX=0,a.wheelY=(a.detail||0)*5),c(a)};b.addListener(a,"DOMMouseScroll",e),b.addListener(a,"mousewheel",e)},b.addMultiMouseDownListener=function(a,c,d,f,g){var h=0,i,j,k=function(a){h+=1,h==1&&(i=a.clientX,j=a.clientY,setTimeout(function(){h=0},f||600));var e=b.getButton(a)==c;if(!e||Math.abs(a.clientX-i)>5||Math.abs(a.clientY-j)>5)h=0;h==d&&(h=0,g(a));if(e)return b.preventDefault(a)};b.addListener(a,"mousedown",k),e.isOldIE&&b.addListener(a,"dblclick",k)},b.addCommandKeyListener=function(a,c){var d=b.addListener;if(e.isOldGecko||e.isOpera){var f=null;d(a,"keydown",function(a){f=a.keyCode}),d(a,"keypress",function(a){return g(c,a,f)})}else{var h=null;d(a,"keydown",function(a){return h=a.keyIdentifier||a.keyCode,g(c,a,a.keyCode)})}};if(window.postMessage){var h=1;b.nextTick=function(a,c){c=c||window;var d="zero-timeout-message-"+h;b.addListener(c,"message",function e(f){f.data==d&&(b.stopPropagation(f),b.removeListener(c,"message",e),a())}),c.postMessage(d,"*")}}else b.nextTick=function(a,b){b=b||window,window.setTimeout(a,0)}}),define("ace/lib/keys",["require","exports","module","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./oop"),e=function(){var a={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,meta:8,command:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",188:",",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:'"'}};for(var b in a.FUNCTION_KEYS){var c=a.FUNCTION_KEYS[b].toUpperCase();a[c]=parseInt(b,10)}return d.mixin(a,a.MODIFIER_KEYS),d.mixin(a,a.PRINTABLE_KEYS),d.mixin(a,a.FUNCTION_KEYS),a}();d.mixin(b,e),b.keyCodeToString=function(a){return(e[a]||String.fromCharCode(a)).toLowerCase()}}),define("ace/lib/oop",["require","exports","module"],function(a,b,c){"use strict",b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/lib/useragent",["require","exports","module"],function(a,b,c){"use strict";var d=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),e=navigator.userAgent;b.isWin=d=="win",b.isMac=d=="mac",b.isLinux=d=="linux",b.isIE=navigator.appName=="Microsoft Internet Explorer"&&parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]),b.isOldIE=b.isIE&&b.isIE<9,b.isGecko=b.isMozilla=window.controllers&&window.navigator.product==="Gecko",b.isOldGecko=b.isGecko&&parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1],10)<4,b.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",b.isWebKit=parseFloat(e.split("WebKit/")[1])||undefined,b.isChrome=parseFloat(e.split(" Chrome/")[1])||undefined,b.isAIR=e.indexOf("AdobeAIR")>=0,b.isIPad=e.indexOf("iPad")>=0,b.isTouchPad=e.indexOf("TouchPad")>=0,b.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},b.getOS=function(){return b.isMac?b.OS.MAC:b.isLinux?b.OS.LINUX:b.OS.WINDOWS}}),define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/useragent"),g=a("./keyboard/textinput").TextInput,h=a("./mouse/mouse_handler").MouseHandler,i=a("./mouse/fold_handler").FoldHandler,j=a("./keyboard/keybinding").KeyBinding,k=a("./edit_session").EditSession,l=a("./search").Search,m=a("./range").Range,n=a("./lib/event_emitter").EventEmitter,o=a("./commands/command_manager").CommandManager,p=a("./commands/default_commands").commands,q=function(a,b){var c=a.getContainerElement();this.container=c,this.renderer=a,this.textInput=new g(a.getTextAreaContainer(),this),this.keyBinding=new j(this),f.isIPad||(this.$mouseHandler=new h(this),new i(this)),this.$blockScrolling=0,this.$search=(new l).set({wrap:!0}),this.commands=new o(f.isMac?"mac":"win",p),this.setSession(b||new k(""))};(function(){d.implement(this,n),this.setKeyboardHandler=function(a){this.keyBinding.setKeyboardHandler(a)},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(a){if(this.session==a)return;if(this.session){var b=this.session;this.session.removeEventListener("change",this.$onDocumentChange),this.session.removeEventListener("changeMode",this.$onChangeMode),this.session.removeEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.session.removeEventListener("changeTabSize",this.$onChangeTabSize),this.session.removeEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.session.removeEventListener("changeWrapMode",this.$onChangeWrapMode),this.session.removeEventListener("onChangeFold",this.$onChangeFold),this.session.removeEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.session.removeEventListener("changeBackMarker",this.$onChangeBackMarker),this.session.removeEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.session.removeEventListener("changeAnnotation",this.$onChangeAnnotation),this.session.removeEventListener("changeOverwrite",this.$onCursorChange),this.session.removeEventListener("changeScrollTop",this.$onScrollTopChange),this.session.removeEventListener("changeLeftTop",this.$onScrollLeftChange);var c=this.session.getSelection();c.removeEventListener("changeCursor",this.$onCursorChange),c.removeEventListener("changeSelection",this.$onSelectionChange)}this.session=a,this.$onDocumentChange=this.onDocumentChange.bind(this),a.addEventListener("change",this.$onDocumentChange),this.renderer.setSession(a),this.$onChangeMode=this.onChangeMode.bind(this),a.addEventListener("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),a.addEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.updateText.bind(this.renderer),a.addEventListener("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),a.addEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),a.addEventListener("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),a.addEventListener("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.addEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.addEventListener("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.addEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.addEventListener("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.addEventListener("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.addEventListener("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.addEventListener("changeScrollLeft",this.$onScrollLeftChange),this.selection=a.getSelection(),this.selection.addEventListener("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.addEventListener("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.$blockScrolling+=1,this.onCursorChange(),this.$blockScrolling-=1,this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull(),this._emit("changeSession",{session:a,oldSession:b})},this.getSession=function(){return this.session},this.getSelection=function(){return this.selection},this.resize=function(){this.renderer.onResize()},this.setTheme=function(a){this.renderer.setTheme(a)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(a){this.renderer.setStyle(a)},this.unsetStyle=function(a){this.renderer.unsetStyle(a)},this.setFontSize=function(a){this.container.style.fontSize=a,this.renderer.updateFontSize()},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var a=this;this.$highlightPending=!0,setTimeout(function(){a.$highlightPending=!1;var b=a.session.findMatchingBracket(a.getCursorPosition());if(b){var c=new m(b.row,b.column,b.row,b.column+1);a.session.$bracketHighlight=a.session.addMarker(c,"ace_bracket","text")}},10)},this.focus=function(){var a=this;setTimeout(function(){a.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(){this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus")},this.onBlur=function(){this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur")},this.onDocumentChange=function(a){var b=a.data,c=b.range,d;c.start.row==c.end.row&&b.action!="insertLines"&&b.action!="removeLines"?d=c.end.row:d=Infinity,this.renderer.updateLines(c.start.row,d),this._emit("change",a),this.onCursorChange()},this.onTokenizerUpdate=function(a){var b=a.data;this.renderer.updateLines(b.first,b.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.renderer.updateCursor(),this.$blockScrolling||this.renderer.scrollCursorIntoView(),this.renderer.moveTextAreaToCursor(this.textInput.getElement()),this.$highlightBrackets(),this.$updateHighlightActiveLine()},this.$updateHighlightActiveLine=function(){var a=this.getSession();a.$highlightLineMarker&&a.removeMarker(a.$highlightLineMarker),typeof this.$lastrow=="number"&&this.renderer.removeGutterDecoration(this.$lastrow,"ace_gutter_active_line"),a.$highlightLineMarker=null,this.$lastrow=null;if(this.getHighlightActiveLine()){var b=this.getCursorPosition(),c=this.session.getFoldLine(b.row);if(this.getSelectionStyle()!="line"||!this.selection.isMultiLine()){var d;c?d=new m(c.start.row,0,c.end.row+1,0):d=new m(b.row,0,b.row+1,0),a.$highlightLineMarker=a.addMarker(d,"ace_active_line","background")}this.renderer.addGutterDecoration(this.$lastrow=b.row,"ace_gutter_active_line")}},this.onSelectionChange=function(a){var b=this.getSession();b.$selectionMarker&&b.removeMarker(b.$selectionMarker),b.$selectionMarker=null;if(!this.selection.isEmpty()){var c=this.selection.getRange(),d=this.getSelectionStyle();b.$selectionMarker=b.addMarker(c,"ace_selection",d)}else this.$updateHighlightActiveLine();this.$highlightSelectedWord&&this.session.getMode().highlightSelection(this)},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.setBreakpoints(this.session.getBreakpoints())},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(){this.renderer.updateText()},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getCopyText=function(){var a="";return this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange())),this._emit("copy",a),a},this.onCut=function(){this.commands.exec("cut",this)},this.insert=function(a){var b=this.session,c=b.getMode(),d=this.getCursorPosition();if(this.getBehavioursEnabled()){var e=c.transformAction(b.getState(d.row),"insertion",this,b,a);e&&(a=e.text)}a=a.replace("	",this.session.getTabString());if(!this.selection.isEmpty())d=this.session.remove(this.getSelectionRange()),this.clearSelection();else if(this.session.getOverwrite()){var f=new m.fromPoints(d,d);f.end.column+=a.length,this.session.remove(f)}this.clearSelection();var g=d.column,h=b.getState(d.row),i=c.checkOutdent(h,b.getLine(d.row),a),j=b.getLine(d.row),k=c.getNextLineIndent(h,j.slice(0,d.column),b.getTabString()),l=b.insert(d,a);e&&e.selection&&(e.selection.length==2?this.selection.setSelectionRange(new m(d.row,g+e.selection[0],d.row,g+e.selection[1])):this.selection.setSelectionRange(new m(d.row+e.selection[0],e.selection[1],d.row+e.selection[2],e.selection[3])));var h=b.getState(d.row);if(b.getDocument().isNewLine(a)){this.moveCursorTo(d.row+1,0);var n=b.getTabSize(),o=Number.MAX_VALUE;for(var p=d.row+1;p<=l.row;++p){var q=0;j=b.getLine(p);for(var r=0;r<j.length;++r)if(j.charAt(r)=="	")q+=n;else{if(j.charAt(r)!=" ")break;q+=1}/[^\s]/.test(j)&&(o=Math.min(q,o))}for(var p=d.row+1;p<=l.row;++p){var s=o;j=b.getLine(p);for(var r=0;r<j.length&&s>0;++r)j.charAt(r)=="	"?s-=n:j.charAt(r)==" "&&(s-=1);b.remove(new m(p,0,p,r))}b.indentRows(d.row+1,l.row,k)}i&&c.autoOutdent(h,b,d.row)},this.onTextInput=function(a,b){b&&this._emit("paste",a),this.keyBinding.onTextInput(a,b)},this.onCommandKey=function(a,b,c){this.keyBinding.onCommandKey(a,b,c)},this.setOverwrite=function(a){this.session.setOverwrite(a)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(a){this.$mouseHandler.setScrollSpeed(a)},this.getScrollSpeed=function(){return this.$mouseHandler.getScrollSpeed()},this.setDragDelay=function(a){this.$mouseHandler.setDragDelay(a)},this.getDragDelay=function(){return this.$mouseHandler.getDragDelay()},this.$selectionStyle="line",this.setSelectionStyle=function(a){if(this.$selectionStyle==a)return;this.$selectionStyle=a,this.onSelectionChange(),this._emit("changeSelectionStyle",{data:a})},this.getSelectionStyle=function(){return this.$selectionStyle},this.$highlightActiveLine=!0,this.setHighlightActiveLine=function(a){if(this.$highlightActiveLine==a)return;this.$highlightActiveLine=a,this.$updateHighlightActiveLine()},this.getHighlightActiveLine=function(){return this.$highlightActiveLine},this.$highlightSelectedWord=!0,this.setHighlightSelectedWord=function(a){if(this.$highlightSelectedWord==a)return;this.$highlightSelectedWord=a,a?this.session.getMode().highlightSelection(this):this.session.getMode().clearSelectionHighlight(this)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(a){this.renderer.setAnimatedScroll(a)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(a){if(this.getShowInvisibles()==a)return;this.renderer.setShowInvisibles(a)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setShowPrintMargin=function(a){this.renderer.setShowPrintMargin(a)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(a){this.renderer.setPrintMarginColumn(a)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.$readOnly=!1,this.setReadOnly=function(a){this.$readOnly=a},this.getReadOnly=function(){return this.$readOnly},this.$modeBehaviours=!0,this.setBehavioursEnabled=function(a){this.$modeBehaviours=a},this.getBehavioursEnabled=function(){return this.$modeBehaviours},this.setShowFoldWidgets=function(a){var b=this.renderer.$gutterLayer;if(b.getShowFoldWidgets()==a)return;this.renderer.$gutterLayer.setShowFoldWidgets(a),this.$showFoldWidgets=a,this.renderer.updateFull()},this.getShowFoldWidgets=function(){return this.renderer.$gutterLayer.getShowFoldWidgets()},this.remove=function(a){this.selection.isEmpty()&&(a=="left"?this.selection.selectLeft():this.selection.selectRight());var b=this.getSelectionRange();if(this.getBehavioursEnabled()){var c=this.session,d=c.getState(b.start.row),e=c.getMode().transformAction(d,"deletion",this,c,b);e&&(b=e)}this.session.remove(b),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var a=this.getSelectionRange();a.start.column==a.end.column&&a.start.row==a.end.row&&(a.end.column=0,a.end.row++),this.session.remove(a),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var a=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(a)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var a=this.getCursorPosition(),b=a.column;if(b===0)return;var c=this.session.getLine(a.row),d,e;b<c.length?(d=c.charAt(b)+c.charAt(b-1),e=new m(a.row,b-1,a.row,b+1)):(d=c.charAt(b-1)+c.charAt(b-2),e=new m(a.row,b-2,a.row,b)),this.session.replace(e,d)},this.toLowerCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toLowerCase()),this.selection.setSelectionRange(a)},this.toUpperCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toUpperCase()),this.selection.setSelectionRange(a)},this.indent=function(){var a=this.session,b=this.getSelectionRange();if(!(b.start.row<b.end.row||b.start.column<b.end.column)){var d;if(this.session.getUseSoftTabs()){var f=a.getTabSize(),g=this.getCursorPosition(),h=a.documentToScreenColumn(g.row,g.column),i=f-h%f;d=e.stringRepeat(" ",i)}else d="	";return this.insert(d)}var c=this.$getSelectedRows();a.indentRows(c.first,c.last,"	")},this.blockOutdent=function(){var a=this.session.getSelection();this.session.outdentRows(a.getRange())},this.toggleCommentLines=function(){var a=this.session.getState(this.getCursorPosition().row),b=this.$getSelectedRows();this.session.getMode().toggleCommentLines(a,this.session,b.first,b.last)},this.removeLines=function(){var a=this.$getSelectedRows(),b;a.first===0||a.last+1<this.session.getLength()?b=new m(a.first,0,a.last+1,0):b=new m(a.first-1,this.session.getLine(a.first-1).length,a.last,this.session.getLine(a.last).length),this.session.remove(b),this.clearSelection()},this.moveLinesDown=function(){this.$moveLines(function(a,b){return this.session.moveLinesDown(a,b)})},this.moveLinesUp=function(){this.$moveLines(function(a,b){return this.session.moveLinesUp(a,b)})},this.moveText=function(a,b){return this.$readOnly?null:this.session.moveText(a,b)},this.copyLinesUp=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b),0})},this.copyLinesDown=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b)})},this.$moveLines=function(a){var b=this.$getSelectedRows(),c=this.selection;if(!c.isMultiLine())var d=c.getRange(),e=c.isBackwards();var f=a.call(this,b.first,b.last);d?(d.start.row+=f,d.end.row+=f,c.setSelectionRange(d,e)):(c.setSelectionAnchor(b.last+f+1,0),c.$moveSelection(function(){c.moveCursorTo(b.first+f,0)}))},this.$getSelectedRows=function(){var a=this.getSelectionRange().collapseRows();return{first:a.start.row,last:a.end.row}},this.onCompositionStart=function(a){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(a){this.renderer.setCompositionText(a)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(a){return a>=this.getFirstVisibleRow()&&a<=this.getLastVisibleRow()},this.isRowFullyVisible=function(a){return a>=this.renderer.getFirstFullyVisibleRow()&&a<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$getPageDownRow=function(){return this.renderer.getScrollBottomRow()},this.$getPageUpRow=function(){var a=this.renderer.getScrollTopRow(),b=this.renderer.getScrollBottomRow();return a-(b-a)},this.selectPageDown=function(){var a=this.$getPageDownRow()+Math.floor(this.$getVisibleRowCount()/2);this.scrollPageDown();var b=this.getSelection(),c=this.session.documentToScreenPosition(b.getSelectionLead()),d=this.session.screenToDocumentPosition(a,c.column);b.selectTo(d.row,d.column)},this.selectPageUp=function(){var a=this.renderer.getScrollTopRow()-this.renderer.getScrollBottomRow(),b=this.$getPageUpRow()+Math.round(a/2);this.scrollPageUp();var c=this.getSelection(),d=this.session.documentToScreenPosition(c.getSelectionLead()),e=this.session.screenToDocumentPosition(b,d.column);c.selectTo(e.row,e.column)},this.gotoPageDown=function(){var a=this.$getPageDownRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.gotoPageUp=function(){var a=this.$getPageUpRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.scrollPageDown=function(){this.scrollToRow(this.$getPageDownRow())},this.scrollPageUp=function(){this.renderer.scrollToRow(this.$getPageUpRow())},this.scrollToRow=function(a){this.renderer.scrollToRow(a)},this.scrollToLine=function(a,b){this.renderer.scrollToLine(a,b)},this.centerSelection=function(){var a=this.getSelectionRange(),b=Math.floor(a.start.row+(a.end.row-a.start.row)/2);this.renderer.scrollToLine(b,!0)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(a,b){this.selection.moveCursorTo(a,b)},this.moveCursorToPosition=function(a){this.selection.moveCursorToPosition(a)},this.jumpToMatching=function(){var a=this.getCursorPosition(),b=this.session.findMatchingBracket(a);b||(a.column+=1,b=this.session.findMatchingBracket(a)),b||(a.column-=2,b=this.session.findMatchingBracket(a)),b&&(this.clearSelection(),this.moveCursorTo(b.row,b.column))},this.gotoLine=function(a,b){this.selection.clearSelection(),this.session.unfold({row:a-1,column:b||0}),this.$blockScrolling+=1,this.moveCursorTo(a-1,b||0),this.$blockScrolling-=1,this.isRowFullyVisible(this.getCursorPosition().row)||this.scrollToLine(a,!0)},this.navigateTo=function(a,b){this.clearSelection(),this.moveCursorTo(a,b)},this.navigateUp=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(-a,0)},this.navigateDown=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(a,0)},this.navigateLeft=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().start;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().end;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(a,b){b&&this.$search.set(b);var c=this.$search.find(this.session),d=0;return c?(this.$tryReplace(c,a)&&(d=1),c!==null&&(this.selection.setSelectionRange(c),this.renderer.scrollSelectionIntoView(c.start,c.end)),d):d},this.replaceAll=function(a,b){b&&this.$search.set(b);var c=this.$search.findAll(this.session),d=0;if(!c.length)return d;var e=this.getSelectionRange();this.clearSelection(),this.selection.moveCursorTo(0,0),this.$blockScrolling+=1;for(var f=c.length-1;f>=0;--f)this.$tryReplace(c[f],a)&&d++;return this.selection.setSelectionRange(e),this.$blockScrolling-=1,d},this.$tryReplace=function(a,b){var c=this.session.getTextRange(a);return b=this.$search.replace(c,b),b!==null?(a.end=this.session.replace(a,b),a):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(a,b){this.clearSelection(),b=b||{},b.needle=a,this.$search.set(b),this.$find()},this.findNext=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!1),this.$search.set(a),this.$find()},this.findPrevious=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!0),this.$search.set(a),this.$find()},this.$find=function(a){this.selection.isEmpty()||this.$search.set({needle:this.session.getTextRange(this.getSelectionRange())}),typeof a!="undefined"&&this.$search.set({backwards:a});var b=this.$search.find(this.session);if(b){this.session.unfold(b),this.$blockScrolling+=1,this.selection.setSelectionRange(b),this.$blockScrolling-=1;if(this.getAnimatedScroll()){var c=this.getCursorPosition();this.isRowFullyVisible(c.row)||this.scrollToLine(c.row,!0)}else this.renderer.scrollSelectionIntoView(b.start,b.end)}},this.undo=function(){this.session.getUndoManager().undo()},this.redo=function(){this.session.getUndoManager().redo()},this.destroy=function(){this.renderer.destroy()}}).call(q.prototype),b.Editor=q}),define("ace/lib/lang",["require","exports","module"],function(a,b,c){"use strict",b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return(new Array(b+1)).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(var c=0,d=a.length;c<d;c++)a[c]&&typeof a[c]=="object"?b[c]=this.copyObject(a[c]):b[c]=a[c];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){return d.cancel(),b=setTimeout(c,a||0),d};return d.schedule=d,d.call=function(){return this.cancel(),a(),d},d.cancel=function(){return clearTimeout(b),b=null,d},d}}),define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("../lib/useragent"),f=a("../lib/dom"),g=function(a,b){function l(){try{c.select()}catch(a){}}function m(a){if(!i){var d=a||c.value;if(d){d.charCodeAt(d.length-1)==g.charCodeAt(0)?(d=d.slice(0,-1),d&&b.onTextInput(d,j)):b.onTextInput(d,j);if(!v())return!1}}i=!1,j=!1,c.value=g,l()}function v(){return document.activeElement===c}var c=f.createElement("textarea");e.isTouchPad&&c.setAttribute("x-palm-disable-auto-cap",!0),c.style.left="-10000px",c.style.position="fixed",a.insertBefore(c,a.firstChild);var g=String.fromCharCode(0);m();var h=!1,i=!1,j=!1,k="",n=function(a){setTimeout(function(){h||m(a.data)},0)},o=function(a){if(e.isOldIE&&c.value.charCodeAt(0)>128)return;setTimeout(function(){h||m()},0)},p=function(a){h=!0,b.onCompositionStart(),e.isGecko||setTimeout(q,0)},q=function(){if(!h)return;b.onCompositionUpdate(c.value)},r=function(a){h=!1,b.onCompositionEnd()},s=function(a){i=!0;var d=b.getCopyText();d?c.value=d:a.preventDefault(),l(),setTimeout(function(){m()},0)},t=function(a){i=!0;var d=b.getCopyText();d?(c.value=d,b.onCut()):a.preventDefault(),l(),setTimeout(function(){m()},0)};d.addCommandKeyListener(c,b.onCommandKey.bind(b));if(e.isOldIE){var u={13:1,27:1};d.addListener(c,"keyup",function(a){h&&(!c.value||u[a.keyCode])&&setTimeout(r,0);if((c.value.charCodeAt(0)|0)<129)return;h?q():p()})}"onpropertychange"in c&&!("oninput"in c)?d.addListener(c,"propertychange",o):d.addListener(c,"input",n),d.addListener(c,"paste",function(a){j=!0,a.clipboardData&&a.clipboardData.getData?(m(a.clipboardData.getData("text/plain")),a.preventDefault()):o()}),"onbeforecopy"in c&&typeof clipboardData!="undefined"?(d.addListener(c,"beforecopy",function(a){var c=b.getCopyText();c?clipboardData.setData("Text",c):a.preventDefault()}),d.addListener(a,"keydown",function(a){if(a.ctrlKey&&a.keyCode==88){var c=b.getCopyText();c&&(clipboardData.setData("Text",c),b.onCut()),d.preventDefault(a)}})):(d.addListener(c,"copy",s),d.addListener(c,"cut",t)),d.addListener(c,"compositionstart",p),e.isGecko&&d.addListener(c,"text",q),e.isWebKit&&d.addListener(c,"keyup",q),d.addListener(c,"compositionend",r),d.addListener(c,"blur",function(){b.onBlur()}),d.addListener(c,"focus",function(){b.onFocus(),l()}),this.focus=function(){b.onFocus(),l(),c.focus()},this.blur=function(){c.blur()},this.isFocused=v,this.getElement=function(){return c},this.onContextMenu=function(a,b){a&&(k||(k=c.style.cssText),c.style.cssText="position:fixed; z-index:1000;left:"+(a.x-2)+"px; top:"+(a.y-2)+"px;"),b&&(c.value="")},this.onContextMenuClose=function(){setTimeout(function(){k&&(c.style.cssText=k,k=""),m()},0)}};b.TextInput=g}),define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("./default_handlers").DefaultHandlers,f=a("./default_gutter_handler").GutterHandler,g=a("./mouse_event").MouseEvent,h=function(a){this.editor=a,new e(a),new f(a),d.addListener(a.container,"mousedown",function(b){return a.focus(),d.preventDefault(b)}),d.addListener(a.container,"selectstart",function(a){return d.preventDefault(a)});var b=a.renderer.getMouseEventTarget();d.addListener(b,"mousedown",this.onMouseEvent.bind(this,"mousedown")),d.addListener(b,"click",this.onMouseEvent.bind(this,"click")),d.addListener(b,"mousemove",this.onMouseMove.bind(this,"mousemove")),d.addMultiMouseDownListener(b,0,2,500,this.onMouseEvent.bind(this,"dblclick")),d.addMultiMouseDownListener(b,0,3,600,this.onMouseEvent.bind(this,"tripleclick")),d.addMultiMouseDownListener(b,0,4,600,this.onMouseEvent.bind(this,"quadclick")),d.addMouseWheelListener(a.container,this.onMouseWheel.bind(this,"mousewheel"));var c=a.renderer.$gutter;d.addListener(c,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),d.addListener(c,"click",this.onMouseEvent.bind(this,"gutterclick")),d.addListener(c,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),d.addListener(c,"mousemove",this.onMouseMove.bind(this,"gutter"))};(function(){this.$scrollSpeed=1,this.setScrollSpeed=function(a){this.$scrollSpeed=a},this.getScrollSpeed=function(){return this.$scrollSpeed},this.onMouseEvent=function(a,b){this.editor._emit(a,new g(b,this.editor))},this.$dragDelay=250,this.setDragDelay=function(a){this.$dragDelay=a},this.getDragDelay=function(){return this.$dragDelay},this.onMouseMove=function(a,b){var c=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!c||!c.length)return;this.editor._emit(a,new g(b,this.editor))},this.onMouseWheel=function(a,b){var c=new g(b,this.editor);c.speed=this.$scrollSpeed*2,c.wheelX=b.wheelX,c.wheelY=b.wheelY,this.editor._emit(a,c)}}).call(h.prototype),b.MouseHandler=h}),define("ace/mouse/default_handlers",["require","exports","module","ace/lib/event","ace/lib/dom","ace/lib/browser_focus"],function(a,b,c){function k(a){this.editor=a,this.$clickSelection=null,this.browserFocus=new f,a.setDefaultHandler("mousedown",this.onMouseDown.bind(this)),a.setDefaultHandler("dblclick",this.onDoubleClick.bind(this)),a.setDefaultHandler("tripleclick",this.onTripleClick.bind(this)),a.setDefaultHandler("quadclick",this.onQuadClick.bind(this)),a.setDefaultHandler("mousewheel",this.onScroll.bind(this))}function l(a,b,c,d){return Math.sqrt(Math.pow(c-a,2)+Math.pow(d-b,2))}"use strict";var d=a("../lib/event"),e=a("../lib/dom"),f=a("../lib/browser_focus").BrowserFocus,g=0,h=1,i=2,j=5;(function(){this.onMouseDown=function(a){function C(b){a.getShiftKey()?m.selection.selectToPosition(b):n.$clickSelection||(m.moveCursorToPosition(b),m.selection.clearSelection()),q=h}var b=a.inSelection(),c=a.pageX,f=a.pageY,k=a.getDocumentPosition(),m=this.editor,n=this,o=m.getSelectionRange(),p=o.isEmpty(),q=g;if(b&&(!this.browserFocus.isFocused()||(new Date).getTime()-this.browserFocus.lastFocus<20||!m.isFocused())){m.focus();return}var r=a.getButton();if(r!==0){p&&m.moveCursorToPosition(k),r==2&&(m.textInput.onContextMenu({x:a.clientX,y:a.clientY},p),d.capture(m.container,function(){},m.textInput.onContextMenuClose));return}b||C(k);var s=c,t=f,u=(new Date).getTime(),v,w,x,y=function(a){s=d.getDocumentX(a),t=d.getDocumentY(a)},z=function(a){clearInterval(F),q==g?C(k):q==i&&A(a),n.$clickSelection=null,q=g},A=function(a){e.removeCssClass(m.container,"ace_dragging"),m.session.removeMarker(x),m.$mouseHandler.$clickSelection||v||(m.moveCursorToPosition(k),m.selection.clearSelection());if(!v)return;if(w.contains(v.row,v.column)){v=null;return}m.clearSelection();if(a&&(a.ctrlKey||a.altKey))var b=m.session,c=b.insert(v,b.getTextRange(w));else var c=m.moveText(w,v);if(!c){v=null;return}m.selection.setSelectionRange(c)},B=function(){if(q==g){var a=l(c,f,s,t),b=(new Date).getTime();if(a>j){q=h;var d=m.renderer.screenToTextCoordinates(s,t);C(d)}else if(b-u>m.getDragDelay()){q=i,w=m.getSelectionRange();var k=m.getSelectionStyle();x=m.session.addMarker(w,"ace_selection",k),m.clearSelection(),e.addCssClass(m.container,"ace_dragging")}}q==i?E():q==h&&D()},D=function(){var a,b=m.renderer.screenToTextCoordinates(s,t);n.$clickSelection?n.$clickSelection.contains(b.row,b.column)?m.selection.setSelectionRange(n.$clickSelection):(n.$clickSelection.compare(b.row,b.column)==-1?a=n.$clickSelection.end:a=n.$clickSelection.start,m.selection.setSelectionAnchor(a.row,a.column),m.selection.selectToPosition(b)):m.selection.selectToPosition(b),m.renderer.scrollCursorIntoView()},E=function(){v=m.renderer.screenToTextCoordinates(s,t),m.moveCursorToPosition(v)};d.capture(m.container,y,z);var F=setInterval(B,20);return a.preventDefault()},this.onDoubleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectWord(),this.$clickSelection=c.getSelectionRange()},this.onTripleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectLine(),this.$clickSelection=c.getSelectionRange()},this.onQuadClick=function(a){var b=this.editor;b.selectAll(),this.$clickSelection=b.getSelectionRange()},this.onScroll=function(a){var b=this.editor;b.renderer.scrollBy(a.wheelX*a.speed,a.wheelY*a.speed);if(b.renderer.isScrollableBy(a.wheelX*a.speed,a.wheelY*a.speed))return a.preventDefault()}}).call(k.prototype),b.DefaultHandlers=k}),define("ace/lib/browser_focus",["require","exports","module","ace/lib/oop","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./oop"),e=a("./event"),f=a("./event_emitter").EventEmitter,g=function(a){a=a||window,this.lastFocus=(new Date).getTime(),this._isFocused=!0;var b=this;"onfocusin"in a.document?(e.addListener(a.document,"focusin",function(a){b._setFocused(!0)}),e.addListener(a.document,"focusout",function(a){b._setFocused(!!a.toElement)})):(e.addListener(a,"blur",function(a){b._setFocused(!1)}),e.addListener(a,"focus",function(a){b._setFocused(!0)}))};(function(){d.implement(this,f),this.isFocused=function(){return this._isFocused},this._setFocused=function(a){if(this._isFocused==a)return;a&&(this.lastFocus=(new Date).getTime()),this._isFocused=a,this._emit("changeFocus")}}).call(g.prototype),b.BrowserFocus=g}),define("ace/lib/event_emitter",["require","exports","module"],function(a,b,c){"use strict";var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{},this._defaultHandlers=this._defaultHandlers||{};var c=this._eventRegistry[a]||[],d=this._defaultHandlers[a];if(!c.length&&!d)return;b=b||{},b.type=a,b.stopPropagation||(b.stopPropagation=function(){this.propagationStopped=!0}),b.preventDefault||(b.preventDefault=function(){this.defaultPrevented=!0});for(var e=0;e<c.length;e++){c[e](b);if(b.propagationStopped)break}d&&!b.defaultPrevented&&d(b)},d.setDefaultHandler=function(a,b){this._defaultHandlers=this._defaultHandlers||{};if(this._defaultHandlers[a])throw new Error("The default handler for '"+a+"' is already set");this._defaultHandlers[a]=b},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)return;var d=c.indexOf(b);d!==-1&&c.splice(d,1)},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("ace/mouse/default_gutter_handler",["require","exports","module"],function(a,b,c){function d(a){a.setDefaultHandler("gutterclick",function(b){var c=b.getDocumentPosition().row,d=a.session.selection;d.moveCursorTo(c,0),d.selectLine()})}"use strict",b.GutterHandler=d}),define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=b.MouseEvent=function(a,b){this.domEvent=a,this.editor=b,this.pageX=d.getDocumentX(a),this.pageY=d.getDocumentY(a),this.clientX=a.clientX,this.clientY=a.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){d.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){d.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){if(this.$pos)return this.$pos;var a=d.getDocumentX(this.domEvent),b=d.getDocumentY(this.domEvent);return this.$pos=this.editor.renderer.screenToTextCoordinates(a,b),this.$pos},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var a=this.editor;if(a.getReadOnly())this.$inSelection=!1;else{var b=a.getSelectionRange();if(b.isEmpty())this.$inSelection=!1;else{var c=this.getDocumentPosition();this.$inSelection=b.contains(c.row,c.column)}}return this.$inSelection},this.getButton=function(){return d.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=function(){return this.domEvent.ctrlKey||this.domEvent.metaKey}}).call(e.prototype)}),define("ace/mouse/fold_handler",["require","exports","module"],function(a,b,c){function d(a){a.on("click",function(b){var c=b.getDocumentPosition(),d=a.session,e=d.getFoldAt(c.row,c.column,1);e&&(b.getAccelKey()?d.removeFold(e):d.expandFold(e),b.stop())}),a.on("gutterclick",function(b){if(b.domEvent.target.className.indexOf("ace_fold-widget")!=-1){var c=b.getDocumentPosition().row;a.session.onFoldWidgetClick(c,b.domEvent),b.stop()}})}"use strict",b.FoldHandler=d}),define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event","ace/commands/default_commands"],function(a,b,c){"use strict";var d=a("../lib/keys"),e=a("../lib/event");a("../commands/default_commands");var f=function(a){this.$editor=a,this.$data={},this.$handlers=[this]};(function(){this.setKeyboardHandler=function(a){if(this.$handlers[this.$handlers.length-1]==a)return;this.$data={},this.$handlers=a?[this,a]:[this]},this.addKeyboardHandler=function(a){this.removeKeyboardHandler(a),this.$handlers.push(a)},this.removeKeyboardHandler=function(a){var b=this.$handlers.indexOf(a);return b==-1?!1:(this.$handlers.splice(b,1),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.$callKeyboardHandlers=function(a,b,c,d){var f;for(var g=this.$handlers.length;g--;){f=this.$handlers[g].handleKeyboard(this.$data,a,b,c,d);if(f&&f.command)break}if(!f||!f.command)return!1;var h=!1,i=this.$editor.commands;return f.command!="null"?h=i.exec(f.command,this.$editor,f.args):h=!0,h&&d&&e.stopEvent(d),h},this.handleKeyboard=function(a,b,c){return{command:this.$editor.commands.findKeyCommand(b,c)}},this.onCommandKey=function(a,b,c){var e=d.keyCodeToString(c);this.$callKeyboardHandlers(b,e,c,a)},this.onTextInput=function(a,b){var c=!1;!b&&a.length==1&&(c=this.$callKeyboardHandlers(0,a)),c||this.$editor.commands.exec("insertstring",this.$editor,a)}}).call(f.prototype),b.KeyBinding=f}),define("ace/commands/default_commands",["require","exports","module","ace/lib/lang"],function(a,b,c){function e(a,b){return{win:a,mac:b}}"use strict";var d=a("../lib/lang");b.commands=[{name:"selectall",bindKey:e("Ctrl-A","Command-A"),exec:function(a){a.selectAll()},readOnly:!0},{name:"centerselection",bindKey:e(null,"Ctrl-L"),exec:function(a){a.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:e("Ctrl-L","Command-L"),exec:function(a){var b=parseInt(prompt("Enter line number:"),10);isNaN(b)||a.gotoLine(b)},readOnly:!0},{name:"fold",bindKey:e("Alt-L","Alt-L"),exec:function(a){a.session.toggleFold(!1)},readOnly:!0},{name:"unfold",bindKey:e("Alt-Shift-L","Alt-Shift-L"),exec:function(a){a.session.toggleFold(!0)},readOnly:!0},{name:"foldall",bindKey:e("Alt-0","Alt-0"),exec:function(a){a.session.foldAll()},readOnly:!0},{name:"unfoldall",bindKey:e("Alt-Shift-0","Alt-Shift-0"),exec:function(a){a.session.unfold()},readOnly:!0},{name:"findnext",bindKey:e("Ctrl-K","Command-G"),exec:function(a){a.findNext()},readOnly:!0},{name:"findprevious",bindKey:e("Ctrl-Shift-K","Command-Shift-G"),exec:function(a){a.findPrevious()},readOnly:!0},{name:"find",bindKey:e("Ctrl-F","Command-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());a.find(b)},readOnly:!0},{name:"overwrite",bindKey:e("Insert","Insert"),exec:function(a){a.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:e("Ctrl-Shift-Home|Alt-Shift-Up","Command-Shift-Up"),exec:function(a){a.getSelection().selectFileStart()},readOnly:!0},{name:"gotostart",bindKey:e("Ctrl-Home|Ctrl-Up","Command-Home|Command-Up"),exec:function(a){a.navigateFileStart()},readOnly:!0},{name:"selectup",bindKey:e("Shift-Up","Shift-Up"),exec:function(a){a.getSelection().selectUp()},multiSelectAction:"forEach",readOnly:!0},{name:"golineup",bindKey:e("Up","Up|Ctrl-P"),exec:function(a,b){a.navigateUp(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selecttoend",bindKey:e("Ctrl-Shift-End|Alt-Shift-Down","Command-Shift-Down"),exec:function(a){a.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoend",bindKey:e("Ctrl-End|Ctrl-Down","Command-End|Command-Down"),exec:function(a){a.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"selectdown",bindKey:e("Shift-Down","Shift-Down"),exec:function(a){a.getSelection().selectDown()},multiSelectAction:"forEach",readOnly:!0},{name:"golinedown",bindKey:e("Down","Down|Ctrl-N"),exec:function(a,b){a.navigateDown(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectwordleft",bindKey:e("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(a){a.getSelection().selectWordLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"gotowordleft",bindKey:e("Ctrl-Left","Option-Left"),exec:function(a){a.navigateWordLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"selecttolinestart",bindKey:e("Alt-Shift-Left","Command-Shift-Left"),exec:function(a){a.getSelection().selectLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"gotolinestart",bindKey:e("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(a){a.navigateLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"selectleft",bindKey:e("Shift-Left","Shift-Left"),exec:function(a){a.getSelection().selectLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoleft",bindKey:e("Left","Left|Ctrl-B"),exec:function(a,b){a.navigateLeft(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectwordright",bindKey:e("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(a){a.getSelection().selectWordRight()},multiSelectAction:"forEach",readOnly:!0},{name:"gotowordright",bindKey:e("Ctrl-Right","Option-Right"),exec:function(a){a.navigateWordRight()},multiSelectAction:"forEach",readOnly:!0},{name:"selecttolineend",bindKey:e("Alt-Shift-Right","Command-Shift-Right"),exec:function(a){a.getSelection().selectLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"gotolineend",bindKey:e("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(a){a.navigateLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"selectright",bindKey:e("Shift-Right","Shift-Right"),exec:function(a){a.getSelection().selectRight()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoright",bindKey:e("Right","Right|Ctrl-F"),exec:function(a,b){a.navigateRight(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectpagedown",bindKey:e("Shift-PageDown","Shift-PageDown"),exec:function(a){a.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:e(null,"PageDown"),exec:function(a){a.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:e("PageDown","Option-PageDown|Ctrl-V"),exec:function(a){a.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:e("Shift-PageUp","Shift-PageUp"),exec:function(a){a.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:e(null,"PageUp"),exec:function(a){a.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:e("PageUp","Option-PageUp"),exec:function(a){a.gotoPageUp()},readOnly:!0},{name:"selectlinestart",bindKey:e("Shift-Home","Shift-Home"),exec:function(a){a.getSelection().selectLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"selectlineend",bindKey:e("Shift-End","Shift-End"),exec:function(a){a.getSelection().selectLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"togglerecording",bindKey:e("Ctrl-Alt-E","Command-Option-E"),exec:function(a){a.commands.toggleRecording()},readOnly:!0},{name:"replaymacro",bindKey:e("Ctrl-Shift-E","Command-Shift-E"),exec:function(a){a.commands.replay(a)},readOnly:!0},{name:"jumptomatching",bindKey:e("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(a){a.jumpToMatching()},multiSelectAction:"forEach",readOnly:!0},{name:"cut",exec:function(a){var b=a.getSelectionRange();a._emit("cut",b),a.selection.isEmpty()||(a.session.remove(b),a.clearSelection())},multiSelectAction:"forEach"},{name:"removeline",bindKey:e("Ctrl-D","Command-D"),exec:function(a){a.removeLines()},multiSelectAction:"forEach"},{name:"togglecomment",bindKey:e("Ctrl-7","Command-7"),exec:function(a){a.toggleCommentLines()},multiSelectAction:"forEach"},{name:"replace",bindKey:e("Ctrl-R","Command-Option-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replace(c,{needle:b})}},{name:"replaceall",bindKey:e("Ctrl-Shift-R","Command-Shift-Option-F"),exec:function(a){var b=prompt("Find:");if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replaceAll(c,{needle:b})}},{name:"undo",bindKey:e("Ctrl-Z","Command-Z"),exec:function(a){a.undo()}},{name:"redo",bindKey:e("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(a){a.redo()}},{name:"copylinesup",bindKey:e("Ctrl-Alt-Up","Command-Option-Up"),exec:function(a){a.copyLinesUp()}},{name:"movelinesup",bindKey:e("Alt-Up","Option-Up"),exec:function(a){a.moveLinesUp()}},{name:"copylinesdown",bindKey:e("Ctrl-Alt-Down","Command-Option-Down"),exec:function(a){a.copyLinesDown()}},{name:"movelinesdown",bindKey:e("Alt-Down","Option-Down"),exec:function(a){a.moveLinesDown()}},{name:"del",bindKey:e("Delete","Delete|Ctrl-D"),exec:function(a){a.remove("right")},multiSelectAction:"forEach"},{name:"backspace",bindKey:e("Command-Backspace|Option-Backspace|Shift-Backspace|Backspace","Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(a){a.remove("left")},multiSelectAction:"forEach"},{name:"removetolinestart",bindKey:e("Alt-Backspace","Command-Backspace"),exec:function(a){a.removeToLineStart()},multiSelectAction:"forEach"},{name:"removetolineend",bindKey:e("Alt-Delete","Ctrl-K"),exec:function(a){a.removeToLineEnd()},multiSelectAction:"forEach"},{name:"removewordleft",bindKey:e("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(a){a.removeWordLeft()},multiSelectAction:"forEach"},{name:"removewordright",bindKey:e("Ctrl-Delete","Alt-Delete"),exec:function(a){a.removeWordRight()},multiSelectAction:"forEach"},{name:"outdent",bindKey:e("Shift-Tab","Shift-Tab"),exec:function(a){a.blockOutdent()},multiSelectAction:"forEach"},{name:"indent",bindKey:e("Tab","Tab"),exec:function(a){a.indent()},multiSelectAction:"forEach"},{name:"insertstring",exec:function(a,b){a.insert(b)},multiSelectAction:"forEach"},{name:"inserttext",exec:function(a,b){a.insert(d.stringRepeat(b.text||"",b.times||1))},multiSelectAction:"forEach"},{name:"splitline",bindKey:e(null,"Ctrl-O"),exec:function(a){a.splitLine()},multiSelectAction:"forEach"},{name:"transposeletters",bindKey:e("Ctrl-T","Ctrl-T"),exec:function(a){a.transposeLetters()},multiSelectAction:function(a){a.transposeSelections(1)}},{name:"touppercase",bindKey:e("Ctrl-U","Ctrl-U"),exec:function(a){a.toUpperCase()},multiSelectAction:"forEach"},{name:"tolowercase",bindKey:e("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(a){a.toLowerCase()},multiSelectAction:"forEach"}]}),define("ace/edit_session",["require","exports","module","ace/config","ace/lib/oop","ace/lib/lang","ace/lib/net","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/edit_session/folding","ace/edit_session/bracket_match"],function(a,b,c){"use strict";var d=a("./config"),e=a("./lib/oop"),f=a("./lib/lang"),g=a("./lib/net"),h=a("./lib/event_emitter").EventEmitter,i=a("./selection").Selection,j=a("./mode/text").Mode,k=a("./range").Range,l=a("./document").Document,m=a("./background_tokenizer").BackgroundTokenizer,n=function(a,b){this.$modified=!0,this.$breakpoints=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$rowCache=[],this.$wrapData=[],this.$foldData=[],this.$undoSelect=!0,this.$foldData.toString=function(){var a="";return this.forEach(function(b){a+="\n"+b.toString()}),a},a instanceof l?this.setDocument(a):this.setDocument(new l(a)),this.selection=new i(this),b?this.setMode(b):this.setMode(new j)};(function(){function q(a){return a<4352?!1:a>=4352&&a<=4447||a>=4515&&a<=4519||a>=4602&&a<=4607||a>=9001&&a<=9002||a>=11904&&a<=11929||a>=11931&&a<=12019||a>=12032&&a<=12245||a>=12272&&a<=12283||a>=12288&&a<=12350||a>=12353&&a<=12438||a>=12441&&a<=12543||a>=12549&&a<=12589||a>=12593&&a<=12686||a>=12688&&a<=12730||a>=12736&&a<=12771||a>=12784&&a<=12830||a>=12832&&a<=12871||a>=12880&&a<=13054||a>=13056&&a<=19903||a>=19968&&a<=42124||a>=42128&&a<=42182||a>=43360&&a<=43388||a>=44032&&a<=55203||a>=55216&&a<=55238||a>=55243&&a<=55291||a>=63744&&a<=64255||a>=65040&&a<=65049||a>=65072&&a<=65106||a>=65108&&a<=65126||a>=65128&&a<=65131||a>=65281&&a<=65376||a>=65504&&a<=65510}e.implement(this,h),this.setDocument=function(a){if(this.doc)throw new Error("Document is already set");this.doc=a,a.on("change",this.onChange.bind(this)),this.on("changeFold",this.onChangeFold.bind(this)),this.bgTokenizer&&(this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0))},this.getDocument=function(){return this.doc},this.$resetRowCache=function(a){if(a==0){this.$rowCache=[];return}var b=this.$rowCache;for(var c=0;c<b.length;c++)if(b[c].docRow>=a){b.splice(c,b.length);return}},this.onChangeFold=function(a){var b=a.data;this.$resetRowCache(b.start.row)},this.onChange=function(a){var b=a.data;this.$modified=!0,this.$resetRowCache(b.range.start.row);var c=this.$updateInternalDataOnChange(a);!this.$fromUndo&&this.$undoManager&&!b.ignore&&(this.$deltasDoc.push(b),c&&c.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:c}),this.$informUndoManager.schedule()),this.bgTokenizer.start(b.range.start.row),this._emit("change",a)},this.setValue=function(a){this.doc.setValue(a),this.selection.moveCursorTo(0,0),this.selection.clearSelection(),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(a){return this.bgTokenizer.getState(a)},this.getTokens=function(a,b){return this.bgTokenizer.getTokens(a,b)},this.getTokenAt=function(a,b){var c=this.bgTokenizer.getTokens(a,a)[0].tokens,d,e=0;if(b==null)f=c.length-1,e=this.getLine(a).length;else for(var f=0;f<c.length;f++){e+=c[f].value.length;if(e>=b)break}return d=c[f],d?(d.index=f,d.start=e-d.value.length,d):null},this.setUndoManager=function(a){this.$undoManager=a,this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(a){var b=this;this.$syncInformUndoManager=function(){b.$informUndoManager.cancel(),b.$deltasFold.length&&(b.$deltas.push({group:"fold",deltas:b.$deltasFold}),b.$deltasFold=[]),b.$deltasDoc.length&&(b.$deltas.push({group:"doc",deltas:b.$deltasDoc}),b.$deltasDoc=[]),b.$deltas.length>0&&a.execute({action:"aceupdate",args:[b.$deltas,b]}),b.$deltas=[]},this.$informUndoManager=f.deferredCall(this.$syncInformUndoManager)}},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?f.stringRepeat(" ",this.getTabSize()):"	"},this.$useSoftTabs=!0,this.setUseSoftTabs=function(a){if(this.$useSoftTabs===a)return;this.$useSoftTabs=a},this.getUseSoftTabs=function(){return this.$useSoftTabs},this.$tabSize=4,this.setTabSize=function(a){if(isNaN(a)||this.$tabSize===a)return;this.$modified=!0,this.$tabSize=a,this._emit("changeTabSize")},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(a){return this.$useSoftTabs&&a.column%this.$tabSize==0},this.$overwrite=!1,this.setOverwrite=function(a){if(this.$overwrite==a)return;this.$overwrite=a,this._emit("changeOverwrite")},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(a){this.$breakpoints=[];for(var b=0;b<a.length;b++)this.$breakpoints[a[b]]=!0;this._emit("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._emit("changeBreakpoint",{})},this.setBreakpoint=function(a){this.$breakpoints[a]=!0,this._emit("changeBreakpoint",{})},this.clearBreakpoint=function(a){delete this.$breakpoints[a],this._emit("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.addMarker=function(a,b,c,d){var e=this.$markerId++,f={range:a,type:c||"line",renderer:typeof c=="function"?c:null,clazz:b,inFront:!!d};return d?(this.$frontMarkers[e]=f,this._emit("changeFrontMarker")):(this.$backMarkers[e]=f,this._emit("changeBackMarker")),e},this.removeMarker=function(a){var b=this.$frontMarkers[a]||this.$backMarkers[a];if(!b)return;var c=b.inFront?this.$frontMarkers:this.$backMarkers;b&&(delete c[a],this._emit(b.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(a){return a?this.$frontMarkers:this.$backMarkers},this.setAnnotations=function(a){this.$annotations={};for(var b=0;b<a.length;b++){var c=a[b],d=c.row;this.$annotations[d]?this.$annotations[d].push(c):this.$annotations[d]=[c]}this._emit("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||{}},this.clearAnnotations=function(){this.$annotations={},this._emit("changeAnnotation",{})},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getWordRange=function(a,b){var c=this.getLine(a),d=!1;b>0&&(d=!!c.charAt(b-1).match(this.tokenRe)),d||(d=!!c.charAt(b).match(this.tokenRe));var e=d?this.tokenRe:this.nonTokenRe,f=b;if(f>0){do f--;while(f>=0&&c.charAt(f).match(e));f++}var g=b;while(g<c.length&&c.charAt(g).match(e))g++;return new k(a,f,a,g)},this.getAWordRange=function(a,b){var c=this.getWordRange(a,b),d=this.getLine(c.end.row);while(d.charAt(c.end.column).match(/[ \t]/))c.end.column+=1;return c},this.setNewLineMode=function(a){this.doc.setNewLineMode(a)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.$useWorker=!0,this.setUseWorker=function(a){if(this.$useWorker==a)return;this.$useWorker=a,this.$stopWorker(),a&&this.$startWorker()},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(a){var b=a.data;this.bgTokenizer.start(b.first),this._emit("tokenizerUpdate",a)},this.$modes={},this._loadMode=function(b,c){function i(a){if(e.$modes[b])return c(e.$modes[b]);e.$modes[b]=new a.Mode,e._emit("loadmode",{name:b,mode:e.$modes[b]}),c(e.$modes[b])}function j(a){if(!d.get("packaged"))return a();var c=b.split("/").pop(),e=d.get("modePath")+"/mode-"+c+d.get("suffix");g.loadScript(e,a)}if(this.$modes[b])return c(this.$modes[b]);var e=this,f;try{f=a(b)}catch(h){}if(f)return i(f);j(function(){a([b],i)})},this.$mode=null,this.$origMode=null,this.setMode=function(a){this.$origMode=a;if(typeof a=="string"){var b=this;this._loadMode(a,function(c){if(b.$origMode!==a)return;b.setMode(c)});return}if(this.$mode===a)return;this.$mode=a,this.$stopWorker(),this.$useWorker&&this.$startWorker();var c=a.getTokenizer();if(c.addEventListener!==undefined){var d=this.onReloadTokenizer.bind(this);c.addEventListener("update",d)}if(!this.bgTokenizer){this.bgTokenizer=new m(c);var b=this;this.bgTokenizer.addEventListener("update",function(a){b._emit("tokenizerUpdate",a)})}else this.bgTokenizer.setTokenizer(c);this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0),this.tokenRe=a.tokenRe,this.nonTokenRe=a.nonTokenRe,this.$setFolding(a.foldingRules),this._emit("changeMode")},this.$stopWorker=function(){this.$worker&&this.$worker.terminate(),this.$worker=null},this.$startWorker=function(){if(typeof Worker!="undefined"&&!a.noWorker)try{this.$worker=this.$mode.createWorker(this)}catch(b){console.log("Could not load worker"),console.log(b),this.$worker=null}else this.$worker=null},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(a){a=Math.round(Math.max(0,a));if(this.$scrollTop===a)return;this.$scrollTop=a,this._emit("changeScrollTop",a)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(a){a=Math.round(Math.max(0,a));if(this.$scrollLeft===a)return;this.$scrollLeft=a,this._emit("changeScrollLeft",a)},this.getScrollLeft=function(){return this.$scrollLeft},this.getWidth=function(){return this.$computeWidth(),this.width},this.getScreenWidth=function(){return this.$computeWidth(),this.screenWidth},this.$computeWidth=function(a){if(this.$modified||a){this.$modified=!1;var b=this.doc.getAllLines(),c=0,d=0;for(var e=0;e<b.length;e++){var f=this.getFoldLine(e),g,h;g=b[e];if(f){var i=f.range.end;g=this.getFoldDisplayLine(f),e=i.row}h=g.length,c=Math.max(c,h),this.$useWrapMode||(d=Math.max(d,this.$getStringScreenWidth(g)[0]))}this.width=c,this.$useWrapMode?this.screenWidth=this.$wrapLimit:this.screenWidth=d}},this.getLine=function(a){return this.doc.getLine(a)},this.getLines=function(a,b){return this.doc.getLines(a,b)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(a){return this.doc.getTextRange(a)},this.insert=function(a,b){return this.doc.insert(a,b)},this.remove=function(a){return this.doc.remove(a)},this.undoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=a.length-1;d!=-1;d--){var e=a[d];e.group=="doc"?(this.doc.revertDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!0,c)):e.deltas.forEach(function(a){this.addFolds(a.folds)},this)}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.redoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=0;d<a.length;d++){var e=a[d];e.group=="doc"&&(this.doc.applyDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!1,c))}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.setUndoSelect=function(a){this.$undoSelect=a},this.$getUndoSelection=function(a,b,c){function d(a){var c=a.action=="insertText"||a.action=="insertLines";return b?!c:c}var e=a[0],f,g,h=!1;d(e)?(f=e.range.clone(),h=!0):(f=k.fromPoints(e.range.start,e.range.start),h=!1);for(var i=1;i<a.length;i++)e=a[i],d(e)?(g=e.range.start,f.compare(g.row,g.column)==-1&&f.setStart(e.range.start),g=e.range.end,f.compare(g.row,g.column)==1&&f.setEnd(e.range.end),h=!0):(g=e.range.start,f.compare(g.row,g.column)==-1&&(f=k.fromPoints(e.range.start,e.range.start)),h=!1);if(c!=null){var j=c.compareRange(f);j==1?f.setStart(c.start):j==-1&&f.setEnd(c.end)}return f},this.replace=function(a,b){return this.doc.replace(a,b)},this.moveText=function(a,b){var c=this.getTextRange(a);this.remove(a);var d=b.row,e=b.column;!a.isMultiLine()&&a.start.row==d&&a.end.column<e&&(e-=c.length);if(a.isMultiLine()&&a.end.row<d){var f=this.doc.$split(c);d-=f.length-1}var g=d+a.end.row-a.start.row,h=a.isMultiLine()?a.end.column:e+a.end.column-a.start.column,i=new k(d,e,g,h);return this.insert(i.start,c),i},this.indentRows=function(a,b,c){c=c.replace(/\t/g,this.getTabString());for(var d=a;d<=b;d++)this.insert({row:d,column:0},c)},this.outdentRows=function(a){var b=a.collapseRows(),c=new k(0,0,0,0),d=this.getTabSize();for(var e=b.start.row;e<=b.end.row;++e){var f=this.getLine(e);c.start.row=e,c.end.row=e;for(var g=0;g<d;++g)if(f.charAt(g)!=" ")break;g<d&&f.charAt(g)=="	"?(c.start.column=g,c.end.column=g+1):(c.start.column=0,c.end.column=g),this.remove(c)}},this.moveLinesUp=function(a,b){if(a<=0)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a-1,c),-1},this.moveLinesDown=function(a,b){if(b>=this.doc.getLength()-1)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a+1,c),1},this.duplicateLines=function(a,b){var a=this.$clipRowToDocument(a),b=this.$clipRowToDocument(b),c=this.getLines(a,b);this.doc.insertLines(a,c);var d=b-a+1;return d},this.$clipRowToDocument=function(a){return Math.max(0,Math.min(a,this.doc.getLength()-1))},this.$clipColumnToRow=function(a,b){return b<0?0:Math.min(this.doc.getLine(a).length,b)},this.$clipPositionToDocument=function(a,b){b=Math.max(0,b);if(a<0)a=0,b=0;else{var c=this.doc.getLength();a>=c?(a=c-1,b=this.doc.getLine(c-1).length):b=Math.min(this.doc.getLine(a).length,b)}return{row:a,column:b}},this.$clipRangeToDocument=function(a){a.start.row<0?(a.start.row=0,a.start.column=0):a.start.column=this.$clipColumnToRow(a.start.row,a.start.column);var b=this.doc.getLength()-1;return a.end.row>b?(a.end.row=b,a.end.column=this.doc.getLine(b).length):a.end.column=this.$clipColumnToRow(a.end.row,a.end.column),a},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(a){if(a!=this.$useWrapMode){this.$useWrapMode=a,this.$modified=!0,this.$resetRowCache(0);if(a){var b=this.getLength();this.$wrapData=[];for(var c=0;c<b;c++)this.$wrapData.push([]);this.$updateWrapData(0,b-1)}this._emit("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(a,b){if(this.$wrapLimitRange.min!==a||this.$wrapLimitRange.max!==b)this.$wrapLimitRange.min=a,this.$wrapLimitRange.max=b,this.$modified=!0,this._emit("changeWrapMode")},this.adjustWrapLimit=function(a){var b=this.$constrainWrapLimit(a);return b!=this.$wrapLimit&&b>0?(this.$wrapLimit=b,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._emit("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(a){var b=this.$wrapLimitRange.min;b&&(a=Math.max(b,a));var c=this.$wrapLimitRange.max;return c&&(a=Math.min(c,a)),Math.max(1,a)},this.getWrapLimit=function(){return this.$wrapLimit},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(a){var b=this.$useWrapMode,c,d=a.data.action,e=a.data.range.start.row,f=a.data.range.end.row,g=a.data.range.start,h=a.data.range.end,i=null;d.indexOf("Lines")!=-1?(d=="insertLines"?f=e+a.data.lines.length:f=e,c=a.data.lines?a.data.lines.length:f-e):c=f-e;if(c!=0)if(d.indexOf("remove")!=-1){b&&this.$wrapData.splice(e,c);var j=this.$foldData;i=this.getFoldsInRange(a.data.range),this.removeFolds(i);var k=this.getFoldLine(h.row),l=0;if(k){k.addRemoveChars(h.row,h.column,g.column-h.column),k.shiftRow(-c);var m=this.getFoldLine(e);m&&m!==k&&(m.merge(k),k=m),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=h.row&&k.shiftRow(-c)}f=e}else{var n;if(b){n=[e,0];for(var o=0;o<c;o++)n.push([]);this.$wrapData.splice.apply(this.$wrapData,n)}var j=this.$foldData,k=this.getFoldLine(e),l=0;if(k){var p=k.range.compareInside(g.row,g.column);p==0?(k=k.split(g.row,g.column),k.shiftRow(c),k.addRemoveChars(f,0,h.column-g.column)):p==-1&&(k.addRemoveChars(e,0,h.column-g.column),k.shiftRow(c)),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=e&&k.shiftRow(c)}}else{c=Math.abs(a.data.range.start.column-a.data.range.end.column),d.indexOf("remove")!=-1&&(i=this.getFoldsInRange(a.data.range),this.removeFolds(i),c=-c);var k=this.getFoldLine(e);k&&k.addRemoveChars(e,g.column,c)}return b&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),b&&this.$updateWrapData(e,f),i},this.$updateWrapData=function(a,b){var c=this.doc.getAllLines(),d=this.getTabSize(),e=this.$wrapData,g=this.$wrapLimit,h,k,l=a;b=Math.min(b,c.length-1);while(l<=b){k=this.getFoldLine(l,k);if(!k)h=this.$getDisplayTokens(f.stringTrimRight(c[l])),e[l]=this.$computeWrapSplits(h,g,d),l++;else{h=[],k.walk(function(a,b,d,e){var f;if(a){f=this.$getDisplayTokens(a,h.length),f[0]=i;for(var g=1;g<f.length;g++)f[g]=j}else f=this.$getDisplayTokens(c[b].substring(e,d),h.length);h=h.concat(f)}.bind(this),k.end.row,c[k.end.row].length+1);while(h.length!=0&&h[h.length-1]>=n)h.pop();e[k.start.row]=this.$computeWrapSplits(h,g,d),l=k.end.row+1}}};var b=1,c=2,i=3,j=4,l=9,n=10,o=11,p=12;this.$computeWrapSplits=function(a,b){function g(b){var d=a.slice(e,b),g=d.length;d.join("").replace(/12/g,function(){g-=1}).replace(/2/g,function(){g-=1}),f+=g,c.push(f),e=b}if(a.length==0)return[];var c=[],d=a.length,e=0,f=0;while(d-e>b){var h=e+b;if(a[h]>=n){while(a[h]>=n)h++;g(h);continue}if(a[h]==i||a[h]==j){for(h;h!=e-1;h--)if(a[h]==i)break;if(h>e){g(h);continue}h=e+b;for(h;h<a.length;h++)if(a[h]!=j)break;if(h==a.length)break;g(h);continue}var k=Math.max(h-10,e-1);while(h>k&&a[h]<i)h--;while(h>k&&a[h]==l)h--;if(h>k){g(++h);continue}h=e+b,g(h)}return c},this.$getDisplayTokens=function(a,d){var e=[],f;d=d||0;for(var g=0;g<a.length;g++){var h=a.charCodeAt(g);if(h==9){f=this.getScreenTabSize(e.length+d),e.push(o);for(var i=1;i<f;i++)e.push(p)}else h==32?e.push(n):h>39&&h<48||h>57&&h<64?e.push(l):h>=4352&&q(h)?e.push(b,c):e.push(b)}return e},this.$getStringScreenWidth=function(a,b,c){if(b==0)return[0,0];b==null&&(b=c+a.length*Math.max(this.getTabSize(),2)),c=c||0;var d,e;for(e=0;e<a.length;e++){d=a.charCodeAt(e),d==9?c+=this.getScreenTabSize(c):d>=4352&&q(d)?c+=2:c+=1;if(c>b)break}return[c,e]},this.getRowLength=function(a){return!this.$useWrapMode||!this.$wrapData[a]?1:this.$wrapData[a].length+1},this.getRowHeight=function(a,b){return this.getRowLength(b)*a.lineHeight},this.getScreenLastRowColumn=function(a){var b=this.screenToDocumentPosition(a,Number.MAX_VALUE);return this.documentToScreenColumn(b.row,b.column)},this.getDocumentLastRowColumn=function(a,b){var c=this.documentToScreenRow(a,b);return this.getScreenLastRowColumn(c)},this.getDocumentLastRowColumnPosition=function(a,b){var c=this.documentToScreenRow(a,b);return this.screenToDocumentPosition(c,Number.MAX_VALUE/10)},this.getRowSplitData=function(a){return this.$useWrapMode?this.$wrapData[a]:undefined},this.getScreenTabSize=function(a){return this.$tabSize-a%this.$tabSize},this.screenToDocumentRow=function(a,b){return this.screenToDocumentPosition(a,b).row},this.screenToDocumentColumn=function(a,b){return this.screenToDocumentPosition(a,b).column},this.screenToDocumentPosition=function(a,b){if(a<0)return{row:0,column:0};var c,d=0,e=0,f,g=0,h=0,i=this.$rowCache;for(var j=0;j<i.length;j++){if(!(i[j].screenRow<a))break;g=i[j].screenRow,d=i[j].docRow}var k=!i.length||j==i.length,l=this.getLength()-1,m=this.getNextFoldLine(d),n=m?m.start.row:Infinity;while(g<=a){h=this.getRowLength(d);if(g+h-1>=a||d>=l)break;g+=h,d++,d>n&&(d=m.end.row+1,m=this.getNextFoldLine(d,m),n=m?m.start.row:Infinity),k&&i.push({docRow:d,screenRow:g})}if(m&&m.start.row<=d)c=this.getFoldDisplayLine(m),d=m.start.row;else{if(g+h<=a||d>l)return{row:l,column:this.getLine(l).length};c=this.getLine(d),m=null}if(this.$useWrapMode){var o=this.$wrapData[d];o&&(f=o[a-g],a>g&&o.length&&(e=o[a-g-1]||o[o.length-1],c=c.substring(e)))}return e+=this.$getStringScreenWidth(c,b)[1],this.$useWrapMode&&e>=f&&(e=f-1),m?m.idxToPosition(e):{row:d,column:e}},this.documentToScreenPosition=function(a,b){if(typeof b=="undefined")var c=this.$clipPositionToDocument(a.row,a.column);else c=this.$clipPositionToDocument(a,b);a=c.row,b=c.column;var d;if(this.$useWrapMode){d=this.$wrapData;if(a>d.length-1)return{row:this.getScreenLength(),column:d.length==0?0:d[d.length-1].length-1}}var e=0,f=null,g=null;g=this.getFoldAt(a,b,1),g&&(a=g.start.row,b=g.start.column);var h,i=0,j=this.$rowCache;for(var k=0;k<j.length;k++){if(!(j[k].docRow<a))break;e=j[k].screenRow,i=j[k].docRow}var l=!j.length||k==j.length,m=this.getNextFoldLine(i),n=m?m.start.row:Infinity;while(i<a){if(i>=n){h=m.end.row+1;if(h>a)break;m=this.getNextFoldLine(h,m),n=m?m.start.row:Infinity}else h=i+1;e+=this.getRowLength(i),i=h,l&&j.push({docRow:i,screenRow:e})}var o="";m&&i>=n?(o=this.getFoldDisplayLine(m,a,b),f=m.start.row):(o=this.getLine(a).substring(0,b),f=a);if(this.$useWrapMode){var p=d[f],q=0;while(o.length>=p[q])e++,q++;o=o.substring(p[q-1]||0,o.length)}return{row:e,column:this.$getStringScreenWidth(o)[0]}},this.documentToScreenColumn=function(a,b){return this.documentToScreenPosition(a,b).column},this.documentToScreenRow=function(a,b){return this.documentToScreenPosition(a,b).row},this.getScreenLength=function(){var a=0,b=null;if(!this.$useWrapMode){a=this.getLength();var c=this.$foldData;for(var d=0;d<c.length;d++)b=c[d],a-=b.end.row-b.start.row}else{var e=this.$wrapData.length,f=0,d=0,b=this.$foldData[d++],g=b?b.start.row:Infinity;while(f<e)a+=this.$wrapData[f].length+1,f++,f>g&&(f=b.end.row+1,b=this.$foldData[d++],g=b?b.start.row:Infinity)}return a}}).call(n.prototype),a("./edit_session/folding").Folding.call(n.prototype),a("./edit_session/bracket_match").BracketMatch.call(n.prototype),b.EditSession=n}),define("ace/config",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return a.replace(/-(.)/g,function(a,b){return b.toUpperCase()})}"no use strict";var d=a("./lib/lang"),e=function(){return this}(),f={packaged:!1,workerPath:"",modePath:"",themePath:"",suffix:".js"};b.get=function(a){if(!f.hasOwnProperty(a))throw new Error("Unknown confik key: "+a);return f[a]},b.set=function(a,b){if(!f.hasOwnProperty(a))throw new Error("Unknown confik key: "+a);f[a]=b},b.all=function(){return d.copyObject(f)},b.init=function(){f.packaged=a.packaged||c.packaged||e.define&&define.packaged;if(!e.document)return"";var d={},h="",i,j=document.getElementsByTagName("script");for(var k=0;k<j.length;k++){var l=j[k],m=l.src||l.getAttribute("src");if(!m)continue;var n=l.attributes;for(var o=0,p=n.length;o<p;o++){var q=n[o];q.name.indexOf("data-ace-")===0&&(d[g(q.name.replace(/^data-ace-/,""))]=q.value)}var r=m.match(/^(?:(.*\/)ace\.js|(.*\/)ace((-uncompressed)?(-noconflict)?\.js))(?:\?|$)/);r&&(h=r[1]||r[2],i=r[3])}h&&(d.base=d.base||h,d.packaged=!0),d.suffix=d.suffix||i,d.workerPath=d.workerPath||d.base,d.modePath=d.modePath||d.base,d.themePath=d.themePath||d.base,delete d.base;for(var s in d)typeof d[s]!="undefined"&&b.set(s,d[s])}}),define("ace/lib/net",["require","exports","module"],function(a,b,c){"use strict",b.get=function(a,c){var d=b.createXhr();d.open("GET",a,!0),d.onreadystatechange=function(a){d.readyState===4&&c(d.responseText)},d.send(null)};var d=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];b.createXhr=function(){var a,b,c;if(typeof XMLHttpRequest!="undefined")return new XMLHttpRequest;for(b=0;b<3;b++){c=d[b];try{a=new ActiveXObject(c)}catch(e){}if(a){d=[c];break}}if(!a)throw new Error("createXhr(): XMLHttpRequest not available");return a},b.loadScript=function(a,b){var c=document.getElementsByTagName("head")[0],d=document.createElement("script");d.src=a,c.appendChild(d),d.onload=b}}),define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/event_emitter").EventEmitter,g=a("./range").Range,h=function(a){this.session=a,this.doc=a.getDocument(),this.clearSelection(),this.selectionLead=this.doc.createAnchor(0,0),this.selectionAnchor=this.doc.createAnchor(0,0);var b=this;this.selectionLead.on("change",function(a){b._emit("changeCursor"),b.$isEmpty||b._emit("changeSelection"),!b.$keepDesiredColumnOnChange&&a.old.column!=a.value.column&&(b.$desiredColumn=null)}),this.selectionAnchor.on("change",function(){b.$isEmpty||b._emit("changeSelection")})};(function(){d.implement(this,f),this.isEmpty=function(){return this.$isEmpty||this.selectionAnchor.row==this.selectionLead.row&&this.selectionAnchor.column==this.selectionLead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.selectionLead.getPosition()},this.setSelectionAnchor=function(a,b){this.selectionAnchor.setPosition(a,b),this.$isEmpty&&(this.$isEmpty=!1,this._emit("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.selectionAnchor.getPosition()},this.getSelectionLead=function(){return this.selectionLead.getPosition()},this.shiftSelection=function(a){if(this.$isEmpty){this.moveCursorTo(this.selectionLead.row,this.selectionLead.column+a);return}var b=this.getSelectionAnchor(),c=this.getSelectionLead(),d=this.isBackwards();(!d||b.column!==0)&&this.setSelectionAnchor(b.row,b.column+a),(d||c.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(c.row,c.column+a)})},this.isBackwards=function(){var a=this.selectionAnchor,b=this.selectionLead;return a.row>b.row||a.row==b.row&&a.column>b.column},this.getRange=function(){var a=this.selectionAnchor,b=this.selectionLead;return this.isEmpty()?g.fromPoints(b,b):this.isBackwards()?g.fromPoints(b,a):g.fromPoints(a,b)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){var a=this.doc.getLength()-1;this.setSelectionAnchor(a,this.doc.getLine(a).length),this.moveCursorTo(0,0)},this.setSelectionRange=function(a,b){b?(this.setSelectionAnchor(a.end.row,a.end.column),this.selectTo(a.start.row,a.start.column)):(this.setSelectionAnchor(a.start.row,a.start.column),this.selectTo(a.end.row,a.end.column)),this.$desiredColumn=null},this.$moveSelection=function(a){var b=this.selectionLead;this.$isEmpty&&this.setSelectionAnchor(b.row,b.column),a.call(this)},this.selectTo=function(a,b){this.$moveSelection(function(){this.moveCursorTo(a,b)})},this.selectToPosition=function(a){this.$moveSelection(function(){this.moveCursorToPosition(a)})},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.selectWord=function(){var a=this.getCursor(),b=this.session.getWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectAWord=function(){var a=this.getCursor(),b=this.session.getAWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectLine=function(){var a=this.selectionLead.row,b,c=this.session.getFoldLine(a);c?(a=c.start.row,b=c.end.row):b=a,this.setSelectionAnchor(a,0),this.$moveSelection(function(){this.moveCursorTo(b+1,0)})},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.moveCursorLeft=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,-1))this.moveCursorTo(b.start.row,b.start.column);else if(a.column==0)a.row>0&&this.moveCursorTo(a.row-1,this.doc.getLine(a.row-1).length);else{var c=this.session.getTabSize();this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column-c,a.column).split(" ").length-1==c?this.moveCursorBy(0,-c):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,1))this.moveCursorTo(b.end.row,b.end.column);else if(this.selectionLead.column==this.doc.getLine(this.selectionLead.row).length)this.selectionLead.row<this.doc.getLength()-1&&this.moveCursorTo(this.selectionLead.row+1,0);else{var c=this.session.getTabSize(),a=this.selectionLead;this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column,a.column+c).split(" ").length-1==c?this.moveCursorBy(0,c):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.session.documentToScreenRow(a,b),d=this.session.screenToDocumentPosition(c,0),e=this.session.getDisplayLine(a,null,d.row,d.column),f=e.match(/^\s*/);f[0].length==b?this.moveCursorTo(d.row,d.column):this.moveCursorTo(d.row,d.column+f[0].length)},this.moveCursorLineEnd=function(){var a=this.selectionLead,b=this.session.getDocumentLastRowColumnPosition(a.row,a.column);this.moveCursorTo(b.row,b.column)},this.moveCursorFileEnd=function(){var a=this.doc.getLength()-1,b=this.doc.getLine(a).length;this.moveCursorTo(a,b)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorWordRight=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.doc.getLine(a),d=c.substring(b),e;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var f=this.session.getFoldAt(a,b,1);if(f){this.moveCursorTo(f.end.row,f.end.column);return}if(e=this.session.nonTokenRe.exec(d))b+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,d=c.substring(b);if(b>=c.length){this.moveCursorTo(a,c.length),this.moveCursorRight(),a<this.doc.getLength()-1&&this.moveCursorWordRight();return}if(e=this.session.tokenRe.exec(d))b+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorWordLeft=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c;if(c=this.session.getFoldAt(a,b,-1)){this.moveCursorTo(c.start.row,c.start.column);return}var d=this.session.getFoldStringAt(a,b,-1);d==null&&(d=this.doc.getLine(a).substring(0,b));var f=e.stringReverse(d),g;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(g=this.session.nonTokenRe.exec(f))b-=this.session.nonTokenRe.lastIndex,f=f.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0;if(b<=0){this.moveCursorTo(a,0),this.moveCursorLeft(),a>0&&this.moveCursorWordLeft();return}if(g=this.session.tokenRe.exec(f))b-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorBy=function(a,b){var c=this.session.documentToScreenPosition(this.selectionLead.row,this.selectionLead.column);b===0&&(this.$desiredColumn?c.column=this.$desiredColumn:this.$desiredColumn=c.column);var d=this.session.screenToDocumentPosition(c.row+a,c.column);this.moveCursorTo(d.row,d.column+b,b===0)},this.moveCursorToPosition=function(a){this.moveCursorTo(a.row,a.column)},this.moveCursorTo=function(a,b,c){var d=this.session.getFoldAt(a,b,1);d&&(a=d.start.row,b=d.start.column),this.$keepDesiredColumnOnChange=!0,this.selectionLead.setPosition(a,b),this.$keepDesiredColumnOnChange=!1,c||(this.$desiredColumn=null)},this.moveCursorToScreen=function(a,b,c){var d=this.session.screenToDocumentPosition(a,b);this.moveCursorTo(d.row,d.column,c)},this.detach=function(){this.selectionLead.detach(),this.selectionAnchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(a){this.setSelectionRange(a,a.cursor==a.start),this.$desiredColumn=a.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(a){var b=this.getRange();return a?(a.start.column=b.start.column,a.start.row=b.start.row,a.end.column=b.end.column,a.end.row=b.end.row):a=b,a.cursor=this.isBackwards()?a.start:a.end,a.desiredColumn=this.$desiredColumn,a}}).call(h.prototype),b.Selection=h}),define("ace/range",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.isEqual=function(a){return this.start.row==a.start.row&&this.end.row==a.end.row&&this.start.column==a.start.column&&this.end.column==a.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;return b=this.compare(c.row,c.column),b==1?(b=this.compare(d.row,d.column),b==1?2:b==0?1:0):b==-1?-2:(b=this.compare(d.row,d.column),b==-1?-1:b==1?42:0)},this.comparePoint=function(a){return this.compare(a.row,a.column)},this.containsRange=function(a){return this.comparePoint(a.start)==0&&this.comparePoint(a.end)==0},this.intersectsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)||this.isStart(a,b)?!1:!0:!1},this.insideStart=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)?!1:!0:!1},this.insideEnd=function(a,b){return this.compare(a,b)==0?this.isStart(a,b)?!1:!0:!1},this.compare=function(a,b){return!this.isMultiLine()&&a===this.start.row?b<this.start.column?-1:b>this.end.column?1:0:a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.fixOrientation=function(){if(this.start.row<this.end.row||this.start.row==this.end.row&&this.start.column<this.end.column)return!1;var a=this.start;return this.end=this.start,this.start=a,!0},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour","ace/unicode"],function(a,b,c){"use strict";var d=a("../tokenizer").Tokenizer,e=a("./text_highlight_rules").TextHighlightRules,f=a("./behaviour").Behaviour,g=a("../unicode"),h=function(){this.$tokenizer=new d((new e).getRules()),this.$behaviour=new f};(function(){this.tokenRe=new RegExp("^["+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]|s])+","g"),this.getTokenizer=function(){return this.$tokenizer},this.toggleCommentLines=function(a,b,c,d){},this.getNextLineIndent=function(a,b,c){return""},this.checkOutdent=function(a,b,c){return!1},this.autoOutdent=function(a,b,c){},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.createWorker=function(a){return null},this.highlightSelection=function(a){var b=a.session;b.$selectionOccurrences||(b.$selectionOccurrences=[]),b.$selectionOccurrences.length&&this.clearSelectionHighlight(a);var c=a.getSelectionRange();if(c.isEmpty()||c.isMultiLine())return;var d=c.start.column-1,e=c.end.column+1,f=b.getLine(c.start.row),g=f.length,h=f.substring(Math.max(d,0),Math.min(e,g));if(d>=0&&/^[\w\d]/.test(h)||e<=g&&/[\w\d]$/.test(h))return;h=f.substring(c.start.column,c.end.column);if(!/^[\w\d]+$/.test(h))return;var i=a.getCursorPosition(),j={wrap:!0,wholeWord:!0,caseSensitive:!0,needle:h},k=a.$search.getOptions();a.$search.set(j);var l=a.$search.findAll(b);l.forEach(function(a){if(!a.contains(i.row,i.column)){var c=b.addMarker(a,"ace_selected_word","text");b.$selectionOccurrences.push(c)}}),a.$search.set(k)},this.clearSelectionHighlight=function(a){if(!a.session.$selectionOccurrences)return;a.session.$selectionOccurrences.forEach(function(b){a.session.removeMarker(b)}),a.session.$selectionOccurrences=[]},this.createModeDelegates=function(a){if(!this.$embeds)return;this.$modes={};for(var b=0;b<this.$embeds.length;b++)a[this.$embeds[b]]&&(this.$modes[this.$embeds[b]]=new a[this.$embeds[b]]);var c=["toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction"];for(var b=0;b<c.length;b++)(function(a){var d=c[b],e=a[d];a[c[b]]=function(){return this.$delegator(d,arguments,e)}})(this)},this.$delegator=function(a,b,c){var d=b[0];for(var e=0;e<this.$embeds.length;e++){if(!this.$modes[this.$embeds[e]])continue;var f=d.split(this.$embeds[e]);if(!f[0]&&f[1]){b[0]=f[1];var g=this.$modes[this.$embeds[e]];return g[a].apply(g,b)}}var h=c.apply(this,b);return c?h:undefined},this.transformAction=function(a,b,c,d,e){if(this.$behaviour){var f=this.$behaviour.getBehaviours();for(var g in f)if(f[g][b]){var h=f[g][b].apply(this,arguments);if(h)return h}}}}).call(h.prototype),b.Mode=h}),define("ace/tokenizer",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b){b=b?"g"+b:"g",this.rules=a,this.regExps={},this.matchMappings={};for(var c in this.rules){var d=this.rules[c],e=d,f=[],g=0,h=this.matchMappings[c]={};for(var i=0;i<e.length;i++){e[i].regex instanceof RegExp&&(e[i].regex=e[i].regex.toString().slice(1,-1));var j=(new RegExp("(?:("+e[i].regex+")|(.))")).exec("a").length-2,k=e[i].regex.replace(/\\([0-9]+)/g,function(a,b){return"\\"+(parseInt(b,10)+g+1)});if(j>1&&e[i].token.length!==j-1)throw new Error("Matching groups and length of the token array don't match in rule #"+i+" of state "+c);h[g]={rule:i,len:j},g+=j,f.push(k)}this.regExps[c]=new RegExp("(?:("+f.join(")|(")+")|(.))",b)}};(function(){this.getLineTokens=function(a,b){var c=b,d=this.rules[c],e=this.matchMappings[c],f=this.regExps[c];f.lastIndex=0;var g,h=[],i=0,j={type:null,value:""};while(g=f.exec(a)){var k="text",l=null,m=[g[0]];for(var n=0;n<g.length-2;n++){if(g[n+1]===undefined)continue;l=d[e[n].rule],e[n].len>1&&(m=g.slice(n+2,n+1+e[n].len)),typeof l.token=="function"?k=l.token.apply(this,m):k=l.token;var o=l.next;o&&o!==c&&(c=o,d=this.rules[c],e=this.matchMappings[c],i=f.lastIndex,f=this.regExps[c],f.lastIndex=i);break}if(m[0]){typeof k=="string"&&(m=[m.join("")],k=[k]);for(var n=0;n<m.length;n++){if(!m[n])continue;(!l||l.merge||k[n]==="text")&&j.type===k[n]?j.value+=m[n]:(j.type&&h.push(j),j={type:k[n],value:m[n]})}}if(i==a.length)break;i=f.lastIndex}return j.type&&h.push(j),{tokens:h,state:c}}}).call(d.prototype),b.Tokenizer=d}),define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(a,b,c){"use strict";var d=a("../lib/lang"),e=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:"text",regex:".+"}]}};(function(){this.addRules=function(a,b){for(var c in a){var d=a[c];for(var e=0;e<d.length;e++){var f=d[e];f.next?f.next=b+f.next:f.next=b+c}this.$rules[b+c]=d}},this.getRules=function(){return this.$rules},this.embedRules=function(a,b,c,e){var f=(new a).getRules();if(e)for(var g=0;g<e.length;g++)e[g]=b+e[g];else{e=[];for(var h in f)e.push(b+h)}this.addRules(f,b);for(var g=0;g<e.length;g++)Array.prototype.unshift.apply(this.$rules[e[g]],d.deepCopy(c));this.$embeds||(this.$embeds=[]),this.$embeds.push(b)},this.getEmbeds=function(){return this.$embeds}}).call(e.prototype),b.TextHighlightRules=e}),define("ace/mode/behaviour",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.$behaviours={}};(function(){this.add=function(a,b,c){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[a]:this.$behaviours[a]={}}this.$behaviours[a][b]=c},this.addBehaviours=function(a){for(var b in a)for(var c in a[b])this.add(b,c,a[b][c])},this.remove=function(a){this.$behaviours&&this.$behaviours[a]&&delete this.$behaviours[a]},this.inherit=function(a,b){if(typeof a=="function")var c=(new a).getBehaviours(b);else var c=a.getBehaviours(b);this.addBehaviours(c)},this.getBehaviours=function(a){if(!a)return this.$behaviours;var b={};for(var c=0;c<a.length;c++)this.$behaviours[a[c]]&&(b[a[c]]=this.$behaviours[a[c]]);return b}}).call(d.prototype),b.Behaviour=d}),define("ace/unicode",["require","exports","module"],function(a,b,c){function d(a){var c=/\w{4}/g;for(var d in a)b.packages[d]=a[d].replace(c,"\\u$&")}"use strict",b.packages={},d({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),define("ace/document",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/range","ace/anchor"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=a("./range").Range,g=a("./anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r\n|\r|\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){if(this.$newLineMode===a)return;this.$newLineMode=a},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];return b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column)),b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();return a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length),a},this.insert=function(a,b){if(!b||b.length===0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];return a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||"")),a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};return this._emit("change",{data:e}),d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};return this._emit("change",{data:d}),c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};return this._emit("change",{data:e}),d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b==c)return;var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};return this._emit("change",{data:i}),d.start},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};return this._emit("change",{data:e}),d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._emit("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row==c.end.row&&c.start.row!=this.row)return;if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row==d.row&&this.column==d.column)return;var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._emit("change",{old:e,value:d})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};return a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0),c}}).call(f.prototype)}),define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=function(a,b){this.running=!1,this.lines=[],this.currentLine=0,this.tokenizer=a;var c=this;this.$worker=function(){if(!c.running)return;var a=new Date,b=c.currentLine,d=c.doc,e=0,f=d.getLength();while(c.currentLine<f){c.lines[c.currentLine]=c.$tokenizeRows(c.currentLine,c.currentLine)[0],c.currentLine++,e+=1;if(e%5==0&&new Date-a>20){c.fireUpdateEvent(b,c.currentLine-1),c.running=setTimeout(c.$worker,20);return}}c.running=!1,c.fireUpdateEvent(b,f-1)}};(function(){d.implement(this,e),this.setTokenizer=function(a){this.tokenizer=a,this.lines=[],this.start(0)},this.setDocument=function(a){this.doc=a,this.lines=[],this.stop()},this.fireUpdateEvent=function(a,b){var c={first:a,last:b};this._emit("update",{data:c})},this.start=function(a){this.currentLine=Math.min(a||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(a,b){return this.$tokenizeRows(a,b)},this.getState=function(a){return this.$tokenizeRows(a,a)[0].state},this.$tokenizeRows=function(a,b){if(!this.doc||isNaN(a)||isNaN(b))return[{state:"start",tokens:[]}];var c=[],d="start",e=!1;a>0&&this.lines[a-1]?(d=this.lines[a-1].state,e=!0):a==0?(d="start",e=!0):this.lines.length>0&&(d=this.lines[this.lines.length-1].state);var f=this.doc.getLines(a,b);for(var g=a;g<=b;g++)if(!this.lines[g]){var h=this.tokenizer.getLineTokens(f[g-a]||"",d),d=h.state;c.push(h),e&&(this.lines[g]=h)}else{var h=this.lines[g];d=h.state,c.push(h)}return c}}).call(f.prototype),b.BackgroundTokenizer=f}),define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(a,b,c){function h(){this.getFoldAt=function(a,b,c){var d=this.getFoldLine(a);if(!d)return null;var e=d.folds;for(var f=0;f<e.length;f++){var g=e[f];if(g.range.contains(a,b)){if(c==1&&g.range.isEnd(a,b))continue;if(c==-1&&g.range.isStart(a,b))continue;return g}}},this.getFoldsInRange=function(a){a=a.clone();var b=a.start,c=a.end,d=this.$foldData,e=[];b.column+=1,c.column-=1;for(var f=0;f<d.length;f++){var g=d[f].range.compareRange(a);if(g==2)continue;if(g==-2)break;var h=d[f].folds;for(var i=0;i<h.length;i++){var j=h[i];g=j.range.compareRange(a);if(g==-2)break;if(g==2)continue;if(g==42)break;e.push(j)}}return e},this.getAllFolds=function(){function c(b){a.push(b);if(!b.subFolds)return;for(var d=0;d<b.subFolds.length;d++)c(b.subFolds[d])}var a=[],b=this.$foldData;for(var d=0;d<b.length;d++)for(var e=0;e<b[d].folds.length;e++)c(b[d].folds[e]);return a},this.getFoldStringAt=function(a,b,c,d){d=d||this.getFoldLine(a);if(!d)return null;var e={end:{column:0}},f,g;for(var h=0;h<d.folds.length;h++){g=d.folds[h];var i=g.range.compareEnd(a,b);if(i==-1){f=this.getLine(g.start.row).substring(e.end.column,g.start.column);break}if(i===0)return null;e=g}return f||(f=this.getLine(g.start.row).substring(e.end.column)),c==-1?f.substring(0,b-e.end.column):c==1?f.substring(b-e.end.column):f},this.getFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.start.row<=a&&e.end.row>=a)return e;if(e.end.row>a)return null}return null},this.getNextFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.end.row>=a)return e}return null},this.getFoldedRowCount=function(a,b){var c=this.$foldData,d=b-a+1;for(var e=0;e<c.length;e++){var f=c[e],g=f.end.row,h=f.start.row;if(g>=b){h<b&&(h>=a?d-=b-h:d=0);break}g>=a&&(h>=a?d-=g-h:d-=g-a+1)}return d},this.$addFoldLine=function(a){return this.$foldData.push(a),this.$foldData.sort(function(a,b){return a.start.row-b.start.row}),a},this.addFold=function(a,b){var c=this.$foldData,d=!1,g;a instanceof f?g=a:g=new f(b,a),this.$clipRangeToDocument(g.range);var h=g.start.row,i=g.start.column,j=g.end.row,k=g.end.column;if(g.placeholder.length<2)throw"Placeholder has to be at least 2 characters";if(h==j&&k-i<2)throw"The range has to be at least 2 characters width";var l=this.getFoldAt(h,i,1),m=this.getFoldAt(j,k,-1);if(l&&m==l)return l.addSubFold(g);if(l&&!l.range.isStart(h,i)||m&&!m.range.isEnd(j,k))throw"A fold can't intersect already existing fold"+g.range+l.range;var n=this.getFoldsInRange(g.range);n.length>0&&(this.removeFolds(n),g.subFolds=n);for(var o=0;o<c.length;o++){var p=c[o];if(j==p.start.row){p.addFold(g),d=!0;break}if(h==p.end.row){p.addFold(g),d=!0;if(!g.sameRow){var q=c[o+1];if(q&&q.start.row==j){p.merge(q);break}}break}if(j<=p.start.row)break}return d||(p=this.$addFoldLine(new e(this.$foldData,g))),this.$useWrapMode&&this.$updateWrapData(p.start.row,p.start.row),this.$modified=!0,this._emit("changeFold",{data:g}),g},this.addFolds=function(a){a.forEach(function(a){this.addFold(a)},this)},this.removeFold=function(a){var b=a.foldLine,c=b.start.row,d=b.end.row,e=this.$foldData,f=b.folds;if(f.length==1)e.splice(e.indexOf(b),1);else if(b.range.isEnd(a.end.row,a.end.column))f.pop(),b.end.row=f[f.length-1].end.row,b.end.column=f[f.length-1].end.column;else if(b.range.isStart(a.start.row,a.start.column))f.shift(),b.start.row=f[0].start.row,b.start.column=f[0].start.column;else if(a.sameRow)f.splice(f.indexOf(a),1);else{var g=b.split(a.start.row,a.start.column);f=g.folds,f.shift(),g.start.row=f[0].start.row,g.start.column=f[0].start.column}this.$useWrapMode&&this.$updateWrapData(c,d),this.$modified=!0,this._emit("changeFold",{data:a})},this.removeFolds=function(a){var b=[];for(var c=0;c<a.length;c++)b.push(a[c]);b.forEach(function(a){this.removeFold(a)},this),this.$modified=!0},this.expandFold=function(a){this.removeFold(a),a.subFolds.forEach(function(a){this.addFold(a)},this),a.subFolds=[]},this.expandFolds=function(a){a.forEach(function(a){this.expandFold(a)},this)},this.unfold=function(a,b){var c,e;a==null?c=new d(0,0,this.getLength(),0):typeof a=="number"?c=new d(a,0,a,this.getLine(a).length):"row"in a?c=d.fromPoints(a,a):c=a,e=this.getFoldsInRange(c);if(b)this.removeFolds(e);else while(e.length)this.expandFolds(e),e=this.getFoldsInRange(c)},this.isRowFolded=function(a,b){return!!this.getFoldLine(a,b)},this.getRowFoldEnd=function(a,b){var c=this.getFoldLine(a,b);return c?c.end.row:a},this.getFoldDisplayLine=function(a,b,c,d,e){d==null&&(d=a.start.row,e=0),b==null&&(b=a.end.row,c=this.getLine(b).length);var f=this.doc,g="";return a.walk(function(a,b,c,h){if(b<d)return;if(b==d){if(c<e)return;h=Math.max(e,h)}a?g+=a:g+=f.getLine(b).substring(h,c)}.bind(this),b,c),g},this.getDisplayLine=function(a,b,c,d){var e=this.getFoldLine(a);if(!e){var f;return f=this.doc.getLine(a),f.substring(d||0,b||f.length)}return this.getFoldDisplayLine(e,a,b,c,d)},this.$cloneFoldData=function(){var a=[];return a=this.$foldData.map(function(b){var c=b.folds.map(function(a){return a.clone()});return new e(a,c)}),a},this.toggleFold=function(a){var b=this.selection,c=b.getRange(),d,e;if(c.isEmpty()){var f=c.start;d=this.getFoldAt(f.row,f.column);if(d){this.expandFold(d);return}(e=this.findMatchingBracket(f))?c.comparePoint(e)==1?c.end=e:(c.start=e,c.start.column++,c.end.column--):(e=this.findMatchingBracket({row:f.row,column:f.column+1}))?(c.comparePoint(e)==1?c.end=e:c.start=e,c.start.column++):c=this.getCommentFoldRange(f.row,f.column)||c}else{var g=this.getFoldsInRange(c);if(a&&g.length){this.expandFolds(g);return}g.length==1&&(d=g[0])}d||(d=this.getFoldAt(c.start.row,c.start.column));if(d&&d.range.toString()==c.toString()){this.expandFold(d);return}var h="...";if(!c.isMultiLine()){h=this.getTextRange(c);if(h.length<4)return;h=h.trim().substring(0,2)+".."}this.addFold(h,c)},this.getCommentFoldRange=function(a,b){var c=new g(this,a,b),e=c.getCurrentToken();if(e&&/^comment|string/.test(e.type)){var f=new d,h=new RegExp(e.type.replace(/\..*/,"\\."));do e=c.stepBackward();while(e&&h.test(e.type));c.stepForward(),f.start.row=c.getCurrentTokenRow(),f.start.column=c.getCurrentTokenColumn()+2,c=new g(this,a,b);do e=c.stepForward();while(e&&h.test(e.type));return e=c.stepBackward(),f.end.row=c.getCurrentTokenRow(),f.end.column=c.getCurrentTokenColumn()+e.value.length,f}},this.foldAll=function(a,b){var c=this.foldWidgets;b=b||this.getLength();for(var d=a||0;d<b;d++){c[d]==null&&(c[d]=this.getFoldWidget(d));if(c[d]!="start")continue;var e=this.getFoldWidgetRange(d);if(e&&e.end.row<b)try{this.addFold("...",e)}catch(f){}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(a){if(!this.$foldStyles[a])throw new Error("invalid fold style: "+a+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==a)return;this.$foldStyle=a,a=="manual"&&this.unfold();var b=this.$foldMode;this.$setFolding(null),this.$setFolding(b)},this.$setFolding=function(a){if(this.$foldMode==a)return;this.$foldMode=a,this.removeListener("change",this.$updateFoldWidgets),this._emit("changeAnnotation");if(!a||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=a.getFoldWidget.bind(a,this,this.$foldStyle),this.getFoldWidgetRange=a.getFoldWidgetRange.bind(a,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets)},this.onFoldWidgetClick=function(a,b){var c=this.getFoldWidget(a),d=this.getLine(a),e=b.shiftKey,f=e||b.ctrlKey||b.altKey||b.metaKey,g;c=="end"?g=this.getFoldAt(a,0,-1):g=this.getFoldAt(a,d.length,1);if(g){f?this.removeFold(g):this.expandFold(g);return}var h=this.getFoldWidgetRange(a);if(h){if(!h.isMultiLine()){g=this.getFoldAt(h.start.row,h.start.column,1);if(g&&h.isEqual(g.range)){this.removeFold(g);return}}e||this.addFold("...",h),f&&this.foldAll(h.start.row+1,h.end.row)}else f&&this.foldAll(a+1,this.getLength()),b.target.className+=" invalid"},this.updateFoldWidgets=function(a){var b=a.data,c=b.range,d=c.start.row,e=c.end.row-d;if(e===0)this.foldWidgets[d]=null;else if(b.action=="removeText"||b.action=="removeLines")this.foldWidgets.splice(d,e+1,null);else{var f=Array(e+1);f.unshift(d,1),this.foldWidgets.splice.apply(this.foldWidgets,f)}}}"use strict";var d=a("../range").Range,e=a("./fold_line").FoldLine,f=a("./fold").Fold,g=a("../token_iterator").TokenIterator;b.Folding=h}),define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(a,b,c){function e(a,b){this.foldData=a,Array.isArray(b)?this.folds=b:b=this.folds=[b];var c=b[b.length-1];this.range=new d(b[0].start.row,b[0].start.column,c.end.row,c.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(a){a.setFoldLine(this)},this)}"use strict";var d=a("../range").Range;(function(){this.shiftRow=function(a){this.start.row+=a,this.end.row+=a,this.folds.forEach(function(b){b.start.row+=a,b.end.row+=a})},this.addFold=function(a){if(a.sameRow){if(a.start.row<this.startRow||a.endRow>this.endRow)throw"Can't add a fold to this FoldLine as it has no connection";this.folds.push(a),this.folds.sort(function(a,b){return-a.range.compareEnd(b.start.row,b.start.column)}),this.range.compareEnd(a.start.row,a.start.column)>0?(this.end.row=a.end.row,this.end.column=a.end.column):this.range.compareStart(a.end.row,a.end.column)<0&&(this.start.row=a.start.row,this.start.column=a.start.column)}else if(a.start.row==this.end.row)this.folds.push(a),this.end.row=a.end.row,this.end.column=a.end.column;else{if(a.end.row!=this.start.row)throw"Trying to add fold to FoldRow that doesn't have a matching row";this.folds.unshift(a),this.start.row=a.start.row,this.start.column=a.start.column}a.foldLine=this},this.containsRow=function(a){return a>=this.start.row&&a<=this.end.row},this.walk=function(a,b,c){var d=0,e=this.folds,f,g,h,i=!0;b==null&&(b=this.end.row,c=this.end.column);for(var j=0;j<e.length;j++){f=e[j],g=f.range.compareStart(b,c);if(g==-1){a(null,b,c,d,i);return}h=a(null,f.start.row,f.start.column,d,i),h=!h&&a(f.placeholder,f.start.row,f.start.column,d);if(h||g==0)return;i=!f.sameRow,d=f.end.column}a(null,b,c,d,i)},this.getNextFoldTo=function(a,b){var c,d;for(var e=0;e<this.folds.length;e++){c=this.folds[e],d=c.range.compareEnd(a,b);if(d==-1)return{fold:c,kind:"after"};if(d==0)return{fold:c,kind:"inside"}}return null},this.addRemoveChars=function(a,b,c){var d=this.getNextFoldTo(a,b),e,f;if(d){e=d.fold;if(d.kind=="inside"&&e.start.column!=b&&e.start.row!=a)throw"Moving characters inside of a fold should never be reached";if(e.start.row==a){f=this.folds;var g=f.indexOf(e);g==0&&(this.start.column+=c);for(g;g<f.length;g++){e=f[g],e.start.column+=c;if(!e.sameRow)return;e.end.column+=c}this.end.column+=c}}},this.split=function(a,b){var c=this.getNextFoldTo(a,b).fold,d=this.folds,f=this.foldData;if(!c)return null;var g=d.indexOf(c),h=d[g-1];this.end.row=h.end.row,this.end.column=h.end.column,d=d.splice(g,d.length-g);var i=new e(f,d);return f.splice(f.indexOf(this)+1,0,i),i},this.merge=function(a){var b=a.folds;for(var c=0;c<b.length;c++)this.addFold(b[c]);var d=this.foldData;d.splice(d.indexOf(a),1)},this.toString=function(){var a=[this.range.toString()+": ["];return this.folds.forEach(function(b){a.push("  "+b.toString())}),a.push("]"),a.join("\n")},this.idxToPosition=function(a){var b=0,c;for(var d=0;d<this.folds.length;d++){var c=this.folds[d];a-=c.start.column-b;if(a<0)return{row:c.start.row,column:c.start.column+a};a-=c.placeholder.length;if(a<0)return c.start;b=c.end.column}return{row:this.end.row,column:this.end.column+a}}}).call(e.prototype),b.FoldLine=e}),define("ace/edit_session/fold",["require","exports","module"],function(a,b,c){"use strict";var d=b.Fold=function(a,b){this.foldLine=null,this.placeholder=b,this.range=a,this.start=a.start,this.end=a.end,this.sameRow=a.start.row==a.end.row,this.subFolds=[]};(function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(a){this.foldLine=a,this.subFolds.forEach(function(b){b.setFoldLine(a)})},this.clone=function(){var a=this.range.clone(),b=new d(a,this.placeholder);return this.subFolds.forEach(function(a){b.subFolds.push(a.clone())}),b},this.addSubFold=function(a){if(this.range.isEqual(a))return this;if(!this.range.containsRange(a))throw"A fold can't intersect already existing fold"+a.range+this.range;var b=a.range.start.row,c=a.range.start.column;for(var d=0,e=-1;d<this.subFolds.length;d++){e=this.subFolds[d].range.compare(b,c);if(e!=1)break}var f=this.subFolds[d];if(e==0)return f.addSubFold(a);var b=a.range.end.row,c=a.range.end.column;for(var g=d,e=-1;g<this.subFolds.length;g++){e=this.subFolds[g].range.compare(b,c);if(e!=1)break}var h=this.subFolds[g];if(e==0)throw"A fold can't intersect already existing fold"+a.range+this.range;var i=this.subFolds.splice(d,g-d,a);return a.setFoldLine(this.foldLine),a}}).call(d.prototype)}),define("ace/token_iterator",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c){this.$session=a,this.$row=b,this.$rowTokens=a.getTokens(b,b)[0].tokens;var d=a.getTokenAt(b,c);this.$tokenIndex=d?d.index:-1};(function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){var a=this.$session.getLength();this.$tokenIndex+=1;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1;if(this.$row>=a)return this.$row=a-1,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var a=this.$rowTokens,b=this.$tokenIndex,c=a[b].start;if(c!==undefined)return c;c=0;while(b>0)b-=1,c+=a[b].value.length;return c}}).call(d.prototype),b.TokenIterator=d}),define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator"],function(a,b,c){function e(){this.findMatchingBracket=function(a){if(a.column==0)return null;var b=this.getLine(a.row).charAt(a.column-1);if(b=="")return null;var c=b.match(/([\(\[\{])|([\)\]\}])/);return c?c[1]?this.$findClosingBracket(c[1],a):this.$findOpeningBracket(c[2],a):null},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("rparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn()-2,j=g.value;for(;;){while(i>=0){var k=j.charAt(i);if(k==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else k==a&&(e+=1);i-=1}do g=f.stepBackward();while(g&&!h.test(g.type));if(g==null)break;j=g.value,i=j.length-1}return null},this.$findClosingBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("lparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn();for(;;){var j=g.value,k=j.length;while(i<k){var l=j.charAt(i);if(l==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else l==a&&(e+=1);i+=1}do g=f.stepForward();while(g&&!h.test(g.type));if(g==null)break;i=0}return null}}"use strict";var d=a("../token_iterator").TokenIterator;b.BracketMatch=e}),define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(a,b,c){"use strict";var d=a("./lib/lang"),e=a("./lib/oop"),f=a("./range").Range,g=function(){this.$options={needle:"",backwards:!1,wrap:!1,caseSensitive:!1,wholeWord:!1,scope:g.ALL,regExp:!1}};g.ALL=1,g.SELECTION=2,function(){this.set=function(a){return e.mixin(this.$options,a),this},this.getOptions=function(){return d.copyObject(this.$options)},this.find=function(a){if(!this.$options.needle)return null;if(this.$options.backwards)var b=this.$backwardMatchIterator(a);else b=this.$forwardMatchIterator(a);var c=null;return b.forEach(function(a){return c=a,!0}),c},this.findAll=function(a){var b=this.$options;if(!b.needle)return[];if(b.backwards)var c=this.$backwardMatchIterator(a);else c=this.$forwardMatchIterator(a);var d=!b.start&&b.wrap&&b.scope==g.ALL;d&&(b.start={row:0,column:0});var e=[];return c.forEach(function(a){e.push(a)}),d&&(b.start=null),e},this.replace=function(a,b){var c=this.$assembleRegExp(),d=c.exec(a);return d&&d[0].length==a.length?this.$options.regExp?a.replace(c,b):b:null},this.$forwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$forwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a){var b=arguments[arguments.length-2];return g.push({str:a,offset:e+b}),a});for(var h=0;h<g.length;h++){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$backwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$backwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a,b){return g.push({str:a,offset:e+b}),a});for(var h=g.length-1;h>=0;h--){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$rangeFromMatch=function(a,b,c){return new f(a,b,a,b+c)},this.$assembleRegExp=function(){if(this.$options.regExp)var a=this.$options.needle;else a=d.escapeRegExp(this.$options.needle);this.$options.wholeWord&&(a="\\b"+a+"\\b");var b="g";this.$options.caseSensitive||(b+="i");var c=new RegExp(a,b);return c},this.$forwardLineIterator=function(a){function k(e){var f=a.getLine(e);return b&&e==c.end.row&&(f=f.substring(0,c.end.column)),j&&e==d.row&&(f=f.substring(0,d.column)),f}var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"start":"end"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap,j=!1;return{forEach:function(a){var b=d.row,c=k(b),g=d.column,l=!1;j=!1;while(!a(c,g,b)){if(l)return;b++,g=0;if(b>h){if(!i)return;b=e,g=f,j=!0}b==d.row&&(l=!0),c=k(b)}}}},this.$backwardLineIterator=function(a){var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"end":"start"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap;return{forEach:function(g){var j=d.row,k=a.getLine(j).substring(0,d.column),l=0,m=!1,n=!1;while(!g(k,l,j)){if(m)return;j--,l=0;if(j<e){if(!i)return;j=h,n=!0}j==d.row&&(m=!0),k=a.getLine(j),b&&(j==e?l=f:j==h&&(k=k.substring(0,c.end.column))),n&&j==d.row&&(l=d.column)}}}}}.call(g.prototype),b.Search=g}),define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../keyboard/hash_handler").HashHandler,f=a("../lib/event_emitter").EventEmitter,g=function(a,b){this.platform=a,this.commands={},this.commmandKeyBinding={},this.addCommands(b),this.setDefaultHandler("exec",function(a){a.command.exec(a.editor,a.args||{})})};d.inherits(g,e),function(){d.implement(this,f),this.exec=function(a,b,c){return typeof a=="string"&&(a=this.commands[a]),a?b&&b.$readOnly&&!a.readOnly?!1:(this._emit("exec",{editor:b,command:a,args:c}),!0):!1},this.toggleRecording=function(){if(this.$inReplay)return;return this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(a){this.macro.push([a.command,a.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(a){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording();try{this.$inReplay=!0,this.macro.forEach(function(b){typeof b=="string"?this.exec(b,a):this.exec(b[0],a,b[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(a){return a.map(function(a){return typeof a[0]!="string"&&(a[0]=a[0].name),a[1]||(a=a[0]),a})}}.call(g.prototype),b.CommandManager=g}),define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys"],function(a,b,c){function e(a,b){this.platform=b,this.commands={},this.commmandKeyBinding={},this.addCommands(a)}"use strict";var d=a("../lib/keys");(function(){function a(a,c,e){var f,g=0,h=b(a.toLowerCase());for(var i=0,j=h.length;i<j;i++)d.KEY_MODS[h[i]]?g|=d.KEY_MODS[h[i]]:f=h[i]||"-";return{key:f,hashId:g}}function b(a){return a.trim().split(new RegExp("[\\s ]*\\-[\\s ]*","g"),999)}this.addCommand=function(a){this.commands[a.name]&&this.removeCommand(a),this.commands[a.name]=a,a.bindKey&&this._buildKeyHash(a)},this.removeCommand=function(a){var b=typeof a=="string"?a:a.name;a=this.commands[b],delete this.commands[b];var c=this.commmandKeyBinding;for(var d in c)for(var e in c[d])c[d][e]==a&&delete c[d][e]},this.addCommands=function(a){a&&Object.keys(a).forEach(function(b){var c=a[b];if(typeof c=="string")return this.bindKey(c,b);typeof c=="function"&&(c={exec:c}),c.name||(c.name=b),this.addCommand(c)},this)},this.removeCommands=function(a){Object.keys(a).forEach(function(b){this.removeCommand(a[b])},this)},this.bindKey=function(b,c){if(!b)return;var d=this.commmandKeyBinding;b.split("|").forEach(function(b){var e=a(b,c),f=e.hashId;(d[f]||(d[f]={}))[e.key]=c})},this.bindKeys=function(a){Object.keys(a).forEach(function(b){this.bindKey(b,a[b])},this)},this._buildKeyHash=function(a){var b=a.bindKey;if(!b)return;var c=typeof b=="string"?b:b[this.platform];this.bindKey(c,a)},this.findKeyCommand=function(b,c){var d=this.commmandKeyBinding;return d[b]&&d[b][c.toLowerCase()]},this.handleKeyboard=function(a,b,c,d){return{command:this.findKeyCommand(b,c)}}}).call(e.prototype),b.HashHandler=e}),define("ace/undomanager",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.reset()};(function(){this.execute=function(a){var b=a.args[0];this.$doc=a.args[1],this.$undoStack.push(b),this.$redoStack=[]},this.undo=function(a){var b=this.$undoStack.pop(),c=null;return b&&(c=this.$doc.undoChanges(b,a),this.$redoStack.push(b)),c},this.redo=function(a){var b=this.$redoStack.pop(),c=null;return b&&(c=this.$doc.redoChanges(b,a),this.$undoStack.push(b)),c},this.reset=function(){this.$undoStack=[],this.$redoStack=[]},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0}}).call(d.prototype),b.UndoManager=d}),define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/useragent","ace/config","ace/lib/net","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/renderloop","ace/lib/event_emitter","text!ace/css/editor.css"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/useragent"),h=a("./config"),i=a("./lib/net"),j=a("./layer/gutter").Gutter,k=a("./layer/marker").Marker,l=a("./layer/text").Text,m=a("./layer/cursor").Cursor,n=a("./scrollbar").ScrollBar,o=a("./renderloop").RenderLoop,p=a("./lib/event_emitter").EventEmitter,q=a("text!./css/editor.css");e.importCssString(q,"ace_editor");var r=function(a,b){var c=this;this.container=a,e.addCssClass(a,"ace_editor"),this.setTheme(b),this.$gutter=e.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=e.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=e.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new j(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onResize.bind(this,!0)),this.$markerBack=new k(this.content);var d=this.$textLayer=new l(this.content);this.canvas=d.element,this.$markerFront=new k(this.content),this.characterWidth=d.getCharacterWidth(),this.lineHeight=d.getLineHeight(),this.$cursorLayer=new m(this.content),this.$cursorPadding=8,this.$horizScroll=!0,this.$horizScrollAlwaysVisible=!0,this.$animatedScroll=!1,this.scrollBar=new n(a),this.scrollBar.addEventListener("scroll",function(a){c.session.setScrollTop(a.data)}),this.scrollTop=0,this.scrollLeft=0,f.addListener(this.scroller,"scroll",function(){var a=c.scroller.scrollLeft;c.scrollLeft=a,c.session.setScrollLeft(a),a==0?c.$gutter.className="ace_gutter":c.$gutter.className="ace_gutter horscroll"}),this.cursorPos={row:0,column:0},this.$textLayer.addEventListener("changeCharacterSize",function(){c.characterWidth=d.getCharacterWidth(),c.lineHeight=d.getLineHeight(),c.$updatePrintMargin(),c.onResize(!0),c.$loop.schedule(c.CHANGE_FULL)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:1,characterWidth:1,minHeight:1,maxHeight:1,offset:0,height:1},this.$loop=new o(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.setPadding(4),this.$updatePrintMargin()};(function(){this.showGutter=!0,this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,d.implement(this,p),this.setSession=function(a){this.session=a,this.$cursorLayer.setSession(a),this.$markerBack.setSession(a),this.$markerFront.setSession(a),this.$gutterLayer.setSession(a),this.$textLayer.setSession(a),this.$loop.schedule(this.CHANGE_FULL)},this.updateLines=function(a,b){b===undefined&&(b=Infinity),this.$changedLines?(this.$changedLines.firstRow>a&&(this.$changedLines.firstRow=a),this.$changedLines.lastRow<b&&(this.$changedLines.lastRow=b)):this.$changedLines={firstRow:a,lastRow:b},this.$loop.schedule(this.CHANGE_LINES)},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(){this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.onResize=function(a){var b=this.CHANGE_SIZE,c=this.$size,d=e.getInnerHeight(this.container);if(a||c.height!=d)c.height=d,this.scroller.style.height=d+"px",c.scrollerHeight=this.scroller.clientHeight,this.scrollBar.setHeight(c.scrollerHeight),this.session&&(this.session.setScrollTop(this.getScrollTop()),b|=this.CHANGE_FULL);var f=e.getInnerWidth(this.container);if(a||c.width!=f){c.width=f;var g=this.showGutter?this.$gutter.offsetWidth:0;this.scroller.style.left=g+"px",c.scrollerWidth=Math.max(0,f-g-this.scrollBar.getWidth()),this.scroller.style.width=c.scrollerWidth+"px";if(this.session.getUseWrapMode()&&this.adjustWrapLimit()||a)b|=this.CHANGE_FULL}this.$loop.schedule(b)},this.adjustWrapLimit=function(){var a=this.$size.scrollerWidth-this.$padding*2,b=Math.floor(a/this.characterWidth);return this.session.adjustWrapLimit(b)},this.setAnimatedScroll=function(a){this.$animatedScroll=a},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(a){this.$textLayer.setShowInvisibles(a)&&this.$loop.schedule(this.CHANGE_TEXT)},this.getShowInvisibles=function(){return this.$textLayer.showInvisibles},this.$showPrintMargin=!0,this.setShowPrintMargin=function(a){this.$showPrintMargin=a,this.$updatePrintMargin()},this.getShowPrintMargin=function(){return this.$showPrintMargin},this.$printMarginColumn=80,this.setPrintMarginColumn=function(a){this.$printMarginColumn=a,this.$updatePrintMargin()},this.getPrintMarginColumn=function(){return this.$printMarginColumn},this.getShowGutter=function(){return this.showGutter},this.setShowGutter=function(a){if(this.showGutter===a)return;this.$gutter.style.display=a?"block":"none",this.showGutter=a,this.onResize(!0)},this.$updatePrintMargin=function(){var a;if(!this.$showPrintMargin&&!this.$printMarginEl)return;this.$printMarginEl||(a=e.createElement("div"),a.className="ace_print_margin_layer",this.$printMarginEl=e.createElement("div"),this.$printMarginEl.className="ace_print_margin",a.appendChild(this.$printMarginEl),this.content.insertBefore(a,this.$textLayer.element));var b=this.$printMarginEl.style;b.left=this.characterWidth*this.$printMarginColumn+this.$padding+"px",b.visibility=this.$showPrintMargin?"visible":"hidden"},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.content},this.getTextAreaContainer=function(){return this.container},this.moveTextAreaToCursor=function(a){if(g.isIE)return;if(this.layerConfig.lastRow===0)return;var b=this.$cursorLayer.getPixelPosition();if(!b)return;var c=this.content.getBoundingClientRect(),d=this.layerConfig.offset;a.style.left=c.left+b.left+"px",a.style.top=c.top+b.top-this.scrollTop+d+"px"},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var a=Math.floor((this.layerConfig.height+this.layerConfig.offset)/this.layerConfig.lineHeight);return this.layerConfig.firstRow-1+a},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(a){this.$padding=a,this.$textLayer.setPadding(a),this.$cursorLayer.setPadding(a),this.$markerFront.setPadding(a),this.$markerBack.setPadding(a),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.getHScrollBarAlwaysVisible=function(){return this.$horizScrollAlwaysVisible},this.setHScrollBarAlwaysVisible=function(a){this.$horizScrollAlwaysVisible!=a&&(this.$horizScrollAlwaysVisible=a,(!this.$horizScrollAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL))},this.$updateScrollBar=function(){this.scrollBar.setInnerHeight(this.layerConfig.maxHeight),this.scrollBar.setScrollTop(this.scrollTop)},this.$renderChanges=function(a){if(!a||!this.session||!this.container.offsetWidth)return;(a&this.CHANGE_FULL||a&this.CHANGE_SIZE||a&this.CHANGE_TEXT||a&this.CHANGE_LINES||a&this.CHANGE_SCROLL)&&this.$computeLayerConfig();if(a&this.CHANGE_H_SCROLL){this.scroller.scrollLeft=this.scrollLeft;var b=this.scroller.scrollLeft;this.scrollLeft=b,this.session.setScrollLeft(b)}if(a&this.CHANGE_FULL){this.$textLayer.checkForSizeChanges(),this.$updateScrollBar(),this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig);return}if(a&this.CHANGE_SCROLL){this.$updateScrollBar(),a&this.CHANGE_TEXT||a&this.CHANGE_LINES?this.$textLayer.update(this.layerConfig):this.$textLayer.scrollLines(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig);return}a&this.CHANGE_TEXT?(this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_LINES?this.$updateLines()&&(this.$updateScrollBar(),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_GUTTER&&this.showGutter&&this.$gutterLayer.update(this.layerConfig),a&this.CHANGE_CURSOR&&this.$cursorLayer.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(this.layerConfig),a&this.CHANGE_SIZE&&this.$updateScrollBar()},this.$computeLayerConfig=function(){var a=this.session,b=this.scrollTop%this.lineHeight,c=this.$size.scrollerHeight+this.lineHeight,d=this.$getLongestLine(),e=this.$horizScrollAlwaysVisible||this.$size.scrollerWidth-d<0,f=this.$horizScroll!==e;this.$horizScroll=e,f&&(this.scroller.style.overflowX=e?"scroll":"hidden",e||this.session.setScrollLeft(0));var g=this.session.getScreenLength()*this.lineHeight;this.session.setScrollTop(Math.max(0,Math.min(this.scrollTop,g-this.$size.scrollerHeight)));var h=Math.ceil(c/this.lineHeight)-1,i=Math.max(0,Math.round((this.scrollTop-b)/this.lineHeight)),j=i+h,k,l,m={lineHeight:this.lineHeight};i=a.screenToDocumentRow(i,0);var n=a.getFoldLine(i);n&&(i=n.start.row),k=a.documentToScreenRow(i,0),l=a.getRowHeight(m,i),j=Math.min(a.screenToDocumentRow(j,0),a.getLength()-1),c=this.$size.scrollerHeight+a.getRowHeight(m,j)+l,b=this.scrollTop-k*this.lineHeight,this.layerConfig={width:d,padding:this.$padding,firstRow:i,firstRowScreen:k,lastRow:j,lineHeight:this.lineHeight,characterWidth:this.characterWidth,minHeight:c,maxHeight:g,offset:b,height:this.$size.scrollerHeight},this.$gutterLayer.element.style.marginTop=-b+"px",this.content.style.marginTop=-b+"px",this.content.style.width=d+2*this.$padding+"px",this.content.style.height=c+"px",f&&this.onResize(!0)},this.$updateLines=function(){var a=this.$changedLines.firstRow,b=this.$changedLines.lastRow;this.$changedLines=null;var c=this.layerConfig;if(c.width!=this.$getLongestLine())return this.$textLayer.update(c);if(a>c.lastRow+1)return;if(b<c.firstRow)return;if(b===Infinity){this.showGutter&&this.$gutterLayer.update(c),this.$textLayer.update(c);return}return this.$textLayer.updateLines(c,a,b),!0},this.$getLongestLine=function(){var a=this.session.getScreenWidth();return this.$textLayer.showInvisibles&&(a+=1),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(a*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(a,b){this.$gutterLayer.addGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.removeGutterDecoration=function(a,b){this.$gutterLayer.removeGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.setBreakpoints=function(a){this.$gutterLayer.setBreakpoints(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(a){this.$gutterLayer.setAnnotations(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(a,b){this.scrollCursorIntoView(a),this.scrollCursorIntoView(b)},this.scrollCursorIntoView=function(a){if(this.$size.scrollerHeight===0)return;var b=this.$cursorLayer.getPixelPosition(a),c=b.left,d=b.top;this.scrollTop>d&&this.session.setScrollTop(d),this.scrollTop+this.$size.scrollerHeight<d+this.lineHeight&&this.session.setScrollTop(d+this.lineHeight-this.$size.scrollerHeight);var e=this.scrollLeft;e>c&&(c<this.$padding+2*this.layerConfig.characterWidth&&(c=0),this.session.setScrollLeft(c)),e+this.$size.scrollerWidth<c+this.characterWidth&&this.session.setScrollLeft(Math.round(c+this.characterWidth-this.$size.scrollerWidth))},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(a){this.session.setScrollTop(a*this.lineHeight)},this.STEPS=10,this.$calcSteps=function(a,b){var c=0,d=this.STEPS,e=[],f=function(a,b,c){return(a/=.5)<1?c/2*Math.pow(a,3)+b:c/2*(Math.pow(a-2,3)+2)+b};for(c=0;c<d;++c)e.push(f(c/this.STEPS,a,b-a));return e.push(b),e},this.scrollToLine=function(a,b){var c=this.$cursorLayer.getPixelPosition({row:a,column:0}),d=c.top;b&&(d-=this.$size.scrollerHeight/2);if(this.$animatedScroll&&Math.abs(d-this.scrollTop)<1e4){var e=this,f=e.$calcSteps(this.scrollTop,d);clearInterval(this.$timer),this.$timer=setInterval(function(){e.session.setScrollTop(f.shift()),f.length||clearInterval(e.$timer)},10)}else this.session.setScrollTop(d)},this.scrollToY=function(a){this.scrollTop!==a&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=a)},this.scrollToX=function(a){a<=this.$padding&&(a=0),this.scrollLeft!==a&&(this.scrollLeft=a),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollBy=function(a,b){b&&this.session.setScrollTop(this.session.getScrollTop()+b),a&&this.session.setScrollLeft(this.session.getScrollLeft()+a)},this.isScrollableBy=function(a,b){if(b<0&&this.session.getScrollTop()>0)return!0;if(b>0&&this.session.getScrollTop()+this.$size.scrollerHeight<this.layerConfig.maxHeight)return!0},this.pixelToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return{row:f,column:d}},this.screenToTextCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return this.session.screenToDocumentPosition(f,Math.max(d,0))},this.textToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=this.session.documentToScreenPosition(a,b),e=this.$padding+Math.round(d.column*this.characterWidth),f=d.row*this.lineHeight;return{pageX:c.left+e-this.scrollLeft,pageY:c.top+f-this.scrollTop}},this.visualizeFocus=function(){e.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){e.removeCssClass(this.container,"ace_focus")},this.showComposition=function(a){this.$composition||(this.$composition=e.createElement("div"),this.$composition.className="ace_composition",this.content.appendChild(this.$composition)),this.$composition.innerHTML="&#160;";var b=this.$cursorLayer.getPixelPosition(),c=this.$composition.style;c.top=b.top+"px",c.left=b.left+this.$padding+"px",c.height=this.lineHeight+"px",this.hideCursor()},this.setCompositionText=function(a){e.setInnerText(this.$composition,a)},this.hideComposition=function(){this.showCursor();if(!this.$composition)return;var a=this.$composition.style;a.top="-10000px",a.left="-10000px"},this._loadTheme=function(a,b){if(!h.get("packaged"))return b();var c=a.split("/").pop(),d=h.get("themePath")+"/theme-"+c+h.get("suffix");i.loadScript(d,b)},this.setTheme=function(b){function h(a){e.importCssString(a.cssText,a.cssClass,c.container.ownerDocument),c.$theme&&e.removeCssClass(c.container,c.$theme),c.$theme=a?a.cssClass:null,c.$theme&&e.addCssClass(c.container,c.$theme),a&&a.isDark?e.addCssClass(c.container,"ace_dark"):e.removeCssClass(c.container,"ace_dark"),c.$size&&(c.$size.width=0,c.onResize())}var c=this;this.$themeValue=b;if(!b||typeof b=="string"){var d=b||"ace/theme/textmate",f;try{f=a(d)}catch(g){}if(f)return h(f);c._loadTheme(d,function(){a([d],function(a){if(c.$themeValue!==b)return;h(a)})})}else h(b)},this.getTheme=function(){return this.$themeValue},this.setStyle=function(b){e.addCssClass(this.container,b)},this.unsetStyle=function(b){e.removeCssClass(this.container,b)},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}}).call(r.prototype),b.VirtualRenderer=r}),define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=a("../lib/oop"),f=a("../lib/event_emitter").EventEmitter,g=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_gutter-layer",a.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$breakpoints=[],this.$annotations=[],this.$decorations=[]};(function(){e.implement(this,f),this.setSession=function(a){this.session=a},this.addGutterDecoration=function(a,b){this.$decorations[a]||(this.$decorations[a]=""),this.$decorations[a]+=" "+b},this.removeGutterDecoration=function(a,b){this.$decorations[a]=this.$decorations[a].replace(" "+b,"")},this.setBreakpoints=function(a){this.$breakpoints=a.concat()},this.setAnnotations=function(a){this.$annotations=[];for(var b in a)if(a.hasOwnProperty(b)){var c=a[b];if(!c)continue;var d=this.$annotations[b]={text:[]};for(var e=0;e<c.length;e++){var f=c[e],g=f.text.replace(/"/g,"&quot;").replace(/'/g,"&#8217;").replace(/</,"&lt;");d.text.indexOf(g)===-1&&d.text.push(g);var h=f.type;h=="error"?d.className="ace_error":h=="warning"&&d.className!="ace_error"?d.className="ace_warning":h=="info"&&!d.className&&(d.className="ace_info")}}},this.update=function(a){this.$config=a;var b={className:"",text:[]},c=[],e=a.firstRow,f=a.lastRow,g=this.session.getNextFoldLine(e),h=g?g.start.row:Infinity,i=this.$showFoldWidgets&&this.session.foldWidgets;for(;;){e>h&&(e=g.end.row+1,g=this.session.getNextFoldLine(e,g),h=g?g.start.row:Infinity);if(e>f)break;var j=this.$annotations[e]||b;c.push("<div class='ace_gutter-cell",this.$decorations[e]||"",this.$breakpoints[e]?" ace_breakpoint ":" ",j.className,"' title='",j.text.join("\n"),"' style='height:",a.lineHeight,"px;'>",e+1);if(i){var k=i[e];k==null&&(k=i[e]=this.session.getFoldWidget(e)),k&&c.push("<span class='ace_fold-widget ",k,k=="start"&&e==h&&e<g.end.row?" closed":" open","'></span>")}var l=this.session.getRowLength(e)-1;while(l--)c.push("</div><div class='ace_gutter-cell' style='height:",a.lineHeight,"px'>¦");c.push("</div>"),e++}this.element=d.setInnerHtml(this.element,c.join("")),this.element.style.height=a.minHeight+"px";var m=this.element.offsetWidth;m!==this.gutterWidth&&(this.gutterWidth=m,this._emit("changeGutterWidth",m))},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(a){a?d.addCssClass(this.element,"ace_folding-enabled"):d.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=a},this.getShowFoldWidgets=function(){return this.$showFoldWidgets}}).call(g.prototype),b.Gutter=g}),define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../range").Range,e=a("../lib/dom"),f=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_marker-layer",a.appendChild(this.element)};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.setMarkers=function(a){this.markers=a},this.update=function(a){var a=a||this.config;if(!a)return;this.config=a;var b=[];for(var c in this.markers){var d=this.markers[c],f=d.range.clipRows(a.firstRow,a.lastRow);if(f.isEmpty())continue;f=f.toScreenRange(this.session);if(d.renderer){var g=this.$getTop(f.start.row,a),h=Math.round(this.$padding+f.start.column*a.characterWidth);d.renderer(b,f,h,g,a)}else f.isMultiLine()?d.type=="text"?this.drawTextMarker(b,f,d.clazz,a):this.drawMultiLineMarker(b,f,d.clazz,a,d.type):this.drawSingleLineMarker(b,f,d.clazz,a,null,d.type)}this.element=e.setInnerHtml(this.element,b.join(""))},this.$getTop=function(a,b){return(a-b.firstRowScreen)*b.lineHeight},this.drawTextMarker=function(a,b,c,e){var f=b.start.row,g=new d(f,b.start.column,f,this.session.getScreenLastRowColumn(f));this.drawSingleLineMarker(a,g,c,e,1,"text"),f=b.end.row,g=new d(f,0,f,b.end.column),this.drawSingleLineMarker(a,g,c,e,0,"text");for(f=b.start.row+1;f<b.end.row;f++)g.start.row=f,g.end.row=f,g.end.column=this.session.getScreenLastRowColumn(f),this.drawSingleLineMarker(a,g,c,e,1,"text")},this.drawMultiLineMarker=function(a,b,c,d,e){var f=e==="background"?0:this.$padding,g=d.width+2*this.$padding-f,h=d.lineHeight,i=Math.round(g-b.start.column*d.characterWidth),j=this.$getTop(b.start.row,d),k=Math.round(f+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>"),j=this.$getTop(b.end.row,d),i=Math.round(b.end.column*d.characterWidth),a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",f,"px;'></div>"),h=(b.end.row-b.start.row-1)*d.lineHeight;if(h<0)return;j=this.$getTop(b.start.row+1,d),a.push("<div class='",c,"' style='","height:",h,"px;","width:",g,"px;","top:",j,"px;","left:",f,"px;'></div>")},this.drawSingleLineMarker=function(a,b,c,d,e,f){var g=f==="background"?0:this.$padding,h=d.lineHeight;if(f==="background")var i=d.width;else i=Math.round((b.end.column+(e||0)-b.start.column)*d.characterWidth);var j=this.$getTop(b.start.row,d),k=Math.round(g+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>")}}).call(f.prototype),b.Marker=f}),define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/dom"),f=a("../lib/lang"),g=a("../lib/useragent"),h=a("../lib/event_emitter").EventEmitter,i=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_text-layer",a.appendChild(this.element),this.$characterSize=this.$measureSizes()||{width:0,height:0},this.$pollSizeChanges()};(function(){d.implement(this,h),this.EOF_CHAR="¶",this.EOL_CHAR="¬",this.TAB_CHAR="→",this.SPACE_CHAR="·",this.$padding=0,this.setPadding=function(a){this.$padding=a,this.element.style.padding="0 "+a+"px"},this.getLineHeight=function(){return this.$characterSize.height||1},this.getCharacterWidth=function(){return this.$characterSize.width||1},this.checkForSizeChanges=function(){var a=this.$measureSizes();a&&(this.$characterSize.width!==a.width||this.$characterSize.height!==a.height)&&(this.$characterSize=a,this._emit("changeCharacterSize",{data:a}))},this.$pollSizeChanges=function(){var a=this;this.$pollSizeChangesTimer=setInterval(function(){a.checkForSizeChanges()},500)},this.$fontStyles={fontFamily:1,fontSize:1,fontWeight:1,fontStyle:1,lineHeight:1},this.$measureSizes=g.isIE||g.isOldGecko?function(){var a=1e3;if(!this.$measureNode){var b=this.$measureNode=e.createElement("div"),c=b.style;c.width=c.height="auto",c.left=c.top=-a*40+"px",c.visibility="hidden",c.position="fixed",c.overflow="visible",c.whiteSpace="nowrap",b.innerHTML=f.stringRepeat("Xy",a);if(this.element.ownerDocument.body)this.element.ownerDocument.body.appendChild(b);else{var d=this.element.parentNode;while(!e.hasCssClass(d,"ace_editor"))d=d.parentNode;d.appendChild(b)}}if(!this.element.offsetWidth)return null;var c=this.$measureNode.style,g=e.computedStyle(this.element);for(var h in this.$fontStyles)c[h]=g[h];var i={height:this.$measureNode.offsetHeight,width:this.$measureNode.offsetWidth/(a*2)};return i.width==0||i.height==0?null:i}:function(){if(!this.$measureNode){var a=this.$measureNode=e.createElement("div"),b=a.style;b.width=b.height="auto",b.left=b.top="-100px",b.visibility="hidden",b.position="fixed",b.overflow="visible",b.whiteSpace="nowrap",a.innerHTML="X";var c=this.element.parentNode;while(c&&!e.hasCssClass(c,"ace_editor"))c=c.parentNode;if(!c)return this.$measureNode=null;c.appendChild(a)}var d=this.$measureNode.getBoundingClientRect(),f={height:d.height,width:d.width};return f.width==0||f.height==0?null:f},this.setSession=function(a){this.session=a},this.showInvisibles=!1,this.setShowInvisibles=function(a){return this.showInvisibles==a?!1:(this.showInvisibles=a,!0)},this.$tabStrings=[],this.$computeTabString=function(){var a=this.session.getTabSize(),b=this.$tabStrings=[0];for(var c=1;c<a+1;c++)this.showInvisibles?b.push("<span class='ace_invisible'>"+this.TAB_CHAR+(new Array(c)).join("&#160;")+"</span>"):b.push((new Array(c+1)).join("&#160;"))},this.updateLines=function(a,b,c){this.$computeTabString(),(this.config.lastRow!=a.lastRow||this.config.firstRow!=a.firstRow)&&this.scrollLines(a),this.config=a;var d=Math.max(b,a.firstRow),f=Math.min(c,a.lastRow),g=this.element.childNodes,h=0;for(var i=a.firstRow;i<d;i++){var j=this.session.getFoldLine(i);if(j){if(j.containsRow(d)){d=j.start.row;break}i=j.end.row}h++}for(var k=d;k<=f;k++){var l=g[h++];if(!l)continue;var m=[],n=this.session.getTokens(k,k);this.$renderLine(m,k,n[0].tokens,!this.$useLineGroups()),l=e.setInnerHtml(l,m.join("")),k=this.session.getRowFoldEnd(k)}},this.scrollLines=function(a){this.$computeTabString();var b=this.config;this.config=a;if(!b||b.lastRow<a.firstRow)return this.update(a);if(a.lastRow<b.firstRow)return this.update(a);var c=this.element;if(b.firstRow<a.firstRow)for(var d=this.session.getFoldedRowCount(b.firstRow,a.firstRow-1);d>0;d--)c.removeChild(c.firstChild);if(b.lastRow>a.lastRow)for(var d=this.session.getFoldedRowCount(a.lastRow+1,b.lastRow);d>0;d--)c.removeChild(c.lastChild);if(a.firstRow<b.firstRow){var e=this.$renderLinesFragment(a,a.firstRow,b.firstRow-1);c.firstChild?c.insertBefore(e,c.firstChild):c.appendChild(e)}if(a.lastRow>b.lastRow){var e=this.$renderLinesFragment(a,b.lastRow+1,a.lastRow);c.appendChild(e)}},this.$renderLinesFragment=function(a,b,c){var d=this.element.ownerDocument.createDocumentFragment(),f=b,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>c)break;var i=e.createElement("div"),j=[],k=this.session.getTokens(f,f);k.length==1&&this.$renderLine(j,f,k[0].tokens,!1),i.innerHTML=j.join("");if(this.$useLineGroups())i.className="ace_line_group",d.appendChild(i);else{var l=i.childNodes;while(l.length)d.appendChild(l[0])}f++}return d},this.update=function(a){this.$computeTabString(),this.config=a;var b=[],c=a.firstRow,d=a.lastRow,f=c,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>d)break;this.$useLineGroups()&&b.push("<div class='ace_line_group'>");var i=this.session.getTokens(f,f);i.length==1&&this.$renderLine(b,f,i[0].tokens,!1),this.$useLineGroups()&&b.push("</div>"),f++}this.element=e.setInnerHtml(this.element,b.join(""))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(a,b,c,d){var e=this,f=/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g,h=function(a,c,d,f,h){if(a.charCodeAt(0)==32)return(new Array(a.length+1)).join("&#160;");if(a=="	"){var i=e.session.getScreenTabSize(b+f);return b+=i-1,e.$tabStrings[i]}if(a=="&")return g.isOldGecko?"&":"&amp;";if(a=="<")return"&lt;";if(a=="　"){var j=e.showInvisibles?"ace_cjk ace_invisible":"ace_cjk",k=e.showInvisibles?e.SPACE_CHAR:"";return b+=1,"<span class='"+j+"' style='width:"+e.config.characterWidth*2+"px'>"+k+"</span>"}if(a.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)){if(e.showInvisibles){var k=(new Array(a.length+1)).join(e.SPACE_CHAR);return"<span class='ace_invisible'>"+k+"</span>"}return"&#160;"}return b+=1,"<span class='ace_cjk' style='width:"+e.config.characterWidth*2+"px'>"+a+"</span>"},i=d.replace(f,h);if(!this.$textToken[c.type]){var j="ace_"+c.type.replace(/\./g," ace_"),k="";c.type=="fold"&&(k=" style='width:"+c.value.length*this.config.characterWidth+"px;' "),a.push("<span class='",j,"'",k,">",i,"</span>")}else a.push(i);return b+d.length},this.$renderLineCore=function(a,b,c,d,e){var f=0,g=0,h,i=0,j=this;!d||d.length==0?h=Number.MAX_VALUE:h=d[0],e||a.push("<div class='ace_line' style='height:",this.config.lineHeight,"px","'>");for(var k=0;k<c.length;k++){var l=c[k],m=l.value;if(f+m.length<h)i=j.$renderToken(a,i,l,m),f+=m.length;else{while(f+m.length>=h)i=j.$renderToken(a,i,l,m.substring(0,h-f)),m=m.substring(h-f),f=h,e||a.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px","'>"),g++,i=0,h=d[g]||Number.MAX_VALUE;m.length!=0&&(f+=m.length,i=j.$renderToken(a,i,l,m))}}this.showInvisibles&&(b!==this.session.getLength()-1?a.push("<span class='ace_invisible'>"+this.EOL_CHAR+"</span>"):a.push("<span class='ace_invisible'>"+this.EOF_CHAR+"</span>")),e||a.push("</div>")},this.$renderLine=function(a,b,c,d){if(!this.session.isRowFolded(b)){var e=this.session.getRowSplitData(b);this.$renderLineCore(a,b,c,e,d)}else this.$renderFoldLine(a,b,c,d)},this.$renderFoldLine=function(a,b,c,d){function h(a,b,c){var d=0,e=0;while(e+a[d].value.length<b){e+=a[d].value.length,d++;if(d==a.length)return}if(e!=b){var f=a[d].value.substring(b-e);f.length>c-b&&(f=f.substring(0,c-b)),g.push({type:a[d].type,value:f}),e=b+f.length,d+=1}while(e<c){var f=a[d].value;f.length+e>c&&(f=f.substring(0,c-e)),g.push({type:a[d].type,value:f}),e+=f.length,d+=1}}var e=this.session,f=e.getFoldLine(b),g=[];f.walk(function(a,b,d,e,f){a?g.push({type:"fold",value:a}):(f&&(c=this.session.getTokens(b,b)[0].tokens),c.length!=0&&h(c,e,d))}.bind(this),f.end.row,this.session.getLine(f.end.row).length);var i=this.session.$useWrapMode?this.session.$wrapData[b]:null;this.$renderLineCore(a,b,g,i,d)},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(i.prototype),b.Text=i}),define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_cursor-layer",a.appendChild(this.element),this.isVisible=!1,this.cursors=[],this.cursor=this.addCursor()};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.addCursor=function(){var a=d.createElement("div"),b="ace_cursor";return this.isVisible||(b+=" ace_hidden"),this.overwrite&&(b+=" ace_overwrite"),a.className=b,this.element.appendChild(a),this.cursors.push(a),a},this.removeCursor=function(){if(this.cursors.length>1){var a=this.cursors.pop();return a.parentNode.removeChild(a),a}},this.hideCursor=function(){this.isVisible=!1;for(var a=this.cursors.length;a--;)d.addCssClass(this.cursors[a],"ace_hidden");clearInterval(this.blinkId)},this.showCursor=function(){this.isVisible=!0;for(var a=this.cursors.length;a--;)d.removeCssClass(this.cursors[a],"ace_hidden");this.element.style.visibility="",this.restartTimer()},this.restartTimer=function(){clearInterval(this.blinkId);if(!this.isVisible)return;var a=this.element;this.blinkId=setInterval(function(){a.style.visibility="hidden",setTimeout(function(){a.style.visibility="visible"},400)},1e3)},this.getPixelPosition=function(a,b){if(!this.config||!this.session)return{left:0,top:0};a||(a=this.session.selection.getCursor());var c=this.session.documentToScreenPosition(a),d=Math.round(this.$padding+c.column*this.config.characterWidth),e=(c.row-(b?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:d,top:e}},this.update=function(a){this.config=a;if(this.session.selectionMarkerCount>1){var b=this.session.$selectionMarkers,c=0,d,e=0;for(var c=b.length;c--;){d=b[c];var f=this.getPixelPosition(d.cursor,!0),g=(this.cursors[e++]||this.addCursor()).style;g.left=f.left+"px",g.top=f.top+"px",g.width=a.characterWidth+"px",g.height=a.lineHeight+"px"}if(e>1)while(this.cursors.length>e)this.removeCursor()}else{var f=this.getPixelPosition(null,!0),g=this.cursor.style;g.left=f.left+"px",g.top=f.top+"px",g.width=a.characterWidth+"px",g.height=a.lineHeight+"px";while(this.cursors.length>1)this.removeCursor()}var h=this.session.getOverwrite();h!=this.overwrite&&this.$setOverite(h),this.restartTimer()},this.$setOverite=function(a){this.overwrite=a;for(var b=this.cursors.length;b--;)a?d.addCssClass(this.cursors[b],"ace_overwrite"):d.removeCssClass(this.cursors[b],"ace_overwrite")},this.destroy=function(){clearInterval(this.blinkId)}}).call(e.prototype),b.Cursor=e}),define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/event_emitter").EventEmitter,h=function(a){this.element=e.createElement("div"),this.element.className="ace_sb",this.inner=e.createElement("div"),this.element.appendChild(this.inner),a.appendChild(this.element),this.width=e.scrollbarWidth(a.ownerDocument),this.element.style.width=(this.width||15)+5+"px",f.addListener(this.element,"scroll",this.onScroll.bind(this))};(function(){d.implement(this,g),this.onScroll=function(){this._emit("scroll",{data:this.element.scrollTop})},this.getWidth=function(){return this.width},this.setHeight=function(a){this.element.style.height=a+"px"},this.setInnerHeight=function(a){this.inner.style.height=a+"px"},this.setScrollTop=function(a){this.element.scrollTop=a}}).call(h.prototype),b.ScrollBar=h}),define("ace/renderloop",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("./lib/event"),e=function(a,b){this.onRender=a,this.pending=!1,this.changes=0,this.window=b||window};(function(){this.schedule=function(a){this.changes=this.changes|a;if(!this.pending){this.pending=!0;var b=this;d.nextTick(function(){b.pending=!1;var a;while(a=b.changes)b.changes=0,b.onRender(a)},this.window)}}}).call(e.prototype),b.RenderLoop=e}),define("text!ace/css/editor.css",[],".ace_editor {\n    position: absolute;\n    overflow: hidden;\n    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Consolas', monospace;\n    font-size: 12px;\n}\n\n.ace_scroller {\n    position: absolute;\n    overflow-x: scroll;\n    overflow-y: hidden;\n}\n\n.ace_content {\n    position: absolute;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    cursor: text;\n}\n\n.ace_composition {\n    position: absolute;\n    background: #555;\n    color: #DDD;\n    z-index: 4;\n}\n\n.ace_gutter {\n    position: absolute;\n    overflow : hidden;\n    height: 100%;\n    width: auto;\n    cursor: default;\n    z-index: 1000;\n}\n\n.ace_gutter.horscroll {\n    box-shadow: 0px 0px 20px rgba(0,0,0,0.4);\n}\n\n.ace_gutter-cell {\n    padding-left: 19px;\n    padding-right: 6px;\n}\n\n.ace_gutter-cell.ace_error {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_warning {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_info {\n    background-image: url(\"data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_editor .ace_sb {\n    position: absolute;\n    overflow-x: hidden;\n    overflow-y: scroll;\n    right: 0;\n}\n\n.ace_editor .ace_sb div {\n    position: absolute;\n    width: 1px;\n    left: 0;\n}\n\n.ace_editor .ace_print_margin_layer {\n    z-index: 0;\n    position: absolute;\n    overflow: hidden;\n    margin: 0;\n    left: 0;\n    height: 100%;\n    width: 100%;\n}\n\n.ace_editor .ace_print_margin {\n    position: absolute;\n    height: 100%;\n}\n\n.ace_editor textarea {\n    position: fixed;\n    z-index: 0;\n    width: 10px;\n    height: 30px;\n    opacity: 0;\n    background: transparent;\n    appearance: none;\n    -moz-appearance: none;\n    border: none;\n    resize: none;\n    outline: none;\n    overflow: hidden;\n}\n\n.ace_layer {\n    z-index: 1;\n    position: absolute;\n    overflow: hidden;\n    white-space: nowrap;\n    height: 100%;\n    width: 100%;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    /* setting pointer-events: auto; on node under the mouse, which changes\n        during scroll, will break mouse wheel scrolling in Safari */\n    pointer-events: none;\n}\n\n.ace_gutter .ace_layer {\n    position: relative;\n    min-width: 40px;\n    text-align: right;\n    pointer-events: auto;\n}\n\n.ace_text-layer {\n    color: black;\n}\n\n.ace_cjk {\n    display: inline-block;\n    text-align: center;\n}\n\n.ace_cursor-layer {\n    z-index: 4;\n}\n\n.ace_cursor {\n    z-index: 4;\n    position: absolute;\n}\n\n.ace_cursor.ace_hidden {\n    opacity: 0.2;\n}\n\n.ace_line {\n    white-space: nowrap;\n}\n\n.ace_marker-layer .ace_step {\n    position: absolute;\n    z-index: 3;\n}\n\n.ace_marker-layer .ace_selection {\n    position: absolute;\n    z-index: 5;\n}\n\n.ace_marker-layer .ace_bracket {\n    position: absolute;\n    z-index: 6;\n}\n\n.ace_marker-layer .ace_active_line {\n    position: absolute;\n    z-index: 2;\n}\n\n.ace_gutter .ace_gutter_active_line{\n    background-color : #dcdcdc;\n}\n\n.ace_marker-layer .ace_selected_word {\n    position: absolute;\n    z-index: 4;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n}\n\n.ace_line .ace_fold {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    \n    display: inline-block;\n    height: 11px;\n    margin-top: -2px;\n    vertical-align: middle;\n\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n    color: transparent;\n\n    border: 1px solid black;\n    -moz-border-radius: 2px;\n    -webkit-border-radius: 2px;\n    border-radius: 2px;\n    \n    cursor: pointer;\n    pointer-events: auto;\n}\n\n.ace_dark .ace_fold {\n}\n\n.ace_fold:hover{\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%003IDAT8%11c%FC%FF%FF%7F%3E%03%1A%60%01%F2%3F%A3%891%80%04%FFQ%26%F8w%C0%B43%A1%DB%0C%E2%8F%0A%A2%85%CAh%80%8C%06%08%3C%04%E8%96%18%00%A3S%0D%CD%CF%D8%C1%9D%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n}\n\n.ace_dragging .ace_content {\n    cursor: move;\n}\n\n.ace_folding-enabled > .ace_gutter-cell {\n    padding-right: 13px;\n}\n\n.ace_fold-widget {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n\n    margin: 0 -12px 1px 1px;\n    display: inline-block;\n    height: 14px;\n    width: 11px;\n    vertical-align: text-bottom;\n    \n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat;\n    background-position: center 5px;\n\n    border-radius: 3px;\n}\n\n.ace_fold-widget.end {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget.closed {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget:hover {\n    border: 1px solid rgba(0, 0, 0, 0.3);\n    background-color: rgba(255, 255, 255, 0.2);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    background-position: center 4px;\n}\n\n.ace_fold-widget:active {\n    border: 1px solid rgba(0, 0, 0, 0.4);\n    background-color: rgba(0, 0, 0, 0.05);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n}\n\n.ace_fold-widget.invalid {\n    background-color: #FFB4B4;\n    border-color: #DE5555;\n}\n"),define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor"],function(a,b,c){function j(a,b,c){return i.$options.wrap=!0,i.$options.needle=b,i.$options.backwards=c==-1,i.find(a)}function m(a,b){return a.row==b.row&&a.column==b.column}function n(a){a.$onAddRange=a.$onAddRange.bind(a),a.$onRemoveRange=a.$onRemoveRange.bind(a),a.$onMultiSelect=a.$onMultiSelect.bind(a),a.$onSingleSelect=a.$onSingleSelect.bind(a),b.onSessionChange.call(a,a),a.on("changeSession",b.onSessionChange.bind(a)),a.on("mousedown",g),a.commands.addCommands(b.commands.defaultCommands)}var d=a("./range_list").RangeList,e=a("./range").Range,f=a("./selection").Selection,g=a("./mouse/multi_select_handler").onMouseDown;b.commands=a("./commands/multi_select_commands");var h=a("./search").Search,i=new h,k=a("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(k.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(a){if(!this.inMultiSelectMode&&this.rangeCount==0){var b=this.toOrientedRange();if(!a||!a.isEqual(b))this.rangeList.add(b),this.$onAddRange(b)}if(!a)return;a.cursor||(a.cursor=a.end);var c=this.rangeList.add(a);this.$onAddRange(a),c.length&&this.$onRemoveRange(c),this.rangeCount>0&&!this.inMultiSelectMode&&(this._emit("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session))},this.toSingleRange=function(a){a=a||this.ranges[0];var b=this.rangeList.removeAll();b.length&&this.$onRemoveRange(b),a&&this.fromOrientedRange(a)},this.substractPoint=function(a){var b=this.rangeList.substractPoint(a);if(b)return this.$onRemoveRange(b),b[0]},this.mergeOverlappingRanges=function(){var a=this.rangeList.merge();a.length?this.$onRemoveRange(a):this.ranges[0]&&this.fromOrientedRange(this.ranges[0])},this.$onAddRange=function(a){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(a),this.fromOrientedRange(a),this._emit("addRange",{range:a})},this.$onRemoveRange=function(a){this.rangeCount=this.rangeList.ranges.length;if(this.rangeCount==1&&this.inMultiSelectMode){var b=this.rangeList.ranges.pop();a.push(b),this.rangeCount=0}for(var c=a.length;c--;){var d=this.ranges.indexOf(a[c]);this.ranges.splice(d,1)}this._emit("removeRange",{ranges:a}),this.rangeCount==0&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._emit("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),b=b||this.ranges[0],b&&!b.isEqual(this.getRange())&&this.fromOrientedRange(b)},this.$initRangeList=function(){if(this.rangeList)return;this.rangeList=new d,this.ranges=[],this.rangeCount=0},this.getAllRanges=function(){return this.rangeList.ranges.concat()},this.splitIntoLines=function(){if(this.rangeCount>1){var a=this.rangeList.ranges,b=a[a.length-1],c=e.fromPoints(a[0].start,b.end);this.toSingleRange(),this.setSelectionRange(c,b.cursor==b.start)}else{var d=this.session.documentToScreenPosition(this.selectionLead),f=this.session.documentToScreenPosition(this.selectionAnchor),g=this.rectangularRangeBlock(d,f);g.forEach(this.addRange,this)}},this.rectangularRangeBlock=function(a,b,c){var d=[],f=a.column<b.column;if(f)var g=a.column,h=b.column;else var g=b.column,h=a.column;var i=a.row<b.row;if(i)var j=a.row,k=b.row;else var j=b.row,k=a.row;g<0&&(g=0),j<0&&(j=0),j==k&&(c=!0);for(var l=j;l<=k;l++){var n=e.fromPoints(this.session.screenToDocumentPosition(l,g),this.session.screenToDocumentPosition(l,h));if(n.isEmpty()){if(o&&m(n.end,o))break;var o=n.end}n.cursor=f?n.start:n.end,d.push(n)}i&&d.reverse();if(!c){var p=d.length-1;while(d[p].isEmpty()&&p>0)p--;if(p>0){var q=0;while(d[q].isEmpty())q++}for(var r=p;r>=q;r--)d[r].isEmpty()&&d.splice(r,1)}return d}}.call(f.prototype);var l=a("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(a){a.cursor||(a.cursor=a.end);var b=this.getSelectionStyle();return a.marker=this.session.addMarker(a,"ace_selection",b),this.session.$selectionMarkers.push(a),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,a},this.removeSelectionMarkers=function(a){for(var b=a.length;b--;){var c=a[b];if(!c.marker)continue;this.session.removeMarker(c.marker);var d=this.session.$selectionMarkers.indexOf(c);d!=-1&&this.session.$selectionMarkers.splice(d,1)}this.session.selectionMarkerCount=this.session.$selectionMarkers.length},this.$onAddRange=function(a){this.addSelectionMarker(a.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(a){this.removeSelectionMarkers(a.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(a){if(this.inMultiSelectMode)return;this.inMultiSelectMode=!0,this.setStyle("multiselect"),this.keyBinding.addKeyboardHandler(b.commands.keyboardHandler),this.commands.on("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onSingleSelect=function(a){if(this.session.multiSelect.inVirtualMode)return;this.inMultiSelectMode=!1,this.unsetStyle("multiselect"),this.keyBinding.removeKeyboardHandler(b.commands.keyboardHandler),this.commands.removeEventListener("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelectExec=function(a){var b=a.command,c=a.editor;b.multiSelectAction?b.multiSelectAction=="forEach"?c.forEachSelection(b,a.args):b.multiSelectAction=="single"?(c.exitMultiSelectMode(),b.exec(c,a.args||{})):b.multiSelectAction(c,a.args||{}):(b.exec(c,a.args||{}),c.multiSelect.addRange(c.multiSelect.toOrientedRange()),c.multiSelect.mergeOverlappingRanges()),a.preventDefault()},this.forEachSelection=function(a,b){if(this.inVirtualSelectionMode)return;var c=this.session,d=this.selection,e=d.rangeList,g=d._eventRegistry;d._eventRegistry={};var h=new f(c);this.inVirtualSelectionMode=!0;for(var i=e.ranges.length;i--;)h.fromOrientedRange(e.ranges[i]),this.selection=c.selection=h,a.exec(this,b||{}),h.toOrientedRange(e.ranges[i]);h.detach(),this.selection=c.selection=d,this.inVirtualSelectionMode=!1,d._eventRegistry=g,d.mergeOverlappingRanges(),this.onCursorChange(),this.onSelectionChange()},this.exitMultiSelectMode=function(){if(this.inVirtualSelectionMode)return;this.multiSelect.toSingleRange()},this.getCopyText=function(){var a="";if(this.inMultiSelectMode){var b=this.multiSelect.rangeList.ranges;a=[];for(var c=0;c<b.length;c++)a.push(this.session.getTextRange(b[c]));a=a.join(this.session.getDocument().getNewLineCharacter())}else this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange()));return a},this.selectMoreLines=function(a,b){var c=this.selection.toOrientedRange(),d=c.cursor==c.end,f=this.session.documentToScreenPosition(c.cursor);this.selection.$desiredColumn&&(f.column=this.selection.$desiredColumn);var g=this.session.screenToDocumentPosition(f.row+a,f.column);if(!c.isEmpty())var h=this.session.documentToScreenPosition(d?c.end:c.start),i=this.session.screenToDocumentPosition(h.row+a,h.column);else var i=g;if(d){var j=e.fromPoints(g,i);j.cursor=j.start}else{var j=e.fromPoints(i,g);j.cursor=j.end}j.desiredColumn=f.column;if(!this.selection.inMultiSelectMode)this.selection.addRange(c);else if(b)var k=c.cursor;this.selection.addRange(j),k&&this.selection.substractPoint(k)},this.transposeSelections=function(a){var b=this.session,c=b.multiSelect,d=c.ranges;for(var e=d.length;e--;){var f=d[e];if(f.isEmpty()){var g=b.getWordRange(f.start.row,f.start.column);f.start.row=g.start.row,f.start.column=g.start.column,f.end.row=g.end.row,f.end.column=g.end.column}}c.mergeOverlappingRanges();var h=[];for(var e=d.length;e--;){var f=d[e];h.unshift(b.getTextRange(f))}a<0?h.unshift(h.pop()):h.push(h.shift());for(var e=d.length;e--;){var f=d[e],g=f.clone();b.replace(f,h[e]),f.start.row=g.start.row,f.start.column=g.start.column}},this.selectMore=function(a,b){var c=this.session,d=c.multiSelect,e=d.toOrientedRange();if(e.isEmpty()){var e=c.getWordRange(e.start.row,e.start.column);e.cursor=e.end,this.multiSelect.addRange(e)}var f=c.getTextRange(e),g=j(c,f,a);g&&(g.cursor=a==-1?g.start:g.end,this.multiSelect.addRange(g)),b&&this.multiSelect.substractPoint(e.cursor)}}).call(l.prototype),b.onSessionChange=function(a){var b=a.session;b.multiSelect||(b.$selectionMarkers=[],b.selection.$initRangeList(),b.multiSelect=b.selection),this.multiSelect=b.multiSelect;var c=a.oldSession;c&&(c.multiSelect&&c.multiSelect.editor==this&&(c.multiSelect.editor=null),b.multiSelect.removeEventListener("addRange",this.$onAddRange),b.multiSelect.removeEventListener("removeRange",this.$onRemoveRange),b.multiSelect.removeEventListener("multiSelect",this.$onMultiSelect),b.multiSelect.removeEventListener("singleSelect",this.$onSingleSelect)),b.multiSelect.on("addRange",this.$onAddRange),b.multiSelect.on("removeRange",this.$onRemoveRange),b.multiSelect.on("multiSelect",this.$onMultiSelect),b.multiSelect.on("singleSelect",this.$onSingleSelect),this.inMultiSelectMode!=b.selection.inMultiSelectMode&&(b.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},b.MultiSelect=n}),define("ace/range_list",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.ranges=[]};(function(){this.comparePoints=function(a,b){return a.row-b.row||a.column-b.column},this.pointIndex=function(a,b){var c=this.ranges;for(var d=b||0;d<c.length;d++){var e=c[d],f=this.comparePoints(a,e.end);if(f>0)continue;return f==0?d:(f=this.comparePoints(a,e.start),f>=0?d:-d-1)}return-d-1},this.add=function(a){var b=this.pointIndex(a.start);b<0&&(b=-b-1);var c=this.pointIndex(a.end,b);return c<0?c=-c-1:c++,this.ranges.splice(b,c-b,a)},this.addList=function(a){var b=[];for(var c=a.length;c--;)b.push.call(b,this.add(a[c]));return b},this.substractPoint=function(a){var b=this.pointIndex(a);if(b>=0)return this.ranges.splice(b,1)},this.merge=function(){var a=[],b=this.ranges,c=b[0],d;for(var e=1;e<b.length;e++){d=c,c=b[e];var f=this.comparePoints(d.end,c.start);if(f<0)continue;if(f==0&&!d.isEmpty()&&!c.isEmpty())continue;this.comparePoints(d.end,c.end)<0&&(d.end.row=c.end.row,d.end.column=c.end.column),b.splice(e,1),a.push(c),c=d,e--}return a},this.contains=function(a,b){return this.pointIndex({row:a,column:b})>=0},this.containsPoint=function(a){return this.pointIndex(a)>=0},this.rangeAtPoint=function(a){var b=this.pointIndex(a);if(b>=0)return this.ranges[b]},this.clipRows=function(a,b){var c=this.ranges;if(c[0].start.row>b||c[c.length-1].start.row<a)return[];var d=this.pointIndex({row:a,column:0});d<0&&(d=-d-1);var e=this.pointIndex({row:b,column:0},d);e<0&&(e=-e-1);var f=[];for(var g=d;g<e;g++)f.push(c[g]);return f},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(a){this.session&&this.detach(),this.session=a,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){if(!this.session)return;this.session.removeListener("change",this.onChange),this.session=null},this.$onChange=function(a){var b=a.data.range;if(a.data.action[0]=="i")var c=b.start,d=b.end;else var d=b.start,c=b.end;var e=c.row,f=d.row,g=f-e,h=-c.column+d.column,i=this.ranges;for(var j=0,k=i.length;j<k;j++){var l=i[j];if(l.end.row<e)continue;if(l.start.row>e)break;l.start.row==e&&l.start.column>=c.column&&(l.start.column+=h,l.start.row+=g),l.end.row==e&&l.end.column>=c.column&&(l.end.column+=h,l.end.row+=g)}if(g!=0&&j<k)for(;j<k;j++){var l=i[j];l.start.row+=g,l.end.row+=g}}}).call(d.prototype),b.RangeList=d}),define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event"],function(a,b,c){function e(a,b){return a.row==b.row&&a.column==b.column}function f(a){var b=a.domEvent,c=b.altKey,f=b.shiftKey,g=a.getAccelKey(),h=a.getButton();if(!g&&!c){if(a.editor.inMultiSelectMode)if(h==0)a.editor.exitMultiSelectMode();else if(h==2){var i=a.editor,j=i.selection.isEmpty();i.textInput.onContextMenu({x:a.clientX,y:a.clientY},j),d.capture(i.container,function(){},i.textInput.onContextMenuClose),a.stop()}return}var i=a.editor,k=i.selection,l=i.inMultiSelectMode,m=a.getDocumentPosition(),n=k.getCursor(),o=a.inSelection()||k.isEmpty()&&e(m,n),p=a.pageX,q=a.pageY,r=function(a){p=d.getDocumentX(a),q=d.getDocumentY(a)},s=function(){var a=i.renderer.pixelToScreenCoordinates(p,q),b=t.screenToDocumentPosition(a.row,a.column);if(e(v,a)&&e(b,k.selectionLead))return;v=a,i.selection.moveCursorToPosition(b),i.selection.clearSelection(),i.renderer.scrollCursorIntoView(),i.removeSelectionMarkers(x),x=k.rectangularRangeBlock(v,u),x.forEach(i.addSelectionMarker,i),i.updateSelectionMarkers()},t=i.session,u=i.renderer.pixelToScreenCoordinates(p,q),v=u;if(g&&!f&&!c&&h==0){if(!l&&o)return;l||k.addRange(k.toOrientedRange());var w=k.rangeList.rangeAtPoint(m);d.capture(i.container,function(){},function(){var a=k.toOrientedRange();w&&a.isEmpty()&&e(w.cursor,a.cursor)?k.substractPoint(a.cursor):k.addRange(a)})}else if(!f&&c&&h==0){a.stop(),l&&!g?k.toSingleRange():!l&&g&&k.addRange(),k.moveCursorToPosition(m),k.clearSelection();var x=[],y=function(a){clearInterval(A),i.removeSelectionMarkers(x);for(var b=0;b<x.length;b++)k.addRange(x[b])},z=s;d.capture(i.container,r,y);var A=setInterval(function(){z()},20);return a.preventDefault()}}var d=a("../lib/event");b.onMouseDown=f}),define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],function(a,b,c){b.defaultCommands=[{name:"addCursorAbove",exec:function(a){a.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},readonly:!0},{name:"addCursorBelow",exec:function(a){a.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},readonly:!0},{name:"addCursorAboveSkipCurrent",exec:function(a){a.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},readonly:!0},{name:"addCursorBelowSkipCurrent",exec:function(a){a.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},readonly:!0},{name:"selectMoreBefore",exec:function(a){a.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},readonly:!0},{name:"selectMoreAfter",exec:function(a){a.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},readonly:!0},{name:"selectNextBefore",exec:function(a){a.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},readonly:!0},{name:"selectNextAfter",exec:function(a){a.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},readonly:!0},{name:"splitIntoLines",exec:function(a){a.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Shift-L",mac:"Ctrl-Shift-L"},readonly:!0}],b.multiEditCommands=[{name:"singleSelection",bindKey:"esc",exec:function(a){a.exitMultiSelectMode()},readonly:!0}];var d=a("../keyboard/hash_handler").HashHandler;b.keyboardHandler=new d(b.multiEditCommands)}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/config"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=a("../config"),g=function(b,c,d,e){this.changeListener=this.changeListener.bind(this);if(f.get("packaged"))this.$worker=new Worker(f.get("workerPath")+"/"+c);else{var g=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(g);var h={};for(var i=0;i<b.length;i++){var j=b[i],k=this.$normalizePath(a.nameToUrl(j,null,"_").replace(/.js$/,""));h[j]=k}}this.$worker.postMessage({init:!0,tlns:h,module:d,classname:e}),this.callbackId=1,this.callbacks={};var l=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":l._emit(b.name,{data:b.data});break;case"call":var c=l.callbacks[b.id];c&&(c(b.data),delete l.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+/,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}}).call(g.prototype),b.WorkerClient=g}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e}),define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./range").Range,e=a("./lib/event_emitter").EventEmitter,f=a("./lib/oop"),g=function(a,b,c,d,e,f){var g=this;this.length=b,this.session=a,this.doc=a.getDocument(),this.mainClass=e,this.othersClass=f,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=d,this.$onCursorChange=function(){setTimeout(function(){g.onCursorChange()})},this.$pos=c;var h=a.getUndoManager().$undoStack||a.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=h.length,this.setup(),a.selection.on("changeCursor",this.$onCursorChange)};(function(){f.implement(this,e),this.setup=function(){var a=this,b=this.doc,c=this.session,e=this.$pos;this.pos=b.createAnchor(e.row,e.column),this.markerId=c.addMarker(new d(e.row,e.column,e.row,e.column+this.length),this.mainClass,null,!1),this.pos.on("change",function(b){c.removeMarker(a.markerId),a.markerId=c.addMarker(new d(b.value.row,b.value.column,b.value.row,b.value.column+a.length),a.mainClass,null,!1)}),this.others=[],this.$others.forEach(function(c){var d=b.createAnchor(c.row,c.column);a.others.push(d)}),c.setUndoSelect(!1)},this.showOtherMarkers=function(){if(this.othersActive)return;var a=this.session,b=this;this.othersActive=!0,this.others.forEach(function(c){c.markerId=a.addMarker(new d(c.row,c.column,c.row,c.column+b.length),b.othersClass,null,!1),c.on("change",function(e){a.removeMarker(c.markerId),c.markerId=a.addMarker(new d(e.value.row,e.value.column,e.value.row,e.value.column+b.length),b.othersClass,null,!1)})})},this.hideOtherMarkers=function(){if(!this.othersActive)return;this.othersActive=!1;for(var a=0;a<this.others.length;a++)this.session.removeMarker(this.others[a].markerId)},this.onUpdate=function(a){var b=a.data,c=b.range;if(c.start.row!==c.end.row)return;if(c.start.row!==this.pos.row)return;if(this.$updating)return;this.$updating=!0;var e=b.action==="insertText"?c.end.column-c.start.column:c.start.column-c.end.column;if(c.start.column>=this.pos.column&&c.start.column<=this.pos.column+this.length+1){var f=c.start.column-this.pos.column;this.length+=e;if(!this.session.$fromUndo){if(b.action==="insertText")for(var g=this.others.length-1;g>=0;g--){var h=this.others[g],i={row:h.row,column:h.column+f};h.row===c.start.row&&c.start.column<h.column&&(i.column+=e),this.doc.insert(i,b.text)}else if(b.action==="removeText")for(var g=this.others.length-1;g>=0;g--){var h=this.others[g],i={row:h.row,column:h.column+f};h.row===c.start.row&&c.start.column<h.column&&(i.column+=e),this.doc.remove(new d(i.row,i.column,i.row,i.column-e))}c.start.column===this.pos.column&&b.action==="insertText"?setTimeout(function(){this.pos.setPosition(this.pos.row,this.pos.column-e);for(var a=0;a<this.others.length;a++){var b=this.others[a],d={row:b.row,column:b.column-e};b.row===c.start.row&&c.start.column<b.column&&(d.column+=e),b.setPosition(d.row,d.column)}}.bind(this),0):c.start.column===this.pos.column&&b.action==="removeText"&&setTimeout(function(){for(var a=0;a<this.others.length;a++){var b=this.others[a];b.row===c.start.row&&c.start.column<b.column&&b.setPosition(b.row,b.column-e)}}.bind(this),0)}this.pos._emit("change",{value:this.pos});for(var g=0;g<this.others.length;g++)this.others[g]._emit("change",{value:this.others[g]})}this.$updating=!1},this.onCursorChange=function(a){if(this.$updating)return;var b=this.session.selection.getCursor();b.row===this.pos.row&&b.column>=this.pos.column&&b.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",a)):(this.hideOtherMarkers(),this._emit("cursorLeave",a))},this.detach=function(){this.session.removeMarker(this.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.pos.detach();for(var a=0;a<this.others.length;a++)this.others[a].detach();this.session.setUndoSelect(!0)},this.cancel=function(){if(this.$undoStackDepth===-1)throw Error("Canceling placeholders only supported with undo manager attached to session.");var a=this.session.getUndoManager(),b=(a.$undoStack||a.$undostack).length-this.$undoStackDepth;for(var c=0;c<b;c++)a.undo(!0)}}).call(g.prototype),b.PlaceHolder=g}),define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict",b.isDark=!1,b.cssClass="ace-tm",b.cssText=".ace-tm .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tm .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tm .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tm .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tm .ace_fold {    background-color: #6B72E6;}.ace-tm .ace_text-layer {  cursor: text;}.ace-tm .ace_cursor {  border-left: 1px solid black;}.ace-tm .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}        .ace-tm .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-tm .ace_line .ace_storage,.ace-tm .ace_line .ace_keyword {  color: blue;}.ace-tm .ace_line .ace_constant {  color: rgb(197, 6, 11);}.ace-tm .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-tm .ace_line .ace_constant.ace_language {  color: rgb(88, 92, 246);}.ace-tm .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_invalid {  background-color: rgb(153, 0, 0);  color: white;}.ace-tm .ace_line .ace_support.ace_function {  color: rgb(60, 76, 114);}.ace-tm .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_support.ace_type,.ace-tm .ace_line .ace_support.ace_class {  color: rgb(109, 121, 222);}.ace-tm .ace_line .ace_keyword.ace_operator {  color: rgb(104, 118, 135);}.ace-tm .ace_line .ace_string {  color: rgb(3, 106, 7);}.ace-tm .ace_line .ace_comment {  color: rgb(76, 136, 107);}.ace-tm .ace_line .ace_comment.ace_doc {  color: rgb(0, 102, 255);}.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(128, 159, 191);}.ace-tm .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 205);}.ace-tm .ace_line .ace_variable {  color: rgb(49, 132, 149);}.ace-tm .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {  color: #0000A2;}.ace-tm .ace_markup.ace_markupine {    text-decoration:underline;}.ace-tm .ace_markup.ace_heading {  color: rgb(12, 7, 255);}.ace-tm .ace_markup.ace_list {  color:rgb(185, 6, 144);}.ace-tm .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-tm .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_meta.ace_tag {  color:rgb(28, 2, 255);}.ace-tm .ace_string.ace_regex {  color: rgb(255, 0, 0)}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)});
             (function() {
                 window.require(["ace/ace"], function(a) {
                     if (!window.ace)
@@ -7,4 +7,3 @@
                         ace[key] = a[key];
                 });
             })();
-        
\ No newline at end of file

From c98b56d2da8f3d95eb7dd665e15df1f623dbdb30 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 13 Jun 2012 21:16:23 +0200
Subject: [PATCH 0366/1537] CSSMin: Remove debug code

---
 3rdparty/mediawiki/CSSMin.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/3rdparty/mediawiki/CSSMin.php b/3rdparty/mediawiki/CSSMin.php
index 1ee2919140..e9c2badf62 100644
--- a/3rdparty/mediawiki/CSSMin.php
+++ b/3rdparty/mediawiki/CSSMin.php
@@ -172,7 +172,6 @@ class CSSMin {
 					$type = self::getMimeType( $file );
 					// Detect when URLs were preceeded with embed tags, and also verify file size is
 					// below the limit
-			var_dump($match['embed'], $file, filesize($file));
 					if (
 						$type
 						&& $match['embed'][1] > 0

From 12b34d2dda6569f0f06ead29488c19ec8b9a5a8c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 13 Jun 2012 21:39:05 +0200
Subject: [PATCH 0367/1537] Whitespace fix

---
 lib/filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index dd74daffa4..28bd7d5290 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -319,7 +319,7 @@ class OC_Filesystem{
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
-    if (self::getView() != null && $mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
+		if (self::getView() != null && $mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
 			self::mkdir(basename($mountpoint));
 		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);

From 6bd80d6457177a47cfb5f98d9bcb224556ed12a1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:06:22 +0200
Subject: [PATCH 0368/1537] show username of the body who shares in the summary

---
 apps/calendar/ajax/events.php |  1 -
 apps/calendar/lib/app.php     | 15 +++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 56fa51aaff..b0c5587633 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -27,7 +27,6 @@ else {
 $start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']);
 $end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']);
 $events = OC_Calendar_App::getrequestedEvents($calendar_id, $start, $end);
-
 $output = array();
 foreach($events as $event){
 	$output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end));
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index ff7ad1cb93..e04f2ed0cd 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -331,26 +331,29 @@ class OC_Calendar_App{
 	 */
 	public static function getrequestedEvents($calendarid, $start, $end){
 		$events = array();
-		if($calendarid == 'shared_rw' || $_GET['calendar_id'] == 'shared_r'){
+		if($calendarid == 'shared_rw' || $calendarid == 'shared_r'){
 			$calendars = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR, 1, ($_GET['calendar_id'] == 'shared_rw')?'rw':'r');
 			foreach($calendars as $calendar){
 				$calendarevents = OC_Calendar_Object::allInPeriod($calendar['calendarid'], $start, $end);
+				foreach($calendarevents as $event){
+					$event['summary'] .= ' (' . self::$l10n->t('by') .  ' ' . OC_Calendar_Object::getowner($event['id']) . ')';
+				}
 				$events = array_merge($events, $calendarevents);
 			}
 			$singleevents = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::EVENT, 1, ($_GET['calendar_id'] == 'shared_rw')?'rw':'r');
 			foreach($singleevents as $singleevent){
 				$event = OC_Calendar_Object::find($singleevent['eventid']);
+				$event['summary'] .= ' (' . self::$l10n->t('by') .  ' ' . OC_Calendar_Object::getowner($event['id']) . ')';
 				$events[] =  $event;
 			}
 		}else{
-			$calendar_id = $_GET['calendar_id'];
-			if (is_numeric($calendar_id)) {
-				$calendar = self::getCalendar($calendar_id);
+			if (is_numeric($calendarid)) {
+				$calendar = self::getCalendar($calendarid);
 				OCP\Response::enableCaching(0);
 				OCP\Response::setETagHeader($calendar['ctag']);
-				$events = OC_Calendar_Object::allInPeriod($calendar_id, $start, $end);
+				$events = OC_Calendar_Object::allInPeriod($calendarid, $start, $end);
 			} else {
-				OCP\Util::emitHook('OC_Calendar', 'getEvents', array('calendar_id' => $calendar_id, 'events' => &$events));
+				OCP\Util::emitHook('OC_Calendar', 'getEvents', array('calendar_id' => $calendarid, 'events' => &$events));
 			}
 		}
 		return $events;

From b1139e977a2ac6fbbf55ed78e674a60c66588b66 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:12:54 +0200
Subject: [PATCH 0369/1537] fix a ui bug for calendar sharing

---
 apps/calendar/templates/part.showevent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
index a5bbfd5b8f..3acba45723 100644
--- a/apps/calendar/templates/part.showevent.php
+++ b/apps/calendar/templates/part.showevent.php
@@ -33,7 +33,7 @@
 				<select name="calendar" disabled="disabled">
 					<option>
 					<?php
-					$calendar = OC_Calendar_App::getCalendar($_['calendar']);
+					$calendar = OC_Calendar_App::getCalendar($_['calendar'], false, false);
 					echo $calendar['displayname'] . ' ' . $l->t('of') . ' ' . $calendar['userid'];
 					?>
 					</option>

From 2e44ffaf021aed95a649a16cae2585b75a45655d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:14:40 +0200
Subject: [PATCH 0370/1537] another ui fix

---
 apps/calendar/templates/part.showevent.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
index 3acba45723..43092e3195 100644
--- a/apps/calendar/templates/part.showevent.php
+++ b/apps/calendar/templates/part.showevent.php
@@ -30,15 +30,10 @@
 			</td>
 			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
 			<td>
-				<select name="calendar" disabled="disabled">
-					<option>
-					<?php
-					$calendar = OC_Calendar_App::getCalendar($_['calendar'], false, false);
-					echo $calendar['displayname'] . ' ' . $l->t('of') . ' ' . $calendar['userid'];
-					?>
-					</option>
-					
-				</select>
+			<?php
+			$calendar = OC_Calendar_App::getCalendar($_['calendar'], false, false);
+			echo $calendar['displayname'] . ' ' . $l->t('of') . ' ' . $calendar['userid'];
+			?>
 			</td>
 			<th width="75px">&nbsp;</th>
 			<td>

From e15480683820426870be62a26dc7b91cbdc9a157 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:20:43 +0200
Subject: [PATCH 0371/1537] fix another ui bug of calendar

---
 apps/calendar/templates/part.showevent.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
index 43092e3195..59684d831e 100644
--- a/apps/calendar/templates/part.showevent.php
+++ b/apps/calendar/templates/part.showevent.php
@@ -19,12 +19,14 @@
 			<th width="75px"><?php echo $l->t("Category");?>:</th>
 			<td>
 				<?php
-				if(count($_['categories']) == 0){
+				if(count($_['categories']) == 0 || $_['categories'] == ''){
 					echo $l->t('No categories selected');
 				}else{
-					echo '<select id="category" name="categories[]" multiple="multiple" title="' .  $l->t("Select category") . '">';
-					echo OCP\html_select_options($_['categories'], $_['categories'], array('combine'=>true));
-					echo '</select>';
+					echo '<ul>';
+					foreach($_['categories'] as $categorie){
+						echo '<li>' . $categorie . '</li>';
+					}
+					echo '</ul>';
 				}
 				?>
 			</td>

From e4278574a8806b4748d132adb5f29fb61e6c6058 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 03:23:22 +0200
Subject: [PATCH 0372/1537] fixed sorting errors and missbehaviours - now
 sorting like file browser

---
 apps/gallery/lib/tiles.php       | 39 +++++++++++++-------
 apps/gallery/templates/index.php | 61 ++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index e43c99bb76..48b54f0cf0 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -63,7 +63,7 @@ class TilesLine {
 				$img_w = $this->tiles_array[$i]->getWidth();
 				$extra = '';
 				if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
-			$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
+				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
 		}
 		
 		$r .= '</div>';
@@ -122,7 +122,7 @@ class TileStack extends TileBase {
 		$this->tiles_array = array();
 		$this->stack_name = $stack_name;
 		for ($i = 0; $i < count($path_array) && $i < self::STACK_REPRESENTATIVES; $i++) {
-		$tile = new TileSingle($path_array[$i]);
+			$tile = new TileSingle($path_array[$i]);
 			array_push($this->tiles_array, $tile);
 		}
 	}
@@ -134,32 +134,47 @@ class TileStack extends TileBase {
 
 	public function getWidth() {
 		$max = 0;
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$max = max($max, $this->tiles_array[$i]->getWidth());
+		if(count($this->tiles_array) == 0) {
+			$max = IMAGE_WIDTH;
+		} else {
+			for ($i = 0; $i < count($this->tiles_array); $i++) {
+				$max = max($max, $this->tiles_array[$i]->getWidth());
+			}
 		}
 		return min(IMAGE_WIDTH, $max);
 	}
 
 	public function get() {
 		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$top = rand(-5, 5);
-			$left = rand(-5, 5);
-			$img_w = $this->tiles_array[$i]->getWidth();
-			$extra = '';
-			if ($img_w < IMAGE_WIDTH) {
-				$extra = 'width:'.$img_w.'px;';
+		if(count($this->tiles_array) == 0) {
+			// aint no pictures in this folder...
+			$r.='<div class="miniature_border gallery_div" style="border:2px solid; margin-right: 2px;"></div>';
+		} else {
+			for ($i = 0; $i < count($this->tiles_array); $i++) {
+				$top = rand(-5, 5);
+				$left = rand(-5, 5);
+				$img_w = $this->tiles_array[$i]->getWidth();
+				$extra = '';
+				if ($img_w < IMAGE_WIDTH) {
+					$extra = 'width:'.$img_w.'px;';
+				}
+				$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
 			}
-			$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
 		}
 		return $r;
 	}
 
 	public function getOnHoverAction() {
+		if(count($this->tiles_array) == 0) {
+			return 'javascript:explode_empty(this);return false;';
+		}
 		return 'javascript:explode(this);return false;';
 	}
 	
 	public function getOnOutAction() {
+		if(count($this->tiles_array) == 0) {
+			return 'javascript:deplode_empty(this);return false;';
+		}
 		return 'javascript:deplode(this);return false;';
 	}
 
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index f992604549..930f80238b 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -16,6 +16,14 @@ div.visible { opacity: 0.8;}
 
 var root = "<?php echo htmlentities($root); ?>";
 
+function explode_empty(element) {
+	$('div', element).each(function(index, elem) {
+		if ($(elem).hasClass('title')) {
+			$(elem).addClass('visible');
+		}
+	});
+}
+
 function explode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -28,6 +36,14 @@ function explode(element) {
 	});
 }
 
+function deplode_empty(element) {
+	$('div', element).each(function(index, elem) {
+		if ($(elem).hasClass('title')) {
+			$(elem).removeClass('visible');
+		}
+	});
+}
+
 function deplode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -79,41 +95,40 @@ $root = empty($_GET['root'])?'/':$_GET['root'];
 $images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
 sort($images);
 
-$arr = array();
 $tl = new \OC\Pictures\TilesLine();
 $ts = new \OC\Pictures\TileStack(array(), '');
 $previous_element = @$images[0];
+
+$root_images = array();
+$second_level_images = array();
+
 for($i = 0; $i < count($images); $i++) {
 	$prev_dir_arr = explode('/', $previous_element);
 	$dir_arr = explode('/', $images[$i]);
 
-	if (count($dir_arr)==1) {
-		$tl->addTile(new \OC\Pictures\TileSingle($root.$images[$i]));
-		continue;
+	if(count($dir_arr) == 1) { // getting the images in this directory
+		$root_images[] = $root.$images[$i];
+	} else {
+		if (count($dir_arr) == 2) { // These are the pics in that subdir
+			$second_level_images[] = $root.$images[$i];
+		}
+		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
+			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+			$second_level_images = array();
+		}
+		// have us a little something to compare against
+		$previous_element = $images[$i];
 	}
-	if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
-		$tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
-		$arr = array();
-	}
-	$arr[] = $root.$images[$i];
-	$previous_element = $images[$i];
 }
 
-$dir_arr = explode('/', $previous_element);
-
-if (count($images)>1) {
-  if (count($dir_arr)==0) {
-    $tl->addTile(new \OC\Pictures\TileSingle($previous_element));
-  } else if (count($dir_arr) && $ts->getCount() == 0){
-      $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
-  } else {
-    $arr[] = $previous_element;
-    $ts->addTile($arr);
-  }
+// if last element in the directory was a directory we don't want to miss it :)
+if(count($second_level_images)>0) {
+	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 }
 
-if ($ts->getCount() != 0) {
-	$tl->addTile($ts);
+// and finally our images actually stored in the root folder
+for($i = 0; $i<count($root_images); $i++) {
+	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));
 }
 
 echo $tl->get();

From 4711c2bb412749100fa53d8e1684154b87846092 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 13:05:25 +0200
Subject: [PATCH 0373/1537] fixed second_level_images issue

---
 apps/gallery/templates/index.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 930f80238b..5a9aba9ea0 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -109,12 +109,11 @@ for($i = 0; $i < count($images); $i++) {
 	if(count($dir_arr) == 1) { // getting the images in this directory
 		$root_images[] = $root.$images[$i];
 	} else {
-		if (count($dir_arr) == 2) { // These are the pics in that subdir
-			$second_level_images[] = $root.$images[$i];
-		}
 		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
 			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 			$second_level_images = array();
+		} else if (count($dir_arr) == 2) { // These are the pics in that subdir
+			$second_level_images[] = $root.$images[$i];
 		}
 		// have us a little something to compare against
 		$previous_element = $images[$i];

From e99a95a756b15028b11871c3c7350066f2751964 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 14:06:56 +0200
Subject: [PATCH 0374/1537] now also working for directories only containing
 one image

---
 apps/gallery/templates/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 5a9aba9ea0..5cff2c65a0 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -112,7 +112,8 @@ for($i = 0; $i < count($images); $i++) {
 		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
 			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 			$second_level_images = array();
-		} else if (count($dir_arr) == 2) { // These are the pics in that subdir
+		}
+		if (count($dir_arr) == 2) { // These are the pics in that subdir
 			$second_level_images[] = $root.$images[$i];
 		}
 		// have us a little something to compare against

From 9f59cc5eb0069f28fc17eebc2adb3a62a13f95bd Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 14:38:12 +0200
Subject: [PATCH 0375/1537] improved look of directories not containing images
 directly

---
 apps/gallery/lib/tiles.php       | 4 ++--
 apps/gallery/templates/index.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 48b54f0cf0..817939759d 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -63,7 +63,7 @@ class TilesLine {
 				$img_w = $this->tiles_array[$i]->getWidth();
 				$extra = '';
 				if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
-				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
+				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'" style="background-color:#ddd">'.$this->tiles_array[$i]->get().'</div>';
 		}
 		
 		$r .= '</div>';
@@ -148,7 +148,7 @@ class TileStack extends TileBase {
 		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
 		if(count($this->tiles_array) == 0) {
 			// aint no pictures in this folder...
-			$r.='<div class="miniature_border gallery_div" style="border:2px solid; margin-right: 2px;"></div>';
+			$r.='<div class="miniature_border gallery_div"></div>';
 		} else {
 			for ($i = 0; $i < count($this->tiles_array); $i++) {
 				$top = rand(-5, 5);
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 5cff2c65a0..42ef9f6587 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -9,7 +9,7 @@ div.miniature_border {position:absolute; height: 150px; -moz-transition-duration
 div.line {display:inline-block; border: 0; width: auto; height: 160px}
 div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
 div.gallery_div img.shrinker {width:80px !important;}
-div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
+div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; right:-5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
 div.visible { opacity: 0.8;}
 </style>
 <script type="text/javascript">
@@ -59,7 +59,7 @@ function deplode(element) {
 function openNewGal(album_name) {
 	root = root + album_name + "/";
 	var url = window.location.toString().replace(window.location.search, '');
-  url = url + "?app=gallery&root="+encodeURIComponent(root);
+	url = url + "?app=gallery&root="+encodeURIComponent(root);
 	
 	window.location = url;
 }

From 22cd610a795e1960f1bb5746908848affd5cb587 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 15:20:45 +0200
Subject: [PATCH 0376/1537] use images from deeper directories for preview if
 the actual directory doesn't contain any

---
 apps/gallery/templates/index.php | 45 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 42ef9f6587..a74f4c4a40 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -102,23 +102,36 @@ $previous_element = @$images[0];
 $root_images = array();
 $second_level_images = array();
 
-for($i = 0; $i < count($images); $i++) {
-	$prev_dir_arr = explode('/', $previous_element);
-	$dir_arr = explode('/', $images[$i]);
+$fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
 
-	if(count($dir_arr) == 1) { // getting the images in this directory
-		$root_images[] = $root.$images[$i];
-	} else {
-		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
-			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-			$second_level_images = array();
-		}
-		if (count($dir_arr) == 2) { // These are the pics in that subdir
-			$second_level_images[] = $root.$images[$i];
-		}
-		// have us a little something to compare against
-		$previous_element = $images[$i];
-	}
+for($i = 0; $i < count($images); $i++) {
+        $prev_dir_arr = explode('/', $previous_element);
+        $dir_arr = explode('/', $images[$i]);
+
+        if(count($dir_arr) == 1) { // getting the images in this directory
+                $root_images[] = $root.$images[$i];
+        } else {
+                if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
+                        if(count($second_level_images) == 0) { // if we don't have images in this directory
+                                if(count($fallback_images) != 0) { // but have fallback_images
+                                        $tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+                                        $fallback_images = array();
+                                }
+                        } else { // if we collected images for this directory
+                                $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+                                echo print_r($fallback_images)."\n";
+                                $fallback_images = array();
+                                $second_level_images = array();
+                        }
+                }
+                if (count($dir_arr) == 2) { // These are the pics in our current subdir
+                        $second_level_images[] = $root.$images[$i];
+                } else { // These are images from the deeper directories
+                        $fallback_images[] = $root.$images[$i];
+                }
+                // have us a little something to compare against
+                $previous_element = $images[$i];
+        }
 }
 
 // if last element in the directory was a directory we don't want to miss it :)

From 56d2e99239f0bd3221162d719a958494534c2080 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 15:23:05 +0200
Subject: [PATCH 0377/1537] deleted some debugging output

---
 apps/gallery/templates/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index a74f4c4a40..0eda1ca050 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -119,7 +119,6 @@ for($i = 0; $i < count($images); $i++) {
                                 }
                         } else { // if we collected images for this directory
                                 $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-                                echo print_r($fallback_images)."\n";
                                 $fallback_images = array();
                                 $second_level_images = array();
                         }

From 6c7e10245c310b8945b90e50aceb0cd3a123b9bd Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 12:01:16 +0200
Subject: [PATCH 0378/1537] suppress warning if /dev/urandom is not readable
 (bug #997)

---
 3rdparty/phpass/PasswordHash.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/phpass/PasswordHash.php b/3rdparty/phpass/PasswordHash.php
index 12958c7f19..84447b277d 100644
--- a/3rdparty/phpass/PasswordHash.php
+++ b/3rdparty/phpass/PasswordHash.php
@@ -48,7 +48,7 @@ class PasswordHash {
 	function get_random_bytes($count)
 	{
 		$output = '';
-		if (is_readable('/dev/urandom') &&
+		if (@is_readable('/dev/urandom') &&
 		    ($fh = @fopen('/dev/urandom', 'rb'))) {
 			$output = fread($fh, $count);
 			fclose($fh);

From b32afd1331ee881dedf4ed0467b468248ebba16b Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 12:39:18 +0200
Subject: [PATCH 0379/1537] we don't have empty previewstacks any more - code
 cleaned up

---
 apps/gallery/lib/tiles.php | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 817939759d..2ff4fa5647 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -134,47 +134,32 @@ class TileStack extends TileBase {
 
 	public function getWidth() {
 		$max = 0;
-		if(count($this->tiles_array) == 0) {
-			$max = IMAGE_WIDTH;
-		} else {
-			for ($i = 0; $i < count($this->tiles_array); $i++) {
-				$max = max($max, $this->tiles_array[$i]->getWidth());
-			}
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$max = max($max, $this->tiles_array[$i]->getWidth());
 		}
 		return min(IMAGE_WIDTH, $max);
 	}
 
 	public function get() {
 		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
-		if(count($this->tiles_array) == 0) {
-			// aint no pictures in this folder...
-			$r.='<div class="miniature_border gallery_div"></div>';
-		} else {
-			for ($i = 0; $i < count($this->tiles_array); $i++) {
-				$top = rand(-5, 5);
-				$left = rand(-5, 5);
-				$img_w = $this->tiles_array[$i]->getWidth();
-				$extra = '';
-				if ($img_w < IMAGE_WIDTH) {
-					$extra = 'width:'.$img_w.'px;';
-				}
-				$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$top = rand(-5, 5);
+			$left = rand(-5, 5);
+			$img_w = $this->tiles_array[$i]->getWidth();
+			$extra = '';
+			if ($img_w < IMAGE_WIDTH) {
+				$extra = 'width:'.$img_w.'px;';
 			}
+			$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
 		}
 		return $r;
 	}
 
 	public function getOnHoverAction() {
-		if(count($this->tiles_array) == 0) {
-			return 'javascript:explode_empty(this);return false;';
-		}
 		return 'javascript:explode(this);return false;';
 	}
 	
 	public function getOnOutAction() {
-		if(count($this->tiles_array) == 0) {
-			return 'javascript:deplode_empty(this);return false;';
-		}
 		return 'javascript:deplode(this);return false;';
 	}
 

From bc6884b17623cc7aaf008fba6a162b551aeb7adc Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 12:51:27 +0200
Subject: [PATCH 0380/1537] we don't neede the functions for empty stacks any
 more

---
 apps/gallery/templates/index.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 0eda1ca050..148c3df225 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -16,14 +16,6 @@ div.visible { opacity: 0.8;}
 
 var root = "<?php echo htmlentities($root); ?>";
 
-function explode_empty(element) {
-	$('div', element).each(function(index, elem) {
-		if ($(elem).hasClass('title')) {
-			$(elem).addClass('visible');
-		}
-	});
-}
-
 function explode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -36,14 +28,6 @@ function explode(element) {
 	});
 }
 
-function deplode_empty(element) {
-	$('div', element).each(function(index, elem) {
-		if ($(elem).hasClass('title')) {
-			$(elem).removeClass('visible');
-		}
-	});
-}
-
 function deplode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {

From e7b93b1807d9ba22bf77b2afcebbf6ac43ca602d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 13:13:17 +0200
Subject: [PATCH 0381/1537] xss vulnerability fixed for fancybox image viewer

---
 .../js/jquery.fancybox-1.3.4.pack.js          | 805 +++++++++++++++++-
 apps/files_imageviewer/js/lightbox.js         |   1 +
 2 files changed, 777 insertions(+), 29 deletions(-)

diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
index 1373ed0838..d5b72d8640 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
@@ -15,32 +15,779 @@
  *   http://www.gnu.org/licenses/gpl.html
  */
 
-;(function(b){var m,t,u,f,D,j,E,n,z,A,q=0,e={},o=[],p=0,d={},l=[],G=null,v=new Image,J=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,W=/[^\.]\.(swf)\s*$/i,K,L=1,y=0,s="",r,i,h=false,B=b.extend(b("<div/>")[0],{prop:0}),M=b.browser.msie&&b.browser.version<7&&!window.XMLHttpRequest,N=function(){t.hide();v.onerror=v.onload=null;G&&G.abort();m.empty()},O=function(){if(false===e.onError(o,q,e)){t.hide();h=false}else{e.titleShow=false;e.width="auto";e.height="auto";m.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');
-F()}},I=function(){var a=o[q],c,g,k,C,P,w;N();e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));w=e.onStart(o,q,e);if(w===false)h=false;else{if(typeof w=="object")e=b.extend(e,w);k=e.title||(a.nodeName?b(a).attr("title"):a.title)||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(k===""&&e.orig&&e.titleFromAlt)k=e.orig.attr("alt");c=e.href||(a.nodeName?b(a).attr("href"):a.href)||null;if(/^(?:javascript)/i.test(c)||
-c=="#")c=null;if(e.type){g=e.type;if(!c)c=e.content}else if(e.content)g="html";else if(c)g=c.match(J)?"image":c.match(W)?"swf":b(a).hasClass("iframe")?"iframe":c.indexOf("#")===0?"inline":"ajax";if(g){if(g=="inline"){a=c.substr(c.indexOf("#"));g=b(a).length>0?"inline":"ajax"}e.type=g;e.href=c;e.title=k;if(e.autoDimensions)if(e.type=="html"||e.type=="inline"||e.type=="ajax"){e.width="auto";e.height="auto"}else e.autoDimensions=false;if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick=
-false;e.enableEscapeButton=false;e.showCloseButton=false}e.padding=parseInt(e.padding,10);e.margin=parseInt(e.margin,10);m.css("padding",e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(j.children())});switch(g){case "html":m.html(e.content);F();break;case "inline":if(b(a).parent().is("#fancybox-content")===true){h=false;break}b('<div class="fancybox-inline-tmp" />').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(j.children())}).bind("fancybox-cancel",
-function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();v=new Image;v.onerror=function(){O()};v.onload=function(){h=true;v.onerror=v.onload=null;e.width=v.width;e.height=v.height;b("<img />").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+e.width+'" height="'+e.height+'"><param name="movie" value="'+c+
-'"></param>';P="";b.each(e.swf,function(x,H){C+='<param name="'+x+'" value="'+H+'"></param>';P+=" "+x+'="'+H+'"'});C+='<embed src="'+c+'" type="application/x-shockwave-flash" width="'+e.width+'" height="'+e.height+'"'+P+"></embed></object>";m.html(C);F();break;case "ajax":h=false;b.fancybox.showActivity();e.ajax.win=e.ajax.success;G=b.ajax(b.extend({},e.ajax,{url:c,data:e.ajax.data||{},error:function(x){x.status>0&&O()},success:function(x,H,R){if((typeof R=="object"?R:G).status==200){if(typeof e.ajax.win==
-"function"){w=e.ajax.win(c,x,H,R);if(w===false){t.hide();return}else if(typeof w=="string"||typeof w=="object")x=w}m.html(x);F()}}}));break;case "iframe":Q()}}else O()}},F=function(){var a=e.width,c=e.height;a=a.toString().indexOf("%")>-1?parseInt((b(window).width()-e.margin*2)*parseFloat(a)/100,10)+"px":a=="auto"?"auto":a+"px";c=c.toString().indexOf("%")>-1?parseInt((b(window).height()-e.margin*2)*parseFloat(c)/100,10)+"px":c=="auto"?"auto":c+"px";m.wrapInner('<div style="width:'+a+";height:"+c+
-";overflow: "+(e.scrolling=="auto"?"auto":e.scrolling=="yes"?"scroll":"hidden")+';position:relative;"></div>');e.width=m.width();e.height=m.height();Q()},Q=function(){var a,c;t.hide();if(f.is(":visible")&&false===d.onCleanup(l,p,d)){b.event.trigger("fancybox-cancel");h=false}else{h=true;b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");f.is(":visible")&&d.titlePosition!=="outside"&&f.css("height",f.height());l=o;p=q;d=e;if(d.overlayShow){u.css({"background-color":d.overlayColor,
-opacity:d.overlayOpacity,cursor:d.hideOnOverlayClick?"pointer":"auto",height:b(document).height()});if(!u.is(":visible")){M&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});u.show()}}else u.hide();i=X();s=d.title||"";y=0;n.empty().removeAttr("style").removeClass();if(d.titleShow!==false){if(b.isFunction(d.titleFormat))a=d.titleFormat(s,l,p,d);else a=s&&s.length?
-d.titlePosition=="float"?'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+s+'</td><td id="fancybox-title-float-right"></td></tr></table>':'<div id="fancybox-title-'+d.titlePosition+'">'+s+"</div>":false;s=a;if(!(!s||s==="")){n.addClass("fancybox-title-"+d.titlePosition).html(s).appendTo("body").show();switch(d.titlePosition){case "inside":n.css({width:i.width-d.padding*2,marginLeft:d.padding,marginRight:d.padding});
-y=n.outerHeight(true);n.appendTo(D);i.height+=y;break;case "over":n.css({marginLeft:d.padding,width:i.width-d.padding*2,bottom:d.padding}).appendTo(D);break;case "float":n.css("left",parseInt((n.width()-i.width-40)/2,10)*-1).appendTo(f);break;default:n.css({width:i.width-d.padding*2,paddingLeft:d.padding,paddingRight:d.padding}).appendTo(f)}}}n.hide();if(f.is(":visible")){b(E.add(z).add(A)).hide();a=f.position();r={top:a.top,left:a.left,width:f.width(),height:f.height()};c=r.width==i.width&&r.height==
-i.height;j.fadeTo(d.changeFade,0.3,function(){var g=function(){j.html(m.contents()).fadeTo(d.changeFade,1,S)};b.event.trigger("fancybox-change");j.empty().removeAttr("filter").css({"border-width":d.padding,width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2});if(c)g();else{B.prop=0;b(B).animate({prop:1},{duration:d.changeSpeed,easing:d.easingChange,step:T,complete:g})}})}else{f.removeAttr("style");j.css("border-width",d.padding);if(d.transitionIn=="elastic"){r=V();j.html(m.contents());
-f.show();if(d.opacity)i.opacity=0;B.prop=0;b(B).animate({prop:1},{duration:d.speedIn,easing:d.easingIn,step:T,complete:S})}else{d.titlePosition=="inside"&&y>0&&n.show();j.css({width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2}).html(m.contents());f.css(i).fadeIn(d.transitionIn=="none"?0:d.speedIn,S)}}}},Y=function(){if(d.enableEscapeButton||d.enableKeyboardNav)b(document).bind("keydown.fb",function(a){if(a.keyCode==27&&d.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if((a.keyCode==
-37||a.keyCode==39)&&d.enableKeyboardNav&&a.target.tagName!=="INPUT"&&a.target.tagName!=="TEXTAREA"&&a.target.tagName!=="SELECT"){a.preventDefault();b.fancybox[a.keyCode==37?"prev":"next"]()}});if(d.showNavArrows){if(d.cyclic&&l.length>1||p!==0)z.show();if(d.cyclic&&l.length>1||p!=l.length-1)A.show()}else{z.hide();A.hide()}},S=function(){if(!b.support.opacity){j.get(0).style.removeAttribute("filter");f.get(0).style.removeAttribute("filter")}e.autoDimensions&&j.css("height","auto");f.css("height","auto");
-s&&s.length&&n.show();d.showCloseButton&&E.show();Y();d.hideOnContentClick&&j.bind("click",b.fancybox.close);d.hideOnOverlayClick&&u.bind("click",b.fancybox.close);b(window).bind("resize.fb",b.fancybox.resize);d.centerOnScroll&&b(window).bind("scroll.fb",b.fancybox.center);if(d.type=="iframe")b('<iframe id="fancybox-frame" name="fancybox-frame'+(new Date).getTime()+'" frameborder="0" hspace="0" '+(b.browser.msie?'allowtransparency="true""':"")+' scrolling="'+e.scrolling+'" src="'+d.href+'"></iframe>').appendTo(j);
-f.show();h=false;b.fancybox.center();d.onComplete(l,p,d);var a,c;if(l.length-1>p){a=l[p+1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}if(p>0){a=l[p-1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}},T=function(a){var c={width:parseInt(r.width+(i.width-r.width)*a,10),height:parseInt(r.height+(i.height-r.height)*a,10),top:parseInt(r.top+(i.top-r.top)*a,10),left:parseInt(r.left+(i.left-r.left)*a,10)};if(typeof i.opacity!=="undefined")c.opacity=a<0.5?0.5:a;f.css(c);
-j.css({width:c.width-d.padding*2,height:c.height-y*a-d.padding*2})},U=function(){return[b(window).width()-d.margin*2,b(window).height()-d.margin*2,b(document).scrollLeft()+d.margin,b(document).scrollTop()+d.margin]},X=function(){var a=U(),c={},g=d.autoScale,k=d.padding*2;c.width=d.width.toString().indexOf("%")>-1?parseInt(a[0]*parseFloat(d.width)/100,10):d.width+k;c.height=d.height.toString().indexOf("%")>-1?parseInt(a[1]*parseFloat(d.height)/100,10):d.height+k;if(g&&(c.width>a[0]||c.height>a[1]))if(e.type==
-"image"||e.type=="swf"){g=d.width/d.height;if(c.width>a[0]){c.width=a[0];c.height=parseInt((c.width-k)/g+k,10)}if(c.height>a[1]){c.height=a[1];c.width=parseInt((c.height-k)*g+k,10)}}else{c.width=Math.min(c.width,a[0]);c.height=Math.min(c.height,a[1])}c.top=parseInt(Math.max(a[3]-20,a[3]+(a[1]-c.height-40)*0.5),10);c.left=parseInt(Math.max(a[2]-20,a[2]+(a[0]-c.width-40)*0.5),10);return c},V=function(){var a=e.orig?b(e.orig):false,c={};if(a&&a.length){c=a.offset();c.top+=parseInt(a.css("paddingTop"),
-10)||0;c.left+=parseInt(a.css("paddingLeft"),10)||0;c.top+=parseInt(a.css("border-top-width"),10)||0;c.left+=parseInt(a.css("border-left-width"),10)||0;c.width=a.width();c.height=a.height();c={width:c.width+d.padding*2,height:c.height+d.padding*2,top:c.top-d.padding-20,left:c.left-d.padding-20}}else{a=U();c={width:d.padding*2,height:d.padding*2,top:parseInt(a[3]+a[1]*0.5,10),left:parseInt(a[2]+a[0]*0.5,10)}}return c},Z=function(){if(t.is(":visible")){b("div",t).css("top",L*-40+"px");L=(L+1)%12}else clearInterval(K)};
-b.fn.fancybox=function(a){if(!b(this).length)return this;b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(c){c.preventDefault();if(!h){h=true;b(this).blur();o=[];q=0;c=b(this).attr("rel")||"";if(!c||c==""||c==="nofollow")o.push(this);else{o=b("a[rel="+c+"], area[rel="+c+"]");q=o.index(this)}I()}});return this};b.fancybox=function(a,c){var g;if(!h){h=true;g=typeof c!=="undefined"?c:{};o=[];q=parseInt(g.index,10)||0;if(b.isArray(a)){for(var k=
-0,C=a.length;k<C;k++)if(typeof a[k]=="object")b(a[k]).data("fancybox",b.extend({},g,a[k]));else a[k]=b({}).data("fancybox",b.extend({content:a[k]},g));o=jQuery.merge(o,a)}else{if(typeof a=="object")b(a).data("fancybox",b.extend({},g,a));else a=b({}).data("fancybox",b.extend({content:a},g));o.push(a)}if(q>o.length||q<0)q=0;I()}};b.fancybox.showActivity=function(){clearInterval(K);t.show();K=setInterval(Z,66)};b.fancybox.hideActivity=function(){t.hide()};b.fancybox.next=function(){return b.fancybox.pos(p+
-1)};b.fancybox.prev=function(){return b.fancybox.pos(p-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a);o=l;if(a>-1&&a<l.length){q=a;I()}else if(d.cyclic&&l.length>1){q=a>=l.length?0:l.length-1;I()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");N();e.onCancel(o,q,e);h=false}};b.fancybox.close=function(){function a(){u.fadeOut("fast");n.empty().hide();f.hide();b.event.trigger("fancybox-cleanup");j.empty();d.onClosed(l,p,d);l=e=[];p=q=0;d=e={};h=false}if(!(h||f.is(":hidden"))){h=
-true;if(d&&false===d.onCleanup(l,p,d))h=false;else{N();b(E.add(z).add(A)).hide();b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");j.find("iframe").attr("src",M&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");d.titlePosition!=="inside"&&n.empty();f.stop();if(d.transitionOut=="elastic"){r=V();var c=f.position();i={top:c.top,left:c.left,width:f.width(),height:f.height()};if(d.opacity)i.opacity=1;n.empty().hide();B.prop=1;
-b(B).animate({prop:0},{duration:d.speedOut,easing:d.easingOut,step:T,complete:a})}else f.fadeOut(d.transitionOut=="none"?0:d.speedOut,a)}}};b.fancybox.resize=function(){u.is(":visible")&&u.css("height",b(document).height());b.fancybox.center(true)};b.fancybox.center=function(a){var c,g;if(!h){g=a===true?1:0;c=U();!g&&(f.width()>c[0]||f.height()>c[1])||f.stop().animate({top:parseInt(Math.max(c[3]-20,c[3]+(c[1]-j.height()-40)*0.5-d.padding)),left:parseInt(Math.max(c[2]-20,c[2]+(c[0]-j.width()-40)*0.5-
-d.padding))},typeof a=="number"?a:200)}};b.fancybox.init=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('<div id="fancybox-tmp"></div>'),t=b('<div id="fancybox-loading"><div></div></div>'),u=b('<div id="fancybox-overlay"></div>'),f=b('<div id="fancybox-wrap"></div>'));D=b('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(f);
-D.append(j=b('<div id="fancybox-content"></div>'),E=b('<a id="fancybox-close"></a>'),n=b('<div id="fancybox-title"></div>'),z=b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),A=b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()});
-b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(D)}}};
-b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",
-easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery);
\ No newline at end of file
+;
+(function(b) {
+	var m, t, u, f, D, j, E, n, z, A, q = 0, e = {}, o = [], p = 0, d = {}, l = [], G = null, v = new Image, J = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i, W = /[^\.]\.(swf)\s*$/i, K, L = 1, y = 0, s = "", r, i, h = false, B = b
+			.extend(b("<div/>")[0], {
+				prop : 0
+			}), M = b.browser.msie && b.browser.version < 7
+			&& !window.XMLHttpRequest, N = function() {
+		t.hide();
+		v.onerror = v.onload = null;
+		G && G.abort();
+		m.empty()
+	}, O = function() {
+		if (false === e.onError(o, q, e)) {
+			t.hide();
+			h = false
+		} else {
+			e.titleShow = false;
+			e.width = "auto";
+			e.height = "auto";
+			m
+					.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');
+			F()
+		}
+	}, I = function() {
+		var a = o[q], c, g, k, C, P, w;
+		N();
+		e = b.extend({}, b.fn.fancybox.defaults,
+				typeof b(a).data("fancybox") == "undefined" ? e : b(a).data(
+						"fancybox"));
+		w = e.onStart(o, q, e);
+		if (w === false)
+			h = false;
+		else {
+			if (typeof w == "object")
+				e = b.extend(e, w);
+			k = e.title || (a.nodeName ? b(a).attr("title") : a.title) || "";
+			k = k.replace(/</, "&lt;").replace(/>/, "&gt;");
+			if (a.nodeName && !e.orig)
+				e.orig = b(a).children("img:first").length ? b(a).children(
+						"img:first") : b(a);
+			if (k === "" && e.orig && e.titleFromAlt)
+				k = e.orig.attr("alt");
+			c = e.href || (a.nodeName ? b(a).attr("href") : a.href) || null;
+			if (/^(?:javascript)/i.test(c) || c == "#")
+				c = null;
+			if (e.type) {
+				g = e.type;
+				if (!c)
+					c = e.content
+			} else if (e.content)
+				g = "html";
+			else if (c)
+				g = c.match(J) ? "image" : c.match(W) ? "swf" : b(a).hasClass(
+						"iframe") ? "iframe" : c.indexOf("#") === 0 ? "inline"
+						: "ajax";
+			if (g) {
+				if (g == "inline") {
+					a = c.substr(c.indexOf("#"));
+					g = b(a).length > 0 ? "inline" : "ajax"
+				}
+				e.type = g;
+				e.href = c;
+				e.title = k;
+				if (e.autoDimensions)
+					if (e.type == "html" || e.type == "inline"
+							|| e.type == "ajax") {
+						e.width = "auto";
+						e.height = "auto"
+					} else
+						e.autoDimensions = false;
+				if (e.modal) {
+					e.overlayShow = true;
+					e.hideOnOverlayClick = false;
+					e.hideOnContentClick = false;
+					e.enableEscapeButton = false;
+					e.showCloseButton = false
+				}
+				e.padding = parseInt(e.padding, 10);
+				e.margin = parseInt(e.margin, 10);
+				m.css("padding", e.padding + e.margin);
+				b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind(
+						"fancybox-change", function() {
+							b(this).replaceWith(j.children())
+						});
+				switch (g) {
+				case "html":
+					m.html(e.content);
+					F();
+					break;
+				case "inline":
+					if (b(a).parent().is("#fancybox-content") === true) {
+						h = false;
+						break
+					}
+					b('<div class="fancybox-inline-tmp" />').hide()
+							.insertBefore(b(a)).bind("fancybox-cleanup",
+									function() {
+										b(this).replaceWith(j.children())
+									}).bind("fancybox-cancel", function() {
+								b(this).replaceWith(m.children())
+							});
+					b(a).appendTo(m);
+					F();
+					break;
+				case "image":
+					h = false;
+					b.fancybox.showActivity();
+					v = new Image;
+					v.onerror = function() {
+						O()
+					};
+					v.onload = function() {
+						h = true;
+						v.onerror = v.onload = null;
+						e.width = v.width;
+						e.height = v.height;
+						b("<img />").attr({
+							id : "fancybox-img",
+							src : v.src,
+							alt : e.title
+						}).appendTo(m);
+						Q()
+					};
+					v.src = c;
+					break;
+				case "swf":
+					e.scrolling = "no";
+					C = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'
+							+ e.width
+							+ '" height="'
+							+ e.height
+							+ '"><param name="movie" value="'
+							+ c
+							+ '"></param>';
+					P = "";
+					b.each(e.swf, function(x, H) {
+						C += '<param name="' + x + '" value="' + H
+								+ '"></param>';
+						P += " " + x + '="' + H + '"'
+					});
+					C += '<embed src="' + c
+							+ '" type="application/x-shockwave-flash" width="'
+							+ e.width + '" height="' + e.height + '"' + P
+							+ "></embed></object>";
+					m.html(C);
+					F();
+					break;
+				case "ajax":
+					h = false;
+					b.fancybox.showActivity();
+					e.ajax.win = e.ajax.success;
+					G = b.ajax(b.extend({}, e.ajax, {
+						url : c,
+						data : e.ajax.data || {},
+						error : function(x) {
+							x.status > 0 && O()
+						},
+						success : function(x, H, R) {
+							if ((typeof R == "object" ? R : G).status == 200) {
+								if (typeof e.ajax.win == "function") {
+									w = e.ajax.win(c, x, H, R);
+									if (w === false) {
+										t.hide();
+										return
+									} else if (typeof w == "string"
+											|| typeof w == "object")
+										x = w
+								}
+								m.html(x);
+								F()
+							}
+						}
+					}));
+					break;
+				case "iframe":
+					Q()
+				}
+			} else
+				O()
+		}
+	}, F = function() {
+		var a = e.width, c = e.height;
+		a = a.toString().indexOf("%") > -1 ? parseInt(
+				(b(window).width() - e.margin * 2) * parseFloat(a) / 100, 10)
+				+ "px" : a == "auto" ? "auto" : a + "px";
+		c = c.toString().indexOf("%") > -1 ? parseInt(
+				(b(window).height() - e.margin * 2) * parseFloat(c) / 100, 10)
+				+ "px" : c == "auto" ? "auto" : c + "px";
+		m.wrapInner('<div style="width:'
+				+ a
+				+ ";height:"
+				+ c
+				+ ";overflow: "
+				+ (e.scrolling == "auto" ? "auto"
+						: e.scrolling == "yes" ? "scroll" : "hidden")
+				+ ';position:relative;"></div>');
+		e.width = m.width();
+		e.height = m.height();
+		Q()
+	}, Q = function() {
+		var a, c;
+		t.hide();
+		if (f.is(":visible") && false === d.onCleanup(l, p, d)) {
+			b.event.trigger("fancybox-cancel");
+			h = false
+		} else {
+			h = true;
+			b(j.add(u)).unbind();
+			b(window).unbind("resize.fb scroll.fb");
+			b(document).unbind("keydown.fb");
+			f.is(":visible") && d.titlePosition !== "outside"
+					&& f.css("height", f.height());
+			l = o;
+			p = q;
+			d = e;
+			if (d.overlayShow) {
+				u.css({
+					"background-color" : d.overlayColor,
+					opacity : d.overlayOpacity,
+					cursor : d.hideOnOverlayClick ? "pointer" : "auto",
+					height : b(document).height()
+				});
+				if (!u.is(":visible")) {
+					M
+							&& b("select:not(#fancybox-tmp select)")
+									.filter(
+											function() {
+												return this.style.visibility !== "hidden"
+											}).css({
+										visibility : "hidden"
+									}).one("fancybox-cleanup", function() {
+										this.style.visibility = "inherit"
+									});
+					u.show()
+				}
+			} else
+				u.hide();
+			i = X();
+			s = d.title || "";
+			y = 0;
+			n.empty().removeAttr("style").removeClass();
+			if (d.titleShow !== false) {
+				if (b.isFunction(d.titleFormat))
+					a = d.titleFormat(s, l, p, d);
+				else
+					a = s && s.length ? d.titlePosition == "float" ? '<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'
+							+ s
+							+ '</td><td id="fancybox-title-float-right"></td></tr></table>'
+							: '<div id="fancybox-title-' + d.titlePosition
+									+ '">' + s + "</div>"
+							: false;
+				s = a;
+				if (!(!s || s === "")) {
+					n.addClass("fancybox-title-" + d.titlePosition).html(s)
+							.appendTo("body").show();
+					switch (d.titlePosition) {
+					case "inside":
+						n.css({
+							width : i.width - d.padding * 2,
+							marginLeft : d.padding,
+							marginRight : d.padding
+						});
+						y = n.outerHeight(true);
+						n.appendTo(D);
+						i.height += y;
+						break;
+					case "over":
+						n.css({
+							marginLeft : d.padding,
+							width : i.width - d.padding * 2,
+							bottom : d.padding
+						}).appendTo(D);
+						break;
+					case "float":
+						n.css(
+								"left",
+								parseInt((n.width() - i.width - 40) / 2, 10)
+										* -1).appendTo(f);
+						break;
+					default:
+						n.css({
+							width : i.width - d.padding * 2,
+							paddingLeft : d.padding,
+							paddingRight : d.padding
+						}).appendTo(f)
+					}
+				}
+			}
+			n.hide();
+			if (f.is(":visible")) {
+				b(E.add(z).add(A)).hide();
+				a = f.position();
+				r = {
+					top : a.top,
+					left : a.left,
+					width : f.width(),
+					height : f.height()
+				};
+				c = r.width == i.width && r.height == i.height;
+				j.fadeTo(d.changeFade, 0.3, function() {
+					var g = function() {
+						j.html(m.contents()).fadeTo(d.changeFade, 1, S)
+					};
+					b.event.trigger("fancybox-change");
+					j.empty().removeAttr("filter").css(
+							{
+								"border-width" : d.padding,
+								width : i.width - d.padding * 2,
+								height : e.autoDimensions ? "auto" : i.height
+										- y - d.padding * 2
+							});
+					if (c)
+						g();
+					else {
+						B.prop = 0;
+						b(B).animate({
+							prop : 1
+						}, {
+							duration : d.changeSpeed,
+							easing : d.easingChange,
+							step : T,
+							complete : g
+						})
+					}
+				})
+			} else {
+				f.removeAttr("style");
+				j.css("border-width", d.padding);
+				if (d.transitionIn == "elastic") {
+					r = V();
+					j.html(m.contents());
+					f.show();
+					if (d.opacity)
+						i.opacity = 0;
+					B.prop = 0;
+					b(B).animate({
+						prop : 1
+					}, {
+						duration : d.speedIn,
+						easing : d.easingIn,
+						step : T,
+						complete : S
+					})
+				} else {
+					d.titlePosition == "inside" && y > 0 && n.show();
+					j.css(
+							{
+								width : i.width - d.padding * 2,
+								height : e.autoDimensions ? "auto" : i.height
+										- y - d.padding * 2
+							}).html(m.contents());
+					f
+							.css(i)
+							.fadeIn(d.transitionIn == "none" ? 0 : d.speedIn, S)
+				}
+			}
+		}
+	}, Y = function() {
+		if (d.enableEscapeButton || d.enableKeyboardNav)
+			b(document).bind(
+					"keydown.fb",
+					function(a) {
+						if (a.keyCode == 27 && d.enableEscapeButton) {
+							a.preventDefault();
+							b.fancybox.close()
+						} else if ((a.keyCode == 37 || a.keyCode == 39)
+								&& d.enableKeyboardNav
+								&& a.target.tagName !== "INPUT"
+								&& a.target.tagName !== "TEXTAREA"
+								&& a.target.tagName !== "SELECT") {
+							a.preventDefault();
+							b.fancybox[a.keyCode == 37 ? "prev" : "next"]()
+						}
+					});
+		if (d.showNavArrows) {
+			if (d.cyclic && l.length > 1 || p !== 0)
+				z.show();
+			if (d.cyclic && l.length > 1 || p != l.length - 1)
+				A.show()
+		} else {
+			z.hide();
+			A.hide()
+		}
+	}, S = function() {
+		if (!b.support.opacity) {
+			j.get(0).style.removeAttribute("filter");
+			f.get(0).style.removeAttribute("filter")
+		}
+		e.autoDimensions && j.css("height", "auto");
+		f.css("height", "auto");
+		s && s.length && n.show();
+		d.showCloseButton && E.show();
+		Y();
+		d.hideOnContentClick && j.bind("click", b.fancybox.close);
+		d.hideOnOverlayClick && u.bind("click", b.fancybox.close);
+		b(window).bind("resize.fb", b.fancybox.resize);
+		d.centerOnScroll && b(window).bind("scroll.fb", b.fancybox.center);
+		if (d.type == "iframe")
+			b(
+					'<iframe id="fancybox-frame" name="fancybox-frame'
+							+ (new Date).getTime()
+							+ '" frameborder="0" hspace="0" '
+							+ (b.browser.msie ? 'allowtransparency="true""'
+									: "") + ' scrolling="' + e.scrolling
+							+ '" src="' + d.href + '"></iframe>').appendTo(j);
+		f.show();
+		h = false;
+		b.fancybox.center();
+		d.onComplete(l, p, d);
+		var a, c;
+		if (l.length - 1 > p) {
+			a = l[p + 1].href;
+			if (typeof a !== "undefined" && a.match(J)) {
+				c = new Image;
+				c.src = a
+			}
+		}
+		if (p > 0) {
+			a = l[p - 1].href;
+			if (typeof a !== "undefined" && a.match(J)) {
+				c = new Image;
+				c.src = a
+			}
+		}
+	}, T = function(a) {
+		var c = {
+			width : parseInt(r.width + (i.width - r.width) * a, 10),
+			height : parseInt(r.height + (i.height - r.height) * a, 10),
+			top : parseInt(r.top + (i.top - r.top) * a, 10),
+			left : parseInt(r.left + (i.left - r.left) * a, 10)
+		};
+		if (typeof i.opacity !== "undefined")
+			c.opacity = a < 0.5 ? 0.5 : a;
+		f.css(c);
+		j.css({
+			width : c.width - d.padding * 2,
+			height : c.height - y * a - d.padding * 2
+		})
+	}, U = function() {
+		return [ b(window).width() - d.margin * 2,
+				b(window).height() - d.margin * 2,
+				b(document).scrollLeft() + d.margin,
+				b(document).scrollTop() + d.margin ]
+	}, X = function() {
+		var a = U(), c = {}, g = d.autoScale, k = d.padding * 2;
+		c.width = d.width.toString().indexOf("%") > -1 ? parseInt(a[0]
+				* parseFloat(d.width) / 100, 10) : d.width + k;
+		c.height = d.height.toString().indexOf("%") > -1 ? parseInt(a[1]
+				* parseFloat(d.height) / 100, 10) : d.height + k;
+		if (g && (c.width > a[0] || c.height > a[1]))
+			if (e.type == "image" || e.type == "swf") {
+				g = d.width / d.height;
+				if (c.width > a[0]) {
+					c.width = a[0];
+					c.height = parseInt((c.width - k) / g + k, 10)
+				}
+				if (c.height > a[1]) {
+					c.height = a[1];
+					c.width = parseInt((c.height - k) * g + k, 10)
+				}
+			} else {
+				c.width = Math.min(c.width, a[0]);
+				c.height = Math.min(c.height, a[1])
+			}
+		c.top = parseInt(Math.max(a[3] - 20, a[3] + (a[1] - c.height - 40)
+				* 0.5), 10);
+		c.left = parseInt(Math.max(a[2] - 20, a[2] + (a[0] - c.width - 40)
+				* 0.5), 10);
+		return c
+	}, V = function() {
+		var a = e.orig ? b(e.orig) : false, c = {};
+		if (a && a.length) {
+			c = a.offset();
+			c.top += parseInt(a.css("paddingTop"), 10) || 0;
+			c.left += parseInt(a.css("paddingLeft"), 10) || 0;
+			c.top += parseInt(a.css("border-top-width"), 10) || 0;
+			c.left += parseInt(a.css("border-left-width"), 10) || 0;
+			c.width = a.width();
+			c.height = a.height();
+			c = {
+				width : c.width + d.padding * 2,
+				height : c.height + d.padding * 2,
+				top : c.top - d.padding - 20,
+				left : c.left - d.padding - 20
+			}
+		} else {
+			a = U();
+			c = {
+				width : d.padding * 2,
+				height : d.padding * 2,
+				top : parseInt(a[3] + a[1] * 0.5, 10),
+				left : parseInt(a[2] + a[0] * 0.5, 10)
+			}
+		}
+		return c
+	}, Z = function() {
+		if (t.is(":visible")) {
+			b("div", t).css("top", L * -40 + "px");
+			L = (L + 1) % 12
+		} else
+			clearInterval(K)
+	};
+	b.fn.fancybox = function(a) {
+		if (!b(this).length)
+			return this;
+		b(this).data("fancybox",
+				b.extend({}, a, b.metadata ? b(this).metadata() : {})).unbind(
+				"click.fb").bind("click.fb", function(c) {
+			c.preventDefault();
+			if (!h) {
+				h = true;
+				b(this).blur();
+				o = [];
+				q = 0;
+				c = b(this).attr("rel") || "";
+				if (!c || c == "" || c === "nofollow")
+					o.push(this);
+				else {
+					o = b("a[rel=" + c + "], area[rel=" + c + "]");
+					q = o.index(this)
+				}
+				I()
+			}
+		});
+		return this
+	};
+	b.fancybox = function(a, c) {
+		var g;
+		if (!h) {
+			h = true;
+			g = typeof c !== "undefined" ? c : {};
+			o = [];
+			q = parseInt(g.index, 10) || 0;
+			if (b.isArray(a)) {
+				for ( var k = 0, C = a.length; k < C; k++)
+					if (typeof a[k] == "object")
+						b(a[k]).data("fancybox", b.extend({}, g, a[k]));
+					else
+						a[k] = b({}).data("fancybox", b.extend({
+							content : a[k]
+						}, g));
+				o = jQuery.merge(o, a)
+			} else {
+				if (typeof a == "object")
+					b(a).data("fancybox", b.extend({}, g, a));
+				else
+					a = b({}).data("fancybox", b.extend({
+						content : a
+					}, g));
+				o.push(a)
+			}
+			if (q > o.length || q < 0)
+				q = 0;
+			I()
+		}
+	};
+	b.fancybox.showActivity = function() {
+		clearInterval(K);
+		t.show();
+		K = setInterval(Z, 66)
+	};
+	b.fancybox.hideActivity = function() {
+		t.hide()
+	};
+	b.fancybox.next = function() {
+		return b.fancybox.pos(p + 1)
+	};
+	b.fancybox.prev = function() {
+		return b.fancybox.pos(p - 1)
+	};
+	b.fancybox.pos = function(a) {
+		if (!h) {
+			a = parseInt(a);
+			o = l;
+			if (a > -1 && a < l.length) {
+				q = a;
+				I()
+			} else if (d.cyclic && l.length > 1) {
+				q = a >= l.length ? 0 : l.length - 1;
+				I()
+			}
+		}
+	};
+	b.fancybox.cancel = function() {
+		if (!h) {
+			h = true;
+			b.event.trigger("fancybox-cancel");
+			N();
+			e.onCancel(o, q, e);
+			h = false
+		}
+	};
+	b.fancybox.close = function() {
+		function a() {
+			u.fadeOut("fast");
+			n.empty().hide();
+			f.hide();
+			b.event.trigger("fancybox-cleanup");
+			j.empty();
+			d.onClosed(l, p, d);
+			l = e = [];
+			p = q = 0;
+			d = e = {};
+			h = false
+		}
+		if (!(h || f.is(":hidden"))) {
+			h = true;
+			if (d && false === d.onCleanup(l, p, d))
+				h = false;
+			else {
+				N();
+				b(E.add(z).add(A)).hide();
+				b(j.add(u)).unbind();
+				b(window).unbind("resize.fb scroll.fb");
+				b(document).unbind("keydown.fb");
+				j
+						.find("iframe")
+						.attr(
+								"src",
+								M && /^https/i.test(window.location.href || "") ? "javascript:void(false)"
+										: "about:blank");
+				d.titlePosition !== "inside" && n.empty();
+				f.stop();
+				if (d.transitionOut == "elastic") {
+					r = V();
+					var c = f.position();
+					i = {
+						top : c.top,
+						left : c.left,
+						width : f.width(),
+						height : f.height()
+					};
+					if (d.opacity)
+						i.opacity = 1;
+					n.empty().hide();
+					B.prop = 1;
+					b(B).animate({
+						prop : 0
+					}, {
+						duration : d.speedOut,
+						easing : d.easingOut,
+						step : T,
+						complete : a
+					})
+				} else
+					f.fadeOut(d.transitionOut == "none" ? 0 : d.speedOut, a)
+			}
+		}
+	};
+	b.fancybox.resize = function() {
+		u.is(":visible") && u.css("height", b(document).height());
+		b.fancybox.center(true)
+	};
+	b.fancybox.center = function(a) {
+		var c, g;
+		if (!h) {
+			g = a === true ? 1 : 0;
+			c = U();
+			!g
+					&& (f.width() > c[0] || f.height() > c[1])
+					|| f.stop().animate(
+							{
+								top : parseInt(Math.max(c[3] - 20, c[3]
+										+ (c[1] - j.height() - 40) * 0.5
+										- d.padding)),
+								left : parseInt(Math.max(c[2] - 20, c[2]
+										+ (c[0] - j.width() - 40) * 0.5
+										- d.padding))
+							}, typeof a == "number" ? a : 200)
+		}
+	};
+	b.fancybox.init = function() {
+		if (!b("#fancybox-wrap").length) {
+			b("body").append(m = b('<div id="fancybox-tmp"></div>'),
+					t = b('<div id="fancybox-loading"><div></div></div>'),
+					u = b('<div id="fancybox-overlay"></div>'),
+					f = b('<div id="fancybox-wrap"></div>'));
+			D = b('<div id="fancybox-outer"></div>')
+					.append(
+							'<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>')
+					.appendTo(f);
+			D
+					.append(
+							j = b('<div id="fancybox-content"></div>'),
+							E = b('<a id="fancybox-close"></a>'),
+							n = b('<div id="fancybox-title"></div>'),
+							z = b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),
+							A = b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));
+			E.click(b.fancybox.close);
+			t.click(b.fancybox.cancel);
+			z.click(function(a) {
+				a.preventDefault();
+				b.fancybox.prev()
+			});
+			A.click(function(a) {
+				a.preventDefault();
+				b.fancybox.next()
+			});
+			b.fn.mousewheel
+					&& f.bind("mousewheel.fb", function(a, c) {
+						if (h)
+							a.preventDefault();
+						else if (b(a.target).get(0).clientHeight == 0
+								|| b(a.target).get(0).scrollHeight === b(
+										a.target).get(0).clientHeight) {
+							a.preventDefault();
+							b.fancybox[c > 0 ? "prev" : "next"]()
+						}
+					});
+			b.support.opacity || f.addClass("fancybox-ie");
+			if (M) {
+				t.addClass("fancybox-ie6");
+				f.addClass("fancybox-ie6");
+				b(
+						'<iframe id="fancybox-hide-sel-frame" src="'
+								+ (/^https/i.test(window.location.href || "") ? "javascript:void(false)"
+										: "about:blank")
+								+ '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>')
+						.prependTo(D)
+			}
+		}
+	};
+	b.fn.fancybox.defaults = {
+		padding : 10,
+		margin : 40,
+		opacity : false,
+		modal : false,
+		cyclic : false,
+		scrolling : "auto",
+		width : 560,
+		height : 340,
+		autoScale : true,
+		autoDimensions : true,
+		centerOnScroll : false,
+		ajax : {},
+		swf : {
+			wmode : "transparent"
+		},
+		hideOnOverlayClick : true,
+		hideOnContentClick : false,
+		overlayShow : true,
+		overlayOpacity : 0.7,
+		overlayColor : "#777",
+		titleShow : true,
+		titlePosition : "float",
+		titleFormat : null,
+		titleFromAlt : false,
+		transitionIn : "fade",
+		transitionOut : "fade",
+		speedIn : 300,
+		speedOut : 300,
+		changeSpeed : 300,
+		changeFade : "fast",
+		easingIn : "swing",
+		easingOut : "swing",
+		showCloseButton : true,
+		showNavArrows : true,
+		enableEscapeButton : true,
+		enableKeyboardNav : true,
+		onStart : function() {
+		},
+		onCancel : function() {
+		},
+		onComplete : function() {
+		},
+		onCleanup : function() {
+		},
+		onClosed : function() {
+		},
+		onError : function() {
+		}
+	};
+	b(document).ready(function() {
+		b.fancybox.init()
+	})
+})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 69cda7a0ec..32147782fe 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -22,6 +22,7 @@ function viewImage(dir, file) {
 	if(file.indexOf('.psd')>0){//can't view those
 		return;
 	}
+	console.log("!!!!!!!!! lightbox");
 	var location=OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 	$.fancybox({
 		"href": location,

From b0ecef02e905972bdd963ba03610e5c025a36e1b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 13:17:06 +0200
Subject: [PATCH 0382/1537] debugging output removed

---
 apps/files_imageviewer/js/lightbox.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 32147782fe..69cda7a0ec 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -22,7 +22,6 @@ function viewImage(dir, file) {
 	if(file.indexOf('.psd')>0){//can't view those
 		return;
 	}
-	console.log("!!!!!!!!! lightbox");
 	var location=OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 	$.fancybox({
 		"href": location,

From 756eb3548fcab5f610bccee50d6581e2a3bcd36c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 12:48:09 +0200
Subject: [PATCH 0383/1537] Use the right csrf token.

---
 apps/contacts/templates/part.cropphoto.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 1e025ef4e0..1079afc808 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -1,7 +1,7 @@
 <?php 
 $id = $_['id'];
 $tmpkey = $_['tmpkey'];
-$csrf_token = $_GET['csrf_token'];
+$requesttoken = $_['requesttoken'];
 OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 ?>
 <script language="Javascript">
@@ -49,7 +49,7 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey,
 	action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
 
 	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
-	<input type="hidden" name="requesttoken" value="<?php echo $csrf_token; ?>">
+	<input type="hidden" name="requesttoken" value="<?php echo $requesttoken; ?>">
 	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
 	<fieldset id="coords">
 	<input type="hidden" id="x1" name="x1" value="" />

From a34db3fbe00aa54a4d98bfab0d48ce03db8ee8c3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 12:48:42 +0200
Subject: [PATCH 0384/1537] Don't add slash if it's there already.

---
 lib/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper.php b/lib/helper.php
index decc1d6133..fe6795d28e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -132,7 +132,7 @@ class OC_Helper {
 	 * Returns a absolute url to the given service.
 	 */
 	public static function linkToRemote( $service, $add_slash = true ) {
-		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . ($add_slash?'/':'');
+		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
 	}
 
 	/**

From 8fd9cbcc54190f9f3afd7e74ed295216953c7383 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 12:57:30 +0200
Subject: [PATCH 0385/1537] White-space fix.

---
 lib/helper.php      | 68 ++++++++++++++++++++++-----------------------
 lib/public/util.php | 22 ++++++---------
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index fe6795d28e..2ded7b13c3 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -90,12 +90,12 @@ class OC_Helper {
 	}
 
 
-        /**
-         * @brief Returns the server protocol
-         * @returns the server protocol
-         *
-         * Returns the server protocol. It respects reverse proxy servers and load balancers
-         */
+	/**
+	* @brief Returns the server protocol
+	* @returns the server protocol
+	*
+	* Returns the server protocol. It respects reverse proxy servers and load balancers
+	*/
 	public static function serverProtocol() {
 		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
 			$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
@@ -143,7 +143,7 @@ class OC_Helper {
 	 *
 	 * Returns the path to the image.
 	 */
-        public static function imagePath( $app, $image ){
+	public static function imagePath( $app, $image ){
 		// Read the selected theme from the config file
 		$theme=OC_Config::getValue( "theme" );
 
@@ -551,35 +551,35 @@ class OC_Helper {
 		}
 	}
 
-    /**
-     * Adds a suffix to the name in case the file exists
-     *
-     * @param $path
-     * @param $filename
-     * @return string
-     */
-    public static function buildNotExistingFileName($path, $filename){
-	    if($path==='/'){
-		    $path='';
-	    }
-        if ($pos = strrpos($filename, '.')) {
-            $name = substr($filename, 0, $pos);
-            $ext = substr($filename, $pos);
-        } else {
-            $name = $filename;
-        }
+	/**
+	* Adds a suffix to the name in case the file exists
+	*
+	* @param $path
+	* @param $filename
+	* @return string
+	*/
+	public static function buildNotExistingFileName($path, $filename){
+		if($path==='/'){
+			$path='';
+		}
+		if ($pos = strrpos($filename, '.')) {
+			$name = substr($filename, 0, $pos);
+			$ext = substr($filename, $pos);
+		} else {
+			$name = $filename;
+		}
 
-        $newpath = $path . '/' . $filename;
-        $newname = $filename;
-        $counter = 2;
-        while (OC_Filesystem::file_exists($newpath)) {
-            $newname = $name . ' (' . $counter . ')' . $ext;
-            $newpath = $path . '/' . $newname;
-            $counter++;
-        }
+		$newpath = $path . '/' . $filename;
+		$newname = $filename;
+		$counter = 2;
+		while (OC_Filesystem::file_exists($newpath)) {
+			$newname = $name . ' (' . $counter . ')' . $ext;
+			$newpath = $path . '/' . $newname;
+			$counter++;
+		}
 
-        return $newpath;
-    }
+		return $newpath;
+	}
 	
 	/*
 	 * checks if $sub is a subdirectory of $parent
diff --git a/lib/public/util.php b/lib/public/util.php
index 995161e2ab..d79d3f26b1 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -145,15 +145,15 @@ class Util {
 	}
 
 
-        /**
-         * @brief Creates an url
-         * @param $app app
-         * @param $file file
-         * @returns the url
-         *
-         * Returns a url to the given app and file.
-         */
-        public static function linkTo( $app, $file ){
+	/**
+	* @brief Creates an url
+	* @param $app app
+	* @param $file file
+	* @returns the url
+	*
+	* Returns a url to the given app and file.
+	*/
+	public static function linkTo( $app, $file ){
 		return(\OC_Helper::linkTo( $app, $file ));
 	}
 
@@ -264,10 +264,6 @@ class Util {
 	public static function callCheck(){
 		return(\OC_Util::callCheck());
 	}
-
-
-
-
 }
 
 ?>

From 211a546600de0d108d3c1b66602dec681ff18837 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 13:41:39 +0200
Subject: [PATCH 0386/1537] fixed xss vulnerability in un-packed version of
 jquery.fancybox and repack it

---
 .../js/jquery.fancybox-1.3.4.js               |   3 +-
 .../js/jquery.fancybox-1.3.4.pack.js          | 794 +-----------------
 2 files changed, 3 insertions(+), 794 deletions(-)

diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
index be77275376..21b202b9e3 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
@@ -84,7 +84,8 @@
 			}
 
 			title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || '';
-
+			title = title.replace(/</, "&lt;").replace(/>/, "&gt;");
+			
 			if (obj.nodeName && !selectedOpts.orig) {
 				selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj);
 			}
diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
index d5b72d8640..ff9a90f09d 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
@@ -1,793 +1 @@
-/*
- * FancyBox - jQuery Plugin
- * Simple and fancy lightbox alternative
- *
- * Examples and documentation at: http://fancybox.net
- * 
- * Copyright (c) 2008 - 2010 Janis Skarnelis
- * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
- * 
- * Version: 1.3.4 (11/11/2010)
- * Requires: jQuery v1.3+
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */
-
-;
-(function(b) {
-	var m, t, u, f, D, j, E, n, z, A, q = 0, e = {}, o = [], p = 0, d = {}, l = [], G = null, v = new Image, J = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i, W = /[^\.]\.(swf)\s*$/i, K, L = 1, y = 0, s = "", r, i, h = false, B = b
-			.extend(b("<div/>")[0], {
-				prop : 0
-			}), M = b.browser.msie && b.browser.version < 7
-			&& !window.XMLHttpRequest, N = function() {
-		t.hide();
-		v.onerror = v.onload = null;
-		G && G.abort();
-		m.empty()
-	}, O = function() {
-		if (false === e.onError(o, q, e)) {
-			t.hide();
-			h = false
-		} else {
-			e.titleShow = false;
-			e.width = "auto";
-			e.height = "auto";
-			m
-					.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');
-			F()
-		}
-	}, I = function() {
-		var a = o[q], c, g, k, C, P, w;
-		N();
-		e = b.extend({}, b.fn.fancybox.defaults,
-				typeof b(a).data("fancybox") == "undefined" ? e : b(a).data(
-						"fancybox"));
-		w = e.onStart(o, q, e);
-		if (w === false)
-			h = false;
-		else {
-			if (typeof w == "object")
-				e = b.extend(e, w);
-			k = e.title || (a.nodeName ? b(a).attr("title") : a.title) || "";
-			k = k.replace(/</, "&lt;").replace(/>/, "&gt;");
-			if (a.nodeName && !e.orig)
-				e.orig = b(a).children("img:first").length ? b(a).children(
-						"img:first") : b(a);
-			if (k === "" && e.orig && e.titleFromAlt)
-				k = e.orig.attr("alt");
-			c = e.href || (a.nodeName ? b(a).attr("href") : a.href) || null;
-			if (/^(?:javascript)/i.test(c) || c == "#")
-				c = null;
-			if (e.type) {
-				g = e.type;
-				if (!c)
-					c = e.content
-			} else if (e.content)
-				g = "html";
-			else if (c)
-				g = c.match(J) ? "image" : c.match(W) ? "swf" : b(a).hasClass(
-						"iframe") ? "iframe" : c.indexOf("#") === 0 ? "inline"
-						: "ajax";
-			if (g) {
-				if (g == "inline") {
-					a = c.substr(c.indexOf("#"));
-					g = b(a).length > 0 ? "inline" : "ajax"
-				}
-				e.type = g;
-				e.href = c;
-				e.title = k;
-				if (e.autoDimensions)
-					if (e.type == "html" || e.type == "inline"
-							|| e.type == "ajax") {
-						e.width = "auto";
-						e.height = "auto"
-					} else
-						e.autoDimensions = false;
-				if (e.modal) {
-					e.overlayShow = true;
-					e.hideOnOverlayClick = false;
-					e.hideOnContentClick = false;
-					e.enableEscapeButton = false;
-					e.showCloseButton = false
-				}
-				e.padding = parseInt(e.padding, 10);
-				e.margin = parseInt(e.margin, 10);
-				m.css("padding", e.padding + e.margin);
-				b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind(
-						"fancybox-change", function() {
-							b(this).replaceWith(j.children())
-						});
-				switch (g) {
-				case "html":
-					m.html(e.content);
-					F();
-					break;
-				case "inline":
-					if (b(a).parent().is("#fancybox-content") === true) {
-						h = false;
-						break
-					}
-					b('<div class="fancybox-inline-tmp" />').hide()
-							.insertBefore(b(a)).bind("fancybox-cleanup",
-									function() {
-										b(this).replaceWith(j.children())
-									}).bind("fancybox-cancel", function() {
-								b(this).replaceWith(m.children())
-							});
-					b(a).appendTo(m);
-					F();
-					break;
-				case "image":
-					h = false;
-					b.fancybox.showActivity();
-					v = new Image;
-					v.onerror = function() {
-						O()
-					};
-					v.onload = function() {
-						h = true;
-						v.onerror = v.onload = null;
-						e.width = v.width;
-						e.height = v.height;
-						b("<img />").attr({
-							id : "fancybox-img",
-							src : v.src,
-							alt : e.title
-						}).appendTo(m);
-						Q()
-					};
-					v.src = c;
-					break;
-				case "swf":
-					e.scrolling = "no";
-					C = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'
-							+ e.width
-							+ '" height="'
-							+ e.height
-							+ '"><param name="movie" value="'
-							+ c
-							+ '"></param>';
-					P = "";
-					b.each(e.swf, function(x, H) {
-						C += '<param name="' + x + '" value="' + H
-								+ '"></param>';
-						P += " " + x + '="' + H + '"'
-					});
-					C += '<embed src="' + c
-							+ '" type="application/x-shockwave-flash" width="'
-							+ e.width + '" height="' + e.height + '"' + P
-							+ "></embed></object>";
-					m.html(C);
-					F();
-					break;
-				case "ajax":
-					h = false;
-					b.fancybox.showActivity();
-					e.ajax.win = e.ajax.success;
-					G = b.ajax(b.extend({}, e.ajax, {
-						url : c,
-						data : e.ajax.data || {},
-						error : function(x) {
-							x.status > 0 && O()
-						},
-						success : function(x, H, R) {
-							if ((typeof R == "object" ? R : G).status == 200) {
-								if (typeof e.ajax.win == "function") {
-									w = e.ajax.win(c, x, H, R);
-									if (w === false) {
-										t.hide();
-										return
-									} else if (typeof w == "string"
-											|| typeof w == "object")
-										x = w
-								}
-								m.html(x);
-								F()
-							}
-						}
-					}));
-					break;
-				case "iframe":
-					Q()
-				}
-			} else
-				O()
-		}
-	}, F = function() {
-		var a = e.width, c = e.height;
-		a = a.toString().indexOf("%") > -1 ? parseInt(
-				(b(window).width() - e.margin * 2) * parseFloat(a) / 100, 10)
-				+ "px" : a == "auto" ? "auto" : a + "px";
-		c = c.toString().indexOf("%") > -1 ? parseInt(
-				(b(window).height() - e.margin * 2) * parseFloat(c) / 100, 10)
-				+ "px" : c == "auto" ? "auto" : c + "px";
-		m.wrapInner('<div style="width:'
-				+ a
-				+ ";height:"
-				+ c
-				+ ";overflow: "
-				+ (e.scrolling == "auto" ? "auto"
-						: e.scrolling == "yes" ? "scroll" : "hidden")
-				+ ';position:relative;"></div>');
-		e.width = m.width();
-		e.height = m.height();
-		Q()
-	}, Q = function() {
-		var a, c;
-		t.hide();
-		if (f.is(":visible") && false === d.onCleanup(l, p, d)) {
-			b.event.trigger("fancybox-cancel");
-			h = false
-		} else {
-			h = true;
-			b(j.add(u)).unbind();
-			b(window).unbind("resize.fb scroll.fb");
-			b(document).unbind("keydown.fb");
-			f.is(":visible") && d.titlePosition !== "outside"
-					&& f.css("height", f.height());
-			l = o;
-			p = q;
-			d = e;
-			if (d.overlayShow) {
-				u.css({
-					"background-color" : d.overlayColor,
-					opacity : d.overlayOpacity,
-					cursor : d.hideOnOverlayClick ? "pointer" : "auto",
-					height : b(document).height()
-				});
-				if (!u.is(":visible")) {
-					M
-							&& b("select:not(#fancybox-tmp select)")
-									.filter(
-											function() {
-												return this.style.visibility !== "hidden"
-											}).css({
-										visibility : "hidden"
-									}).one("fancybox-cleanup", function() {
-										this.style.visibility = "inherit"
-									});
-					u.show()
-				}
-			} else
-				u.hide();
-			i = X();
-			s = d.title || "";
-			y = 0;
-			n.empty().removeAttr("style").removeClass();
-			if (d.titleShow !== false) {
-				if (b.isFunction(d.titleFormat))
-					a = d.titleFormat(s, l, p, d);
-				else
-					a = s && s.length ? d.titlePosition == "float" ? '<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'
-							+ s
-							+ '</td><td id="fancybox-title-float-right"></td></tr></table>'
-							: '<div id="fancybox-title-' + d.titlePosition
-									+ '">' + s + "</div>"
-							: false;
-				s = a;
-				if (!(!s || s === "")) {
-					n.addClass("fancybox-title-" + d.titlePosition).html(s)
-							.appendTo("body").show();
-					switch (d.titlePosition) {
-					case "inside":
-						n.css({
-							width : i.width - d.padding * 2,
-							marginLeft : d.padding,
-							marginRight : d.padding
-						});
-						y = n.outerHeight(true);
-						n.appendTo(D);
-						i.height += y;
-						break;
-					case "over":
-						n.css({
-							marginLeft : d.padding,
-							width : i.width - d.padding * 2,
-							bottom : d.padding
-						}).appendTo(D);
-						break;
-					case "float":
-						n.css(
-								"left",
-								parseInt((n.width() - i.width - 40) / 2, 10)
-										* -1).appendTo(f);
-						break;
-					default:
-						n.css({
-							width : i.width - d.padding * 2,
-							paddingLeft : d.padding,
-							paddingRight : d.padding
-						}).appendTo(f)
-					}
-				}
-			}
-			n.hide();
-			if (f.is(":visible")) {
-				b(E.add(z).add(A)).hide();
-				a = f.position();
-				r = {
-					top : a.top,
-					left : a.left,
-					width : f.width(),
-					height : f.height()
-				};
-				c = r.width == i.width && r.height == i.height;
-				j.fadeTo(d.changeFade, 0.3, function() {
-					var g = function() {
-						j.html(m.contents()).fadeTo(d.changeFade, 1, S)
-					};
-					b.event.trigger("fancybox-change");
-					j.empty().removeAttr("filter").css(
-							{
-								"border-width" : d.padding,
-								width : i.width - d.padding * 2,
-								height : e.autoDimensions ? "auto" : i.height
-										- y - d.padding * 2
-							});
-					if (c)
-						g();
-					else {
-						B.prop = 0;
-						b(B).animate({
-							prop : 1
-						}, {
-							duration : d.changeSpeed,
-							easing : d.easingChange,
-							step : T,
-							complete : g
-						})
-					}
-				})
-			} else {
-				f.removeAttr("style");
-				j.css("border-width", d.padding);
-				if (d.transitionIn == "elastic") {
-					r = V();
-					j.html(m.contents());
-					f.show();
-					if (d.opacity)
-						i.opacity = 0;
-					B.prop = 0;
-					b(B).animate({
-						prop : 1
-					}, {
-						duration : d.speedIn,
-						easing : d.easingIn,
-						step : T,
-						complete : S
-					})
-				} else {
-					d.titlePosition == "inside" && y > 0 && n.show();
-					j.css(
-							{
-								width : i.width - d.padding * 2,
-								height : e.autoDimensions ? "auto" : i.height
-										- y - d.padding * 2
-							}).html(m.contents());
-					f
-							.css(i)
-							.fadeIn(d.transitionIn == "none" ? 0 : d.speedIn, S)
-				}
-			}
-		}
-	}, Y = function() {
-		if (d.enableEscapeButton || d.enableKeyboardNav)
-			b(document).bind(
-					"keydown.fb",
-					function(a) {
-						if (a.keyCode == 27 && d.enableEscapeButton) {
-							a.preventDefault();
-							b.fancybox.close()
-						} else if ((a.keyCode == 37 || a.keyCode == 39)
-								&& d.enableKeyboardNav
-								&& a.target.tagName !== "INPUT"
-								&& a.target.tagName !== "TEXTAREA"
-								&& a.target.tagName !== "SELECT") {
-							a.preventDefault();
-							b.fancybox[a.keyCode == 37 ? "prev" : "next"]()
-						}
-					});
-		if (d.showNavArrows) {
-			if (d.cyclic && l.length > 1 || p !== 0)
-				z.show();
-			if (d.cyclic && l.length > 1 || p != l.length - 1)
-				A.show()
-		} else {
-			z.hide();
-			A.hide()
-		}
-	}, S = function() {
-		if (!b.support.opacity) {
-			j.get(0).style.removeAttribute("filter");
-			f.get(0).style.removeAttribute("filter")
-		}
-		e.autoDimensions && j.css("height", "auto");
-		f.css("height", "auto");
-		s && s.length && n.show();
-		d.showCloseButton && E.show();
-		Y();
-		d.hideOnContentClick && j.bind("click", b.fancybox.close);
-		d.hideOnOverlayClick && u.bind("click", b.fancybox.close);
-		b(window).bind("resize.fb", b.fancybox.resize);
-		d.centerOnScroll && b(window).bind("scroll.fb", b.fancybox.center);
-		if (d.type == "iframe")
-			b(
-					'<iframe id="fancybox-frame" name="fancybox-frame'
-							+ (new Date).getTime()
-							+ '" frameborder="0" hspace="0" '
-							+ (b.browser.msie ? 'allowtransparency="true""'
-									: "") + ' scrolling="' + e.scrolling
-							+ '" src="' + d.href + '"></iframe>').appendTo(j);
-		f.show();
-		h = false;
-		b.fancybox.center();
-		d.onComplete(l, p, d);
-		var a, c;
-		if (l.length - 1 > p) {
-			a = l[p + 1].href;
-			if (typeof a !== "undefined" && a.match(J)) {
-				c = new Image;
-				c.src = a
-			}
-		}
-		if (p > 0) {
-			a = l[p - 1].href;
-			if (typeof a !== "undefined" && a.match(J)) {
-				c = new Image;
-				c.src = a
-			}
-		}
-	}, T = function(a) {
-		var c = {
-			width : parseInt(r.width + (i.width - r.width) * a, 10),
-			height : parseInt(r.height + (i.height - r.height) * a, 10),
-			top : parseInt(r.top + (i.top - r.top) * a, 10),
-			left : parseInt(r.left + (i.left - r.left) * a, 10)
-		};
-		if (typeof i.opacity !== "undefined")
-			c.opacity = a < 0.5 ? 0.5 : a;
-		f.css(c);
-		j.css({
-			width : c.width - d.padding * 2,
-			height : c.height - y * a - d.padding * 2
-		})
-	}, U = function() {
-		return [ b(window).width() - d.margin * 2,
-				b(window).height() - d.margin * 2,
-				b(document).scrollLeft() + d.margin,
-				b(document).scrollTop() + d.margin ]
-	}, X = function() {
-		var a = U(), c = {}, g = d.autoScale, k = d.padding * 2;
-		c.width = d.width.toString().indexOf("%") > -1 ? parseInt(a[0]
-				* parseFloat(d.width) / 100, 10) : d.width + k;
-		c.height = d.height.toString().indexOf("%") > -1 ? parseInt(a[1]
-				* parseFloat(d.height) / 100, 10) : d.height + k;
-		if (g && (c.width > a[0] || c.height > a[1]))
-			if (e.type == "image" || e.type == "swf") {
-				g = d.width / d.height;
-				if (c.width > a[0]) {
-					c.width = a[0];
-					c.height = parseInt((c.width - k) / g + k, 10)
-				}
-				if (c.height > a[1]) {
-					c.height = a[1];
-					c.width = parseInt((c.height - k) * g + k, 10)
-				}
-			} else {
-				c.width = Math.min(c.width, a[0]);
-				c.height = Math.min(c.height, a[1])
-			}
-		c.top = parseInt(Math.max(a[3] - 20, a[3] + (a[1] - c.height - 40)
-				* 0.5), 10);
-		c.left = parseInt(Math.max(a[2] - 20, a[2] + (a[0] - c.width - 40)
-				* 0.5), 10);
-		return c
-	}, V = function() {
-		var a = e.orig ? b(e.orig) : false, c = {};
-		if (a && a.length) {
-			c = a.offset();
-			c.top += parseInt(a.css("paddingTop"), 10) || 0;
-			c.left += parseInt(a.css("paddingLeft"), 10) || 0;
-			c.top += parseInt(a.css("border-top-width"), 10) || 0;
-			c.left += parseInt(a.css("border-left-width"), 10) || 0;
-			c.width = a.width();
-			c.height = a.height();
-			c = {
-				width : c.width + d.padding * 2,
-				height : c.height + d.padding * 2,
-				top : c.top - d.padding - 20,
-				left : c.left - d.padding - 20
-			}
-		} else {
-			a = U();
-			c = {
-				width : d.padding * 2,
-				height : d.padding * 2,
-				top : parseInt(a[3] + a[1] * 0.5, 10),
-				left : parseInt(a[2] + a[0] * 0.5, 10)
-			}
-		}
-		return c
-	}, Z = function() {
-		if (t.is(":visible")) {
-			b("div", t).css("top", L * -40 + "px");
-			L = (L + 1) % 12
-		} else
-			clearInterval(K)
-	};
-	b.fn.fancybox = function(a) {
-		if (!b(this).length)
-			return this;
-		b(this).data("fancybox",
-				b.extend({}, a, b.metadata ? b(this).metadata() : {})).unbind(
-				"click.fb").bind("click.fb", function(c) {
-			c.preventDefault();
-			if (!h) {
-				h = true;
-				b(this).blur();
-				o = [];
-				q = 0;
-				c = b(this).attr("rel") || "";
-				if (!c || c == "" || c === "nofollow")
-					o.push(this);
-				else {
-					o = b("a[rel=" + c + "], area[rel=" + c + "]");
-					q = o.index(this)
-				}
-				I()
-			}
-		});
-		return this
-	};
-	b.fancybox = function(a, c) {
-		var g;
-		if (!h) {
-			h = true;
-			g = typeof c !== "undefined" ? c : {};
-			o = [];
-			q = parseInt(g.index, 10) || 0;
-			if (b.isArray(a)) {
-				for ( var k = 0, C = a.length; k < C; k++)
-					if (typeof a[k] == "object")
-						b(a[k]).data("fancybox", b.extend({}, g, a[k]));
-					else
-						a[k] = b({}).data("fancybox", b.extend({
-							content : a[k]
-						}, g));
-				o = jQuery.merge(o, a)
-			} else {
-				if (typeof a == "object")
-					b(a).data("fancybox", b.extend({}, g, a));
-				else
-					a = b({}).data("fancybox", b.extend({
-						content : a
-					}, g));
-				o.push(a)
-			}
-			if (q > o.length || q < 0)
-				q = 0;
-			I()
-		}
-	};
-	b.fancybox.showActivity = function() {
-		clearInterval(K);
-		t.show();
-		K = setInterval(Z, 66)
-	};
-	b.fancybox.hideActivity = function() {
-		t.hide()
-	};
-	b.fancybox.next = function() {
-		return b.fancybox.pos(p + 1)
-	};
-	b.fancybox.prev = function() {
-		return b.fancybox.pos(p - 1)
-	};
-	b.fancybox.pos = function(a) {
-		if (!h) {
-			a = parseInt(a);
-			o = l;
-			if (a > -1 && a < l.length) {
-				q = a;
-				I()
-			} else if (d.cyclic && l.length > 1) {
-				q = a >= l.length ? 0 : l.length - 1;
-				I()
-			}
-		}
-	};
-	b.fancybox.cancel = function() {
-		if (!h) {
-			h = true;
-			b.event.trigger("fancybox-cancel");
-			N();
-			e.onCancel(o, q, e);
-			h = false
-		}
-	};
-	b.fancybox.close = function() {
-		function a() {
-			u.fadeOut("fast");
-			n.empty().hide();
-			f.hide();
-			b.event.trigger("fancybox-cleanup");
-			j.empty();
-			d.onClosed(l, p, d);
-			l = e = [];
-			p = q = 0;
-			d = e = {};
-			h = false
-		}
-		if (!(h || f.is(":hidden"))) {
-			h = true;
-			if (d && false === d.onCleanup(l, p, d))
-				h = false;
-			else {
-				N();
-				b(E.add(z).add(A)).hide();
-				b(j.add(u)).unbind();
-				b(window).unbind("resize.fb scroll.fb");
-				b(document).unbind("keydown.fb");
-				j
-						.find("iframe")
-						.attr(
-								"src",
-								M && /^https/i.test(window.location.href || "") ? "javascript:void(false)"
-										: "about:blank");
-				d.titlePosition !== "inside" && n.empty();
-				f.stop();
-				if (d.transitionOut == "elastic") {
-					r = V();
-					var c = f.position();
-					i = {
-						top : c.top,
-						left : c.left,
-						width : f.width(),
-						height : f.height()
-					};
-					if (d.opacity)
-						i.opacity = 1;
-					n.empty().hide();
-					B.prop = 1;
-					b(B).animate({
-						prop : 0
-					}, {
-						duration : d.speedOut,
-						easing : d.easingOut,
-						step : T,
-						complete : a
-					})
-				} else
-					f.fadeOut(d.transitionOut == "none" ? 0 : d.speedOut, a)
-			}
-		}
-	};
-	b.fancybox.resize = function() {
-		u.is(":visible") && u.css("height", b(document).height());
-		b.fancybox.center(true)
-	};
-	b.fancybox.center = function(a) {
-		var c, g;
-		if (!h) {
-			g = a === true ? 1 : 0;
-			c = U();
-			!g
-					&& (f.width() > c[0] || f.height() > c[1])
-					|| f.stop().animate(
-							{
-								top : parseInt(Math.max(c[3] - 20, c[3]
-										+ (c[1] - j.height() - 40) * 0.5
-										- d.padding)),
-								left : parseInt(Math.max(c[2] - 20, c[2]
-										+ (c[0] - j.width() - 40) * 0.5
-										- d.padding))
-							}, typeof a == "number" ? a : 200)
-		}
-	};
-	b.fancybox.init = function() {
-		if (!b("#fancybox-wrap").length) {
-			b("body").append(m = b('<div id="fancybox-tmp"></div>'),
-					t = b('<div id="fancybox-loading"><div></div></div>'),
-					u = b('<div id="fancybox-overlay"></div>'),
-					f = b('<div id="fancybox-wrap"></div>'));
-			D = b('<div id="fancybox-outer"></div>')
-					.append(
-							'<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>')
-					.appendTo(f);
-			D
-					.append(
-							j = b('<div id="fancybox-content"></div>'),
-							E = b('<a id="fancybox-close"></a>'),
-							n = b('<div id="fancybox-title"></div>'),
-							z = b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),
-							A = b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));
-			E.click(b.fancybox.close);
-			t.click(b.fancybox.cancel);
-			z.click(function(a) {
-				a.preventDefault();
-				b.fancybox.prev()
-			});
-			A.click(function(a) {
-				a.preventDefault();
-				b.fancybox.next()
-			});
-			b.fn.mousewheel
-					&& f.bind("mousewheel.fb", function(a, c) {
-						if (h)
-							a.preventDefault();
-						else if (b(a.target).get(0).clientHeight == 0
-								|| b(a.target).get(0).scrollHeight === b(
-										a.target).get(0).clientHeight) {
-							a.preventDefault();
-							b.fancybox[c > 0 ? "prev" : "next"]()
-						}
-					});
-			b.support.opacity || f.addClass("fancybox-ie");
-			if (M) {
-				t.addClass("fancybox-ie6");
-				f.addClass("fancybox-ie6");
-				b(
-						'<iframe id="fancybox-hide-sel-frame" src="'
-								+ (/^https/i.test(window.location.href || "") ? "javascript:void(false)"
-										: "about:blank")
-								+ '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>')
-						.prependTo(D)
-			}
-		}
-	};
-	b.fn.fancybox.defaults = {
-		padding : 10,
-		margin : 40,
-		opacity : false,
-		modal : false,
-		cyclic : false,
-		scrolling : "auto",
-		width : 560,
-		height : 340,
-		autoScale : true,
-		autoDimensions : true,
-		centerOnScroll : false,
-		ajax : {},
-		swf : {
-			wmode : "transparent"
-		},
-		hideOnOverlayClick : true,
-		hideOnContentClick : false,
-		overlayShow : true,
-		overlayOpacity : 0.7,
-		overlayColor : "#777",
-		titleShow : true,
-		titlePosition : "float",
-		titleFormat : null,
-		titleFromAlt : false,
-		transitionIn : "fade",
-		transitionOut : "fade",
-		speedIn : 300,
-		speedOut : 300,
-		changeSpeed : 300,
-		changeFade : "fast",
-		easingIn : "swing",
-		easingOut : "swing",
-		showCloseButton : true,
-		showNavArrows : true,
-		enableEscapeButton : true,
-		enableKeyboardNav : true,
-		onStart : function() {
-		},
-		onCancel : function() {
-		},
-		onComplete : function() {
-		},
-		onCleanup : function() {
-		},
-		onClosed : function() {
-		},
-		onError : function() {
-		}
-	};
-	b(document).ready(function() {
-		b.fancybox.init()
-	})
-})(jQuery);
\ No newline at end of file
+(function(B){var L,T,Q,M,d,m,J,A,O,z,C=0,H={},j=[],e=0,G={},y=[],f=null,o=new Image(),i=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,k=/[^\.]\.(swf)\s*$/i,p,N=1,h=0,t="",b,c,P=false,s=B.extend(B("<div/>")[0],{prop:0}),S=B.browser.msie&&B.browser.version<7&&!window.XMLHttpRequest,r=function(){T.hide();o.onerror=o.onload=null;if(f){f.abort()}L.empty()},x=function(){if(false===H.onError(j,C,H)){T.hide();P=false;return}H.titleShow=false;H.width="auto";H.height="auto";L.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');n()},w=function(){var Z=j[C],W,Y,ab,aa,V,X;r();H=B.extend({},B.fn.fancybox.defaults,(typeof B(Z).data("fancybox")=="undefined"?H:B(Z).data("fancybox")));X=H.onStart(j,C,H);if(X===false){P=false;return}else{if(typeof X=="object"){H=B.extend(H,X)}}ab=H.title||(Z.nodeName?B(Z).attr("title"):Z.title)||"";ab=ab.replace(/</,"&lt;").replace(/>/,"&gt;");if(Z.nodeName&&!H.orig){H.orig=B(Z).children("img:first").length?B(Z).children("img:first"):B(Z)}if(ab===""&&H.orig&&H.titleFromAlt){ab=H.orig.attr("alt")}W=H.href||(Z.nodeName?B(Z).attr("href"):Z.href)||null;if((/^(?:javascript)/i).test(W)||W=="#"){W=null}if(H.type){Y=H.type;if(!W){W=H.content}}else{if(H.content){Y="html"}else{if(W){if(W.match(i)){Y="image"}else{if(W.match(k)){Y="swf"}else{if(B(Z).hasClass("iframe")){Y="iframe"}else{if(W.indexOf("#")===0){Y="inline"}else{Y="ajax"}}}}}}}if(!Y){x();return}if(Y=="inline"){Z=W.substr(W.indexOf("#"));Y=B(Z).length>0?"inline":"ajax"}H.type=Y;H.href=W;H.title=ab;if(H.autoDimensions){if(H.type=="html"||H.type=="inline"||H.type=="ajax"){H.width="auto";H.height="auto"}else{H.autoDimensions=false}}if(H.modal){H.overlayShow=true;H.hideOnOverlayClick=false;H.hideOnContentClick=false;H.enableEscapeButton=false;H.showCloseButton=false}H.padding=parseInt(H.padding,10);H.margin=parseInt(H.margin,10);L.css("padding",(H.padding+H.margin));B(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){B(this).replaceWith(m.children())});switch(Y){case"html":L.html(H.content);n();break;case"inline":if(B(Z).parent().is("#fancybox-content")===true){P=false;return}B('<div class="fancybox-inline-tmp" />').hide().insertBefore(B(Z)).bind("fancybox-cleanup",function(){B(this).replaceWith(m.children())}).bind("fancybox-cancel",function(){B(this).replaceWith(L.children())});B(Z).appendTo(L);n();break;case"image":P=false;B.fancybox.showActivity();o=new Image();o.onerror=function(){x()};o.onload=function(){P=true;o.onerror=o.onload=null;F()};o.src=W;break;case"swf":H.scrolling="no";aa='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+H.width+'" height="'+H.height+'"><param name="movie" value="'+W+'"></param>';V="";B.each(H.swf,function(ac,ad){aa+='<param name="'+ac+'" value="'+ad+'"></param>';V+=" "+ac+'="'+ad+'"'});aa+='<embed src="'+W+'" type="application/x-shockwave-flash" width="'+H.width+'" height="'+H.height+'"'+V+"></embed></object>";L.html(aa);n();break;case"ajax":P=false;B.fancybox.showActivity();H.ajax.win=H.ajax.success;f=B.ajax(B.extend({},H.ajax,{url:W,data:H.ajax.data||{},error:function(ac,ae,ad){if(ac.status>0){x()}},success:function(ad,af,ac){var ae=typeof ac=="object"?ac:f;if(ae.status==200){if(typeof H.ajax.win=="function"){X=H.ajax.win(W,ad,af,ac);if(X===false){T.hide();return}else{if(typeof X=="string"||typeof X=="object"){ad=X}}}L.html(ad);n()}}}));break;case"iframe":E();break}},n=function(){var V=H.width,W=H.height;if(V.toString().indexOf("%")>-1){V=parseInt((B(window).width()-(H.margin*2))*parseFloat(V)/100,10)+"px"}else{V=V=="auto"?"auto":V+"px"}if(W.toString().indexOf("%")>-1){W=parseInt((B(window).height()-(H.margin*2))*parseFloat(W)/100,10)+"px"}else{W=W=="auto"?"auto":W+"px"}L.wrapInner('<div style="width:'+V+";height:"+W+";overflow: "+(H.scrolling=="auto"?"auto":(H.scrolling=="yes"?"scroll":"hidden"))+';position:relative;"></div>');H.width=L.width();H.height=L.height();E()},F=function(){H.width=o.width;H.height=o.height;B("<img />").attr({id:"fancybox-img",src:o.src,alt:H.title}).appendTo(L);E()},E=function(){var W,V;T.hide();if(M.is(":visible")&&false===G.onCleanup(y,e,G)){B.event.trigger("fancybox-cancel");P=false;return}P=true;B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");if(M.is(":visible")&&G.titlePosition!=="outside"){M.css("height",M.height())}y=j;e=C;G=H;if(G.overlayShow){Q.css({"background-color":G.overlayColor,opacity:G.overlayOpacity,cursor:G.hideOnOverlayClick?"pointer":"auto",height:B(document).height()});if(!Q.is(":visible")){if(S){B("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"})}Q.show()}}else{Q.hide()}c=R();l();if(M.is(":visible")){B(J.add(O).add(z)).hide();W=M.position(),b={top:W.top,left:W.left,width:M.width(),height:M.height()};V=(b.width==c.width&&b.height==c.height);m.fadeTo(G.changeFade,0.3,function(){var X=function(){m.html(L.contents()).fadeTo(G.changeFade,1,v)};B.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":G.padding,width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2});if(V){X()}else{s.prop=0;B(s).animate({prop:1},{duration:G.changeSpeed,easing:G.easingChange,step:U,complete:X})}});return}M.removeAttr("style");m.css("border-width",G.padding);if(G.transitionIn=="elastic"){b=I();m.html(L.contents());M.show();if(G.opacity){c.opacity=0}s.prop=0;B(s).animate({prop:1},{duration:G.speedIn,easing:G.easingIn,step:U,complete:v});return}if(G.titlePosition=="inside"&&h>0){A.show()}m.css({width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2}).html(L.contents());M.css(c).fadeIn(G.transitionIn=="none"?0:G.speedIn,v)},D=function(V){if(V&&V.length){if(G.titlePosition=="float"){return'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+V+'</td><td id="fancybox-title-float-right"></td></tr></table>'}return'<div id="fancybox-title-'+G.titlePosition+'">'+V+"</div>"}return false},l=function(){t=G.title||"";h=0;A.empty().removeAttr("style").removeClass();if(G.titleShow===false){A.hide();return}t=B.isFunction(G.titleFormat)?G.titleFormat(t,y,e,G):D(t);if(!t||t===""){A.hide();return}A.addClass("fancybox-title-"+G.titlePosition).html(t).appendTo("body").show();switch(G.titlePosition){case"inside":A.css({width:c.width-(G.padding*2),marginLeft:G.padding,marginRight:G.padding});h=A.outerHeight(true);A.appendTo(d);c.height+=h;break;case"over":A.css({marginLeft:G.padding,width:c.width-(G.padding*2),bottom:G.padding}).appendTo(d);break;case"float":A.css("left",parseInt((A.width()-c.width-40)/2,10)*-1).appendTo(M);break;default:A.css({width:c.width-(G.padding*2),paddingLeft:G.padding,paddingRight:G.padding}).appendTo(M);break}A.hide()},g=function(){if(G.enableEscapeButton||G.enableKeyboardNav){B(document).bind("keydown.fb",function(V){if(V.keyCode==27&&G.enableEscapeButton){V.preventDefault();B.fancybox.close()}else{if((V.keyCode==37||V.keyCode==39)&&G.enableKeyboardNav&&V.target.tagName!=="INPUT"&&V.target.tagName!=="TEXTAREA"&&V.target.tagName!=="SELECT"){V.preventDefault();B.fancybox[V.keyCode==37?"prev":"next"]()}}})}if(!G.showNavArrows){O.hide();z.hide();return}if((G.cyclic&&y.length>1)||e!==0){O.show()}if((G.cyclic&&y.length>1)||e!=(y.length-1)){z.show()}},v=function(){if(!B.support.opacity){m.get(0).style.removeAttribute("filter");M.get(0).style.removeAttribute("filter")}if(H.autoDimensions){m.css("height","auto")}M.css("height","auto");if(t&&t.length){A.show()}if(G.showCloseButton){J.show()}g();if(G.hideOnContentClick){m.bind("click",B.fancybox.close)}if(G.hideOnOverlayClick){Q.bind("click",B.fancybox.close)}B(window).bind("resize.fb",B.fancybox.resize);if(G.centerOnScroll){B(window).bind("scroll.fb",B.fancybox.center)}if(G.type=="iframe"){B('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" '+(B.browser.msie?'allowtransparency="true""':"")+' scrolling="'+H.scrolling+'" src="'+G.href+'"></iframe>').appendTo(m)}M.show();P=false;B.fancybox.center();G.onComplete(y,e,G);K()},K=function(){var V,W;if((y.length-1)>e){V=y[e+1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}if(e>0){V=y[e-1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}},U=function(W){var V={width:parseInt(b.width+(c.width-b.width)*W,10),height:parseInt(b.height+(c.height-b.height)*W,10),top:parseInt(b.top+(c.top-b.top)*W,10),left:parseInt(b.left+(c.left-b.left)*W,10)};if(typeof c.opacity!=="undefined"){V.opacity=W<0.5?0.5:W}M.css(V);m.css({width:V.width-G.padding*2,height:V.height-(h*W)-G.padding*2})},u=function(){return[B(window).width()-(G.margin*2),B(window).height()-(G.margin*2),B(document).scrollLeft()+G.margin,B(document).scrollTop()+G.margin]},R=function(){var V=u(),Z={},W=G.autoScale,X=G.padding*2,Y;if(G.width.toString().indexOf("%")>-1){Z.width=parseInt((V[0]*parseFloat(G.width))/100,10)}else{Z.width=G.width+X}if(G.height.toString().indexOf("%")>-1){Z.height=parseInt((V[1]*parseFloat(G.height))/100,10)}else{Z.height=G.height+X}if(W&&(Z.width>V[0]||Z.height>V[1])){if(H.type=="image"||H.type=="swf"){Y=(G.width)/(G.height);if((Z.width)>V[0]){Z.width=V[0];Z.height=parseInt(((Z.width-X)/Y)+X,10)}if((Z.height)>V[1]){Z.height=V[1];Z.width=parseInt(((Z.height-X)*Y)+X,10)}}else{Z.width=Math.min(Z.width,V[0]);Z.height=Math.min(Z.height,V[1])}}Z.top=parseInt(Math.max(V[3]-20,V[3]+((V[1]-Z.height-40)*0.5)),10);Z.left=parseInt(Math.max(V[2]-20,V[2]+((V[0]-Z.width-40)*0.5)),10);return Z},q=function(V){var W=V.offset();W.top+=parseInt(V.css("paddingTop"),10)||0;W.left+=parseInt(V.css("paddingLeft"),10)||0;W.top+=parseInt(V.css("border-top-width"),10)||0;W.left+=parseInt(V.css("border-left-width"),10)||0;W.width=V.width();W.height=V.height();return W},I=function(){var Y=H.orig?B(H.orig):false,X={},W,V;if(Y&&Y.length){W=q(Y);X={width:W.width+(G.padding*2),height:W.height+(G.padding*2),top:W.top-G.padding-20,left:W.left-G.padding-20}}else{V=u();X={width:G.padding*2,height:G.padding*2,top:parseInt(V[3]+V[1]*0.5,10),left:parseInt(V[2]+V[0]*0.5,10)}}return X},a=function(){if(!T.is(":visible")){clearInterval(p);return}B("div",T).css("top",(N*-40)+"px");N=(N+1)%12};B.fn.fancybox=function(V){if(!B(this).length){return this}B(this).data("fancybox",B.extend({},V,(B.metadata?B(this).metadata():{}))).unbind("click.fb").bind("click.fb",function(X){X.preventDefault();if(P){return}P=true;B(this).blur();j=[];C=0;var W=B(this).attr("rel")||"";if(!W||W==""||W==="nofollow"){j.push(this)}else{j=B("a[rel="+W+"], area[rel="+W+"]");C=j.index(this)}w();return});return this};B.fancybox=function(Y){var X;if(P){return}P=true;X=typeof arguments[1]!=="undefined"?arguments[1]:{};j=[];C=parseInt(X.index,10)||0;if(B.isArray(Y)){for(var W=0,V=Y.length;W<V;W++){if(typeof Y[W]=="object"){B(Y[W]).data("fancybox",B.extend({},X,Y[W]))}else{Y[W]=B({}).data("fancybox",B.extend({content:Y[W]},X))}}j=jQuery.merge(j,Y)}else{if(typeof Y=="object"){B(Y).data("fancybox",B.extend({},X,Y))}else{Y=B({}).data("fancybox",B.extend({content:Y},X))}j.push(Y)}if(C>j.length||C<0){C=0}w()};B.fancybox.showActivity=function(){clearInterval(p);T.show();p=setInterval(a,66)};B.fancybox.hideActivity=function(){T.hide()};B.fancybox.next=function(){return B.fancybox.pos(e+1)};B.fancybox.prev=function(){return B.fancybox.pos(e-1)};B.fancybox.pos=function(V){if(P){return}V=parseInt(V);j=y;if(V>-1&&V<y.length){C=V;w()}else{if(G.cyclic&&y.length>1){C=V>=y.length?0:y.length-1;w()}}return};B.fancybox.cancel=function(){if(P){return}P=true;B.event.trigger("fancybox-cancel");r();H.onCancel(j,C,H);P=false};B.fancybox.close=function(){if(P||M.is(":hidden")){return}P=true;if(G&&false===G.onCleanup(y,e,G)){P=false;return}r();B(J.add(O).add(z)).hide();B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");m.find("iframe").attr("src",S&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");if(G.titlePosition!=="inside"){A.empty()}M.stop();function V(){Q.fadeOut("fast");A.empty().hide();M.hide();B.event.trigger("fancybox-cleanup");m.empty();G.onClosed(y,e,G);y=H=[];e=C=0;G=H={};P=false}if(G.transitionOut=="elastic"){b=I();var W=M.position();c={top:W.top,left:W.left,width:M.width(),height:M.height()};if(G.opacity){c.opacity=1}A.empty().hide();s.prop=1;B(s).animate({prop:0},{duration:G.speedOut,easing:G.easingOut,step:U,complete:V})}else{M.fadeOut(G.transitionOut=="none"?0:G.speedOut,V)}};B.fancybox.resize=function(){if(Q.is(":visible")){Q.css("height",B(document).height())}B.fancybox.center(true)};B.fancybox.center=function(){var V,W;if(P){return}W=arguments[0]===true?1:0;V=u();if(!W&&(M.width()>V[0]||M.height()>V[1])){return}M.stop().animate({top:parseInt(Math.max(V[3]-20,V[3]+((V[1]-m.height()-40)*0.5)-G.padding)),left:parseInt(Math.max(V[2]-20,V[2]+((V[0]-m.width()-40)*0.5)-G.padding))},typeof arguments[0]=="number"?arguments[0]:200)};B.fancybox.init=function(){if(B("#fancybox-wrap").length){return}B("body").append(L=B('<div id="fancybox-tmp"></div>'),T=B('<div id="fancybox-loading"><div></div></div>'),Q=B('<div id="fancybox-overlay"></div>'),M=B('<div id="fancybox-wrap"></div>'));d=B('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(M);d.append(m=B('<div id="fancybox-content"></div>'),J=B('<a id="fancybox-close"></a>'),A=B('<div id="fancybox-title"></div>'),O=B('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=B('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));J.click(B.fancybox.close);T.click(B.fancybox.cancel);O.click(function(V){V.preventDefault();B.fancybox.prev()});z.click(function(V){V.preventDefault();B.fancybox.next()});if(B.fn.mousewheel){M.bind("mousewheel.fb",function(V,W){if(P){V.preventDefault()}else{if(B(V.target).get(0).clientHeight==0||B(V.target).get(0).scrollHeight===B(V.target).get(0).clientHeight){V.preventDefault();B.fancybox[W>0?"prev":"next"]()}}})}if(!B.support.opacity){M.addClass("fancybox-ie")}if(S){T.addClass("fancybox-ie6");M.addClass("fancybox-ie6");B('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(d)}};B.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};B(document).ready(function(){B.fancybox.init()})})(jQuery);
\ No newline at end of file

From d28a4f0638bf06e9ad84b80fb49c142c4e71f9cd Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 14:17:30 +0200
Subject: [PATCH 0387/1537] prevent xss attacks also if some javascript ends up
 in the alt-tag

---
 apps/files_imageviewer/js/jquery.fancybox-1.3.4.js      | 3 ++-
 apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
index 21b202b9e3..a1db7b6198 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
@@ -84,7 +84,6 @@
 			}
 
 			title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || '';
-			title = title.replace(/</, "&lt;").replace(/>/, "&gt;");
 			
 			if (obj.nodeName && !selectedOpts.orig) {
 				selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj);
@@ -94,6 +93,8 @@
 				title = selectedOpts.orig.attr('alt');
 			}
 
+			title = title.replace(/</, "&lt;").replace(/>/, "&gt;");
+			
 			href = selectedOpts.href || (obj.nodeName ? $(obj).attr('href') : obj.href) || null;
 
 			if ((/^(?:javascript)/i).test(href) || href == '#') {
diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
index ff9a90f09d..e5ee2ae359 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
@@ -1 +1 @@
-(function(B){var L,T,Q,M,d,m,J,A,O,z,C=0,H={},j=[],e=0,G={},y=[],f=null,o=new Image(),i=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,k=/[^\.]\.(swf)\s*$/i,p,N=1,h=0,t="",b,c,P=false,s=B.extend(B("<div/>")[0],{prop:0}),S=B.browser.msie&&B.browser.version<7&&!window.XMLHttpRequest,r=function(){T.hide();o.onerror=o.onload=null;if(f){f.abort()}L.empty()},x=function(){if(false===H.onError(j,C,H)){T.hide();P=false;return}H.titleShow=false;H.width="auto";H.height="auto";L.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');n()},w=function(){var Z=j[C],W,Y,ab,aa,V,X;r();H=B.extend({},B.fn.fancybox.defaults,(typeof B(Z).data("fancybox")=="undefined"?H:B(Z).data("fancybox")));X=H.onStart(j,C,H);if(X===false){P=false;return}else{if(typeof X=="object"){H=B.extend(H,X)}}ab=H.title||(Z.nodeName?B(Z).attr("title"):Z.title)||"";ab=ab.replace(/</,"&lt;").replace(/>/,"&gt;");if(Z.nodeName&&!H.orig){H.orig=B(Z).children("img:first").length?B(Z).children("img:first"):B(Z)}if(ab===""&&H.orig&&H.titleFromAlt){ab=H.orig.attr("alt")}W=H.href||(Z.nodeName?B(Z).attr("href"):Z.href)||null;if((/^(?:javascript)/i).test(W)||W=="#"){W=null}if(H.type){Y=H.type;if(!W){W=H.content}}else{if(H.content){Y="html"}else{if(W){if(W.match(i)){Y="image"}else{if(W.match(k)){Y="swf"}else{if(B(Z).hasClass("iframe")){Y="iframe"}else{if(W.indexOf("#")===0){Y="inline"}else{Y="ajax"}}}}}}}if(!Y){x();return}if(Y=="inline"){Z=W.substr(W.indexOf("#"));Y=B(Z).length>0?"inline":"ajax"}H.type=Y;H.href=W;H.title=ab;if(H.autoDimensions){if(H.type=="html"||H.type=="inline"||H.type=="ajax"){H.width="auto";H.height="auto"}else{H.autoDimensions=false}}if(H.modal){H.overlayShow=true;H.hideOnOverlayClick=false;H.hideOnContentClick=false;H.enableEscapeButton=false;H.showCloseButton=false}H.padding=parseInt(H.padding,10);H.margin=parseInt(H.margin,10);L.css("padding",(H.padding+H.margin));B(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){B(this).replaceWith(m.children())});switch(Y){case"html":L.html(H.content);n();break;case"inline":if(B(Z).parent().is("#fancybox-content")===true){P=false;return}B('<div class="fancybox-inline-tmp" />').hide().insertBefore(B(Z)).bind("fancybox-cleanup",function(){B(this).replaceWith(m.children())}).bind("fancybox-cancel",function(){B(this).replaceWith(L.children())});B(Z).appendTo(L);n();break;case"image":P=false;B.fancybox.showActivity();o=new Image();o.onerror=function(){x()};o.onload=function(){P=true;o.onerror=o.onload=null;F()};o.src=W;break;case"swf":H.scrolling="no";aa='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+H.width+'" height="'+H.height+'"><param name="movie" value="'+W+'"></param>';V="";B.each(H.swf,function(ac,ad){aa+='<param name="'+ac+'" value="'+ad+'"></param>';V+=" "+ac+'="'+ad+'"'});aa+='<embed src="'+W+'" type="application/x-shockwave-flash" width="'+H.width+'" height="'+H.height+'"'+V+"></embed></object>";L.html(aa);n();break;case"ajax":P=false;B.fancybox.showActivity();H.ajax.win=H.ajax.success;f=B.ajax(B.extend({},H.ajax,{url:W,data:H.ajax.data||{},error:function(ac,ae,ad){if(ac.status>0){x()}},success:function(ad,af,ac){var ae=typeof ac=="object"?ac:f;if(ae.status==200){if(typeof H.ajax.win=="function"){X=H.ajax.win(W,ad,af,ac);if(X===false){T.hide();return}else{if(typeof X=="string"||typeof X=="object"){ad=X}}}L.html(ad);n()}}}));break;case"iframe":E();break}},n=function(){var V=H.width,W=H.height;if(V.toString().indexOf("%")>-1){V=parseInt((B(window).width()-(H.margin*2))*parseFloat(V)/100,10)+"px"}else{V=V=="auto"?"auto":V+"px"}if(W.toString().indexOf("%")>-1){W=parseInt((B(window).height()-(H.margin*2))*parseFloat(W)/100,10)+"px"}else{W=W=="auto"?"auto":W+"px"}L.wrapInner('<div style="width:'+V+";height:"+W+";overflow: "+(H.scrolling=="auto"?"auto":(H.scrolling=="yes"?"scroll":"hidden"))+';position:relative;"></div>');H.width=L.width();H.height=L.height();E()},F=function(){H.width=o.width;H.height=o.height;B("<img />").attr({id:"fancybox-img",src:o.src,alt:H.title}).appendTo(L);E()},E=function(){var W,V;T.hide();if(M.is(":visible")&&false===G.onCleanup(y,e,G)){B.event.trigger("fancybox-cancel");P=false;return}P=true;B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");if(M.is(":visible")&&G.titlePosition!=="outside"){M.css("height",M.height())}y=j;e=C;G=H;if(G.overlayShow){Q.css({"background-color":G.overlayColor,opacity:G.overlayOpacity,cursor:G.hideOnOverlayClick?"pointer":"auto",height:B(document).height()});if(!Q.is(":visible")){if(S){B("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"})}Q.show()}}else{Q.hide()}c=R();l();if(M.is(":visible")){B(J.add(O).add(z)).hide();W=M.position(),b={top:W.top,left:W.left,width:M.width(),height:M.height()};V=(b.width==c.width&&b.height==c.height);m.fadeTo(G.changeFade,0.3,function(){var X=function(){m.html(L.contents()).fadeTo(G.changeFade,1,v)};B.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":G.padding,width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2});if(V){X()}else{s.prop=0;B(s).animate({prop:1},{duration:G.changeSpeed,easing:G.easingChange,step:U,complete:X})}});return}M.removeAttr("style");m.css("border-width",G.padding);if(G.transitionIn=="elastic"){b=I();m.html(L.contents());M.show();if(G.opacity){c.opacity=0}s.prop=0;B(s).animate({prop:1},{duration:G.speedIn,easing:G.easingIn,step:U,complete:v});return}if(G.titlePosition=="inside"&&h>0){A.show()}m.css({width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2}).html(L.contents());M.css(c).fadeIn(G.transitionIn=="none"?0:G.speedIn,v)},D=function(V){if(V&&V.length){if(G.titlePosition=="float"){return'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+V+'</td><td id="fancybox-title-float-right"></td></tr></table>'}return'<div id="fancybox-title-'+G.titlePosition+'">'+V+"</div>"}return false},l=function(){t=G.title||"";h=0;A.empty().removeAttr("style").removeClass();if(G.titleShow===false){A.hide();return}t=B.isFunction(G.titleFormat)?G.titleFormat(t,y,e,G):D(t);if(!t||t===""){A.hide();return}A.addClass("fancybox-title-"+G.titlePosition).html(t).appendTo("body").show();switch(G.titlePosition){case"inside":A.css({width:c.width-(G.padding*2),marginLeft:G.padding,marginRight:G.padding});h=A.outerHeight(true);A.appendTo(d);c.height+=h;break;case"over":A.css({marginLeft:G.padding,width:c.width-(G.padding*2),bottom:G.padding}).appendTo(d);break;case"float":A.css("left",parseInt((A.width()-c.width-40)/2,10)*-1).appendTo(M);break;default:A.css({width:c.width-(G.padding*2),paddingLeft:G.padding,paddingRight:G.padding}).appendTo(M);break}A.hide()},g=function(){if(G.enableEscapeButton||G.enableKeyboardNav){B(document).bind("keydown.fb",function(V){if(V.keyCode==27&&G.enableEscapeButton){V.preventDefault();B.fancybox.close()}else{if((V.keyCode==37||V.keyCode==39)&&G.enableKeyboardNav&&V.target.tagName!=="INPUT"&&V.target.tagName!=="TEXTAREA"&&V.target.tagName!=="SELECT"){V.preventDefault();B.fancybox[V.keyCode==37?"prev":"next"]()}}})}if(!G.showNavArrows){O.hide();z.hide();return}if((G.cyclic&&y.length>1)||e!==0){O.show()}if((G.cyclic&&y.length>1)||e!=(y.length-1)){z.show()}},v=function(){if(!B.support.opacity){m.get(0).style.removeAttribute("filter");M.get(0).style.removeAttribute("filter")}if(H.autoDimensions){m.css("height","auto")}M.css("height","auto");if(t&&t.length){A.show()}if(G.showCloseButton){J.show()}g();if(G.hideOnContentClick){m.bind("click",B.fancybox.close)}if(G.hideOnOverlayClick){Q.bind("click",B.fancybox.close)}B(window).bind("resize.fb",B.fancybox.resize);if(G.centerOnScroll){B(window).bind("scroll.fb",B.fancybox.center)}if(G.type=="iframe"){B('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" '+(B.browser.msie?'allowtransparency="true""':"")+' scrolling="'+H.scrolling+'" src="'+G.href+'"></iframe>').appendTo(m)}M.show();P=false;B.fancybox.center();G.onComplete(y,e,G);K()},K=function(){var V,W;if((y.length-1)>e){V=y[e+1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}if(e>0){V=y[e-1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}},U=function(W){var V={width:parseInt(b.width+(c.width-b.width)*W,10),height:parseInt(b.height+(c.height-b.height)*W,10),top:parseInt(b.top+(c.top-b.top)*W,10),left:parseInt(b.left+(c.left-b.left)*W,10)};if(typeof c.opacity!=="undefined"){V.opacity=W<0.5?0.5:W}M.css(V);m.css({width:V.width-G.padding*2,height:V.height-(h*W)-G.padding*2})},u=function(){return[B(window).width()-(G.margin*2),B(window).height()-(G.margin*2),B(document).scrollLeft()+G.margin,B(document).scrollTop()+G.margin]},R=function(){var V=u(),Z={},W=G.autoScale,X=G.padding*2,Y;if(G.width.toString().indexOf("%")>-1){Z.width=parseInt((V[0]*parseFloat(G.width))/100,10)}else{Z.width=G.width+X}if(G.height.toString().indexOf("%")>-1){Z.height=parseInt((V[1]*parseFloat(G.height))/100,10)}else{Z.height=G.height+X}if(W&&(Z.width>V[0]||Z.height>V[1])){if(H.type=="image"||H.type=="swf"){Y=(G.width)/(G.height);if((Z.width)>V[0]){Z.width=V[0];Z.height=parseInt(((Z.width-X)/Y)+X,10)}if((Z.height)>V[1]){Z.height=V[1];Z.width=parseInt(((Z.height-X)*Y)+X,10)}}else{Z.width=Math.min(Z.width,V[0]);Z.height=Math.min(Z.height,V[1])}}Z.top=parseInt(Math.max(V[3]-20,V[3]+((V[1]-Z.height-40)*0.5)),10);Z.left=parseInt(Math.max(V[2]-20,V[2]+((V[0]-Z.width-40)*0.5)),10);return Z},q=function(V){var W=V.offset();W.top+=parseInt(V.css("paddingTop"),10)||0;W.left+=parseInt(V.css("paddingLeft"),10)||0;W.top+=parseInt(V.css("border-top-width"),10)||0;W.left+=parseInt(V.css("border-left-width"),10)||0;W.width=V.width();W.height=V.height();return W},I=function(){var Y=H.orig?B(H.orig):false,X={},W,V;if(Y&&Y.length){W=q(Y);X={width:W.width+(G.padding*2),height:W.height+(G.padding*2),top:W.top-G.padding-20,left:W.left-G.padding-20}}else{V=u();X={width:G.padding*2,height:G.padding*2,top:parseInt(V[3]+V[1]*0.5,10),left:parseInt(V[2]+V[0]*0.5,10)}}return X},a=function(){if(!T.is(":visible")){clearInterval(p);return}B("div",T).css("top",(N*-40)+"px");N=(N+1)%12};B.fn.fancybox=function(V){if(!B(this).length){return this}B(this).data("fancybox",B.extend({},V,(B.metadata?B(this).metadata():{}))).unbind("click.fb").bind("click.fb",function(X){X.preventDefault();if(P){return}P=true;B(this).blur();j=[];C=0;var W=B(this).attr("rel")||"";if(!W||W==""||W==="nofollow"){j.push(this)}else{j=B("a[rel="+W+"], area[rel="+W+"]");C=j.index(this)}w();return});return this};B.fancybox=function(Y){var X;if(P){return}P=true;X=typeof arguments[1]!=="undefined"?arguments[1]:{};j=[];C=parseInt(X.index,10)||0;if(B.isArray(Y)){for(var W=0,V=Y.length;W<V;W++){if(typeof Y[W]=="object"){B(Y[W]).data("fancybox",B.extend({},X,Y[W]))}else{Y[W]=B({}).data("fancybox",B.extend({content:Y[W]},X))}}j=jQuery.merge(j,Y)}else{if(typeof Y=="object"){B(Y).data("fancybox",B.extend({},X,Y))}else{Y=B({}).data("fancybox",B.extend({content:Y},X))}j.push(Y)}if(C>j.length||C<0){C=0}w()};B.fancybox.showActivity=function(){clearInterval(p);T.show();p=setInterval(a,66)};B.fancybox.hideActivity=function(){T.hide()};B.fancybox.next=function(){return B.fancybox.pos(e+1)};B.fancybox.prev=function(){return B.fancybox.pos(e-1)};B.fancybox.pos=function(V){if(P){return}V=parseInt(V);j=y;if(V>-1&&V<y.length){C=V;w()}else{if(G.cyclic&&y.length>1){C=V>=y.length?0:y.length-1;w()}}return};B.fancybox.cancel=function(){if(P){return}P=true;B.event.trigger("fancybox-cancel");r();H.onCancel(j,C,H);P=false};B.fancybox.close=function(){if(P||M.is(":hidden")){return}P=true;if(G&&false===G.onCleanup(y,e,G)){P=false;return}r();B(J.add(O).add(z)).hide();B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");m.find("iframe").attr("src",S&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");if(G.titlePosition!=="inside"){A.empty()}M.stop();function V(){Q.fadeOut("fast");A.empty().hide();M.hide();B.event.trigger("fancybox-cleanup");m.empty();G.onClosed(y,e,G);y=H=[];e=C=0;G=H={};P=false}if(G.transitionOut=="elastic"){b=I();var W=M.position();c={top:W.top,left:W.left,width:M.width(),height:M.height()};if(G.opacity){c.opacity=1}A.empty().hide();s.prop=1;B(s).animate({prop:0},{duration:G.speedOut,easing:G.easingOut,step:U,complete:V})}else{M.fadeOut(G.transitionOut=="none"?0:G.speedOut,V)}};B.fancybox.resize=function(){if(Q.is(":visible")){Q.css("height",B(document).height())}B.fancybox.center(true)};B.fancybox.center=function(){var V,W;if(P){return}W=arguments[0]===true?1:0;V=u();if(!W&&(M.width()>V[0]||M.height()>V[1])){return}M.stop().animate({top:parseInt(Math.max(V[3]-20,V[3]+((V[1]-m.height()-40)*0.5)-G.padding)),left:parseInt(Math.max(V[2]-20,V[2]+((V[0]-m.width()-40)*0.5)-G.padding))},typeof arguments[0]=="number"?arguments[0]:200)};B.fancybox.init=function(){if(B("#fancybox-wrap").length){return}B("body").append(L=B('<div id="fancybox-tmp"></div>'),T=B('<div id="fancybox-loading"><div></div></div>'),Q=B('<div id="fancybox-overlay"></div>'),M=B('<div id="fancybox-wrap"></div>'));d=B('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(M);d.append(m=B('<div id="fancybox-content"></div>'),J=B('<a id="fancybox-close"></a>'),A=B('<div id="fancybox-title"></div>'),O=B('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=B('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));J.click(B.fancybox.close);T.click(B.fancybox.cancel);O.click(function(V){V.preventDefault();B.fancybox.prev()});z.click(function(V){V.preventDefault();B.fancybox.next()});if(B.fn.mousewheel){M.bind("mousewheel.fb",function(V,W){if(P){V.preventDefault()}else{if(B(V.target).get(0).clientHeight==0||B(V.target).get(0).scrollHeight===B(V.target).get(0).clientHeight){V.preventDefault();B.fancybox[W>0?"prev":"next"]()}}})}if(!B.support.opacity){M.addClass("fancybox-ie")}if(S){T.addClass("fancybox-ie6");M.addClass("fancybox-ie6");B('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(d)}};B.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};B(document).ready(function(){B.fancybox.init()})})(jQuery);
\ No newline at end of file
+(function(B){var L,T,Q,M,d,m,J,A,O,z,C=0,H={},j=[],e=0,G={},y=[],f=null,o=new Image(),i=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,k=/[^\.]\.(swf)\s*$/i,p,N=1,h=0,t="",b,c,P=false,s=B.extend(B("<div/>")[0],{prop:0}),S=B.browser.msie&&B.browser.version<7&&!window.XMLHttpRequest,r=function(){T.hide();o.onerror=o.onload=null;if(f){f.abort()}L.empty()},x=function(){if(false===H.onError(j,C,H)){T.hide();P=false;return}H.titleShow=false;H.width="auto";H.height="auto";L.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');n()},w=function(){var Z=j[C],W,Y,ab,aa,V,X;r();H=B.extend({},B.fn.fancybox.defaults,(typeof B(Z).data("fancybox")=="undefined"?H:B(Z).data("fancybox")));X=H.onStart(j,C,H);if(X===false){P=false;return}else{if(typeof X=="object"){H=B.extend(H,X)}}ab=H.title||(Z.nodeName?B(Z).attr("title"):Z.title)||"";if(Z.nodeName&&!H.orig){H.orig=B(Z).children("img:first").length?B(Z).children("img:first"):B(Z)}if(ab===""&&H.orig&&H.titleFromAlt){ab=H.orig.attr("alt")}ab=ab.replace(/</,"&lt;").replace(/>/,"&gt;");W=H.href||(Z.nodeName?B(Z).attr("href"):Z.href)||null;if((/^(?:javascript)/i).test(W)||W=="#"){W=null}if(H.type){Y=H.type;if(!W){W=H.content}}else{if(H.content){Y="html"}else{if(W){if(W.match(i)){Y="image"}else{if(W.match(k)){Y="swf"}else{if(B(Z).hasClass("iframe")){Y="iframe"}else{if(W.indexOf("#")===0){Y="inline"}else{Y="ajax"}}}}}}}if(!Y){x();return}if(Y=="inline"){Z=W.substr(W.indexOf("#"));Y=B(Z).length>0?"inline":"ajax"}H.type=Y;H.href=W;H.title=ab;if(H.autoDimensions){if(H.type=="html"||H.type=="inline"||H.type=="ajax"){H.width="auto";H.height="auto"}else{H.autoDimensions=false}}if(H.modal){H.overlayShow=true;H.hideOnOverlayClick=false;H.hideOnContentClick=false;H.enableEscapeButton=false;H.showCloseButton=false}H.padding=parseInt(H.padding,10);H.margin=parseInt(H.margin,10);L.css("padding",(H.padding+H.margin));B(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){B(this).replaceWith(m.children())});switch(Y){case"html":L.html(H.content);n();break;case"inline":if(B(Z).parent().is("#fancybox-content")===true){P=false;return}B('<div class="fancybox-inline-tmp" />').hide().insertBefore(B(Z)).bind("fancybox-cleanup",function(){B(this).replaceWith(m.children())}).bind("fancybox-cancel",function(){B(this).replaceWith(L.children())});B(Z).appendTo(L);n();break;case"image":P=false;B.fancybox.showActivity();o=new Image();o.onerror=function(){x()};o.onload=function(){P=true;o.onerror=o.onload=null;F()};o.src=W;break;case"swf":H.scrolling="no";aa='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+H.width+'" height="'+H.height+'"><param name="movie" value="'+W+'"></param>';V="";B.each(H.swf,function(ac,ad){aa+='<param name="'+ac+'" value="'+ad+'"></param>';V+=" "+ac+'="'+ad+'"'});aa+='<embed src="'+W+'" type="application/x-shockwave-flash" width="'+H.width+'" height="'+H.height+'"'+V+"></embed></object>";L.html(aa);n();break;case"ajax":P=false;B.fancybox.showActivity();H.ajax.win=H.ajax.success;f=B.ajax(B.extend({},H.ajax,{url:W,data:H.ajax.data||{},error:function(ac,ae,ad){if(ac.status>0){x()}},success:function(ad,af,ac){var ae=typeof ac=="object"?ac:f;if(ae.status==200){if(typeof H.ajax.win=="function"){X=H.ajax.win(W,ad,af,ac);if(X===false){T.hide();return}else{if(typeof X=="string"||typeof X=="object"){ad=X}}}L.html(ad);n()}}}));break;case"iframe":E();break}},n=function(){var V=H.width,W=H.height;if(V.toString().indexOf("%")>-1){V=parseInt((B(window).width()-(H.margin*2))*parseFloat(V)/100,10)+"px"}else{V=V=="auto"?"auto":V+"px"}if(W.toString().indexOf("%")>-1){W=parseInt((B(window).height()-(H.margin*2))*parseFloat(W)/100,10)+"px"}else{W=W=="auto"?"auto":W+"px"}L.wrapInner('<div style="width:'+V+";height:"+W+";overflow: "+(H.scrolling=="auto"?"auto":(H.scrolling=="yes"?"scroll":"hidden"))+';position:relative;"></div>');H.width=L.width();H.height=L.height();E()},F=function(){H.width=o.width;H.height=o.height;B("<img />").attr({id:"fancybox-img",src:o.src,alt:H.title}).appendTo(L);E()},E=function(){var W,V;T.hide();if(M.is(":visible")&&false===G.onCleanup(y,e,G)){B.event.trigger("fancybox-cancel");P=false;return}P=true;B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");if(M.is(":visible")&&G.titlePosition!=="outside"){M.css("height",M.height())}y=j;e=C;G=H;if(G.overlayShow){Q.css({"background-color":G.overlayColor,opacity:G.overlayOpacity,cursor:G.hideOnOverlayClick?"pointer":"auto",height:B(document).height()});if(!Q.is(":visible")){if(S){B("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"})}Q.show()}}else{Q.hide()}c=R();l();if(M.is(":visible")){B(J.add(O).add(z)).hide();W=M.position(),b={top:W.top,left:W.left,width:M.width(),height:M.height()};V=(b.width==c.width&&b.height==c.height);m.fadeTo(G.changeFade,0.3,function(){var X=function(){m.html(L.contents()).fadeTo(G.changeFade,1,v)};B.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":G.padding,width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2});if(V){X()}else{s.prop=0;B(s).animate({prop:1},{duration:G.changeSpeed,easing:G.easingChange,step:U,complete:X})}});return}M.removeAttr("style");m.css("border-width",G.padding);if(G.transitionIn=="elastic"){b=I();m.html(L.contents());M.show();if(G.opacity){c.opacity=0}s.prop=0;B(s).animate({prop:1},{duration:G.speedIn,easing:G.easingIn,step:U,complete:v});return}if(G.titlePosition=="inside"&&h>0){A.show()}m.css({width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2}).html(L.contents());M.css(c).fadeIn(G.transitionIn=="none"?0:G.speedIn,v)},D=function(V){if(V&&V.length){if(G.titlePosition=="float"){return'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+V+'</td><td id="fancybox-title-float-right"></td></tr></table>'}return'<div id="fancybox-title-'+G.titlePosition+'">'+V+"</div>"}return false},l=function(){t=G.title||"";h=0;A.empty().removeAttr("style").removeClass();if(G.titleShow===false){A.hide();return}t=B.isFunction(G.titleFormat)?G.titleFormat(t,y,e,G):D(t);if(!t||t===""){A.hide();return}A.addClass("fancybox-title-"+G.titlePosition).html(t).appendTo("body").show();switch(G.titlePosition){case"inside":A.css({width:c.width-(G.padding*2),marginLeft:G.padding,marginRight:G.padding});h=A.outerHeight(true);A.appendTo(d);c.height+=h;break;case"over":A.css({marginLeft:G.padding,width:c.width-(G.padding*2),bottom:G.padding}).appendTo(d);break;case"float":A.css("left",parseInt((A.width()-c.width-40)/2,10)*-1).appendTo(M);break;default:A.css({width:c.width-(G.padding*2),paddingLeft:G.padding,paddingRight:G.padding}).appendTo(M);break}A.hide()},g=function(){if(G.enableEscapeButton||G.enableKeyboardNav){B(document).bind("keydown.fb",function(V){if(V.keyCode==27&&G.enableEscapeButton){V.preventDefault();B.fancybox.close()}else{if((V.keyCode==37||V.keyCode==39)&&G.enableKeyboardNav&&V.target.tagName!=="INPUT"&&V.target.tagName!=="TEXTAREA"&&V.target.tagName!=="SELECT"){V.preventDefault();B.fancybox[V.keyCode==37?"prev":"next"]()}}})}if(!G.showNavArrows){O.hide();z.hide();return}if((G.cyclic&&y.length>1)||e!==0){O.show()}if((G.cyclic&&y.length>1)||e!=(y.length-1)){z.show()}},v=function(){if(!B.support.opacity){m.get(0).style.removeAttribute("filter");M.get(0).style.removeAttribute("filter")}if(H.autoDimensions){m.css("height","auto")}M.css("height","auto");if(t&&t.length){A.show()}if(G.showCloseButton){J.show()}g();if(G.hideOnContentClick){m.bind("click",B.fancybox.close)}if(G.hideOnOverlayClick){Q.bind("click",B.fancybox.close)}B(window).bind("resize.fb",B.fancybox.resize);if(G.centerOnScroll){B(window).bind("scroll.fb",B.fancybox.center)}if(G.type=="iframe"){B('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" '+(B.browser.msie?'allowtransparency="true""':"")+' scrolling="'+H.scrolling+'" src="'+G.href+'"></iframe>').appendTo(m)}M.show();P=false;B.fancybox.center();G.onComplete(y,e,G);K()},K=function(){var V,W;if((y.length-1)>e){V=y[e+1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}if(e>0){V=y[e-1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}},U=function(W){var V={width:parseInt(b.width+(c.width-b.width)*W,10),height:parseInt(b.height+(c.height-b.height)*W,10),top:parseInt(b.top+(c.top-b.top)*W,10),left:parseInt(b.left+(c.left-b.left)*W,10)};if(typeof c.opacity!=="undefined"){V.opacity=W<0.5?0.5:W}M.css(V);m.css({width:V.width-G.padding*2,height:V.height-(h*W)-G.padding*2})},u=function(){return[B(window).width()-(G.margin*2),B(window).height()-(G.margin*2),B(document).scrollLeft()+G.margin,B(document).scrollTop()+G.margin]},R=function(){var V=u(),Z={},W=G.autoScale,X=G.padding*2,Y;if(G.width.toString().indexOf("%")>-1){Z.width=parseInt((V[0]*parseFloat(G.width))/100,10)}else{Z.width=G.width+X}if(G.height.toString().indexOf("%")>-1){Z.height=parseInt((V[1]*parseFloat(G.height))/100,10)}else{Z.height=G.height+X}if(W&&(Z.width>V[0]||Z.height>V[1])){if(H.type=="image"||H.type=="swf"){Y=(G.width)/(G.height);if((Z.width)>V[0]){Z.width=V[0];Z.height=parseInt(((Z.width-X)/Y)+X,10)}if((Z.height)>V[1]){Z.height=V[1];Z.width=parseInt(((Z.height-X)*Y)+X,10)}}else{Z.width=Math.min(Z.width,V[0]);Z.height=Math.min(Z.height,V[1])}}Z.top=parseInt(Math.max(V[3]-20,V[3]+((V[1]-Z.height-40)*0.5)),10);Z.left=parseInt(Math.max(V[2]-20,V[2]+((V[0]-Z.width-40)*0.5)),10);return Z},q=function(V){var W=V.offset();W.top+=parseInt(V.css("paddingTop"),10)||0;W.left+=parseInt(V.css("paddingLeft"),10)||0;W.top+=parseInt(V.css("border-top-width"),10)||0;W.left+=parseInt(V.css("border-left-width"),10)||0;W.width=V.width();W.height=V.height();return W},I=function(){var Y=H.orig?B(H.orig):false,X={},W,V;if(Y&&Y.length){W=q(Y);X={width:W.width+(G.padding*2),height:W.height+(G.padding*2),top:W.top-G.padding-20,left:W.left-G.padding-20}}else{V=u();X={width:G.padding*2,height:G.padding*2,top:parseInt(V[3]+V[1]*0.5,10),left:parseInt(V[2]+V[0]*0.5,10)}}return X},a=function(){if(!T.is(":visible")){clearInterval(p);return}B("div",T).css("top",(N*-40)+"px");N=(N+1)%12};B.fn.fancybox=function(V){if(!B(this).length){return this}B(this).data("fancybox",B.extend({},V,(B.metadata?B(this).metadata():{}))).unbind("click.fb").bind("click.fb",function(X){X.preventDefault();if(P){return}P=true;B(this).blur();j=[];C=0;var W=B(this).attr("rel")||"";if(!W||W==""||W==="nofollow"){j.push(this)}else{j=B("a[rel="+W+"], area[rel="+W+"]");C=j.index(this)}w();return});return this};B.fancybox=function(Y){var X;if(P){return}P=true;X=typeof arguments[1]!=="undefined"?arguments[1]:{};j=[];C=parseInt(X.index,10)||0;if(B.isArray(Y)){for(var W=0,V=Y.length;W<V;W++){if(typeof Y[W]=="object"){B(Y[W]).data("fancybox",B.extend({},X,Y[W]))}else{Y[W]=B({}).data("fancybox",B.extend({content:Y[W]},X))}}j=jQuery.merge(j,Y)}else{if(typeof Y=="object"){B(Y).data("fancybox",B.extend({},X,Y))}else{Y=B({}).data("fancybox",B.extend({content:Y},X))}j.push(Y)}if(C>j.length||C<0){C=0}w()};B.fancybox.showActivity=function(){clearInterval(p);T.show();p=setInterval(a,66)};B.fancybox.hideActivity=function(){T.hide()};B.fancybox.next=function(){return B.fancybox.pos(e+1)};B.fancybox.prev=function(){return B.fancybox.pos(e-1)};B.fancybox.pos=function(V){if(P){return}V=parseInt(V);j=y;if(V>-1&&V<y.length){C=V;w()}else{if(G.cyclic&&y.length>1){C=V>=y.length?0:y.length-1;w()}}return};B.fancybox.cancel=function(){if(P){return}P=true;B.event.trigger("fancybox-cancel");r();H.onCancel(j,C,H);P=false};B.fancybox.close=function(){if(P||M.is(":hidden")){return}P=true;if(G&&false===G.onCleanup(y,e,G)){P=false;return}r();B(J.add(O).add(z)).hide();B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");m.find("iframe").attr("src",S&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");if(G.titlePosition!=="inside"){A.empty()}M.stop();function V(){Q.fadeOut("fast");A.empty().hide();M.hide();B.event.trigger("fancybox-cleanup");m.empty();G.onClosed(y,e,G);y=H=[];e=C=0;G=H={};P=false}if(G.transitionOut=="elastic"){b=I();var W=M.position();c={top:W.top,left:W.left,width:M.width(),height:M.height()};if(G.opacity){c.opacity=1}A.empty().hide();s.prop=1;B(s).animate({prop:0},{duration:G.speedOut,easing:G.easingOut,step:U,complete:V})}else{M.fadeOut(G.transitionOut=="none"?0:G.speedOut,V)}};B.fancybox.resize=function(){if(Q.is(":visible")){Q.css("height",B(document).height())}B.fancybox.center(true)};B.fancybox.center=function(){var V,W;if(P){return}W=arguments[0]===true?1:0;V=u();if(!W&&(M.width()>V[0]||M.height()>V[1])){return}M.stop().animate({top:parseInt(Math.max(V[3]-20,V[3]+((V[1]-m.height()-40)*0.5)-G.padding)),left:parseInt(Math.max(V[2]-20,V[2]+((V[0]-m.width()-40)*0.5)-G.padding))},typeof arguments[0]=="number"?arguments[0]:200)};B.fancybox.init=function(){if(B("#fancybox-wrap").length){return}B("body").append(L=B('<div id="fancybox-tmp"></div>'),T=B('<div id="fancybox-loading"><div></div></div>'),Q=B('<div id="fancybox-overlay"></div>'),M=B('<div id="fancybox-wrap"></div>'));d=B('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(M);d.append(m=B('<div id="fancybox-content"></div>'),J=B('<a id="fancybox-close"></a>'),A=B('<div id="fancybox-title"></div>'),O=B('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=B('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));J.click(B.fancybox.close);T.click(B.fancybox.cancel);O.click(function(V){V.preventDefault();B.fancybox.prev()});z.click(function(V){V.preventDefault();B.fancybox.next()});if(B.fn.mousewheel){M.bind("mousewheel.fb",function(V,W){if(P){V.preventDefault()}else{if(B(V.target).get(0).clientHeight==0||B(V.target).get(0).scrollHeight===B(V.target).get(0).clientHeight){V.preventDefault();B.fancybox[W>0?"prev":"next"]()}}})}if(!B.support.opacity){M.addClass("fancybox-ie")}if(S){T.addClass("fancybox-ie6");M.addClass("fancybox-ie6");B('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(d)}};B.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};B(document).ready(function(){B.fancybox.init()})})(jQuery);
\ No newline at end of file

From 6468e0a1d5f542bccc3c146b56118cb5d1853fc7 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 15:14:36 +0200
Subject: [PATCH 0388/1537] fixed bug #996: first picture in folder is repeated
 in the last position behaving like a directory

---
 apps/gallery/templates/index.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index f992604549..749f8891f8 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -101,10 +101,8 @@ for($i = 0; $i < count($images); $i++) {
 
 $dir_arr = explode('/', $previous_element);
 
-if (count($images)>1) {
-  if (count($dir_arr)==0) {
-    $tl->addTile(new \OC\Pictures\TileSingle($previous_element));
-  } else if (count($dir_arr) && $ts->getCount() == 0){
+if (count($images)>1 && count($dir_arr) > 1) {
+  if (count($dir_arr) && $ts->getCount() == 0){
       $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
   } else {
     $arr[] = $previous_element;

From fa67927eb5084161b0dba26dbbfa92b362985b8e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 15:14:36 +0200
Subject: [PATCH 0389/1537] fixed bug #996: first picture in folder is repeated
 in the last position behaving like a directory

Conflicts:
	apps/gallery/templates/index.php
---
 apps/gallery/templates/index.php | 50 ++++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 148c3df225..e7b7f2e187 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -89,32 +89,32 @@ $second_level_images = array();
 $fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
 
 for($i = 0; $i < count($images); $i++) {
-        $prev_dir_arr = explode('/', $previous_element);
-        $dir_arr = explode('/', $images[$i]);
+	$prev_dir_arr = explode('/', $previous_element);
+	$dir_arr = explode('/', $images[$i]);
 
-        if(count($dir_arr) == 1) { // getting the images in this directory
-                $root_images[] = $root.$images[$i];
-        } else {
-                if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
-                        if(count($second_level_images) == 0) { // if we don't have images in this directory
-                                if(count($fallback_images) != 0) { // but have fallback_images
-                                        $tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-                                        $fallback_images = array();
-                                }
-                        } else { // if we collected images for this directory
-                                $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-                                $fallback_images = array();
-                                $second_level_images = array();
-                        }
-                }
-                if (count($dir_arr) == 2) { // These are the pics in our current subdir
-                        $second_level_images[] = $root.$images[$i];
-                } else { // These are images from the deeper directories
-                        $fallback_images[] = $root.$images[$i];
-                }
-                // have us a little something to compare against
-                $previous_element = $images[$i];
-        }
+	if(count($dir_arr) == 1) { // getting the images in this directory
+		$root_images[] = $root.$images[$i];
+	} else {
+		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
+			if(count($second_level_images) == 0) { // if we don't have images in this directory
+				if(count($fallback_images) != 0) { // but have fallback_images
+					$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+					$fallback_images = array();
+				}
+			} else { // if we collected images for this directory
+				$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+				$fallback_images = array();
+				$second_level_images = array();
+			}
+		}
+		if (count($dir_arr) == 2) { // These are the pics in our current subdir
+			$second_level_images[] = $root.$images[$i];
+		} else { // These are images from the deeper directories
+			$fallback_images[] = $root.$images[$i];
+		}
+		// have us a little something to compare against
+		$previous_element = $images[$i];
+	}
 }
 
 // if last element in the directory was a directory we don't want to miss it :)

From 4510571aa15d18d958947efd380b211a9a12aaaa Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 30 May 2012 17:46:49 +0200
Subject: [PATCH 0390/1537] Add app for logging access to shared files

---
 apps/files_sharing/sharedstorage.php        | 16 ++++++++
 apps/files_sharing_log/appinfo/app.php      | 22 +++++++++++
 apps/files_sharing_log/appinfo/database.xml | 44 +++++++++++++++++++++
 apps/files_sharing_log/appinfo/info.xml     | 10 +++++
 apps/files_sharing_log/appinfo/version      |  1 +
 apps/files_sharing_log/css/style.css        |  7 ++++
 apps/files_sharing_log/index.php            | 21 ++++++++++
 apps/files_sharing_log/log.php              | 34 ++++++++++++++++
 apps/files_sharing_log/templates/index.php  | 42 ++++++++++++++++++++
 9 files changed, 197 insertions(+)
 create mode 100644 apps/files_sharing_log/appinfo/app.php
 create mode 100644 apps/files_sharing_log/appinfo/database.xml
 create mode 100644 apps/files_sharing_log/appinfo/info.xml
 create mode 100644 apps/files_sharing_log/appinfo/version
 create mode 100644 apps/files_sharing_log/css/style.css
 create mode 100644 apps/files_sharing_log/index.php
 create mode 100644 apps/files_sharing_log/log.php
 create mode 100644 apps/files_sharing_log/templates/index.php

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 3bb6e73035..e8aa73dd56 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -320,6 +320,11 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	public function file_get_contents($path) {
 		$source = $this->getSource($path);
 		if ($source) {
+			$info = array(
+				'target' => $this->datadir.$path,
+				'source' => $source,
+			);
+			OCP\Util::emitHook('OC_Filestorage_Shared', 'file_get_contents', $info);
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->file_get_contents($this->getInternalPath($source));
 		}
@@ -329,6 +334,11 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		if ($this->is_writable($path)) {
 			$source = $this->getSource($path);
 			if ($source) {
+				$info = array(
+						'target' => $this->datadir.$path,
+						'source' => $source,
+					     );
+				OCP\Util::emitHook('OC_Filestorage_Shared', 'file_put_contents', $info);
 				$storage = OC_Filesystem::getStorage($source);
 				$result = $storage->file_put_contents($this->getInternalPath($source), $data);
 				if ($result) {
@@ -416,6 +426,12 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	public function fopen($path, $mode) {
 		$source = $this->getSource($path);
 		if ($source) {
+			$info = array(
+				'target' => $this->datadir.$path,
+				'source' => $source,
+				'mode' => $mode,
+			);
+			OCP\Util::emitHook('OC_Filestorage_Shared', 'fopen', $info);
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->fopen($this->getInternalPath($source), $mode);
 		}
diff --git a/apps/files_sharing_log/appinfo/app.php b/apps/files_sharing_log/appinfo/app.php
new file mode 100644
index 0000000000..23cae61fbf
--- /dev/null
+++ b/apps/files_sharing_log/appinfo/app.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+OC::$CLASSPATH['OC_Files_Sharing_Log'] = 'apps/files_sharing_log/log.php';
+
+$l=new OC_L10N('files_sharing_log');
+OCP\App::addNavigationEntry( array(
+  'id' => 'files_sharing_log_index',
+  'order' => 5,
+  'href' => OCP\Util::linkTo( 'files_sharing_log', 'index.php' ),
+  'icon' => OCP\Util::imagePath( 'files_sharing_log', 'icon.png' ),
+  'name' => $l->t('Shared files log'))
+);
+
+OCP\Util::connectHook('OC_Filestorage_Shared', 'fopen', 'OC_Files_Sharing_Log', 'fopen');
+OCP\Util::connectHook('OC_Filestorage_Shared', 'file_get_contents', 'OC_Files_Sharing_Log', 'file_get_contents');
+OCP\Util::connectHook('OC_Filestorage_Shared', 'file_put_contents', 'OC_Files_Sharing_Log', 'file_put_contents');
diff --git a/apps/files_sharing_log/appinfo/database.xml b/apps/files_sharing_log/appinfo/database.xml
new file mode 100644
index 0000000000..92e5f0125b
--- /dev/null
+++ b/apps/files_sharing_log/appinfo/database.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+	 <name>*dbname*</name>
+	 <create>true</create>
+	 <overwrite>false</overwrite>
+	 <charset>latin1</charset>
+	 <table>
+		<name>*dbprefix*sharing_log</name>
+		<declaration>
+			<field>
+				<name>user_id</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+			<field>
+				<name>source</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>128</length>
+			</field>
+			<field>
+				<name>uid_who</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+			<field>
+				<name>when</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+			<field>
+				<name>mode</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+		</declaration>
+	</table>
+</database>
diff --git a/apps/files_sharing_log/appinfo/info.xml b/apps/files_sharing_log/appinfo/info.xml
new file mode 100644
index 0000000000..d5e3283df3
--- /dev/null
+++ b/apps/files_sharing_log/appinfo/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<info>
+	<id>files_sharing_log</id>
+	<name>File Shared access logging app</name>
+	<description>Log access to shared files</description>
+	<licence>AGPL</licence>
+	<author>Bart Visscher</author>
+	<require>4</require>
+	<shipped>true</shipped>
+</info>
diff --git a/apps/files_sharing_log/appinfo/version b/apps/files_sharing_log/appinfo/version
new file mode 100644
index 0000000000..49d59571fb
--- /dev/null
+++ b/apps/files_sharing_log/appinfo/version
@@ -0,0 +1 @@
+0.1
diff --git a/apps/files_sharing_log/css/style.css b/apps/files_sharing_log/css/style.css
new file mode 100644
index 0000000000..069d3a45e0
--- /dev/null
+++ b/apps/files_sharing_log/css/style.css
@@ -0,0 +1,7 @@
+#files_sharing_log {
+padding: 2em;
+}
+#files_sharing_log th,
+#files_sharing_log td {
+padding: 0 1em;
+}
diff --git a/apps/files_sharing_log/index.php b/apps/files_sharing_log/index.php
new file mode 100644
index 0000000000..ffacbdd860
--- /dev/null
+++ b/apps/files_sharing_log/index.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+OCP\User::checkLoggedIn();
+OCP\App::checkAppEnabled('files_sharing_log');
+
+OCP\App::setActiveNavigationEntry('files_sharing_log_index');
+
+OCP\Util::addStyle('files_sharing_log', 'style');
+
+$query = OCP\DB::prepare('SELECT * FROM *PREFIX*sharing_log WHERE user_id = ?');
+$log = $query->execute(array(OCP\User::getUser()))->fetchAll();
+
+$output = new OCP\Template('files_sharing_log', 'index', 'user');
+$output->assign('log', $log);
+$output->printPage();
diff --git a/apps/files_sharing_log/log.php b/apps/files_sharing_log/log.php
new file mode 100644
index 0000000000..e6a12b9fb1
--- /dev/null
+++ b/apps/files_sharing_log/log.php
@@ -0,0 +1,34 @@
+<?php
+
+class OC_Files_Sharing_Log {
+	static public function fopen($arguments) {
+		$target = $arguments['target'];
+		$source = $arguments['source'];
+		$mode = $arguments['mode'];
+		self::log($target, $source, $mode);
+	}
+
+	static public function file_get_contents($arguments) {
+		$target = $arguments['target'];
+		$source = $arguments['source'];
+		$mode = 'get';
+		self::log($target, $source, $mode);
+	}
+
+	static public function file_put_contents($arguments) {
+		$target = $arguments['target'];
+		$source = $arguments['source'];
+		$mode = 'put';
+		self::log($target, $source, $mode);
+	}
+
+	static public function log($target, $source, $mode) {
+		$query = OCP\DB::prepare("SELECT * FROM *PREFIX*sharing WHERE source = ? AND target = ?");
+		$info = $query->execute(array($source, $target))->fetchAll();
+		$info = $info[0];
+		//var_dump($info);
+		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing_log VALUES (?,?,?,?,?)");
+		$query->execute(array($info['uid_owner'], $source, OCP\User::getUser(), time(), $mode));
+		//die;
+	}
+}
diff --git a/apps/files_sharing_log/templates/index.php b/apps/files_sharing_log/templates/index.php
new file mode 100644
index 0000000000..55bfc1d6a3
--- /dev/null
+++ b/apps/files_sharing_log/templates/index.php
@@ -0,0 +1,42 @@
+<table id="files_sharing_log">
+	<thead>
+		<tr>
+			<th><?php echo $l->t('File') ?></th>
+			<th><?php echo $l->t('Who') ?></th>
+			<th><?php echo $l->t('When') ?></th>
+			<th><?php echo $l->t('What') ?></th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php foreach($_['log'] as $log): ?>
+		<tr>
+			<td>
+			<?php echo $log['source'] ?>
+			</td>
+			<td>
+			<?php echo $log['uid_who'] ?>
+			</td>
+			<td>
+			<?php echo date('Y-m-d H:i:s', $log['when']) ?>
+			</td>
+			<td>
+			<?php switch ($log['mode']):
+				case 'get':
+					echo $l->t('Read');
+					break;
+				case 'put':
+					echo $l->t('Write');
+					break;
+				default:
+					if (strpos('r', $log['mode']) !== false):
+						echo $l->t('Read');
+					else:
+						echo $l->t('Write');
+					endif;
+			      endswitch;
+			?>
+			</td>
+		</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>

From a3afd51b9401ea03a50d7555ad724a64820c8674 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 18:02:07 +0200
Subject: [PATCH 0391/1537] fixed one issue with last directory in structure
 having a lot of subdirectories and finally some pictures

---
 apps/gallery/templates/index.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index e7b7f2e187..544875a9ef 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -122,6 +122,11 @@ if(count($second_level_images)>0) {
 	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 }
 
+// if last element in the directory was a directory with no second_level_images we also don't want to miss it ...
+if(count($fallback_images)>0) {
+	$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+}
+
 // and finally our images actually stored in the root folder
 for($i = 0; $i<count($root_images); $i++) {
 	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));

From f0b87bc4218b16bf5122332108666ce833a844ce Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 18:06:28 +0200
Subject: [PATCH 0392/1537] Make requesttoken global.

---
 core/templates/layout.user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 6f9b02237c..e271acf10e 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -32,7 +32,7 @@
 		<?php endforeach; ?>
 		<script type="text/javascript">
 			$(function() {
-				var requesttoken = '<?php echo $_['requesttoken']; ?>';
+				requesttoken = '<?php echo $_['requesttoken']; ?>';
 				$(document).bind('ajaxSend', function(elm, xhr, s){
 					if(requesttoken) {
 						xhr.setRequestHeader('requesttoken', requesttoken);

From 47c03a0effbe036e644da8ae2dee65f12a6e6c84 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 18:12:38 +0200
Subject: [PATCH 0393/1537] Contacts: Fixes for CSRF.

---
 apps/contacts/js/contacts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 45509a7f9d..a1b9976006 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1152,7 +1152,7 @@ Contacts={
 			},
 			editPhoto:function(id, tmpkey){
 				//alert('editPhoto: ' + tmpkey);
-				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id},function(jsondata){
+				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
 					if(jsondata.status == 'success'){
 						//alert(jsondata.data.page);
 						$('#edit_photo_dialog_img').html(jsondata.data.page);
@@ -1645,7 +1645,7 @@ $(document).ready(function(){
 				//}
 			}
 		};
-		xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+Contacts.UI.Card.id+'&imagefile='+encodeURIComponent(file.name), true);
+		xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+Contacts.UI.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
 		xhr.setRequestHeader('Cache-Control', 'no-cache');
 		xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 		xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));

From 6e15b231b081183cae8d1cdfb482d76d2f3c2873 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 14 Jun 2012 12:27:30 -0400
Subject: [PATCH 0394/1537] Check for '\' as well when searching for parent
 folders, because Windows returns '\' for dirname()

---
 apps/files_sharing/lib_share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 356c958b6c..31170f07fd 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -276,7 +276,7 @@ class OC_Share {
 		$userDirectory = substr($target, 0, strpos($target, "files") + 5);
 		$target = dirname($target);
 		$result = array();
-		while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory) {
+		while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory && $target != "\\") {
 			// Check if the parent directory of this target location is shared
 			$result = $query->execute(array($target))->fetchAll();
 			if (count($result) > 0) {

From 12bfc551fba6d50256d58b060f1e38bcc489af2d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 14 Jun 2012 18:31:38 +0200
Subject: [PATCH 0395/1537] reverting 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1,
 differs between OC3 and 4

---
 apps/files_sharing/appinfo/app.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index b59c90b877..ea3a9da6f7 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -8,8 +8,8 @@ OCP\Util::connectHook("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OCP\Util::connectHook("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
 OCP\Util::connectHook("OC_Filesystem", "post_write", "OC_Share", "updateItem");
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Share', 'removeUser');
-OCP\Util::connectHook('OC_Group', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
-OCP\Util::connectHook('OC_Group', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
+OCP\Util::connectHook('OC_User', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
+OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
 if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') {
 	OCP\Util::addscript("files_sharing", "share");

From 4eb0c270aa902bd5d84edb2500f866fed4e6e9ab Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 19:38:43 +0200
Subject: [PATCH 0396/1537] fixed handling of fallback_images

---
 apps/gallery/templates/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 544875a9ef..bf4f117c7d 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -109,8 +109,11 @@ for($i = 0; $i < count($images); $i++) {
 		}
 		if (count($dir_arr) == 2) { // These are the pics in our current subdir
 			$second_level_images[] = $root.$images[$i];
+			$fallback_images = array();
 		} else { // These are images from the deeper directories
-			$fallback_images[] = $root.$images[$i];
+			if(count($second_level_images) == 0) {
+				$fallback_images[] = $root.$images[$i];
+			}
 		}
 		// have us a little something to compare against
 		$previous_element = $images[$i];

From 4cc9bf09be7ddb5e576ccfd798e9bcc80bc8a953 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 14 Jun 2012 20:55:36 +0200
Subject: [PATCH 0397/1537] fix javascript error

---
 apps/files_pdfviewer/js/pdfjs/viewer.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_pdfviewer/js/pdfjs/viewer.js b/apps/files_pdfviewer/js/pdfjs/viewer.js
index ff4f2452b6..8a568e6a74 100644
--- a/apps/files_pdfviewer/js/pdfjs/viewer.js
+++ b/apps/files_pdfviewer/js/pdfjs/viewer.js
@@ -1675,6 +1675,10 @@ function preDraw() {
 function updateViewarea() {
   if (!PDFView.initialized)
     return;
+  var container = document.getElementById('viewer');
+  if (!container)
+    return;
+
   var visiblePages = PDFView.getVisiblePages();
   var pageToDraw;
   for (var i = 0; i < visiblePages.length; i++) {

From ec69377ade89d02ebea4acb9594e9bc29c40ddb4 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 14 Jun 2012 21:00:19 +0200
Subject: [PATCH 0398/1537] first load compatibility.js

---
 apps/files_pdfviewer/appinfo/app.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
index f700d004dc..c8ca2dc8d9 100644
--- a/apps/files_pdfviewer/appinfo/app.php
+++ b/apps/files_pdfviewer/appinfo/app.php
@@ -1,8 +1,9 @@
 <?php
 //load the required files
-OCP\Util::addscript( 'files_pdfviewer', 'viewer');
 OCP\Util::addStyle( 'files_pdfviewer', 'viewer');
-OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/build/pdf');
+
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/compatibility');
+OCP\Util::addscript( 'files_pdfviewer', 'viewer');
+OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/build/pdf');
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/viewer');
 ?>

From f7e686d4f1c73a8fe4ca760ef91c3d88d864a117 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 14 Jun 2012 15:04:49 -0400
Subject: [PATCH 0399/1537] Revert "Fix a counting mistake"

This reverts commit c20abfef388f9159e71b71c17a57d849faa5d913.
---
 apps/files_sharing/lib_share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 31170f07fd..02e121b77c 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -495,7 +495,7 @@ class OC_Share {
 		$result = $query->execute(array($gid))->fetchAll();
 		if (count($result) > 0) {
 			$lastSource = '';
-			for ($i = 0; $i < count($result) - 1; $i++) {
+			for ($i = 0; i < count($result); $i++) {
 				if ($result[$i]['source'] != $lastSource) {
 					new OC_Share($result[$i]['source'], $arguments['gid'], $result[$i]['permissions']);
 					$lastSource = $result[$i]['source'];

From f3b30e4658c4dde82b56b458c672fa5edcba5d6b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 14 Jun 2012 15:14:01 -0400
Subject: [PATCH 0400/1537] Forgot $ sign for variable

---
 apps/files_sharing/lib_share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 02e121b77c..4abf80ae19 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -495,7 +495,7 @@ class OC_Share {
 		$result = $query->execute(array($gid))->fetchAll();
 		if (count($result) > 0) {
 			$lastSource = '';
-			for ($i = 0; i < count($result); $i++) {
+			for ($i = 0; $i < count($result); $i++) {
 				if ($result[$i]['source'] != $lastSource) {
 					new OC_Share($result[$i]['source'], $arguments['gid'], $result[$i]['permissions']);
 					$lastSource = $result[$i]['source'];

From 6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 14 Jun 2012 21:00:02 +0000
Subject: [PATCH 0401/1537] Add possibility to choose the installation folder

---
 config/config.sample.php | 12 ++++++------
 lib/app.php              | 39 +++++++++++++++++++++++++++++----------
 lib/base.php             |  4 ++--
 lib/installer.php        |  3 +--
 lib/util.php             | 16 +++++++++-------
 5 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index bc66e9ebc0..afc04f8ec1 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -33,17 +33,17 @@ $CONFIG = array(
  * If the apps dir is not writable, you can't download&install extra apps
  * in the admin apps menu.
  */
-"writable_appsdir" => true,
 // "datadirectory" => "",
 "apps_paths" => array(
 
 /* Set an array of path for your apps directories
- key 'path' is for the fs path an the key url is for the http path to your
- applications paths
+ key 'path' is for the fs path an the key 'url' is for the http path to your
+ applications paths. 'writable' indicate if the user can install apps in this folder.
 */
-  array(
-    'path'=> '/var/www/owncloud/apps',
-    'url' => '/apps',
+	array(
+		'path'=> '/var/www/owncloud/apps',
+		'url' => '/apps',
+		'writable' => true,
   ),
  ),
 );
diff --git a/lib/app.php b/lib/app.php
index 79a0a2e053..ca7a022f89 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -322,17 +322,39 @@ class OC_App{
 		return $list;
 	}
 
+	/**
+	* Get the path where to install apps
+  */
+	public static function getInstallPath() {
+		if(OC_Config::getValue('appstoreenabled', true)==false) {
+			return false;
+		}
+
+		foreach(OC::$APPSROOTS as $dir) {
+			if(isset($dir['writable']) && $dir['writable']===true)
+				return $dir['path'];
+		}
+
+		OC_Log::write('core','No application directories are marked as writable.',OC_Log::ERROR);
+		return null;
+	}
+
+
+	protected static function findAppInDirectories($appid) {
+		foreach(OC::$APPSROOTS as $dir) {
+			if(file_exists($dir['path'].'/'.$appid)) {
+				return $dir;
+			}
+		}
+	}
 	/**
 	* Get the directory for the given app.
 	* If the app is defined in multiple directory, the first one is taken. (false if not found)
 	*/
 	public static function getAppPath($appid) {
-		foreach(OC::$APPSROOTS as $dir) {
-			if(file_exists($dir['path'].'/'.$appid)) {
-				return $dir['path'].'/'.$appid;
-			}
+		if( ($dir = self::findAppInDirectories($appid)) != false) {
+			return $dir['path'].'/'.$appid;
 		}
-		return false;
 	}
 
 	/**
@@ -340,12 +362,9 @@ class OC_App{
 	* If the app is defined in multiple directory, the first one is taken. (false if not found)
 	*/
 	public static function getAppWebPath($appid) {
-		foreach(OC::$APPSROOTS as $dir) {
-			if(file_exists($dir['path'].'/'.$appid)) {
-				return $dir['url'].'/'.$appid;
-			}
+		if( ($dir = self::findAppInDirectories($appid)) != false) {
+			return $dir['url'].'/'.$appid;
 		}
-		return false;
 	}
 
 	/**
diff --git a/lib/base.php b/lib/base.php
index 6e85f1a734..ca4052e5a1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -169,9 +169,9 @@ class OC{
 					OC::$APPSROOTS[] = $paths;	
 			}
 		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
-			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => OC::$WEBROOT.'/apps/');
+			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => OC::$WEBROOT.'/apps/', 'writable' => true);
 		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/');
+			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/', 'writable' => true);
 			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}
 
diff --git a/lib/installer.php b/lib/installer.php
index bfa34de2a7..299674b29e 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -126,8 +126,6 @@ class OC_Installer{
 			return false;
 		}
 		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true);
-		$basedir=OC_App::getAppPath($info['id']);
-
                 // check the code for not allowed calls
                 if(!OC_Installer::checkCode($info['id'],$extractDir)){
 			OC_Log::write('core','App can\'t be installed because of not allowed code in the App',OC_Log::ERROR);
@@ -153,6 +151,7 @@ class OC_Installer{
 			return false;
 		}
 
+		$basedir=OC_App::getInstallPath().'/'.$info['id'];
 		//check if the destination directory already exists
 		if(is_dir($basedir)){
 			OC_Log::write('core','App directory already exists',OC_Log::WARN);
diff --git a/lib/util.php b/lib/util.php
index 20888fa71f..b344d576eb 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -29,13 +29,15 @@ class OC_Util {
 			$tmpl->printPage();
 			exit;
 		}
-		
-		// Check if apps folder is writable.
-		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
-			$tmpl = new OC_Template( '', 'error', 'guest' );
-			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
-			$tmpl->printPage();
-			exit;
+
+		// Check if there is a writable install folder.
+		if(OC_Config::getValue('appstoreenabled', true)) {
+			if( OC_App::getInstallPath() === null  || !is_writable(OC_App::getInstallPath())) {
+				$tmpl = new OC_Template( '', 'error', 'guest' );
+				$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+				$tmpl->printPage();
+				exit;
+			}
 		}
 		
 		// Create root dir.

From 27ab6daeb00770039911c2e135fb24804ed2d31b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 22:40:18 +0200
Subject: [PATCH 0402/1537] If Hr. Lerdorf had made up his mind on parameter
 order, life would have been a lot easier...

---
 apps/contacts/lib/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index e3d5df3d51..e74b465a47 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -56,7 +56,7 @@ class OC_Contacts_Hooks{
 
 	static public function getBirthdayEvents($parameters) {
 		$name = $parameters['calendar_id'];
-		if (strpos('birthday_', $name) != 0) {
+		if (strpos($name, 'birthday_') != 0) {
 			return;
 		}
 		$info = explode('_', $name);

From 96a3e28c2e744dbdd07bd96e40fb2f7813fb3894 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 22:44:54 +0200
Subject: [PATCH 0403/1537] Cleanup code.

---
 apps/contacts/lib/search.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 144138a7c2..19330fa9be 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -2,17 +2,10 @@
 class OC_Search_Provider_Contacts extends OC_Search_Provider{
 	function search($query){
 		$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser(), 1);
-// 		if(count($calendars)==0 || !OCP\App::isEnabled('contacts')){
-// 			//return false;
-// 		}
-		// NOTE: Does the following do anything
-		$results=array();
-		$searchquery=array();
-		if(substr_count($query, ' ') > 0){
-			$searchquery = explode(' ', $query);
-		}else{
-			$searchquery[] = $query;
+		if(count($addressbooks)==0 || !OCP\App::isEnabled('contacts')){
+			return array();
 		}
+		$results=array();
 		$l = new OC_l10n('contacts');
 		foreach($addressbooks as $addressbook){
 			$vcards = OC_Contacts_VCard::all($addressbook['id']);

From df83df5263db57056d0bd70edfa3b28e7b5e6b6b Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 14 Jun 2012 21:19:11 +0000
Subject: [PATCH 0404/1537] Correct sample config

---
 config/config.sample.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 5af5a6efc0..c7c811345b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -86,11 +86,11 @@ $CONFIG = array(
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 
-/* Set this to false to disable the check for writable apps dir.
- * If the apps dir is not writable, you can't download&install extra apps
- * in the admin apps menu.
+/* The directory where the user data is stored, default to data in the owncloud
+ * directory. The sqlite database is also stored here, when sqlite is used.
  */
 // "datadirectory" => "",
+
 "apps_paths" => array(
 
 /* Set an array of path for your apps directories
@@ -103,9 +103,5 @@ $CONFIG = array(
 		'writable' => true,
   ),
  ),
-
-/* The directory where the user data is stored, default to data in the owncloud
- * directory. The sqlite database is also stored here, when sqlite is used.
- */
 );
-?>
+

From 31db583f0305cbd1eee6dc3b867e7e7ffb3c25b9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 00:26:34 +0200
Subject: [PATCH 0405/1537] Make events show again.

---
 apps/calendar/ajax/events.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index b0c5587633..3f29f1e5ef 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -13,16 +13,15 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 
 // Look for the calendar id
-$calendar_id = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false);
-if($calendar_id !== false){
-	if(! is_numeric($calendar_id['userid']) && $calendar_id['userid'] != OCP\User::getUser()){
-		OCP\JSON::error();
-		exit;
+$calendar_id = null;
+if (strval(intval($_GET['calendar_id'])) == strval($_GET['calendar_id'])) { // integer for sure.
+	$id = intval($_GET['calendar_id']);
+	$calendarrow = OC_Calendar_App::getCalendar($id, true, false); // Let's at least security check otherwise we might as well use OC_Calendar_Calendar::find()
+	if($calendarrow !== false && is_int($calendar_id['userid']) && $id == $calendar_id['userid']) {
+		$calendar_id = $id;
 	}
 }
-else {
-	$calendar_id = $_GET['calendar_id'];
-}
+$calendar_id = (is_null($calendar_id)?strip_tags($_GET['calendar_id']):$calendar_id);
 
 $start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']);
 $end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']);

From 1e76a530eadc9568e0630197201648d40b4ad2d4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 00:28:12 +0200
Subject: [PATCH 0406/1537] No need to find calendar twice.

---
 apps/calendar/lib/app.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index e04f2ed0cd..74cf9f0103 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -50,10 +50,7 @@ class OC_Calendar_App{
 				return false;
 			}
 		}
-		if($calendar === false){
-			return false;
-		}
-		return OC_Calendar_Calendar::find($id);
+		return $calendar;
 	}
 	
 	/*

From 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 00:50:42 +0200
Subject: [PATCH 0407/1537] Agree on argument type.

---
 apps/calendar/ajax/import/dropimport.php |  2 +-
 apps/calendar/index.php                  | 10 +++++-----
 apps/calendar/lib/calendar.php           |  6 +++---
 apps/calendar/lib/search.php             |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index e98c282ef4..684eebf5fd 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -45,7 +45,7 @@ foreach($lines as $line) {
 	}
 	$i++;
 }
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 $id = $calendars[0]['id'];
 foreach($uids as $uid) {
 	$prefix=$suffix=$content=array();
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 05a808a5ae..a74c879436 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -11,11 +11,11 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
 // Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
-if( count($calendars) == 0){
-	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
-}
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+// if( count($calendars) == 0){
+// 	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
+// 	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+// }
 
 $eventSources = array();
 foreach($calendars as $calendar){
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 869b35e2e1..dfd8fe7437 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -44,13 +44,13 @@ class OC_Calendar_Calendar{
 	/**
 	 * @brief Returns the list of calendars for a specific user.
 	 * @param string $uid User ID
-	 * @param boolean $active Only return calendars with this $active state, default(=null) is don't care
+	 * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
 	 * @return array
 	 */
-	public static function allCalendars($uid, $active=null){
+	public static function allCalendars($uid, $active=false){
 		$values = array($uid);
 		$active_where = '';
-		if (!is_null($active) && $active){
+		if ($active === true){
 			$active_where = ' AND active = ?';
 			$values[] = $active;
 		}
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 03516b3b70..6526b4223a 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,7 +1,7 @@
 <?php
 class OC_Search_Provider_Calendar extends OC_Search_Provider{
 	function search($query){
-		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 		if(count($calendars)==0 || !OCP\App::isEnabled('calendar')){
 			//return false;
 		}

From 6d43e6565e77ecdd891ba2a96dca5ae0611b5622 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 00:53:13 +0200
Subject: [PATCH 0408/1537] Revert "Agree on argument type."

This reverts commit 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294.
---
 apps/calendar/ajax/import/dropimport.php |  2 +-
 apps/calendar/index.php                  | 10 +++++-----
 apps/calendar/lib/calendar.php           |  6 +++---
 apps/calendar/lib/search.php             |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index 684eebf5fd..e98c282ef4 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -45,7 +45,7 @@ foreach($lines as $line) {
 	}
 	$i++;
 }
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
 $id = $calendars[0]['id'];
 foreach($uids as $uid) {
 	$prefix=$suffix=$content=array();
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index a74c879436..05a808a5ae 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -11,11 +11,11 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
 // Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-// if( count($calendars) == 0){
-// 	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
-// 	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-// }
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+if( count($calendars) == 0){
+	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
+	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+}
 
 $eventSources = array();
 foreach($calendars as $calendar){
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index dfd8fe7437..869b35e2e1 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -44,13 +44,13 @@ class OC_Calendar_Calendar{
 	/**
 	 * @brief Returns the list of calendars for a specific user.
 	 * @param string $uid User ID
-	 * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
+	 * @param boolean $active Only return calendars with this $active state, default(=null) is don't care
 	 * @return array
 	 */
-	public static function allCalendars($uid, $active=false){
+	public static function allCalendars($uid, $active=null){
 		$values = array($uid);
 		$active_where = '';
-		if ($active === true){
+		if (!is_null($active) && $active){
 			$active_where = ' AND active = ?';
 			$values[] = $active;
 		}
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 6526b4223a..03516b3b70 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,7 +1,7 @@
 <?php
 class OC_Search_Provider_Calendar extends OC_Search_Provider{
 	function search($query){
-		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
 		if(count($calendars)==0 || !OCP\App::isEnabled('calendar')){
 			//return false;
 		}

From ad32c203002cbf2c02457084e40c216d06afd7f2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 01:51:26 +0200
Subject: [PATCH 0409/1537] Agree on argument type (cleaned this time).

---
 apps/calendar/ajax/import/dropimport.php | 2 +-
 apps/calendar/index.php                  | 4 ++--
 apps/calendar/lib/calendar.php           | 6 +++---
 apps/calendar/lib/search.php             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index e98c282ef4..684eebf5fd 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -45,7 +45,7 @@ foreach($lines as $line) {
 	}
 	$i++;
 }
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 $id = $calendars[0]['id'];
 foreach($uids as $uid) {
 	$prefix=$suffix=$content=array();
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 05a808a5ae..eed4d98f15 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -11,10 +11,10 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
 // Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 if( count($calendars) == 0){
 	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 }
 
 $eventSources = array();
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 869b35e2e1..cde020293d 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -44,13 +44,13 @@ class OC_Calendar_Calendar{
 	/**
 	 * @brief Returns the list of calendars for a specific user.
 	 * @param string $uid User ID
-	 * @param boolean $active Only return calendars with this $active state, default(=null) is don't care
+	 * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
 	 * @return array
 	 */
-	public static function allCalendars($uid, $active=null){
+	public static function allCalendars($uid, $active=false){
 		$values = array($uid);
 		$active_where = '';
-		if (!is_null($active) && $active){
+		if ($active){
 			$active_where = ' AND active = ?';
 			$values[] = $active;
 		}
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 03516b3b70..6526b4223a 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,7 +1,7 @@
 <?php
 class OC_Search_Provider_Calendar extends OC_Search_Provider{
 	function search($query){
-		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 		if(count($calendars)==0 || !OCP\App::isEnabled('calendar')){
 			//return false;
 		}

From ad8c4ab182b50617a65e8fd4ed33045e99fdfdb6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 01:55:02 +0200
Subject: [PATCH 0410/1537] Only create new calendar when there are none. Fix
 oc-1007.

---
 apps/calendar/index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index eed4d98f15..4b87119592 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -11,7 +11,7 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
 // Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), false);
 if( count($calendars) == 0){
 	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
 	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
@@ -19,7 +19,9 @@ if( count($calendars) == 0){
 
 $eventSources = array();
 foreach($calendars as $calendar){
-	$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
+	if($calendar['active'] == 1) {
+		$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
+	}
 }
 
 $eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true');

From 3c75ac5f62056a178744215e153802569b183b26 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 02:07:32 +0200
Subject: [PATCH 0411/1537] Update calendar after delete.

---
 apps/calendar/js/calendar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 1cbe5c6764..5136c3e774 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -430,6 +430,7 @@ Calendar={
 							$('#calendar_holder').fullCalendar('removeEventSource', url);
 							$('#choosecalendar_dialog').dialog('destroy').remove();
 							Calendar.UI.Calendar.overview();
+							$('#calendar_holder').fullCalendar('refetchEvents');
 						}
 					  });
 				}

From f6aa366857a28da302461d1c426288b23d49b7af Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 02:10:55 +0200
Subject: [PATCH 0412/1537] Make sure there is a calendar after delete.

---
 apps/calendar/lib/calendar.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index cde020293d..0a54e7a32a 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -198,6 +198,10 @@ class OC_Calendar_Calendar{
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
 		$stmt->execute(array($id));
 
+		if(count(self::allCalendars()) == 0) {
+			self::addCalendar(OCP\USER::getUser(),'Default calendar');
+		}
+
 		return true;
 	}
 

From 92083aa20cd0367d5b1643a4c98580769e5d57ca Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 14 Jun 2012 20:56:48 -0400
Subject: [PATCH 0413/1537] Fix upload for Google Drive; Google Documents List
 API documentation was misleading

---
 apps/files_external/lib/google.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index c2a4af0ff8..fe60a06629 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -40,7 +40,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		$this->entries = array();
 	}
 
-	private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true) {
+	private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true, $returnHTTPCode = false) {
 		$uri = trim($uri);
 		// create an associative array from each key/value url query param pair.
 		$params = array();
@@ -108,6 +108,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			if ($httpCode <= 308) {
 				if ($isDownload) {
 					return $tmpFile;
+				} else if ($returnHTTPCode) {
+					return array('result' => $result, 'code' => $httpCode);
 				} else {
 					return $result;
 				}
@@ -425,7 +427,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			$etag = $entry->getAttribute('gd:etag');
 			$links = $entry->getElementsByTagName('link');
 			foreach ($links as $link) {
-				if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-edit-media') {
+				if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-create-media') {
 					$uploadUri = $link->getAttribute('href');
 					break;
 				}
@@ -461,12 +463,12 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 					}
 				}
 				$end = $i + $chunkSize - 1;
-				$headers = array('Content-Length: '.$chunkSize, 'Content-Type: '.$mimetype, 'Content Range: bytes '.$i.'-'.$end.'/'.$size);
+				$headers = array('Content-Length: '.$chunkSize, 'Content-Type: '.$mimetype, 'Content-Range: bytes '.$i.'-'.$end.'/'.$size);
 				$postData = fread($handle, $chunkSize);
-				$result = $this->sendRequest($uploadUri, 'PUT', $postData, $headers, false, true, false);
-				if ($result) {
-					// Get next location to upload file chunk
-					if (preg_match('@^Location: (.*)$@m', $result, $matches)) {
+				$result = $this->sendRequest($uploadUri, 'PUT', $postData, $headers, false, true, false, true);
+				if ($result['code'] == '308') {
+					if (preg_match('@^Location: (.*)$@m', $result['result'], $matches)) {
+						// Get next location to upload file chunk
 						$uploadUri = trim($matches[1]);
 					}
 					$i += $chunkSize;

From 8a68d09b0fdcaf445a2b376cc42b705c81023f35 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 03:26:08 +0200
Subject: [PATCH 0414/1537] Use type=url for URL field.

---
 apps/contacts/templates/part.contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index ca682baaf8..0a930949eb 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -37,7 +37,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<dt class="hidden" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="url_label" data-element="URL"><label for="url"><?php echo $l->t('Web site'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" name="value[URL]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" name="value[URL]" type="url" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property big" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Groups'); ?></label></dt>

From effb6f1309a2ce3800c0758257a7f7825a8fa5d1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 04:26:03 +0200
Subject: [PATCH 0415/1537] Update stylesheet for type=url.

---
 apps/contacts/css/contacts.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 8de68fbf05..dc16d9764c 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -22,10 +22,10 @@
 #firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
 #firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; }
 
-#card input[type="text"].contacts_property,input[type="email"].contacts_property { width: 14em; float: left; font-weight: bold; }
+#card input[type="text"].contacts_property,input[type="email"].contacts_property,input[type="url"].contacts_property { width: 14em; float: left; font-weight: bold; }
 .categories { float: left; width: 16em; }
-#card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
-#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="tel"]:active, select:hover, select:focus, select:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
+#card input[type="text"],input[type="email"],input[type="url"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
+#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="url"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="url"]:active,input[type="tel"]:active, select:hover, select:focus, select:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
 textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
 dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; }
 .form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }

From 0d3f5f736f8e0d32470ea31980bae1094fcab50a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 14 Jun 2012 18:22:48 +0200
Subject: [PATCH 0416/1537] Disable minizing when DEBUG is true

---
 lib/minimizer/css.php | 4 +++-
 lib/minimizer/js.php  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 4637417579..09a0efdc3a 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -67,7 +67,9 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			$remote .= dirname($file_info[2]);
 			$css_out .= CSSMin::remap($css, dirname($file), $remote, true);
 		}
-		$css_out = CSSMin::minify($css_out);
+		if (!defined('DEBUG') || !DEBUG){
+			$css_out = CSSMin::minify($css_out);
+		}
 		return $css_out;
 	}
 }
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index 4ddaa79d81..b9a023e068 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -56,7 +56,9 @@ class OC_Minimizer_JS extends OC_Minimizer
 			$js_out .= '/* ' . $file . ' */' . "\n";
 			$js_out .= file_get_contents($file);
 		}
-		$js_out = JavaScriptMinifier::minify($js_out);
+		if (!defined('DEBUG') || !DEBUG){
+			$js_out = JavaScriptMinifier::minify($js_out);
+		}
 		return $js_out;
 	}
 }

From 2b228fba3463722ad19ea6ccd150b96772508791 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 11:18:38 +0200
Subject: [PATCH 0417/1537] Load app before running update script

---
 lib/app.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/app.php b/lib/app.php
index 0c51e3c553..7fdfc93138 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -542,6 +542,7 @@ class OC_App{
 			return;
 		}
 		if(file_exists(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php')){
+			self::loadApp($appid);
 			include OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php';
 		}
 

From b6a8de853062407fb4ae5890048410f9ba07d373 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 11:24:40 +0200
Subject: [PATCH 0418/1537] don't clean and cache calendar on every update

---
 apps/calendar/appinfo/update.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
index a26c23f9ad..ab8a5263bd 100644
--- a/apps/calendar/appinfo/update.php
+++ b/apps/calendar/appinfo/update.php
@@ -15,8 +15,10 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
 		$r = $stmt->execute(array($color,$id));
 	}
 }
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-foreach($calendars as $calendar){
-	OC_Calendar_Repeat::cleancalendar($calendar['id']);
-	OC_Calendar_Repeat::generatecalendar($calendar['id']);
+if (version_compare($installedVersion, '0.5', '<')) {
+	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+	foreach($calendars as $calendar){
+		OC_Calendar_Repeat::cleancalendar($calendar['id']);
+		OC_Calendar_Repeat::generatecalendar($calendar['id']);
+	}
 }
\ No newline at end of file

From 6f20d516466f50798c147ae228f39b4826a4b7db Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 11:25:29 +0200
Subject: [PATCH 0419/1537] fix generateEventOutput for calendar hook

---
 apps/calendar/lib/app.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 4bd1e1b711..4adfa28dd1 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -362,17 +362,14 @@ class OC_Calendar_App{
 	 * @return (array) $output - readable output
 	 */
 	public static function generateEventOutput($event, $start, $end){
-		// Why is the following code necessary ? //
-		/*if(isset($event['calendardata'])){
+		if(isset($event['calendardata'])){
 			$object = OC_VObject::parse($event['calendardata']);
 			$vevent = $object->VEVENT;
 		}else{
 			$vevent = $event['vevent'];
-		}*/
+		}
 		$return = array();
 		$id = $event['id'];
-		$object = $object = OC_VObject::parse($event['calendardata']);
-		$vevent = $object->VEVENT;
 		$allday = ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false;
 		$last_modified = @$vevent->__get('LAST-MODIFIED');
 		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;

From 5c106834323a7337a1ce10fbd926a85c4b1cceba Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 11:29:16 +0200
Subject: [PATCH 0420/1537] use easier parseable date to init datetime

---
 apps/calendar/lib/repeat.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index de13f1eb21..889a0eb3f4 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -89,9 +89,9 @@ class OC_Calendar_Repeat{
 			return false;
 		}
 		$object = OC_VObject::parse($event['calendardata']);
-		$start = new DateTime('first day of January ' . date('Y') . ' 00:00:00', new DateTimeZone('UTC'));
+		$start = new DateTime('01-01-' . date('Y') . ' 00:00:00', new DateTimeZone('UTC'));
 		$start->modify('-5 years');
-		$end = new DateTime('last day of December ' . date('Y') . ' 23:59:59', new DateTimeZone('UTC'));
+		$end = new DateTime('31-12-' . date('Y') . ' 23:59:59', new DateTimeZone('UTC'));
 		$end->modify('+5 years');
 		$object->expand($start, $end);
 		foreach($object->getComponents() as $vevent){

From e4529301ff2ff8f8b6cb668cd48243070dabebde Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 11:34:21 +0200
Subject: [PATCH 0421/1537] change some function names in OC_Calendar_Repeat

---
 apps/calendar/appinfo/app.php    |  2 +-
 apps/calendar/appinfo/update.php |  4 ++--
 apps/calendar/lib/repeat.php     | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 89821d37d8..f1f2a26d87 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -13,7 +13,7 @@ OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate
 OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update');
 OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean');
 OCP\Util::connectHook('OC_Calendar', 'moveEvent', 'OC_Calendar_Repeat', 'update');
-OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleancalendar');
+OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleanCalendar');
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
index ab8a5263bd..98159c3383 100644
--- a/apps/calendar/appinfo/update.php
+++ b/apps/calendar/appinfo/update.php
@@ -18,7 +18,7 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
 if (version_compare($installedVersion, '0.5', '<')) {
 	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
 	foreach($calendars as $calendar){
-		OC_Calendar_Repeat::cleancalendar($calendar['id']);
-		OC_Calendar_Repeat::generatecalendar($calendar['id']);
+		OC_Calendar_Repeat::cleanCalendar($calendar['id']);
+		OC_Calendar_Repeat::generateCalendar($calendar['id']);
 	}
 }
\ No newline at end of file
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 889a0eb3f4..d1b14eea91 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -49,7 +49,7 @@ class OC_Calendar_Repeat{
 	 * @param (int) $id - id of the calendar
 	 * @return (array) 
 	 */
-	public static function getcalendar($id){
+	public static function getCalendar($id){
 		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?');
 		$result = $stmt->execute(array($id));
 		$return = array();
@@ -65,7 +65,7 @@ class OC_Calendar_Repeat{
 	 * @param (string) $until - end for period in UTC
 	 * @return (array)
 	 */
-	public static function getcalendar_inperiod($id, $from, $until){
+	public static function getCalendar_inperiod($id, $from, $until){
 		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?'
 		.' AND ((startdate >= ? AND startdate <= ?)'
 		.' OR (enddate >= ? AND enddate <= ?))');
@@ -122,7 +122,7 @@ class OC_Calendar_Repeat{
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
 	 */
-	public static function generatecalendar($id){
+	public static function generateCalendar($id){
 		$allobjects = OC_Calendar_Object::all($id);
 		foreach($allobjects['id'] as $eventid){
 			self::generate($eventid);
@@ -144,9 +144,9 @@ class OC_Calendar_Repeat{
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
 	 */
-	public static function updatecalendar($id){
-		self::cleancalendar($id);
-		self::generatecalendar($id);
+	public static function updateCalendar($id){
+		self::cleanCalendar($id);
+		self::generateCalendar($id);
 		return true;
 	}
 	/*
@@ -182,7 +182,7 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function is_calendar_cached($id){
-		$cachedevents = count(self::getcalendar($id));
+		$cachedevents = count(self::getCalendar($id));
 		$repeatingevents = 0;
 		$allevents = OC_Calendar_Object::all($id);
 		foreach($allevents as $event){
@@ -210,7 +210,7 @@ class OC_Calendar_Repeat{
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
 	 */
-	public static function cleancalendar($id){
+	public static function cleanCalendar($id){
 		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE calid = ?');
 		$stmt->execute(array($id));
 	}

From 22a33b509ff8339393834764a19d8d026177783e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 11:39:19 +0200
Subject: [PATCH 0422/1537] use DateTime as type of parameter in the functions
 is_cached_inperiod and get_inperiod

---
 apps/calendar/lib/app.php    |  4 ++--
 apps/calendar/lib/repeat.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 4adfa28dd1..4711bf7a2e 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -378,8 +378,8 @@ class OC_Calendar_App{
 						'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
 						'lastmodified'=>$lastmodified,
 						'allDay'=>$allday);
-		if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end))){
-			$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end));
+		if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){
+			$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, $start, $end);
 			foreach($cachedinperiod as $cachedevent){
 				$dynamicoutput = array();
 				if($allday){
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index d1b14eea91..4b9cbdcd4b 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -27,8 +27,8 @@ class OC_Calendar_Repeat{
 	/*
 	 * @brief returns the cache of an event in a specific peroid
 	 * @param (int) $id - id of the event
-	 * @param (string) $from - start for period in UTC
-	 * @param (string) $until - end for period in UTC
+	 * @param (DateTime) $from - start for period in UTC
+	 * @param (DateTime) $until - end for period in UTC
 	 * @return (array)
 	 */
 	public static function get_inperiod($id, $from, $until){
@@ -36,8 +36,8 @@ class OC_Calendar_Repeat{
 		.' AND ((startdate >= ? AND startdate <= ?)'
 		.' OR (enddate >= ? AND enddate <= ?))');
 		$result = $stmt->execute(array($id,
-					$from, $until,
-					$from, $until));
+					OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until),
+					OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until)));
 		$return = array();
 		while($row = $result->fetchRow()){
 			$return[] = $row;
@@ -164,8 +164,8 @@ class OC_Calendar_Repeat{
 	/*
 	 * @brief checks if an event is already cached in a specific period
 	 * @param (int) id - id of the event
-	 * @param (string) $from - start for period in UTC
-	 * @param (string) $until - end for period in UTC
+	 * @param (DateTime) $from - start for period in UTC
+	 * @param (DateTime) $until - end for period in UTC
 	 * @return (bool)
 	 */
 	public static function is_cached_inperiod($id, $start, $end){

From aa7ce480f4c83f6430eb019cfa172553b5578769 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 12:11:22 +0200
Subject: [PATCH 0423/1537] create OC_Calendar_Object::generateStartEndDate
 function

---
 apps/calendar/lib/app.php    | 30 ++----------------------------
 apps/calendar/lib/object.php | 17 +++++++++++++++++
 apps/calendar/lib/repeat.php | 19 +++----------------
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 17c23f4ea3..e3be8c8428 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -400,36 +400,10 @@ class OC_Calendar_App{
 		}else{
 			$object->expand($start, $end);
 			foreach($object->getComponents() as $vevent){
-				if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
+				if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;
 				}
-				$dynamicoutput = array();
-				$dtstart = $vevent->DTSTART;
-				$start_dt = $dtstart->getDateTime();
-				$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-				$end_dt = $dtend->getDateTime();
-				
-				if($allday){
-					$dynamicoutput['start'] = $start_dt->format('Y-m-d');
-					$end_dt->modify('-1 sec');
-					$dynamicoutput['end'] = $end_dt->format('Y-m-d');
-				}else{
-					$start_dt->setTimezone(new DateTimeZone(self::$tz));
-					$end_dt->setTimezone(new DateTimeZone(self::$tz));
-					$dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
-					$dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
-				}
-
-				// Handle exceptions to recurring events
-				/*$exceptionDateObjects = $vevent->select('EXDATE');
-				$exceptionDateMap = Array();
-				foreach ($exceptionDateObjects as $exceptionObject) {
-					foreach($exceptionObject->getDateTimes() as $datetime) {
-						$ts = $datetime->getTimestamp();
-						$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
-					}
-				}*/
-
+				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), self::$tz);
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index ba3fa814f3..07f2afb7b5 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -807,4 +807,21 @@ class OC_Calendar_Object{
 		$event = self::find($id);
 		return ($event['repeating'] == 1)?true:false;
 	}
+
+	public static function generateStartEndDate($dtstart, $dtend, $tz){
+		$start_dt = $dtstart->getDateTime();
+		$end_dt = $dtend->getDateTime();
+		$return = array();
+		if($allday){
+			$return['start'] = $start_dt->format('Y-m-d');
+			$end_dt->modify('-1 hour');
+			$return['end'] = $end_dt->format('Y-m-d');
+		}else{
+			$start_dt->setTimezone(new DateTimeZone($tz));
+			$end_dt->setTimezone(new DateTimeZone($tz));
+			$return['start'] = $start_dt->format('Y-m-d H:i:s');
+			$return['end'] = $end_dt->format('Y-m-d H:i:s');
+		}
+		return $return;
+	}
 }
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 4b9cbdcd4b..6976378ebd 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -95,25 +95,12 @@ class OC_Calendar_Repeat{
 		$end->modify('+5 years');
 		$object->expand($start, $end);
 		foreach($object->getComponents() as $vevent){
-			if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
+			if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
 				continue;
 			}
-			$dtstart = $vevent->DTSTART;
-			$start_dt = $dtstart->getDateTime();
-			$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-			$end_dt = $dtend->getDateTime();
-			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
-				$startdate = $start_dt->format('Y-m-d');
-				$end_dt->modify('-1 sec');
-				$enddate = $end_dt->format('Y-m-d');
-			}else{
-				$start_dt->setTimezone(new DateTimeZone('UTC'));
-				$end_dt->setTimezone(new DateTimeZone('UTC'));
-				$startdate = $start_dt->format('Y-m-d H:i:s');
-				$enddate = $end_dt->format('Y-m-d H:i:s');
-			}
+			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), 'UTC');
 			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_repeat (eventid,calid,startdate,enddate) VALUES(?,?,?,?)');
-			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startdate,$enddate));
+			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startenddate['start'],$startenddate['end']));
 		}
 		return true;
 	}

From 3ddaedee3bcc498b144d3f5df1356eccee7fbb49 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 15 Jun 2012 15:51:06 +0200
Subject: [PATCH 0424/1537] fixed xss vulnerability

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index b90b1b310a..32b3c88df1 100755
--- a/index.php
+++ b/index.php
@@ -121,7 +121,7 @@ elseif(OC_User::isLoggedIn()) {
 	if(!array_key_exists('sectoken', $_SESSION) || (array_key_exists('sectoken', $_SESSION) && is_null(OC::$REQUESTEDFILE)) || substr(OC::$REQUESTEDFILE, -3) == 'php'){
 		$sectoken=rand(1000000,9999999);
 		$_SESSION['sectoken']=$sectoken;
-		$redirect_url = (isset($_REQUEST['redirect_url'])) ? $_REQUEST['redirect_url'] : $_SERVER['REQUEST_URI'];
+		$redirect_url = (isset($_REQUEST['redirect_url'])) ? strip_tags($_REQUEST['redirect_url']) : $_SERVER['REQUEST_URI'];
 		OC_Template::printGuestPage('', 'login', array('error' => $error, 'sectoken' => $sectoken, 'redirect' => $redirect_url));
 	}
 }

From 8f6121ffa8dfd5ee85ba70569587e2b1878084cd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 15:55:46 +0200
Subject: [PATCH 0425/1537] Files: Double encode download links. Fix for
 oc-1016.

---
 apps/files/js/fileactions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index deec640bc1..4dc05088ee 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -141,7 +141,7 @@ $(document).ready(function(){
 		var downloadScope = 'file';
 	}
 	FileActions.register(downloadScope,'Download',function(){return OC.imagePath('core','actions/download')},function(filename){
-		window.location=OC.filePath('files', 'ajax', 'download.php') + '?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val());
+		window.location=OC.filePath('files', 'ajax', 'download.php') + encodeURIComponent('?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()));
 	});
 });
 

From 400769ab400f8c57b95d762420ff2b8da62738a3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 16:04:01 +0200
Subject: [PATCH 0426/1537] Optimize WebDav access using OC_FileCache

---
 lib/connector/sabre/directory.php | 25 +++++++++++--------------
 lib/connector/sabre/file.php      |  7 +++++--
 lib/connector/sabre/node.php      | 22 +++++++++++++++-------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index e74d832cb0..5aa70392d7 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -59,19 +59,22 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * @throws Sabre_DAV_Exception_FileNotFound
 	 * @return Sabre_DAV_INode
 	 */
-	public function getChild($name) {
+	public function getChild($name, $info = null) {
 
 		$path = $this->path . '/' . $name;
+		if (is_null($info)) {
+			$info = OC_FileCache::get($path);
+		}
 
-		if (!OC_Filesystem::file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
+		if (!$info) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
 
-		if (OC_Filesystem::is_dir($path)) {
+		if ($info['mimetype'] == 'httpd/unix-directory') {
 
-			return new OC_Connector_Sabre_Directory($path);
+			return new OC_Connector_Sabre_Directory($path, $info);
 
 		} else {
 
-			return new OC_Connector_Sabre_File($path);
+			return new OC_Connector_Sabre_File($path, $info);
 
 		}
 
@@ -85,17 +88,11 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function getChildren() {
 
 		$nodes = array();
-		// foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
-		if( OC_Filesystem::is_dir($this->path . '/')){
-			$dh = OC_Filesystem::opendir($this->path . '/');
-			while(( $node = readdir($dh)) !== false ){
-				if($node!='.' && $node!='..'){
-					$nodes[] = $this->getChild($node);
-				}
-			}
+		$folder_content = OC_FileCache::getFolderContent($this->path);
+		foreach($folder_content as $info) {
+			$nodes[] = $this->getChild($info['name'], $info);
 		}
 		return $nodes;
-
 	}
 
 	/**
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 3ba1b3355f..dd25df78c2 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -63,8 +63,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * @return int
 	 */
 	public function getSize() {
-		$this->stat();
-		return $this->stat_cache['size'];
+		$this->getFileinfoCache();
+		return $this->fileinfo_cache['size'];
 
 	}
 
@@ -92,6 +92,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * @return mixed
 	 */
 	public function getContentType() {
+		if (isset($this->fileinfo_cache['mimetype'])) {
+			return $this->fileinfo_cache['mimetype'];
+		}
 
 		return OC_Filesystem::getMimeType($this->path);
 
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index e7bcea3171..e5c059f0c8 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -33,7 +33,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * file stat cache
 	 * @var array
 	 */
-	protected $stat_cache;
+	protected $fileinfo_cache;
 
 	/**
 	 * Sets up the node, expects a full path name
@@ -41,8 +41,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param string $path
 	 * @return void
 	 */
-	public function __construct($path) {
+	public function __construct($path, $fileinfo_cache = null) {
 		$this->path = $path;
+		if ($fileinfo_cache) {
+			$this->fileinfo_cache = $fileinfo_cache;
+		}
 	}
 
 
@@ -85,9 +88,14 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	/**
 	 * Set the stat cache
 	 */
-	protected function stat() {
-		if (!isset($this->stat_cache)) {
-			$this->stat_cache = OC_Filesystem::stat($this->path);
+	protected function getFileinfoCache() {
+		if (!isset($this->fileinfo_cache)) {
+			if ($fileinfo_cache = OC_FileCache::get($this->path)) {
+			} else {
+				$fileinfo_cache = OC_Filesystem::stat($this->path);
+			}
+
+			$this->fileinfo_cache = $fileinfo_cache;
 		}
 	}
 
@@ -97,8 +105,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @return int
 	 */
 	public function getLastModified() {
-		$this->stat();
-		return $this->stat_cache['mtime'];
+		$this->getFileinfoCache();
+		return $this->fileinfo_cache['mtime'];
 
 	}
 

From 449760f665a2416875458cbb3f34387df038b08a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 16:43:24 +0200
Subject: [PATCH 0427/1537] add hasUpdated to oc_filestorage

---
 apps/files_sharing/sharedstorage.php | 9 +++++++++
 lib/filestorage.php                  | 9 +++++++++
 lib/filestorage/common.php           | 9 +++++++++
 lib/filestorage/local.php            | 9 +++++++++
 tests/lib/filestorage.php            | 8 ++++++++
 5 files changed, 44 insertions(+)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 3bb6e73035..1a6942ad16 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -512,6 +512,15 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		OC_Filesystem::mount('OC_Filestorage_Shared', array('datadir' => '/'.OCP\USER::getUser().'/files/Shared'), '/'.OCP\USER::getUser().'/files/Shared/');
 	}
 
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time){
+		//TODO
+		return $this->filemtime($path)>$time;
+	}
 }
 
 if (OCP\USER::isLoggedIn()) {
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 1d7e004af3..71ef4aed00 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -50,4 +50,13 @@ abstract class OC_Filestorage{
 	abstract public function search($query);
 	abstract public function touch($path, $mtime=null);
 	abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 *
+	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+	 * returning true for other changes in the folder is optional
+	 */
+	abstract public function hasUpdated($path,$time);
 }
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index f0bfc064cb..f2a5775fd1 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -156,4 +156,13 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		}
 		return $files;
 	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time){
+		return $this->filemtime($path)>$time;
+	}
 }
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index ea9a907026..44a2ab0f63 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -194,4 +194,13 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function getFolderSize($path){
 		return 0;//depricated, use OC_FileCach instead
 	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time){
+		return $this->filemtime($path)>$time;
+	}
 }
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index f71b658253..00f37b9f1a 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -149,6 +149,9 @@ abstract class Test_FileStorage extends UnitTestCase {
 			$this->assertTrue(($ctimeStart-1)<=$cTime);
 			$this->assertTrue($cTime<=($ctimeEnd+1));
 		}
+		$this->assertTrue($this->instance->hasUpdated('/lorem.txt',$ctimeStart-1));
+		$this->assertTrue($this->instance->hasUpdated('/',$ctimeStart-1));
+		
 		$this->assertTrue(($ctimeStart-1)<=$mTime);
 		$this->assertTrue($mTime<=($ctimeEnd+1));
 		$this->assertEqual(filesize($textFile),$this->instance->filesize('/lorem.txt'));
@@ -168,6 +171,8 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue(($mtimeStart-1)<=$mTime);
 		$this->assertTrue($mTime<=($mtimeEnd+1));
 		$this->assertEqual($cTime,$originalCTime);
+
+		$this->assertTrue($this->instance->hasUpdated('/lorem.txt',$mtimeStart-1));
 		
 		if($this->instance->touch('/lorem.txt',100)!==false){
 			$mTime=$this->instance->filemtime('/lorem.txt');
@@ -184,6 +189,9 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$mTime=$this->instance->filemtime('/lorem.txt');
 		$this->assertTrue(($mtimeStart-1)<=$mTime);
 		$this->assertTrue($mTime<=($mtimeEnd+1));
+
+		$this->instance->unlink('/lorem.txt');
+		$this->assertTrue($this->instance->hasUpdated('/',$mtimeStart-1));
 	}
 
 	public function testSearch(){

From a9a424a51982396943e9c3353c0c36f289dd41ba Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 17:42:39 +0200
Subject: [PATCH 0428/1537] also add hasUpdated to oc_filesystem and
 oc_filesystemview

---
 lib/filesystem.php     | 9 +++++++++
 lib/filesystemview.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 28bd7d5290..89de533d72 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -474,6 +474,15 @@ class OC_Filesystem{
 	static public function search($query){
 		return OC_FileCache::search($query);
 	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	static public function hasUpdated($path,$time){
+		return self::$defaultInstance->hasUpdated($path);
+	}
 }
 
 require_once('filecache.php');
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 58657671b9..813a87cd74 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -444,4 +444,13 @@ class OC_FilesystemView {
 		}
 		return null;
 	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time){
+		return $this->basicOperation('hasUpdated',$path,array(),$time);
+	}
 }

From f06c08a63742de9adea4a146a4480b71ad254f20 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 19:56:15 +0200
Subject: [PATCH 0429/1537] cleanup oc_filecache, splitting it in several parts
 and using the new hasUpdated

---
 apps/files/ajax/upload.php          |   2 +-
 apps/files_encryption/lib/proxy.php |   2 +-
 lib/filecache.php                   | 442 +++++-----------------------
 lib/filecache/cached.php            |  67 +++++
 lib/filecache/update.php            | 210 +++++++++++++
 lib/fileproxy/quota.php             |   4 +-
 lib/files.php                       |   2 +-
 7 files changed, 350 insertions(+), 379 deletions(-)
 create mode 100644 lib/filecache/cached.php
 create mode 100644 lib/filecache/update.php

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index d6c799af32..b779924cfb 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -48,7 +48,7 @@ if(strpos($dir,'..') === false){
 	for($i=0;$i<$fileCount;$i++){
         $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
 		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i],$target)){
-			$meta=OC_FileCache::getCached($target);
+			$meta=OC_FileCache_Cached::get($target);
 			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
 		}
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 9fd57c0f02..ad9bcf55f2 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @return bool
 	 */
 	private static function isEncrypted($path){
-		$metadata=OC_FileCache::getCached($path,'');
+		$metadata=OC_FileCache_Cached::get($path,'');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
 	
diff --git a/lib/filecache.php b/lib/filecache.php
index 3fb8e4113c..7c9c4dc41f 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -28,8 +28,6 @@
  * It will try to keep the data up to date but changes from outside ownCloud can invalidate the cache
  */
 class OC_FileCache{
-	private static $savedData=array();
-	
 	/**
 	 * get the filesystem info from the cache
 	 * @param string path
@@ -44,29 +42,15 @@ class OC_FileCache{
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function get($path,$root=''){
-		if(self::isUpdated($path,$root)){
-			if(!$root){//filesystem hooks are only valid for the default root
+	public static function get($path,$root=false){
+		if(OC_FileCache_Update::hasUpdated($path,$root)){
+			if($root===false){//filesystem hooks are only valid for the default root
 				OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path));
 			}else{
-				self::fileSystemWatcherWrite(array('path'=>$path),$root);
+				OC_FileCache_Update::update($path,$root);
 			}
 		}
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}
-		if($root=='/'){
-			$root='';
-		}
-		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path_hash=?');
-		$result=$query->execute(array(md5($path)))->fetchRow();
-		if(is_array($result)){
-			return $result;
-		}else{
-			OC_Log::write('files','get(): file not found in cache ('.$path.')',OC_Log::DEBUG);
-			return false;
-		}
+		return OC_FileCache_Cached::get($path,$root);
 	}
 
 	/**
@@ -77,30 +61,23 @@ class OC_FileCache{
 	 *
 	 * $data is an assiciative array in the same format as returned by get
 	 */
-	public static function put($path,$data,$root=''){
-		if(!$root){
+	public static function put($path,$data,$root=false){
+		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
-		if($root=='/'){
-			$root='';
-		}
 		$path=$root.$path;
-		if($path=='/'){
-			$parent=-1;
-		}else{
-			$parent=self::getFileId(dirname($path));
-		}
-		$id=self::getFileId($path);
+		$parent=self::getParentId($path);
+		$id=self::getId($path,'');
 		if($id!=-1){
 			self::update($id,$data);
 			return;
 		}
-		if(isset(self::$savedData[$path])){
-			$data=array_merge($data,self::$savedData[$path]);
-			unset(self::$savedData[$path]);
+		if(isset(OC_FileCache_Cached::$savedData[$path])){
+			$data=array_merge($data,OC_FileCache_Cached::$savedData[$path]);
+			unset(OC_FileCache_Cached::$savedData[$path]);
 		}
 		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
-			self::$savedData[$path]=$data;
+			OC_FileCache_Cached::$savedData[$path]=$data;
 			return;
 		}
 		if(!isset($data['encrypted'])){
@@ -157,13 +134,10 @@ class OC_FileCache{
 	 * @param string newPath
 	 * @param string root (optional)
 	 */
-	public static function move($oldPath,$newPath,$root=''){
-		if(!$root){
+	public static function move($oldPath,$newPath,$root=false){
+		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
-		if($root=='/'){
-			$root='';
-		}
 		$oldPath=$root.$oldPath;
 		$newPath=$root.$newPath;
 		$newParent=self::getParentId($newPath);
@@ -182,28 +156,19 @@ class OC_FileCache{
 
 	/**
 	 * delete info from the cache
-	 * @param string/int $file
+	 * @param string path
 	 * @param string root (optional)
 	 */
-	public static function delete($file,$root=''){
-		if(!is_numeric($file)){
-			if(!$root){
-				$root=OC_Filesystem::getRoot();
-			}
-			if($root=='/'){
-				$root='';
-			}
-			$path=$root.$file;
-			self::delete(self::getFileId($path));
-		}elseif($file!=-1){
-			$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE parent=?');
-			$result=$query->execute(array($file));
-			while($child=$result->fetchRow()){
-				self::delete(intval($child['id']));
-			}
-			$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE id=?');
-			$query->execute(array($file));
+	public static function delete($path,$root=false){
+		if($root===false){
+			$root=OC_Filesystem::getRoot();
 		}
+		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE path_hash=?');
+		$query->execute(array(md5($root.$path)));
+		
+		//delete everything inside the folder
+		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE path LIKE ?');
+		$query->execute(array($root.$path.'/%'));
 	}
 	
 	/**
@@ -213,13 +178,10 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return array of filepaths
 	 */
-	public static function search($search,$returnData=false,$root=''){
-		if(!$root){
+	public static function search($search,$returnData=false,$root=false){
+		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
-		if($root=='/'){
-			$root='';
-		}
 		$rootLen=strlen($root);
 		if(!$returnData){
 			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND `user`=?');
@@ -254,26 +216,11 @@ class OC_FileCache{
 	 * - encrypted
 	 * - versioned
 	 */
-  public static function getFolderContent($path,$root='',$mimetype_filter=''){
-		if(self::isUpdated($path,$root)){
-			self::updateFolder($path,$root);
-		}
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}
-		if($root=='/'){
-			$root='';
-		}
-		$path=$root.$path;
-		$parent=self::getFileId($path);
-    $query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=? AND (mimetype LIKE ? OR mimetype = ?)');
-    $result=$query->execute(array($parent, $mimetype_filter.'%', 'httpd/unix-directory'))->fetchAll();
-		if(is_array($result)){
-			return $result;
-		}else{
-			OC_Log::write('files','getFolderContent(): file not found in cache ('.$path.')',OC_Log::DEBUG);
-			return false;
+	public static function getFolderContent($path,$root=false,$mimetype_filter=''){
+		if(OC_FileCache_Update::hasUpdated($path,$root)){
+			OC_FileCache_Update::updateFolder($path,$root);
 		}
+		return OC_FileCache_Cached::getFolderContent($path,$root,$mimetype_filter);
 	}
 
 	/**
@@ -282,58 +229,34 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return bool
 	 */
-	public static function inCache($path,$root=''){
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}
-		if($root=='/'){
-			$root='';
-		}
-		$path=$root.$path;
-		return self::getFileId($path)!=-1;
+	public static function inCache($path,$root=false){
+		return self::getId($path,$root)!=-1;
 	}
 
-	/**
-	 * get the file id as used in the cache
-	 * unlike the public getId, full paths are used here (/usename/files/foo instead of /foo)
-	 * @param string $path
-	 * @return int
-	 */
-	private static function getFileId($path){
-		$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path_hash=?');
-		if(OC_DB::isError($query)){
-			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
-			return -1;
-		}
-		$result=$query->execute(array(md5($path)));
-		if(OC_DB::isError($result)){
-			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
-			return -1;
-		}
-		$result=$result->fetchRow();
-		if(is_array($result)){
-			return $result['id'];
-		}else{
-			OC_Log::write('files','getFileId(): file not found in cache ('.$path.')',OC_Log::DEBUG);
-			return -1;
-		}
-	}
-	
 	/**
 	 * get the file id as used in the cache
 	 * @param string path
 	 * @param string root (optional)
 	 * @return int
 	 */
-	public static function getId($path,$root=''){
-		if(!$root){
+	public static function getId($path,$root=false){
+		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
-		if($root=='/'){
-			$root='';
+		
+		$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path_hash=?');
+		$result=$query->execute(array(md5($root.$path)));
+		if(OC_DB::isError($result)){
+			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
+			return -1;
+		}
+		
+		$result=$result->fetchRow();
+		if(is_array($result)){
+			return $result['id'];
+		}else{
+			return -1;
 		}
-		$path=$root.$path;
-		return self::getFileId($path);
 	}
 	
 	/**
@@ -366,154 +289,23 @@ class OC_FileCache{
 		if($path=='/'){
 			return -1;
 		}else{
-			return self::getFileId(dirname($path));
-		}
-	}
-
-	/**
-	 * called when changes are made to files
-	 * @param array $params
-	 * @param string root (optional)
-	 */
-	public static function fileSystemWatcherWrite($params,$root=''){
-		if(!$root){
-			$view=OC_Filesystem::getView();
-		}else{
-			$view=new OC_FilesystemView(($root=='/')?'':$root);
-		}
-		
-		$path=$params['path'];
-		$fullPath=$view->getRoot().$path;
-		$mimetype=$view->getMimeType($path);
-		$dir=$view->is_dir($path.'/');
-		//dont use self::get here, we don't want inifinte loops when a file has changed
-		$cachedSize=self::getCachedSize($path,$root);
-		$size=0;
-		if($dir){
-			if(self::inCache($path,$root)){
-				$parent=self::getFileId($fullPath);
-				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
-				$result=$query->execute(array($parent));
-				while($row=$result->fetchRow()){
-					$size+=$row['size'];
-				}
-				$mtime=$view->filemtime($path);
-				$ctime=$view->filectime($path);
-				$writable=$view->is_writable($path);
-				self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
-			}else{
-				$count=0;
-				self::scan($path,null,$count,$root);
-			}
-		}else{
-			$size=self::scanFile($path,$root);
-		}
-		self::increaseSize(dirname($fullPath),$size-$cachedSize);
-	}
-	
-	public static function getCached($path,$root=''){
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}else{
-			if($root=='/'){
-				$root='';
-			}
-		}
-		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path_hash=?');
-		$result=$query->execute(array(md5($path)))->fetchRow();
-		if(is_array($result)){
-			if(isset(self::$savedData[$path])){
-				$result=array_merge($result,self::$savedData[$path]);
-			}
-			return $result;
-		}else{
-			OC_Log::write('files','getCached(): file not found in cache ('.$path.')',OC_Log::DEBUG);
-			if(isset(self::$savedData[$path])){
-				return self::$savedData[$path];
-			}else{
-				return array();
-			}
+			return self::getId(dirname($path),'');
 		}
 	}
 	
-	private static function getCachedSize($path,$root){
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}else{
-			if($root=='/'){
-				$root='';
-			}
-		}
-		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path_hash=?');
-		$result=$query->execute(array(md5($path)));
-		if($row=$result->fetchRow()){
-			return $row['size'];
-		}else{//file not in cache
-			return 0;
-		}
-	}
-
-	/**
-	 * called when files are deleted
-	 * @param array $params
-	 * @param string root (optional)
-	 */
-	public static function fileSystemWatcherDelete($params,$root=''){
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}
-		if($root=='/'){
-			$root='';
-		}
-		$path=$params['path'];
-		$fullPath=$root.$path;
-		if(self::getFileId($fullPath)==-1){
-			return;
-		}
-		$size=self::getCachedSize($path,$root);
-		self::increaseSize(dirname($fullPath),-$size);
-		self::delete($path);
-	}
-
-	/**
-	 * called when files are deleted
-	 * @param array $params
-	 * @param string root (optional)
-	 */
-	public static function fileSystemWatcherRename($params,$root=''){
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}
-		if($root=='/'){
-			$root='';
-		}
-		$oldPath=$params['oldpath'];
-		$newPath=$params['newpath'];
-		$fullOldPath=$root.$oldPath;
-		$fullNewPath=$root.$newPath;
-		if(($id=self::getFileId($fullOldPath))!=-1){
-			$oldSize=self::getCachedSize($oldPath,$root);
-		}else{
-			return;
-		}
-		$size=OC_Filesystem::filesize($newPath);
-		self::increaseSize(dirname($fullOldPath),-$oldSize);
-		self::increaseSize(dirname($fullNewPath),$oldSize);
-		self::move($oldPath,$newPath);
-	}
-
 	/**
 	 * adjust the size of the parent folders
 	 * @param string $path
 	 * @param int $sizeDiff
+	 * @param string root (optinal)
 	 */
-	private static function increaseSize($path,$sizeDiff){
+	public static function increaseSize($path,$sizeDiff, $root=false){
 		if($sizeDiff==0) return;
-		while(($id=self::getFileId($path))!=-1){//walk up the filetree increasing the size of all parent folders
+		$id=self::getId($path,'');
+		while($id!=-1){//walk up the filetree increasing the size of all parent folders
 			$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
 			$query->execute(array($sizeDiff,$id));
+			$id=self::getParentId($path);
 			$path=dirname($path);
 		}
 	}
@@ -525,15 +317,15 @@ class OC_FileCache{
 	 * @param int count (optional)
 	 * @param string root (optionak)
 	 */
-	public static function scan($path,$eventSource=false,&$count=0,$root=''){
+	public static function scan($path,$eventSource=false,&$count=0,$root=false){
 		if($eventSource){
 			$eventSource->send('scanning',array('file'=>$path,'count'=>$count));
 		}
 		$lastSend=$count;
-		if(!$root){
+		if($root===false){
 			$view=OC_Filesystem::getView();
 		}else{
-			$view=new OC_FilesystemView(($root=='/')?'':$root);
+			$view=new OC_FilesystemView($root);
 		}
 		self::scanFile($path,$root);
 		$dh=$view->opendir($path.'/');
@@ -555,8 +347,9 @@ class OC_FileCache{
 				}
 			}
 		}
-		self::cleanFolder($path,$root);
-		self::increaseSize($view->getRoot().$path,$totalSize);
+		
+		OC_FileCache_Update::cleanFolder($path,$root);
+		self::increaseSize($path,$totalSize,$root);
 	}
 
 	/**
@@ -565,11 +358,11 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return int size of the scanned file
 	 */
-	public static function scanFile($path,$root=''){
-		if(!$root){
+	public static function scanFile($path,$root=false){
+		if($root===false){
 			$view=OC_Filesystem::getView();
 		}else{
-			$view=new OC_FilesystemView(($root=='/')?'':$root);
+			$view=new OC_FilesystemView($root);
 		}
 		if(!$view->is_readable($path)) return; //cant read, nothing we can do
 		clearstatcache();
@@ -602,11 +395,9 @@ class OC_FileCache{
 	 * seccond mimetype part can be ommited
 	 * e.g. searchByMime('audio')
 	 */
-	public static function searchByMime($part1,$part2=null,$root=null){
-		if(!$root){
+	public static function searchByMime($part1,$part2=null,$root=false){
+		if($root===false){
 			$root=OC_Filesystem::getRoot();
-		}elseif($root=='/'){
-			$root='';
 		}
 		$rootLen=strlen($root);
 		$root .= '%';
@@ -625,103 +416,6 @@ class OC_FileCache{
 		return $names;
 	}
 
-	/**
-	 * check if a file or folder is updated outside owncloud
-	 * @param string path
-	 * @param string root (optional)
-	 * @return bool
-	 */
-	public static function isUpdated($path,$root=''){
-		if(!$root){
-			$root=OC_Filesystem::getRoot();
-			$view=OC_Filesystem::getView();
-		}else{
-			if($root=='/'){
-				$root='';
-			}
-			$view=new OC_FilesystemView($root);
-		}
-		if(!$view->file_exists($path)){
-			return false;
-		}
-		$mtime=$view->filemtime($path);
-		$isDir=$view->is_dir($path);
-		$fullPath=$root.$path;
-		$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path_hash=?');
-		$result=$query->execute(array(md5($fullPath)));
-		if($row=$result->fetchRow()){
-			$cachedMTime=$row['mtime'];
-			return ($mtime>$cachedMTime);
-		}else{//file not in cache, so it has to be updated
-			if($path=='/' or $path==''){//dont auto update the root folder, it will be scanned
-				return false;
-			}
-			return true;
-		}
-	}
-
-	/**
-	 * update the cache according to changes in the folder
-	 * @param string path
-	 * @param string root (optional)
-	 */
-	private static function updateFolder($path,$root=''){
-		if(!$root){
-			$view=OC_Filesystem::getView();
-		}else{
-			$view=new OC_FilesystemView(($root=='/')?'':$root);
-		}
-		$dh=$view->opendir($path.'/');
-		if($dh){//check for changed/new files
-			while (($filename = readdir($dh)) !== false) {
-				if($filename != '.' and $filename != '..'){
-					$file=$path.'/'.$filename;
-					if(self::isUpdated($file,$root)){
-						if(!$root){//filesystem hooks are only valid for the default root
-							OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$file));
-						}else{
-							self::fileSystemWatcherWrite(array('path'=>$file),$root);
-						}
-					}
-				}
-			}
-		}
-		
-		self::cleanFolder($path,$root);
-		
-		//update the folder last, so we can calculate the size correctly
-		if(!$root){//filesystem hooks are only valid for the default root
-			OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path));
-		}else{
-			self::fileSystemWatcherWrite(array('path'=>$path),$root);
-		}
-	}
-
-	/**
-	 * delete non existing files from the cache
-	 */
-	private static function cleanFolder($path,$root=''){
-		if(!$root){
-			$view=OC_Filesystem::getView();
-		}else{
-			$view=new OC_FilesystemView(($root=='/')?'':$root);
-		}
-		//check for removed files, not using getFolderContent to prevent loops
-		$parent=self::getFileId($view->getRoot().$path);
-		$query=OC_DB::prepare('SELECT name FROM *PREFIX*fscache WHERE parent=?');
-		$result=$query->execute(array($parent));
-		while($row=$result->fetchRow()){
-			$file=$path.'/'.$row['name'];
-			if(!$view->file_exists($file)){
-				if(!$root){//filesystem hooks are only valid for the default root
-					OC_Hook::emit('OC_Filesystem','post_delete',array('path'=>$file));
-				}else{
-					self::fileSystemWatcherDelete(array('path'=>$file),$root);
-				}
-			}
-		}
-	}
-
 	/**
 	 * clean old pre-path_hash entries
 	 */
@@ -732,6 +426,6 @@ class OC_FileCache{
 }
 
 //watch for changes and try to keep the cache up to date
-OC_Hook::connect('OC_Filesystem','post_write','OC_FileCache','fileSystemWatcherWrite');
-OC_Hook::connect('OC_Filesystem','post_delete','OC_FileCache','fileSystemWatcherDelete');
-OC_Hook::connect('OC_Filesystem','post_rename','OC_FileCache','fileSystemWatcherRename');
+OC_Hook::connect('OC_Filesystem','post_write','OC_FileCache_Update','fileSystemWatcherWrite');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_FileCache_Update','fileSystemWatcherDelete');
+OC_Hook::connect('OC_Filesystem','post_rename','OC_FileCache_Update','fileSystemWatcherRename');
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
new file mode 100644
index 0000000000..a22adad452
--- /dev/null
+++ b/lib/filecache/cached.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+/**
+ * get data from the filecache without checking for updates
+ */
+class OC_FileCache_Cached{
+	public static $savedData=array();
+	
+	public static function get($path,$root=false){
+		if($root===false){
+			$root=OC_Filesystem::getRoot();
+		}
+		$path=$root.$path;
+		$query=OC_DB::prepare('SELECT path,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path_hash=?');
+		$result=$query->execute(array(md5($path)))->fetchRow();
+		if(is_array($result)){
+			if(isset(self::$savedData[$path])){
+				$result=array_merge($result,self::$savedData[$path]);
+			}
+			return $result;
+		}else{
+			if(isset(self::$savedData[$path])){
+				return self::$savedData[$path];
+			}else{
+				return array();
+			}
+		}
+	}
+
+	/**
+	 * get all files and folders in a folder
+	 * @param string path
+	 * @param string root (optional)
+	 * @return array
+	 *
+	 * returns an array of assiciative arrays with the following keys:
+	 * - path
+	 * - name
+	 * - size
+	 * - mtime
+	 * - ctime
+	 * - mimetype
+	 * - encrypted
+	 * - versioned
+	 */
+	public static function getFolderContent($path,$root=false,$mimetype_filter=''){
+		if($root===false){
+			$root=OC_Filesystem::getRoot();
+		}
+		$parent=OC_FileCache::getId($path,$root);
+		$query=OC_DB::prepare('SELECT path,name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=? AND (mimetype LIKE ? OR mimetype = ?)');
+		$result=$query->execute(array($parent, $mimetype_filter.'%', 'httpd/unix-directory'))->fetchAll();
+		if(is_array($result)){
+			return $result;
+		}else{
+			OC_Log::write('files','getFolderContent(): file not found in cache ('.$path.')',OC_Log::DEBUG);
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
new file mode 100644
index 0000000000..9e23c6dfe7
--- /dev/null
+++ b/lib/filecache/update.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+/**
+ * handles updating the filecache according to outside changes
+ */
+class OC_FileCache_Update{
+	/**
+	 * check if a file or folder is updated outside owncloud
+	 * @param string path
+	 * @param string root (optional)
+	 * @return bool
+	 */
+	public static function hasUpdated($path,$root=false){
+		if($root===false){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView($root);
+		}
+		if(!$view->file_exists($path)){
+			return false;
+		}
+		$cachedData=OC_FileCache_Cached::get($path,$root);
+		if(isset($cachedData['mtime'])){
+			$cachedMTime=$cachedData['mtime'];
+			return $view->hasUpdated($path,$cachedMTime);
+		}else{//file not in cache, so it has to be updated
+			if(($path=='/' or $path=='') and $root===false){//dont auto update the home folder, it will be scanned
+				return false;
+			}
+			return true;
+		}
+	}
+	
+	/**
+	 * delete non existing files from the cache
+	 */
+	public static function cleanFolder($path,$root=false){
+		if($root===false){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView($root);
+		}
+
+		$cachedContent=OC_FileCache_Cached::getFolderContent($path,$root);
+		foreach($cachedContent as $fileData){
+			$path=$fileData['path'];
+			$file=$view->getRelativePath($path);
+			if(!$view->file_exists($file)){
+				if($root===false){//filesystem hooks are only valid for the default root
+					OC_Hook::emit('OC_Filesystem','post_delete',array('path'=>$file));
+				}else{
+					self::delete($file,$root);
+				}
+			}
+		}
+	}
+
+	/**
+	 * update the cache according to changes in the folder
+	 * @param string path
+	 * @param string root (optional)
+	 */
+	public static function updateFolder($path,$root=false){
+		if($root===false){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView($root);
+		}
+		$dh=$view->opendir($path.'/');
+		if($dh){//check for changed/new files
+			while (($filename = readdir($dh)) !== false) {
+				if($filename != '.' and $filename != '..'){
+					$file=$path.'/'.$filename;
+					if(self::hasUpdated($file,$root)){
+						if($root===false){//filesystem hooks are only valid for the default root
+							OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$file));
+						}else{
+							self::update($file,$root);
+						}
+					}
+				}
+			}
+		}
+
+		self::cleanFolder($path,$root);
+
+		//update the folder last, so we can calculate the size correctly
+		if($root===false){//filesystem hooks are only valid for the default root
+			OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path));
+		}else{
+			self::update($path,$root);
+		}
+	}
+
+	/**
+	 * called when changes are made to files
+	 * @param array $params
+	 * @param string root (optional)
+	 */
+	public static function fileSystemWatcherWrite($params){
+		$path=$params['path'];
+		self::update($path);
+	}
+
+	/**
+	 * called when files are deleted
+	 * @param array $params
+	 * @param string root (optional)
+	 */
+	public static function fileSystemWatcherDelete($params){
+		$path=$params['path'];
+		self::delete($path);
+	}
+
+	/**
+	 * called when files are deleted
+	 * @param array $params
+	 * @param string root (optional)
+	 */
+	public static function fileSystemWatcherRename($params){
+		$oldPath=$params['oldpath'];
+		$newPath=$params['newpath'];
+		self::rename($oldPath,$newPath);
+	}
+
+	/**
+	 * update the filecache according to changes to the fileysystem
+	 * @param string path
+	 * @param string root (optional)
+	 */
+	public static function update($path,$root=false){
+		if($root===false){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView($root);
+		}
+
+		$mimetype=$view->getMimeType($path);
+		
+		$size=0;
+		$cached=OC_FileCache_Cached::get($path,$root);
+		$cachedSize=isset($cached['size'])?$cached['size']:0;
+		
+		if($mimetype=='httpd/unix-directory'){
+			if(OC_FileCache::inCache($path,$root)){
+				$cachedContent=OC_FileCache_Cached::getFolderContent($path,$root);
+				foreach($cachedContent as $file){
+					$size+=$file['size'];
+				}
+				$mtime=$view->filemtime($path);
+				$ctime=$view->filectime($path);
+				$writable=$view->is_writable($path);
+				OC_FileCache::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
+			}else{
+				$count=0;
+				OC_FileCache::scan($path,null,$count,$root);
+				return; //increaseSize is already called inside scan
+			}
+		}else{
+			$size=OC_FileCache::scanFile($path,$root);
+		}
+		OC_FileCache::increaseSize(dirname($path),$size-$cachedSize,$root);
+	}
+
+	/**
+	 * update the filesystem after a delete has been detected
+	 * @param string path
+	 * @param string root (optional)
+	 */
+	public static function delete($path,$root=false){
+		$cached=OC_FileCache_Cached::get($path,$root);
+		if(!isset($cached['size'])){
+			return;
+		}
+		$size=$cached['size'];
+		OC_FileCache::increaseSize(dirname($path),-$size,$root);
+		OC_FileCache::delete($path,$root);
+	}
+
+	/**
+	 * update the filesystem after a rename has been detected
+	 * @param string oldPath
+	 * @param string newPath
+	 * @param string root (optional)
+	 */
+	public static function rename($oldPath,$newPath,$root=false){
+		if(!OC_FileCache::inCache($oldPath,$root)){
+			return;
+		}
+		if($root===false){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView($root);
+		}
+
+		$cached=OC_FileCache_Cached::get($oldPath,$root);
+		$oldSize=$cached['size'];
+		$size=$view->filesize($newPath);
+		OC_FileCache::increaseSize(dirname($oldPath),-$oldSize,$root);
+		OC_FileCache::increaseSize(dirname($newPath),$oldSize,$root);
+		OC_FileCache::move($oldPath,$newPath);
+	}
+}
\ No newline at end of file
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 9e4c2d0643..f061d48219 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -54,8 +54,8 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 * @return int
 	 */
 	private function getFreeSpace(){
-		$rootInfo=OC_FileCache::get('');
-		$usedSpace=$rootInfo['size'];
+		$rootInfo=OC_FileCache_Cached::get('');
+		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
 		$totalSpace=$this->getQuota();
 		if($totalSpace==0){
 			return 0;
diff --git a/lib/files.php b/lib/files.php
index 705b7a6ca6..3ecf08739b 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -36,7 +36,7 @@ class OC_Files {
 		if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){
 			$directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY));
 		}
-		$files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
+		$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
 		foreach($files as &$file){
 			$file['directory']=$directory;
 			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';

From 27efdbd58f284c054ae9150ff2a2b0dcb5fab70f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 17:04:37 +0200
Subject: [PATCH 0430/1537] Use setter for FileinfoCache

---
 lib/connector/sabre/directory.php | 10 ++++------
 lib/connector/sabre/node.php      | 12 +++++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 5aa70392d7..6af4dd3656 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -69,15 +69,13 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		if (!$info) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
 
 		if ($info['mimetype'] == 'httpd/unix-directory') {
-
-			return new OC_Connector_Sabre_Directory($path, $info);
-
+			$node = new OC_Connector_Sabre_Directory($path);
 		} else {
-
-			return new OC_Connector_Sabre_File($path, $info);
-
+			$node = new OC_Connector_Sabre_File($path);
 		}
 
+		$node->setFileinfoCache($info);
+		return $node;
 	}
 
 	/**
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index e5c059f0c8..8a860242f2 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -41,11 +41,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param string $path
 	 * @return void
 	 */
-	public function __construct($path, $fileinfo_cache = null) {
+	public function __construct($path) {
 		$this->path = $path;
-		if ($fileinfo_cache) {
-			$this->fileinfo_cache = $fileinfo_cache;
-		}
 	}
 
 
@@ -85,8 +82,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	}
 
+	public function setFileinfoCache($fileinfo_cache)
+	{
+		$this->fileinfo_cache = $fileinfo_cache;
+	}
+
 	/**
-	 * Set the stat cache
+	 * Make sure the fileinfo cache is filled. Uses OC_FileCache or a direct stat
 	 */
 	protected function getFileinfoCache() {
 		if (!isset($this->fileinfo_cache)) {

From 463a506fcb2ec9c5e219434654ec5c5e0d8f834b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 17:05:10 +0200
Subject: [PATCH 0431/1537] Fix webdav property name compare

---
 lib/connector/sabre/node.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 8a860242f2..7a9d8198ae 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -139,7 +139,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 				}
 			}
 			else {
-				if( strcmp( $propertyName, "lastmodified")) {
+				if( strcmp( $propertyName, "lastmodified") === 0) {
 					$this->touch($propertyValue);
 				} else {
 					if(!array_key_exists( $propertyName, $existing )){

From e905b14758d18c5254ecf2fbe8e867ea96293877 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 17:05:27 +0200
Subject: [PATCH 0432/1537] Spelling fix

---
 lib/filecache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 7c9c4dc41f..32c6929ff6 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -34,7 +34,7 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return array
 	 *
-	 * returns an assiciative array with the following keys:
+	 * returns an associative array with the following keys:
 	 * - size
 	 * - mtime
 	 * - ctime

From e11c5a23d52ba0bfe082f36311a504c72278aa40 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 17:51:56 +0200
Subject: [PATCH 0433/1537] Optimize WebDav access by preloading dav custom
 properties

---
 lib/connector/sabre/directory.php | 22 ++++++++++++++++++++--
 lib/connector/sabre/node.php      | 30 +++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 6af4dd3656..9832449af3 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -85,10 +85,28 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function getChildren() {
 
-		$nodes = array();
 		$folder_content = OC_FileCache::getFolderContent($this->path);
+		$paths = array();
 		foreach($folder_content as $info) {
-			$nodes[] = $this->getChild($info['name'], $info);
+			$paths[] = $this->path.'/'.$info['name'];
+		}
+		$placeholders = join(',', array_fill(0, count($paths), '?'));
+		$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ?' . ' AND propertypath IN ('.$placeholders.')' );
+		array_unshift($paths, OC_User::getUser()); // prepend userid
+		$result = $query->execute( $paths );
+		$properties = array_fill_keys($paths, array());
+		while($row = $result->fetchRow()) {
+			$propertypath = $row['propertypath'];
+			$propertyname = $row['propertyname'];
+			$propertyvalue = $row['propertyvalue'];
+			$properties[$propertypath][$propertyname] = $propertyvalue;
+		}
+
+		$nodes = array();
+		foreach($folder_content as $info) {
+			$node = $this->getChild($info['name'], $info);
+			$node->setPropertyCache($properties[$this->path.'/'.$info['name']]);
+			$nodes[] = $node;
 		}
 		return $nodes;
 	}
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 7a9d8198ae..be315a0ffd 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -30,10 +30,15 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 */
 	protected $path;
 	/**
-	 * file stat cache
+	 * node fileinfo cache
 	 * @var array
 	 */
 	protected $fileinfo_cache;
+	/**
+	 * node properties cache
+	 * @var array
+	 */
+	protected $property_cache = null;
 
 	/**
 	 * Sets up the node, expects a full path name
@@ -101,6 +106,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		}
 	}
 
+	public function setPropertyCache($property_cache)
+	{
+		$this->property_cache = $property_cache;
+	}
+
 	/**
 	 * Returns the last modification time, as a unix timestamp
 	 *
@@ -153,6 +163,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 			}
 
 		}
+		$this->setPropertyCache(null);
 		return true;
 	}
 
@@ -168,23 +179,24 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @return void
 	 */
 	function getProperties($properties) {
-		// At least some magic in here :-)
-		$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ? AND propertypath = ?' );
-		$result = $query->execute( array( OC_User::getUser(), $this->path ));
+		if (is_null($this->property_cache)) {
+			$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ? AND propertypath = ?' );
+			$result = $query->execute( array( OC_User::getUser(), $this->path ));
 
-		$existing = array();
-		while( $row = $result->fetchRow()){
-			$existing[$row['propertyname']] = $row['propertyvalue'];
+			$this->property_cache = array();
+			while( $row = $result->fetchRow()){
+				$this->property_cache[$row['propertyname']] = $row['propertyvalue'];
+			}
 		}
 
 		// if the array was empty, we need to return everything
 		if(count($properties) == 0){
-			return $existing;
+			return $this->property_cache;
 		}
 		
 		$props = array();
 		foreach($properties as $property) {
-			if (isset($existing[$property])) $props[$property] = $existing[$property];
+			if (isset($this->property_cache[$property])) $props[$property] = $this->property_cache[$property];
 		}
 		return $props;
 	}

From cb833e45c230effac2194ae79e48a5d710c4d064 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 21:59:40 +0200
Subject: [PATCH 0434/1537] get rid of php4 style constructors in mdb2

---
 3rdparty/MDB2/Schema/Parser.php   | 27 ---------------------------
 3rdparty/MDB2/Schema/Parser2.php  | 27 ---------------------------
 3rdparty/MDB2/Schema/Validate.php | 22 ----------------------
 3rdparty/MDB2/Schema/Writer.php   | 17 -----------------
 4 files changed, 93 deletions(-)

diff --git a/3rdparty/MDB2/Schema/Parser.php b/3rdparty/MDB2/Schema/Parser.php
index cfd0c37d8a..3c4345661b 100644
--- a/3rdparty/MDB2/Schema/Parser.php
+++ b/3rdparty/MDB2/Schema/Parser.php
@@ -146,33 +146,6 @@ class MDB2_Schema_Parser extends XML_Parser
         );
     }
 
-    /**
-     * PHP 4 compatible constructor
-     *
-     * @param array $variables              mixed array with user defined schema
-     *                                      variables
-     * @param bool  $fail_on_invalid_names  array with reserved words per RDBMS
-     * @param array $structure              multi dimensional array with 
-     *                                      database schema and data
-     * @param array $valid_types            information of all valid fields 
-     *                                      types
-     * @param bool  $force_defaults         if true sets a default value to
-     *                                      field when not explicit
-     * @param int   $max_identifiers_length maximum allowed size for entities 
-     *                                      name
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function MDB2_Schema_Parser($variables, $fail_on_invalid_names = true,
-        $structure = false, $valid_types = array(), $force_defaults = true,
-        $max_identifiers_length = null
-    ) {
-        $this->__construct($variables, $fail_on_invalid_names, $structure, $valid_types, $force_defaults);
-    }
-
     /**
      * Triggered when reading a XML open tag <element>
      *
diff --git a/3rdparty/MDB2/Schema/Parser2.php b/3rdparty/MDB2/Schema/Parser2.php
index b415b4a336..f27dffbabf 100644
--- a/3rdparty/MDB2/Schema/Parser2.php
+++ b/3rdparty/MDB2/Schema/Parser2.php
@@ -143,33 +143,6 @@ class MDB2_Schema_Parser2 extends XML_Unserializer
         parent::XML_Unserializer($this->options);
     }
 
-    /**
-     * PHP 4 compatible constructor
-     *
-     * @param array $variables              mixed array with user defined schema
-     *                                      variables
-     * @param bool  $fail_on_invalid_names  array with reserved words per RDBMS
-     * @param array $structure              multi dimensional array with 
-     *                                      database schema and data
-     * @param array $valid_types            information of all valid fields 
-     *                                      types
-     * @param bool  $force_defaults         if true sets a default value to
-     *                                      field when not explicit
-     * @param int   $max_identifiers_length maximum allowed size for entities 
-     *                                      name
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function MDB2_Schema_Parser2($variables, $fail_on_invalid_names = true,
-        $structure = false, $valid_types = array(), $force_defaults = true,
-        $max_identifiers_length = null
-    ) {
-        $this->__construct($variables, $fail_on_invalid_names, $structure, $valid_types, $force_defaults);
-    }
-
     /**
      * Main method. Parses XML Schema File.
      *
diff --git a/3rdparty/MDB2/Schema/Validate.php b/3rdparty/MDB2/Schema/Validate.php
index 4cff175576..4a8e0d27ba 100644
--- a/3rdparty/MDB2/Schema/Validate.php
+++ b/3rdparty/MDB2/Schema/Validate.php
@@ -108,28 +108,6 @@ class MDB2_Schema_Validate
         $this->max_identifiers_length = $max_identifiers_length;
     }
 
-    /**
-     * PHP 4 compatible constructor
-     *
-     * @param bool  $fail_on_invalid_names  array with reserved words per RDBMS
-     * @param array $valid_types            information of all valid fields 
-     *                                      types
-     * @param bool  $force_defaults         if true sets a default value to
-     *                                      field when not explicit
-     * @param int   $max_identifiers_length maximum allowed size for entities 
-     *                                      name
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function MDB2_Schema_Validate($fail_on_invalid_names = true, $valid_types = array(),
-        $force_defaults = true, $max_identifiers_length = null
-    ) {
-        $this->__construct($fail_on_invalid_names, $valid_types, $force_defaults);
-    }
-
     // }}}
     // {{{ raiseError()
 
diff --git a/3rdparty/MDB2/Schema/Writer.php b/3rdparty/MDB2/Schema/Writer.php
index 70a03168de..96dd2bed0f 100644
--- a/3rdparty/MDB2/Schema/Writer.php
+++ b/3rdparty/MDB2/Schema/Writer.php
@@ -80,23 +80,6 @@ class MDB2_Schema_Writer
     function __construct($valid_types = array())
     {
         $this->valid_types = $valid_types;
-    }
-
-    /**
-     * PHP 4 compatible constructor
-     *
-     * @param array $valid_types information of all valid fields 
-     *                           types
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function MDB2_Schema_Writer($valid_types = array())
-    {
-        $this->__construct($valid_types);
-    }
 
     // }}}
     // {{{ raiseError()

From 19bfe214010e4cc3730d9718def20b88d379fed5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 23:11:33 +0200
Subject: [PATCH 0435/1537] add binary test case for encryption

---
 apps/files_encryption/tests/binary    | Bin 0 -> 9734 bytes
 apps/files_encryption/tests/proxy.php |  40 +++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 apps/files_encryption/tests/binary

diff --git a/apps/files_encryption/tests/binary b/apps/files_encryption/tests/binary
new file mode 100644
index 0000000000000000000000000000000000000000..79bc99479daeb0c85fe2ad89fb9346efb517cf02
GIT binary patch
literal 9734
zcmeIu1wR}P0{~#%ZJ3_!?wZ`xOq=6y(=|Qa-E6u}$6+QXP7Gu69ELf0nC8@9$NN3r
zpXVby`D)gid8Rinqj>64KWJwPdY3WCBQsQs%J{!W{Bda5oJ{((v#@lSYm-)`HuynT
z2=a)8VyrDhz4oQV&3Ae0|M(+q)64a*NU#>lGO0k*b9>{p<`m%*f1!+$K`|S6o~NwG
zawW%Yd|QTz$ah@Ai!M}G`=)pDy<RX{cD-%`CF>S9z}00~;ZJro5byMXHPDHE`_!#?
zCMMb{b-0R7;ITiw=)#PHxZisT_a%2k`9qiN>M0G7>9)GYB^^&1(bg{~DBrJsyzHt)
zE_1RhoY3{9GtsW3QUZ3j*r~$m4@tb%1ag7B8r;0KOuXrf8)_c~99;8%s=zGMT8+#|
zOLnGwMDI0^Ka%lELL+exO;V|<yD4KkQu_GB#7k?)p_W#rvc287gZSt3Dy{L|tn@6b
zx54jb)~6~)(PacXD2mV&KQ;%ki%^9yvqsO^b(#&8nVsnKU(JvX;P9tG0h$vm`3Y$C
zlMMXA#&N-1)GU`n2B&gDPk|G7q*e+}^<d9aaQKL`4Z2`#R*+82&X>s!bb8d9{Rx^z
zwe^I6-M717{!%wf74%RqfcO$ka7U1v@)2X97wykn355e8iPs66S3-)sf`&M;52S13
zEl1y)NxA_wESI0{yH0MPaRpZTAJFfJUy<yIvu*i=XPe)<hHH*xyVVUT)dXEDYo#_Q
z7GU@og5WL7jtJJNq{^60Kp7Wf3aFR_%;zhF+~Uo2_f3aSRiy>o5@jzlA`|d>*_Pk*
z1feyQ0jS9pMw6VvplJWB5ixV}`FezK2U?usz@Xca10$rDP&9d=&#Rm`k60$9o?vOW
zWEKC9(^SU{JDnj-um5CU6)!^lnY`jU25zQ%a9aXG^l1sR6ONnIqU6oVB{KLE1Il8*
zd7cuQz<b{FTR{@iWae^W!q8iFP_#Y!s~`o!pYL0Ay;Kh`$1K$DWPkZ%Ha%uzLJzOP
z>xty!rhgYR{}gc9-qI~7g0#+F97b;u|5;hEzqE>3nDOskLNZ4z#>;}KRdBYqmT&MJ
z0slx}|Lgbe5&B5|#lhavjTDmyJ*_?$t6Fha222n}YDIG}1o(g=Mfn|5#zn`|)O)!o
z*`}z)5Ep=1>doueN`IFc+I6jdnV|H;ch7MKt`$w9Y;YpCpstCwUqb`lZR;%Zy=rp6
z)m-pb!BXzi4`>{o&FVWH;=nPDxI|Xqd(J5M+~P5mpV~+}>fx&PUfWIOBKHVG#s@X7
zYO?kyOO68)pGep8=f^NcGhPCdp&z3hxSb=kH^>KHI5tbve`^gOeMd{spa`ob1Eu3V
znpgy~7Lt5U6_J)BcXUpraFpFKX|SQtJebvTv3MV_^`x@1)6BUX`_7(e$(C<uBwkso
z&VTYj$&Tj97W34RoiF^j9B%|edfr>7jHqsE?l5=t!)4{`3yzUJl&XhyU}RQLq~qpM
zl|E>Qd)385M?jOL`);f}5wb_SHQ>S%^LV(+>H$+bxf}ovS6K|>fRWQGkz_2L^ykHz
zCoMPcn*#$}mSI8fe7J``zq~8A&{x3i2brvPe8}DKF|%JpijPrAr3+M>6G`TiD`~p2
zW&K8W?nt6dxm~!$m~9(O8f_#~1$XD1Ce-l!G}_lqSh4k=n#ogA(4i!{?#*z{`|I~7
z592E2$z3#Be@8e#kN*a8Z?%T`-dpysT<{n5wJGfP?C2)0cz~VNYgYl%=q8}{G8I~%
zRCW)KRyDymfM5mPHG1<mWQ=`ra}{BJJoTU>c;A|*&ky)dl-asq(L40oB^OBJtgW~v
zWvA<^0~WEO9@9?kDl4^6Bj|RR6+ScwAB;CH3Xy82c|}6dQa|##Edwq0*Fq_0_@fwi
zvuV?exKh$`a1-CVp;0$}j5;Q4J5|8lXVJAeZ6ktyEO8;_?J8ANZ}#on4Zu#C0Ua_T
z*@!w9Q&f<NNm`um5prqYTuVyOklc`w&u=7yHHd7PHT7A+Ol<?1+i68nqqWfE#h~<V
zn;8uPmbT`EV`^$@tZ*)q1F)g?IJqrLo1i4$b((RoJvJ`(iOkny>fzA5ILdBA%}>_T
zEw3*!$fpn-rPJJAo_VI@5G_2B1%=j{3PFFc3W2TF%WtZRi9e8~sWODsjAuYS;`h|W
zFUqiFE!Bd+E$L|ral=@A<*H}aQWgAd;k=UZ5T^91F)bMpe4>)M-tOkK(<fyY;?@OS
zVXiC;Z*r_Bm#9sPJ70-TV-KtJw}M5URSr2XXr#H$Q7G-Wu&Xx10M9f2Pr5&?qK=;U
zB~r9LduPh(2Ve|Sb!ao}<C-?{@SS*yd1>E;%Al+Mw@rA~-bFDvasFQb(!>Z6xi&#D
zF;L|C-YT<`34J8U3^7twIXy5GKTKo<qfDo{+){@rjtP46yji~*or?x)s7`_1v6I!l
zg#IZy*n{%Vnr|zY_kc;z)57sthH8M9`J1ptqNY_#R}V`=8Mr#;{-Nm}(SAb|nRl7`
z@r2u?{C4)0yn)&}T=qXa?~<?^?XjKyMUi!5rfea`e)8T9?~G;Mg+K&(>cp?7%67eN
z!jJ4<p(R*7NMi#H15zI<iO%oTbb>|en>tr09M$D&gH#UzBRV1c-L^p+{M}zOQyGfW
zgMlPD+@t;-RuOK2(y<HTzmUlz!k)@Ri3!Wt=nnJeZr=uGZ0SlLCK`n}j&$HM=NArd
zLhX3llGO%STgbNF?DD8NYy=|M)Ycx-u-|KBf6XE(Qp^q|b(Z4kZGXbj^8T&IEM;3R
zJ+bV^L(2NdUkjQmcyVC3H_3^|Y!L22qjP`B<`oE)WBlEm!rGMalA%biH?!{k?|=od
z&h&Jp_KI2_<?0V}sSvJ{pD9>4vcFiy`@5sojlNS;k&~gHnqz6OON%fy)(R+)C(1fA
zp}|~+Q+mkqL0qDt5&0(^v#7*y&_3vWL6qCAI%xQh4j`<$pD7&1n)9a35`|<W@|F0S
z6qr%dtNx2v(Ih)Ncax%5#p#GlIP>q(Eyb-{>KlaBKK;^0W)~Tjs%fb$PH4J%^G~s5
z9m$r<V|&I!tc&S|zhz~?C+C?ceeV7vB63K7Z5oBJ3&#x9@_Mv-thH~odR{opguLnq
zMR|d<{b6XhX#4jn`V@Cho?AyWVm;yJ()$vz*Iuz?D@D#tYmJ*5CNqy)@q30<RaIaJ
z0^g^ONmW*_W)P2Bj6H$n<;k;VDyRMU7GqrRr!?>nKH0O9PX;$*Yj%4jNwH||s^FKZ
zmFL1K&xRQ-FRvsr)u*}3M8)oQK@0zoJ!FVmuL(?hJFSgTmi(352^1W;V<Gn_t+x<Q
z-7XfSI&TK8i%u2s8T*`cO{_C=2ypV?4Q{#ZP+R&+^7`E?c@|x#U+>;5U7&AIY!1aj
z8QfxF$(`q$Evk-7{|))F6QXj8Z);Xwp1~OviCPolcbyPQxE<}oi}qPLJk}jm#zk%Z
zP;8!yw<Btvki|3k`9R2oX{-a}hxW_D^@Pq|_fd|O<$wVlyMLj61a+4hpd13x85>Yo
zMR0MUbTgY~7DJiFl9Vr(M>2M~?l6JJ@^``{1NvEuNDoOyYXe-TR40!)p5k}cA+{CO
z$~5{Dk?Wq*s)XUxtj8K99v;P*>R216Y{;M%HJ(F}g!K_y$9)5O(a)WIP;gJ`E6~-S
zgTBg7)&q0&eB&FHQ_COtW}ePg5a?opp<E-MSn~qfYZ)yOmH7or6fk)A>Om-kX;$iW
z?TfPRz<3Yrd&6l$U+}0v09UU#Q&`EaqeaYUvul#LW~0+d<Y@^IK4kYZQ!(nK{G(;J
z1$-n@A1J>(icqoD19wy>naaiMM|N<zO9+atC@gV$Zj_WHgl@0bSL`b%MRFsxqa!*;
zOY{pZw0~CEwd3lJX9i^%i&1DU)sJ528OXISc^50#3U_@icq{UOYP^9`;h{Uf&)1<(
z))D0Y==$+!brIy=5OMGU5A$;`Z#4K+GVw&=R{Ux-r&T&2p)JB9sDTxsA^QUkPVPEM
z!Qq}ScIvqNGldPUaAh)+3;(ykpaFn4O7rD;M~)p){7Y@h)ai<;$`xA7XW#ip3;l&e
zt9={{<?%r%$<GU%pZT*YmK1Io$!Mnbn^;c<SwL2XD<2E}2B<@c!*()ex6@Om7!ZoI
zBNVbbI1Mk+UDNhGL{)p%P7~O^>#Yuhwhh+B>pSAx$wnJ{Xy(%}+B{n-U0=91nLGdT
zjbZ@Npf$(u$eAM116a8Z<mLhV?Iz*|X(Il(W*a<vkt&0bYXOVD`Zb-nUR-f3=9o$$
z?#mH>8?9OzU$9{=ZWE_CO@8*E)ZsDVM)|_93t<|EJ0Lv~+t0e3h}fWJ7DDSyKSjQC
zD>|Fbk2Re42Fj0CN=e;J#Nnh1lpz-t$am7HN$+jcU|VcDB!Q*4Hjx}Sbt}f}S59-y
zE6_qz7cOkQiA5%^pZvoe9bM-RE1g&UV_Xf;Ak?&hBnAJY9okNL^}+bQyIMjoi1d>o
zqmjOFA1F9p+rA+`d$kU3dFqltXp4|@>*ASqkeM;1(Fz-y$t(Sltfg{7y7K5EX50f<
z_|YxzWaioNA1oQxmOl=udJ>GcU+ndo!A7bA?r$W%`Q5~jO>z%bQO=7cdQ@fUCk(_q
zx?SOXkF+qGY;+ORkFIm58^))*WHs&Ep-X_inT>gf<&_+MLal(uUfCF4H~{=bn|+?F
zt%%U>+iSp~Fw7wJWJj!yOYTZj59fQ91^LPxA~epaNQ)-p^hHaojdpFJaR`ZfFV4T5
z3VkJ!b?z$XpYG0ph+?K1uruwXV7buPWCls!l|Pf+kInw}Q<Qfr^{ZyO+2x71G^;UI
zZ-`q4`J!S|wTrt2Rj}9DJlQBO#=_#PhB_o=^>T3w%}qEl_Z1FyBp|oKLEOJD*z6oe
zf=M$0lzc{@+)zy-;{?HPK^-he&Q9pjEqkfiJ#{fvDv`QZxPCSaPk|xH^IcgYnFx-l
z84CdyD6%?BPO&enNS|N8hAx*_!ZfJ1RMV#Rdju*|8iOnNKk-d>Nzt?Zk%U0%=_nNF
zMWwkr&6nnmt45jWcL7Ys^kevfY@zSPx^KPL1i}{Vc?K6BXy_dEtK<HO&+;BdFt_QD
zW%avTL@IyIu_UHt`hYsuY^=nc^xh?x8?9I`<|m(-H3%lg36t*t>5~5V;Dsr-U~gkt
z>;$g(&Juc*VQ8N4a&OKv5&i3K1e<*1&ThKqeFnIL6k#6XR59UPnj?Fy1UdanNy5h0
zz`4J7pp-5=?I`F?znSr#3m#NFn%0totjutPW!|x6YOikjuJ2=P7P<IA&P+J&rkb2q
zz`ToT3|;o~KJnpj4w~7SOEKU%^R8YXopykHMspDEUcI4=yIc7Y)k8U3(^xx*xJZm6
zFvK2OO(NM4GP|<L=yl$5kP@lz8na%lTLC>;Hdw;P9*?&U+r|!JH6}R_Bg!mchZmzW
z69Q}ceBg`Y2X+;P&Sw<XFABxxM++0x=poJ^OSwH@f?Xh*w|lvQ=};GhaNS1lSWwRz
z)4ZVL7Ii2Q61AI~E$jbOz-A}3!x(!$hpCNN59o~!H0^@ky4mw&(*hsb)-w*|XVD%F
ztbJR&R==X?*;8wfYdTLAoH%i+FKA_V!mAfjOHE|Z#P#gyBe0KE@Nz#>B&iEjP5AbD
z<Lp>rM@`Nn1&ip)T-$gK5Qh9EK3Y#yH`pxZ0FI@9bs;0%C!e|A-<CXK(9gbQ7KhGs
zh>cV)O}_QrV23$8NcD-9w@UxG`w9e3aB~*G)QgW$`>)2eZ5*nVE28xW16}?Jkuh@T
z)?az{!rxY#0o`Tw{0F=W94Li!>w1n*DKQQZoOcG;eSV8>UF{+;b=bN6&;#pInD$h%
z+@_f-v3T6H`n9gt5GJ6l>&_$}5C+fQHJ{8FdqYXaQ)?9Powq^%?OsoB-MZJG-ZGjy
zgUvJqK!ja{DNttd7sn0PtB*&@PJ80h5SKg2llnTcMs86rUNtTFX5}kI*%{6ZW*N8p
ztXpizZt(PrLl)s05Cz>S-Q2fJWku(-NSXWNIun8oqIW73vc4FkLIH^aaF(CSal}_r
zEg=4M{ysuk(?mgbWsG$H@JeMN*Z43BHQ`uRfW&Tlo39^85;_dJrLYQodxK<-Qk-3m
z2vW;UsBozbIqS3;&UE0kRmW#%SX?5WJ58p8XBjG`z~glX)pnKS8`r+(`B1Ch!&9J5
zL?&g|qawl@b-GGF<?mg@u7-im${-tOd?0;d9N@ff$Gz;esBZZ*@XShVN5j#fuJDDr
z$c$fWoqt`tGo#rm!<%E{QT4IGR~Pc1!W{n;3d6}dEGO0wK4WH<fJbVo7zvL><sZhJ
zt9XBb%wnol#t(w2M6o<2rf@X8$@8QfUL4D8k2!avS<&28HjQZ@ev45<$o)6LTnn#P
zZ}^*h7LlL4&uX`$I<ewKmw9gMxAv1Xe{=iIFH+0bnfxhm%GHT&3o*hyvJsF{+6?2I
zsq}mqebS{cpE3>B-7B5t`aqYDb!bN6)doJUnmpO~l62S=VrAbuDE`J%hnm3q`1Qd=
zmZ|4}Bm7t=^wcZgD=9CuV$5kHkXinY<4@ZY>7GPVSgzx=RH>6&lirl;gg^a+%HF35
zRs+>5PosObPXAopV=r8wI*zbGTB!TknW`}&j2n0`f`z%@jla_3SY&5Bj#Y~WYYdOF
z_!lHX)GB6RU$z~WCa1=O*T~#AI#1>2_+7cH%HnYyf0Q!g+Rhiygz!Yhh@Uo9V2VbV
zq3Jj$S$i==XOEXpj3`J$VCZLpAJO^Io;?pd4?GV%4?GV%4?GV%4?GV%4?GV%4?GV%
T4?GV%5By&bh=_`bOA!1IE57#c

literal 0
HcmV?d00001

diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index f36b219343..5616e2091a 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -7,8 +7,13 @@
  */
 
 class Test_CryptProxy extends UnitTestCase {
+	private $oldConfig;
 	
 	public function setUp(){
+		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
+		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+	
+		
 		//set testing key
 		$_SESSION['enckey']=md5(time());
 	
@@ -29,10 +34,11 @@ class Test_CryptProxy extends UnitTestCase {
 		$rootView->mkdir('/'.OC_User::getUser().'/files');
 	}
 
+	public function tearDown(){
+		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
+	}
+
 	public function testSimple(){
-		$oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
-		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
-	
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$original=file_get_contents($file);
 
@@ -46,16 +52,42 @@ class Test_CryptProxy extends UnitTestCase {
 		$this->assertNotEqual($original,$stored);
 		$this->assertEqual($original,$fromFile);
 
+	}
+
+	public function testView(){
+		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+		$original=file_get_contents($file);
+
 		$rootView=new OC_FilesystemView('');
 		$view=new OC_FilesystemView('/'.OC_User::getUser());
 		$userDir='/'.OC_User::getUser().'/files';
 
+		$rootView->file_put_contents($userDir.'/file',$original);
+
+		OC_FileProxy::$enabled=false;
+		$stored=$rootView->file_get_contents($userDir.'/file');
+		OC_FileProxy::$enabled=true;
+
+		$this->assertNotEqual($original,$stored);
 		$fromFile=$rootView->file_get_contents($userDir.'/file');
 		$this->assertEqual($original,$fromFile);
 
 		$fromFile=$view->file_get_contents('files/file');
 		$this->assertEqual($original,$fromFile);
+	}
 
-		OCP\Config::setAppValue('files_encryption','enable_encryption',$oldConfig);
+	public function testBinary(){
+		$file=__DIR__.'/binary';
+		$original=file_get_contents($file);
+
+		OC_Filesystem::file_put_contents('/file',$original);
+
+		OC_FileProxy::$enabled=false;
+		$stored=OC_Filesystem::file_get_contents('/file');
+		OC_FileProxy::$enabled=true;
+
+		$fromFile=OC_Filesystem::file_get_contents('/file');
+		$this->assertNotEqual($original,$stored);
+		$this->assertEqual($original,$fromFile);
 	}
 }

From 03951ccc6b4d710e2e21d4344842a7c310453871 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 23:11:55 +0200
Subject: [PATCH 0436/1537] fix encryption proxy for updated filecache

---
 apps/files_encryption/lib/proxy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ad9bcf55f2..b9e719448a 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -67,7 +67,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		if(self::shouldEncrypt($path)){
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
 				$data=OC_Crypt::blockEncrypt($data);
-				OC_FileCache::put($path,array('encrypted'=>true));
+				OC_FileCache::put($path,array('encrypted'=>true),'');
 			}
 		}
 	}

From 6d3ae575b6ed9934e37a884ea152008a29cbfc7b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 22:35:09 +0200
Subject: [PATCH 0437/1537] Remove $DOCUMENTROOT, not used

---
 apps/user_webfinger/webfinger.php | 7 -------
 lib/base.php                      | 6 +-----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index e75c546c2c..39ab4ba6ba 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -17,13 +17,6 @@ header("Content-Type: application/xrd+json");
  *
  '* but can also use complex database queries to generate the webfinger result
  **/
-// calculate the documentroot
-// modified version of the one in lib/base.php that takes the .well-known symlink into account
-/*$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
-$SERVERROOT=str_replace("\\",'/',dirname(dirname(dirname(dirname(__FILE__)))));
-$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
-$WEBROOT=substr($SUBURI,0,-34);
-*/
 
 $userName = '';
 $hostName = '';
diff --git a/lib/base.php b/lib/base.php
index f85710ddfc..fedc123885 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -121,8 +121,7 @@ class OC{
 	}
 
 	public static function initPaths(){
-		// calculate the documentroot
-		$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
+		// calculate the root directories
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
 		OC::$SUBURI= str_replace("\\","/",substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT)));
 		$scriptName=$_SERVER["SCRIPT_NAME"];
@@ -137,9 +136,6 @@ class OC{
 			}
 		}
                 OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
-		// try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody
-//		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT));
-
 
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
 			OC::$WEBROOT='/'.OC::$WEBROOT;

From 4268fe61bad04a873a8f161937128dbae1eae741 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 16 Jun 2012 00:44:23 +0200
Subject: [PATCH 0438/1537] Calendar: Write-close session to enable parallel
 events.php requests

---
 apps/calendar/ajax/events.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 3f29f1e5ef..39130a6a98 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -11,6 +11,7 @@ require_once('when/When.php');
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+session_write_close();
 
 // Look for the calendar id
 $calendar_id = null;

From e37ef6dd473eaedcdf2814445ae12fb39786d585 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 15 Jun 2012 23:14:40 +0000
Subject: [PATCH 0439/1537] Move user import to personal settings. Fix user
 migration between servers.

---
 apps/user_migrate/admin.php              | 87 ------------------------
 apps/user_migrate/settings.php           | 66 +++++++++++++++++-
 apps/user_migrate/templates/admin.php    | 13 ----
 apps/user_migrate/templates/settings.php | 13 ++++
 lib/migrate.php                          | 40 ++++-------
 5 files changed, 90 insertions(+), 129 deletions(-)
 delete mode 100644 apps/user_migrate/admin.php
 delete mode 100644 apps/user_migrate/templates/admin.php

diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
deleted file mode 100644
index df8bff01c8..0000000000
--- a/apps/user_migrate/admin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * ownCloud - user_migrate
- *
- * @author Tom Needham
- * @copyright 2012 Tom Needham tom@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/>.
- *
- */
-OCP\User::checkAdminUser();
-OCP\App::checkAppEnabled('user_migrate');
-
-// Import?
-if (isset($_POST['user_import'])) {
-	
-	$root = OC::$SERVERROOT . "/";
-	$importname = "owncloud_import_" . date("y-m-d_H-i-s");
-	
-	// Save data dir for later
-	$datadir = OCP\Config::getSystemValue( 'datadirectory' );
-	
-	// Copy the uploaded file
-	$from = $_FILES['owncloud_import']['tmp_name'];
-	$to = get_temp_dir().'/'.$importname.'.zip';
-	if( !move_uploaded_file( $from, $to ) ){
-		$error = array('error'=>'Failed to move the uploaded file','hint'=>'Try checking the permissions of the '.get_temp_dir().' dir.');
-		OCP\Util::writeLog( 'user_migrate', "Failed to copy the uploaded file", OCP\Util::ERROR );
-		$tmpl = new OCP\Template('user_migrate', 'admin');
-		$tmpl->assign('error',$error);
-    	return $tmpl->fetchPage();
-	}
-	$response = json_decode( OC_Migrate::import( $to, 'user' ) );
-	if( !$response->success ){
-		$error = array('error'=>'There was an error while importing the user!','hint'=>'Please check the logs for a more detailed explaination');
-		$tmpl = new OCP\Template('user_migrate', 'admin');
-		$tmpl->assign('error',$error);
-    	return $tmpl->fetchPage();	
-	} else {
-		// Check import status
-		foreach( $response->data as $app => $status ){
-			if( $status != 'true' ){
-				// It failed for some reason
-				if( $status == 'notsupported' ){
-					$notsupported[] = $app;	
-				} else if( !$status ){
-					$failed[] = $app;
-				}
-			}	
-		}
-		// Any problems?
-		if( isset( $notsupported ) || isset( $failed ) ){
-			if( count( $failed ) > 0 ){
-				$error = array('error'=>'Some app data failed to import','hint'=>'App data for: '.implode(', ', $failed).' failed to import.');
-				$tmpl = new OCP\Template('user_migrate', 'admin');
-				$tmpl->assign('error',$error);
-    			return $tmpl->fetchPage();	
-			} else if( count( $notsupported ) > 0 ){
-				$error = array('error'=>'Some app data could not be imported, as the apps are not installed on this instance','hint'=>'App data for: '.implode(', ', $notsupported).' failed to import as they were not found. Please install the apps and try again');
-				$tmpl = new OCP\Template('user_migrate', 'admin');
-				$tmpl->assign('error',$error);
-    			return $tmpl->fetchPage();	
-			}
-		} else {
-			// Went swimmingly!
-			$tmpl = new OCP\Template('user_migrate', 'admin');
-    		return $tmpl->fetchPage();	
-		}
-	}
-		
-} else {
-// fill template
-    $tmpl = new OCP\Template('user_migrate', 'admin');
-    return $tmpl->fetchPage();
-}
diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
index 8edd035338..098927fa17 100644
--- a/apps/user_migrate/settings.php
+++ b/apps/user_migrate/settings.php
@@ -23,7 +23,67 @@
  *
  */
 OCP\App::checkAppEnabled('user_migrate');
+if (isset($_POST['user_import'])) {
+	$root = OC::$SERVERROOT . "/";
+	$importname = "owncloud_import_" . date("y-m-d_H-i-s");
+	
+	// Save data dir for later
+	$datadir = OCP\Config::getSystemValue( 'datadirectory' );
+	
+	// Copy the uploaded file
+	$from = $_FILES['owncloud_import']['tmp_name'];
+	$to = get_temp_dir().'/'.$importname.'.zip';
+	if( !move_uploaded_file( $from, $to ) ){
 
-// fill template
-$tmpl = new OCP\Template('user_migrate', 'settings');
-return $tmpl->fetchPage();
\ No newline at end of file
+		$error = array('error'=>'Failed to move the uploaded file','hint'=>'Try checking the permissions of the '.get_temp_dir().' dir.');
+		OCP\Util::writeLog( 'user_migrate', "Failed to copy the uploaded file", OCP\Util::ERROR );
+		$tmpl = new OCP\Template('user_migrate', 'settings');
+		$tmpl->assign('error',$error);
+    	//return $tmpl->fetchPage();
+	}
+		
+
+	$response = json_decode( OC_Migrate::import( $to, 'user' ) );
+	if( !$response->success ){
+		$error = array('error'=>'There was an error while importing the user!','hint'=>'Please check the logs for a more detailed explaination');
+		$tmpl = new OCP\Template('user_migrate', 'settings');
+		$tmpl->assign('error',$error);
+    	//return $tmpl->fetchPage();	
+	} else {
+		// Check import status
+		foreach( $response->data as $app => $status ){
+			if( $status != 'true' ){
+				// It failed for some reason
+				if( $status == 'notsupported' ){
+					$notsupported[] = $app;	
+				} else if( !$status ){
+					$failed[] = $app;
+				}
+			}	
+		}
+		// Any problems?
+		if( isset( $notsupported ) || isset( $failed ) ){
+			if( count( $failed ) > 0 ){
+				$error = array('error'=>'Some app data failed to import','hint'=>'App data for: '.implode(', ', $failed).' failed to import.');
+				$tmpl = new OCP\Template('user_migrate', 'settings');
+				$tmpl->assign('error',$error);
+    			//return $tmpl->fetchPage();	
+			} else if( count( $notsupported ) > 0 ){
+				$error = array('error'=>'Some app data could not be imported, as the apps are not installed on this instance','hint'=>'App data for: '.implode(', ', $notsupported).' failed to import as they were not found. Please install the apps and try again');
+				$tmpl = new OCP\Template('user_migrate', 'settings');
+				$tmpl->assign('error',$error);
+    			//return $tmpl->fetchPage();	
+			}
+		} else {
+			// Went swimmingly!
+			$tmpl = new OCP\Template('user_migrate', 'settings');
+    		//return $tmpl->fetchPage();	
+		}
+
+	}
+		
+} else {
+	// fill template
+	$tmpl = new OCP\Template('user_migrate', 'settings');
+	return $tmpl->fetchPage();
+}
\ No newline at end of file
diff --git a/apps/user_migrate/templates/admin.php b/apps/user_migrate/templates/admin.php
deleted file mode 100644
index ff51f43ffd..0000000000
--- a/apps/user_migrate/templates/admin.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<form id="import" action="#" method="post" enctype="multipart/form-data">
-    <fieldset class="personalblock">
-		<?php if(isset($_['error'])){ ?>
-		<h3><?php echo $_['error']['error']; ?></h3>
-		<p><?php echo $_['error']['hint']; ?></p>
-		<?php } ?>
-        <legend><strong><?php echo $l->t('Import user account');?></strong></legend>
-        </p>
-        <p><input type="file" id="owncloud_import" name="owncloud_import" style="width:180px;"><label for="owncloud_import"> <?php echo $l->t('ownCloud User Zip');?></label>
-        </p>
-        <input type="submit" name="user_import" value="<?php echo $l->t('Import'); ?>" />
-    </fieldset>
-</form>
diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
index 8f1fe41df0..1718abe9e0 100644
--- a/apps/user_migrate/templates/settings.php
+++ b/apps/user_migrate/templates/settings.php
@@ -4,3 +4,16 @@
 	</p>
 	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
 </fieldset>
+<form id="import" action="#" method="post" enctype="multipart/form-data">
+    <fieldset class="personalblock">
+		<?php if(isset($_['error'])){ ?>
+		<h3><?php echo $_['error']['error']; ?></h3>
+		<p><?php echo $_['error']['hint']; ?></p>
+		<?php } ?>
+        <legend><strong><?php echo $l->t('Import user account');?></strong></legend>
+        </p>
+        <p><input type="file" id="owncloud_import" name="owncloud_import" style="width:180px;"><label for="owncloud_import"> <?php echo $l->t('ownCloud User Zip');?></label>
+        </p>
+        <input type="submit" name="user_import" value="<?php echo $l->t('Import'); ?>" />
+    </fieldset>
+</form>
diff --git a/lib/migrate.php b/lib/migrate.php
index f9cab915d0..5939ba32e5 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -196,7 +196,7 @@ class OC_Migrate{
 	* @param optional $uid userid of new user
 	*/
 	public static function import( $path, $type='user', $uid=null ){
-		OC_Util::checkAdminUser();
+		
 		$datadir = OC_Config::getValue( 'datadirectory' );
 		// Extract the zip
 		if( !$extractpath = self::extractZip( $path ) ){
@@ -216,12 +216,19 @@ class OC_Migrate{
 		}
 		self::$exporttype = $type;
 
+		$currentuser = OC_User::getUser();
+
 		// Have we got a user if type is user
 		if( self::$exporttype == 'user' ){
-			if( !$uid ){
-				self::$uid = $json->exporteduser;
-			} else {
-				self::$uid = $uid;
+			self::$uid = !is_null($uid) ? $uid : $currentuser;
+		}
+		
+		// We need to be an admin if we are not importing our own data
+		if(($type == 'user' && self::$uid != $currentuser) || $type != 'user' ){
+			if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+				// Naughty.
+				OC_Log::write( 'migration', 'Import not permitted.', OC_Log::ERROR );
+				return json_encode( array( 'success' => false ) ); 	
 			}
 		}
 
@@ -229,27 +236,8 @@ class OC_Migrate{
 		switch( self::$exporttype ){
 			case 'user':
 				// Check user availability
-				if( OC_User::userExists( self::$uid ) ){
-					OC_Log::write( 'migration', 'User already exists', OC_Log::ERROR );
-					return json_encode( array( 'success' => false ) );
-				}
-				$run = true;
-				OC_Hook::emit( "OC_User", "pre_createUser", array( "run" => &$run, "uid" => self::$uid, "password" => $json->hash ));
-				if( !$run ){
-					// Something stopped the user creation
-					OC_Log::write( 'migration', 'User creation failed', OC_Log::ERROR );
-					return json_encode( array( 'success' => false ) );
-				}
-				// Create the user
-				if( !self::createUser( self::$uid, $json->hash ) ){
-					return json_encode( array( 'success' => false ) );
-				}
-				// Emit the post_createUser hook (password is already hashed, will cause problems
-				OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => self::$uid, "password" => $json->hash ));
-				// Make the new users data dir
-				$path = $datadir . '/' . self::$uid;
-				if( !mkdir( $path, 0755, true ) ){
-					OC_Log::write( 'migration', 'Failed to create users data dir: '.$path, OC_Log::ERROR );
+				if( !OC_User::userExists( self::$uid ) ){
+					OC_Log::write( 'migration', 'User doesn\'t exist', OC_Log::ERROR );
 					return json_encode( array( 'success' => false ) );
 				}
 				// Copy data

From 195c37f88a803055c92fd38f33a4eb7a1440e5ab Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 23:48:39 +0200
Subject: [PATCH 0440/1537] fix for encryption binary files

---
 apps/files_encryption/lib/crypt.php        | 37 ++++++++++++----------
 apps/files_encryption/lib/cryptstream.php  |  4 ++-
 apps/files_encryption/tests/encryption.php | 19 +++++++++++
 apps/files_encryption/tests/stream.php     | 17 +++++++++-
 4 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index d2b8ad145a..4c0ffa978e 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -43,22 +43,22 @@ class OC_Crypt {
 		self::init($params['uid'],$params['password']);
 	}
 
-       public static function init($login,$password) {      
-          $view1=new OC_FilesystemView('/');
-          if(!$view1->file_exists('/'.$login)){
-             $view1->mkdir('/'.$login);
-          }
+	public static function init($login,$password) {
+		$view1=new OC_FilesystemView('/');
+		if(!$view1->file_exists('/'.$login)){
+			$view1->mkdir('/'.$login);
+		}
 
-          $view=new OC_FilesystemView('/'.$login);      
-          
-          OC_FileProxy::$enabled=false;
-          if(!$view->file_exists('/encryption.key')){// does key exist?
-             OC_Crypt::createkey($login,$password);
-          }
-          $key=$view->file_get_contents('/encryption.key');
-          OC_FileProxy::$enabled=true;
-          $_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
-       }
+		$view=new OC_FilesystemView('/'.$login);
+
+		OC_FileProxy::$enabled=false;
+		if(!$view->file_exists('/encryption.key')){// does key exist?
+			OC_Crypt::createkey($login,$password);
+		}
+		$key=$view->file_get_contents('/encryption.key');
+		OC_FileProxy::$enabled=true;
+		$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
+	}
 
 
 	/**
@@ -140,7 +140,7 @@ class OC_Crypt {
 	public static function decrypt( $content, $key='') {
 		$bf = self::getBlowfish($key);
 		$data=$bf->decrypt($content);
-		return rtrim($data, "\0");
+		return $data;
 	}
 
 	/**
@@ -181,6 +181,9 @@ class OC_Crypt {
 			while (!feof($handleread)) {
 				$content = fread($handleread, 8192);
 				$enccontent=OC_CRYPT::decrypt( $content, $key);
+				if(feof($handleread)){
+					$enccontent=rtrim($enccontent, "\0");
+				}
 				fwrite($handlewrite, $enccontent);
 			}
 			fclose($handlewrite);
@@ -209,6 +212,6 @@ class OC_Crypt {
 			$result.=self::decrypt(substr($data,0,8192),$key);
 			$data=substr($data,8192);
 		}
-		return $result;
+		return rtrim($result, "\0");
 	}
 }
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index a698ee0033..56331cbf60 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -47,7 +47,6 @@ class OC_CryptStream{
 			$this->path=self::$sourceStreams[basename($path)]['path'];
 		}else{
 			$this->path=$path;
-			OCP\Util::writeLog('files_encryption','open encrypted '.$path. ' in '.$mode,OCP\Util::DEBUG);
 			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
 			$this->source=self::$rootView->fopen($path,$mode);
 			OC_FileProxy::$enabled=true;
@@ -84,6 +83,9 @@ class OC_CryptStream{
 		}else{
 			$result='';
 		}
+		if($this->stream_eof()){
+			$result=rtrim($result, "\0");
+		}
 		return $result;
 	}
 	
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index cf24a225d2..70aa1daf4c 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -13,6 +13,7 @@ class Test_Encryption extends UnitTestCase {
 		$source=file_get_contents($file); //nice large text file
 		$encrypted=OC_Crypt::encrypt($source,$key);
 		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=rtrim($decrypted, "\0");
 		$this->assertNotEqual($encrypted,$source);
 		$this->assertEqual($decrypted,$source);
 
@@ -20,6 +21,7 @@ class Test_Encryption extends UnitTestCase {
 		$encrypted=OC_Crypt::encrypt($chunk,$key);
 		$this->assertEqual(strlen($chunk),strlen($encrypted));
 		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=rtrim($decrypted, "\0");
 		$this->assertEqual($decrypted,$chunk);
 		
 		$encrypted=OC_Crypt::blockEncrypt($source,$key);
@@ -43,6 +45,7 @@ class Test_Encryption extends UnitTestCase {
 		$source=file_get_contents($file); //binary file
 		$encrypted=OC_Crypt::encrypt($source,$key);
 		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=rtrim($decrypted, "\0");
 		$this->assertEqual($decrypted,$source);
 
 		$encrypted=OC_Crypt::blockEncrypt($source,$key);
@@ -50,4 +53,20 @@ class Test_Encryption extends UnitTestCase {
 		$this->assertEqual($decrypted,$source);
 
 	}
+
+	function testBinary(){
+		$key=uniqid();
+	
+		$file=__DIR__.'/binary';
+		$source=file_get_contents($file); //binary file
+		$encrypted=OC_Crypt::encrypt($source,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+
+		$decrypted=rtrim($decrypted, "\0");
+		$this->assertEqual($decrypted,$source);
+
+		$encrypted=OC_Crypt::blockEncrypt($source,$key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
+		$this->assertEqual($decrypted,$source);
+	}
 }
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index b23805d60b..4ffeb6210a 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -50,7 +50,22 @@ class Test_CryptStream extends UnitTestCase {
 			$file=$this->tmpFiles[$id];
 		}
 		$stream=fopen($file,$mode);
-		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy','stream'=>$stream);
+		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream);
 		return fopen('crypt://streams/'.$id,$mode);
 	}
+
+	function testBinary(){
+		$file=__DIR__.'/binary';
+		$source=file_get_contents($file);
+
+		$stream=$this->getStream('test','w');
+		fwrite($stream,$source);
+		fclose($stream);
+
+		$stream=$this->getStream('test','r');
+		$data=stream_get_contents($stream);
+		fclose($stream);
+		$this->assertEqual(strlen($data),strlen($source));
+		$this->assertEqual($source,$data);
+	}
 }

From bf2062b09d6c3a3d1c8b94b3612b6bb940aa5b79 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 16 Jun 2012 01:35:39 +0200
Subject: [PATCH 0441/1537] write_close the session when scanning files or
 music

---
 apps/files/ajax/scan.php | 1 +
 apps/media/ajax/api.php  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index d695ce8161..6fcf97688c 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -10,6 +10,7 @@ if(!$checkOnly){
 	$eventSource=new OC_EventSource();
 }
 
+session_write_close();
 
 //create the file cache if necesary
 if($force or !OC_FileCache::inCache('')){
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index a229c17e80..23abc57927 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -46,6 +46,9 @@ if(!isset($arguments['album'])){
 if(!isset($arguments['search'])){
 	$arguments['search']='';
 }
+
+session_write_close();
+
 OC_MEDIA_COLLECTION::$uid=OCP\USER::getUser();
 if($arguments['action']){
 	switch($arguments['action']){

From b6375e7a8c4dd8dd2d03bd1e66b9eb1810b15443 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 16 Jun 2012 09:40:03 +0200
Subject: [PATCH 0442/1537] remove a closing php tag in calendar

---
 apps/calendar/ajax/changeview.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index 0099fd5ec2..47e690f329 100644
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -18,5 +18,4 @@ switch($view){
 		exit;
 }
 OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'currentview', $view);
-OCP\JSON::success();
-?>
+OCP\JSON::success();
\ No newline at end of file

From 31ec93bd00db6f5419496989eb68322c46fb4527 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 16 Jun 2012 09:45:17 +0200
Subject: [PATCH 0443/1537] remove a lot of closing php tags and empty lines at
 a file's end in calendar app

---
 apps/calendar/ajax/calendar/activation.php    | 2 +-
 apps/calendar/ajax/calendar/delete.php        | 3 +--
 apps/calendar/ajax/calendar/edit.form.php     | 3 +--
 apps/calendar/ajax/calendar/edit.php          | 3 +--
 apps/calendar/ajax/calendar/new.form.php      | 3 +--
 apps/calendar/ajax/calendar/new.php           | 2 +-
 apps/calendar/ajax/calendar/overview.php      | 3 +--
 apps/calendar/ajax/calendar/update.php        | 2 +-
 apps/calendar/ajax/categories/rescan.php      | 2 +-
 apps/calendar/ajax/event/delete.php           | 2 +-
 apps/calendar/ajax/event/edit.form.php        | 2 +-
 apps/calendar/ajax/event/edit.php             | 3 +--
 apps/calendar/ajax/event/move.php             | 2 +-
 apps/calendar/ajax/event/new.form.php         | 2 +-
 apps/calendar/ajax/event/new.php              | 3 +--
 apps/calendar/ajax/event/resize.php           | 2 +-
 apps/calendar/ajax/import/dialog.php          | 3 +--
 apps/calendar/ajax/import/dropimport.php      | 3 +--
 apps/calendar/ajax/import/import.php          | 2 +-
 apps/calendar/ajax/settings/getfirstday.php   | 3 +--
 apps/calendar/ajax/settings/guesstimezone.php | 3 +--
 apps/calendar/ajax/settings/setfirstday.php   | 4 +---
 apps/calendar/ajax/settings/settimeformat.php | 4 +---
 apps/calendar/ajax/settings/settimezone.php   | 4 +---
 apps/calendar/ajax/settings/timeformat.php    | 3 +--
 25 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
index 380db6a943..e31908beb1 100644
--- a/apps/calendar/ajax/calendar/activation.php
+++ b/apps/calendar/ajax/calendar/activation.php
@@ -20,4 +20,4 @@ $calendar = OC_Calendar_App::getCalendar($calendarid);
 OCP\JSON::success(array(
 	'active' => $calendar['active'],
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php
index 9e092f2df1..4d6706f600 100644
--- a/apps/calendar/ajax/calendar/delete.php
+++ b/apps/calendar/ajax/calendar/delete.php
@@ -21,5 +21,4 @@ if($del == true){
 	OCP\JSON::success();
 }else{
 	OCP\JSON::error(array('error'=>'dberror'));
-}
-?> 
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php
index 036ed12bb7..3916c52763 100644
--- a/apps/calendar/ajax/calendar/edit.form.php
+++ b/apps/calendar/ajax/calendar/edit.form.php
@@ -16,5 +16,4 @@ $tmpl = new OCP\Template("calendar", "part.editcalendar");
 $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php
index 516c9f6c76..82f18fe7f4 100644
--- a/apps/calendar/ajax/calendar/edit.php
+++ b/apps/calendar/ajax/calendar/edit.php
@@ -20,5 +20,4 @@ $tmpl = new OCP\Template("calendar", "part.editcalendar");
 $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php
index ee46757f56..0783b6168f 100644
--- a/apps/calendar/ajax/calendar/new.form.php
+++ b/apps/calendar/ajax/calendar/new.form.php
@@ -19,5 +19,4 @@ $tmpl = new OCP\Template('calendar', 'part.editcalendar');
 $tmpl->assign('new', true);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
index 76dbef6b9d..278c8e5520 100644
--- a/apps/calendar/ajax/calendar/new.php
+++ b/apps/calendar/ajax/calendar/new.php
@@ -34,4 +34,4 @@ $tmpl->assign('calendar', $calendar);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
index 9631253750..9d43364ffb 100644
--- a/apps/calendar/ajax/calendar/overview.php
+++ b/apps/calendar/ajax/calendar/overview.php
@@ -11,5 +11,4 @@ $l10n = OC_L10N::get('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 $output = new OCP\Template("calendar", "part.choosecalendar");
-$output -> printpage();
-?>
+$output -> printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
index dce0027304..5cf63d396f 100644
--- a/apps/calendar/ajax/calendar/update.php
+++ b/apps/calendar/ajax/calendar/update.php
@@ -39,4 +39,4 @@ $tmpl->assign('calendar', $calendar);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));
\ No newline at end of file
diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php
index 93e8c50954..f0060cb23b 100644
--- a/apps/calendar/ajax/categories/rescan.php
+++ b/apps/calendar/ajax/categories/rescan.php
@@ -39,4 +39,4 @@ if(count($events) == 0) {
 OC_Calendar_App::scanCategories($events);
 $categories = OC_Calendar_App::getCategoryOptions();
 
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
+OCP\JSON::success(array('data' => array('categories'=>$categories)));
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
index cb30621af4..f183d431af 100644
--- a/apps/calendar/ajax/event/delete.php
+++ b/apps/calendar/ajax/event/delete.php
@@ -17,4 +17,4 @@ if($access != 'owner' && $access != 'rw'){
 	exit;
 }
 $result = OC_Calendar_Object::delete($id);
-OCP\JSON::success();
+OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
index dbb78edb79..6e5709a18d 100644
--- a/apps/calendar/ajax/event/edit.form.php
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -261,4 +261,4 @@ if($repeat['repeat'] != 'doesnotrepeat'){
 	$tmpl->assign('repeat_date', '');
 	$tmpl->assign('repeat_year', 'bydate');
 }
-$tmpl->printpage();
+$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
index e615fb093d..1c3babc3d9 100644
--- a/apps/calendar/ajax/event/edit.php
+++ b/apps/calendar/ajax/event/edit.php
@@ -42,5 +42,4 @@ if($errarr){
 		OC_Calendar_Object::moveToCalendar($id, $cal);
 	}
 	OCP\JSON::success();
-}
-?>
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php
index 8added6914..04cf2fb051 100644
--- a/apps/calendar/ajax/event/move.php
+++ b/apps/calendar/ajax/event/move.php
@@ -43,4 +43,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
 
 $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
 $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
+OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
index 91b85fff07..0b19e7e92f 100644
--- a/apps/calendar/ajax/event/new.form.php
+++ b/apps/calendar/ajax/event/new.form.php
@@ -72,4 +72,4 @@ $tmpl->assign('repeat_count', '10');
 $tmpl->assign('repeat_weekofmonth', 'auto');
 $tmpl->assign('repeat_date', '');
 $tmpl->assign('repeat_year', 'bydate');
-$tmpl->printpage();
+$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
index 72d57be03b..30e2b0cae3 100644
--- a/apps/calendar/ajax/event/new.php
+++ b/apps/calendar/ajax/event/new.php
@@ -21,5 +21,4 @@ if($errarr){
 	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
 	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
 	OCP\JSON::success();
-}
-?>
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php
index 0dc0a5fca7..56b83205e8 100644
--- a/apps/calendar/ajax/event/resize.php
+++ b/apps/calendar/ajax/event/resize.php
@@ -35,4 +35,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
 
 OC_Calendar_Object::edit($id, $vcalendar->serialize());
 $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
+OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
index 3be02d2a6d..b99c32278c 100644
--- a/apps/calendar/ajax/import/dialog.php
+++ b/apps/calendar/ajax/import/dialog.php
@@ -12,5 +12,4 @@ OCP\App::checkAppEnabled('calendar');
 $tmpl = new OCP\Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
-?>
+$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index 684eebf5fd..87667d4de6 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -70,5 +70,4 @@ foreach($uids as $uid) {
 		OC_Calendar_Object::add($id, $import);
 	}
 }
-OCP\JSON::success();
-?>
\ No newline at end of file
+OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 6fdad12c08..1facedfe0d 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -119,4 +119,4 @@ foreach($uids as $uid) {
 writeProgress('100');
 sleep(3);
 OC_Cache::remove($progresskey);
-OCP\JSON::success();
+OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php
index 23b71bba04..bc995f7d6e 100644
--- a/apps/calendar/ajax/settings/getfirstday.php
+++ b/apps/calendar/ajax/settings/getfirstday.php
@@ -8,5 +8,4 @@
  
 OCP\JSON::checkLoggedIn();
 $firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
-OCP\JSON::encodedPrint(array('firstday' => $firstday));
-?> 
+OCP\JSON::encodedPrint(array('firstday' => $firstday));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
index f36f3bf061..6b6b8bef9c 100644
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -23,5 +23,4 @@ if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timez
 }
 OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone);
 $message = array('message'=> $l->t('New Timezone:') . $timezone);
-OCP\JSON::success($message);
-?>
\ No newline at end of file
+OCP\JSON::success($message);
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
index 373eeee796..056a603752 100644
--- a/apps/calendar/ajax/settings/setfirstday.php
+++ b/apps/calendar/ajax/settings/setfirstday.php
@@ -12,6 +12,4 @@ if(isset($_POST["firstday"])){
 	OCP\JSON::success();
 }else{
 	OCP\JSON::error();
-}
-?> 
- 
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php
index eae7be54e8..8e95f6f3bf 100644
--- a/apps/calendar/ajax/settings/settimeformat.php
+++ b/apps/calendar/ajax/settings/settimeformat.php
@@ -12,6 +12,4 @@ if(isset($_POST["timeformat"])){
 	OCP\JSON::success();
 }else{
 	OCP\JSON::error();
-}
-?> 
- 
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
index d2797a08aa..6d029a6643 100644
--- a/apps/calendar/ajax/settings/settimezone.php
+++ b/apps/calendar/ajax/settings/settimezone.php
@@ -22,6 +22,4 @@ if( isset( $_POST['timezone'] ) ){
 	OCP\JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
 }else{
 	OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
-}
-
-?>
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php
index 809164e870..eebb687dfa 100644
--- a/apps/calendar/ajax/settings/timeformat.php
+++ b/apps/calendar/ajax/settings/timeformat.php
@@ -8,5 +8,4 @@
  
 OCP\JSON::checkLoggedIn();
 $timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
-OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
-?> 
+OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
\ No newline at end of file

From 709dbd82a60363555b613b381f73d942f9fdbcc4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 16:58:55 +0200
Subject: [PATCH 0444/1537] Set default charset to utf-8.

---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index bcc8657b4a..a0ad499b60 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -120,7 +120,7 @@ class OC_DB {
 					}else{
 						$dsn='mysql:dbname='.$name.';host='.$host;
 					}
-					$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'";
+					$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'; SET CHARACTER SET 'UTF8';";
 					break;
 				case 'pgsql':
 					if($port){

From a91e3d68b0727c4e3c93056b72161cfeaa3c09e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Sat, 16 Jun 2012 17:53:14 +0200
Subject: [PATCH 0445/1537] fixing syntax error

---
 3rdparty/MDB2/Schema/Writer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/3rdparty/MDB2/Schema/Writer.php b/3rdparty/MDB2/Schema/Writer.php
index 96dd2bed0f..3eaa39a207 100644
--- a/3rdparty/MDB2/Schema/Writer.php
+++ b/3rdparty/MDB2/Schema/Writer.php
@@ -80,6 +80,7 @@ class MDB2_Schema_Writer
     function __construct($valid_types = array())
     {
         $this->valid_types = $valid_types;
+    }
 
     // }}}
     // {{{ raiseError()

From 6642ef6a509417f61cffa51022a3192bdff69823 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 18:06:10 +0200
Subject: [PATCH 0446/1537] Fix string encoding probs.

---
 apps/contacts/ajax/contacts.php               |  2 +-
 apps/contacts/ajax/editaddress.php            | 13 ++++++++++-
 apps/contacts/index.php                       |  2 +-
 apps/contacts/templates/part.contacts.php     |  2 +-
 .../templates/part.edit_address_dialog.php    | 22 ++++++++-----------
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 37d396cd83..dbc9be5ca5 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -13,7 +13,7 @@ OCP\JSON::checkAppEnabled('contacts');
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
 $contacts = OC_Contacts_VCard::all($ids);
 $tmpl = new OCP\Template("contacts", "part.contacts");
-$tmpl->assign('contacts', $contacts);
+$tmpl->assign('contacts', $contacts, false);
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
index 969aeeba8f..2d7aba11b0 100644
--- a/apps/contacts/ajax/editaddress.php
+++ b/apps/contacts/ajax/editaddress.php
@@ -20,7 +20,18 @@ if($checksum) {
 	$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 	$element = $vcard->children[$line];
 	$adr = OC_Contacts_VCard::structureProperty($element);
-	$tmpl->assign('adr',$adr);
+	$types = array();
+	if(isset($adr['parameters']['TYPE'])) {
+		if(is_array($adr['parameters']['TYPE'])) {
+			$types = array_map('htmlspecialchars', $adr['parameters']['TYPE']);
+			$types = array_map('strtoupper', $types);
+		} else {
+			$types = array(strtoupper(htmlspecialchars($adr['parameters']['TYPE'])));
+		}
+	}
+	$tmpl->assign('types', $types, false);
+	$adr = array_map('htmlspecialchars', $adr['value']);
+	$tmpl->assign('adr', $adr, false);
 }
 
 $tmpl->assign('id',$id);
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 74b7c43c55..bdb52c123c 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -66,7 +66,7 @@ $tmpl->assign('phone_types', $phone_types);
 $tmpl->assign('email_types', $email_types);
 $tmpl->assign('categories', $categories);
 $tmpl->assign('addressbooks', $addressbooks);
-$tmpl->assign('contacts', $contacts);
+$tmpl->assign('contacts', $contacts, false);
 $tmpl->assign('details', $details );
 $tmpl->assign('id',$id);
 $tmpl->printPage();
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 00a61f72fd..5751750540 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -8,5 +8,5 @@
 		}
 	}
 ?>
-	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
+	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li>
 <?php endforeach; ?>
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
index 7684795f34..d5ea95ba46 100644
--- a/apps/contacts/templates/part.edit_address_dialog.php
+++ b/apps/contacts/templates/part.edit_address_dialog.php
@@ -1,13 +1,9 @@
 <?php
 $adr = isset($_['adr'])?$_['adr']:array();
-$id = $_['id'];
-$types = array();
-foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):array() as $type) {
-	$types[] = strtoupper($type);
-}
+$id = isset($_['id'])?$_['id']:array();
+$types = isset($_['types'])?$_['types']:array();
 ?>
 <div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
-<!-- ?php print_r($types); ? -->
 	<fieldset id="address">
 		<dl class="form">
 			<dt>
@@ -22,43 +18,43 @@ foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):arra
 				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_pobox" name="value[ADR][0]" placeholder="<?php echo $l->t('PO Box'); ?>" value="<?php echo isset($adr['value'][0])?$adr['value'][0]:''; ?>">
+				<input type="text" id="adr_pobox" name="value[ADR][0]" placeholder="<?php echo $l->t('PO Box'); ?>" value="<?php echo isset($adr[0])?$adr[0]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_street"><?php echo $l->t('Street address'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_street" name="value[ADR][2]" placeholder="<?php echo $l->t('Street and number'); ?>" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
+				<input type="text" id="adr_street" name="value[ADR][2]" placeholder="<?php echo $l->t('Street and number'); ?>" value="<?php echo isset($adr[2])?$adr[2]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_extended" name="value[ADR][1]" placeholder="<?php echo $l->t('Apartment number etc.'); ?>" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
+				<input type="text" id="adr_extended" name="value[ADR][1]" placeholder="<?php echo $l->t('Apartment number etc.'); ?>" value="<?php echo isset($adr[1])?$adr[1]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_city" name="value[ADR][3]" placeholder="<?php echo $l->t('City'); ?>" value="<?php echo isset($adr['value'][3])?$adr['value'][3]:''; ?>">
+				<input type="text" id="adr_city" name="value[ADR][3]" placeholder="<?php echo $l->t('City'); ?>" value="<?php echo isset($adr[3])?$adr[3]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_region" name="value[ADR][4]" placeholder="<?php echo $l->t('E.g. state or province'); ?>" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
+				<input type="text" id="adr_region" name="value[ADR][4]" placeholder="<?php echo $l->t('E.g. state or province'); ?>" value="<?php echo isset($adr[4])?$adr[4]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_zipcode" name="value[ADR][5]" placeholder="<?php echo $l->t('Postal code'); ?>" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
+				<input type="text" id="adr_zipcode" name="value[ADR][5]" placeholder="<?php echo $l->t('Postal code'); ?>" value="<?php echo isset($adr[5])?$adr[5]:''; ?>">
 			</dd>
 			<dt>
 				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_country" name="value[ADR][6]" placeholder="<?php echo $l->t('Country'); ?>" value="<?php echo isset($adr['value'][6])?$adr['value'][6]:''; ?>">
+				<input type="text" id="adr_country" name="value[ADR][6]" placeholder="<?php echo $l->t('Country'); ?>" value="<?php echo isset($adr[6])?$adr[6]:''; ?>">
 			</dd>
 		</dl>
 	</fieldset>

From 4cbdd59859af971549a77ab684a06e08ee5f46d7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 18:38:20 +0200
Subject: [PATCH 0447/1537] Fix char encoding.

---
 apps/contacts/ajax/editname.php                   |  5 +++--
 apps/contacts/templates/part.edit_name_dialog.php | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index d06d416b7e..62cae894b6 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -28,8 +28,9 @@ if($id) {
 			$name = OC_Contacts_VCard::structureProperty($property);
 		}
 	}
-	$tmpl->assign('name',$name);
-	$tmpl->assign('id',$id);
+	$name = array_map('htmlspecialchars', $name['value']);
+	$tmpl->assign('name',$name, false);
+	$tmpl->assign('id',$id, false);
 } else {
 	bailOut(OC_Contacts_App::$l10n->t('Contact ID is missing.'));
 }
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
index be45f9a5b0..f984c232a3 100644
--- a/apps/contacts/templates/part.edit_name_dialog.php
+++ b/apps/contacts/templates/part.edit_name_dialog.php
@@ -22,7 +22,7 @@ $addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
 		<?php }} ?>
 		<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
 		<dd>
-			<input name="pre" id="pre" value="<?php echo isset($name['value'][3]) ? $name['value'][3] : ''; ?>" type="text" list="prefixes" />
+			<input name="pre" id="pre" value="<?php echo isset($name[3]) ? $name[3] : ''; ?>" type="text" list="prefixes" />
 			<datalist id="prefixes">
 				<option value="<?php echo $l->t('Miss'); ?>">
 				<option value="<?php echo $l->t('Ms'); ?>">
@@ -33,14 +33,14 @@ $addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
 			</datalist>
 		</dd>
 		<dt><label for="giv"><?php echo $l->t('Given name'); ?></label></dt>
-		<dd><input name="giv" id="giv" value="<?php echo isset($name['value'][1]) ? $name['value'][1] : ''; ?>" type="text" /></dd>
+		<dd><input name="giv" id="giv" value="<?php echo isset($name[1]) ? $name[1] : ''; ?>" type="text" /></dd>
 		<dt><label for="add"><?php echo $l->t('Additional names'); ?></label></dt>
-		<dd><input name="add" id="add" value="<?php echo isset($name['value'][2]) ? $name['value'][2] : ''; ?>" type="text" /></dd>
+		<dd><input name="add" id="add" value="<?php echo isset($name[2]) ? $name[2] : ''; ?>" type="text" /></dd>
 		<dt><label for="fam"><?php echo $l->t('Family name'); ?></label></dt>
-		<dd><input name="fam" id="fam" value="<?php echo isset($name['value'][0]) ? $name['value'][0] : ''; ?>" type="text" /></dd>
+		<dd><input name="fam" id="fam" value="<?php echo isset($name[0]) ? $name[0] : ''; ?>" type="text" /></dd>
 		<dt><label for="suf"><?php echo $l->t('Hon. suffixes'); ?></label></dt>
 		<dd>
-			<input name="suf" id="suf" value="<?php echo isset($name['value'][4]) ? $name['value'][4] : ''; ?>" type="text" list="suffixes" />
+			<input name="suf" id="suf" value="<?php echo isset($name[4]) ? $name[4] : ''; ?>" type="text" list="suffixes" />
 			<datalist id="suffixes">
 				<option value="<?php echo $l->t('J.D.'); ?>">
 				<option value="<?php echo $l->t('M.D.'); ?>">

From 1118498050c3098e23bafe9e6dc78a465d913531 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 18:54:55 +0200
Subject: [PATCH 0448/1537] files_imageviewer: Double encode paths. Fixes
 oc-1016.

---
 apps/files_imageviewer/js/lightbox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 69cda7a0ec..31f08456d2 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -22,7 +22,7 @@ function viewImage(dir, file) {
 	if(file.indexOf('.psd')>0){//can't view those
 		return;
 	}
-	var location=OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
+	var location=OC.filePath('files','ajax','download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
 	$.fancybox({
 		"href": location,
 		"title": file.replace(/</, "&lt;").replace(/>/, "&gt;"),

From 9c6d82d00d4280f1b87fe077abff0b4be1d9e07c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 19:48:33 +0200
Subject: [PATCH 0449/1537] PDF Viewer: Double encode link.

---
 apps/files_pdfviewer/js/viewer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index d98bedc5c0..2c9cbb9b43 100644
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -13,7 +13,7 @@ function hidePDFviewer() {
 function showPDFviewer(dir,filename){
 	if(!showPDFviewer.shown){
 		$("#editor").hide();
-		var url = OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir);
+		var url = OC.filePath('files','ajax','download.php')+encodeURIComponent('?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir));
 		$('table').hide();
 		function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
 		showPDFviewer.oldcode = $("#controls").html();

From 99a68abbd5ae5b41b0fcae5efc8235ac49484164 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 16 Jun 2012 14:15:43 +0200
Subject: [PATCH 0450/1537] Add session_write_close to the minimizer

---
 core/minimizer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/minimizer.php b/core/minimizer.php
index 6828acc87d..709c7508e9 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -1,4 +1,5 @@
 <?php
+session_write_close();
 
 OC_App::loadApps();
 

From 6e9cd63fa1af24781c981c5535876f22fdb17934 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 16 Jun 2012 20:50:52 +0200
Subject: [PATCH 0451/1537] Only check for apps owncloud version requirment
 when there is a new owncloud version

---
 lib/app.php  | 29 +++++++++++++++--------------
 lib/base.php |  1 +
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 7fdfc93138..c08e977b03 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -489,32 +489,33 @@ class OC_App{
 			$currentVersion=OC_App::getAppVersion($app);
 			if ($currentVersion) {
 				if (version_compare($currentVersion, $installedVersion, '>')) {
-					OC_Log::write($app,'starting app upgrade from '.$installedVersion.' to '.$currentVersion,OC_Log::DEBUG);
+					OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion,OC_Log::DEBUG);
 					OC_App::updateApp($app);
-					OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));
+					OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
 				}
 			}
 		}
+	}
 
-		// check if the current enabled apps are compatible with the current ownCloud version. disable them if not.
-		// this is important if you upgrade ownCloud and have non ported 3rd party apps installed
-		$apps =OC_App::getEnabledApps();
-		$version=OC_Util::getVersion();
+	/**
+	 * check if the current enabled apps are compatible with the current
+	 * ownCloud version. disable them if not.
+	 * This is important if you upgrade ownCloud and have non ported 3rd
+	 * party apps installed.
+	 */
+	public static function checkAppsRequirements($apps = array()){
+		if (empty($apps)) {
+			$apps = OC_App::getEnabledApps();
+		}
+		$version = OC_Util::getVersion();
 		foreach($apps as $app) {
-
 			// check if the app is compatible with this version of ownCloud
-			$info=OC_App::getAppInfo($app);
+			$info = OC_App::getAppInfo($app);
 			if(!isset($info['require']) or ($version[0]>$info['require'])){
 				OC_Log::write('core','App "'.$info['name'].'" can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				OC_App::disable( $app );
 			}
-
-
-
 		}
-
-
-
 	}
 
 	/**
diff --git a/lib/base.php b/lib/base.php
index fedc123885..30f7e5bba6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -229,6 +229,7 @@ class OC{
 				}
 
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+				OC_App::checkAppsRequirements();
 			}
 
 			OC_App::updateApps();

From 6f93176a4be21dcda1009d9cea052e5fdb50ae16 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 16 Jun 2012 20:52:01 +0200
Subject: [PATCH 0452/1537] Be smarter when checking single app language
 availability

---
 lib/l10n.php | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index 3596c992ba..ba4bf23780 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -228,23 +228,29 @@ class OC_L10N{
 			return self::$language;
 		}
 
-		$available = array();
-		if(is_array($app)){
-			$available = $app;
-		}
-		else{
-			$available=self::findAvailableLanguages($app);
-		}
 		if(OC_User::getUser() && OC_Preferences::getValue(OC_User::getUser(), 'core', 'lang')){
 			$lang = OC_Preferences::getValue(OC_User::getUser(), 'core', 'lang');
 			self::$language = $lang;
-			if(array_search($lang, $available) !== false){
+			if(is_array($app)){
+				$available = $app;
+				$lang_exists = array_search($lang, $available) !== false;
+			}
+			else {
+				$lang_exists = self::languageExists($app, $lang);
+			}
+			if($lang_exists){
 				return $lang;
 			}
 		}
 
 		if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
 			$accepted_languages = preg_split('/,\s*/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			if(is_array($app)){
+				$available = $app;
+			}
+			else{
+				$available = self::findAvailableLanguages($app);
+			}
 			foreach($accepted_languages as $i){
 				$temp = explode(';', $i);
 				if(array_search($temp[0], $available) !== false){
@@ -296,4 +302,15 @@ class OC_L10N{
 		}
 		return $available;
 	}
+
+	public static function languageExists($app, $lang){
+		if ($lang == 'en'){//english is always available
+			return true;
+		}
+		$dir = self::findI18nDir($app);
+		if(is_dir($dir)){
+			return file_exists($dir.'/'.$lang.'.php');
+		}
+		return false;
+	}
 }

From b38e46276f247315772c5d46f0c73ea11a139cef Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 01:26:30 +0200
Subject: [PATCH 0453/1537] when checking if the content of a folder has been
 updated, exlicitly state that we are checking a folder

solves some issues with external storages not updating correctly
---
 lib/filecache.php        | 2 +-
 lib/filecache/update.php | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 32c6929ff6..9963a5a3ba 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -217,7 +217,7 @@ class OC_FileCache{
 	 * - versioned
 	 */
 	public static function getFolderContent($path,$root=false,$mimetype_filter=''){
-		if(OC_FileCache_Update::hasUpdated($path,$root)){
+		if(OC_FileCache_Update::hasUpdated($path,$root,true)){
 			OC_FileCache_Update::updateFolder($path,$root);
 		}
 		return OC_FileCache_Cached::getFolderContent($path,$root,$mimetype_filter);
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 9e23c6dfe7..2e3eb67da0 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -15,9 +15,10 @@ class OC_FileCache_Update{
 	 * check if a file or folder is updated outside owncloud
 	 * @param string path
 	 * @param string root (optional)
+	 * @param boolean folder
 	 * @return bool
 	 */
-	public static function hasUpdated($path,$root=false){
+	public static function hasUpdated($path,$root=false,$folder=false){
 		if($root===false){
 			$view=OC_Filesystem::getView();
 		}else{
@@ -29,7 +30,11 @@ class OC_FileCache_Update{
 		$cachedData=OC_FileCache_Cached::get($path,$root);
 		if(isset($cachedData['mtime'])){
 			$cachedMTime=$cachedData['mtime'];
-			return $view->hasUpdated($path,$cachedMTime);
+			if($folder){
+				return $view->hasUpdated($path.'/',$cachedMTime);
+			}else{
+				return $view->hasUpdated($path,$cachedMTime);
+			}
 		}else{//file not in cache, so it has to be updated
 			if(($path=='/' or $path=='') and $root===false){//dont auto update the home folder, it will be scanned
 				return false;

From e8dd86ce0de9ec0d7c1774c62281451445b26c92 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 16 Jun 2012 19:48:03 -0400
Subject: [PATCH 0454/1537] Revert "Set default charset to utf-8."

This reverts commit 709dbd82a60363555b613b381f73d942f9fdbcc4.
---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index a0ad499b60..bcc8657b4a 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -120,7 +120,7 @@ class OC_DB {
 					}else{
 						$dsn='mysql:dbname='.$name.';host='.$host;
 					}
-					$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'; SET CHARACTER SET 'UTF8';";
+					$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'";
 					break;
 				case 'pgsql':
 					if($port){

From 549541215e41cc42d94ae92f72df423fce1e5a1c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:15:11 +0200
Subject: [PATCH 0455/1537] get the correct metadate from updated folders to
 put in the cache

---
 lib/filecache/update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 2e3eb67da0..dd77f491ca 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -159,9 +159,9 @@ class OC_FileCache_Update{
 				foreach($cachedContent as $file){
 					$size+=$file['size'];
 				}
-				$mtime=$view->filemtime($path);
-				$ctime=$view->filectime($path);
-				$writable=$view->is_writable($path);
+				$mtime=$view->filemtime($path.'/');
+				$ctime=$view->filectime($path.'/');
+				$writable=$view->is_writable($path.'/');
 				OC_FileCache::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
 			}else{
 				$count=0;

From 5b6229544d03e59085918151abd010f2700b84f2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:42:40 +0200
Subject: [PATCH 0456/1537] fix statcache for filenames containing
 non-alphanumeric characters in smb streamwrapper

---
 3rdparty/smb4php/smb.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3rdparty/smb4php/smb.php b/3rdparty/smb4php/smb.php
index 69fb2487bc..12c5890723 100644
--- a/3rdparty/smb4php/smb.php
+++ b/3rdparty/smb4php/smb.php
@@ -326,8 +326,11 @@ class smb_stream_wrapper extends smb {
 					$this->dir = array_keys($o['info']);
 					$this->dir_index = 0;
 					$this->adddircache ($url, $this->dir);
+					if(substr($url,-1,1)=='/'){
+						$url=substr($url,0,-1);
+					}
 					foreach ($o['info'] as $name => $info) {
-						smb::addstatcache($url . '/' . urlencode($name), $info);
+						smb::addstatcache($url . '/' . $name, $info);
 					}
 				} else {
 					trigger_error ("dir_opendir(): dir failed for path '".$pu['path']."'", E_USER_WARNING);

From 769cbe9a4cc5b105cc0277057b21e4661bd9c890 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:54:23 +0200
Subject: [PATCH 0457/1537] improve filecache support for smb

---
 apps/files_external/lib/smb.php | 44 ++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 9112655194..e05d69f784 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -47,6 +47,48 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 			$path=substr($path,0,-1);
 		}
 		return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path;
-		
+	}
+
+	public function stat($path){
+		if(!$path and $this->root=='/'){//mtime doesn't work for shares
+			$mtime=$this->shareMTime();
+			$stat=stat($this->constructUrl($path));
+			$stat['mtime']=$mtime;
+			return $stat;
+		}else{
+			return stat($this->constructUrl($path));
+		}
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time){
+		if(!$path and $this->root=='/'){
+			//mtime doesn't work for shares, but giving the nature of the backend, doing a full update is still just fast enough
+			return true;
+		}else{
+			$actualTime=$this->filemtime($path);
+			return $actualTime>$time;
+		}
+	}
+
+	/**
+	 * get the best guess for the modification time of the share
+	 */
+	private function shareMTime(){
+		$dh=$this->opendir('');
+		$lastCtime=0;
+		while($file=readdir($dh)){
+			if($file!='.' and $file!='..'){
+				$ctime=$this->filemtime($file);
+				if($ctime>$lastCtime){
+					$lastCtime=$ctime;
+				}
+			}
+		}
+		return $lastCtime;
 	}
 }

From ed66c63c29c71c183093b7d34133b4cfb5d64925 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:59:38 +0200
Subject: [PATCH 0458/1537] improve caching smb results a bit

---
 apps/files_external/lib/smb.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index e05d69f784..9db8e9fd98 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -60,6 +60,10 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 		}
 	}
 
+	public function filetype($path){
+		return (bool)$this->opendir($path);//using opendir causes the same amount of requests and caches the content of the folder in one go
+	}
+
 	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time

From ad4f066bac5e4d6777b258d6a161ab062211d787 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 03:09:49 +0200
Subject: [PATCH 0459/1537] suppress error when using is_dir on non directory
 in smb backend

---
 apps/files_external/lib/smb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 9db8e9fd98..5e34deb233 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -61,7 +61,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	}
 
 	public function filetype($path){
-		return (bool)$this->opendir($path);//using opendir causes the same amount of requests and caches the content of the folder in one go
+		return (bool)@$this->opendir($path);//using opendir causes the same amount of requests and caches the content of the folder in one go
 	}
 
 	/**

From b064fc69686cfc71f381420131dff7708a3d8474 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 17 Jun 2012 12:06:40 +0000
Subject: [PATCH 0460/1537] user_migrate: remove old code

---
 apps/user_migrate/appinfo/app.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php
index e57bfc2a9d..9d314b59ce 100644
--- a/apps/user_migrate/appinfo/app.php
+++ b/apps/user_migrate/appinfo/app.php
@@ -22,7 +22,6 @@
 */
 
 OCP\App::registerPersonal( 'user_migrate', 'settings' );
-OCP\App::registerAdmin( 'user_migrate', 'admin' );
 OCP\Util::addscript( 'user_migrate', 'export');
 
 // add settings page to navigation
@@ -32,4 +31,4 @@ $entry = array(
 	'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ),
 	'name' => 'Import'
 );
-?>
\ No newline at end of file
+?>

From 7f485d1b2058a1af2f82555939df3d6c306047a3 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Sat, 16 Jun 2012 23:37:24 +0200
Subject: [PATCH 0461/1537] contacts app now lists contacts sorted by
 expandable/collapsable addressbooks

---
 apps/contacts/css/contacts.css            |  6 ++-
 apps/contacts/js/contacts.js              | 34 +++++++--------
 apps/contacts/templates/index.php         |  6 +--
 apps/contacts/templates/part.contacts.php | 53 ++++++++++++++++++-----
 4 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index dc16d9764c..0240207d79 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -2,9 +2,11 @@
 	font-weight: bold;
 }*/
 #leftcontent { top: 3.5em !important; padding: 0; margin: 0; }
+#leftcontent a { padding: 0 0 0 25px; }
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
-#contacts { background: #fff; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0; }
-#contacts a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
+#leftcontent h3 {background: #aaa; display: block; max-width: 100%; height: 2em; padding: 0.5em 0.8em;}
+.contacts { background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; overflow: auto; padding: 0; margin: 0; }
+.contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index a1b9976006..1c5139117d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -173,11 +173,11 @@ Contacts={
 			// Name has changed. Update it and reorder.
 			$('#fn').change(function(){
 				var name = $('#fn').val().strip_tags();
-				var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]');
+				var item = $('.contacts [data-id="'+Contacts.UI.Card.id+'"]');
 				$(item).find('a').html(name);
 				Contacts.UI.Card.fn = name;
 				var added = false;
-				$('#contacts li').each(function(){
+				$('.contacts li').each(function(){
 					if ($(this).text().toLowerCase() > name.toLowerCase()) {
 						$(this).before(item).fadeIn('fast');
 						added = true;
@@ -248,12 +248,12 @@ Contacts={
 			update:function(id) {
 				var newid;
 				if(!id) {
-					newid = $('#contacts li:first-child').data('id');
+					newid = $('.contacts li:first-child').data('id');
 				} else {
 					newid = id;
 				}
 				var localLoadContact = function(id) {
-					if($('#contacts li').length > 0) {
+					if($('.contacts li').length > 0) {
 						$('#leftcontent li[data-id="'+newid+'"]').addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
@@ -278,7 +278,7 @@ Contacts={
 						}
 					});
 				}
-				else if($('#contacts li').length == 0) {
+				else if($('.contacts li').length == 0) {
 					// load intro page
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
 						if(jsondata.status == 'success'){
@@ -384,7 +384,7 @@ Contacts={
 								this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
 								this.data = undefined;
 								
-								if($('#contacts li').length > 0) { // Load first in list.
+								if($('.contacts li').length > 0) { // Load first in list.
 									Contacts.UI.Card.update(newid);
 								} else {
 									// load intro page
@@ -1498,7 +1498,7 @@ Contacts={
 			update:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
 					if(jsondata.status == 'success'){
-						$('#contacts').html(jsondata.data.page);
+						$('#leftcontent').html(jsondata.data.page);
 						Contacts.UI.Card.update();
 					}
 					else{
@@ -1506,8 +1506,8 @@ Contacts={
 					}
 				});
 				setTimeout(function() {
-					$('#contacts li').unbind('inview');
-					$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+					$('.contacts li').unbind('inview');
+					$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 						if (isInView) {
 							if (!$(this).find('a').attr('style')) {
 								$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
@@ -1518,19 +1518,19 @@ Contacts={
 			},
 			// Add thumbnails to the contact list as they become visible in the viewport.
 			lazyupdate:function(){
-				$('#contacts li').live('inview', function(){
+				$('.contacts li').live('inview', function(){
 					if (!$(this).find('a').attr('style')) {
 						$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
 					}
 				});
 			},
 			refreshThumbnail:function(id){
-				var item = $('#contacts [data-id="'+id+'"]').find('a');
+				var item = $('.contacts [data-id="'+id+'"]').find('a');
 				item.html(Contacts.UI.Card.fn);
 				item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
 			},
 			scrollTo:function(id){
-				$('#contacts').animate({
+				$('.contacts').animate({
 					scrollTop: $('#leftcontent li[data-id="'+id+'"]').offset().top-20}, 'slow','swing');
 			}
 		}
@@ -1552,12 +1552,12 @@ $(document).ready(function(){
 	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
 	
 	// Load a contact.
-	$('#contacts').keydown(function(event) {
+	$('.contacts').keydown(function(event) {
 		if(event.which == 13) {
-			$('#contacts').click();
+			$('.contacts').click();
 		}
 	});
-	$('#contacts').click(function(event){
+	$('.contacts').click(function(event){
 		var $tgt = $(event.target);
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();
@@ -1565,7 +1565,7 @@ $(document).ready(function(){
 			item.addClass('active');
 			var oldid = $('#rightcontent').data('id');
 			if(oldid != 0){
-				$('#contacts li[data-id="'+oldid+'"]').removeClass('active');
+				$('.contacts li[data-id="'+oldid+'"]').removeClass('active');
 			}
 			$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 				if(jsondata.status == 'success'){
@@ -1579,7 +1579,7 @@ $(document).ready(function(){
 		return false;
 	});
 
-	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+	$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
 			// element is now visible in the viewport
 			if (visiblePartY == 'top') {
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 7d212e71ba..82619601c2 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -3,10 +3,8 @@
 	var categories = <?php echo json_encode($_['categories']); ?>;
 	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
 </script>
-<div id="leftcontent" class="leftcontent">
-	<ul id="contacts">
-		<?php echo $this->inc("part.contacts"); ?>
-	</ul>
+<div id="leftcontent">
+	<?php echo $this->inc("part.contacts"); ?>
 </div>
 <div id="bottomcontrols">
 	<form>
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 5751750540..1e64119c05 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,12 +1,45 @@
-<?php foreach( $_['contacts'] as $contact ):
-	$display = trim($contact['fullname']);
-	if(!$display) {
-		$vcard = OC_Contacts_App::getContactVCard($contact['id']);
-		if(!is_null($vcard)) {
-			$struct = OC_Contacts_VCard::structureContact($vcard);
-			$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
-		}
+<?php
+// get the names of the addressbooks
+$addressbook_names = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+$contacts = array();
+
+// sort the contacts by addressbookid
+foreach( $_['contacts'] as $contact ):
+	if(is_null($contacts[$contact['addressbookid']])) {
+		$contacts[$contact['addressbookid']] = array();
 	}
+	$contacts[$contact['addressbookid']][] = $contact;
+endforeach;
+
+// print them out sorted by addressbook-name
+for($i=0; $i<count($addressbook_names); $i++) {
+	// a little ugly doing it this way but dunno how to do it else :)
+	if(!(is_null($contacts[$addressbook_names[$i]['id']]))) { // look if we got contacts from this adressbook
+		echo '<h3 class="addressbookname">'.$addressbook_names[$i]['displayname'].'</h3>';
+		echo '<div>
+			<ul class="contacts">';
+		foreach($contacts[$addressbook_names[$i]['id']] as $contact):
+			$display = trim($contact['fullname']);
+
+			if(!$display) {
+				$vcard = OC_Contacts_App::getContactVCard($contact['id']);
+				if(!is_null($vcard)) {
+					$struct = OC_Contacts_VCard::structureContact($vcard);
+					$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
+				}
+			}
+			echo '<li role="button" book-id="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'">'.htmlspecialchars($display).'</a></li>';
+
+		endforeach;
+		echo '</ul></div>';
+	}
+}
 ?>
-	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li>
-<?php endforeach; ?>
+<script language="Javascript">
+$(document).ready(function() {
+	$('#leftcontent .addressbookname').click(function(event) {
+		$(this).next().toggle('slow');
+		return false;
+	}).next().hide();
+});
+</script>

From 92e35bd843890eabeb582c5b616354324f332e85 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Sun, 17 Jun 2012 02:29:35 +0200
Subject: [PATCH 0462/1537] now a little less in template - more in ajax
 controller

---
 apps/contacts/ajax/contacts.php           | 28 ++++++++++++-
 apps/contacts/js/contacts.js              |  3 +-
 apps/contacts/templates/index.php         |  1 -
 apps/contacts/templates/part.contacts.php | 51 ++++++++---------------
 4 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index dbc9be5ca5..1edc35709e 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -11,9 +11,33 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$contacts = OC_Contacts_VCard::all($ids);
+$contacts_alphabet = OC_Contacts_VCard::all($ids);
+$active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+
+// Our new array for the contacts sorted by addressbook
+$contacts_addressbook = array();
+foreach($contacts_alphabet as $contact):
+	if(is_null($contacts_addressbook[$contact['addressbookid']])) {
+		$contacts_addressbook[$contact['addressbookid']] = array();
+	}
+	$contacts_addressbook[$contact['addressbookid']][] = $contact;
+endforeach;
+
+// FIXME: this is kind of ugly - just to replace the keys of the array
+// perhaps we could do some magic combine_array() instead...
+foreach($contacts_addressbook as $addressbook_id => $contacts):
+	foreach($active_addressbooks as $addressbook):
+		if($addressbook_id == $addressbook['id']) {
+			unset($contacts_addressbook[$addressbook_id]);
+			$contacts_addressbook[$addressbook['displayname']] = $contacts;
+		}
+	endforeach;
+endforeach;
+// This one should be ok for a small amount of Addressbooks
+ksort($contacts_addressbook);
+
 $tmpl = new OCP\Template("contacts", "part.contacts");
-$tmpl->assign('contacts', $contacts, false);
+$tmpl->assign('contacts', $contacts_addressbook, false);
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 1c5139117d..925dbafe46 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1557,7 +1557,7 @@ $(document).ready(function(){
 			$('.contacts').click();
 		}
 	});
-	$('.contacts').click(function(event){
+	$(document).on("click", ".contacts",function(event){
 		var $tgt = $(event.target);
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();
@@ -1678,3 +1678,4 @@ $(document).ready(function(){
 	$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
 	$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 });
+Contacts.UI.Contacts.update();
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 82619601c2..74dcf5149d 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -4,7 +4,6 @@
 	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
 </script>
 <div id="leftcontent">
-	<?php echo $this->inc("part.contacts"); ?>
 </div>
 <div id="bottomcontrols">
 	<form>
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 1e64119c05..6c1252debc 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,39 +1,22 @@
 <?php
-// get the names of the addressbooks
-$addressbook_names = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-$contacts = array();
-
-// sort the contacts by addressbookid
-foreach( $_['contacts'] as $contact ):
-	if(is_null($contacts[$contact['addressbookid']])) {
-		$contacts[$contact['addressbookid']] = array();
-	}
-	$contacts[$contact['addressbookid']][] = $contact;
-endforeach;
-
-// print them out sorted by addressbook-name
-for($i=0; $i<count($addressbook_names); $i++) {
-	// a little ugly doing it this way but dunno how to do it else :)
-	if(!(is_null($contacts[$addressbook_names[$i]['id']]))) { // look if we got contacts from this adressbook
-		echo '<h3 class="addressbookname">'.$addressbook_names[$i]['displayname'].'</h3>';
-		echo '<div>
-			<ul class="contacts">';
-		foreach($contacts[$addressbook_names[$i]['id']] as $contact):
-			$display = trim($contact['fullname']);
-
-			if(!$display) {
-				$vcard = OC_Contacts_App::getContactVCard($contact['id']);
-				if(!is_null($vcard)) {
-					$struct = OC_Contacts_VCard::structureContact($vcard);
-					$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
-				}
+foreach($_['contacts'] as $category => $contacts):
+	echo '<h3 class="addressbookname">'.$category.'</h3>';
+	echo '<div>';
+	echo '<ul class="contacts">';
+	foreach($contacts as $contact):
+		$display = trim($contact['fullname']);
+		if(!$display) {
+			$vcard = OC_Contacts_App::getContactVCard($contact['id']);
+			if(!is_null($vcard)) {
+				$struct = OC_Contacts_VCard::structureContact($vcard);
+				$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
 			}
-			echo '<li role="button" book-id="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'">'.htmlspecialchars($display).'</a></li>';
-
-		endforeach;
-		echo '</ul></div>';
-	}
-}
+		}
+		echo '<li role="button" book-id="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'">'.htmlspecialchars($display).'</a></li>';
+	endforeach;
+	echo '</ul>';
+	echo '</div>';
+endforeach;
 ?>
 <script language="Javascript">
 $(document).ready(function() {

From 56d25d4d1b5c210b3c48e49d5bd644d09adc1a0b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 20:11:34 +0200
Subject: [PATCH 0463/1537] Make the parsing in the controller, not in the
 template. Assign only relevant entries to the template.

---
 apps/contacts/ajax/contacts.php | 41 ++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 1edc35709e..773f027dc6 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -16,29 +16,32 @@ $active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
 
 // Our new array for the contacts sorted by addressbook
 $contacts_addressbook = array();
-foreach($contacts_alphabet as $contact):
-	if(is_null($contacts_addressbook[$contact['addressbookid']])) {
-		$contacts_addressbook[$contact['addressbookid']] = array();
+foreach($contacts_alphabet as $contact) {
+	if(!isset($contacts_addressbook[$contact['addressbookid']])) {
+		$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array());
 	}
-	$contacts_addressbook[$contact['addressbookid']][] = $contact;
-endforeach;
-
-// FIXME: this is kind of ugly - just to replace the keys of the array
-// perhaps we could do some magic combine_array() instead...
-foreach($contacts_addressbook as $addressbook_id => $contacts):
-	foreach($active_addressbooks as $addressbook):
-		if($addressbook_id == $addressbook['id']) {
-			unset($contacts_addressbook[$addressbook_id]);
-			$contacts_addressbook[$addressbook['displayname']] = $contacts;
+	$display = trim($contact['fullname']);
+	if(!$display) {
+		$vcard = OC_Contacts_App::getContactVCard($contact['id']);
+		if(!is_null($vcard)) {
+			$struct = OC_Contacts_VCard::structureContact($vcard);
+			$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
 		}
-	endforeach;
-endforeach;
-// This one should be ok for a small amount of Addressbooks
-ksort($contacts_addressbook);
+	}
+	$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
+}
+
+foreach($contacts_addressbook as $addressbook_id => $contacts) {
+	foreach($active_addressbooks as $addressbook) {
+		if($addressbook_id == $addressbook['id']) {
+			$contacts_addressbook[$addressbook_id]['displayname'] = $addressbook['displayname'];
+		}
+	}
+}
 
 $tmpl = new OCP\Template("contacts", "part.contacts");
-$tmpl->assign('contacts', $contacts_addressbook, false);
+$tmpl->assign('books', $contacts_addressbook, false);
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
-?>
+

From b1cfc99f63d5628a183fd2364763455b7ed840bc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 20:19:14 +0200
Subject: [PATCH 0464/1537] Styled address book entries.

---
 apps/contacts/css/contacts.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 0240207d79..d617373742 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -4,7 +4,8 @@
 #leftcontent { top: 3.5em !important; padding: 0; margin: 0; }
 #leftcontent a { padding: 0 0 0 25px; }
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
-#leftcontent h3 {background: #aaa; display: block; max-width: 100%; height: 2em; padding: 0.5em 0.8em;}
+#leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; height: 2em; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
+#leftcontent h3:hover { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
 .contacts { background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}

From 91f5a1de399f9bd77ff31b1ec153b54a9aa5da21 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 20:20:26 +0200
Subject: [PATCH 0465/1537] Obsolete language="Javascript".

---
 apps/contacts/templates/part.contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 0a930949eb..2274d66ec8 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -121,7 +121,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 <div id="edit_photo_dialog" title="Edit photo">
 		<div id="edit_photo_dialog_img"></div>
 </div>
-<script language="Javascript">
+<script type="text/javascript">
 $(document).ready(function(){
 	if('<?php echo $id; ?>'!='') {
 		$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':'<?php echo $id; ?>'},function(jsondata){

From 2875901fc7c2eadb95deb6efb23d725dae35be02 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 20:21:10 +0200
Subject: [PATCH 0466/1537] Obsolete language="Javascript".

---
 apps/contacts/templates/part.cropphoto.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 1079afc808..6d7b1e4477 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -4,7 +4,7 @@ $tmpkey = $_['tmpkey'];
 $requesttoken = $_['requesttoken'];
 OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 ?>
-<script language="Javascript">
+<script type="text/javascript">
 	jQuery(function($) {
 		$('#cropbox').Jcrop({
 			onChange:	showCoords,

From b6b6d691582a22437b4f96e1c9f5915635dc4815 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 20:22:01 +0200
Subject: [PATCH 0467/1537] Moved parsing to the controller and js to
 contacts.js.

---
 apps/contacts/templates/part.contacts.php | 32 +++++------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 6c1252debc..d23a249b98 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,28 +1,10 @@
 <?php
-foreach($_['contacts'] as $category => $contacts):
-	echo '<h3 class="addressbookname">'.$category.'</h3>';
-	echo '<div>';
-	echo '<ul class="contacts">';
-	foreach($contacts as $contact):
-		$display = trim($contact['fullname']);
-		if(!$display) {
-			$vcard = OC_Contacts_App::getContactVCard($contact['id']);
-			if(!is_null($vcard)) {
-				$struct = OC_Contacts_VCard::structureContact($vcard);
-				$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
-			}
-		}
-		echo '<li role="button" book-id="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'">'.htmlspecialchars($display).'</a></li>';
-	endforeach;
+foreach($_['books'] as $id => $addressbook) {
+	echo '<h3 class="addressbook" data-id="'.$id.'">'.$addressbook['displayname'].'</h3>';
+	echo '<ul class="contacts hidden">';
+	foreach($addressbook['contacts'] as $contact) {
+		echo '<li role="button" book-id="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'">'.$contact['displayname'].'</a></li>';
+	}
 	echo '</ul>';
-	echo '</div>';
-endforeach;
+}
 ?>
-<script language="Javascript">
-$(document).ready(function() {
-	$('#leftcontent .addressbookname').click(function(event) {
-		$(this).next().toggle('slow');
-		return false;
-	}).next().hide();
-});
-</script>

From 5a8f4b87839baaeb3b557895cc89d58e19ad75ce Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 20:23:20 +0200
Subject: [PATCH 0468/1537] Adjustments for inview handler etc.

---
 apps/contacts/js/contacts.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 925dbafe46..981af6f53a 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1498,23 +1498,34 @@ Contacts={
 			update:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
 					if(jsondata.status == 'success'){
-						$('#leftcontent').html(jsondata.data.page);
+						$('#leftcontent').html(jsondata.data.page).ready(function() {
+							setTimeout(function() {
+								$('.contacts li').unbind('inview');
+								$('.contacts li:visible').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+									if (isInView) {
+										if (!$(this).find('a').attr('style')) {
+											$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
+										}
+									}
+								})}, 100);
+							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
+						});
 						Contacts.UI.Card.update();
 					}
 					else{
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-				setTimeout(function() {
+				/*setTimeout(function() {
 					$('.contacts li').unbind('inview');
-					$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+					$('.contacts li:visible').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 						if (isInView) {
 							if (!$(this).find('a').attr('style')) {
 								$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
 							}
 						}
 					})}, 500);
-				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
+				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
 			},
 			// Add thumbnails to the contact list as they become visible in the viewport.
 			lazyupdate:function(){
@@ -1557,7 +1568,7 @@ $(document).ready(function(){
 			$('.contacts').click();
 		}
 	});
-	$(document).on("click", ".contacts",function(event){
+	$(document).on('click', '.contacts', function(event){
 		var $tgt = $(event.target);
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();
@@ -1579,6 +1590,11 @@ $(document).ready(function(){
 		return false;
 	});
 
+	$(document).on('click', '.addressbook', function(event){
+		$(this).next().toggle();
+		return false;
+	});
+	
 	$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
 			// element is now visible in the viewport

From 9e4a41e9cb672234b3d96fc83c96f93a91a3fb59 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 21:34:56 +0200
Subject: [PATCH 0469/1537] Add effect on addressbook show/hide.

---
 apps/contacts/css/contacts.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index d617373742..77bfc54663 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -4,7 +4,7 @@
 #leftcontent { top: 3.5em !important; padding: 0; margin: 0; }
 #leftcontent a { padding: 0 0 0 25px; }
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
-#leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; height: 2em; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
+#leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
 #leftcontent h3:hover { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
 .contacts { background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }

From fb700de4a40432f26209911548045390a10499b8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 21:37:13 +0200
Subject: [PATCH 0470/1537] Add effect on addressbook show/hide.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 981af6f53a..110c383ac7 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1591,7 +1591,7 @@ $(document).ready(function(){
 	});
 
 	$(document).on('click', '.addressbook', function(event){
-		$(this).next().toggle();
+		$(this).next().slideToggle(300);
 		return false;
 	});
 	

From 46a771d2e6261fae20f2bcadb2355c05954920d4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 21:47:15 +0200
Subject: [PATCH 0471/1537] Sort addressbooks.

---
 apps/contacts/ajax/contacts.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 773f027dc6..beed3f05d5 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -6,6 +6,13 @@
  * See the COPYING-README file.
  */
 
+function cmp($a, $b)
+{
+    if ($a['displayname'] == $b['displayname']) {
+        return 0;
+    }
+    return ($a['displayname'] < $b['displayname']) ? -1 : 1;
+}
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
@@ -39,6 +46,8 @@ foreach($contacts_addressbook as $addressbook_id => $contacts) {
 	}
 }
 
+usort($contacts_addressbook, 'cmp');
+
 $tmpl = new OCP\Template("contacts", "part.contacts");
 $tmpl->assign('books', $contacts_addressbook, false);
 $page = $tmpl->fetchPage();

From 7d84c4741c72e46cf9d07bbae97d515f54f9a2d7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 21:50:49 +0200
Subject: [PATCH 0472/1537] Use uasort instead of usort.

---
 apps/contacts/ajax/contacts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index beed3f05d5..bf4d5deb2e 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -46,7 +46,7 @@ foreach($contacts_addressbook as $addressbook_id => $contacts) {
 	}
 }
 
-usort($contacts_addressbook, 'cmp');
+uasort($contacts_addressbook, 'cmp');
 
 $tmpl = new OCP\Template("contacts", "part.contacts");
 $tmpl->assign('books', $contacts_addressbook, false);

From 8337b30e433710ce0f9a7d8b24f23e0fab6fe381 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 23:09:25 +0200
Subject: [PATCH 0473/1537] Add thumbnail links so they are loaded when
 addressbook is expanded.

---
 apps/contacts/templates/part.contacts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index d23a249b98..f0b14c8e5f 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,9 +1,9 @@
 <?php
 foreach($_['books'] as $id => $addressbook) {
 	echo '<h3 class="addressbook" data-id="'.$id.'">'.$addressbook['displayname'].'</h3>';
-	echo '<ul class="contacts hidden">';
+	echo '<ul class="contacts hidden" data-id="'.$id.'">';
 	foreach($addressbook['contacts'] as $contact) {
-		echo '<li role="button" book-id="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'">'.$contact['displayname'].'</a></li>';
+		echo '<li role="button" data-bookid="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'" style="background: url('.link_to('contacts','thumbnail.php').'?id='.$contact['id'].') no-repeat scroll 0 0 transparent;">'.$contact['displayname'].'</a></li>';
 	}
 	echo '</ul>';
 }

From ea4d8ccf709679e9885763f45da9113cc3abd6e3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 23:12:11 +0200
Subject: [PATCH 0474/1537] Rearrange markup.

---
 apps/contacts/templates/index.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 74dcf5149d..d16356d4a5 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -4,12 +4,14 @@
 	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
 </script>
 <div id="leftcontent">
-</div>
-<div id="bottomcontrols">
-	<form>
-		<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::linkTo('contacts', 'img/contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>"   /></button>
-		<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
-	</form>
+	<div id="contacts">
+	</div>
+	<div id="bottomcontrols">
+		<form>
+			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::linkTo('contacts', 'img/contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>"   /></button>
+			<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
+		</form>
+	</div>
 </div>
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
 	<?php

From 3efec3fde9c89382b0c011ab25c7201f6ec95c6d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 23:12:48 +0200
Subject: [PATCH 0475/1537] Make contact list fit in viewport.

---
 apps/contacts/css/contacts.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 77bfc54663..6c65db2b77 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -6,7 +6,7 @@
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
 #leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
 #leftcontent h3:hover { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
-.contacts { background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; overflow: auto; padding: 0; margin: 0; }
+#contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }

From cab4a634dfac023361c32c124f386d2a8bcf115c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 17 Jun 2012 23:14:02 +0200
Subject: [PATCH 0476/1537] Save addressbook id to be able to rearrange
 contacts properly.

---
 apps/contacts/js/contacts.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 110c383ac7..6b8b917d07 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -171,13 +171,14 @@ Contacts={
 			});*/
 			
 			// Name has changed. Update it and reorder.
+			// TODO: Take addressbook into account
 			$('#fn').change(function(){
 				var name = $('#fn').val().strip_tags();
 				var item = $('.contacts [data-id="'+Contacts.UI.Card.id+'"]');
 				$(item).find('a').html(name);
 				Contacts.UI.Card.fn = name;
 				var added = false;
-				$('.contacts li').each(function(){
+				$('.contacts li[data-bookid="'+Contacts.UI.Card.bookid+'"]').each(function(){
 					if ($(this).text().toLowerCase() > name.toLowerCase()) {
 						$(this).before(item).fadeIn('fast');
 						added = true;
@@ -185,7 +186,7 @@ Contacts={
 					}
 				});
 				if(!added) {
-					$('#leftcontent ul').append(item);
+					$('#leftcontent ul[data-id="'+Contacts.UI.Card.bookid+'"]').append(item);
 				}
 				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
 			});
@@ -245,19 +246,20 @@ Contacts={
 			honpre:'',
 			honsuf:'',
 			data:undefined,
-			update:function(id) {
+			update:function(id, bookid) {
 				var newid;
 				if(!id) {
 					newid = $('.contacts li:first-child').data('id');
+					bookid = $('.contacts li:first-child').data('bookid');
 				} else {
 					newid = id;
 				}
-				var localLoadContact = function(id) {
+				var localLoadContact = function(id, bookid) {
 					if($('.contacts li').length > 0) {
 						$('#leftcontent li[data-id="'+newid+'"]').addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
-								Contacts.UI.Card.loadContact(jsondata.data);
+								Contacts.UI.Card.loadContact(jsondata.data, bookid);
 							} else {
 								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 							}
@@ -271,7 +273,7 @@ Contacts={
 						if(jsondata.status == 'success'){
 							$('#rightcontent').html(jsondata.data.page).ready(function() {
 								Contacts.UI.loadHandlers();
-								localLoadContact(newid);
+								localLoadContact(newid, bookid);
 							});
 						} else {
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -370,7 +372,7 @@ Contacts={
 					if(answer == true) {
 						$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':Contacts.UI.Card.id},function(jsondata){
 							if(jsondata.status == 'success'){
-								var newid = '';
+								var newid = '', bookid;
 								var curlistitem = $('#leftcontent [data-id="'+jsondata.data.id+'"]');
 								var newlistitem = curlistitem.prev();
 								if(newlistitem == undefined) {
@@ -379,13 +381,14 @@ Contacts={
 								curlistitem.remove();
 								if(newlistitem != undefined) {
 									newid = newlistitem.data('id');
+									bookid = newlistitem.data('id');
 								}
 								$('#rightcontent').data('id',newid);
 								this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
 								this.data = undefined;
 								
 								if($('.contacts li').length > 0) { // Load first in list.
-									Contacts.UI.Card.update(newid);
+									Contacts.UI.Card.update(newid, bookid);
 								} else {
 									// load intro page
 									$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
@@ -408,9 +411,10 @@ Contacts={
 				});
 				return false;
 			},
-			loadContact:function(jsondata){
+			loadContact:function(jsondata, bookid){
 				this.data = jsondata;
 				this.id = this.data.id;
+				this.bookid = bookid;
 				$('#rightcontent').data('id',this.id);
 				this.populateNameFields();
 				this.loadPhoto();
@@ -1498,7 +1502,7 @@ Contacts={
 			update:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
 					if(jsondata.status == 'success'){
-						$('#leftcontent').html(jsondata.data.page).ready(function() {
+						$('#contacts').html(jsondata.data.page).ready(function() {
 							setTimeout(function() {
 								$('.contacts li').unbind('inview');
 								$('.contacts li:visible').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
@@ -1573,6 +1577,7 @@ $(document).ready(function(){
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();
 			var id = item.data('id');
+			var bookid = item.data('bookid');
 			item.addClass('active');
 			var oldid = $('#rightcontent').data('id');
 			if(oldid != 0){
@@ -1580,7 +1585,7 @@ $(document).ready(function(){
 			}
 			$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 				if(jsondata.status == 'success'){
-					Contacts.UI.Card.loadContact(jsondata.data);
+					Contacts.UI.Card.loadContact(jsondata.data, bookid);
 				}
 				else{
 					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));

From a4f53922c2df6442af774386e41771dd4f06ac30 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 18 Jun 2012 00:36:25 +0200
Subject: [PATCH 0477/1537] Removed erroneous value attributes. Partial fix for
 oc-1029.

---
 apps/contacts/templates/part.contact.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 2274d66ec8..80e2ee1125 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -33,15 +33,15 @@ $id = isset($_['id']) ? $_['id'] : '';
 	</span>
 	<dl id="identityprops" class="form">
 		<dt class="hidden" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="org_value" data-element="ORG"><input id="org" required="required" name="value[ORG]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dd class="propertycontainer hidden" id="org_value" data-element="ORG"><input id="org" required="required" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dd class="propertycontainer hidden" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="url_label" data-element="URL"><label for="url"><?php echo $l->t('Web site'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" name="value[URL]" type="url" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" type="url" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
 		<dd class="propertycontainer hidden" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property big" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
 		<dt class="hidden" id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Groups'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="categories_value" data-element="CATEGORIES"><input id="categories" required="required" name="value[CATEGORIES]" type="text" class="contacts_property bold" name="value" value="" placeholder="
+		<dd class="propertycontainer hidden" id="categories_value" data-element="CATEGORIES"><input id="categories" required="required" type="text" class="contacts_property bold" name="value" value="" placeholder="
 <?php echo $l->t('Separate groups with commas'); ?>" />
 		<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a><a role="button" class="action edit" title="<?php echo $l->t('Edit groups'); ?>"></a></dd>
 	</dl>

From 73fd4c979a3e8f30c80327e1c28c8373a462c0b8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 18 Jun 2012 02:21:29 +0200
Subject: [PATCH 0478/1537] Update js after contactlist change.

---
 apps/contacts/js/contacts.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6b8b917d07..1408e840f2 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -247,16 +247,17 @@ Contacts={
 			honsuf:'',
 			data:undefined,
 			update:function(id, bookid) {
-				var newid;
+				var newid, firstitem;
 				if(!id) {
-					newid = $('.contacts li:first-child').data('id');
-					bookid = $('.contacts li:first-child').data('bookid');
+					firstitem = $('#contacts:first-child li:first-child');
+					newid = firstitem.data('id');
+					bookid = firstitem.data('bookid');
 				} else {
 					newid = id;
 				}
-				var localLoadContact = function(id, bookid) {
+				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
-						$('#leftcontent li[data-id="'+newid+'"]').addClass('active');
+						firstitem.addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
 								Contacts.UI.Card.loadContact(jsondata.data, bookid);
@@ -293,7 +294,7 @@ Contacts={
 					});
 				}
 				else {
-					localLoadContact();
+					localLoadContact(newid, bookid);
 				}
 			},
 			doExport:function() {
@@ -317,7 +318,7 @@ Contacts={
 							var id = jsondata.data.id;
 							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 								if(jsondata.status == 'success'){
-									Contacts.UI.Card.loadContact(jsondata.data);
+									Contacts.UI.Card.loadContact(jsondata.data, aid);
 									$('#leftcontent .active').removeClass('active');
 									var item = $('<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>');
 									var added = false;
@@ -1503,7 +1504,7 @@ Contacts={
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts').html(jsondata.data.page).ready(function() {
-							setTimeout(function() {
+							/*setTimeout(function() {
 								$('.contacts li').unbind('inview');
 								$('.contacts li:visible').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 									if (isInView) {
@@ -1512,7 +1513,7 @@ Contacts={
 										}
 									}
 								})}, 100);
-							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
+							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
 						});
 						Contacts.UI.Card.update();
 					}
@@ -1600,7 +1601,7 @@ $(document).ready(function(){
 		return false;
 	});
 	
-	$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+	/*$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
 			// element is now visible in the viewport
 			if (visiblePartY == 'top') {
@@ -1612,14 +1613,14 @@ $(document).ready(function(){
 				if (!$(this).find('a').attr('style')) {
 					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
 					$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
-				}/* else {
-					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
-				}*/
+				}// else {
+				//	alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
+				//}
 			}
 		} else {
 			// element has gone out of viewport
 		}
-	});
+	});*/
 	
 	$('.contacts_property').live('change', function(){
 		Contacts.UI.Card.saveProperty(this);

From e5feb4e1aab49fe658f65e9503b268eb3f41882d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 18 Jun 2012 02:22:22 +0200
Subject: [PATCH 0479/1537] Remove obsolete js.

---
 apps/contacts/templates/part.contact.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 80e2ee1125..5757563fe5 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -121,19 +121,3 @@ $id = isset($_['id']) ? $_['id'] : '';
 <div id="edit_photo_dialog" title="Edit photo">
 		<div id="edit_photo_dialog_img"></div>
 </div>
-<script type="text/javascript">
-$(document).ready(function(){
-	if('<?php echo $id; ?>'!='') {
-		$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':'<?php echo $id; ?>'},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#leftcontent li[data-id="<?php echo $id; ?>"]').addClass('active');
-				Contacts.UI.Card.loadContact(jsondata.data);
-				Contacts.UI.loadHandlers();
-			}
-			else{
-				OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-			}
-		});
-	}
-});
-</script>

From 91f69858e49c3981d31eeee428c7bf3cd5e142fe Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 09:42:31 +0200
Subject: [PATCH 0480/1537] escape log messages to avoid possible js execution

---
 settings/js/log.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/log.js b/settings/js/log.js
index 6063c7d9a9..bde8b8b104 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -39,7 +39,7 @@ OC.Log={
 			row.append(appTd);
 			
 			var messageTd=$('<td/>');
-			messageTd.text(entry.message);
+			messageTd.text(entry.message.replace(/</, "&lt;").replace(/>/, "&gt;"));
 			row.append(messageTd);
 			
 			var timeTd=$('<td/>');

From 617de811f786dd9282ad52c062a58072027f5637 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 12:07:31 +0200
Subject: [PATCH 0481/1537] Cache the minimized output also on the server

---
 core/minimizer.php |  4 ++--
 lib/minimizer.php  | 22 +++++++++++++++++++---
 lib/request.php    | 25 +++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 lib/request.php

diff --git a/core/minimizer.php b/core/minimizer.php
index 709c7508e9..47e3d855e7 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -6,10 +6,10 @@ OC_App::loadApps();
 if ($service == 'core.css'){
 	$minimizer = new OC_Minimizer_CSS();
 	$files = $minimizer->findFiles(OC_Util::$core_styles);
-	$minimizer->output($files);
+	$minimizer->output($files, $service);
 }
 else if ($service == 'core.js'){
 	$minimizer = new OC_Minimizer_JS();
 	$files = $minimizer->findFiles(OC_Util::$core_scripts);
-	$minimizer->output($files);
+	$minimizer->output($files, $service);
 }
diff --git a/lib/minimizer.php b/lib/minimizer.php
index 9f9ef086c4..428fa477f7 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -26,14 +26,30 @@ abstract class OC_Minimizer
 
 	abstract public function minimizeFiles($files);
 
-	public function output($files) {
+	public function output($files, $cache_key) {
 		header('Content-Type: '.$this->contentType);
 		OC_Response::enableCaching();
 		$last_modified = $this->getLastModified($files);
 		OC_Response::setLastModifiedHeader($last_modified);
 
-		$out = $this->minimizeFiles($files);
-		OC_Response::setETagHeader(md5($out));
+		$gzout = false;
+		$cache = new OC_Cache_FileGlobal();
+		if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
+			$gzout = $cache->get($cache_key.'.gz');
+			OC_Response::setETagHeader(md5($gzout));
+		}
+
+		if (!$gzout) {
+			$out = $this->minimizeFiles($files);
+			$gzout = gzencode($out);
+			$cache->set($cache_key.'.gz', $gzout);
+		}
+		if ($encoding = OC_Request::acceptGZip()) {
+			header('Content-Encoding: '.$encoding);
+			$out = $gzout;
+		} else {
+			$out = gzdecode($gzout);
+		}
 		header('Content-Length: '.strlen($out));
 		echo $out;
 	}
diff --git a/lib/request.php b/lib/request.php
new file mode 100644
index 0000000000..d152d0c73b
--- /dev/null
+++ b/lib/request.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Request {
+	static public function isNoCache() {
+		if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) {
+			return false;
+		}
+		return $_SERVER['HTTP_CACHE_CONTROL'] == 'no-cache';
+	}
+
+	static public function acceptGZip() {
+		$HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"];
+		if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false )
+			return 'x-gzip';
+		else if( strpos($HTTP_ACCEPT_ENCODING,'gzip') !== false )
+			return 'gzip';
+		return false;
+	}
+}

From a5a1a9fd4a2f1cd5f2457ba3ab0ceb432da1be33 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 11:12:53 +0200
Subject: [PATCH 0482/1537] Forgot a file

---
 lib/cache/fileglobal.php | 70 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 lib/cache/fileglobal.php

diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
new file mode 100644
index 0000000000..469dd4b6dd
--- /dev/null
+++ b/lib/cache/fileglobal.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+class OC_Cache_FileGlobal{
+	protected function getCacheDir() {
+		$cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/';
+		if (!is_dir($cache_dir)) {
+			mkdir($cache_dir);
+		}
+		return $cache_dir;
+	}
+
+	public function get($key) {
+		if ($this->hasKey($key)) {
+			$cache_dir = $this->getCacheDir();
+			return file_get_contents($cache_dir.$key);
+		}
+		return null;
+	}
+
+	public function set($key, $value, $ttl=0) {
+		$cache_dir = $this->getCacheDir();
+		if ($cache_dir and file_put_contents($cache_dir.$key, $value)) {
+			if ($ttl === 0) {
+				$ttl = 86400; // 60*60*24
+			}
+			return touch($cache_dir.$key, time() + $ttl);
+		}
+		return false;
+	}
+
+	public function hasKey($key) {
+		$cache_dir = $this->getCacheDir();
+		if ($cache_dir && is_file($cache_dir.$key)) {
+			$mtime = filemtime($cache_dir.$key);
+			if ($mtime < time()) {
+				unlink($cache_dir.$key);
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public function remove($key) {
+		$cache_dir = $this->getCacheDir();
+		if(!$cache_dir){
+			return false;
+		}
+		return unlink($cache_dir.$key);
+	}
+
+	public function clear(){
+		$cache_dir = $this->getCacheDir();
+		if($cache_dir and is_dir($cache_dir)){
+			$dh=opendir($cache_dir);
+			while($file=readdir($dh)){
+				if($file!='.' and $file!='..'){
+					unlink($cache_dir.$file);
+				}
+			}
+		}
+	}
+}

From 977cd0df6b502c1a15147c1641fea754128a0875 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 11:33:24 +0200
Subject: [PATCH 0483/1537] Fix errors for minimizer

---
 lib/base.php             | 2 +-
 lib/cache/fileglobal.php | 8 ++++++++
 lib/request.php          | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 30f7e5bba6..94ae26c4d1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -282,7 +282,7 @@ class OC{
 			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
 				$file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
 				$minimizer = new OC_Minimizer_CSS();
-				$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)));
+				$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)), $file);
 				exit;
 			}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
 				require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 469dd4b6dd..1c2c9bdc82 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -16,7 +16,12 @@ class OC_Cache_FileGlobal{
 		return $cache_dir;
 	}
 
+	protected function fixKey($key) {
+		return str_replace('/', '_', $key);
+	}
+
 	public function get($key) {
+		$key = $this->fixKey($key);
 		if ($this->hasKey($key)) {
 			$cache_dir = $this->getCacheDir();
 			return file_get_contents($cache_dir.$key);
@@ -25,6 +30,7 @@ class OC_Cache_FileGlobal{
 	}
 
 	public function set($key, $value, $ttl=0) {
+		$key = $this->fixKey($key);
 		$cache_dir = $this->getCacheDir();
 		if ($cache_dir and file_put_contents($cache_dir.$key, $value)) {
 			if ($ttl === 0) {
@@ -36,6 +42,7 @@ class OC_Cache_FileGlobal{
 	}
 
 	public function hasKey($key) {
+		$key = $this->fixKey($key);
 		$cache_dir = $this->getCacheDir();
 		if ($cache_dir && is_file($cache_dir.$key)) {
 			$mtime = filemtime($cache_dir.$key);
@@ -53,6 +60,7 @@ class OC_Cache_FileGlobal{
 		if(!$cache_dir){
 			return false;
 		}
+		$key = $this->fixKey($key);
 		return unlink($cache_dir.$key);
 	}
 
diff --git a/lib/request.php b/lib/request.php
index d152d0c73b..0b5aaf8ef3 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -15,6 +15,9 @@ class OC_Request {
 	}
 
 	static public function acceptGZip() {
+		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
+			return false;
+		}
 		$HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"];
 		if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false )
 			return 'x-gzip';

From 4a50c15a8ef596a075c851e08479b468d446545a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Mon, 18 Jun 2012 13:36:49 +0200
Subject: [PATCH 0484/1537] corrected header width and floating (can now
 dynamically add stuff to header); someone may test this in IE

---
 core/css/styles.css            | 11 +++++------
 core/templates/layout.user.php |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index b6b5918d65..6c5c264353 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -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,8 +102,6 @@ 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; }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e271acf10e..c6696fc72b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -45,10 +45,10 @@
 	<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">
+			<a class="header-right" 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 htmlentities($_POST['query']);};?>" autocomplete="off" />
 			</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">

From e3b58f6783aa173ceb9c26476ddf01dc570fc5e8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 18 Jun 2012 14:47:09 +0200
Subject: [PATCH 0485/1537] Revert "create
 OC_Calendar_Object::generateStartEndDate function"

This reverts commit aa7ce480f4c83f6430eb019cfa172553b5578769.
---
 apps/calendar/lib/app.php    | 30 ++++++++++++++++++++++++++++--
 apps/calendar/lib/object.php | 17 -----------------
 apps/calendar/lib/repeat.php | 19 ++++++++++++++++---
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index e3be8c8428..17c23f4ea3 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -400,10 +400,36 @@ class OC_Calendar_App{
 		}else{
 			$object->expand($start, $end);
 			foreach($object->getComponents() as $vevent){
-				if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
+				if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
 					continue;
 				}
-				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), self::$tz);
+				$dynamicoutput = array();
+				$dtstart = $vevent->DTSTART;
+				$start_dt = $dtstart->getDateTime();
+				$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+				$end_dt = $dtend->getDateTime();
+				
+				if($allday){
+					$dynamicoutput['start'] = $start_dt->format('Y-m-d');
+					$end_dt->modify('-1 sec');
+					$dynamicoutput['end'] = $end_dt->format('Y-m-d');
+				}else{
+					$start_dt->setTimezone(new DateTimeZone(self::$tz));
+					$end_dt->setTimezone(new DateTimeZone(self::$tz));
+					$dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
+					$dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
+				}
+
+				// Handle exceptions to recurring events
+				/*$exceptionDateObjects = $vevent->select('EXDATE');
+				$exceptionDateMap = Array();
+				foreach ($exceptionDateObjects as $exceptionObject) {
+					foreach($exceptionObject->getDateTimes() as $datetime) {
+						$ts = $datetime->getTimestamp();
+						$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
+					}
+				}*/
+
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 07f2afb7b5..ba3fa814f3 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -807,21 +807,4 @@ class OC_Calendar_Object{
 		$event = self::find($id);
 		return ($event['repeating'] == 1)?true:false;
 	}
-
-	public static function generateStartEndDate($dtstart, $dtend, $tz){
-		$start_dt = $dtstart->getDateTime();
-		$end_dt = $dtend->getDateTime();
-		$return = array();
-		if($allday){
-			$return['start'] = $start_dt->format('Y-m-d');
-			$end_dt->modify('-1 hour');
-			$return['end'] = $end_dt->format('Y-m-d');
-		}else{
-			$start_dt->setTimezone(new DateTimeZone($tz));
-			$end_dt->setTimezone(new DateTimeZone($tz));
-			$return['start'] = $start_dt->format('Y-m-d H:i:s');
-			$return['end'] = $end_dt->format('Y-m-d H:i:s');
-		}
-		return $return;
-	}
 }
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 6976378ebd..4b9cbdcd4b 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -95,12 +95,25 @@ class OC_Calendar_Repeat{
 		$end->modify('+5 years');
 		$object->expand($start, $end);
 		foreach($object->getComponents() as $vevent){
-			if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
+			if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
 				continue;
 			}
-			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), 'UTC');
+			$dtstart = $vevent->DTSTART;
+			$start_dt = $dtstart->getDateTime();
+			$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+			$end_dt = $dtend->getDateTime();
+			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
+				$startdate = $start_dt->format('Y-m-d');
+				$end_dt->modify('-1 sec');
+				$enddate = $end_dt->format('Y-m-d');
+			}else{
+				$start_dt->setTimezone(new DateTimeZone('UTC'));
+				$end_dt->setTimezone(new DateTimeZone('UTC'));
+				$startdate = $start_dt->format('Y-m-d H:i:s');
+				$enddate = $end_dt->format('Y-m-d H:i:s');
+			}
 			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_repeat (eventid,calid,startdate,enddate) VALUES(?,?,?,?)');
-			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startenddate['start'],$startenddate['end']));
+			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startdate,$enddate));
 		}
 		return true;
 	}

From beed6e0f0e198e74abfc3262db5b2b560ef76cbe Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 18 Jun 2012 14:47:58 +0200
Subject: [PATCH 0486/1537] Revert "Revert "create
 OC_Calendar_Object::generateStartEndDate function""

This reverts commit e3b58f6783aa173ceb9c26476ddf01dc570fc5e8.
---
 apps/calendar/lib/app.php    | 30 ++----------------------------
 apps/calendar/lib/object.php | 17 +++++++++++++++++
 apps/calendar/lib/repeat.php | 19 +++----------------
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 17c23f4ea3..e3be8c8428 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -400,36 +400,10 @@ class OC_Calendar_App{
 		}else{
 			$object->expand($start, $end);
 			foreach($object->getComponents() as $vevent){
-				if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
+				if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;
 				}
-				$dynamicoutput = array();
-				$dtstart = $vevent->DTSTART;
-				$start_dt = $dtstart->getDateTime();
-				$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-				$end_dt = $dtend->getDateTime();
-				
-				if($allday){
-					$dynamicoutput['start'] = $start_dt->format('Y-m-d');
-					$end_dt->modify('-1 sec');
-					$dynamicoutput['end'] = $end_dt->format('Y-m-d');
-				}else{
-					$start_dt->setTimezone(new DateTimeZone(self::$tz));
-					$end_dt->setTimezone(new DateTimeZone(self::$tz));
-					$dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
-					$dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
-				}
-
-				// Handle exceptions to recurring events
-				/*$exceptionDateObjects = $vevent->select('EXDATE');
-				$exceptionDateMap = Array();
-				foreach ($exceptionDateObjects as $exceptionObject) {
-					foreach($exceptionObject->getDateTimes() as $datetime) {
-						$ts = $datetime->getTimestamp();
-						$exceptionDateMap[idate('Y',$ts)][idate('m', $ts)][idate('d', $ts)] = true;
-					}
-				}*/
-
+				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), self::$tz);
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index ba3fa814f3..07f2afb7b5 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -807,4 +807,21 @@ class OC_Calendar_Object{
 		$event = self::find($id);
 		return ($event['repeating'] == 1)?true:false;
 	}
+
+	public static function generateStartEndDate($dtstart, $dtend, $tz){
+		$start_dt = $dtstart->getDateTime();
+		$end_dt = $dtend->getDateTime();
+		$return = array();
+		if($allday){
+			$return['start'] = $start_dt->format('Y-m-d');
+			$end_dt->modify('-1 hour');
+			$return['end'] = $end_dt->format('Y-m-d');
+		}else{
+			$start_dt->setTimezone(new DateTimeZone($tz));
+			$end_dt->setTimezone(new DateTimeZone($tz));
+			$return['start'] = $start_dt->format('Y-m-d H:i:s');
+			$return['end'] = $end_dt->format('Y-m-d H:i:s');
+		}
+		return $return;
+	}
 }
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 4b9cbdcd4b..6976378ebd 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -95,25 +95,12 @@ class OC_Calendar_Repeat{
 		$end->modify('+5 years');
 		$object->expand($start, $end);
 		foreach($object->getComponents() as $vevent){
-			if(get_class($vevent) != 'Sabre_VObject_Component_VEvent'){
+			if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
 				continue;
 			}
-			$dtstart = $vevent->DTSTART;
-			$start_dt = $dtstart->getDateTime();
-			$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-			$end_dt = $dtend->getDateTime();
-			if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
-				$startdate = $start_dt->format('Y-m-d');
-				$end_dt->modify('-1 sec');
-				$enddate = $end_dt->format('Y-m-d');
-			}else{
-				$start_dt->setTimezone(new DateTimeZone('UTC'));
-				$end_dt->setTimezone(new DateTimeZone('UTC'));
-				$startdate = $start_dt->format('Y-m-d H:i:s');
-				$enddate = $end_dt->format('Y-m-d H:i:s');
-			}
+			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), 'UTC');
 			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_repeat (eventid,calid,startdate,enddate) VALUES(?,?,?,?)');
-			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startdate,$enddate));
+			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startenddate['start'],$startenddate['end']));
 		}
 		return true;
 	}

From 2fd7df57d9255e9a8b2fa57c7e9fd435f2b44f98 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 15:35:22 +0200
Subject: [PATCH 0487/1537] don't add the "Shared"-directory size to users
 quota

---
 settings/personal.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index 64e08be89e..26a9f601d9 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -17,7 +17,8 @@ OC_App::setActiveNavigationEntry( 'personal' );
 
 // calculate the disc space
 $rootInfo=OC_FileCache::get('');
-$used=$rootInfo['size'];
+$sharedInfo=OC_FileCache::get('/Shared');
+$used=$rootInfo['size']-$sharedInfo['size'];
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
 if($total==0) $total=1;  // prevent division by zero

From 79f9d61ec84041c61a8d00042dfeb28afd8219a6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 12:44:06 +0200
Subject: [PATCH 0488/1537] Allow apps to load before login, needed for
 user_openid

---
 apps/user_openid/appinfo/info.xml | 1 +
 index.php                         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml
index 268af23973..7aae4271fa 100644
--- a/apps/user_openid/appinfo/info.xml
+++ b/apps/user_openid/appinfo/info.xml
@@ -8,6 +8,7 @@
 	<require>4</require>
 	<shipped>true</shipped>
 	<types>
+		<prelogin/>
 		<authentication/>
 	</types>
 </info>
diff --git a/index.php b/index.php
index 32b3c88df1..1171c0fe0c 100755
--- a/index.php
+++ b/index.php
@@ -69,6 +69,7 @@ elseif(OC_User::isLoggedIn()) {
 
 // For all others cases, we display the guest page :
 } else {
+	OC_App::loadApps(array('prelogin'));
 	$error = false;
 	// remember was checked after last login
 	if(isset($_COOKIE["oc_remember_login"]) && isset($_COOKIE["oc_token"]) && isset($_COOKIE["oc_username"]) && $_COOKIE["oc_remember_login"]) {

From 332603a2637ec46984f0622ee9a930a84a1c367d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 12:57:11 +0200
Subject: [PATCH 0489/1537] Move formfactor code to OC_Template

---
 lib/base.php     | 34 ----------------------------------
 lib/template.php | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 94ae26c4d1..db55504117 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -95,31 +95,6 @@ class OC{
 		}
 	}
 
-	/**
-	 * autodetects the formfactor of the used device
-	 * default -> the normal desktop browser interface
-	 * mobile -> interface for smartphones
-	 * tablet -> interface for tablets
-	 * standalone -> the default interface but without header, footer and sidebar. just the application. useful to ue just a specific app on the desktop in a standalone window.
-	 */
-	public static function detectFormfactor(){
-		// please add more useragent strings for other devices
-		if(isset($_SERVER['HTTP_USER_AGENT'])){
-			if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) {
-				$mode='tablet';
-			}elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0){
-				$mode='mobile';
-			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)){
-				$mode='mobile';
-			}else{
-				$mode='default';
-			}
-		}else{
-			$mode='default';
-		}
-		return($mode);
-	}
-
 	public static function initPaths(){
 		// calculate the root directories
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
@@ -237,15 +212,6 @@ class OC{
 	}
 
 	public static function initTemplateEngine() {
-		// if the formfactor is not yet autodetected do the autodetection now. For possible forfactors check the detectFormfactor documentation
-		if(!isset($_SESSION['formfactor'])){
-			$_SESSION['formfactor']=OC::detectFormfactor();
-		}
-		// allow manual override via GET parameter
-		if(isset($_GET['formfactor'])){
-			$_SESSION['formfactor']=$_GET['formfactor'];
-		}
-
 		// Add the stuff we need always
 		OC_Util::addScript( "jquery-1.7.2.min" );
 		OC_Util::addScript( "jquery-ui-1.8.16.custom.min" );
diff --git a/lib/template.php b/lib/template.php
index a3700e133e..7e2e1d4d52 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -166,11 +166,48 @@ class OC_Template{
 		$this->findTemplate($name);
 	}
 
+	/**
+	 * autodetects the formfactor of the used device
+	 * default -> the normal desktop browser interface
+	 * mobile -> interface for smartphones
+	 * tablet -> interface for tablets
+	 * standalone -> the default interface but without header, footer and
+	 * 	sidebar, just the application. Useful to use just a specific
+	 * 	app on the desktop in a standalone window.
+	 */
+	public static function detectFormfactor(){
+		// please add more useragent strings for other devices
+		if(isset($_SERVER['HTTP_USER_AGENT'])){
+			if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) {
+				$mode='tablet';
+			}elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0){
+				$mode='mobile';
+			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)){
+				$mode='mobile';
+			}else{
+				$mode='default';
+			}
+		}else{
+			$mode='default';
+		}
+		return($mode);
+	}
+
 	/**
 	 * @brief Returns the formfactor extension for current formfactor
 	 */
 	static public function getFormFactorExtension()
 	{
+		// if the formfactor is not yet autodetected do the
+		// autodetection now. For possible formfactors check the
+		// detectFormfactor documentation
+		if(!isset($_SESSION['formfactor'])){
+			$_SESSION['formfactor'] = self::detectFormfactor();
+		}
+		// allow manual override via GET parameter
+		if(isset($_GET['formfactor'])){
+			$_SESSION['formfactor']=$_GET['formfactor'];
+		}
 		$formfactor=$_SESSION['formfactor'];
 		if($formfactor=='default') { 
 			$fext='';

From 180243d92a6e1261092c6262f02b20b2f3785ba7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 15:04:35 +0200
Subject: [PATCH 0490/1537] Move page layout handling to its own class

---
 lib/template.php       | 130 +------------------------------
 lib/templatelayout.php | 170 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+), 127 deletions(-)
 create mode 100644 lib/templatelayout.php

diff --git a/lib/template.php b/lib/template.php
index 7e2e1d4d52..a5d10c45d2 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -307,7 +307,7 @@ class OC_Template{
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
-		public function assign( $key, $value, $sanitizeHTML=true ){
+	public function assign( $key, $value, $sanitizeHTML=true ){
 		if($sanitizeHTML == true) {
 			if(is_array($value)) {
 				array_walk_recursive($value,'OC_Template::sanitizeHTML');
@@ -376,29 +376,6 @@ class OC_Template{
 		}
 	}
 
-	/*
-	 * @brief append the $file-url if exist at $root
-	 * @param $type of collection to use when appending
-	 * @param $root path to check
-	 * @param $web base for path
-	 * @param $file the filename
-	 */
-        public function appendIfExist($type, $root, $web, $file) {
-                if (is_file($root.'/'.$file)) {
-                		$pathes = explode('/', $file);
-                		if($type == 'cssfiles' && $root == OC::$APPSROOT && $pathes[0] == 'apps'){
-                				$app = $pathes[1];
-                				unset($pathes[0]);
-                				unset($pathes[1]);
-                				$path = implode('/', $pathes);
-                				$this->append( $type, OC_Helper::linkTo($app, $path));
-                		}else{
-                				$this->append( $type, $web.'/'.$file);
-                		}
-                        return true;
-                }
-                return false;
-        }
 	/**
 	 * @brief Proceeds the template
 	 * @returns content
@@ -410,109 +387,9 @@ class OC_Template{
 		$data = $this->_fetch();
 
 		if( $this->renderas ){
-			// Decide which page we show
-			if( $this->renderas == "user" ){
-				$page = new OC_Template( "core", "layout.user" );
-				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
+			$page = new OC_TemplateLayout($this->renderas);
+			if($this->renderas == 'user') {
 				$page->assign('requesttoken', $this->vars['requesttoken']);
-				if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
-					$page->assign('bodyid','body-settings', false);
-				}else{
-					$page->assign('bodyid','body-user', false);
-				}
-
-				// Add navigation entry
-				$navigation = OC_App::getNavigation();
-				$page->assign( "navigation", $navigation, false);
-				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation(), false);
-				foreach($navigation as $entry) {
-					if ($entry['active']) {
-						$page->assign( 'application', $entry['name'], false );
-						break;
-					}
-				}
-			}else{
-				$page = new OC_Template( "core", "layout.guest" );
-			}
-
-			// Read the selected theme from the config file
-			$theme=OC_Config::getValue( "theme" );
-
-			// Read the detected formfactor and use the right file name.
-			$fext = self::getFormFactorExtension();
-
-			$page->assign('jsfiles', array(), false);
-			// Add the core js files or the js files provided by the selected theme
-			foreach(OC_Util::$scripts as $script){
-				// Is it in 3rd party?
-                                if($page->appendIfExist('jsfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
-
-				// Is it in apps and overwritten by the theme?
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
-
-				// Is it part of an app?
-				}elseif($page->appendIfExist('jsfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
-
-				// Is it in the owncloud root but overwritten by the theme?
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
-
-				// Is it in the owncloud root ?
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
-
-				// Is in core but overwritten by a theme?
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
-
-				// Is it in core?
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
-				}elseif($page->appendIfExist('jsfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
-
-				}else{
-					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
-
-				}
-			}
-			// Add the css files
-			$page->assign('cssfiles', array());
-			foreach(OC_Util::$styles as $style){
-				// is it in 3rdparty?
-                                if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
-
-				// or in apps?
-				}elseif($page->appendIfExist('cssfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
-				}elseif($page->appendIfExist('cssfiles', OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
-
-				// or in the owncloud root?
-				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
-				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
-
-				// or in core ?
-				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
-				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
-
-				}else{
-					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
-				}
-			}
-			// Add the theme css files. you can override the default values here
-			if(!empty($theme)) {
-				foreach(OC_Util::$styles as $style){
-                                             if($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
-
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
-
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
-                                        }elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
-                                        }
-				}
 			}
 
 			// Add custom headers
@@ -521,7 +398,6 @@ class OC_Template{
 				$page->append('headers',$header);
 			}
 
-			// Add css files and js files
 			$page->assign( "content", $data, false );
 			return $page->fetchPage();
 		}
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
new file mode 100644
index 0000000000..e387309ad7
--- /dev/null
+++ b/lib/templatelayout.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_TemplateLayout extends OC_Template {
+	public function __construct( $renderas ){
+		// Decide which page we show
+		if( $renderas == 'user' ){
+			parent::__construct( 'core', 'layout.user' );
+			$this->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
+			if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
+				$this->assign('bodyid','body-settings', false);
+			}else{
+				$this->assign('bodyid','body-user', false);
+			}
+
+			// Add navigation entry
+			$navigation = OC_App::getNavigation();
+			$this->assign( 'navigation', $navigation, false);
+			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation(), false);
+			foreach($navigation as $entry) {
+				if ($entry['active']) {
+					$this->assign( 'application', $entry['name'], false );
+					break;
+				}
+			}
+		}else{
+			parent::__construct( 'core', 'layout.guest' );
+		}
+
+		// Add the core js files or the js files provided by the selected theme
+		$jsfiles = $this->findScripts(OC_Util::$scripts);
+		$this->assign('jsfiles', array(), false);
+		foreach($jsfiles as $info) {
+			$root = $info[0];
+			$web = $info[1];
+			$file = $info[2];
+			$this->append( 'jsfiles', $web.'/'.$file);
+		}
+
+		// Add the css files
+		$cssfiles = $this->findStyles(OC_Util::$styles);
+		$this->assign('cssfiles', array());
+		foreach($cssfiles as $info) {
+			$root = $info[0];
+			$web = $info[1];
+			$file = $info[2];
+			$paths = explode('/', $file);
+			if($root == OC::$APPSROOT && $paths[0] == 'apps'){
+				$app = $paths[1];
+				unset($paths[0]);
+				unset($paths[1]);
+				$path = implode('/', $paths);
+				$this->append( 'cssfiles', OC_Helper::linkTo($app, $path));
+			}else{
+				$this->append( 'cssfiles', $web.'/'.$file);
+			}
+		}
+	}
+
+	/*
+	 * @brief append the $file-url if exist at $root
+	 * @param $files array to append file info to
+	 * @param $root path to check
+	 * @param $web base for path
+	 * @param $file the filename
+	 */
+        public function appendIfExist(&$files, $root, $webroot, $file) {
+                if (is_file($root.'/'.$file)) {
+			$files[] = array($root, $webroot, $file);
+			return true;
+                }
+                return false;
+        }
+
+	public function findStyles($styles){
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( 'theme' );
+
+		// Read the detected formfactor and use the right file name.
+		$fext = self::getFormFactorExtension();
+
+		$files = array();
+		foreach($styles as $style){
+			// is it in 3rdparty?
+			if($this->appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
+
+			// or in apps?
+			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
+			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
+
+			// or in the owncloud root?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
+
+			// or in core ?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
+
+			}else{
+				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+				die();
+			}
+		}
+		// Add the theme css files. you can override the default values here
+		if(!empty($theme)) {
+			foreach($styles as $style){
+				     if($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
+				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
+
+				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
+				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
+
+				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
+				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
+				}
+			}
+		}
+		return $files;
+	}
+
+	public function findScripts($scripts){
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( 'theme' );
+
+		// Read the detected formfactor and use the right file name.
+		$fext = self::getFormFactorExtension();
+
+		$files = array();
+		foreach($scripts as $script){
+			// Is it in 3rd party?
+			if($this->appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+
+			// Is it in apps and overwritten by the theme?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
+
+			// Is it part of an app?
+			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
+			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
+
+			// Is it in the owncloud root but overwritten by the theme?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
+
+			// Is it in the owncloud root ?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
+
+			// Is in core but overwritten by a theme?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
+
+			// Is it in core?
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
+			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
+
+			}else{
+				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+				die();
+
+			}
+		}
+		return $files;
+	}
+}

From 3000e8f9d508088abe7bb9c2cbc8f3490fa36c9a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 15:35:04 +0200
Subject: [PATCH 0491/1537] Prepare template js and css functions for use in
 the js and css minimizers

---
 lib/templatelayout.php | 64 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index e387309ad7..1f82e82be7 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -32,8 +32,8 @@ class OC_TemplateLayout extends OC_Template {
 			parent::__construct( 'core', 'layout.guest' );
 		}
 
-		// Add the core js files or the js files provided by the selected theme
-		$jsfiles = $this->findScripts(OC_Util::$scripts);
+		// Add the js files
+		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
 		foreach($jsfiles as $info) {
 			$root = $info[0];
@@ -43,7 +43,7 @@ class OC_TemplateLayout extends OC_Template {
 		}
 
 		// Add the css files
-		$cssfiles = $this->findStyles(OC_Util::$styles);
+		$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
 		$this->assign('cssfiles', array());
 		foreach($cssfiles as $info) {
 			$root = $info[0];
@@ -69,7 +69,7 @@ class OC_TemplateLayout extends OC_Template {
 	 * @param $web base for path
 	 * @param $file the filename
 	 */
-        public function appendIfExist(&$files, $root, $webroot, $file) {
+        static public function appendIfExist(&$files, $root, $webroot, $file) {
                 if (is_file($root.'/'.$file)) {
 			$files[] = array($root, $webroot, $file);
 			return true;
@@ -77,7 +77,7 @@ class OC_TemplateLayout extends OC_Template {
                 return false;
         }
 
-	public function findStyles($styles){
+	static public function findStylesheetFiles($styles){
 		// Read the selected theme from the config file
 		$theme=OC_Config::getValue( 'theme' );
 
@@ -87,19 +87,19 @@ class OC_TemplateLayout extends OC_Template {
 		$files = array();
 		foreach($styles as $style){
 			// is it in 3rdparty?
-			if($this->appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
+			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
 
 			// or in apps?
-			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
-			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
+			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
+			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
 
 			// or in the owncloud root?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
 
 			// or in core ?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 			}else{
 				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -109,21 +109,21 @@ class OC_TemplateLayout extends OC_Template {
 		// Add the theme css files. you can override the default values here
 		if(!empty($theme)) {
 			foreach($styles as $style){
-				     if($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
-				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
+				     if(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
+				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
 
-				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
-				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
+				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
+				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
 
-				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
-				}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
+				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
+				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
 				}
 			}
 		}
 		return $files;
 	}
 
-	public function findScripts($scripts){
+	static public function findJavascriptFiles($scripts){
 		// Read the selected theme from the config file
 		$theme=OC_Config::getValue( 'theme' );
 
@@ -133,31 +133,31 @@ class OC_TemplateLayout extends OC_Template {
 		$files = array();
 		foreach($scripts as $script){
 			// Is it in 3rd party?
-			if($this->appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
 
 			// Is it in apps and overwritten by the theme?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
 
 			// Is it part of an app?
-			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
-			}elseif($this->appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
+			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
+			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
 
 			// Is it in the owncloud root but overwritten by the theme?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
 
 			// Is it in the owncloud root ?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
 
 			// Is in core but overwritten by a theme?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
 
 			// Is it in core?
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
-			}elseif($this->appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
+			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
 
 			}else{
 				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

From 2f00384b5124ec0b3f3703d73a11a129aff93a62 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 15:40:43 +0200
Subject: [PATCH 0492/1537] Use TemplateLayout functions for finding js and css
 files in minimizer

---
 core/minimizer.php    |  4 ++--
 lib/minimizer.php     | 13 +------------
 lib/minimizer/css.php | 44 -------------------------------------------
 lib/minimizer/js.php  | 43 ------------------------------------------
 4 files changed, 3 insertions(+), 101 deletions(-)

diff --git a/core/minimizer.php b/core/minimizer.php
index 47e3d855e7..0abbca7502 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -5,11 +5,11 @@ OC_App::loadApps();
 
 if ($service == 'core.css'){
 	$minimizer = new OC_Minimizer_CSS();
-	$files = $minimizer->findFiles(OC_Util::$core_styles);
+	$files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
 	$minimizer->output($files, $service);
 }
 else if ($service == 'core.js'){
 	$minimizer = new OC_Minimizer_JS();
-	$files = $minimizer->findFiles(OC_Util::$core_scripts);
+	$files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
 	$minimizer->output($files, $service);
 }
diff --git a/lib/minimizer.php b/lib/minimizer.php
index 428fa477f7..e17c114f06 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -1,17 +1,6 @@
 <?php
 
-abstract class OC_Minimizer
-{
-	protected $files = array();
-
-	protected function appendIfExist($root, $webroot, $file) {
-                if (is_file($root.'/'.$file)) {
-			$this->files[] = array($root, $webroot, $file);
-                        return true;
-                }
-                return false;
-	}
-
+abstract class OC_Minimizer {
 	public function getLastModified($files) {
 		$last_modified = 0;
 		foreach($files as $file_info) {
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 09a0efdc3a..da502bfa9e 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -6,50 +6,6 @@ class OC_Minimizer_CSS extends OC_Minimizer
 {
 	protected $contentType = 'text/css';
 
-	public function findFiles($styles) {
-		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( "theme" );
-
-		// Read the detected formfactor and use the right file name.
-		$fext = OC_Template::getFormFactorExtension();
-		foreach($styles as $style){
-			// is it in 3rdparty?
-			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
-
-			// or in apps?
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
-
-			// or in the owncloud root?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
-
-			// or in core ?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
-
-			}else{
-				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
-			}
-		}
-		// Add the theme css files. you can override the default values here
-		if(!empty($theme)) {
-			foreach($styles as $style){
-				     if($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
-				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
-
-				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
-				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
-
-				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
-				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
-				}
-			}
-		}
-		return $this->files;
-	}
-
 	public function minimizeFiles($files) {
 		$css_out = '';
 		$appswebroot = (string) OC::$APPSWEBROOT;
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index b9a023e068..0f5cb7e557 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -6,49 +6,6 @@ class OC_Minimizer_JS extends OC_Minimizer
 {
 	protected $contentType = 'application/javascript';
 
-	public function findFiles($scripts) {
-		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( "theme" );
-
-		// Read the detected formfactor and use the right file name.
-		$fext = OC_Template::getFormFactorExtension();
-		// Add the core js files or the js files provided by the selected theme
-		foreach($scripts as $script){
-			// Is it in 3rd party?
-			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
-
-			// Is it in apps and overwritten by the theme?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
-
-			// Is it part of an app?
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
-
-			// Is it in the owncloud root but overwritten by the theme?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
-
-			// Is it in the owncloud root ?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
-
-			// Is in core but overwritten by a theme?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
-
-			// Is it in core?
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
-			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
-
-			}else{
-				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
-			}
-		}
-		return $this->files;
-	}
-
 	public function minimizeFiles($files) {
 		$js_out = '';
 		foreach($files as $file_info) {

From 13aad8f06d2872a9af6f08787101bcf4f7013f05 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 18 Jun 2012 15:58:01 +0200
Subject: [PATCH 0493/1537] some little fixes for repeating events caching

---
 apps/calendar/lib/app.php    |  6 +++---
 apps/calendar/lib/object.php | 10 ++++++----
 apps/calendar/lib/repeat.php |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index e3be8c8428..c5fb501ce3 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -399,11 +399,11 @@ class OC_Calendar_App{
 			}
 		}else{
 			$object->expand($start, $end);
-			foreach($object->getComponents() as $vevent){
-				if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
+			foreach($object->getComponents() as $singleevent){
+				if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;
 				}
-				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), self::$tz);
+				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($singleevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($singleevent), $allday, self::$tz);
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 07f2afb7b5..12dbd3b8b4 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -304,8 +304,7 @@ class OC_Calendar_Object{
 		return date('Y-m-d H:i', $datetime->format('U') - $datetime->getOffset());
 	}
 
-	public static function getDTEndFromVEvent($vevent)
-	{
+	public static function getDTEndFromVEvent($vevent){
 		if ($vevent->DTEND) {
 			$dtend = $vevent->DTEND;
 		}else{
@@ -808,13 +807,16 @@ class OC_Calendar_Object{
 		return ($event['repeating'] == 1)?true:false;
 	}
 
-	public static function generateStartEndDate($dtstart, $dtend, $tz){
+	public static function generateStartEndDate($dtstart, $dtend, $allday, $tz){
 		$start_dt = $dtstart->getDateTime();
 		$end_dt = $dtend->getDateTime();
 		$return = array();
 		if($allday){
 			$return['start'] = $start_dt->format('Y-m-d');
-			$end_dt->modify('-1 hour');
+			$end_dt->modify('-1 day');
+			while($start_dt->format('U') >= $end_dt->format('U')){
+				$end_dt->modify('+1 day');
+			}
 			$return['end'] = $end_dt->format('Y-m-d');
 		}else{
 			$start_dt->setTimezone(new DateTimeZone($tz));
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 6976378ebd..204f96a5a2 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -98,7 +98,7 @@ class OC_Calendar_Repeat{
 			if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
 				continue;
 			}
-			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), 'UTC');
+			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false, 'UTC');
 			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_repeat (eventid,calid,startdate,enddate) VALUES(?,?,?,?)');
 			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startenddate['start'],$startenddate['end']));
 		}
@@ -111,8 +111,8 @@ class OC_Calendar_Repeat{
 	 */
 	public static function generateCalendar($id){
 		$allobjects = OC_Calendar_Object::all($id);
-		foreach($allobjects['id'] as $eventid){
-			self::generate($eventid);
+		foreach($allobjects as $event){
+			self::generate($event['id']);
 		}
 		return true;
 	}

From d496a5e19fbe70d2313cae17be0e788ac6487cd0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 17:23:54 +0200
Subject: [PATCH 0494/1537] ignore "Shared"-directory when calculating free
 space

---
 lib/fileproxy/quota.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index f061d48219..dab41c5e90 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -55,7 +55,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 */
 	private function getFreeSpace(){
 		$rootInfo=OC_FileCache_Cached::get('');
+		$sharedInfo=OC_FileCache_Cached::get('/Shared');
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
+		$usedSpace=isset($sharedInfo['size'])?$rootInfo['size']-$sharedInfo['size']:$rootInfo['size'];
 		$totalSpace=$this->getQuota();
 		if($totalSpace==0){
 			return 0;

From debd9c8dfb900658d6698738d47e7e88ec862dfa Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 18 Jun 2012 18:17:49 +0200
Subject: [PATCH 0495/1537] fix problem with encryption flag not being saved
 correctly in the filecache

---
 apps/files_encryption/lib/cryptstream.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 56331cbf60..64fec381de 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -159,7 +159,7 @@ class OC_CryptStream{
 	public function stream_close(){
 		$this->flush();
 		if($this->meta['mode']!='r' and $this->meta['mode']!='rb'){
-			OC_FileCache::put($this->path,array('encrypted'=>true));
+			OC_FileCache::put($this->path,array('encrypted'=>true),'');
 		}
 		return fclose($this->source);
 	}

From cfb3b633f50decbe0ebd04ba46eaea5f4e5fa226 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 18 Jun 2012 19:51:46 +0000
Subject: [PATCH 0496/1537] Force sanitize function to use UTF8 (for php lower
 than 5.4)

---
 lib/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template.php b/lib/template.php
index a5d10c45d2..77e9332d5b 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -326,7 +326,7 @@ class OC_Template{
 	 * This function is internally used to sanitize HTML.
 	 */
  	private static function sanitizeHTML( &$value ){
- 			$value = htmlentities( $value );
+ 			$value = htmlentities( $value , ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
  			return $value;
     }
 

From a1364c9726b1511a193ced8dac00e44d5515437b Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 18 Jun 2012 22:48:52 +0200
Subject: [PATCH 0497/1537] fixes oc-1026

---
 apps/files_sharing/get.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index e2fcb82750..a051451d33 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -61,7 +61,7 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
 		$list->assign("downloadURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path=");
 		$list->assign("readonly", true);
 		$tmpl = new OCP\Template("files", "index", "user");
-		$tmpl->assign("fileList", $list->fetchPage());
+		$tmpl->assign("fileList", $list->fetchPage(), false);
 		$tmpl->assign("breadcrumb", $breadcrumbNav->fetchPage());
 		$tmpl->assign("readonly", true);
 		$tmpl->assign("allowZipDownload", false);

From d4044d0283147df678dc0f833abfcc844e0eff75 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 18 Jun 2012 21:16:51 +0200
Subject: [PATCH 0498/1537] Delay loading of translations until they are used

---
 lib/l10n.php        | 30 +++++++++++++++++++++++-------
 lib/l10n/string.php | 25 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 lib/l10n/string.php

diff --git a/lib/l10n.php b/lib/l10n.php
index ba4bf23780..0f01e927ff 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -39,6 +39,16 @@ class OC_L10N{
 	 */
 	protected static $language = '';
 	
+	/**
+	 * App of this object
+	 */
+	protected $app;
+
+	/**
+	 * Language of this object
+	 */
+	protected $lang;
+
 	/**
 	 * Translations
 	 */
@@ -77,10 +87,17 @@ class OC_L10N{
 	 * language.
 	 */
 	public function __construct($app, $lang = null){
-		$this->init($app, $lang);
+		$this->app = $app;
+		$this->lang = $lang;
 	}
 		
-	protected function init($app, $lang = null){
+	protected function init(){
+		if ($this->app === true) {
+			return;
+		}
+		$app = $this->app;
+		$lang = $this->lang;
+		$this->app = true;
 		// Find the right language
 		if(is_null($lang)){
 			$lang = self::findLanguage($app);
@@ -127,10 +144,7 @@ class OC_L10N{
 	 * returned.
 	 */
 	public function t($text, $parameters = array()){
-		if(array_key_exists($text, $this->translations)){
-			return vsprintf($this->translations[$text], $parameters);
-		}
-		return vsprintf($text, $parameters);
+		return new OC_L10N_String($this, $text, $parameters);
 	}
 
 	/**
@@ -144,7 +158,7 @@ class OC_L10N{
 	public function tA($textArray){
 		$result = array();
 		foreach($textArray as $key => $text){
-			$result[$key] = $this->t($text);
+			$result[$key] = (string)$this->t($text);
 		}
 		return $result;
 	}
@@ -156,6 +170,7 @@ class OC_L10N{
 	 * Returns an associative array with all translations
 	 */
 	public function getTranslations(){
+		$this->init();
 		return $this->translations;
 	}
 
@@ -182,6 +197,7 @@ class OC_L10N{
 	 *    - params: timestamp (int/string)
 	 */
 	public function l($type, $data){
+		$this->init();
 		switch($type){
 			// If you add something don't forget to add it to $localizations
 			// at the top of the page
diff --git a/lib/l10n/string.php b/lib/l10n/string.php
new file mode 100644
index 0000000000..4769790a16
--- /dev/null
+++ b/lib/l10n/string.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_L10N_String{
+	protected $l10n;
+	public function __construct($l10n, $text, $parameters){
+		$this->l10n = $l10n;
+		$this->text = $text;
+		$this->parameters = $parameters;
+
+	}
+
+	public function __toString(){
+		$translations = $this->l10n->getTranslations();
+		if(array_key_exists($this->text, $translations)){
+			return vsprintf($translations[$this->text], $this->parameters);
+		}
+		return vsprintf($this->text, $this->parameters);
+	}
+}

From 0132b802827c221bbee2050c70caed36619d4d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Mon, 18 Jun 2012 23:18:32 +0200
Subject: [PATCH 0499/1537] added CSS class .headerAction

---
 core/css/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 6c5c264353..3b94978717 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -111,8 +111,8 @@ label.infield { cursor: text !important; }
 
 .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; }
+#logout, .headerAction { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
+.action:hover, .selectedActions a:hover, #logout:hover, .headerAction: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; }

From c3cd3f357135ac21c00d089d0cce477122190b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Mon, 18 Jun 2012 23:22:52 +0200
Subject: [PATCH 0500/1537] CSS class headerAction -> header-action

---
 core/css/styles.css            | 4 ++--
 core/templates/layout.user.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 3b94978717..44fd1e084f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -111,8 +111,8 @@ label.infield { cursor: text !important; }
 
 .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, .headerAction { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-.action:hover, .selectedActions a:hover, #logout:hover, .headerAction: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; }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index c6696fc72b..500ac9beda 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -45,7 +45,7 @@
 	<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>
-			<a class="header-right" 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>
+			<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 htmlentities($_POST['query']);};?>" autocomplete="off" />
 			</form>

From c1df0539a087f2e8964357e96a05c6887b188c7f Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 18 Jun 2012 23:33:02 +0200
Subject: [PATCH 0501/1537] fixes oc-668

---
 lib/helper.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/helper.php b/lib/helper.php
index 2ded7b13c3..480c3fe930 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -378,6 +378,12 @@ class OC_Helper {
 
 			//trim the character set from the end of the response
 			$mimeType=substr($reply,0,strrpos($reply,' '));
+
+			//trim ; 
+			if (strpos($mimeType, ';') !== false) {
+				$mimeType = strstr($mimeType, ';', true);
+			}
+
 		}
 		if ($mimeType=='application/octet-stream') {
 			// Fallback solution: (try to guess the type by the file extension

From 0469f529fa3c5bb5c643f4c253f886f58ca50ba7 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 19 Jun 2012 09:35:13 +0200
Subject: [PATCH 0502/1537] quota calculation fixed

---
 lib/fileproxy/quota.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index dab41c5e90..b0c3775b9d 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -57,7 +57,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		$rootInfo=OC_FileCache_Cached::get('');
 		$sharedInfo=OC_FileCache_Cached::get('/Shared');
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
-		$usedSpace=isset($sharedInfo['size'])?$rootInfo['size']-$sharedInfo['size']:$rootInfo['size'];
+		$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
 		$totalSpace=$this->getQuota();
 		if($totalSpace==0){
 			return 0;

From c8c105df3339ad9fe06b8631a1f933fcb6279025 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 19 Jun 2012 13:04:11 +0200
Subject: [PATCH 0503/1537] Calendar: fix modifying of end DateTime object

---
 apps/calendar/lib/object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 12dbd3b8b4..2e0d37d14a 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -813,7 +813,7 @@ class OC_Calendar_Object{
 		$return = array();
 		if($allday){
 			$return['start'] = $start_dt->format('Y-m-d');
-			$end_dt->modify('-1 day');
+			$end_dt->modify('-1 minute');
 			while($start_dt->format('U') >= $end_dt->format('U')){
 				$end_dt->modify('+1 day');
 			}

From 2b2da6fe35fc0709f281d0d6e7864a21064f3ae9 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 19 Jun 2012 13:26:55 +0200
Subject: [PATCH 0504/1537] Calendar: js fix

---
 apps/calendar/js/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index eafd503c99..03e4217573 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -53,7 +53,7 @@ $(document).ready(function(){
 });
 function calendarcachecheck(){
 	$.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) {
-		$('#cleancalendarcache').attr('title', jsondata.l10n);
+		$('#cleancalendarcache').attr('title', jsondata.l10n.text);
 		if(jsondata.status == 'success'){
 			$('#cleancalendarcache').css('background', '#90EE90');
 			$('#cleancalendarcache').css('color', '#333');

From 5ce0097b6f89dc0a14bb946b8ab457127f00edb1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 19 Jun 2012 13:30:45 +0200
Subject: [PATCH 0505/1537] Calendar: only run ->expand if the event is
 repeating

---
 apps/calendar/lib/app.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index c5fb501ce3..167382a5e7 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -398,7 +398,9 @@ class OC_Calendar_App{
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}else{
-			$object->expand($start, $end);
+			if(OC_Calendar_Object::isrepeating($id)){
+				$object->expand($start, $end);
+			}
 			foreach($object->getComponents() as $singleevent){
 				if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;

From 33aec973dfdce7307480f03417b14de55f30d9d2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 19 Jun 2012 14:55:14 +0200
Subject: [PATCH 0506/1537] Loading of contacts was placed outside of
 $(document).ready() function.

---
 apps/contacts/js/contacts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 1408e840f2..56dc2d422c 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1699,5 +1699,6 @@ $(document).ready(function(){
 	}
 	$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
 	$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
+
+	Contacts.UI.Contacts.update();
 });
-Contacts.UI.Contacts.update();

From 0b9a48b4b6fe7f75475c931c554fc9208a697113 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 19 Jun 2012 14:56:21 +0200
Subject: [PATCH 0507/1537] Re-add missing loadhandlers() call.

---
 apps/contacts/js/contacts.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 56dc2d422c..2319334c58 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1700,5 +1700,6 @@ $(document).ready(function(){
 	$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
 	$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 
+	Contacts.UI.loadHandlers();
 	Contacts.UI.Contacts.update();
 });

From d2936bd90caa2b256d32e7d349449ed58b28107b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 19 Jun 2012 17:20:19 +0200
Subject: [PATCH 0508/1537] introducing a sanitize HTML function for the
 internal and the public API. This allows to easily convert strings to HTML
 before displaying them on the web page to reduce the risk of xss
 vulnerabilities.

---
 lib/public/util.php | 12 ++++++++++++
 lib/util.php        | 17 ++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/public/util.php b/lib/public/util.php
index d79d3f26b1..7c0cb66607 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -264,6 +264,18 @@ class Util {
 	public static function callCheck(){
 		return(\OC_Util::callCheck());
 	}
+	
+	/**
+	 * @brief Used to sanitize HTML
+	 *
+	 * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page.
+	 *
+	 * @param string or array of strings
+	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+	 */
+	public static function sanitizeHTML( $value ){
+		return(\OC_Util::sanitizeHTML($value)); //Specify encoding for PHP<5.4
+	}
 }
 
 ?>
diff --git a/lib/util.php b/lib/util.php
index 0266a8ecc5..bcfeb417c1 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -370,7 +370,7 @@ class OC_Util {
 		$_SESSION['requesttoken-'.$token]=time();
 
 		// cleanup old tokens garbage collector
-		// only run every 20th time so we don�t waste cpu cycles
+		// only run every 20th time so we don't waste cpu cycles
 		if(rand(0,20)==0) {  
 			foreach($_SESSION as $key=>$value) {
 				// search all tokens in the session
@@ -426,4 +426,19 @@ class OC_Util {
 			exit;
 		}
 	}
+	
+	/**
+	 * @brief Public function to sanitize HTML
+	 *
+	 * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page.
+	 * 
+	 * @param string or array of strings
+	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+	 */
+	public static function sanitizeHTML( &$value ){
+		if (is_array($value) || is_object($value)) array_walk_recursive($value,'OC_Util::sanitizeHTML');
+		else $value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+		return $value;
+	}
+
 }

From 089ae980c40544de54a10d407fd366f61ef5ec48 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 19 Jun 2012 17:24:55 +0200
Subject: [PATCH 0509/1537] use new sanitize HTML function

---
 index.php                | 2 +-
 lib/template.php         | 8 +-------
 settings/admin.php       | 2 +-
 settings/ajax/getlog.php | 2 +-
 settings/js/log.js       | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index 1171c0fe0c..e3c94adf66 100755
--- a/index.php
+++ b/index.php
@@ -122,7 +122,7 @@ elseif(OC_User::isLoggedIn()) {
 	if(!array_key_exists('sectoken', $_SESSION) || (array_key_exists('sectoken', $_SESSION) && is_null(OC::$REQUESTEDFILE)) || substr(OC::$REQUESTEDFILE, -3) == 'php'){
 		$sectoken=rand(1000000,9999999);
 		$_SESSION['sectoken']=$sectoken;
-		$redirect_url = (isset($_REQUEST['redirect_url'])) ? strip_tags($_REQUEST['redirect_url']) : $_SERVER['REQUEST_URI'];
+		$redirect_url = (isset($_REQUEST['redirect_url'])) ? OC_Util::sanitizeHTML($_REQUEST['redirect_url']) : $_SERVER['REQUEST_URI'];
 		OC_Template::printGuestPage('', 'login', array('error' => $error, 'sectoken' => $sectoken, 'redirect' => $redirect_url));
 	}
 }
diff --git a/lib/template.php b/lib/template.php
index 77e9332d5b..75b33d8aac 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -308,13 +308,7 @@ class OC_Template{
 	 * If the key existed before, it will be overwritten
 	 */
 	public function assign( $key, $value, $sanitizeHTML=true ){
-		if($sanitizeHTML == true) {
-			if(is_array($value)) {
-				array_walk_recursive($value,'OC_Template::sanitizeHTML');
-			} else {
-				$value = OC_Template::sanitizeHTML($value);
-			}
-		}
+		if($sanitizeHTML == true) $value=OC_Util::sanitizeHTML($value);
 		$this->vars[$key] = $value;
 		return true;
 	}
diff --git a/settings/admin.php b/settings/admin.php
index 4cbd67c367..a997bad4e3 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -23,7 +23,7 @@ function compareEntries($a,$b){
 usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',$entries,false);
+$tmpl->assign('entries',$entries);
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index ed48b2cae1..d9e80de37b 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -14,4 +14,4 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count,$offset);
-OC_JSON::success(array("data" => $entries));
+OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries)));
diff --git a/settings/js/log.js b/settings/js/log.js
index bde8b8b104..6063c7d9a9 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -39,7 +39,7 @@ OC.Log={
 			row.append(appTd);
 			
 			var messageTd=$('<td/>');
-			messageTd.text(entry.message.replace(/</, "&lt;").replace(/>/, "&gt;"));
+			messageTd.text(entry.message);
 			row.append(messageTd);
 			
 			var timeTd=$('<td/>');

From 4b6f6291c524648ffaa77683d77b486bb467b7e8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 19 Jun 2012 17:54:19 +0200
Subject: [PATCH 0510/1537] Remember result of OC_User::isLoggedIn, can be very
 expensive to check

---
 lib/user.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index f1903093d6..23b88aa1d0 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -240,13 +240,17 @@ class OC_User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn(){
+		static $is_login_checked = null;
+		if (!is_null($is_login_checked)) {
+			return $is_login_checked;
+		}
 		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
 			OC_App::loadApps(array('authentication'));
 			if (self::userExists($_SESSION['user_id']) ){
-				return true;
+				return $is_login_checked = true;
 			}
 		}
-		return false;
+		return $is_login_checked = false;
 	}
 
 	/**

From f11e4d7cd6c5cae9a0be52dff0bb2f32e20e7099 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 19 Jun 2012 19:29:43 +0200
Subject: [PATCH 0511/1537] removing sanitizeHTML() function from template.php
 since I moved it to util.php to make it more generic.

---
 lib/template.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/template.php b/lib/template.php
index 75b33d8aac..8fb0133b28 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -313,17 +313,6 @@ class OC_Template{
 		return true;
 	}
 
-
-	/**
-	 * @brief Internaly used to sanitze HTML
-	 *
-	 * This function is internally used to sanitize HTML.
-	 */
- 	private static function sanitizeHTML( &$value ){
- 			$value = htmlentities( $value , ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
- 			return $value;
-    }
-
 	/**
 	 * @brief Appends a variable
 	 * @param $key key

From 28a72e0e3c25ecf8cc5ab61a4398ab687072b203 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 19 Jun 2012 19:42:40 +0100
Subject: [PATCH 0512/1537] Fixed deleteAll function for deleting all old
 versions of files (expireAll) Added new readdir() method to all storage
 classes and handlers (only working implementation in local.php)

---
 apps/files_archive/lib/storage.php   |  1 +
 apps/files_sharing/sharedstorage.php |  2 +
 apps/files_versions/versions.php     | 68 ++++++++++++++++++----------
 lib/filestorage.php                  |  1 +
 lib/filestorage/local.php            |  3 ++
 lib/filesystem.php                   |  3 ++
 lib/filesystemview.php               |  4 ++
 7 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index 8676166361..2f10d6a3e4 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -49,6 +49,7 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 		OC_FakeDirStream::$dirs[$id]=$content;
 		return opendir('fakedir://'.$id);
 	}
+	public function readdir($path){}
 	public function stat($path){
 		$ctime=filectime($this->path);
 		$path=$this->stripPath($path);
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 1a6942ad16..9174334383 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -139,6 +139,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
+	public function readdir( $path ) {}
+	
 	public function is_dir($path) {
 		if ($path == "" || $path == "/") {
 			return true;
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 44ce7c635a..6feb0cbb9c 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -303,66 +303,88 @@ class Storage {
          */
         public static function expireAll() {
 	
-		function deleteAll($directory, $empty = false) {
+		function deleteAll( $directory, $empty = false ) {
 		
-			if(substr($directory,-1) == "/") {
-				$directory = substr($directory,0,-1);
+			// strip leading slash
+			if( substr( $directory, 0, 1 ) == "/" ) {
+			
+				$directory = substr( $directory, 1 );
+				
+			}
+			
+			// strip trailing slash
+			if( substr( $directory, -1) == "/" ) {
+			
+				$directory = substr( $directory, 0, -1 );
+				
 			}
 
-			if(!file_exists($directory) || !is_dir($directory)) {
+			$view = new \OC_FilesystemView('');
+			
+			if ( !$view->file_exists( $directory ) || !$view->is_dir( $directory ) ) {
 			
 				return false;
 				
-			} elseif(!is_readable($directory)) {
+			} elseif( !$view->is_readable( $directory ) ) {
 			
 				return false;
 				
 			} else {
 			
-				$directoryHandle = opendir($directory);
-			
-				while ($contents = readdir($directoryHandle)) {
+				$foldername = \OCP\Config::getSystemValue('datadirectory') .'/' . \OCP\USER::getUser() .'/' . $directory; // have to set an absolute path for use with PHP's opendir as OC version doesn't work
 				
-					if( $contents != '.' && $contents != '..') {
+				$directoryHandle = opendir( $foldername );	
+			
+				while ( $contents = $view->readdir( $directoryHandle ) ) {
+				
+					if ( $contents != '.' && $contents != '..') {
 						
 						$path = $directory . "/" . $contents;
 					
-						if( is_dir($path) ) {
+						if ( $view->is_dir( $path ) ) {
 							
-							deleteAll($path);
+							deleteAll( $path );
 						
 						} else {
-						
-							unlink($path);
+							
+							$view->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
 						
 						}
 					}
 				
 				}
 			
-				closedir( $directoryHandle );
+				//$view->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
 
-				if( $empty == false ) {
+				if ( $empty == false ) {
 				
-					if(!rmdir($directory)) {
+					if ( !$view->rmdir( $directory ) ) {
 					
 						return false;
 						
 					}
 					
-				}
+ 				}
 			
 				return true;
 			}
 			
 		}
-	
-		/*	
-		// FIXME: make this path dynamic
-		$dir = '/home/samtuke/owncloud/git/oc5/data/admin/versions';
+		
+		$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+		
+		deleteAll( $dir, true );
 
-		( deleteAll( $dir, 1 ) ? return true : return false );
-		*/
+// 		if ( deleteAll( $dir, 1 ) ) {
+// 		
+// 			echo "<h1>deleted ok</h1>";
+// 			
+// 		} else {
+// 			
+// 			echo "<h1>not deleted</h1>";
+// 			
+// 		}
+	
         }
 
 
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 71ef4aed00..bf353bb0cc 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -28,6 +28,7 @@ abstract class OC_Filestorage{
 	abstract public function mkdir($path);
 	abstract public function rmdir($path);
 	abstract public function opendir($path);
+	abstract public function readdir($path);
 	abstract public function is_dir($path);
 	abstract public function is_file($path);
 	abstract public function stat($path);
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 44a2ab0f63..27794fe17c 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -20,6 +20,9 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function opendir($path){
 		return opendir($this->datadir.$path);
 	}
+	public function readdir($handle){
+		return readdir($handle);
+	}
 	public function is_dir($path){
 		if(substr($path,-1)=='/'){
 			$path=substr($path,0,-1);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 89de533d72..0d0943d363 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -399,6 +399,9 @@ class OC_Filesystem{
 	static public function opendir($path){
 		return self::$defaultInstance->opendir($path);
 	}
+	static public function readdir($path){
+		return self::$defaultInstance->readdir($path);
+	}
 	static public function is_dir($path){
 		return self::$defaultInstance->is_dir($path);
 	}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 813a87cd74..da622bcf92 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -158,6 +158,10 @@ class OC_FilesystemView {
 	public function opendir($path){
 		return $this->basicOperation('opendir',$path,array('read'));
 	}
+	public function readdir($handle){
+		$fsLocal= new OC_Filestorage_Local( array( 'datadir' => '/' ) );
+		return $fsLocal->readdir( $handle );
+	}
 	public function is_dir($path){
 		if($path=='/'){
 			return true;

From d8b32c2f0e962531fa36707faa6deed6ebb2e378 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 19 Jun 2012 22:12:05 +0200
Subject: [PATCH 0513/1537] Move check code from setupFS to checkServer

---
 lib/util.php | 54 +++++++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index bcfeb417c1..b6564468ff 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -19,41 +19,12 @@ class OC_Util {
 			return false;
 		}
 
-		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", OC::$SERVERROOT."/backup" );
-
-		// Check if config folder is writable.
-		if(!is_writable(OC::$SERVERROOT."/config/")) {
-			$tmpl = new OC_Template( '', 'error', 'guest' );
-			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
-			$tmpl->printPage();
-			exit;
-		}
-		
-		// Check if apps folder is writable.
-		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
-			$tmpl = new OC_Template( '', 'error', 'guest' );
-			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
-			$tmpl->printPage();
-			exit;
-		}
-		
-		// Create root dir.
-		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
-			$success=@mkdir($CONFIG_DATADIRECTORY_ROOT);
-			if(!$success) {
-				$tmpl = new OC_Template( '', 'error', 'guest' );
-				$tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ")));
-				$tmpl->printPage();
-				exit;
-  			}
-		}
-
 		// If we are not forced to load a specific user we load the one that is logged in
 		if( $user == "" && OC_User::isLoggedIn()){
 			$user = OC_User::getUser();
 		}
 
+		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
 		if(!self::$rootMounted){
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
@@ -209,9 +180,6 @@ class OC_Util {
 	 * @return array arrays with error messages and hints
 	 */
 	public static function checkServer(){
-		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", OC::$SERVERROOT."/backup" );
-		$CONFIG_INSTALLED = OC_Config::getValue( "installed", false );
 		$errors=array();
 
 		//check for database drivers
@@ -224,6 +192,17 @@ class OC_Util {
 		//common hint for all file permissons error messages
 		$permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory";
 
+		// Check if config folder is writable.
+		if(!is_writable(OC::$SERVERROOT."/config/")) {
+			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
+		}
+
+		// Check if apps folder is writable.
+		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
+			$errors[]=array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
+		}
+
+		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//check for correct file permissions
 		if(!stristr(PHP_OS, 'WIN')){
                 	$permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
@@ -237,6 +216,7 @@ class OC_Util {
 				}
 			}
 			if( OC_Config::getValue( "enablebackup", false )){
+				$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", OC::$SERVERROOT."/backup" );
 				$prems=substr(decoct(@fileperms($CONFIG_BACKUPDIRECTORY)),-3);
 				if(substr($prems,-1)!='0'){
 					OC_Helper::chmodr($CONFIG_BACKUPDIRECTORY,0770);
@@ -250,7 +230,13 @@ class OC_Util {
 		}else{
 			//TODO: permissions checks for windows hosts
 		}
-		if(is_dir($CONFIG_DATADIRECTORY_ROOT) and !is_writable($CONFIG_DATADIRECTORY_ROOT)){
+		// Create root dir.
+		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
+			$success=@mkdir($CONFIG_DATADIRECTORY_ROOT);
+			if(!$success) {
+				$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
+			}
+		} else if(!is_writable($CONFIG_DATADIRECTORY_ROOT)){
 			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
 		}
 

From f54ef5a464e3530da36f2ebe7f88052cac0c6ad0 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 19 Jun 2012 22:50:28 +0200
Subject: [PATCH 0514/1537] Remove OC::$CONFIG_DATADIRECTORY, not used

---
 lib/base.php  | 12 ------------
 lib/files.php |  5 +----
 lib/util.php  | 34 +++++++++++++++++-----------------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index db55504117..6e209afebd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -42,10 +42,6 @@ class OC{
 	 * the owncloud root path for http requests (e.g. owncloud/)
 	 */
 	public static $WEBROOT = '';
-	/**
-	 * the folder that stores that data files for the filesystem of the user (e.g. /srv/http/owncloud/data/myusername/files)
-	 */
-	public static $CONFIG_DATADIRECTORY = '';
 	/**
 	 * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
 	 */
@@ -349,19 +345,11 @@ class OC{
 			exit;
 		}
 
-		// TODO: we should get rid of this one, too
-		// WARNING: to make everything even more confusing,
-		//   DATADIRECTORY is a var that changes and DATADIRECTORY_ROOT
-		//   stays the same, but is set by "datadirectory".
-		//   Any questions?
-		OC::$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-
 		// User and Groups
 		if( !OC_Config::getValue( "installed", false )){
 			$_SESSION['user_id'] = '';
 		}
 
-
 		OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 		OC_Group::useBackend(new OC_Group_Database());
 
diff --git a/lib/files.php b/lib/files.php
index 3ecf08739b..469c3a15b8 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -30,12 +30,9 @@ class OC_Files {
 
 	/**
 	* get the content of a directory
-	* @param dir $directory
+	* @param dir $directory path under datadirectory
 	*/
 	public static function getDirectoryContent($directory, $mimetype_filter = ''){
-		if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){
-			$directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY));
-		}
 		$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
 		foreach($files as &$file){
 			$file['directory']=$directory;
diff --git a/lib/util.php b/lib/util.php
index b6564468ff..5492587862 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -24,16 +24,16 @@ class OC_Util {
 			$user = OC_User::getUser();
 		}
 
-		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
+		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
 		if(!self::$rootMounted){
-			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/');
 			self::$rootMounted=true;
 		}
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
-			OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
-			if( !is_dir( OC::$CONFIG_DATADIRECTORY )){
-				mkdir( OC::$CONFIG_DATADIRECTORY, 0755, true );
+			$userdirectory = $CONFIG_DATADIRECTORY."/$user/$root";
+			if( !is_dir( $userdirectory )){
+				mkdir( $userdirectory, 0755, true );
 			}
 
 			//jail the user into his "home" directory
@@ -42,8 +42,8 @@ class OC_Util {
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
 			// Load personal mount config
-			if (is_file($CONFIG_DATADIRECTORY_ROOT.'/'.$user.'/mount.php')) {
-				$mountConfig = include($CONFIG_DATADIRECTORY_ROOT.'/'.$user.'/mount.php');
+			if (is_file($CONFIG_DATADIRECTORY.'/'.$user.'/mount.php')) {
+				$mountConfig = include($CONFIG_DATADIRECTORY.'/'.$user.'/mount.php');
 				if (isset($mountConfig['user'][$user])) {
 					foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
 						OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
@@ -202,17 +202,17 @@ class OC_Util {
 			$errors[]=array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
 		}
 
-		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
+		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//check for correct file permissions
 		if(!stristr(PHP_OS, 'WIN')){
                 	$permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
-			$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
+			$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
 			if(substr($prems,-1)!='0'){
-				OC_Helper::chmodr($CONFIG_DATADIRECTORY_ROOT,0770);
+				OC_Helper::chmodr($CONFIG_DATADIRECTORY,0770);
 				clearstatcache();
-				$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
+				$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
 				if(substr($prems,2,1)!='0'){
-					$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable for other users<br/>','hint'=>$permissionsModHint);
+					$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') is readable for other users<br/>','hint'=>$permissionsModHint);
 				}
 			}
 			if( OC_Config::getValue( "enablebackup", false )){
@@ -231,13 +231,13 @@ class OC_Util {
 			//TODO: permissions checks for windows hosts
 		}
 		// Create root dir.
-		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
-			$success=@mkdir($CONFIG_DATADIRECTORY_ROOT);
+		if(!is_dir($CONFIG_DATADIRECTORY)){
+			$success=@mkdir($CONFIG_DATADIRECTORY);
 			if(!$success) {
-				$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
+				$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
 			}
-		} else if(!is_writable($CONFIG_DATADIRECTORY_ROOT)){
-			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
+		} else if(!is_writable($CONFIG_DATADIRECTORY)){
+			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
 		}
 
 		// check if all required php modules are present

From 13a9ef36fb7bf7706af545cbe227296fa005403c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 20 Jun 2012 11:34:17 +0200
Subject: [PATCH 0515/1537] don't show other users file if the filesystem is
 not index already

---
 lib/filecache/cached.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index a22adad452..17a792a23d 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -55,6 +55,9 @@ class OC_FileCache_Cached{
 			$root=OC_Filesystem::getRoot();
 		}
 		$parent=OC_FileCache::getId($path,$root);
+		if($parent==-1){
+			return array();
+		}
 		$query=OC_DB::prepare('SELECT path,name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=? AND (mimetype LIKE ? OR mimetype = ?)');
 		$result=$query->execute(array($parent, $mimetype_filter.'%', 'httpd/unix-directory'))->fetchAll();
 		if(is_array($result)){

From 8d89bba07cc1add9d464a63a360c9338099e3d30 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 12:23:26 +0200
Subject: [PATCH 0516/1537] use new sanitizeHTML() function

---
 apps/media/js/collection.js | 10 +++++-----
 apps/media/lib_scanner.php  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 03d577c7c9..161fc0c681 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -97,13 +97,13 @@ Collection={
 					if(artist.name && artist.songs.length>0){
 						var tr=template.clone().removeClass('template');
 						if(artist.songs.length>1){
-							tr.find('td.title a').text(artist.songs.length+' '+t('media','songs'));
-							tr.find('td.album a').text(artist.albums.length+' '+t('media','albums'));
+							tr.find('td.title a').html(artist.songs.length+' '+t('media','songs'));
+							tr.find('td.album a').html(artist.albums.length+' '+t('media','albums'));
 						}else{
-							tr.find('td.title a').text(artist.songs[0].name);
-							tr.find('td.album a').text(artist.albums[0].name);
+							tr.find('td.title a').html(artist.songs[0].name);
+							tr.find('td.album a').html(artist.albums[0].name);
 						}
-						tr.find('td.artist a').text(artist.name);
+						tr.find('td.artist a').html(artist.name);
 						tr.data('artistData',artist);
 						tr.find('td.artist a').click(function(event){
 							event.preventDefault();
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index 82170e5ca8..a8218c3a4d 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -79,19 +79,19 @@ class OC_MEDIA_SCANNER{
 			OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN);
 			$artist='unknown';
 		}else{
-			$artist=strip_tags(stripslashes($data['comments']['artist'][0]));
+			$artist=OCP\Util::sanitizeHTML(stripslashes($data['comments']['artist'][0]));
 		}
 		if(!isset($data['comments']['album'])){
 			OCP\Util::writeLog('media',"error reading album tag in '$file'",OCP\Util::WARN);
 			$album='unknown';
 		}else{
-			$album=strip_tags(stripslashes($data['comments']['album'][0]));
+			$album=OCP\Util::sanitizeHTML(stripslashes($data['comments']['album'][0]));
 		}
 		if(!isset($data['comments']['title'])){
 			OCP\Util::writeLog('media',"error reading title tag in '$file'",OCP\Util::WARN);
 			$title='unknown';
 		}else{
-			$title=strip_tags(stripslashes($data['comments']['title'][0]));
+			$title=OCP\Util::sanitizeHTML(stripslashes($data['comments']['title'][0]));
 		}
 		$size=$data['filesize'];
 		if (isset($data['comments']['track']))

From 7c6b8475ebf99ef87543bc77f0d2440c046befcf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 19 Jun 2012 01:15:58 +0200
Subject: [PATCH 0517/1537] LDAP: only map users within the User Base Tree

---
 apps/user_ldap/group_ldap.php |  4 +++-
 apps/user_ldap/lib_ldap.php   | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 78bc5b4656..a3117b5a41 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -166,7 +166,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 				$result[] = OC_LDAP::dn2username($ldap_users[0]);
 				continue;
 			} else {
-				$result[] = OC_LDAP::dn2username($member);
+				if($ocname = OC_LDAP::dn2username($member)){
+					$result[] = $ocname;
+				}
 			}
 		}
 		if(!$isMemberUid) {
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index befdf267bc..6feb6d3c65 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -166,11 +166,14 @@ class OC_LDAP {
 	 * @brief returns the internal ownCloud name for the given LDAP DN of the group
 	 * @param $dn the dn of the group object
 	 * @param $ldapname optional, the display name of the object
-	 * @returns string with with the name to use in ownCloud
+	 * @returns string with with the name to use in ownCloud, false on DN outside of search DN
 	 *
 	 * returns the internal ownCloud name for the given LDAP DN of the group
 	 */
 	static public function dn2groupname($dn, $ldapname = null) {
+		if(strrpos($dn, self::ldapBaseGroups) !== (strlen($dn)-strlen(self::ldapBaseGroups)-1)) {
+			return false;
+		}
 		return self::dn2ocname($dn, $ldapname, false);
 	}
 
@@ -180,9 +183,12 @@ class OC_LDAP {
 	 * @param $ldapname optional, the display name of the object
 	 * @returns string with with the name to use in ownCloud
 	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the user
+	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
 	 */
 	static public function dn2username($dn, $ldapname = null) {
+		if(strrpos($dn, self::ldapBaseUsers) !== (strlen($dn)-strlen(self::ldapBaseUsers)-1)) {
+			return false;
+		}
 		return self::dn2ocname($dn, $ldapname, true);
 	}
 

From 5b02217906a44312ffe43a97124a6ad2f0707aef Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 20 Jun 2012 12:41:30 +0200
Subject: [PATCH 0518/1537] forgotten $, incorrect  subtract

---
 apps/user_ldap/lib_ldap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 6feb6d3c65..aa104eb512 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -171,7 +171,7 @@ class OC_LDAP {
 	 * returns the internal ownCloud name for the given LDAP DN of the group
 	 */
 	static public function dn2groupname($dn, $ldapname = null) {
-		if(strrpos($dn, self::ldapBaseGroups) !== (strlen($dn)-strlen(self::ldapBaseGroups)-1)) {
+		if(strrpos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
 			return false;
 		}
 		return self::dn2ocname($dn, $ldapname, false);
@@ -186,7 +186,7 @@ class OC_LDAP {
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
 	 */
 	static public function dn2username($dn, $ldapname = null) {
-		if(strrpos($dn, self::ldapBaseUsers) !== (strlen($dn)-strlen(self::ldapBaseUsers)-1)) {
+		if(strrpos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
 			return false;
 		}
 		return self::dn2ocname($dn, $ldapname, true);

From 5a2c93ec2d3383da9f945cd71763a519f1cf462f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 15:11:14 +0200
Subject: [PATCH 0519/1537] use sanitizeHTML() function

---
 apps/calendar/ajax/events.php | 2 +-
 apps/calendar/js/calendar.js  | 2 +-
 apps/calendar/lib/object.php  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 39130a6a98..845cea8df8 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -31,4 +31,4 @@ $output = array();
 foreach($events as $event){
 	$output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end));
 }
-OCP\JSON::encodedPrint($output);
+OCP\JSON::encodedPrint(OCP\Util::sanitizeHTML($output));
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 5136c3e774..3b1be59381 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -869,7 +869,7 @@ $(document).ready(function(){
 		eventDrop: Calendar.UI.moveEvent,
 		eventResize: Calendar.UI.resizeEvent,
 		eventRender: function(event, element) {
-			element.find('.fc-event-title').html(element.find('.fc-event-title').text());
+			element.find('.fc-event-title').html(element.find('.fc-event-title').html());
 			element.tipsy({
 				className: 'tipsy-event',
 				opacity: 0.9,
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 9e4806227b..4212bf5a32 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -600,8 +600,8 @@ class OC_Calendar_Object{
 
 	public static function updateVCalendarFromRequest($request, $vcalendar)
 	{
-		$title = strip_tags($request["title"]);
-		$location = strip_tags($request["location"]);
+		$title = $request["title"];
+		$location = $request["location"];
 		$categories = $request["categories"];
 		$allday = isset($request["allday"]);
 		$from = $request["from"];
@@ -611,7 +611,7 @@ class OC_Calendar_Object{
 			$totime = $request['totime'];
 		}
 		$vevent = $vcalendar->VEVENT;
-		$description = strip_tags($request["description"]);
+		$description = $request["description"];
 		$repeat = $request["repeat"];
 		if($repeat != 'doesnotrepeat'){
 			$rrule = '';

From e52230d11c5cef0e6105166b7d704c8c69f60425 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 15:41:05 +0200
Subject: [PATCH 0520/1537] no need to escape the title

---
 3rdparty/fullcalendar/js/fullcalendar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/fullcalendar/js/fullcalendar.js b/3rdparty/fullcalendar/js/fullcalendar.js
index 779a313c76..314f8c8a1a 100644
--- a/3rdparty/fullcalendar/js/fullcalendar.js
+++ b/3rdparty/fullcalendar/js/fullcalendar.js
@@ -4662,7 +4662,7 @@ function DayEventRenderer() {
 					"</span>";
 			}
 			html +=
-				"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
+				"<span class='fc-event-title'>" + event.title + "</span>" +
 				"</div>";
 			if (seg.isEnd && isEventResizable(event)) {
 				html +=

From 6644511124d0f93ca6636344db5455da6d160c3d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 16:29:19 +0200
Subject: [PATCH 0521/1537] remove unnecessary comment

---
 lib/public/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/util.php b/lib/public/util.php
index 7c0cb66607..c611d59a53 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -274,7 +274,7 @@ class Util {
 	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
 	 */
 	public static function sanitizeHTML( $value ){
-		return(\OC_Util::sanitizeHTML($value)); //Specify encoding for PHP<5.4
+		return(\OC_Util::sanitizeHTML($value));
 	}
 }
 

From 5c8e774cea24bd964632ae96357a308272753513 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 08:57:21 +0200
Subject: [PATCH 0522/1537] Small code reorder

---
 lib/util.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 5492587862..f0999b6d20 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -19,17 +19,18 @@ class OC_Util {
 			return false;
 		}
 
-		// If we are not forced to load a specific user we load the one that is logged in
-		if( $user == "" && OC_User::isLoggedIn()){
-			$user = OC_User::getUser();
-		}
-
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
 		if(!self::$rootMounted){
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/');
 			self::$rootMounted=true;
 		}
+
+		// If we are not forced to load a specific user we load the one that is logged in
+		if( $user == "" && OC_User::isLoggedIn()){
+			$user = OC_User::getUser();
+		}
+
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
 			$userdirectory = $CONFIG_DATADIRECTORY."/$user/$root";
 			if( !is_dir( $userdirectory )){

From cd934d5d8924b51d719ac20025b5fa034c74c3fb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 19 Jun 2012 17:38:04 +0200
Subject: [PATCH 0523/1537] Adjust OC_Filesystem use in hooks to string, so the
 class is loaded as late as possible

---
 apps/files_versions/appinfo/app.php | 2 +-
 apps/gallery/lib/hooks_handlers.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 49f1573f7c..8b891848c5 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -6,4 +6,4 @@ OCP\App::registerAdmin('files_versions', 'settings');
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index a9f4dc6aff..093979834d 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -21,7 +21,7 @@
 * 
 */
 
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, "OC_Gallery_Hooks_Handlers", "removePhoto");
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OC_Gallery_Hooks_Handlers", "removePhoto");
 //OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, "OC_Gallery_Hooks_Handlers", "renamePhoto");
 
 require_once(OC::$CLASSPATH['Pictures_Managers']);

From 6404476bec76a5c4bc2c6d3bb1508bb1c6c025f2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 19 Jun 2012 17:38:04 +0200
Subject: [PATCH 0524/1537] Delay setup of FS until OC_Filesystem is used

---
 apps/files_sharing/appinfo/app.php   |  9 +++++++--
 apps/files_sharing/sharedstorage.php | 13 +++----------
 lib/base.php                         |  6 ------
 lib/filesystem.php                   |  1 +
 lib/util.php                         |  8 +++++---
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index ea3a9da6f7..bbb753d5e6 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,15 +1,20 @@
 <?php
 
-require_once('apps/files_sharing/sharedstorage.php');
-
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
+OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/sharedstorage.php";
+
 OCP\App::registerAdmin('files_sharing', 'settings');
+
+OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC_Filestorage_Shared', 'setup');
+
 OCP\Util::connectHook("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OCP\Util::connectHook("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
 OCP\Util::connectHook("OC_Filesystem", "post_write", "OC_Share", "updateItem");
+
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Share', 'removeUser');
 OCP\Util::connectHook('OC_User', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
 OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
+
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
 if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') {
 	OCP\Util::addscript("files_sharing", "share");
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 9174334383..9c6df31d29 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -510,8 +510,9 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 
-	public static function setup() {
-		OC_Filesystem::mount('OC_Filestorage_Shared', array('datadir' => '/'.OCP\USER::getUser().'/files/Shared'), '/'.OCP\USER::getUser().'/files/Shared/');
+	public static function setup($options) {
+		$user_dir = $options['user_dir'];
+		OC_Filesystem::mount('OC_Filestorage_Shared', array('datadir' => $user_dir.'/Shared'), $user_dir.'/Shared/');
 	}
 
 	/**
@@ -524,11 +525,3 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		return $this->filemtime($path)>$time;
 	}
 }
-
-if (OCP\USER::isLoggedIn()) {
-	OC_Filestorage_Shared::setup();
-} else {
-	OCP\Util::connectHook('OC_User', 'post_login', 'OC_Filestorage_Shared', 'setup');
-}
-
-?>
diff --git a/lib/base.php b/lib/base.php
index 6e209afebd..b6ca19568f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -353,12 +353,6 @@ class OC{
 		OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 		OC_Group::useBackend(new OC_Group_Database());
 
-		// Set up file system unless forbidden
-		global $RUNTIME_NOSETUPFS;
-		if(!$RUNTIME_NOSETUPFS ){
-			OC_Util::setupFS();
-		}
-
 		// Load Apps
 		// This includes plugins for users and filesystems as well
 		global $RUNTIME_NOAPPS;
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 0d0943d363..aeeb012f37 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -488,4 +488,5 @@ class OC_Filesystem{
 	}
 }
 
+OC_Util::setupFS();
 require_once('filecache.php');
diff --git a/lib/util.php b/lib/util.php
index f0999b6d20..46c9e0ef92 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -14,7 +14,7 @@ class OC_Util {
 	public static $core_scripts=array();
 
 	// Can be set up
-	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
+	public static function setupFS( $user = '' ){// configure the initial filesystem based on the configuration
 		if(self::$fsSetup){//setting up the filesystem twice can only lead to trouble
 			return false;
 		}
@@ -32,13 +32,14 @@ class OC_Util {
 		}
 
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
-			$userdirectory = $CONFIG_DATADIRECTORY."/$user/$root";
+			$user_dir = '/'.$user.'/files';
+			$userdirectory = $CONFIG_DATADIRECTORY.$user_dir;
 			if( !is_dir( $userdirectory )){
 				mkdir( $userdirectory, 0755, true );
 			}
 
 			//jail the user into his "home" directory
-			OC_Filesystem::init('/'.$user.'/'.$root);
+			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
@@ -51,6 +52,7 @@ class OC_Util {
 					}
 				}
 			}
+			OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir));
 		}
 	}
 

From 7a3d606cacb68c23d7972d078370c58d4a8f8a2c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 17:10:17 +0200
Subject: [PATCH 0525/1537] Prefer requested app before redirecting to default
 page

---
 lib/util.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 46c9e0ef92..7792f96d44 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -324,7 +324,11 @@ class OC_Util {
 		OC_Log::write('core','redirectToDefaultPage',OC_Log::DEBUG);
 		if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
 			header( 'Location: '.$_REQUEST['redirect_url']);
-		} else {
+		}
+		else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
+			header( 'Location: '.OC::$WEBROOT.'/?app='.OC::$REQUESTEDAPP );
+		}
+		else {
 			header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));
 		}
 		exit();

From c244daac897cf8a9e50297b8c9a643dcc9651338 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 20 Jun 2012 16:24:49 +0100
Subject: [PATCH 0526/1537] removed readdir to fix bug oc-1054

---
 apps/files_archive/lib/storage.php   | 1 -
 apps/files_sharing/sharedstorage.php | 2 --
 lib/filestorage.php                  | 1 -
 3 files changed, 4 deletions(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index 2f10d6a3e4..8676166361 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -49,7 +49,6 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 		OC_FakeDirStream::$dirs[$id]=$content;
 		return opendir('fakedir://'.$id);
 	}
-	public function readdir($path){}
 	public function stat($path){
 		$ctime=filectime($this->path);
 		$path=$this->stripPath($path);
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 9174334383..1a6942ad16 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -139,8 +139,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
-	public function readdir( $path ) {}
-	
 	public function is_dir($path) {
 		if ($path == "" || $path == "/") {
 			return true;
diff --git a/lib/filestorage.php b/lib/filestorage.php
index bf353bb0cc..71ef4aed00 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -28,7 +28,6 @@ abstract class OC_Filestorage{
 	abstract public function mkdir($path);
 	abstract public function rmdir($path);
 	abstract public function opendir($path);
-	abstract public function readdir($path);
 	abstract public function is_dir($path);
 	abstract public function is_file($path);
 	abstract public function stat($path);

From 72215a818d0e222af80000909f9fa78243112533 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 20 Jun 2012 18:25:12 +0100
Subject: [PATCH 0527/1537] added new user settings interface for deleting old
 file versions fixed OCA_VersionsexpireAll() to use native PHP readdir()
 removed local storage implementation of readdir()

---
 apps/files_versions/ajax/expireAll.php        | 41 +++++++++++++++
 apps/files_versions/appinfo/app.php           |  4 +-
 apps/files_versions/js/settings-personal.js   | 51 +++++++++++++++++++
 apps/files_versions/settings-personal.php     |  8 +++
 .../templates/settings-personal.php           |  9 ++++
 apps/files_versions/versions.php              | 26 +++++-----
 lib/filestorage/local.php                     |  3 --
 7 files changed, 124 insertions(+), 18 deletions(-)
 create mode 100644 apps/files_versions/ajax/expireAll.php
 create mode 100644 apps/files_versions/js/settings-personal.js
 create mode 100644 apps/files_versions/settings-personal.php
 create mode 100644 apps/files_versions/templates/settings-personal.php

diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
new file mode 100644
index 0000000000..f9cd74aed0
--- /dev/null
+++ b/apps/files_versions/ajax/expireAll.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * ownCloud - user_migrate
+ *
+ * @author Sam Tuke
+ * @copyright 2012 Sam Tuke samtuke@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/>.
+ *
+ */
+
+// TODO: Allow admins to expire versions of any user
+// TODO: Provide feedback as to how many versions were deleted
+
+// Check user and app status
+OCP\JSON::checkLoggedIn();
+OCP\App::checkAppEnabled('files_versions');
+
+if( OCA_Versions\Storage::expireAll() ){
+	
+	OCP\JSON::success();
+	die();
+	
+} else {
+	
+	OCP\JSON::error();
+	die();
+	
+}
\ No newline at end of file
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 8b891848c5..ef2f54dd3f 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -3,7 +3,9 @@
 require_once('apps/files_versions/versions.php');
 
 OCP\App::registerAdmin('files_versions', 'settings');
+OCP\App::registerPersonal('files_versions','settings-personal');
+
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
\ No newline at end of file
diff --git a/apps/files_versions/js/settings-personal.js b/apps/files_versions/js/settings-personal.js
new file mode 100644
index 0000000000..d9456f3f2a
--- /dev/null
+++ b/apps/files_versions/js/settings-personal.js
@@ -0,0 +1,51 @@
+// $(document).ready(function(){
+// 	$('#versions').change( function(){
+// 		OC.msg.startSaving('#calendar .msg')
+// 		// Serialize the data
+// 		var post = $( '#timezone' ).serialize();
+// 		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){
+// 			//OC.msg.finishedSaving('#calendar .msg', data);
+// 		});
+// 		return false;
+// 	});
+// });
+
+$(document).ready(function(){
+	//
+	$('#expireAllBtn').click(function(){
+		
+		// Prevent page from reloading
+		event.preventDefault();
+		
+		// Show loading gif
+		$('.expireAllLoading').show();
+	
+		$.getJSON(
+			OC.filePath('files_versions','ajax','expireAll.php'),
+			function(result){
+				if (result.status == 'success') {
+					$('.expireAllLoading').hide();
+					$('#expireAllBtn').html('Expiration successful');
+				} else {
+					
+					// Cancel loading
+					$('#expireAllBtn').html('Expiration failed');
+					
+					// Show Dialog
+					OC.dialogs.alert(
+						'Something went wrong, your files may not have been expired', 
+						'An error has occurred', 
+						function(){ 
+							$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
+						}
+						
+					);
+					
+				}
+ 			}
+			
+		);
+
+	});
+	
+});
\ No newline at end of file
diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php
new file mode 100644
index 0000000000..db80172979
--- /dev/null
+++ b/apps/files_versions/settings-personal.php
@@ -0,0 +1,8 @@
+<?php
+
+$tmpl = new OCP\Template( 'files_versions', 'settings-personal');
+
+OCP\Util::addscript('files_versions','settings-personal');
+
+return $tmpl->fetchPage();
+?>
\ No newline at end of file
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
new file mode 100644
index 0000000000..7ff016b585
--- /dev/null
+++ b/apps/files_versions/templates/settings-personal.php
@@ -0,0 +1,9 @@
+<form id="versions">
+	<fieldset class="personalblock">
+		<legend>
+			<strong>Versions</strong><!-- translate using echo $l->t('foo'); -->
+		</legend>
+		<p>This will delete all existing backup versions of your files</p><!-- translate using echo $l->t('foo'); -->
+		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 6feb0cbb9c..7522538caf 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -333,9 +333,9 @@ class Storage {
 			
 				$foldername = \OCP\Config::getSystemValue('datadirectory') .'/' . \OCP\USER::getUser() .'/' . $directory; // have to set an absolute path for use with PHP's opendir as OC version doesn't work
 				
-				$directoryHandle = opendir( $foldername );	
-			
-				while ( $contents = $view->readdir( $directoryHandle ) ) {
+				$directoryHandle = $view->opendir( \OCP\USER::getUser() . '/' . $directory );
+				
+				while ( $contents = readdir( $directoryHandle ) ) {
 				
 					if ( $contents != '.' && $contents != '..') {
 						
@@ -373,17 +373,15 @@ class Storage {
 		
 		$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 		
-		deleteAll( $dir, true );
-
-// 		if ( deleteAll( $dir, 1 ) ) {
-// 		
-// 			echo "<h1>deleted ok</h1>";
-// 			
-// 		} else {
-// 			
-// 			echo "<h1>not deleted</h1>";
-// 			
-// 		}
+		if ( deleteAll( $dir, true ) ) {
+		
+			return true;
+			
+		} else {
+			
+			return false;
+			
+		}
 	
         }
 
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 27794fe17c..44a2ab0f63 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -20,9 +20,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function opendir($path){
 		return opendir($this->datadir.$path);
 	}
-	public function readdir($handle){
-		return readdir($handle);
-	}
 	public function is_dir($path){
 		if(substr($path,-1)=='/'){
 			$path=substr($path,0,-1);

From 4b231c15d567104619c9bd38c3a07f005512cf5b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 20 Jun 2012 16:31:22 +0200
Subject: [PATCH 0528/1537] bookmarks: make read later-button draggable again,
 fixes oc-944

---
 apps/bookmarks/css/bookmarks.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 3a3e0fbf6b..a67afcd44f 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -1,5 +1,5 @@
 #content { overflow: auto; height: 100%; }
-#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
+#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777; position: relative;}
 #firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; }
 #firstrun .button { font-size: 0.7em; }
 #firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }

From f255ac8b3a82bcf9e77c3bc0db7583d1492df44c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 20 Jun 2012 20:03:25 +0200
Subject: [PATCH 0529/1537] make bookmarks bookmarklet work again, kudos to
 Victor Dubiniuk

---
 apps/bookmarks/addBm.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index 866fa1e7b1..4df93c8b05 100644
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -5,20 +5,20 @@
 *
 * @author Arthur Schiwon
 * @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.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 
+* 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 Lesser General Public 
+*
+* You should have received a copy of the GNU Lesser General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
+*
 */
 
 
@@ -28,6 +28,6 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');
-addBookmark($_POST['url'], '', 'Read-Later');
+addBookmark($_GET['url'], '', 'Read-Later');
 
 include 'templates/addBm.php';

From 0f1fe0b505b57e1fec3171a57ea41ec41d9692ee Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 20 Jun 2012 19:35:13 +0200
Subject: [PATCH 0530/1537] Log error as ERROR.

---
 apps/contacts/lib/vcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 71a874d783..110d721ace 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -56,7 +56,7 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( $prep );
 				$result = $stmt->execute($id);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::ERROR);
 				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OCP\Util::DEBUG);
 				OCP\Util::writeLog('contacts','SQL:'.$prep,OCP\Util::DEBUG);
 			}

From 426ed27be2dc5df34cc036cc87337837288156ec Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 20 Jun 2012 20:57:34 +0200
Subject: [PATCH 0531/1537] Make sure address books are shown even if empty.

---
 apps/contacts/ajax/contacts.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index bf4d5deb2e..16730ec947 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -17,14 +17,25 @@ function cmp($a, $b)
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$contacts_alphabet = OC_Contacts_VCard::all($ids);
 $active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+error_log('active_addressbooks: '.print_r($active_addressbooks, true));
+
+$contacts_addressbook = array();
+$ids = array();
+foreach($active_addressbooks as $addressbook) {
+	$ids[] = $addressbook['id'];
+	if(!isset($contacts_addressbook[$addressbook['id']])) {
+		$contacts_addressbook[$addressbook['id']] = array('contacts' => array());
+		$contacts_addressbook[$addressbook['id']]['displayname'] = $addressbook['displayname'];
+	}
+}	
+error_log('ids: '.print_r($ids, true));
+$contacts_alphabet = OC_Contacts_VCard::all($ids);
+error_log('contacts_alphabet: '.print_r($contacts_alphabet, true));
 
 // Our new array for the contacts sorted by addressbook
-$contacts_addressbook = array();
 foreach($contacts_alphabet as $contact) {
-	if(!isset($contacts_addressbook[$contact['addressbookid']])) {
+	if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
 		$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array());
 	}
 	$display = trim($contact['fullname']);
@@ -38,14 +49,6 @@ foreach($contacts_alphabet as $contact) {
 	$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
 }
 
-foreach($contacts_addressbook as $addressbook_id => $contacts) {
-	foreach($active_addressbooks as $addressbook) {
-		if($addressbook_id == $addressbook['id']) {
-			$contacts_addressbook[$addressbook_id]['displayname'] = $addressbook['displayname'];
-		}
-	}
-}
-
 uasort($contacts_addressbook, 'cmp');
 
 $tmpl = new OCP\Template("contacts", "part.contacts");

From dc8c188ffed520b719a117564db78b0a23828a75 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 20 Jun 2012 20:59:33 +0200
Subject: [PATCH 0532/1537] Better error checking.

---
 apps/contacts/lib/addressbook.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 79445ceeee..878d8835f9 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -172,12 +172,11 @@ class OC_Contacts_Addressbook{
 		if(!$prefbooks){
 			$addressbooks = OC_Contacts_Addressbook::all($uid);
 			if(count($addressbooks) == 0){
-				OC_Contacts_Addressbook::add($uid,'default','Default Address Book');
-				$addressbooks = OC_Contacts_Addressbook::all($uid);
+				$id = OC_Contacts_Addressbook::add($uid,'default','Default Address Book');
+				self::setActive($id, true);
 			}
-			$prefbooks = $addressbooks[0]['id'];
-			OCP\Config::setUserValue($uid,'contacts','openaddressbooks',$prefbooks);
 		}
+		$prefbooks = OCP\Config::getUserValue($uid,'contacts','openaddressbooks',null);
 		return explode(';',$prefbooks);
 	}
 
@@ -195,7 +194,7 @@ class OC_Contacts_Addressbook{
 			$stmt = OCP\DB::prepare( $prep );
 			$result = $stmt->execute($active);
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OCP\Util::ERROR);
 			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OCP\Util::DEBUG);
 			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OCP\Util::DEBUG);
 		}
@@ -210,7 +209,7 @@ class OC_Contacts_Addressbook{
 	/**
 	 * @brief Activates an addressbook
 	 * @param integer $id
-	 * @param integer $name
+	 * @param boolean $active
 	 * @return boolean
 	 */
 	public static function setActive($id,$active){
@@ -256,11 +255,15 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function delete($id){
-		// FIXME: There's no error checking at all.
 		self::setActive($id, false);
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
-		$stmt->execute(array($id));
-
+		try {
+			$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
+			$stmt->execute(array($id));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:delete:, exception for '.$id.': '.$e->getMessage(),OCP\Util::ERROR);
+			return false;
+		}
+		
 		$cards = OC_Contacts_VCard::all($id);
 		foreach($cards as $card){
 			OC_Contacts_VCard::delete($card['id']);

From 10a0d5a46c277ed342f19946b451db1082fb41c5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 20 Jun 2012 21:00:07 +0200
Subject: [PATCH 0533/1537] More changes for updating the contacts list.

---
 apps/contacts/ajax/addcontact.php |  2 +-
 apps/contacts/js/contacts.js      | 32 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index e45072c954..12f7bb9db9 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -47,4 +47,4 @@ if(!$id) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'id' => $id )));
+OCP\JSON::success(array('data' => array( 'id' => $id, 'aid' => $aid )));
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 2319334c58..8ab2a3fbb8 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -174,7 +174,7 @@ Contacts={
 			// TODO: Take addressbook into account
 			$('#fn').change(function(){
 				var name = $('#fn').val().strip_tags();
-				var item = $('.contacts [data-id="'+Contacts.UI.Card.id+'"]');
+				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]');
 				$(item).find('a').html(name);
 				Contacts.UI.Card.fn = name;
 				var added = false;
@@ -186,7 +186,7 @@ Contacts={
 					}
 				});
 				if(!added) {
-					$('#leftcontent ul[data-id="'+Contacts.UI.Card.bookid+'"]').append(item);
+					$('#contacts ul[data-id="'+Contacts.UI.Card.bookid+'"]').append(item);
 				}
 				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
 			});
@@ -250,8 +250,10 @@ Contacts={
 				var newid, firstitem;
 				if(!id) {
 					firstitem = $('#contacts:first-child li:first-child');
-					newid = firstitem.data('id');
-					bookid = firstitem.data('bookid');
+					if(firstitem.length > 0) {
+						newid = firstitem.data('id');
+						bookid = firstitem.data('bookid');
+					}
 				} else {
 					newid = id;
 				}
@@ -269,7 +271,7 @@ Contacts={
 				}
 				
 				// Make sure proper DOM is loaded.
-				if(!$('#card')[0]) {
+				if(!$('#card')[0] && newid) {
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{},function(jsondata){
 						if(jsondata.status == 'success'){
 							$('#rightcontent').html(jsondata.data.page).ready(function() {
@@ -281,7 +283,7 @@ Contacts={
 						}
 					});
 				}
-				else if($('.contacts li').length == 0) {
+				else if(!newid) {
 					// load intro page
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
 						if(jsondata.status == 'success'){
@@ -316,13 +318,14 @@ Contacts={
 						if (jsondata.status == 'success'){
 							$('#rightcontent').data('id',jsondata.data.id);
 							var id = jsondata.data.id;
+							var aid = jsondata.data.aid;
 							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 								if(jsondata.status == 'success'){
 									Contacts.UI.Card.loadContact(jsondata.data, aid);
-									$('#leftcontent .active').removeClass('active');
+									$('#contacts .active').removeClass('active');
 									var item = $('<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>');
 									var added = false;
-									$('#leftcontent ul li').each(function(){
+									$('#contacts ul[data-id="'+aid+'"] li').each(function(){
 										if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
 											$(this).before(item).fadeIn('fast');
 											added = true;
@@ -330,7 +333,7 @@ Contacts={
 										}
 									});
 									if(!added) {
-										$('#leftcontent ul').append(item);
+										$('#contacts ul[data-id="'+aid+'"]').append(item);
 									}
 									if(isnew) { // add some default properties
 										Contacts.UI.Card.addProperty('EMAIL');
@@ -374,7 +377,7 @@ Contacts={
 						$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':Contacts.UI.Card.id},function(jsondata){
 							if(jsondata.status == 'success'){
 								var newid = '', bookid;
-								var curlistitem = $('#leftcontent [data-id="'+jsondata.data.id+'"]');
+								var curlistitem = $('#contacts li[data-id="'+jsondata.data.id+'"]');
 								var newlistitem = curlistitem.prev();
 								if(newlistitem == undefined) {
 									newlistitem = curlistitem.next();
@@ -1541,13 +1544,16 @@ Contacts={
 				});
 			},
 			refreshThumbnail:function(id){
-				var item = $('.contacts [data-id="'+id+'"]').find('a');
+				var item = $('.contacts li[data-id="'+id+'"]').find('a');
 				item.html(Contacts.UI.Card.fn);
 				item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
 			},
 			scrollTo:function(id){
-				$('.contacts').animate({
-					scrollTop: $('#leftcontent li[data-id="'+id+'"]').offset().top-20}, 'slow','swing');
+				var item = $('#contacts li[data-id="'+id+'"]');
+				if(item) {
+					$('.contacts').animate({
+						scrollTop: $('#contacts li[data-id="'+id+'"]').offset().top-20}, 'slow','swing');
+				}
 			}
 		}
 	}

From a6dc7345d0053aa93c8f44f94002b7d2426c2658 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 21:22:41 +0200
Subject: [PATCH 0534/1537] Gallery: Move code/js/css from main template to the
 right place

---
 apps/gallery/css/styles.css      |   8 +++
 apps/gallery/index.php           |  64 +++++++++++++++++
 apps/gallery/js/pictures.js      |  33 ++++++++-
 apps/gallery/templates/index.php | 116 ++-----------------------------
 4 files changed, 108 insertions(+), 113 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 98d3651549..dcef1f08c6 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -4,3 +4,11 @@ div#controls input[type=button] { -webkit-transition: opacity 0.5s ease-in-out;
 input[type=button]:disabled { opacity: 0.5 }
 .ui-dialog tr {background-color: #eee;}
 .ui-dialog input {width: 90%;}
+
+div.gallery_div {position:relative; display: inline-block; height: 152px; width: 150px; margin: 5px;}
+div.miniature_border {position:absolute; height: 150px; -moz-transition-duration: 0.2s; -o-transition-duration:0.2s;  -webkit-transition-duration: .2s; background-position: 50%;}
+div.line {display:inline-block; border: 0; width: auto; height: 160px}
+div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
+div.gallery_div img.shrinker {width:80px !important;}
+div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; right:-5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
+div.visible { opacity: 0.8;}
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index b87d99bb6c..c08305bff9 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -31,6 +31,70 @@ OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('gallery', 'styles');
 OCP\Util::addScript('gallery', 'pictures');
 
+include('apps/gallery/lib/tiles.php');
+
+$root = !empty($_GET['root']) ? $_GET['root'] : '/';
+$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
+sort($images);
+
+$tl = new \OC\Pictures\TilesLine();
+$ts = new \OC\Pictures\TileStack(array(), '');
+$previous_element = @$images[0];
+
+$root_images = array();
+$second_level_images = array();
+
+$fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
+
+for($i = 0; $i < count($images); $i++) {
+	$prev_dir_arr = explode('/', $previous_element);
+	$dir_arr = explode('/', $images[$i]);
+
+	if(count($dir_arr) == 1) { // getting the images in this directory
+		$root_images[] = $root.$images[$i];
+	} else {
+		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
+			if(count($second_level_images) == 0) { // if we don't have images in this directory
+				if(count($fallback_images) != 0) { // but have fallback_images
+					$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+					$fallback_images = array();
+				}
+			} else { // if we collected images for this directory
+				$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+				$fallback_images = array();
+				$second_level_images = array();
+			}
+		}
+		if (count($dir_arr) == 2) { // These are the pics in our current subdir
+			$second_level_images[] = $root.$images[$i];
+			$fallback_images = array();
+		} else { // These are images from the deeper directories
+			if(count($second_level_images) == 0) {
+				$fallback_images[] = $root.$images[$i];
+			}
+		}
+		// have us a little something to compare against
+		$previous_element = $images[$i];
+	}
+}
+
+// if last element in the directory was a directory we don't want to miss it :)
+if(count($second_level_images)>0) {
+	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+}
+
+// if last element in the directory was a directory with no second_level_images we also don't want to miss it ...
+if(count($fallback_images)>0) {
+	$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+}
+
+// and finally our images actually stored in the root folder
+for($i = 0; $i<count($root_images); $i++) {
+	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));
+}
+
 $tmpl = new OCP\Template( 'gallery', 'index', 'user' );
+$tmpl->assign('root', $root);
+$tmpl->assign('tl', $tl, false);
 $tmpl->printPage();
 ?>
diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js
index 678c9bcbf5..3a79788968 100644
--- a/apps/gallery/js/pictures.js
+++ b/apps/gallery/js/pictures.js
@@ -1,4 +1,3 @@
-
 function constructSharingPath() {
   return document.location.protocol + '//' + document.location.host + OC.linkTo('', 'public.php') + '?service=gallery&token=' + Albums.token;
 }
@@ -35,3 +34,35 @@ function shareGallery() {
     });
   });
 }
+
+function explode(element) {
+	$('div', element).each(function(index, elem) {
+		if ($(elem).hasClass('title')) {
+			$(elem).addClass('visible');
+		} else {
+			$(elem).css('margin-top', Math.floor(30-(Math.random()*60)) + 'px')
+			       .css('margin-left', Math.floor(30-(Math.random()*60))+ 'px')
+			       .css('z-index', '999');
+		}
+	});
+}
+
+function deplode(element) {
+	$('div', element).each(function(index, elem) {
+		if ($(elem).hasClass('title')) {
+			$(elem).removeClass('visible');
+		} else {
+			$(elem).css('margin-top', Math.floor(5-(Math.random()*10)) + 'px')
+			   .css('margin-left', Math.floor(5-(Math.random()*10))+ 'px')
+			   .css('z-index', '3');
+		}
+	});
+}
+
+function openNewGal(album_name) {
+	root = root + album_name + "/";
+	var url = window.location.toString().replace(window.location.search, '');
+	url = url + "?app=gallery&root="+encodeURIComponent(root);
+
+	window.location = url;
+}
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index bf4f117c7d..1890552fc0 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,52 +1,6 @@
-<?php
-
-$l = OC_L10N::get('gallery');
-$root = !empty($_GET['root']) ? $_GET['root'] : '/';
-?>
-<style>
-div.gallery_div {position:relative; display: inline-block; height: 152px; width: 150px; margin: 5px;}
-div.miniature_border {position:absolute; height: 150px; -moz-transition-duration: 0.2s; -o-transition-duration:0.2s;  -webkit-transition-duration: .2s; background-position: 50%;}
-div.line {display:inline-block; border: 0; width: auto; height: 160px}
-div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
-div.gallery_div img.shrinker {width:80px !important;}
-div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; right:-5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
-div.visible { opacity: 0.8;}
-</style>
 <script type="text/javascript">
 
-var root = "<?php echo htmlentities($root); ?>";
-
-function explode(element) {
-	$('div', element).each(function(index, elem) {
-	 	if ($(elem).hasClass('title')) {
-		 	$(elem).addClass('visible');
-	 	} else {
-			$(elem).css('margin-top', Math.floor(30-(Math.random()*60)) + 'px')
-			       .css('margin-left', Math.floor(30-(Math.random()*60))+ 'px')
-			       .css('z-index', '999');
-		}
-	});
-}
-
-function deplode(element) {
-	$('div', element).each(function(index, elem) {
-	 	if ($(elem).hasClass('title')) {
-		 	$(elem).removeClass('visible');
-	 	} else {
-			$(elem).css('margin-top', Math.floor(5-(Math.random()*10)) + 'px')
-		    	   .css('margin-left', Math.floor(5-(Math.random()*10))+ 'px')
-		    	   .css('z-index', '3');
-		}
-	});
-}
-
-function openNewGal(album_name) {
-	root = root + album_name + "/";
-	var url = window.location.toString().replace(window.location.search, '');
-	url = url + "?app=gallery&root="+encodeURIComponent(root);
-	
-	window.location = url;
-}
+var root = "<?php echo $_['root']; ?>";
 
 $(document).ready(function() {
 		$("a[rel=images]").fancybox({
@@ -57,7 +11,7 @@ $(document).ready(function() {
 </script>
 
 <div id="controls"><?php
-	$sr = trim($root, '/');
+	$sr = trim($_['root'], '/');
 	if (!empty($sr)) {
 		$paths = explode('/', $sr);
 		$path = '/';
@@ -68,74 +22,12 @@ $(document).ready(function() {
 		}
 	}
 		
-?>	<!--<a href="javascript:shareGallery();"><input type="button" value="<?php echo $l->t('Share');?>" /></a>--><br/>
+?><br/>
 </div>
 <div id="gallerycontent">
 <?php
 
-include('apps/gallery/lib/tiles.php');
-$root = empty($_GET['root'])?'/':$_GET['root'];
-
-$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
-sort($images);
-
-$tl = new \OC\Pictures\TilesLine();
-$ts = new \OC\Pictures\TileStack(array(), '');
-$previous_element = @$images[0];
-
-$root_images = array();
-$second_level_images = array();
-
-$fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
-
-for($i = 0; $i < count($images); $i++) {
-	$prev_dir_arr = explode('/', $previous_element);
-	$dir_arr = explode('/', $images[$i]);
-
-	if(count($dir_arr) == 1) { // getting the images in this directory
-		$root_images[] = $root.$images[$i];
-	} else {
-		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
-			if(count($second_level_images) == 0) { // if we don't have images in this directory
-				if(count($fallback_images) != 0) { // but have fallback_images
-					$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-					$fallback_images = array();
-				}
-			} else { // if we collected images for this directory
-				$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-				$fallback_images = array();
-				$second_level_images = array();
-			}
-		}
-		if (count($dir_arr) == 2) { // These are the pics in our current subdir
-			$second_level_images[] = $root.$images[$i];
-			$fallback_images = array();
-		} else { // These are images from the deeper directories
-			if(count($second_level_images) == 0) {
-				$fallback_images[] = $root.$images[$i];
-			}
-		}
-		// have us a little something to compare against
-		$previous_element = $images[$i];
-	}
-}
-
-// if last element in the directory was a directory we don't want to miss it :)
-if(count($second_level_images)>0) {
-	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-}
-
-// if last element in the directory was a directory with no second_level_images we also don't want to miss it ...
-if(count($fallback_images)>0) {
-	$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-}
-
-// and finally our images actually stored in the root folder
-for($i = 0; $i<count($root_images); $i++) {
-	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));
-}
-
-echo $tl->get();
+echo $_['tl']->get();
 
 ?>
 </div>

From fedfa4c98e9093fc3499745909c81cce381e2624 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 21:38:56 +0200
Subject: [PATCH 0535/1537] DateTime objects are directly comparable

---
 apps/calendar/lib/object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index a6ae659008..7f3322b1ab 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -814,7 +814,7 @@ class OC_Calendar_Object{
 		if($allday){
 			$return['start'] = $start_dt->format('Y-m-d');
 			$end_dt->modify('-1 minute');
-			while($start_dt->format('U') >= $end_dt->format('U')){
+			while($start_dt >= $end_dt){
 				$end_dt->modify('+1 day');
 			}
 			$return['end'] = $end_dt->format('Y-m-d');

From cc3835d65711a6db3472d2ef7f84a59b112dbe7c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 20 Jun 2012 19:24:07 -0400
Subject: [PATCH 0536/1537] Only call OC_FileCache::get('/Shared') if it exists
 in the file cache, prevents premature addition of the Shared folder to the
 file cache

Conflicts:

	lib/fileproxy/quota.php
---
 lib/fileproxy/quota.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index b0c3775b9d..7316224cc6 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -55,7 +55,12 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 */
 	private function getFreeSpace(){
 		$rootInfo=OC_FileCache_Cached::get('');
-		$sharedInfo=OC_FileCache_Cached::get('/Shared');
+		// TODO Remove after merge of share_api
+		if (OC_FileCache::inCache('/Shared')) {
+			$sharedInfo=OC_FileCache_Cached::get('/Shared');
+		} else {
+			$sharedInfo = null;
+		}
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
 		$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
 		$totalSpace=$this->getQuota();

From f8ec280b6eb072a687be5e55021eb4d76dec02cf Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 21 Jun 2012 09:44:20 +0200
Subject: [PATCH 0537/1537] correct presentation of HTML encoded characters

---
 apps/media/js/player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index ad40683083..867ea80236 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -40,7 +40,7 @@ var PlayList={
 					PlayList.init(items[index].type,null); // init calls load that calls play
 				}else{
 					PlayList.player.jPlayer("setMedia", items[PlayList.current]);
-					$(".jp-current-song").text(items[PlayList.current].name);
+					$(".jp-current-song").html(items[PlayList.current].name);
 					items[index].playcount++;
 					PlayList.player.jPlayer("play",time);
 					if(index>0){

From 96d0b9834afda9d717631789210ede1dddebc86c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 09:58:04 +0200
Subject: [PATCH 0538/1537] fix mimetype for cdr files - bugfix for oc 559

---
 lib/mimetypes.fixlist.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/mimetypes.fixlist.php b/lib/mimetypes.fixlist.php
index a40fbd9e22..13e3f16b36 100644
--- a/lib/mimetypes.fixlist.php
+++ b/lib/mimetypes.fixlist.php
@@ -17,5 +17,6 @@ return array(
 	'xlsx'=>'application/msexcel',
 	'ppt'=>'application/mspowerpoint',
 	'pptx'=>'application/mspowerpoint',
-	'sgf' => 'application/sgf'
+	'sgf' => 'application/sgf',
+	'cdr' => 'application/coreldraw'
 );

From cd005e6c62976eabb38112138415c1c0e19069ee Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 21 Jun 2012 10:28:43 +0200
Subject: [PATCH 0539/1537] use new sanitizeHTML() function

---
 apps/files/templates/part.breadcrumb.php | 2 +-
 apps/files_texteditor/js/editor.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 43fe2d1fa9..22d9bb4490 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
 	<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
 		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
-    		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlentities($crumb["name"],ENT_COMPAT,'utf-8'); ?></a>
+    		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
 		</div>
 	<?php endfor;?>
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 70bb74a910..9d168c1c4f 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -67,7 +67,7 @@ function setSyntaxMode(ext){
 function showControls(filename,writeperms){
 	// Loads the control bar at the top.
 	// Load the new toolbar.
-	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename.replace(/</, "&lt;").replace(/>/, "&gt;")+'</p></div>';
+	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename+'</p></div>';
 	if(writeperms=="true"){
 		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
 	}

From 1db253922327bc115bca71fcb4a594b1f06c0353 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 11:35:20 +0200
Subject: [PATCH 0540/1537] make edit event form work with DateTime Property
 UTC

---
 apps/calendar/ajax/event/edit.form.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
index 6e5709a18d..26a0cc2a60 100644
--- a/apps/calendar/ajax/event/edit.form.php
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -27,6 +27,14 @@ $vevent = $object->VEVENT;
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 switch($dtstart->getDateType()) {
+	case Sabre_VObject_Property_DateTime::UTC:
+		$timeOffset = OC_Calendar_App::$tz*60;
+		$newDT      = $dtstart->getDateTime(); 
+		$newDT->add(new DateInterval("PT" . $timeOffset . "M"));
+		$dtstart->setDateTime($newDT); 
+		$newDT      = $dtend->getDateTime(); 
+		$newDT->add(new DateInterval("PT" . $timeOffset . "M"));
+		$dtend->setDateTime($newDT); 
 	case Sabre_VObject_Property_DateTime::LOCALTZ:
 	case Sabre_VObject_Property_DateTime::LOCAL:
 		$startdate = $dtstart->getDateTime()->format('d-m-Y');

From 2f9763d216a759505868b75ff0e4dcf846e7000c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 21 Jun 2012 11:50:51 +0200
Subject: [PATCH 0541/1537] check if user is allowed to edit bookmarks

---
 apps/bookmarks/ajax/editBookmark.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index fcec2e1ced..439b680dc2 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -40,18 +40,26 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
 }
 
 $bookmark_id = (int)$_POST["id"];
+$user_id = OCP\USER::getUser();
 
 $query = OCP\DB::prepare("
 	UPDATE *PREFIX*bookmarks
 	SET url = ?, title =?, lastmodified = $_ut
-	WHERE id = $bookmark_id
+	WHERE id = ?
+	AND user_id = ?
 	");
 
 $params=array(
 	htmlspecialchars_decode($_POST["url"]),
 	htmlspecialchars_decode($_POST["title"]),
+	$bookmark_id,
+	$user_id,
 	);
-$query->execute($params);
+
+$result = $query->execute($params);
+
+# Abort the operation if bookmark couldn't be set (probably because the user is not allowed to edit this bookmark)
+if ($result->numRows() == 0) exit();
 
 # Remove old tags and insert new ones.
 $query = OCP\DB::prepare("
@@ -66,7 +74,7 @@ $query = OCP\DB::prepare("
 	(bookmark_id, tag)
 	VALUES (?, ?)
 	");
-	
+
 $tags = explode(' ', urldecode($_POST["tags"]));
 foreach ($tags as $tag) {
 	if(empty($tag)) {

From 34739b7ec5b5bb26f993704b169937d3f04ed7c7 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 21 Jun 2012 13:57:18 +0200
Subject: [PATCH 0542/1537] use new sanitizeHTML() function

---
 apps/bookmarks/templates/list.php | 2 +-
 core/templates/layout.user.php    | 2 +-
 core/templates/login.php          | 2 +-
 settings/ajax/togglegroups.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index fdd2b19f79..1ed79264d0 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -7,7 +7,7 @@
  * See the COPYING-README file.
  */
 ?>
-<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo htmlentities($_GET['tag'],ENT_COMPAT,'utf-8'); ?>" />
+<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo OCP\Util::sanitizeHTML($_GET['tag']); ?>" />
 <div id="controls">
 	<input type="hidden" id="bookmark_add_id" value="0" />
 	<input type="text" id="bookmark_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="bookmarks_input" />
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 500ac9beda..660c9522c7 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -47,7 +47,7 @@
 			<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>
 			<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 htmlentities($_POST['query']);};?>" autocomplete="off" />
+				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" />
 			</form>
 		</div></header>
 
diff --git a/core/templates/login.php b/core/templates/login.php
index a40bf5c330..985cf90c2a 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -7,7 +7,7 @@
 		<?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="off" required />
+			<input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?OC_Util::sanitizeHTML($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required />
 		</p>
 		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f76e22f51d..7773c1049c 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -10,7 +10,7 @@ $error = "add user to";
 $action = "add";
 
 $username = $_POST["username"];
-$group = htmlentities($_POST["group"]);
+$group = OC_Util::sanitizeHTML($_POST["group"]);
 
 if(!OC_Group::groupExists($group)){
 	OC_Group::createGroup($group);

From e95055b2bdcd70568c4b4e21424800cab47a582b Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 21 Jun 2012 14:07:04 +0200
Subject: [PATCH 0543/1537] check if the data directory is accessible via http.
 Show a big security warning if yes

---
 lib/util.php                 | 53 +++++++++++++++++++++++++++++++-----
 settings/admin.php           |  2 ++
 settings/css/settings.css    |  5 +++-
 settings/templates/admin.php | 15 ++++++++++
 4 files changed, 67 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 settings/admin.php
 mode change 100644 => 100755 settings/templates/admin.php

diff --git a/lib/util.php b/lib/util.php
index 7792f96d44..8a2d913109 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -420,18 +420,57 @@ class OC_Util {
 		}
 	}
 	
-	/**
-	 * @brief Public function to sanitize HTML
-	 *
+	/**
+	 * @brief Public function to sanitize HTML
+	 *
 	 * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page.
 	 * 
 	 * @param string or array of strings
-	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
 	 */
-	public static function sanitizeHTML( &$value ){
-		if (is_array($value) || is_object($value)) array_walk_recursive($value,'OC_Util::sanitizeHTML');
-		else $value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+	public static function sanitizeHTML( &$value ){
+		if (is_array($value) || is_object($value)) array_walk_recursive($value,'OC_Util::sanitizeHTML');
+		else $value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
 		return $value;
 	}
 
+
+        /**
+         * Check if the htaccess file is working buy creating a test file in the data directory and trying to access via http
+         */
+        public static function ishtaccessworking() {
+
+		// testdata
+		$filename='/htaccesstest.txt';
+		$testcontent='testcontent';
+
+		// creating a test file
+                $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
+                $fp = @fopen($testfile, 'w');
+                @fwrite($fp, $testcontent);
+                @fclose($fp);
+
+		// accessing the file via http
+                $url = OC_Helper::serverProtocol(). '://'  . OC_Helper::serverHost() . OC::$WEBROOT.'/data'.$filename;
+                $fp = @fopen($url, 'r');
+                $content=@fread($fp, 2048);
+                @fclose($fp);
+
+		// cleanup
+		@unlink($testfile);
+
+		// does it work ?
+		if($content==$testcontent) {
+			return(false);
+		}else{
+			return(true);
+
+		}
+
+        }
+
+
+
+
+
 }
diff --git a/settings/admin.php b/settings/admin.php
old mode 100644
new mode 100755
index a997bad4e3..8369ee64e0
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -15,6 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" );
 
 $tmpl = new OC_Template( 'settings', 'admin', 'user');
 $forms=OC_App::getForms('admin');
+$htaccessworking=OC_Util::ishtaccessworking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
 function compareEntries($a,$b){
@@ -24,6 +25,7 @@ usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',$entries);
+$tmpl->assign('htaccessworking',$htaccessworking);
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
diff --git a/settings/css/settings.css b/settings/css/settings.css
index df1e3cfd3c..80e96df5e6 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -48,5 +48,8 @@ li.active { color:#000; }
 small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size:6pt; padding:4px; border-radius: 4px;}
 span.version { margin-left:3em; color:#ddd; }
 
-/* LOF */
+/* LOG */
 #log { white-space:normal; }
+
+/* ADMIN */
+span.securitywarning {color:#C33; font-weight:bold; }
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
old mode 100644
new mode 100755
index 38c6042c82..a9f727d676
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -6,6 +6,21 @@
 $levels=array('Debug','Info','Warning','Error','Fatal');
 ?>
 
+<?php
+
+if(!$_['htaccessworking']) {
+?>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+
+	<span class="securitywarning">Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.</span>
+	
+</fieldset>	
+<?php	
+}
+?>
+
+
 <?php foreach($_['forms'] as $form){
 	echo $form;
 };?>

From f5740a6f925ddcd78a563ab38db88f05d6a77317 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 15:19:49 +0200
Subject: [PATCH 0544/1537] fix a PHP Notice

---
 apps/calendar/lib/app.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 167382a5e7..8e13b13b8a 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -338,6 +338,9 @@ class OC_Calendar_App{
 			$singleevents = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::EVENT, 1, ($_GET['calendar_id'] == 'shared_rw')?'rw':'r');
 			foreach($singleevents as $singleevent){
 				$event = OC_Calendar_Object::find($singleevent['eventid']);
+				if(!array_key_exists('summary', $event)){
+					$event['summary'] = self::$l10n->t('unnamed');
+				}
 				$event['summary'] .= ' (' . self::$l10n->t('by') .  ' ' . OC_Calendar_Object::getowner($event['id']) . ')';
 				$events[] =  $event;
 			}

From 7c3f6f61db5b93c3393ab4b3b99c3e6906ed27be Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 21 Jun 2012 14:53:58 +0100
Subject: [PATCH 0545/1537] Fixed missing jQuery event object - expire
 interface now works with Firefox

---
 apps/files_versions/js/settings-personal.js | 78 +++++++++------------
 1 file changed, 33 insertions(+), 45 deletions(-)

diff --git a/apps/files_versions/js/settings-personal.js b/apps/files_versions/js/settings-personal.js
index d9456f3f2a..6ea8c1a950 100644
--- a/apps/files_versions/js/settings-personal.js
+++ b/apps/files_versions/js/settings-personal.js
@@ -1,51 +1,39 @@
-// $(document).ready(function(){
-// 	$('#versions').change( function(){
-// 		OC.msg.startSaving('#calendar .msg')
-// 		// Serialize the data
-// 		var post = $( '#timezone' ).serialize();
-// 		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){
-// 			//OC.msg.finishedSaving('#calendar .msg', data);
-// 		});
-// 		return false;
-// 	});
-// });
+// TODO: allow the button to be clicked only once
 
-$(document).ready(function(){
+$( document ).ready(function(){
 	//
-	$('#expireAllBtn').click(function(){
+	$( '#expireAllBtn' ).click( 
 		
-		// Prevent page from reloading
-		event.preventDefault();
+		function( event ) {
 		
-		// Show loading gif
-		$('.expireAllLoading').show();
-	
-		$.getJSON(
-			OC.filePath('files_versions','ajax','expireAll.php'),
-			function(result){
-				if (result.status == 'success') {
-					$('.expireAllLoading').hide();
-					$('#expireAllBtn').html('Expiration successful');
-				} else {
-					
-					// Cancel loading
-					$('#expireAllBtn').html('Expiration failed');
-					
-					// Show Dialog
-					OC.dialogs.alert(
-						'Something went wrong, your files may not have been expired', 
-						'An error has occurred', 
-						function(){ 
-							$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
-						}
-						
-					);
-					
-				}
- 			}
+			// Prevent page from reloading
+			event.preventDefault();
 			
-		);
-
-	});
-	
+			// Show loading gif
+			$('.expireAllLoading').show();
+		
+			$.getJSON(
+				OC.filePath('files_versions','ajax','expireAll.php'),
+				function(result){
+					if (result.status == 'success') {
+						$('.expireAllLoading').hide();
+						$('#expireAllBtn').html('Expiration successful');
+					} else {
+						
+						// Cancel loading
+						$('#expireAllBtn').html('Expiration failed');
+						
+						// Show Dialog
+						OC.dialogs.alert(
+							'Something went wrong, your files may not have been expired', 
+							'An error has occurred', 
+							function(){ 
+								$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
+							}	
+						);		
+					}
+				}	
+			);
+		}
+	);
 });
\ No newline at end of file

From 49d9eb7acf8636eed2e25292df924694fc4ccd47 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 16:23:13 +0200
Subject: [PATCH 0546/1537] fix calendar

---
 apps/calendar/ajax/events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 7178358c7b..ae55cbc02d 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -22,7 +22,7 @@ $calendar_id = (is_null($calendar_id)?strip_tags($_GET['calendar_id']):$calendar
 
 $start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']);
 $end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']);
-$events = OC_Calendar_App::getrequestedEvents($calendar_id, $start, $end);
+$events = OC_Calendar_App::getrequestedEvents($_GET['calendar_id'], $start, $end);
 $output = array();
 foreach($events as $event){
 	$output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end));

From d0455c5819099751fb8614a76c272a23c6494b65 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 17:37:53 +0200
Subject: [PATCH 0547/1537] truncate decrypted files based on filelength

---
 apps/files_encryption/lib/crypt.php        |   8 ++++--
 apps/files_encryption/lib/cryptstream.php  |  17 +++++++++---
 apps/files_encryption/lib/proxy.php        |  23 ++++++++++++++--
 apps/files_encryption/tests/encryption.php |   2 +-
 apps/files_encryption/tests/proxy.php      |  15 +++++++++++
 apps/files_encryption/tests/stream.php     |  30 +++++++++++++++------
 apps/files_encryption/tests/zeros          | Bin 0 -> 10238 bytes
 lib/filecache.php                          |  10 +++----
 8 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 apps/files_encryption/tests/zeros

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 4c0ffa978e..1c90954cec 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -206,12 +206,16 @@ class OC_Crypt {
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
-	public static function blockDecrypt($data, $key=''){
+	public static function blockDecrypt($data, $key='',$maxLength=0){
 		$result='';
 		while(strlen($data)){
 			$result.=self::decrypt(substr($data,0,8192),$key);
 			$data=substr($data,8192);
 		}
-		return rtrim($result, "\0");
+		if($maxLength>0){
+			return substr($result,0,$maxLength);
+		}else{
+			return rtrim($result, "\0");
+		}
 	}
 }
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 64fec381de..4ef7d1e08b 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -35,6 +35,7 @@ class OC_CryptStream{
 	private $meta=array();//header/meta for source stream
 	private $count;
 	private $writeCache;
+	private $size;
 	private static $rootView;
 
 	public function stream_open($path, $mode, $options, &$opened_path){
@@ -45,8 +46,14 @@ class OC_CryptStream{
 		if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])){
 			$this->source=self::$sourceStreams[basename($path)]['stream'];
 			$this->path=self::$sourceStreams[basename($path)]['path'];
+			$this->size=self::$sourceStreams[basename($path)]['size'];
 		}else{
 			$this->path=$path;
+			if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+'){
+				$this->size=0;
+			}else{
+				$this->size=self::$rootView->filesize($path,$mode);
+			}
 			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
 			$this->source=self::$rootView->fopen($path,$mode);
 			OC_FileProxy::$enabled=true;
@@ -77,14 +84,16 @@ class OC_CryptStream{
 			OCP\Util::writeLog('files_encryption','php bug 21641 no longer holds, decryption will not work',OCP\Util::FATAL);
 			die();
 		}
+		$pos=ftell($this->source);
 		$data=fread($this->source,8192);
 		if(strlen($data)){
 			$result=OC_Crypt::decrypt($data);
 		}else{
 			$result='';
 		}
-		if($this->stream_eof()){
-			$result=rtrim($result, "\0");
+		$length=$this->size-$pos;
+		if($length<8192){
+			$result=substr($result,0,$length);
 		}
 		return $result;
 	}
@@ -116,6 +125,8 @@ class OC_CryptStream{
 				$data=substr($data,8192);
 			}
 		}
+		$currentPos=ftell($this->source);
+		$this->size=max($this->size,$currentPos);
 		return $length;
 	}
 
@@ -159,7 +170,7 @@ class OC_CryptStream{
 	public function stream_close(){
 		$this->flush();
 		if($this->meta['mode']!='r' and $this->meta['mode']!='rb'){
-			OC_FileCache::put($this->path,array('encrypted'=>true),'');
+			OC_FileCache::put($this->path,array('encrypted'=>true,'size'=>$this->size),'');
 		}
 		return fclose($this->source);
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index b9e719448a..f25e4a662f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -66,15 +66,17 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	public function preFile_put_contents($path,&$data){
 		if(self::shouldEncrypt($path)){
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
+				$size=strlen($data);
 				$data=OC_Crypt::blockEncrypt($data);
-				OC_FileCache::put($path,array('encrypted'=>true),'');
+				OC_FileCache::put($path,array('encrypted'=>true,'size'=>$size),'');
 			}
 		}
 	}
 	
 	public function postFile_get_contents($path,$data){
 		if(self::isEncrypted($path)){
-			$data=OC_Crypt::blockDecrypt($data);
+			$cached=OC_FileCache_Cached::get($path,'');
+			$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
 		}
 		return $data;
 	}
@@ -108,4 +110,21 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		}
 		return $mime;
 	}
+
+	public function postStat($path,$data){
+		if(self::isEncrypted($path)){
+			$cached=OC_FileCache_Cached::get($path,'');
+			$data['size']=$cached['size'];
+		}
+		return $data;
+	}
+
+	public function postFileSize($path,$size){
+		if(self::isEncrypted($path)){
+			$cached=OC_FileCache_Cached::get($path,'');
+			return  $cached['size'];
+		}else{
+			return $size;
+		}
+	}
 }
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index 70aa1daf4c..286770a69f 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -66,7 +66,7 @@ class Test_Encryption extends UnitTestCase {
 		$this->assertEqual($decrypted,$source);
 
 		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key,strlen($source));
 		$this->assertEqual($decrypted,$source);
 	}
 }
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 5616e2091a..4533289265 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -50,6 +50,7 @@ class Test_CryptProxy extends UnitTestCase {
 		
 		$fromFile=OC_Filesystem::file_get_contents('/file');
 		$this->assertNotEqual($original,$stored);
+		$this->assertEqual(strlen($original),strlen($fromFile));
 		$this->assertEqual($original,$fromFile);
 
 	}
@@ -88,6 +89,20 @@ class Test_CryptProxy extends UnitTestCase {
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
 		$this->assertNotEqual($original,$stored);
+		$this->assertEqual(strlen($original),strlen($fromFile));
 		$this->assertEqual($original,$fromFile);
+
+		$file=__DIR__.'/zeros';
+		$original=file_get_contents($file);
+
+		OC_Filesystem::file_put_contents('/file',$original);
+
+		OC_FileProxy::$enabled=false;
+		$stored=OC_Filesystem::file_get_contents('/file');
+		OC_FileProxy::$enabled=true;
+
+		$fromFile=OC_Filesystem::file_get_contents('/file');
+		$this->assertNotEqual($original,$stored);
+		$this->assertEqual(strlen($original),strlen($fromFile));
 	}
 }
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 4ffeb6210a..d95ea792f7 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -10,23 +10,23 @@ class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
 	
 	function testStream(){
-		$stream=$this->getStream('test1','w');
+		$stream=$this->getStream('test1','w',strlen('foobar'));
 		fwrite($stream,'foobar');
 		fclose($stream);
 
-		$stream=$this->getStream('test1','r');
+		$stream=$this->getStream('test1','r',strlen('foobar'));
 		$data=fread($stream,6);
 		fclose($stream);
 		$this->assertEqual('foobar',$data);
 
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$source=fopen($file,'r');
-		$target=$this->getStream('test2','w');
+		$target=$this->getStream('test2','w',0);
 		OCP\Files::streamCopy($source,$target);
 		fclose($target);
 		fclose($source);
 
-		$stream=$this->getStream('test2','r');
+		$stream=$this->getStream('test2','r',filesize($file));
 		$data=stream_get_contents($stream);
 		$original=file_get_contents($file);
 		$this->assertEqual(strlen($original),strlen($data));
@@ -37,9 +37,10 @@ class Test_CryptStream extends UnitTestCase {
 	 * get a cryptstream to a temporary file
 	 * @param string $id
 	 * @param string $mode
+	 * @param int size
 	 * @return resource
 	 */
-	function getStream($id,$mode){
+	function getStream($id,$mode,$size){
 		if($id===''){
 			$id=uniqid();
 		}
@@ -50,7 +51,7 @@ class Test_CryptStream extends UnitTestCase {
 			$file=$this->tmpFiles[$id];
 		}
 		$stream=fopen($file,$mode);
-		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream);
+		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
 		return fopen('crypt://streams/'.$id,$mode);
 	}
 
@@ -58,11 +59,24 @@ class Test_CryptStream extends UnitTestCase {
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test','w');
+		$stream=$this->getStream('test','w',strlen($source));
 		fwrite($stream,$source);
 		fclose($stream);
 
-		$stream=$this->getStream('test','r');
+		$stream=$this->getStream('test','r',strlen($source));
+		$data=stream_get_contents($stream);
+		fclose($stream);
+		$this->assertEqual(strlen($data),strlen($source));
+		$this->assertEqual($source,$data);
+
+		$file=__DIR__.'/zeros';
+		$source=file_get_contents($file);
+
+		$stream=$this->getStream('test2','w',strlen($source));
+		fwrite($stream,$source);
+		fclose($stream);
+
+		$stream=$this->getStream('test2','r',strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data),strlen($source));
diff --git a/apps/files_encryption/tests/zeros b/apps/files_encryption/tests/zeros
new file mode 100644
index 0000000000000000000000000000000000000000..ff982acf423cad62041f225497e099ba5520961c
GIT binary patch
literal 10238
zcmeIu0Sy2E0K%a6Pi+o2h(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM
P7%*VKfB^#r415g?C;k8d

literal 0
HcmV?d00001

diff --git a/lib/filecache.php b/lib/filecache.php
index 9963a5a3ba..d5458834e0 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -68,18 +68,18 @@ class OC_FileCache{
 		$path=$root.$path;
 		$parent=self::getParentId($path);
 		$id=self::getId($path,'');
-		if($id!=-1){
-			self::update($id,$data);
-			return;
-		}
 		if(isset(OC_FileCache_Cached::$savedData[$path])){
-			$data=array_merge($data,OC_FileCache_Cached::$savedData[$path]);
+			$data=array_merge(OC_FileCache_Cached::$savedData[$path],$data);
 			unset(OC_FileCache_Cached::$savedData[$path]);
 		}
 		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
 			OC_FileCache_Cached::$savedData[$path]=$data;
 			return;
 		}
+		if($id!=-1){
+			self::update($id,$data);
+			return;
+		}
 		if(!isset($data['encrypted'])){
 			$data['encrypted']=false;
 		}

From 56de98ed8cb74cc197d5b7cecdc519c2c267e3a5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 18:07:56 +0200
Subject: [PATCH 0548/1537] fix saved file size for uploaded files

---
 apps/files_encryption/lib/cryptstream.php | 8 ++++----
 lib/filecache.php                         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 4ef7d1e08b..e002053756 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -115,8 +115,9 @@ class OC_CryptStream{
 			$data=substr($block,0,$currentPos%8192).$data;
 			fseek($this->source,-($currentPos%8192),SEEK_CUR);
 		}
-		while(strlen($data)>0){
-			if(strlen($data)<8192){
+		$currentPos=ftell($this->source);
+		while($remainingLength=strlen($data)>0){
+			if($remainingLength<8192){
 				$this->writeCache=$data;
 				$data='';
 			}else{
@@ -125,8 +126,7 @@ class OC_CryptStream{
 				$data=substr($data,8192);
 			}
 		}
-		$currentPos=ftell($this->source);
-		$this->size=max($this->size,$currentPos);
+		$this->size=max($this->size,$currentPos+$length);
 		return $length;
 	}
 
diff --git a/lib/filecache.php b/lib/filecache.php
index d5458834e0..e3bcc7d000 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -72,14 +72,14 @@ class OC_FileCache{
 			$data=array_merge(OC_FileCache_Cached::$savedData[$path],$data);
 			unset(OC_FileCache_Cached::$savedData[$path]);
 		}
-		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
-			OC_FileCache_Cached::$savedData[$path]=$data;
-			return;
-		}
 		if($id!=-1){
 			self::update($id,$data);
 			return;
 		}
+		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
+			OC_FileCache_Cached::$savedData[$path]=$data;
+			return;
+		}
 		if(!isset($data['encrypted'])){
 			$data['encrypted']=false;
 		}

From 6707e4187e4c1186eff8dfe06999c4539ab80de7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 18:35:12 +0200
Subject: [PATCH 0549/1537] only use 1 fsview when initializing encryption

---
 apps/files_encryption/lib/crypt.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 1c90954cec..849e88ee0b 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -44,18 +44,16 @@ class OC_Crypt {
 	}
 
 	public static function init($login,$password) {
-		$view1=new OC_FilesystemView('/');
-		if(!$view1->file_exists('/'.$login)){
-			$view1->mkdir('/'.$login);
+		$view=new OC_FilesystemView('/');
+		if(!$view->file_exists('/'.$login)){
+			$view->mkdir('/'.$login);
 		}
 
-		$view=new OC_FilesystemView('/'.$login);
-
 		OC_FileProxy::$enabled=false;
-		if(!$view->file_exists('/encryption.key')){// does key exist?
+		if(!$view->file_exists('/'.$login.'/encryption.key')){// does key exist?
 			OC_Crypt::createkey($login,$password);
 		}
-		$key=$view->file_get_contents('/encryption.key');
+		$key=$view->file_get_contents('/'.$login.'/encryption.key');
 		OC_FileProxy::$enabled=true;
 		$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
 	}

From 49033ff8e0dd89d964264f269930b0587b8479c4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 18:53:10 +0200
Subject: [PATCH 0550/1537] dont change the encryption key during the test case

---
 apps/files_encryption/tests/proxy.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 4533289265..fcfc4cfb9f 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -8,10 +8,12 @@
 
 class Test_CryptProxy extends UnitTestCase {
 	private $oldConfig;
+	private $oldKey;
 	
 	public function setUp(){
 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
 		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
 	
 		
 		//set testing key
@@ -36,6 +38,9 @@ class Test_CryptProxy extends UnitTestCase {
 
 	public function tearDown(){
 		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
+		if(!is_null($this->oldKey)){
+			$_SESSION['enckey']=$this->oldKey;
+		}
 	}
 
 	public function testSimple(){

From a9a913c27304c395c3f6af3487781d02790b8009 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 21 Jun 2012 18:07:21 +0100
Subject: [PATCH 0551/1537] Implemented deleteAll() method in OC_FilesystemView
 (interface) and OC_Filestorage_Common (logic) Made OC_Filestorage_Local and
 OC_Filestorage_Shared extend OC_Filestorage_Common Set searchInDir() to
 protected instead of private in OC_Filestorage_Local and
 OC_Filestorage_Shared Added class documentation to OC_Filestorage_Common
 Cleaned up OCA_Versions::expireAll()

---
 apps/files_sharing/sharedstorage.php |  4 +-
 apps/files_versions/versions.php     | 86 ++--------------------------
 lib/filestorage/common.php           | 85 +++++++++++++++++++++++++++
 lib/filestorage/local.php            |  4 +-
 lib/filesystemview.php               |  3 +
 5 files changed, 97 insertions(+), 85 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 62c86ee18e..fed1b834fa 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -25,7 +25,7 @@ require_once( 'lib_share.php' );
 /**
  * Convert target path to source path and pass the function call to the correct storage provider
  */
-class OC_Filestorage_Shared extends OC_Filestorage {
+class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	private $datadir;
 	private $sourcePaths = array();
@@ -492,7 +492,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		return $this->searchInDir($query);
 	}
 
-	private function searchInDir($query, $path = "") {
+	protected function searchInDir($query, $path = "") {
 		$files = array();
 		if ($dh = $this->opendir($path)) {
 			while (($filename = readdir($dh)) !== false) {
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 7522538caf..9c0829ff1d 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -261,10 +261,8 @@ class Storage {
                 
         }
 
-
-        
         /**
-         * expire old versions of a file.
+         * @brief Erase a file's versions which exceed the set quota
          */
         public static function expire($filename) {
                 if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
@@ -298,90 +296,16 @@ class Storage {
         }
 
         /**
-         * @brief erase all old versions of all user files
-         * @return 
+         * @brief Erase all old versions of all user files
+         * @return true/false
          */
         public static function expireAll() {
-	
-		function deleteAll( $directory, $empty = false ) {
 		
-			// strip leading slash
-			if( substr( $directory, 0, 1 ) == "/" ) {
-			
-				$directory = substr( $directory, 1 );
-				
-			}
-			
-			// strip trailing slash
-			if( substr( $directory, -1) == "/" ) {
-			
-				$directory = substr( $directory, 0, -1 );
-				
-			}
-
-			$view = new \OC_FilesystemView('');
-			
-			if ( !$view->file_exists( $directory ) || !$view->is_dir( $directory ) ) {
-			
-				return false;
-				
-			} elseif( !$view->is_readable( $directory ) ) {
-			
-				return false;
-				
-			} else {
-			
-				$foldername = \OCP\Config::getSystemValue('datadirectory') .'/' . \OCP\USER::getUser() .'/' . $directory; // have to set an absolute path for use with PHP's opendir as OC version doesn't work
-				
-				$directoryHandle = $view->opendir( \OCP\USER::getUser() . '/' . $directory );
-				
-				while ( $contents = readdir( $directoryHandle ) ) {
-				
-					if ( $contents != '.' && $contents != '..') {
-						
-						$path = $directory . "/" . $contents;
-					
-						if ( $view->is_dir( $path ) ) {
-							
-							deleteAll( $path );
-						
-						} else {
-							
-							$view->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
-						
-						}
-					}
-				
-				}
-			
-				//$view->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
-
-				if ( $empty == false ) {
-				
-					if ( !$view->rmdir( $directory ) ) {
-					
-						return false;
-						
-					}
-					
- 				}
-			
-				return true;
-			}
-			
-		}
+		$view = new \OC_FilesystemView('');
 		
 		$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 		
-		if ( deleteAll( $dir, true ) ) {
-		
-			return true;
-			
-		} else {
-			
-			return false;
-			
-		}
+		return $view->deleteAll( $dir, true );
 	
         }
 
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index f2a5775fd1..ba78fca80e 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -20,6 +20,18 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+/**
+ * Storage backend class for providing common filesystem operation methods 
+ * which are not storage-backend specific.
+ *
+ * OC_Filestorage_Common is never used directly; it is extended by all other
+ * storage backends, where its methods may be overridden, and additional 
+ * (backend-specific) methods are defined.
+ *
+ * Some OC_Filestorage_Common methods call functions which are first defined
+ * in classes which extend it, e.g. $this->stat() .
+ */
+
 abstract class OC_Filestorage_Common extends OC_Filestorage {
 
 	public function __construct($parameters){}
@@ -87,6 +99,79 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		return $count>0;
 	}
 // 	abstract public function fopen($path,$mode);
+
+	/**
+	 * @brief Deletes all files and folders recursively within a directory
+	 * @param $directory The directory whose contents will be deleted
+	 * @param $empty Flag indicating whether directory will be emptied
+	 * @returns true/false
+	 *
+	 * @note By default the directory specified by $directory will be 
+	 * deleted together with its contents. To avoid this set $empty to true
+	 */
+	public function deleteAll( $directory, $empty = false ) {
+	
+		// strip leading slash
+		if( substr( $directory, 0, 1 ) == "/" ) {
+		
+			$directory = substr( $directory, 1 );
+			
+		}
+		
+		// strip trailing slash
+		if( substr( $directory, -1) == "/" ) {
+		
+			$directory = substr( $directory, 0, -1 );
+			
+		}
+		
+		if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory ) || !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
+		
+			return false;
+			
+		} elseif( !$this->is_readable( \OCP\USER::getUser() . '/' . $directory ) ) {
+		
+			return false;
+			
+		} else {
+			
+			$directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
+			
+			while ( $contents = readdir( $directoryHandle ) ) {
+			
+				if ( $contents != '.' && $contents != '..') {
+					
+					$path = $directory . "/" . $contents;
+				
+					if ( $this->is_dir( $path ) ) {
+						
+						deleteAll( $path );
+					
+					} else {
+						
+						$this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
+					
+					}
+				}
+			
+			}
+		
+			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
+
+			if ( $empty == false ) {
+			
+				if ( !$this->rmdir( $directory ) ) {
+				
+					return false;
+					
+				}
+				
+			}
+		
+			return true;
+		}
+		
+	}
 	public function getMimeType($path){
 		if(!$this->file_exists($path)){
 			return false;
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 44a2ab0f63..b2eba05151 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -2,7 +2,7 @@
 /**
  * for local filestore, we only have to map the paths
  */
-class OC_Filestorage_Local extends OC_Filestorage{
+class OC_Filestorage_Local extends OC_Filestorage_Common{
 	protected $datadir;
 	private static $mimetypes=null;
 	public function __construct($arguments){
@@ -172,7 +172,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			return $this->datadir.$path;
 	}
 
-	private function searchInDir($query,$dir=''){
+	protected function searchInDir($query,$dir=''){
 		$files=array();
 		foreach (scandir($this->datadir.$dir) as $item) {
 			if ($item == '.' || $item == '..') continue;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index da622bcf92..99e08c50e7 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -252,6 +252,9 @@ class OC_FilesystemView {
 	public function unlink($path){
 		return $this->basicOperation('unlink',$path,array('delete'));
 	}
+	public function deleteAll( $directory, $empty = false ) {
+		return $this->basicOperation( 'deleteAll', $directory, array('delete'), $empty );
+	}
 	public function rename($path1,$path2){
 		$absolutePath1=$this->getAbsolutePath($path1);
 		$absolutePath2=$this->getAbsolutePath($path2);

From b9e3b0ddf9260c7db468268714b75e2dfdbf5a3e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 18:20:25 +0200
Subject: [PATCH 0552/1537] Tasks: Fix position of the summary input

---
 apps/tasks/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
index 23aac4e9ca..ccebe60df0 100644
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -33,7 +33,7 @@
 .task .completed {position:absolute;left:3em;top:0.3em;}
 
 .task .summary{padding-left:4em;height:2em;}
-.task .summary input{position:relative;left:5px;top:0.5em;}
+.task .summary input{position:absolute;left:5em;top:0;}
 .task.done .summary{text-decoration:line-through;}
 
 .task .tag{border-radius:0.4em;display:inline-block;opacity:0.2;margin:0 0.2em;border:1px solid transparent;padding:0 0.4em;cursor:pointer;}

From 10351550cd822c08b605ce9a249ff880c64b0211 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 18:21:15 +0200
Subject: [PATCH 0553/1537] Tasks: Use list label for ordering by list

---
 apps/tasks/templates/tasks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tasks/templates/tasks.php b/apps/tasks/templates/tasks.php
index ab6138b613..c0e2f8d4e2 100644
--- a/apps/tasks/templates/tasks.php
+++ b/apps/tasks/templates/tasks.php
@@ -2,7 +2,7 @@
 	<input type="text" id="tasks_newtask">
 	<input type="button" id="tasks_addtask" value="<?php echo $l->t('Add Task'); ?>">
 	<input type="button" id="tasks_order_due" value="<?php echo $l->t('Order Due'); ?>">
-	<input type="button" id="tasks_order_category" value="<?php echo $l->t('Order Category'); ?>">
+	<input type="button" id="tasks_order_category" value="<?php echo $l->t('Order List'); ?>">
 	<input type="button" id="tasks_order_complete" value="<?php echo $l->t('Order Complete'); ?>">
 	<input type="button" id="tasks_order_location" value="<?php echo $l->t('Order Location'); ?>">
 	<input type="button" id="tasks_order_prio" value="<?php echo $l->t('Order Priority'); ?>">

From b17e6826099f2ba58d1abd246cf3c103520efea4 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 18:21:38 +0200
Subject: [PATCH 0554/1537] Tasks: Add delete action

---
 apps/tasks/css/style.css       |  2 ++
 apps/tasks/js/tasks.js         | 30 +++++++++++++++---------------
 apps/tasks/templates/tasks.php |  3 +++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
index ccebe60df0..80b6e777b5 100644
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -58,3 +58,5 @@
 .task .due{position:absolute;right:0.3em;}
 .task .due .date{width:6em;}
 .task .due .time{width:6em;}
+
+.task_delete{position:absolute;bottom:2px;right:5px}
diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index 6547b80981..bc92965bb0 100644
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -97,8 +97,10 @@ OC.Tasks = {
 				due.find('.time').timepicker('setTime', date.getHours()+':'+date.getMinutes());
 			}
 		}
+		var delete_action = task_container.find('.task_delete').click(OC.Tasks.deleteClickHandler);
 		$('<div>')
 			.addClass('more')
+			.append(delete_action)
 			.append(description)
 			.append(due)
 			.appendTo(task_container);
@@ -273,6 +275,19 @@ OC.Tasks = {
 		$task.find('div.location').show();
 		$task.find('input.location').hide();
 	},
+	deleteClickHandler:function(event){
+		var $task = $(this).closest('.task'),
+			task = $task.data('task');
+		$.post(OC.filePath('tasks', 'ajax', 'delete.php'),{'id':task.id},function(jsondata){
+			if(jsondata.status == 'success'){
+				$task.remove();
+			}
+			else{
+				alert(jsondata.data.message);
+			}
+		});
+		return false;
+	},
 	complete_task:function() {
 		var $task = $(this).closest('.task'),
 			task = $task.data('task'),
@@ -441,21 +456,6 @@ $(document).ready(function(){
 		});
 	});
 
-	$('#tasks_delete').live('click',function(){
-		var id = $('#task_details').data('id');
-		$.post('ajax/delete.php',{'id':id},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#tasks [data-id="'+jsondata.data.id+'"]').remove();
-				$('#task_details').data('id','');
-				$('#task_details').html('');
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		return false;
-	});
-
 	$('#tasks_addtask').click(function(){
 		var input = $('#tasks_newtask').val();
 		$.post(OC.filePath('tasks', 'ajax', 'addtask.php'),{text:input},function(jsondata){
diff --git a/apps/tasks/templates/tasks.php b/apps/tasks/templates/tasks.php
index c0e2f8d4e2..8c0c89e497 100644
--- a/apps/tasks/templates/tasks.php
+++ b/apps/tasks/templates/tasks.php
@@ -25,6 +25,9 @@
 	<span class="task_less">
 		<img title="<?php echo $l->t('Less') ?>" src="<?php echo OCP\image_path('core', 'actions/triangle-n.svg') ?>" class="svg"><?php echo $l->t('Less') ?>
 	</span>
+	<span class="task_delete">
+		<img title="<?php echo $l->t('Delete') ?>" src="<?php echo OCP\image_path('core', 'actions/delete.svg') ?>" class="svg"><?php echo $l->t('Delete') ?>
+	</span>
 </p>
 <script type='text/javascript'>
 var categories = <?php echo json_encode($_['categories']); ?>;

From b17bf59cedce3f6326af26c9d1522d57b1d15ada Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 21 Jun 2012 20:51:23 +0200
Subject: [PATCH 0555/1537] Only search for VEVENTs.

---
 apps/calendar/lib/search.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 6526b4223a..560330f65e 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -17,6 +17,9 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 		foreach($calendars as $calendar){
 			$objects = OC_Calendar_Object::all($calendar['id']);
 			foreach($objects as $object){
+				if($object['objecttype']!='VEVENT') {
+					continue;
+				}
 				if(substr_count(strtolower($object['summary']), strtolower($query)) > 0){
 					$calendardata = OC_VObject::parse($object['calendardata']);
 					$vevent = $calendardata->VEVENT;
@@ -37,7 +40,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i');
 					}
 					$link = OCP\Util::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']);
-					$results[]=new OC_Search_Result($object['summary'],$info, $link,$l->t('Cal.'));//$name,$text,$link,$type
+					$results[]=new OC_Search_Result($object['summary'],$info, $link,(string)$l->t('Cal.'));//$name,$text,$link,$type
 				}
 			}
 		}

From d22f805b632fad18232d49d638949fe87c2f9183 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 21 Jun 2012 19:19:39 +0000
Subject: [PATCH 0556/1537] Correct inclusion paths

---
 lib/templatelayout.php | 59 ++++++++++++++++++++++++++++++------------
 remote.php             |  7 +++--
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 1f82e82be7..6e1d435f67 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -9,6 +9,7 @@
 class OC_TemplateLayout extends OC_Template {
 	public function __construct( $renderas ){
 		// Decide which page we show
+
 		if( $renderas == 'user' ){
 			parent::__construct( 'core', 'layout.user' );
 			$this->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
@@ -32,6 +33,12 @@ class OC_TemplateLayout extends OC_Template {
 			parent::__construct( 'core', 'layout.guest' );
 		}
 
+		$apps_paths = array();
+		foreach(OC_App::getEnabledApps() as $app){
+			$apps_paths[$app] = OC_App::getAppWebPath($app);
+    }
+		$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
+
 		// Add the js files
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
@@ -44,19 +51,29 @@ class OC_TemplateLayout extends OC_Template {
 
 		// Add the css files
 		$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
+
 		$this->assign('cssfiles', array());
 		foreach($cssfiles as $info) {
 			$root = $info[0];
 			$web = $info[1];
 			$file = $info[2];
 			$paths = explode('/', $file);
-			if($root == OC::$APPSROOT && $paths[0] == 'apps'){
-				$app = $paths[1];
+
+			$in_root = false;
+			foreach(OC::$APPSROOTS as $app_root) {
+				if($root == $app_root['path']) {
+					$in_root = true;
+          break;
+				}
+			}
+
+			if($in_root ) {
+				$app = $paths[0];
 				unset($paths[0]);
-				unset($paths[1]);
 				$path = implode('/', $paths);
 				$this->append( 'cssfiles', OC_Helper::linkTo($app, $path));
-			}else{
+			}
+			else {
 				$this->append( 'cssfiles', $web.'/'.$file);
 			}
 		}
@@ -89,10 +106,6 @@ class OC_TemplateLayout extends OC_Template {
 			// is it in 3rdparty?
 			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
 
-			// or in apps?
-			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
-			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
-
 			// or in the owncloud root?
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
@@ -102,8 +115,17 @@ class OC_TemplateLayout extends OC_Template {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 			}else{
-				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
+				$append = false;
+				// or in apps?
+				foreach( OC::$APPSROOTS as $apps_dir)
+				{
+					if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) { $append =true; break; }
+					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { $append =true; break; }
+				}
+				if(! $append) {
+					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					die();
+				}
 			}
 		}
 		// Add the theme css files. you can override the default values here
@@ -139,10 +161,6 @@ class OC_TemplateLayout extends OC_Template {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
 
-			// Is it part of an app?
-			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
-			}elseif(self::appendIfExist($files, OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
-
 			// Is it in the owncloud root but overwritten by the theme?
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
@@ -160,9 +178,16 @@ class OC_TemplateLayout extends OC_Template {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
 
 			}else{
-				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
-
+				// Is it part of an app?
+				$append = false;
+				foreach( OC::$APPSROOTS as $apps_dir) {
+					if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$script$fext.js")) { $append =true; break; }
+					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$script.js")) { $append =true; break; }
+				}
+				if(! $append) {
+					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					die();
+				}
 			}
 		}
 		return $files;
diff --git a/remote.php b/remote.php
index a58b1c0a0f..ef610f3694 100644
--- a/remote.php
+++ b/remote.php
@@ -20,7 +20,6 @@ if(is_null($file)){
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
-
 if(count(explode('/',$file)) == 3) {
 	$parts=explode('/',$file);
 	$app=$parts[2];
@@ -28,9 +27,9 @@ if(count(explode('/',$file)) == 3) {
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
 	require_once( OC::$SERVERROOT.$file);
 } else {
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts=explode('/', $file, 4);
+	$app=$parts[2];
 	OC_App::loadApp($app);
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
+	require_once(OC_App::getAppPath($app) .'/'. $parts[3]);
 }

From 84b9ac2678e6a0b014b730896a12d1531789d8da Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 21 Jun 2012 19:35:34 +0000
Subject: [PATCH 0557/1537] Correct writable check for app dir

---
 lib/util.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 8a2d913109..6cca418a1b 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -200,9 +200,11 @@ class OC_Util {
 			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
 		}
 
-		// Check if apps folder is writable.
-		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
-			$errors[]=array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
+		// Check if there is a writable install folder.
+		if(OC_Config::getValue('appstoreenabled', true)) {
+			if( OC_App::getInstallPath() === null  || !is_writable(OC_App::getInstallPath())) {
+				$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
+			}
 		}
 
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );

From ad7154b344c29e597f366e0d448cc3d1659861b4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 21 Jun 2012 22:02:17 +0200
Subject: [PATCH 0558/1537] Fix being able to link directly to contact, that I
 broke in other commit.

---
 apps/contacts/js/contacts.js              | 10 ++++++----
 apps/contacts/templates/index.php         |  1 +
 apps/contacts/templates/part.contacts.php |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 8ab2a3fbb8..bd8535b4f6 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -256,12 +256,14 @@ Contacts={
 					}
 				} else {
 					newid = id;
+					bookid = bookid?bookid:$('#contacts li[data-id="'+newid+'"]').data('bookid');
 				}
 				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
-						firstitem.addClass('active');
+						$('#contacts li[data-id="'+newid+'"]').addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
+								$('#contacts h3[data-id="'+bookid+'"]').trigger('click');
 								Contacts.UI.Card.loadContact(jsondata.data, bookid);
 							} else {
 								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -1503,7 +1505,7 @@ Contacts={
 		},
 		Contacts:{
 			// Reload the contacts list.
-			update:function(){
+			update:function(id){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts').html(jsondata.data.page).ready(function() {
@@ -1518,7 +1520,7 @@ Contacts={
 								})}, 100);
 							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
 						});
-						Contacts.UI.Card.update();
+						Contacts.UI.Card.update(id);
 					}
 					else{
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -1707,5 +1709,5 @@ $(document).ready(function(){
 	$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 
 	Contacts.UI.loadHandlers();
-	Contacts.UI.Contacts.update();
+	Contacts.UI.Contacts.update(id);
 });
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index d16356d4a5..1790ad4e30 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,6 +1,7 @@
 <script type='text/javascript'>
 	var totalurl = '<?php echo OCP\Util::linkToRemote('carddav'); ?>addressbooks';
 	var categories = <?php echo json_encode($_['categories']); ?>;
+	var id = <?php echo $_['id']; ?>;
 	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
 </script>
 <div id="leftcontent">
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index f0b14c8e5f..c33c5832e8 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -3,7 +3,7 @@ foreach($_['books'] as $id => $addressbook) {
 	echo '<h3 class="addressbook" data-id="'.$id.'">'.$addressbook['displayname'].'</h3>';
 	echo '<ul class="contacts hidden" data-id="'.$id.'">';
 	foreach($addressbook['contacts'] as $contact) {
-		echo '<li role="button" data-bookid="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="index.php?id='.$contact['id'].'" style="background: url('.link_to('contacts','thumbnail.php').'?id='.$contact['id'].') no-repeat scroll 0 0 transparent;">'.$contact['displayname'].'</a></li>';
+		echo '<li role="button" data-bookid="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="'.link_to('contacts','index.php').'&id='.$contact['id'].'" style="background: url('.link_to('contacts','thumbnail.php').'?id='.$contact['id'].') no-repeat scroll 0 0 transparent;">'.$contact['displayname'].'</a></li>';
 	}
 	echo '</ul>';
 }

From 37d12144c2debd27271378d2adc5c2b65a25e1f7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 21 Jun 2012 22:03:57 +0200
Subject: [PATCH 0559/1537] Fix URL delimiter.

---
 apps/contacts/lib/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 19330fa9be..5a5632a152 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -11,7 +11,7 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
 			$vcards = OC_Contacts_VCard::all($addressbook['id']);
 			foreach($vcards as $vcard){
 				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0){
-					$link = OCP\Util::linkTo('contacts', 'index.php').'?id='.urlencode($vcard['id']);
+					$link = OCP\Util::linkTo('contacts', 'index.php').'&id='.urlencode($vcard['id']);
 					$results[]=new OC_Search_Result($vcard['fullname'],'', $link,$l->t('Contact'));//$name,$text,$link,$type
 				}
 			}

From bf6abdde2df060af7657f5328fdc638a561d21aa Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 21 Jun 2012 12:25:45 -0400
Subject: [PATCH 0560/1537] Add missing ')'

---
 apps/files_sharing/get.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 1ab8c6a257..40a90a1530 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -77,7 +77,7 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
 		header("Content-Length: " . OC_Filesystem::filesize($source));
 		//download the file
 		@ob_clean();
-		OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token);
+		OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token));
 		OC_Filesystem::readfile($source);
 	}
 } else {

From 95b52028936459800eee8db05bc24c813ccc7c67 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 21 Jun 2012 21:13:12 +0000
Subject: [PATCH 0561/1537] Correct usage of approot

---
 apps/gallery/appinfo/update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
index a0997ab5e8..c1d2212742 100644
--- a/apps/gallery/appinfo/update.php
+++ b/apps/gallery/appinfo/update.php
@@ -7,5 +7,5 @@ if (version_compare($currentVersion, '0.5.0', '<')) {
 	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_albums');
 	$stmt->execute();
 
-	\OC_DB::createDbFromStructure(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml');
+	\OC_DB::createDbFromStructure(OC_App::getAppPath($appid).'/appinfo/database.xml');
 }

From f46623da6cff1019ccce2adc61ea293e49a6fb34 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 21 Jun 2012 21:29:18 +0000
Subject: [PATCH 0562/1537] Do not search apps if oc is not yet installed

---
 lib/app.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index 1a2dc370d6..071ac83b4f 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -143,6 +143,8 @@ class OC_App{
 	 * get all enabled apps
 	 */
 	public static function getEnabledApps(){
+		if(!OC_Config::getValue('installed', false))
+			return array();
 		$apps=array('files');
 		$query = OC_DB::prepare( 'SELECT appid FROM *PREFIX*appconfig WHERE configkey = \'enabled\' AND configvalue=\'yes\'' );
 		$result=$query->execute();

From c047fdafdb64503ef10db2ac1cc2d1d9120a1244 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 23:20:09 +0200
Subject: [PATCH 0563/1537] Calendar: Fix missing template parameter 'shared'
 for new and update calendar

---
 apps/calendar/ajax/calendar/new.php    | 8 +++++++-
 apps/calendar/ajax/calendar/update.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
index 278c8e5520..e77d4ebff0 100644
--- a/apps/calendar/ajax/calendar/new.php
+++ b/apps/calendar/ajax/calendar/new.php
@@ -31,7 +31,13 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
 $calendar = OC_Calendar_Calendar::find($calendarid);
 $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
+if(OC_Calendar_Share::allUsersSharedwith($calendarid, OC_Calendar_Share::CALENDAR) == array()){
+	$shared = false;
+}else{
+	$shared = true;
+}
+$tmpl->assign('shared', $shared);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
\ No newline at end of file
+));
diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
index 5cf63d396f..a2c898c807 100644
--- a/apps/calendar/ajax/calendar/update.php
+++ b/apps/calendar/ajax/calendar/update.php
@@ -36,7 +36,13 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 $calendar = OC_Calendar_App::getCalendar($calendarid);
 $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
+if(OC_Calendar_Share::allUsersSharedwith($calendarid, OC_Calendar_Share::CALENDAR) == array()){
+	$shared = false;
+}else{
+	$shared = true;
+}
+$tmpl->assign('shared', $shared);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
\ No newline at end of file
+));

From 1d07b9e29186f51220486ff2ea6a3b70175f16e0 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 23:21:15 +0200
Subject: [PATCH 0564/1537] Calendar: Missing userid in allCalendars call

---
 apps/calendar/lib/calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index b725898858..1bfab5cd64 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -206,7 +206,7 @@ class OC_Calendar_Calendar{
 		$stmt->execute(array($id));
 
 		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', $id);
-		if(count(self::allCalendars()) == 0) {
+		if(count(self::allCalendars(OCP\USER::getUser())) == 0) {
 			self::addCalendar(OCP\USER::getUser(),'Default calendar');
 		}
 

From 4a22f4ca78a22d720c8e61233d7c6541f82f1c2b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 23:26:51 +0200
Subject: [PATCH 0565/1537] Calendar: convert choosecalendar.rowfields template
 from plain php to html+php

---
 .../part.choosecalendar.rowfields.php         | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index 965523f847..40c906b696 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -1,8 +1,21 @@
-<?php
-echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td  id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . $_['calendar']['displayname'] . '</label></td>';
-echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img  class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>';
-echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
-echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>';
-echo '<td width="20px"><a  href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/rename.svg').'"></a></td>';
-echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img  class="svg action" src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></td>';
+<td width="20px">
+  <input type="checkbox" id="active_<?php echo $_['calendar']['id'] ?>" onclick="Calendar.UI.Calendar.activation(this,<?php echo $_['calendar']['id'] ?>)"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
+</td>
+<td id="<?php echo OCP\USER::getUser() ?>_<?php echo $_['calendar']['id'] ?>">
+  <label for="active_<?php echo $_['calendar']['id'] ?>"><?php echo $_['calendar']['displayname'] ?></label>
+</td>
+<td width="20px">
+  <a href="#" onclick="Calendar.UI.Share.dropdown('<?php echo OCP\USER::getUser() ?>', <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Share Calendar') ?>" class="action"><img class="svg action" src="<?php echo (!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg') ?>"></a>
+</td>
+<td width="20px">
+  <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo $_['calendar']['uri'] ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>
+</td>
+<td width="20px">
+  <a href="?app=calendar&amp;getfile=export.php?calid=<?php echo $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
+</td>
+<td width="20px">
+  <a href="#" onclick="Calendar.UI.Calendar.edit(this, <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Edit') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>"></a>
+</td>
+<td width="20px">
+  <a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(<?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Delete') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>"></a>
+</td>

From fd23c286ef9bf3851aefbc62c30cfc1659768847 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 23:27:45 +0200
Subject: [PATCH 0566/1537] Calendar: Fix caldav url encoding

---
 apps/calendar/js/calendar.js                              | 3 +--
 apps/calendar/templates/part.choosecalendar.rowfields.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 3b1be59381..f8ab2fe4bd 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -207,8 +207,7 @@ Calendar={
 			}
 		},
 		showCalDAVUrl:function(username, calname){
-			$('#caldav_url').val(totalurl + '/' + username + '/' + calname);
-			$('#caldav_url').val(encodeURI($('#caldav_url').val()));
+			$('#caldav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(calname));
 			$('#caldav_url').show();
 			$("#caldav_url_close").show();
 		},
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index 40c906b696..4492ce731c 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -8,7 +8,7 @@
   <a href="#" onclick="Calendar.UI.Share.dropdown('<?php echo OCP\USER::getUser() ?>', <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Share Calendar') ?>" class="action"><img class="svg action" src="<?php echo (!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg') ?>"></a>
 </td>
 <td width="20px">
-  <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo $_['calendar']['uri'] ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>
+  <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo rawurlencode(html_entity_decode($_['calendar']['uri'], ENT_QUOTES, 'UTF-8')) ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>
 </td>
 <td width="20px">
   <a href="?app=calendar&amp;getfile=export.php?calid=<?php echo $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>

From 82f39d329214b2f6ac73b864b968bc1e9febebdf Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 23:29:05 +0200
Subject: [PATCH 0567/1537] Contacts: Fix name and carddav-url encoding

---
 apps/contacts/js/contacts.js                                 | 2 +-
 apps/contacts/templates/part.chooseaddressbook.rowfields.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index bd8535b4f6..6f5602c211 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -77,7 +77,7 @@ Contacts={
 			}
 		},
 		showCardDAVUrl:function(username, bookname){
-			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+			$('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
 			$('#carddav_url').show();
 			$('#carddav_url_close').show();
 		},
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 780920ea3c..2988bb44c5 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -2,10 +2,10 @@
 	<input id="active_<?php echo $_['addressbook']["id"]; ?>" type="checkbox" onClick="Contacts.UI.Addressbooks.activation(this, <?php echo $_['addressbook']["id"]; ?>)" <?php echo (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : ''); ?>>
 </td>
 <td>
-	<label for="active_<?php echo $_['addressbook']["id"]; ?>"><?php echo htmlspecialchars($_['addressbook']["displayname"]); ?></label>
+	<label for="active_<?php echo $_['addressbook']["id"]; ?>"><?php echo $_['addressbook']["displayname"]; ?></label>
 </td>
 <td width="20px">
-	<a onclick="Contacts.UI.showCardDAVUrl('<?php echo OCP\USER::getUser(); ?>', '<?php echo rawurlencode($_['addressbook']["uri"]); ?>');" title="<?php echo $l->t("CardDav Link"); ?>" class="svg action globe"></a>
+	<a onclick="Contacts.UI.showCardDAVUrl('<?php echo OCP\USER::getUser(); ?>', '<?php echo rawurlencode(html_entity_decode($_['addressbook']['uri'], ENT_QUOTES, 'UTF-8')); ?>');" title="<?php echo $l->t("CardDav Link"); ?>" class="svg action globe"></a>
 </td>
 <td width="20px">
 	<a href="<?php echo OCP\Util::linkTo('contacts', 'export.php'); ?>?bookid=<?php echo $_['addressbook']["id"]; ?>" title="<?php echo $l->t("Download"); ?>" class="svg action download"></a>

From fcaf04cad96aa8fe2937ec9def60e77c7f4bb795 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 21 Jun 2012 22:00:48 +0000
Subject: [PATCH 0568/1537] Add little more doc about app folders

---
 config/config.sample.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index c7c811345b..c4cb719796 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -96,6 +96,7 @@ $CONFIG = array(
 /* Set an array of path for your apps directories
  key 'path' is for the fs path an the key 'url' is for the http path to your
  applications paths. 'writable' indicate if the user can install apps in this folder.
+ You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false
 */
 	array(
 		'path'=> '/var/www/owncloud/apps',

From b5953e7a83d2dc8f1483c7809414dca7a1cde990 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 21 Jun 2012 22:22:36 +0000
Subject: [PATCH 0569/1537] Provide solution for smoother migration for apps to
 multi-app dir

---
 lib/base.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 2f16f7dab4..22dd86535a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -71,7 +71,11 @@ class OC{
 	 */
 	public static function autoload($className){
 		if(array_key_exists($className,OC::$CLASSPATH)){
-			require_once OC::$CLASSPATH[$className];
+			/** @TODO: Remove this when necessary
+			 Remove "apps/" from inclusion path for smooth migration to mutli app dir
+			*/
+			$path = preg_replace('/apps\//','', OC::$CLASSPATH[$className]);
+			require_once $path;
 		}
 		elseif(strpos($className,'OC_')===0){
 			require_once strtolower(str_replace('_','/',substr($className,3)) . '.php');

From ba2d203a543bdbf1c029b48485a59cb5e898d630 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 22 Jun 2012 09:56:54 +0200
Subject: [PATCH 0570/1537] some path fixes for multi-dir app

---
 lib/app.php            | 2 +-
 lib/templatelayout.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 071ac83b4f..486704a222 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -370,7 +370,7 @@ class OC_App{
 	*/
 	public static function getAppWebPath($appid) {
 		if( ($dir = self::findAppInDirectories($appid)) != false) {
-			return $dir['url'].'/'.$appid;
+			return OC::$WEBROOT.$dir['url'].'/'.$appid;
 		}
 	}
 
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 6e1d435f67..d33a87e9e4 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -181,8 +181,8 @@ class OC_TemplateLayout extends OC_Template {
 				// Is it part of an app?
 				$append = false;
 				foreach( OC::$APPSROOTS as $apps_dir) {
-					if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$script$fext.js")) { $append =true; break; }
-					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$script.js")) { $append =true; break; }
+					if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { $append =true; break; }
+					elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { $append =true; break; }
 				}
 				if(! $append) {
 					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

From 8c28aec664612c4deab7eb79acfe293a77839417 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 11:30:40 +0200
Subject: [PATCH 0571/1537] date don't change correctly in the view list (bug
 #973) fixed

---
 apps/calendar/js/calendar.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index f8ab2fe4bd..e17f88e38b 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -705,10 +705,12 @@ function ListView(element, calendar) {
 		if (delta) {
 			if (delta < 0){
 				addDays(t.start, -7);
+				addDays(t.end, -7);
 				if (!opt('weekends')) {
 					skipWeekend(t.start, delta < 0 ? -1 : 1);
 				}
 			}else{
+				addDays(t.start, 7);
 				addDays(t.end, 7);
 				if (!opt('weekends')) {
 					skipWeekend(t.end, delta < 0 ? -1 : 1);

From df60d6d5d2e905d3df9095d244e756fd60fd8c01 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 12:24:10 +0200
Subject: [PATCH 0572/1537] Fixes for multi app dir :

Url should be given as relative path (to webroot)
Correct link construction from js
---
 core/js/js.js | 3 +--
 lib/base.php  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index a1ad0c7718..7a53bb75ef 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -64,9 +64,8 @@ OC={
 			}
 		}else if(file.substring(file.length-3) != 'php' && !isCore){
 			link=OC.appswebroots[app];
-			link+='/'+app+'/';
 			if(type){
-				link+=type+'/';
+				link+= '/'+type+'/';
 			}
 			link+=file;
 		}else{
diff --git a/lib/base.php b/lib/base.php
index 22dd86535a..870550f267 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -140,9 +140,9 @@ class OC{
 					OC::$APPSROOTS[] = $paths;	
 			}
 		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
-			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => OC::$WEBROOT.'/apps/', 'writable' => true);
+			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps/', 'writable' => true);
 		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/', 'writable' => true);
+			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps/', 'writable' => true);
 			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}
 

From bef9b671ee6beb36a0f10ac755b32477ef5f77e6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 22 Jun 2012 12:42:07 +0200
Subject: [PATCH 0573/1537] LDAP: cheaper userExists() implementation

---
 apps/user_ldap/user_ldap.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 9281aebe81..48e7d429fc 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -124,7 +124,19 @@ class OC_USER_LDAP extends OC_User_Backend {
 	 * @return boolean
 	 */
 	public function userExists($uid){
-		return in_array($uid, $this->getUsers());
+		//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
+		$dn = OC_LDAP::username2dn($uid);
+		if(!$dn) {
+			return false;
+		}
+
+		//if user really still exists, we will be able to read his cn
+		$cn = OC_LDAP::readAttribute($dn, 'cn');
+		if(!$cn || empty($cn)) {
+			return false;
+		}
+
+		return true;
 	}
 
 }

From 72fe463f7f20ee23521666cdca4141dc584ec722 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 12:44:17 +0200
Subject: [PATCH 0574/1537] Correct OC_Config writer. Use var_export (has
 support for array,...)

---
 lib/config.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/lib/config.php b/lib/config.php
index 9279549b1b..65f9fdc06b 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -152,23 +152,12 @@ class OC_Config{
 	 *
 	 * Saves the config to the config file.
 	 *
-	 * Known flaws: Strings are not escaped properly
 	 */
 	public static function writeData(){
 		// Create a php file ...
-		$content = "<?php\n\$CONFIG = array(\n";
-
-		foreach( self::$cache as $key => $value ){
-			if( is_bool( $value )){
-				$value = $value ? 'true' : 'false';
-				$content .= "\"$key\" => $value,\n";
-			}
-			else{
-				$value = str_replace( "'", "\\'", $value );
-				$content .= "\"$key\" => '$value',\n";
-			}
-		}
-		$content .= ");\n?>\n";
+		$content = "<?php\n\$CONFIG = ";
+		$content .= var_export(self::$cache, true);
+		$content .= ";\n?>\n";
 
 		$filename = OC::$SERVERROOT."/config/config.php";
 		// Write the file

From 19931e2008296b4d8fe9717ae78093fb88f1b3e9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 22 Jun 2012 12:49:56 +0200
Subject: [PATCH 0575/1537] remove unnecessary closing PHP tag

---
 apps/user_ldap/user_ldap.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 48e7d429fc..85b3d88973 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -139,6 +139,4 @@ class OC_USER_LDAP extends OC_User_Backend {
 		return true;
 	}
 
-}
-
-?>
+}
\ No newline at end of file

From 8c2803a7c1d2b5d6b1d4bab5d36ebceb19324729 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 13:12:03 +0200
Subject: [PATCH 0576/1537] Correct image path and apps path replacement

---
 .../css/jquery.fancybox-1.3.4.css             | 66 +++++++++----------
 .../css/DroidSansMono/stylesheet.css          | 10 +--
 apps/gallery/css/sharing.css                  |  2 +-
 lib/minimizer/css.php                         |  3 +-
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
index 5fdf7af14c..6e982805a4 100644
--- a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
+++ b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
@@ -35,7 +35,7 @@
 	left: 0;
 	width: 40px;
 	height: 480px;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 }
 
 #fancybox-overlay {
@@ -99,7 +99,7 @@
 	right: -15px;
 	width: 30px;
 	height: 30px;
-	background: transparent url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -40px 0px;
+	background: transparent url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px 0px;
 	cursor: pointer;
 	z-index: 1103;
 	display: none;
@@ -137,7 +137,7 @@
 	width: 35%;
 	cursor: pointer;
 	outline: none;
-	background: transparent url('%appswebroot%/apps/files_imageviewer/img/blank.gif');
+	background: transparent url('%appswebroot%/files_imageviewer/img/blank.gif');
 	z-index: 1102;
 	display: none;
 }
@@ -163,12 +163,12 @@
 }
 
 #fancybox-left-ico {
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 	background-position: -40px -30px;
 }
 
 #fancybox-right-ico {
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 	background-position: -40px -60px;
 }
 
@@ -199,13 +199,13 @@
 	top: -20px;
 	left: 0;
 	width: 100%;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');
 }
 
 #fancybox-bg-ne {
 	top: -20px;
 	right: -20px;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 	background-position: -40px -162px;
 }
 
@@ -213,14 +213,14 @@
 	top: 0;
 	right: -20px;
 	height: 100%;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-y.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');
 	background-position: -20px 0px;
 }
 
 #fancybox-bg-se {
 	bottom: -20px;
 	right: -20px;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 	background-position: -40px -182px; 
 }
 
@@ -228,14 +228,14 @@
 	bottom: -20px;
 	left: 0;
 	width: 100%;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');
 	background-position: 0px -20px;
 }
 
 #fancybox-bg-sw {
 	bottom: -20px;
 	left: -20px;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 	background-position: -40px -142px;
 }
 
@@ -243,13 +243,13 @@
 	top: 0;
 	left: -20px;
 	height: 100%;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-y.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');
 }
 
 #fancybox-bg-nw {
 	top: -20px;
 	left: -20px;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
 	background-position: -40px -122px;
 }
 
@@ -282,7 +282,7 @@
 
 #fancybox-title-over {
 	padding: 10px;
-	background-image: url('%appswebroot%/apps/files_imageviewer/img/fancy_title_over.png');
+	background-image: url('%appswebroot%/files_imageviewer/img/fancy_title_over.png');
 	display: block;
 }
 
@@ -306,7 +306,7 @@
 
 #fancybox-title-float-left {
 	padding: 0 0 0 15px;
-	background: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;
+	background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;
 }
 
 #fancybox-title-float-main {
@@ -314,25 +314,25 @@
 	line-height: 29px;
 	font-weight: bold;
 	padding: 0 0 3px 0;
-	background: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png') 0px -40px;
+	background: url('%appswebroot%/files_imageviewer/img/fancybox-x.png') 0px -40px;
 }
 
 #fancybox-title-float-right {
 	padding: 0 0 0 15px;
-	background: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -55px -90px no-repeat;
+	background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -55px -90px no-repeat;
 }
 
 /* IE6 */
 
-.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_close.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_close.png', sizingMethod='scale'); }
 
-.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_nav_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_nav_right.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_nav_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_nav_right.png', sizingMethod='scale'); }
 
-.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
-.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_main.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_right.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_main.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_right.png', sizingMethod='scale'); }
 
 .fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
 	height: expression(this.parentNode.clientHeight + "px");
@@ -343,17 +343,17 @@
 	top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
 }
 
-#fancybox-loading.fancybox-ie6 div	{ background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_loading.png', sizingMethod='scale'); }
+#fancybox-loading.fancybox-ie6 div	{ background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_loading.png', sizingMethod='scale'); }
 
 /* IE6, IE7, IE8 */
 
 .fancybox-ie .fancybox-bg { background: transparent !important; }
 
-.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_n.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_ne.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_e.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_se.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_s.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_sw.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_w.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_nw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_n.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_ne.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_e.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_se.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_s.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_sw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_w.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_nw.png', sizingMethod='scale'); }
diff --git a/apps/files_texteditor/css/DroidSansMono/stylesheet.css b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
index 5bf9122ed7..4d814b262d 100644
--- a/apps/files_texteditor/css/DroidSansMono/stylesheet.css
+++ b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
@@ -4,11 +4,11 @@
 
 @font-face {
     font-family: 'Droid Sans Mono';
-    src: url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot');
-    src: url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot?#iefix') format('embedded-opentype'),
-         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff') format('woff'),
-         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf') format('truetype'),
-         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg#DroidSansMonoRegular') format('svg');
+    src: url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot');
+    src: url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot?#iefix') format('embedded-opentype'),
+         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff') format('woff'),
+         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf') format('truetype'),
+         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg#DroidSansMonoRegular') format('svg');
     font-weight: normal;
     font-style: normal;
 
diff --git a/apps/gallery/css/sharing.css b/apps/gallery/css/sharing.css
index d061fc3e6c..4712369cc8 100644
--- a/apps/gallery/css/sharing.css
+++ b/apps/gallery/css/sharing.css
@@ -5,4 +5,4 @@ div.gallery_box:hover { color: black; }
 div.gallery_box h1 {font-size: 17px; font-weight: normal;}
 div#breadcrumb { border: 0; width: 70%; margin: 0 auto; padding: 25px 0; font-family: Verdana; text-align: center;}
 span.breadcrumbelement { margin: 10px; margin-right: 0; cursor: pointer;}
-span.inside { background-image: url('%appswebroot%/apps/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;}
+span.inside { background-image: url('%appswebroot%/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;}
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 97099adbdf..bf2a6d1d18 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -17,7 +17,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			$in_root = false;
 			foreach(OC::$APPSROOTS as $app_root) {
 				if(strpos($file, $app_root['path']) == 0) {
-					$in_root = $app_root['url'];
+					$in_root = $webroot.$app_root['url'];
 					break;
 				}
 			}
@@ -33,6 +33,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 		if (!defined('DEBUG') || !DEBUG){
 			$css_out = CSSMin::minify($css_out);
 		}
+// die();
 		return $css_out;
 	}
 }

From 115c30bdb4f4b89b51f2397981a15c8091a6e9c0 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 13:57:54 +0200
Subject: [PATCH 0577/1537] Enhance hint about writable app directory

---
 lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 6cca418a1b..50955ebb87 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -203,7 +203,8 @@ class OC_Util {
 		// Check if there is a writable install folder.
 		if(OC_Config::getValue('appstoreenabled', true)) {
 			if( OC_App::getInstallPath() === null  || !is_writable(OC_App::getInstallPath())) {
-				$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
+				$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory 
+				in owncloud or disabling the appstore in the config file.");
 			}
 		}
 

From 5b46734a401e88c0830b0577682a365e012c5999 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 13:58:15 +0200
Subject: [PATCH 0578/1537] xss vulnerability fixed

---
 apps/gallery/lib/tiles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 2ff4fa5647..2bc8d4fcce 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -141,7 +141,7 @@ class TileStack extends TileBase {
 	}
 
 	public function get() {
-		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
+		$r = '<div class="title gallery_div">'. \OCP\Util::sanitizeHTML($this->stack_name).'</div>';
 		for ($i = 0; $i < count($this->tiles_array); $i++) {
 			$top = rand(-5, 5);
 			$left = rand(-5, 5);

From e1fa9c282bd268efdcb09a63fcfbd0a68ee11a7a Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 14:11:57 +0200
Subject: [PATCH 0579/1537] xss vulnerabilities fixed

---
 apps/gallery/lib/tiles.php       | 2 +-
 apps/gallery/templates/index.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 2bc8d4fcce..011168471f 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -168,7 +168,7 @@ class TileStack extends TileBase {
 	}
 	
 	public function getOnClickAction() {
-		return 'javascript:openNewGal(\''.$this->stack_name.'\');';
+		return 'javascript:openNewGal(\''.\OCP\Util::sanitizeHTML($this->stack_name).'\');';
 	}
 
 	private $tiles_array;
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 1890552fc0..037e53059d 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-var root = "<?php echo $_['root']; ?>";
+var root = "<?php echo OCP\Util::sanitizeHTML($_['root']); ?>";
 
 $(document).ready(function() {
 		$("a[rel=images]").fancybox({

From 07124ee38dfa1b9c51d9efbddd2680497ec633f9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 22 Jun 2012 01:43:59 +0200
Subject: [PATCH 0580/1537] Cast translation to string.

---
 apps/contacts/lib/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 5a5632a152..5d9ca97e76 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -12,7 +12,7 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
 			foreach($vcards as $vcard){
 				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0){
 					$link = OCP\Util::linkTo('contacts', 'index.php').'&id='.urlencode($vcard['id']);
-					$results[]=new OC_Search_Result($vcard['fullname'],'', $link,$l->t('Contact'));//$name,$text,$link,$type
+					$results[]=new OC_Search_Result($vcard['fullname'],'', $link,(string)$l->t('Contact'));//$name,$text,$link,$type
 				}
 			}
 		}

From 1f06cdf81f1a5100008884e67078e868e60ae9a8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 22 Jun 2012 14:27:24 +0200
Subject: [PATCH 0581/1537] Small js fix.

---
 apps/contacts/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 1790ad4e30..0d4219c9f2 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,7 +1,7 @@
 <script type='text/javascript'>
 	var totalurl = '<?php echo OCP\Util::linkToRemote('carddav'); ?>addressbooks';
 	var categories = <?php echo json_encode($_['categories']); ?>;
-	var id = <?php echo $_['id']; ?>;
+	var id = '<?php echo $_['id']; ?>';
 	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
 </script>
 <div id="leftcontent">

From 06e20fe4b8e068f0f114dff2f34b5506b8f1b593 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 15:20:18 +0200
Subject: [PATCH 0582/1537] Correct css inclusion with minimizer

---
 lib/minimizer/css.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index bf2a6d1d18..f8e84482bb 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -16,7 +16,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 
 			$in_root = false;
 			foreach(OC::$APPSROOTS as $app_root) {
-				if(strpos($file, $app_root['path']) == 0) {
+				if(strpos($file, $app_root['path']) === 0) {
 					$in_root = $webroot.$app_root['url'];
 					break;
 				}
@@ -33,7 +33,6 @@ class OC_Minimizer_CSS extends OC_Minimizer
 		if (!defined('DEBUG') || !DEBUG){
 			$css_out = CSSMin::minify($css_out);
 		}
-// die();
 		return $css_out;
 	}
 }

From 2d2366bb57ea677223d79e3e60d62fcd6c184471 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 16:06:46 +0200
Subject: [PATCH 0583/1537] Avoid fetch ocs info if the appstore is disabled

---
 lib/ocsclient.php | 49 ++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 2888569ad1..951d761d7e 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -57,6 +57,9 @@ class OC_OCSClient{
 	 * This function returns a list of all the application categories on the OCS server
 	 */
 	public static function getCategories(){
+		if(OC_Config::getValue('appstoreenabled', true)==false){
+			return NULL;
+		}
 		$url=OC_OCSClient::getAppStoreURL().'/content/categories';
 	
 		$xml=@file_get_contents($url);
@@ -130,6 +133,9 @@ class OC_OCSClient{
 	 * This function returns an  applications from the OCS server
 	 */
 	public static function getApplication($id){
+		if(OC_Config::getValue('appstoreenabled', true)==false){
+			return NULL;
+		}
 		$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
 
 		$xml=@file_get_contents($url);
@@ -157,31 +163,34 @@ class OC_OCSClient{
 		return $app;
 	}
 
-        /**
-         * @brief Get the download url for an application from the OCS server
-         * @returns array with application data
-         *
-         * This function returns an download url for an applications from the OCS server
-         */
-        public static function getApplicationDownload($id,$item){
-                $url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
+	/**
+		* @brief Get the download url for an application from the OCS server
+		* @returns array with application data
+		*
+		* This function returns an download url for an applications from the OCS server
+		*/
+	public static function getApplicationDownload($id,$item){
+		if(OC_Config::getValue('appstoreenabled', true)==false){
+			return NULL;
+		}
+		$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
 
-                $xml=@file_get_contents($url);
-                if($xml==FALSE){
-                        OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
-                        return NULL;
-                }
-                $data=simplexml_load_string($xml);
+		$xml=@file_get_contents($url);
+		if($xml==FALSE){
+			OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
+			return NULL;
+		}
+		$data=simplexml_load_string($xml);
 
-                $tmp=$data->data->content;
-                $app=array();
-                if(isset($tmp->downloadlink)) { 
-	 		$app['downloadlink']=$tmp->downloadlink;
+		$tmp=$data->data->content;
+		$app=array();
+		if(isset($tmp->downloadlink)) { 
+			$app['downloadlink']=$tmp->downloadlink;
 		}else{
 	 		$app['downloadlink']='';
 		}
-                return $app;
-        }
+		return $app;
+	}
 
 
 	/**

From aade44471d3a603f90cb7750d829fff5efc9cad4 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 22 Jun 2012 16:10:06 +0200
Subject: [PATCH 0584/1537] pdf viewer no longer 'eats' keyboard input

---
 apps/files_pdfviewer/js/pdfjs/viewer.js | 66 -------------------------
 1 file changed, 66 deletions(-)

diff --git a/apps/files_pdfviewer/js/pdfjs/viewer.js b/apps/files_pdfviewer/js/pdfjs/viewer.js
index 8a568e6a74..f49257d792 100644
--- a/apps/files_pdfviewer/js/pdfjs/viewer.js
+++ b/apps/files_pdfviewer/js/pdfjs/viewer.js
@@ -1871,70 +1871,4 @@ window.addEventListener('DOMMouseScroll', function(evt) {
   }
 }, false);
 
-window.addEventListener('keydown', function keydown(evt) {
-  var handled = false;
-  var cmd = (evt.ctrlKey ? 1 : 0) |
-            (evt.altKey ? 2 : 0) |
-            (evt.shiftKey ? 4 : 0) |
-            (evt.metaKey ? 8 : 0);
 
-  // First, handle the key bindings that are independent whether an input
-  // control is selected or not.
-  if (cmd == 1 || cmd == 8) { // either CTRL or META key.
-    switch (evt.keyCode) {
-      case 61: // FF/Mac '='
-      case 107: // FF '+' and '='
-      case 187: // Chrome '+'
-        PDFView.zoomIn();
-        handled = true;
-        break;
-      case 109: // FF '-'
-      case 189: // Chrome '-'
-        PDFView.zoomOut();
-        handled = true;
-        break;
-      case 48: // '0'
-        PDFView.parseScale(kDefaultScale, true);
-        handled = true;
-        break;
-    }
-  }
-
-  if (handled) {
-    evt.preventDefault();
-    return;
-  }
-
-  // Some shortcuts should not get handled if a control/input element
-  // is selected.
-  var curElement = document.activeElement;
-  if (curElement && curElement.tagName == 'INPUT')
-    return;
-  var controlsElement = document.getElementById('controls');
-  while (curElement) {
-    if (curElement === controlsElement)
-      return; // ignoring if the 'controls' element is focused
-    curElement = curElement.parentNode;
-  }
-
-  if (cmd == 0) { // no control key pressed at all.
-    switch (evt.keyCode) {
-      case 37: // left arrow
-      case 75: // 'k'
-      case 80: // 'p'
-        PDFView.page--;
-        handled = true;
-        break;
-      case 39: // right arrow
-      case 74: // 'j'
-      case 78: // 'n'
-        PDFView.page++;
-        handled = true;
-        break;
-    }
-  }
-
-  if (handled) {
-    evt.preventDefault();
-  }
-});

From 036530b2fd0477f592d816acff5e689edf712ff4 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 17:00:56 +0200
Subject: [PATCH 0585/1537] log messages are looking nicer if html code gets
 interpreted. (xss prevention happens on another place)

---
 settings/js/log.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/log.js b/settings/js/log.js
index 6063c7d9a9..fe2e92f7a8 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -39,7 +39,7 @@ OC.Log={
 			row.append(appTd);
 			
 			var messageTd=$('<td/>');
-			messageTd.text(entry.message);
+			messageTd.html(entry.message);
 			row.append(messageTd);
 			
 			var timeTd=$('<td/>');

From 0aafc717ec676cbedb21443fc05cd5b0496b8b42 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 22 Jun 2012 15:00:54 +0000
Subject: [PATCH 0586/1537] Text Editor: fix editor positioning

---
 apps/files_texteditor/css/style.css | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index d91a91d18d..82c57b88bb 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -1,16 +1,8 @@
 #editor{
 	position: fixed;
 	display: block;
-	top: 6.5em;
-	left: 12.5em;
-}
-#editorwrapper{
-	position: absolute;
-	height: 0;
-	width: 0;
-	top: 41px;
-	left: 160px;
-	display: none;
+	top: 6.8em;
+	left: 13.5em;
 }
 #editor_save{
 	margin-left: 7px;

From 432aa58bab91092f6a2bd2065b5fbbcfe3421523 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 08:17:35 +0200
Subject: [PATCH 0587/1537] Spelling fixes

---
 lib/util.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 50955ebb87..0d9f412944 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -426,10 +426,11 @@ class OC_Util {
 	/**
 	 * @brief Public function to sanitize HTML
 	 *
-	 * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page.
+	 * This function is used to sanitize HTML and should be applied on any
+	 * string or array of strings before displaying it on a web page.
 	 * 
 	 * @param string or array of strings
-	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+	 * @return array with sanitized strings or a single sanitized string, depends on the input parameter.
 	 */
 	public static function sanitizeHTML( &$value ){
 		if (is_array($value) || is_object($value)) array_walk_recursive($value,'OC_Util::sanitizeHTML');
@@ -439,7 +440,7 @@ class OC_Util {
 
 
         /**
-         * Check if the htaccess file is working buy creating a test file in the data directory and trying to access via http
+         * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
          */
         public static function ishtaccessworking() {
 

From 50667dcb82d8a31541ee13fe71c8da4074099ea8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 08:43:58 +0200
Subject: [PATCH 0588/1537] Convert OC_L10N_String to a string in
 OC_JSON::encodedPrint

---
 lib/json.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/json.php b/lib/json.php
index dfc0a7b894..4eab4fce9f 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -81,6 +81,15 @@ class OC_JSON{
 		self::encodedPrint($data);
 	}
 
+	/**
+	 * Convert OC_L10N_String to string, for use in json encodings
+	 */
+	protected static function to_string(&$value){
+		if ($value instanceof OC_L10N_String) {
+			$value = (string)$value;
+		}
+	}
+
 	/**
 	* Encode and print $data in json format
 	*/
@@ -89,6 +98,7 @@ class OC_JSON{
 			if($setContentType){
 				self::setContentTypeHeader();
 			}
+			array_walk_recursive($data, array('OC_JSON', 'to_string'));
 			echo json_encode($data);
 		}
 	}

From 96ec7a66bb64e1e2ffa9b87e9473dceb9f45516c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 19:41:08 +0200
Subject: [PATCH 0589/1537] More session_write_close

---
 apps/contacts/thumbnail.php      | 1 +
 apps/gallery/ajax/thumbnail.php  | 1 +
 apps/gallery/templates/index.php | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index da4e930f3e..8378507163 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -23,6 +23,7 @@
 OCP\JSON::checkLoggedIn();
 //OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
+session_close_write();
 
 function getStandardImage(){
 	//OCP\Response::setExpiresHeader('P10D');
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index 4fc9eba992..5bf1d420dc 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -23,6 +23,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('gallery');
+session_write_close();
 require_once('apps/gallery/lib/managers.php');
 
 
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 037e53059d..c3b4a17854 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -26,6 +26,7 @@ $(document).ready(function() {
 </div>
 <div id="gallerycontent">
 <?php
+session_write_close();
 
 echo $_['tl']->get();
 

From f655981baf1086243d208f8aa3da8d6e26e32d48 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 17:16:34 +0200
Subject: [PATCH 0590/1537] Fix initialization of OC_Filesystem setup from DAV

---
 lib/connector/sabre/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 1c7a84f0f2..ee68039162 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -33,7 +33,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	protected function validateUserPass($username, $password){
 		OC_Util::setUpFS();//login hooks may need early access to the filesystem
 		if(OC_User::login($username,$password)){
-			OC_Util::setUpFS();
+			OC_Util::setUpFS($username);
 			return true;
 		}
 		else{

From ebfc5b2762053960048b4f6a63ddc33482059edd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 17:17:55 +0200
Subject: [PATCH 0591/1537] Add compatability function for APC cache

---
 lib/cache/apc.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/cache/apc.php b/lib/cache/apc.php
index f814afbe49..b1ce87f526 100644
--- a/lib/cache/apc.php
+++ b/lib/cache/apc.php
@@ -44,3 +44,11 @@ class OC_Cache_APC {
 		}
 	}
 }
+if(!function_exists('apc_exists')) {
+	function apc_exists($keys)
+	{
+		$result;
+		apc_fetch($keys, $result);
+		return $result;
+	}
+}

From b650f4669829064805fdeb5fb85ae0de88e35966 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 22 Jun 2012 12:08:46 -0400
Subject: [PATCH 0592/1537] Fix variable checks for mounting Google Drive

---
 apps/files_external/js/google.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 0d65cfda01..84c74c5742 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
 				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
 					params[key] = value;
 				});
-				if (params['oauth_token'].length > 1 && decodeURIComponent(params['oauth_token']) == $(token).val() && params['oauth_verifier'].length > 1) {
+				if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
 					var tr = $(this);
 					$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
 						if (result && result.status == 'success') {

From 618a3c1d94980ab6de8eadc0a491cd324cea2285 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 22 Jun 2012 12:22:19 -0400
Subject: [PATCH 0593/1537] Fix removing personal mounts

---
 apps/files_external/lib/config.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 870c13b5ae..5b9e00a378 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -157,12 +157,17 @@ class OC_Mount_Config {
 	*/
 	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
 		// Verify that the mount point applies for the current user
-		if ($isPersonal && $applicable != OCP\User::getUser()) {
-			return false;
+		if ($isPersonal) {
+			if ($applicable != OCP\User::getUser()) {
+				return false;
+			}
+			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
+		} else {
+			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
 		}
 		$mountPoints = self::readData($isPersonal);
 		// Remove mount point
-		unset($mountPoints[$mountType][$applicable]['/$user/files/'.$mountPoint]);
+		unset($mountPoints[$mountType][$applicable][$mountPoint]);
 		// Unset parent arrays if empty
 		if (empty($mountPoints[$mountType][$applicable])) {
 			unset($mountPoints[$mountType][$applicable]);

From f4b937c6fe325b1ad8bceb7ceba69a9a8a068bcd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 17:43:57 +0200
Subject: [PATCH 0594/1537] Simplify search result js code

---
 search/js/result.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/search/js/result.js b/search/js/result.js
index 1087f9684b..27a2383e2c 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -41,23 +41,13 @@ OC.search.showResults=function(results){
 		for(var name in types){
 			var type=types[name];
 			if(type.length>0){
-				var row=$('#searchresults tr.template').clone();
-				row.removeClass('template');
-				row.addClass('result');
-				row.children('td.type').text(name);
-				row.find('td.result a').attr('href',type[0].link);
-				row.find('td.result div.name').text(type[0].name);
-				row.find('td.result div.text').text(type[0].text);
-				row.data('index',index);
-				index++;
-				if(OC.search.customResults[name]){//give plugins the ability to customize the entries in here
-					OC.search.customResults[name](row,type[0]);
-				}
-				$('#searchresults tbody').append(row);
-				for(var i=1;i<type.length;i++){
+				for(var i=0;i<type.length;i++){
 					var row=$('#searchresults tr.template').clone();
 					row.removeClass('template');
 					row.addClass('result');
+					if (index == 0){
+						row.children('td.type').text(name);
+					}
 					row.find('td.result a').attr('href',type[i].link);
 					row.find('td.result div.name').text(type[i].name);
 					row.find('td.result div.text').text(type[i].text);

From 2e6e1544757c3ef9e12314bfc99b2f09e7b397d9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 22:46:09 +0200
Subject: [PATCH 0595/1537] Gallery: Fix opening folders with a ' in the name

---
 apps/gallery/js/pictures.js | 2 +-
 apps/gallery/lib/tiles.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js
index 3a79788968..91fbf5be96 100644
--- a/apps/gallery/js/pictures.js
+++ b/apps/gallery/js/pictures.js
@@ -60,7 +60,7 @@ function deplode(element) {
 }
 
 function openNewGal(album_name) {
-	root = root + album_name + "/";
+	root = root + decodeURIComponent(album_name) + "/";
 	var url = window.location.toString().replace(window.location.search, '');
 	url = url + "?app=gallery&root="+encodeURIComponent(root);
 
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 011168471f..5efe0d7a29 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -168,7 +168,7 @@ class TileStack extends TileBase {
 	}
 	
 	public function getOnClickAction() {
-		return 'javascript:openNewGal(\''.\OCP\Util::sanitizeHTML($this->stack_name).'\');';
+		return 'javascript:openNewGal(\''.rawurlencode($this->stack_name).'\');';
 	}
 
 	private $tiles_array;

From ded9ea5ad3fd46516ca9ea7849dbdfbe753a1dc5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 22:57:35 +0200
Subject: [PATCH 0596/1537] Spelling fixes

---
 apps/user_ldap/lib_ldap.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index a03ca0d4cf..c88b18b10d 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -472,14 +472,13 @@ class OC_LDAP {
 			$attr = array(strtolower($attr));
 		}
 
-		// See if we have a resource, that way we can get rid of the
-		// error-supressing.
+		// See if we have a resource
 		$link_resource = self::getConnectionResource();
 		if($link_resource)
 		{
 			$sr = ldap_search($link_resource, $base, $filter, $attr);
 			$findings = ldap_get_entries($link_resource, $sr );
-			// if we're here, probably no connection ressource is returned.
+			// if we're here, probably no connection resource is returned.
 			// to make ownCloud behave nicely, we simply give back an empty array.
 			if(is_null($findings)) {
 				return array();

From b5e3e150eb9737022d0c9080e84bac4d290c96a7 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 20:58:28 +0000
Subject: [PATCH 0597/1537] Correction of path looking for apps and css

---
 apps/contacts/css/jquery.Jcrop.css | 2 +-
 lib/db.php                         | 2 +-
 lib/migrate.php                    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
index c9b24a5ebe..a9ba4746e0 100644
--- a/apps/contacts/css/jquery.Jcrop.css
+++ b/apps/contacts/css/jquery.Jcrop.css
@@ -14,7 +14,7 @@
 }
 
 .jcrop-vline, .jcrop-hline {
-	background: white url('%webroot%/apps/contacts/img/Jcrop.gif') top left repeat;
+	background: white url('%appswebroot%/contacts/img/Jcrop.gif') top left repeat;
 	font-size: 0px;
 	position: absolute;
 }
diff --git a/lib/db.php b/lib/db.php
index bcc8657b4a..dc9e3392d0 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -526,7 +526,7 @@ class OC_DB {
 	 	self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
 	 	
 	 	foreach($apps as $app){
-	 		$path = OC::$SERVERROOT.'/apps/'.$app.'/appinfo/database.xml';
+	 		$path = self::getAppPath($app).'/appinfo/database.xml';
 	 		if(file_exists($path)){
 	 			self::removeDBStructure( $path );	
 	 		}
diff --git a/lib/migrate.php b/lib/migrate.php
index 5939ba32e5..f26b4b2567 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -64,7 +64,7 @@ class OC_Migrate{
 		$apps = OC_App::getAllApps();
 
 		foreach($apps as $app){
-			$path = OC::$SERVERROOT . '/apps/' . $app . '/appinfo/migrate.php';
+			$path = self::getAppPath($app) . '/appinfo/migrate.php';
 			if( file_exists( $path ) ){
 				include( $path );
 			}
@@ -398,7 +398,7 @@ class OC_Migrate{
 			if( OC_App::isEnabled( $provider->getID() ) ){
 				$success = true;
 				// Does this app use the database?
-				if( file_exists( OC::$SERVERROOT.'/apps/'.$provider->getID().'/appinfo/database.xml' ) ){
+				if( file_exists( self::getAppPath($provider->getID()).'/appinfo/database.xml' ) ){
 					// Create some app tables
 					$tables = self::createAppTables( $provider->getID() );
 					if( is_array( $tables ) ){
@@ -539,7 +539,7 @@ class OC_Migrate{
 		}
 
 		// There is a database.xml file
-		$content = file_get_contents( OC::$SERVERROOT . '/apps/' . $appid . '/appinfo/database.xml' );
+		$content = file_get_contents(self::getAppPath($appid) . '/appinfo/database.xml' );
 
 		$file2 = 'static://db_scheme';
 		// TODO get the relative path to migration.db from the data dir
@@ -608,7 +608,7 @@ class OC_Migrate{
 	static public function getApps(){
 		$allapps = OC_App::getAllApps();
 		foreach($allapps as $app){
-			$path = OC::$SERVERROOT . '/apps/' . $app . '/lib/migrate.php';
+			$path = self::getAppPath($app) . '/lib/migrate.php';
 			if( file_exists( $path ) ){
 				$supportsmigration[] = $app;
 			}

From 33165e3915dc5d8f09583d70fca0441e17db905f Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 21:01:12 +0000
Subject: [PATCH 0598/1537] Do not close php tag on config file

---
 lib/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config.php b/lib/config.php
index 65f9fdc06b..266d559126 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -157,7 +157,7 @@ class OC_Config{
 		// Create a php file ...
 		$content = "<?php\n\$CONFIG = ";
 		$content .= var_export(self::$cache, true);
-		$content .= ";\n?>\n";
+		$content .= ";\n";
 
 		$filename = OC::$SERVERROOT."/config/config.php";
 		// Write the file

From d39d7fb9ff7d071b8981e6c8caf74fffb9eb0218 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 22:05:39 +0000
Subject: [PATCH 0599/1537] Remove references to /apps/ and correct inclusion
 of settings

---
 apps/files_versions/appinfo/app.php |  4 ++--
 apps/gallery/appinfo/app.php        | 16 ++++++++--------
 apps/gallery/index.php              |  2 +-
 apps/media/appinfo/app.php          |  6 +++---
 lib/app.php                         |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index ef2f54dd3f..bd06dc0ced 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('apps/files_versions/versions.php');
+require_once('files_versions/versions.php');
 
 OCP\App::registerAdmin('files_versions', 'settings');
 OCP\App::registerPersonal('files_versions','settings-personal');
@@ -8,4 +8,4 @@ OCP\App::registerPersonal('files_versions','settings-personal');
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
\ No newline at end of file
+OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index e3a8dbd588..df3b68ef73 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -21,13 +21,13 @@
 * 
 */
 
-OC::$CLASSPATH['OC_Gallery_Album'] = 'apps/gallery/lib/album.php';
-OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
-OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
-OC::$CLASSPATH['OC_Gallery_Sharing'] = 'apps/gallery/lib/sharing.php';
-OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php';
-OC::$CLASSPATH['Pictures_Managers'] = 'apps/gallery/lib/managers.php';
-OC::$CLASSPATH['Pictures_Tiles'] = 'apps/gallery/lib/tiles.php';
+OC::$CLASSPATH['OC_Gallery_Album'] = 'gallery/lib/album.php';
+OC::$CLASSPATH['OC_Gallery_Photo'] = 'gallery/lib/photo.php';
+OC::$CLASSPATH['OC_Gallery_Scanner'] = 'gallery/lib/scanner.php';
+OC::$CLASSPATH['OC_Gallery_Sharing'] = 'gallery/lib/sharing.php';
+OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'gallery/lib/hooks_handlers.php';
+OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php';
+OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php';
 
 $l = OC_L10N::get('gallery');
 
@@ -52,4 +52,4 @@ class OC_GallerySearchProvider extends OC_Search_Provider{
 
 //OC_Search::registerProvider('OC_GallerySearchProvider');
 
-require_once('apps/gallery/lib/hooks_handlers.php');
+require_once('gallery/lib/hooks_handlers.php');
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index c08305bff9..52a5b81a23 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -31,7 +31,7 @@ OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('gallery', 'styles');
 OCP\Util::addScript('gallery', 'pictures');
 
-include('apps/gallery/lib/tiles.php');
+include('gallery/lib/tiles.php');
 
 $root = !empty($_GET['root']) ? $_GET['root'] : '/';
 $images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 869bc34402..c5bfc34654 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -22,9 +22,9 @@
 
 $l=OC_L10N::get('media');
 
-require_once('apps/media/lib_media.php');
-require_once('apps/media/lib_collection.php');
-require_once('apps/media/lib_scanner.php');
+require_once('media/lib_media.php');
+require_once('media/lib_collection.php');
+require_once('media/lib_scanner.php');
 
 OCP\Util::addscript('media','loader');
 OCP\App::registerPersonal('media','settings');
diff --git a/lib/app.php b/lib/app.php
index 486704a222..84d17957de 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -492,21 +492,21 @@ class OC_App{
 	 * register a settings form to be shown
 	 */
 	public static function registerSettings($app,$page){
-		self::$settingsForms[]='apps/'.$app.'/'.$page.'.php';
+		self::$settingsForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register an admin form to be shown
 	 */
 	public static function registerAdmin($app,$page){
-		self::$adminForms[]='apps/'.$app.'/'.$page.'.php';
+		self::$adminForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register a personal form to be shown
 	 */
 	public static function registerPersonal($app,$page){
-		self::$personalForms[]='apps/'.$app.'/'.$page.'.php';
+		self::$personalForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**

From 7c5ff900d020ad3a3bd49377d99b5e5963d17c9c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 23 Jun 2012 16:17:59 +0200
Subject: [PATCH 0600/1537] work with non existing apps directory. thanks to
 Antonio for the hint

---
 lib/installer.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index c0903f93d5..b650f3eed0 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -287,16 +287,17 @@ class OC_Installer{
 	 */
 	public static function installShippedApps(){
 		foreach(OC::$APPSROOTS as $app_dir) {
-			$dir = opendir( $app_dir['path'] );
-			while( false !== ( $filename = readdir( $dir ))){
-				if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ){
-					if( file_exists( $app_dir['path']."/$filename/appinfo/app.php" )){
-						if(!OC_Installer::isInstalled($filename)){
-							$info=OC_App::getAppInfo($filename);
-							$enabled = isset($info['default_enable']);
-							if( $enabled ){
-								OC_Installer::installShippedApp($filename);
-								OC_Appconfig::setValue($filename,'enabled','yes');
+			if($dir = opendir( $app_dir['path'] )){
+				while( false !== ( $filename = readdir( $dir ))){
+					if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ){
+						if( file_exists( $app_dir['path']."/$filename/appinfo/app.php" )){
+							if(!OC_Installer::isInstalled($filename)){
+								$info=OC_App::getAppInfo($filename);
+								$enabled = isset($info['default_enable']);
+								if( $enabled ){
+									OC_Installer::installShippedApp($filename);
+									OC_Appconfig::setValue($filename,'enabled','yes');
+								}
 							}
 						}
 					}

From 2c1c1ba88c7eb7a4c40fc14bc1cc92287ad1c8da Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 23 Jun 2012 16:21:47 +0200
Subject: [PATCH 0601/1537] close only if exist

---
 lib/installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/installer.php b/lib/installer.php
index b650f3eed0..00feb6d470 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -302,8 +302,8 @@ class OC_Installer{
 						}
 					}
 				}
+				closedir( $dir );
 			}
-			closedir( $dir );
 		}
 	}
 

From 5323983fc715d815a3e1820a32d0e826c0f41f09 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 23 Jun 2012 14:42:37 +0000
Subject: [PATCH 0602/1537] Text editor: Waste less space for line numbers

---
 apps/files_texteditor/css/style.css | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index 82c57b88bb..14a1c4a9bb 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -2,13 +2,10 @@
 	position: fixed;
 	display: block;
 	top: 6.8em;
-	left: 13.5em;
+	left: 12.5em;
+	z-index: 20;
 }
 #editor_save{
 	margin-left: 7px;
 	float: left;
 }
-#saving_icon{
-	margin-top: 3px;
-	float: left;
-}

From d450560b392f7be4ff05f31b6ffe89caf03dd2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Sat, 23 Jun 2012 16:59:55 +0200
Subject: [PATCH 0603/1537] remove trailing slash in %appswebroot% placeholder

---
 lib/minimizer/css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index f8e84482bb..110935ea3b 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -17,7 +17,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			$in_root = false;
 			foreach(OC::$APPSROOTS as $app_root) {
 				if(strpos($file, $app_root['path']) === 0) {
-					$in_root = $webroot.$app_root['url'];
+					$in_root = rtrim($webroot.$app_root['url'], '/');
 					break;
 				}
 			}

From a113ee9e9fd07ab10472746ae8fdfeb61c3d7aeb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 24 Jun 2012 00:42:16 +0200
Subject: [PATCH 0604/1537] add x-webkit-speech to searchbox

---
 core/templates/layout.user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index d6911fd1e1..7e98fdedc2 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -47,7 +47,7 @@
 			<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>
 			<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" />
+				<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>
 		</div></header>
 

From ca5de26bacf6d8a2245a8d916eaa642c3415bd5f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 24 Jun 2012 09:41:37 +0200
Subject: [PATCH 0605/1537] another fix for oc-1044

---
 apps/calendar/ajax/event/edit.form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
index 26a0cc2a60..86dff7b75a 100644
--- a/apps/calendar/ajax/event/edit.form.php
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -28,7 +28,7 @@ $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 switch($dtstart->getDateType()) {
 	case Sabre_VObject_Property_DateTime::UTC:
-		$timeOffset = OC_Calendar_App::$tz*60;
+		$timeOffset = $_SESSION['timezone']*60;
 		$newDT      = $dtstart->getDateTime(); 
 		$newDT->add(new DateInterval("PT" . $timeOffset . "M"));
 		$dtstart->setDateTime($newDT); 

From 0ab6e2ee3d88c9e2e3ada339ccd9b9f921d70598 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 08:06:42 +0000
Subject: [PATCH 0606/1537] Try to fix the remote pbm. fix oc-1090

---
 remote.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote.php b/remote.php
index ef610f3694..976012dea5 100644
--- a/remote.php
+++ b/remote.php
@@ -20,16 +20,19 @@ if(is_null($file)){
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
-if(count(explode('/',$file)) == 3) {
+
+$file = ltrim ($file, '/');
+
+if(count(explode('/',$file)) == 2) {
 	$parts=explode('/',$file);
-	$app=$parts[2];
+	$app=$parts[1];
 	OC_App::loadApp($app);
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once( OC::$SERVERROOT.$file);
+	require_once( OC::$SERVERROOT.'/'.$file);
 } else {
-	$parts=explode('/', $file, 4);
-	$app=$parts[2];
+	$parts=explode('/', $file, 2);
+	$app=$parts[0];
 	OC_App::loadApp($app);
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once(OC_App::getAppPath($app) .'/'. $parts[3]);
+	require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
 }

From 9e6d2f2f82322f499722c7db8b8df5d9469ea1e5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 01:48:37 +0200
Subject: [PATCH 0607/1537] Improve prev/next selection on delete.

---
 apps/contacts/js/contacts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6f5602c211..0654976a6d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -380,12 +380,12 @@ Contacts={
 							if(jsondata.status == 'success'){
 								var newid = '', bookid;
 								var curlistitem = $('#contacts li[data-id="'+jsondata.data.id+'"]');
-								var newlistitem = curlistitem.prev();
+								var newlistitem = curlistitem.prev('li');
 								if(newlistitem == undefined) {
-									newlistitem = curlistitem.next();
+									newlistitem = curlistitem.next('li');
 								}
 								curlistitem.remove();
-								if(newlistitem != undefined) {
+								if(!$(newlistitem).is('li')) {
 									newid = newlistitem.data('id');
 									bookid = newlistitem.data('id');
 								}

From b182e6c86a8ca0ef4e74f134bbb29e1db1fc5497 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 01:57:08 +0200
Subject: [PATCH 0608/1537] Trim trailing whitespace from version.

---
 lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index 84d17957de..b337c55ec6 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -381,7 +381,7 @@ class OC_App{
 		$file= self::getAppPath($appid).'/appinfo/version';
 		$version=@file_get_contents($file);
 		if($version){
-			return $version;
+			return trim($version);
 		}else{
 			$appData=self::getAppInfo($appid);
 			return $appData['version'];

From 5393c0cfedf9ab07276e43e02fbe75e397671df0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 16:03:10 +0200
Subject: [PATCH 0609/1537] Click to select which address book to add to.

---
 apps/contacts/css/contacts.css | 2 +-
 apps/contacts/js/contacts.js   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 6c65db2b77..fb5bcb2b70 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -5,7 +5,7 @@
 #leftcontent a { padding: 0 0 0 25px; }
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
 #leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
-#leftcontent h3:hover { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
+#leftcontent h3:hover,#leftcontent h3:active,#leftcontent h3.active { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
 #contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 0654976a6d..0325b2cec2 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -310,10 +310,11 @@ Contacts={
 			editNew:function(){ // add a new contact
 				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				//Contacts.UI.Card.add(t('contacts', 'Contact')+';'+t('contacts', 'New')+';;;', t('contacts', 'New Contact'), '', true);
-				Contacts.UI.Card.add(';;;;;', '', '', true);
+				Contacts.UI.Card.add(';;;;;', '', this.bookid, true);
 				return false;
 			},
 			add:function(n, fn, aid, isnew){ // add a new contact
+				aid = aid?aid:$('#contacts h3.active').first().data('id');
 				var localAddcontact = function(n, fn, aid, isnew) {
 					$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
 					function(jsondata) {
@@ -1605,6 +1606,8 @@ $(document).ready(function(){
 	});
 
 	$(document).on('click', '.addressbook', function(event){
+		$('#contacts h3').removeClass('active');
+		$(this).addClass('active');
 		$(this).next().slideToggle(300);
 		return false;
 	});

From 0f9b9fa111208925f2d4518e40476d5f68b6f940 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 16:07:18 +0200
Subject: [PATCH 0610/1537] Remove unneeded parameter.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 0325b2cec2..39e4522485 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -310,7 +310,7 @@ Contacts={
 			editNew:function(){ // add a new contact
 				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				//Contacts.UI.Card.add(t('contacts', 'Contact')+';'+t('contacts', 'New')+';;;', t('contacts', 'New Contact'), '', true);
-				Contacts.UI.Card.add(';;;;;', '', this.bookid, true);
+				Contacts.UI.Card.add(';;;;;', '', '', true);
 				return false;
 			},
 			add:function(n, fn, aid, isnew){ // add a new contact

From c53a8fa541dec244085ce551f2b1dd5b18b6e568 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 15:11:58 +0000
Subject: [PATCH 0611/1537] Correct seq name in media songs fix oc-589

---
 apps/media/lib_collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index a32a50534e..bf82e65e62 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -277,7 +277,7 @@ class OC_MEDIA_COLLECTION{
 				$query=self::$queries['addsong'];
 			}
 			$query->execute(array($name,$artist,$album,$path,$uid,$length,$track,$size));
-			$songId=OCP\DB::insertid('*PREFIX*media_songs');
+			$songId=OCP\DB::insertid('*PREFIX*media_songs_song');
 // 			self::setLastUpdated();
 			return self::getSongId($name,$artist,$album);
 		}

From f56b3df0bcb2c678b944f5086adad6e3e678252a Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 15:58:51 +0000
Subject: [PATCH 0612/1537] Resolve scanning issue case comparison of songs

---
 apps/media/lib_collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index bf82e65e62..598c08d32e 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -104,7 +104,7 @@ class OC_MEDIA_COLLECTION{
 			return self::$albumIdCache[$artistId][$albumId][$name];
 		}else{
 			$uid=$_SESSION['user_id'];
-			$query=OCP\DB::prepare("SELECT song_id FROM *PREFIX*media_songs WHERE song_user=? AND song_name LIKE ? AND song_artist=? AND song_album=?");
+			$query=OCP\DB::prepare("SELECT song_id FROM *PREFIX*media_songs WHERE song_user=? AND lower(song_name) LIKE ? AND song_artist=? AND song_album=?");
 			$songs=$query->execute(array($uid,$name,$artistId,$albumId))->fetchAll();
 			if(is_array($songs) and isset($songs[0])){
 				self::$albumIdCache[$artistId][$albumId][$name]=$songs[0]['song_id'];

From 61adae1e49b67cfe79d5daf2bc9e649b343090bb Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 19:41:23 +0000
Subject: [PATCH 0613/1537] Use intervals for sessions deletion with postgres
 fix oc-492

---
 apps/media/lib_ampache.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index f5c91661ab..255e6f468f 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -77,7 +77,7 @@ class OC_MEDIA_AMPACHE{
 					$songs=OC_MEDIA_COLLECTION::getSongCount();
 					$artists=OC_MEDIA_COLLECTION::getArtistCount();
 					$albums=OC_MEDIA_COLLECTION::getAlbumCount();
-					$query=OCP\DB::prepare("INSERT INTO *PREFIX*media_sessions (`session_id`, `token`, `user_id`, `start`) VALUES (NULL, ?, ?, now());");
+					$query=OCP\DB::prepare("INSERT INTO *PREFIX*media_sessions (`token`, `user_id`, `start`) VALUES (?, ?, now());");
 					$query->execute(array($token,$user));
 					$expire=date('c',time()+600);
 					echo('<?xml version="1.0" encoding="UTF-8"?>');
@@ -136,8 +136,14 @@ class OC_MEDIA_AMPACHE{
 				return false;
 			}
 		}
+		$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
+		if($CONFIG_DBTYPE == 'psql'){
+			$interval = ' \'600s\'::interval ';
+		}else {
+			$interval = '600';
+		}
 		//remove old sessions
-		$query=OCP\DB::prepare("DELETE from *PREFIX*media_sessions WHERE start<(NOW()-600)");
+		$query=OCP\DB::prepare("DELETE from *PREFIX*media_sessions WHERE start<(NOW() - ".$interval.")");
 		$query->execute();
 		
 		$query=OCP\DB::prepare("SELECT user_id from *PREFIX*media_sessions WHERE token=?");

From 2a6a155e23626fbbc4b04917b52e2f918e10effc Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 10:46:49 +0200
Subject: [PATCH 0614/1537] Correct File cache error with postgresql

---
 lib/filecache.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/filecache.php b/lib/filecache.php
index e3bcc7d000..13d7b34c9d 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -110,6 +110,9 @@ class OC_FileCache{
 		$queryParts=array();
 		foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute){
 			if(isset($data[$attribute])){
+				//Convert to int it args are false
+                        	if($data[$attribute] === false) $arguments[] = 0;
+				else $arguments[] = $data[$attribute];
 				$arguments[]=$data[$attribute];
 				$queryParts[]=$attribute.'=?';
 			}

From df1eca4fa2876da3507b51a5a47683284e887c7a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 22:15:36 +0200
Subject: [PATCH 0615/1537] Also load categories from VJOURNAL.

---
 apps/calendar/lib/app.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 8e13b13b8a..344c89f36b 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -194,6 +194,9 @@ class OC_Calendar_App{
 		} else
 		if (isset($calendar->VTODO)) {
 			$object = $calendar->VTODO;
+		} else
+		if (isset($calendar->VJOURNAL)) {
+			$object = $calendar->VJOURNAL;
 		}
 		if ($object) {
 			self::getVCategories()->loadFromVObject($object, true);

From f10c51193b0b661a187490f584cc41fbc7a67f01 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 22:21:21 +0200
Subject: [PATCH 0616/1537] Fixed function name.

---
 apps/contacts/thumbnail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 8378507163..a69e9c74f7 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -23,7 +23,7 @@
 OCP\JSON::checkLoggedIn();
 //OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
-session_close_write();
+session_write_close();
 
 function getStandardImage(){
 	//OCP\Response::setExpiresHeader('P10D');

From 3afbc3d2dc3c36145411926f1b59de0401fe6876 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 22:22:58 +0200
Subject: [PATCH 0617/1537] Add some DRYness to logging.

---
 apps/contacts/ajax/addproperty.php       |  6 +---
 apps/contacts/ajax/categories/delete.php | 13 +-------
 apps/contacts/ajax/categories/rescan.php | 13 +-------
 apps/contacts/ajax/contactdetails.php    |  6 +---
 apps/contacts/ajax/createaddressbook.php | 13 +++-----
 apps/contacts/ajax/currentphoto.php      |  6 +---
 apps/contacts/ajax/deletecard.php        | 19 +++++------
 apps/contacts/ajax/deleteproperty.php    |  7 ++---
 apps/contacts/ajax/editname.php          |  6 +---
 apps/contacts/ajax/loadphoto.php         |  6 +---
 apps/contacts/ajax/loghandler.php        | 40 ++++++++++++++++++++++++
 apps/contacts/ajax/oc_photo.php          |  6 +---
 apps/contacts/ajax/savecrop.php          |  6 +---
 apps/contacts/ajax/saveproperty.php      | 12 +------
 apps/contacts/ajax/updateaddressbook.php | 13 +++-----
 apps/contacts/ajax/uploadimport.php      |  6 +---
 apps/contacts/ajax/uploadphoto.php       |  9 +-----
 17 files changed, 70 insertions(+), 117 deletions(-)
 create mode 100644 apps/contacts/ajax/loghandler.php

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index f888b94e38..1b6db0c8f8 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -25,11 +25,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/addproperty.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
+require_once('loghandler.php');
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
index bee2dbe3f6..76c23d6487 100644
--- a/apps/contacts/ajax/categories/delete.php
+++ b/apps/contacts/ajax/categories/delete.php
@@ -10,18 +10,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.print_r($element, true));
-}
-
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/categories/delete.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/categories/delete.php: '.$msg, OCP\Util::DEBUG);
-}
+require_once('../loghandler.php');
 
 $categories = isset($_POST['categories'])?$_POST['categories']:null;
 
diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
index 84a67dec0b..48ec165381 100644
--- a/apps/contacts/ajax/categories/rescan.php
+++ b/apps/contacts/ajax/categories/rescan.php
@@ -10,18 +10,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.print_r($element, true));
-}
-
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-}
+require_once('../loghandler.php');
 
 $addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
 if(count($addressbooks) == 0) {
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index a6ca10f9c9..b697b1a8e5 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -20,11 +20,7 @@
  *
  */
  
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/contactdetails.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
+require_once('loghandler.php');
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index 616766bb1a..2ec5f542bb 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -12,25 +12,20 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
+require_once('loghandler.php');
 
 $userid = OCP\USER::getUser();
 $name = trim(strip_tags($_POST['name']));
 if(!$name) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add addressbook with an empty name.'))));
-	OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Cannot add addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR);
-	exit();
+	bailOut('Cannot add addressbook with an empty name.');
 }
 $bookid = OC_Contacts_Addressbook::add($userid, $name, null);
 if(!$bookid) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding addressbook.'))));
-	OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OCP\Util::ERROR);
-	exit();
+	bailOut('Error adding addressbook: '.$name);
 }
 
 if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error activating addressbook.'))));
-	OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR);
-	//exit();
+	bailOut('Error activating addressbook.');
 }
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index 5f90128f32..b10e752c45 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -24,11 +24,7 @@
 OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::ERROR);
-	exit();
-}
+require_once('loghandler.php');
 
 if (!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
index 2a6bd277d1..1161c18abd 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -19,26 +19,21 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
+require_once('loghandler.php');
 
 // foreach($_SERVER as $key=>$value) {
 // 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _SERVER: '.$key.'=>'.$value, OCP\Util::DEBUG);
 // }
-foreach($_POST as $key=>$value) {
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _POST: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
-}
-foreach($_GET as $key=>$value) {
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _GET: '.$key.'=>'.print_r($value, true), OCP\Util::DEBUG);
-}
+// foreach($_POST as $key=>$value) {
+// 	debug($key.'=>'.print_r($value, true));
+// }
+// foreach($_GET as $key=>$value) {
+// 	debug($key.'=>'.print_r($value, true));
+// }
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 55f7e32308..90e5e64903 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -24,6 +24,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
+require_once('loghandler.php');
 
 $id = $_POST['id'];
 $checksum = $_POST['checksum'];
@@ -31,16 +32,14 @@ $checksum = $_POST['checksum'];
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 if(is_null($line)){
-	OCP\JSON::error(array('data' => array( 'message' => OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'))));
+	bailOut(OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'));
 	exit();
 }
 
 unset($vcard->children[$line]);
 
 if(!OC_Contacts_VCard::edit($id,$vcard)) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error deleting contact property.'))));
-	OCP\Util::writeLog('contacts','ajax/deleteproperty.php: Error deleting contact property', OCP\Util::ERROR);
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('Error deleting contact property.'));
 }
 
 OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 62cae894b6..868ca222e0 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -9,11 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
+require_once('loghandler.php');
 
 $tmpl = new OCP\Template("contacts", "part.edit_name_dialog");
 
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
index eac7ca7d02..61b5356edc 100644
--- a/apps/contacts/ajax/loadphoto.php
+++ b/apps/contacts/ajax/loadphoto.php
@@ -24,11 +24,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/loadphoto.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
+require_once('loghandler.php');
 
 $id = isset($_GET['id']) ? $_GET['id'] : '';
 $refresh = isset($_GET['refresh']) ? true : false;
diff --git a/apps/contacts/ajax/loghandler.php b/apps/contacts/ajax/loghandler.php
new file mode 100644
index 0000000000..831b2e50c1
--- /dev/null
+++ b/apps/contacts/ajax/loghandler.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * 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/>.
+ *
+ */
+
+function bailOut($msg, $tracelevel=1, $debuglevel=OCP\Util::ERROR) {
+	OCP\JSON::error(array('data' => array('message' => $msg)));
+	debug($msg, $tracelevel, $debuglevel);
+	exit();
+}
+
+function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) {
+	if(PHP_VERSION >= "5.4") {
+		$call = debug_backtrace(false, $tracelevel+1);
+	} else {
+		$call = debug_backtrace(false);
+	}
+	error_log('trace: '.print_r($call, true));
+	$call = $call[$tracelevel];
+	if($debuglevel !== false) {
+		OCP\Util::writeLog('contacts', $call['file'].'. Line: '.$call['line'].': '.$msg, $debuglevel);
+	}
+}
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index ea25ebf176..5c50ba92db 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -22,11 +22,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::ERROR);
-	exit();
-}
+require_once('loghandler.php');
 
 if(!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 6faf6a173d..adce6be3b3 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -27,11 +27,7 @@ OCP\JSON::callCheck();
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
+require_once('loghandler.php');
 
 $image = null;
 
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 6ee9ec90b5..34fc3cc535 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -19,21 +19,11 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
-}
-
+require_once('loghandler.php');
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
 $value = isset($_POST['value'])?$_POST['value']:null;
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index 19b5b3bddc..d3a772c727 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -11,27 +11,22 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+require_once('loghandler.php');
 
 $bookid = $_POST['id'];
 OC_Contacts_App::getAddressbook($bookid); // is owner access check
 
 $name = trim(strip_tags($_POST['name']));
 if(!$name) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'))));
-	OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Cannot update addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR);
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'));
 }
 
 if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.'))));
-	OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OCP\Util::ERROR);
-	//exit();
+	bailOut(OC_Contacts_App::$l10n->t('Error updating addressbook.'));
 }
 
 if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.'))));
-	OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error (de)activating addressbook: '.$bookid, OCP\Util::ERROR);
-	//exit();
+	bailOut(OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'));
 }
 
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index 463ca161e5..c1e9c8b1ad 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -23,11 +23,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::ERROR);
-	exit();
-}
+require_once('loghandler.php');
 
 $view = OCP\Files::getStorage('contacts');
 $tmpfile = md5(rand());
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 889de6a1f8..8545ca84ee 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -27,14 +27,7 @@ OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
-}
+require_once('loghandler.php');
 
 // If it is a Drag'n'Drop transfer it's handled here.
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);

From e845e567496c38aa56cda9f217f52aedf8b05f57 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 24 Jun 2012 22:24:54 +0200
Subject: [PATCH 0618/1537] Remove excessive debugging.

---
 apps/contacts/ajax/contacts.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 16730ec947..2ce6de1696 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -18,7 +18,6 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
 $active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
-error_log('active_addressbooks: '.print_r($active_addressbooks, true));
 
 $contacts_addressbook = array();
 $ids = array();
@@ -29,9 +28,7 @@ foreach($active_addressbooks as $addressbook) {
 		$contacts_addressbook[$addressbook['id']]['displayname'] = $addressbook['displayname'];
 	}
 }	
-error_log('ids: '.print_r($ids, true));
 $contacts_alphabet = OC_Contacts_VCard::all($ids);
-error_log('contacts_alphabet: '.print_r($contacts_alphabet, true));
 
 // Our new array for the contacts sorted by addressbook
 foreach($contacts_alphabet as $contact) {

From 564cd825997461218c4efbd5d4c3877e1f815353 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 20:49:48 +0000
Subject: [PATCH 0619/1537] Fix the fix about filecache and postgres

---
 lib/filecache.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 13d7b34c9d..d956f34dc4 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -111,9 +111,8 @@ class OC_FileCache{
 		foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute){
 			if(isset($data[$attribute])){
 				//Convert to int it args are false
-                        	if($data[$attribute] === false) $arguments[] = 0;
+				if($data[$attribute] === false) $arguments[] = 0;
 				else $arguments[] = $data[$attribute];
-				$arguments[]=$data[$attribute];
 				$queryParts[]=$attribute.'=?';
 			}
 		}

From 0fb9d0bf29a18c6fd463a4a62fcada2f473685d2 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 21:24:43 +0000
Subject: [PATCH 0620/1537] Correct bookmark app : add through interface and
 remove missing css

---
 apps/bookmarks/ajax/addBookmark.php | 2 +-
 apps/bookmarks/templates/addBm.php  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index d66aab5896..6b5a0f71d4 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -31,5 +31,5 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
 
 require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
-$id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']);
+$id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
 OCP\JSON::success(array('data' => $id));
\ No newline at end of file
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
index dbe673f53a..534bafe588 100644
--- a/apps/bookmarks/templates/addBm.php
+++ b/apps/bookmarks/templates/addBm.php
@@ -3,7 +3,6 @@
   <head>  
     <meta charset="utf-8">  
     <title>Read later - ownCloud</title>  
-    <link rel="stylesheet" href="css/readlater.css">  
   </head>
   <body>
   	<div class="message"><h1>Saved!</h1></div>

From 51d33768b84fe8467258bfe67a1f9cd7e0f0913a Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 21:30:14 +0000
Subject: [PATCH 0621/1537] Prevent errors and mini enhancement of saved window
 in bookmarks

---
 apps/bookmarks/bookmarksHelper.php | 3 ++-
 apps/bookmarks/templates/addBm.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
index 01b551111e..92baac2f51 100644
--- a/apps/bookmarks/bookmarksHelper.php
+++ b/apps/bookmarks/bookmarksHelper.php
@@ -90,7 +90,8 @@ function addBookmark($url, $title, $tags='') {
 	
 	if(empty($title)) {
 		$metadata = getURLMetadata($url);
-		$title = $metadata['title'];
+		if(isset($metadata['title'])) // Check for problems fetching the title
+			$title = $metadata['title'];
 	}
 	
 	if(empty($title)) {
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
index 534bafe588..357e0a18f2 100644
--- a/apps/bookmarks/templates/addBm.php
+++ b/apps/bookmarks/templates/addBm.php
@@ -6,5 +6,6 @@
   </head>
   <body>
   	<div class="message"><h1>Saved!</h1></div>
+		<a href="javascript:self.close()" >Close the window</a>
   </body>  
 </html>  
\ No newline at end of file

From 052bd8efbb39096867fdb2c0922b77f468a45ef9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 03:41:28 +0200
Subject: [PATCH 0622/1537] Drag'n'Drop contacts between addressbook. Still
 needs some css magic.

---
 apps/contacts/ajax/movetoaddressbook.php | 41 ++++++++++++++++++++++++
 apps/contacts/js/contacts.js             | 36 +++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 apps/contacts/ajax/movetoaddressbook.php

diff --git a/apps/contacts/ajax/movetoaddressbook.php b/apps/contacts/ajax/movetoaddressbook.php
new file mode 100644
index 0000000000..a3336c3cb6
--- /dev/null
+++ b/apps/contacts/ajax/movetoaddressbook.php
@@ -0,0 +1,41 @@
+<?php
+/**
+* @author  Victor Dubiniuk
+* Copyright (c) 2012 Victor Dubiniuk <victor.dubiniuk@gmail.com>
+* Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
+* This file is licensed under the Affero General Public License version 3 or
+* later.
+* See the COPYING-README file.
+*/
+	
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
+
+$ids = $_POST['ids'];
+$aid = intval($_POST['aid']);
+OC_Contacts_App::getAddressbook($aid);
+	
+if(!is_array($ids)) {
+	$ids = array($ids,);
+}
+$goodids = array();
+foreach ($ids as $id){
+	try {
+		$card = OC_Contacts_App::getContactObject( intval($id) );
+		if($card) {
+			$goodids[] = $id;
+		}
+	} catch (Exception $e) {
+		OCP\Util::writeLog('contacts', 'Error moving contact "'.$id.'" to addressbook "'.$aid.'"'.$e->getMessage(), OCP\Util::ERROR);
+	}
+}
+try {
+	OC_Contacts_VCard::moveToAddressBook($aid, $ids);
+}  catch (Exception $e) {
+	$msg = $e->getMessage();
+	OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $ids).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
+	OC_JSON::error(array('data' => array('message' => $msg,)));
+}
+	
+OC_JSON::success(array('data' => array('ids' => $goodids,)));
\ No newline at end of file
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 39e4522485..d5f09fbc72 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1505,6 +1505,36 @@ Contacts={
 			}
 		},
 		Contacts:{
+			drop:function(event, ui) {
+				var dragitem = ui.draggable, droptarget = $(this);
+				//console.log('Drop ' + dragitem.data('id') +' on: ' + droptarget.data('id'));
+				if(dragitem.data('bookid') == droptarget.data('id')) {
+					return false;
+				}
+				var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
+				$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: $(this).data('id') },
+					function(jsondata){
+						if(jsondata.status == 'success'){
+							// Do some inserting/removing/sorting magic
+							var name = $(dragitem).find('a').html();
+							var added = false;
+							$(droplist).children().each(function(){
+								if ($(this).text().toLowerCase() > name.toLowerCase()) {
+									$(this).before(dragitem.detach()); //.fadeIn('slow');
+									added = true;
+									return false;
+								}
+							});
+							if(!added) {
+								$(droplist).append(dragitem.detach());
+							}
+							dragitem.data('bookid', droptarget.data('id'));
+							Contacts.UI.Contacts.scrollTo(dragitem.data('id'));
+						} else {
+							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						}
+				});
+			},
 			// Reload the contacts list.
 			update:function(id){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
@@ -1522,6 +1552,12 @@ Contacts={
 							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
 						});
 						Contacts.UI.Card.update(id);
+						$('#contacts h3,#contacts ul').droppable({ drop: Contacts.UI.Contacts.drop});
+						$('#contacts li').draggable({
+							axis: 'y', containment: '#contacts',
+							scroll: true, scrollSensitivity: 100,
+							opacity: 0.7, helper: 'clone'
+						});
 					}
 					else{
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));

From c3130919c2fa67caa5d7d52124b20388633c5cfa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 05:02:01 +0200
Subject: [PATCH 0623/1537] Allow direct link to app.

---
 settings/apps.php           | 2 ++
 settings/js/apps.js         | 9 +++++++++
 settings/templates/apps.php | 4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/settings/apps.php b/settings/apps.php
index f85b28158f..f4ae8b8d97 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -93,6 +93,8 @@ usort($apps, 'app_sort');
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
 $tmpl->assign('apps',$apps, false);
+$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
+$tmpl->assign('appid',$appid);
 
 $tmpl->printPage();
 
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 224076aba4..cfef894c6f 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -73,4 +73,13 @@ $(document).ready(function(){
 			}
 		}
 	});
+	
+	if(appid) {
+		var item = $('#leftcontent li[data-id="'+appid+'"]');
+		if(item) {
+			item.trigger('click');
+			item.addClass('active');
+			$('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
+		}
+	}
 });
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index c620f796e0..b9beedca15 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,7 +3,9 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
-
+<script type='text/javascript'>
+	var appid = '<?php echo $_['appid']; ?>';
+</script>
 <div id="controls">
 	<a class="button" target="_blank" href="http://owncloud.org/dev/writing-apps/"><?php echo $l->t('Add your App');?></a>
 </div>

From 5ac4830e757eb07ff2ca993954f2c31bbe80185f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 05:03:30 +0200
Subject: [PATCH 0624/1537] XSS fix.

---
 settings/templates/apps.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index b9beedca15..6edaf6c584 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -12,7 +12,7 @@
 <ul id="leftcontent">
 	<?php foreach($_['apps'] as $app):?>
 	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>">
-		<a href="?appid=<?php echo $app['id'] ?>"><?php  echo $app['name'] ?></a>
+		<a href="?appid=<?php echo $app['id'] ?>"><?php  echo htmlentities($app['name']) ?></a>
 		<span class="hidden">
 			<?php OC_JSON::encodedPrint($app,false) ?>
 		</span>

From 9ee528bc74a924def23168cd2ef8ccbdcbc649c8 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 25 Jun 2012 10:15:20 +0200
Subject: [PATCH 0625/1537] Only delete existing thumbnails (bug #1100)

---
 apps/gallery/lib/managers.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index d4d978dbdd..fcce3f40e2 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -86,7 +86,10 @@ class ThumbnailsManager {
 	}
 	
 	public function delete($path) {
-		unlink(\OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path);
+		$thumbnail = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path;
+		if (file_exists($thumbnail)) {
+			unlink($thumbnail);
+		}
 	}
 	
 	private function __construct() {}

From a4c47c674df2be3d32dcbb1e924986bc7df600ce Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 25 Jun 2012 11:55:51 +0200
Subject: [PATCH 0626/1537] write sql errors into the error log for better
 debugging

---
 lib/db.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/db.php b/lib/db.php
index dc9e3392d0..9e6835adc6 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -246,6 +246,7 @@ class OC_DB {
 				$entry = 'DB Error: "'.$result->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.$query.'<br />';
 				OC_Log::write('core',$entry,OC_Log::FATAL);
+				error_log('DB error: '.$entry);
 				die( $entry );
 			}
 		}else{
@@ -255,6 +256,7 @@ class OC_DB {
 				$entry = 'DB Error: "'.$e->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.$query.'<br />';
 				OC_Log::write('core',$entry,OC_Log::FATAL);
+				error_log('DB error: '.$entry);
 				die( $entry );
 			}
 			$result=new PDOStatementWrapper($result);

From a09a01a49fbbb7e821c0e9d259586930d51a87d5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 25 Jun 2012 12:44:54 +0200
Subject: [PATCH 0627/1537] sanitizeHTML() has to be called later to keep the
 path unchanged

---
 apps/gallery/index.php           | 2 +-
 apps/gallery/templates/index.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 52a5b81a23..b8aadacb47 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -94,7 +94,7 @@ for($i = 0; $i<count($root_images); $i++) {
 }
 
 $tmpl = new OCP\Template( 'gallery', 'index', 'user' );
-$tmpl->assign('root', $root);
+$tmpl->assign('root', $root, false);
 $tmpl->assign('tl', $tl, false);
 $tmpl->printPage();
 ?>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index c3b4a17854..c90932cefd 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-var root = "<?php echo OCP\Util::sanitizeHTML($_['root']); ?>";
+var root = "<?php echo $_['root']; ?>";
 
 $(document).ready(function() {
 		$("a[rel=images]").fancybox({
@@ -18,7 +18,7 @@ $(document).ready(function() {
 		for ($i = 0; $i < count($paths); $i++) {
 			$path .= urlencode($paths[$i]).'/';
 			$classess = 'crumb'.($i == count($paths)-1?' last':'');
-			echo '<div class="'.$classess.'" style="background-image:url(\''.\OCP\image_path('core','breadcrumb.png').'\')"><a href="'.\OCP\Util::linkTo('gallery', 'index.php').'&root='.$path.'">'.$paths[$i].'</a></div>';
+			echo '<div class="'.$classess.'" style="background-image:url(\''.\OCP\image_path('core','breadcrumb.png').'\')"><a href="'.\OCP\Util::linkTo('gallery', 'index.php').'&root='.$path.'">'.OCP\Util::sanitizeHTML($paths[$i]).'</a></div>';
 		}
 	}
 		

From d64a7716f1a32cda698cb26597d074de8b9ab245 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 25 Jun 2012 13:16:35 +0200
Subject: [PATCH 0628/1537] LDAP: always sanitize DN and DN-containing
 attributes

---
 apps/user_ldap/lib_ldap.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index c88b18b10d..2940e1d825 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -425,7 +425,7 @@ class OC_LDAP {
 		if(isset($result[$attr]) && $result[$attr]['count'] > 0){
 			$values = array();
 			for($i=0;$i<$result[$attr]['count'];$i++) {
-				$values[] = $result[$attr][$i];
+				$values[] = self::resemblesDN($attr) ? self::sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
 			}
 			return $values;
 		}
@@ -508,7 +508,7 @@ class OC_LDAP {
 						$key = strtolower($key);
 						if(isset($item[$key])) {
 							if($key != 'dn'){
-								$selection[$i][$key] = $item[$key][0];
+								$selection[$i][$key] = self::resemblesDN($key) ? self::sanitizeDN($item[$key][0]) : $item[$key][0];
 							} else {
 								$selection[$i][$key] = self::sanitizeDN($item[$key]);
 							}
@@ -521,7 +521,7 @@ class OC_LDAP {
 					$key = strtolower($attr[0]);
 
 					if(isset($item[$key])) {
-						if($key == 'dn') {
+						if(self::resemblesDN($key)) {
 							$selection[] = self::sanitizeDN($item[$key]);
 						} else {
 							$selection[] = $item[$key];
@@ -536,6 +536,15 @@ class OC_LDAP {
 		return $findings;
 	}
 
+	static private function resemblesDN($attr) {
+		$resemblingAttributes = array(
+			'dn',
+			'uniquemember',
+			'member'
+		);
+		return in_array($attr, $resemblingAttributes);
+	}
+
 	static private function sanitizeDN($dn) {
 		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
 		$dn = preg_replace('/([^\\\]),(\s+)/','\1,',$dn);

From 3f6a7859c9ed71823767ff0932c9ff48067be1e2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 22 Jun 2012 12:42:07 +0200
Subject: [PATCH 0629/1537] LDAP: cheaper userExists() implementation, fixes
 oc-1012

---
 apps/user_ldap/user_ldap.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 85b3d88973..b98cf7a55b 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -136,6 +136,9 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 		}
 
+		return true;
+		}
+
 		return true;
 	}
 

From 09a9f5400e011ed691a7f4faca03f39ac3b5e7ba Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 25 Jun 2012 15:50:27 +0200
Subject: [PATCH 0630/1537] Trim url and path of appsroot to have and standart
 type of path fix oc-1107

---
 lib/base.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 870550f267..b4da6434e2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -136,14 +136,16 @@ class OC{
 		$config_paths = OC_Config::getValue('apps_paths', array());
 		if(! empty($config_paths)){
 			foreach($config_paths as $paths) {
-				if( isset($paths['url']) && isset($paths['path']))
-					OC::$APPSROOTS[] = $paths;	
+				if( isset($paths['url']) && isset($paths['path'])) {
+					$paths['url'] = rtrim($paths['url'],'/');
+					$paths['path'] = rtrim($paths['path'],'/');
+					OC::$APPSROOTS[] = $paths;
+				}
 			}
 		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
-			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps/', 'writable' => true);
+			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => true);
 		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps/', 'writable' => true);
-			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
+			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps', 'writable' => true);
 		}
 
 		if(empty(OC::$APPSROOTS)){

From ef93bf223a54a3247c177285cc4a333b3a67624d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 17:26:44 +0200
Subject: [PATCH 0631/1537] Try to conserve some memory. Should fix oc-1106 for
 master.

---
 apps/contacts/ajax/contacts.php | 2 +-
 apps/contacts/index.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 2ce6de1696..4bb7801cb2 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -45,7 +45,7 @@ foreach($contacts_alphabet as $contact) {
 	}
 	$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
 }
-
+unset($contacts_alphabet);
 uasort($contacts_addressbook, 'cmp');
 
 $tmpl = new OCP\Template("contacts", "part.contacts");
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index bdb52c123c..f6b37409ea 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -28,6 +28,7 @@ $details = array();
 if(is_null($id) && count($contacts) > 0) {
 	$id = $contacts[0]['id'];
 }
+unset($contacts);
 if(!is_null($id)) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
 	$details = OC_Contacts_VCard::structureContact($vcard);
@@ -66,7 +67,6 @@ $tmpl->assign('phone_types', $phone_types);
 $tmpl->assign('email_types', $email_types);
 $tmpl->assign('categories', $categories);
 $tmpl->assign('addressbooks', $addressbooks);
-$tmpl->assign('contacts', $contacts, false);
 $tmpl->assign('details', $details );
 $tmpl->assign('id',$id);
 $tmpl->printPage();

From 9bb409d88196703b01aba1ef087c85f794ca564c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 25 Jun 2012 17:34:28 +0200
Subject: [PATCH 0632/1537] fix syntax error after merge

---
 apps/user_ldap/user_ldap.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index b98cf7a55b..85b3d88973 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -136,9 +136,6 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 		}
 
-		return true;
-		}
-
 		return true;
 	}
 

From 380f41136cf705de2df5101e42d89c9483e2c078 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Mon, 25 Jun 2012 16:57:41 +0100
Subject: [PATCH 0633/1537] Added placeholder msg to share with menu to clarify
 user list restricted to security context

---
 apps/files_sharing/css/sharing.css | 1 +
 apps/files_sharing/js/share.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css
index c4b4540e9d..d4fcf79ee9 100644
--- a/apps/files_sharing/css/sharing.css
+++ b/apps/files_sharing/css/sharing.css
@@ -12,3 +12,4 @@ a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em
 a.unshare:hover { opacity:1; }
 #share_with { width: 16em; }
 #privateLink label, .edit { font-weight:normal; }
+#share_with_chzn { display: block; }
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 96c9017dbf..9194d2240a 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -61,7 +61,7 @@ OC.Share={
 		OC.Share.loadItem(item);
 		var html = '<div id="dropdown" class="drop" data-item="'+item+'">';
 		html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
-		html += '<option value=""></option>';
+		html += '<option value="" selected="selected" disabled="disabled">Your groups & members</option>';
 		html += '</select>';
 		html += '<div id="sharedWithList">';
 		html += '<ul id="userList"></ul>';

From b8d6ad0431b33c56ea1fceba0845eecb4ef6ca0f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 17:59:49 +0200
Subject: [PATCH 0634/1537] Improve styling on draggables.

---
 apps/contacts/css/contacts.css |  1 +
 apps/contacts/js/contacts.js   | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index fb5bcb2b70..f60d9bfe67 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -8,6 +8,7 @@
 #leftcontent h3:hover,#leftcontent h3:active,#leftcontent h3.active { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
 #contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
+.contacts li.ui-draggable { height: 23px; width: 20em; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d5f09fbc72..12c6d98f20 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1550,14 +1550,16 @@ Contacts={
 									}
 								})}, 100);
 							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
+							if($('#contacts h3').length > 1) {
+								$('#contacts h3,#contacts ul').droppable({ drop: Contacts.UI.Contacts.drop});
+								$('#contacts li').draggable({
+									axis: 'y', containment: '#contacts',
+									scroll: true, scrollSensitivity: 100,
+									opacity: 0.7, helper: 'clone'
+								});
+							}
 						});
 						Contacts.UI.Card.update(id);
-						$('#contacts h3,#contacts ul').droppable({ drop: Contacts.UI.Contacts.drop});
-						$('#contacts li').draggable({
-							axis: 'y', containment: '#contacts',
-							scroll: true, scrollSensitivity: 100,
-							opacity: 0.7, helper: 'clone'
-						});
 					}
 					else{
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));

From dc4b89132769fc5842eab6bf4d388a8041a43bdd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 18:23:48 +0200
Subject: [PATCH 0635/1537] Better visual feedback and prevent drop on self.

---
 apps/contacts/css/contacts.css |  1 +
 apps/contacts/js/contacts.js   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index f60d9bfe67..143fdae80e 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -9,6 +9,7 @@
 #contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 .contacts li.ui-draggable { height: 23px; width: 20em; }
+.ui-state-hover { border: 1px solid dashed; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 12c6d98f20..036734049b 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1551,8 +1551,17 @@ Contacts={
 								})}, 100);
 							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
 							if($('#contacts h3').length > 1) {
-								$('#contacts h3,#contacts ul').droppable({ drop: Contacts.UI.Contacts.drop});
+								$('#contacts h3,#contacts ul').each(function(index) {
+									var id = $(this).data('id');
+									var accept = 'li:not([data-bookid="'+id+'"])';
+									$(this).droppable({
+										drop: Contacts.UI.Contacts.drop,
+										activeClass: 'ui-state-hover',
+										accept: accept
+									});
+								});
 								$('#contacts li').draggable({
+									revert: 'invalid',
 									axis: 'y', containment: '#contacts',
 									scroll: true, scrollSensitivity: 100,
 									opacity: 0.7, helper: 'clone'

From f374dae233b3a4c970562d096514ba20e6d40bcc Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Mon, 25 Jun 2012 18:01:17 +0100
Subject: [PATCH 0636/1537] Added text ACS warning to admin's user settings
 page, and corresponding CSS styles

---
 core/css/styles.css          | 1 +
 settings/css/settings.css    | 2 ++
 settings/templates/users.php | 5 +++++
 settings/users.php           | 9 +++++++++
 4 files changed, 17 insertions(+)

diff --git a/core/css/styles.css b/core/css/styles.css
index 44fd1e084f..338518e5b2 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -106,6 +106,7 @@ label.infield { cursor: text !important; }
 /* 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; }
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 80e96df5e6..d5634eec81 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -53,3 +53,5 @@ span.version { margin-left:3em; color:#ddd; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
+h3.settingsNotice { font-size: 1.2em; }
+.settingsNotice { font-weight:bold; padding: 0.5em 0; }
diff --git a/settings/templates/users.php b/settings/templates/users.php
index ea3fe777ff..c042f2664e 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -112,3 +112,8 @@ foreach($_["groups"] as $group) {
 		<?php endforeach; ?>
 	</tbody>
 </table>
+
+<!-- use a standard notification class / system for this message -->
+<?php if( $_["share_notice"] ):?>
+<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
+<?php endif;?>	
\ No newline at end of file
diff --git a/settings/users.php b/settings/users.php
index 96515a90ce..026a30a750 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -33,11 +33,20 @@ foreach($quotaPreset as &$preset){
 
 $defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
 
+$shareNotice = '';
+
+if (\OC_App::isEnabled( "files_sharing" ) ) {
+
+	$shareNotice = 'Note: users may only share to groups that they belong to, and their members';
+	
+}
+
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
+$tmpl->assign( 'share_notice', $shareNotice);
 $tmpl->printPage();
 
 ?>

From a52036f3efeed8e4ba0ab81c2b9a20bd07cda2d7 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 25 Jun 2012 17:33:24 +0000
Subject: [PATCH 0637/1537] Quick fix of multi app migration. Need a better
 solution

---
 remote.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/remote.php b/remote.php
index 976012dea5..e68a53800c 100644
--- a/remote.php
+++ b/remote.php
@@ -16,6 +16,8 @@ if (!$pos = strpos($path_info, '/', 1)) {
 }
 $service=substr($path_info, 1, $pos-1);
 $file = OC_AppConfig::getValue('core', 'remote_' . $service);
+$file = preg_replace('/apps\//','', $file); //Todo Remove after Multiappdir migration
+
 if(is_null($file)){
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;

From 2250fb1159934a38b1a45c4fbca7fece4b11733c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 20:29:56 +0200
Subject: [PATCH 0638/1537] Emit Completed.

---
 apps/tasks/lib/app.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/tasks/lib/app.php b/apps/tasks/lib/app.php
index 7b90842033..1b42968f0b 100644
--- a/apps/tasks/lib/app.php
+++ b/apps/tasks/lib/app.php
@@ -180,6 +180,7 @@ class OC_Task_App {
 			$timezone = new DateTimeZone($timezone);
 			$completed = new DateTime($completed, $timezone);
 			$vtodo->setDateTime('COMPLETED', $completed);
+			OCP\Util::emitHook('OC_Task', 'taskCompleted', $vtodo);
 		} else {
 			unset($vtodo->COMPLETED);
 		}

From fb53708d10924ee63749439b0c51029093a04b78 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 25 Jun 2012 20:53:31 +0200
Subject: [PATCH 0639/1537] LDAP: compare base trees case insensitively

---
 apps/user_ldap/lib_ldap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 2940e1d825..21c4e57e29 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -171,7 +171,7 @@ class OC_LDAP {
 	 * returns the internal ownCloud name for the given LDAP DN of the group
 	 */
 	static public function dn2groupname($dn, $ldapname = null) {
-		if(strrpos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
+		if(strripos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
 			return false;
 		}
 		return self::dn2ocname($dn, $ldapname, false);
@@ -186,7 +186,7 @@ class OC_LDAP {
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
 	 */
 	static public function dn2username($dn, $ldapname = null) {
-		if(strrpos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
+		if(strripos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
 			return false;
 		}
 		return self::dn2ocname($dn, $ldapname, true);

From cae089df91bf2ba9413145dc800d9fa77aab08cb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 08:50:13 +0200
Subject: [PATCH 0640/1537] Cache: Create global cache in OC_Cache

---
 lib/cache.php     | 14 ++++++++++++++
 lib/minimizer.php |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/cache.php b/lib/cache.php
index 55d5b064c4..66d1049fb5 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -8,7 +8,21 @@
 
 class OC_Cache {
 	static protected $cache;
+	static protected $global_cache;
 
+	static public function getGlobalCache() {
+		if (!self::$global_cache) {
+			self::$global_cache = new OC_Cache_FileGlobal();
+		}
+		return self::$global_cache;
+	}
+
+	static public function getUserCache() {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache;
+	}
 	static protected function init() {
 		$fast_cache = null;
 		if (!$fast_cache && function_exists('xcache_set')) {
diff --git a/lib/minimizer.php b/lib/minimizer.php
index e17c114f06..2650c579c1 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -22,7 +22,7 @@ abstract class OC_Minimizer {
 		OC_Response::setLastModifiedHeader($last_modified);
 
 		$gzout = false;
-		$cache = new OC_Cache_FileGlobal();
+		$cache = OC_Cache::getGlobalCache();
 		if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
 			$gzout = $cache->get($cache_key.'.gz');
 			OC_Response::setETagHeader(md5($gzout));

From 4e4a1a4274940a9aa7b4c9313d13f8aeb80123ba Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 08:53:17 +0200
Subject: [PATCH 0641/1537] Cache: Use getUserCache cache in OC_Cache

---
 lib/cache.php | 61 ++++++++++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/lib/cache.php b/lib/cache.php
index 66d1049fb5..e6f2beeb30 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -7,7 +7,7 @@
  */
 
 class OC_Cache {
-	static protected $cache;
+	static protected $user_cache;
 	static protected $global_cache;
 
 	static public function getGlobalCache() {
@@ -18,61 +18,48 @@ class OC_Cache {
 	}
 
 	static public function getUserCache() {
-		if (!self::$cache) {
-			self::init();
-		}
-		return self::$cache;
-	}
-	static protected function init() {
-		$fast_cache = null;
-		if (!$fast_cache && function_exists('xcache_set')) {
-			$fast_cache = new OC_Cache_XCache();
-		}
-		if (!$fast_cache && function_exists('apc_store')) {
-			$fast_cache = new OC_Cache_APC();
-		}
-		self::$cache = new OC_Cache_File();
-		if ($fast_cache) {
-			self::$cache = new OC_Cache_Broker($fast_cache, self::$cache);
+		if (!self::$user_cache) {
+			$fast_cache = null;
+			if (!$fast_cache && function_exists('xcache_set')) {
+				$fast_cache = new OC_Cache_XCache();
+			}
+			if (!$fast_cache && function_exists('apc_store')) {
+				$fast_cache = new OC_Cache_APC();
+			}
+			self::$user_cache = new OC_Cache_File();
+			if ($fast_cache) {
+				self::$user_cache = new OC_Cache_Broker($fast_cache, self::$user_cache);
+			}
 		}
+		return self::$user_cache;
 	}
 
 	static public function get($key) {
-		if (!self::$cache) {
-			self::init();
-		}
-		return self::$cache->get($key);
+		$user_cache = self::getUserCache();
+		return $user_cache->get($key);
 	}
 
 	static public function set($key, $value, $ttl=0) {
 		if (empty($key)) {
 			return false;
 		}
-		if (!self::$cache) {
-			self::init();
-		}
-		return self::$cache->set($key, $value, $ttl);
+		$user_cache = self::getUserCache();
+		return $user_cache->set($key, $value, $ttl);
 	}
 
 	static public function hasKey($key) {
-		if (!self::$cache) {
-			self::init();
-		}
-		return self::$cache->hasKey($key);
+		$user_cache = self::getUserCache();
+		return $user_cache->hasKey($key);
 	}
 
 	static public function remove($key) {
-		if (!self::$cache) {
-			self::init();
-		}
-		return self::$cache->remove($key);
+		$user_cache = self::getUserCache();
+		return $user_cache->remove($key);
 	}
 
 	static public function clear() {
-		if (!self::$cache) {
-			self::init();
-		}
-		return self::$cache->clear();
+		$user_cache = self::getUserCache();
+		return $user_cache->clear();
 	}
 
 }

From 531c1c509c32d400f0eebfd436ac608a6b6e35a7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 17:42:50 +0200
Subject: [PATCH 0642/1537] Cache: Add APC and XCache to global cache handler

---
 lib/cache.php        | 10 ++++++++++
 lib/cache/apc.php    | 11 ++++++++++-
 lib/cache/xcache.php | 11 ++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/cache.php b/lib/cache.php
index e6f2beeb30..1f269174fa 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -12,7 +12,17 @@ class OC_Cache {
 
 	static public function getGlobalCache() {
 		if (!self::$global_cache) {
+			$fast_cache = null;
+			if (!$fast_cache && function_exists('xcache_set')) {
+				$fast_cache = new OC_Cache_XCache(true);
+			}
+			if (!$fast_cache && function_exists('apc_store')) {
+				$fast_cache = new OC_Cache_APC(true);
+			}
 			self::$global_cache = new OC_Cache_FileGlobal();
+			if ($fast_cache) {
+				self::$global_cache = new OC_Cache_Broker($fast_cache, self::$global_cache);
+			}
 		}
 		return self::$global_cache;
 	}
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
index b1ce87f526..6cf47d0c15 100644
--- a/lib/cache/apc.php
+++ b/lib/cache/apc.php
@@ -7,11 +7,20 @@
  */
 
 class OC_Cache_APC {
+	protected $prefix;
+
+	public function __construct($global = false) {
+		$this->prefix = OC_Util::getInstanceId().'/';
+		if (!$global) {
+			$this->prefix .= OC_User::getUser().'/';
+		}
+	}
+
 	/**
 	 * entries in APC gets namespaced to prevent collisions between owncloud instances and users
 	 */
 	protected function getNameSpace() {
-		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
+		return $this->prefix;
 	}
 
 	public function get($key) {
diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index b57338929e..bd55cee8f6 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -7,11 +7,20 @@
  */
 
 class OC_Cache_XCache {
+	protected $prefix;
+
+	public function __construct($global = false) {
+		$this->prefix = OC_Util::getInstanceId().'/';
+		if (!$global) {
+			$this->prefix .= OC_User::getUser().'/';
+		}
+	}
+
 	/**
 	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
 	 */
 	protected function getNameSpace() {
-		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
+		return $this->prefix;
 	}
 
 	public function get($key) {

From fe0f281b4fdd4932bde16e84e98c0ea572d3c96e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 17:46:03 +0200
Subject: [PATCH 0643/1537] Fix setting ETag header on cache miss

---
 lib/minimizer.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/minimizer.php b/lib/minimizer.php
index 2650c579c1..3bf5ff9980 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -25,12 +25,15 @@ abstract class OC_Minimizer {
 		$cache = OC_Cache::getGlobalCache();
 		if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
 			$gzout = $cache->get($cache_key.'.gz');
-			OC_Response::setETagHeader(md5($gzout));
+			if ($gzout) {
+				OC_Response::setETagHeader(md5($gzout));
+			}
 		}
 
 		if (!$gzout) {
 			$out = $this->minimizeFiles($files);
 			$gzout = gzencode($out);
+			OC_Response::setETagHeader(md5($gzout));
 			$cache->set($cache_key.'.gz', $gzout);
 		}
 		if ($encoding = OC_Request::acceptGZip()) {

From c6b9f613bb109d4ecfe66e51e7fbf0322f96c2b1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 17:59:06 +0200
Subject: [PATCH 0644/1537] Cache: try to set the fast cache in the Broker

---
 lib/cache/broker.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/cache/broker.php b/lib/cache/broker.php
index 62a7cd96d1..931d0dd407 100644
--- a/lib/cache/broker.php
+++ b/lib/cache/broker.php
@@ -23,15 +23,13 @@ class OC_Cache_Broker {
 	}
 
 	public function set($key, $value, $ttl=0) {
-		$set_slow = strlen($value) > 8192;
-		if ($set_slow) {
+		if (!$this->fast_cache->set($key, $value, $ttl)) {
 			if ($this->fast_cache->hasKey($key)) {
 				$this->fast_cache->remove($key);
 			}
-			$this->slow_cache->set($key, $value, $ttl);
-		} else {
-			$this->fast_cache->set($key, $value, $ttl);
+			return $this->slow_cache->set($key, $value, $ttl);
 		}
+		return true;
 	}
 
 	public function hasKey($key) {

From 103ae6faa455966f01b4476dbe9a7a40a766c8f5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 20:54:15 +0200
Subject: [PATCH 0645/1537] Media: Change includes in app.php to use the
 autoloader

---
 apps/media/appinfo/app.php | 19 ++++++++++++++++---
 apps/media/lib_media.php   | 12 ------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index c5bfc34654..75015d627b 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -22,9 +22,22 @@
 
 $l=OC_L10N::get('media');
 
-require_once('media/lib_media.php');
-require_once('media/lib_collection.php');
-require_once('media/lib_scanner.php');
+OC::$CLASSPATH['OC_MEDIA'] = 'media/lib_media.php';
+OC::$CLASSPATH['OC_MediaSearchProvider'] = 'media/lib_media.php';
+OC::$CLASSPATH['OC_MEDIA_COLLECTION'] = 'media/lib_collection.php';
+OC::$CLASSPATH['OC_MEDIA_SCANNER'] = 'media/lib_scanner.php';
+
+//we need to have the sha256 hash of passwords for ampache
+OCP\Util::connectHook('OC_User','post_login','OC_MEDIA','loginListener');
+
+//connect to the filesystem for auto updating
+OCP\Util::connectHook('OC_Filesystem','post_write','OC_MEDIA','updateFile');
+
+//listen for file deletions to clean the database if a song is deleted
+OCP\Util::connectHook('OC_Filesystem','post_delete','OC_MEDIA','deleteFile');
+
+//list for file moves to update the database
+OCP\Util::connectHook('OC_Filesystem','post_rename','OC_MEDIA','moveFile');
 
 OCP\Util::addscript('media','loader');
 OCP\App::registerPersonal('media','settings');
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 71069fdf4b..9e687a4af2 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -21,18 +21,6 @@
 * 
 */
 
-//we need to have the sha256 hash of passwords for ampache
-OCP\Util::connectHook('OC_User','post_login','OC_MEDIA','loginListener');
-
-//connect to the filesystem for auto updating
-OCP\Util::connectHook('OC_Filesystem','post_write','OC_MEDIA','updateFile');
-
-//listen for file deletions to clean the database if a song is deleted
-OCP\Util::connectHook('OC_Filesystem','post_delete','OC_MEDIA','deleteFile');
-
-//list for file moves to update the database
-OCP\Util::connectHook('OC_Filesystem','post_rename','OC_MEDIA','moveFile');
-
 class OC_MEDIA{
 	/**
 	 * get the sha256 hash of the password needed for ampache

From b384d79bf88b2a29d77e1f909da6d4ee8b110e07 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 23:31:35 +0200
Subject: [PATCH 0646/1537] Remove x-scrollbar from contacts list.

---
 apps/contacts/css/contacts.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 143fdae80e..a6ac55ca8e 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -8,7 +8,8 @@
 #leftcontent h3:hover,#leftcontent h3:active,#leftcontent h3.active { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
 #contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
-.contacts li.ui-draggable { height: 23px; width: 20em; }
+.contacts li.ui-draggable { height: 23px; }
+.ui-draggable-dragging { width: 16em; }
 .ui-state-hover { border: 1px solid dashed; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
@@ -18,7 +19,7 @@
 #contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
 #contacts_propertymenu { clear: both; max-width: 15em; margin: 2em; }
 #contacts_propertymenu_button { position:relative;top:0;left:0; margin: 0; }
-#contacts_propertymenu_dropdown { background-color: #fff; position:relative; right:0; overflow:hidden; text-overflow:ellipsis; /*border: thin solid #1d2d44;*/  -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000; box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
+#contacts_propertymenu_dropdown { background-color: #fff; position:relative; right:0; overflow:hidden; text-overflow:ellipsis; border: thin solid #1d2d44; box-shadow: 0 3px 5px #bbb; /* -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000;  box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em;*/ border-radius: 3px; }
 #contacts_propertymenu li { display: block; font-weight: bold; height: 20px; }
 #contacts_propertymenu li a { padding: 3px; display: block }
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
@@ -32,7 +33,7 @@
 #card input[type="text"],input[type="email"],input[type="url"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
 #card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="url"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="url"]:active,input[type="tel"]:active, select:hover, select:focus, select:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
 textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
-dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; }
+dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
 .form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }
 .form dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0px; white-space: nowrap; vertical-align: text-bottom; }
 label:hover, dt:hover { color: #333; }

From ac4e19218e526d94be8551711a2f1f25d0eea429 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 02:47:59 +0200
Subject: [PATCH 0647/1537] All is good ;-)

---
 lib/preferences.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/preferences.php b/lib/preferences.php
index 89fc73aa23..f72378ce94 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -150,6 +150,7 @@ class OC_Preferences{
 			$query = OC_DB::prepare( 'UPDATE *PREFIX*preferences SET configvalue = ? WHERE userid = ? AND appid = ? AND configkey = ?' );
 			$query->execute( array( $value, $user, $app, $key ));
 		}
+		return true;
 	}
 
 	/**

From 8df59852a46b50a8ac0984a4500954dba2725d9b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 04:09:45 +0200
Subject: [PATCH 0648/1537] Adjust pic width a bit.

---
 apps/contacts/css/contacts.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index a6ac55ca8e..1766c28761 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -73,7 +73,7 @@ label:hover, dt:hover { color: #333; }
 .contactsection { position: relative; float: left; /*max-width: 40em;*/ padding: 0.5em; height: auto: border: thin solid lightgray;/* -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; border-radius: 0.5em; background-color: #f8f8f8;*/ }
 
 #cropbox { margin: auto; }
-#contacts_details_photo_wrapper { min-width: 80px; }
+#contacts_details_photo_wrapper { min-width: 120px; }
 #contacts_details_photo_wrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background: url('%webroot%/core/img/loading.gif') no-repeat center center; cursor: wait; }
 #contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
 #contacts_details_photo:hover { background: #fff; cursor: default; }

From bf756293c62ceb63a4bad7491d9fc90e3c6c9af0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 05:26:50 +0200
Subject: [PATCH 0649/1537] Added signals.

---
 apps/contacts/lib/hooks.php | 9 +++++++++
 apps/contacts/lib/vcard.php | 9 +++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index e74b465a47..0a920fc519 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -20,6 +20,15 @@
  *
  */
 
+/**
+ * The following signals are being emitted:
+ * 
+ * OC_Contacts_VCard::post_moveToAddressbook(array('aid' => $aid, 'id' => $id))
+ * OC_Contacts_VCard::pre_deleteVCard(array('aid' => $aid, 'id' => $id, 'uri' = $uri)); (NOTE: the values can be null depending on which method emits them)
+ * OC_Contacts_VCard::post_updateVCard($id)
+ * OC_Contacts_VCard::post_createVCard($newid)
+ */
+
 /**
  * This class contains all hooks.
  */
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 110d721ace..0f3a08844b 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -293,7 +293,7 @@ class OC_Contacts_VCard{
 		$newid = OCP\DB::insertid('*PREFIX*contacts_cards');
 
 		OC_Contacts_Addressbook::touch($aid);
-
+		OC_Hook::emit('OC_Contacts_VCard', 'post_createVCard', $newid);
 		return $newid;
 	}
 
@@ -360,7 +360,7 @@ class OC_Contacts_VCard{
 		$result = $stmt->execute(array($fn,$data,time(),$id));
 
 		OC_Contacts_Addressbook::touch($oldcard['addressbookid']);
-
+		OC_Hook::emit('OC_Contacts_VCard', 'post_updateVCard', $id);
 		return true;
 	}
 
@@ -388,6 +388,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function delete($id){
 		// FIXME: Add error checking.
+		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => null, 'id' => $id, 'uri' => null));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
 		$stmt->execute(array($id));
 
@@ -402,6 +403,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function deleteFromDAVData($aid,$uri){
 		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
+		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uid));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
 		$stmt->execute(array($aid,$uri));
 		OC_Contacts_Addressbook::touch($aid);
@@ -559,9 +561,8 @@ class OC_Contacts_VCard{
 				return false;
 			}
 		}
-
+		OC_Hook::emit('OC_Contacts_VCard', 'post_moveToAddressbook', array('aid' => $aid, 'id' => $id));
 		OC_Contacts_Addressbook::touch($aid);
 		return true;
 	}
-
 }

From 18d542074499445731c1754d697fc8b51665bbff Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 10:35:19 +0200
Subject: [PATCH 0650/1537] typo in js statement fixed

---
 core/js/multiselect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 5f339006d2..db5afa637c 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -136,7 +136,7 @@
 							var option=$('<option selected="selected"/>');
 							option.attr('value',$(this).val());
 							option.text($(this).val());
-							select.append(optione);
+							select.append(options);
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
 							if(settings.createCallback){

From 72b365842f03d01e1479578ae36f5074d793e702 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 12:51:32 +0200
Subject: [PATCH 0651/1537] bugfix for #1098 (assigning a group to a user, the
 group appears incrementally many times the more you assign it)

---
 settings/js/users.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/js/users.js b/settings/js/users.js
index f173357749..0de0d1df3b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -213,5 +213,6 @@ $(document).ready(function(){
 				}
 			}
 		);
+	    location.reload();
 	});
 });

From 9cb01bd0931dc081c27906897af0235f9746a9ef Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 14:27:50 +0200
Subject: [PATCH 0652/1537] xss fix

---
 apps/files_texteditor/js/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 9d168c1c4f..70bb74a910 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -67,7 +67,7 @@ function setSyntaxMode(ext){
 function showControls(filename,writeperms){
 	// Loads the control bar at the top.
 	// Load the new toolbar.
-	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename+'</p></div>';
+	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename.replace(/</, "&lt;").replace(/>/, "&gt;")+'</p></div>';
 	if(writeperms=="true"){
 		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
 	}

From b9ce4e1f406f1ee57d58b409c368a89aa9ddde9a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 26 Jun 2012 15:20:29 +0200
Subject: [PATCH 0653/1537] add OC_Calendar_Object::createUID()

---
 apps/calendar/lib/object.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 7f3322b1ab..0531a56fc5 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -216,6 +216,14 @@ class OC_Calendar_Object{
 
 		return true;
 	}
+	
+	/**
+     * @brief Creates a UID
+     * @return string
+     */
+    protected static function createUID(){
+        return substr(md5(rand().time()),0,10);
+    }
 
 	/**
 	 * @brief Extracts data from a vObject-Object

From 46e93168cdacdf49552f39a548d99a4a04f6ca30 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 16:06:31 +0200
Subject: [PATCH 0654/1537] Fix variable name.

---
 apps/contacts/lib/vcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 0f3a08844b..22c546b2c4 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -403,7 +403,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function deleteFromDAVData($aid,$uri){
 		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
-		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uid));
+		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uri));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
 		$stmt->execute(array($aid,$uri));
 		OC_Contacts_Addressbook::touch($aid);

From db115429f7d0968b415a0abba51fe61a4ead94a4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 17:35:58 +0200
Subject: [PATCH 0655/1537] Added createUser hook.

---
 apps/contacts/appinfo/app.php |  1 +
 apps/contacts/lib/hooks.php   | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 7a04ec7ff5..64fe00eef1 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -5,6 +5,7 @@ OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
 OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
+OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Contacts_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
 OCP\Util::connectHook('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
 OCP\Util::connectHook('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 0a920fc519..9794a9c9b9 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -33,6 +33,16 @@
  * This class contains all hooks.
  */
 class OC_Contacts_Hooks{
+	/**
+	 * @brief Add default Addressbooks of a certain user
+	 * @param paramters parameters from postDeleteUser-Hook
+	 * @return array
+	 */
+	static public function createUser($parameters) {
+		OC_Contacts_Addressbook::addDefault($parameters['uid'],'default','Default Address Book');
+		return true;
+	}
+	
 	/**
 	 * @brief Deletes all Addressbooks of a certain user
 	 * @param paramters parameters from postDeleteUser-Hook

From d8b181cd844401ee8587bac99a101fcc532fcacf Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 17:54:00 +0200
Subject: [PATCH 0656/1537] Added error checking on all db queries.

---
 apps/contacts/index.php           |   3 +
 apps/contacts/lib/addressbook.php |  99 ++++++++++++++++++++++-------
 apps/contacts/lib/vcard.php       | 101 ++++++++++++++++++++++--------
 3 files changed, 152 insertions(+), 51 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index f6b37409ea..0b4f89b30c 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -15,6 +15,9 @@ OCP\App::checkAppEnabled('contacts');
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
 $contacts = OC_Contacts_VCard::all($ids);
+if($contacts === false) {
+	OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG);
+}
 
 $addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
 
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 878d8835f9..86a41b18cf 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -41,11 +41,18 @@ class OC_Contacts_Addressbook{
 	/**
 	 * @brief Returns the list of addressbooks for a specific user.
 	 * @param string $uid
-	 * @return array
+	 * @return array or false.
 	 */
 	public static function all($uid){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
-		$result = $stmt->execute(array($uid));
+		try {
+			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
+			$result = $stmt->execute(array($uid));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' uid: '.$uid,OCP\Util::DEBUG);
+			return false;
+		}
+
 
 		$addressbooks = array();
 		while( $row = $result->fetchRow()){
@@ -68,15 +75,36 @@ class OC_Contacts_Addressbook{
 	/**
 	 * @brief Gets the data of one address book
 	 * @param integer $id
-	 * @return associative array
+	 * @return associative array or false.
 	 */
 	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
-		$result = $stmt->execute(array($id));
+		try {
+			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
+			$result = $stmt->execute(array($id));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id,OCP\Util::DEBUG);
+			return false;
+		}
 
 		return $result->fetchRow();
 	}
 
+	/**
+	 * @brief Adds default address book
+	 * @return $id ID of the newly created addressbook or false on error.
+	 */
+	public static function addDefault($uid = null){
+		if(is_null($uid)) {
+			$uid = OCP\USER::getUser();
+		}
+		$id = self::add($uid,'default','Default Address Book');
+		if($id !== false) {
+			self::setActive($id, true);
+		}
+		return $id;
+	}
+	
 	/**
 	 * @brief Creates a new address book
 	 * @param string $userid
@@ -84,17 +112,22 @@ class OC_Contacts_Addressbook{
 	 * @param string $description
 	 * @return insertid
 	 */
-	public static function add($userid,$name,$description=''){
-		$all = self::all($userid);
+	public static function add($uid,$name,$description=''){
+		$all = self::all($uid);
 		$uris = array();
 		foreach($all as $i){
 			$uris[] = $i['uri'];
 		}
 
 		$uri = self::createURI($name, $uris );
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
-		$result = $stmt->execute(array($userid,$name,$uri,$description,1));
+		try {
+			$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
+			$result = $stmt->execute(array($uid,$name,$uri,$description,1));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uid: '.$uid,OCP\Util::DEBUG);
+			return false;
+		}
 
 		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
 	}
@@ -105,13 +138,20 @@ class OC_Contacts_Addressbook{
 	 * @param string $uri
 	 * @param string $name
 	 * @param string $description
-	 * @return insertid
+	 * @return insertid or false
 	 */
 	public static function addFromDAVData($principaluri,$uri,$name,$description){
-		$userid = self::extractUserID($principaluri);
+		$uid = self::extractUserID($principaluri);
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
-		$result = $stmt->execute(array($userid,$name,$uri,$description,1));
+		try {
+			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)');
+			$result = $stmt->execute(array($uid,$name,$uri,$description,1));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uid: '.$uid,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uri: '.$uri,OCP\Util::DEBUG);
+			return false;
+		}
 
 		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
 	}
@@ -134,8 +174,14 @@ class OC_Contacts_Addressbook{
 			$description = $addressbook['description'];
 		}
 
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET displayname=?,description=?, ctag=ctag+1 WHERE id=?' );
-		$result = $stmt->execute(array($name,$description,$id));
+		try {
+			$stmt = OCP\DB::prepare('UPDATE *PREFIX*contacts_addressbooks SET displayname=?,description=?, ctag=ctag+1 WHERE id=?');
+			$result = $stmt->execute(array($name,$description,$id));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id,OCP\Util::DEBUG);
+			return false;
+		}
 
 		return true;
 	}
@@ -172,8 +218,7 @@ class OC_Contacts_Addressbook{
 		if(!$prefbooks){
 			$addressbooks = OC_Contacts_Addressbook::all($uid);
 			if(count($addressbooks) == 0){
-				$id = OC_Contacts_Addressbook::add($uid,'default','Default Address Book');
-				self::setActive($id, true);
+				self::addDefault($uid);
 			}
 		}
 		$prefbooks = OCP\Config::getUserValue($uid,'contacts','openaddressbooks',null);
@@ -186,6 +231,9 @@ class OC_Contacts_Addressbook{
 	 * @return array
 	 */
 	public static function active($uid){
+		if(is_null($uid)){
+			$uid = OCP\USER::getUser();
+		}
 		$active = self::activeIds($uid);
 		$addressbooks = array();
 		$ids_sql = join(',', array_fill(0, count($active), '?'));
@@ -194,15 +242,18 @@ class OC_Contacts_Addressbook{
 			$stmt = OCP\DB::prepare( $prep );
 			$result = $stmt->execute($active);
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OCP\Util::DEBUG);
-			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uid: '.$uid,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '.join(',', $active),OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', SQL:'.$prep,OCP\Util::DEBUG);
 		}
 
 		while( $row = $result->fetchRow()){
 			$addressbooks[] = $row;
 		}
-
+		if(!count($addressbooks)) {
+			self::addDefault($uid);
+		}
 		return $addressbooks;
 	}
 
@@ -260,7 +311,7 @@ class OC_Contacts_Addressbook{
 			$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
 			$stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:delete:, exception for '.$id.': '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(),OCP\Util::ERROR);
 			return false;
 		}
 		
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 22c546b2c4..bf22be0de7 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -42,32 +42,37 @@ class OC_Contacts_VCard{
 	/**
 	 * @brief Returns all cards of an address book
 	 * @param integer $id
-	 * @return array
+	 * @return array|false
 	 *
 	 * The cards are associative arrays. You'll find the original vCard in
 	 * ['carddata']
 	 */
 	public static function all($id){
 		$result = null;
-		if(is_array($id)) {
+		if(is_array($id) && count($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
 			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname';
 			try {
 				$stmt = OCP\DB::prepare( $prep );
 				$result = $stmt->execute($id);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts','SQL:'.$prep,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '.join(',', $id),OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.'SQL:'.$prep,OCP\Util::DEBUG);
+				return false;
 			}
-		} elseif($id) {
+		} elseif(is_int($id) || is_string($id)) {
 			try {
 				$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
 				$result = $stmt->execute(array($id));
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all, ids: '. $id,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '. $id,OCP\Util::DEBUG);
+				return false;
 			}
+		} else {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.'. Addressbook id(s) argument is empty: '. $id,OCP\Util::DEBUG);
+			return false;
 		}
 		$cards = array();
 		if(!is_null($result)) {
@@ -82,11 +87,17 @@ class OC_Contacts_VCard{
 	/**
 	 * @brief Returns a card
 	 * @param integer $id
-	 * @return associative array
+	 * @return associative array or false.
 	 */
 	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE id = ?' );
-		$result = $stmt->execute(array($id));
+		try {
+			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE id = ?' );
+			$result = $stmt->execute(array($id));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '. $id,OCP\Util::DEBUG);
+			return false;
+		}
 
 		return $result->fetchRow();
 	}
@@ -95,11 +106,17 @@ class OC_Contacts_VCard{
 	 * @brief finds a card by its DAV Data
 	 * @param integer $aid Addressbook id
 	 * @param string $uri the uri ('filename')
-	 * @return associative array
+	 * @return associative array or false.
 	 */
 	public static function findWhereDAVDataIs($aid,$uri){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
-		$result = $stmt->execute(array($aid,$uri));
+		try {
+			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
+			$result = $stmt->execute(array($aid,$uri));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
+			return false;
+		}
 
 		return $result->fetchRow();
 	}
@@ -149,7 +166,13 @@ class OC_Contacts_VCard{
 	protected static function trueUID($aid, &$uid) {
 		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
 		$uri = $uid.'.vcf';
-		$result = $stmt->execute(array($aid,$uri));
+		try {
+			$result = $stmt->execute(array($aid,$uri));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uid'.$uid, OCP\Util::DEBUG);
+			return false;
+		}
 		if($result->numRows() > 0){
 			while(true) {
 				$tmpuid = substr(md5(rand().time()),0,10);
@@ -254,7 +277,7 @@ class OC_Contacts_VCard{
 	 * @param integer $aid Addressbook id
 	 * @param OC_VObject $card  vCard file
 	 * @param string $uri the uri of the card, default based on the UID
-	 * @return insertid on success or null if no card.
+	 * @return insertid on success or false.
 	 */
 	public static function add($aid, OC_VObject $card, $uri=null, $isnew=false){
 		if(is_null($card)){
@@ -289,7 +312,13 @@ class OC_Contacts_VCard{
 
 		$data = $card->serialize();
 		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
-		$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
+		try {
+			$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
+			return false;
+		}
 		$newid = OCP\DB::insertid('*PREFIX*contacts_cards');
 
 		OC_Contacts_Addressbook::touch($aid);
@@ -325,8 +354,8 @@ class OC_Contacts_VCard{
 					$result = $stmt->execute(array($data,time(),$object[0]));
 					//OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0].': '.$object[1],OCP\Util::DEBUG);
 				} catch(Exception $e) {
-					OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
-					OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0],OCP\Util::DEBUG);
+					OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+					OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$object[0],OCP\Util::DEBUG);
 				}
 			}
 		}
@@ -357,7 +386,13 @@ class OC_Contacts_VCard{
 
 		$data = $card->serialize();
 		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET fullname = ?,carddata = ?, lastmodified = ? WHERE id = ?' );
-		$result = $stmt->execute(array($fn,$data,time(),$id));
+		try {
+			$result = $stmt->execute(array($fn,$data,time(),$id));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id'.$id, OCP\Util::DEBUG);
+			return false;
+		}
 
 		OC_Contacts_Addressbook::touch($oldcard['addressbookid']);
 		OC_Hook::emit('OC_Contacts_VCard', 'post_updateVCard', $id);
@@ -390,7 +425,13 @@ class OC_Contacts_VCard{
 		// FIXME: Add error checking.
 		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => null, 'id' => $id, 'uri' => null));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
-		$stmt->execute(array($id));
+		try {
+			$stmt->execute(array($id));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
+			return false;
+		}
 
 		return true;
 	}
@@ -405,7 +446,13 @@ class OC_Contacts_VCard{
 		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
 		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uri));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
-		$stmt->execute(array($aid,$uri));
+		try {
+			$stmt->execute(array($aid,$uri));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri: '.$uri, OCP\Util::DEBUG);
+			return false;
+		}
 		OC_Contacts_Addressbook::touch($aid);
 
 		return true;
@@ -546,9 +593,9 @@ class OC_Contacts_VCard{
 				$vals = array_merge((array)$aid, $id);
 				$result = $stmt->execute($vals);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook, ids: '.join(',', $vals),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts','SQL:'.$prep,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '.join(',', $vals),OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', SQL:'.$prep,OCP\Util::DEBUG);
 				return false;
 			}
 		} else {
@@ -556,8 +603,8 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
 				$result = $stmt->execute(array($aid, $id));
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook, id: '.$id,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' id: '.$id,OCP\Util::DEBUG);
 				return false;
 			}
 		}

From 1b2d09f9ca3e23abbb368f44b63df4133bbb4d6b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 18:04:22 +0200
Subject: [PATCH 0657/1537] Added missing requesttoken.

---
 apps/contacts/ajax/loadcard.php | 2 ++
 apps/contacts/js/contacts.js    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index fbb831f4a1..1309faaa7a 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -27,6 +27,7 @@ OCP\JSON::checkAppEnabled('contacts');
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+$requesttoken = $_GET['requesttoken'];
 
 $freeSpace=OC_Filesystem::free_space('/');
 $freeSpace=max($freeSpace,0);
@@ -41,6 +42,7 @@ $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesi
 $tmpl->assign('adr_types',$adr_types);
 $tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('email_types',$email_types);
+$tmpl->assign('requesttoken', $requesttoken);
 $tmpl->assign('id','');
 $page = $tmpl->fetchPage();
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 036734049b..204fe18a52 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -315,6 +315,7 @@ Contacts={
 			},
 			add:function(n, fn, aid, isnew){ // add a new contact
 				aid = aid?aid:$('#contacts h3.active').first().data('id');
+				console.log('add() aid: ' + aid);
 				var localAddcontact = function(n, fn, aid, isnew) {
 					$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
 					function(jsondata) {
@@ -359,7 +360,7 @@ Contacts={
 			
 				var card = $('#card')[0];
 				if(!card) {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{},function(jsondata){
+					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
 						if(jsondata.status == 'success'){
 							$('#rightcontent').html(jsondata.data.page).ready(function() {
 								Contacts.UI.loadHandlers();

From cad282b73f48b696e078c38abde3e3ec1bea691f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 26 Jun 2012 18:14:59 +0200
Subject: [PATCH 0658/1537] Added some error checking.

---
 apps/contacts/js/contacts.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 204fe18a52..64b7af850e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -258,6 +258,9 @@ Contacts={
 					newid = id;
 					bookid = bookid?bookid:$('#contacts li[data-id="'+newid+'"]').data('bookid');
 				}
+				if(!bookid) {
+					bookid = $('#contacts h3').first().data('id');
+				}
 				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
 						$('#contacts li[data-id="'+newid+'"]').addClass('active');
@@ -315,7 +318,6 @@ Contacts={
 			},
 			add:function(n, fn, aid, isnew){ // add a new contact
 				aid = aid?aid:$('#contacts h3.active').first().data('id');
-				console.log('add() aid: ' + aid);
 				var localAddcontact = function(n, fn, aid, isnew) {
 					$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
 					function(jsondata) {
@@ -1567,6 +1569,8 @@ Contacts={
 									scroll: true, scrollSensitivity: 100,
 									opacity: 0.7, helper: 'clone'
 								});
+							} else {
+								$('#contacts h3').first().addClass('active');
 							}
 						});
 						Contacts.UI.Card.update(id);

From f55f13eebc3c3f15e74a7026a058ffaa5079f0e3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 26 Jun 2012 14:48:51 -0400
Subject: [PATCH 0659/1537] Don't call getLocalFile() until you know it
 actually is music

---
 apps/media/lib_scanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index a8218c3a4d..3c32879eee 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -61,7 +61,6 @@ class OC_MEDIA_SCANNER{
 	 * @return boolean
 	 */
 	public static function scanFile($path){
-		$file=OC_Filesystem::getLocalFile($path);
 		if(!self::isMusic($path)){
 			return;
 		}
@@ -69,6 +68,7 @@ class OC_MEDIA_SCANNER{
 			self::$getID3=@new getID3();
 			self::$getID3->encoding='UTF-8';
 		}
+		$file=OC_Filesystem::getLocalFile($path);
 		$data=@self::$getID3->analyze($file);
 		getid3_lib::CopyTagsToComments($data);
 		if(!isset($data['comments'])){

From a25ae4b4b66e54e627912e5691f01da998f17029 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 27 Jun 2012 01:03:18 +0200
Subject: [PATCH 0660/1537] Make Categories a bit quieter.

---
 lib/vcategories.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/vcategories.php b/lib/vcategories.php
index 1e79b62f0d..8157c34386 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -55,7 +55,7 @@ class OC_VCategories {
 		$this->app = $app;
 		$this->user = is_null($user) ? OC_User::getUser() : $user;
 		$categories = trim(OC_Preferences::getValue($this->user, $app, self::PREF_CATEGORIES_LABEL, ''));
-		$this->categories = $categories != '' ? unserialize($categories) : $defcategories;
+		$this->categories = $categories != '' ? @unserialize($categories) : $defcategories;
 	}
 
 	/**
@@ -64,6 +64,9 @@ class OC_VCategories {
 	*/
 	public function categories() {
 		//OC_Log::write('core','OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG);
+		if(!$this->categories) {
+			return array();
+		}
 		usort($this->categories, 'strnatcasecmp'); // usort to also renumber the keys
 		return $this->categories;
 	}
@@ -203,11 +206,17 @@ class OC_VCategories {
 
 	// case-insensitive in_array
 	private function in_arrayi($needle, $haystack) {
+		if(!is_array($haystack)) {
+			return false;
+		}
 		return in_array(strtolower($needle), array_map('strtolower', $haystack));
 	}
 
 	// case-insensitive array_search
 	private function array_searchi($needle, $haystack) {
+		if(!is_array($haystack)) {
+			return false;
+		}
 		return array_search(strtolower($needle),array_map('strtolower',$haystack)); 
 	}
 

From 2f0b4983e9019bb4a129f5578cf0a3ced1dab4d7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 26 Jun 2012 20:41:11 +0200
Subject: [PATCH 0661/1537] Move app upgrade check to loading of apps

---
 lib/app.php  | 24 ++++++++++--------------
 lib/base.php |  4 ++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index b337c55ec6..be17beeacc 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -84,6 +84,7 @@ class OC_App{
 	 */
 	public static function loadApp($app){
 		if(is_file(self::getAppPath($app).'/appinfo/app.php')){
+			self::checkUpgrade($app);
 			require_once( $app.'/appinfo/app.php' );
 		}
 	}
@@ -526,22 +527,17 @@ class OC_App{
 	}
 
 	/**
-	 * check if any apps need updating and update those
+	 * check if the app need updating and update when needed
 	 */
-	public static function updateApps(){
+	public static function checkUpgrade($app) {
 		$versions = self::getAppVersions();
-		//ensure files app is installed for upgrades
-		if(!isset($versions['files'])){
-			$versions['files']='0';
-		}
-		foreach( $versions as $app=>$installedVersion ){
-			$currentVersion=OC_App::getAppVersion($app);
-			if ($currentVersion) {
-				if (version_compare($currentVersion, $installedVersion, '>')) {
-					OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion,OC_Log::DEBUG);
-					OC_App::updateApp($app);
-					OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
-				}
+		$currentVersion=OC_App::getAppVersion($app);
+		if ($currentVersion) {
+			$installedVersion = $versions[$app];
+			if (version_compare($currentVersion, $installedVersion, '>')) {
+				OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion,OC_Log::DEBUG);
+				OC_App::updateApp($app);
+				OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
 			}
 		}
 	}
diff --git a/lib/base.php b/lib/base.php
index b4da6434e2..11e63e208e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -208,9 +208,9 @@ class OC{
 
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 				OC_App::checkAppsRequirements();
+				// load all apps to also upgrade enabled apps
+				OC_App::loadApps();
 			}
-
-			OC_App::updateApps();
 		}
 	}
 

From dab58f3464ec8aded5e0da4b050e5ee3d0bc5cfc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 26 Jun 2012 20:53:28 +0200
Subject: [PATCH 0662/1537] Cache result of OC_App::getAppVersions

---
 lib/app.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index be17beeacc..a9feff1620 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -567,6 +567,10 @@ class OC_App{
 	 * get the installed version of all papps
 	 */
 	public static function getAppVersions(){
+		static $versions;
+		if (isset($versions)) {   // simple cache, needs to be fixed
+			return $versions; // when function is used besides in checkUpgrade
+		}
 		$versions=array();
 		$query = OC_DB::prepare( 'SELECT appid, configvalue FROM *PREFIX*appconfig WHERE configkey = \'installed_version\'' );
 		$result = $query->execute();

From 153ee9dcfa62fa7efaf365890884c516d8bc11a1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 26 Jun 2012 22:24:16 +0200
Subject: [PATCH 0663/1537] Check if app is enabled before loading in remote
 and public.php

---
 public.php |  1 +
 remote.php | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/public.php b/public.php
index 19c02a7a02..8846769f46 100644
--- a/public.php
+++ b/public.php
@@ -10,6 +10,7 @@ if(is_null($file)){
 
 $parts=explode('/',$file,2);
 $app=$parts[0];
+OC_Util::checkAppEnabled($app);
 OC_App::loadApp($app);
 
 require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
diff --git a/remote.php b/remote.php
index e68a53800c..af48cd922c 100644
--- a/remote.php
+++ b/remote.php
@@ -27,13 +27,24 @@ $file = ltrim ($file, '/');
 
 if(count(explode('/',$file)) == 2) {
 	$parts=explode('/',$file);
-	$app=$parts[1];
-	OC_App::loadApp($app);
+	$app=$parts[0];
+	switch ($app) {
+		case 'files':
+			OC_Util::checkAppEnabled($app);
+			OC_App::loadApp($app);
+			break;
+		case 'core':
+			break;
+		default:
+			OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+			exit;
+	}
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
 	require_once( OC::$SERVERROOT.'/'.$file);
 } else {
 	$parts=explode('/', $file, 2);
 	$app=$parts[0];
+	OC_Util::checkAppEnabled($app);
 	OC_App::loadApp($app);
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
 	require_once(OC_App::getAppPath($app) .'/'. $parts[1]);

From 0cc7ae904d046501cc7335bdcdd49f24cf237192 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 15 Jun 2012 20:52:56 -0400
Subject: [PATCH 0664/1537] Initial work on a share API

---
 lib/public/share.php | 673 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 673 insertions(+)
 create mode 100644 lib/public/share.php

diff --git a/lib/public/share.php b/lib/public/share.php
new file mode 100644
index 0000000000..38a23b4385
--- /dev/null
+++ b/lib/public/share.php
@@ -0,0 +1,673 @@
+<?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/>.
+*/
+
+namespace OCP;
+
+/**
+* This class provides the ability for apps to share their content between users.
+* Apps must create a backend class that extends OCP\Share_Backend and register it with this class.
+*/
+class Share {
+
+	const SHARETYPE_USER = 0;
+	const SHARETYPE_GROUP = 1;
+	const SHARETYPE_CONTACT = 2;
+	const SHARETYPE_PRIVATE_LINK = 3;
+
+	const PERMISSION_READ = 0;
+	const PERMISSION_UPDATE = 1;
+	const PERMISSION_DELETE = 2;
+	const PERMISSION_SHARE = 3;
+	
+	private static $backendTypes = array();
+	private static $backends = array();
+	private static $sharedFolder = '/Shared/';
+
+	/**
+	* @brief Register a sharing backend class that extends OCP\Share_Backend for an item type
+	* @param string Class
+	* @param string Item type
+	* @param string (optional) Depends on item type
+	* @param array (optional) List of supported file extensions if this item type depends on files
+	* @return Returns true if backend is registered or false if error
+	*/
+	public static function registerBackend($class, $itemType, $dependsOn = null, $supportedFileExtensions = null) {
+		if (is_subclass_of($class, 'OCP\Share_Backend')) {
+			if (!isset(self::$backendTypes[$itemType])) {
+				self::$backendTypes[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
+				return true;
+			} else {
+				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
+				return false;
+			}
+		}
+		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, the class must extend abstract class OC_Share_Backend', \OC_Log::ERROR);
+		return false;
+	}
+
+	/**
+	* @brief Get the items of item type shared with the current user
+	* @param string Item type
+	* @return
+	*/
+	public static function getItemsSharedWith($itemType) {
+		return self::getItems($itemType, null, \OC_User::getUser(), true, null, true);
+	}
+
+	/**
+	* @brief Get the item of item type shared with the current user
+	* @param string Item type
+	* @return
+	*/
+	public static function getItemSharedWith($itemType, $item) {
+		return self::getItems($itemType, $item, \OC_User::getUser(), true, null, true, 1);
+	}
+
+	/**
+	* @brief Get the shared items of item type owned by the current user
+	* @param string Item type
+	* @return The
+	*/
+	public static function getItemsOwned($itemType) {
+		return self::getItems($itemType, null, null, null, \OC_User::getUser(), true);
+	}
+
+	/**
+	* @brief Get the shared item of item type owned by the current user
+	* @param string Item type
+	* @return The
+	*/
+	public static function getItemOwned($itemType, $item) {
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), true, 1);
+	}
+
+	/**
+	* @brief Share an item with a user, group, or via private link
+	* @param string Item type
+	* @param string Item
+	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
+	* @param string User or group the item is being shared with
+	* @param string
+	* @return Returns true on success or false on failure
+	*/
+	public static function share($itemType, $item, $shareType, $shareWith, $permissions) {
+		$uidOwner = \OC_User::getUser();
+		// Verify share type and sharing conditions are met
+		switch ($shareType) {
+			case self::SHARETYPE_USER:
+				if ($shareWith == $uidOwner) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner', \OC_Log::ERROR);
+					return false;
+				}
+				if (!\OC_User::userExists($shareWith)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' does not exist', \OC_Log::ERROR);
+					return false;
+				} else {
+					$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
+					if (empty($inGroup)) {
+						\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of', \OC_Log::ERROR);
+						return false;
+					}
+				}
+				if (self::getItems($itemType, $item, $shareWith, true, $uidOwner, false, 1)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
+					return false;
+				}
+				$uidSharedWith = array($shareWith);
+				$gidSharedWith = null;
+				break;
+			case self::SHARETYPE_GROUP:
+				if (!\OC_Group::groupExists($shareWith)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the group '.$shareWith.' does not exist', \OC_Log::ERROR);
+					return false;
+				} else if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
+					return false;
+				}
+				if (self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
+					return false;
+				}
+				$uidSharedWith = array_diff(\OC_Group::usersInGroup($shareWith), array($uidOwner));
+				$gidSharedWith = $shareWith;
+				break;
+			case self::SHARETYPE_PRIVATE_LINK:
+				// TODO don't loop through folder conversion
+				$uidSharedWith = '';
+				$gidSharedWith = null;
+			default:
+				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
+				return false;
+		}
+		// If the item is a folder, scan through the folder looking for equivalent item types
+		if ($itemType == 'folder') {
+			$parentFolder = self::put('folder', $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, true);
+			if ($parentFolder && $files = \OC_Files::getDirectoryContent($item)) {
+				for ($i = 0; $i < count($files); $i++) {
+					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $item) - strlen($item));
+					if ($files[$i]['mimetype'] == 'httpd/unix-directory' && $children = OC_Files::getDirectoryContent($name, '/')) {
+						// Continue scanning into child folders
+						array_push($files, $children);
+					} else {
+						// Pass on to put() to check if this item should be converted, the item won't be inserted into the database unless it can be converted
+						self::put('file', $name, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, $parentFolder);
+					}
+				}
+				return $return;
+			}
+			return false;
+		} else {
+			// Put the item into the database
+			return self::put($itemType, $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions);
+		}
+	}
+
+	/**
+	* @brief Unshare an item from a user, group, or delete a private link
+	* @param string Item type
+	* @param string Item
+	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
+	* @param string User or group the item is being shared with
+	* @return Returns true on success or false on failure
+	*/
+	public static function unshare($itemType, $item, $shareType, $shareWith) {
+		$uidOwner = \OC_User::getUser();
+		switch ($shareType) {
+			case self::SHARETYPE_USER:
+			case self::SHARETYPE_PRIVATE_LINK:
+				$item = self::getItems($itemType, $item, $shareWith, null, $uidOwner, false, 1);
+				break;
+			case self::SHARETYPE_GROUP:
+				$item = self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1);
+				break;
+			default:
+				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
+				return false;
+		}
+		if ($item) {
+			self::delete($item['item_source'], $item['id']);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* @brief
+	* @param
+	* @param
+	* @return
+	*/
+	public static function unshareFromSelf($itemType, $itemTarget) {
+		$uidSharedWith = \OC_User::getUser();
+		if ($item = self::getItems($itemType, $itemTarget, $uidSharedWith, true, null, false, 1)) {
+			// TODO Check if item is inside a shared folder and was converted
+			if ($item['parent']) {
+				$query = \OC_DB::prepare('SELECT item_type FROM *PREFIX*sharing WHERE id = ? LIMIT 1');
+				$result = $query->execute(array($item['parent']))->fetchRow();
+				// TODO Check other parents
+				if (isset($result['item_type']) && $result['item_type'] = 'folder') {
+					return false;
+				}
+			}
+			// Check if this is a group share, if it is a group share a new entry needs to be created marked as unshared from self
+			if ($item['uid_shared_with'] == null) {
+				$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?,?,?,?,?,?)');
+				$result = $query->execute(array($item['item_type'], $item['item_source'], $item['item_target'], $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], self::UNSHARED_FROM_SELF, $item['stime'], $item['file_source'], $item['file_target']));
+				if (\OC_DB::isError($result)) {
+// 					\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
+					return false;
+				}
+			}
+			return self::delete($item['item_source'], $item['id'], true);
+		}
+		return false;
+	}
+
+	/**
+	* @brief Set the target name of the item for the current user
+	* @param string Item type
+	* @param string Old item name
+	* @param string New item name
+	* @return Returns true on success or false on failure
+	*/
+	public static function setTarget($itemType, $oldTarget, $newTarget) {
+		if ($backend = self::getBackend($itemType)) {
+			$uidSharedWith = \OC_User::getUser();
+			if ($item = self::getItems($itemType, $oldTarget, $uidSharedWith, true, null, false, 1)) {
+				// Check if this is a group share
+				if ($item['uid_shared_with'] == null) {
+					// A new entry needs to be created exclusively for the user
+					$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?,?,?,?,?,?)');
+					if (isset($item['file_target'])) {
+						$fileTarget = $newTarget;
+					} else {
+						$fileTarget = null;
+					}
+					$query->execute(array($itemType, $item['item_source'], $newTarget, $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], $item['permissions'], $item['stime'], $item['file_source'], $fileTarget));
+					return true;
+				} else {
+					// Check if this item is a file or folder, update the file_target as well if this is the case
+					if ($itemType == 'file' || $itemType == 'folder') {
+						$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET item_target = ?, file_target = REPLACE(file_target, ?, ?) WHERE uid_shared_with = ?');
+						$query->execute(array($newTarget, $oldTarget, $newTarget, $uidSharedWith));
+					} else {
+						$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET item_target = ? WHERE item_type = ? AND item_target = ? AND uid_shared_with = ?');
+						$query->execute(array($newTarget, $itemType, $oldTarget, $uidSharedWith));
+					}
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	* @brief Set the permissions of an item for a specific user or group
+	* @param string Item type
+	* @param string Item
+	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
+	* @param string User or group the item is being shared with
+	* @param
+	* @return Returns true on success or false on failure
+	*/
+	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
+		$uidOwner = \OC_User::getUser();
+		switch ($shareType) {
+			case self::SHARETYPE_USER:
+			case self::SHARETYPE_PRIVATE_LINK:
+				$item = self::getItems($itemType, $item, $shareWith, null, $uidOwner, false, 1);
+				break;
+			case self::SHARETYPE_GROUP:
+				$item = self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1);
+				break;
+			default:
+				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
+				return false;
+		}
+		if ($item) {
+			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
+			if (isset($item['parent'])) {
+				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*sharing WHERE id = ? LIMIT 1');
+				$result = $query->execute(array($item['parent']))->fetchRow();
+				if (!isset($result['permissions']) || $permissions > $result['permissions']) {
+					\OC_Log::write('OCP\Share', '', \OC_Log::ERROR);
+					return false;
+				}
+			}
+			$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET permissions = ? WHERE id = ?');
+			$query->execute(array($permissions, $item['id']));
+			// Check if permissions were reduced
+			if ($permissions < $item['permissions']) {
+				// Reduce the permissions for all reshares of this item
+				$ids = array($item['id']);
+				$query = \OC_DB::prepare('SELECT id, parent, permissions FROM *PREFIX*sharing WHERE item_source = ?');
+				$result = $query->execute(array($item['item_source']));
+				while ($item = $result->fetchRow()) {
+					if (in_array($item['parent'], $ids) && $item['permissions'] > $permissions) {
+						$ids[] = $item['id'];
+					}
+				}
+				// Remove parent item from array, this item's permissions already got updated
+				unset($ids[0]);
+				if (!empty($ids)) {
+					$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET permissions = ? WHERE id IN (?)');
+					$query->execute(array($permissions, implode(',', $ids)));
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+		/**
+	* @brief Get the backend class for the specified item type
+	* @param string Item type
+	* @return Sharing backend object
+	*/
+	private static function getBackend($itemType) {
+		if (isset(self::$backends[$itemType])) {
+			return self::$backends[$itemType];
+		} else if (isset(self::$backendTypes[$itemType]['class'])) {
+			$class = self::$backendTypes[$itemType]['class'];
+			if (class_exists($class)) {
+				self::$backends[$itemType] = new $class;
+				return self::$backends[$itemType];
+			} else {
+				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not found', \OC_Log::ERROR);
+				return false;
+			}
+		}
+		\OC_Log::write('OCP\Share', 'Sharing backend for '.$itemType.' not found', \OC_Log::ERROR);
+		return false;
+	}
+
+	/**
+	* @brief Get a list of parent item types for the specified item type
+	* @param string Item type
+	* @return array
+	*/
+	private static function getParentItemTypes($itemType) {
+		$parents = array($itemType);
+		foreach (self::$backendTypes as $type => $backend) {
+			if (in_array($backend->dependsOn, $parents)) {
+				$parents[] = $type;
+			}
+		}
+		if (!empty($parents)) {
+			return $parents;
+		}
+		return false;
+	}
+
+	/**
+	* @brief Get shared items from the database
+	* @param string Item type
+	* @param string Item (optional)
+	* @param string User the item(s) is(are) shared with
+	* @param string|bool Group the item(s) is(are) shared with
+	* @param string User that is the owner of shared items (optional)
+	* @param bool Translate the items back into their original source (optional)
+	* @param int Number of items to return, -1 to return all matches (optional)
+	*
+	* See public functions getItem(s)... for parameter usage
+	*
+	*/
+	private static function getItems($itemType, $item = null, $uidSharedWith = null, $gidSharedWith = null, $uidOwner = null, $translate = true, $limit = -1) {
+		if ($backend = self::getBackend($itemType)) {
+			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
+			if (isset($itemType)) {
+				if ($parents = self::getParentItemTypes($itemType)) {
+				$where = "WHERE item_type IN ('".$itemType."'";
+				foreach ($parents as $parent) {
+					$where .= ", '.$parent.'";
+				}
+				$where .= ')';
+				} else {
+					$where = "WHERE item_type = '".$itemType."'";
+				}
+				// TODO exclude items that are inside of folders and got converted i.e. songs, pictures
+				if ($itemType == 'files') {
+
+				}
+			}
+			if (isset($uidSharedWith)) {
+				if ($gidSharedWith === true) {
+					$where .= " AND (uid_shared_with = '".$uidSharedWith."'";
+					// Include group shares
+					$groups = \OC_Group::getUserGroups($uidSharedWith);
+					if (!empty($groups)) {
+						$groups = "'".implode("','", $groups)."'";
+						$where .= " OR gid_shared_with IN (".$groups.") AND (uid_shared_with IS NULL OR uid_shared_with = '".$uidSharedWith."'))";
+					}
+				} else {
+					$where .= " AND uid_shared_with = '".$uidSharedWith."'";
+				}
+			} else if (isset($gidSharedWith)) {
+				$where .= " AND gid_shared_with = '".$gidSharedWith."' AND uid_shared_with IS NULL";
+			}
+			if (isset($uidOwner)) {
+				$where .= " AND uid_owner = '".$uidOwner."'";
+			}
+			if (isset($item)) {
+				// If looking for own shared items, check item_source else check item_target
+				if (isset($uidOwner)) {
+					// Check if this item depends on a file and getSource() returned an array
+					$source = $backend->getSource($item, $uidOwner);
+					if (is_array($source)) {
+						$itemSource = $source['item'];
+					} else {
+						$itemSource = $source;
+					}
+					$where .= " AND item_source = '".$itemSource."'";
+				} else {
+					$where .= " AND item_target = '".$item."'";
+				}
+			}
+			if ($limit != -1) {
+				$where .= ' LIMIT '.$limit;
+			}
+			echo $where.'<br />';
+			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*sharing '.$where);
+			$result = $query->execute();
+			$items = array();
+			while ($item = $result->fetchRow()) {
+				// Check if this is part of a group share and the user has a different target from the group share
+				if ($gidSharedWith === true && isset($item['gid_shared_with']) && isset($item['uid_shared_with'])) {
+					// Remove the default group share item from the array
+
+				}
+				if ($translate) {
+					if ($item['item_type'] != $itemType && $parentBackend = self::getBackend($item['item_type'])) {
+						if ($itemType == 'files') {
+							// TODO Don't get children, rather get file sources
+						}
+						// TODO add to array parent name
+						$children = $parentBackend->getChildren($item);
+						foreach ($children as $child) {
+							$items[] = $child;
+						}
+					} else {
+						$items[] = $backend->translateItem($item);
+					}
+				}
+			}
+			if (!empty($items)) {
+				return $items;
+			}
+		}
+		return false;
+	}
+
+	/**
+	* @brief Put shared item into the database
+	* @param string Item type
+	* @param string Item
+	* @param array User(s) the item is being shared with
+	* @param string|null Group the item is being shared with
+	* @param string Owner of the item
+	* @param string
+	* @param int Parent folder target (optional)
+	* @return bool
+	*/
+	private static function put($itemType, $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, $parentFolder = null) {
+		// Check file extension for an equivalent item type to convert to
+		if ($itemType == 'file') {
+			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
+			foreach (self::$backendTypes as $type => $backend) {
+				if (isset($backend['dependsOn']) && $backend['dependsOn'] == 'file' && isset($backend['supportedFileExtensions']) && in_array($extension, $backend['supportedFileExtensions'])) {
+					$itemType = $type;
+					break;
+				}
+			}
+			// Exit if this is being called for a file inside a folder, and no equivalent item type is found
+			if (isset($parentFolder) && $itemType == 'file') {
+				return false;
+			}
+		}
+		if ($backend = self::getBackend($itemType)) {
+			// Check if this is a reshare
+			if ($checkReshare = self::getItemSharedWith($itemType, $item)) {
+				// TODO Check if resharing is allowed
+				$parent = $checkReshare['id'];
+				$itemSource = $checkReshare['item_source'];
+				$fileSource = $checkReshare['file_source'];
+				$fileTarget = $checkReshare['file_target'];
+			} else {
+				$parent = null;
+				$source = $backend->getSource($item, $uidOwner);
+				if (!$source) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the sharing backend for '.$itemType.' could not find its source', \OC_Log::ERROR);
+					return false;
+				} else if (is_array($source)) {
+					$itemSource = $source['item'];
+					$fileSource = \OC_FileCache::getId($source['file']);
+				} else {
+					$itemSource = $source;
+					$fileSource = null;
+				}
+			}
+			$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing (item_type, item_source, item_target, parent, uid_shared_with, gid_shared_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+			// If the item is being shared with a group, add an entry for the group itself
+			if (isset($gidSharedWith)) {
+				if (isset($fileSource)) {
+					if (isset($parentFolder)) {
+						$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
+					} else {
+						$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
+					}
+				} else {
+					$groupFileTarget = null;
+				}
+				$groupItemTarget = $backend->generateTarget($item, false);
+				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, null, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+				// Save this id, any extra rows for this group share will need to reference it
+				$parent = \OC_DB::insertid('*PREFIX*sharing');
+			}
+			// Need to loop through the users in a group, just in case we need to change the item target or file target for a specific user
+			// A normal user share also goes through this loop
+			foreach ($uidSharedWith as $uid) {
+				$itemTarget = $backend->generateTarget($item, $uid);
+				if (isset($fileSource)) {
+					if (isset($parentFolder)) {
+						// TODO
+					} else {
+						$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
+					}
+				} else {
+					$fileTarget = null;
+				}
+				if (isset($gidSharedWith)) {
+					// Insert an extra row for the group share if the item or file target is unique for this user
+					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
+						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uid, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+						\OC_DB::insertid('*PREFIX*sharing');
+					}
+				} else {
+					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uid, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+					\OC_DB::insertid('*PREFIX*sharing');
+				}
+				
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* @brief Delete all reshares of an item
+	* @param string
+	* @param int Id of item to delete
+	* @param bool
+	*/
+	private static function delete($itemSource, $parent, $excludeParent = false) {
+		$query = \OC_DB::prepare('SELECT id, parent FROM *PREFIX*sharing WHERE item_source = ?');
+		$result = $query->execute(array($itemSource));
+		$ids = array($parent);
+		while ($item = $result->fetchRow()) {
+			if (in_array($item['parent'], $ids)) {
+				$ids[] = $item['id'];
+			}
+		}
+		if ($excludeParent) {
+			unset($ids[0]);
+		}
+		if (!empty($ids)) {
+			$query = \OC_DB::prepare('DELETE FROM *PREFIX*sharing WHERE id IN (?)');
+			$query->execute(array(implode("','", $ids)));
+		}
+	}
+
+	/**
+	* Hook Listeners
+	*/
+	
+	public static function post_writeFile($arguments) {
+		// TODO
+	}
+
+	public static function post_deleteUser($arguments) {
+		// Delete any items shared with the deleted user
+		$query = \OC_DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_shared_with = ?');
+		$result = $query->execute(array($arguments['uid']));
+		// Delete any items the deleted user shared
+		$query = \OC_DB::prepare('SELECT id, item_source FROM *PREFIX*sharing WHERE uid_owner = ?');
+		$result = $query->execute(array($arguments['uid']));
+		while ($item = $result->fetchRow()) {
+			self::delete($item['item_source'], $item['id']);
+		}
+	}
+
+	public static function post_addToGroup($arguments) {
+		// TODO
+	}
+
+	public static function post_removeFromGroup($arguments) {
+		// TODO
+	}
+
+}
+
+/**
+* Abstract backend class that apps must extend to share content.
+*/
+abstract class Share_Backend {
+
+	public static $dependsOn;
+	public static $supportedFileExtensions = array();
+
+	/**
+	* @brief Get the source of the item to be stored in the database
+	* @param string Item
+	* @param string Owner of the item
+	* @return mixed|array|false Source
+	*
+	* Return a 
+	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
+	* Return false if the item does not exist for the user
+	*
+	* The translateItem() function will translate the source returned back into the item
+	*/
+	public abstract function getSource($item, $uid);
+
+	/**
+	* @brief Get a unique name of the item for the specified user
+	* @param string Item
+	* @param string|false User the item is being shared with
+	* @param array|null List of similar item names already existing as shared items
+	* @return string Target name
+	*
+	* This function needs to verify that the user does not already have an item with this name.
+	* If it does generate a new name e.g. name_#
+	*/
+	public abstract function generateTarget($item, $uid, $exclude = null);
+
+	public abstract function transteItem($source);
+
+}
+
+abstract class Share_Backend_Parent extends Share_Backend {
+
+	public abstract function getChildren($item);
+    
+}
+
+?>
\ No newline at end of file

From c7e0449a75ee2b19b46e40f6a0edcd1308c937e4 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 18 Jun 2012 15:18:30 -0400
Subject: [PATCH 0665/1537] Finish parent folder implementation, change
 recursive delete process

---
 lib/public/share.php | 119 +++++++++++++++++++++++++++++--------------
 1 file changed, 80 insertions(+), 39 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 38a23b4385..8db58093ea 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
 * ownCloud
 *
@@ -132,7 +131,7 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				$uidSharedWith = array($shareWith);
+				$uidSharedWith = $shareWith;
 				$gidSharedWith = null;
 				break;
 			case self::SHARETYPE_GROUP:
@@ -204,7 +203,7 @@ class Share {
 				return false;
 		}
 		if ($item) {
-			self::delete($item['item_source'], $item['id']);
+			self::delete($item['id']);
 			return true;
 		}
 		return false;
@@ -237,7 +236,7 @@ class Share {
 					return false;
 				}
 			}
-			return self::delete($item['item_source'], $item['id'], true);
+			return self::delete($item['id'], true);
 		}
 		return false;
 	}
@@ -481,14 +480,14 @@ class Share {
 	* @brief Put shared item into the database
 	* @param string Item type
 	* @param string Item
-	* @param array User(s) the item is being shared with
+	* @param string|array User(s) the item is being shared with
 	* @param string|null Group the item is being shared with
 	* @param string Owner of the item
 	* @param string
-	* @param int Parent folder target (optional)
+	* @param bool|array Parent folder target (optional)
 	* @return bool
 	*/
-	private static function put($itemType, $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, $parentFolder = null) {
+	private static function put($itemType, $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, $parentFolder = false) {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
@@ -507,6 +506,7 @@ class Share {
 			// Check if this is a reshare
 			if ($checkReshare = self::getItemSharedWith($itemType, $item)) {
 				// TODO Check if resharing is allowed
+				// TODO Don't check if inside folder
 				$parent = $checkReshare['id'];
 				$itemSource = $checkReshare['item_source'];
 				$fileSource = $checkReshare['file_source'];
@@ -519,18 +519,29 @@ class Share {
 					return false;
 				} else if (is_array($source)) {
 					$itemSource = $source['item'];
-					$fileSource = \OC_FileCache::getId($source['file']);
+					$fileSource = self::getBackend('file')->getId($source['file']);
 				} else {
 					$itemSource = $source;
 					$fileSource = null;
 				}
 			}
 			$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing (item_type, item_source, item_target, parent, uid_shared_with, gid_shared_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
-			// If the item is being shared with a group, add an entry for the group itself
-			if (isset($gidSharedWith)) {
+			// Share with a group
+			if (isset($gidSharedWith))  {
 				if (isset($fileSource)) {
-					if (isset($parentFolder)) {
-						$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
+					if ($parentFolder) {
+						if ($parentFolder === true) {
+							$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
+							// Set group default file target for future use
+							$parentFolders[0]['folder'] = $groupFileTarget;
+						} else {
+							// Get group default file target
+							$groupFileTarget = $parentFolder[0]['folder'].$item;
+							$parent = $parentFolder[0]['id'];
+							unset($parentFolder[0]);
+							// Only loop through users we know have different file target paths
+							$uidSharedWith = array_keys($parentFolder);
+						}
 					} else {
 						$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
 					}
@@ -541,31 +552,64 @@ class Share {
 				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, null, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
 				// Save this id, any extra rows for this group share will need to reference it
 				$parent = \OC_DB::insertid('*PREFIX*sharing');
-			}
-			// Need to loop through the users in a group, just in case we need to change the item target or file target for a specific user
-			// A normal user share also goes through this loop
-			foreach ($uidSharedWith as $uid) {
-				$itemTarget = $backend->generateTarget($item, $uid);
-				if (isset($fileSource)) {
-					if (isset($parentFolder)) {
-						// TODO
+				// Loop through all users of this group in case we need to add an extra row
+				foreach ($uidSharedWith as $uid) {
+					$itemTarget = $backend->generateTarget($item, $uid);
+					if (isset($fileSource)) {
+						if ($parentFolder) {
+							if ($parentFolder === true) {
+								$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+								if ($fileTarget != $groupFileTarget) {
+									$parentFolders[$uid]['folder'] = $fileTarget;
+								}
+							} else if (isset($parentFolder[$uid])) {
+								$fileTarget = $parentFolder[$uid]['folder'].$item;
+								$parent = $parentFolder[$uid]['id'];
+							}
+						} else {
+							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+						}
 					} else {
-						$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
+						$fileTarget = null;
+					}
+					// Insert an extra row for the group share if the item or file target is unique for this user
+					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
+						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uid, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+						$id = \OC_DB::insertid('*PREFIX*sharing');
+					}
+					if ($parentFolder === true) {
+						$parentFolders['id'] = $id;
+					}
+				}
+				if ($parentFolder === true) {
+					// Return parent folders to preserve file target paths for potential children
+					return $parentFolders;
+				}
+			} else {
+				// Share with a user
+				$itemTarget = $backend->generateTarget($item, $uidSharedWith);
+				if (isset($fileSource)) {
+					if ($parentFolder) {
+						if ($parentFolder === true) {
+							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+							$parentFolders['folder'] = $fileTarget;
+						} else {
+							$fileTarget = $parentFolder['folder'].$item;
+							$parent = $parentFolder['id'];
+						}
+					} else {
+						$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
 					}
 				} else {
 					$fileTarget = null;
 				}
-				if (isset($gidSharedWith)) {
-					// Insert an extra row for the group share if the item or file target is unique for this user
-					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uid, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-						\OC_DB::insertid('*PREFIX*sharing');
-					}
-				} else {
-					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uid, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-					\OC_DB::insertid('*PREFIX*sharing');
+				$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uidSharedWith, null, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+				$id = \OC_DB::insertid('*PREFIX*sharing');
+				if ($parentFolder === true) {
+					$parentFolders['id'] = $id;
+					// Return parent folder to preserve file target paths for potential children
+					return $parentFolders;
 				}
-				
 			}
 			return true;
 		}
@@ -578,14 +622,11 @@ class Share {
 	* @param int Id of item to delete
 	* @param bool
 	*/
-	private static function delete($itemSource, $parent, $excludeParent = false) {
-		$query = \OC_DB::prepare('SELECT id, parent FROM *PREFIX*sharing WHERE item_source = ?');
-		$result = $query->execute(array($itemSource));
+	private static function delete($parent, $excludeParent = false) {
+		$query = \OC_DB::prepare('SELECT id FROM *PREFIX*sharing WHERE parent IN (?)');
 		$ids = array($parent);
-		while ($item = $result->fetchRow()) {
-			if (in_array($item['parent'], $ids)) {
-				$ids[] = $item['id'];
-			}
+		while ($item = $query->execute(array(implode("','", $ids)))->fetchRow()) {
+			$ids[] = $item['id'];
 		}
 		if ($excludeParent) {
 			unset($ids[0]);
@@ -612,7 +653,7 @@ class Share {
 		$query = \OC_DB::prepare('SELECT id, item_source FROM *PREFIX*sharing WHERE uid_owner = ?');
 		$result = $query->execute(array($arguments['uid']));
 		while ($item = $result->fetchRow()) {
-			self::delete($item['item_source'], $item['id']);
+			self::delete($item['id']);
 		}
 	}
 

From 945565f4206367be53a2c612a2d078a6b539a343 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 19 Jun 2012 14:19:30 -0400
Subject: [PATCH 0666/1537] Move ajax and js files to core

---
 core/ajax/share.php                      | 42 ++++++++++++++++++++++++
 {apps/files_sharing => core}/js/share.js | 12 +++----
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 core/ajax/share.php
 rename {apps/files_sharing => core}/js/share.js (94%)

diff --git a/core/ajax/share.php b/core/ajax/share.php
new file mode 100644
index 0000000000..f87c12dbb5
--- /dev/null
+++ b/core/ajax/share.php
@@ -0,0 +1,42 @@
+<?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/>.
+*/
+
+OCP\JSON::checkLoggedIn();
+switch ($_POST['action']) {
+	case 'share':
+		$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+		($return) ? OCP\JSON::success() : OCP\JSON::error();
+		break;
+	case 'unshare':
+		$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']);
+		($return) ? OCP\JSON::success() : OCP\JSON::error();
+		break;
+	case 'setTarget':
+		$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
+		($return) ? OCP\JSON::success() : OCP\JSON::error();
+		break;
+	case 'setPermissions':
+		$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+		($return) ? OCP\JSON::success() : OCP\JSON::error();
+		break;
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_sharing/js/share.js b/core/js/share.js
similarity index 94%
rename from apps/files_sharing/js/share.js
rename to core/js/share.js
index 9194d2240a..5f695774ce 100644
--- a/apps/files_sharing/js/share.js
+++ b/core/js/share.js
@@ -6,7 +6,7 @@ OC.Share={
 	usersAndGroups:[],
 	loadIcons:function() {
 		// Cache all icons for shared files
-		$.getJSON(OC.filePath('files_sharing', 'ajax', 'getstatuses.php'), function(result) {
+		$.getJSON(OC.filePath('core', 'ajax', 'share.php'), function(result) {
 			if (result && result.status === 'success') {
 				$.each(result.data, function(item, hasPrivateLink) {
 					if (hasPrivateLink) {
@@ -19,7 +19,7 @@ OC.Share={
 		});
 	},
 	loadItem:function(item) {
-		$.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'getitem.php'), data: { item: item }, async: false, success: function(result) {
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { item: item }, async: false, success: function(result) {
 			if (result && result.status === 'success') {
 				var item = result.data;
 				OC.Share.itemUsers = item.users;
@@ -29,7 +29,7 @@ OC.Share={
 		}});
 	},
 	share:function(source, uid_shared_with, permissions, callback) {
-		$.post(OC.filePath('files_sharing', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
 			if (result && result.status === 'success') {
 				if (callback) {
 					callback(result.data);
@@ -40,7 +40,7 @@ OC.Share={
 		});
 	},
 	unshare:function(source, uid_shared_with, callback) {
-		$.post(OC.filePath('files_sharing', 'ajax', 'unshare.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) {
 			if (result && result.status === 'success') {
 				if (callback) {
 					callback();
@@ -50,8 +50,8 @@ OC.Share={
 			}
 		});
 	},
-	changePermissions:function(source, uid_shared_with, permissions) {
-		$.post(OC.filePath('files_sharing','ajax','setpermissions.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
+	setPermissions:function(source, uid_shared_with, permissions) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
 			if (!result || result.status !== 'success') {
 				OC.dialogs.alert('Error', 'Error while changing permissions');
 			}

From bd8769a7c5178e1bb6704e3b2f03d0730b0cb4e5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 19 Jun 2012 14:21:44 -0400
Subject: [PATCH 0667/1537] Fixes for registering and fetching backends

---
 lib/public/share.php | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 8db58093ea..6fd3587c2b 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -43,19 +43,19 @@ class Share {
 
 	/**
 	* @brief Register a sharing backend class that extends OCP\Share_Backend for an item type
-	* @param string Class
 	* @param string Item type
+	* @param object Backend class
 	* @param string (optional) Depends on item type
 	* @param array (optional) List of supported file extensions if this item type depends on files
 	* @return Returns true if backend is registered or false if error
 	*/
-	public static function registerBackend($class, $itemType, $dependsOn = null, $supportedFileExtensions = null) {
+	public static function registerBackend($itemType, $class, $dependsOn = null, $supportedFileExtensions = null) {
 		if (is_subclass_of($class, 'OCP\Share_Backend')) {
-			if (!isset(self::$backendTypes[$itemType])) {
-				self::$backendTypes[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
+			if (!isset(self::$backends[$itemType])) {
+				self::$backends[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
 				return true;
 			} else {
-				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
+				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backends[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
 				return false;
 			}
 		}
@@ -111,8 +111,10 @@ class Share {
 	public static function share($itemType, $item, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
+		// TODO Doesn't handle types 
 		switch ($shareType) {
 			case self::SHARETYPE_USER:
+				\OC_Log::write('OCP\Share', 'share type '.$shareType, \OC_Log::ERROR);
 				if ($shareWith == $uidOwner) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner', \OC_Log::ERROR);
 					return false;
@@ -153,6 +155,7 @@ class Share {
 				// TODO don't loop through folder conversion
 				$uidSharedWith = '';
 				$gidSharedWith = null;
+				break;
 			default:
 				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
 				return false;
@@ -218,11 +221,10 @@ class Share {
 	public static function unshareFromSelf($itemType, $itemTarget) {
 		$uidSharedWith = \OC_User::getUser();
 		if ($item = self::getItems($itemType, $itemTarget, $uidSharedWith, true, null, false, 1)) {
-			// TODO Check if item is inside a shared folder and was converted
+			// Check if item is inside a shared folder and was converted
 			if ($item['parent']) {
 				$query = \OC_DB::prepare('SELECT item_type FROM *PREFIX*sharing WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
-				// TODO Check other parents
 				if (isset($result['item_type']) && $result['item_type'] = 'folder') {
 					return false;
 				}
@@ -337,23 +339,14 @@ class Share {
 		return false;
 	}
 
-		/**
+	/**
 	* @brief Get the backend class for the specified item type
 	* @param string Item type
 	* @return Sharing backend object
 	*/
 	private static function getBackend($itemType) {
-		if (isset(self::$backends[$itemType])) {
-			return self::$backends[$itemType];
-		} else if (isset(self::$backendTypes[$itemType]['class'])) {
-			$class = self::$backendTypes[$itemType]['class'];
-			if (class_exists($class)) {
-				self::$backends[$itemType] = new $class;
-				return self::$backends[$itemType];
-			} else {
-				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not found', \OC_Log::ERROR);
-				return false;
-			}
+		if (isset(self::$backends[$itemType]['class'])) {
+			return self::$backends[$itemType]['class'];
 		}
 		\OC_Log::write('OCP\Share', 'Sharing backend for '.$itemType.' not found', \OC_Log::ERROR);
 		return false;

From 10986f00dc88dceeb5a052ff7651609d1e9b1465 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 21 Jun 2012 12:07:11 -0400
Subject: [PATCH 0668/1537] Use share type and share with in db instead of
 separate columns for user and group

---
 lib/public/share.php | 151 +++++++++++++++++++++++++------------------
 1 file changed, 88 insertions(+), 63 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 6fd3587c2b..18388fec98 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -27,19 +27,20 @@ namespace OCP;
 */
 class Share {
 
-	const SHARETYPE_USER = 0;
-	const SHARETYPE_GROUP = 1;
+	
+	const SHARE_TYPE_USER = 0;
+	const SHARE_TYPE_GROUP = 1;
 	const SHARETYPE_CONTACT = 2;
-	const SHARETYPE_PRIVATE_LINK = 3;
+	const SHARETYPE_PRIVATE_LINK = 4;	
 
 	const PERMISSION_READ = 0;
 	const PERMISSION_UPDATE = 1;
 	const PERMISSION_DELETE = 2;
 	const PERMISSION_SHARE = 3;
-	
-	private static $backendTypes = array();
+
+	private static $shareTypeUserAndGroups = -1;
+	private static $shareTypeGroupUserUnique = 3;
 	private static $backends = array();
-	private static $sharedFolder = '/Shared/';
 
 	/**
 	* @brief Register a sharing backend class that extends OCP\Share_Backend for an item type
@@ -113,7 +114,7 @@ class Share {
 		// Verify share type and sharing conditions are met
 		// TODO Doesn't handle types 
 		switch ($shareType) {
-			case self::SHARETYPE_USER:
+			case self::SHARE_TYPE_USER:
 				\OC_Log::write('OCP\Share', 'share type '.$shareType, \OC_Log::ERROR);
 				if ($shareWith == $uidOwner) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner', \OC_Log::ERROR);
@@ -133,10 +134,8 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				$uidSharedWith = $shareWith;
-				$gidSharedWith = null;
 				break;
-			case self::SHARETYPE_GROUP:
+			case self::SHARE_TYPE_GROUP:
 				if (!\OC_Group::groupExists($shareWith)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the group '.$shareWith.' does not exist', \OC_Log::ERROR);
 					return false;
@@ -148,8 +147,11 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				$uidSharedWith = array_diff(\OC_Group::usersInGroup($shareWith), array($uidOwner));
-				$gidSharedWith = $shareWith;
+				// Convert share with into an array with the keys group and users
+				$group = $shareWith;
+				$shareWith = array();
+				$shareWith['group'] = $group;
+				$shareWith['users'] = array_diff(\OC_Group::usersInGroup($shareWith), array($uidOwner));
 				break;
 			case self::SHARETYPE_PRIVATE_LINK:
 				// TODO don't loop through folder conversion
@@ -162,7 +164,7 @@ class Share {
 		}
 		// If the item is a folder, scan through the folder looking for equivalent item types
 		if ($itemType == 'folder') {
-			$parentFolder = self::put('folder', $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, true);
+			$parentFolder = self::put('folder', $item, $shareType, $shareWith, $uidOwner, $permissions, true);
 			if ($parentFolder && $files = \OC_Files::getDirectoryContent($item)) {
 				for ($i = 0; $i < count($files); $i++) {
 					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $item) - strlen($item));
@@ -171,7 +173,7 @@ class Share {
 						array_push($files, $children);
 					} else {
 						// Pass on to put() to check if this item should be converted, the item won't be inserted into the database unless it can be converted
-						self::put('file', $name, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, $parentFolder);
+						self::put('file', $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
 					}
 				}
 				return $return;
@@ -179,7 +181,7 @@ class Share {
 			return false;
 		} else {
 			// Put the item into the database
-			return self::put($itemType, $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions);
+			return self::put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions);
 		}
 	}
 
@@ -194,11 +196,11 @@ class Share {
 	public static function unshare($itemType, $item, $shareType, $shareWith) {
 		$uidOwner = \OC_User::getUser();
 		switch ($shareType) {
-			case self::SHARETYPE_USER:
+			case self::SHARE_TYPE_USER:
 			case self::SHARETYPE_PRIVATE_LINK:
 				$item = self::getItems($itemType, $item, $shareWith, null, $uidOwner, false, 1);
 				break;
-			case self::SHARETYPE_GROUP:
+			case self::SHARE_TYPE_GROUP:
 				$item = self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1);
 				break;
 			default:
@@ -225,7 +227,7 @@ class Share {
 			if ($item['parent']) {
 				$query = \OC_DB::prepare('SELECT item_type FROM *PREFIX*sharing WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
-				if (isset($result['item_type']) && $result['item_type'] = 'folder') {
+				if (isset($result['item_type']) && $result['item_type'] == 'folder') {
 					return false;
 				}
 			}
@@ -293,11 +295,11 @@ class Share {
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		switch ($shareType) {
-			case self::SHARETYPE_USER:
+			case self::SHARE_TYPE_USER:
 			case self::SHARETYPE_PRIVATE_LINK:
 				$item = self::getItems($itemType, $item, $shareWith, null, $uidOwner, false, 1);
 				break;
-			case self::SHARETYPE_GROUP:
+			case self::SHARE_TYPE_GROUP:
 				$item = self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1);
 				break;
 			default:
@@ -383,7 +385,7 @@ class Share {
 	* See public functions getItem(s)... for parameter usage
 	*
 	*/
-	private static function getItems($itemType, $item = null, $uidSharedWith = null, $gidSharedWith = null, $uidOwner = null, $translate = true, $limit = -1) {
+	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = true, $checkOnly = false, $limit = -1) {
 		if ($backend = self::getBackend($itemType)) {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
 			if (isset($itemType)) {
@@ -401,20 +403,17 @@ class Share {
 
 				}
 			}
-			if (isset($uidSharedWith)) {
-				if ($gidSharedWith === true) {
-					$where .= " AND (uid_shared_with = '".$uidSharedWith."'";
-					// Include group shares
-					$groups = \OC_Group::getUserGroups($uidSharedWith);
-					if (!empty($groups)) {
-						$groups = "'".implode("','", $groups)."'";
-						$where .= " OR gid_shared_with IN (".$groups.") AND (uid_shared_with IS NULL OR uid_shared_with = '".$uidSharedWith."'))";
-					}
+			if (isset($shareType) && isset($shareWith)) {
+				// Include all user and group items
+				if ($shareType == self::$shareTypeUserAndGroups) {
+					$where .= " AND share_type IN ('".self::SHARE_TYPE_USER."','".self::SHARE_TYPE_GROUP."','".self::$shareTypeGroupUserUnique."')";
+					$groups = \OC_Group::getUserGroups($shareWith);
+					$userAndGroups = array_merge(array($shareWith), $groups);
+					$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
+					
 				} else {
-					$where .= " AND uid_shared_with = '".$uidSharedWith."'";
+					$where .= " AND share_type = '".$shareType."' AND share_with = '".$shareWith."'";
 				}
-			} else if (isset($gidSharedWith)) {
-				$where .= " AND gid_shared_with = '".$gidSharedWith."' AND uid_shared_with IS NULL";
 			}
 			if (isset($uidOwner)) {
 				$where .= " AND uid_owner = '".$uidOwner."'";
@@ -431,39 +430,45 @@ class Share {
 					}
 					$where .= " AND item_source = '".$itemSource."'";
 				} else {
-					$where .= " AND item_target = '".$item."'";
+					if ($itemType == 'file' && substr($item, -1) == '/') {
+						// Special case to select only the shared files inside the folder
+						$where .= " AND file_target LIKE '".$item."%/'";
+					} else {
+						$where .= " AND item_target = '".$item."'";
+					}
 				}
 			}
 			if ($limit != -1) {
 				$where .= ' LIMIT '.$limit;
 			}
-			echo $where.'<br />';
 			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*sharing '.$where);
 			$result = $query->execute();
-			$items = array();
-			while ($item = $result->fetchRow()) {
-				// Check if this is part of a group share and the user has a different target from the group share
-				if ($gidSharedWith === true && isset($item['gid_shared_with']) && isset($item['uid_shared_with'])) {
-					// Remove the default group share item from the array
+			if (!$checkOnly) {
+				$items = array();
+				while ($item = $result->fetchRow()) {
+					// Filter out duplicate group shares for users with unique targets
+					if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
 
-				}
-				if ($translate) {
-					if ($item['item_type'] != $itemType && $parentBackend = self::getBackend($item['item_type'])) {
-						if ($itemType == 'files') {
-							// TODO Don't get children, rather get file sources
-						}
-						// TODO add to array parent name
-						$children = $parentBackend->getChildren($item);
-						foreach ($children as $child) {
-							$items[] = $child;
-						}
+					}
+					$sources[] = $item['item_source'];
+					if ($format) {
+						$shareInfo[$item['item_source']] = array('item_target' => $item['item_target'], 'permissions' => $item['permissions'], 'stime' => $item['stime']);
 					} else {
-						$items[] = $backend->translateItem($item);
+						$shareInfo[$item['item_source']][$item['id']] = array('item_target' => $item['item_target'], 'permissions' => $item['permissions'], 'stime' => $item['stime']);
 					}
 				}
-			}
-			if (!empty($items)) {
-				return $items;
+				if ($format) {
+					return $backend->formatItems($sources, $shareInfo);
+				} else {
+					// TODO wrap items back into share type, share with, permissions
+					$items = $backend->getItems($sources);
+					
+				}
+				if (!empty($items)) {
+					return $items;
+				}
+			} else {
+				return $result->fetchAll();
 			}
 		}
 		return false;
@@ -480,7 +485,7 @@ class Share {
 	* @param bool|array Parent folder target (optional)
 	* @return bool
 	*/
-	private static function put($itemType, $item, $uidSharedWith, $gidSharedWith, $uidOwner, $permissions, $parentFolder = false) {
+	private static function put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = false) {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
@@ -520,7 +525,7 @@ class Share {
 			}
 			$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing (item_type, item_source, item_target, parent, uid_shared_with, gid_shared_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
 			// Share with a group
-			if (isset($gidSharedWith))  {
+			if ($shareType == self::SHARE_TYPE_GROUP) {
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
@@ -542,11 +547,11 @@ class Share {
 					$groupFileTarget = null;
 				}
 				$groupItemTarget = $backend->generateTarget($item, false);
-				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, null, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
 				// Save this id, any extra rows for this group share will need to reference it
 				$parent = \OC_DB::insertid('*PREFIX*sharing');
 				// Loop through all users of this group in case we need to add an extra row
-				foreach ($uidSharedWith as $uid) {
+				foreach ($shareWith['users'] as $uid) {
 					$itemTarget = $backend->generateTarget($item, $uid);
 					if (isset($fileSource)) {
 						if ($parentFolder) {
@@ -567,7 +572,7 @@ class Share {
 					}
 					// Insert an extra row for the group share if the item or file target is unique for this user
 					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uid, $gidSharedWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 						$id = \OC_DB::insertid('*PREFIX*sharing');
 					}
 					if ($parentFolder === true) {
@@ -579,7 +584,6 @@ class Share {
 					return $parentFolders;
 				}
 			} else {
-				// Share with a user
 				$itemTarget = $backend->generateTarget($item, $uidSharedWith);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
@@ -596,7 +600,7 @@ class Share {
 				} else {
 					$fileTarget = null;
 				}
-				$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $uidSharedWith, null, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+				$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 				$id = \OC_DB::insertid('*PREFIX*sharing');
 				if ($parentFolder === true) {
 					$parentFolders['id'] = $id;
@@ -668,6 +672,8 @@ abstract class Share_Backend {
 	public static $dependsOn;
 	public static $supportedFileExtensions = array();
 
+
+
 	/**
 	* @brief Get the source of the item to be stored in the database
 	* @param string Item
@@ -682,6 +688,8 @@ abstract class Share_Backend {
 	*/
 	public abstract function getSource($item, $uid);
 
+
+
 	/**
 	* @brief Get a unique name of the item for the specified user
 	* @param string Item
@@ -694,7 +702,24 @@ abstract class Share_Backend {
 	*/
 	public abstract function generateTarget($item, $uid, $exclude = null);
 
-	public abstract function transteItem($source);
+
+
+	/**
+	* @brief
+	* @param array
+	* @return
+	*/
+	public abstract function getItems($sources);
+
+
+
+	/**
+	* @brief
+	* @param array
+	* @param array
+	* @return
+	*/
+	public abstract function formatItems($sources, $shareInfo);
 
 }
 

From 71350bc61879ab2e532d5f55c058b4fba9341656 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 22 Jun 2012 17:43:04 -0400
Subject: [PATCH 0669/1537] I'm having trouble making up my mind...
 translateItem -> getItems() -> formatItems(). It may change again. Preparing
 shared storage for new api.

---
 apps/files_sharing/sharedstorage.php |  90 +++++++++++----------
 lib/files.php                        |   5 ++
 lib/public/share.php                 | 115 +++++++++++++--------------
 3 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index fed1b834fa..21aa2f23b9 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Michael Gapczynski
- * @copyright 2011 Michael Gapczynski GapczynskiM@gmail.com
+ * @copyright 2011 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
@@ -20,43 +20,50 @@
  *
  */
 
-require_once( 'lib_share.php' );
-
 /**
  * Convert target path to source path and pass the function call to the correct storage provider
  */
 class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
-	private $datadir;
+	private $sharedFolder;
 	private $sourcePaths = array();
 	
 	public function __construct($arguments) {
-		$this->datadir = $arguments['datadir'];
-		$this->datadir .= "/";
+		$this->sharedFolder = $arguments['sharedFolder'];
 	}
-	
-	public function getInternalPath($path) {
+
+	public function getSourcePath($target) {
+		$target = $this->sharedFolder.$target;
+		if (isset($this->sourcePaths[$target])) {
+			return $this->sourcePaths[$target];
+		} else {
+			if (dirname($target) != $this->sharedFolder) {
+				$pos = strlen($this->sharedFolder);
+				// Get shared folder name
+				$itemTarget = substr($target, $pos, strpos($target, '/', $pos));
+			} else {
+				$itemTarget = $target;
+			}
+			$sourcePath = OCP\Share::getItemSharedWith('file', $itemTarget, OC_Share_Backend_File::FORMAT_SOURCE_PATH);
+			if ($sourcePath) {
+				$this->sourcePaths[$target] = $sourcePath;
+				return $sourcePath;
+			}
+			return false;
+		}
+	}
+
+	private function getInternalPath($path) {
 		$mountPoint = OC_Filesystem::getMountPoint($path);
 		$internalPath = substr($path, strlen($mountPoint));
 		return $internalPath;
 	}
 	
-	public function getSource($target) {
-		$target = $this->datadir.$target;
-		if (array_key_exists($target, $this->sourcePaths)) {
-			return $this->sourcePaths[$target];
-		} else {
-			$source = OC_Share::getSource($target);
-			$this->sourcePaths[$target] = $source;
-			return $source;
-		}
-	}
-	
 	public function mkdir($path) {
 		if ($path == "" || $path == "/" || !$this->is_writable($path)) {
 			return false; 
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->mkdir($this->getInternalPath($source));
@@ -73,6 +80,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	public function opendir($path) {
 		if ($path == "" || $path == "/") {
 			$path = $this->datadir.$path;
+			// TODO
 			$sharedItems = OC_Share::getItemsInFolder($path);
 			$files = array();
 			foreach ($sharedItems as $item) {
@@ -84,7 +92,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			OC_FakeDirStream::$dirs['shared']=$files;
 			return opendir('fakedir://shared');
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				$dh = $storage->opendir($this->getInternalPath($source));
@@ -143,7 +151,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if ($path == "" || $path == "/") {
 			return true;
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->is_dir($this->getInternalPath($source));
@@ -152,7 +160,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function is_file($path) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->is_file($this->getInternalPath($source));
@@ -167,7 +175,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$stat["ctime"] = $this->filectime($path);
 			return $stat;
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->stat($this->getInternalPath($source));
@@ -179,7 +187,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if ($path == "" || $path == "/") {
 			return "dir";
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filetype($this->getInternalPath($source));
@@ -192,7 +200,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if ($path == "" || $path == "/" || $this->is_dir($path)) {
 			return $this->getFolderSize($path);
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filesize($this->getInternalPath($source));
@@ -267,7 +275,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if ($path == "" || $path == "/") {
 			return true;
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->file_exists($this->getInternalPath($source));
@@ -288,7 +296,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 			return $ctime;
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filectime($this->getInternalPath($source));
@@ -309,7 +317,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 			return $mtime;
 		} else {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filemtime($this->getInternalPath($source));
@@ -318,7 +326,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function file_get_contents($path) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$info = array(
 				'target' => $this->datadir.$path,
@@ -332,7 +340,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function file_put_contents($path, $data) {
 		if ($this->is_writable($path)) {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$info = array(
 						'target' => $this->datadir.$path,
@@ -381,7 +389,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 				return false;
 			// Check if both paths have write permission
 			} else if ($this->is_writable($path1) && $this->is_writable($path2)) {
-				$oldSource = $this->getSource($path1);
+				$oldSource = $this->getSourcePath($path1);
 				$newSource = $folders['source'].substr($newTarget, strlen($folders['target']));
 				if ($oldSource) {
 					$storage = OC_Filesystem::getStorage($oldSource);
@@ -424,7 +432,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function fopen($path, $mode) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$info = array(
 				'target' => $this->datadir.$path,
@@ -438,7 +446,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function toTmpFile($path) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->toTmpFile($this->getInternalPath($source));
@@ -447,7 +455,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function fromTmpFile($tmpFile, $path) {
 		if ($this->is_writable($path)) {
-			$source = $this->getSource($path);
+			$source = $this->getSourcePath($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				$result = $storage->fromTmpFile($tmpFile, $this->getInternalPath($source));
@@ -465,7 +473,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if ($path == "" || $path == "/") {
 			return 'httpd/unix-directory';
 		}
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->getMimeType($this->getInternalPath($source));
@@ -473,7 +481,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function hash($type, $path, $raw) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->hash($type, $this->getInternalPath($source), $raw);
@@ -481,7 +489,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function free_space($path) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->free_space($this->getInternalPath($source));
@@ -510,14 +518,14 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 
 	public function getLocalFile($path) {
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->getLocalFile($this->getInternalPath($source));
 		}
 	}
 	public function touch($path, $mtime=null){
-		$source = $this->getSource($path);
+		$source = $this->getSourcePath($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->touch($this->getInternalPath($source),$time);
@@ -526,7 +534,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 
 	public static function setup($options) {
 		$user_dir = $options['user_dir'];
-		OC_Filesystem::mount('OC_Filestorage_Shared', array('datadir' => $user_dir.'/Shared'), $user_dir.'/Shared/');
+		OC_Filesystem::mount('OC_Filestorage_Shared', array('sharedFolder' => $user_dir.'/Shared'), $user_dir.'/Shared/');
 	}
 
 	/**
diff --git a/lib/files.php b/lib/files.php
index 469c3a15b8..2feae20afe 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -34,6 +34,11 @@ class OC_Files {
 	*/
 	public static function getDirectoryContent($directory, $mimetype_filter = ''){
 		$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
+		if ($directory == '') {
+			$files = array_merge($files, array());
+		} else if (substr($directory, 7) == '/Shared') {
+			$files = array_merge($files, OCP\Share::getItemsSharedWith('file', $directory, OC_Share_Backend_File::FORMAT_FILE_APP));
+		}
 		foreach($files as &$file){
 			$file['directory']=$directory;
 			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';
diff --git a/lib/public/share.php b/lib/public/share.php
index 18388fec98..2ba3187dff 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -31,13 +31,15 @@ class Share {
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
 	const SHARETYPE_CONTACT = 2;
-	const SHARETYPE_PRIVATE_LINK = 4;	
+	const SHARETYPE_PRIVATE_LINK = 4;
 
 	const PERMISSION_READ = 0;
 	const PERMISSION_UPDATE = 1;
 	const PERMISSION_DELETE = 2;
 	const PERMISSION_SHARE = 3;
 
+	const FORMAT_NONE = -1;
+
 	private static $shareTypeUserAndGroups = -1;
 	private static $shareTypeGroupUserUnique = 3;
 	private static $backends = array();
@@ -67,37 +69,45 @@ class Share {
 	/**
 	* @brief Get the items of item type shared with the current user
 	* @param string Item type
-	* @return
+	* @param int Format (optional) Format type must be defined by the backend
+	* @param int Number of items to return (optional) Returns all by default
+	* @return Return depends on format
 	*/
-	public static function getItemsSharedWith($itemType) {
-		return self::getItems($itemType, null, \OC_User::getUser(), true, null, true);
+	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE, $limit = -1) {
+		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $limit);
 	}
 
 	/**
 	* @brief Get the item of item type shared with the current user
 	* @param string Item type
-	* @return
+	* @param string Item target
+	* @param int Format (optional) Format type must be defined by the backend
+	* @return Return depends on format
 	*/
-	public static function getItemSharedWith($itemType, $item) {
-		return self::getItems($itemType, $item, \OC_User::getUser(), true, null, true, 1);
+	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE) {
+		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, 1);
 	}
 
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
-	* @return The
+	* @param int Format (optional) Format type must be defined by the backend
+	* @param int Number of items to return (optional) Returns all by default
+	* @return Return depends on format
 	*/
-	public static function getItemsOwned($itemType) {
-		return self::getItems($itemType, null, null, null, \OC_User::getUser(), true);
+	public static function getItemsOwned($itemType, $format = self::FORMAT_NONE, $limit = -1) {
+		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $limit);
 	}
 
 	/**
 	* @brief Get the shared item of item type owned by the current user
 	* @param string Item type
-	* @return The
+	* @param string Item
+	* @param int Format (optional) Format type must be defined by the backend
+	* @return Return depends on format
 	*/
-	public static function getItemOwned($itemType, $item) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), true, 1);
+	public static function getItemOwned($itemType, $item, $format = self::FORMAT_NONE) {
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, 1);
 	}
 
 	/**
@@ -130,7 +140,7 @@ class Share {
 						return false;
 					}
 				}
-				if (self::getItems($itemType, $item, $shareWith, true, $uidOwner, false, 1)) {
+				if (self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -143,7 +153,7 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				if (self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1)) {
+				if (self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -375,7 +385,7 @@ class Share {
 	/**
 	* @brief Get shared items from the database
 	* @param string Item type
-	* @param string Item (optional)
+	* @param string Item or item target (optional)
 	* @param string User the item(s) is(are) shared with
 	* @param string|bool Group the item(s) is(are) shared with
 	* @param string User that is the owner of shared items (optional)
@@ -385,7 +395,7 @@ class Share {
 	* See public functions getItem(s)... for parameter usage
 	*
 	*/
-	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = true, $checkOnly = false, $limit = -1) {
+	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $limit = -1) {
 		if ($backend = self::getBackend($itemType)) {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
 			if (isset($itemType)) {
@@ -410,7 +420,6 @@ class Share {
 					$groups = \OC_Group::getUserGroups($shareWith);
 					$userAndGroups = array_merge(array($shareWith), $groups);
 					$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
-					
 				} else {
 					$where .= " AND share_type = '".$shareType."' AND share_with = '".$shareWith."'";
 				}
@@ -443,32 +452,24 @@ class Share {
 			}
 			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*sharing '.$where);
 			$result = $query->execute();
-			if (!$checkOnly) {
-				$items = array();
-				while ($item = $result->fetchRow()) {
-					// Filter out duplicate group shares for users with unique targets
-					if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
-
-					}
-					$sources[] = $item['item_source'];
-					if ($format) {
-						$shareInfo[$item['item_source']] = array('item_target' => $item['item_target'], 'permissions' => $item['permissions'], 'stime' => $item['stime']);
-					} else {
-						$shareInfo[$item['item_source']][$item['id']] = array('item_target' => $item['item_target'], 'permissions' => $item['permissions'], 'stime' => $item['stime']);
-					}
-				}
-				if ($format) {
-					return $backend->formatItems($sources, $shareInfo);
-				} else {
-					// TODO wrap items back into share type, share with, permissions
-					$items = $backend->getItems($sources);
+			$items = array();
+			while ($item = $result->fetchRow()) {
+				// TODO Filter out duplicate group shares for users with unique targets
+				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
+					// Group shares should already be in items array
 					
 				}
-				if (!empty($items)) {
-					return $items;
+				// TODO Add in parent item types children?
+				if ($parents && in_array($item['item_type'], $parents)) {
+					$children[] = $item;
 				}
+// 				$items[] = array($item['item_source'] => $item['id'];
+				$items[$item['item']][$item['id']] = array('item_target' => $item['item_target'], 'permissions' => $item['permissions'], 'stime' => $item['stime']);
+			}
+			if ($format == self::FORMAT_NONE) {
+				return $items;
 			} else {
-				return $result->fetchAll();
+				return $backend->formatItems($items, $format);
 			}
 		}
 		return false;
@@ -523,7 +524,7 @@ class Share {
 					$fileSource = null;
 				}
 			}
-			$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing (item_type, item_source, item_target, parent, uid_shared_with, gid_shared_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+			$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing (item_type, item, item_source, item_target, parent, uid_shared_with, gid_shared_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
 			// Share with a group
 			if ($shareType == self::SHARE_TYPE_GROUP) {
 				if (isset($fileSource)) {
@@ -547,7 +548,7 @@ class Share {
 					$groupFileTarget = null;
 				}
 				$groupItemTarget = $backend->generateTarget($item, false);
-				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+				$query->execute(array($itemType, $item, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
 				// Save this id, any extra rows for this group share will need to reference it
 				$parent = \OC_DB::insertid('*PREFIX*sharing');
 				// Loop through all users of this group in case we need to add an extra row
@@ -572,7 +573,7 @@ class Share {
 					}
 					// Insert an extra row for the group share if the item or file target is unique for this user
 					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+						$query->execute(array($itemType, $item, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 						$id = \OC_DB::insertid('*PREFIX*sharing');
 					}
 					if ($parentFolder === true) {
@@ -600,7 +601,7 @@ class Share {
 				} else {
 					$fileTarget = null;
 				}
-				$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+				$query->execute(array($itemType, $item, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 				$id = \OC_DB::insertid('*PREFIX*sharing');
 				if ($parentFolder === true) {
 					$parentFolders['id'] = $id;
@@ -638,10 +639,6 @@ class Share {
 	* Hook Listeners
 	*/
 	
-	public static function post_writeFile($arguments) {
-		// TODO
-	}
-
 	public static function post_deleteUser($arguments) {
 		// Delete any items shared with the deleted user
 		$query = \OC_DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_shared_with = ?');
@@ -705,22 +702,18 @@ abstract class Share_Backend {
 
 
 	/**
-	* @brief
-	* @param array
-	* @return
+	* @brief Converts the shared item sources back into the item in the specified format
+	* @param array Sources of shared items
+	* @param int Format 
+	* @return ?
+	* 
+	* The items array is formatted with the sources as the keys to an array with the following keys: item_target, permissions, stime
+	* This function allows the backend to control the output of shared items with custom formats.
+	* It is only called through calls to the public getItem(s)SharedWith functions.
 	*/
-	public abstract function getItems($sources);
+	public abstract function formatItems($items, $format);
 
 
-
-	/**
-	* @brief
-	* @param array
-	* @param array
-	* @return
-	*/
-	public abstract function formatItems($sources, $shareInfo);
-
 }
 
 abstract class Share_Backend_Parent extends Share_Backend {

From 5f1aa1b92e7b8e18e38718b8da6c79eda0840ac1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 22 Jun 2012 18:00:10 -0400
Subject: [PATCH 0670/1537] Fix additional getItems calls due to parameter
 change

---
 lib/public/share.php | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 2ba3187dff..ec371ebf98 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -122,7 +122,6 @@ class Share {
 	public static function share($itemType, $item, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
-		// TODO Doesn't handle types 
 		switch ($shareType) {
 			case self::SHARE_TYPE_USER:
 				\OC_Log::write('OCP\Share', 'share type '.$shareType, \OC_Log::ERROR);
@@ -168,6 +167,7 @@ class Share {
 				$uidSharedWith = '';
 				$gidSharedWith = null;
 				break;
+			// Future share types need to include their own conditions
 			default:
 				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
 				return false;
@@ -204,20 +204,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function unshare($itemType, $item, $shareType, $shareWith) {
-		$uidOwner = \OC_User::getUser();
-		switch ($shareType) {
-			case self::SHARE_TYPE_USER:
-			case self::SHARETYPE_PRIVATE_LINK:
-				$item = self::getItems($itemType, $item, $shareWith, null, $uidOwner, false, 1);
-				break;
-			case self::SHARE_TYPE_GROUP:
-				$item = self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1);
-				break;
-			default:
-				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
-				return false;
-		}
-		if ($item) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -265,7 +252,8 @@ class Share {
 	public static function setTarget($itemType, $oldTarget, $newTarget) {
 		if ($backend = self::getBackend($itemType)) {
 			$uidSharedWith = \OC_User::getUser();
-			if ($item = self::getItems($itemType, $oldTarget, $uidSharedWith, true, null, false, 1)) {
+			// TODO Check permissions for setting target?
+			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, 1)) {
 				// Check if this is a group share
 				if ($item['uid_shared_with'] == null) {
 					// A new entry needs to be created exclusively for the user
@@ -303,20 +291,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
-		$uidOwner = \OC_User::getUser();
-		switch ($shareType) {
-			case self::SHARE_TYPE_USER:
-			case self::SHARETYPE_PRIVATE_LINK:
-				$item = self::getItems($itemType, $item, $shareWith, null, $uidOwner, false, 1);
-				break;
-			case self::SHARE_TYPE_GROUP:
-				$item = self::getItems($itemType, $item, null, $shareWith, $uidOwner, false, 1);
-				break;
-			default:
-				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
-				return false;
-		}
-		if ($item) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*sharing WHERE id = ? LIMIT 1');

From 819811461535cceb8208651f6a131cbb97efd169 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 16:42:51 -0400
Subject: [PATCH 0671/1537] Some more changes to getItems() and fixes in shared
 storage

---
 apps/files_sharing/sharedstorage.php | 15 +++++++++----
 lib/public/share.php                 | 32 +++++++++++++++++++---------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 21aa2f23b9..11a5d39f01 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -38,16 +38,23 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			return $this->sourcePaths[$target];
 		} else {
 			if (dirname($target) != $this->sharedFolder) {
-				$pos = strlen($this->sharedFolder);
+				$len = strlen($this->sharedFolder);
+				$pos = strpos($target, '/', $len);
 				// Get shared folder name
-				$itemTarget = substr($target, $pos, strpos($target, '/', $pos));
+				$itemTarget = substr($target, $len, $pos);
+				$insideFolder = true;
 			} else {
 				$itemTarget = $target;
+				$insideFolder = false;
 			}
 			$sourcePath = OCP\Share::getItemSharedWith('file', $itemTarget, OC_Share_Backend_File::FORMAT_SOURCE_PATH);
 			if ($sourcePath) {
-				$this->sourcePaths[$target] = $sourcePath;
-				return $sourcePath;
+				if ($insideFolder) {
+					$this->sourcePaths[$target] = $sourcePath.substr($target, $pos);
+				} else {
+					$this->sourcePaths[$target] = $sourcePath;
+				}
+				return $this->sourcePaths[$target];
 			}
 			return false;
 		}
diff --git a/lib/public/share.php b/lib/public/share.php
index ec371ebf98..f4a11a170a 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -375,11 +375,11 @@ class Share {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
 			if (isset($itemType)) {
 				if ($parents = self::getParentItemTypes($itemType)) {
-				$where = "WHERE item_type IN ('".$itemType."'";
-				foreach ($parents as $parent) {
-					$where .= ", '.$parent.'";
-				}
-				$where .= ')';
+					$where = "WHERE item_type IN ('".$itemType."'";
+					foreach ($parents as $parent) {
+						$where .= ", '.$parent.'";
+					}
+					$where .= ')';
 				} else {
 					$where = "WHERE item_type = '".$itemType."'";
 				}
@@ -401,6 +401,10 @@ class Share {
 			}
 			if (isset($uidOwner)) {
 				$where .= " AND uid_owner = '".$uidOwner."'";
+				if (!isset($shareType)) {
+					// Prevent unique user targets for group shares from being selected
+					$where .= " AND share_type != '".self::$shareTypeGroupUserUnique."'";
+				}
 			}
 			if (isset($item)) {
 				// If looking for own shared items, check item_source else check item_target
@@ -423,25 +427,33 @@ class Share {
 				}
 			}
 			if ($limit != -1) {
+				if ($limit == 1 && $shareType == self::$shareTypeUserAndGroups) {
+					// Make sure the unique user target is returned if it exists, unique targets should follow the group share in the database
+					// If the limit is not 1, the filtering can be done later
+					$where .= ' ORDER BY id DESC';
+				}
 				$where .= ' LIMIT '.$limit;
 			}
 			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*sharing '.$where);
 			$result = $query->execute();
 			$items = array();
 			while ($item = $result->fetchRow()) {
-				// TODO Filter out duplicate group shares for users with unique targets
+				// Filter out duplicate group shares for users with unique targets
 				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
-					// Group shares should already be in items array
-					
+					// Group shares should already be in the items array
+					unset($items[$item['parent']]);
 				}
 				// TODO Add in parent item types children?
 				if ($parents && in_array($item['item_type'], $parents)) {
 					$children[] = $item;
 				}
-// 				$items[] = array($item['item_source'] => $item['id'];
-				$items[$item['item']][$item['id']] = array('item_target' => $item['item_target'], 'permissions' => $item['permissions'], 'stime' => $item['stime']);
+				$items[$item['id']] = $item;
 			}
 			if ($format == self::FORMAT_NONE) {
+				if ($limit == 1) {
+					// Return just the item instead of 2-dimensional array
+					return $items[key($items)];
+				}
 				return $items;
 			} else {
 				return $backend->formatItems($items, $format);

From bc68f14c4baba0438bf019af144564eec6624760 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 19:16:50 -0400
Subject: [PATCH 0672/1537] Prepare drop down UI for share API

---
 apps/files_sharing/appinfo/app.php |   2 +-
 core/ajax/share.php                |  51 ++++++++----
 core/js/share.js                   | 123 +++++++++++------------------
 lib/public/share.php               |  30 +++++--
 4 files changed, 107 insertions(+), 99 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index bbb753d5e6..d51a4f5164 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -17,7 +17,7 @@ OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFrom
 
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
 if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') {
-	OCP\Util::addscript("files_sharing", "share");
+	OCP\Util::addScript('core', 'share');
 }
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle( 'files_sharing', 'sharing' );
diff --git a/core/ajax/share.php b/core/ajax/share.php
index f87c12dbb5..11fee4a000 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -20,23 +20,40 @@
 */
 
 OCP\JSON::checkLoggedIn();
-switch ($_POST['action']) {
-	case 'share':
-		$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-		($return) ? OCP\JSON::success() : OCP\JSON::error();
-		break;
-	case 'unshare':
-		$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']);
-		($return) ? OCP\JSON::success() : OCP\JSON::error();
-		break;
-	case 'setTarget':
-		$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
-		($return) ? OCP\JSON::success() : OCP\JSON::error();
-		break;
-	case 'setPermissions':
-		$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-		($return) ? OCP\JSON::success() : OCP\JSON::error();
-		break;
+if (isset($_POST['action'])) {
+	switch ($_POST['action']) {
+		case 'share':
+			$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+			// TODO May need to return private link
+			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			break;
+		case 'unshare':
+			$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']);
+			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			break;
+		case 'setTarget':
+			$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
+			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			break;
+		case 'setPermissions':
+			$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			break;
+	}
+} else if (isset($_GET['fetch'])) {
+	switch ($_GET['fetch']) {
+		case 'getItemsSharedStatuses':
+			$return = OCP\Share::getItemsSharedStatuses($_POST['itemType']);
+			($return) ? OCP\JSON::success(array('data' => $return)) : OCP\JSON::error();
+			break;
+		case 'getItemShared':
+			$return = OCP\Share::getItemShared($_POST['itemType'], $_POST['item']);
+			($return) ? OCP\JSON::success(array('data' => $return)) : OCP\JSON::error();
+			break;
+		case 'getShareWith':
+			// TODO Autocomplete for all users, groups, etc.
+			break;
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/core/js/share.js b/core/js/share.js
index 5f695774ce..9ba35616a4 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -1,35 +1,34 @@
 OC.Share={
-	icons:[],
-	itemUsers:[],
-	itemGroups:[],
-	itemPrivateLink:false,
-	usersAndGroups:[],
-	loadIcons:function() {
-		// Cache all icons for shared files
-		$.getJSON(OC.filePath('core', 'ajax', 'share.php'), function(result) {
+	item:[],
+	statuses:[],
+	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) {
-					if (hasPrivateLink) {
-						OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
+					// Private links override shared in terms of icon display
+					if (itemType == 'file') {
+						OC.Share.statuses[item] = hasPrivateLink;
 					} else {
-						OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
+						if (hasPrivateLink) {
+							$('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/public'));
+						} else {
+							$('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/shared'));
+						}
 					}
 				});
 			}
 		});
 	},
-	loadItem:function(item) {
-		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { item: item }, async: false, success: function(result) {
+	loadItem:function(itemType, item) {
+		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemShared', itemType: itemType, item: item }, async: false, function(result) {
 			if (result && result.status === 'success') {
-				var item = result.data;
-				OC.Share.itemUsers = item.users;
-				OC.Share.itemGroups = item.groups;
-				OC.Share.itemPrivateLink = item.privateLink;
+				OC.Share.item = result.data;
 			}
 		}});
 	},
-	share:function(source, uid_shared_with, permissions, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
+	share:function(itemType, shareType, shareWith, permissions, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
 			if (result && result.status === 'success') {
 				if (callback) {
 					callback(result.data);
@@ -39,8 +38,8 @@ OC.Share={
 			}
 		});
 	},
-	unshare:function(source, uid_shared_with, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) {
+	unshare:function(itemType, shareType, shareWith, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, shareType: shareType, shareWith: shareWith }, function(result) {
 			if (result && result.status === 'success') {
 				if (callback) {
 					callback();
@@ -50,16 +49,17 @@ OC.Share={
 			}
 		});
 	},
-	setPermissions:function(source, uid_shared_with, permissions) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
+	setPermissions:function(itemType, item, shareType, shareWith, permissions) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
 			if (!result || result.status !== 'success') {
 				OC.dialogs.alert('Error', 'Error while changing permissions');
 			}
 		});
 	},
-	showDropDown:function(item, appendTo) {
+	showDropDown:function(itemType, item, appendTo) {
 		OC.Share.loadItem(item);
 		var html = '<div id="dropdown" class="drop" data-item="'+item+'">';
+		// TODO replace with autocomplete textbox
 		html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
 		html += '<option value="" selected="selected" disabled="disabled">Your groups & members</option>';
 		html += '</select>';
@@ -81,43 +81,6 @@ OC.Share={
 		html += '</form>';
 		html += '</div>';
 		$(html).appendTo(appendTo);
-		if (OC.Share.usersAndGroups.length < 1) {
-			$.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'userautocomplete.php'), async: false, success: function(users) {
-				if (users) {
-					OC.Share.usersAndGroups = users;
-					$.each(users, function(index, user) {
-						$(user).appendTo('#share_with');
-					});
-					$('#share_with').trigger('liszt:updated');
-				}
-			}});
-		} else {
-			$.each(OC.Share.usersAndGroups, function(index, user) {
-				$(user).appendTo('#share_with');
-			});
-			$('#share_with').trigger('liszt:updated');
-		}
-		if (OC.Share.itemUsers) {
-			$.each(OC.Share.itemUsers, function(index, user) {
-				if (user.parentFolder) {
-					OC.Share.addSharedWith(user.uid, user.permissions, false, user.parentFolder);
-				} else {
-					OC.Share.addSharedWith(user.uid, user.permissions, false, false);
-				}
-			});
-		}
-		if (OC.Share.itemGroups) {
-			$.each(OC.Share.itemGroups, function(index, group) {
-				if (group.parentFolder) {
-					OC.Share.addSharedWith(group.gid, group.permissions, group.users, group.parentFolder);
-				} else {
-					OC.Share.addSharedWith(group.gid, group.permissions, group.users, false);
-				}
-			});
-		}
-		if (OC.Share.itemPrivateLink) {
-			OC.Share.showPrivateLink(item, OC.Share.itemPrivateLink);
-		}
 		$('#dropdown').show('blind');
 		$('#share_with').chosen();
 	},
@@ -215,49 +178,57 @@ OC.Share={
 
 $(document).ready(function() {
 
+	$('.share').live('click', function() {
+		if ($(this).data('itemType') !== undefined && $(this).data('item') !== undefined) {
+			OC.Share.showDropDown($(this).data('itemType'), $(this).data('item'), $(this));
+		}
+	});
+	
 	if (typeof FileActions !== 'undefined') {
-		OC.Share.loadIcons();
+		OC.Share.loadIcons('file');
 		FileActions.register('all', 'Share', function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
 			var item =  $('#dir').val() + '/' + filename;
-			// Check if icon is in cache
-			if (OC.Share.icons[item]) {
-				return OC.Share.icons[item];
+			// Check if status is in cache
+			if (OC.Share.statuses[item] === true) {
+				return OC.imagePath('core', 'actions/public');
+			} else if (OC.Share.statuses[item] === false) {
+				return OC.imagePath('core', 'actions/shared');
 			} else {
 				var last = '';
 				var path = OC.Share.dirname(item);
 				// Search for possible parent folders that are shared
 				while (path != last) {
-					if (OC.Share.icons[path]) {
-						OC.Share.icons[item] = OC.Share.icons[path];
-						return OC.Share.icons[item];
+					if (OC.Share.statuses[path] === true) {
+						return OC.imagePath('core', 'actions/public');
+					} else if (OC.Share.statuses[path] === false) {
+						return OC.imagePath('core', 'actions/shared');
 					}
 					last = path;
 					path = OC.Share.dirname(path);
 				}
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-				return OC.Share.icons[item];
+				return OC.imagePath('core', 'actions/share');
 			}
 		}, function(filename) {
-			var file = $('#dir').val() + '/' + filename;
+			var item = $('#dir').val() + '/' + filename;
 			var appendTo = $('tr').filterAttr('data-file',filename).find('td.filename');
 			// Check if drop down is already visible for a different file
 			if (($('#dropdown').length > 0)) {
-				if (file != $('#dropdown').data('item')) {
+				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
 						$('tr').removeClass('mouseOver');
-						$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-						OC.Share.showDropDown(file, appendTo);
+						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
+						OC.Share.showDropDown('file', item, appendTo);
 					});
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(file, appendTo);
+				OC.Share.showDropDown('file', item, appendTo);
 			}
 		});
 	};
-	
+
 	$(this).click(function(event) {
 		if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
 			if ($('#dropdown').is(':visible')) {
diff --git a/lib/public/share.php b/lib/public/share.php
index f4a11a170a..b77a986f44 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -30,8 +30,7 @@ class Share {
 	
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
-	const SHARETYPE_CONTACT = 2;
-	const SHARETYPE_PRIVATE_LINK = 4;
+	const SHARE_TYPE_PRIVATE_LINK = 3;
 
 	const PERMISSION_READ = 0;
 	const PERMISSION_UPDATE = 1;
@@ -39,9 +38,10 @@ class Share {
 	const PERMISSION_SHARE = 3;
 
 	const FORMAT_NONE = -1;
+	const FORMAT_STATUSES = -2;
 
 	private static $shareTypeUserAndGroups = -1;
-	private static $shareTypeGroupUserUnique = 3;
+	private static $shareTypeGroupUserUnique = 2;
 	private static $backends = array();
 
 	/**
@@ -95,7 +95,7 @@ class Share {
 	* @param int Number of items to return (optional) Returns all by default
 	* @return Return depends on format
 	*/
-	public static function getItemsOwned($itemType, $format = self::FORMAT_NONE, $limit = -1) {
+	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $limit = -1) {
 		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $limit);
 	}
 
@@ -106,10 +106,20 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemOwned($itemType, $item, $format = self::FORMAT_NONE) {
+	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE) {
 		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, 1);
 	}
 
+	/**
+	* @brief Get the status of each shared item of item type owned by the current user
+	* @param string Item type
+	* @param int Number of items to return (optional) Returns all by default
+	* @return array, item as key with a value of true if item has a private link or false
+	*/
+	public static function getItemsSharedStatuses($itemType, $limit = -1) {
+		return self::getItems($itemType, null, null, null, \OC_User::getUser(), self::FORMAT_STATUSES, $limit);
+	}
+
 	/**
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
@@ -455,6 +465,16 @@ class Share {
 					return $items[key($items)];
 				}
 				return $items;
+			} else if ($format == self::FORMAT_STATUSES) {
+				$statuses = array();
+				foreach ($items as $item) {
+					if ($item['shareType'] == self::SHARE_TYPE_PRIVATE_LINK) {
+						$statuses[$item['item']] = true;
+					} else if (!isset($statuses[$item['item']])) {
+						$statuses[$items['item']] = false;
+					}
+				}
+				return $statuses;
 			} else {
 				return $backend->formatItems($items, $format);
 			}

From f21fdf14f9456b5a25c78f48d03063c383cdbdc2 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 19:25:41 -0400
Subject: [PATCH 0673/1537] Forgot I got rid of the class field backendTypes,
 use the array keys of the backends field instead

---
 core/js/share.js     | 2 +-
 lib/public/share.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 9ba35616a4..b7821ce14b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -25,7 +25,7 @@ OC.Share={
 			if (result && result.status === 'success') {
 				OC.Share.item = result.data;
 			}
-		}});
+		});
 	},
 	share:function(itemType, shareType, shareWith, permissions, callback) {
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
diff --git a/lib/public/share.php b/lib/public/share.php
index b77a986f44..0ba4cefad9 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -355,8 +355,9 @@ class Share {
 	* @return array
 	*/
 	private static function getParentItemTypes($itemType) {
+		$backendTypes = array_keys(self::$backends);
 		$parents = array($itemType);
-		foreach (self::$backendTypes as $type => $backend) {
+		foreach ($backendTypes as $type => $backend) {
 			if (in_array($backend->dependsOn, $parents)) {
 				$parents[] = $type;
 			}
@@ -497,7 +498,8 @@ class Share {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
-			foreach (self::$backendTypes as $type => $backend) {
+			$backendTypes = array_keys(self::$backends);
+			foreach ($backendTypes as $type => $backend) {
 				if (isset($backend['dependsOn']) && $backend['dependsOn'] == 'file' && isset($backend['supportedFileExtensions']) && in_array($extension, $backend['supportedFileExtensions'])) {
 					$itemType = $type;
 					break;

From 28b7793d5bc3e89dd1fd85fe0461e9c7b2dd4133 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 20:12:33 -0400
Subject: [PATCH 0674/1537] Fixes and change database table from sharing to
 share

---
 apps/files_sharing/appinfo/app.php |  2 +
 lib/public/share.php               | 82 +++++++++++++++---------------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index d51a4f5164..281ab00d77 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,6 +1,7 @@
 <?php
 
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
+OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/share.php";
 OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/sharedstorage.php";
 
 OCP\App::registerAdmin('files_sharing', 'settings');
@@ -22,3 +23,4 @@ if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', '
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle( 'files_sharing', 'sharing' );
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
+OCP\Share::registerBackend('file', new OC_Share_Backend_File());
diff --git a/lib/public/share.php b/lib/public/share.php
index 0ba4cefad9..3ceb9f590c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -58,11 +58,11 @@ class Share {
 				self::$backends[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
 				return true;
 			} else {
-				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backends[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
+				\OC_Log::write('OCP\Share', 'Sharing backend '.get_class($class).' not registered, '.get_class(self::$backends[$itemType]['class']).' is already registered for '.$itemType, \OC_Log::WARN);
 				return false;
 			}
 		}
-		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, the class must extend abstract class OC_Share_Backend', \OC_Log::ERROR);
+		\OC_Log::write('OCP\Share', 'Sharing backend '.get_class($class).' not registered, the class must extend abstract class OC_Share_Backend', \OC_Log::ERROR);
 		return false;
 	}
 
@@ -232,7 +232,7 @@ class Share {
 		if ($item = self::getItems($itemType, $itemTarget, $uidSharedWith, true, null, false, 1)) {
 			// Check if item is inside a shared folder and was converted
 			if ($item['parent']) {
-				$query = \OC_DB::prepare('SELECT item_type FROM *PREFIX*sharing WHERE id = ? LIMIT 1');
+				$query = \OC_DB::prepare('SELECT item_type FROM *PREFIX*share WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
 				if (isset($result['item_type']) && $result['item_type'] == 'folder') {
 					return false;
@@ -240,7 +240,7 @@ class Share {
 			}
 			// Check if this is a group share, if it is a group share a new entry needs to be created marked as unshared from self
 			if ($item['uid_shared_with'] == null) {
-				$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?,?,?,?,?,?)');
+				$query = \OC_DB::prepare('INSERT INTO *PREFIX*share VALUES(?,?,?,?,?,?,?,?,?,?)');
 				$result = $query->execute(array($item['item_type'], $item['item_source'], $item['item_target'], $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], self::UNSHARED_FROM_SELF, $item['stime'], $item['file_source'], $item['file_target']));
 				if (\OC_DB::isError($result)) {
 // 					\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
@@ -267,7 +267,7 @@ class Share {
 				// Check if this is a group share
 				if ($item['uid_shared_with'] == null) {
 					// A new entry needs to be created exclusively for the user
-					$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?,?,?,?,?,?)');
+					$query = \OC_DB::prepare('INSERT INTO *PREFIX*share VALUES(?,?,?,?,?,?,?,?,?,?)');
 					if (isset($item['file_target'])) {
 						$fileTarget = $newTarget;
 					} else {
@@ -278,10 +278,10 @@ class Share {
 				} else {
 					// Check if this item is a file or folder, update the file_target as well if this is the case
 					if ($itemType == 'file' || $itemType == 'folder') {
-						$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET item_target = ?, file_target = REPLACE(file_target, ?, ?) WHERE uid_shared_with = ?');
+						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ?, file_target = REPLACE(file_target, ?, ?) WHERE uid_shared_with = ?');
 						$query->execute(array($newTarget, $oldTarget, $newTarget, $uidSharedWith));
 					} else {
-						$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET item_target = ? WHERE item_type = ? AND item_target = ? AND uid_shared_with = ?');
+						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ? WHERE item_type = ? AND item_target = ? AND uid_shared_with = ?');
 						$query->execute(array($newTarget, $itemType, $oldTarget, $uidSharedWith));
 					}
 					return true;
@@ -304,20 +304,20 @@ class Share {
 		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
-				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*sharing WHERE id = ? LIMIT 1');
+				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
 				if (!isset($result['permissions']) || $permissions > $result['permissions']) {
 					\OC_Log::write('OCP\Share', '', \OC_Log::ERROR);
 					return false;
 				}
 			}
-			$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET permissions = ? WHERE id = ?');
+			$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = ? WHERE id = ?');
 			$query->execute(array($permissions, $item['id']));
 			// Check if permissions were reduced
 			if ($permissions < $item['permissions']) {
 				// Reduce the permissions for all reshares of this item
 				$ids = array($item['id']);
-				$query = \OC_DB::prepare('SELECT id, parent, permissions FROM *PREFIX*sharing WHERE item_source = ?');
+				$query = \OC_DB::prepare('SELECT id, parent, permissions FROM *PREFIX*share WHERE item_source = ?');
 				$result = $query->execute(array($item['item_source']));
 				while ($item = $result->fetchRow()) {
 					if (in_array($item['parent'], $ids) && $item['permissions'] > $permissions) {
@@ -327,7 +327,7 @@ class Share {
 				// Remove parent item from array, this item's permissions already got updated
 				unset($ids[0]);
 				if (!empty($ids)) {
-					$query = \OC_DB::prepare('UPDATE *PREFIX*sharing SET permissions = ? WHERE id IN (?)');
+					$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = ? WHERE id IN (?)');
 					$query->execute(array($permissions, implode(',', $ids)));
 				}
 			}
@@ -445,7 +445,7 @@ class Share {
 				}
 				$where .= ' LIMIT '.$limit;
 			}
-			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*sharing '.$where);
+			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*share '.$where);
 			$result = $query->execute();
 			$items = array();
 			while ($item = $result->fetchRow()) {
@@ -460,24 +460,26 @@ class Share {
 				}
 				$items[$item['id']] = $item;
 			}
-			if ($format == self::FORMAT_NONE) {
-				if ($limit == 1) {
-					// Return just the item instead of 2-dimensional array
-					return $items[key($items)];
-				}
-				return $items;
-			} else if ($format == self::FORMAT_STATUSES) {
-				$statuses = array();
-				foreach ($items as $item) {
-					if ($item['shareType'] == self::SHARE_TYPE_PRIVATE_LINK) {
-						$statuses[$item['item']] = true;
-					} else if (!isset($statuses[$item['item']])) {
-						$statuses[$items['item']] = false;
+			if (!empty($items)) {
+				if ($format == self::FORMAT_NONE) {
+					if ($limit == 1) {
+						// Return just the item instead of 2-dimensional array
+						return $items[key($items)];
 					}
+					return $items;
+				} else if ($format == self::FORMAT_STATUSES) {
+					$statuses = array();
+					foreach ($items as $item) {
+						if ($item['shareType'] == self::SHARE_TYPE_PRIVATE_LINK) {
+							$statuses[$item['item']] = true;
+						} else if (!isset($statuses[$item['item']])) {
+							$statuses[$items['item']] = false;
+						}
+					}
+					return $statuses;
+				} else {
+					return $backend->formatItems($items, $format);
 				}
-				return $statuses;
-			} else {
-				return $backend->formatItems($items, $format);
 			}
 		}
 		return false;
@@ -494,7 +496,7 @@ class Share {
 	* @param bool|array Parent folder target (optional)
 	* @return bool
 	*/
-	private static function put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = false) {
+	private static function put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
@@ -533,7 +535,7 @@ class Share {
 					$fileSource = null;
 				}
 			}
-			$query = \OC_DB::prepare('INSERT INTO *PREFIX*sharing (item_type, item, item_source, item_target, parent, uid_shared_with, gid_shared_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+			$query = \OC_DB::prepare('INSERT INTO *PREFIX*share (item_type, item, item_source, item_target, parent, share_type, share_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
 			// Share with a group
 			if ($shareType == self::SHARE_TYPE_GROUP) {
 				if (isset($fileSource)) {
@@ -559,7 +561,7 @@ class Share {
 				$groupItemTarget = $backend->generateTarget($item, false);
 				$query->execute(array($itemType, $item, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
 				// Save this id, any extra rows for this group share will need to reference it
-				$parent = \OC_DB::insertid('*PREFIX*sharing');
+				$parent = \OC_DB::insertid('*PREFIX*share');
 				// Loop through all users of this group in case we need to add an extra row
 				foreach ($shareWith['users'] as $uid) {
 					$itemTarget = $backend->generateTarget($item, $uid);
@@ -583,7 +585,7 @@ class Share {
 					// Insert an extra row for the group share if the item or file target is unique for this user
 					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
 						$query->execute(array($itemType, $item, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-						$id = \OC_DB::insertid('*PREFIX*sharing');
+						$id = \OC_DB::insertid('*PREFIX*share');
 					}
 					if ($parentFolder === true) {
 						$parentFolders['id'] = $id;
@@ -594,24 +596,24 @@ class Share {
 					return $parentFolders;
 				}
 			} else {
-				$itemTarget = $backend->generateTarget($item, $uidSharedWith);
+				$itemTarget = $backend->generateTarget($item, $shareWith);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $shareWith);
 							$parentFolders['folder'] = $fileTarget;
 						} else {
 							$fileTarget = $parentFolder['folder'].$item;
 							$parent = $parentFolder['id'];
 						}
 					} else {
-						$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+						$fileTarget = self::getBackend('file')->generateTarget($source['file'], $shareWith);
 					}
 				} else {
 					$fileTarget = null;
 				}
 				$query->execute(array($itemType, $item, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-				$id = \OC_DB::insertid('*PREFIX*sharing');
+				$id = \OC_DB::insertid('*PREFIX*share');
 				if ($parentFolder === true) {
 					$parentFolders['id'] = $id;
 					// Return parent folder to preserve file target paths for potential children
@@ -630,7 +632,7 @@ class Share {
 	* @param bool
 	*/
 	private static function delete($parent, $excludeParent = false) {
-		$query = \OC_DB::prepare('SELECT id FROM *PREFIX*sharing WHERE parent IN (?)');
+		$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN (?)');
 		$ids = array($parent);
 		while ($item = $query->execute(array(implode("','", $ids)))->fetchRow()) {
 			$ids[] = $item['id'];
@@ -639,7 +641,7 @@ class Share {
 			unset($ids[0]);
 		}
 		if (!empty($ids)) {
-			$query = \OC_DB::prepare('DELETE FROM *PREFIX*sharing WHERE id IN (?)');
+			$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE id IN (?)');
 			$query->execute(array(implode("','", $ids)));
 		}
 	}
@@ -650,10 +652,10 @@ class Share {
 	
 	public static function post_deleteUser($arguments) {
 		// Delete any items shared with the deleted user
-		$query = \OC_DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_shared_with = ?');
+		$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE uid_shared_with = ?');
 		$result = $query->execute(array($arguments['uid']));
 		// Delete any items the deleted user shared
-		$query = \OC_DB::prepare('SELECT id, item_source FROM *PREFIX*sharing WHERE uid_owner = ?');
+		$query = \OC_DB::prepare('SELECT id, item_source FROM *PREFIX*share WHERE uid_owner = ?');
 		$result = $query->execute(array($arguments['uid']));
 		while ($item = $result->fetchRow()) {
 			self::delete($item['id']);

From 32f9901bcd8b767b93520de346e092147dbb205b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 22:17:54 -0400
Subject: [PATCH 0675/1537] Fix retrieving supported file extensions from
 backend and remove the dependsOn and supportedFileExtensions parameters from
 registerBackend()

---
 apps/gallery/appinfo/app.php |  3 +++
 lib/public/share.php         | 21 +++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index df3b68ef73..9efb4346c3 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -28,6 +28,9 @@ OC::$CLASSPATH['OC_Gallery_Sharing'] = 'gallery/lib/sharing.php';
 OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'gallery/lib/hooks_handlers.php';
 OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php';
 OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php';
+OC::$CLASSPATH['OC_Share_Backend_Photo'] = 'gallery/lib/share.php';
+
+OCP\Share::registerBackend('photo', new OC_Share_Backend_Photo());
 
 $l = OC_L10N::get('gallery');
 
diff --git a/lib/public/share.php b/lib/public/share.php
index 3ceb9f590c..1376eb4ded 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -52,13 +52,13 @@ class Share {
 	* @param array (optional) List of supported file extensions if this item type depends on files
 	* @return Returns true if backend is registered or false if error
 	*/
-	public static function registerBackend($itemType, $class, $dependsOn = null, $supportedFileExtensions = null) {
+	public static function registerBackend($itemType, $class) {
 		if (is_subclass_of($class, 'OCP\Share_Backend')) {
 			if (!isset(self::$backends[$itemType])) {
-				self::$backends[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
+				self::$backends[$itemType] = $class;
 				return true;
 			} else {
-				\OC_Log::write('OCP\Share', 'Sharing backend '.get_class($class).' not registered, '.get_class(self::$backends[$itemType]['class']).' is already registered for '.$itemType, \OC_Log::WARN);
+				\OC_Log::write('OCP\Share', 'Sharing backend '.get_class($class).' not registered, '.get_class(self::$backends[$itemType]).' is already registered for '.$itemType, \OC_Log::WARN);
 				return false;
 			}
 		}
@@ -342,8 +342,8 @@ class Share {
 	* @return Sharing backend object
 	*/
 	private static function getBackend($itemType) {
-		if (isset(self::$backends[$itemType]['class'])) {
-			return self::$backends[$itemType]['class'];
+		if (isset(self::$backends[$itemType])) {
+			return self::$backends[$itemType];
 		}
 		\OC_Log::write('OCP\Share', 'Sharing backend for '.$itemType.' not found', \OC_Log::ERROR);
 		return false;
@@ -500,9 +500,8 @@ class Share {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
-			$backendTypes = array_keys(self::$backends);
-			foreach ($backendTypes as $type => $backend) {
-				if (isset($backend['dependsOn']) && $backend['dependsOn'] == 'file' && isset($backend['supportedFileExtensions']) && in_array($extension, $backend['supportedFileExtensions'])) {
+			foreach (self::$backends as $type => $backend) {
+				if (isset($backend->dependsOn) && $backend->dependsOn == 'file' && isset($backend->supportedFileExtensions) && in_array($extension, $backend->supportedFileExtensions)) {
 					$itemType = $type;
 					break;
 				}
@@ -677,10 +676,8 @@ class Share {
 */
 abstract class Share_Backend {
 
-	public static $dependsOn;
-	public static $supportedFileExtensions = array();
-
-
+	public $dependsOn;
+	public $supportedFileExtensions = array();
 
 	/**
 	* @brief Get the source of the item to be stored in the database

From 243faf63349b184eadbeaa795f2aa54692cf9e51 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 23:00:29 -0400
Subject: [PATCH 0676/1537] Fix searching for parent item types, search for
 file source instead of item source for the file item type in case the item
 was converted

---
 lib/public/share.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 1376eb4ded..469b91b9f1 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -355,9 +355,8 @@ class Share {
 	* @return array
 	*/
 	private static function getParentItemTypes($itemType) {
-		$backendTypes = array_keys(self::$backends);
 		$parents = array($itemType);
-		foreach ($backendTypes as $type => $backend) {
+		foreach (self::$backends as $type => $backend) {
 			if (in_array($backend->dependsOn, $parents)) {
 				$parents[] = $type;
 			}
@@ -386,11 +385,7 @@ class Share {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
 			if (isset($itemType)) {
 				if ($parents = self::getParentItemTypes($itemType)) {
-					$where = "WHERE item_type IN ('".$itemType."'";
-					foreach ($parents as $parent) {
-						$where .= ", '.$parent.'";
-					}
-					$where .= ')';
+					$where = "WHERE item_type IN ('".implode("','", $parents)."')";
 				} else {
 					$where = "WHERE item_type = '".$itemType."'";
 				}
@@ -405,9 +400,9 @@ class Share {
 					$where .= " AND share_type IN ('".self::SHARE_TYPE_USER."','".self::SHARE_TYPE_GROUP."','".self::$shareTypeGroupUserUnique."')";
 					$groups = \OC_Group::getUserGroups($shareWith);
 					$userAndGroups = array_merge(array($shareWith), $groups);
-					$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
+					$where .= " AND share_with IN ('".implode(",", $userAndGroups).")";
 				} else {
-					$where .= " AND share_type = '".$shareType."' AND share_with = '".$shareWith."'";
+					$where .= " AND share_type = ".$shareType." AND share_with = '".$shareWith."'";
 				}
 			}
 			if (isset($uidOwner)) {
@@ -420,14 +415,19 @@ class Share {
 			if (isset($item)) {
 				// If looking for own shared items, check item_source else check item_target
 				if (isset($uidOwner)) {
-					// Check if this item depends on a file and getSource() returned an array
 					$source = $backend->getSource($item, $uidOwner);
-					if (is_array($source)) {
-						$itemSource = $source['item'];
+					// If item type is a file, file source needs to be checked in case the item was converted
+					if ($itemType == 'file') {
+						$where .= " AND file_source = ".\OC_FileCache::getId($source['file']);
 					} else {
-						$itemSource = $source;
+						// Check if this item depends on a file and getSource() returned an array
+						if (is_array($source)) {
+							$itemSource = $source['item'];
+						} else {
+							$itemSource = $source;
+						}
+						$where .= " AND item_source = '".$itemSource."'";
 					}
-					$where .= " AND item_source = '".$itemSource."'";
 				} else {
 					if ($itemType == 'file' && substr($item, -1) == '/') {
 						// Special case to select only the shared files inside the folder
@@ -528,7 +528,7 @@ class Share {
 					return false;
 				} else if (is_array($source)) {
 					$itemSource = $source['item'];
-					$fileSource = self::getBackend('file')->getId($source['file']);
+					$fileSource = \OC_FileCache::getId($source['file']);
 				} else {
 					$itemSource = $source;
 					$fileSource = null;

From c41cb192c9e903ac6b4a911b851b848e71a97303 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 24 Jun 2012 23:12:20 -0400
Subject: [PATCH 0677/1537] Fix which line needs '' wrapped around the array
 values

---
 lib/public/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 469b91b9f1..a00b35fef4 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -397,10 +397,10 @@ class Share {
 			if (isset($shareType) && isset($shareWith)) {
 				// Include all user and group items
 				if ($shareType == self::$shareTypeUserAndGroups) {
-					$where .= " AND share_type IN ('".self::SHARE_TYPE_USER."','".self::SHARE_TYPE_GROUP."','".self::$shareTypeGroupUserUnique."')";
+					$where .= " AND share_type IN (".self::SHARE_TYPE_USER.",".self::SHARE_TYPE_GROUP.",".self::$shareTypeGroupUserUnique.")";
 					$groups = \OC_Group::getUserGroups($shareWith);
 					$userAndGroups = array_merge(array($shareWith), $groups);
-					$where .= " AND share_with IN ('".implode(",", $userAndGroups).")";
+					$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
 				} else {
 					$where .= " AND share_type = ".$shareType." AND share_with = '".$shareWith."'";
 				}

From d332e1e9c1b4289f8ecd927047e6d16234013908 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 22:51:05 +0200
Subject: [PATCH 0678/1537] Documentation fix

---
 lib/public/share.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index a00b35fef4..0a76bf6520 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -685,11 +685,10 @@ abstract class Share_Backend {
 	* @param string Owner of the item
 	* @return mixed|array|false Source
 	*
-	* Return a 
 	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
 	* Return false if the item does not exist for the user
 	*
-	* The translateItem() function will translate the source returned back into the item
+	* The formatItems() function will translate the source returned back into the item
 	*/
 	public abstract function getSource($item, $uid);
 
@@ -730,4 +729,4 @@ abstract class Share_Backend_Parent extends Share_Backend {
     
 }
 
-?>
\ No newline at end of file
+?>

From b9e1033563b534faa75b0e0562f441b4eaf83a7d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 25 Jun 2012 22:51:42 +0200
Subject: [PATCH 0679/1537] Basic framework for contacts sharing

---
 apps/contacts/appinfo/app.php |  2 ++
 apps/contacts/lib/share.php   | 54 +++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 apps/contacts/lib/share.php

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 64fe00eef1..f27db13ca7 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -3,6 +3,7 @@ OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
 OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
 OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
+OC::$CLASSPATH['OC_Contacts_Share'] = 'apps/contacts/lib/share.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
 OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
 OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Contacts_Hooks', 'createUser');
@@ -21,3 +22,4 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('contacts','settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
+OCP\Share::registerBackend('addressbook', new OC_Contacts_Share());
diff --git a/apps/contacts/lib/share.php b/apps/contacts/lib/share.php
new file mode 100644
index 0000000000..d304042edd
--- /dev/null
+++ b/apps/contacts/lib/share.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Contacts_Share extends OCP\Share_Backend {
+	/**
+	* @brief Get the source of the item to be stored in the database
+	* @param string Item
+	* @param string Owner of the item
+	* @return mixed|array|false Source
+	*
+	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
+	* Return false if the item does not exist for the user
+	*
+	* The formatItems() function will translate the source returned back into the item
+	*/
+	public function getSource($item, $uid) {
+		$addressbook = OC_Contacts_Addressbook::find( $item );
+		if( $addressbook === false || $addressbook['userid'] != $uid) {
+			return false;
+		}
+		return $item;
+	}
+
+	/**
+	* @brief Get a unique name of the item for the specified user
+	* @param string Item
+	* @param string|false User the item is being shared with
+	* @param array|null List of similar item names already existing as shared items
+	* @return string Target name
+	*
+	* This function needs to verify that the user does not already have an item with this name.
+	* If it does generate a new name e.g. name_#
+	*/
+	public function generateTarget($item, $uid, $exclude = null) {
+	}
+
+	/**
+	* @brief Converts the shared item sources back into the item in the specified format
+	* @param array Sources of shared items
+	* @param int Format 
+	* @return ?
+	* 
+	* The items array is formatted with the sources as the keys to an array with the following keys: item_target, permissions, stime
+	* This function allows the backend to control the output of shared items with custom formats.
+	* It is only called through calls to the public getItem(s)SharedWith functions.
+	*/
+	public function formatItems($items, $format) {
+	}
+}

From 9fdfcc29febe4ae7d1f8f056878cd04f5596f1e0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Jun 2012 13:21:01 -0400
Subject: [PATCH 0680/1537] Fix group sharing

---
 lib/public/share.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 0a76bf6520..7982f78e43 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -170,7 +170,7 @@ class Share {
 				$group = $shareWith;
 				$shareWith = array();
 				$shareWith['group'] = $group;
-				$shareWith['users'] = array_diff(\OC_Group::usersInGroup($shareWith), array($uidOwner));
+				$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 				break;
 			case self::SHARETYPE_PRIVATE_LINK:
 				// TODO don't loop through folder conversion
@@ -567,7 +567,7 @@ class Share {
 					if (isset($fileSource)) {
 						if ($parentFolder) {
 							if ($parentFolder === true) {
-								$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+								$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
 								if ($fileTarget != $groupFileTarget) {
 									$parentFolders[$uid]['folder'] = $fileTarget;
 								}
@@ -576,7 +576,7 @@ class Share {
 								$parent = $parentFolder[$uid]['id'];
 							}
 						} else {
-							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
 						}
 					} else {
 						$fileTarget = null;

From b5961635eac898ee8a8c67aaa9f46fd91cbf53d0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Jun 2012 14:55:49 -0400
Subject: [PATCH 0681/1537] Fix ajax share file and replace 'User or Group'
 select form with a textbox

---
 core/ajax/share.php | 15 ++++++++-------
 core/js/share.js    | 47 +++++++++------------------------------------
 2 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 11fee4a000..3582f8596b 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -18,37 +18,38 @@
 * 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';
 
-OCP\JSON::checkLoggedIn();
+OC_JSON::checkLoggedIn();
 if (isset($_POST['action'])) {
 	switch ($_POST['action']) {
 		case 'share':
 			$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 			// TODO May need to return private link
-			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			($return) ? OC_JSON::success() : OC_JSON::error();
 			break;
 		case 'unshare':
 			$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']);
-			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			($return) ? OC_JSON::success() : OC_JSON::error();
 			break;
 		case 'setTarget':
 			$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
-			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			($return) ? OC_JSON::success() : OC_JSON::error();
 			break;
 		case 'setPermissions':
 			$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-			($return) ? OCP\JSON::success() : OCP\JSON::error();
+			($return) ? OC_JSON::success() : OC_JSON::error();
 			break;
 	}
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
 		case 'getItemsSharedStatuses':
 			$return = OCP\Share::getItemsSharedStatuses($_POST['itemType']);
-			($return) ? OCP\JSON::success(array('data' => $return)) : OCP\JSON::error();
+			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getItemShared':
 			$return = OCP\Share::getItemShared($_POST['itemType'], $_POST['item']);
-			($return) ? OCP\JSON::success(array('data' => $return)) : OCP\JSON::error();
+			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getShareWith':
 			// TODO Autocomplete for all users, groups, etc.
diff --git a/core/js/share.js b/core/js/share.js
index b7821ce14b..73a7ff86c2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -21,20 +21,20 @@ OC.Share={
 		});
 	},
 	loadItem:function(itemType, item) {
-		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemShared', itemType: itemType, item: item }, async: false, function(result) {
+		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemShared', itemType: itemType, item: item }, function(result) {
 			if (result && result.status === 'success') {
 				OC.Share.item = result.data;
 			}
 		});
 	},
-	share:function(itemType, shareType, shareWith, permissions, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+	share:function(itemType, item, shareType, shareWith, permissions, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, item: item, 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');
+				OC.dialogs.alert('Error', 'Error while sharing');
 			}
 		});
 	},
@@ -58,11 +58,9 @@ OC.Share={
 	},
 	showDropDown:function(itemType, item, appendTo) {
 		OC.Share.loadItem(item);
-		var html = '<div id="dropdown" class="drop" data-item="'+item+'">';
+		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
 		// TODO replace with autocomplete textbox
-		html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
-		html += '<option value="" selected="selected" disabled="disabled">Your groups & members</option>';
-		html += '</select>';
+		html += '<input id="shareWith" type="text" placeholder="Share with" />';
 		html += '<div id="sharedWithList">';
 		html += '<ul id="userList"></ul>';
 		html += '<div id="groups" style="display:none;">';
@@ -253,35 +251,8 @@ $(document).ready(function() {
 		}
 	});
 	
-	$('#share_with').live('change', function() {
-		var item = $('#dropdown').data('item');
-		var uid_shared_with = $(this).val();
-		var pos = uid_shared_with.indexOf('(group)');
-		var isGroup = false;
-		if (pos != -1) {
-			// Remove '(group)' from uid_shared_with
-			uid_shared_with = uid_shared_with.substr(0, pos);
-			isGroup = true;
-		}
-		OC.Share.share(item, uid_shared_with, 0, function() {
-			if (isGroup) {
-				// Reload item because we don't know which users are in the group
-				OC.Share.loadItem(item);
-				var users;
-				$.each(OC.Share.itemGroups, function(index, group) {
-					if (group.gid == uid_shared_with) {
-						users = group.users;
-					}
-				});
-				OC.Share.addSharedWith(uid_shared_with, 0, users, false);
-			} else {
-				OC.Share.addSharedWith(uid_shared_with, 0, false, false);
-			}
-			// Change icon
-			if (!OC.Share.itemPrivateLink) {
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-			}
-		});
+	$('#shareWith').live('change', function() {
+		OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item'), 0, $(this).val(), 0, false);
 	});
 	
 	$('.unshare').live('click', function() {
@@ -334,4 +305,4 @@ $(document).ready(function() {
 	$('#emailPrivateLink').live('submit', function() {
 		OC.Share.emailPrivateLink();
 	});
-});
\ No newline at end of file
+});

From 578b8a9da1a1a0bb28c3f73845dc1e36b99f096d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Jun 2012 15:01:14 -0400
Subject: [PATCH 0682/1537] $_POST variables should be $_GET for fetch

---
 core/ajax/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3582f8596b..c9bee6a7ed 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -44,11 +44,11 @@ if (isset($_POST['action'])) {
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
 		case 'getItemsSharedStatuses':
-			$return = OCP\Share::getItemsSharedStatuses($_POST['itemType']);
+			$return = OCP\Share::getItemsSharedStatuses($_GET['itemType']);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getItemShared':
-			$return = OCP\Share::getItemShared($_POST['itemType'], $_POST['item']);
+			$return = OCP\Share::getItemShared($_GET['itemType'], $_GET['item']);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getShareWith':

From d95d738723073de641d18368e208f79a4e253327 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Jun 2012 15:04:39 -0400
Subject: [PATCH 0683/1537] Fix FORMAT_STATUSES

---
 lib/public/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 7982f78e43..bdd2c316cd 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -470,10 +470,10 @@ class Share {
 				} else if ($format == self::FORMAT_STATUSES) {
 					$statuses = array();
 					foreach ($items as $item) {
-						if ($item['shareType'] == self::SHARE_TYPE_PRIVATE_LINK) {
+						if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
 							$statuses[$item['item']] = true;
 						} else if (!isset($statuses[$item['item']])) {
-							$statuses[$items['item']] = false;
+							$statuses[$item['item']] = false;
 						}
 					}
 					return $statuses;

From cb19fdd55bae285994540f5a7cb3f075317d50fe Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Jun 2012 19:27:57 -0400
Subject: [PATCH 0684/1537] Show users and groups shared with in dropdown

---
 core/js/share.js     | 27 +++++++++++++++++----------
 lib/public/share.php |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 73a7ff86c2..96ea307730 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -1,4 +1,7 @@
 OC.Share={
+	SHARE_TYPE_USER:0,
+	SHARE_TYPE_GROUP:1,
+	SHARE_TYPE_PRIVATE_LINK:3,
 	item:[],
 	statuses:[],
 	loadIcons:function(itemType) {
@@ -21,11 +24,15 @@ OC.Share={
 		});
 	},
 	loadItem:function(itemType, item) {
-		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemShared', itemType: itemType, item: item }, function(result) {
+		var data = '';
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItemShared', itemType: itemType, item: item }, async: false, success: function(result) {
 			if (result && result.status === 'success') {
-				OC.Share.item = result.data;
+				data = result.data;
+			} else {
+				data = false;
 			}
-		});
+		}});
+		return data;
 	},
 	share:function(itemType, item, shareType, shareWith, permissions, callback) {
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
@@ -57,17 +64,17 @@ OC.Share={
 		});
 	},
 	showDropDown:function(itemType, item, appendTo) {
-		OC.Share.loadItem(item);
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
 		// TODO replace with autocomplete textbox
 		html += '<input id="shareWith" type="text" placeholder="Share with" />';
 		html += '<div id="sharedWithList">';
-		html += '<ul id="userList"></ul>';
-		html += '<div id="groups" style="display:none;">';
-		html += '<br />';
-		html += 'Groups: ';
-		html += '<ul id="groupList"></ul>';
-		html += '</div>';
+		var sharedWith = OC.Share.loadItem(itemType, item);
+		if (sharedWith) {
+			$.each(sharedWith, function(index, row) {
+				html += row.share_with;
+				html += '<br />';
+			});
+		}
 		html += '</div>';
 		html += '<div id="privateLink">';
 		html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
diff --git a/lib/public/share.php b/lib/public/share.php
index bdd2c316cd..c5a749a090 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -107,7 +107,7 @@ class Share {
 	* @return Return depends on format
 	*/
 	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, 1);
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format);
 	}
 
 	/**

From afd9705283c177fc12892e9edb2425ae380fcfa1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 27 Jun 2012 02:10:02 +0200
Subject: [PATCH 0685/1537] Add check for return value.

---
 apps/contacts/ajax/contacts.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 4bb7801cb2..07b442159c 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -31,19 +31,21 @@ foreach($active_addressbooks as $addressbook) {
 $contacts_alphabet = OC_Contacts_VCard::all($ids);
 
 // Our new array for the contacts sorted by addressbook
-foreach($contacts_alphabet as $contact) {
-	if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
-		$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array());
-	}
-	$display = trim($contact['fullname']);
-	if(!$display) {
-		$vcard = OC_Contacts_App::getContactVCard($contact['id']);
-		if(!is_null($vcard)) {
-			$struct = OC_Contacts_VCard::structureContact($vcard);
-			$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
+if($contacts_alphabet) {
+	foreach($contacts_alphabet as $contact) {
+		if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
+			$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array());
 		}
+		$display = trim($contact['fullname']);
+		if(!$display) {
+			$vcard = OC_Contacts_App::getContactVCard($contact['id']);
+			if(!is_null($vcard)) {
+				$struct = OC_Contacts_VCard::structureContact($vcard);
+				$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
+			}
+		}
+		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
 	}
-	$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
 }
 unset($contacts_alphabet);
 uasort($contacts_addressbook, 'cmp');

From 823bef3a090fdcfc0ac6ad6662e5535d7a5aae72 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 27 Jun 2012 02:10:50 +0200
Subject: [PATCH 0686/1537] Ensure event handlers are being set when adding
 first contact.

---
 apps/contacts/js/contacts.js | 48 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 64b7af850e..f4c361082c 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -234,6 +234,30 @@ Contacts={
 			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
 			$('#contacts_propertymenu_button').tipsy();
 			$('#contacts_newcontact, #chooseaddressbook').tipsy({gravity: 'sw'});
+
+			$('body').click(function(e){
+				if(!$(e.target).is('#contacts_propertymenu_button')) {
+					$('#contacts_propertymenu_dropdown').hide();
+				}
+			});
+			function propertyMenu(){
+				var menu = $('#contacts_propertymenu_dropdown');
+				if(menu.is(':hidden')) {
+					menu.show();
+					menu.find('li').first().focus();
+				} else {
+					menu.hide();
+				}
+			}
+			$('#contacts_propertymenu_button').click(propertyMenu);
+			$('#contacts_propertymenu_button').keydown(propertyMenu);
+			function propertyMenuItem(){
+				var type = $(this).data('type');
+				Contacts.UI.Card.addProperty(type);
+				$('#contacts_propertymenu_dropdown').hide();
+			}
+			$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
+			$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 		},
 		Card:{
 			id:'',
@@ -1739,30 +1763,6 @@ $(document).ready(function(){
 		xhr.send(file);
 	}
 
-	$('body').click(function(e){
-		if(!$(e.target).is('#contacts_propertymenu_button')) {
-			$('#contacts_propertymenu_dropdown').hide();
-		}
-	});
-	function propertyMenu(){
-		var menu = $('#contacts_propertymenu_dropdown');
-		if(menu.is(':hidden')) {
-			menu.show();
-			menu.find('li').first().focus();
-		} else {
-			menu.hide();
-		}
-	}
-	$('#contacts_propertymenu_button').click(propertyMenu);
-	$('#contacts_propertymenu_button').keydown(propertyMenu);
-	function propertyMenuItem(){
-		var type = $(this).data('type');
-		Contacts.UI.Card.addProperty(type);
-		$('#contacts_propertymenu_dropdown').hide();
-	}
-	$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
-	$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
-
 	Contacts.UI.loadHandlers();
 	Contacts.UI.Contacts.update(id);
 });

From 3edc40a68a7cf576d7197328e57c001d1667ae39 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 27 Jun 2012 02:12:14 +0200
Subject: [PATCH 0687/1537] Load default categories if there are none,

---
 apps/contacts/lib/app.php | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 29428763d6..b3a7abd28b 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -10,7 +10,6 @@
  * This class manages our app actions
  */
 OC_Contacts_App::$l10n = OC_L10N::get('contacts');
-OC_Contacts_App::$categories = new OC_VCategories('contacts');
 class OC_Contacts_App {
 	/*
 	 * @brief language object for calendar app
@@ -137,30 +136,54 @@ class OC_Contacts_App {
 		}
 	}
 
-	/*
+	/**
 	 * @brief returns the vcategories object of the user
 	 * @return (object) $vcategories
 	 */
 	protected static function getVCategories() {
 		if (is_null(self::$categories)) {
-			self::$categories = new OC_VCategories('contacts');
+			self::$categories = new OC_VCategories('contacts', null, self::getDefaultCategories());
 		}
 		return self::$categories;
 	}
 	
-	/*
+	/**
 	 * @brief returns the categories for the user
 	 * @return (Array) $categories
 	 */
 	public static function getCategories() {
-		$categories = self::$categories->categories();
+		$categories = self::getVCategories()->categories();
 		if(count($categories) == 0) {
 			self::scanCategories();
 			$categories = self::$categories->categories();
 		}
-		return $categories;
+		return ($categories ? $categories : self::getDefaultCategories());
 	}
 
+	/**
+	 * @brief returns the default categories of ownCloud
+	 * @return (array) $categories
+	 */
+	protected static function getDefaultCategories(){
+		return array(
+			(string)self::$l10n->t('Birthday'),
+			(string)self::$l10n->t('Business'),
+			(string)self::$l10n->t('Call'),
+			(string)self::$l10n->t('Clients'),
+			(string)self::$l10n->t('Deliverer'),
+			(string)self::$l10n->t('Holidays'),
+			(string)self::$l10n->t('Ideas'),
+			(string)self::$l10n->t('Journey'),
+			(string)self::$l10n->t('Jubilee'),
+			(string)self::$l10n->t('Meeting'),
+			(string)self::$l10n->t('Other'),
+			(string)self::$l10n->t('Personal'),
+			(string)self::$l10n->t('Projects'),
+			(string)self::$l10n->t('Questions'),
+			(string)self::$l10n->t('Work'),
+		);
+	}
+	
 	/**
 	 * scan vcards for categories.
 	 * @param $vccontacts VCards to scan. null to check all vcards for the current user.

From 79da782892282ffc6390953fdcf2d496c6adc0fd Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 26 Jun 2012 20:37:36 -0400
Subject: [PATCH 0688/1537] Improve error handling of Dropbox storage backend

---
 apps/files_external/lib/dropbox.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 5e94277c6d..6f1a154a12 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -41,7 +41,11 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			return $this->metaData[$path];
 		} else {
 			if ($list) {
-				$response = $this->dropbox->getMetaData($path);
+				try {
+					$response = $this->dropbox->getMetaData($path);
+				} catch (Exception $exception) {
+					return false;
+				}
 				if ($response && isset($response['contents'])) {
 					$contents = $response['contents'];
 					// Cache folder's contents
@@ -90,7 +94,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 		if ($metaData = $this->getMetaData($path)) {
 			$stat['size'] = $metaData['bytes'];
 			$stat['atime'] = time();
-			$stat['mtime'] = strtotime($metaData['modified']);
+			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
 			$stat['ctime'] = $stat['mtime'];
 			return $stat;
 		}
@@ -111,11 +115,11 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 	public function is_readable($path) {
-		return true;
+		return self::file_exists($path);
 	}
 
 	public function is_writable($path) {
-		return true;
+		return self::file_exists($path);
 	}
 
 	public function file_exists($path) {

From 060a29726095e9b4ba838d2a28cae9a2e0e959a3 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Jun 2012 11:46:42 +0200
Subject: [PATCH 0689/1537] enable highlighting of address in OSM.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index f4c361082c..e5326ad880 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -48,7 +48,7 @@ Contacts={
 				adrstr = adrstr + adrarr[6].trim();
 			}
 			adrstr = encodeURIComponent(adrstr);
-			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&zoom=';
+			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&polygon=1&zoom=';
 			var newWindow = window.open(uri,'_blank');
 			newWindow.focus();
 		},

From 420d23a875c19ba04d679db826bcf9bd2ad9d6c2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 27 Jun 2012 13:08:16 +0200
Subject: [PATCH 0690/1537] fix webdav errors for empty folders

---
 lib/connector/sabre/directory.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 9832449af3..b75bb5c50f 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -90,16 +90,18 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		foreach($folder_content as $info) {
 			$paths[] = $this->path.'/'.$info['name'];
 		}
-		$placeholders = join(',', array_fill(0, count($paths), '?'));
-		$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ?' . ' AND propertypath IN ('.$placeholders.')' );
-		array_unshift($paths, OC_User::getUser()); // prepend userid
-		$result = $query->execute( $paths );
 		$properties = array_fill_keys($paths, array());
-		while($row = $result->fetchRow()) {
-			$propertypath = $row['propertypath'];
-			$propertyname = $row['propertyname'];
-			$propertyvalue = $row['propertyvalue'];
-			$properties[$propertypath][$propertyname] = $propertyvalue;
+		if(count($paths)>0){
+			$placeholders = join(',', array_fill(0, count($paths), '?'));
+			$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ?' . ' AND propertypath IN ('.$placeholders.')' );
+			array_unshift($paths, OC_User::getUser()); // prepend userid
+			$result = $query->execute( $paths );
+			while($row = $result->fetchRow()) {
+				$propertypath = $row['propertypath'];
+				$propertyname = $row['propertyname'];
+				$propertyvalue = $row['propertyvalue'];
+				$properties[$propertypath][$propertyname] = $propertyvalue;
+			}
 		}
 
 		$nodes = array();

From 12f7cb87679453fa96c796df857b7e7193d4ee09 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 27 Jun 2012 13:21:45 +0200
Subject: [PATCH 0691/1537] fix running tests from cli

---
 lib/base.php   | 8 +++++---
 lib/helper.php | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 11e63e208e..c2b0bbef78 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -170,8 +170,10 @@ class OC{
 	public static function checkInstalled() {
 		// Redirect to installer if not installed
 		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
-			$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
-			header("Location: $url");
+			if(!OC::$CLI){
+				$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+				header("Location: $url");
+			}
 			exit();
 		}
 	}
@@ -180,7 +182,7 @@ class OC{
 		// redirect to https site if configured
 		if( OC_Config::getValue( "forcessl", false )){
 			ini_set("session.cookie_secure", "on");
-			if(OC_Helper::serverProtocol()<>'https') {
+			if(OC_Helper::serverProtocol()<>'https' and !OC::$CLI) {
 				$url = "https://". OC_Helper::serverHost() . $_SERVER['REQUEST_URI'];
 				header("Location: $url");
 				exit();
diff --git a/lib/helper.php b/lib/helper.php
index 37914b73e1..6ab55f2761 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -75,6 +75,9 @@ class OC_Helper {
 	 * reverse proxies
 	 */
 	public static function serverHost() {
+		if(OC::$CLI){
+			return 'localhost';
+		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
 			if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
 				$host = trim(array_pop(explode(",", $_SERVER['HTTP_X_FORWARDED_HOST'])));

From 2d8a380a21716f619bc38e769876dfa5752e6f68 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 27 Jun 2012 14:56:34 +0200
Subject: [PATCH 0692/1537] Fix recursion when running an update script

---
 lib/app.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index a9feff1620..61566ed752 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -36,6 +36,7 @@ class OC_App{
 	static private $appInfo = array();
 	static private $appTypes = array();
 	static private $loadedApps = array();
+	static private $checkedApps = array();
 
 	/**
 	 * @brief loads all apps
@@ -530,6 +531,10 @@ class OC_App{
 	 * check if the app need updating and update when needed
 	 */
 	public static function checkUpgrade($app) {
+		if (in_array($app, self::$checkedApps)) {
+			return;
+		}
+		self::$checkedApps[] = $app;
 		$versions = self::getAppVersions();
 		$currentVersion=OC_App::getAppVersion($app);
 		if ($currentVersion) {

From d5237c42bc0d6f9155629c15904b69b7f60e2e5f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Jun 2012 15:05:40 +0200
Subject: [PATCH 0693/1537] Util::formatDate() expect $timestamp as double

---
 apps/files_versions/ajax/getVersions.php  | 4 +---
 apps/files_versions/history.php           | 4 ++--
 apps/files_versions/js/versions.js        | 4 ++--
 apps/files_versions/templates/history.php | 4 +---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index bee6054333..96289caec9 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -14,9 +14,7 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 	$versionsFormatted = array();
 	
 	foreach ( $versions AS $version ) {
-	
-		$versionsFormatted[] = OCP\Util::formatDate( $version );
-		
+		$versionsFormatted[] = OCP\Util::formatDate( doubleval($version) );
 	}
 
 	$versionsSorted = array_reverse( $versions );
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index cb4726e8d0..ca03de0472 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -38,13 +38,13 @@ if ( isset( $_GET['path'] ) ) {
 			
 			$tmpl->assign( 'outcome_stat', 'success' );
 			
-			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( $_GET['revert'] ) );
+			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
 			
 		} else {
 		
 			$tmpl->assign( 'outcome_stat', 'failure' );
 		
-			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( $_GET['revert'] ) );
+			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
 			
 		}
 		
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 82d569fa0f..a090fde446 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -104,9 +104,9 @@ function createVersionsDropdown(filename, files) {
 	}
 	
 	function addVersion(revision ) {
-		name=formatDate(revision*1000);
+		name=formatDate(revision.version*1000);
 		var version=$('<option/>');
-		version.attr('value',revision);
+		version.attr('value',revision.version);
 		version.text(name);
 		
 // 		} else {
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 13e104152b..1b44255642 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -20,13 +20,11 @@ if( isset( $_['message'] ) ) {
 	echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
 	
 	foreach ( $_['versions'] as $v ) {
-	
 		echo ' ';
-		echo OCP\Util::formatDate( $v['version'] );
+		echo OCP\Util::formatDate( doubleval($v['version']) );
 		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a><br /><br />';
 		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
 		echo '<br /><br />';
-		
 	}
 
 }

From 235515e84bed920d9f89d56a535a4662d95fd461 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 27 Jun 2012 15:44:42 +0200
Subject: [PATCH 0694/1537] Something like this should do it for sharing
 contacts

---
 apps/contacts/index.php     |  1 +
 apps/contacts/lib/share.php | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 0b4f89b30c..e72d2917ea 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -20,6 +20,7 @@ if($contacts === false) {
 }
 
 $addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Contacts_Share::FORMAT_ADDRESSBOOKS));
 
 // Load the files we need
 OCP\App::setActiveNavigationEntry( 'contacts_index' );
diff --git a/apps/contacts/lib/share.php b/apps/contacts/lib/share.php
index d304042edd..3198d22621 100644
--- a/apps/contacts/lib/share.php
+++ b/apps/contacts/lib/share.php
@@ -7,6 +7,7 @@
  */
 
 class OC_Contacts_Share extends OCP\Share_Backend {
+	const FORMAT_ADDRESSBOOKS = 1;
 	/**
 	* @brief Get the source of the item to be stored in the database
 	* @param string Item
@@ -37,6 +38,18 @@ class OC_Contacts_Share extends OCP\Share_Backend {
 	* If it does generate a new name e.g. name_#
 	*/
 	public function generateTarget($item, $uid, $exclude = null) {
+		$addressbook = OC_Contacts_Addressbook::find( $item );
+		$user_addressbooks = array();
+		foreach(OC_Contacts_Addressbook::all($uid) as $user_addressbook) {
+			$user_addressbooks[] = $user_addressbooks['displayname'];
+		}
+		$name = $addressbook['uid']."'s ".$addressbook['displayname'];
+		$suffix = '';
+		while (in_array($name.$suffix, $user_addressbooks)) {
+			$suffix++;
+		}
+		
+		return $name.$suffix;
 	}
 
 	/**
@@ -50,5 +63,12 @@ class OC_Contacts_Share extends OCP\Share_Backend {
 	* It is only called through calls to the public getItem(s)SharedWith functions.
 	*/
 	public function formatItems($items, $format) {
+		$addressbooks = array();
+		foreach($items as $source => $info) {
+			$addressbook = OC_Contacts_Addressbook::find( $source );
+			$addressbook['displayname'] = $info['item_target'];
+			$addressbooks[] = $addressbook;
+		}
+		return $addressbooks;
 	}
 }

From c67ae2e7f1bbb352158728394259c74de11aa989 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Jun 2012 15:56:14 +0200
Subject: [PATCH 0695/1537] no reason to strip tags at this point

---
 apps/files_versions/ajax/getVersions.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 96289caec9..fe48434d2c 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -5,7 +5,6 @@ require_once('apps/files_versions/versions.php');
 
 $userDirectory = "/".OCP\USER::getUser()."/files";
 $source = $_GET['source'];
-$source = strip_tags( $source );
 
 if( OCA_Versions\Storage::isversioned( $source ) ) {
 

From 19f94774fbc72562f2a3280b0cc49fbda89ea48b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 12:04:11 -0400
Subject: [PATCH 0696/1537] Don't overwrite fake directory stream for Dropbox
 and Google Drive

---
 apps/files_external/lib/dropbox.php | 5 ++---
 apps/files_external/lib/google.php  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 6f1a154a12..e3fbb24499 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -33,7 +33,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 		$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 		$oauth->setToken($params['token'], $params['token_secret']);
 		$this->dropbox = new Dropbox_API($oauth, 'dropbox');
-		
 	}
 
 	private function getMetaData($path, $list = false) {
@@ -84,8 +83,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			foreach ($contents as $file) {
 				$files[] = basename($file['path']);
 			}
-			OC_FakeDirStream::$dirs['dropbox'] = $files;
-			return opendir('fakedir://dropbox');
+			OC_FakeDirStream::$dirs['dropbox'.$path] = $files;
+			return opendir('fakedir://dropbox'.$path);
 		}
 		return false;
 	}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index fe60a06629..41b560ae84 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -237,8 +237,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				$this->entries[$name] = $entry;
 			}
 		}
-		OC_FakeDirStream::$dirs['google'] = $files;
-		return opendir('fakedir://google');
+		OC_FakeDirStream::$dirs['google'.$path] = $files;
+		return opendir('fakedir://google'.$path);
 	}
 
 	public function stat($path) {

From 2c773d549d261c6c7b760639acb8f9eedd6c100a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 12:07:42 -0400
Subject: [PATCH 0697/1537] Don't overwrite fake directory stream for Shared
 storage

---
 apps/files_sharing/sharedstorage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index fed1b834fa..4138fc2b39 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -81,8 +81,8 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 					$files[] = basename($item['target']);
 				}
 			}
-			OC_FakeDirStream::$dirs['shared']=$files;
-			return opendir('fakedir://shared');
+			OC_FakeDirStream::$dirs['shared'.$path] = $files;
+			return opendir('fakedir://shared'.$path);
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {

From b7f86cf282723049842b014883d28301781c413f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 12:24:21 -0400
Subject: [PATCH 0698/1537] Add Samba Share parameter to external storage UI

---
 apps/files_external/lib/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 5b9e00a378..95f8beeb49 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -45,7 +45,7 @@ class OC_Mount_Config {
 			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
 			'OC_Filestorage_Google' => array('backend' => 'Google Drive', 'configuration' => array('token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),
 			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root')),
+			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'share' => 'Share', 'root' => '&Root')),
 			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
 		);
 	}

From 25a50f00bd70a3bbb209ff20938aed358b7ffd7c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 27 Jun 2012 20:56:58 +0200
Subject: [PATCH 0699/1537] add merge calendar function and add some
 documentation to OC_Calendar_Calendar

---
 apps/calendar/lib/calendar.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 1bfab5cd64..521bf944d9 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -212,7 +212,20 @@ class OC_Calendar_Calendar{
 
 		return true;
 	}
-
+	
+	/*
+	 * @brief merges two calendars
+	 * @param integer $id1
+	 * @param integer $id2
+	 * @return boolean
+	 */
+	public static function mergeCalendar($id1, $id2){
+		$stmt = OCP\DB::prepare('UPDATE *PREFIX*calendar_objects SET calendarid = ? WHERE calendarid = ?');
+		$stmt->execute(array($id1, $id2));
+		self::touchCalendar($id1);
+		self::deleteCalendar($id2);
+	}
+	
 	/**
 	 * @brief Creates a URI for Calendar
 	 * @param string $name name of the calendar
@@ -238,6 +251,11 @@ class OC_Calendar_Calendar{
 		list($prefix,$userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
 		return $userid;
 	}
+	
+	/*
+	 * @brief returns the possible color for calendars
+	 * @return array
+	 */
 	public static function getCalendarColorOptions(){
 		return array(
 			'#ff0000', // "Red"
@@ -251,6 +269,11 @@ class OC_Calendar_Calendar{
 		);
 	}
 
+	/*
+	 * @brief generates the Event Source Info for our JS
+	 * @param array $calendar calendar data
+	 * @return array
+	 */
 	public static function getEventSourceInfo($calendar){
 		return array(
 			'url' => OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],

From 77c66e8cc4ee69b8d52a25c7cf436f1c0347113a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 27 Jun 2012 21:05:46 +0200
Subject: [PATCH 0700/1537] move some documentation to the right place

---
 apps/calendar/lib/calendar.php | 14 +-------------
 apps/calendar/lib/object.php   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 521bf944d9..5274397c76 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -10,19 +10,6 @@
  * The following SQL statement is just a help for developers and will not be
  * executed!
  *
- * CREATE TABLE calendar_objects (
- *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- *     calendarid INTEGER UNSIGNED NOT NULL,
- *     objecttype VARCHAR(40) NOT NULL,
- *     startdate DATETIME,
- *     enddate DATETIME,
- *     repeating INT(1),
- *     summary VARCHAR(255),
- *     calendardata TEXT,
- *     uri VARCHAR(100),
- *     lastmodified INT(11)
- * );
- *
  * CREATE TABLE calendar_calendars (
  *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
  *     userid VARCHAR(255),
@@ -35,6 +22,7 @@
  *     timezone TEXT,
  *     components VARCHAR(20)
  * );
+ *
  */
 
 /**
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 0531a56fc5..5d475c8943 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -5,6 +5,25 @@
  * later.
  * See the COPYING-README file.
  */
+ /*
+ *
+ * The following SQL statement is just a help for developers and will not be
+ * executed!
+ *
+ * CREATE TABLE calendar_objects (
+ *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ *     calendarid INTEGER UNSIGNED NOT NULL,
+ *     objecttype VARCHAR(40) NOT NULL,
+ *     startdate DATETIME,
+ *     enddate DATETIME,
+ *     repeating INT(1),
+ *     summary VARCHAR(255),
+ *     calendardata TEXT,
+ *     uri VARCHAR(100),
+ *     lastmodified INT(11)
+ * );
+ *
+ */
 
 /**
  * This class manages our calendar objects

From 9b605969f1ef9826469c68ec35df768063f904ba Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 15:23:26 -0400
Subject: [PATCH 0701/1537] Fixes in Dropbox API, try to catch Dropbox
 exceptions, implement rename and copy in Dropbox storage backend

---
 3rdparty/Dropbox/API.php            |  6 +--
 apps/files_external/lib/dropbox.php | 59 +++++++++++++++++++++++------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/3rdparty/Dropbox/API.php b/3rdparty/Dropbox/API.php
index cff6c35c7f..8cdce678e1 100644
--- a/3rdparty/Dropbox/API.php
+++ b/3rdparty/Dropbox/API.php
@@ -139,7 +139,7 @@ class Dropbox_API {
     public function copy($from, $to, $root = null) {
 
         if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root));
+        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root), 'POST');
 
         return json_decode($response['body'],true);
 
@@ -178,7 +178,7 @@ class Dropbox_API {
     public function delete($path, $root = null) {
 
         if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root));
+        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root), 'POST');
         return json_decode($response['body']);
 
     }
@@ -196,7 +196,7 @@ class Dropbox_API {
     public function move($from, $to, $root = null) {
 
         if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root));
+        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root), 'POST');
 
         return json_decode($response['body'],true);
 
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index e3fbb24499..35663d431f 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -70,11 +70,16 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 	public function mkdir($path) {
-		return $this->dropbox->createFolder($path);
+		try {
+			$this->dropbox->createFolder($path);
+			return true;
+		} catch (Exception $exception) {
+			return false;
+		}
 	}
 
 	public function rmdir($path) {
-		return $this->dropbox->delete($path);
+		return $this->unlink($path);
 	}
 
 	public function opendir($path) {
@@ -114,11 +119,11 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 	public function is_readable($path) {
-		return self::file_exists($path);
+		return $this->file_exists($path);
 	}
 
 	public function is_writable($path) {
-		return self::file_exists($path);
+		return $this->file_exists($path);
 	}
 
 	public function file_exists($path) {
@@ -132,7 +137,30 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 	public function unlink($path) {
-		return $this->dropbox->delete($path);
+		try {
+			$this->dropbox->delete($path);
+			return true;
+		} catch (Exception $exception) {
+			return false;
+		}
+	}
+
+	public function rename($path1, $path2) {
+		try {
+			$this->dropbox->move($path1, $path2);
+			return true;
+		} catch (Exception $exception) {
+			return false;
+		}
+	}
+
+	public function copy($path1, $path2) {
+		try {
+			$this->dropbox->copy($path1, $path2);
+			return true;
+		} catch (Exception $exception) {
+			return false;
+		}
 	}
 
 	public function fopen($path, $mode) {
@@ -140,8 +168,13 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			case 'r':
 			case 'rb':
 				$tmpFile = OC_Helper::tmpFile();
-				file_put_contents($tmpFile, $this->dropbox->getFile($path));
-				return fopen($tmpFile, 'r');
+				try {
+					$data = $this->dropbox->getFile($path);
+					file_put_contents($tmpFile, $data);
+					return fopen($tmpFile, 'r');
+				} catch (Exception $exception) {
+					return false;
+				}
 			case 'w':
 			case 'wb':
 			case 'a':
@@ -174,9 +207,11 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	public function writeBack($tmpFile) {
 		if (isset(self::$tempFiles[$tmpFile])) {
 			$handle = fopen($tmpFile, 'r');
-			$response = $this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
-			if ($response) {
+			try {
+				$response = $this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
 				unlink($tmpFile);
+			} catch (Exception $exception) {
+				
 			}
 		}
 	}
@@ -191,10 +226,12 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 	public function free_space($path) {
-		if ($info = $this->dropbox->getAccountInfo()) {
+		try {
+			$info = $this->dropbox->getAccountInfo();
 			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
+		} catch (Exception $exception) {
+			return false;
 		}
-		return false;
 	}
 
 	public function touch($path, $mtime = null) {

From 2706988225f7ef36463c8aceaeb3ec84108abde7 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 28 May 2012 20:56:21 +0000
Subject: [PATCH 0702/1537] Set table prefix if not set in postgresql install

---
 lib/setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/setup.php b/lib/setup.php
index 5f1fb1525e..e1c1a110b3 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -150,7 +150,7 @@ class OC_Setup {
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
 				$dbhost = $options['dbhost'];
-				$dbtableprefix = $options['dbtableprefix'];
+				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
 				OC_CONFIG::setValue('dbname', $dbname);
 				OC_CONFIG::setValue('dbhost', $dbhost);
 				OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);

From 8712754f8ccbbfcd0b2b546b82b345d49973678c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 27 Jun 2012 22:27:48 +0200
Subject: [PATCH 0703/1537] fix style of some doc

---
 apps/calendar/lib/export.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
index 63f7b9e6c6..6f478236de 100644
--- a/apps/calendar/lib/export.php
+++ b/apps/calendar/lib/export.php
@@ -14,9 +14,9 @@ class OC_Calendar_Export{
 
 	/*
 	 * @brief export a calendar or an event
-	 * @param (int) $id - id of calendar / event
-	 * @param (const) $type - use OC_Calendar_Export constants
-	 * @return (string)
+	 * @param integer $id id of calendar / event
+	 * @param string $type use OC_Calendar_Export constants
+	 * @return string
 	 */
 	public static function export($id, $type){
 		if($type == self::EVENT){
@@ -30,8 +30,8 @@ class OC_Calendar_Export{
 
 	/*
 	 * @brief export a calendar and convert all times to UTC
-	 * @param (int) $id - id of the calendar
-	 * @return (string)
+	 * @param integer $id id of the calendar
+	 * @return string
 	 */
 	private static function calendar($id){
 		$events = OC_Calendar_Object::all($id);

From 7284e57c9157bb377c4dc815658ca9f8a89eb07c Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Wed, 27 Jun 2012 20:43:33 +0000
Subject: [PATCH 0704/1537] Migration: fix app paths

---
 lib/migrate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/migrate.php b/lib/migrate.php
index f26b4b2567..731b6a6839 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -64,7 +64,7 @@ class OC_Migrate{
 		$apps = OC_App::getAllApps();
 
 		foreach($apps as $app){
-			$path = self::getAppPath($app) . '/appinfo/migrate.php';
+			$path = OC_App::getAppPath($app) . '/appinfo/migrate.php';
 			if( file_exists( $path ) ){
 				include( $path );
 			}
@@ -398,7 +398,7 @@ class OC_Migrate{
 			if( OC_App::isEnabled( $provider->getID() ) ){
 				$success = true;
 				// Does this app use the database?
-				if( file_exists( self::getAppPath($provider->getID()).'/appinfo/database.xml' ) ){
+				if( file_exists( OC_App::getAppPath($provider->getID()).'/appinfo/database.xml' ) ){
 					// Create some app tables
 					$tables = self::createAppTables( $provider->getID() );
 					if( is_array( $tables ) ){
@@ -539,7 +539,7 @@ class OC_Migrate{
 		}
 
 		// There is a database.xml file
-		$content = file_get_contents(self::getAppPath($appid) . '/appinfo/database.xml' );
+		$content = file_get_contents(OC_App::getAppPath($appid) . '/appinfo/database.xml' );
 
 		$file2 = 'static://db_scheme';
 		// TODO get the relative path to migration.db from the data dir

From 77b7f214d2dd2f7ef14ebfe0ed641a1f44a1a05f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 27 Jun 2012 22:43:57 +0200
Subject: [PATCH 0705/1537] Load contactlist progressivly.

---
 apps/contacts/ajax/contacts.php |  36 ++++++---
 apps/contacts/js/contacts.js    | 125 ++++++++++++++++++--------------
 apps/contacts/lib/vcard.php     |  14 +++-
 3 files changed, 106 insertions(+), 69 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 07b442159c..67ebcaf736 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -17,24 +17,44 @@ function cmp($a, $b)
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+$start = isset($_GET['startat'])?$_GET['startat']:0;
+$aid = isset($_GET['aid'])?$_GET['aid']:null;
 
+if(is_null($aid)) {
+	// Called initially to get the active addressbooks.
+	$active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+} else {
+	// called each time more contacts has to be shown.
+	$active_addressbooks = array(OC_Contacts_Addressbook::find($aid));
+}
+
+
+session_write_close();
+
+// create the addressbook associate array
 $contacts_addressbook = array();
 $ids = array();
 foreach($active_addressbooks as $addressbook) {
 	$ids[] = $addressbook['id'];
 	if(!isset($contacts_addressbook[$addressbook['id']])) {
-		$contacts_addressbook[$addressbook['id']] = array('contacts' => array());
+		$contacts_addressbook[$addressbook['id']] = array('contacts' => array('type' => 'book',));
 		$contacts_addressbook[$addressbook['id']]['displayname'] = $addressbook['displayname'];
 	}
 }	
-$contacts_alphabet = OC_Contacts_VCard::all($ids);
 
+$contacts_alphabet = array(); 
+
+// get next 50 for each addressbook.
+foreach($ids as $id) {
+	if($id) {
+		$contacts_alphabet = array_merge($contacts_alphabet, OC_Contacts_VCard::all($id, $start, 50));
+	}
+}
 // Our new array for the contacts sorted by addressbook
 if($contacts_alphabet) {
 	foreach($contacts_alphabet as $contact) {
 		if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
-			$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array());
+			$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array('type' => 'book',));
 		}
 		$display = trim($contact['fullname']);
 		if(!$display) {
@@ -44,15 +64,11 @@ if($contacts_alphabet) {
 				$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
 			}
 		}
-		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
+		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('type' => 'contact', 'id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
 	}
 }
 unset($contacts_alphabet);
 uasort($contacts_addressbook, 'cmp');
 
-$tmpl = new OCP\Template("contacts", "part.contacts");
-$tmpl->assign('books', $contacts_addressbook, false);
-$page = $tmpl->fetchPage();
-
-OCP\JSON::success(array('data' => array( 'page' => $page )));
+OCP\JSON::success(array('data' => array('entries' => $contacts_addressbook)));
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index e5326ad880..d357e50608 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -273,7 +273,7 @@ Contacts={
 			update:function(id, bookid) {
 				var newid, firstitem;
 				if(!id) {
-					firstitem = $('#contacts:first-child li:first-child');
+					firstitem = $('#contacts ul').first().find('li:first-child');
 					if(firstitem.length > 0) {
 						newid = firstitem.data('id');
 						bookid = firstitem.data('bookid');
@@ -285,6 +285,7 @@ Contacts={
 				if(!bookid) {
 					bookid = $('#contacts h3').first().data('id');
 				}
+				console.log('bookid: ' +bookid);
 				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
 						$('#contacts li[data-id="'+newid+'"]').addClass('active');
@@ -340,6 +341,9 @@ Contacts={
 				Contacts.UI.Card.add(';;;;;', '', '', true);
 				return false;
 			},
+			createEntry:function(data) {
+				return $('<li data-id="'+data.id+'" data-bookid="'+data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+data.id+') no-repeat scroll 0% 0% transparent;">'+data.displayname+'</a></li>');
+			},
 			add:function(n, fn, aid, isnew){ // add a new contact
 				aid = aid?aid:$('#contacts h3.active').first().data('id');
 				var localAddcontact = function(n, fn, aid, isnew) {
@@ -1532,6 +1536,7 @@ Contacts={
 			}
 		},
 		Contacts:{
+			batchnum:50,
 			drop:function(event, ui) {
 				var dragitem = ui.draggable, droptarget = $(this);
 				//console.log('Drop ' + dragitem.data('id') +' on: ' + droptarget.data('id'));
@@ -1563,64 +1568,79 @@ Contacts={
 				});
 			},
 			// Reload the contacts list.
-			update:function(id){
-				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),{},function(jsondata){
+			update:function(id, aid, start){
+				self = this;
+				console.log('update: ' + aid + ' ' + start);
+				var firstrun = false;
+				var opts = {};
+				opts['startat'] = (start?start:0);
+				if(aid) {
+					opts['aid'] = aid;
+				}
+				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
 					if(jsondata.status == 'success'){
-						$('#contacts').html(jsondata.data.page).ready(function() {
-							/*setTimeout(function() {
-								$('.contacts li').unbind('inview');
-								$('.contacts li:visible').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-									if (isInView) {
-										if (!$(this).find('a').attr('style')) {
-											$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
-										}
+						var books = jsondata.data.entries;
+						$.each(jsondata.data.entries, function(b, book) { 
+							if($('#contacts h3[data-id="'+b+'"]').length == 0) {
+								firstrun = true;
+								
+								if($('#contacts h3').length == 0) {
+									$('#contacts').html('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts" data-id="'+b+'"></ul>');
+								} else {
+									if(!$('#contacts h3[data-id="'+b+'"]').length) {
+										$('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts" data-id="'+b+'"></ul>')
+										.appendTo('#contacts');
 									}
-								})}, 100);
-							setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
-							if($('#contacts h3').length > 1) {
-								$('#contacts h3,#contacts ul').each(function(index) {
-									var id = $(this).data('id');
-									var accept = 'li:not([data-bookid="'+id+'"])';
-									$(this).droppable({
-										drop: Contacts.UI.Contacts.drop,
-										activeClass: 'ui-state-hover',
-										accept: accept
+								}
+								$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
+									$('#contacts h3').removeClass('active');
+									$(this).addClass('active');
+									$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
+									return false;
+								});
+								var accept = 'li:not([data-bookid="'+b+'"])';
+								$('#contacts h3[data-id="'+b+'"]').droppable({
+									drop: Contacts.UI.Contacts.drop,
+									activeClass: 'ui-state-hover',
+									accept: accept
+								});
+							}
+							var contactlist = $('#contacts ul[data-id="'+b+'"]');
+							for(var c in book.contacts) {
+								if(book.contacts[c].id == undefined) { continue; }
+								var contact = Contacts.UI.Card.createEntry(book.contacts[c]);
+								if(c == self.batchnum-5) {
+									contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+										$(this).unbind(event);
+										var bookid = $(this).data('bookid');
+										var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
+										if (isInView && numsiblings >= self.batchnum) {
+											console.log('This would be a good time to load more contacts.');
+											Contacts.UI.Contacts.update(id, bookid, $('#contacts li[data-bookid="'+bookid+'"]').length);
+										}
 									});
-								});
-								$('#contacts li').draggable({
-									revert: 'invalid',
-									axis: 'y', containment: '#contacts',
-									scroll: true, scrollSensitivity: 100,
-									opacity: 0.7, helper: 'clone'
-								});
-							} else {
-								$('#contacts h3').first().addClass('active');
+								}
+								contactlist.append(contact);
 							}
 						});
-						Contacts.UI.Card.update(id);
+						if($('#contacts h3').length > 1) {
+							$('#contacts li').draggable({
+								revert: 'invalid',
+								axis: 'y', containment: '#contacts',
+								scroll: true, scrollSensitivity: 100,
+								opacity: 0.7, helper: 'clone'
+							});
+						} else {
+							$('#contacts h3').first().addClass('active');
+						}
+						if(opts['startat'] == 0) { // only update card on first load.
+							Contacts.UI.Card.update();
+						}
 					}
 					else{
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-				/*setTimeout(function() {
-					$('.contacts li').unbind('inview');
-					$('.contacts li:visible').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-						if (isInView) {
-							if (!$(this).find('a').attr('style')) {
-								$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
-							}
-						}
-					})}, 500);
-				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);*/
-			},
-			// Add thumbnails to the contact list as they become visible in the viewport.
-			lazyupdate:function(){
-				$('.contacts li').live('inview', function(){
-					if (!$(this).find('a').attr('style')) {
-						$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
-					}
-				});
 			},
 			refreshThumbnail:function(id){
 				var item = $('.contacts li[data-id="'+id+'"]').find('a');
@@ -1681,13 +1701,6 @@ $(document).ready(function(){
 		return false;
 	});
 
-	$(document).on('click', '.addressbook', function(event){
-		$('#contacts h3').removeClass('active');
-		$(this).addClass('active');
-		$(this).next().slideToggle(300);
-		return false;
-	});
-	
 	/*$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
 			// element is now visible in the viewport
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index bf22be0de7..e3b6560562 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -47,11 +47,18 @@ class OC_Contacts_VCard{
 	 * The cards are associative arrays. You'll find the original vCard in
 	 * ['carddata']
 	 */
-	public static function all($id){
+	public static function all($id, $start=null, $num=null){
+		$limitsql = '';
+		if(!is_null($num)) {
+			$limitsql = ' LIMIT '.$num;
+		}
+		if(!is_null($start) && !is_null($num)) {
+			$limitsql .= ' OFFSET '.$start.' ';
+		}
 		$result = null;
 		if(is_array($id) && count($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
-			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname';
+			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname '.$limitsql;
 			try {
 				$stmt = OCP\DB::prepare( $prep );
 				$result = $stmt->execute($id);
@@ -63,7 +70,8 @@ class OC_Contacts_VCard{
 			}
 		} elseif(is_int($id) || is_string($id)) {
 			try {
-				$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+				$sql = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname'.$limitsql;
+				$stmt = OCP\DB::prepare( $sql );
 				$result = $stmt->execute(array($id));
 			} catch(Exception $e) {
 				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);

From 426193cf6cd39ea5422190f7ab45b4435cd5ecf6 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Wed, 27 Jun 2012 21:18:15 +0000
Subject: [PATCH 0706/1537] Migration: Fix contacts and bookmarks

---
 apps/bookmarks/appinfo/migrate.php | 8 ++++----
 apps/contacts/appinfo/migrate.php  | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/bookmarks/appinfo/migrate.php b/apps/bookmarks/appinfo/migrate.php
index e7e572f52d..f1353f1887 100644
--- a/apps/bookmarks/appinfo/migrate.php
+++ b/apps/bookmarks/appinfo/migrate.php
@@ -40,8 +40,8 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
 				$idmap = array();
 				while( $row = $results->fetchRow() ){
 					// Import each bookmark, saving its id into the map	
-					$query = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks(url, title, user_id, public, added, lastmodified) VALUES (?, ?, ?, ?, ?, ?)" );
-					$query->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) );
+					$bookmarkquery = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks(url, title, user_id, public, added, lastmodified) VALUES (?, ?, ?, ?, ?, ?)" );
+					$bookmarkquery->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) );
 					// Map the id
 					$idmap[$row['id']] = OCP\DB::insertid();
 				}
@@ -51,8 +51,8 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
 					$results = $query->execute( array( $oldid ) );
 					while( $row = $results->fetchRow() ){
 						// Import the tags for this bookmark, using the new bookmark id
-						$query = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" );
-						$query->execute( array( $newid, $row['tag'] ) );	
+						$tagquery = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" );
+						$tagquery->execute( array( $newid, $row['tag'] ) );	
 					}		
 				}
 				// All done!
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
index 1400cdf79d..cceb440617 100644
--- a/apps/contacts/appinfo/migrate.php
+++ b/apps/contacts/appinfo/migrate.php
@@ -40,19 +40,20 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 				$idmap = array();
 				while( $row = $results->fetchRow() ){
 					// Import each bookmark, saving its id into the map	
-					$query = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
-					$query->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
+					$addressbookquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
+					$addressbookquery->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
 					// Map the id
 					$idmap[$row['id']] = OCP\DB::insertid();
 				}
 				// Now tags
 				foreach($idmap as $oldid => $newid){
+					
 					$query = $this->content->prepare( "SELECT * FROM contacts_cards WHERE addressbookid LIKE ?" );
 					$results = $query->execute( array( $oldid ) );
 					while( $row = $results->fetchRow() ){
 						// Import the tags for this bookmark, using the new bookmark id
-						$query = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
-						$query->execute( array( $newid, $row['fullname'], $row['carddata'], $row['uri'], $row['lastmodified'] ) );	
+						$contactquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
+						$contactquery->execute( array( $newid, $row['fullname'], $row['carddata'], $row['uri'], $row['lastmodified'] ) );	
 					}		
 				}
 				// All done!

From db6139fd4166ff4766ffec5ede0b80d7b8782850 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 19:44:05 -0400
Subject: [PATCH 0707/1537] Don't overwrite fake directory stream for Amazon S3
 storage

---
 apps/files_external/lib/amazons3.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index b8e5b9b079..9feb490dac 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -96,8 +96,8 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 			foreach ($response->body->CommonPrefixes as $object) {
 				$files[] = basename($object->Prefix);
 			}
-			OC_FakeDirStream::$dirs['amazons3'] = $files;
-			return opendir('fakedir://amazons3');
+			OC_FakeDirStream::$dirs['amazons3'.$path] = $files;
+			return opendir('fakedir://amazons3'.$path);
 		}
 		return false;
 	}

From a48aba316ebd2135647ecf6062383053331f5b8f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 28 Jun 2012 01:45:59 +0200
Subject: [PATCH 0708/1537] Smoother profile picture loading - hopefully.

---
 apps/contacts/ajax/loadphoto.php              | 10 +--
 apps/contacts/css/contacts.css                |  6 +-
 apps/contacts/js/contacts.js                  | 75 +++++++++++--------
 apps/contacts/templates/part.contact.php      |  8 +-
 apps/contacts/templates/part.contactphoto.php | 16 ----
 5 files changed, 56 insertions(+), 59 deletions(-)
 delete mode 100644 apps/contacts/templates/part.contactphoto.php

diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
index 61b5356edc..a35631055e 100644
--- a/apps/contacts/ajax/loadphoto.php
+++ b/apps/contacts/ajax/loadphoto.php
@@ -42,11 +42,5 @@ foreach($vcard->children as $property){
 	}
 }
 
-$tmpl = new OCP\Template("contacts", "part.contactphoto");
-$tmpl->assign('id', $id);
-if($refresh) {
-	$tmpl->assign('refresh', 1);
-}
-$page = $tmpl->fetchPage();
-OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
-?>
+OCP\JSON::success(array('data' => array('checksum'=>$checksum)));
+
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 1766c28761..ce4daa1d3a 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -73,10 +73,10 @@ label:hover, dt:hover { color: #333; }
 .contactsection { position: relative; float: left; /*max-width: 40em;*/ padding: 0.5em; height: auto: border: thin solid lightgray;/* -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; border-radius: 0.5em; background-color: #f8f8f8;*/ }
 
 #cropbox { margin: auto; }
-#contacts_details_photo_wrapper { min-width: 120px; }
+#contacts_details_photo_wrapper { width: 200px; }
 #contacts_details_photo_wrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background: url('%webroot%/core/img/loading.gif') no-repeat center center; cursor: wait; }
-#contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
-#contacts_details_photo:hover { background: #fff; cursor: default; }
+.contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; opacity: 1; }
+.contacts_details_photo:hover { background: #fff; cursor: default; }
 #phototools { position:absolute; margin: 5px 0 0 10px; width:auto; height:22px; padding:0px; background-color:#fff; list-style-type:none; border-radius: 0.5em; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
 #phototools li { display: inline; }
 #phototools li a { float:left; cursor:pointer; width:22px; height:22px; opacity: 0.6; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d357e50608..9d41b70a31 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -144,6 +144,31 @@ Contacts={
 			$('#edit_name').click(function(){Contacts.UI.Card.editName()});
 			$('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
 			
+			$('#phototools li a').click(function() {
+				$(this).tipsy('hide');
+			});
+			$('#contacts_details_photo_wrapper').hover(
+				function () {
+					$('#phototools').slideDown(200);
+				},
+				function () {
+					$('#phototools').slideUp(200);
+				}
+			);
+			$('#phototools').hover(
+				function () {
+					$(this).removeClass('transparent');
+				},
+				function () {
+					$(this).addClass('transparent');
+				}
+			);
+			$('#phototools .upload').click(function() {
+				$('#file_upload_start').trigger('click');
+			});
+			$('#phototools .cloud').click(function() {
+				OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true);
+			});
 			/* Initialize the photo edit dialog */
 			$('#edit_photo_dialog').dialog({ 
 				autoOpen: false, modal: true, height: 'auto', width: 'auto'
@@ -1109,25 +1134,6 @@ Contacts={
 			loadPhotoHandlers:function(){
 				$('#phototools li a').tipsy('hide');
 				$('#phototools li a').tipsy();
-				$('#phototools li a').click(function() {
-					$(this).tipsy('hide');
-				});
-				$('#contacts_details_photo_wrapper').hover(
-					function () {
-						$('#phototools').slideDown(200);
-					},
-					function () {
-						$('#phototools').slideUp(200);
-					}
-				);
-				$('#phototools').hover(
-					function () {
-						$(this).removeClass('transparent');
-					},
-					function () {
-						$(this).addClass('transparent');
-					}
-				);
 				if(this.data.PHOTO) {
 					$('#phototools .delete').click(function() {
 						$(this).tipsy('hide');
@@ -1138,16 +1144,12 @@ Contacts={
 						$(this).tipsy('hide');
 						Contacts.UI.Card.editCurrentPhoto();
 					});
+					$('#phototools .delete').show();
+					$('#phototools .edit').show();
 				} else {
 					$('#phototools .delete').hide();
 					$('#phototools .edit').hide();
 				}
-				$('#phototools .upload').click(function() {
-					$('#file_upload_start').trigger('click');
-				});
-				$('#phototools .cloud').click(function() {
-					OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true);
-				});
 			},
 			cloudPhotoSelected:function(path){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){
@@ -1162,22 +1164,33 @@ Contacts={
 				});
 			},
 			loadPhoto:function(refresh){
+				var self = this;
+				var refreshstr = (refresh?'&refresh=1'+Math.random():'')
 				$('#phototools li a').tipsy('hide');
 				var wrapper = $('#contacts_details_photo_wrapper');
-				wrapper.addClass('wait');
+				wrapper.addClass('loading').addClass('wait');
+				
+				var img = new Image();
+				$(img).load(function () {
+					$('img.contacts_details_photo').remove()
+					$(this).addClass('contacts_details_photo').hide();
+					wrapper.removeClass('loading').removeClass('wait');
+					$(this).insertAfter($('#phototools')).fadeIn();
+				}).error(function () {
+					// notify the user that the image could not be loaded
+					$(t('contacts','something went wrong.')).insertAfter($('#phototools'));
+				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
+		
 				$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
-						wrapper.html(jsondata.data.page).ready(function(){ wrapper.removeClass('wait').tipsy() });
 						Contacts.UI.Card.loadPhotoHandlers();
 					}
 					else{
-						wrapper.removeClass('wait');
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
 				$('#file_upload_form').show();
-				$('#contacts_propertymenu_dropdown a[data-type="PHOTO"]').parent().hide();
 			},
 			editCurrentPhoto:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
@@ -1213,15 +1226,15 @@ Contacts={
 				var target = $('#crop_target');
 				var form = $('#cropform');
 				var wrapper = $('#contacts_details_photo_wrapper');
+				var self = this;
 				wrapper.addClass('wait');
 				form.submit();
 				target.load(function(){
 					var response=jQuery.parseJSON(target.contents().text());
 					if(response != undefined && response.status == 'success'){
 						// load cropped photo.
-						wrapper.html(response.data.page).ready(function(){ wrapper.removeClass('wait') });
+						self.loadPhoto(true);
 						Contacts.UI.Card.data.PHOTO = true;
-						Contacts.UI.Card.loadPhotoHandlers();
 					}else{
 						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
 						wrapper.removeClass('wait');
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 5757563fe5..bb574372e5 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -18,7 +18,14 @@ $id = isset($_['id']) ? $_['id'] : '';
 
 	<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
 	<div class="tip propertycontainer" id="contacts_details_photo_wrapper" title="<?php echo $l->t('Drop photo to upload'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)" data-element="PHOTO">
+	<ul id="phototools" class="transparent hidden">
+		<li><a class="svg delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
+		<li><a class="svg edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
+		<li><a class="svg upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
+		<li><a class="svg cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
+	</ul>
 	</div>
+	<img />
 	</div> <!-- contact_photo -->
 
 	<div id="contact_identity" class="contactsection">
@@ -104,7 +111,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 	<div id="contacts_propertymenu">
 	<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>
 	<ul id="contacts_propertymenu_dropdown" role="menu" class="hidden">
-		<li><a role="menuitem" data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
 		<li><a role="menuitem" data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
 		<li><a role="menuitem" data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
 		<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
deleted file mode 100644
index bddf4cc8a8..0000000000
--- a/apps/contacts/templates/part.contactphoto.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php 
-$id = $_['id'];
-$wattr = isset($_['width'])?'width="'.$_['width'].'"':'';
-$hattr = isset($_['height'])?'height="'.$_['height'].'"':'';
-$rand = isset($_['refresh'])?'&refresh='.rand():'';
-?>
-<ul id="phototools" class="transparent hidden">
-	<li><a class="svg delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
-	<li><a class="svg edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
-	<li><a class="svg upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
-	<li><a class="svg cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
-</ul>
-<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OCP\Util::linkToAbsolute('contacts', 'photo.php'); ?>?id=<?php echo $id.$rand; ?>" />
-<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
-
-

From e04a605b9b5dab2e7e79364dcc0eaee35721ee8b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 28 Jun 2012 01:51:42 +0200
Subject: [PATCH 0709/1537] No need for this anymore.

---
 apps/contacts/templates/part.contacts.php | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 apps/contacts/templates/part.contacts.php

diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
deleted file mode 100644
index c33c5832e8..0000000000
--- a/apps/contacts/templates/part.contacts.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-foreach($_['books'] as $id => $addressbook) {
-	echo '<h3 class="addressbook" data-id="'.$id.'">'.$addressbook['displayname'].'</h3>';
-	echo '<ul class="contacts hidden" data-id="'.$id.'">';
-	foreach($addressbook['contacts'] as $contact) {
-		echo '<li role="button" data-bookid="'.$contact['addressbookid'].'" data-id="'.$contact['id'].'"><a href="'.link_to('contacts','index.php').'&id='.$contact['id'].'" style="background: url('.link_to('contacts','thumbnail.php').'?id='.$contact['id'].') no-repeat scroll 0 0 transparent;">'.$contact['displayname'].'</a></li>';
-	}
-	echo '</ul>';
-}
-?>

From 81953e7bb5179ed33eb4ac5e24301e41148c252e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 20:23:42 -0400
Subject: [PATCH 0710/1537] Return login errors for PostgreSQL setup

---
 lib/setup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/setup.php b/lib/setup.php
index e1c1a110b3..59c3aefbf1 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -163,6 +163,7 @@ class OC_Setup {
 						'error' => 'PostgreSQL username and/or password not valid',
 						'hint' => 'You need to enter either an existing account or the administrator.'
 					);
+					return $error;
 				}
 				else {
 					//check for roles creation rights in postgresql

From dac539b61936e61c804c3d8fbf91003803e2cc81 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 28 Jun 2012 11:46:17 +0200
Subject: [PATCH 0711/1537] handover the correct timestamp

---
 apps/files_versions/ajax/getVersions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index fe48434d2c..f29d1760b6 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -13,7 +13,7 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 	$versionsFormatted = array();
 	
 	foreach ( $versions AS $version ) {
-		$versionsFormatted[] = OCP\Util::formatDate( doubleval($version) );
+		$versionsFormatted[] = OCP\Util::formatDate( $version['version'] );
 	}
 
 	$versionsSorted = array_reverse( $versions );

From 52f99a7570921f994035c96002b7ae46acdfea9b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 28 Jun 2012 11:48:57 +0200
Subject: [PATCH 0712/1537] delete file versions if the user deletes a file

---
 apps/files_archive/appinfo/app.php        |  2 ++
 apps/files_versions/lib/hooks_handler.php | 38 +++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 apps/files_versions/lib/hooks_handler.php

diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
index 67376c4a03..e602667026 100644
--- a/apps/files_archive/appinfo/app.php
+++ b/apps/files_archive/appinfo/app.php
@@ -7,7 +7,9 @@
  */
 
 OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php';
+OC::$CLASSPATH['OC_Files_Versions_Hooks_Handler'] = 'files_versions/lib/hooks_handler.php';
 
 OCP\Util::connectHook('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount');
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OC_Files_Versions_Hooks_Handler", "removeVersions");
 
 OCP\Util::addscript( 'files_archive', 'archive' );
diff --git a/apps/files_versions/lib/hooks_handler.php b/apps/files_versions/lib/hooks_handler.php
new file mode 100644
index 0000000000..4be2d1c284
--- /dev/null
+++ b/apps/files_versions/lib/hooks_handler.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+* ownCloud - hooks handler of the Versions app
+*
+* @author Bjoern Schiessle
+* @copyright 2012 Bjoern Schiessle schiessle@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 Lesser General Public 
+* License along with this library. If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
+class OC_Files_Versions_Hooks_Handler {
+
+	public static function removeVersions($params) {
+		$rel_path =  $params[OC_Filesystem::signal_param_path];
+		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_path;
+		if(OCA_Versions\Storage::isversioned($rel_path)) {
+			$versions = OCA_Versions\Storage::getVersions($rel_path);
+			foreach ($versions as $v){
+					unlink($abs_path.'.v' . $v['version']);
+			}
+		}
+	}
+}
+
+?>
\ No newline at end of file

From f22f49671bcdc87058c6060db4ca4e4e1d9704f1 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 28 Jun 2012 12:42:47 +0200
Subject: [PATCH 0713/1537] move hook to erase versions from deleted files to
 the right place

---
 apps/files_archive/appinfo/app.php        |  2 --
 apps/files_versions/appinfo/app.php       |  2 ++
 apps/files_versions/lib/hooks_handler.php | 38 -----------------------
 apps/files_versions/versions.php          | 14 ++++++++-
 4 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 apps/files_versions/lib/hooks_handler.php

diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
index e602667026..67376c4a03 100644
--- a/apps/files_archive/appinfo/app.php
+++ b/apps/files_archive/appinfo/app.php
@@ -7,9 +7,7 @@
  */
 
 OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php';
-OC::$CLASSPATH['OC_Files_Versions_Hooks_Handler'] = 'files_versions/lib/hooks_handler.php';
 
 OCP\Util::connectHook('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount');
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OC_Files_Versions_Hooks_Handler", "removeVersions");
 
 OCP\Util::addscript( 'files_archive', 'archive' );
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index bd06dc0ced..5a559c0c96 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -9,3 +9,5 @@ OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
 OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
+// Listen to delete signals
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Storage", "removeVersions");
\ No newline at end of file
diff --git a/apps/files_versions/lib/hooks_handler.php b/apps/files_versions/lib/hooks_handler.php
deleted file mode 100644
index 4be2d1c284..0000000000
--- a/apps/files_versions/lib/hooks_handler.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
-* ownCloud - hooks handler of the Versions app
-*
-* @author Bjoern Schiessle
-* @copyright 2012 Bjoern Schiessle schiessle@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 Lesser General Public 
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-class OC_Files_Versions_Hooks_Handler {
-
-	public static function removeVersions($params) {
-		$rel_path =  $params[OC_Filesystem::signal_param_path];
-		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_path;
-		if(OCA_Versions\Storage::isversioned($rel_path)) {
-			$versions = OCA_Versions\Storage::getVersions($rel_path);
-			foreach ($versions as $v){
-					unlink($abs_path.'.v' . $v['version']);
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 9c0829ff1d..787de0f78a 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -309,5 +309,17 @@ class Storage {
 	
         }
 
-
+        /**
+         * @brief Erase versions of deleted file
+         */
+        public static function removeVersions($params) {
+        	$rel_path =  $params[\OC_Filesystem::signal_param_path];
+        	$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_path.'.v';
+        	if(Storage::isversioned($rel_path)) {
+        		$versions = Storage::getVersions($rel_path);
+        		foreach ($versions as $v){
+        			unlink($abs_path . $v['version']);
+        		}
+        	}
+        }
 }

From e5792cc064c41c2a5bca32b886a8bc08cce2fb3f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 28 Jun 2012 14:06:20 +0200
Subject: [PATCH 0714/1537] adjust the name and/or location of the stored
 versions if the actual file gets moved or renamed

---
 apps/files_versions/appinfo/app.php |  5 +++--
 apps/files_versions/versions.php    | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 5a559c0c96..105c5a102c 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -9,5 +9,6 @@ OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
 OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
-// Listen to delete signals
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Storage", "removeVersions");
\ No newline at end of file
+// Listen to delete and rename signals
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Storage", "removeVersions");
+OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Storage", "renameVersions");
\ No newline at end of file
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 787de0f78a..b733c57923 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -310,7 +310,11 @@ class Storage {
         }
 
         /**
-         * @brief Erase versions of deleted file
+         * @brief Erase versions of deleted file
+         * @param array
+         *          
+         * This function is connected to the delete signal of OC_Filesystem
+         * cleanup the versions directory if the actual file gets deleted
          */
         public static function removeVersions($params) {
         	$rel_path =  $params[\OC_Filesystem::signal_param_path];
@@ -322,4 +326,23 @@ class Storage {
         		}
         	}
         }
+        
+        /**
+         * @brief rename/move versions of renamed/moved files
+         * @param array with oldpath and newpath
+         * 
+         * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+         * of the stored versions along the actual file
+         */
+        public static function renameVersions($params) {
+        	$rel_oldpath =  $params['oldpath'];
+        	$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_oldpath.'.v';
+        	$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$params['newpath'].'.v';
+        	if(Storage::isversioned($rel_oldpath)) {
+        		$versions = Storage::getVersions($rel_oldpath);
+        		foreach ($versions as $v){
+        			rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
+        		}
+        	}
+        }
 }

From bdd1baeb858b4968a6b69b48960abe3b9f63bc92 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 28 Jun 2012 14:18:57 +0200
Subject: [PATCH 0715/1537] use public API

---
 apps/files_versions/versions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index b733c57923..7ed5f25750 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -316,9 +316,9 @@ class Storage {
          * This function is connected to the delete signal of OC_Filesystem
          * cleanup the versions directory if the actual file gets deleted
          */
-        public static function removeVersions($params) {
-        	$rel_path =  $params[\OC_Filesystem::signal_param_path];
-        	$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_path.'.v';
+        public static function removeVersions($params) {
+        	$rel_path =  $params['path'];
+        	$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
         	if(Storage::isversioned($rel_path)) {
         		$versions = Storage::getVersions($rel_path);
         		foreach ($versions as $v){
@@ -336,8 +336,8 @@ class Storage {
          */
         public static function renameVersions($params) {
         	$rel_oldpath =  $params['oldpath'];
-        	$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_oldpath.'.v';
-        	$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$params['newpath'].'.v';
+        	$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
+        	$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
         	if(Storage::isversioned($rel_oldpath)) {
         		$versions = Storage::getVersions($rel_oldpath);
         		foreach ($versions as $v){

From 9a4709e68db5cff184816ed9d01086ba00f62b35 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 28 Jun 2012 16:41:00 +0200
Subject: [PATCH 0716/1537] fix calendar export for Apple iCal - i hate bloody
 line ends

---
 apps/calendar/lib/export.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
index 6f478236de..7c98d94fcc 100644
--- a/apps/calendar/lib/export.php
+++ b/apps/calendar/lib/export.php
@@ -49,6 +49,9 @@ class OC_Calendar_Export{
 			$return .= $object->VEVENT->serialize();
 		}
 		$return .= "END:VCALENDAR";
+		$return = str_replace("\r\n", "\n", $return);
+		$return = str_replace("\r", "\n", $return);
+		$return = str_replace("\n", "\r\n", $return);
 		return $return;
 	}
 }

From 9dd7ca26671d2c6640210e59071135e8f69cca7f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 28 Jun 2012 18:54:13 +0200
Subject: [PATCH 0717/1537] some changes and more doc for OC_Calendar_Export
 class

---
 apps/calendar/lib/export.php | 74 +++++++++++++++++++++++++++---------
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
index 7c98d94fcc..cd248ce92a 100644
--- a/apps/calendar/lib/export.php
+++ b/apps/calendar/lib/export.php
@@ -6,9 +6,12 @@
  * See the COPYING-README file.
  */
 /*
- * This class does export
+ * This class does export and converts all times to UTC
  */
 class OC_Calendar_Export{
+	/*
+	 * @brief Use one of these constants as second parameter if you call OC_Calendar_Export::export()
+	 */
 	const CALENDAR = 'calendar';
 	const EVENT = 'event';
 
@@ -20,38 +23,71 @@ class OC_Calendar_Export{
 	 */
 	public static function export($id, $type){
 		if($type == self::EVENT){
-			$data = OC_Calendar_App::getEventObject($_GET['eventid'], false);
-			$return = $data['calendardata'];
+			$return = self::event($id);
 		}else{
 			$return = self::calendar($id);
 		}
-		return $return;
+		return self::fixLineBreaks($return);
 	}
 
 	/*
-	 * @brief export a calendar and convert all times to UTC
+	 * @brief exports a calendar and convert all times to UTC
 	 * @param integer $id id of the calendar
 	 * @return string
 	 */
 	private static function calendar($id){
 		$events = OC_Calendar_Object::all($id);
-		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar\n";
+		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
 		foreach($events as $event){
-			$object = OC_VObject::parse($event['calendardata']);
-			$dtstart = $object->VEVENT->DTSTART;
-			$start_dt = $dtstart->getDateTime();
-			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object->VEVENT);
-			$end_dt = $dtend->getDateTime();
-			if($dtstart->getDateType() !== Sabre_VObject_Element_DateTime::DATE){
-				$object->VEVENT->DTSTART->offsetUnset('VALUE');
-				$object->VEVENT->DTEND->offsetUnset('VALUE');
-			}
-			$return .= $object->VEVENT->serialize();
+			$return .= self::generateEvent($event);
 		}
 		$return .= "END:VCALENDAR";
-		$return = str_replace("\r\n", "\n", $return);
-		$return = str_replace("\r", "\n", $return);
-		$return = str_replace("\n", "\r\n", $return);
 		return $return;
 	}
+	
+	/*
+	 * @brief exports an event and convert all times to UTC
+	 * @param integer $id id of the event
+	 * @return string
+	 */
+	private static function event($id){
+		$event = OC_Calendar_Object::find($id);
+		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
+		$return .= self::generateEvent($event);
+		$return .= "END:VCALENDAR";
+		return $return;
+	 }
+	 
+	 /*
+	  * @brief generates the VEVENT with UTC dates
+	  * @param array $event
+	  * @return string
+	  */
+	 private static function generateEvent($event){
+		$object = OC_VObject::parse($event['calendardata']);
+		$dtstart = $object->VEVENT->DTSTART;
+		$start_dt = $dtstart->getDateTime();
+		$dtend = OC_Calendar_Object::getDTEndFromVEvent($object->VEVENT);
+		$end_dt = $dtend->getDateTime();
+		if($dtstart->getDateType() !== Sabre_VObject_Element_DateTime::DATE){
+			$start_dt->setTimezone(new DateTimeZone('UTC'));
+			$end_dt->setTimezone(new DateTimeZone('UTC'));
+			$object->VEVENT->setDateTime('DTSTART', $start_dt, Sabre_VObject_Property_DateTime::UTC);
+			$object->VEVENT->setDateTime('DTEND', $end_dt, Sabre_VObject_Property_DateTime::UTC);
+		}
+		return $object->VEVENT->serialize();
+	}
+	
+	/*
+	 * @brief fixes new line breaks
+	 * (fixes problems with Apple iCal)
+	 * @param string $string to fix
+	 * @return string 
+	 */
+	private static function fixLineBreaks($string){
+		$string = str_replace("\r\n", "\n", $string);
+		$string = str_replace("\r", "\n", $string);
+		$string = str_replace("\n", "\r\n", $string);
+		return $string;
+	}
 }

From 930bbeabd4285617c8a360babbffedca3f3d7634 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 28 Jun 2012 19:04:14 +0200
Subject: [PATCH 0718/1537] Calendar Export: replace spaces with dashes in the
 name of the calendar / event

---
 apps/calendar/export.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 5ed7092cbf..1374c49cc0 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -16,7 +16,7 @@ if(isset($cal)){
 		exit;
 	}
 	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . $calendar['displayname'] . '.ics'); 
+	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $calendar['displayname']) . '.ics'); 
 	echo OC_Calendar_Export::export($cal, OC_Calendar_Export::CALENDAR);
 }elseif(isset($event)){
 	$data = OC_Calendar_App::getEventObject($_GET['eventid'], true);
@@ -25,6 +25,6 @@ if(isset($cal)){
 		exit;
 	}
 	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . $data['summary'] . '.ics');
+	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $data['summary']) . '.ics');
 	echo OC_Calendar_Export::export($event, OC_Calendar_Export::EVENT);
 }
\ No newline at end of file

From 4b3af1f73be4d2d6e9a3fed0cbe7a35e774359f7 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 28 Jun 2012 19:12:50 +0200
Subject: [PATCH 0719/1537] use OC_Calendar_Export for publicly shared
 calendars

---
 apps/calendar/share.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/calendar/share.php b/apps/calendar/share.php
index 68c7d0ffae..f8f9bb8ea4 100644
--- a/apps/calendar/share.php
+++ b/apps/calendar/share.php
@@ -1,22 +1,30 @@
 <?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
 $token = strip_tags($_GET['t']);
 $shared = OC_Calendar_Share::getElementByToken($token);
-$nl = "\n\r";
 if($shared['type'] == OC_Calendar_Share::CALENDAR){
 	$calendar = OC_Calendar_App::getCalendar($shared['id'], false);
-	$calobjects = OC_Calendar_Object::all($shared['id']);
-	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . $calendar['displayname'] . '.ics'); 
-	foreach($calobjects as $calobject){
-		echo $calobject['calendardata'] . $nl;
+	if(!$calendar){
+		header('HTTP/1.0 404 Not Found');
+		exit;
 	}
-}elseif($shared['type'] == OC_Calendar_Share::EVENT){
-	$data = OC_Calendar_App::getEventObject($shared['id'], false);
-	$calendarid = $data['calendarid'];
-	$calendar = OC_Calendar_App::getCalendar($calendarid);
 	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . $data['summary'] . '.ics'); 
-	echo $data['calendardata'];
+	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $calendar['displayname']) . '.ics'); 
+	echo OC_Calendar_Export::export($shared['id'], OC_Calendar_Export::CALENDAR);
+}elseif($shared['type'] == OC_Calendar_Share::EVENT){
+	if(!$data){
+		header('HTTP/1.0 404 Not Found');
+		exit;
+	}
+	header('Content-Type: text/Calendar');
+	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $data['summary']) . '.ics');
+	echo OC_Calendar_Export::export($shared['id'], OC_Calendar_Export::EVENT);
 }else{
-	header('Error 404: Not Found');
-}
\ No newline at end of file
+	header('HTTP/1.0 404 Not Found');
+	exit;
+}

From 91d92aed0284a0af83fd656a51deb9335e6b4703 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 28 Jun 2012 19:13:43 +0200
Subject: [PATCH 0720/1537] fix for previous commit

---
 apps/calendar/share.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/share.php b/apps/calendar/share.php
index f8f9bb8ea4..bffcf0b470 100644
--- a/apps/calendar/share.php
+++ b/apps/calendar/share.php
@@ -17,6 +17,7 @@ if($shared['type'] == OC_Calendar_Share::CALENDAR){
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $calendar['displayname']) . '.ics'); 
 	echo OC_Calendar_Export::export($shared['id'], OC_Calendar_Export::CALENDAR);
 }elseif($shared['type'] == OC_Calendar_Share::EVENT){
+	$data = OC_Calendar_App::getEventObject($shared['id'], false);
 	if(!$data){
 		header('HTTP/1.0 404 Not Found');
 		exit;

From b2cbf1199ddf9802316a4508ee312490c6b88ddb Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 28 Jun 2012 19:37:29 +0000
Subject: [PATCH 0721/1537] Pg setup enhancement

do not create a db if already existing .. and reset the user password instead of creating if the user already exists
---
 lib/setup.php | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index 59c3aefbf1..5387a0ef49 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -285,13 +285,23 @@ class OC_Setup {
 		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$e_name = pg_escape_string($name);
 		$e_user = pg_escape_string($user);
-		$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
+		$query = "select datname from pg_database where datname = '$e_name'";
 		$result = pg_query($connection, $query);
 		if(!$result) {
 			$entry='DB Error: "'.pg_last_error($connection).'"<br />';
 			$entry.='Offending command was: '.$query.'<br />';
 			echo($entry);
 		}
+		if(! pg_fetch_row($result)) {
+			//The database does not exists... let's create it
+			$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry='DB Error: "'.pg_last_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.'<br />';
+				echo($entry);
+			}
+		}
 		$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
 		$result = pg_query($connection, $query);		
 	}
@@ -299,13 +309,33 @@ class OC_Setup {
 	private static function pg_createDBUser($name,$password,$connection) {
 		$e_name = pg_escape_string($name);
 		$e_password = pg_escape_string($password);
-		$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
+		$query = "select * from pg_roles where rolname='$e_name';";
 		$result = pg_query($connection, $query);
 		if(!$result) {
 			$entry='DB Error: "'.pg_last_error($connection).'"<br />';
 			$entry.='Offending command was: '.$query.'<br />';
 			echo($entry);
 		}
+
+		if(! pg_fetch_row($result)) {
+			//user does not exists let's create it :)
+			$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry='DB Error: "'.pg_last_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.'<br />';
+				echo($entry);
+			}
+		}
+		else { // change password of the existing role
+			$query = "ALTER ROLE \"$e_name\" WITH PASSWORD '$e_password';";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry='DB Error: "'.pg_last_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.'<br />';
+				echo($entry);
+			}
+		}
 	}
 
 	/**

From 19bb4e83c994a31578d35d8a43a6ab4b180858d7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 28 Jun 2012 21:26:03 +0200
Subject: [PATCH 0722/1537] Remove redundant code from OC_Helper::linkTo

---
 lib/helper.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 6ab55f2761..64378da356 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -38,13 +38,10 @@ class OC_Helper {
 	 */
 	public static function linkTo( $app, $file ){
 		if( $app != '' ){
-			$app .= '/';
+			$app_path = OC_App::getAppPath($app);
 			// Check if the app is in the app folder
-			if( file_exists( OC_App::getAppPath($app).'/'.$file )){
+			if( $app_path && file_exists( $app_path.'/'.$file )){
 				if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){	
-					if(substr($app, -1, 1) == '/'){
-						$app = substr($app, 0, strlen($app) - 1);
-					}
 					$urlLinkTo =  OC::$WEBROOT . '/?app=' . $app;
 					$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
 				}else{
@@ -52,7 +49,7 @@ class OC_Helper {
 				}
 			}
 			else{
-				$urlLinkTo =  OC::$WEBROOT . '/' . $app . $file;
+				$urlLinkTo =  OC::$WEBROOT . '/' . $app . '/' . $file;
 			}
 		}
 		else{

From bf09edcbf1775115067611b85b954fbabad74ba3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 28 Jun 2012 21:54:33 +0200
Subject: [PATCH 0723/1537] Remember the app root information.

---
 lib/app.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index 61566ed752..d1f12594a2 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -350,9 +350,13 @@ class OC_App{
 
 
 	protected static function findAppInDirectories($appid) {
+		static $app_dir = array();
+		if (isset($app_dir[$appid])) {
+			return $app_dir[$appid];
+		}
 		foreach(OC::$APPSROOTS as $dir) {
 			if(file_exists($dir['path'].'/'.$appid)) {
-				return $dir;
+				return $app_dir[$appid]=$dir;
 			}
 		}
 	}

From 02e4e0e08f39bfb59a7bd8e4a538d6715897af2b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 28 Jun 2012 21:59:01 +0200
Subject: [PATCH 0724/1537] Gallery: Get all the image information for a
 directory at once

---
 apps/gallery/lib/managers.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index fcce3f40e2..17eb741a66 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -4,6 +4,7 @@ namespace OC\Pictures;
 
 class DatabaseManager {
 	private static $instance = null;
+	protected $cache = array();
 	const TAG = 'DatabaseManager';
 	
 	public static function getInstance() {
@@ -12,13 +13,27 @@ class DatabaseManager {
 		return self::$instance;
 	}
 	
+	protected function getPathData($path) {
+		$stmt = \OCP\DB::prepare('SELECT * FROM *PREFIX*pictures_images_cache
+			WHERE uid_owner LIKE ? AND path like ? AND path not like ?');
+		$path_match = $path.'/%';
+		$path_notmatch = $path.'/%/%';
+		$result = $stmt->execute(array(\OCP\USER::getUser(), $path_match, $path_notmatch));
+		$this->cache[$path] = array();
+		while (($row = $result->fetchRow()) != false) {
+			$this->cache[$path][$row['path']] = $row;
+		}
+	}
+
 	public function getFileData($path) {
 		$gallery_path = \OCP\Config::getSystemValue( 'datadirectory' ).'/'.\OC_User::getUser().'/gallery';
 		$path = $gallery_path.$path;
-		$stmt = \OCP\DB::prepare('SELECT * FROM *PREFIX*pictures_images_cache WHERE uid_owner LIKE ? AND path = ?');
-		$result = $stmt->execute(array(\OCP\USER::getUser(), $path));
-		if (($row = $result->fetchRow()) != false) {
-			return $row;
+		$dir = dirname($path);
+		if (!isset($this->cache[$dir])) {
+			$this->getPathData($dir);
+		}
+		if (isset($this->cache[$dir][$path])) {
+			return $this->cache[$dir][$path];
 		}
 		$image = new \OC_Image();
 		if (!$image->loadFromFile($path)) {
@@ -28,6 +43,7 @@ class DatabaseManager {
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
 		$ret = array('path' => $path, 'width' => $image->width(), 'height' => $image->height());
 		unset($image);
+		$this->cache[$dir][$path] = $ret;
 		return $ret;
 	}
 	

From 1ccbbfad530e4efdbfe301c8014ee7f31fa56220 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 28 Jun 2012 22:01:46 +0200
Subject: [PATCH 0725/1537] Spelling fix

---
 lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index d1f12594a2..4c2c43ec26 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -573,7 +573,7 @@ class OC_App{
 	}
 
 	/**
-	 * get the installed version of all papps
+	 * get the installed version of all apps
 	 */
 	public static function getAppVersions(){
 		static $versions;

From 31bba86e8753ce3a1d7821c195f64ebfb052e01d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 28 Jun 2012 17:54:53 -0400
Subject: [PATCH 0726/1537] Fix external storage UI for Admin page

---
 apps/files_external/js/settings.js         | 4 ++--
 apps/files_external/personal.php           | 2 +-
 apps/files_external/settings.php           | 2 +-
 apps/files_external/templates/settings.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 57188a6a26..49b7710638 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -27,7 +27,7 @@ OC.MountConfig={
 			}
 		});
 		if (addMountPoint) {
-			if ($('#externalStorage').data('admin')) {
+			if ($('#externalStorage').data('admin') === true) {
 				var isPersonal = false;
 				var multiselect = $(tr).find('.chzn-select').val();
 				var oldGroups = $(tr).find('.applicable').data('applicable-groups');
@@ -117,7 +117,7 @@ $(document).ready(function() {
 		if (mountPoint == '') {
 			return false;
 		}
-		if ($('#externalStorage').data('admin')) {
+		if ($('#externalStorage').data('admin') === true) {
 			var isPersonal = false;
 			var multiselect = $(tr).find('.chzn-select').val();
 			$.each(multiselect, function(index, value) {
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 32e0874244..b758e7e7eb 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -26,7 +26,7 @@ $backends = OC_Mount_Config::getBackends();
 // Remove local storage
 unset($backends['OC_Filestorage_Local']);
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('isAdminPage', false);
+$tmpl->assign('isAdminPage', false, false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 983855ecdc..acc9036b29 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -23,7 +23,7 @@
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('isAdminPage', true);
+$tmpl->assign('isAdminPage', true, false);
 $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
 $tmpl->assign('backends', OC_Mount_Config::getBackends());
 $tmpl->assign('groups', OC_Group::getGroups());
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 6c37df8001..7777593d74 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,7 +1,7 @@
 <form id="files_external">
 	<fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
-		<table id="externalStorage" data-admin="<?php echo json_encode($_['isAdminPage']); ?>">
+		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
 					<th><?php echo $l->t('Mount point'); ?></th>

From 75af5778a4e034600edd2e891f8c70e6e807808a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 29 Jun 2012 00:49:37 +0200
Subject: [PATCH 0727/1537] pass progresskey the correct way during calender
 import

---
 apps/calendar/js/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 0fc5018e89..cef95afc3a 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -44,7 +44,7 @@ Calendar_Import={
 			$('#newcalendar').attr('readonly', 'readonly');
 			$('#calendar').attr('disabled', 'disabled');
 			var progresskey = $('#progresskey').val();
-			$.post(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progresskey='+progresskey, {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
+			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progresskey: progresskey, method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
 				if(data.status == 'success'){
 					$('#progressbar').progressbar('option', 'value', 100);
 					$('#import_done').css('display', 'block');

From 6917d741931acb8d8a5dddbc6c668a5b75960a91 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 29 Jun 2012 11:07:41 +0200
Subject: [PATCH 0728/1537] =?UTF-8?q?move=20the=20ownCloud=20version=20to?=
 =?UTF-8?q?=20admin=20which=20makes=20more=20sense.=20A=20normal=20user=20?=
 =?UTF-8?q?can=C2=B4t=20update=20ownCloud=20anyways.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings/templates/admin.php    | 7 +++++++
 settings/templates/personal.php | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a9f727d676..033cd1a164 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -54,3 +54,10 @@ if(!$_['htaccessworking']) {
 </table>
 <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
 </fieldset>
+
+
+<p class="personalblock">
+	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
+	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="http://gitorious.org/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
+</p>
+
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 014996a5b2..ee40120d72 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -55,10 +55,5 @@
 	echo $form;
 };?>
 
-<p class="personalblock">
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
-	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="http://gitorious.org/owncloud" target="_blank">source code</a> is freely licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
-</p>
-
 
 

From 60ec46f706fde158ec66b447446ed0b763e40076 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 29 Jun 2012 11:59:47 +0200
Subject: [PATCH 0729/1537] - remove leading http[s] to let createBaseUri()
 generate secure/unsecure base URI - if secure is set to true add 's' to http

---
 apps/files_external/lib/webdav.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index d136f04f3e..94d9abb6a2 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -20,10 +20,14 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	private static $tempFiles=array();
 	
 	public function __construct($params){
-		$this->host=$params['host'];
+		$host = $params['host'];
+		//remove leading http[s], will be generated in createBaseUri()
+		if (substr($host,0,8) == "https://") $host = substr($host, 8);
+		else if (substr($host,0,7) == "http://") $host = substr($host, 7);
+		$this->host=$host;
 		$this->user=$params['user'];
 		$this->password=$params['password'];
-		$this->secure=isset($params['secure'])?(bool)$params['secure']:false;
+		$this->secure=(isset($params['secure']) && $params['secure'] == 'true')?true:false;
 		$this->root=isset($params['root'])?$params['root']:'/';
 		if(!$this->root || $this->root[0]!='/'){
 			$this->root='/'.$this->root;
@@ -46,7 +50,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	private function createBaseUri(){
 		$baseUri='http';
 		if($this->secure){
-			$baseUri.'s';
+			$baseUri.='s';
 		}
 		$baseUri.='://'.$this->host.$this->root;
 		return $baseUri;

From 08e707d25821fd6111ed8f8b91aa5f77ee1b490f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 29 Jun 2012 14:32:07 +0200
Subject: [PATCH 0730/1537] some work on OC_Calendar_Import

---
 apps/calendar/lib/import.php | 139 +++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 apps/calendar/lib/import.php

diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
new file mode 100644
index 0000000000..e64a9e91eb
--- /dev/null
+++ b/apps/calendar/lib/import.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+/*
+ * This class does import and converts all times to the users current timezone
+ */
+class OC_Calendar_Import{
+	/*
+	 * @brief var to check if errors happend while initialization
+	 */
+	private $error;
+	
+	/*
+	 * @brief Sabre_VObject_Component_VCalendar object - for documentation see http://code.google.com/p/sabredav/wiki/Sabre_VObject_Component_VCalendar
+	 */
+	private $calobject;
+	
+	/*
+	 * @brief var saves the ical string that was submitted with the __construct function
+	 */
+	private $ical;
+	
+	/*
+	 * @brief var saves the ical string that was submitted with the __construct function
+	 */
+	private $tz;
+	
+	/*
+	 * @brief var saves the percentage of the import's progress
+	 */
+	private $progress;
+
+	/*
+	 * public methods 
+	 */
+	
+	/*
+	 * @brief does general initialization for import object
+	 * @param string $calendar 
+	 * @return boolean
+	 */
+	public function __construct($ical, $tz){
+		$this->error = null;
+		$this->ical = $ical;
+		try{
+			$this->calobject = OC_VObject::parse($this->ical);
+		}catch(Exception $e){
+			//MISSING: write some log
+			$this->error = true;
+			return false;
+		}
+		$this->tz = $tz;
+	}
+	
+	/*
+	 * @brief imports a calendar
+	 * @param string $force force import even though calendar is not valid
+	 * @return boolean
+	 */
+	public function import($force = false){
+		if(!$this->isValid() && !$force){
+			return false;
+		}
+		
+	}
+	
+	/*
+	 * @brief checks if something went wrong while initialization
+	 * @return boolean
+	 */
+	public function isValid(){
+		if(is_null($this->error)){
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * @brief returns the percentage of progress
+	 * @return integer
+	 */
+	public function getProgress(){
+		return $this->progress;
+	}
+
+	/*
+	 * private methods 
+	 */
+	
+	/*
+	 * @brief 
+	 * @return 
+	 */
+	private function (){
+
+	}
+	
+
+	/*
+	 * methods for X-...
+	 */
+	
+	/*
+	 * @brief guesses the calendar color
+	 * @return mixed - string or boolean
+	 */
+	private function guessCalendarColor(){
+		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
+			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
+		}
+		return false;
+	}
+	
+	/*
+	 * @brief guesses the calendar description
+	 * @return mixed - string or boolean
+	 */
+	private function guessCalendarDescription(){
+		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
+			return $this->calobject->__get('X-WR-CALDESC');
+		}
+		return false;
+	}
+	
+	/*
+	 * @brief guesses the calendar name
+	 * @return mixed - string or boolean
+	 */
+	private function guessCalendarName(){
+		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
+			return $this->calobject->__get('X-WR-CALNAME');
+		}
+		return false;
+	}
+}

From b95996c02c8b94a69eba21e31e0c5a3d30756d6d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 29 Jun 2012 15:23:04 +0200
Subject: [PATCH 0731/1537] - when creating a new text file or directory which
 name already exist use the same pattern as for file uploads in such a case
 (add a (N) to the name) - don't allow renaming if a file/directory with the
 name already exists

---
 apps/files/js/files.js | 13 ++++++++++---
 lib/files.php          |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 3ba473e023..86c5185bf7 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -451,7 +451,7 @@ $(document).ready(function() {
 		$(this).append(input);
 		input.focus();
 		input.change(function(){
-			var name=$(this).val();
+			var name=getUniqueName($(this).val());
 			if(type != 'web' && name.indexOf('/')!=-1){
 				$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
 				$('#notification').fadeIn();
@@ -496,6 +496,7 @@ $(document).ready(function() {
 					}else{//or the domain
 						localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.','');
 					}
+					localName = getUniqueName(localName);
 					$.post(
 						OC.filePath('files','ajax','newfile.php'),
 						{dir:$('#dir').val(),source:name,filename:localName},
@@ -737,7 +738,10 @@ getMimeIcon.cache={};
 function getUniqueName(name){
 	if($('tr').filterAttr('data-file',name).length>0){
 		var parts=name.split('.');
-		var extension=parts.pop();
+		var extension = "";
+		if (parts.length > 1) {
+			extension=parts.pop();
+		}
 		var base=parts.join('.');
 		numMatch=base.match(/\((\d+)\)/);
 		var num=2;
@@ -747,7 +751,10 @@ function getUniqueName(name){
 			base.pop();
 			base=base.join('(').trim();
 		}
-		name=base+' ('+num+').'+extension;
+		name=base+' ('+num+')';
+		if (extension) {
+			name = name+'.'+extension;
+		}
 		return getUniqueName(name);
 	}
 	return name;
diff --git a/lib/files.php b/lib/files.php
index 469c3a15b8..cee273d95c 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -167,10 +167,12 @@ class OC_Files {
 	* @param file $target
 	*/
 	public static function move($sourceDir,$source,$targetDir,$target){
-		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){
+		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared') && !OC_Filesystem::file_exists($tagetDir.'/'.$target)){
 			$targetFile=self::normalizePath($targetDir.'/'.$target);
 			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);
+		} else {
+			return false;
 		}
 	}
 

From bda0026374381d4519f1032c365db0a18989fbb7 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 29 Jun 2012 15:40:46 +0200
Subject: [PATCH 0732/1537] fix birthday calendar

---
 apps/calendar/lib/app.php   | 18 +++++++++---------
 apps/contacts/lib/hooks.php |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 344c89f36b..9cd6ad2851 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -368,12 +368,14 @@ class OC_Calendar_App{
 	 * @return (array) $output - readable output
 	 */
 	public static function generateEventOutput($event, $start, $end){
-		if(isset($event['calendardata'])){
-			$object = OC_VObject::parse($event['calendardata']);
-			$vevent = $object->VEVENT;
-		}else{
-			$vevent = $event['vevent'];
+		if(!isset($event['calendardata']) && !isset($event['vevent'])){
+			return false;
 		}
+		if(!isset($event['calendardata']) && isset($event['vevent'])){
+			$event['calendardata'] = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud's Internal iCal System\n" . $event['vevent']->serialize() .  "END:VCALENDAR";
+		}
+		$object = OC_VObject::parse($event['calendardata']);
+		$vevent = $object->VEVENT;
 		$return = array();
 		$id = $event['id'];
 		$allday = ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false;
@@ -404,15 +406,13 @@ class OC_Calendar_App{
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}else{
-			if(OC_Calendar_Object::isrepeating($id)){
-				$object->expand($start, $end);
-			}
+			$object->expand($start, $end);
 			foreach($object->getComponents() as $singleevent){
 				if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;
 				}
 				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($singleevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($singleevent), $allday, self::$tz);
-				$return[] = array_merge($staticoutput, $dynamicoutput);
+				$return[] = array_merge($staticoutput, $dynamicoutput);			
 			}
 		}
 		return $return;
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 9794a9c9b9..d91d3c565b 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -90,9 +90,10 @@ class OC_Contacts_Hooks{
 			if ($birthday) {
 				$date = new DateTime($birthday);
 				$vevent = new OC_VObject('VEVENT');
-				$vevent->setDateTime('LAST-MODIFIED', new DateTime($vcard->REV));
+				//$vevent->setDateTime('LAST-MODIFIED', new DateTime($vcard->REV));
 				$vevent->setDateTime('DTSTART', $date, Sabre_VObject_Element_DateTime::DATE);
 				$vevent->setString('DURATION', 'P1D');
+				$vevent->setString('UID', substr(md5(rand().time()),0,10));
 				// DESCRIPTION?
 				$vevent->setString('RRULE', 'FREQ=YEARLY');
 				$title = str_replace('{name}', $vcard->getAsString('FN'), OC_Contacts_App::$l10n->t('{name}\'s Birthday'));
@@ -101,6 +102,7 @@ class OC_Contacts_Hooks{
 					'vevent' => $vevent,
 					'repeating' => true,
 					'summary' => $title,
+					'calendardata' => "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Contacts " . OCP\App::getAppVersion('contacts') . "\n" . $vevent->serialize() .  "END:VCALENDAR"
 					);
 			}
 		}

From 94add1c000bc40cd77362ae7a1176e2b6c8faad3 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 29 Jun 2012 16:49:22 +0200
Subject: [PATCH 0733/1537] typo fixed

---
 lib/files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/files.php b/lib/files.php
index cee273d95c..d5bebb7e54 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -167,7 +167,7 @@ class OC_Files {
 	* @param file $target
 	*/
 	public static function move($sourceDir,$source,$targetDir,$target){
-		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared') && !OC_Filesystem::file_exists($tagetDir.'/'.$target)){
+		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared') && !OC_Filesystem::file_exists($targetDir.'/'.$target)){
 			$targetFile=self::normalizePath($targetDir.'/'.$target);
 			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);

From f311c2a2ff0155a457097346b6b7011e0db4df64 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 11:04:35 -0400
Subject: [PATCH 0734/1537] Hide the delete button on new mount point row

---
 apps/files_external/js/settings.js         | 1 +
 apps/files_external/templates/settings.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 49b7710638..23d5c2f630 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -103,6 +103,7 @@ $(document).ready(function() {
 		});
 		$('.chz-select').chosen();
 		$(tr).find('td').last().attr('class', 'remove');
+		$(tr).find('td').last().removeAttr('style');
 		$(tr).removeAttr('id');
 		$(this).remove();
 	});
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 7777593d74..069599d028 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -74,7 +74,7 @@
 							</select>
 						</td>
 					<?php endif; ?>
-					<td <?php if ($mountPoint != '') echo 'class="remove"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+					<td <?php echo ($mountPoint != '') ? 'class="remove"' : 'style="visibility:hidden;"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>

From 2d49a491fb740625ef56f6791669584e5ae49927 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 11:09:17 -0400
Subject: [PATCH 0735/1537] Clear the mount point value for the new mount point
 row

---
 apps/files_external/js/settings.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 23d5c2f630..1c366a79c7 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -73,7 +73,8 @@ $(document).ready(function() {
 	
 	$('#selectBackend').live('change', function() {
 		var tr = $(this).parent().parent();
-		$('#externalStorage tbody').last().append($(tr).clone());
+		$('#externalStorage tbody').append($(tr).clone());
+		$('#externalStorage tbody tr').last().find('.mountPoint input').val('');
 		var selected = $(this).find('option:selected').text();
 		var backendClass = $(this).val();
 		$(this).parent().text(selected);

From 7e9455c3823d31fc12fcaee030abfc78ffedec80 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 11:22:54 -0400
Subject: [PATCH 0736/1537] Allow multiple Google Drive and Dropbox external
 storages to be configured

---
 apps/files_external/js/dropbox.js | 1 -
 apps/files_external/js/google.js  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 67f3c46a6e..08796cbbdc 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -23,7 +23,6 @@ $(document).ready(function() {
 					});
 				}
 			}
-			return false;
 		}
 	});
 
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 84c74c5742..55042194c7 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -24,7 +24,6 @@ $(document).ready(function() {
 					});
 				}
 			}
-			return false;
 		}
 	});
 	

From 3bcf176a53c17f43c252673b2e3eced9d9ce94f3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 29 Jun 2012 17:26:29 +0200
Subject: [PATCH 0737/1537] add some hooks to fix calendar sharing

---
 apps/calendar/appinfo/app.php |  5 +++++
 apps/calendar/lib/share.php   | 24 +++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index f1f2a26d87..c9e0f14d7a 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -8,12 +8,17 @@ OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre
 OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
 OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
+//General Hooks
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
+//Repeating Events Hooks
 OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate');
 OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update');
 OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean');
 OCP\Util::connectHook('OC_Calendar', 'moveEvent', 'OC_Calendar_Repeat', 'update');
 OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleanCalendar');
+//Sharing Hooks
+OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Share', 'post_eventdelete');
+OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Share', 'post_caldelete');
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index 54c531892f..01502f1c6b 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -258,7 +258,7 @@ class OC_Calendar_Share{
 		}
 
 		/*
-		 * @brief delete all shared calendars / events after a user was deleted
+		 * @brief deletes all shared calendars / events after a user was deleted
 		 * @param (string) $userid
 		 * @return (bool)
 		 */
@@ -273,4 +273,26 @@ class OC_Calendar_Share{
 			$stmt->execute(array($userid));
 			return true;
 		}
+		
+		/*
+		 * @brief deletes all shared events of a calendar
+		 * @param integer $calid
+		 * @return boolean
+		 */
+		public static function post_caldelete($calid){
+			$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_share_calendar WHERE calendarid = ?');
+			$stmt->execute(array($calid));
+			return true;
+		}
+		
+		/*
+		 * @brief deletes all shares of an event
+		 * @param integer $eventid
+		 * @return boolean
+		 */
+		public static function post_eventdelete($eventid){
+			$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_share_event WHERE eventid = ?');
+			$stmt->execute(array($eventid));
+			return true;
+		}
 }
\ No newline at end of file

From 652a874fa6ad82d1bc797898bce23c0ad52be14c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 29 Jun 2012 18:13:52 +0200
Subject: [PATCH 0738/1537] fix displaying of events

---
 apps/calendar/lib/app.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 9cd6ad2851..ca897a36dc 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -406,7 +406,9 @@ class OC_Calendar_App{
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}else{
-			$object->expand($start, $end);
+			if(OC_Calendar_Object::isrepeating($id) || $event['repeating'] == 1){
+				$object->expand($start, $end);
+			}
 			foreach($object->getComponents() as $singleevent){
 				if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;

From 2b4ecbaba0b6696d399166a1faab79cd6f6e2d43 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 29 Jun 2012 18:36:24 +0200
Subject: [PATCH 0739/1537] Whitespace fixes

---
 apps/user_openid/appinfo/app.php     | 2 --
 apps/user_openid/class.openid.v3.php | 2 --
 apps/user_openid/user_openid.php     | 4 ----
 3 files changed, 8 deletions(-)

diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index c683254101..a37b3237e2 100644
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -50,5 +50,3 @@ if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){
 	OCP\Util::writeLog('user_openid','USER CANCELED REQUEST',OCP\Util::DEBUG);
 	return false;
 }
-
-?>
diff --git a/apps/user_openid/class.openid.v3.php b/apps/user_openid/class.openid.v3.php
index 8afb9e5b81..eeb3198665 100644
--- a/apps/user_openid/class.openid.v3.php
+++ b/apps/user_openid/class.openid.v3.php
@@ -324,5 +324,3 @@ class SimpleOpenID{
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index e228de95e9..229bb10aae 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -63,7 +63,3 @@ class OC_USER_OPENID extends OC_User_Backend {
 		}
 	}
 }
-
-
-
-?>

From f61793aa14ac8ebbdd7bdc69e21063d12eb08746 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 29 Jun 2012 18:36:58 +0200
Subject: [PATCH 0740/1537] Coding style fixes

---
 apps/user_openid/appinfo/app.php | 2 +-
 apps/user_openid/user_openid.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index a37b3237e2..fe57b189fa 100644
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -27,7 +27,7 @@ OC_User::useBackend('openid');
 //check for results from openid requests
 if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){
 	OCP\Util::writeLog('user_openid','openid retured',OCP\Util::DEBUG);
-	$openid = new SimpleOpenID;
+	$openid = new SimpleOpenID();
 	$openid->SetIdentity($_GET['openid_identity']);
 	$openid_validation_result = $openid->ValidateWithServer();
 	if ($openid_validation_result == true){         // OK HERE KEY IS VALID
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index 229bb10aae..70b193a30b 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -37,7 +37,7 @@ class OC_USER_OPENID extends OC_User_Backend {
 	 */
 	public function checkPassword( $uid, $password ){
 		// Get identity from user and redirect browser to OpenID Server
-		$openid = new SimpleOpenID;
+		$openid = new SimpleOpenID();
 		$openid->SetIdentity($uid);
 		$openid->SetTrustRoot('http://' . OCP\Util::getServerHost());
 		if ($openid->GetOpenIDServer()){

From 3ed7738d5efb7cfc86552d6992a8983d10b18310 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 29 Jun 2012 18:37:42 +0200
Subject: [PATCH 0741/1537] Increment user_openid version to load new app type

---
 apps/user_openid/appinfo/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_openid/appinfo/version b/apps/user_openid/appinfo/version
index 6da28dde76..d917d3e26a 100644
--- a/apps/user_openid/appinfo/version
+++ b/apps/user_openid/appinfo/version
@@ -1 +1 @@
-0.1.1
\ No newline at end of file
+0.1.2

From 719c7f7f6ebfe53a73eeffb07c6c23d6a788e711 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 13:00:41 -0400
Subject: [PATCH 0742/1537] Fix WebDAV external storage opendir() and stat()
 for directories, bug fix for oc-1160

---
 apps/files_external/lib/webdav.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 94d9abb6a2..d0fe2aca85 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -73,13 +73,15 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$stripLength=strlen($this->root)+strlen($path);
 			$id=md5('webdav'.$this->root.$path);
 			OC_FakeDirStream::$dirs[$id]=array();
+			$skip = true;
 			foreach($response as $file=>$data){
-				//strip root and path
-				$file=trim(substr($file,$stripLength));
-				$file=trim($file,'/');
-				if($file){
-					OC_FakeDirStream::$dirs[$id][]=$file;
+				// Skip the first file, because it is the current directory
+				if ($skip) {
+					$skip = false;
+					continue;
 				}
+				$file = urldecode(basename($file));
+				OC_FakeDirStream::$dirs[$id][]=$file;
 			}
 			return opendir('fakedir://'.$id);
 		}catch(Exception $e){
@@ -244,15 +246,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength'));
-			if(isset($response['{DAV:}getlastmodified']) and isset($response['{DAV:}getcontentlength'])){
-				return array(
-					'mtime'=>strtotime($response['{DAV:}getlastmodified']),
-					'size'=>(int)$response['{DAV:}getcontentlength'],
-					'ctime'=>-1,
-				);
-			}else{
-				return array();
-			}
+			return array(
+				'mtime'=>strtotime($response['{DAV:}getlastmodified']),
+				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
+				'ctime'=>-1,
+			);
 		}catch(Exception $e){
 			return array();
 		}

From 05cb94801ad9d73e50b800b6a940e4fd15518b40 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 16:29:58 -0400
Subject: [PATCH 0743/1537] Add new group to other user's group select forms

---
 core/js/multiselect.js | 5 +++--
 settings/js/users.js   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index db5afa637c..ba89c1bb56 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -35,6 +35,7 @@
 		}
 
 		button.click(function(event){
+			
 			var button=$(this);
 			if(button.parent().children('ul').length>0){
 				button.parent().children('ul').slideUp(400,function(){
@@ -136,11 +137,11 @@
 							var option=$('<option selected="selected"/>');
 							option.attr('value',$(this).val());
 							option.text($(this).val());
-							select.append(options);
+							select.append(option);
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
 							if(settings.createCallback){
-								settings.createCallback();
+								settings.createCallback($(this).val());
 							}
 						}
 					});
diff --git a/settings/js/users.js b/settings/js/users.js
index 0de0d1df3b..18f4e9f209 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -40,7 +40,13 @@ $(document).ready(function(){
 		}else{
 			checkHandeler=false;
 		}
+		var addGroup = function(group) {
+			$('select[multiple]').each(function(index, element) {
+				$(element).append('<option value="'+group+'">'+group+'</option>');
+			})
+		};
 		element.multiSelect({
+			createCallback:addGroup,
 			createText:'add group',
 			checked:checked,
 			oncheck:checkHandeler,

From 8e4832bd129b91fcfe5c24b821e6daf6d9fe6edb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 16:44:08 -0400
Subject: [PATCH 0744/1537] Prevent adding a duplicate to a multiselect

---
 core/js/multiselect.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index ba89c1bb56..c4fd74b047 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -129,13 +129,24 @@
 						if(event.keyCode == 13) {
 							event.preventDefault();
 							event.stopPropagation();
+							var value = $(this).val();
+							var exists = false;
+							$.each(options,function(index, item) {
+								if ($(item).val() == value) {
+									exists = true;
+									return false;
+								}
+							});
+							if (exists) {
+								return false;
+							}
 							var li=$(this).parent();
 							$(this).remove();
 							li.text('+ '+settings.createText);
 							li.before(createItem(this));
 							var select=button.parent().next();
 							var option=$('<option selected="selected"/>');
-							option.attr('value',$(this).val());
+							option.attr('value',value);
 							option.text($(this).val());
 							select.append(option);
 							li.prev().children('input').trigger('click');

From a4614f83ff6553f3e7b094e44ab2b0cf4ce68ff2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 29 Jun 2012 23:17:32 +0200
Subject: [PATCH 0745/1537] Don't add duplicate contacts in the list when
 en-/disable an address book.

---
 apps/contacts/js/contacts.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9d41b70a31..5be1fa6129 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1621,19 +1621,21 @@ Contacts={
 							var contactlist = $('#contacts ul[data-id="'+b+'"]');
 							for(var c in book.contacts) {
 								if(book.contacts[c].id == undefined) { continue; }
-								var contact = Contacts.UI.Card.createEntry(book.contacts[c]);
-								if(c == self.batchnum-5) {
-									contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-										$(this).unbind(event);
-										var bookid = $(this).data('bookid');
-										var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
-										if (isInView && numsiblings >= self.batchnum) {
-											console.log('This would be a good time to load more contacts.');
-											Contacts.UI.Contacts.update(id, bookid, $('#contacts li[data-bookid="'+bookid+'"]').length);
-										}
-									});
+								if($('#contacts li[data-id="'+book.contacts[c]['id']+'"][data-id="'+book.contacts[c]['bookid']+'"]').length == 0) {
+									var contact = Contacts.UI.Card.createEntry(book.contacts[c]);
+									if(c == self.batchnum-5) {
+										contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+											$(this).unbind(event);
+											var bookid = $(this).data('bookid');
+											var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
+											if (isInView && numsiblings >= self.batchnum) {
+												console.log('This would be a good time to load more contacts.');
+												Contacts.UI.Contacts.update(id, bookid, $('#contacts li[data-bookid="'+bookid+'"]').length);
+											}
+										});
+									}
+									contactlist.append(contact);
 								}
-								contactlist.append(contact);
 							}
 						});
 						if($('#contacts h3').length > 1) {

From c992482e9275af31ab697a9acbecc3ba59e9bf3c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 17:52:24 -0400
Subject: [PATCH 0746/1537] Prevent duplicate group showing in multiselect that
 added the group

---
 settings/js/users.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 18f4e9f209..90569bcc56 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -42,7 +42,9 @@ $(document).ready(function(){
 		}
 		var addGroup = function(group) {
 			$('select[multiple]').each(function(index, element) {
-				$(element).append('<option value="'+group+'">'+group+'</option>');
+				if ($(element).find('option[value="'+group +'"]').length == 0) {
+					$(element).append('<option value="'+group+'">'+group+'</option>');
+				}
 			})
 		};
 		element.multiSelect({

From 252453cd343b690101189402ecefacf78f6704e2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 30 Jun 2012 01:05:18 +0200
Subject: [PATCH 0747/1537] fix encryption test cases when not logged in

---
 apps/files_encryption/tests/proxy.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index fcfc4cfb9f..5463836a20 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -11,6 +11,8 @@ class Test_CryptProxy extends UnitTestCase {
 	private $oldKey;
 	
 	public function setUp(){
+		$user=OC_User::getUser();
+
 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
 		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
 		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
@@ -30,10 +32,12 @@ class Test_CryptProxy extends UnitTestCase {
 		OC_Filesystem::clearMounts();
 		OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
 
+		OC_Filesystem::init('/'.$user.'/files');
+
 		//set up the users home folder in the temp storage
 		$rootView=new OC_FilesystemView('');
-		$rootView->mkdir('/'.OC_User::getUser());
-		$rootView->mkdir('/'.OC_User::getUser().'/files');
+		$rootView->mkdir('/'.$user);
+		$rootView->mkdir('/'.$user.'/files');
 	}
 
 	public function tearDown(){

From d43ed43b5a5614b05a6949b4a1e757c2c5246254 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 30 Jun 2012 01:13:33 +0200
Subject: [PATCH 0748/1537] cant to ttl tests for xcache

---
 tests/lib/cache/xcache.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index a5e954f827..cc2077076c 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -28,4 +28,8 @@ class Test_Cache_XCache extends Test_Cache {
 	public function setUp(){
 		$this->instance=new OC_Cache_XCache();
 	}
+
+	function testTTL(){
+		// ttl doesn't work correctly in the same request
+	}
 }

From 2c35e185f714f24c6c1a2a53a47e33cf01310ebe Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 30 Jun 2012 01:14:01 +0200
Subject: [PATCH 0749/1537] make sure the filesystem is setup properly for
 oc_cache_file tests

---
 tests/lib/cache/file.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 226e5068c4..54e60e6569 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -21,7 +21,26 @@
 */
 
 class Test_Cache_File extends Test_Cache {
+	function skip() {
+		$this->skipUnless(OC_User::isLoggedIn());
+	}
+	
 	public function setUp(){
+		//clear all proxies and hooks so we can do clean testing
+		OC_FileProxy::clearProxies();
+		OC_Hook::clear('OC_Filesystem');
+		
+		//enable only the encryption hook
+		OC_FileProxy::register(new OC_FileProxy_Encryption());
+		
+		//set up temporary storage
+		OC_Filesystem::clearMounts();
+		OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
+
+		//set up the users dir
+		$rootView=new OC_FilesystemView('');
+		$rootView->mkdir('/'.OC_User::getUser());
+		
 		$this->instance=new OC_Cache_File();
 	}
 }

From edc6a648d1d667d3179e51c98ab937cf35e4a333 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 19:35:28 -0400
Subject: [PATCH 0750/1537] Fix placeholder value for optional fields in
 external storage UI

---
 apps/files_external/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 069599d028..e651c4574d 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -39,7 +39,7 @@
 									<?php elseif(strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" <?php if ($value == 'true') echo ' checked="checked"'; ?>  /><?php echo substr($placeholder, 1); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
-										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
+										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 5); ?>" />
 									<?php elseif (strpos($placeholder, '#') !== false): ?>
 										<input type="hidden" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" />
 									<?php else: ?>

From 34d4eb8edd4b485f65e50fbd4c66f852268f1dab Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 12:42:36 +0200
Subject: [PATCH 0751/1537] some more work on calendar import class

---
 apps/calendar/lib/import.php | 107 ++++++++++++++++++++++++++++++-----
 1 file changed, 92 insertions(+), 15 deletions(-)

diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index e64a9e91eb..864fc02fdf 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -10,29 +10,34 @@
  */
 class OC_Calendar_Import{
 	/*
-	 * @brief var to check if errors happend while initialization
+	 * @brief var saves if the percentage should be saved with OC_Cache
 	 */
-	private $error;
+	private $cacheprogress;
 	
 	/*
 	 * @brief Sabre_VObject_Component_VCalendar object - for documentation see http://code.google.com/p/sabredav/wiki/Sabre_VObject_Component_VCalendar
 	 */
 	private $calobject;
 	
+	/*
+	 * @brief var to check if errors happend while initialization
+	 */
+	private $error;
+	
 	/*
 	 * @brief var saves the ical string that was submitted with the __construct function
 	 */
 	private $ical;
 	
-	/*
-	 * @brief var saves the ical string that was submitted with the __construct function
-	 */
-	private $tz;
-	
 	/*
 	 * @brief var saves the percentage of the import's progress
 	 */
 	private $progress;
+	
+	/*
+	 * @brief var saves the timezone the events shell converted to
+	 */
+	private $tz;
 
 	/*
 	 * public methods 
@@ -40,10 +45,11 @@ class OC_Calendar_Import{
 	
 	/*
 	 * @brief does general initialization for import object
-	 * @param string $calendar 
+	 * @param string $calendar content of ical file
+	 * @param string $tz timezone of the user
 	 * @return boolean
 	 */
-	public function __construct($ical, $tz){
+	public function __construct($ical){
 		$this->error = null;
 		$this->ical = $ical;
 		try{
@@ -53,7 +59,7 @@ class OC_Calendar_Import{
 			$this->error = true;
 			return false;
 		}
-		$this->tz = $tz;
+		return true;
 	}
 	
 	/*
@@ -65,7 +71,21 @@ class OC_Calendar_Import{
 		if(!$this->isValid() && !$force){
 			return false;
 		}
-		
+		foreach($this->calobject->getComponents() as $object){
+			if(!($object instanceof Sabre_VObject_Component_VEvent) && !($object instanceof Sabre_VObject_Component_VJournal) && !($object instanceof Sabre_VObject_Component_VTodo)){
+				continue;
+			}
+			
+		}
+	}
+	
+	/*
+	 * @brief sets the timezone
+	 * @return boolean
+	 */
+	public function setTimeZone($tz){
+		$this->tz = $tz;
+		return true;
 	}
 	
 	/*
@@ -86,11 +106,61 @@ class OC_Calendar_Import{
 	public function getProgress(){
 		return $this->progress;
 	}
+	
+	/*
+	 * @brief enables the cache for the percentage of progress
+	 * @return boolean
+	 */
+	public function enableProgressCache(){
+		$this->cacheprogress = true;
+		return true;
+	}
+	
+	/*
+	 * @brief disables the cache for the percentage of progress
+	 * @return boolean
+	 */
+	public function disableProgressCache(){
+		$this->cacheprogress = false;
+		return false;
+	}
 
 	/*
 	 * private methods 
 	 */
 	
+	/*
+	 * @brief generates an unique ID 
+	 * @return string 
+	 */
+	private function createUID(){
+		return substr(md5(rand().time()),0,10);
+	}
+	
+	/*
+	 * @brief checks is the UID is already in use for another event
+	 * @param string $uid uid to check
+	 * @return boolean
+	 */
+	private function isUIDAvailable($uid){
+		
+	}
+	
+	/*
+	 * @brief generates a proper VCalendar string
+	 * @param string $vobject
+	 * @return string 
+	 */
+	private function createVCalendar($vobject){
+		if(is_object($vobject)){
+			$vobject = @$vobject->serialize();
+		}
+		$vcalendar = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
+		$vcalendar .= $vobject;
+		$vcalendar .= "END:VCALENDAR";
+		return $vcalendar;
+	}
+	
 	/*
 	 * @brief 
 	 * @return 
@@ -99,16 +169,23 @@ class OC_Calendar_Import{
 
 	}
 	
+	/*
+	 * @brief 
+	 * @return 
+	 */
+	private function (){
+
+	}
 
 	/*
-	 * methods for X-...
+	 * public methods for prerendering of X-... Attributes
 	 */
 	
 	/*
 	 * @brief guesses the calendar color
 	 * @return mixed - string or boolean
 	 */
-	private function guessCalendarColor(){
+	public function guessCalendarColor(){
 		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
 			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
 		}
@@ -119,7 +196,7 @@ class OC_Calendar_Import{
 	 * @brief guesses the calendar description
 	 * @return mixed - string or boolean
 	 */
-	private function guessCalendarDescription(){
+	public function guessCalendarDescription(){
 		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
 			return $this->calobject->__get('X-WR-CALDESC');
 		}
@@ -130,7 +207,7 @@ class OC_Calendar_Import{
 	 * @brief guesses the calendar name
 	 * @return mixed - string or boolean
 	 */
-	private function guessCalendarName(){
+	public function guessCalendarName(){
 		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
 			return $this->calobject->__get('X-WR-CALNAME');
 		}

From 704a1c655e350aa4881069297f99caa0c1d56952 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 30 Jun 2012 11:07:54 +0000
Subject: [PATCH 0752/1537] Contacts: fix add contact icon path

---
 apps/contacts/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 0d4219c9f2..a8fb6c57c2 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -9,7 +9,7 @@
 	</div>
 	<div id="bottomcontrols">
 		<form>
-			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::linkTo('contacts', 'img/contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>"   /></button>
+			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>"   /></button>
 			<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
 		</form>
 	</div>

From 51173163ce71c8b2f7f4876ba3cb9def51f19125 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 30 Jun 2012 11:22:09 +0000
Subject: [PATCH 0753/1537] Contacts: align the bottom control buttons

---
 apps/contacts/css/contacts.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index ce4daa1d3a..588a51a429 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -12,6 +12,7 @@
 .ui-draggable-dragging { width: 16em; }
 .ui-state-hover { border: 1px solid dashed; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
+#bottomcontrols img { margin-top: 0.35em; }
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
 #actionbar { height: 30px; width: 60px; position: fixed; right: 0px; top: 4em; margin: 0 0 0 0; padding: 0 0 0 0; z-index: 1000; }

From 390f5cc89fc956b021c0566534ca969ed0377f11 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 15:17:29 +0200
Subject: [PATCH 0754/1537] some work on (drop)import)

---
 apps/calendar/ajax/import/dropimport.php | 81 +++++-------------------
 apps/calendar/appinfo/app.php            |  1 +
 apps/calendar/js/calendar.js             | 13 +---
 apps/calendar/lib/calendar.php           | 16 +++++
 apps/calendar/lib/import.php             | 69 ++++++++++++++++----
 5 files changed, 94 insertions(+), 86 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index 87667d4de6..41dfd7d934 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -1,73 +1,26 @@
 <?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
 $data = $_POST['data'];
 $data = explode(',', $data);
 $data = end($data);
 $data = base64_decode($data);
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
-$nl="\r\n";
-$comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
-$data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
-$lines = explode("\n", $data);
-unset($data);
-$comp=$uid=$cal=false;
-$cals=$uids=array();
-$i = 0;
-foreach($lines as $line) {
-	if(strpos($line, ':')!==false) {
-		list($attr, $val) = explode(':', strtoupper($line));
-		if ($attr == 'BEGIN' && $val == 'VCALENDAR') {
-			$cal = $i;
-			$cals[$cal] = array('first'=>$i,'last'=>$i,'end'=>$i);
-		} elseif ($attr =='BEGIN' && $cal!==false && isset($comps[$val])) {
-			$comp = $val;
-			$beginNo = $i;
-		} elseif ($attr == 'END' && $cal!==false && $val == 'VCALENDAR') {
-			if($comp!==false) {
-				unset($cals[$cal]); // corrupt calendar, unset it
-			} else {
-				$cals[$cal]['end'] = $i;
-			}
-			$comp=$uid=$cal=false; // reset calendar
-		} elseif ($attr == 'END' && $comp!==false && $val == $comp) {
-			if(! $uid) {
-				$uid = OC_Calendar_Object::createUID();
-			}
-			$uids[$uid][$beginNo] = array('end'=>$i, 'cal'=>$cal);
-			if ($cals[$cal]['first'] == $cal) {
-				$cals[$cal]['first'] = $beginNo;
-			}
-			$cals[$cal]['last'] = $i;
-			$comp=$uid=false; // reset component
-		} elseif ($attr =="UID" && $comp!==false) {
-			list($attr, $uid) = explode(':', $line);
-		}
-	}
-	$i++;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-$id = $calendars[0]['id'];
-foreach($uids as $uid) {
-	$prefix=$suffix=$content=array();
-	foreach($uid as $begin=>$details) {
-		$cal = $details['cal'];
-		if(!isset($cals[$cal])) {
-			continue; // from corrupt/incomplete calendar
-		}
-		$cdata = $cals[$cal];
-		// if we have multiple components from different calendar objects,
-		// we should really merge their elements (enhancement?) -- 1st one wins for now.
-		if(! count($prefix)) {
-			$prefix = array_slice($lines, $cal, $cdata['first'] - $cal);
-		}
-		if(! count($suffix)) {
-			$suffix = array_slice($lines, $cdata['last']+1, $cdata['end'] - $cdata['last']);
-		}
-		$content = array_merge($content, array_slice($lines, $begin, $details['end'] - $begin + 1));
-	}
-	if(count($content)) {
-		$import = join($nl, array_merge($prefix, $content, $suffix)) . $nl;
-		OC_Calendar_Object::add($id, $import);
-	}
+$import = new OC_Calendar_Import($data);
+$import->setTimeZone(OC_Calendar_App::$tz);
+$import->disableProgressCache();
+if(!$import->isValid()){
+	OCP\JSON::error();
+	exit;
 }
+$calendarname = $import->createCalendarName(OCP\User::getUser());
+$calendarcolor = $import->createCalendarColor();
+$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),strip_tags($calendarname),'VEVENT,VTODO,VJOURNAL',null,0,$calendarcolor);
+$import->setCalendarID($newid);
+$import->import();
 OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 3c8cc76133..b9357d574e 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -9,6 +9,7 @@ OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
 OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
+OC::$CLASSPATH['OC_Calendar_Import'] = 'apps/calendar/lib/import.php';
 //General Hooks
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
 //Repeating Events Hooks
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index e17f88e38b..251522802a 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -622,18 +622,11 @@ Calendar={
 			drop:function(e){
 				var files = e.dataTransfer.files;
 				for(var i = 0;i < files.length;i++){
-					var file = files[i]
+					var file = files[i];
 					reader = new FileReader();
 					reader.onload = function(event){
-						if(file.type != 'text/calendar'){
-							$('#notification').html('At least one file don\'t seems to be a calendar file. File skipped.');
-							$('#notification').slideDown();
-							window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-							return false;
-						}else{
-							Calendar.UI.Drop.import(event.target.result);
-							$('#calendar_holder').fullCalendar('refetchEvents');
-						}
+						Calendar.UI.Drop.import(event.target.result);
+						$('#calendar_holder').fullCalendar('refetchEvents');
 					}
 					reader.readAsDataURL(file);
 				}
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 5274397c76..c73e11224d 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -271,4 +271,20 @@ class OC_Calendar_Calendar{
 			'cache' => true,
 		);
 	}
+	
+	/*
+	 * @brief checks if a calendar name is available for a user
+	 * @param string $calendarname 
+	 * @param string $userid
+	 * @return boolean
+	 */
+	public static function isCalendarNameavailable($calendarname, $userid){
+		$calendars = self::allCalendars($userid);
+		foreach($calendars as $calendar){
+			if($calendar['displayname'] == $calendarname){
+				return false;
+			}
+		}
+		return true;
+	}
 }
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index 864fc02fdf..d23a55a620 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -29,6 +29,11 @@ class OC_Calendar_Import{
 	 */
 	private $ical;
 	
+	/*
+	 * @brief calendar id for import
+	 */
+	private $id;
+	
 	/*
 	 * @brief var saves the percentage of the import's progress
 	 */
@@ -64,7 +69,7 @@ class OC_Calendar_Import{
 	
 	/*
 	 * @brief imports a calendar
-	 * @param string $force force import even though calendar is not valid
+	 * @param boolean $force force import even though calendar is not valid
 	 * @return boolean
 	 */
 	public function import($force = false){
@@ -76,7 +81,10 @@ class OC_Calendar_Import{
 				continue;
 			}
 			
+			
+			
 		}
+		return true;
 	}
 	
 	/*
@@ -124,6 +132,43 @@ class OC_Calendar_Import{
 		$this->cacheprogress = false;
 		return false;
 	}
+	
+	/*
+	 * @brief generates a new calendar name
+	 * @param string $userid 
+	 * @return string
+	 */
+	public function createCalendarName($userid){	
+		$calendars = OC_Calendar_Calendar::allCalendars($userid);
+		$calendarname = $guessedcalendarname = !is_null($this->guessCalendarName())?($this->guessCalendarName()):(OC_Calendar_App::$l10n->t('New Calendar'));
+		$i = 1;
+		while(!OC_Calendar_Calendar::isCalendarNameavailable($calendarname, $userid)){
+			$calendarname = $guessedcalendarname . ' (' . $i . ')';
+			$i++;
+		}
+		return $calendarname;
+	}
+	
+	/*
+	 * @brief generates a new calendar color
+	 * @return string
+	 */
+	public function createCalendarColor($userid){
+		if(is_null($this->guessCalendarColor()))){
+			return '#9fc6e7';
+		}
+		return $this->guessCalendarColor();
+	}
+	
+	/*
+	 * @brief sets the id for the calendar
+	 * @param integer $id of the calendar
+	 * @return boolean
+	 */
+	public static function setCalendarID($id){
+		$this->id = $id;
+		return true:
+	}
 
 	/*
 	 * private methods 
@@ -165,52 +210,52 @@ class OC_Calendar_Import{
 	 * @brief 
 	 * @return 
 	 */
-	private function (){
+	//private function (){
 
-	}
+	//}
 	
 	/*
 	 * @brief 
 	 * @return 
 	 */
-	private function (){
+	//private function (){
 
-	}
+	//}
 
 	/*
-	 * public methods for prerendering of X-... Attributes
+	 * private methods for prerendering of X-... Attributes
 	 */
 	
 	/*
 	 * @brief guesses the calendar color
 	 * @return mixed - string or boolean
 	 */
-	public function guessCalendarColor(){
+	private function guessCalendarColor(){
 		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
 			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
 		}
-		return false;
+		return null;
 	}
 	
 	/*
 	 * @brief guesses the calendar description
 	 * @return mixed - string or boolean
 	 */
-	public function guessCalendarDescription(){
+	private function guessCalendarDescription(){
 		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
 			return $this->calobject->__get('X-WR-CALDESC');
 		}
-		return false;
+		return null;
 	}
 	
 	/*
 	 * @brief guesses the calendar name
 	 * @return mixed - string or boolean
 	 */
-	public function guessCalendarName(){
+	private function guessCalendarName(){
 		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
 			return $this->calobject->__get('X-WR-CALNAME');
 		}
-		return false;
+		return null;
 	}
 }

From 34b2486d5342aba7b9459ce1e27f5acf2e7629e4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 15:23:21 +0200
Subject: [PATCH 0755/1537] some improvements for calendar export

---
 apps/calendar/lib/export.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
index cd248ce92a..b05e758672 100644
--- a/apps/calendar/lib/export.php
+++ b/apps/calendar/lib/export.php
@@ -37,7 +37,8 @@ class OC_Calendar_Export{
 	 */
 	private static function calendar($id){
 		$events = OC_Calendar_Object::all($id);
-		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
+		$calendar = OC_Calendar_Calendar::find($id);
+		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\nX-WR-CALNAME:" . $calendar['displayname'] . "\n";
 		foreach($events as $event){
 			$return .= self::generateEvent($event);
 		}
@@ -52,7 +53,7 @@ class OC_Calendar_Export{
 	 */
 	private static function event($id){
 		$event = OC_Calendar_Object::find($id);
-		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
+		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\nX-WR-CALNAME:" . $event['summary'] . "\n";
 		$return .= self::generateEvent($event);
 		$return .= "END:VCALENDAR";
 		return $return;

From 8e0addebc315d064b543d3b33442b528a0127ee2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 15:39:20 +0200
Subject: [PATCH 0756/1537] fix some doc

---
 apps/calendar/lib/share.php | 84 ++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index 01502f1c6b..7e1a43c414 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -13,9 +13,9 @@ class OC_Calendar_Share{
 	const EVENT = 'event';
 	/*
 	 * @brief: returns informations about all calendar or events which users are sharing with the user - userid
-	 * @param: (string) $userid - id of the user
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return: (array) $return - information about calendars
+	 * @param: string $userid - id of the user
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return: array $return - information about calendars
 	 */
 	public static function allSharedwithuser($userid, $type, $active=null, $permission=null){
 		$group_where = self::group_sql(OC_Group::getUserGroups($userid));
@@ -35,9 +35,9 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: returns all users a calendar / event is shared with
-	 * @param: (int) id - id of the calendar / event
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return: (array) $users - information about users a calendar / event is shared with
+	 * @param: integer id - id of the calendar / event
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return: array $users - information about users a calendar / event is shared with
 	 */
 	public static function allUsersSharedwith($id, $type){
 		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ' . $type . 'id = ? ORDER BY share');
@@ -50,11 +50,11 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: shares a calendar / event
-	 * @param: (string) $owner - userid of the owner
-	 * @param: (string) $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: (string) $sharetype - type of sharing (can be: user/group/public)
-	 * @param: (string) $id - id of the calendar / event
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
+	 * @param: string $owner - userid of the owner
+	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
+	 * @param: string $sharetype - type of sharing (can be: user/group/public)
+	 * @param: string $id - id of the calendar / event
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
 	 * @return (mixed) - token (if $sharetype == public) / bool (if $sharetype != public)
 	 */
 	public static function share($owner, $share, $sharetype, $id, $type){
@@ -82,12 +82,12 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: stops sharing a calendar / event
-	 * @param: (string) $owner - userid of the owner
-	 * @param: (string) $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: (string) $sharetype - type of sharing (can be: user/group/public)
-	 * @param: (string) $id - id of the calendar / event
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return (bool)
+	 * @param: string $owner - userid of the owner
+	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
+	 * @param: string $sharetype - type of sharing (can be: user/group/public)
+	 * @param: string $id - id of the calendar / event
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return boolean
 	 */
 	public static function unshare($owner, $share, $sharetype, $id, $type){
 		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_share_' . $type . ' WHERE owner = ? ' . (($sharetype != 'public')?'AND share = ?':'') . ' AND sharetype = ? AND ' . $type . 'id = ?');
@@ -100,12 +100,12 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: changes the permission for a calendar / event
-	 * @param: (string) $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: (string) $sharetype - type of sharing (can be: user/group/public)
-	 * @param: (string) $id - id of the calendar / event
-	 * @param: (int) $permission - permission of user the calendar / event is shared with (if $sharetype == public then $permission = 0)
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return (bool)
+	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
+	 * @param: string $sharetype - type of sharing (can be: user/group/public)
+	 * @param: string $id - id of the calendar / event
+	 * @param: integer $permission - permission of user the calendar / event is shared with (if $sharetype == public then $permission = 0)
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return boolean
 	 */
 	public static function changepermission($share, $sharetype, $id, $permission, $type){
 		if($sharetype == 'public' && $permission == 1){
@@ -117,7 +117,7 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: generates a token for public calendars / events
-	 * @return: (string) $token
+	 * @return: string $token
 	 */
 	private static function generate_token($id, $type){
 		$uniqid = uniqid();
@@ -140,12 +140,12 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: checks if it is already shared
-	 * @param: (string) $owner - userid of the owner
-	 * @param: (string) $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: (string) $sharetype - type of sharing (can be: user/group/public)
-	 * @param: (string) $id - id of the calendar / event
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return (bool)
+	 * @param: string $owner - userid of the owner
+	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
+	 * @param: string $sharetype - type of sharing (can be: user/group/public)
+	 * @param: string $id - id of the calendar / event
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return boolean
 	 */
 	public static function is_already_shared($owner, $share, $sharetype, $id, $type){
 		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE owner = ? AND share = ? AND sharetype = ? AND ' . $type . 'id = ?');
@@ -183,10 +183,10 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: checks the permission for editing an event
-	 * @param: (string) $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: (string) $id - id of the calendar / event
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return (bool)
+	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
+	 * @param: string $id - id of the calendar / event
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return boolean
 	 */
 	public static function is_editing_allowed($share, $id, $type){
 		$group_where = self::group_sql(OC_Group::getUserGroups($share));
@@ -204,10 +204,10 @@ class OC_Calendar_Share{
 	}
 	/*
 	 * @brief: checks the access of 
-	 * @param: (string) $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: (string) $id - id of the calendar / event
-	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
-	 * @return (bool)
+	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
+	 * @param: string $id - id of the calendar / event
+	 * @param: string $type - use const self::CALENDAR or self::EVENT
+	 * @return boolean
 	 */
 	public static function check_access($share, $id, $type){
 		$group_where = self::group_sql(OC_Group::getUserGroups($share));
@@ -225,7 +225,7 @@ class OC_Calendar_Share{
 	}
         /*
          * @brief: returns the calendardata of an event or a calendar
-         * @param: (string) $token - token which should be searched
+         * @param: string $token - token which should be searched
          * @return: mixed - bool if false, array with type and id if true
          */
         public static function getElementByToken($token){
@@ -250,7 +250,7 @@ class OC_Calendar_Share{
 		
 		/*
 		 * @brief sets the active status of the calendar
-		 * @param (string) $
+		 * @param string 
 		 */
 		public static function set_active($share, $id, $active){
 			$stmt = OCP\DB::prepare("UPDATE *PREFIX*calendar_share_calendar SET active = ? WHERE share = ? AND sharetype = 'user' AND calendarid = ?");
@@ -259,8 +259,8 @@ class OC_Calendar_Share{
 
 		/*
 		 * @brief deletes all shared calendars / events after a user was deleted
-		 * @param (string) $userid
-		 * @return (bool)
+		 * @param string $userid
+		 * @return boolean
 		 */
 		public static function post_userdelete($userid){			
 			$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_share_calendar WHERE owner = ?');

From 4ed55315e7280ab4212c0172503b1a08a0a4240d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Sat, 30 Jun 2012 16:53:41 +0200
Subject: [PATCH 0757/1537] fixed linkTo()

---
 lib/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper.php b/lib/helper.php
index 64378da356..b1d2da1452 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -45,7 +45,7 @@ class OC_Helper {
 					$urlLinkTo =  OC::$WEBROOT . '/?app=' . $app;
 					$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
 				}else{
-					$urlLinkTo =  OC_App::getAppWebPath($app) . $file;
+					$urlLinkTo =  OC_App::getAppWebPath($app) . '/' . $file;
 				}
 			}
 			else{

From fa5b31ac9ce8945140dbd4eae325d8c7aa5560e6 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 17:08:00 +0200
Subject: [PATCH 0758/1537] fix documentation style

---
 apps/calendar/lib/app.php      |  50 ++++++-----
 apps/calendar/lib/calendar.php |   8 +-
 apps/calendar/lib/export.php   |  14 +--
 apps/calendar/lib/object.php   | 157 +++++++++++++++++++++++++--------
 apps/calendar/lib/repeat.php   |  28 +++---
 apps/calendar/lib/share.php    |  30 +++----
 6 files changed, 186 insertions(+), 101 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index ca897a36dc..1a13f2958c 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -13,22 +13,22 @@ OC_Calendar_App::$tz = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar',
 class OC_Calendar_App{
 	const CALENDAR = 'calendar';
 	const EVENT = 'event';
-	/*
+	/**
 	 * @brief language object for calendar app
 	 */
 	public static $l10n;
 	
-	/*
+	/**
 	 * @brief categories of the user
 	 */
 	protected static $categories = null;
 
-	/*
+	/**
 	 * @brief timezone of the user
 	 */
 	public static $tz;
 	
-	/*
+	/**
 	 * @brief returns informations about a calendar
 	 * @param int $id - id of the calendar
 	 * @param bool $security - check access rights or not
@@ -53,7 +53,7 @@ class OC_Calendar_App{
 		return $calendar;
 	}
 	
-	/*
+	/**
 	 * @brief returns informations about an event
 	 * @param int $id - id of the event
 	 * @param bool $security - check access rights or not
@@ -79,7 +79,7 @@ class OC_Calendar_App{
 		return $event;
 	}
 	
-	/*
+	/**
 	 * @brief returns the parsed calendar data
 	 * @param int $id - id of the event
 	 * @param bool $security - check access rights or not
@@ -97,7 +97,7 @@ class OC_Calendar_App{
 		return $vobject;
 	}
 	
-	/*
+	/**
 	 * @brief checks if an event was edited and dies if it was
 	 * @param (object) $vevent - vevent object of the event
 	 * @param (int) $lastmodified - time of last modification as unix timestamp
@@ -112,7 +112,7 @@ class OC_Calendar_App{
 		return true;
 	}
 	
-	/*
+	/**
 	 * @brief returns the default categories of ownCloud
 	 * @return (array) $categories
 	 */
@@ -136,7 +136,7 @@ class OC_Calendar_App{
 		);
 	}
 	
-	/*
+	/**
 	 * @brief returns the vcategories object of the user
 	 * @return (object) $vcategories
 	 */
@@ -147,7 +147,7 @@ class OC_Calendar_App{
 		return self::$categories;
 	}
 	
-	/*
+	/**
 	 * @brief returns the categories of the vcategories object
 	 * @return (array) $categories
 	 */
@@ -202,12 +202,16 @@ class OC_Calendar_App{
 			self::getVCategories()->loadFromVObject($object, true);
 		}
 	}
-
+	
+	/**
+	 * @brief returns the options for the repeat rule of an repeating event
+	 * @return array - valid inputs for the repeat rule of an repeating event
+	 */
 	public static function getRepeatOptions(){
 		return OC_Calendar_Object::getRepeatOptions(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for the end of an repeating event
 	 * @return array - valid inputs for the end of an repeating events
 	 */
@@ -215,7 +219,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getEndOptions(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an monthly repeating event
 	 * @return array - valid inputs for monthly repeating events
 	 */
@@ -223,7 +227,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getMonthOptions(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an weekly repeating event
 	 * @return array - valid inputs for weekly repeating events
 	 */
@@ -231,7 +235,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getWeeklyOptions(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an yearly repeating event
 	 * @return array - valid inputs for yearly repeating events
 	 */
@@ -239,7 +243,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getYearOptions(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an yearly repeating event which occurs on specific days of the year
 	 * @return array - valid inputs for yearly repeating events
 	 */
@@ -247,7 +251,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getByYearDayOptions();
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an yearly repeating event which occurs on specific month of the year
 	 * @return array - valid inputs for yearly repeating events
 	 */
@@ -255,7 +259,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getByMonthOptions(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an yearly repeating event which occurs on specific week numbers of the year
 	 * @return array - valid inputs for yearly repeating events
 	 */
@@ -263,7 +267,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getByWeekNoOptions();
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an yearly or monthly repeating event which occurs on specific days of the month
 	 * @return array - valid inputs for yearly or monthly repeating events
 	 */
@@ -271,7 +275,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getByMonthDayOptions();
 	}
 	
-	/*
+	/**
 	 * @brief returns the options for an monthly repeating event which occurs on specific weeks of the month
 	 * @return array - valid inputs for monthly repeating events
 	 */
@@ -279,7 +283,7 @@ class OC_Calendar_App{
 		return OC_Calendar_Object::getWeekofMonth(self::$l10n);
 	}
 	
-	/*
+	/**
 	 * @brief checks the access for a calendar / an event
 	 * @param (int) $id - id of the calendar / event
 	 * @param (string) $type - type of the id (calendar/event)
@@ -320,7 +324,7 @@ class OC_Calendar_App{
 		}
 	}
 	
-	/*
+	/**
 	 * @brief analyses the parameter for calendar parameter and returns the objects
 	 * @param (string) $calendarid - calendarid
 	 * @param (int) $start - unixtimestamp of start
@@ -360,7 +364,7 @@ class OC_Calendar_App{
 		return $events;
 	}
 	
-	/*
+	/**
 	 * @brief generates the output for an event which will be readable for our js
 	 * @param (mixed) $event - event object / array
 	 * @param (int) $start - DateTime object of start
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 5274397c76..128b55c48e 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
-/*
+/**
  *
  * The following SQL statement is just a help for developers and will not be
  * executed!
@@ -201,7 +201,7 @@ class OC_Calendar_Calendar{
 		return true;
 	}
 	
-	/*
+	/**
 	 * @brief merges two calendars
 	 * @param integer $id1
 	 * @param integer $id2
@@ -240,7 +240,7 @@ class OC_Calendar_Calendar{
 		return $userid;
 	}
 	
-	/*
+	/**
 	 * @brief returns the possible color for calendars
 	 * @return array
 	 */
@@ -257,7 +257,7 @@ class OC_Calendar_Calendar{
 		);
 	}
 
-	/*
+	/**
 	 * @brief generates the Event Source Info for our JS
 	 * @param array $calendar calendar data
 	 * @return array
diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
index b05e758672..8f26891f36 100644
--- a/apps/calendar/lib/export.php
+++ b/apps/calendar/lib/export.php
@@ -5,17 +5,17 @@
  * later.
  * See the COPYING-README file.
  */
-/*
+/**
  * This class does export and converts all times to UTC
  */
 class OC_Calendar_Export{
-	/*
+	/**
 	 * @brief Use one of these constants as second parameter if you call OC_Calendar_Export::export()
 	 */
 	const CALENDAR = 'calendar';
 	const EVENT = 'event';
 
-	/*
+	/**
 	 * @brief export a calendar or an event
 	 * @param integer $id id of calendar / event
 	 * @param string $type use OC_Calendar_Export constants
@@ -30,7 +30,7 @@ class OC_Calendar_Export{
 		return self::fixLineBreaks($return);
 	}
 
-	/*
+	/**
 	 * @brief exports a calendar and convert all times to UTC
 	 * @param integer $id id of the calendar
 	 * @return string
@@ -46,7 +46,7 @@ class OC_Calendar_Export{
 		return $return;
 	}
 	
-	/*
+	/**
 	 * @brief exports an event and convert all times to UTC
 	 * @param integer $id id of the event
 	 * @return string
@@ -59,7 +59,7 @@ class OC_Calendar_Export{
 		return $return;
 	 }
 	 
-	 /*
+	 /**
 	  * @brief generates the VEVENT with UTC dates
 	  * @param array $event
 	  * @return string
@@ -79,7 +79,7 @@ class OC_Calendar_Export{
 		return $object->VEVENT->serialize();
 	}
 	
-	/*
+	/**
 	 * @brief fixes new line breaks
 	 * (fixes problems with Apple iCal)
 	 * @param string $string to fix
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 5d475c8943..140542bf4f 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -1,11 +1,13 @@
 <?php
 /**
  * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
- /*
+ /**
  *
  * The following SQL statement is just a help for developers and will not be
  * executed!
@@ -330,7 +332,12 @@ class OC_Calendar_Object{
 	public static function getUTCforMDB($datetime){
 		return date('Y-m-d H:i', $datetime->format('U') - $datetime->getOffset());
 	}
-
+	
+	/**
+	 * @brief returns the DTEND of an $vevent object
+	 * @param object $vevent vevent object
+	 * @return object
+	 */
 	public static function getDTEndFromVEvent($vevent){
 		if ($vevent->DTEND) {
 			$dtend = $vevent->DTEND;
@@ -355,9 +362,12 @@ class OC_Calendar_Object{
 		}
 		return $dtend;
 	}
-
-	public static function getRepeatOptions($l10n)
-	{
+	
+	/**
+	 * @brief returns the options for the repeat rule of an repeating event
+	 * @return array - valid inputs for the repeat rule of an repeating event
+	 */
+	public static function getRepeatOptions($l10n){
 		return array(
 			'doesnotrepeat' => $l10n->t('Does not repeat'),
 			'daily'         => $l10n->t('Daily'),
@@ -368,26 +378,35 @@ class OC_Calendar_Object{
 			'yearly'        => $l10n->t('Yearly')
 		);
 	}
-
-	public static function getEndOptions($l10n)
-	{
+	
+	/**
+	 * @brief returns the options for the end of an repeating event
+	 * @return array - valid inputs for the end of an repeating events
+	 */
+	public static function getEndOptions($l10n){
 		return array(
 			'never' => $l10n->t('never'),
 			'count' => $l10n->t('by occurrences'),
 			'date'  => $l10n->t('by date')
 		);
 	}
-
-	public static function getMonthOptions($l10n)
-	{
+	
+	/**
+	 * @brief returns the options for an monthly repeating event
+	 * @return array - valid inputs for monthly repeating events
+	 */
+	public static function getMonthOptions($l10n){
 		return array(
 			'monthday' => $l10n->t('by monthday'),
 			'weekday'  => $l10n->t('by weekday')
 		);
 	}
-
-	public static function getWeeklyOptions($l10n)
-	{
+	
+	/**
+	 * @brief returns the options for an weekly repeating event
+	 * @return array - valid inputs for weekly repeating events
+	 */
+	public static function getWeeklyOptions($l10n){
 		return array(
 			'MO' => $l10n->t('Monday'),
 			'TU' => $l10n->t('Tuesday'),
@@ -398,9 +417,12 @@ class OC_Calendar_Object{
 			'SU' => $l10n->t('Sunday')
 		);
 	}
-
-	public static function getWeekofMonth($l10n)
-	{
+	
+	/**
+	 * @brief returns the options for an monthly repeating event which occurs on specific weeks of the month
+	 * @return array - valid inputs for monthly repeating events
+	 */
+	public static function getWeekofMonth($l10n){
 		return array(
 			'auto' => $l10n->t('events week of month'),
 			'1' => $l10n->t('first'),
@@ -411,7 +433,11 @@ class OC_Calendar_Object{
 			'-1' => $l10n->t('last')
 		);
 	}
-
+	
+	/**
+	 * @brief returns the options for an yearly repeating event which occurs on specific days of the year
+	 * @return array - valid inputs for yearly repeating events
+	 */
 	public static function getByYearDayOptions(){
 		$return = array();
 		foreach(range(1,366) as $num){
@@ -419,7 +445,11 @@ class OC_Calendar_Object{
 		}
 		return $return;
 	}
-
+	
+	/**
+	 * @brief returns the options for an yearly or monthly repeating event which occurs on specific days of the month
+	 * @return array - valid inputs for yearly or monthly repeating events
+	 */
 	public static function getByMonthDayOptions(){
 		$return = array();
 		foreach(range(1,31) as $num){
@@ -427,7 +457,11 @@ class OC_Calendar_Object{
 		}
 		return $return;
 	}
-
+	
+	/**
+	 * @brief returns the options for an yearly repeating event which occurs on specific month of the year
+	 * @return array - valid inputs for yearly repeating events
+	 */
 	public static function getByMonthOptions($l10n){
 		return array(
 			'1'  => $l10n->t('January'),
@@ -444,7 +478,11 @@ class OC_Calendar_Object{
 			'12' => $l10n->t('December')
 		);
 	}
-
+	
+	/**
+	 * @brief returns the options for an yearly repeating event
+	 * @return array - valid inputs for yearly repeating events
+	 */
 	public static function getYearOptions($l10n){
 		return array(
 			'bydate' => $l10n->t('by events date'),
@@ -453,13 +491,21 @@ class OC_Calendar_Object{
 			'bydaymonth'  => $l10n->t('by day and month')
 		);
 	}
-
+	
+	/**
+	 * @brief returns the options for an yearly repeating event which occurs on specific week numbers of the year
+	 * @return array - valid inputs for yearly repeating events
+	 */
 	public static function getByWeekNoOptions(){
 		return range(1, 52);
 	}
-
-	public static function validateRequest($request)
-	{
+	
+	/**
+	 * @brief validates a request
+	 * @param array $request
+	 * @return mixed (array / boolean)
+	 */
+	public static function validateRequest($request){
 		$errnum = 0;
 		$errarr = array('title'=>'false', 'cal'=>'false', 'from'=>'false', 'fromtime'=>'false', 'to'=>'false', 'totime'=>'false', 'endbeforestart'=>'false');
 		if($request['title'] == ''){
@@ -606,17 +652,24 @@ class OC_Calendar_Object{
 		}
 		return false;
 	}
-
-	protected static function checkTime($time)
-	{
+	
+	/**
+	 * @brief validates time
+	 * @param string $time
+	 * @return boolean
+	 */	
+	protected static function checkTime($time){
 		list($hours, $minutes) = explode(':', $time);
 		return empty($time)
 			|| $hours < 0 || $hours > 24
 			|| $minutes < 0 || $minutes > 60;
 	}
-
-	public static function createVCalendarFromRequest($request)
-	{
+	
+	/**
+	 * @brief creates an VCalendar Object from the request data
+	 * @param array $request
+	 * @return object created $vcalendar
+	 */	public static function createVCalendarFromRequest($request){
 		$vcalendar = new OC_VObject('VCALENDAR');
 		$vcalendar->add('PRODID', 'ownCloud Calendar');
 		$vcalendar->add('VERSION', '2.0');
@@ -629,9 +682,14 @@ class OC_Calendar_Object{
 		$vevent->setUID();
 		return self::updateVCalendarFromRequest($request, $vcalendar);
 	}
-
-	public static function updateVCalendarFromRequest($request, $vcalendar)
-	{
+	
+	/**
+	 * @brief updates an VCalendar Object from the request data
+	 * @param array $request
+	 * @param object $vcalendar
+	 * @return object updated $vcalendar
+	 */
+	public static function updateVCalendarFromRequest($request, $vcalendar){
 		$title = $request["title"];
 		$location = $request["location"];
 		$categories = $request["categories"];
@@ -811,29 +869,52 @@ class OC_Calendar_Object{
 		$vevent->setString('DESCRIPTION', $description);
 		$vevent->setString('CATEGORIES', $categories);
 
-		/*if($repeat == "true"){
+		/**if($repeat == "true"){
 			$vevent->RRULE = $repeat;
 		}*/
 
 		return $vcalendar;
 	}
-
+	
+	/**
+	 * @brief returns the owner of an object
+	 * @param integer $id
+	 * @return string
+	 */
 	public static function getowner($id){
 		$event = self::find($id);
 		$cal = OC_Calendar_Calendar::find($event['calendarid']);
 		return $cal['userid'];
 	}
 	
+	/**
+	 * @brief returns the calendarid of an object
+	 * @param integer $id
+	 * @return integer
+	 */
 	public static function getCalendarid($id){
 		$event = self::find($id);
 		return $event['calendarid'];
 	}
-
+	
+	/**
+	 * @brief checks if an object is repeating
+	 * @param integer $id
+	 * @return boolean
+	 */
 	public static function isrepeating($id){
 		$event = self::find($id);
 		return ($event['repeating'] == 1)?true:false;
 	}
-
+	
+	/**
+	 * @brief converts the start_dt and end_dt to a new timezone 
+	 * @param object $dtstart
+	 * @param object $dtend
+	 * @param boolean $allday
+	 * @param string $tz
+	 * @return array
+	 */
 	public static function generateStartEndDate($dtstart, $dtend, $allday, $tz){
 		$start_dt = $dtstart->getDateTime();
 		$end_dt = $dtend->getDateTime();
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index 204f96a5a2..b9fbee8fe0 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -5,12 +5,12 @@
  * later.
  * See the COPYING-README file.
  */
-/*
+/**
  * This class manages the caching of repeating events
  * Events will be cached for the current year ± 5 years
  */
 class OC_Calendar_Repeat{
-	/*
+	/**
 	 * @brief returns the cache of an event
 	 * @param (int) $id - id of the event
 	 * @return (array) 
@@ -24,7 +24,7 @@ class OC_Calendar_Repeat{
 		}
 		return $return;
 	}
-	/*
+	/**
 	 * @brief returns the cache of an event in a specific peroid
 	 * @param (int) $id - id of the event
 	 * @param (DateTime) $from - start for period in UTC
@@ -44,7 +44,7 @@ class OC_Calendar_Repeat{
 		}
 		return $return;
 	}
-	/*
+	/**
 	 * @brief returns the cache of all repeating events of a calendar
 	 * @param (int) $id - id of the calendar
 	 * @return (array) 
@@ -58,7 +58,7 @@ class OC_Calendar_Repeat{
 		}
 		return $return;
 	}
-	/*
+	/**
 	 * @brief returns the cache of all repeating events of a calendar in a specific period
 	 * @param (int) $id - id of the event
 	 * @param (string) $from - start for period in UTC
@@ -78,7 +78,7 @@ class OC_Calendar_Repeat{
 		}
 		return $return;
 	}
-	/*
+	/**
 	 * @brief generates the cache the first time
 	 * @param (int) id - id of the event
 	 * @return (bool)
@@ -104,7 +104,7 @@ class OC_Calendar_Repeat{
 		}
 		return true;
 	}
-	/*
+	/**
 	 * @brief generates the cache the first time for all repeating event of an calendar
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
@@ -116,7 +116,7 @@ class OC_Calendar_Repeat{
 		}
 		return true;
 	}
-	/*
+	/**
 	 * @brief updates an event that is already cached
 	 * @param (int) id - id of the event
 	 * @return (bool)
@@ -126,7 +126,7 @@ class OC_Calendar_Repeat{
 		self::generate($id);
 		return true;
 	}
-	/*
+	/**
 	 * @brief updates all repating events of a calendar that are already cached
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
@@ -136,7 +136,7 @@ class OC_Calendar_Repeat{
 		self::generateCalendar($id);
 		return true;
 	}
-	/*
+	/**
 	 * @brief checks if an event is already cached
 	 * @param (int) id - id of the event
 	 * @return (bool)
@@ -148,7 +148,7 @@ class OC_Calendar_Repeat{
 			return false;
 		}
 	}
-	/*
+	/**
 	 * @brief checks if an event is already cached in a specific period
 	 * @param (int) id - id of the event
 	 * @param (DateTime) $from - start for period in UTC
@@ -163,7 +163,7 @@ class OC_Calendar_Repeat{
 		}
 
 	}
-	/*
+	/**
 	 * @brief checks if a whole calendar is already cached
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
@@ -183,7 +183,7 @@ class OC_Calendar_Repeat{
 			return true;
 		}
 	}
-	/*
+	/**
 	 * @brief removes the cache of an event
 	 * @param (int) id - id of the event
 	 * @return (bool)
@@ -192,7 +192,7 @@ class OC_Calendar_Repeat{
 		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE eventid = ?');
 		$stmt->execute(array($id));
 	}
-	/*
+	/**
 	 * @brief removes the cache of all events of a calendar
 	 * @param (int) id - id of the calendar
 	 * @return (bool)
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index 7e1a43c414..4fe8817140 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -5,13 +5,13 @@
  * later.
  * See the COPYING-README file.
  */
-/*
+/**
  * This class manages shared calendars
  */
 class OC_Calendar_Share{
 	const CALENDAR = 'calendar';
 	const EVENT = 'event';
-	/*
+	/**
 	 * @brief: returns informations about all calendar or events which users are sharing with the user - userid
 	 * @param: string $userid - id of the user
 	 * @param: string $type - use const self::CALENDAR or self::EVENT
@@ -33,7 +33,7 @@ class OC_Calendar_Share{
 		}
 		return $return;
 	}
-	/*
+	/**
 	 * @brief: returns all users a calendar / event is shared with
 	 * @param: integer id - id of the calendar / event
 	 * @param: string $type - use const self::CALENDAR or self::EVENT
@@ -48,7 +48,7 @@ class OC_Calendar_Share{
 		}
 		return $users;
 	}
-	/*
+	/**
 	 * @brief: shares a calendar / event
 	 * @param: string $owner - userid of the owner
 	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
@@ -80,7 +80,7 @@ class OC_Calendar_Share{
 			return true;
 		}
 	}
-	/*
+	/**
 	 * @brief: stops sharing a calendar / event
 	 * @param: string $owner - userid of the owner
 	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
@@ -98,7 +98,7 @@ class OC_Calendar_Share{
 		}
 		return true;
 	}
-	/*
+	/**
 	 * @brief: changes the permission for a calendar / event
 	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
 	 * @param: string $sharetype - type of sharing (can be: user/group/public)
@@ -115,7 +115,7 @@ class OC_Calendar_Share{
 		$stmt->execute(array($permission, $share, $sharetype, $id));
 		return true;
 	}
-	/*
+	/**
 	 * @brief: generates a token for public calendars / events
 	 * @return: string $token
 	 */
@@ -138,7 +138,7 @@ class OC_Calendar_Share{
 		$token = md5($string);
 		return substr($token, rand(0,16), 15);
 	}
-	/*
+	/**
 	 * @brief: checks if it is already shared
 	 * @param: string $owner - userid of the owner
 	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
@@ -181,7 +181,7 @@ class OC_Calendar_Share{
 		}
 		return $active_where;
 	}
-	/*
+	/**
 	 * @brief: checks the permission for editing an event
 	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
 	 * @param: string $id - id of the calendar / event
@@ -202,7 +202,7 @@ class OC_Calendar_Share{
 		}
 		return false;
 	}
-	/*
+	/**
 	 * @brief: checks the access of 
 	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
 	 * @param: string $id - id of the calendar / event
@@ -223,7 +223,7 @@ class OC_Calendar_Share{
 			return false;
 		}
 	}
-        /*
+        /**
          * @brief: returns the calendardata of an event or a calendar
          * @param: string $token - token which should be searched
          * @return: mixed - bool if false, array with type and id if true
@@ -248,7 +248,7 @@ class OC_Calendar_Share{
 			return $return;
         }
 		
-		/*
+		/**
 		 * @brief sets the active status of the calendar
 		 * @param string 
 		 */
@@ -257,7 +257,7 @@ class OC_Calendar_Share{
 			$stmt->execute(array($active, $share, $id));
 		}
 
-		/*
+		/**
 		 * @brief deletes all shared calendars / events after a user was deleted
 		 * @param string $userid
 		 * @return boolean
@@ -274,7 +274,7 @@ class OC_Calendar_Share{
 			return true;
 		}
 		
-		/*
+		/**
 		 * @brief deletes all shared events of a calendar
 		 * @param integer $calid
 		 * @return boolean
@@ -285,7 +285,7 @@ class OC_Calendar_Share{
 			return true;
 		}
 		
-		/*
+		/**
 		 * @brief deletes all shares of an event
 		 * @param integer $eventid
 		 * @return boolean

From 376431fa0d20f6fade8d4e9cb7b1240e3e6eaf34 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 22:08:30 +0200
Subject: [PATCH 0759/1537] import works now for dropimport

---
 apps/calendar/ajax/import/dropimport.php |  5 +--
 apps/calendar/lib/import.php             | 53 +++++++++++++++---------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index 41dfd7d934..25b404787f 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -12,15 +12,14 @@ $data = base64_decode($data);
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 $import = new OC_Calendar_Import($data);
+$import->setUserID(OCP\User::getUser());
 $import->setTimeZone(OC_Calendar_App::$tz);
 $import->disableProgressCache();
 if(!$import->isValid()){
 	OCP\JSON::error();
 	exit;
 }
-$calendarname = $import->createCalendarName(OCP\User::getUser());
-$calendarcolor = $import->createCalendarColor();
-$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),strip_tags($calendarname),'VEVENT,VTODO,VJOURNAL',null,0,$calendarcolor);
+$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),strip_tags($import->createCalendarName()),'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
 $import->setCalendarID($newid);
 $import->import();
 OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index d23a55a620..969725f527 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -43,6 +43,11 @@ class OC_Calendar_Import{
 	 * @brief var saves the timezone the events shell converted to
 	 */
 	private $tz;
+	
+	/*
+	 * @brief var saves the userid
+	 */
+	private $userid;
 
 	/*
 	 * public methods 
@@ -69,20 +74,21 @@ class OC_Calendar_Import{
 	
 	/*
 	 * @brief imports a calendar
-	 * @param boolean $force force import even though calendar is not valid
 	 * @return boolean
 	 */
-	public function import($force = false){
-		if(!$this->isValid() && !$force){
+	public function import(){
+		if(!$this->isValid()){
 			return false;
 		}
 		foreach($this->calobject->getComponents() as $object){
 			if(!($object instanceof Sabre_VObject_Component_VEvent) && !($object instanceof Sabre_VObject_Component_VJournal) && !($object instanceof Sabre_VObject_Component_VTodo)){
 				continue;
 			}
-			
-			
-			
+			$object->DTSTART->getDateTime()->setTimezone(new DateTimeZone($this->tz));
+			$object->DTEND = OC_Calendar_Object::getDTEndFromVEvent($object);
+			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
+			$vcalendar = $this->createVCalendar($object->serialize());
+			OC_Calendar_Object::add($this->id, $vcalendar);
 		}
 		return true;
 	}
@@ -135,14 +141,13 @@ class OC_Calendar_Import{
 	
 	/*
 	 * @brief generates a new calendar name
-	 * @param string $userid 
 	 * @return string
 	 */
-	public function createCalendarName($userid){	
-		$calendars = OC_Calendar_Calendar::allCalendars($userid);
+	public function createCalendarName(){	
+		$calendars = OC_Calendar_Calendar::allCalendars($this->userid);
 		$calendarname = $guessedcalendarname = !is_null($this->guessCalendarName())?($this->guessCalendarName()):(OC_Calendar_App::$l10n->t('New Calendar'));
 		$i = 1;
-		while(!OC_Calendar_Calendar::isCalendarNameavailable($calendarname, $userid)){
+		while(!OC_Calendar_Calendar::isCalendarNameavailable($calendarname, $this->userid)){
 			$calendarname = $guessedcalendarname . ' (' . $i . ')';
 			$i++;
 		}
@@ -153,8 +158,8 @@ class OC_Calendar_Import{
 	 * @brief generates a new calendar color
 	 * @return string
 	 */
-	public function createCalendarColor($userid){
-		if(is_null($this->guessCalendarColor()))){
+	public function createCalendarColor(){
+		if(is_null($this->guessCalendarColor())){
 			return '#9fc6e7';
 		}
 		return $this->guessCalendarColor();
@@ -165,9 +170,19 @@ class OC_Calendar_Import{
 	 * @param integer $id of the calendar
 	 * @return boolean
 	 */
-	public static function setCalendarID($id){
+	public function setCalendarID($id){
 		$this->id = $id;
-		return true:
+		return true;
+	}
+	
+	/*
+	 * @brief sets the userid to import the calendar
+	 * @param string $id of the user
+	 * @return boolean
+	 */
+	public function setUserID($userid){
+		$this->userid = $userid;
+		return true;
 	}
 
 	/*
@@ -207,12 +222,12 @@ class OC_Calendar_Import{
 	}
 	
 	/*
-	 * @brief 
-	 * @return 
+	 * @brief checks if an event already exists in the user's calendars
+	 * @return boolean
 	 */
-	//private function (){
+	private function isDuplicate(){
 
-	//}
+	}
 	
 	/*
 	 * @brief 
@@ -223,7 +238,7 @@ class OC_Calendar_Import{
 	//}
 
 	/*
-	 * private methods for prerendering of X-... Attributes
+	 * private methods for (pre)rendering of X-... Attributes
 	 */
 	
 	/*

From f15941a967669c9a7e1e1c391b55e61a39e44484 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 22:26:29 +0200
Subject: [PATCH 0760/1537] improve dropimport

---
 apps/calendar/ajax/import/dropimport.php |  5 +++--
 apps/calendar/js/calendar.js             |  4 ++++
 apps/calendar/lib/import.php             | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index 25b404787f..a3bef1ac29 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -19,7 +19,8 @@ if(!$import->isValid()){
 	OCP\JSON::error();
 	exit;
 }
-$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),strip_tags($import->createCalendarName()),'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
+$newcalendarname = strip_tags($import->createCalendarName());
+$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),$newcalendarname,'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
 $import->setCalendarID($newid);
 $import->import();
-OCP\JSON::success();
\ No newline at end of file
+OCP\JSON::success(array('newcalendarname'=>$newcalendarname, 'count'=>$import->getCount(), 'newcalendarid'=>$newid, 'eventSource'=>OC_Calendar_Calendar::getEventSourceInfo(OC_Calendar_Calendar::find($newid))));
\ No newline at end of file
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 251522802a..0c4d44769c 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -634,6 +634,10 @@ Calendar={
 			import:function(data){
 				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
 					if(result.status == 'success'){
+						$('#calendar_holder').fullCalendar('addEventSource', result.eventSource);
+						$('#notification').html(result.count + ' Events has been saved in the new calendar ' + result.newcalendarname);
+						$('#notification').slideDown();
+						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
 						return true;
 					}else{
 						$('#notification').html('ownCloud wasn\'t able to import at least one file. File skipped.');
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index 969725f527..9076a747a4 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -19,6 +19,11 @@ class OC_Calendar_Import{
 	 */
 	private $calobject;
 	
+	/*
+	 * @brief var counts the number of imported elements
+	 */
+	private $count;
+	
 	/*
 	 * @brief var to check if errors happend while initialization
 	 */
@@ -62,6 +67,7 @@ class OC_Calendar_Import{
 	public function __construct($ical){
 		$this->error = null;
 		$this->ical = $ical;
+		$this->count = 0;
 		try{
 			$this->calobject = OC_VObject::parse($this->ical);
 		}catch(Exception $e){
@@ -89,6 +95,7 @@ class OC_Calendar_Import{
 			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
 			$vcalendar = $this->createVCalendar($object->serialize());
 			OC_Calendar_Object::add($this->id, $vcalendar);
+			$this->count++;
 		}
 		return true;
 	}
@@ -184,6 +191,15 @@ class OC_Calendar_Import{
 		$this->userid = $userid;
 		return true;
 	}
+	
+	/*
+	 * @brief returns the private 
+	 * @param string $id of the user
+	 * @return boolean
+	 */
+	public function getCount(){
+		return $this->count;
+	}
 
 	/*
 	 * private methods 

From a705b19cd598b538d0b82d97166d5d0ba03ff835 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 22:45:12 +0200
Subject: [PATCH 0761/1537] little fix for import

---
 apps/calendar/lib/import.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index 9076a747a4..3a7af8e4bf 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -90,8 +90,9 @@ class OC_Calendar_Import{
 			if(!($object instanceof Sabre_VObject_Component_VEvent) && !($object instanceof Sabre_VObject_Component_VJournal) && !($object instanceof Sabre_VObject_Component_VTodo)){
 				continue;
 			}
+			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object);
 			$object->DTSTART->getDateTime()->setTimezone(new DateTimeZone($this->tz));
-			$object->DTEND = OC_Calendar_Object::getDTEndFromVEvent($object);
+			$object->DTEND->setDateTime($dtend->getDateTime(), $object->DTSTART->getDateType());
 			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
 			$vcalendar = $this->createVCalendar($object->serialize());
 			OC_Calendar_Object::add($this->id, $vcalendar);

From ce331bd1d39192d5a062f27c2a63af581063e0b6 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 30 Jun 2012 23:18:41 +0200
Subject: [PATCH 0762/1537] improvements for dropoimport

---
 apps/calendar/ajax/import/dropimport.php |  8 +++++++-
 apps/calendar/js/calendar.js             |  4 ++--
 apps/calendar/lib/import.php             | 20 ++++++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index a3bef1ac29..b58b3f91cc 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -23,4 +23,10 @@ $newcalendarname = strip_tags($import->createCalendarName());
 $newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),$newcalendarname,'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
 $import->setCalendarID($newid);
 $import->import();
-OCP\JSON::success(array('newcalendarname'=>$newcalendarname, 'count'=>$import->getCount(), 'newcalendarid'=>$newid, 'eventSource'=>OC_Calendar_Calendar::getEventSourceInfo(OC_Calendar_Calendar::find($newid))));
\ No newline at end of file
+$count = $import->getCount();
+if($count == 0){
+	OC_Calendar_Calendar::deleteCalendar($newid);
+	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your account')));
+}else{
+	OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' . $newcalendarname, 'eventSource'=>OC_Calendar_Calendar::getEventSourceInfo(OC_Calendar_Calendar::find($newid))));
+}
\ No newline at end of file
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 0c4d44769c..aaf168844e 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -635,12 +635,12 @@ Calendar={
 				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
 					if(result.status == 'success'){
 						$('#calendar_holder').fullCalendar('addEventSource', result.eventSource);
-						$('#notification').html(result.count + ' Events has been saved in the new calendar ' + result.newcalendarname);
+						$('#notification').html(result.message);
 						$('#notification').slideDown();
 						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
 						return true;
 					}else{
-						$('#notification').html('ownCloud wasn\'t able to import at least one file. File skipped.');
+						$('#notification').html(result.message);
 						$('#notification').slideDown();
 						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
 					}
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index 3a7af8e4bf..dccb8955af 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -95,8 +95,12 @@ class OC_Calendar_Import{
 			$object->DTEND->setDateTime($dtend->getDateTime(), $object->DTSTART->getDateType());
 			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
 			$vcalendar = $this->createVCalendar($object->serialize());
-			OC_Calendar_Object::add($this->id, $vcalendar);
-			$this->count++;
+			$insertid = OC_Calendar_Object::add($this->id, $vcalendar);
+			if($this->isDuplicate($insertid)){
+				OC_Calendar_Object::delete($insertid);
+			}else{
+				$this->count++;	
+			}
 		}
 		return true;
 	}
@@ -240,10 +244,18 @@ class OC_Calendar_Import{
 	
 	/*
 	 * @brief checks if an event already exists in the user's calendars
+	 * @param integer $insertid id of the new object
 	 * @return boolean
 	 */
-	private function isDuplicate(){
-
+	private function isDuplicate($insertid){
+		$newobject = OC_Calendar_Object::find($insertid);
+		$stmt = OCP\DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*calendar_objects WHERE objecttype=? AND startdate=? AND enddate=? AND repeating=? AND summary=? AND calendardata=?');
+		$result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata']));
+		$result = $result->fetchRow();
+		if($result['count'] >= 2){
+			return true;
+		}
+		return false;
 	}
 	
 	/*

From 7a649fc65aa106ccc2c7535ad368ba56082a28dd Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 17:25:21 -0400
Subject: [PATCH 0763/1537] Switch back to registering just the class and not
 the object, better for performance

---
 lib/public/share.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index c5a749a090..99dae542eb 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -43,26 +43,22 @@ class Share {
 	private static $shareTypeUserAndGroups = -1;
 	private static $shareTypeGroupUserUnique = 2;
 	private static $backends = array();
+	private static $backendTypes = array();
 
 	/**
 	* @brief Register a sharing backend class that extends OCP\Share_Backend for an item type
 	* @param string Item type
-	* @param object Backend class
+	* @param string Backend class
 	* @param string (optional) Depends on item type
 	* @param array (optional) List of supported file extensions if this item type depends on files
 	* @return Returns true if backend is registered or false if error
 	*/
-	public static function registerBackend($itemType, $class) {
-		if (is_subclass_of($class, 'OCP\Share_Backend')) {
-			if (!isset(self::$backends[$itemType])) {
-				self::$backends[$itemType] = $class;
-				return true;
-			} else {
-				\OC_Log::write('OCP\Share', 'Sharing backend '.get_class($class).' not registered, '.get_class(self::$backends[$itemType]).' is already registered for '.$itemType, \OC_Log::WARN);
-				return false;
-			}
+	public static function registerBackend($itemType, $class, $dependsOn = null, $supportedFileExtensions = null) {
+		if (!isset(self::$backendTypes[$itemType])) {
+			self::$backendTypes[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
+			return true;
 		}
-		\OC_Log::write('OCP\Share', 'Sharing backend '.get_class($class).' not registered, the class must extend abstract class OC_Share_Backend', \OC_Log::ERROR);
+		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
 		return false;
 	}
 
@@ -344,6 +340,19 @@ class Share {
 	private static function getBackend($itemType) {
 		if (isset(self::$backends[$itemType])) {
 			return self::$backends[$itemType];
+		} else if (isset(self::$backendTypes[$itemType]['class'])) {
+			$class = self::$backendTypes[$itemType]['class'];
+			if (class_exists($class)) {
+				self::$backends[$itemType] = new $class;
+				if (!is_subclass_of(self::$backends[$itemType], 'OCP\Share_Backend')) {
+					\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' must extend abstract class OC_Share_Backend', \OC_Log::ERROR);
+					return false;
+				}
+				return self::$backends[$itemType];
+			} else {
+				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not found', \OC_Log::ERROR);
+				return false;
+			}
 		}
 		\OC_Log::write('OCP\Share', 'Sharing backend for '.$itemType.' not found', \OC_Log::ERROR);
 		return false;

From 2418d9a1a9a1a36ed8e929ba4cb62b31ce849f8e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 17:33:30 -0400
Subject: [PATCH 0764/1537] Change registerBackend calls class argument to
 strings

---
 apps/contacts/appinfo/app.php      | 2 +-
 apps/files_sharing/appinfo/app.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index f27db13ca7..cec0f3e88c 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -22,4 +22,4 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('contacts','settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
-OCP\Share::registerBackend('addressbook', new OC_Contacts_Share());
+OCP\Share::registerBackend('addressbook', 'OC_Contacts_Share');
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 281ab00d77..a08544909b 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -23,4 +23,4 @@ if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', '
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle( 'files_sharing', 'sharing' );
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
-OCP\Share::registerBackend('file', new OC_Share_Backend_File());
+OCP\Share::registerBackend('file', 'OC_Share_Backend_File');

From 75c111a33b69d4da2f0540d17e425e9f6e7f5df6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 18:00:01 -0400
Subject: [PATCH 0765/1537] Have getItems() return an empty array instead of
 false, so apps only need to do an array_merge()

---
 lib/public/share.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 99dae542eb..e214fb46dd 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -145,7 +145,7 @@ class Share {
 						return false;
 					}
 				}
-				if (self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
+				if ($item = self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($item)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -158,7 +158,7 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				if (self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
+				if ($item = self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($item)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -210,7 +210,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function unshare($itemType, $item, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1) && !empty($item)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -259,7 +259,7 @@ class Share {
 		if ($backend = self::getBackend($itemType)) {
 			$uidSharedWith = \OC_User::getUser();
 			// TODO Check permissions for setting target?
-			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, 1)) {
+			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, 1) && !empty($item)) {
 				// Check if this is a group share
 				if ($item['uid_shared_with'] == null) {
 					// A new entry needs to be created exclusively for the user
@@ -297,7 +297,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1) && !empty($item)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
@@ -491,7 +491,7 @@ class Share {
 				}
 			}
 		}
-		return false;
+		return array();
 	}
 
 	/**
@@ -522,7 +522,7 @@ class Share {
 		}
 		if ($backend = self::getBackend($itemType)) {
 			// Check if this is a reshare
-			if ($checkReshare = self::getItemSharedWith($itemType, $item)) {
+			if ($checkReshare = self::getItemSharedWith($itemType, $item) && !empty($checkReshare)) {
 				// TODO Check if resharing is allowed
 				// TODO Don't check if inside folder
 				$parent = $checkReshare['id'];

From 601237a0c3056156e272598b853827f615be86a4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 00:09:33 +0200
Subject: [PATCH 0766/1537] add algorithm to generate the calendar's text color

---
 apps/calendar/lib/calendar.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 3fc51e3900..c852740596 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -267,7 +267,7 @@ class OC_Calendar_Calendar{
 			'url' => OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],
 			'backgroundColor' => $calendar['calendarcolor'],
 			'borderColor' => '#888',
-			'textColor' => 'black',
+			'textColor' => self::generateTextColor($calendar['calendarcolor']),
 			'cache' => true,
 		);
 	}
@@ -287,4 +287,21 @@ class OC_Calendar_Calendar{
 		}
 		return true;
 	}
+	
+	/*
+	 * @brief generates the text color for the calendar
+	 * @param integer $calendarname
+	 * @return boolean
+	 */
+	public static function generateTextColor($calendarcolor){
+		if(substr_count($calendarcolor, '#') == 1){
+			$calendarcolor = substr($calendarcolor,1);
+		}
+		$red = hexdec(substr($calendarcolor,0,2));
+		$green = hexdec(substr($calendarcolor,2,2));
+		$blue = hexdec(substr($calendarcolor,2,2));
+		//recommendation by W3C
+		$computation = ((($red * 299) + ($green * 587) + ($blue * 114)) / 1000);
+		return ($computation > 130)?'black':'white';
+	}
 }

From be11f71d27e704a2d3cc4958e1dda66441659390 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 00:31:05 +0200
Subject: [PATCH 0767/1537] fix doc for
 OC_Calendar_Calendar::generateTextColor()

---
 apps/calendar/lib/calendar.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index c852740596..6cac99ba48 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -290,7 +290,8 @@ class OC_Calendar_Calendar{
 	
 	/*
 	 * @brief generates the text color for the calendar
-	 * @param integer $calendarname
+	 * @param string $calendarcolor rgb calendar color code in hex format (with or without the leading #)
+	 * (this function doesn't pay attention on the alpha value of rgba color codes)
 	 * @return boolean
 	 */
 	public static function generateTextColor($calendarcolor){

From c7a4075aaa133a0ad9a6d84b525924866a8bd9a3 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 30 Jun 2012 11:04:35 +0000
Subject: [PATCH 0768/1537] Updates contacts migration provider

---
 apps/contacts/appinfo/migrate.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
index cceb440617..02026c5979 100644
--- a/apps/contacts/appinfo/migrate.php
+++ b/apps/contacts/appinfo/migrate.php
@@ -30,7 +30,7 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 		
 	}
 	
-	// Import function for bookmarks
+	// Import function for contacts
 	function import( ){
 		switch( $this->appinfo->version ){
 			default:
@@ -39,11 +39,13 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 				$results = $query->execute( array( $this->olduid ) );
 				$idmap = array();
 				while( $row = $results->fetchRow() ){
-					// Import each bookmark, saving its id into the map	
+					// Import each addressbook	
 					$addressbookquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
 					$addressbookquery->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
 					// Map the id
-					$idmap[$row['id']] = OCP\DB::insertid();
+					$idmap[$row['id']] = OCP\DB::insertid('*PREFIX*contacts_addressbooks');
+					// Make the addressbook active
+					OC_Contacts_Addressbook::setActive($idmap[$row['id']], true);
 				}
 				// Now tags
 				foreach($idmap as $oldid => $newid){
@@ -51,7 +53,7 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 					$query = $this->content->prepare( "SELECT * FROM contacts_cards WHERE addressbookid LIKE ?" );
 					$results = $query->execute( array( $oldid ) );
 					while( $row = $results->fetchRow() ){
-						// Import the tags for this bookmark, using the new bookmark id
+						// Import the contacts
 						$contactquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
 						$contactquery->execute( array( $newid, $row['fullname'], $row['carddata'], $row['uri'], $row['lastmodified'] ) );	
 					}		

From cfc78d44bbde0426337ba6dbacf32a87667f9334 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 30 Jun 2012 10:57:47 +0000
Subject: [PATCH 0769/1537] Return correct json response, fix syntax

---
 lib/migrate.php | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/lib/migrate.php b/lib/migrate.php
index 731b6a6839..f788a637d3 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -278,7 +278,7 @@ class OC_Migrate{
 						return json_encode( array( 'success' => false ) );
 					}
 					// Done
-					return json_encode( 'success' => true );
+					return json_encode( array( 'success' => true ) );
 					*/
 			break;
 		}
@@ -443,21 +443,10 @@ class OC_Migrate{
 						'ocversion' => OC_Util::getVersion(),
 						'exporttime' => time(),
 						'exportedby' => OC_User::getUser(),
-						'exporttype' => self::$exporttype
+						'exporttype' => self::$exporttype,
+						'exporteduser' => self::$uid
 					);
-		// Add hash if user export
-		if( self::$exporttype == 'user' ){
-			$query = OC_DB::prepare( "SELECT password FROM *PREFIX*users WHERE uid = ?" );
-			$result = $query->execute( array( self::$uid ) );
-			$row = $result->fetchRow();
-			$hash = $row ? $row['password'] : false;
-			if( !$hash ){
-				OC_Log::write( 'migration', 'Failed to get the users password hash', OC_log::ERROR);
-				return false;
-			}
-			$info['hash'] = $hash;
-			$info['exporteduser'] = self::$uid;
-		}
+
 		if( !is_array( $array ) ){
 			OC_Log::write( 'migration', 'Supplied $array was not an array in getExportInfo()', OC_Log::ERROR );
 		}

From b2cb7d54d16aa1ae5904b917b3d597763150d04d Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 30 Jun 2012 10:55:38 +0000
Subject: [PATCH 0770/1537] Fixed app path

---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index 9e6835adc6..ffa0d37307 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -528,7 +528,7 @@ class OC_DB {
 	 	self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
 	 	
 	 	foreach($apps as $app){
-	 		$path = self::getAppPath($app).'/appinfo/database.xml';
+	 		$path = OC_App::getAppPath($app).'/appinfo/database.xml';
 	 		if(file_exists($path)){
 	 			self::removeDBStructure( $path );	
 	 		}

From 6a060ecd230f5b94b94dd08fc16845303627a1ab Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 01:02:54 +0200
Subject: [PATCH 0771/1537] use light grey instead of white

---
 apps/calendar/lib/calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 6cac99ba48..7778242464 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -303,6 +303,6 @@ class OC_Calendar_Calendar{
 		$blue = hexdec(substr($calendarcolor,2,2));
 		//recommendation by W3C
 		$computation = ((($red * 299) + ($green * 587) + ($blue * 114)) / 1000);
-		return ($computation > 130)?'black':'white';
+		return ($computation > 130)?'#000000':'#FAFAFA';
 	}
 }

From c073216d8d33afecb0a95bfbc7d8699be6624ca2 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 20:57:31 -0400
Subject: [PATCH 0772/1537] Don't overwrite the item variable when checking if
 the item is already shared

---
 lib/public/share.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index e214fb46dd..c39e62ad57 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -130,7 +130,6 @@ class Share {
 		// Verify share type and sharing conditions are met
 		switch ($shareType) {
 			case self::SHARE_TYPE_USER:
-				\OC_Log::write('OCP\Share', 'share type '.$shareType, \OC_Log::ERROR);
 				if ($shareWith == $uidOwner) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner', \OC_Log::ERROR);
 					return false;
@@ -145,7 +144,7 @@ class Share {
 						return false;
 					}
 				}
-				if ($item = self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($item)) {
+				if ($checkShareExists = self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($checkShareExists)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -158,7 +157,7 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				if ($item = self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($item)) {
+				if ($checkShareExists = self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($checkShareExists)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}

From 47f46890c8ce4b80bef8e474339f2ebda6bb8e55 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 21:03:36 -0400
Subject: [PATCH 0773/1537] Fix generateTarget() for contacts backend

---
 apps/contacts/lib/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/lib/share.php b/apps/contacts/lib/share.php
index 3198d22621..aa1f70be73 100644
--- a/apps/contacts/lib/share.php
+++ b/apps/contacts/lib/share.php
@@ -41,9 +41,9 @@ class OC_Contacts_Share extends OCP\Share_Backend {
 		$addressbook = OC_Contacts_Addressbook::find( $item );
 		$user_addressbooks = array();
 		foreach(OC_Contacts_Addressbook::all($uid) as $user_addressbook) {
-			$user_addressbooks[] = $user_addressbooks['displayname'];
+			$user_addressbooks[] = $user_addressbook['displayname'];
 		}
-		$name = $addressbook['uid']."'s ".$addressbook['displayname'];
+		$name = $addressbook['userid']."'s ".$addressbook['displayname'];
 		$suffix = '';
 		while (in_array($name.$suffix, $user_addressbooks)) {
 			$suffix++;

From f456cee9d838f07476ac4f9b478ed78e5e336b67 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 21:06:04 -0400
Subject: [PATCH 0774/1537] Fix fetching item type from share class element,
 comment out the auto hider for now since it doesn't work outside of the Files
 app

---
 core/js/share.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 96ea307730..bcad906262 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -184,8 +184,8 @@ OC.Share={
 $(document).ready(function() {
 
 	$('.share').live('click', function() {
-		if ($(this).data('itemType') !== undefined && $(this).data('item') !== undefined) {
-			OC.Share.showDropDown($(this).data('itemType'), $(this).data('item'), $(this));
+		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
+			OC.Share.showDropDown($(this).data('item-type'), $(this).data('item'), $(this).parent().parent());
 		}
 	});
 	
@@ -232,17 +232,17 @@ $(document).ready(function() {
 				OC.Share.showDropDown('file', item, appendTo);
 			}
 		});
-	};
+	}
 
-	$(this).click(function(event) {
-		if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
-			if ($('#dropdown').is(':visible')) {
-				OC.Share.hideDropDown(function() {
-					$('tr').removeClass('mouseOver');
-				});
-			}
-		}
-	});
+// 	$(this).click(function(event) {
+// 		if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
+// 			if ($('#dropdown').is(':visible')) {
+// 				OC.Share.hideDropDown(function() {
+// 					$('tr').removeClass('mouseOver');
+// 				});
+// 			}
+// 		}
+// 	});
 
 	$('#sharedWithList li').live('mouseenter', function(event) {
 		// Show permissions and unshare button

From 0b9b1757feac577ab3589f817bb53f5e570ac761 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 21:06:49 -0400
Subject: [PATCH 0775/1537] Add share action to addressbooks!

---
 apps/contacts/css/contacts.css                               | 3 ++-
 apps/contacts/templates/part.chooseaddressbook.rowfields.php | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 1766c28761..b3e5efb785 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -48,11 +48,12 @@ label:hover, dt:hover { color: #333; }
 .float { float: left; }
 .svg { border: inherit; background: inherit; }
 .listactions { height: 1em; width:60px; float: left; clear: right; }
-.add,.edit,.delete,.mail, .globe, .upload, .download, .cloud { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; opacity: 0.1; }
+.add,.edit,.delete,.mail, .globe, .upload, .download, .cloud, .share { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; opacity: 0.1; }
 .add:hover,.edit:hover,.delete:hover,.mail:hover, .globe:hover, .upload:hover, .download:hover .cloud:hover { opacity: 1.0 }
 .add { background:url('%webroot%/core/img/actions/add.svg') no-repeat center; clear: both; }
 .delete { background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
 .edit { background:url('%webroot%/core/img/actions/rename.svg') no-repeat center; }
+.share { background:url('%webroot%/core/img/actions/share.svg') no-repeat center; }
 .mail { background:url('%webroot%/core/img/actions/mail.svg') no-repeat center; }
 .upload { background:url('%webroot%/core/img/actions/upload.svg') no-repeat center; }
 .download { background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 2988bb44c5..c0a3ba68cd 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -13,6 +13,9 @@
 <td width="20px">
 	<a title="<?php echo $l->t("Edit"); ?>" class="svg action edit" onclick="Contacts.UI.Addressbooks.editAddressbook(this, <?php echo $_['addressbook']["id"]; ?>);"></a>
 </td>
+<td width="20px">
+	<a title="<?php echo $l->t("Share"); ?>" class="svg action share" data-item-type="addressbook" data-item="<?php echo $_['addressbook']['id']; ?>" />
+</td>
 <td width="20px">
 	<a onclick="Contacts.UI.Addressbooks.deleteAddressbook(this, <?php echo $_['addressbook']["id"]; ?>);" title="<?php echo $l->t("Delete"); ?>" class="svg action delete"></a>
 </td>

From 3e8a34f9062015e79d4d1a29e8187586feb4cd68 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 30 Jun 2012 21:15:10 -0400
Subject: [PATCH 0776/1537] Don't select all columns for FORMAT_STATUSES

---
 lib/public/share.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index c39e62ad57..59db104853 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -453,7 +453,12 @@ class Share {
 				}
 				$where .= ' LIMIT '.$limit;
 			}
-			$query = \OC_DB::prepare('SELECT * FROM *PREFIX*share '.$where);
+			if ($format == self::FORMAT_STATUSES) {
+				$select = 'item, share_type';
+			} else {
+				$select = '*';
+			}
+			$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
 			$result = $query->execute();
 			$items = array();
 			while ($item = $result->fetchRow()) {

From 4e63981da9a02d8a6c2393ad6773edf558222530 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 1 Jul 2012 13:45:20 +0200
Subject: [PATCH 0777/1537] Disable mimesniffing

---
 lib/json.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/json.php b/lib/json.php
index 4eab4fce9f..7cd9ba371d 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -15,6 +15,8 @@ class OC_JSON{
 		if (!self::$send_content_type_header){
 			// We send json data
 			header( 'Content-Type: '.$type );
+			// Force download
+			header( 'Content-Disposition: attachment' );
 			self::$send_content_type_header = true;
 		}
 	}
@@ -94,12 +96,12 @@ class OC_JSON{
 	* Encode and print $data in json format
 	*/
 	public static function encodedPrint($data,$setContentType=true){
-		if(!isset($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '') {
+			// Disable mimesniffing, don't move this to setContentTypeHeader!
+			header( 'X-Content-Type-Options: nosniff' );
 			if($setContentType){
 				self::setContentTypeHeader();
 			}
 			array_walk_recursive($data, array('OC_JSON', 'to_string'));
 			echo json_encode($data);
-		}
 	}
 }

From 7ceba61413ec3cc63112471e89f346ac1613d928 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:29:02 -0400
Subject: [PATCH 0778/1537] Revert "bugfix for #1098 (assigning a group to a
 user, the group appears incrementally many times the more you assign it)"

This reverts commit 265d7e50f55978a3bebfa077aa8552d5ea1b0c59.
---
 settings/js/users.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 90569bcc56..c04df81d82 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -221,6 +221,5 @@ $(document).ready(function(){
 				}
 			}
 		);
-	    location.reload();
 	});
 });

From eca2e073f812c89712c74f8626816c29a449232f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:53:29 -0400
Subject: [PATCH 0779/1537] Don't reload the page after sending private link to
 email address

---
 apps/files_sharing/js/share.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 9194d2240a..39e6bd7859 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -360,7 +360,8 @@ $(document).ready(function() {
 		$(this).select();
 	});
 
-	$('#emailPrivateLink').live('submit', function() {
+	$('#emailPrivateLink').live('submit', function(event) {
+		event.preventDefault();
 		OC.Share.emailPrivateLink();
 	});
 });
\ No newline at end of file

From 803f2c2517c0874ca5fd3526e8056d3d919712f2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 21:36:09 +0200
Subject: [PATCH 0780/1537] some work on calendar import

---
 apps/calendar/ajax/import/import.php    |  62 ++++++----
 apps/calendar/js/loader.js              | 151 +++++++++++++++---------
 apps/calendar/lib/import.php            |   8 +-
 apps/calendar/templates/part.import.php |  21 +++-
 4 files changed, 155 insertions(+), 87 deletions(-)

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 1facedfe0d..210bcb34d2 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -5,41 +5,56 @@
  * later.
  * See the COPYING-README file.
  */
-//check for calendar rights or create new one
-ob_start();
-
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 session_write_close();
-
-$nl="\r\n";
-$comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
-
-global $progresskey;
-$progresskey = 'calendar.import-' . $_POST['progresskey'];
-
-if (isset($_POST['progress']) && $_POST['progress']) {
-	echo OC_Cache::get($progresskey);
-	die;
-}
-
-function writeProgress($pct) {
-	global $progresskey;
-	OC_Cache::set($progresskey, $pct, 300);
-}
-writeProgress('10');
 $file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
+if(!$file){
+	OCP\JSON::error(array('error'=>'404'));
+}
+$import = new OC_Calendar_Import($file);
+$import->setUserID(OCP\User::getUser());
+$import->setTimeZone(OC_Calendar_App::$tz);
+$import->enableProgressCache();
+if(!$import->isValid()){
+	OCP\JSON::error(array('error'=>'notvalid'));
+	exit;
+}
+$newcal = false;
 if($_POST['method'] == 'new'){
-	$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), $_POST['calname']);
-	OC_Calendar_Calendar::setCalendarActive($id, 1);
+	$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
+	foreach($calendars as $calendar){
+		if($calendar['dispalyname'] == $_POST['calname']){
+			$id = $calendar['id'];
+			$newcal = false;
+			break;
+		}
+		$newcal = true;
+	}
+	if($newcal){
+		$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), strip_tags($_POST['calname'],'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor()));
+		OC_Calendar_Calendar::setCalendarActive($id, 1);
+	}
 }else{
 	$calendar = OC_Calendar_App::getCalendar($_POST['id']);
 	if($calendar['userid'] != OCP\USER::getUser()){
-		OCP\JSON::error();
+		OCP\JSON::error(array('error'=>'missingcalendarrights'));
 		exit();
 	}
 	$id = $_POST['id'];
 }
+$import->setCalendarID($id);
+$import->import();
+$count = $import->getCount();
+if($count == 0){
+	if($newcal){
+		OC_Calendar_Calendar::deleteCalendar($id);
+	}
+	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your account')));
+}else{
+		OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' . $newcalendarname));
+}
+/*		//////////////////////////// Attention: following code is quite painfull !!! ///////////////////////
 writeProgress('20');
 // normalize the newlines
 $file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
@@ -91,7 +106,6 @@ foreach($lines as $line) {
 // import the calendar
 writeProgress('60');
 foreach($uids as $uid) {
-	
 	$prefix=$suffix=$content=array();
 	foreach($uid as $begin=>$details) {
 		
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index cef95afc3a..f54e3fa262 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -5,33 +5,102 @@
  * See the COPYING-README file.
  */
 Calendar_Import={
-	importdialog: function(filename){
-		var path = $('#dir').val();
-		$('body').append('<div id="calendar_import"></div>');
-		$('#calendar_import').load(OC.filePath('calendar', 'ajax/import', 'dialog.php'), {filename:filename, path:path},	function(){Calendar_Import.initdialog(filename);});
-	},
-	initdialog: function(filename){
-		$('#calendar_import_dialog').dialog({
-			width : 500,
-			close : function() {
-				$(this).dialog('destroy').remove();
-				$('#calendar_import').remove();
-			}
-		});
-		$('#import_done_button').click(function(){
-			$('#calendar_import_dialog').dialog('destroy').remove();
+	Store:{
+		file: '',
+		path: '',
+		id: 0,
+		method: '',
+		calname: '',
+		progresskey: '',
+		percentage: 0
+	}
+	Dialog:{
+		open: function(filename){
+			Calendar_Import.Store.file = filename;
+			Calendar_Import.Store.path = $('#dir').val();
+			$('body').append('<div id="calendar_import"></div>');
+			$('#calendar_import').load(OC.filePath('calendar', 'ajax/import', 'dialog.php'), {filename:Calendar_Import.Store.file, path:Calendar_Import.Store.path},function(){
+					Calendar_Import.Dialog.init();
+			});
+		},
+		close: function(){
+			$(this).dialog('destroy').remove();
 			$('#calendar_import').remove();
-		});
-		$('#progressbar').progressbar({value: 0});
-		$('#startimport').click(function(){
-			var filename = $('#filename').val();
-			var path = $('#path').val();
-			var calid = $('#calendar option:selected').val();
+		},
+		init: function(){
+			//init dialog
+			$('#calendar_import_dialog').dialog({
+				width : 500,
+				close : function() {
+					Calendar_Import.Dialog.close();
+				}
+			});
+			//init buttons
+			$('#import_done_button').click(function(){
+				Calendar_Import.closedialog();
+			});
+			$('#startimport').click(function(){
+				Calendar_import.Core.process();
+			}
+			$('#calendar').change(function(){
+				if($('#calendar option:selected').val() == 'newcal'){
+					$('#newcalform').slideDown('slow');
+				}else{
+					$('#newcalform').slideUp('slow');
+				}
+			});
+			//init progressbar
+			$('#progressbar').progressbar({value: Calendar_Import.Store.percentage});
+			Calendar_Import.Store.progresskey = $('#progresskey').val();
+		},
+		mergewarning: function(){
+			
+		},
+		update: function(){
+			/*$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progress:1,progresskey: progresskey}, function(percent){
+				$('#progressbar').progressbar('option', 'value', parseInt(percent));
+				if(percent < 100){
+					window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
+				}else{
+					$('#import_done').css('display', 'block');
+				}
+			});*/
+		return 0;
+		},
+		warning: function(validation){
+			
+		}
+	},
+	Core:{
+		process: function(){
+			var validation = Calendar.Core.prepare();
+			if(validation){
+				$('#newcalendar').attr('readonly', 'readonly');
+				$('#calendar').attr('disabled', 'disabled');
+				Calendar.Core.send();
+			}else{
+				Calendar.Dialog.warning(validation);
+			}
+		},
+		send: function(){
+			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), 
+			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.filename), id: String (Calendar_Import.Store.calid)}, function(data){
+				if(data.status == 'success'){
+					$('#progressbar').progressbar('option', 'value', 100);
+					$('#import_done').css('display', 'block');
+					$('#status').html(data.message);
+				}
+			});
+			$('#form_container').css('display', 'none');
+			$('#progressbar_container').css('display', 'block');
+			window.setTimeout('Calendar_Import.Dialog.update', 500);
+		},
+		prepare: function(){
+			Calendar_Import.Store.id = $('#calendar option:selected').val();
 			if($('#calendar option:selected').val() == 'newcal'){
-				var method = 'new';
-				var calname = $('#newcalendar').val();
-				var calname = $.trim(calname);
-				if(calname == ''){
+				Calendar_Import.Store.method = 'new';
+				Calendar_Import.Store.calname = $.trim($('#newcalendar').val());
+				if(Calendar_Import.Store.calname == ''){
 					$('#newcalendar').css('background-color', '#FF2626');
 					$('#newcalendar').focus(function(){
 						$('#newcalendar').css('background-color', '#F8F8F8');
@@ -41,36 +110,8 @@ Calendar_Import={
 			}else{
 				var method = 'old';
 			}
-			$('#newcalendar').attr('readonly', 'readonly');
-			$('#calendar').attr('disabled', 'disabled');
-			var progresskey = $('#progresskey').val();
-			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progresskey: progresskey, method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
-				if(data.status == 'success'){
-					$('#progressbar').progressbar('option', 'value', 100);
-					$('#import_done').css('display', 'block');
-				}
-			});
-			$('#form_container').css('display', 'none');
-			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
-		});
-		$('#calendar').change(function(){
-			if($('#calendar option:selected').val() == 'newcal'){
-				$('#newcalform').slideDown('slow');
-			}else{
-				$('#newcalform').slideUp('slow');
-			}
-		});
-	},
-	getimportstatus: function(progresskey){
-		$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progress:1,progresskey: progresskey}, function(percent){
-			$('#progressbar').progressbar('option', 'value', parseInt(percent));
-			if(percent < 100){
-				window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
-			}else{
-				$('#import_done').css('display', 'block');
-			}
-		});
+			
+		}
 	}
 }
 $(document).ready(function(){
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index dccb8955af..92bcc31261 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -267,14 +267,14 @@ class OC_Calendar_Import{
 	//}
 
 	/*
-	 * private methods for (pre)rendering of X-... Attributes
+	 * public methods for (pre)rendering of X-... Attributes
 	 */
 	
 	/*
 	 * @brief guesses the calendar color
 	 * @return mixed - string or boolean
 	 */
-	private function guessCalendarColor(){
+	public function guessCalendarColor(){
 		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
 			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
 		}
@@ -285,7 +285,7 @@ class OC_Calendar_Import{
 	 * @brief guesses the calendar description
 	 * @return mixed - string or boolean
 	 */
-	private function guessCalendarDescription(){
+	public function guessCalendarDescription(){
 		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
 			return $this->calobject->__get('X-WR-CALDESC');
 		}
@@ -296,7 +296,7 @@ class OC_Calendar_Import{
 	 * @brief guesses the calendar name
 	 * @return mixed - string or boolean
 	 */
-	private function guessCalendarName(){
+	public function guessCalendarName(){
 		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
 			return $this->calobject->__get('X-WR-CALNAME');
 		}
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index 70ff961215..2a3ca9dae9 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -1,9 +1,19 @@
-<div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file"); ?>">
+<?php
+//Prerendering for iCalendar file
+$file = OC_Filesystem::file_get_contents($_['path'] . '/' . $_['filename']);
+if(!$file){
+	OCP\JSON::error(array('error'=>'404'));
+}
+$import = new OC_Calendar_Import($file);
+$newcalendarname = strip_tags($import->createCalendarName());
+$guessedcalendarname = $import->guessCalendarName();
+?>
+<div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file");?>">
 <div id="form_container">
 <input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
 <input type="hidden" id="path" value="<?php echo $_['path'];?>">
 <input type="hidden" id="progresskey" value="<?php echo rand() ?>">
-<p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b></p>
+<p style="text-align:center;"><b><?php echo $l->t('Please choose a calendar'); ?></b></p>
 <select style="width:100%;" id="calendar" name="calendar">
 <?php
 $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
@@ -15,9 +25,12 @@ echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], arra
 ?>
 </select>
 <div id="newcalform" style="display: none;">
-	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new calendar'); ?>" id="newcalendar" name="newcalendar">
+	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new calendar'); ?>" id="newcalendar" name="newcalendar" value="<?php echo $newcalendarname ?>">
 </div>
-<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
+<div id="namealreadyused" style="display: none;text-align:center;">
+	<span class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></span>
+</div>
+<input type="button" value="<?php echo $l->t("Import") . ' ' . $_['filename']; ?>!" id="startimport">
 </div>
 <div id="progressbar_container" style="display: none">
 <p style="text-align:center;"><b><?php echo $l->t('Importing calendar'); ?></b></p>

From 5ff72f2cd7559ba39ad4f0a255debc02f38d4430 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 21:50:53 +0200
Subject: [PATCH 0781/1537] fix a small PHP fail

---
 lib/l10n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index 4acbc5dceb..b21829e91f 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -115,7 +115,7 @@ class OC_L10N{
 			// (Just no need to define date/time format etc. twice)
 			if(file_exists($i18ndir.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
-				include($i18ndir.$lang.'.php');
+				include(strip_tags($i18ndir).strip_tags($lang).'.php');
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
 					$this->translations = $TRANSLATIONS;
 				}

From e89a0949c45972aa45b8eed02b498f8487685330 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 23:32:21 +0200
Subject: [PATCH 0782/1537] remove some whitespace

---
 apps/calendar/ajax/import/dialog.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
index b99c32278c..18fe226172 100644
--- a/apps/calendar/ajax/import/dialog.php
+++ b/apps/calendar/ajax/import/dialog.php
@@ -5,8 +5,6 @@
  * later.
  * See the COPYING-README file.
  */
-
- 
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 $tmpl = new OCP\Template('calendar', 'part.import');

From e4960c3bb471d572e6883eb8c5a503e3e7c6ccba Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 21:50:53 +0200
Subject: [PATCH 0783/1537] fix a small PHP fail

---
 lib/l10n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index 4acbc5dceb..b21829e91f 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -115,7 +115,7 @@ class OC_L10N{
 			// (Just no need to define date/time format etc. twice)
 			if(file_exists($i18ndir.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
-				include($i18ndir.$lang.'.php');
+				include(strip_tags($i18ndir).strip_tags($lang).'.php');
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
 					$this->translations = $TRANSLATIONS;
 				}

From f8cebed3481d523ff43d438ac97048137f4f9902 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 10:21:38 +0200
Subject: [PATCH 0784/1537] Don't display error messages

---
 lib/l10n.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index b21829e91f..de8514573d 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -113,13 +113,13 @@ class OC_L10N{
 			$i18ndir = self::findI18nDir($app);
 			// Localization is in /l10n, Texts are in $i18ndir
 			// (Just no need to define date/time format etc. twice)
-			if(file_exists($i18ndir.$lang.'.php')){
+			if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
 				include(strip_tags($i18ndir).strip_tags($lang).'.php');
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
 					$this->translations = $TRANSLATIONS;
 				}
-			}
+			} 
 
 			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
 				// Include the file, save the data from $CONFIG

From 90331a3fa1c2bd7c1ec5efb6b9f55d02d1ffe273 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 12:20:43 +0200
Subject: [PATCH 0785/1537] Remove forced download

---
 lib/json.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/json.php b/lib/json.php
index 7cd9ba371d..c49b831c12 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -15,8 +15,6 @@ class OC_JSON{
 		if (!self::$send_content_type_header){
 			// We send json data
 			header( 'Content-Type: '.$type );
-			// Force download
-			header( 'Content-Disposition: attachment' );
 			self::$send_content_type_header = true;
 		}
 	}

From 515adceaceea8de6e3264f17b2fe24419da10959 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 2 Jul 2012 14:03:16 +0200
Subject: [PATCH 0786/1537] LDAP: reset resource on failed bind

check for resource
---
 apps/user_ldap/lib_ldap.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 21c4e57e29..152977ff7f 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -474,17 +474,16 @@ class OC_LDAP {
 
 		// See if we have a resource
 		$link_resource = self::getConnectionResource();
-		if($link_resource)
-		{
+		if(is_resource($link_resource)) {
 			$sr = ldap_search($link_resource, $base, $filter, $attr);
 			$findings = ldap_get_entries($link_resource, $sr );
+
 			// if we're here, probably no connection resource is returned.
 			// to make ownCloud behave nicely, we simply give back an empty array.
 			if(is_null($findings)) {
 				return array();
 			}
-		} else
-		{
+		} else {
 			// Seems like we didn't find any resource.
 			// Return an empty array just like before.
 			return array();
@@ -690,6 +689,7 @@ class OC_LDAP {
 			$ldapLogin = @ldap_bind(self::$ldapConnectionRes, self::$ldapAgentName, self::$ldapAgentPassword );
 			if(!$ldapLogin) {
 				OCP\Util::writeLog('ldap', 'Bind failed: ' . ldap_errno(self::$ldapConnectionRes) . ': ' . ldap_error(self::$ldapConnectionRes), OCP\Util::ERROR);
+				self::$ldapConnectionRes = null;
 				return false;
 			}
 		}

From ab036d47645867374cb6f4f2d168f407e96ceda5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 2 Jul 2012 17:52:51 +0200
Subject: [PATCH 0787/1537] webdav client crashes for secure connections if he
 doesn't have the right root certificate for ssl verification. For the moment
 I print at least a useful error message to the OC log and the Apache log

---
 3rdparty/Sabre/DAV/Client.php      | 1 +
 apps/files_external/lib/webdav.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
index a8320dd978..23bd7c0539 100644
--- a/3rdparty/Sabre/DAV/Client.php
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -249,6 +249,7 @@ class Sabre_DAV_Client {
             // Automatically follow redirects
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_MAXREDIRS => 5,
+        	//CURLOPT_SSL_VERIFYPEER	=> false,
         );
 
         switch ($method) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index d0fe2aca85..dda8afe9f2 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -96,6 +96,8 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$responseType=$response["{DAV:}resourcetype"]->resourceType;
 			return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
 		}catch(Exception $e){
+			error_log($e->getMessage());
+			\OCP\Util::writeLog("webdav client", \OCP\Util::sanitizeHTML($e->getMessage()), \OCP\Util::ERROR);
 			return false;
 		}
 	}

From dd56416a39b4ddf1ee550b9e5912bcbe3dc88ad8 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 2 Jul 2012 14:23:13 -0400
Subject: [PATCH 0788/1537] Remove the method getItemsSharedStatuses, it is
 easy enough to just pass the format instead

---
 core/ajax/share.php  |  2 +-
 lib/public/share.php | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index c9bee6a7ed..b1b619e622 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -44,7 +44,7 @@ if (isset($_POST['action'])) {
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
 		case 'getItemsSharedStatuses':
-			$return = OCP\Share::getItemsSharedStatuses($_GET['itemType']);
+			$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getItemShared':
diff --git a/lib/public/share.php b/lib/public/share.php
index 59db104853..f493cc17da 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -106,16 +106,6 @@ class Share {
 		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format);
 	}
 
-	/**
-	* @brief Get the status of each shared item of item type owned by the current user
-	* @param string Item type
-	* @param int Number of items to return (optional) Returns all by default
-	* @return array, item as key with a value of true if item has a private link or false
-	*/
-	public static function getItemsSharedStatuses($itemType, $limit = -1) {
-		return self::getItems($itemType, null, null, null, \OC_User::getUser(), self::FORMAT_STATUSES, $limit);
-	}
-
 	/**
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type

From 52822652bce0466895a6ee139d625439fddc240b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 2 Jul 2012 20:24:26 +0200
Subject: [PATCH 0789/1537] provide multibyte aware helper functions
 mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling
 with UTF 8

---
 lib/helper.php      | 74 ++++++++++++++++++++++++++++++++++++++++++---
 lib/public/util.php | 70 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 126 insertions(+), 18 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index b1d2da1452..0d18098a4e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -41,7 +41,7 @@ class OC_Helper {
 			$app_path = OC_App::getAppPath($app);
 			// Check if the app is in the app folder
 			if( $app_path && file_exists( $app_path.'/'.$file )){
-				if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){	
+				if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){
 					$urlLinkTo =  OC::$WEBROOT . '/?app=' . $app;
 					$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
 				}else{
@@ -379,7 +379,7 @@ class OC_Helper {
 			//trim the character set from the end of the response
 			$mimeType=substr($reply,0,strrpos($reply,' '));
 
-			//trim ; 
+			//trim ;
 			if (strpos($mimeType, ';') !== false) {
 				$mimeType = strstr($mimeType, ';', true);
 			}
@@ -586,11 +586,11 @@ class OC_Helper {
 
 		return $newpath;
 	}
-	
+
 	/*
 	 * checks if $sub is a subdirectory of $parent
-	 * 
-	 * @param $sub 
+	 *
+	 * @param $sub
 	 * @param $parent
 	 * @return bool
 	 */
@@ -620,4 +620,68 @@ class OC_Helper {
 		exit;*/
 		return false;
 	}
+
+	/**
+	* @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+	*
+	* @param $input The array to work on
+	* @param $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+	* @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+	* @return array
+	*
+	* Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+	* based on http://www.php.net/manual/en/function.array-change-key-case.php#107715
+	*
+	*/
+	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8'){
+		$case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
+		$ret = array();
+		foreach ($input as $k => $v) {
+			$ret[mb_convert_case($k, $case, $encoding)] = $v;
+		}
+		return $ret;
+	}
+
+	/**
+	* @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
+	*
+	* @param $input The input string. .Opposite to the PHP build-in function does not accept an array.
+	* @param $replacement The replacement string.
+	* @param $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string.
+	* @param $length Length of the part to be replaced
+	* @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+	* @return string
+	*
+	*/
+	public static function mb_substr_replace($string, $replacement, $start, $length = null, $encoding = 'UTF-8') {
+		$start = intval($start);
+		$length = intval($length);
+		$string = mb_substr($string, 0, $start, $encoding) .
+		          $replacement .
+		          mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding);
+
+		return $string;
+	}
+
+	/**
+	* @brief Replace all occurrences of the search string with the replacement string
+	*
+	* @param $search The value being searched for, otherwise known as the needle. String.
+	* @param $replace The replacement string.
+	* @param $subject The string or array being searched and replaced on, otherwise known as the haystack.
+	* @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+	* @param $count If passed, this will be set to the number of replacements performed.
+	* @return string
+	*
+	*/
+	public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
+		$offset = -1;
+		$length = mb_strlen($search, 'UTF-8');
+		while(($i = mb_strrpos($subject, $search, $offset, 'UTF-8'))) {
+			$subject = OC_Helper::mb_substr_replace($subject, $replace, $i, $length);
+			$offset = $i - mb_strlen($subject, 'UTF-8') - 1;
+			$count++;
+		}
+		return $subject;
+	}
 }
diff --git a/lib/public/util.php b/lib/public/util.php
index c611d59a53..4112109154 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
@@ -54,7 +54,7 @@ class Util {
 
 
 	/**
-	 * @brief send an email 
+	 * @brief send an email
 	 * @param string $toaddress
 	 * @param string $toname
 	 * @param string $subject
@@ -264,17 +264,61 @@ class Util {
 	public static function callCheck(){
 		return(\OC_Util::callCheck());
 	}
-	
-	/**
-	 * @brief Used to sanitize HTML
-	 *
-	 * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page.
-	 *
-	 * @param string or array of strings
-	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
-	 */
-	public static function sanitizeHTML( $value ){
-		return(\OC_Util::sanitizeHTML($value));
+
+	/**
+	 * @brief Used to sanitize HTML
+	 *
+	 * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page.
+	 *
+	 * @param string or array of strings
+	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+	 */
+	public static function sanitizeHTML( $value ){
+		return(\OC_Util::sanitizeHTML($value));
+	}
+
+	/**
+	* @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+	*
+	* @param $input The array to work on
+	* @param $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+	* @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+	* @return array
+	*
+	*
+	*/
+	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8'){
+		return(\OC_Helper::mb_array_change_key_case($input, $case, $encoding));
+	}
+
+	/**
+	* @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
+	*
+	* @param $input The input string. .Opposite to the PHP build-in function does not accept an array.
+	* @param $replacement The replacement string.
+	* @param $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string.
+	* @param $length Length of the part to be replaced
+	* @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+	* @return string
+	*
+	*/
+	public static function mb_substr_replace($string, $replacement, $start, $length = null, $encoding = 'UTF-8') {
+		return(\OC_Helper::mb_substr_replace($string, $replacement, $start, $length, $encoding));
+	}
+
+	/**
+	* @brief Replace all occurrences of the search string with the replacement string
+	*
+	* @param $search The value being searched for, otherwise known as the needle. String.
+	* @param $replace The replacement string.
+	* @param $subject The string or array being searched and replaced on, otherwise known as the haystack.
+	* @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+	* @param $count If passed, this will be set to the number of replacements performed.
+	* @return string
+	*
+	*/
+	public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
+		return(\OC_Helper::mb_str_replace($search, $replace, $subject, $encoding, $count));
 	}
 }
 

From 0a6f7b33c3b5e0552c041f3d529f577c0b392f40 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 2 Jul 2012 20:31:07 +0200
Subject: [PATCH 0790/1537] LDAP: make it UTF-8 save

---
 apps/user_ldap/appinfo/update.php | 18 ++++++++++++++++++
 apps/user_ldap/appinfo/version    |  2 +-
 apps/user_ldap/group_ldap.php     |  2 +-
 apps/user_ldap/lib_ldap.php       | 30 +++++++++++++++---------------
 apps/user_ldap/user_ldap.php      |  2 +-
 5 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index dc437ce21c..badceb378d 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -31,3 +31,21 @@ if($state == 'doCheck'){
 		OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
 	}
 }
+
+
+//from version 0.2 to 0.2.1
+$objects = array('user', 'group');
+
+foreach($objects as $object) {
+	$fetchDNSql = 'SELECT ldap_dn from *PREFIX*ldap_'.$object.'_mapping';
+	$updateSql = 'UPDATE *PREFIX*ldap_'.$object.'_mapping SET ldap_DN = ? WHERE ldap_dn = ?';
+
+	$query = OCP\DB::prepare($fetchDNSql);
+	$res = $query->execute();
+	$DNs = $res->fetchAll();
+	$updateQuery = OCP\DB::prepare($updateSql);
+	foreach($DNs as $dn) {
+		$newDN = mb_strtolower($dn['ldap_dn'], 'UTF-8');
+		$updateQuery->execute(array($newDN, $dn['ldap_dn']));
+	}
+}
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 2f4536184b..5f021e960e 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.2
\ No newline at end of file
+0.2.0.5
\ No newline at end of file
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index a3117b5a41..d438c7d84d 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -158,7 +158,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		$isMemberUid = (strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid');
 		foreach($members as $member) {
 			if($isMemberUid) {
-				$filter = str_replace('%uid', $member, OC_LDAP::conf('ldapLoginFilter'));
+				$filter = OCP\Util::mb_str_replace('%uid', $member, OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
 				$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
 				if(count($ldap_users) < 1) {
 					continue;
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 152977ff7f..08b09304d7 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -171,7 +171,7 @@ class OC_LDAP {
 	 * returns the internal ownCloud name for the given LDAP DN of the group
 	 */
 	static public function dn2groupname($dn, $ldapname = null) {
-		if(strripos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
+		if(mb_strripos($dn, self::$ldapBaseGroups, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen(self::$ldapBaseGroups, 'UTF-8'))) {
 			return false;
 		}
 		return self::dn2ocname($dn, $ldapname, false);
@@ -186,7 +186,7 @@ class OC_LDAP {
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
 	 */
 	static public function dn2username($dn, $ldapname = null) {
-		if(strripos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
+		if(mb_strripos($dn, self::$ldapBaseUsers, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen(self::$ldapBaseUsers, 'UTF-8'))) {
 			return false;
 		}
 		return self::dn2ocname($dn, $ldapname, true);
@@ -304,7 +304,7 @@ class OC_LDAP {
 	 */
 	static private function alternateOwnCloudName($name, $dn) {
 		$ufn = ldap_dn2ufn($dn);
-		$name = $name . '@' . trim(substr_replace($ufn, '', 0, strpos($ufn, ',')));
+		$name = $name . '@' . trim(OCP\Util::mb_substr_replace($ufn, '', 0, mb_strpos($ufn, ',', 0, 'UTF-8'), 'UTF-8'));
 		$name = self::sanitizeUsername($name);
 		return $name;
 	}
@@ -419,8 +419,8 @@ class OC_LDAP {
 		$rr = ldap_read($cr, $dn, 'objectClass=*', array($attr));
 		$er = ldap_first_entry($cr, $rr);
 		//LDAP attributes are not case sensitive
-		$result = array_change_key_case(ldap_get_attributes($cr, $er));
-		$attr = strtolower($attr);
+		$result = OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
+		$attr = mb_strtolower($attr, 'UTF-8');
 
 		if(isset($result[$attr]) && $result[$attr]['count'] > 0){
 			$values = array();
@@ -469,7 +469,7 @@ class OC_LDAP {
 	 */
 	static private function search($filter, $base, $attr = null) {
 		if(!is_null($attr) && !is_array($attr)) {
-			$attr = array(strtolower($attr));
+			$attr = array(mb_strtolower($attr, 'UTF-8'));
 		}
 
 		// See if we have a resource
@@ -500,11 +500,11 @@ class OC_LDAP {
 				if(!is_array($item)) {
 					continue;
 				}
-				$item = array_change_key_case($item);
+				$item = OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8');
 
 				if($multiarray) {
 					foreach($attr as $key) {
-						$key = strtolower($key);
+						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
 							if($key != 'dn'){
 								$selection[$i][$key] = self::resemblesDN($key) ? self::sanitizeDN($item[$key][0]) : $item[$key][0];
@@ -517,7 +517,7 @@ class OC_LDAP {
 					$i++;
 				} else {
 					//tribute to case insensitivity
-					$key = strtolower($attr[0]);
+					$key = mb_strtolower($attr[0], 'UTF-8');
 
 					if(isset($item[$key])) {
 						if(self::resemblesDN($key)) {
@@ -546,10 +546,10 @@ class OC_LDAP {
 
 	static private function sanitizeDN($dn) {
 		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
-		$dn = preg_replace('/([^\\\]),(\s+)/','\1,',$dn);
+		$dn = preg_replace('/([^\\\]),(\s+)/u','\1,',$dn);
 
 		//make comparisons and everything work
-		$dn = strtolower($dn);
+		$dn = mb_strtolower($dn, 'UTF-8');
 
 		return $dn;
 	}
@@ -560,10 +560,10 @@ class OC_LDAP {
 		}
 
 		//REPLACEMENTS
-		$name = str_replace(' ', '_', $name);
+		$name = OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
 
 		//every remaining unallowed characters will be removed
-		$name = preg_replace('/[^a-zA-Z0-9_.@-]/', '', $name);
+		$name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name);
 
 		return $name;
 	}
@@ -637,10 +637,10 @@ class OC_LDAP {
 			self::$ldapBaseGroups        = OCP\Config::getAppValue('user_ldap', 'ldap_base_groups', self::$ldapBase);
 			self::$ldapTLS               = OCP\Config::getAppValue('user_ldap', 'ldap_tls',0);
 			self::$ldapNoCase            = OCP\Config::getAppValue('user_ldap', 'ldap_nocase', 0);
-			self::$ldapUserDisplayName   = strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_display_name', 'uid'));
+			self::$ldapUserDisplayName   = mb_strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_display_name', 'uid'), 'UTF-8');
 			self::$ldapUserFilter        = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter','objectClass=person');
 			self::$ldapLoginFilter       = OCP\Config::getAppValue('user_ldap', 'ldap_login_filter', '(uid=%uid)');
-			self::$ldapGroupDisplayName  = strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR));
+			self::$ldapGroupDisplayName  = mb_strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR), 'UTF-8');
 			self::$ldapIgnoreNamingRules = OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
 
 			if(empty(self::$ldapBaseUsers)) {
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 85b3d88973..b51d9a55cc 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -84,7 +84,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 	 */
 	public function checkPassword($uid, $password){
 		//find out dn of the user name
-		$filter = str_replace('%uid', $uid, OC_LDAP::conf('ldapLoginFilter'));
+		$filter = OCP\Util::mb_str_replace('%uid', $uid, OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
 		$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
 		if(count($ldap_users) < 1) {
 			return false;

From 88cbbc86b84984946b80f6dd18e5a6a88b47f936 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Jul 2012 19:06:40 +0000
Subject: [PATCH 0791/1537] Text editor: Always use UTF-8 to keep Ace happy.

---
 apps/files_texteditor/ajax/loadfile.php | 1 +
 apps/files_texteditor/ajax/savefile.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php
index c263306e71..5a5affa46b 100644
--- a/apps/files_texteditor/ajax/loadfile.php
+++ b/apps/files_texteditor/ajax/loadfile.php
@@ -43,6 +43,7 @@ if(!empty($filename))
 	{
 		$mtime = OC_Filesystem::filemtime($path);
 		$filecontents = OC_Filesystem::file_get_contents($path);
+		$filecontents = iconv(mb_detect_encoding($filecontents), "UTF-8", $filecontents);
 		OCP\JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'false', 'mtime' => $mtime)));	
 	}	
 } else {
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index f789112d7d..961db7105e 100644
--- a/apps/files_texteditor/ajax/savefile.php
+++ b/apps/files_texteditor/ajax/savefile.php
@@ -48,6 +48,7 @@ if($path != '' && $mtime != '' && $filecontents)
 		// Save file
 		if(OC_Filesystem::is_writable($path))
 		{
+			$filecontents = iconv(mb_detect_encoding($filecontents), "UTF-8", $filecontents);
 			OC_Filesystem::file_put_contents($path, $filecontents);
 			// Clear statcache
 			clearstatcache();

From 77b582e4e6629d228344e11a24954507f8854979 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 2 Jul 2012 15:29:34 -0400
Subject: [PATCH 0792/1537] Change getItems() return to a 3-dimensional array
 to handle multiple shares of the same item

---
 apps/contacts/lib/share.php | 19 ++++++++++++-------
 lib/public/share.php        | 38 +++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/apps/contacts/lib/share.php b/apps/contacts/lib/share.php
index aa1f70be73..44b7e8c064 100644
--- a/apps/contacts/lib/share.php
+++ b/apps/contacts/lib/share.php
@@ -54,19 +54,24 @@ class OC_Contacts_Share extends OCP\Share_Backend {
 
 	/**
 	* @brief Converts the shared item sources back into the item in the specified format
-	* @param array Sources of shared items
-	* @param int Format 
+	* @param array Shared items
+	* @param int Format
 	* @return ?
-	* 
-	* The items array is formatted with the sources as the keys to an array with the following keys: item_target, permissions, stime
+	*
+	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
+	* The key/value pairs included in the share info depend on the function originally called:
+	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
+	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
 	* This function allows the backend to control the output of shared items with custom formats.
-	* It is only called through calls to the public getItem(s)SharedWith functions.
+	* It is only called through calls to the public getItem(s)Shared(With) functions.
 	*/
 	public function formatItems($items, $format) {
 		$addressbooks = array();
-		foreach($items as $source => $info) {
+		foreach ($items as $source => $shares) {
 			$addressbook = OC_Contacts_Addressbook::find( $source );
-			$addressbook['displayname'] = $info['item_target'];
+			foreach ($shares as $info) {
+				$addressbook['displayname'] = $info['item_target'];
+			}
 			$addressbooks[] = $addressbook;
 		}
 		return $addressbooks;
diff --git a/lib/public/share.php b/lib/public/share.php
index f493cc17da..6c82e01b1e 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -444,9 +444,13 @@ class Share {
 				$where .= ' LIMIT '.$limit;
 			}
 			if ($format == self::FORMAT_STATUSES) {
-				$select = 'item, share_type';
+				$select = 'id, item_type, item, item_source, share_type';
 			} else {
-				$select = '*';
+				if (isset($uidOwner)) {
+					$select = 'id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source';
+				} else {
+					$select = 'id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target';
+				}
 			}
 			$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
 			$result = $query->execute();
@@ -455,29 +459,32 @@ class Share {
 				// Filter out duplicate group shares for users with unique targets
 				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
 					// Group shares should already be in the items array
-					unset($items[$item['parent']]);
+					unset($items[$item['item_source']][$item['parent']]);
 				}
 				// TODO Add in parent item types children?
 				if ($parents && in_array($item['item_type'], $parents)) {
 					$children[] = $item;
 				}
-				$items[$item['id']] = $item;
+				$items[$item['item_source']][$item['id']] = $item;
 			}
 			if (!empty($items)) {
 				if ($format == self::FORMAT_NONE) {
 					if ($limit == 1) {
-						// Return just the item instead of 2-dimensional array
-						return $items[key($items)];
+						// Return just the item instead of 3-dimensional array
+						return $item;
 					}
 					return $items;
 				} else if ($format == self::FORMAT_STATUSES) {
 					$statuses = array();
-					foreach ($items as $item) {
-						if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
-							$statuses[$item['item']] = true;
-						} else if (!isset($statuses[$item['item']])) {
-							$statuses[$item['item']] = false;
+					foreach ($items as $shares) {
+						foreach ($shares as $info) {
+							if ($info['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
+								$statuses[$info['item']] = true;
+							} else if (!isset($statuses[$info['item']])) {
+								$statuses[$info['item']] = false;
+							}
 						}
+						
 					}
 					return $statuses;
 				} else {
@@ -713,13 +720,16 @@ abstract class Share_Backend {
 
 	/**
 	* @brief Converts the shared item sources back into the item in the specified format
-	* @param array Sources of shared items
+	* @param array Shared items
 	* @param int Format 
 	* @return ?
 	* 
-	* The items array is formatted with the sources as the keys to an array with the following keys: item_target, permissions, stime
+	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
+	* The key/value pairs included in the share info depend on the function originally called: 
+	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
+	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
 	* This function allows the backend to control the output of shared items with custom formats.
-	* It is only called through calls to the public getItem(s)SharedWith functions.
+	* It is only called through calls to the public getItem(s)Shared(With) functions.
 	*/
 	public abstract function formatItems($items, $format);
 

From 8a1c27918319a96a5e801b1e945eb0fce5b489af Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Tue, 3 Jul 2012 09:20:42 +0200
Subject: [PATCH 0793/1537] Escape pg connection string on setup

---
 lib/setup.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index 5387a0ef49..bad0f5301c 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -155,8 +155,11 @@ class OC_Setup {
 				OC_CONFIG::setValue('dbhost', $dbhost);
 				OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
 
+				$e_host = addslashes($dbhost);
+				$e_user = addslashes($dbuser);
+				$e_password = addslashes($dbpass);
 				//check if the database user has admin right
-				$connection_string = "host=$dbhost dbname=postgres user=$dbuser password=$dbpass";
+				$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
 				$connection = @pg_connect($connection_string);
 				if(!$connection) {
 					$error[] = array(
@@ -166,8 +169,9 @@ class OC_Setup {
 					return $error;
 				}
 				else {
+					$e_user = pg_escape_string($dbuser);
 					//check for roles creation rights in postgresql
-					$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$dbuser'";
+					$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$e_user'";
 					$result = pg_query($connection, $query);
 					if($result and pg_num_rows($result) > 0) {
 						//use the admin login data for the new database user
@@ -199,7 +203,13 @@ class OC_Setup {
 					// connect to the ownCloud database (dbname=$dbname) an check if it needs to be filled
 					$dbuser = OC_CONFIG::getValue('dbuser');
 					$dbpass = OC_CONFIG::getValue('dbpassword');
-					$connection_string = "host=$dbhost dbname=$dbname user=$dbuser password=$dbpass";
+
+					$e_host = addslashes($dbhost);
+					$e_dbname = addslashes($dbname);
+					$e_user = addslashes($dbuser);
+					$e_password = addslashes($dbpass);
+
+					$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
 					$connection = @pg_connect($connection_string);
 					if(!$connection) {
 						$error[] = array(

From 29a9559fa9df7f08947dabbba270bd97c3419d54 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 3 Jul 2012 13:43:18 +0200
Subject: [PATCH 0794/1537] some work on calendar import dialog

---
 apps/calendar/ajax/import/calendarcheck.php |  18 ++++
 apps/calendar/ajax/import/dropimport.php    |   2 +-
 apps/calendar/ajax/import/import.php        |  10 +-
 apps/calendar/css/import.css                |  12 +++
 apps/calendar/js/loader.js                  | 102 ++++++++++++--------
 apps/calendar/templates/part.import.php     |  58 +++++------
 6 files changed, 132 insertions(+), 70 deletions(-)
 create mode 100644 apps/calendar/ajax/import/calendarcheck.php
 create mode 100644 apps/calendar/css/import.css

diff --git a/apps/calendar/ajax/import/calendarcheck.php b/apps/calendar/ajax/import/calendarcheck.php
new file mode 100644
index 0000000000..a91bab7057
--- /dev/null
+++ b/apps/calendar/ajax/import/calendarcheck.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+OCP\JSON::checkLoggedIn();
+OCP\App::checkAppEnabled('calendar');
+$calname = strip_tags($_POST['calname']);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
+foreach($calendars as $calendar){
+	if($calendar['displayname'] == $calname){
+		OCP\JSON::success(array('message'=>'exists'));
+		exit;
+	}
+}
+OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index b58b3f91cc..f46e731409 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -26,7 +26,7 @@ $import->import();
 $count = $import->getCount();
 if($count == 0){
 	OC_Calendar_Calendar::deleteCalendar($newid);
-	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your account')));
+	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your calendar.')));
 }else{
 	OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' . $newcalendarname, 'eventSource'=>OC_Calendar_Calendar::getEventSourceInfo(OC_Calendar_Calendar::find($newid))));
 }
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 210bcb34d2..b251c94f4f 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -32,7 +32,7 @@ if($_POST['method'] == 'new'){
 		$newcal = true;
 	}
 	if($newcal){
-		$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), strip_tags($_POST['calname'],'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor()));
+		$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), strip_tags($_POST['calname']),'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
 		OC_Calendar_Calendar::setCalendarActive($id, 1);
 	}
 }else{
@@ -50,9 +50,13 @@ if($count == 0){
 	if($newcal){
 		OC_Calendar_Calendar::deleteCalendar($id);
 	}
-	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your account')));
+	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your calendar.')));
 }else{
-		OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' . $newcalendarname));
+	if($newcal){
+		OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' .  strip_tags($_POST['calname'])));
+	}else{
+		OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in your calendar')));
+	}
 }
 /*		//////////////////////////// Attention: following code is quite painfull !!! ///////////////////////
 writeProgress('20');
diff --git a/apps/calendar/css/import.css b/apps/calendar/css/import.css
new file mode 100644
index 0000000000..d60d54253a
--- /dev/null
+++ b/apps/calendar/css/import.css
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+#calendar_import_newcalform, #calendar_import_mergewarning, #calendar_import_process, #calendar_import_done{display:none;}
+#calendar_import_process_message, #calendar_import_status, #calendar_import_form_message, #calendar_import_mergewarning{text-align:center;}
+#calendar_import_form_message{font-weight: bold;}
+#calendar_import_newcalendar{width:480px;}
+.calendar_import_warning{background-color: rgba(216,22,22,0.7);}
+.calendar_import_revertwarning{background-color: #ffffff;}
\ No newline at end of file
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index f54e3fa262..9f18ea8726 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -13,9 +13,10 @@ Calendar_Import={
 		calname: '',
 		progresskey: '',
 		percentage: 0
-	}
+	},
 	Dialog:{
 		open: function(filename){
+			OC.addStyle('calendar', 'import');
 			Calendar_Import.Store.file = filename;
 			Calendar_Import.Store.path = $('#dir').val();
 			$('body').append('<div id="calendar_import"></div>');
@@ -24,8 +25,9 @@ Calendar_Import={
 			});
 		},
 		close: function(){
+			Calendar_Import.reset();
 			$(this).dialog('destroy').remove();
-			$('#calendar_import').remove();
+			$('#calendar_import_dialog').remove();
 		},
 		init: function(){
 			//init dialog
@@ -36,25 +38,36 @@ Calendar_Import={
 				}
 			});
 			//init buttons
-			$('#import_done_button').click(function(){
-				Calendar_Import.closedialog();
+			$('#calendar_import_done').click(function(){
+				Calendar_Import.Dialog.close();
 			});
-			$('#startimport').click(function(){
-				Calendar_import.Core.process();
-			}
-			$('#calendar').change(function(){
-				if($('#calendar option:selected').val() == 'newcal'){
-					$('#newcalform').slideDown('slow');
+			$('#calendar_import_submit').click(function(){
+				Calendar_Import.Core.process();
+			});
+			$('#calendar_import_calendar').change(function(){
+				if($('#calendar_import_calendar option:selected').val() == 'newcal'){
+					$('#calendar_import_newcalform').slideDown('slow');
+					Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
 				}else{
-					$('#newcalform').slideUp('slow');
+					$('#calendar_import_newcalform').slideUp('slow');
+					$('#calendar_import_mergewarning').slideUp('slow');
 				}
 			});
+			$('#calendar_import_newcalendar').keyup(function(){
+				Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
+			});
 			//init progressbar
-			$('#progressbar').progressbar({value: Calendar_Import.Store.percentage});
-			Calendar_Import.Store.progresskey = $('#progresskey').val();
+			$('#calendar_import_progressbar').progressbar({value: Calendar_Import.Store.percentage});
+			Calendar_Import.Store.progresskey = $('#calendar_import_progresskey').val();
 		},
-		mergewarning: function(){
-			
+		mergewarning: function(newcalname){
+			$.post(OC.filePath('calendar', 'ajax/import', 'calendarcheck.php'), {calname: newcalname}, function(data){
+				if(data.message == 'exists'){
+					$('#calendar_import_mergewarning').slideDown('slow');
+				}else{
+					$('#calendar_import_mergewarning').slideUp('slow');
+				}
+			});
 		},
 		update: function(){
 			/*$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progress:1,progresskey: progresskey}, function(percent){
@@ -67,28 +80,35 @@ Calendar_Import={
 			});*/
 		return 0;
 		},
-		warning: function(validation){
-			
+		warning: function(selector){
+			$(selector).css('background-color', '#FF2626');
+			$(selector).focus(function(){
+				$(selector).css('background-color', '#F8F8F8');
+			});
 		}
 	},
 	Core:{
 		process: function(){
-			var validation = Calendar.Core.prepare();
+			var validation = Calendar_Import.Core.prepare();
+			$('#calendar_import_form').css('display', 'none');
+			$('#calendar_import_process').css('display', 'block');
 			if(validation){
-				$('#newcalendar').attr('readonly', 'readonly');
-				$('#calendar').attr('disabled', 'disabled');
-				Calendar.Core.send();
-			}else{
-				Calendar.Dialog.warning(validation);
+				$('#calendar_import_newcalendar').attr('readonly', 'readonly');
+				$('#calendar_import_calendar').attr('disabled', 'disabled');
+				Calendar_Import.Core.send();
 			}
 		},
 		send: function(){
 			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), 
-			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.filename), id: String (Calendar_Import.Store.calid)}, function(data){
+			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.file), id: String (Calendar_Import.Store.id)}, function(data){
 				if(data.status == 'success'){
-					$('#progressbar').progressbar('option', 'value', 100);
-					$('#import_done').css('display', 'block');
-					$('#status').html(data.message);
+					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
+					$('#calendar_import_done').css('display', 'block');
+					$('#calendar_import_status').html(data.message);
+				}else{
+					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
+					$("#calendar_import_progressbar > div").css('background-color', '#FF2626');
+					$('#calendar_import_status').html(data.message);
 				}
 			});
 			$('#form_container').css('display', 'none');
@@ -96,27 +116,33 @@ Calendar_Import={
 			window.setTimeout('Calendar_Import.Dialog.update', 500);
 		},
 		prepare: function(){
-			Calendar_Import.Store.id = $('#calendar option:selected').val();
-			if($('#calendar option:selected').val() == 'newcal'){
+			Calendar_Import.Store.id = $('#calendar_import_calendar option:selected').val();
+			if($('#calendar_import_calendar option:selected').val() == 'newcal'){
 				Calendar_Import.Store.method = 'new';
-				Calendar_Import.Store.calname = $.trim($('#newcalendar').val());
+				Calendar_Import.Store.calname = $.trim($('#calendar_import_newcalendar').val());
 				if(Calendar_Import.Store.calname == ''){
-					$('#newcalendar').css('background-color', '#FF2626');
-					$('#newcalendar').focus(function(){
-						$('#newcalendar').css('background-color', '#F8F8F8');
-					});
+					Calendar_Import.Dialog.warning('#calendar_import_newcalendar');
 					return false;
 				}
 			}else{
-				var method = 'old';
+				Calendar_Import.Store.method = 'old';
 			}
-			
+			return true;
 		}
+	},
+	reset: function(){
+		Calendar_Import.Store.file = '';
+		Calendar_Import.Store.path = '';
+		Calendar_Import.Store.id = 0;
+		Calendar_Import.Store.method = '';
+		Calendar_Import.Store.calname = '';
+		Calendar_Import.Store.progresskey = '';
+		Calendar_Import.Store.percentage = 0;
 	}
 }
 $(document).ready(function(){
 	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/calendar','importcal', '', Calendar_Import.importdialog); 
-		FileActions.setDefault('text/calendar','importcal');
+		FileActions.register('text/calendar','importCalendar', '', Calendar_Import.Dialog.open); 
+		FileActions.setDefault('text/calendar','importCalendar');
 	};
 });
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index 2a3ca9dae9..c7156c79d7 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -7,37 +7,39 @@ if(!$file){
 $import = new OC_Calendar_Import($file);
 $newcalendarname = strip_tags($import->createCalendarName());
 $guessedcalendarname = $import->guessCalendarName();
-?>
-<div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file");?>">
-<div id="form_container">
-<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
-<input type="hidden" id="path" value="<?php echo $_['path'];?>">
-<input type="hidden" id="progresskey" value="<?php echo rand() ?>">
-<p style="text-align:center;"><b><?php echo $l->t('Please choose a calendar'); ?></b></p>
-<select style="width:100%;" id="calendar" name="calendar">
-<?php
+//loading calendars for select box
 $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
 $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
-for($i = 0;$i<count($calendar_options);$i++){
-	$calendar_options[$i]['displayname'] = $calendar_options[$i]['displayname'];
-}
-echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 ?>
-</select>
-<div id="newcalform" style="display: none;">
-	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new calendar'); ?>" id="newcalendar" name="newcalendar" value="<?php echo $newcalendarname ?>">
-</div>
-<div id="namealreadyused" style="display: none;text-align:center;">
-	<span class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></span>
-</div>
-<input type="button" value="<?php echo $l->t("Import") . ' ' . $_['filename']; ?>!" id="startimport">
-</div>
-<div id="progressbar_container" style="display: none">
-<p style="text-align:center;"><b><?php echo $l->t('Importing calendar'); ?></b></p>
-<div id="progressbar"></div>
-<div id="import_done" style="display: none;">
-<p style="text-align:center;"><b><?php echo $l->t('Calendar imported successfully'); ?></b></p>
-<input type="button" value="<?php echo $l->t('Close Dialog'); ?>" id="import_done_button">
+<div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file");?>">
+<div id="calendar_import_form">
+	<form>
+		<input type="hidden" id="calendar_import_filename" value="<?php echo $_['filename'];?>">
+		<input type="hidden" id="calendar_import_path" value="<?php echo $_['path'];?>">
+		<input type="hidden" id="calendar_import_progresskey" value="<?php echo rand() ?>">
+		<span id="calendar_import_form_message"><?php echo $l->t('Please choose a calendar'); ?></span>
+		<select style="width:100%;" id="calendar_import_calendar" name="calendar_import_calendar">
+		<?php
+		for($i = 0;$i<count($calendar_options);$i++){
+			$calendar_options[$i]['displayname'] = $calendar_options[$i]['displayname'];
+		}
+		echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
+		?>
+		</select>
+		<div id="calendar_import_newcalform">
+			<input id="calendar_import_newcalendar"  type="text" placeholder="<?php echo $l->t('Name of new calendar'); ?>" value="<?php echo $newcalendarname ?>"><br>
+			<!--<input id="calendar_import_generatename" type="button" class="button" value="<?php echo $l->t('Take an available name!'); ?>"><br>-->
+			<span  id="calendar_import_mergewarning" class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></span>
+		</div>
+		<input id="calendar_import_submit" type="button" class="button" value="&raquo; <?php echo $l->t('Import'); ?> &raquo;" id="startimport">
+	<form>
 </div>
+<div id="calendar_import_process">
+	<span id="calendar_import_process_message"></span>
+	<div  id="calendar_import_progressbar"></div>
+	<br>
+	<div id="calendar_import_status" class="hint"></div>
+	<br>
+	<input id="calendar_import_done" type="button" value="<?php echo $l->t('Close Dialog'); ?>">
 </div>
 </div>
\ No newline at end of file

From ca2b1f78630257ff4a2beadb5e25d628e5195bb0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 3 Jul 2012 13:55:48 +0200
Subject: [PATCH 0795/1537] fix encoding fail in calendar app - bugfix for
 oc-1194

---
 apps/calendar/js/calendar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index e17f88e38b..b7f355a1b8 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -870,7 +870,7 @@ $(document).ready(function(){
 		eventDrop: Calendar.UI.moveEvent,
 		eventResize: Calendar.UI.resizeEvent,
 		eventRender: function(event, element) {
-			element.find('.fc-event-title').html(element.find('.fc-event-title').html());
+			element.find('.fc-event-title').html(element.find('.fc-event-title').text());
 			element.tipsy({
 				className: 'tipsy-event',
 				opacity: 0.9,

From 4bc9e4e012fa0ee4300ec26d020d2b27b032ff6a Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 3 Jul 2012 16:43:57 +0200
Subject: [PATCH 0796/1537] wrong var name fixed

---
 lib/filesystemview.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 99e08c50e7..d474b61b98 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -276,7 +276,7 @@ class OC_FilesystemView {
 				}else{
 					$source=$this->fopen($path1,'r');
 					$target=$this->fopen($path2,'w');
-					$count=OC_Helper::streamCopy($data,$target);
+					$count=OC_Helper::streamCopy($source,$target);
 					$storage1=$this->getStorage($path1);
 					$storage1->unlink($this->getInternalPath($path1));
 					$result=$count>0;
@@ -314,7 +314,7 @@ class OC_FilesystemView {
 				}else{
 					$source=$this->fopen($path1,'r');
 					$target=$this->fopen($path2,'w');
-					$count=OC_Helper::streamCopy($data,$target);
+					$count=OC_Helper::streamCopy($source,$target);
 				}
         OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2));
 				if(!$exists){

From b6cff93254176b9a8a88cd0e6c8a29c70d1eac20 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 3 Jul 2012 16:47:46 +0200
Subject: [PATCH 0797/1537] fix spelling fail in code

---
 apps/calendar/ajax/import/import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index b251c94f4f..63f761dd27 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -24,7 +24,7 @@ $newcal = false;
 if($_POST['method'] == 'new'){
 	$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
 	foreach($calendars as $calendar){
-		if($calendar['dispalyname'] == $_POST['calname']){
+		if($calendar['displayname'] == $_POST['calname']){
 			$id = $calendar['id'];
 			$newcal = false;
 			break;

From 4185bd629259bfb0618143d0474e192e969daf96 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 3 Jul 2012 11:11:01 -0400
Subject: [PATCH 0798/1537] Load shared addressbooks inside
 OC_Contacts_Addressbook instead of the index, add public functions
 getItemShared(With)BySource() for contacts app

---
 apps/contacts/index.php           |  1 -
 apps/contacts/lib/addressbook.php |  2 +-
 apps/contacts/lib/app.php         |  2 +-
 lib/public/share.php              | 55 ++++++++++++++++++++++++-------
 4 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index e72d2917ea..0b4f89b30c 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -20,7 +20,6 @@ if($contacts === false) {
 }
 
 $addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
-$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Contacts_Share::FORMAT_ADDRESSBOOKS));
 
 // Load the files we need
 OCP\App::setActiveNavigationEntry( 'contacts_index' );
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 86a41b18cf..afbf1d5920 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -58,7 +58,7 @@ class OC_Contacts_Addressbook{
 		while( $row = $result->fetchRow()){
 			$addressbooks[] = $row;
 		}
-
+		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Contacts_Share::FORMAT_ADDRESSBOOKS));
 		return $addressbooks;
 	}
 
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 29428763d6..ce66624c8f 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -24,7 +24,7 @@ class OC_Contacts_App {
 
 	public static function getAddressbook($id) {
 		$addressbook = OC_Contacts_Addressbook::find( $id );
-		if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
+		if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser() && !OCP\Share::getItemSharedWithBySource('addressbook', $id)) {
 			if ($addressbook === false) {
 				OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR);
 				OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.'))));
diff --git a/lib/public/share.php b/lib/public/share.php
index 6c82e01b1e..425824fcd7 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -84,6 +84,17 @@ class Share {
 		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, 1);
 	}
 
+	/**
+	* @brief Get the item of item type shared with the current user by source
+	* @param string Item type
+	* @param string Item source
+	* @param int Format (optional) Format type must be defined by the backend
+	* @return Return depends on format
+	*/
+	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE) {
+		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, 1, true);
+	}
+
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
@@ -106,6 +117,17 @@ class Share {
 		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format);
 	}
 
+	/**
+	* @brief Get the shared item of item type owned by the current user by source
+	* @param string Item type
+	* @param string Item source
+	* @param int Format (optional) Format type must be defined by the backend
+	* @return Return depends on format
+	*/
+	public static function getItemSharedBySource($itemType, $item, $format = self::FORMAT_NONE) {
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, -1, true);
+	}
+
 	/**
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
@@ -378,7 +400,7 @@ class Share {
 	* See public functions getItem(s)... for parameter usage
 	*
 	*/
-	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $limit = -1) {
+	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $limit = -1, $isSource = false) {
 		if ($backend = self::getBackend($itemType)) {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
 			if (isset($itemType)) {
@@ -427,11 +449,19 @@ class Share {
 						$where .= " AND item_source = '".$itemSource."'";
 					}
 				} else {
-					if ($itemType == 'file' && substr($item, -1) == '/') {
-						// Special case to select only the shared files inside the folder
-						$where .= " AND file_target LIKE '".$item."%/'";
+					if ($isSource) {
+						if ($itemType == 'file') {
+							$where .= " AND file_source = '".$item."'";
+						} else {
+							$where .= " AND item_source = '".$item."'";
+						}
 					} else {
-						$where .= " AND item_target = '".$item."'";
+						if ($itemType == 'file' && substr($item, -1) == '/') {
+							// Special case to select only the shared files inside the folder
+							$where .= " AND file_target LIKE '".$item."%/'";
+						} else {
+							$where .= " AND item_target = '".$item."'";
+						}
 					}
 				}
 			}
@@ -456,23 +486,23 @@ class Share {
 			$result = $query->execute();
 			$items = array();
 			while ($item = $result->fetchRow()) {
+				if ($limit == 1) {
+					// Return just the item instead of 3-dimensional array
+					return $item;
+				}
 				// Filter out duplicate group shares for users with unique targets
 				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
-					// Group shares should already be in the items array
+					// Remove the parent group share
 					unset($items[$item['item_source']][$item['parent']]);
 				}
+				$items[$item['item_source']][$item['id']] = $item;
 				// TODO Add in parent item types children?
 				if ($parents && in_array($item['item_type'], $parents)) {
 					$children[] = $item;
 				}
-				$items[$item['item_source']][$item['id']] = $item;
 			}
 			if (!empty($items)) {
 				if ($format == self::FORMAT_NONE) {
-					if ($limit == 1) {
-						// Return just the item instead of 3-dimensional array
-						return $item;
-					}
 					return $items;
 				} else if ($format == self::FORMAT_STATUSES) {
 					$statuses = array();
@@ -480,6 +510,7 @@ class Share {
 						foreach ($shares as $info) {
 							if ($info['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
 								$statuses[$info['item']] = true;
+								break;
 							} else if (!isset($statuses[$info['item']])) {
 								$statuses[$info['item']] = false;
 							}
@@ -490,6 +521,8 @@ class Share {
 				} else {
 					return $backend->formatItems($items, $format);
 				}
+			} else if ($limit == 1) {
+				return false;
 			}
 		}
 		return array();

From 1e36e1f2cb72298cebda693aa1452ec569250757 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 3 Jul 2012 11:36:57 -0400
Subject: [PATCH 0799/1537] Use formatted shared addressbook in all cases,
 addressbooks out of order now

---
 apps/contacts/lib/addressbook.php | 13 ++++++++++++-
 apps/contacts/lib/app.php         | 16 +++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index afbf1d5920..4f00ce1f9e 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -235,6 +235,7 @@ class OC_Contacts_Addressbook{
 			$uid = OCP\USER::getUser();
 		}
 		$active = self::activeIds($uid);
+		$shared = OCP\Share::getItemsSharedWith('addressbook', OC_Contacts_Share::FORMAT_ADDRESSBOOKS);
 		$addressbooks = array();
 		$ids_sql = join(',', array_fill(0, count($active), '?'));
 		$prep = 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN ('.$ids_sql.') ORDER BY displayname';
@@ -249,7 +250,17 @@ class OC_Contacts_Addressbook{
 		}
 
 		while( $row = $result->fetchRow()){
-			$addressbooks[] = $row;
+			// Insert formatted shared addressbook instead
+			if ($row['userid'] != $uid) {
+				foreach ($shared as $addressbook) {
+					if ($addressbook['id'] == $row['id']) {
+						$addressbooks[] = $addressbook;
+						break;
+					}
+				}
+			} else {
+				$addressbooks[] = $row;
+			}
 		}
 		if(!count($addressbooks)) {
 			self::addDefault($uid);
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index ce66624c8f..3b16ffd5c1 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -24,16 +24,18 @@ class OC_Contacts_App {
 
 	public static function getAddressbook($id) {
 		$addressbook = OC_Contacts_Addressbook::find( $id );
-		if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser() && !OCP\Share::getItemSharedWithBySource('addressbook', $id)) {
-			if ($addressbook === false) {
-				OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR);
-				OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.'))));
-			}
-			else {
+		if ($addressbook === false) {
+			OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR);
+			OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.'))));
+			exit();
+		} else if ($addressbook['userid'] != OCP\USER::getUser()) {
+			if ($shared = OCP\Share::getItemSharedWithBySource('addressbook', $id)) {
+				$addressbook['displayname'] = $shared['item_target'];
+			} else {
 				OCP\Util::writeLog('contacts', 'Addressbook('.$id.') is not from '.OCP\USER::getUser(), OCP\Util::ERROR);
 				OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.'))));
+				exit();
 			}
-			exit();
 		}
 		return $addressbook;
 	}

From aec6eea235526644be4e0642dd59a3b5f8e9c0e3 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 3 Jul 2012 18:01:05 +0200
Subject: [PATCH 0800/1537] use filesystem abstraction layer to copy file
 versions

---
 apps/files_versions/versions.php | 14 +++++++++++---
 lib/filesystem.php               |  1 +
 lib/filesystemview.php           |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index 7ed5f25750..1a1a2e9ecf 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -68,6 +68,9 @@ class Storage {
 	 */
 	public static function store($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			$files_view = \OCP\Files::getStorage("files");
+			$users_view = \OCP\Files::getStorage("files_versions");
+			$users_view->chroot(\OCP\User::getUser().'/');
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -79,8 +82,13 @@ class Storage {
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
 			Storage::init();
 
+			//check if source file already exist as version to avoid recursions.
+			if ($users_view->file_exists($filename)) {
+				return false;
+			}
+			
 			// check if filename is a directory
-			if(is_dir($filesfoldername.'/'.$filename)){
+			if($files_view->is_dir($filename)){
 				return false;
 			}
 
@@ -95,7 +103,7 @@ class Storage {
 			}
 			
 			// check filesize
-			if(filesize($filesfoldername.'/'.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
+			if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
 				return false;
 			}
 
@@ -116,7 +124,7 @@ class Storage {
 			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);	
 
 			// store a new version of a file
-			copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());
+			$users_view->copy('files'.$filename, 'versions'.$filename.'.v'.time());
         
 			// expire old revisions if necessary
 			Storage::expire($filename);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 0ab3bd69ac..65318fa3ab 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -153,6 +153,7 @@ class OC_Filesystem{
 		if($path[0]!=='/'){
 			$path='/'.$path;
 		}
+		$path=str_replace('//', '/',$path);
 		$foundMountPoint='';
 		foreach(OC_Filesystem::$mounts as $mountpoint=>$storage){
 			if($mountpoint==$path){
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index d474b61b98..448663bb08 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -314,7 +314,7 @@ class OC_FilesystemView {
 				}else{
 					$source=$this->fopen($path1,'r');
 					$target=$this->fopen($path2,'w');
-					$count=OC_Helper::streamCopy($source,$target);
+					$result=OC_Helper::streamCopy($source,$target);
 				}
         OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2));
 				if(!$exists){

From a775deaf22ee803ae2ff0dbe1068229d9c819232 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 3 Jul 2012 17:42:51 +0100
Subject: [PATCH 0801/1537] Moved hooks and versions.php into new lib directory
 Part-ported filesystem operations to OC_FilesystemView Refactored Storage
 class to depend on an OC_FsV object and have fewer static classes

---
 apps/files_versions/ajax/expireAll.php     |   4 +-
 apps/files_versions/ajax/getVersions.php   |   2 -
 apps/files_versions/appinfo/app.php        |   6 +-
 apps/files_versions/history.php            |   3 +-
 apps/files_versions/lib/hooks.php          |  35 ++
 apps/files_versions/{ => lib}/versions.php | 669 +++++++++++----------
 6 files changed, 381 insertions(+), 338 deletions(-)
 create mode 100644 apps/files_versions/lib/hooks.php
 rename apps/files_versions/{ => lib}/versions.php (90%)

diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index f9cd74aed0..238e3bdad4 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -28,7 +28,9 @@
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('files_versions');
 
-if( OCA_Versions\Storage::expireAll() ){
+$versions = new OCA_Versions\Storage( new OC_FilesystemView('') );
+
+if( $versions->expireAll() ){
 	
 	OCP\JSON::success();
 	die();
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index f29d1760b6..1a0e21732c 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -1,8 +1,6 @@
 <?php
 OCP\JSON::checkAppEnabled('files_versions');
 
-require_once('apps/files_versions/versions.php');
-
 $userDirectory = "/".OCP\USER::getUser()."/files";
 $source = $_GET['source'];
 
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 105c5a102c..dba612e4b7 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once('files_versions/versions.php');
+//require_once('files_versions/versions.php');
+OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
+OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
 
 OCP\App::registerAdmin('files_versions', 'settings');
 OCP\App::registerPersonal('files_versions','settings-personal');
@@ -8,7 +10,7 @@ OCP\App::registerPersonal('files_versions','settings-personal');
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
 // Listen to delete and rename signals
 OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Storage", "removeVersions");
 OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Storage", "renameVersions");
\ No newline at end of file
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index ca03de0472..e3332d7cdb 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -30,11 +30,12 @@ if ( isset( $_GET['path'] ) ) {
 	$path = $_GET['path'];
 	$path = strip_tags( $path );
 	$tmpl->assign( 'path', $path );
+	$versions = new OCA_Versions\Storage( new OC_FilesystemView('') );
 
 	// roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
         	
-        	if( \OCA_Versions\Storage::rollback( $path, $_GET['revert'] ) ) {
+        	if( $versions->rollback( $path, $_GET['revert'] ) ) {
 			
 			$tmpl->assign( 'outcome_stat', 'success' );
 			
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
new file mode 100644
index 0000000000..8a74670532
--- /dev/null
+++ b/apps/files_versions/lib/hooks.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This class contains all hooks.
+ */
+ 
+namespace OCA_Versions;
+
+class Hooks {
+
+	/**
+	 * listen to write event.
+	 */
+	public static function write_hook( $params ) {
+	
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			
+			$versions = new Storage( new \OC_FilesystemView('') );
+			
+			$path = $params[\OC_Filesystem::signal_param_path];
+			
+			if($path<>'') $versions->store( $path );
+			
+		}
+	}
+	
+}
+
+?>
diff --git a/apps/files_versions/versions.php b/apps/files_versions/lib/versions.php
similarity index 90%
rename from apps/files_versions/versions.php
rename to apps/files_versions/lib/versions.php
index 7ed5f25750..af7ae11a25 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -1,348 +1,353 @@
-<?php
-/**
- * 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.
- */
-
-/**
- * Versions
- *
- * A class to handle the versioning of files.
- */
-
-namespace OCA_Versions;
-
-class Storage {
-
-
-	// config.php configuration:
-	//   - files_versions
-	//   - files_versionsfolder
-	//   - files_versionsblacklist
-	//   - files_versionsmaxfilesize
-	//   - files_versionsinterval 
-	//   - files_versionmaxversions 
-	//
-	// todo:
-	//   - port to oc_filesystem to enable network transparency
-	//   - implement expire all function. And find a place to call it ;-)
-	//   - add transparent compression. first test if it´s worth it.
-
-	const DEFAULTENABLED=true; 
-	const DEFAULTFOLDER='versions'; 
-	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
-	const DEFAULTMAXFILESIZE=1048576; // 10MB 
-	const DEFAULTMININTERVAL=1; // 2 min
-	const DEFAULTMAXVERSIONS=50; 
-
-	/**
-	 * init the versioning and create the versions folder.
-	 */
-	public static function init() {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			// create versions folder
-			$foldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			if(!is_dir($foldername)){
-				mkdir($foldername);
-			}
-		}
-	}
-
-
-	/**
-	 * listen to write event.
-	 */
-	public static function write_hook($params) {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			$path = $params[\OC_Filesystem::signal_param_path];
-			if($path<>'') Storage::store($path);
-		}
-	}
-
-
-
-	/**
-	 * store a new version of a file.
-	 */
-	public static function store($filename) {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
-				$pos = strpos($source, '/files', 1);
-				$uid = substr($source, 1, $pos - 1);
-				$filename = substr($source, $pos + 6);
-			} else {
-				$uid = \OCP\User::getUser();
-			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
-			Storage::init();
-
-			// check if filename is a directory
-			if(is_dir($filesfoldername.'/'.$filename)){
-				return false;
-			}
-
-			// check filetype blacklist
-			$blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));
-			foreach($blacklist as $bl) {
-				$parts=explode('.', $filename);
-				$ext=end($parts);
-				if(strtolower($ext)==$bl) {
-					return false;
-				}
-			}
-			
-			// check filesize
-			if(filesize($filesfoldername.'/'.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
-				return false;
-			}
-
-
-			// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
-			if ($uid == \OCP\User::getUser()) {
-				$matches=glob($versionsFolderName.'/'.$filename.'.v*');
-				sort($matches);
-				$parts=explode('.v',end($matches));
-				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
-					return false;
-				}
-			}
-
-
-			// create all parent folders
-			$info=pathinfo($filename);	
-			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);	
-
-			// store a new version of a file
-			copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());
-        
-			// expire old revisions if necessary
-			Storage::expire($filename);
-		}
-	}
-
-
-	/**
-	 * rollback to an old version of a file.
-	 */
-	public static function rollback($filename,$revision) {
-	
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
-				$pos = strpos($source, '/files', 1);
-				$uid = substr($source, 1, $pos - 1);
-				$filename = substr($source, $pos + 6);
-			} else {
-				$uid = \OCP\User::getUser();
-			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			
-			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
-			
-			// rollback
-			if ( @copy($versionsFolderName.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
-			
-				return true;
-				
-			}else{
-			
-				return false;
-				
-			}
-			
-		}
-		
-	}
-
-	/**
-	 * check if old versions of a file exist.
-	 */
-	public static function isversioned($filename) {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
-				$pos = strpos($source, '/files', 1);
-				$uid = substr($source, 1, $pos - 1);
-				$filename = substr($source, $pos + 6);
-			} else {
-				$uid = \OCP\User::getUser();
-			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-
-			// check for old versions
-			$matches=glob($versionsFolderName.'/'.$filename.'.v*');
-			if(count($matches)>1){
-				return true;
-			}else{
-				return false;
-			}
-		}else{
-			return(false);
-		}
-	}
-
-
-        
-        /**
-         * @brief get a list of all available versions of a file in descending chronological order
-         * @param $filename file to find versions of, relative to the user files dir
-         * @param $count number of versions to return
-         * @returns array
-         */
-        public static function getVersions( $filename, $count = 0 ) {
-        
-                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-                
-			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
-				$pos = strpos($source, '/files', 1);
-				$uid = substr($source, 1, $pos - 1);
-				$filename = substr($source, $pos + 6);
-			} else {
-				$uid = \OCP\User::getUser();
-			}
-			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$versions = array();         
-			
-			// fetch for old versions
-			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
-			
-			sort( $matches );
-			
-			$i = 0;
-			
-			foreach( $matches as $ma ) {
-				
-				$i++;
-				$versions[$i]['cur'] = 0;
-				$parts = explode( '.v', $ma );
-				$versions[$i]['version'] = ( end( $parts ) );
-				
-				// if file with modified date exists, flag it in array as currently enabled version
-				$curFile['fileName'] = basename( $parts[0] );
-				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
-				
-				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
-				
-			}
-			
-			$versions = array_reverse( $versions );
-			
-			foreach( $versions as $key => $value ) {
-				
-				// flag the first matched file in array (which will have latest modification date) as current version
-				if ( $versions[$key]['fileMatch'] ) {
-				
-					$versions[$key]['cur'] = 1;
-					break;
-					
-				}
-			
-			}
-			
-			$versions = array_reverse( $versions );
-			
-			// only show the newest commits
-			if( $count != 0 and ( count( $versions )>$count ) ) {
-			
-				$versions = array_slice( $versions, count( $versions ) - $count );
-				
-			}
-	
-			return( $versions );
-
-
-                } else {
-                
-			// if versioning isn't enabled then return an empty array
-                        return( array() );
-                        
-                }
-                
-        }
-
-        /**
-         * @brief Erase a file's versions which exceed the set quota
-         */
-        public static function expire($filename) {
-                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-
-			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
-				$pos = strpos($source, '/files', 1);
-				$uid = substr($source, 1, $pos - 1);
-				$filename = substr($source, $pos + 6);
-			} else {
-				$uid = \OCP\User::getUser();
-			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-
-			// check for old versions
-			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
-			
-			if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
-			
-				$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
-
-				// delete old versions of a file
-				$deleteItems = array_slice( $matches, 0, $numberToDelete );
-				
-				foreach( $deleteItems as $de ) {
-				
-					unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
-					
-				}
-			}
-                }
-        }
-
-        /**
-         * @brief Erase all old versions of all user files
-         * @return true/false
-         */
-        public static function expireAll() {
-		
-		$view = new \OC_FilesystemView('');
-		
-		$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-		
-		return $view->deleteAll( $dir, true );
-	
-        }
-
+<?php
+/**
+ * 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.
+ */
+
+/**
+ * Versions
+ *
+ * A class to handle the versioning of files.
+ */
+
+namespace OCA_Versions;
+
+class Storage {
+
+
+	// config.php configuration:
+	//   - files_versions
+	//   - files_versionsfolder
+	//   - files_versionsblacklist
+	//   - files_versionsmaxfilesize
+	//   - files_versionsinterval 
+	//   - files_versionmaxversions 
+	//
+	// todo:
+	//   - finish porting to OC_FilesystemView to enable network transparency
+	//   - add transparent compression. first test if it´s worth it.
+
+	const DEFAULTENABLED=true; 
+	const DEFAULTFOLDER='versions'; 
+	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
+	const DEFAULTMAXFILESIZE=1048576; // 10MB 
+	const DEFAULTMININTERVAL=1; // 2 min
+	const DEFAULTMAXVERSIONS=50;
+	
+	private $view;
+	
+	function __construct( $view ) {
+	
+		$this->view = $view;
+		
+	}
+
+	/**
+	 * init the versioning and create the versions folder.
+	 */
+	public static function init() {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			// create versions folder
+			$foldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			if(!is_dir($foldername)){
+				mkdir($foldername);
+			}
+		}
+	}
+
+
+	/**
+	 * listen to write event.
+	 */
+	public static function write_hook($params) {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			$path = $params[\OC_Filesystem::signal_param_path];
+			if($path<>'') $this->store($path);
+		}
+	}
+
+
+
+	/**
+	 * store a new version of a file.
+	 */
+	public function store($filename) {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+				$pos = strpos($source, '/files', 1);
+				$uid = substr($source, 1, $pos - 1);
+				$filename = substr($source, $pos + 6);
+			} else {
+				$uid = \OCP\User::getUser();
+			}
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
+			Storage::init();
+
+			// check if filename is a directory
+			if(is_dir($filesfoldername.'/'.$filename)){
+				return false;
+			}
+
+			// check filetype blacklist
+			$blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));
+			foreach($blacklist as $bl) {
+				$parts=explode('.', $filename);
+				$ext=end($parts);
+				if(strtolower($ext)==$bl) {
+					return false;
+				}
+			}
+			
+			// check filesize
+			if(filesize($filesfoldername.'/'.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
+				return false;
+			}
+
+
+			// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
+			if ($uid == \OCP\User::getUser()) {
+				$matches=glob($versionsFolderName.'/'.$filename.'.v*');
+				sort($matches);
+				$parts=explode('.v',end($matches));
+				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
+					return false;
+				}
+			}
+
+
+			// create all parent folders
+			$info=pathinfo($filename);	
+			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);	
+
+			// store a new version of a file
+			copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());
+        
+			// expire old revisions if necessary
+			$this->expire($filename);
+		}
+	}
+
+
+	/**
+	 * rollback to an old version of a file.
+	 */
+	public function rollback( $filename, $revision ) {
+	
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+				$pos = strpos($source, '/files', 1);
+				$uid = substr($source, 1, $pos - 1);
+				$filename = substr($source, $pos + 6);
+			} else {
+				$uid = \OCP\User::getUser();
+			}
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			
+			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
+			
+			// rollback
+			if ( copy( $versionsFolderName.'/'.$filename.'.v'.$revision, $filesfoldername.'/'.$filename ) ) {
+			
+				return true;
+				
+			} else {
+			
+				return false;
+				
+			}
+			
+		}
+		
+	}
+
+	/**
+	 * check if old versions of a file exist.
+	 */
+	public static function isversioned($filename) {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+				$pos = strpos($source, '/files', 1);
+				$uid = substr($source, 1, $pos - 1);
+				$filename = substr($source, $pos + 6);
+			} else {
+				$uid = \OCP\User::getUser();
+			}
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+
+			// check for old versions
+			$matches=glob($versionsFolderName.'/'.$filename.'.v*');
+			if(count($matches)>1){
+				return true;
+			}else{
+				return false;
+			}
+		}else{
+			return(false);
+		}
+	}
+
+
+        
         /**
-         * @brief Erase versions of deleted file
-         * @param array
-         *          
-         * This function is connected to the delete signal of OC_Filesystem
+         * @brief get a list of all available versions of a file in descending chronological order
+         * @param $filename file to find versions of, relative to the user files dir
+         * @param $count number of versions to return
+         * @returns array
+         */
+        public static function getVersions( $filename, $count = 0 ) {
+        
+                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+                
+			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+				$pos = strpos($source, '/files', 1);
+				$uid = substr($source, 1, $pos - 1);
+				$filename = substr($source, $pos + 6);
+			} else {
+				$uid = \OCP\User::getUser();
+			}
+			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versions = array();         
+			
+			// fetch for old versions
+			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
+			
+			sort( $matches );
+			
+			$i = 0;
+			
+			foreach( $matches as $ma ) {
+				
+				$i++;
+				$versions[$i]['cur'] = 0;
+				$parts = explode( '.v', $ma );
+				$versions[$i]['version'] = ( end( $parts ) );
+				
+				// if file with modified date exists, flag it in array as currently enabled version
+				$curFile['fileName'] = basename( $parts[0] );
+				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
+				
+				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
+				
+			}
+			
+			$versions = array_reverse( $versions );
+			
+			foreach( $versions as $key => $value ) {
+				
+				// flag the first matched file in array (which will have latest modification date) as current version
+				if ( $versions[$key]['fileMatch'] ) {
+				
+					$versions[$key]['cur'] = 1;
+					break;
+					
+				}
+			
+			}
+			
+			$versions = array_reverse( $versions );
+			
+			// only show the newest commits
+			if( $count != 0 and ( count( $versions )>$count ) ) {
+			
+				$versions = array_slice( $versions, count( $versions ) - $count );
+				
+			}
+	
+			return( $versions );
+
+
+                } else {
+                
+			// if versioning isn't enabled then return an empty array
+                        return( array() );
+                        
+                }
+                
+        }
+
+        /**
+         * @brief Erase a file's versions which exceed the set quota
+         */
+        public function expire( $filename ) {
+                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+
+			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+				$pos = strpos($source, '/files', 1);
+				$uid = substr($source, 1, $pos - 1);
+				$filename = substr($source, $pos + 6);
+			} else {
+				$uid = \OCP\User::getUser();
+			}
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+
+			// check for old versions
+			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
+			
+			if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
+			
+				$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
+
+				// delete old versions of a file
+				$deleteItems = array_slice( $matches, 0, $numberToDelete );
+				
+				foreach( $deleteItems as $de ) {
+				
+					$this->view->unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
+					
+				}
+			}
+                }
+        }
+
+        /**
+         * @brief Erase all old versions of all user files
+         * @return true/false
+         */
+        public function expireAll() {
+		
+		$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+		
+		return $this->view->deleteAll( $dir, true );
+	
+        }
+
+        /**
+         * @brief Erase versions of deleted file
+         * @param array
+         *          
+         * This function is connected to the delete signal of OC_Filesystem
          * cleanup the versions directory if the actual file gets deleted
-         */
-        public static function removeVersions($params) {
+         */
+        public static function removeVersions($params) {
         	$rel_path =  $params['path'];
         	$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
         	if(Storage::isversioned($rel_path)) {
         		$versions = Storage::getVersions($rel_path);
         		foreach ($versions as $v){
-        			unlink($abs_path . $v['version']);
+        			$this->view->unlink( $abs_path . $v['version'] );
         		}
         	}
-        }
-        
+        }
+        
         /**
-         * @brief rename/move versions of renamed/moved files
-         * @param array with oldpath and newpath
-         * 
-         * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+         * @brief rename/move versions of renamed/moved files
+         * @param array with oldpath and newpath
+         * 
+         * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
          * of the stored versions along the actual file
          */
         public static function renameVersions($params) {
-        	$rel_oldpath =  $params['oldpath'];
-        	$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
+        	$rel_oldpath =  $params['oldpath'];
+        	$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
         	$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
-        	if(Storage::isversioned($rel_oldpath)) {
+        	if(Storage::isversioned($rel_oldpath)) {
         		$versions = Storage::getVersions($rel_oldpath);
-        		foreach ($versions as $v){
-        			rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
-        		}
+        		foreach ($versions as $v){
+        			rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
+        		}
         	}
-        }
-}
+        }
+}

From 5e8ef331904d09bc02da101de807b7f7f2ceae65 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 3 Jul 2012 14:00:09 -0400
Subject: [PATCH 0802/1537] Clean up in the dropdown for unsharing

---
 apps/files_sharing/css/sharing.css |  4 +-
 core/ajax/share.php                |  3 +-
 core/js/share.js                   | 96 ++++++++----------------------
 lib/public/share.php               |  2 +-
 4 files changed, 31 insertions(+), 74 deletions(-)

diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css
index d4fcf79ee9..a2fa870c43 100644
--- a/apps/files_sharing/css/sharing.css
+++ b/apps/files_sharing/css/sharing.css
@@ -6,9 +6,9 @@
 -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; }
-#sharedWithList { padding:0.5em; list-style-type: none; }
+#shareWithList { padding:0.5em; list-style-type: none; }
 #privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
-a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; opacity:.5; }
+a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; }
 a.unshare:hover { opacity:1; }
 #share_with { width: 16em; }
 #privateLink label, .edit { font-weight:normal; }
diff --git a/core/ajax/share.php b/core/ajax/share.php
index b1b619e622..f9ab91b9d2 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -47,7 +47,8 @@ if (isset($_POST['action'])) {
 			$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
-		case 'getItemShared':
+		case 'getItem':
+			// TODO Check if the item was shared to the current user
 			$return = OCP\Share::getItemShared($_GET['itemType'], $_GET['item']);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
diff --git a/core/js/share.js b/core/js/share.js
index bcad906262..685932f673 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -25,7 +25,7 @@ OC.Share={
 	},
 	loadItem:function(itemType, item) {
 		var data = '';
-		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItemShared', itemType: itemType, item: item }, async: false, success: function(result) {
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, item: item }, async: false, success: function(result) {
 			if (result && result.status === 'success') {
 				data = result.data;
 			} else {
@@ -45,8 +45,8 @@ OC.Share={
 			}
 		});
 	},
-	unshare:function(itemType, shareType, shareWith, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, shareType: shareType, shareWith: shareWith }, function(result) {
+	unshare:function(itemType, item, shareType, shareWith, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith }, function(result) {
 			if (result && result.status === 'success') {
 				if (callback) {
 					callback();
@@ -67,15 +67,8 @@ OC.Share={
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
 		// TODO replace with autocomplete textbox
 		html += '<input id="shareWith" type="text" placeholder="Share with" />';
-		html += '<div id="sharedWithList">';
-		var sharedWith = OC.Share.loadItem(itemType, item);
-		if (sharedWith) {
-			$.each(sharedWith, function(index, row) {
-				html += row.share_with;
-				html += '<br />';
-			});
-		}
-		html += '</div>';
+		html += '<ul id="shareWithList">';
+		html += '</ul>';
 		html += '<div id="privateLink">';
 		html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
 		html += '<br />';
@@ -86,6 +79,14 @@ OC.Share={
 		html += '</form>';
 		html += '</div>';
 		$(html).appendTo(appendTo);
+		var data = OC.Share.loadItem(itemType, item);
+		if (data) {
+			$.each(data, function(index, shares) {
+				$.each(shares, function(id, share) {
+					OC.Share.addShareWith(share.share_with, share.permissions);
+				});
+			});
+		}
 		$('#dropdown').show('blind');
 		$('#share_with').chosen();
 	},
@@ -97,54 +98,16 @@ OC.Share={
 			}
 		});
 	},
-	addSharedWith:function(uid_shared_with, permissions, isGroup, parentFolder) {
-		if (parentFolder) {
-			var sharedWith = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
-		} else {
-			var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
-			var style = ((permissions == 0) ? 'style="display:none;"' : '');
-			var sharedWith = '<li data-uid_shared_with="'+uid_shared_with+'">';
-			sharedWith += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
-			sharedWith += uid_shared_with;
-			sharedWith += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
-			sharedWith += '<label class="edit" for="'+uid_shared_with+'" '+style+'>can edit</label>';
-			sharedWith += '</li>';
-		}
-		if (isGroup) {
-			// Groups are added to a different list
-			$('#groups').show();
-			$(sharedWith).appendTo('#groupList');
-			// Remove group from select form
-			$('#share_with option[value="'+uid_shared_with+'(group)"]').remove();
-			$('#share_with').trigger('liszt:updated');
-			// Remove users in group from select form
-			$.each(isGroup, function(index, user) {
-				$('#share_with option[value="'+user+'"]').remove();
-				$('#share_with').trigger('liszt:updated');
-			});
-		} else {
-			$(sharedWith).appendTo('#userList');
-			// Remove user from select form
-			$('#share_with option[value="'+uid_shared_with+'"]').remove();
-			$('#share_with').trigger('liszt:updated');
-		}
+	addShareWith:function(shareWith, permissions) {
+		var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
+		var style = ((permissions == 0) ? 'style="display:none;"' : '');
+		var html = '<li >';
+		html += shareWith;
+		html += '<a href="" class="unshare" data-share-with="'+shareWith+'" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
+		html += '</li>';
+		$(html).appendTo('#shareWithList');
 		
 	},
-	removeSharedWith:function(uid_shared_with) {
-		var option;
-		if ($('#userList li[data-uid_shared_with="'+uid_shared_with+'"]').length > 0) {
-			$('#userList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
-			option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
-		} else if ($('#groupList li[data-uid_shared_with="'+uid_shared_with+'"]').length > 0) {
-			$('#groupList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
-			if ($('#groupList li').length < 1) {
-				$('#groups').hide();
-			}
-			option = '<option value="'+uid_shared_with+'(group)">'+uid_shared_with+' (group)</option>';
-		}
-		$(option).appendTo('#share_with');
-		$('#share_with').trigger('liszt:updated');
-	},
 	showPrivateLink:function(item, token) {
 		$('#privateLinkCheckbox').attr('checked', true);
 		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&token='+token;
@@ -244,12 +207,12 @@ $(document).ready(function() {
 // 		}
 // 	});
 
-	$('#sharedWithList li').live('mouseenter', function(event) {
+	$('#shareWithList li').live('mouseenter', function(event) {
 		// Show permissions and unshare button
 		$(':hidden', this).show();
 	});
 	
-	$('#sharedWithList li').live('mouseleave', function(event) {
+	$('#shareWithList li').live('mouseleave', function(event) {
 		// Hide permissions and unshare button
 		$('a', this).hide();
 		if (!$('input:[type=checkbox]', this).is(':checked')) {
@@ -263,16 +226,9 @@ $(document).ready(function() {
 	});
 	
 	$('.unshare').live('click', function() {
-		var item = $('#dropdown').data('item');
-		var uid_shared_with = $(this).parent().data('uid_shared_with');
-		OC.Share.unshare(item, uid_shared_with, function() {
-			OC.Share.removeSharedWith(uid_shared_with);
-			// Reload item to update cached users and groups for the icon check
-			OC.Share.loadItem(item);
-			// Change icon
-			if (!OC.Share.itemPrivateLink && !OC.Share.itemUsers && !OC.Share.itemGroups) {
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-			}
+		var li = $(this).parent();
+		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item'), 0, $(this).data('share-with'), function() {
+			$(li).remove();
 		});
 	});
 	
diff --git a/lib/public/share.php b/lib/public/share.php
index 425824fcd7..c0e8051062 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -479,7 +479,7 @@ class Share {
 				if (isset($uidOwner)) {
 					$select = 'id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source';
 				} else {
-					$select = 'id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target';
+					$select = '*';
 				}
 			}
 			$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);

From 96dea9507aab6189e4b0c7a50558a4d74bd37d8e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 3 Jul 2012 14:03:04 -0400
Subject: [PATCH 0803/1537] Return false for single item checks and an empty
 array for multiple item checks

---
 lib/public/share.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index c0e8051062..641d164001 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -156,7 +156,7 @@ class Share {
 						return false;
 					}
 				}
-				if ($checkShareExists = self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($checkShareExists)) {
+				if (self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -169,7 +169,7 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				if ($checkShareExists = self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1) && !empty($checkShareExists)) {
+				if (self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -221,7 +221,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function unshare($itemType, $item, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1) && !empty($item)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -270,7 +270,7 @@ class Share {
 		if ($backend = self::getBackend($itemType)) {
 			$uidSharedWith = \OC_User::getUser();
 			// TODO Check permissions for setting target?
-			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, 1) && !empty($item)) {
+			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, 1)) {
 				// Check if this is a group share
 				if ($item['uid_shared_with'] == null) {
 					// A new entry needs to be created exclusively for the user
@@ -308,7 +308,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1) && !empty($item)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
@@ -521,7 +521,7 @@ class Share {
 				} else {
 					return $backend->formatItems($items, $format);
 				}
-			} else if ($limit == 1) {
+			} else if ($limit == 1 || (isset($uidOwner) && isset($item))) {
 				return false;
 			}
 		}
@@ -556,7 +556,7 @@ class Share {
 		}
 		if ($backend = self::getBackend($itemType)) {
 			// Check if this is a reshare
-			if ($checkReshare = self::getItemSharedWith($itemType, $item) && !empty($checkReshare)) {
+			if ($checkReshare = self::getItemSharedWith($itemType, $item)) {
 				// TODO Check if resharing is allowed
 				// TODO Don't check if inside folder
 				$parent = $checkReshare['id'];

From c036700c5451351a580f9c244b1bf6ad5eb9a3a7 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 3 Jul 2012 22:33:24 +0200
Subject: [PATCH 0804/1537] some more work on calendar import

---
 apps/calendar/ajax/import/import.php    | 14 +++++++--
 apps/calendar/css/import.css            |  5 ++-
 apps/calendar/js/loader.js              | 42 ++++++++++++++++---------
 apps/calendar/lib/import.php            | 41 ++++++++++++++++++++----
 apps/calendar/templates/part.import.php |  8 ++---
 5 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 63f761dd27..b5a97e5d12 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -8,6 +8,10 @@
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 session_write_close();
+if (isset($_POST['progresskey']) && isset($_POST['getprogress'])) {
+	echo OCP\JSON::success(array('percent'=>OC_Cache::get($_POST['progresskey'])));
+	exit;
+}
 $file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
 if(!$file){
 	OCP\JSON::error(array('error'=>'404'));
@@ -16,6 +20,7 @@ $import = new OC_Calendar_Import($file);
 $import->setUserID(OCP\User::getUser());
 $import->setTimeZone(OC_Calendar_App::$tz);
 $import->enableProgressCache();
+$import->setProgresskey($_POST['progresskey']);
 if(!$import->isValid()){
 	OCP\JSON::error(array('error'=>'notvalid'));
 	exit;
@@ -44,7 +49,12 @@ if($_POST['method'] == 'new'){
 	$id = $_POST['id'];
 }
 $import->setCalendarID($id);
-$import->import();
+try{
+	$import->import();
+}catch (Exception $e) {
+	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('Import failed'), 'debug'=>$e->getMessage()));
+	//write some log
+}
 $count = $import->getCount();
 if($count == 0){
 	if($newcal){
@@ -137,4 +147,4 @@ foreach($uids as $uid) {
 writeProgress('100');
 sleep(3);
 OC_Cache::remove($progresskey);
-OCP\JSON::success();
\ No newline at end of file
+OCP\JSON::success();*/
\ No newline at end of file
diff --git a/apps/calendar/css/import.css b/apps/calendar/css/import.css
index d60d54253a..46bab2b7cf 100644
--- a/apps/calendar/css/import.css
+++ b/apps/calendar/css/import.css
@@ -7,6 +7,5 @@
 #calendar_import_newcalform, #calendar_import_mergewarning, #calendar_import_process, #calendar_import_done{display:none;}
 #calendar_import_process_message, #calendar_import_status, #calendar_import_form_message, #calendar_import_mergewarning{text-align:center;}
 #calendar_import_form_message{font-weight: bold;}
-#calendar_import_newcalendar{width:480px;}
-.calendar_import_warning{background-color: rgba(216,22,22,0.7);}
-.calendar_import_revertwarning{background-color: #ffffff;}
\ No newline at end of file
+#calendar_import_newcalendar{width:96%;}
+.calendar_import_warning{border-color: #fc3333;}
\ No newline at end of file
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 9f18ea8726..77199a5327 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -70,32 +70,46 @@ Calendar_Import={
 			});
 		},
 		update: function(){
-			/*$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progress:1,progresskey: progresskey}, function(percent){
-				$('#progressbar').progressbar('option', 'value', parseInt(percent));
-				if(percent < 100){
-					window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
+			if(Calendar_Import.Store.percentage == 100){
+				return false;
+			}
+			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progresskey: Calendar_Import.Store.progresskey, getprogress: true}, function(data){
+ 				if(data.status == 'success'){
+ 					if(data.percent == null){
+	 					return false;
+ 					}
+ 					Calendar_Import.Store.percentage = parseInt(data.percent);
+					$('#calendar_import_progressbar').progressbar('option', 'value', parseInt(data.percent));
+					if(data.percent < 100 ){
+						window.setTimeout('Calendar_Import.Dialog.update()', 250);
+					}else{
+						$('#calendar_import_done').css('display', 'block');
+					}
 				}else{
-					$('#import_done').css('display', 'block');
+					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
+					$('#calendar_import_progressbar > div').css('background-color', '#FF2626');
+					$('#calendar_import_status').html(data.message);
 				}
-			});*/
-		return 0;
+			});
+			return 0;
 		},
 		warning: function(selector){
-			$(selector).css('background-color', '#FF2626');
+			$(selector).addClass('calendar_import_warning');
 			$(selector).focus(function(){
-				$(selector).css('background-color', '#F8F8F8');
+				$(selector).removeClass('calendar_import_warning');
 			});
 		}
 	},
 	Core:{
 		process: function(){
 			var validation = Calendar_Import.Core.prepare();
-			$('#calendar_import_form').css('display', 'none');
-			$('#calendar_import_process').css('display', 'block');
 			if(validation){
+				$('#calendar_import_form').css('display', 'none');
+				$('#calendar_import_process').css('display', 'block');
 				$('#calendar_import_newcalendar').attr('readonly', 'readonly');
 				$('#calendar_import_calendar').attr('disabled', 'disabled');
 				Calendar_Import.Core.send();
+				window.setTimeout('Calendar_Import.Dialog.update()', 250);
 			}
 		},
 		send: function(){
@@ -103,17 +117,15 @@ Calendar_Import={
 			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.file), id: String (Calendar_Import.Store.id)}, function(data){
 				if(data.status == 'success'){
 					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
+					Calendar_Import.Store.percentage = 100;
 					$('#calendar_import_done').css('display', 'block');
 					$('#calendar_import_status').html(data.message);
 				}else{
 					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
-					$("#calendar_import_progressbar > div").css('background-color', '#FF2626');
+					$('#calendar_import_progressbar > div').css('background-color', '#FF2626');
 					$('#calendar_import_status').html(data.message);
 				}
 			});
-			$('#form_container').css('display', 'none');
-			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Calendar_Import.Dialog.update', 500);
 		},
 		prepare: function(){
 			Calendar_Import.Store.id = $('#calendar_import_calendar option:selected').val();
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index 92bcc31261..f348be3794 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -9,6 +9,11 @@
  * This class does import and converts all times to the users current timezone
  */
 class OC_Calendar_Import{
+	/*
+	 * @brief counts the absolute number of parsed elements
+	 */
+	private $abscount;
+	
 	/*
 	 * @brief var saves if the percentage should be saved with OC_Cache
 	 */
@@ -44,6 +49,11 @@ class OC_Calendar_Import{
 	 */
 	private $progress;
 	
+	/*
+	 * @brief var saves the key for the percentage of the import's progress
+	 */
+	private $progresskey;
+	
 	/*
 	 * @brief var saves the timezone the events shell converted to
 	 */
@@ -67,6 +77,7 @@ class OC_Calendar_Import{
 	public function __construct($ical){
 		$this->error = null;
 		$this->ical = $ical;
+		$this->abscount = 0;
 		$this->count = 0;
 		try{
 			$this->calobject = OC_VObject::parse($this->ical);
@@ -86,6 +97,7 @@ class OC_Calendar_Import{
 		if(!$this->isValid()){
 			return false;
 		}
+		$numofcomponents = count($this->calobject->getComponents());
 		foreach($this->calobject->getComponents() as $object){
 			if(!($object instanceof Sabre_VObject_Component_VEvent) && !($object instanceof Sabre_VObject_Component_VJournal) && !($object instanceof Sabre_VObject_Component_VTodo)){
 				continue;
@@ -96,12 +108,15 @@ class OC_Calendar_Import{
 			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
 			$vcalendar = $this->createVCalendar($object->serialize());
 			$insertid = OC_Calendar_Object::add($this->id, $vcalendar);
+			$this->abscount++;
 			if($this->isDuplicate($insertid)){
 				OC_Calendar_Object::delete($insertid);
 			}else{
-				$this->count++;	
+				$this->count++;
 			}
+			$this->updateProgress(intval(($this->abscount / $numofcomponents)*100));
 		}
+		OC_Cache::remove($this->progresskey);
 		return true;
 	}
 	
@@ -114,6 +129,15 @@ class OC_Calendar_Import{
 		return true;
 	}
 	
+	/*
+	 * @brief sets the progresskey
+	 * @return boolean
+	 */
+	public function setProgresskey($progresskey){
+		$this->progresskey = $progresskey;
+		return true;
+	}
+	
 	/*
 	 * @brief checks if something went wrong while initialization
 	 * @return boolean
@@ -259,12 +283,17 @@ class OC_Calendar_Import{
 	}
 	
 	/*
-	 * @brief 
-	 * @return 
+	 * @brief updates the progress var
+	 * @param integer $percentage
+	 * @return boolean
 	 */
-	//private function (){
-
-	//}
+	private function updateProgress($percentage){
+		$this->progress = $percentage;
+		if($this->cacheprogress){
+			OC_Cache::set($this->progresskey, $this->progress, 300);
+		}
+		return true;
+	}
 
 	/*
 	 * public methods for (pre)rendering of X-... Attributes
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index c7156c79d7..1029cdd925 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -17,7 +17,7 @@ $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new c
 		<input type="hidden" id="calendar_import_filename" value="<?php echo $_['filename'];?>">
 		<input type="hidden" id="calendar_import_path" value="<?php echo $_['path'];?>">
 		<input type="hidden" id="calendar_import_progresskey" value="<?php echo rand() ?>">
-		<span id="calendar_import_form_message"><?php echo $l->t('Please choose a calendar'); ?></span>
+		<div id="calendar_import_form_message"><?php echo $l->t('Please choose a calendar'); ?></div>
 		<select style="width:100%;" id="calendar_import_calendar" name="calendar_import_calendar">
 		<?php
 		for($i = 0;$i<count($calendar_options);$i++){
@@ -27,15 +27,15 @@ $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new c
 		?>
 		</select>
 		<div id="calendar_import_newcalform">
-			<input id="calendar_import_newcalendar"  type="text" placeholder="<?php echo $l->t('Name of new calendar'); ?>" value="<?php echo $newcalendarname ?>"><br>
+			<input id="calendar_import_newcalendar"  class="" type="text" placeholder="<?php echo $l->t('Name of new calendar'); ?>" value="<?php echo $newcalendarname ?>"><br>
 			<!--<input id="calendar_import_generatename" type="button" class="button" value="<?php echo $l->t('Take an available name!'); ?>"><br>-->
-			<span  id="calendar_import_mergewarning" class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></span>
+			<div  id="calendar_import_mergewarning" class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></div>
 		</div>
 		<input id="calendar_import_submit" type="button" class="button" value="&raquo; <?php echo $l->t('Import'); ?> &raquo;" id="startimport">
 	<form>
 </div>
 <div id="calendar_import_process">
-	<span id="calendar_import_process_message"></span>
+	<div id="calendar_import_process_message"></div>
 	<div  id="calendar_import_progressbar"></div>
 	<br>
 	<div id="calendar_import_status" class="hint"></div>

From db33765e3662a6492c765bc737b3986a41ee82b9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 3 Jul 2012 16:52:53 -0400
Subject: [PATCH 0805/1537] Add share with to list in dropdown after sharing

---
 core/js/share.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 685932f673..2dc2a54ee5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -222,7 +222,11 @@ $(document).ready(function() {
 	});
 	
 	$('#shareWith').live('change', function() {
-		OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item'), 0, $(this).val(), 0, false);
+		var shareWith = $(this).val();
+		OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item'), 0, shareWith, 0, function() {
+			OC.Share.addShareWith(shareWith, 0);
+			$('#shareWith').val('');
+		});
 	});
 	
 	$('.unshare').live('click', function() {

From 1ad5e3e39f7e1c6d8279cf8e06781a8e6512b9fe Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 3 Jul 2012 17:00:23 -0400
Subject: [PATCH 0806/1537] Add parameter to showDropDown to not show private
 link UI, only files can be shared as private links

---
 core/js/share.js | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 2dc2a54ee5..755e71e996 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -63,20 +63,23 @@ OC.Share={
 			}
 		});
 	},
-	showDropDown:function(itemType, item, appendTo) {
+	showDropDown:function(itemType, item, appendTo, privateLink) {
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
 		// TODO replace with autocomplete textbox
 		html += '<input id="shareWith" type="text" placeholder="Share with" />';
 		html += '<ul id="shareWithList">';
 		html += '</ul>';
-		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 += '<form id="emailPrivateLink">';
-		html += '<input id="privateLinkText" style="display:none; width:90%;" />';
-		html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
-		html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
-		html += '</form>';
+		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 += '<form id="emailPrivateLink">';
+			html += '<input id="privateLinkText" style="display:none; width:90%;" />';
+			html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
+			html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
+			html += '</form>';
+			html += '</div>';
+		}
 		html += '</div>';
 		$(html).appendTo(appendTo);
 		var data = OC.Share.loadItem(itemType, item);
@@ -148,7 +151,11 @@ $(document).ready(function() {
 
 	$('.share').live('click', function() {
 		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
-			OC.Share.showDropDown($(this).data('item-type'), $(this).data('item'), $(this).parent().parent());
+			var privateLink = false;
+			if ($(this).data('private-link') !== undefined && $(this).data('private-link') == true) {
+				privateLink = true;
+			}
+			OC.Share.showDropDown($(this).data('item-type'), $(this).data('item'), $(this).parent().parent(), privateLink);
 		}
 	});
 	
@@ -187,12 +194,12 @@ $(document).ready(function() {
 					OC.Share.hideDropDown(function () {
 						$('tr').removeClass('mouseOver');
 						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
-						OC.Share.showDropDown('file', item, appendTo);
+						OC.Share.showDropDown('file', item, appendTo, true);
 					});
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown('file', item, appendTo);
+				OC.Share.showDropDown('file', item, appendTo, true);
 			}
 		});
 	}

From 393eefa5d2f9725acefc29c3bb9b4eaa2a4a25ad Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 3 Jul 2012 23:44:47 +0200
Subject: [PATCH 0807/1537] replace some direct links with OC.imagePath

---
 apps/calendar/js/calendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index b7f355a1b8..004b2386fb 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -547,7 +547,7 @@ Calendar={
 				$('#share_user').live('change', function(){
 					if($('#sharewithuser_' + $('#share_user option:selected').text()).length == 0){
 						Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_user option:selected').text(), 'user');
-						var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="' + oc_webroot + '/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
+						var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="' + OC.imagePath('core', 'actions/delete.svg') + '" class="svg action" style="display:none;float:right;"></li>';
 						$('#sharewithuser_list').append(newitem);
 						$('#sharewithuser_' + $('#share_user option:selected').text() + ' > img').click(function(){
 							$('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
@@ -562,7 +562,7 @@ Calendar={
 				$('#share_group').live('change', function(){
 					if($('#sharewithgroup_' + $('#share_group option:selected').text()).length == 0){
 						Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_group option:selected').text(), 'group');
-						var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="' + oc_webroot + '/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
+						var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="' + OC.imagePath('core', 'actions/delete.svg') + '" class="svg action" style="display:none;float:right;"></li>';
 						$('#sharewithgroup_list').append(newitem);
 						$('#sharewithgroup_' + $('#share_group option:selected').text() + ' > img').click(function(){
 							$('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');

From 799e34acd4a73b31a6b2f5fa8f4de3c3557763a8 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Tue, 3 Jul 2012 21:58:08 +0000
Subject: [PATCH 0808/1537] Add slash to app url if not set fix oc-1169

---
 core/js/js.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index 7a53bb75ef..d6483b2c22 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -67,6 +67,8 @@ OC={
 			if(type){
 				link+= '/'+type+'/';
 			}
+			if(link.substring(link.length-1) != '/')
+				link+='/';
 			link+=file;
 		}else{
 			link+='/';

From 3b09aa8578702a403e06e6359a19013b573443bc Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 4 Jul 2012 10:13:00 +0000
Subject: [PATCH 0809/1537] Correct Postgresql connection with space in
 password. Work around php bug

---
 lib/db.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/db.php b/lib/db.php
index ffa0d37307..2a06d72ea3 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -128,6 +128,14 @@ class OC_DB {
 					}else{
 						$dsn='pgsql:dbname='.$name.';host='.$host;
 					}
+					/**
+					* Ugly fix for pg connections pbm when password use spaces
+					*/
+					$e_user = addslashes($user);
+					$e_password = addslashes($pass);
+					$pass = $user = null;
+					$dsn .= ";user='$e_user';password='$e_password'";
+					/** END OF FIX***/
 					break;
 			}
 			try{

From 6d3afb3857f30f69fd883bb3f933568a9e2f4115 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 13:49:39 +0200
Subject: [PATCH 0810/1537] Moved action buttons down to the add field menu.
 Fixes oc-1155.

---
 apps/contacts/css/contacts.css           |  4 +--
 apps/contacts/templates/part.contact.php | 34 ++++++++++++------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 588a51a429..5b6ccb7638 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -15,10 +15,10 @@
 #bottomcontrols img { margin-top: 0.35em; }
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
-#actionbar { height: 30px; width: 60px; position: fixed; right: 0px; top: 4em; margin: 0 0 0 0; padding: 0 0 0 0; z-index: 1000; }
+#actionbar { position: relative; clear: both; height: 30px;}
 #contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
 #contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
-#contacts_propertymenu { clear: both; max-width: 15em; margin: 2em; }
+#contacts_propertymenu { clear: left; float:left; max-width: 15em; margin: 2em; }
 #contacts_propertymenu_button { position:relative;top:0;left:0; margin: 0; }
 #contacts_propertymenu_dropdown { background-color: #fff; position:relative; right:0; overflow:hidden; text-overflow:ellipsis; border: thin solid #1d2d44; box-shadow: 0 3px 5px #bbb; /* -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000;  box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em;*/ border-radius: 3px; }
 #contacts_propertymenu li { display: block; font-weight: bold; height: 20px; }
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index bb574372e5..4233bffede 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -9,10 +9,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
 	</form>
-	<div id="actionbar">
-		<button class="svg action" id="contacts_downloadcard" title="<?php echo $l->t('Download contact');?>"></button>
-		<button class="svg action" id="contacts_deletecard" title="<?php echo $l->t('Delete contact');?>"></button>
-	</div>
 
 	<div id="contact_photo" class="contactsection">
 
@@ -108,19 +104,23 @@ $id = isset($_['id']) ? $_['id'] : '';
 	</form>
 	</div> <!-- contact_note -->
 
-	<div id="contacts_propertymenu">
-	<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>
-	<ul id="contacts_propertymenu_dropdown" role="menu" class="hidden">
-		<li><a role="menuitem" data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
-		<li><a role="menuitem" data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
-		<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
-		<li><a role="menuitem" data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
-		<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
-		<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
-		<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
-		<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>
-		<li><a role="menuitem" data-type="CATEGORIES"><?php echo $l->t('Groups'); ?></a></li>
-	</ul>
+	<div id="actionbar">
+		<div id="contacts_propertymenu">
+		<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>
+		<ul id="contacts_propertymenu_dropdown" role="menu" class="hidden">
+			<li><a role="menuitem" data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
+			<li><a role="menuitem" data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
+			<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
+			<li><a role="menuitem" data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
+			<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
+			<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
+			<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
+			<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>
+			<li><a role="menuitem" data-type="CATEGORIES"><?php echo $l->t('Groups'); ?></a></li>
+		</ul>
+		</div>
+		<button class="svg action" id="contacts_downloadcard" title="<?php echo $l->t('Download contact');?>"></button>
+		<button class="svg action" id="contacts_deletecard" title="<?php echo $l->t('Delete contact');?>"></button>
 	</div>
 
 </div> <!-- card -->

From 825d92d59c54a5274f94e7058c4458238f9586a3 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 4 Jul 2012 14:28:08 +0100
Subject: [PATCH 0811/1537] Added undo functionality to delete user procedure
 on user settings page

---
 settings/js/users.js         | 96 ++++++++++++++++++++++++++++++++----
 settings/templates/users.php |  2 +
 2 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index c04df81d82..dfa28e4c4c 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,6 +4,72 @@
  * See the COPYING-README file.
  */
 
+UserList={
+	useUndo:true,
+	
+	/**
+	 * @brief Initiate user deletion process in UI
+	 * @param string uid the user ID to be deleted
+	 *
+	 * Does not actually delete the user; it sets them for
+	 * deletion when the current page is unloaded, at which point 
+	 * finishDelete() completes the process. This allows for 'undo'.
+	 */
+	do_delete:function( uid ) {
+		
+		UserList.deleteUid = uid;
+		
+		// Set undo flag
+		UserList.deleteCanceled = false;
+		
+		// Hide user in table to reflect deletion
+		$(this).parent().parent().hide();
+		$('tr').filterAttr( 'data-uid', UserList.deleteUid ).hide();
+		
+		// Provide user with option to undo
+		$('#notification').text(t('files','undo delete user'));
+		$('#notification').data('deleteuser',true);
+		$('#notification').fadeIn();
+			
+	},
+	
+	/**
+	 * @brief Delete a user via ajax
+	 * @param bool ready whether to use ready() upon completion
+	 *
+	 * Executes deletion via ajax of user identified by property deleteUid 
+	 * if 'undo' has not been used.  Completes the user deletion procedure 
+	 * and reflects success in UI.
+	 */
+	finishDelete:function( ready ){
+		
+		// Check deletion has not been undone
+		if( !UserList.deleteCanceled && UserList.deleteUid ){
+			
+			// Delete user via ajax
+			$.post(
+				OC.filePath('settings','ajax','removeuser.php'),
+				{username:UserList.deleteUid},
+				function(result){
+					
+					// Remove undo option, & remove user from table
+					boolOperationFinished( 
+						data, function(){
+							$('#notification').fadeOut();
+							$('tr').filterAttr( 'data-uid', username ).remove();
+							UserList.deleteCanceled=true;
+							UserList.deleteFiles=null;
+							if( ready ){
+								ready();
+							}
+						}
+					);
+				}
+			);
+ 		}
+	}
+}
+
 $(document).ready(function(){
 	function setQuota(uid,quota,ready){
 		$.post(
@@ -61,15 +127,12 @@ $(document).ready(function(){
 	});
 	
 	$('td.remove>img').live('click',function(event){
-		var uid=$(this).parent().parent().data('uid');
-		$.post(
-			OC.filePath('settings','ajax','removeuser.php'),
-			{username:uid},
-			function(result){
-			
-			}
-		);
-		$(this).parent().parent().remove();
+		
+		var uid = $(this).parent().parent().data('uid');
+		
+		// Call function for handling delete/undo
+		UserList.do_delete( uid );
+		
 	});
 	
 	$('td.password>img').live('click',function(event){
@@ -222,4 +285,19 @@ $(document).ready(function(){
 			}
 		);
 	});
+	// Handle undo notifications
+	$('#notification').hide();
+	$('#notification').click(function(){
+		if($('#notification').data('deleteuser'))
+		{
+			$( 'tr' ).filterAttr( 'data-uid', UserList.deleteUid ).show();
+			UserList.deleteCanceled=true;
+			UserList.deleteFiles=null;
+		}
+		$('#notification').fadeOut();
+	});
+	UserList.useUndo=('onbeforeunload' in window)
+	$(window).bind('beforeunload', function (){
+		UserList.finishDelete(null);
+	});
 });
diff --git a/settings/templates/users.php b/settings/templates/users.php
index c042f2664e..5511242456 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -52,6 +52,8 @@ foreach($_["groups"] as $group) {
 	</div>
 </div>
 
+<div id='notification'></div>
+
 <table data-groups="<?php echo implode(', ',$allGroups);?>">
 	<thead>
 		<tr>

From b2eac08ad3a279ab81c508929c68d947bedbc9da Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 16:54:00 +0200
Subject: [PATCH 0812/1537] Query contacts in batches of 20. Possible fix for
 oc-1126.

---
 apps/contacts/export.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index f84a10c138..ba7b06e40d 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -14,12 +14,16 @@ $contactid = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 $nl = "\n";
 if(isset($bookid)){
 	$addressbook = OC_Contacts_App::getAddressbook($bookid);
-	$cardobjects = OC_Contacts_VCard::all($bookid);
+	//$cardobjects = OC_Contacts_VCard::all($bookid);
 	header('Content-Type: text/directory');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
 
-	foreach($cardobjects as $card) {
-		echo $card['carddata'] . $nl;
+	$start = 0;
+	while($cardobjects = OC_Contacts_VCard::all($bookid, $start, 20)){
+		foreach($cardobjects as $card) {
+			echo $card['carddata'] . $nl;
+		}
+		$start += 20;
 	}
 }elseif(isset($contactid)){
 	$data = OC_Contacts_App::getContactObject($contactid);

From 5d61b85a1dace6ebb41025deaad019af8b3e5145 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 4 Jul 2012 17:16:02 +0200
Subject: [PATCH 0813/1537] allow users to upload ssl root certificates for the
 webdav client

---
 .../ajax/addRootCertificate.php               | 12 +++++++++
 .../ajax/removeRootCertificate.php            |  9 +++++++
 apps/files_external/js/settings.js            | 10 +++++---
 apps/files_external/lib/config.php            | 15 +++++++++++
 apps/files_external/personal.php              |  1 +
 apps/files_external/templates/settings.php    | 25 +++++++++++++++++--
 6 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 apps/files_external/ajax/addRootCertificate.php
 create mode 100644 apps/files_external/ajax/removeRootCertificate.php

diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
new file mode 100644
index 0000000000..33cd64d2c7
--- /dev/null
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -0,0 +1,12 @@
+<?php
+
+OCP\JSON::checkAppEnabled('files_external');
+
+$view = \OCP\Files::getStorage("files_external");
+$from = $_FILES['rootcert_import']['tmp_name'];
+$to = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").$_FILES['rootcert_import']['name'];
+move_uploaded_file($from, $to);
+
+header("Location: settings/personal.php");
+exit;
+?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
new file mode 100644
index 0000000000..05f2fdef2d
--- /dev/null
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -0,0 +1,9 @@
+<?php
+
+OCP\JSON::checkAppEnabled('files_external');
+
+$view = \OCP\Files::getStorage("files_external");
+$cert = $_POST['cert'];
+$file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").$cert;
+unlink($file);
+?>
\ No newline at end of file
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 1c366a79c7..0d942e7845 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1,4 +1,4 @@
-OC.MountConfig={
+OC.MountConfig={	
 	saveStorage:function(tr) {
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if (mountPoint == '') {
@@ -68,7 +68,6 @@ OC.MountConfig={
 }
 
 $(document).ready(function() {
-
 	$('.chzn-select').chosen();
 	
 	$('#selectBackend').live('change', function() {
@@ -116,8 +115,11 @@ $(document).ready(function() {
 	$('td.remove>img').live('click', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
-		if (mountPoint == '') {
-			return false;
+		if (!mountPoint) {
+			var row=this.parentNode.parentNode;
+			$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), { cert: row.id  });
+			$(tr).remove();
+			return true;
 		}
 		if ($('#externalStorage').data('admin') === true) {
 			var isPersonal = false;
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 95f8beeb49..4e82e6b254 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -237,6 +237,21 @@ class OC_Mount_Config {
 		$content .= ");\n?>";
 		@file_put_contents($file, $content);
 	}
+	
+	/**
+	 * Returns all user uploaded ssl root certificates
+	 * @return array
+	 */
+	public static function getCertificates() {
+		$view = \OCP\Files::getStorage('files_external');
+		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("");
+		$result = array();
+		$handle = opendir($path);
+		while (false !== ($file = readdir($handle))) {
+			if($file != '.' && $file != '..') $result[] = $file;
+		}
+		return $result;
+	}
 
 }
 
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index b758e7e7eb..dec501741b 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -28,6 +28,7 @@ unset($backends['OC_Filestorage_Local']);
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('isAdminPage', false, false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
+$tmpl->assign('certs', OC_Mount_Config::getCertificates());
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
 
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index e651c4574d..be86033d20 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,4 +1,4 @@
-<form id="files_external">
+<form id="files_external" method="post" enctype="multipart/form-data" action="/owncloud/?app=files_external&getfile=ajax%2FaddRootCertificate.php">
 	<fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
 		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
@@ -79,6 +79,27 @@
 			<?php endforeach; ?>
 			</tbody>
 		</table>
+		<br />
+		
+  		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+			<thead>
+				<tr>
+					<th><?php echo $l->t('SSL root certificates'); ?></th>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tbody width="100%">
+			<?php foreach ($_['certs'] as $rootCert): ?>
+			<tr id="<?php echo $rootCert ?>">	
+			<td class="rootCert"><?php echo $rootCert ?></td>
+			<td <?php echo ($rootCert != '') ? 'class="remove"' : 'style="visibility:hidden;"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+			</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>		
+        <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
+        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />		
+		
 		<?php if ($_['isAdminPage']): ?>
 			<br />
 			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
@@ -86,4 +107,4 @@
 			<em><?php echo $l->t('Allow users to mount their own external storage'); ?></em>
 		<?php endif; ?>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>

From e258da5c3c81a256c21e7423085089a7bd6a898d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 4 Jul 2012 17:22:04 +0200
Subject: [PATCH 0814/1537] certificate should be only visible for users

---
 apps/files_external/templates/settings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index be86033d20..dccc0913f2 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -81,6 +81,7 @@
 		</table>
 		<br />
 		
+		<?php if (!$_['isAdminPage']): ?>
   		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
@@ -99,6 +100,7 @@
 		</table>		
         <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
         <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />		
+		<?php endif; ?>
 		
 		<?php if ($_['isAdminPage']): ?>
 			<br />

From 5880bbee8f11b4a999cf9f11e9fca3c5739057ec Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 4 Jul 2012 17:37:47 +0200
Subject: [PATCH 0815/1537] add miniColors

---
 3rdparty/miniColors/GPL-LICENSE.txt           | 278 +++++++++
 3rdparty/miniColors/MIT-LICENSE.txt           |  20 +
 3rdparty/miniColors/css/images/colors.png     | Bin 0 -> 12485 bytes
 3rdparty/miniColors/css/images/trigger.png    | Bin 0 -> 1406 bytes
 3rdparty/miniColors/css/jquery.miniColors.css |  81 +++
 3rdparty/miniColors/js/jquery.miniColors.js   | 580 ++++++++++++++++++
 .../miniColors/js/jquery.miniColors.min.js    |   9 +
 7 files changed, 968 insertions(+)
 create mode 100644 3rdparty/miniColors/GPL-LICENSE.txt
 create mode 100644 3rdparty/miniColors/MIT-LICENSE.txt
 create mode 100755 3rdparty/miniColors/css/images/colors.png
 create mode 100755 3rdparty/miniColors/css/images/trigger.png
 create mode 100755 3rdparty/miniColors/css/jquery.miniColors.css
 create mode 100755 3rdparty/miniColors/js/jquery.miniColors.js
 create mode 100755 3rdparty/miniColors/js/jquery.miniColors.min.js

diff --git a/3rdparty/miniColors/GPL-LICENSE.txt b/3rdparty/miniColors/GPL-LICENSE.txt
new file mode 100644
index 0000000000..11dddd00ef
--- /dev/null
+++ b/3rdparty/miniColors/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
diff --git a/3rdparty/miniColors/MIT-LICENSE.txt b/3rdparty/miniColors/MIT-LICENSE.txt
new file mode 100644
index 0000000000..ec6f758157
--- /dev/null
+++ b/3rdparty/miniColors/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) Cory LaViska
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/miniColors/css/images/colors.png b/3rdparty/miniColors/css/images/colors.png
new file mode 100755
index 0000000000000000000000000000000000000000..1b4f819d8d9367147e8b1d2145e5fa1c5d6a48d3
GIT binary patch
literal 12485
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
P00000NkvXXu0mjfdwpY9

literal 0
HcmV?d00001

diff --git a/3rdparty/miniColors/css/images/trigger.png b/3rdparty/miniColors/css/images/trigger.png
new file mode 100755
index 0000000000000000000000000000000000000000..8c169fd6053009030232ef865a61876992b68589
GIT binary patch
literal 1406
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`I>-^Aq1JP;qO
z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=Ysky7Esj-o<iHobDp{s#~sfn{2h-qMHWMXOT
z0@Le~pIn-onpXnTn}X15j8iWtDdZLaZFWg5$}CGwaVyHtRRDY0Die!aEG%3M&76#Y
z(T>Y45WOi_+yd2$+aLNs$LND17Ac}(Lcr7mV#1RxkONQnsd>QEUIa?kr@s7UU|{^@
z>Eaktacj*~$E-sRB5mp?BgD7u(%yAKHs;l})P)a3cWG2{e-&!7?th>gvs+vwW{XHj
z&V_A;GfVy@#?3g=p?UVeXVt^i_y7Df_FMC?;Kvz>><vlBrNy00+!kM4;_)iM;00sO
zL$$6&P79``8X8nev~hK1n9bh%-$A_lD2t2%<F+SUTrn#{Zq(TQpJckc$F7n6vZUZE
znG-v*x8K&YkVsGy311z$Y~gKf1L2Hk>^EOen!6;zabwilu;g6^dl-e>WDmLJGs&<t
zx;_Y6*-{yQ>^yJ4ueh&55<W{M0$85Qe7<kx!y(rE-M!ZLbC&Xn9q#KN76xr(lQ&hl
z!d;Vf|LD}S3^VPjgu6aY4yw6S;GaG*c{yjWVdLd6h93*J2i}{=mL9e7EaTH#Oq-N;
zZFp2;cf3pXc%tQka}_pqQF_zA9$E56^(fGd*#(D!D}Svth`*M#b=B$Sw5IL(d=U)C
zwoX^~$#4s+V|w(v?wO)Uv}0H9?Y@JWQw=4)u2?+pX3jCQ*}TQE(@S^9ny$~f6t?Di
z_C(gDjr9_*R=CgW$k~2-rBD0Jpf{ECeA@-4_$<GCJ-WJEM0vrMt63|3iW5Hlt;?T$
z{BNE8_vtMEF6q4}vHECgG~-W!g+;}dqMd)1uji=xqPJ@X`{hXo#D8Y=yViYP^6Gm$
aBOAjblk?)&Tgn<iC8DRRpUXO@geCxF<p)Io

literal 0
HcmV?d00001

diff --git a/3rdparty/miniColors/css/jquery.miniColors.css b/3rdparty/miniColors/css/jquery.miniColors.css
new file mode 100755
index 0000000000..381bc1dc06
--- /dev/null
+++ b/3rdparty/miniColors/css/jquery.miniColors.css
@@ -0,0 +1,81 @@
+.miniColors-trigger {
+	height: 22px;
+	width: 22px;
+	background: url(images/trigger.png) center no-repeat;
+	vertical-align: middle;
+	margin: 0 .25em;
+	display: inline-block;
+	outline: none;
+}
+
+.miniColors-selector {
+	position: absolute;
+	width: 175px;
+	height: 150px;
+	background: #FFF;
+	border: solid 1px #BBB;
+	-moz-box-shadow: 0 0 6px rgba(0, 0, 0, .25);
+	-webkit-box-shadow: 0 0 6px rgba(0, 0, 0, .25);
+	box-shadow: 0 0 6px rgba(0, 0, 0, .25);
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	padding: 5px;
+	z-index: 999999;
+}
+
+.miniColors-selector.black {
+	background: #000;
+	border-color: #000;
+}
+
+.miniColors-colors {
+	position: absolute;
+	top: 5px;
+	left: 5px;
+	width: 150px;
+	height: 150px;
+	background: url(images/colors.png) right no-repeat;
+	cursor: crosshair;
+}
+
+.miniColors-hues {
+	position: absolute;
+	top: 5px;
+	left: 160px;
+	width: 20px;
+	height: 150px;
+	background: url(images/colors.png) left no-repeat;
+	cursor: crosshair;
+}
+
+.miniColors-colorPicker {
+	position: absolute;
+	width: 9px;
+	height: 9px;
+	border: 1px solid #fff;
+	-moz-border-radius: 11px;
+	-webkit-border-radius: 11px;
+	border-radius: 11px;
+}
+.miniColors-colorPicker-inner {
+	position: absolute;
+	top: 0;
+	left: 0; 
+	width: 7px;
+	height: 7px;
+	border: 1px solid #000;
+	-moz-border-radius: 9px;
+	-webkit-border-radius: 9px;
+	border-radius: 9px;
+}
+
+.miniColors-huePicker {
+	position: absolute;
+	left: -3px;
+	width: 24px;
+	height: 1px;
+	border: 1px solid #fff;
+	border-radius: 2px;
+	background: #000;
+}
\ No newline at end of file
diff --git a/3rdparty/miniColors/js/jquery.miniColors.js b/3rdparty/miniColors/js/jquery.miniColors.js
new file mode 100755
index 0000000000..187db3fa84
--- /dev/null
+++ b/3rdparty/miniColors/js/jquery.miniColors.js
@@ -0,0 +1,580 @@
+/*
+ * jQuery miniColors: A small color selector
+ *
+ * Copyright 2011 Cory LaViska for A Beautiful Site, LLC. (http://abeautifulsite.net/)
+ *
+ * Dual licensed under the MIT or GPL Version 2 licenses
+ *
+*/
+if(jQuery) (function($) {
+	
+	$.extend($.fn, {
+		
+		miniColors: function(o, data) {
+			
+			var create = function(input, o, data) {
+				//
+				// Creates a new instance of the miniColors selector
+				//
+				
+				// Determine initial color (defaults to white)
+				var color = expandHex(input.val());
+				if( !color ) color = 'ffffff';
+				var hsb = hex2hsb(color);
+				
+				// Create trigger
+				var trigger = $('<a class="miniColors-trigger" style="background-color: #' + color + '" href="#"></a>');
+				trigger.insertAfter(input);
+				
+				// Set input data and update attributes
+				input
+					.addClass('miniColors')
+					.data('original-maxlength', input.attr('maxlength') || null)
+					.data('original-autocomplete', input.attr('autocomplete') || null)
+					.data('letterCase', 'uppercase')
+					.data('trigger', trigger)
+					.data('hsb', hsb)
+					.data('change', o.change ? o.change : null)
+					.data('close', o.close ? o.close : null)
+					.data('open', o.open ? o.open : null)
+					.attr('maxlength', 7)
+					.attr('autocomplete', 'off')
+					.val('#' + convertCase(color, o.letterCase));
+				
+				// Handle options
+				if( o.readonly ) input.prop('readonly', true);
+				if( o.disabled ) disable(input);
+				
+				// Show selector when trigger is clicked
+				trigger.bind('click.miniColors', function(event) {
+					event.preventDefault();
+					if( input.val() === '' ) input.val('#');
+					show(input);
+
+				});
+				
+				// Show selector when input receives focus
+				input.bind('focus.miniColors', function(event) {
+					if( input.val() === '' ) input.val('#');
+					show(input);
+				});
+				
+				// Hide on blur
+				input.bind('blur.miniColors', function(event) {
+					var hex = expandHex( hsb2hex(input.data('hsb')) );
+					input.val( hex ? '#' + convertCase(hex, input.data('letterCase')) : '' );
+				});
+				
+				// Hide when tabbing out of the input
+				input.bind('keydown.miniColors', function(event) {
+					if( event.keyCode === 9 ) hide(input);
+				});
+				
+				// Update when color is typed in
+				input.bind('keyup.miniColors', function(event) {
+					setColorFromInput(input);
+				});
+				
+				// Handle pasting
+				input.bind('paste.miniColors', function(event) {
+					// Short pause to wait for paste to complete
+					setTimeout( function() {
+						setColorFromInput(input);
+					}, 5);
+				});
+				
+			};
+			
+			var destroy = function(input) {
+				//
+				// Destroys an active instance of the miniColors selector
+				//
+				
+				hide();
+				input = $(input);
+				
+				// Restore to original state
+				input.data('trigger').remove();
+				input
+					.attr('autocomplete', input.data('original-autocomplete'))
+					.attr('maxlength', input.data('original-maxlength'))
+					.removeData()
+					.removeClass('miniColors')
+					.unbind('.miniColors');
+				$(document).unbind('.miniColors');
+			};
+			
+			var enable = function(input) {
+				//
+				// Enables the input control and the selector
+				//
+				input
+					.prop('disabled', false)
+					.data('trigger')
+					.css('opacity', 1);
+			};
+			
+			var disable = function(input) {
+				//
+				// Disables the input control and the selector
+				//
+				hide(input);
+				input
+					.prop('disabled', true)
+					.data('trigger')
+					.css('opacity', 0.5);
+			};
+			
+			var show = function(input) {
+				//
+				// Shows the miniColors selector
+				//
+				if( input.prop('disabled') ) return false;
+				
+				// Hide all other instances 
+				hide();				
+				
+				// Generate the selector
+				var selector = $('<div class="miniColors-selector"></div>');
+				selector
+					.append('<div class="miniColors-colors" style="background-color: #FFF;"><div class="miniColors-colorPicker"><div class="miniColors-colorPicker-inner"></div></div>')
+					.append('<div class="miniColors-hues"><div class="miniColors-huePicker"></div></div>')
+					.css({
+						top: input.is(':visible') ? input.offset().top + input.outerHeight() : input.data('trigger').offset().top + input.data('trigger').outerHeight(),
+						left: input.is(':visible') ? input.offset().left : input.data('trigger').offset().left,
+						display: 'none'
+					})
+					.addClass( input.attr('class') );
+				
+				// Set background for colors
+				var hsb = input.data('hsb');
+				selector
+					.find('.miniColors-colors')
+					.css('backgroundColor', '#' + hsb2hex({ h: hsb.h, s: 100, b: 100 }));
+				
+				// Set colorPicker position
+				var colorPosition = input.data('colorPosition');
+				if( !colorPosition ) colorPosition = getColorPositionFromHSB(hsb);
+				selector.find('.miniColors-colorPicker')
+					.css('top', colorPosition.y + 'px')
+					.css('left', colorPosition.x + 'px');
+				
+				// Set huePicker position
+				var huePosition = input.data('huePosition');
+				if( !huePosition ) huePosition = getHuePositionFromHSB(hsb);
+				selector.find('.miniColors-huePicker').css('top', huePosition.y + 'px');
+				
+				// Set input data
+				input
+					.data('selector', selector)
+					.data('huePicker', selector.find('.miniColors-huePicker'))
+					.data('colorPicker', selector.find('.miniColors-colorPicker'))
+					.data('mousebutton', 0);
+					
+				$('BODY').append(selector);
+				selector.fadeIn(100);
+				
+				// Prevent text selection in IE
+				selector.bind('selectstart', function() { return false; });
+				
+				$(document).bind('mousedown.miniColors touchstart.miniColors', function(event) {
+					
+					input.data('mousebutton', 1);
+					var testSubject = $(event.target).parents().andSelf();
+					
+					if( testSubject.hasClass('miniColors-colors') ) {
+						event.preventDefault();
+						input.data('moving', 'colors');
+						moveColor(input, event);
+					}
+					
+					if( testSubject.hasClass('miniColors-hues') ) {
+						event.preventDefault();
+						input.data('moving', 'hues');
+						moveHue(input, event);
+					}
+					
+					if( testSubject.hasClass('miniColors-selector') ) {
+						event.preventDefault();
+						return;
+					}
+					
+					if( testSubject.hasClass('miniColors') ) return;
+					
+					hide(input);
+				});
+				
+				$(document)
+					.bind('mouseup.miniColors touchend.miniColors', function(event) {
+					    event.preventDefault();
+						input.data('mousebutton', 0).removeData('moving');
+					})
+					.bind('mousemove.miniColors touchmove.miniColors', function(event) {
+						event.preventDefault();
+						if( input.data('mousebutton') === 1 ) {
+							if( input.data('moving') === 'colors' ) moveColor(input, event);
+							if( input.data('moving') === 'hues' ) moveHue(input, event);
+						}
+					});
+				
+				// Fire open callback
+				if( input.data('open') ) {
+					input.data('open').call(input.get(0), '#' + hsb2hex(hsb), hsb2rgb(hsb));
+				}
+				
+			};
+			
+			var hide = function(input) {
+				
+				//
+				// Hides one or more miniColors selectors
+				//
+				
+				// Hide all other instances if input isn't specified
+				if( !input ) input = '.miniColors';
+				
+				$(input).each( function() {
+					var selector = $(this).data('selector');
+					$(this).removeData('selector');
+					$(selector).fadeOut(100, function() {
+						// Fire close callback
+						if( input.data('close') ) {
+							var hsb = input.data('hsb'), hex = hsb2hex(hsb);	
+							input.data('close').call(input.get(0), '#' + hex, hsb2rgb(hsb));
+						}
+						$(this).remove();
+					});
+				});
+				
+				$(document).unbind('.miniColors');
+				
+			};
+			
+			var moveColor = function(input, event) {
+
+				var colorPicker = input.data('colorPicker');
+				
+				colorPicker.hide();
+				
+				var position = {
+					x: event.pageX,
+					y: event.pageY
+				};
+				
+				// Touch support
+				if( event.originalEvent.changedTouches ) {
+					position.x = event.originalEvent.changedTouches[0].pageX;
+					position.y = event.originalEvent.changedTouches[0].pageY;
+				}
+				position.x = position.x - input.data('selector').find('.miniColors-colors').offset().left - 5;
+				position.y = position.y - input.data('selector').find('.miniColors-colors').offset().top - 5;
+				if( position.x <= -5 ) position.x = -5;
+				if( position.x >= 144 ) position.x = 144;
+				if( position.y <= -5 ) position.y = -5;
+				if( position.y >= 144 ) position.y = 144;
+				
+				input.data('colorPosition', position);
+				colorPicker.css('left', position.x).css('top', position.y).show();
+				
+				// Calculate saturation
+				var s = Math.round((position.x + 5) * 0.67);
+				if( s < 0 ) s = 0;
+				if( s > 100 ) s = 100;
+				
+				// Calculate brightness
+				var b = 100 - Math.round((position.y + 5) * 0.67);
+				if( b < 0 ) b = 0;
+				if( b > 100 ) b = 100;
+				
+				// Update HSB values
+				var hsb = input.data('hsb');
+				hsb.s = s;
+				hsb.b = b;
+				
+				// Set color
+				setColor(input, hsb, true);
+			};
+			
+			var moveHue = function(input, event) {
+				
+				var huePicker = input.data('huePicker');
+				
+				huePicker.hide();
+				
+				var position = {
+					y: event.pageY
+				};
+				
+				// Touch support
+				if( event.originalEvent.changedTouches ) {
+					position.y = event.originalEvent.changedTouches[0].pageY;
+				}
+				
+				position.y = position.y - input.data('selector').find('.miniColors-colors').offset().top - 1;
+				if( position.y <= -1 ) position.y = -1;
+				if( position.y >= 149 ) position.y = 149;
+				input.data('huePosition', position);
+				huePicker.css('top', position.y).show();
+				
+				// Calculate hue
+				var h = Math.round((150 - position.y - 1) * 2.4);
+				if( h < 0 ) h = 0;
+				if( h > 360 ) h = 360;
+				
+				// Update HSB values
+				var hsb = input.data('hsb');
+				hsb.h = h;
+				
+				// Set color
+				setColor(input, hsb, true);
+				
+			};
+			
+			var setColor = function(input, hsb, updateInput) {
+				input.data('hsb', hsb);
+				var hex = hsb2hex(hsb);	
+				if( updateInput ) input.val( '#' + convertCase(hex, input.data('letterCase')) );
+				input.data('trigger').css('backgroundColor', '#' + hex);
+				if( input.data('selector') ) input.data('selector').find('.miniColors-colors').css('backgroundColor', '#' + hsb2hex({ h: hsb.h, s: 100, b: 100 }));
+				
+				// Fire change callback
+				if( input.data('change') ) {
+					if( hex === input.data('lastChange') ) return;
+					input.data('change').call(input.get(0), '#' + hex, hsb2rgb(hsb));
+					input.data('lastChange', hex);
+				}
+				
+			};
+			
+			var setColorFromInput = function(input) {
+				
+				input.val('#' + cleanHex(input.val()));
+				var hex = expandHex(input.val());
+				if( !hex ) return false;
+				
+				// Get HSB equivalent
+				var hsb = hex2hsb(hex);
+				
+				// If color is the same, no change required
+				var currentHSB = input.data('hsb');
+				if( hsb.h === currentHSB.h && hsb.s === currentHSB.s && hsb.b === currentHSB.b ) return true;
+				
+				// Set colorPicker position
+				var colorPosition = getColorPositionFromHSB(hsb);
+				var colorPicker = $(input.data('colorPicker'));
+				colorPicker.css('top', colorPosition.y + 'px').css('left', colorPosition.x + 'px');
+				input.data('colorPosition', colorPosition);
+				
+				// Set huePosition position
+				var huePosition = getHuePositionFromHSB(hsb);
+				var huePicker = $(input.data('huePicker'));
+				huePicker.css('top', huePosition.y + 'px');
+				input.data('huePosition', huePosition);
+				
+				setColor(input, hsb);
+				
+				return true;
+				
+			};
+			
+			var convertCase = function(string, letterCase) {
+				if( letterCase === 'lowercase' ) return string.toLowerCase();
+				if( letterCase === 'uppercase' ) return string.toUpperCase();
+				return string;
+			};
+			
+			var getColorPositionFromHSB = function(hsb) {				
+				var x = Math.ceil(hsb.s / 0.67);
+				if( x < 0 ) x = 0;
+				if( x > 150 ) x = 150;
+				var y = 150 - Math.ceil(hsb.b / 0.67);
+				if( y < 0 ) y = 0;
+				if( y > 150 ) y = 150;
+				return { x: x - 5, y: y - 5 };
+			};
+			
+			var getHuePositionFromHSB = function(hsb) {
+				var y = 150 - (hsb.h / 2.4);
+				if( y < 0 ) h = 0;
+				if( y > 150 ) h = 150;				
+				return { y: y - 1 };
+			};
+			
+			var cleanHex = function(hex) {
+				return hex.replace(/[^A-F0-9]/ig, '');
+			};
+			
+			var expandHex = function(hex) {
+				hex = cleanHex(hex);
+				if( !hex ) return null;
+				if( hex.length === 3 ) hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
+				return hex.length === 6 ? hex : null;
+			};			
+			
+			var hsb2rgb = function(hsb) {
+				var rgb = {};
+				var h = Math.round(hsb.h);
+				var s = Math.round(hsb.s*255/100);
+				var v = Math.round(hsb.b*255/100);
+				if(s === 0) {
+					rgb.r = rgb.g = rgb.b = v;
+				} else {
+					var t1 = v;
+					var t2 = (255 - s) * v / 255;
+					var t3 = (t1 - t2) * (h % 60) / 60;
+					if( h === 360 ) h = 0;
+					if( h < 60 ) { rgb.r = t1; rgb.b = t2; rgb.g = t2 + t3; }
+					else if( h < 120 ) {rgb.g = t1; rgb.b = t2; rgb.r = t1 - t3; }
+					else if( h < 180 ) {rgb.g = t1; rgb.r = t2; rgb.b = t2 + t3; }
+					else if( h < 240 ) {rgb.b = t1; rgb.r = t2; rgb.g = t1 - t3; }
+					else if( h < 300 ) {rgb.b = t1; rgb.g = t2; rgb.r = t2 + t3; }
+					else if( h < 360 ) {rgb.r = t1; rgb.g = t2; rgb.b = t1 - t3; }
+					else { rgb.r = 0; rgb.g = 0; rgb.b = 0; }
+				}
+				return {
+					r: Math.round(rgb.r),
+					g: Math.round(rgb.g),
+					b: Math.round(rgb.b)
+				};
+			};
+			
+			var rgb2hex = function(rgb) {
+				var hex = [
+					rgb.r.toString(16),
+					rgb.g.toString(16),
+					rgb.b.toString(16)
+				];
+				$.each(hex, function(nr, val) {
+					if (val.length === 1) hex[nr] = '0' + val;
+				});
+				return hex.join('');
+			};
+			
+			var hex2rgb = function(hex) {
+				hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
+				
+				return {
+					r: hex >> 16,
+					g: (hex & 0x00FF00) >> 8,
+					b: (hex & 0x0000FF)
+				};
+			};
+			
+			var rgb2hsb = function(rgb) {
+				var hsb = { h: 0, s: 0, b: 0 };
+				var min = Math.min(rgb.r, rgb.g, rgb.b);
+				var max = Math.max(rgb.r, rgb.g, rgb.b);
+				var delta = max - min;
+				hsb.b = max;
+				hsb.s = max !== 0 ? 255 * delta / max : 0;
+				if( hsb.s !== 0 ) {
+					if( rgb.r === max ) {
+						hsb.h = (rgb.g - rgb.b) / delta;
+					} else if( rgb.g === max ) {
+						hsb.h = 2 + (rgb.b - rgb.r) / delta;
+					} else {
+						hsb.h = 4 + (rgb.r - rgb.g) / delta;
+					}
+				} else {
+					hsb.h = -1;
+				}
+				hsb.h *= 60;
+				if( hsb.h < 0 ) {
+					hsb.h += 360;
+				}
+				hsb.s *= 100/255;
+				hsb.b *= 100/255;
+				return hsb;
+			};			
+			
+			var hex2hsb = function(hex) {
+				var hsb = rgb2hsb(hex2rgb(hex));
+				// Zero out hue marker for black, white, and grays (saturation === 0)
+				if( hsb.s === 0 ) hsb.h = 360;
+				return hsb;
+			};
+			
+			var hsb2hex = function(hsb) {
+				return rgb2hex(hsb2rgb(hsb));
+			};
+
+			
+			// Handle calls to $([selector]).miniColors()
+			switch(o) {
+			
+				case 'readonly':
+					
+					$(this).each( function() {
+						if( !$(this).hasClass('miniColors') ) return;
+						$(this).prop('readonly', data);
+					});
+					
+					return $(this);
+				
+				case 'disabled':
+					
+					$(this).each( function() {
+						if( !$(this).hasClass('miniColors') ) return;
+						if( data ) {
+							disable($(this));
+						} else {
+							enable($(this));
+						}
+					});
+										
+					return $(this);
+			
+				case 'value':
+					
+					// Getter
+					if( data === undefined ) {
+						if( !$(this).hasClass('miniColors') ) return;
+						var input = $(this),
+							hex = expandHex(input.val());
+						return hex ? '#' + convertCase(hex, input.data('letterCase')) : null;
+					}
+					
+					// Setter
+					$(this).each( function() {
+						if( !$(this).hasClass('miniColors') ) return;
+						$(this).val(data);
+						setColorFromInput($(this));
+					});
+					
+					return $(this);
+					
+				case 'destroy':
+					
+					$(this).each( function() {
+						if( !$(this).hasClass('miniColors') ) return;
+						destroy($(this));
+					});
+										
+					return $(this);
+				
+				default:
+					
+					if( !o ) o = {};
+					
+					$(this).each( function() {
+						
+						// Must be called on an input element
+						if( $(this)[0].tagName.toLowerCase() !== 'input' ) return;
+						
+						// If a trigger is present, the control was already created
+						if( $(this).data('trigger') ) return;
+						
+						// Create the control
+						create($(this), o, data);
+						
+					});
+					
+					return $(this);
+					
+			}
+			
+		}
+			
+	});
+	
+})(jQuery);
\ No newline at end of file
diff --git a/3rdparty/miniColors/js/jquery.miniColors.min.js b/3rdparty/miniColors/js/jquery.miniColors.min.js
new file mode 100755
index 0000000000..c00e0ace6b
--- /dev/null
+++ b/3rdparty/miniColors/js/jquery.miniColors.min.js
@@ -0,0 +1,9 @@
+/*
+ * jQuery miniColors: A small color selector
+ *
+ * Copyright 2011 Cory LaViska for A Beautiful Site, LLC. (http://abeautifulsite.net/)
+ *
+ * Dual licensed under the MIT or GPL Version 2 licenses
+ *
+*/
+if(jQuery)(function($){$.extend($.fn,{miniColors:function(o,data){var create=function(input,o,data){var color=expandHex(input.val());if(!color)color='ffffff';var hsb=hex2hsb(color);var trigger=$('<a class="miniColors-trigger" style="background-color: #'+color+'" href="#"></a>');trigger.insertAfter(input);input.addClass('miniColors').data('original-maxlength',input.attr('maxlength')||null).data('original-autocomplete',input.attr('autocomplete')||null).data('letterCase','uppercase').data('trigger',trigger).data('hsb',hsb).data('change',o.change?o.change:null).data('close',o.close?o.close:null).data('open',o.open?o.open:null).attr('maxlength',7).attr('autocomplete','off').val('#'+convertCase(color,o.letterCase));if(o.readonly)input.prop('readonly',true);if(o.disabled)disable(input);trigger.bind('click.miniColors',function(event){event.preventDefault();if(input.val()==='')input.val('#');show(input)});input.bind('focus.miniColors',function(event){if(input.val()==='')input.val('#');show(input)});input.bind('blur.miniColors',function(event){var hex=expandHex(hsb2hex(input.data('hsb')));input.val(hex?'#'+convertCase(hex,input.data('letterCase')):'')});input.bind('keydown.miniColors',function(event){if(event.keyCode===9)hide(input)});input.bind('keyup.miniColors',function(event){setColorFromInput(input)});input.bind('paste.miniColors',function(event){setTimeout(function(){setColorFromInput(input)},5)})};var destroy=function(input){hide();input=$(input);input.data('trigger').remove();input.attr('autocomplete',input.data('original-autocomplete')).attr('maxlength',input.data('original-maxlength')).removeData().removeClass('miniColors').unbind('.miniColors');$(document).unbind('.miniColors')};var enable=function(input){input.prop('disabled',false).data('trigger').css('opacity',1)};var disable=function(input){hide(input);input.prop('disabled',true).data('trigger').css('opacity',0.5)};var show=function(input){if(input.prop('disabled'))return false;hide();var selector=$('<div class="miniColors-selector"></div>');selector.append('<div class="miniColors-colors" style="background-color: #FFF;"><div class="miniColors-colorPicker"><div class="miniColors-colorPicker-inner"></div></div>').append('<div class="miniColors-hues"><div class="miniColors-huePicker"></div></div>').css({top:input.is(':visible')?input.offset().top+input.outerHeight():input.data('trigger').offset().top+input.data('trigger').outerHeight(),left:input.is(':visible')?input.offset().left:input.data('trigger').offset().left,display:'none'}).addClass(input.attr('class'));var hsb=input.data('hsb');selector.find('.miniColors-colors').css('backgroundColor','#'+hsb2hex({h:hsb.h,s:100,b:100}));var colorPosition=input.data('colorPosition');if(!colorPosition)colorPosition=getColorPositionFromHSB(hsb);selector.find('.miniColors-colorPicker').css('top',colorPosition.y+'px').css('left',colorPosition.x+'px');var huePosition=input.data('huePosition');if(!huePosition)huePosition=getHuePositionFromHSB(hsb);selector.find('.miniColors-huePicker').css('top',huePosition.y+'px');input.data('selector',selector).data('huePicker',selector.find('.miniColors-huePicker')).data('colorPicker',selector.find('.miniColors-colorPicker')).data('mousebutton',0);$('BODY').append(selector);selector.fadeIn(100);selector.bind('selectstart',function(){return false});$(document).bind('mousedown.miniColors touchstart.miniColors',function(event){input.data('mousebutton',1);var testSubject=$(event.target).parents().andSelf();if(testSubject.hasClass('miniColors-colors')){event.preventDefault();input.data('moving','colors');moveColor(input,event)}if(testSubject.hasClass('miniColors-hues')){event.preventDefault();input.data('moving','hues');moveHue(input,event)}if(testSubject.hasClass('miniColors-selector')){event.preventDefault();return}if(testSubject.hasClass('miniColors'))return;hide(input)});$(document).bind('mouseup.miniColors touchend.miniColors',function(event){event.preventDefault();input.data('mousebutton',0).removeData('moving')}).bind('mousemove.miniColors touchmove.miniColors',function(event){event.preventDefault();if(input.data('mousebutton')===1){if(input.data('moving')==='colors')moveColor(input,event);if(input.data('moving')==='hues')moveHue(input,event)}});if(input.data('open')){input.data('open').call(input.get(0),'#'+hsb2hex(hsb),hsb2rgb(hsb))}};var hide=function(input){if(!input)input='.miniColors';$(input).each(function(){var selector=$(this).data('selector');$(this).removeData('selector');$(selector).fadeOut(100,function(){if(input.data('close')){var hsb=input.data('hsb'),hex=hsb2hex(hsb);input.data('close').call(input.get(0),'#'+hex,hsb2rgb(hsb))}$(this).remove()})});$(document).unbind('.miniColors')};var moveColor=function(input,event){var colorPicker=input.data('colorPicker');colorPicker.hide();var position={x:event.pageX,y:event.pageY};if(event.originalEvent.changedTouches){position.x=event.originalEvent.changedTouches[0].pageX;position.y=event.originalEvent.changedTouches[0].pageY}position.x=position.x-input.data('selector').find('.miniColors-colors').offset().left-5;position.y=position.y-input.data('selector').find('.miniColors-colors').offset().top-5;if(position.x<=-5)position.x=-5;if(position.x>=144)position.x=144;if(position.y<=-5)position.y=-5;if(position.y>=144)position.y=144;input.data('colorPosition',position);colorPicker.css('left',position.x).css('top',position.y).show();var s=Math.round((position.x+5)*0.67);if(s<0)s=0;if(s>100)s=100;var b=100-Math.round((position.y+5)*0.67);if(b<0)b=0;if(b>100)b=100;var hsb=input.data('hsb');hsb.s=s;hsb.b=b;setColor(input,hsb,true)};var moveHue=function(input,event){var huePicker=input.data('huePicker');huePicker.hide();var position={y:event.pageY};if(event.originalEvent.changedTouches){position.y=event.originalEvent.changedTouches[0].pageY}position.y=position.y-input.data('selector').find('.miniColors-colors').offset().top-1;if(position.y<=-1)position.y=-1;if(position.y>=149)position.y=149;input.data('huePosition',position);huePicker.css('top',position.y).show();var h=Math.round((150-position.y-1)*2.4);if(h<0)h=0;if(h>360)h=360;var hsb=input.data('hsb');hsb.h=h;setColor(input,hsb,true)};var setColor=function(input,hsb,updateInput){input.data('hsb',hsb);var hex=hsb2hex(hsb);if(updateInput)input.val('#'+convertCase(hex,input.data('letterCase')));input.data('trigger').css('backgroundColor','#'+hex);if(input.data('selector'))input.data('selector').find('.miniColors-colors').css('backgroundColor','#'+hsb2hex({h:hsb.h,s:100,b:100}));if(input.data('change')){if(hex===input.data('lastChange'))return;input.data('change').call(input.get(0),'#'+hex,hsb2rgb(hsb));input.data('lastChange',hex)}};var setColorFromInput=function(input){input.val('#'+cleanHex(input.val()));var hex=expandHex(input.val());if(!hex)return false;var hsb=hex2hsb(hex);var currentHSB=input.data('hsb');if(hsb.h===currentHSB.h&&hsb.s===currentHSB.s&&hsb.b===currentHSB.b)return true;var colorPosition=getColorPositionFromHSB(hsb);var colorPicker=$(input.data('colorPicker'));colorPicker.css('top',colorPosition.y+'px').css('left',colorPosition.x+'px');input.data('colorPosition',colorPosition);var huePosition=getHuePositionFromHSB(hsb);var huePicker=$(input.data('huePicker'));huePicker.css('top',huePosition.y+'px');input.data('huePosition',huePosition);setColor(input,hsb);return true};var convertCase=function(string,letterCase){if(letterCase==='lowercase')return string.toLowerCase();if(letterCase==='uppercase')return string.toUpperCase();return string};var getColorPositionFromHSB=function(hsb){var x=Math.ceil(hsb.s/0.67);if(x<0)x=0;if(x>150)x=150;var y=150-Math.ceil(hsb.b/0.67);if(y<0)y=0;if(y>150)y=150;return{x:x-5,y:y-5}};var getHuePositionFromHSB=function(hsb){var y=150-(hsb.h/2.4);if(y<0)h=0;if(y>150)h=150;return{y:y-1}};var cleanHex=function(hex){return hex.replace(/[^A-F0-9]/ig,'')};var expandHex=function(hex){hex=cleanHex(hex);if(!hex)return null;if(hex.length===3)hex=hex[0]+hex[0]+hex[1]+hex[1]+hex[2]+hex[2];return hex.length===6?hex:null};var hsb2rgb=function(hsb){var rgb={};var h=Math.round(hsb.h);var s=Math.round(hsb.s*255/100);var v=Math.round(hsb.b*255/100);if(s===0){rgb.r=rgb.g=rgb.b=v}else{var t1=v;var t2=(255-s)*v/255;var t3=(t1-t2)*(h%60)/60;if(h===360)h=0;if(h<60){rgb.r=t1;rgb.b=t2;rgb.g=t2+t3}else if(h<120){rgb.g=t1;rgb.b=t2;rgb.r=t1-t3}else if(h<180){rgb.g=t1;rgb.r=t2;rgb.b=t2+t3}else if(h<240){rgb.b=t1;rgb.r=t2;rgb.g=t1-t3}else if(h<300){rgb.b=t1;rgb.g=t2;rgb.r=t2+t3}else if(h<360){rgb.r=t1;rgb.g=t2;rgb.b=t1-t3}else{rgb.r=0;rgb.g=0;rgb.b=0}}return{r:Math.round(rgb.r),g:Math.round(rgb.g),b:Math.round(rgb.b)}};var rgb2hex=function(rgb){var hex=[rgb.r.toString(16),rgb.g.toString(16),rgb.b.toString(16)];$.each(hex,function(nr,val){if(val.length===1)hex[nr]='0'+val});return hex.join('')};var hex2rgb=function(hex){hex=parseInt(((hex.indexOf('#')>-1)?hex.substring(1):hex),16);return{r:hex>>16,g:(hex&0x00FF00)>>8,b:(hex&0x0000FF)}};var rgb2hsb=function(rgb){var hsb={h:0,s:0,b:0};var min=Math.min(rgb.r,rgb.g,rgb.b);var max=Math.max(rgb.r,rgb.g,rgb.b);var delta=max-min;hsb.b=max;hsb.s=max!==0?255*delta/max:0;if(hsb.s!==0){if(rgb.r===max){hsb.h=(rgb.g-rgb.b)/delta}else if(rgb.g===max){hsb.h=2+(rgb.b-rgb.r)/delta}else{hsb.h=4+(rgb.r-rgb.g)/delta}}else{hsb.h=-1}hsb.h*=60;if(hsb.h<0){hsb.h+=360}hsb.s*=100/255;hsb.b*=100/255;return hsb};var hex2hsb=function(hex){var hsb=rgb2hsb(hex2rgb(hex));if(hsb.s===0)hsb.h=360;return hsb};var hsb2hex=function(hsb){return rgb2hex(hsb2rgb(hsb))};switch(o){case'readonly':$(this).each(function(){if(!$(this).hasClass('miniColors'))return;$(this).prop('readonly',data)});return $(this);case'disabled':$(this).each(function(){if(!$(this).hasClass('miniColors'))return;if(data){disable($(this))}else{enable($(this))}});return $(this);case'value':if(data===undefined){if(!$(this).hasClass('miniColors'))return;var input=$(this),hex=expandHex(input.val());return hex?'#'+convertCase(hex,input.data('letterCase')):null}$(this).each(function(){if(!$(this).hasClass('miniColors'))return;$(this).val(data);setColorFromInput($(this))});return $(this);case'destroy':$(this).each(function(){if(!$(this).hasClass('miniColors'))return;destroy($(this))});return $(this);default:if(!o)o={};$(this).each(function(){if($(this)[0].tagName.toLowerCase()!=='input')return;if($(this).data('trigger'))return;create($(this),o,data)});return $(this)}}})})(jQuery);
\ No newline at end of file

From 9ea34cae43c20206e02ff12040ab558b4ba64d80 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 29 Jun 2012 22:12:39 +0200
Subject: [PATCH 0816/1537] Simplified remote.php file loading

---
 remote.php | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/remote.php b/remote.php
index af48cd922c..bdce867aab 100644
--- a/remote.php
+++ b/remote.php
@@ -25,27 +25,17 @@ if(is_null($file)){
 
 $file = ltrim ($file, '/');
 
-if(count(explode('/',$file)) == 2) {
-	$parts=explode('/',$file);
-	$app=$parts[0];
-	switch ($app) {
-		case 'files':
-			OC_Util::checkAppEnabled($app);
-			OC_App::loadApp($app);
-			break;
-		case 'core':
-			break;
-		default:
-			OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
-			exit;
-	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once( OC::$SERVERROOT.'/'.$file);
-} else {
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
-	OC_Util::checkAppEnabled($app);
-	OC_App::loadApp($app);
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
+$parts=explode('/', $file, 2);
+$app=$parts[0];
+switch ($app) {
+	default:
+		OC_Util::checkAppEnabled($app);
+		OC_App::loadApp($app);
+		$file = OC_App::getAppPath($app) .'/'. $parts[1];
+		break;
+	case 'core':
+		$file =  OC::$SERVERROOT .'/'. $file;
+		break;
 }
+$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+require_once($file);

From 621b83df72cdafd41e033c250a000a05b5a2eb97 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 3 Jul 2012 17:53:09 +0200
Subject: [PATCH 0817/1537] Remove referer check, this is unreliable. The
 header doesnt need te exist, or can be wrong

---
 lib/base.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index c2b0bbef78..fe69ad70c0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -330,21 +330,6 @@ class OC{
 
 		self::checkInstalled();
 		self::checkSSL();
-
-		// CSRF protection
-		if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
-		$refererhost=parse_url($referer);
-		if(isset($refererhost['host'])) $refererhost=$refererhost['host']; else $refererhost='';
-		$server=OC_Helper::serverHost();
-		$serverhost=explode(':',$server);
-		$serverhost=$serverhost['0'];
-		if(!self::$CLI){
-			if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
-				$url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';
-				header("Location: $url");
-				exit();
-			}
-		}
 		self::initSession();
 		self::initTemplateEngine();
 		self::checkUpgrade();

From 280c59e91482660fb9a6f3ccf3f4b6df97883f5c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 3 Jul 2012 17:54:12 +0200
Subject: [PATCH 0818/1537] More helpfull debug msg for redirectToDefaultPage

---
 lib/util.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 0d9f412944..2a7b8a922f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -324,16 +324,17 @@ class OC_Util {
 	* Redirect to the user default page
 	*/
 	public static function redirectToDefaultPage(){
-		OC_Log::write('core','redirectToDefaultPage',OC_Log::DEBUG);
 		if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
-			header( 'Location: '.$_REQUEST['redirect_url']);
+			$location = $_REQUEST['redirect_url'];
 		}
 		else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
-			header( 'Location: '.OC::$WEBROOT.'/?app='.OC::$REQUESTEDAPP );
+			$location = OC::$WEBROOT.'/?app='.OC::$REQUESTEDAPP;
 		}
 		else {
-			header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));
+			$location = OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files');
 		}
+		OC_Log::write('core', 'redirectToDefaultPage: '.$location, OC_Log::DEBUG);
+		header( 'Location: '.$location );
 		exit();
 	}
 

From a4c28931289ea2d93f9338f43a8b2c647cf6535e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 4 Jul 2012 21:14:40 +0200
Subject: [PATCH 0819/1537] some more work on calendar import - new import is
 (nearly) done

---
 apps/calendar/ajax/import/import.php    |  2 +-
 apps/calendar/appinfo/app.php           |  2 ++
 apps/calendar/css/import.css            |  7 +++++--
 apps/calendar/js/loader.js              | 23 +++++++++++++++++++++--
 apps/calendar/templates/part.import.php | 17 +++++++++++++++--
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index b5a97e5d12..cbb4b55056 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -37,7 +37,7 @@ if($_POST['method'] == 'new'){
 		$newcal = true;
 	}
 	if($newcal){
-		$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), strip_tags($_POST['calname']),'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
+		$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), strip_tags($_POST['calname']),'VEVENT,VTODO,VJOURNAL',null,0,strip_tags($_POST['calcolor']));
 		OC_Calendar_Calendar::setCalendarActive($id, 1);
 	}
 }else{
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index b9357d574e..09b18ed397 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -24,6 +24,8 @@ OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Share', 'pos
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
+OCP\Util::addStyle('3rdparty/miniColors', 'jquery.miniColors');
+OCP\Util::addscript('3rdparty/miniColors', 'jquery.miniColors.min');
 OCP\App::addNavigationEntry( array(
   'id' => 'calendar_index',
   'order' => 10,
diff --git a/apps/calendar/css/import.css b/apps/calendar/css/import.css
index 46bab2b7cf..8abdc3aecd 100644
--- a/apps/calendar/css/import.css
+++ b/apps/calendar/css/import.css
@@ -7,5 +7,8 @@
 #calendar_import_newcalform, #calendar_import_mergewarning, #calendar_import_process, #calendar_import_done{display:none;}
 #calendar_import_process_message, #calendar_import_status, #calendar_import_form_message, #calendar_import_mergewarning{text-align:center;}
 #calendar_import_form_message{font-weight: bold;}
-#calendar_import_newcalendar{width:96%;}
-.calendar_import_warning{border-color: #fc3333;}
\ No newline at end of file
+#calendar_import_newcalendar{width:415px;float:right;}
+#calendar_import_mergewarning{clear: both;}
+#calendar_import_defaultcolors{clear:both;margin: 0 auto;text-align: center;}
+.calendar_import_warning{border-color: #fc3333;}
+.calendar-colorpicker-color{display:inline-block;width:20px;height:5px;margin: 0 auto;cursor:pointer;border:2px solid transparent;}
\ No newline at end of file
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 77199a5327..b28d19ab00 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -11,6 +11,7 @@ Calendar_Import={
 		id: 0,
 		method: '',
 		calname: '',
+		calcolor: '',
 		progresskey: '',
 		percentage: 0
 	},
@@ -33,6 +34,7 @@ Calendar_Import={
 			//init dialog
 			$('#calendar_import_dialog').dialog({
 				width : 500,
+				resizable: false,
 				close : function() {
 					Calendar_Import.Dialog.close();
 				}
@@ -44,6 +46,10 @@ Calendar_Import={
 			$('#calendar_import_submit').click(function(){
 				Calendar_Import.Core.process();
 			});
+			$('#calendar_import_mergewarning').click(function(){
+				$('#calendar_import_newcalendar').attr('value', $('#calendar_import_availablename').val());
+				Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
+			});
 			$('#calendar_import_calendar').change(function(){
 				if($('#calendar_import_calendar option:selected').val() == 'newcal'){
 					$('#calendar_import_newcalform').slideDown('slow');
@@ -54,7 +60,16 @@ Calendar_Import={
 				}
 			});
 			$('#calendar_import_newcalendar').keyup(function(){
-				Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
+				Calendar_Import.Dialog.mergewarning($.trim($('#calendar_import_newcalendar').val()));
+			});
+			$('#calendar_import_newcalendar_color').miniColors({
+				letterCase: 'uppercase'
+			});
+			$('.calendar-colorpicker-color').click(function(){
+				var str = $(this).attr('rel');
+				str = str.substr(1);
+				$('#calendar_import_newcalendar_color').attr('value', str);
+				$(".color-picker").miniColors('value', '#' + str);
 			});
 			//init progressbar
 			$('#calendar_import_progressbar').progressbar({value: Calendar_Import.Store.percentage});
@@ -114,7 +129,7 @@ Calendar_Import={
 		},
 		send: function(){
 			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), 
-			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.file), id: String (Calendar_Import.Store.id)}, function(data){
+			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.file), id: String (Calendar_Import.Store.id), calcolor: String (Calendar_Import.Store.calcolor)}, function(data){
 				if(data.status == 'success'){
 					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
 					Calendar_Import.Store.percentage = 100;
@@ -136,6 +151,10 @@ Calendar_Import={
 					Calendar_Import.Dialog.warning('#calendar_import_newcalendar');
 					return false;
 				}
+				Calendar_Import.Store.calcolor = $.trim($('#calendar_import_newcalendar_color').val());
+				if(Calendar_Import.Store.calcolor == ''){
+					Calendar_Import.Store.calcolor = $('.calendar-colorpicker-color:first').attr('rel');
+				}
 			}else{
 				Calendar_Import.Store.method = 'old';
 			}
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index 1029cdd925..2ce3cc3423 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -5,11 +5,14 @@ if(!$file){
 	OCP\JSON::error(array('error'=>'404'));
 }
 $import = new OC_Calendar_Import($file);
+$import->setUserID(OCP\User::getUser());
 $newcalendarname = strip_tags($import->createCalendarName());
-$guessedcalendarname = $import->guessCalendarName();
+$guessedcalendarname = strip_tags($import->guessCalendarName());
+$calendarcolor = strip_tags($import->createCalendarColor());
 //loading calendars for select box
 $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
 $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
+$defaultcolors = OC_Calendar_Calendar::getCalendarColorOptions();
 ?>
 <div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file");?>">
 <div id="calendar_import_form">
@@ -17,6 +20,7 @@ $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new c
 		<input type="hidden" id="calendar_import_filename" value="<?php echo $_['filename'];?>">
 		<input type="hidden" id="calendar_import_path" value="<?php echo $_['path'];?>">
 		<input type="hidden" id="calendar_import_progresskey" value="<?php echo rand() ?>">
+		<input type="hidden" id="calendar_import_availablename" value="<?php echo $newcalendarname ?>">
 		<div id="calendar_import_form_message"><?php echo $l->t('Please choose a calendar'); ?></div>
 		<select style="width:100%;" id="calendar_import_calendar" name="calendar_import_calendar">
 		<?php
@@ -26,8 +30,17 @@ $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new c
 		echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 		?>
 		</select>
+		<br><br>
 		<div id="calendar_import_newcalform">
-			<input id="calendar_import_newcalendar"  class="" type="text" placeholder="<?php echo $l->t('Name of new calendar'); ?>" value="<?php echo $newcalendarname ?>"><br>
+			<input id="calendar_import_newcalendar_color" class="color-picker" type="hidden" size="6" value="<?php echo substr($calendarcolor,1); ?>">
+			<input id="calendar_import_newcalendar"  class="" type="text" placeholder="<?php echo $l->t('Name of new calendar'); ?>" value="<?php echo $guessedcalendarname ?>"><br>
+			<div id="calendar_import_defaultcolors">
+				<?php
+				foreach($defaultcolors as $color){
+					echo '<span class="calendar-colorpicker-color" rel="' . $color . '" style="background-color: ' . $color .  ';"></span>';
+				}
+				?>
+			</div>
 			<!--<input id="calendar_import_generatename" type="button" class="button" value="<?php echo $l->t('Take an available name!'); ?>"><br>-->
 			<div  id="calendar_import_mergewarning" class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></div>
 		</div>

From 706a13544ba1aa022b1642baac53d8070c268cc4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 22:12:56 +0200
Subject: [PATCH 0820/1537] Remove ugly activation hack.

---
 apps/contacts/appinfo/database.xml |   8 ++
 apps/contacts/appinfo/version      |   2 +-
 apps/contacts/js/contacts.js       |  19 ++--
 apps/contacts/lib/addressbook.php  | 157 +++++++++++------------------
 4 files changed, 78 insertions(+), 108 deletions(-)

diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
index 7c8268d71f..dc469ca0a0 100644
--- a/apps/contacts/appinfo/database.xml
+++ b/apps/contacts/appinfo/database.xml
@@ -62,6 +62,14 @@
     <length>4</length>
    </field>
 
+   <field>
+    <name>active</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <length>4</length>
+   </field>
+
   </declaration>
 
  </table>
diff --git a/apps/contacts/appinfo/version b/apps/contacts/appinfo/version
index 2f4536184b..7dff5b8921 100644
--- a/apps/contacts/appinfo/version
+++ b/apps/contacts/appinfo/version
@@ -1 +1 @@
-0.2
\ No newline at end of file
+0.2.1
\ No newline at end of file
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 5be1fa6129..d4b3ef588b 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1359,13 +1359,18 @@ Contacts={
 				}
 				return false;
 			},
-			activation:function(checkbox, bookid)
-			{
-				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
-				  function(data) {
-					if (data.status == 'success'){
-						checkbox.checked = data.active == 1;
-						Contacts.UI.Contacts.update();
+			activation:function(checkbox, bookid){
+				var active = checkbox.checked;
+				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), {bookid: bookid, active: (active?1:0)}, function(jsondata) {
+					if (jsondata.status == 'success'){
+						if(!active) {
+							$('#contacts h3[data-id="'+bookid+'"],#contacts ul[data-id="'+bookid+'"]').remove();
+						} else {
+							Contacts.UI.Contacts.update();
+						}
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						checkbox.checked = !active;
 					}
 				  });
 			},
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 86a41b18cf..f33f4a204e 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -41,27 +41,62 @@ class OC_Contacts_Addressbook{
 	/**
 	 * @brief Returns the list of addressbooks for a specific user.
 	 * @param string $uid
+	 * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
 	 * @return array or false.
 	 */
-	public static function all($uid){
+	public static function all($uid, $active=false){
+		$values = array($uid);
+		$active_where = '';
+		if ($active){
+			$active_where = ' AND active = ?';
+			$values[] = 1;
+		}
 		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
-			$result = $stmt->execute(array($uid));
+			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ' . $active_where . ' ORDER BY displayname' );
+			$result = $stmt->execute($values);
 		} catch(Exception $e) {
 			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(),OCP\Util::ERROR);
 			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' uid: '.$uid,OCP\Util::DEBUG);
 			return false;
 		}
 
-
 		$addressbooks = array();
 		while( $row = $result->fetchRow()){
 			$addressbooks[] = $row;
 		}
+		if(!$active && !count($addressbooks)) {
+			self::addDefault($uid);
+		}
 
 		return $addressbooks;
 	}
 
+	/**
+	 * @brief Get active addressbook IDs for a user.
+	 * @param integer $uid User id. If null current user will be used.
+	 * @return array
+	 */
+	public static function activeIds($uid = null){
+		if(is_null($uid)){
+			$uid = OCP\USER::getUser();
+		}
+		$activeaddressbooks = self::all($uid, true);
+		$ids = array();
+		foreach($activeaddressbooks as $addressbook) {
+			$ids[] = $addressbook['userid'];
+		}
+		return $ids;
+	}
+
+	/**
+	 * @brief Returns the list of active addressbooks for a specific user.
+	 * @param string $uid
+	 * @return array
+	 */
+	public static function active($uid){
+		return self::all($uid, true);
+	}
+
 	/**
 	 * @brief Returns the list of addressbooks for a principal (DAV term of user)
 	 * @param string $principaluri
@@ -186,77 +221,6 @@ class OC_Contacts_Addressbook{
 		return true;
 	}
 
-	public static function cleanArray($array, $remove_null_number = true){
-		$new_array = array();
-
-		$null_exceptions = array();
-
-		foreach ($array as $key => $value){
-			$value = trim($value);
-
-			if($remove_null_number){
-				$null_exceptions[] = '0';
-			}
-
-			if(!in_array($value, $null_exceptions) && $value != "")	{
-				$new_array[] = $value;
-			}
-		}
-		return $new_array;
-	}
-
-	/**
-	 * @brief Get active addressbooks for a user.
-	 * @param integer $uid User id. If null current user will be used.
-	 * @return array
-	 */
-	public static function activeIds($uid = null){
-		if(is_null($uid)){
-			$uid = OCP\USER::getUser();
-		}
-		$prefbooks = OCP\Config::getUserValue($uid,'contacts','openaddressbooks',null);
-		if(!$prefbooks){
-			$addressbooks = OC_Contacts_Addressbook::all($uid);
-			if(count($addressbooks) == 0){
-				self::addDefault($uid);
-			}
-		}
-		$prefbooks = OCP\Config::getUserValue($uid,'contacts','openaddressbooks',null);
-		return explode(';',$prefbooks);
-	}
-
-	/**
-	 * @brief Returns the list of active addressbooks for a specific user.
-	 * @param string $uid
-	 * @return array
-	 */
-	public static function active($uid){
-		if(is_null($uid)){
-			$uid = OCP\USER::getUser();
-		}
-		$active = self::activeIds($uid);
-		$addressbooks = array();
-		$ids_sql = join(',', array_fill(0, count($active), '?'));
-		$prep = 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN ('.$ids_sql.') ORDER BY displayname';
-		try {
-			$stmt = OCP\DB::prepare( $prep );
-			$result = $stmt->execute($active);
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uid: '.$uid,OCP\Util::DEBUG);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '.join(',', $active),OCP\Util::DEBUG);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', SQL:'.$prep,OCP\Util::DEBUG);
-		}
-
-		while( $row = $result->fetchRow()){
-			$addressbooks[] = $row;
-		}
-		if(!count($addressbooks)) {
-			self::addDefault($uid);
-		}
-		return $addressbooks;
-	}
-
 	/**
 	 * @brief Activates an addressbook
 	 * @param integer $id
@@ -264,30 +228,16 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function setActive($id,$active){
-		// Need these ones for checking uri
-		//$addressbook = self::find($id);
-
-		if(is_null($id)){
-			$id = 0;
+		$sql = 'UPDATE *PREFIX*contacts_addressbooks SET active = ? WHERE id = ?';
+		OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id.', active: '.intval($active),OCP\Util::ERROR);
+		try {
+			$stmt = OCP\DB::prepare($sql);
+			$stmt->execute(array(intval($active), $id));
+			return true;
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(),OCP\Util::ERROR);
+			return false;
 		}
-
-		$openaddressbooks = self::activeIds();
-		if($active) {
-			if(!in_array($id, $openaddressbooks)) {
-				$openaddressbooks[] = $id;
-			}
-		} else { 
-			if(in_array($id, $openaddressbooks)) {
-				unset($openaddressbooks[array_search($id, $openaddressbooks)]);
-			}
-		}
-		// NOTE: Ugly hack...
-		$openaddressbooks = self::cleanArray($openaddressbooks, false);
-		sort($openaddressbooks, SORT_NUMERIC);
-		// FIXME: I alway end up with a ';' prepending when imploding the array..?
-		OCP\Config::setUserValue(OCP\USER::getUser(),'contacts','openaddressbooks',implode(';', $openaddressbooks));
-
-		return true;
 	}
 
 	/**
@@ -296,8 +246,15 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function isActive($id){
-		//OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OCP\Util::DEBUG);
-		return in_array($id, self::activeIds());
+		$sql = 'SELECT active FROM *PREFIX*contacts_addressbooks WHERE id = ?';
+		try {
+			$stmt = OCP\DB::prepare( $sql );
+			$result = $stmt->execute(array($id));
+			$row = $result->fetchRow();
+			return (bool)$row['active'];
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+		}
 	}
 
 	/**

From 5d79444852cdc12f976264c21409311a475cf54f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 22:58:31 +0200
Subject: [PATCH 0821/1537] Missing update script.

---
 apps/contacts/appinfo/update.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 apps/contacts/appinfo/update.php

diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php
new file mode 100644
index 0000000000..873899f578
--- /dev/null
+++ b/apps/contacts/appinfo/update.php
@@ -0,0 +1,25 @@
+<?php
+
+$installedVersion=OCP\Config::getAppValue('contacts', 'installed_version');
+if (version_compare($installedVersion, '0.2.90', '<')) {
+	// First set all address books in-active.
+	$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET active=0' );
+	$result = $stmt->execute(array());
+	
+	// Then get all the active address books.
+	$stmt = OCP\DB::prepare( 'SELECT userid,configvalue FROM *PREFIX*preferences WHERE appid=\'contacts\' AND configkey=\'openaddressbooks\'' );
+	$result = $stmt->execute(array());
+	
+	// Prepare statement for updating the new 'active' field.
+	$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET active=? WHERE id=? AND userid=?' );
+	while( $row = $result->fetchRow()) {
+		$ids = explode(';', $row['configvalue']);
+		foreach($ids as $id) {
+			$r = $stmt->execute(array(1, $id, $row['userid']));
+		}
+	}
+	
+	// Remove the old preferences.
+	$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE appid=\'contacts\' AND configkey=\'openaddressbooks\'' );
+	$result = $stmt->execute(array());
+}

From dac2c14ae932187f30b045bf700680d75375b9fa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 5 Jul 2012 00:37:08 +0200
Subject: [PATCH 0822/1537] Add missing CSRF check.

---
 apps/contacts/ajax/uploadimport.php | 1 +
 apps/contacts/js/contacts.js        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index c1e9c8b1ad..9511520828 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -23,6 +23,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 require_once('loghandler.php');
 
 $view = OCP\Files::getStorage('contacts');
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d4b3ef588b..25fc122bf3 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1465,7 +1465,7 @@ Contacts={
 							}
 						}
 					};
-					xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadimport.php') + '?file='+encodeURIComponent(file.name), true);
+					xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadimport.php') + '?file='+encodeURIComponent(file.name)+'&requesttoken='+requesttoken, true);
 					xhr.setRequestHeader('Cache-Control', 'no-cache');
 					xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 					xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));

From 9d00f4d2fb0c881eadfedc5de6537da4133eda7b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 5 Jul 2012 00:40:11 +0200
Subject: [PATCH 0823/1537] Correct db default value.

---
 apps/contacts/appinfo/database.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
index dc469ca0a0..9b269d765d 100644
--- a/apps/contacts/appinfo/database.xml
+++ b/apps/contacts/appinfo/database.xml
@@ -65,7 +65,7 @@
    <field>
     <name>active</name>
     <type>integer</type>
-    <default>0</default>
+    <default>1</default>
     <notnull>true</notnull>
     <length>4</length>
    </field>

From f86ecb3bf7af9e41d5d3b041ea5ee1bf4fbeb634 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 11:28:32 +0200
Subject: [PATCH 0824/1537] send ca cert path to sabredav client

---
 3rdparty/Sabre/DAV/Client.php      | 9 +++++++++
 apps/files_external/lib/webdav.php | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
index 23bd7c0539..d257c86da1 100644
--- a/3rdparty/Sabre/DAV/Client.php
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -22,6 +22,7 @@ class Sabre_DAV_Client {
     protected $userName;
     protected $password;
     protected $proxy;
+    protected $capath;
 
     /**
      * Constructor
@@ -49,6 +50,11 @@ class Sabre_DAV_Client {
             'proxy'
         );
 
+        $this->capath = '';
+        if (isset($settings['capath'])) {
+        	$this->capath = $settings['capath'];
+        }
+
         foreach($validSettings as $validSetting) {
             if (isset($settings[$validSetting])) {
                 $this->$validSetting = $settings[$validSetting];
@@ -249,9 +255,12 @@ class Sabre_DAV_Client {
             // Automatically follow redirects
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_MAXREDIRS => 5,
+        	CURLOPT_SSL_VERIFYPEER => true,
         	//CURLOPT_SSL_VERIFYPEER	=> false,
         );
 
+        if ($this->capath != '') $curlSettings[CURLOPT_CAPATH] = $this->capath;
+        
         switch ($method) {
             case 'PUT':
                 $curlSettings[CURLOPT_PUT] = true;
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index dda8afe9f2..097ff3c016 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -36,10 +36,13 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$this->root.='/';
 		}
 		
+		$caview = \OCP\Files::getStorage('files_external');
+		$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,
 			'password' => $this->password,
+			'capath' => $capath, 
 		);
 		$this->client = new Sabre_DAV_Client($settings);
 

From aa3b575ceba3f1d3008c5051831d87f9d8e9b598 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 11:31:30 +0200
Subject: [PATCH 0825/1537] disabled user upload of root certificates until
 sabredav client can handle them

---
 apps/files_external/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index dccc0913f2..8f8fe8d527 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -81,7 +81,7 @@
 		</table>
 		<br />
 		
-		<?php if (!$_['isAdminPage']): ?>
+		<?php if (!$_['isAdminPage'] && false):  // disabled until sabredav can handle uploaded ca certs   ?>
   		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>

From 55cde0e5aa7118ed916fc76e21c72c5081cc81ae Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 11:35:08 +0200
Subject: [PATCH 0826/1537] moved remove and rename hook to libs/hooks.php

---
 apps/files_versions/appinfo/app.php  |  4 +--
 apps/files_versions/lib/hooks.php    | 37 ++++++++++++++++++++++++++++
 apps/files_versions/lib/versions.php | 37 ----------------------------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index dba612e4b7..9ac7f6d5cd 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -12,5 +12,5 @@ OCP\Util::addscript('files_versions', 'versions');
 // Listen to write signals
 OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
 // Listen to delete and rename signals
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Storage", "removeVersions");
-OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Storage", "renameVersions");
\ No newline at end of file
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook");
+OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook");
\ No newline at end of file
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 8a74670532..b43fdb9fd3 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -30,6 +30,43 @@ class Hooks {
 		}
 	}
 	
+	/**
+	 * @brief Erase versions of deleted file
+	 * @param array
+	 *
+	 * This function is connected to the delete signal of OC_Filesystem
+	 * cleanup the versions directory if the actual file gets deleted
+	 */
+	public static function remove_hook($params) {
+		$rel_path =  $params['path'];
+		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
+		if(Storage::isversioned($rel_path)) {
+			$versions = Storage::getVersions($rel_path);
+			foreach ($versions as $v){
+				unlink($abs_path . $v['version']);
+			}
+		}
+	}
+	
+	/**
+	 * @brief rename/move versions of renamed/moved files
+	 * @param array with oldpath and newpath
+	 *
+	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+	 * of the stored versions along the actual file
+	 */
+	public static function rename_hook($params) {
+		$rel_oldpath =  $params['oldpath'];
+		$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
+		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
+		if(Storage::isversioned($rel_oldpath)) {
+			$versions = Storage::getVersions($rel_oldpath);
+			foreach ($versions as $v){
+				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
+			}
+		}
+	}
+	
 }
 
 ?>
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index fb78e0a56c..412044dba7 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -323,41 +323,4 @@ class Storage {
 		return $this->view->deleteAll( $dir, true );
 	
         }
-
-        /**
-         * @brief Erase versions of deleted file
-         * @param array
-         *          
-         * This function is connected to the delete signal of OC_Filesystem
-         * cleanup the versions directory if the actual file gets deleted
-         */
-        public static function removeVersions($params) {
-        	$rel_path =  $params['path'];
-        	$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
-        	if(Storage::isversioned($rel_path)) {
-        		$versions = Storage::getVersions($rel_path);
-        		foreach ($versions as $v){
-        			unlink($abs_path . $v['version']);
-        		}
-        	}
-        }
-        
-        /**
-         * @brief rename/move versions of renamed/moved files
-         * @param array with oldpath and newpath
-         * 
-         * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-         * of the stored versions along the actual file
-         */
-        public static function renameVersions($params) {
-        	$rel_oldpath =  $params['oldpath'];
-        	$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
-        	$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
-        	if(Storage::isversioned($rel_oldpath)) {
-        		$versions = Storage::getVersions($rel_oldpath);
-        		foreach ($versions as $v){
-        			rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
-        		}
-        	}
-        }
 }

From 378fa2bc86fd5df095b2d05855bd54a341dba1b0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 12:17:33 +0200
Subject: [PATCH 0827/1537] check if caview really exists

---
 .htaccess                          | 4 ++--
 apps/files_external/lib/webdav.php | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.htaccess b/.htaccess
index 11ee1d59f8..6d1844dbf9 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,8 @@
 ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
-php_value upload_max_filesize 513M
-php_value post_max_size 513M
+php_value upload_max_filesize 2000M
+php_value post_max_size 2000M
 php_value memory_limit 512M
 <IfModule env_module>
   SetEnv htaccessWorking true
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 097ff3c016..32dd26ae6c 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -36,8 +36,10 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$this->root.='/';
 		}
 		
-		$caview = \OCP\Files::getStorage('files_external');
-		$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
+		$capath = '';
+		if($caview = \OCP\Files::getStorage('files_external')) {
+			$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
+		}
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,

From 51774cca6b34a24ccbc191184f6d36d81b879210 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 14:20:40 +0200
Subject: [PATCH 0828/1537] use OC_Filesystem for rollback

---
 apps/files_versions/lib/versions.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 412044dba7..5611e538ad 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -147,6 +147,9 @@ class Storage {
 	public static function rollback($filename,$revision) {
 	
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			$users_view = \OCP\Files::getStorage("files_versions");
+			$users_view->chroot(\OCP\User::getUser().'/');
+			
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -159,7 +162,7 @@ class Storage {
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
 			
 			// rollback
-			if ( @copy($versionsFolderName.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
+			if( @$users_view->copy('versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
 			
 				return true;
 				

From bd494f562f5c396de557b2887e2b4559d4dfadb9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 15:03:14 +0200
Subject: [PATCH 0829/1537] fixed faulty commit

---
 .htaccess | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 6d1844dbf9..11ee1d59f8 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,8 @@
 ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
-php_value upload_max_filesize 2000M
-php_value post_max_size 2000M
+php_value upload_max_filesize 513M
+php_value post_max_size 513M
 php_value memory_limit 512M
 <IfModule env_module>
   SetEnv htaccessWorking true

From 5bf050b13bbac944421ac6e993993237f847068a Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 15:55:46 +0200
Subject: [PATCH 0830/1537] moved performance improvement from isLoggedIn() to
 userExists() to avoid webdav problems

---
 lib/user.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 23b88aa1d0..d02c1208a8 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -240,17 +240,13 @@ class OC_User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn(){
-		static $is_login_checked = null;
-		if (!is_null($is_login_checked)) {
-			return $is_login_checked;
-		}
 		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
 			OC_App::loadApps(array('authentication'));
 			if (self::userExists($_SESSION['user_id']) ){
-				return $is_login_checked = true;
+				return true;
 			}
 		}
-		return $is_login_checked = false;
+		return false;
 	}
 
 	/**
@@ -349,13 +345,17 @@ class OC_User {
 	 * @return boolean
 	 */
 	public static function userExists($uid){
+		static $user_exists_checked = null;
+		if (!is_null($user_exists_checked)) {
+			return $user_exists_checked;
+		}
 		foreach(self::$_usedBackends as $backend){
 			$result=$backend->userExists($uid);
 			if($result===true){
-				return true;
+				return $user_exists_checked = true;
 			}
 		}
-		return false;
+		return $user_exists_checked = false;
 	}
 
 	/**

From 5e0b80dc8d824e4b6dcea1732dae5fdfb3216183 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 5 Jul 2012 17:12:52 +0200
Subject: [PATCH 0831/1537] Contacts: Fix copy&paste error

---
 apps/contacts/lib/addressbook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index f33f4a204e..40675efd8b 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -41,7 +41,7 @@ class OC_Contacts_Addressbook{
 	/**
 	 * @brief Returns the list of addressbooks for a specific user.
 	 * @param string $uid
-	 * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
+	 * @param boolean $active Only return addressbooks with this $active state, default(=false) is don't care
 	 * @return array or false.
 	 */
 	public static function all($uid, $active=false){

From 59b38e668dd2a31e55a7bf0bbf6e9cb57cba6f9b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 6 Jul 2012 02:46:43 +0200
Subject: [PATCH 0832/1537] Missing requesttoken

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 25fc122bf3..39ef14e506 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -327,7 +327,7 @@ Contacts={
 				
 				// Make sure proper DOM is loaded.
 				if(!$('#card')[0] && newid) {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{},function(jsondata){
+					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
 						if(jsondata.status == 'success'){
 							$('#rightcontent').html(jsondata.data.page).ready(function() {
 								Contacts.UI.loadHandlers();

From a5a1d929ca2e75332f20f0cafc0711aa0f0608fb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 6 Jul 2012 03:22:02 +0200
Subject: [PATCH 0833/1537] No need for being protected.

---
 apps/contacts/lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index b3a7abd28b..25461877e6 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -164,7 +164,7 @@ class OC_Contacts_App {
 	 * @brief returns the default categories of ownCloud
 	 * @return (array) $categories
 	 */
-	protected static function getDefaultCategories(){
+	public static function getDefaultCategories(){
 		return array(
 			(string)self::$l10n->t('Birthday'),
 			(string)self::$l10n->t('Business'),

From f875240b47823d28c5169b354ffe1a3e80aaf57e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 6 Jul 2012 11:23:20 +0200
Subject: [PATCH 0834/1537] comment out some code

---
 apps/calendar/lib/import.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index f348be3794..d36891cb2b 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -238,18 +238,18 @@ class OC_Calendar_Import{
 	 * @brief generates an unique ID 
 	 * @return string 
 	 */
-	private function createUID(){
-		return substr(md5(rand().time()),0,10);
-	}
+	//private function createUID(){
+	//	return substr(md5(rand().time()),0,10);
+	//}
 	
 	/*
 	 * @brief checks is the UID is already in use for another event
 	 * @param string $uid uid to check
 	 * @return boolean
 	 */
-	private function isUIDAvailable($uid){
-		
-	}
+	//private function isUIDAvailable($uid){
+	//	
+	//}
 	
 	/*
 	 * @brief generates a proper VCalendar string

From 8353517969d4256a86c1085cb3c3804f08a14001 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 6 Jul 2012 12:24:03 +0200
Subject: [PATCH 0835/1537] use OC_Connector_Sabre_Client

---
 apps/files_external/lib/webdav.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 32dd26ae6c..7511096f0d 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -36,18 +36,18 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$this->root.='/';
 		}
 		
-		$capath = '';
-		if($caview = \OCP\Files::getStorage('files_external')) {
-			$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
-		}
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,
 			'password' => $this->password,
-			'capath' => $capath, 
 		);
-		$this->client = new Sabre_DAV_Client($settings);
 
+		$this->client = new OC_Connector_Sabre_Client($settings);
+		
+		if($caview = \OCP\Files::getStorage('files_external')) {
+			$this->client->setCurlSettings(array(CURLOPT_CAPATH => \OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath(""),
+					CURLOPT_SSL_VERIFYPEER	=> false));
+		}
 		//create the root folder if necesary
 		$this->mkdir('');
 	}

From ba8dee05209e136a8911862b21ff6ad90d67f149 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 6 Jul 2012 12:26:54 +0200
Subject: [PATCH 0836/1537] introduce subclassed client.php and revert changes
 to 3rdparty

---
 3rdparty/Sabre/DAV/Client.php  |   7 --
 lib/connector/sabre/client.php | 168 +++++++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+), 7 deletions(-)
 create mode 100644 lib/connector/sabre/client.php

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
index d257c86da1..075e84caa1 100644
--- a/3rdparty/Sabre/DAV/Client.php
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -22,7 +22,6 @@ class Sabre_DAV_Client {
     protected $userName;
     protected $password;
     protected $proxy;
-    protected $capath;
 
     /**
      * Constructor
@@ -50,10 +49,6 @@ class Sabre_DAV_Client {
             'proxy'
         );
 
-        $this->capath = '';
-        if (isset($settings['capath'])) {
-        	$this->capath = $settings['capath'];
-        }
 
         foreach($validSettings as $validSetting) {
             if (isset($settings[$validSetting])) {
@@ -259,8 +254,6 @@ class Sabre_DAV_Client {
         	//CURLOPT_SSL_VERIFYPEER	=> false,
         );
 
-        if ($this->capath != '') $curlSettings[CURLOPT_CAPATH] = $this->capath;
-        
         switch ($method) {
             case 'PUT':
                 $curlSettings[CURLOPT_PUT] = true;
diff --git a/lib/connector/sabre/client.php b/lib/connector/sabre/client.php
new file mode 100644
index 0000000000..bcf564c06d
--- /dev/null
+++ b/lib/connector/sabre/client.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2012 Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
+	
+	protected $curlSettings;
+	
+	public function __construct(array $settings) {
+		//set default curl settings
+		$this->curlSettings = array(
+				CURLOPT_RETURNTRANSFER => true,
+				// Return headers as part of the response
+				CURLOPT_HEADER => true,
+				// Automatically follow redirects
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_MAXREDIRS => 5,
+				CURLOPT_SSL_VERIFYPEER => true,
+				//CURLOPT_SSL_VERIFYPEER	=> false,
+		);
+		parent::__construct($settings);
+	}
+	
+	public function setCurlSettings($settings) {
+		if (is_array($settings)) {
+			foreach ($settings as $k => $v) {
+				$this->curlSettings[$k] = $v;
+			}
+		}
+	}
+	
+	/**
+	 * Copied from SabreDAV with some modification to use user defined curlSettings
+	 * Performs an actual HTTP request, and returns the result.
+	 *
+	 * If the specified url is relative, it will be expanded based on the base
+	 * url.
+	 *
+	 * The returned array contains 3 keys:
+	 *   * body - the response body
+	 *   * httpCode - a HTTP code (200, 404, etc)
+	 *   * headers - a list of response http headers. The header names have
+	 *     been lowercased.
+	 *
+	 * @param string $method
+	 * @param string $url
+	 * @param string $body
+	 * @param array $headers
+	 * @return array
+	 */
+	public function request($method, $url = '', $body = null, $headers = array()) {
+		 
+		$this->curlSettings[CURLOPT_POSTFIELDS] = $body;	 
+		$url = $this->getAbsoluteUrl($url);
+	
+		switch ($method) {
+			case 'PUT':
+				$this->curlSettings[CURLOPT_PUT] = true;
+				break;
+			case 'HEAD' :
+	
+				// do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD
+				// requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
+				// specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
+				// ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
+				// response body
+				$this->curlSettings[CURLOPT_NOBODY] = true;
+				$this->curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+				break;
+	
+			default:
+				$this->curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
+				break;
+	
+		}
+	
+		// Adding HTTP headers
+		$nHeaders = array();
+		foreach($headers as $key=>$value) {
+	
+			$nHeaders[] = $key . ': ' . $value;
+	
+		}
+		$this->curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
+	
+		if ($this->proxy) {
+			$this->curlSettings[CURLOPT_PROXY] = $this->proxy;
+		}
+	
+		if ($this->userName) {
+			$this->curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
+			$this->curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
+		}
+	
+		list(
+				$response,
+				$curlInfo,
+				$curlErrNo,
+				$curlError
+		) = $this->curlRequest($url, $this->curlSettings);
+	
+		$headerBlob = substr($response, 0, $curlInfo['header_size']);
+		$response = substr($response, $curlInfo['header_size']);
+	
+		// In the case of 100 Continue, or redirects we'll have multiple lists
+		// of headers for each separate HTTP response. We can easily split this
+		// because they are separated by \r\n\r\n
+		$headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+	
+		// We only care about the last set of headers
+		$headerBlob = $headerBlob[count($headerBlob)-1];
+	
+		// Splitting headers
+		$headerBlob = explode("\r\n", $headerBlob);
+	
+		$headers = array();
+		foreach($headerBlob as $header) {
+			$parts = explode(':', $header, 2);
+			if (count($parts)==2) {
+				$headers[strtolower(trim($parts[0]))] = trim($parts[1]);
+			}
+		}
+	
+		$response = array(
+				'body' => $response,
+				'statusCode' => $curlInfo['http_code'],
+				'headers' => $headers
+		);
+	
+		if ($curlErrNo) {
+			throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
+		}
+	
+		if ($response['statusCode']>=400) {
+			switch ($response['statusCode']) {
+				case 404:
+					throw new Sabre_DAV_Exception_NotFound('Resource ' . $url . ' not found.');
+					break;
+	
+				default:
+					throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
+			}
+		}
+	
+		return $response;
+	
+	}
+	
+}
\ No newline at end of file

From 963faf64587163d2dbeaf5dc4fd577412a04e0c2 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 6 Jul 2012 12:35:29 +0200
Subject: [PATCH 0837/1537] CURLOPT_SSL_VERIFYPEER=false shouldn't be in master

---
 apps/files_external/lib/webdav.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 7511096f0d..9b874e62e3 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -45,8 +45,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$this->client = new OC_Connector_Sabre_Client($settings);
 		
 		if($caview = \OCP\Files::getStorage('files_external')) {
-			$this->client->setCurlSettings(array(CURLOPT_CAPATH => \OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath(""),
-					CURLOPT_SSL_VERIFYPEER	=> false));
+			$this->client->setCurlSettings(array(CURLOPT_CAPATH => \OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("")));
 		}
 		//create the root folder if necesary
 		$this->mkdir('');

From ab1b4f1f0381b05debabdcee22cb1c4f54fa4219 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 6 Jul 2012 12:05:43 +0200
Subject: [PATCH 0838/1537] Fugly fixed include.

---
 apps/contacts/ajax/categories/rescan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
index 48ec165381..f9d9ef7ba6 100644
--- a/apps/contacts/ajax/categories/rescan.php
+++ b/apps/contacts/ajax/categories/rescan.php
@@ -10,7 +10,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-require_once('../loghandler.php');
+require_once(__DIR__.'../loghandler.php');
 
 $addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
 if(count($addressbooks) == 0) {

From a1872412bf24e175f4545216b597963137945aad Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 6 Jul 2012 12:07:02 +0200
Subject: [PATCH 0839/1537] Correct hack ;)

---
 apps/contacts/ajax/categories/rescan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
index f9d9ef7ba6..679f57aa26 100644
--- a/apps/contacts/ajax/categories/rescan.php
+++ b/apps/contacts/ajax/categories/rescan.php
@@ -10,7 +10,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-require_once(__DIR__.'../loghandler.php');
+require_once(__DIR__.'/../loghandler.php');
 
 $addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
 if(count($addressbooks) == 0) {

From cafbd023379073623295d11ae06be55a5f2cb569 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 6 Jul 2012 13:24:56 +0200
Subject: [PATCH 0840/1537] Fix endless loop when no addressbooks.

---
 apps/contacts/lib/addressbook.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 40675efd8b..7549464f46 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -148,10 +148,17 @@ class OC_Contacts_Addressbook{
 	 * @return insertid
 	 */
 	public static function add($uid,$name,$description=''){
-		$all = self::all($uid);
+		try {
+			$stmt = OCP\DB::prepare( 'SELECT uri FROM *PREFIX*contacts_addressbooks WHERE userid = ? ' );
+			$result = $stmt->execute(array($uid));
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' uid: '.$uid,OCP\Util::DEBUG);
+			return false;
+		}
 		$uris = array();
-		foreach($all as $i){
-			$uris[] = $i['uri'];
+		while($row = $result->fetchRow()){
+			$uris[] = $row['uri'];
 		}
 
 		$uri = self::createURI($name, $uris );

From 75d01b065da91acb7512b3df82d69c8d931c50b3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 6 Jul 2012 13:49:04 +0200
Subject: [PATCH 0841/1537] Make export batch size configurable.

---
 apps/contacts/export.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index ba7b06e40d..58fdb040a5 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -19,11 +19,12 @@ if(isset($bookid)){
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
 
 	$start = 0;
-	while($cardobjects = OC_Contacts_VCard::all($bookid, $start, 20)){
+	$batchsize = OCP\Config::getUserValue(OCP\User::getUser(), 'contacts', 'export_batch_size', 20);
+	while($cardobjects = OC_Contacts_VCard::all($bookid, $start, $batchsize)){
 		foreach($cardobjects as $card) {
 			echo $card['carddata'] . $nl;
 		}
-		$start += 20;
+		$start += $batchsize;
 	}
 }elseif(isset($contactid)){
 	$data = OC_Contacts_App::getContactObject($contactid);

From e91b4bc2ac79f8855c57accfce2558ead52d2943 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 6 Jul 2012 15:58:38 +0200
Subject: [PATCH 0842/1537] allow user to upload his own root certificate for
 secure webdav mount

---
 .../ajax/addRootCertificate.php               | 16 ++++++++++-
 .../ajax/removeRootCertificate.php            |  3 ++-
 apps/files_external/lib/config.php            | 27 ++++++++++++++++++-
 apps/files_external/lib/webdav.php            |  2 +-
 apps/files_external/templates/settings.php    |  2 +-
 lib/connector/sabre/client.php                |  2 +-
 6 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index 33cd64d2c7..c192855629 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -4,9 +4,23 @@ OCP\JSON::checkAppEnabled('files_external');
 
 $view = \OCP\Files::getStorage("files_external");
 $from = $_FILES['rootcert_import']['tmp_name'];
-$to = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").$_FILES['rootcert_import']['name'];
+$path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
+$to = $path.$_FILES['rootcert_import']['name'];
 move_uploaded_file($from, $to);
 
+//check if it is a PEM certificate, otherwise convert it if possible
+$fh = fopen($to, 'r');
+$data = fread($fh, filesize($to));
+fclose($fh);
+if (!strpos($data, 'BEGIN CERTIFICATE')) {
+	$pem = chunk_split(base64_encode($data), 64, "\n");
+	$pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+	$fh = fopen($to, 'w');
+	fwrite($fh, $pem);
+}
+
+OC_Mount_Config::createCertificateBundle();
+
 header("Location: settings/personal.php");
 exit;
 ?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index 05f2fdef2d..a00922f421 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -4,6 +4,7 @@ OCP\JSON::checkAppEnabled('files_external');
 
 $view = \OCP\Files::getStorage("files_external");
 $cert = $_POST['cert'];
-$file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").$cert;
+$file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'.$cert;
 unlink($file);
+OC_Mount_Config::createCertificateBundle();
 ?>
\ No newline at end of file
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 4e82e6b254..5630df77a9 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -244,7 +244,8 @@ class OC_Mount_Config {
 	 */
 	public static function getCertificates() {
 		$view = \OCP\Files::getStorage('files_external');
-		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("");
+		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
+		if (!is_dir($path)) mkdir($path);
 		$result = array();
 		$handle = opendir($path);
 		while (false !== ($file = readdir($handle))) {
@@ -252,6 +253,30 @@ class OC_Mount_Config {
 		}
 		return $result;
 	}
+	
+	/**
+	 * creates certificate bundle
+	 */
+	public static function createCertificateBundle() {
+		$view = \OCP\Files::getStorage("files_external");
+		$path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("");
+		
+		$certs = OC_Mount_Config::getCertificates();
+		$fh_certs = fopen($path."/rootcerts.crt", 'w');
+		foreach ($certs as $cert) {
+			$file=$path.'/uploads/'.$cert;
+			$fh = fopen($file, "r");
+			$data = fread($fh, filesize($file));
+			fclose($fh);
+			if (strpos($data, 'BEGIN CERTIFICATE')) {
+				fwrite($fh_certs, $data);
+			}
+		}
+		
+		fclose($fh_certs);
+		
+		return true;
+	} 
 
 }
 
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 9b874e62e3..ea6ca65b97 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -45,7 +45,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$this->client = new OC_Connector_Sabre_Client($settings);
 		
 		if($caview = \OCP\Files::getStorage('files_external')) {
-			$this->client->setCurlSettings(array(CURLOPT_CAPATH => \OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("")));
+			$this->client->setCurlSettings(array(CURLOPT_CAINFO => \OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt'));
 		}
 		//create the root folder if necesary
 		$this->mkdir('');
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 8f8fe8d527..3d65e9b747 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -81,7 +81,7 @@
 		</table>
 		<br />
 		
-		<?php if (!$_['isAdminPage'] && false):  // disabled until sabredav can handle uploaded ca certs   ?>
+		<?php if (!$_['isAdminPage']):  ?>
   		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
diff --git a/lib/connector/sabre/client.php b/lib/connector/sabre/client.php
index bcf564c06d..b799b541a0 100644
--- a/lib/connector/sabre/client.php
+++ b/lib/connector/sabre/client.php
@@ -68,7 +68,7 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 	 * @return array
 	 */
 	public function request($method, $url = '', $body = null, $headers = array()) {
-		 
+
 		$this->curlSettings[CURLOPT_POSTFIELDS] = $body;	 
 		$url = $this->getAbsoluteUrl($url);
 	

From ca26bcc581ed7e19cdd236e0bc2010c4f3008679 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 6 Jul 2012 17:09:20 +0200
Subject: [PATCH 0843/1537] close file after write process

---
 apps/files_external/ajax/addRootCertificate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index c192855629..c5f49a82d3 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -17,6 +17,7 @@ if (!strpos($data, 'BEGIN CERTIFICATE')) {
 	$pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
 	$fh = fopen($to, 'w');
 	fwrite($fh, $pem);
+	fclose($fh);
 }
 
 OC_Mount_Config::createCertificateBundle();

From b96753079542d76ef16dcba835de0c4b75158c47 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 6 Jul 2012 18:42:41 +0200
Subject: [PATCH 0844/1537] increase the time limit again to a sensible
 granularity of 1 min. Please talk to me before changing this.

---
 apps/files_versions/lib/versions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 5611e538ad..4f0ee2c6d5 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -33,7 +33,7 @@ class Storage {
 	const DEFAULTFOLDER='versions'; 
 	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
 	const DEFAULTMAXFILESIZE=1048576; // 10MB 
-	const DEFAULTMININTERVAL=1; // 2 min
+	const DEFAULTMININTERVAL=60; // 1 min
 	const DEFAULTMAXVERSIONS=50;
 	
 	private $view;

From 466d7c0d99eab914960295f27496a9380cd8d125 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 6 Jul 2012 15:51:01 -0400
Subject: [PATCH 0845/1537] Improvements and bug fix for log reading, fixes bug
 oc-982

---
 lib/log/owncloud.php | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 92914af8fc..42ae7867ff 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -63,25 +63,38 @@ class OC_Log_Owncloud {
 		self::init();
 		$minLevel=OC_Config::getValue( "loglevel", OC_Log::WARN );
 		$entries = array();
-		$handle = @fopen(self::$logFile, 'r');
+		$handle = @fopen(self::$logFile, 'rb');
 		if ($handle) {
-			// Just a guess to set the file pointer to the right spot
-			$maxLineLength = 150;
-			fseek($handle, -($limit * $maxLineLength + $offset * $maxLineLength), SEEK_END);
-			// Skip first line, because it is most likely a partial line
-			fgets($handle);
-			while (!feof($handle)) {
-				$line = fgets($handle);
-				if (!empty($line)) {
-					$entry = json_decode($line);
-					if ($entry->level >= $minLevel) {
-						$entries[] = $entry;
+			fseek($handle, 0, SEEK_END);
+			$pos = ftell($handle);
+			$line = '';
+			$entriesCount = 0;
+			$lines = 0;
+			// Loop through each character of the file looking for new lines
+			while ($pos >= 0 && $entriesCount < $limit) {
+				fseek($handle, $pos);
+				$ch = fgetc($handle);
+				if ($ch == "\n" || $pos == 0) {
+					if ($line != '') {
+						// Add the first character if at the start of the file, because it doesn't hit the else in the loop
+						if ($pos == 0) {
+							$line = $ch.$line;
+						}
+						$lines++;
+						$entry = json_decode($line);
+						// Add the line as an entry if it is passed the offset and is equal or above the log level
+						if ($lines > $offset && $entry->level >= $minLevel) {
+							$entries[] = $entry;
+							$entriesCount++;
+						}
+						$line = '';
 					}
+				} else {
+					$line = $ch.$line;
 				}
+				$pos--;
 			}
 			fclose($handle);
-			// Extract the needed entries and reverse the order
-			$entries = array_reverse(array_slice($entries, -($limit + $offset), $limit));
 		}
 		return $entries;
 	}

From 90e4af312a68049d08d7701e069143387613545a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 6 Jul 2012 16:38:54 -0400
Subject: [PATCH 0846/1537] Fix time formatting for minutes, prepend 0 if
 minutes is less than 10

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/js.js b/core/js/js.js
index d6483b2c22..df834157cd 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -518,5 +518,5 @@ function formatDate(date){
 	}
 	var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'),
 	t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ];
-	return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+date.getMinutes();
+	return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
 }

From f955e5e9b2ed03137f6c5a264a97500be9107bbe Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 6 Jul 2012 17:29:45 -0400
Subject: [PATCH 0847/1537] Move line counter so we only count lines towards
 the offset that are equal or above the log level

---
 lib/log/owncloud.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 42ae7867ff..9eb21832c5 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -80,12 +80,14 @@ class OC_Log_Owncloud {
 						if ($pos == 0) {
 							$line = $ch.$line;
 						}
-						$lines++;
 						$entry = json_decode($line);
 						// Add the line as an entry if it is passed the offset and is equal or above the log level
-						if ($lines > $offset && $entry->level >= $minLevel) {
-							$entries[] = $entry;
-							$entriesCount++;
+						if ($entry->level >= $minLevel) {
+							$lines++;
+							if ($lines > $offset) {
+								$entries[] = $entry;
+								$entriesCount++;
+							}
 						}
 						$line = '';
 					}

From ec7bb86b2875c9e5afbd7db57de3c872afc3e90b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 15:00:02 +0200
Subject: [PATCH 0848/1537] Fixes a problem with the user creation ("User
 already existed" even if the user don't exists.) Thanks to Phil Reinhardt for
 pointing this out.

---
 lib/user.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index d02c1208a8..3029ec1acc 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -345,9 +345,8 @@ class OC_User {
 	 * @return boolean
 	 */
 	public static function userExists($uid){
-		static $user_exists_checked = null;
-		if (!is_null($user_exists_checked)) {
-			return $user_exists_checked;
+		if (!is_null($user_exists_checked)) {
+			return $user_exists_checked;
 		}
 		foreach(self::$_usedBackends as $backend){
 			$result=$backend->userExists($uid);

From acb196e17fb6d01a808e8758b5f852447cc03d99 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 7 Jul 2012 15:18:50 +0200
Subject: [PATCH 0849/1537] add group_admin table

---
 db_structure.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/db_structure.xml b/db_structure.xml
index 94567b4d53..f6dedab0a1 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -233,6 +233,32 @@
 
  </table>
 
+ <table>
+
+  <name>*dbprefix*group_admin</name>
+
+  <declaration>
+
+   <field>
+    <name>gid</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>64</length>
+   </field>
+
+   <field>
+    <name>uid</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>64</length>
+   </field>
+
+  </declaration>
+
+ </table>
+
  <table>
 
   <name>*dbprefix*groups</name>

From 777eb1d8b1d68f93d986bf2c8280e7416a1694e6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 15:27:04 +0200
Subject: [PATCH 0850/1537] CSRF check in the settings

---
 settings/ajax/changepassword.php | 2 ++
 settings/ajax/creategroup.php    | 2 ++
 settings/ajax/createuser.php     | 1 +
 settings/ajax/disableapp.php     | 1 +
 settings/ajax/enableapp.php      | 1 +
 settings/ajax/lostpassword.php   | 2 +-
 settings/ajax/openid.php         | 1 +
 settings/ajax/removegroup.php    | 1 +
 settings/ajax/removeuser.php     | 1 +
 settings/ajax/setlanguage.php    | 1 +
 settings/ajax/setloglevel.php    | 1 +
 settings/ajax/setquota.php       | 1 +
 settings/ajax/togglegroups.php   | 1 +
 13 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 860ea98787..604298b1cf 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -9,6 +9,8 @@ $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
 if( (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && ($username!=OC_User::getUser() || !OC_User::checkPassword($username,$oldPassword)))) {
 	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
 	exit();
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 57d82e7bd9..3626600ad9 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -9,6 +9,8 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
 	exit();
 }
 
+OCP\JSON::callCheck();
+
 $groupname = $_POST["groupname"];
 
 // Does the group exist?
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 6714711bc8..079b4750b7 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -8,6 +8,7 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
 	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
 	exit();
 }
+OCP\JSON::callCheck();
 
 $groups = array();
 if( isset( $_POST["groups"] )){
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index 53e9be379e..cc00698870 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -2,6 +2,7 @@
 // Init owncloud
 require_once('../../lib/base.php');
 OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
 
 OC_App::disable($_POST['appid']);
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index cb116ebe4e..bd53a50210 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -3,6 +3,7 @@
 // Init owncloud
 require_once('../../lib/base.php');
 OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
 
 if(OC_App::enable($_POST['appid'])){
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index c6df8551f5..68f6b7933e 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -2,8 +2,8 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
-
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $l=OC_L10N::get('core');
 
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index 58d071255c..883cd52bfe 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -6,6 +6,7 @@ require_once('../../lib/base.php');
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 OC_JSON::checkAppEnabled('user_openid');
 
 // Get data
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 4d36478189..19cbe51fd5 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -4,6 +4,7 @@
 require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
 
 $name = $_POST["groupname"];
 
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 2c288997a1..63388b3ca6 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -4,6 +4,7 @@
 require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index e3b00c3bc8..6b8c9274e6 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -6,6 +6,7 @@ require_once('../../lib/base.php');
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 
 // Get data
diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 298cbd6473..4b97ba2aa3 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -7,6 +7,7 @@
 
 require_once('../../lib/base.php');
 OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
 
 OC_Config::setValue( 'loglevel', $_POST['level'] );
 
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index f59017600a..44c2067824 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -9,6 +9,7 @@
 require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 7773c1049c..a7cdeb2cfb 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -4,6 +4,7 @@
 require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
 
 $success = true;
 $error = "add user to";

From b46d3019ca4ebc346811eb52a7607702d69975a4 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 15:52:49 +0200
Subject: [PATCH 0851/1537] Uninitialized variable

---
 lib/user.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/user.php b/lib/user.php
index 3029ec1acc..2b4e367ab7 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -345,6 +345,7 @@ class OC_User {
 	 * @return boolean
 	 */
 	public static function userExists($uid){
+		static $user_exists_checked = null;
 		if (!is_null($user_exists_checked)) {
 			return $user_exists_checked;
 		}

From c63db28eafbe4745faf44a4774cc857e830939c9 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 15:54:52 +0200
Subject: [PATCH 0852/1537] CSRF check

---
 apps/bookmarks/ajax/addBookmark.php  | 2 ++
 apps/bookmarks/ajax/delBookmark.php  | 2 ++
 apps/bookmarks/ajax/editBookmark.php | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 6b5a0f71d4..483716405a 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true;
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
 OCP\JSON::checkAppEnabled('bookmarks');
 
 require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index 5a067701c9..f40f02ebab 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true;
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
 OCP\JSON::checkAppEnabled('bookmarks');
 
 $id = $_POST['id'];
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index 439b680dc2..0b37d161af 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true;
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
 OCP\JSON::checkAppEnabled('bookmarks');
 
 $CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );

From 0abcf0a421e26a17de00d3bf3a890da1f1689c16 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 15:58:11 +0200
Subject: [PATCH 0853/1537] CSRF checks

---
 apps/files/ajax/delete.php    | 1 +
 apps/files/ajax/move.php      | 1 +
 apps/files/ajax/newfile.php   | 1 +
 apps/files/ajax/newfolder.php | 1 +
 apps/files/ajax/rename.php    | 1 +
 apps/files/ajax/upload.php    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index ed155de0dc..161d820f73 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -4,6 +4,7 @@
 
 
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 // Get data
 $dir = stripslashes($_GET["dir"]);
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 945fe4e7b8..56171dd0ed 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -4,6 +4,7 @@
 
 
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 // Get data
 $dir = stripslashes($_GET["dir"]);
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index edb7841487..7236deb65c 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -4,6 +4,7 @@
 
 
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 // Get the params
 $dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index c5c37914c6..ae92bcf09b 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -4,6 +4,7 @@
 
 
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 // Get the params
 $dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index e2fa3d54a6..8e98308eb5 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -4,6 +4,7 @@
 
 
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 // Get data
 $dir = stripslashes($_GET["dir"]);
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index b779924cfb..5553cf5a13 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -7,6 +7,7 @@
 OCP\JSON::setContentTypeHeader('text/plain');
 
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 if (!isset($_FILES['files'])) {
 	OCP\JSON::error(array("data" => array( "message" => "No file was uploaded. Unknown error" )));

From b7c510a61a5eaeba76284628fe76fc60b7035aed Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 16:02:33 +0200
Subject: [PATCH 0854/1537] CSRF checks

---
 apps/external/ajax/setsites.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
index 772863974a..188e71e891 100644
--- a/apps/external/ajax/setsites.php
+++ b/apps/external/ajax/setsites.php
@@ -8,6 +8,7 @@
 
  
 OCP\User::checkAdminUser();
+OCP\JSON::callCheck();
 
 $sites = array();
 for ($i = 0; $i < sizeof($_POST['site_name']); $i++) {

From 04a0755fd364b16bfb461382b1409fbb6336a359 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 16:03:21 +0200
Subject: [PATCH 0855/1537] CSRF checks

---
 apps/files_sharing/ajax/email.php          | 2 ++
 apps/files_sharing/ajax/setpermissions.php | 1 +
 apps/files_sharing/ajax/share.php          | 1 +
 apps/files_sharing/ajax/unshare.php        | 1 +
 4 files changed, 5 insertions(+)

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 523c3d2078..e1dccb7d0f 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -1,6 +1,8 @@
 <?php
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
+OCP\JSON::callCheck();
+
 $user = OCP\USER::getUser();
 // TODO translations
 $type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
index 4d19cd40f2..31b7a3878e 100644
--- a/apps/files_sharing/ajax/setpermissions.php
+++ b/apps/files_sharing/ajax/setpermissions.php
@@ -2,6 +2,7 @@
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
 $uid_shared_with = $_POST['uid_shared_with'];
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index 1ee8c3f791..f4f2172d25 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -2,6 +2,7 @@
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $userDirectory = '/'.OCP\USER::getUser().'/files';
 $sources = explode(';', $_POST['sources']);
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index d50e7963a0..44ffdb1a5b 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -2,6 +2,7 @@
 
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
 $uid_shared_with = $_POST['uid_shared_with'];

From 2c318f45f4ac47c7646407692910e1fc72bf07c2 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 16:08:27 +0200
Subject: [PATCH 0856/1537] CSRF checks

---
 apps/files_texteditor/ajax/savefile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index 961db7105e..f3ac323e32 100644
--- a/apps/files_texteditor/ajax/savefile.php
+++ b/apps/files_texteditor/ajax/savefile.php
@@ -26,6 +26,7 @@
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 // Get paramteres
 $filecontents = isset($_POST['filecontents']) ? $_POST['filecontents'] : false;

From ea70ca3ce3cbbaac0e24e30304f44dfc37c11f56 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 7 Jul 2012 16:12:21 +0200
Subject: [PATCH 0857/1537] CSRF checks

---
 apps/files_external/ajax/addMountPoint.php    | 2 ++
 apps/files_external/ajax/removeMountPoint.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
index 549cb6a342..0eedfdb333 100644
--- a/apps/files_external/ajax/addMountPoint.php
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -1,6 +1,8 @@
 <?php
 
 OCP\JSON::checkAppEnabled('files_external');
+OCP\JSON::callCheck();
+
 if ($_POST['isPersonal'] == 'true') {
 	OCP\JSON::checkLoggedIn();
 	$isPersonal = true;
diff --git a/apps/files_external/ajax/removeMountPoint.php b/apps/files_external/ajax/removeMountPoint.php
index b77b306bcb..a96601b4d0 100644
--- a/apps/files_external/ajax/removeMountPoint.php
+++ b/apps/files_external/ajax/removeMountPoint.php
@@ -1,6 +1,8 @@
 <?php
 
 OCP\JSON::checkAppEnabled('files_external');
+OCP\JSON::callCheck();
+
 if ($_POST['isPersonal'] == 'true') {
 	OCP\JSON::checkLoggedIn();
 	$isPersonal = true;

From 2b22f0db0a8238d088d6c1cca8a6df909b36e323 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 13:28:12 +0200
Subject: [PATCH 0858/1537] Add missing requesttoken.

---
 apps/contacts/ajax/importaddressbook.php           | 1 +
 apps/contacts/templates/part.importaddressbook.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
index f93bbfa4d9..3c01e24a18 100644
--- a/apps/contacts/ajax/importaddressbook.php
+++ b/apps/contacts/ajax/importaddressbook.php
@@ -18,6 +18,7 @@ $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
 $tmpl = new OCP\Template('contacts', 'part.importaddressbook');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->printpage();
 ?>
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
index 01f8dd77d0..8ceb5f3538 100644
--- a/apps/contacts/templates/part.importaddressbook.php
+++ b/apps/contacts/templates/part.importaddressbook.php
@@ -12,6 +12,7 @@
 	<th><?php echo $l->t('Select address book to import to:') ?></th>
 	<td>
 		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
+			<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
 			<select id="book" name="book" class="float">
 			<?php
 			$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());

From e6a60198e429adf4c7fae261109ae09a9045f733 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 14:11:48 +0200
Subject: [PATCH 0859/1537] Return error messages in correct format.

---
 apps/contacts/import.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index c95fd970fe..22f33d7157 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -35,20 +35,20 @@ if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
 	$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
 }
 if(!$file) {
-	OCP\JSON::error(array('message' => 'Import file was empty.'));
+	OCP\JSON::error(array('data' => array('message' => 'Import file was empty.')));
 	exit();
 }
 if(isset($_POST['method']) && $_POST['method'] == 'new'){
 	$id = OC_Contacts_Addressbook::add(OCP\USER::getUser(), $_POST['addressbookname']);
 	if(!$id) {
-		OCP\JSON::error(array('message' => 'Error creating address book.'));
+		OCP\JSON::error(array('data' => array('message' => 'Error creating address book.')));
 		exit();
 	}
 	OC_Contacts_Addressbook::setActive($id, 1);
 }else{
 	$id = $_POST['id'];
 	if(!$id) {
-		OCP\JSON::error(array('message' => 'Error getting the ID of the address book.'));
+		OCP\JSON::error(array('data' => array('message' => 'Error getting the ID of the address book.')));
 		exit();
 	}
 	OC_Contacts_App::getAddressbook($id); // is owner access check
@@ -77,7 +77,7 @@ writeProgress('70');
 $imported = 0;
 $failed = 0;
 if(!count($parts) > 0) {
-	OCP\JSON::error(array('message' => 'No contacts to import in .'.$_POST['file'].' Please check if the file is corrupted.'));
+	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in .'.$_POST['file'].' Please check if the file is corrupted.')));
 	exit();
 }
 foreach($parts as $part){

From 97106f198fb9d49a2f8369a0dc9fa9d7c5172140 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 16:10:12 +0200
Subject: [PATCH 0860/1537] Set the loading class on the property being
 changed, not on its container.

---
 apps/contacts/js/contacts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 39ef14e506..324833833b 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -660,7 +660,7 @@ Contacts={
 					return false;
 				}
 				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
-				Contacts.UI.loading(container, true);
+				Contacts.UI.loading(obj, true);
 				var checksum = container.data('checksum');
 				var name = container.data('element');
 				var fields = container.find('input.contacts_property,select.contacts_property').serializeArray();
@@ -683,7 +683,7 @@ Contacts={
 				var q = container.find('input.contacts_property,select.contacts_property,textarea.contacts_property').serialize();
 				if(q == '' || q == undefined) {
 					OC.dialogs.alert(t('contacts', 'Couldn\'t serialize elements.'), t('contacts', 'Error'));
-					Contacts.UI.loading(container, false);
+					Contacts.UI.loading(obj, false);
 					return false;
 				}
 				q = q + '&id=' + this.id + '&name=' + name;
@@ -695,7 +695,7 @@ Contacts={
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
 							Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							Contacts.UI.loading(container, false);
+							Contacts.UI.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return true;
 						}

From f5c620006ebdaf65ced253f88bb85fc1ca671e3b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 16:15:52 +0200
Subject: [PATCH 0861/1537] Set the loading class on the property being
 changed, not on its container. Now on all the places relevant ;-)

---
 apps/contacts/js/contacts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 324833833b..0ed35a6a90 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -701,7 +701,7 @@ Contacts={
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							Contacts.UI.loading(container, false);
+							Contacts.UI.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return false;
 						}
@@ -714,13 +714,13 @@ Contacts={
 							container.data('checksum', jsondata.data.checksum);
 							// TODO: savePropertyInternal doesn't know about new fields
 							//Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							Contacts.UI.loading(container, false);
+							Contacts.UI.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return true;
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							Contacts.UI.loading(container, false);
+							Contacts.UI.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return false;
 						}

From 3424785db0b9396a950083d90dc6d5cf3133b512 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 16:58:17 +0200
Subject: [PATCH 0862/1537] Implemented Sabre iCalendar Export Plugin.

---
 apps/calendar/appinfo/remote.php     | 2 +-
 apps/calendar/settings.php           | 1 +
 apps/calendar/templates/settings.php | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 7ab546245f..e8f9e80c7a 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -34,6 +34,6 @@ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CalDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
-
+$server->addPlugin(new Sabre_CalDAV_ICSExportPlugin());
 // And off we go!
 $server->exec();
diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php
index a18b1ca9f4..eaa20c6c9b 100644
--- a/apps/calendar/settings.php
+++ b/apps/calendar/settings.php
@@ -10,6 +10,7 @@ $tmpl = new OCP\Template( 'calendar', 'settings');
 $timezone=OCP\Config::getUserValue(OCP\USER::getUser(),'calendar','timezone','');
 $tmpl->assign('timezone',$timezone);
 $tmpl->assign('timezones',DateTimeZone::listIdentifiers());
+$tmpl->assign('calendars', OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()), false);
 
 OCP\Util::addscript('calendar','settings');
 
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 6d018f1511..28c357621a 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -56,6 +56,12 @@
 		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?></code></dd>
 		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
 		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
+		<dt><?php echo $l->t('Read only iCalendar link(s)'); ?></dt>
+		<dd>
+			<?php foreach($_['calendars'] as $calendar) { ?>
+			<a href="<?php echo OCP\Util::linkToRemote('caldav').'calendars/'.OCP\USER::getUser().'/'.rawurlencode($calendar['uri']) ?>?export"><?php echo $calendar['displayname'] ?></a><br />
+			<?php } ?>
+		</dd>
 		</dl>
         </fieldset>
 </form>

From 334257d2b64fb9690ded42a747e4abca1ffbb1bf Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 17:52:57 +0200
Subject: [PATCH 0863/1537] Implemented VCFExportPlugin.

---
 apps/contacts/appinfo/app.php         |   1 +
 apps/contacts/appinfo/remote.php      |   1 +
 apps/contacts/lib/VCFExportPlugin.php | 103 ++++++++++++++++++++++++++
 apps/contacts/settings.php            |   1 +
 apps/contacts/templates/settings.php  |   6 ++
 5 files changed, 112 insertions(+)
 create mode 100644 apps/contacts/lib/VCFExportPlugin.php

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 64fe00eef1..33e89c3e9b 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -4,6 +4,7 @@ OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
 OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
+OC::$CLASSPATH['Sabre_CardDAV_VCFExportPlugin'] = 'apps/contacts/lib/VCFExportPlugin.php';
 OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
 OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Contacts_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 5add3bc688..09c2de1799 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -49,6 +49,7 @@ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new Sabre_CardDAV_VCFExportPlugin());
 
 // And off we go!
 $server->exec();
diff --git a/apps/contacts/lib/VCFExportPlugin.php b/apps/contacts/lib/VCFExportPlugin.php
new file mode 100644
index 0000000000..b1edcaaef2
--- /dev/null
+++ b/apps/contacts/lib/VCFExportPlugin.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * ICS Exporter
+ *
+ * This plugin adds the ability to export entire address books as .vcf files.
+ * This is useful for clients that don't support CardDAV yet. They often do
+ * support vcf files.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?export
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='export') return;
+
+        // splitting uri
+        list($uri) = explode('?',$uri,2);
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_CardDAV_AddressBook)) return;
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','text/directory');
+        $this->server->httpResponse->sendStatus(200);
+
+        $nodes = $this->server->getPropertiesForPath($uri, array(
+            '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data',
+        ),1);
+
+        $this->server->httpResponse->sendBody($this->generateVCF($nodes));
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Merges all vcard objects, and builds one big vcf export
+     *
+     * @param array $nodes
+     * @return string
+     */
+    public function generateVCF(array $nodes) {
+        $objects = array();
+
+        foreach($nodes as $node) {
+
+            if (!isset($node[200]['{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data'])) {
+                continue;
+            }
+            $nodeData = $node[200]['{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data'];
+
+            $nodeComp = Sabre_VObject_Reader::read($nodeData);
+            $objects[] = $nodeComp;
+
+        }
+        ob_start();
+        foreach($objects as $obj) echo $obj->serialize();
+        return ob_get_clean();
+
+    }
+
+}
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
index c88fed0b4d..bc57f4a1d0 100644
--- a/apps/contacts/settings.php
+++ b/apps/contacts/settings.php
@@ -1,6 +1,7 @@
 <?php
 
 $tmpl = new OCP\Template( 'contacts', 'settings');
+$tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
 
 return $tmpl->fetchPage();
 ?>
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index 216003b6c6..f520559d14 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -7,6 +7,12 @@
 		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?></code></dd>
 		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
 		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
+		<dt><?php echo $l->t('Read only vCard directory link(s)'); ?></dt>
+		<dd>
+			<?php foreach($_['addressbooks'] as $addressbook) { ?>
+			<a href="<?php echo OCP\Util::linkToRemote('carddav').'addressbooks/'.OCP\USER::getUser().'/'.rawurlencode($addressbook['uri']) ?>?export"><?php echo $addressbook['displayname'] ?></a><br />
+			<?php } ?>
+		</dd>
 		</dl>
 		Powered by <a href="http://geonames.org/" target="_blank">geonames.org webservice</a>
 	</fieldset>

From dc8193fccb7f18435844a3f5d2e79d27b6b7f0a3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 18:28:55 +0200
Subject: [PATCH 0864/1537] Make it possible to import files using CR as eol.

---
 apps/contacts/import.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 22f33d7157..93c47ef266 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -12,6 +12,7 @@ OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 session_write_close();
 
+$cr = "\r";
 $nl = "\n";
 
 global $progresskey;
@@ -56,6 +57,10 @@ if(isset($_POST['method']) && $_POST['method'] == 'new'){
 //analyse the contacts file
 writeProgress('40');
 $lines = explode($nl, $file);
+if(count($lines) == 1) { // Mac eol
+	$lines = explode($cr, $file);
+}
+
 $inelement = false;
 $parts = array();
 $card = array();

From e8010209bb1ec8ef9ecc1cff7ac2b2d4d414bd74 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 8 Jul 2012 22:11:13 +0200
Subject: [PATCH 0865/1537] Custom chunking support

---
 lib/connector/sabre/directory.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index b75bb5c50f..894256d5b2 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -33,10 +33,31 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * @return void
 	 */
 	public function createFile($name, $data = null) {
-
-		$newPath = $this->path . '/' . $name;
-		OC_Filesystem::file_put_contents($newPath,$data);
-
+		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+			$cache = new OC_Cache_File();
+			$cache->set($name, $data);
+			preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
+			$prefix = $matches['name'].'-chunking-'.$matches['transferid'].'-'.$matches['chunkcount'].'-';
+			$parts = 0;
+			for($i=0; $i < $matches['chunkcount']; $i++) {
+				if ($cache->hasKey($prefix.$i)) {
+					$parts ++;
+				}
+			}
+			if ($parts == $matches['chunkcount']) {
+				$newPath = $this->path . '/' . $matches['name'];
+				$f = OC_Filesystem::fopen($newPath, 'w');
+				for($i=0; $i < $matches['chunkcount']; $i++) {
+					$chunk = $cache->get($prefix.$i);
+					$cache->remove($prefix.$i);
+					fwrite($f,$chunk);
+				}
+				fclose($f);
+			}
+		} else {
+			$newPath = $this->path . '/' . $name;
+			OC_Filesystem::file_put_contents($newPath,$data);
+		}
 	}
 
 	/**

From 0b6cd8d2033cf280431436e76ca3847597f6f596 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 23:36:52 +0200
Subject: [PATCH 0866/1537] Simplify VCF generation.

---
 apps/contacts/lib/VCFExportPlugin.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/contacts/lib/VCFExportPlugin.php b/apps/contacts/lib/VCFExportPlugin.php
index b1edcaaef2..6554cb258e 100644
--- a/apps/contacts/lib/VCFExportPlugin.php
+++ b/apps/contacts/lib/VCFExportPlugin.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ICS Exporter
+ * VCF Exporter
  *
  * This plugin adds the ability to export entire address books as .vcf files.
  * This is useful for clients that don't support CardDAV yet. They often do
@@ -53,7 +53,7 @@ class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
 
         $node = $this->server->tree->getNodeForPath($uri);
 
-        if (!($node instanceof Sabre_CardDAV_AddressBook)) return;
+        if (!($node instanceof Sabre_CardDAV_IAddressBook)) return;
 
         // Checking ACL, if available.
         if ($aclPlugin = $this->server->getPlugin('acl')) {
@@ -89,14 +89,11 @@ class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
                 continue;
             }
             $nodeData = $node[200]['{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data'];
-
-            $nodeComp = Sabre_VObject_Reader::read($nodeData);
-            $objects[] = $nodeComp;
+            $objects[] = $nodeData;
 
         }
-        ob_start();
-        foreach($objects as $obj) echo $obj->serialize();
-        return ob_get_clean();
+
+        return implode("\r\n", $objects);
 
     }
 

From 6d123e90f30919e8d48c0b6ce6a1e871b3e6885d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 23:38:03 +0200
Subject: [PATCH 0867/1537] Remove deleted address book from list.

---
 apps/contacts/js/contacts.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 0ed35a6a90..3005126b71 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1393,6 +1393,7 @@ Contacts={
 					  function(jsondata) {
 						if (jsondata.status == 'success'){
 							$(obj).closest('tr').remove();
+							$('#contacts h3[data-id="'+bookid+'"],#contacts ul[data-id="'+bookid+'"]').remove();
 							Contacts.UI.Contacts.update();
 						} else {
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));

From 6116dc6b658873a69ec5adf267df1fb55999bf1a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 00:14:42 +0200
Subject: [PATCH 0868/1537] Added default parameter $reset to allow for
 incremental rescan.

---
 lib/vcategories.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/vcategories.php b/lib/vcategories.php
index 8157c34386..4e73bb18d4 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -131,8 +131,10 @@ class OC_VCategories {
 	*	}
 	* 	$categories->rescan($objects);
 	*/
-	public function rescan($objects, $sync=true) {
-		$this->categories = array();
+	public function rescan($objects, $sync=true, $reset=true) {
+		if($reset === true) {
+			$this->categories = array();
+		}
 		foreach($objects as $object) {
 			//OC_Log::write('core','OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);
 			$vobject = OC_VObject::parse($object);

From d1cf787197c4a5209881f61c60a9172d7b41a684 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 00:15:37 +0200
Subject: [PATCH 0869/1537] Move code to OC_Contacts_App::scanCategories().

---
 apps/contacts/ajax/categories/rescan.php | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
index 679f57aa26..0d8464a23e 100644
--- a/apps/contacts/ajax/categories/rescan.php
+++ b/apps/contacts/ajax/categories/rescan.php
@@ -10,22 +10,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-require_once(__DIR__.'/../loghandler.php');
-
-$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-if(count($addressbooks) == 0) {
-	bailOut(OC_Contacts_App::$l10n->t('No address books found.'));
-}
-$addressbookids = array();
-foreach($addressbooks as $addressbook) {
-	$addressbookids[] = $addressbook['id'];
-} 
-$contacts = OC_Contacts_VCard::all($addressbookids);
-if(count($contacts) == 0) {
-	bailOut(OC_Contacts_App::$l10n->t('No contacts found.'));
-}
-
-OC_Contacts_App::scanCategories($contacts);
+OC_Contacts_App::scanCategories();
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));

From 47aaca49a11997ed2d0d6a92df730f42df77d88c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 00:16:14 +0200
Subject: [PATCH 0870/1537] Rescan categories in small batches to reduce memory
 usage.

---
 apps/contacts/lib/app.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 25461877e6..f125ec0293 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -196,17 +196,20 @@ class OC_Contacts_App {
 				foreach($vcaddressbooks as $vcaddressbook) {
 					$vcaddressbookids[] = $vcaddressbook['id'];
 				}
-				$vccontacts = OC_Contacts_VCard::all($vcaddressbookids);
+				$start = 0;
+				$batchsize = 10;
+				while($vccontacts = OC_Contacts_VCard::all($vcaddressbookids, $start, $batchsize)){
+					$cards = array();
+					foreach($vccontacts as $vccontact) {
+						$cards[] = $vccontact['carddata'];
+					}
+					OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', scanning: '.$batchsize.' starting from '.$start,OCP\Util::DEBUG);
+					// only reset on first batch.
+					self::getVCategories()->rescan($cards, true, ($start==0?true:false));
+					$start += $batchsize;
+				}
 			}
 		}
-		if(is_array($vccontacts) && count($vccontacts) > 0) {
-			$cards = array();
-			foreach($vccontacts as $vccontact) {
-				$cards[] = $vccontact['carddata'];
-			}
-
-			self::$categories->rescan($cards);
-		}
 	}
 
 	/**

From f5c329af981f59f78c12648ea41c258f477f3e82 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 01:48:42 +0200
Subject: [PATCH 0871/1537] Delay fetching of carddata and set ETag and size
 instead.

---
 apps/contacts/lib/connector_sabre.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/connector_sabre.php
index c967e90660..b712d9eed2 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/connector_sabre.php
@@ -138,8 +138,10 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 		foreach($data as $i){
 			$cards[] = array(
 				'id' => $i['id'],
-				'carddata' => $i['carddata'],
+				//'carddata' => $i['carddata'],
 				'uri' => $i['uri'],
+				'size' => strlen($i['carddata']),
+				'etag' => md5($i['carddata']),
 				'lastmodified' => $i['lastmodified'] );
 		}
 

From 7d41d3aba8650d5bb7f5ec68721f645e91f5d52b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 09:40:33 +0200
Subject: [PATCH 0872/1537] webdav ssl cleanup

---
 apps/files_external/lib/webdav.php |  9 ++--
 lib/connector/sabre/client.php     | 73 ++++++++++++++++--------------
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index ea6ca65b97..b30e121f99 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -43,10 +43,13 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		);
 
 		$this->client = new OC_Connector_Sabre_Client($settings);
-		
+		/*
 		if($caview = \OCP\Files::getStorage('files_external')) {
-			$this->client->setCurlSettings(array(CURLOPT_CAINFO => \OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt'));
-		}
+			$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
+			if (file_exists($certPath))  {
+				$this->client->addTrustedCertificates($certPath);
+			}
+		}*/
 		//create the root folder if necesary
 		$this->mkdir('');
 	}
diff --git a/lib/connector/sabre/client.php b/lib/connector/sabre/client.php
index b799b541a0..87f9d59b3a 100644
--- a/lib/connector/sabre/client.php
+++ b/lib/connector/sabre/client.php
@@ -23,29 +23,18 @@
 
 class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 	
-	protected $curlSettings;
-	
-	public function __construct(array $settings) {
-		//set default curl settings
-		$this->curlSettings = array(
-				CURLOPT_RETURNTRANSFER => true,
-				// Return headers as part of the response
-				CURLOPT_HEADER => true,
-				// Automatically follow redirects
-				CURLOPT_FOLLOWLOCATION => true,
-				CURLOPT_MAXREDIRS => 5,
-				CURLOPT_SSL_VERIFYPEER => true,
-				//CURLOPT_SSL_VERIFYPEER	=> false,
-		);
-		parent::__construct($settings);
-	}
-	
-	public function setCurlSettings($settings) {
-		if (is_array($settings)) {
-			foreach ($settings as $k => $v) {
-				$this->curlSettings[$k] = $v;
-			}
-		}
+	protected $trustedCertificates;
+
+	/**
+	 * Add trusted root certificates to the webdav client.
+	 *
+	 * The parameter certificates should be a absulute path to a file which contains
+	 * all trusted certificates
+	 *
+	 * @param string $certificates
+	 */
+	public function addTrustedCertificates($certificates) {
+		$this->trustedCertificates = $certificates;
 	}
 	
 	/**
@@ -68,13 +57,28 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 	 * @return array
 	 */
 	public function request($method, $url = '', $body = null, $headers = array()) {
-
-		$this->curlSettings[CURLOPT_POSTFIELDS] = $body;	 
+	
 		$url = $this->getAbsoluteUrl($url);
 	
+		$curlSettings = array(
+				CURLOPT_RETURNTRANSFER => true,
+				// Return headers as part of the response
+				CURLOPT_HEADER => true,
+				CURLOPT_POSTFIELDS => $body,
+				// Automatically follow redirects
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_MAXREDIRS => 5,
+				CURLOPT_SSL_VERIFYPEER => true,
+				//CURLOPT_SSL_VERIFYPEER	=> false,
+		);
+		
+		if($this->trustedCertificates) {
+			$curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;
+		}
+	
 		switch ($method) {
 			case 'PUT':
-				$this->curlSettings[CURLOPT_PUT] = true;
+				$curlSettings[CURLOPT_PUT] = true;
 				break;
 			case 'HEAD' :
 	
@@ -83,12 +87,12 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 				// specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
 				// ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
 				// response body
-				$this->curlSettings[CURLOPT_NOBODY] = true;
-				$this->curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+				$curlSettings[CURLOPT_NOBODY] = true;
+				$curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
 				break;
 	
 			default:
-				$this->curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
+				$curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
 				break;
 	
 		}
@@ -100,15 +104,15 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 			$nHeaders[] = $key . ': ' . $value;
 	
 		}
-		$this->curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
+		$curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
 	
 		if ($this->proxy) {
-			$this->curlSettings[CURLOPT_PROXY] = $this->proxy;
+			$curlSettings[CURLOPT_PROXY] = $this->proxy;
 		}
 	
 		if ($this->userName) {
-			$this->curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
-			$this->curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
+			$curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
+			$curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
 		}
 	
 		list(
@@ -116,7 +120,7 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 				$curlInfo,
 				$curlErrNo,
 				$curlError
-		) = $this->curlRequest($url, $this->curlSettings);
+		) = $this->curlRequest($url, $curlSettings);
 	
 		$headerBlob = substr($response, 0, $curlInfo['header_size']);
 		$response = substr($response, $curlInfo['header_size']);
@@ -164,5 +168,4 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 		return $response;
 	
 	}
-	
 }
\ No newline at end of file

From 32b476d6ec58e6b020667ebe71ab5e2cd380b375 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 10:19:19 +0200
Subject: [PATCH 0873/1537] remove comments around code block

---
 apps/files_external/lib/webdav.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index b30e121f99..3d13518f57 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -43,13 +43,13 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		);
 
 		$this->client = new OC_Connector_Sabre_Client($settings);
-		/*
+		
 		if($caview = \OCP\Files::getStorage('files_external')) {
 			$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
 			if (file_exists($certPath))  {
 				$this->client->addTrustedCertificates($certPath);
 			}
-		}*/
+		}
 		//create the root folder if necesary
 		$this->mkdir('');
 	}

From 82a57f0ce369f6827a0a86a4ef35f62707b014fd Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 10:31:50 +0200
Subject: [PATCH 0874/1537] revert performance improvements in userExists()
 because it breaks new user creation

---
 lib/user.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 2b4e367ab7..f1903093d6 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -345,17 +345,13 @@ class OC_User {
 	 * @return boolean
 	 */
 	public static function userExists($uid){
-		static $user_exists_checked = null;
-		if (!is_null($user_exists_checked)) {
-			return $user_exists_checked;
-		}
 		foreach(self::$_usedBackends as $backend){
 			$result=$backend->userExists($uid);
 			if($result===true){
-				return $user_exists_checked = true;
+				return true;
 			}
 		}
-		return $user_exists_checked = false;
+		return false;
 	}
 
 	/**

From 6bf1473f0ea1ff325a86a0ec077eb301767f7152 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 11:58:16 +0200
Subject: [PATCH 0875/1537] replace urlencoded slash

---
 apps/files_external/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 3d65e9b747..7639fe0513 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,4 +1,4 @@
-<form id="files_external" method="post" enctype="multipart/form-data" action="/owncloud/?app=files_external&getfile=ajax%2FaddRootCertificate.php">
+<form id="files_external" method="post" enctype="multipart/form-data" action="/owncloud/?app=files_external&getfile=ajax/addRootCertificate.php">
 	<fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
 		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>

From 77f07c672e5f98396eac70046b848d9ad0c2dc61 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 12:49:04 +0200
Subject: [PATCH 0876/1537] remove hard coded path

---
 apps/files_external/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 7639fe0513..e8bc94790d 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,4 +1,4 @@
-<form id="files_external" method="post" enctype="multipart/form-data" action="/owncloud/?app=files_external&getfile=ajax/addRootCertificate.php">
+<form id="files_external" method="post" enctype="multipart/form-data" action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
 	<fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
 		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>

From 6f408c36516638c3dceb86582823eb312a0bbc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 4 Jul 2012 23:36:49 +0200
Subject: [PATCH 0877/1537] add supersized slideshow

---
 apps/gallery/css/supersized.css               |  25 +
 apps/gallery/css/supersized.shutter.css       |  74 ++
 apps/gallery/img/supersized/back.png          | Bin 0 -> 2629 bytes
 apps/gallery/img/supersized/bg-black.png      | Bin 0 -> 1074 bytes
 apps/gallery/img/supersized/bg-hover.png      | Bin 0 -> 960 bytes
 .../img/supersized/button-tray-down.png       | Bin 0 -> 1506 bytes
 .../gallery/img/supersized/button-tray-up.png | Bin 0 -> 1466 bytes
 apps/gallery/img/supersized/forward.png       | Bin 0 -> 2614 bytes
 apps/gallery/img/supersized/nav-bg.png        | Bin 0 -> 995 bytes
 apps/gallery/img/supersized/nav-dot.png       | Bin 0 -> 1901 bytes
 apps/gallery/img/supersized/pause.png         | Bin 0 -> 1131 bytes
 apps/gallery/img/supersized/play.png          | Bin 0 -> 1562 bytes
 apps/gallery/img/supersized/progress-back.png | Bin 0 -> 929 bytes
 apps/gallery/img/supersized/progress-bar.png  | Bin 0 -> 929 bytes
 apps/gallery/img/supersized/progress.gif      | Bin 0 -> 2608 bytes
 .../img/supersized/supersized-logo.png        | Bin 0 -> 3982 bytes
 apps/gallery/img/supersized/thumb-back.png    | Bin 0 -> 2122 bytes
 apps/gallery/img/supersized/thumb-forward.png | Bin 0 -> 2118 bytes
 apps/gallery/index.php                        |   6 +
 apps/gallery/js/jquery.easing.min.js          |  71 ++
 apps/gallery/js/slideshow.js                  |  58 ++
 apps/gallery/js/supersized.3.2.7.js           | 930 ++++++++++++++++++
 apps/gallery/js/supersized.3.2.7.min.js       |  13 +
 apps/gallery/js/supersized.shutter.js         | 337 +++++++
 apps/gallery/js/supersized.shutter.min.js     |  14 +
 apps/gallery/templates/index.php              |  52 +-
 26 files changed, 1579 insertions(+), 1 deletion(-)
 create mode 100644 apps/gallery/css/supersized.css
 create mode 100644 apps/gallery/css/supersized.shutter.css
 create mode 100644 apps/gallery/img/supersized/back.png
 create mode 100644 apps/gallery/img/supersized/bg-black.png
 create mode 100644 apps/gallery/img/supersized/bg-hover.png
 create mode 100644 apps/gallery/img/supersized/button-tray-down.png
 create mode 100644 apps/gallery/img/supersized/button-tray-up.png
 create mode 100644 apps/gallery/img/supersized/forward.png
 create mode 100644 apps/gallery/img/supersized/nav-bg.png
 create mode 100644 apps/gallery/img/supersized/nav-dot.png
 create mode 100644 apps/gallery/img/supersized/pause.png
 create mode 100644 apps/gallery/img/supersized/play.png
 create mode 100644 apps/gallery/img/supersized/progress-back.png
 create mode 100644 apps/gallery/img/supersized/progress-bar.png
 create mode 100644 apps/gallery/img/supersized/progress.gif
 create mode 100644 apps/gallery/img/supersized/supersized-logo.png
 create mode 100644 apps/gallery/img/supersized/thumb-back.png
 create mode 100644 apps/gallery/img/supersized/thumb-forward.png
 create mode 100644 apps/gallery/js/jquery.easing.min.js
 create mode 100644 apps/gallery/js/slideshow.js
 create mode 100644 apps/gallery/js/supersized.3.2.7.js
 create mode 100644 apps/gallery/js/supersized.3.2.7.min.js
 create mode 100644 apps/gallery/js/supersized.shutter.js
 create mode 100644 apps/gallery/js/supersized.shutter.min.js

diff --git a/apps/gallery/css/supersized.css b/apps/gallery/css/supersized.css
new file mode 100644
index 0000000000..617f501120
--- /dev/null
+++ b/apps/gallery/css/supersized.css
@@ -0,0 +1,25 @@
+/*
+
+	Supersized - Fullscreen Slideshow jQuery Plugin
+	Version : 3.2.7
+	Site	: www.buildinternet.com/project/supersized
+	
+	Author	: Sam Dunn
+	Company : One Mighty Roar (www.onemightyroar.com)
+	License : MIT License / GPL License
+	
+*/
+#supersized-loader { display:none; position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center;}
+
+#supersized {  visibility:hidden; display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:200; height:100%; width:100%; }
+#supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
+#supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }	/*Speed*/
+#supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }			/*Quality*/
+
+#supersized li { display:block; list-style:none; z-index:150; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
+#supersized a { width:100%; height:100%; display:block; }
+#supersized li.prevslide { z-index:160; }
+#supersized li.activeslide { z-index:170; }
+#supersized li.image-loading { background:#111 url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center; width:100%; height:100%; }
+#supersized li.image-loading img{ visibility:hidden; }
+#supersized li.prevslide img, #supersized li.activeslide img{ display:inline; }
diff --git a/apps/gallery/css/supersized.shutter.css b/apps/gallery/css/supersized.shutter.css
new file mode 100644
index 0000000000..0084d4bb9c
--- /dev/null
+++ b/apps/gallery/css/supersized.shutter.css
@@ -0,0 +1,74 @@
+/*
+
+	Supersized - Fullscreen Slideshow jQuery Plugin
+	Version : 3.2.7
+	Site	: www.buildinternet.com/project/supersized
+	
+	Theme 	: Shutter 1.2
+	Author	: Sam Dunn
+	Company : One Mighty Roar (www.onemightyroar.com)
+	License : MIT License / GPL License
+	
+*/
+
+/* Controls Bar
+----------------------------*/
+#slideshow-controls-wrapper { margin:0 auto; height:42px; width:100%; bottom:0px; left:0; z-index:204; background:url('%appswebroot%/gallery/img/supersized/nav-bg.png') repeat-x; position:fixed; }
+#slideshow-controls { overflow:hidden; height:100%; position:relative; text-align:left; z-index:205; }
+#slidecounter { float:left; color:#999; font:14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 0 -1px 0; margin:0px 10px 0 15px; line-height:42px; }
+#slidecaption { overflow:hidden; float:left; color:#FFF; font:400 14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 1px 1px 2px; margin:0 20px 0 0; line-height:42px; }
+
+/*#navigation { float:right; margin:0px 20px 0 0; }*/
+#play-button{ float:left; margin-top:1px;border-right:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
+#play-button:hover{ background-position:0 1px; cursor:pointer; }
+
+#prevslide, #nextslide{ position:fixed; height:43px; width:43px; top:50%; margin-top:-21px; opacity:0.6; z-index:204; }
+#prevslide{ left:10px; background:url('%appswebroot%/gallery/img/supersized/back.png'); }
+#nextslide{ right:10px; background:url('%appswebroot%/gallery/img/supersized/forward.png'); }
+#prevslide:active, #nextslide:active{ margin-top:-19px; }
+#prevslide:hover, #nextslide:hover{ cursor:pointer; }
+
+ul#slide-list{ padding:15px 0; float:left; position:absolute; left:50%; }
+ul#slide-list li{ list-style:none; width:12px; height:12px; float:left; margin:0 5px 0 0; }
+ul#slide-list li.current-slide a, ul#slide-list li.current-slide a:hover{ background-position:0 0px; }
+ul#slide-list li a{ display:block; width:12px; height:12px; background:url('%appswebroot%/gallery/img/supersized/nav-dot.png') no-repeat 0 -24px; }
+ul#slide-list li a:hover{ background-position:0 -12px; cursor:pointer; }
+
+#tray-button{ float:right; margin-top:1px; border-left:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
+#tray-button:hover{ background-position:0 1px; cursor:pointer; }
+
+
+/* Progress Bar
+----------------------------*/					
+#progress-back{ z-index:205; position:fixed; bottom:42px; left:0; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-back.png') repeat-x; }
+#progress-bar{ position:relative; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-bar.png') repeat-x; }
+
+
+/* Thumbnail Navigation
+----------------------------*/	
+#nextthumb,#prevthumb { z-index:202; display:none; position:fixed; bottom:61px; height:75px; width:100px; overflow:hidden; background:#ddd; border:1px solid #fff; -webkit-box-shadow:0 0 5px #000; }
+#nextthumb { right:12px; }
+#prevthumb { left:12px; }
+#nextthumb img, #prevthumb img { width:150px; height:auto;  }
+#nextthumb:active, #prevthumb:active { bottom:59px; }
+#nextthumb:hover, #prevthumb:hover { cursor:pointer; }
+
+
+/* Thumbnail Tray
+----------------------------*/			
+#thumb-tray{ position:fixed; z-index:203; bottom:0; left:0; background:url('%appswebroot%/gallery/img/supersized/bg-black.png'); height:150px; width:100%; overflow:hidden; text-align:center; -moz-box-shadow: 0px 0px 4px #000; -webkit-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; }
+
+#thumb-back, #thumb-forward{ position:absolute; z-index:5; bottom:42px; height:108px; width:40px; }
+#thumb-back{ left:0; background: url('%appswebroot%/gallery/img/supersized/thumb-back.png') no-repeat center center;}
+#thumb-forward{ right:0; background:url('%appswebroot%/gallery/img/supersized/thumb-forward.png') no-repeat center center;}
+#thumb-back:hover, #thumb-forward:hover{ cursor:pointer; background-color:rgba(256,256,256, 0.1); }
+#thumb-back:hover{ border-right:1px solid rgba(256,256,256, 0.2); }
+#thumb-forward:hover{ border-left:1px solid rgba(256,256,256, 0.2); }
+
+
+ul#thumb-list{ display:inline-block; list-style:none; position:relative; left:0px; padding:0 0px; }
+ul#thumb-list li{ background:#111; list-style:none; display:inline; width:150px; height:108px; overflow:hidden; float:left; margin:0; }
+ul#thumb-list li img { width:200px; height:auto; opacity:0.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter:alpha(opacity=60); -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; -o-transition: all 100ms ease-in-out; -ms-transition: all 100ms ease-in-out; transition: all 100ms ease-in-out; }
+ul#thumb-list li.current-thumb img, ul#thumb-list li:hover img{ opacity:1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); }
+ul#thumb-list li:hover{ cursor:pointer; }
+				
diff --git a/apps/gallery/img/supersized/back.png b/apps/gallery/img/supersized/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..44cd0ae703cb0810dc707f0da621708e14018fdd
GIT binary patch
literal 2629
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
W&UfTqLYgi7*!fWc$QQni+WR-l%v!_%

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/bg-black.png b/apps/gallery/img/supersized/bg-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c2f00140d611be9ab73598bd1ca5f313416b8ec
GIT binary patch
literal 1074
zcmcgrzi-n(6utzhiYg+Nv7HWgCHC3*;n<2PAx>zdI*O7=WW=#AiIv)C><e*%5EU?#
z4IvmASjq%q0R|+HU}9utWJcmIK;oPxDFb1|()r#yec$(f+`EU(#<le3&L#jLUEkMR
zY`5c;+F*bG`_m5FwrRCX+oVq?W`IH2COr)6t~tOhY}(VCUvLS4bDY!Z(yno!TEyke
z7{f=d&)5Kz_9EZ3Mwr4L9yp%H{e1tCgO06n*YgH4{0bgA`?CPIXN`_E8(E6Y?OleY
zNM!;prY4NsLoZY#jhpML%#M!*4$dKTq;aQ7b&V#hkO0Fxk1`f2AXpH2F`JWR`4W_n
zhy)}FqLdM3H7ltI!Nte1Xo1~VTY7B~i+LJ1q|{dhVKSNUlPphyfgmc15^G3Oh9NTH
z)T3sU@xtAuf{sHgaD3_z55|gSkBq6tu}n`(aQ&667cSbw8YV=hFNi#fOIiXA<KIx%
zU7<tT!e{yZRXFTSeJr$aNXCK1F0Q{Dhw{}*fK5t*4k3rjE;fgRl5j|TSZU{>VOowC
z`*XZusC6%-rf1>0u5nC(cN|;Q^EJ657nPixt%+h4DSA;Z=L&_Il#@{vWtUu?SYsD^
zbjh{PxaGCncobZpMb>fP+`@J(ATFGjtUBv+k=N=ixc2&7ifg$7OGbz<_K%BR9<k|(
z&DGd4XEpfPW78h6u`d34^pZV^le%8+MBjdVO{4)xeSUrau5<ip<KnXiZyq1eleggb
t2wd2L$)tYeDD^+>)K+2<_rts7dGKN<@#N0-^V{(&u2&oStE)He{RXOzJiGt^

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/bg-hover.png b/apps/gallery/img/supersized/bg-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ca2022e106454b787657cecabc88aa30eb744fb
GIT binary patch
literal 960
zcmaJ=zi-n(7<EO9pi-qG6;;sXbQzEkvCm1IA6872#14&wt0;*?*y`Aq#7gWl_Jue>
zAjH(pAXQ>uhk=EWfdwHkv9nb4AE>$^!N569(hez>&UfGGz4yKQ?z@BP?t`_}+p8SM
ztyOl^8k?8cfY+|F|GW678*I8owI;2THXRy1<_Z>RVNh|54z6Lt8a?@r^Bi{t+Knb{
z>JMd;IJ^;I_|Wkfo8$7^p=X#qOhF5GY*&FNpT9t0TMB$6=}7lVxNGl>eOw>!Hq3F)
z%vo^zKFEhM6L2s!K<M<{Kn@i+(UsXc+7=*~Kxj{aXQrBZ6_kjNfyAS@iP8w9MP5v%
zGMUUhkU%05P(lzBaWNw&6EZ?z`azb>x7u<|El+c?NP%5SJy{Tj!y!LR^2F~5VlJ19
zG!lt8L&SrTON}t@2C<ofiUZTPJ!%sdM2bd>45$K`)3YNu-dxrVre$IU6GFoiL>@&)
zngMnF|4_%7qXSyQ=YAIo2aS=3g&GdXz&F{&wPR5#PcHe`pu}$w(w|ka+9i|(UE+aK
zT>`pc+HMq2@VYKn+<+Rci7ToCnF4RymRwAUITfX|DK%XdMGa-kSv4ymNs~$_iIRmG
zS0(1a!7iO~t#fYfQf|}=j>j^q*tefztLzg8OpYwu3%rzzny5)>mFblhdpYA;3%pFZ
z+NE59nGvFky>QX9E!I8Ja^AKqm^VIlS-1PFtsBDQ59~>#Dr%t-{%oypZ2bN4m0J!E
zj==He{_pE|UcB5t0moZ+Pj7CXt{g7ET{`;pE!O|DvcAW?dA{}R(0czmdQ%l`SN&Mr
Gd-V^>d@1<=

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/button-tray-down.png b/apps/gallery/img/supersized/button-tray-down.png
new file mode 100644
index 0000000000000000000000000000000000000000..99b92aef122f08800dd80bd79b92fd7d2293a692
GIT binary patch
literal 1506
zcmeAS@N?(olHy`uVBq!ia0vp^W<adP!3HFM1g@|JQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|26w%uvtJ
z*u>o2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1?ON>1>eNv%sdbu
ztlrnx$}_LHBrz{J)zigR321^|W@d_&lew#fv9XJ@sez-3p`ojRql=}frKO{(g{8BL
zk%@^BOs`9Ra%paAUI|QZ3PP_7PQ9R{kXrz>*(J3ovn(~mttdZN0qkX~Oe}6OF)=nU
zH#IfKX&zK>3Kq9O^;+Q6s}FRHJ}6?5A{r(HOg$hbJlO&{@Pwb52Tbinz+^32Cga7x
zz!c``;uunK>&*=RY~etWqxqMFR%?iu>%LS!;TO}Xva9SWe}JHLhWR6}g2aF`>$VBq
zEm?TX$?NF0?gVkJsHO=&)VaM)6U3BC1Wg_<F(|z?^Gb;NyzsaMS>DIa`AELr`=MEU
zlJ%a$w(s{@a|#3s3ofV?bG)_u;GqZ!?&L(Bp4N>9V%y3uzWl=2*ifFVmKL#2BD&Cg
z9gFM(0Sk5e+nnAz_(Tpaiuvs|qav(aLnMfu?cBf8PlpakYfbe!zSJU~Q~2tuEEB2X
zi5^S-|4F!0wrE+VNcTLE)B1H=A2CkwS6lzxJ$bq2o$Kk^h7)%<ty;BgL&%*wJ&X6V
zZQJr&;05FH15Y#FgnW6ow{zQ1eXdF=xvu?3KJi4{t~&PT(!2f5p#iLsIXjGu|4!h!
zd}rdVPe!r3X9?{5e$afoRQv5iF6G7t)C1Vg=Py0BB537=#2L3I?XvXh3KC77%PL*B
z@3_m=eNCzc>tFwRbfZ@=%J@}%fR0$^yTEU2H|R!`Z;p!N$UfzJ?Ew3S2VYk=O*(D+
z`)JdxQ(Slbdb{o~Us_xLhkJ6n>THM8lYV}gTexbasnOYAYQZx(gI3K~{}_8Lm%GX~
zh|@dk(j@<|(!Y08)O^!w=bn1{-Q@q5k7?7{OSkL(xGivZ$=yrO4%u<}HE=&juKAI)
zdAYgHB)yZ?>))2VPl=D?%)XoZXqs5EtC0jxSBql7k#jmPQ{waDE?Dz2updmcl!@My
zEp=(#yuJOEx@$`NtW~DHX_z*5^HY}y^-B3^Db3#ue(?U<U)@|*#J3{}5|zgeMcnxI
cF}Q(|fpgckE1}<?6oN`!Pgg&ebxsLQ0JT*)r~m)}

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/button-tray-up.png b/apps/gallery/img/supersized/button-tray-up.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc57785f0a7a309cc2959273f5eaaaa1a69ed40
GIT binary patch
literal 1466
zcmeAS@N?(olHy`uVBq!ia0vp^W<adP!3HFM1g@|JQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|26w%uvtJ
z*u>o2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1?ON>1>eNv%sdbu
ztlrnx$}_LHBrz{J)zigR321^|W@d_&iHWg+xhW7BIGPw5x*9mTSejZ|I+|KoI=dK|
zm>9wIy5uL9=BDPA!1Sgd^qS$+3rY&P1wfl!Qj0RnQd8WD@^clyUbf1_?G|I4=0WwQ
z;C71%PQCg-$LND17Ac}(Lcr7mV#1RxkONQnsd>QEUIa|m{^1AKF)%RcdAc};RNQ(q
z<E*!|qsW2#bw^D&vlnCq`umF5c(|@s_%YRizw4?(=L<)JZM<GAtgT@p&GY`a+k6f9
z@IS+qEAB`$$FzAiJ7@FGT9cn5Vt>G8Gjnzge_c+3@!@}E_iUc6WnnODV-XcI3dxut
z(K!)<W^g;}mNR(@l}jC7EVovo(^5ug`OZm4ZrFWO%3c`of?>UOOi;y!I-Ysnocez5
zi|Y2@|Mxfjdf##3oC{$qk1n3`TuAj;*i&91w=yH?+21aH?A-gk{5~IBb526Yk{KsL
zLMCLTtbCmO{KbzSDl^i=Z02c2oX^?xJ9DC@Cik4{?OU>EO^b^?-7xiZW8$pvFYb#j
z*b8_*`1^Ib%CWG6%~uq-jpKs?f}`2n67MA@7D|@Hrh8xi8gxV?&fuBz!(|80Z?u>r
zd6T`OmeHebuIRK$n;L#b9Lxv|EzLCB%Mp2cm*>IXU%t3LaE`7P`v3p%*`zmXvu#-S
z^Yb2G@Gkam=)sDfl_^}S_QZw#i@vK>Hn-{iD`}~Ad)~f=nOnOa@xKs|o}KXc`CK2*
z<wu(~>8w{%TmJBo692TR+MVm(#Z}1X%{%<Dc3o!lyUw2?u8r~b+vnTdIAYuW@%+i!
zz-#L7qW?-*^Y44g9vgOu*)>kax;Em3<|lbemv0mI2>+ciIZ11M2V>n;uN%gddg%q{
zCN|wZvMyTq=e75Xjyu-r7UV3q%25A4<E&-?``c&zmQR;(1LFo7WjC~icZ(!2Jh-+_
U=k}8u%R!~7r>mdKI;Vst07H-=f&c&j

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/forward.png b/apps/gallery/img/supersized/forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2084ab3fafe805cc4fa302bc4d2723932fba46f
GIT binary patch
literal 2614
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
LS07?EAvE<rfHP?0

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/nav-bg.png b/apps/gallery/img/supersized/nav-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..800f904ddc7d1f2bbd2b82d7eb20d23fdfdf406f
GIT binary patch
literal 995
zcmaJ=O=#0l9FHH9IT@liJ<LaT@UkW^?b5Dcadt`Tf@YMqvR)>8OWxM7B`+qgYqo><
zfrp`@;6+4FdJ>%AX|SOl1QCazhaEh4^5_S6R`8{3I}g^t%X|OF@AvzEzSZL7nf|`x
zeH_R28xwko?R(f7>OH{zk57I?Y&%BtRaz!<w1EQ5<!myGf#ITgT*Am+zW5f8a@;=N
zsZ?pzJf~R16;O;3BG+eZjvF0|d}J+P3TE-V<Ei|Qjh8%dY?YsqO=$WWt~nDc0WPmh
zR;-l;D{J#(r@&~WFaZ}+1R{6Q3zbOao4N`+$JZhcnh?66@;gCQ%_7i9fPpN)gay+O
zq$NR04QDc$A&`U;6k$@7k_joJq>>7Rp!M<0TVT&ACB4w{#VnPtQR*wA*l09_MoJ*T
zyeMU}*;pf)OfW<uT=po65?(miR?u;11&&W0;(=HZ&5}A*c^2tT3a;Og^}<$}Si!^y
z`JyDiIHfkwH2)8E-3~gWCA=H&KZV1}vX8|Q4oN+*SmWjfV^_YS1sG8hR0vsYSFu<l
zl!P_n1Fb9r6IqTI+fBS_Dux$Q<XPCzRh}sbj$<o@@w}9m)8oT>T9c$a94U<GBQlip
zvIbKym1}c#V%1&j(KgrK<!W8I@hG@H^Q_~*S;BT9ATDU8tT^3c$#&IiaqaH0<hpW2
z7K|7-_OC{_uh{g&$IjR?qcix}W78h6u`Z&4uk1-o8G5b~eWJHN^k0U(`m@*P?>+kd
z@`?uc&h#8KZv9>#*gUj<=H`v}*~3SV+}XIcwRIxbw|#bM_`%&Lmrh?-r}g_w>t7x|
n|JJ*DVdLqqo~_Ln_3gwf?oD|*`uX|YTKw#c{G`4%K6CXCqme#T

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/nav-dot.png b/apps/gallery/img/supersized/nav-dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..a28a50789f37f6afc9abc8b1495c76cacf7a1889
GIT binary patch
literal 1901
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
ND2-4^jx9<0^l!9${2u@S

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/pause.png b/apps/gallery/img/supersized/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2c21a51ceeb781cb1a7ada35e9d3fe01ddb0083
GIT binary patch
literal 1131
zcmaJ=TWHfz7>-k_jE*6KH$-AYAEs@Rc5T<NbZkxMip!i?Vf6woOU~BVCMPCmHmf3{
zzIZ`liXiMwHnw?rkl~Ah4%tLdK|v5F2tz@JqC-S+4|+1&>4P<Ja?XGFzVH9efBtj2
zy=_NT<@!p3AgYorf`sQV9yKdG`2T(P2#=?AD3L}Tum|O33lNPe>;_~~mwSN(WVQd$
zBT!EeODQdtMrpB?Q=smbU5ww+P0S{U`Uc08l`KGHH|W(2p89m>9z|*@Pj!YwMl|Cf
zqqP()&{1ehDTS;ORjGy;S?_RIKnF-B9X)5*oWoNKx*T4++cZTkKv0&aew#{*?PMHU
zfDHK=pTdM0GR*qfU~ME4*-i!+mZ6yd%?5mIgbM~Zh9Qd|g|k^|4<`xD#auYzsSH9U
zN7MOy-k%Tpq18*X(P-4w2n2i>;j{Y<Bs)IC-ds`;fUQ`Xi8N@CuA<xx`w&lIr@xP&
zn~SoBT`UtW812X=&H5SlNF|^s{vWFAi)b53;E&&b3frlE6VMW{VV|Yoi|g6!rZTy>
z1!M%R6ok1_727iqK|2FYGTsp)MOo1dH(tPtB9}C5BpV7y3Ot1s{F<h6P4PN55)IWw
zgt}&yO)zyV%Ql6=!Nvq5GzQ|~5?6pqpAHOE;;MhR(Xw2(6?7A47J#K425Pefb#mdz
zoL1gTxU620tCsf?Da)m?8QQ(rzb?A8g}cXHF19TW78@TJxZ5q<*0ak*9Y2XTNue?2
zy!vouqUr(ZO?(`iW}2o$dqzI4@UA-fb}PU9^TgQkV>@GW)yIxLyj5|n=EmyB*VpW=
zB|OaWCEhM#>C4%!`I=Q1`i2LdjU5`Dv^%|<-hcTT<Bz<Cm!$5qQ%dLE0(W@7^mM4u
z^TIh5TpK!bJL_52F)(=N{MTAyeoOjtEWIl@tazA}<1;PiPfxH{s&m2dnec&a($yy)
z)_beZ9ci7c#JsJc>{Kq1`*u;Blzw2cG3mV9I5$5!*gJl3!)*Ih@Oi_}p^CNli{4^$
ZE4zq&)l;5ihI!yV|74;~xY^Wo;umj`cl`hW

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/play.png b/apps/gallery/img/supersized/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..16e53f8674546f9d1530ef1b29a8559eaa948386
GIT binary patch
literal 1562
zcmaJ>eM}Q)96mrN;!uJJbu;F;#^|u^-4)u>h9YgR*vbyDR6!ibaXsKB*DKe97Fnif
zG%bFjGEwKZLzzl~I(2kv7RBLoo2ELQi4J8Zn4ufQZ-(xQ6!!=2lDqf)y?LJJ_q^}>
z<h<FLvm+xuhyVZ}(rm&k!l)G9gz)!-@AJ6_wZbr&H|Fs<YzgloI113&*kTGaGejw6
zp$J=b#YHLw0Ky>Jn#bqiA8SaKkr4rm%*{9iHUOl|aytleF~x($R4HxOLVx+rLLhC^
zLb(bY!5s#wj5aOdsGKF4R&vQ=Qf-4~rGhDLjUd2KJOR3ya=TOG)<T228etw-h9Phe
z!Y|fBZ%pOk*`R^tC{Q6oq$Hw5KqV?e6O&Xbl?0R{C;}sL7?n#=l_pWHK@f20frM_H
ztwdwN(uaBpl@==Fd4~puT`rf*l_+DmQW#aM)d3B;Tq+=>&T2bPxTSWdIH-V8PLiV?
zJk8p{fFe=MR`Oa%aQbEojAK~V?i@NM;lN-w;eb&Y64+7@h~xhcWtd^KlebWB{f;Q?
zv{pMP*g`qkN{$pRu0$MY<<J;7ir`t!%ChCbQ_L=7dDdCRIzU5?0>lZDwg>7#JdSJ3
zb|+8RNy?0AAwfY#(>9IXkc_I-iX;`5oQ|SKBpF3fy+WC&Ga{HyZcqlf7)w?%l${T9
zZEv}XcX9(!U>rhcjN<4j%9hTt3^=%D4LyRFL`<g_8tVl;!No{k-f(Rrcp2gv-pPdp
zGjQNy|8vp7B_Tb5>2Pd?VmSDeT}V3@h_%0}6aYfknK7N!eXFMt&zh(cE&ClenR5J_
zroZpaRp_!_MZB&ZGvVH7S@+d_DB9ckJqCU=YE49Jetw3bUR1x~V4mNa|L|zf(U=6!
zN=tm2&-d{8c>9`O@wG?C?H9}YY_2=Ew_f(YXh{pN-B&esdD<x1h4xdTxUS+))~v2*
zZS#gqB0~ys)AW0`dAf0xM1s=s?dcuKQ^s#Q<vq2oPW0PlroNi4<#|5(fZx30<c6+D
z_-VDaKdhn<Dk#YHUb?>*X2nOI#E{DBD<Qs(3;LyJjvb2(8yM)UdZtg^b$0ch8jrR4
z=F(l0Xriv|pBv9=YJ5mia`<WO?G2Zhr$wHPW#O%x_fL6QuqPWh%Zgs6JR_LOC-JM=
z>QyIVw`bH%TDnNKrAQK^*Qq4Z=5r-+JJh1*RTFFCGOP_QNWQM?O4!lwqT~x5eZDRD
z`NE$rNE*-qE@JBL-7}hgCgq<R4}0&=PxmKfyvW*-8pf3VQoFZ<tt?=hjPn=9=Ctl@
z%57jt@whvCe)wAwy{fp?J;tCqY(nGwkC#sD-@Kr<vpYOx*O$OKWGdmA)7;T=y$yL(
z*WmripD^mP!p5yTe=O#vJTS;RVhj4Z_tP`cfvDDY<K)oKVXSnKUphzB3;x-Wo6}Jg
zKksDAjHcAI8A#~G^EI~;vL2X$7k#Uv{3{5&eWSBNH11_u{j|xOLjLf6bbM{k4gEo7
z!Cck&N4<G5&|Oe+;QIQ;$KrjaUt<!kSvvZzc21bR@@9KRuIZ9@{x*;JM!j<XXm!ae
zk6t`=Vawfzq0w03mHXbE`Q3f1Hh)dW`^uX$x2^A=HMZdhul9Kq+oPu)(w~U#dOedv
ggNf)le`YKK9Q$IKsQ<%5lEB~EY|O-3^hL}61q>`o1^@s6

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/progress-back.png b/apps/gallery/img/supersized/progress-back.png
new file mode 100644
index 0000000000000000000000000000000000000000..68cd45b6706bc9b1870d83842c89fc3423429a67
GIT binary patch
literal 929
zcmaJ=J#W)M7<K`ns!}D8%0Q>nbtU%MX+CVll+;eBB^*UbBr^75UlS{}&pls=6EUD}
zY%Kf*M*aW;BVuJj%<TLD2JX^0Wgu8O-@T{jdEU=^+wDBx-#gq>6lLE#b9-Xn5o>q%
zzWCP<-#5kfn74+!PcQf!Gomy@IwHV}@tE`o4i{HnNkdWY!e}t$L;r;p&{)M1qvmlc
z*ox9P$x|Fm2?rxGjuIRG`t%usD74|rijVx%A(QBA$w+_M83fB|V21GIDQM)D5QquK
zAdfGT%*t)J(zV1{UTYAnAbe`Wo1lh%7dVs=P*G7SKve{)x~i9tYqi=FU?3f7$k247
zq}QynVIc(89~9nLcwzP2_S%=QY&hXOwKQ!$pR4n-O4(S`P1BSbhEWoTQnpAq&Pz#l
zR4BM43s{u$h$cWP;t`#38;VG8Qi#)yY?7_ZBnqbGIMs9&$&?D9@Bbef#~XCUd*n9W
ze+p-VMM|_D$>@v)qHz~T(p73Xj9^aLfYQsNiroq2G@H;AIQ<InaS$caUg3S;@{)|>
zBp{w^L!qEXQD_-v)2tdb_t-^kU2ma!yYAL2sM4x9sEo?Zg6q;?7L$Y*-0+s$+RBxq
z5U0YkOIY-Zgl$G+uu9pAw#Rb1Rd3A=x5wga<!T}rO*ZzgMi*CNdgO64w!+v9K1sy1
zGcndbKYWo->XGL*2l<cDgM$NpK2q-dzW40Sj`HxEa{b+T{Z2j_uhnrso}OR-0Tz!L
A=l}o!

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/progress-bar.png b/apps/gallery/img/supersized/progress-bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ebb0513b78c054a2b5a48d8688f56f8b839241
GIT binary patch
literal 929
zcmaJ=J#W)M7&b&gRYfHv#6YLhbzmX(*{PfO6jOybp%!%%B@tv`;9_4AH?_~4FT@EO
z8#CeuurM;RFmz_&2QcvuSlP-sO;QGerSsi;dY<R~ym#%^lfB*jT}4s$+!LoG_ZxEU
z?A((7%KnF%-0q7;Uv$|}%m}ASEnou*+=z^5hmv6a>Km;pN&$wwzUX_W*k_SSa*Ucq
ziDWBE^*Bq2KcNB)=qQYB`0MKh1Yuyq=cb3eq)x}-$%51FqSf;k6W<Ep@gq>puoQ@>
zARvp*;}mB$T<T(Z&aX8HmJl(q;Z;z5uMO&qQ(&s7=%XV9j&xNo9hS@GhrmEO(vYF)
zMo};0l7SHds}D+VJQ(7R(_HzImJP>3Bv{jCvza<8sf>>_-LkA)!!U{xQB3EtAXza^
z57r6}O?@6FB4jbh70G~2g$-q-S1ClvMmA1YWs(KcGLmSzit?1!K+pR>G>SIpRCMTd
zy#EwVd-H^99h$N!_hsXT2f3>R*EuDE@g8I6>ngU#Ot5s!5>W4&z$1Pb=k^lsdDx9p
zL1Le}jt!-P8ioNjteSOXRP;j!HFdp#D$R;hF_GCY>!^fEwKdma{xqVoSaXAGuCbMy
zk3y74&kp6`YZ^2;i@-8v9Bz%J+}x_S;s)DeL0h?+3`WZv`&XmaS8{st<7RB7u^D_C
z%W3CwtY3UOdn%vAJ=dxAvLA!rmzNiXyM;SHA1F6(D{sCRPTxQK@-crjZlmRVe*E(7
E9|9d3=>Px#

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/progress.gif b/apps/gallery/img/supersized/progress.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f3e45e0569c02ae3fe7114691e5b5aba892e9ef4
GIT binary patch
literal 2608
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
To9S~^+y+<0ZCHLEy;%PN2K9)%

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/supersized-logo.png b/apps/gallery/img/supersized/supersized-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1243a297840e79bc777d46e1a15b5b235d09983
GIT binary patch
literal 3982
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

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/thumb-back.png b/apps/gallery/img/supersized/thumb-back.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c969ebd5276c73df8c1e8f4fb205731f00a0793
GIT binary patch
literal 2122
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

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/supersized/thumb-forward.png b/apps/gallery/img/supersized/thumb-forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..afe451c75d0d6072a77a67f5ebbbf862dda8e3c4
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index b8aadacb47..c7eafc9a1c 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -30,6 +30,12 @@ OCP\App::setActiveNavigationEntry( 'gallery_index' );
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('gallery', 'styles');
 OCP\Util::addScript('gallery', 'pictures');
+OCP\Util::addStyle( 'gallery', 'supersized' );
+OCP\Util::addStyle( 'gallery', 'supersized.shutter' );
+OCP\Util::addscript('gallery', 'slideshow');
+OCP\Util::addscript('gallery', 'jquery.easing.min');
+OCP\Util::addscript('gallery', 'supersized.3.2.7.min');
+OCP\Util::addscript('gallery', 'supersized.shutter.min');
 
 include('gallery/lib/tiles.php');
 
diff --git a/apps/gallery/js/jquery.easing.min.js b/apps/gallery/js/jquery.easing.min.js
new file mode 100644
index 0000000000..bbf8410391
--- /dev/null
+++ b/apps/gallery/js/jquery.easing.min.js
@@ -0,0 +1,71 @@
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright � 2008 George McGinley Smith
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+*/
+
+jQuery.easing.jswing=jQuery.easing.swing;jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(e,f,a,h,g){return jQuery.easing[jQuery.easing.def](e,f,a,h,g)},easeInQuad:function(e,f,a,h,g){return h*(f/=g)*f+a},easeOutQuad:function(e,f,a,h,g){return -h*(f/=g)*(f-2)+a},easeInOutQuad:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f+a}return -h/2*((--f)*(f-2)-1)+a},easeInCubic:function(e,f,a,h,g){return h*(f/=g)*f*f+a},easeOutCubic:function(e,f,a,h,g){return h*((f=f/g-1)*f*f+1)+a},easeInOutCubic:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f+a}return h/2*((f-=2)*f*f+2)+a},easeInQuart:function(e,f,a,h,g){return h*(f/=g)*f*f*f+a},easeOutQuart:function(e,f,a,h,g){return -h*((f=f/g-1)*f*f*f-1)+a},easeInOutQuart:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f*f+a}return -h/2*((f-=2)*f*f*f-2)+a},easeInQuint:function(e,f,a,h,g){return h*(f/=g)*f*f*f*f+a},easeOutQuint:function(e,f,a,h,g){return h*((f=f/g-1)*f*f*f*f+1)+a},easeInOutQuint:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f*f*f+a}return h/2*((f-=2)*f*f*f*f+2)+a},easeInSine:function(e,f,a,h,g){return -h*Math.cos(f/g*(Math.PI/2))+h+a},easeOutSine:function(e,f,a,h,g){return h*Math.sin(f/g*(Math.PI/2))+a},easeInOutSine:function(e,f,a,h,g){return -h/2*(Math.cos(Math.PI*f/g)-1)+a},easeInExpo:function(e,f,a,h,g){return(f==0)?a:h*Math.pow(2,10*(f/g-1))+a},easeOutExpo:function(e,f,a,h,g){return(f==g)?a+h:h*(-Math.pow(2,-10*f/g)+1)+a},easeInOutExpo:function(e,f,a,h,g){if(f==0){return a}if(f==g){return a+h}if((f/=g/2)<1){return h/2*Math.pow(2,10*(f-1))+a}return h/2*(-Math.pow(2,-10*--f)+2)+a},easeInCirc:function(e,f,a,h,g){return -h*(Math.sqrt(1-(f/=g)*f)-1)+a},easeOutCirc:function(e,f,a,h,g){return h*Math.sqrt(1-(f=f/g-1)*f)+a},easeInOutCirc:function(e,f,a,h,g){if((f/=g/2)<1){return -h/2*(Math.sqrt(1-f*f)-1)+a}return h/2*(Math.sqrt(1-(f-=2)*f)+1)+a},easeInElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k)==1){return e+l}if(!j){j=k*0.3}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}return -(g*Math.pow(2,10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j))+e},easeOutElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k)==1){return e+l}if(!j){j=k*0.3}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}return g*Math.pow(2,-10*h)*Math.sin((h*k-i)*(2*Math.PI)/j)+l+e},easeInOutElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k/2)==2){return e+l}if(!j){j=k*(0.3*1.5)}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}if(h<1){return -0.5*(g*Math.pow(2,10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j))+e}return g*Math.pow(2,-10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j)*0.5+l+e},easeInBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}return i*(f/=h)*f*((g+1)*f-g)+a},easeOutBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}return i*((f=f/h-1)*f*((g+1)*f+g)+1)+a},easeInOutBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}if((f/=h/2)<1){return i/2*(f*f*(((g*=(1.525))+1)*f-g))+a}return i/2*((f-=2)*f*(((g*=(1.525))+1)*f+g)+2)+a},easeInBounce:function(e,f,a,h,g){return h-jQuery.easing.easeOutBounce(e,g-f,0,h,g)+a},easeOutBounce:function(e,f,a,h,g){if((f/=g)<(1/2.75)){return h*(7.5625*f*f)+a}else{if(f<(2/2.75)){return h*(7.5625*(f-=(1.5/2.75))*f+0.75)+a}else{if(f<(2.5/2.75)){return h*(7.5625*(f-=(2.25/2.75))*f+0.9375)+a}else{return h*(7.5625*(f-=(2.625/2.75))*f+0.984375)+a}}}},easeInOutBounce:function(e,f,a,h,g){if(f<g/2){return jQuery.easing.easeInBounce(e,f*2,0,h,g)*0.5+a}return jQuery.easing.easeOutBounce(e,f*2-g,0,h,g)*0.5+h*0.5+a}});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright � 2001 Robert Penner
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ */
\ No newline at end of file
diff --git a/apps/gallery/js/slideshow.js b/apps/gallery/js/slideshow.js
new file mode 100644
index 0000000000..01d5a4cf2c
--- /dev/null
+++ b/apps/gallery/js/slideshow.js
@@ -0,0 +1,58 @@
+$(document).ready(function(){
+        
+	$.endSlideshow = function () {
+		if($.supersized.vars.slideshow_interval){
+			clearInterval($.supersized.vars.slideshow_interval);
+		};
+
+		$(".supersizedHolder").remove();
+		$('#slideshow-content').hide();
+		$('#thumb-list').remove();
+	}
+        
+	// add slideshow in holder div
+	$('#slideshow input.start').click(function(){
+
+		var images=[];
+		$('#gallerycontent div a').each(function(i,a){
+			images.push({image : a.href, title : a.title, thumb : a.children[0].src, url : 'javascript:$.endSlideshow()'});
+		});
+
+		if (images.length <= 0) {
+			return;
+		}
+
+		$("body").append("<div class='supersizedHolder'></div>");
+		$("#supersized-loader").remove();
+		$("#supersized").remove();
+		$(".supersizedHolder").append("<div id='supersized-loader'></div><ul id='supersized'></ul>");
+		$("#supersized").show();
+		$('#slideshow-content').show();
+
+
+		jQuery(function($){
+
+			$.supersized({
+
+				// Functionality
+				slide_interval      :   3000,		// Length between transitions
+				transition          :   1, 		// 0-None, 1-Fade, 2-Slide Top, 3-Slide Right, 4-Slide Bottom, 5-Slide Left, 6-Carousel Right, 7-Carousel Left
+				transition_speed    :   700,		// Speed of transition
+
+				// Components							
+				slide_links         :   'blank',	// Individual links for each slide (Options: false, 'num', 'name', 'blank')
+				slides              :   images		// Slideshow Images
+							    
+			});
+		});
+
+	});
+
+	//close slideshow on esc and remove holder
+	$(document).keyup(function(e) {
+		if (e.keyCode == 27) { // esc
+			$.endSlideshow();
+		}
+	});
+
+});
diff --git a/apps/gallery/js/supersized.3.2.7.js b/apps/gallery/js/supersized.3.2.7.js
new file mode 100644
index 0000000000..f5a1c0bbc2
--- /dev/null
+++ b/apps/gallery/js/supersized.3.2.7.js
@@ -0,0 +1,930 @@
+/*
+
+	Supersized - Fullscreen Slideshow jQuery Plugin
+	Version : 3.2.7
+	Site	: www.buildinternet.com/project/supersized
+	
+	Author	: Sam Dunn
+	Company : One Mighty Roar (www.onemightyroar.com)
+	License : MIT License / GPL License
+	
+*/
+
+(function($){
+
+	/* Place Supersized Elements
+	----------------------------*/
+	$(document).ready(function() {
+		$('body').append('<div id="supersized-loader"></div><ul id="supersized"></ul>');
+	});
+    
+    
+    $.supersized = function(options){
+    	
+    	/* Variables
+		----------------------------*/
+    	var el = '#supersized',
+        	base = this;
+        // Access to jQuery and DOM versions of element
+        base.$el = $(el);
+        base.el = el;
+        vars = $.supersized.vars;
+        // Add a reverse reference to the DOM object
+        base.$el.data("supersized", base);
+        api = base.$el.data('supersized');
+		
+		base.init = function(){
+        	// Combine options and vars
+        	$.supersized.vars = $.extend($.supersized.vars, $.supersized.themeVars);
+        	$.supersized.vars.options = $.extend({},$.supersized.defaultOptions, $.supersized.themeOptions, options);
+            base.options = $.supersized.vars.options;
+            
+            base._build();
+        };
+        
+        
+        /* Build Elements
+		----------------------------*/
+        base._build = function(){
+        	// Add in slide markers
+        	var thisSlide = 0,
+        		slideSet = '',
+				markers = '',
+				markerContent,
+				thumbMarkers = '',
+				thumbImage;
+				
+			while(thisSlide <= base.options.slides.length-1){
+				//Determine slide link content
+				switch(base.options.slide_links){
+					case 'num':
+						markerContent = thisSlide;
+						break;
+					case 'name':
+						markerContent = base.options.slides[thisSlide].title;
+						break;
+					case 'blank':
+						markerContent = '';
+						break;
+				}
+				
+				slideSet = slideSet+'<li class="slide-'+thisSlide+'"></li>';
+				
+				if(thisSlide == base.options.start_slide-1){
+					// Slide links
+					if (base.options.slide_links)markers = markers+'<li class="slide-link-'+thisSlide+' current-slide"><a>'+markerContent+'</a></li>';
+					// Slide Thumbnail Links
+					if (base.options.thumb_links){
+						base.options.slides[thisSlide].thumb ? thumbImage = base.options.slides[thisSlide].thumb : thumbImage = base.options.slides[thisSlide].image;
+						thumbMarkers = thumbMarkers+'<li class="thumb'+thisSlide+' current-thumb"><img src="'+thumbImage+'"/></li>';
+					};
+				}else{
+					// Slide links
+					if (base.options.slide_links) markers = markers+'<li class="slide-link-'+thisSlide+'" ><a>'+markerContent+'</a></li>';
+					// Slide Thumbnail Links
+					if (base.options.thumb_links){
+						base.options.slides[thisSlide].thumb ? thumbImage = base.options.slides[thisSlide].thumb : thumbImage = base.options.slides[thisSlide].image;
+						thumbMarkers = thumbMarkers+'<li class="thumb'+thisSlide+'"><img src="'+thumbImage+'"/></li>';
+					};
+				}
+				thisSlide++;
+			}
+			
+			if (base.options.slide_links) $(vars.slide_list).html(markers);
+			if (base.options.thumb_links && vars.thumb_tray.length){
+				$(vars.thumb_tray).append('<ul id="'+vars.thumb_list.replace('#','')+'">'+thumbMarkers+'</ul>');
+			}
+			
+			$(base.el).append(slideSet);
+			
+			// Add in thumbnails
+			if (base.options.thumbnail_navigation){
+				// Load previous thumbnail
+				vars.current_slide - 1 < 0  ? prevThumb = base.options.slides.length - 1 : prevThumb = vars.current_slide - 1;
+				$(vars.prev_thumb).show().html($("<img/>").attr("src", base.options.slides[prevThumb].image));
+				
+				// Load next thumbnail
+				vars.current_slide == base.options.slides.length - 1 ? nextThumb = 0 : nextThumb = vars.current_slide + 1;
+				$(vars.next_thumb).show().html($("<img/>").attr("src", base.options.slides[nextThumb].image));
+			}
+			
+            base._start(); // Get things started
+        };
+        
+        
+        /* Initialize
+		----------------------------*/
+    	base._start = function(){
+			
+			// Determine if starting slide random
+			if (base.options.start_slide){
+				vars.current_slide = base.options.start_slide - 1;
+			}else{
+				vars.current_slide = Math.floor(Math.random()*base.options.slides.length);	// Generate random slide number
+			}
+			
+			// If links should open in new window
+			var linkTarget = base.options.new_window ? ' target="_blank"' : '';
+			
+			// Set slideshow quality (Supported only in FF and IE, no Webkit)
+			if (base.options.performance == 3){
+				base.$el.addClass('speed'); 		// Faster transitions
+			} else if ((base.options.performance == 1) || (base.options.performance == 2)){
+				base.$el.addClass('quality');	// Higher image quality
+			}
+						
+			// Shuffle slide order if needed		
+			if (base.options.random){
+				arr = base.options.slides;
+				for(var j, x, i = arr.length; i; j = parseInt(Math.random() * i), x = arr[--i], arr[i] = arr[j], arr[j] = x);	// Fisher-Yates shuffle algorithm (jsfromhell.com/array/shuffle)
+			    base.options.slides = arr;
+			}
+			
+			/*-----Load initial set of images-----*/
+	
+			if (base.options.slides.length > 1){
+				if(base.options.slides.length > 2){
+					// Set previous image
+					vars.current_slide - 1 < 0  ? loadPrev = base.options.slides.length - 1 : loadPrev = vars.current_slide - 1;	// If slide is 1, load last slide as previous
+					var imageLink = (base.options.slides[loadPrev].url) ? "href='" + base.options.slides[loadPrev].url + "'" : "";
+				
+					var imgPrev = $('<img src="'+base.options.slides[loadPrev].image+'"/>');
+					var slidePrev = base.el+' li:eq('+loadPrev+')';
+					imgPrev.appendTo(slidePrev).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading prevslide');
+				
+					imgPrev.load(function(){
+						$(this).data('origWidth', $(this).width()).data('origHeight', $(this).height());
+						base.resizeNow();	// Resize background image
+					});	// End Load
+				}
+			} else {
+				// Slideshow turned off if there is only one slide
+				base.options.slideshow = 0;
+			}
+			
+			// Set current image
+			imageLink = (api.getField('url')) ? "href='" + api.getField('url') + "'" : "";
+			var img = $('<img src="'+api.getField('image')+'"/>');
+			
+			var slideCurrent= base.el+' li:eq('+vars.current_slide+')';
+			img.appendTo(slideCurrent).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading activeslide');
+			
+			img.load(function(){
+				base._origDim($(this));
+				base.resizeNow();	// Resize background image
+				base.launch();
+				if( typeof theme != 'undefined' && typeof theme._init == "function" ) theme._init();	// Load Theme
+			});
+			
+			if (base.options.slides.length > 1){
+				// Set next image
+				vars.current_slide == base.options.slides.length - 1 ? loadNext = 0 : loadNext = vars.current_slide + 1;	// If slide is last, load first slide as next
+				imageLink = (base.options.slides[loadNext].url) ? "href='" + base.options.slides[loadNext].url + "'" : "";
+				
+				var imgNext = $('<img src="'+base.options.slides[loadNext].image+'"/>');
+				var slideNext = base.el+' li:eq('+loadNext+')';
+				imgNext.appendTo(slideNext).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading');
+				
+				imgNext.load(function(){
+					$(this).data('origWidth', $(this).width()).data('origHeight', $(this).height());
+					base.resizeNow();	// Resize background image
+				});	// End Load
+			}
+			/*-----End load initial images-----*/
+			
+			//  Hide elements to be faded in
+			base.$el.css('visibility','hidden');
+			$('.load-item').hide();
+			
+    	};
+		
+		
+		/* Launch Supersized
+		----------------------------*/
+		base.launch = function(){
+		
+			base.$el.css('visibility','visible');
+			$('#supersized-loader').remove();		//Hide loading animation
+			
+			// Call theme function for before slide transition
+			if( typeof theme != 'undefined' && typeof theme.beforeAnimation == "function" ) theme.beforeAnimation('next');
+			$('.load-item').show();
+			
+			// Keyboard Navigation
+			if (base.options.keyboard_nav){
+				$(document.documentElement).keyup(function (event) {
+				
+					if(vars.in_animation) return false;		// Abort if currently animating
+					
+					// Left Arrow or Down Arrow
+					if ((event.keyCode == 37) || (event.keyCode == 40)) {
+						clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
+						base.prevSlide();
+					
+					// Right Arrow or Up Arrow
+					} else if ((event.keyCode == 39) || (event.keyCode == 38)) {
+						clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
+						base.nextSlide();
+					
+					// Spacebar	
+					} else if (event.keyCode == 32 && !vars.hover_pause) {
+						clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
+						base.playToggle();
+					}
+				
+				});
+			}
+			
+			// Pause when hover on image
+			if (base.options.slideshow && base.options.pause_hover){
+				$(base.el).hover(function() {
+					if(vars.in_animation) return false;		// Abort if currently animating
+			   			vars.hover_pause = true;	// Mark slideshow paused from hover
+			   			if(!vars.is_paused){
+			   				vars.hover_pause = 'resume';	// It needs to resume afterwards
+			   				base.playToggle();
+			   			}
+			   	}, function() {
+					if(vars.hover_pause == 'resume'){
+						base.playToggle();
+						vars.hover_pause = false;
+					}
+			   	});
+			}
+			
+			if (base.options.slide_links){
+				// Slide marker clicked
+				$(vars.slide_list+'> li').click(function(){
+				
+					index = $(vars.slide_list+'> li').index(this);
+					targetSlide = index + 1;
+					
+					base.goTo(targetSlide);
+					return false;
+					
+				});
+			}
+			
+			// Thumb marker clicked
+			if (base.options.thumb_links){
+				$(vars.thumb_list+'> li').click(function(){
+				
+					index = $(vars.thumb_list+'> li').index(this);
+					targetSlide = index + 1;
+					
+					api.goTo(targetSlide);
+					return false;
+					
+				});
+			}
+			
+			// Start slideshow if enabled
+			if (base.options.slideshow && base.options.slides.length > 1){
+	    		
+	    		// Start slideshow if autoplay enabled
+	    		if (base.options.autoplay && base.options.slides.length > 1){
+	    			vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);	// Initiate slide interval
+				}else{
+					vars.is_paused = true;	// Mark as paused
+				}
+				
+				//Prevent navigation items from being dragged					
+				$('.load-item img').bind("contextmenu mousedown",function(){
+					return false;
+				});
+								
+			}
+			
+			// Adjust image when browser is resized
+			$(window).resize(function(){
+	    		base.resizeNow();
+			});
+    		
+    	};
+        
+        
+        /* Resize Images
+		----------------------------*/
+		base.resizeNow = function(){
+			
+			return base.$el.each(function() {
+		  		//  Resize each image seperately
+		  		$('img', base.el).each(function(){
+		  			
+					thisSlide = $(this);
+					var ratio = (thisSlide.data('origHeight')/thisSlide.data('origWidth')).toFixed(2);	// Define image ratio
+					
+					// Gather browser size
+					var browserwidth = base.$el.width(),
+						browserheight = base.$el.height(),
+						offset;
+					
+					/*-----Resize Image-----*/
+					if (base.options.fit_always){	// Fit always is enabled
+						if ((browserheight/browserwidth) > ratio){
+							resizeWidth();
+						} else {
+							resizeHeight();
+						}
+					}else{	// Normal Resize
+						if ((browserheight <= base.options.min_height) && (browserwidth <= base.options.min_width)){	// If window smaller than minimum width and height
+						
+							if ((browserheight/browserwidth) > ratio){
+								base.options.fit_landscape && ratio < 1 ? resizeWidth(true) : resizeHeight(true);	// If landscapes are set to fit
+							} else {
+								base.options.fit_portrait && ratio >= 1 ? resizeHeight(true) : resizeWidth(true);		// If portraits are set to fit
+							}
+						
+						} else if (browserwidth <= base.options.min_width){		// If window only smaller than minimum width
+						
+							if ((browserheight/browserwidth) > ratio){
+								base.options.fit_landscape && ratio < 1 ? resizeWidth(true) : resizeHeight();	// If landscapes are set to fit
+							} else {
+								base.options.fit_portrait && ratio >= 1 ? resizeHeight() : resizeWidth(true);		// If portraits are set to fit
+							}
+							
+						} else if (browserheight <= base.options.min_height){	// If window only smaller than minimum height
+						
+							if ((browserheight/browserwidth) > ratio){
+								base.options.fit_landscape && ratio < 1 ? resizeWidth() : resizeHeight(true);	// If landscapes are set to fit
+							} else {
+								base.options.fit_portrait && ratio >= 1 ? resizeHeight(true) : resizeWidth();		// If portraits are set to fit
+							}
+						
+						} else {	// If larger than minimums
+							
+							if ((browserheight/browserwidth) > ratio){
+								base.options.fit_landscape && ratio < 1 ? resizeWidth() : resizeHeight();	// If landscapes are set to fit
+							} else {
+								base.options.fit_portrait && ratio >= 1 ? resizeHeight() : resizeWidth();		// If portraits are set to fit
+							}
+							
+						}
+					}
+					/*-----End Image Resize-----*/
+					
+					
+					/*-----Resize Functions-----*/
+					
+					function resizeWidth(minimum){
+						if (minimum){	// If minimum height needs to be considered
+							if(thisSlide.width() < browserwidth || thisSlide.width() < base.options.min_width ){
+								if (thisSlide.width() * ratio >= base.options.min_height){
+									thisSlide.width(base.options.min_width);
+						    		thisSlide.height(thisSlide.width() * ratio);
+						    	}else{
+						    		resizeHeight();
+						    	}
+						    }
+						}else{
+							if (base.options.min_height >= browserheight && !base.options.fit_landscape){	// If minimum height needs to be considered
+								if (browserwidth * ratio >= base.options.min_height || (browserwidth * ratio >= base.options.min_height && ratio <= 1)){	// If resizing would push below minimum height or image is a landscape
+									thisSlide.width(browserwidth);
+									thisSlide.height(browserwidth * ratio);
+								} else if (ratio > 1){		// Else the image is portrait
+									thisSlide.height(base.options.min_height);
+									thisSlide.width(thisSlide.height() / ratio);
+								} else if (thisSlide.width() < browserwidth) {
+									thisSlide.width(browserwidth);
+						    		thisSlide.height(thisSlide.width() * ratio);
+								}
+							}else{	// Otherwise, resize as normal
+								thisSlide.width(browserwidth);
+								thisSlide.height(browserwidth * ratio);
+							}
+						}
+					};
+					
+					function resizeHeight(minimum){
+						if (minimum){	// If minimum height needs to be considered
+							if(thisSlide.height() < browserheight){
+								if (thisSlide.height() / ratio >= base.options.min_width){
+									thisSlide.height(base.options.min_height);
+									thisSlide.width(thisSlide.height() / ratio);
+								}else{
+									resizeWidth(true);
+								}
+							}
+						}else{	// Otherwise, resized as normal
+							if (base.options.min_width >= browserwidth){	// If minimum width needs to be considered
+								if (browserheight / ratio >= base.options.min_width || ratio > 1){	// If resizing would push below minimum width or image is a portrait
+									thisSlide.height(browserheight);
+									thisSlide.width(browserheight / ratio);
+								} else if (ratio <= 1){		// Else the image is landscape
+									thisSlide.width(base.options.min_width);
+						    		thisSlide.height(thisSlide.width() * ratio);
+								}
+							}else{	// Otherwise, resize as normal
+								thisSlide.height(browserheight);
+								thisSlide.width(browserheight / ratio);
+							}
+						}
+					};
+					
+					/*-----End Resize Functions-----*/
+					
+					if (thisSlide.parents('li').hasClass('image-loading')){
+						$('.image-loading').removeClass('image-loading');
+					}
+					
+					// Horizontally Center
+					if (base.options.horizontal_center){
+						$(this).css('left', (browserwidth - $(this).width())/2);
+					}
+					
+					// Vertically Center
+					if (base.options.vertical_center){
+						$(this).css('top', (browserheight - $(this).height())/2);
+					}
+					
+				});
+				
+				// Basic image drag and right click protection
+				if (base.options.image_protect){
+					
+					$('img', base.el).bind("contextmenu mousedown",function(){
+						return false;
+					});
+				
+				}
+				
+				return false;
+				
+			});
+			
+		};
+        
+        
+        /* Next Slide
+		----------------------------*/
+		base.nextSlide = function(){
+			
+			if(vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
+				else vars.in_animation = true;		// Otherwise set animation marker
+				
+		    clearInterval(vars.slideshow_interval);	// Stop slideshow
+		    
+		    var slides = base.options.slides,					// Pull in slides array
+				liveslide = base.$el.find('.activeslide');		// Find active slide
+				$('.prevslide').removeClass('prevslide');
+				liveslide.removeClass('activeslide').addClass('prevslide');	// Remove active class & update previous slide
+					
+			// Get the slide number of new slide
+			vars.current_slide + 1 == base.options.slides.length ? vars.current_slide = 0 : vars.current_slide++;
+			
+		    var nextslide = $(base.el+' li:eq('+vars.current_slide+')'),
+		    	prevslide = base.$el.find('.prevslide');
+			
+			// If hybrid mode is on drop quality for transition
+			if (base.options.performance == 1) base.$el.removeClass('quality').addClass('speed');	
+			
+			
+			/*-----Load Image-----*/
+			
+			loadSlide = false;
+
+			vars.current_slide == base.options.slides.length - 1 ? loadSlide = 0 : loadSlide = vars.current_slide + 1;	// Determine next slide
+
+			var targetList = base.el+' li:eq('+loadSlide+')';
+			if (!$(targetList).html()){
+				
+				// If links should open in new window
+				var linkTarget = base.options.new_window ? ' target="_blank"' : '';
+				
+				imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
+				var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
+				
+				img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
+				
+				img.load(function(){
+					base._origDim($(this));
+					base.resizeNow();
+				});	// End Load
+			};
+						
+			// Update thumbnails (if enabled)
+			if (base.options.thumbnail_navigation == 1){
+			
+				// Load previous thumbnail
+				vars.current_slide - 1 < 0  ? prevThumb = base.options.slides.length - 1 : prevThumb = vars.current_slide - 1;
+				$(vars.prev_thumb).html($("<img/>").attr("src", base.options.slides[prevThumb].image));
+			
+				// Load next thumbnail
+				nextThumb = loadSlide;
+				$(vars.next_thumb).html($("<img/>").attr("src", base.options.slides[nextThumb].image));
+				
+			}
+			
+			
+			
+			/*-----End Load Image-----*/
+			
+			
+			// Call theme function for before slide transition
+			if( typeof theme != 'undefined' && typeof theme.beforeAnimation == "function" ) theme.beforeAnimation('next');
+			
+			//Update slide markers
+			if (base.options.slide_links){
+				$('.current-slide').removeClass('current-slide');
+				$(vars.slide_list +'> li' ).eq(vars.current_slide).addClass('current-slide');
+			}
+		    
+		    nextslide.css('visibility','hidden').addClass('activeslide');	// Update active slide
+		    
+	    	switch(base.options.transition){
+	    		case 0: case 'none':	// No transition
+	    		    nextslide.css('visibility','visible'); vars.in_animation = false; base.afterAnimation();
+	    		    break;
+	    		case 1: case 'fade':	// Fade
+	    		    nextslide.animate({opacity : 0},0).css('visibility','visible').animate({opacity : 1, avoidTransforms : false}, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    		    break;
+	    		case 2: case 'slideTop':	// Slide Top
+	    		    nextslide.animate({top : -base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    		    break;
+	    		case 3: case 'slideRight':	// Slide Right
+	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    			break;
+	    		case 4: case 'slideBottom': // Slide Bottom
+	    			nextslide.animate({top : base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    			break;
+	    		case 5: case 'slideLeft':  // Slide Left
+	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    			break;
+	    		case 6: case 'carouselRight':	// Carousel Right
+	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+					liveslide.animate({ left: -base.$el.width(), avoidTransforms : false }, base.options.transition_speed );
+	    			break;
+	    		case 7: case 'carouselLeft':   // Carousel Left
+	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+					liveslide.animate({ left: base.$el.width(), avoidTransforms : false }, base.options.transition_speed );
+	    			break;
+	    	}
+		    return false;	
+		};
+		
+		
+		/* Previous Slide
+		----------------------------*/
+		base.prevSlide = function(){
+		
+			if(vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
+				else vars.in_animation = true;		// Otherwise set animation marker
+			
+			clearInterval(vars.slideshow_interval);	// Stop slideshow
+			
+			var slides = base.options.slides,					// Pull in slides array
+				liveslide = base.$el.find('.activeslide');		// Find active slide
+				$('.prevslide').removeClass('prevslide');
+				liveslide.removeClass('activeslide').addClass('prevslide');		// Remove active class & update previous slide
+			
+			// Get current slide number
+			vars.current_slide == 0 ?  vars.current_slide = base.options.slides.length - 1 : vars.current_slide-- ;
+				
+		    var nextslide =  $(base.el+' li:eq('+vars.current_slide+')'),
+		    	prevslide =  base.$el.find('.prevslide');
+			
+			// If hybrid mode is on drop quality for transition
+			if (base.options.performance == 1) base.$el.removeClass('quality').addClass('speed');	
+			
+			
+			/*-----Load Image-----*/
+			
+			loadSlide = vars.current_slide;
+			
+			var targetList = base.el+' li:eq('+loadSlide+')';
+			if (!$(targetList).html()){
+				// If links should open in new window
+				var linkTarget = base.options.new_window ? ' target="_blank"' : '';
+				imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
+				var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
+				
+				img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
+				
+				img.load(function(){
+					base._origDim($(this));
+					base.resizeNow();
+				});	// End Load
+			};
+			
+			// Update thumbnails (if enabled)
+			if (base.options.thumbnail_navigation == 1){
+			
+				// Load previous thumbnail
+				//prevThumb = loadSlide;
+				loadSlide == 0 ? prevThumb = base.options.slides.length - 1 : prevThumb = loadSlide - 1;
+				$(vars.prev_thumb).html($("<img/>").attr("src", base.options.slides[prevThumb].image));
+				
+				// Load next thumbnail
+				vars.current_slide == base.options.slides.length - 1 ? nextThumb = 0 : nextThumb = vars.current_slide + 1;
+				$(vars.next_thumb).html($("<img/>").attr("src", base.options.slides[nextThumb].image));
+			}
+			
+			/*-----End Load Image-----*/
+			
+			
+			// Call theme function for before slide transition
+			if( typeof theme != 'undefined' && typeof theme.beforeAnimation == "function" ) theme.beforeAnimation('prev');
+			
+			//Update slide markers
+			if (base.options.slide_links){
+				$('.current-slide').removeClass('current-slide');
+				$(vars.slide_list +'> li' ).eq(vars.current_slide).addClass('current-slide');
+			}
+			
+		    nextslide.css('visibility','hidden').addClass('activeslide');	// Update active slide
+		    
+		    switch(base.options.transition){
+	    		case 0: case 'none':	// No transition
+	    		    nextslide.css('visibility','visible'); vars.in_animation = false; base.afterAnimation();
+	    		    break;
+	    		case 1: case 'fade':	// Fade
+	    		  	nextslide.animate({opacity : 0},0).css('visibility','visible').animate({opacity : 1, avoidTransforms : false}, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    		    break;
+	    		case 2: case 'slideTop':	// Slide Top (reverse)
+	    		    nextslide.animate({top : base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    		    break;
+	    		case 3: case 'slideRight':	// Slide Right (reverse)
+	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    			break;
+	    		case 4: case 'slideBottom': // Slide Bottom (reverse)
+	    			nextslide.animate({top : -base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    			break;
+	    		case 5: case 'slideLeft':  // Slide Left (reverse)
+	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+	    			break;
+	    		case 6: case 'carouselRight':	// Carousel Right (reverse)
+	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+					liveslide.animate({left : 0}, 0 ).animate({ left: base.$el.width(), avoidTransforms : false}, base.options.transition_speed );
+	    			break;
+	    		case 7: case 'carouselLeft':   // Carousel Left (reverse)
+	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
+					liveslide.animate({left : 0}, 0 ).animate({ left: -base.$el.width(), avoidTransforms : false }, base.options.transition_speed );
+	    			break;
+	    	}
+		    return false;	
+		};
+		
+		
+		/* Play/Pause Toggle
+		----------------------------*/
+		base.playToggle = function(){
+		
+			if (vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
+			
+			if (vars.is_paused){
+				
+				vars.is_paused = false;
+				
+				// Call theme function for play
+				if( typeof theme != 'undefined' && typeof theme.playToggle == "function" ) theme.playToggle('play');
+				
+				// Resume slideshow
+	        	vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);
+	        	  
+        	}else{
+        		
+        		vars.is_paused = true;
+        		
+        		// Call theme function for pause
+        		if( typeof theme != 'undefined' && typeof theme.playToggle == "function" ) theme.playToggle('pause');
+        		
+        		// Stop slideshow
+        		clearInterval(vars.slideshow_interval);	
+       		
+       		}
+		    
+		    return false;
+    		
+    	};
+    	
+    	
+    	/* Go to specific slide
+		----------------------------*/
+    	base.goTo = function(targetSlide){
+			if (vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
+			
+			var totalSlides = base.options.slides.length;
+			
+			// If target outside range
+			if(targetSlide < 0){
+				targetSlide = totalSlides;
+			}else if(targetSlide > totalSlides){
+				targetSlide = 1;
+			}
+			targetSlide = totalSlides - targetSlide + 1;
+			
+			clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
+			
+			// Call theme function for goTo trigger
+			if (typeof theme != 'undefined' && typeof theme.goTo == "function" ) theme.goTo();
+			
+			if (vars.current_slide == totalSlides - targetSlide){
+				if(!(vars.is_paused)){
+					vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);
+				} 
+				return false;
+			}
+			
+			// If ahead of current position
+			if(totalSlides - targetSlide > vars.current_slide ){
+				
+				// Adjust for new next slide
+				vars.current_slide = totalSlides-targetSlide-1;
+				vars.update_images = 'next';
+				base._placeSlide(vars.update_images);
+				
+			//Otherwise it's before current position
+			}else if(totalSlides - targetSlide < vars.current_slide){
+				
+				// Adjust for new prev slide
+				vars.current_slide = totalSlides-targetSlide+1;
+				vars.update_images = 'prev';
+			    base._placeSlide(vars.update_images);
+			    
+			}
+			
+			// set active markers
+			if (base.options.slide_links){
+				$(vars.slide_list +'> .current-slide').removeClass('current-slide');
+				$(vars.slide_list +'> li').eq((totalSlides-targetSlide)).addClass('current-slide');
+			}
+			
+			if (base.options.thumb_links){
+				$(vars.thumb_list +'> .current-thumb').removeClass('current-thumb');
+				$(vars.thumb_list +'> li').eq((totalSlides-targetSlide)).addClass('current-thumb');
+			}
+			
+		};
+        
+        
+        /* Place Slide
+		----------------------------*/
+        base._placeSlide = function(place){
+    			
+			// If links should open in new window
+			var linkTarget = base.options.new_window ? ' target="_blank"' : '';
+			
+			loadSlide = false;
+			
+			if (place == 'next'){
+				
+				vars.current_slide == base.options.slides.length - 1 ? loadSlide = 0 : loadSlide = vars.current_slide + 1;	// Determine next slide
+				
+				var targetList = base.el+' li:eq('+loadSlide+')';
+				
+				if (!$(targetList).html()){
+					// If links should open in new window
+					var linkTarget = base.options.new_window ? ' target="_blank"' : '';
+					
+					imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
+					var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
+					
+					img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
+					
+					img.load(function(){
+						base._origDim($(this));
+						base.resizeNow();
+					});	// End Load
+				};
+				
+				base.nextSlide();
+				
+			}else if (place == 'prev'){
+			
+				vars.current_slide - 1 < 0  ? loadSlide = base.options.slides.length - 1 : loadSlide = vars.current_slide - 1;	// Determine next slide
+				
+				var targetList = base.el+' li:eq('+loadSlide+')';
+				
+				if (!$(targetList).html()){
+					// If links should open in new window
+					var linkTarget = base.options.new_window ? ' target="_blank"' : '';
+					
+					imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
+					var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
+					
+					img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
+					
+					img.load(function(){
+						base._origDim($(this));
+						base.resizeNow();
+					});	// End Load
+				};
+				base.prevSlide();
+			}
+			
+		};
+		
+		
+		/* Get Original Dimensions
+		----------------------------*/
+		base._origDim = function(targetSlide){
+			targetSlide.data('origWidth', targetSlide.width()).data('origHeight', targetSlide.height());
+		};
+		
+		
+		/* After Slide Animation
+		----------------------------*/
+		base.afterAnimation = function(){
+			
+			// If hybrid mode is on swap back to higher image quality
+			if (base.options.performance == 1){
+		    	base.$el.removeClass('speed').addClass('quality');
+			}
+			
+			// Update previous slide
+			if (vars.update_images){
+				vars.current_slide - 1 < 0  ? setPrev = base.options.slides.length - 1 : setPrev = vars.current_slide-1;
+				vars.update_images = false;
+				$('.prevslide').removeClass('prevslide');
+				$(base.el+' li:eq('+setPrev+')').addClass('prevslide');
+			}
+			
+			vars.in_animation = false;
+			
+			// Resume slideshow
+			if (!vars.is_paused && base.options.slideshow){
+				vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);
+				if (base.options.stop_loop && vars.current_slide == base.options.slides.length - 1 ) base.playToggle();
+			}
+			
+			// Call theme function for after slide transition
+			if (typeof theme != 'undefined' && typeof theme.afterAnimation == "function" ) theme.afterAnimation();
+			
+			return false;
+		
+		};
+		
+		base.getField = function(field){
+			return base.options.slides[vars.current_slide][field];
+		};
+		
+        // Make it go!
+        base.init();
+	};
+	
+	
+	/* Global Variables
+	----------------------------*/
+	$.supersized.vars = {
+	
+		// Elements							
+		thumb_tray			:	'#thumb-tray',	// Thumbnail tray
+		thumb_list			:	'#thumb-list',	// Thumbnail list
+		slide_list          :   '#slide-list',	// Slide link list
+		
+		// Internal variables
+		current_slide			:	0,			// Current slide number
+		in_animation 			:	false,		// Prevents animations from stacking
+		is_paused 				: 	false,		// Tracks paused on/off
+		hover_pause				:	false,		// If slideshow is paused from hover
+		slideshow_interval		:	false,		// Stores slideshow timer					
+		update_images 			: 	false,		// Trigger to update images after slide jump
+		options					:	{}			// Stores assembled options list
+		
+	};
+	
+	
+	/* Default Options
+	----------------------------*/
+	$.supersized.defaultOptions = {
+    
+    	// Functionality
+		slideshow               :   1,			// Slideshow on/off
+		autoplay				:	1,			// Slideshow starts playing automatically
+		start_slide             :   1,			// Start slide (0 is random)
+		stop_loop				:	0,			// Stops slideshow on last slide
+		random					: 	0,			// Randomize slide order (Ignores start slide)
+		slide_interval          :   5000,		// Length between transitions
+		transition              :   1, 			// 0-None, 1-Fade, 2-Slide Top, 3-Slide Right, 4-Slide Bottom, 5-Slide Left, 6-Carousel Right, 7-Carousel Left
+		transition_speed		:	750,		// Speed of transition
+		new_window				:	1,			// Image links open in new window/tab
+		pause_hover             :   0,			// Pause slideshow on hover
+		keyboard_nav            :   1,			// Keyboard navigation on/off
+		performance				:	1,			// 0-Normal, 1-Hybrid speed/quality, 2-Optimizes image quality, 3-Optimizes transition speed //  (Only works for Firefox/IE, not Webkit)
+		image_protect			:	1,			// Disables image dragging and right click with Javascript
+												   
+		// Size & Position
+		fit_always				:	0,			// Image will never exceed browser width or height (Ignores min. dimensions)
+		fit_landscape			:   0,			// Landscape images will not exceed browser width
+		fit_portrait         	:   1,			// Portrait images will not exceed browser height  			   
+		min_width		        :   0,			// Min width allowed (in pixels)
+		min_height		        :   0,			// Min height allowed (in pixels)
+		horizontal_center       :   1,			// Horizontally center background
+		vertical_center         :   1,			// Vertically center background
+		
+												   
+		// Components							
+		slide_links				:	1,			// Individual links for each slide (Options: false, 'num', 'name', 'blank')
+		thumb_links				:	1,			// Individual thumb links for each slide
+		thumbnail_navigation    :   0			// Thumbnail navigation
+    	
+    };
+    
+    $.fn.supersized = function(options){
+        return this.each(function(){
+            (new $.supersized(options));
+        });
+    };
+		
+})(jQuery);
+
diff --git a/apps/gallery/js/supersized.3.2.7.min.js b/apps/gallery/js/supersized.3.2.7.min.js
new file mode 100644
index 0000000000..b9cea9cee1
--- /dev/null
+++ b/apps/gallery/js/supersized.3.2.7.min.js
@@ -0,0 +1,13 @@
+/*
+
+	Supersized - Fullscreen Slideshow jQuery Plugin
+	Version : 3.2.7
+	Site	: www.buildinternet.com/project/supersized
+	
+	Author	: Sam Dunn
+	Company : One Mighty Roar (www.onemightyroar.com)
+	License : MIT License / GPL License
+	
+*/
+
+(function(a){a(document).ready(function(){a("body").append('<div id="supersized-loader"></div><ul id="supersized"></ul>')});a.supersized=function(b){var c="#supersized",d=this;d.$el=a(c);d.el=c;vars=a.supersized.vars;d.$el.data("supersized",d);api=d.$el.data("supersized");d.init=function(){a.supersized.vars=a.extend(a.supersized.vars,a.supersized.themeVars);a.supersized.vars.options=a.extend({},a.supersized.defaultOptions,a.supersized.themeOptions,b);d.options=a.supersized.vars.options;d._build()};d._build=function(){var g=0,e="",j="",h,f="",i;while(g<=d.options.slides.length-1){switch(d.options.slide_links){case"num":h=g;break;case"name":h=d.options.slides[g].title;break;case"blank":h="";break}e=e+'<li class="slide-'+g+'"></li>';if(g==d.options.start_slide-1){if(d.options.slide_links){j=j+'<li class="slide-link-'+g+' current-slide"><a>'+h+"</a></li>"}if(d.options.thumb_links){d.options.slides[g].thumb?i=d.options.slides[g].thumb:i=d.options.slides[g].image;f=f+'<li class="thumb'+g+' current-thumb"><img src="'+i+'"/></li>'}}else{if(d.options.slide_links){j=j+'<li class="slide-link-'+g+'" ><a>'+h+"</a></li>"}if(d.options.thumb_links){d.options.slides[g].thumb?i=d.options.slides[g].thumb:i=d.options.slides[g].image;f=f+'<li class="thumb'+g+'"><img src="'+i+'"/></li>'}}g++}if(d.options.slide_links){a(vars.slide_list).html(j)}if(d.options.thumb_links&&vars.thumb_tray.length){a(vars.thumb_tray).append('<ul id="'+vars.thumb_list.replace("#","")+'">'+f+"</ul>")}a(d.el).append(e);if(d.options.thumbnail_navigation){vars.current_slide-1<0?prevThumb=d.options.slides.length-1:prevThumb=vars.current_slide-1;a(vars.prev_thumb).show().html(a("<img/>").attr("src",d.options.slides[prevThumb].image));vars.current_slide==d.options.slides.length-1?nextThumb=0:nextThumb=vars.current_slide+1;a(vars.next_thumb).show().html(a("<img/>").attr("src",d.options.slides[nextThumb].image))}d._start()};d._start=function(){if(d.options.start_slide){vars.current_slide=d.options.start_slide-1}else{vars.current_slide=Math.floor(Math.random()*d.options.slides.length)}var o=d.options.new_window?' target="_blank"':"";if(d.options.performance==3){d.$el.addClass("speed")}else{if((d.options.performance==1)||(d.options.performance==2)){d.$el.addClass("quality")}}if(d.options.random){arr=d.options.slides;for(var h,m,k=arr.length;k;h=parseInt(Math.random()*k),m=arr[--k],arr[k]=arr[h],arr[h]=m){}d.options.slides=arr}if(d.options.slides.length>1){if(d.options.slides.length>2){vars.current_slide-1<0?loadPrev=d.options.slides.length-1:loadPrev=vars.current_slide-1;var g=(d.options.slides[loadPrev].url)?"href='"+d.options.slides[loadPrev].url+"'":"";var q=a('<img src="'+d.options.slides[loadPrev].image+'"/>');var n=d.el+" li:eq("+loadPrev+")";q.appendTo(n).wrap("<a "+g+o+"></a>").parent().parent().addClass("image-loading prevslide");q.load(function(){a(this).data("origWidth",a(this).width()).data("origHeight",a(this).height());d.resizeNow()})}}else{d.options.slideshow=0}g=(api.getField("url"))?"href='"+api.getField("url")+"'":"";var l=a('<img src="'+api.getField("image")+'"/>');var f=d.el+" li:eq("+vars.current_slide+")";l.appendTo(f).wrap("<a "+g+o+"></a>").parent().parent().addClass("image-loading activeslide");l.load(function(){d._origDim(a(this));d.resizeNow();d.launch();if(typeof theme!="undefined"&&typeof theme._init=="function"){theme._init()}});if(d.options.slides.length>1){vars.current_slide==d.options.slides.length-1?loadNext=0:loadNext=vars.current_slide+1;g=(d.options.slides[loadNext].url)?"href='"+d.options.slides[loadNext].url+"'":"";var e=a('<img src="'+d.options.slides[loadNext].image+'"/>');var p=d.el+" li:eq("+loadNext+")";e.appendTo(p).wrap("<a "+g+o+"></a>").parent().parent().addClass("image-loading");e.load(function(){a(this).data("origWidth",a(this).width()).data("origHeight",a(this).height());d.resizeNow()})}d.$el.css("visibility","hidden");a(".load-item").hide()};d.launch=function(){d.$el.css("visibility","visible");a("#supersized-loader").remove();if(typeof theme!="undefined"&&typeof theme.beforeAnimation=="function"){theme.beforeAnimation("next")}a(".load-item").show();if(d.options.keyboard_nav){a(document.documentElement).keyup(function(e){if(vars.in_animation){return false}if((e.keyCode==37)||(e.keyCode==40)){clearInterval(vars.slideshow_interval);d.prevSlide()}else{if((e.keyCode==39)||(e.keyCode==38)){clearInterval(vars.slideshow_interval);d.nextSlide()}else{if(e.keyCode==32&&!vars.hover_pause){clearInterval(vars.slideshow_interval);d.playToggle()}}}})}if(d.options.slideshow&&d.options.pause_hover){a(d.el).hover(function(){if(vars.in_animation){return false}vars.hover_pause=true;if(!vars.is_paused){vars.hover_pause="resume";d.playToggle()}},function(){if(vars.hover_pause=="resume"){d.playToggle();vars.hover_pause=false}})}if(d.options.slide_links){a(vars.slide_list+"> li").click(function(){index=a(vars.slide_list+"> li").index(this);targetSlide=index+1;d.goTo(targetSlide);return false})}if(d.options.thumb_links){a(vars.thumb_list+"> li").click(function(){index=a(vars.thumb_list+"> li").index(this);targetSlide=index+1;api.goTo(targetSlide);return false})}if(d.options.slideshow&&d.options.slides.length>1){if(d.options.autoplay&&d.options.slides.length>1){vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval)}else{vars.is_paused=true}a(".load-item img").bind("contextmenu mousedown",function(){return false})}a(window).resize(function(){d.resizeNow()})};d.resizeNow=function(){return d.$el.each(function(){a("img",d.el).each(function(){thisSlide=a(this);var f=(thisSlide.data("origHeight")/thisSlide.data("origWidth")).toFixed(2);var e=d.$el.width(),h=d.$el.height(),i;if(d.options.fit_always){if((h/e)>f){g()}else{j()}}else{if((h<=d.options.min_height)&&(e<=d.options.min_width)){if((h/e)>f){d.options.fit_landscape&&f<1?g(true):j(true)}else{d.options.fit_portrait&&f>=1?j(true):g(true)}}else{if(e<=d.options.min_width){if((h/e)>f){d.options.fit_landscape&&f<1?g(true):j()}else{d.options.fit_portrait&&f>=1?j():g(true)}}else{if(h<=d.options.min_height){if((h/e)>f){d.options.fit_landscape&&f<1?g():j(true)}else{d.options.fit_portrait&&f>=1?j(true):g()}}else{if((h/e)>f){d.options.fit_landscape&&f<1?g():j()}else{d.options.fit_portrait&&f>=1?j():g()}}}}}function g(k){if(k){if(thisSlide.width()<e||thisSlide.width()<d.options.min_width){if(thisSlide.width()*f>=d.options.min_height){thisSlide.width(d.options.min_width);thisSlide.height(thisSlide.width()*f)}else{j()}}}else{if(d.options.min_height>=h&&!d.options.fit_landscape){if(e*f>=d.options.min_height||(e*f>=d.options.min_height&&f<=1)){thisSlide.width(e);thisSlide.height(e*f)}else{if(f>1){thisSlide.height(d.options.min_height);thisSlide.width(thisSlide.height()/f)}else{if(thisSlide.width()<e){thisSlide.width(e);thisSlide.height(thisSlide.width()*f)}}}}else{thisSlide.width(e);thisSlide.height(e*f)}}}function j(k){if(k){if(thisSlide.height()<h){if(thisSlide.height()/f>=d.options.min_width){thisSlide.height(d.options.min_height);thisSlide.width(thisSlide.height()/f)}else{g(true)}}}else{if(d.options.min_width>=e){if(h/f>=d.options.min_width||f>1){thisSlide.height(h);thisSlide.width(h/f)}else{if(f<=1){thisSlide.width(d.options.min_width);thisSlide.height(thisSlide.width()*f)}}}else{thisSlide.height(h);thisSlide.width(h/f)}}}if(thisSlide.parents("li").hasClass("image-loading")){a(".image-loading").removeClass("image-loading")}if(d.options.horizontal_center){a(this).css("left",(e-a(this).width())/2)}if(d.options.vertical_center){a(this).css("top",(h-a(this).height())/2)}});if(d.options.image_protect){a("img",d.el).bind("contextmenu mousedown",function(){return false})}return false})};d.nextSlide=function(){if(vars.in_animation||!api.options.slideshow){return false}else{vars.in_animation=true}clearInterval(vars.slideshow_interval);var h=d.options.slides,e=d.$el.find(".activeslide");a(".prevslide").removeClass("prevslide");e.removeClass("activeslide").addClass("prevslide");vars.current_slide+1==d.options.slides.length?vars.current_slide=0:vars.current_slide++;var g=a(d.el+" li:eq("+vars.current_slide+")"),i=d.$el.find(".prevslide");if(d.options.performance==1){d.$el.removeClass("quality").addClass("speed")}loadSlide=false;vars.current_slide==d.options.slides.length-1?loadSlide=0:loadSlide=vars.current_slide+1;var k=d.el+" li:eq("+loadSlide+")";if(!a(k).html()){var j=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(k).wrap("<a "+imageLink+j+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}if(d.options.thumbnail_navigation==1){vars.current_slide-1<0?prevThumb=d.options.slides.length-1:prevThumb=vars.current_slide-1;a(vars.prev_thumb).html(a("<img/>").attr("src",d.options.slides[prevThumb].image));nextThumb=loadSlide;a(vars.next_thumb).html(a("<img/>").attr("src",d.options.slides[nextThumb].image))}if(typeof theme!="undefined"&&typeof theme.beforeAnimation=="function"){theme.beforeAnimation("next")}if(d.options.slide_links){a(".current-slide").removeClass("current-slide");a(vars.slide_list+"> li").eq(vars.current_slide).addClass("current-slide")}g.css("visibility","hidden").addClass("activeslide");switch(d.options.transition){case 0:case"none":g.css("visibility","visible");vars.in_animation=false;d.afterAnimation();break;case 1:case"fade":g.animate({opacity:0},0).css("visibility","visible").animate({opacity:1,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 2:case"slideTop":g.animate({top:-d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 3:case"slideRight":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 4:case"slideBottom":g.animate({top:d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 5:case"slideLeft":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 6:case"carouselRight":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:-d.$el.width(),avoidTransforms:false},d.options.transition_speed);break;case 7:case"carouselLeft":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:d.$el.width(),avoidTransforms:false},d.options.transition_speed);break}return false};d.prevSlide=function(){if(vars.in_animation||!api.options.slideshow){return false}else{vars.in_animation=true}clearInterval(vars.slideshow_interval);var h=d.options.slides,e=d.$el.find(".activeslide");a(".prevslide").removeClass("prevslide");e.removeClass("activeslide").addClass("prevslide");vars.current_slide==0?vars.current_slide=d.options.slides.length-1:vars.current_slide--;var g=a(d.el+" li:eq("+vars.current_slide+")"),i=d.$el.find(".prevslide");if(d.options.performance==1){d.$el.removeClass("quality").addClass("speed")}loadSlide=vars.current_slide;var k=d.el+" li:eq("+loadSlide+")";if(!a(k).html()){var j=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(k).wrap("<a "+imageLink+j+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}if(d.options.thumbnail_navigation==1){loadSlide==0?prevThumb=d.options.slides.length-1:prevThumb=loadSlide-1;a(vars.prev_thumb).html(a("<img/>").attr("src",d.options.slides[prevThumb].image));vars.current_slide==d.options.slides.length-1?nextThumb=0:nextThumb=vars.current_slide+1;a(vars.next_thumb).html(a("<img/>").attr("src",d.options.slides[nextThumb].image))}if(typeof theme!="undefined"&&typeof theme.beforeAnimation=="function"){theme.beforeAnimation("prev")}if(d.options.slide_links){a(".current-slide").removeClass("current-slide");a(vars.slide_list+"> li").eq(vars.current_slide).addClass("current-slide")}g.css("visibility","hidden").addClass("activeslide");switch(d.options.transition){case 0:case"none":g.css("visibility","visible");vars.in_animation=false;d.afterAnimation();break;case 1:case"fade":g.animate({opacity:0},0).css("visibility","visible").animate({opacity:1,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 2:case"slideTop":g.animate({top:d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 3:case"slideRight":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 4:case"slideBottom":g.animate({top:-d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 5:case"slideLeft":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 6:case"carouselRight":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:0},0).animate({left:d.$el.width(),avoidTransforms:false},d.options.transition_speed);break;case 7:case"carouselLeft":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:0},0).animate({left:-d.$el.width(),avoidTransforms:false},d.options.transition_speed);break}return false};d.playToggle=function(){if(vars.in_animation||!api.options.slideshow){return false}if(vars.is_paused){vars.is_paused=false;if(typeof theme!="undefined"&&typeof theme.playToggle=="function"){theme.playToggle("play")}vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval)}else{vars.is_paused=true;if(typeof theme!="undefined"&&typeof theme.playToggle=="function"){theme.playToggle("pause")}clearInterval(vars.slideshow_interval)}return false};d.goTo=function(f){if(vars.in_animation||!api.options.slideshow){return false}var e=d.options.slides.length;if(f<0){f=e}else{if(f>e){f=1}}f=e-f+1;clearInterval(vars.slideshow_interval);if(typeof theme!="undefined"&&typeof theme.goTo=="function"){theme.goTo()}if(vars.current_slide==e-f){if(!(vars.is_paused)){vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval)}return false}if(e-f>vars.current_slide){vars.current_slide=e-f-1;vars.update_images="next";d._placeSlide(vars.update_images)}else{if(e-f<vars.current_slide){vars.current_slide=e-f+1;vars.update_images="prev";d._placeSlide(vars.update_images)}}if(d.options.slide_links){a(vars.slide_list+"> .current-slide").removeClass("current-slide");a(vars.slide_list+"> li").eq((e-f)).addClass("current-slide")}if(d.options.thumb_links){a(vars.thumb_list+"> .current-thumb").removeClass("current-thumb");a(vars.thumb_list+"> li").eq((e-f)).addClass("current-thumb")}};d._placeSlide=function(e){var h=d.options.new_window?' target="_blank"':"";loadSlide=false;if(e=="next"){vars.current_slide==d.options.slides.length-1?loadSlide=0:loadSlide=vars.current_slide+1;var g=d.el+" li:eq("+loadSlide+")";if(!a(g).html()){var h=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(g).wrap("<a "+imageLink+h+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}d.nextSlide()}else{if(e=="prev"){vars.current_slide-1<0?loadSlide=d.options.slides.length-1:loadSlide=vars.current_slide-1;var g=d.el+" li:eq("+loadSlide+")";if(!a(g).html()){var h=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(g).wrap("<a "+imageLink+h+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}d.prevSlide()}}};d._origDim=function(e){e.data("origWidth",e.width()).data("origHeight",e.height())};d.afterAnimation=function(){if(d.options.performance==1){d.$el.removeClass("speed").addClass("quality")}if(vars.update_images){vars.current_slide-1<0?setPrev=d.options.slides.length-1:setPrev=vars.current_slide-1;vars.update_images=false;a(".prevslide").removeClass("prevslide");a(d.el+" li:eq("+setPrev+")").addClass("prevslide")}vars.in_animation=false;if(!vars.is_paused&&d.options.slideshow){vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval);if(d.options.stop_loop&&vars.current_slide==d.options.slides.length-1){d.playToggle()}}if(typeof theme!="undefined"&&typeof theme.afterAnimation=="function"){theme.afterAnimation()}return false};d.getField=function(e){return d.options.slides[vars.current_slide][e]};d.init()};a.supersized.vars={thumb_tray:"#thumb-tray",thumb_list:"#thumb-list",slide_list:"#slide-list",current_slide:0,in_animation:false,is_paused:false,hover_pause:false,slideshow_interval:false,update_images:false,options:{}};a.supersized.defaultOptions={slideshow:1,autoplay:1,start_slide:1,stop_loop:0,random:0,slide_interval:5000,transition:1,transition_speed:750,new_window:1,pause_hover:0,keyboard_nav:1,performance:1,image_protect:1,fit_always:0,fit_landscape:0,fit_portrait:1,min_width:0,min_height:0,horizontal_center:1,vertical_center:1,slide_links:1,thumb_links:1,thumbnail_navigation:0};a.fn.supersized=function(b){return this.each(function(){(new a.supersized(b))})}})(jQuery);
\ No newline at end of file
diff --git a/apps/gallery/js/supersized.shutter.js b/apps/gallery/js/supersized.shutter.js
new file mode 100644
index 0000000000..cc3025a94a
--- /dev/null
+++ b/apps/gallery/js/supersized.shutter.js
@@ -0,0 +1,337 @@
+/*
+
+	Supersized - Fullscreen Slideshow jQuery Plugin
+	Version : 3.2.7
+	Theme 	: Shutter 1.1
+	
+	Site	: www.buildinternet.com/project/supersized
+	Author	: Sam Dunn
+	Company : One Mighty Roar (www.onemightyroar.com)
+	License : MIT License / GPL License
+
+*/
+
+(function($){
+	
+	theme = {
+	 	
+	 	
+	 	/* Initial Placement
+		----------------------------*/
+	 	_init : function(){
+	 		
+	 		// Center Slide Links
+	 		if (api.options.slide_links) $(vars.slide_list).css('margin-left', -$(vars.slide_list).width()/2);
+	 		
+			// Start progressbar if autoplay enabled
+                        if (api.options.autoplay){
+                                if (api.options.progress_bar) theme.progressBar();
+			}else{
+				if ($(vars.play_button).attr('src')) $(vars.play_button).attr("src", vars.image_path + "play.png");	// If pause play button is image, swap src
+				if (api.options.progress_bar) $(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );	//  Place progress bar
+			}
+			
+			
+			/* Thumbnail Tray
+			----------------------------*/
+			// Hide tray off screen
+			$(vars.thumb_tray).animate({bottom : -$(vars.thumb_tray).height()}, 0 );
+			
+			// Thumbnail Tray Toggle
+			$(vars.tray_button).toggle(function(){
+				$(vars.thumb_tray).stop().animate({bottom : 0, avoidTransforms : true}, 300 );
+				if ($(vars.tray_arrow).attr('src')) $(vars.tray_arrow).attr("src", vars.image_path + "button-tray-down.png");
+				return false;
+			}, function() {
+				$(vars.thumb_tray).stop().animate({bottom : -$(vars.thumb_tray).height(), avoidTransforms : true}, 300 );
+				if ($(vars.tray_arrow).attr('src')) $(vars.tray_arrow).attr("src", vars.image_path + "button-tray-up.png");
+				return false;
+			});
+			
+			// Make thumb tray proper size
+			$(vars.thumb_list).width($('> li', vars.thumb_list).length * $('> li', vars.thumb_list).outerWidth(true));	//Adjust to true width of thumb markers
+			
+			// Display total slides
+			if ($(vars.slide_total).length){
+				$(vars.slide_total).html(api.options.slides.length);
+			}
+			
+			
+			/* Thumbnail Tray Navigation
+			----------------------------*/	
+			if (api.options.thumb_links){
+				//Hide thumb arrows if not needed
+				if ($(vars.thumb_list).width() <= $(vars.thumb_tray).width()){
+					$(vars.thumb_back +','+vars.thumb_forward).fadeOut(0);
+				}
+				
+				// Thumb Intervals
+        		vars.thumb_interval = Math.floor($(vars.thumb_tray).width() / $('> li', vars.thumb_list).outerWidth(true)) * $('> li', vars.thumb_list).outerWidth(true);
+        		vars.thumb_page = 0;
+        		
+        		// Cycle thumbs forward
+        		$(vars.thumb_forward).click(function(){
+        			if (vars.thumb_page - vars.thumb_interval <= -$(vars.thumb_list).width()){
+        				vars.thumb_page = 0;
+        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+        			}else{
+        				vars.thumb_page = vars.thumb_page - vars.thumb_interval;
+        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+        			}
+        		});
+        		
+        		// Cycle thumbs backwards
+        		$(vars.thumb_back).click(function(){
+        			if (vars.thumb_page + vars.thumb_interval > 0){
+        				vars.thumb_page = Math.floor($(vars.thumb_list).width() / vars.thumb_interval) * -vars.thumb_interval;
+        				if ($(vars.thumb_list).width() <= -vars.thumb_page) vars.thumb_page = vars.thumb_page + vars.thumb_interval;
+        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+					}else{
+        				vars.thumb_page = vars.thumb_page + vars.thumb_interval;
+        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+        			}
+        		});
+				
+			}
+			
+			
+			/* Navigation Items
+			----------------------------*/
+		    $(vars.next_slide).click(function() {
+		    	api.nextSlide();
+		    });
+		    
+		    $(vars.prev_slide).click(function() {
+		    	api.prevSlide();
+		    });
+		    
+		    	// Full Opacity on Hover
+		    	if(jQuery.support.opacity){
+			    	$(vars.prev_slide +','+vars.next_slide).mouseover(function() {
+					   $(this).stop().animate({opacity:1},100);
+					}).mouseout(function(){
+					   $(this).stop().animate({opacity:0.6},100);
+					});
+				}
+			
+			if (api.options.thumbnail_navigation){
+				// Next thumbnail clicked
+				$(vars.next_thumb).click(function() {
+			    	api.nextSlide();
+			    });
+			    // Previous thumbnail clicked
+			    $(vars.prev_thumb).click(function() {
+			    	api.prevSlide();
+			    });
+			}
+			
+		    $(vars.play_button).click(function() {
+				api.playToggle();						    
+		    });
+			
+			
+			/* Thumbnail Mouse Scrub
+			----------------------------*/
+    		if (api.options.mouse_scrub){
+				$(vars.thumb_tray).mousemove(function(e) {
+					var containerWidth = $(vars.thumb_tray).width(),
+						listWidth = $(vars.thumb_list).width();
+					if (listWidth > containerWidth){
+						var mousePos = 1,
+							diff = e.pageX - mousePos;
+						if (diff > 10 || diff < -10) { 
+						    mousePos = e.pageX; 
+						    newX = (containerWidth - listWidth) * (e.pageX/containerWidth);
+						    diff = parseInt(Math.abs(parseInt($(vars.thumb_list).css('left'))-newX )).toFixed(0);
+						    $(vars.thumb_list).stop().animate({'left':newX}, {duration:diff*3, easing:'easeOutExpo'});
+						}
+					}
+				});
+			}
+			
+			
+			/* Window Resize
+			----------------------------*/
+			$(window).resize(function(){
+				
+				// Delay progress bar on resize
+				if (api.options.progress_bar && !vars.in_animation){
+					if (vars.slideshow_interval) clearInterval(vars.slideshow_interval);
+					if (api.options.slides.length - 1 > 0) clearInterval(vars.slideshow_interval);
+					
+					$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
+					
+					if (!vars.progressDelay && api.options.slideshow){
+						// Delay slideshow from resuming so Chrome can refocus images
+						vars.progressDelay = setTimeout(function() {
+								if (!vars.is_paused){
+									theme.progressBar();
+									vars.slideshow_interval = setInterval(api.nextSlide, api.options.slide_interval);
+								}
+								vars.progressDelay = false;
+						}, 1000);
+					}
+				}
+				
+				// Thumb Links
+				if (api.options.thumb_links && vars.thumb_tray.length){
+					// Update Thumb Interval & Page
+					vars.thumb_page = 0;	
+					vars.thumb_interval = Math.floor($(vars.thumb_tray).width() / $('> li', vars.thumb_list).outerWidth(true)) * $('> li', vars.thumb_list).outerWidth(true);
+					
+					// Adjust thumbnail markers
+					if ($(vars.thumb_list).width() > $(vars.thumb_tray).width()){
+						$(vars.thumb_back +','+vars.thumb_forward).fadeIn('fast');
+						$(vars.thumb_list).stop().animate({'left':0}, 200);
+					}else{
+						$(vars.thumb_back +','+vars.thumb_forward).fadeOut('fast');
+					}
+					
+				}
+			});	
+			
+								
+	 	},
+	 	
+	 	
+	 	/* Go To Slide
+		----------------------------*/
+	 	goTo : function(){
+	 		if (api.options.progress_bar && !vars.is_paused){
+				$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
+				theme.progressBar();
+			}
+		},
+	 	
+	 	/* Play & Pause Toggle
+		----------------------------*/
+	 	playToggle : function(state){
+	 		
+	 		if (state =='play'){
+	 			// If image, swap to pause
+	 			if ($(vars.play_button).attr('src')) $(vars.play_button).attr("src", vars.image_path + "pause.png");
+				if (api.options.progress_bar && !vars.is_paused) theme.progressBar();
+	 		}else if (state == 'pause'){
+	 			// If image, swap to play
+	 			if ($(vars.play_button).attr('src')) $(vars.play_button).attr("src", vars.image_path + "play.png");
+        		if (api.options.progress_bar && vars.is_paused)$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
+	 		}
+	 		
+	 	},
+	 	
+	 	
+	 	/* Before Slide Transition
+		----------------------------*/
+	 	beforeAnimation : function(direction){
+		    if (api.options.progress_bar && !vars.is_paused) $(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
+		  	
+		  	/* Update Fields
+		  	----------------------------*/
+		  	// Update slide caption
+		   	if ($(vars.slide_caption).length){
+		   		(api.getField('title')) ? $(vars.slide_caption).html(api.getField('title')) : $(vars.slide_caption).html('');
+		   	}
+		    // Update slide number
+			if (vars.slide_current.length){
+			    $(vars.slide_current).html(vars.current_slide + 1);
+			}
+		    
+		    
+		    // Highlight current thumbnail and adjust row position
+		    if (api.options.thumb_links){
+		    
+				$('.current-thumb').removeClass('current-thumb');
+				$('li', vars.thumb_list).eq(vars.current_slide).addClass('current-thumb');
+				
+				// If thumb out of view
+				if ($(vars.thumb_list).width() > $(vars.thumb_tray).width()){
+					// If next slide direction
+					if (direction == 'next'){
+						if (vars.current_slide == 0){
+							vars.thumb_page = 0;
+							$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+						} else if ($('.current-thumb').offset().left - $(vars.thumb_tray).offset().left >= vars.thumb_interval){
+	        				vars.thumb_page = vars.thumb_page - vars.thumb_interval;
+	        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+						}
+					// If previous slide direction
+					}else if(direction == 'prev'){
+						if (vars.current_slide == api.options.slides.length - 1){
+							vars.thumb_page = Math.floor($(vars.thumb_list).width() / vars.thumb_interval) * -vars.thumb_interval;
+							if ($(vars.thumb_list).width() <= -vars.thumb_page) vars.thumb_page = vars.thumb_page + vars.thumb_interval;
+							$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+						} else if ($('.current-thumb').offset().left - $(vars.thumb_tray).offset().left < 0){
+							if (vars.thumb_page + vars.thumb_interval > 0) return false;
+	        				vars.thumb_page = vars.thumb_page + vars.thumb_interval;
+	        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
+						}
+					}
+				}
+				
+				
+			}
+		    
+	 	},
+	 	
+	 	
+	 	/* After Slide Transition
+		----------------------------*/
+	 	afterAnimation : function(){
+	 		if (api.options.progress_bar && !vars.is_paused) theme.progressBar();	//  Start progress bar
+	 	},
+	 	
+	 	
+	 	/* Progress Bar
+		----------------------------*/
+		progressBar : function(){
+    		$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 ).animate({left:0}, api.options.slide_interval);
+    	}
+	 	
+	 
+	 };
+	 
+	 
+	 /* Theme Specific Variables
+	 ----------------------------*/
+	 $.supersized.themeVars = {
+	 	
+	 	// Internal Variables
+		progress_delay		:	false,				// Delay after resize before resuming slideshow
+		thumb_page 			: 	false,				// Thumbnail page
+		thumb_interval 		: 	false,				// Thumbnail interval
+		image_path			:	OC.webroot+"/apps/gallery/img/supersized/",				// Default image path
+													
+		// General Elements							
+		play_button			:	'#pauseplay',		// Play/Pause button
+		next_slide			:	'#nextslide',		// Next slide button
+		prev_slide			:	'#prevslide',		// Prev slide button
+		next_thumb			:	'#nextthumb',		// Next slide thumb button
+		prev_thumb			:	'#prevthumb',		// Prev slide thumb button
+		
+		slide_caption		:	'#slidecaption',	// Slide caption
+		slide_current		:	'.slidenumber',		// Current slide number
+		slide_total			:	'.totalslides',		// Total Slides
+		slide_list			:	'#slide-list',		// Slide jump list							
+		
+		thumb_tray			:	'#thumb-tray',		// Thumbnail tray
+		thumb_list			:	'#thumb-list',		// Thumbnail list
+		thumb_forward		:	'#thumb-forward',	// Cycles forward through thumbnail list
+		thumb_back			:	'#thumb-back',		// Cycles backwards through thumbnail list
+		tray_arrow			:	'#tray-arrow',		// Thumbnail tray button arrow
+		tray_button			:	'#tray-button',		// Thumbnail tray button
+		
+		progress_bar		:	'#progress-bar'		// Progress bar
+	 												
+	 };												
+	
+	 /* Theme Specific Options
+	 ----------------------------*/												
+	 $.supersized.themeOptions = {					
+	 						   
+		progress_bar		:	1,		// Timer for each slide											
+		mouse_scrub			:	0		// Thumbnails move with mouse
+		
+	 };
+	
+	
+})(jQuery);
diff --git a/apps/gallery/js/supersized.shutter.min.js b/apps/gallery/js/supersized.shutter.min.js
new file mode 100644
index 0000000000..52ea4a3384
--- /dev/null
+++ b/apps/gallery/js/supersized.shutter.min.js
@@ -0,0 +1,14 @@
+/*
+
+	Supersized - Fullscreen Slideshow jQuery Plugin
+	Version : 3.2.7
+	Theme 	: Shutter 1.1
+	
+	Site	: www.buildinternet.com/project/supersized
+	Author	: Sam Dunn
+	Company : One Mighty Roar (www.onemightyroar.com)
+	License : MIT License / GPL License
+
+*/
+
+(function(a){theme={_init:function(){if(api.options.slide_links){a(vars.slide_list).css("margin-left",-a(vars.slide_list).width()/2)}if(api.options.autoplay){if(api.options.progress_bar){theme.progressBar()}}else{if(a(vars.play_button).attr("src")){a(vars.play_button).attr("src",vars.image_path+"play.png")}if(api.options.progress_bar){a(vars.progress_bar).stop().animate({left:-a(window).width()},0)}}a(vars.thumb_tray).animate({bottom:-a(vars.thumb_tray).height()},0);a(vars.tray_button).toggle(function(){a(vars.thumb_tray).stop().animate({bottom:0,avoidTransforms:true},300);if(a(vars.tray_arrow).attr("src")){a(vars.tray_arrow).attr("src",vars.image_path+"button-tray-down.png")}return false},function(){a(vars.thumb_tray).stop().animate({bottom:-a(vars.thumb_tray).height(),avoidTransforms:true},300);if(a(vars.tray_arrow).attr("src")){a(vars.tray_arrow).attr("src",vars.image_path+"button-tray-up.png")}return false});a(vars.thumb_list).width(a("> li",vars.thumb_list).length*a("> li",vars.thumb_list).outerWidth(true));if(a(vars.slide_total).length){a(vars.slide_total).html(api.options.slides.length)}if(api.options.thumb_links){if(a(vars.thumb_list).width()<=a(vars.thumb_tray).width()){a(vars.thumb_back+","+vars.thumb_forward).fadeOut(0)}vars.thumb_interval=Math.floor(a(vars.thumb_tray).width()/a("> li",vars.thumb_list).outerWidth(true))*a("> li",vars.thumb_list).outerWidth(true);vars.thumb_page=0;a(vars.thumb_forward).click(function(){if(vars.thumb_page-vars.thumb_interval<=-a(vars.thumb_list).width()){vars.thumb_page=0;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{vars.thumb_page=vars.thumb_page-vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}});a(vars.thumb_back).click(function(){if(vars.thumb_page+vars.thumb_interval>0){vars.thumb_page=Math.floor(a(vars.thumb_list).width()/vars.thumb_interval)*-vars.thumb_interval;if(a(vars.thumb_list).width()<=-vars.thumb_page){vars.thumb_page=vars.thumb_page+vars.thumb_interval}a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{vars.thumb_page=vars.thumb_page+vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}})}a(vars.next_slide).click(function(){api.nextSlide()});a(vars.prev_slide).click(function(){api.prevSlide()});if(jQuery.support.opacity){a(vars.prev_slide+","+vars.next_slide).mouseover(function(){a(this).stop().animate({opacity:1},100)}).mouseout(function(){a(this).stop().animate({opacity:0.6},100)})}if(api.options.thumbnail_navigation){a(vars.next_thumb).click(function(){api.nextSlide()});a(vars.prev_thumb).click(function(){api.prevSlide()})}a(vars.play_button).click(function(){api.playToggle()});if(api.options.mouse_scrub){a(vars.thumb_tray).mousemove(function(f){var c=a(vars.thumb_tray).width(),g=a(vars.thumb_list).width();if(g>c){var b=1,d=f.pageX-b;if(d>10||d<-10){b=f.pageX;newX=(c-g)*(f.pageX/c);d=parseInt(Math.abs(parseInt(a(vars.thumb_list).css("left"))-newX)).toFixed(0);a(vars.thumb_list).stop().animate({left:newX},{duration:d*3,easing:"easeOutExpo"})}}})}a(window).resize(function(){if(api.options.progress_bar&&!vars.in_animation){if(vars.slideshow_interval){clearInterval(vars.slideshow_interval)}if(api.options.slides.length-1>0){clearInterval(vars.slideshow_interval)}a(vars.progress_bar).stop().animate({left:-a(window).width()},0);if(!vars.progressDelay&&api.options.slideshow){vars.progressDelay=setTimeout(function(){if(!vars.is_paused){theme.progressBar();vars.slideshow_interval=setInterval(api.nextSlide,api.options.slide_interval)}vars.progressDelay=false},1000)}}if(api.options.thumb_links&&vars.thumb_tray.length){vars.thumb_page=0;vars.thumb_interval=Math.floor(a(vars.thumb_tray).width()/a("> li",vars.thumb_list).outerWidth(true))*a("> li",vars.thumb_list).outerWidth(true);if(a(vars.thumb_list).width()>a(vars.thumb_tray).width()){a(vars.thumb_back+","+vars.thumb_forward).fadeIn("fast");a(vars.thumb_list).stop().animate({left:0},200)}else{a(vars.thumb_back+","+vars.thumb_forward).fadeOut("fast")}}})},goTo:function(b){if(api.options.progress_bar&&!vars.is_paused){a(vars.progress_bar).stop().animate({left:-a(window).width()},0);theme.progressBar()}},playToggle:function(b){if(b=="play"){if(a(vars.play_button).attr("src")){a(vars.play_button).attr("src",vars.image_path+"pause.png")}if(api.options.progress_bar&&!vars.is_paused){theme.progressBar()}}else{if(b=="pause"){if(a(vars.play_button).attr("src")){a(vars.play_button).attr("src",vars.image_path+"play.png")}if(api.options.progress_bar&&vars.is_paused){a(vars.progress_bar).stop().animate({left:-a(window).width()},0)}}}},beforeAnimation:function(b){if(api.options.progress_bar&&!vars.is_paused){a(vars.progress_bar).stop().animate({left:-a(window).width()},0)}if(a(vars.slide_caption).length){(api.getField("title"))?a(vars.slide_caption).html(api.getField("title")):a(vars.slide_caption).html("")}if(vars.slide_current.length){a(vars.slide_current).html(vars.current_slide+1)}if(api.options.thumb_links){a(".current-thumb").removeClass("current-thumb");a("li",vars.thumb_list).eq(vars.current_slide).addClass("current-thumb");if(a(vars.thumb_list).width()>a(vars.thumb_tray).width()){if(b=="next"){if(vars.current_slide==0){vars.thumb_page=0;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{if(a(".current-thumb").offset().left-a(vars.thumb_tray).offset().left>=vars.thumb_interval){vars.thumb_page=vars.thumb_page-vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}}}else{if(b=="prev"){if(vars.current_slide==api.options.slides.length-1){vars.thumb_page=Math.floor(a(vars.thumb_list).width()/vars.thumb_interval)*-vars.thumb_interval;if(a(vars.thumb_list).width()<=-vars.thumb_page){vars.thumb_page=vars.thumb_page+vars.thumb_interval}a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{if(a(".current-thumb").offset().left-a(vars.thumb_tray).offset().left<0){if(vars.thumb_page+vars.thumb_interval>0){return false}vars.thumb_page=vars.thumb_page+vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}}}}}}},afterAnimation:function(){if(api.options.progress_bar&&!vars.is_paused){theme.progressBar()}},progressBar:function(){a(vars.progress_bar).stop().animate({left:-a(window).width()},0).animate({left:0},api.options.slide_interval)}};a.supersized.themeVars={progress_delay:false,thumb_page:false,thumb_interval:false,image_path:OC.webroot+"/apps/gallery/img/supersized/",play_button:"#pauseplay",next_slide:"#nextslide",prev_slide:"#prevslide",next_thumb:"#nextthumb",prev_thumb:"#prevthumb",slide_caption:"#slidecaption",slide_current:".slidenumber",slide_total:".totalslides",slide_list:"#slide-list",thumb_tray:"#thumb-tray",thumb_list:"#thumb-list",thumb_forward:"#thumb-forward",thumb_back:"#thumb-back",tray_arrow:"#tray-arrow",tray_button:"#tray-button",progress_bar:"#progress-bar"};a.supersized.themeOptions={progress_bar:1,mouse_scrub:0}})(jQuery);
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index c90932cefd..048fb6c5bb 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -22,7 +22,10 @@ $(document).ready(function() {
 		}
 	}
 		
-?><br/>
+?>
+	<div id="slideshow">
+		<input type="button" class="start" value="<?php echo $l->t('Slideshow')?>" />
+	</div>
 </div>
 <div id="gallerycontent">
 <?php
@@ -32,3 +35,50 @@ echo $_['tl']->get();
 
 ?>
 </div>
+
+<!-- start supersized block -->
+<div id="slideshow-content" class="supersized" style="display:none;">
+
+	<!--Thumbnail Navigation-->
+	<div id="prevthumb"></div>
+	<div id="nextthumb"></div>
+
+	<!--Arrow Navigation-->
+	<a id="prevslide" class="load-item"></a>
+	<a id="nextslide" class="load-item"></a>
+
+	<div id="thumb-tray" class="load-item">
+		<div id="thumb-back"></div>
+		<div id="thumb-forward"></div>
+	</div>
+
+	<!--Time Bar-->
+	<div id="progress-back" class="load-item">
+		<div id="progress-bar"></div>
+	</div>
+
+	<!--Control Bar-->
+	<div id="slideshow-controls-wrapper" class="load-item">
+		<div id="slideshow-controls">
+
+			<a id="play-button"><img id="pauseplay" src="<?php echo OCP\image_path('gallery', 'supersized/pause.png'); ?>"/></a>
+
+			<!--Slide counter-->
+			<div id="slidecounter">
+				<span class="slidenumber"></span> / <span class="totalslides"></span>
+			</div>
+
+			<!--Slide captions displayed here-->
+			<div id="slidecaption"></div>
+
+			<!--Thumb Tray button-->
+			<a id="tray-button"><img id="tray-arrow" src="<?php echo OCP\image_path('gallery', 'supersized/button-tray-up.png'); ?>"/></a>
+
+			<!--Navigation-->
+			<!--
+			<ul id="slide-list"></ul>
+			-->
+		</div>
+	</div>
+
+</div><!-- end supersized block -->

From b67199bb452483ec7d3c3d338b2f3a0c667e42e7 Mon Sep 17 00:00:00 2001
From: jfd <jfd@underverse>
Date: Mon, 9 Jul 2012 16:04:46 +0200
Subject: [PATCH 0878/1537] add css id attribute, minor fixes

---
 apps/gallery/css/styles.css             |  2 +-
 apps/gallery/css/supersized.css         | 24 ++++----
 apps/gallery/css/supersized.shutter.css | 76 ++++++++++++-------------
 apps/gallery/index.php                  | 10 ++--
 apps/gallery/js/slideshow.js            | 12 ++--
 apps/gallery/templates/index.php        |  2 +-
 apps/gallery/templates/view_album.php   |  8 +--
 7 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index dcef1f08c6..fa87e51c85 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,5 +1,5 @@
 #gallerycontent { margin-top: 2.8em; overflow: visible; }
-#g-settings {position: absolute; left 13.5em; top: 0;}
+#g-settings {position: absolute; left: 13.5em; top: 0;}
 div#controls input[type=button] { -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; opacity: 1; position:absolute; right:13.5em; top:0em; }
 input[type=button]:disabled { opacity: 0.5 }
 .ui-dialog tr {background-color: #eee;}
diff --git a/apps/gallery/css/supersized.css b/apps/gallery/css/supersized.css
index 617f501120..57ee7e23a5 100644
--- a/apps/gallery/css/supersized.css
+++ b/apps/gallery/css/supersized.css
@@ -9,17 +9,17 @@
 	License : MIT License / GPL License
 	
 */
-#supersized-loader { display:none; position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center;}
+#supersized-holder #supersized-loader { display:none; position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center;}
 
-#supersized {  visibility:hidden; display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:200; height:100%; width:100%; }
-#supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
-#supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }	/*Speed*/
-#supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }			/*Quality*/
+#supersized-holder #supersized {  visibility:hidden; display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:200; height:100%; width:100%; }
+#supersized-holder #supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
+#supersized-holder #supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }	/*Speed*/
+#supersized-holder #supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }			/*Quality*/
 
-#supersized li { display:block; list-style:none; z-index:150; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
-#supersized a { width:100%; height:100%; display:block; }
-#supersized li.prevslide { z-index:160; }
-#supersized li.activeslide { z-index:170; }
-#supersized li.image-loading { background:#111 url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center; width:100%; height:100%; }
-#supersized li.image-loading img{ visibility:hidden; }
-#supersized li.prevslide img, #supersized li.activeslide img{ display:inline; }
+#supersized-holder #supersized li { display:block; list-style:none; z-index:150; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
+#supersized-holder #supersized a { width:100%; height:100%; display:block; }
+#supersized-holder #supersized li.prevslide { z-index:160; }
+#supersized-holder #supersized li.activeslide { z-index:170; }
+#supersized-holder #supersized li.image-loading { background:#111 url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center; width:100%; height:100%; }
+#supersized-holder #supersized li.image-loading img{ visibility:hidden; }
+#supersized-holder #supersized li.prevslide img, #supersized-holder #supersized li.activeslide img{ display:inline; }
diff --git a/apps/gallery/css/supersized.shutter.css b/apps/gallery/css/supersized.shutter.css
index 0084d4bb9c..428c254c3b 100644
--- a/apps/gallery/css/supersized.shutter.css
+++ b/apps/gallery/css/supersized.shutter.css
@@ -13,62 +13,62 @@
 
 /* Controls Bar
 ----------------------------*/
-#slideshow-controls-wrapper { margin:0 auto; height:42px; width:100%; bottom:0px; left:0; z-index:204; background:url('%appswebroot%/gallery/img/supersized/nav-bg.png') repeat-x; position:fixed; }
-#slideshow-controls { overflow:hidden; height:100%; position:relative; text-align:left; z-index:205; }
-#slidecounter { float:left; color:#999; font:14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 0 -1px 0; margin:0px 10px 0 15px; line-height:42px; }
-#slidecaption { overflow:hidden; float:left; color:#FFF; font:400 14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 1px 1px 2px; margin:0 20px 0 0; line-height:42px; }
+#slideshow-content #slideshow-controls-wrapper { margin:0 auto; height:42px; width:100%; bottom:0px; left:0; z-index:204; background:url('%appswebroot%/gallery/img/supersized/nav-bg.png') repeat-x; position:fixed; }
+#slideshow-content #slideshow-controls { overflow:hidden; height:100%; position:relative; text-align:left; z-index:205; }
+#slideshow-content #slidecounter { float:left; color:#999; font:14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 0 -1px 0; margin:0px 10px 0 15px; line-height:42px; }
+#slideshow-content #slidecaption { overflow:hidden; float:left; color:#FFF; font:400 14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 1px 1px 2px; margin:0 20px 0 0; line-height:42px; }
 
 /*#navigation { float:right; margin:0px 20px 0 0; }*/
-#play-button{ float:left; margin-top:1px;border-right:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
-#play-button:hover{ background-position:0 1px; cursor:pointer; }
+#slideshow-content #play-button{ float:left; margin-top:1px;border-right:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
+#slideshow-content #play-button:hover{ background-position:0 1px; cursor:pointer; }
 
-#prevslide, #nextslide{ position:fixed; height:43px; width:43px; top:50%; margin-top:-21px; opacity:0.6; z-index:204; }
-#prevslide{ left:10px; background:url('%appswebroot%/gallery/img/supersized/back.png'); }
-#nextslide{ right:10px; background:url('%appswebroot%/gallery/img/supersized/forward.png'); }
-#prevslide:active, #nextslide:active{ margin-top:-19px; }
-#prevslide:hover, #nextslide:hover{ cursor:pointer; }
+#slideshow-content #prevslide, #nextslide{ position:fixed; height:43px; width:43px; top:50%; margin-top:-21px; opacity:0.6; z-index:204; }
+#slideshow-content #prevslide{ left:10px; background:url('%appswebroot%/gallery/img/supersized/back.png'); }
+#slideshow-content #nextslide{ right:10px; background:url('%appswebroot%/gallery/img/supersized/forward.png'); }
+#slideshow-content #prevslide:active, #nextslide:active{ margin-top:-19px; }
+#slideshow-content #prevslide:hover, #nextslide:hover{ cursor:pointer; }
 
-ul#slide-list{ padding:15px 0; float:left; position:absolute; left:50%; }
-ul#slide-list li{ list-style:none; width:12px; height:12px; float:left; margin:0 5px 0 0; }
-ul#slide-list li.current-slide a, ul#slide-list li.current-slide a:hover{ background-position:0 0px; }
-ul#slide-list li a{ display:block; width:12px; height:12px; background:url('%appswebroot%/gallery/img/supersized/nav-dot.png') no-repeat 0 -24px; }
-ul#slide-list li a:hover{ background-position:0 -12px; cursor:pointer; }
+#slideshow-content ul#slide-list{ padding:15px 0; float:left; position:absolute; left:50%; }
+#slideshow-content ul#slide-list li{ list-style:none; width:12px; height:12px; float:left; margin:0 5px 0 0; }
+#slideshow-content ul#slide-list li.current-slide a, ul#slide-list li.current-slide a:hover{ background-position:0 0px; }
+#slideshow-content ul#slide-list li a{ display:block; width:12px; height:12px; background:url('%appswebroot%/gallery/img/supersized/nav-dot.png') no-repeat 0 -24px; }
+#slideshow-content ul#slide-list li a:hover{ background-position:0 -12px; cursor:pointer; }
 
-#tray-button{ float:right; margin-top:1px; border-left:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
-#tray-button:hover{ background-position:0 1px; cursor:pointer; }
+#slideshow-content #tray-button{ float:right; margin-top:1px; border-left:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
+#slideshow-content #tray-button:hover{ background-position:0 1px; cursor:pointer; }
 
 
 /* Progress Bar
 ----------------------------*/					
-#progress-back{ z-index:205; position:fixed; bottom:42px; left:0; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-back.png') repeat-x; }
-#progress-bar{ position:relative; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-bar.png') repeat-x; }
+#slideshow-content #progress-back{ z-index:205; position:fixed; bottom:42px; left:0; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-back.png') repeat-x; }
+#slideshow-content #progress-bar{ position:relative; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-bar.png') repeat-x; }
 
 
 /* Thumbnail Navigation
 ----------------------------*/	
-#nextthumb,#prevthumb { z-index:202; display:none; position:fixed; bottom:61px; height:75px; width:100px; overflow:hidden; background:#ddd; border:1px solid #fff; -webkit-box-shadow:0 0 5px #000; }
-#nextthumb { right:12px; }
-#prevthumb { left:12px; }
-#nextthumb img, #prevthumb img { width:150px; height:auto;  }
-#nextthumb:active, #prevthumb:active { bottom:59px; }
-#nextthumb:hover, #prevthumb:hover { cursor:pointer; }
+#slideshow-content #nextthumb, #slideshow-content #prevthumb { z-index:202; display:none; position:fixed; bottom:61px; height:75px; width:100px; overflow:hidden; background:#ddd; border:1px solid #fff; -webkit-box-shadow:0 0 5px #000; }
+#slideshow-content #nextthumb { right:12px; }
+#slideshow-content #prevthumb { left:12px; }
+#slideshow-content #nextthumb img, #slideshow-content #prevthumb img { width:150px; height:auto;  }
+#slideshow-content #nextthumb:active, #slideshow-content #prevthumb:active { bottom:59px; }
+#slideshow-content #nextthumb:hover, #slideshow-content #prevthumb:hover { cursor:pointer; }
 
 
 /* Thumbnail Tray
 ----------------------------*/			
-#thumb-tray{ position:fixed; z-index:203; bottom:0; left:0; background:url('%appswebroot%/gallery/img/supersized/bg-black.png'); height:150px; width:100%; overflow:hidden; text-align:center; -moz-box-shadow: 0px 0px 4px #000; -webkit-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; }
+#slideshow-content #thumb-tray{ position:fixed; z-index:203; bottom:0; left:0; background:url('%appswebroot%/gallery/img/supersized/bg-black.png'); height:150px; width:100%; overflow:hidden; text-align:center; -moz-box-shadow: 0px 0px 4px #000; -webkit-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; }
 
-#thumb-back, #thumb-forward{ position:absolute; z-index:5; bottom:42px; height:108px; width:40px; }
-#thumb-back{ left:0; background: url('%appswebroot%/gallery/img/supersized/thumb-back.png') no-repeat center center;}
-#thumb-forward{ right:0; background:url('%appswebroot%/gallery/img/supersized/thumb-forward.png') no-repeat center center;}
-#thumb-back:hover, #thumb-forward:hover{ cursor:pointer; background-color:rgba(256,256,256, 0.1); }
-#thumb-back:hover{ border-right:1px solid rgba(256,256,256, 0.2); }
-#thumb-forward:hover{ border-left:1px solid rgba(256,256,256, 0.2); }
+#slideshow-content #thumb-back, #slideshow-content #thumb-forward{ position:absolute; z-index:5; bottom:42px; height:108px; width:40px; }
+#slideshow-content #thumb-back{ left:0; background: url('%appswebroot%/gallery/img/supersized/thumb-back.png') no-repeat center center;}
+#slideshow-content #thumb-forward{ right:0; background:url('%appswebroot%/gallery/img/supersized/thumb-forward.png') no-repeat center center;}
+#slideshow-content #thumb-back:hover, #slideshow-content #thumb-forward:hover{ cursor:pointer; background-color:rgba(256,256,256, 0.1); }
+#slideshow-content #thumb-back:hover{ border-right:1px solid rgba(256,256,256, 0.2); }
+#slideshow-content #thumb-forward:hover{ border-left:1px solid rgba(256,256,256, 0.2); }
 
 
-ul#thumb-list{ display:inline-block; list-style:none; position:relative; left:0px; padding:0 0px; }
-ul#thumb-list li{ background:#111; list-style:none; display:inline; width:150px; height:108px; overflow:hidden; float:left; margin:0; }
-ul#thumb-list li img { width:200px; height:auto; opacity:0.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter:alpha(opacity=60); -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; -o-transition: all 100ms ease-in-out; -ms-transition: all 100ms ease-in-out; transition: all 100ms ease-in-out; }
-ul#thumb-list li.current-thumb img, ul#thumb-list li:hover img{ opacity:1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); }
-ul#thumb-list li:hover{ cursor:pointer; }
+#slideshow-content ul#thumb-list{ display:inline-block; list-style:none; position:relative; left:0px; padding:0 0px; }
+#slideshow-content ul#thumb-list li{ background:#111; list-style:none; display:inline; width:150px; height:108px; overflow:hidden; float:left; margin:0; }
+#slideshow-content ul#thumb-list li img { width:200px; height:auto; opacity:0.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter:alpha(opacity=60); -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; -o-transition: all 100ms ease-in-out; -ms-transition: all 100ms ease-in-out; transition: all 100ms ease-in-out; }
+#slideshow-content ul#thumb-list li.current-thumb img, #slideshow-content ul#thumb-list li:hover img{ opacity:1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); }
+#slideshow-content ul#thumb-list li:hover{ cursor:pointer; }
 				
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index c7eafc9a1c..a891e2889f 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -32,12 +32,12 @@ OCP\Util::addStyle('gallery', 'styles');
 OCP\Util::addScript('gallery', 'pictures');
 OCP\Util::addStyle( 'gallery', 'supersized' );
 OCP\Util::addStyle( 'gallery', 'supersized.shutter' );
-OCP\Util::addscript('gallery', 'slideshow');
-OCP\Util::addscript('gallery', 'jquery.easing.min');
-OCP\Util::addscript('gallery', 'supersized.3.2.7.min');
-OCP\Util::addscript('gallery', 'supersized.shutter.min');
+OCP\Util::addScript('gallery', 'slideshow');
+OCP\Util::addScript('gallery', 'jquery.easing.min');
+OCP\Util::addScript('gallery', 'supersized.3.2.7.min');
+OCP\Util::addScript('gallery', 'supersized.shutter.min');
 
-include('gallery/lib/tiles.php');
+include 'gallery/lib/tiles.php';
 
 $root = !empty($_GET['root']) ? $_GET['root'] : '/';
 $images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
diff --git a/apps/gallery/js/slideshow.js b/apps/gallery/js/slideshow.js
index 01d5a4cf2c..88e89f39ff 100644
--- a/apps/gallery/js/slideshow.js
+++ b/apps/gallery/js/slideshow.js
@@ -5,7 +5,7 @@ $(document).ready(function(){
 			clearInterval($.supersized.vars.slideshow_interval);
 		};
 
-		$(".supersizedHolder").remove();
+		$('#supersized-holder').remove();
 		$('#slideshow-content').hide();
 		$('#thumb-list').remove();
 	}
@@ -22,11 +22,11 @@ $(document).ready(function(){
 			return;
 		}
 
-		$("body").append("<div class='supersizedHolder'></div>");
-		$("#supersized-loader").remove();
-		$("#supersized").remove();
-		$(".supersizedHolder").append("<div id='supersized-loader'></div><ul id='supersized'></ul>");
-		$("#supersized").show();
+		$('body').append("<div id='supersized-holder'></div>");
+		$('#supersized-loader').remove();
+		$('#supersized').remove();
+		$('#supersized-holder').append("<div id='supersized-loader'></div><ul id='supersized'></ul>");
+		$('#supersized').show();
 		$('#slideshow-content').show();
 
 
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 048fb6c5bb..b2efd5342f 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -37,7 +37,7 @@ echo $_['tl']->get();
 </div>
 
 <!-- start supersized block -->
-<div id="slideshow-content" class="supersized" style="display:none;">
+<div id="slideshow-content" style="display:none;">
 
 	<!--Thumbnail Navigation-->
 	<div id="prevthumb"></div>
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index c16ed69c06..00e891103f 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -1,9 +1,9 @@
 <?php
 OCP\Util::addStyle('gallery', 'styles');
-OCP\Util::addscript('gallery', 'albums');
-OCP\Util::addscript('gallery', 'album_cover');
-OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
+OCP\Util::addScript('gallery', 'albums');
+OCP\Util::addScript('gallery', 'album_cover');
+OCP\Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
+OCP\Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
 OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
 $l = OC_L10N::get('gallery');
 ?>

From e59a1806cf676dad9256ad3adb83a6e9530b7612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 9 Jul 2012 16:51:16 +0200
Subject: [PATCH 0879/1537] remove superfluous ?> at the end of .php files
 (left out apps/*/templates)

---
 apps/bookmarks/lib/bookmarks.php              |  3 +-
 apps/contacts/ajax/addbook.php                |  1 -
 .../ajax/categories/categoriesfor.php         |  1 -
 apps/contacts/ajax/categories/delete.php      |  2 -
 apps/contacts/ajax/categories/list.php        |  2 -
 apps/contacts/ajax/categories/rescan.php      |  2 -
 apps/contacts/ajax/currentphoto.php           |  2 -
 apps/contacts/ajax/editaddress.php            |  2 -
 apps/contacts/ajax/editaddressbook.php        |  1 -
 apps/contacts/ajax/editname.php               |  2 -
 apps/contacts/ajax/importaddressbook.php      |  1 -
 apps/contacts/ajax/importdialog.php           |  1 -
 apps/contacts/ajax/oc_photo.php               |  2 -
 apps/contacts/ajax/uploadimport.php           |  3 -
 apps/contacts/ajax/uploadphoto.php            |  1 -
 apps/contacts/export.php                      |  1 -
 apps/contacts/index.php                       |  2 -
 apps/contacts/settings.php                    |  1 -
 apps/external/ajax/setsites.php               |  1 -
 apps/external/index.php                       |  1 -
 apps/external/lib/external.php                |  2 -
 apps/external/settings.php                    |  1 -
 apps/files/ajax/autocomplete.php              |  2 -
 apps/files/ajax/delete.php                    |  2 -
 apps/files/ajax/download.php                  |  1 -
 apps/files/ajax/list.php                      |  2 -
 apps/files/ajax/mimeicon.php                  |  2 -
 apps/files/ajax/move.php                      |  2 -
 apps/files/ajax/rawlist.php                   |  2 -
 apps/files/ajax/rename.php                    |  2 -
 apps/files/ajax/timezone.php                  |  2 +-
 apps/files/ajax/upload.php                    |  2 -
 apps/files/download.php                       |  1 -
 apps/files/index.php                          |  2 -
 apps/files/settings.php                       |  2 -
 apps/files_external/ajax/addMountPoint.php    |  2 -
 apps/files_external/ajax/removeMountPoint.php |  2 -
 apps/files_external/tests/amazons3.php        |  3 -
 apps/files_imageviewer/appinfo/app.php        |  2 -
 apps/files_pdfviewer/appinfo/app.php          |  1 -
 apps/files_sharing/ajax/email.php             |  2 -
 apps/files_sharing/ajax/getitem.php           |  2 -
 apps/files_sharing/ajax/getstatuses.php       |  2 -
 apps/files_sharing/ajax/setpermissions.php    |  2 -
 apps/files_sharing/ajax/share.php             |  2 -
 apps/files_sharing/ajax/toggleresharing.php   |  2 -
 apps/files_sharing/ajax/unshare.php           |  2 -
 apps/files_sharing/ajax/userautocomplete.php  |  2 -
 apps/files_sharing/get.php                    |  1 -
 apps/files_sharing/lib_share.php              |  2 -
 apps/files_sharing/list.php                   |  2 -
 apps/files_texteditor/appinfo/app.php         |  1 -
 apps/files_versions/ajax/togglesettings.php   |  2 -
 apps/files_versions/history.php               |  2 -
 apps/files_versions/lib/hooks.php             | 72 +++++++++----------
 apps/files_versions/settings.php              |  1 -
 apps/gallery/ajax/createAlbum.php             |  2 -
 apps/gallery/ajax/galleryOp.php               |  1 -
 apps/gallery/index.php                        |  1 -
 apps/gallery/lib/hooks_handlers.php           |  2 -
 apps/gallery/lib/images_utils.php             |  2 -
 apps/gallery/lib/managers.php                 |  7 +-
 apps/gallery/lib/tiles.php                    |  2 -
 apps/gallery/lib/tiles_test.php               |  2 -
 apps/media/ajax/api.php                       |  1 -
 apps/media/ajax/autoupdate.php                |  1 -
 apps/media/index.php                          |  2 -
 apps/media/lib_ampache.php                    |  2 -
 apps/media/lib_collection.php                 |  2 -
 apps/media/settings.php                       |  1 -
 apps/remoteStorage/settings.php               |  1 -
 apps/user_migrate/appinfo/app.php             |  1 -
 apps/user_openid/phpmyid.php                  |  1 -
 apps/user_openid/user.php                     |  3 -
 apps/user_webfinger/webfinger.php             |  1 -
 core/ajax/grouplist.php                       |  2 -
 core/ajax/translations.php                    |  1 -
 core/ajax/userlist.php                        |  2 -
 core/ajax/validateuser.php                    |  2 -
 core/ajax/vcategories/add.php                 |  2 -
 core/ajax/vcategories/delete.php              |  2 -
 core/ajax/vcategories/edit.php                |  2 -
 core/strings.php                              |  1 -
 lib/MDB2/Driver/Function/sqlite3.php          |  1 -
 lib/MDB2/Driver/Manager/sqlite3.php           |  1 -
 lib/MDB2/Driver/sqlite3.php                   |  2 -
 lib/public/app.php                            |  3 -
 lib/public/config.php                         |  2 -
 lib/public/db.php                             |  2 -
 lib/public/files.php                          |  2 -
 lib/public/json.php                           |  2 -
 lib/public/response.php                       |  2 -
 lib/public/template.php                       |  3 -
 lib/public/user.php                           |  3 -
 lib/public/util.php                           |  2 -
 lib/setup.php                                 |  2 -
 lib/updater.php                               |  1 -
 lib/vcategories.php                           |  1 -
 ocs/providers.php                             |  3 -
 ocs/v1.php                                    |  2 -
 search/ajax/search.php                        |  2 -
 search/index.php                              |  2 -
 settings/ajax/changepassword.php              |  2 -
 settings/ajax/creategroup.php                 |  2 -
 settings/ajax/createuser.php                  |  2 -
 settings/ajax/lostpassword.php                |  2 -
 settings/ajax/openid.php                      |  2 -
 settings/ajax/removegroup.php                 |  2 -
 settings/ajax/removeuser.php                  |  2 -
 settings/ajax/setlanguage.php                 |  2 -
 settings/ajax/setquota.php                    |  1 -
 settings/ajax/togglegroups.php                |  2 -
 settings/apps.php                             |  2 -
 settings/help.php                             |  2 -
 settings/personal.php                         |  4 +-
 settings/users.php                            |  3 -
 status.php                                    |  3 -
 webapps.php                                   |  2 -
 118 files changed, 41 insertions(+), 249 deletions(-)

diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
index e0005968f3..86fba45a50 100644
--- a/apps/bookmarks/lib/bookmarks.php
+++ b/apps/bookmarks/lib/bookmarks.php
@@ -145,5 +145,4 @@ class OC_Bookmarks_Bookmarks{
 		$result = $query->execute();
 		return true;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
index 70f47cc812..751185b44f 100644
--- a/apps/contacts/ajax/addbook.php
+++ b/apps/contacts/ajax/addbook.php
@@ -17,4 +17,3 @@ $tmpl = new OCP\Template('contacts', 'part.editaddressbook');
 $tmpl->assign('new', true);
 $tmpl->assign('addressbook', $book);
 $tmpl->printPage();
-?>
diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php
index 846af300de..6b6fcad0eb 100644
--- a/apps/contacts/ajax/categories/categoriesfor.php
+++ b/apps/contacts/ajax/categories/categoriesfor.php
@@ -25,4 +25,3 @@ foreach($vcard->children as $property){
 	}
 }
 OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
-?>
diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
index 76c23d6487..7c3261446b 100644
--- a/apps/contacts/ajax/categories/delete.php
+++ b/apps/contacts/ajax/categories/delete.php
@@ -45,5 +45,3 @@ $catman->delete($categories, $cards);
 debug('After delete: '.print_r($catman->categories(), true));
 OC_Contacts_VCard::updateDataByID($cards);
 OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
-
-?>
diff --git a/apps/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php
index 3ae7635390..f234116ba8 100644
--- a/apps/contacts/ajax/categories/list.php
+++ b/apps/contacts/ajax/categories/list.php
@@ -13,5 +13,3 @@ OCP\JSON::checkAppEnabled('contacts');
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>
diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
index 0d8464a23e..fd875a965d 100644
--- a/apps/contacts/ajax/categories/rescan.php
+++ b/apps/contacts/ajax/categories/rescan.php
@@ -14,5 +14,3 @@ OC_Contacts_App::scanCategories();
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index b10e752c45..8f60eca08e 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -51,5 +51,3 @@ if( is_null($contact)) {
 		bailOut(OC_Contacts_App::$l10n->t('The loading photo is not valid.'));
 	}
 }
-
-?>
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
index 2d7aba11b0..1eb9429d79 100644
--- a/apps/contacts/ajax/editaddress.php
+++ b/apps/contacts/ajax/editaddress.php
@@ -39,5 +39,3 @@ $tmpl->assign('adr_types',$adr_types);
 
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
-
-?>
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
index 7a9b757ae0..4bc77302e5 100644
--- a/apps/contacts/ajax/editaddressbook.php
+++ b/apps/contacts/ajax/editaddressbook.php
@@ -14,4 +14,3 @@ $tmpl = new OCP\Template("contacts", "part.editaddressbook");
 $tmpl->assign('new', false);
 $tmpl->assign('addressbook', $addressbook);
 $tmpl->printPage();
-?>
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 868ca222e0..9e7c090eee 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -32,5 +32,3 @@ if($id) {
 }
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page)));
-
-?>
diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
index 3c01e24a18..6b5b06681c 100644
--- a/apps/contacts/ajax/importaddressbook.php
+++ b/apps/contacts/ajax/importaddressbook.php
@@ -21,4 +21,3 @@ $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->printpage();
-?>
diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
index 5f8805a610..691522538f 100644
--- a/apps/contacts/ajax/importdialog.php
+++ b/apps/contacts/ajax/importdialog.php
@@ -13,4 +13,3 @@ $tmpl = new OCP\Template('contacts', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
 $tmpl->printpage();
-?>
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 5c50ba92db..710179fffc 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -58,5 +58,3 @@ if(OC_Cache::set($tmpkey, $image->data(), 600)) {
 } else {
 	bailOut('Couldn\'t save temporary image: '.$tmpkey);
 }
-
-?>
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index 9511520828..80b282f38a 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -70,6 +70,3 @@ if(file_exists($file['tmp_name'])) {
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-
-
-?>
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 8545ca84ee..6bb3fe8a5e 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -102,4 +102,3 @@ if(file_exists($file['tmp_name'])) {
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-?>
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 58fdb040a5..eb506506c4 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -32,4 +32,3 @@ if(isset($bookid)){
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
 }
-?>
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 0b4f89b30c..a89ffffa9c 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -73,5 +73,3 @@ $tmpl->assign('addressbooks', $addressbooks);
 $tmpl->assign('details', $details );
 $tmpl->assign('id',$id);
 $tmpl->printPage();
-
-?>
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
index bc57f4a1d0..a079499381 100644
--- a/apps/contacts/settings.php
+++ b/apps/contacts/settings.php
@@ -4,4 +4,3 @@ $tmpl = new OCP\Template( 'contacts', 'settings');
 $tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
 
 return $tmpl->fetchPage();
-?>
diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
index 188e71e891..0f9e061d0e 100644
--- a/apps/external/ajax/setsites.php
+++ b/apps/external/ajax/setsites.php
@@ -23,4 +23,3 @@ else
 	OCP\Config::setAppValue('external', 'sites', json_encode($sites));
 
 echo 'true';
-?>
diff --git a/apps/external/index.php b/apps/external/index.php
index 81819e76e2..3b6f06e1bf 100644
--- a/apps/external/index.php
+++ b/apps/external/index.php
@@ -40,4 +40,3 @@ if (isset($_GET['id'])) {
 		$tmpl->printPage();
 	}
 }
-?>
diff --git a/apps/external/lib/external.php b/apps/external/lib/external.php
index 9fff5d5569..d13a7cf6dd 100644
--- a/apps/external/lib/external.php
+++ b/apps/external/lib/external.php
@@ -32,5 +32,3 @@ class OC_External {
 	}
 
 }
-
-?>
diff --git a/apps/external/settings.php b/apps/external/settings.php
index c109733e54..488444c119 100644
--- a/apps/external/settings.php
+++ b/apps/external/settings.php
@@ -7,4 +7,3 @@ OCP\Util::addscript( "external", "admin" );
 $tmpl = new OCP\Template( 'external', 'settings');
 
 return $tmpl->fetchPage();
-?>
diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
index 7ff34da96b..e504bb24bf 100644
--- a/apps/files/ajax/autocomplete.php
+++ b/apps/files/ajax/autocomplete.php
@@ -52,5 +52,3 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)){
 	}
 }
 OCP\JSON::encodedPrint($files);
-
-?>
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 161d820f73..695f803884 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -26,5 +26,3 @@ if($success) {
 } else {
 	OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
 }
-
-?>
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index e9373f5f6a..b9a4ddaf5e 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -34,4 +34,3 @@ $files = $_GET["files"];
 $dir = $_GET["dir"];
 
 OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-?>
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index f0600a179d..dae0c1a828 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -42,5 +42,3 @@ $list->assign( "files", $files, false );
 $data = array('files' => $list->fetchPage());
 
 OCP\JSON::success(array('data' => $data));
-
-?>
diff --git a/apps/files/ajax/mimeicon.php b/apps/files/ajax/mimeicon.php
index 57898cd82d..80d50f8452 100644
--- a/apps/files/ajax/mimeicon.php
+++ b/apps/files/ajax/mimeicon.php
@@ -7,5 +7,3 @@ $RUNTIME_NOAPPS=false;
 
 
 print OC_Helper::mimetypeIcon($_GET['mime']);
-
-?>
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 56171dd0ed..3d4003a8ed 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -17,5 +17,3 @@ if(OC_Files::move($dir,$file,$target,$file)){
 }else{
 	OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }
-
-?>
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 7cb02f7967..d159f6e152 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -22,5 +22,3 @@ foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ){
 }
 
 OCP\JSON::success(array('data' => $files));
-
-?>
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 8e98308eb5..45448279fa 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -18,5 +18,3 @@ if( OC_Files::move( $dir, $file, $dir, $newname )) {
 else{
 	OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" )));
 }
-
-?>
diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php
index cafb5074ec..0be441a36a 100644
--- a/apps/files/ajax/timezone.php
+++ b/apps/files/ajax/timezone.php
@@ -3,4 +3,4 @@
 	// see lib/base.php for an example
 	//session_start();
 	$_SESSION['timezone'] = $_GET['time'];
-?>
+        
\ No newline at end of file
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 5553cf5a13..74e6eb560d 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -60,5 +60,3 @@ if(strpos($dir,'..') === false){
 }
 
 OCP\JSON::error(array('data' => array('error' => $error, "file" => $fileName)));
-
-?>
diff --git a/apps/files/download.php b/apps/files/download.php
index 2b5d4e2d87..4e2478d1ad 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -46,4 +46,3 @@ header('Content-Length: '.OC_Filesystem::filesize($filename));
 
 @ob_end_clean();
 OC_Filesystem::readfile( $filename );
-?>
diff --git a/apps/files/index.php b/apps/files/index.php
index ed36c5edab..c2c0cb6170 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -98,5 +98,3 @@ $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 $tmpl->printPage();
-
-?>
diff --git a/apps/files/settings.php b/apps/files/settings.php
index e5a66239eb..cd6dd8c161 100644
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -56,5 +56,3 @@ $tmpl = new OCP\Template( "files", "index", "user" );
 $tmpl->assign( 'files', $files );
 $tmpl->assign( "breadcrumb", $breadcrumb );
 $tmpl->printPage();
-
-?>
diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
index 0eedfdb333..e08f805942 100644
--- a/apps/files_external/ajax/addMountPoint.php
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -11,5 +11,3 @@ if ($_POST['isPersonal'] == 'true') {
 	$isPersonal = false;
 }
 OC_Mount_Config::addMountPoint($_POST['mountPoint'], $_POST['class'], $_POST['classOptions'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
-
-?>
diff --git a/apps/files_external/ajax/removeMountPoint.php b/apps/files_external/ajax/removeMountPoint.php
index a96601b4d0..aa44642620 100644
--- a/apps/files_external/ajax/removeMountPoint.php
+++ b/apps/files_external/ajax/removeMountPoint.php
@@ -11,5 +11,3 @@ if ($_POST['isPersonal'] == 'true') {
 	$isPersonal = false;
 }
 OC_Mount_Config::removeMountPoint($_POST['mountPoint'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
-
-?>
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index d0084c94af..b9b4cf65bd 100644
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -45,6 +45,3 @@ if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['r
 		}
 	}
 }
-
-?>
-
diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php
index 6c8d8c30ca..6184585cff 100644
--- a/apps/files_imageviewer/appinfo/app.php
+++ b/apps/files_imageviewer/appinfo/app.php
@@ -4,5 +4,3 @@ OCP\Util::addscript( 'files_imageviewer', 'lightbox' );
 OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
 OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
 OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
-
-?>
diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
index c8ca2dc8d9..e4771ee517 100644
--- a/apps/files_pdfviewer/appinfo/app.php
+++ b/apps/files_pdfviewer/appinfo/app.php
@@ -6,4 +6,3 @@ OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/compatibility');
 OCP\Util::addscript( 'files_pdfviewer', 'viewer');
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/build/pdf');
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/viewer');
-?>
diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index e1dccb7d0f..ca63f540f9 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -11,5 +11,3 @@ $link = $_POST['link'];
 $text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
 $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
 OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
-
-?>
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 94f0890d70..ff6c29b6a0 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -64,5 +64,3 @@ while ($path != $userDirectory) {
 }
 
 OCP\JSON::success(array('data' => $item));
-
-?>
diff --git a/apps/files_sharing/ajax/getstatuses.php b/apps/files_sharing/ajax/getstatuses.php
index 488cab13bc..1be4d9a0d9 100644
--- a/apps/files_sharing/ajax/getstatuses.php
+++ b/apps/files_sharing/ajax/getstatuses.php
@@ -20,5 +20,3 @@ if ($rows = OC_Share::getMySharedItems()) {
 }
 
 OCP\JSON::success(array('data' => $items));
-
-?>
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
index 31b7a3878e..0a2cf78f76 100644
--- a/apps/files_sharing/ajax/setpermissions.php
+++ b/apps/files_sharing/ajax/setpermissions.php
@@ -10,5 +10,3 @@ $permissions = $_POST['permissions'];
 OC_Share::setPermissions($source, $uid_shared_with, $permissions);
 
 OCP\JSON::success();
-
-?>
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index f4f2172d25..3f224d1b67 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -35,5 +35,3 @@ foreach ($sources as $source) {
 		}
 	}
 }
-
-?>
diff --git a/apps/files_sharing/ajax/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php
index 673f00c5d1..7da4fdfeea 100644
--- a/apps/files_sharing/ajax/toggleresharing.php
+++ b/apps/files_sharing/ajax/toggleresharing.php
@@ -7,5 +7,3 @@ if ($_POST['resharing'] == true) {
 } else {
 	OCP\Config::setAppValue('files_sharing', 'resharing', 'no');
 }
-
-?>
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index 44ffdb1a5b..02a59c4016 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -9,5 +9,3 @@ $uid_shared_with = $_POST['uid_shared_with'];
 OC_Share::unshare($source, $uid_shared_with);
 
 OCP\JSON::success();
-
-?>
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 0e1bf6d588..388a4844b9 100644
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -28,5 +28,3 @@ $users[] = "</optgroup>";
 $groups[] = "</optgroup>";
 $users = array_merge($users, $groups);
 OCP\JSON::encodedPrint($users);
-
-?>
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 40a90a1530..70a5162d38 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -86,4 +86,3 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
 	$tmpl->printPage();
 	die();
 }
-?>
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 6e09226925..0237acfc1a 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -513,5 +513,3 @@ class OC_Share {
 	}
 
 }
-
-?>
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 2fd24840d3..54704c942f 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -33,5 +33,3 @@ OCP\Util::addscript("files_sharing", "list");
 $tmpl = new OCP\Template("files_sharing", "list", "user");
 $tmpl->assign("shared_items", OC_Share::getMySharedItems());
 $tmpl->printPage();
-
-?>
diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php
index c745170018..1f9773bca3 100644
--- a/apps/files_texteditor/appinfo/app.php
+++ b/apps/files_texteditor/appinfo/app.php
@@ -4,4 +4,3 @@ OCP\Util::addStyle( 'files_texteditor', 'DroidSansMono/stylesheet' );
 OCP\Util::addStyle( 'files_texteditor', 'style' );
 OCP\Util::addscript( 'files_texteditor', 'editor');
 OCP\Util::addscript( 'files_texteditor', 'aceeditor/ace');
-?>
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php
index d513d12dd6..86f614c5c8 100644
--- a/apps/files_versions/ajax/togglesettings.php
+++ b/apps/files_versions/ajax/togglesettings.php
@@ -7,5 +7,3 @@ if (OCP\Config::getSystemValue('versions', 'true')=='true') {
 } else {
 	OCP\Config::setSystemValue('versions', 'true');
 }
-
-?>
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index e3332d7cdb..b2ae8d232e 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -71,5 +71,3 @@ if ( isset( $_GET['path'] ) ) {
 }
 
 $tmpl->printPage( );
-
-?>
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index b43fdb9fd3..f93d4dabe2 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -30,43 +30,41 @@ class Hooks {
 		}
 	}
 	
-	/**
-	 * @brief Erase versions of deleted file
-	 * @param array
-	 *
-	 * This function is connected to the delete signal of OC_Filesystem
-	 * cleanup the versions directory if the actual file gets deleted
-	 */
-	public static function remove_hook($params) {
-		$rel_path =  $params['path'];
-		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
-		if(Storage::isversioned($rel_path)) {
-			$versions = Storage::getVersions($rel_path);
-			foreach ($versions as $v){
-				unlink($abs_path . $v['version']);
-			}
-		}
-	}
-	
-	/**
-	 * @brief rename/move versions of renamed/moved files
-	 * @param array with oldpath and newpath
-	 *
-	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-	 * of the stored versions along the actual file
-	 */
-	public static function rename_hook($params) {
-		$rel_oldpath =  $params['oldpath'];
-		$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
-		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
-		if(Storage::isversioned($rel_oldpath)) {
-			$versions = Storage::getVersions($rel_oldpath);
-			foreach ($versions as $v){
-				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
-			}
-		}
+	/**
+	 * @brief Erase versions of deleted file
+	 * @param array
+	 *
+	 * This function is connected to the delete signal of OC_Filesystem
+	 * cleanup the versions directory if the actual file gets deleted
+	 */
+	public static function remove_hook($params) {
+		$rel_path =  $params['path'];
+		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
+		if(Storage::isversioned($rel_path)) {
+			$versions = Storage::getVersions($rel_path);
+			foreach ($versions as $v){
+				unlink($abs_path . $v['version']);
+			}
+		}
+	}
+	
+	/**
+	 * @brief rename/move versions of renamed/moved files
+	 * @param array with oldpath and newpath
+	 *
+	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+	 * of the stored versions along the actual file
+	 */
+	public static function rename_hook($params) {
+		$rel_oldpath =  $params['oldpath'];
+		$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
+		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
+		if(Storage::isversioned($rel_oldpath)) {
+			$versions = Storage::getVersions($rel_oldpath);
+			foreach ($versions as $v){
+				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
+			}
+		}
 	}
 	
 }
-
-?>
diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php
index 5f9e60fc58..f2873b8f7c 100644
--- a/apps/files_versions/settings.php
+++ b/apps/files_versions/settings.php
@@ -7,4 +7,3 @@ OCP\Util::addscript( 'files_versions', 'versions' );
 $tmpl = new OCP\Template( 'files_versions', 'settings');
 
 return $tmpl->fetchPage();
-?>
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
index 61e2e9ae2e..5bfa5aa9a9 100644
--- a/apps/gallery/ajax/createAlbum.php
+++ b/apps/gallery/ajax/createAlbum.php
@@ -28,5 +28,3 @@ OCP\JSON::checkAppEnabled('gallery');
 OC_Gallery_Album::create(OCP\USER::getUser(), $_GET['album_name']);
 
 OCP\JSON::success(array('name' => $_GET['album_name']));
-
-?>
diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 7cbe3e46e2..ab8c64e28a 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -186,4 +186,3 @@ if ($_GET['operation']) {
     OCP\JSON::error(array('cause' => 'Unknown operation'));
   }
 }
-?>
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index a891e2889f..ce79f8f878 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -103,4 +103,3 @@ $tmpl = new OCP\Template( 'gallery', 'index', 'user' );
 $tmpl->assign('root', $root, false);
 $tmpl->assign('tl', $tl, false);
 $tmpl->printPage();
-?>
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 093979834d..3bafdb5cf4 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -38,5 +38,3 @@ class OC_Gallery_Hooks_Handlers {
 		//TODO: implement this
 	}
 }
-
-?>
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
index ac3a383c97..f5e37cf1de 100644
--- a/apps/gallery/lib/images_utils.php
+++ b/apps/gallery/lib/images_utils.php
@@ -60,5 +60,3 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $
     imagedestroy($process);
     imagedestroy($myImage);
 }
-
-?>
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 17eb741a66..495c51ea9c 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -102,13 +102,12 @@ class ThumbnailsManager {
 	}
 	
 	public function delete($path) {
-		$thumbnail = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path;
-		if (file_exists($thumbnail)) {
-			unlink($thumbnail);
+		$thumbnail = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path;
+		if (file_exists($thumbnail)) {
+			unlink($thumbnail);
 		}
 	}
 	
 	private function __construct() {}
 
 }
-?>
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 5efe0d7a29..3ff06dfcbe 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -174,5 +174,3 @@ class TileStack extends TileBase {
 	private $tiles_array;
 	private $stack_name;
 }
-
-?>
diff --git a/apps/gallery/lib/tiles_test.php b/apps/gallery/lib/tiles_test.php
index 022a88f75c..02d567c628 100644
--- a/apps/gallery/lib/tiles_test.php
+++ b/apps/gallery/lib/tiles_test.php
@@ -83,5 +83,3 @@ if ($ts->getCount() != 0) {
 }
 
 echo $tl->get();
-
-?>
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 23abc57927..7f5cdb22c1 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -131,4 +131,3 @@ if($arguments['action']){
 			exit;
 	}
 }
-?>
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
index 3122c7e675..c2dbf27a00 100644
--- a/apps/media/ajax/autoupdate.php
+++ b/apps/media/ajax/autoupdate.php
@@ -35,4 +35,3 @@ $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true');
 OCP\Config::setUserValue(OCP\USER::getUser(),'media','autoupdate',(integer)$autoUpdate);
 
 OCP\JSON::success(array('data' => $autoUpdate));
-?>
diff --git a/apps/media/index.php b/apps/media/index.php
index fb51aa0b17..ae85abc8aa 100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -40,5 +40,3 @@ OCP\App::setActiveNavigationEntry( 'media_index' );
 
 $tmpl = new OCP\Template( 'media', 'music', 'user' );
 $tmpl->printPage();
-?>
- 
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index 255e6f468f..d35cca150b 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -419,5 +419,3 @@ class OC_MEDIA_AMPACHE{
 		echo('</root>');
 	}
 }
-
-?>
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index 598c08d32e..e65930f551 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -387,5 +387,3 @@ class OC_MEDIA_COLLECTION{
 		$query->execute(array($newPath,$oldPath));
 	}
 }
-
-?>
diff --git a/apps/media/settings.php b/apps/media/settings.php
index 227298fafe..53738f02f9 100644
--- a/apps/media/settings.php
+++ b/apps/media/settings.php
@@ -3,4 +3,3 @@
 $tmpl = new OCP\Template( 'media', 'settings');
 
 return $tmpl->fetchPage();
-?>
diff --git a/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php
index 9c48549fe6..3be8b0984d 100644
--- a/apps/remoteStorage/settings.php
+++ b/apps/remoteStorage/settings.php
@@ -4,4 +4,3 @@ require_once('lib_remoteStorage.php');
 $tmpl = new OCP\Template( 'remoteStorage', 'settings');
 
 return $tmpl->fetchPage();
-?>
diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php
index 9d314b59ce..366c400493 100644
--- a/apps/user_migrate/appinfo/app.php
+++ b/apps/user_migrate/appinfo/app.php
@@ -31,4 +31,3 @@ $entry = array(
 	'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ),
 	'name' => 'Import'
 );
-?>
diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php
index 5aaab64285..13fd31c47c 100644
--- a/apps/user_openid/phpmyid.php
+++ b/apps/user_openid/phpmyid.php
@@ -1705,4 +1705,3 @@ $run_mode = (isset($_REQUEST['openid_mode'])
 debug("Run mode: $run_mode at: " . time());
 debug($_REQUEST, 'Request params');
 call_user_func($run_mode . '_mode');
-?>
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index 392424795f..d25b95259e 100644
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -45,6 +45,3 @@ if(!OCP\User::userExists($USERNAME)){
 $IDENTITY=OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME;
 
 require_once 'phpmyid.php';
-
-
-?>
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index 6b64a7e286..e5b7f042d5 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -58,4 +58,3 @@ foreach($apps as $app) {
 	}
 }
 echo "]}";
-?>
diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
index cc15102bbc..e3e92fcfa1 100644
--- a/core/ajax/grouplist.php
+++ b/core/ajax/grouplist.php
@@ -45,5 +45,3 @@ foreach( OC_Group::getGroups() as $i ){
 }
 
 OC_JSON::encodedPrint($groups);
-
-?>
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index a6433b1964..2bd6b7ed63 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/userlist.php b/core/ajax/userlist.php
index c8168eaf46..85ca004ae6 100644
--- a/core/ajax/userlist.php
+++ b/core/ajax/userlist.php
@@ -44,5 +44,3 @@ foreach( OC_User::getUsers() as $i ){
 }
 
 OC_JSON::encodedPrint($users);
-
-?>
diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php
index 258bd50fca..78ec451fac 100644
--- a/core/ajax/validateuser.php
+++ b/core/ajax/validateuser.php
@@ -36,5 +36,3 @@ if(!isset($_SERVER['PHP_AUTH_USER'])){
 	        OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "false"));
 	}
 }
-
-?>
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index a58489228d..e69f8bb726 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 75def433d3..a41fa083c3 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 252b3d3454..3e5540cbc2 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/strings.php b/core/strings.php
index 8c3f64ef14..01ab386608 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/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index a013aea165..1af262fd7a 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -134,4 +134,3 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
 
     // }}}
 }
-?>
diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 8f4e1312eb..10255a3619 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -1360,4 +1360,3 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
 
     // }}}
 }
-?>
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 39d3fb6727..25927aff63 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -1332,5 +1332,3 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
 		$this->free();
     }
 }
-
-?>
diff --git a/lib/public/app.php b/lib/public/app.php
index 9e2108818b..38c51af9cd 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -158,6 +158,3 @@ class App {
 
 
 }
-
-
-?>
diff --git a/lib/public/config.php b/lib/public/config.php
index 9f5abe672c..ab01902ffe 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -134,5 +134,3 @@ class Config {
 
 
 }
-
-?>
diff --git a/lib/public/db.php b/lib/public/db.php
index f7564c0bb6..3a33f7674d 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -91,5 +91,3 @@ class DB {
 
 
 }
-
-?>
diff --git a/lib/public/files.php b/lib/public/files.php
index fc3004434b..32b3f03674 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -115,5 +115,3 @@ class Files {
 
 
 }
-
-?>
diff --git a/lib/public/json.php b/lib/public/json.php
index b6edbd65bd..1bc1e3ab4d 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -105,5 +105,3 @@ class JSON {
 	}
 
 }
-
-?>
diff --git a/lib/public/response.php b/lib/public/response.php
index cc2137c5ca..8dff3bcd35 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -105,5 +105,3 @@ class Response {
 
 
 }
-
-?>
diff --git a/lib/public/template.php b/lib/public/template.php
index b89088bdd0..a0ed618cb2 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -104,6 +104,3 @@ function html_select_options($options, $selected, $params=array()) {
 class Template extends \OC_Template {
 
 }
-
-
-?>
diff --git a/lib/public/user.php b/lib/public/user.php
index a0c069f737..713e366b96 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -120,6 +120,3 @@ class User {
 
 
 }
-
-
-?>
diff --git a/lib/public/util.php b/lib/public/util.php
index 4112109154..43f9e3cee5 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -321,5 +321,3 @@ class Util {
 		return(\OC_Helper::mb_str_replace($search, $replace, $subject, $encoding, $count));
 	}
 }
-
-?>
diff --git a/lib/setup.php b/lib/setup.php
index bad0f5301c..2f73c486c9 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -380,5 +380,3 @@ class OC_Setup {
 		file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', '');
 	}
 }
-
-?>
diff --git a/lib/updater.php b/lib/updater.php
index 5d97178c30..332cea03bf 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -84,4 +84,3 @@ class OC_Updater{
 
 	}
 }
-?>
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 4e73bb18d4..d15b7b166e 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -223,4 +223,3 @@ class OC_VCategories {
 	}
 
 }
-?>
diff --git a/ocs/providers.php b/ocs/providers.php
index adaa28db6c..f9cafd20b0 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -40,6 +40,3 @@ echo('
 </provider>
 </providers>
 ');
-
-
-?>
diff --git a/ocs/v1.php b/ocs/v1.php
index 77dd75b9fc..ab0dc80f4b 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -24,5 +24,3 @@
 require_once('../lib/base.php');
 @ob_clean();
 OC_OCS::handle();
-
-?>
diff --git a/search/ajax/search.php b/search/ajax/search.php
index 326724d60c..95ddfedf8b 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -35,5 +35,3 @@ if($query){
 }else{
 	echo 'false';
 }
-
-?>
diff --git a/search/index.php b/search/index.php
index 518695c56d..de55aec399 100644
--- a/search/index.php
+++ b/search/index.php
@@ -49,5 +49,3 @@ foreach($results as $result){
 $tmpl = new OC_Template( 'search', 'index', 'user' );
 $tmpl->assign('resultTypes',$resultTypes);
 $tmpl->printPage();
-
-?>
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 604298b1cf..4ba6813517 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -23,5 +23,3 @@ if( OC_User::setPassword( $username, $password )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
 }
-
-?>
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 3626600ad9..af8ad3dd8c 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -26,5 +26,3 @@ if( OC_Group::createGroup( $groupname )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to add group" )));
 }
-
-?>
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 079b4750b7..c56df4bc15 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -36,5 +36,3 @@ try {
 } catch (Exception $exception) {
 	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }
-
-?>
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 68f6b7933e..803a424854 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -15,5 +15,3 @@ if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMA
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
 }
-
-?>
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index 883cd52bfe..bf4ead0602 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -17,5 +17,3 @@ if( isset( $_POST['identity'] ) ){
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }
-
-?>
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 19cbe51fd5..f8c2065956 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -15,5 +15,3 @@ if( OC_Group::deleteGroup( $name )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to delete group" )));
 }
-
-?>
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 63388b3ca6..230815217c 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -15,5 +15,3 @@ if( OC_User::deleteUser( $username )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to delete user" )));
 }
-
-?>
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index 6b8c9274e6..54b103cd4f 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -22,5 +22,3 @@ if( isset( $_POST['lang'] ) ){
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }
-
-?>
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 44c2067824..2b412c0f2f 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -35,4 +35,3 @@ if($username){
 }
 OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
 
-?>
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index a7cdeb2cfb..95338ed026 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -38,5 +38,3 @@ if( $success ){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to $error group $group" )));
 }
-
-?>
diff --git a/settings/apps.php b/settings/apps.php
index f4ae8b8d97..762395c031 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -97,5 +97,3 @@ $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 $tmpl->assign('appid',$appid);
 
 $tmpl->printPage();
-
-?>
diff --git a/settings/help.php b/settings/help.php
index f0abed8f55..b1dc1c5be7 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -25,5 +25,3 @@ $tmpl->assign( "kbe", $kbe );
 $tmpl->assign( "pagecount", $pagecount );
 $tmpl->assign( "page", $page );
 $tmpl->printPage();
-
-?>
diff --git a/settings/personal.php b/settings/personal.php
index 26a9f601d9..d82db0d0e7 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -17,7 +17,7 @@ OC_App::setActiveNavigationEntry( 'personal' );
 
 // calculate the disc space
 $rootInfo=OC_FileCache::get('');
-$sharedInfo=OC_FileCache::get('/Shared');
+$sharedInfo=OC_FileCache::get('/Shared');
 $used=$rootInfo['size']-$sharedInfo['size'];
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
@@ -61,5 +61,3 @@ foreach($forms as $form){
 	$tmpl->append('forms',$form);
 }
 $tmpl->printPage();
-
-?>
diff --git a/settings/users.php b/settings/users.php
index 026a30a750..c3259d2a3f 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -48,6 +48,3 @@ $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->assign( 'share_notice', $shareNotice);
 $tmpl->printPage();
-
-?>
-
diff --git a/status.php b/status.php
index 2d31702ecb..f314a3a1c6 100644
--- a/status.php
+++ b/status.php
@@ -29,6 +29,3 @@ if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='fals
 $values=array('installed'=>$installed,'version'=>implode('.',OC_Util::getVersion()),'versionstring'=>OC_Util::getVersionString(),'edition'=>OC_Util::getEditionString());
 
 echo(json_encode($values));
-
-
-?>
diff --git a/webapps.php b/webapps.php
index b5fee9bf85..82e677a51c 100644
--- a/webapps.php
+++ b/webapps.php
@@ -52,5 +52,3 @@ if(!OC_User::login($authuser,$authpw)){
 
 
 }
-
-?>

From 43f00a2dc85b4d7ceba8e7a13941b0deb409b842 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 18:11:29 +0200
Subject: [PATCH 0880/1537] create uploads directory for ssl certificates if it
 didn't exists

---
 apps/files_external/ajax/addRootCertificate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index c5f49a82d3..d28a7d24b2 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -5,6 +5,7 @@ OCP\JSON::checkAppEnabled('files_external');
 $view = \OCP\Files::getStorage("files_external");
 $from = $_FILES['rootcert_import']['tmp_name'];
 $path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
+if(!file_exists($path)) mkdir($path,0700,true);
 $to = $path.$_FILES['rootcert_import']['name'];
 move_uploaded_file($from, $to);
 

From d0b625352cc8acc160e22cb2f4e9ae8e10f753f6 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 9 Jul 2012 21:51:19 +0200
Subject: [PATCH 0881/1537] some work on subadmins

---
 lib/group.php                |  13 +++++
 lib/subadmin.php             | 107 +++++++++++++++++++++++++++++++++++
 lib/util.php                 |  22 ++++++-
 settings/templates/users.php |  22 ++++++-
 settings/users.php           |  25 +++++---
 5 files changed, 178 insertions(+), 11 deletions(-)
 create mode 100644 lib/subadmin.php

diff --git a/lib/group.php b/lib/group.php
index ceee5fa4ed..fb280c157e 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -271,4 +271,17 @@ class OC_Group {
 		}
 		return $users;
 	}
+	
+	/**
+	 * @brief get a list of all users in several groups
+	 * @param array $gids
+	 * @returns array with user ids
+	 */
+	public static function usersInGroups($gids){
+		$users = array();
+		foreach($gids as $gid){
+			$users = array_merge(array_diff(self::usersInGroup($gid), $users), $users);
+		}
+		return $users;
+	}
 }
diff --git a/lib/subadmin.php b/lib/subadmin.php
new file mode 100644
index 0000000000..aad657b024
--- /dev/null
+++ b/lib/subadmin.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Georg Ehrke
+ * @copyright 2012 Georg Ehrke 
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class provides all methods needed for managing groups.
+ *
+ * Hooks provided:
+ *   post_createSubAdmin($gid)
+ *   post_deleteSubAdmin($gid)
+ */
+class OC_SubAdmin{
+
+	/**
+	 * @brief add a SubAdmin
+	 * @param $uid uid of the SubAdmin
+	 * @param $gid gid of the group
+	 * @return boolean
+	 */
+	public static function createSubAdmin($uid, $gid){
+		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*group_admin (gid,uid) VALUES(?,?)');
+		$result = $stmt->execute(array($gid, $uid));
+		if(OC_DB::isError($result)){
+			return false;
+		}
+		OC_Hook::emit( "OC_SubAdmin", "post_createSubAdmin", array( "gid" => $gid ));
+		return true;
+	}
+
+	/**
+	 * @brief delete a SubAdmin
+	 * @param $uid uid of the SubAdmin
+	 * @param $gid gid of the group
+	 * @return boolean
+	 */
+	public static function deleteSubAdmin($uid, $gid){
+		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE gid = ? AND uid = ?');
+		$result = $stmt->execute(array($gid, $uid));
+		if(OC_DB::isError($result)){
+			return false;
+		}
+		OC_Hook::emit( "OC_SubAdmin", "post_deleteSubAdmin", array( "gid" => $gid ));
+		return true;
+	}
+
+	/**
+	 * @brief get groups of a SubAdmin
+	 * @param $uid uid of the SubAdmin
+	 * @return array
+	 */
+	public static function getSubAdminsGroups($uid){
+		$stmt = OC_DB::prepare('SELECT gid FROM *PREFIX*group_admin WHERE uid = ?');
+		$result = $stmt->execute(array($gid, $uid));
+		$gids = array();
+		while($row = $result->fetchRow()){
+			$gids[] = $row['gid'];
+		}
+		return $gids;
+	}
+
+	/**
+	 * @brief get SubAdmins of a group
+	 * @param $gid gid of the group
+	 * @return array
+	 */
+	public static function getGroupsSubAdmins($gid){
+		$stmt = OC_DB::prepare('SELECT uid FROM *PREFIX*group_admin WHERE gid = ?');
+		$result = $stmt->execute(array($gid, $uid));
+		$uids = array();
+		while($row = $result->fetchRow()){
+			$uids[] = $row['uid'];
+		}
+		return $uids;
+	}
+	
+	/**
+	 * @brief get all SubAdmins
+	 * @return array
+	 */
+	public static function getAllSubAdmins(){
+		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*group_admin');
+		$result = $stmt->execute(array($gid, $uid));
+		$subadmins = array();
+		while($row = $result->fetchRow()){
+			$subadmins[] = $row;
+		}
+		return $subadmins;
+	}
+}
diff --git a/lib/util.php b/lib/util.php
index 2a7b8a922f..de9171edc8 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,80,1);
+		return array(4,81,2);
 	}
 
 	/**
@@ -320,6 +320,26 @@ class OC_Util {
 		}
 	}
 
+	/**
+	* Check if the user is a subadmin, redirects to home if not
+	* @return array $groups where the current user is subadmin
+	*/
+	public static function checkSubAdminUser(){
+		// Check if we are a user
+		self::checkLoggedIn();
+		if(OC_Group::inGroup(OC_User::getUser(),'admin')){
+			return OC_Group::getGroups();
+		}
+		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin WHERE uid = ?');
+		$result = $stmt->execute(array(OC_User::getUser()));
+		$result = $result->fetchRow();
+		if($result['count'] == 0){
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
+			exit();
+		}
+		return $groups;
+	}
+
 	/**
 	* Redirect to the user default page
 	*/
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 5511242456..b16aa1ae16 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -1,13 +1,14 @@
-<?php /**
+<?php
+/**
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
-
 $allGroups=array();
 foreach($_["groups"] as $group) {
 	$allGroups[]=$group['name'];
 }
+$_['subadmingroups'] = $_['groups'];
 ?>
 
 <div id="controls">
@@ -60,6 +61,9 @@ foreach($_["groups"] as $group) {
 			<th id='headerName'><?php echo $l->t('Name')?></th>
 			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
 			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerSubAdmins"><?php echo $l->t('SubAdmins'); ?></th>
+			<?php endif;?>
 			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
@@ -84,6 +88,20 @@ foreach($_["groups"] as $group) {
 					<?php endforeach;?>
 			</select>
 			</td>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<td class="subadmins"><select
+				data-username="<?php echo $user['name'] ;?>"
+				data-user-groups="<?php echo $user['groups'] ;?>"
+				data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin for ...')?>"
+				multiple="multiple">
+					<?php foreach($_["subadmingroups"] as $group): ?>
+					<option value="<?php echo $group['name'];?>">
+						<?php echo $group['name'];?>
+					</option>
+					<?php endforeach;?>
+			</select>
+			</td>
+			<?php endif;?>
 			<td class="quota">
 				<div class="quota-select-wrapper">
 					<select class='quota-user'>
diff --git a/settings/users.php b/settings/users.php
index 026a30a750..a6ce94bb5b 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -6,7 +6,7 @@
  */
 
 require_once('../lib/base.php');
-OC_Util::checkAdminUser();
+OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
@@ -17,11 +17,22 @@ OC_App::setActiveNavigationEntry( 'core_users' );
 $users = array();
 $groups = array();
 
-foreach( OC_User::getUsers() as $i ){
-	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Preferences::getValue($i,'files','quota','default'));
+$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
+if($isadmin){
+	$groups = OC_Group::getGroups();
+	$accessibleusers = OC_User::getUsers();
+	$subadmins = OC_SubAdmin::getAllSubAdmins();
+}else{
+	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessibleusers = OC_Group::usersInGroups($groups);
+	$subadmins = false;
 }
 
-foreach( OC_Group::getGroups() as $i ){
+foreach($accessibleusers as $i){
+	$users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),'quota'=>OC_Preferences::getValue($i,'files','quota','default'));
+}
+
+foreach( $groups as $i ){
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
@@ -44,10 +55,8 @@ if (\OC_App::isEnabled( "files_sharing" ) ) {
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
+$tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->assign( 'share_notice', $shareNotice);
-$tmpl->printPage();
-
-?>
-
+$tmpl->printPage();
\ No newline at end of file

From b97eb3a48fab0ca166d00c4f8c0499f96983256b Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 9 Jul 2012 23:48:06 +0200
Subject: [PATCH 0882/1537] fixing oc-1198

---
 apps/files_pdfviewer/js/pdfjs/viewer.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/files_pdfviewer/js/pdfjs/viewer.js b/apps/files_pdfviewer/js/pdfjs/viewer.js
index f49257d792..90dd1eef02 100644
--- a/apps/files_pdfviewer/js/pdfjs/viewer.js
+++ b/apps/files_pdfviewer/js/pdfjs/viewer.js
@@ -1432,7 +1432,7 @@ var DocumentOutlineView = function documentOutlineView(outline) {
         queue.push({parent: itemsDiv, items: item.items});
       }
 
-      levelData.parent.appendChild(div);
+//      levelData.parent.appendChild(div);
     }
   }
 };
@@ -1751,10 +1751,9 @@ function updateThumbViewArea() {
 }
 
 window.addEventListener('resize', function webViewerResize(evt) {
-  if (PDFView.initialized &&
+  if (PDFView.initialized && PDFView.active &&
       (document.getElementById('pageWidthOption').selected ||
-      document.getElementById('pageFitOption').selected ||
-      document.getElementById('pageAutoOption').selected))
+      document.getElementById('pageFitOption').selected ))
       PDFView.parseScale(document.getElementById('scaleSelect').value);
   updateViewarea();
 });
@@ -1788,8 +1787,8 @@ window.addEventListener('change', function webViewerChange(evt) {
   document.title = file.name;
 
   // URL does not reflect proper document location - hiding some icons.
-  document.getElementById('viewBookmark').setAttribute('hidden', 'true');
-  document.getElementById('download').setAttribute('hidden', 'true');
+//  document.getElementById('viewBookmark').setAttribute('hidden', 'true');
+//  document.getElementById('download').setAttribute('hidden', 'true');
 }, true);
 
 function selectScaleOption(value) {

From 50462903d6dd86f867947cbc1cdb5b65f72592ab Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 13:05:53 +0200
Subject: [PATCH 0883/1537] Revert "Delay fetching of carddata and set ETag and
 size instead."

This reverts commit f5c329af981f59f78c12648ea41c258f477f3e82.
---
 apps/contacts/lib/connector_sabre.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/connector_sabre.php
index b712d9eed2..c967e90660 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/connector_sabre.php
@@ -138,10 +138,8 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 		foreach($data as $i){
 			$cards[] = array(
 				'id' => $i['id'],
-				//'carddata' => $i['carddata'],
+				'carddata' => $i['carddata'],
 				'uri' => $i['uri'],
-				'size' => strlen($i['carddata']),
-				'etag' => md5($i['carddata']),
 				'lastmodified' => $i['lastmodified'] );
 		}
 

From 7cb74a0bf34494d93a3139992668eaa112a6b825 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 19:09:46 +0200
Subject: [PATCH 0884/1537] Reduce variables assigned.

---
 apps/contacts/index.php           | 19 ++++---------------
 apps/contacts/templates/index.php |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index a89ffffa9c..70d594e71b 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -14,28 +14,18 @@ OCP\App::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$contacts = OC_Contacts_VCard::all($ids);
+$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 ? true : false); // just to check if there are any contacts.
 if($contacts === false) {
 	OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG);
 }
-
-$addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+error_log('activeIds: '.print_r($activeIds, true));
+error_log('has_contacts: '.$has_contacts);
 
 // Load the files we need
 OCP\App::setActiveNavigationEntry( 'contacts_index' );
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-$details = array();
-
-if(is_null($id) && count($contacts) > 0) {
-	$id = $contacts[0]['id'];
-}
-unset($contacts);
-if(!is_null($id)) {
-	$vcard = OC_Contacts_App::getContactVCard($id);
-	$details = OC_Contacts_VCard::structureContact($vcard);
-}
 $property_types = OC_Contacts_App::getAddPropertyOptions();
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
@@ -69,7 +59,6 @@ $tmpl->assign('property_types', $property_types);
 $tmpl->assign('phone_types', $phone_types);
 $tmpl->assign('email_types', $email_types);
 $tmpl->assign('categories', $categories);
-$tmpl->assign('addressbooks', $addressbooks);
-$tmpl->assign('details', $details );
+$tmpl->assign('has_contacts',$has_contacts);
 $tmpl->assign('id',$id);
 $tmpl->printPage();
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index a8fb6c57c2..5b49b68e95 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -16,7 +16,7 @@
 </div>
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
 	<?php
-		if ($_['id']){
+		if($_['has_contacts']){
 			echo $this->inc('part.contact');
 		}
 		else{

From 0744e5a17285043b83ef1085d67973e698d14030 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 19:10:34 +0200
Subject: [PATCH 0885/1537] Look for the right field :-P

---
 apps/contacts/lib/addressbook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 7549464f46..a31ee25461 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -83,7 +83,7 @@ class OC_Contacts_Addressbook{
 		$activeaddressbooks = self::all($uid, true);
 		$ids = array();
 		foreach($activeaddressbooks as $addressbook) {
-			$ids[] = $addressbook['userid'];
+			$ids[] = $addressbook['id'];
 		}
 		return $ids;
 	}

From 861c37925598a9bf5c5ae255b7b781c8b1e5b477 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 19:32:37 +0200
Subject: [PATCH 0886/1537] Make sure the proper DOM is loaded and the right
 address book gets expanded.

---
 apps/contacts/js/contacts.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 3005126b71..dd194db016 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -316,7 +316,7 @@ Contacts={
 						$('#contacts li[data-id="'+newid+'"]').addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
-								$('#contacts h3[data-id="'+bookid+'"]').trigger('click');
+								$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
 								Contacts.UI.Card.loadContact(jsondata.data, bookid);
 							} else {
 								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -326,7 +326,8 @@ Contacts={
 				}
 				
 				// Make sure proper DOM is loaded.
-				if(!$('#card')[0] && newid) {
+				if(!$('#card').length && newid) {
+					console.log('Loading card DOM');
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
 						if(jsondata.status == 'success'){
 							$('#rightcontent').html(jsondata.data.page).ready(function() {
@@ -339,6 +340,7 @@ Contacts={
 					});
 				}
 				else if(!newid) {
+					console.log('Loading intro');
 					// load intro page
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
 						if(jsondata.status == 'success'){
@@ -370,6 +372,7 @@ Contacts={
 				return $('<li data-id="'+data.id+'" data-bookid="'+data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+data.id+') no-repeat scroll 0% 0% transparent;">'+data.displayname+'</a></li>');
 			},
 			add:function(n, fn, aid, isnew){ // add a new contact
+				console.log('Adding ' + fn);
 				aid = aid?aid:$('#contacts h3.active').first().data('id');
 				var localAddcontact = function(n, fn, aid, isnew) {
 					$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
@@ -413,8 +416,8 @@ Contacts={
 					});
 				}
 			
-				var card = $('#card')[0];
-				if(!card) {
+				if(!$('#card').length) {
+					console.log('Loading card DOM');
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
 						if(jsondata.status == 'success'){
 							$('#rightcontent').html(jsondata.data.page).ready(function() {
@@ -1604,10 +1607,10 @@ Contacts={
 								firstrun = true;
 								
 								if($('#contacts h3').length == 0) {
-									$('#contacts').html('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts" data-id="'+b+'"></ul>');
+									$('#contacts').html('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
 								} else {
 									if(!$('#contacts h3[data-id="'+b+'"]').length) {
-										$('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts" data-id="'+b+'"></ul>')
+										$('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
 										.appendTo('#contacts');
 									}
 								}

From 34ac2ea1ba7f05b34ae3070cf4ec0a211692c05a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jul 2012 19:34:10 +0200
Subject: [PATCH 0887/1537] Don't escape assigned values.

---
 apps/contacts/index.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 70d594e71b..c1e33252f5 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -18,8 +18,6 @@ $has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 ? true : false);
 if($contacts === false) {
 	OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG);
 }
-error_log('activeIds: '.print_r($activeIds, true));
-error_log('has_contacts: '.$has_contacts);
 
 // Load the files we need
 OCP\App::setActiveNavigationEntry( 'contacts_index' );
@@ -53,12 +51,12 @@ OCP\Util::addStyle('contacts','jquery.Jcrop');
 OCP\Util::addStyle('contacts','contacts');
 
 $tmpl = new OCP\Template( "contacts", "index", "user" );
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('property_types', $property_types);
-$tmpl->assign('phone_types', $phone_types);
-$tmpl->assign('email_types', $email_types);
-$tmpl->assign('categories', $categories);
-$tmpl->assign('has_contacts',$has_contacts);
-$tmpl->assign('id',$id);
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize, false);
+$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize), false);
+$tmpl->assign('property_types', $property_types, false);
+$tmpl->assign('phone_types', $phone_types, false);
+$tmpl->assign('email_types', $email_types, false);
+$tmpl->assign('categories', $categories, false);
+$tmpl->assign('has_contacts', $has_contacts, false);
+$tmpl->assign('id',$id, false);
 $tmpl->printPage();

From 9d2cbc88f00173543cdefcf30c1d0f1498d95798 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 10 Jul 2012 01:23:29 +0200
Subject: [PATCH 0888/1537] Revert reversion of
 f5c329af981f59f78c12648ea41c258f477f3e82 :-P

---
 apps/contacts/lib/connector_sabre.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/connector_sabre.php
index c967e90660..99b94fc767 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/connector_sabre.php
@@ -138,7 +138,9 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 		foreach($data as $i){
 			$cards[] = array(
 				'id' => $i['id'],
-				'carddata' => $i['carddata'],
+				//'carddata' => $i['carddata'],
+				'size' => strlen($i['carddata']),
+				'etag' => md5($i['carddata']),
 				'uri' => $i['uri'],
 				'lastmodified' => $i['lastmodified'] );
 		}

From 528567ae4e589606325465356819db9dfbadab0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 10 Jul 2012 12:27:12 +0200
Subject: [PATCH 0889/1537] gitignore phpStorm .idea metadata folder

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index e2ff07d14d..ae63693170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,9 @@ RCS/*
 # netbeans 
 nbproject
 
+# phpStorm
+.idea
+
 # geany
 *.geany
 

From 91da4b05b72b118ad9f6ffb7f24fbe1aa5bc20fe Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 10 Jul 2012 15:51:57 +0100
Subject: [PATCH 0890/1537] fixed typos

---
 apps/files_encryption/js/settings.js         | 4 ++--
 apps/files_encryption/templates/settings.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 37d62265c9..8cc433246c 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -17,8 +17,8 @@ $(document).ready(function(){
 		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
 	}
 
-	$('#enbale_encryption').change(function(){
-		var checked=$('#enbale_encryption').is(':checked');
+	$('#enable_encryption').change(function(){
+		var checked=$('#enable_encryption').is(':checked');
 		OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false');
 	})
 })
\ No newline at end of file
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 25b5a06f56..79780d694c 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -7,6 +7,6 @@
 				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
 			<?php endforeach;?>
 		</select>
-		<input type='checkbox' id='enbale_encryption' <?php if($_['encryption_enabled']){echo 'checked="checked"';} ?>></input><label for='enbale_encryption'><?php echo $l->t('Enable Encryption')?></label>
+		<input type='checkbox' id='enable_encryption' <?php if($_['encryption_enabled']){echo 'checked="checked"';} ?>></input><label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
 	</fieldset>
 </form>

From 3e53bf4a868405d1d5ef8ba0ecc07ecf5ebb3a59 Mon Sep 17 00:00:00 2001
From: Johannes Willnecker <johannes@willnecker.com>
Date: Thu, 5 Jul 2012 21:09:48 +0200
Subject: [PATCH 0891/1537] Fix for oc-972, oc-1144 and oc-1191

---
 apps/gallery/lib/managers.php |  38 ++++++++++---
 lib/image.php                 | 102 +++++++++++++++++++++++++++-------
 2 files changed, 112 insertions(+), 28 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 495c51ea9c..94e7565832 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -25,6 +25,15 @@ class DatabaseManager {
 		}
 	}
 
+	public function setFileData($path, $width, $height) {
+		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
+		$stmt->execute(array(\OCP\USER::getUser(), $path, $width, $height));
+		$ret = array('path' => $path, 'width' => $width, 'height' => $height);
+		unset($image);
+		$this->cache[$dir][$path] = $ret;
+		return $ret;
+	}
+
 	public function getFileData($path) {
 		$gallery_path = \OCP\Config::getSystemValue( 'datadirectory' ).'/'.\OC_User::getUser().'/gallery';
 		$path = $gallery_path.$path;
@@ -39,9 +48,7 @@ class DatabaseManager {
 		if (!$image->loadFromFile($path)) {
 			return false;
 		}
-		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
-		$stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
-		$ret = array('path' => $path, 'width' => $image->width(), 'height' => $image->height());
+		$ret = $this->setFileData($path, $image->width(), $image->height());
 		unset($image);
 		$this->cache[$dir][$path] = $ret;
 		return $ret;
@@ -76,7 +83,7 @@ class ThumbnailsManager {
 
 		$image->fixOrientation();
 
-		$ret = $image->preciseResize(floor((150*$image->width())/$image->height()), 150);
+		$ret = $image->preciseResize($this->getThumbnailWidth($image), $this->getThumbnailHeight($image));
 		
 		if (!$ret) {
 			\OC_Log::write(self::TAG, 'Couldn\'t resize image', \OC_Log::ERROR);
@@ -87,13 +94,28 @@ class ThumbnailsManager {
 		$image->save($gallery_path.'/'.$path);
 		return $image;
 	}
-	
+
+	public function getThumbnailWidth($image) {
+		return floor((150*$image->widthTopLeft())/$image->heightTopLeft());
+	}
+
+	public function getThumbnailHeight($image) {
+		return 150;
+	}
+
 	public function getThumbnailInfo($path) {
 		$arr = DatabaseManager::getInstance()->getFileData($path);
 		if (!$arr) {
-			$thubnail = $this->getThumbnail($path);
-			unset($thubnail);
-			$arr = DatabaseManager::getInstance()->getFileData($path);
+			if (!\OC_Filesystem::file_exists($path)) {
+				\OC_Log::write(self::TAG, 'File '.$path.' don\'t exists', \OC_Log::WARN);
+				return false;
+			}
+			$image = new \OC_Image();
+			$image->loadFromFile(\OC_Filesystem::getLocalFile($path));
+			if (!$image->valid()) {
+				return false;
+			}
+			$arr = DatabaseManager::getInstance()->setFileData($path, $this->getThumbnailWidth($image), $this->getThumbnailHeight($image));
 		}
 		$ret = array('filepath' => $arr['path'],
 					 'width' => $arr['width'],
diff --git a/lib/image.php b/lib/image.php
index e5c59bacdc..1d4d63707f 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -107,6 +107,56 @@ class OC_Image {
 		return $this->valid() ? imagesy($this->resource) : -1;
 	}
 
+	/**
+	* @brief Returns the width when the image orientation is top-left.
+	* @returns int
+	*/
+	public function widthTopLeft() {
+		$o = $this->getOrientation();
+		OC_Log::write('core','OC_Image->widthTopLeft() Orientation: '.$o, OC_Log::DEBUG);
+		switch($o) {
+			case -1:
+			case 1:
+			case 2: // Not tested
+			case 3:
+			case 4: // Not tested
+				return $this->width();
+				break;
+			case 5: // Not tested
+			case 6:
+			case 7: // Not tested
+			case 8:
+				return $this->height();
+				break;
+		}
+		return $this->width();
+	}
+
+	/**
+	* @brief Returns the height when the image orientation is top-left.
+	* @returns int
+	*/
+	public function heightTopLeft() {
+		$o = $this->getOrientation();
+		OC_Log::write('core','OC_Image->heightTopLeft() Orientation: '.$o, OC_Log::DEBUG);
+		switch($o) {
+			case -1:
+			case 1:
+			case 2: // Not tested
+			case 3:
+			case 4: // Not tested
+				return $this->height();
+				break;
+			case 5: // Not tested
+			case 6:
+			case 7: // Not tested
+			case 8:
+				return $this->width();
+				break;
+		}
+		return $this->height();
+	}
+
 	/**
 	* @brief Outputs the image.
 	* @returns bool
@@ -207,36 +257,48 @@ class OC_Image {
 		return base64_encode($this->data());
 	}
 
+	/**
+	* (I'm open for suggestions on better method name ;)
+	* @brief Get the orientation based on EXIF data.
+	* @returns The orientation or -1 if no EXIF data is available.
+	*/
+	public function getOrientation() {
+		if(!is_callable('exif_read_data')){
+			OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
+			return -1;
+		}
+		if(!$this->valid()) {
+			OC_Log::write('core','OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
+			return -1;
+		}
+		if(is_null($this->filepath) || !is_readable($this->filepath)) {
+			OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
+			return -1;
+		}
+		$exif = @exif_read_data($this->filepath, 'IFD0');
+		if(!$exif) {
+			return -1;
+		}
+		if(!isset($exif['Orientation'])) {
+			return -1;
+		}
+		return $exif['Orientation'];
+	}
+
 	/**
 	* (I'm open for suggestions on better method name ;)
 	* @brief Fixes orientation based on EXIF data.
 	* @returns bool.
 	*/
 	public function fixOrientation() {
-		if(!is_callable('exif_read_data')){
-			OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
-			return false;
-		}
-		if(!$this->valid()) {
-			OC_Log::write('core','OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
-			return false;
-		}
-		if(is_null($this->filepath) || !is_readable($this->filepath)) {
-			OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
-			return false;
-		}
-		$exif = @exif_read_data($this->filepath, 'IFD0');
-		if(!$exif) {
-			return false;
-		}
-		if(!isset($exif['Orientation'])) {
-			return true; // Nothing to fix
-		}
-		$o = $exif['Orientation'];
+		$o = $this->getOrienation();
 		OC_Log::write('core','OC_Image->fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
 		$rotate = 0;
 		$flip = false;
 		switch($o) {
+			case -1:
+				return false; //Nothing to fix
+				break;
 			case 1:
 				$rotate = 0;
 				$flip = false;

From 570ea787f1520b74165c9974bb79526ba28a8c9a Mon Sep 17 00:00:00 2001
From: Johannes Willnecker <johannes@willnecker.com>
Date: Thu, 5 Jul 2012 21:35:36 +0200
Subject: [PATCH 0892/1537] fixed typo

---
 lib/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/image.php b/lib/image.php
index 1d4d63707f..01e843d831 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -291,7 +291,7 @@ class OC_Image {
 	* @returns bool.
 	*/
 	public function fixOrientation() {
-		$o = $this->getOrienation();
+		$o = $this->getOrientation();
 		OC_Log::write('core','OC_Image->fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
 		$rotate = 0;
 		$flip = false;

From 02c9b03b8e29303090e159160b011bdac1dc4d51 Mon Sep 17 00:00:00 2001
From: Johannes Willnecker <johannes@willnecker.com>
Date: Thu, 5 Jul 2012 21:42:39 +0200
Subject: [PATCH 0893/1537] Missing dir added.

---
 apps/gallery/lib/managers.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 94e7565832..9ed1938742 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -30,6 +30,7 @@ class DatabaseManager {
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $width, $height));
 		$ret = array('path' => $path, 'width' => $width, 'height' => $height);
 		unset($image);
+		$dir = dirname($path);
 		$this->cache[$dir][$path] = $ret;
 		return $ret;
 	}

From acb96123326460316290257cb05553f6a284ba04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 10 Jul 2012 16:53:09 +0200
Subject: [PATCH 0894/1537] fix thumbnail size calculation, use const for
 THUMBNAIL_HEIGHT

---
 apps/gallery/lib/managers.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 9ed1938742..3b6f754fc2 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -2,7 +2,7 @@
 
 namespace OC\Pictures;
 
-class DatabaseManager {
+class DatabaseManager {        
 	private static $instance = null;
 	protected $cache = array();
 	const TAG = 'DatabaseManager';
@@ -62,6 +62,7 @@ class ThumbnailsManager {
 	
 	private static $instance = null;
 	const TAG = 'ThumbnailManager';
+        const THUMBNAIL_HEIGHT = 150;
 	
 	public static function getInstance() {
 		if (self::$instance === null)
@@ -81,27 +82,23 @@ class ThumbnailsManager {
 		$image = new \OC_Image();
 		$image->loadFromFile(\OC_Filesystem::getLocalFile($path));
 		if (!$image->valid()) return false;
-
+                            
 		$image->fixOrientation();
-
-		$ret = $image->preciseResize($this->getThumbnailWidth($image), $this->getThumbnailHeight($image));
+                
+		$ret = $image->preciseResize( floor((self::THUMBNAIL_HEIGHT*$image->width())/$image->height()), self::THUMBNAIL_HEIGHT );
 		
 		if (!$ret) {
 			\OC_Log::write(self::TAG, 'Couldn\'t resize image', \OC_Log::ERROR);
 			unset($image);
 			return false;
 		}
-
+                
 		$image->save($gallery_path.'/'.$path);
 		return $image;
 	}
 
 	public function getThumbnailWidth($image) {
-		return floor((150*$image->widthTopLeft())/$image->heightTopLeft());
-	}
-
-	public function getThumbnailHeight($image) {
-		return 150;
+		return floor((self::THUMBNAIL_HEIGHT*$image->widthTopLeft())/$image->heightTopLeft());
 	}
 
 	public function getThumbnailInfo($path) {
@@ -116,7 +113,7 @@ class ThumbnailsManager {
 			if (!$image->valid()) {
 				return false;
 			}
-			$arr = DatabaseManager::getInstance()->setFileData($path, $this->getThumbnailWidth($image), $this->getThumbnailHeight($image));
+			$arr = DatabaseManager::getInstance()->setFileData($path, $this->getThumbnailWidth($image), self::THUMBNAIL_HEIGHT);
 		}
 		$ret = array('filepath' => $arr['path'],
 					 'width' => $arr['width'],

From 9be6432aac30f6f34f74c343eb764a03c9adad5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 10 Jul 2012 16:57:31 +0200
Subject: [PATCH 0895/1537] shrink css height for gallery_div from 152 to 150
 to shrink grey background thumbnail height

---
 apps/gallery/css/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index fa87e51c85..63f645662d 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -5,7 +5,7 @@ input[type=button]:disabled { opacity: 0.5 }
 .ui-dialog tr {background-color: #eee;}
 .ui-dialog input {width: 90%;}
 
-div.gallery_div {position:relative; display: inline-block; height: 152px; width: 150px; margin: 5px;}
+div.gallery_div {position:relative; display: inline-block; height: 150px; width: 150px; margin: 5px;}
 div.miniature_border {position:absolute; height: 150px; -moz-transition-duration: 0.2s; -o-transition-duration:0.2s;  -webkit-transition-duration: .2s; background-position: 50%;}
 div.line {display:inline-block; border: 0; width: auto; height: 160px}
 div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}

From bf09bcc8542cae436a3d712032ae51725f3d929c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 10 Jul 2012 11:54:41 +0200
Subject: [PATCH 0896/1537] add OCP\Files to access files

---
 apps/files_versions/lib/versions.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 4f0ee2c6d5..723c27577a 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -239,10 +239,9 @@ class Storage {
 				$versions[$i]['version'] = ( end( $parts ) );
 				
 				// if file with modified date exists, flag it in array as currently enabled version
-				$curFile['fileName'] = basename( $parts[0] );
-				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
-				
-				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
+				$files_view = \OCP\Files::getStorage('files');
+				$local_file = $files_view->getLocalFile($filename);
+				( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
 				
 			}
 			

From e7a0c4f0bb73cb6540678e8174c448fdaf5c299d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 10 Jul 2012 16:41:20 +0200
Subject: [PATCH 0897/1537] use readfile() instead iof fopen() for file
 download over webdav. fopen() didn't work for large files on some servers
 while readfile() seems to work for all files on all configurations.

---
 lib/connector/sabre/file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index dd25df78c2..e4dc8c9344 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -42,7 +42,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function get() {
 
-		return OC_Filesystem::fopen($this->path,'r');
+		return OC_Filesystem::readfile($this->path);
 
 	}
 

From 7c908a0016db30c70271304c4d080383911645e3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 18:56:22 -0400
Subject: [PATCH 0898/1537] Sharing files working using share API

---
 apps/files_sharing/appinfo/app.php      |   4 +-
 apps/files_sharing/lib/share/file.php   |  94 ++++++++++++
 apps/files_sharing/lib/share/folder.php |  64 ++++++++
 apps/files_sharing/sharedstorage.php    | 193 +++++-------------------
 core/js/share.js                        |  18 ++-
 lib/filecache.php                       |   8 +
 lib/files.php                           |  34 +++--
 lib/public/share.php                    | 102 ++++++-------
 8 files changed, 288 insertions(+), 229 deletions(-)
 create mode 100644 apps/files_sharing/lib/share/file.php
 create mode 100644 apps/files_sharing/lib/share/folder.php

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index a08544909b..7495a5bbe6 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,7 +1,8 @@
 <?php
 
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
-OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/share.php";
+OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
+OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
 OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/sharedstorage.php";
 
 OCP\App::registerAdmin('files_sharing', 'settings');
@@ -24,3 +25,4 @@ OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
 OCP\Util::addStyle( 'files_sharing', 'sharing' );
 OCP\Util::addStyle("3rdparty", "chosen/chosen");
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
+OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
new file mode 100644
index 0000000000..86b82b19ac
--- /dev/null
+++ b/apps/files_sharing/lib/share/file.php
@@ -0,0 +1,94 @@
+<?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/>.
+*/
+
+class OC_Share_Backend_File extends OCP\Share_Backend {
+
+	const FORMAT_SOURCE_PATH = 0;
+	const FORMAT_FILE_APP = 1;
+	const FORMAT_FILE_APP_ROOT = 2;
+	const FORMAT_OPENDIR = 3;
+
+	public function getSource($item, $uid) {
+		if (OC_Filesystem::file_exists($item)) {
+			return array('item' => null, 'file' => $item);
+		}
+		return false;
+	}
+
+	public function generateTarget($item, $uid, $exclude = null) {
+		// TODO Make sure target path doesn't exist already
+		return '/Shared'.$item;
+	}
+
+	public function formatItems($items, $format, $parameters = null) {
+		if ($format == self::FORMAT_OPENDIR) {
+			$files = array();
+			foreach ($items as $file) {
+				$files[] = basename($file['file_target']);
+			}
+			return $files;
+		} else {
+			$shares = array();
+			$ids = array();
+			foreach ($items as $item) {
+				$shares[$item['file_source']] = $item;
+				$ids[] = $item['file_source'];
+			}
+			$ids = "'".implode("','", $ids)."'";
+			if ($format == self::FORMAT_SOURCE_PATH) {
+				$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
+				$result = $query->execute()->fetchAll();
+				if (isset($result[0]['path'])) {
+					return $result[0]['path'];
+				}
+				return false;
+			} else if ($format == self::FORMAT_FILE_APP) {
+				$query = OCP\DB::prepare('SELECT id, path, name, ctime, mtime, mimetype, size, encrypted, versioned, writable FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
+				$result = $query->execute();
+				$files = array();
+				while ($file = $result->fetchRow()) {
+					// Set target path
+					$file['path'] = $shares[$file['id']]['file_target'];
+					$file['name'] = basename($file['path']);
+					// TODO Set permissions: $file['writable']
+					$files[] = $file;
+				}
+				return $files;
+			} else if ($format == self::FORMAT_FILE_APP_ROOT) {
+				$query = OCP\DB::prepare('SELECT id, path, name, ctime, mtime, mimetype, size, encrypted, versioned, writable FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
+				$result = $query->execute();
+				$mtime = 0;
+				$size = 0;
+				while ($file = $result->fetchRow()) {
+					if ($file['mtime'] > $mtime) {
+						$mtime = $file['mtime'];
+					}
+					$size += $file['size'];
+				}
+				return array(0 => array('name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false));
+			}
+		}
+		return array();
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
new file mode 100644
index 0000000000..033e2ba966
--- /dev/null
+++ b/apps/files_sharing/lib/share/folder.php
@@ -0,0 +1,64 @@
+<?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/>.
+*/
+
+class OC_Share_Backend_Folder extends OC_Share_Backend_File {
+
+	public function inCollection($collections, $item) {
+		// TODO
+	}
+
+	public function getChildrenSources($item) {
+		return OC_FileCache::getFolderContent($item);
+	}
+
+	public function formatItems($items, $format, $parameters = null) {
+		if ($format == self::FORMAT_FILE_APP && isset($parameters['folder'])) {
+			$folder = $items[key($items)];
+			$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id = ?');
+			$result = $query->execute(array($folder['file_source']))->fetchRow();
+			if (isset($result['path'])) {
+				if (isset($parameters['mimetype_filter'])) {
+					$mimetype_filter = $parameters['mimetype_filter'];
+				} else {
+					$mimetype_filter = '';
+				}
+				$pos = strpos($result['path'], $folder['item']);
+				$path = substr($result['path'], $pos).substr($parameters['folder'], strlen($folder['file_target']));
+				$root = substr($result['path'], 0, $pos);
+				return OC_FileCache::getFolderContent($path, $root, $mimetype_filter);
+			}
+		}/* else if ($format == self::FORMAT_OPENDIR_ROOT) {
+			$query = OCP\DB::prepare('SELECT name FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
+			$result = $query->execute();
+			$files = array();
+			while ($file = $result->fetchRow()) {
+				// Set target path
+				$files[] = basename($shares[$file['id']]['item_target']);
+			}
+			return $files;
+		}*/
+		return array();
+	}
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 11a5d39f01..1dfdf13379 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -32,30 +32,25 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$this->sharedFolder = $arguments['sharedFolder'];
 	}
 
-	public function getSourcePath($target) {
-		$target = $this->sharedFolder.$target;
+	private function getSourcePath($target) {
+		$target = $this->sharedFolder.'/'.$target;
+		$target = rtrim($target, '/');
 		if (isset($this->sourcePaths[$target])) {
 			return $this->sourcePaths[$target];
 		} else {
-			if (dirname($target) != $this->sharedFolder) {
-				$len = strlen($this->sharedFolder);
-				$pos = strpos($target, '/', $len);
-				// Get shared folder name
-				$itemTarget = substr($target, $len, $pos);
-				$insideFolder = true;
+			$pos = strpos($target, '/', 8);
+			// Get shared folder name
+			if ($pos !== false) {
+				$itemTarget = substr($target, 0, $pos);
 			} else {
 				$itemTarget = $target;
-				$insideFolder = false;
 			}
 			$sourcePath = OCP\Share::getItemSharedWith('file', $itemTarget, OC_Share_Backend_File::FORMAT_SOURCE_PATH);
 			if ($sourcePath) {
-				if ($insideFolder) {
-					$this->sourcePaths[$target] = $sourcePath.substr($target, $pos);
-				} else {
-					$this->sourcePaths[$target] = $sourcePath;
-				}
+				$this->sourcePaths[$target] = $sourcePath.substr($target, strlen($itemTarget));
 				return $this->sourcePaths[$target];
 			}
+			OCP\Util::writeLog('files_sharing', 'File source path not found for: '.$target, OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -70,8 +65,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if ($path == "" || $path == "/" || !$this->is_writable($path)) {
 			return false; 
 		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
+			if ($source = $this->getSourcePath($path)) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->mkdir($this->getInternalPath($source));
 			}
@@ -80,116 +74,54 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function rmdir($path) {
 		// The folder will be removed from the database, but won't be deleted from the owner's filesystem
-		OC_Share::unshareFromMySelf($this->datadir.$path);
-		$this->clearFolderSizeCache($path);
+		// TODO
 	}
 	
 	public function opendir($path) {
-		if ($path == "" || $path == "/") {
-			$path = $this->datadir.$path;
-			// TODO
-			$sharedItems = OC_Share::getItemsInFolder($path);
-			$files = array();
-			foreach ($sharedItems as $item) {
-				// If item is in the root of the shared storage provider and the item exists add it to the fakedirs
-				if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
-					$files[] = basename($item['target']);
-				}
-			}
-			OC_FakeDirStream::$dirs['shared']=$files;
+		if ($path == '' || $path == '/') {
+			$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_Folder::FORMAT_OPENDIR);
+			OC_FakeDirStream::$dirs['shared'] = $files;
 			return opendir('fakedir://shared');
 		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
+			if ($source = $this->getSourcePath($path)) {
 				$storage = OC_Filesystem::getStorage($source);
-				$dh = $storage->opendir($this->getInternalPath($source));
-				$modifiedItems = OC_Share::getItemsInFolder($source);
-				if ($modifiedItems && $dh) {
-					$sources = array();
-					$targets = array();
-					// Remove any duplicate or trailing '/'
-					$path = preg_replace('{(/)\1+}', "/", $path);
-					$targetFolder = rtrim($this->datadir.$path, "/");
-					foreach ($modifiedItems as $item) {
-						// If the item is in the current directory and the item exists add it to the arrays
-						if (dirname($item['target']) == $targetFolder && $this->file_exists($path."/".basename($item['target']))) {
-							// If the item was unshared from self, add it it to the arrays
-							if ($item['permissions'] == OC_Share::UNSHARED) {
-								$sources[] = basename($item['source']);
-								$targets[] = "";
-							} else {
-								$sources[] = basename($item['source']);
-								$targets[] = basename($item['target']);
-							}
-						}
-					}
-					// Don't waste time if there aren't any modified items in the current directory
-					if (empty($sources)) {
-						return $dh;
-					} else {
-						global $FAKEDIRS;
-						$files = array();
-						while (($filename = readdir($dh)) !== false) {
-							if ($filename != "." && $filename != "..") {
-								// If the file isn't in the sources array it isn't modified and can be added as is
-								if (!in_array($filename, $sources)) {
-									$files[] = $filename;
-								// The file has a different name than the source and is added to the fakedirs
-								} else {
-									$target = $targets[array_search($filename, $sources)];
-									// Don't add the file if it was unshared from self by the user
-									if ($target != "") {
-										$files[] = $target;
-									}
-								}
-							}
-						}
-						$FAKEDIRS['shared'] = $files;
-						return opendir('fakedir://shared');
-					}
-				} else {
-					return $dh;
-				}
+				return $storage->opendir($this->getInternalPath($source));
 			}
 		}
 	}
-	
+
 	public function is_dir($path) {
-		if ($path == "" || $path == "/") {
+		if ($path == '' || $path == '/') {
 			return true;
 		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
+			if ($source = $this->getSourcePath($path)) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->is_dir($this->getInternalPath($source));
 			}
 		}
 	}
-	
+
 	public function is_file($path) {
-		$source = $this->getSourcePath($path);
-		if ($source) {
+		if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->is_file($this->getInternalPath($source));
 		}
 	}
-	
-	// TODO fill in other components of array
+
 	public function stat($path) {
-		if ($path == "" || $path == "/") {
-			$stat["size"] = $this->filesize($path);
-			$stat["mtime"] = $this->filemtime($path);
-			$stat["ctime"] = $this->filectime($path);
+		if ($path == '' || $path == '/') {
+			$stat['size'] = $this->filesize($path);
+			$stat['mtime'] = $this->filemtime($path);
+			$stat['ctime'] = $this->filectime($path);
 			return $stat;
 		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
+			if ($source = $this->getSourcePath($path)) {
 				$storage = OC_Filesystem::getStorage($source);
 				return $storage->stat($this->getInternalPath($source));
 			}
 		}
 	}
-	
+
 	public function filetype($path) {
 		if ($path == "" || $path == "/") {
 			return "dir";
@@ -202,7 +134,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 
 	}
-	
+
 	public function filesize($path) {
 		if ($path == "" || $path == "/" || $this->is_dir($path)) {
 			return $this->getFolderSize($path);
@@ -215,55 +147,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 
-	public function getFolderSize($path) {
-		return 0; //depricated
-	}
-	
-	private function calculateFolderSize($path) {
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$size = 0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if ($filename != "." && $filename != "..") {
-					$subFile = $path."/".$filename;
-					if ($this->is_file($subFile)) {
-						$size += $this->filesize($subFile);
-					} else {
-						$size += $this->getFolderSize($subFile);
-					}
-				}
-			}
-			if ($size > 0) {
-				$dbpath = rtrim($this->datadir.$path, "/");
-// 				$query = OCP\DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-// 				$result = $query->execute(array($dbpath, $size));
-			}
-		}
-		return $size;
-	}
-
-	private function clearFolderSizeCache($path) {
-		$path = rtrim($path, "/");
-		$path = preg_replace('{(/)\1+}', "/", $path);
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$dbpath = rtrim($this->datadir.$path, "/");
-// 		$query = OCP\DB::prepare("DELETE FROM *PREFIX*/*foldersize*/ WHERE path = ?");
-// 		$result = $query->execute(array($dbpath));
-		if ($path != "/" && $path != "") {
-			$parts = explode("/", $path);
-			$part = array_pop($parts);
-			if (empty($part)) {
-				array_pop($parts);
-			}
-			$parent = implode("/", $parts);
-			$this->clearFolderSizeCache($parent);
-		}
-	}
-
 	public function is_readable($path) {
 		return true;
 	}
@@ -271,7 +154,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	public function is_writable($path) {
 		if($path == "" || $path == "/"){
 			return false;
-		}elseif (OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
+		}elseif (OC_Share::getPermissions($this->sharedFolder.$path) & OC_Share::WRITE) {
 			return true;
 		} else {
 			return false;
@@ -336,7 +219,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$source = $this->getSourcePath($path);
 		if ($source) {
 			$info = array(
-				'target' => $this->datadir.$path,
+				'target' => $this->sharedFolder.$path,
 				'source' => $source,
 			);
 			OCP\Util::emitHook('OC_Filestorage_Shared', 'file_get_contents', $info);
@@ -350,7 +233,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$source = $this->getSourcePath($path);
 			if ($source) {
 				$info = array(
-						'target' => $this->datadir.$path,
+						'target' => $this->sharedFolder.$path,
 						'source' => $source,
 					     );
 				OCP\Util::emitHook('OC_Filestorage_Shared', 'file_put_contents', $info);
@@ -366,7 +249,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function unlink($path) {
 		// The item will be removed from the database, but won't be touched on the owner's filesystem
-		$target = $this->datadir.$path;
+		$target = $this->sharedFolder.$path;
 		// Check if the item is inside a shared folder
 		if (OC_Share::getParentFolders($target)) {
 			// If entry for item already exists
@@ -385,8 +268,8 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function rename($path1, $path2) {
-		$oldTarget = $this->datadir.$path1;
-		$newTarget = $this->datadir.$path2;
+		$oldTarget = $this->sharedFolder.$path1;
+		$newTarget = $this->sharedFolder.$path2;
 		// Check if the item is inside a shared folder
 		if ($folders = OC_Share::getParentFolders($oldTarget)) {
 			$root1 = substr($path1, 0, strpos($path1, "/"));
@@ -442,7 +325,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$source = $this->getSourcePath($path);
 		if ($source) {
 			$info = array(
-				'target' => $this->datadir.$path,
+				'target' => $this->sharedFolder.$path,
 				'source' => $source,
 				'mode' => $mode,
 			);
@@ -541,7 +424,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 
 	public static function setup($options) {
 		$user_dir = $options['user_dir'];
-		OC_Filesystem::mount('OC_Filestorage_Shared', array('sharedFolder' => $user_dir.'/Shared'), $user_dir.'/Shared/');
+		OC_Filesystem::mount('OC_Filestorage_Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
 	}
 
 	/**
@@ -551,6 +434,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	 */
 	public function hasUpdated($path,$time){
 		//TODO
-		return $this->filemtime($path)>$time;
+		return false;
 	}
 }
diff --git a/core/js/share.js b/core/js/share.js
index 755e71e996..3c7d2619eb 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -84,10 +84,8 @@ OC.Share={
 		$(html).appendTo(appendTo);
 		var data = OC.Share.loadItem(itemType, item);
 		if (data) {
-			$.each(data, function(index, shares) {
-				$.each(shares, function(id, share) {
-					OC.Share.addShareWith(share.share_with, share.permissions);
-				});
+			$.each(data, function(index, share) {
+				OC.Share.addShareWith(share.share_with, share.permissions);
 			});
 		}
 		$('#dropdown').show('blind');
@@ -160,6 +158,7 @@ $(document).ready(function() {
 	});
 	
 	if (typeof FileActions !== 'undefined') {
+		
 		OC.Share.loadIcons('file');
 		FileActions.register('all', 'Share', function(filename) {
 			// Return the correct sharing icon
@@ -187,19 +186,24 @@ $(document).ready(function() {
 			}
 		}, function(filename) {
 			var item = $('#dir').val() + '/' + filename;
-			var appendTo = $('tr').filterAttr('data-file',filename).find('td.filename');
+			if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
+				var itemType = 'folder';
+			} else {
+				var itemType = 'file';
+			}
+			var appendTo = $('tr').filterAttr('data-file', filename).find('td.filename');
 			// Check if drop down is already visible for a different file
 			if (($('#dropdown').length > 0)) {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
 						$('tr').removeClass('mouseOver');
 						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
-						OC.Share.showDropDown('file', item, appendTo, true);
+						OC.Share.showDropDown(itemType, item, appendTo, true);
 					});
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown('file', item, appendTo, true);
+				OC.Share.showDropDown(itemType, item, appendTo, true);
 			}
 		});
 	}
diff --git a/lib/filecache.php b/lib/filecache.php
index d956f34dc4..b6f4d23986 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -324,6 +324,10 @@ class OC_FileCache{
 			$eventSource->send('scanning',array('file'=>$path,'count'=>$count));
 		}
 		$lastSend=$count;
+		// NOTE: Ugly hack to prevent shared files from going into the cache (the source already exists somewhere in the cache)
+		if (substr($path, 0, 7) == '/Shared') {
+			return;
+		}
 		if($root===false){
 			$view=OC_Filesystem::getView();
 		}else{
@@ -361,6 +365,10 @@ class OC_FileCache{
 	 * @return int size of the scanned file
 	 */
 	public static function scanFile($path,$root=false){
+		// NOTE: Ugly hack to prevent shared files from going into the cache (the source already exists somewhere in the cache)
+		if (substr($path, 0, 7) == '/Shared') {
+			return;
+		}
 		if($root===false){
 			$view=OC_Filesystem::getView();
 		}else{
diff --git a/lib/files.php b/lib/files.php
index 2feae20afe..4f58ff6782 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -33,15 +33,30 @@ class OC_Files {
 	* @param dir $directory path under datadirectory
 	*/
 	public static function getDirectoryContent($directory, $mimetype_filter = ''){
-		$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
-		if ($directory == '') {
-			$files = array_merge($files, array());
-		} else if (substr($directory, 7) == '/Shared') {
-			$files = array_merge($files, OCP\Share::getItemsSharedWith('file', $directory, OC_Share_Backend_File::FORMAT_FILE_APP));
+		$files = array();
+		if (substr($directory, 0, 7) == '/Shared') {
+			if ($directory == '/Shared') {
+				$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP, array('mimetype_filter' => $mimetype_filter));
+			} else {
+				$pos = strpos($directory, '/', 8);
+				// Get shared folder name
+				if ($pos !== false) {
+					$itemTarget = substr($directory, 0, $pos);
+				} else {
+					$itemTarget = $directory;
+				}
+				$files = OCP\Share::getItemSharedWith('folder', $itemTarget, OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter));
+			}
+		} else {
+			$files = OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
+			if ($directory == '') {
+				// Add 'Shared' folder
+				$files = array_merge($files, OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT));
+			}
 		}
-		foreach($files as &$file){
-			$file['directory']=$directory;
-			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';
+		foreach ($files as &$file) {
+			$file['directory'] = $directory;
+			$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
 		}
 		usort($files, "fileCmp");//TODO: remove this once ajax is merged
 		return $files;
@@ -109,8 +124,7 @@ class OC_Files {
 				header('Content-Type: application/zip');
 				header('Content-Length: ' . filesize($filename));
 			}else{
-				$fileData=OC_FileCache::get($filename);
-				header('Content-Type: ' . $fileData['mimetype']);
+				header('Content-Type: '.OC_Filesystem::getMimeType($filename));
 			}
 		}elseif($zip or !OC_Filesystem::file_exists($filename)){
 			header("HTTP/1.0 404 Not Found");
diff --git a/lib/public/share.php b/lib/public/share.php
index 641d164001..8c7f5a7ad8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -53,9 +53,9 @@ class Share {
 	* @param array (optional) List of supported file extensions if this item type depends on files
 	* @return Returns true if backend is registered or false if error
 	*/
-	public static function registerBackend($itemType, $class, $dependsOn = null, $supportedFileExtensions = null) {
+	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
 		if (!isset(self::$backendTypes[$itemType])) {
-			self::$backendTypes[$itemType] = array('class' => $class, 'dependsOn' => $dependsOn, 'supportedFileExtensions' => $supportedFileExtensions);
+			self::$backendTypes[$itemType] = array('class' => $class, 'collectionOf' => $collectionOf, 'supportedFileExtensions' => $supportedFileExtensions);
 			return true;
 		}
 		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
@@ -69,8 +69,8 @@ class Share {
 	* @param int Number of items to return (optional) Returns all by default
 	* @return Return depends on format
 	*/
-	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE, $limit = -1) {
-		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $limit);
+	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1) {
+		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, $limit);
 	}
 
 	/**
@@ -80,8 +80,8 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE) {
-		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, 1);
+	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, $parameters = null) {
+		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1);
 	}
 
 	/**
@@ -91,8 +91,8 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE) {
-		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, 1, true);
+	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE, $parameters = null) {
+		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, true);
 	}
 
 	/**
@@ -102,8 +102,8 @@ class Share {
 	* @param int Number of items to return (optional) Returns all by default
 	* @return Return depends on format
 	*/
-	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $limit = -1) {
-		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $limit);
+	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1) {
+		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $parameters, $limit);
 	}
 
 	/**
@@ -113,8 +113,8 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format);
+	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE, $parameters = null) {
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, $parameters);
 	}
 
 	/**
@@ -124,8 +124,8 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemSharedBySource($itemType, $item, $format = self::FORMAT_NONE) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, -1, true);
+	public static function getItemSharedBySource($itemType, $item, $format = self::FORMAT_NONE, $parameters = null) {
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, $parameters, -1, true);
 	}
 
 	/**
@@ -195,7 +195,7 @@ class Share {
 			if ($parentFolder && $files = \OC_Files::getDirectoryContent($item)) {
 				for ($i = 0; $i < count($files); $i++) {
 					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $item) - strlen($item));
-					if ($files[$i]['mimetype'] == 'httpd/unix-directory' && $children = OC_Files::getDirectoryContent($name, '/')) {
+					if ($files[$i]['mimetype'] == 'httpd/unix-directory' && $children = \OC_Files::getDirectoryContent($name, '/')) {
 						// Continue scanning into child folders
 						array_push($files, $children);
 					} else {
@@ -370,19 +370,19 @@ class Share {
 	}
 
 	/**
-	* @brief Get a list of parent item types for the specified item type
+	* @brief Get a list of collection item types for the specified item type
 	* @param string Item type
 	* @return array
 	*/
-	private static function getParentItemTypes($itemType) {
-		$parents = array($itemType);
-		foreach (self::$backends as $type => $backend) {
-			if (in_array($backend->dependsOn, $parents)) {
-				$parents[] = $type;
+	private static function getCollectionItemTypes($itemType) {
+		$collections = array($itemType);
+		foreach (self::$backendTypes as $type => $backend) {
+			if (in_array($backend['collectionOf'], $collections)) {
+				$collections[] = $type;
 			}
 		}
-		if (!empty($parents)) {
-			return $parents;
+		if (count($collections) > 1) {
+			return $collections;
 		}
 		return false;
 	}
@@ -400,19 +400,13 @@ class Share {
 	* See public functions getItem(s)... for parameter usage
 	*
 	*/
-	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $limit = -1, $isSource = false) {
+	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $isSource = false) {
 		if ($backend = self::getBackend($itemType)) {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
-			if (isset($itemType)) {
-				if ($parents = self::getParentItemTypes($itemType)) {
-					$where = "WHERE item_type IN ('".implode("','", $parents)."')";
-				} else {
-					$where = "WHERE item_type = '".$itemType."'";
-				}
-				// TODO exclude items that are inside of folders and got converted i.e. songs, pictures
-				if ($itemType == 'files') {
-
-				}
+			if ($parents = self::getCollectionItemTypes($itemType)) {
+				$where = "WHERE item_type IN ('".implode("','", $parents)."')";
+			} else {
+				$where = "WHERE item_type = '".$itemType."'";
 			}
 			if (isset($shareType) && isset($shareWith)) {
 				// Include all user and group items
@@ -450,20 +444,21 @@ class Share {
 					}
 				} else {
 					if ($isSource) {
-						if ($itemType == 'file') {
+						if ($itemType == 'file' || $itemType == 'folder') {
 							$where .= " AND file_source = '".$item."'";
 						} else {
 							$where .= " AND item_source = '".$item."'";
 						}
 					} else {
-						if ($itemType == 'file' && substr($item, -1) == '/') {
-							// Special case to select only the shared files inside the folder
-							$where .= " AND file_target LIKE '".$item."%/'";
+						if ($itemType == 'file' || $itemType == 'folder') {
+							$where .= " AND file_target = '".$item."'";
 						} else {
 							$where .= " AND item_target = '".$item."'";
 						}
 					}
 				}
+			} else if ($itemType == 'file') {
+				// TODO Exclude converted items inside shared folders
 			}
 			if ($limit != -1) {
 				if ($limit == 1 && $shareType == self::$shareTypeUserAndGroups) {
@@ -486,16 +481,12 @@ class Share {
 			$result = $query->execute();
 			$items = array();
 			while ($item = $result->fetchRow()) {
-				if ($limit == 1) {
-					// Return just the item instead of 3-dimensional array
-					return $item;
-				}
 				// Filter out duplicate group shares for users with unique targets
 				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
 					// Remove the parent group share
-					unset($items[$item['item_source']][$item['parent']]);
+					unset($items[$item['parent']]);
 				}
-				$items[$item['item_source']][$item['id']] = $item;
+				$items[$item['id']] = $item;
 				// TODO Add in parent item types children?
 				if ($parents && in_array($item['item_type'], $parents)) {
 					$children[] = $item;
@@ -506,20 +497,17 @@ class Share {
 					return $items;
 				} else if ($format == self::FORMAT_STATUSES) {
 					$statuses = array();
-					foreach ($items as $shares) {
-						foreach ($shares as $info) {
-							if ($info['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
-								$statuses[$info['item']] = true;
-								break;
-							} else if (!isset($statuses[$info['item']])) {
-								$statuses[$info['item']] = false;
-							}
+					foreach ($items as $item) {
+						if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
+							$statuses[$item['item']] = true;
+							break;
+						} else if (!isset($statuses[$item['item']])) {
+							$statuses[$item['item']] = false;
 						}
-						
 					}
 					return $statuses;
 				} else {
-					return $backend->formatItems($items, $format);
+					return $backend->formatItems($items, $format, $parameters);
 				}
 			} else if ($limit == 1 || (isset($uidOwner) && isset($item))) {
 				return false;
@@ -764,12 +752,14 @@ abstract class Share_Backend {
 	* This function allows the backend to control the output of shared items with custom formats.
 	* It is only called through calls to the public getItem(s)Shared(With) functions.
 	*/
-	public abstract function formatItems($items, $format);
+	public abstract function formatItems($items, $format, $parameters = null);
 
 
 }
 
-abstract class Share_Backend_Parent extends Share_Backend {
+abstract class Share_Backend_Collection extends Share_Backend {
+
+	public abstract function inCollection($collections, $item);
 
 	public abstract function getChildren($item);
     

From 3134a962d92e2f67ea989ba775bf3d98c72bb1f0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 18:59:42 -0400
Subject: [PATCH 0899/1537] Call exit() to prevent further code execution if
 directory does not exist

---
 apps/files/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/index.php b/apps/files/index.php
index ed36c5edab..907dfda365 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -40,6 +40,7 @@ $dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir.'/')) {
 	header('Location: '.$_SERVER['PHP_SELF'].'');
+	exit();
 }
 
 $files = array();

From ca04c1a0f88ef61aa8206a95547202670971919c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 18:59:42 -0400
Subject: [PATCH 0900/1537] Call exit() to prevent further code execution if
 directory does not exist

---
 apps/files/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/index.php b/apps/files/index.php
index c2c0cb6170..79bed8e357 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -40,6 +40,7 @@ $dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir.'/')) {
 	header('Location: '.$_SERVER['PHP_SELF'].'');
+	exit();
 }
 
 $files = array();

From c0e1b8e7e709ca0ec12b49862f8222e7e5d4aa44 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 19:54:03 -0400
Subject: [PATCH 0901/1537] Sanitize POST and GET in ajax/share

---
 core/ajax/share.php | 52 +++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index f9ab91b9d2..ee2dac1831 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,36 +21,60 @@
 require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
-if (isset($_POST['action'])) {
+if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item'])) {
+	$itemType = OCP\Util::sanitizeHTML($_POST['itemType']);
+	$item = OCP\Util::sanitizeHTML($_POST['item']);
 	switch ($_POST['action']) {
 		case 'share':
-			$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-			// TODO May need to return private link
-			($return) ? OC_JSON::success() : OC_JSON::error();
+			error_log($_POST['item']);
+			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
+				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
+				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);
+				$permissions = OCP\Util::sanitizeHTML($_POST['permissions']);
+				$return = OCP\Share::share($itemType, $item, $shareType, $shareWith, $permissions);
+				// TODO May need to return private link
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
 			break;
 		case 'unshare':
-			$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']);
-			($return) ? OC_JSON::success() : OC_JSON::error();
+			if (isset($_POST['shareType']) && isset($_POST['shareWith'])) {
+				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
+				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);
+				$return = OCP\Share::unshare($itemType, $item, $shareType, $shareWith);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
 			break;
 		case 'setTarget':
-			$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
-			($return) ? OC_JSON::success() : OC_JSON::error();
+			if (isset($_POST['newTarget'])) {
+				$newTarget = OCP\Util::sanitizeHTML($_POST['newTarget']);
+				$return = OCP\Share::setTarget($itemType, $item, $newTarget);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
 			break;
 		case 'setPermissions':
-			$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-			($return) ? OC_JSON::success() : OC_JSON::error();
+			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
+				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
+				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);
+				$permissions = OCP\Util::sanitizeHTML($_POST['permissions']);
+				$return = OCP\Share::setPermissions($itemType, $item, $shareType, $shareWith, $permissions);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
 			break;
 	}
-} else if (isset($_GET['fetch'])) {
+} else if (isset($_GET['fetch']) && isset($_GET['itemType'])) {
+	$itemType = OCP\Util::sanitizeHTML($_GET['itemType']);
 	switch ($_GET['fetch']) {
 		case 'getItemsSharedStatuses':
-			$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
+			$return = OCP\Share::getItemsShared($itemType, OCP\Share::FORMAT_STATUSES);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getItem':
 			// TODO Check if the item was shared to the current user
-			$return = OCP\Share::getItemShared($_GET['itemType'], $_GET['item']);
-			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+			if (isset($_GET['item'])) {
+				$item = OCP\Util::sanitizeHTML($_GET['item']);
+				$return = OCP\Share::getItemShared($itemType, $item);
+				($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+			}
 			break;
 		case 'getShareWith':
 			// TODO Autocomplete for all users, groups, etc.

From ef1924dbbb662a1e33d7fc74cb7c9e1b36585225 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Fri, 25 May 2012 22:07:36 +0200
Subject: [PATCH 0902/1537] gallery :: display big picture according to exif

- fixes oc-314
- caching of the 'big' images in subfolder view
  next to the tumbnails
- now choosen to use max 1200px for viewing
  this helps speeding up the viewing process

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 apps/gallery/ajax/viewImage.php | 34 +++++++++++++++++++++++++++++++++
 apps/gallery/js/albums.js       |  2 +-
 apps/gallery/lib/photo.php      | 31 ++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 apps/gallery/ajax/viewImage.php

diff --git a/apps/gallery/ajax/viewImage.php b/apps/gallery/ajax/viewImage.php
new file mode 100644
index 0000000000..4f7af1496f
--- /dev/null
+++ b/apps/gallery/ajax/viewImage.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * ownCloud - gallery application
+ *
+ * @author Ike Devolder
+ * @copyright 2012 Ike Devolder
+ * 
+ * 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 Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('gallery');
+
+$img = $_GET['img'];
+
+$image = OC_Gallery_Photo::getViewImage($img);
+if ($image) {
+    OCP\Response::enableCaching(3600 * 24); // 24 hour
+    $image->show();
+}
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 413c71471a..62d3f783ec 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -79,7 +79,7 @@ Albums={
 			});
 			element.append(local);
 		}
-		var photoDisplayTemplate = '<div class="gallery_box"><div class="dummy"></div><div><a rel="images" href="'+OC.linkTo('files','download.php')+'?file=URLPATH"><img src="'+OC.filePath('gallery','ajax','thumbnail.php')+'?img=IMGPATH"></a></div></div>';
+        var photoDisplayTemplate = '<div class="gallery_box"><div class="dummy"></div><div><a rel="images" href="'+OC.linkTo('gallery/ajax','viewImage.php')+'?img=URLPATH"><img src="'+OC.filePath('gallery','ajax','thumbnail.php')+'?img=IMGPATH"></a></div></div>';
 		for (var i in Albums.photos) {
 			element.append(photoDisplayTemplate.replace("IMGPATH", escape(Albums.photos[i])).replace("URLPATH", escape(Albums.photos[i])));
 		}
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index f9527cb5fd..38a6690c63 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -97,6 +97,37 @@ class OC_Gallery_Photo {
 		return null;
 	}
 
+    public static function getViewImage($image_name, $owner = null) {
+        if (!$owner) $owner = OCP\USER::getUser();
+        $save_dir = OCP\Config::getSystemValue("datadirectory").'/'. $owner .'/gallery/';
+        $save_dir .= dirname($image_name). '/view/';
+        $image_path = $image_name;
+        $view_file = $save_dir . basename($image_name);
+        if (!is_dir($save_dir)) {
+            mkdir($save_dir, 0777, true);
+        }
+        if (file_exists($view_file)) {
+            $image = new OC_Image($view_file);
+        } else {
+            $image_path = OC_Filesystem::getLocalFile($image_path);
+            if(!file_exists($image_path)) {
+                return null;
+            }
+            $image = new OC_Image($image_path);
+            if ($image->valid()) {
+                $image->resize(1200);
+                $image->fixOrientation();
+                $image->save($view_file);
+            }
+        }
+        if ($image->valid()) {
+            return $image;
+        }else{
+            $image->destroy();
+        }
+        return null;
+    }
+
 	public static function getGalleryRoot() {
 		return OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '');
 	}

From 0b14b4e3e8b184197e6b2ad501d07af0f803c774 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 18:59:42 -0400
Subject: [PATCH 0903/1537] Call exit() to prevent further code execution if
 directory does not exist

---
 apps/files/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/index.php b/apps/files/index.php
index c2c0cb6170..79bed8e357 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -40,6 +40,7 @@ $dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir.'/')) {
 	header('Location: '.$_SERVER['PHP_SELF'].'');
+	exit();
 }
 
 $files = array();

From ca8028bd736ef0eae882747c5437cebc5701e561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 11 Jul 2012 02:32:17 +0200
Subject: [PATCH 0904/1537] small fixes in merge request 104, use
 OCP\Files::getStorage

---
 apps/gallery/ajax/viewImage.php |   6 +-
 apps/gallery/lib/managers.php   |  15 ++--
 apps/gallery/lib/photo.php      | 134 ++++++++++++++++----------------
 apps/gallery/lib/tiles.php      |   2 +-
 4 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/apps/gallery/ajax/viewImage.php b/apps/gallery/ajax/viewImage.php
index 4f7af1496f..daf0ab741f 100644
--- a/apps/gallery/ajax/viewImage.php
+++ b/apps/gallery/ajax/viewImage.php
@@ -20,8 +20,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('gallery');
 
@@ -29,6 +27,6 @@ $img = $_GET['img'];
 
 $image = OC_Gallery_Photo::getViewImage($img);
 if ($image) {
-    OCP\Response::enableCaching(3600 * 24); // 24 hour
-    $image->show();
+	OCP\Response::enableCaching(3600 * 24); // 24 hour
+	$image->show();
 }
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 3b6f754fc2..b6ade3d1b1 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -71,9 +71,9 @@ class ThumbnailsManager {
 	}
 
 	public function getThumbnail($path) {
-		$gallery_path = \OCP\Config::getSystemValue( 'datadirectory' ).'/'.\OC_User::getUser().'/gallery';
-		if (file_exists($gallery_path.$path)) {
-			return new \OC_Image($gallery_path.$path);
+		$gallery_storage = \OCP\Files::getStorage('gallery');
+		if ($gallery_storage->file_exists($path)) {
+			return new \OC_Image($gallery_storage->getLocalFile($path));
 		}
 		if (!\OC_Filesystem::file_exists($path)) {
 			\OC_Log::write(self::TAG, 'File '.$path.' don\'t exists', \OC_Log::WARN);
@@ -92,8 +92,9 @@ class ThumbnailsManager {
 			unset($image);
 			return false;
 		}
+		$l = $gallery_storage->getLocalFile($path);
                 
-		$image->save($gallery_path.'/'.$path);
+		$image->save($l);
 		return $image;
 	}
 
@@ -122,9 +123,9 @@ class ThumbnailsManager {
 	}
 	
 	public function delete($path) {
-		$thumbnail = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path;
-		if (file_exists($thumbnail)) {
-			unlink($thumbnail);
+		$thumbnail_storage = \OCP\Files::getStorage('gallery');
+		if ($thumbnail_storage->file_exists($path)) {
+			$thumbnail_storage->unlink($path);
 		}
 	}
 	
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 38a6690c63..3b4e74641b 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -1,53 +1,55 @@
 <?php
 
 /**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.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 Lesser General Public 
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
+ * ownCloud - gallery application
+ *
+ * @author Bartek Przybylski
+ * @copyright 2012 Bartek Przybylski bart.p.pl@gmail.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 Lesser General Public 
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
 class OC_Gallery_Photo {
-	public static function create($albumId, $img){
+
+	public static function create($albumId, $img) {
 		$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
 		$stmt->execute(array($albumId, $img));
 	}
-	public static function find($albumId, $img=null){
+
+	public static function find($albumId, $img = null) {
 		$sql = 'SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?';
 		$args = array($albumId);
-		if (!is_null($img)){
+		if (!is_null($img)) {
 			$sql .= ' AND file_path = ?';
 			$args[] = $img;
 		}
 		$stmt = OCP\DB::prepare($sql);
 		return $stmt->execute($args);
 	}
-	public static function findForAlbum($owner, $album_name){
+
+	public static function findForAlbum($owner, $album_name) {
 		$stmt = OCP\DB::prepare('SELECT *'
-			.' FROM *PREFIX*gallery_photos photos,'
-				.' *PREFIX*gallery_albums albums'
-			.' WHERE albums.uid_owner = ?'
-				.' AND albums.album_name = ?'
-				.' AND photos.album_id = albums.album_id');
+					.' FROM *PREFIX*gallery_photos photos,'
+						.' *PREFIX*gallery_albums albums'
+					.' WHERE albums.uid_owner = ?'
+						.' AND albums.album_name = ?'
+						.' AND photos.album_id = albums.album_id');
 		return $stmt->execute(array($owner, $album_name));
 	}
 
-  public static function removeByPath($path, $album_id) {
-    $stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path LIKE ? and album_id = ?');
+	public static function removeByPath($path, $album_id) {
+		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path LIKE ? and album_id = ?');
 		$stmt->execute(array($path, $album_id));
 	}
 
@@ -67,19 +69,20 @@ class OC_Gallery_Photo {
 	}
 
 	public static function getThumbnail($image_name, $owner = null) {
-		if (!$owner) $owner = OCP\USER::getUser();
+		if (!$owner)
+			$owner = OCP\USER::getUser();
 		$view = OCP\Files::getStorage('gallery');
 		$save_dir = dirname($image_name);
 		if (!$view->is_dir($save_dir)) {
 			$view->mkdir($save_dir);
 		}
-		$view->chroot($view->getRoot().'/'.$save_dir);
+		$view->chroot($view->getRoot() . '/' . $save_dir);
 		$thumb_file = basename($image_name);
 		if ($view->file_exists($thumb_file)) {
 			$image = new OC_Image($view->fopen($thumb_file, 'r'));
 		} else {
 			$image_path = OC_Filesystem::getLocalFile($image_name);
-			if(!file_exists($image_path)) {
+			if (!file_exists($image_path)) {
 				return null;
 			}
 			$image = new OC_Image($image_path);
@@ -91,44 +94,45 @@ class OC_Gallery_Photo {
 		}
 		if ($image->valid()) {
 			return $image;
-		}else{
+		} else {
 			$image->destroy();
 		}
 		return null;
 	}
 
-    public static function getViewImage($image_name, $owner = null) {
-        if (!$owner) $owner = OCP\USER::getUser();
-        $save_dir = OCP\Config::getSystemValue("datadirectory").'/'. $owner .'/gallery/';
-        $save_dir .= dirname($image_name). '/view/';
-        $image_path = $image_name;
-        $view_file = $save_dir . basename($image_name);
-        if (!is_dir($save_dir)) {
-            mkdir($save_dir, 0777, true);
-        }
-        if (file_exists($view_file)) {
-            $image = new OC_Image($view_file);
-        } else {
-            $image_path = OC_Filesystem::getLocalFile($image_path);
-            if(!file_exists($image_path)) {
-                return null;
-            }
-            $image = new OC_Image($image_path);
-            if ($image->valid()) {
-                $image->resize(1200);
-                $image->fixOrientation();
-                $image->save($view_file);
-            }
-        }
-        if ($image->valid()) {
-            return $image;
-        }else{
-            $image->destroy();
-        }
-        return null;
-    }
+	public static function getViewImage($image_name, $owner = null) {
+		if (!$owner) $owner = OCP\USER::getUser();
+		$save_dir = OCP\Config::getSystemValue("datadirectory") . '/' . $owner . '/gallery';
+		$save_dir .= dirname($image_name) . '/view/';
+		$image_path = $image_name;
+		$view_file = $save_dir . basename($image_name);
+		if (!is_dir($save_dir)) {
+			mkdir($save_dir, 0777, true);
+		}
+		if (file_exists($view_file)) {
+			$image = new OC_Image($view_file);
+		} else {
+			$image_path = OC_Filesystem::getLocalFile($image_path);
+			if (!file_exists($image_path)) {
+				return null;
+			}
+			$image = new OC_Image($image_path);
+			if ($image->valid()) {
+				$image->resize(1200);
+				$image->fixOrientation();
+				$image->save($view_file);
+			}
+		}
+		if ($image->valid()) {
+			return $image;
+		} else {
+			$image->destroy();
+		}
+		return null;
+	}
 
 	public static function getGalleryRoot() {
 		return OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '');
 	}
+
 }
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 3ff06dfcbe..754734e609 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -95,7 +95,7 @@ class TileSingle extends TileBase {
 	public function get($extra = '') {
 		//	!HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
 		//	!HACK! will result in failing of opening them 
-		return '<a rel="images" title="'.htmlentities(basename($this->getPath())).'" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
+		return '<a rel="images" title="'.htmlentities(basename($this->getPath())).'" href="'.\OCP\Util::linkTo('gallery','ajax/viewImage.php').'?img='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
 	}
 	
 	public function getMiniatureSrc() {

From c21ff29a53fc26ae0e8942f81b4c0f8a66a9d860 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 21:29:34 -0400
Subject: [PATCH 0905/1537] Fix getItems() calls

---
 lib/public/share.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 8c7f5a7ad8..7837e91f10 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -156,7 +156,7 @@ class Share {
 						return false;
 					}
 				}
-				if (self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
+				if (self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -169,7 +169,7 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				if (self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, 1)) {
+				if (self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
@@ -221,7 +221,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function unshare($itemType, $item, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -308,7 +308,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, 1)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');

From a7416b1cd8386bfef5c2911c2f7ec39e5a67d7ef Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 21:30:16 -0400
Subject: [PATCH 0906/1537] Add back returning only the item if the limit is 1
 and now check that the format is set to none

---
 lib/public/share.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/public/share.php b/lib/public/share.php
index 7837e91f10..c6dff4467d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -481,6 +481,10 @@ class Share {
 			$result = $query->execute();
 			$items = array();
 			while ($item = $result->fetchRow()) {
+				// Return only the item instead of a 2-dimensional array
+				if ($limit == 1 && $format == self::FORMAT_NONE) {
+					return $item;
+				}
 				// Filter out duplicate group shares for users with unique targets
 				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
 					// Remove the parent group share

From b1482562335c30c4df4cbd3c74a3c18739a53aa9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 10 Jul 2012 21:30:52 -0400
Subject: [PATCH 0907/1537] Get rid of sneaky error_log() that got left behind

---
 core/ajax/share.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index ee2dac1831..33eea22352 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -26,7 +26,6 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 	$item = OCP\Util::sanitizeHTML($_POST['item']);
 	switch ($_POST['action']) {
 		case 'share':
-			error_log($_POST['item']);
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
 				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);

From e248412ca9e9b75db5c7a4cc9651391e341c66f5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 9 Jul 2012 16:07:26 +0200
Subject: [PATCH 0908/1537] use getStorage() to get versions location

update routine implemented
version number of files_versions increased

Conflicts:

	apps/files_versions/lib/hooks.php
---
 apps/files_versions/ajax/expireAll.php |   2 +-
 apps/files_versions/appinfo/update.php |  16 ++
 apps/files_versions/appinfo/version    |   2 +-
 apps/files_versions/history.php        |   2 +-
 apps/files_versions/lib/hooks.php      |  69 ++++----
 apps/files_versions/lib/versions.php   | 226 +++++++++++--------------
 6 files changed, 158 insertions(+), 159 deletions(-)
 create mode 100644 apps/files_versions/appinfo/update.php

diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index 238e3bdad4..4f165be0ae 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -28,7 +28,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('files_versions');
 
-$versions = new OCA_Versions\Storage( new OC_FilesystemView('') );
+$versions = new OCA_Versions\Storage();
 
 if( $versions->expireAll() ){
 	
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
new file mode 100644
index 0000000000..9569ca1048
--- /dev/null
+++ b/apps/files_versions/appinfo/update.php
@@ -0,0 +1,16 @@
+<?php
+
+$installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version');
+// move versions to new directory
+if (version_compare($installedVersion, '1.0.2', '<')) {
+	$users = \OCP\User::getUsers();
+	$datadir =  \OCP\Config::getSystemValue('datadirectory').'/';
+    foreach ($users as $user) {
+    	$oldPath = $datadir.$user.'/versions';
+    	$newPath = $datadir.$user.'/files_versions';
+    	if(is_dir($oldPath)) {
+    		rename($oldPath, $newPath);
+    	}
+    }
+	
+}
diff --git a/apps/files_versions/appinfo/version b/apps/files_versions/appinfo/version
index 7f207341d5..e6d5cb833c 100644
--- a/apps/files_versions/appinfo/version
+++ b/apps/files_versions/appinfo/version
@@ -1 +1 @@
-1.0.1
\ No newline at end of file
+1.0.2
\ No newline at end of file
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index b2ae8d232e..a34c92ee42 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -30,7 +30,7 @@ if ( isset( $_GET['path'] ) ) {
 	$path = $_GET['path'];
 	$path = strip_tags( $path );
 	$tmpl->assign( 'path', $path );
-	$versions = new OCA_Versions\Storage( new OC_FilesystemView('') );
+	$versions = new OCA_Versions\Storage();
 
 	// roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index f93d4dabe2..bfc8fd3a37 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -30,41 +30,46 @@ class Hooks {
 		}
 	}
 	
-	/**
-	 * @brief Erase versions of deleted file
-	 * @param array
-	 *
-	 * This function is connected to the delete signal of OC_Filesystem
-	 * cleanup the versions directory if the actual file gets deleted
-	 */
+
+	/**
+	 * @brief Erase versions of deleted file
+	 * @param array
+	 *
+	 * This function is connected to the delete signal of OC_Filesystem
+	 * cleanup the versions directory if the actual file gets deleted
+	 */
 	public static function remove_hook($params) {
-		$rel_path =  $params['path'];
-		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
-		if(Storage::isversioned($rel_path)) {
-			$versions = Storage::getVersions($rel_path);
-			foreach ($versions as $v){
-				unlink($abs_path . $v['version']);
-			}
-		}
-	}
-	
-	/**
-	 * @brief rename/move versions of renamed/moved files
-	 * @param array with oldpath and newpath
-	 *
-	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-	 * of the stored versions along the actual file
-	 */
+		$versions_fileview = \OCP\Files::getStorage('files_versions');
+		$rel_path =  $params['path'];
+		$abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$rel_path.'.v';
+		if(Storage::isversioned($rel_path)) {
+			$versions = Storage::getVersions($rel_path);
+			foreach ($versions as $v){
+				unlink($abs_path . $v['version']);
+			}
+		}
+	}
+	
+	/**
+	 * @brief rename/move versions of renamed/moved files
+	 * @param array with oldpath and newpath
+	 *
+	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+	 * of the stored versions along the actual file
+	 */
 	public static function rename_hook($params) {
-		$rel_oldpath =  $params['oldpath'];
-		$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
-		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';
+		$versions_fileview = \OCP\Files::getStorage('files_versions');
+		$rel_oldpath =  $params['oldpath'];
+		$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$rel_oldpath.'.v';
+		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v';
 		if(Storage::isversioned($rel_oldpath)) {
-			$versions = Storage::getVersions($rel_oldpath);
-			foreach ($versions as $v){
-				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
-			}
-		}
+			$info=pathinfo($abs_newpath);
+			if(!file_exists($info['dirname'])) mkdir($info['dirname'],0700,true);
+			$versions = Storage::getVersions($rel_oldpath);
+			foreach ($versions as $v){
+				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
+			}
+		}
 	}
 	
 }
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 723c27577a..0ce884c3ea 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -22,41 +22,26 @@ class Storage {
 	//   - files_versionsfolder
 	//   - files_versionsblacklist
 	//   - files_versionsmaxfilesize
-	//   - files_versionsinterval 
-	//   - files_versionmaxversions 
+	//   - files_versionsinterval
+	//   - files_versionmaxversions
 	//
 	// todo:
 	//   - finish porting to OC_FilesystemView to enable network transparency
 	//   - add transparent compression. first test if it´s worth it.
 
-	const DEFAULTENABLED=true; 
-	const DEFAULTFOLDER='versions'; 
-	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
-	const DEFAULTMAXFILESIZE=1048576; // 10MB 
+	const DEFAULTENABLED=true;
+	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp';
+	const DEFAULTMAXFILESIZE=1048576; // 10MB
 	const DEFAULTMININTERVAL=60; // 1 min
 	const DEFAULTMAXVERSIONS=50;
-	
+
 	private $view;
-	
-	function __construct( $view ) {
-	
-		$this->view = $view;
-		
-	}
 
-	/**
-	 * init the versioning and create the versions folder.
-	 */
-	public static function init() {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			// create versions folder
-			$foldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			if(!is_dir($foldername)){
-				mkdir($foldername);
-			}
-		}
-	}
+	function __construct() {
 
+		$this->view = \OCP\Files::getStorage('files_versions');
+
+	}
 
 	/**
 	 * listen to write event.
@@ -75,11 +60,11 @@ class Storage {
 	 */
 	public function store($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-		
+
 			$files_view = \OCP\Files::getStorage("files");
 			$users_view = \OCP\Files::getStorage("files_versions");
 			$users_view->chroot(\OCP\User::getUser().'/');
-			
+				
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -87,15 +72,14 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
-			Storage::init();
-
+				
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory') .  $this->view->getAbsolutePath('');
+				
 			//check if source file already exist as version to avoid recursions.
 			if ($users_view->file_exists($filename)) {
 				return false;
 			}
-			
+				
 			// check if filename is a directory
 			if($files_view->is_dir($filename)){
 				return false;
@@ -110,7 +94,7 @@ class Storage {
 					return false;
 				}
 			}
-			
+				
 			// check filesize
 			if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
 				return false;
@@ -129,12 +113,12 @@ class Storage {
 
 
 			// create all parent folders
-			$info=pathinfo($filename);	
-			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);	
+			$info=pathinfo($filename);
+			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);
 
 			// store a new version of a file
-			@$users_view->copy('files'.$filename, 'versions'.$filename.'.v'.time());
-        
+			@$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
+
 			// expire old revisions if necessary
 			Storage::expire($filename);
 		}
@@ -145,11 +129,11 @@ class Storage {
 	 * rollback to an old version of a file.
 	 */
 	public static function rollback($filename,$revision) {
-	
+
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 			$users_view = \OCP\Files::getStorage("files_versions");
 			$users_view->chroot(\OCP\User::getUser().'/');
-			
+				
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -157,23 +141,20 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			
-			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
-			
+				
 			// rollback
-			if( @$users_view->copy('versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
-			
+			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
+					
 				return true;
-				
+
 			}else{
-			
+					
 				return false;
-				
+
 			}
-			
+				
 		}
-		
+
 	}
 
 	/**
@@ -181,18 +162,17 @@ class Storage {
 	 */
 	public static function isversioned($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			$versions_fileview = \OCP\Files::getStorage("files_versions");
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
-				$uid = substr($source, 1, $pos - 1);
 				$filename = substr($source, $pos + 6);
-			} else {
-				$uid = \OCP\User::getUser();
 			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
+			
 			// check for old versions
-			$matches=glob($versionsFolderName.'/'.$filename.'.v*');
-			if(count($matches)>1){
+			$matches=glob($versionsFolderName.$filename.'.v*');
+			if(count($matches)>0){
 				return true;
 			}else{
 				return false;
@@ -203,17 +183,17 @@ class Storage {
 	}
 
 
-        
-        /**
-         * @brief get a list of all available versions of a file in descending chronological order
-         * @param $filename file to find versions of, relative to the user files dir
-         * @param $count number of versions to return
-         * @returns array
-         */
-        public static function getVersions( $filename, $count = 0 ) {
-        
-                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-                
+
+	/**
+	 * @brief get a list of all available versions of a file in descending chronological order
+	 * @param $filename file to find versions of, relative to the user files dir
+	 * @param $count number of versions to return
+	 * @returns array
+	 */
+	public static function getVersions( $filename, $count = 0 ) {
+
+		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -221,70 +201,71 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$versions = array();         
-			
+			$versions_fileview = \OCP\Files::getStorage('files_versions');
+			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
+			$versions = array();
+				
 			// fetch for old versions
 			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
-			
-			sort( $matches );
-			
-			$i = 0;
-			
-			foreach( $matches as $ma ) {
 				
+			sort( $matches );
+				
+			$i = 0;
+				
+			$files_view = \OCP\Files::getStorage('files');
+			$local_file = $files_view->getLocalFile($filename);
+			foreach( $matches as $ma ) {
+
 				$i++;
 				$versions[$i]['cur'] = 0;
 				$parts = explode( '.v', $ma );
 				$versions[$i]['version'] = ( end( $parts ) );
-				
+
 				// if file with modified date exists, flag it in array as currently enabled version
-				$files_view = \OCP\Files::getStorage('files');
-				$local_file = $files_view->getLocalFile($filename);
 				( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
-				
+
 			}
-			
-			$versions = array_reverse( $versions );
-			
-			foreach( $versions as $key => $value ) {
 				
+			$versions = array_reverse( $versions );
+				
+			foreach( $versions as $key => $value ) {
+
 				// flag the first matched file in array (which will have latest modification date) as current version
 				if ( $versions[$key]['fileMatch'] ) {
-				
+
 					$versions[$key]['cur'] = 1;
 					break;
-					
+						
 				}
-			
+					
 			}
-			
+				
 			$versions = array_reverse( $versions );
-			
+				
 			// only show the newest commits
 			if( $count != 0 and ( count( $versions )>$count ) ) {
-			
+					
 				$versions = array_slice( $versions, count( $versions ) - $count );
-				
+
 			}
-	
+
 			return( $versions );
 
 
-                } else {
-                
-			// if versioning isn't enabled then return an empty array
-                        return( array() );
-                        
-                }
-                
-        }
+		} else {
 
-        /**
-         * @brief Erase a file's versions which exceed the set quota
-         */
-        public static function expire($filename) {
-                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			// if versioning isn't enabled then return an empty array
+			return( array() );
+
+		}
+
+	}
+
+	/**
+	 * @brief Erase a file's versions which exceed the set quota
+	 */
+	public static function expire($filename) {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
@@ -293,36 +274,33 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versions_fileview = \OCP\Files::getStorage("files_versions");
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
 
 			// check for old versions
 			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
-			
+				
 			if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
-			
+					
 				$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
 
 				// delete old versions of a file
 				$deleteItems = array_slice( $matches, 0, $numberToDelete );
-				
+
 				foreach( $deleteItems as $de ) {
-				
+
 					unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
-					
+						
 				}
 			}
-                }
-        }
+		}
+	}
 
-        /**
-         * @brief Erase all old versions of all user files
-         * @return true/false
-         */
-        public function expireAll() {
-		
-		$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-		
-		return $this->view->deleteAll( $dir, true );
-	
-        }
+	/**
+	 * @brief Erase all old versions of all user files
+	 * @return true/false
+	 */
+	public function expireAll() {
+		return $this->view->deleteAll('', true);
+	}
 }

From 07efd39d8a1b82f61f5ed429cd713c04c5988788 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 11 Jul 2012 15:44:39 +0200
Subject: [PATCH 0909/1537] prevent script execution during slideshow

---
 apps/gallery/js/slideshow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/js/slideshow.js b/apps/gallery/js/slideshow.js
index 88e89f39ff..cc5dfc44a2 100644
--- a/apps/gallery/js/slideshow.js
+++ b/apps/gallery/js/slideshow.js
@@ -15,7 +15,7 @@ $(document).ready(function(){
 
 		var images=[];
 		$('#gallerycontent div a').each(function(i,a){
-			images.push({image : a.href, title : a.title, thumb : a.children[0].src, url : 'javascript:$.endSlideshow()'});
+			images.push({image : a.href, title : a.title.replace(/</, '&lt;').replace(/>/, '&gt;'), thumb : a.children[0].src, url : 'javascript:$.endSlideshow()'});
 		});
 
 		if (images.length <= 0) {

From e896c0a9e3cdf34112ce722583d574f36dbbaf2a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 11:33:48 -0400
Subject: [PATCH 0910/1537] Fix addressbook sharing, formatItems() changed in
 past commits

---
 apps/contacts/lib/share.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/lib/share.php b/apps/contacts/lib/share.php
index 44b7e8c064..7aec533957 100644
--- a/apps/contacts/lib/share.php
+++ b/apps/contacts/lib/share.php
@@ -65,13 +65,11 @@ class OC_Contacts_Share extends OCP\Share_Backend {
 	* This function allows the backend to control the output of shared items with custom formats.
 	* It is only called through calls to the public getItem(s)Shared(With) functions.
 	*/
-	public function formatItems($items, $format) {
+	public function formatItems($items, $format, $parameters = null) {
 		$addressbooks = array();
-		foreach ($items as $source => $shares) {
-			$addressbook = OC_Contacts_Addressbook::find( $source );
-			foreach ($shares as $info) {
-				$addressbook['displayname'] = $info['item_target'];
-			}
+		foreach ($items as $item) {
+			$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
+			$addressbook['displayname'] = $item['item_target'];
 			$addressbooks[] = $addressbook;
 		}
 		return $addressbooks;

From ccb5e99395955233b6600b4bf04c90dfa1d08ede Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 12:18:59 -0400
Subject: [PATCH 0911/1537] Generate random token for private links (more
 entropy than past private links)

---
 core/js/share.js     |  5 +++--
 lib/public/share.php | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 3c7d2619eb..90da96259e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -253,11 +253,12 @@ $(document).ready(function() {
 	});
 	
 	$('#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(item, 'public', 0, function(token) {
-				OC.Share.showPrivateLink(item, token);
+			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');
 			});
diff --git a/lib/public/share.php b/lib/public/share.php
index c6dff4467d..61014c6160 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -179,11 +179,9 @@ class Share {
 				$shareWith['group'] = $group;
 				$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 				break;
-			case self::SHARETYPE_PRIVATE_LINK:
-				// TODO don't loop through folder conversion
-				$uidSharedWith = '';
-				$gidSharedWith = null;
-				break;
+			case self::SHARE_TYPE_PRIVATE_LINK:
+				$shareWith = md5(uniqid($item, true));
+				return self::put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions);
 			// Future share types need to include their own conditions
 			default:
 				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
@@ -630,7 +628,11 @@ class Share {
 					return $parentFolders;
 				}
 			} else {
-				$itemTarget = $backend->generateTarget($item, $shareWith);
+				if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
+					$itemTarget = null;
+				} else {
+					$itemTarget = $backend->generateTarget($item, $shareWith);
+				}
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
@@ -641,7 +643,11 @@ class Share {
 							$parent = $parentFolder['id'];
 						}
 					} else {
-						$fileTarget = self::getBackend('file')->generateTarget($source['file'], $shareWith);
+						if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
+							$fileTarget = basename($source['file']);
+						} else {
+							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $shareWith);
+						}
 					}
 				} else {
 					$fileTarget = null;

From cbf851de69d796ccf7df48d3c1d1f94a311acdb1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 12:21:30 -0400
Subject: [PATCH 0912/1537] Show private link in dropdown

---
 core/js/share.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 90da96259e..42002ea798 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -85,7 +85,11 @@ OC.Share={
 		var data = OC.Share.loadItem(itemType, item);
 		if (data) {
 			$.each(data, function(index, share) {
-				OC.Share.addShareWith(share.share_with, share.permissions);
+				if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
+					OC.Share.showPrivateLink(item, share.share_with);
+				} else {
+					OC.Share.addShareWith(share.share_with, share.permissions);
+				}
 			});
 		}
 		$('#dropdown').show('blind');

From c3fea30811f845fe357b70d5beb511ca4ad42eca Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Wed, 11 Jul 2012 19:14:04 +0200
Subject: [PATCH 0913/1537] Sanitizing file names

---
 apps/files/js/filelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e6a9a6883a..3645258f98 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -14,7 +14,7 @@ FileList={
 			var extension=false;
 		}
 		html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
-		html+='<a class="name" href="download.php?file='+$('#dir').val()+'/'+name+'"><span class="nametext">'+basename
+		html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '&lt;').replace(/>/, '&gt;')+'/'+name+'"><span class="nametext">'+basename
 		if(extension){
 			html+='<span class="extension">'+extension+'</span>';
 		}

From 7077678f7fb33b376e05eece3b62dc4ae058055a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:26:22 -0400
Subject: [PATCH 0914/1537] Sanitize toaddress for emailing private links

---
 apps/files_sharing/ajax/email.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index ca63f540f9..0765bdd988 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -5,9 +5,10 @@ OCP\JSON::callCheck();
 
 $user = OCP\USER::getUser();
 // TODO translations
+$toaddress = OCP\Util::sanitizeHtml($_POST['toaddress']);
 $type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
 $subject = $user.' shared a '.$type.' with you';
 $link = $_POST['link'];
 $text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
 $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
-OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
+OCP\Util::sendMail($toaddress, $toaddress, $subject, $text, $fromaddress, $user);

From 66da0a215137ef03b31a6b5706007e503aa1ad0a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:36:27 -0400
Subject: [PATCH 0915/1537] Catch exceptions from PHPMailer

---
 lib/mail.php | 54 +++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/mail.php b/lib/mail.php
index 7343f5f0d9..9d2cd62494 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -56,33 +56,35 @@ class OC_Mail {
 		$mailo->From =$fromaddress;
 		$mailo->FromName = $fromname;;
 		$a=explode(' ',$toaddress);
-		foreach($a as $ad) {
-			$mailo->AddAddress($ad,$toname);
+		try {
+			foreach($a as $ad) {
+				$mailo->AddAddress($ad,$toname);
+			}
+
+			if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname);
+			if($bcc<>'') $mailo->AddBCC($bcc);
+
+			$mailo->AddReplyTo($fromaddress, $fromname);
+
+			$mailo->WordWrap = 50;
+			if($html==1) $mailo->IsHTML(true); else $mailo->IsHTML(false);
+
+			$mailo->Subject = $subject;
+			if($altbody=='') {
+				$mailo->Body    = $mailtext.OC_MAIL::getfooter();
+				$mailo->AltBody = '';
+			}else{
+				$mailo->Body    = $mailtext;
+				$mailo->AltBody = $altbody;
+			}
+			$mailo->CharSet = 'UTF-8';
+
+			$mailo->Send();
+			unset($mailo);
+			OC_Log::write('Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject,'mail',OC_Log::DEBUG);
+		} catch (Exception $exception) {
+			OC_Log::write('mail', $exception->getMessage(), OC_Log::DEBUG);
 		}
-
-		if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname);
-		if($bcc<>'') $mailo->AddBCC($bcc);
-
-		$mailo->AddReplyTo($fromaddress, $fromname);
-
-		$mailo->WordWrap = 50;
-		if($html==1) $mailo->IsHTML(true); else $mailo->IsHTML(false);
-
-		$mailo->Subject = $subject;
-		if($altbody=='') {
-			$mailo->Body    = $mailtext.OC_MAIL::getfooter();
-			$mailo->AltBody = '';
-		}else{
-			$mailo->Body    = $mailtext;
-			$mailo->AltBody = $altbody;
-		}
-		$mailo->CharSet = 'UTF-8';
-
-		$mailo->Send();
-		unset($mailo);
-
-		OC_Log::write('Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject,'mail',OC_Log::DEBUG);
-
 	}
 
 

From 8afcddf44fedc706108dc318c146a777ca2a4988 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Wed, 11 Jul 2012 21:52:51 +0200
Subject: [PATCH 0916/1537] Handling exceptions

---
 lib/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mail.php b/lib/mail.php
index 9d2cd62494..545b95da87 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -36,7 +36,7 @@ class OC_Mail {
 		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );  
 
 
-		$mailo = new PHPMailer();
+		$mailo = new PHPMailer(true);
 		if($SMTPMODE=='sendmail') {
 			$mailo->IsSendmail();
 		}elseif($SMTPMODE=='smtp'){

From 281bf62af93e373d761b767af6cc316e4681d66a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:41:59 -0400
Subject: [PATCH 0917/1537] Fix log write() parameters in wrong order

---
 lib/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mail.php b/lib/mail.php
index 545b95da87..7eb2c4770c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -81,7 +81,7 @@ class OC_Mail {
 
 			$mailo->Send();
 			unset($mailo);
-			OC_Log::write('Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject,'mail',OC_Log::DEBUG);
+			OC_Log::write('mail', 'Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject, OC_Log::DEBUG);
 		} catch (Exception $exception) {
 			OC_Log::write('mail', $exception->getMessage(), OC_Log::DEBUG);
 		}

From 91a15bae76c4c4fca456c38fb51c8b944c92c341 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 16:02:43 -0400
Subject: [PATCH 0918/1537] Revert santizing toaddress, because PHPMailer now
 throws exceptions

---
 apps/files_sharing/ajax/email.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 0765bdd988..3026eb7467 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -5,10 +5,9 @@ OCP\JSON::callCheck();
 
 $user = OCP\USER::getUser();
 // TODO translations
-$toaddress = OCP\Util::sanitizeHtml($_POST['toaddress']);
 $type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
 $subject = $user.' shared a '.$type.' with you';
 $link = $_POST['link'];
 $text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
 $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
-OCP\Util::sendMail($toaddress, $toaddress, $subject, $text, $fromaddress, $user);
+OCP\Util::sendMail($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);

From 8890a4128015df0ad57101703d6c164ea54fe4ee Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 28 Jun 2012 21:26:39 -0400
Subject: [PATCH 0919/1537] Fix setting custom quota size for users, bug fix
 for oc-1128

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index dfa28e4c4c..771ed51f5f 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -186,7 +186,7 @@ $(document).ready(function(){
 	})
 	
 	$('input.quota-other').live('change',function(){
-		var uid=$(this).parent().parent().data('uid');
+		var uid=$(this).parent().parent().parent().data('uid');
 		var quota=$(this).val();
 		var select=$(this).prev();
 		var other=$(this);

From 88f4845ca33fd6f2988f230116e2190d15ab1866 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 20:04:18 -0400
Subject: [PATCH 0920/1537] Sanitization isn't required here

---
 core/ajax/share.php | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 33eea22352..4c5ef310b7 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -22,56 +22,43 @@ require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
 if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item'])) {
-	$itemType = OCP\Util::sanitizeHTML($_POST['itemType']);
-	$item = OCP\Util::sanitizeHTML($_POST['item']);
 	switch ($_POST['action']) {
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
-				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
-				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);
-				$permissions = OCP\Util::sanitizeHTML($_POST['permissions']);
-				$return = OCP\Share::share($itemType, $item, $shareType, $shareWith, $permissions);
+				$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 				// TODO May need to return private link
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
 		case 'unshare':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith'])) {
-				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
-				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);
-				$return = OCP\Share::unshare($itemType, $item, $shareType, $shareWith);
+				$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
 		case 'setTarget':
 			if (isset($_POST['newTarget'])) {
-				$newTarget = OCP\Util::sanitizeHTML($_POST['newTarget']);
-				$return = OCP\Share::setTarget($itemType, $item, $newTarget);
+				$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
 		case 'setPermissions':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
-				$shareType = OCP\Util::sanitizeHTML($_POST['shareType']);
-				$shareWith = OCP\Util::sanitizeHTML($_POST['shareWith']);
-				$permissions = OCP\Util::sanitizeHTML($_POST['permissions']);
-				$return = OCP\Share::setPermissions($itemType, $item, $shareType, $shareWith, $permissions);
+				$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
 	}
 } else if (isset($_GET['fetch']) && isset($_GET['itemType'])) {
-	$itemType = OCP\Util::sanitizeHTML($_GET['itemType']);
 	switch ($_GET['fetch']) {
 		case 'getItemsSharedStatuses':
-			$return = OCP\Share::getItemsShared($itemType, OCP\Share::FORMAT_STATUSES);
+			$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
 			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			break;
 		case 'getItem':
 			// TODO Check if the item was shared to the current user
 			if (isset($_GET['item'])) {
-				$item = OCP\Util::sanitizeHTML($_GET['item']);
-				$return = OCP\Share::getItemShared($itemType, $item);
+				$return = OCP\Share::getItemShared($_GET['itemType'], $_GET['item']);
 				($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			}
 			break;

From ac395dced16a3887005cb0f75806109ec5a3805c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 20:28:29 -0400
Subject: [PATCH 0921/1537] Rename $contacts to $has_contacts, it missed this
 commit: 7cb74a0

---
 apps/contacts/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index c1e33252f5..fbc3565c4d 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -15,7 +15,7 @@ OCP\App::checkAppEnabled('contacts');
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
 $has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 ? true : false); // just to check if there are any contacts.
-if($contacts === false) {
+if($has_contacts === false) {
 	OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG);
 }
 

From f496a9dea69ec387eb6979916c2569dc4d81b47e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 20:28:29 -0400
Subject: [PATCH 0922/1537] Rename $contacts to $has_contacts, it missed this
 commit: 7cb74a0

---
 apps/contacts/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index c1e33252f5..fbc3565c4d 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -15,7 +15,7 @@ OCP\App::checkAppEnabled('contacts');
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
 $has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 ? true : false); // just to check if there are any contacts.
-if($contacts === false) {
+if($has_contacts === false) {
 	OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG);
 }
 

From bdcfa4bb63800093ad47520c9874fb837f9bf2e9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 20:43:48 -0400
Subject: [PATCH 0923/1537] Add check if file is found in file cache

---
 lib/public/share.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/public/share.php b/lib/public/share.php
index 61014c6160..7356714219 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -562,6 +562,10 @@ class Share {
 				} else if (is_array($source)) {
 					$itemSource = $source['item'];
 					$fileSource = \OC_FileCache::getId($source['file']);
+					if ($fileSource == -1) {
+						\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the file could not be found in the file cache', \OC_Log::ERROR);
+						return false;
+					}
 				} else {
 					$itemSource = $source;
 					$fileSource = null;

From ecae3ea43055055d39080a512f247f89be3c22df Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 12 Jul 2012 10:52:30 -0400
Subject: [PATCH 0924/1537] Rename parents to collectionTypes,
 getCollectionItemTypes() shouldn't include the original item type

---
 lib/public/share.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 7356714219..a3ed7846b5 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -373,14 +373,15 @@ class Share {
 	* @return array
 	*/
 	private static function getCollectionItemTypes($itemType) {
-		$collections = array($itemType);
+		$collectionTypes = array($itemType);
 		foreach (self::$backendTypes as $type => $backend) {
-			if (in_array($backend['collectionOf'], $collections)) {
-				$collections[] = $type;
+			if (in_array($backend['collectionOf'], $collectionTypes)) {
+				$collectionTypes[] = $type;
 			}
 		}
-		if (count($collections) > 1) {
-			return $collections;
+		if (count($collectionTypes) > 1) {
+			unset($collectionTypes[0]);
+			return $collectionTypes;
 		}
 		return false;
 	}
@@ -401,8 +402,9 @@ class Share {
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $isSource = false) {
 		if ($backend = self::getBackend($itemType)) {
 			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
-			if ($parents = self::getCollectionItemTypes($itemType)) {
-				$where = "WHERE item_type IN ('".implode("','", $parents)."')";
+			if ($collectionTypes = self::getCollectionItemTypes($itemType)) {
+				$collectionTypes = array_merge(array($itemType), $collectionTypes);
+				$where = "WHERE item_type IN ('".implode("','", $collectionTypes)."')";
 			} else {
 				$where = "WHERE item_type = '".$itemType."'";
 			}
@@ -490,7 +492,7 @@ class Share {
 				}
 				$items[$item['id']] = $item;
 				// TODO Add in parent item types children?
-				if ($parents && in_array($item['item_type'], $parents)) {
+				if ($collectionTypes && in_array($item['item_type'], $collectionTypes)) {
 					$children[] = $item;
 				}
 			}

From 63b6f20e05391e65da1569ae5e897d1e279081f2 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 12 Jul 2012 11:59:48 -0400
Subject: [PATCH 0925/1537] Move already shared with check out of user and
 group cases, and add check for already shared with inside a collection

---
 lib/public/share.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index a3ed7846b5..3bf0a76a5d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -156,10 +156,6 @@ class Share {
 						return false;
 					}
 				}
-				if (self::getItems($itemType, $item, self::SHARE_TYPE_USER, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the user '.$shareWith, \OC_Log::ERROR);
-					return false;
-				}
 				break;
 			case self::SHARE_TYPE_GROUP:
 				if (!\OC_Group::groupExists($shareWith)) {
@@ -169,10 +165,6 @@ class Share {
 					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
 					return false;
 				}
-				if (self::getItems($itemType, $item, self::SHARE_TYPE_GROUP, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with the group '.$shareWith, \OC_Log::ERROR);
-					return false;
-				}
 				// Convert share with into an array with the keys group and users
 				$group = $shareWith;
 				$shareWith = array();
@@ -187,6 +179,21 @@ class Share {
 				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
 				return false;
 		}
+		if (self::getItems($itemType, $item, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
+			\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith, \OC_Log::ERROR);
+			return false;
+		}
+		if ($collectionTypes = self::getCollectionItemTypes($itemType)) {
+			foreach ($collectionTypes as $collectionType) {
+				$collections = self::getItems($collectionType, null, self::SHARE_TYPE_USER, $shareWith, $uidOwner);
+				if ($backend = self::getBackend($collectionType)) {
+					if ($backend->inCollection($collections, $item)) {
+						\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith.' inside a collection', \OC_Log::ERROR);
+						return false;
+					}
+				}
+			}
+		}
 		// If the item is a folder, scan through the folder looking for equivalent item types
 		if ($itemType == 'folder') {
 			$parentFolder = self::put('folder', $item, $shareType, $shareWith, $uidOwner, $permissions, true);

From f638340d1fb5d70e6776949d3cdc72597deba4ca Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 12 Jul 2012 14:29:51 -0400
Subject: [PATCH 0926/1537] Add check for folder item type as well

---
 lib/public/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 3bf0a76a5d..9743edd4a6 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -438,7 +438,7 @@ class Share {
 				if (isset($uidOwner)) {
 					$source = $backend->getSource($item, $uidOwner);
 					// If item type is a file, file source needs to be checked in case the item was converted
-					if ($itemType == 'file') {
+					if ($itemType == 'file' || $itemType == 'folder') {
 						$where .= " AND file_source = ".\OC_FileCache::getId($source['file']);
 					} else {
 						// Check if this item depends on a file and getSource() returned an array

From 967c6d7d3cfeb2f504ddc4301b902b39377c45fb Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 13 Jul 2012 13:25:43 +0200
Subject: [PATCH 0927/1537] allow command line based installation/setup

---
 lib/setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/setup.php b/lib/setup.php
index 2f73c486c9..027c84db09 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -257,7 +257,7 @@ class OC_Setup {
 				OC_Installer::installShippedApps();
 
 				//create htaccess files for apache hosts
-				if (strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+				if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
 					self::createHtaccess();
 				}
 

From 5de2a292fcfe9174542e7708b033c8026a2c46a6 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 13 Jul 2012 13:41:13 +0200
Subject: [PATCH 0928/1537] restructuring test suite invocation - now we load
 all test cases into one suite and execute this single suite. this is
 necessary to be able to generate one xml report and is also a precondition
 for code coverage analysis(which will follow soon)

---
 tests/index.php | 52 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/tests/index.php b/tests/index.php
index 691bf2a5d4..e91b3f0da5 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -26,39 +26,59 @@ require_once 'simpletest/mock_objects.php';
 require_once 'simpletest/collector.php';
 require_once 'simpletest/default_reporter.php';
 
+// test suite instance
+$testSuite=new TestSuite("ownCloud Unit Test Suite");
+
+// prepare the reporter
+if(OC::$CLI){
+	$reporter=new TextReporter;
+	$test=isset($_SERVER['argv'][1])?$_SERVER['argv'][1]:false;
+	if($test=='xml')
+	{
+		$reporter= new XmlReporter;
+		$test=false;
+	}
+}else{
+	$reporter='HtmlReporter';
+	$test=isset($_GET['test'])?$_GET['test']:false;
+}
+
 //load core test cases
-loadTests(dirname(__FILE__));
+loadTests(dirname(__FILE__), $testSuite, $test);
 
 //load app test cases
+
+//
+// TODO: define a list of apps to be enabled + enable them
+//
+
 $apps=OC_App::getEnabledApps();
 foreach($apps as $app){
 	if(is_dir(OC::$SERVERROOT.'/apps/'.$app.'/tests')){
-		loadTests(OC::$SERVERROOT.'/apps/'.$app.'/tests');
+		loadTests(OC::$SERVERROOT.'/apps/'.$app.'/tests', $testSuite, $test);
 	}
 }
 
-function loadTests($dir=''){
-	if(OC::$CLI){
-		$reporter='TextReporter';
-		$test=isset($_SERVER['argv'][1])?$_SERVER['argv'][1]:false;
-	}else{
-		$reporter='HtmlReporter';
-		$test=isset($_GET['test'])?$_GET['test']:false;
-	}
+// run the suite
+if($testSuite->getSize()>0){
+	$testSuite->run($reporter);
+}
+
+// helper below
+function loadTests($dir,$testSuite, $test){
 	if($dh=opendir($dir)){
 		while($name=readdir($dh)){
 			if($name[0]!='.'){//no hidden files, '.' or '..'
 				$file=$dir.'/'.$name;
 				if(is_dir($file)){
-					loadTests($file);
+					loadTests($file, $testSuite, $test);
 				}elseif(substr($file,-4)=='.php' and $file!=__FILE__){
 					$name=getTestName($file);
 					if($test===false or $test==$name or substr($name,0,strlen($test))==$test){
-						$testCase=new TestSuite($name);
-						$testCase->addFile($file);
-						if($testCase->getSize()>0){
-							$testCase->run(new $reporter());
-						}
+					        $extractor = new SimpleFileLoader();
+						$loadedSuite=$extractor->load($file);
+						if ($loadedSuite->getSize() > 0)
+						        $testSuite->add($loadedSuite);
 					}
 				}
 			}

From fd0c6da41009b20b0c0906d8ec895cbab54af832 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 13 Jul 2012 13:55:15 +0200
Subject: [PATCH 0929/1537] autotest.sh added: create an fresh environment
 using sqlite (mysql anf pg will follow) and executes the test suite

---
 autotest.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 autotest.sh

diff --git a/autotest.sh b/autotest.sh
new file mode 100755
index 0000000000..a5e28b6de9
--- /dev/null
+++ b/autotest.sh
@@ -0,0 +1,32 @@
+#preparation
+echo "Setup environment for sqlite testing ..."
+DATADIR=data-autotest
+rm -rf $DATADIR
+mkdir $DATADIR
+rm -rf config/config.php
+#cp autotest/config.sqlite.php config/autoconfig.php
+cat > ./config/autoconfig.php <<DELIM
+<?php
+\$AUTOCONFIG = array (
+  'installed' => false,
+  'dbtype' => 'sqlite',
+  'dbtableprefix' => 'oc_',
+  'datadirectory' => 'data',
+  'adminlogin' => 'admin',
+  'adminpass' => 'admin',
+  'directory' => '$PWD/$DATADIR',
+);
+DELIM
+
+php -f index.php
+
+#test execution
+echo 'Testing with sqlite ...'
+cd tests
+php -f index.php -- xml
+
+
+#
+# TODO: create config for mysql and postgres
+#
+

From 6ee228cac7e5aca1181113ca499bda6c04497da7 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 13 Jul 2012 15:10:30 +0200
Subject: [PATCH 0930/1537] rediect test results to autotest-results-sqlite.xml

---
 autotest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest.sh b/autotest.sh
index a5e28b6de9..a9794db698 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -23,7 +23,7 @@ php -f index.php
 #test execution
 echo 'Testing with sqlite ...'
 cd tests
-php -f index.php -- xml
+php -f index.php -- xml > autotest-results-sqlite.xml
 
 
 #

From b45d3ced79b5a20034c85973760e2f120e1574e7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 13 Jul 2012 22:44:35 +0200
Subject: [PATCH 0931/1537] fix remote and public.php

---
 apps/calendar/appinfo/version      |  2 +-
 apps/contacts/appinfo/version      |  2 +-
 apps/files/appinfo/version         |  2 +-
 apps/files_sharing/appinfo/version |  2 +-
 apps/gallery/appinfo/version       |  2 +-
 apps/media/appinfo/version         |  2 +-
 lib/app.php                        |  2 +-
 public.php                         |  1 +
 remote.php                         | 10 ++++------
 9 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
index 2eb3c4fe4e..cb0c939a93 100644
--- a/apps/calendar/appinfo/version
+++ b/apps/calendar/appinfo/version
@@ -1 +1 @@
-0.5
+0.5.2
diff --git a/apps/contacts/appinfo/version b/apps/contacts/appinfo/version
index 7dff5b8921..373f8c6f07 100644
--- a/apps/contacts/appinfo/version
+++ b/apps/contacts/appinfo/version
@@ -1 +1 @@
-0.2.1
\ No newline at end of file
+0.2.3
\ No newline at end of file
diff --git a/apps/files/appinfo/version b/apps/files/appinfo/version
index 8cfbc905b3..9c1218c201 100644
--- a/apps/files/appinfo/version
+++ b/apps/files/appinfo/version
@@ -1 +1 @@
-1.1.1
\ No newline at end of file
+1.1.3
\ No newline at end of file
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index 7dff5b8921..f4778493c5 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.2.1
\ No newline at end of file
+0.2.2
\ No newline at end of file
diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version
index 8f0916f768..4b9fcbec10 100644
--- a/apps/gallery/appinfo/version
+++ b/apps/gallery/appinfo/version
@@ -1 +1 @@
-0.5.0
+0.5.1
diff --git a/apps/media/appinfo/version b/apps/media/appinfo/version
index e6adf3fc7b..44bb5d1f74 100644
--- a/apps/media/appinfo/version
+++ b/apps/media/appinfo/version
@@ -1 +1 @@
-0.4
\ No newline at end of file
+0.4.1
\ No newline at end of file
diff --git a/lib/app.php b/lib/app.php
index 4c2c43ec26..caf8bd8252 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -608,7 +608,7 @@ class OC_App{
 		//set remote/public handelers
 		$appData=self::getAppInfo($appid);
 		foreach($appData['remote'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $path);
+			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $appid.'/'.$path);
 		}
 		foreach($appData['public'] as $name=>$path){
 			OCP\CONFIG::setAppValue('core', 'public_'.$name, $appid.'/'.$path);
diff --git a/public.php b/public.php
index 8846769f46..8383f36a24 100644
--- a/public.php
+++ b/public.php
@@ -10,6 +10,7 @@ if(is_null($file)){
 
 $parts=explode('/',$file,2);
 $app=$parts[0];
+
 OC_Util::checkAppEnabled($app);
 OC_App::loadApp($app);
 
diff --git a/remote.php b/remote.php
index bdce867aab..8c02c24e2a 100644
--- a/remote.php
+++ b/remote.php
@@ -15,27 +15,25 @@ if (!$pos = strpos($path_info, '/', 1)) {
 	$pos = strlen($path_info);
 }
 $service=substr($path_info, 1, $pos-1);
+
 $file = OC_AppConfig::getValue('core', 'remote_' . $service);
-$file = preg_replace('/apps\//','', $file); //Todo Remove after Multiappdir migration
 
 if(is_null($file)){
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
 
-$file = ltrim ($file, '/');
-
 $parts=explode('/', $file, 2);
 $app=$parts[0];
 switch ($app) {
+	case 'core':
+		$file =  OC::$SERVERROOT .'/'. $file;
+		break;
 	default:
 		OC_Util::checkAppEnabled($app);
 		OC_App::loadApp($app);
 		$file = OC_App::getAppPath($app) .'/'. $parts[1];
 		break;
-	case 'core':
-		$file =  OC::$SERVERROOT .'/'. $file;
-		break;
 }
 $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
 require_once($file);

From 7d1f644011e23d19cc22d431ae5e6cf31144db50 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 13 Jul 2012 23:24:22 +0200
Subject: [PATCH 0932/1537] use new way to register remote/public.php entries
 in user_webfinger

---
 apps/user_webfinger/appinfo/app.php  | 2 --
 apps/user_webfinger/appinfo/info.xml | 4 ++++
 apps/user_webfinger/appinfo/version  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/user_webfinger/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
index 3336af6682..b3d9bbc7f3 100644
--- a/apps/user_webfinger/appinfo/app.php
+++ b/apps/user_webfinger/appinfo/app.php
@@ -1,3 +1 @@
 <?php
-OCP\CONFIG::setAppValue('core', 'public_host-meta', '/apps/user_webfinger/host-meta.php');
-OCP\CONFIG::setAppValue('core', 'public_webfinger', '/apps/user_webfinger/webfinger.php');
diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml
index 4e28814a26..f74e5d3f93 100644
--- a/apps/user_webfinger/appinfo/info.xml
+++ b/apps/user_webfinger/appinfo/info.xml
@@ -7,4 +7,8 @@
 	<author>Michiel de Jong, Florian Hülsmann</author>
 	<require>4</require>
 	<shipped>true</shipped>
+	<public>
+		<host-meta>host-meta.php</host-meta>
+		<webfinger>webfinger.php</webfinger>
+	</public>
 </info>
diff --git a/apps/user_webfinger/appinfo/version b/apps/user_webfinger/appinfo/version
index 1d71ef9744..a2268e2de4 100644
--- a/apps/user_webfinger/appinfo/version
+++ b/apps/user_webfinger/appinfo/version
@@ -1 +1 @@
-0.3
\ No newline at end of file
+0.3.1
\ No newline at end of file

From 880d80be674fe4cc5c6be40980567ccd4b4553a5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jul 2012 00:10:17 +0200
Subject: [PATCH 0933/1537] fix minified js and css

---
 remote.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/remote.php b/remote.php
index 8c02c24e2a..8461eea19a 100644
--- a/remote.php
+++ b/remote.php
@@ -23,6 +23,8 @@ if(is_null($file)){
 	exit;
 }
 
+$file=ltrim($file,'/');
+
 $parts=explode('/', $file, 2);
 $app=$parts[0];
 switch ($app) {

From d45d73eecfcc4cff7e7edba8678509e78bec7e07 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 10 Jul 2012 13:16:26 +0200
Subject: [PATCH 0934/1537] Try to avoid occasional error messages.

---
 apps/contacts/js/jquery.inview.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/js/jquery.inview.js b/apps/contacts/js/jquery.inview.js
index 01900b0b4b..9687cd8336 100644
--- a/apps/contacts/js/jquery.inview.js
+++ b/apps/contacts/js/jquery.inview.js
@@ -62,8 +62,8 @@
 
   function getViewportOffset() {
     return {
-      top:  w.pageYOffset || documentElement.scrollTop   || d.body.scrollTop,
-      left: w.pageXOffset || documentElement.scrollLeft  || d.body.scrollLeft
+      top:  w.pageYOffset || documentElement.scrollTop   || (d.body?d.body.scrollTop:0),
+      left: w.pageXOffset || documentElement.scrollLeft  || (d.body?d.body.scrollLeft:0)
     };
   }
 

From 140263003afd35360a734fab7b32ca7b0dcbb3a0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 10 Jul 2012 14:55:03 +0200
Subject: [PATCH 0935/1537] Give default address book a more intuitive name and
 replace spaces with underscores in uri.

---
 apps/contacts/lib/addressbook.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index a31ee25461..9d584ff6d6 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -133,7 +133,7 @@ class OC_Contacts_Addressbook{
 		if(is_null($uid)) {
 			$uid = OCP\USER::getUser();
 		}
-		$id = self::add($uid,'default','Default Address Book');
+		$id = self::add($uid,'Contacts','Default Address Book');
 		if($id !== false) {
 			self::setActive($id, true);
 		}
@@ -306,7 +306,7 @@ class OC_Contacts_Addressbook{
 	 * @return string new name
 	 */
 	public static function createURI($name,$existing){
-		$name = strtolower($name);
+		$name = str_replace(' ', '_', strtolower($name));
 		$newname = $name;
 		$i = 1;
 		while(in_array($newname,$existing)){

From 51a451839671f14ad84b7db8d091ae451006d5f7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 09:35:39 -0400
Subject: [PATCH 0936/1537] Add support for CRUDS permissions

---
 lib/public/share.php | 86 ++++++++++++++++++++++++++++----------------
 1 file changed, 55 insertions(+), 31 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 9743edd4a6..43ce5b8211 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -27,15 +27,21 @@ namespace OCP;
 */
 class Share {
 
-	
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
 	const SHARE_TYPE_PRIVATE_LINK = 3;
 
-	const PERMISSION_READ = 0;
-	const PERMISSION_UPDATE = 1;
-	const PERMISSION_DELETE = 2;
-	const PERMISSION_SHARE = 3;
+	/** CRUDS permissions (Create, Read, Update, Delete, Share) using a bitmask
+	* Construct permissions for share() and setPermissions with Or (|) e.g. Give user read and update permissions: PERMISSION_READ | PERMISSION_UPDATE
+	* Check if permission is granted with And (&) e.g. Check if delete is granted: if ($permissions & PERMISSION_DELETE)
+	* Remove permissions with And (&) and Not (~) e.g. Remove the update permission: $permissions &= ~PERMISSION_UPDATE
+	* Apps are required to handle permissions on their own, this class only stores and manages the permissions of shares
+	*/
+	const PERMISSION_CREATE = 4;
+	const PERMISSION_READ = 1;
+	const PERMISSION_UPDATE = 2;
+	const PERMISSION_DELETE = 8;
+	const PERMISSION_SHARE = 16;
 
 	const FORMAT_NONE = -1;
 	const FORMAT_STATUSES = -2;
@@ -134,7 +140,7 @@ class Share {
 	* @param string Item
 	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
-	* @param string
+	* @param int CRUDS permissions
 	* @return Returns true on success or false on failure
 	*/
 	public static function share($itemType, $item, $shareType, $shareWith, $permissions) {
@@ -309,7 +315,7 @@ class Share {
 	* @param string Item
 	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
-	* @param
+	* @param int CRUDS permissions
 	* @return Returns true on success or false on failure
 	*/
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
@@ -318,33 +324,47 @@ class Share {
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
-				if (!isset($result['permissions']) || $permissions > $result['permissions']) {
-					\OC_Log::write('OCP\Share', '', \OC_Log::ERROR);
+				if (~(int)$result['permissions'] & $permissions) {
+					\OC_Log::write('OCP\Share', 'Setting permissions for '.$item.' failed, because the permissions exceed permissions granted to the parent item', \OC_Log::ERROR);
 					return false;
 				}
 			}
 			$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = ? WHERE id = ?');
 			$query->execute(array($permissions, $item['id']));
-			// Check if permissions were reduced
-			if ($permissions < $item['permissions']) {
-				// Reduce the permissions for all reshares of this item
-				$ids = array($item['id']);
-				$query = \OC_DB::prepare('SELECT id, parent, permissions FROM *PREFIX*share WHERE item_source = ?');
-				$result = $query->execute(array($item['item_source']));
-				while ($item = $result->fetchRow()) {
-					if (in_array($item['parent'], $ids) && $item['permissions'] > $permissions) {
-						$ids[] = $item['id'];
+			// Check if permissions were removed
+			if ($item['permissions'] & ~$permissions) {
+				// If share permission is removed all reshares must be deleted
+				if (($item['permissions'] & self::PERMISSION_SHARE) && (~$permissions & self::PERMISSION_SHARE)) {
+					self::delete($item['id'], true);
+				} else {
+					$ids = array();
+					$parents = array($item['id']);
+					while (!empty($parents)) {
+						$parents = "'".implode("','", $parents)."'";
+						$query = \OC_DB::prepare('SELECT id, permissions FROM *PREFIX*share WHERE parent IN ('.$parents.')');
+						$result = $query->execute();
+						// Reset parents array, only go through loop again if items are found that need permissions removed
+						$parents = array();
+						while ($item = $result->fetchRow()) {
+							// Check if permissions need to be removed
+							if ($item['permissions'] & ~$permissions) {
+								// Add to list of items that need permissions removed
+								$ids[] = $item['id'];
+								$parents[] = $item['id'];
+							}
+						}
+					}
+					// Remove the permissions for all reshares of this item
+					if (!empty($ids)) {
+						$ids = "'".implode("','", $ids)."'";
+						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = permissions & ? WHERE id IN ('.$ids.')');
+						$query->execute(array($permissions));
 					}
-				}
-				// Remove parent item from array, this item's permissions already got updated
-				unset($ids[0]);
-				if (!empty($ids)) {
-					$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = ? WHERE id IN (?)');
-					$query->execute(array($permissions, implode(',', $ids)));
 				}
 			}
 			return true;
 		}
+		\OC_Log::write('OCP\Share', 'Setting permissions for '.$item.' failed, because the item was not found', \OC_Log::ERROR);
 		return false;
 	}
 
@@ -479,7 +499,7 @@ class Share {
 				$select = 'id, item_type, item, item_source, share_type';
 			} else {
 				if (isset($uidOwner)) {
-					$select = 'id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source';
+					$select = 'id, item_type, item, item_source, parent, share_type, share_with, permissions, stime, file_source';
 				} else {
 					$select = '*';
 				}
@@ -556,12 +576,16 @@ class Share {
 		if ($backend = self::getBackend($itemType)) {
 			// Check if this is a reshare
 			if ($checkReshare = self::getItemSharedWith($itemType, $item)) {
-				// TODO Check if resharing is allowed
-				// TODO Don't check if inside folder
-				$parent = $checkReshare['id'];
-				$itemSource = $checkReshare['item_source'];
-				$fileSource = $checkReshare['file_source'];
-				$fileTarget = $checkReshare['file_target'];
+				if ($checkReshare['permissions'] & self::PERMISSION_SHARE) {
+					// TODO Don't check if inside folder
+					$parent = $checkReshare['id'];
+					$itemSource = $checkReshare['item_source'];
+					$fileSource = $checkReshare['file_source'];
+					$fileTarget = $checkReshare['file_target'];
+				} else {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because resharing is not allowed', \OC_Log::ERROR);
+					return false;
+				}
 			} else {
 				$parent = null;
 				$source = $backend->getSource($item, $uidOwner);

From 8de69fcb18619a16fcccb9377d6c7b92b5ffe33d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 10:19:18 -0400
Subject: [PATCH 0937/1537] Update documentation

---
 lib/public/share.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 43ce5b8211..e1d668c2ae 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -138,10 +138,10 @@ class Share {
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
 	* @param string Item
-	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
-	* @return Returns true on success or false on failure
+	* @return bool Returns true on success or false on failure
 	*/
 	public static function share($itemType, $item, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
@@ -227,7 +227,7 @@ class Share {
 	* @brief Unshare an item from a user, group, or delete a private link
 	* @param string Item type
 	* @param string Item
-	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @return Returns true on success or false on failure
 	*/
@@ -313,7 +313,7 @@ class Share {
 	* @brief Set the permissions of an item for a specific user or group
 	* @param string Item type
 	* @param string Item
-	* @param int SHARETYPE_USER | SHARETYPE_GROUP | SHARETYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @return Returns true on success or false on failure
@@ -417,11 +417,14 @@ class Share {
 	* @brief Get shared items from the database
 	* @param string Item type
 	* @param string Item or item target (optional)
-	* @param string User the item(s) is(are) shared with
-	* @param string|bool Group the item(s) is(are) shared with
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_PRIVATE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
+	* @param string User or group the item is being shared with
 	* @param string User that is the owner of shared items (optional)
-	* @param bool Translate the items back into their original source (optional)
+	* @param int Format to convert items to with formatItems()
+	* @param mixed Parameters to pass to formatItems()
 	* @param int Number of items to return, -1 to return all matches (optional)
+	* @param bool Is item the source (optional)
+	* @return mixed
 	*
 	* See public functions getItem(s)... for parameter usage
 	*
@@ -551,12 +554,11 @@ class Share {
 	* @brief Put shared item into the database
 	* @param string Item type
 	* @param string Item
-	* @param string|array User(s) the item is being shared with
-	* @param string|null Group the item is being shared with
-	* @param string Owner of the item
-	* @param string
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param string User or group the item is being shared with
+	* @param int CRUDS permissions
 	* @param bool|array Parent folder target (optional)
-	* @return bool
+	* @return bool Returns true on success or false on failure
 	*/
 	private static function put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
 		// Check file extension for an equivalent item type to convert to

From bbbfc2c56543c4d04e470f5429ddec94c61d8c3a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 10:52:31 -0400
Subject: [PATCH 0938/1537] Fix delete(), it was going in an infinite loop

---
 lib/public/share.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index e1d668c2ae..eeee64327c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -711,17 +711,26 @@ class Share {
 	* @param bool
 	*/
 	private static function delete($parent, $excludeParent = false) {
-		$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN (?)');
 		$ids = array($parent);
-		while ($item = $query->execute(array(implode("','", $ids)))->fetchRow()) {
-			$ids[] = $item['id'];
+		$parents = array($parent);
+		while (!empty($parents)) {
+			$parents = "'".implode("','", $parents)."'";
+			$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.')');
+			$result = $query->execute();
+			// Reset parents array, only go through loop again if items are found
+			$parents = array();
+			while ($item = $result->fetchRow()) {
+				$ids[] = $item['id'];
+				$parents[] = $item['id'];
+			}
 		}
 		if ($excludeParent) {
 			unset($ids[0]);
 		}
 		if (!empty($ids)) {
-			$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE id IN (?)');
-			$query->execute(array(implode("','", $ids)));
+			$ids = "'".implode("','", $ids)."'";
+			$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE id IN ('.$ids.')');
+			$query->execute();
 		}
 	}
 

From 459bcd8d5ea337c2f9e7c37f6561e780579a528d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 10:55:34 -0400
Subject: [PATCH 0939/1537] Update documentation

---
 lib/public/share.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index eeee64327c..5b9c17c6c8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -706,9 +706,8 @@ class Share {
 
 	/**
 	* @brief Delete all reshares of an item
-	* @param string
 	* @param int Id of item to delete
-	* @param bool
+	* @param bool If true, exclude the parent from the delete
 	*/
 	private static function delete($parent, $excludeParent = false) {
 		$ids = array($parent);

From 0e9ab5cf2a0705124a32d7f66298de72e35d1595 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 11:02:16 -0400
Subject: [PATCH 0940/1537] Fix post_deleteUser(), column name changed and
 item_source is no longer needed

---
 lib/public/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 5b9c17c6c8..445bd52164 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -739,10 +739,10 @@ class Share {
 	
 	public static function post_deleteUser($arguments) {
 		// Delete any items shared with the deleted user
-		$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE uid_shared_with = ?');
+		$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE share_with = ?');
 		$result = $query->execute(array($arguments['uid']));
 		// Delete any items the deleted user shared
-		$query = \OC_DB::prepare('SELECT id, item_source FROM *PREFIX*share WHERE uid_owner = ?');
+		$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE uid_owner = ?');
 		$result = $query->execute(array($arguments['uid']));
 		while ($item = $result->fetchRow()) {
 			self::delete($item['id']);

From 82dea705d48f192cdeae942753141f3ea7770721 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 11:53:02 -0400
Subject: [PATCH 0941/1537] Add option to delete() to check the owner of the
 first search of reshares

---
 lib/public/share.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 445bd52164..50f2ff1c8a 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -707,15 +707,22 @@ class Share {
 	/**
 	* @brief Delete all reshares of an item
 	* @param int Id of item to delete
-	* @param bool If true, exclude the parent from the delete
+	* @param bool If true, exclude the parent from the delete (optional)
+	* @param string The user that the parent was shared with (optinal)
 	*/
-	private static function delete($parent, $excludeParent = false) {
+	private static function delete($parent, $excludeParent = false, $uidOwner = null) {
 		$ids = array($parent);
 		$parents = array($parent);
 		while (!empty($parents)) {
 			$parents = "'".implode("','", $parents)."'";
-			$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.')');
-			$result = $query->execute();
+			// Check the owner on the first search of reshares, useful for finding and deleting the reshares by a single user of a group share
+			if (count($ids) == 1 && isset($uidOwner)) {
+				$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.') AND uid_owner = ?');
+				$result = $query->execute(array($uidOwner));
+			} else {
+				$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.')');
+				$result = $query->execute();
+			}
 			// Reset parents array, only go through loop again if items are found
 			$parents = array();
 			while ($item = $result->fetchRow()) {

From cc6c940b9ab814b6674a36b218b1be26e94a26bd Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 11:55:22 -0400
Subject: [PATCH 0942/1537] Implement post_removeFromGroup()

---
 lib/public/share.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 50f2ff1c8a..b1f7468c83 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -761,7 +761,16 @@ class Share {
 	}
 
 	public static function post_removeFromGroup($arguments) {
-		// TODO
+		$query = \OC_DB::prepare('SELECT id, share_type FROM *PREFIX*share WHERE (share_type = ? AND share_with = ?) OR (share_type = ? AND share_with = ?)');
+		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid'], self::$shareTypeGroupUserUnique, $arguments['uid']));
+		while ($item = $result->fetchRow()) {
+			if ($item['share_type'] == self::SHARE_TYPE_GROUP) {
+				// Delete all reshares by this user of the group share
+				self::delete($item['id'], true, $arguments['uid']);
+			} else {
+				self::delete($item['id']);
+			}
+		}
 	}
 
 }

From 1ff2dd8f63efdc67302e427601b619da5867d438 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 14:06:57 -0400
Subject: [PATCH 0943/1537] Listen to post_deleteUser, post_addToGroup, and
 post_removeFromGroup hooks

---
 lib/public/share.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/public/share.php b/lib/public/share.php
index b1f7468c83..75dea92eea 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -21,6 +21,10 @@
 
 namespace OCP;
 
+\OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+\OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+\OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+
 /**
 * This class provides the ability for apps to share their content between users.
 * Apps must create a backend class that extends OCP\Share_Backend and register it with this class.

From b455149bae9d764e36f2f61bfdea58f7c8d1f040 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 14 Jul 2012 16:56:17 -0400
Subject: [PATCH 0944/1537] Fix undo delete user

---
 settings/js/users.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 771ed51f5f..63ad426ecf 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -47,25 +47,24 @@ UserList={
 		if( !UserList.deleteCanceled && UserList.deleteUid ){
 			
 			// Delete user via ajax
-			$.post(
-				OC.filePath('settings','ajax','removeuser.php'),
-				{username:UserList.deleteUid},
-				function(result){
-					
-					// Remove undo option, & remove user from table
-					boolOperationFinished( 
-						data, function(){
-							$('#notification').fadeOut();
-							$('tr').filterAttr( 'data-uid', username ).remove();
-							UserList.deleteCanceled=true;
-							UserList.deleteFiles=null;
-							if( ready ){
-								ready();
-							}
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
+				async: false,
+				data: { username: UserList.deleteUid },
+				success: function(result) {
+					if (result.status == 'success') {
+						// Remove undo option, & remove user from table
+						$('#notification').fadeOut();
+						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+						UserList.deleteCanceled = true;
+						UserList.deleteFiles = null;
+						if (ready) {
+							ready();
 						}
-					);
+					}
 				}
-			);
+			});
  		}
 	}
 }

From 87912a8c6595e90b3248bc84dce6e0693253b81d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 14 Jul 2012 14:25:25 +0200
Subject: [PATCH 0945/1537] Fix loading previous or next contact after deleting
 one.

---
 apps/contacts/js/contacts.js | 203 ++++++++++++++++++++++++++++++-----
 1 file changed, 177 insertions(+), 26 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index dd194db016..b0274201ac 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -258,7 +258,7 @@ Contacts={
 			$('#contacts_deletecard').tipsy({gravity: 'ne'});
 			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
 			$('#contacts_propertymenu_button').tipsy();
-			$('#contacts_newcontact, #chooseaddressbook').tipsy({gravity: 'sw'});
+			$('#contacts_newcontact, #contacts_import, #chooseaddressbook').tipsy({gravity: 'sw'});
 
 			$('body').click(function(e){
 				if(!$(e.target).is('#contacts_propertymenu_button')) {
@@ -441,13 +441,13 @@ Contacts={
 								var newid = '', bookid;
 								var curlistitem = $('#contacts li[data-id="'+jsondata.data.id+'"]');
 								var newlistitem = curlistitem.prev('li');
-								if(newlistitem == undefined) {
+								if(!newlistitem) {
 									newlistitem = curlistitem.next('li');
 								}
 								curlistitem.remove();
-								if(!$(newlistitem).is('li')) {
+								if($(newlistitem).is('li')) {
 									newid = newlistitem.data('id');
-									bookid = newlistitem.data('id');
+									bookid = newlistitem.data('bookid');
 								}
 								$('#rightcontent').data('id',newid);
 								this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
@@ -774,6 +774,7 @@ Contacts={
 				}
 			},
 			deleteProperty:function(obj, type){
+				console.log('deleteProperty');
 				Contacts.UI.loading(obj, true);
 				var checksum = Contacts.UI.checksumFor(obj);
 				if(checksum) {
@@ -1377,6 +1378,21 @@ Contacts={
 					}
 				  });
 			},
+			addAddressbook:function(name, description, cb) {
+				$.post(OC.filePath('contacts', 'ajax', 'addaddressbook.php'), { name: name, description: description, active: true },
+					function(jsondata){
+						if(jsondata.status == 'success'){
+							if(cb) {
+								cb(jsondata.data);
+							}
+							//Contacts.UI.Contacts.update();
+						} else {
+							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+							return false;
+						}
+				});
+
+			},
 			newAddressbook:function(object){
 				var tr = $(document.createElement('tr'))
 					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
@@ -1508,25 +1524,24 @@ Contacts={
 					.load(OC.filePath('contacts', 'ajax', 'importaddressbook.php'));
 				$(object).closest('tr').after(tr).hide();
 			},
-			doImport:function(path, file){
-				$(Contacts.UI.Addressbooks.droptarget).html(t('contacts', 'Importing...'));
-				Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, true);
-				var id = $('#importaddressbook_dialog').find('#book').val();
-				$.post(OC.filePath('contacts', '', 'import.php'), { id: id, path: path, file: file, fstype: 'OC_FilesystemView' },
-					function(jsondata){
-						if(jsondata.status == 'success'){
-							Contacts.UI.Addressbooks.droptarget.html(t('contacts', 'Import done. Success/Failure: ')+jsondata.data.imported+'/'+jsondata.data.failed);
-							$('#chooseaddressbook_dialog').find('#close_button').val(t('contacts', 'OK'));
-							Contacts.UI.Contacts.update();
-							setTimeout(
-									function() {
-										$(Contacts.UI.Addressbooks.droptarget).html(Contacts.UI.Addressbooks.droptext);
-									}, 5000);
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-				});
-				Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, false);
+			doImport:function(name, file, aid){
+				var cImport = function(id, file) {
+					$.post(OC.filePath('contacts', '', 'import.php'), { id: id, file: file, fstype: 'OC_FilesystemView' },
+						function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.Contacts.update(undefined, id);
+							} else {
+								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+							}
+					});
+				}
+				if(!aid) {
+					aid = Contacts.UI.Addressbooks.addAddressbook(name, t('contacts', 'Imported address book'), function(addressbook) {
+						cImport(addressbook.id, file);
+					});
+				} else {
+					cImport(aid, file);
+				}
 			},
 			submit:function(button, bookid){
 				var displayname = $("#displayname_"+bookid).val().trim();
@@ -1591,6 +1606,13 @@ Contacts={
 			},
 			// Reload the contacts list.
 			update:function(id, aid, start){
+				if(!start) {
+					if(aid) {
+						$('#contacts h3[data-id="'+aid+'"],#contacts ul[data-id="'+aid+'"]').remove();
+					} else {
+						$('#contacts').empty();
+					}
+				}
 				self = this;
 				console.log('update: ' + aid + ' ' + start);
 				var firstrun = false;
@@ -1605,12 +1627,12 @@ Contacts={
 						$.each(jsondata.data.entries, function(b, book) { 
 							if($('#contacts h3[data-id="'+b+'"]').length == 0) {
 								firstrun = true;
-								
+								// TODO: Make sure address books are sorted properly.
 								if($('#contacts h3').length == 0) {
-									$('#contacts').html('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
+									$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
 								} else {
 									if(!$('#contacts h3[data-id="'+b+'"]').length) {
-										$('<h3 class="addressbook" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
+										$('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
 										.appendTo('#contacts');
 									}
 								}
@@ -1800,6 +1822,135 @@ $(document).ready(function(){
 		xhr.send(file);
 	}
 
+	// Import using jquery.fileupload
+	$(function() {
+		$('#contacts_import').click(function() {
+			$('#import_upload_start').click();
+			return false;
+		});
+		$('#import_upload_start').fileupload({
+			dropZone: $('#contacts'), // restrict dropZone to content div
+			add: function(e, data) {
+				var files = data.files;
+				var totalSize=0;
+				if(files){
+					for(var i=0;i<files.length;i++){
+						if(files[i].size ==0 && files[i].type== '')
+						{
+							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
+							return;
+						}
+						totalSize+=files[i].size;
+					}
+				}
+				if(totalSize>$('#max_upload').val()){
+					console.log('upload too large');
+				}else{
+					if($.support.xhrFileUpload) {
+						// TODO: First upload file(s) and cache names in an array, then check if we know
+						// the aid, otherwise ask user, then import files.
+						for(var i=0;i<files.length;i++){
+							var fileName = files[i].name;
+							var dropTarget;
+							if($(e.originalEvent.target).is('h3')) {
+								console.log('h3');
+								dropTarget = $(e.originalEvent.target).next('ul');
+							} else {
+								dropTarget = $(e.originalEvent.target).closest('ul');
+							}
+							if(dropTarget && dropTarget.hasClass('contacts')) { // TODO: More thorough check for where we are.
+								var aid = dropTarget.attr('data-id');
+								console.log('aid: ' + aid);
+								var jqXHR =  $('#import_upload_start').fileupload('send', {files: files[i],
+										formData: function(form) {
+											console.log(form.html());
+											var formArray = form.serializeArray();
+											formArray['aid'] = aid;
+											return formArray;
+										}}).success(function(result, textStatus, jqXHR) {
+											if(result.status == 'success') {
+												// import the file
+												Contacts.UI.Addressbooks.doImport(result.data.name, result.data.file, aid);
+											} else {
+												console.log('Error: ' + response.data.message);
+											}
+										})
+								.error(function(jqXHR, textStatus, errorThrown) {
+									console.log(errorThrown, textStatus);
+									if(errorThrown === 'abort') {
+										console.log('abort');
+									}
+								});
+							} else {
+								var jqXHR =  $('#import_upload_start').fileupload('send', {files: files[i]})
+									.success(function(result, textStatus, jqXHR) {
+										if(result.status == 'success') {
+											// import the file
+											Contacts.UI.Addressbooks.doImport(result.data.name, result.data.file);
+										} else {
+											console.log('Error: ' + response.data.message);
+										}
+									})
+									.error(function(jqXHR, textStatus, errorThrown) {
+										console.log(jqXHR.responseText, errorThrown, textStatus);
+										if(errorThrown === 'abort') {
+										}
+									});
+							}
+						}
+					}else{
+						data.submit().success(function(data, status) {
+							response = jQuery.parseJSON(data[0].body.innerText);
+							if(response[0] != undefined && response[0].status == 'success') {
+								var file=response[0];
+								delete uploadingFiles[file.name];
+								$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
+								var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
+								if(size==t('files','Pending')){
+									$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
+								}
+								FileList.loadingDone(file.name);
+							} else {
+								$('#notification').text(t('files', response.data.message));
+								$('#notification').fadeIn();
+								$('#fileList > tr').not('[data-mime]').fadeOut();
+								$('#fileList > tr').not('[data-mime]').remove();
+							}
+						});
+					}
+				}
+			},
+			fail: function(e, data) {
+				console.log('fail');
+				// TODO: cancel upload & display error notification
+			},
+			progress: function(e, data) {
+				// TODO: show nice progress bar in file row
+			},
+			progressall: function(e, data) {
+				var progress = (data.loaded/data.total)*100;
+				console.log('progress: ' + progress);
+				$('#uploadprogressbar').progressbar('value',progress);
+			},
+			start: function(e, data) {
+				console.log('start');
+				$('#uploadprogressbar').progressbar({value:0});
+				$('#uploadprogressbar').fadeIn();
+				if(data.dataType != 'iframe ') {
+					$('#upload input.stop').show();
+				}
+			},
+			stop: function(e, data) {
+				console.log('stop');
+				if(data.dataType != 'iframe ') {
+					$('#upload input.stop').hide();
+				}	
+				$('#uploadprogressbar').progressbar('value',100);
+				$('#uploadprogressbar').fadeOut();
+			}
+		})
+	});
+	
 	Contacts.UI.loadHandlers();
 	Contacts.UI.Contacts.update(id);
 });

From eba4f080159f0a97f82c79f8b57b6ce45ef127b5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 04:15:57 +0200
Subject: [PATCH 0946/1537] Refactored contacts import.

---
 apps/contacts/ajax/addaddressbook.php         |  35 ++
 apps/contacts/ajax/importaddressbook.php      |  23 -
 apps/contacts/ajax/selectaddressbook.php      |  16 +
 apps/contacts/ajax/uploadimport.php           |  12 +-
 apps/contacts/css/contacts.css                |   1 +
 apps/contacts/import.php                      |   7 +-
 apps/contacts/index.php                       |   1 +
 apps/contacts/js/contacts.js                  | 417 ++++++++----------
 apps/contacts/lib/app.php                     |   2 +-
 apps/contacts/templates/index.php             |  15 +-
 .../templates/part.chooseaddressbook.php      |   1 -
 .../templates/part.importaddressbook.php      |  38 --
 .../templates/part.selectaddressbook.php      |  27 ++
 13 files changed, 286 insertions(+), 309 deletions(-)
 create mode 100644 apps/contacts/ajax/addaddressbook.php
 delete mode 100644 apps/contacts/ajax/importaddressbook.php
 create mode 100644 apps/contacts/ajax/selectaddressbook.php
 delete mode 100644 apps/contacts/templates/part.importaddressbook.php
 create mode 100644 apps/contacts/templates/part.selectaddressbook.php

diff --git a/apps/contacts/ajax/addaddressbook.php b/apps/contacts/ajax/addaddressbook.php
new file mode 100644
index 0000000000..3d7885fe46
--- /dev/null
+++ b/apps/contacts/ajax/addaddressbook.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+ 
+
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
+require_once('loghandler.php');
+
+debug('name: '.$_POST['name']);
+
+$userid = OCP\USER::getUser();
+$name = isset($_POST['name'])?trim(strip_tags($_POST['name'])):null;
+$description = isset($_POST['description'])?trim(strip_tags($_POST['description'])):null;
+
+if(is_null($name)) {
+	bailOut('Cannot add addressbook with an empty name.');
+}
+$bookid = OC_Contacts_Addressbook::add($userid, $name, $description);
+if(!$bookid) {
+	bailOut('Error adding addressbook: '.$name);
+}
+
+if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
+	bailOut('Error activating addressbook.');
+}
+$addressbook = OC_Contacts_App::getAddressbook($bookid);
+OCP\JSON::success(array('data' => $addressbook));
diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
deleted file mode 100644
index 6b5b06681c..0000000000
--- a/apps/contacts/ajax/importaddressbook.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
-$freeSpace=OC_Filesystem::free_space('/');
-$freeSpace=max($freeSpace,0);
-$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
-
-$tmpl = new OCP\Template('contacts', 'part.importaddressbook');
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->printpage();
diff --git a/apps/contacts/ajax/selectaddressbook.php b/apps/contacts/ajax/selectaddressbook.php
new file mode 100644
index 0000000000..6c35d08c82
--- /dev/null
+++ b/apps/contacts/ajax/selectaddressbook.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+ 
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+
+$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+$tmpl = new OCP\Template("contacts", "part.selectaddressbook");
+$tmpl->assign('addressbooks', $addressbooks);
+$page = $tmpl->fetchPage();
+OCP\JSON::success(array('data' => array('page' => $page )));
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index 80b282f38a..3c5a2d750e 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -27,13 +27,16 @@ OCP\JSON::callCheck();
 require_once('loghandler.php');
 
 $view = OCP\Files::getStorage('contacts');
+if(!$view->file_exists('imports')) {
+	$view->mkdir('imports');
+}
 $tmpfile = md5(rand());
 
 // If it is a Drag'n'Drop transfer it's handled here.
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
 if($fn) {
-	if($view->file_put_contents('/'.$tmpfile, file_get_contents('php://input'))) {
-		OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
+	if($view->file_put_contents('/imports/'.$fn, file_get_contents('php://input'))) {
+		OCP\JSON::success(array('data' => array('file'=>$tmpfile, 'name'=>$fn)));
 		exit();
 	} else {
 		bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
@@ -60,10 +63,9 @@ if($error !== UPLOAD_ERR_OK) {
 }
 $file=$_FILES['importfile'];
 
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
-	if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) {
-		OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
+	if($view->file_put_contents('/imports/'.$file['name'], file_get_contents($file['tmp_name']))) {
+		OCP\JSON::success(array('data' => array('file'=>$file['name'], 'name'=>$file['name'])));
 	} else {
 		bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
 	}
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 5b6ccb7638..ad97b21104 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -13,6 +13,7 @@
 .ui-state-hover { border: 1px solid dashed; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #bottomcontrols img { margin-top: 0.35em; }
+#uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
 #actionbar { position: relative; clear: both; height: 30px;}
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 93c47ef266..3f45e5631f 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -12,7 +12,6 @@ OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 session_write_close();
 
-$cr = "\r";
 $nl = "\n";
 
 global $progresskey;
@@ -31,7 +30,7 @@ writeProgress('10');
 $view = $file = null;
 if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
 	$view = OCP\Files::getStorage('contacts');
-	$file = $view->file_get_contents('/' . $_POST['file']);
+	$file = $view->file_get_contents('/imports/' . $_POST['file']);
 } else {
 	$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
 }
@@ -56,10 +55,8 @@ if(isset($_POST['method']) && $_POST['method'] == 'new'){
 }
 //analyse the contacts file
 writeProgress('40');
+$file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
 $lines = explode($nl, $file);
-if(count($lines) == 1) { // Mac eol
-	$lines = explode($cr, $file);
-}
 
 $inelement = false;
 $parts = array();
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index fbc3565c4d..00b1b4f7a9 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -42,6 +42,7 @@ OCP\Util::addscript('','oc-vcategories');
 OCP\Util::addscript('contacts','contacts');
 OCP\Util::addscript('contacts','expanding');
 OCP\Util::addscript('contacts','jquery.combobox');
+OCP\Util::addscript('files', 'jquery.fileupload');
 OCP\Util::addscript('contacts','jquery.inview');
 OCP\Util::addscript('contacts','jquery.Jcrop');
 OCP\Util::addscript('contacts','jquery.multi-autocomplete');
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index b0274201ac..eabc368cf8 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -12,7 +12,7 @@ String.prototype.strip_tags = function(){
 
 Contacts={
 	UI:{
-		notification:function(msg, ndata) {
+		notify:function(msg, ndata) {
 			$('#notification').text(msg);
 			if(data) {
 				$('#notification').data(ndata[0],ndata[1]);
@@ -218,7 +218,7 @@ Contacts={
 
 			$('#contacts_deletecard').click( function() { Contacts.UI.Card.doDelete();return false;} );
 			$('#contacts_deletecard').keydown( function(event) { 
-				if(event.which == 13) {
+				if(event.which == 13 || event.which == 32) {
 					Contacts.UI.Card.doDelete();
 				}
 				return false;
@@ -226,7 +226,7 @@ Contacts={
 
 			$('#contacts_downloadcard').click( function() { Contacts.UI.Card.doExport();return false;} );
 			$('#contacts_downloadcard').keydown( function(event) { 
-				if(event.which == 13) {
+				if(event.which == 13 || event.which == 32) {
 					Contacts.UI.Card.doExport();
 				}
 				return false;
@@ -295,22 +295,32 @@ Contacts={
 			honpre:'',
 			honsuf:'',
 			data:undefined,
-			update:function(id, bookid) {
-				var newid, firstitem;
-				if(!id) {
+			update:function(params) { // params {cid:int, aid:int}
+				if(!params) { params = {}; }
+				$('#contacts li').removeClass('active');
+				console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
+				var newid, bookid, firstitem;
+				if(!parseInt(params.cid) && !parseInt(params.aid)) {
 					firstitem = $('#contacts ul').first().find('li:first-child');
 					if(firstitem.length > 0) {
-						newid = firstitem.data('id');
-						bookid = firstitem.data('bookid');
+						newid = parseInt(firstitem.data('id'));
+						bookid = parseInt(firstitem.data('bookid'));
 					}
+				} else if(!parseInt(params.cid) && parseInt(params.aid)) {
+					bookid = parseInt(params.aid);
+					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
+				} else if(parseInt(params.cid) && !parseInt(params.aid)) {
+					newid = parseInt(params.cid);
+					bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
 				} else {
-					newid = id;
-					bookid = bookid?bookid:$('#contacts li[data-id="'+newid+'"]').data('bookid');
+					newid = parseInt(params.cid);
+					bookid = parseInt(params.aid);
 				}
-				if(!bookid) {
-					bookid = $('#contacts h3').first().data('id');
+				if(!bookid || !newid) {
+					bookid = parseInt($('#contacts h3').first().data('id'));
+					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
 				}
-				console.log('bookid: ' +bookid);
+				console.log('newid: ' + newid + ' bookid: ' +bookid);
 				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
 						$('#contacts li[data-id="'+newid+'"]').addClass('active');
@@ -359,9 +369,6 @@ Contacts={
 			doExport:function() {
 				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
 			},
-			doImport:function(){
-				Contacts.UI.notImplemented();
-			},
 			editNew:function(){ // add a new contact
 				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				//Contacts.UI.Card.add(t('contacts', 'Contact')+';'+t('contacts', 'New')+';;;', t('contacts', 'New Contact'), '', true);
@@ -454,7 +461,7 @@ Contacts={
 								this.data = undefined;
 								
 								if($('.contacts li').length > 0) { // Load first in list.
-									Contacts.UI.Card.update(newid, bookid);
+									Contacts.UI.Card.update({cid:newid, aid:bookid});
 								} else {
 									// load intro page
 									$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
@@ -1385,7 +1392,6 @@ Contacts={
 							if(cb) {
 								cb(jsondata.data);
 							}
-							//Contacts.UI.Contacts.update();
 						} else {
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 							return false;
@@ -1420,128 +1426,14 @@ Contacts={
 					  });
 				}
 			},
-			loadImportHandlers:function() {
-				$('#import_upload_start').change(function(){
-					Contacts.UI.Addressbooks.uploadImport(this.files);
-				});
-				$('#importaddressbook_dialog').find('.upload').click(function() {
-					Contacts.UI.Addressbooks.droptarget.html(t('contacts', 'Uploading...'));
-					Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, true);
-					//$('#import_upload_start').trigger('click');
-					//return false;
-				});
-				$('#importaddressbook_dialog').find('.upload').tipsy();
-				this.droptarget = $('#import_drop_target');
-				$(this.droptarget).bind('dragover',function(event){
-					$(event.target).addClass('droppable');
-					event.stopPropagation();
-					event.preventDefault();  
-				});
-				$(this.droptarget).bind('dragleave',function(event){
-					$(event.target).removeClass('droppable');
-				});
-				$(this.droptarget).bind('drop',function(event){
-					event.stopPropagation();
-					event.preventDefault();
-					$(event.target).removeClass('droppable');
-					$(event.target).html(t('contacts', 'Uploading...'));
-					Contacts.UI.loading(event.target, true);
-					$.importUpload(event.originalEvent.dataTransfer.files);
-				});
-
-				$.importUpload = function(files){
-					var file = files[0];
-					if(file.size > $('#max_upload').val()){
-						OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts','Upload too large'));
-						$(Contacts.UI.Addressbooks.droptarget).html(Contacts.UI.Addressbooks.droptext);
-						Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, false);
-						return;
-					}
-					if(file.type.indexOf('text') != 0) {
-						OC.dialogs.alert(t('contacts','You have dropped a file type that cannot be imported: ') + file.type, t('contacts','Wrong file type'));
-						$(Contacts.UI.Addressbooks.droptarget).html(Contacts.UI.Addressbooks.droptext);
-						Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, false);
-						return;
-					}
-					var xhr = new XMLHttpRequest();
-
-					if (!xhr.upload) {
-						OC.dialogs.alert(t('contacts', 'Your browser doesn\'t support AJAX upload. Please upload the contacts file to ownCloud and import that way.'), t('contacts', 'Error'))
-					}
-					importUpload = xhr.upload,
-					xhr.onreadystatechange = function() {
-						if (xhr.readyState == 4){
-							response = $.parseJSON(xhr.responseText);
-							if(response.status == 'success') {
-								if(xhr.status == 200) {
-									Contacts.UI.Addressbooks.doImport(response.data.path, response.data.file);
-								} else {
-									$(Contacts.UI.Addressbooks.droptarget).html(Contacts.UI.Addressbooks.droptext);
-									Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, false);
-									OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, t('contacts', 'Error'));
-								}
-							} else {
-								OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-							}
+			doImport:function(file, aid){
+				$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
+					function(jsondata){
+						if(jsondata.status != 'success'){
+							Contacts.UI.notify(jsondata.data.message);
 						}
-					};
-					xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadimport.php') + '?file='+encodeURIComponent(file.name)+'&requesttoken='+requesttoken, true);
-					xhr.setRequestHeader('Cache-Control', 'no-cache');
-					xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-					xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
-					xhr.setRequestHeader('X-File-Size', file.size);
-					xhr.setRequestHeader('Content-Type', file.type);
-					xhr.send(file);
-				}
-			},
-			uploadImport:function(filelist) {
-				if(!filelist) {
-					OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
-					return;
-				}
-				//var file = filelist.item(0);
-				var file = filelist[0];
-				var target = $('#import_upload_target');
-				var form = $('#import_upload_form');
-				var totalSize=0;
-				if(file.size > $('#max_upload').val()){
-					OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts', 'Error'));
-					return;
-				} else {
-					target.load(function(){
-						var response=jQuery.parseJSON(target.contents().text());
-						if(response != undefined && response.status == 'success'){
-							Contacts.UI.Addressbooks.doImport(response.data.path, response.data.file);
-						}else{
-							OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-						}
-					});
-					form.submit();
-				}
-			},
-			importAddressbook:function(object){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('contacts', 'ajax', 'importaddressbook.php'));
-				$(object).closest('tr').after(tr).hide();
-			},
-			doImport:function(name, file, aid){
-				var cImport = function(id, file) {
-					$.post(OC.filePath('contacts', '', 'import.php'), { id: id, file: file, fstype: 'OC_FilesystemView' },
-						function(jsondata){
-							if(jsondata.status == 'success'){
-								Contacts.UI.Contacts.update(undefined, id);
-							} else {
-								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							}
-					});
-				}
-				if(!aid) {
-					aid = Contacts.UI.Addressbooks.addAddressbook(name, t('contacts', 'Imported address book'), function(addressbook) {
-						cImport(addressbook.id, file);
-					});
-				} else {
-					cImport(aid, file);
-				}
+				});
+				return false;
 			},
 			submit:function(button, bookid){
 				var displayname = $("#displayname_"+bookid).val().trim();
@@ -1597,6 +1489,7 @@ Contacts={
 							if(!added) {
 								$(droplist).append(dragitem.detach());
 							}
+							dragitem.attr('data-bookid', droptarget.data('id'))
 							dragitem.data('bookid', droptarget.data('id'));
 							Contacts.UI.Contacts.scrollTo(dragitem.data('id'));
 						} else {
@@ -1605,21 +1498,22 @@ Contacts={
 				});
 			},
 			// Reload the contacts list.
-			update:function(id, aid, start){
-				if(!start) {
-					if(aid) {
-						$('#contacts h3[data-id="'+aid+'"],#contacts ul[data-id="'+aid+'"]').remove();
+			update:function(params){
+				if(!params) { params = {}; }
+				if(!params.start) {
+					if(params.aid) {
+						$('#contacts h3[data-id="'+params.aid+'"],#contacts ul[data-id="'+params.aid+'"]').remove();
 					} else {
 						$('#contacts').empty();
 					}
 				}
 				self = this;
-				console.log('update: ' + aid + ' ' + start);
+				console.log('update: ' + params.cid + ' ' + params.aid + ' ' + params.start);
 				var firstrun = false;
 				var opts = {};
-				opts['startat'] = (start?start:0);
-				if(aid) {
-					opts['aid'] = aid;
+				opts['startat'] = (params.start?params.start:0);
+				if(params.aid) {
+					opts['aid'] = params.aid;
 				}
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
 					if(jsondata.status == 'success'){
@@ -1661,7 +1555,7 @@ Contacts={
 											var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
 											if (isInView && numsiblings >= self.batchnum) {
 												console.log('This would be a good time to load more contacts.');
-												Contacts.UI.Contacts.update(id, bookid, $('#contacts li[data-bookid="'+bookid+'"]').length);
+												Contacts.UI.Contacts.update({cid:params.cid, aid:bookid, start:$('#contacts li[data-bookid="'+bookid+'"]').length});
 											}
 										});
 									}
@@ -1680,7 +1574,7 @@ Contacts={
 							$('#contacts h3').first().addClass('active');
 						}
 						if(opts['startat'] == 0) { // only update card on first load.
-							Contacts.UI.Card.update();
+							Contacts.UI.Card.update(params);
 						}
 					}
 					else{
@@ -1720,7 +1614,7 @@ $(document).ready(function(){
 	
 	// Load a contact.
 	$('.contacts').keydown(function(event) {
-		if(event.which == 13) {
+		if(event.which == 13 || event.which == 32) {
 			$('.contacts').click();
 		}
 	});
@@ -1747,34 +1641,11 @@ $(document).ready(function(){
 		return false;
 	});
 
-	/*$('.contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
-			// element is now visible in the viewport
-			if (visiblePartY == 'top') {
-				// top part of element is visible
-			} else if (visiblePartY == 'bottom') {
-				// bottom part of element is visible
-			} else {
-				// whole part of element is visible
-				if (!$(this).find('a').attr('style')) {
-					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
-					$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
-				}// else {
-				//	alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
-				//}
-			}
-		} else {
-			// element has gone out of viewport
-		}
-	});*/
-	
 	$('.contacts_property').live('change', function(){
 		Contacts.UI.Card.saveProperty(this);
 	});
 
-	/**
-	 * Upload function for dropped files. Should go in the Contacts class/object.
-	 */
+	// Upload function for dropped contact photos files. Should go in the Contacts class/object.
 	$.fileUpload = function(files){
 		var file = files[0];
 		if(file.size > $('#max_upload').val()){
@@ -1822,21 +1693,32 @@ $(document).ready(function(){
 		xhr.send(file);
 	}
 
+	$(document).bind('drop dragover', function (e) {
+			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
+	});
+
+	//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+	if(navigator.userAgent.search(/konqueror/i)==-1){
+		$('#import_upload_start').attr('multiple','multiple')
+	}
 	// Import using jquery.fileupload
 	$(function() {
-		$('#contacts_import').click(function() {
+		var uploadingFiles = {}, numfiles = 0, uploadedfiles = 0, retries = 0;
+		var aid;
+		
+		$('#contacts_import').click(function() { // TODO: Trick IE by hiding fileupload behind button.
 			$('#import_upload_start').click();
 			return false;
 		});
 		$('#import_upload_start').fileupload({
-			dropZone: $('#contacts'), // restrict dropZone to content div
+			dropZone: $('#contacts'), // restrict dropZone to contacts list.
 			add: function(e, data) {
 				var files = data.files;
 				var totalSize=0;
-				if(files){
-					for(var i=0;i<files.length;i++){
-						if(files[i].size ==0 && files[i].type== '')
-						{
+				if(files) {
+					numfiles += files.length; uploadedfiles = 0;
+					for(var i=0;i<files.length;i++) {
+						if(files[i].size ==0 && files[i].type== '') {
 							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
 							return;
 						}
@@ -1844,61 +1726,46 @@ $(document).ready(function(){
 					}
 				}
 				if(totalSize>$('#max_upload').val()){
-					console.log('upload too large');
+					OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts','Upload too large'));
+					numfiles = uploadedfiles = retries = aid = 0;
+					uploadingFiles = {};
+					return;
 				}else{
 					if($.support.xhrFileUpload) {
-						// TODO: First upload file(s) and cache names in an array, then check if we know
-						// the aid, otherwise ask user, then import files.
 						for(var i=0;i<files.length;i++){
 							var fileName = files[i].name;
 							var dropTarget;
 							if($(e.originalEvent.target).is('h3')) {
-								console.log('h3');
 								dropTarget = $(e.originalEvent.target).next('ul');
 							} else {
 								dropTarget = $(e.originalEvent.target).closest('ul');
 							}
 							if(dropTarget && dropTarget.hasClass('contacts')) { // TODO: More thorough check for where we are.
-								var aid = dropTarget.attr('data-id');
-								console.log('aid: ' + aid);
-								var jqXHR =  $('#import_upload_start').fileupload('send', {files: files[i],
-										formData: function(form) {
-											console.log(form.html());
-											var formArray = form.serializeArray();
-											formArray['aid'] = aid;
-											return formArray;
-										}}).success(function(result, textStatus, jqXHR) {
-											if(result.status == 'success') {
-												// import the file
-												Contacts.UI.Addressbooks.doImport(result.data.name, result.data.file, aid);
-											} else {
-												console.log('Error: ' + response.data.message);
-											}
-										})
-								.error(function(jqXHR, textStatus, errorThrown) {
-									console.log(errorThrown, textStatus);
-									if(errorThrown === 'abort') {
-										console.log('abort');
-									}
-								});
+								aid = dropTarget.attr('data-id');
 							} else {
-								var jqXHR =  $('#import_upload_start').fileupload('send', {files: files[i]})
-									.success(function(result, textStatus, jqXHR) {
-										if(result.status == 'success') {
-											// import the file
-											Contacts.UI.Addressbooks.doImport(result.data.name, result.data.file);
-										} else {
-											console.log('Error: ' + response.data.message);
-										}
-									})
-									.error(function(jqXHR, textStatus, errorThrown) {
-										console.log(jqXHR.responseText, errorThrown, textStatus);
-										if(errorThrown === 'abort') {
-										}
-									});
+								aid = undefined;
 							}
+							var jqXHR =  $('#import_upload_start').fileupload('send', {files: files[i],
+								formData: function(form) {
+									var formArray = form.serializeArray();
+									formArray['aid'] = aid;
+									return formArray;
+								}})
+								.success(function(result, textStatus, jqXHR) {
+									if(result.status == 'success') {
+										// import the file
+										uploadedfiles += 1;
+									} else {
+										Contacts.UI.notify(jsondata.data.message);
+									}
+									return false;
+								})
+								.error(function(jqXHR, textStatus, errorThrown) {
+									Contacts.UI.notify(errorThrown + ': ' + textStatus);
+								});
+							uploadingFiles[fileName] = jqXHR;
 						}
-					}else{
+					} else {
 						data.submit().success(function(data, status) {
 							response = jQuery.parseJSON(data[0].body.innerText);
 							if(response[0] != undefined && response[0].status == 'success') {
@@ -1911,10 +1778,7 @@ $(document).ready(function(){
 								}
 								FileList.loadingDone(file.name);
 							} else {
-								$('#notification').text(t('files', response.data.message));
-								$('#notification').fadeIn();
-								$('#fileList > tr').not('[data-mime]').fadeOut();
-								$('#fileList > tr').not('[data-mime]').remove();
+								Contacts.UI.notify(response.data.message);
 							}
 						});
 					}
@@ -1924,16 +1788,11 @@ $(document).ready(function(){
 				console.log('fail');
 				// TODO: cancel upload & display error notification
 			},
-			progress: function(e, data) {
-				// TODO: show nice progress bar in file row
-			},
 			progressall: function(e, data) {
-				var progress = (data.loaded/data.total)*100;
-				console.log('progress: ' + progress);
+				var progress = (data.loaded/data.total)*50;
 				$('#uploadprogressbar').progressbar('value',progress);
 			},
 			start: function(e, data) {
-				console.log('start');
 				$('#uploadprogressbar').progressbar({value:0});
 				$('#uploadprogressbar').fadeIn();
 				if(data.dataType != 'iframe ') {
@@ -1941,16 +1800,104 @@ $(document).ready(function(){
 				}
 			},
 			stop: function(e, data) {
-				console.log('stop');
+				// stop only gets fired once so we collect uploaded items here.
+				var importFiles = function(aid, fileList) {
+					// Create a closure that can be called from different places.
+					if(numfiles != uploadedfiles) {
+						Contacts.UI.notify('Not all files uploaded. Retrying...');
+						retries += 1;
+						if(retries > 0) {
+							numfiles = uploadedfiles = retries = aid = 0;
+							uploadingFiles = {};
+							OC.dialogs.alert(t('contacts', 'Something went wrong with the upload, please retry.'), t('contacts', 'Error'));
+							return;
+						}
+						setTimeout(function() { // Just to let any uploads finish
+							importFiles(aid, uploadingFiles);
+						}, 1000);
+					}
+					$('#uploadprogressbar').progressbar('value',50);
+					var todo = uploadedfiles;
+					$.each(fileList, function(fileName, data) {
+						Contacts.UI.Addressbooks.doImport(fileName, aid);
+						delete fileList[fileName];
+						numfiles -= 1; uploadedfiles -= 1;
+						$('#uploadprogressbar').progressbar('value',50+(50/(todo-uploadedfiles)));
+					})
+					$('#uploadprogressbar').progressbar('value',100);
+					$('#uploadprogressbar').fadeOut();
+					setTimeout(function() {
+						Contacts.UI.Contacts.update({aid:aid});
+						numfiles = uploadedfiles = retries = aid = 0;
+					}, 1000);
+				}
+				if(!aid) {
+					// Either selected with filepicker or dropped outside of an address book.
+					$.getJSON(OC.filePath('contacts', 'ajax', 'selectaddressbook.php'),{},function(jsondata) {
+						if(jsondata.status == 'success') {
+							if($('#selectaddressbook_dialog').dialog('isOpen') == true) {
+								$('#selectaddressbook_dialog').dialog('moveToTop');
+							} else {
+								$('#dialog_holder').html(jsondata.data.page).ready(function($) {
+									$('#selectaddressbook_dialog').dialog({
+										modal: true, height: 'auto', width: 'auto',
+										buttons: {
+											'Ok':function() {
+												aid = $('#selectaddressbook_dialog').find('input:checked').val();
+												if(aid == 'new') {
+													var displayname = $('#selectaddressbook_dialog').find('input.name').val();
+													var description = $('#selectaddressbook_dialog').find('input.desc').val();
+													if(!displayname.trim()) {
+														OC.dialogs.alert(t('contacts', 'The address book name cannot be empty.'), t('contacts', 'Error'));
+														return false;
+													}
+													$(this).dialog('close');
+													Contacts.UI.Addressbooks.addAddressbook(displayname, description, function(addressbook){
+														aid = addressbook.id;
+														setTimeout(function() {
+															importFiles(aid, uploadingFiles);
+														}, 500);
+														console.log('aid ' + aid);
+													});
+												} else {
+													setTimeout(function() {
+														importFiles(aid, uploadingFiles);
+													}, 500);
+													console.log('aid ' + aid);
+													$(this).dialog('close');
+												}
+											},
+											'Cancel':function() { 
+												$(this).dialog('close');
+												numfiles = uploadedfiles = retries = aid = 0;
+												uploadingFiles = {};
+												$('#uploadprogressbar').fadeOut();
+											}
+										},
+										close: function(event, ui) {
+											// TODO: If numfiles != 0 delete tmp files after a timeout.
+											$(this).dialog('destroy').remove();
+										}
+									});
+								});
+							}
+						} else {
+							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						}
+					});
+				} else {
+					// Dropped on an address book or it's list.
+					setTimeout(function() { // Just to let any uploads finish
+						importFiles(aid, uploadingFiles);
+					}, 1000);
+				}
 				if(data.dataType != 'iframe ') {
 					$('#upload input.stop').hide();
 				}	
-				$('#uploadprogressbar').progressbar('value',100);
-				$('#uploadprogressbar').fadeOut();
 			}
 		})
 	});
 	
 	Contacts.UI.loadHandlers();
-	Contacts.UI.Contacts.update(id);
+	Contacts.UI.Contacts.update({cid:id});
 });
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index f125ec0293..046ceb0bf0 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -41,7 +41,7 @@ class OC_Contacts_App {
 		$card = OC_Contacts_VCard::find( $id );
 		if( $card === false ) {
 			OCP\Util::writeLog('contacts', 'Contact could not be found: '.$id, OCP\Util::ERROR);
-			OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id)));
+			OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.print_r($id, true))));
 			exit();
 		}
 
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 5b49b68e95..e13748ddde 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,3 +1,4 @@
+<div id='notification'></div>
 <script type='text/javascript'>
 	var totalurl = '<?php echo OCP\Util::linkToRemote('carddav'); ?>addressbooks';
 	var categories = <?php echo json_encode($_['categories']); ?>;
@@ -5,13 +6,21 @@
 	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
 </script>
 <div id="leftcontent">
+	<div class="hidden" id="statusbar"></div>
 	<div id="contacts">
 	</div>
+	<div id="uploadprogressbar"></div>
 	<div id="bottomcontrols">
 		<form>
-			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>"   /></button>
+			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
+			<button class="svg" id="contacts_import" title="<?php echo $l->t('Import'); ?>"><img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" /></button>
 			<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
 		</form>
+		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
+			<input class="float" id="import_upload_start" type="file" accept="text/*" name="importfile" /></a>
+			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+		</form>
+		<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
 	</div>
 </div>
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
@@ -27,3 +36,7 @@
 <!-- Dialogs -->
 <div id="dialog_holder"></div>
 <!-- End of Dialogs -->
+<menu type="context" id="addressbookmenu">
+	<menuitem label="Delete" icon="core/img/actions/delete.svg" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
+	<menuitem label="Rename" icon="core/img/actions/rename.svg" onclick="alert('Can\'t do that')"></menuitem>
+</menu>
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index a0ec053ab9..caed67736c 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -14,7 +14,6 @@ for($i = 0; $i < count($option_addressbooks); $i++){
 <tr>
 	<td colspan="5" style="padding: 0.5em;">
 		<a class="button" href="#" onclick="Contacts.UI.Addressbooks.newAddressbook(this);"><?php echo $l->t('New Address Book') ?></a>
-		<a class="button" href="#" onclick="Contacts.UI.Addressbooks.importAddressbook(this);"><?php echo $l->t('Import from VCF') ?></a>
 	</td>
 </tr>
 <tr>
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
deleted file mode 100644
index 8ceb5f3538..0000000000
--- a/apps/contacts/templates/part.importaddressbook.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<td id="importaddressbook_dialog" colspan="6">
-<table>
-<tr>
-	<th><?php echo $l->t('Select address book to import to:') ?></th>
-	<td>
-		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
-			<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
-			<select id="book" name="book" class="float">
-			<?php
-			$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-			echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-			?>
-			</select>
-			<span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file<br />to import contacts."); ?> (Max. <?php echo  $_['uploadMaxHumanFilesize']; ?>)</span>
-			<a class="svg upload float" title="<?php echo $l->t('Select from HD'); ?>">
-			<input class="float" id="import_upload_start" type="file" accept="text/*" name="importfile" /></a>
-			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-		</form>
-	</td>
-</tr>
-</table>
-
-<input id="close_button" style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this);" value="<?php echo $l->t("Cancel"); ?>">
-<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
-</td>
-<script type="text/javascript">
-$(document).ready(function(){
-	Contacts.UI.Addressbooks.loadImportHandlers();
-});
-</script>
\ No newline at end of file
diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
new file mode 100644
index 0000000000..c54ddaf2e6
--- /dev/null
+++ b/apps/contacts/templates/part.selectaddressbook.php
@@ -0,0 +1,27 @@
+<div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>">
+<form>
+<table style="width: 100%">
+	<?php foreach($_['addressbooks'] as $idx => $addressbook) { ?>
+	<tr>
+		<td>
+			<input id="book_<?php echo $addressbook['id']; ?>" name="book" type="radio" value="<?php echo $addressbook['id']; ?>" <?php echo ($idx==0?'checked="checked"':'')?>>
+		</td>
+		<td>
+			<label for="book_<?php echo $addressbook['id']; ?>"><?php echo $addressbook['displayname']; ?></label>
+		</td>
+		<td><?php echo $addressbook['description']; ?></td>
+	</tr>
+	<?php } ?>
+	<tr>
+		<td>
+			<input id="book_new" name="book" type="radio" value="new">
+		</td>
+		<th>
+			<input type="text" class="name" name="displayname" placeholder="<?php echo $l->t("Enter name"); ?>" />
+		</th>
+		<td><input type="text" class="desc" name="description" placeholder="<?php echo $l->t("Enter description"); ?>" /></td>
+	</tr>
+</table>
+</form>
+</div>
+

From ce40576881b2a0894f873ad40adb43187994b5a7 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 15 Jul 2012 12:05:48 +0200
Subject: [PATCH 0947/1537] MySql testing added

---
 autotest.sh | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index a9794db698..06605687d1 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -1,4 +1,6 @@
-#preparation
+#
+# sqlite testing now
+#
 echo "Setup environment for sqlite testing ..."
 DATADIR=data-autotest
 rm -rf $DATADIR
@@ -25,8 +27,46 @@ echo 'Testing with sqlite ...'
 cd tests
 php -f index.php -- xml > autotest-results-sqlite.xml
 
+#
+# mysql testing now
+#
+# NOTES:
+#  - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
+#
+echo "Setup environment for MySql testing ..."
+DATADIR=data-autotest
+rm -rf $DATADIR
+mkdir $DATADIR
+rm -rf config/config.php
+cat > ./config/autoconfig.php <<DELIM
+<?php
+\$AUTOCONFIG = array (
+  'installed' => false,
+  'dbtype' => 'mysql',
+  'dbtableprefix' => 'oc_',
+  'datadirectory' => 'data',
+  'adminlogin' => 'admin',
+  'adminpass' => 'admin',
+  'directory' => '$PWD/$DATADIR',
+  'dbuser' => 'oc_autotest',	
+  'dbname' => 'oc_autotest',	
+  'dbhost' => 'localhost',
+  'dbpass' => 'owncloud',	
+);
+DELIM
+
+#drop the database
+mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
+
+#setup
+php -f index.php
+
+#test execution
+echo 'Testing with MySql ...'
+cd tests
+php -f index.php -- xml > autotest-results-MySql.xml
 
 #
-# TODO: create config for mysql and postgres
+# TODO: create config for postgres
 #
 

From 287285880c0ed61f0b247b2cdef97cc75cf4b0a2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 09:33:33 +0200
Subject: [PATCH 0948/1537] Removed obsolete TODO.

---
 apps/contacts/js/contacts.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index eabc368cf8..25739cc974 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -187,16 +187,7 @@ Contacts={
 				}
 			] );
 			
-			/*$('#fn').blur(function(){
-				if($('#fn').val() == '') {
-					OC.dialogs.alert(t('contacts','The name field cannot be empty. Please enter a name for this contact.'), t('contacts','Name is empty'), function() { $('#fn').focus(); });
-					$('#fn').focus();
-					return false;
-				}
-			});*/
-			
 			// Name has changed. Update it and reorder.
-			// TODO: Take addressbook into account
 			$('#fn').change(function(){
 				var name = $('#fn').val().strip_tags();
 				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]');

From 4e684b9e9dd7c31e04d65e506dfe6e0bb0eaccdb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 09:54:31 +0200
Subject: [PATCH 0949/1537] Fixed sorting of addressbooks.

---
 apps/contacts/js/contacts.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 25739cc974..a9fe38ead1 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1509,16 +1509,26 @@ Contacts={
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
 					if(jsondata.status == 'success'){
 						var books = jsondata.data.entries;
-						$.each(jsondata.data.entries, function(b, book) { 
+						$.each(books, function(b, book) { 
 							if($('#contacts h3[data-id="'+b+'"]').length == 0) {
 								firstrun = true;
-								// TODO: Make sure address books are sorted properly.
 								if($('#contacts h3').length == 0) {
 									$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
 								} else {
 									if(!$('#contacts h3[data-id="'+b+'"]').length) {
-										$('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
-										.appendTo('#contacts');
+										var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
+										var added = false;
+										$('#contacts h3').each(function(){
+											if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
+												$(this).before(item).fadeIn('fast');
+												added = true;
+												return false;
+											}
+										});
+										if(!added) {
+											$('#contacts').append(item);
+										}
+										
 									}
 								}
 								$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {

From 7af608881bb1ae8f3b08cae63a0e4b03891f1ed5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 10:12:47 +0200
Subject: [PATCH 0950/1537] Added notification.

---
 apps/contacts/js/contacts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index a9fe38ead1..f859f8385c 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1787,7 +1787,8 @@ $(document).ready(function(){
 			},
 			fail: function(e, data) {
 				console.log('fail');
-				// TODO: cancel upload & display error notification
+				Contacts.UI.notify(data.errorThrown + ': ' + data.textStatus);
+				// TODO: Remove file from upload queue.
 			},
 			progressall: function(e, data) {
 				var progress = (data.loaded/data.total)*50;

From d71da67bee465585d0873879753c3d3a8d5b5166 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 10:24:33 +0200
Subject: [PATCH 0951/1537] Typo.

---
 apps/contacts/import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 3f45e5631f..e6d1e8050d 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -79,7 +79,7 @@ writeProgress('70');
 $imported = 0;
 $failed = 0;
 if(!count($parts) > 0) {
-	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in .'.$_POST['file'].' Please check if the file is corrupted.')));
+	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in '.$_POST['file'].'. Please check if the file is corrupted.')));
 	exit();
 }
 foreach($parts as $part){

From 48521fcfaa6d6b36f5e55ac5de936b82a8f60c19 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 10:29:03 +0200
Subject: [PATCH 0952/1537] Made notifications more flexible.

---
 apps/contacts/js/contacts.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index f859f8385c..ffbc1d009e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -12,13 +12,10 @@ String.prototype.strip_tags = function(){
 
 Contacts={
 	UI:{
-		notify:function(msg, ndata) {
-			$('#notification').text(msg);
-			if(data) {
-				$('#notification').data(ndata[0],ndata[1]);
-			}
+		notify:function(params) {
+			$('#notification').text(params.message);
 			$('#notification').fadeIn();
-			setTimeout($('#notification').fadeOut(), 10000);
+			setTimeout(function() {$('#notification').fadeOut();}, 10000);
 		},
 		notImplemented:function() {
 			OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));
@@ -1421,7 +1418,7 @@ Contacts={
 				$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
 					function(jsondata){
 						if(jsondata.status != 'success'){
-							Contacts.UI.notify(jsondata.data.message);
+							Contacts.UI.notify({message:jsondata.data.message});
 						}
 				});
 				return false;
@@ -1757,12 +1754,12 @@ $(document).ready(function(){
 										// import the file
 										uploadedfiles += 1;
 									} else {
-										Contacts.UI.notify(jsondata.data.message);
+										Contacts.UI.notify({message:jsondata.data.message});
 									}
 									return false;
 								})
 								.error(function(jqXHR, textStatus, errorThrown) {
-									Contacts.UI.notify(errorThrown + ': ' + textStatus);
+									Contacts.UI.notify({message:errorThrown + ': ' + textStatus,});
 								});
 							uploadingFiles[fileName] = jqXHR;
 						}
@@ -1779,7 +1776,7 @@ $(document).ready(function(){
 								}
 								FileList.loadingDone(file.name);
 							} else {
-								Contacts.UI.notify(response.data.message);
+								Contacts.UI.notify({message:response.data.message});
 							}
 						});
 					}
@@ -1787,7 +1784,7 @@ $(document).ready(function(){
 			},
 			fail: function(e, data) {
 				console.log('fail');
-				Contacts.UI.notify(data.errorThrown + ': ' + data.textStatus);
+				Contacts.UI.notify({message:data.errorThrown + ': ' + data.textStatus});
 				// TODO: Remove file from upload queue.
 			},
 			progressall: function(e, data) {
@@ -1806,7 +1803,7 @@ $(document).ready(function(){
 				var importFiles = function(aid, fileList) {
 					// Create a closure that can be called from different places.
 					if(numfiles != uploadedfiles) {
-						Contacts.UI.notify('Not all files uploaded. Retrying...');
+						Contacts.UI.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
 						retries += 1;
 						if(retries > 0) {
 							numfiles = uploadedfiles = retries = aid = 0;

From 8b49e304e0729b464975add486f527484cbfa7fb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 12:20:26 +0200
Subject: [PATCH 0953/1537] Hide file form field behind image so it will maybe
 work with IE...

---
 apps/contacts/css/contacts.css    |  4 ++--
 apps/contacts/js/contacts.js      |  6 ++----
 apps/contacts/templates/index.php | 12 ++++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index ad97b21104..de7950ecc6 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -14,7 +14,7 @@
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #bottomcontrols img { margin-top: 0.35em; }
 #uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
-#contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
+#contacts_newcontact, #contacts_import, #chooseaddressbook { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
 #actionbar { position: relative; clear: both; height: 30px;}
 #contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
@@ -111,7 +111,7 @@ dl.addresscard .action { float: right; }
 #file_upload_form { width: 0; height: 0; }
 #file_upload_target, #import_upload_target, #crop_target { display:none; }
 #file_upload_start, #import_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; width:0; height:0;}
-#import_upload_start { width: 16px; height: 16px; margin: 0 0 0 0; }
+#import_upload_start { width: 20px; height: 20px; margin: 0 0 -24px 0; padding: 0;}
 input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .big { font-weight:bold; font-size:1.2em; }
 .huge { font-weight:bold; font-size:1.5em; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index ffbc1d009e..2ebec4c242 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1704,12 +1704,9 @@ $(document).ready(function(){
 		var uploadingFiles = {}, numfiles = 0, uploadedfiles = 0, retries = 0;
 		var aid;
 		
-		$('#contacts_import').click(function() { // TODO: Trick IE by hiding fileupload behind button.
-			$('#import_upload_start').click();
-			return false;
-		});
 		$('#import_upload_start').fileupload({
 			dropZone: $('#contacts'), // restrict dropZone to contacts list.
+			acceptFileTypes:  /^text\/(directory|vcard|x-vcard)$/i,
 			add: function(e, data) {
 				var files = data.files;
 				var totalSize=0;
@@ -1759,6 +1756,7 @@ $(document).ready(function(){
 									return false;
 								})
 								.error(function(jqXHR, textStatus, errorThrown) {
+									console.log(textStatus);
 									Contacts.UI.notify({message:errorThrown + ': ' + textStatus,});
 								});
 							uploadingFiles[fileName] = jqXHR;
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index e13748ddde..98cb67a26e 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -11,13 +11,13 @@
 	</div>
 	<div id="uploadprogressbar"></div>
 	<div id="bottomcontrols">
-		<form>
-			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
-			<button class="svg" id="contacts_import" title="<?php echo $l->t('Import'); ?>"><img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" /></button>
-			<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
-		</form>
 		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
-			<input class="float" id="import_upload_start" type="file" accept="text/*" name="importfile" /></a>
+			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
+			<span class="svg" id="contacts_import" title="<?php echo $l->t('Import'); ?>">
+				<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
+				<img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" />
+			</span>
+			<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 		</form>
 		<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>

From db034f05ca17a961f99e7eb7033ac38d2615a577 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 12:22:14 +0200
Subject: [PATCH 0954/1537] Improve temp file handling.

---
 apps/contacts/import.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index e6d1e8050d..ed1b80e132 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -48,7 +48,7 @@ if(isset($_POST['method']) && $_POST['method'] == 'new'){
 }else{
 	$id = $_POST['id'];
 	if(!$id) {
-		OCP\JSON::error(array('data' => array('message' => 'Error getting the ID of the address book.')));
+		OCP\JSON::error(array('data' => array('message' => 'Error getting the ID of the address book.', 'file'=>$_POST['file'])));
 		exit();
 	}
 	OC_Contacts_App::getAddressbook($id); // is owner access check
@@ -79,7 +79,7 @@ writeProgress('70');
 $imported = 0;
 $failed = 0;
 if(!count($parts) > 0) {
-	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in '.$_POST['file'].'. Please check if the file is corrupted.')));
+	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in '.$_POST['file'].'. Please check if the file is corrupted.', 'file'=>$_POST['file'])));
 	exit();
 }
 foreach($parts as $part){
@@ -102,8 +102,8 @@ writeProgress('100');
 sleep(3);
 OC_Cache::remove($progresskey);
 if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
-	if(!$view->unlink('/' . $_POST['file'])) {
+	if(!$view->unlink('/imports/' . $_POST['file'])) {
 		OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
 	}
 }
-OCP\JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed)));
+OCP\JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed, 'file'=>$_POST['file'])));

From 160e701fbf4d87e9673114f0dd51c6705e180475 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 12:27:46 +0200
Subject: [PATCH 0955/1537] Make list droppable too instead of just the header.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 2ebec4c242..b4e7cdba44 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1535,7 +1535,7 @@ Contacts={
 									return false;
 								});
 								var accept = 'li:not([data-bookid="'+b+'"])';
-								$('#contacts h3[data-id="'+b+'"]').droppable({
+								$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
 									drop: Contacts.UI.Contacts.drop,
 									activeClass: 'ui-state-hover',
 									accept: accept

From e707e948577b927a28b86545d345e7b6c8606352 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jul 2012 16:31:28 +0200
Subject: [PATCH 0956/1537] subadmins can now add users

---
 lib/app.php                  | 13 ++++--
 lib/subadmin.php             | 36 +++++++++++----
 lib/util.php                 |  9 ++--
 settings/ajax/createuser.php | 29 ++++++++++--
 settings/js/users.js         | 89 ++++++++++++++++++++++++++----------
 settings/templates/users.php | 20 +++++---
 settings/users.php           | 12 +++--
 7 files changed, 149 insertions(+), 59 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 4c2c43ec26..9c3411a76b 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -293,16 +293,21 @@ class OC_App{
 		if (OC_User::isLoggedIn()) {
 			// personal menu
 			$settings[] = array( "id" => "personal", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ));
-
+			
 			// if there're some settings forms
 			if(!empty(self::$settingsForms))
 				// settings menu
 				$settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "settings.php" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
-
-			// if the user is an admin
-			if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+			
+			//SubAdmins are also allowed to access user management
+			if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
 				// admin users menu
 				$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
+			}
+			
+			
+			// if the user is an admin
+			if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
 				// admin apps menu
 				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
 
diff --git a/lib/subadmin.php b/lib/subadmin.php
index aad657b024..b6f0b3007f 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -38,9 +38,6 @@ class OC_SubAdmin{
 	public static function createSubAdmin($uid, $gid){
 		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*group_admin (gid,uid) VALUES(?,?)');
 		$result = $stmt->execute(array($gid, $uid));
-		if(OC_DB::isError($result)){
-			return false;
-		}
 		OC_Hook::emit( "OC_SubAdmin", "post_createSubAdmin", array( "gid" => $gid ));
 		return true;
 	}
@@ -54,9 +51,6 @@ class OC_SubAdmin{
 	public static function deleteSubAdmin($uid, $gid){
 		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE gid = ? AND uid = ?');
 		$result = $stmt->execute(array($gid, $uid));
-		if(OC_DB::isError($result)){
-			return false;
-		}
 		OC_Hook::emit( "OC_SubAdmin", "post_deleteSubAdmin", array( "gid" => $gid ));
 		return true;
 	}
@@ -68,7 +62,7 @@ class OC_SubAdmin{
 	 */
 	public static function getSubAdminsGroups($uid){
 		$stmt = OC_DB::prepare('SELECT gid FROM *PREFIX*group_admin WHERE uid = ?');
-		$result = $stmt->execute(array($gid, $uid));
+		$result = $stmt->execute(array($uid));
 		$gids = array();
 		while($row = $result->fetchRow()){
 			$gids[] = $row['gid'];
@@ -83,7 +77,7 @@ class OC_SubAdmin{
 	 */
 	public static function getGroupsSubAdmins($gid){
 		$stmt = OC_DB::prepare('SELECT uid FROM *PREFIX*group_admin WHERE gid = ?');
-		$result = $stmt->execute(array($gid, $uid));
+		$result = $stmt->execute(array($gid));
 		$uids = array();
 		while($row = $result->fetchRow()){
 			$uids[] = $row['uid'];
@@ -97,11 +91,35 @@ class OC_SubAdmin{
 	 */
 	public static function getAllSubAdmins(){
 		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*group_admin');
-		$result = $stmt->execute(array($gid, $uid));
+		$result = $stmt->execute();
 		$subadmins = array();
 		while($row = $result->fetchRow()){
 			$subadmins[] = $row;
 		}
 		return $subadmins;
 	}
+	
+	/**
+	 * @brief checks if a user is a SubAdmin of a group
+	 * @return array
+	 */
+	public static function isSubAdminofGroup($uid, $gid){
+		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin where uid = ? AND gid = ?');
+		$result = $stmt->execute(array($uid, $gid));
+		$result = $result->fetchRow();
+		if($result['count'] >= 1){
+			return true;
+		}
+		return false;
+	}
+	
+	public static function isSubAdmin($uid){
+		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin WHERE uid = ?');
+		$result = $stmt->execute(array($uid));
+		$result = $result->fetchRow();
+		if($result['count'] > 0){
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/lib/util.php b/lib/util.php
index de9171edc8..2eb102dfa6 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -328,16 +328,13 @@ class OC_Util {
 		// Check if we are a user
 		self::checkLoggedIn();
 		if(OC_Group::inGroup(OC_User::getUser(),'admin')){
-			return OC_Group::getGroups();
+			return true;
 		}
-		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin WHERE uid = ?');
-		$result = $stmt->execute(array(OC_User::getUser()));
-		$result = $result->fetchRow();
-		if($result['count'] == 0){
+		if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())){
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
-		return $groups;
+		return true;
 	}
 
 	/**
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index c56df4bc15..41bf31a05f 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -4,15 +4,36 @@
 require_once('../../lib/base.php');
 
 // Check if we are a user
-if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && !OC_SubAdmin::isSubAdmin(OC_User::getUser()))){
 	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
 	exit();
 }
 OCP\JSON::callCheck();
 
-$groups = array();
-if( isset( $_POST["groups"] )){
-	$groups = $_POST["groups"];
+$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
+
+if($isadmin){
+	$groups = array();
+	if( isset( $_POST["groups"] )){
+		$groups = $_POST["groups"];
+	}
+}else{
+	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessiblegroups = array_flip($accessiblegroups);
+	if(isset( $_POST["groups"] )){
+		$unauditedgroups = $_POST["groups"];
+		$groups = array();
+		foreach($unauditedgroups as $group){
+			if(array_key_exists($group, $accessiblegroups)){
+				$groups[] = $group;
+			}
+		}
+		if(count($groups) == 0){
+			$groups = array_flip($accessiblegroups);
+		}
+	}else{
+		$groups = array_flip($accessiblegroups);
+	}
 }
 $username = $_POST["username"];
 $password = $_POST["password"];
diff --git a/settings/js/users.js b/settings/js/users.js
index dfa28e4c4c..c86949db38 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -84,18 +84,56 @@ $(document).ready(function(){
 	}
 	
 	function applyMultiplySelect(element){
+		console.log(element);
 		var checked=[];
 		var user=element.data('username');
-		if(element.data('userGroups')){
-			checked=element.data('userGroups').split(', ');
+		if($(element).attr('class') == 'groupsselect'){		
+			if(element.data('userGroups')){
+				checked=element.data('userGroups').split(', ');
+			}
+			if(user){
+				var checkHandeler=function(group){
+					if(user==OC.currentUser && group=='admin'){
+						return false;
+					}
+					$.post(
+						OC.filePath('settings','ajax','togglegroups.php'),
+						{
+							username:user,
+							group:group
+						},
+						function(){}
+					);
+				};
+			}else{
+				checkHandeler=false;
+			}
+			var addGroup = function(group) {
+				$('select[multiple]').each(function(index, element) {
+					if ($(element).find('option[value="'+group +'"]').length == 0) {
+						$(element).append('<option value="'+group+'">'+group+'</option>');
+					}
+				})
+			};
+			element.multiSelect({
+				createCallback:addGroup,
+				createText:'add group',
+				checked:checked,
+				oncheck:checkHandeler,
+				onuncheck:checkHandeler,
+				minWidth: 100,
+			});
 		}
-		if(user){
+		if($(element).attr('class') == 'subadminsselect'){	
+			if(element.data('subadmin')){
+				checked=element.data('subadmin').split(', ');
+			}
 			var checkHandeler=function(group){
-				if(user==OC.currentUser && group=='admin'){
+				if(group=='admin'){
 					return false;
 				}
 				$.post(
-					OC.filePath('settings','ajax','togglegroups.php'),
+					OC.filePath('settings','ajax','togglesubadmins.php'),
 					{
 						username:user,
 						group:group
@@ -103,24 +141,25 @@ $(document).ready(function(){
 					function(){}
 				);
 			};
-		}else{
-			checkHandeler=false;
+			
+			var addSubAdmin = function(group) {
+				console.log('addSubAdmin called');
+				console.log(group);
+				$('select[multiple]').each(function(index, element) {
+					if ($(element).find('option[value="'+group +'"]').length == 0) {
+						$(element).append('<option value="'+group+'">'+group+'</option>');
+					}
+				})
+			};
+			element.multiSelect({
+				createCallback:addSubAdmin,
+				createText:null,
+				checked:checked,
+				oncheck:checkHandeler,
+				onuncheck:checkHandeler,
+				minWidth: 100,
+			});
 		}
-		var addGroup = function(group) {
-			$('select[multiple]').each(function(index, element) {
-				if ($(element).find('option[value="'+group +'"]').length == 0) {
-					$(element).append('<option value="'+group+'">'+group+'</option>');
-				}
-			})
-		};
-		element.multiSelect({
-			createCallback:addGroup,
-			createText:'add group',
-			checked:checked,
-			oncheck:checkHandeler,
-			onuncheck:checkHandeler,
-			minWidth: 100,
-		});
 	}
 	$('select[multiple]').each(function(index,element){
 		applyMultiplySelect($(element));
@@ -255,12 +294,14 @@ $(document).ready(function(){
 					OC.dialogs.alert(result.data.message, 'Error creating user');
 				}
 				else {
+					groups = result.data.groups;
+					console.log(groups);
 					var tr=$('#content table tbody tr').first().clone();
 					tr.attr('data-uid',username);
 					tr.find('td.name').text(username);
-					var select=$('<select multiple="multiple" data-placehoder="Groups" title="Groups">');
+					var select=$('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
 					select.data('username',username);
-					select.data('userGroups',groups.join(', '));
+					select.data('userGroups',groups);
 					tr.find('td.groups').empty();
 					var allGroups=$('#content table').data('groups').split(', ');
 					for(var i=0;i<groups.length;i++){
diff --git a/settings/templates/users.php b/settings/templates/users.php
index b16aa1ae16..649fce107d 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -6,9 +6,12 @@
  */
 $allGroups=array();
 foreach($_["groups"] as $group) {
-	$allGroups[]=$group['name'];
+	$allGroups[] = $group['name'];
 }
-$_['subadmingroups'] = $_['groups'];
+$_['subadmingroups'] = $allGroups;
+$items = array_flip($_['subadmingroups']);
+unset($items['admin']);
+$_['subadmingroups'] = array_flip($items);
 ?>
 
 <div id="controls">
@@ -16,6 +19,7 @@ $_['subadmingroups'] = $_['groups'];
 		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
+			class="groupsselect"
 			id="newusergroups" data-placeholder="groups"
 			title="<?php echo $l->t('Groups')?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
@@ -62,7 +66,7 @@ $_['subadmingroups'] = $_['groups'];
 			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
 			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php echo $l->t('SubAdmins'); ?></th>
+			<th id="headerSubAdmins"><?php echo $l->t('SubAdmin'); ?></th>
 			<?php endif;?>
 			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
 			<th id="headerRemove">&nbsp;</th>
@@ -74,9 +78,10 @@ $_['subadmingroups'] = $_['groups'];
 			<td class="name"><?php echo $user["name"]; ?></td>
 			<td class="password"><span>●●●●●●●</span> <img class="svg action"
 				src="<?php echo image_path('core','actions/rename.svg')?>"
-				alt="set new password" title="set new password" />
+				alt="set new password" title="set new password"/>
 			</td>
 			<td class="groups"><select
+				class="groupsselect"
 				data-username="<?php echo $user['name'] ;?>"
 				data-user-groups="<?php echo $user['groups'] ;?>"
 				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
@@ -90,13 +95,14 @@ $_['subadmingroups'] = $_['groups'];
 			</td>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
 			<td class="subadmins"><select
+				class="subadminsselect"
 				data-username="<?php echo $user['name'] ;?>"
-				data-user-groups="<?php echo $user['groups'] ;?>"
+				data-subadmin="<?php echo $user['subadmin'] ;?>"
 				data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin for ...')?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php echo $group['name'];?>">
-						<?php echo $group['name'];?>
+					<option value="<?php echo $group;?>">
+						<?php echo $group;?>
 					</option>
 					<?php endforeach;?>
 			</select>
diff --git a/settings/users.php b/settings/users.php
index e066956291..60ffc337a7 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -19,20 +19,20 @@ $groups = array();
 
 $isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
 if($isadmin){
-	$groups = OC_Group::getGroups();
+	$accessiblegroups = OC_Group::getGroups();
 	$accessibleusers = OC_User::getUsers();
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
-	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessibleusers = OC_Group::usersInGroups($groups);
+	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessibleusers = OC_Group::usersInGroups($accessiblegroups);
 	$subadmins = false;
 }
 
 foreach($accessibleusers as $i){
-	$users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),'quota'=>OC_Preferences::getValue($i,'files','quota','default'));
+	$users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),'quota'=>OC_Preferences::getValue($i,'files','quota','default'),'subadmin'=>implode(', ',OC_SubAdmin::getSubAdminsGroups($i)));
 }
 
-foreach( $groups as $i ){
+foreach( $accessiblegroups as $i ){
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
@@ -55,7 +55,9 @@ if (\OC_App::isEnabled( "files_sharing" ) ) {
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
+$tmpl->assign( 'isadmin', $isadmin);
 $tmpl->assign( 'subadmins', $subadmins);
+$tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->assign( 'share_notice', $shareNotice);

From 044134a289339e0b7dbcbfa9f5603efca1dfea81 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jul 2012 16:32:57 +0200
Subject: [PATCH 0957/1537] add another file which was missing in the previous
 commit

---
 settings/ajax/togglesubadmins.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 settings/ajax/togglesubadmins.php

diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
new file mode 100644
index 0000000000..8e91af62c5
--- /dev/null
+++ b/settings/ajax/togglesubadmins.php
@@ -0,0 +1,23 @@
+<?php
+
+// Init owncloud
+require_once('../../lib/base.php');
+
+OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
+
+$success = true;
+$error = "add user to";
+$action = "add";
+
+$username = $_POST["username"];
+$group = OC_Util::sanitizeHTML($_POST["group"]);
+
+// Toggle group
+if(OC_SubAdmin::isSubAdminofGroup($username, $group)){
+	OC_SubAdmin::deleteSubAdmin($username, $group);
+}else{
+	OC_SubAdmin::createSubAdmin($username, $group);
+}
+
+OC_JSON::success();
\ No newline at end of file

From dd95149238ae8792e2ca322d404f6ab6cb09c926 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 17:34:30 +0200
Subject: [PATCH 0958/1537] Also unlink unsuccessful imports.

---
 apps/contacts/import.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index ed1b80e132..7d3acf86cf 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -80,6 +80,11 @@ $imported = 0;
 $failed = 0;
 if(!count($parts) > 0) {
 	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in '.$_POST['file'].'. Please check if the file is corrupted.', 'file'=>$_POST['file'])));
+	if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
+		if(!$view->unlink('/imports/' . $_POST['file'])) {
+			OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
+		}
+	}
 	exit();
 }
 foreach($parts as $part){

From a1b9b4b43e211fc2c87316ccf9660bb103e235e9 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 15 Jul 2012 13:49:11 +0200
Subject: [PATCH 0959/1537] fixing reset on autotest

---
 autotest.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/autotest.sh b/autotest.sh
index 06605687d1..6863eec032 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -26,11 +26,14 @@ php -f index.php
 echo 'Testing with sqlite ...'
 cd tests
 php -f index.php -- xml > autotest-results-sqlite.xml
+cd ..
+git checkout tests/data/*
 
 #
 # mysql testing now
 #
 # NOTES:
+#  - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
 #  - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
 #
 echo "Setup environment for MySql testing ..."
@@ -65,6 +68,8 @@ php -f index.php
 echo 'Testing with MySql ...'
 cd tests
 php -f index.php -- xml > autotest-results-MySql.xml
+cd ..
+git checkout tests/data/*
 
 #
 # TODO: create config for postgres

From b1a7826d56bbd779ef306cebd0d9f89faa878f14 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 15 Jul 2012 15:17:27 -0400
Subject: [PATCH 0960/1537] Check if user is already logged in for DAV auth,
 instead of logging in and creating new sessions for every request

---
 lib/connector/sabre/auth.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index ee68039162..99f696e3a0 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -31,13 +31,18 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 * @return bool
 	 */
 	protected function validateUserPass($username, $password){
-		OC_Util::setUpFS();//login hooks may need early access to the filesystem
-		if(OC_User::login($username,$password)){
-			OC_Util::setUpFS($username);
+		if (OC_User::isLoggedIn()) {
+			OC_Util::setupFS($username);
 			return true;
-		}
-		else{
-			return false;
+		} else {
+			OC_Util::setUpFS();//login hooks may need early access to the filesystem
+			if(OC_User::login($username,$password)){
+				OC_Util::setUpFS($username);
+				return true;
+			}
+			else{
+				return false;
+			}
 		}
 	}
 } 

From 72ebc2a32a80bfcca6323e2313b1a08ad07f5c54 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 15 Jul 2012 15:22:31 -0400
Subject: [PATCH 0961/1537] Delete old session files, suggested by Torben
 Nehmer, see bug oc-736

---
 lib/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index f1903093d6..230efe7139 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -200,7 +200,7 @@ class OC_User {
 		if( $run ){
 			$uid=self::checkPassword( $uid, $password );
 			if($uid){
-				session_regenerate_id();
+				session_regenerate_id(true);
 				self::setUserId($uid);
 				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
 				return true;

From 6bb3a281b1883c61b4e69f5d0840707f27b66277 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 15 Jul 2012 23:21:56 +0200
Subject: [PATCH 0962/1537] some more structure added

---
 autotest.sh | 100 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 44 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 6863eec032..fe55c1066d 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -1,56 +1,36 @@
+#!/bin/bash
 #
-# sqlite testing now
+# ownCloud
 #
-echo "Setup environment for sqlite testing ..."
+# @author Thomas Müller
+# @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
+#
+
 DATADIR=data-autotest
-rm -rf $DATADIR
-mkdir $DATADIR
-rm -rf config/config.php
-#cp autotest/config.sqlite.php config/autoconfig.php
-cat > ./config/autoconfig.php <<DELIM
+BASEDIR=$PWD
+
+# create autoconfig for sqlite, mysql and (soon) postgresql
+cat > ./tests/autoconfig-sqlite.php <<DELIM
 <?php
 \$AUTOCONFIG = array (
   'installed' => false,
   'dbtype' => 'sqlite',
   'dbtableprefix' => 'oc_',
-  'datadirectory' => 'data',
   'adminlogin' => 'admin',
   'adminpass' => 'admin',
-  'directory' => '$PWD/$DATADIR',
+  'directory' => '$BASEDIR/$DATADIR',
 );
 DELIM
 
-php -f index.php
-
-#test execution
-echo 'Testing with sqlite ...'
-cd tests
-php -f index.php -- xml > autotest-results-sqlite.xml
-cd ..
-git checkout tests/data/*
-
-#
-# mysql testing now
-#
-# NOTES:
-#  - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
-#  - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
-#
-echo "Setup environment for MySql testing ..."
-DATADIR=data-autotest
-rm -rf $DATADIR
-mkdir $DATADIR
-rm -rf config/config.php
-cat > ./config/autoconfig.php <<DELIM
+cat > ./tests/autoconfig-mysql.php <<DELIM
 <?php
 \$AUTOCONFIG = array (
   'installed' => false,
   'dbtype' => 'mysql',
   'dbtableprefix' => 'oc_',
-  'datadirectory' => 'data',
   'adminlogin' => 'admin',
   'adminpass' => 'admin',
-  'directory' => '$PWD/$DATADIR',
+  'directory' => '$BASEDIR/$DATADIR',
   'dbuser' => 'oc_autotest',	
   'dbname' => 'oc_autotest',	
   'dbhost' => 'localhost',
@@ -58,20 +38,52 @@ cat > ./config/autoconfig.php <<DELIM
 );
 DELIM
 
-#drop the database
-mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
 
-#setup
-php -f index.php
+function execute_tests {
+	echo "Setup environment for $1 testing ..."
+	# back to root folder
+	cd $BASEDIR
+	echo $BASEDIR
 
-#test execution
-echo 'Testing with MySql ...'
-cd tests
-php -f index.php -- xml > autotest-results-MySql.xml
-cd ..
-git checkout tests/data/*
+	# revert changes to tests/data
+	git checkout tests/data/*
+
+	# reset data directory
+	rm -rf $DATADIR
+	mkdir $DATADIR
+
+	# remove the old config file
+	rm -rf config/config.php
+
+	# drop database
+	if [ "$1" == "mysql" ] ; then
+		mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
+	fi
+
+	# copy autoconfig
+	cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
+
+	# trigger installation
+	php -f index.php
+
+	#test execution
+	echo "Testing with $1 ..."
+	cd tests
+	php -f index.php -- xml > autotest-results-$1.xml
+}
 
 #
-# TODO: create config for postgres
+# start test execution
+#
+execute_tests "sqlite"
+execute_tests 'mysql'
+
+# TODO: implement this
+#execute_tests 'postgresql'
+
+#
+# NOTES:
+#  - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
+#  - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
 #
 

From 3ffc96c3e96de8bb26729f510e6a35be5477c6c1 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 16 Jul 2012 00:07:40 +0200
Subject: [PATCH 0963/1537] add database type to xml report

---
 autotest.sh     |  2 +-
 tests/index.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index fe55c1066d..bf98932a4a 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -69,7 +69,7 @@ function execute_tests {
 	#test execution
 	echo "Testing with $1 ..."
 	cd tests
-	php -f index.php -- xml > autotest-results-$1.xml
+	php -f index.php -- xml $1 > autotest-results-$1.xml
 }
 
 #
diff --git a/tests/index.php b/tests/index.php
index e91b3f0da5..935ce39531 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -26,8 +26,7 @@ require_once 'simpletest/mock_objects.php';
 require_once 'simpletest/collector.php';
 require_once 'simpletest/default_reporter.php';
 
-// test suite instance
-$testSuite=new TestSuite("ownCloud Unit Test Suite");
+$testSuiteName="ownCloud Unit Test Suite";
 
 // prepare the reporter
 if(OC::$CLI){
@@ -37,12 +36,19 @@ if(OC::$CLI){
 	{
 		$reporter= new XmlReporter;
 		$test=false;
+
+		if(isset($_SERVER['argv'][2])){
+			$testSuiteName=$testSuiteName." (".$_SERVER['argv'][2].")";
+		}
 	}
 }else{
 	$reporter='HtmlReporter';
 	$test=isset($_GET['test'])?$_GET['test']:false;
 }
 
+// test suite instance
+$testSuite=new TestSuite($testSuiteName);
+
 //load core test cases
 loadTests(dirname(__FILE__), $testSuite, $test);
 

From 001a47afb0767537defab828447179443d2985d5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 17:40:34 +0200
Subject: [PATCH 0964/1537] Remove obsolete FIXMEs.

---
 apps/contacts/lib/vcard.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index e3b6560562..4f1ba5f08d 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -430,7 +430,6 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function delete($id){
-		// FIXME: Add error checking.
 		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => null, 'id' => $id, 'uri' => null));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
 		try {
@@ -451,7 +450,6 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function deleteFromDAVData($aid,$uri){
-		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
 		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uri));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
 		try {

From 502f4206780eaa6a694fe054b687975ab7671385 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 20:45:54 +0200
Subject: [PATCH 0965/1537] Wrap image uploading in anonymous function.

---
 apps/contacts/js/contacts.js | 88 ++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index b4e7cdba44..30e1e27212 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1643,53 +1643,55 @@ $(document).ready(function(){
 		Contacts.UI.Card.saveProperty(this);
 	});
 
-	// Upload function for dropped contact photos files. Should go in the Contacts class/object.
-	$.fileUpload = function(files){
-		var file = files[0];
-		if(file.size > $('#max_upload').val()){
-			OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts','Upload too large'));
-			return;
-		}
-		if (file.type.indexOf("image") != 0) {
-			OC.dialogs.alert(t('contacts','Only image files can be used as profile picture.'), t('contacts','Wrong file type'));
-			return;
-		}
-		var xhr = new XMLHttpRequest();
+	$(function() {
+		// Upload function for dropped contact photos files. Should go in the Contacts class/object.
+		$.fileUpload = function(files){
+			var file = files[0];
+			if(file.size > $('#max_upload').val()){
+				OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts','Upload too large'));
+				return;
+			}
+			if (file.type.indexOf("image") != 0) {
+				OC.dialogs.alert(t('contacts','Only image files can be used as profile picture.'), t('contacts','Wrong file type'));
+				return;
+			}
+			var xhr = new XMLHttpRequest();
 
-		if (!xhr.upload) {
-			OC.dialogs.alert(t('contacts', 'Your browser doesn\'t support AJAX upload. Please click on the profile picture to select a photo to upload.'), t('contacts', 'Error'))
-		}
-		fileUpload = xhr.upload,
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4){
-				response = $.parseJSON(xhr.responseText);
-				if(response.status == 'success') {
-					if(xhr.status == 200) {
-						Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+			if (!xhr.upload) {
+				OC.dialogs.alert(t('contacts', 'Your browser doesn\'t support AJAX upload. Please click on the profile picture to select a photo to upload.'), t('contacts', 'Error'))
+			}
+			fileUpload = xhr.upload,
+			xhr.onreadystatechange = function() {
+				if (xhr.readyState == 4){
+					response = $.parseJSON(xhr.responseText);
+					if(response.status == 'success') {
+						if(xhr.status == 200) {
+							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+						} else {
+							OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, t('contacts', 'Error'));
+						}
 					} else {
-						OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, t('contacts', 'Error'));
+						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
 					}
-				} else {
-					OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
 				}
-			}
-		};
-	
-		fileUpload.onprogress = function(e){
-			if (e.lengthComputable){
-				var _progress = Math.round((e.loaded * 100) / e.total);
-				//if (_progress != 100){
-				//}
-			}
-		};
-		xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+Contacts.UI.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
-		xhr.setRequestHeader('Cache-Control', 'no-cache');
-		xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-		xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
-		xhr.setRequestHeader('X-File-Size', file.size);
-		xhr.setRequestHeader('Content-Type', file.type);
-		xhr.send(file);
-	}
+			};
+		
+			fileUpload.onprogress = function(e){
+				if (e.lengthComputable){
+					var _progress = Math.round((e.loaded * 100) / e.total);
+					//if (_progress != 100){
+					//}
+				}
+			};
+			xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+Contacts.UI.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
+			xhr.setRequestHeader('Cache-Control', 'no-cache');
+			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+			xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
+			xhr.setRequestHeader('X-File-Size', file.size);
+			xhr.setRequestHeader('Content-Type', file.type);
+			xhr.send(file);
+		}
+	});
 
 	$(document).bind('drop dragover', function (e) {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone

From 8fba6b9bc72f93c13e0984dd832b84a15152986a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 21:34:56 +0200
Subject: [PATCH 0966/1537] UI part of addressbook merging.

---
 apps/contacts/js/contacts.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 30e1e27212..2fcead42f5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1456,20 +1456,26 @@ Contacts={
 			batchnum:50,
 			drop:function(event, ui) {
 				var dragitem = ui.draggable, droptarget = $(this);
-				//console.log('Drop ' + dragitem.data('id') +' on: ' + droptarget.data('id'));
+				if(dragitem.is('li')) {
+					Contacts.UI.Contacts.dropContact(event, dragitem, droptarget);
+				} else {
+					Contacts.UI.Contacts.dropAddressbook(event, dragitem, droptarget);
+				}
+			},
+			dropContact:function(event, dragitem, droptarget) {
 				if(dragitem.data('bookid') == droptarget.data('id')) {
 					return false;
 				}
 				var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
-				$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: $(this).data('id') },
+				$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
 					function(jsondata){
 						if(jsondata.status == 'success'){
 							// Do some inserting/removing/sorting magic
 							var name = $(dragitem).find('a').html();
 							var added = false;
 							$(droplist).children().each(function(){
-								if ($(this).text().toLowerCase() > name.toLowerCase()) {
-									$(this).before(dragitem.detach()); //.fadeIn('slow');
+								if (droptarget.text().toLowerCase() > name.toLowerCase()) {
+									droptarget.before(dragitem.detach()); //.fadeIn('slow');
 									added = true;
 									return false;
 								}
@@ -1485,6 +1491,9 @@ Contacts={
 						}
 				});
 			},
+			dropAddressbook:function(event, dragitem, droptarget) {
+				alert('Dropping address books not implemented yet');
+			},
 			// Reload the contacts list.
 			update:function(params){
 				if(!params) { params = {}; }
@@ -1534,7 +1543,7 @@ Contacts={
 									$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
 									return false;
 								});
-								var accept = 'li:not([data-bookid="'+b+'"])';
+								var accept = 'li:not([data-bookid="'+b+'"]),h3:not([data-id="'+b+'"])';
 								$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
 									drop: Contacts.UI.Contacts.drop,
 									activeClass: 'ui-state-hover',
@@ -1562,7 +1571,7 @@ Contacts={
 							}
 						});
 						if($('#contacts h3').length > 1) {
-							$('#contacts li').draggable({
+							$('#contacts li,#contacts h3').draggable({
 								revert: 'invalid',
 								axis: 'y', containment: '#contacts',
 								scroll: true, scrollSensitivity: 100,

From 25f50e8273240bf7afd39ec0728b80cad156527d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 21:58:45 +0200
Subject: [PATCH 0967/1537] Set the address book of the active contact active.

---
 apps/contacts/js/contacts.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 2fcead42f5..bca542fdcd 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -285,7 +285,7 @@ Contacts={
 			data:undefined,
 			update:function(params) { // params {cid:int, aid:int}
 				if(!params) { params = {}; }
-				$('#contacts li').removeClass('active');
+				$('#contacts li,#contacts h3').removeClass('active');
 				console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
 				var newid, bookid, firstitem;
 				if(!parseInt(params.cid) && !parseInt(params.aid)) {
@@ -311,7 +311,7 @@ Contacts={
 				console.log('newid: ' + newid + ' bookid: ' +bookid);
 				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
-						$('#contacts li[data-id="'+newid+'"]').addClass('active');
+						$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
 								$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
@@ -1634,7 +1634,13 @@ $(document).ready(function(){
 			item.addClass('active');
 			var oldid = $('#rightcontent').data('id');
 			if(oldid != 0){
-				$('.contacts li[data-id="'+oldid+'"]').removeClass('active');
+				var olditem = $('.contacts li[data-id="'+oldid+'"]');
+				var oldbookid = olditem.data('bookid');
+				olditem.removeClass('active');
+				if(oldbookid != bookid) {
+					$('#contacts h3[data-id="'+oldbookid+'"]').removeClass('active');
+					$('#contacts h3[data-id="'+bookid+'"]').addClass('active');
+				}
 			}
 			$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 				if(jsondata.status == 'success'){

From 0fb1a76113cc4c030d0c42cdfd0436604ccdd3ab Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 22:00:09 +0200
Subject: [PATCH 0968/1537] Bold active address book.

---
 apps/contacts/css/contacts.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index de7950ecc6..27a796a15f 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -5,7 +5,7 @@
 #leftcontent a { padding: 0 0 0 25px; }
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
 #leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
-#leftcontent h3:hover,#leftcontent h3:active,#leftcontent h3.active { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; }
+#leftcontent h3:hover,#leftcontent h3:active,#leftcontent h3.active { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; font-weight: bold; }
 #contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 .contacts li.ui-draggable { height: 23px; }

From 2035bc7905271761ac7e056b647a35f13a57ea4c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 22:04:33 +0200
Subject: [PATCH 0969/1537] Fix sorting - again :-P

---
 apps/contacts/js/contacts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index bca542fdcd..861250c53e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1474,8 +1474,8 @@ Contacts={
 							var name = $(dragitem).find('a').html();
 							var added = false;
 							$(droplist).children().each(function(){
-								if (droptarget.text().toLowerCase() > name.toLowerCase()) {
-									droptarget.before(dragitem.detach()); //.fadeIn('slow');
+								if ($(this).text().toLowerCase() > name.toLowerCase()) {
+									$(this).before(dragitem.detach()); //.fadeIn('slow');
 									added = true;
 									return false;
 								}

From 7a7ac580944d85c8bdde9aadd95a24e71b9471cb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 15 Jul 2012 22:20:26 +0200
Subject: [PATCH 0970/1537] Remove obsolete code.

---
 apps/contacts/js/contacts.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 861250c53e..31d50a606f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1334,8 +1334,6 @@ Contacts={
 			},
 		},
 		Addressbooks:{
-			droptarget:undefined,
-			droptext:t('contacts', 'Drop a VCF file<br />to import contacts.'),
 			overview:function(){
 				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
 					$('#chooseaddressbook_dialog').dialog('moveToTop');

From 296f79d1a4a30acee77ea41219e43f385fd6797e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 16 Jul 2012 01:36:18 +0200
Subject: [PATCH 0971/1537] latin1 => utf8

---
 apps/files_sharing_log/appinfo/database.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing_log/appinfo/database.xml b/apps/files_sharing_log/appinfo/database.xml
index 92e5f0125b..dae811f87f 100644
--- a/apps/files_sharing_log/appinfo/database.xml
+++ b/apps/files_sharing_log/appinfo/database.xml
@@ -3,7 +3,7 @@
 	 <name>*dbname*</name>
 	 <create>true</create>
 	 <overwrite>false</overwrite>
-	 <charset>latin1</charset>
+	 <charset>utf8</charset>
 	 <table>
 		<name>*dbprefix*sharing_log</name>
 		<declaration>

From ccb1c57745a4cab8cf475209fa17da0db390db01 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 16 Jul 2012 19:35:40 +0200
Subject: [PATCH 0972/1537] add warning in log if OC_L10N::tA was called

---
 lib/l10n.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/l10n.php b/lib/l10n.php
index de8514573d..e7f5ffea0e 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -154,8 +154,15 @@ class OC_L10N{
 	 *
 	 * Returns the translation. If no translation is found, $textArray will be
 	 * returned.
+	 *
+	 *
+	 * @deprecated deprecated since ownCloud version 5.0
+	 * This method will probably be removed with ownCloud 6.0
+	 *
+	 *
 	 */
 	public function tA($textArray){
+		OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.',OC_Log::WARN);
 		$result = array();
 		foreach($textArray as $key => $text){
 			$result[$key] = (string)$this->t($text);

From 7ab35af6dd9f0338f0a239aab20c045cfcbd34b5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jul 2012 19:55:36 +0200
Subject: [PATCH 0973/1537] use the remote.php infrastructure for remoteStorage

---
 apps/remoteStorage/appinfo/info.xml           |  3 ++
 apps/remoteStorage/appinfo/version            |  2 +-
 apps/remoteStorage/appinfo/webfinger.php      |  6 ++--
 apps/remoteStorage/oauth_ro_auth.php          | 20 +++++------
 apps/remoteStorage/{WebDAV.php => webdav.php} | 36 ++++++-------------
 5 files changed, 28 insertions(+), 39 deletions(-)
 rename apps/remoteStorage/{WebDAV.php => webdav.php} (72%)

diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index fa878762a0..1388ad9c31 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -7,4 +7,7 @@
 	<author>Michiel de Jong</author>
 	<require>4</require>
 	<shipped>true</shipped>
+	<remote>
+		<remoteStorage>webdav.php</remoteStorage>
+	</remote>
 </info>
diff --git a/apps/remoteStorage/appinfo/version b/apps/remoteStorage/appinfo/version
index 490f510fc2..0e2c93950b 100644
--- a/apps/remoteStorage/appinfo/version
+++ b/apps/remoteStorage/appinfo/version
@@ -1 +1 @@
-0.6
\ No newline at end of file
+0.7
\ No newline at end of file
diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php
index 5d481f315f..e8b237628c 100644
--- a/apps/remoteStorage/appinfo/webfinger.php
+++ b/apps/remoteStorage/appinfo/webfinger.php
@@ -1,8 +1,8 @@
-<?php if(OC_User::userExists(WF_USER)) { ?>
+<?php if(OC_User::userExists(WF_USER)): ?>
     {
         "rel":"remoteStorage",
-        "template":"<?php echo WF_BASEURL; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/",
+        "template":"<?php echo WF_BASEURL; ?>/remote.php/remoteStorage/<?php echo WF_USER; ?>/remoteStorage/{category}/",
         "api":"WebDAV",
         "auth":"<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>"
     }
-<?php } ?>
+<?php endif ?>
diff --git a/apps/remoteStorage/oauth_ro_auth.php b/apps/remoteStorage/oauth_ro_auth.php
index 12d02d1cf5..bed3093c3b 100644
--- a/apps/remoteStorage/oauth_ro_auth.php
+++ b/apps/remoteStorage/oauth_ro_auth.php
@@ -9,10 +9,10 @@
 
 class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	private $validTokens;
-  private $category;
+	private $category;
 	public function __construct($validTokensArg, $categoryArg) {
 		$this->validTokens = $validTokensArg;
-    $this->category = $categoryArg;
+		$this->category = $categoryArg;
 	}
 
 	/**
@@ -25,16 +25,16 @@ class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBa
 	 */
 	protected function validateUserPass($username, $password){
 		//always give read-only:
-		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS') 
+		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
 		    || (isset($this->validTokens[$password]))
-        || (($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-        ) {
+			|| (($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
+		) {
 			OC_Util::setUpFS();
 			return true;
 		} else {
-      //var_export($_SERVER);
-      //var_export($this->validTokens);
-      //die('not getting in with "'.$username.'"/"'.$password.'"!');
+			//var_export($_SERVER);
+			//var_export($this->validTokens);
+			//die('not getting in with "'.$username.'"/"'.$password.'"!');
 			return false;	
 		}
 	}
@@ -48,8 +48,8 @@ class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBa
 		$userpass = $auth->getUserPass();
 		if (!$userpass) {
 			if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
-	        ||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-          ) {
+				||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
+			) {
 				$userpass = array('', '');
 			} else {
 				$auth->requireLogin();
diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/webdav.php
similarity index 72%
rename from apps/remoteStorage/WebDAV.php
rename to apps/remoteStorage/webdav.php
index 7a81c18e0a..8d8ec6a45a 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/webdav.php
@@ -25,22 +25,7 @@
 *
 */
 
-
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-
-
-require_once('../../lib/base.php');
-
-require_once('../../lib/user.php');
-require_once('../../lib/public/user.php');
-
-require_once('../../lib/app.php');
-require_once('../../lib/public/app.php');
-
-require_once('../../3rdparty/Sabre/DAV/Auth/IBackend.php');
-require_once('../../3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php');
-require_once('../../lib/connector/sabre/auth.php');
+OC_App::loadApps(array('filesystem','authentication'));
 
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('lib_remoteStorage.php');
@@ -61,14 +46,15 @@ if(isset($_SERVER['HTTP_ORIGIN'])) {
 	header('Access-Control-Allow-Origin: *');
 }
 
-$path = substr($_SERVER["REQUEST_URI"], strlen($_SERVER["SCRIPT_NAME"]));
+$path = substr($_SERVER["REQUEST_URI"], strlen($baseuri));
+
 $pathParts =  explode('/', $path);
 // for webdav:
-// 0/     1       /   2    /   3...
-//  /$ownCloudUser/remoteStorage/$category/
+//      0       /   1    /   2...
+//  $ownCloudUser/remoteStorage/$category/
 
-if(count($pathParts) >= 3 && $pathParts[0] == '') {
-	list($dummy, $ownCloudUser, $dummy2, $category) = $pathParts;
+if(count($pathParts) >= 2) {
+	list($ownCloudUser, $dummy2, $category) = $pathParts;
 
 	OC_Util::setupFS($ownCloudUser);
 
@@ -77,13 +63,13 @@ if(count($pathParts) >= 3 && $pathParts[0] == '') {
 	$server = new Sabre_DAV_Server($publicDir);
 
 	// Path to our script
-	$server->setBaseUri(OC::$WEBROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
+	$server->setBaseUri($baseuri.$ownCloudUser);
 
 	// Auth backend
 	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
-      OC_remoteStorage::getValidTokens($ownCloudUser, $category),
-      $category
-      );
+		OC_remoteStorage::getValidTokens($ownCloudUser, $category),
+		$category
+	);
 
 	$authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud');//should use $validTokens here
 	$server->addPlugin($authPlugin);

From f047fdbfaa653a3f745d3911df125b02ecb2556c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jul 2012 19:55:53 +0200
Subject: [PATCH 0974/1537] revert to using fopen for webdav instead of
 readfile

---
 lib/connector/sabre/file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index e4dc8c9344..4700dbf8b8 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -42,7 +42,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function get() {
 
-		return OC_Filesystem::readfile($this->path);
+		return OC_Filesystem::fopen($this->path,'rb');
 
 	}
 

From 19f2ce69975ed63589eca461f88a46da2bf57625 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jul 2012 19:56:43 +0200
Subject: [PATCH 0975/1537] improve webfinger for situations where owncloud is
 not installed in the server root

---
 apps/user_webfinger/.htaccess     |  5 +++++
 apps/user_webfinger/host-meta.php | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 apps/user_webfinger/.htaccess

diff --git a/apps/user_webfinger/.htaccess b/apps/user_webfinger/.htaccess
new file mode 100644
index 0000000000..1b13cf788f
--- /dev/null
+++ b/apps/user_webfinger/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+RewriteEngine on
+RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+RewriteRule ^host-meta host-meta.php [QSA,L]
+</IfModule>
diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index 32ffb51205..4ac37b1ea0 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -1,10 +1,27 @@
 <?php
+
+if(class_exists('OC')){
+	$WEBROOT=OC::$WEBROOT;
+}else{//not called trough remote.php try to guess the webroot the best we can from here
+	// calculate the root directories
+	$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-strlen('apps/user_webfinger/host-meta.php')));
+	$WEBROOT=substr($SERVERROOT,strlen(realpath($_SERVER['DOCUMENT_ROOT'])));
+
+	if($WEBROOT!='' and $WEBROOT[0]!=='/'){
+		$WEBROOT='/'.$WEBROOT;
+	}
+}
+
+if(substr($WEBROOT,-1)==='/'){
+	$WEBROOT=substr($WEBROOT,0,-1);
+}
+
 $hostMetaHeader = array(
 	'Access-Control-Allow-Origin' => '*',
 	'Content-Type' => 'application/xrd+json'
 );
 $serverName = $_SERVER['SERVER_NAME'];
-$hostMetaContents = '{"links":[{"rel":"lrdd","template":"http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$serverName.'/public.php?service=webfinger&q={uri}"}]}';
+$hostMetaContents = '{"links":[{"rel":"lrdd","template":"http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$serverName.$WEBROOT.'/public.php?service=webfinger&q={uri}"}]}';
 foreach($hostMetaHeader as $header => $value) {
 	header($header . ": " . $value);
 }

From 47566b0c4282d49347e7a12f2df1ab38a1966ac8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 16 Jul 2012 20:25:45 +0200
Subject: [PATCH 0976/1537] stop using of OC_L10N::tA

---
 apps/calendar/templates/calendar.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 2246a0178e..29b9bf6bc5 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -2,10 +2,10 @@
 				var defaultView = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') ?>';
 				var eventSources = <?php echo json_encode($_['eventSources']) ?>;
 				var categories = <?php echo json_encode($_['categories']); ?>;
-				var dayNames = <?php echo json_encode($l->tA(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'))) ?>;
-				var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'))) ?>;
-				var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
-				var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
+				var dayNames = new Array("<?php echo $l -> t("Sunday");?>", "<?php echo $l -> t("Monday");?>", "<?php echo $l -> t("Tuesday");?>", "<?php echo $l -> t("Wednesday");?>", "<?php echo $l -> t("Thursday");?>", "<?php echo $l -> t("Friday");?>", "<?php echo $l -> t("Saturday");?>");
+				var dayNamesShort = new Array("<?php echo $l -> t("Sun.");?>", "<?php echo $l -> t("Mon.");?>", "<?php echo $l -> t("Tue.");?>", "<?php echo $l -> t("Wed.");?>", "<?php echo $l -> t("Thu.");?>", "<?php echo $l -> t("Fri.");?>", "<?php echo $l -> t("Sat.");?>");
+				var monthNames = new Array("<?php echo $l -> t("January");?>", "<?php echo $l -> t("February");?>", "<?php echo $l -> t("March");?>", "<?php echo $l -> t("April");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("June");?>", "<?php echo $l -> t("July");?>", "<?php echo $l -> t("August");?>", "<?php echo $l -> t("September");?>", "<?php echo $l -> t("October");?>", "<?php echo $l -> t("November");?>", "<?php echo $l -> t("December");?>");
+				var monthNamesShort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May.");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
 				var agendatime = '<?php echo ((int) OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
 				var defaulttime = '<?php echo ((int) OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
 				var allDayText = '<?php echo addslashes($l->t('All day')) ?>';

From f128b96ac0e0bf659ae818e6b6d190b3fbbe18f7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 16 Jul 2012 23:36:11 +0200
Subject: [PATCH 0977/1537] Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD.
 Fixes oc-1276.

---
 apps/contacts/ajax/saveproperty.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 34fc3cc535..5a0a7c1488 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -66,8 +66,7 @@ if($element != $name) {
 switch($element) {
 	case 'BDAY':
 		$date = New DateTime($value);
-		//$vcard->setDateTime('BDAY', $date, Sabre_VObject_Element_DateTime::DATE);
-		$value = $date->format(DateTime::ATOM);
+		$value = $date->format('Y-m-d');
 		break;
 	case 'FN':
 		if(!$value) {
@@ -89,6 +88,14 @@ if(!$value) {
 } else {
 	/* setting value */
 	switch($element) {
+		case 'BDAY':
+			// I don't use setDateTime() because that formats it as YYYYMMDD instead of YYYY-MM-DD
+			// which is what the RFC recommends.
+			$vcard->children[$line]->setValue($value);
+			$vcard->children[$line]->parameters = array();
+			$vcard->children[$line]->add(new Sabre_VObject_Parameter('VALUE', 'DATE'));
+			debug('Setting value:'.$name.' '.$vcard->children[$line]);
+			break;
 		case 'CATEGORIES':
 			debug('Setting string:'.$name.' '.$value);
 			$vcard->children[$line]->setValue($value);

From 4de66880edb59e9169d8b3c3c5d2238214a8bfc1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 01:35:35 +0200
Subject: [PATCH 0978/1537] If a contact wasn't loaded in the list you coulcn't
 access it from search result. Fixes oc-1264.

---
 apps/contacts/ajax/contactdetails.php |  3 +++
 apps/contacts/js/contacts.js          | 30 +++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index b697b1a8e5..d438f708b4 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -30,6 +30,7 @@ $id = isset($_GET['id'])?$_GET['id']:null;
 if(is_null($id)) {
 	bailOut(OC_Contacts_App::$l10n->t('Missing ID'));
 }
+$card = OC_Contacts_VCard::find($id);
 $vcard = OC_Contacts_App::getContactVCard( $id );
 if(is_null($vcard)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
@@ -50,5 +51,7 @@ if(isset($details['PHOTO'])) {
 	$details['PHOTO'] = false;
 }
 $details['id'] = $id;
+$details['displayname'] = $card['fullname'];
+$details['addressbookid'] = $card['addressbookid'];
 OC_Contacts_App::setLastModifiedHeader($vcard);
 OCP\JSON::success(array('data' => $details));
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 31d50a606f..990d83c00b 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -299,7 +299,13 @@ Contacts={
 					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
 				} else if(parseInt(params.cid) && !parseInt(params.aid)) {
 					newid = parseInt(params.cid);
-					bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
+					var listitem = $('#contacts li[data-id="'+newid+'"]');
+					console.log('Is contact in list? ' + listitem.length);
+					if(listitem.length) {
+						bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
+					} else { // contact isn't in list yet.
+						bookid = 'unknown';
+					}
 				} else {
 					newid = parseInt(params.cid);
 					bookid = parseInt(params.aid);
@@ -311,9 +317,14 @@ Contacts={
 				console.log('newid: ' + newid + ' bookid: ' +bookid);
 				var localLoadContact = function(newid, bookid) {
 					if($('.contacts li').length > 0) {
-						$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
+								if(bookid == 'unknown') { 
+									bookid = jsondata.data.addressbookid; 
+									var entry = Contacts.UI.Card.createEntry(jsondata.data);
+									$('#contacts ul[data-id="'+bookid+'"]').append(entry);
+								}
+								$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
 								$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
 								Contacts.UI.Card.loadContact(jsondata.data, bookid);
 							} else {
@@ -1549,9 +1560,10 @@ Contacts={
 								});
 							}
 							var contactlist = $('#contacts ul[data-id="'+b+'"]');
+							var contacts = $('#contacts ul[data-id="'+b+'"] li');
 							for(var c in book.contacts) {
 								if(book.contacts[c].id == undefined) { continue; }
-								if($('#contacts li[data-id="'+book.contacts[c]['id']+'"][data-id="'+book.contacts[c]['bookid']+'"]').length == 0) {
+								if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
 									var contact = Contacts.UI.Card.createEntry(book.contacts[c]);
 									if(c == self.batchnum-5) {
 										contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
@@ -1564,7 +1576,17 @@ Contacts={
 											}
 										});
 									}
-									contactlist.append(contact);
+									var added = false;
+									contacts.each(function(){
+										if ($(this).text().toLowerCase() > book.contacts[c].displayname.toLowerCase()) {
+											$(this).before(contact);
+											added = true;
+											return false;
+										}
+									});
+									if(!added) {
+										contactlist.append(contact);
+									}
 								}
 							}
 						});

From 4b8a34df21aca5cb7e38ec16d4d6720e27f543a9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 01:37:28 +0200
Subject: [PATCH 0979/1537] Wrong argument count in postCreateUser hook for
 contacts.

---
 apps/contacts/lib/hooks.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index d91d3c565b..6239aec49e 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -34,12 +34,12 @@
  */
 class OC_Contacts_Hooks{
 	/**
-	 * @brief Add default Addressbooks of a certain user
-	 * @param paramters parameters from postDeleteUser-Hook
+	 * @brief Add default Addressbook for a certain user
+	 * @param paramters parameters from postCreateUser-Hook
 	 * @return array
 	 */
 	static public function createUser($parameters) {
-		OC_Contacts_Addressbook::addDefault($parameters['uid'],'default','Default Address Book');
+		OC_Contacts_Addressbook::addDefault($parameters['uid']);
 		return true;
 	}
 	

From 258df5eea2fe7db6b03cf20f3c16357487dc425b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 03:04:04 +0200
Subject: [PATCH 0980/1537] Added hook for postCreateUser. Probably fix for
 oc-1265.

---
 apps/calendar/appinfo/app.php |  1 +
 apps/calendar/lib/hooks.php   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 3c8cc76133..c8fccc326c 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -10,6 +10,7 @@ OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
 //General Hooks
+OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
 //Repeating Events Hooks
 OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate');
diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php
index 328d2951d2..bc0b02c62b 100644
--- a/apps/calendar/lib/hooks.php
+++ b/apps/calendar/lib/hooks.php
@@ -11,7 +11,18 @@
  */
 class OC_Calendar_Hooks{
 	/**
-	 * @brief Deletes all Addressbooks of a certain user
+	 * @brief Creates default calendar for a user
+	 * @param paramters parameters from postCreateUser-Hook
+	 * @return array
+	 */
+	public static function createUser($parameters) {
+		OC_Calendar_Calendar::addCalendar($parameters['uid'],'Default calendar');
+
+		return true;
+	}
+
+	/**
+	 * @brief Deletes all calendars of a certain user
 	 * @param paramters parameters from postDeleteUser-Hook
 	 * @return array
 	 */

From 1f4d6896df039bfb02878fbbf146c7f23ae09c74 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 03:59:41 +0200
Subject: [PATCH 0981/1537] Wrong version comparison in update.php.

---
 apps/contacts/appinfo/update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php
index 873899f578..21e736bb44 100644
--- a/apps/contacts/appinfo/update.php
+++ b/apps/contacts/appinfo/update.php
@@ -1,7 +1,7 @@
 <?php
 
 $installedVersion=OCP\Config::getAppValue('contacts', 'installed_version');
-if (version_compare($installedVersion, '0.2.90', '<')) {
+if (version_compare($installedVersion, '0.2.3', '<')) {
 	// First set all address books in-active.
 	$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET active=0' );
 	$result = $stmt->execute(array());

From 06ff6c6d7daeb44da0de5de36eef7ea2b7a4137e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 11:46:01 +0200
Subject: [PATCH 0982/1537] Added CSRF checks to Calendar. Expect some error
 messages - and report them ;)

---
 apps/calendar/ajax/calendar/activation.php    | 2 ++
 apps/calendar/ajax/calendar/delete.php        | 1 +
 apps/calendar/ajax/calendar/new.php           | 3 +--
 apps/calendar/ajax/calendar/update.php        | 1 +
 apps/calendar/ajax/categories/rescan.php      | 1 +
 apps/calendar/ajax/event/delete.php           | 1 +
 apps/calendar/ajax/event/edit.php             | 1 +
 apps/calendar/ajax/event/move.php             | 1 +
 apps/calendar/ajax/event/new.php              | 1 +
 apps/calendar/ajax/event/resize.php           | 1 +
 apps/calendar/ajax/import/import.php          | 1 +
 apps/calendar/ajax/settings/setfirstday.php   | 1 +
 apps/calendar/ajax/settings/settimeformat.php | 1 +
 apps/calendar/ajax/settings/settimezone.php   | 1 +
 14 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
index e31908beb1..f4aadc5b01 100644
--- a/apps/calendar/ajax/calendar/activation.php
+++ b/apps/calendar/ajax/calendar/activation.php
@@ -9,6 +9,8 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
+
 $calendarid = $_POST['calendarid'];
 $calendar = OC_Calendar_App::getCalendar($calendarid, true);
 if(!$calendar){
diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php
index 4d6706f600..089255cae3 100644
--- a/apps/calendar/ajax/calendar/delete.php
+++ b/apps/calendar/ajax/calendar/delete.php
@@ -9,6 +9,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 $cal = $_POST["calendarid"];
 $calendar = OC_Calendar_App::getCalendar($cal, true);
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
index e77d4ebff0..67d1282237 100644
--- a/apps/calendar/ajax/calendar/new.php
+++ b/apps/calendar/ajax/calendar/new.php
@@ -6,11 +6,10 @@
  * See the COPYING-README file.
  */
 
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 if(trim($_POST['name']) == ''){
 	OCP\JSON::error(array('message'=>'empty'));
diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
index a2c898c807..c09b1008c9 100644
--- a/apps/calendar/ajax/calendar/update.php
+++ b/apps/calendar/ajax/calendar/update.php
@@ -11,6 +11,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 if(trim($_POST['name']) == ''){
 	OCP\JSON::error(array('message'=>'empty'));
diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php
index f0060cb23b..08c32865b6 100644
--- a/apps/calendar/ajax/categories/rescan.php
+++ b/apps/calendar/ajax/categories/rescan.php
@@ -9,6 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.print_r($element, true));
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
index f183d431af..17e45c001e 100644
--- a/apps/calendar/ajax/event/delete.php
+++ b/apps/calendar/ajax/event/delete.php
@@ -9,6 +9,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 $access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
index 1c3babc3d9..db78bf6e5e 100644
--- a/apps/calendar/ajax/event/edit.php
+++ b/apps/calendar/ajax/event/edit.php
@@ -9,6 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 
diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php
index 04cf2fb051..f4e2b36376 100644
--- a/apps/calendar/ajax/event/move.php
+++ b/apps/calendar/ajax/event/move.php
@@ -7,6 +7,7 @@
  */
  
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 $access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
index 30e2b0cae3..bc0439cc31 100644
--- a/apps/calendar/ajax/event/new.php
+++ b/apps/calendar/ajax/event/new.php
@@ -10,6 +10,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 $errarr = OC_Calendar_Object::validateRequest($_POST);
 if($errarr){
diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php
index 56b83205e8..15b687b55d 100644
--- a/apps/calendar/ajax/event/resize.php
+++ b/apps/calendar/ajax/event/resize.php
@@ -7,6 +7,7 @@
  */
  
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 1facedfe0d..38008af4a9 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -10,6 +10,7 @@ ob_start();
 
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 session_write_close();
 
 $nl="\r\n";
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
index 056a603752..73cf0c19b7 100644
--- a/apps/calendar/ajax/settings/setfirstday.php
+++ b/apps/calendar/ajax/settings/setfirstday.php
@@ -7,6 +7,7 @@
  */
  
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 if(isset($_POST["firstday"])){
 	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'firstday', $_POST["firstday"]);
 	OCP\JSON::success();
diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php
index 8e95f6f3bf..6136857e2f 100644
--- a/apps/calendar/ajax/settings/settimeformat.php
+++ b/apps/calendar/ajax/settings/settimeformat.php
@@ -7,6 +7,7 @@
  */
  
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 if(isset($_POST["timeformat"])){
 	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
 	OCP\JSON::success();
diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
index 6d029a6643..06db66d578 100644
--- a/apps/calendar/ajax/settings/settimezone.php
+++ b/apps/calendar/ajax/settings/settimezone.php
@@ -14,6 +14,7 @@ $l=OC_L10N::get('calendar');
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 // Get data
 if( isset( $_POST['timezone'] ) ){

From 8444fc5787331fb34919991f3cd9f55cf3fb4989 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 11:52:11 +0200
Subject: [PATCH 0983/1537] Added CSRF checks to Tasks. Expect some error
 messages - and report them ;)

---
 apps/tasks/ajax/addtask.php         | 1 +
 apps/tasks/ajax/delete.php          | 1 +
 apps/tasks/ajax/edittask.php        | 1 +
 apps/tasks/ajax/update_property.php | 1 +
 4 files changed, 4 insertions(+)

diff --git a/apps/tasks/ajax/addtask.php b/apps/tasks/ajax/addtask.php
index 9f35e7f21e..188e179236 100644
--- a/apps/tasks/ajax/addtask.php
+++ b/apps/tasks/ajax/addtask.php
@@ -3,6 +3,7 @@
 // Init owncloud
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('tasks');
+OCP\JSON::callCheck();
 
 $calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
 $first_calendar = reset($calendars);
diff --git a/apps/tasks/ajax/delete.php b/apps/tasks/ajax/delete.php
index e29add9b55..cc22c3e387 100644
--- a/apps/tasks/ajax/delete.php
+++ b/apps/tasks/ajax/delete.php
@@ -23,6 +23,7 @@
 // Init owncloud
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('tasks');
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 $task = OC_Calendar_App::getEventObject( $id );
diff --git a/apps/tasks/ajax/edittask.php b/apps/tasks/ajax/edittask.php
index edcc8a7cdc..77ecff13e6 100644
--- a/apps/tasks/ajax/edittask.php
+++ b/apps/tasks/ajax/edittask.php
@@ -3,6 +3,7 @@
 // Init owncloud
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('tasks');
+OCP\JSON::callCheck();
 
 $l10n = new OC_L10N('tasks');
 
diff --git a/apps/tasks/ajax/update_property.php b/apps/tasks/ajax/update_property.php
index 46521cf6c5..f47040a77d 100644
--- a/apps/tasks/ajax/update_property.php
+++ b/apps/tasks/ajax/update_property.php
@@ -9,6 +9,7 @@
 // Init owncloud
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('tasks');
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 $property = $_POST['type'];

From 748fcabba48fe0f60951be22a531f3bf88fdabff Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 11:57:38 +0200
Subject: [PATCH 0984/1537] Added CSRF checks to files_versions. Expect some
 error messages - and report them ;)

---
 apps/files_versions/ajax/expireAll.php       | 1 +
 apps/files_versions/ajax/rollbackVersion.php | 1 +
 apps/files_versions/ajax/togglesettings.php  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index 4f165be0ae..2a678c7f0a 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -27,6 +27,7 @@
 // Check user and app status
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('files_versions');
+OCP\JSON::callCheck();
 
 $versions = new OCA_Versions\Storage();
 
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 8d1092f8b8..24d71a914a 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -1,6 +1,7 @@
 <?php
 
 OCP\JSON::checkAppEnabled('files_versions');
+OCP\JSON::callCheck();
 
 $userDirectory = "/".OCP\USER::getUser()."/files";
 
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php
index 86f614c5c8..546b37ae1a 100644
--- a/apps/files_versions/ajax/togglesettings.php
+++ b/apps/files_versions/ajax/togglesettings.php
@@ -2,6 +2,7 @@
 
 OCP\JSON::checkAppEnabled('files_versions');
 OCP\JSON::checkAdminUser();
+OCP\JSON::callCheck();
 if (OCP\Config::getSystemValue('versions', 'true')=='true') {
 	OCP\Config::setSystemValue('versions', 'false');
 } else {

From 2c9aa029a73957e61ed5e520dc54eaa5c75db472 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 12:04:34 +0200
Subject: [PATCH 0985/1537] Added missing CSRF checks.

---
 apps/contacts/ajax/categories/delete.php | 1 +
 apps/contacts/ajax/categories/rescan.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
index 7c3261446b..68a308e322 100644
--- a/apps/contacts/ajax/categories/delete.php
+++ b/apps/contacts/ajax/categories/delete.php
@@ -9,6 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 require_once('../loghandler.php');
 
diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
index fd875a965d..a06e780395 100644
--- a/apps/contacts/ajax/categories/rescan.php
+++ b/apps/contacts/ajax/categories/rescan.php
@@ -9,6 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 OC_Contacts_App::scanCategories();
 $categories = OC_Contacts_App::getCategories();

From ec4891b7d3a57b92cd833d6cbd1109ba1c45376e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 12:07:14 +0200
Subject: [PATCH 0986/1537] Fixed require path.

---
 apps/contacts/ajax/categories/delete.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
index 68a308e322..f53d852d60 100644
--- a/apps/contacts/ajax/categories/delete.php
+++ b/apps/contacts/ajax/categories/delete.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-require_once('../loghandler.php');
+require_once(__DIR__.'/../loghandler.php');
 
 $categories = isset($_POST['categories'])?$_POST['categories']:null;
 

From 0ea29398c7fce1d969b56a831cad4344fb99c22c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 18 Jul 2012 12:22:30 +0200
Subject: [PATCH 0987/1537] remember username and provide autocomplete feature

---
 core/templates/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/templates/login.php b/core/templates/login.php
index 985cf90c2a..ce419016d2 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -7,7 +7,7 @@
 		<?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'])?OC_Util::sanitizeHTML($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required />
+			<input type="text" name="user" id="user" autocomplete="on" value="<?php echo !empty($_POST['user'])?OC_Util::sanitizeHTML($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required />
 		</p>
 		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>

From 20a174e71b8e0f2a500d98e7781fe7f66e2e9a23 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 18 Jul 2012 12:27:15 +0200
Subject: [PATCH 0988/1537] remove second "autocomplete" statement

---
 core/templates/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/templates/login.php b/core/templates/login.php
index ce419016d2..b35c4a33be 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -7,7 +7,7 @@
 		<?php endif; ?>
 		<p class="infield">
 			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<input type="text" name="user" id="user" autocomplete="on" value="<?php echo !empty($_POST['user'])?OC_Util::sanitizeHTML($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required />
+			<input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?OC_Util::sanitizeHTML($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="on" required />
 		</p>
 		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>

From 4490a884927c6d17e3a684500761d5cceaab128d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 18 Jul 2012 15:27:31 +0200
Subject: [PATCH 0989/1537] fix changepassword.php for subadmins

---
 settings/ajax/changepassword.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 4ba6813517..a5122bdd9d 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -11,7 +11,28 @@ $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-if( (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && ($username!=OC_User::getUser() || !OC_User::checkPassword($username,$oldPassword)))) {
+$userstatus = null;
+if(OC_Group::inGroup(OC_User::getUser(), 'admin')){
+	$userstatus = 'admin';
+}
+if(OC_SubAdmin::isSubAdmin(OC_User::getUser())){
+	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$isuseraccessible = false;
+	foreach($accessiblegroups as $accessiblegroup){
+		if(OC_Group::inGroup($username, $accessiblegroup)){
+			$isuseraccessible = true;
+			break;
+		}
+	}
+	if($isuseraccessible){
+		$userstatus = 'subadmin';
+	}
+}
+if(OC_User::getUser() == $username && OC_User::checkPassword($username,$oldPassword)){
+	$userstatus = 'user';
+}
+
+if(is_null($userstatus)){
 	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
 	exit();
 }

From f503aea09999e55bb2e51e87fbdd769092a97501 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 18 Jul 2012 15:28:12 +0200
Subject: [PATCH 0990/1537] remove unused code from togglesubadmins.php

---
 settings/ajax/togglesubadmins.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 8e91af62c5..42db845030 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -6,10 +6,6 @@ require_once('../../lib/base.php');
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-$success = true;
-$error = "add user to";
-$action = "add";
-
 $username = $_POST["username"];
 $group = OC_Util::sanitizeHTML($_POST["group"]);
 

From a5bebb86a59a156d00bbd36f477696ddd38ca092 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 18 Jul 2012 17:10:53 +0200
Subject: [PATCH 0991/1537] add checkSubAdminUser method to OC_JSON class

---
 lib/json.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/json.php b/lib/json.php
index c49b831c12..b0d3d91865 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -64,6 +64,18 @@ class OC_JSON{
 			exit();
 		}
 	}
+        
+	/**
+	* Check if the user is a subadmin, send json error msg if not
+	*/
+	public static function checkSubAdminUser(){
+		self::checkLoggedIn();
+		if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())){
+			$l = OC_L10N::get('core');
+			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+			exit();
+		}
+	}
 
 	/**
 	* Send json error msg

From fb6468936e2b65d7d14f6b86ff3933f6fe0a6cc4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 18 Jul 2012 17:23:40 +0200
Subject: [PATCH 0992/1537] fix removeuser.php for subadmins

---
 settings/ajax/removeuser.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 230815217c..01b2839639 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -3,11 +3,27 @@
 // Init owncloud
 require_once('../../lib/base.php');
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && OC_SubAdmin::isSubAdmin(OC_User::getUser())){
+	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$isuseraccessible = false;
+	foreach($accessiblegroups as $accessiblegroup){
+		if(OC_Group::inGroup($username, $accessiblegroup)){
+			$isuseraccessible = true;
+			break;
+		}
+	}
+	if(!$isuseraccessible){
+		$l = OC_L10N::get('core');
+		self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+		exit();
+	}
+}
+
 // Return Success story
 if( OC_User::deleteUser( $username )){
 	OC_JSON::success(array("data" => array( "username" => $username )));

From b30da61d595a4efe4b35e5b05ca7fcd04732a28f Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 18 Jul 2012 21:44:41 +0200
Subject: [PATCH 0993/1537] postgres added to autotest mechanism

---
 autotest.sh | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index bf98932a4a..a42c6ab059 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -38,12 +38,26 @@ cat > ./tests/autoconfig-mysql.php <<DELIM
 );
 DELIM
 
+cat > ./tests/autoconfig-pgsql.php <<DELIM
+<?php
+\$AUTOCONFIG = array (
+  'installed' => false,
+  'dbtype' => 'pgsql',
+  'dbtableprefix' => 'oc_',
+  'adminlogin' => 'admin',
+  'adminpass' => 'admin',
+  'directory' => '$BASEDIR/$DATADIR',
+  'dbuser' => 'oc_autotest',	
+  'dbname' => 'oc_autotest',	
+  'dbhost' => 'localhost',
+  'dbpass' => 'owncloud',	
+);
+DELIM
 
 function execute_tests {
 	echo "Setup environment for $1 testing ..."
 	# back to root folder
 	cd $BASEDIR
-	echo $BASEDIR
 
 	# revert changes to tests/data
 	git checkout tests/data/*
@@ -59,6 +73,9 @@ function execute_tests {
 	if [ "$1" == "mysql" ] ; then
 		mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
 	fi
+	if [ "$1" == "pgsql" ] ; then
+		dropdb -U oc_autotest oc_autotest
+	fi
 
 	# copy autoconfig
 	cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
@@ -77,13 +94,17 @@ function execute_tests {
 #
 execute_tests "sqlite"
 execute_tests 'mysql'
-
-# TODO: implement this
-#execute_tests 'postgresql'
+execute_tests 'pgsql'
 
 #
-# NOTES:
+# NOTES on mysql:
 #  - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
 #  - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
 #
+# NOTES on pgsql:
+#  - su - postgres
+#  - createuser -P (enter username and password and enable superuser)
+#  - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
+# local	all	all	trust
+#
 

From e031b9b88009ed7b1d1986d9a58e7cb39b5dd825 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 19 Jul 2012 16:19:23 +0200
Subject: [PATCH 0994/1537] fix running test cases from browser

---
 tests/index.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/index.php b/tests/index.php
index 935ce39531..0be27ee3fd 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -32,8 +32,7 @@ $testSuiteName="ownCloud Unit Test Suite";
 if(OC::$CLI){
 	$reporter=new TextReporter;
 	$test=isset($_SERVER['argv'][1])?$_SERVER['argv'][1]:false;
-	if($test=='xml')
-	{
+	if($test=='xml'){
 		$reporter= new XmlReporter;
 		$test=false;
 
@@ -42,7 +41,7 @@ if(OC::$CLI){
 		}
 	}
 }else{
-	$reporter='HtmlReporter';
+	$reporter=new HtmlReporter;
 	$test=isset($_GET['test'])?$_GET['test']:false;
 }
 
@@ -81,10 +80,10 @@ function loadTests($dir,$testSuite, $test){
 				}elseif(substr($file,-4)=='.php' and $file!=__FILE__){
 					$name=getTestName($file);
 					if($test===false or $test==$name or substr($name,0,strlen($test))==$test){
-					        $extractor = new SimpleFileLoader();
+						$extractor = new SimpleFileLoader();
 						$loadedSuite=$extractor->load($file);
 						if ($loadedSuite->getSize() > 0)
-						        $testSuite->add($loadedSuite);
+							$testSuite->add($loadedSuite);
 					}
 				}
 			}

From 6e139f16e4a245fb77d97d495fd8f1ce991a733b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 16:30:58 +0200
Subject: [PATCH 0995/1537] add isUserAccessible method to OC_SubAdmin class

---
 lib/subadmin.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/subadmin.php b/lib/subadmin.php
index b6f0b3007f..330876536d 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -122,4 +122,17 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
+	
+	public static function isUserAccessible($subadmin, $user){
+		if(!self::isSubAdmin($subadmin)){
+			return false;
+		}
+		$accessiblegroups = self::getSubAdminsGroups($subadmin);
+		foreach($accessiblegroups as $accessiblegroup){
+			if(OC_Group::inGroup($user, $accessiblegroup)){
+				return true;
+			}
+		}
+		return false;
+	}
 }

From 33b8de91eacc09a4c15d4d45df0006ff80a9fb09 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 19 Jul 2012 16:31:55 +0200
Subject: [PATCH 0996/1537] allow a more flexible way of using user backends

---
 lib/base.php |  2 +-
 lib/user.php | 38 +++++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index fe69ad70c0..631ed4fcce 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -345,7 +345,7 @@ class OC{
 			$_SESSION['user_id'] = '';
 		}
 
-		OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
+		OC_User::useBackend(new OC_User_Database());
 		OC_Group::useBackend(new OC_Group_Database());
 
 		// Load Apps
diff --git a/lib/user.php b/lib/user.php
index 230efe7139..356be4decf 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -50,8 +50,8 @@ class OC_User {
 	 *
 	 * Makes a list of backends that can be used by other modules
 	 */
-	public static function registerBackend( $name ){
-		self::$_backends[] = $name;
+	public static function registerBackend( $backend ){
+		self::$_backends[] = $backend;
 		return true;
 	}
 
@@ -83,22 +83,26 @@ class OC_User {
 	 * Set the User Authentication Module
 	 */
 	public static function useBackend( $backend = 'database' ){
-		// You'll never know what happens
-		if( null === $backend OR !is_string( $backend )){
-			$backend = 'database';
-		}
+		if($backend instanceof OC_User_Backend){
+			self::$_usedBackends[get_class($backend)]=$backend;
+		}else{
+			// You'll never know what happens
+			if( null === $backend OR !is_string( $backend )){
+				$backend = 'database';
+			}
 
-		// Load backend
-		switch( $backend ){
-			case 'database':
-			case 'mysql':
-			case 'sqlite':
-				self::$_usedBackends[$backend] = new OC_User_Database();
-				break;
-			default:
-				$className = 'OC_USER_' . strToUpper($backend);
-				self::$_usedBackends[$backend] = new $className();
-				break;
+			// Load backend
+			switch( $backend ){
+				case 'database':
+				case 'mysql':
+				case 'sqlite':
+					self::$_usedBackends[$backend] = new OC_User_Database();
+					break;
+				default:
+					$className = 'OC_USER_' . strToUpper($backend);
+					self::$_usedBackends[$backend] = new $className();
+					break;
+			}
 		}
 
 		true;

From ffc55f351013b46c841ed1c477de6328169ac4cd Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 16:35:14 +0200
Subject: [PATCH 0997/1537] simplify code of remoteuser.php

---
 settings/ajax/removeuser.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 01b2839639..1439cfe373 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -8,20 +8,10 @@ OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && OC_SubAdmin::isSubAdmin(OC_User::getUser())){
-	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$isuseraccessible = false;
-	foreach($accessiblegroups as $accessiblegroup){
-		if(OC_Group::inGroup($username, $accessiblegroup)){
-			$isuseraccessible = true;
-			break;
-		}
-	}
-	if(!$isuseraccessible){
-		$l = OC_L10N::get('core');
-		self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
-		exit();
-	}
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+	$l = OC_L10N::get('core');
+	self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
 }
 
 // Return Success story

From 2fc834230a8e5cae4070d0c1f0053e0dc20db1b3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 16:37:41 +0200
Subject: [PATCH 0998/1537] fix setqouta for subadmins

---
 settings/ajax/setquota.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 2b412c0f2f..55e936515e 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -8,11 +8,17 @@
 // Init owncloud
 require_once('../../lib/base.php');
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+	$l = OC_L10N::get('core');
+	self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
 if($quota!='none' and $quota!='default'){

From 05bc541276192c9f1bbe82ea9989872d5f25f49c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 16:43:46 +0200
Subject: [PATCH 0999/1537] add some doc for lib/subadmin.php

---
 lib/subadmin.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/subadmin.php b/lib/subadmin.php
index 330876536d..26cf64304d 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -101,7 +101,9 @@ class OC_SubAdmin{
 	
 	/**
 	 * @brief checks if a user is a SubAdmin of a group
-	 * @return array
+	 * @param $uid uid of the subadmin
+	 * @param $gid gid of the group
+	 * @return bool
 	 */
 	public static function isSubAdminofGroup($uid, $gid){
 		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin where uid = ? AND gid = ?');
@@ -113,6 +115,11 @@ class OC_SubAdmin{
 		return false;
 	}
 	
+	/**
+	 * @brief checks if a user is a SubAdmin
+	 * @param $uid uid of the subadmin
+	 * @return bool
+	 */
 	public static function isSubAdmin($uid){
 		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin WHERE uid = ?');
 		$result = $stmt->execute(array($uid));
@@ -123,6 +130,12 @@ class OC_SubAdmin{
 		return false;
 	}
 	
+	/**
+	 * @brief checks if a user is a accessible by a subadmin
+	 * @param $subadmin uid of the subadmin
+	 * @param $user uid of the user
+	 * @return bool
+	 */
 	public static function isUserAccessible($subadmin, $user){
 		if(!self::isSubAdmin($subadmin)){
 			return false;

From 6cf418f2fae60dd5f7d3dd1cf77977f6faa0dfcb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 18:00:33 +0200
Subject: [PATCH 1000/1537] fix copy&paste fail and deny subadmins to set the
 default qouta

---
 settings/ajax/removeuser.php | 2 +-
 settings/ajax/setquota.php   | 4 ++--
 settings/templates/users.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 1439cfe373..bfab13a68c 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -10,7 +10,7 @@ $username = $_POST["username"];
 
 if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
 	$l = OC_L10N::get('core');
-	self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
 }
 
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 55e936515e..2a30b1d97e 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -13,9 +13,9 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))){
 	$l = OC_L10N::get('core');
-	self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
 }
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 649fce107d..9f246423d2 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -32,7 +32,7 @@ $_['subadmingroups'] = array_flip($items);
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
 		<div class="quota-select-wrapper">
-			<select class='quota'>
+			<select class='quota' <?php if(!(is_array($_['subadmins']) || $_['subadmins'])) echo 'disabled="disabled"'; ?>>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option

From abb9f52dd7aea3df934d0db8d7f3218770e534f1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 19:17:01 +0200
Subject: [PATCH 1001/1537] add isGroupAccessible in OC_SubAdmin

---
 lib/subadmin.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/subadmin.php b/lib/subadmin.php
index 26cf64304d..04e6143081 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -148,4 +148,11 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
+	
+	/*
+	 * @brief alias for self::isSubAdminofGroup()
+	 */
+	public static function isGroupAccessible($subadmin, $group){
+		return self::isSubAdminofGroup($subadmin, $group);
+	}
 }

From 91578883343d909da027790aa2458ad114b53aa0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jul 2012 19:32:59 +0200
Subject: [PATCH 1002/1537] simplify code of changepassword.php

---
 settings/ajax/changepassword.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index a5122bdd9d..fa778de5c9 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -15,18 +15,8 @@ $userstatus = null;
 if(OC_Group::inGroup(OC_User::getUser(), 'admin')){
 	$userstatus = 'admin';
 }
-if(OC_SubAdmin::isSubAdmin(OC_User::getUser())){
-	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$isuseraccessible = false;
-	foreach($accessiblegroups as $accessiblegroup){
-		if(OC_Group::inGroup($username, $accessiblegroup)){
-			$isuseraccessible = true;
-			break;
-		}
-	}
-	if($isuseraccessible){
-		$userstatus = 'subadmin';
-	}
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+	$userstatus = 'subadmin';
 }
 if(OC_User::getUser() == $username && OC_User::checkPassword($username,$oldPassword)){
 	$userstatus = 'user';

From 57fb37151a6c29d857733c78e3b00909aabaf413 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 19 Jul 2012 22:42:18 +0200
Subject: [PATCH 1003/1537] imap user backend

---
 apps/user_external/appinfo/app.php  |  2 ++
 apps/user_external/appinfo/info.xml | 13 ++++++++++
 apps/user_external/appinfo/version  |  1 +
 apps/user_external/lib/imap.php     | 40 +++++++++++++++++++++++++++++
 apps/user_external/tests/config.php | 16 ++++++++++++
 apps/user_external/tests/imap.php   | 34 ++++++++++++++++++++++++
 6 files changed, 106 insertions(+)
 create mode 100644 apps/user_external/appinfo/app.php
 create mode 100644 apps/user_external/appinfo/info.xml
 create mode 100644 apps/user_external/appinfo/version
 create mode 100644 apps/user_external/lib/imap.php
 create mode 100644 apps/user_external/tests/config.php
 create mode 100644 apps/user_external/tests/imap.php

diff --git a/apps/user_external/appinfo/app.php b/apps/user_external/appinfo/app.php
new file mode 100644
index 0000000000..e53b839daf
--- /dev/null
+++ b/apps/user_external/appinfo/app.php
@@ -0,0 +1,2 @@
+<?php
+OC::$CLASSPATH['OC_User_IMAP']='apps/user_external/lib/imap.php';
diff --git a/apps/user_external/appinfo/info.xml b/apps/user_external/appinfo/info.xml
new file mode 100644
index 0000000000..1d1dcee540
--- /dev/null
+++ b/apps/user_external/appinfo/info.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<info>
+	<id>user_external</id>
+	<name>External user support</name>
+	<description>Use external user authentication methods</description>
+	<licence>AGPL</licence>
+	<author>Robin Appelman</author>
+	<require>4</require>
+	<shipped>true</shipped>
+	<types>
+		<authentication/>
+	</types>
+</info>
diff --git a/apps/user_external/appinfo/version b/apps/user_external/appinfo/version
new file mode 100644
index 0000000000..ceab6e11ec
--- /dev/null
+++ b/apps/user_external/appinfo/version
@@ -0,0 +1 @@
+0.1
\ No newline at end of file
diff --git a/apps/user_external/lib/imap.php b/apps/user_external/lib/imap.php
new file mode 100644
index 0000000000..584e9804b1
--- /dev/null
+++ b/apps/user_external/lib/imap.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_User_IMAP extends OC_User_Backend{
+	private $mailbox;
+	
+	public function __construct($mailbox){
+		$this->mailbox=$mailbox;
+	}
+	
+	/**
+	 * @brief Check if the password is correct
+	 * @param $uid The username
+	 * @param $password The password
+	 * @returns true/false
+	 *
+	 * Check if the password is correct without logging in the user
+	 */
+	public function checkPassword($uid, $password){
+		$mbox = @imap_open($this->mailbox, $uid, $password);
+		imap_errors();
+		imap_alerts();
+		if($mbox){
+			imap_close($mbox);
+			return $uid;
+		}else{
+			return false;
+		}
+	}
+
+	public function userExists($uid){
+		return true;
+	}
+}
+
diff --git a/apps/user_external/tests/config.php b/apps/user_external/tests/config.php
new file mode 100644
index 0000000000..a32ad5d83a
--- /dev/null
+++ b/apps/user_external/tests/config.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+return array(
+	'imap'=>array(
+		'run'=>false,
+		'mailbox'=>'{imap.gmail.com:993/imap/ssl}INBOX', //see http://php.net/manual/en/function.imap-open.php
+		'user'=>'foo',//valid username/password combination
+		'password'=>'bar',
+	),
+);
diff --git a/apps/user_external/tests/imap.php b/apps/user_external/tests/imap.php
new file mode 100644
index 0000000000..c703b32107
--- /dev/null
+++ b/apps/user_external/tests/imap.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_User_Imap extends UnitTestCase{
+	/**
+	 * @var OC_User_IMAP $instance
+	 */
+	private $instance;
+
+	private function getConfig(){
+		return include(__DIR__.'/config.php');
+	}
+
+	function skip(){
+		$config=$this->getConfig();
+		$this->skipUnless($config['imap']['run']);
+	} 
+
+	function setUp(){
+		$config=$this->getConfig();
+		$this->instance=new OC_User_IMAP($config['imap']['mailbox']);
+	}
+	
+	function testLogin(){
+		$config=$this->getConfig();
+		$this->assertEqual($config['imap']['user'],$this->instance->checkPassword($config['imap']['user'],$config['imap']['password']));
+		$this->assertFalse($this->instance->checkPassword($config['imap']['user'],$config['imap']['password'].'foo'));
+	}
+}

From b357a968c07bdfe888c469ff261baff8f8ed4d51 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 19 Jul 2012 22:42:26 +0200
Subject: [PATCH 1004/1537] smb user backend

---
 apps/user_external/appinfo/app.php  |  1 +
 apps/user_external/lib/smb.php      | 43 +++++++++++++++++++++++++++++
 apps/user_external/tests/config.php |  6 ++++
 apps/user_external/tests/smb.php    | 34 +++++++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 apps/user_external/lib/smb.php
 create mode 100644 apps/user_external/tests/smb.php

diff --git a/apps/user_external/appinfo/app.php b/apps/user_external/appinfo/app.php
index e53b839daf..66320da95b 100644
--- a/apps/user_external/appinfo/app.php
+++ b/apps/user_external/appinfo/app.php
@@ -1,2 +1,3 @@
 <?php
 OC::$CLASSPATH['OC_User_IMAP']='apps/user_external/lib/imap.php';
+OC::$CLASSPATH['OC_User_SMB']='apps/user_external/lib/smb.php';
diff --git a/apps/user_external/lib/smb.php b/apps/user_external/lib/smb.php
new file mode 100644
index 0000000000..44d2b7903d
--- /dev/null
+++ b/apps/user_external/lib/smb.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_User_SMB extends OC_User_Backend{
+	private $host;
+
+	const smbclient='smbclient';
+	const loginError='NT_STATUS_LOGON_FAILURE';
+	
+	public function __construct($host){
+		$this->host=$host;
+	}
+	
+	/**
+	 * @brief Check if the password is correct
+	 * @param $uid The username
+	 * @param $password The password
+	 * @returns true/false
+	 *
+	 * Check if the password is correct without logging in the user
+	 */
+	public function checkPassword($uid, $password){
+		$uidEscaped=escapeshellarg($uid);
+		$password=escapeshellarg($password);
+		$result=array();
+		$command=self::smbclient.' //'.$this->host.'/dummy -U'.$uidEscaped.'%'.$password;
+		$result=exec($command,$result);
+		if(substr($result,-strlen(self::loginError))==self::loginError){
+			return false;
+		}else{
+			return $uid;
+		}
+	}
+	
+	public function userExists($uid){
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/apps/user_external/tests/config.php b/apps/user_external/tests/config.php
index a32ad5d83a..a72b2bbce8 100644
--- a/apps/user_external/tests/config.php
+++ b/apps/user_external/tests/config.php
@@ -13,4 +13,10 @@ return array(
 		'user'=>'foo',//valid username/password combination
 		'password'=>'bar',
 	),
+	'smb'=>array(
+		'run'=>true,
+		'host'=>'localhost',
+		'user'=>'test',//valid username/password combination
+		'password'=>'test',
+	),
 );
diff --git a/apps/user_external/tests/smb.php b/apps/user_external/tests/smb.php
new file mode 100644
index 0000000000..1ed7eb934b
--- /dev/null
+++ b/apps/user_external/tests/smb.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_User_SMB extends UnitTestCase{
+	/**
+	 * @var OC_User_IMAP $instance
+	 */
+	private $instance;
+	
+	private function getConfig(){
+		return include(__DIR__.'/config.php');
+	}
+	
+	function skip(){
+		$config=$this->getConfig();
+		$this->skipUnless($config['smb']['run']);
+	}
+	
+	function setUp(){
+		$config=$this->getConfig();
+		$this->instance=new OC_User_SMB($config['smb']['host']);
+	}
+	
+	function testLogin(){
+		$config=$this->getConfig();
+		$this->assertEqual($config['smb']['user'],$this->instance->checkPassword($config['smb']['user'],$config['smb']['password']));
+		$this->assertFalse($this->instance->checkPassword($config['smb']['user'],$config['smb']['password'].'foo'));
+	}
+}

From ad14d67c8dee81a343ff31fe6e510c588abbf46b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 19 Jul 2012 23:03:02 +0200
Subject: [PATCH 1005/1537] ftp user backend

---
 apps/user_external/appinfo/app.php  |  1 +
 apps/user_external/lib/ftp.php      | 45 +++++++++++++++++++++++++++++
 apps/user_external/tests/config.php |  8 ++++-
 apps/user_external/tests/ftp.php    | 34 ++++++++++++++++++++++
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 apps/user_external/lib/ftp.php
 create mode 100644 apps/user_external/tests/ftp.php

diff --git a/apps/user_external/appinfo/app.php b/apps/user_external/appinfo/app.php
index 66320da95b..c7408ec30d 100644
--- a/apps/user_external/appinfo/app.php
+++ b/apps/user_external/appinfo/app.php
@@ -1,3 +1,4 @@
 <?php
 OC::$CLASSPATH['OC_User_IMAP']='apps/user_external/lib/imap.php';
 OC::$CLASSPATH['OC_User_SMB']='apps/user_external/lib/smb.php';
+OC::$CLASSPATH['OC_User_FTP']='apps/user_external/lib/ftp.php';
diff --git a/apps/user_external/lib/ftp.php b/apps/user_external/lib/ftp.php
new file mode 100644
index 0000000000..e03e17d2b6
--- /dev/null
+++ b/apps/user_external/lib/ftp.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_User_FTP extends OC_User_Backend{
+	private $host;
+	private $secure;
+	private $protocol;
+
+	public function __construct($host,$secure=false){
+		$this->host=$host;
+		$this->secure=$secure;
+		$this->protocol='ftp';
+		if($this->secure){
+			$this->protocol.='s';
+		}
+		$this->protocol.='://';
+	}
+
+	/**
+	 * @brief Check if the password is correct
+	 * @param $uid The username
+	 * @param $password The password
+	 * @returns true/false
+	 *
+	 * Check if the password is correct without logging in the user
+	 */
+	public function checkPassword($uid, $password){
+		$url=$this->protocol.$uid.':'.$password.'@'.$this->host.'/';
+		$result=@opendir($url);
+		if(is_resource($result)){
+			return $uid;
+		}else{
+			return false;
+		}
+	}
+
+	public function userExists($uid){
+		return true;
+	}
+}
diff --git a/apps/user_external/tests/config.php b/apps/user_external/tests/config.php
index a72b2bbce8..64ee141d32 100644
--- a/apps/user_external/tests/config.php
+++ b/apps/user_external/tests/config.php
@@ -14,7 +14,13 @@ return array(
 		'password'=>'bar',
 	),
 	'smb'=>array(
-		'run'=>true,
+		'run'=>false,
+		'host'=>'localhost',
+		'user'=>'test',//valid username/password combination
+		'password'=>'test',
+	),
+	'ftp'=>array(
+		'run'=>false,
 		'host'=>'localhost',
 		'user'=>'test',//valid username/password combination
 		'password'=>'test',
diff --git a/apps/user_external/tests/ftp.php b/apps/user_external/tests/ftp.php
new file mode 100644
index 0000000000..0cf7565f9c
--- /dev/null
+++ b/apps/user_external/tests/ftp.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_User_FTP extends UnitTestCase{
+	/**
+	 * @var OC_User_IMAP $instance
+	 */
+	private $instance;
+	
+	private function getConfig(){
+		return include(__DIR__.'/config.php');
+	}
+	
+	function skip(){
+		$config=$this->getConfig();
+		$this->skipUnless($config['ftp']['run']);
+	}
+	
+	function setUp(){
+		$config=$this->getConfig();
+		$this->instance=new OC_User_FTP($config['ftp']['host']);
+	}
+	
+	function testLogin(){
+		$config=$this->getConfig();
+		$this->assertEqual($config['ftp']['user'],$this->instance->checkPassword($config['ftp']['user'],$config['ftp']['password']));
+		$this->assertFalse($this->instance->checkPassword($config['ftp']['user'],$config['ftp']['password'].'foo'));
+	}
+}

From 87da179e6cc8f17918dd8ab987f670f3d3449107 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 14:28:34 +0200
Subject: [PATCH 1006/1537] Eye candy for the draggables.

---
 apps/contacts/css/contacts.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 27a796a15f..f76365a2bc 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -9,7 +9,7 @@
 #contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
 .contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
 .contacts li.ui-draggable { height: 23px; }
-.ui-draggable-dragging { width: 16em; }
+.ui-draggable-dragging { width: 17em; cursor: move; }
 .ui-state-hover { border: 1px solid dashed; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #bottomcontrols img { margin-top: 0.35em; }

From fc46322d4ce444a0c882179ee6c2aa3b6aa0b469 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 18 Jul 2012 16:08:58 +0200
Subject: [PATCH 1007/1537] Tweak dragging.

---
 apps/contacts/js/contacts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 990d83c00b..6186b5e17f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1592,9 +1592,10 @@ Contacts={
 						});
 						if($('#contacts h3').length > 1) {
 							$('#contacts li,#contacts h3').draggable({
+								distance: 10,
 								revert: 'invalid',
 								axis: 'y', containment: '#contacts',
-								scroll: true, scrollSensitivity: 100,
+								scroll: true, scrollSensitivity: 40,
 								opacity: 0.7, helper: 'clone'
 							});
 						} else {

From 5c0c9bbdc176d093d98a5357172df5deb57e6fb9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 18 Jul 2012 16:24:21 +0200
Subject: [PATCH 1008/1537] Cleaning up a bit.

---
 apps/contacts/css/contacts.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index f76365a2bc..927e730980 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -16,7 +16,7 @@
 #uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
 #contacts_newcontact, #contacts_import, #chooseaddressbook { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
-#actionbar { position: relative; clear: both; height: 30px;}
+#actionbar { clear: both; height: 30px;}
 #contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
 #contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
 #contacts_propertymenu { clear: left; float:left; max-width: 15em; margin: 2em; }
@@ -72,7 +72,7 @@ label:hover, dt:hover { color: #333; }
 #identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
 /*#contact_photo { max-width: 250px; }*/
 #contact_identity { min-width: 30em; }
-.contactsection { position: relative; float: left; /*max-width: 40em;*/ padding: 0.5em; height: auto: border: thin solid lightgray;/* -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; border-radius: 0.5em; background-color: #f8f8f8;*/ }
+.contactsection { position: relative; float: left; padding: 0.5em; height: auto; }
 
 #cropbox { margin: auto; }
 #contacts_details_photo_wrapper { width: 200px; }

From 616f2f336e1e03aaf22aeed7196182b1890669b5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Jul 2012 22:55:52 +0200
Subject: [PATCH 1009/1537] Trigger loading of more contacts a bit earlier.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6186b5e17f..5aead47888 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1565,7 +1565,7 @@ Contacts={
 								if(book.contacts[c].id == undefined) { continue; }
 								if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
 									var contact = Contacts.UI.Card.createEntry(book.contacts[c]);
-									if(c == self.batchnum-5) {
+									if(c == self.batchnum-10) {
 										contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 											$(this).unbind(event);
 											var bookid = $(this).data('bookid');

From 1cbddcf211d81065bf91bacee5b318c48b6b27aa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Jul 2012 23:48:17 +0200
Subject: [PATCH 1010/1537] Code style

---
 apps/contacts/ajax/activation.php             |  8 +++-
 apps/contacts/ajax/addaddressbook.php         |  6 ++-
 apps/contacts/ajax/addcontact.php             | 10 ++--
 apps/contacts/ajax/addproperty.php            | 39 +++++++++-------
 .../ajax/categories/categoriesfor.php         | 15 ++++--
 apps/contacts/ajax/categories/delete.php      |  2 +-
 apps/contacts/ajax/contactdetails.php         |  2 +-
 apps/contacts/ajax/createaddressbook.php      |  2 +-
 apps/contacts/ajax/currentphoto.php           |  2 +-
 apps/contacts/ajax/deletecard.php             | 12 +----
 apps/contacts/ajax/deleteproperty.php         | 11 +++--
 apps/contacts/ajax/editaddress.php            |  4 +-
 apps/contacts/ajax/editname.php               |  6 +--
 apps/contacts/ajax/loadcard.php               | 14 +++---
 apps/contacts/ajax/loadintro.php              |  2 +-
 apps/contacts/ajax/loadphoto.php              |  2 +-
 apps/contacts/ajax/loghandler.php             | 10 ++--
 apps/contacts/ajax/oc_photo.php               |  6 ++-
 apps/contacts/ajax/savecrop.php               | 20 +++++---
 apps/contacts/ajax/saveproperty.php           |  8 ++--
 apps/contacts/ajax/updateaddressbook.php      |  2 +-
 apps/contacts/ajax/uploadimport.php           | 28 ++++++-----
 apps/contacts/ajax/uploadphoto.php            | 46 ++++++++++++-------
 23 files changed, 152 insertions(+), 105 deletions(-)

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
index 74cb738ab8..69173c54c4 100644
--- a/apps/contacts/ajax/activation.php
+++ b/apps/contacts/ajax/activation.php
@@ -16,8 +16,12 @@ $bookid = $_POST['bookid'];
 $book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
 
 if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
-	OCP\Util::writeLog('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR);
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
+	OCP\Util::writeLog('contacts',
+		'ajax/activation.php: Error activating addressbook: '. $bookid, 
+		OCP\Util::ERROR);
+	OCP\JSON::error(array(
+		'data' => array(
+			'message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
 	exit();
 }
 
diff --git a/apps/contacts/ajax/addaddressbook.php b/apps/contacts/ajax/addaddressbook.php
index 3d7885fe46..40773704bb 100644
--- a/apps/contacts/ajax/addaddressbook.php
+++ b/apps/contacts/ajax/addaddressbook.php
@@ -12,13 +12,15 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 debug('name: '.$_POST['name']);
 
 $userid = OCP\USER::getUser();
 $name = isset($_POST['name'])?trim(strip_tags($_POST['name'])):null;
-$description = isset($_POST['description'])?trim(strip_tags($_POST['description'])):null;
+$description = isset($_POST['description'])
+	? trim(strip_tags($_POST['description']))
+	: null;
 
 if(is_null($name)) {
 	bailOut('Cannot add addressbook with an empty name.');
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index 12f7bb9db9..6aaf5a9df3 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -37,13 +37,15 @@ $n = trim($_POST['n']);
 
 $vcard = new OC_VObject('VCARD');
 $vcard->setUID();
-$vcard->setString('FN',$fn);
-$vcard->setString('N',$n);
+$vcard->setString('FN', $fn);
+$vcard->setString('N', $n);
 
 $id = OC_Contacts_VCard::add($aid, $vcard, null, $isnew);
 if(!$id) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
-	OCP\Util::writeLog('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR);
+	OCP\JSON::error(array(
+		'data' => array(
+			'message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
+	OCP\Util::writeLog('contacts', 'ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR);
 	exit();
 }
 
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 1b6db0c8f8..96f27b2b9b 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -25,7 +25,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
@@ -33,22 +33,26 @@ $value = isset($_POST['value'])?$_POST['value']:null;
 $parameters = isset($_POST['parameters'])?$_POST['parameters']:array();
 
 $vcard = OC_Contacts_App::getContactVCard($id);
+$l10n = OC_Contacts_App::$l10n;
 
 if(!$name) {
-	bailOut(OC_Contacts_App::$l10n->t('element name is not set.'));
+	bailOut($l10n->t('element name is not set.'));
 }
 if(!$id) {
-	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
+	bailOut($l10n->t('id is not set.'));
 }
 
 if(!$vcard) {
-	bailOut(OC_Contacts_App::$l10n->t('Could not parse contact: ').$id);
+	bailOut($l10n->t('Could not parse contact: ').$id);
 }
 
-if(!is_array($value)){
+if(!is_array($value)) {
 	$value = trim($value);
-	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))) {
-		bailOut(OC_Contacts_App::$l10n->t('Cannot add empty property.'));
+	if(!$value && in_array(
+			$name, 
+			array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))
+		) {
+		bailOut($l10n->t('Cannot add empty property.'));
 	}
 } elseif($name === 'ADR') { // only add if non-empty elements.
 	$empty = true;
@@ -59,7 +63,7 @@ if(!is_array($value)){
 		}
 	}
 	if($empty) {
-		bailOut(OC_Contacts_App::$l10n->t('At least one of the address fields has to be filled out.'));
+		bailOut($l10n->t('At least one of the address fields has to be filled out.'));
 	}
 }
 
@@ -68,12 +72,14 @@ $current = $vcard->select($name);
 foreach($current as $item) {
 	$tmpvalue = (is_array($value)?implode(';', $value):$value);
 	if($tmpvalue == $item->value) {
-		bailOut(OC_Contacts_App::$l10n->t('Trying to add duplicate property: '.$name.': '.$tmpvalue));
+		bailOut($l10n->t('Trying to add duplicate property: '.$name.': '.$tmpvalue));
 	}
 }
 
 if(is_array($value)) {
-	ksort($value);  // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	// NOTE: Important, otherwise the compound value will 
+	// be set in the order the fields appear in the form!
+	ksort($value);  
 	$value = array_map('strip_tags', $value);
 } else {
 	$value = strip_tags($value);
@@ -116,24 +122,25 @@ switch($name) {
 
 $line = count($vcard->children) - 1;
 
-// Apparently Sabre_VObject_Parameter doesn't do well with multiple values or I don't know how to do it. Tanghus.
+// Apparently Sabre_VObject_Parameter doesn't do well with 
+// multiple values or I don't know how to do it. Tanghus.
 foreach ($parameters as $key=>$element) {
 	if(is_array($element) && strtoupper($key) == 'TYPE') { 
 		// NOTE: Maybe this doesn't only apply for TYPE?
 		// And it probably shouldn't be done here anyways :-/
-		foreach($element as $e){
+		foreach($element as $e) {
 			if($e != '' && !is_null($e)){
-				$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$e);
+				$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
 			}
 		}
 	} else {
-			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$element);
+			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $element);
 	}
 }
 $checksum = md5($vcard->children[$line]->serialize());
 
-if(!OC_Contacts_VCard::edit($id,$vcard)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error adding contact property: '.$name));
+if(!OC_Contacts_VCard::edit($id, $vcard)) {
+	bailOut($l10n->t('Error adding contact property: '.$name));
 }
 
 OCP\JSON::success(array('data' => array( 'checksum' => $checksum )));
diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php
index 6b6fcad0eb..8391b14b54 100644
--- a/apps/contacts/ajax/categories/categoriesfor.php
+++ b/apps/contacts/ajax/categories/categoriesfor.php
@@ -12,16 +12,23 @@ OCP\JSON::checkAppEnabled('contacts');
 
 $id = isset($_GET['id'])?$_GET['id']:null;
 if(is_null($id)) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('No ID provided'))));
+	OCP\JSON::error(array(
+		'data' => array(
+			'message' => OC_Contacts_App::$l10n->t('No ID provided'))));
 	exit();
 }
 $vcard = OC_Contacts_App::getContactVCard( $id );
 foreach($vcard->children as $property){
-	//OCP\Util::writeLog('contacts','ajax/categories/checksumfor.php: '.$property->name, OCP\Util::DEBUG);
 	if($property->name == 'CATEGORIES') {
 		$checksum = md5($property->serialize());
-		OCP\JSON::success(array('data' => array('value'=>$property->value, 'checksum'=>$checksum)));
+		OCP\JSON::success(array(
+			'data' => array(
+				'value' => $property->value, 
+				'checksum' => $checksum,
+				)));
 		exit();
 	}
 }
-OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
+OCP\JSON::error(array(
+	'data' => array(
+		'message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
index f53d852d60..bc9f3e14e8 100644
--- a/apps/contacts/ajax/categories/delete.php
+++ b/apps/contacts/ajax/categories/delete.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-require_once(__DIR__.'/../loghandler.php');
+require_once __DIR__.'/../loghandler.php';
 
 $categories = isset($_POST['categories'])?$_POST['categories']:null;
 
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index d438f708b4..27d7611ade 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -20,7 +20,7 @@
  *
  */
  
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index 2ec5f542bb..8dbd63f642 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -12,7 +12,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $userid = OCP\USER::getUser();
 $name = trim(strip_tags($_POST['name']));
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index 8f60eca08e..96080e661e 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -24,7 +24,7 @@
 OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 if (!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
index 1161c18abd..9777046fc8 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -23,17 +23,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once('loghandler.php');
-
-// foreach($_SERVER as $key=>$value) {
-// 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: _SERVER: '.$key.'=>'.$value, OCP\Util::DEBUG);
-// }
-// foreach($_POST as $key=>$value) {
-// 	debug($key.'=>'.print_r($value, true));
-// }
-// foreach($_GET as $key=>$value) {
-// 	debug($key.'=>'.print_r($value, true));
-// }
+require_once 'loghandler.php';
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 90e5e64903..6c81dc52b3 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -24,22 +24,23 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $id = $_POST['id'];
 $checksum = $_POST['checksum'];
+$l10n = OC_Contacts_App::$l10n
 
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
-if(is_null($line)){
-	bailOut(OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'));
+if(is_null($line)) {
+	bailOut($l10n->t('Information about vCard is incorrect. Please reload the page.'));
 	exit();
 }
 
 unset($vcard->children[$line]);
 
-if(!OC_Contacts_VCard::edit($id,$vcard)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error deleting contact property.'));
+if(!OC_Contacts_VCard::edit($id, $vcard)) {
+	bailOut($l10n->t('Error deleting contact property.'));
 }
 
 OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
index 1eb9429d79..b5e4b72ed5 100644
--- a/apps/contacts/ajax/editaddress.php
+++ b/apps/contacts/ajax/editaddress.php
@@ -34,8 +34,8 @@ if($checksum) {
 	$tmpl->assign('adr', $adr, false);
 }
 
-$tmpl->assign('id',$id);
-$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('id', $id);
+$tmpl->assign('adr_types', $adr_types);
 
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 9e7c090eee..eb55634011 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -9,7 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $tmpl = new OCP\Template("contacts", "part.edit_name_dialog");
 
@@ -25,8 +25,8 @@ if($id) {
 		}
 	}
 	$name = array_map('htmlspecialchars', $name['value']);
-	$tmpl->assign('name',$name, false);
-	$tmpl->assign('id',$id, false);
+	$tmpl->assign('name', $name, false);
+	$tmpl->assign('id', $id, false);
 } else {
 	bailOut(OC_Contacts_App::$l10n->t('Contact ID is missing.'));
 }
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index 1309faaa7a..75fe33ada6 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -30,20 +30,20 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 $requesttoken = $_GET['requesttoken'];
 
 $freeSpace=OC_Filesystem::free_space('/');
-$freeSpace=max($freeSpace,0);
-$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+$freeSpace=max($freeSpace, 0);
+$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
 
-$tmpl = new OCP\Template('contacts','part.contact');
+$tmpl = new OCP\Template('contacts', 'part.contact');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('adr_types',$adr_types);
-$tmpl->assign('phone_types',$phone_types);
-$tmpl->assign('email_types',$email_types);
+$tmpl->assign('adr_types', $adr_types);
+$tmpl->assign('phone_types', $phone_types);
+$tmpl->assign('email_types', $email_types);
 $tmpl->assign('requesttoken', $requesttoken);
-$tmpl->assign('id','');
+$tmpl->assign('id', '');
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/loadintro.php b/apps/contacts/ajax/loadintro.php
index 6e8fcc4b04..1da08950ca 100644
--- a/apps/contacts/ajax/loadintro.php
+++ b/apps/contacts/ajax/loadintro.php
@@ -25,7 +25,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
 
-$tmpl = new OCP\Template('contacts','part.no_contacts');
+$tmpl = new OCP\Template('contacts', 'part.no_contacts');
 $page = $tmpl->fetchPage();
 
 OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
index a35631055e..be924b5db4 100644
--- a/apps/contacts/ajax/loadphoto.php
+++ b/apps/contacts/ajax/loadphoto.php
@@ -24,7 +24,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $id = isset($_GET['id']) ? $_GET['id'] : '';
 $refresh = isset($_GET['refresh']) ? true : false;
diff --git a/apps/contacts/ajax/loghandler.php b/apps/contacts/ajax/loghandler.php
index 831b2e50c1..be4b98c111 100644
--- a/apps/contacts/ajax/loghandler.php
+++ b/apps/contacts/ajax/loghandler.php
@@ -20,13 +20,15 @@
  *
  */
 
-function bailOut($msg, $tracelevel=1, $debuglevel=OCP\Util::ERROR) {
+function bailOut($msg, $tracelevel=1, $debuglevel=OCP\Util::ERROR) 
+{
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	debug($msg, $tracelevel, $debuglevel);
 	exit();
 }
 
-function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) {
+function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) 
+{
 	if(PHP_VERSION >= "5.4") {
 		$call = debug_backtrace(false, $tracelevel+1);
 	} else {
@@ -35,6 +37,8 @@ function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) {
 	error_log('trace: '.print_r($call, true));
 	$call = $call[$tracelevel];
 	if($debuglevel !== false) {
-		OCP\Util::writeLog('contacts', $call['file'].'. Line: '.$call['line'].': '.$msg, $debuglevel);
+		OCP\Util::writeLog('contacts', 
+			$call['file'].'. Line: '.$call['line'].': '.$msg, 
+			$debuglevel);
 	}
 }
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 710179fffc..fe37b530f8 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -22,7 +22,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 if(!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
@@ -50,7 +50,9 @@ if($image->width() > 400 || $image->height() > 400) {
 	$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 }
 if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-	OCP\Util::writeLog('contacts','ajax/oc_photo.php: Couldn\'t save correct image orientation: '.$localpath, OCP\Util::DEBUG);
+	OCP\Util::writeLog('contacts', 
+		'ajax/oc_photo.php: Couldn\'t save correct image orientation: '.$localpath, 
+		OCP\Util::DEBUG);
 }
 if(OC_Cache::set($tmpkey, $image->data(), 600)) {
 	OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index adce6be3b3..3958af5c07 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -27,7 +27,7 @@ OCP\JSON::callCheck();
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $image = null;
 
@@ -48,7 +48,7 @@ if($id == '') {
 	bailOut('Missing contact id.');
 }
 
-OCP\Util::writeLog('contacts','savecrop.php: key: '.$tmpkey, OCP\Util::DEBUG);
+OCP\Util::writeLog('contacts', 'savecrop.php: key: '.$tmpkey, OCP\Util::DEBUG);
 
 $data = OC_Cache::get($tmpkey);
 if($data) {
@@ -56,7 +56,9 @@ if($data) {
 	if($image->loadFromdata($data)) {
 		$w = ($w != -1 ? $w : $image->width());
 		$h = ($h != -1 ? $h : $image->height());
-		OCP\Util::writeLog('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OCP\Util::DEBUG);
+		OCP\Util::writeLog('contacts',
+			'savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, 
+			OCP\Util::DEBUG);
 		if($image->crop($x1, $y1, $w, $h)) {
 			if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
 				$card = OC_Contacts_App::getContactVCard($id);
@@ -65,7 +67,9 @@ if($data) {
 					bailOut(OC_Contacts_App::$l10n->t('Error getting contact object.'));
 				}
 				if($card->__isset('PHOTO')) {
-					OCP\Util::writeLog('contacts','savecrop.php: PHOTO property exists.', OCP\Util::DEBUG);
+					OCP\Util::writeLog('contacts',
+						'savecrop.php: PHOTO property exists.', 
+						OCP\Util::DEBUG);
 					$property = $card->__get('PHOTO');
 					if(!$property) {
 						OC_Cache::remove($tmpkey);
@@ -76,8 +80,12 @@ if($data) {
 					$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
 					$card->__set('PHOTO', $property);
 				} else {
-					OCP\Util::writeLog('contacts','savecrop.php: files: Adding PHOTO property.', OCP\Util::DEBUG);
-					$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
+					OCP\Util::writeLog('contacts',
+						'savecrop.php: files: Adding PHOTO property.', 
+						OCP\Util::DEBUG);
+					$card->addProperty('PHOTO', 
+						$image->__toString(), array('ENCODING' => 'b', 
+						'TYPE' => $image->mimeType()));
 				}
 				$now = new DateTime;
 				$card->setString('REV', $now->format(DateTime::W3C));
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 5a0a7c1488..c3aaf5a959 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -19,7 +19,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require_once('loghandler.php');
+require_once 'loghandler.php';
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
@@ -39,9 +39,11 @@ if(!$id) {
 if(!$checksum) {
 	bailOut(OC_Contacts_App::$l10n->t('checksum is not set.'));
 }
-if(is_array($value)){
+if(is_array($value)) {
 	$value = array_map('strip_tags', $value);
-	ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	// NOTE: Important, otherwise the compound value will be 
+	// set in the order the fields appear in the form!
+	ksort($value); 
 	//if($name == 'CATEGORIES') {
 	//	$value = OC_Contacts_VCard::escapeDelimiters($value, ',');
 	//} else {
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index d3a772c727..a14b215843 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -11,7 +11,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-require_once('loghandler.php');
+require_once 'loghandler.php';
 
 $bookid = $_POST['id'];
 OC_Contacts_App::getAddressbook($bookid); // is owner access check
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index 3c5a2d750e..9fb271f54e 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -24,7 +24,9 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once('loghandler.php');
+require_once 'loghandler.php';
+
+$l10n = OC_Contacts_App::$l10n
 
 $view = OCP\Files::getStorage('contacts');
 if(!$view->file_exists('imports')) {
@@ -39,25 +41,29 @@ if($fn) {
 		OCP\JSON::success(array('data' => array('file'=>$tmpfile, 'name'=>$fn)));
 		exit();
 	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
+		bailOut($l10n->t('Error uploading contacts to storage.'));
 	}
 }
 
 // File input transfers are handled here
 if (!isset($_FILES['importfile'])) {
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG);
-	OCP\JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
+	OCP\Util::writeLog('contacts',
+		'ajax/uploadphoto.php: No file was uploaded. Unknown error.', 
+		OCP\Util::DEBUG);
+	OCP\JSON::error(array('
+		data' => array(
+			'message' => 'No file was uploaded. Unknown error' )));
 	exit();
 }
 $error = $_FILES['importfile']['error'];
 if($error !== UPLOAD_ERR_OK) {
 	$errors = array(
-		0=>OC_Contacts_App::$l10n->t("There is no error, the file uploaded with success"),
-		1=>OC_Contacts_App::$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
-		2=>OC_Contacts_App::$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-		3=>OC_Contacts_App::$l10n->t("The uploaded file was only partially uploaded"),
-		4=>OC_Contacts_App::$l10n->t("No file was uploaded"),
-		6=>OC_Contacts_App::$l10n->t("Missing a temporary folder")
+		0=>$l10n->t("There is no error, the file uploaded with success"),
+		1=>$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+		2=>$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+		3=>$l10n->t("The uploaded file was only partially uploaded"),
+		4=>$l10n->t("No file was uploaded"),
+		6=>$l10n->t("Missing a temporary folder")
 	);
 	bailOut($errors[$error]);
 }
@@ -67,7 +73,7 @@ if(file_exists($file['tmp_name'])) {
 	if($view->file_put_contents('/imports/'.$file['name'], file_get_contents($file['tmp_name']))) {
 		OCP\JSON::success(array('data' => array('file'=>$file['name'], 'name'=>$file['name'])));
 	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
+		bailOut($l10n->t('Error uploading contacts to storage.'));
 	}
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 6bb3fe8a5e..4cd38db8c7 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -27,13 +27,13 @@ OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
-require_once('loghandler.php');
-
+require_once 'loghandler.php';
+$l10n = OC_Contacts_App::$l10n;
 // If it is a Drag'n'Drop transfer it's handled here.
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
 if ($fn) {
 	if (!isset($_GET['id'])) {
-		bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
+		bailOut($l10n->t('No contact ID was submitted.'));
 	}
 	$id = $_GET['id'];
 	$tmpkey = 'contact-photo-'.md5($fn);
@@ -48,33 +48,38 @@ if ($fn) {
 			debug('Couldn\'t save correct image orientation: '.$tmpkey);
 		}
 		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
-			OCP\JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpkey)));
+			OCP\JSON::success(array(
+				'data' => array(
+					'mime'=>$_SERVER['CONTENT_TYPE'], 
+					'name'=>$fn, 
+					'id'=>$id, 
+					'tmp'=>$tmpkey)));
 			exit();
 		} else {
-			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
+			bailOut($l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey);
+		bailOut($l10n->t('Couldn\'t load temporary image: ').$tmpkey);
 	}
 }
 
 // Uploads from file dialog are handled here.
 if (!isset($_POST['id'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
+	bailOut($l10n->t('No contact ID was submitted.'));
 }
 if (!isset($_FILES['imagefile'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No file was uploaded. Unknown error'));
+	bailOut($l10n->t('No file was uploaded. Unknown error'));
 }
 
 $error = $_FILES['imagefile']['error'];
 if($error !== UPLOAD_ERR_OK) {
 	$errors = array(
-		0=>OC_Contacts_App::$l10n->t("There is no error, the file uploaded with success"),
-		1=>OC_Contacts_App::$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
-		2=>OC_Contacts_App::$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-		3=>OC_Contacts_App::$l10n->t("The uploaded file was only partially uploaded"),
-		4=>OC_Contacts_App::$l10n->t("No file was uploaded"),
-		6=>OC_Contacts_App::$l10n->t("Missing a temporary folder")
+		0=>$l10n->t("There is no error, the file uploaded with success"),
+		1=>$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+		2=>$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+		3=>$l10n->t("The uploaded file was only partially uploaded"),
+		4=>$l10n->t("No file was uploaded"),
+		6=>$l10n->t("Missing a temporary folder")
 	);
 	bailOut($errors[$error]);
 }
@@ -91,13 +96,20 @@ if(file_exists($file['tmp_name'])) {
 			debug('Couldn\'t save correct image orientation: '.$tmpkey);
 		}
 		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
-			OCP\JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpkey)));
+			OCP\JSON::success(array(
+				'data' => array(
+					'mime'=>$file['type'],
+					'size'=>$file['size'],
+					'name'=>$file['name'], 
+					'id'=>$_POST['id'], 
+					'tmp'=>$tmpkey,
+					)));
 			exit();
 		} else {
-			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
+			bailOut($l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$file['tmp_name']);
+		bailOut($l10n->t('Couldn\'t load temporary image: ').$file['tmp_name']);
 	}
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');

From b8eea32478df17bc0f512376022de4bfd827af49 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 00:17:59 +0200
Subject: [PATCH 1011/1537] Coding style.

---
 apps/contacts/lib/addressbook.php |  80 +++++++++----------
 apps/contacts/lib/app.php         |  10 +--
 apps/contacts/lib/search.php      |   6 +-
 apps/contacts/lib/vcard.php       | 126 +++++++++++++++---------------
 4 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 9d584ff6d6..65e02312bd 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -37,17 +37,17 @@
 /**
  * This class manages our addressbooks.
  */
-class OC_Contacts_Addressbook{
+class OC_Contacts_Addressbook {
 	/**
 	 * @brief Returns the list of addressbooks for a specific user.
 	 * @param string $uid
 	 * @param boolean $active Only return addressbooks with this $active state, default(=false) is don't care
 	 * @return array or false.
 	 */
-	public static function all($uid, $active=false){
+	public static function all($uid, $active=false) {
 		$values = array($uid);
 		$active_where = '';
-		if ($active){
+		if ($active) {
 			$active_where = ' AND active = ?';
 			$values[] = 1;
 		}
@@ -55,13 +55,13 @@ class OC_Contacts_Addressbook{
 			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ' . $active_where . ' ORDER BY displayname' );
 			$result = $stmt->execute($values);
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' uid: '.$uid,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' uid: '.$uid, OCP\Util::DEBUG);
 			return false;
 		}
 
 		$addressbooks = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$addressbooks[] = $row;
 		}
 		if(!$active && !count($addressbooks)) {
@@ -76,8 +76,8 @@ class OC_Contacts_Addressbook{
 	 * @param integer $uid User id. If null current user will be used.
 	 * @return array
 	 */
-	public static function activeIds($uid = null){
-		if(is_null($uid)){
+	public static function activeIds($uid = null) {
+		if(is_null($uid)) {
 			$uid = OCP\USER::getUser();
 		}
 		$activeaddressbooks = self::all($uid, true);
@@ -93,7 +93,7 @@ class OC_Contacts_Addressbook{
 	 * @param string $uid
 	 * @return array
 	 */
-	public static function active($uid){
+	public static function active($uid) {
 		return self::all($uid, true);
 	}
 
@@ -112,13 +112,13 @@ class OC_Contacts_Addressbook{
 	 * @param integer $id
 	 * @return associative array or false.
 	 */
-	public static function find($id){
+	public static function find($id) {
 		try {
 			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
 			$result = $stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -129,11 +129,11 @@ class OC_Contacts_Addressbook{
 	 * @brief Adds default address book
 	 * @return $id ID of the newly created addressbook or false on error.
 	 */
-	public static function addDefault($uid = null){
+	public static function addDefault($uid = null) {
 		if(is_null($uid)) {
 			$uid = OCP\USER::getUser();
 		}
-		$id = self::add($uid,'Contacts','Default Address Book');
+		$id = self::add($uid,'Contacts', 'Default Address Book');
 		if($id !== false) {
 			self::setActive($id, true);
 		}
@@ -147,13 +147,13 @@ class OC_Contacts_Addressbook{
 	 * @param string $description
 	 * @return insertid
 	 */
-	public static function add($uid,$name,$description=''){
+	public static function add($uid,$name,$description='') {
 		try {
 			$stmt = OCP\DB::prepare( 'SELECT uri FROM *PREFIX*contacts_addressbooks WHERE userid = ? ' );
 			$result = $stmt->execute(array($uid));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' uid: '.$uid,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' uid: '.$uid, OCP\Util::DEBUG);
 			return false;
 		}
 		$uris = array();
@@ -166,8 +166,8 @@ class OC_Contacts_Addressbook{
 			$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
 			$result = $stmt->execute(array($uid,$name,$uri,$description,1));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uid: '.$uid,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', uid: '.$uid, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -182,16 +182,16 @@ class OC_Contacts_Addressbook{
 	 * @param string $description
 	 * @return insertid or false
 	 */
-	public static function addFromDAVData($principaluri,$uri,$name,$description){
+	public static function addFromDAVData($principaluri,$uri,$name,$description) {
 		$uid = self::extractUserID($principaluri);
 
 		try {
 			$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)');
 			$result = $stmt->execute(array($uid,$name,$uri,$description,1));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uid: '.$uid,OCP\Util::DEBUG);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', uri: '.$uri,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', uid: '.$uid, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', uri: '.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -205,14 +205,14 @@ class OC_Contacts_Addressbook{
 	 * @param string $description
 	 * @return boolean
 	 */
-	public static function edit($id,$name,$description){
+	public static function edit($id,$name,$description) {
 		// Need these ones for checking uri
 		$addressbook = self::find($id);
 
-		if(is_null($name)){
+		if(is_null($name)) {
 			$name = $addressbook['name'];
 		}
-		if(is_null($description)){
+		if(is_null($description)) {
 			$description = $addressbook['description'];
 		}
 
@@ -220,8 +220,8 @@ class OC_Contacts_Addressbook{
 			$stmt = OCP\DB::prepare('UPDATE *PREFIX*contacts_addressbooks SET displayname=?,description=?, ctag=ctag+1 WHERE id=?');
 			$result = $stmt->execute(array($name,$description,$id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -234,15 +234,15 @@ class OC_Contacts_Addressbook{
 	 * @param boolean $active
 	 * @return boolean
 	 */
-	public static function setActive($id,$active){
+	public static function setActive($id,$active) {
 		$sql = 'UPDATE *PREFIX*contacts_addressbooks SET active = ? WHERE id = ?';
-		OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id.', active: '.intval($active),OCP\Util::ERROR);
+		OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id.', active: '.intval($active), OCP\Util::ERROR);
 		try {
 			$stmt = OCP\DB::prepare($sql);
 			$stmt->execute(array(intval($active), $id));
 			return true;
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -252,7 +252,7 @@ class OC_Contacts_Addressbook{
 	 * @param integer $id ID of the address book.
 	 * @return boolean
 	 */
-	public static function isActive($id){
+	public static function isActive($id) {
 		$sql = 'SELECT active FROM *PREFIX*contacts_addressbooks WHERE id = ?';
 		try {
 			$stmt = OCP\DB::prepare( $sql );
@@ -260,7 +260,7 @@ class OC_Contacts_Addressbook{
 			$row = $result->fetchRow();
 			return (bool)$row['active'];
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
 		}
 	}
 
@@ -269,13 +269,13 @@ class OC_Contacts_Addressbook{
 	 * @param integer $id
 	 * @return boolean
 	 */
-	public static function delete($id){
+	public static function delete($id) {
 		self::setActive($id, false);
 		try {
 			$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
 			$stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(),OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 		
@@ -292,7 +292,7 @@ class OC_Contacts_Addressbook{
 	 * @param integer $id
 	 * @return boolean
 	 */
-	public static function touch($id){
+	public static function touch($id) {
 		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET ctag = ctag + 1 WHERE id = ?' );
 		$stmt->execute(array($id));
 
@@ -305,11 +305,11 @@ class OC_Contacts_Addressbook{
 	 * @param array  $existing existing addressbook URIs
 	 * @return string new name
 	 */
-	public static function createURI($name,$existing){
+	public static function createURI($name,$existing) {
 		$name = str_replace(' ', '_', strtolower($name));
 		$newname = $name;
 		$i = 1;
-		while(in_array($newname,$existing)){
+		while(in_array($newname, $existing)) {
 			$newname = $name.$i;
 			$i = $i + 1;
 		}
@@ -320,8 +320,8 @@ class OC_Contacts_Addressbook{
 	 * @brief gets the userid from a principal path
 	 * @return string
 	 */
-	public static function extractUserID($principaluri){
-		list($prefix,$userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
+	public static function extractUserID($principaluri) {
+		list($prefix, $userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
 		return $userid;
 	}
 }
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 046ceb0bf0..689149367f 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -61,11 +61,11 @@ class OC_Contacts_App {
 		if(!is_null($vcard) && !$vcard->__isset('N')) {
 			$version = OCP\App::getAppVersion('contacts');
 			if($version >= 5) {
-				OCP\Util::writeLog('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', 'OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OCP\Util::DEBUG);
 			}
-			OCP\Util::writeLog('contacts','getContactVCard, Missing N field', OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', 'getContactVCard, Missing N field', OCP\Util::DEBUG);
 			if($vcard->__isset('FN')) {
-				OCP\Util::writeLog('contacts','getContactVCard, found FN field: '.$vcard->__get('FN'), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', 'getContactVCard, found FN field: '.$vcard->__get('FN'), OCP\Util::DEBUG);
 				$n = implode(';', array_reverse(array_slice(explode(' ', $vcard->__get('FN')), 0, 2))).';;;';
 				$vcard->setString('N', $n);
 				OC_Contacts_VCard::edit( $id, $vcard);
@@ -203,9 +203,9 @@ class OC_Contacts_App {
 					foreach($vccontacts as $vccontact) {
 						$cards[] = $vccontact['carddata'];
 					}
-					OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', scanning: '.$batchsize.' starting from '.$start,OCP\Util::DEBUG);
+					OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', scanning: '.$batchsize.' starting from '.$start, OCP\Util::DEBUG);
 					// only reset on first batch.
-					self::getVCategories()->rescan($cards, true, ($start==0?true:false));
+					self::getVCategories()->rescan($cards, true, ($start == 0 ? true : false));
 					$start += $batchsize;
 				}
 			}
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 5d9ca97e76..53aa2b4849 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -2,7 +2,7 @@
 class OC_Search_Provider_Contacts extends OC_Search_Provider{
 	function search($query){
 		$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser(), 1);
-		if(count($addressbooks)==0 || !OCP\App::isEnabled('contacts')){
+		if(count($addressbooks)==0 || !OCP\App::isEnabled('contacts')) {
 			return array();
 		}
 		$results=array();
@@ -10,9 +10,9 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
 		foreach($addressbooks as $addressbook){
 			$vcards = OC_Contacts_VCard::all($addressbook['id']);
 			foreach($vcards as $vcard){
-				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0){
+				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0) {
 					$link = OCP\Util::linkTo('contacts', 'index.php').'&id='.urlencode($vcard['id']);
-					$results[]=new OC_Search_Result($vcard['fullname'],'', $link,(string)$l->t('Contact'));//$name,$text,$link,$type
+					$results[]=new OC_Search_Result($vcard['fullname'], '', $link, (string)$l->t('Contact'));//$name,$text,$link,$type
 				}
 			}
 		}
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 4f1ba5f08d..732c5a2258 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -63,9 +63,9 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( $prep );
 				$result = $stmt->execute($id);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '.join(',', $id),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.'SQL:'.$prep,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', ids: '.join(',', $id), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.'SQL:'.$prep, OCP\Util::DEBUG);
 				return false;
 			}
 		} elseif(is_int($id) || is_string($id)) {
@@ -74,12 +74,12 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( $sql );
 				$result = $stmt->execute(array($id));
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '. $id,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', ids: '. $id, OCP\Util::DEBUG);
 				return false;
 			}
 		} else {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.'. Addressbook id(s) argument is empty: '. $id,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.'. Addressbook id(s) argument is empty: '. $id, OCP\Util::DEBUG);
 			return false;
 		}
 		$cards = array();
@@ -102,8 +102,8 @@ class OC_Contacts_VCard{
 			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE id = ?' );
 			$result = $stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '. $id,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '. $id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -121,8 +121,8 @@ class OC_Contacts_VCard{
 			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
 			$result = $stmt->execute(array($aid,$uri));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -177,16 +177,16 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($aid,$uri));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uid'.$uid, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uid'.$uid, OCP\Util::DEBUG);
 			return false;
 		}
-		if($result->numRows() > 0){
+		if($result->numRows() > 0) {
 			while(true) {
-				$tmpuid = substr(md5(rand().time()),0,10);
+				$tmpuid = substr(md5(rand().time()), 0, 10);
 				$uri = $tmpuid.'.vcf';
-				$result = $stmt->execute(array($aid,$uri));
-				if($result->numRows() > 0){
+				$result = $stmt->execute(array($aid, $uri));
+				if($result->numRows() > 0) {
 					continue;
 				} else {
 					$uid = $tmpuid;
@@ -225,29 +225,29 @@ class OC_Contacts_VCard{
 			}
 			// Fix format of type parameters.
 			if($upgrade && in_array($property->name, $typeprops)) {
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(),OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(), OCP\Util::DEBUG);
 				self::formatPropertyTypes($property);
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(),OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(), OCP\Util::DEBUG);
 			}
-			if($property->name == 'FN'){
+			if($property->name == 'FN') {
 				$fn = $property->value;
 			}
-			if($property->name == 'N'){
+			if($property->name == 'N') {
 				$n = $property->value;
 			}
-			if($property->name == 'UID'){
+			if($property->name == 'UID') {
 				$uid = $property->value;
 			}
-			if($property->name == 'ORG'){
+			if($property->name == 'ORG') {
 				$org = $property->value;
 			}
-			if($property->name == 'EMAIL' && is_null($email)){ // only use the first email as substitute for missing N or FN.
+			if($property->name == 'EMAIL' && is_null($email)) { // only use the first email as substitute for missing N or FN.
 				$email = $property->value;
 			}
 		}
 		// Check for missing 'N', 'FN' and 'UID' properties
 		if(!$fn) {
-			if($n && $n != ';;;;'){
+			if($n && $n != ';;;;') {
 				$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
 			} elseif($email) {
 				$fn = $email;
@@ -257,21 +257,21 @@ class OC_Contacts_VCard{
 				$fn = 'Unknown Name';
 			}
 			$vcard->setString('FN', $fn);
-			OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn, OCP\Util::DEBUG);
 		}
-		if(!$n || $n == ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-)
+		if(!$n || $n == ';;;;') { // Fix missing 'N' field. Ugly hack ahead ;-)
 			$slice = array_reverse(array_slice(explode(' ', $fn), 0, 2)); // Take 2 first name parts of 'FN' and reverse.
 			if(count($slice) < 2) { // If not enought, add one more...
 				$slice[] = "";
 			}
 			$n = implode(';', $slice).';;;';
 			$vcard->setString('N', $n);
-			OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'N\' field: '.$n,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Added missing \'N\' field: '.$n, OCP\Util::DEBUG);
 		}
 		if(!$uid) {
 			$vcard->setUID();
 			$uid = $vcard->getAsString('UID');
-			OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'UID\' field: '.$uid,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Added missing \'UID\' field: '.$uid, OCP\Util::DEBUG);
 		}
 		if(self::trueUID($aid, $uid)) {
 			$vcard->setString('UID', $uid);
@@ -288,8 +288,8 @@ class OC_Contacts_VCard{
 	 * @return insertid on success or false.
 	 */
 	public static function add($aid, OC_VObject $card, $uri=null, $isnew=false){
-		if(is_null($card)){
-			OCP\Util::writeLog('contacts','OC_Contacts_VCard::add. No vCard supplied', OCP\Util::ERROR);
+		if(is_null($card)) {
+			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::add. No vCard supplied', OCP\Util::ERROR);
 			return null;
 		};
 
@@ -298,7 +298,7 @@ class OC_Contacts_VCard{
 			self::updateValuesFromAdd($aid, $card);
 		}
 
-		$card->setString('VERSION','3.0');
+		$card->setString('VERSION', '3.0');
 		// Add product ID is missing.
 		$prodid = trim($card->getAsString('PRODID'));
 		if(!$prodid) {
@@ -323,8 +323,8 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 		$newid = OCP\DB::insertid('*PREFIX*contacts_cards');
@@ -355,15 +355,15 @@ class OC_Contacts_VCard{
 		$now = new DateTime;
 		foreach($objects as $object) {
 			$vcard = OC_VObject::parse($object[1]);
-			if(!is_null($vcard)){
+			if(!is_null($vcard)) {
 				$vcard->setString('REV', $now->format(DateTime::W3C));
 				$data = $vcard->serialize();
 				try {
 					$result = $stmt->execute(array($data,time(),$object[0]));
 					//OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0].': '.$object[1],OCP\Util::DEBUG);
 				} catch(Exception $e) {
-					OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-					OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$object[0],OCP\Util::DEBUG);
+					OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+					OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$object[0], OCP\Util::DEBUG);
 				}
 			}
 		}
@@ -397,8 +397,8 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($fn,$data,time(),$id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id'.$id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id'.$id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -414,11 +414,11 @@ class OC_Contacts_VCard{
 	 * @param string $data  vCard file
 	 * @return boolean
 	 */
-	public static function editFromDAVData($aid,$uri,$data){
-		$oldcard = self::findWhereDAVDataIs($aid,$uri);
+	public static function editFromDAVData($aid, $uri, $data){
+		$oldcard = self::findWhereDAVDataIs($aid, $uri);
 		$card = OC_VObject::parse($data);
 		if(!$card) {
-			OCP\Util::writeLog('contacts','OC_Contacts_VCard::editFromDAVData. Unable to parse VCARD, uri: '.$uri,OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', Unable to parse VCARD, uri: '.$uri, OCP\Util::ERROR);
 			return false;
 		}
 		return self::edit($oldcard['id'], $card);
@@ -435,8 +435,8 @@ class OC_Contacts_VCard{
 		try {
 			$stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -455,8 +455,8 @@ class OC_Contacts_VCard{
 		try {
 			$stmt->execute(array($aid,$uri));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri: '.$uri, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri: '.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 		OC_Contacts_Addressbook::touch($aid);
@@ -485,14 +485,14 @@ class OC_Contacts_VCard{
 	 * @return array
 	 */
 	public static function unescapeDelimiters($value, $delimiter=';') {
-		$array = explode($delimiter,$value);
+		$array = explode($delimiter, $value);
 		for($i=0;$i<count($array);$i++) {
-			if(substr($array[$i],-1,1)=="\\") {
+			if(substr($array[$i],-1, 1)=="\\") {
 				if(isset($array[$i+1])) {
-					$array[$i] = substr($array[$i],0,count($array[$i])-2).$delimiter.$array[$i+1];
+					$array[$i] = substr($array[$i], 0, count($array[$i])-2).$delimiter.$array[$i+1];
 					unset($array[$i+1]);
 				} else {
-					$array[$i] = substr($array[$i],0,count($array[$i])-2).$delimiter;
+					$array[$i] = substr($array[$i], 0, count($array[$i])-2).$delimiter;
 				}
 				$i = $i - 1;
 			}
@@ -508,12 +508,12 @@ class OC_Contacts_VCard{
 	 *
 	 * look at code ...
 	 */
-	public static function structureContact($object){
+	public static function structureContact($object) {
 		$details = array();
 		foreach($object->children as $property){
 			$temp = self::structureProperty($property);
 			if(!is_null($temp)) {
-				if(array_key_exists($property->name,$details)){
+				if(array_key_exists($property->name, $details)) {
 					$details[$property->name][] = $temp;
 				}
 				else{
@@ -537,10 +537,10 @@ class OC_Contacts_VCard{
 	 * NOTE: $value is not escaped anymore. It shouldn't make any difference
 	 * but we should look out for any problems.
 	 */
-	public static function structureProperty($property){
+	public static function structureProperty($property) {
 		$value = $property->value;
 		//$value = htmlspecialchars($value);
-		if($property->name == 'ADR' || $property->name == 'N'){
+		if($property->name == 'ADR' || $property->name == 'N') {
 			$value = self::unescapeDelimiters($value);
 		} elseif($property->name == 'BDAY') {
 			if(strpos($value, '-') === false) {
@@ -560,17 +560,17 @@ class OC_Contacts_VCard{
 			// Faulty entries by kaddressbook
 			// Actually TYPE=PREF is correct according to RFC 2426
 			// but this way is more handy in the UI. Tanghus.
-			if($parameter->name == 'TYPE' && $parameter->value == 'PREF'){
+			if($parameter->name == 'TYPE' && $parameter->value == 'PREF') {
 				$parameter->name = 'PREF';
 				$parameter->value = '1';
 			}
 			// NOTE: Apparently Sabre_VObject_Reader can't always deal with value list parameters
 			// like TYPE=HOME,CELL,VOICE. Tanghus.
-			if (in_array($property->name, array('TEL', 'EMAIL')) && $parameter->name == 'TYPE'){
-				if (isset($temp['parameters'][$parameter->name])){
+			if (in_array($property->name, array('TEL', 'EMAIL')) && $parameter->name == 'TYPE') {
+				if (isset($temp['parameters'][$parameter->name])) {
 					$temp['parameters'][$parameter->name][] = $parameter->value;
 				}
-				else{
+				else {
 					$temp['parameters'][$parameter->name] = array($parameter->value);
 				}
 			}
@@ -588,7 +588,7 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 *
 	 */
-	public static function moveToAddressBook($aid, $id){
+	public static function moveToAddressBook($aid, $id) {
 		OC_Contacts_App::getAddressbook($aid); // check for user ownership.
 		if(is_array($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
@@ -599,9 +599,9 @@ class OC_Contacts_VCard{
 				$vals = array_merge((array)$aid, $id);
 				$result = $stmt->execute($vals);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', ids: '.join(',', $vals),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', SQL:'.$prep,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', ids: '.join(',', $vals), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', SQL:'.$prep, OCP\Util::DEBUG);
 				return false;
 			}
 		} else {
@@ -609,8 +609,8 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
 				$result = $stmt->execute(array($aid, $id));
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(),OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts',__CLASS__.'::'.__METHOD__.' id: '.$id,OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' id: '.$id, OCP\Util::DEBUG);
 				return false;
 			}
 		}

From 98e769d2693d1798c25bba0b90c1e36995cce20a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 00:52:10 +0200
Subject: [PATCH 1012/1537] dont use the mtimes stored in zip archives since
 they dont update correctly

---
 lib/archive/zip.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 6631a649b1..ff405ce098 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -74,8 +74,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @return int
 	 */
 	function mtime($path){
-		$stat=$this->zip->statName($path);
-		return $stat['mtime'];
+		return filemtime($this->path);
 	}
 	/**
 	 * get the files in a folder

From 5fe00275680f3425832fcf74a84ceb48c5e3482e Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 20 Jul 2012 08:20:45 +0200
Subject: [PATCH 1013/1537] fixing syntax error

---
 apps/contacts/ajax/deleteproperty.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 6c81dc52b3..205df8bc18 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -28,7 +28,7 @@ require_once 'loghandler.php';
 
 $id = $_POST['id'];
 $checksum = $_POST['checksum'];
-$l10n = OC_Contacts_App::$l10n
+$l10n = OC_Contacts_App::$l10n;
 
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);

From 8c06452434df1ab546709db61f2987b17549959a Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 20 Jul 2012 09:14:32 +0200
Subject: [PATCH 1014/1537] fixing syntax error

---
 apps/contacts/ajax/uploadimport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index 9fb271f54e..87032b731a 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -26,7 +26,7 @@ OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 require_once 'loghandler.php';
 
-$l10n = OC_Contacts_App::$l10n
+$l10n = OC_Contacts_App::$l10n;
 
 $view = OCP\Files::getStorage('contacts');
 if(!$view->file_exists('imports')) {

From e42f7656970c0b9cf04a8b200eb6d5690b8c9c84 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 20 Jul 2012 15:04:50 +0200
Subject: [PATCH 1015/1537] simplify code of createuser.php

---
 settings/ajax/createuser.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 41bf31a05f..f16e91e200 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -18,21 +18,18 @@ if($isadmin){
 		$groups = $_POST["groups"];
 	}
 }else{
-	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessiblegroups = array_flip($accessiblegroups);
 	if(isset( $_POST["groups"] )){
-		$unauditedgroups = $_POST["groups"];
 		$groups = array();
-		foreach($unauditedgroups as $group){
-			if(array_key_exists($group, $accessiblegroups)){
+		foreach($_POST["groups"] as $group){
+			if(OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group)){
 				$groups[] = $group;
 			}
 		}
 		if(count($groups) == 0){
-			$groups = array_flip($accessiblegroups);
+			$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 		}
 	}else{
-		$groups = array_flip($accessiblegroups);
+		$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 	}
 }
 $username = $_POST["username"];

From 7f08c84739f5cff97a6176555ddc2bef6a0f010f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 20 Jul 2012 15:13:51 +0200
Subject: [PATCH 1016/1537] fix tooglegroup for subadmins

---
 settings/ajax/togglegroups.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 95338ed026..75cd0858bb 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -3,7 +3,7 @@
 // Init owncloud
 require_once('../../lib/base.php');
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $success = true;
@@ -13,6 +13,12 @@ $action = "add";
 $username = $_POST["username"];
 $group = OC_Util::sanitizeHTML($_POST["group"]);
 
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))){
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
 if(!OC_Group::groupExists($group)){
 	OC_Group::createGroup($group);
 }

From b3d7043f9cd4d252050570a4ae85f78f1ad662c2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 15:14:44 +0200
Subject: [PATCH 1017/1537] Change uri fields from 100 to 200 chars.

---
 apps/contacts/appinfo/database.xml | 4 ++--
 apps/contacts/appinfo/version      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
index 9b269d765d..b814b0f151 100644
--- a/apps/contacts/appinfo/database.xml
+++ b/apps/contacts/appinfo/database.xml
@@ -44,7 +44,7 @@
     <type>text</type>
     <default></default>
     <notnull>false</notnull>
-    <length>100</length>
+    <length>200</length>
    </field>
 
    <field>
@@ -118,7 +118,7 @@
     <type>text</type>
     <default></default>
     <notnull>false</notnull>
-    <length>100</length>
+    <length>200</length>
    </field>
 
    <field>
diff --git a/apps/contacts/appinfo/version b/apps/contacts/appinfo/version
index 373f8c6f07..72f9fa8202 100644
--- a/apps/contacts/appinfo/version
+++ b/apps/contacts/appinfo/version
@@ -1 +1 @@
-0.2.3
\ No newline at end of file
+0.2.4
\ No newline at end of file

From c3bd30cc6b5b9de1578aa5a3b3d1123166232045 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 20 Jul 2012 15:20:48 +0200
Subject: [PATCH 1018/1537] improve default qouta for subadmins

---
 settings/templates/users.php | 15 +++++++++++++--
 settings/users.php           |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/settings/templates/users.php b/settings/templates/users.php
index 9f246423d2..3e1eb9a0bb 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -13,7 +13,9 @@ $items = array_flip($_['subadmingroups']);
 unset($items['admin']);
 $_['subadmingroups'] = array_flip($items);
 ?>
-
+<script>
+var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
+</script>
 <div id="controls">
 	<form id="newuser">
 		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
@@ -32,7 +34,8 @@ $_['subadmingroups'] = array_flip($items);
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
 		<div class="quota-select-wrapper">
-			<select class='quota' <?php if(!(is_array($_['subadmins']) || $_['subadmins'])) echo 'disabled="disabled"'; ?>>
+			<?php if((bool) $_['isadmin']): ?>
+			<select class='quota'>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option
@@ -53,6 +56,14 @@ $_['subadmingroups'] = array_flip($items);
 					...
 				</option>
 			</select> <input class='quota-other'></input>
+			<?php endif; ?>
+			<?php if((bool) !$_['isadmin']): ?>
+				<select class='quota' disabled="disabled">
+					<option selected="selected">
+				<?php echo $_['default_quota'];?>
+					</option>
+				</select>
+			<?php endif; ?>
 		</div>
 	</div>
 </div>
diff --git a/settings/users.php b/settings/users.php
index 60ffc337a7..e88c4d1d9c 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -55,7 +55,7 @@ if (\OC_App::isEnabled( "files_sharing" ) ) {
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
-$tmpl->assign( 'isadmin', $isadmin);
+$tmpl->assign( 'isadmin', (int) $isadmin);
 $tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);

From e4154e68324fd9af4c7ba0b9abba3e50d5b5c56e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 20 Jul 2012 15:23:56 +0200
Subject: [PATCH 1019/1537] remove old files

---
 3rdparty/Sabre.includes.php                   |   26 -
 3rdparty/Sabre/CalDAV/Backend/Abstract.php    |  168 --
 3rdparty/Sabre/CalDAV/Backend/PDO.php         |  396 ----
 3rdparty/Sabre/CalDAV/Calendar.php            |  343 ---
 3rdparty/Sabre/CalDAV/CalendarObject.php      |  273 ---
 3rdparty/Sabre/CalDAV/CalendarQueryParser.php |  296 ---
 .../Sabre/CalDAV/CalendarQueryValidator.php   |  347 ---
 3rdparty/Sabre/CalDAV/CalendarRootNode.php    |   75 -
 3rdparty/Sabre/CalDAV/ICSExportPlugin.php     |  139 --
 3rdparty/Sabre/CalDAV/ICalendar.php           |   18 -
 3rdparty/Sabre/CalDAV/ICalendarObject.php     |   20 -
 3rdparty/Sabre/CalDAV/Plugin.php              |  829 -------
 .../Sabre/CalDAV/Principal/Collection.php     |   31 -
 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php |  178 --
 .../Sabre/CalDAV/Principal/ProxyWrite.php     |  178 --
 3rdparty/Sabre/CalDAV/Principal/User.php      |  132 --
 .../SupportedCalendarComponentSet.php         |   85 -
 .../CalDAV/Property/SupportedCalendarData.php |   38 -
 .../CalDAV/Property/SupportedCollationSet.php |   44 -
 3rdparty/Sabre/CalDAV/Schedule/IMip.php       |  104 -
 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php    |   16 -
 3rdparty/Sabre/CalDAV/Schedule/Outbox.php     |  152 --
 3rdparty/Sabre/CalDAV/Server.php              |   68 -
 3rdparty/Sabre/CalDAV/UserCalendars.php       |  298 ---
 3rdparty/Sabre/CalDAV/Version.php             |   24 -
 3rdparty/Sabre/CalDAV/includes.php            |   43 -
 3rdparty/Sabre/CardDAV/AddressBook.php        |  310 ---
 .../Sabre/CardDAV/AddressBookQueryParser.php  |  209 --
 3rdparty/Sabre/CardDAV/AddressBookRoot.php    |   78 -
 3rdparty/Sabre/CardDAV/Backend/Abstract.php   |  166 --
 3rdparty/Sabre/CardDAV/Backend/PDO.php        |  330 ---
 3rdparty/Sabre/CardDAV/Card.php               |  250 ---
 3rdparty/Sabre/CardDAV/IAddressBook.php       |   18 -
 3rdparty/Sabre/CardDAV/ICard.php              |   18 -
 3rdparty/Sabre/CardDAV/IDirectory.php         |   21 -
 3rdparty/Sabre/CardDAV/Plugin.php             |  587 -----
 .../CardDAV/Property/SupportedAddressData.php |   69 -
 3rdparty/Sabre/CardDAV/UserAddressBooks.php   |  257 ---
 3rdparty/Sabre/CardDAV/Version.php            |   26 -
 3rdparty/Sabre/CardDAV/includes.php           |   32 -
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   83 -
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   98 -
 3rdparty/Sabre/DAV/Auth/Backend/Apache.php    |   62 -
 3rdparty/Sabre/DAV/Auth/Backend/File.php      |   75 -
 3rdparty/Sabre/DAV/Auth/Backend/PDO.php       |   65 -
 3rdparty/Sabre/DAV/Auth/IBackend.php          |   36 -
 3rdparty/Sabre/DAV/Auth/Plugin.php            |  111 -
 .../Sabre/DAV/Browser/GuessContentType.php    |   97 -
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   55 -
 3rdparty/Sabre/DAV/Browser/Plugin.php         |  489 ----
 3rdparty/Sabre/DAV/Browser/assets/favicon.ico |  Bin 4286 -> 0 bytes
 .../DAV/Browser/assets/icons/addressbook.png  |  Bin 7232 -> 0 bytes
 .../DAV/Browser/assets/icons/calendar.png     |  Bin 4388 -> 0 bytes
 .../Sabre/DAV/Browser/assets/icons/card.png   |  Bin 5695 -> 0 bytes
 .../DAV/Browser/assets/icons/collection.png   |  Bin 3474 -> 0 bytes
 .../Sabre/DAV/Browser/assets/icons/file.png   |  Bin 2837 -> 0 bytes
 .../Sabre/DAV/Browser/assets/icons/parent.png |  Bin 3474 -> 0 bytes
 .../DAV/Browser/assets/icons/principal.png    |  Bin 5480 -> 0 bytes
 3rdparty/Sabre/DAV/Client.php                 |  463 ----
 3rdparty/Sabre/DAV/Collection.php             |  106 -
 3rdparty/Sabre/DAV/Directory.php              |   17 -
 3rdparty/Sabre/DAV/Exception.php              |   64 -
 3rdparty/Sabre/DAV/Exception/BadRequest.php   |   28 -
 3rdparty/Sabre/DAV/Exception/Conflict.php     |   28 -
 .../Sabre/DAV/Exception/ConflictingLock.php   |   35 -
 3rdparty/Sabre/DAV/Exception/FileNotFound.php |   19 -
 3rdparty/Sabre/DAV/Exception/Forbidden.php    |   27 -
 .../DAV/Exception/InsufficientStorage.php     |   27 -
 .../DAV/Exception/InvalidResourceType.php     |   33 -
 .../Exception/LockTokenMatchesRequestUri.php  |   39 -
 3rdparty/Sabre/DAV/Exception/Locked.php       |   67 -
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   45 -
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   28 -
 3rdparty/Sabre/DAV/Exception/NotFound.php     |   28 -
 .../Sabre/DAV/Exception/NotImplemented.php    |   27 -
 .../Sabre/DAV/Exception/PaymentRequired.php   |   28 -
 .../DAV/Exception/PreconditionFailed.php      |   69 -
 .../DAV/Exception/ReportNotImplemented.php    |   30 -
 .../RequestedRangeNotSatisfiable.php          |   29 -
 .../DAV/Exception/UnsupportedMediaType.php    |   28 -
 3rdparty/Sabre/DAV/FS/Directory.php           |  136 --
 3rdparty/Sabre/DAV/FS/File.php                |   89 -
 3rdparty/Sabre/DAV/FS/Node.php                |   80 -
 3rdparty/Sabre/DAV/FSExt/Directory.php        |  154 --
 3rdparty/Sabre/DAV/FSExt/File.php             |   93 -
 3rdparty/Sabre/DAV/FSExt/Node.php             |  212 --
 3rdparty/Sabre/DAV/File.php                   |   85 -
 3rdparty/Sabre/DAV/ICollection.php            |   74 -
 3rdparty/Sabre/DAV/IExtendedCollection.php    |   28 -
 3rdparty/Sabre/DAV/IFile.php                  |   77 -
 3rdparty/Sabre/DAV/INode.php                  |   46 -
 3rdparty/Sabre/DAV/IProperties.php            |   67 -
 3rdparty/Sabre/DAV/IQuota.php                 |   27 -
 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php |   50 -
 3rdparty/Sabre/DAV/Locks/Backend/FS.php       |  191 --
 3rdparty/Sabre/DAV/Locks/Backend/File.php     |  181 --
 3rdparty/Sabre/DAV/Locks/Backend/PDO.php      |  165 --
 3rdparty/Sabre/DAV/Locks/LockInfo.php         |   81 -
 3rdparty/Sabre/DAV/Locks/Plugin.php           |  633 ------
 3rdparty/Sabre/DAV/Mount/Plugin.php           |   80 -
 3rdparty/Sabre/DAV/Node.php                   |   55 -
 3rdparty/Sabre/DAV/ObjectTree.php             |  153 --
 3rdparty/Sabre/DAV/Property.php               |   25 -
 .../Sabre/DAV/Property/GetLastModified.php    |   75 -
 3rdparty/Sabre/DAV/Property/Href.php          |   91 -
 3rdparty/Sabre/DAV/Property/HrefList.php      |   96 -
 3rdparty/Sabre/DAV/Property/IHref.php         |   25 -
 3rdparty/Sabre/DAV/Property/LockDiscovery.php |  102 -
 3rdparty/Sabre/DAV/Property/ResourceType.php  |  125 --
 3rdparty/Sabre/DAV/Property/Response.php      |  155 --
 3rdparty/Sabre/DAV/Property/ResponseList.php  |   57 -
 3rdparty/Sabre/DAV/Property/SupportedLock.php |   76 -
 .../Sabre/DAV/Property/SupportedReportSet.php |  109 -
 3rdparty/Sabre/DAV/Server.php                 | 1999 -----------------
 3rdparty/Sabre/DAV/ServerPlugin.php           |   90 -
 3rdparty/Sabre/DAV/SimpleCollection.php       |  105 -
 3rdparty/Sabre/DAV/SimpleDirectory.php        |   21 -
 3rdparty/Sabre/DAV/SimpleFile.php             |  121 -
 3rdparty/Sabre/DAV/StringUtil.php             |   91 -
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |  289 ---
 3rdparty/Sabre/DAV/Tree.php                   |  193 --
 3rdparty/Sabre/DAV/Tree/Filesystem.php        |  123 -
 3rdparty/Sabre/DAV/URLUtil.php                |  121 -
 3rdparty/Sabre/DAV/UUIDUtil.php               |   64 -
 3rdparty/Sabre/DAV/Version.php                |   24 -
 3rdparty/Sabre/DAV/XMLUtil.php                |  186 --
 3rdparty/Sabre/DAV/includes.php               |   97 -
 .../DAVACL/AbstractPrincipalCollection.php    |  154 --
 .../Sabre/DAVACL/Exception/AceConflict.php    |   32 -
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   81 -
 .../Sabre/DAVACL/Exception/NoAbstract.php     |   32 -
 .../Exception/NotRecognizedPrincipal.php      |   32 -
 .../Exception/NotSupportedPrivilege.php       |   32 -
 3rdparty/Sabre/DAVACL/IACL.php                |   73 -
 3rdparty/Sabre/DAVACL/IPrincipal.php          |   75 -
 3rdparty/Sabre/DAVACL/IPrincipalBackend.php   |  153 --
 3rdparty/Sabre/DAVACL/Plugin.php              | 1348 -----------
 3rdparty/Sabre/DAVACL/Principal.php           |  279 ---
 .../Sabre/DAVACL/PrincipalBackend/PDO.php     |  427 ----
 3rdparty/Sabre/DAVACL/PrincipalCollection.php |   35 -
 3rdparty/Sabre/DAVACL/Property/Acl.php        |  209 --
 .../Sabre/DAVACL/Property/AclRestrictions.php |   32 -
 .../Property/CurrentUserPrivilegeSet.php      |   75 -
 3rdparty/Sabre/DAVACL/Property/Principal.php  |  160 --
 .../DAVACL/Property/SupportedPrivilegeSet.php |   92 -
 3rdparty/Sabre/DAVACL/Version.php             |   24 -
 3rdparty/Sabre/DAVACL/includes.php            |   38 -
 3rdparty/Sabre/HTTP/AWSAuth.php               |  227 --
 3rdparty/Sabre/HTTP/AbstractAuth.php          |  111 -
 3rdparty/Sabre/HTTP/BasicAuth.php             |   67 -
 3rdparty/Sabre/HTTP/DigestAuth.php            |  240 --
 3rdparty/Sabre/HTTP/Request.php               |  268 ---
 3rdparty/Sabre/HTTP/Response.php              |  157 --
 3rdparty/Sabre/HTTP/Util.php                  |   82 -
 3rdparty/Sabre/HTTP/Version.php               |   24 -
 3rdparty/Sabre/HTTP/includes.php              |   27 -
 3rdparty/Sabre/VObject/Component.php          |  365 ---
 3rdparty/Sabre/VObject/Component/VAlarm.php   |  102 -
 .../Sabre/VObject/Component/VCalendar.php     |  133 --
 3rdparty/Sabre/VObject/Component/VEvent.php   |   70 -
 3rdparty/Sabre/VObject/Component/VJournal.php |   46 -
 3rdparty/Sabre/VObject/Component/VTodo.php    |   68 -
 3rdparty/Sabre/VObject/DateTimeParser.php     |  177 --
 3rdparty/Sabre/VObject/Element.php            |   16 -
 3rdparty/Sabre/VObject/Element/DateTime.php   |   37 -
 .../Sabre/VObject/Element/MultiDateTime.php   |   17 -
 3rdparty/Sabre/VObject/ElementList.php        |  172 --
 3rdparty/Sabre/VObject/FreeBusyGenerator.php  |  297 ---
 3rdparty/Sabre/VObject/Node.php               |  149 --
 3rdparty/Sabre/VObject/Parameter.php          |   84 -
 3rdparty/Sabre/VObject/ParseException.php     |   12 -
 3rdparty/Sabre/VObject/Property.php           |  348 ---
 3rdparty/Sabre/VObject/Property/DateTime.php  |  260 ---
 .../Sabre/VObject/Property/MultiDateTime.php  |  166 --
 3rdparty/Sabre/VObject/Reader.php             |  183 --
 3rdparty/Sabre/VObject/RecurrenceIterator.php | 1009 ---------
 3rdparty/Sabre/VObject/Version.php            |   24 -
 3rdparty/Sabre/VObject/WindowsTimezoneMap.php |  128 --
 3rdparty/Sabre/VObject/includes.php           |   41 -
 3rdparty/Sabre/autoload.php                   |   31 -
 180 files changed, 24866 deletions(-)
 delete mode 100644 3rdparty/Sabre.includes.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Backend/Abstract.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Calendar.php
 delete mode 100644 3rdparty/Sabre/CalDAV/CalendarObject.php
 delete mode 100644 3rdparty/Sabre/CalDAV/CalendarQueryParser.php
 delete mode 100644 3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
 delete mode 100644 3rdparty/Sabre/CalDAV/CalendarRootNode.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICSExportPlugin.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICalendar.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICalendarObject.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Plugin.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/Collection.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/User.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Schedule/IMip.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Schedule/Outbox.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Server.php
 delete mode 100644 3rdparty/Sabre/CalDAV/UserCalendars.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Version.php
 delete mode 100644 3rdparty/Sabre/CalDAV/includes.php
 delete mode 100644 3rdparty/Sabre/CardDAV/AddressBook.php
 delete mode 100644 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
 delete mode 100644 3rdparty/Sabre/CardDAV/AddressBookRoot.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Backend/Abstract.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Card.php
 delete mode 100644 3rdparty/Sabre/CardDAV/IAddressBook.php
 delete mode 100644 3rdparty/Sabre/CardDAV/ICard.php
 delete mode 100644 3rdparty/Sabre/CardDAV/IDirectory.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Plugin.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
 delete mode 100644 3rdparty/Sabre/CardDAV/UserAddressBooks.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Version.php
 delete mode 100644 3rdparty/Sabre/CardDAV/includes.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/Apache.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/File.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/IBackend.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/GuessContentType.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/favicon.ico
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/card.png
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/file.png
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
 delete mode 100644 3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
 delete mode 100644 3rdparty/Sabre/DAV/Client.php
 delete mode 100644 3rdparty/Sabre/DAV/Collection.php
 delete mode 100644 3rdparty/Sabre/DAV/Directory.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/BadRequest.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/Conflict.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/ConflictingLock.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/FileNotFound.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/Forbidden.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/Locked.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/NotFound.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/NotImplemented.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/PaymentRequired.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
 delete mode 100644 3rdparty/Sabre/DAV/FS/Directory.php
 delete mode 100644 3rdparty/Sabre/DAV/FS/File.php
 delete mode 100644 3rdparty/Sabre/DAV/FS/Node.php
 delete mode 100644 3rdparty/Sabre/DAV/FSExt/Directory.php
 delete mode 100644 3rdparty/Sabre/DAV/FSExt/File.php
 delete mode 100644 3rdparty/Sabre/DAV/FSExt/Node.php
 delete mode 100644 3rdparty/Sabre/DAV/File.php
 delete mode 100644 3rdparty/Sabre/DAV/ICollection.php
 delete mode 100644 3rdparty/Sabre/DAV/IExtendedCollection.php
 delete mode 100644 3rdparty/Sabre/DAV/IFile.php
 delete mode 100644 3rdparty/Sabre/DAV/INode.php
 delete mode 100644 3rdparty/Sabre/DAV/IProperties.php
 delete mode 100644 3rdparty/Sabre/DAV/IQuota.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/FS.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/File.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/LockInfo.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Mount/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Node.php
 delete mode 100644 3rdparty/Sabre/DAV/ObjectTree.php
 delete mode 100644 3rdparty/Sabre/DAV/Property.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/GetLastModified.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/Href.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/HrefList.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/IHref.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/LockDiscovery.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/ResourceType.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/Response.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/ResponseList.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/SupportedLock.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/SupportedReportSet.php
 delete mode 100644 3rdparty/Sabre/DAV/Server.php
 delete mode 100644 3rdparty/Sabre/DAV/ServerPlugin.php
 delete mode 100644 3rdparty/Sabre/DAV/SimpleCollection.php
 delete mode 100644 3rdparty/Sabre/DAV/SimpleDirectory.php
 delete mode 100644 3rdparty/Sabre/DAV/SimpleFile.php
 delete mode 100644 3rdparty/Sabre/DAV/StringUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Tree.php
 delete mode 100644 3rdparty/Sabre/DAV/Tree/Filesystem.php
 delete mode 100644 3rdparty/Sabre/DAV/URLUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/UUIDUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/Version.php
 delete mode 100644 3rdparty/Sabre/DAV/XMLUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/includes.php
 delete mode 100644 3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/AceConflict.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 delete mode 100644 3rdparty/Sabre/DAVACL/IACL.php
 delete mode 100644 3rdparty/Sabre/DAVACL/IPrincipal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/IPrincipalBackend.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Principal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
 delete mode 100644 3rdparty/Sabre/DAVACL/PrincipalCollection.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/Acl.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/Principal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Version.php
 delete mode 100644 3rdparty/Sabre/DAVACL/includes.php
 delete mode 100644 3rdparty/Sabre/HTTP/AWSAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/AbstractAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/BasicAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/DigestAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/Request.php
 delete mode 100644 3rdparty/Sabre/HTTP/Response.php
 delete mode 100644 3rdparty/Sabre/HTTP/Util.php
 delete mode 100644 3rdparty/Sabre/HTTP/Version.php
 delete mode 100644 3rdparty/Sabre/HTTP/includes.php
 delete mode 100644 3rdparty/Sabre/VObject/Component.php
 delete mode 100644 3rdparty/Sabre/VObject/Component/VAlarm.php
 delete mode 100644 3rdparty/Sabre/VObject/Component/VCalendar.php
 delete mode 100644 3rdparty/Sabre/VObject/Component/VEvent.php
 delete mode 100644 3rdparty/Sabre/VObject/Component/VJournal.php
 delete mode 100644 3rdparty/Sabre/VObject/Component/VTodo.php
 delete mode 100644 3rdparty/Sabre/VObject/DateTimeParser.php
 delete mode 100644 3rdparty/Sabre/VObject/Element.php
 delete mode 100644 3rdparty/Sabre/VObject/Element/DateTime.php
 delete mode 100644 3rdparty/Sabre/VObject/Element/MultiDateTime.php
 delete mode 100644 3rdparty/Sabre/VObject/ElementList.php
 delete mode 100644 3rdparty/Sabre/VObject/FreeBusyGenerator.php
 delete mode 100644 3rdparty/Sabre/VObject/Node.php
 delete mode 100644 3rdparty/Sabre/VObject/Parameter.php
 delete mode 100644 3rdparty/Sabre/VObject/ParseException.php
 delete mode 100644 3rdparty/Sabre/VObject/Property.php
 delete mode 100644 3rdparty/Sabre/VObject/Property/DateTime.php
 delete mode 100644 3rdparty/Sabre/VObject/Property/MultiDateTime.php
 delete mode 100644 3rdparty/Sabre/VObject/Reader.php
 delete mode 100644 3rdparty/Sabre/VObject/RecurrenceIterator.php
 delete mode 100644 3rdparty/Sabre/VObject/Version.php
 delete mode 100644 3rdparty/Sabre/VObject/WindowsTimezoneMap.php
 delete mode 100644 3rdparty/Sabre/VObject/includes.php
 delete mode 100644 3rdparty/Sabre/autoload.php

diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
deleted file mode 100644
index c133437366..0000000000
--- a/3rdparty/Sabre.includes.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Library include file
- *
- * This file is deprecated, don't use it!
- * Instead, use the specific includes files that are in the sub-packages.
- *
- *   Sabre/DAV/includes.php
- *   Sabre/HTTP/includes.php
- *
- *   etc..
- *
- * This file contains all includes to the rest of the SabreDAV library
- * Make sure the lib/ directory is in PHP's include_path.
- *
- * @package Sabre
- * @deprecated Don't use this file, it will be remove in a future version
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-include 'Sabre/HTTP/includes.php';
-include 'Sabre/DAV/includes.php';
-
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
deleted file mode 100644
index 7aba1d69ff..0000000000
--- a/3rdparty/Sabre/CalDAV/Backend/Abstract.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/**
- * Abstract Calendaring backend. Extend this class to create your own backends.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_CalDAV_Backend_Abstract {
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    abstract function getCalendarsForUser($principalUri);
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return void
-     */
-    abstract function createCalendar($principalUri,$calendarUri,array $properties);
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        return false;
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    abstract function deleteCalendar($calendarId);
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *   * size - The size of the calendar objects, in bytes.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    abstract function getCalendarObjects($calendarId);
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array
-     */
-    abstract function getCalendarObject($calendarId,$objectUri);
-
-    /**
-     * Creates a new calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    abstract function deleteCalendarObject($calendarId,$objectUri);
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
deleted file mode 100644
index ddacf940c7..0000000000
--- a/3rdparty/Sabre/CalDAV/Backend/PDO.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-/**
- * PDO CalDAV backend
- *
- * This backend is used to store calendar-data in a PDO database, such as
- * sqlite or MySQL
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
-
-    /**
-     * pdo
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The table name that will be used for calendars
-     *
-     * @var string
-     */
-    protected $calendarTableName;
-
-    /**
-     * The table name that will be used for calendar objects
-     *
-     * @var string
-     */
-    protected $calendarObjectTableName;
-
-    /**
-     * List of CalDAV properties, and how they map to database fieldnames
-     *
-     * Add your own properties by simply adding on to this array
-     *
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}displayname'                          => 'displayname',
-        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-    );
-
-    /**
-     * Creates the backend
-     *
-     * @param PDO $pdo
-     * @param string $calendarTableName
-     * @param string $calendarObjectTableName
-     */
-    public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
-
-        $this->pdo = $pdo;
-        $this->calendarTableName = $calendarTableName;
-        $this->calendarObjectTableName = $calendarObjectTableName;
-
-    }
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri) {
-
-        $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'ctag';
-        $fields[] = 'components';
-        $fields[] = 'principaluri';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
-        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM ".$this->calendarTableName." WHERE principaluri = ? ORDER BY calendarorder ASC");
-        $stmt->execute(array($principalUri));
-
-        $calendars = array();
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-            $components = array();
-            if ($row['components']) {
-                $components = explode(',',$row['components']);
-            }
-
-            $calendar = array(
-                'id' => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
-            );
-
-
-            foreach($this->propertyMap as $xmlName=>$dbName) {
-                $calendar[$xmlName] = $row[$dbName];
-            }
-
-            $calendars[] = $calendar;
-
-        }
-
-        return $calendars;
-
-    }
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return string
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties) {
-
-        $fieldNames = array(
-            'principaluri',
-            'uri',
-            'ctag',
-        );
-        $values = array(
-            ':principaluri' => $principalUri,
-            ':uri'          => $calendarUri,
-            ':ctag'         => 1,
-        );
-
-        // Default value
-        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
-        if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
-        } else {
-            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
-                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
-            }
-            $values[':components'] = implode(',',$properties[$sccs]->getValue());
-        }
-
-        foreach($this->propertyMap as $xmlName=>$dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO ".$this->calendarTableName." (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        $newValues = array();
-        $result = array(
-            200 => array(), // Ok
-            403 => array(), // Forbidden
-            424 => array(), // Failed Dependency
-        );
-
-        $hasError = false;
-
-        foreach($mutations as $propertyName=>$propertyValue) {
-
-            // We don't know about this property.
-            if (!isset($this->propertyMap[$propertyName])) {
-                $hasError = true;
-                $result[403][$propertyName] = null;
-                unset($mutations[$propertyName]);
-                continue;
-            }
-
-            $fieldName = $this->propertyMap[$propertyName];
-            $newValues[$fieldName] = $propertyValue;
-
-        }
-
-        // If there were any errors we need to fail the request
-        if ($hasError) {
-            // Properties has the remaining properties
-            foreach($mutations as $propertyName=>$propertyValue) {
-                $result[424][$propertyName] = null;
-            }
-
-            // Removing unused statuscodes for cleanliness
-            foreach($result as $status=>$properties) {
-                if (is_array($properties) && count($properties)===0) unset($result[$status]);
-            }
-
-            return $result;
-
-        }
-
-        // Success
-
-        // Now we're generating the sql query.
-        $valuesSql = array();
-        foreach($newValues as $fieldName=>$value) {
-            $valuesSql[] = $fieldName . ' = ?';
-        }
-        $valuesSql[] = 'ctag = ctag + 1';
-
-        $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ',$valuesSql) . " WHERE id = ?");
-        $newValues['id'] = $calendarId;
-        $stmt->execute(array_values($newValues));
-
-        return true;
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarTableName.' WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *   * size - The size of the calendar objects, in bytes.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId) {
-
-        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-        return $stmt->fetchAll();
-
-    }
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array
-     */
-    public function getCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId, $objectUri));
-        return $stmt->fetch();
-
-    }
-
-    /**
-     * Creates a new calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO '.$this->calendarObjectTableName.' (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
-        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarObjectTableName.' SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE '. $this->calendarTableName .' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
deleted file mode 100644
index 623df2dd1b..0000000000
--- a/3rdparty/Sabre/CalDAV/Calendar.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-
-/**
- * This object represents a CalDAV calendar.
- *
- * A calendar can contain multiple TODO and or Events. These are represented
- * as Sabre_CalDAV_CalendarObject objects.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * This is an array with calendar information
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param array $calendarInfo
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalBackend = $principalBackend;
-        $this->calendarInfo = $calendarInfo;
-
-
-    }
-
-    /**
-     * Returns the name of the calendar
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->calendarInfo['uri'];
-
-    }
-
-    /**
-     * Updates properties such as the display name and description
-     *
-     * @param array $mutations
-     * @return array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
-
-    }
-
-    /**
-     * Returns the list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $response = array();
-
-        foreach($requestedProperties as $prop) switch($prop) {
-
-            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
-                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData();
-                break;
-            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
-                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet();
-                break;
-            case '{DAV:}owner' :
-                $response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
-                break;
-            default :
-                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
-                break;
-
-        }
-        return $response;
-
-    }
-
-    /**
-     * Returns a calendar object
-     *
-     * The contained calendar objects are for example Events or Todo's.
-     *
-     * @param string $name
-     * @return Sabre_DAV_ICalendarObject
-     */
-    public function getChild($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
-        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of calendar objects
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Checks if a child-node exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj)
-            return false;
-        else
-            return true;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in calendars.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid ICalendar string.
-     *
-     * @param string $name
-     * @param resource $calendarData
-     * @return string|null
-     */
-    public function createFile($name,$calendarData = null) {
-
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
-
-    }
-
-    /**
-     * Deletes the calendar.
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
-
-    }
-
-    /**
-     * Renames the calendar. Note that most calendars use the
-     * {DAV:}displayname to display a name to display a name.
-     *
-     * @param string $newName
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
-
-        // We need to inject 'read-free-busy' in the tree, aggregated under
-        // {DAV:}read.
-        foreach($default['aggregates'] as &$agg) {
-
-            if ($agg['privilege'] !== '{DAV:}read') continue;
-
-            $agg['aggregates'][] = array(
-                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
-            );
-
-        }
-        return $default;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
deleted file mode 100644
index 72f0a578d1..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarObject.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-
-/**
- * The CalendarObject represents a single VEVENT or VTODO within a Calendar.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
-
-    /**
-     * Sabre_CalDAV_Backend_Abstract
-     *
-     * @var array
-     */
-    protected $caldavBackend;
-
-    /**
-     * Array with information about this CalendarObject
-     *
-     * @var array
-     */
-    protected $objectData;
-
-    /**
-     * Array with information about the containing calendar
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param array $calendarInfo
-     * @param array $objectData
-     */
-    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,array $calendarInfo,array $objectData) {
-
-        $this->caldavBackend = $caldavBackend;
-
-        if (!isset($objectData['calendarid'])) {
-            throw new InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
-        }
-        if (!isset($objectData['uri'])) {
-            throw new InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-
-        $this->calendarInfo = $calendarInfo;
-        $this->objectData = $objectData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->objectData['uri'];
-
-    }
-
-    /**
-     * Returns the ICalendar-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
-        }
-        return $this->objectData['calendardata'];
-
-    }
-
-    /**
-     * Updates the ICalendar-formatted object
-     *
-     * @param string $calendarData
-     * @return void
-     */
-    public function put($calendarData) {
-
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
-        $this->objectData['calendardata'] = $calendarData;
-        $this->objectData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the calendar object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/calendar';
-
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->objectData['etag'])) {
-            return $this->objectData['etag'];
-        } else {
-            return '"' . md5($this->get()). '"';
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return time
-     */
-    public function getLastModified() {
-
-        return $this->objectData['lastmodified'];
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size',$this->objectData)) {
-            return $this->objectData['size'];
-        } else {
-            return strlen($this->get());
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
deleted file mode 100644
index bd0d343382..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-
-/**
- * Parses the calendar-query report request body.
- *
- * Whoever designed this format, and the CalDAV equivalent even more so,
- * has no feel for design.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarQueryParser {
-
-    /**
-     * List of requested properties the client wanted
-     *
-     * @var array
-     */
-    public $requestedProperties;
-
-    /**
-     * List of property/component filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * This property will contain null if CALDAV:expand was not specified, 
-     * otherwise it will contain an array with 2 elements (start, end). Each 
-     * contain a DateTime object.
-     *
-     * If expand is specified, recurring calendar objects are to be expanded 
-     * into their individual components, and only the components that fall 
-     * within the specified time-range are to be returned.
-     *
-     * For more details, see rfc4791, section 9.6.5.
-     * 
-     * @var null|array 
-     */
-    public $expand;
-
-    /**
-     * DOM Document
-     *
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     *
-     * @param DOMDocument $dom
-     */
-    public function __construct(DOMDocument $dom) {
-
-        $this->dom = $dom;
-
-        $this->xpath = new DOMXPath($dom);
-        $this->xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
-        $this->xpath->registerNameSpace('dav','urn:DAV');
-
-    }
-
-    /**
-     * Parses the request.
-     *
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-
-        $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
-        if ($filter->length !== 1) {
-            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
-        }
-
-        $compFilters = $this->parseCompFilters($filter->item(0));
-        if (count($compFilters)!==1) {
-            throw new Sabre_DAV_Exception_BadRequest('There must be exactly 1 top-level comp-filter.');
-        }
-
-        $this->filters = $compFilters[0];
-        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
-
-        $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
-        if ($expand->length>0) {
-            $this->expand = $this->parseExpand($expand->item(0));
-        }
-             
-
-    }
-
-    /**
-     * Parses all the 'comp-filter' elements from a node
-     *
-     * @param DOMElement $parentNode
-     * @return array
-     */
-    protected function parseCompFilters(DOMElement $parentNode) {
-
-        $compFilterNodes = $this->xpath->query('cal:comp-filter', $parentNode);
-        $result = array();
-
-        for($ii=0; $ii < $compFilterNodes->length; $ii++) {
-
-            $compFilterNode = $compFilterNodes->item($ii);
-
-            $compFilter = array();
-            $compFilter['name'] = $compFilterNode->getAttribute('name');
-            $compFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $compFilterNode)->length>0;
-            $compFilter['comp-filters'] = $this->parseCompFilters($compFilterNode);
-            $compFilter['prop-filters'] = $this->parsePropFilters($compFilterNode);
-            $compFilter['time-range'] = $this->parseTimeRange($compFilterNode);
-
-            if ($compFilter['time-range'] && !in_array($compFilter['name'],array(
-                'VEVENT',
-                'VTODO',
-                'VJOURNAL',
-                'VFREEBUSY',
-                'VALARM',
-            ))) {
-                throw new Sabre_DAV_Exception_BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
-            };
-
-            $result[] = $compFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses all the prop-filter elements from a node
-     *
-     * @param DOMElement $parentNode
-     * @return array
-     */
-    protected function parsePropFilters(DOMElement $parentNode) {
-
-        $propFilterNodes = $this->xpath->query('cal:prop-filter', $parentNode);
-        $result = array();
-
-        for ($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilterNode = $propFilterNodes->item($ii);
-            $propFilter = array();
-            $propFilter['name'] = $propFilterNode->getAttribute('name');
-            $propFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $propFilterNode)->length>0;
-            $propFilter['param-filters'] = $this->parseParamFilters($propFilterNode);
-            $propFilter['text-match'] = $this->parseTextMatch($propFilterNode);
-            $propFilter['time-range'] = $this->parseTimeRange($propFilterNode);
-
-            $result[] = $propFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses the param-filter element
-     *
-     * @param DOMElement $parentNode
-     * @return array
-     */
-    protected function parseParamFilters(DOMElement $parentNode) {
-
-        $paramFilterNodes = $this->xpath->query('cal:param-filter', $parentNode);
-        $result = array();
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $paramFilterNode = $paramFilterNodes->item($ii);
-            $paramFilter = array();
-            $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-            $paramFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $paramFilterNode)->length>0;
-            $paramFilter['text-match'] = $this->parseTextMatch($paramFilterNode);
-
-            $result[] = $paramFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses the text-match element
-     *
-     * @param DOMElement $parentNode
-     * @return array|null
-     */
-    protected function parseTextMatch(DOMElement $parentNode) {
-
-        $textMatchNodes = $this->xpath->query('cal:text-match', $parentNode);
-
-        if ($textMatchNodes->length === 0)
-            return null;
-
-        $textMatchNode = $textMatchNodes->item(0);
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;ascii-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'value' => $textMatchNode->nodeValue
-        );
-
-    }
-
-    /**
-     * Parses the time-range element
-     *
-     * @param DOMElement $parentNode
-     * @return array|null
-     */
-    protected function parseTimeRange(DOMElement $parentNode) {
-
-        $timeRangeNodes = $this->xpath->query('cal:time-range', $parentNode);
-        if ($timeRangeNodes->length === 0) {
-            return null;
-        }
-
-        $timeRangeNode = $timeRangeNodes->item(0);
-
-        if ($start = $timeRangeNode->getAttribute('start')) {
-            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-        } else {
-            $start = null;
-        }
-        if ($end = $timeRangeNode->getAttribute('end')) {
-            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-        } else {
-            $end = null;
-        }
-
-        if (!is_null($start) && !is_null($end) && $end <= $start) {
-            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
-        }
-
-        return array(
-            'start' => $start,
-            'end' => $end,
-        );
-
-    }
-
-    /**
-     * Parses the CALDAV:expand element
-     * 
-     * @param DOMElement $parentNode 
-     * @return void
-     */
-    protected function parseExpand(DOMElement $parentNode) {
-
-        $start = $parentNode->getAttribute('start');
-        if(!$start) {
-            throw new Sabre_DAV_Exception_BadRequest('The "start" attribute is required for the CALDAV:expand element');
-        } 
-        $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-
-        $end = $parentNode->getAttribute('end');
-        if(!$end) {
-            throw new Sabre_DAV_Exception_BadRequest('The "end" attribute is required for the CALDAV:expand element');
-        } 
-        $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-        
-        if ($end <= $start) {
-            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
-        }
-
-        return array(
-            'start' => $start,
-            'end' => $end,
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
deleted file mode 100644
index 1bb6b5d53f..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-
-/**
- * CalendarQuery Validator
- *
- * This class is responsible for checking if an iCalendar object matches a set
- * of filters. The main function to do this is 'validate'.
- *
- * This is used to determine which icalendar objects should be returned for a
- * calendar-query REPORT request.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarQueryValidator {
-
-    /**
-     * Verify if a list of filters applies to the calendar data object
-     *
-     * The list of filters must be formatted as parsed by Sabre_CalDAV_CalendarQueryParser
-     *
-     * @param Sabre_VObject_Component $vObject
-     * @param array $filters
-     * @return bool
-     */
-    public function validate(Sabre_VObject_Component $vObject,array $filters) {
-
-        // The top level object is always a component filter.
-        // We'll parse it manually, as it's pretty simple.
-        if ($vObject->name !== $filters['name']) {
-            return false;
-        }
-
-        return
-            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
-            $this->validatePropFilters($vObject, $filters['prop-filters']);
-
-
-    }
-
-    /**
-     * This method checks the validity of comp-filters.
-     *
-     * A list of comp-filters needs to be specified. Also the parent of the
-     * component we're checking should be specified, not the component to check
-     * itself.
-     *
-     * @param Sabre_VObject_Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateCompFilters(Sabre_VObject_Component $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent->$filter['name']);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one component
-            // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
-
-                if (
-                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
-                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
-                        // We had a match, so this comp-filter succeeds
-                        continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-comp-filters or
-            // sub-prop-filters and there was no match. This means this filter
-            // needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all comp-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of prop-filters.
-     *
-     * A list of prop-filters needs to be specified. Also the parent of the
-     * property we're checking should be specified, not the property to check
-     * itself.
-     *
-     * @param Sabre_VObject_Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validatePropFilters(Sabre_VObject_Component $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent->$filter['name']);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['param-filters'] && !$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one property
-            // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
-
-                if(
-                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
-                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
-                ) {
-                    // We had a match, so this prop-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-param-filters or
-            // text-match filters and there was no match. This means the
-            // filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all prop-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of param-filters.
-     *
-     * A list of param-filters needs to be specified. Also the parent of the
-     * parameter we're checking should be specified, not the parameter to check
-     * itself.
-     *
-     * @param Sabre_VObject_Property $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateParamFilters(Sabre_VObject_Property $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent[$filter['name']]);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (!$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one parameter
-            // for which the subfilters hold true.
-            foreach($parent[$filter['name']] as $subParam) {
-
-                if($this->validateTextMatch($subParam,$filter['text-match'])) {
-                    // We had a match, so this param-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there was a text-match filter and there
-            // were no matches. This means the filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all param-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of a text-match.
-     *
-     * A single text-match should be specified as well as the specific property
-     * or parameter we need to validate.
-     *
-     * @param Sabre_VObject_Node $parent
-     * @param array $textMatch
-     * @return bool
-     */
-    protected function validateTextMatch(Sabre_VObject_Node $parent, array $textMatch) {
-
-        $value = (string)$parent;
-
-        $isMatching = Sabre_DAV_StringUtil::textMatch($value, $textMatch['value'], $textMatch['collation']);
-
-        return ($textMatch['negate-condition'] xor $isMatching);
-
-    }
-
-    /**
-     * Validates if a component matches the given time range.
-     *
-     * This is all based on the rules specified in rfc4791, which are quite
-     * complex.
-     *
-     * @param Sabre_VObject_Node $component
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    protected function validateTimeRange(Sabre_VObject_Node $component, $start, $end) {
-
-        if (is_null($start)) {
-            $start = new DateTime('1900-01-01');
-        }
-        if (is_null($end)) {
-            $end = new DateTime('3000-01-01');
-        }
-
-        switch($component->name) {
-
-            case 'VEVENT' :
-            case 'VTODO' :
-            case 'VJOURNAL' :
-
-                return $component->isInTimeRange($start, $end);
-
-            case 'VALARM' :
-
-                // If the valarm is wrapped in a recurring event, we need to
-                // expand the recursions, and validate each.
-                //
-                // Our datamodel doesn't easily allow us to do this straight
-                // in the VALARM component code, so this is a hack, and an
-                // expensive one too.
-                if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
-                    // Fire up the iterator!
-                    $it = new Sabre_VObject_RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
-                    while($it->valid()) {
-                        $expandedEvent = $it->getEventObject();
-
-                        // We need to check from these expanded alarms, which
-                        // one is the first to trigger. Based on this, we can
-                        // determine if we can 'give up' expanding events.
-                        $firstAlarm = null;
-                        foreach($expandedEvent->VALARM as $expandedAlarm) {
-                            $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                            if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
-                                $firstAlarm = $effectiveTrigger;
-                            }
-                            if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                return true;
-                            }
-
-                        }
-                        if ($firstAlarm > $end) {
-                            return false;
-                        }
-                        $it->next();
-                    }
-                    return false;
-                } else {
-                    return $component->isInTimeRange($start, $end);
-                }
-
-            case 'VFREEBUSY' :
-                throw new Sabre_DAV_Exception_NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
-
-            case 'COMPLETED' :
-            case 'CREATED' :
-            case 'DTEND' :
-            case 'DTSTAMP' :
-            case 'DTSTART' :
-            case 'DUE' :
-            case 'LAST-MODIFIED' :
-                return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
-
-
-
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
deleted file mode 100644
index 3907913cc7..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarRootNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Users collection
- *
- * This object is responsible for generating a collection of users.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Constructor
-     *
-     * This constructor needs both an authentication and a caldav backend.
-     *
-     * By default this class will show a list of calendar collections for
-     * principals in the 'principals' collection. If your main principals are
-     * actually located in a different path, use the $principalPrefix argument
-     * to override this.
-     *
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend, $principalPrefix = 'principals') {
-
-        parent::__construct($principalBackend, $principalPrefix);
-        $this->caldavBackend = $caldavBackend;
-
-    }
-
-    /**
-     * Returns the nodename
-     *
-     * We're overriding this, because the default will be the 'principalPrefix',
-     * and we want it to be Sabre_CalDAV_Plugin::CALENDAR_ROOT
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return Sabre_DAV_INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
deleted file mode 100644
index ec42b406b2..0000000000
--- a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * ICS Exporter
- *
- * This plugin adds the ability to export entire calendars as .ics files.
- * This is useful for clients that don't support CalDAV yet. They often do
- * support ics files.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?export
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='export') return;
-
-        // splitting uri
-        list($uri) = explode('?',$uri,2);
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_CalDAV_Calendar)) return;
-
-        // Checking ACL, if available.
-        if ($aclPlugin = $this->server->getPlugin('acl')) {
-            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
-        $this->server->httpResponse->sendStatus(200);
-
-        $nodes = $this->server->getPropertiesForPath($uri, array(
-            '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data',
-        ),1);
-
-        $this->server->httpResponse->sendBody($this->generateICS($nodes));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big ics export
-     *
-     * @param array $nodes
-     * @return string
-     */
-    public function generateICS(array $nodes) {
-
-        $calendar = new Sabre_VObject_Component('vcalendar');
-        $calendar->version = '2.0';
-        if (Sabre_DAV_Server::$exposeVersion) {
-            $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
-        } else {
-            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
-        }
-        $calendar->calscale = 'GREGORIAN';
-
-        $collectedTimezones = array();
-
-        $timezones = array();
-        $objects = array();
-
-        foreach($nodes as $node) {
-
-            if (!isset($node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'])) {
-                continue;
-            }
-            $nodeData = $node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'];
-
-            $nodeComp = Sabre_VObject_Reader::read($nodeData);
-
-            foreach($nodeComp->children() as $child) {
-
-                switch($child->name) {
-                    case 'VEVENT' :
-                    case 'VTODO' :
-                    case 'VJOURNAL' :
-                        $objects[] = $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE' :
-                        // Naively just checking tzid.
-                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
-
-                        $timezones[] = $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-
-                }
-
-            }
-
-        }
-
-        foreach($timezones as $tz) $calendar->add($tz);
-        foreach($objects as $obj) $calendar->add($obj);
-
-        return $calendar->serialize();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
deleted file mode 100644
index 15d51ebcf7..0000000000
--- a/3rdparty/Sabre/CalDAV/ICalendar.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Calendar interface
- *
- * Implement this interface to allow a node to be recognized as an calendar.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
-
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
deleted file mode 100644
index 280f982a31..0000000000
--- a/3rdparty/Sabre/CalDAV/ICalendarObject.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * CalendarObject interface
-/**
- * Extend the ICalendarObject interface to allow your custom nodes to be picked up as
- * CalendarObjects.
- *
- * Calendar objects are resources such as Events, Todo's or Journals.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile {
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
deleted file mode 100644
index d7d1d97051..0000000000
--- a/3rdparty/Sabre/CalDAV/Plugin.php
+++ /dev/null
@@ -1,829 +0,0 @@
-<?php
-
-/**
- * CalDAV plugin
- *
- * This plugin provides functionality added by CalDAV (RFC 4791)
- * It implements new reports, and the MKCALENDAR method.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * This is the official CalDAV namespace
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
-    /**
-     * This is the namespace for the proprietary calendarserver extensions
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * The following constants are used to differentiate
-     * the various filters for the calendar-query report
-     */
-    const FILTER_COMPFILTER   = 1;
-    const FILTER_TIMERANGE    = 3;
-    const FILTER_PROPFILTER   = 4;
-    const FILTER_PARAMFILTER  = 5;
-    const FILTER_TEXTMATCH    = 6;
-
-    /**
-     * The hardcoded root for calendar objects. It is unfortunate
-     * that we're stuck with it, but it will have to do for now
-     */
-    const CALENDAR_ROOT = 'calendars';
-
-    /**
-     * Reference to server object
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * The email handler for invites and other scheduling messages.
-     * 
-     * @var Sabre_CalDAV_Schedule_IMip 
-     */
-    protected $imipHandler;
-
-    /**
-     * Sets the iMIP handler.
-     *
-     * iMIP = The email transport of iCalendar scheduling messages. Setting 
-     * this is optional, but if you want the server to allow invites to be sent 
-     * out, you must set a handler.
-     *
-     * Specifically iCal will plain assume that the server supports this. If 
-     * the server doesn't, iCal will display errors when inviting people to 
-     * events.
-     *
-     * @param Sabre_CalDAV_Schedule_IMip $imipHandler 
-     * @return void
-     */
-    public function setIMipHandler(Sabre_CalDAV_Schedule_IMip $imipHandler) {
-
-        $this->imipHandler = $imipHandler;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        // The MKCALENDAR is only available on unmapped uri's, whose
-        // parents extend IExtendedCollection
-        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        $node = $this->server->tree->getNodeForPath($parent);
-
-        if ($node instanceof Sabre_DAV_IExtendedCollection) {
-            try {
-                $node->getChild($name);
-            } catch (Sabre_DAV_Exception_NotFound $e) {
-                return array('MKCALENDAR');
-            }
-        }
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the DAV: HTTP header.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('calendar-access', 'calendar-proxy');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'caldav';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        $reports = array();
-        if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
-            $reports[] = '{' . self::NS_CALDAV . '}calendar-multiget';
-            $reports[] = '{' . self::NS_CALDAV . '}calendar-query';
-        }
-        if ($node instanceof Sabre_CalDAV_ICalendar) {
-            $reports[] = '{' . self::NS_CALDAV . '}free-busy-query';
-        }
-        return $reports;
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
-        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
-        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
-        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
-
-        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
-        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
-
-        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
-
-        $server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-        $server->resourceTypeMapping['Sabre_CalDAV_Schedule_IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
-        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-
-        array_push($server->protectedProperties,
-
-            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
-            '{' . self::NS_CALDAV . '}supported-calendar-data',
-            '{' . self::NS_CALDAV . '}max-resource-size',
-            '{' . self::NS_CALDAV . '}min-date-time',
-            '{' . self::NS_CALDAV . '}max-date-time',
-            '{' . self::NS_CALDAV . '}max-instances',
-            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
-            '{' . self::NS_CALDAV . '}calendar-home-set',
-            '{' . self::NS_CALDAV . '}supported-collation-set',
-            '{' . self::NS_CALDAV . '}calendar-data',
-
-            // scheduling extension
-            '{' . self::NS_CALDAV . '}schedule-inbox-URL',
-            '{' . self::NS_CALDAV . '}schedule-outbox-URL',
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-            '{' . self::NS_CALDAV . '}calendar-user-type',
-
-            // CalendarServer extensions
-            '{' . self::NS_CALENDARSERVER . '}getctag',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for'
-
-        );
-    }
-
-    /**
-     * This function handles support for the MKCALENDAR method
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch ($method) {
-            case 'MKCALENDAR' :
-                $this->httpMkCalendar($uri);
-                // false is returned to stop the propagation of the
-                // unknownMethod event.
-                return false;
-            case 'POST' :
-                // Checking if we're talking to an outbox
-                try {
-                    $node = $this->server->tree->getNodeForPath($uri);
-                } catch (Sabre_DAV_Exception_NotFound $e) {
-                    return;
-                }
-                if (!$node instanceof Sabre_CalDAV_Schedule_IOutbox)
-                    return;
-
-                $this->outboxRequest($node);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CalDAV
-     *
-     * @param string $reportName
-     * @param DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) {
-            case '{'.self::NS_CALDAV.'}calendar-multiget' :
-                $this->calendarMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}calendar-query' :
-                $this->calendarQueryReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}free-busy-query' :
-                $this->freeBusyQueryReport($dom);
-                return false;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the MKCALENDAR HTTP method, which creates
-     * a new calendar.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpMkCalendar($uri) {
-
-        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
-        // for clients matching iCal in the user agent
-        //$ua = $this->server->httpRequest->getHeader('User-Agent');
-        //if (strpos($ua,'iCal/')!==false) {
-        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
-        //}
-
-        $body = $this->server->httpRequest->getBody(true);
-        $properties = array();
-
-        if ($body) {
-
-            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-            foreach($dom->firstChild->childNodes as $child) {
-
-                if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
-                foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
-                    $properties[$k] = $prop;
-                }
-
-            }
-        }
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-
-        $this->server->createCollection($uri,$resourceType,$properties);
-
-        $this->server->httpResponse->sendStatus(201);
-        $this->server->httpResponse->setHeader('Content-Length',0);
-    }
-
-    /**
-     * beforeGetProperties
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific
-     * properties.
-     *
-     * @param string $path
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
-
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            // calendar-home-set property
-            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
-            if (in_array($calHome,$requestedProperties)) {
-                $principalId = $node->getName();
-                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[$calHome]);
-                $returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
-            }
-
-            // schedule-outbox-URL property
-            $scheduleProp = '{' . self::NS_CALDAV . '}schedule-outbox-URL';
-            if (in_array($scheduleProp,$requestedProperties)) {
-                $principalId = $node->getName();
-                $outboxPath = self::CALENDAR_ROOT . '/' . $principalId . '/outbox';
-                unset($requestedProperties[$scheduleProp]);
-                $returnedProperties[200][$scheduleProp] = new Sabre_DAV_Property_Href($outboxPath);
-            }
-
-            // calendar-user-address-set property
-            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
-            if (in_array($calProp,$requestedProperties)) {
-
-                $addresses = $node->getAlternateUriSet();
-                $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl();
-                unset($requestedProperties[$calProp]);
-                $returnedProperties[200][$calProp] = new Sabre_DAV_Property_HrefList($addresses, false);
-
-            }
-
-            // These two properties are shortcuts for ical to easily find
-            // other principals this principal has access to.
-            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
-            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
-            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
-
-                $membership = $node->getGroupMembership();
-                $readList = array();
-                $writeList = array();
-
-                foreach($membership as $group) {
-
-                    $groupNode = $this->server->tree->getNodeForPath($group);
-
-                    // If the node is either ap proxy-read or proxy-write
-                    // group, we grab the parent principal and add it to the
-                    // list.
-                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
-                        list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
-                    }
-                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyWrite) {
-                        list($writeList[]) = Sabre_DAV_URLUtil::splitPath($group);
-                    }
-
-                }
-                if (in_array($propRead,$requestedProperties)) {
-                    unset($requestedProperties[$propRead]);
-                    $returnedProperties[200][$propRead] = new Sabre_DAV_Property_HrefList($readList);
-                }
-                if (in_array($propWrite,$requestedProperties)) {
-                    unset($requestedProperties[$propWrite]);
-                    $returnedProperties[200][$propWrite] = new Sabre_DAV_Property_HrefList($writeList);
-                }
-
-            }
-
-        } // instanceof IPrincipal
-
-
-        if ($node instanceof Sabre_CalDAV_ICalendarObject) {
-            // The calendar-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
-            if (in_array($calDataProp, $requestedProperties)) {
-                unset($requestedProperties[$calDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-    }
-
-    /**
-     * This function handles the calendar-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function calendarMultiGetReport($dom) {
-
-        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-
-        $xpath = new DOMXPath($dom);
-        $xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
-        $xpath->registerNameSpace('dav','urn:DAV');
-
-        $expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
-        if ($expand->length>0) {
-            $expandElem = $expand->item(0);
-            $start = $expandElem->getAttribute('start');
-            $end = $expandElem->getAttribute('end');
-            if(!$start || !$end) {
-                throw new Sabre_DAV_Exception_BadRequest('The "start" and "end" attributes are required for the CALDAV:expand element');
-            }
-            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-
-            if ($end <= $start) {
-                throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
-            }
-
-            $expand = true;
-
-        } else {
-
-            $expand = false;
-
-        }
-
-        foreach($hrefElems as $elem) {
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
-
-            if ($expand && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
-                $vObject = Sabre_VObject_Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
-                $vObject->expand($start, $end);
-                $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-            }
-
-            $propertyList[]=$objProps;
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
-
-    }
-
-    /**
-     * This function handles the calendar-query REPORT
-     *
-     * This report is used by clients to request calendar objects based on
-     * complex conditions.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function calendarQueryReport($dom) {
-
-        $parser = new Sabre_CalDAV_CalendarQueryParser($dom);
-        $parser->parse();
-
-        $requestedCalendarData = true;
-        $requestedProperties = $parser->requestedProperties;
-
-        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
-
-            // We always retrieve calendar-data, as we need it for filtering.
-            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
-
-            // If calendar-data wasn't explicitly requested, we need to remove
-            // it after processing.
-            $requestedCalendarData = false;
-        }
-
-        // These are the list of nodes that potentially match the requirement
-        $candidateNodes = $this->server->getPropertiesForPath(
-            $this->server->getRequestUri(),
-            $requestedProperties,
-            $this->server->getHTTPDepth(0)
-        );
-
-        $verifiedNodes = array();
-
-        $validator = new Sabre_CalDAV_CalendarQueryValidator();
-
-        foreach($candidateNodes as $node) {
-
-            // If the node didn't have a calendar-data property, it must not be a calendar object
-            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']))
-                continue;
-
-            $vObject = Sabre_VObject_Reader::read($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-            if ($validator->validate($vObject,$parser->filters)) {
-
-                if (!$requestedCalendarData) {
-                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                }
-                if ($parser->expand) {
-                    $vObject->expand($parser->expand['start'], $parser->expand['end']);
-                    $node[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-                }
-                $verifiedNodes[] = $node;
-            }
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
-
-    }
-
-    /**
-     * This method is responsible for parsing the request and generating the
-     * response for the CALDAV:free-busy-query REPORT.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    protected function freeBusyQueryReport(DOMNode $dom) {
-
-        $start = null;
-        $end = null;
-
-        foreach($dom->firstChild->childNodes as $childNode) {
-
-            $clark = Sabre_DAV_XMLUtil::toClarkNotation($childNode);
-            if ($clark == '{' . self::NS_CALDAV . '}time-range') {
-                $start = $childNode->getAttribute('start');
-                $end = $childNode->getAttribute('end');
-                break;
-            }
-
-        }
-        if ($start) {
-            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-        }
-        if ($end) {
-            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-        }
-
-        if (!$start && !$end) {
-            throw new Sabre_DAV_Exception_BadRequest('The freebusy report must have a time-range filter');
-        }
-        $acl = $this->server->getPlugin('acl');
-
-        if (!$acl) {
-            throw new Sabre_DAV_Exception('The ACL plugin must be loaded for free-busy queries to work');
-        }
-        $uri = $this->server->getRequestUri();
-        $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy');
-
-        $calendar = $this->server->tree->getNodeForPath($uri);
-        if (!$calendar instanceof Sabre_CalDAV_ICalendar) {
-            throw new Sabre_DAV_Exception_NotImplemented('The free-busy-query REPORT is only implemented on calendars');
-        }
-
-        $objects = array_map(function($child) {
-            $obj = $child->get();
-            if (is_resource($obj)) {
-                $obj = stream_get_contents($obj);
-            }
-            return $obj;
-        }, $calendar->getChildren());
-
-        $generator = new Sabre_VObject_FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($start, $end);
-        $result = $generator->getResult();
-        $result = $result->serialize();
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
-        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
-        $this->server->httpResponse->sendBody($result);
-
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that CalDAV objects receive
-     * valid calendar data.
-     *
-     * @param string $path
-     * @param Sabre_DAV_IFile $node
-     * @param resource $data
-     * @return void
-     */
-    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
-
-        if (!$node instanceof Sabre_CalDAV_ICalendarObject)
-            return;
-
-        $this->validateICalendar($data);
-
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that newly created calendar
-     * objects contain valid calendar data.
-     *
-     * @param string $path
-     * @param resource $data
-     * @param Sabre_DAV_ICollection $parentNode
-     * @return void
-     */
-    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
-
-        if (!$parentNode instanceof Sabre_CalDAV_Calendar)
-            return;
-
-        $this->validateICalendar($data);
-
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string $data
-     * @return void
-     */
-    protected function validateICalendar(&$data) {
-
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        // Converting the data to unicode, if needed.
-        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
-
-        try {
-
-            $vobj = Sabre_VObject_Reader::read($data);
-
-        } catch (Sabre_VObject_ParseException $e) {
-
-            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: ' . $e->getMessage());
-
-        }
-
-    }
-
-    /**
-     * This method handles POST requests to the schedule-outbox
-     *
-     * @param Sabre_CalDAV_Schedule_IOutbox $outboxNode
-     * @return void
-     */
-    public function outboxRequest(Sabre_CalDAV_Schedule_IOutbox $outboxNode) {
-
-        $originator = $this->server->httpRequest->getHeader('Originator');
-        $recipients = $this->server->httpRequest->getHeader('Recipient');
-
-        if (!$originator) {
-            throw new Sabre_DAV_Exception_BadRequest('The Originator: header must be specified when making POST requests');
-        } 
-        if (!$recipients) {
-            throw new Sabre_DAV_Exception_BadRequest('The Recipient: header must be specified when making POST requests');
-        } 
-
-        if (!preg_match('/^mailto:(.*)@(.*)$/', $originator)) {
-            throw new Sabre_DAV_Exception_BadRequest('Originator must start with mailto: and must be valid email address');
-        }
-        $originator = substr($originator,7);
-
-        $recipients = explode(',',$recipients);
-        foreach($recipients as $k=>$recipient) {
-
-            $recipient = trim($recipient);
-            if (!preg_match('/^mailto:(.*)@(.*)$/', $recipient)) { 
-                throw new Sabre_DAV_Exception_BadRequest('Recipients must start with mailto: and must be valid email address');
-            }
-            $recipient = substr($recipient, 7);
-            $recipients[$k] = $recipient;
-        }
-
-        // We need to make sure that 'originator' matches one of the email 
-        // addresses of the selected principal.
-        $principal = $outboxNode->getOwner();
-        $props = $this->server->getProperties($principal,array(
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-        ));
-
-        $addresses = array();
-        if (isset($props['{' . self::NS_CALDAV . '}calendar-user-address-set'])) {
-            $addresses = $props['{' . self::NS_CALDAV . '}calendar-user-address-set']->getHrefs();
-        }
-
-        if (!in_array('mailto:' . $originator, $addresses)) {
-            throw new Sabre_DAV_Exception_Forbidden('The addresses specified in the Originator header did not match any addresses in the owners calendar-user-address-set header');
-        }
-
-        try { 
-            $vObject = Sabre_VObject_Reader::read($this->server->httpRequest->getBody(true));
-        } catch (Sabre_VObject_ParseException $e) {
-            throw new Sabre_DAV_Exception_BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
-        }
-
-        // Checking for the object type
-        $componentType = null;
-        foreach($vObject->getComponents() as $component) {
-            if ($component->name !== 'VTIMEZONE') {
-                $componentType = $component->name;
-                break;
-            }
-        }
-        if (is_null($componentType)) {
-            throw new Sabre_DAV_Exception_BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
-        }
-
-        // Validating the METHOD
-        $method = strtoupper((string)$vObject->METHOD);
-        if (!$method) {
-            throw new Sabre_DAV_Exception_BadRequest('A METHOD property must be specified in iTIP messages');
-        }
-
-        if (in_array($method, array('REQUEST','REPLY','ADD','CANCEL')) && $componentType==='VEVENT') {
-            $this->iMIPMessage($originator, $recipients, $vObject);
-            $this->server->httpResponse->sendStatus(200);
-            $this->server->httpResponse->sendBody('Messages sent');
-        } else {
-            throw new Sabre_DAV_Exception_NotImplemented('This iTIP method is currently not implemented');
-        }
-
-    }
-
-    /**
-     * Sends an iMIP message by email.
-     * 
-     * @param string $originator 
-     * @param array $recipients 
-     * @param Sabre_VObject_Component $vObject 
-     * @return void
-     */
-    protected function iMIPMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
-
-        if (!$this->imipHandler) {
-            throw new Sabre_DAV_Exception_NotImplemented('No iMIP handler is setup on this server.');
-        }
-        $this->imipHandler->sendMessage($originator, $recipients, $vObject); 
-
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param Sabre_DAV_INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
-
-        if (!$node instanceof Sabre_CalDAV_UserCalendars)
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new calendar</h3>
-            <input type="hidden" name="sabreAction" value="mkcalendar" />
-            <label>Name (uri):</label> <input type="text" name="name" /><br />
-            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
-            <input type="submit" value="create" />
-            </form>
-            </td></tr>';
-
-        return false;
-
-    }
-
-    /**
-     * This method allows us to intercept the 'mkcalendar' sabreAction. This
-     * action enables the user to create new calendars from the browser plugin.
-     *
-     * @param string $uri
-     * @param string $action
-     * @param array $postVars
-     * @return bool
-     */
-    public function browserPostAction($uri, $action, array $postVars) {
-
-        if ($action!=='mkcalendar')
-            return;
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-        $properties = array();
-        if (isset($postVars['{DAV:}displayname'])) {
-            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
-        }
-        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
deleted file mode 100644
index abbefa5567..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/Collection.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Principal collection
- *
- * This is an alternative collection to the standard ACL principal collection.
- * This collection adds support for the calendar-proxy-read and
- * calendar-proxy-write sub-principals, as defined by the caldav-proxy
- * specification.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * Returns a child object based on principal information
-     *
-     * @param array $principalInfo
-     * @return Sabre_CalDAV_Principal_User
-     */
-    public function getChildForPrincipal(array $principalInfo) {
-
-        return new Sabre_CalDAV_Principal_User($this->principalBackend, $principalInfo);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
deleted file mode 100644
index 4b3f035634..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * ProxyRead principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by Sabre_CalDAV_Principal_User.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
-
-    /**
-     * Principal information from the parent principal.
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param array $principalInfo
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'calendar-proxy-read';
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return null
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName();
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
deleted file mode 100644
index dd0c2e86ed..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * ProxyWrite principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by Sabre_CalDAV_Principal_User.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
-
-    /**
-     * Parent principal information
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal Backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object
-     *
-     * Note that you MUST supply the parent principal information.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param array $principalInfo
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'calendar-proxy-write';
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return null
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName();
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
deleted file mode 100644
index 8453b877a7..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/User.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * CalDAV principal
- *
- * This is a standard user-principal for CalDAV. This principal is also a
- * collection and returns the caldav-proxy-read and caldav-proxy-write child
- * principals.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * @param string $name Name of the file
-     * @param resource $data Initial payload, passed as a readable stream resource.
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/' . $name);
-        if (!$principal) {
-            throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
-        }
-        if ($name === 'calendar-proxy-read')
-            return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
-
-        if ($name === 'calendar-proxy-write')
-            return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
-
-        throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        $r = array();
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-read')) {
-            $r[] = new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
-        }
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-write')) {
-            $r[] = new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * Returns whether or not the child node exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-            $this->getChild($name);
-            return true;
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            return false;
-        }
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        $acl = parent::getACL();
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
-            'protected' => true,
-        );
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
-            'protected' => true,
-        );
-        return $acl;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
deleted file mode 100644
index 2ea078d7da..0000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Supported component set property
- *
- * This property is a representation of the supported-calendar_component-set
- * property in the CalDAV namespace. It simply requires an array of components,
- * such as VEVENT, VTODO
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
-
-    /**
-     * List of supported components, such as "VEVENT, VTODO"
-     *
-     * @var array
-     */
-    private $components;
-
-    /**
-     * Creates the property
-     *
-     * @param array $components
-     */
-    public function __construct(array $components) {
-
-       $this->components = $components;
-
-    }
-
-    /**
-     * Returns the list of supported components
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->components;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-       $doc = $node->ownerDocument;
-       foreach($this->components as $component) {
-
-            $xcomp = $doc->createElement('cal:comp');
-            $xcomp->setAttribute('name',$component);
-            $node->appendChild($xcomp);
-
-       }
-
-    }
-
-    /**
-     * Unserializes the DOMElement back into a Property class.
-     *
-     * @param DOMElement $node
-     * @return Sabre_CalDAV_Property_SupportedCalendarComponentSet
-     */
-    static function unserialize(DOMElement $node) {
-
-        $components = array();
-        foreach($node->childNodes as $childNode) {
-            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
-                $components[] = $childNode->getAttribute('name');
-            }
-        }
-        return new self($components);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
deleted file mode 100644
index 1d848dd5cf..0000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Supported-calendar-data property
- *
- * This property is a representation of the supported-calendar-data property
- * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
- * so the value is currently hardcoded.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
-
-        $caldata = $doc->createElement($prefix . ':calendar-data');
-        $caldata->setAttribute('content-type','text/calendar');
-        $caldata->setAttribute('version','2.0');
-
-        $node->appendChild($caldata);
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
deleted file mode 100644
index 24e84d4c17..0000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * supported-collation-set property
- *
- * This property is a representation of the supported-collation-set property
- * in the CalDAV namespace.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property in a DOM document
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
-        if (!$prefix) $prefix = 'cal';
-
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;octet')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
-        );
-
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IMip.php b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
deleted file mode 100644
index 37e75fcc4a..0000000000
--- a/3rdparty/Sabre/CalDAV/Schedule/IMip.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * iMIP handler.
- *
- * This class is responsible for sending out iMIP messages. iMIP is the
- * email-based transport for iTIP. iTIP deals with scheduling operations for
- * iCalendar objects.
- *
- * If you want to customize the email that gets sent out, you can do so by
- * extending this class and overriding the sendMessage method.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Schedule_IMip {
-
-    /**
-     * Email address used in From: header.
-     *
-     * @var string
-     */
-    protected $senderEmail;
-
-    /**
-     * Creates the email handler.
-     *
-     * @param string $senderEmail. The 'senderEmail' is the email that shows up
-     *                             in the 'From:' address. This should
-     *                             generally be some kind of no-reply email
-     *                             address you own.
-     */
-    public function __construct($senderEmail) {
-
-        $this->senderEmail = $senderEmail;
-
-    }
-
-    /**
-     * Sends one or more iTip messages through email.
-     *
-     * @param string $originator
-     * @param array $recipients
-     * @param Sabre_VObject_Component $vObject
-     * @return void
-     */
-    public function sendMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
-
-        foreach($recipients as $recipient) {
-
-            $to = $recipient;
-            $replyTo = $originator;
-            $subject = 'SabreDAV iTIP message';
-
-            switch(strtoupper($vObject->METHOD)) {
-                case 'REPLY' :
-                    $subject = 'Response for: ' . $vObject->VEVENT->SUMMARY;
-                    break;
-                case 'REQUEST' :
-                    $subject = 'Invitation for: ' .$vObject->VEVENT->SUMMARY;
-                    break;
-                case 'CANCEL' :
-                    $subject = 'Cancelled event: ' . $vObject->VEVENT->SUMMARY;
-                    break;
-            }
-
-            $headers = array();
-            $headers[] = 'Reply-To: ' . $replyTo;
-            $headers[] = 'From: ' . $this->senderEmail;
-            $headers[] = 'Content-Type: text/calendar; method=' . (string)$vObject->method . '; charset=utf-8';
-            if (Sabre_DAV_Server::$exposeVersion) {
-                $headers[] = 'X-Sabre-Version: ' . Sabre_DAV_Version::VERSION . '-' . Sabre_DAV_Version::STABILITY;
-            }
-
-            $vcalBody = $vObject->serialize();
-
-            $this->mail($to, $subject, $vcalBody, $headers);
-
-        }
-
-    }
-
-    /**
-     * This function is reponsible for sending the actual email.
-     *
-     * @param string $to Recipient email address
-     * @param string $subject Subject of the email
-     * @param string $body iCalendar body
-     * @param array $headers List of headers
-     * @return void
-     */
-    protected function mail($to, $subject, $body, array $headers) {
-
-        mail($to, $subject, $body, implode("\r\n", $headers));
-
-    }
-
-
-}
-
-?>
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
deleted file mode 100644
index 46d77514bc..0000000000
--- a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Implement this interface to have a node be recognized as a CalDAV scheduling
- * outbox.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_Schedule_IOutbox extends Sabre_DAV_ICollection, Sabre_DAVACL_IACL {
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/Outbox.php b/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
deleted file mode 100644
index 014c37230d..0000000000
--- a/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * The CalDAV scheduling outbox
- *
- * The outbox is mainly used as an endpoint in the tree for a client to do
- * free-busy requests. This functionality is completely handled by the
- * Scheduling plugin, so this object is actually mostly static.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Schedule_Outbox extends Sabre_DAV_Directory implements Sabre_CalDAV_Schedule_IOutbox {
-
-    /**
-     * The principal Uri
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param string $principalUri
-     */
-    public function __construct($principalUri) {
-
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'outbox';
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = array(
-            'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
-        );
-
-        return $default;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
deleted file mode 100644
index 325e3d80a7..0000000000
--- a/3rdparty/Sabre/CalDAV/Server.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * CalDAV server
- *
- * Deprecated! Warning: This class is now officially deprecated
- *
- * This script is a convenience script. It quickly sets up a WebDAV server
- * with caldav and ACL support, and it creates the root 'principals' and
- * 'calendars' collections.
- *
- * Note that if you plan to do anything moderately complex, you are advised to
- * not subclass this server, but use Sabre_DAV_Server directly instead. This
- * class is nothing more than an 'easy setup'.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @deprecated Don't use this class anymore, it will be removed in version 1.7.
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Server extends Sabre_DAV_Server {
-
-    /**
-     * The authentication realm
-     *
-     * Note that if this changes, the hashes in the auth backend must also
-     * be recalculated.
-     *
-     * @var string
-     */
-    public $authRealm = 'SabreDAV';
-
-    /**
-     * Sets up the object. A PDO object must be passed to setup all the backends.
-     *
-     * @param PDO $pdo
-     */
-    public function __construct(PDO $pdo) {
-
-        /* Backends */
-        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
-        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
-        $principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
-
-        /* Directory structure */
-        $tree = array(
-            new Sabre_CalDAV_Principal_Collection($principalBackend),
-            new Sabre_CalDAV_CalendarRootNode($principalBackend, $calendarBackend),
-        );
-
-        /* Initializing server */
-        parent::__construct($tree);
-
-        /* Server Plugins */
-        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,$this->authRealm);
-        $this->addPlugin($authPlugin);
-
-        $aclPlugin = new Sabre_DAVACL_Plugin();
-        $this->addPlugin($aclPlugin);
-
-        $caldavPlugin = new Sabre_CalDAV_Plugin();
-        $this->addPlugin($caldavPlugin);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
deleted file mode 100644
index b8d3f0573f..0000000000
--- a/3rdparty/Sabre/CalDAV/UserCalendars.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-/**
- * The UserCalenders class contains all calendars associated to one user
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal information
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param mixed $userUri
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
-
-        $this->principalBackend = $principalBackend;
-        $this->caldavBackend = $caldavBackend;
-        $this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return Sabre_CalDAV_Calendar
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new Sabre_DAV_Exception_NotFound('Calendar with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Checks if a calendar exists.
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return bool
-     */
-    public function childExists($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return true;
-
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a list of calendars
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-        $objs = array();
-        foreach($calendars as $calendar) {
-            $objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
-        }
-        $objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new calendar
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalInfo['uri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
deleted file mode 100644
index 939e903c89..0000000000
--- a/3rdparty/Sabre/CalDAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the Sabre_CalDAV version constants.
- *
- * @package Sabre
- * @subpackage CalDAV 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.2';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/CalDAV/includes.php b/3rdparty/Sabre/CalDAV/includes.php
deleted file mode 100644
index 1ecb870a0e..0000000000
--- a/3rdparty/Sabre/CalDAV/includes.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Sabre_CalDAV includes file
- *
- * Including this file will automatically include all files from the
- * Sabre_CalDAV package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/Backend/Abstract.php';
-include __DIR__ . '/Backend/PDO.php';
-include __DIR__ . '/CalendarQueryParser.php';
-include __DIR__ . '/CalendarQueryValidator.php';
-include __DIR__ . '/CalendarRootNode.php';
-include __DIR__ . '/ICalendar.php';
-include __DIR__ . '/ICalendarObject.php';
-include __DIR__ . '/ICSExportPlugin.php';
-include __DIR__ . '/Plugin.php';
-include __DIR__ . '/Principal/Collection.php';
-include __DIR__ . '/Principal/ProxyRead.php';
-include __DIR__ . '/Principal/ProxyWrite.php';
-include __DIR__ . '/Principal/User.php';
-include __DIR__ . '/Property/SupportedCalendarComponentSet.php';
-include __DIR__ . '/Property/SupportedCalendarData.php';
-include __DIR__ . '/Property/SupportedCollationSet.php';
-include __DIR__ . '/Schedule/IMip.php';
-include __DIR__ . '/Schedule/IOutbox.php';
-include __DIR__ . '/Schedule/Outbox.php';
-include __DIR__ . '/Server.php';
-include __DIR__ . '/UserCalendars.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/Calendar.php';
-include __DIR__ . '/CalendarObject.php';
-// End includes
diff --git a/3rdparty/Sabre/CardDAV/AddressBook.php b/3rdparty/Sabre/CardDAV/AddressBook.php
deleted file mode 100644
index 3b381e1eea..0000000000
--- a/3rdparty/Sabre/CardDAV/AddressBook.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-
-/**
- * The AddressBook class represents a CardDAV addressbook, owned by a specific user
- *
- * The AddressBook can contain multiple vcards
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * This is an array with addressbook information
-     *
-     * @var array
-     */
-    private $addressBookInfo;
-
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    private $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param array $addressBookInfo
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-
-    }
-
-    /**
-     * Returns the name of the addressbook
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->addressBookInfo['uri'];
-
-    }
-
-    /**
-     * Returns a card
-     *
-     * @param string $name
-     * @return Sabre_DAV_Card
-     */
-    public function getChild($name) {
-
-        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
-        return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of cards
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in addressbooks.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in addressbooks is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid VCARD.
-     *
-     * This method may return an ETag.
-     *
-     * @param string $name
-     * @param resource $vcardData
-     * @return void|null
-     */
-    public function createFile($name,$vcardData = null) {
-
-        $vcardData = stream_get_contents($vcardData);
-        // Converting to UTF-8, if needed
-        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
-
-        return $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
-
-    }
-
-    /**
-     * Deletes the entire addressbook.
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
-
-    }
-
-    /**
-     * Renames the addressbook
-     *
-     * @param string $newName
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming addressbooks is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
-
-    }
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties
-     * @return array
-     */
-    public function getProperties($properties) {
-
-        $response = array();
-        foreach($properties as $propertyName) {
-
-            if (isset($this->addressBookInfo[$propertyName])) {
-
-                $response[$propertyName] = $this->addressBookInfo[$propertyName];
-
-            }
-
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
deleted file mode 100644
index 85a4963127..0000000000
--- a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * Parses the addressbook-query report request body.
- *
- * Whoever designed this format, and the CalDAV equivalent even more so,
- * has no feel for design.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBookQueryParser {
-
-    const TEST_ANYOF = 'anyof';
-    const TEST_ALLOF = 'allof';
-
-    /**
-     * List of requested properties the client wanted
-     *
-     * @var array
-     */
-    public $requestedProperties;
-
-    /**
-     * The number of results the client wants
-     *
-     * null means it wasn't specified, which in most cases means 'all results'.
-     *
-     * @var int|null
-     */
-    public $limit;
-
-    /**
-     * List of property filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * Either TEST_ANYOF or TEST_ALLOF
-     *
-     * @var string
-     */
-    public $test;
-
-    /**
-     * DOM Document
-     *
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     *
-     * @param DOMDocument $dom
-     */
-    public function __construct(DOMDocument $dom) {
-
-        $this->dom = $dom;
-
-        $this->xpath = new DOMXPath($dom);
-        $this->xpath->registerNameSpace('card',Sabre_CardDAV_Plugin::NS_CARDDAV);
-
-    }
-
-    /**
-     * Parses the request.
-     *
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-
-        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
-        if (is_nan($limit)) $limit = null;
-
-        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
-        if ($filter->length !== 1) {
-            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
-        }
-
-        $filter = $filter->item(0);
-        $test = $this->xpath->evaluate('string(@test)', $filter);
-        if (!$test) $test = self::TEST_ANYOF;
-        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
-            throw new Sabre_DAV_Exception_BadRequest('The test attribute must either hold "anyof" or "allof"');
-        }
-
-        $propFilters = array();
-
-        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
-        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
-
-
-        }
-
-        $this->filters = $propFilters;
-        $this->limit = $limit;
-        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
-        $this->test = $test;
-
-    }
-
-    /**
-     * Parses the prop-filter xml element
-     *
-     * @param DOMElement $propFilterNode
-     * @return array
-     */
-    protected function parsePropFilterNode(DOMElement $propFilterNode) {
-
-        $propFilter = array();
-        $propFilter['name'] = $propFilterNode->getAttribute('name');
-        $propFilter['test'] = $propFilterNode->getAttribute('test');
-        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
-
-        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
-
-        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
-
-        $propFilter['param-filters'] = array();
-
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
-
-        }
-        $propFilter['text-matches'] = array();
-        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
-
-        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
-
-            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
-
-        }
-
-        return $propFilter;
-
-    }
-
-    /**
-     * Parses the param-filter element
-     *
-     * @param DOMElement $paramFilterNode
-     * @return array
-     */
-    public function parseParamFilterNode(DOMElement $paramFilterNode) {
-
-        $paramFilter = array();
-        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
-        $paramFilter['text-match'] = null;
-
-        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
-        if ($textMatch->length>0) {
-            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
-        }
-
-        return $paramFilter;
-
-    }
-
-    /**
-     * Text match
-     *
-     * @param DOMElement $textMatchNode
-     * @return array
-     */
-    public function parseTextMatchNode(DOMElement $textMatchNode) {
-
-        $matchType = $textMatchNode->getAttribute('match-type');
-        if (!$matchType) $matchType = 'contains';
-
-        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
-            throw new Sabre_DAV_Exception_BadRequest('Unknown match-type: ' . $matchType);
-        }
-
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;unicode-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'match-type' => $matchType,
-            'value' => $textMatchNode->nodeValue
-        );
-
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
deleted file mode 100644
index 9d37b15f08..0000000000
--- a/3rdparty/Sabre/CardDAV/AddressBookRoot.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * AddressBook rootnode
- *
- * This object lists a collection of users, which can contain addressbooks.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * Principal Backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * This constructor needs both a principal and a carddav backend.
-     *
-     * By default this class will show a list of addressbook collections for
-     * principals in the 'principals' collection. If your main principals are
-     * actually located in a different path, use the $principalPrefix argument
-     * to override this.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalPrefix = 'principals') {
-
-        $this->carddavBackend = $carddavBackend;
-        parent::__construct($principalBackend, $principalPrefix);
-
-    }
-
-    /**
-     * Returns the name of the node
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return Sabre_CardDAV_Plugin::ADDRESSBOOK_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return Sabre_DAV_INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Backend/Abstract.php b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
deleted file mode 100644
index e4806b7161..0000000000
--- a/3rdparty/Sabre/CardDAV/Backend/Abstract.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-/**
- * Abstract Backend class
- *
- * This class serves as a base-class for addressbook backends
- *
- * Note that there are references to 'addressBookId' scattered throughout the
- * class. The value of the addressBookId is completely up to you, it can be any
- * arbitrary value you can use as an unique identifier.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_CardDAV_Backend_Abstract {
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * Every addressbook should have the following properties:
-     *   id - an arbitrary unique id
-     *   uri - the 'basename' part of the url
-     *   principaluri - Same as the passed parameter
-     *
-     * Any additional clark-notation property may be passed besides this. Some
-     * common ones are :
-     *   {DAV:}displayname
-     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
-     *   {http://calendarserver.org/ns/}getctag
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public abstract function getAddressBooksForUser($principalUri);
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre_DAV_IProperties for a description of the mutations array, as
-     * well as the return value.
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public abstract function updateAddressBook($addressBookId, array $mutations);
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return void
-     */
-    abstract public function createAddressBook($principalUri, $url, array $properties);
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param mixed $addressBookId
-     * @return void
-     */
-    abstract public function deleteAddressBook($addressBookId);
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public abstract function getCards($addressbookId);
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public abstract function getCard($addressBookId, $cardUri);
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    abstract public function createCard($addressBookId, $cardUri, $cardData);
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    abstract public function updateCard($addressBookId, $cardUri, $cardData);
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    abstract public function deleteCard($addressBookId, $cardUri);
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Backend/PDO.php b/3rdparty/Sabre/CardDAV/Backend/PDO.php
deleted file mode 100644
index 413a77f3bc..0000000000
--- a/3rdparty/Sabre/CardDAV/Backend/PDO.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-
-/**
- * PDO CardDAV backend
- *
- * This CardDAV backend uses PDO to store addressbooks
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
-
-    /**
-     * PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The PDO table name used to store addressbooks
-     */
-    protected $addressBooksTableName;
-
-    /**
-     * The PDO table name used to store cards
-     */
-    protected $cardsTableName;
-
-    /**
-     * Sets up the object
-     *
-     * @param PDO $pdo
-     * @param string $addressBooksTableName
-     * @param string $cardsTableName
-     */
-    public function __construct(PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
-
-        $this->pdo = $pdo;
-        $this->addressBooksTableName = $addressBooksTableName;
-        $this->cardsTableName = $cardsTableName;
-
-    }
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getAddressBooksForUser($principalUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM '.$this->addressBooksTableName.' WHERE principaluri = ?');
-        $stmt->execute(array($principalUri));
-
-        $addressBooks = array();
-
-        foreach($stmt->fetchAll() as $row) {
-
-            $addressBooks[] = array(
-                'id'  => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{DAV:}displayname' => $row['displayname'],
-                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
-                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
-                    new Sabre_CardDAV_Property_SupportedAddressData(),
-            );
-
-        }
-
-        return $addressBooks;
-
-    }
-
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre_DAV_IProperties for a description of the mutations array, as
-     * well as the return value.
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateAddressBook($addressBookId, array $mutations) {
-
-        $updates = array();
-
-        foreach($mutations as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $updates['displayname'] = $newValue;
-                    break;
-                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $updates['description'] = $newValue;
-                    break;
-                default :
-                    // If any unsupported values were being updated, we must
-                    // let the entire request fail.
-                    return false;
-            }
-
-        }
-
-        // No values are being updated?
-        if (!$updates) {
-            return false;
-        }
-
-        $query = 'UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 ';
-        foreach($updates as $key=>$value) {
-            $query.=', `' . $key . '` = :' . $key . ' ';
-        }
-        $query.=' WHERE id = :addressbookid';
-
-        $stmt = $this->pdo->prepare($query);
-        $updates['addressbookid'] = $addressBookId;
-
-        $stmt->execute($updates);
-
-        return true;
-
-    }
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return void
-     */
-    public function createAddressBook($principalUri, $url, array $properties) {
-
-        $values = array(
-            'displayname' => null,
-            'description' => null,
-            'principaluri' => $principalUri,
-            'uri' => $url,
-        );
-
-        foreach($properties as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $values['displayname'] = $newValue;
-                    break;
-                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $values['description'] = $newValue;
-                    break;
-                default :
-                    throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
-            }
-
-        }
-
-        $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-    }
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param int $addressBookId
-     * @return void
-     */
-    public function deleteAddressBook($addressBookId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
-        $stmt->execute(array($addressBookId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
-        $stmt->execute(array($addressBookId));
-
-    }
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public function getCards($addressbookId) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
-        $stmt->execute(array($addressbookId));
-
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-
-    }
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public function getCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ? LIMIT 1');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-        return (count($result)>0?$result[0]:false);
-
-    }
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function createCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
-
-        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return '"' . md5($cardData) . '"';
-
-    }
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function updateCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('UPDATE ' . $this->cardsTableName . ' SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
-        $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return '"' . md5($cardData) . '"';
-
-    }
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    public function deleteCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ?');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return $stmt->rowCount()===1;
-
-    }
-}
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
deleted file mode 100644
index d7c6633383..0000000000
--- a/3rdparty/Sabre/CardDAV/Card.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-/**
- * The Card object represents a single Card from an addressbook
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
-
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    private $carddavBackend;
-
-    /**
-     * Array with information about this Card
-     *
-     * @var array
-     */
-    private $cardData;
-
-    /**
-     * Array with information about the containing addressbook
-     *
-     * @var array
-     */
-    private $addressBookInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param array $addressBookInfo
-     * @param array $cardData
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo,array $cardData) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-        $this->cardData = $cardData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->cardData['uri'];
-
-    }
-
-    /**
-     * Returns the VCard-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating 'carddata' is optional. If we don't yet have it
-        // already, we fetch it from the backend.
-        if (!isset($this->cardData['carddata'])) {
-            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
-        }
-        return $this->cardData['carddata'];
-
-    }
-
-    /**
-     * Updates the VCard-formatted object
-     *
-     * @param string $cardData
-     * @return void
-     */
-    public function put($cardData) {
-
-        if (is_resource($cardData))
-            $cardData = stream_get_contents($cardData);
-
-        // Converting to UTF-8, if needed
-        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
-
-        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
-        $this->cardData['carddata'] = $cardData;
-        $this->cardData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the card
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/x-vcard';
-
-    }
-
-    /**
-     * Returns an ETag for this object
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->cardData['etag'])) {
-            return $this->cardData['etag'];
-        } else {
-            return '"' . md5($this->get()) . '"';
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return time
-     */
-    public function getLastModified() {
-
-        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size', $this->cardData)) {
-            return $this->cardData['size'];
-        } else {
-            return strlen($this->get());
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
deleted file mode 100644
index 2bc275bcf7..0000000000
--- a/3rdparty/Sabre/CardDAV/IAddressBook.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * AddressBook interface
- *
- * Implement this interface to allow a node to be recognized as an addressbook.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
-
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
deleted file mode 100644
index a17299316c..0000000000
--- a/3rdparty/Sabre/CardDAV/ICard.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Card interface
- *
- * Extend the ICard interface to allow your custom nodes to be picked up as
- * 'Cards'.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_ICard extends Sabre_DAV_IFile {
-
-}
-
diff --git a/3rdparty/Sabre/CardDAV/IDirectory.php b/3rdparty/Sabre/CardDAV/IDirectory.php
deleted file mode 100644
index 22d4afeb24..0000000000
--- a/3rdparty/Sabre/CardDAV/IDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * IDirectory interface
- *
- * Implement this interface to have an addressbook marked as a 'directory'. A
- * directory is an (often) global addressbook.
- *
- * A full description can be found in the IETF draft:
- *   - draft-daboo-carddav-directory-gateway
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
deleted file mode 100644
index 9ebec243eb..0000000000
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-
-/**
- * CardDAV plugin
- *
- * The CardDAV plugin adds CardDAV functionality to the WebDAV server
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Url to the addressbooks
-     */
-    const ADDRESSBOOK_ROOT = 'addressbooks';
-
-    /**
-     * xml namespace for CardDAV elements
-     */
-    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
-
-    /**
-     * Add urls to this property to have them automatically exposed as
-     * 'directories' to the user.
-     *
-     * @var array
-     */
-    public $directories = array();
-
-    /**
-     * Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        /* Events */
-        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
-        $server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
-        $server->subscribeEvent('report', array($this,'report'));
-        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
-        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
-
-        /* Namespaces */
-        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
-
-        /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
-        $server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
-
-        /* Adding properties that may never be changed */
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
-
-        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre_DAV_Property_Href';
-
-        $this->server = $server;
-
-    }
-
-    /**
-     * Returns a list of supported features.
-     *
-     * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('addressbook');
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_CardDAV_IAddressBook || $node instanceof Sabre_CardDAV_ICard) {
-            return array(
-                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
-                 '{' . self::NS_CARDDAV . '}addressbook-query',
-            );
-        }
-        return array();
-
-    }
-
-
-    /**
-     * Adds all CardDAV-specific properties
-     *
-     * @param string $path
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) {
-
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            // calendar-home-set property
-            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-            if (in_array($addHome,$requestedProperties)) {
-                $principalId = $node->getName();
-                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
-                $returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
-            }
-
-            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
-            if ($this->directories && in_array($directories, $requestedProperties)) {
-                unset($requestedProperties[array_search($directories, $requestedProperties)]);
-                $returnedProperties[200][$directories] = new Sabre_DAV_Property_HrefList($this->directories);
-            }
-
-        }
-
-        if ($node instanceof Sabre_CardDAV_ICard) {
-
-            // The address-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
-            if (in_array($addressDataProp, $requestedProperties)) {
-                unset($requestedProperties[$addressDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-        if ($node instanceof Sabre_CardDAV_UserAddressBooks) {
-
-            $meCardProp = '{http://calendarserver.org/ns/}me-card';
-            if (in_array($meCardProp, $requestedProperties)) {
-
-                $props = $this->server->getProperties($node->getOwner(), array('{http://sabredav.org/ns}vcard-url'));
-                if (isset($props['{http://sabredav.org/ns}vcard-url'])) {
-
-                    $returnedProperties[200][$meCardProp] = new Sabre_DAV_Property_Href(
-                        $props['{http://sabredav.org/ns}vcard-url']
-                    );
-                    $pos = array_search($meCardProp, $requestedProperties);
-                    unset($requestedProperties[$pos]);
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This event is triggered when a PROPPATCH method is executed
-     *
-     * @param array $mutations
-     * @param array $result
-     * @param Sabre_DAV_INode $node
-     * @return void
-     */
-    public function updateProperties(&$mutations, &$result, $node) {
-
-        if (!$node instanceof Sabre_CardDAV_UserAddressBooks) {
-            return true;
-        }
-
-        $meCard = '{http://calendarserver.org/ns/}me-card';
-
-        // The only property we care about
-        if (!isset($mutations[$meCard]))
-            return true;
-
-        $value = $mutations[$meCard];
-        unset($mutations[$meCard]);
-
-        if ($value instanceof Sabre_DAV_Property_IHref) {
-            $value = $value->getHref();
-            $value = $this->server->calculateUri($value);
-        } elseif (!is_null($value)) {
-            $result[400][$meCard] = null;
-            return false;
-        }
-
-        $innerResult = $this->server->updateProperties(
-            $node->getOwner(),
-            array(
-                '{http://sabredav.org/ns}vcard-url' => $value,
-            )
-        );
-
-        $closureResult = false;
-        foreach($innerResult as $status => $props) {
-            if (is_array($props) && array_key_exists('{http://sabredav.org/ns}vcard-url', $props)) {
-                $result[$status][$meCard] = null;
-                $closureResult = ($status>=200 && $status<300);
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CardDAV
-     *
-     * @param string $reportName
-     * @param DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) {
-            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
-                $this->addressbookMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CARDDAV.'}addressbook-query' :
-                $this->addressBookQueryReport($dom);
-                return false;
-            default :
-                return;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the addressbook-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function addressbookMultiGetReport($dom) {
-
-        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-        $propertyList = array();
-
-        foreach($hrefElems as $elem) {
-
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
-
-    }
-
-    /**
-     * This function handles the addressbook-query REPORT
-     *
-     * This report is used by the client to filter an addressbook based on a
-     * complex query.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    protected function addressbookQueryReport($dom) {
-
-        $query = new Sabre_CardDAV_AddressBookQueryParser($dom);
-        $query->parse();
-
-        $depth = $this->server->getHTTPDepth(0);
-
-        if ($depth==0) {
-            $candidateNodes = array(
-                $this->server->tree->getNodeForPath($this->server->getRequestUri())
-            );
-        } else {
-            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
-        }
-
-        $validNodes = array();
-        foreach($candidateNodes as $node) {
-
-            if (!$node instanceof Sabre_CardDAV_ICard)
-                continue;
-
-            $blob = $node->get();
-            if (is_resource($blob)) {
-                $blob = stream_get_contents($blob);
-            }
-
-            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
-                continue;
-            }
-
-            $validNodes[] = $node;
-
-            if ($query->limit && $query->limit <= count($validNodes)) {
-                // We hit the maximum number of items, we can stop now.
-                break;
-            }
-
-        }
-
-        $result = array();
-        foreach($validNodes as $validNode) {
-
-            if ($depth==0) {
-                $href = $this->server->getRequestUri();
-            } else {
-                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
-            }
-
-            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
-
-    }
-
-    /**
-     * Validates if a vcard makes it throught a list of filters.
-     *
-     * @param string $vcardData
-     * @param array $filters
-     * @param string $test anyof or allof (which means OR or AND)
-     * @return bool
-     */
-    public function validateFilters($vcardData, array $filters, $test) {
-
-        $vcard = Sabre_VObject_Reader::read($vcardData);
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($vcard->{$filter['name']});
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
-
-                // We only need to check for existence
-                $success = $isDefined;
-
-            } else {
-
-                $vProperties = $vcard->select($filter['name']);
-
-                $results = array();
-                if ($filter['param-filters']) {
-                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
-                }
-                if ($filter['text-matches']) {
-                    $texts = array();
-                    foreach($vProperties as $vProperty)
-                        $texts[] = $vProperty->value;
-
-                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
-                }
-
-                if (count($results)===1) {
-                    $success = $results[0];
-                } else {
-                    if ($filter['test'] === 'anyof') {
-                        $success = $results[0] || $results[1];
-                    } else {
-                        $success = $results[0] && $results[1];
-                    }
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        } // foreach
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a param-filter can be applied to a specific property.
-     *
-     * @todo currently we're only validating the first parameter of the passed
-     *       property. Any subsequence parameters with the same name are
-     *       ignored.
-     * @param array $vProperties
-     * @param array $filters
-     * @param string $test
-     * @return bool
-     */
-    protected function validateParamFilters(array $vProperties, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = false;
-            foreach($vProperties as $vProperty) {
-                $isDefined = isset($vProperty[$filter['name']]);
-                if ($isDefined) break;
-            }
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-
-            // If there's no text-match, we can just check for existence
-            } elseif (!$filter['text-match'] || !$isDefined) {
-
-                $success = $isDefined;
-
-            } else {
-
-                $success = false;
-                foreach($vProperties as $vProperty) {
-                    // If we got all the way here, we'll need to validate the
-                    // text-match filter.
-                    $success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
-                    if ($success) break;
-                }
-                if ($filter['text-match']['negate-condition']) {
-                    $success = !$success;
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a text-filter can be applied to a specific property.
-     *
-     * @param array $texts
-     * @param array $filters
-     * @param string $test
-     * @return bool
-     */
-    protected function validateTextMatches(array $texts, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $success = false;
-            foreach($texts as $haystack) {
-                $success = Sabre_DAV_StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
-
-                // Breaking on the first match
-                if ($success) break;
-            }
-            if ($filter['negate-condition']) {
-                $success = !$success;
-            }
-
-            if ($success && $test==='anyof')
-                return true;
-
-            if (!$success && $test=='allof')
-                return false;
-
-
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param Sabre_DAV_INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
-
-        if (!$node instanceof Sabre_CardDAV_UserAddressBooks)
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new address book</h3>
-            <input type="hidden" name="sabreAction" value="mkaddressbook" />
-            <label>Name (uri):</label> <input type="text" name="name" /><br />
-            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
-            <input type="submit" value="create" />
-            </form>
-            </td></tr>';
-
-        return false;
-
-    }
-
-    /**
-     * This method allows us to intercept the 'mkcalendar' sabreAction. This
-     * action enables the user to create new calendars from the browser plugin.
-     *
-     * @param string $uri
-     * @param string $action
-     * @param array $postVars
-     * @return bool
-     */
-    public function browserPostAction($uri, $action, array $postVars) {
-
-        if ($action!=='mkaddressbook')
-            return;
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:carddav}addressbook');
-        $properties = array();
-        if (isset($postVars['{DAV:}displayname'])) {
-            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
-        }
-        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
deleted file mode 100644
index 36d9306e7a..0000000000
--- a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Supported-address-data property
- *
- * This property is a representation of the supported-address-data property
- * in the CardDAV namespace.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
-
-    /**
-     * supported versions
-     *
-     * @var array
-     */
-    protected $supportedData = array();
-
-    /**
-     * Creates the property
-     *
-     * @param array|null $supportedData
-     */
-    public function __construct(array $supportedData = null) {
-
-        if (is_null($supportedData)) {
-            $supportedData = array(
-                array('contentType' => 'text/vcard', 'version' => '3.0'),
-                array('contentType' => 'text/vcard', 'version' => '4.0'),
-            );
-        }
-
-       $this->supportedData = $supportedData;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix =
-            isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
-            $server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
-            'card';
-
-        foreach($this->supportedData as $supported) {
-
-            $caldata = $doc->createElementNS(Sabre_CardDAV_Plugin::NS_CARDDAV, $prefix . ':address-data-type');
-            $caldata->setAttribute('content-type',$supported['contentType']);
-            $caldata->setAttribute('version',$supported['version']);
-            $node->appendChild($caldata);
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
deleted file mode 100644
index 3f11fb1123..0000000000
--- a/3rdparty/Sabre/CardDAV/UserAddressBooks.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/**
- * UserAddressBooks class
- *
- * The UserAddressBooks collection contains a list of addressbooks associated with a user
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
-    /**
-     * Principal uri
-     *
-     * @var array
-     */
-    protected $principalUri;
-
-    /**
-     * carddavBackend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param string $principalUri
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return Sabre_CardDAV_AddressBook
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new Sabre_DAV_Exception_NotFound('Addressbook with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Returns a list of addressbooks
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
-        $objs = array();
-        foreach($addressbooks as $addressbook) {
-            $objs[] = new Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new addressbook
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{'.Sabre_CardDAV_Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
deleted file mode 100644
index 811b929e39..0000000000
--- a/3rdparty/Sabre/CardDAV/Version.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Version Class
- *
- * This class contains the Sabre_CardDAV version information
- *
- * @package Sabre
- * @subpackage CardDAV 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.1';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/CardDAV/includes.php b/3rdparty/Sabre/CardDAV/includes.php
deleted file mode 100644
index c3b8c04b07..0000000000
--- a/3rdparty/Sabre/CardDAV/includes.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_CardDAV includes file
- *
- * Including this file will automatically include all files from the
- * Sabre_CardDAV package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/AddressBookQueryParser.php';
-include __DIR__ . '/AddressBookRoot.php';
-include __DIR__ . '/Backend/Abstract.php';
-include __DIR__ . '/Backend/PDO.php';
-include __DIR__ . '/IAddressBook.php';
-include __DIR__ . '/ICard.php';
-include __DIR__ . '/IDirectory.php';
-include __DIR__ . '/Plugin.php';
-include __DIR__ . '/Property/SupportedAddressData.php';
-include __DIR__ . '/UserAddressBooks.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/AddressBook.php';
-include __DIR__ . '/Card.php';
-// End includes
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
deleted file mode 100644
index 1e89b84f9a..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * HTTP Basic authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Basic
- * Most of the digest logic is handled, implementors just need to worry about
- * the validateUserPass method.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author James David Low (http://jameslow.com/)
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var string|null
-     */
-    protected $currentUser;
-
-    /**
-     * Validates a username and password
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     */
-    abstract protected function validateUserPass($username, $password);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-        return $this->currentUser;
-    }
-
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server, $realm) {
-
-        $auth = new Sabre_HTTP_BasicAuth();
-        $auth->setHTTPRequest($server->httpRequest);
-        $auth->setHTTPResponse($server->httpResponse);
-        $auth->setRealm($realm);
-        $userpass = $auth->getUserPass();
-        if (!$userpass) {
-            $auth->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
-        }
-
-        // Authenticates the user
-        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
-            $auth->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
-        }
-        $this->currentUser = $userpass[0];
-        return true;
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
deleted file mode 100644
index 9833928b97..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * HTTP Digest authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Digest
- * Most of the digest logic is handled, implementors just need to worry about
- * the getDigestHash method
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var array|null
-     */
-    protected $currentUser;
-
-    /**
-     * Returns a users digest hash based on the username and realm.
-     *
-     * If the user was not known, null must be returned.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    abstract public function getDigestHash($realm, $username);
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server, $realm) {
-
-        $digest = new Sabre_HTTP_DigestAuth();
-
-        // Hooking up request and response objects
-        $digest->setHTTPRequest($server->httpRequest);
-        $digest->setHTTPResponse($server->httpResponse);
-
-        $digest->setRealm($realm);
-        $digest->init();
-
-        $username = $digest->getUsername();
-
-        // No username was given
-        if (!$username) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
-        }
-
-        $hash = $this->getDigestHash($realm, $username);
-        // If this was false, the user account didn't exist
-        if ($hash===false || is_null($hash)) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
-        }
-        if (!is_string($hash)) {
-            throw new Sabre_DAV_Exception('The returned value from getDigestHash must be a string or null');
-        }
-
-        // If this was false, the password or part of the hash was incorrect.
-        if (!$digest->validateA1($hash)) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
-        }
-
-        $this->currentUser = $username;
-        return true;
-
-    }
-
-    /**
-     * Returns the currently logged in username.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        return $this->currentUser;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
deleted file mode 100644
index d4294ea4d8..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Apache authenticator
- *
- * This authentication backend assumes that authentication has been
- * configured in apache, rather than within SabreDAV.
- *
- * Make sure apache is properly configured for this to work.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * Current apache user
-     *
-     * @var string
-     */
-    protected $remoteUser;
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server, $realm) {
-
-        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
-        if (is_null($remoteUser)) {
-            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
-        }
-
-        $this->remoteUser = $remoteUser;
-        return true;
-
-    }
-
-    /**
-     * Returns information about the currently logged in user.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return array|null
-     */
-    public function getCurrentUser() {
-
-        return $this->remoteUser;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
deleted file mode 100644
index de308d64a6..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/File.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
-
-    /**
-     * List of users
-     *
-     * @var array
-     */
-    protected $users = array();
-
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     *
-     * @param string|null $filename
-     */
-    public function __construct($filename=null) {
-
-        if (!is_null($filename))
-            $this->loadFile($filename);
-
-    }
-
-    /**
-     * Loads an htdigest-formatted file. This method can be called multiple times if
-     * more than 1 file is used.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function loadFile($filename) {
-
-        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
-
-            if (substr_count($line, ":") !== 2)
-                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
-
-            list($username,$realm,$A1) = explode(':',$line);
-
-            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
-                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
-
-            $this->users[$realm . ':' . $username] = $A1;
-
-        }
-
-    }
-
-    /**
-     * Returns a users' information
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string
-     */
-    public function getDigestHash($realm, $username) {
-
-        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
deleted file mode 100644
index eac18a23fb..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
-
-    /**
-     * Reference to PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name we'll be using
-     *
-     * @var string
-     */
-    protected $tableName;
-
-
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     *
-     * @param PDO $pdo
-     * @param string $tableName The PDO table name to use
-     */
-    public function __construct(PDO $pdo, $tableName = 'users') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns the digest hash for a user.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    public function getDigestHash($realm,$username) {
-
-        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?');
-        $stmt->execute(array($username));
-        $result = $stmt->fetchAll();
-
-        if (!count($result)) return;
-
-        return $result[0]['digesta1'];
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
deleted file mode 100644
index 5be5d1bc93..0000000000
--- a/3rdparty/Sabre/DAV/Auth/IBackend.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * This is the base class for any authentication object.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_Auth_IBackend {
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @return bool
-     */
-    function authenticate(Sabre_DAV_Server $server,$realm);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    function getCurrentUser();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
deleted file mode 100644
index 55a4e39167..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Plugin.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * This plugin provides Authentication for a WebDAV server.
- *
- * It relies on a Backend object, which provides user information.
- *
- * Additionally, it provides support for:
- *  * {DAV:}current-user-principal property from RFC5397
- *  * {DAV:}principal-collection-set property from RFC3744
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to main server object
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Authentication backend
-     *
-     * @var Sabre_DAV_Auth_IBackend
-     */
-    private $authBackend;
-
-    /**
-     * The authentication realm.
-     *
-     * @var string
-     */
-    private $realm;
-
-    /**
-     * __construct
-     *
-     * @param Sabre_DAV_Auth_IBackend $authBackend
-     * @param string $realm
-     */
-    public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
-
-        $this->authBackend = $authBackend;
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Initializes the plugin. This function is automatically called by the server
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'auth';
-
-    }
-
-    /**
-     * Returns the current users' principal uri.
-     *
-     * If nobody is logged in, this will return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        $userInfo = $this->authBackend->getCurrentUser();
-        if (!$userInfo) return null;
-
-        return $userInfo;
-
-    }
-
-    /**
-     * This method is called before any HTTP method and forces users to be authenticated
-     *
-     * @param string $method
-     * @param string $uri
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        $this->authBackend->authenticate($this->server,$this->realm);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
deleted file mode 100644
index b6c00d461c..0000000000
--- a/3rdparty/Sabre/DAV/Browser/GuessContentType.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * GuessContentType plugin
- *
- * A lot of the built-in File objects just return application/octet-stream
- * as a content-type by default. This is a problem for some clients, because
- * they expect a correct contenttype.
- *
- * There's really no accurate, fast and portable way to determine the contenttype
- * so this extension does what the rest of the world does, and guesses it based
- * on the file extension.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * List of recognized file extensions
-     *
-     * Feel free to add more
-     *
-     * @var array
-     */
-    public $extensionMap = array(
-
-        // images
-        'jpg' => 'image/jpeg',
-        'gif' => 'image/gif',
-        'png' => 'image/png',
-
-        // groupware
-        'ics' => 'text/calendar',
-        'vcf' => 'text/x-vcard',
-
-        // text
-        'txt' => 'text/plain',
-
-    );
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        // Using a relatively low priority (200) to allow other extensions
-        // to set the content-type first.
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
-
-    }
-
-    /**
-     * Handler for teh afterGetProperties event
-     *
-     * @param string $path
-     * @param array $properties
-     * @return void
-     */
-    public function afterGetProperties($path, &$properties) {
-
-        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
-
-            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
-            $contentType = $this->getContentType($fileName);
-
-            if ($contentType) {
-                $properties[200]['{DAV:}getcontenttype'] = $contentType;
-                unset($properties[404]['{DAV:}getcontenttype']);
-            }
-
-        }
-
-    }
-
-    /**
-     * Simple method to return the contenttype
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function getContentType($fileName) {
-
-        // Just grabbing the extension
-        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
-        if (isset($this->extensionMap[$extension]))
-            return $this->extensionMap[$extension];
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
deleted file mode 100644
index 1588488764..0000000000
--- a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This is a simple plugin that will map any GET request for non-files to
- * PROPFIND allprops-requests.
- *
- * This should allow easy debugging of PROPFIND
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * reference to server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-    }
-
-    /**
-     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method!='GET') return true;
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_DAV_IFile) return;
-
-        $this->server->invokeMethod('PROPFIND',$uri);
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
deleted file mode 100644
index 09bbdd2ae0..0000000000
--- a/3rdparty/Sabre/DAV/Browser/Plugin.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-
-/**
- * Browser Plugin
- *
- * This plugin provides a html representation, so that a WebDAV server may be accessed
- * using a browser.
- *
- * The class intercepts GET requests to collection resources and generates a simple
- * html index.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * List of default icons for nodes.
-     *
-     * This is an array with class / interface names as keys, and asset names
-     * as values.
-     *
-     * The evaluation order is reversed. The last item in the list gets
-     * precendence.
-     *
-     * @var array
-     */
-    public $iconMap = array(
-        'Sabre_DAV_IFile' => 'icons/file',
-        'Sabre_DAV_ICollection' => 'icons/collection',
-        'Sabre_DAVACL_IPrincipal' => 'icons/principal',
-        'Sabre_CalDAV_ICalendar' => 'icons/calendar',
-        'Sabre_CardDAV_IAddressBook' => 'icons/addressbook',
-        'Sabre_CardDAV_ICard' => 'icons/card',
-    );
-
-    /**
-     * The file extension used for all icons
-     *
-     * @var string
-     */
-    public $iconExtension = '.png';
-
-    /**
-     * reference to server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * enablePost turns on the 'actions' panel, which allows people to create
-     * folders and upload files straight from a browser.
-     *
-     * @var bool
-     */
-    protected $enablePost = true;
-
-    /**
-     * By default the browser plugin will generate a favicon and other images.
-     * To turn this off, set this property to false.
-     *
-     * @var bool
-     */
-    protected $enableAssets = true;
-
-    /**
-     * Creates the object.
-     *
-     * By default it will allow file creation and uploads.
-     * Specify the first argument as false to disable this
-     *
-     * @param bool $enablePost
-     * @param bool $enableAssets
-     */
-    public function __construct($enablePost=true, $enableAssets = true) {
-
-        $this->enablePost = $enablePost;
-        $this->enableAssets = $enableAssets;
-
-    }
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-        $this->server->subscribeEvent('onHTMLActionsPanel', array($this, 'htmlActionsPanel'),200);
-        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
-    }
-
-    /**
-     * This method intercepts GET requests to collections and returns the html
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method !== 'GET') return true;
-
-        // We're not using straight-up $_GET, because we want everything to be
-        // unit testable.
-        $getVars = array();
-        parse_str($this->server->httpRequest->getQueryString(), $getVars);
-
-        if (isset($getVars['sabreAction']) && $getVars['sabreAction'] === 'asset' && isset($getVars['assetName'])) {
-            $this->serveAsset($getVars['assetName']);
-            return false;
-        }
-
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            // We're simply stopping when the file isn't found to not interfere
-            // with other plugins.
-            return;
-        }
-        if ($node instanceof Sabre_DAV_IFile)
-            return;
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
-
-        $this->server->httpResponse->sendBody(
-            $this->generateDirectoryIndex($uri)
-        );
-
-        return false;
-
-    }
-
-    /**
-     * Handles POST requests for tree operations.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpPOSTHandler($method, $uri) {
-
-        if ($method!='POST') return;
-        $contentType = $this->server->httpRequest->getHeader('Content-Type');
-        list($contentType) = explode(';', $contentType);
-        if ($contentType !== 'application/x-www-form-urlencoded' &&
-            $contentType !== 'multipart/form-data') {
-                return;
-        }
-        $postVars = $this->server->httpRequest->getPostVars();
-
-        if (!isset($postVars['sabreAction']))
-            return;
-
-        if ($this->server->broadcastEvent('onBrowserPostAction', array($uri, $postVars['sabreAction'], $postVars))) {
-
-            switch($postVars['sabreAction']) {
-
-                case 'mkcol' :
-                    if (isset($postVars['name']) && trim($postVars['name'])) {
-                        // Using basename() because we won't allow slashes
-                        list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($postVars['name']));
-                        $this->server->createDirectory($uri . '/' . $folderName);
-                    }
-                    break;
-                case 'put' :
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
-
-                    list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
-
-                    // Making sure we only have a 'basename' component
-                    list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
-
-                    if (is_uploaded_file($file['tmp_name'])) {
-                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'],'r'));
-                    }
-                    break;
-
-            }
-
-        }
-        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
-        $this->server->httpResponse->sendStatus(302);
-        return false;
-
-    }
-
-    /**
-     * Escapes a string for html.
-     *
-     * @param string $value
-     * @return string
-     */
-    public function escapeHTML($value) {
-
-        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
-
-    }
-
-    /**
-     * Generates the html directory index for a given url
-     *
-     * @param string $path
-     * @return string
-     */
-    public function generateDirectoryIndex($path) {
-
-        $version = '';
-        if (Sabre_DAV_Server::$exposeVersion) {
-            $version = Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY;
-        }
-
-        $html = "<html>
-<head>
-  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . $version . "</title>
-  <style type=\"text/css\">
-  body { Font-family: arial}
-  h1 { font-size: 150% }
-  </style>
-        ";
-
-        if ($this->enableAssets) {
-            $html.='<link rel="shortcut icon" href="'.$this->getAssetUrl('favicon.ico').'" type="image/vnd.microsoft.icon" />';
-        }
-
-        $html .= "</head>
-<body>
-  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
-  <table>
-    <tr><th width=\"24\"></th><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
-    <tr><td colspan=\"5\"><hr /></td></tr>";
-
-        $files = $this->server->getPropertiesForPath($path,array(
-            '{DAV:}displayname',
-            '{DAV:}resourcetype',
-            '{DAV:}getcontenttype',
-            '{DAV:}getcontentlength',
-            '{DAV:}getlastmodified',
-        ),1);
-
-        $parent = $this->server->tree->getNodeForPath($path);
-
-
-        if ($path) {
-
-            list($parentUri) = Sabre_DAV_URLUtil::splitPath($path);
-            $fullPath = Sabre_DAV_URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
-
-            $icon = $this->enableAssets?'<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl('icons/parent' . $this->iconExtension) . '" width="24" alt="Parent" /></a>':'';
-            $html.= "<tr>
-    <td>$icon</td>
-    <td><a href=\"{$fullPath}\">..</a></td>
-    <td>[parent]</td>
-    <td></td>
-    <td></td>
-    </tr>";
-
-        }
-
-        foreach($files as $file) {
-
-            // This is the current directory, we can skip it
-            if (rtrim($file['href'],'/')==$path) continue;
-
-            list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
-
-            $type = null;
-
-
-            if (isset($file[200]['{DAV:}resourcetype'])) {
-                $type = $file[200]['{DAV:}resourcetype']->getValue();
-
-                // resourcetype can have multiple values
-                if (!is_array($type)) $type = array($type);
-
-                foreach($type as $k=>$v) {
-
-                    // Some name mapping is preferred
-                    switch($v) {
-                        case '{DAV:}collection' :
-                            $type[$k] = 'Collection';
-                            break;
-                        case '{DAV:}principal' :
-                            $type[$k] = 'Principal';
-                            break;
-                        case '{urn:ietf:params:xml:ns:carddav}addressbook' :
-                            $type[$k] = 'Addressbook';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}calendar' :
-                            $type[$k] = 'Calendar';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
-                            $type[$k] = 'Schedule Inbox';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
-                            $type[$k] = 'Schedule Outbox';
-                            break;
-                        case '{http://calendarserver.org/ns/}calendar-proxy-read' :
-                            $type[$k] = 'Proxy-Read';
-                            break;
-                        case '{http://calendarserver.org/ns/}calendar-proxy-write' :
-                            $type[$k] = 'Proxy-Write';
-                            break;
-                    }
-
-                }
-                $type = implode(', ', $type);
-            }
-
-            // If no resourcetype was found, we attempt to use
-            // the contenttype property
-            if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
-                $type = $file[200]['{DAV:}getcontenttype'];
-            }
-            if (!$type) $type = 'Unknown';
-
-            $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
-            $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
-
-            $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
-
-            $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
-
-            $displayName = $this->escapeHTML($displayName);
-            $type = $this->escapeHTML($type);
-
-            $icon = '';
-
-            if ($this->enableAssets) {
-                $node = $parent->getChild($name);
-                foreach(array_reverse($this->iconMap) as $class=>$iconName) {
-
-                    if ($node instanceof $class) {
-                        $icon = '<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl($iconName . $this->iconExtension) . '" alt="" width="24" /></a>';
-                        break;
-                    }
-
-
-                }
-
-            }
-
-            $html.= "<tr>
-    <td>$icon</td>
-    <td><a href=\"{$fullPath}\">{$displayName}</a></td>
-    <td>{$type}</td>
-    <td>{$size}</td>
-    <td>{$lastmodified}</td>
-    </tr>";
-
-        }
-
-        $html.= "<tr><td colspan=\"5\"><hr /></td></tr>";
-
-        $output = '';
-
-        if ($this->enablePost) {
-            $this->server->broadcastEvent('onHTMLActionsPanel',array($parent, &$output));
-        }
-
-        $html.=$output;
-
-        $html.= "</table>
-        <address>Generated by SabreDAV " . $version . " (c)2007-2012 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
-        </body>
-        </html>";
-
-        return $html;
-
-    }
-
-    /**
-     * This method is used to generate the 'actions panel' output for
-     * collections.
-     *
-     * This specifically generates the interfaces for creating new files, and
-     * creating new directories.
-     *
-     * @param Sabre_DAV_INode $node
-     * @param mixed $output
-     * @return void
-     */
-    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
-
-        if (!$node instanceof Sabre_DAV_ICollection)
-            return;
-
-        // We also know fairly certain that if an object is a non-extended
-        // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node)==='Sabre_DAV_SimpleCollection')
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new folder</h3>
-            <input type="hidden" name="sabreAction" value="mkcol" />
-            Name: <input type="text" name="name" /><br />
-            <input type="submit" value="create" />
-            </form>
-            <form method="post" action="" enctype="multipart/form-data">
-            <h3>Upload file</h3>
-            <input type="hidden" name="sabreAction" value="put" />
-            Name (optional): <input type="text" name="name" /><br />
-            File: <input type="file" name="file" /><br />
-            <input type="submit" value="upload" />
-            </form>
-            </td></tr>';
-
-    }
-
-    /**
-     * This method takes a path/name of an asset and turns it into url
-     * suiteable for http access.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getAssetUrl($assetName) {
-
-        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
-
-    }
-
-    /**
-     * This method returns a local pathname to an asset.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getLocalAssetPath($assetName) {
-
-        // Making sure people aren't trying to escape from the base path.
-        $assetSplit = explode('/', $assetName);
-        if (in_array('..',$assetSplit)) {
-            throw new Sabre_DAV_Exception('Incorrect asset path');
-        }
-        $path = __DIR__ . '/assets/' . $assetName;
-        return $path;
-
-    }
-
-    /**
-     * This method reads an asset from disk and generates a full http response.
-     *
-     * @param string $assetName
-     * @return void
-     */
-    protected function serveAsset($assetName) {
-
-        $assetPath = $this->getLocalAssetPath($assetName);
-        if (!file_exists($assetPath)) {
-            throw new Sabre_DAV_Exception_NotFound('Could not find an asset with this name');
-        }
-        // Rudimentary mime type detection
-        switch(strtolower(substr($assetPath,strpos($assetPath,'.')+1))) {
-
-        case 'ico' :
-            $mime = 'image/vnd.microsoft.icon';
-            break;
-
-        case 'png' :
-            $mime = 'image/png';
-            break;
-
-        default:
-            $mime = 'application/octet-stream';
-            break;
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type', $mime);
-        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
-        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody(fopen($assetPath,'r'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/assets/favicon.ico b/3rdparty/Sabre/DAV/Browser/assets/favicon.ico
deleted file mode 100644
index 2b2c10a22cc7a57c4dc5d7156f184448f2bee92b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmc&&O-NKx6uz%14NNBzA}E}JHil3^6a|4&P_&6!RGSD}1rgCAC@`9dTC_@vqNoT8
z0%;dQR0K_{iUM;bf#3*%o1h^C2N7@IH_nmc?Va~t5U6~f`_BE&`Of`&_n~tUev3uN
zziw!)bL*XR-2hy!51_yCgT8fb3s`VC=e=KcI5&)PGGQlpSAh?}1mK&Pg8c>z0Y`y$
zAT_6qJ%yV?|0!S$5WO@z3+`QD17OyXL4PyiM}RavtA7Tu7p)pn^p7Ks@m6m7)A}X$
z4Y+@;NrHYq_;V@RoZ|;69MPx!46Ftg*Tc~711C+J`JMuUfYwNBzXPB9sZm3WK9272
z&x|>@f_E<?SJ!n3F_!+bjQL(SbG*pN*ZN$yjf@Y*UxY8qyfdC$j-dkR++q8Z(SMuq
zfqvGxyvf)mCXM`3#|fi<8vgb`|A)bqT(si=-rx;=+NAlS2KT#;*X?6Ue@g;SVmR+T
zfQ)^2O3afcmvu-EZSO1nlLklg`<wYhpZi$%hi%qJ?r(!Ps`Lj8j^tcCGtHdL`!ONr
zi{e@OQ%awEO0+_IL*<gO^ZX>O{b3cubqjOyc~<H3P7OIT@bL~1O>J3I$d_lHIpN}q
z!{kjX{c{12XF=~Z$w$kazXHB!b53>u!rx}_$e&dD`xNgv+MR&p2yN1xb0>&9t@28Z
zV&5u#j_D=P9mI#){2s8@eGGj(?>gooo<%RT14>`VSZ&_l6GlGnan=^bemD56rRN{?
zSAqZD$i;oS9SF6#f5I`#^C<Zl_1nO;w0X9AnJWgj;1j*j9wa}5KIfFRhVgvn8Q25F
zX>&hW@13s_lc3LUl(PWmHcop2{vr^kO`kP(*4!m=3Hn3e#Oc!a2;iDn+FbXzcOHEQ
zbX<Zy_d4fE*T6CF*YPoJ)-?|3IJT*M2v|~cf<AdX%Z~xh*?E9xU`c%NY@HE)qwET}
zjXWv(qQ$)+ZOgLOSAZTj_YS|Q%(cp>Z)u93cj1WA=KS+M>jZ=oYyXq}1?ZdsjsX0A
zkJXCvi~cfO@2ffd7r^;>=SsL-3U%l5HRoEZ#0r<I5G^jMtaMR%O%#<k0ef>%`7%&%
ziLTXJqU*JeXt3H5`AS#h(dpfl+`Ox|)*~QS%h&VO!d#)!>r3U5_YsDi2fY6Sd&vw%

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png b/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
deleted file mode 100644
index c9acc84172dad59708b6b298b310b8d29eeeb671..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7232
zcmeHMXH=70vktu%m8u{iNEJu|p@k-dE<u_!K?q3*p(L0D2_BRpphyQ15tSlQ1VO|G
zf`C*HN)bd3NH2m&6-0`{4e0T3);)gSANTurvR2l+=bf2nW<N7~*4pchv9>bh;oQp!
z004N*&5Ug6PsrAvofQCJ0J8kPi!O*#jGZWUL@!DZii8CiV2GYrpt(N^hqc9`Fu^B&
z$Li3XlkoOV6epx598L6BMs3+BQ~d+z-T;7(J~aS^_Qg_wo>&~7pbMI-s0IP?7+sK~
z8WMsGKw!P`W~WG4yHi&7=u^IEEeuFsk5h*Vrvvz7DJUS--;Y3sQ*}YxxN!P<>ophz
z+%}>3>Vm!{<%F~bB8Vg`5T>l6tfGX5sH+0iRFzfLRMb^qia-?zL=z0r0INcjpqg-q
z8XN`%e*b~=IDtAOj2GP2$mDxCx}*#8rceUlU~o`SkaCc!GLeJ>L$$QDzz`L%ii#55
zLWvwqprEKq1hUi?#5W8hEE!G02T<@t0&oix<w*>r=z>6WJ@7j?2K@s&Aduv@jf_Eq
zv3^*8EP+A>LzSW6o%VDlZ1Fg63i*c{f&86iI^SR_DuC_+0h6|E{^l9rO{5UX-o$`^
z_WYsV_TL%OJb;3R(c^9r`oovLEA)1<WC{kn(_-6wyH4Mt|410_i1oCipeWlL`+?)>
zN5s+d$KcTvEQUfv6TQ5!SY-@$JAofL!3_c_-b51Fnn=cPu}SA}i)5e<1`YqV)ot+`
z>jr+5Z_+o>55Gk<+z&;->4K<A7_1j6(2oMrtG)fb<XaCJDXM|?R$piVJ%fQq{O~8S
zB%nRL%`wCvvM*i-yj4Cw{P!r^(w|{;z<*C-D<?Dwi=q%oJCd@)p7?uGdjF>&f4Xf4
z*@?Opg@UK}VRyv%Go$a__mho-f4Ygk@O1vF+EFt7eA{D5{^b9!NI%8a+1W>M#5WER
zMEbcxQ_Klo#O-7AcN@F`hGa~opfIFAkJbOyBk+{qpKERDlW4o4eu8d|CSvGq|Ls8h
z12~2BGjMyXpCge(pGp7dYwVB0|0n%X(x2Mxf_>}29Rr14jc@PhgNi;Q!9RxNw=(VM
z?f=Sho2~x}@($2{gX|#V*UNwD`ZY&8EdHfy2N}O!{!7=dIoe_IFI_vx`1SH%x_-^k
z4vYUp7w2EsEG&V3w+f<PqS#|6U;qHGiMf%1J+;^K%jTv&lX?v!=t6wMMl2TzT2cyu
zhOB%{9S&P$Jzsw=aZq$)W4*1WrKMqhx!*Bbd@2aI8?3+Kq4_a6#^6{=?C{_^k(&+I
z8fF%<Syuymu@XQ0qLav7y$OX-8!K@h%+7?CrnRhHKJw4yM_l9P0F38%-7VbfPupB%
zP}*4ipix)ImnFK^`V`B2xRUY7Sa+yUG}yfw60)+yl`|^ZE-g_ODe4sZ1xNk5AZs|%
z`FWFja8}=QWig#$QsRL2nT;q9{uQ=Bu0w!lZbw0NYlHgWc!NVOm%<&5u7;;wyEeR7
z;mAFAUC)#H#WW7(d`zjXvAbF_fiY92rl|z`X)i0UgBPoihf_q{Dhqd1R`n(%WOXBR
z*t14GvdbeYWTm-gBR(qp+PU;$wmSXj&()$LV@{!}A!}d6r)Q8^6O2d8RUpq`m7B}y
z!z}H%h(1Mb<uy+3gl0x=zO2*CjZH_g`}CuoyQ1^YluY1QR7H{vKkEyeJzqz=!@cQS
z4XyQ0(zv&>&Lv``pA3oHbg@?#%M;1t1p-E2-|c|#H-_R1@JzcNBq&XcTyD{j<6UEo
zI0B^10yQ<)ne~ii-I(2&&uI#3*c>cE#4F`4kjf9Yf_ZrA9}M*e%!^mAR}E$zo9Zu3
zORdt;YtL*^N_oifn?F+u*|JG0gxkI3G?lUOvJIf`xLe&LM~@;G2ok9*GlYr@Go9q^
zEz`#}@G`i`7&#X(r(J-?mH-)D<>Cgao26JlhL$0DkE{zbmf-K(&|l=DD*83q#uQGU
zBfS~GLtVKIm&%cnvH3DXpH6YX+nd@SWMv({*9pmf$($M!me<r&<vv?OYs6*G&#N0h
z^~oK#$DbK72%PiNXB*Rd(0!lpl8bqd)W?h$_&y?>du{2S+`*XCh6t-wjlCNsFC~wA
ztcbPif81a*Yr3ti?%Lg-nYeKf;M-OF)`;J@?PY=n6fA4v!4Y!-RK&GE!e|%E#rOE^
zoFOK;>>L^svjrm2h{sHx(ZWK2#aNC-Iyotq$H<py0lt2j?elDJg1GE4Xkm}@40`tI
z#C7trnR5R!tzvVU#p~U>A~D8yWs;GH{Czl&W$vSX9co>CY_Jx<owq>^p$*HJ(W=11
z2PK+Q^PIpqE{Q$`e^qZ}9+2ghQRIQ~E)V}@K_6kS`C%KoxHO#-#<egW<4*HJ<^qtU
znm=+TxfrtVusKxiA+#LneQn&}(J^SR0^CKH=}i6JjB`4RP8|96wNmUP>55!NTr9BH
z$Gf;zV1y&|YokQx-X0?N;CZ<LltmK<y#Ii3+ncKTfehB-!OCdy>I65bn4U4me(v9v
zt~$4NQ0?3rdSimd1&!>(WtET&)ww0Fc3t+>j11iq;<6g?d`;6m(?o-v--hwhsT@)D
z0tIfwG=F`%g`|b}Fj5F8rtn%b=Q*N4c476cdco@zbJ{%maeVAa3Aft*j9l<Eb4!D<
zPI;i{+zZAefeaVpI*zyZo!L6O$eJ`U7aKzcG%V8Kt+)umJ*9>ATg{8YasCtKb*)A6
z&p)mOy?*~>R<Orw_E1daV%Q`KpmP7C%&`s0<uez){$7>z>8ALTwmBci{43pegY-Rz
z@eqaDI>U++PdYkRyrs|SG9%{4tSuE@XNM|3erf14y>^db<MWCvVCLwa-Nqu(gBd+2
zxAj-060llc6H${AR(#6td};~earPvz>o%`=<#-XIL;5_gIA^7h8{BBuh8QFCLWCMz
zjybw8t#D>`diqPK?x2S16YVFy=Uha*f^b!zgR4JJ1ZT}vGx=G3Onb-tVMfdR7D0dD
z`glZQZoz|4cc%WQut~kEYa)eZXSH#>_lm0s76*KCRHhC+4HUTh7P+wZx$aU#-1PwD
zSw(J?U7Ia5Q(8A&im4#q-#hZkl`FX)bHqF}g8`PDLh%P9%#Y3|7lfHZ&tmX5;&hWT
z<5fx_3!1T4E*<_n0Pc)>)%JSuOcLRfI-%tzZ;gP!lL*7d())_#@^@3z?2K^hXQMez
zmDt>^G}ZL42){nsmzQ~bTugJ`1R|Rsv0yNHf_;8B=k-ptG#j-&17x9xZl-tKyA+#6
ztpovzDJU_K53r$#T&zg?0a^a6-O5L(t?|buEi^7SuU@r^ia5%0=)partDxHpgbYVJ
zf7*m%AIoR4_ci_L>MqZ+*&Gus1R1Cu%z!(p(e<aG0J(fnANtHIQkQqHOy$Wh)(fu8
zV@s#4-`dw=Y03&`o9sn~2gOqi0#aY>54?)BHFeZReqE|p;9|xOx#=mi9BR2G+bFNE
z-l%Yn{d&pegCmMktsLdiG9F(%KkR?98FB?ye>(quR3lC}e?WDi>cbomAm@FBzd$g^
zV;Gwwu)@-|QaU>tzvM-TZ+$#1$T~4m^(w?f*!&T{%)ZSN@d_#2fI@5R<Xfl6_SiEu
zl}-K9h=c6~g!a2M!DRbX*{)$8R%wR11hWup<5eBeU16nG`@O@$B2muP4~?{g<np8g
zs%o4QI}MKbN||R!<aNJEy<~+J-T;iKAID7xW(p$e+1U7Q$;l`xh_u&CwuVbpc$dwI
z2&Q*Xo)l$}Vh@`sOB{OHeIz_l!|p~`4@}^OZ8jm;e7{5NgCx86J%!HI$7HKHZ;X6R
z39r*nv;~_#R$7K>m8uEfOL0E93XfHpv@9<(lpR4mCW=Wvos2v<hVSZ7n5&6rg*d%m
z`)Yc8DOs4I{Y+<Wa?$SG-BJA4nr0nT%g63aGTmuE=XtZ4*C{CwFJ;-qS|xm1J=gIr
zNQgRh&$`IJ>P=RffHC{UD;WbfFVr5`q+#U0o}O{-IJS~<YT;x{%nk5MrJ#0w%4w6^
zHY`bw!=BH^qbs6hmBg<trv_yy*R90cj&9mN8WN$^T-x__GZE0>eAv(asK`d^)1aHQ
ziy$S$GkI8i4v*0tgFSBcLh-pWdJsuP?pNabJmX@Z_2OKk=(*Z@o+mKR5yN;JSh0YO
z;_LHf?tcg;o|L=R`eA^auo>D~-ub>gnZ&aogPZNsR-M?G+g#spUS#6M*q%}`oxWOC
zeSONjTSg*?%f^N&jiG)pQcJJ-=+ayFwkTSC&8&4Qaq3x))DfvNqQv#n<ADf;xkj7Y
z_5s13eU$LoSwb8y-|!08*+p60LGc&?>S&JAl^B7b(Tia2WaO$md0D6JDpTV=dCihh
zQ4Ie<?<vNayXX>xnVGqpv4g8h+U=%}z6rv`flBeFYR&i{J@Lk9WM+$=Dcj=<YEpxO
zmIss@A86fxr(9!qHq-a4ofa*-^`0rQ!xn!1LxZSAH|rp<G^VcBC-!WfouT$H+WUFi
z3wKeqwvFl6!F~6O+Ja4{y0151&~~WFuJq~poPGOjFsrT$YjZwAbQyeSoR+4SP@-T!
ziSTVQO55e&{K0hDWiL=z3GF&E)GS%wP-+O`n}4_eoIwqr13Oj7uy(D|%p$Q?L50#A
z%_nA+pQYr}G#b|~bJ4@ltV?dsxnz=5Zirr_D~_z;&YmjIpJM#H$~p%Z&3S=EItO{Y
zM5Vd0LRJhGy)XT>aFB+24EdQMu1Z35i3S>ORB({g<BS4f21e>=d7Sfc(FkLfW`1UO
z{)U`pu+|%A1{9(x2s#>kQGEY6mjQOyW35MuUrjoDTz&Cr=j$yJ%f!y>222$-wGR#^
zPN>LNhJplQ3fd3rD)m~H=?JTcNmm6(GWiC#@iqmIk<V(@e@dybJQ3XH|ADzw$=)rW
z5t{7~IhHpTUi^Xst6QsixFTtds+f3}cYl3x%Og%KD{DJxW&WBhl*v2Gn^6{TbOEv;
z&_Ryq#MS#{nyvJZI8(V8!F;oZ_KF@~IwFynHQT}2<8l1Wn*?tGz6Umvz(UoFY4!XU
z<6hi3IdrvhOvhRw&6*-0rI4Qb4v<!sRCE_92d!A@;S!Kx=p^M%?MVX!E8JpR#?03x
zPMjd<)y6WN{-X*jHK4ny+E~khF=lw$!^?eSg1yJ&QhKTE0~O8%4>{%gyHD^6lw7tt
zhMhcptW>Ps#OeK11)H|fL)fJ|=F`I?@r=te)Adow=3hu^^>w<UahnUmGRiDQ%9?(L
z_RmZ4HjSSeK(#UkaVigBZw!n^S?cG+;j*VL%1UMES(~Q4nPup08SQN~-1mX2bB|xE
zi5W|kXv&z-M{i%N)T4(*%2VpT7I6x{Lm=3Nxv-IESjew-tHajWV|de=n_mIk1pip(
zuxZGW=FF15b*TFu`u7xS==#U!t#=b<SB&kxaKTdNi#`+TdTxs?rzC0zQHE1hN4>4s
zs9r~e!tV^N-`jWDP0kaCJGkt1WnrBrilEV4XHRx~iV?{UMKtsA@Ek2{pXlE0kR$8K
zvUgsr*wQ{^erT2u61=e2S;I*CS-d4bT4LYe&2<Z`7wgR_*of)u$Xi$Tg@NPQO(q-3
z17BCNH<8Hzt}b>Z2R+NOWD&k|R#};cqIY8^5>EQfcq87f$;c)(zU)I@Er+1@JoG9p
za9q{*!gAy(yOu~ku$Py95#Ec`?GJ;Omy3r6Q~g@+Je)1x%Tl~Q%D9&QWWh;Vh-wC-
zOV=yUyC*dJXWMyT-U3!~it`e2?`E=SeW8nCPUFMoJ(mdqi$ZMzi+PbsS?Ln`$rt&C
z22G<M&bF&fxD<VwLUo$utgJo0fkO(Ox?aGapt12ZNSiPJ$|^$VaT!)il6E}!$eR}M
zlw;uBW!199r6rh2^qGdjvx(Mxf)Xk@N5;YviWT48x@pN$?$-AqZ}@)7%Nw6xh0D?B
zj(K{KRa2HjrpcY#d`a)P*}6M>C)MK|$t@NY4UO}@4o{^JomDd#w}qr&tsN2C<lDoq
pj;G%5lKcJSr_jxc_XLSefTz9B(CTU#XzQDvxv`Z|v7txA{{TNn){p=I

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png b/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
deleted file mode 100644
index 3ecd6a800a01b77ec8b53fd2ac2c1ad9be035fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4388
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
VG`ly3;d~;1Y%Cr2-!R7}{u}gUbfEwM

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/card.png b/3rdparty/Sabre/DAV/Browser/assets/icons/card.png
deleted file mode 100644
index 2ce954866d853edb737a7e281de221f7846846f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5695
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png b/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
deleted file mode 100644
index 156fa64fd50f15d9e838326d42d68feba2c23c3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3474
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/file.png b/3rdparty/Sabre/DAV/Browser/assets/icons/file.png
deleted file mode 100644
index 3b98551cec3a863ab120a52cf21debad6cab6748..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2837
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
BY2g3>

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png b/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
deleted file mode 100644
index 156fa64fd50f15d9e838326d42d68feba2c23c3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3474
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png b/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
deleted file mode 100644
index f8988f828e61bb1894c3ea5b848f95aac84beaa3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5480
zcmeHLX;f2Z6Ta+-3COO15P~QOBq1P62umO+tFnuT$R)W6k&qjbiv&bA%T@&uL0dsl
zaKWV(tyZgu5jU_3T3o<|O)S(}K~fbF$(IDB@qD#@KfeAm=j7aX?#w(h?=$nxIqxkF
zS-J$RVWa^70NUS=8YX!Xq<?i)08qfFv}#L)If!pG5)LzvG>``Y6gr#$Vf>RpCKLvN
z^z@Wgh%9j~V?{(G(ZN9^8k~#+r8YQ0GFRda0Ax=A7o;UY2qpnyvN-P8;j`zl7#7_f
zyL?eFA(-m}C9?c7cu;u8(g<2c63vy4_4Lpn3rG@xWC#H<f@C&_PZGFeWw<2CTKXD~
z#mG#MBzNpoQqjR77$2AiVH|Np9MO(OaB{#ba=<w(B03QrZ81aw!39rn#yb$~>|IEN
zMI=Xi%=;hKLjyzR(HW#L>f-m|B$7Ke5ka^lJU%Tg4VUJCgLzE6y{oG$o<PJCiFOhT
zJAOI`0R?s(zJ(NG3WEyqX*?DeVZj`X6cbE<QxSJ8R-(te2dC4fvAL-{whWn0!$WK+
z8R8&(ygkkyFK;hlB8<gMMEKKg9R7QjC4A!rAXnl-!1H7_A9->UVFczU!rZ_2oL0;H
z<wN>&5t^eUu9VPeU&*d$vSj%P9WQSobC=a=D*AN7q~%aTI07QFjZNbuuwkYoe>#hX
zKy(DA!3+ij;pmVof$5w`lvE@U=J7*dK1<4`ghMIG7&4tkn%b&NoMN5AMy8}Gk<F4)
zO=5!_raM+(M~4_-DjUIiG#`9la_M8fg@EEF?F&~-LONy{o3$3=VIm}LPKVR@Nh~s6
zT0S=GeH5AWAq*M+aT3y;Xgml+V4hr3;ZVxQNqPKFK|Z+2g2<yvqaZAV4avp$kkR|@
z`^3iapWMV>c;vsT7Ri^K?+A#O%>REy`Xn}4zK=*gQyluhl5<5v{5cF*c5FVjVNvKj
zUjYKrc^{6|f9ri%NcyL>VUkHCYp744htOcUr0u5;#NU7;yib8gK<wo(PcoDK*4H-~
zWc`yqlJ`L?E7(*A$_*4rHKyK429;z+;-`n?RGH*@`(Ihg*!owH<v_m#kt5^t%P(|&
zo+CMnFLcR~@%iN!x<1d5oW&Qq<jDB^@(W#`=Sa@tpXk!~>zV~|BzLPc$t6mC<Deq|
zsB!$MlnBB7gbA_OQz;542SCg8%i@IQ1aUBG)9So2TY}1wBWzS&9vfA2K2zK0mO}I0
zZBAZKJspZ}D0gV<=#8%Si!R#p!#R;wQM-D1$>u;ISHTOg@8{`1v`W!_A;zE{UtDEr
zWmQzGgfqu3{F+s9ezh<Y)CN^&sUAlQw_Uw_h1S{Ddf@^v%gf62D=;fA_szAh4~cV6
zD4a1Va2}u!*av0(Ibd#4Km)y^qrXuw6B>nZa2)Z9uFly_+2XbaSRA()h1LeQ%&<LT
zD-uskZs?%vN9q@ByUSSIP*5>&Ta2PA<^aue(oO@qP85~&ePYGTyx|%5fgoi~uQi^>
z^R~lr#QqcJ9`=+ib7xnz%$~dZ(#8E~<6(XZPiMH$_!Ml?JJ6rtbw!X2C~!EOMyL41
z-v0ivmTOnq+Am#F4`QP_Mhe0h8NZ5|?KO3W-!!Cjs8aOMy5sXFJX8AT#T`)B&>#fW
zxbD<`wpV0`12&Y+{k{Meex?3e$;QU!mcJ4v$8TxiUPS|M4XSc}dtiW{(Zr;vu<u6I
zy?A>D!$36|9bDk{df1+vF<!KVZAL9v;^`t7${~9wx#YBpy5F7ML|5BVUQ4_{xWrWG
z#>6yo{oS3n4FqdohLjw_`5~{?3hM@%4|Xg-TL<{!O54QXQz7JRVWFg}t9!8~JKOWQ
zXT$280Ugww0mhTe$9;WZJdLKd-;~kNxBIDXL_kvgLD9N(f|+G{RN;<4&mB8hEZn+a
z+3YxvY)Whl6NGL$-)81KwT}IPb3++5b4S$<aZh8))-`j2VgjB<GM8<4A?rUnFV4v=
z*|~F#L1Wh2s7*Lu6))h{L&f>3MoP7|K-3wHW^b(cq+{x2V4&ZIg?(=#W?<v}7Yf_j
zCgXx5OZrADe^yV?4pp@WLkp6ezqf2k7q3<5GWf>0>RtB8i22g=Mf#Bi7Z;Qg%I8uy
z*SJIR4Cq4fut#HiS#`znyk{DP`QOH`zcljnPSW~OyLiaeYxg{rZNc>=*5$S#6<Y_>
z$DhrKGs_ges@%z*nI(Rk)O@Yryvm;X-SyNTRcbufHvzWR=#hhc1O460))F6`PN|DY
z3N-G<8bnv+8mVk<3D`e5IeDrxy2})>S8_tJLtXkDs_SdLBZDEVnwznb8v)mu!!o08
z7^@cU@7;4z%`E)kNXGcUL9#`|B&23EE;ehpb-DTai0G<T$fF5utM!Go&6*KC3vI0R
zbMDt>=h~gE@oaLKP&CrKmLvQX<yqe}|8T>GSLUx*u87evamzB<=YVdFE$c6=%+IIj
zb(*XE*lGwo=q*;Z1ER)M`pb3R5s5^UVf$+Om}t;B)R!2drR3M%)xq=tY%(cF401Bm
znz2|^8m9-u7y=s&RCQ@I)%Zd4l*@;n%<SC~8yEI!R5aL*!dzF}L_Mx>^BA+O8oYV;
zmSUuz`b>|k@p)ISH#d9PaR=L0-KLNK{u<^UE@8}_72?Kkaasu|BFt3t;CyiGfmo|8
z(kAw1)_s##8y6c|6xVLbRqmhnZ1@VU&hK0arg4ab{>^E|*JUl1MFe%lJw=>GLdz5O
zqOLY_RmOhP?FW+24ZmO?*<oawR{Cdi-<wX&p6)`?uGi~!rRj@v0}6+(SvTI^7rF}S
zwyZwUISV@!`b*&Tv5c)wD`vzi8i-66*seq`_R*T%{q#{;b_Q!pgY8WB=p~ynEP6H$
zeyiebY1NGT!OHSX`1OaUk5~?*tTTO(Tv}x`^oTFw_qNn!F6*(qeuvS|b(!HCO5e70
z>^Hr+W!1tihruhm?RS;tp3u`h`8<ZGziTwSSm5=GPF`E(fjuUU*td^QwJhfypS+|L
z9S{gKuCMwzWyGS*<nrAYqt|%erQ2Ot$D$KZ7mMcizRXaYw}3mimg!mDQ?ll}C<K3i
z!5mf~S5^q?CY!p)AEQq>t|>`Ww6Qg=sQYTaFybZ9Z5Y@)k-y*mr@hLWqYfqA;VU2Q
zHBNnUR%_UBz^IQtcD4Ra(_LZl;oJ^`p5m8BPp(6#hwq6xvtIJ3L8A|>e|^?8zem00
zJ}v)`(cV4{T4cWWn<_^C={vqR@1<>k^WGgle2cM~Z}`oF!WYridplU=KYwT0mV}rO
zX5u#U!P=-pW9^}4eV(a$l|!cJ(pT5KcRxu8R2%DxtGdD2wM$d{a=lZP&BEZyfE7_c
zor&e>lw>hoN`E&ponu-*TOm7XrJC1)R{9#Rb!W65F4!5Ar}WPIboMORSS924n9T=H
zFK9bUq3sFy!&sxys8c8RRp1}>PijmWx~i8JZkQKto%Ps~doqk#*?Q^i*trmf%RqJU
z;#=VlXJ@*Ot@Tm7cQh70`TUgTilj9ygRTDMD_Wna-`nRr)Vk*kX+&p+_hoCb$go`z
z(mGzZL{lr@+q}G%)%W7iTIF2Zt6P@o>RvYSKjuC`!I)?+XJ<C7%5^<zW2xsxeiOVp
zA(3x|E>l_PxHBh4;f`g!!E>A4VP5$SQ5CLF_=0&A@lnwhleUz`(>k&GBZWCDT3kgv
cn<BFmTHVweZiK&BBK`L1@4J+G)H^=!KX{H~fB*mh

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
deleted file mode 100644
index 075e84caa1..0000000000
--- a/3rdparty/Sabre/DAV/Client.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-
-/**
- * SabreDAV DAV client
- *
- * This client wraps around Curl to provide a convenient API to a WebDAV
- * server.
- *
- * NOTE: This class is experimental, it's api will likely change in the future.
- *
- * @package Sabre
- * @subpackage DAVClient
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Client {
-
-    public $propertyMap = array();
-
-    protected $baseUri;
-    protected $userName;
-    protected $password;
-    protected $proxy;
-
-    /**
-     * Constructor
-     *
-     * Settings are provided through the 'settings' argument. The following
-     * settings are supported:
-     *
-     *   * baseUri
-     *   * userName (optional)
-     *   * password (optional)
-     *   * proxy (optional)
-     *
-     * @param array $settings
-     */
-    public function __construct(array $settings) {
-
-        if (!isset($settings['baseUri'])) {
-            throw new InvalidArgumentException('A baseUri must be provided');
-        }
-
-        $validSettings = array(
-            'baseUri',
-            'userName',
-            'password',
-            'proxy'
-        );
-
-
-        foreach($validSettings as $validSetting) {
-            if (isset($settings[$validSetting])) {
-                $this->$validSetting = $settings[$validSetting];
-            }
-        }
-
-        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
-
-    }
-
-    /**
-     * Does a PROPFIND request
-     *
-     * The list of requested properties must be specified as an array, in clark
-     * notation.
-     *
-     * The returned array will contain a list of filenames as keys, and
-     * properties as values.
-     *
-     * The properties array will contain the list of properties. Only properties
-     * that are actually returned from the server (without error) will be
-     * returned, anything else is discarded.
-     *
-     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
-     * made to the server to also return all child resources.
-     *
-     * @param string $url
-     * @param array $properties
-     * @param int $depth
-     * @return array
-     */
-    public function propFind($url, array $properties, $depth = 0) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
-        $body.= '  <d:prop>' . "\n";
-
-        foreach($properties as $property) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
-
-            if ($namespace === 'DAV:') {
-                $body.='    <d:' . $elementName . ' />' . "\n";
-            } else {
-                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-            }
-
-        }
-
-        $body.= '  </d:prop>' . "\n";
-        $body.= '</d:propfind>';
-
-        $response = $this->request('PROPFIND', $url, $body, array(
-            'Depth' => $depth,
-            'Content-Type' => 'application/xml'
-        ));
-
-        $result = $this->parseMultiStatus($response['body']);
-
-        // If depth was 0, we only return the top item
-        if ($depth===0) {
-            reset($result);
-            $result = current($result);
-            return $result[200];
-        }
-
-        $newResult = array();
-        foreach($result as $href => $statusList) {
-
-            $newResult[$href] = $statusList[200];
-
-        }
-
-        return $newResult;
-
-    }
-
-    /**
-     * Updates a list of properties on the server
-     *
-     * The list of properties must have clark-notation properties for the keys,
-     * and the actual (string) value for the value. If the value is null, an
-     * attempt is made to delete the property.
-     *
-     * @todo Must be building the request using the DOM, and does not yet
-     *       support complex properties.
-     * @param string $url
-     * @param array $properties
-     * @return void
-     */
-    public function propPatch($url, array $properties) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
-
-        foreach($properties as $propName => $propValue) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
-
-            if ($propValue === null) {
-
-                $body.="<d:remove><d:prop>\n";
-
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . ' />' . "\n";
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-                }
-
-                $body.="</d:prop></d:remove>\n";
-
-            } else {
-
-                $body.="<d:set><d:prop>\n";
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . '>';
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
-                }
-                // Shitty.. i know
-                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8');
-                if ($namespace === 'DAV:') {
-                    $body.='</d:' . $elementName . '>' . "\n";
-                } else {
-                    $body.="</x:" . $elementName . ">\n";
-                }
-                $body.="</d:prop></d:set>\n";
-
-            }
-
-        }
-
-        $body.= '</d:propertyupdate>';
-
-        $this->request('PROPPATCH', $url, $body, array(
-            'Content-Type' => 'application/xml'
-        ));
-
-    }
-
-    /**
-     * Performs an HTTP options request
-     *
-     * This method returns all the features from the 'DAV:' header as an array.
-     * If there was no DAV header, or no contents this method will return an
-     * empty array.
-     *
-     * @return array
-     */
-    public function options() {
-
-        $result = $this->request('OPTIONS');
-        if (!isset($result['headers']['dav'])) {
-            return array();
-        }
-
-        $features = explode(',', $result['headers']['dav']);
-        foreach($features as &$v) {
-            $v = trim($v);
-        }
-        return $features;
-
-    }
-
-    /**
-     * Performs an actual HTTP request, and returns the result.
-     *
-     * If the specified url is relative, it will be expanded based on the base
-     * url.
-     *
-     * The returned array contains 3 keys:
-     *   * body - the response body
-     *   * httpCode - a HTTP code (200, 404, etc)
-     *   * headers - a list of response http headers. The header names have
-     *     been lowercased.
-     *
-     * @param string $method
-     * @param string $url
-     * @param string $body
-     * @param array $headers
-     * @return array
-     */
-    public function request($method, $url = '', $body = null, $headers = array()) {
-
-        $url = $this->getAbsoluteUrl($url);
-
-        $curlSettings = array(
-            CURLOPT_RETURNTRANSFER => true,
-            // Return headers as part of the response
-            CURLOPT_HEADER => true,
-            CURLOPT_POSTFIELDS => $body,
-            // Automatically follow redirects
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_MAXREDIRS => 5,
-        	CURLOPT_SSL_VERIFYPEER => true,
-        	//CURLOPT_SSL_VERIFYPEER	=> false,
-        );
-
-        switch ($method) {
-            case 'PUT':
-                $curlSettings[CURLOPT_PUT] = true;
-                break;
-            case 'HEAD' :
-
-                // do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD
-                // requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
-                // specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
-                // ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
-                // response body
-                $curlSettings[CURLOPT_NOBODY] = true;
-                $curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
-                break;
-
-            default:
-                $curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
-                break;
-
-        }
-
-        // Adding HTTP headers
-        $nHeaders = array();
-        foreach($headers as $key=>$value) {
-
-            $nHeaders[] = $key . ': ' . $value;
-
-        }
-        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
-
-        if ($this->proxy) {
-            $curlSettings[CURLOPT_PROXY] = $this->proxy;
-        }
-
-        if ($this->userName) {
-            $curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
-            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
-        }
-
-        list(
-            $response,
-            $curlInfo,
-            $curlErrNo,
-            $curlError
-        ) = $this->curlRequest($url, $curlSettings);
-
-        $headerBlob = substr($response, 0, $curlInfo['header_size']);
-        $response = substr($response, $curlInfo['header_size']);
-
-        // In the case of 100 Continue, or redirects we'll have multiple lists
-        // of headers for each separate HTTP response. We can easily split this
-        // because they are separated by \r\n\r\n
-        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
-
-        // We only care about the last set of headers
-        $headerBlob = $headerBlob[count($headerBlob)-1];
-
-        // Splitting headers
-        $headerBlob = explode("\r\n", $headerBlob);
-
-        $headers = array();
-        foreach($headerBlob as $header) {
-            $parts = explode(':', $header, 2);
-            if (count($parts)==2) {
-                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
-            }
-        }
-
-        $response = array(
-            'body' => $response,
-            'statusCode' => $curlInfo['http_code'],
-            'headers' => $headers
-        );
-
-        if ($curlErrNo) {
-            throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
-        }
-
-        if ($response['statusCode']>=400) {
-            switch ($response['statusCode']) {
-                case 404:
-                    throw new Sabre_DAV_Exception_NotFound('Resource ' . $url . ' not found.');
-                    break;
-
-                default:
-                    throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
-            }
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Wrapper for all curl functions.
-     *
-     * The only reason this was split out in a separate method, is so it
-     * becomes easier to unittest.
-     *
-     * @param string $url
-     * @param array $settings
-     * @return array
-     */
-    protected function curlRequest($url, $settings) {
-
-        $curl = curl_init($url);
-        curl_setopt_array($curl, $settings);
-
-        return array(
-            curl_exec($curl),
-            curl_getinfo($curl),
-            curl_errno($curl),
-            curl_error($curl)
-        );
-
-    }
-
-    /**
-     * Returns the full url based on the given url (which may be relative). All
-     * urls are expanded based on the base url as given by the server.
-     *
-     * @param string $url
-     * @return string
-     */
-    protected function getAbsoluteUrl($url) {
-
-        // If the url starts with http:// or https://, the url is already absolute.
-        if (preg_match('/^http(s?):\/\//', $url)) {
-            return $url;
-        }
-
-        // If the url starts with a slash, we must calculate the url based off
-        // the root of the base url.
-        if (strpos($url,'/') === 0) {
-            $parts = parse_url($this->baseUri);
-            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
-        }
-
-        // Otherwise...
-        return $this->baseUri . $url;
-
-    }
-
-    /**
-     * Parses a WebDAV multistatus response body
-     *
-     * This method returns an array with the following structure
-     *
-     * array(
-     *   'url/to/resource' => array(
-     *     '200' => array(
-     *        '{DAV:}property1' => 'value1',
-     *        '{DAV:}property2' => 'value2',
-     *     ),
-     *     '404' => array(
-     *        '{DAV:}property1' => null,
-     *        '{DAV:}property2' => null,
-     *     ),
-     *   )
-     *   'url/to/resource2' => array(
-     *      .. etc ..
-     *   )
-     * )
-     *
-     *
-     * @param string $body xml body
-     * @return array
-     */
-    public function parseMultiStatus($body) {
-
-        $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
-
-        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
-        if ($responseXML===false) {
-            throw new InvalidArgumentException('The passed data is not valid XML');
-        }
-
-        $responseXML->registerXPathNamespace('d', 'urn:DAV');
-
-        $propResult = array();
-
-        foreach($responseXML->xpath('d:response') as $response) {
-            $response->registerXPathNamespace('d', 'urn:DAV');
-            $href = $response->xpath('d:href');
-            $href = (string)$href[0];
-
-            $properties = array();
-
-            foreach($response->xpath('d:propstat') as $propStat) {
-
-                $propStat->registerXPathNamespace('d', 'urn:DAV');
-                $status = $propStat->xpath('d:status');
-                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
-
-                $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap);
-
-            }
-
-            $propResult[$href] = $properties;
-
-        }
-
-        return $propResult;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Collection.php b/3rdparty/Sabre/DAV/Collection.php
deleted file mode 100644
index 776c22531b..0000000000
--- a/3rdparty/Sabre/DAV/Collection.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Collection class
- *
- * This is a helper class, that should aid in getting collections classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-
-            if ($child->getName()==$name) return $child;
-
-        }
-        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name);
-
-    }
-
-    /**
-     * Checks is a child-node exists.
-     *
-     * It is generally a good idea to try and override this. Usually it can be optimized.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-
-            $this->getChild($name);
-            return true;
-
-        } catch(Sabre_DAV_Exception_NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Directory.php b/3rdparty/Sabre/DAV/Directory.php
deleted file mode 100644
index 6db8febc02..0000000000
--- a/3rdparty/Sabre/DAV/Directory.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * This class is now deprecated in favor of the Sabre_DAV_Collection class.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated Use Sabre_DAV_Collection instead
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Directory extends Sabre_DAV_Collection {
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
deleted file mode 100644
index a2cd6cf582..0000000000
--- a/3rdparty/Sabre/DAV/Exception.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * SabreDAV base exception
- *
- * This is SabreDAV's base exception file, use this to implement your own exception.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-/**
- * Main Exception class.
- *
- * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occurred.
- * The default for this is 500.
- *
- * This class also allows you to generate custom xml data for your exceptions. This will be displayed
- * in the 'error' element in the failing response.
- */
-class Sabre_DAV_Exception extends Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 500;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return array
-     */
-    public function getHTTPHeaders(Sabre_DAV_Server $server) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/BadRequest.php b/3rdparty/Sabre/DAV/Exception/BadRequest.php
deleted file mode 100644
index b198648a75..0000000000
--- a/3rdparty/Sabre/DAV/Exception/BadRequest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * BadRequest
- *
- * The BadRequest is thrown when the user submitted an invalid HTTP request
- * BadRequest
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 400;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/Conflict.php b/3rdparty/Sabre/DAV/Exception/Conflict.php
deleted file mode 100644
index 6b0bd1fad7..0000000000
--- a/3rdparty/Sabre/DAV/Exception/Conflict.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Conflict
- *
- * A 409 Conflict is thrown when a user tried to make a directory over an existing
- * file or in a parent directory that doesn't exist.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 409;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
deleted file mode 100644
index 6121868e69..0000000000
--- a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * ConflictingLock
- *
- * Similar to Exception_Locked, this exception thrown when a LOCK request
- * was made, on a resource which was already locked
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/FileNotFound.php b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
deleted file mode 100644
index d76e400c93..0000000000
--- a/3rdparty/Sabre/DAV/Exception/FileNotFound.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * FileNotFound
- *
- * Deprecated: Warning, this class is deprecated and will be removed in a 
- * future version of SabreDAV. Please use Sabre_DAV_Exception_NotFound instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @deprecated Use Sabre_DAV_Exception_NotFound instead
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception_NotFound {
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/Forbidden.php b/3rdparty/Sabre/DAV/Exception/Forbidden.php
deleted file mode 100644
index 20b1056e31..0000000000
--- a/3rdparty/Sabre/DAV/Exception/Forbidden.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Forbidden
- *
- * This exception is thrown whenever a user tries to do an operation he's not allowed to
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 403;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
deleted file mode 100644
index 1a15089b0a..0000000000
--- a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * InsufficientStorage
- *
- * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 507;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
deleted file mode 100644
index 2230f1d081..0000000000
--- a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * InvalidResourceType
- *
- * This exception is thrown when the user tried to create a new collection, with
- * a special resourcetype value that was not recognized by the server.
- *
- * See RFC5689 section 3.3
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
deleted file mode 100644
index 80ab7aff65..0000000000
--- a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * LockTokenMatchesRequestUri
- *
- * This exception is thrown by UNLOCK if a supplied lock-token is invalid
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
-
-    /**
-     * Creates the exception
-     */
-    public function __construct() {
-
-        $this->message = 'The locktoken supplied does not match any locks on this entity';
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/Locked.php b/3rdparty/Sabre/DAV/Exception/Locked.php
deleted file mode 100644
index 976365ac1f..0000000000
--- a/3rdparty/Sabre/DAV/Exception/Locked.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Locked
- *
- * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
-
-    /**
-     * Lock information
-     *
-     * @var Sabre_DAV_Locks_LockInfo
-     */
-    protected $lock;
-
-    /**
-     * Creates the exception
-     *
-     * A LockInfo object should be passed if the user should be informed
-     * which lock actually has the file locked.
-     *
-     * @param Sabre_DAV_Locks_LockInfo $lock
-     */
-    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
-
-        $this->lock = $lock;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 423;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
deleted file mode 100644
index 3187575150..0000000000
--- a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * MethodNotAllowed
- *
- * The 405 is thrown when a client tried to create a directory on an already existing directory
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 405;
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return array
-     */
-    public function getHTTPHeaders(Sabre_DAV_Server $server) {
-
-        $methods = $server->getAllowedMethods($server->getRequestUri());
-
-        return array(
-            'Allow' => strtoupper(implode(', ',$methods)),
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
deleted file mode 100644
index 87ca624429..0000000000
--- a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * NotAuthenticated
- *
- * This exception is thrown when the client did not provide valid
- * authentication credentials.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 401;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/NotFound.php b/3rdparty/Sabre/DAV/Exception/NotFound.php
deleted file mode 100644
index 2b9da560d2..0000000000
--- a/3rdparty/Sabre/DAV/Exception/NotFound.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * NotFound
- *
- * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotFound extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 404;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/NotImplemented.php b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
deleted file mode 100644
index d017a19f55..0000000000
--- a/3rdparty/Sabre/DAV/Exception/NotImplemented.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * NotImplemented
- *
- * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 501;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/PaymentRequired.php b/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
deleted file mode 100644
index 4982f45a4b..0000000000
--- a/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Payment Required
- *
- * The PaymentRequired exception may be thrown in a case where a user must pay
- * to access a certain resource or operation.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_PaymentRequired extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 402;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
deleted file mode 100644
index 213e9c5231..0000000000
--- a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * PreconditionFailed
- *
- * This exception is normally thrown when a client submitted a conditional request,
- * like for example an If, If-None-Match or If-Match header, which caused the HTTP
- * request to not execute (the condition of the header failed)
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
-
-    /**
-     * When this exception is thrown, the header-name might be set.
-     *
-     * This allows the exception-catching code to determine which HTTP header
-     * caused the exception.
-     *
-     * @var string
-     */
-    public $header = null;
-
-    /**
-     * Create the exception
-     *
-     * @param string $message
-     * @param string $header
-     */
-    public function __construct($message, $header=null) {
-
-        parent::__construct($message);
-        $this->header = $header;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 412;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        if ($this->header) {
-            $prop = $errorNode->ownerDocument->createElement('s:header');
-            $prop->nodeValue = $this->header;
-            $errorNode->appendChild($prop);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
deleted file mode 100644
index e86800f303..0000000000
--- a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * ReportNotImplemented
- *
- * This exception is thrown when the client requested an unknown report through the REPORT method
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
deleted file mode 100644
index 29ee3654a7..0000000000
--- a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * RequestedRangeNotSatisfiable
- *
- * This exception is normally thrown when the user
- * request a range that is out of the entity bounds.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
-
-    /**
-     * returns the http statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 416;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
deleted file mode 100644
index 9a4693b21a..0000000000
--- a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * UnSupportedMediaType
- *
- * The 415 Unsupported Media Type status code is generally sent back when the client
- * tried to call an HTTP method, with a body the server didn't understand
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception {
-
-    /**
-     * returns the http statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 415;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/FS/Directory.php b/3rdparty/Sabre/DAV/FS/Directory.php
deleted file mode 100644
index 3af2d75558..0000000000
--- a/3rdparty/Sabre/DAV/FS/Directory.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
-
-        if (is_dir($path)) {
-
-            return new Sabre_DAV_FS_Directory($path);
-
-        } else {
-
-            return new Sabre_DAV_FS_File($path);
-
-        }
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Checks if a child exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself
-     *
-     * @return void
-     */
-    public function delete() {
-
-        foreach($this->getChildren() as $child) $child->delete();
-        rmdir($this->path);
-
-    }
-
-    /**
-     * Returns available diskspace information
-     *
-     * @return array
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            );
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FS/File.php b/3rdparty/Sabre/DAV/FS/File.php
deleted file mode 100644
index 6a8039fe30..0000000000
--- a/3rdparty/Sabre/DAV/FS/File.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return string
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return void
-     */
-    public function delete() {
-
-        unlink($this->path);
-
-    }
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return mixed
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return mixed
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FS/Node.php b/3rdparty/Sabre/DAV/FS/Node.php
deleted file mode 100644
index 1283e9d0fd..0000000000
--- a/3rdparty/Sabre/DAV/FS/Node.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * Base node-class
- *
- * The node class implements the method used by both the File and the Directory classes
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
-
-    /**
-     * The path to the current node
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Sets up the node, expects a full path name
-     *
-     * @param string $path
-     */
-    public function __construct($path) {
-
-        $this->path = $path;
-
-    }
-
-
-
-    /**
-     * Returns the name of the node
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
-        return $name;
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
-        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
-
-        $newPath = $parentPath . '/' . $newName;
-        rename($this->path,$newPath);
-
-        $this->path = $newPath;
-
-    }
-
-
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return filemtime($this->path);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/Directory.php b/3rdparty/Sabre/DAV/FSExt/Directory.php
deleted file mode 100644
index 540057183b..0000000000
--- a/3rdparty/Sabre/DAV/FSExt/Directory.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-        return '"' . md5_file($newPath) . '"';
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File could not be located');
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-
-        if (is_dir($path)) {
-
-            return new Sabre_DAV_FSExt_Directory($path);
-
-        } else {
-
-            return new Sabre_DAV_FSExt_File($path);
-
-        }
-
-    }
-
-    /**
-     * Checks if a child exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        if ($name=='.' || $name=='..')
-            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself
-     *
-     * @return bool
-     */
-    public function delete() {
-
-        // Deleting all children
-        foreach($this->getChildren() as $child) $child->delete();
-
-        // Removing resource info, if its still around
-        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
-
-        // Removing the directory itself
-        rmdir($this->path);
-
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns available diskspace information
-     *
-     * @return array
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            );
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/File.php b/3rdparty/Sabre/DAV/FSExt/File.php
deleted file mode 100644
index b93ce5aee2..0000000000
--- a/3rdparty/Sabre/DAV/FSExt/File.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-        return '"' . md5_file($this->path) . '"';
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return string
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return bool
-     */
-    public function delete() {
-
-        unlink($this->path);
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag() {
-
-        return '"' . md5_file($this->path). '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/Node.php b/3rdparty/Sabre/DAV/FSExt/Node.php
deleted file mode 100644
index 68ca06beb7..0000000000
--- a/3rdparty/Sabre/DAV/FSExt/Node.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/**
- * Base node-class
- *
- * The node class implements the method used by both the File and the Directory classes
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_IProperties {
-
-    /**
-     * Updates properties on this node,
-     *
-     * @param array $properties
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        foreach($properties as $propertyName=>$propertyValue) {
-
-            // If it was null, we need to delete the property
-            if (is_null($propertyValue)) {
-                if (isset($resourceData['properties'][$propertyName])) {
-                    unset($resourceData['properties'][$propertyName]);
-                }
-            } else {
-                $resourceData['properties'][$propertyName] = $propertyValue;
-            }
-
-        }
-
-        $this->putResourceData($resourceData);
-        return true;
-    }
-
-    /**
-     * Returns a list of properties for this nodes.;
-     *
-     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
-     * If the array is empty, all properties should be returned
-     *
-     * @param array $properties
-     * @return array
-     */
-    function getProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        // if the array was empty, we need to return everything
-        if (!$properties) return $resourceData['properties'];
-
-        $props = array();
-        foreach($properties as $property) {
-            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
-        }
-
-        return $props;
-
-    }
-
-    /**
-     * Returns the path to the resource file
-     *
-     * @return string
-     */
-    protected function getResourceInfoPath() {
-
-        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
-        return $parentDir . '/.sabredav';
-
-    }
-
-    /**
-     * Returns all the stored resource information
-     *
-     * @return array
-     */
-    protected function getResourceData() {
-
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return array('properties' => array());
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!isset($data[$this->getName()])) {
-            return array('properties' => array());
-        }
-
-        $data = $data[$this->getName()];
-        if (!isset($data['properties'])) $data['properties'] = array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the resource information
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putResourceData(array $newData) {
-
-        $path = $this->getResourceInfoPath();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        $data[$this->getName()] = $newData;
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
-        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
-        $newPath = $parentPath . '/' . $newName;
-
-        // We're deleting the existing resourcedata, and recreating it
-        // for the new path.
-        $resourceData = $this->getResourceData();
-        $this->deleteResourceData();
-
-        rename($this->path,$newPath);
-        $this->path = $newPath;
-        $this->putResourceData($resourceData);
-
-
-    }
-
-    /**
-     * @return bool
-     */
-    public function deleteResourceData() {
-
-        // When we're deleting this node, we also need to delete any resource information
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return true;
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
-        ftruncate($handle,0);
-        rewind($handle);
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-        return true;
-    }
-
-    public function delete() {
-
-        return $this->deleteResourceData();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/File.php b/3rdparty/Sabre/DAV/File.php
deleted file mode 100644
index 3126bd8d36..0000000000
--- a/3rdparty/Sabre/DAV/File.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * This is a helper class, that should aid in getting file classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return 0;
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ICollection.php b/3rdparty/Sabre/DAV/ICollection.php
deleted file mode 100644
index 4626038a66..0000000000
--- a/3rdparty/Sabre/DAV/ICollection.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * The ICollection Interface
- *
- * This interface should be implemented by each class that represents a collection
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    function createFile($name, $data = null);
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    function createDirectory($name);
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @return Sabre_DAV_INode
-     */
-    function getChild($name);
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    function getChildren();
-
-    /**
-     * Checks if a child-node with the specified name exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    function childExists($name);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IExtendedCollection.php b/3rdparty/Sabre/DAV/IExtendedCollection.php
deleted file mode 100644
index 6ec345f9a6..0000000000
--- a/3rdparty/Sabre/DAV/IExtendedCollection.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * The IExtendedCollection interface.
- *
- * This interface can be used to create special-type of collection-resources
- * as defined by RFC 5689.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
-
-    /**
-     * Creates a new collection
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    function createExtendedCollection($name, array $resourceType, array $properties);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IFile.php b/3rdparty/Sabre/DAV/IFile.php
deleted file mode 100644
index 478f822ae7..0000000000
--- a/3rdparty/Sabre/DAV/IFile.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * This interface represents a file in the directory tree
- *
- * A file is a bit of a broad definition. In general it implies that on
- * this specific node a PUT or GET method may be performed, to either update,
- * or retrieve the contents of the file.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IFile extends Sabre_DAV_INode {
-
-    /**
-     * Updates the data
-     *
-     * The data argument is a readable stream resource.
-     *
-     * After a succesful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * If you don't plan to store the file byte-by-byte, and you return a
-     * different object on a subsequent GET you are strongly recommended to not
-     * return an ETag, and just return null.
-     *
-     * @param resource $data
-     * @return string|null
-     */
-    function put($data);
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    function get();
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return void
-     */
-    function getContentType();
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return void
-     */
-    function getETag();
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    function getSize();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/INode.php b/3rdparty/Sabre/DAV/INode.php
deleted file mode 100644
index c57d392310..0000000000
--- a/3rdparty/Sabre/DAV/INode.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * The INode interface is the base interface, and the parent class of both ICollection and IFile
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_INode {
-
-    /**
-     * Deleted the current node
-     *
-     * @return void
-     */
-    function delete();
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    function getName();
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    function setName($name);
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    function getLastModified();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IProperties.php b/3rdparty/Sabre/DAV/IProperties.php
deleted file mode 100644
index 38eaab16da..0000000000
--- a/3rdparty/Sabre/DAV/IProperties.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * IProperties interface
- *
- * Implement this interface to support custom WebDAV properties requested and sent from clients.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations
-     * @return bool|array
-     */
-    function updateProperties($mutations);
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties
-     * @return void
-     */
-    function getProperties($properties);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IQuota.php b/3rdparty/Sabre/DAV/IQuota.php
deleted file mode 100644
index 3fe4c4eced..0000000000
--- a/3rdparty/Sabre/DAV/IQuota.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * IQuota interface
- *
- * Implement this interface to add the ability to return quota information. The ObjectTree
- * will check for quota information on any given node. If the information is not available it will
- * attempt to fetch the information from the root node.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
-
-    /**
-     * Returns the quota information
-     *
-     * This method MUST return an array with 2 values, the first being the total used space,
-     * the second the available space (in bytes)
-     */
-    function getQuotaInfo();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
deleted file mode 100644
index 127e643a2b..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This is an alternative approach to doing this on a per-node basis
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    abstract function getLocks($uri, $returnChildLocks);
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
deleted file mode 100644
index 02cab87fc8..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/FS.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/**
- * This Lock Backend stores all its data in the filesystem in separate file per
- * node.
- *
- * This Lock Manager is now deprecated. It has a bug that allows parent
- * collections to be deletes when children deeper in the tree are locked.
- *
- * This also means that using this backend means you will not pass the Neon
- * Litmus test.
- *
- * You are recommended to use either the PDO or the File backend instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The default data directory
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    public function __construct($dataDir) {
-
-        $this->dataDir = $dataDir;
-
-    }
-
-    protected function getFileNameForUri($uri) {
-
-        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
-
-    }
-
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $lockList = array();
-        $currentPath = '';
-
-        foreach(explode('/',$uri) as $uriPart) {
-
-            // weird algorithm that can probably be improved, but we're traversing the path top down
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$uriPart;
-
-            $uriLocks = $this->getData($currentPath);
-
-            foreach($uriLocks as $uriLock) {
-
-                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
-                if($uri==$currentPath || $uriLock->depth!=0) {
-                    $uriLock->uri = $currentPath;
-                    $lockList[] = $uriLock;
-                }
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($lockList as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]);
-        }
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-            if ($lock->token == $lockInfo->token) unset($locks[$k]);
-        }
-        $locks[] = $lockInfo;
-        $this->putData($uri,$locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($uri,$locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns the stored data for a uri
-     *
-     * @param string $uri
-     * @return array
-     */
-    protected function getData($uri) {
-
-        $path = $this->getFilenameForUri($uri);
-        if (!file_exists($path)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the lock information
-     *
-     * @param string $uri
-     * @param array $newData
-     * @return void
-     */
-    protected function putData($uri,array $newData) {
-
-        $path = $this->getFileNameForUri($uri);
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php
deleted file mode 100644
index c33f963514..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/File.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a single file.
- *
- * Note that this is not nearly as robust as a database, you are encouraged
- * to use the PDO backend instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The storage file
-     *
-     * @var string
-     */
-    private $locksFile;
-
-    /**
-     * Constructor
-     *
-     * @param string $locksFile path to file
-     */
-    public function __construct($locksFile) {
-
-        $this->locksFile = $locksFile;
-
-    }
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $newLocks = array();
-
-        $locks = $this->getData();
-
-        foreach($locks as $lock) {
-
-            if ($lock->uri === $uri ||
-                //deep locks on parents
-                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
-
-                // locks on children
-                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
-
-                $newLocks[] = $lock;
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($newLocks as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
-        }
-        return $newLocks;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getData();
-
-        foreach($locks as $k=>$lock) {
-            if (
-                ($lock->token == $lockInfo->token) ||
-                (time() > $lock->timeout + $lock->created)
-            ) {
-                unset($locks[$k]);
-            }
-        }
-        $locks[] = $lockInfo;
-        $this->putData($locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $locks = $this->getData();
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Loads the lockdata from the filesystem.
-     *
-     * @return array
-     */
-    protected function getData() {
-
-        if (!file_exists($this->locksFile)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($this->locksFile,'r');
-        flock($handle,LOCK_SH);
-
-        // Reading data until the eof
-        $data = stream_get_contents($handle);
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Saves the lockdata
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putData(array $newData) {
-
-        // opening up the file, and creating an exclusive lock
-        $handle = fopen($this->locksFile,'a+');
-        flock($handle,LOCK_EX);
-
-        // We can only truncate and rewind once the lock is acquired.
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
deleted file mode 100644
index acce80638e..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a database. You must pass a PDO
- * connection object in the constructor.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The PDO connection object
-     *
-     * @var pdo
-     */
-    private $pdo;
-
-    /**
-     * The PDO tablename this backend uses.
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * Constructor
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     */
-    public function __construct(PDO $pdo, $tableName = 'locks') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        // NOTE: the following 10 lines or so could be easily replaced by
-        // pure sql. MySQL's non-standard string concatenation prevents us
-        // from doing this though.
-        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM '.$this->tableName.' WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
-        $params = array(time(),$uri);
-
-        // We need to check locks for every part in the uri.
-        $uriParts = explode('/',$uri);
-
-        // We already covered the last part of the uri
-        array_pop($uriParts);
-
-        $currentPath='';
-
-        foreach($uriParts as $part) {
-
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$part;
-
-            $query.=' OR (depth!=0 AND uri = ?)';
-            $params[] = $currentPath;
-
-        }
-
-        if ($returnChildLocks) {
-
-            $query.=' OR (uri LIKE ?)';
-            $params[] = $uri . '/%';
-
-        }
-        $query.=')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($params);
-        $result = $stmt->fetchAll();
-
-        $lockList = array();
-        foreach($result as $row) {
-
-            $lockInfo = new Sabre_DAV_Locks_LockInfo();
-            $lockInfo->owner = $row['owner'];
-            $lockInfo->token = $row['token'];
-            $lockInfo->timeout = $row['timeout'];
-            $lockInfo->created = $row['created'];
-            $lockInfo->scope = $row['scope'];
-            $lockInfo->depth = $row['depth'];
-            $lockInfo->uri   = $row['uri'];
-            $lockList[] = $lockInfo;
-
-        }
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 30*60;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getLocks($uri,false);
-        $exists = false;
-        foreach($locks as $lock) {
-            if ($lock->token == $lockInfo->token) $exists = true;
-        }
-
-        if ($exists) {
-            $stmt = $this->pdo->prepare('UPDATE '.$this->tableName.' SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        } else {
-            $stmt = $this->pdo->prepare('INSERT INTO '.$this->tableName.' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        }
-
-        return true;
-
-    }
-
-
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->tableName.' WHERE uri = ? AND token = ?');
-        $stmt->execute(array($uri,$lockInfo->token));
-
-        return $stmt->rowCount()===1;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php
deleted file mode 100644
index 9df014a428..0000000000
--- a/3rdparty/Sabre/DAV/Locks/LockInfo.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * LockInfo class
- *
- * An object of the LockInfo class holds all the information relevant to a
- * single lock.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_LockInfo {
-
-    /**
-     * A shared lock
-     */
-    const SHARED = 1;
-
-    /**
-     * An exclusive lock
-     */
-    const EXCLUSIVE = 2;
-
-    /**
-     * A never expiring timeout
-     */
-    const TIMEOUT_INFINITE = -1;
-
-    /**
-     * The owner of the lock
-     *
-     * @var string
-     */
-    public $owner;
-
-    /**
-     * The locktoken
-     *
-     * @var string
-     */
-    public $token;
-
-    /**
-     * How long till the lock is expiring
-     *
-     * @var int
-     */
-    public $timeout;
-
-    /**
-     * UNIX Timestamp of when this lock was created
-     *
-     * @var int
-     */
-    public $created;
-
-    /**
-     * Exclusive or shared lock
-     *
-     * @var int
-     */
-    public $scope = self::EXCLUSIVE;
-
-    /**
-     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
-     */
-    public $depth = 0;
-
-    /**
-     * The uri this lock locks
-     *
-     * TODO: This value is not always set
-     * @var mixed
-     */
-    public $uri;
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php
deleted file mode 100644
index fd956950b8..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Plugin.php
+++ /dev/null
@@ -1,633 +0,0 @@
-<?php
-
-/**
- * Locking plugin
- *
- * This plugin provides locking support to a WebDAV server.
- * The easiest way to get started, is by hooking it up as such:
- *
- * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
- * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
- * $server->addPlugin($lockPlugin);
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * locksBackend
-     *
-     * @var Sabre_DAV_Locks_Backend_Abstract
-     */
-    private $locksBackend;
-
-    /**
-     * server
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * __construct
-     *
-     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend
-     */
-    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
-
-        $this->locksBackend = $locksBackend;
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'locks';
-
-    }
-
-    /**
-     * This method is called by the Server if the user used an HTTP method
-     * the server didn't recognize.
-     *
-     * This plugin intercepts the LOCK and UNLOCK methods.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'LOCK'   : $this->httpLock($uri); return false;
-            case 'UNLOCK' : $this->httpUnlock($uri); return false;
-
-        }
-
-    }
-
-    /**
-     * This method is called after most properties have been found
-     * it allows us to add in any Lock-related properties
-     *
-     * @param string $path
-     * @param array $newProperties
-     * @return bool
-     */
-    public function afterGetProperties($path, &$newProperties) {
-
-        foreach($newProperties[404] as $propName=>$discard) {
-
-            switch($propName) {
-
-                case '{DAV:}supportedlock' :
-                    $val = false;
-                    if ($this->locksBackend) $val = true;
-                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
-                    unset($newProperties[404][$propName]);
-                    break;
-
-                case '{DAV:}lockdiscovery' :
-                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
-                    unset($newProperties[404][$propName]);
-                    break;
-
-            }
-
-
-        }
-        return true;
-
-    }
-
-
-    /**
-     * This method is called before the logic for any HTTP method is
-     * handled.
-     *
-     * This plugin uses that feature to intercept access to locked resources.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'DELETE' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock, true))
-                    throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'MKCOL' :
-            case 'PROPPATCH' :
-            case 'PUT' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock))
-                    throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'MOVE' :
-                $lastLock = null;
-                if (!$this->validateLock(array(
-                      $uri,
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                    ),$lastLock, true))
-                        throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'COPY' :
-                $lastLock = null;
-                if (!$this->validateLock(
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                      $lastLock, true))
-                        throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        if ($this->locksBackend)
-            return array('LOCK','UNLOCK');
-
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * In this case this is only the number 2. The 2 in the Dav: header
-     * indicates the server supports locks.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array(2);
-
-    }
-
-    /**
-     * Returns all lock information on a particular uri
-     *
-     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
-     *
-     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
-     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
-     * for any possible locks and return those as well.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks = false) {
-
-        $lockList = array();
-
-        if ($this->locksBackend)
-            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks an uri
-     *
-     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
-     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
-     * of lock (shared or exclusive) and the owner of the lock
-     *
-     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
-     *
-     * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpLock($uri) {
-
-        $lastLock = null;
-        if (!$this->validateLock($uri,$lastLock)) {
-
-            // If the existing lock was an exclusive lock, we need to fail
-            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
-                //var_dump($lastLock);
-                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
-            }
-
-        }
-
-        if ($body = $this->server->httpRequest->getBody(true)) {
-            // This is a new lock request
-            $lockInfo = $this->parseLockRequest($body);
-            $lockInfo->depth = $this->server->getHTTPDepth();
-            $lockInfo->uri = $uri;
-            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
-
-        } elseif ($lastLock) {
-
-            // This must have been a lock refresh
-            $lockInfo = $lastLock;
-
-            // The resource could have been locked through another uri.
-            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
-
-        } else {
-
-            // There was neither a lock refresh nor a new lock request
-            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
-
-        }
-
-        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
-
-        $newFile = false;
-
-        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
-        try {
-            $this->server->tree->getNodeForPath($uri);
-
-            // We need to call the beforeWriteContent event for RFC3744
-            $this->server->broadcastEvent('beforeWriteContent',array($uri));
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            // It didn't, lets create it
-            $this->server->createFile($uri,fopen('php://memory','r'));
-            $newFile = true;
-
-        }
-
-        $this->lockNode($uri,$lockInfo);
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
-        $this->server->httpResponse->sendStatus($newFile?201:200);
-        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
-     * The server should return 204 (No content) on success
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpUnlock($uri) {
-
-        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
-
-        // If the locktoken header is not supplied, we need to throw a bad request exception
-        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
-
-        $locks = $this->getLocks($uri);
-
-        // Windows sometimes forgets to include < and > in the Lock-Token
-        // header
-        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
-
-        foreach($locks as $lock) {
-
-            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
-
-                $this->unlockNode($uri,$lock);
-                $this->server->httpResponse->setHeader('Content-Length','0');
-                $this->server->httpResponse->sendStatus(204);
-                return;
-
-            }
-
-        }
-
-        // If we got here, it means the locktoken was invalid
-        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
-     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
-
-        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
-        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
-
-    }
-
-
-    /**
-     * Returns the contents of the HTTP Timeout header.
-     *
-     * The method formats the header into an integer.
-     *
-     * @return int
-     */
-    public function getTimeoutHeader() {
-
-        $header = $this->server->httpRequest->getHeader('Timeout');
-
-        if ($header) {
-
-            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
-            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
-            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
-
-        } else {
-
-            $header = 0;
-
-        }
-
-        return $header;
-
-    }
-
-    /**
-     * Generates the response for successful LOCK requests
-     *
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return string
-     */
-    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-
-        $prop = $dom->createElementNS('DAV:','d:prop');
-        $dom->appendChild($prop);
-
-        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
-        $prop->appendChild($lockDiscovery);
-
-        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
-        $lockObj->serialize($this->server,$lockDiscovery);
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * validateLock should be called when a write operation is about to happen
-     * It will check if the requested url is locked, and see if the correct lock tokens are passed
-     *
-     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
-     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
-     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
-     * @return bool
-     */
-    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
-
-        if (is_null($urls)) {
-            $urls = array($this->server->getRequestUri());
-        } elseif (is_string($urls)) {
-            $urls = array($urls);
-        } elseif (!is_array($urls)) {
-            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
-        }
-
-        $conditions = $this->getIfConditions();
-
-        // We're going to loop through the urls and make sure all lock conditions are satisfied
-        foreach($urls as $url) {
-
-            $locks = $this->getLocks($url, $checkChildLocks);
-
-            // If there were no conditions, but there were locks, we fail
-            if (!$conditions && $locks) {
-                reset($locks);
-                $lastLock = current($locks);
-                return false;
-            }
-
-            // If there were no locks or conditions, we go to the next url
-            if (!$locks && !$conditions) continue;
-
-            foreach($conditions as $condition) {
-
-                if (!$condition['uri']) {
-                    $conditionUri = $this->server->getRequestUri();
-                } else {
-                    $conditionUri = $this->server->calculateUri($condition['uri']);
-                }
-
-                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
-                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
-
-                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
-                // At least 1 condition has to be satisfied
-                foreach($condition['tokens'] as $conditionToken) {
-
-                    $etagValid = true;
-                    $lockValid  = true;
-
-                    // key 2 can contain an etag
-                    if ($conditionToken[2]) {
-
-                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
-                        $node = $this->server->tree->getNodeForPath($uri);
-                        $etagValid = $node->getETag()==$conditionToken[2];
-
-                    }
-
-                    // key 1 can contain a lock token
-                    if ($conditionToken[1]) {
-
-                        $lockValid = false;
-                        // Match all the locks
-                        foreach($locks as $lockIndex=>$lock) {
-
-                            $lockToken = 'opaquelocktoken:' . $lock->token;
-
-                            // Checking NOT
-                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
-
-                                // Condition valid, onto the next
-                                $lockValid = true;
-                                break;
-                            }
-                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
-
-                                $lastLock = $lock;
-                                // Condition valid and lock matched
-                                unset($locks[$lockIndex]);
-                                $lockValid = true;
-                                break;
-
-                            }
-
-                        }
-
-                    }
-
-                    // If, after checking both etags and locks they are stil valid,
-                    // we can continue with the next condition.
-                    if ($etagValid && $lockValid) continue 2;
-               }
-               // No conditions matched, so we fail
-               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
-            }
-
-            // Conditions were met, we'll also need to check if all the locks are gone
-            if (count($locks)) {
-
-                reset($locks);
-
-                // There's still locks, we fail
-                $lastLock = current($locks);
-                return false;
-
-            }
-
-
-        }
-
-        // We got here, this means every condition was satisfied
-        return true;
-
-    }
-
-    /**
-     * This method is created to extract information from the WebDAV HTTP 'If:' header
-     *
-     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
-     * The function will return an array, containing structs with the following keys
-     *
-     *   * uri   - the uri the condition applies to. If this is returned as an
-     *     empty string, this implies it's referring to the request url.
-     *   * tokens - The lock token. another 2 dimensional array containing 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
-     *   * etag - an etag, if supplied
-     *
-     * @return array
-     */
-    public function getIfConditions() {
-
-        $header = $this->server->httpRequest->getHeader('If');
-        if (!$header) return array();
-
-        $matches = array();
-
-        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
-        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
-
-        $conditions = array();
-
-        foreach($matches as $match) {
-
-            $condition = array(
-                'uri'   => $match['uri'],
-                'tokens' => array(
-                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
-                ),
-            );
-
-            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
-                $match['not']?0:1,
-                $match['token'],
-                isset($match['etag'])?$match['etag']:''
-            );
-            else {
-                $conditions[] = $condition;
-            }
-
-        }
-
-        return $conditions;
-
-    }
-
-    /**
-     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object
-     *
-     * @param string $body
-     * @return Sabre_DAV_Locks_LockInfo
-     */
-    protected function parseLockRequest($body) {
-
-        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
-        $xml->registerXPathNamespace('d','DAV:');
-        $lockInfo = new Sabre_DAV_Locks_LockInfo();
-
-        $children = $xml->children("DAV:");
-        $lockInfo->owner = (string)$children->owner;
-
-        $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
-        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
-
-        return $lockInfo;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Mount/Plugin.php b/3rdparty/Sabre/DAV/Mount/Plugin.php
deleted file mode 100644
index b37a90ae99..0000000000
--- a/3rdparty/Sabre/DAV/Mount/Plugin.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * This plugin provides support for RFC4709: Mounting WebDAV servers
- *
- * Simply append ?mount to any collection to generate the davmount response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- */
-class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handles
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?mount
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='mount') return;
-
-        $currentUri = $this->server->httpRequest->getAbsoluteUri();
-
-        // Stripping off everything after the ?
-        list($currentUri) = explode('?',$currentUri);
-
-        $this->davMount($currentUri);
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Generates the davmount response
-     *
-     * @param string $uri absolute uri
-     * @return void
-     */
-    public function davMount($uri) {
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
-        ob_start();
-        echo '<?xml version="1.0"?>', "\n";
-        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
-        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
-        echo "</dm:mount>";
-        $this->server->httpResponse->sendBody(ob_get_clean());
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Node.php b/3rdparty/Sabre/DAV/Node.php
deleted file mode 100644
index 070b7176af..0000000000
--- a/3rdparty/Sabre/DAV/Node.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Node class
- *
- * This is a helper class, that should aid in getting nodes setup.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
-
-    /**
-     * Returns the last modification time
-     *
-     * In this case, it will simply return the current time
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return time();
-
-    }
-
-    /**
-     * Deleted the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ObjectTree.php b/3rdparty/Sabre/DAV/ObjectTree.php
deleted file mode 100644
index bce5146390..0000000000
--- a/3rdparty/Sabre/DAV/ObjectTree.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * ObjectTree class
- *
- * This implementation of the Tree class makes use of the INode, IFile and ICollection API's
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
-
-    /**
-     * The root node
-     *
-     * @var Sabre_DAV_ICollection
-     */
-    protected $rootNode;
-
-    /**
-     * This is the node cache. Accessed nodes are stored here
-     *
-     * @var array
-     */
-    protected $cache = array();
-
-    /**
-     * Creates the object
-     *
-     * This method expects the rootObject to be passed as a parameter
-     *
-     * @param Sabre_DAV_ICollection $rootNode
-     */
-    public function __construct(Sabre_DAV_ICollection $rootNode) {
-
-        $this->rootNode = $rootNode;
-
-    }
-
-    /**
-     * Returns the INode object for the requested path
-     *
-     * @param string $path
-     * @return Sabre_DAV_INode
-     */
-    public function getNodeForPath($path) {
-
-        $path = trim($path,'/');
-        if (isset($this->cache[$path])) return $this->cache[$path];
-
-        //if (!$path || $path=='.') return $this->rootNode;
-        $currentNode = $this->rootNode;
-
-        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node..
-        foreach(explode('/',$path) as $pathPart) {
-
-            // If this part of the path is just a dot, it actually means we can skip it
-            if ($pathPart=='.' || $pathPart=='') continue;
-
-            if (!($currentNode instanceof Sabre_DAV_ICollection))
-                throw new Sabre_DAV_Exception_NotFound('Could not find node at path: ' . $path);
-
-            $currentNode = $currentNode->getChild($pathPart);
-
-        }
-
-        $this->cache[$path] = $currentNode;
-        return $currentNode;
-
-    }
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            // The root always exists
-            if ($path==='') return true;
-
-            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
-
-            $parentNode = $this->getNodeForPath($parent);
-            if (!$parentNode instanceof Sabre_DAV_ICollection) return false;
-            return $parentNode->childExists($base);
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        $children = $node->getChildren();
-        foreach($children as $child) {
-
-            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes
-     *
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     *
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path
-     * @return void
-     */
-    public function markDirty($path) {
-
-        // We don't care enough about sub-paths
-        // flushing the entire cache
-        $path = trim($path,'/');
-        foreach($this->cache as $nodePath=>$node) {
-            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
-                unset($this->cache[$nodePath]);
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property.php b/3rdparty/Sabre/DAV/Property.php
deleted file mode 100644
index 1cfada3236..0000000000
--- a/3rdparty/Sabre/DAV/Property.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Abstract property class
- *
- * Extend this class to create custom complex properties
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Property {
-
-    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop);
-
-    static function unserialize(DOMElement $prop) {
-
-        throw new Sabre_DAV_Exception('Unserialize has not been implemented for this class');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/GetLastModified.php b/3rdparty/Sabre/DAV/Property/GetLastModified.php
deleted file mode 100644
index bd63f57314..0000000000
--- a/3rdparty/Sabre/DAV/Property/GetLastModified.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This property represents the {DAV:}getlastmodified property.
- *
- * Although this is normally a simple property, windows requires us to add
- * some new attributes.
- *
- * This class uses unix timestamps internally, and converts them to RFC 1123 times for
- * serialization
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
-
-    /**
-     * time
-     *
-     * @var int
-     */
-    public $time;
-
-    /**
-     * __construct
-     *
-     * @param int|DateTime $time
-     */
-    public function __construct($time) {
-
-        if ($time instanceof DateTime) {
-            $this->time = $time;
-        } elseif (is_int($time) || ctype_digit($time)) {
-            $this->time = new DateTime('@' . $time);
-        } else {
-            $this->time = new DateTime($time);
-        }
-
-        // Setting timezone to UTC
-        $this->time->setTimezone(new DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement       $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
-        $prop->setAttribute('b:dt','dateTime.rfc1123');
-        $prop->nodeValue = Sabre_HTTP_Util::toHTTPDate($this->time);
-
-    }
-
-    /**
-     * getTime
-     *
-     * @return DateTime
-     */
-    public function getTime() {
-
-        return $this->time;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/Href.php b/3rdparty/Sabre/DAV/Property/Href.php
deleted file mode 100644
index dac564f24d..0000000000
--- a/3rdparty/Sabre/DAV/Property/Href.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Href property
- *
- * The href property represents a url within a {DAV:}href element.
- * This is used by many WebDAV extensions, but not really within the WebDAV core spec
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * href
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct
-     *
-     * @param string $href
-     * @param bool $autoPrefix
-     */
-    public function __construct($href, $autoPrefix = true) {
-
-        $this->href = $href;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uri
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        $elem = $dom->ownerDocument->createElement($prefix . ':href');
-        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
-        $dom->appendChild($elem);
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_Href
-     */
-    static function unserialize(DOMElement $dom) {
-
-        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
-            return new self($dom->firstChild->textContent,false);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/HrefList.php b/3rdparty/Sabre/DAV/Property/HrefList.php
deleted file mode 100644
index 7a52272e88..0000000000
--- a/3rdparty/Sabre/DAV/Property/HrefList.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * HrefList property
- *
- * This property contains multiple {DAV:}href elements, each containing a url.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
-
-    /**
-     * hrefs
-     *
-     * @var array
-     */
-    private $hrefs;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct
-     *
-     * @param array $hrefs
-     * @param bool $autoPrefix
-     */
-    public function __construct(array $hrefs, $autoPrefix = true) {
-
-        $this->hrefs = $hrefs;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uris
-     *
-     * @return array
-     */
-    public function getHrefs() {
-
-        return $this->hrefs;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        foreach($this->hrefs as $href) {
-            $elem = $dom->ownerDocument->createElement($prefix . ':href');
-            $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $href;
-            $dom->appendChild($elem);
-        }
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_Href
-     */
-    static function unserialize(DOMElement $dom) {
-
-        $hrefs = array();
-        foreach($dom->childNodes as $child) {
-            if (Sabre_DAV_XMLUtil::toClarkNotation($child)==='{DAV:}href') {
-                $hrefs[] = $child->textContent;
-            }
-        }
-        return new self($hrefs, false);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php
deleted file mode 100644
index 5c0409064c..0000000000
--- a/3rdparty/Sabre/DAV/Property/IHref.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * IHref interface
- *
- * Any property implementing this interface can expose a related url.
- * This is used by certain subsystems to aquire more information about for example
- * the owner of a file
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_Property_IHref {
-
-    /**
-     * getHref
-     *
-     * @return string
-     */
-    function getHref();
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/LockDiscovery.php b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
deleted file mode 100644
index 2ded5649a4..0000000000
--- a/3rdparty/Sabre/DAV/Property/LockDiscovery.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Represents {DAV:}lockdiscovery property
- *
- * This property contains all the open locks on a given resource
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
-
-    /**
-     * locks
-     *
-     * @var array
-     */
-    public $locks;
-
-    /**
-     * Should we show the locktoken as well?
-     *
-     * @var bool
-     */
-    public $revealLockToken;
-
-    /**
-     * Hides the {DAV:}lockroot element from the response.
-     *
-     * It was reported that showing the lockroot in the response can break
-     * Office 2000 compatibility.
-     */
-    static public $hideLockRoot = false;
-
-    /**
-     * __construct
-     *
-     * @param array $locks
-     * @param bool $revealLockToken
-     */
-    public function __construct($locks, $revealLockToken = false) {
-
-        $this->locks = $locks;
-        $this->revealLockToken = $revealLockToken;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement       $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        foreach($this->locks as $lock) {
-
-            $activeLock = $doc->createElementNS('DAV:','d:activelock');
-            $prop->appendChild($activeLock);
-
-            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
-            $activeLock->appendChild($lockScope);
-
-            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
-
-            $lockType = $doc->createElementNS('DAV:','d:locktype');
-            $activeLock->appendChild($lockType);
-
-            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
-
-            /* {DAV:}lockroot */
-            if (!self::$hideLockRoot) {
-                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
-                $activeLock->appendChild($lockRoot);
-                $href = $doc->createElementNS('DAV:','d:href');
-                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
-                $lockRoot->appendChild($href);
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
-
-            if ($this->revealLockToken) {
-                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
-                $activeLock->appendChild($lockToken);
-                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/ResourceType.php b/3rdparty/Sabre/DAV/Property/ResourceType.php
deleted file mode 100644
index f6269611e5..0000000000
--- a/3rdparty/Sabre/DAV/Property/ResourceType.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}resourcetype property
- *
- * Normally for files this is empty, and for collection {DAV:}collection.
- * However, other specs define different values for this.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
-
-    /**
-     * resourceType
-     *
-     * @var array
-     */
-    public $resourceType = array();
-
-    /**
-     * __construct
-     *
-     * @param mixed $resourceType
-     */
-    public function __construct($resourceType = array()) {
-
-        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
-            $this->resourceType = array();
-        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
-            $this->resourceType = array('{DAV:}collection');
-        elseif (is_array($resourceType))
-            $this->resourceType = $resourceType;
-        else
-            $this->resourceType = array($resourceType);
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $propName = null;
-        $rt = $this->resourceType;
-
-        foreach($rt as $resourceType) {
-            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) {
-
-                if (isset($server->xmlNamespaces[$propName[1]])) {
-                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
-                } else {
-                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
-                }
-
-            }
-        }
-
-    }
-
-    /**
-     * Returns the values in clark-notation
-     *
-     * For example array('{DAV:}collection')
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->resourceType;
-
-    }
-
-    /**
-     * Checks if the principal contains a certain value
-     *
-     * @param string $type
-     * @return bool
-     */
-    public function is($type) {
-
-        return in_array($type, $this->resourceType);
-
-    }
-
-    /**
-     * Adds a resourcetype value to this property
-     *
-     * @param string $type
-     * @return void
-     */
-    public function add($type) {
-
-        $this->resourceType[] = $type;
-        $this->resourceType = array_unique($this->resourceType);
-
-    }
-
-    /**
-     * Unserializes a DOM element into a ResourceType property.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_ResourceType
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $value = array();
-        foreach($dom->childNodes as $child) {
-
-            $value[] = Sabre_DAV_XMLUtil::toClarkNotation($child);
-
-        }
-
-        return new self($value);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/Response.php b/3rdparty/Sabre/DAV/Property/Response.php
deleted file mode 100644
index 88afbcfb26..0000000000
--- a/3rdparty/Sabre/DAV/Property/Response.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * Response property
- *
- * This class represents the {DAV:}response XML element.
- * This is used by the Server class to encode individual items within a multistatus
- * response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * Url for the response
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Propertylist, ordered by HTTP status code
-     *
-     * @var array
-     */
-    private $responseProperties;
-
-    /**
-     * The responseProperties argument is a list of properties
-     * within an array with keys representing HTTP status codes
-     *
-     * @param string $href
-     * @param array $responseProperties
-     */
-    public function __construct($href, array $responseProperties) {
-
-        $this->href = $href;
-        $this->responseProperties = $responseProperties;
-
-    }
-
-    /**
-     * Returns the url
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Returns the property list
-     *
-     * @return array
-     */
-    public function getResponseProperties() {
-
-        return $this->responseProperties;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
-
-        $document = $dom->ownerDocument;
-        $properties = $this->responseProperties;
-
-        $xresponse = $document->createElement('d:response');
-        $dom->appendChild($xresponse);
-
-        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
-
-        // Adding the baseurl to the beginning of the url
-        $uri = $server->getBaseUri() . $uri;
-
-        $xresponse->appendChild($document->createElement('d:href',$uri));
-
-        // The properties variable is an array containing properties, grouped by
-        // HTTP status
-        foreach($properties as $httpStatus=>$propertyGroup) {
-
-            // The 'href' is also in this array, and it's special cased.
-            // We will ignore it
-            if ($httpStatus=='href') continue;
-
-            // If there are no properties in this group, we can also just carry on
-            if (!count($propertyGroup)) continue;
-
-            $xpropstat = $document->createElement('d:propstat');
-            $xresponse->appendChild($xpropstat);
-
-            $xprop = $document->createElement('d:prop');
-            $xpropstat->appendChild($xprop);
-
-            $nsList = $server->xmlNamespaces;
-
-            foreach($propertyGroup as $propertyName=>$propertyValue) {
-
-                $propName = null;
-                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-                // special case for empty namespaces
-                if ($propName[1]=='') {
-
-                    $currentProperty = $document->createElement($propName[2]);
-                    $xprop->appendChild($currentProperty);
-                    $currentProperty->setAttribute('xmlns','');
-
-                } else {
-
-                    if (!isset($nsList[$propName[1]])) {
-                        $nsList[$propName[1]] = 'x' . count($nsList);
-                    }
-
-                    // If the namespace was defined in the top-level xml namespaces, it means
-                    // there was already a namespace declaration, and we don't have to worry about it.
-                    if (isset($server->xmlNamespaces[$propName[1]])) {
-                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-                    } else {
-                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
-                    }
-                    $xprop->appendChild($currentProperty);
-
-                }
-
-                if (is_scalar($propertyValue)) {
-                    $text = $document->createTextNode($propertyValue);
-                    $currentProperty->appendChild($text);
-                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
-                    $propertyValue->serialize($server,$currentProperty);
-                } elseif (!is_null($propertyValue)) {
-                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
-                }
-
-            }
-
-            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/ResponseList.php b/3rdparty/Sabre/DAV/Property/ResponseList.php
deleted file mode 100644
index cae923afbf..0000000000
--- a/3rdparty/Sabre/DAV/Property/ResponseList.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * ResponseList property
- *
- * This class represents multiple {DAV:}response XML elements.
- * This is used by the Server class to encode items within a multistatus
- * response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
-
-    /**
-     * Response objects.
-     *
-     * @var array
-     */
-    private $responses;
-
-    /**
-     * The only valid argument is a list of Sabre_DAV_Property_Response
-     * objects.
-     *
-     * @param array $responses;
-     */
-    public function __construct($responses) {
-
-        foreach($responses as $response) {
-            if (!($response instanceof Sabre_DAV_Property_Response)) {
-                throw new InvalidArgumentException('You must pass an array of Sabre_DAV_Property_Response objects');
-            }
-        }
-        $this->responses = $responses;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        foreach($this->responses as $response) {
-            $response->serialize($server, $dom);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/SupportedLock.php b/3rdparty/Sabre/DAV/Property/SupportedLock.php
deleted file mode 100644
index 4e3aaf23a1..0000000000
--- a/3rdparty/Sabre/DAV/Property/SupportedLock.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}supportedlock property
- *
- * This property contains information about what kind of locks
- * this server supports.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
-
-    /**
-     * supportsLocks
-     *
-     * @var mixed
-     */
-    public $supportsLocks = false;
-
-    /**
-     * __construct
-     *
-     * @param mixed $supportsLocks
-     */
-    public function __construct($supportsLocks) {
-
-        $this->supportsLocks = $supportsLocks;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement       $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        if (!$this->supportsLocks) return null;
-
-        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
-        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
-
-        $prop->appendChild($lockEntry1);
-        $prop->appendChild($lockEntry2);
-
-        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
-        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
-        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
-        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
-
-        $lockEntry1->appendChild($lockScope1);
-        $lockEntry1->appendChild($lockType1);
-        $lockEntry2->appendChild($lockScope2);
-        $lockEntry2->appendChild($lockType2);
-
-        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
-        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
-
-        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
-        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
-
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
deleted file mode 100644
index e62699f3b5..0000000000
--- a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * supported-report-set property.
- *
- * This property is defined in RFC3253, but since it's
- * so common in other webdav-related specs, it is part of the core server.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
-
-    /**
-     * List of reports
-     *
-     * @var array
-     */
-    protected $reports = array();
-
-    /**
-     * Creates the property
-     *
-     * Any reports passed in the constructor
-     * should be valid report-types in clark-notation.
-     *
-     * Either a string or an array of strings must be passed.
-     *
-     * @param mixed $reports
-     */
-    public function __construct($reports = null) {
-
-        if (!is_null($reports))
-            $this->addReport($reports);
-
-    }
-
-    /**
-     * Adds a report to this property
-     *
-     * The report must be a string in clark-notation.
-     * Multiple reports can be specified as an array.
-     *
-     * @param mixed $report
-     * @return void
-     */
-    public function addReport($report) {
-
-        if (!is_array($report)) $report = array($report);
-
-        foreach($report as $r) {
-
-            if (!preg_match('/^{([^}]*)}(.*)$/',$r))
-                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
-
-            $this->reports[] = $r;
-
-        }
-
-    }
-
-    /**
-     * Returns the list of supported reports
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->reports;
-
-    }
-
-    /**
-     * Serializes the node
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        foreach($this->reports as $reportName) {
-
-            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
-            $prop->appendChild($supportedReport);
-
-            $report = $prop->ownerDocument->createElement('d:report');
-            $supportedReport->appendChild($report);
-
-            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
-
-            list(, $namespace, $element) = $matches;
-
-            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
-
-            if ($prefix) {
-                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
-            } else {
-                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
-            }
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
deleted file mode 100644
index 50b190e8fa..0000000000
--- a/3rdparty/Sabre/DAV/Server.php
+++ /dev/null
@@ -1,1999 +0,0 @@
-<?php
-
-/**
- * Main DAV server class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Server {
-
-    /**
-     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
-     */
-    const DEPTH_INFINITY = -1;
-
-    /**
-     * Nodes that are files, should have this as the type property
-     */
-    const NODE_FILE = 1;
-
-    /**
-     * Nodes that are directories, should use this value as the type property
-     */
-    const NODE_DIRECTORY = 2;
-
-    /**
-     * XML namespace for all SabreDAV related elements
-     */
-    const NS_SABREDAV = 'http://sabredav.org/ns';
-
-    /**
-     * The tree object
-     *
-     * @var Sabre_DAV_Tree
-     */
-    public $tree;
-
-    /**
-     * The base uri
-     *
-     * @var string
-     */
-    protected $baseUri = null;
-
-    /**
-     * httpResponse
-     *
-     * @var Sabre_HTTP_Response
-     */
-    public $httpResponse;
-
-    /**
-     * httpRequest
-     *
-     * @var Sabre_HTTP_Request
-     */
-    public $httpRequest;
-
-    /**
-     * The list of plugins
-     *
-     * @var array
-     */
-    protected $plugins = array();
-
-    /**
-     * This array contains a list of callbacks we should call when certain events are triggered
-     *
-     * @var array
-     */
-    protected $eventSubscriptions = array();
-
-    /**
-     * This is a default list of namespaces.
-     *
-     * If you are defining your own custom namespace, add it here to reduce
-     * bandwidth and improve legibility of xml bodies.
-     *
-     * @var array
-     */
-    public $xmlNamespaces = array(
-        'DAV:' => 'd',
-        'http://sabredav.org/ns' => 's',
-    );
-
-    /**
-     * The propertymap can be used to map properties from
-     * requests to property classes.
-     *
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}resourcetype' => 'Sabre_DAV_Property_ResourceType',
-    );
-
-    public $protectedProperties = array(
-        // RFC4918
-        '{DAV:}getcontentlength',
-        '{DAV:}getetag',
-        '{DAV:}getlastmodified',
-        '{DAV:}lockdiscovery',
-        '{DAV:}resourcetype',
-        '{DAV:}supportedlock',
-
-        // RFC4331
-        '{DAV:}quota-available-bytes',
-        '{DAV:}quota-used-bytes',
-
-        // RFC3744
-        '{DAV:}supported-privilege-set',
-        '{DAV:}current-user-privilege-set',
-        '{DAV:}acl',
-        '{DAV:}acl-restrictions',
-        '{DAV:}inherited-acl-set',
-
-    );
-
-    /**
-     * This is a flag that allow or not showing file, line and code
-     * of the exception in the returned XML
-     *
-     * @var bool
-     */
-    public $debugExceptions = false;
-
-    /**
-     * This property allows you to automatically add the 'resourcetype' value
-     * based on a node's classname or interface.
-     *
-     * The preset ensures that {DAV:}collection is automaticlly added for nodes
-     * implementing Sabre_DAV_ICollection.
-     *
-     * @var array
-     */
-    public $resourceTypeMapping = array(
-        'Sabre_DAV_ICollection' => '{DAV:}collection',
-    );
-
-    /**
-     * If this setting is turned off, SabreDAV's version number will be hidden
-     * from various places.
-     *
-     * Some people feel this is a good security measure.
-     *
-     * @var bool
-     */
-    static public $exposeVersion = true;
-
-    /**
-     * Sets up the server
-     *
-     * If a Sabre_DAV_Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
-     * will create a Sabre_DAV_ObjectTree and use the node as the root.
-     *
-     * If nothing is passed, a Sabre_DAV_SimpleCollection is created in
-     * a Sabre_DAV_ObjectTree.
-     *
-     * If an array is passed, we automatically create a root node, and use
-     * the nodes in the array as top-level children.
-     *
-     * @param Sabre_DAV_Tree|Sabre_DAV_INode|null $treeOrNode The tree object
-     */
-    public function __construct($treeOrNode = null) {
-
-        if ($treeOrNode instanceof Sabre_DAV_Tree) {
-            $this->tree = $treeOrNode;
-        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
-            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
-        } elseif (is_array($treeOrNode)) {
-
-            // If it's an array, a list of nodes was passed, and we need to
-            // create the root node.
-            foreach($treeOrNode as $node) {
-                if (!($node instanceof Sabre_DAV_INode)) {
-                    throw new Sabre_DAV_Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre_DAV_INode');
-                }
-            }
-
-            $root = new Sabre_DAV_SimpleCollection('root', $treeOrNode);
-            $this->tree = new Sabre_DAV_ObjectTree($root);
-
-        } elseif (is_null($treeOrNode)) {
-            $root = new Sabre_DAV_SimpleCollection('root');
-            $this->tree = new Sabre_DAV_ObjectTree($root);
-        } else {
-            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode, an array or null');
-        }
-        $this->httpResponse = new Sabre_HTTP_Response();
-        $this->httpRequest = new Sabre_HTTP_Request();
-
-    }
-
-    /**
-     * Starts the DAV Server
-     *
-     * @return void
-     */
-    public function exec() {
-
-        try {
-
-            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
-
-        } catch (Exception $e) {
-
-            $DOM = new DOMDocument('1.0','utf-8');
-            $DOM->formatOutput = true;
-
-            $error = $DOM->createElementNS('DAV:','d:error');
-            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
-            $DOM->appendChild($error);
-
-            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
-            $error->appendChild($DOM->createElement('s:message',htmlentities($e->getMessage())));
-            if ($this->debugExceptions) {
-                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
-                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
-                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
-                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
-
-            }
-            if (self::$exposeVersion) {
-                $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
-            }
-
-            if($e instanceof Sabre_DAV_Exception) {
-
-                $httpCode = $e->getHTTPCode();
-                $e->serialize($this,$error);
-                $headers = $e->getHTTPHeaders($this);
-
-            } else {
-
-                $httpCode = 500;
-                $headers = array();
-
-            }
-            $headers['Content-Type'] = 'application/xml; charset=utf-8';
-
-            $this->httpResponse->sendStatus($httpCode);
-            $this->httpResponse->setHeaders($headers);
-            $this->httpResponse->sendBody($DOM->saveXML());
-
-        }
-
-    }
-
-    /**
-     * Sets the base server uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function setBaseUri($uri) {
-
-        // If the baseUri does not end with a slash, we must add it
-        if ($uri[strlen($uri)-1]!=='/')
-            $uri.='/';
-
-        $this->baseUri = $uri;
-
-    }
-
-    /**
-     * Returns the base responding uri
-     *
-     * @return string
-     */
-    public function getBaseUri() {
-
-        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
-        return $this->baseUri;
-
-    }
-
-    /**
-     * This method attempts to detect the base uri.
-     * Only the PATH_INFO variable is considered.
-     *
-     * If this variable is not set, the root (/) is assumed.
-     *
-     * @return string
-     */
-    public function guessBaseUri() {
-
-        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
-        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
-
-        // If PATH_INFO is found, we can assume it's accurate.
-        if (!empty($pathInfo)) {
-
-            // We need to make sure we ignore the QUERY_STRING part
-            if ($pos = strpos($uri,'?'))
-                $uri = substr($uri,0,$pos);
-
-            // PATH_INFO is only set for urls, such as: /example.php/path
-            // in that case PATH_INFO contains '/path'.
-            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
-            // not, Therefore they are only comparable if we first decode
-            // REQUEST_INFO as well.
-            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
-
-            // A simple sanity check:
-            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
-                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
-                return rtrim($baseUri,'/') . '/';
-            }
-
-            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
-
-        }
-
-        // The last fallback is that we're just going to assume the server root.
-        return '/';
-
-    }
-
-    /**
-     * Adds a plugin to the server
-     *
-     * For more information, console the documentation of Sabre_DAV_ServerPlugin
-     *
-     * @param Sabre_DAV_ServerPlugin $plugin
-     * @return void
-     */
-    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
-
-        $this->plugins[$plugin->getPluginName()] = $plugin;
-        $plugin->initialize($this);
-
-    }
-
-    /**
-     * Returns an initialized plugin by it's name.
-     *
-     * This function returns null if the plugin was not found.
-     *
-     * @param string $name
-     * @return Sabre_DAV_ServerPlugin
-     */
-    public function getPlugin($name) {
-
-        if (isset($this->plugins[$name]))
-            return $this->plugins[$name];
-
-        // This is a fallback and deprecated.
-        foreach($this->plugins as $plugin) {
-            if (get_class($plugin)===$name) return $plugin;
-        }
-
-        return null;
-
-    }
-
-    /**
-     * Returns all plugins
-     *
-     * @return array
-     */
-    public function getPlugins() {
-
-        return $this->plugins;
-
-    }
-
-
-    /**
-     * Subscribe to an event.
-     *
-     * When the event is triggered, we'll call all the specified callbacks.
-     * It is possible to control the order of the callbacks through the
-     * priority argument.
-     *
-     * This is for example used to make sure that the authentication plugin
-     * is triggered before anything else. If it's not needed to change this
-     * number, it is recommended to ommit.
-     *
-     * @param string $event
-     * @param callback $callback
-     * @param int $priority
-     * @return void
-     */
-    public function subscribeEvent($event, $callback, $priority = 100) {
-
-        if (!isset($this->eventSubscriptions[$event])) {
-            $this->eventSubscriptions[$event] = array();
-        }
-        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
-        $this->eventSubscriptions[$event][$priority] = $callback;
-        ksort($this->eventSubscriptions[$event]);
-
-    }
-
-    /**
-     * Broadcasts an event
-     *
-     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
-     *
-     * The arguments parameter will be sent to all subscribers
-     *
-     * @param string $eventName
-     * @param array $arguments
-     * @return bool
-     */
-    public function broadcastEvent($eventName,$arguments = array()) {
-
-        if (isset($this->eventSubscriptions[$eventName])) {
-
-            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
-
-                $result = call_user_func_array($subscriber,$arguments);
-                if ($result===false) return false;
-
-            }
-
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Handles a http request, and execute a method based on its name
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function invokeMethod($method, $uri) {
-
-        $method = strtoupper($method);
-
-        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
-
-        // Make sure this is a HTTP method we support
-        $internalMethods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'MKCOL',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        if (in_array($method,$internalMethods)) {
-
-            call_user_func(array($this,'http' . $method), $uri);
-
-        } else {
-
-            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
-                // Unsupported method
-                throw new Sabre_DAV_Exception_NotImplemented('There was no handler found for this "' . $method . '" method');
-            }
-
-        }
-
-    }
-
-    // {{{ HTTP Method implementations
-
-    /**
-     * HTTP OPTIONS
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpOptions($uri) {
-
-        $methods = $this->getAllowedMethods($uri);
-
-        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
-        $features = array('1','3', 'extended-mkcol');
-
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-        $this->httpResponse->setHeader('MS-Author-Via','DAV');
-        $this->httpResponse->setHeader('Accept-Ranges','bytes');
-        if (self::$exposeVersion) {
-            $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
-        }
-        $this->httpResponse->setHeader('Content-Length',0);
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP GET
-     *
-     * This method simply fetches the contents of a uri, like normal
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpGet($uri) {
-
-        $node = $this->tree->getNodeForPath($uri,0);
-
-        if (!$this->checkPreconditions(true)) return false;
-
-        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
-        $body = $node->get();
-
-        // Converting string into stream, if needed.
-        if (is_string($body)) {
-            $stream = fopen('php://temp','r+');
-            fwrite($stream,$body);
-            rewind($stream);
-            $body = $stream;
-        }
-
-        /*
-         * TODO: getetag, getlastmodified, getsize should also be used using
-         * this method
-         */
-        $httpHeaders = $this->getHTTPHeaders($uri);
-
-        /* ContentType needs to get a default, because many webservers will otherwise
-         * default to text/html, and we don't want this for security reasons.
-         */
-        if (!isset($httpHeaders['Content-Type'])) {
-            $httpHeaders['Content-Type'] = 'application/octet-stream';
-        }
-
-
-        if (isset($httpHeaders['Content-Length'])) {
-
-            $nodeSize = $httpHeaders['Content-Length'];
-
-            // Need to unset Content-Length, because we'll handle that during figuring out the range
-            unset($httpHeaders['Content-Length']);
-
-        } else {
-            $nodeSize = null;
-        }
-
-        $this->httpResponse->setHeaders($httpHeaders);
-
-        $range = $this->getHTTPRange();
-        $ifRange = $this->httpRequest->getHeader('If-Range');
-        $ignoreRangeHeader = false;
-
-        // If ifRange is set, and range is specified, we first need to check
-        // the precondition.
-        if ($nodeSize && $range && $ifRange) {
-
-            // if IfRange is parsable as a date we'll treat it as a DateTime
-            // otherwise, we must treat it as an etag.
-            try {
-                $ifRangeDate = new DateTime($ifRange);
-
-                // It's a date. We must check if the entity is modified since
-                // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
-                    $modified = new DateTime($httpHeaders['Last-Modified']);
-                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
-                }
-
-            } catch (Exception $e) {
-
-                // It's an entity. We can do a simple comparison.
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
-            }
-        }
-
-        // We're only going to support HTTP ranges if the backend provided a filesize
-        if (!$ignoreRangeHeader && $nodeSize && $range) {
-
-            // Determining the exact byte offsets
-            if (!is_null($range[0])) {
-
-                $start = $range[0];
-                $end = $range[1]?$range[1]:$nodeSize-1;
-                if($start >= $nodeSize)
-                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
-
-                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if($end >= $nodeSize) $end = $nodeSize-1;
-
-            } else {
-
-                $start = $nodeSize-$range[1];
-                $end  = $nodeSize-1;
-
-                if ($start<0) $start = 0;
-
-            }
-
-            // New read/write stream
-            $newStream = fopen('php://temp','r+');
-
-            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
-            rewind($newStream);
-
-            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
-            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
-            $this->httpResponse->sendStatus(206);
-            $this->httpResponse->sendBody($newStream);
-
-
-        } else {
-
-            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
-            $this->httpResponse->sendStatus(200);
-            $this->httpResponse->sendBody($body);
-
-        }
-
-    }
-
-    /**
-     * HTTP HEAD
-     *
-     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
-     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpHead($uri) {
-
-        $node = $this->tree->getNodeForPath($uri);
-        /* This information is only collection for File objects.
-         * Ideally we want to throw 405 Method Not Allowed for every
-         * non-file, but MS Office does not like this
-         */
-        if ($node instanceof Sabre_DAV_IFile) {
-            $headers = $this->getHTTPHeaders($this->getRequestUri());
-            if (!isset($headers['Content-Type'])) {
-                $headers['Content-Type'] = 'application/octet-stream';
-            }
-            $this->httpResponse->setHeaders($headers);
-        }
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP Delete
-     *
-     * The HTTP delete method, deletes a given uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpDelete($uri) {
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-        $this->tree->delete($uri);
-        $this->broadcastEvent('afterUnbind',array($uri));
-
-        $this->httpResponse->sendStatus(204);
-        $this->httpResponse->setHeader('Content-Length','0');
-
-    }
-
-
-    /**
-     * WebDAV PROPFIND
-     *
-     * This WebDAV method requests information about an uri resource, or a list of resources
-     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
-     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
-     *
-     * The request body contains an XML data structure that has a list of properties the client understands
-     * The response body is also an xml document, containing information about every uri resource and the requested properties
-     *
-     * It has to return a HTTP 207 Multi-status status code
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropfind($uri) {
-
-        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
-        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
-
-        $depth = $this->getHTTPDepth(1);
-        // The only two options for the depth of a propfind is 0 or 1
-        if ($depth!=0) $depth = 1;
-
-        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
-
-        // This is a multi-status response
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        // Normally this header is only needed for OPTIONS responses, however..
-        // iCal seems to also depend on these being set for PROPFIND. Since
-        // this is not harmful, we'll add it.
-        $features = array('1','3', 'extended-mkcol');
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-
-        $data = $this->generateMultiStatus($newProperties);
-        $this->httpResponse->sendBody($data);
-
-    }
-
-    /**
-     * WebDAV PROPPATCH
-     *
-     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
-     * In this XML body it is specified which properties should be set/updated and/or deleted
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropPatch($uri) {
-
-        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
-
-        $result = $this->updateProperties($uri, $newProperties);
-
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->httpResponse->sendBody(
-            $this->generateMultiStatus(array($result))
-        );
-
-    }
-
-    /**
-     * HTTP PUT method
-     *
-     * This HTTP method updates a file, or creates a new one.
-     *
-     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpPut($uri) {
-
-        $body = $this->httpRequest->getBody();
-
-        // Intercepting Content-Range
-        if ($this->httpRequest->getHeader('Content-Range')) {
-            /**
-            Content-Range is dangerous for PUT requests:  PUT per definition
-            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
-            in section 7.6:
-              An origin server SHOULD reject any PUT request that contains a
-              Content-Range header field, since it might be misinterpreted as
-              partial content (or might be partial content that is being mistakenly
-              PUT as a full representation).  Partial content updates are possible
-              by targeting a separately identified resource with state that
-              overlaps a portion of the larger resource, or by using a different
-              method that has been specifically defined for partial updates (for
-              example, the PATCH method defined in [RFC5789]).
-            This clarifies RFC2616 section 9.6:
-              The recipient of the entity MUST NOT ignore any Content-*
-              (e.g. Content-Range) headers that it does not understand or implement
-              and MUST return a 501 (Not Implemented) response in such cases.
-            OTOH is a PUT request with a Content-Range currently the only way to
-            continue an aborted upload request and is supported by curl, mod_dav,
-            Tomcat and others.  Since some clients do use this feature which results
-            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
-            all PUT requests with a Content-Range for now.
-            */
-
-            throw new Sabre_DAV_Exception_NotImplemented('PUT with Content-Range is not allowed.');
-        }
-
-        // Intercepting the Finder problem
-        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
-
-            /**
-            Many webservers will not cooperate well with Finder PUT requests,
-            because it uses 'Chunked' transfer encoding for the request body.
-
-            The symptom of this problem is that Finder sends files to the
-            server, but they arrive as 0-length files in PHP.
-
-            If we don't do anything, the user might think they are uploading
-            files successfully, but they end up empty on the server. Instead,
-            we throw back an error if we detect this.
-
-            The reason Finder uses Chunked, is because it thinks the files
-            might change as it's being uploaded, and therefore the
-            Content-Length can vary.
-
-            Instead it sends the X-Expected-Entity-Length header with the size
-            of the file at the very start of the request. If this header is set,
-            but we don't get a request body we will fail the request to
-            protect the end-user.
-            */
-
-            // Only reading first byte
-            $firstByte = fread($body,1);
-            if (strlen($firstByte)!==1) {
-                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
-            }
-
-            // The body needs to stay intact, so we copy everything to a
-            // temporary stream.
-
-            $newBody = fopen('php://temp','r+');
-            fwrite($newBody,$firstByte);
-            stream_copy_to_stream($body, $newBody);
-            rewind($newBody);
-
-            $body = $newBody;
-
-        }
-
-        if ($this->tree->nodeExists($uri)) {
-
-            $node = $this->tree->getNodeForPath($uri);
-
-            // Checking If-None-Match and related headers.
-            if (!$this->checkPreconditions()) return;
-
-            // If the node is a collection, we'll deny it
-            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
-            if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false;
-
-            $etag = $node->put($body);
-
-            $this->broadcastEvent('afterWriteContent',array($uri, $node));
-
-            $this->httpResponse->setHeader('Content-Length','0');
-            if ($etag) $this->httpResponse->setHeader('ETag',$etag);
-            $this->httpResponse->sendStatus(204);
-
-        } else {
-
-            $etag = null;
-            // If we got here, the resource didn't exist yet.
-            if (!$this->createFile($this->getRequestUri(),$body,$etag)) {
-                // For one reason or another the file was not created.
-                return;
-            }
-
-            $this->httpResponse->setHeader('Content-Length','0');
-            if ($etag) $this->httpResponse->setHeader('ETag', $etag);
-            $this->httpResponse->sendStatus(201);
-
-        }
-
-    }
-
-
-    /**
-     * WebDAV MKCOL
-     *
-     * The MKCOL method is used to create a new collection (directory) on the server
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMkcol($uri) {
-
-        $requestBody = $this->httpRequest->getBody(true);
-
-        if ($requestBody) {
-
-            $contentType = $this->httpRequest->getHeader('Content-Type');
-            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
-
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
-
-            }
-
-            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
-            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
-
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
-
-            }
-
-            $properties = array();
-            foreach($dom->firstChild->childNodes as $childNode) {
-
-                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
-                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
-
-            }
-            if (!isset($properties['{DAV:}resourcetype']))
-                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');
-
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-            unset($properties['{DAV:}resourcetype']);
-
-        } else {
-
-            $properties = array();
-            $resourceType = array('{DAV:}collection');
-
-        }
-
-        $result = $this->createCollection($uri, $resourceType, $properties);
-
-        if (is_array($result)) {
-            $this->httpResponse->sendStatus(207);
-            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-            $this->httpResponse->sendBody(
-                $this->generateMultiStatus(array($result))
-            );
-
-        } else {
-            $this->httpResponse->setHeader('Content-Length','0');
-            $this->httpResponse->sendStatus(201);
-        }
-
-    }
-
-    /**
-     * WebDAV HTTP MOVE method
-     *
-     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMove($uri) {
-
-        $moveInfo = $this->getCopyAndMoveInfo();
-
-        // If the destination is part of the source tree, we must fail
-        if ($moveInfo['destination']==$uri)
-            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
-
-        if ($moveInfo['destinationExists']) {
-
-            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
-            $this->tree->delete($moveInfo['destination']);
-            $this->broadcastEvent('afterUnbind',array($moveInfo['destination']));
-
-        }
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
-        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
-        $this->tree->move($uri,$moveInfo['destination']);
-        $this->broadcastEvent('afterUnbind',array($uri));
-        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
-
-    }
-
-    /**
-     * WebDAV HTTP COPY method
-     *
-     * This method copies one uri to a different uri, and works much like the MOVE request
-     * A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpCopy($uri) {
-
-        $copyInfo = $this->getCopyAndMoveInfo();
-        // If the destination is part of the source tree, we must fail
-        if ($copyInfo['destination']==$uri)
-            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
-
-        if ($copyInfo['destinationExists']) {
-            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
-            $this->tree->delete($copyInfo['destination']);
-
-        }
-        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
-        $this->tree->copy($uri,$copyInfo['destination']);
-        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
-
-    }
-
-
-
-    /**
-     * HTTP REPORT method implementation
-     *
-     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
-     * It's used in a lot of extensions, so it made sense to implement it into the core.
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpReport($uri) {
-
-        $body = $this->httpRequest->getBody(true);
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
-
-        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
-
-            // If broadcastEvent returned true, it means the report was not supported
-            throw new Sabre_DAV_Exception_ReportNotImplemented();
-
-        }
-
-    }
-
-    // }}}
-    // {{{ HTTP/WebDAV protocol helpers
-
-    /**
-     * Returns an array with all the supported HTTP methods for a specific uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getAllowedMethods($uri) {
-
-        $methods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        // The MKCOL is only allowed on an unmapped uri
-        try {
-            $this->tree->getNodeForPath($uri);
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            $methods[] = 'MKCOL';
-        }
-
-        // We're also checking if any of the plugins register any new methods
-        foreach($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($uri));
-        array_unique($methods);
-
-        return $methods;
-
-    }
-
-    /**
-     * Gets the uri for the request, keeping the base uri into consideration
-     *
-     * @return string
-     */
-    public function getRequestUri() {
-
-        return $this->calculateUri($this->httpRequest->getUri());
-
-    }
-
-    /**
-     * Calculates the uri for a request, making sure that the base uri is stripped out
-     *
-     * @param string $uri
-     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
-     * @return string
-     */
-    public function calculateUri($uri) {
-
-        if ($uri[0]!='/' && strpos($uri,'://')) {
-
-            $uri = parse_url($uri,PHP_URL_PATH);
-
-        }
-
-        $uri = str_replace('//','/',$uri);
-
-        if (strpos($uri,$this->getBaseUri())===0) {
-
-            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
-
-        // A special case, if the baseUri was accessed without a trailing
-        // slash, we'll accept it as well.
-        } elseif ($uri.'/' === $this->getBaseUri()) {
-
-            return '';
-
-        } else {
-
-            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
-
-        }
-
-    }
-
-    /**
-     * Returns the HTTP depth header
-     *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
-     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
-     *
-     * @param mixed $default
-     * @return int
-     */
-    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
-
-        // If its not set, we'll grab the default
-        $depth = $this->httpRequest->getHeader('Depth');
-
-        if (is_null($depth)) return $default;
-
-        if ($depth == 'infinity') return self::DEPTH_INFINITY;
-
-
-        // If its an unknown value. we'll grab the default
-        if (!ctype_digit($depth)) return $default;
-
-        return (int)$depth;
-
-    }
-
-    /**
-     * Returns the HTTP range header
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header or array($start, $end).
-     *
-     * The first number is the offset of the first byte in the range.
-     * The second number is the offset of the last byte in the range.
-     *
-     * If the second offset is null, it should be treated as the offset of the last byte of the entity
-     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
-     *
-     * @return array|null
-     */
-    public function getHTTPRange() {
-
-        $range = $this->httpRequest->getHeader('range');
-        if (is_null($range)) return null;
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
-
-        if ($matches[1]==='' && $matches[2]==='') return null;
-
-        return array(
-            $matches[1]!==''?$matches[1]:null,
-            $matches[2]!==''?$matches[2]:null,
-        );
-
-    }
-
-
-    /**
-     * Returns information about Copy and Move requests
-     *
-     * This function is created to help getting information about the source and the destination for the
-     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
-     *
-     * The returned value is an array with the following keys:
-     *   * destination - Destination path
-     *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
-     *
-     * @return array
-     */
-    public function getCopyAndMoveInfo() {
-
-        // Collecting the relevant HTTP headers
-        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
-        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
-        $overwrite = $this->httpRequest->getHeader('Overwrite');
-        if (!$overwrite) $overwrite = 'T';
-        if (strtoupper($overwrite)=='T') $overwrite = true;
-        elseif (strtoupper($overwrite)=='F') $overwrite = false;
-        // We need to throw a bad request exception, if the header was invalid
-        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
-
-        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
-
-        try {
-            $destinationParent = $this->tree->getNodeForPath($destinationDir);
-            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            // If the destination parent node is not found, we throw a 409
-            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
-        }
-
-        try {
-
-            $destinationNode = $this->tree->getNodeForPath($destination);
-
-            // If this succeeded, it means the destination already exists
-            // we'll need to throw precondition failed in case overwrite is false
-            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            // Destination didn't exist, we're all good
-            $destinationNode = false;
-
-
-
-        }
-
-        // These are the three relevant properties we need to return
-        return array(
-            'destination'       => $destination,
-            'destinationExists' => $destinationNode==true,
-            'destinationNode'   => $destinationNode,
-        );
-
-    }
-
-    /**
-     * Returns a list of properties for a path
-     *
-     * This is a simplified version getPropertiesForPath.
-     * if you aren't interested in status codes, but you just
-     * want to have a flat list of properties. Use this method.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     */
-    public function getProperties($path, $propertyNames) {
-
-        $result = $this->getPropertiesForPath($path,$propertyNames,0);
-        return $result[0][200];
-
-    }
-
-    /**
-     * A kid-friendly way to fetch properties for a node's children.
-     *
-     * The returned array will be indexed by the path of the of child node.
-     * Only properties that are actually found will be returned.
-     *
-     * The parent node will not be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @return array
-     */
-    public function getPropertiesForChildren($path, $propertyNames) {
-
-        $result = array();
-        foreach($this->getPropertiesForPath($path,$propertyNames,1) as $k=>$row) {
-
-            // Skipping the parent path
-            if ($k === 0) continue;
-
-            $result[$row['href']] = $row[200];
-
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns a list of HTTP headers for a particular resource
-     *
-     * The generated http headers are based on properties provided by the
-     * resource. The method basically provides a simple mapping between
-     * DAV property and HTTP header.
-     *
-     * The headers are intended to be used for HEAD and GET requests.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getHTTPHeaders($path) {
-
-        $propertyMap = array(
-            '{DAV:}getcontenttype'   => 'Content-Type',
-            '{DAV:}getcontentlength' => 'Content-Length',
-            '{DAV:}getlastmodified'  => 'Last-Modified',
-            '{DAV:}getetag'          => 'ETag',
-        );
-
-        $properties = $this->getProperties($path,array_keys($propertyMap));
-
-        $headers = array();
-        foreach($propertyMap as $property=>$header) {
-            if (!isset($properties[$property])) continue;
-
-            if (is_scalar($properties[$property])) {
-                $headers[$header] = $properties[$property];
-
-            // GetLastModified gets special cased
-            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
-                $headers[$header] = Sabre_HTTP_Util::toHTTPDate($properties[$property]->getTime());
-            }
-
-        }
-
-        return $headers;
-
-    }
-
-    /**
-     * Returns a list of properties for a given path
-     *
-     * The path that should be supplied should have the baseUrl stripped out
-     * The list of properties should be supplied in Clark notation. If the list is empty
-     * 'allprops' is assumed.
-     *
-     * If a depth of 1 is requested child elements will also be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @param int $depth
-     * @return array
-     */
-    public function getPropertiesForPath($path, $propertyNames = array(), $depth = 0) {
-
-        if ($depth!=0) $depth = 1;
-
-        $returnPropertyList = array();
-
-        $parentNode = $this->tree->getNodeForPath($path);
-        $nodes = array(
-            $path => $parentNode
-        );
-        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
-            foreach($this->tree->getChildren($path) as $childNode)
-                $nodes[$path . '/' . $childNode->getName()] = $childNode;
-        }
-
-        // If the propertyNames array is empty, it means all properties are requested.
-        // We shouldn't actually return everything we know though, and only return a
-        // sensible list.
-        $allProperties = count($propertyNames)==0;
-
-        foreach($nodes as $myPath=>$node) {
-
-            $currentPropertyNames = $propertyNames;
-
-            $newProperties = array(
-                '200' => array(),
-                '404' => array(),
-            );
-
-            if ($allProperties) {
-                // Default list of propertyNames, when all properties were requested.
-                $currentPropertyNames = array(
-                    '{DAV:}getlastmodified',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}resourcetype',
-                    '{DAV:}quota-used-bytes',
-                    '{DAV:}quota-available-bytes',
-                    '{DAV:}getetag',
-                    '{DAV:}getcontenttype',
-                );
-            }
-
-            // If the resourceType was not part of the list, we manually add it
-            // and mark it for removal. We need to know the resourcetype in order
-            // to make certain decisions about the entry.
-            // WebDAV dictates we should add a / and the end of href's for collections
-            $removeRT = false;
-            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
-                $currentPropertyNames[] = '{DAV:}resourcetype';
-                $removeRT = true;
-            }
-
-            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
-            // If this method explicitly returned false, we must ignore this
-            // node as it is inaccessible.
-            if ($result===false) continue;
-
-            if (count($currentPropertyNames) > 0) {
-
-                if ($node instanceof Sabre_DAV_IProperties)
-                    $newProperties['200'] = $newProperties[200] + $node->getProperties($currentPropertyNames);
-
-            }
-
-
-            foreach($currentPropertyNames as $prop) {
-
-                if (isset($newProperties[200][$prop])) continue;
-
-                switch($prop) {
-                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
-                    case '{DAV:}getcontentlength'      :
-                        if ($node instanceof Sabre_DAV_IFile) {
-                            $size = $node->getSize();
-                            if (!is_null($size)) {
-                                $newProperties[200][$prop] = (int)$node->getSize();
-                            }
-                        }
-                        break;
-                    case '{DAV:}quota-used-bytes'      :
-                        if ($node instanceof Sabre_DAV_IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[0];
-                        }
-                        break;
-                    case '{DAV:}quota-available-bytes' :
-                        if ($node instanceof Sabre_DAV_IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[1];
-                        }
-                        break;
-                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
-                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
-                    case '{DAV:}supported-report-set'  :
-                        $reports = array();
-                        foreach($this->plugins as $plugin) {
-                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
-                        }
-                        $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports);
-                        break;
-                    case '{DAV:}resourcetype' :
-                        $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
-                        foreach($this->resourceTypeMapping as $className => $resourceType) {
-                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
-                        }
-                        break;
-
-                }
-
-                // If we were unable to find the property, we will list it as 404.
-                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
-
-            }
-
-            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
-
-            $newProperties['href'] = trim($myPath,'/');
-
-            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
-            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
-            // Therefore we add a trailing / for any non-file. This might need adjustments
-            // if we find there are other edge cases.
-            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && count($newProperties[200]['{DAV:}resourcetype']->getValue())>0) $newProperties['href'] .='/';
-
-            // If the resourcetype property was manually added to the requested property list,
-            // we will remove it again.
-            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
-
-            $returnPropertyList[] = $newProperties;
-
-        }
-
-        return $returnPropertyList;
-
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new file.
-     *
-     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
-     * It was important to get this done through a centralized function,
-     * allowing plugins to intercept this using the beforeCreateFile event.
-     *
-     * This method will return true if the file was actually created
-     *
-     * @param string   $uri
-     * @param resource $data
-     * @param string   $etag
-     * @return bool
-     */
-    public function createFile($uri,$data, &$etag = null) {
-
-        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
-
-        $parent = $this->tree->getNodeForPath($dir);
-
-        if (!$this->broadcastEvent('beforeCreateFile',array($uri, &$data, $parent))) return false;
-
-        $etag = $parent->createFile($name,$data);
-        $this->tree->markDirty($dir);
-
-        $this->broadcastEvent('afterBind',array($uri));
-        $this->broadcastEvent('afterCreateFile',array($uri, $parent));
-
-        return true;
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new directory.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function createDirectory($uri) {
-
-        $this->createCollection($uri,array('{DAV:}collection'),array());
-
-    }
-
-    /**
-     * Use this method to create a new collection
-     *
-     * The {DAV:}resourcetype is specified using the resourceType array.
-     * At the very least it must contain {DAV:}collection.
-     *
-     * The properties array can contain a list of additional properties.
-     *
-     * @param string $uri The new uri
-     * @param array $resourceType The resourceType(s)
-     * @param array $properties A list of properties
-     * @return array|null
-     */
-    public function createCollection($uri, array $resourceType, array $properties) {
-
-        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        // Making sure {DAV:}collection was specified as resourceType
-        if (!in_array('{DAV:}collection', $resourceType)) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
-        }
-
-
-        // Making sure the parent exists
-        try {
-
-            $parent = $this->tree->getNodeForPath($parentUri);
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
-
-        }
-
-        // Making sure the parent is a collection
-        if (!$parent instanceof Sabre_DAV_ICollection) {
-            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
-        }
-
-
-
-        // Making sure the child does not already exist
-        try {
-            $parent->getChild($newName);
-
-            // If we got here.. it means there's already a node on that url, and we need to throw a 405
-            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            // This is correct
-        }
-
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
-
-        // There are 2 modes of operation. The standard collection
-        // creates the directory, and then updates properties
-        // the extended collection can create it directly.
-        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
-
-            $parent->createExtendedCollection($newName, $resourceType, $properties);
-
-        } else {
-
-            // No special resourcetypes are supported
-            if (count($resourceType)>1) {
-                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
-            }
-
-            $parent->createDirectory($newName);
-            $rollBack = false;
-            $exception = null;
-            $errorResult = null;
-
-            if (count($properties)>0) {
-
-                try {
-
-                    $errorResult = $this->updateProperties($uri, $properties);
-                    if (!isset($errorResult[200])) {
-                        $rollBack = true;
-                    }
-
-                } catch (Sabre_DAV_Exception $e) {
-
-                    $rollBack = true;
-                    $exception = $e;
-
-                }
-
-            }
-
-            if ($rollBack) {
-                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-                $this->tree->delete($uri);
-
-                // Re-throwing exception
-                if ($exception) throw $exception;
-
-                return $errorResult;
-            }
-
-        }
-        $this->tree->markDirty($parentUri);
-        $this->broadcastEvent('afterBind',array($uri));
-
-    }
-
-    /**
-     * This method updates a resource's properties
-     *
-     * The properties array must be a list of properties. Array-keys are
-     * property names in clarknotation, array-values are it's values.
-     * If a property must be deleted, the value should be null.
-     *
-     * Note that this request should either completely succeed, or
-     * completely fail.
-     *
-     * The response is an array with statuscodes for keys, which in turn
-     * contain arrays with propertynames. This response can be used
-     * to generate a multistatus body.
-     *
-     * @param string $uri
-     * @param array $properties
-     * @return array
-     */
-    public function updateProperties($uri, array $properties) {
-
-        // we'll start by grabbing the node, this will throw the appropriate
-        // exceptions if it doesn't.
-        $node = $this->tree->getNodeForPath($uri);
-
-        $result = array(
-            200 => array(),
-            403 => array(),
-            424 => array(),
-        );
-        $remainingProperties = $properties;
-        $hasError = false;
-
-        // Running through all properties to make sure none of them are protected
-        if (!$hasError) foreach($properties as $propertyName => $value) {
-            if(in_array($propertyName, $this->protectedProperties)) {
-                $result[403][$propertyName] = null;
-                unset($remainingProperties[$propertyName]);
-                $hasError = true;
-            }
-        }
-
-        if (!$hasError) {
-            // Allowing plugins to take care of property updating
-            $hasError = !$this->broadcastEvent('updateProperties',array(
-                &$remainingProperties,
-                &$result,
-                $node
-            ));
-        }
-
-        // If the node is not an instance of Sabre_DAV_IProperties, every
-        // property is 403 Forbidden
-        if (!$hasError && count($remainingProperties) && !($node instanceof Sabre_DAV_IProperties)) {
-            $hasError = true;
-            foreach($properties as $propertyName=> $value) {
-                $result[403][$propertyName] = null;
-            }
-            $remainingProperties = array();
-        }
-
-        // Only if there were no errors we may attempt to update the resource
-        if (!$hasError) {
-
-            if (count($remainingProperties)>0) {
-
-                $updateResult = $node->updateProperties($remainingProperties);
-
-                if ($updateResult===true) {
-                    // success
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[200][$propertyName] = null;
-                    }
-
-                } elseif ($updateResult===false) {
-                    // The node failed to update the properties for an
-                    // unknown reason
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[403][$propertyName] = null;
-                    }
-
-                } elseif (is_array($updateResult)) {
-
-                    // The node has detailed update information
-                    // We need to merge the results with the earlier results.
-                    foreach($updateResult as $status => $props) {
-                        if (is_array($props)) {
-                            if (!isset($result[$status]))
-                                $result[$status] = array();
-
-                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
-                        }
-                    }
-
-                } else {
-                    throw new Sabre_DAV_Exception('Invalid result from updateProperties');
-                }
-                $remainingProperties = array();
-            }
-
-        }
-
-        foreach($remainingProperties as $propertyName=>$value) {
-            // if there are remaining properties, it must mean
-            // there's a dependency failure
-            $result[424][$propertyName] = null;
-        }
-
-        // Removing empty array values
-        foreach($result as $status=>$props) {
-
-            if (count($props)===0) unset($result[$status]);
-
-        }
-        $result['href'] = $uri;
-        return $result;
-
-    }
-
-    /**
-     * This method checks the main HTTP preconditions.
-     *
-     * Currently these are:
-     *   * If-Match
-     *   * If-None-Match
-     *   * If-Modified-Since
-     *   * If-Unmodified-Since
-     *
-     * The method will return true if all preconditions are met
-     * The method will return false, or throw an exception if preconditions
-     * failed. If false is returned the operation should be aborted, and
-     * the appropriate HTTP response headers are already set.
-     *
-     * Normally this method will throw 412 Precondition Failed for failures
-     * related to If-None-Match, If-Match and If-Unmodified Since. It will
-     * set the status to 304 Not Modified for If-Modified_since.
-     *
-     * If the $handleAsGET argument is set to true, it will also return 304
-     * Not Modified for failure of the If-None-Match precondition. This is the
-     * desired behaviour for HTTP GET and HTTP HEAD requests.
-     *
-     * @param bool $handleAsGET
-     * @return bool
-     */
-    public function checkPreconditions($handleAsGET = false) {
-
-        $uri = $this->getRequestUri();
-        $node = null;
-        $lastMod = null;
-        $etag = null;
-
-        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
-
-            // If-Match contains an entity tag. Only if the entity-tag
-            // matches we are allowed to make the request succeed.
-            // If the entity-tag is '*' we are only allowed to make the
-            // request succeed if a resource exists at that url.
-            try {
-                $node = $this->tree->getNodeForPath($uri);
-            } catch (Sabre_DAV_Exception_NotFound $e) {
-                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
-            }
-
-            // Only need to check entity tags if they are not *
-            if ($ifMatch!=='*') {
-
-                // There can be multiple etags
-                $ifMatch = explode(',',$ifMatch);
-                $haveMatch = false;
-                foreach($ifMatch as $ifMatchItem) {
-
-                    // Stripping any extra spaces
-                    $ifMatchItem = trim($ifMatchItem,' ');
-
-                    $etag = $node->getETag();
-                    if ($etag===$ifMatchItem) {
-                        $haveMatch = true;
-                    }
-                }
-                if (!$haveMatch) {
-                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
-                }
-            }
-        }
-
-        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
-
-            // The If-None-Match header contains an etag.
-            // Only if the ETag does not match the current ETag, the request will succeed
-            // The header can also contain *, in which case the request
-            // will only succeed if the entity does not exist at all.
-            $nodeExists = true;
-            if (!$node) {
-                try {
-                    $node = $this->tree->getNodeForPath($uri);
-                } catch (Sabre_DAV_Exception_NotFound $e) {
-                    $nodeExists = false;
-                }
-            }
-            if ($nodeExists) {
-                $haveMatch = false;
-                if ($ifNoneMatch==='*') $haveMatch = true;
-                else {
-
-                    // There might be multiple etags
-                    $ifNoneMatch = explode(',', $ifNoneMatch);
-                    $etag = $node->getETag();
-
-                    foreach($ifNoneMatch as $ifNoneMatchItem) {
-
-                        // Stripping any extra spaces
-                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
-
-                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
-
-                    }
-
-                }
-
-                if ($haveMatch) {
-                    if ($handleAsGET) {
-                        $this->httpResponse->sendStatus(304);
-                        return false;
-                    } else {
-                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
-                    }
-                }
-            }
-
-        }
-
-        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
-
-            // The If-Modified-Since header contains a date. We
-            // will only return the entity if it has been changed since
-            // that date. If it hasn't been changed, we return a 304
-            // header
-            // Note that this header only has to be checked if there was no If-None-Match header
-            // as per the HTTP spec.
-            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
-
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new DateTime('@' . $lastMod);
-                    if ($lastMod <= $date) {
-                        $this->httpResponse->sendStatus(304);
-                        $this->httpResponse->setHeader('Last-Modified', Sabre_HTTP_Util::toHTTPDate($lastMod));
-                        return false;
-                    }
-                }
-            }
-        }
-
-        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
-
-            // The If-Unmodified-Since will allow allow the request if the
-            // entity has not changed since the specified date.
-            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
-
-            // We must only check the date if it's valid
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new DateTime('@' . $lastMod);
-                    if ($lastMod > $date) {
-                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
-                    }
-                }
-            }
-
-        }
-        return true;
-
-    }
-
-    // }}}
-    // {{{ XML Readers & Writers
-
-
-    /**
-     * Generates a WebDAV propfind response body based on a list of nodes
-     *
-     * @param array $fileProperties The list with nodes
-     * @return string
-     */
-    public function generateMultiStatus(array $fileProperties) {
-
-        $dom = new DOMDocument('1.0','utf-8');
-        //$dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($fileProperties as $entry) {
-
-            $href = $entry['href'];
-            unset($entry['href']);
-
-            $response = new Sabre_DAV_Property_Response($href,$entry);
-            $response->serialize($this,$multiStatus);
-
-        }
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * This method parses a PropPatch request
-     *
-     * PropPatch changes the properties for a resource. This method
-     * returns a list of properties.
-     *
-     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
-     * and the value contains the property value. If a property is to be removed the value
-     * will be null.
-     *
-     * @param string $body xml body
-     * @return array list of properties in need of updating or deletion
-     */
-    public function parsePropPatchRequest($body) {
-
-        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $newProperties = array();
-
-        foreach($dom->firstChild->childNodes as $child) {
-
-            if ($child->nodeType !== XML_ELEMENT_NODE) continue;
-
-            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
-
-            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
-
-            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
-
-            foreach($innerProperties as $propertyName=>$propertyValue) {
-
-                if ($operation==='{DAV:}remove') {
-                    $propertyValue = null;
-                }
-
-                $newProperties[$propertyName] = $propertyValue;
-
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * This method parses the PROPFIND request and returns its information
-     *
-     * This will either be a list of properties, or an empty array; in which case
-     * an {DAV:}allprop was requested.
-     *
-     * @param string $body
-     * @return array
-     */
-    public function parsePropFindRequest($body) {
-
-        // If the propfind body was empty, it means IE is requesting 'all' properties
-        if (!$body) return array();
-
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
-        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem));
-
-    }
-
-    // }}}
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ServerPlugin.php b/3rdparty/Sabre/DAV/ServerPlugin.php
deleted file mode 100644
index 131863d13f..0000000000
--- a/3rdparty/Sabre/DAV/ServerPlugin.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * The baseclass for all server plugins.
- *
- * Plugins can modify or extend the servers behaviour.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_ServerPlugin {
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre_DAV_Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the requires event subscriptions.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    abstract public function initialize(Sabre_DAV_Server $server);
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array();
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        return array();
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return get_class($this);
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleCollection.php b/3rdparty/Sabre/DAV/SimpleCollection.php
deleted file mode 100644
index 4acf971caa..0000000000
--- a/3rdparty/Sabre/DAV/SimpleCollection.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * SimpleCollection
- *
- * The SimpleCollection is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
-
-    /**
-     * List of childnodes
-     *
-     * @var array
-     */
-    protected $children = array();
-
-    /**
-     * Name of this resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, child nodes can also be bassed.
-     * This nodes must be instances of Sabre_DAV_INode
-     *
-     * @param string $name
-     * @param array $children
-     */
-    public function __construct($name,array $children = array()) {
-
-        $this->name = $name;
-        foreach($children as $child) {
-
-            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
-            $this->addChild($child);
-
-        }
-
-    }
-
-    /**
-     * Adds a new childnode to this collection
-     *
-     * @param Sabre_DAV_INode $child
-     * @return void
-     */
-    public function addChild(Sabre_DAV_INode $child) {
-
-        $this->children[$child->getName()] = $child;
-
-    }
-
-    /**
-     * Returns the name of the collection
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        if (isset($this->children[$name])) return $this->children[$name];
-        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
-
-    }
-
-    /**
-     * Returns a list of children for this collection
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        return array_values($this->children);
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleDirectory.php b/3rdparty/Sabre/DAV/SimpleDirectory.php
deleted file mode 100644
index 621222ebc5..0000000000
--- a/3rdparty/Sabre/DAV/SimpleDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * SimpleDirectory
- *
- * The SimpleDirectory is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * This class is now deprecated, use Sabre_DAV_SimpleCollection instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated Use Sabre_DAV_SimpleCollection instead.
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleDirectory extends Sabre_DAV_SimpleCollection {
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleFile.php b/3rdparty/Sabre/DAV/SimpleFile.php
deleted file mode 100644
index 58330d6861..0000000000
--- a/3rdparty/Sabre/DAV/SimpleFile.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * SimpleFile
- *
- * The 'SimpleFile' class is used to easily add read-only immutable files to
- * the directory structure. One usecase would be to add a 'readme.txt' to a
- * root of a webserver with some standard content.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleFile extends Sabre_DAV_File {
-
-    /**
-     * File contents
-     *
-     * @var string
-     */
-    protected $contents = array();
-
-    /**
-     * Name of this resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * A mimetype, such as 'text/plain' or 'text/html'
-     *
-     * @var string
-     */
-    protected $mimeType;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, as well as the contents of the
-     * file.
-     *
-     * @param string $name
-     * @param string $contents
-     * @param string|null $mimeType
-     */
-    public function __construct($name, $contents, $mimeType = null) {
-
-        $this->name = $name;
-        $this->contents = $contents;
-        $this->mimeType = $mimeType;
-
-    }
-
-    /**
-     * Returns the node name for this file.
-     *
-     * This name is used to construct the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        return $this->contents;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return strlen($this->contents);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     * @return string
-     */
-    public function getETag() {
-
-        return '"' . md5($this->contents) . '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     * @return string
-     */
-    public function getContentType() {
-
-        return $this->mimeType;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/StringUtil.php b/3rdparty/Sabre/DAV/StringUtil.php
deleted file mode 100644
index b126a94c82..0000000000
--- a/3rdparty/Sabre/DAV/StringUtil.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * String utility
- *
- * This class is mainly used to implement the 'text-match' filter, used by both
- * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
- * Because they both need it, it was decided to put it in Sabre_DAV instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_StringUtil {
-
-    /**
-     * Checks if a needle occurs in a haystack ;)
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param string $collation
-     * @param string $matchType
-     * @return bool
-     */
-    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
-
-        switch($collation) {
-
-            case 'i;ascii-casemap' :
-                // default strtolower takes locale into consideration
-                // we don't want this.
-                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
-                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
-                break;
-
-            case 'i;octet' :
-                // Do nothing
-                break;
-
-            case 'i;unicode-casemap' :
-                $haystack = mb_strtoupper($haystack, 'UTF-8');
-                $needle = mb_strtoupper($needle, 'UTF-8');
-                break;
-
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Collation type: ' . $collation . ' is not supported');
-
-        }
-
-        switch($matchType) {
-
-            case 'contains' :
-                return strpos($haystack, $needle)!==false;
-            case 'equals' :
-                return $haystack === $needle;
-            case 'starts-with' :
-                return strpos($haystack, $needle)===0;
-            case 'ends-with' :
-                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Match-type: ' . $matchType . ' is not supported');
-
-        }
-
-    }
-
-    /**
-     * This method takes an input string, checks if it's not valid UTF-8 and
-     * attempts to convert it to UTF-8 if it's not.
-     *
-     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
-     * anything else will likely fail.
-     *
-     * @param string $input
-     * @return string
-     */
-    static public function ensureUTF8($input) {
-
-        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
-
-        if ($encoding === 'ISO-8859-1') {
-            return utf8_encode($input);
-        } else {
-            return $input;
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
deleted file mode 100644
index 36096e6777..0000000000
--- a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-
-/**
- * Temporary File Filter Plugin
- *
- * The purpose of this filter is to intercept some of the garbage files
- * operation systems and applications tend to generate when mounting
- * a WebDAV share as a disk.
- *
- * It will intercept these files and place them in a separate directory.
- * these files are not deleted automatically, so it is adviceable to
- * delete these after they are not accessed for 24 hours.
- *
- * Currently it supports:
- *   * OS/X style resource forks and .DS_Store
- *   * desktop.ini and Thumbs.db (windows)
- *   * .*.swp (vim temporary files)
- *   * .dat.* (smultron temporary files)
- *
- * Additional patterns can be added, by adding on to the
- * temporaryFilePatterns property.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * This is the list of patterns we intercept.
-     * If new patterns are added, they must be valid patterns for preg_match.
-     *
-     * @var array
-     */
-    public $temporaryFilePatterns = array(
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
-        '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
-        '/^~lock.(.*)#$/', // Windows 7 lockfiles
-    );
-
-    /**
-     * This is the directory where this plugin
-     * will store it's files.
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    /**
-     * A reference to the main Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Creates the plugin.
-     *
-     * Make sure you specify a directory for your files. If you don't, we
-     * will use PHP's directory for session-storage instead, and you might
-     * not want that.
-     *
-     * @param string|null $dataDir
-     */
-    public function __construct($dataDir = null) {
-
-        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
-        if (!is_dir($dataDir)) mkdir($dataDir);
-        $this->dataDir = $dataDir;
-
-    }
-
-    /**
-     * Initialize the plugin
-     *
-     * This is called automatically be the Server class after this plugin is
-     * added with Sabre_DAV_Server::addPlugin()
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
-        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
-
-    }
-
-    /**
-     * This method is called before any HTTP method handler
-     *
-     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
-     * filenames that are known to match the 'temporary file' regex.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if (!$tempLocation = $this->isTempFile($uri))
-            return true;
-
-        switch($method) {
-            case 'GET' :
-                return $this->httpGet($tempLocation);
-            case 'PUT' :
-                return $this->httpPut($tempLocation);
-            case 'PROPFIND' :
-                return $this->httpPropfind($tempLocation, $uri);
-            case 'DELETE' :
-                return $this->httpDelete($tempLocation);
-         }
-         return true;
-
-    }
-
-    /**
-     * This method is invoked if some subsystem creates a new file.
-     *
-     * This is used to deal with HTTP LOCK requests which create a new
-     * file.
-     *
-     * @param string $uri
-     * @param resource $data
-     * @return bool
-     */
-    public function beforeCreateFile($uri,$data) {
-
-        if ($tempPath = $this->isTempFile($uri)) {
-
-            $hR = $this->server->httpResponse;
-            $hR->setHeader('X-Sabre-Temp','true');
-            file_put_contents($tempPath,$data);
-            return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * This method will check if the url matches the temporary file pattern
-     * if it does, it will return an path based on $this->dataDir for the
-     * temporary file storage.
-     *
-     * @param string $path
-     * @return boolean|string
-     */
-    protected function isTempFile($path) {
-
-        // We're only interested in the basename.
-        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
-
-        foreach($this->temporaryFilePatterns as $tempFile) {
-
-            if (preg_match($tempFile,$tempPath)) {
-                return $this->getDataDir() . '/sabredav_' . md5($path) . '.tempfile';
-            }
-
-        }
-
-        return false;
-
-    }
-
-
-    /**
-     * This method handles the GET method for temporary files.
-     * If the file doesn't exist, it will return false which will kick in
-     * the regular system for the GET method.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpGet($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('Content-Type','application/octet-stream');
-        $hR->setHeader('Content-Length',filesize($tempLocation));
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(200);
-        $hR->sendBody(fopen($tempLocation,'r'));
-        return false;
-
-    }
-
-    /**
-     * This method handles the PUT method.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpPut($tempLocation) {
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-
-        $newFile = !file_exists($tempLocation);
-
-        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
-             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
-        }
-
-        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
-        $hR->sendStatus($newFile?201:200);
-        return false;
-
-    }
-
-    /**
-     * This method handles the DELETE method.
-     *
-     * If the file didn't exist, it will return false, which will make the
-     * standard HTTP DELETE handler kick in.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpDelete($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        unlink($tempLocation);
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(204);
-        return false;
-
-    }
-
-    /**
-     * This method handles the PROPFIND method.
-     *
-     * It's a very lazy method, it won't bother checking the request body
-     * for which properties were requested, and just sends back a default
-     * set of properties.
-     *
-     * @param string $tempLocation
-     * @param string $uri
-     * @return bool
-     */
-    public function httpPropfind($tempLocation, $uri) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(207);
-        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true));
-
-        $properties = array(
-            'href' => $uri,
-            200 => array(
-                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
-                '{DAV:}getcontentlength' => filesize($tempLocation),
-                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
-                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true,
-
-            ),
-         );
-
-        $data = $this->server->generateMultiStatus(array($properties));
-        $hR->sendBody($data);
-        return false;
-
-    }
-
-
-    /**
-     * This method returns the directory where the temporary files should be stored.
-     *
-     * @return string
-     */
-    protected function getDataDir()
-    {
-        return $this->dataDir;
-    }
-}
diff --git a/3rdparty/Sabre/DAV/Tree.php b/3rdparty/Sabre/DAV/Tree.php
deleted file mode 100644
index 5021639415..0000000000
--- a/3rdparty/Sabre/DAV/Tree.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/**
- * Abstract tree object
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Tree {
-
-    /**
-     * This function must return an INode object for a path
-     * If a Path doesn't exist, thrown a Exception_NotFound
-     *
-     * @param string $path
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    abstract function getNodeForPath($path);
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * Implementors of this class should override this method to make
-     * it cheaper.
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            $this->getNodeForPath($path);
-            return true;
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Copies a file from path to another
-     *
-     * @param string $sourcePath The source location
-     * @param string $destinationPath The full destination path
-     * @return void
-     */
-    public function copy($sourcePath, $destinationPath) {
-
-        $sourceNode = $this->getNodeForPath($sourcePath);
-
-        // grab the dirname and basename components
-        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
-
-        $destinationParent = $this->getNodeForPath($destinationDir);
-        $this->copyNode($sourceNode,$destinationParent,$destinationName);
-
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Moves a file from one location to another
-     *
-     * @param string $sourcePath The path to the file which should be moved
-     * @param string $destinationPath The full destination path, so not just the destination parent node
-     * @return int
-     */
-    public function move($sourcePath, $destinationPath) {
-
-        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
-        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
-
-        if ($sourceDir===$destinationDir) {
-            $renameable = $this->getNodeForPath($sourcePath);
-            $renameable->setName($destinationName);
-        } else {
-            $this->copy($sourcePath,$destinationPath);
-            $this->getNodeForPath($sourcePath)->delete();
-        }
-        $this->markDirty($sourceDir);
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Deletes a node from the tree
-     *
-     * @param string $path
-     * @return void
-     */
-    public function delete($path) {
-
-        $node = $this->getNodeForPath($path);
-        $node->delete();
-
-        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
-        $this->markDirty($parent);
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        return $node->getChildren();
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes
-     *
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     *
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path
-     * @return void
-     */
-    public function markDirty($path) {
-
-
-    }
-
-    /**
-     * copyNode
-     *
-     * @param Sabre_DAV_INode $source
-     * @param Sabre_DAV_ICollection $destinationParent
-     * @param string $destinationName
-     * @return void
-     */
-    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
-
-        if (!$destinationName) $destinationName = $source->getName();
-
-        if ($source instanceof Sabre_DAV_IFile) {
-
-            $data = $source->get();
-
-            // If the body was a string, we need to convert it to a stream
-            if (is_string($data)) {
-                $stream = fopen('php://temp','r+');
-                fwrite($stream,$data);
-                rewind($stream);
-                $data = $stream;
-            }
-            $destinationParent->createFile($destinationName,$data);
-            $destination = $destinationParent->getChild($destinationName);
-
-        } elseif ($source instanceof Sabre_DAV_ICollection) {
-
-            $destinationParent->createDirectory($destinationName);
-
-            $destination = $destinationParent->getChild($destinationName);
-            foreach($source->getChildren() as $child) {
-
-                $this->copyNode($child,$destination);
-
-            }
-
-        }
-        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
-
-            $props = $source->getProperties(array());
-            $destination->updateProperties($props);
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Tree/Filesystem.php b/3rdparty/Sabre/DAV/Tree/Filesystem.php
deleted file mode 100644
index 85a9ee317b..0000000000
--- a/3rdparty/Sabre/DAV/Tree/Filesystem.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Sabre_DAV_Tree_Filesystem
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
-
-    /**
-     * Base url on the filesystem.
-     *
-     * @var string
-     */
-    protected $basePath;
-
-    /**
-     * Creates this tree
-     *
-     * Supply the path you'd like to share.
-     *
-     * @param string $basePath
-     */
-    public function __construct($basePath) {
-
-        $this->basePath = $basePath;
-
-    }
-
-    /**
-     * Returns a new node for the given path
-     *
-     * @param string $path
-     * @return Sabre_DAV_FS_Node
-     */
-    public function getNodeForPath($path) {
-
-        $realPath = $this->getRealPath($path);
-        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_NotFound('File at location ' . $realPath . ' not found');
-        if (is_dir($realPath)) {
-            return new Sabre_DAV_FS_Directory($path);
-        } else {
-            return new Sabre_DAV_FS_File($path);
-        }
-
-    }
-
-    /**
-     * Returns the real filesystem path for a webdav url.
-     *
-     * @param string $publicPath
-     * @return string
-     */
-    protected function getRealPath($publicPath) {
-
-        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
-
-    }
-
-    /**
-     * Copies a file or directory.
-     *
-     * This method must work recursively and delete the destination
-     * if it exists
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function copy($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        $this->realCopy($source,$destination);
-
-    }
-
-    /**
-     * Used by self::copy
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    protected function realCopy($source,$destination) {
-
-        if (is_file($source)) {
-            copy($source,$destination);
-        } else {
-            mkdir($destination);
-            foreach(scandir($source) as $subnode) {
-
-                if ($subnode=='.' || $subnode=='..') continue;
-                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
-
-            }
-        }
-
-    }
-
-    /**
-     * Moves a file or directory recursively.
-     *
-     * If the destination exists, delete it first.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function move($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        rename($source,$destination);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/URLUtil.php b/3rdparty/Sabre/DAV/URLUtil.php
deleted file mode 100644
index 794665a44f..0000000000
--- a/3rdparty/Sabre/DAV/URLUtil.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * URL utility class
- *
- * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
- *
- * It was not possible to use PHP's built-in methods for this, because some clients don't like
- * encoding of certain characters.
- *
- * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
- * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
- * kept as-is.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_URLUtil {
-
-    /**
-     * Encodes the path of a url.
-     *
-     * slashes (/) are treated as path-separators.
-     *
-     * @param string $path
-     * @return string
-     */
-    static function encodePath($path) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $path);
-
-    }
-
-    /**
-     * Encodes a 1 segment of a path
-     *
-     * Slashes are considered part of the name, and are encoded as %2f
-     *
-     * @param string $pathSegment
-     * @return string
-     */
-    static function encodePathSegment($pathSegment) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $pathSegment);
-    }
-
-    /**
-     * Decodes a url-encoded path
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePath($path) {
-
-        return self::decodePathSegment($path);
-
-    }
-
-    /**
-     * Decodes a url-encoded path segment
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePathSegment($path) {
-
-        $path = rawurldecode($path);
-        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
-
-        switch($encoding) {
-
-            case 'ISO-8859-1' :
-                $path = utf8_encode($path);
-
-        }
-
-        return $path;
-
-    }
-
-    /**
-     * Returns the 'dirname' and 'basename' for a path.
-     *
-     * The reason there is a custom function for this purpose, is because
-     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
-     * and we need a method that just operates on UTF-8 characters.
-     *
-     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
-     * directory separator on windows.
-     *
-     * This method returns the 2 components as an array.
-     *
-     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
-     * string is stripped off.
-     *
-     * @param string $path
-     * @return array
-     */
-    static function splitPath($path) {
-
-        $matches = array();
-        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
-            return array($matches[1],$matches[2]);
-        } else {
-            return array(null,null);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/UUIDUtil.php b/3rdparty/Sabre/DAV/UUIDUtil.php
deleted file mode 100644
index f0eebe598e..0000000000
--- a/3rdparty/Sabre/DAV/UUIDUtil.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * UUID Utility
- *
- * This class has static methods to generate and validate UUID's.
- * UUIDs are used a decent amount within various *DAV standards, so it made
- * sense to include it.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_UUIDUtil {
-
-    /**
-     * Returns a pseudo-random v4 UUID
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     * @return string
-     */
-    static function getUUID() {
-
-        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_mid"
-            mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand( 0, 0x0fff ) | 0x4000,
-
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand( 0, 0x3fff ) | 0x8000,
-
-            // 48 bits for "node"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-        );
-    }
-
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     * @return bool
-     */
-    static function validateUUID($uuid) {
-
-        return preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        ) == true;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Version.php b/3rdparty/Sabre/DAV/Version.php
deleted file mode 100644
index 5e5d15e403..0000000000
--- a/3rdparty/Sabre/DAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the SabreDAV version constants.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.2';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/DAV/XMLUtil.php b/3rdparty/Sabre/DAV/XMLUtil.php
deleted file mode 100644
index 60eff3b159..0000000000
--- a/3rdparty/Sabre/DAV/XMLUtil.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * XML utilities for WebDAV
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_XMLUtil {
-
-    /**
-     * Returns the 'clark notation' for an element.
-     *
-     * For example, and element encoded as:
-     * <b:myelem xmlns:b="http://www.example.org/" />
-     * will be returned as:
-     * {http://www.example.org}myelem
-     *
-     * This format is used throughout the SabreDAV sourcecode.
-     * Elements encoded with the urn:DAV namespace will
-     * be returned as if they were in the DAV: namespace. This is to avoid
-     * compatibility problems.
-     *
-     * This function will return null if a nodetype other than an Element is passed.
-     *
-     * @param DOMNode $dom
-     * @return string
-     */
-    static function toClarkNotation(DOMNode $dom) {
-
-        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
-
-        // Mapping back to the real namespace, in case it was dav
-        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
-
-        // Mapping to clark notation
-        return '{' . $ns . '}' . $dom->localName;
-
-    }
-
-    /**
-     * Parses a clark-notation string, and returns the namespace and element
-     * name components.
-     *
-     * If the string was invalid, it will throw an InvalidArgumentException.
-     *
-     * @param string $str
-     * @throws InvalidArgumentException
-     * @return array
-     */
-    static function parseClarkNotation($str) {
-
-        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
-            throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
-        }
-
-        return array(
-            $matches[1],
-            $matches[2]
-        );
-
-    }
-
-    /**
-     * This method takes an XML document (as string) and converts all instances of the
-     * DAV: namespace to urn:DAV
-     *
-     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
-     * spec, and causes the DOM to throw errors
-     *
-     * @param string $xmlDocument
-     * @return array|string|null
-     */
-    static function convertDAVNamespace($xmlDocument) {
-
-        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
-        // namespace is actually a violation of the XML namespaces specification, and will cause errors
-        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
-
-    }
-
-    /**
-     * This method provides a generic way to load a DOMDocument for WebDAV use.
-     *
-     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
-     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
-     *
-     * @param string $xml
-     * @throws Sabre_DAV_Exception_BadRequest
-     * @return DOMDocument
-     */
-    static function loadDOMDocument($xml) {
-
-        if (empty($xml))
-            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
-
-        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
-        // does not support this, so we must intercept this and convert to UTF-8.
-        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
-
-            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
-            $xml = iconv('UTF-16LE','UTF-8',$xml);
-
-            // Because the xml header might specify the encoding, we must also change this.
-            // This regex looks for the string encoding="UTF-16" and replaces it with
-            // encoding="UTF-8".
-            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
-
-        }
-
-        // Retaining old error setting
-        $oldErrorSetting =  libxml_use_internal_errors(true);
-
-        // Clearing any previous errors
-        libxml_clear_errors();
-
-        $dom = new DOMDocument();
-        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
-
-        // We don't generally care about any whitespace
-        $dom->preserveWhiteSpace = false;
-
-        if ($error = libxml_get_last_error()) {
-            libxml_clear_errors();
-            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
-        }
-
-        // Restoring old mechanism for error handling
-        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
-
-        return $dom;
-
-    }
-
-    /**
-     * Parses all WebDAV properties out of a DOM Element
-     *
-     * Generally WebDAV properties are enclosed in {DAV:}prop elements. This
-     * method helps by going through all these and pulling out the actual
-     * propertynames, making them array keys and making the property values,
-     * well.. the array values.
-     *
-     * If no value was given (self-closing element) null will be used as the
-     * value. This is used in for example PROPFIND requests.
-     *
-     * Complex values are supported through the propertyMap argument. The
-     * propertyMap should have the clark-notation properties as it's keys, and
-     * classnames as values.
-     *
-     * When any of these properties are found, the unserialize() method will be
-     * (statically) called. The result of this method is used as the value.
-     *
-     * @param DOMElement $parentNode
-     * @param array $propertyMap
-     * @return array
-     */
-    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
-
-        $propList = array();
-        foreach($parentNode->childNodes as $propNode) {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
-
-            foreach($propNode->childNodes as $propNodeData) {
-
-                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
-                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
-
-                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
-                if (isset($propertyMap[$propertyName])) {
-                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData);
-                } else {
-                    $propList[$propertyName] = $propNodeData->textContent;
-                }
-            }
-
-
-        }
-        return $propList;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/includes.php b/3rdparty/Sabre/DAV/includes.php
deleted file mode 100644
index 6a4890677e..0000000000
--- a/3rdparty/Sabre/DAV/includes.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Sabre_DAV includes file
- *
- * Including this file will automatically include all files from the Sabre_DAV
- * package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/Auth/IBackend.php';
-include __DIR__ . '/Client.php';
-include __DIR__ . '/Exception.php';
-include __DIR__ . '/INode.php';
-include __DIR__ . '/IProperties.php';
-include __DIR__ . '/Locks/Backend/Abstract.php';
-include __DIR__ . '/Locks/Backend/File.php';
-include __DIR__ . '/Locks/Backend/FS.php';
-include __DIR__ . '/Locks/Backend/PDO.php';
-include __DIR__ . '/Locks/LockInfo.php';
-include __DIR__ . '/Node.php';
-include __DIR__ . '/Property/IHref.php';
-include __DIR__ . '/Property.php';
-include __DIR__ . '/Server.php';
-include __DIR__ . '/ServerPlugin.php';
-include __DIR__ . '/StringUtil.php';
-include __DIR__ . '/TemporaryFileFilterPlugin.php';
-include __DIR__ . '/Tree.php';
-include __DIR__ . '/URLUtil.php';
-include __DIR__ . '/UUIDUtil.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/XMLUtil.php';
-include __DIR__ . '/Auth/Backend/AbstractBasic.php';
-include __DIR__ . '/Auth/Backend/AbstractDigest.php';
-include __DIR__ . '/Auth/Backend/Apache.php';
-include __DIR__ . '/Auth/Backend/File.php';
-include __DIR__ . '/Auth/Backend/PDO.php';
-include __DIR__ . '/Auth/Plugin.php';
-include __DIR__ . '/Browser/GuessContentType.php';
-include __DIR__ . '/Browser/MapGetToPropFind.php';
-include __DIR__ . '/Browser/Plugin.php';
-include __DIR__ . '/Exception/BadRequest.php';
-include __DIR__ . '/Exception/Conflict.php';
-include __DIR__ . '/Exception/Forbidden.php';
-include __DIR__ . '/Exception/InsufficientStorage.php';
-include __DIR__ . '/Exception/InvalidResourceType.php';
-include __DIR__ . '/Exception/Locked.php';
-include __DIR__ . '/Exception/LockTokenMatchesRequestUri.php';
-include __DIR__ . '/Exception/MethodNotAllowed.php';
-include __DIR__ . '/Exception/NotAuthenticated.php';
-include __DIR__ . '/Exception/NotFound.php';
-include __DIR__ . '/Exception/NotImplemented.php';
-include __DIR__ . '/Exception/PaymentRequired.php';
-include __DIR__ . '/Exception/PreconditionFailed.php';
-include __DIR__ . '/Exception/ReportNotImplemented.php';
-include __DIR__ . '/Exception/RequestedRangeNotSatisfiable.php';
-include __DIR__ . '/Exception/UnsupportedMediaType.php';
-include __DIR__ . '/FS/Node.php';
-include __DIR__ . '/FSExt/Node.php';
-include __DIR__ . '/ICollection.php';
-include __DIR__ . '/IExtendedCollection.php';
-include __DIR__ . '/IFile.php';
-include __DIR__ . '/IQuota.php';
-include __DIR__ . '/Locks/Plugin.php';
-include __DIR__ . '/Mount/Plugin.php';
-include __DIR__ . '/ObjectTree.php';
-include __DIR__ . '/Property/GetLastModified.php';
-include __DIR__ . '/Property/Href.php';
-include __DIR__ . '/Property/HrefList.php';
-include __DIR__ . '/Property/LockDiscovery.php';
-include __DIR__ . '/Property/ResourceType.php';
-include __DIR__ . '/Property/Response.php';
-include __DIR__ . '/Property/ResponseList.php';
-include __DIR__ . '/Property/SupportedLock.php';
-include __DIR__ . '/Property/SupportedReportSet.php';
-include __DIR__ . '/Tree/Filesystem.php';
-include __DIR__ . '/Collection.php';
-include __DIR__ . '/Directory.php';
-include __DIR__ . '/Exception/ConflictingLock.php';
-include __DIR__ . '/Exception/FileNotFound.php';
-include __DIR__ . '/File.php';
-include __DIR__ . '/FS/Directory.php';
-include __DIR__ . '/FS/File.php';
-include __DIR__ . '/FSExt/Directory.php';
-include __DIR__ . '/FSExt/File.php';
-include __DIR__ . '/SimpleCollection.php';
-include __DIR__ . '/SimpleDirectory.php';
-include __DIR__ . '/SimpleFile.php';
-// End includes
diff --git a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
deleted file mode 100644
index e05b774980..0000000000
--- a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Principals Collection
- *
- * This is a helper class that easily allows you to create a collection that
- * has a childnode for every principal.
- *
- * To use this class, simply implement the getChildForPrincipal method.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection  {
-
-    /**
-     * Node or 'directory' name.
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * If this value is set to true, it effectively disables listing of users
-     * it still allows user to find other users if they have an exact url.
-     *
-     * @var bool
-     */
-    public $disableListing = false;
-
-    /**
-     * Creates the object
-     *
-     * This object must be passed the principal backend. This object will
-     * filter all principals from a specified prefix ($principalPrefix). The
-     * default is 'principals', if your principals are stored in a different
-     * collection, override $principalPrefix
-     *
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, $principalPrefix = 'principals') {
-
-        $this->principalPrefix = $principalPrefix;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return Sabre_DAVACL_IPrincipal
-     */
-    abstract function getChildForPrincipal(array $principalInfo);
-
-    /**
-     * Returns the name of this collection.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalPrefix);
-        return $name;
-
-    }
-
-    /**
-     * Return the list of users
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        if ($this->disableListing)
-            throw new Sabre_DAV_Exception_MethodNotAllowed('Listing members of this collection is disabled');
-
-        $children = array();
-        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
-
-            $children[] = $this->getChildForPrincipal($principalInfo);
-
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_IPrincipal
-     */
-    public function getChild($name) {
-
-        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new Sabre_DAV_Exception_NotFound('Principal with name ' . $name . ' not found');
-        return $this->getChildForPrincipal($principalInfo);
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return a list of 'child names', which may be
-     * used to call $this->getChild in the future.
-     *
-     * @param array $searchProperties
-     * @return array
-     */
-    public function searchPrincipals(array $searchProperties) {
-
-        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties);
-        $r = array();
-
-        foreach($result as $row) {
-            list(, $r[]) = Sabre_DAV_URLUtil::splitPath($row);
-        }
-
-        return $r;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
deleted file mode 100644
index 4b9f93b003..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_AceConflict
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
deleted file mode 100644
index 9b055dd970..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * NeedPrivileges
- *
- * The 403-need privileges is thrown when a user didn't have the appropriate
- * permissions to perform an operation
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
-
-    /**
-     * The relevant uri
-     *
-     * @var string
-     */
-    protected $uri;
-
-    /**
-     * The privileges the user didn't have.
-     *
-     * @var array
-     */
-    protected $privileges;
-
-    /**
-     * Constructor
-     *
-     * @param string $uri
-     * @param array $privileges
-     */
-    public function __construct($uri,array $privileges) {
-
-        $this->uri = $uri;
-        $this->privileges = $privileges;
-
-        parent::__construct('User did not have the required privileges (' . implode(',', $privileges) . ') for path "' . $uri . '"');
-
-    }
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}need-privileges element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:need-privileges');
-        $errorNode->appendChild($np);
-
-        foreach($this->privileges as $privilege) {
-
-            $resource = $doc->createElementNS('DAV:','d:resource');
-            $np->appendChild($resource);
-
-            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
-
-            $priv = $doc->createElementNS('DAV:','d:privilege');
-            $resource->appendChild($priv);
-
-            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
-            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
-
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
deleted file mode 100644
index f44e3e3228..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NoAbstract
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-abstract element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:no-abstract');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
deleted file mode 100644
index 8d1e38ca1b..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NotRecognizedPrincipal
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:recognized-principal');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
deleted file mode 100644
index 3b5d012d7f..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NotSupportedPrivilege
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IACL.php b/3rdparty/Sabre/DAVACL/IACL.php
deleted file mode 100644
index 003e699348..0000000000
--- a/3rdparty/Sabre/DAVACL/IACL.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * ACL-enabled node
- *
- * If you want to add WebDAV ACL to a node, you must implement this class
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IACL extends Sabre_DAV_INode {
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getOwner();
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup();
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL();
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl);
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet();
-
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipal.php b/3rdparty/Sabre/DAVACL/IPrincipal.php
deleted file mode 100644
index fc7605bf62..0000000000
--- a/3rdparty/Sabre/DAVACL/IPrincipal.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * IPrincipal interface
- *
- * Implement this interface to define your own principals
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    function getAlternateUriSet();
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    function getPrincipalUrl();
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    function getGroupMemberSet();
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    function getGroupMembership();
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    function setGroupMemberSet(array $principals);
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    function getDisplayName();
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
deleted file mode 100644
index e798bf890c..0000000000
--- a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * Implement this interface to create your own principal backends.
- *
- * Creating backends for principals is entirely optional. You can also
- * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by
- * Sabre_DAVACL_AbstractPrincipalCollection.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IPrincipalBackend {
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actually injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    function getPrincipalsByPrefix($prefixPath);
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    function getPrincipalByPath($path);
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is supplied as an array. Each key in the array is
-     * a propertyname, such as {DAV:}displayname.
-     *
-     * Each value is the actual value to be updated. If a value is null, it
-     * must be deleted.
-     *
-     * This method should be atomic. It must either completely succeed, or
-     * completely fail. Success and failure can simply be returned as 'true' or
-     * 'false'.
-     *
-     * It is also possible to return detailed failure information. In that case
-     * an array such as this should be returned:
-     *
-     * array(
-     *   200 => array(
-     *      '{DAV:}prop1' => null,
-     *   ),
-     *   201 => array(
-     *      '{DAV:}prop2' => null,
-     *   ),
-     *   403 => array(
-     *      '{DAV:}prop3' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}prop4' => null,
-     *   ),
-     * );
-     *
-     * In this previous example prop1 was successfully updated or deleted, and
-     * prop2 was succesfully created.
-     *
-     * prop3 failed to update due to '403 Forbidden' and because of this prop4
-     * also could not be updated with '424 Failed dependency'.
-     *
-     * This last example was actually incorrect. While 200 and 201 could appear
-     * in 1 response, if there's any error (403) the other properties should
-     * always fail with 423 (failed dependency).
-     *
-     * But anyway, if you don't want to scratch your head over this, just
-     * return true or false.
-     *
-     * @param string $path
-     * @param array $mutations
-     * @return array|bool
-     */
-    function updatePrincipal($path, $mutations);
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @return array
-     */
-    function searchPrincipals($prefixPath, array $searchProperties);
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    function getGroupMemberSet($principal);
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    function getGroupMembership($principal);
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    function setGroupMemberSet($principal, array $members);
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Plugin.php b/3rdparty/Sabre/DAVACL/Plugin.php
deleted file mode 100644
index 5c828c6d97..0000000000
--- a/3rdparty/Sabre/DAVACL/Plugin.php
+++ /dev/null
@@ -1,1348 +0,0 @@
-<?php
-
-/**
- * SabreDAV ACL Plugin
- *
- * This plugin provides funcitonality to enforce ACL permissions.
- * ACL is defined in RFC3744.
- *
- * In addition it also provides support for the {DAV:}current-user-principal
- * property, defined in RFC5397 and the {DAV:}expand-property report, as
- * defined in RFC3253.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Recursion constants
-     *
-     * This only checks the base node
-     */
-    const R_PARENT = 1;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every node in the tree
-     */
-    const R_RECURSIVE = 2;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every parentnode in the tree, but not leaf-nodes.
-     */
-    const R_RECURSIVEPARENTS = 3;
-
-    /**
-     * Reference to server object.
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * List of urls containing principal collections.
-     * Modify this if your principals are located elsewhere.
-     *
-     * @var array
-     */
-    public $principalCollectionSet = array(
-        'principals',
-    );
-
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the
-     * ones that implement Sabre_DAVACL_IACL). For any other node, access is
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
-    /**
-     * By default nodes that are inaccessible by the user, can still be seen
-     * in directory listings (PROPFIND on parent with Depth: 1)
-     *
-     * In certain cases it's desirable to hide inaccessible nodes. Setting this
-     * to true will cause these nodes to be hidden from directory listings.
-     *
-     * @var bool
-     */
-    public $hideNodesFromListings = false;
-
-    /**
-     * This string is prepended to the username of the currently logged in
-     * user. This allows the plugin to determine the principal path based on
-     * the username.
-     *
-     * @var string
-     */
-    public $defaultUsernamePath = 'principals';
-
-    /**
-     * This list of properties are the properties a client can search on using
-     * the {DAV:}principal-property-search report.
-     *
-     * The keys are the property names, values are descriptions.
-     *
-     * @var array
-     */
-    public $principalSearchPropertySet = array(
-        '{DAV:}displayname' => 'Display name',
-        '{http://sabredav.org/ns}email-address' => 'Email address',
-    );
-
-    /**
-     * Any principal uri's added here, will automatically be added to the list 
-     * of ACL's. They will effectively receive {DAV:}all privileges, as a 
-     * protected privilege.
-     * 
-     * @var array 
-     */
-    public $adminPrincipals = array();
-
-    /**
-     * Returns a list of features added by this plugin.
-     *
-     * This list is used in the response of a HTTP OPTIONS request.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('access-control');
-
-    }
-
-    /**
-     * Returns a list of available methods for a given url
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getMethods($uri) {
-
-        return array('ACL');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'acl';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array(
-            '{DAV:}expand-property',
-            '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set',
-        );
-
-    }
-
-
-    /**
-     * Checks if the current user has the specified privilege(s).
-     *
-     * You can specify a single privilege, or a list of privileges.
-     * This method will throw an exception if the privilege is not available
-     * and return true otherwise.
-     *
-     * @param string $uri
-     * @param array|string $privileges
-     * @param int $recursion
-     * @param bool $throwExceptions if set to false, this method won't through exceptions.
-     * @throws Sabre_DAVACL_Exception_NeedPrivileges
-     * @return bool
-     */
-    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-
-        if (!is_array($privileges)) $privileges = array($privileges);
-
-        $acl = $this->getCurrentUserPrivilegeSet($uri);
-
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions)
-                    throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$privileges);
-                else
-                    return false;
-
-            }
-        }
-
-        $failed = array();
-        foreach($privileges as $priv) {
-
-            if (!in_array($priv, $acl)) {
-                $failed[] = $priv;
-            }
-
-        }
-
-        if ($failed) {
-            if ($throwExceptions)
-                throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$failed);
-            else
-                return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * Returns the standard users' principal.
-     *
-     * This is one authorative principal url for the current user.
-     * This method will return null if the user wasn't logged in.
-     *
-     * @return string|null
-     */
-    public function getCurrentUserPrincipal() {
-
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
-
-        $userName = $authPlugin->getCurrentUser();
-        if (!$userName) return null;
-
-        return $this->defaultUsernamePath . '/' . $userName;
-
-    }
-
-    /**
-     * Returns a list of principals that's associated to the current
-     * user, either directly or through group membership.
-     *
-     * @return array
-     */
-    public function getCurrentUserPrincipals() {
-
-        $currentUser = $this->getCurrentUserPrincipal();
-
-        if (is_null($currentUser)) return array();
-
-        $check = array($currentUser);
-        $principals = array($currentUser);
-
-        while(count($check)) {
-
-            $principal = array_shift($check);
-
-            $node = $this->server->tree->getNodeForPath($principal);
-            if ($node instanceof Sabre_DAVACL_IPrincipal) {
-                foreach($node->getGroupMembership() as $groupMember) {
-
-                    if (!in_array($groupMember, $principals)) {
-
-                        $check[] = $groupMember;
-                        $principals[] = $groupMember;
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the supported privilege structure for this ACL plugin.
-     *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure.
-     *
-     * You can either get the list of privileges by a uri (path) or by
-     * specifying a Node.
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getSupportedPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        if ($node instanceof Sabre_DAVACL_IACL) {
-            $result = $node->getSupportedPrivilegeSet();
-
-            if ($result)
-                return $result;
-        }
-
-        return self::getDefaultSupportedPrivilegeSet();
-
-    }
-
-    /**
-     * Returns a fairly standard set of privileges, which may be useful for
-     * other systems to use as a basis.
-     *
-     * @return array
-     */
-    static function getDefaultSupportedPrivilegeSet() {
-
-        return array(
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => array(
-                array(
-                    'privilege'  => '{DAV:}read',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}read
-                array(
-                    'privilege'  => '{DAV:}write',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}write
-            ),
-        ); // {DAV:}all
-
-    }
-
-    /**
-     * Returns the supported privilege set as a flat list
-     *
-     * This is much easier to parse.
-     *
-     * The returned list will be index by privilege name.
-     * The value is a struct containing the following properties:
-     *   - aggregates
-     *   - abstract
-     *   - concrete
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    final public function getFlatPrivilegeSet($node) {
-
-        $privs = $this->getSupportedPrivilegeSet($node);
-
-        $flat = array();
-        $this->getFPSTraverse($privs, null, $flat);
-
-        return $flat;
-
-    }
-
-    /**
-     * Traverses the privilege set tree for reordering
-     *
-     * This function is solely used by getFlatPrivilegeSet, and would have been
-     * a closure if it wasn't for the fact I need to support PHP 5.2.
-     *
-     * @param array $priv
-     * @param $concrete
-     * @param array $flat
-     * @return void
-     */
-    final private function getFPSTraverse($priv, $concrete, &$flat) {
-
-        $myPriv = array(
-            'privilege' => $priv['privilege'],
-            'abstract' => isset($priv['abstract']) && $priv['abstract'],
-            'aggregates' => array(),
-            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
-        );
-
-        if (isset($priv['aggregates']))
-            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
-
-        $flat[$priv['privilege']] = $myPriv;
-
-        if (isset($priv['aggregates'])) {
-
-            foreach($priv['aggregates'] as $subPriv) {
-
-                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the full ACL list.
-     *
-     * Either a uri or a Sabre_DAV_INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getACL($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-        if (!$node instanceof Sabre_DAVACL_IACL) {
-            return null;
-        }
-        $acl = $node->getACL();
-        foreach($this->adminPrincipals as $adminPrincipal) {
-            $acl[] = array(
-                'principal' => $adminPrincipal,
-                'privilege' => '{DAV:}all',
-                'protected' => true,
-            );
-        }
-        return $acl;
-
-    }
-
-    /**
-     * Returns a list of privileges the current user has
-     * on a particular node.
-     *
-     * Either a uri or a Sabre_DAV_INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getCurrentUserPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        $acl = $this->getACL($node);
-
-        if (is_null($acl)) return null;
-
-        $principals = $this->getCurrentUserPrincipals();
-
-        $collected = array();
-
-        foreach($acl as $ace) {
-
-            $principal = $ace['principal'];
-
-            switch($principal) {
-
-                case '{DAV:}owner' :
-                    $owner = $node->getOwner();
-                    if ($owner && in_array($owner, $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-
-                // 'all' matches for every user
-                case '{DAV:}all' :
-
-                // 'authenticated' matched for every user that's logged in.
-                // Since it's not possible to use ACL while not being logged
-                // in, this is also always true.
-                case '{DAV:}authenticated' :
-                    $collected[] = $ace;
-                    break;
-
-                // 'unauthenticated' can never occur either, so we simply
-                // ignore these.
-                case '{DAV:}unauthenticated' :
-                    break;
-
-                default :
-                    if (in_array($ace['principal'], $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-            }
-
-
-
-        }
-
-        // Now we deduct all aggregated privileges.
-        $flat = $this->getFlatPrivilegeSet($node);
-
-        $collected2 = array();
-        while(count($collected)) {
-
-            $current = array_pop($collected);
-            $collected2[] = $current['privilege'];
-
-            foreach($flat[$current['privilege']]['aggregates'] as $subPriv) {
-                $collected2[] = $subPriv;
-                $collected[] = $flat[$subPriv];
-            }
-
-        }
-
-        return array_values(array_unique($collected2));
-
-    }
-
-    /**
-     * Principal property search
-     *
-     * This method can search for principals matching certain values in
-     * properties.
-     *
-     * This method will return a list of properties for the matched properties.
-     *
-     * @param array $searchProperties    The properties to search on. This is a
-     *                                   key-value list. The keys are property
-     *                                   names, and the values the strings to
-     *                                   match them on.
-     * @param array $requestedProperties This is the list of properties to
-     *                                   return for every match.
-     * @param string $collectionUri      The principal collection to search on.
-     *                                   If this is ommitted, the standard
-     *                                   principal collection-set will be used.
-     * @return array     This method returns an array structure similar to
-     *                  Sabre_DAV_Server::getPropertiesForPath. Returned
-     *                  properties are index by a HTTP status code.
-     *
-     */
-    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null) {
-
-        if (!is_null($collectionUri)) {
-            $uris = array($collectionUri);
-        } else {
-            $uris = $this->principalCollectionSet;
-        }
-
-        $lookupResults = array();
-        foreach($uris as $uri) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($uri);
-            if (!$principalCollection instanceof Sabre_DAVACL_AbstractPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $results = $principalCollection->searchPrincipals($searchProperties);
-            foreach($results as $result) {
-                $lookupResults[] = rtrim($uri,'/') . '/' . $result;
-            }
-
-        }
-
-        $matches = array();
-
-        foreach($lookupResults as $lookupResult) {
-
-            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
-
-        }
-
-        return $matches;
-
-    }
-
-    /**
-     * Sets up the plugin
-     *
-     * This method is automatically called by the server class.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-
-        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
-        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
-        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
-        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
-        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
-
-        array_push($server->protectedProperties,
-            '{DAV:}alternate-URI-set',
-            '{DAV:}principal-URL',
-            '{DAV:}group-membership',
-            '{DAV:}principal-collection-set',
-            '{DAV:}current-user-principal',
-            '{DAV:}supported-privilege-set',
-            '{DAV:}current-user-privilege-set',
-            '{DAV:}acl',
-            '{DAV:}acl-restrictions',
-            '{DAV:}inherited-acl-set',
-            '{DAV:}owner',
-            '{DAV:}group'
-        );
-
-        // Automatically mapping nodes implementing IPrincipal to the
-        // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre_DAVACL_IPrincipal'] = '{DAV:}principal';
-
-        // Mapping the group-member-set property to the HrefList property
-        // class.
-        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre_DAV_Property_HrefList';
-
-    }
-
-
-    /* {{{ Event handlers */
-
-    /**
-     * Triggered before any method is handled
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function beforeMethod($method, $uri) {
-
-        $exists = $this->server->tree->nodeExists($uri);
-
-        // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
-
-        switch($method) {
-
-            case 'GET' :
-            case 'HEAD' :
-            case 'OPTIONS' :
-                // For these 3 we only need to know if the node is readable.
-                $this->checkPrivileges($uri,'{DAV:}read');
-                break;
-
-            case 'PUT' :
-            case 'LOCK' :
-            case 'UNLOCK' :
-                // This method requires the write-content priv if the node
-                // already exists, and bind on the parent if the node is being
-                // created.
-                // The bind privilege is handled in the beforeBind event.
-                $this->checkPrivileges($uri,'{DAV:}write-content');
-                break;
-
-
-            case 'PROPPATCH' :
-                $this->checkPrivileges($uri,'{DAV:}write-properties');
-                break;
-
-            case 'ACL' :
-                $this->checkPrivileges($uri,'{DAV:}write-acl');
-                break;
-
-            case 'COPY' :
-            case 'MOVE' :
-                // Copy requires read privileges on the entire source tree.
-                // If the target exists write-content normally needs to be
-                // checked, however, we're deleting the node beforehand and
-                // creating a new one after, so this is handled by the
-                // beforeUnbind event.
-                //
-                // The creation of the new node is handled by the beforeBind
-                // event.
-                //
-                // If MOVE is used beforeUnbind will also be used to check if
-                // the sourcenode can be deleted.
-                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
-
-                break;
-
-        }
-
-    }
-
-    /**
-     * Triggered before a new node is created.
-     *
-     * This allows us to check permissions for any operation that creates a
-     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeBind($uri) {
-
-        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}bind');
-
-    }
-
-    /**
-     * Triggered before a node is deleted
-     *
-     * This allows us to check permissions for any operation that will delete
-     * an existing node.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeUnbind($uri) {
-
-        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
-
-    }
-
-    /**
-     * Triggered before a node is unlocked.
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lock
-     * @TODO: not yet implemented
-     * @return void
-     */
-    public function beforeUnlock($uri, Sabre_DAV_Locks_LockInfo $lock) {
-
-
-    }
-
-    /**
-     * Triggered before properties are looked up in specific nodes.
-     *
-     * @param string $uri
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @TODO really should be broken into multiple methods, or even a class.
-     * @return void
-     */
-    public function beforeGetProperties($uri, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
-
-        // Checking the read permission
-        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
-
-            // User is not allowed to read properties
-            if ($this->hideNodesFromListings) {
-                return false;
-            }
-
-            // Marking all requested properties as '403'.
-            foreach($requestedProperties as $key=>$requestedProperty) {
-                unset($requestedProperties[$key]);
-                $returnedProperties[403][$requestedProperty] = null;
-            }
-            return;
-
-        }
-
-        /* Adding principal properties */
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new Sabre_DAV_Property_HrefList($node->getAlternateUriSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}principal-URL'] = new Sabre_DAV_Property_Href($node->getPrincipalUrl() . '/');
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-member-set'] = new Sabre_DAV_Property_HrefList($node->getGroupMemberSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-membership'] = new Sabre_DAV_Property_HrefList($node->getGroupMembership());
-
-            }
-
-            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
-
-                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
-
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $val = $this->principalCollectionSet;
-            // Ensuring all collections end with a slash
-            foreach($val as $k=>$v) $val[$k] = $v . '/';
-            $returnedProperties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_HrefList($val);
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            if ($url = $this->getCurrentUserPrincipal()) {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF, $url . '/');
-            } else {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::UNAUTHENTICATED);
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Sabre_DAVACL_Property_SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
-                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
-                unset($requestedProperties[$index]);
-            } else {
-                $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Sabre_DAVACL_Property_CurrentUserPrivilegeSet($val);
-                }
-            }
-
-        }
-
-        /* The ACL property contains all the permissions */
-        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[403]['{DAV:}acl'] = null;
-
-            } else {
-
-                $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}acl'] = new Sabre_DAVACL_Property_Acl($this->getACL($node));
-                }
-
-            }
-
-        }
-
-        /* The acl-restrictions property contains information on how privileges
-         * must behave.
-         */
-        if (false !== ($index = array_search('{DAV:}acl-restrictions', $requestedProperties))) {
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}acl-restrictions'] = new Sabre_DAVACL_Property_AclRestrictions();
-        }
-
-    }
-
-    /**
-     * This method intercepts PROPPATCH methods and make sure the
-     * group-member-set is updated correctly.
-     *
-     * @param array $propertyDelta
-     * @param array $result
-     * @param Sabre_DAV_INode $node
-     * @return bool
-     */
-    public function updateProperties(&$propertyDelta, &$result, Sabre_DAV_INode $node) {
-
-        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
-            return;
-
-        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
-            $memberSet = array();
-        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof Sabre_DAV_Property_HrefList) {
-            $memberSet = $propertyDelta['{DAV:}group-member-set']->getHrefs();
-        } else {
-            throw new Sabre_DAV_Exception('The group-member-set property MUST be an instance of Sabre_DAV_Property_HrefList or null');
-        }
-
-        if (!($node instanceof Sabre_DAVACL_IPrincipal)) {
-            $result[403]['{DAV:}group-member-set'] = null;
-            unset($propertyDelta['{DAV:}group-member-set']);
-
-            // Returning false will stop the updateProperties process
-            return false;
-        }
-
-        $node->setGroupMemberSet($memberSet);
-
-        $result[200]['{DAV:}group-member-set'] = null;
-        unset($propertyDelta['{DAV:}group-member-set']);
-
-    }
-
-    /**
-     * This method handels HTTP REPORT requests
-     *
-     * @param string $reportName
-     * @param DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName, $dom) {
-
-        switch($reportName) {
-
-            case '{DAV:}principal-property-search' :
-                $this->principalPropertySearchReport($dom);
-                return false;
-            case '{DAV:}principal-search-property-set' :
-                $this->principalSearchPropertySetReport($dom);
-                return false;
-            case '{DAV:}expand-property' :
-                $this->expandPropertyReport($dom);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This event is triggered for any HTTP method that is not known by the
-     * webserver.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        if ($method!=='ACL') return;
-
-        $this->httpACL($uri);
-        return false;
-
-    }
-
-    /**
-     * This method is responsible for handling the 'ACL' event.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpACL($uri) {
-
-        $body = $this->server->httpRequest->getBody(true);
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $newAcl =
-            Sabre_DAVACL_Property_Acl::unserialize($dom->firstChild)
-            ->getPrivileges();
-
-        // Normalizing urls
-        foreach($newAcl as $k=>$newAce) {
-            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
-        }
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_DAVACL_IACL)) {
-            throw new Sabre_DAV_Exception_MethodNotAllowed('This node does not support the ACL method');
-        }
-
-        $oldAcl = $this->getACL($node);
-
-        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
-
-        /* Checking if protected principals from the existing principal set are
-           not overwritten. */
-        foreach($oldAcl as $oldAce) {
-
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
-
-            $found = false;
-            foreach($newAcl as $newAce) {
-                if (
-                    $newAce['privilege'] === $oldAce['privilege'] &&
-                    $newAce['principal'] === $oldAce['principal'] &&
-                    $newAce['protected']
-                )
-                $found = true;
-            }
-
-            if (!$found)
-                throw new Sabre_DAVACL_Exception_AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
-
-        }
-
-        foreach($newAcl as $newAce) {
-
-            // Do we recognize the privilege
-            if (!isset($supportedPrivileges[$newAce['privilege']])) {
-                throw new Sabre_DAVACL_Exception_NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
-            }
-
-            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
-                throw new Sabre_DAVACL_Exception_NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
-            }
-
-            // Looking up the principal
-            try {
-                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (Sabre_DAV_Exception_NotFound $e) {
-                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
-            }
-            if (!($principal instanceof Sabre_DAVACL_IPrincipal)) {
-                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
-            }
-
-        }
-        $node->setACL($newAcl);
-
-    }
-
-    /* }}} */
-
-    /* Reports {{{ */
-
-    /**
-     * The expand-property report is defined in RFC3253 section 3-8.
-     *
-     * This report is very similar to a standard PROPFIND. The difference is
-     * that it has the additional ability to look at properties containing a
-     * {DAV:}href element, follow that property and grab additional elements
-     * there.
-     *
-     * Other rfc's, such as ACL rely on this report, so it made sense to put
-     * it in this plugin.
-     *
-     * @param DOMElement $dom
-     * @return void
-     */
-    protected function expandPropertyReport($dom) {
-
-        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
-        $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
-
-        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($result as $response) {
-            $response->serialize($this->server, $multiStatus);
-        }
-
-        $xml = $dom->saveXML();
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * This method is used by expandPropertyReport to parse
-     * out the entire HTTP request.
-     *
-     * @param DOMElement $node
-     * @return array
-     */
-    protected function parseExpandPropertyReportRequest($node) {
-
-        $requestedProperties = array();
-        do {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
-
-            if ($node->firstChild) {
-
-                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
-
-            } else {
-
-                $children = array();
-
-            }
-
-            $namespace = $node->getAttribute('namespace');
-            if (!$namespace) $namespace = 'DAV:';
-
-            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
-            $requestedProperties[$propName] = $children;
-
-        } while ($node = $node->nextSibling);
-
-        return $requestedProperties;
-
-    }
-
-    /**
-     * This method expands all the properties and returns
-     * a list with property values
-     *
-     * @param array $path
-     * @param array $requestedProperties the list of required properties
-     * @param int $depth
-     * @return array
-     */
-    protected function expandProperties($path, array $requestedProperties, $depth) {
-
-        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
-
-        $result = array();
-
-        foreach($foundProperties as $node) {
-
-            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
-
-                // We're only traversing if sub-properties were requested
-                if(count($childRequestedProperties)===0) continue;
-
-                // We only have to do the expansion if the property was found
-                // and it contains an href element.
-                if (!array_key_exists($propertyName,$node[200])) continue;
-
-                if ($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref) {
-                    $hrefs = array($node[200][$propertyName]->getHref());
-                } elseif ($node[200][$propertyName] instanceof Sabre_DAV_Property_HrefList) {
-                    $hrefs = $node[200][$propertyName]->getHrefs();
-                }
-
-                $childProps = array();
-                foreach($hrefs as $href) {
-                    $childProps = array_merge($childProps, $this->expandProperties($href, $childRequestedProperties, 0));
-                }
-                $node[200][$propertyName] = new Sabre_DAV_Property_ResponseList($childProps);
-
-            }
-            $result[] = new Sabre_DAV_Property_Response($path, $node);
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * principalSearchPropertySetReport
-     *
-     * This method responsible for handing the
-     * {DAV:}principal-search-property-set report. This report returns a list
-     * of properties the client may search on, using the
-     * {DAV:}principal-property-search report.
-     *
-     * @param DOMDocument $dom
-     * @return void
-     */
-    protected function principalSearchPropertySetReport(DOMDocument $dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
-        }
-
-        if ($dom->firstChild->hasChildNodes())
-            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements');
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $root = $dom->createElement('d:principal-search-property-set');
-        $dom->appendChild($root);
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $root->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        $nsList = $this->server->xmlNamespaces;
-
-        foreach($this->principalSearchPropertySet as $propertyName=>$description) {
-
-            $psp = $dom->createElement('d:principal-search-property');
-            $root->appendChild($psp);
-
-            $prop = $dom->createElement('d:prop');
-            $psp->appendChild($prop);
-
-            $propName = null;
-            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-            $prop->appendChild($currentProperty);
-
-            $descriptionElem = $dom->createElement('d:description');
-            $descriptionElem->setAttribute('xml:lang','en');
-            $descriptionElem->appendChild($dom->createTextNode($description));
-            $psp->appendChild($descriptionElem);
-
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody($dom->saveXML());
-
-    }
-
-    /**
-     * principalPropertySearchReport
-     *
-     * This method is responsible for handing the
-     * {DAV:}principal-property-search report. This report can be used for
-     * clients to search for groups of principals, based on the value of one
-     * or more properties.
-     *
-     * @param DOMDocument $dom
-     * @return void
-     */
-    protected function principalPropertySearchReport(DOMDocument $dom) {
-
-        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
-
-        $uri = null;
-        if (!$applyToPrincipalCollectionSet) {
-            $uri = $this->server->getRequestUri();
-        }
-        $result = $this->principalSearch($searchProperties, $requestedProperties, $uri);
-
-        $xml = $this->server->generateMultiStatus($result);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * parsePrincipalPropertySearchReportRequest
-     *
-     * This method parses the request body from a
-     * {DAV:}principal-property-search report.
-     *
-     * This method returns an array with two elements:
-     *  1. an array with properties to search on, and their values
-     *  2. a list of propertyvalues that should be returned for the request.
-     *
-     * @param DOMDocument $dom
-     * @return array
-     */
-    protected function parsePrincipalPropertySearchReportRequest($dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
-        }
-
-        $searchProperties = array();
-
-        $applyToPrincipalCollectionSet = false;
-
-        // Parsing the search request
-        foreach($dom->firstChild->childNodes as $searchNode) {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set') {
-                $applyToPrincipalCollectionSet = true;
-            }
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
-                continue;
-
-            $propertyName = null;
-            $propertyValue = null;
-
-            foreach($searchNode->childNodes as $childNode) {
-
-                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
-
-                    case '{DAV:}prop' :
-                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
-                        reset($property);
-                        $propertyName = key($property);
-                        break;
-
-                    case '{DAV:}match' :
-                        $propertyValue = $childNode->textContent;
-                        break;
-
-                }
-
-
-            }
-
-            if (is_null($propertyName) || is_null($propertyValue))
-                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
-
-            $searchProperties[$propertyName] = $propertyValue;
-
-        }
-
-        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
-
-    }
-
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php
deleted file mode 100644
index 51c6658afd..0000000000
--- a/3rdparty/Sabre/DAVACL/Principal.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * Principal class
- *
- * This class is a representation of a simple principal
- *
- * Many WebDAV specs require a user to show up in the directory
- * structure.
- *
- * This principal also has basic ACL settings, only allowing the principal
- * access it's own principal.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * Struct with principal information.
-     *
-     * @var array
-     */
-    protected $principalProperties;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the principal object
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param array $principalProperties
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalProperties = array()) {
-
-        if (!isset($principalProperties['uri'])) {
-            throw new Sabre_DAV_Exception('The principal properties must at least contain the \'uri\' key');
-        }
-        $this->principalBackend = $principalBackend;
-        $this->principalProperties = $principalProperties;
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalProperties['uri'];
-
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        $uris = array();
-        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-
-            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-
-        }
-
-        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
-        }
-
-        return array_unique($uris);
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-
-    }
-
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $groupMembers
-     * @return void
-     */
-    public function setGroupMemberSet(array $groupMembers) {
-
-        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-
-    }
-
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        $uri = $this->principalProperties['uri'];
-        list(, $name) = Sabre_DAV_URLUtil::splitPath($uri);
-        return $name;
-
-    }
-
-    /**
-     * Returns the name of the user
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        if (isset($this->principalProperties['{DAV:}displayname'])) {
-            return $this->principalProperties['{DAV:}displayname'];
-        } else {
-            return $this->getName();
-        }
-
-    }
-
-    /**
-     * Returns a list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $newProperties = array();
-        foreach($requestedProperties as $propName) {
-
-            if (isset($this->principalProperties[$propName])) {
-                $newProperties[$propName] = $this->principalProperties[$propName];
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * Updates this principals properties.
-     * 
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->principalBackend->updatePrincipal($this->principalProperties['uri'], $mutations);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalProperties['uri'];
-
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getPrincipalUrl(),
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Updating ACLs is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
deleted file mode 100644
index a76b4a9d72..0000000000
--- a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ /dev/null
@@ -1,427 +0,0 @@
-<?php
-
-/**
- * PDO principal backend
- *
- * This is a simple principal backend that maps exactly to the users table, as
- * used by Sabre_DAV_Auth_Backend_PDO.
- *
- * It assumes all principals are in a single collection. The default collection
- * is 'principals/', but this can be overriden.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
-
-    /**
-     * pdo
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name for 'principals'
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * PDO table name for 'group members'
-     *
-     * @var string
-     */
-    protected $groupMembersTableName;
-
-    /**
-     * A list of additional fields to support
-     *
-     * @var array
-     */
-    protected $fieldMap = array(
-
-        /**
-         * This property can be used to display the users' real name.
-         */
-        '{DAV:}displayname' => array(
-            'dbField' => 'displayname',
-        ),
-
-        /**
-         * This property is actually used by the CardDAV plugin, where it gets
-         * mapped to {http://calendarserver.orgi/ns/}me-card.
-         *
-         * The reason we don't straight-up use that property, is because
-         * me-card is defined as a property on the users' addressbook
-         * collection.
-         */
-        '{http://sabredav.org/ns}vcard-url' => array(
-            'dbField' => 'vcardurl',
-        ),
-        /**
-         * This is the users' primary email-address.
-         */
-        '{http://sabredav.org/ns}email-address' => array(
-            'dbField' => 'email',
-        ),
-    );
-
-    /**
-     * Sets up the backend.
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     * @param string $groupMembersTableName
-     */
-    public function __construct(PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-        $this->groupMembersTableName = $groupMembersTableName;
-
-    }
-
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    public function getPrincipalsByPrefix($prefixPath) {
-
-        $fields = array(
-            'uri',
-        );
-
-        foreach($this->fieldMap as $key=>$value) {
-            $fields[] = $value['dbField'];
-        }
-        $result = $this->pdo->query('SELECT '.implode(',', $fields).'  FROM '. $this->tableName);
-
-        $principals = array();
-
-        while($row = $result->fetch(PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principal = array(
-                'uri' => $row['uri'],
-            );
-            foreach($this->fieldMap as $key=>$value) {
-                if ($row[$value['dbField']]) {
-                    $principal[$key] = $row[$value['dbField']];
-                }
-            }
-            $principals[] = $principal;
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getPrincipalByPath($path) {
-
-        $fields = array(
-            'id',
-            'uri',
-        );
-
-        foreach($this->fieldMap as $key=>$value) {
-            $fields[] = $value['dbField'];
-        }
-        $stmt = $this->pdo->prepare('SELECT '.implode(',', $fields).'  FROM '. $this->tableName . ' WHERE uri = ?');
-        $stmt->execute(array($path));
-
-        $row = $stmt->fetch(PDO::FETCH_ASSOC);
-        if (!$row) return;
-
-        $principal = array(
-            'id'  => $row['id'],
-            'uri' => $row['uri'],
-        );
-        foreach($this->fieldMap as $key=>$value) {
-            if ($row[$value['dbField']]) {
-                $principal[$key] = $row[$value['dbField']];
-            }
-        }
-        return $principal;
-
-    }
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is supplied as an array. Each key in the array is
-     * a propertyname, such as {DAV:}displayname.
-     *
-     * Each value is the actual value to be updated. If a value is null, it
-     * must be deleted.
-     *
-     * This method should be atomic. It must either completely succeed, or
-     * completely fail. Success and failure can simply be returned as 'true' or
-     * 'false'.
-     *
-     * It is also possible to return detailed failure information. In that case
-     * an array such as this should be returned:
-     *
-     * array(
-     *   200 => array(
-     *      '{DAV:}prop1' => null,
-     *   ),
-     *   201 => array(
-     *      '{DAV:}prop2' => null,
-     *   ),
-     *   403 => array(
-     *      '{DAV:}prop3' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}prop4' => null,
-     *   ),
-     * );
-     *
-     * In this previous example prop1 was successfully updated or deleted, and
-     * prop2 was succesfully created.
-     *
-     * prop3 failed to update due to '403 Forbidden' and because of this prop4
-     * also could not be updated with '424 Failed dependency'.
-     *
-     * This last example was actually incorrect. While 200 and 201 could appear
-     * in 1 response, if there's any error (403) the other properties should
-     * always fail with 423 (failed dependency).
-     *
-     * But anyway, if you don't want to scratch your head over this, just
-     * return true or false.
-     *
-     * @param string $path
-     * @param array $mutations
-     * @return array|bool
-     */
-    public function updatePrincipal($path, $mutations) {
-
-        $updateAble = array();
-        foreach($mutations as $key=>$value) {
-
-            // We are not aware of this field, we must fail.
-            if (!isset($this->fieldMap[$key])) {
-
-                $response = array(
-                    403 => array(
-                        $key => null,
-                    ),
-                    424 => array(),
-                );
-
-                // Adding the rest to the response as a 424
-                foreach($mutations as $subKey=>$subValue) {
-                    if ($subKey !== $key) {
-                        $response[424][$subKey] = null;
-                    }
-                }
-                return $response;
-            }
-
-            $updateAble[$this->fieldMap[$key]['dbField']] = $value;
-
-        }
-
-        // No fields to update
-        $query = "UPDATE " . $this->tableName . " SET ";
-
-        $first = true;
-        foreach($updateAble as $key => $value) {
-            if (!$first) {
-                $query.= ', ';
-            }
-            $first = false;
-            $query.= "$key = :$key ";
-        }
-        $query.='WHERE uri = :uri';
-        $stmt = $this->pdo->prepare($query);
-        $updateAble['uri'] =  $path;
-        $stmt->execute($updateAble);
-
-        return true;
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @return array
-     */
-    public function searchPrincipals($prefixPath, array $searchProperties) {
-
-        $query = 'SELECT uri FROM ' . $this->tableName . ' WHERE 1=1 ';
-        $values = array();
-        foreach($searchProperties as $property => $value) {
-
-            switch($property) {
-
-                case '{DAV:}displayname' :
-                    $query.=' AND displayname LIKE ?';
-                    $values[] = '%' . $value . '%';
-                    break;
-                case '{http://sabredav.org/ns}email-address' :
-                    $query.=' AND email LIKE ?';
-                    $values[] = '%' . $value . '%';
-                    break;
-                default :
-                    // Unsupported property
-                    return array();
-
-            }
-
-        }
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $principals = array();
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principals[] = $row['uri'];
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMemberSet($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMembership($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    public function setGroupMemberSet($principal, array $members) {
-
-        // Grabbing the list of principal id's.
-        $stmt = $this->pdo->prepare('SELECT id, uri FROM '.$this->tableName.' WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
-        $stmt->execute(array_merge(array($principal), $members));
-
-        $memberIds = array();
-        $principalId = null;
-
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            if ($row['uri'] == $principal) {
-                $principalId = $row['id'];
-            } else {
-                $memberIds[] = $row['id'];
-            }
-        }
-        if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
-
-        // Wiping out old members
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->groupMembersTableName.' WHERE principal_id = ?;');
-        $stmt->execute(array($principalId));
-
-        foreach($memberIds as $memberId) {
-
-            $stmt = $this->pdo->prepare('INSERT INTO '.$this->groupMembersTableName.' (principal_id, member_id) VALUES (?, ?);');
-            $stmt->execute(array($principalId, $memberId));
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalCollection.php b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
deleted file mode 100644
index c3e4cb83f2..0000000000
--- a/3rdparty/Sabre/DAVACL/PrincipalCollection.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Principals Collection
- *
- * This collection represents a list of users. It uses
- * Sabre_DAV_Auth_Backend to determine which users are available on the list.
- *
- * The users are instances of Sabre_DAV_Auth_Principal
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return Sabre_DAV_INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_DAVACL_Principal($this->principalBackend, $principal);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/Acl.php b/3rdparty/Sabre/DAVACL/Property/Acl.php
deleted file mode 100644
index 05e1a690b3..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/Acl.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}acl property
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
-
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Whether or not the server base url is required to be prefixed when
-     * serializing the property.
-     *
-     * @var boolean
-     */
-    private $prefixBaseUrl;
-
-    /**
-     * Constructor
-     *
-     * This object requires a structure similar to the return value from
-     * Sabre_DAVACL_Plugin::getACL().
-     *
-     * Each privilege is a an array with at least a 'privilege' property, and a
-     * 'principal' property. A privilege may have a 'protected' property as
-     * well.
-     *
-     * The prefixBaseUrl should be set to false, if the supplied principal urls
-     * are already full urls. If this is kept to true, the servers base url
-     * will automatically be prefixed.
-     *
-     * @param bool $prefixBaseUrl
-     * @param array $privileges
-     */
-    public function __construct(array $privileges, $prefixBaseUrl = true) {
-
-        $this->privileges = $privileges;
-        $this->prefixBaseUrl = $prefixBaseUrl;
-
-    }
-
-    /**
-     * Returns the list of privileges for this property
-     *
-     * @return array
-     */
-    public function getPrivileges() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $ace) {
-
-            $this->serializeAce($doc, $node, $ace, $server);
-
-        }
-
-    }
-
-    /**
-     * Unserializes the {DAV:}acl xml element.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAVACL_Property_Acl
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $privileges = array();
-        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
-        for($ii=0; $ii < $xaces->length; $ii++) {
-
-            $xace = $xaces->item($ii);
-            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
-            if ($principal->length !== 1) {
-                throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
-            }
-            $principal = Sabre_DAVACL_Property_Principal::unserialize($principal->item(0));
-
-            switch($principal->getType()) {
-                case Sabre_DAVACL_Property_Principal::HREF :
-                    $principal = $principal->getHref();
-                    break;
-                case Sabre_DAVACL_Property_Principal::AUTHENTICATED :
-                    $principal = '{DAV:}authenticated';
-                    break;
-                case Sabre_DAVACL_Property_Principal::UNAUTHENTICATED :
-                    $principal = '{DAV:}unauthenticated';
-                    break;
-                case Sabre_DAVACL_Property_Principal::ALL :
-                    $principal = '{DAV:}all';
-                    break;
-
-            }
-
-            $protected = false;
-
-            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
-                $protected = true;
-            }
-
-            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
-            if ($grants->length < 1) {
-                throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
-            }
-            $grant = $grants->item(0);
-
-            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
-            for($jj=0; $jj<$xprivs->length; $jj++) {
-
-                $xpriv = $xprivs->item($jj);
-
-                $privilegeName = null;
-
-                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
-
-                    $childNode = $xpriv->childNodes->item($kk);
-                    if ($t = Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
-                        $privilegeName = $t;
-                        break;
-                    }
-                }
-                if (is_null($privilegeName)) {
-                    throw new Sabre_DAV_Exception_BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
-                }
-
-                $privileges[] = array(
-                    'principal' => $principal,
-                    'protected' => $protected,
-                    'privilege' => $privilegeName,
-                );
-
-            }
-
-        }
-
-        return new self($privileges);
-
-    }
-
-    /**
-     * Serializes a single access control entry.
-     *
-     * @param DOMDocument $doc
-     * @param DOMElement $node
-     * @param array $ace
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    private function serializeAce($doc,$node,$ace, $server) {
-
-        $xace  = $doc->createElementNS('DAV:','d:ace');
-        $node->appendChild($xace);
-
-        $principal = $doc->createElementNS('DAV:','d:principal');
-        $xace->appendChild($principal);
-        switch($ace['principal']) {
-            case '{DAV:}authenticated' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:authenticated'));
-                break;
-            case '{DAV:}unauthenticated' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:unauthenticated'));
-                break;
-            case '{DAV:}all' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:all'));
-                break;
-            default:
-                $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
-        }
-
-        $grant = $doc->createElementNS('DAV:','d:grant');
-        $xace->appendChild($grant);
-
-        $privParts = null;
-
-        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
-
-        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
-        $grant->appendChild($xprivilege);
-
-        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($ace['protected']) && $ace['protected'])
-            $xace->appendChild($doc->createElement('d:protected'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php b/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
deleted file mode 100644
index a8b054956d..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * AclRestrictions property
- *
- * This property represents {DAV:}acl-restrictions, as defined in RFC3744.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_AclRestrictions extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property into a DOMElement
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $elem
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $elem) {
-
-        $doc = $elem->ownerDocument;
-
-        $elem->appendChild($doc->createElementNS('DAV:','d:grant-only'));
-        $elem->appendChild($doc->createElementNS('DAV:','d:no-invert'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
deleted file mode 100644
index 94a2964061..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * CurrentUserPrivilegeSet
- *
- * This class represents the current-user-privilege-set property. When
- * requested, it contain all the privileges a user has on a specific node.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
-
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Creates the object
-     *
-     * Pass the privileges in clark-notation
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property in the DOM
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $privName) {
-
-            $this->serializePriv($doc,$node,$privName);
-
-        }
-
-    }
-
-    /**
-     * Serializes one privilege
-     *
-     * @param DOMDocument $doc
-     * @param DOMElement $node
-     * @param string $privName
-     * @return void
-     */
-    protected function serializePriv($doc,$node,$privName) {
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $node->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/Principal.php b/3rdparty/Sabre/DAVACL/Property/Principal.php
deleted file mode 100644
index c36328a58e..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/Principal.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * Principal property
- *
- * The principal property represents a principal from RFC3744 (ACL).
- * The property can be used to specify a principal or pseudo principals.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
-     */
-    const UNAUTHENTICATED = 1;
-
-    /**
-     * To specify any principal that is logged in, use AUTHENTICATED
-     */
-    const AUTHENTICATED = 2;
-
-    /**
-     * Specific principals can be specified with the HREF
-     */
-    const HREF = 3;
-
-    /**
-     * Everybody, basically
-     */
-    const ALL = 4;
-
-    /**
-     * Principal-type
-     *
-     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
-     *
-     * @var int
-     */
-    private $type;
-
-    /**
-     * Url to principal
-     *
-     * This value is only used for the HREF principal type.
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Creates the property.
-     *
-     * The 'type' argument must be one of the type constants defined in this class.
-     *
-     * 'href' is only required for the HREF type.
-     *
-     * @param int $type
-     * @param string|null $href
-     */
-    public function __construct($type, $href = null) {
-
-        $this->type = $type;
-
-        if ($type===self::HREF && is_null($href)) {
-            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
-        }
-        $this->href = $href;
-
-    }
-
-    /**
-     * Returns the principal type
-     *
-     * @return int
-     */
-    public function getType() {
-
-        return $this->type;
-
-    }
-
-    /**
-     * Returns the principal uri.
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-        switch($this->type) {
-
-            case self::UNAUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
-                );
-                break;
-            case self::AUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':authenticated')
-                );
-                break;
-            case self::HREF :
-                $href = $node->ownerDocument->createElement($prefix . ':href');
-                $href->nodeValue = $server->getBaseUri() . $this->href;
-                $node->appendChild($href);
-                break;
-
-        }
-
-    }
-
-    /**
-     * Deserializes a DOM element into a property object.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_Principal
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $parent = $dom->firstChild;
-        while(!Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
-            $parent = $parent->nextSibling;
-        }
-
-        switch(Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
-
-            case '{DAV:}unauthenticated' :
-                return new self(self::UNAUTHENTICATED);
-            case '{DAV:}authenticated' :
-                return new self(self::AUTHENTICATED);
-            case '{DAV:}href':
-                return new self(self::HREF, $parent->textContent);
-            case '{DAV:}all':
-                return new self(self::ALL);
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Unexpected element (' . Sabre_DAV_XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
deleted file mode 100644
index 276d57ae09..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * SupportedPrivilegeSet property
- *
- * This property encodes the {DAV:}supported-privilege-set property, as defined
- * in rfc3744. Please consult the rfc for details about it's structure.
- *
- * This class expects a structure like the one given from
- * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its
- * constructor.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
-
-    /**
-     * privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Constructor
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property into a domdocument.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        $this->serializePriv($doc, $node, $this->privileges);
-
-    }
-
-    /**
-     * Serializes a property
-     *
-     * This is a recursive function.
-     *
-     * @param DOMDocument $doc
-     * @param DOMElement $node
-     * @param array $privilege
-     * @return void
-     */
-    private function serializePriv($doc,$node,$privilege) {
-
-        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
-        $node->appendChild($xsp);
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $xsp->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($privilege['abstract']) && $privilege['abstract']) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
-        }
-
-        if (isset($privilege['description'])) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
-        }
-
-        if (isset($privilege['aggregates'])) {
-            foreach($privilege['aggregates'] as $subPrivilege) {
-                $this->serializePriv($doc,$xsp,$subPrivilege);
-            }
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php
deleted file mode 100644
index 9950f74874..0000000000
--- a/3rdparty/Sabre/DAVACL/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the SabreDAV version constants.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.0';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/DAVACL/includes.php b/3rdparty/Sabre/DAVACL/includes.php
deleted file mode 100644
index 28fa3eed22..0000000000
--- a/3rdparty/Sabre/DAVACL/includes.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL includes file
- *
- * Including this file will automatically include all files from the
- * Sabre_DAVACL package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/AbstractPrincipalCollection.php';
-include __DIR__ . '/Exception/AceConflict.php';
-include __DIR__ . '/Exception/NeedPrivileges.php';
-include __DIR__ . '/Exception/NoAbstract.php';
-include __DIR__ . '/Exception/NotRecognizedPrincipal.php';
-include __DIR__ . '/Exception/NotSupportedPrivilege.php';
-include __DIR__ . '/IACL.php';
-include __DIR__ . '/IPrincipal.php';
-include __DIR__ . '/IPrincipalBackend.php';
-include __DIR__ . '/Plugin.php';
-include __DIR__ . '/Principal.php';
-include __DIR__ . '/PrincipalBackend/PDO.php';
-include __DIR__ . '/PrincipalCollection.php';
-include __DIR__ . '/Property/Acl.php';
-include __DIR__ . '/Property/AclRestrictions.php';
-include __DIR__ . '/Property/CurrentUserPrivilegeSet.php';
-include __DIR__ . '/Property/Principal.php';
-include __DIR__ . '/Property/SupportedPrivilegeSet.php';
-include __DIR__ . '/Version.php';
-// End includes
diff --git a/3rdparty/Sabre/HTTP/AWSAuth.php b/3rdparty/Sabre/HTTP/AWSAuth.php
deleted file mode 100644
index fb8245c8cb..0000000000
--- a/3rdparty/Sabre/HTTP/AWSAuth.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * HTTP AWS Authentication handler
- *
- * Use this class to leverage amazon's AWS authentication header
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * The signature supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->httpRequest->getHeader('Authorization');
-        $authHeader = explode(' ',$authHeader);
-
-        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-
-            if ($contentMD5!=base64_encode(md5($body,true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date'))
-            $requestDate = $this->httpRequest->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->httpRequest->getMethod() . "\n" .
-                $contentMD5 . "\n" .
-                $this->httpRequest->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders .
-                $this->httpRequest->getURI()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new DateTime('-15 minutes');
-        $max = new DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = array();
-        $headers = $this->httpRequest->getHeaders();
-        foreach($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName),'x-amz-')===0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-
-        $headerStr = '';
-        foreach($amzHeaders as $h=>$v) {
-            $headerStr.=$h.':'.$v;
-        }
-
-        return $headerStr;
-
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature
-     *
-     * @param string $key
-     * @param string $message
-     * @return string
-     */
-    private function hmacsha1($key, $message) {
-
-        $blocksize=64;
-        if (strlen($key)>$blocksize)
-            $key=pack('H*', sha1($key));
-        $key=str_pad($key,$blocksize,chr(0x00));
-        $ipad=str_repeat(chr(0x36),$blocksize);
-        $opad=str_repeat(chr(0x5c),$blocksize);
-        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
-        return $hmac;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/AbstractAuth.php b/3rdparty/Sabre/HTTP/AbstractAuth.php
deleted file mode 100644
index 3bccabcd1c..0000000000
--- a/3rdparty/Sabre/HTTP/AbstractAuth.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * HTTP Authentication baseclass
- *
- * This class has the common functionality for BasicAuth and DigestAuth
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_HTTP_AbstractAuth {
-
-    /**
-     * The realm will be displayed in the dialog boxes
-     *
-     * This identifier can be changed through setRealm()
-     *
-     * @var string
-     */
-    protected $realm = 'SabreDAV';
-
-    /**
-     * HTTP response helper
-     *
-     * @var Sabre_HTTP_Response
-     */
-    protected $httpResponse;
-
-
-    /**
-     * HTTP request helper
-     *
-     * @var Sabre_HTTP_Request
-     */
-    protected $httpRequest;
-
-    /**
-     * __construct
-     *
-     */
-    public function __construct() {
-
-        $this->httpResponse = new Sabre_HTTP_Response();
-        $this->httpRequest = new Sabre_HTTP_Request();
-
-    }
-
-    /**
-     * Sets an alternative HTTP response object
-     *
-     * @param Sabre_HTTP_Response $response
-     * @return void
-     */
-    public function setHTTPResponse(Sabre_HTTP_Response $response) {
-
-        $this->httpResponse = $response;
-
-    }
-
-    /**
-     * Sets an alternative HTTP request object
-     *
-     * @param Sabre_HTTP_Request $request
-     * @return void
-     */
-    public function setHTTPRequest(Sabre_HTTP_Request $request) {
-
-        $this->httpRequest = $request;
-
-    }
-
-
-    /**
-     * Sets the realm
-     *
-     * The realm is often displayed in authentication dialog boxes
-     * Commonly an application name displayed here
-     *
-     * @param string $realm
-     * @return void
-     */
-    public function setRealm($realm) {
-
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Returns the realm
-     *
-     * @return string
-     */
-    public function getRealm() {
-
-        return $this->realm;
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    abstract public function requireLogin();
-
-}
diff --git a/3rdparty/Sabre/HTTP/BasicAuth.php b/3rdparty/Sabre/HTTP/BasicAuth.php
deleted file mode 100644
index a747cc6a31..0000000000
--- a/3rdparty/Sabre/HTTP/BasicAuth.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * HTTP Basic Authentication handler
- *
- * Use this class for easy http authentication setup
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * Returns the supplied username and password.
-     *
-     * The returned array has two values:
-     *   * 0 - username
-     *   * 1 - password
-     *
-     * If nothing was supplied, 'false' will be returned
-     *
-     * @return mixed
-     */
-    public function getUserPass() {
-
-        // Apache and mod_php
-        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
-
-            return array($user,$pass);
-
-        }
-
-        // Most other webservers
-        $auth = $this->httpRequest->getHeader('Authorization');
-
-        // Apache could prefix environment variables with REDIRECT_ when urls
-        // are passed through mod_rewrite
-        if (!$auth) {
-            $auth = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
-        }
-
-        if (!$auth) return false;
-
-        if (strpos(strtolower($auth),'basic')!==0) return false;
-
-        return explode(':', base64_decode(substr($auth, 6)));
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/DigestAuth.php b/3rdparty/Sabre/HTTP/DigestAuth.php
deleted file mode 100644
index ee7f05c08e..0000000000
--- a/3rdparty/Sabre/HTTP/DigestAuth.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-/**
- * HTTP Digest Authentication handler
- *
- * Use this class for easy http digest authentication.
- * Instructions:
- *
- *  1. Create the object
- *  2. Call the setRealm() method with the realm you plan to use
- *  3. Call the init method function.
- *  4. Call the getUserName() function. This function may return false if no
- *     authentication information was supplied. Based on the username you
- *     should check your internal database for either the associated password,
- *     or the so-called A1 hash of the digest.
- *  5. Call either validatePassword() or validateA1(). This will return true
- *     or false.
- *  6. To make sure an authentication prompt is displayed, call the
- *     requireLogin() method.
- *
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct() {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($this->realm);
-        parent::__construct();
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre_HTTP_DigestAuth::QOP_AUTH
-     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop']=='auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response']==$validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch($this->qop) {
-            case self::QOP_AUTH    : $qop = 'auth'; break;
-            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
-            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
-        }
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */
-    public function getDigest() {
-
-        // mod_php
-        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
-        if ($digest) return $digest;
-
-        // most other servers
-        $digest = $this->httpRequest->getHeader('Authorization');
-
-        // Apache could prefix environment variables with REDIRECT_ when urls
-        // are passed through mod_rewrite
-        if (!$digest) {
-            $digest = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
-        }
-
-        if ($digest && strpos(strtolower($digest),'digest')===0) {
-            return substr($digest,7);
-        } else {
-            return null;
-        }
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     *
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest
-     * @return mixed
-     */
-    protected function parseDigest($digest) {
-
-        // protect against missing data
-        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-        $data = array();
-
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
-
-        return $needed_parts ? false : $data;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Request.php b/3rdparty/Sabre/HTTP/Request.php
deleted file mode 100644
index 4746ef7770..0000000000
--- a/3rdparty/Sabre/HTTP/Request.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-/**
- * HTTP Request information
- *
- * This object can be used to easily access information about an HTTP request.
- * It can additionally be used to create 'mock' requests.
- *
- * This class mostly operates independent, but because of the nature of a single
- * request per run it can operate as a singleton. For more information check out
- * the behaviour around 'defaultInputStream'.
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Request {
-
-    /**
-     * PHP's $_SERVER data
-     *
-     * @var array
-     */
-    protected $_SERVER;
-
-    /**
-     * PHP's $_POST data
-     *
-     * @var array
-     */
-    protected $_POST;
-
-    /**
-     * The request body, if any.
-     *
-     * This is stored in the form of a stream resource.
-     *
-     * @var resource
-     */
-    protected $body = null;
-
-    /**
-     * This will be set as the 'default' inputStream for a specific HTTP request
-     * We sometimes need to retain, or rebuild this if we need multiple runs
-     * of parsing the original HTTP request.
-     *
-     * @var resource
-     */
-    static $defaultInputStream=null;
-
-    /**
-     * Sets up the object
-     *
-     * The serverData and postData array can be used to override usage of PHP's
-     * global _SERVER and _POST variable respectively.
-     *
-     * @param array $serverData
-     * @param array $postData
-     */
-    public function __construct(array $serverData = null, array $postData = null) {
-
-       if ($serverData) $this->_SERVER = $serverData;
-       else $this->_SERVER =& $_SERVER;
-
-       if ($postData) $this->_POST = $postData;
-       else $this->_POST =& $_POST;
-
-    }
-
-    /**
-     * Returns the value for a specific http header.
-     *
-     * This method returns null if the header did not exist.
-     *
-     * @param string $name
-     * @return string
-     */
-    public function getHeader($name) {
-
-        $name = strtoupper(str_replace(array('-'),array('_'),$name));
-        if (isset($this->_SERVER['HTTP_' . $name])) {
-            return $this->_SERVER['HTTP_' . $name];
-        }
-
-        // There's a few headers that seem to end up in the top-level
-        // server array.
-        switch($name) {
-            case 'CONTENT_TYPE' :
-            case 'CONTENT_LENGTH' :
-                if (isset($this->_SERVER[$name])) {
-                    return $this->_SERVER[$name];
-                }
-                break;
-
-        }
-        return;
-
-    }
-
-    /**
-     * Returns all (known) HTTP headers.
-     *
-     * All headers are converted to lower-case, and additionally all underscores
-     * are automatically converted to dashes
-     *
-     * @return array
-     */
-    public function getHeaders() {
-
-        $hdrs = array();
-        foreach($this->_SERVER as $key=>$value) {
-
-            switch($key) {
-                case 'CONTENT_LENGTH' :
-                case 'CONTENT_TYPE' :
-                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
-                    break;
-                default :
-                    if (strpos($key,'HTTP_')===0) {
-                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
-                    }
-                    break;
-            }
-
-        }
-
-        return $hdrs;
-
-    }
-
-    /**
-     * Returns the HTTP request method
-     *
-     * This is for example POST or GET
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->_SERVER['REQUEST_METHOD'];
-
-    }
-
-    /**
-     * Returns the requested uri
-     *
-     * @return string
-     */
-    public function getUri() {
-
-        return $this->_SERVER['REQUEST_URI'];
-
-    }
-
-    /**
-     * Will return protocol + the hostname + the uri
-     *
-     * @return string
-     */
-    public function getAbsoluteUri() {
-
-        // Checking if the request was made through HTTPS. The last in line is for IIS
-        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
-        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
-
-    }
-
-    /**
-     * Returns everything after the ? from the current url
-     *
-     * @return string
-     */
-    public function getQueryString() {
-
-        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
-
-    }
-
-    /**
-     * Returns the HTTP request body body
-     *
-     * This method returns a readable stream resource.
-     * If the asString parameter is set to true, a string is sent instead.
-     *
-     * @param bool asString
-     * @return resource
-     */
-    public function getBody($asString = false) {
-
-        if (is_null($this->body)) {
-            if (!is_null(self::$defaultInputStream)) {
-                $this->body = self::$defaultInputStream;
-            } else {
-                $this->body = fopen('php://input','r');
-                self::$defaultInputStream = $this->body;
-            }
-        }
-        if ($asString) {
-            $body = stream_get_contents($this->body);
-            return $body;
-        } else {
-            return $this->body;
-        }
-
-    }
-
-    /**
-     * Sets the contents of the HTTP request body
-     *
-     * This method can either accept a string, or a readable stream resource.
-     *
-     * If the setAsDefaultInputStream is set to true, it means for this run of the
-     * script the supplied body will be used instead of php://input.
-     *
-     * @param mixed $body
-     * @param bool $setAsDefaultInputStream
-     * @return void
-     */
-    public function setBody($body,$setAsDefaultInputStream = false) {
-
-        if(is_resource($body)) {
-            $this->body = $body;
-        } else {
-
-            $stream = fopen('php://temp','r+');
-            fputs($stream,$body);
-            rewind($stream);
-            // String is assumed
-            $this->body = $stream;
-        }
-        if ($setAsDefaultInputStream) {
-            self::$defaultInputStream = $this->body;
-        }
-
-    }
-
-    /**
-     * Returns PHP's _POST variable.
-     *
-     * The reason this is in a method is so it can be subclassed and
-     * overridden.
-     *
-     * @return array
-     */
-    public function getPostVars() {
-
-        return $this->_POST;
-
-    }
-
-    /**
-     * Returns a specific item from the _SERVER array.
-     *
-     * Do not rely on this feature, it is for internal use only.
-     *
-     * @param string $field
-     * @return string
-     */
-    public function getRawServerValue($field) {
-
-        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/HTTP/Response.php b/3rdparty/Sabre/HTTP/Response.php
deleted file mode 100644
index ffe9bda208..0000000000
--- a/3rdparty/Sabre/HTTP/Response.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * Sabre_HTTP_Response
- *
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Response {
-
-    /**
-     * Returns a full HTTP status message for an HTTP status code
-     *
-     * @param int $code
-     * @return string
-     */
-    public function getStatusMessage($code) {
-
-        $msg = array(
-            100 => 'Continue',
-            101 => 'Switching Protocols',
-            102 => 'Processing',
-            200 => 'OK',
-            201 => 'Created',
-            202 => 'Accepted',
-            203 => 'Non-Authorative Information',
-            204 => 'No Content',
-            205 => 'Reset Content',
-            206 => 'Partial Content',
-            207 => 'Multi-Status', // RFC 4918
-            208 => 'Already Reported', // RFC 5842
-            226 => 'IM Used', // RFC 3229
-            300 => 'Multiple Choices',
-            301 => 'Moved Permanently',
-            302 => 'Found',
-            303 => 'See Other',
-            304 => 'Not Modified',
-            305 => 'Use Proxy',
-            306 => 'Reserved',
-            307 => 'Temporary Redirect',
-            400 => 'Bad request',
-            401 => 'Unauthorized',
-            402 => 'Payment Required',
-            403 => 'Forbidden',
-            404 => 'Not Found',
-            405 => 'Method Not Allowed',
-            406 => 'Not Acceptable',
-            407 => 'Proxy Authentication Required',
-            408 => 'Request Timeout',
-            409 => 'Conflict',
-            410 => 'Gone',
-            411 => 'Length Required',
-            412 => 'Precondition failed',
-            413 => 'Request Entity Too Large',
-            414 => 'Request-URI Too Long',
-            415 => 'Unsupported Media Type',
-            416 => 'Requested Range Not Satisfiable',
-            417 => 'Expectation Failed',
-            418 => 'I\'m a teapot', // RFC 2324
-            422 => 'Unprocessable Entity', // RFC 4918
-            423 => 'Locked', // RFC 4918
-            424 => 'Failed Dependency', // RFC 4918
-            426 => 'Upgrade required',
-            428 => 'Precondition required', // draft-nottingham-http-new-status
-            429 => 'Too Many Requests', // draft-nottingham-http-new-status
-            431 => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-            500 => 'Internal Server Error',
-            501 => 'Not Implemented',
-            502 => 'Bad Gateway',
-            503 => 'Service Unavailable',
-            504 => 'Gateway Timeout',
-            505 => 'HTTP Version not supported',
-            506 => 'Variant Also Negotiates',
-            507 => 'Insufficient Storage', // RFC 4918
-            508 => 'Loop Detected', // RFC 5842
-            509 => 'Bandwidth Limit Exceeded', // non-standard
-            510 => 'Not extended',
-            511 => 'Network Authentication Required', // draft-nottingham-http-new-status
-       );
-
-       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
-
-    }
-
-    /**
-     * Sends an HTTP status header to the client
-     *
-     * @param int $code HTTP status code
-     * @return bool
-     */
-    public function sendStatus($code) {
-
-        if (!headers_sent())
-            return header($this->getStatusMessage($code));
-        else return false;
-
-    }
-
-    /**
-     * Sets an HTTP header for the response
-     *
-     * @param string $name
-     * @param string $value
-     * @param bool $replace
-     * @return bool
-     */
-    public function setHeader($name, $value, $replace = true) {
-
-        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
-        if (!headers_sent())
-            return header($name . ': ' . $value, $replace);
-        else return false;
-
-    }
-
-    /**
-     * Sets a bunch of HTTP Headers
-     *
-     * headersnames are specified as keys, value in the array value
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        foreach($headers as $key=>$value)
-            $this->setHeader($key, $value);
-
-    }
-
-    /**
-     * Sends the entire response body
-     *
-     * This method can accept either an open filestream, or a string.
-     *
-     * @param mixed $body
-     * @return void
-     */
-    public function sendBody($body) {
-
-        if (is_resource($body)) {
-
-            fpassthru($body);
-
-        } else {
-
-            // We assume a string
-            echo $body;
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Util.php b/3rdparty/Sabre/HTTP/Util.php
deleted file mode 100644
index 67bdd489e1..0000000000
--- a/3rdparty/Sabre/HTTP/Util.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * HTTP utility methods
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @author Paul Voegler
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Util {
-
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     *
-     * @param string $dateHeader
-     * @return bool|DateTime
-     */
-    static function parseHTTPDate($dateHeader) {
-
-        //RFC 2616 section 3.3.1 Full Date
-        //Only the format is checked, valid ranges are checked by strtotime below
-        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-        $time = '[0-2]\d(\:[0-5]\d){2}';
-        $date3 = $month . ' ([1-3]\d| \d)';
-        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
-
-        //ANSI C's asctime() format
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
-        //RFC 850, obsoleted by RFC 1036
-        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
-        //RFC 822, updated by RFC 1123
-        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
-        //allowed date formats by RFC 2616
-        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-
-        //allow for space around the string and strip it
-        $dateHeader = trim($dateHeader, ' ');
-        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
-            return false;
-
-        //append implicit GMT timezone to ANSI C time format
-        if (strpos($dateHeader, ' GMT') === false)
-            $dateHeader .= ' GMT';
-
-
-        $realDate = strtotime($dateHeader);
-        //strtotime can return -1 or false in case of error
-        if ($realDate !== false && $realDate >= 0)
-            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * Transforms a DateTime object to HTTP's most common date format.
-     *
-     * We're serializing it as the RFC 1123 date, which, for HTTP must be
-     * specified as GMT.
-     *
-     * @param DateTime $dateTime
-     * @return string
-     */
-    static function toHTTPDate(DateTime $dateTime) {
-
-        // We need to clone it, as we don't want to affect the existing
-        // DateTime.
-        $dateTime = clone $dateTime;
-        $dateTime->setTimeZone(new DateTimeZone('GMT'));
-        return $dateTime->format('D, d M Y H:i:s \G\M\T');
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Version.php b/3rdparty/Sabre/HTTP/Version.php
deleted file mode 100644
index 23dc7f8a7a..0000000000
--- a/3rdparty/Sabre/HTTP/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the Sabre_HTTP version constants.
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.2';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/HTTP/includes.php b/3rdparty/Sabre/HTTP/includes.php
deleted file mode 100644
index 9d34bf3a8b..0000000000
--- a/3rdparty/Sabre/HTTP/includes.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Sabre_HTTP includes file
- *
- * Including this file will automatically include all files from the Sabre_HTTP
- * package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/AbstractAuth.php';
-include __DIR__ . '/AWSAuth.php';
-include __DIR__ . '/BasicAuth.php';
-include __DIR__ . '/DigestAuth.php';
-include __DIR__ . '/Request.php';
-include __DIR__ . '/Response.php';
-include __DIR__ . '/Util.php';
-include __DIR__ . '/Version.php';
-// End includes
diff --git a/3rdparty/Sabre/VObject/Component.php b/3rdparty/Sabre/VObject/Component.php
deleted file mode 100644
index b78a26133f..0000000000
--- a/3rdparty/Sabre/VObject/Component.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-/**
- * VObject Component
- *
- * This class represents a VCALENDAR/VCARD component. A component is for example
- * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and
- * ends with END:COMPONENTNAME
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component extends Sabre_VObject_Element {
-
-    /**
-     * Name, for example VEVENT
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Children properties and components
-     *
-     * @var array
-     */
-    public $children = array();
-
-    /**
-     * If coponents are added to this map, they will be automatically mapped
-     * to their respective classes, if parsed by the reader or constructed with
-     * the 'create' method.
-     *
-     * @var array
-     */
-    static public $classMap = array(
-        'VCALENDAR'     => 'Sabre_VObject_Component_VCalendar',
-        'VEVENT'        => 'Sabre_VObject_Component_VEvent',
-        'VTODO'         => 'Sabre_VObject_Component_VTodo',
-        'VJOURNAL'      => 'Sabre_VObject_Component_VJournal',
-        'VALARM'        => 'Sabre_VObject_Component_VAlarm',
-    );
-
-    /**
-     * Creates the new component by name, but in addition will also see if
-     * there's a class mapped to the property name.
-     *
-     * @param string $name
-     * @param string $value
-     * @return Sabre_VObject_Component
-     */
-    static public function create($name, $value = null) {
-
-        $name = strtoupper($name);
-
-        if (isset(self::$classMap[$name])) {
-            return new self::$classMap[$name]($name, $value);
-        } else {
-            return new self($name, $value);
-        }
-
-    }
-
-    /**
-     * Creates a new component.
-     *
-     * By default this object will iterate over its own children, but this can
-     * be overridden with the iterator argument
-     *
-     * @param string $name
-     * @param Sabre_VObject_ElementList $iterator
-     */
-    public function __construct($name, Sabre_VObject_ElementList $iterator = null) {
-
-        $this->name = strtoupper($name);
-        if (!is_null($iterator)) $this->iterator = $iterator;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $str = "BEGIN:" . $this->name . "\r\n";
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be higher in the list
-         *
-         * @param Sabre_VObject_Node $n
-         * @return int
-         */
-        $sortScore = function($n) {
-
-            if ($n instanceof Sabre_VObject_Component) {
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ($n->name === 'VTIMEZONE') {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            } else {
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($n->name === 'VERSION') {
-                    return 3;
-                } else {
-                    return 2;
-                }
-            }
-
-        };
-
-        usort($this->children, function($a, $b) use ($sortScore) {
-
-            $sA = $sortScore($a);
-            $sB = $sortScore($b);
-
-            if ($sA === $sB) return 0;
-
-            return ($sA > $sB) ? -1 : 1;
-
-        });
-
-        foreach($this->children as $child) $str.=$child->serialize();
-        $str.= "END:" . $this->name . "\r\n";
-
-        return $str;
-
-    }
-
-    /**
-     * Adds a new component or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Sabre_VObject_Element $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Element
-     * The second adds a property as a string.
-     *
-     * @param mixed $item
-     * @param mixed $itemValue
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Sabre_VObject_Element) {
-            if (!is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->children[] = $item;
-        } elseif(is_string($item)) {
-
-            if (!is_scalar($itemValue)) {
-                throw new InvalidArgumentException('The second argument must be scalar');
-            }
-            $item = Sabre_VObject_Property::create($item,$itemValue);
-            $item->parent = $this;
-            $this->children[] = $item;
-
-        } else {
-
-            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
-
-        }
-
-    }
-
-    /**
-     * Returns an iterable list of children
-     *
-     * @return Sabre_VObject_ElementList
-     */
-    public function children() {
-
-        return new Sabre_VObject_ElementList($this->children);
-
-    }
-
-    /**
-     * Returns an array with elements that match the specified name.
-     *
-     * This function is also aware of MIME-Directory groups (as they appear in
-     * vcards). This means that if a property is grouped as "HOME.EMAIL", it
-     * will also be returned when searching for just "EMAIL". If you want to
-     * search for a property in a specific group, you can select on the entire
-     * string ("HOME.EMAIL"). If you want to search on a specific property that
-     * has not been assigned a group, specify ".EMAIL".
-     *
-     * Keys are retained from the 'children' array, which may be confusing in
-     * certain cases.
-     *
-     * @param string $name
-     * @return array
-     */
-    public function select($name) {
-
-        $group = null;
-        $name = strtoupper($name);
-        if (strpos($name,'.')!==false) {
-            list($group,$name) = explode('.', $name, 2);
-        }
-
-        $result = array();
-        foreach($this->children as $key=>$child) {
-
-            if (
-                strtoupper($child->name) === $name &&
-                (is_null($group) || ( $child instanceof Sabre_VObject_Property && strtoupper($child->group) === $group))
-            ) {
-
-                $result[$key] = $child;
-
-            }
-        }
-
-        reset($result);
-        return $result;
-
-    }
-
-    /**
-     * This method only returns a list of sub-components. Properties are
-     * ignored.
-     *
-     * @return array
-     */
-    public function getComponents() {
-
-        $result = array();
-        foreach($this->children as $child) {
-            if ($child instanceof Sabre_VObject_Component) {
-                $result[] = $child;
-            }
-        }
-
-        return $result;
-
-    }
-
-    /* Magic property accessors {{{ */
-
-    /**
-     * Using 'get' you will either get a property or component,
-     *
-     * If there were no child-elements found with the specified name,
-     * null is returned.
-     *
-     * @param string $name
-     * @return Sabre_VObject_Property
-     */
-    public function __get($name) {
-
-        $matches = $this->select($name);
-        if (count($matches)===0) {
-            return null;
-        } else {
-            $firstMatch = current($matches);
-            /** @var $firstMatch Sabre_VObject_Property */
-            $firstMatch->setIterator(new Sabre_VObject_ElementList(array_values($matches)));
-            return $firstMatch;
-        }
-
-    }
-
-    /**
-     * This method checks if a sub-element with the specified name exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function __isset($name) {
-
-        $matches = $this->select($name);
-        return count($matches)>0;
-
-    }
-
-    /**
-     * Using the setter method you can add properties or subcomponents
-     *
-     * You can either pass a Sabre_VObject_Component, Sabre_VObject_Property
-     * object, or a string to automatically create a Property.
-     *
-     * If the item already exists, it will be removed. If you want to add
-     * a new item with the same name, always use the add() method.
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($name, $value) {
-
-        $matches = $this->select($name);
-        $overWrite = count($matches)?key($matches):null;
-
-        if ($value instanceof Sabre_VObject_Component || $value instanceof Sabre_VObject_Property) {
-            $value->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $value;
-            } else {
-                $this->children[] = $value;
-            }
-        } elseif (is_scalar($value)) {
-            $property = Sabre_VObject_Property::create($name,$value);
-            $property->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $property;
-            } else {
-                $this->children[] = $property;
-            }
-        } else {
-            throw new InvalidArgumentException('You must pass a Sabre_VObject_Component, Sabre_VObject_Property or scalar type');
-        }
-
-    }
-
-    /**
-     * Removes all properties and components within this component.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function __unset($name) {
-
-        $matches = $this->select($name);
-        foreach($matches as $k=>$child) {
-
-            unset($this->children[$k]);
-            $child->parent = null;
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     *
-     * @return void
-     */
-    public function __clone() {
-
-        foreach($this->children as $key=>$child) {
-            $this->children[$key] = clone $child;
-            $this->children[$key]->parent = $this;
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Component/VAlarm.php b/3rdparty/Sabre/VObject/Component/VAlarm.php
deleted file mode 100644
index ebb4a9b18f..0000000000
--- a/3rdparty/Sabre/VObject/Component/VAlarm.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * VAlarm component
- *
- * This component contains some additional functionality specific for VALARMs.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VAlarm extends Sabre_VObject_Component {
-
-    /**
-     * Returns a DateTime object when this alarm is going to trigger.
-     *
-     * This ignores repeated alarm, only the first trigger is returned.
-     *
-     * @return DateTime
-     */
-    public function getEffectiveTriggerTime() {
-
-        $trigger = $this->TRIGGER;
-        if(!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
-            $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
-
-            $parentComponent = $this->parent;
-            if ($related === 'START') {
-                $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                $effectiveTrigger->add($triggerDuration);
-            } else {
-                if ($parentComponent->name === 'VTODO') {
-                    $endProp = 'DUE';
-                } elseif ($parentComponent->name === 'VEVENT') {
-                    $endProp = 'DTEND';
-                } else {
-                    throw new Sabre_DAV_Exception('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
-                }
-
-                if (isset($parentComponent->$endProp)) {
-                    $effectiveTrigger = clone $parentComponent->$endProp->getDateTime();
-                    $effectiveTrigger->add($triggerDuration);
-                } elseif (isset($parentComponent->DURATION)) {
-                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                    $duration = Sabre_VObject_DateTimeParser::parseDuration($parentComponent->DURATION);
-                    $effectiveTrigger->add($duration);
-                    $effectiveTrigger->add($triggerDuration);
-                } else {
-                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                    $effectiveTrigger->add($triggerDuration);
-                }
-            }
-        } else {
-            $effectiveTrigger = $trigger->getDateTime();
-        }
-        return $effectiveTrigger;
-
-    }
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        $effectiveTrigger = $this->getEffectiveTriggerTime();
-
-        if (isset($this->DURATION)) {
-            $duration = Sabre_VObject_DateTimeParser::parseDuration($this->DURATION);
-            $repeat = (string)$this->repeat;
-            if (!$repeat) {
-                $repeat = 1;
-            }
-
-            $period = new DatePeriod($effectiveTrigger, $duration, (int)$repeat);
-
-            foreach($period as $occurrence) {
-
-                if ($start <= $occurrence && $end > $occurrence) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
-        }
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Component/VCalendar.php b/3rdparty/Sabre/VObject/Component/VCalendar.php
deleted file mode 100644
index f3be29afdb..0000000000
--- a/3rdparty/Sabre/VObject/Component/VCalendar.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * The VCalendar component
- *
- * This component adds functionality to a component, specific for a VCALENDAR.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VCalendar extends Sabre_VObject_Component {
-
-    /**
-     * Returns a list of all 'base components'. For instance, if an Event has 
-     * a recurrence rule, and one instance is overridden, the overridden event 
-     * will have the same UID, but will be excluded from this list.
-     *
-     * VTIMEZONE components will always be excluded. 
-     *
-     * @param string $componentName filter by component name 
-     * @return array 
-     */
-    public function getBaseComponents($componentName = null) {
-
-        $components = array();
-        foreach($this->children as $component) {
-
-            if (!$component instanceof Sabre_VObject_Component)
-                continue;
-
-            if (isset($component->{'RECURRENCE-ID'})) 
-                continue;
-
-            if ($componentName && $component->name !== strtoupper($componentName)) 
-                continue;
-
-            if ($component->name === 'VTIMEZONE')
-                continue;
-
-            $components[] = $component;
-
-        }
-
-        return $components;
-
-    }
-
-    /**
-     * If this calendar object, has events with recurrence rules, this method 
-     * can be used to expand the event into multiple sub-events.
-     *
-     * Each event will be stripped from it's recurrence information, and only 
-     * the instances of the event in the specified timerange will be left 
-     * alone.
-     *
-     * In addition, this method will cause timezone information to be stripped, 
-     * and normalized to UTC.
-     *
-     * This method will alter the VCalendar. This cannot be reversed.
-     *
-     * This functionality is specifically used by the CalDAV standard. It is 
-     * possible for clients to request expand events, if they are rather simple 
-     * clients and do not have the possibility to calculate recurrences.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return void
-     */
-    public function expand(DateTime $start, DateTime $end) {
-
-        $newEvents = array();
-
-        foreach($this->select('VEVENT') as $key=>$vevent) {
-
-            if (isset($vevent->{'RECURRENCE-ID'})) {
-                unset($this->children[$key]);
-                continue;
-            } 
-
-
-            if (!$vevent->rrule) {
-                unset($this->children[$key]);
-                if ($vevent->isInTimeRange($start, $end)) {
-                    $newEvents[] = $vevent;
-                }
-                continue;
-            }
-
-            $uid = (string)$vevent->uid;
-            if (!$uid) {
-                throw new LogicException('Event did not have a UID!');
-            }
-
-            $it = new Sabre_VObject_RecurrenceIterator($this, $vevent->uid);
-            $it->fastForward($start);
-
-            while($it->valid() && $it->getDTStart() < $end) {
-
-                if ($it->getDTEnd() > $start) {
-
-                    $newEvents[] = $it->getEventObject();
-
-                }
-                $it->next();
-
-            }
-            unset($this->children[$key]);
-
-        }
-
-        foreach($newEvents as $newEvent) {
-
-            foreach($newEvent->children as $child) {
-                if ($child instanceof Sabre_VObject_Property_DateTime &&
-                    $child->getDateType() == Sabre_VObject_Property_DateTime::LOCALTZ) {
-                        $child->setDateTime($child->getDateTime(),Sabre_VObject_Property_DateTime::UTC);
-                    }
-            }
-
-            $this->add($newEvent);
-
-        }
-
-        // Removing all VTIMEZONE components
-        unset($this->VTIMEZONE);
-
-    } 
-
-}
-
diff --git a/3rdparty/Sabre/VObject/Component/VEvent.php b/3rdparty/Sabre/VObject/Component/VEvent.php
deleted file mode 100644
index 4cc1e36d7d..0000000000
--- a/3rdparty/Sabre/VObject/Component/VEvent.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * VEvent component
- *
- * This component contains some additional functionality specific for VEVENT's.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VEvent extends Sabre_VObject_Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        if ($this->RRULE) {
-            $it = new Sabre_VObject_RecurrenceIterator($this);
-            $it->fastForward($start);
-
-            // We fast-forwarded to a spot where the end-time of the
-            // recurrence instance exceeded the start of the requested
-            // time-range.
-            //
-            // If the starttime of the recurrence did not exceed the
-            // end of the time range as well, we have a match.
-            return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
-
-        }
-
-        $effectiveStart = $this->DTSTART->getDateTime();
-        if (isset($this->DTEND)) {
-            $effectiveEnd = $this->DTEND->getDateTime();
-            // If this was an all-day event, we should just increase the
-            // end-date by 1. Otherwise the event will last until the second
-            // the date changed, by increasing this by 1 day the event lasts
-            // all of the last day as well.
-            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-                $effectiveEnd->modify('+1 day');
-            }
-        } elseif (isset($this->DURATION)) {
-            $effectiveEnd = clone $effectiveStart;
-            $effectiveEnd->add( Sabre_VObject_DateTimeParser::parseDuration($this->DURATION) );
-        } elseif ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-            $effectiveEnd = clone $effectiveStart;
-            $effectiveEnd->modify('+1 day');
-        } else {
-            $effectiveEnd = clone $effectiveStart;
-        }
-        return (
-            ($start <= $effectiveEnd) && ($end > $effectiveStart)
-        );
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Component/VJournal.php b/3rdparty/Sabre/VObject/Component/VJournal.php
deleted file mode 100644
index 22b3ec921e..0000000000
--- a/3rdparty/Sabre/VObject/Component/VJournal.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * VJournal component
- *
- * This component contains some additional functionality specific for VJOURNALs.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VJournal extends Sabre_VObject_Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified 
-     * time-range. This is used for filtering purposes. 
-     *
-     * The rules used to determine if an event falls within the specified 
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return bool 
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
-        if ($dtstart) {
-            $effectiveEnd = clone $dtstart;
-            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-                $effectiveEnd->modify('+1 day');
-            }
-
-            return ($start <= $effectiveEnd && $end > $dtstart);
-
-        }
-        return false;
-
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Component/VTodo.php b/3rdparty/Sabre/VObject/Component/VTodo.php
deleted file mode 100644
index 79d06298d7..0000000000
--- a/3rdparty/Sabre/VObject/Component/VTodo.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * VTodo component
- *
- * This component contains some additional functionality specific for VTODOs.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VTodo extends Sabre_VObject_Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified 
-     * time-range. This is used for filtering purposes. 
-     *
-     * The rules used to determine if an event falls within the specified 
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return bool 
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
-        $duration = isset($this->DURATION)?Sabre_VObject_DateTimeParser::parseDuration($this->DURATION):null;
-        $due = isset($this->DUE)?$this->DUE->getDateTime():null;
-        $completed = isset($this->COMPLETED)?$this->COMPLETED->getDateTime():null;
-        $created = isset($this->CREATED)?$this->CREATED->getDateTime():null;
-
-        if ($dtstart) {
-            if ($duration) {
-                $effectiveEnd = clone $dtstart;
-                $effectiveEnd->add($duration);
-                return $start <= $effectiveEnd && $end > $dtstart;
-            } elseif ($due) {
-                return
-                    ($start < $due || $start <= $dtstart) &&
-                    ($end > $dtstart || $end >= $due);
-            } else {
-                return $start <= $dtstart && $end > $dtstart;
-            }
-        }
-        if ($due) {
-            return ($start < $due && $end >= $due);
-        }
-        if ($completed && $created) {
-            return
-                ($start <= $created || $start <= $completed) &&
-                ($end >= $created || $end >= $completed);
-        }
-        if ($completed) {
-            return ($start <= $completed && $end >= $completed);
-        }
-        if ($created) {
-            return ($end > $created);
-        }
-        return true;
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/DateTimeParser.php b/3rdparty/Sabre/VObject/DateTimeParser.php
deleted file mode 100644
index 1e2d54ef3a..0000000000
--- a/3rdparty/Sabre/VObject/DateTimeParser.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/**
- * DateTimeParser
- *
- * This class is responsible for parsing the several different date and time
- * formats iCalendar and vCards have.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_DateTimeParser {
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
-     *
-     * Specifying a reference timezone is optional. It will only be used
-     * if the non-UTC format is used. The argument is used as a reference, the
-     * returned DateTime object will still be in the UTC timezone.
-     *
-     * @param string $dt
-     * @param DateTimeZone $tz
-     * @return DateTime
-     */
-    static public function parseDateTime($dt,DateTimeZone $tz = null) {
-
-        // Format is YYYYMMDD + "T" + hhmmss
-        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
-
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
-        }
-
-        if ($matches[7]==='Z' || is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
-        }
-        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
-
-        // Still resetting the timezone, to normalize everything to UTC
-        $date->setTimeZone(new DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted date and returns a DateTime object
-     *
-     * @param string $date
-     * @return DateTime
-     */
-    static public function parseDate($date) {
-
-        // Format is YYYYMMDD
-        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
-
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
-        }
-
-        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (RFC5545) formatted duration value.
-     *
-     * This method will either return a DateTimeInterval object, or a string
-     * suitable for strtotime or DateTime::modify.
-     *
-     * @param string $duration
-     * @param bool $asString
-     * @return DateInterval|string
-     */
-    static public function parseDuration($duration, $asString = false) {
-
-        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
-        }
-
-        if (!$asString) {
-            $invert = false;
-            if ($matches['plusminus']==='-') {
-                $invert = true;
-            }
-
-
-            $parts = array(
-                'week',
-                'day',
-                'hour',
-                'minute',
-                'second',
-            );
-            foreach($parts as $part) {
-                $matches[$part] = isset($matches[$part])&&$matches[$part]?(int)$matches[$part]:0;
-            }
-
-
-            // We need to re-construct the $duration string, because weeks and
-            // days are not supported by DateInterval in the same string.
-            $duration = 'P';
-            $days = $matches['day'];
-            if ($matches['week']) {
-                $days+=$matches['week']*7;
-            }
-            if ($days)
-                $duration.=$days . 'D';
-
-            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
-                $duration.='T';
-
-                if ($matches['hour'])
-                    $duration.=$matches['hour'].'H';
-
-                if ($matches['minute'])
-                    $duration.=$matches['minute'].'M';
-
-                if ($matches['second'])
-                    $duration.=$matches['second'].'S';
-
-            }
-
-            $iv = new DateInterval($duration);
-            if ($invert) $iv->invert = true;
-
-            return $iv;
-
-        }
-
-
-
-        $parts = array(
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        );
-
-        $newDur = '';
-        foreach($parts as $part) {
-            if (isset($matches[$part]) && $matches[$part]) {
-                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
-            }
-        }
-
-        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
-        return $newDur;
-
-    }
-
-    /**
-     * Parses either a Date or DateTime, or Duration value.
-     *
-     * @param string $date
-     * @param DateTimeZone|string $referenceTZ
-     * @return DateTime|DateInterval
-     */
-    static public function parse($date, $referenceTZ = null) {
-
-        if ($date[0]==='P' || ($date[0]==='-' && $date[1]==='P')) {
-            return self::parseDuration($date);
-        } elseif (strlen($date)===8) {
-            return self::parseDate($date);
-        } else {
-            return self::parseDateTime($date, $referenceTZ);
-        }
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/VObject/Element.php b/3rdparty/Sabre/VObject/Element.php
deleted file mode 100644
index e20ff0b353..0000000000
--- a/3rdparty/Sabre/VObject/Element.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Base class for all elements
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_VObject_Element extends Sabre_VObject_Node {
-
-    public $parent = null;
-
-}
diff --git a/3rdparty/Sabre/VObject/Element/DateTime.php b/3rdparty/Sabre/VObject/Element/DateTime.php
deleted file mode 100644
index 5e5eb7ab6f..0000000000
--- a/3rdparty/Sabre/VObject/Element/DateTime.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * DateTime property
- *
- * this class got renamed to Sabre_VObject_Property_DateTime
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- * @deprecated
- */
-class Sabre_VObject_Element_DateTime extends Sabre_VObject_Property_DateTime {
-
-    /**
-     * Local 'floating' time
-     */
-    const LOCAL = 1;
-
-    /**
-     * UTC-based time
-     */
-    const UTC = 2;
-
-    /**
-     * Local time plus timezone
-     */
-    const LOCALTZ = 3;
-
-    /**
-     * Only a date, time is ignored
-     */
-    const DATE = 4;
-
-}
diff --git a/3rdparty/Sabre/VObject/Element/MultiDateTime.php b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
deleted file mode 100644
index 8a12ced94a..0000000000
--- a/3rdparty/Sabre/VObject/Element/MultiDateTime.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Multi-DateTime property
- *
- * This class got renamed to Sabre_VObject_Property_MultiDateTime
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- * @deprecated
- */
-class Sabre_VObject_Element_MultiDateTime extends Sabre_VObject_Property_MultiDateTime {
-
-}
diff --git a/3rdparty/Sabre/VObject/ElementList.php b/3rdparty/Sabre/VObject/ElementList.php
deleted file mode 100644
index 7e508db20f..0000000000
--- a/3rdparty/Sabre/VObject/ElementList.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * VObject ElementList
- *
- * This class represents a list of elements. Lists are the result of queries,
- * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_ElementList implements Iterator, Countable, ArrayAccess {
-
-    /**
-     * Inner elements
-     *
-     * @var array
-     */
-    protected $elements = array();
-
-    /**
-     * Creates the element list.
-     *
-     * @param array $elements
-     */
-    public function __construct(array $elements) {
-
-        $this->elements = $elements;
-
-    }
-
-    /* {{{ Iterator interface */
-
-    /**
-     * Current position
-     *
-     * @var int
-     */
-    private $key = 0;
-
-    /**
-     * Returns current item in iteration
-     *
-     * @return Sabre_VObject_Element
-     */
-    public function current() {
-
-        return $this->elements[$this->key];
-
-    }
-
-    /**
-     * To the next item in the iterator
-     *
-     * @return void
-     */
-    public function next() {
-
-        $this->key++;
-
-    }
-
-    /**
-     * Returns the current iterator key
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->key;
-
-    }
-
-    /**
-     * Returns true if the current position in the iterator is a valid one
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        return isset($this->elements[$this->key]);
-
-    }
-
-    /**
-     * Rewinds the iterator
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->key = 0;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements
-     *
-     * @return int
-     */
-    public function count() {
-
-        return count($this->elements);
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * @param int $offset
-     * @return bool
-     */
-    public function offsetExists($offset) {
-
-        return isset($this->elements[$offset]);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset) {
-
-        return $this->elements[$offset];
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        throw new LogicException('You can not add new objects to an ElementList');
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        throw new LogicException('You can not remove objects from an ElementList');
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/FreeBusyGenerator.php b/3rdparty/Sabre/VObject/FreeBusyGenerator.php
deleted file mode 100644
index 1c96a64a00..0000000000
--- a/3rdparty/Sabre/VObject/FreeBusyGenerator.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/**
- * This class helps with generating FREEBUSY reports based on existing sets of
- * objects.
- *
- * It only looks at VEVENT and VFREEBUSY objects from the sourcedata, and
- * generates a single VFREEBUSY object.
- *
- * VFREEBUSY components are described in RFC5545, The rules for what should
- * go in a single freebusy report is taken from RFC4791, section 7.10.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_FreeBusyGenerator {
-
-    /**
-     * Input objects
-     *
-     * @var array
-     */
-    protected $objects;
-
-    /**
-     * Start of range
-     *
-     * @var DateTime|null
-     */
-    protected $start;
-
-    /**
-     * End of range
-     *
-     * @var DateTime|null
-     */
-    protected $end;
-
-    /**
-     * VCALENDAR object
-     *
-     * @var Sabre_VObject_Component
-     */
-    protected $baseObject;
-
-    /**
-     * Sets the VCALENDAR object.
-     *
-     * If this is set, it will not be generated for you. You are responsible
-     * for setting things like the METHOD, CALSCALE, VERSION, etc..
-     *
-     * The VFREEBUSY object will be automatically added though.
-     *
-     * @param Sabre_VObject_Component $vcalendar
-     * @return void
-     */
-    public function setBaseObject(Sabre_VObject_Component $vcalendar) {
-
-        $this->baseObject = $vcalendar;
-
-    }
-
-    /**
-     * Sets the input objects
-     *
-     * Every object must either be a string or a Sabre_VObject_Component.
-     *
-     * @param array $objects
-     * @return void
-     */
-    public function setObjects(array $objects) {
-
-        $this->objects = array();
-        foreach($objects as $object) {
-
-            if (is_string($object)) {
-                $this->objects[] = Sabre_VObject_Reader::read($object);
-            } elseif ($object instanceof Sabre_VObject_Component) {
-                $this->objects[] = $object;
-            } else {
-                throw new InvalidArgumentException('You can only pass strings or Sabre_VObject_Component arguments to setObjects');
-            }
-
-        }
-
-    }
-
-    /**
-     * Sets the time range
-     *
-     * Any freebusy object falling outside of this time range will be ignored.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return void
-     */
-    public function setTimeRange(DateTime $start = null, DateTime $end = null) {
-
-        $this->start = $start;
-        $this->end = $end;
-
-    }
-
-    /**
-     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
-     * a VCALENDAR.
-     *
-     * @return Sabre_VObject_Component
-     */
-    public function getResult() {
-
-        $busyTimes = array();
-
-        foreach($this->objects as $object) {
-
-            foreach($object->getBaseComponents() as $component) {
-
-                switch($component->name) {
-
-                    case 'VEVENT' :
-
-                        $FBTYPE = 'BUSY';
-                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
-                            break;
-                        }
-                        if (isset($component->STATUS)) {
-                            $status = strtoupper($component->STATUS);
-                            if ($status==='CANCELLED') {
-                                break;
-                            }
-                            if ($status==='TENTATIVE') {
-                                $FBTYPE = 'BUSY-TENTATIVE';
-                            }
-                        }
-
-                        $times = array();
-
-                        if ($component->RRULE) {
-
-                            $iterator = new Sabre_VObject_RecurrenceIterator($object, (string)$component->uid);
-                            if ($this->start) {
-                                $iterator->fastForward($this->start);
-                            }
-
-                            $maxRecurrences = 200;
-
-                            while($iterator->valid() && --$maxRecurrences) {
-
-                                $startTime = $iterator->getDTStart();
-                                if ($this->end && $startTime > $this->end) {
-                                    break;
-                                }
-                                $times[] = array(
-                                    $iterator->getDTStart(),
-                                    $iterator->getDTEnd(),
-                                );
-
-                                $iterator->next();
-
-                            }
-
-                        } else {
-
-                            $startTime = $component->DTSTART->getDateTime();
-                            if ($this->end && $startTime > $this->end) {
-                                break;
-                            }
-                            $endTime = null;
-                            if (isset($component->DTEND)) {
-                                $endTime = $component->DTEND->getDateTime();
-                            } elseif (isset($component->DURATION)) {
-                                $duration = Sabre_VObject_DateTimeParser::parseDuration((string)$component->DURATION);
-                                $endTime = clone $startTime;
-                                $endTime->add($duration);
-                            } elseif ($component->DTSTART->getDateType() === Sabre_VObject_Property_DateTime::DATE) {
-                                $endTime = clone $startTime;
-                                $endTime->modify('+1 day');
-                            } else {
-                                // The event had no duration (0 seconds)
-                                break;
-                            }
-
-                            $times[] = array($startTime, $endTime);
-
-                        }
-
-                        foreach($times as $time) {
-
-                            if ($this->end && $time[0] > $this->end) break;
-                            if ($this->start && $time[1] < $this->start) break;
-
-                            $busyTimes[] = array(
-                                $time[0],
-                                $time[1],
-                                $FBTYPE,
-                            );
-                        }
-                        break;
-
-                    case 'VFREEBUSY' :
-                        foreach($component->FREEBUSY as $freebusy) {
-
-                            $fbType = isset($freebusy['FBTYPE'])?strtoupper($freebusy['FBTYPE']):'BUSY';
-
-                            // Skipping intervals marked as 'free'
-                            if ($fbType==='FREE')
-                                continue;
-
-                            $values = explode(',', $freebusy);
-                            foreach($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
-                                $startTime = Sabre_VObject_DateTimeParser::parseDateTime($startTime);
-
-                                if (substr($endTime,0,1)==='P' || substr($endTime,0,2)==='-P') {
-                                    $duration = Sabre_VObject_DateTimeParser::parseDuration($endTime);
-                                    $endTime = clone $startTime;
-                                    $endTime->add($duration);
-                                } else {
-                                    $endTime = Sabre_VObject_DateTimeParser::parseDateTime($endTime);
-                                }
-
-                                if($this->start && $this->start > $endTime) continue;
-                                if($this->end && $this->end < $startTime) continue;
-                                $busyTimes[] = array(
-                                    $startTime,
-                                    $endTime,
-                                    $fbType
-                                );
-
-                            }
-
-
-                        }
-                        break;
-
-
-
-                }
-
-
-            }
-
-        }
-
-        if ($this->baseObject) {
-            $calendar = $this->baseObject;
-        } else {
-            $calendar = new Sabre_VObject_Component('VCALENDAR');
-            $calendar->version = '2.0';
-            if (Sabre_DAV_Server::$exposeVersion) {
-                $calendar->prodid = '-//SabreDAV//Sabre VObject ' . Sabre_VObject_Version::VERSION . '//EN';
-            } else {
-                $calendar->prodid = '-//SabreDAV//Sabre VObject//EN';
-            }
-            $calendar->calscale = 'GREGORIAN';
-        }
-
-        $vfreebusy = new Sabre_VObject_Component('VFREEBUSY');
-        $calendar->add($vfreebusy);
-
-        if ($this->start) {
-            $dtstart = new Sabre_VObject_Property_DateTime('DTSTART');
-            $dtstart->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
-            $vfreebusy->add($dtstart);
-        }
-        if ($this->end) {
-            $dtend = new Sabre_VObject_Property_DateTime('DTEND');
-            $dtend->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
-            $vfreebusy->add($dtend);
-        }
-        $dtstamp = new Sabre_VObject_Property_DateTime('DTSTAMP');
-        $dtstamp->setDateTime(new DateTime('now'), Sabre_VObject_Property_DateTime::UTC);
-        $vfreebusy->add($dtstamp);
-
-        foreach($busyTimes as $busyTime) {
-
-            $busyTime[0]->setTimeZone(new DateTimeZone('UTC'));
-            $busyTime[1]->setTimeZone(new DateTimeZone('UTC'));
-
-            $prop = new Sabre_VObject_Property(
-                'FREEBUSY',
-                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
-            );
-            $prop['FBTYPE'] = $busyTime[2];
-            $vfreebusy->add($prop);
-
-        }
-
-        return $calendar;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/VObject/Node.php b/3rdparty/Sabre/VObject/Node.php
deleted file mode 100644
index d89e01b56c..0000000000
--- a/3rdparty/Sabre/VObject/Node.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Base class for all nodes
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_VObject_Node implements IteratorAggregate, ArrayAccess, Countable {
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    abstract function serialize();
-
-    /**
-     * Iterator override
-     *
-     * @var Sabre_VObject_ElementList
-     */
-    protected $iterator = null;
-
-    /**
-     * A link to the parent node
-     *
-     * @var Sabre_VObject_Node
-     */
-    public $parent = null;
-
-    /* {{{ IteratorAggregator interface */
-
-    /**
-     * Returns the iterator for this object
-     *
-     * @return Sabre_VObject_ElementList
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator))
-            return $this->iterator;
-
-        return new Sabre_VObject_ElementList(array($this));
-
-    }
-
-    /**
-     * Sets the overridden iterator
-     *
-     * Note that this is not actually part of the iterator interface
-     *
-     * @param Sabre_VObject_ElementList $iterator
-     * @return void
-     */
-    public function setIterator(Sabre_VObject_ElementList $iterator) {
-
-        $this->iterator = $iterator;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements
-     *
-     * @return int
-     */
-    public function count() {
-
-        $it = $this->getIterator();
-        return $it->count();
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return bool
-     */
-    public function offsetExists($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetExists($offset);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetGet($offset);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetSet($offset,$value);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetUnset($offset);
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/Parameter.php b/3rdparty/Sabre/VObject/Parameter.php
deleted file mode 100644
index 2e39af5f78..0000000000
--- a/3rdparty/Sabre/VObject/Parameter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * VObject Parameter
- *
- * This class represents a parameter. A parameter is always tied to a property.
- * In the case of:
- *   DTSTART;VALUE=DATE:20101108
- * VALUE=DATE would be the parameter name and value.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Parameter extends Sabre_VObject_Node {
-
-    /**
-     * Parameter name
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Parameter value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * Sets up the object
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __construct($name, $value = null) {
-
-        $this->name = strtoupper($name);
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        if (is_null($this->value)) {
-            return $this->name;
-        }
-        $src = array(
-            '\\',
-            "\n",
-            ';',
-            ',',
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-            '\;',
-            '\,',
-        );
-
-        return $this->name . '=' . str_replace($src, $out, $this->value);
-
-    }
-
-    /**
-     * Called when this object is being cast to a string
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return $this->value;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/ParseException.php b/3rdparty/Sabre/VObject/ParseException.php
deleted file mode 100644
index 1b5e95bf16..0000000000
--- a/3rdparty/Sabre/VObject/ParseException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Exception thrown by Sabre_VObject_Reader if an invalid object was attempted to be parsed.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_ParseException extends Exception { }
diff --git a/3rdparty/Sabre/VObject/Property.php b/3rdparty/Sabre/VObject/Property.php
deleted file mode 100644
index ce74fe3865..0000000000
--- a/3rdparty/Sabre/VObject/Property.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-
-/**
- * VObject Property
- *
- * A property in VObject is usually in the form PARAMNAME:paramValue.
- * An example is : SUMMARY:Weekly meeting
- *
- * Properties can also have parameters:
- * SUMMARY;LANG=en:Weekly meeting.
- *
- * Parameters can be accessed using the ArrayAccess interface.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property extends Sabre_VObject_Element {
-
-    /**
-     * Propertyname
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Group name
-     *
-     * This may be something like 'HOME' for vcards.
-     *
-     * @var string
-     */
-    public $group;
-
-    /**
-     * Property parameters
-     *
-     * @var array
-     */
-    public $parameters = array();
-
-    /**
-     * Property value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * If properties are added to this map, they will be automatically mapped
-     * to their respective classes, if parsed by the reader or constructed with
-     * the 'create' method.
-     *
-     * @var array
-     */
-    static public $classMap = array(
-        'COMPLETED'     => 'Sabre_VObject_Property_DateTime',
-        'CREATED'       => 'Sabre_VObject_Property_DateTime',
-        'DTEND'         => 'Sabre_VObject_Property_DateTime',
-        'DTSTAMP'       => 'Sabre_VObject_Property_DateTime',
-        'DTSTART'       => 'Sabre_VObject_Property_DateTime',
-        'DUE'           => 'Sabre_VObject_Property_DateTime',
-        'EXDATE'        => 'Sabre_VObject_Property_MultiDateTime',
-        'LAST-MODIFIED' => 'Sabre_VObject_Property_DateTime',
-        'RECURRENCE-ID' => 'Sabre_VObject_Property_DateTime',
-        'TRIGGER'       => 'Sabre_VObject_Property_DateTime',
-    );
-
-    /**
-     * Creates the new property by name, but in addition will also see if
-     * there's a class mapped to the property name.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    static public function create($name, $value = null) {
-
-        $name = strtoupper($name);
-        $shortName = $name;
-        $group = null;
-        if (strpos($shortName,'.')!==false) {
-            list($group, $shortName) = explode('.', $shortName);
-        }
-
-        if (isset(self::$classMap[$shortName])) {
-            return new self::$classMap[$shortName]($name, $value);
-        } else {
-            return new self($name, $value);
-        }
-
-    }
-
-    /**
-     * Creates a new property object
-     *
-     * By default this object will iterate over its own children, but this can
-     * be overridden with the iterator argument
-     *
-     * @param string $name
-     * @param string $value
-     * @param Sabre_VObject_ElementList $iterator
-     */
-    public function __construct($name, $value = null, $iterator = null) {
-
-        $name = strtoupper($name);
-        $group = null;
-        if (strpos($name,'.')!==false) {
-            list($group, $name) = explode('.', $name);
-        }
-        $this->name = $name;
-        $this->group = $group;
-        if (!is_null($iterator)) $this->iterator = $iterator;
-        $this->setValue($value);
-
-    }
-
-
-
-    /**
-     * Updates the internal value
-     *
-     * @param string $value
-     * @return void
-     */
-    public function setValue($value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
-
-        if (count($this->parameters)) {
-            foreach($this->parameters as $param) {
-
-                $str.=';' . $param->serialize();
-
-            }
-        }
-        $src = array(
-            '\\',
-            "\n",
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-        );
-        $str.=':' . str_replace($src, $out, $this->value);
-
-        $out = '';
-        while(strlen($str)>0) {
-            if (strlen($str)>75) {
-                $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
-                $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
-            } else {
-                $out.=$str . "\r\n";
-                $str='';
-                break;
-            }
-        }
-
-        return $out;
-
-    }
-
-    /**
-     * Adds a new componenten or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Sabre_VObject_Parameter $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Parameter
-     * The second adds a property as a string.
-     *
-     * @param mixed $item
-     * @param mixed $itemValue
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Sabre_VObject_Parameter) {
-            if (!is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->parameters[] = $item;
-        } elseif(is_string($item)) {
-
-            if (!is_scalar($itemValue) && !is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must be scalar');
-            }
-            $parameter = new Sabre_VObject_Parameter($item,$itemValue);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } else {
-
-            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
-
-        }
-
-    }
-
-    /* ArrayAccess interface {{{ */
-
-    /**
-     * Checks if an array element exists
-     *
-     * @param mixed $name
-     * @return bool
-     */
-    public function offsetExists($name) {
-
-        if (is_int($name)) return parent::offsetExists($name);
-
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name) return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a parameter, or parameter list.
-     *
-     * @param string $name
-     * @return Sabre_VObject_Element
-     */
-    public function offsetGet($name) {
-
-        if (is_int($name)) return parent::offsetGet($name);
-        $name = strtoupper($name);
-
-        $result = array();
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name)
-                $result[] = $parameter;
-        }
-
-        if (count($result)===0) {
-            return null;
-        } elseif (count($result)===1) {
-            return $result[0];
-        } else {
-            $result[0]->setIterator(new Sabre_VObject_ElementList($result));
-            return $result[0];
-        }
-
-    }
-
-    /**
-     * Creates a new parameter
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($name, $value) {
-
-        if (is_int($name)) return parent::offsetSet($name, $value);
-
-        if (is_scalar($value)) {
-            if (!is_string($name))
-                throw new InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
-
-            $this->offsetUnset($name);
-            $parameter = new Sabre_VObject_Parameter($name, $value);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } elseif ($value instanceof Sabre_VObject_Parameter) {
-            if (!is_null($name))
-                throw new InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a Sabre_VObject_Parameter. Add using $array[]=$parameterObject.');
-
-            $value->parent = $this;
-            $this->parameters[] = $value;
-        } else {
-            throw new InvalidArgumentException('You can only add parameters to the property object');
-        }
-
-    }
-
-    /**
-     * Removes one or more parameters with the specified name
-     *
-     * @param string $name
-     * @return void
-     */
-    public function offsetUnset($name) {
-
-        if (is_int($name)) return parent::offsetUnset($name);
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $key=>$parameter) {
-            if ($parameter->name == $name) {
-                $parameter->parent = null;
-                unset($this->parameters[$key]);
-            }
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * Called when this object is being cast to a string
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return (string)$this->value;
-
-    }
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     *
-     * @return void
-     */
-    public function __clone() {
-
-        foreach($this->parameters as $key=>$child) {
-            $this->parameters[$key] = clone $child;
-            $this->parameters[$key]->parent = $this;
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Property/DateTime.php b/3rdparty/Sabre/VObject/Property/DateTime.php
deleted file mode 100644
index fe2372caa8..0000000000
--- a/3rdparty/Sabre/VObject/Property/DateTime.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-/**
- * DateTime property
- *
- * This element is used for iCalendar properties such as the DTSTART property.
- * It basically provides a few helper functions that make it easier to deal
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTime and getDateTime to
- * retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep
- * reference and results might appear incorrectly.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property_DateTime extends Sabre_VObject_Property {
-
-    /**
-     * Local 'floating' time
-     */
-    const LOCAL = 1;
-
-    /**
-     * UTC-based time
-     */
-    const UTC = 2;
-
-    /**
-     * Local time plus timezone
-     */
-    const LOCALTZ = 3;
-
-    /**
-     * Only a date, time is ignored
-     */
-    const DATE = 4;
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime
-     */
-    protected $dateTime;
-
-    /**
-     * dateType
-     *
-     * @var int
-     */
-    protected $dateType;
-
-    /**
-     * Updates the Date and Time.
-     *
-     * @param DateTime $dt
-     * @param int $dateType
-     * @return void
-     */
-    public function setDateTime(DateTime $dt, $dateType = self::LOCALTZ) {
-
-        switch($dateType) {
-
-            case self::LOCAL :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::UTC :
-                $dt->setTimeZone(new DateTimeZone('UTC'));
-                $this->setValue($dt->format('Ymd\\THis\\Z'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::LOCALTZ :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
-                break;
-            case self::DATE :
-                $this->setValue($dt->format('Ymd'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTime = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return DateTime|null
-     */
-    public function getDateTime() {
-
-        if ($this->dateTime)
-            return $this->dateTime;
-
-        list(
-            $this->dateType,
-            $this->dateTime
-        ) = self::parseData($this->value, $this);
-        return $this->dateTime;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set,
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        list(
-            $this->dateType,
-            $this->dateTime,
-        ) = self::parseData($this->value, $this);
-        return $this->dateType;
-
-    }
-
-    /**
-     * Parses the internal data structure to figure out what the current date
-     * and time is.
-     *
-     * The returned array contains two elements:
-     *   1. A 'DateType' constant (as defined on this class), or null.
-     *   2. A DateTime object (or null)
-     *
-     * @param string|null $propertyValue The string to parse (yymmdd or
-     *                                   ymmddThhmmss, etc..)
-     * @param Sabre_VObject_Property|null $property The instance of the
-     *                                              property we're parsing.
-     * @return array
-     */
-    static public function parseData($propertyValue, Sabre_VObject_Property $property = null) {
-
-        if (is_null($propertyValue)) {
-            return array(null, null);
-        }
-
-        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
-        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
-        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
-
-        if (!preg_match($regex, $propertyValue, $matches)) {
-            throw new InvalidArgumentException($propertyValue . ' is not a valid DateTime or Date string');
-        }
-
-        if (!isset($matches['hour'])) {
-            // Date-only
-            return array(
-                self::DATE,
-                new DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00'),
-            );
-        }
-
-        $dateStr =
-            $matches['year'] .'-' .
-            $matches['month'] . '-' .
-            $matches['date'] . ' ' .
-            $matches['hour'] . ':' .
-            $matches['minute'] . ':' .
-            $matches['second'];
-
-        if (isset($matches['isutc'])) {
-            $dt = new DateTime($dateStr,new DateTimeZone('UTC'));
-            $dt->setTimeZone(new DateTimeZone('UTC'));
-            return array(
-                self::UTC,
-                $dt
-            );
-        }
-
-        // Finding the timezone.
-        $tzid = $property['TZID'];
-        if (!$tzid) {
-            return array(
-                self::LOCAL,
-                new DateTime($dateStr)
-            );
-        }
-
-        try {
-            // tzid an Olson identifier?
-            $tz = new DateTimeZone($tzid->value);
-        } catch (Exception $e) {
-
-            // Not an Olson id, we're going to try to find the information 
-            // through the time zone name map.
-            $newtzid = Sabre_VObject_WindowsTimezoneMap::lookup($tzid->value);
-            if (is_null($newtzid)) {
-
-                // Not a well known time zone name either, we're going to try 
-                // to find the information through the VTIMEZONE object.
-
-                // First we find the root object
-                $root = $property;
-                while($root->parent) {
-                    $root = $root->parent;
-                }
-
-                if (isset($root->VTIMEZONE)) {
-                    foreach($root->VTIMEZONE as $vtimezone) {
-                        if (((string)$vtimezone->TZID) == $tzid) {
-                            if (isset($vtimezone->{'X-LIC-LOCATION'})) {
-                                $newtzid = (string)$vtimezone->{'X-LIC-LOCATION'};
-                            } else {
-                                // No libical location specified. As a last resort we could 
-                                // try matching $vtimezone's DST rules against all known 
-                                // time zones returned by DateTimeZone::list*
-
-                                // TODO
-                            }
-                        }
-                    }
-                }
-            }
-
-            try {
-                $tz = new DateTimeZone($newtzid);
-            } catch (Exception $e) {
-                // If all else fails, we use the default PHP timezone
-                $tz = new DateTimeZone(date_default_timezone_get()); 
-            }
-        }
-        $dt = new DateTime($dateStr, $tz);
-        $dt->setTimeZone($tz);
-
-        return array(
-            self::LOCALTZ,
-            $dt
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Property/MultiDateTime.php b/3rdparty/Sabre/VObject/Property/MultiDateTime.php
deleted file mode 100644
index ae53ab6a61..0000000000
--- a/3rdparty/Sabre/VObject/Property/MultiDateTime.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-/**
- * Multi-DateTime property
- *
- * This element is used for iCalendar properties such as the EXDATE property.
- * It basically provides a few helper functions that make it easier to deal
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTimes and getDateTimes
- * to retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep
- * reference and results might appear incorrectly.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property_MultiDateTime extends Sabre_VObject_Property {
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime[]
-     */
-    protected $dateTimes;
-
-    /**
-     * dateType
-     *
-     * This is one of the Sabre_VObject_Property_DateTime constants.
-     *
-     * @var int
-     */
-    protected $dateType;
-
-    /**
-     * Updates the value
-     *
-     * @param array $dt Must be an array of DateTime objects.
-     * @param int $dateType
-     * @return void
-     */
-    public function setDateTimes(array $dt, $dateType = Sabre_VObject_Property_DateTime::LOCALTZ) {
-
-        foreach($dt as $i)
-            if (!$i instanceof DateTime)
-                throw new InvalidArgumentException('You must pass an array of DateTime objects');
-
-        $this->offsetUnset('VALUE');
-        $this->offsetUnset('TZID');
-        switch($dateType) {
-
-            case Sabre_VObject_Property_DateTime::LOCAL :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case Sabre_VObject_Property_DateTime::UTC :
-                $val = array();
-                foreach($dt as $i) {
-                    $i->setTimeZone(new DateTimeZone('UTC'));
-                    $val[] = $i->format('Ymd\\THis\\Z');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case Sabre_VObject_Property_DateTime::LOCALTZ :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
-                break;
-            case Sabre_VObject_Property_DateTime::DATE :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTimes = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return array|null
-     */
-    public function getDateTimes() {
-
-        if ($this->dateTimes)
-            return $this->dateTimes;
-
-        $dts = array();
-
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateTimes;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set,
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        $dts = array();
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateType;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Reader.php b/3rdparty/Sabre/VObject/Reader.php
deleted file mode 100644
index eea73fa3dc..0000000000
--- a/3rdparty/Sabre/VObject/Reader.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * VCALENDAR/VCARD reader
- *
- * This class reads the vobject file, and returns a full element tree.
- *
- * TODO: this class currently completely works 'statically'. This is pointless,
- * and defeats OOP principals. Needs refactoring in a future version.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Reader {
-
-    /**
-     * Parses the file and returns the top component
-     *
-     * @param string $data
-     * @return Sabre_VObject_Element
-     */
-    static function read($data) {
-
-        // Normalizing newlines
-        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
-
-        $lines = explode("\n", $data);
-
-        // Unfolding lines
-        $lines2 = array();
-        foreach($lines as $line) {
-
-            // Skipping empty lines
-            if (!$line) continue;
-
-            if ($line[0]===" " || $line[0]==="\t") {
-                $lines2[count($lines2)-1].=substr($line,1);
-            } else {
-                $lines2[] = $line;
-            }
-
-        }
-
-        unset($lines);
-
-        reset($lines2);
-
-        return self::readLine($lines2);
-
-    }
-
-    /**
-     * Reads and parses a single line.
-     *
-     * This method receives the full array of lines. The array pointer is used
-     * to traverse.
-     *
-     * @param array $lines
-     * @return Sabre_VObject_Element
-     */
-    static private function readLine(&$lines) {
-
-        $line = current($lines);
-        $lineNr = key($lines);
-        next($lines);
-
-        // Components
-        if (stripos($line,"BEGIN:")===0) {
-
-            $componentName = strtoupper(substr($line,6));
-            $obj = Sabre_VObject_Component::create($componentName);
-
-            $nextLine = current($lines);
-
-            while(stripos($nextLine,"END:")!==0) {
-
-                $obj->add(self::readLine($lines));
-
-                $nextLine = current($lines);
-
-                if ($nextLine===false)
-                    throw new Sabre_VObject_ParseException('Invalid VObject. Document ended prematurely.');
-
-            }
-
-            // Checking component name of the 'END:' line.
-            if (substr($nextLine,4)!==$obj->name) {
-                throw new Sabre_VObject_ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
-            }
-            next($lines);
-
-            return $obj;
-
-        }
-
-        // Properties
-        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
-
-
-        $token = '[A-Z0-9-\.]+';
-        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
-        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
-
-        $result = preg_match($regex,$line,$matches);
-
-        if (!$result) {
-            throw new Sabre_VObject_ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
-        }
-
-        $propertyName = strtoupper($matches['name']);
-        $propertyValue = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
-            if ($matches[2]==='n' || $matches[2]==='N') {
-                return "\n";
-            } else {
-                return $matches[2];
-            }
-        }, $matches['value']);
-
-        $obj = Sabre_VObject_Property::create($propertyName, $propertyValue);
-
-        if ($matches['parameters']) {
-
-            foreach(self::readParameters($matches['parameters']) as $param) {
-                $obj->add($param);
-            }
-
-        }
-
-        return $obj;
-
-
-    }
-
-    /**
-     * Reads a parameter list from a property
-     *
-     * This method returns an array of Sabre_VObject_Parameter
-     *
-     * @param string $parameters
-     * @return array
-     */
-    static private function readParameters($parameters) {
-
-        $token = '[A-Z0-9-]+';
-
-        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
-
-        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
-        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
-
-        $params = array();
-        foreach($matches as $match) {
-
-            $value = isset($match['paramValue'])?$match['paramValue']:null;
-
-            if (isset($value[0])) {
-                // Stripping quotes, if needed
-                if ($value[0] === '"') $value = substr($value,1,strlen($value)-2);
-            } else {
-                $value = '';
-            }
-
-            $value = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
-                if ($matches[2]==='n' || $matches[2]==='N') {
-                    return "\n";
-                } else {
-                    return $matches[2];
-                }
-            }, $value);
-
-            $params[] = new Sabre_VObject_Parameter($match['paramName'], $value);
-
-        }
-
-        return $params;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/VObject/RecurrenceIterator.php b/3rdparty/Sabre/VObject/RecurrenceIterator.php
deleted file mode 100644
index 833aa091ab..0000000000
--- a/3rdparty/Sabre/VObject/RecurrenceIterator.php
+++ /dev/null
@@ -1,1009 +0,0 @@
-<?php
-
-/**
- * This class is used to determine new for a recurring event, when the next
- * events occur.
- *
- * This iterator may loop infinitely in the future, therefore it is important
- * that if you use this class, you set hard limits for the amount of iterations
- * you want to handle.
- *
- * Note that currently there is not full support for the entire iCalendar
- * specification, as it's very complex and contains a lot of permutations
- * that's not yet used very often in software.
- *
- * For the focus has been on features as they actually appear in Calendaring
- * software, but this may well get expanded as needed / on demand
- *
- * The following RRULE properties are supported
- *   * UNTIL
- *   * INTERVAL
- *   * COUNT
- *   * FREQ=DAILY
- *     * BYDAY
- *   * FREQ=WEEKLY
- *     * BYDAY
- *     * WKST
- *   * FREQ=MONTHLY
- *     * BYMONTHDAY
- *     * BYDAY
- *     * BYSETPOS
- *   * FREQ=YEARLY
- *     * BYMONTH
- *     * BYMONTHDAY (only if BYMONTH is also set)
- *     * BYDAY (only if BYMONTH is also set)
- *
- * Anything beyond this is 'undefined', which means that it may get ignored, or
- * you may get unexpected results. The effect is that in some applications the
- * specified recurrence may look incorrect, or is missing.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_RecurrenceIterator implements Iterator {
-
-    /**
-     * The initial event date
-     *
-     * @var DateTime
-     */
-    public $startDate;
-
-    /**
-     * The end-date of the initial event
-     *
-     * @var DateTime
-     */
-    public $endDate;
-
-    /**
-     * The 'current' recurrence.
-     *
-     * This will be increased for every iteration.
-     *
-     * @var DateTime
-     */
-    public $currentDate;
-
-
-    /**
-     * List of dates that are excluded from the rules.
-     *
-     * This list contains the items that have been overriden by the EXDATE
-     * property.
-     *
-     * @var array
-     */
-    public $exceptionDates = array();
-
-    /**
-     * Base event
-     *
-     * @var Sabre_VObject_Component_VEvent
-     */
-    public $baseEvent;
-
-    /**
-     * List of dates that are overridden by other events.
-     * Similar to $overriddenEvents, but this just contains the original dates.
-     *
-     * @var array
-     */
-    public $overriddenDates = array();
-
-    /**
-     * list of events that are 'overridden'.
-     *
-     * This is an array of Sabre_VObject_Component_VEvent objects.
-     *
-     * @var array
-     */
-    public $overriddenEvents = array();
-
-
-    /**
-     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
-     * yearly.
-     *
-     * @var string
-     */
-    public $frequency;
-
-    /**
-     * The last instance of this recurrence, inclusively
-     *
-     * @var DateTime|null
-     */
-    public $until;
-
-    /**
-     * The number of recurrences, or 'null' if infinitely recurring.
-     *
-     * @var int
-     */
-    public $count;
-
-    /**
-     * The interval.
-     *
-     * If for example frequency is set to daily, interval = 2 would mean every
-     * 2 days.
-     *
-     * @var int
-     */
-    public $interval = 1;
-
-    /**
-     * Which seconds to recur.
-     *
-     * This is an array of integers (between 0 and 60)
-     *
-     * @var array
-     */
-    public $bySecond;
-
-    /**
-     * Which minutes to recur
-     *
-     * This is an array of integers (between 0 and 59)
-     *
-     * @var array
-     */
-    public $byMinute;
-
-    /**
-     * Which hours to recur
-     *
-     * This is an array of integers (between 0 and 23)
-     *
-     * @var array
-     */
-    public $byHour;
-
-    /**
-     * Which weekdays to recur.
-     *
-     * This is an array of weekdays
-     *
-     * This may also be preceeded by a positive or negative integer. If present,
-     * this indicates the nth occurrence of a specific day within the monthly or
-     * yearly rrule. For instance, -2TU indicates the second-last tuesday of
-     * the month, or year.
-     *
-     * @var array
-     */
-    public $byDay;
-
-    /**
-     * Which days of the month to recur
-     *
-     * This is an array of days of the months (1-31). The value can also be
-     * negative. -5 for instance means the 5th last day of the month.
-     *
-     * @var array
-     */
-    public $byMonthDay;
-
-    /**
-     * Which days of the year to recur.
-     *
-     * This is an array with days of the year (1 to 366). The values can also
-     * be negative. For instance, -1 will always represent the last day of the
-     * year. (December 31st).
-     *
-     * @var array
-     */
-    public $byYearDay;
-
-    /**
-     * Which week numbers to recur.
-     *
-     * This is an array of integers from 1 to 53. The values can also be
-     * negative. -1 will always refer to the last week of the year.
-     *
-     * @var array
-     */
-    public $byWeekNo;
-
-    /**
-     * Which months to recur
-     *
-     * This is an array of integers from 1 to 12.
-     *
-     * @var array
-     */
-    public $byMonth;
-
-    /**
-     * Which items in an existing st to recur.
-     *
-     * These numbers work together with an existing by* rule. It specifies
-     * exactly which items of the existing by-rule to filter.
-     *
-     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
-     * used to recur the last workday of the month.
-     *
-     * This would be done by setting frequency to 'monthly', byDay to
-     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
-     *
-     * @var array
-     */
-    public $bySetPos;
-
-    /**
-     * When a week starts
-     *
-     * @var string
-     */
-    public $weekStart = 'MO';
-
-    /**
-     * The current item in the list
-     *
-     * @var int
-     */
-    public $counter = 0;
-
-    /**
-     * Simple mapping from iCalendar day names to day numbers
-     *
-     * @var array
-     */
-    private $dayMap = array(
-        'SU' => 0,
-        'MO' => 1,
-        'TU' => 2,
-        'WE' => 3,
-        'TH' => 4,
-        'FR' => 5,
-        'SA' => 6,
-    );
-
-    /**
-     * Mappings between the day number and english day name.
-     *
-     * @var array
-     */
-    private $dayNames = array(
-        0 => 'Sunday',
-        1 => 'Monday',
-        2 => 'Tuesday',
-        3 => 'Wednesday',
-        4 => 'Thursday',
-        5 => 'Friday',
-        6 => 'Saturday',
-    );
-
-    /**
-     * If the current iteration of the event is an overriden event, this
-     * property will hold the VObject
-     *
-     * @var Sabre_Component_VObject
-     */
-    private $currentOverriddenEvent;
-
-    /**
-     * This property may contain the date of the next not-overridden event.
-     * This date is calculated sometimes a bit early, before overridden events
-     * are evaluated.
-     *
-     * @var DateTime
-     */
-    private $nextDate;
-
-    /**
-     * Creates the iterator
-     *
-     * You should pass a VCALENDAR component, as well as the UID of the event
-     * we're going to traverse.
-     *
-     * @param Sabre_VObject_Component $vcal
-     * @param string|null $uid
-     */
-    public function __construct(Sabre_VObject_Component $vcal, $uid=null) {
-
-        if (is_null($uid)) {
-            if ($vcal->name === 'VCALENDAR') {
-                throw new InvalidArgumentException('If you pass a VCALENDAR object, you must pass a uid argument as well');
-            }
-            $components = array($vcal);
-            $uid = (string)$vcal->uid;
-        } else {
-            $components = $vcal->select('VEVENT');
-        }
-        foreach($components as $component) {
-            if ((string)$component->uid == $uid) {
-                if (isset($component->{'RECURRENCE-ID'})) {
-                    $this->overriddenEvents[$component->DTSTART->getDateTime()->getTimeStamp()] = $component;
-                    $this->overriddenDates[] = $component->{'RECURRENCE-ID'}->getDateTime();
-                } else {
-                    $this->baseEvent = $component;
-                }
-            }
-        }
-        if (!$this->baseEvent) {
-            throw new InvalidArgumentException('Could not find a base event with uid: ' . $uid);
-        }
-
-        $this->startDate = clone $this->baseEvent->DTSTART->getDateTime();
-
-        $this->endDate = null;
-        if (isset($this->baseEvent->DTEND)) {
-            $this->endDate = clone $this->baseEvent->DTEND->getDateTime();
-        } else {
-            $this->endDate = clone $this->startDate;
-            if (isset($this->baseEvent->DURATION)) {
-                $this->endDate->add(Sabre_VObject_DateTimeParser::parse($this->baseEvent->DURATION->value));
-            }
-        }
-        $this->currentDate = clone $this->startDate;
-
-        $rrule = (string)$this->baseEvent->RRULE;
-
-        $parts = explode(';', $rrule);
-
-        foreach($parts as $part) {
-
-            list($key, $value) = explode('=', $part, 2);
-
-            switch(strtoupper($key)) {
-
-                case 'FREQ' :
-                    if (!in_array(
-                        strtolower($value),
-                        array('secondly','minutely','hourly','daily','weekly','monthly','yearly')
-                    )) {
-                        throw new InvalidArgumentException('Unknown value for FREQ=' . strtoupper($value));
-
-                    }
-                    $this->frequency = strtolower($value);
-                    break;
-
-                case 'UNTIL' :
-                    $this->until = Sabre_VObject_DateTimeParser::parse($value);
-                    break;
-
-                case 'COUNT' :
-                    $this->count = (int)$value;
-                    break;
-
-                case 'INTERVAL' :
-                    $this->interval = (int)$value;
-                    break;
-
-                case 'BYSECOND' :
-                    $this->bySecond = explode(',', $value);
-                    break;
-
-                case 'BYMINUTE' :
-                    $this->byMinute = explode(',', $value);
-                    break;
-
-                case 'BYHOUR' :
-                    $this->byHour = explode(',', $value);
-                    break;
-
-                case 'BYDAY' :
-                    $this->byDay = explode(',', strtoupper($value));
-                    break;
-
-                case 'BYMONTHDAY' :
-                    $this->byMonthDay = explode(',', $value);
-                    break;
-
-                case 'BYYEARDAY' :
-                    $this->byYearDay = explode(',', $value);
-                    break;
-
-                case 'BYWEEKNO' :
-                    $this->byWeekNo = explode(',', $value);
-                    break;
-
-                case 'BYMONTH' :
-                    $this->byMonth = explode(',', $value);
-                    break;
-
-                case 'BYSETPOS' :
-                    $this->bySetPos = explode(',', $value);
-                    break;
-
-                case 'WKST' :
-                    $this->weekStart = strtoupper($value);
-                    break;
-
-            }
-
-        }
-
-        // Parsing exception dates
-        if (isset($this->baseEvent->EXDATE)) {
-            foreach($this->baseEvent->EXDATE as $exDate) {
-
-                foreach(explode(',', (string)$exDate) as $exceptionDate) {
-
-                    $this->exceptionDates[] =
-                        Sabre_VObject_DateTimeParser::parse($exceptionDate, $this->startDate->getTimeZone());
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the current item in the list
-     *
-     * @return DateTime
-     */
-    public function current() {
-
-        if (!$this->valid()) return null;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * This method returns the startdate for the current iteration of the
-     * event.
-     *
-     * @return DateTime
-     */
-    public function getDtStart() {
-
-        if (!$this->valid()) return null;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * This method returns the enddate for the current iteration of the
-     * event.
-     *
-     * @return DateTime
-     */
-    public function getDtEnd() {
-
-        if (!$this->valid()) return null;
-        $dtEnd = clone $this->currentDate;
-        $dtEnd->add( $this->startDate->diff( $this->endDate ) );
-        return clone $dtEnd;
-
-    }
-
-    /**
-     * Returns a VEVENT object with the updated start and end date.
-     *
-     * Any recurrence information is removed, and this function may return an
-     * 'overridden' event instead.
-     *
-     * This method always returns a cloned instance.
-     *
-     * @return void
-     */
-    public function getEventObject() {
-
-        if ($this->currentOverriddenEvent) {
-            return clone $this->currentOverriddenEvent;
-        }
-        $event = clone $this->baseEvent;
-        unset($event->RRULE);
-        unset($event->EXDATE);
-        unset($event->RDATE);
-        unset($event->EXRULE);
-
-        $event->DTSTART->setDateTime($this->getDTStart(), $event->DTSTART->getDateType());
-        if (isset($event->DTEND)) {
-            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTSTART->getDateType());
-        }
-        if ($this->counter > 0) {
-            $event->{'RECURRENCE-ID'} = (string)$event->DTSTART;
-        }
-
-        return $event;
-
-    }
-
-    /**
-     * Returns the current item number
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->counter;
-
-    }
-
-    /**
-     * Whether or not there is a 'next item'
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        if (!is_null($this->count)) {
-            return $this->counter < $this->count;
-        }
-        if (!is_null($this->until)) {
-            return $this->currentDate <= $this->until;
-        }
-        return true;
-
-    }
-
-    /**
-     * Resets the iterator
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     *
-     * Note that this checks the current 'endDate', not the 'stardDate'. This
-     * means that if you forward to January 1st, the iterator will stop at the
-     * first event that ends *after* January 1st.
-     *
-     * @param DateTime $dt
-     * @return void
-     */
-    public function fastForward(DateTime $dt) {
-
-        while($this->valid() && $this->getDTEnd() < $dt) {
-            $this->next();
-        }
-
-    }
-
-    /**
-     * Goes on to the next iteration
-     *
-     * @return void
-     */
-    public function next() {
-
-        /*
-        if (!is_null($this->count) && $this->counter >= $this->count) {
-            $this->currentDate = null;
-        }*/
-
-
-        $previousStamp = $this->currentDate->getTimeStamp();
-
-        while(true) {
-
-            $this->currentOverriddenEvent = null;
-
-            // If we have a next date 'stored', we use that
-            if ($this->nextDate) {
-                $this->currentDate = $this->nextDate;
-                $currentStamp = $this->currentDate->getTimeStamp();
-                $this->nextDate = null;
-            } else {
-
-                // Otherwise, we calculate it
-                switch($this->frequency) {
-
-                    case 'daily' :
-                        $this->nextDaily();
-                        break;
-
-                    case 'weekly' :
-                        $this->nextWeekly();
-                        break;
-
-                    case 'monthly' :
-                        $this->nextMonthly();
-                        break;
-
-                    case 'yearly' :
-                        $this->nextYearly();
-                        break;
-
-                }
-                $currentStamp = $this->currentDate->getTimeStamp();
-
-                // Checking exception dates
-                foreach($this->exceptionDates as $exceptionDate) {
-                    if ($this->currentDate == $exceptionDate) {
-                        $this->counter++;
-                        continue 2;
-                    }
-                }
-                foreach($this->overriddenDates as $overriddenDate) {
-                    if ($this->currentDate == $overriddenDate) {
-                        continue 2;
-                    }
-                }
-
-            }
-
-            // Checking overriden events
-            foreach($this->overriddenEvents as $index=>$event) {
-                if ($index > $previousStamp && $index <= $currentStamp) {
-
-                    // We're moving the 'next date' aside, for later use.
-                    $this->nextDate = clone $this->currentDate;
-
-                    $this->currentDate = $event->DTSTART->getDateTime();
-                    $this->currentOverriddenEvent = $event;
-
-                    break;
-                }
-            }
-
-            break;
-
-        }
-
-        /*
-        if (!is_null($this->until)) {
-            if($this->currentDate > $this->until) {
-                $this->currentDate = null;
-            }
-        }*/
-
-        $this->counter++;
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for daily frequency.
-     *
-     * @return void
-     */
-    protected function nextDaily() {
-
-        if (!$this->byDay) {
-            $this->currentDate->modify('+' . $this->interval . ' days');
-            return;
-        }
-
-        $recurrenceDays = array();
-        foreach($this->byDay as $byDay) {
-
-            // The day may be preceeded with a positive (+n) or
-            // negative (-n) integer. However, this does not make
-            // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
-
-        }
-
-        do {
-
-            $this->currentDate->modify('+' . $this->interval . ' days');
-
-            // Current day of the week
-            $currentDay = $this->currentDate->format('w');
-
-        } while (!in_array($currentDay, $recurrenceDays));
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for weekly frequency.
-     *
-     * @return void
-     */
-    protected function nextWeekly() {
-
-        if (!$this->byDay) {
-            $this->currentDate->modify('+' . $this->interval . ' weeks');
-            return;
-        }
-
-        $recurrenceDays = array();
-        foreach($this->byDay as $byDay) {
-
-            // The day may be preceeded with a positive (+n) or
-            // negative (-n) integer. However, this does not make
-            // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
-
-        }
-
-        // Current day of the week
-        $currentDay = $this->currentDate->format('w');
-
-        // First day of the week:
-        $firstDay = $this->dayMap[$this->weekStart];
-
-        $time = array(
-            $this->currentDate->format('H'),
-            $this->currentDate->format('i'),
-            $this->currentDate->format('s')
-        );
-
-        // Increasing the 'current day' until we find our next
-        // occurrence.
-        while(true) {
-
-            $currentDay++;
-
-            if ($currentDay>6) {
-                $currentDay = 0;
-            }
-
-            // We need to roll over to the next week
-            if ($currentDay === $firstDay) {
-                $this->currentDate->modify('+' . $this->interval . ' weeks');
-
-                // We need to go to the first day of this week, but only if we
-                // are not already on this first day of this week.
-                if($this->currentDate->format('w') != $firstDay) {
-                    $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
-                    $this->currentDate->setTime($time[0],$time[1],$time[2]);
-                }
-            }
-
-            // We have a match
-            if (in_array($currentDay ,$recurrenceDays)) {
-                $this->currentDate->modify($this->dayNames[$currentDay]);
-                $this->currentDate->setTime($time[0],$time[1],$time[2]);
-                break;
-            }
-
-        }
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for monthly frequency.
-     *
-     * @return void
-     */
-    protected function nextMonthly() {
-
-        $currentDayOfMonth = $this->currentDate->format('j');
-        if (!$this->byMonthDay && !$this->byDay) {
-
-            // If the current day is higher than the 28th, rollover can
-            // occur to the next month. We Must skip these invalid
-            // entries.
-            if ($currentDayOfMonth < 29) {
-                $this->currentDate->modify('+' . $this->interval . ' months');
-            } else {
-                $increase = 0;
-                do {
-                    $increase++;
-                    $tempDate = clone $this->currentDate;
-                    $tempDate->modify('+ ' . ($this->interval*$increase) . ' months');
-                } while ($tempDate->format('j') != $currentDayOfMonth);
-                $this->currentDate = $tempDate;
-            }
-            return;
-        }
-
-        while(true) {
-
-            $occurrences = $this->getMonthlyOccurrences();
-
-            foreach($occurrences as $occurrence) {
-
-                // The first occurrence thats higher than the current
-                // day of the month wins.
-                if ($occurrence > $currentDayOfMonth) {
-                    break 2;
-                }
-
-            }
-
-            // If we made it all the way here, it means there were no
-            // valid occurrences, and we need to advance to the next
-            // month.
-            $this->currentDate->modify('first day of this month');
-            $this->currentDate->modify('+ ' . $this->interval . ' months');
-
-            // This goes to 0 because we need to start counting at hte
-            // beginning.
-            $currentDayOfMonth = 0;
-
-        }
-
-        $this->currentDate->setDate($this->currentDate->format('Y'), $this->currentDate->format('n'), $occurrence);
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for yearly frequency.
-     *
-     * @return void
-     */
-    protected function nextYearly() {
-
-        if (!$this->byMonth) {
-            $this->currentDate->modify('+' . $this->interval . ' years');
-            return;
-        }
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        $advancedToNewMonth = false;
-
-        // If we got a byDay or getMonthDay filter, we must first expand
-        // further.
-        if ($this->byDay || $this->byMonthDay) {
-
-            while(true) {
-
-                $occurrences = $this->getMonthlyOccurrences();
-
-                foreach($occurrences as $occurrence) {
-
-                    // The first occurrence that's higher than the current
-                    // day of the month wins.
-                    // If we advanced to the next month or year, the first
-                    // occurence is always correct.
-                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        break 2;
-                    }
-
-                }
-
-                // If we made it here, it means we need to advance to
-                // the next month or year.
-                $currentDayOfMonth = 1;
-                $advancedToNewMonth = true;
-                do {
-
-                    $currentMonth++;
-                    if ($currentMonth>12) {
-                        $currentYear+=$this->interval;
-                        $currentMonth = 1;
-                    }
-                } while (!in_array($currentMonth, $this->byMonth));
-
-                $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
-
-            }
-
-            // If we made it here, it means we got a valid occurrence
-            $this->currentDate->setDate($currentYear, $currentMonth, $occurrence);
-            return;
-
-        } else {
-
-            // no byDay or byMonthDay, so we can just loop through the
-            // months.
-            do {
-
-                $currentMonth++;
-                if ($currentMonth>12) {
-                    $currentYear+=$this->interval;
-                    $currentMonth = 1;
-                }
-            } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
-            return;
-
-        }
-
-    }
-
-    /**
-     * Returns all the occurrences for a monthly frequency with a 'byDay' or
-     * 'byMonthDay' expansion for the current month.
-     *
-     * The returned list is an array of integers with the day of month (1-31).
-     *
-     * @return array
-     */
-    protected function getMonthlyOccurrences() {
-
-        $startDate = clone $this->currentDate;
-
-        $byDayResults = array();
-
-        // Our strategy is to simply go through the byDays, advance the date to
-        // that point and add it to the results.
-        if ($this->byDay) foreach($this->byDay as $day) {
-
-            $dayName = $this->dayNames[$this->dayMap[substr($day,-2)]];
-
-            // Dayname will be something like 'wednesday'. Now we need to find
-            // all wednesdays in this month.
-            $dayHits = array();
-
-            $checkDate = clone $startDate;
-            $checkDate->modify('first day of this month');
-            $checkDate->modify($dayName);
-
-            do {
-                $dayHits[] = $checkDate->format('j');
-                $checkDate->modify('next ' . $dayName);
-            } while ($checkDate->format('n') === $startDate->format('n'));
-
-            // So now we have 'all wednesdays' for month. It is however
-            // possible that the user only really wanted the 1st, 2nd or last
-            // wednesday.
-            if (strlen($day)>2) {
-                $offset = (int)substr($day,0,-2);
-
-                if ($offset>0) {
-                    // It is possible that the day does not exist, such as a
-                    // 5th or 6th wednesday of the month.
-                    if (isset($dayHits[$offset-1])) {
-                        $byDayResults[] = $dayHits[$offset-1];
-                    }
-                } else {
-
-                    // if it was negative we count from the end of the array
-                    $byDayResults[] = $dayHits[count($dayHits) + $offset];
-                }
-            } else {
-                // There was no counter (first, second, last wednesdays), so we
-                // just need to add the all to the list).
-                $byDayResults = array_merge($byDayResults, $dayHits);
-
-            }
-
-        }
-
-        $byMonthDayResults = array();
-        if ($this->byMonthDay) foreach($this->byMonthDay as $monthDay) {
-
-            // Removing values that are out of range for this month
-            if ($monthDay > $startDate->format('t') ||
-                $monthDay < 0-$startDate->format('t')) {
-                    continue;
-            }
-            if ($monthDay>0) {
-                $byMonthDayResults[] = $monthDay;
-            } else {
-                // Negative values
-                $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
-            }
-        }
-
-        // If there was just byDay or just byMonthDay, they just specify our
-        // (almost) final list. If both were provided, then byDay limits the
-        // list.
-        if ($this->byMonthDay && $this->byDay) {
-            $result = array_intersect($byMonthDayResults, $byDayResults);
-        } elseif ($this->byMonthDay) {
-            $result = $byMonthDayResults;
-        } else {
-            $result = $byDayResults;
-        }
-        $result = array_unique($result);
-        sort($result, SORT_NUMERIC);
-
-        // The last thing that needs checking is the BYSETPOS. If it's set, it
-        // means only certain items in the set survive the filter.
-        if (!$this->bySetPos) {
-            return $result;
-        }
-
-        $filteredResult = array();
-        foreach($this->bySetPos as $setPos) {
-
-            if ($setPos<0) {
-                $setPos = count($result)-($setPos+1);
-            }
-            if (isset($result[$setPos-1])) {
-                $filteredResult[] = $result[$setPos-1];
-            }
-        }
-
-        sort($filteredResult, SORT_NUMERIC);
-        return $filteredResult;
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/VObject/Version.php b/3rdparty/Sabre/VObject/Version.php
deleted file mode 100644
index 00110febc0..0000000000
--- a/3rdparty/Sabre/VObject/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the version number for the VObject package
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.3.2';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/VObject/WindowsTimezoneMap.php b/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
deleted file mode 100644
index 5e1cc5d479..0000000000
--- a/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * Time zone name translation
- *
- * This file translates well-known time zone names into "Olson database" time zone names.
- *
- * @package Sabre
- * @subpackage VObject 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Frank Edelhaeuser (fedel@users.sourceforge.net) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_WindowsTimezoneMap {
-
-    protected static $map = array(
-
-        // from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
-        // snapshot taken on 2012/01/16
-
-        // windows
-        'AUS Central Standard Time'=>'Australia/Darwin',
-        'AUS Eastern Standard Time'=>'Australia/Sydney',
-        'Afghanistan Standard Time'=>'Asia/Kabul',
-        'Alaskan Standard Time'=>'America/Anchorage',
-        'Arab Standard Time'=>'Asia/Riyadh',
-        'Arabian Standard Time'=>'Asia/Dubai',
-        'Arabic Standard Time'=>'Asia/Baghdad',
-        'Argentina Standard Time'=>'America/Buenos_Aires',
-        'Armenian Standard Time'=>'Asia/Yerevan',
-        'Atlantic Standard Time'=>'America/Halifax',
-        'Azerbaijan Standard Time'=>'Asia/Baku',
-        'Azores Standard Time'=>'Atlantic/Azores',
-        'Bangladesh Standard Time'=>'Asia/Dhaka',
-        'Canada Central Standard Time'=>'America/Regina',
-        'Cape Verde Standard Time'=>'Atlantic/Cape_Verde',
-        'Caucasus Standard Time'=>'Asia/Yerevan',
-        'Cen. Australia Standard Time'=>'Australia/Adelaide',
-        'Central America Standard Time'=>'America/Guatemala',
-        'Central Asia Standard Time'=>'Asia/Almaty',
-        'Central Brazilian Standard Time'=>'America/Cuiaba',
-        'Central Europe Standard Time'=>'Europe/Budapest',
-        'Central European Standard Time'=>'Europe/Warsaw',
-        'Central Pacific Standard Time'=>'Pacific/Guadalcanal',
-        'Central Standard Time'=>'America/Chicago',
-        'Central Standard Time (Mexico)'=>'America/Mexico_City',
-        'China Standard Time'=>'Asia/Shanghai',
-        'Dateline Standard Time'=>'Etc/GMT+12',
-        'E. Africa Standard Time'=>'Africa/Nairobi',
-        'E. Australia Standard Time'=>'Australia/Brisbane',
-        'E. Europe Standard Time'=>'Europe/Minsk',
-        'E. South America Standard Time'=>'America/Sao_Paulo',
-        'Eastern Standard Time'=>'America/New_York',
-        'Egypt Standard Time'=>'Africa/Cairo',
-        'Ekaterinburg Standard Time'=>'Asia/Yekaterinburg',
-        'FLE Standard Time'=>'Europe/Kiev',
-        'Fiji Standard Time'=>'Pacific/Fiji',
-        'GMT Standard Time'=>'Europe/London',
-        'GTB Standard Time'=>'Europe/Istanbul',
-        'Georgian Standard Time'=>'Asia/Tbilisi',
-        'Greenland Standard Time'=>'America/Godthab',
-        'Greenwich Standard Time'=>'Atlantic/Reykjavik',
-        'Hawaiian Standard Time'=>'Pacific/Honolulu',
-        'India Standard Time'=>'Asia/Calcutta',
-        'Iran Standard Time'=>'Asia/Tehran',
-        'Israel Standard Time'=>'Asia/Jerusalem',
-        'Jordan Standard Time'=>'Asia/Amman',
-        'Kamchatka Standard Time'=>'Asia/Kamchatka',
-        'Korea Standard Time'=>'Asia/Seoul',
-        'Magadan Standard Time'=>'Asia/Magadan',
-        'Mauritius Standard Time'=>'Indian/Mauritius',
-        'Mexico Standard Time'=>'America/Mexico_City',
-        'Mexico Standard Time 2'=>'America/Chihuahua',
-        'Mid-Atlantic Standard Time'=>'Etc/GMT+2',
-        'Middle East Standard Time'=>'Asia/Beirut',
-        'Montevideo Standard Time'=>'America/Montevideo',
-        'Morocco Standard Time'=>'Africa/Casablanca',
-        'Mountain Standard Time'=>'America/Denver',
-        'Mountain Standard Time (Mexico)'=>'America/Chihuahua',
-        'Myanmar Standard Time'=>'Asia/Rangoon',
-        'N. Central Asia Standard Time'=>'Asia/Novosibirsk',
-        'Namibia Standard Time'=>'Africa/Windhoek',
-        'Nepal Standard Time'=>'Asia/Katmandu',
-        'New Zealand Standard Time'=>'Pacific/Auckland',
-        'Newfoundland Standard Time'=>'America/St_Johns',
-        'North Asia East Standard Time'=>'Asia/Irkutsk',
-        'North Asia Standard Time'=>'Asia/Krasnoyarsk',
-        'Pacific SA Standard Time'=>'America/Santiago',
-        'Pacific Standard Time'=>'America/Los_Angeles',
-        'Pacific Standard Time (Mexico)'=>'America/Santa_Isabel',
-        'Pakistan Standard Time'=>'Asia/Karachi',
-        'Paraguay Standard Time'=>'America/Asuncion',
-        'Romance Standard Time'=>'Europe/Paris',
-        'Russian Standard Time'=>'Europe/Moscow',
-        'SA Eastern Standard Time'=>'America/Cayenne',
-        'SA Pacific Standard Time'=>'America/Bogota',
-        'SA Western Standard Time'=>'America/La_Paz',
-        'SE Asia Standard Time'=>'Asia/Bangkok',
-        'Samoa Standard Time'=>'Pacific/Apia',
-        'Singapore Standard Time'=>'Asia/Singapore',
-        'South Africa Standard Time'=>'Africa/Johannesburg',
-        'Sri Lanka Standard Time'=>'Asia/Colombo',
-        'Syria Standard Time'=>'Asia/Damascus',
-        'Taipei Standard Time'=>'Asia/Taipei',
-        'Tasmania Standard Time'=>'Australia/Hobart',
-        'Tokyo Standard Time'=>'Asia/Tokyo',
-        'Tonga Standard Time'=>'Pacific/Tongatapu',
-        'US Eastern Standard Time'=>'America/Indianapolis',
-        'US Mountain Standard Time'=>'America/Phoenix',
-        'UTC'=>'Etc/GMT',
-        'UTC+12'=>'Etc/GMT-12',
-        'UTC-02'=>'Etc/GMT+2',
-        'UTC-11'=>'Etc/GMT+11',
-        'Ulaanbaatar Standard Time'=>'Asia/Ulaanbaatar',
-        'Venezuela Standard Time'=>'America/Caracas',
-        'Vladivostok Standard Time'=>'Asia/Vladivostok',
-        'W. Australia Standard Time'=>'Australia/Perth',
-        'W. Central Africa Standard Time'=>'Africa/Lagos',
-        'W. Europe Standard Time'=>'Europe/Berlin',
-        'West Asia Standard Time'=>'Asia/Tashkent',
-        'West Pacific Standard Time'=>'Pacific/Port_Moresby',
-        'Yakutsk Standard Time'=>'Asia/Yakutsk',
-    );
-
-    static public function lookup($tzid) {
-        return isset(self::$map[$tzid]) ? self::$map[$tzid] : null;
-    }
-}
diff --git a/3rdparty/Sabre/VObject/includes.php b/3rdparty/Sabre/VObject/includes.php
deleted file mode 100644
index 0177a8f1ba..0000000000
--- a/3rdparty/Sabre/VObject/includes.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Sabre_VObject includes file
- *
- * Including this file will automatically include all files from the VObject
- * package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/DateTimeParser.php';
-include __DIR__ . '/ElementList.php';
-include __DIR__ . '/FreeBusyGenerator.php';
-include __DIR__ . '/Node.php';
-include __DIR__ . '/Parameter.php';
-include __DIR__ . '/ParseException.php';
-include __DIR__ . '/Reader.php';
-include __DIR__ . '/RecurrenceIterator.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/WindowsTimezoneMap.php';
-include __DIR__ . '/Element.php';
-include __DIR__ . '/Property.php';
-include __DIR__ . '/Component.php';
-include __DIR__ . '/Property/DateTime.php';
-include __DIR__ . '/Property/MultiDateTime.php';
-include __DIR__ . '/Component/VAlarm.php';
-include __DIR__ . '/Component/VCalendar.php';
-include __DIR__ . '/Component/VEvent.php';
-include __DIR__ . '/Component/VJournal.php';
-include __DIR__ . '/Component/VTodo.php';
-include __DIR__ . '/Element/DateTime.php';
-include __DIR__ . '/Element/MultiDateTime.php';
-// End includes
diff --git a/3rdparty/Sabre/autoload.php b/3rdparty/Sabre/autoload.php
deleted file mode 100644
index c7b537d83d..0000000000
--- a/3rdparty/Sabre/autoload.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * SabreDAV's PHP autoloader
- *
- * If you love the autoloader, and don't care as much about performance, this
- * file register a new autoload function using spl_autoload_register.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-/**
- * @param string $className
- * @return void
- */
-function Sabre_autoload($className) {
-
-    if(strpos($className,'Sabre_')===0) {
-
-        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
-
-    }
-
-}
-
-spl_autoload_register('Sabre_autoload');
-

From bd91ee4d2289b15fa69c3712056f275cac3405ed Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 20 Jul 2012 15:25:36 +0200
Subject: [PATCH 1020/1537] add SabreDav 1.6.3 files

---
 3rdparty/Sabre.includes.php                   |   26 +
 3rdparty/Sabre/CalDAV/Backend/Abstract.php    |  168 ++
 3rdparty/Sabre/CalDAV/Backend/PDO.php         |  396 ++++
 3rdparty/Sabre/CalDAV/Calendar.php            |  343 +++
 3rdparty/Sabre/CalDAV/CalendarObject.php      |  273 +++
 3rdparty/Sabre/CalDAV/CalendarQueryParser.php |  296 +++
 .../Sabre/CalDAV/CalendarQueryValidator.php   |  369 +++
 3rdparty/Sabre/CalDAV/CalendarRootNode.php    |   75 +
 3rdparty/Sabre/CalDAV/ICSExportPlugin.php     |  139 ++
 3rdparty/Sabre/CalDAV/ICalendar.php           |   18 +
 3rdparty/Sabre/CalDAV/ICalendarObject.php     |   20 +
 3rdparty/Sabre/CalDAV/Plugin.php              |  865 +++++++
 .../Sabre/CalDAV/Principal/Collection.php     |   31 +
 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php |  178 ++
 .../Sabre/CalDAV/Principal/ProxyWrite.php     |  178 ++
 3rdparty/Sabre/CalDAV/Principal/User.php      |  132 ++
 .../SupportedCalendarComponentSet.php         |   85 +
 .../CalDAV/Property/SupportedCalendarData.php |   38 +
 .../CalDAV/Property/SupportedCollationSet.php |   44 +
 3rdparty/Sabre/CalDAV/Schedule/IMip.php       |  104 +
 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php    |   16 +
 3rdparty/Sabre/CalDAV/Schedule/Outbox.php     |  152 ++
 3rdparty/Sabre/CalDAV/Server.php              |   68 +
 3rdparty/Sabre/CalDAV/UserCalendars.php       |  298 +++
 3rdparty/Sabre/CalDAV/Version.php             |   24 +
 3rdparty/Sabre/CalDAV/includes.php            |   43 +
 3rdparty/Sabre/CardDAV/AddressBook.php        |  312 +++
 .../Sabre/CardDAV/AddressBookQueryParser.php  |  219 ++
 3rdparty/Sabre/CardDAV/AddressBookRoot.php    |   78 +
 3rdparty/Sabre/CardDAV/Backend/Abstract.php   |  166 ++
 3rdparty/Sabre/CardDAV/Backend/PDO.php        |  330 +++
 3rdparty/Sabre/CardDAV/Card.php               |  250 ++
 3rdparty/Sabre/CardDAV/IAddressBook.php       |   18 +
 3rdparty/Sabre/CardDAV/ICard.php              |   18 +
 3rdparty/Sabre/CardDAV/IDirectory.php         |   21 +
 3rdparty/Sabre/CardDAV/Plugin.php             |  666 ++++++
 .../CardDAV/Property/SupportedAddressData.php |   69 +
 3rdparty/Sabre/CardDAV/UserAddressBooks.php   |  257 +++
 3rdparty/Sabre/CardDAV/Version.php            |   26 +
 3rdparty/Sabre/CardDAV/includes.php           |   32 +
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   83 +
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   98 +
 3rdparty/Sabre/DAV/Auth/Backend/Apache.php    |   62 +
 3rdparty/Sabre/DAV/Auth/Backend/File.php      |   75 +
 3rdparty/Sabre/DAV/Auth/Backend/PDO.php       |   65 +
 3rdparty/Sabre/DAV/Auth/IBackend.php          |   36 +
 3rdparty/Sabre/DAV/Auth/Plugin.php            |  111 +
 .../Sabre/DAV/Browser/GuessContentType.php    |   97 +
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   55 +
 3rdparty/Sabre/DAV/Browser/Plugin.php         |  489 ++++
 3rdparty/Sabre/DAV/Browser/assets/favicon.ico |  Bin 0 -> 4286 bytes
 .../DAV/Browser/assets/icons/addressbook.png  |  Bin 0 -> 7232 bytes
 .../DAV/Browser/assets/icons/calendar.png     |  Bin 0 -> 4388 bytes
 .../Sabre/DAV/Browser/assets/icons/card.png   |  Bin 0 -> 5695 bytes
 .../DAV/Browser/assets/icons/collection.png   |  Bin 0 -> 3474 bytes
 .../Sabre/DAV/Browser/assets/icons/file.png   |  Bin 0 -> 2837 bytes
 .../Sabre/DAV/Browser/assets/icons/parent.png |  Bin 0 -> 3474 bytes
 .../DAV/Browser/assets/icons/principal.png    |  Bin 0 -> 5480 bytes
 3rdparty/Sabre/DAV/Client.php                 |  492 ++++
 3rdparty/Sabre/DAV/Collection.php             |  106 +
 3rdparty/Sabre/DAV/Directory.php              |   17 +
 3rdparty/Sabre/DAV/Exception.php              |   64 +
 3rdparty/Sabre/DAV/Exception/BadRequest.php   |   28 +
 3rdparty/Sabre/DAV/Exception/Conflict.php     |   28 +
 .../Sabre/DAV/Exception/ConflictingLock.php   |   35 +
 3rdparty/Sabre/DAV/Exception/FileNotFound.php |   19 +
 3rdparty/Sabre/DAV/Exception/Forbidden.php    |   27 +
 .../DAV/Exception/InsufficientStorage.php     |   27 +
 .../DAV/Exception/InvalidResourceType.php     |   33 +
 .../Exception/LockTokenMatchesRequestUri.php  |   39 +
 3rdparty/Sabre/DAV/Exception/Locked.php       |   67 +
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   45 +
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   28 +
 3rdparty/Sabre/DAV/Exception/NotFound.php     |   28 +
 .../Sabre/DAV/Exception/NotImplemented.php    |   27 +
 .../Sabre/DAV/Exception/PaymentRequired.php   |   28 +
 .../DAV/Exception/PreconditionFailed.php      |   69 +
 .../DAV/Exception/ReportNotImplemented.php    |   30 +
 .../RequestedRangeNotSatisfiable.php          |   29 +
 .../DAV/Exception/UnsupportedMediaType.php    |   28 +
 3rdparty/Sabre/DAV/FS/Directory.php           |  136 ++
 3rdparty/Sabre/DAV/FS/File.php                |   89 +
 3rdparty/Sabre/DAV/FS/Node.php                |   80 +
 3rdparty/Sabre/DAV/FSExt/Directory.php        |  154 ++
 3rdparty/Sabre/DAV/FSExt/File.php             |   93 +
 3rdparty/Sabre/DAV/FSExt/Node.php             |  212 ++
 3rdparty/Sabre/DAV/File.php                   |   85 +
 3rdparty/Sabre/DAV/ICollection.php            |   74 +
 3rdparty/Sabre/DAV/IExtendedCollection.php    |   28 +
 3rdparty/Sabre/DAV/IFile.php                  |   77 +
 3rdparty/Sabre/DAV/INode.php                  |   46 +
 3rdparty/Sabre/DAV/IProperties.php            |   67 +
 3rdparty/Sabre/DAV/IQuota.php                 |   27 +
 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php |   50 +
 3rdparty/Sabre/DAV/Locks/Backend/FS.php       |  191 ++
 3rdparty/Sabre/DAV/Locks/Backend/File.php     |  181 ++
 3rdparty/Sabre/DAV/Locks/Backend/PDO.php      |  165 ++
 3rdparty/Sabre/DAV/Locks/LockInfo.php         |   81 +
 3rdparty/Sabre/DAV/Locks/Plugin.php           |  633 ++++++
 3rdparty/Sabre/DAV/Mount/Plugin.php           |   80 +
 3rdparty/Sabre/DAV/Node.php                   |   55 +
 3rdparty/Sabre/DAV/ObjectTree.php             |  153 ++
 3rdparty/Sabre/DAV/Property.php               |   25 +
 .../Sabre/DAV/Property/GetLastModified.php    |   75 +
 3rdparty/Sabre/DAV/Property/Href.php          |   91 +
 3rdparty/Sabre/DAV/Property/HrefList.php      |   96 +
 3rdparty/Sabre/DAV/Property/IHref.php         |   25 +
 3rdparty/Sabre/DAV/Property/LockDiscovery.php |  102 +
 3rdparty/Sabre/DAV/Property/ResourceType.php  |  125 +
 3rdparty/Sabre/DAV/Property/Response.php      |  155 ++
 3rdparty/Sabre/DAV/Property/ResponseList.php  |   57 +
 3rdparty/Sabre/DAV/Property/SupportedLock.php |   76 +
 .../Sabre/DAV/Property/SupportedReportSet.php |  109 +
 3rdparty/Sabre/DAV/Server.php                 | 2006 +++++++++++++++++
 3rdparty/Sabre/DAV/ServerPlugin.php           |   90 +
 3rdparty/Sabre/DAV/SimpleCollection.php       |  105 +
 3rdparty/Sabre/DAV/SimpleDirectory.php        |   21 +
 3rdparty/Sabre/DAV/SimpleFile.php             |  121 +
 3rdparty/Sabre/DAV/StringUtil.php             |   91 +
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |  289 +++
 3rdparty/Sabre/DAV/Tree.php                   |  193 ++
 3rdparty/Sabre/DAV/Tree/Filesystem.php        |  123 +
 3rdparty/Sabre/DAV/URLUtil.php                |  121 +
 3rdparty/Sabre/DAV/UUIDUtil.php               |   64 +
 3rdparty/Sabre/DAV/Version.php                |   24 +
 3rdparty/Sabre/DAV/XMLUtil.php                |  186 ++
 3rdparty/Sabre/DAV/includes.php               |   97 +
 .../DAVACL/AbstractPrincipalCollection.php    |  154 ++
 .../Sabre/DAVACL/Exception/AceConflict.php    |   32 +
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   81 +
 .../Sabre/DAVACL/Exception/NoAbstract.php     |   32 +
 .../Exception/NotRecognizedPrincipal.php      |   32 +
 .../Exception/NotSupportedPrivilege.php       |   32 +
 3rdparty/Sabre/DAVACL/IACL.php                |   73 +
 3rdparty/Sabre/DAVACL/IPrincipal.php          |   75 +
 3rdparty/Sabre/DAVACL/IPrincipalBackend.php   |  153 ++
 3rdparty/Sabre/DAVACL/Plugin.php              | 1348 +++++++++++
 3rdparty/Sabre/DAVACL/Principal.php           |  279 +++
 .../Sabre/DAVACL/PrincipalBackend/PDO.php     |  427 ++++
 3rdparty/Sabre/DAVACL/PrincipalCollection.php |   35 +
 3rdparty/Sabre/DAVACL/Property/Acl.php        |  209 ++
 .../Sabre/DAVACL/Property/AclRestrictions.php |   32 +
 .../Property/CurrentUserPrivilegeSet.php      |   75 +
 3rdparty/Sabre/DAVACL/Property/Principal.php  |  160 ++
 .../DAVACL/Property/SupportedPrivilegeSet.php |   92 +
 3rdparty/Sabre/DAVACL/Version.php             |   24 +
 3rdparty/Sabre/DAVACL/includes.php            |   38 +
 3rdparty/Sabre/HTTP/AWSAuth.php               |  227 ++
 3rdparty/Sabre/HTTP/AbstractAuth.php          |  111 +
 3rdparty/Sabre/HTTP/BasicAuth.php             |   67 +
 3rdparty/Sabre/HTTP/DigestAuth.php            |  240 ++
 3rdparty/Sabre/HTTP/Request.php               |  268 +++
 3rdparty/Sabre/HTTP/Response.php              |  157 ++
 3rdparty/Sabre/HTTP/Util.php                  |   82 +
 3rdparty/Sabre/HTTP/Version.php               |   24 +
 3rdparty/Sabre/HTTP/includes.php              |   27 +
 3rdparty/Sabre/VObject/Component.php          |  365 +++
 3rdparty/Sabre/VObject/Component/VAlarm.php   |  102 +
 .../Sabre/VObject/Component/VCalendar.php     |  133 ++
 3rdparty/Sabre/VObject/Component/VEvent.php   |   70 +
 3rdparty/Sabre/VObject/Component/VJournal.php |   46 +
 3rdparty/Sabre/VObject/Component/VTodo.php    |   68 +
 3rdparty/Sabre/VObject/DateTimeParser.php     |  181 ++
 3rdparty/Sabre/VObject/Element.php            |   16 +
 3rdparty/Sabre/VObject/Element/DateTime.php   |   37 +
 .../Sabre/VObject/Element/MultiDateTime.php   |   17 +
 3rdparty/Sabre/VObject/ElementList.php        |  172 ++
 3rdparty/Sabre/VObject/FreeBusyGenerator.php  |  297 +++
 3rdparty/Sabre/VObject/Node.php               |  149 ++
 3rdparty/Sabre/VObject/Parameter.php          |   84 +
 3rdparty/Sabre/VObject/ParseException.php     |   12 +
 3rdparty/Sabre/VObject/Property.php           |  348 +++
 3rdparty/Sabre/VObject/Property/DateTime.php  |  260 +++
 .../Sabre/VObject/Property/MultiDateTime.php  |  166 ++
 3rdparty/Sabre/VObject/Reader.php             |  183 ++
 3rdparty/Sabre/VObject/RecurrenceIterator.php | 1009 +++++++++
 3rdparty/Sabre/VObject/Version.php            |   24 +
 3rdparty/Sabre/VObject/WindowsTimezoneMap.php |  128 ++
 3rdparty/Sabre/VObject/includes.php           |   41 +
 3rdparty/Sabre/autoload.php                   |   31 +
 180 files changed, 25055 insertions(+)
 create mode 100755 3rdparty/Sabre.includes.php
 create mode 100755 3rdparty/Sabre/CalDAV/Backend/Abstract.php
 create mode 100755 3rdparty/Sabre/CalDAV/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/CalDAV/Calendar.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarObject.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarQueryParser.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarRootNode.php
 create mode 100755 3rdparty/Sabre/CalDAV/ICSExportPlugin.php
 create mode 100755 3rdparty/Sabre/CalDAV/ICalendar.php
 create mode 100755 3rdparty/Sabre/CalDAV/ICalendarObject.php
 create mode 100755 3rdparty/Sabre/CalDAV/Plugin.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/Collection.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/User.php
 create mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 create mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
 create mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
 create mode 100755 3rdparty/Sabre/CalDAV/Schedule/IMip.php
 create mode 100755 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
 create mode 100755 3rdparty/Sabre/CalDAV/Schedule/Outbox.php
 create mode 100755 3rdparty/Sabre/CalDAV/Server.php
 create mode 100755 3rdparty/Sabre/CalDAV/UserCalendars.php
 create mode 100755 3rdparty/Sabre/CalDAV/Version.php
 create mode 100755 3rdparty/Sabre/CalDAV/includes.php
 create mode 100755 3rdparty/Sabre/CardDAV/AddressBook.php
 create mode 100755 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
 create mode 100755 3rdparty/Sabre/CardDAV/AddressBookRoot.php
 create mode 100755 3rdparty/Sabre/CardDAV/Backend/Abstract.php
 create mode 100755 3rdparty/Sabre/CardDAV/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/CardDAV/Card.php
 create mode 100755 3rdparty/Sabre/CardDAV/IAddressBook.php
 create mode 100755 3rdparty/Sabre/CardDAV/ICard.php
 create mode 100755 3rdparty/Sabre/CardDAV/IDirectory.php
 create mode 100755 3rdparty/Sabre/CardDAV/Plugin.php
 create mode 100755 3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
 create mode 100755 3rdparty/Sabre/CardDAV/UserAddressBooks.php
 create mode 100755 3rdparty/Sabre/CardDAV/Version.php
 create mode 100755 3rdparty/Sabre/CardDAV/includes.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/Apache.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/File.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/IBackend.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/GuessContentType.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/favicon.ico
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/card.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/file.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
 create mode 100755 3rdparty/Sabre/DAV/Client.php
 create mode 100755 3rdparty/Sabre/DAV/Collection.php
 create mode 100755 3rdparty/Sabre/DAV/Directory.php
 create mode 100755 3rdparty/Sabre/DAV/Exception.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/BadRequest.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/Conflict.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/ConflictingLock.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/FileNotFound.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/Forbidden.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/Locked.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/NotFound.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/NotImplemented.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/PaymentRequired.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
 create mode 100755 3rdparty/Sabre/DAV/FS/Directory.php
 create mode 100755 3rdparty/Sabre/DAV/FS/File.php
 create mode 100755 3rdparty/Sabre/DAV/FS/Node.php
 create mode 100755 3rdparty/Sabre/DAV/FSExt/Directory.php
 create mode 100755 3rdparty/Sabre/DAV/FSExt/File.php
 create mode 100755 3rdparty/Sabre/DAV/FSExt/Node.php
 create mode 100755 3rdparty/Sabre/DAV/File.php
 create mode 100755 3rdparty/Sabre/DAV/ICollection.php
 create mode 100755 3rdparty/Sabre/DAV/IExtendedCollection.php
 create mode 100755 3rdparty/Sabre/DAV/IFile.php
 create mode 100755 3rdparty/Sabre/DAV/INode.php
 create mode 100755 3rdparty/Sabre/DAV/IProperties.php
 create mode 100755 3rdparty/Sabre/DAV/IQuota.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/FS.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/File.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/LockInfo.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Mount/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Node.php
 create mode 100755 3rdparty/Sabre/DAV/ObjectTree.php
 create mode 100755 3rdparty/Sabre/DAV/Property.php
 create mode 100755 3rdparty/Sabre/DAV/Property/GetLastModified.php
 create mode 100755 3rdparty/Sabre/DAV/Property/Href.php
 create mode 100755 3rdparty/Sabre/DAV/Property/HrefList.php
 create mode 100755 3rdparty/Sabre/DAV/Property/IHref.php
 create mode 100755 3rdparty/Sabre/DAV/Property/LockDiscovery.php
 create mode 100755 3rdparty/Sabre/DAV/Property/ResourceType.php
 create mode 100755 3rdparty/Sabre/DAV/Property/Response.php
 create mode 100755 3rdparty/Sabre/DAV/Property/ResponseList.php
 create mode 100755 3rdparty/Sabre/DAV/Property/SupportedLock.php
 create mode 100755 3rdparty/Sabre/DAV/Property/SupportedReportSet.php
 create mode 100755 3rdparty/Sabre/DAV/Server.php
 create mode 100755 3rdparty/Sabre/DAV/ServerPlugin.php
 create mode 100755 3rdparty/Sabre/DAV/SimpleCollection.php
 create mode 100755 3rdparty/Sabre/DAV/SimpleDirectory.php
 create mode 100755 3rdparty/Sabre/DAV/SimpleFile.php
 create mode 100755 3rdparty/Sabre/DAV/StringUtil.php
 create mode 100755 3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
 create mode 100755 3rdparty/Sabre/DAV/Tree.php
 create mode 100755 3rdparty/Sabre/DAV/Tree/Filesystem.php
 create mode 100755 3rdparty/Sabre/DAV/URLUtil.php
 create mode 100755 3rdparty/Sabre/DAV/UUIDUtil.php
 create mode 100755 3rdparty/Sabre/DAV/Version.php
 create mode 100755 3rdparty/Sabre/DAV/XMLUtil.php
 create mode 100755 3rdparty/Sabre/DAV/includes.php
 create mode 100755 3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/AceConflict.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 create mode 100755 3rdparty/Sabre/DAVACL/IACL.php
 create mode 100755 3rdparty/Sabre/DAVACL/IPrincipal.php
 create mode 100755 3rdparty/Sabre/DAVACL/IPrincipalBackend.php
 create mode 100755 3rdparty/Sabre/DAVACL/Plugin.php
 create mode 100755 3rdparty/Sabre/DAVACL/Principal.php
 create mode 100755 3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
 create mode 100755 3rdparty/Sabre/DAVACL/PrincipalCollection.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/Acl.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/Principal.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 create mode 100755 3rdparty/Sabre/DAVACL/Version.php
 create mode 100755 3rdparty/Sabre/DAVACL/includes.php
 create mode 100755 3rdparty/Sabre/HTTP/AWSAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/AbstractAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/BasicAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/DigestAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/Request.php
 create mode 100755 3rdparty/Sabre/HTTP/Response.php
 create mode 100755 3rdparty/Sabre/HTTP/Util.php
 create mode 100755 3rdparty/Sabre/HTTP/Version.php
 create mode 100755 3rdparty/Sabre/HTTP/includes.php
 create mode 100755 3rdparty/Sabre/VObject/Component.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VAlarm.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VCalendar.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VEvent.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VJournal.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VTodo.php
 create mode 100755 3rdparty/Sabre/VObject/DateTimeParser.php
 create mode 100755 3rdparty/Sabre/VObject/Element.php
 create mode 100755 3rdparty/Sabre/VObject/Element/DateTime.php
 create mode 100755 3rdparty/Sabre/VObject/Element/MultiDateTime.php
 create mode 100755 3rdparty/Sabre/VObject/ElementList.php
 create mode 100755 3rdparty/Sabre/VObject/FreeBusyGenerator.php
 create mode 100755 3rdparty/Sabre/VObject/Node.php
 create mode 100755 3rdparty/Sabre/VObject/Parameter.php
 create mode 100755 3rdparty/Sabre/VObject/ParseException.php
 create mode 100755 3rdparty/Sabre/VObject/Property.php
 create mode 100755 3rdparty/Sabre/VObject/Property/DateTime.php
 create mode 100755 3rdparty/Sabre/VObject/Property/MultiDateTime.php
 create mode 100755 3rdparty/Sabre/VObject/Reader.php
 create mode 100755 3rdparty/Sabre/VObject/RecurrenceIterator.php
 create mode 100755 3rdparty/Sabre/VObject/Version.php
 create mode 100755 3rdparty/Sabre/VObject/WindowsTimezoneMap.php
 create mode 100755 3rdparty/Sabre/VObject/includes.php
 create mode 100755 3rdparty/Sabre/autoload.php

diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
new file mode 100755
index 0000000000..c133437366
--- /dev/null
+++ b/3rdparty/Sabre.includes.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Library include file
+ *
+ * This file is deprecated, don't use it!
+ * Instead, use the specific includes files that are in the sub-packages.
+ *
+ *   Sabre/DAV/includes.php
+ *   Sabre/HTTP/includes.php
+ *
+ *   etc..
+ *
+ * This file contains all includes to the rest of the SabreDAV library
+ * Make sure the lib/ directory is in PHP's include_path.
+ *
+ * @package Sabre
+ * @deprecated Don't use this file, it will be remove in a future version
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+include 'Sabre/HTTP/includes.php';
+include 'Sabre/DAV/includes.php';
+
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
new file mode 100755
index 0000000000..7aba1d69ff
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * Abstract Calendaring backend. Extend this class to create your own backends.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    abstract function getCalendarsForUser($principalUri);
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return void
+     */
+    abstract function createCalendar($principalUri,$calendarUri,array $properties);
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The mutations array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $mutations
+     * @return bool|array
+     */
+    public function updateCalendar($calendarId, array $mutations) {
+
+        return false;
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param string $calendarId
+     * @return void
+     */
+    abstract function deleteCalendar($calendarId);
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '  "abcdef"')
+     *   * calendarid - The calendarid as it was passed to this function.
+     *   * size - The size of the calendar objects, in bytes.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param string $calendarId
+     * @return array
+     */
+    abstract function getCalendarObjects($calendarId);
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return array
+     */
+    abstract function getCalendarObject($calendarId,$objectUri);
+
+    /**
+     * Creates a new calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return void
+     */
+    abstract function deleteCalendarObject($calendarId,$objectUri);
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
new file mode 100755
index 0000000000..ddacf940c7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Backend/PDO.php
@@ -0,0 +1,396 @@
+<?php
+
+/**
+ * PDO CalDAV backend
+ *
+ * This backend is used to store calendar-data in a PDO database, such as
+ * sqlite or MySQL
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * pdo
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * The table name that will be used for calendars
+     *
+     * @var string
+     */
+    protected $calendarTableName;
+
+    /**
+     * The table name that will be used for calendar objects
+     *
+     * @var string
+     */
+    protected $calendarObjectTableName;
+
+    /**
+     * List of CalDAV properties, and how they map to database fieldnames
+     *
+     * Add your own properties by simply adding on to this array
+     *
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}displayname'                          => 'displayname',
+        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
+    );
+
+    /**
+     * Creates the backend
+     *
+     * @param PDO $pdo
+     * @param string $calendarTableName
+     * @param string $calendarObjectTableName
+     */
+    public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
+
+        $this->pdo = $pdo;
+        $this->calendarTableName = $calendarTableName;
+        $this->calendarObjectTableName = $calendarObjectTableName;
+
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getCalendarsForUser($principalUri) {
+
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'ctag';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+
+        // Making fields a comma-delimited list
+        $fields = implode(', ', $fields);
+        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM ".$this->calendarTableName." WHERE principaluri = ? ORDER BY calendarorder ASC");
+        $stmt->execute(array($principalUri));
+
+        $calendars = array();
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+            $components = array();
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+
+            $calendar = array(
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
+                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
+            );
+
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $calendars[] = $calendar;
+
+        }
+
+        return $calendars;
+
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return string
+     */
+    public function createCalendar($principalUri, $calendarUri, array $properties) {
+
+        $fieldNames = array(
+            'principaluri',
+            'uri',
+            'ctag',
+        );
+        $values = array(
+            ':principaluri' => $principalUri,
+            ':uri'          => $calendarUri,
+            ':ctag'         => 1,
+        );
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        $fieldNames[] = 'components';
+        if (!isset($properties[$sccs])) {
+            $values[':components'] = 'VEVENT,VTODO';
+        } else {
+            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
+                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
+            }
+            $values[':components'] = implode(',',$properties[$sccs]->getValue());
+        }
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            if (isset($properties[$xmlName])) {
+
+                $values[':' . $dbName] = $properties[$xmlName];
+                $fieldNames[] = $dbName;
+            }
+        }
+
+        $stmt = $this->pdo->prepare("INSERT INTO ".$this->calendarTableName." (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
+        $stmt->execute($values);
+
+        return $this->pdo->lastInsertId();
+
+    }
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The mutations array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $mutations
+     * @return bool|array
+     */
+    public function updateCalendar($calendarId, array $mutations) {
+
+        $newValues = array();
+        $result = array(
+            200 => array(), // Ok
+            403 => array(), // Forbidden
+            424 => array(), // Failed Dependency
+        );
+
+        $hasError = false;
+
+        foreach($mutations as $propertyName=>$propertyValue) {
+
+            // We don't know about this property.
+            if (!isset($this->propertyMap[$propertyName])) {
+                $hasError = true;
+                $result[403][$propertyName] = null;
+                unset($mutations[$propertyName]);
+                continue;
+            }
+
+            $fieldName = $this->propertyMap[$propertyName];
+            $newValues[$fieldName] = $propertyValue;
+
+        }
+
+        // If there were any errors we need to fail the request
+        if ($hasError) {
+            // Properties has the remaining properties
+            foreach($mutations as $propertyName=>$propertyValue) {
+                $result[424][$propertyName] = null;
+            }
+
+            // Removing unused statuscodes for cleanliness
+            foreach($result as $status=>$properties) {
+                if (is_array($properties) && count($properties)===0) unset($result[$status]);
+            }
+
+            return $result;
+
+        }
+
+        // Success
+
+        // Now we're generating the sql query.
+        $valuesSql = array();
+        foreach($newValues as $fieldName=>$value) {
+            $valuesSql[] = $fieldName . ' = ?';
+        }
+        $valuesSql[] = 'ctag = ctag + 1';
+
+        $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ',$valuesSql) . " WHERE id = ?");
+        $newValues['id'] = $calendarId;
+        $stmt->execute(array_values($newValues));
+
+        return true;
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param string $calendarId
+     * @return void
+     */
+    public function deleteCalendar($calendarId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarTableName.' WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '  "abcdef"')
+     *   * calendarid - The calendarid as it was passed to this function.
+     *   * size - The size of the calendar objects, in bytes.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param string $calendarId
+     * @return array
+     */
+    public function getCalendarObjects($calendarId) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+        return $stmt->fetchAll();
+
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return array
+     */
+    public function getCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId, $objectUri));
+        return $stmt->fetch();
+
+    }
+
+    /**
+     * Creates a new calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO '.$this->calendarObjectTableName.' (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
+        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
+        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarObjectTableName.' SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return void
+     */
+    public function deleteCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE '. $this->calendarTableName .' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
new file mode 100755
index 0000000000..623df2dd1b
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Calendar.php
@@ -0,0 +1,343 @@
+<?php
+
+/**
+ * This object represents a CalDAV calendar.
+ *
+ * A calendar can contain multiple TODO and or Events. These are represented
+ * as Sabre_CalDAV_CalendarObject objects.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * This is an array with calendar information
+     *
+     * @var array
+     */
+    protected $calendarInfo;
+
+    /**
+     * CalDAV backend
+     *
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param array $calendarInfo
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
+
+        $this->caldavBackend = $caldavBackend;
+        $this->principalBackend = $principalBackend;
+        $this->calendarInfo = $calendarInfo;
+
+
+    }
+
+    /**
+     * Returns the name of the calendar
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->calendarInfo['uri'];
+
+    }
+
+    /**
+     * Updates properties such as the display name and description
+     *
+     * @param array $mutations
+     * @return array
+     */
+    public function updateProperties($mutations) {
+
+        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
+
+    }
+
+    /**
+     * Returns the list of properties
+     *
+     * @param array $requestedProperties
+     * @return array
+     */
+    public function getProperties($requestedProperties) {
+
+        $response = array();
+
+        foreach($requestedProperties as $prop) switch($prop) {
+
+            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
+                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData();
+                break;
+            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
+                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet();
+                break;
+            case '{DAV:}owner' :
+                $response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
+                break;
+            default :
+                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
+                break;
+
+        }
+        return $response;
+
+    }
+
+    /**
+     * Returns a calendar object
+     *
+     * The contained calendar objects are for example Events or Todo's.
+     *
+     * @param string $name
+     * @return Sabre_DAV_ICalendarObject
+     */
+    public function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
+        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of calendar objects
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Checks if a child-node exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj)
+            return false;
+        else
+            return true;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in calendars.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid ICalendar string.
+     *
+     * @param string $name
+     * @param resource $calendarData
+     * @return string|null
+     */
+    public function createFile($name,$calendarData = null) {
+
+        if (is_resource($calendarData)) {
+            $calendarData = stream_get_contents($calendarData);
+        }
+        return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
+
+    }
+
+    /**
+     * Deletes the calendar.
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
+
+    }
+
+    /**
+     * Renames the calendar. Note that most calendars use the
+     * {DAV:}displayname to display a name to display a name.
+     *
+     * @param string $newName
+     * @return void
+     */
+    public function setName($newName) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     *
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->calendarInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
+
+        // We need to inject 'read-free-busy' in the tree, aggregated under
+        // {DAV:}read.
+        foreach($default['aggregates'] as &$agg) {
+
+            if ($agg['privilege'] !== '{DAV:}read') continue;
+
+            $agg['aggregates'][] = array(
+                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+            );
+
+        }
+        return $default;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
new file mode 100755
index 0000000000..72f0a578d1
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarObject.php
@@ -0,0 +1,273 @@
+<?php
+
+/**
+ * The CalendarObject represents a single VEVENT or VTODO within a Calendar.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
+
+    /**
+     * Sabre_CalDAV_Backend_Abstract
+     *
+     * @var array
+     */
+    protected $caldavBackend;
+
+    /**
+     * Array with information about this CalendarObject
+     *
+     * @var array
+     */
+    protected $objectData;
+
+    /**
+     * Array with information about the containing calendar
+     *
+     * @var array
+     */
+    protected $calendarInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param array $calendarInfo
+     * @param array $objectData
+     */
+    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,array $calendarInfo,array $objectData) {
+
+        $this->caldavBackend = $caldavBackend;
+
+        if (!isset($objectData['calendarid'])) {
+            throw new InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
+        }
+        if (!isset($objectData['uri'])) {
+            throw new InvalidArgumentException('The objectData argument must contain an \'uri\' property');
+        }
+
+        $this->calendarInfo = $calendarInfo;
+        $this->objectData = $objectData;
+
+    }
+
+    /**
+     * Returns the uri for this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->objectData['uri'];
+
+    }
+
+    /**
+     * Returns the ICalendar-formatted object
+     *
+     * @return string
+     */
+    public function get() {
+
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
+        }
+        return $this->objectData['calendardata'];
+
+    }
+
+    /**
+     * Updates the ICalendar-formatted object
+     *
+     * @param string $calendarData
+     * @return void
+     */
+    public function put($calendarData) {
+
+        if (is_resource($calendarData)) {
+            $calendarData = stream_get_contents($calendarData);
+        }
+        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
+        $this->objectData['calendardata'] = $calendarData;
+        $this->objectData['etag'] = $etag;
+
+        return $etag;
+
+    }
+
+    /**
+     * Deletes the calendar object
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type
+     *
+     * @return string
+     */
+    public function getContentType() {
+
+        return 'text/calendar';
+
+    }
+
+    /**
+     * Returns an ETag for this object.
+     *
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * @return string
+     */
+    public function getETag() {
+
+        if (isset($this->objectData['etag'])) {
+            return $this->objectData['etag'];
+        } else {
+            return '"' . md5($this->get()). '"';
+        }
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     *
+     * @return time
+     */
+    public function getLastModified() {
+
+        return $this->objectData['lastmodified'];
+
+    }
+
+    /**
+     * Returns the size of this object in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        if (array_key_exists('size',$this->objectData)) {
+            return $this->objectData['size'];
+        } else {
+            return strlen($this->get());
+        }
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->calendarInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
new file mode 100755
index 0000000000..bd0d343382
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
@@ -0,0 +1,296 @@
+<?php
+
+/**
+ * Parses the calendar-query report request body.
+ *
+ * Whoever designed this format, and the CalDAV equivalent even more so,
+ * has no feel for design.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarQueryParser {
+
+    /**
+     * List of requested properties the client wanted
+     *
+     * @var array
+     */
+    public $requestedProperties;
+
+    /**
+     * List of property/component filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * This property will contain null if CALDAV:expand was not specified, 
+     * otherwise it will contain an array with 2 elements (start, end). Each 
+     * contain a DateTime object.
+     *
+     * If expand is specified, recurring calendar objects are to be expanded 
+     * into their individual components, and only the components that fall 
+     * within the specified time-range are to be returned.
+     *
+     * For more details, see rfc4791, section 9.6.5.
+     * 
+     * @var null|array 
+     */
+    public $expand;
+
+    /**
+     * DOM Document
+     *
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * DOM XPath object
+     *
+     * @var DOMXPath
+     */
+    protected $xpath;
+
+    /**
+     * Creates the parser
+     *
+     * @param DOMDocument $dom
+     */
+    public function __construct(DOMDocument $dom) {
+
+        $this->dom = $dom;
+
+        $this->xpath = new DOMXPath($dom);
+        $this->xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
+        $this->xpath->registerNameSpace('dav','urn:DAV');
+
+    }
+
+    /**
+     * Parses the request.
+     *
+     * @return void
+     */
+    public function parse() {
+
+        $filterNode = null;
+
+        $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
+        if ($filter->length !== 1) {
+            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
+        }
+
+        $compFilters = $this->parseCompFilters($filter->item(0));
+        if (count($compFilters)!==1) {
+            throw new Sabre_DAV_Exception_BadRequest('There must be exactly 1 top-level comp-filter.');
+        }
+
+        $this->filters = $compFilters[0];
+        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
+
+        $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
+        if ($expand->length>0) {
+            $this->expand = $this->parseExpand($expand->item(0));
+        }
+             
+
+    }
+
+    /**
+     * Parses all the 'comp-filter' elements from a node
+     *
+     * @param DOMElement $parentNode
+     * @return array
+     */
+    protected function parseCompFilters(DOMElement $parentNode) {
+
+        $compFilterNodes = $this->xpath->query('cal:comp-filter', $parentNode);
+        $result = array();
+
+        for($ii=0; $ii < $compFilterNodes->length; $ii++) {
+
+            $compFilterNode = $compFilterNodes->item($ii);
+
+            $compFilter = array();
+            $compFilter['name'] = $compFilterNode->getAttribute('name');
+            $compFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $compFilterNode)->length>0;
+            $compFilter['comp-filters'] = $this->parseCompFilters($compFilterNode);
+            $compFilter['prop-filters'] = $this->parsePropFilters($compFilterNode);
+            $compFilter['time-range'] = $this->parseTimeRange($compFilterNode);
+
+            if ($compFilter['time-range'] && !in_array($compFilter['name'],array(
+                'VEVENT',
+                'VTODO',
+                'VJOURNAL',
+                'VFREEBUSY',
+                'VALARM',
+            ))) {
+                throw new Sabre_DAV_Exception_BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
+            };
+
+            $result[] = $compFilter;
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Parses all the prop-filter elements from a node
+     *
+     * @param DOMElement $parentNode
+     * @return array
+     */
+    protected function parsePropFilters(DOMElement $parentNode) {
+
+        $propFilterNodes = $this->xpath->query('cal:prop-filter', $parentNode);
+        $result = array();
+
+        for ($ii=0; $ii < $propFilterNodes->length; $ii++) {
+
+            $propFilterNode = $propFilterNodes->item($ii);
+            $propFilter = array();
+            $propFilter['name'] = $propFilterNode->getAttribute('name');
+            $propFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $propFilterNode)->length>0;
+            $propFilter['param-filters'] = $this->parseParamFilters($propFilterNode);
+            $propFilter['text-match'] = $this->parseTextMatch($propFilterNode);
+            $propFilter['time-range'] = $this->parseTimeRange($propFilterNode);
+
+            $result[] = $propFilter;
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Parses the param-filter element
+     *
+     * @param DOMElement $parentNode
+     * @return array
+     */
+    protected function parseParamFilters(DOMElement $parentNode) {
+
+        $paramFilterNodes = $this->xpath->query('cal:param-filter', $parentNode);
+        $result = array();
+
+        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
+
+            $paramFilterNode = $paramFilterNodes->item($ii);
+            $paramFilter = array();
+            $paramFilter['name'] = $paramFilterNode->getAttribute('name');
+            $paramFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $paramFilterNode)->length>0;
+            $paramFilter['text-match'] = $this->parseTextMatch($paramFilterNode);
+
+            $result[] = $paramFilter;
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Parses the text-match element
+     *
+     * @param DOMElement $parentNode
+     * @return array|null
+     */
+    protected function parseTextMatch(DOMElement $parentNode) {
+
+        $textMatchNodes = $this->xpath->query('cal:text-match', $parentNode);
+
+        if ($textMatchNodes->length === 0)
+            return null;
+
+        $textMatchNode = $textMatchNodes->item(0);
+        $negateCondition = $textMatchNode->getAttribute('negate-condition');
+        $negateCondition = $negateCondition==='yes';
+        $collation = $textMatchNode->getAttribute('collation');
+        if (!$collation) $collation = 'i;ascii-casemap';
+
+        return array(
+            'negate-condition' => $negateCondition,
+            'collation' => $collation,
+            'value' => $textMatchNode->nodeValue
+        );
+
+    }
+
+    /**
+     * Parses the time-range element
+     *
+     * @param DOMElement $parentNode
+     * @return array|null
+     */
+    protected function parseTimeRange(DOMElement $parentNode) {
+
+        $timeRangeNodes = $this->xpath->query('cal:time-range', $parentNode);
+        if ($timeRangeNodes->length === 0) {
+            return null;
+        }
+
+        $timeRangeNode = $timeRangeNodes->item(0);
+
+        if ($start = $timeRangeNode->getAttribute('start')) {
+            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+        } else {
+            $start = null;
+        }
+        if ($end = $timeRangeNode->getAttribute('end')) {
+            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+        } else {
+            $end = null;
+        }
+
+        if (!is_null($start) && !is_null($end) && $end <= $start) {
+            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
+        }
+
+        return array(
+            'start' => $start,
+            'end' => $end,
+        );
+
+    }
+
+    /**
+     * Parses the CALDAV:expand element
+     * 
+     * @param DOMElement $parentNode 
+     * @return void
+     */
+    protected function parseExpand(DOMElement $parentNode) {
+
+        $start = $parentNode->getAttribute('start');
+        if(!$start) {
+            throw new Sabre_DAV_Exception_BadRequest('The "start" attribute is required for the CALDAV:expand element');
+        } 
+        $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+
+        $end = $parentNode->getAttribute('end');
+        if(!$end) {
+            throw new Sabre_DAV_Exception_BadRequest('The "end" attribute is required for the CALDAV:expand element');
+        } 
+        $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+        
+        if ($end <= $start) {
+            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
+        }
+
+        return array(
+            'start' => $start,
+            'end' => $end,
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
new file mode 100755
index 0000000000..4bcd32cdf8
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
@@ -0,0 +1,369 @@
+<?php
+
+/**
+ * CalendarQuery Validator
+ *
+ * This class is responsible for checking if an iCalendar object matches a set
+ * of filters. The main function to do this is 'validate'.
+ *
+ * This is used to determine which icalendar objects should be returned for a
+ * calendar-query REPORT request.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarQueryValidator {
+
+    /**
+     * Verify if a list of filters applies to the calendar data object
+     *
+     * The list of filters must be formatted as parsed by Sabre_CalDAV_CalendarQueryParser
+     *
+     * @param Sabre_VObject_Component $vObject
+     * @param array $filters
+     * @return bool
+     */
+    public function validate(Sabre_VObject_Component $vObject,array $filters) {
+
+        // The top level object is always a component filter.
+        // We'll parse it manually, as it's pretty simple.
+        if ($vObject->name !== $filters['name']) {
+            return false;
+        }
+
+        return
+            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
+            $this->validatePropFilters($vObject, $filters['prop-filters']);
+
+
+    }
+
+    /**
+     * This method checks the validity of comp-filters.
+     *
+     * A list of comp-filters needs to be specified. Also the parent of the
+     * component we're checking should be specified, not the component to check
+     * itself.
+     *
+     * @param Sabre_VObject_Component $parent
+     * @param array $filters
+     * @return bool
+     */
+    protected function validateCompFilters(Sabre_VObject_Component $parent, array $filters) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($parent->$filter['name']);
+
+            if ($filter['is-not-defined']) {
+
+                if ($isDefined) {
+                    return false;
+                } else {
+                    continue;
+                }
+
+            }
+            if (!$isDefined) {
+                return false;
+            }
+
+            if ($filter['time-range']) {
+                foreach($parent->$filter['name'] as $subComponent) {
+                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+                        continue 2;
+                    }
+                }
+                return false;
+            }
+
+            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
+                continue;
+            }
+
+            // If there are sub-filters, we need to find at least one component
+            // for which the subfilters hold true.
+            foreach($parent->$filter['name'] as $subComponent) {
+
+                if (
+                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
+                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
+                        // We had a match, so this comp-filter succeeds
+                        continue 2;
+                }
+
+            }
+
+            // If we got here it means there were sub-comp-filters or
+            // sub-prop-filters and there was no match. This means this filter
+            // needs to return false.
+            return false;
+
+        }
+
+        // If we got here it means we got through all comp-filters alive so the
+        // filters were all true.
+        return true;
+
+    }
+
+    /**
+     * This method checks the validity of prop-filters.
+     *
+     * A list of prop-filters needs to be specified. Also the parent of the
+     * property we're checking should be specified, not the property to check
+     * itself.
+     *
+     * @param Sabre_VObject_Component $parent
+     * @param array $filters
+     * @return bool
+     */
+    protected function validatePropFilters(Sabre_VObject_Component $parent, array $filters) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($parent->$filter['name']);
+
+            if ($filter['is-not-defined']) {
+
+                if ($isDefined) {
+                    return false;
+                } else {
+                    continue;
+                }
+
+            }
+            if (!$isDefined) {
+                return false;
+            }
+
+            if ($filter['time-range']) {
+                foreach($parent->$filter['name'] as $subComponent) {
+                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+                        continue 2;
+                    }
+                }
+                return false;
+            }
+
+            if (!$filter['param-filters'] && !$filter['text-match']) {
+                continue;
+            }
+
+            // If there are sub-filters, we need to find at least one property
+            // for which the subfilters hold true.
+            foreach($parent->$filter['name'] as $subComponent) {
+
+                if(
+                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
+                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
+                ) {
+                    // We had a match, so this prop-filter succeeds
+                    continue 2;
+                }
+
+            }
+
+            // If we got here it means there were sub-param-filters or
+            // text-match filters and there was no match. This means the
+            // filter needs to return false.
+            return false;
+
+        }
+
+        // If we got here it means we got through all prop-filters alive so the
+        // filters were all true.
+        return true;
+
+    }
+
+    /**
+     * This method checks the validity of param-filters.
+     *
+     * A list of param-filters needs to be specified. Also the parent of the
+     * parameter we're checking should be specified, not the parameter to check
+     * itself.
+     *
+     * @param Sabre_VObject_Property $parent
+     * @param array $filters
+     * @return bool
+     */
+    protected function validateParamFilters(Sabre_VObject_Property $parent, array $filters) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($parent[$filter['name']]);
+
+            if ($filter['is-not-defined']) {
+
+                if ($isDefined) {
+                    return false;
+                } else {
+                    continue;
+                }
+
+            }
+            if (!$isDefined) {
+                return false;
+            }
+
+            if (!$filter['text-match']) {
+                continue;
+            }
+
+            // If there are sub-filters, we need to find at least one parameter
+            // for which the subfilters hold true.
+            foreach($parent[$filter['name']] as $subParam) {
+
+                if($this->validateTextMatch($subParam,$filter['text-match'])) {
+                    // We had a match, so this param-filter succeeds
+                    continue 2;
+                }
+
+            }
+
+            // If we got here it means there was a text-match filter and there
+            // were no matches. This means the filter needs to return false.
+            return false;
+
+        }
+
+        // If we got here it means we got through all param-filters alive so the
+        // filters were all true.
+        return true;
+
+    }
+
+    /**
+     * This method checks the validity of a text-match.
+     *
+     * A single text-match should be specified as well as the specific property
+     * or parameter we need to validate.
+     *
+     * @param Sabre_VObject_Node $parent
+     * @param array $textMatch
+     * @return bool
+     */
+    protected function validateTextMatch(Sabre_VObject_Node $parent, array $textMatch) {
+
+        $value = (string)$parent;
+
+        $isMatching = Sabre_DAV_StringUtil::textMatch($value, $textMatch['value'], $textMatch['collation']);
+
+        return ($textMatch['negate-condition'] xor $isMatching);
+
+    }
+
+    /**
+     * Validates if a component matches the given time range.
+     *
+     * This is all based on the rules specified in rfc4791, which are quite
+     * complex.
+     *
+     * @param Sabre_VObject_Node $component
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return bool
+     */
+    protected function validateTimeRange(Sabre_VObject_Node $component, $start, $end) {
+
+        if (is_null($start)) {
+            $start = new DateTime('1900-01-01');
+        }
+        if (is_null($end)) {
+            $end = new DateTime('3000-01-01');
+        }
+
+        switch($component->name) {
+
+            case 'VEVENT' :
+            case 'VTODO' :
+            case 'VJOURNAL' :
+
+                return $component->isInTimeRange($start, $end);
+
+            case 'VALARM' :
+
+                // If the valarm is wrapped in a recurring event, we need to
+                // expand the recursions, and validate each.
+                //
+                // Our datamodel doesn't easily allow us to do this straight
+                // in the VALARM component code, so this is a hack, and an
+                // expensive one too.
+                if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
+
+                    // Fire up the iterator!
+                    $it = new Sabre_VObject_RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
+                    while($it->valid()) {
+                        $expandedEvent = $it->getEventObject();
+
+                        // We need to check from these expanded alarms, which
+                        // one is the first to trigger. Based on this, we can
+                        // determine if we can 'give up' expanding events.
+                        $firstAlarm = null;
+                        foreach($expandedEvent->VALARM as $expandedAlarm) {
+
+                            $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+                            if ($expandedAlarm->isInTimeRange($start, $end)) {
+                                return true;
+                            }
+
+                            if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
+                                // This is an alarm with a non-relative trigger
+                                // time, likely created by a buggy client. The
+                                // implication is that every alarm in this
+                                // recurring event trigger at the exact same
+                                // time. It doesn't make sense to traverse
+                                // further.
+                            } else {
+                                // We store the first alarm as a means to
+                                // figure out when we can stop traversing.
+                                if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
+                                    $firstAlarm = $effectiveTrigger;
+                                }
+                            }
+
+                        }
+                        if (is_null($firstAlarm)) {
+                            // No alarm was found.
+                            //
+                            // Or technically: No alarm that will change for
+                            // every instance of the recurrence was found,
+                            // which means we can assume there was no match.
+                            return false;
+                        }
+                        if ($firstAlarm > $end) {
+                            return false;
+                        }
+                        $it->next();
+                    }
+                    return false;
+                } else {
+                    return $component->isInTimeRange($start, $end);
+                }
+
+            case 'VFREEBUSY' :
+                throw new Sabre_DAV_Exception_NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
+
+            case 'COMPLETED' :
+            case 'CREATED' :
+            case 'DTEND' :
+            case 'DTSTAMP' :
+            case 'DTSTART' :
+            case 'DUE' :
+            case 'LAST-MODIFIED' :
+                return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
+
+
+
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
new file mode 100755
index 0000000000..3907913cc7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Users collection
+ *
+ * This object is responsible for generating a collection of users.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * CalDAV backend
+     *
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Constructor
+     *
+     * This constructor needs both an authentication and a caldav backend.
+     *
+     * By default this class will show a list of calendar collections for
+     * principals in the 'principals' collection. If your main principals are
+     * actually located in a different path, use the $principalPrefix argument
+     * to override this.
+     *
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend, $principalPrefix = 'principals') {
+
+        parent::__construct($principalBackend, $principalPrefix);
+        $this->caldavBackend = $caldavBackend;
+
+    }
+
+    /**
+     * Returns the nodename
+     *
+     * We're overriding this, because the default will be the 'principalPrefix',
+     * and we want it to be Sabre_CalDAV_Plugin::CALENDAR_ROOT
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return Sabre_DAV_INode
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
new file mode 100755
index 0000000000..ec42b406b2
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * ICS Exporter
+ *
+ * This plugin adds the ability to export entire calendars as .ics files.
+ * This is useful for clients that don't support CalDAV yet. They often do
+ * support ics files.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?export
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='export') return;
+
+        // splitting uri
+        list($uri) = explode('?',$uri,2);
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_CalDAV_Calendar)) return;
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
+        $this->server->httpResponse->sendStatus(200);
+
+        $nodes = $this->server->getPropertiesForPath($uri, array(
+            '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data',
+        ),1);
+
+        $this->server->httpResponse->sendBody($this->generateICS($nodes));
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Merges all calendar objects, and builds one big ics export
+     *
+     * @param array $nodes
+     * @return string
+     */
+    public function generateICS(array $nodes) {
+
+        $calendar = new Sabre_VObject_Component('vcalendar');
+        $calendar->version = '2.0';
+        if (Sabre_DAV_Server::$exposeVersion) {
+            $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
+        } else {
+            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
+        }
+        $calendar->calscale = 'GREGORIAN';
+
+        $collectedTimezones = array();
+
+        $timezones = array();
+        $objects = array();
+
+        foreach($nodes as $node) {
+
+            if (!isset($node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'])) {
+                continue;
+            }
+            $nodeData = $node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'];
+
+            $nodeComp = Sabre_VObject_Reader::read($nodeData);
+
+            foreach($nodeComp->children() as $child) {
+
+                switch($child->name) {
+                    case 'VEVENT' :
+                    case 'VTODO' :
+                    case 'VJOURNAL' :
+                        $objects[] = $child;
+                        break;
+
+                    // VTIMEZONE is special, because we need to filter out the duplicates
+                    case 'VTIMEZONE' :
+                        // Naively just checking tzid.
+                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
+
+                        $timezones[] = $child;
+                        $collectedTimezones[] = $child->TZID;
+                        break;
+
+                }
+
+            }
+
+        }
+
+        foreach($timezones as $tz) $calendar->add($tz);
+        foreach($objects as $obj) $calendar->add($obj);
+
+        return $calendar->serialize();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
new file mode 100755
index 0000000000..15d51ebcf7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendar.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Calendar interface
+ *
+ * Implement this interface to allow a node to be recognized as an calendar.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
+
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
new file mode 100755
index 0000000000..280f982a31
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendarObject.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * CalendarObject interface
+/**
+ * Extend the ICalendarObject interface to allow your custom nodes to be picked up as
+ * CalendarObjects.
+ *
+ * Calendar objects are resources such as Events, Todo's or Journals.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile {
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
new file mode 100755
index 0000000000..5903968c00
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Plugin.php
@@ -0,0 +1,865 @@
+<?php
+
+/**
+ * CalDAV plugin
+ *
+ * This plugin provides functionality added by CalDAV (RFC 4791)
+ * It implements new reports, and the MKCALENDAR method.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the official CalDAV namespace
+     */
+    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+
+    /**
+     * This is the namespace for the proprietary calendarserver extensions
+     */
+    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * The following constants are used to differentiate
+     * the various filters for the calendar-query report
+     */
+    const FILTER_COMPFILTER   = 1;
+    const FILTER_TIMERANGE    = 3;
+    const FILTER_PROPFILTER   = 4;
+    const FILTER_PARAMFILTER  = 5;
+    const FILTER_TEXTMATCH    = 6;
+
+    /**
+     * The hardcoded root for calendar objects. It is unfortunate
+     * that we're stuck with it, but it will have to do for now
+     */
+    const CALENDAR_ROOT = 'calendars';
+
+    /**
+     * Reference to server object
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * The email handler for invites and other scheduling messages.
+     * 
+     * @var Sabre_CalDAV_Schedule_IMip 
+     */
+    protected $imipHandler;
+
+    /**
+     * Sets the iMIP handler.
+     *
+     * iMIP = The email transport of iCalendar scheduling messages. Setting 
+     * this is optional, but if you want the server to allow invites to be sent 
+     * out, you must set a handler.
+     *
+     * Specifically iCal will plain assume that the server supports this. If 
+     * the server doesn't, iCal will display errors when inviting people to 
+     * events.
+     *
+     * @param Sabre_CalDAV_Schedule_IMip $imipHandler 
+     * @return void
+     */
+    public function setIMipHandler(Sabre_CalDAV_Schedule_IMip $imipHandler) {
+
+        $this->imipHandler = $imipHandler;
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getHTTPMethods($uri) {
+
+        // The MKCALENDAR is only available on unmapped uri's, whose
+        // parents extend IExtendedCollection
+        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        $node = $this->server->tree->getNodeForPath($parent);
+
+        if ($node instanceof Sabre_DAV_IExtendedCollection) {
+            try {
+                $node->getChild($name);
+            } catch (Sabre_DAV_Exception_NotFound $e) {
+                return array('MKCALENDAR');
+            }
+        }
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the DAV: HTTP header.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('calendar-access', 'calendar-proxy');
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'caldav';
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        $reports = array();
+        if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
+            $reports[] = '{' . self::NS_CALDAV . '}calendar-multiget';
+            $reports[] = '{' . self::NS_CALDAV . '}calendar-query';
+        }
+        if ($node instanceof Sabre_CalDAV_ICalendar) {
+            $reports[] = '{' . self::NS_CALDAV . '}free-busy-query';
+        }
+        return $reports;
+
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
+        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
+        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
+        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
+
+        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
+        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
+
+        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
+
+        $server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+        $server->resourceTypeMapping['Sabre_CalDAV_Schedule_IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
+        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+
+        array_push($server->protectedProperties,
+
+            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
+            '{' . self::NS_CALDAV . '}supported-calendar-data',
+            '{' . self::NS_CALDAV . '}max-resource-size',
+            '{' . self::NS_CALDAV . '}min-date-time',
+            '{' . self::NS_CALDAV . '}max-date-time',
+            '{' . self::NS_CALDAV . '}max-instances',
+            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
+            '{' . self::NS_CALDAV . '}calendar-home-set',
+            '{' . self::NS_CALDAV . '}supported-collation-set',
+            '{' . self::NS_CALDAV . '}calendar-data',
+
+            // scheduling extension
+            '{' . self::NS_CALDAV . '}schedule-inbox-URL',
+            '{' . self::NS_CALDAV . '}schedule-outbox-URL',
+            '{' . self::NS_CALDAV . '}calendar-user-address-set',
+            '{' . self::NS_CALDAV . '}calendar-user-type',
+
+            // CalendarServer extensions
+            '{' . self::NS_CALENDARSERVER . '}getctag',
+            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
+            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for'
+
+        );
+    }
+
+    /**
+     * This function handles support for the MKCALENDAR method
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function unknownMethod($method, $uri) {
+
+        switch ($method) {
+            case 'MKCALENDAR' :
+                $this->httpMkCalendar($uri);
+                // false is returned to stop the propagation of the
+                // unknownMethod event.
+                return false;
+            case 'POST' :
+                // Checking if we're talking to an outbox
+                try {
+                    $node = $this->server->tree->getNodeForPath($uri);
+                } catch (Sabre_DAV_Exception_NotFound $e) {
+                    return;
+                }
+                if (!$node instanceof Sabre_CalDAV_Schedule_IOutbox)
+                    return;
+
+                $this->outboxRequest($node);
+                return false;
+
+        }
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV
+     *
+     * @param string $reportName
+     * @param DOMNode $dom
+     * @return bool
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) {
+            case '{'.self::NS_CALDAV.'}calendar-multiget' :
+                $this->calendarMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CALDAV.'}calendar-query' :
+                $this->calendarQueryReport($dom);
+                return false;
+            case '{'.self::NS_CALDAV.'}free-busy-query' :
+                $this->freeBusyQueryReport($dom);
+                return false;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the MKCALENDAR HTTP method, which creates
+     * a new calendar.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function httpMkCalendar($uri) {
+
+        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
+        // for clients matching iCal in the user agent
+        //$ua = $this->server->httpRequest->getHeader('User-Agent');
+        //if (strpos($ua,'iCal/')!==false) {
+        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
+        //}
+
+        $body = $this->server->httpRequest->getBody(true);
+        $properties = array();
+
+        if ($body) {
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+            foreach($dom->firstChild->childNodes as $child) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
+                foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
+                    $properties[$k] = $prop;
+                }
+
+            }
+        }
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+
+        $this->server->createCollection($uri,$resourceType,$properties);
+
+        $this->server->httpResponse->sendStatus(201);
+        $this->server->httpResponse->setHeader('Content-Length',0);
+    }
+
+    /**
+     * beforeGetProperties
+     *
+     * This method handler is invoked before any after properties for a
+     * resource are fetched. This allows us to add in any CalDAV specific
+     * properties.
+     *
+     * @param string $path
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @return void
+     */
+    public function beforeGetProperties($path, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
+
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            // calendar-home-set property
+            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
+            if (in_array($calHome,$requestedProperties)) {
+                $principalId = $node->getName();
+                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
+                unset($requestedProperties[$calHome]);
+                $returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
+            }
+
+            // schedule-outbox-URL property
+            $scheduleProp = '{' . self::NS_CALDAV . '}schedule-outbox-URL';
+            if (in_array($scheduleProp,$requestedProperties)) {
+                $principalId = $node->getName();
+                $outboxPath = self::CALENDAR_ROOT . '/' . $principalId . '/outbox';
+                unset($requestedProperties[$scheduleProp]);
+                $returnedProperties[200][$scheduleProp] = new Sabre_DAV_Property_Href($outboxPath);
+            }
+
+            // calendar-user-address-set property
+            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
+            if (in_array($calProp,$requestedProperties)) {
+
+                $addresses = $node->getAlternateUriSet();
+                $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl();
+                unset($requestedProperties[$calProp]);
+                $returnedProperties[200][$calProp] = new Sabre_DAV_Property_HrefList($addresses, false);
+
+            }
+
+            // These two properties are shortcuts for ical to easily find
+            // other principals this principal has access to.
+            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
+            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
+            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
+
+                $membership = $node->getGroupMembership();
+                $readList = array();
+                $writeList = array();
+
+                foreach($membership as $group) {
+
+                    $groupNode = $this->server->tree->getNodeForPath($group);
+
+                    // If the node is either ap proxy-read or proxy-write
+                    // group, we grab the parent principal and add it to the
+                    // list.
+                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
+                        list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
+                    }
+                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyWrite) {
+                        list($writeList[]) = Sabre_DAV_URLUtil::splitPath($group);
+                    }
+
+                }
+                if (in_array($propRead,$requestedProperties)) {
+                    unset($requestedProperties[$propRead]);
+                    $returnedProperties[200][$propRead] = new Sabre_DAV_Property_HrefList($readList);
+                }
+                if (in_array($propWrite,$requestedProperties)) {
+                    unset($requestedProperties[$propWrite]);
+                    $returnedProperties[200][$propWrite] = new Sabre_DAV_Property_HrefList($writeList);
+                }
+
+            }
+
+        } // instanceof IPrincipal
+
+
+        if ($node instanceof Sabre_CalDAV_ICalendarObject) {
+            // The calendar-data property is not supposed to be a 'real'
+            // property, but in large chunks of the spec it does act as such.
+            // Therefore we simply expose it as a property.
+            $calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
+            if (in_array($calDataProp, $requestedProperties)) {
+                unset($requestedProperties[$calDataProp]);
+                $val = $node->get();
+                if (is_resource($val))
+                    $val = stream_get_contents($val);
+
+                // Taking out \r to not screw up the xml output
+                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
+
+            }
+        }
+
+    }
+
+    /**
+     * This function handles the calendar-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function calendarMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+
+        $xpath = new DOMXPath($dom);
+        $xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
+        $xpath->registerNameSpace('dav','urn:DAV');
+
+        $expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
+        if ($expand->length>0) {
+            $expandElem = $expand->item(0);
+            $start = $expandElem->getAttribute('start');
+            $end = $expandElem->getAttribute('end');
+            if(!$start || !$end) {
+                throw new Sabre_DAV_Exception_BadRequest('The "start" and "end" attributes are required for the CALDAV:expand element');
+            }
+            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+
+            if ($end <= $start) {
+                throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
+            }
+
+            $expand = true;
+
+        } else {
+
+            $expand = false;
+
+        }
+
+        foreach($hrefElems as $elem) {
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
+
+            if ($expand && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
+                $vObject = Sabre_VObject_Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
+                $vObject->expand($start, $end);
+                $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
+            }
+
+            $propertyList[]=$objProps;
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function calendarQueryReport($dom) {
+
+        $parser = new Sabre_CalDAV_CalendarQueryParser($dom);
+        $parser->parse();
+
+        $requestedCalendarData = true;
+        $requestedProperties = $parser->requestedProperties;
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+
+            // We always retrieve calendar-data, as we need it for filtering.
+            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
+
+            // If calendar-data wasn't explicitly requested, we need to remove
+            // it after processing.
+            $requestedCalendarData = false;
+        }
+
+        // These are the list of nodes that potentially match the requirement
+        $candidateNodes = $this->server->getPropertiesForPath(
+            $this->server->getRequestUri(),
+            $requestedProperties,
+            $this->server->getHTTPDepth(0)
+        );
+
+        $verifiedNodes = array();
+
+        $validator = new Sabre_CalDAV_CalendarQueryValidator();
+
+        foreach($candidateNodes as $node) {
+
+            // If the node didn't have a calendar-data property, it must not be a calendar object
+            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']))
+                continue;
+
+            $vObject = Sabre_VObject_Reader::read($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+            if ($validator->validate($vObject,$parser->filters)) {
+
+                if (!$requestedCalendarData) {
+                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+                }
+                if ($parser->expand) {
+                    $vObject->expand($parser->expand['start'], $parser->expand['end']);
+                    $node[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
+                }
+                $verifiedNodes[] = $node;
+            }
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
+
+    }
+
+    /**
+     * This method is responsible for parsing the request and generating the
+     * response for the CALDAV:free-busy-query REPORT.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    protected function freeBusyQueryReport(DOMNode $dom) {
+
+        $start = null;
+        $end = null;
+
+        foreach($dom->firstChild->childNodes as $childNode) {
+
+            $clark = Sabre_DAV_XMLUtil::toClarkNotation($childNode);
+            if ($clark == '{' . self::NS_CALDAV . '}time-range') {
+                $start = $childNode->getAttribute('start');
+                $end = $childNode->getAttribute('end');
+                break;
+            }
+
+        }
+        if ($start) {
+            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+        }
+        if ($end) {
+            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+        }
+
+        if (!$start && !$end) {
+            throw new Sabre_DAV_Exception_BadRequest('The freebusy report must have a time-range filter');
+        }
+        $acl = $this->server->getPlugin('acl');
+
+        if (!$acl) {
+            throw new Sabre_DAV_Exception('The ACL plugin must be loaded for free-busy queries to work');
+        }
+        $uri = $this->server->getRequestUri();
+        $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy');
+
+        $calendar = $this->server->tree->getNodeForPath($uri);
+        if (!$calendar instanceof Sabre_CalDAV_ICalendar) {
+            throw new Sabre_DAV_Exception_NotImplemented('The free-busy-query REPORT is only implemented on calendars');
+        }
+
+        $objects = array_map(function($child) {
+            $obj = $child->get();
+            if (is_resource($obj)) {
+                $obj = stream_get_contents($obj);
+            }
+            return $obj;
+        }, $calendar->getChildren());
+
+        $generator = new Sabre_VObject_FreeBusyGenerator();
+        $generator->setObjects($objects);
+        $generator->setTimeRange($start, $end);
+        $result = $generator->getResult();
+        $result = $result->serialize();
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
+        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
+        $this->server->httpResponse->sendBody($result);
+
+    }
+
+    /**
+     * This method is triggered before a file gets updated with new content.
+     *
+     * This plugin uses this method to ensure that CalDAV objects receive
+     * valid calendar data.
+     *
+     * @param string $path
+     * @param Sabre_DAV_IFile $node
+     * @param resource $data
+     * @return void
+     */
+    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
+
+        if (!$node instanceof Sabre_CalDAV_ICalendarObject)
+            return;
+
+        $this->validateICalendar($data);
+
+    }
+
+    /**
+     * This method is triggered before a new file is created.
+     *
+     * This plugin uses this method to ensure that newly created calendar
+     * objects contain valid calendar data.
+     *
+     * @param string $path
+     * @param resource $data
+     * @param Sabre_DAV_ICollection $parentNode
+     * @return void
+     */
+    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
+
+        if (!$parentNode instanceof Sabre_CalDAV_Calendar)
+            return;
+
+        $this->validateICalendar($data);
+
+    }
+
+    /**
+     * Checks if the submitted iCalendar data is in fact, valid.
+     *
+     * An exception is thrown if it's not.
+     *
+     * @param resource|string $data
+     * @return void
+     */
+    protected function validateICalendar(&$data) {
+
+        // If it's a stream, we convert it to a string first.
+        if (is_resource($data)) {
+            $data = stream_get_contents($data);
+        }
+
+        // Converting the data to unicode, if needed.
+        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
+
+        try {
+
+            $vobj = Sabre_VObject_Reader::read($data);
+
+        } catch (Sabre_VObject_ParseException $e) {
+
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: ' . $e->getMessage());
+
+        }
+
+        if ($vobj->name !== 'VCALENDAR') {
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support iCalendar objects.');
+        }
+
+        $foundType = null;
+        $foundUID = null;
+        foreach($vobj->getComponents() as $component) {
+            switch($component->name) {
+                case 'VTIMEZONE' :
+                    continue 2;
+                case 'VEVENT' :
+                case 'VTODO' :
+                case 'VJOURNAL' :
+                    if (is_null($foundType)) {
+                        $foundType = $component->name;
+                        if (!isset($component->UID)) {
+                            throw new Sabre_DAV_Exception_BadRequest('Every ' . $component->name . ' component must have an UID');
+                        }
+                        $foundUID = (string)$component->UID;
+                    } else {
+                        if ($foundType !== $component->name) {
+                            throw new Sabre_DAV_Exception_BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
+                        }
+                        if ($foundUID !== (string)$component->UID) {
+                            throw new Sabre_DAV_Exception_BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
+                        }
+                    }
+                    break;
+                default :
+                    throw new Sabre_DAV_Exception_BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
+
+            }
+        }
+        if (!$foundType)
+            throw new Sabre_DAV_Exception_BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+
+    }
+
+    /**
+     * This method handles POST requests to the schedule-outbox
+     *
+     * @param Sabre_CalDAV_Schedule_IOutbox $outboxNode
+     * @return void
+     */
+    public function outboxRequest(Sabre_CalDAV_Schedule_IOutbox $outboxNode) {
+
+        $originator = $this->server->httpRequest->getHeader('Originator');
+        $recipients = $this->server->httpRequest->getHeader('Recipient');
+
+        if (!$originator) {
+            throw new Sabre_DAV_Exception_BadRequest('The Originator: header must be specified when making POST requests');
+        } 
+        if (!$recipients) {
+            throw new Sabre_DAV_Exception_BadRequest('The Recipient: header must be specified when making POST requests');
+        } 
+
+        if (!preg_match('/^mailto:(.*)@(.*)$/', $originator)) {
+            throw new Sabre_DAV_Exception_BadRequest('Originator must start with mailto: and must be valid email address');
+        }
+        $originator = substr($originator,7);
+
+        $recipients = explode(',',$recipients);
+        foreach($recipients as $k=>$recipient) {
+
+            $recipient = trim($recipient);
+            if (!preg_match('/^mailto:(.*)@(.*)$/', $recipient)) { 
+                throw new Sabre_DAV_Exception_BadRequest('Recipients must start with mailto: and must be valid email address');
+            }
+            $recipient = substr($recipient, 7);
+            $recipients[$k] = $recipient;
+        }
+
+        // We need to make sure that 'originator' matches one of the email 
+        // addresses of the selected principal.
+        $principal = $outboxNode->getOwner();
+        $props = $this->server->getProperties($principal,array(
+            '{' . self::NS_CALDAV . '}calendar-user-address-set',
+        ));
+
+        $addresses = array();
+        if (isset($props['{' . self::NS_CALDAV . '}calendar-user-address-set'])) {
+            $addresses = $props['{' . self::NS_CALDAV . '}calendar-user-address-set']->getHrefs();
+        }
+
+        if (!in_array('mailto:' . $originator, $addresses)) {
+            throw new Sabre_DAV_Exception_Forbidden('The addresses specified in the Originator header did not match any addresses in the owners calendar-user-address-set header');
+        }
+
+        try { 
+            $vObject = Sabre_VObject_Reader::read($this->server->httpRequest->getBody(true));
+        } catch (Sabre_VObject_ParseException $e) {
+            throw new Sabre_DAV_Exception_BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
+        }
+
+        // Checking for the object type
+        $componentType = null;
+        foreach($vObject->getComponents() as $component) {
+            if ($component->name !== 'VTIMEZONE') {
+                $componentType = $component->name;
+                break;
+            }
+        }
+        if (is_null($componentType)) {
+            throw new Sabre_DAV_Exception_BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
+        }
+
+        // Validating the METHOD
+        $method = strtoupper((string)$vObject->METHOD);
+        if (!$method) {
+            throw new Sabre_DAV_Exception_BadRequest('A METHOD property must be specified in iTIP messages');
+        }
+
+        if (in_array($method, array('REQUEST','REPLY','ADD','CANCEL')) && $componentType==='VEVENT') {
+            $this->iMIPMessage($originator, $recipients, $vObject);
+            $this->server->httpResponse->sendStatus(200);
+            $this->server->httpResponse->sendBody('Messages sent');
+        } else {
+            throw new Sabre_DAV_Exception_NotImplemented('This iTIP method is currently not implemented');
+        }
+
+    }
+
+    /**
+     * Sends an iMIP message by email.
+     * 
+     * @param string $originator 
+     * @param array $recipients 
+     * @param Sabre_VObject_Component $vObject 
+     * @return void
+     */
+    protected function iMIPMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
+
+        if (!$this->imipHandler) {
+            throw new Sabre_DAV_Exception_NotImplemented('No iMIP handler is setup on this server.');
+        }
+        $this->imipHandler->sendMessage($originator, $recipients, $vObject); 
+
+    }
+
+    /**
+     * This method is used to generate HTML output for the
+     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
+     * can use to create new calendars.
+     *
+     * @param Sabre_DAV_INode $node
+     * @param string $output
+     * @return bool
+     */
+    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+        if (!$node instanceof Sabre_CalDAV_UserCalendars)
+            return;
+
+        $output.= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Create new calendar</h3>
+            <input type="hidden" name="sabreAction" value="mkcalendar" />
+            <label>Name (uri):</label> <input type="text" name="name" /><br />
+            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
+            <input type="submit" value="create" />
+            </form>
+            </td></tr>';
+
+        return false;
+
+    }
+
+    /**
+     * This method allows us to intercept the 'mkcalendar' sabreAction. This
+     * action enables the user to create new calendars from the browser plugin.
+     *
+     * @param string $uri
+     * @param string $action
+     * @param array $postVars
+     * @return bool
+     */
+    public function browserPostAction($uri, $action, array $postVars) {
+
+        if ($action!=='mkcalendar')
+            return;
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+        $properties = array();
+        if (isset($postVars['{DAV:}displayname'])) {
+            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
+        }
+        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
new file mode 100755
index 0000000000..abbefa5567
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/Collection.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Principal collection
+ *
+ * This is an alternative collection to the standard ACL principal collection.
+ * This collection adds support for the calendar-proxy-read and
+ * calendar-proxy-write sub-principals, as defined by the caldav-proxy
+ * specification.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * Returns a child object based on principal information
+     *
+     * @param array $principalInfo
+     * @return Sabre_CalDAV_Principal_User
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+
+        return new Sabre_CalDAV_Principal_User($this->principalBackend, $principalInfo);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
new file mode 100755
index 0000000000..4b3f035634
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * ProxyRead principal
+ *
+ * This class represents a principal group, hosted under the main principal.
+ * This is needed to implement 'Calendar delegation' support. This class is
+ * instantiated by Sabre_CalDAV_Principal_User.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
+
+    /**
+     * Principal information from the parent principal.
+     *
+     * @var array
+     */
+    protected $principalInfo;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the object.
+     *
+     * Note that you MUST supply the parent principal information.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param array $principalInfo
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
+
+        $this->principalInfo = $principalInfo;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * Returns this principals name.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return 'calendar-proxy-read';
+
+    }
+
+    /**
+     * Returns the last modification time
+     *
+     * @return null
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Deletes the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    public function getAlternateUriSet() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalInfo['uri'] . '/' . $this->getName();
+
+    }
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $principals
+     * @return void
+     */
+    public function setGroupMemberSet(array $principals) {
+
+        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+
+    }
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename.
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+
+        return $this->getName();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
new file mode 100755
index 0000000000..dd0c2e86ed
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * ProxyWrite principal
+ *
+ * This class represents a principal group, hosted under the main principal.
+ * This is needed to implement 'Calendar delegation' support. This class is
+ * instantiated by Sabre_CalDAV_Principal_User.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
+
+    /**
+     * Parent principal information
+     *
+     * @var array
+     */
+    protected $principalInfo;
+
+    /**
+     * Principal Backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the object
+     *
+     * Note that you MUST supply the parent principal information.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param array $principalInfo
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
+
+        $this->principalInfo = $principalInfo;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * Returns this principals name.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return 'calendar-proxy-write';
+
+    }
+
+    /**
+     * Returns the last modification time
+     *
+     * @return null
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Deletes the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    public function getAlternateUriSet() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalInfo['uri'] . '/' . $this->getName();
+
+    }
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $principals
+     * @return void
+     */
+    public function setGroupMemberSet(array $principals) {
+
+        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+
+    }
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename.
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+
+        return $this->getName();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
new file mode 100755
index 0000000000..8453b877a7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/User.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * CalDAV principal
+ *
+ * This is a standard user-principal for CalDAV. This principal is also a
+ * collection and returns the caldav-proxy-read and caldav-proxy-write child
+ * principals.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * @param string $name Name of the file
+     * @param resource $data Initial payload, passed as a readable stream resource.
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/' . $name);
+        if (!$principal) {
+            throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
+        }
+        if ($name === 'calendar-proxy-read')
+            return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
+
+        if ($name === 'calendar-proxy-write')
+            return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
+
+        throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        $r = array();
+        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-read')) {
+            $r[] = new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
+        }
+        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-write')) {
+            $r[] = new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
+        }
+
+        return $r;
+
+    }
+
+    /**
+     * Returns whether or not the child node exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            return false;
+        }
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        $acl = parent::getACL();
+        $acl[] = array(
+            'privilege' => '{DAV:}read',
+            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
+            'protected' => true,
+        );
+        $acl[] = array(
+            'privilege' => '{DAV:}read',
+            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
+            'protected' => true,
+        );
+        return $acl;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
new file mode 100755
index 0000000000..2ea078d7da
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Supported component set property
+ *
+ * This property is a representation of the supported-calendar_component-set
+ * property in the CalDAV namespace. It simply requires an array of components,
+ * such as VEVENT, VTODO
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
+
+    /**
+     * List of supported components, such as "VEVENT, VTODO"
+     *
+     * @var array
+     */
+    private $components;
+
+    /**
+     * Creates the property
+     *
+     * @param array $components
+     */
+    public function __construct(array $components) {
+
+       $this->components = $components;
+
+    }
+
+    /**
+     * Returns the list of supported components
+     *
+     * @return array
+     */
+    public function getValue() {
+
+        return $this->components;
+
+    }
+
+    /**
+     * Serializes the property in a DOMDocument
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+       $doc = $node->ownerDocument;
+       foreach($this->components as $component) {
+
+            $xcomp = $doc->createElement('cal:comp');
+            $xcomp->setAttribute('name',$component);
+            $node->appendChild($xcomp);
+
+       }
+
+    }
+
+    /**
+     * Unserializes the DOMElement back into a Property class.
+     *
+     * @param DOMElement $node
+     * @return Sabre_CalDAV_Property_SupportedCalendarComponentSet
+     */
+    static function unserialize(DOMElement $node) {
+
+        $components = array();
+        foreach($node->childNodes as $childNode) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
+                $components[] = $childNode->getAttribute('name');
+            }
+        }
+        return new self($components);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
new file mode 100755
index 0000000000..1d848dd5cf
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Supported-calendar-data property
+ *
+ * This property is a representation of the supported-calendar-data property
+ * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
+ * so the value is currently hardcoded.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOMDocument
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
+
+        $caldata = $doc->createElement($prefix . ':calendar-data');
+        $caldata->setAttribute('content-type','text/calendar');
+        $caldata->setAttribute('version','2.0');
+
+        $node->appendChild($caldata);
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
new file mode 100755
index 0000000000..24e84d4c17
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * supported-collation-set property
+ *
+ * This property is a representation of the supported-collation-set property
+ * in the CalDAV namespace.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOM document
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
+        if (!$prefix) $prefix = 'cal';
+
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;octet')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
+        );
+
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IMip.php b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
new file mode 100755
index 0000000000..37e75fcc4a
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * iMIP handler.
+ *
+ * This class is responsible for sending out iMIP messages. iMIP is the
+ * email-based transport for iTIP. iTIP deals with scheduling operations for
+ * iCalendar objects.
+ *
+ * If you want to customize the email that gets sent out, you can do so by
+ * extending this class and overriding the sendMessage method.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Schedule_IMip {
+
+    /**
+     * Email address used in From: header.
+     *
+     * @var string
+     */
+    protected $senderEmail;
+
+    /**
+     * Creates the email handler.
+     *
+     * @param string $senderEmail. The 'senderEmail' is the email that shows up
+     *                             in the 'From:' address. This should
+     *                             generally be some kind of no-reply email
+     *                             address you own.
+     */
+    public function __construct($senderEmail) {
+
+        $this->senderEmail = $senderEmail;
+
+    }
+
+    /**
+     * Sends one or more iTip messages through email.
+     *
+     * @param string $originator
+     * @param array $recipients
+     * @param Sabre_VObject_Component $vObject
+     * @return void
+     */
+    public function sendMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
+
+        foreach($recipients as $recipient) {
+
+            $to = $recipient;
+            $replyTo = $originator;
+            $subject = 'SabreDAV iTIP message';
+
+            switch(strtoupper($vObject->METHOD)) {
+                case 'REPLY' :
+                    $subject = 'Response for: ' . $vObject->VEVENT->SUMMARY;
+                    break;
+                case 'REQUEST' :
+                    $subject = 'Invitation for: ' .$vObject->VEVENT->SUMMARY;
+                    break;
+                case 'CANCEL' :
+                    $subject = 'Cancelled event: ' . $vObject->VEVENT->SUMMARY;
+                    break;
+            }
+
+            $headers = array();
+            $headers[] = 'Reply-To: ' . $replyTo;
+            $headers[] = 'From: ' . $this->senderEmail;
+            $headers[] = 'Content-Type: text/calendar; method=' . (string)$vObject->method . '; charset=utf-8';
+            if (Sabre_DAV_Server::$exposeVersion) {
+                $headers[] = 'X-Sabre-Version: ' . Sabre_DAV_Version::VERSION . '-' . Sabre_DAV_Version::STABILITY;
+            }
+
+            $vcalBody = $vObject->serialize();
+
+            $this->mail($to, $subject, $vcalBody, $headers);
+
+        }
+
+    }
+
+    /**
+     * This function is reponsible for sending the actual email.
+     *
+     * @param string $to Recipient email address
+     * @param string $subject Subject of the email
+     * @param string $body iCalendar body
+     * @param array $headers List of headers
+     * @return void
+     */
+    protected function mail($to, $subject, $body, array $headers) {
+
+        mail($to, $subject, $body, implode("\r\n", $headers));
+
+    }
+
+
+}
+
+?>
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
new file mode 100755
index 0000000000..46d77514bc
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Implement this interface to have a node be recognized as a CalDAV scheduling
+ * outbox.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_Schedule_IOutbox extends Sabre_DAV_ICollection, Sabre_DAVACL_IACL {
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/Outbox.php b/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
new file mode 100755
index 0000000000..014c37230d
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * The CalDAV scheduling outbox
+ *
+ * The outbox is mainly used as an endpoint in the tree for a client to do
+ * free-busy requests. This functionality is completely handled by the
+ * Scheduling plugin, so this object is actually mostly static.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Schedule_Outbox extends Sabre_DAV_Directory implements Sabre_CalDAV_Schedule_IOutbox {
+
+    /**
+     * The principal Uri
+     *
+     * @var string
+     */
+    protected $principalUri;
+
+    /**
+     * Constructor
+     *
+     * @param string $principalUri
+     */
+    public function __construct($principalUri) {
+
+        $this->principalUri = $principalUri;
+
+    }
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return 'outbox';
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalUri;
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('You\'re not allowed to update the ACL');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
+        $default['aggregates'][] = array(
+            'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
+        );
+
+        return $default;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
new file mode 100755
index 0000000000..325e3d80a7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Server.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * CalDAV server
+ *
+ * Deprecated! Warning: This class is now officially deprecated
+ *
+ * This script is a convenience script. It quickly sets up a WebDAV server
+ * with caldav and ACL support, and it creates the root 'principals' and
+ * 'calendars' collections.
+ *
+ * Note that if you plan to do anything moderately complex, you are advised to
+ * not subclass this server, but use Sabre_DAV_Server directly instead. This
+ * class is nothing more than an 'easy setup'.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @deprecated Don't use this class anymore, it will be removed in version 1.7.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Server extends Sabre_DAV_Server {
+
+    /**
+     * The authentication realm
+     *
+     * Note that if this changes, the hashes in the auth backend must also
+     * be recalculated.
+     *
+     * @var string
+     */
+    public $authRealm = 'SabreDAV';
+
+    /**
+     * Sets up the object. A PDO object must be passed to setup all the backends.
+     *
+     * @param PDO $pdo
+     */
+    public function __construct(PDO $pdo) {
+
+        /* Backends */
+        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
+        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
+        $principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
+
+        /* Directory structure */
+        $tree = array(
+            new Sabre_CalDAV_Principal_Collection($principalBackend),
+            new Sabre_CalDAV_CalendarRootNode($principalBackend, $calendarBackend),
+        );
+
+        /* Initializing server */
+        parent::__construct($tree);
+
+        /* Server Plugins */
+        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,$this->authRealm);
+        $this->addPlugin($authPlugin);
+
+        $aclPlugin = new Sabre_DAVACL_Plugin();
+        $this->addPlugin($aclPlugin);
+
+        $caldavPlugin = new Sabre_CalDAV_Plugin();
+        $this->addPlugin($caldavPlugin);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
new file mode 100755
index 0000000000..b8d3f0573f
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/UserCalendars.php
@@ -0,0 +1,298 @@
+<?php
+
+/**
+ * The UserCalenders class contains all calendars associated to one user
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * CalDAV backend
+     *
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Principal information
+     *
+     * @var array
+     */
+    protected $principalInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param mixed $userUri
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
+
+        $this->principalBackend = $principalBackend;
+        $this->caldavBackend = $caldavBackend;
+        $this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
+
+    }
+
+    /**
+     * Returns the name of this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
+        return $name;
+
+    }
+
+    /**
+     * Updates the name of this object
+     *
+     * @param string $name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Deletes this object
+     *
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Returns the last modification date
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     *
+     * @param string $filename
+     * @param resource $data
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name
+     *
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CalDAV_Calendar
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_NotFound('Calendar with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Checks if a calendar exists.
+     *
+     * @param string $name
+     * @todo needs optimizing
+     * @return bool
+     */
+    public function childExists($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return true;
+
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a list of calendars
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objs = array();
+        foreach($calendars as $calendar) {
+            $objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
+        }
+        $objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new calendar
+     *
+     * @param string $name
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalInfo['uri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalInfo['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
new file mode 100755
index 0000000000..289a0c83a3
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_CalDAV version constants.
+ *
+ * @package Sabre
+ * @subpackage CalDAV 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/CalDAV/includes.php b/3rdparty/Sabre/CalDAV/includes.php
new file mode 100755
index 0000000000..1ecb870a0e
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/includes.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Sabre_CalDAV includes file
+ *
+ * Including this file will automatically include all files from the
+ * Sabre_CalDAV package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/Backend/Abstract.php';
+include __DIR__ . '/Backend/PDO.php';
+include __DIR__ . '/CalendarQueryParser.php';
+include __DIR__ . '/CalendarQueryValidator.php';
+include __DIR__ . '/CalendarRootNode.php';
+include __DIR__ . '/ICalendar.php';
+include __DIR__ . '/ICalendarObject.php';
+include __DIR__ . '/ICSExportPlugin.php';
+include __DIR__ . '/Plugin.php';
+include __DIR__ . '/Principal/Collection.php';
+include __DIR__ . '/Principal/ProxyRead.php';
+include __DIR__ . '/Principal/ProxyWrite.php';
+include __DIR__ . '/Principal/User.php';
+include __DIR__ . '/Property/SupportedCalendarComponentSet.php';
+include __DIR__ . '/Property/SupportedCalendarData.php';
+include __DIR__ . '/Property/SupportedCollationSet.php';
+include __DIR__ . '/Schedule/IMip.php';
+include __DIR__ . '/Schedule/IOutbox.php';
+include __DIR__ . '/Schedule/Outbox.php';
+include __DIR__ . '/Server.php';
+include __DIR__ . '/UserCalendars.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/Calendar.php';
+include __DIR__ . '/CalendarObject.php';
+// End includes
diff --git a/3rdparty/Sabre/CardDAV/AddressBook.php b/3rdparty/Sabre/CardDAV/AddressBook.php
new file mode 100755
index 0000000000..12297175a8
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBook.php
@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * The AddressBook class represents a CardDAV addressbook, owned by a specific user
+ *
+ * The AddressBook can contain multiple vcards
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * This is an array with addressbook information
+     *
+     * @var array
+     */
+    private $addressBookInfo;
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    private $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param array $addressBookInfo
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+
+    }
+
+    /**
+     * Returns the name of the addressbook
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->addressBookInfo['uri'];
+
+    }
+
+    /**
+     * Returns a card
+     *
+     * @param string $name
+     * @return Sabre_DAV_Card
+     */
+    public function getChild($name) {
+
+        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
+        return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of cards
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in addressbooks.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in addressbooks is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid VCARD.
+     *
+     * This method may return an ETag.
+     *
+     * @param string $name
+     * @param resource $vcardData
+     * @return void|null
+     */
+    public function createFile($name,$vcardData = null) {
+
+        if (is_resource($vcardData)) {
+            $vcardData = stream_get_contents($vcardData);
+        }
+        // Converting to UTF-8, if needed
+        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
+
+        return $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
+
+    }
+
+    /**
+     * Deletes the entire addressbook.
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
+
+    }
+
+    /**
+     * Renames the addressbook
+     *
+     * @param string $newName
+     * @return void
+     */
+    public function setName($newName) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming addressbooks is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     *
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations
+     * @return bool|array
+     */
+    public function updateProperties($mutations) {
+
+        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
+
+    }
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties
+     * @return array
+     */
+    public function getProperties($properties) {
+
+        $response = array();
+        foreach($properties as $propertyName) {
+
+            if (isset($this->addressBookInfo[$propertyName])) {
+
+                $response[$propertyName] = $this->addressBookInfo[$propertyName];
+
+            }
+
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->addressBookInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
new file mode 100755
index 0000000000..46bb8ff18d
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
@@ -0,0 +1,219 @@
+<?php
+
+/**
+ * Parses the addressbook-query report request body.
+ *
+ * Whoever designed this format, and the CalDAV equivalent even more so,
+ * has no feel for design.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBookQueryParser {
+
+    const TEST_ANYOF = 'anyof';
+    const TEST_ALLOF = 'allof';
+
+    /**
+     * List of requested properties the client wanted
+     *
+     * @var array
+     */
+    public $requestedProperties;
+
+    /**
+     * The number of results the client wants
+     *
+     * null means it wasn't specified, which in most cases means 'all results'.
+     *
+     * @var int|null
+     */
+    public $limit;
+
+    /**
+     * List of property filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * Either TEST_ANYOF or TEST_ALLOF
+     *
+     * @var string
+     */
+    public $test;
+
+    /**
+     * DOM Document
+     *
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * DOM XPath object
+     *
+     * @var DOMXPath
+     */
+    protected $xpath;
+
+    /**
+     * Creates the parser
+     *
+     * @param DOMDocument $dom
+     */
+    public function __construct(DOMDocument $dom) {
+
+        $this->dom = $dom;
+
+        $this->xpath = new DOMXPath($dom);
+        $this->xpath->registerNameSpace('card',Sabre_CardDAV_Plugin::NS_CARDDAV);
+
+    }
+
+    /**
+     * Parses the request.
+     *
+     * @return void
+     */
+    public function parse() {
+
+        $filterNode = null;
+
+        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
+        if (is_nan($limit)) $limit = null;
+
+        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
+
+        // According to the CardDAV spec there needs to be exactly 1 filter
+        // element. However, KDE 4.8.2 contains a bug that will encode 0 filter
+        // elements, so this is a workaround for that.
+        //
+        // See: https://bugs.kde.org/show_bug.cgi?id=300047
+        if ($filter->length === 0) {
+            $test = null;
+            $filter = null;
+        } elseif ($filter->length === 1) {
+            $filter = $filter->item(0);
+            $test = $this->xpath->evaluate('string(@test)', $filter);
+        } else {
+            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
+        }
+
+        if (!$test) $test = self::TEST_ANYOF;
+        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
+            throw new Sabre_DAV_Exception_BadRequest('The test attribute must either hold "anyof" or "allof"');
+        }
+
+        $propFilters = array();
+
+        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
+        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
+
+            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
+
+
+        }
+
+        $this->filters = $propFilters;
+        $this->limit = $limit;
+        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
+        $this->test = $test;
+
+    }
+
+    /**
+     * Parses the prop-filter xml element
+     *
+     * @param DOMElement $propFilterNode
+     * @return array
+     */
+    protected function parsePropFilterNode(DOMElement $propFilterNode) {
+
+        $propFilter = array();
+        $propFilter['name'] = $propFilterNode->getAttribute('name');
+        $propFilter['test'] = $propFilterNode->getAttribute('test');
+        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
+
+        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
+
+        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
+
+        $propFilter['param-filters'] = array();
+
+
+        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
+
+            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
+
+        }
+        $propFilter['text-matches'] = array();
+        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
+
+        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
+
+            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
+
+        }
+
+        return $propFilter;
+
+    }
+
+    /**
+     * Parses the param-filter element
+     *
+     * @param DOMElement $paramFilterNode
+     * @return array
+     */
+    public function parseParamFilterNode(DOMElement $paramFilterNode) {
+
+        $paramFilter = array();
+        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
+        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
+        $paramFilter['text-match'] = null;
+
+        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
+        if ($textMatch->length>0) {
+            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
+        }
+
+        return $paramFilter;
+
+    }
+
+    /**
+     * Text match
+     *
+     * @param DOMElement $textMatchNode
+     * @return array
+     */
+    public function parseTextMatchNode(DOMElement $textMatchNode) {
+
+        $matchType = $textMatchNode->getAttribute('match-type');
+        if (!$matchType) $matchType = 'contains';
+
+        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
+            throw new Sabre_DAV_Exception_BadRequest('Unknown match-type: ' . $matchType);
+        }
+
+        $negateCondition = $textMatchNode->getAttribute('negate-condition');
+        $negateCondition = $negateCondition==='yes';
+        $collation = $textMatchNode->getAttribute('collation');
+        if (!$collation) $collation = 'i;unicode-casemap';
+
+        return array(
+            'negate-condition' => $negateCondition,
+            'collation' => $collation,
+            'match-type' => $matchType,
+            'value' => $textMatchNode->nodeValue
+        );
+
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
new file mode 100755
index 0000000000..9d37b15f08
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * AddressBook rootnode
+ *
+ * This object lists a collection of users, which can contain addressbooks.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * Principal Backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    protected $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * This constructor needs both a principal and a carddav backend.
+     *
+     * By default this class will show a list of addressbook collections for
+     * principals in the 'principals' collection. If your main principals are
+     * actually located in a different path, use the $principalPrefix argument
+     * to override this.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalPrefix = 'principals') {
+
+        $this->carddavBackend = $carddavBackend;
+        parent::__construct($principalBackend, $principalPrefix);
+
+    }
+
+    /**
+     * Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return Sabre_CardDAV_Plugin::ADDRESSBOOK_ROOT;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return Sabre_DAV_INode
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Backend/Abstract.php b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
new file mode 100755
index 0000000000..e4806b7161
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Abstract Backend class
+ *
+ * This class serves as a base-class for addressbook backends
+ *
+ * Note that there are references to 'addressBookId' scattered throughout the
+ * class. The value of the addressBookId is completely up to you, it can be any
+ * arbitrary value you can use as an unique identifier.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CardDAV_Backend_Abstract {
+
+    /**
+     * Returns the list of addressbooks for a specific user.
+     *
+     * Every addressbook should have the following properties:
+     *   id - an arbitrary unique id
+     *   uri - the 'basename' part of the url
+     *   principaluri - Same as the passed parameter
+     *
+     * Any additional clark-notation property may be passed besides this. Some
+     * common ones are :
+     *   {DAV:}displayname
+     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
+     *   {http://calendarserver.org/ns/}getctag
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public abstract function getAddressBooksForUser($principalUri);
+
+    /**
+     * Updates an addressbook's properties
+     *
+     * See Sabre_DAV_IProperties for a description of the mutations array, as
+     * well as the return value.
+     *
+     * @param mixed $addressBookId
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public abstract function updateAddressBook($addressBookId, array $mutations);
+
+    /**
+     * Creates a new address book
+     *
+     * @param string $principalUri
+     * @param string $url Just the 'basename' of the url.
+     * @param array $properties
+     * @return void
+     */
+    abstract public function createAddressBook($principalUri, $url, array $properties);
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param mixed $addressBookId
+     * @return void
+     */
+    abstract public function deleteAddressBook($addressBookId);
+
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also ommit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
+    public abstract function getCards($addressbookId);
+
+    /**
+     * Returns a specfic card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
+    public abstract function getCard($addressBookId, $cardUri);
+
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    abstract public function createCard($addressBookId, $cardUri, $cardData);
+
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    abstract public function updateCard($addressBookId, $cardUri, $cardData);
+
+    /**
+     * Deletes a card
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return bool
+     */
+    abstract public function deleteCard($addressBookId, $cardUri);
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Backend/PDO.php b/3rdparty/Sabre/CardDAV/Backend/PDO.php
new file mode 100755
index 0000000000..413a77f3bc
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Backend/PDO.php
@@ -0,0 +1,330 @@
+<?php
+
+/**
+ * PDO CardDAV backend
+ *
+ * This CardDAV backend uses PDO to store addressbooks
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
+
+    /**
+     * PDO connection
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * The PDO table name used to store addressbooks
+     */
+    protected $addressBooksTableName;
+
+    /**
+     * The PDO table name used to store cards
+     */
+    protected $cardsTableName;
+
+    /**
+     * Sets up the object
+     *
+     * @param PDO $pdo
+     * @param string $addressBooksTableName
+     * @param string $cardsTableName
+     */
+    public function __construct(PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
+
+        $this->pdo = $pdo;
+        $this->addressBooksTableName = $addressBooksTableName;
+        $this->cardsTableName = $cardsTableName;
+
+    }
+
+    /**
+     * Returns the list of addressbooks for a specific user.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getAddressBooksForUser($principalUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM '.$this->addressBooksTableName.' WHERE principaluri = ?');
+        $stmt->execute(array($principalUri));
+
+        $addressBooks = array();
+
+        foreach($stmt->fetchAll() as $row) {
+
+            $addressBooks[] = array(
+                'id'  => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{DAV:}displayname' => $row['displayname'],
+                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
+                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
+                    new Sabre_CardDAV_Property_SupportedAddressData(),
+            );
+
+        }
+
+        return $addressBooks;
+
+    }
+
+
+    /**
+     * Updates an addressbook's properties
+     *
+     * See Sabre_DAV_IProperties for a description of the mutations array, as
+     * well as the return value.
+     *
+     * @param mixed $addressBookId
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateAddressBook($addressBookId, array $mutations) {
+
+        $updates = array();
+
+        foreach($mutations as $property=>$newValue) {
+
+            switch($property) {
+                case '{DAV:}displayname' :
+                    $updates['displayname'] = $newValue;
+                    break;
+                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+                    $updates['description'] = $newValue;
+                    break;
+                default :
+                    // If any unsupported values were being updated, we must
+                    // let the entire request fail.
+                    return false;
+            }
+
+        }
+
+        // No values are being updated?
+        if (!$updates) {
+            return false;
+        }
+
+        $query = 'UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 ';
+        foreach($updates as $key=>$value) {
+            $query.=', `' . $key . '` = :' . $key . ' ';
+        }
+        $query.=' WHERE id = :addressbookid';
+
+        $stmt = $this->pdo->prepare($query);
+        $updates['addressbookid'] = $addressBookId;
+
+        $stmt->execute($updates);
+
+        return true;
+
+    }
+
+    /**
+     * Creates a new address book
+     *
+     * @param string $principalUri
+     * @param string $url Just the 'basename' of the url.
+     * @param array $properties
+     * @return void
+     */
+    public function createAddressBook($principalUri, $url, array $properties) {
+
+        $values = array(
+            'displayname' => null,
+            'description' => null,
+            'principaluri' => $principalUri,
+            'uri' => $url,
+        );
+
+        foreach($properties as $property=>$newValue) {
+
+            switch($property) {
+                case '{DAV:}displayname' :
+                    $values['displayname'] = $newValue;
+                    break;
+                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+                    $values['description'] = $newValue;
+                    break;
+                default :
+                    throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
+            }
+
+        }
+
+        $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($values);
+
+    }
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param int $addressBookId
+     * @return void
+     */
+    public function deleteAddressBook($addressBookId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
+        $stmt->execute(array($addressBookId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
+        $stmt->execute(array($addressBookId));
+
+    }
+
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also ommit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
+    public function getCards($addressbookId) {
+
+        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
+        $stmt->execute(array($addressbookId));
+
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+
+    }
+
+    /**
+     * Returns a specfic card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
+    public function getCard($addressBookId, $cardUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ? LIMIT 1');
+        $stmt->execute(array($addressBookId, $cardUri));
+
+        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        return (count($result)>0?$result[0]:false);
+
+    }
+
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    public function createCard($addressBookId, $cardUri, $cardData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
+
+        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
+
+        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return '"' . md5($cardData) . '"';
+
+    }
+
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    public function updateCard($addressBookId, $cardUri, $cardData) {
+
+        $stmt = $this->pdo->prepare('UPDATE ' . $this->cardsTableName . ' SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
+        $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
+
+        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return '"' . md5($cardData) . '"';
+
+    }
+
+    /**
+     * Deletes a card
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return bool
+     */
+    public function deleteCard($addressBookId, $cardUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ?');
+        $stmt->execute(array($addressBookId, $cardUri));
+
+        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return $stmt->rowCount()===1;
+
+    }
+}
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
new file mode 100755
index 0000000000..d7c6633383
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Card.php
@@ -0,0 +1,250 @@
+<?php
+
+/**
+ * The Card object represents a single Card from an addressbook
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    private $carddavBackend;
+
+    /**
+     * Array with information about this Card
+     *
+     * @var array
+     */
+    private $cardData;
+
+    /**
+     * Array with information about the containing addressbook
+     *
+     * @var array
+     */
+    private $addressBookInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param array $addressBookInfo
+     * @param array $cardData
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo,array $cardData) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+        $this->cardData = $cardData;
+
+    }
+
+    /**
+     * Returns the uri for this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->cardData['uri'];
+
+    }
+
+    /**
+     * Returns the VCard-formatted object
+     *
+     * @return string
+     */
+    public function get() {
+
+        // Pre-populating 'carddata' is optional. If we don't yet have it
+        // already, we fetch it from the backend.
+        if (!isset($this->cardData['carddata'])) {
+            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
+        }
+        return $this->cardData['carddata'];
+
+    }
+
+    /**
+     * Updates the VCard-formatted object
+     *
+     * @param string $cardData
+     * @return void
+     */
+    public function put($cardData) {
+
+        if (is_resource($cardData))
+            $cardData = stream_get_contents($cardData);
+
+        // Converting to UTF-8, if needed
+        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
+
+        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
+        $this->cardData['carddata'] = $cardData;
+        $this->cardData['etag'] = $etag;
+
+        return $etag;
+
+    }
+
+    /**
+     * Deletes the card
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type
+     *
+     * @return string
+     */
+    public function getContentType() {
+
+        return 'text/x-vcard';
+
+    }
+
+    /**
+     * Returns an ETag for this object
+     *
+     * @return string
+     */
+    public function getETag() {
+
+        if (isset($this->cardData['etag'])) {
+            return $this->cardData['etag'];
+        } else {
+            return '"' . md5($this->get()) . '"';
+        }
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     *
+     * @return time
+     */
+    public function getLastModified() {
+
+        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
+
+    }
+
+    /**
+     * Returns the size of this object in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        if (array_key_exists('size', $this->cardData)) {
+            return $this->cardData['size'];
+        } else {
+            return strlen($this->get());
+        }
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->addressBookInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
new file mode 100755
index 0000000000..2bc275bcf7
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/IAddressBook.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * AddressBook interface
+ *
+ * Implement this interface to allow a node to be recognized as an addressbook.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
+
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
new file mode 100755
index 0000000000..a17299316c
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/ICard.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Card interface
+ *
+ * Extend the ICard interface to allow your custom nodes to be picked up as
+ * 'Cards'.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_ICard extends Sabre_DAV_IFile {
+
+}
+
diff --git a/3rdparty/Sabre/CardDAV/IDirectory.php b/3rdparty/Sabre/CardDAV/IDirectory.php
new file mode 100755
index 0000000000..22d4afeb24
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/IDirectory.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * IDirectory interface
+ *
+ * Implement this interface to have an addressbook marked as a 'directory'. A
+ * directory is an (often) global addressbook.
+ *
+ * A full description can be found in the IETF draft:
+ *   - draft-daboo-carddav-directory-gateway
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
new file mode 100755
index 0000000000..ca20e46849
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -0,0 +1,666 @@
+<?php
+
+/**
+ * CardDAV plugin
+ *
+ * The CardDAV plugin adds CardDAV functionality to the WebDAV server
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Url to the addressbooks
+     */
+    const ADDRESSBOOK_ROOT = 'addressbooks';
+
+    /**
+     * xml namespace for CardDAV elements
+     */
+    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
+
+    /**
+     * Add urls to this property to have them automatically exposed as
+     * 'directories' to the user.
+     *
+     * @var array
+     */
+    public $directories = array();
+
+    /**
+     * Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        /* Events */
+        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
+        $server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
+        $server->subscribeEvent('report', array($this,'report'));
+        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
+        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
+        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
+        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
+
+        /* Namespaces */
+        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
+
+        /* Mapping Interfaces to {DAV:}resourcetype values */
+        $server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
+        $server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
+
+        /* Adding properties that may never be changed */
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
+
+        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre_DAV_Property_Href';
+
+        $this->server = $server;
+
+    }
+
+    /**
+     * Returns a list of supported features.
+     *
+     * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('addressbook');
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_CardDAV_IAddressBook || $node instanceof Sabre_CardDAV_ICard) {
+            return array(
+                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
+                 '{' . self::NS_CARDDAV . '}addressbook-query',
+            );
+        }
+        return array();
+
+    }
+
+
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param string $path
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @return void
+     */
+    public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) {
+
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            // calendar-home-set property
+            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
+            if (in_array($addHome,$requestedProperties)) {
+                $principalId = $node->getName();
+                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
+                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
+                $returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
+            }
+
+            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
+            if ($this->directories && in_array($directories, $requestedProperties)) {
+                unset($requestedProperties[array_search($directories, $requestedProperties)]);
+                $returnedProperties[200][$directories] = new Sabre_DAV_Property_HrefList($this->directories);
+            }
+
+        }
+
+        if ($node instanceof Sabre_CardDAV_ICard) {
+
+            // The address-data property is not supposed to be a 'real'
+            // property, but in large chunks of the spec it does act as such.
+            // Therefore we simply expose it as a property.
+            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
+            if (in_array($addressDataProp, $requestedProperties)) {
+                unset($requestedProperties[$addressDataProp]);
+                $val = $node->get();
+                if (is_resource($val))
+                    $val = stream_get_contents($val);
+
+                // Taking out \r to not screw up the xml output
+                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+
+            }
+        }
+
+        if ($node instanceof Sabre_CardDAV_UserAddressBooks) {
+
+            $meCardProp = '{http://calendarserver.org/ns/}me-card';
+            if (in_array($meCardProp, $requestedProperties)) {
+
+                $props = $this->server->getProperties($node->getOwner(), array('{http://sabredav.org/ns}vcard-url'));
+                if (isset($props['{http://sabredav.org/ns}vcard-url'])) {
+
+                    $returnedProperties[200][$meCardProp] = new Sabre_DAV_Property_Href(
+                        $props['{http://sabredav.org/ns}vcard-url']
+                    );
+                    $pos = array_search($meCardProp, $requestedProperties);
+                    unset($requestedProperties[$pos]);
+
+                }
+
+            }
+
+        }
+
+    }
+
+    /**
+     * This event is triggered when a PROPPATCH method is executed
+     *
+     * @param array $mutations
+     * @param array $result
+     * @param Sabre_DAV_INode $node
+     * @return void
+     */
+    public function updateProperties(&$mutations, &$result, $node) {
+
+        if (!$node instanceof Sabre_CardDAV_UserAddressBooks) {
+            return true;
+        }
+
+        $meCard = '{http://calendarserver.org/ns/}me-card';
+
+        // The only property we care about
+        if (!isset($mutations[$meCard]))
+            return true;
+
+        $value = $mutations[$meCard];
+        unset($mutations[$meCard]);
+
+        if ($value instanceof Sabre_DAV_Property_IHref) {
+            $value = $value->getHref();
+            $value = $this->server->calculateUri($value);
+        } elseif (!is_null($value)) {
+            $result[400][$meCard] = null;
+            return false;
+        }
+
+        $innerResult = $this->server->updateProperties(
+            $node->getOwner(),
+            array(
+                '{http://sabredav.org/ns}vcard-url' => $value,
+            )
+        );
+
+        $closureResult = false;
+        foreach($innerResult as $status => $props) {
+            if (is_array($props) && array_key_exists('{http://sabredav.org/ns}vcard-url', $props)) {
+                $result[$status][$meCard] = null;
+                $closureResult = ($status>=200 && $status<300);
+            }
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CardDAV
+     *
+     * @param string $reportName
+     * @param DOMNode $dom
+     * @return bool
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) {
+            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
+                $this->addressbookMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CARDDAV.'}addressbook-query' :
+                $this->addressBookQueryReport($dom);
+                return false;
+            default :
+                return;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the addressbook-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function addressbookMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+        $propertyList = array();
+
+        foreach($hrefElems as $elem) {
+
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This method is triggered before a file gets updated with new content.
+     *
+     * This plugin uses this method to ensure that Card nodes receive valid
+     * vcard data.
+     *
+     * @param string $path
+     * @param Sabre_DAV_IFile $node
+     * @param resource $data
+     * @return void
+     */
+    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
+
+        if (!$node instanceof Sabre_CardDAV_ICard)
+            return;
+
+        $this->validateVCard($data);
+
+    }
+
+    /**
+     * This method is triggered before a new file is created.
+     *
+     * This plugin uses this method to ensure that Card nodes receive valid
+     * vcard data.
+     *
+     * @param string $path
+     * @param resource $data
+     * @param Sabre_DAV_ICollection $parentNode
+     * @return void
+     */
+    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
+
+        if (!$parentNode instanceof Sabre_CardDAV_IAddressBook)
+            return;
+
+        $this->validateVCard($data);
+
+    }
+
+    /**
+     * Checks if the submitted iCalendar data is in fact, valid.
+     *
+     * An exception is thrown if it's not.
+     *
+     * @param resource|string $data
+     * @return void
+     */
+    protected function validateVCard(&$data) {
+
+        // If it's a stream, we convert it to a string first.
+        if (is_resource($data)) {
+            $data = stream_get_contents($data);
+        }
+
+        // Converting the data to unicode, if needed.
+        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
+
+        try {
+
+            $vobj = Sabre_VObject_Reader::read($data);
+
+        } catch (Sabre_VObject_ParseException $e) {
+
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
+
+        }
+
+        if ($vobj->name !== 'VCARD') {
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support vcard objects.');
+        }
+
+    }
+
+
+    /**
+     * This function handles the addressbook-query REPORT
+     *
+     * This report is used by the client to filter an addressbook based on a
+     * complex query.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    protected function addressbookQueryReport($dom) {
+
+        $query = new Sabre_CardDAV_AddressBookQueryParser($dom);
+        $query->parse();
+
+        $depth = $this->server->getHTTPDepth(0);
+
+        if ($depth==0) {
+            $candidateNodes = array(
+                $this->server->tree->getNodeForPath($this->server->getRequestUri())
+            );
+        } else {
+            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
+        }
+
+        $validNodes = array();
+        foreach($candidateNodes as $node) {
+
+            if (!$node instanceof Sabre_CardDAV_ICard)
+                continue;
+
+            $blob = $node->get();
+            if (is_resource($blob)) {
+                $blob = stream_get_contents($blob);
+            }
+
+            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
+                continue;
+            }
+
+            $validNodes[] = $node;
+
+            if ($query->limit && $query->limit <= count($validNodes)) {
+                // We hit the maximum number of items, we can stop now.
+                break;
+            }
+
+        }
+
+        $result = array();
+        foreach($validNodes as $validNode) {
+
+            if ($depth==0) {
+                $href = $this->server->getRequestUri();
+            } else {
+                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
+            }
+
+            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
+
+    }
+
+    /**
+     * Validates if a vcard makes it throught a list of filters.
+     *
+     * @param string $vcardData
+     * @param array $filters
+     * @param string $test anyof or allof (which means OR or AND)
+     * @return bool
+     */
+    public function validateFilters($vcardData, array $filters, $test) {
+
+        $vcard = Sabre_VObject_Reader::read($vcardData);
+
+        if (!$filters) return true;
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($vcard->{$filter['name']});
+            if ($filter['is-not-defined']) {
+                if ($isDefined) {
+                    $success = false;
+                } else {
+                    $success = true;
+                }
+            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
+
+                // We only need to check for existence
+                $success = $isDefined;
+
+            } else {
+
+                $vProperties = $vcard->select($filter['name']);
+
+                $results = array();
+                if ($filter['param-filters']) {
+                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
+                }
+                if ($filter['text-matches']) {
+                    $texts = array();
+                    foreach($vProperties as $vProperty)
+                        $texts[] = $vProperty->value;
+
+                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
+                }
+
+                if (count($results)===1) {
+                    $success = $results[0];
+                } else {
+                    if ($filter['test'] === 'anyof') {
+                        $success = $results[0] || $results[1];
+                    } else {
+                        $success = $results[0] && $results[1];
+                    }
+                }
+
+            } // else
+
+            // There are two conditions where we can already determine whether
+            // or not this filter succeeds.
+            if ($test==='anyof' && $success) {
+                return true;
+            }
+            if ($test==='allof' && !$success) {
+                return false;
+            }
+
+        } // foreach
+
+        // If we got all the way here, it means we haven't been able to
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * Validates if a param-filter can be applied to a specific property.
+     *
+     * @todo currently we're only validating the first parameter of the passed
+     *       property. Any subsequence parameters with the same name are
+     *       ignored.
+     * @param array $vProperties
+     * @param array $filters
+     * @param string $test
+     * @return bool
+     */
+    protected function validateParamFilters(array $vProperties, array $filters, $test) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = false;
+            foreach($vProperties as $vProperty) {
+                $isDefined = isset($vProperty[$filter['name']]);
+                if ($isDefined) break;
+            }
+
+            if ($filter['is-not-defined']) {
+                if ($isDefined) {
+                    $success = false;
+                } else {
+                    $success = true;
+                }
+
+            // If there's no text-match, we can just check for existence
+            } elseif (!$filter['text-match'] || !$isDefined) {
+
+                $success = $isDefined;
+
+            } else {
+
+                $success = false;
+                foreach($vProperties as $vProperty) {
+                    // If we got all the way here, we'll need to validate the
+                    // text-match filter.
+                    $success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
+                    if ($success) break;
+                }
+                if ($filter['text-match']['negate-condition']) {
+                    $success = !$success;
+                }
+
+            } // else
+
+            // There are two conditions where we can already determine whether
+            // or not this filter succeeds.
+            if ($test==='anyof' && $success) {
+                return true;
+            }
+            if ($test==='allof' && !$success) {
+                return false;
+            }
+
+        }
+
+        // If we got all the way here, it means we haven't been able to
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * Validates if a text-filter can be applied to a specific property.
+     *
+     * @param array $texts
+     * @param array $filters
+     * @param string $test
+     * @return bool
+     */
+    protected function validateTextMatches(array $texts, array $filters, $test) {
+
+        foreach($filters as $filter) {
+
+            $success = false;
+            foreach($texts as $haystack) {
+                $success = Sabre_DAV_StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
+
+                // Breaking on the first match
+                if ($success) break;
+            }
+            if ($filter['negate-condition']) {
+                $success = !$success;
+            }
+
+            if ($success && $test==='anyof')
+                return true;
+
+            if (!$success && $test=='allof')
+                return false;
+
+
+        }
+
+        // If we got all the way here, it means we haven't been able to
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * This method is used to generate HTML output for the
+     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
+     * can use to create new calendars.
+     *
+     * @param Sabre_DAV_INode $node
+     * @param string $output
+     * @return bool
+     */
+    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+        if (!$node instanceof Sabre_CardDAV_UserAddressBooks)
+            return;
+
+        $output.= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Create new address book</h3>
+            <input type="hidden" name="sabreAction" value="mkaddressbook" />
+            <label>Name (uri):</label> <input type="text" name="name" /><br />
+            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
+            <input type="submit" value="create" />
+            </form>
+            </td></tr>';
+
+        return false;
+
+    }
+
+    /**
+     * This method allows us to intercept the 'mkcalendar' sabreAction. This
+     * action enables the user to create new calendars from the browser plugin.
+     *
+     * @param string $uri
+     * @param string $action
+     * @param array $postVars
+     * @return bool
+     */
+    public function browserPostAction($uri, $action, array $postVars) {
+
+        if ($action!=='mkaddressbook')
+            return;
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:carddav}addressbook');
+        $properties = array();
+        if (isset($postVars['{DAV:}displayname'])) {
+            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
+        }
+        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
new file mode 100755
index 0000000000..36d9306e7a
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Supported-address-data property
+ *
+ * This property is a representation of the supported-address-data property
+ * in the CardDAV namespace.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
+
+    /**
+     * supported versions
+     *
+     * @var array
+     */
+    protected $supportedData = array();
+
+    /**
+     * Creates the property
+     *
+     * @param array|null $supportedData
+     */
+    public function __construct(array $supportedData = null) {
+
+        if (is_null($supportedData)) {
+            $supportedData = array(
+                array('contentType' => 'text/vcard', 'version' => '3.0'),
+                array('contentType' => 'text/vcard', 'version' => '4.0'),
+            );
+        }
+
+       $this->supportedData = $supportedData;
+
+    }
+
+    /**
+     * Serializes the property in a DOMDocument
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix =
+            isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
+            $server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
+            'card';
+
+        foreach($this->supportedData as $supported) {
+
+            $caldata = $doc->createElementNS(Sabre_CardDAV_Plugin::NS_CARDDAV, $prefix . ':address-data-type');
+            $caldata->setAttribute('content-type',$supported['contentType']);
+            $caldata->setAttribute('version',$supported['version']);
+            $node->appendChild($caldata);
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
new file mode 100755
index 0000000000..3f11fb1123
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * UserAddressBooks class
+ *
+ * The UserAddressBooks collection contains a list of addressbooks associated with a user
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+
+    /**
+     * Principal uri
+     *
+     * @var array
+     */
+    protected $principalUri;
+
+    /**
+     * carddavBackend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    protected $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param string $principalUri
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->principalUri = $principalUri;
+
+    }
+
+    /**
+     * Returns the name of this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
+        return $name;
+
+    }
+
+    /**
+     * Updates the name of this object
+     *
+     * @param string $name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed();
+
+    }
+
+    /**
+     * Deletes this object
+     *
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed();
+
+    }
+
+    /**
+     * Returns the last modification date
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     *
+     * @param string $filename
+     * @param resource $data
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name
+     *
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CardDAV_AddressBook
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_NotFound('Addressbook with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Returns a list of addressbooks
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
+        $objs = array();
+        foreach($addressbooks as $addressbook) {
+            $objs[] = new Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
+        }
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new addressbook
+     *
+     * @param string $name
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{'.Sabre_CardDAV_Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalUri;
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalUri,
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalUri,
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
new file mode 100755
index 0000000000..d0623f0d3e
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Version.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Version Class
+ *
+ * This class contains the Sabre_CardDAV version information
+ *
+ * @package Sabre
+ * @subpackage CardDAV 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/CardDAV/includes.php b/3rdparty/Sabre/CardDAV/includes.php
new file mode 100755
index 0000000000..c3b8c04b07
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/includes.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_CardDAV includes file
+ *
+ * Including this file will automatically include all files from the
+ * Sabre_CardDAV package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/AddressBookQueryParser.php';
+include __DIR__ . '/AddressBookRoot.php';
+include __DIR__ . '/Backend/Abstract.php';
+include __DIR__ . '/Backend/PDO.php';
+include __DIR__ . '/IAddressBook.php';
+include __DIR__ . '/ICard.php';
+include __DIR__ . '/IDirectory.php';
+include __DIR__ . '/Plugin.php';
+include __DIR__ . '/Property/SupportedAddressData.php';
+include __DIR__ . '/UserAddressBooks.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/AddressBook.php';
+include __DIR__ . '/Card.php';
+// End includes
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
new file mode 100755
index 0000000000..1e89b84f9a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * HTTP Basic authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Basic
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the validateUserPass method.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author James David Low (http://jameslow.com/)
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * This variable holds the currently logged in username.
+     *
+     * @var string|null
+     */
+    protected $currentUser;
+
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     */
+    abstract protected function validateUserPass($username, $password);
+
+    /**
+     * Returns information about the currently logged in username.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+        return $this->currentUser;
+    }
+
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server, $realm) {
+
+        $auth = new Sabre_HTTP_BasicAuth();
+        $auth->setHTTPRequest($server->httpRequest);
+        $auth->setHTTPResponse($server->httpResponse);
+        $auth->setRealm($realm);
+        $userpass = $auth->getUserPass();
+        if (!$userpass) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
+        }
+
+        // Authenticates the user
+        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
+        }
+        $this->currentUser = $userpass[0];
+        return true;
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
new file mode 100755
index 0000000000..9833928b97
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * HTTP Digest authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Digest
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the getDigestHash method
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * This variable holds the currently logged in username.
+     *
+     * @var array|null
+     */
+    protected $currentUser;
+
+    /**
+     * Returns a users digest hash based on the username and realm.
+     *
+     * If the user was not known, null must be returned.
+     *
+     * @param string $realm
+     * @param string $username
+     * @return string|null
+     */
+    abstract public function getDigestHash($realm, $username);
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server, $realm) {
+
+        $digest = new Sabre_HTTP_DigestAuth();
+
+        // Hooking up request and response objects
+        $digest->setHTTPRequest($server->httpRequest);
+        $digest->setHTTPResponse($server->httpResponse);
+
+        $digest->setRealm($realm);
+        $digest->init();
+
+        $username = $digest->getUsername();
+
+        // No username was given
+        if (!$username) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
+        }
+
+        $hash = $this->getDigestHash($realm, $username);
+        // If this was false, the user account didn't exist
+        if ($hash===false || is_null($hash)) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
+        }
+        if (!is_string($hash)) {
+            throw new Sabre_DAV_Exception('The returned value from getDigestHash must be a string or null');
+        }
+
+        // If this was false, the password or part of the hash was incorrect.
+        if (!$digest->validateA1($hash)) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
+        }
+
+        $this->currentUser = $username;
+        return true;
+
+    }
+
+    /**
+     * Returns the currently logged in username.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+
+        return $this->currentUser;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
new file mode 100755
index 0000000000..d4294ea4d8
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Apache authenticator
+ *
+ * This authentication backend assumes that authentication has been
+ * configured in apache, rather than within SabreDAV.
+ *
+ * Make sure apache is properly configured for this to work.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * Current apache user
+     *
+     * @var string
+     */
+    protected $remoteUser;
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server, $realm) {
+
+        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
+        if (is_null($remoteUser)) {
+            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
+        }
+
+        $this->remoteUser = $remoteUser;
+        return true;
+
+    }
+
+    /**
+     * Returns information about the currently logged in user.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return array|null
+     */
+    public function getCurrentUser() {
+
+        return $this->remoteUser;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
new file mode 100755
index 0000000000..de308d64a6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/File.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * List of users
+     *
+     * @var array
+     */
+    protected $users = array();
+
+    /**
+     * Creates the backend object.
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     *
+     * @param string|null $filename
+     */
+    public function __construct($filename=null) {
+
+        if (!is_null($filename))
+            $this->loadFile($filename);
+
+    }
+
+    /**
+     * Loads an htdigest-formatted file. This method can be called multiple times if
+     * more than 1 file is used.
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function loadFile($filename) {
+
+        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
+
+            if (substr_count($line, ":") !== 2)
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
+
+            list($username,$realm,$A1) = explode(':',$line);
+
+            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
+
+            $this->users[$realm . ':' . $username] = $A1;
+
+        }
+
+    }
+
+    /**
+     * Returns a users' information
+     *
+     * @param string $realm
+     * @param string $username
+     * @return string
+     */
+    public function getDigestHash($realm, $username) {
+
+        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
new file mode 100755
index 0000000000..eac18a23fb
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * Reference to PDO connection
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * PDO table name we'll be using
+     *
+     * @var string
+     */
+    protected $tableName;
+
+
+    /**
+     * Creates the backend object.
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     *
+     * @param PDO $pdo
+     * @param string $tableName The PDO table name to use
+     */
+    public function __construct(PDO $pdo, $tableName = 'users') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+
+    }
+
+    /**
+     * Returns the digest hash for a user.
+     *
+     * @param string $realm
+     * @param string $username
+     * @return string|null
+     */
+    public function getDigestHash($realm,$username) {
+
+        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?');
+        $stmt->execute(array($username));
+        $result = $stmt->fetchAll();
+
+        if (!count($result)) return;
+
+        return $result[0]['digesta1'];
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
new file mode 100755
index 0000000000..5be5d1bc93
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/IBackend.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This is the base class for any authentication object.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Auth_IBackend {
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @return bool
+     */
+    function authenticate(Sabre_DAV_Server $server,$realm);
+
+    /**
+     * Returns information about the currently logged in username.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return string|null
+     */
+    function getCurrentUser();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
new file mode 100755
index 0000000000..55a4e39167
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Plugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * This plugin provides Authentication for a WebDAV server.
+ *
+ * It relies on a Backend object, which provides user information.
+ *
+ * Additionally, it provides support for:
+ *  * {DAV:}current-user-principal property from RFC5397
+ *  * {DAV:}principal-collection-set property from RFC3744
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to main server object
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Authentication backend
+     *
+     * @var Sabre_DAV_Auth_IBackend
+     */
+    private $authBackend;
+
+    /**
+     * The authentication realm.
+     *
+     * @var string
+     */
+    private $realm;
+
+    /**
+     * __construct
+     *
+     * @param Sabre_DAV_Auth_IBackend $authBackend
+     * @param string $realm
+     */
+    public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
+
+        $this->authBackend = $authBackend;
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Initializes the plugin. This function is automatically called by the server
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'auth';
+
+    }
+
+    /**
+     * Returns the current users' principal uri.
+     *
+     * If nobody is logged in, this will return null.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+
+        $userInfo = $this->authBackend->getCurrentUser();
+        if (!$userInfo) return null;
+
+        return $userInfo;
+
+    }
+
+    /**
+     * This method is called before any HTTP method and forces users to be authenticated
+     *
+     * @param string $method
+     * @param string $uri
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        $this->authBackend->authenticate($this->server,$this->realm);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
new file mode 100755
index 0000000000..b6c00d461c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * GuessContentType plugin
+ *
+ * A lot of the built-in File objects just return application/octet-stream
+ * as a content-type by default. This is a problem for some clients, because
+ * they expect a correct contenttype.
+ *
+ * There's really no accurate, fast and portable way to determine the contenttype
+ * so this extension does what the rest of the world does, and guesses it based
+ * on the file extension.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * List of recognized file extensions
+     *
+     * Feel free to add more
+     *
+     * @var array
+     */
+    public $extensionMap = array(
+
+        // images
+        'jpg' => 'image/jpeg',
+        'gif' => 'image/gif',
+        'png' => 'image/png',
+
+        // groupware
+        'ics' => 'text/calendar',
+        'vcf' => 'text/x-vcard',
+
+        // text
+        'txt' => 'text/plain',
+
+    );
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        // Using a relatively low priority (200) to allow other extensions
+        // to set the content-type first.
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
+
+    }
+
+    /**
+     * Handler for teh afterGetProperties event
+     *
+     * @param string $path
+     * @param array $properties
+     * @return void
+     */
+    public function afterGetProperties($path, &$properties) {
+
+        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
+
+            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
+            $contentType = $this->getContentType($fileName);
+
+            if ($contentType) {
+                $properties[200]['{DAV:}getcontenttype'] = $contentType;
+                unset($properties[404]['{DAV:}getcontenttype']);
+            }
+
+        }
+
+    }
+
+    /**
+     * Simple method to return the contenttype
+     *
+     * @param string $fileName
+     * @return string
+     */
+    protected function getContentType($fileName) {
+
+        // Just grabbing the extension
+        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
+        if (isset($this->extensionMap[$extension]))
+            return $this->extensionMap[$extension];
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
new file mode 100755
index 0000000000..1588488764
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * This is a simple plugin that will map any GET request for non-files to
+ * PROPFIND allprops-requests.
+ *
+ * This should allow easy debugging of PROPFIND
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * reference to server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin and subscribes to events
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+    }
+
+    /**
+     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method!='GET') return true;
+
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_DAV_IFile) return;
+
+        $this->server->invokeMethod('PROPFIND',$uri);
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
new file mode 100755
index 0000000000..09bbdd2ae0
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/Plugin.php
@@ -0,0 +1,489 @@
+<?php
+
+/**
+ * Browser Plugin
+ *
+ * This plugin provides a html representation, so that a WebDAV server may be accessed
+ * using a browser.
+ *
+ * The class intercepts GET requests to collection resources and generates a simple
+ * html index.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * List of default icons for nodes.
+     *
+     * This is an array with class / interface names as keys, and asset names
+     * as values.
+     *
+     * The evaluation order is reversed. The last item in the list gets
+     * precendence.
+     *
+     * @var array
+     */
+    public $iconMap = array(
+        'Sabre_DAV_IFile' => 'icons/file',
+        'Sabre_DAV_ICollection' => 'icons/collection',
+        'Sabre_DAVACL_IPrincipal' => 'icons/principal',
+        'Sabre_CalDAV_ICalendar' => 'icons/calendar',
+        'Sabre_CardDAV_IAddressBook' => 'icons/addressbook',
+        'Sabre_CardDAV_ICard' => 'icons/card',
+    );
+
+    /**
+     * The file extension used for all icons
+     *
+     * @var string
+     */
+    public $iconExtension = '.png';
+
+    /**
+     * reference to server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * enablePost turns on the 'actions' panel, which allows people to create
+     * folders and upload files straight from a browser.
+     *
+     * @var bool
+     */
+    protected $enablePost = true;
+
+    /**
+     * By default the browser plugin will generate a favicon and other images.
+     * To turn this off, set this property to false.
+     *
+     * @var bool
+     */
+    protected $enableAssets = true;
+
+    /**
+     * Creates the object.
+     *
+     * By default it will allow file creation and uploads.
+     * Specify the first argument as false to disable this
+     *
+     * @param bool $enablePost
+     * @param bool $enableAssets
+     */
+    public function __construct($enablePost=true, $enableAssets = true) {
+
+        $this->enablePost = $enablePost;
+        $this->enableAssets = $enableAssets;
+
+    }
+
+    /**
+     * Initializes the plugin and subscribes to events
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+        $this->server->subscribeEvent('onHTMLActionsPanel', array($this, 'htmlActionsPanel'),200);
+        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
+    }
+
+    /**
+     * This method intercepts GET requests to collections and returns the html
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method !== 'GET') return true;
+
+        // We're not using straight-up $_GET, because we want everything to be
+        // unit testable.
+        $getVars = array();
+        parse_str($this->server->httpRequest->getQueryString(), $getVars);
+
+        if (isset($getVars['sabreAction']) && $getVars['sabreAction'] === 'asset' && isset($getVars['assetName'])) {
+            $this->serveAsset($getVars['assetName']);
+            return false;
+        }
+
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            // We're simply stopping when the file isn't found to not interfere
+            // with other plugins.
+            return;
+        }
+        if ($node instanceof Sabre_DAV_IFile)
+            return;
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
+
+        $this->server->httpResponse->sendBody(
+            $this->generateDirectoryIndex($uri)
+        );
+
+        return false;
+
+    }
+
+    /**
+     * Handles POST requests for tree operations.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function httpPOSTHandler($method, $uri) {
+
+        if ($method!='POST') return;
+        $contentType = $this->server->httpRequest->getHeader('Content-Type');
+        list($contentType) = explode(';', $contentType);
+        if ($contentType !== 'application/x-www-form-urlencoded' &&
+            $contentType !== 'multipart/form-data') {
+                return;
+        }
+        $postVars = $this->server->httpRequest->getPostVars();
+
+        if (!isset($postVars['sabreAction']))
+            return;
+
+        if ($this->server->broadcastEvent('onBrowserPostAction', array($uri, $postVars['sabreAction'], $postVars))) {
+
+            switch($postVars['sabreAction']) {
+
+                case 'mkcol' :
+                    if (isset($postVars['name']) && trim($postVars['name'])) {
+                        // Using basename() because we won't allow slashes
+                        list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($postVars['name']));
+                        $this->server->createDirectory($uri . '/' . $folderName);
+                    }
+                    break;
+                case 'put' :
+                    if ($_FILES) $file = current($_FILES);
+                    else break;
+
+                    list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
+                    if (isset($postVars['name']) && trim($postVars['name']))
+                        $newName = trim($postVars['name']);
+
+                    // Making sure we only have a 'basename' component
+                    list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
+
+                    if (is_uploaded_file($file['tmp_name'])) {
+                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'],'r'));
+                    }
+                    break;
+
+            }
+
+        }
+        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
+        $this->server->httpResponse->sendStatus(302);
+        return false;
+
+    }
+
+    /**
+     * Escapes a string for html.
+     *
+     * @param string $value
+     * @return string
+     */
+    public function escapeHTML($value) {
+
+        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
+
+    }
+
+    /**
+     * Generates the html directory index for a given url
+     *
+     * @param string $path
+     * @return string
+     */
+    public function generateDirectoryIndex($path) {
+
+        $version = '';
+        if (Sabre_DAV_Server::$exposeVersion) {
+            $version = Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY;
+        }
+
+        $html = "<html>
+<head>
+  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . $version . "</title>
+  <style type=\"text/css\">
+  body { Font-family: arial}
+  h1 { font-size: 150% }
+  </style>
+        ";
+
+        if ($this->enableAssets) {
+            $html.='<link rel="shortcut icon" href="'.$this->getAssetUrl('favicon.ico').'" type="image/vnd.microsoft.icon" />';
+        }
+
+        $html .= "</head>
+<body>
+  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
+  <table>
+    <tr><th width=\"24\"></th><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
+    <tr><td colspan=\"5\"><hr /></td></tr>";
+
+        $files = $this->server->getPropertiesForPath($path,array(
+            '{DAV:}displayname',
+            '{DAV:}resourcetype',
+            '{DAV:}getcontenttype',
+            '{DAV:}getcontentlength',
+            '{DAV:}getlastmodified',
+        ),1);
+
+        $parent = $this->server->tree->getNodeForPath($path);
+
+
+        if ($path) {
+
+            list($parentUri) = Sabre_DAV_URLUtil::splitPath($path);
+            $fullPath = Sabre_DAV_URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
+
+            $icon = $this->enableAssets?'<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl('icons/parent' . $this->iconExtension) . '" width="24" alt="Parent" /></a>':'';
+            $html.= "<tr>
+    <td>$icon</td>
+    <td><a href=\"{$fullPath}\">..</a></td>
+    <td>[parent]</td>
+    <td></td>
+    <td></td>
+    </tr>";
+
+        }
+
+        foreach($files as $file) {
+
+            // This is the current directory, we can skip it
+            if (rtrim($file['href'],'/')==$path) continue;
+
+            list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
+
+            $type = null;
+
+
+            if (isset($file[200]['{DAV:}resourcetype'])) {
+                $type = $file[200]['{DAV:}resourcetype']->getValue();
+
+                // resourcetype can have multiple values
+                if (!is_array($type)) $type = array($type);
+
+                foreach($type as $k=>$v) {
+
+                    // Some name mapping is preferred
+                    switch($v) {
+                        case '{DAV:}collection' :
+                            $type[$k] = 'Collection';
+                            break;
+                        case '{DAV:}principal' :
+                            $type[$k] = 'Principal';
+                            break;
+                        case '{urn:ietf:params:xml:ns:carddav}addressbook' :
+                            $type[$k] = 'Addressbook';
+                            break;
+                        case '{urn:ietf:params:xml:ns:caldav}calendar' :
+                            $type[$k] = 'Calendar';
+                            break;
+                        case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
+                            $type[$k] = 'Schedule Inbox';
+                            break;
+                        case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
+                            $type[$k] = 'Schedule Outbox';
+                            break;
+                        case '{http://calendarserver.org/ns/}calendar-proxy-read' :
+                            $type[$k] = 'Proxy-Read';
+                            break;
+                        case '{http://calendarserver.org/ns/}calendar-proxy-write' :
+                            $type[$k] = 'Proxy-Write';
+                            break;
+                    }
+
+                }
+                $type = implode(', ', $type);
+            }
+
+            // If no resourcetype was found, we attempt to use
+            // the contenttype property
+            if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
+                $type = $file[200]['{DAV:}getcontenttype'];
+            }
+            if (!$type) $type = 'Unknown';
+
+            $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
+            $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
+
+            $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
+
+            $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
+
+            $displayName = $this->escapeHTML($displayName);
+            $type = $this->escapeHTML($type);
+
+            $icon = '';
+
+            if ($this->enableAssets) {
+                $node = $parent->getChild($name);
+                foreach(array_reverse($this->iconMap) as $class=>$iconName) {
+
+                    if ($node instanceof $class) {
+                        $icon = '<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl($iconName . $this->iconExtension) . '" alt="" width="24" /></a>';
+                        break;
+                    }
+
+
+                }
+
+            }
+
+            $html.= "<tr>
+    <td>$icon</td>
+    <td><a href=\"{$fullPath}\">{$displayName}</a></td>
+    <td>{$type}</td>
+    <td>{$size}</td>
+    <td>{$lastmodified}</td>
+    </tr>";
+
+        }
+
+        $html.= "<tr><td colspan=\"5\"><hr /></td></tr>";
+
+        $output = '';
+
+        if ($this->enablePost) {
+            $this->server->broadcastEvent('onHTMLActionsPanel',array($parent, &$output));
+        }
+
+        $html.=$output;
+
+        $html.= "</table>
+        <address>Generated by SabreDAV " . $version . " (c)2007-2012 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
+        </body>
+        </html>";
+
+        return $html;
+
+    }
+
+    /**
+     * This method is used to generate the 'actions panel' output for
+     * collections.
+     *
+     * This specifically generates the interfaces for creating new files, and
+     * creating new directories.
+     *
+     * @param Sabre_DAV_INode $node
+     * @param mixed $output
+     * @return void
+     */
+    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+        if (!$node instanceof Sabre_DAV_ICollection)
+            return;
+
+        // We also know fairly certain that if an object is a non-extended
+        // SimpleCollection, we won't need to show the panel either.
+        if (get_class($node)==='Sabre_DAV_SimpleCollection')
+            return;
+
+        $output.= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Create new folder</h3>
+            <input type="hidden" name="sabreAction" value="mkcol" />
+            Name: <input type="text" name="name" /><br />
+            <input type="submit" value="create" />
+            </form>
+            <form method="post" action="" enctype="multipart/form-data">
+            <h3>Upload file</h3>
+            <input type="hidden" name="sabreAction" value="put" />
+            Name (optional): <input type="text" name="name" /><br />
+            File: <input type="file" name="file" /><br />
+            <input type="submit" value="upload" />
+            </form>
+            </td></tr>';
+
+    }
+
+    /**
+     * This method takes a path/name of an asset and turns it into url
+     * suiteable for http access.
+     *
+     * @param string $assetName
+     * @return string
+     */
+    protected function getAssetUrl($assetName) {
+
+        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
+
+    }
+
+    /**
+     * This method returns a local pathname to an asset.
+     *
+     * @param string $assetName
+     * @return string
+     */
+    protected function getLocalAssetPath($assetName) {
+
+        // Making sure people aren't trying to escape from the base path.
+        $assetSplit = explode('/', $assetName);
+        if (in_array('..',$assetSplit)) {
+            throw new Sabre_DAV_Exception('Incorrect asset path');
+        }
+        $path = __DIR__ . '/assets/' . $assetName;
+        return $path;
+
+    }
+
+    /**
+     * This method reads an asset from disk and generates a full http response.
+     *
+     * @param string $assetName
+     * @return void
+     */
+    protected function serveAsset($assetName) {
+
+        $assetPath = $this->getLocalAssetPath($assetName);
+        if (!file_exists($assetPath)) {
+            throw new Sabre_DAV_Exception_NotFound('Could not find an asset with this name');
+        }
+        // Rudimentary mime type detection
+        switch(strtolower(substr($assetPath,strpos($assetPath,'.')+1))) {
+
+        case 'ico' :
+            $mime = 'image/vnd.microsoft.icon';
+            break;
+
+        case 'png' :
+            $mime = 'image/png';
+            break;
+
+        default:
+            $mime = 'application/octet-stream';
+            break;
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type', $mime);
+        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
+        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody(fopen($assetPath,'r'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/assets/favicon.ico b/3rdparty/Sabre/DAV/Browser/assets/favicon.ico
new file mode 100755
index 0000000000000000000000000000000000000000..2b2c10a22cc7a57c4dc5d7156f184448f2bee92b
GIT binary patch
literal 4286
zcmc&&O-NKx6uz%14NNBzA}E}JHil3^6a|4&P_&6!RGSD}1rgCAC@`9dTC_@vqNoT8
z0%;dQR0K_{iUM;bf#3*%o1h^C2N7@IH_nmc?Va~t5U6~f`_BE&`Of`&_n~tUev3uN
zziw!)bL*XR-2hy!51_yCgT8fb3s`VC=e=KcI5&)PGGQlpSAh?}1mK&Pg8c>z0Y`y$
zAT_6qJ%yV?|0!S$5WO@z3+`QD17OyXL4PyiM}RavtA7Tu7p)pn^p7Ks@m6m7)A}X$
z4Y+@;NrHYq_;V@RoZ|;69MPx!46Ftg*Tc~711C+J`JMuUfYwNBzXPB9sZm3WK9272
z&x|>@f_E<?SJ!n3F_!+bjQL(SbG*pN*ZN$yjf@Y*UxY8qyfdC$j-dkR++q8Z(SMuq
zfqvGxyvf)mCXM`3#|fi<8vgb`|A)bqT(si=-rx;=+NAlS2KT#;*X?6Ue@g;SVmR+T
zfQ)^2O3afcmvu-EZSO1nlLklg`<wYhpZi$%hi%qJ?r(!Ps`Lj8j^tcCGtHdL`!ONr
zi{e@OQ%awEO0+_IL*<gO^ZX>O{b3cubqjOyc~<H3P7OIT@bL~1O>J3I$d_lHIpN}q
z!{kjX{c{12XF=~Z$w$kazXHB!b53>u!rx}_$e&dD`xNgv+MR&p2yN1xb0>&9t@28Z
zV&5u#j_D=P9mI#){2s8@eGGj(?>gooo<%RT14>`VSZ&_l6GlGnan=^bemD56rRN{?
zSAqZD$i;oS9SF6#f5I`#^C<Zl_1nO;w0X9AnJWgj;1j*j9wa}5KIfFRhVgvn8Q25F
zX>&hW@13s_lc3LUl(PWmHcop2{vr^kO`kP(*4!m=3Hn3e#Oc!a2;iDn+FbXzcOHEQ
zbX<Zy_d4fE*T6CF*YPoJ)-?|3IJT*M2v|~cf<AdX%Z~xh*?E9xU`c%NY@HE)qwET}
zjXWv(qQ$)+ZOgLOSAZTj_YS|Q%(cp>Z)u93cj1WA=KS+M>jZ=oYyXq}1?ZdsjsX0A
zkJXCvi~cfO@2ffd7r^;>=SsL-3U%l5HRoEZ#0r<I5G^jMtaMR%O%#<k0ef>%`7%&%
ziLTXJqU*JeXt3H5`AS#h(dpfl+`Ox|)*~QS%h&VO!d#)!>r3U5_YsDi2fY6Sd&vw%

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png b/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
new file mode 100755
index 0000000000000000000000000000000000000000..c9acc84172dad59708b6b298b310b8d29eeeb671
GIT binary patch
literal 7232
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png b/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
new file mode 100755
index 0000000000000000000000000000000000000000..3ecd6a800a01b77ec8b53fd2ac2c1ad9be035fc0
GIT binary patch
literal 4388
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
VG`ly3;d~;1Y%Cr2-!R7}{u}gUbfEwM

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/card.png b/3rdparty/Sabre/DAV/Browser/assets/icons/card.png
new file mode 100755
index 0000000000000000000000000000000000000000..2ce954866d853edb737a7e281de221f7846846f6
GIT binary patch
literal 5695
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png b/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
new file mode 100755
index 0000000000000000000000000000000000000000..156fa64fd50f15d9e838326d42d68feba2c23c3b
GIT binary patch
literal 3474
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/file.png b/3rdparty/Sabre/DAV/Browser/assets/icons/file.png
new file mode 100755
index 0000000000000000000000000000000000000000..3b98551cec3a863ab120a52cf21debad6cab6748
GIT binary patch
literal 2837
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
BY2g3>

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png b/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
new file mode 100755
index 0000000000000000000000000000000000000000..156fa64fd50f15d9e838326d42d68feba2c23c3b
GIT binary patch
literal 3474
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png b/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
new file mode 100755
index 0000000000000000000000000000000000000000..f8988f828e61bb1894c3ea5b848f95aac84beaa3
GIT binary patch
literal 5480
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
new file mode 100755
index 0000000000..9a428765e9
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -0,0 +1,492 @@
+<?php
+
+/**
+ * SabreDAV DAV client
+ *
+ * This client wraps around Curl to provide a convenient API to a WebDAV
+ * server.
+ *
+ * NOTE: This class is experimental, it's api will likely change in the future.
+ *
+ * @package Sabre
+ * @subpackage DAVClient
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Client {
+
+    public $propertyMap = array();
+
+    protected $baseUri;
+    protected $userName;
+    protected $password;
+    protected $proxy;
+
+    /**
+     * Basic authentication
+     */
+    const AUTH_BASIC = 1;
+
+    /**
+     * Digest authentication
+     */
+    const AUTH_DIGEST = 2;
+
+    /**
+     * The authentication type we're using.
+     *
+     * This is a bitmask of AUTH_BASIC and AUTH_DIGEST.
+     *
+     * If DIGEST is used, the client makes 1 extra request per request, to get
+     * the authentication tokens.
+     *
+     * @var int
+     */
+    protected $authType;
+
+    /**
+     * Constructor
+     *
+     * Settings are provided through the 'settings' argument. The following
+     * settings are supported:
+     *
+     *   * baseUri
+     *   * userName (optional)
+     *   * password (optional)
+     *   * proxy (optional)
+     *
+     * @param array $settings
+     */
+    public function __construct(array $settings) {
+
+        if (!isset($settings['baseUri'])) {
+            throw new InvalidArgumentException('A baseUri must be provided');
+        }
+
+        $validSettings = array(
+            'baseUri',
+            'userName',
+            'password',
+            'proxy',
+        );
+
+        foreach($validSettings as $validSetting) {
+            if (isset($settings[$validSetting])) {
+                $this->$validSetting = $settings[$validSetting];
+            }
+        }
+
+        if (isset($settings['authType'])) {
+            $this->authType = $settings['authType'];
+        } else {
+            $this->authType = self::AUTH_BASIC | self::AUTH_DIGEST;
+        }
+
+        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
+
+    }
+
+    /**
+     * Does a PROPFIND request
+     *
+     * The list of requested properties must be specified as an array, in clark
+     * notation.
+     *
+     * The returned array will contain a list of filenames as keys, and
+     * properties as values.
+     *
+     * The properties array will contain the list of properties. Only properties
+     * that are actually returned from the server (without error) will be
+     * returned, anything else is discarded.
+     *
+     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+     * made to the server to also return all child resources.
+     *
+     * @param string $url
+     * @param array $properties
+     * @param int $depth
+     * @return array
+     */
+    public function propFind($url, array $properties, $depth = 0) {
+
+        $body = '<?xml version="1.0"?>' . "\n";
+        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
+        $body.= '  <d:prop>' . "\n";
+
+        foreach($properties as $property) {
+
+            list(
+                $namespace,
+                $elementName
+            ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
+
+            if ($namespace === 'DAV:') {
+                $body.='    <d:' . $elementName . ' />' . "\n";
+            } else {
+                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+            }
+
+        }
+
+        $body.= '  </d:prop>' . "\n";
+        $body.= '</d:propfind>';
+
+        $response = $this->request('PROPFIND', $url, $body, array(
+            'Depth' => $depth,
+            'Content-Type' => 'application/xml'
+        ));
+
+        $result = $this->parseMultiStatus($response['body']);
+
+        // If depth was 0, we only return the top item
+        if ($depth===0) {
+            reset($result);
+            $result = current($result);
+            return $result[200];
+        }
+
+        $newResult = array();
+        foreach($result as $href => $statusList) {
+
+            $newResult[$href] = $statusList[200];
+
+        }
+
+        return $newResult;
+
+    }
+
+    /**
+     * Updates a list of properties on the server
+     *
+     * The list of properties must have clark-notation properties for the keys,
+     * and the actual (string) value for the value. If the value is null, an
+     * attempt is made to delete the property.
+     *
+     * @todo Must be building the request using the DOM, and does not yet
+     *       support complex properties.
+     * @param string $url
+     * @param array $properties
+     * @return void
+     */
+    public function propPatch($url, array $properties) {
+
+        $body = '<?xml version="1.0"?>' . "\n";
+        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
+
+        foreach($properties as $propName => $propValue) {
+
+            list(
+                $namespace,
+                $elementName
+            ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
+
+            if ($propValue === null) {
+
+                $body.="<d:remove><d:prop>\n";
+
+                if ($namespace === 'DAV:') {
+                    $body.='    <d:' . $elementName . ' />' . "\n";
+                } else {
+                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+                }
+
+                $body.="</d:prop></d:remove>\n";
+
+            } else {
+
+                $body.="<d:set><d:prop>\n";
+                if ($namespace === 'DAV:') {
+                    $body.='    <d:' . $elementName . '>';
+                } else {
+                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
+                }
+                // Shitty.. i know
+                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8');
+                if ($namespace === 'DAV:') {
+                    $body.='</d:' . $elementName . '>' . "\n";
+                } else {
+                    $body.="</x:" . $elementName . ">\n";
+                }
+                $body.="</d:prop></d:set>\n";
+
+            }
+
+        }
+
+        $body.= '</d:propertyupdate>';
+
+        $this->request('PROPPATCH', $url, $body, array(
+            'Content-Type' => 'application/xml'
+        ));
+
+    }
+
+    /**
+     * Performs an HTTP options request
+     *
+     * This method returns all the features from the 'DAV:' header as an array.
+     * If there was no DAV header, or no contents this method will return an
+     * empty array.
+     *
+     * @return array
+     */
+    public function options() {
+
+        $result = $this->request('OPTIONS');
+        if (!isset($result['headers']['dav'])) {
+            return array();
+        }
+
+        $features = explode(',', $result['headers']['dav']);
+        foreach($features as &$v) {
+            $v = trim($v);
+        }
+        return $features;
+
+    }
+
+    /**
+     * Performs an actual HTTP request, and returns the result.
+     *
+     * If the specified url is relative, it will be expanded based on the base
+     * url.
+     *
+     * The returned array contains 3 keys:
+     *   * body - the response body
+     *   * httpCode - a HTTP code (200, 404, etc)
+     *   * headers - a list of response http headers. The header names have
+     *     been lowercased.
+     *
+     * @param string $method
+     * @param string $url
+     * @param string $body
+     * @param array $headers
+     * @return array
+     */
+    public function request($method, $url = '', $body = null, $headers = array()) {
+
+        $url = $this->getAbsoluteUrl($url);
+
+        $curlSettings = array(
+            CURLOPT_RETURNTRANSFER => true,
+            // Return headers as part of the response
+            CURLOPT_HEADER => true,
+            CURLOPT_POSTFIELDS => $body,
+            // Automatically follow redirects
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_MAXREDIRS => 5,
+        );
+
+        switch ($method) {
+            case 'HEAD' :
+
+                // do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD
+                // requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
+                // specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
+                // ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
+                // response body
+                $curlSettings[CURLOPT_NOBODY] = true;
+                $curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+                break;
+
+            default:
+                $curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
+                break;
+
+        }
+
+        // Adding HTTP headers
+        $nHeaders = array();
+        foreach($headers as $key=>$value) {
+
+            $nHeaders[] = $key . ': ' . $value;
+
+        }
+        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
+
+        if ($this->proxy) {
+            $curlSettings[CURLOPT_PROXY] = $this->proxy;
+        }
+
+        if ($this->userName && $this->authType) {
+            $curlType = 0;
+            if ($this->authType & self::AUTH_BASIC) {
+                $curlType |= CURLAUTH_BASIC;
+            }
+            if ($this->authType & self::AUTH_DIGEST) {
+                $curlType |= CURLAUTH_DIGEST;
+            }
+            $curlSettings[CURLOPT_HTTPAUTH] = $curlType;
+            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
+        }
+
+        list(
+            $response,
+            $curlInfo,
+            $curlErrNo,
+            $curlError
+        ) = $this->curlRequest($url, $curlSettings);
+
+        $headerBlob = substr($response, 0, $curlInfo['header_size']);
+        $response = substr($response, $curlInfo['header_size']);
+
+        // In the case of 100 Continue, or redirects we'll have multiple lists
+        // of headers for each separate HTTP response. We can easily split this
+        // because they are separated by \r\n\r\n
+        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+
+        // We only care about the last set of headers
+        $headerBlob = $headerBlob[count($headerBlob)-1];
+
+        // Splitting headers
+        $headerBlob = explode("\r\n", $headerBlob);
+
+        $headers = array();
+        foreach($headerBlob as $header) {
+            $parts = explode(':', $header, 2);
+            if (count($parts)==2) {
+                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
+            }
+        }
+
+        $response = array(
+            'body' => $response,
+            'statusCode' => $curlInfo['http_code'],
+            'headers' => $headers
+        );
+
+        if ($curlErrNo) {
+            throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
+        }
+
+        if ($response['statusCode']>=400) {
+            switch ($response['statusCode']) {
+                case 404:
+                    throw new Sabre_DAV_Exception_NotFound('Resource ' . $url . ' not found.');
+                    break;
+
+                default:
+                    throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
+            }
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Wrapper for all curl functions.
+     *
+     * The only reason this was split out in a separate method, is so it
+     * becomes easier to unittest.
+     *
+     * @param string $url
+     * @param array $settings
+     * @return array
+     */
+    protected function curlRequest($url, $settings) {
+
+        $curl = curl_init($url);
+        curl_setopt_array($curl, $settings);
+
+        return array(
+            curl_exec($curl),
+            curl_getinfo($curl),
+            curl_errno($curl),
+            curl_error($curl)
+        );
+
+    }
+
+    /**
+     * Returns the full url based on the given url (which may be relative). All
+     * urls are expanded based on the base url as given by the server.
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function getAbsoluteUrl($url) {
+
+        // If the url starts with http:// or https://, the url is already absolute.
+        if (preg_match('/^http(s?):\/\//', $url)) {
+            return $url;
+        }
+
+        // If the url starts with a slash, we must calculate the url based off
+        // the root of the base url.
+        if (strpos($url,'/') === 0) {
+            $parts = parse_url($this->baseUri);
+            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
+        }
+
+        // Otherwise...
+        return $this->baseUri . $url;
+
+    }
+
+    /**
+     * Parses a WebDAV multistatus response body
+     *
+     * This method returns an array with the following structure
+     *
+     * array(
+     *   'url/to/resource' => array(
+     *     '200' => array(
+     *        '{DAV:}property1' => 'value1',
+     *        '{DAV:}property2' => 'value2',
+     *     ),
+     *     '404' => array(
+     *        '{DAV:}property1' => null,
+     *        '{DAV:}property2' => null,
+     *     ),
+     *   )
+     *   'url/to/resource2' => array(
+     *      .. etc ..
+     *   )
+     * )
+     *
+     *
+     * @param string $body xml body
+     * @return array
+     */
+    public function parseMultiStatus($body) {
+
+        $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
+
+        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
+        if ($responseXML===false) {
+            throw new InvalidArgumentException('The passed data is not valid XML');
+        }
+
+        $responseXML->registerXPathNamespace('d', 'urn:DAV');
+
+        $propResult = array();
+
+        foreach($responseXML->xpath('d:response') as $response) {
+            $response->registerXPathNamespace('d', 'urn:DAV');
+            $href = $response->xpath('d:href');
+            $href = (string)$href[0];
+
+            $properties = array();
+
+            foreach($response->xpath('d:propstat') as $propStat) {
+
+                $propStat->registerXPathNamespace('d', 'urn:DAV');
+                $status = $propStat->xpath('d:status');
+                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
+
+                $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap);
+
+            }
+
+            $propResult[$href] = $properties;
+
+        }
+
+        return $propResult;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Collection.php b/3rdparty/Sabre/DAV/Collection.php
new file mode 100755
index 0000000000..776c22531b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Collection.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Collection class
+ *
+ * This is a helper class, that should aid in getting collections classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
+     * Generally its wise to override this, as this can usually be optimized
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+
+            if ($child->getName()==$name) return $child;
+
+        }
+        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name);
+
+    }
+
+    /**
+     * Checks is a child-node exists.
+     *
+     * It is generally a good idea to try and override this. Usually it can be optimized.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        try {
+
+            $this->getChild($name);
+            return true;
+
+        } catch(Sabre_DAV_Exception_NotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Directory.php b/3rdparty/Sabre/DAV/Directory.php
new file mode 100755
index 0000000000..6db8febc02
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Directory.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * This class is now deprecated in favor of the Sabre_DAV_Collection class.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated Use Sabre_DAV_Collection instead
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Directory extends Sabre_DAV_Collection {
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
new file mode 100755
index 0000000000..a2cd6cf582
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * SabreDAV base exception
+ *
+ * This is SabreDAV's base exception file, use this to implement your own exception.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * Main Exception class.
+ *
+ * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occurred.
+ * The default for this is 500.
+ *
+ * This class also allows you to generate custom xml data for your exceptions. This will be displayed
+ * in the 'error' element in the failing response.
+ */
+class Sabre_DAV_Exception extends Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 500;
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return array
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        return array();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/BadRequest.php b/3rdparty/Sabre/DAV/Exception/BadRequest.php
new file mode 100755
index 0000000000..b198648a75
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/BadRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * BadRequest
+ *
+ * The BadRequest is thrown when the user submitted an invalid HTTP request
+ * BadRequest
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 400;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/Conflict.php b/3rdparty/Sabre/DAV/Exception/Conflict.php
new file mode 100755
index 0000000000..6b0bd1fad7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Conflict.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Conflict
+ *
+ * A 409 Conflict is thrown when a user tried to make a directory over an existing
+ * file or in a parent directory that doesn't exist.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 409;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
new file mode 100755
index 0000000000..6121868e69
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ConflictingLock
+ *
+ * Similar to Exception_Locked, this exception thrown when a LOCK request
+ * was made, on a resource which was already locked
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/FileNotFound.php b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
new file mode 100755
index 0000000000..d76e400c93
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * FileNotFound
+ *
+ * Deprecated: Warning, this class is deprecated and will be removed in a 
+ * future version of SabreDAV. Please use Sabre_DAV_Exception_NotFound instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @deprecated Use Sabre_DAV_Exception_NotFound instead
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception_NotFound {
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/Forbidden.php b/3rdparty/Sabre/DAV/Exception/Forbidden.php
new file mode 100755
index 0000000000..20b1056e31
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Forbidden.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Forbidden
+ *
+ * This exception is thrown whenever a user tries to do an operation he's not allowed to
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 403;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
new file mode 100755
index 0000000000..1a15089b0a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * InsufficientStorage
+ *
+ * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 507;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
new file mode 100755
index 0000000000..2230f1d081
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * InvalidResourceType
+ *
+ * This exception is thrown when the user tried to create a new collection, with
+ * a special resourcetype value that was not recognized by the server.
+ *
+ * See RFC5689 section 3.3
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
new file mode 100755
index 0000000000..80ab7aff65
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * LockTokenMatchesRequestUri
+ *
+ * This exception is thrown by UNLOCK if a supplied lock-token is invalid
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Creates the exception
+     */
+    public function __construct() {
+
+        $this->message = 'The locktoken supplied does not match any locks on this entity';
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/Locked.php b/3rdparty/Sabre/DAV/Exception/Locked.php
new file mode 100755
index 0000000000..976365ac1f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Locked.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Locked
+ *
+ * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
+
+    /**
+     * Lock information
+     *
+     * @var Sabre_DAV_Locks_LockInfo
+     */
+    protected $lock;
+
+    /**
+     * Creates the exception
+     *
+     * A LockInfo object should be passed if the user should be informed
+     * which lock actually has the file locked.
+     *
+     * @param Sabre_DAV_Locks_LockInfo $lock
+     */
+    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
+
+        $this->lock = $lock;
+
+    }
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 423;
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
new file mode 100755
index 0000000000..3187575150
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * MethodNotAllowed
+ *
+ * The 405 is thrown when a client tried to create a directory on an already existing directory
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 405;
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return array
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        $methods = $server->getAllowedMethods($server->getRequestUri());
+
+        return array(
+            'Allow' => strtoupper(implode(', ',$methods)),
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
new file mode 100755
index 0000000000..87ca624429
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NotAuthenticated
+ *
+ * This exception is thrown when the client did not provide valid
+ * authentication credentials.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 401;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/NotFound.php b/3rdparty/Sabre/DAV/Exception/NotFound.php
new file mode 100755
index 0000000000..2b9da560d2
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotFound.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NotFound
+ *
+ * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotFound extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 404;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/NotImplemented.php b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
new file mode 100755
index 0000000000..d017a19f55
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * NotImplemented
+ *
+ * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 501;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/PaymentRequired.php b/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
new file mode 100755
index 0000000000..4982f45a4b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Payment Required
+ *
+ * The PaymentRequired exception may be thrown in a case where a user must pay
+ * to access a certain resource or operation.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_PaymentRequired extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 402;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
new file mode 100755
index 0000000000..213e9c5231
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * PreconditionFailed
+ *
+ * This exception is normally thrown when a client submitted a conditional request,
+ * like for example an If, If-None-Match or If-Match header, which caused the HTTP
+ * request to not execute (the condition of the header failed)
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
+
+    /**
+     * When this exception is thrown, the header-name might be set.
+     *
+     * This allows the exception-catching code to determine which HTTP header
+     * caused the exception.
+     *
+     * @var string
+     */
+    public $header = null;
+
+    /**
+     * Create the exception
+     *
+     * @param string $message
+     * @param string $header
+     */
+    public function __construct($message, $header=null) {
+
+        parent::__construct($message);
+        $this->header = $header;
+
+    }
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 412;
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        if ($this->header) {
+            $prop = $errorNode->ownerDocument->createElement('s:header');
+            $prop->nodeValue = $this->header;
+            $errorNode->appendChild($prop);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
new file mode 100755
index 0000000000..e86800f303
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * ReportNotImplemented
+ *
+ * This exception is thrown when the client requested an unknown report through the REPORT method
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
new file mode 100755
index 0000000000..29ee3654a7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * RequestedRangeNotSatisfiable
+ *
+ * This exception is normally thrown when the user
+ * request a range that is out of the entity bounds.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
+
+    /**
+     * returns the http statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 416;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
new file mode 100755
index 0000000000..9a4693b21a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * UnSupportedMediaType
+ *
+ * The 415 Unsupported Media Type status code is generally sent back when the client
+ * tried to call an HTTP method, with a body the server didn't understand
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception {
+
+    /**
+     * returns the http statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 415;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/FS/Directory.php b/3rdparty/Sabre/DAV/FS/Directory.php
new file mode 100755
index 0000000000..3af2d75558
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/Directory.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null) {
+
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FS_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FS_File($path);
+
+        }
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return void
+     */
+    public function delete() {
+
+        foreach($this->getChildren() as $child) $child->delete();
+        rmdir($this->path);
+
+    }
+
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            );
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FS/File.php b/3rdparty/Sabre/DAV/FS/File.php
new file mode 100755
index 0000000000..6a8039fe30
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/File.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * File class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * @param resource $data
+     * @return void
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return string
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return void
+     */
+    public function delete() {
+
+        unlink($this->path);
+
+    }
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return filesize($this->path);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return mixed
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return mixed
+     */
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FS/Node.php b/3rdparty/Sabre/DAV/FS/Node.php
new file mode 100755
index 0000000000..1283e9d0fd
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/Node.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Base node-class
+ *
+ * The node class implements the method used by both the File and the Directory classes
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
+
+    /**
+     * The path to the current node
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param string $path
+     */
+    public function __construct($path) {
+
+        $this->path = $path;
+
+    }
+
+
+
+    /**
+     * Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $name;
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+
+        $newPath = $parentPath . '/' . $newName;
+        rename($this->path,$newPath);
+
+        $this->path = $newPath;
+
+    }
+
+
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return filemtime($this->path);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/Directory.php b/3rdparty/Sabre/DAV/FSExt/Directory.php
new file mode 100755
index 0000000000..540057183b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/Directory.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+        return '"' . md5_file($newPath) . '"';
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File could not be located');
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FSExt_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FSExt_File($path);
+
+        }
+
+    }
+
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        if ($name=='.' || $name=='..')
+            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return bool
+     */
+    public function delete() {
+
+        // Deleting all children
+        foreach($this->getChildren() as $child) $child->delete();
+
+        // Removing resource info, if its still around
+        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
+
+        // Removing the directory itself
+        rmdir($this->path);
+
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            );
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/File.php b/3rdparty/Sabre/DAV/FSExt/File.php
new file mode 100755
index 0000000000..b93ce5aee2
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/File.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * File class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * data is a readable stream resource.
+     *
+     * @param resource $data
+     * @return void
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+        return '"' . md5_file($this->path) . '"';
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return string
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return bool
+     */
+    public function delete() {
+
+        unlink($this->path);
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string|null
+     */
+    public function getETag() {
+
+        return '"' . md5_file($this->path). '"';
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return filesize($this->path);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/Node.php b/3rdparty/Sabre/DAV/FSExt/Node.php
new file mode 100755
index 0000000000..68ca06beb7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/Node.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * Base node-class
+ *
+ * The node class implements the method used by both the File and the Directory classes
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_IProperties {
+
+    /**
+     * Updates properties on this node,
+     *
+     * @param array $properties
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+
+        foreach($properties as $propertyName=>$propertyValue) {
+
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (isset($resourceData['properties'][$propertyName])) {
+                    unset($resourceData['properties'][$propertyName]);
+                }
+            } else {
+                $resourceData['properties'][$propertyName] = $propertyValue;
+            }
+
+        }
+
+        $this->putResourceData($resourceData);
+        return true;
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     *
+     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
+     * If the array is empty, all properties should be returned
+     *
+     * @param array $properties
+     * @return array
+     */
+    function getProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+
+        // if the array was empty, we need to return everything
+        if (!$properties) return $resourceData['properties'];
+
+        $props = array();
+        foreach($properties as $property) {
+            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
+        }
+
+        return $props;
+
+    }
+
+    /**
+     * Returns the path to the resource file
+     *
+     * @return string
+     */
+    protected function getResourceInfoPath() {
+
+        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $parentDir . '/.sabredav';
+
+    }
+
+    /**
+     * Returns all the stored resource information
+     *
+     * @return array
+     */
+    protected function getResourceData() {
+
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return array('properties' => array());
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!isset($data[$this->getName()])) {
+            return array('properties' => array());
+        }
+
+        $data = $data[$this->getName()];
+        if (!isset($data['properties'])) $data['properties'] = array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the resource information
+     *
+     * @param array $newData
+     * @return void
+     */
+    protected function putResourceData(array $newData) {
+
+        $path = $this->getResourceInfoPath();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        $data[$this->getName()] = $newData;
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+        $newPath = $parentPath . '/' . $newName;
+
+        // We're deleting the existing resourcedata, and recreating it
+        // for the new path.
+        $resourceData = $this->getResourceData();
+        $this->deleteResourceData();
+
+        rename($this->path,$newPath);
+        $this->path = $newPath;
+        $this->putResourceData($resourceData);
+
+
+    }
+
+    /**
+     * @return bool
+     */
+    public function deleteResourceData() {
+
+        // When we're deleting this node, we also need to delete any resource information
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return true;
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
+        ftruncate($handle,0);
+        rewind($handle);
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+        return true;
+    }
+
+    public function delete() {
+
+        return $this->deleteResourceData();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/File.php b/3rdparty/Sabre/DAV/File.php
new file mode 100755
index 0000000000..3126bd8d36
--- /dev/null
+++ b/3rdparty/Sabre/DAV/File.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * File class
+ *
+ * This is a helper class, that should aid in getting file classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * data is a readable stream resource.
+     *
+     * @param resource $data
+     * @return void
+     */
+    public function put($data) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    public function get() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes.
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return 0;
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string|null
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ICollection.php b/3rdparty/Sabre/DAV/ICollection.php
new file mode 100755
index 0000000000..4626038a66
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ICollection.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * The ICollection Interface
+ *
+ * This interface should be implemented by each class that represents a collection
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    function createFile($name, $data = null);
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    function createDirectory($name);
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @return Sabre_DAV_INode
+     */
+    function getChild($name);
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    function getChildren();
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    function childExists($name);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IExtendedCollection.php b/3rdparty/Sabre/DAV/IExtendedCollection.php
new file mode 100755
index 0000000000..6ec345f9a6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IExtendedCollection.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * The IExtendedCollection interface.
+ *
+ * This interface can be used to create special-type of collection-resources
+ * as defined by RFC 5689.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new collection
+     *
+     * @param string $name
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    function createExtendedCollection($name, array $resourceType, array $properties);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IFile.php b/3rdparty/Sabre/DAV/IFile.php
new file mode 100755
index 0000000000..478f822ae7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IFile.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This interface represents a file in the directory tree
+ *
+ * A file is a bit of a broad definition. In general it implies that on
+ * this specific node a PUT or GET method may be performed, to either update,
+ * or retrieve the contents of the file.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IFile extends Sabre_DAV_INode {
+
+    /**
+     * Updates the data
+     *
+     * The data argument is a readable stream resource.
+     *
+     * After a succesful put operation, you may choose to return an ETag. The
+     * etag must always be surrounded by double-quotes. These quotes must
+     * appear in the actual string you're returning.
+     *
+     * Clients may use the ETag from a PUT request to later on make sure that
+     * when they update the file, the contents haven't changed in the mean
+     * time.
+     *
+     * If you don't plan to store the file byte-by-byte, and you return a
+     * different object on a subsequent GET you are strongly recommended to not
+     * return an ETag, and just return null.
+     *
+     * @param resource $data
+     * @return string|null
+     */
+    function put($data);
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    function get();
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return void
+     */
+    function getContentType();
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return void
+     */
+    function getETag();
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return int
+     */
+    function getSize();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/INode.php b/3rdparty/Sabre/DAV/INode.php
new file mode 100755
index 0000000000..c57d392310
--- /dev/null
+++ b/3rdparty/Sabre/DAV/INode.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * The INode interface is the base interface, and the parent class of both ICollection and IFile
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_INode {
+
+    /**
+     * Deleted the current node
+     *
+     * @return void
+     */
+    function delete();
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    function getName();
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    function setName($name);
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IProperties.php b/3rdparty/Sabre/DAV/IProperties.php
new file mode 100755
index 0000000000..38eaab16da
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IProperties.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * IProperties interface
+ *
+ * Implement this interface to support custom WebDAV properties requested and sent from clients.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations
+     * @return bool|array
+     */
+    function updateProperties($mutations);
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties
+     * @return void
+     */
+    function getProperties($properties);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IQuota.php b/3rdparty/Sabre/DAV/IQuota.php
new file mode 100755
index 0000000000..3fe4c4eced
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IQuota.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * IQuota interface
+ *
+ * Implement this interface to add the ability to return quota information. The ObjectTree
+ * will check for quota information on any given node. If the information is not available it will
+ * attempt to fetch the information from the root node.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
+
+    /**
+     * Returns the quota information
+     *
+     * This method MUST return an array with 2 values, the first being the total used space,
+     * the second the available space (in bytes)
+     */
+    function getQuotaInfo();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
new file mode 100755
index 0000000000..127e643a2b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This is an alternative approach to doing this on a per-node basis
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    abstract function getLocks($uri, $returnChildLocks);
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
new file mode 100755
index 0000000000..02cab87fc8
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * This Lock Backend stores all its data in the filesystem in separate file per
+ * node.
+ *
+ * This Lock Manager is now deprecated. It has a bug that allows parent
+ * collections to be deletes when children deeper in the tree are locked.
+ *
+ * This also means that using this backend means you will not pass the Neon
+ * Litmus test.
+ *
+ * You are recommended to use either the PDO or the File backend instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The default data directory
+     *
+     * @var string
+     */
+    private $dataDir;
+
+    public function __construct($dataDir) {
+
+        $this->dataDir = $dataDir;
+
+    }
+
+    protected function getFileNameForUri($uri) {
+
+        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
+
+    }
+
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        $lockList = array();
+        $currentPath = '';
+
+        foreach(explode('/',$uri) as $uriPart) {
+
+            // weird algorithm that can probably be improved, but we're traversing the path top down
+            if ($currentPath) $currentPath.='/';
+            $currentPath.=$uriPart;
+
+            $uriLocks = $this->getData($currentPath);
+
+            foreach($uriLocks as $uriLock) {
+
+                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
+                if($uri==$currentPath || $uriLock->depth!=0) {
+                    $uriLock->uri = $currentPath;
+                    $lockList[] = $uriLock;
+                }
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($lockList as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]);
+        }
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) unset($locks[$k]);
+        }
+        $locks[] = $lockInfo;
+        $this->putData($uri,$locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($uri,$locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns the stored data for a uri
+     *
+     * @param string $uri
+     * @return array
+     */
+    protected function getData($uri) {
+
+        $path = $this->getFilenameForUri($uri);
+        if (!file_exists($path)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the lock information
+     *
+     * @param string $uri
+     * @param array $newData
+     * @return void
+     */
+    protected function putData($uri,array $newData) {
+
+        $path = $this->getFileNameForUri($uri);
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php
new file mode 100755
index 0000000000..c33f963514
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/File.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a single file.
+ *
+ * Note that this is not nearly as robust as a database, you are encouraged
+ * to use the PDO backend instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The storage file
+     *
+     * @var string
+     */
+    private $locksFile;
+
+    /**
+     * Constructor
+     *
+     * @param string $locksFile path to file
+     */
+    public function __construct($locksFile) {
+
+        $this->locksFile = $locksFile;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        $newLocks = array();
+
+        $locks = $this->getData();
+
+        foreach($locks as $lock) {
+
+            if ($lock->uri === $uri ||
+                //deep locks on parents
+                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
+
+                // locks on children
+                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
+
+                $newLocks[] = $lock;
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($newLocks as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
+        }
+        return $newLocks;
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getData();
+
+        foreach($locks as $k=>$lock) {
+            if (
+                ($lock->token == $lockInfo->token) ||
+                (time() > $lock->timeout + $lock->created)
+            ) {
+                unset($locks[$k]);
+            }
+        }
+        $locks[] = $lockInfo;
+        $this->putData($locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getData();
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Loads the lockdata from the filesystem.
+     *
+     * @return array
+     */
+    protected function getData() {
+
+        if (!file_exists($this->locksFile)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($this->locksFile,'r');
+        flock($handle,LOCK_SH);
+
+        // Reading data until the eof
+        $data = stream_get_contents($handle);
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Saves the lockdata
+     *
+     * @param array $newData
+     * @return void
+     */
+    protected function putData(array $newData) {
+
+        // opening up the file, and creating an exclusive lock
+        $handle = fopen($this->locksFile,'a+');
+        flock($handle,LOCK_EX);
+
+        // We can only truncate and rewind once the lock is acquired.
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
new file mode 100755
index 0000000000..acce80638e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a database. You must pass a PDO
+ * connection object in the constructor.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The PDO connection object
+     *
+     * @var pdo
+     */
+    private $pdo;
+
+    /**
+     * The PDO tablename this backend uses.
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * Constructor
+     *
+     * @param PDO $pdo
+     * @param string $tableName
+     */
+    public function __construct(PDO $pdo, $tableName = 'locks') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        // NOTE: the following 10 lines or so could be easily replaced by
+        // pure sql. MySQL's non-standard string concatenation prevents us
+        // from doing this though.
+        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM '.$this->tableName.' WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
+        $params = array(time(),$uri);
+
+        // We need to check locks for every part in the uri.
+        $uriParts = explode('/',$uri);
+
+        // We already covered the last part of the uri
+        array_pop($uriParts);
+
+        $currentPath='';
+
+        foreach($uriParts as $part) {
+
+            if ($currentPath) $currentPath.='/';
+            $currentPath.=$part;
+
+            $query.=' OR (depth!=0 AND uri = ?)';
+            $params[] = $currentPath;
+
+        }
+
+        if ($returnChildLocks) {
+
+            $query.=' OR (uri LIKE ?)';
+            $params[] = $uri . '/%';
+
+        }
+        $query.=')';
+
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($params);
+        $result = $stmt->fetchAll();
+
+        $lockList = array();
+        foreach($result as $row) {
+
+            $lockInfo = new Sabre_DAV_Locks_LockInfo();
+            $lockInfo->owner = $row['owner'];
+            $lockInfo->token = $row['token'];
+            $lockInfo->timeout = $row['timeout'];
+            $lockInfo->created = $row['created'];
+            $lockInfo->scope = $row['scope'];
+            $lockInfo->depth = $row['depth'];
+            $lockInfo->uri   = $row['uri'];
+            $lockList[] = $lockInfo;
+
+        }
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 30*60;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getLocks($uri,false);
+        $exists = false;
+        foreach($locks as $lock) {
+            if ($lock->token == $lockInfo->token) $exists = true;
+        }
+
+        if ($exists) {
+            $stmt = $this->pdo->prepare('UPDATE '.$this->tableName.' SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        } else {
+            $stmt = $this->pdo->prepare('INSERT INTO '.$this->tableName.' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        }
+
+        return true;
+
+    }
+
+
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->tableName.' WHERE uri = ? AND token = ?');
+        $stmt->execute(array($uri,$lockInfo->token));
+
+        return $stmt->rowCount()===1;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php
new file mode 100755
index 0000000000..9df014a428
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/LockInfo.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * LockInfo class
+ *
+ * An object of the LockInfo class holds all the information relevant to a
+ * single lock.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_LockInfo {
+
+    /**
+     * A shared lock
+     */
+    const SHARED = 1;
+
+    /**
+     * An exclusive lock
+     */
+    const EXCLUSIVE = 2;
+
+    /**
+     * A never expiring timeout
+     */
+    const TIMEOUT_INFINITE = -1;
+
+    /**
+     * The owner of the lock
+     *
+     * @var string
+     */
+    public $owner;
+
+    /**
+     * The locktoken
+     *
+     * @var string
+     */
+    public $token;
+
+    /**
+     * How long till the lock is expiring
+     *
+     * @var int
+     */
+    public $timeout;
+
+    /**
+     * UNIX Timestamp of when this lock was created
+     *
+     * @var int
+     */
+    public $created;
+
+    /**
+     * Exclusive or shared lock
+     *
+     * @var int
+     */
+    public $scope = self::EXCLUSIVE;
+
+    /**
+     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
+     */
+    public $depth = 0;
+
+    /**
+     * The uri this lock locks
+     *
+     * TODO: This value is not always set
+     * @var mixed
+     */
+    public $uri;
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php
new file mode 100755
index 0000000000..fd956950b8
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Plugin.php
@@ -0,0 +1,633 @@
+<?php
+
+/**
+ * Locking plugin
+ *
+ * This plugin provides locking support to a WebDAV server.
+ * The easiest way to get started, is by hooking it up as such:
+ *
+ * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
+ * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
+ * $server->addPlugin($lockPlugin);
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * locksBackend
+     *
+     * @var Sabre_DAV_Locks_Backend_Abstract
+     */
+    private $locksBackend;
+
+    /**
+     * server
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * __construct
+     *
+     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend
+     */
+    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
+
+        $this->locksBackend = $locksBackend;
+
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * This method is automatically called by the Server class after addPlugin.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'locks';
+
+    }
+
+    /**
+     * This method is called by the Server if the user used an HTTP method
+     * the server didn't recognize.
+     *
+     * This plugin intercepts the LOCK and UNLOCK methods.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function unknownMethod($method, $uri) {
+
+        switch($method) {
+
+            case 'LOCK'   : $this->httpLock($uri); return false;
+            case 'UNLOCK' : $this->httpUnlock($uri); return false;
+
+        }
+
+    }
+
+    /**
+     * This method is called after most properties have been found
+     * it allows us to add in any Lock-related properties
+     *
+     * @param string $path
+     * @param array $newProperties
+     * @return bool
+     */
+    public function afterGetProperties($path, &$newProperties) {
+
+        foreach($newProperties[404] as $propName=>$discard) {
+
+            switch($propName) {
+
+                case '{DAV:}supportedlock' :
+                    $val = false;
+                    if ($this->locksBackend) $val = true;
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
+                    unset($newProperties[404][$propName]);
+                    break;
+
+                case '{DAV:}lockdiscovery' :
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
+                    unset($newProperties[404][$propName]);
+                    break;
+
+            }
+
+
+        }
+        return true;
+
+    }
+
+
+    /**
+     * This method is called before the logic for any HTTP method is
+     * handled.
+     *
+     * This plugin uses that feature to intercept access to locked resources.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        switch($method) {
+
+            case 'DELETE' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock, true))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MKCOL' :
+            case 'PROPPATCH' :
+            case 'PUT' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MOVE' :
+                $lastLock = null;
+                if (!$this->validateLock(array(
+                      $uri,
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                    ),$lastLock, true))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'COPY' :
+                $lastLock = null;
+                if (!$this->validateLock(
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                      $lastLock, true))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getHTTPMethods($uri) {
+
+        if ($this->locksBackend)
+            return array('LOCK','UNLOCK');
+
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the HTTP OPTIONS Dav: header.
+     *
+     * In this case this is only the number 2. The 2 in the Dav: header
+     * indicates the server supports locks.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array(2);
+
+    }
+
+    /**
+     * Returns all lock information on a particular uri
+     *
+     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
+     *
+     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
+     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
+     * for any possible locks and return those as well.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks = false) {
+
+        $lockList = array();
+
+        if ($this->locksBackend)
+            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks an uri
+     *
+     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
+     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
+     * of lock (shared or exclusive) and the owner of the lock
+     *
+     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
+     *
+     * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpLock($uri) {
+
+        $lastLock = null;
+        if (!$this->validateLock($uri,$lastLock)) {
+
+            // If the existing lock was an exclusive lock, we need to fail
+            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
+                //var_dump($lastLock);
+                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+            }
+
+        }
+
+        if ($body = $this->server->httpRequest->getBody(true)) {
+            // This is a new lock request
+            $lockInfo = $this->parseLockRequest($body);
+            $lockInfo->depth = $this->server->getHTTPDepth();
+            $lockInfo->uri = $uri;
+            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+
+        } elseif ($lastLock) {
+
+            // This must have been a lock refresh
+            $lockInfo = $lastLock;
+
+            // The resource could have been locked through another uri.
+            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
+
+        } else {
+
+            // There was neither a lock refresh nor a new lock request
+            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
+
+        }
+
+        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
+
+        $newFile = false;
+
+        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
+        try {
+            $this->server->tree->getNodeForPath($uri);
+
+            // We need to call the beforeWriteContent event for RFC3744
+            $this->server->broadcastEvent('beforeWriteContent',array($uri));
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            // It didn't, lets create it
+            $this->server->createFile($uri,fopen('php://memory','r'));
+            $newFile = true;
+
+        }
+
+        $this->lockNode($uri,$lockInfo);
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
+        $this->server->httpResponse->sendStatus($newFile?201:200);
+        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
+     * The server should return 204 (No content) on success
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpUnlock($uri) {
+
+        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
+
+        // If the locktoken header is not supplied, we need to throw a bad request exception
+        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
+
+        $locks = $this->getLocks($uri);
+
+        // Windows sometimes forgets to include < and > in the Lock-Token
+        // header
+        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
+
+        foreach($locks as $lock) {
+
+            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
+
+                $this->unlockNode($uri,$lock);
+                $this->server->httpResponse->setHeader('Content-Length','0');
+                $this->server->httpResponse->sendStatus(204);
+                return;
+
+            }
+
+        }
+
+        // If we got here, it means the locktoken was invalid
+        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
+     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
+
+        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
+        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
+
+    }
+
+
+    /**
+     * Returns the contents of the HTTP Timeout header.
+     *
+     * The method formats the header into an integer.
+     *
+     * @return int
+     */
+    public function getTimeoutHeader() {
+
+        $header = $this->server->httpRequest->getHeader('Timeout');
+
+        if ($header) {
+
+            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
+            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
+            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
+
+        } else {
+
+            $header = 0;
+
+        }
+
+        return $header;
+
+    }
+
+    /**
+     * Generates the response for successful LOCK requests
+     *
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return string
+     */
+    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+
+        $prop = $dom->createElementNS('DAV:','d:prop');
+        $dom->appendChild($prop);
+
+        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
+        $prop->appendChild($lockDiscovery);
+
+        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
+        $lockObj->serialize($this->server,$lockDiscovery);
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * validateLock should be called when a write operation is about to happen
+     * It will check if the requested url is locked, and see if the correct lock tokens are passed
+     *
+     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
+     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
+     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
+     * @return bool
+     */
+    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
+
+        if (is_null($urls)) {
+            $urls = array($this->server->getRequestUri());
+        } elseif (is_string($urls)) {
+            $urls = array($urls);
+        } elseif (!is_array($urls)) {
+            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
+        }
+
+        $conditions = $this->getIfConditions();
+
+        // We're going to loop through the urls and make sure all lock conditions are satisfied
+        foreach($urls as $url) {
+
+            $locks = $this->getLocks($url, $checkChildLocks);
+
+            // If there were no conditions, but there were locks, we fail
+            if (!$conditions && $locks) {
+                reset($locks);
+                $lastLock = current($locks);
+                return false;
+            }
+
+            // If there were no locks or conditions, we go to the next url
+            if (!$locks && !$conditions) continue;
+
+            foreach($conditions as $condition) {
+
+                if (!$condition['uri']) {
+                    $conditionUri = $this->server->getRequestUri();
+                } else {
+                    $conditionUri = $this->server->calculateUri($condition['uri']);
+                }
+
+                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
+                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
+
+                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
+                // At least 1 condition has to be satisfied
+                foreach($condition['tokens'] as $conditionToken) {
+
+                    $etagValid = true;
+                    $lockValid  = true;
+
+                    // key 2 can contain an etag
+                    if ($conditionToken[2]) {
+
+                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
+                        $node = $this->server->tree->getNodeForPath($uri);
+                        $etagValid = $node->getETag()==$conditionToken[2];
+
+                    }
+
+                    // key 1 can contain a lock token
+                    if ($conditionToken[1]) {
+
+                        $lockValid = false;
+                        // Match all the locks
+                        foreach($locks as $lockIndex=>$lock) {
+
+                            $lockToken = 'opaquelocktoken:' . $lock->token;
+
+                            // Checking NOT
+                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
+
+                                // Condition valid, onto the next
+                                $lockValid = true;
+                                break;
+                            }
+                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
+
+                                $lastLock = $lock;
+                                // Condition valid and lock matched
+                                unset($locks[$lockIndex]);
+                                $lockValid = true;
+                                break;
+
+                            }
+
+                        }
+
+                    }
+
+                    // If, after checking both etags and locks they are stil valid,
+                    // we can continue with the next condition.
+                    if ($etagValid && $lockValid) continue 2;
+               }
+               // No conditions matched, so we fail
+               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
+            }
+
+            // Conditions were met, we'll also need to check if all the locks are gone
+            if (count($locks)) {
+
+                reset($locks);
+
+                // There's still locks, we fail
+                $lastLock = current($locks);
+                return false;
+
+            }
+
+
+        }
+
+        // We got here, this means every condition was satisfied
+        return true;
+
+    }
+
+    /**
+     * This method is created to extract information from the WebDAV HTTP 'If:' header
+     *
+     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
+     * The function will return an array, containing structs with the following keys
+     *
+     *   * uri   - the uri the condition applies to. If this is returned as an
+     *     empty string, this implies it's referring to the request url.
+     *   * tokens - The lock token. another 2 dimensional array containing 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
+     *   * etag - an etag, if supplied
+     *
+     * @return array
+     */
+    public function getIfConditions() {
+
+        $header = $this->server->httpRequest->getHeader('If');
+        if (!$header) return array();
+
+        $matches = array();
+
+        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
+        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
+
+        $conditions = array();
+
+        foreach($matches as $match) {
+
+            $condition = array(
+                'uri'   => $match['uri'],
+                'tokens' => array(
+                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
+                ),
+            );
+
+            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
+                $match['not']?0:1,
+                $match['token'],
+                isset($match['etag'])?$match['etag']:''
+            );
+            else {
+                $conditions[] = $condition;
+            }
+
+        }
+
+        return $conditions;
+
+    }
+
+    /**
+     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object
+     *
+     * @param string $body
+     * @return Sabre_DAV_Locks_LockInfo
+     */
+    protected function parseLockRequest($body) {
+
+        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
+        $xml->registerXPathNamespace('d','DAV:');
+        $lockInfo = new Sabre_DAV_Locks_LockInfo();
+
+        $children = $xml->children("DAV:");
+        $lockInfo->owner = (string)$children->owner;
+
+        $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
+        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
+
+        return $lockInfo;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Mount/Plugin.php b/3rdparty/Sabre/DAV/Mount/Plugin.php
new file mode 100755
index 0000000000..b37a90ae99
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Mount/Plugin.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * This plugin provides support for RFC4709: Mounting WebDAV servers
+ *
+ * Simply append ?mount to any collection to generate the davmount response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ */
+class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handles
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?mount
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='mount') return;
+
+        $currentUri = $this->server->httpRequest->getAbsoluteUri();
+
+        // Stripping off everything after the ?
+        list($currentUri) = explode('?',$currentUri);
+
+        $this->davMount($currentUri);
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Generates the davmount response
+     *
+     * @param string $uri absolute uri
+     * @return void
+     */
+    public function davMount($uri) {
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
+        ob_start();
+        echo '<?xml version="1.0"?>', "\n";
+        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
+        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
+        echo "</dm:mount>";
+        $this->server->httpResponse->sendBody(ob_get_clean());
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Node.php b/3rdparty/Sabre/DAV/Node.php
new file mode 100755
index 0000000000..070b7176af
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Node.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Node class
+ *
+ * This is a helper class, that should aid in getting nodes setup.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
+
+    /**
+     * Returns the last modification time
+     *
+     * In this case, it will simply return the current time
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return time();
+
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ObjectTree.php b/3rdparty/Sabre/DAV/ObjectTree.php
new file mode 100755
index 0000000000..bce5146390
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ObjectTree.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * ObjectTree class
+ *
+ * This implementation of the Tree class makes use of the INode, IFile and ICollection API's
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
+
+    /**
+     * The root node
+     *
+     * @var Sabre_DAV_ICollection
+     */
+    protected $rootNode;
+
+    /**
+     * This is the node cache. Accessed nodes are stored here
+     *
+     * @var array
+     */
+    protected $cache = array();
+
+    /**
+     * Creates the object
+     *
+     * This method expects the rootObject to be passed as a parameter
+     *
+     * @param Sabre_DAV_ICollection $rootNode
+     */
+    public function __construct(Sabre_DAV_ICollection $rootNode) {
+
+        $this->rootNode = $rootNode;
+
+    }
+
+    /**
+     * Returns the INode object for the requested path
+     *
+     * @param string $path
+     * @return Sabre_DAV_INode
+     */
+    public function getNodeForPath($path) {
+
+        $path = trim($path,'/');
+        if (isset($this->cache[$path])) return $this->cache[$path];
+
+        //if (!$path || $path=='.') return $this->rootNode;
+        $currentNode = $this->rootNode;
+
+        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node..
+        foreach(explode('/',$path) as $pathPart) {
+
+            // If this part of the path is just a dot, it actually means we can skip it
+            if ($pathPart=='.' || $pathPart=='') continue;
+
+            if (!($currentNode instanceof Sabre_DAV_ICollection))
+                throw new Sabre_DAV_Exception_NotFound('Could not find node at path: ' . $path);
+
+            $currentNode = $currentNode->getChild($pathPart);
+
+        }
+
+        $this->cache[$path] = $currentNode;
+        return $currentNode;
+
+    }
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            // The root always exists
+            if ($path==='') return true;
+
+            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
+
+            $parentNode = $this->getNodeForPath($parent);
+            if (!$parentNode instanceof Sabre_DAV_ICollection) return false;
+            return $parentNode->childExists($base);
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        $children = $node->getChildren();
+        foreach($children as $child) {
+
+            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
+
+        }
+        return $children;
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes
+     *
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     *
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path
+     * @return void
+     */
+    public function markDirty($path) {
+
+        // We don't care enough about sub-paths
+        // flushing the entire cache
+        $path = trim($path,'/');
+        foreach($this->cache as $nodePath=>$node) {
+            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
+                unset($this->cache[$nodePath]);
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property.php b/3rdparty/Sabre/DAV/Property.php
new file mode 100755
index 0000000000..1cfada3236
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Abstract property class
+ *
+ * Extend this class to create custom complex properties
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Property {
+
+    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop);
+
+    static function unserialize(DOMElement $prop) {
+
+        throw new Sabre_DAV_Exception('Unserialize has not been implemented for this class');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/GetLastModified.php b/3rdparty/Sabre/DAV/Property/GetLastModified.php
new file mode 100755
index 0000000000..bd63f57314
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/GetLastModified.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This property represents the {DAV:}getlastmodified property.
+ *
+ * Although this is normally a simple property, windows requires us to add
+ * some new attributes.
+ *
+ * This class uses unix timestamps internally, and converts them to RFC 1123 times for
+ * serialization
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
+
+    /**
+     * time
+     *
+     * @var int
+     */
+    public $time;
+
+    /**
+     * __construct
+     *
+     * @param int|DateTime $time
+     */
+    public function __construct($time) {
+
+        if ($time instanceof DateTime) {
+            $this->time = $time;
+        } elseif (is_int($time) || ctype_digit($time)) {
+            $this->time = new DateTime('@' . $time);
+        } else {
+            $this->time = new DateTime($time);
+        }
+
+        // Setting timezone to UTC
+        $this->time->setTimezone(new DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement       $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
+        $prop->setAttribute('b:dt','dateTime.rfc1123');
+        $prop->nodeValue = Sabre_HTTP_Util::toHTTPDate($this->time);
+
+    }
+
+    /**
+     * getTime
+     *
+     * @return DateTime
+     */
+    public function getTime() {
+
+        return $this->time;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/Href.php b/3rdparty/Sabre/DAV/Property/Href.php
new file mode 100755
index 0000000000..dac564f24d
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/Href.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Href property
+ *
+ * The href property represents a url within a {DAV:}href element.
+ * This is used by many WebDAV extensions, but not really within the WebDAV core spec
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * href
+     *
+     * @var string
+     */
+    private $href;
+
+    /**
+     * Automatically prefix the url with the server base directory
+     *
+     * @var bool
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct
+     *
+     * @param string $href
+     * @param bool $autoPrefix
+     */
+    public function __construct($href, $autoPrefix = true) {
+
+        $this->href = $href;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uri
+     *
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        $elem = $dom->ownerDocument->createElement($prefix . ':href');
+        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
+        $dom->appendChild($elem);
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_Href
+     */
+    static function unserialize(DOMElement $dom) {
+
+        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
+            return new self($dom->firstChild->textContent,false);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/HrefList.php b/3rdparty/Sabre/DAV/Property/HrefList.php
new file mode 100755
index 0000000000..7a52272e88
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/HrefList.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * HrefList property
+ *
+ * This property contains multiple {DAV:}href elements, each containing a url.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
+
+    /**
+     * hrefs
+     *
+     * @var array
+     */
+    private $hrefs;
+
+    /**
+     * Automatically prefix the url with the server base directory
+     *
+     * @var bool
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct
+     *
+     * @param array $hrefs
+     * @param bool $autoPrefix
+     */
+    public function __construct(array $hrefs, $autoPrefix = true) {
+
+        $this->hrefs = $hrefs;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uris
+     *
+     * @return array
+     */
+    public function getHrefs() {
+
+        return $this->hrefs;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        foreach($this->hrefs as $href) {
+            $elem = $dom->ownerDocument->createElement($prefix . ':href');
+            $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $href;
+            $dom->appendChild($elem);
+        }
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_Href
+     */
+    static function unserialize(DOMElement $dom) {
+
+        $hrefs = array();
+        foreach($dom->childNodes as $child) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($child)==='{DAV:}href') {
+                $hrefs[] = $child->textContent;
+            }
+        }
+        return new self($hrefs, false);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php
new file mode 100755
index 0000000000..5c0409064c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/IHref.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * IHref interface
+ *
+ * Any property implementing this interface can expose a related url.
+ * This is used by certain subsystems to aquire more information about for example
+ * the owner of a file
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Property_IHref {
+
+    /**
+     * getHref
+     *
+     * @return string
+     */
+    function getHref();
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/LockDiscovery.php b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
new file mode 100755
index 0000000000..2ded5649a4
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Represents {DAV:}lockdiscovery property
+ *
+ * This property contains all the open locks on a given resource
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
+
+    /**
+     * locks
+     *
+     * @var array
+     */
+    public $locks;
+
+    /**
+     * Should we show the locktoken as well?
+     *
+     * @var bool
+     */
+    public $revealLockToken;
+
+    /**
+     * Hides the {DAV:}lockroot element from the response.
+     *
+     * It was reported that showing the lockroot in the response can break
+     * Office 2000 compatibility.
+     */
+    static public $hideLockRoot = false;
+
+    /**
+     * __construct
+     *
+     * @param array $locks
+     * @param bool $revealLockToken
+     */
+    public function __construct($locks, $revealLockToken = false) {
+
+        $this->locks = $locks;
+        $this->revealLockToken = $revealLockToken;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement       $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        foreach($this->locks as $lock) {
+
+            $activeLock = $doc->createElementNS('DAV:','d:activelock');
+            $prop->appendChild($activeLock);
+
+            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
+            $activeLock->appendChild($lockScope);
+
+            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
+
+            $lockType = $doc->createElementNS('DAV:','d:locktype');
+            $activeLock->appendChild($lockType);
+
+            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
+
+            /* {DAV:}lockroot */
+            if (!self::$hideLockRoot) {
+                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
+                $activeLock->appendChild($lockRoot);
+                $href = $doc->createElementNS('DAV:','d:href');
+                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
+                $lockRoot->appendChild($href);
+            }
+
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
+
+            if ($this->revealLockToken) {
+                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
+                $activeLock->appendChild($lockToken);
+                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
+            }
+
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/ResourceType.php b/3rdparty/Sabre/DAV/Property/ResourceType.php
new file mode 100755
index 0000000000..f6269611e5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/ResourceType.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * This class represents the {DAV:}resourcetype property
+ *
+ * Normally for files this is empty, and for collection {DAV:}collection.
+ * However, other specs define different values for this.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
+
+    /**
+     * resourceType
+     *
+     * @var array
+     */
+    public $resourceType = array();
+
+    /**
+     * __construct
+     *
+     * @param mixed $resourceType
+     */
+    public function __construct($resourceType = array()) {
+
+        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
+            $this->resourceType = array();
+        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
+            $this->resourceType = array('{DAV:}collection');
+        elseif (is_array($resourceType))
+            $this->resourceType = $resourceType;
+        else
+            $this->resourceType = array($resourceType);
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $propName = null;
+        $rt = $this->resourceType;
+
+        foreach($rt as $resourceType) {
+            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) {
+
+                if (isset($server->xmlNamespaces[$propName[1]])) {
+                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
+                } else {
+                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
+                }
+
+            }
+        }
+
+    }
+
+    /**
+     * Returns the values in clark-notation
+     *
+     * For example array('{DAV:}collection')
+     *
+     * @return array
+     */
+    public function getValue() {
+
+        return $this->resourceType;
+
+    }
+
+    /**
+     * Checks if the principal contains a certain value
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function is($type) {
+
+        return in_array($type, $this->resourceType);
+
+    }
+
+    /**
+     * Adds a resourcetype value to this property
+     *
+     * @param string $type
+     * @return void
+     */
+    public function add($type) {
+
+        $this->resourceType[] = $type;
+        $this->resourceType = array_unique($this->resourceType);
+
+    }
+
+    /**
+     * Unserializes a DOM element into a ResourceType property.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_ResourceType
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $value = array();
+        foreach($dom->childNodes as $child) {
+
+            $value[] = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+        }
+
+        return new self($value);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/Response.php b/3rdparty/Sabre/DAV/Property/Response.php
new file mode 100755
index 0000000000..88afbcfb26
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/Response.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Response property
+ *
+ * This class represents the {DAV:}response XML element.
+ * This is used by the Server class to encode individual items within a multistatus
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * Url for the response
+     *
+     * @var string
+     */
+    private $href;
+
+    /**
+     * Propertylist, ordered by HTTP status code
+     *
+     * @var array
+     */
+    private $responseProperties;
+
+    /**
+     * The responseProperties argument is a list of properties
+     * within an array with keys representing HTTP status codes
+     *
+     * @param string $href
+     * @param array $responseProperties
+     */
+    public function __construct($href, array $responseProperties) {
+
+        $this->href = $href;
+        $this->responseProperties = $responseProperties;
+
+    }
+
+    /**
+     * Returns the url
+     *
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Returns the property list
+     *
+     * @return array
+     */
+    public function getResponseProperties() {
+
+        return $this->responseProperties;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
+
+        $document = $dom->ownerDocument;
+        $properties = $this->responseProperties;
+
+        $xresponse = $document->createElement('d:response');
+        $dom->appendChild($xresponse);
+
+        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
+
+        // Adding the baseurl to the beginning of the url
+        $uri = $server->getBaseUri() . $uri;
+
+        $xresponse->appendChild($document->createElement('d:href',$uri));
+
+        // The properties variable is an array containing properties, grouped by
+        // HTTP status
+        foreach($properties as $httpStatus=>$propertyGroup) {
+
+            // The 'href' is also in this array, and it's special cased.
+            // We will ignore it
+            if ($httpStatus=='href') continue;
+
+            // If there are no properties in this group, we can also just carry on
+            if (!count($propertyGroup)) continue;
+
+            $xpropstat = $document->createElement('d:propstat');
+            $xresponse->appendChild($xpropstat);
+
+            $xprop = $document->createElement('d:prop');
+            $xpropstat->appendChild($xprop);
+
+            $nsList = $server->xmlNamespaces;
+
+            foreach($propertyGroup as $propertyName=>$propertyValue) {
+
+                $propName = null;
+                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+
+                // special case for empty namespaces
+                if ($propName[1]=='') {
+
+                    $currentProperty = $document->createElement($propName[2]);
+                    $xprop->appendChild($currentProperty);
+                    $currentProperty->setAttribute('xmlns','');
+
+                } else {
+
+                    if (!isset($nsList[$propName[1]])) {
+                        $nsList[$propName[1]] = 'x' . count($nsList);
+                    }
+
+                    // If the namespace was defined in the top-level xml namespaces, it means
+                    // there was already a namespace declaration, and we don't have to worry about it.
+                    if (isset($server->xmlNamespaces[$propName[1]])) {
+                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+                    } else {
+                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
+                    }
+                    $xprop->appendChild($currentProperty);
+
+                }
+
+                if (is_scalar($propertyValue)) {
+                    $text = $document->createTextNode($propertyValue);
+                    $currentProperty->appendChild($text);
+                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
+                    $propertyValue->serialize($server,$currentProperty);
+                } elseif (!is_null($propertyValue)) {
+                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
+                }
+
+            }
+
+            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/ResponseList.php b/3rdparty/Sabre/DAV/Property/ResponseList.php
new file mode 100755
index 0000000000..cae923afbf
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/ResponseList.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * ResponseList property
+ *
+ * This class represents multiple {DAV:}response XML elements.
+ * This is used by the Server class to encode items within a multistatus
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
+
+    /**
+     * Response objects.
+     *
+     * @var array
+     */
+    private $responses;
+
+    /**
+     * The only valid argument is a list of Sabre_DAV_Property_Response
+     * objects.
+     *
+     * @param array $responses;
+     */
+    public function __construct($responses) {
+
+        foreach($responses as $response) {
+            if (!($response instanceof Sabre_DAV_Property_Response)) {
+                throw new InvalidArgumentException('You must pass an array of Sabre_DAV_Property_Response objects');
+            }
+        }
+        $this->responses = $responses;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        foreach($this->responses as $response) {
+            $response->serialize($server, $dom);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/SupportedLock.php b/3rdparty/Sabre/DAV/Property/SupportedLock.php
new file mode 100755
index 0000000000..4e3aaf23a1
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/SupportedLock.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This class represents the {DAV:}supportedlock property
+ *
+ * This property contains information about what kind of locks
+ * this server supports.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
+
+    /**
+     * supportsLocks
+     *
+     * @var mixed
+     */
+    public $supportsLocks = false;
+
+    /**
+     * __construct
+     *
+     * @param mixed $supportsLocks
+     */
+    public function __construct($supportsLocks) {
+
+        $this->supportsLocks = $supportsLocks;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement       $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        if (!$this->supportsLocks) return null;
+
+        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
+        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
+
+        $prop->appendChild($lockEntry1);
+        $prop->appendChild($lockEntry2);
+
+        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
+        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
+
+        $lockEntry1->appendChild($lockScope1);
+        $lockEntry1->appendChild($lockType1);
+        $lockEntry2->appendChild($lockScope2);
+        $lockEntry2->appendChild($lockType2);
+
+        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
+        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
+
+        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
+        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
+
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
new file mode 100755
index 0000000000..e62699f3b5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * supported-report-set property.
+ *
+ * This property is defined in RFC3253, but since it's
+ * so common in other webdav-related specs, it is part of the core server.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
+
+    /**
+     * List of reports
+     *
+     * @var array
+     */
+    protected $reports = array();
+
+    /**
+     * Creates the property
+     *
+     * Any reports passed in the constructor
+     * should be valid report-types in clark-notation.
+     *
+     * Either a string or an array of strings must be passed.
+     *
+     * @param mixed $reports
+     */
+    public function __construct($reports = null) {
+
+        if (!is_null($reports))
+            $this->addReport($reports);
+
+    }
+
+    /**
+     * Adds a report to this property
+     *
+     * The report must be a string in clark-notation.
+     * Multiple reports can be specified as an array.
+     *
+     * @param mixed $report
+     * @return void
+     */
+    public function addReport($report) {
+
+        if (!is_array($report)) $report = array($report);
+
+        foreach($report as $r) {
+
+            if (!preg_match('/^{([^}]*)}(.*)$/',$r))
+                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
+
+            $this->reports[] = $r;
+
+        }
+
+    }
+
+    /**
+     * Returns the list of supported reports
+     *
+     * @return array
+     */
+    public function getValue() {
+
+        return $this->reports;
+
+    }
+
+    /**
+     * Serializes the node
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        foreach($this->reports as $reportName) {
+
+            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
+            $prop->appendChild($supportedReport);
+
+            $report = $prop->ownerDocument->createElement('d:report');
+            $supportedReport->appendChild($report);
+
+            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
+
+            list(, $namespace, $element) = $matches;
+
+            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
+
+            if ($prefix) {
+                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
+            } else {
+                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
+            }
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
new file mode 100755
index 0000000000..0dfac8b0c7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Server.php
@@ -0,0 +1,2006 @@
+<?php
+
+/**
+ * Main DAV server class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Server {
+
+    /**
+     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
+     */
+    const DEPTH_INFINITY = -1;
+
+    /**
+     * Nodes that are files, should have this as the type property
+     */
+    const NODE_FILE = 1;
+
+    /**
+     * Nodes that are directories, should use this value as the type property
+     */
+    const NODE_DIRECTORY = 2;
+
+    /**
+     * XML namespace for all SabreDAV related elements
+     */
+    const NS_SABREDAV = 'http://sabredav.org/ns';
+
+    /**
+     * The tree object
+     *
+     * @var Sabre_DAV_Tree
+     */
+    public $tree;
+
+    /**
+     * The base uri
+     *
+     * @var string
+     */
+    protected $baseUri = null;
+
+    /**
+     * httpResponse
+     *
+     * @var Sabre_HTTP_Response
+     */
+    public $httpResponse;
+
+    /**
+     * httpRequest
+     *
+     * @var Sabre_HTTP_Request
+     */
+    public $httpRequest;
+
+    /**
+     * The list of plugins
+     *
+     * @var array
+     */
+    protected $plugins = array();
+
+    /**
+     * This array contains a list of callbacks we should call when certain events are triggered
+     *
+     * @var array
+     */
+    protected $eventSubscriptions = array();
+
+    /**
+     * This is a default list of namespaces.
+     *
+     * If you are defining your own custom namespace, add it here to reduce
+     * bandwidth and improve legibility of xml bodies.
+     *
+     * @var array
+     */
+    public $xmlNamespaces = array(
+        'DAV:' => 'd',
+        'http://sabredav.org/ns' => 's',
+    );
+
+    /**
+     * The propertymap can be used to map properties from
+     * requests to property classes.
+     *
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}resourcetype' => 'Sabre_DAV_Property_ResourceType',
+    );
+
+    public $protectedProperties = array(
+        // RFC4918
+        '{DAV:}getcontentlength',
+        '{DAV:}getetag',
+        '{DAV:}getlastmodified',
+        '{DAV:}lockdiscovery',
+        '{DAV:}resourcetype',
+        '{DAV:}supportedlock',
+
+        // RFC4331
+        '{DAV:}quota-available-bytes',
+        '{DAV:}quota-used-bytes',
+
+        // RFC3744
+        '{DAV:}supported-privilege-set',
+        '{DAV:}current-user-privilege-set',
+        '{DAV:}acl',
+        '{DAV:}acl-restrictions',
+        '{DAV:}inherited-acl-set',
+
+    );
+
+    /**
+     * This is a flag that allow or not showing file, line and code
+     * of the exception in the returned XML
+     *
+     * @var bool
+     */
+    public $debugExceptions = false;
+
+    /**
+     * This property allows you to automatically add the 'resourcetype' value
+     * based on a node's classname or interface.
+     *
+     * The preset ensures that {DAV:}collection is automaticlly added for nodes
+     * implementing Sabre_DAV_ICollection.
+     *
+     * @var array
+     */
+    public $resourceTypeMapping = array(
+        'Sabre_DAV_ICollection' => '{DAV:}collection',
+    );
+
+    /**
+     * If this setting is turned off, SabreDAV's version number will be hidden
+     * from various places.
+     *
+     * Some people feel this is a good security measure.
+     *
+     * @var bool
+     */
+    static public $exposeVersion = true;
+
+    /**
+     * Sets up the server
+     *
+     * If a Sabre_DAV_Tree object is passed as an argument, it will
+     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
+     * will create a Sabre_DAV_ObjectTree and use the node as the root.
+     *
+     * If nothing is passed, a Sabre_DAV_SimpleCollection is created in
+     * a Sabre_DAV_ObjectTree.
+     *
+     * If an array is passed, we automatically create a root node, and use
+     * the nodes in the array as top-level children.
+     *
+     * @param Sabre_DAV_Tree|Sabre_DAV_INode|null $treeOrNode The tree object
+     */
+    public function __construct($treeOrNode = null) {
+
+        if ($treeOrNode instanceof Sabre_DAV_Tree) {
+            $this->tree = $treeOrNode;
+        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
+            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
+        } elseif (is_array($treeOrNode)) {
+
+            // If it's an array, a list of nodes was passed, and we need to
+            // create the root node.
+            foreach($treeOrNode as $node) {
+                if (!($node instanceof Sabre_DAV_INode)) {
+                    throw new Sabre_DAV_Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre_DAV_INode');
+                }
+            }
+
+            $root = new Sabre_DAV_SimpleCollection('root', $treeOrNode);
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+
+        } elseif (is_null($treeOrNode)) {
+            $root = new Sabre_DAV_SimpleCollection('root');
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+        } else {
+            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode, an array or null');
+        }
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Starts the DAV Server
+     *
+     * @return void
+     */
+    public function exec() {
+
+        try {
+
+            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
+
+        } catch (Exception $e) {
+
+            $DOM = new DOMDocument('1.0','utf-8');
+            $DOM->formatOutput = true;
+
+            $error = $DOM->createElementNS('DAV:','d:error');
+            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
+            $DOM->appendChild($error);
+
+            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
+            $error->appendChild($DOM->createElement('s:message',$e->getMessage()));
+            if ($this->debugExceptions) {
+                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
+                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
+                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
+                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
+
+            }
+            if (self::$exposeVersion) {
+                $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
+            }
+
+            if($e instanceof Sabre_DAV_Exception) {
+
+                $httpCode = $e->getHTTPCode();
+                $e->serialize($this,$error);
+                $headers = $e->getHTTPHeaders($this);
+
+            } else {
+
+                $httpCode = 500;
+                $headers = array();
+
+            }
+            $headers['Content-Type'] = 'application/xml; charset=utf-8';
+
+            $this->httpResponse->sendStatus($httpCode);
+            $this->httpResponse->setHeaders($headers);
+            $this->httpResponse->sendBody($DOM->saveXML());
+
+        }
+
+    }
+
+    /**
+     * Sets the base server uri
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function setBaseUri($uri) {
+
+        // If the baseUri does not end with a slash, we must add it
+        if ($uri[strlen($uri)-1]!=='/')
+            $uri.='/';
+
+        $this->baseUri = $uri;
+
+    }
+
+    /**
+     * Returns the base responding uri
+     *
+     * @return string
+     */
+    public function getBaseUri() {
+
+        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
+        return $this->baseUri;
+
+    }
+
+    /**
+     * This method attempts to detect the base uri.
+     * Only the PATH_INFO variable is considered.
+     *
+     * If this variable is not set, the root (/) is assumed.
+     *
+     * @return string
+     */
+    public function guessBaseUri() {
+
+        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
+        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
+
+        // If PATH_INFO is found, we can assume it's accurate.
+        if (!empty($pathInfo)) {
+
+            // We need to make sure we ignore the QUERY_STRING part
+            if ($pos = strpos($uri,'?'))
+                $uri = substr($uri,0,$pos);
+
+            // PATH_INFO is only set for urls, such as: /example.php/path
+            // in that case PATH_INFO contains '/path'.
+            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
+            // not, Therefore they are only comparable if we first decode
+            // REQUEST_INFO as well.
+            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
+
+            // A simple sanity check:
+            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
+                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
+                return rtrim($baseUri,'/') . '/';
+            }
+
+            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
+
+        }
+
+        // The last fallback is that we're just going to assume the server root.
+        return '/';
+
+    }
+
+    /**
+     * Adds a plugin to the server
+     *
+     * For more information, console the documentation of Sabre_DAV_ServerPlugin
+     *
+     * @param Sabre_DAV_ServerPlugin $plugin
+     * @return void
+     */
+    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
+
+        $this->plugins[$plugin->getPluginName()] = $plugin;
+        $plugin->initialize($this);
+
+    }
+
+    /**
+     * Returns an initialized plugin by it's name.
+     *
+     * This function returns null if the plugin was not found.
+     *
+     * @param string $name
+     * @return Sabre_DAV_ServerPlugin
+     */
+    public function getPlugin($name) {
+
+        if (isset($this->plugins[$name]))
+            return $this->plugins[$name];
+
+        // This is a fallback and deprecated.
+        foreach($this->plugins as $plugin) {
+            if (get_class($plugin)===$name) return $plugin;
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Returns all plugins
+     *
+     * @return array
+     */
+    public function getPlugins() {
+
+        return $this->plugins;
+
+    }
+
+
+    /**
+     * Subscribe to an event.
+     *
+     * When the event is triggered, we'll call all the specified callbacks.
+     * It is possible to control the order of the callbacks through the
+     * priority argument.
+     *
+     * This is for example used to make sure that the authentication plugin
+     * is triggered before anything else. If it's not needed to change this
+     * number, it is recommended to ommit.
+     *
+     * @param string $event
+     * @param callback $callback
+     * @param int $priority
+     * @return void
+     */
+    public function subscribeEvent($event, $callback, $priority = 100) {
+
+        if (!isset($this->eventSubscriptions[$event])) {
+            $this->eventSubscriptions[$event] = array();
+        }
+        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
+        $this->eventSubscriptions[$event][$priority] = $callback;
+        ksort($this->eventSubscriptions[$event]);
+
+    }
+
+    /**
+     * Broadcasts an event
+     *
+     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
+     *
+     * The arguments parameter will be sent to all subscribers
+     *
+     * @param string $eventName
+     * @param array $arguments
+     * @return bool
+     */
+    public function broadcastEvent($eventName,$arguments = array()) {
+
+        if (isset($this->eventSubscriptions[$eventName])) {
+
+            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
+
+                $result = call_user_func_array($subscriber,$arguments);
+                if ($result===false) return false;
+
+            }
+
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Handles a http request, and execute a method based on its name
+     *
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function invokeMethod($method, $uri) {
+
+        $method = strtoupper($method);
+
+        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
+
+        // Make sure this is a HTTP method we support
+        $internalMethods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'MKCOL',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        if (in_array($method,$internalMethods)) {
+
+            call_user_func(array($this,'http' . $method), $uri);
+
+        } else {
+
+            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
+                // Unsupported method
+                throw new Sabre_DAV_Exception_NotImplemented('There was no handler found for this "' . $method . '" method');
+            }
+
+        }
+
+    }
+
+    // {{{ HTTP Method implementations
+
+    /**
+     * HTTP OPTIONS
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpOptions($uri) {
+
+        $methods = $this->getAllowedMethods($uri);
+
+        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
+        $features = array('1','3', 'extended-mkcol');
+
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+        $this->httpResponse->setHeader('MS-Author-Via','DAV');
+        $this->httpResponse->setHeader('Accept-Ranges','bytes');
+        if (self::$exposeVersion) {
+            $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
+        }
+        $this->httpResponse->setHeader('Content-Length',0);
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP GET
+     *
+     * This method simply fetches the contents of a uri, like normal
+     *
+     * @param string $uri
+     * @return bool
+     */
+    protected function httpGet($uri) {
+
+        $node = $this->tree->getNodeForPath($uri,0);
+
+        if (!$this->checkPreconditions(true)) return false;
+
+        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
+        $body = $node->get();
+
+        // Converting string into stream, if needed.
+        if (is_string($body)) {
+            $stream = fopen('php://temp','r+');
+            fwrite($stream,$body);
+            rewind($stream);
+            $body = $stream;
+        }
+
+        /*
+         * TODO: getetag, getlastmodified, getsize should also be used using
+         * this method
+         */
+        $httpHeaders = $this->getHTTPHeaders($uri);
+
+        /* ContentType needs to get a default, because many webservers will otherwise
+         * default to text/html, and we don't want this for security reasons.
+         */
+        if (!isset($httpHeaders['Content-Type'])) {
+            $httpHeaders['Content-Type'] = 'application/octet-stream';
+        }
+
+
+        if (isset($httpHeaders['Content-Length'])) {
+
+            $nodeSize = $httpHeaders['Content-Length'];
+
+            // Need to unset Content-Length, because we'll handle that during figuring out the range
+            unset($httpHeaders['Content-Length']);
+
+        } else {
+            $nodeSize = null;
+        }
+
+        $this->httpResponse->setHeaders($httpHeaders);
+
+        $range = $this->getHTTPRange();
+        $ifRange = $this->httpRequest->getHeader('If-Range');
+        $ignoreRangeHeader = false;
+
+        // If ifRange is set, and range is specified, we first need to check
+        // the precondition.
+        if ($nodeSize && $range && $ifRange) {
+
+            // if IfRange is parsable as a date we'll treat it as a DateTime
+            // otherwise, we must treat it as an etag.
+            try {
+                $ifRangeDate = new DateTime($ifRange);
+
+                // It's a date. We must check if the entity is modified since
+                // the specified date.
+                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
+                else {
+                    $modified = new DateTime($httpHeaders['Last-Modified']);
+                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
+                }
+
+            } catch (Exception $e) {
+
+                // It's an entity. We can do a simple comparison.
+                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
+                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
+            }
+        }
+
+        // We're only going to support HTTP ranges if the backend provided a filesize
+        if (!$ignoreRangeHeader && $nodeSize && $range) {
+
+            // Determining the exact byte offsets
+            if (!is_null($range[0])) {
+
+                $start = $range[0];
+                $end = $range[1]?$range[1]:$nodeSize-1;
+                if($start >= $nodeSize)
+                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+
+                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+                if($end >= $nodeSize) $end = $nodeSize-1;
+
+            } else {
+
+                $start = $nodeSize-$range[1];
+                $end  = $nodeSize-1;
+
+                if ($start<0) $start = 0;
+
+            }
+
+            // New read/write stream
+            $newStream = fopen('php://temp','r+');
+
+            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
+            rewind($newStream);
+
+            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
+            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
+            $this->httpResponse->sendStatus(206);
+            $this->httpResponse->sendBody($newStream);
+
+
+        } else {
+
+            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
+            $this->httpResponse->sendStatus(200);
+            $this->httpResponse->sendBody($body);
+
+        }
+
+    }
+
+    /**
+     * HTTP HEAD
+     *
+     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
+     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpHead($uri) {
+
+        $node = $this->tree->getNodeForPath($uri);
+        /* This information is only collection for File objects.
+         * Ideally we want to throw 405 Method Not Allowed for every
+         * non-file, but MS Office does not like this
+         */
+        if ($node instanceof Sabre_DAV_IFile) {
+            $headers = $this->getHTTPHeaders($this->getRequestUri());
+            if (!isset($headers['Content-Type'])) {
+                $headers['Content-Type'] = 'application/octet-stream';
+            }
+            $this->httpResponse->setHeaders($headers);
+        }
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP Delete
+     *
+     * The HTTP delete method, deletes a given uri
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpDelete($uri) {
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+        $this->tree->delete($uri);
+        $this->broadcastEvent('afterUnbind',array($uri));
+
+        $this->httpResponse->sendStatus(204);
+        $this->httpResponse->setHeader('Content-Length','0');
+
+    }
+
+
+    /**
+     * WebDAV PROPFIND
+     *
+     * This WebDAV method requests information about an uri resource, or a list of resources
+     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
+     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
+     *
+     * The request body contains an XML data structure that has a list of properties the client understands
+     * The response body is also an xml document, containing information about every uri resource and the requested properties
+     *
+     * It has to return a HTTP 207 Multi-status status code
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropfind($uri) {
+
+        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
+        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
+
+        $depth = $this->getHTTPDepth(1);
+        // The only two options for the depth of a propfind is 0 or 1
+        if ($depth!=0) $depth = 1;
+
+        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
+
+        // This is a multi-status response
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        // Normally this header is only needed for OPTIONS responses, however..
+        // iCal seems to also depend on these being set for PROPFIND. Since
+        // this is not harmful, we'll add it.
+        $features = array('1','3', 'extended-mkcol');
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+
+        $data = $this->generateMultiStatus($newProperties);
+        $this->httpResponse->sendBody($data);
+
+    }
+
+    /**
+     * WebDAV PROPPATCH
+     *
+     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
+     * In this XML body it is specified which properties should be set/updated and/or deleted
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropPatch($uri) {
+
+        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
+
+        $result = $this->updateProperties($uri, $newProperties);
+
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $this->httpResponse->sendBody(
+            $this->generateMultiStatus(array($result))
+        );
+
+    }
+
+    /**
+     * HTTP PUT method
+     *
+     * This HTTP method updates a file, or creates a new one.
+     *
+     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
+     *
+     * @param string $uri
+     * @return bool
+     */
+    protected function httpPut($uri) {
+
+        $body = $this->httpRequest->getBody();
+
+        // Intercepting Content-Range
+        if ($this->httpRequest->getHeader('Content-Range')) {
+            /**
+            Content-Range is dangerous for PUT requests:  PUT per definition
+            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
+            in section 7.6:
+              An origin server SHOULD reject any PUT request that contains a
+              Content-Range header field, since it might be misinterpreted as
+              partial content (or might be partial content that is being mistakenly
+              PUT as a full representation).  Partial content updates are possible
+              by targeting a separately identified resource with state that
+              overlaps a portion of the larger resource, or by using a different
+              method that has been specifically defined for partial updates (for
+              example, the PATCH method defined in [RFC5789]).
+            This clarifies RFC2616 section 9.6:
+              The recipient of the entity MUST NOT ignore any Content-*
+              (e.g. Content-Range) headers that it does not understand or implement
+              and MUST return a 501 (Not Implemented) response in such cases.
+            OTOH is a PUT request with a Content-Range currently the only way to
+            continue an aborted upload request and is supported by curl, mod_dav,
+            Tomcat and others.  Since some clients do use this feature which results
+            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
+            all PUT requests with a Content-Range for now.
+            */
+
+            throw new Sabre_DAV_Exception_NotImplemented('PUT with Content-Range is not allowed.');
+        }
+
+        // Intercepting the Finder problem
+        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
+
+            /**
+            Many webservers will not cooperate well with Finder PUT requests,
+            because it uses 'Chunked' transfer encoding for the request body.
+
+            The symptom of this problem is that Finder sends files to the
+            server, but they arrive as 0-length files in PHP.
+
+            If we don't do anything, the user might think they are uploading
+            files successfully, but they end up empty on the server. Instead,
+            we throw back an error if we detect this.
+
+            The reason Finder uses Chunked, is because it thinks the files
+            might change as it's being uploaded, and therefore the
+            Content-Length can vary.
+
+            Instead it sends the X-Expected-Entity-Length header with the size
+            of the file at the very start of the request. If this header is set,
+            but we don't get a request body we will fail the request to
+            protect the end-user.
+            */
+
+            // Only reading first byte
+            $firstByte = fread($body,1);
+            if (strlen($firstByte)!==1) {
+                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
+            }
+
+            // The body needs to stay intact, so we copy everything to a
+            // temporary stream.
+
+            $newBody = fopen('php://temp','r+');
+            fwrite($newBody,$firstByte);
+            stream_copy_to_stream($body, $newBody);
+            rewind($newBody);
+
+            $body = $newBody;
+
+        }
+
+        if ($this->tree->nodeExists($uri)) {
+
+            $node = $this->tree->getNodeForPath($uri);
+
+            // Checking If-None-Match and related headers.
+            if (!$this->checkPreconditions()) return;
+
+            // If the node is a collection, we'll deny it
+            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
+            if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false;
+
+            $etag = $node->put($body);
+
+            $this->broadcastEvent('afterWriteContent',array($uri, $node));
+
+            $this->httpResponse->setHeader('Content-Length','0');
+            if ($etag) $this->httpResponse->setHeader('ETag',$etag);
+            $this->httpResponse->sendStatus(204);
+
+        } else {
+
+            $etag = null;
+            // If we got here, the resource didn't exist yet.
+            if (!$this->createFile($this->getRequestUri(),$body,$etag)) {
+                // For one reason or another the file was not created.
+                return;
+            }
+
+            $this->httpResponse->setHeader('Content-Length','0');
+            if ($etag) $this->httpResponse->setHeader('ETag', $etag);
+            $this->httpResponse->sendStatus(201);
+
+        }
+
+    }
+
+
+    /**
+     * WebDAV MKCOL
+     *
+     * The MKCOL method is used to create a new collection (directory) on the server
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMkcol($uri) {
+
+        $requestBody = $this->httpRequest->getBody(true);
+
+        if ($requestBody) {
+
+            $contentType = $this->httpRequest->getHeader('Content-Type');
+            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
+
+                // We must throw 415 for unsupported mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
+
+            }
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
+            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
+
+                // We must throw 415 for unsupported mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
+
+            }
+
+            $properties = array();
+            foreach($dom->firstChild->childNodes as $childNode) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
+                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
+
+            }
+            if (!isset($properties['{DAV:}resourcetype']))
+                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+
+            $resourceType = $properties['{DAV:}resourcetype']->getValue();
+            unset($properties['{DAV:}resourcetype']);
+
+        } else {
+
+            $properties = array();
+            $resourceType = array('{DAV:}collection');
+
+        }
+
+        $result = $this->createCollection($uri, $resourceType, $properties);
+
+        if (is_array($result)) {
+            $this->httpResponse->sendStatus(207);
+            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+            $this->httpResponse->sendBody(
+                $this->generateMultiStatus(array($result))
+            );
+
+        } else {
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(201);
+        }
+
+    }
+
+    /**
+     * WebDAV HTTP MOVE method
+     *
+     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMove($uri) {
+
+        $moveInfo = $this->getCopyAndMoveInfo();
+
+        // If the destination is part of the source tree, we must fail
+        if ($moveInfo['destination']==$uri)
+            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
+
+        if ($moveInfo['destinationExists']) {
+
+            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
+            $this->tree->delete($moveInfo['destination']);
+            $this->broadcastEvent('afterUnbind',array($moveInfo['destination']));
+
+        }
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
+        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
+        $this->tree->move($uri,$moveInfo['destination']);
+        $this->broadcastEvent('afterUnbind',array($uri));
+        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
+
+    }
+
+    /**
+     * WebDAV HTTP COPY method
+     *
+     * This method copies one uri to a different uri, and works much like the MOVE request
+     * A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return bool
+     */
+    protected function httpCopy($uri) {
+
+        $copyInfo = $this->getCopyAndMoveInfo();
+        // If the destination is part of the source tree, we must fail
+        if ($copyInfo['destination']==$uri)
+            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
+
+        if ($copyInfo['destinationExists']) {
+            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
+            $this->tree->delete($copyInfo['destination']);
+
+        }
+        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
+        $this->tree->copy($uri,$copyInfo['destination']);
+        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
+
+    }
+
+
+
+    /**
+     * HTTP REPORT method implementation
+     *
+     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
+     * It's used in a lot of extensions, so it made sense to implement it into the core.
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpReport($uri) {
+
+        $body = $this->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
+
+        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
+
+            // If broadcastEvent returned true, it means the report was not supported
+            throw new Sabre_DAV_Exception_ReportNotImplemented();
+
+        }
+
+    }
+
+    // }}}
+    // {{{ HTTP/WebDAV protocol helpers
+
+    /**
+     * Returns an array with all the supported HTTP methods for a specific uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getAllowedMethods($uri) {
+
+        $methods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        // The MKCOL is only allowed on an unmapped uri
+        try {
+            $this->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            $methods[] = 'MKCOL';
+        }
+
+        // We're also checking if any of the plugins register any new methods
+        foreach($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($uri));
+        array_unique($methods);
+
+        return $methods;
+
+    }
+
+    /**
+     * Gets the uri for the request, keeping the base uri into consideration
+     *
+     * @return string
+     */
+    public function getRequestUri() {
+
+        return $this->calculateUri($this->httpRequest->getUri());
+
+    }
+
+    /**
+     * Calculates the uri for a request, making sure that the base uri is stripped out
+     *
+     * @param string $uri
+     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
+     * @return string
+     */
+    public function calculateUri($uri) {
+
+        if ($uri[0]!='/' && strpos($uri,'://')) {
+
+            $uri = parse_url($uri,PHP_URL_PATH);
+
+        }
+
+        $uri = str_replace('//','/',$uri);
+
+        if (strpos($uri,$this->getBaseUri())===0) {
+
+            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
+
+        // A special case, if the baseUri was accessed without a trailing
+        // slash, we'll accept it as well.
+        } elseif ($uri.'/' === $this->getBaseUri()) {
+
+            return '';
+
+        } else {
+
+            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
+
+        }
+
+    }
+
+    /**
+     * Returns the HTTP depth header
+     *
+     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
+     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
+     *
+     * @param mixed $default
+     * @return int
+     */
+    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
+
+        // If its not set, we'll grab the default
+        $depth = $this->httpRequest->getHeader('Depth');
+
+        if (is_null($depth)) return $default;
+
+        if ($depth == 'infinity') return self::DEPTH_INFINITY;
+
+
+        // If its an unknown value. we'll grab the default
+        if (!ctype_digit($depth)) return $default;
+
+        return (int)$depth;
+
+    }
+
+    /**
+     * Returns the HTTP range header
+     *
+     * This method returns null if there is no well-formed HTTP range request
+     * header or array($start, $end).
+     *
+     * The first number is the offset of the first byte in the range.
+     * The second number is the offset of the last byte in the range.
+     *
+     * If the second offset is null, it should be treated as the offset of the last byte of the entity
+     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
+     *
+     * @return array|null
+     */
+    public function getHTTPRange() {
+
+        $range = $this->httpRequest->getHeader('range');
+        if (is_null($range)) return null;
+
+        // Matching "Range: bytes=1234-5678: both numbers are optional
+
+        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
+
+        if ($matches[1]==='' && $matches[2]==='') return null;
+
+        return array(
+            $matches[1]!==''?$matches[1]:null,
+            $matches[2]!==''?$matches[2]:null,
+        );
+
+    }
+
+
+    /**
+     * Returns information about Copy and Move requests
+     *
+     * This function is created to help getting information about the source and the destination for the
+     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
+     *
+     * The returned value is an array with the following keys:
+     *   * destination - Destination path
+     *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
+     *
+     * @return array
+     */
+    public function getCopyAndMoveInfo() {
+
+        // Collecting the relevant HTTP headers
+        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
+        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
+        $overwrite = $this->httpRequest->getHeader('Overwrite');
+        if (!$overwrite) $overwrite = 'T';
+        if (strtoupper($overwrite)=='T') $overwrite = true;
+        elseif (strtoupper($overwrite)=='F') $overwrite = false;
+        // We need to throw a bad request exception, if the header was invalid
+        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
+
+        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
+
+        try {
+            $destinationParent = $this->tree->getNodeForPath($destinationDir);
+            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            // If the destination parent node is not found, we throw a 409
+            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
+        }
+
+        try {
+
+            $destinationNode = $this->tree->getNodeForPath($destination);
+
+            // If this succeeded, it means the destination already exists
+            // we'll need to throw precondition failed in case overwrite is false
+            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            // Destination didn't exist, we're all good
+            $destinationNode = false;
+
+
+
+        }
+
+        // These are the three relevant properties we need to return
+        return array(
+            'destination'       => $destination,
+            'destinationExists' => $destinationNode==true,
+            'destinationNode'   => $destinationNode,
+        );
+
+    }
+
+    /**
+     * Returns a list of properties for a path
+     *
+     * This is a simplified version getPropertiesForPath.
+     * if you aren't interested in status codes, but you just
+     * want to have a flat list of properties. Use this method.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     */
+    public function getProperties($path, $propertyNames) {
+
+        $result = $this->getPropertiesForPath($path,$propertyNames,0);
+        return $result[0][200];
+
+    }
+
+    /**
+     * A kid-friendly way to fetch properties for a node's children.
+     *
+     * The returned array will be indexed by the path of the of child node.
+     * Only properties that are actually found will be returned.
+     *
+     * The parent node will not be returned.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     * @return array
+     */
+    public function getPropertiesForChildren($path, $propertyNames) {
+
+        $result = array();
+        foreach($this->getPropertiesForPath($path,$propertyNames,1) as $k=>$row) {
+
+            // Skipping the parent path
+            if ($k === 0) continue;
+
+            $result[$row['href']] = $row[200];
+
+        }
+        return $result;
+
+    }
+
+    /**
+     * Returns a list of HTTP headers for a particular resource
+     *
+     * The generated http headers are based on properties provided by the
+     * resource. The method basically provides a simple mapping between
+     * DAV property and HTTP header.
+     *
+     * The headers are intended to be used for HEAD and GET requests.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getHTTPHeaders($path) {
+
+        $propertyMap = array(
+            '{DAV:}getcontenttype'   => 'Content-Type',
+            '{DAV:}getcontentlength' => 'Content-Length',
+            '{DAV:}getlastmodified'  => 'Last-Modified',
+            '{DAV:}getetag'          => 'ETag',
+        );
+
+        $properties = $this->getProperties($path,array_keys($propertyMap));
+
+        $headers = array();
+        foreach($propertyMap as $property=>$header) {
+            if (!isset($properties[$property])) continue;
+
+            if (is_scalar($properties[$property])) {
+                $headers[$header] = $properties[$property];
+
+            // GetLastModified gets special cased
+            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
+                $headers[$header] = Sabre_HTTP_Util::toHTTPDate($properties[$property]->getTime());
+            }
+
+        }
+
+        return $headers;
+
+    }
+
+    /**
+     * Returns a list of properties for a given path
+     *
+     * The path that should be supplied should have the baseUrl stripped out
+     * The list of properties should be supplied in Clark notation. If the list is empty
+     * 'allprops' is assumed.
+     *
+     * If a depth of 1 is requested child elements will also be returned.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     * @param int $depth
+     * @return array
+     */
+    public function getPropertiesForPath($path, $propertyNames = array(), $depth = 0) {
+
+        if ($depth!=0) $depth = 1;
+
+        $returnPropertyList = array();
+
+        $parentNode = $this->tree->getNodeForPath($path);
+        $nodes = array(
+            $path => $parentNode
+        );
+        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
+            foreach($this->tree->getChildren($path) as $childNode)
+                $nodes[$path . '/' . $childNode->getName()] = $childNode;
+        }
+
+        // If the propertyNames array is empty, it means all properties are requested.
+        // We shouldn't actually return everything we know though, and only return a
+        // sensible list.
+        $allProperties = count($propertyNames)==0;
+
+        foreach($nodes as $myPath=>$node) {
+
+            $currentPropertyNames = $propertyNames;
+
+            $newProperties = array(
+                '200' => array(),
+                '404' => array(),
+            );
+
+            if ($allProperties) {
+                // Default list of propertyNames, when all properties were requested.
+                $currentPropertyNames = array(
+                    '{DAV:}getlastmodified',
+                    '{DAV:}getcontentlength',
+                    '{DAV:}resourcetype',
+                    '{DAV:}quota-used-bytes',
+                    '{DAV:}quota-available-bytes',
+                    '{DAV:}getetag',
+                    '{DAV:}getcontenttype',
+                );
+            }
+
+            // If the resourceType was not part of the list, we manually add it
+            // and mark it for removal. We need to know the resourcetype in order
+            // to make certain decisions about the entry.
+            // WebDAV dictates we should add a / and the end of href's for collections
+            $removeRT = false;
+            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
+                $currentPropertyNames[] = '{DAV:}resourcetype';
+                $removeRT = true;
+            }
+
+            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
+            // If this method explicitly returned false, we must ignore this
+            // node as it is inaccessible.
+            if ($result===false) continue;
+
+            if (count($currentPropertyNames) > 0) {
+
+                if ($node instanceof Sabre_DAV_IProperties)
+                    $newProperties['200'] = $newProperties[200] + $node->getProperties($currentPropertyNames);
+
+            }
+
+
+            foreach($currentPropertyNames as $prop) {
+
+                if (isset($newProperties[200][$prop])) continue;
+
+                switch($prop) {
+                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
+                    case '{DAV:}getcontentlength'      :
+                        if ($node instanceof Sabre_DAV_IFile) {
+                            $size = $node->getSize();
+                            if (!is_null($size)) {
+                                $newProperties[200][$prop] = (int)$node->getSize();
+                            }
+                        }
+                        break;
+                    case '{DAV:}quota-used-bytes'      :
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[0];
+                        }
+                        break;
+                    case '{DAV:}quota-available-bytes' :
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[1];
+                        }
+                        break;
+                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
+                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
+                    case '{DAV:}supported-report-set'  :
+                        $reports = array();
+                        foreach($this->plugins as $plugin) {
+                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
+                        }
+                        $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports);
+                        break;
+                    case '{DAV:}resourcetype' :
+                        $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
+                        foreach($this->resourceTypeMapping as $className => $resourceType) {
+                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
+                        }
+                        break;
+
+                }
+
+                // If we were unable to find the property, we will list it as 404.
+                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
+
+            }
+
+            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
+
+            $newProperties['href'] = trim($myPath,'/');
+
+            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
+            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
+            // Therefore we add a trailing / for any non-file. This might need adjustments
+            // if we find there are other edge cases.
+            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && count($newProperties[200]['{DAV:}resourcetype']->getValue())>0) $newProperties['href'] .='/';
+
+            // If the resourcetype property was manually added to the requested property list,
+            // we will remove it again.
+            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
+
+            $returnPropertyList[] = $newProperties;
+
+        }
+
+        return $returnPropertyList;
+
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new file.
+     *
+     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
+     * It was important to get this done through a centralized function,
+     * allowing plugins to intercept this using the beforeCreateFile event.
+     *
+     * This method will return true if the file was actually created
+     *
+     * @param string   $uri
+     * @param resource $data
+     * @param string   $etag
+     * @return bool
+     */
+    public function createFile($uri,$data, &$etag = null) {
+
+        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
+
+        $parent = $this->tree->getNodeForPath($dir);
+
+        if (!$this->broadcastEvent('beforeCreateFile',array($uri, &$data, $parent))) return false;
+
+        $etag = $parent->createFile($name,$data);
+        $this->tree->markDirty($dir);
+
+        $this->broadcastEvent('afterBind',array($uri));
+        $this->broadcastEvent('afterCreateFile',array($uri, $parent));
+
+        return true;
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new directory.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function createDirectory($uri) {
+
+        $this->createCollection($uri,array('{DAV:}collection'),array());
+
+    }
+
+    /**
+     * Use this method to create a new collection
+     *
+     * The {DAV:}resourcetype is specified using the resourceType array.
+     * At the very least it must contain {DAV:}collection.
+     *
+     * The properties array can contain a list of additional properties.
+     *
+     * @param string $uri The new uri
+     * @param array $resourceType The resourceType(s)
+     * @param array $properties A list of properties
+     * @return array|null
+     */
+    public function createCollection($uri, array $resourceType, array $properties) {
+
+        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        // Making sure {DAV:}collection was specified as resourceType
+        if (!in_array('{DAV:}collection', $resourceType)) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
+        }
+
+
+        // Making sure the parent exists
+        try {
+
+            $parent = $this->tree->getNodeForPath($parentUri);
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
+
+        }
+
+        // Making sure the parent is a collection
+        if (!$parent instanceof Sabre_DAV_ICollection) {
+            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
+        }
+
+
+
+        // Making sure the child does not already exist
+        try {
+            $parent->getChild($newName);
+
+            // If we got here.. it means there's already a node on that url, and we need to throw a 405
+            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            // This is correct
+        }
+
+
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
+
+        // There are 2 modes of operation. The standard collection
+        // creates the directory, and then updates properties
+        // the extended collection can create it directly.
+        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
+
+            $parent->createExtendedCollection($newName, $resourceType, $properties);
+
+        } else {
+
+            // No special resourcetypes are supported
+            if (count($resourceType)>1) {
+                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
+            }
+
+            $parent->createDirectory($newName);
+            $rollBack = false;
+            $exception = null;
+            $errorResult = null;
+
+            if (count($properties)>0) {
+
+                try {
+
+                    $errorResult = $this->updateProperties($uri, $properties);
+                    if (!isset($errorResult[200])) {
+                        $rollBack = true;
+                    }
+
+                } catch (Sabre_DAV_Exception $e) {
+
+                    $rollBack = true;
+                    $exception = $e;
+
+                }
+
+            }
+
+            if ($rollBack) {
+                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+                $this->tree->delete($uri);
+
+                // Re-throwing exception
+                if ($exception) throw $exception;
+
+                return $errorResult;
+            }
+
+        }
+        $this->tree->markDirty($parentUri);
+        $this->broadcastEvent('afterBind',array($uri));
+
+    }
+
+    /**
+     * This method updates a resource's properties
+     *
+     * The properties array must be a list of properties. Array-keys are
+     * property names in clarknotation, array-values are it's values.
+     * If a property must be deleted, the value should be null.
+     *
+     * Note that this request should either completely succeed, or
+     * completely fail.
+     *
+     * The response is an array with statuscodes for keys, which in turn
+     * contain arrays with propertynames. This response can be used
+     * to generate a multistatus body.
+     *
+     * @param string $uri
+     * @param array $properties
+     * @return array
+     */
+    public function updateProperties($uri, array $properties) {
+
+        // we'll start by grabbing the node, this will throw the appropriate
+        // exceptions if it doesn't.
+        $node = $this->tree->getNodeForPath($uri);
+
+        $result = array(
+            200 => array(),
+            403 => array(),
+            424 => array(),
+        );
+        $remainingProperties = $properties;
+        $hasError = false;
+
+        // Running through all properties to make sure none of them are protected
+        if (!$hasError) foreach($properties as $propertyName => $value) {
+            if(in_array($propertyName, $this->protectedProperties)) {
+                $result[403][$propertyName] = null;
+                unset($remainingProperties[$propertyName]);
+                $hasError = true;
+            }
+        }
+
+        if (!$hasError) {
+            // Allowing plugins to take care of property updating
+            $hasError = !$this->broadcastEvent('updateProperties',array(
+                &$remainingProperties,
+                &$result,
+                $node
+            ));
+        }
+
+        // If the node is not an instance of Sabre_DAV_IProperties, every
+        // property is 403 Forbidden
+        if (!$hasError && count($remainingProperties) && !($node instanceof Sabre_DAV_IProperties)) {
+            $hasError = true;
+            foreach($properties as $propertyName=> $value) {
+                $result[403][$propertyName] = null;
+            }
+            $remainingProperties = array();
+        }
+
+        // Only if there were no errors we may attempt to update the resource
+        if (!$hasError) {
+
+            if (count($remainingProperties)>0) {
+
+                $updateResult = $node->updateProperties($remainingProperties);
+
+                if ($updateResult===true) {
+                    // success
+                    foreach($remainingProperties as $propertyName=>$value) {
+                        $result[200][$propertyName] = null;
+                    }
+
+                } elseif ($updateResult===false) {
+                    // The node failed to update the properties for an
+                    // unknown reason
+                    foreach($remainingProperties as $propertyName=>$value) {
+                        $result[403][$propertyName] = null;
+                    }
+
+                } elseif (is_array($updateResult)) {
+
+                    // The node has detailed update information
+                    // We need to merge the results with the earlier results.
+                    foreach($updateResult as $status => $props) {
+                        if (is_array($props)) {
+                            if (!isset($result[$status]))
+                                $result[$status] = array();
+
+                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
+                        }
+                    }
+
+                } else {
+                    throw new Sabre_DAV_Exception('Invalid result from updateProperties');
+                }
+                $remainingProperties = array();
+            }
+
+        }
+
+        foreach($remainingProperties as $propertyName=>$value) {
+            // if there are remaining properties, it must mean
+            // there's a dependency failure
+            $result[424][$propertyName] = null;
+        }
+
+        // Removing empty array values
+        foreach($result as $status=>$props) {
+
+            if (count($props)===0) unset($result[$status]);
+
+        }
+        $result['href'] = $uri;
+        return $result;
+
+    }
+
+    /**
+     * This method checks the main HTTP preconditions.
+     *
+     * Currently these are:
+     *   * If-Match
+     *   * If-None-Match
+     *   * If-Modified-Since
+     *   * If-Unmodified-Since
+     *
+     * The method will return true if all preconditions are met
+     * The method will return false, or throw an exception if preconditions
+     * failed. If false is returned the operation should be aborted, and
+     * the appropriate HTTP response headers are already set.
+     *
+     * Normally this method will throw 412 Precondition Failed for failures
+     * related to If-None-Match, If-Match and If-Unmodified Since. It will
+     * set the status to 304 Not Modified for If-Modified_since.
+     *
+     * If the $handleAsGET argument is set to true, it will also return 304
+     * Not Modified for failure of the If-None-Match precondition. This is the
+     * desired behaviour for HTTP GET and HTTP HEAD requests.
+     *
+     * @param bool $handleAsGET
+     * @return bool
+     */
+    public function checkPreconditions($handleAsGET = false) {
+
+        $uri = $this->getRequestUri();
+        $node = null;
+        $lastMod = null;
+        $etag = null;
+
+        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
+
+            // If-Match contains an entity tag. Only if the entity-tag
+            // matches we are allowed to make the request succeed.
+            // If the entity-tag is '*' we are only allowed to make the
+            // request succeed if a resource exists at that url.
+            try {
+                $node = $this->tree->getNodeForPath($uri);
+            } catch (Sabre_DAV_Exception_NotFound $e) {
+                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
+            }
+
+            // Only need to check entity tags if they are not *
+            if ($ifMatch!=='*') {
+
+                // There can be multiple etags
+                $ifMatch = explode(',',$ifMatch);
+                $haveMatch = false;
+                foreach($ifMatch as $ifMatchItem) {
+
+                    // Stripping any extra spaces
+                    $ifMatchItem = trim($ifMatchItem,' ');
+
+                    $etag = $node->getETag();
+                    if ($etag===$ifMatchItem) {
+                        $haveMatch = true;
+                    } else {
+                        // Evolution has a bug where it sometimes prepends the "
+                        // with a \. This is our workaround.
+                        if (str_replace('\\"','"', $ifMatchItem) === $etag) {
+                            $haveMatch = true;
+                        }
+                    }
+
+                }
+                if (!$haveMatch) {
+                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
+                }
+            }
+        }
+
+        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
+
+            // The If-None-Match header contains an etag.
+            // Only if the ETag does not match the current ETag, the request will succeed
+            // The header can also contain *, in which case the request
+            // will only succeed if the entity does not exist at all.
+            $nodeExists = true;
+            if (!$node) {
+                try {
+                    $node = $this->tree->getNodeForPath($uri);
+                } catch (Sabre_DAV_Exception_NotFound $e) {
+                    $nodeExists = false;
+                }
+            }
+            if ($nodeExists) {
+                $haveMatch = false;
+                if ($ifNoneMatch==='*') $haveMatch = true;
+                else {
+
+                    // There might be multiple etags
+                    $ifNoneMatch = explode(',', $ifNoneMatch);
+                    $etag = $node->getETag();
+
+                    foreach($ifNoneMatch as $ifNoneMatchItem) {
+
+                        // Stripping any extra spaces
+                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
+
+                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
+
+                    }
+
+                }
+
+                if ($haveMatch) {
+                    if ($handleAsGET) {
+                        $this->httpResponse->sendStatus(304);
+                        return false;
+                    } else {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
+                    }
+                }
+            }
+
+        }
+
+        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
+
+            // The If-Modified-Since header contains a date. We
+            // will only return the entity if it has been changed since
+            // that date. If it hasn't been changed, we return a 304
+            // header
+            // Note that this header only has to be checked if there was no If-None-Match header
+            // as per the HTTP spec.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
+
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod <= $date) {
+                        $this->httpResponse->sendStatus(304);
+                        $this->httpResponse->setHeader('Last-Modified', Sabre_HTTP_Util::toHTTPDate($lastMod));
+                        return false;
+                    }
+                }
+            }
+        }
+
+        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
+
+            // The If-Unmodified-Since will allow allow the request if the
+            // entity has not changed since the specified date.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
+
+            // We must only check the date if it's valid
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod > $date) {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
+                    }
+                }
+            }
+
+        }
+        return true;
+
+    }
+
+    // }}}
+    // {{{ XML Readers & Writers
+
+
+    /**
+     * Generates a WebDAV propfind response body based on a list of nodes
+     *
+     * @param array $fileProperties The list with nodes
+     * @return string
+     */
+    public function generateMultiStatus(array $fileProperties) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        //$dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($fileProperties as $entry) {
+
+            $href = $entry['href'];
+            unset($entry['href']);
+
+            $response = new Sabre_DAV_Property_Response($href,$entry);
+            $response->serialize($this,$multiStatus);
+
+        }
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * This method parses a PropPatch request
+     *
+     * PropPatch changes the properties for a resource. This method
+     * returns a list of properties.
+     *
+     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
+     * and the value contains the property value. If a property is to be removed the value
+     * will be null.
+     *
+     * @param string $body xml body
+     * @return array list of properties in need of updating or deletion
+     */
+    public function parsePropPatchRequest($body) {
+
+        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $newProperties = array();
+
+        foreach($dom->firstChild->childNodes as $child) {
+
+            if ($child->nodeType !== XML_ELEMENT_NODE) continue;
+
+            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
+
+            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
+
+            foreach($innerProperties as $propertyName=>$propertyValue) {
+
+                if ($operation==='{DAV:}remove') {
+                    $propertyValue = null;
+                }
+
+                $newProperties[$propertyName] = $propertyValue;
+
+            }
+
+        }
+
+        return $newProperties;
+
+    }
+
+    /**
+     * This method parses the PROPFIND request and returns its information
+     *
+     * This will either be a list of properties, or an empty array; in which case
+     * an {DAV:}allprop was requested.
+     *
+     * @param string $body
+     * @return array
+     */
+    public function parsePropFindRequest($body) {
+
+        // If the propfind body was empty, it means IE is requesting 'all' properties
+        if (!$body) return array();
+
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
+        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem));
+
+    }
+
+    // }}}
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ServerPlugin.php b/3rdparty/Sabre/DAV/ServerPlugin.php
new file mode 100755
index 0000000000..131863d13f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ServerPlugin.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * The baseclass for all server plugins.
+ *
+ * Plugins can modify or extend the servers behaviour.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_ServerPlugin {
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre_DAV_Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the requires event subscriptions.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    abstract public function initialize(Sabre_DAV_Server $server);
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array();
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getHTTPMethods($uri) {
+
+        return array();
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return get_class($this);
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        return array();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleCollection.php b/3rdparty/Sabre/DAV/SimpleCollection.php
new file mode 100755
index 0000000000..4acf971caa
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleCollection.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * SimpleCollection
+ *
+ * The SimpleCollection is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
+
+    /**
+     * List of childnodes
+     *
+     * @var array
+     */
+    protected $children = array();
+
+    /**
+     * Name of this resource
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, child nodes can also be bassed.
+     * This nodes must be instances of Sabre_DAV_INode
+     *
+     * @param string $name
+     * @param array $children
+     */
+    public function __construct($name,array $children = array()) {
+
+        $this->name = $name;
+        foreach($children as $child) {
+
+            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
+            $this->addChild($child);
+
+        }
+
+    }
+
+    /**
+     * Adds a new childnode to this collection
+     *
+     * @param Sabre_DAV_INode $child
+     * @return void
+     */
+    public function addChild(Sabre_DAV_INode $child) {
+
+        $this->children[$child->getName()] = $child;
+
+    }
+
+    /**
+     * Returns the name of the collection
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
+     * Generally its wise to override this, as this can usually be optimized
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        if (isset($this->children[$name])) return $this->children[$name];
+        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
+
+    }
+
+    /**
+     * Returns a list of children for this collection
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        return array_values($this->children);
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleDirectory.php b/3rdparty/Sabre/DAV/SimpleDirectory.php
new file mode 100755
index 0000000000..621222ebc5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleDirectory.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * SimpleDirectory
+ *
+ * The SimpleDirectory is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * This class is now deprecated, use Sabre_DAV_SimpleCollection instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated Use Sabre_DAV_SimpleCollection instead.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleDirectory extends Sabre_DAV_SimpleCollection {
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleFile.php b/3rdparty/Sabre/DAV/SimpleFile.php
new file mode 100755
index 0000000000..58330d6861
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleFile.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * SimpleFile
+ *
+ * The 'SimpleFile' class is used to easily add read-only immutable files to
+ * the directory structure. One usecase would be to add a 'readme.txt' to a
+ * root of a webserver with some standard content.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleFile extends Sabre_DAV_File {
+
+    /**
+     * File contents
+     *
+     * @var string
+     */
+    protected $contents = array();
+
+    /**
+     * Name of this resource
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * A mimetype, such as 'text/plain' or 'text/html'
+     *
+     * @var string
+     */
+    protected $mimeType;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, as well as the contents of the
+     * file.
+     *
+     * @param string $name
+     * @param string $contents
+     * @param string|null $mimeType
+     */
+    public function __construct($name, $contents, $mimeType = null) {
+
+        $this->name = $name;
+        $this->contents = $contents;
+        $this->mimeType = $mimeType;
+
+    }
+
+    /**
+     * Returns the node name for this file.
+     *
+     * This name is used to construct the url.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    public function get() {
+
+        return $this->contents;
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes.
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return strlen($this->contents);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     * @return string
+     */
+    public function getETag() {
+
+        return '"' . md5($this->contents) . '"';
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     * @return string
+     */
+    public function getContentType() {
+
+        return $this->mimeType;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/StringUtil.php b/3rdparty/Sabre/DAV/StringUtil.php
new file mode 100755
index 0000000000..b126a94c82
--- /dev/null
+++ b/3rdparty/Sabre/DAV/StringUtil.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * String utility
+ *
+ * This class is mainly used to implement the 'text-match' filter, used by both
+ * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
+ * Because they both need it, it was decided to put it in Sabre_DAV instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_StringUtil {
+
+    /**
+     * Checks if a needle occurs in a haystack ;)
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @param string $collation
+     * @param string $matchType
+     * @return bool
+     */
+    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
+
+        switch($collation) {
+
+            case 'i;ascii-casemap' :
+                // default strtolower takes locale into consideration
+                // we don't want this.
+                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
+                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
+                break;
+
+            case 'i;octet' :
+                // Do nothing
+                break;
+
+            case 'i;unicode-casemap' :
+                $haystack = mb_strtoupper($haystack, 'UTF-8');
+                $needle = mb_strtoupper($needle, 'UTF-8');
+                break;
+
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Collation type: ' . $collation . ' is not supported');
+
+        }
+
+        switch($matchType) {
+
+            case 'contains' :
+                return strpos($haystack, $needle)!==false;
+            case 'equals' :
+                return $haystack === $needle;
+            case 'starts-with' :
+                return strpos($haystack, $needle)===0;
+            case 'ends-with' :
+                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Match-type: ' . $matchType . ' is not supported');
+
+        }
+
+    }
+
+    /**
+     * This method takes an input string, checks if it's not valid UTF-8 and
+     * attempts to convert it to UTF-8 if it's not.
+     *
+     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
+     * anything else will likely fail.
+     *
+     * @param string $input
+     * @return string
+     */
+    static public function ensureUTF8($input) {
+
+        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
+
+        if ($encoding === 'ISO-8859-1') {
+            return utf8_encode($input);
+        } else {
+            return $input;
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
new file mode 100755
index 0000000000..36096e6777
--- /dev/null
+++ b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * Temporary File Filter Plugin
+ *
+ * The purpose of this filter is to intercept some of the garbage files
+ * operation systems and applications tend to generate when mounting
+ * a WebDAV share as a disk.
+ *
+ * It will intercept these files and place them in a separate directory.
+ * these files are not deleted automatically, so it is adviceable to
+ * delete these after they are not accessed for 24 hours.
+ *
+ * Currently it supports:
+ *   * OS/X style resource forks and .DS_Store
+ *   * desktop.ini and Thumbs.db (windows)
+ *   * .*.swp (vim temporary files)
+ *   * .dat.* (smultron temporary files)
+ *
+ * Additional patterns can be added, by adding on to the
+ * temporaryFilePatterns property.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the list of patterns we intercept.
+     * If new patterns are added, they must be valid patterns for preg_match.
+     *
+     * @var array
+     */
+    public $temporaryFilePatterns = array(
+        '/^\._(.*)$/',     // OS/X resource forks
+        '/^.DS_Store$/',   // OS/X custom folder settings
+        '/^desktop.ini$/', // Windows custom folder settings
+        '/^Thumbs.db$/',   // Windows thumbnail cache
+        '/^.(.*).swp$/',   // ViM temporary files
+        '/^\.dat(.*)$/',   // Smultron seems to create these
+        '/^~lock.(.*)#$/', // Windows 7 lockfiles
+    );
+
+    /**
+     * This is the directory where this plugin
+     * will store it's files.
+     *
+     * @var string
+     */
+    private $dataDir;
+
+    /**
+     * A reference to the main Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Creates the plugin.
+     *
+     * Make sure you specify a directory for your files. If you don't, we
+     * will use PHP's directory for session-storage instead, and you might
+     * not want that.
+     *
+     * @param string|null $dataDir
+     */
+    public function __construct($dataDir = null) {
+
+        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
+        if (!is_dir($dataDir)) mkdir($dataDir);
+        $this->dataDir = $dataDir;
+
+    }
+
+    /**
+     * Initialize the plugin
+     *
+     * This is called automatically be the Server class after this plugin is
+     * added with Sabre_DAV_Server::addPlugin()
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
+        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
+
+    }
+
+    /**
+     * This method is called before any HTTP method handler
+     *
+     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
+     * filenames that are known to match the 'temporary file' regex.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if (!$tempLocation = $this->isTempFile($uri))
+            return true;
+
+        switch($method) {
+            case 'GET' :
+                return $this->httpGet($tempLocation);
+            case 'PUT' :
+                return $this->httpPut($tempLocation);
+            case 'PROPFIND' :
+                return $this->httpPropfind($tempLocation, $uri);
+            case 'DELETE' :
+                return $this->httpDelete($tempLocation);
+         }
+         return true;
+
+    }
+
+    /**
+     * This method is invoked if some subsystem creates a new file.
+     *
+     * This is used to deal with HTTP LOCK requests which create a new
+     * file.
+     *
+     * @param string $uri
+     * @param resource $data
+     * @return bool
+     */
+    public function beforeCreateFile($uri,$data) {
+
+        if ($tempPath = $this->isTempFile($uri)) {
+
+            $hR = $this->server->httpResponse;
+            $hR->setHeader('X-Sabre-Temp','true');
+            file_put_contents($tempPath,$data);
+            return false;
+        }
+        return true;
+
+    }
+
+    /**
+     * This method will check if the url matches the temporary file pattern
+     * if it does, it will return an path based on $this->dataDir for the
+     * temporary file storage.
+     *
+     * @param string $path
+     * @return boolean|string
+     */
+    protected function isTempFile($path) {
+
+        // We're only interested in the basename.
+        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
+
+        foreach($this->temporaryFilePatterns as $tempFile) {
+
+            if (preg_match($tempFile,$tempPath)) {
+                return $this->getDataDir() . '/sabredav_' . md5($path) . '.tempfile';
+            }
+
+        }
+
+        return false;
+
+    }
+
+
+    /**
+     * This method handles the GET method for temporary files.
+     * If the file doesn't exist, it will return false which will kick in
+     * the regular system for the GET method.
+     *
+     * @param string $tempLocation
+     * @return bool
+     */
+    public function httpGet($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('Content-Type','application/octet-stream');
+        $hR->setHeader('Content-Length',filesize($tempLocation));
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(200);
+        $hR->sendBody(fopen($tempLocation,'r'));
+        return false;
+
+    }
+
+    /**
+     * This method handles the PUT method.
+     *
+     * @param string $tempLocation
+     * @return bool
+     */
+    public function httpPut($tempLocation) {
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+
+        $newFile = !file_exists($tempLocation);
+
+        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
+             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
+        }
+
+        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
+        $hR->sendStatus($newFile?201:200);
+        return false;
+
+    }
+
+    /**
+     * This method handles the DELETE method.
+     *
+     * If the file didn't exist, it will return false, which will make the
+     * standard HTTP DELETE handler kick in.
+     *
+     * @param string $tempLocation
+     * @return bool
+     */
+    public function httpDelete($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        unlink($tempLocation);
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(204);
+        return false;
+
+    }
+
+    /**
+     * This method handles the PROPFIND method.
+     *
+     * It's a very lazy method, it won't bother checking the request body
+     * for which properties were requested, and just sends back a default
+     * set of properties.
+     *
+     * @param string $tempLocation
+     * @param string $uri
+     * @return bool
+     */
+    public function httpPropfind($tempLocation, $uri) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(207);
+        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true));
+
+        $properties = array(
+            'href' => $uri,
+            200 => array(
+                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
+                '{DAV:}getcontentlength' => filesize($tempLocation),
+                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
+                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true,
+
+            ),
+         );
+
+        $data = $this->server->generateMultiStatus(array($properties));
+        $hR->sendBody($data);
+        return false;
+
+    }
+
+
+    /**
+     * This method returns the directory where the temporary files should be stored.
+     *
+     * @return string
+     */
+    protected function getDataDir()
+    {
+        return $this->dataDir;
+    }
+}
diff --git a/3rdparty/Sabre/DAV/Tree.php b/3rdparty/Sabre/DAV/Tree.php
new file mode 100755
index 0000000000..5021639415
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Tree.php
@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * Abstract tree object
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Tree {
+
+    /**
+     * This function must return an INode object for a path
+     * If a Path doesn't exist, thrown a Exception_NotFound
+     *
+     * @param string $path
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    abstract function getNodeForPath($path);
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * Implementors of this class should override this method to make
+     * it cheaper.
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            $this->getNodeForPath($path);
+            return true;
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Copies a file from path to another
+     *
+     * @param string $sourcePath The source location
+     * @param string $destinationPath The full destination path
+     * @return void
+     */
+    public function copy($sourcePath, $destinationPath) {
+
+        $sourceNode = $this->getNodeForPath($sourcePath);
+
+        // grab the dirname and basename components
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        $destinationParent = $this->getNodeForPath($destinationDir);
+        $this->copyNode($sourceNode,$destinationParent,$destinationName);
+
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Moves a file from one location to another
+     *
+     * @param string $sourcePath The path to the file which should be moved
+     * @param string $destinationPath The full destination path, so not just the destination parent node
+     * @return int
+     */
+    public function move($sourcePath, $destinationPath) {
+
+        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        if ($sourceDir===$destinationDir) {
+            $renameable = $this->getNodeForPath($sourcePath);
+            $renameable->setName($destinationName);
+        } else {
+            $this->copy($sourcePath,$destinationPath);
+            $this->getNodeForPath($sourcePath)->delete();
+        }
+        $this->markDirty($sourceDir);
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Deletes a node from the tree
+     *
+     * @param string $path
+     * @return void
+     */
+    public function delete($path) {
+
+        $node = $this->getNodeForPath($path);
+        $node->delete();
+
+        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
+        $this->markDirty($parent);
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        return $node->getChildren();
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes
+     *
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     *
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path
+     * @return void
+     */
+    public function markDirty($path) {
+
+
+    }
+
+    /**
+     * copyNode
+     *
+     * @param Sabre_DAV_INode $source
+     * @param Sabre_DAV_ICollection $destinationParent
+     * @param string $destinationName
+     * @return void
+     */
+    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
+
+        if (!$destinationName) $destinationName = $source->getName();
+
+        if ($source instanceof Sabre_DAV_IFile) {
+
+            $data = $source->get();
+
+            // If the body was a string, we need to convert it to a stream
+            if (is_string($data)) {
+                $stream = fopen('php://temp','r+');
+                fwrite($stream,$data);
+                rewind($stream);
+                $data = $stream;
+            }
+            $destinationParent->createFile($destinationName,$data);
+            $destination = $destinationParent->getChild($destinationName);
+
+        } elseif ($source instanceof Sabre_DAV_ICollection) {
+
+            $destinationParent->createDirectory($destinationName);
+
+            $destination = $destinationParent->getChild($destinationName);
+            foreach($source->getChildren() as $child) {
+
+                $this->copyNode($child,$destination);
+
+            }
+
+        }
+        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
+
+            $props = $source->getProperties(array());
+            $destination->updateProperties($props);
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Tree/Filesystem.php b/3rdparty/Sabre/DAV/Tree/Filesystem.php
new file mode 100755
index 0000000000..40580ae366
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Tree/Filesystem.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * Sabre_DAV_Tree_Filesystem
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
+
+    /**
+     * Base url on the filesystem.
+     *
+     * @var string
+     */
+    protected $basePath;
+
+    /**
+     * Creates this tree
+     *
+     * Supply the path you'd like to share.
+     *
+     * @param string $basePath
+     */
+    public function __construct($basePath) {
+
+        $this->basePath = $basePath;
+
+    }
+
+    /**
+     * Returns a new node for the given path
+     *
+     * @param string $path
+     * @return Sabre_DAV_FS_Node
+     */
+    public function getNodeForPath($path) {
+
+        $realPath = $this->getRealPath($path);
+        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_NotFound('File at location ' . $realPath . ' not found');
+        if (is_dir($realPath)) {
+            return new Sabre_DAV_FS_Directory($realPath);
+        } else {
+            return new Sabre_DAV_FS_File($realPath);
+        }
+
+    }
+
+    /**
+     * Returns the real filesystem path for a webdav url.
+     *
+     * @param string $publicPath
+     * @return string
+     */
+    protected function getRealPath($publicPath) {
+
+        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
+
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    public function copy($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        $this->realCopy($source,$destination);
+
+    }
+
+    /**
+     * Used by self::copy
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    protected function realCopy($source,$destination) {
+
+        if (is_file($source)) {
+            copy($source,$destination);
+        } else {
+            mkdir($destination);
+            foreach(scandir($source) as $subnode) {
+
+                if ($subnode=='.' || $subnode=='..') continue;
+                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
+
+            }
+        }
+
+    }
+
+    /**
+     * Moves a file or directory recursively.
+     *
+     * If the destination exists, delete it first.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    public function move($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        rename($source,$destination);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/URLUtil.php b/3rdparty/Sabre/DAV/URLUtil.php
new file mode 100755
index 0000000000..794665a44f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/URLUtil.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * URL utility class
+ *
+ * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
+ *
+ * It was not possible to use PHP's built-in methods for this, because some clients don't like
+ * encoding of certain characters.
+ *
+ * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
+ * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
+ * kept as-is.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_URLUtil {
+
+    /**
+     * Encodes the path of a url.
+     *
+     * slashes (/) are treated as path-separators.
+     *
+     * @param string $path
+     * @return string
+     */
+    static function encodePath($path) {
+
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/])/',function($match) {
+
+            return '%'.sprintf('%02x',ord($match[0]));
+
+        }, $path);
+
+    }
+
+    /**
+     * Encodes a 1 segment of a path
+     *
+     * Slashes are considered part of the name, and are encoded as %2f
+     *
+     * @param string $pathSegment
+     * @return string
+     */
+    static function encodePathSegment($pathSegment) {
+
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)])/',function($match) {
+
+            return '%'.sprintf('%02x',ord($match[0]));
+
+        }, $pathSegment);
+    }
+
+    /**
+     * Decodes a url-encoded path
+     *
+     * @param string $path
+     * @return string
+     */
+    static function decodePath($path) {
+
+        return self::decodePathSegment($path);
+
+    }
+
+    /**
+     * Decodes a url-encoded path segment
+     *
+     * @param string $path
+     * @return string
+     */
+    static function decodePathSegment($path) {
+
+        $path = rawurldecode($path);
+        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
+
+        switch($encoding) {
+
+            case 'ISO-8859-1' :
+                $path = utf8_encode($path);
+
+        }
+
+        return $path;
+
+    }
+
+    /**
+     * Returns the 'dirname' and 'basename' for a path.
+     *
+     * The reason there is a custom function for this purpose, is because
+     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
+     * and we need a method that just operates on UTF-8 characters.
+     *
+     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
+     * directory separator on windows.
+     *
+     * This method returns the 2 components as an array.
+     *
+     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
+     * string is stripped off.
+     *
+     * @param string $path
+     * @return array
+     */
+    static function splitPath($path) {
+
+        $matches = array();
+        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
+            return array($matches[1],$matches[2]);
+        } else {
+            return array(null,null);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/UUIDUtil.php b/3rdparty/Sabre/DAV/UUIDUtil.php
new file mode 100755
index 0000000000..f0eebe598e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/UUIDUtil.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * UUID Utility
+ *
+ * This class has static methods to generate and validate UUID's.
+ * UUIDs are used a decent amount within various *DAV standards, so it made
+ * sense to include it.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_UUIDUtil {
+
+    /**
+     * Returns a pseudo-random v4 UUID
+     *
+     * This function is based on a comment by Andrew Moore on php.net
+     *
+     * @see http://www.php.net/manual/en/function.uniqid.php#94959
+     * @return string
+     */
+    static function getUUID() {
+
+        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+            // 32 bits for "time_low"
+            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+
+            // 16 bits for "time_mid"
+            mt_rand( 0, 0xffff ),
+
+            // 16 bits for "time_hi_and_version",
+            // four most significant bits holds version number 4
+            mt_rand( 0, 0x0fff ) | 0x4000,
+
+            // 16 bits, 8 bits for "clk_seq_hi_res",
+            // 8 bits for "clk_seq_low",
+            // two most significant bits holds zero and one for variant DCE1.1
+            mt_rand( 0, 0x3fff ) | 0x8000,
+
+            // 48 bits for "node"
+            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+        );
+    }
+
+    /**
+     * Checks if a string is a valid UUID.
+     *
+     * @param string $uuid
+     * @return bool
+     */
+    static function validateUUID($uuid) {
+
+        return preg_match(
+            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+            $uuid
+        ) == true;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Version.php b/3rdparty/Sabre/DAV/Version.php
new file mode 100755
index 0000000000..40cfe81b34
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/DAV/XMLUtil.php b/3rdparty/Sabre/DAV/XMLUtil.php
new file mode 100755
index 0000000000..60eff3b159
--- /dev/null
+++ b/3rdparty/Sabre/DAV/XMLUtil.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * XML utilities for WebDAV
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_XMLUtil {
+
+    /**
+     * Returns the 'clark notation' for an element.
+     *
+     * For example, and element encoded as:
+     * <b:myelem xmlns:b="http://www.example.org/" />
+     * will be returned as:
+     * {http://www.example.org}myelem
+     *
+     * This format is used throughout the SabreDAV sourcecode.
+     * Elements encoded with the urn:DAV namespace will
+     * be returned as if they were in the DAV: namespace. This is to avoid
+     * compatibility problems.
+     *
+     * This function will return null if a nodetype other than an Element is passed.
+     *
+     * @param DOMNode $dom
+     * @return string
+     */
+    static function toClarkNotation(DOMNode $dom) {
+
+        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
+
+        // Mapping back to the real namespace, in case it was dav
+        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
+
+        // Mapping to clark notation
+        return '{' . $ns . '}' . $dom->localName;
+
+    }
+
+    /**
+     * Parses a clark-notation string, and returns the namespace and element
+     * name components.
+     *
+     * If the string was invalid, it will throw an InvalidArgumentException.
+     *
+     * @param string $str
+     * @throws InvalidArgumentException
+     * @return array
+     */
+    static function parseClarkNotation($str) {
+
+        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
+            throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
+        }
+
+        return array(
+            $matches[1],
+            $matches[2]
+        );
+
+    }
+
+    /**
+     * This method takes an XML document (as string) and converts all instances of the
+     * DAV: namespace to urn:DAV
+     *
+     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
+     * spec, and causes the DOM to throw errors
+     *
+     * @param string $xmlDocument
+     * @return array|string|null
+     */
+    static function convertDAVNamespace($xmlDocument) {
+
+        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
+        // namespace is actually a violation of the XML namespaces specification, and will cause errors
+        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
+
+    }
+
+    /**
+     * This method provides a generic way to load a DOMDocument for WebDAV use.
+     *
+     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
+     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
+     *
+     * @param string $xml
+     * @throws Sabre_DAV_Exception_BadRequest
+     * @return DOMDocument
+     */
+    static function loadDOMDocument($xml) {
+
+        if (empty($xml))
+            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
+
+        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
+        // does not support this, so we must intercept this and convert to UTF-8.
+        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
+
+            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
+            $xml = iconv('UTF-16LE','UTF-8',$xml);
+
+            // Because the xml header might specify the encoding, we must also change this.
+            // This regex looks for the string encoding="UTF-16" and replaces it with
+            // encoding="UTF-8".
+            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
+
+        }
+
+        // Retaining old error setting
+        $oldErrorSetting =  libxml_use_internal_errors(true);
+
+        // Clearing any previous errors
+        libxml_clear_errors();
+
+        $dom = new DOMDocument();
+        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
+
+        // We don't generally care about any whitespace
+        $dom->preserveWhiteSpace = false;
+
+        if ($error = libxml_get_last_error()) {
+            libxml_clear_errors();
+            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
+        }
+
+        // Restoring old mechanism for error handling
+        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
+
+        return $dom;
+
+    }
+
+    /**
+     * Parses all WebDAV properties out of a DOM Element
+     *
+     * Generally WebDAV properties are enclosed in {DAV:}prop elements. This
+     * method helps by going through all these and pulling out the actual
+     * propertynames, making them array keys and making the property values,
+     * well.. the array values.
+     *
+     * If no value was given (self-closing element) null will be used as the
+     * value. This is used in for example PROPFIND requests.
+     *
+     * Complex values are supported through the propertyMap argument. The
+     * propertyMap should have the clark-notation properties as it's keys, and
+     * classnames as values.
+     *
+     * When any of these properties are found, the unserialize() method will be
+     * (statically) called. The result of this method is used as the value.
+     *
+     * @param DOMElement $parentNode
+     * @param array $propertyMap
+     * @return array
+     */
+    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
+
+        $propList = array();
+        foreach($parentNode->childNodes as $propNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
+
+            foreach($propNode->childNodes as $propNodeData) {
+
+                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
+                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
+
+                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
+                if (isset($propertyMap[$propertyName])) {
+                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData);
+                } else {
+                    $propList[$propertyName] = $propNodeData->textContent;
+                }
+            }
+
+
+        }
+        return $propList;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/includes.php b/3rdparty/Sabre/DAV/includes.php
new file mode 100755
index 0000000000..6a4890677e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/includes.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Sabre_DAV includes file
+ *
+ * Including this file will automatically include all files from the Sabre_DAV
+ * package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/Auth/IBackend.php';
+include __DIR__ . '/Client.php';
+include __DIR__ . '/Exception.php';
+include __DIR__ . '/INode.php';
+include __DIR__ . '/IProperties.php';
+include __DIR__ . '/Locks/Backend/Abstract.php';
+include __DIR__ . '/Locks/Backend/File.php';
+include __DIR__ . '/Locks/Backend/FS.php';
+include __DIR__ . '/Locks/Backend/PDO.php';
+include __DIR__ . '/Locks/LockInfo.php';
+include __DIR__ . '/Node.php';
+include __DIR__ . '/Property/IHref.php';
+include __DIR__ . '/Property.php';
+include __DIR__ . '/Server.php';
+include __DIR__ . '/ServerPlugin.php';
+include __DIR__ . '/StringUtil.php';
+include __DIR__ . '/TemporaryFileFilterPlugin.php';
+include __DIR__ . '/Tree.php';
+include __DIR__ . '/URLUtil.php';
+include __DIR__ . '/UUIDUtil.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/XMLUtil.php';
+include __DIR__ . '/Auth/Backend/AbstractBasic.php';
+include __DIR__ . '/Auth/Backend/AbstractDigest.php';
+include __DIR__ . '/Auth/Backend/Apache.php';
+include __DIR__ . '/Auth/Backend/File.php';
+include __DIR__ . '/Auth/Backend/PDO.php';
+include __DIR__ . '/Auth/Plugin.php';
+include __DIR__ . '/Browser/GuessContentType.php';
+include __DIR__ . '/Browser/MapGetToPropFind.php';
+include __DIR__ . '/Browser/Plugin.php';
+include __DIR__ . '/Exception/BadRequest.php';
+include __DIR__ . '/Exception/Conflict.php';
+include __DIR__ . '/Exception/Forbidden.php';
+include __DIR__ . '/Exception/InsufficientStorage.php';
+include __DIR__ . '/Exception/InvalidResourceType.php';
+include __DIR__ . '/Exception/Locked.php';
+include __DIR__ . '/Exception/LockTokenMatchesRequestUri.php';
+include __DIR__ . '/Exception/MethodNotAllowed.php';
+include __DIR__ . '/Exception/NotAuthenticated.php';
+include __DIR__ . '/Exception/NotFound.php';
+include __DIR__ . '/Exception/NotImplemented.php';
+include __DIR__ . '/Exception/PaymentRequired.php';
+include __DIR__ . '/Exception/PreconditionFailed.php';
+include __DIR__ . '/Exception/ReportNotImplemented.php';
+include __DIR__ . '/Exception/RequestedRangeNotSatisfiable.php';
+include __DIR__ . '/Exception/UnsupportedMediaType.php';
+include __DIR__ . '/FS/Node.php';
+include __DIR__ . '/FSExt/Node.php';
+include __DIR__ . '/ICollection.php';
+include __DIR__ . '/IExtendedCollection.php';
+include __DIR__ . '/IFile.php';
+include __DIR__ . '/IQuota.php';
+include __DIR__ . '/Locks/Plugin.php';
+include __DIR__ . '/Mount/Plugin.php';
+include __DIR__ . '/ObjectTree.php';
+include __DIR__ . '/Property/GetLastModified.php';
+include __DIR__ . '/Property/Href.php';
+include __DIR__ . '/Property/HrefList.php';
+include __DIR__ . '/Property/LockDiscovery.php';
+include __DIR__ . '/Property/ResourceType.php';
+include __DIR__ . '/Property/Response.php';
+include __DIR__ . '/Property/ResponseList.php';
+include __DIR__ . '/Property/SupportedLock.php';
+include __DIR__ . '/Property/SupportedReportSet.php';
+include __DIR__ . '/Tree/Filesystem.php';
+include __DIR__ . '/Collection.php';
+include __DIR__ . '/Directory.php';
+include __DIR__ . '/Exception/ConflictingLock.php';
+include __DIR__ . '/Exception/FileNotFound.php';
+include __DIR__ . '/File.php';
+include __DIR__ . '/FS/Directory.php';
+include __DIR__ . '/FS/File.php';
+include __DIR__ . '/FSExt/Directory.php';
+include __DIR__ . '/FSExt/File.php';
+include __DIR__ . '/SimpleCollection.php';
+include __DIR__ . '/SimpleDirectory.php';
+include __DIR__ . '/SimpleFile.php';
+// End includes
diff --git a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
new file mode 100755
index 0000000000..e05b774980
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This is a helper class that easily allows you to create a collection that
+ * has a childnode for every principal.
+ *
+ * To use this class, simply implement the getChildForPrincipal method.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection  {
+
+    /**
+     * Node or 'directory' name.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * If this value is set to true, it effectively disables listing of users
+     * it still allows user to find other users if they have an exact url.
+     *
+     * @var bool
+     */
+    public $disableListing = false;
+
+    /**
+     * Creates the object
+     *
+     * This object must be passed the principal backend. This object will
+     * filter all principals from a specified prefix ($principalPrefix). The
+     * default is 'principals', if your principals are stored in a different
+     * collection, override $principalPrefix
+     *
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, $principalPrefix = 'principals') {
+
+        $this->principalPrefix = $principalPrefix;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return Sabre_DAVACL_IPrincipal
+     */
+    abstract function getChildForPrincipal(array $principalInfo);
+
+    /**
+     * Returns the name of this collection.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalPrefix);
+        return $name;
+
+    }
+
+    /**
+     * Return the list of users
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        if ($this->disableListing)
+            throw new Sabre_DAV_Exception_MethodNotAllowed('Listing members of this collection is disabled');
+
+        $children = array();
+        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
+
+            $children[] = $this->getChildForPrincipal($principalInfo);
+
+
+        }
+        return $children;
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_IPrincipal
+     */
+    public function getChild($name) {
+
+        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
+        if (!$principalInfo) throw new Sabre_DAV_Exception_NotFound('Principal with name ' . $name . ' not found');
+        return $this->getChildForPrincipal($principalInfo);
+
+    }
+
+    /**
+     * This method is used to search for principals matching a set of
+     * properties.
+     *
+     * This search is specifically used by RFC3744's principal-property-search
+     * REPORT. You should at least allow searching on
+     * http://sabredav.org/ns}email-address.
+     *
+     * The actual search should be a unicode-non-case-sensitive search. The
+     * keys in searchProperties are the WebDAV property names, while the values
+     * are the property values to search on.
+     *
+     * If multiple properties are being searched on, the search should be
+     * AND'ed.
+     *
+     * This method should simply return a list of 'child names', which may be
+     * used to call $this->getChild in the future.
+     *
+     * @param array $searchProperties
+     * @return array
+     */
+    public function searchPrincipals(array $searchProperties) {
+
+        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties);
+        $r = array();
+
+        foreach($result as $row) {
+            list(, $r[]) = Sabre_DAV_URLUtil::splitPath($row);
+        }
+
+        return $r;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
new file mode 100755
index 0000000000..4b9f93b003
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_AceConflict
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
new file mode 100755
index 0000000000..9b055dd970
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * NeedPrivileges
+ *
+ * The 403-need privileges is thrown when a user didn't have the appropriate
+ * permissions to perform an operation
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
+
+    /**
+     * The relevant uri
+     *
+     * @var string
+     */
+    protected $uri;
+
+    /**
+     * The privileges the user didn't have.
+     *
+     * @var array
+     */
+    protected $privileges;
+
+    /**
+     * Constructor
+     *
+     * @param string $uri
+     * @param array $privileges
+     */
+    public function __construct($uri,array $privileges) {
+
+        $this->uri = $uri;
+        $this->privileges = $privileges;
+
+        parent::__construct('User did not have the required privileges (' . implode(',', $privileges) . ') for path "' . $uri . '"');
+
+    }
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}need-privileges element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:need-privileges');
+        $errorNode->appendChild($np);
+
+        foreach($this->privileges as $privilege) {
+
+            $resource = $doc->createElementNS('DAV:','d:resource');
+            $np->appendChild($resource);
+
+            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
+
+            $priv = $doc->createElementNS('DAV:','d:privilege');
+            $resource->appendChild($priv);
+
+            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
+            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
+
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
new file mode 100755
index 0000000000..f44e3e3228
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NoAbstract
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}no-abstract element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:no-abstract');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
new file mode 100755
index 0000000000..8d1e38ca1b
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NotRecognizedPrincipal
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:recognized-principal');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
new file mode 100755
index 0000000000..3b5d012d7f
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NotSupportedPrivilege
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IACL.php b/3rdparty/Sabre/DAVACL/IACL.php
new file mode 100755
index 0000000000..003e699348
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IACL.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * ACL-enabled node
+ *
+ * If you want to add WebDAV ACL to a node, you must implement this class
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IACL extends Sabre_DAV_INode {
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    function getOwner();
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    function getGroup();
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    function getACL();
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    function setACL(array $acl);
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    function getSupportedPrivilegeSet();
+
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipal.php b/3rdparty/Sabre/DAVACL/IPrincipal.php
new file mode 100755
index 0000000000..fc7605bf62
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IPrincipal.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * IPrincipal interface
+ *
+ * Implement this interface to define your own principals
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    function getAlternateUriSet();
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    function getPrincipalUrl();
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    function getGroupMemberSet();
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    function getGroupMembership();
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $principals
+     * @return void
+     */
+    function setGroupMemberSet(array $principals);
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename.
+     *
+     * @return string
+     */
+    function getDisplayName();
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
new file mode 100755
index 0000000000..e798bf890c
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * Implement this interface to create your own principal backends.
+ *
+ * Creating backends for principals is entirely optional. You can also
+ * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by
+ * Sabre_DAVACL_AbstractPrincipalCollection.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IPrincipalBackend {
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
+     *     field that's actually injected in a number of other properties. If
+     *     you have an email address, use this property.
+     *
+     * @param string $prefixPath
+     * @return array
+     */
+    function getPrincipalsByPrefix($prefixPath);
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    function getPrincipalByPath($path);
+
+    /**
+     * Updates one ore more webdav properties on a principal.
+     *
+     * The list of mutations is supplied as an array. Each key in the array is
+     * a propertyname, such as {DAV:}displayname.
+     *
+     * Each value is the actual value to be updated. If a value is null, it
+     * must be deleted.
+     *
+     * This method should be atomic. It must either completely succeed, or
+     * completely fail. Success and failure can simply be returned as 'true' or
+     * 'false'.
+     *
+     * It is also possible to return detailed failure information. In that case
+     * an array such as this should be returned:
+     *
+     * array(
+     *   200 => array(
+     *      '{DAV:}prop1' => null,
+     *   ),
+     *   201 => array(
+     *      '{DAV:}prop2' => null,
+     *   ),
+     *   403 => array(
+     *      '{DAV:}prop3' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}prop4' => null,
+     *   ),
+     * );
+     *
+     * In this previous example prop1 was successfully updated or deleted, and
+     * prop2 was succesfully created.
+     *
+     * prop3 failed to update due to '403 Forbidden' and because of this prop4
+     * also could not be updated with '424 Failed dependency'.
+     *
+     * This last example was actually incorrect. While 200 and 201 could appear
+     * in 1 response, if there's any error (403) the other properties should
+     * always fail with 423 (failed dependency).
+     *
+     * But anyway, if you don't want to scratch your head over this, just
+     * return true or false.
+     *
+     * @param string $path
+     * @param array $mutations
+     * @return array|bool
+     */
+    function updatePrincipal($path, $mutations);
+
+    /**
+     * This method is used to search for principals matching a set of
+     * properties.
+     *
+     * This search is specifically used by RFC3744's principal-property-search
+     * REPORT. You should at least allow searching on
+     * http://sabredav.org/ns}email-address.
+     *
+     * The actual search should be a unicode-non-case-sensitive search. The
+     * keys in searchProperties are the WebDAV property names, while the values
+     * are the property values to search on.
+     *
+     * If multiple properties are being searched on, the search should be
+     * AND'ed.
+     *
+     * This method should simply return an array with full principal uri's.
+     *
+     * If somebody attempted to search on a property the backend does not
+     * support, you should simply return 0 results.
+     *
+     * You can also just return 0 results if you choose to not support
+     * searching at all, but keep in mind that this may stop certain features
+     * from working.
+     *
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties);
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return array
+     */
+    function getGroupMemberSet($principal);
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     */
+    function getGroupMembership($principal);
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param array $members
+     * @return void
+     */
+    function setGroupMemberSet($principal, array $members);
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Plugin.php b/3rdparty/Sabre/DAVACL/Plugin.php
new file mode 100755
index 0000000000..5c828c6d97
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Plugin.php
@@ -0,0 +1,1348 @@
+<?php
+
+/**
+ * SabreDAV ACL Plugin
+ *
+ * This plugin provides funcitonality to enforce ACL permissions.
+ * ACL is defined in RFC3744.
+ *
+ * In addition it also provides support for the {DAV:}current-user-principal
+ * property, defined in RFC5397 and the {DAV:}expand-property report, as
+ * defined in RFC3253.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Recursion constants
+     *
+     * This only checks the base node
+     */
+    const R_PARENT = 1;
+
+    /**
+     * Recursion constants
+     *
+     * This checks every node in the tree
+     */
+    const R_RECURSIVE = 2;
+
+    /**
+     * Recursion constants
+     *
+     * This checks every parentnode in the tree, but not leaf-nodes.
+     */
+    const R_RECURSIVEPARENTS = 3;
+
+    /**
+     * Reference to server object.
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * List of urls containing principal collections.
+     * Modify this if your principals are located elsewhere.
+     *
+     * @var array
+     */
+    public $principalCollectionSet = array(
+        'principals',
+    );
+
+    /**
+     * By default ACL is only enforced for nodes that have ACL support (the
+     * ones that implement Sabre_DAVACL_IACL). For any other node, access is
+     * always granted.
+     *
+     * To override this behaviour you can turn this setting off. This is useful
+     * if you plan to fully support ACL in the entire tree.
+     *
+     * @var bool
+     */
+    public $allowAccessToNodesWithoutACL = true;
+
+    /**
+     * By default nodes that are inaccessible by the user, can still be seen
+     * in directory listings (PROPFIND on parent with Depth: 1)
+     *
+     * In certain cases it's desirable to hide inaccessible nodes. Setting this
+     * to true will cause these nodes to be hidden from directory listings.
+     *
+     * @var bool
+     */
+    public $hideNodesFromListings = false;
+
+    /**
+     * This string is prepended to the username of the currently logged in
+     * user. This allows the plugin to determine the principal path based on
+     * the username.
+     *
+     * @var string
+     */
+    public $defaultUsernamePath = 'principals';
+
+    /**
+     * This list of properties are the properties a client can search on using
+     * the {DAV:}principal-property-search report.
+     *
+     * The keys are the property names, values are descriptions.
+     *
+     * @var array
+     */
+    public $principalSearchPropertySet = array(
+        '{DAV:}displayname' => 'Display name',
+        '{http://sabredav.org/ns}email-address' => 'Email address',
+    );
+
+    /**
+     * Any principal uri's added here, will automatically be added to the list 
+     * of ACL's. They will effectively receive {DAV:}all privileges, as a 
+     * protected privilege.
+     * 
+     * @var array 
+     */
+    public $adminPrincipals = array();
+
+    /**
+     * Returns a list of features added by this plugin.
+     *
+     * This list is used in the response of a HTTP OPTIONS request.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('access-control');
+
+    }
+
+    /**
+     * Returns a list of available methods for a given url
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getMethods($uri) {
+
+        return array('ACL');
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'acl';
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        return array(
+            '{DAV:}expand-property',
+            '{DAV:}principal-property-search',
+            '{DAV:}principal-search-property-set',
+        );
+
+    }
+
+
+    /**
+     * Checks if the current user has the specified privilege(s).
+     *
+     * You can specify a single privilege, or a list of privileges.
+     * This method will throw an exception if the privilege is not available
+     * and return true otherwise.
+     *
+     * @param string $uri
+     * @param array|string $privileges
+     * @param int $recursion
+     * @param bool $throwExceptions if set to false, this method won't through exceptions.
+     * @throws Sabre_DAVACL_Exception_NeedPrivileges
+     * @return bool
+     */
+    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+
+        if (!is_array($privileges)) $privileges = array($privileges);
+
+        $acl = $this->getCurrentUserPrivilegeSet($uri);
+
+        if (is_null($acl)) {
+            if ($this->allowAccessToNodesWithoutACL) {
+                return true;
+            } else {
+                if ($throwExceptions)
+                    throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$privileges);
+                else
+                    return false;
+
+            }
+        }
+
+        $failed = array();
+        foreach($privileges as $priv) {
+
+            if (!in_array($priv, $acl)) {
+                $failed[] = $priv;
+            }
+
+        }
+
+        if ($failed) {
+            if ($throwExceptions)
+                throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$failed);
+            else
+                return false;
+        }
+        return true;
+
+    }
+
+    /**
+     * Returns the standard users' principal.
+     *
+     * This is one authorative principal url for the current user.
+     * This method will return null if the user wasn't logged in.
+     *
+     * @return string|null
+     */
+    public function getCurrentUserPrincipal() {
+
+        $authPlugin = $this->server->getPlugin('auth');
+        if (is_null($authPlugin)) return null;
+
+        $userName = $authPlugin->getCurrentUser();
+        if (!$userName) return null;
+
+        return $this->defaultUsernamePath . '/' . $userName;
+
+    }
+
+    /**
+     * Returns a list of principals that's associated to the current
+     * user, either directly or through group membership.
+     *
+     * @return array
+     */
+    public function getCurrentUserPrincipals() {
+
+        $currentUser = $this->getCurrentUserPrincipal();
+
+        if (is_null($currentUser)) return array();
+
+        $check = array($currentUser);
+        $principals = array($currentUser);
+
+        while(count($check)) {
+
+            $principal = array_shift($check);
+
+            $node = $this->server->tree->getNodeForPath($principal);
+            if ($node instanceof Sabre_DAVACL_IPrincipal) {
+                foreach($node->getGroupMembership() as $groupMember) {
+
+                    if (!in_array($groupMember, $principals)) {
+
+                        $check[] = $groupMember;
+                        $principals[] = $groupMember;
+
+                    }
+
+                }
+
+            }
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns the supported privilege structure for this ACL plugin.
+     *
+     * See RFC3744 for more details. Currently we default on a simple,
+     * standard structure.
+     *
+     * You can either get the list of privileges by a uri (path) or by
+     * specifying a Node.
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getSupportedPrivilegeSet($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+
+        if ($node instanceof Sabre_DAVACL_IACL) {
+            $result = $node->getSupportedPrivilegeSet();
+
+            if ($result)
+                return $result;
+        }
+
+        return self::getDefaultSupportedPrivilegeSet();
+
+    }
+
+    /**
+     * Returns a fairly standard set of privileges, which may be useful for
+     * other systems to use as a basis.
+     *
+     * @return array
+     */
+    static function getDefaultSupportedPrivilegeSet() {
+
+        return array(
+            'privilege'  => '{DAV:}all',
+            'abstract'   => true,
+            'aggregates' => array(
+                array(
+                    'privilege'  => '{DAV:}read',
+                    'aggregates' => array(
+                        array(
+                            'privilege' => '{DAV:}read-acl',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}read-current-user-privilege-set',
+                            'abstract'  => true,
+                        ),
+                    ),
+                ), // {DAV:}read
+                array(
+                    'privilege'  => '{DAV:}write',
+                    'aggregates' => array(
+                        array(
+                            'privilege' => '{DAV:}write-acl',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}write-properties',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}write-content',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}bind',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}unbind',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}unlock',
+                            'abstract'  => true,
+                        ),
+                    ),
+                ), // {DAV:}write
+            ),
+        ); // {DAV:}all
+
+    }
+
+    /**
+     * Returns the supported privilege set as a flat list
+     *
+     * This is much easier to parse.
+     *
+     * The returned list will be index by privilege name.
+     * The value is a struct containing the following properties:
+     *   - aggregates
+     *   - abstract
+     *   - concrete
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    final public function getFlatPrivilegeSet($node) {
+
+        $privs = $this->getSupportedPrivilegeSet($node);
+
+        $flat = array();
+        $this->getFPSTraverse($privs, null, $flat);
+
+        return $flat;
+
+    }
+
+    /**
+     * Traverses the privilege set tree for reordering
+     *
+     * This function is solely used by getFlatPrivilegeSet, and would have been
+     * a closure if it wasn't for the fact I need to support PHP 5.2.
+     *
+     * @param array $priv
+     * @param $concrete
+     * @param array $flat
+     * @return void
+     */
+    final private function getFPSTraverse($priv, $concrete, &$flat) {
+
+        $myPriv = array(
+            'privilege' => $priv['privilege'],
+            'abstract' => isset($priv['abstract']) && $priv['abstract'],
+            'aggregates' => array(),
+            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
+        );
+
+        if (isset($priv['aggregates']))
+            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
+
+        $flat[$priv['privilege']] = $myPriv;
+
+        if (isset($priv['aggregates'])) {
+
+            foreach($priv['aggregates'] as $subPriv) {
+
+                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
+
+            }
+
+        }
+
+    }
+
+    /**
+     * Returns the full ACL list.
+     *
+     * Either a uri or a Sabre_DAV_INode may be passed.
+     *
+     * null will be returned if the node doesn't support ACLs.
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getACL($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+        if (!$node instanceof Sabre_DAVACL_IACL) {
+            return null;
+        }
+        $acl = $node->getACL();
+        foreach($this->adminPrincipals as $adminPrincipal) {
+            $acl[] = array(
+                'principal' => $adminPrincipal,
+                'privilege' => '{DAV:}all',
+                'protected' => true,
+            );
+        }
+        return $acl;
+
+    }
+
+    /**
+     * Returns a list of privileges the current user has
+     * on a particular node.
+     *
+     * Either a uri or a Sabre_DAV_INode may be passed.
+     *
+     * null will be returned if the node doesn't support ACLs.
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getCurrentUserPrivilegeSet($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+
+        $acl = $this->getACL($node);
+
+        if (is_null($acl)) return null;
+
+        $principals = $this->getCurrentUserPrincipals();
+
+        $collected = array();
+
+        foreach($acl as $ace) {
+
+            $principal = $ace['principal'];
+
+            switch($principal) {
+
+                case '{DAV:}owner' :
+                    $owner = $node->getOwner();
+                    if ($owner && in_array($owner, $principals)) {
+                        $collected[] = $ace;
+                    }
+                    break;
+
+
+                // 'all' matches for every user
+                case '{DAV:}all' :
+
+                // 'authenticated' matched for every user that's logged in.
+                // Since it's not possible to use ACL while not being logged
+                // in, this is also always true.
+                case '{DAV:}authenticated' :
+                    $collected[] = $ace;
+                    break;
+
+                // 'unauthenticated' can never occur either, so we simply
+                // ignore these.
+                case '{DAV:}unauthenticated' :
+                    break;
+
+                default :
+                    if (in_array($ace['principal'], $principals)) {
+                        $collected[] = $ace;
+                    }
+                    break;
+
+            }
+
+
+
+        }
+
+        // Now we deduct all aggregated privileges.
+        $flat = $this->getFlatPrivilegeSet($node);
+
+        $collected2 = array();
+        while(count($collected)) {
+
+            $current = array_pop($collected);
+            $collected2[] = $current['privilege'];
+
+            foreach($flat[$current['privilege']]['aggregates'] as $subPriv) {
+                $collected2[] = $subPriv;
+                $collected[] = $flat[$subPriv];
+            }
+
+        }
+
+        return array_values(array_unique($collected2));
+
+    }
+
+    /**
+     * Principal property search
+     *
+     * This method can search for principals matching certain values in
+     * properties.
+     *
+     * This method will return a list of properties for the matched properties.
+     *
+     * @param array $searchProperties    The properties to search on. This is a
+     *                                   key-value list. The keys are property
+     *                                   names, and the values the strings to
+     *                                   match them on.
+     * @param array $requestedProperties This is the list of properties to
+     *                                   return for every match.
+     * @param string $collectionUri      The principal collection to search on.
+     *                                   If this is ommitted, the standard
+     *                                   principal collection-set will be used.
+     * @return array     This method returns an array structure similar to
+     *                  Sabre_DAV_Server::getPropertiesForPath. Returned
+     *                  properties are index by a HTTP status code.
+     *
+     */
+    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null) {
+
+        if (!is_null($collectionUri)) {
+            $uris = array($collectionUri);
+        } else {
+            $uris = $this->principalCollectionSet;
+        }
+
+        $lookupResults = array();
+        foreach($uris as $uri) {
+
+            $principalCollection = $this->server->tree->getNodeForPath($uri);
+            if (!$principalCollection instanceof Sabre_DAVACL_AbstractPrincipalCollection) {
+                // Not a principal collection, we're simply going to ignore
+                // this.
+                continue;
+            }
+
+            $results = $principalCollection->searchPrincipals($searchProperties);
+            foreach($results as $result) {
+                $lookupResults[] = rtrim($uri,'/') . '/' . $result;
+            }
+
+        }
+
+        $matches = array();
+
+        foreach($lookupResults as $lookupResult) {
+
+            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
+
+        }
+
+        return $matches;
+
+    }
+
+    /**
+     * Sets up the plugin
+     *
+     * This method is automatically called by the server class.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+
+        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
+        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
+        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
+        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
+        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
+
+        array_push($server->protectedProperties,
+            '{DAV:}alternate-URI-set',
+            '{DAV:}principal-URL',
+            '{DAV:}group-membership',
+            '{DAV:}principal-collection-set',
+            '{DAV:}current-user-principal',
+            '{DAV:}supported-privilege-set',
+            '{DAV:}current-user-privilege-set',
+            '{DAV:}acl',
+            '{DAV:}acl-restrictions',
+            '{DAV:}inherited-acl-set',
+            '{DAV:}owner',
+            '{DAV:}group'
+        );
+
+        // Automatically mapping nodes implementing IPrincipal to the
+        // {DAV:}principal resourcetype.
+        $server->resourceTypeMapping['Sabre_DAVACL_IPrincipal'] = '{DAV:}principal';
+
+        // Mapping the group-member-set property to the HrefList property
+        // class.
+        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre_DAV_Property_HrefList';
+
+    }
+
+
+    /* {{{ Event handlers */
+
+    /**
+     * Triggered before any method is handled
+     *
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function beforeMethod($method, $uri) {
+
+        $exists = $this->server->tree->nodeExists($uri);
+
+        // If the node doesn't exists, none of these checks apply
+        if (!$exists) return;
+
+        switch($method) {
+
+            case 'GET' :
+            case 'HEAD' :
+            case 'OPTIONS' :
+                // For these 3 we only need to know if the node is readable.
+                $this->checkPrivileges($uri,'{DAV:}read');
+                break;
+
+            case 'PUT' :
+            case 'LOCK' :
+            case 'UNLOCK' :
+                // This method requires the write-content priv if the node
+                // already exists, and bind on the parent if the node is being
+                // created.
+                // The bind privilege is handled in the beforeBind event.
+                $this->checkPrivileges($uri,'{DAV:}write-content');
+                break;
+
+
+            case 'PROPPATCH' :
+                $this->checkPrivileges($uri,'{DAV:}write-properties');
+                break;
+
+            case 'ACL' :
+                $this->checkPrivileges($uri,'{DAV:}write-acl');
+                break;
+
+            case 'COPY' :
+            case 'MOVE' :
+                // Copy requires read privileges on the entire source tree.
+                // If the target exists write-content normally needs to be
+                // checked, however, we're deleting the node beforehand and
+                // creating a new one after, so this is handled by the
+                // beforeUnbind event.
+                //
+                // The creation of the new node is handled by the beforeBind
+                // event.
+                //
+                // If MOVE is used beforeUnbind will also be used to check if
+                // the sourcenode can be deleted.
+                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
+
+                break;
+
+        }
+
+    }
+
+    /**
+     * Triggered before a new node is created.
+     *
+     * This allows us to check permissions for any operation that creates a
+     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function beforeBind($uri) {
+
+        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
+        $this->checkPrivileges($parentUri,'{DAV:}bind');
+
+    }
+
+    /**
+     * Triggered before a node is deleted
+     *
+     * This allows us to check permissions for any operation that will delete
+     * an existing node.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function beforeUnbind($uri) {
+
+        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
+        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
+
+    }
+
+    /**
+     * Triggered before a node is unlocked.
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lock
+     * @TODO: not yet implemented
+     * @return void
+     */
+    public function beforeUnlock($uri, Sabre_DAV_Locks_LockInfo $lock) {
+
+
+    }
+
+    /**
+     * Triggered before properties are looked up in specific nodes.
+     *
+     * @param string $uri
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @TODO really should be broken into multiple methods, or even a class.
+     * @return void
+     */
+    public function beforeGetProperties($uri, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
+
+        // Checking the read permission
+        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
+
+            // User is not allowed to read properties
+            if ($this->hideNodesFromListings) {
+                return false;
+            }
+
+            // Marking all requested properties as '403'.
+            foreach($requestedProperties as $key=>$requestedProperty) {
+                unset($requestedProperties[$key]);
+                $returnedProperties[403][$requestedProperty] = null;
+            }
+            return;
+
+        }
+
+        /* Adding principal properties */
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new Sabre_DAV_Property_HrefList($node->getAlternateUriSet());
+
+            }
+            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}principal-URL'] = new Sabre_DAV_Property_Href($node->getPrincipalUrl() . '/');
+
+            }
+            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}group-member-set'] = new Sabre_DAV_Property_HrefList($node->getGroupMemberSet());
+
+            }
+            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}group-membership'] = new Sabre_DAV_Property_HrefList($node->getGroupMembership());
+
+            }
+
+            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
+
+                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
+
+            }
+
+        }
+        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            $val = $this->principalCollectionSet;
+            // Ensuring all collections end with a slash
+            foreach($val as $k=>$v) $val[$k] = $v . '/';
+            $returnedProperties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_HrefList($val);
+
+        }
+        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            if ($url = $this->getCurrentUserPrincipal()) {
+                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF, $url . '/');
+            } else {
+                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::UNAUTHENTICATED);
+            }
+
+        }
+        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Sabre_DAVACL_Property_SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
+
+        }
+        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
+
+            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
+                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
+                unset($requestedProperties[$index]);
+            } else {
+                $val = $this->getCurrentUserPrivilegeSet($node);
+                if (!is_null($val)) {
+                    unset($requestedProperties[$index]);
+                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Sabre_DAVACL_Property_CurrentUserPrivilegeSet($val);
+                }
+            }
+
+        }
+
+        /* The ACL property contains all the permissions */
+        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
+
+            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[403]['{DAV:}acl'] = null;
+
+            } else {
+
+                $acl = $this->getACL($node);
+                if (!is_null($acl)) {
+                    unset($requestedProperties[$index]);
+                    $returnedProperties[200]['{DAV:}acl'] = new Sabre_DAVACL_Property_Acl($this->getACL($node));
+                }
+
+            }
+
+        }
+
+        /* The acl-restrictions property contains information on how privileges
+         * must behave.
+         */
+        if (false !== ($index = array_search('{DAV:}acl-restrictions', $requestedProperties))) {
+            unset($requestedProperties[$index]);
+            $returnedProperties[200]['{DAV:}acl-restrictions'] = new Sabre_DAVACL_Property_AclRestrictions();
+        }
+
+    }
+
+    /**
+     * This method intercepts PROPPATCH methods and make sure the
+     * group-member-set is updated correctly.
+     *
+     * @param array $propertyDelta
+     * @param array $result
+     * @param Sabre_DAV_INode $node
+     * @return bool
+     */
+    public function updateProperties(&$propertyDelta, &$result, Sabre_DAV_INode $node) {
+
+        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
+            return;
+
+        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
+            $memberSet = array();
+        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof Sabre_DAV_Property_HrefList) {
+            $memberSet = $propertyDelta['{DAV:}group-member-set']->getHrefs();
+        } else {
+            throw new Sabre_DAV_Exception('The group-member-set property MUST be an instance of Sabre_DAV_Property_HrefList or null');
+        }
+
+        if (!($node instanceof Sabre_DAVACL_IPrincipal)) {
+            $result[403]['{DAV:}group-member-set'] = null;
+            unset($propertyDelta['{DAV:}group-member-set']);
+
+            // Returning false will stop the updateProperties process
+            return false;
+        }
+
+        $node->setGroupMemberSet($memberSet);
+
+        $result[200]['{DAV:}group-member-set'] = null;
+        unset($propertyDelta['{DAV:}group-member-set']);
+
+    }
+
+    /**
+     * This method handels HTTP REPORT requests
+     *
+     * @param string $reportName
+     * @param DOMNode $dom
+     * @return bool
+     */
+    public function report($reportName, $dom) {
+
+        switch($reportName) {
+
+            case '{DAV:}principal-property-search' :
+                $this->principalPropertySearchReport($dom);
+                return false;
+            case '{DAV:}principal-search-property-set' :
+                $this->principalSearchPropertySetReport($dom);
+                return false;
+            case '{DAV:}expand-property' :
+                $this->expandPropertyReport($dom);
+                return false;
+
+        }
+
+    }
+
+    /**
+     * This event is triggered for any HTTP method that is not known by the
+     * webserver.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function unknownMethod($method, $uri) {
+
+        if ($method!=='ACL') return;
+
+        $this->httpACL($uri);
+        return false;
+
+    }
+
+    /**
+     * This method is responsible for handling the 'ACL' event.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function httpACL($uri) {
+
+        $body = $this->server->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $newAcl =
+            Sabre_DAVACL_Property_Acl::unserialize($dom->firstChild)
+            ->getPrivileges();
+
+        // Normalizing urls
+        foreach($newAcl as $k=>$newAce) {
+            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
+        }
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_DAVACL_IACL)) {
+            throw new Sabre_DAV_Exception_MethodNotAllowed('This node does not support the ACL method');
+        }
+
+        $oldAcl = $this->getACL($node);
+
+        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
+
+        /* Checking if protected principals from the existing principal set are
+           not overwritten. */
+        foreach($oldAcl as $oldAce) {
+
+            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
+
+            $found = false;
+            foreach($newAcl as $newAce) {
+                if (
+                    $newAce['privilege'] === $oldAce['privilege'] &&
+                    $newAce['principal'] === $oldAce['principal'] &&
+                    $newAce['protected']
+                )
+                $found = true;
+            }
+
+            if (!$found)
+                throw new Sabre_DAVACL_Exception_AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+
+        }
+
+        foreach($newAcl as $newAce) {
+
+            // Do we recognize the privilege
+            if (!isset($supportedPrivileges[$newAce['privilege']])) {
+                throw new Sabre_DAVACL_Exception_NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
+            }
+
+            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
+                throw new Sabre_DAVACL_Exception_NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
+            }
+
+            // Looking up the principal
+            try {
+                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
+            } catch (Sabre_DAV_Exception_NotFound $e) {
+                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
+            }
+            if (!($principal instanceof Sabre_DAVACL_IPrincipal)) {
+                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
+            }
+
+        }
+        $node->setACL($newAcl);
+
+    }
+
+    /* }}} */
+
+    /* Reports {{{ */
+
+    /**
+     * The expand-property report is defined in RFC3253 section 3-8.
+     *
+     * This report is very similar to a standard PROPFIND. The difference is
+     * that it has the additional ability to look at properties containing a
+     * {DAV:}href element, follow that property and grab additional elements
+     * there.
+     *
+     * Other rfc's, such as ACL rely on this report, so it made sense to put
+     * it in this plugin.
+     *
+     * @param DOMElement $dom
+     * @return void
+     */
+    protected function expandPropertyReport($dom) {
+
+        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
+        $depth = $this->server->getHTTPDepth(0);
+        $requestUri = $this->server->getRequestUri();
+
+        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($result as $response) {
+            $response->serialize($this->server, $multiStatus);
+        }
+
+        $xml = $dom->saveXML();
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    /**
+     * This method is used by expandPropertyReport to parse
+     * out the entire HTTP request.
+     *
+     * @param DOMElement $node
+     * @return array
+     */
+    protected function parseExpandPropertyReportRequest($node) {
+
+        $requestedProperties = array();
+        do {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
+
+            if ($node->firstChild) {
+
+                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
+
+            } else {
+
+                $children = array();
+
+            }
+
+            $namespace = $node->getAttribute('namespace');
+            if (!$namespace) $namespace = 'DAV:';
+
+            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
+            $requestedProperties[$propName] = $children;
+
+        } while ($node = $node->nextSibling);
+
+        return $requestedProperties;
+
+    }
+
+    /**
+     * This method expands all the properties and returns
+     * a list with property values
+     *
+     * @param array $path
+     * @param array $requestedProperties the list of required properties
+     * @param int $depth
+     * @return array
+     */
+    protected function expandProperties($path, array $requestedProperties, $depth) {
+
+        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
+
+        $result = array();
+
+        foreach($foundProperties as $node) {
+
+            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
+
+                // We're only traversing if sub-properties were requested
+                if(count($childRequestedProperties)===0) continue;
+
+                // We only have to do the expansion if the property was found
+                // and it contains an href element.
+                if (!array_key_exists($propertyName,$node[200])) continue;
+
+                if ($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref) {
+                    $hrefs = array($node[200][$propertyName]->getHref());
+                } elseif ($node[200][$propertyName] instanceof Sabre_DAV_Property_HrefList) {
+                    $hrefs = $node[200][$propertyName]->getHrefs();
+                }
+
+                $childProps = array();
+                foreach($hrefs as $href) {
+                    $childProps = array_merge($childProps, $this->expandProperties($href, $childRequestedProperties, 0));
+                }
+                $node[200][$propertyName] = new Sabre_DAV_Property_ResponseList($childProps);
+
+            }
+            $result[] = new Sabre_DAV_Property_Response($path, $node);
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * principalSearchPropertySetReport
+     *
+     * This method responsible for handing the
+     * {DAV:}principal-search-property-set report. This report returns a list
+     * of properties the client may search on, using the
+     * {DAV:}principal-property-search report.
+     *
+     * @param DOMDocument $dom
+     * @return void
+     */
+    protected function principalSearchPropertySetReport(DOMDocument $dom) {
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+
+        if ($dom->firstChild->hasChildNodes())
+            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements');
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElement('d:principal-search-property-set');
+        $dom->appendChild($root);
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $root->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        $nsList = $this->server->xmlNamespaces;
+
+        foreach($this->principalSearchPropertySet as $propertyName=>$description) {
+
+            $psp = $dom->createElement('d:principal-search-property');
+            $root->appendChild($psp);
+
+            $prop = $dom->createElement('d:prop');
+            $psp->appendChild($prop);
+
+            $propName = null;
+            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+
+            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+            $prop->appendChild($currentProperty);
+
+            $descriptionElem = $dom->createElement('d:description');
+            $descriptionElem->setAttribute('xml:lang','en');
+            $descriptionElem->appendChild($dom->createTextNode($description));
+            $psp->appendChild($descriptionElem);
+
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody($dom->saveXML());
+
+    }
+
+    /**
+     * principalPropertySearchReport
+     *
+     * This method is responsible for handing the
+     * {DAV:}principal-property-search report. This report can be used for
+     * clients to search for groups of principals, based on the value of one
+     * or more properties.
+     *
+     * @param DOMDocument $dom
+     * @return void
+     */
+    protected function principalPropertySearchReport(DOMDocument $dom) {
+
+        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
+
+        $uri = null;
+        if (!$applyToPrincipalCollectionSet) {
+            $uri = $this->server->getRequestUri();
+        }
+        $result = $this->principalSearch($searchProperties, $requestedProperties, $uri);
+
+        $xml = $this->server->generateMultiStatus($result);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    /**
+     * parsePrincipalPropertySearchReportRequest
+     *
+     * This method parses the request body from a
+     * {DAV:}principal-property-search report.
+     *
+     * This method returns an array with two elements:
+     *  1. an array with properties to search on, and their values
+     *  2. a list of propertyvalues that should be returned for the request.
+     *
+     * @param DOMDocument $dom
+     * @return array
+     */
+    protected function parsePrincipalPropertySearchReportRequest($dom) {
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+
+        $searchProperties = array();
+
+        $applyToPrincipalCollectionSet = false;
+
+        // Parsing the search request
+        foreach($dom->firstChild->childNodes as $searchNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set') {
+                $applyToPrincipalCollectionSet = true;
+            }
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
+                continue;
+
+            $propertyName = null;
+            $propertyValue = null;
+
+            foreach($searchNode->childNodes as $childNode) {
+
+                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+
+                    case '{DAV:}prop' :
+                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
+                        reset($property);
+                        $propertyName = key($property);
+                        break;
+
+                    case '{DAV:}match' :
+                        $propertyValue = $childNode->textContent;
+                        break;
+
+                }
+
+
+            }
+
+            if (is_null($propertyName) || is_null($propertyValue))
+                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
+
+            $searchProperties[$propertyName] = $propertyValue;
+
+        }
+
+        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
+
+    }
+
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php
new file mode 100755
index 0000000000..51c6658afd
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Principal.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * Principal class
+ *
+ * This class is a representation of a simple principal
+ *
+ * Many WebDAV specs require a user to show up in the directory
+ * structure.
+ *
+ * This principal also has basic ACL settings, only allowing the principal
+ * access it's own principal.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * Struct with principal information.
+     *
+     * @var array
+     */
+    protected $principalProperties;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the principal object
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param array $principalProperties
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalProperties = array()) {
+
+        if (!isset($principalProperties['uri'])) {
+            throw new Sabre_DAV_Exception('The principal properties must at least contain the \'uri\' key');
+        }
+        $this->principalBackend = $principalBackend;
+        $this->principalProperties = $principalProperties;
+
+    }
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalProperties['uri'];
+
+    }
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    public function getAlternateUriSet() {
+
+        $uris = array();
+        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
+
+            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
+
+        }
+
+        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
+            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
+        }
+
+        return array_unique($uris);
+
+    }
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
+
+    }
+
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $groupMembers
+     * @return void
+     */
+    public function setGroupMemberSet(array $groupMembers) {
+
+        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
+
+    }
+
+
+    /**
+     * Returns this principals name.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        $uri = $this->principalProperties['uri'];
+        list(, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+        return $name;
+
+    }
+
+    /**
+     * Returns the name of the user
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+
+        if (isset($this->principalProperties['{DAV:}displayname'])) {
+            return $this->principalProperties['{DAV:}displayname'];
+        } else {
+            return $this->getName();
+        }
+
+    }
+
+    /**
+     * Returns a list of properties
+     *
+     * @param array $requestedProperties
+     * @return array
+     */
+    public function getProperties($requestedProperties) {
+
+        $newProperties = array();
+        foreach($requestedProperties as $propName) {
+
+            if (isset($this->principalProperties[$propName])) {
+                $newProperties[$propName] = $this->principalProperties[$propName];
+            }
+
+        }
+
+        return $newProperties;
+
+    }
+
+    /**
+     * Updates this principals properties.
+     * 
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateProperties($mutations) {
+
+        return $this->principalBackend->updatePrincipal($this->principalProperties['uri'], $mutations);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalProperties['uri'];
+
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getPrincipalUrl(),
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Updating ACLs is not allowed here');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
new file mode 100755
index 0000000000..a76b4a9d72
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
@@ -0,0 +1,427 @@
+<?php
+
+/**
+ * PDO principal backend
+ *
+ * This is a simple principal backend that maps exactly to the users table, as
+ * used by Sabre_DAV_Auth_Backend_PDO.
+ *
+ * It assumes all principals are in a single collection. The default collection
+ * is 'principals/', but this can be overriden.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
+
+    /**
+     * pdo
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * PDO table name for 'principals'
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * PDO table name for 'group members'
+     *
+     * @var string
+     */
+    protected $groupMembersTableName;
+
+    /**
+     * A list of additional fields to support
+     *
+     * @var array
+     */
+    protected $fieldMap = array(
+
+        /**
+         * This property can be used to display the users' real name.
+         */
+        '{DAV:}displayname' => array(
+            'dbField' => 'displayname',
+        ),
+
+        /**
+         * This property is actually used by the CardDAV plugin, where it gets
+         * mapped to {http://calendarserver.orgi/ns/}me-card.
+         *
+         * The reason we don't straight-up use that property, is because
+         * me-card is defined as a property on the users' addressbook
+         * collection.
+         */
+        '{http://sabredav.org/ns}vcard-url' => array(
+            'dbField' => 'vcardurl',
+        ),
+        /**
+         * This is the users' primary email-address.
+         */
+        '{http://sabredav.org/ns}email-address' => array(
+            'dbField' => 'email',
+        ),
+    );
+
+    /**
+     * Sets up the backend.
+     *
+     * @param PDO $pdo
+     * @param string $tableName
+     * @param string $groupMembersTableName
+     */
+    public function __construct(PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+        $this->groupMembersTableName = $groupMembersTableName;
+
+    }
+
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
+     *     field that's actualy injected in a number of other properties. If
+     *     you have an email address, use this property.
+     *
+     * @param string $prefixPath
+     * @return array
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+
+        $fields = array(
+            'uri',
+        );
+
+        foreach($this->fieldMap as $key=>$value) {
+            $fields[] = $value['dbField'];
+        }
+        $result = $this->pdo->query('SELECT '.implode(',', $fields).'  FROM '. $this->tableName);
+
+        $principals = array();
+
+        while($row = $result->fetch(PDO::FETCH_ASSOC)) {
+
+            // Checking if the principal is in the prefix
+            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
+            if ($rowPrefix !== $prefixPath) continue;
+
+            $principal = array(
+                'uri' => $row['uri'],
+            );
+            foreach($this->fieldMap as $key=>$value) {
+                if ($row[$value['dbField']]) {
+                    $principal[$key] = $row[$value['dbField']];
+                }
+            }
+            $principals[] = $principal;
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+
+        $fields = array(
+            'id',
+            'uri',
+        );
+
+        foreach($this->fieldMap as $key=>$value) {
+            $fields[] = $value['dbField'];
+        }
+        $stmt = $this->pdo->prepare('SELECT '.implode(',', $fields).'  FROM '. $this->tableName . ' WHERE uri = ?');
+        $stmt->execute(array($path));
+
+        $row = $stmt->fetch(PDO::FETCH_ASSOC);
+        if (!$row) return;
+
+        $principal = array(
+            'id'  => $row['id'],
+            'uri' => $row['uri'],
+        );
+        foreach($this->fieldMap as $key=>$value) {
+            if ($row[$value['dbField']]) {
+                $principal[$key] = $row[$value['dbField']];
+            }
+        }
+        return $principal;
+
+    }
+
+    /**
+     * Updates one ore more webdav properties on a principal.
+     *
+     * The list of mutations is supplied as an array. Each key in the array is
+     * a propertyname, such as {DAV:}displayname.
+     *
+     * Each value is the actual value to be updated. If a value is null, it
+     * must be deleted.
+     *
+     * This method should be atomic. It must either completely succeed, or
+     * completely fail. Success and failure can simply be returned as 'true' or
+     * 'false'.
+     *
+     * It is also possible to return detailed failure information. In that case
+     * an array such as this should be returned:
+     *
+     * array(
+     *   200 => array(
+     *      '{DAV:}prop1' => null,
+     *   ),
+     *   201 => array(
+     *      '{DAV:}prop2' => null,
+     *   ),
+     *   403 => array(
+     *      '{DAV:}prop3' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}prop4' => null,
+     *   ),
+     * );
+     *
+     * In this previous example prop1 was successfully updated or deleted, and
+     * prop2 was succesfully created.
+     *
+     * prop3 failed to update due to '403 Forbidden' and because of this prop4
+     * also could not be updated with '424 Failed dependency'.
+     *
+     * This last example was actually incorrect. While 200 and 201 could appear
+     * in 1 response, if there's any error (403) the other properties should
+     * always fail with 423 (failed dependency).
+     *
+     * But anyway, if you don't want to scratch your head over this, just
+     * return true or false.
+     *
+     * @param string $path
+     * @param array $mutations
+     * @return array|bool
+     */
+    public function updatePrincipal($path, $mutations) {
+
+        $updateAble = array();
+        foreach($mutations as $key=>$value) {
+
+            // We are not aware of this field, we must fail.
+            if (!isset($this->fieldMap[$key])) {
+
+                $response = array(
+                    403 => array(
+                        $key => null,
+                    ),
+                    424 => array(),
+                );
+
+                // Adding the rest to the response as a 424
+                foreach($mutations as $subKey=>$subValue) {
+                    if ($subKey !== $key) {
+                        $response[424][$subKey] = null;
+                    }
+                }
+                return $response;
+            }
+
+            $updateAble[$this->fieldMap[$key]['dbField']] = $value;
+
+        }
+
+        // No fields to update
+        $query = "UPDATE " . $this->tableName . " SET ";
+
+        $first = true;
+        foreach($updateAble as $key => $value) {
+            if (!$first) {
+                $query.= ', ';
+            }
+            $first = false;
+            $query.= "$key = :$key ";
+        }
+        $query.='WHERE uri = :uri';
+        $stmt = $this->pdo->prepare($query);
+        $updateAble['uri'] =  $path;
+        $stmt->execute($updateAble);
+
+        return true;
+
+    }
+
+    /**
+     * This method is used to search for principals matching a set of
+     * properties.
+     *
+     * This search is specifically used by RFC3744's principal-property-search
+     * REPORT. You should at least allow searching on
+     * http://sabredav.org/ns}email-address.
+     *
+     * The actual search should be a unicode-non-case-sensitive search. The
+     * keys in searchProperties are the WebDAV property names, while the values
+     * are the property values to search on.
+     *
+     * If multiple properties are being searched on, the search should be
+     * AND'ed.
+     *
+     * This method should simply return an array with full principal uri's.
+     *
+     * If somebody attempted to search on a property the backend does not
+     * support, you should simply return 0 results.
+     *
+     * You can also just return 0 results if you choose to not support
+     * searching at all, but keep in mind that this may stop certain features
+     * from working.
+     *
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @return array
+     */
+    public function searchPrincipals($prefixPath, array $searchProperties) {
+
+        $query = 'SELECT uri FROM ' . $this->tableName . ' WHERE 1=1 ';
+        $values = array();
+        foreach($searchProperties as $property => $value) {
+
+            switch($property) {
+
+                case '{DAV:}displayname' :
+                    $query.=' AND displayname LIKE ?';
+                    $values[] = '%' . $value . '%';
+                    break;
+                case '{http://sabredav.org/ns}email-address' :
+                    $query.=' AND email LIKE ?';
+                    $values[] = '%' . $value . '%';
+                    break;
+                default :
+                    // Unsupported property
+                    return array();
+
+            }
+
+        }
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($values);
+
+        $principals = array();
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+            // Checking if the principal is in the prefix
+            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
+            if ($rowPrefix !== $prefixPath) continue;
+
+            $principals[] = $row['uri'];
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return array
+     */
+    public function getGroupMemberSet($principal) {
+
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
+        $stmt->execute(array($principal['id']));
+
+        $result = array();
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $row['uri'];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     */
+    public function getGroupMembership($principal) {
+
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
+        $stmt->execute(array($principal['id']));
+
+        $result = array();
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $row['uri'];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param array $members
+     * @return void
+     */
+    public function setGroupMemberSet($principal, array $members) {
+
+        // Grabbing the list of principal id's.
+        $stmt = $this->pdo->prepare('SELECT id, uri FROM '.$this->tableName.' WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
+        $stmt->execute(array_merge(array($principal), $members));
+
+        $memberIds = array();
+        $principalId = null;
+
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            if ($row['uri'] == $principal) {
+                $principalId = $row['id'];
+            } else {
+                $memberIds[] = $row['id'];
+            }
+        }
+        if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
+
+        // Wiping out old members
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->groupMembersTableName.' WHERE principal_id = ?;');
+        $stmt->execute(array($principalId));
+
+        foreach($memberIds as $memberId) {
+
+            $stmt = $this->pdo->prepare('INSERT INTO '.$this->groupMembersTableName.' (principal_id, member_id) VALUES (?, ?);');
+            $stmt->execute(array($principalId, $memberId));
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalCollection.php b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
new file mode 100755
index 0000000000..c3e4cb83f2
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This collection represents a list of users. It uses
+ * Sabre_DAV_Auth_Backend to determine which users are available on the list.
+ *
+ * The users are instances of Sabre_DAV_Auth_Principal
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return Sabre_DAV_INode
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_DAVACL_Principal($this->principalBackend, $principal);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/Acl.php b/3rdparty/Sabre/DAVACL/Property/Acl.php
new file mode 100755
index 0000000000..05e1a690b3
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/Acl.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * This class represents the {DAV:}acl property
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
+
+    /**
+     * List of privileges
+     *
+     * @var array
+     */
+    private $privileges;
+
+    /**
+     * Whether or not the server base url is required to be prefixed when
+     * serializing the property.
+     *
+     * @var boolean
+     */
+    private $prefixBaseUrl;
+
+    /**
+     * Constructor
+     *
+     * This object requires a structure similar to the return value from
+     * Sabre_DAVACL_Plugin::getACL().
+     *
+     * Each privilege is a an array with at least a 'privilege' property, and a
+     * 'principal' property. A privilege may have a 'protected' property as
+     * well.
+     *
+     * The prefixBaseUrl should be set to false, if the supplied principal urls
+     * are already full urls. If this is kept to true, the servers base url
+     * will automatically be prefixed.
+     *
+     * @param bool $prefixBaseUrl
+     * @param array $privileges
+     */
+    public function __construct(array $privileges, $prefixBaseUrl = true) {
+
+        $this->privileges = $privileges;
+        $this->prefixBaseUrl = $prefixBaseUrl;
+
+    }
+
+    /**
+     * Returns the list of privileges for this property
+     *
+     * @return array
+     */
+    public function getPrivileges() {
+
+        return $this->privileges;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        foreach($this->privileges as $ace) {
+
+            $this->serializeAce($doc, $node, $ace, $server);
+
+        }
+
+    }
+
+    /**
+     * Unserializes the {DAV:}acl xml element.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAVACL_Property_Acl
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $privileges = array();
+        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
+        for($ii=0; $ii < $xaces->length; $ii++) {
+
+            $xace = $xaces->item($ii);
+            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
+            if ($principal->length !== 1) {
+                throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
+            }
+            $principal = Sabre_DAVACL_Property_Principal::unserialize($principal->item(0));
+
+            switch($principal->getType()) {
+                case Sabre_DAVACL_Property_Principal::HREF :
+                    $principal = $principal->getHref();
+                    break;
+                case Sabre_DAVACL_Property_Principal::AUTHENTICATED :
+                    $principal = '{DAV:}authenticated';
+                    break;
+                case Sabre_DAVACL_Property_Principal::UNAUTHENTICATED :
+                    $principal = '{DAV:}unauthenticated';
+                    break;
+                case Sabre_DAVACL_Property_Principal::ALL :
+                    $principal = '{DAV:}all';
+                    break;
+
+            }
+
+            $protected = false;
+
+            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
+                $protected = true;
+            }
+
+            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
+            if ($grants->length < 1) {
+                throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
+            }
+            $grant = $grants->item(0);
+
+            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
+            for($jj=0; $jj<$xprivs->length; $jj++) {
+
+                $xpriv = $xprivs->item($jj);
+
+                $privilegeName = null;
+
+                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
+
+                    $childNode = $xpriv->childNodes->item($kk);
+                    if ($t = Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+                        $privilegeName = $t;
+                        break;
+                    }
+                }
+                if (is_null($privilegeName)) {
+                    throw new Sabre_DAV_Exception_BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
+                }
+
+                $privileges[] = array(
+                    'principal' => $principal,
+                    'protected' => $protected,
+                    'privilege' => $privilegeName,
+                );
+
+            }
+
+        }
+
+        return new self($privileges);
+
+    }
+
+    /**
+     * Serializes a single access control entry.
+     *
+     * @param DOMDocument $doc
+     * @param DOMElement $node
+     * @param array $ace
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    private function serializeAce($doc,$node,$ace, $server) {
+
+        $xace  = $doc->createElementNS('DAV:','d:ace');
+        $node->appendChild($xace);
+
+        $principal = $doc->createElementNS('DAV:','d:principal');
+        $xace->appendChild($principal);
+        switch($ace['principal']) {
+            case '{DAV:}authenticated' :
+                $principal->appendChild($doc->createElementNS('DAV:','d:authenticated'));
+                break;
+            case '{DAV:}unauthenticated' :
+                $principal->appendChild($doc->createElementNS('DAV:','d:unauthenticated'));
+                break;
+            case '{DAV:}all' :
+                $principal->appendChild($doc->createElementNS('DAV:','d:all'));
+                break;
+            default:
+                $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
+        }
+
+        $grant = $doc->createElementNS('DAV:','d:grant');
+        $xace->appendChild($grant);
+
+        $privParts = null;
+
+        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
+
+        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
+        $grant->appendChild($xprivilege);
+
+        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+        if (isset($ace['protected']) && $ace['protected'])
+            $xace->appendChild($doc->createElement('d:protected'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php b/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
new file mode 100755
index 0000000000..a8b054956d
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * AclRestrictions property
+ *
+ * This property represents {DAV:}acl-restrictions, as defined in RFC3744.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_AclRestrictions extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property into a DOMElement
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $elem
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $elem) {
+
+        $doc = $elem->ownerDocument;
+
+        $elem->appendChild($doc->createElementNS('DAV:','d:grant-only'));
+        $elem->appendChild($doc->createElementNS('DAV:','d:no-invert'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
new file mode 100755
index 0000000000..94a2964061
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * CurrentUserPrivilegeSet
+ *
+ * This class represents the current-user-privilege-set property. When
+ * requested, it contain all the privileges a user has on a specific node.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
+
+    /**
+     * List of privileges
+     *
+     * @var array
+     */
+    private $privileges;
+
+    /**
+     * Creates the object
+     *
+     * Pass the privileges in clark-notation
+     *
+     * @param array $privileges
+     */
+    public function __construct(array $privileges) {
+
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Serializes the property in the DOM
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        foreach($this->privileges as $privName) {
+
+            $this->serializePriv($doc,$node,$privName);
+
+        }
+
+    }
+
+    /**
+     * Serializes one privilege
+     *
+     * @param DOMDocument $doc
+     * @param DOMElement $node
+     * @param string $privName
+     * @return void
+     */
+    protected function serializePriv($doc,$node,$privName) {
+
+        $xp  = $doc->createElementNS('DAV:','d:privilege');
+        $node->appendChild($xp);
+
+        $privParts = null;
+        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
+
+        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/Principal.php b/3rdparty/Sabre/DAVACL/Property/Principal.php
new file mode 100755
index 0000000000..c36328a58e
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/Principal.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * Principal property
+ *
+ * The principal property represents a principal from RFC3744 (ACL).
+ * The property can be used to specify a principal or pseudo principals.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
+     */
+    const UNAUTHENTICATED = 1;
+
+    /**
+     * To specify any principal that is logged in, use AUTHENTICATED
+     */
+    const AUTHENTICATED = 2;
+
+    /**
+     * Specific principals can be specified with the HREF
+     */
+    const HREF = 3;
+
+    /**
+     * Everybody, basically
+     */
+    const ALL = 4;
+
+    /**
+     * Principal-type
+     *
+     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
+     *
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Url to principal
+     *
+     * This value is only used for the HREF principal type.
+     *
+     * @var string
+     */
+    private $href;
+
+    /**
+     * Creates the property.
+     *
+     * The 'type' argument must be one of the type constants defined in this class.
+     *
+     * 'href' is only required for the HREF type.
+     *
+     * @param int $type
+     * @param string|null $href
+     */
+    public function __construct($type, $href = null) {
+
+        $this->type = $type;
+
+        if ($type===self::HREF && is_null($href)) {
+            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
+        }
+        $this->href = $href;
+
+    }
+
+    /**
+     * Returns the principal type
+     *
+     * @return int
+     */
+    public function getType() {
+
+        return $this->type;
+
+    }
+
+    /**
+     * Returns the principal uri.
+     *
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+        switch($this->type) {
+
+            case self::UNAUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
+                );
+                break;
+            case self::AUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':authenticated')
+                );
+                break;
+            case self::HREF :
+                $href = $node->ownerDocument->createElement($prefix . ':href');
+                $href->nodeValue = $server->getBaseUri() . $this->href;
+                $node->appendChild($href);
+                break;
+
+        }
+
+    }
+
+    /**
+     * Deserializes a DOM element into a property object.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_Principal
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $parent = $dom->firstChild;
+        while(!Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
+            $parent = $parent->nextSibling;
+        }
+
+        switch(Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
+
+            case '{DAV:}unauthenticated' :
+                return new self(self::UNAUTHENTICATED);
+            case '{DAV:}authenticated' :
+                return new self(self::AUTHENTICATED);
+            case '{DAV:}href':
+                return new self(self::HREF, $parent->textContent);
+            case '{DAV:}all':
+                return new self(self::ALL);
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Unexpected element (' . Sabre_DAV_XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
new file mode 100755
index 0000000000..276d57ae09
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * SupportedPrivilegeSet property
+ *
+ * This property encodes the {DAV:}supported-privilege-set property, as defined
+ * in rfc3744. Please consult the rfc for details about it's structure.
+ *
+ * This class expects a structure like the one given from
+ * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its
+ * constructor.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
+
+    /**
+     * privileges
+     *
+     * @var array
+     */
+    private $privileges;
+
+    /**
+     * Constructor
+     *
+     * @param array $privileges
+     */
+    public function __construct(array $privileges) {
+
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Serializes the property into a domdocument.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        $this->serializePriv($doc, $node, $this->privileges);
+
+    }
+
+    /**
+     * Serializes a property
+     *
+     * This is a recursive function.
+     *
+     * @param DOMDocument $doc
+     * @param DOMElement $node
+     * @param array $privilege
+     * @return void
+     */
+    private function serializePriv($doc,$node,$privilege) {
+
+        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
+        $node->appendChild($xsp);
+
+        $xp  = $doc->createElementNS('DAV:','d:privilege');
+        $xsp->appendChild($xp);
+
+        $privParts = null;
+        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
+
+        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+        if (isset($privilege['abstract']) && $privilege['abstract']) {
+            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
+        }
+
+        if (isset($privilege['description'])) {
+            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
+        }
+
+        if (isset($privilege['aggregates'])) {
+            foreach($privilege['aggregates'] as $subPrivilege) {
+                $this->serializePriv($doc,$xsp,$subPrivilege);
+            }
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php
new file mode 100755
index 0000000000..9950f74874
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.0';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/DAVACL/includes.php b/3rdparty/Sabre/DAVACL/includes.php
new file mode 100755
index 0000000000..28fa3eed22
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/includes.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Sabre_DAVACL includes file
+ *
+ * Including this file will automatically include all files from the
+ * Sabre_DAVACL package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/AbstractPrincipalCollection.php';
+include __DIR__ . '/Exception/AceConflict.php';
+include __DIR__ . '/Exception/NeedPrivileges.php';
+include __DIR__ . '/Exception/NoAbstract.php';
+include __DIR__ . '/Exception/NotRecognizedPrincipal.php';
+include __DIR__ . '/Exception/NotSupportedPrivilege.php';
+include __DIR__ . '/IACL.php';
+include __DIR__ . '/IPrincipal.php';
+include __DIR__ . '/IPrincipalBackend.php';
+include __DIR__ . '/Plugin.php';
+include __DIR__ . '/Principal.php';
+include __DIR__ . '/PrincipalBackend/PDO.php';
+include __DIR__ . '/PrincipalCollection.php';
+include __DIR__ . '/Property/Acl.php';
+include __DIR__ . '/Property/AclRestrictions.php';
+include __DIR__ . '/Property/CurrentUserPrivilegeSet.php';
+include __DIR__ . '/Property/Principal.php';
+include __DIR__ . '/Property/SupportedPrivilegeSet.php';
+include __DIR__ . '/Version.php';
+// End includes
diff --git a/3rdparty/Sabre/HTTP/AWSAuth.php b/3rdparty/Sabre/HTTP/AWSAuth.php
new file mode 100755
index 0000000000..fb8245c8cb
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/AWSAuth.php
@@ -0,0 +1,227 @@
+<?php
+
+/**
+ * HTTP AWS Authentication handler
+ *
+ * Use this class to leverage amazon's AWS authentication header
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The signature supplied by the HTTP client
+     *
+     * @var string
+     */
+    private $signature = null;
+
+    /**
+     * The accesskey supplied by the HTTP client
+     *
+     * @var string
+     */
+    private $accessKey = null;
+
+    /**
+     * An error code, if any
+     *
+     * This value will be filled with one of the ERR_* constants
+     *
+     * @var int
+     */
+    public $errorCode = 0;
+
+    const ERR_NOAWSHEADER = 1;
+    const ERR_MD5CHECKSUMWRONG = 2;
+    const ERR_INVALIDDATEFORMAT = 3;
+    const ERR_REQUESTTIMESKEWED = 4;
+    const ERR_INVALIDSIGNATURE = 5;
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     *
+     * @return bool
+     */
+    public function init() {
+
+        $authHeader = $this->httpRequest->getHeader('Authorization');
+        $authHeader = explode(' ',$authHeader);
+
+        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
+            $this->errorCode = self::ERR_NOAWSHEADER;
+             return false;
+        }
+
+        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
+
+        return true;
+
+    }
+
+    /**
+     * Returns the username for the request
+     *
+     * @return string
+     */
+    public function getAccessKey() {
+
+        return $this->accessKey;
+
+    }
+
+    /**
+     * Validates the signature based on the secretKey
+     *
+     * @param string $secretKey
+     * @return bool
+     */
+    public function validate($secretKey) {
+
+        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
+
+        if ($contentMD5) {
+            // We need to validate the integrity of the request
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+
+            if ($contentMD5!=base64_encode(md5($body,true))) {
+                // content-md5 header did not match md5 signature of body
+                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+                return false;
+            }
+
+        }
+
+        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date'))
+            $requestDate = $this->httpRequest->getHeader('Date');
+
+        if (!$this->validateRFC2616Date($requestDate))
+            return false;
+
+        $amzHeaders = $this->getAmzHeaders();
+
+        $signature = base64_encode(
+            $this->hmacsha1($secretKey,
+                $this->httpRequest->getMethod() . "\n" .
+                $contentMD5 . "\n" .
+                $this->httpRequest->getHeader('Content-type') . "\n" .
+                $requestDate . "\n" .
+                $amzHeaders .
+                $this->httpRequest->getURI()
+            )
+        );
+
+        if ($this->signature != $signature) {
+
+            $this->errorCode = self::ERR_INVALIDSIGNATURE;
+            return false;
+
+        }
+
+        return true;
+
+    }
+
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+    /**
+     * Makes sure the supplied value is a valid RFC2616 date.
+     *
+     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
+     * user just supplied the word 'now' for the date header.
+     *
+     * This function also makes sure the Date header is within 15 minutes of the operating
+     * system date, to prevent replay attacks.
+     *
+     * @param string $dateHeader
+     * @return bool
+     */
+    protected function validateRFC2616Date($dateHeader) {
+
+        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
+
+        // Unknown format
+        if (!$date) {
+            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
+            return false;
+        }
+
+        $min = new DateTime('-15 minutes');
+        $max = new DateTime('+15 minutes');
+
+        // We allow 15 minutes around the current date/time
+        if ($date > $max || $date < $min) {
+            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
+            return false;
+        }
+
+        return $date;
+
+    }
+
+    /**
+     * Returns a list of AMZ headers
+     *
+     * @return string
+     */
+    protected function getAmzHeaders() {
+
+        $amzHeaders = array();
+        $headers = $this->httpRequest->getHeaders();
+        foreach($headers as $headerName => $headerValue) {
+            if (strpos(strtolower($headerName),'x-amz-')===0) {
+                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
+            }
+        }
+        ksort($amzHeaders);
+
+        $headerStr = '';
+        foreach($amzHeaders as $h=>$v) {
+            $headerStr.=$h.':'.$v;
+        }
+
+        return $headerStr;
+
+    }
+
+    /**
+     * Generates an HMAC-SHA1 signature
+     *
+     * @param string $key
+     * @param string $message
+     * @return string
+     */
+    private function hmacsha1($key, $message) {
+
+        $blocksize=64;
+        if (strlen($key)>$blocksize)
+            $key=pack('H*', sha1($key));
+        $key=str_pad($key,$blocksize,chr(0x00));
+        $ipad=str_repeat(chr(0x36),$blocksize);
+        $opad=str_repeat(chr(0x5c),$blocksize);
+        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
+        return $hmac;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/AbstractAuth.php b/3rdparty/Sabre/HTTP/AbstractAuth.php
new file mode 100755
index 0000000000..3bccabcd1c
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/AbstractAuth.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * HTTP Authentication baseclass
+ *
+ * This class has the common functionality for BasicAuth and DigestAuth
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The realm will be displayed in the dialog boxes
+     *
+     * This identifier can be changed through setRealm()
+     *
+     * @var string
+     */
+    protected $realm = 'SabreDAV';
+
+    /**
+     * HTTP response helper
+     *
+     * @var Sabre_HTTP_Response
+     */
+    protected $httpResponse;
+
+
+    /**
+     * HTTP request helper
+     *
+     * @var Sabre_HTTP_Request
+     */
+    protected $httpRequest;
+
+    /**
+     * __construct
+     *
+     */
+    public function __construct() {
+
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Sets an alternative HTTP response object
+     *
+     * @param Sabre_HTTP_Response $response
+     * @return void
+     */
+    public function setHTTPResponse(Sabre_HTTP_Response $response) {
+
+        $this->httpResponse = $response;
+
+    }
+
+    /**
+     * Sets an alternative HTTP request object
+     *
+     * @param Sabre_HTTP_Request $request
+     * @return void
+     */
+    public function setHTTPRequest(Sabre_HTTP_Request $request) {
+
+        $this->httpRequest = $request;
+
+    }
+
+
+    /**
+     * Sets the realm
+     *
+     * The realm is often displayed in authentication dialog boxes
+     * Commonly an application name displayed here
+     *
+     * @param string $realm
+     * @return void
+     */
+    public function setRealm($realm) {
+
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Returns the realm
+     *
+     * @return string
+     */
+    public function getRealm() {
+
+        return $this->realm;
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    abstract public function requireLogin();
+
+}
diff --git a/3rdparty/Sabre/HTTP/BasicAuth.php b/3rdparty/Sabre/HTTP/BasicAuth.php
new file mode 100755
index 0000000000..a747cc6a31
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/BasicAuth.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * HTTP Basic Authentication handler
+ *
+ * Use this class for easy http authentication setup
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * Returns the supplied username and password.
+     *
+     * The returned array has two values:
+     *   * 0 - username
+     *   * 1 - password
+     *
+     * If nothing was supplied, 'false' will be returned
+     *
+     * @return mixed
+     */
+    public function getUserPass() {
+
+        // Apache and mod_php
+        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
+
+            return array($user,$pass);
+
+        }
+
+        // Most other webservers
+        $auth = $this->httpRequest->getHeader('Authorization');
+
+        // Apache could prefix environment variables with REDIRECT_ when urls
+        // are passed through mod_rewrite
+        if (!$auth) {
+            $auth = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
+        }
+
+        if (!$auth) return false;
+
+        if (strpos(strtolower($auth),'basic')!==0) return false;
+
+        return explode(':', base64_decode(substr($auth, 6)));
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/DigestAuth.php b/3rdparty/Sabre/HTTP/DigestAuth.php
new file mode 100755
index 0000000000..ee7f05c08e
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/DigestAuth.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * HTTP Digest Authentication handler
+ *
+ * Use this class for easy http digest authentication.
+ * Instructions:
+ *
+ *  1. Create the object
+ *  2. Call the setRealm() method with the realm you plan to use
+ *  3. Call the init method function.
+ *  4. Call the getUserName() function. This function may return false if no
+ *     authentication information was supplied. Based on the username you
+ *     should check your internal database for either the associated password,
+ *     or the so-called A1 hash of the digest.
+ *  5. Call either validatePassword() or validateA1(). This will return true
+ *     or false.
+ *  6. To make sure an authentication prompt is displayed, call the
+ *     requireLogin() method.
+ *
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * These constants are used in setQOP();
+     */
+    const QOP_AUTH = 1;
+    const QOP_AUTHINT = 2;
+
+    protected $nonce;
+    protected $opaque;
+    protected $digestParts;
+    protected $A1;
+    protected $qop = self::QOP_AUTH;
+
+    /**
+     * Initializes the object
+     */
+    public function __construct() {
+
+        $this->nonce = uniqid();
+        $this->opaque = md5($this->realm);
+        parent::__construct();
+
+    }
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     *
+     * @return void
+     */
+    public function init() {
+
+        $digest = $this->getDigest();
+        $this->digestParts = $this->parseDigest($digest);
+
+    }
+
+    /**
+     * Sets the quality of protection value.
+     *
+     * Possible values are:
+     *   Sabre_HTTP_DigestAuth::QOP_AUTH
+     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
+     *
+     * Multiple values can be specified using logical OR.
+     *
+     * QOP_AUTHINT ensures integrity of the request body, but this is not
+     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
+     * request body to be md5'ed, which can put strains on CPU and memory.
+     *
+     * @param int $qop
+     * @return void
+     */
+    public function setQOP($qop) {
+
+        $this->qop = $qop;
+
+    }
+
+    /**
+     * Validates the user.
+     *
+     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+     *
+     * @param string $A1
+     * @return bool
+     */
+    public function validateA1($A1) {
+
+        $this->A1 = $A1;
+        return $this->validate();
+
+    }
+
+    /**
+     * Validates authentication through a password. The actual password must be provided here.
+     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+     *
+     * @param string $password
+     * @return bool
+     */
+    public function validatePassword($password) {
+
+        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+        return $this->validate();
+
+    }
+
+    /**
+     * Returns the username for the request
+     *
+     * @return string
+     */
+    public function getUsername() {
+
+        return $this->digestParts['username'];
+
+    }
+
+    /**
+     * Validates the digest challenge
+     *
+     * @return bool
+     */
+    protected function validate() {
+
+        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
+
+        if ($this->digestParts['qop']=='auth-int') {
+            // Making sure we support this qop value
+            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            // We need to add an md5 of the entire request body to the A2 part of the hash
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+            $A2 .= ':' . md5($body);
+        } else {
+
+            // We need to make sure we support this qop value
+            if (!($this->qop & self::QOP_AUTH)) return false;
+        }
+
+        $A2 = md5($A2);
+
+        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
+
+        return $this->digestParts['response']==$validResponse;
+
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $qop = '';
+        switch($this->qop) {
+            case self::QOP_AUTH    : $qop = 'auth'; break;
+            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
+            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
+        }
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+
+    /**
+     * This method returns the full digest string.
+     *
+     * It should be compatibile with mod_php format and other webservers.
+     *
+     * If the header could not be found, null will be returned
+     *
+     * @return mixed
+     */
+    public function getDigest() {
+
+        // mod_php
+        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
+        if ($digest) return $digest;
+
+        // most other servers
+        $digest = $this->httpRequest->getHeader('Authorization');
+
+        // Apache could prefix environment variables with REDIRECT_ when urls
+        // are passed through mod_rewrite
+        if (!$digest) {
+            $digest = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
+        }
+
+        if ($digest && strpos(strtolower($digest),'digest')===0) {
+            return substr($digest,7);
+        } else {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * Parses the different pieces of the digest string into an array.
+     *
+     * This method returns false if an incomplete digest was supplied
+     *
+     * @param string $digest
+     * @return mixed
+     */
+    protected function parseDigest($digest) {
+
+        // protect against missing data
+        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+        $data = array();
+
+        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $m) {
+            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
+            unset($needed_parts[$m[1]]);
+        }
+
+        return $needed_parts ? false : $data;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Request.php b/3rdparty/Sabre/HTTP/Request.php
new file mode 100755
index 0000000000..4746ef7770
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Request.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * HTTP Request information
+ *
+ * This object can be used to easily access information about an HTTP request.
+ * It can additionally be used to create 'mock' requests.
+ *
+ * This class mostly operates independent, but because of the nature of a single
+ * request per run it can operate as a singleton. For more information check out
+ * the behaviour around 'defaultInputStream'.
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Request {
+
+    /**
+     * PHP's $_SERVER data
+     *
+     * @var array
+     */
+    protected $_SERVER;
+
+    /**
+     * PHP's $_POST data
+     *
+     * @var array
+     */
+    protected $_POST;
+
+    /**
+     * The request body, if any.
+     *
+     * This is stored in the form of a stream resource.
+     *
+     * @var resource
+     */
+    protected $body = null;
+
+    /**
+     * This will be set as the 'default' inputStream for a specific HTTP request
+     * We sometimes need to retain, or rebuild this if we need multiple runs
+     * of parsing the original HTTP request.
+     *
+     * @var resource
+     */
+    static $defaultInputStream=null;
+
+    /**
+     * Sets up the object
+     *
+     * The serverData and postData array can be used to override usage of PHP's
+     * global _SERVER and _POST variable respectively.
+     *
+     * @param array $serverData
+     * @param array $postData
+     */
+    public function __construct(array $serverData = null, array $postData = null) {
+
+       if ($serverData) $this->_SERVER = $serverData;
+       else $this->_SERVER =& $_SERVER;
+
+       if ($postData) $this->_POST = $postData;
+       else $this->_POST =& $_POST;
+
+    }
+
+    /**
+     * Returns the value for a specific http header.
+     *
+     * This method returns null if the header did not exist.
+     *
+     * @param string $name
+     * @return string
+     */
+    public function getHeader($name) {
+
+        $name = strtoupper(str_replace(array('-'),array('_'),$name));
+        if (isset($this->_SERVER['HTTP_' . $name])) {
+            return $this->_SERVER['HTTP_' . $name];
+        }
+
+        // There's a few headers that seem to end up in the top-level
+        // server array.
+        switch($name) {
+            case 'CONTENT_TYPE' :
+            case 'CONTENT_LENGTH' :
+                if (isset($this->_SERVER[$name])) {
+                    return $this->_SERVER[$name];
+                }
+                break;
+
+        }
+        return;
+
+    }
+
+    /**
+     * Returns all (known) HTTP headers.
+     *
+     * All headers are converted to lower-case, and additionally all underscores
+     * are automatically converted to dashes
+     *
+     * @return array
+     */
+    public function getHeaders() {
+
+        $hdrs = array();
+        foreach($this->_SERVER as $key=>$value) {
+
+            switch($key) {
+                case 'CONTENT_LENGTH' :
+                case 'CONTENT_TYPE' :
+                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
+                    break;
+                default :
+                    if (strpos($key,'HTTP_')===0) {
+                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
+                    }
+                    break;
+            }
+
+        }
+
+        return $hdrs;
+
+    }
+
+    /**
+     * Returns the HTTP request method
+     *
+     * This is for example POST or GET
+     *
+     * @return string
+     */
+    public function getMethod() {
+
+        return $this->_SERVER['REQUEST_METHOD'];
+
+    }
+
+    /**
+     * Returns the requested uri
+     *
+     * @return string
+     */
+    public function getUri() {
+
+        return $this->_SERVER['REQUEST_URI'];
+
+    }
+
+    /**
+     * Will return protocol + the hostname + the uri
+     *
+     * @return string
+     */
+    public function getAbsoluteUri() {
+
+        // Checking if the request was made through HTTPS. The last in line is for IIS
+        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
+        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
+
+    }
+
+    /**
+     * Returns everything after the ? from the current url
+     *
+     * @return string
+     */
+    public function getQueryString() {
+
+        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
+
+    }
+
+    /**
+     * Returns the HTTP request body body
+     *
+     * This method returns a readable stream resource.
+     * If the asString parameter is set to true, a string is sent instead.
+     *
+     * @param bool asString
+     * @return resource
+     */
+    public function getBody($asString = false) {
+
+        if (is_null($this->body)) {
+            if (!is_null(self::$defaultInputStream)) {
+                $this->body = self::$defaultInputStream;
+            } else {
+                $this->body = fopen('php://input','r');
+                self::$defaultInputStream = $this->body;
+            }
+        }
+        if ($asString) {
+            $body = stream_get_contents($this->body);
+            return $body;
+        } else {
+            return $this->body;
+        }
+
+    }
+
+    /**
+     * Sets the contents of the HTTP request body
+     *
+     * This method can either accept a string, or a readable stream resource.
+     *
+     * If the setAsDefaultInputStream is set to true, it means for this run of the
+     * script the supplied body will be used instead of php://input.
+     *
+     * @param mixed $body
+     * @param bool $setAsDefaultInputStream
+     * @return void
+     */
+    public function setBody($body,$setAsDefaultInputStream = false) {
+
+        if(is_resource($body)) {
+            $this->body = $body;
+        } else {
+
+            $stream = fopen('php://temp','r+');
+            fputs($stream,$body);
+            rewind($stream);
+            // String is assumed
+            $this->body = $stream;
+        }
+        if ($setAsDefaultInputStream) {
+            self::$defaultInputStream = $this->body;
+        }
+
+    }
+
+    /**
+     * Returns PHP's _POST variable.
+     *
+     * The reason this is in a method is so it can be subclassed and
+     * overridden.
+     *
+     * @return array
+     */
+    public function getPostVars() {
+
+        return $this->_POST;
+
+    }
+
+    /**
+     * Returns a specific item from the _SERVER array.
+     *
+     * Do not rely on this feature, it is for internal use only.
+     *
+     * @param string $field
+     * @return string
+     */
+    public function getRawServerValue($field) {
+
+        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/HTTP/Response.php b/3rdparty/Sabre/HTTP/Response.php
new file mode 100755
index 0000000000..ffe9bda208
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Response.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Sabre_HTTP_Response
+ *
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Response {
+
+    /**
+     * Returns a full HTTP status message for an HTTP status code
+     *
+     * @param int $code
+     * @return string
+     */
+    public function getStatusMessage($code) {
+
+        $msg = array(
+            100 => 'Continue',
+            101 => 'Switching Protocols',
+            102 => 'Processing',
+            200 => 'OK',
+            201 => 'Created',
+            202 => 'Accepted',
+            203 => 'Non-Authorative Information',
+            204 => 'No Content',
+            205 => 'Reset Content',
+            206 => 'Partial Content',
+            207 => 'Multi-Status', // RFC 4918
+            208 => 'Already Reported', // RFC 5842
+            226 => 'IM Used', // RFC 3229
+            300 => 'Multiple Choices',
+            301 => 'Moved Permanently',
+            302 => 'Found',
+            303 => 'See Other',
+            304 => 'Not Modified',
+            305 => 'Use Proxy',
+            306 => 'Reserved',
+            307 => 'Temporary Redirect',
+            400 => 'Bad request',
+            401 => 'Unauthorized',
+            402 => 'Payment Required',
+            403 => 'Forbidden',
+            404 => 'Not Found',
+            405 => 'Method Not Allowed',
+            406 => 'Not Acceptable',
+            407 => 'Proxy Authentication Required',
+            408 => 'Request Timeout',
+            409 => 'Conflict',
+            410 => 'Gone',
+            411 => 'Length Required',
+            412 => 'Precondition failed',
+            413 => 'Request Entity Too Large',
+            414 => 'Request-URI Too Long',
+            415 => 'Unsupported Media Type',
+            416 => 'Requested Range Not Satisfiable',
+            417 => 'Expectation Failed',
+            418 => 'I\'m a teapot', // RFC 2324
+            422 => 'Unprocessable Entity', // RFC 4918
+            423 => 'Locked', // RFC 4918
+            424 => 'Failed Dependency', // RFC 4918
+            426 => 'Upgrade required',
+            428 => 'Precondition required', // draft-nottingham-http-new-status
+            429 => 'Too Many Requests', // draft-nottingham-http-new-status
+            431 => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            500 => 'Internal Server Error',
+            501 => 'Not Implemented',
+            502 => 'Bad Gateway',
+            503 => 'Service Unavailable',
+            504 => 'Gateway Timeout',
+            505 => 'HTTP Version not supported',
+            506 => 'Variant Also Negotiates',
+            507 => 'Insufficient Storage', // RFC 4918
+            508 => 'Loop Detected', // RFC 5842
+            509 => 'Bandwidth Limit Exceeded', // non-standard
+            510 => 'Not extended',
+            511 => 'Network Authentication Required', // draft-nottingham-http-new-status
+       );
+
+       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
+
+    }
+
+    /**
+     * Sends an HTTP status header to the client
+     *
+     * @param int $code HTTP status code
+     * @return bool
+     */
+    public function sendStatus($code) {
+
+        if (!headers_sent())
+            return header($this->getStatusMessage($code));
+        else return false;
+
+    }
+
+    /**
+     * Sets an HTTP header for the response
+     *
+     * @param string $name
+     * @param string $value
+     * @param bool $replace
+     * @return bool
+     */
+    public function setHeader($name, $value, $replace = true) {
+
+        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
+        if (!headers_sent())
+            return header($name . ': ' . $value, $replace);
+        else return false;
+
+    }
+
+    /**
+     * Sets a bunch of HTTP Headers
+     *
+     * headersnames are specified as keys, value in the array value
+     *
+     * @param array $headers
+     * @return void
+     */
+    public function setHeaders(array $headers) {
+
+        foreach($headers as $key=>$value)
+            $this->setHeader($key, $value);
+
+    }
+
+    /**
+     * Sends the entire response body
+     *
+     * This method can accept either an open filestream, or a string.
+     *
+     * @param mixed $body
+     * @return void
+     */
+    public function sendBody($body) {
+
+        if (is_resource($body)) {
+
+            fpassthru($body);
+
+        } else {
+
+            // We assume a string
+            echo $body;
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Util.php b/3rdparty/Sabre/HTTP/Util.php
new file mode 100755
index 0000000000..67bdd489e1
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Util.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * HTTP utility methods
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @author Paul Voegler
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Util {
+
+    /**
+     * Parses a RFC2616-compatible date string
+     *
+     * This method returns false if the date is invalid
+     *
+     * @param string $dateHeader
+     * @return bool|DateTime
+     */
+    static function parseHTTPDate($dateHeader) {
+
+        //RFC 2616 section 3.3.1 Full Date
+        //Only the format is checked, valid ranges are checked by strtotime below
+        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+        $time = '[0-2]\d(\:[0-5]\d){2}';
+        $date3 = $month . ' ([1-3]\d| \d)';
+        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
+
+        //ANSI C's asctime() format
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
+        //RFC 850, obsoleted by RFC 1036
+        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
+        //RFC 822, updated by RFC 1123
+        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
+        //allowed date formats by RFC 2616
+        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+
+        //allow for space around the string and strip it
+        $dateHeader = trim($dateHeader, ' ');
+        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
+            return false;
+
+        //append implicit GMT timezone to ANSI C time format
+        if (strpos($dateHeader, ' GMT') === false)
+            $dateHeader .= ' GMT';
+
+
+        $realDate = strtotime($dateHeader);
+        //strtotime can return -1 or false in case of error
+        if ($realDate !== false && $realDate >= 0)
+            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * Transforms a DateTime object to HTTP's most common date format.
+     *
+     * We're serializing it as the RFC 1123 date, which, for HTTP must be
+     * specified as GMT.
+     *
+     * @param DateTime $dateTime
+     * @return string
+     */
+    static function toHTTPDate(DateTime $dateTime) {
+
+        // We need to clone it, as we don't want to affect the existing
+        // DateTime.
+        $dateTime = clone $dateTime;
+        $dateTime->setTimeZone(new DateTimeZone('GMT'));
+        return $dateTime->format('D, d M Y H:i:s \G\M\T');
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Version.php b/3rdparty/Sabre/HTTP/Version.php
new file mode 100755
index 0000000000..23dc7f8a7a
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_HTTP version constants.
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.2';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/HTTP/includes.php b/3rdparty/Sabre/HTTP/includes.php
new file mode 100755
index 0000000000..9d34bf3a8b
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/includes.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Sabre_HTTP includes file
+ *
+ * Including this file will automatically include all files from the Sabre_HTTP
+ * package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/AbstractAuth.php';
+include __DIR__ . '/AWSAuth.php';
+include __DIR__ . '/BasicAuth.php';
+include __DIR__ . '/DigestAuth.php';
+include __DIR__ . '/Request.php';
+include __DIR__ . '/Response.php';
+include __DIR__ . '/Util.php';
+include __DIR__ . '/Version.php';
+// End includes
diff --git a/3rdparty/Sabre/VObject/Component.php b/3rdparty/Sabre/VObject/Component.php
new file mode 100755
index 0000000000..b78a26133f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component.php
@@ -0,0 +1,365 @@
+<?php
+
+/**
+ * VObject Component
+ *
+ * This class represents a VCALENDAR/VCARD component. A component is for example
+ * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and
+ * ends with END:COMPONENTNAME
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component extends Sabre_VObject_Element {
+
+    /**
+     * Name, for example VEVENT
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Children properties and components
+     *
+     * @var array
+     */
+    public $children = array();
+
+    /**
+     * If coponents are added to this map, they will be automatically mapped
+     * to their respective classes, if parsed by the reader or constructed with
+     * the 'create' method.
+     *
+     * @var array
+     */
+    static public $classMap = array(
+        'VCALENDAR'     => 'Sabre_VObject_Component_VCalendar',
+        'VEVENT'        => 'Sabre_VObject_Component_VEvent',
+        'VTODO'         => 'Sabre_VObject_Component_VTodo',
+        'VJOURNAL'      => 'Sabre_VObject_Component_VJournal',
+        'VALARM'        => 'Sabre_VObject_Component_VAlarm',
+    );
+
+    /**
+     * Creates the new component by name, but in addition will also see if
+     * there's a class mapped to the property name.
+     *
+     * @param string $name
+     * @param string $value
+     * @return Sabre_VObject_Component
+     */
+    static public function create($name, $value = null) {
+
+        $name = strtoupper($name);
+
+        if (isset(self::$classMap[$name])) {
+            return new self::$classMap[$name]($name, $value);
+        } else {
+            return new self($name, $value);
+        }
+
+    }
+
+    /**
+     * Creates a new component.
+     *
+     * By default this object will iterate over its own children, but this can
+     * be overridden with the iterator argument
+     *
+     * @param string $name
+     * @param Sabre_VObject_ElementList $iterator
+     */
+    public function __construct($name, Sabre_VObject_ElementList $iterator = null) {
+
+        $this->name = strtoupper($name);
+        if (!is_null($iterator)) $this->iterator = $iterator;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    public function serialize() {
+
+        $str = "BEGIN:" . $this->name . "\r\n";
+
+        /**
+         * Gives a component a 'score' for sorting purposes.
+         *
+         * This is solely used by the childrenSort method.
+         *
+         * A higher score means the item will be higher in the list
+         *
+         * @param Sabre_VObject_Node $n
+         * @return int
+         */
+        $sortScore = function($n) {
+
+            if ($n instanceof Sabre_VObject_Component) {
+                // We want to encode VTIMEZONE first, this is a personal
+                // preference.
+                if ($n->name === 'VTIMEZONE') {
+                    return 1;
+                } else {
+                    return 0;
+                }
+            } else {
+                // VCARD version 4.0 wants the VERSION property to appear first
+                if ($n->name === 'VERSION') {
+                    return 3;
+                } else {
+                    return 2;
+                }
+            }
+
+        };
+
+        usort($this->children, function($a, $b) use ($sortScore) {
+
+            $sA = $sortScore($a);
+            $sB = $sortScore($b);
+
+            if ($sA === $sB) return 0;
+
+            return ($sA > $sB) ? -1 : 1;
+
+        });
+
+        foreach($this->children as $child) $str.=$child->serialize();
+        $str.= "END:" . $this->name . "\r\n";
+
+        return $str;
+
+    }
+
+    /**
+     * Adds a new component or element
+     *
+     * You can call this method with the following syntaxes:
+     *
+     * add(Sabre_VObject_Element $element)
+     * add(string $name, $value)
+     *
+     * The first version adds an Element
+     * The second adds a property as a string.
+     *
+     * @param mixed $item
+     * @param mixed $itemValue
+     * @return void
+     */
+    public function add($item, $itemValue = null) {
+
+        if ($item instanceof Sabre_VObject_Element) {
+            if (!is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
+            }
+            $item->parent = $this;
+            $this->children[] = $item;
+        } elseif(is_string($item)) {
+
+            if (!is_scalar($itemValue)) {
+                throw new InvalidArgumentException('The second argument must be scalar');
+            }
+            $item = Sabre_VObject_Property::create($item,$itemValue);
+            $item->parent = $this;
+            $this->children[] = $item;
+
+        } else {
+
+            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
+
+        }
+
+    }
+
+    /**
+     * Returns an iterable list of children
+     *
+     * @return Sabre_VObject_ElementList
+     */
+    public function children() {
+
+        return new Sabre_VObject_ElementList($this->children);
+
+    }
+
+    /**
+     * Returns an array with elements that match the specified name.
+     *
+     * This function is also aware of MIME-Directory groups (as they appear in
+     * vcards). This means that if a property is grouped as "HOME.EMAIL", it
+     * will also be returned when searching for just "EMAIL". If you want to
+     * search for a property in a specific group, you can select on the entire
+     * string ("HOME.EMAIL"). If you want to search on a specific property that
+     * has not been assigned a group, specify ".EMAIL".
+     *
+     * Keys are retained from the 'children' array, which may be confusing in
+     * certain cases.
+     *
+     * @param string $name
+     * @return array
+     */
+    public function select($name) {
+
+        $group = null;
+        $name = strtoupper($name);
+        if (strpos($name,'.')!==false) {
+            list($group,$name) = explode('.', $name, 2);
+        }
+
+        $result = array();
+        foreach($this->children as $key=>$child) {
+
+            if (
+                strtoupper($child->name) === $name &&
+                (is_null($group) || ( $child instanceof Sabre_VObject_Property && strtoupper($child->group) === $group))
+            ) {
+
+                $result[$key] = $child;
+
+            }
+        }
+
+        reset($result);
+        return $result;
+
+    }
+
+    /**
+     * This method only returns a list of sub-components. Properties are
+     * ignored.
+     *
+     * @return array
+     */
+    public function getComponents() {
+
+        $result = array();
+        foreach($this->children as $child) {
+            if ($child instanceof Sabre_VObject_Component) {
+                $result[] = $child;
+            }
+        }
+
+        return $result;
+
+    }
+
+    /* Magic property accessors {{{ */
+
+    /**
+     * Using 'get' you will either get a property or component,
+     *
+     * If there were no child-elements found with the specified name,
+     * null is returned.
+     *
+     * @param string $name
+     * @return Sabre_VObject_Property
+     */
+    public function __get($name) {
+
+        $matches = $this->select($name);
+        if (count($matches)===0) {
+            return null;
+        } else {
+            $firstMatch = current($matches);
+            /** @var $firstMatch Sabre_VObject_Property */
+            $firstMatch->setIterator(new Sabre_VObject_ElementList(array_values($matches)));
+            return $firstMatch;
+        }
+
+    }
+
+    /**
+     * This method checks if a sub-element with the specified name exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function __isset($name) {
+
+        $matches = $this->select($name);
+        return count($matches)>0;
+
+    }
+
+    /**
+     * Using the setter method you can add properties or subcomponents
+     *
+     * You can either pass a Sabre_VObject_Component, Sabre_VObject_Property
+     * object, or a string to automatically create a Property.
+     *
+     * If the item already exists, it will be removed. If you want to add
+     * a new item with the same name, always use the add() method.
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    public function __set($name, $value) {
+
+        $matches = $this->select($name);
+        $overWrite = count($matches)?key($matches):null;
+
+        if ($value instanceof Sabre_VObject_Component || $value instanceof Sabre_VObject_Property) {
+            $value->parent = $this;
+            if (!is_null($overWrite)) {
+                $this->children[$overWrite] = $value;
+            } else {
+                $this->children[] = $value;
+            }
+        } elseif (is_scalar($value)) {
+            $property = Sabre_VObject_Property::create($name,$value);
+            $property->parent = $this;
+            if (!is_null($overWrite)) {
+                $this->children[$overWrite] = $property;
+            } else {
+                $this->children[] = $property;
+            }
+        } else {
+            throw new InvalidArgumentException('You must pass a Sabre_VObject_Component, Sabre_VObject_Property or scalar type');
+        }
+
+    }
+
+    /**
+     * Removes all properties and components within this component.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function __unset($name) {
+
+        $matches = $this->select($name);
+        foreach($matches as $k=>$child) {
+
+            unset($this->children[$k]);
+            $child->parent = null;
+
+        }
+
+    }
+
+    /* }}} */
+
+    /**
+     * This method is automatically called when the object is cloned.
+     * Specifically, this will ensure all child elements are also cloned.
+     *
+     * @return void
+     */
+    public function __clone() {
+
+        foreach($this->children as $key=>$child) {
+            $this->children[$key] = clone $child;
+            $this->children[$key]->parent = $this;
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Component/VAlarm.php b/3rdparty/Sabre/VObject/Component/VAlarm.php
new file mode 100755
index 0000000000..ebb4a9b18f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VAlarm.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * VAlarm component
+ *
+ * This component contains some additional functionality specific for VALARMs.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VAlarm extends Sabre_VObject_Component {
+
+    /**
+     * Returns a DateTime object when this alarm is going to trigger.
+     *
+     * This ignores repeated alarm, only the first trigger is returned.
+     *
+     * @return DateTime
+     */
+    public function getEffectiveTriggerTime() {
+
+        $trigger = $this->TRIGGER;
+        if(!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
+            $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($this->TRIGGER);
+            $related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
+
+            $parentComponent = $this->parent;
+            if ($related === 'START') {
+                $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
+                $effectiveTrigger->add($triggerDuration);
+            } else {
+                if ($parentComponent->name === 'VTODO') {
+                    $endProp = 'DUE';
+                } elseif ($parentComponent->name === 'VEVENT') {
+                    $endProp = 'DTEND';
+                } else {
+                    throw new Sabre_DAV_Exception('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
+                }
+
+                if (isset($parentComponent->$endProp)) {
+                    $effectiveTrigger = clone $parentComponent->$endProp->getDateTime();
+                    $effectiveTrigger->add($triggerDuration);
+                } elseif (isset($parentComponent->DURATION)) {
+                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
+                    $duration = Sabre_VObject_DateTimeParser::parseDuration($parentComponent->DURATION);
+                    $effectiveTrigger->add($duration);
+                    $effectiveTrigger->add($triggerDuration);
+                } else {
+                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
+                    $effectiveTrigger->add($triggerDuration);
+                }
+            }
+        } else {
+            $effectiveTrigger = $trigger->getDateTime();
+        }
+        return $effectiveTrigger;
+
+    }
+
+    /**
+     * Returns true or false depending on if the event falls in the specified
+     * time-range. This is used for filtering purposes.
+     *
+     * The rules used to determine if an event falls within the specified
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return bool
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        $effectiveTrigger = $this->getEffectiveTriggerTime();
+
+        if (isset($this->DURATION)) {
+            $duration = Sabre_VObject_DateTimeParser::parseDuration($this->DURATION);
+            $repeat = (string)$this->repeat;
+            if (!$repeat) {
+                $repeat = 1;
+            }
+
+            $period = new DatePeriod($effectiveTrigger, $duration, (int)$repeat);
+
+            foreach($period as $occurrence) {
+
+                if ($start <= $occurrence && $end > $occurrence) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
+        }
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Component/VCalendar.php b/3rdparty/Sabre/VObject/Component/VCalendar.php
new file mode 100755
index 0000000000..f3be29afdb
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VCalendar.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * The VCalendar component
+ *
+ * This component adds functionality to a component, specific for a VCALENDAR.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VCalendar extends Sabre_VObject_Component {
+
+    /**
+     * Returns a list of all 'base components'. For instance, if an Event has 
+     * a recurrence rule, and one instance is overridden, the overridden event 
+     * will have the same UID, but will be excluded from this list.
+     *
+     * VTIMEZONE components will always be excluded. 
+     *
+     * @param string $componentName filter by component name 
+     * @return array 
+     */
+    public function getBaseComponents($componentName = null) {
+
+        $components = array();
+        foreach($this->children as $component) {
+
+            if (!$component instanceof Sabre_VObject_Component)
+                continue;
+
+            if (isset($component->{'RECURRENCE-ID'})) 
+                continue;
+
+            if ($componentName && $component->name !== strtoupper($componentName)) 
+                continue;
+
+            if ($component->name === 'VTIMEZONE')
+                continue;
+
+            $components[] = $component;
+
+        }
+
+        return $components;
+
+    }
+
+    /**
+     * If this calendar object, has events with recurrence rules, this method 
+     * can be used to expand the event into multiple sub-events.
+     *
+     * Each event will be stripped from it's recurrence information, and only 
+     * the instances of the event in the specified timerange will be left 
+     * alone.
+     *
+     * In addition, this method will cause timezone information to be stripped, 
+     * and normalized to UTC.
+     *
+     * This method will alter the VCalendar. This cannot be reversed.
+     *
+     * This functionality is specifically used by the CalDAV standard. It is 
+     * possible for clients to request expand events, if they are rather simple 
+     * clients and do not have the possibility to calculate recurrences.
+     *
+     * @param DateTime $start
+     * @param DateTime $end 
+     * @return void
+     */
+    public function expand(DateTime $start, DateTime $end) {
+
+        $newEvents = array();
+
+        foreach($this->select('VEVENT') as $key=>$vevent) {
+
+            if (isset($vevent->{'RECURRENCE-ID'})) {
+                unset($this->children[$key]);
+                continue;
+            } 
+
+
+            if (!$vevent->rrule) {
+                unset($this->children[$key]);
+                if ($vevent->isInTimeRange($start, $end)) {
+                    $newEvents[] = $vevent;
+                }
+                continue;
+            }
+
+            $uid = (string)$vevent->uid;
+            if (!$uid) {
+                throw new LogicException('Event did not have a UID!');
+            }
+
+            $it = new Sabre_VObject_RecurrenceIterator($this, $vevent->uid);
+            $it->fastForward($start);
+
+            while($it->valid() && $it->getDTStart() < $end) {
+
+                if ($it->getDTEnd() > $start) {
+
+                    $newEvents[] = $it->getEventObject();
+
+                }
+                $it->next();
+
+            }
+            unset($this->children[$key]);
+
+        }
+
+        foreach($newEvents as $newEvent) {
+
+            foreach($newEvent->children as $child) {
+                if ($child instanceof Sabre_VObject_Property_DateTime &&
+                    $child->getDateType() == Sabre_VObject_Property_DateTime::LOCALTZ) {
+                        $child->setDateTime($child->getDateTime(),Sabre_VObject_Property_DateTime::UTC);
+                    }
+            }
+
+            $this->add($newEvent);
+
+        }
+
+        // Removing all VTIMEZONE components
+        unset($this->VTIMEZONE);
+
+    } 
+
+}
+
diff --git a/3rdparty/Sabre/VObject/Component/VEvent.php b/3rdparty/Sabre/VObject/Component/VEvent.php
new file mode 100755
index 0000000000..4cc1e36d7d
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VEvent.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * VEvent component
+ *
+ * This component contains some additional functionality specific for VEVENT's.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VEvent extends Sabre_VObject_Component {
+
+    /**
+     * Returns true or false depending on if the event falls in the specified
+     * time-range. This is used for filtering purposes.
+     *
+     * The rules used to determine if an event falls within the specified
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return bool
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        if ($this->RRULE) {
+            $it = new Sabre_VObject_RecurrenceIterator($this);
+            $it->fastForward($start);
+
+            // We fast-forwarded to a spot where the end-time of the
+            // recurrence instance exceeded the start of the requested
+            // time-range.
+            //
+            // If the starttime of the recurrence did not exceed the
+            // end of the time range as well, we have a match.
+            return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
+
+        }
+
+        $effectiveStart = $this->DTSTART->getDateTime();
+        if (isset($this->DTEND)) {
+            $effectiveEnd = $this->DTEND->getDateTime();
+            // If this was an all-day event, we should just increase the
+            // end-date by 1. Otherwise the event will last until the second
+            // the date changed, by increasing this by 1 day the event lasts
+            // all of the last day as well.
+            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+                $effectiveEnd->modify('+1 day');
+            }
+        } elseif (isset($this->DURATION)) {
+            $effectiveEnd = clone $effectiveStart;
+            $effectiveEnd->add( Sabre_VObject_DateTimeParser::parseDuration($this->DURATION) );
+        } elseif ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+            $effectiveEnd = clone $effectiveStart;
+            $effectiveEnd->modify('+1 day');
+        } else {
+            $effectiveEnd = clone $effectiveStart;
+        }
+        return (
+            ($start <= $effectiveEnd) && ($end > $effectiveStart)
+        );
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Component/VJournal.php b/3rdparty/Sabre/VObject/Component/VJournal.php
new file mode 100755
index 0000000000..22b3ec921e
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VJournal.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * VJournal component
+ *
+ * This component contains some additional functionality specific for VJOURNALs.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VJournal extends Sabre_VObject_Component {
+
+    /**
+     * Returns true or false depending on if the event falls in the specified 
+     * time-range. This is used for filtering purposes. 
+     *
+     * The rules used to determine if an event falls within the specified 
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end 
+     * @return bool 
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
+        if ($dtstart) {
+            $effectiveEnd = clone $dtstart;
+            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+                $effectiveEnd->modify('+1 day');
+            }
+
+            return ($start <= $effectiveEnd && $end > $dtstart);
+
+        }
+        return false;
+
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Component/VTodo.php b/3rdparty/Sabre/VObject/Component/VTodo.php
new file mode 100755
index 0000000000..79d06298d7
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VTodo.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * VTodo component
+ *
+ * This component contains some additional functionality specific for VTODOs.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VTodo extends Sabre_VObject_Component {
+
+    /**
+     * Returns true or false depending on if the event falls in the specified 
+     * time-range. This is used for filtering purposes. 
+     *
+     * The rules used to determine if an event falls within the specified 
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end 
+     * @return bool 
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
+        $duration = isset($this->DURATION)?Sabre_VObject_DateTimeParser::parseDuration($this->DURATION):null;
+        $due = isset($this->DUE)?$this->DUE->getDateTime():null;
+        $completed = isset($this->COMPLETED)?$this->COMPLETED->getDateTime():null;
+        $created = isset($this->CREATED)?$this->CREATED->getDateTime():null;
+
+        if ($dtstart) {
+            if ($duration) {
+                $effectiveEnd = clone $dtstart;
+                $effectiveEnd->add($duration);
+                return $start <= $effectiveEnd && $end > $dtstart;
+            } elseif ($due) {
+                return
+                    ($start < $due || $start <= $dtstart) &&
+                    ($end > $dtstart || $end >= $due);
+            } else {
+                return $start <= $dtstart && $end > $dtstart;
+            }
+        }
+        if ($due) {
+            return ($start < $due && $end >= $due);
+        }
+        if ($completed && $created) {
+            return
+                ($start <= $created || $start <= $completed) &&
+                ($end >= $created || $end >= $completed);
+        }
+        if ($completed) {
+            return ($start <= $completed && $end >= $completed);
+        }
+        if ($created) {
+            return ($end > $created);
+        }
+        return true;
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/DateTimeParser.php b/3rdparty/Sabre/VObject/DateTimeParser.php
new file mode 100755
index 0000000000..23a4bb6991
--- /dev/null
+++ b/3rdparty/Sabre/VObject/DateTimeParser.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * DateTimeParser
+ *
+ * This class is responsible for parsing the several different date and time
+ * formats iCalendar and vCards have.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_DateTimeParser {
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
+     *
+     * Specifying a reference timezone is optional. It will only be used
+     * if the non-UTC format is used. The argument is used as a reference, the
+     * returned DateTime object will still be in the UTC timezone.
+     *
+     * @param string $dt
+     * @param DateTimeZone $tz
+     * @return DateTime
+     */
+    static public function parseDateTime($dt,DateTimeZone $tz = null) {
+
+        // Format is YYYYMMDD + "T" + hhmmss
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
+        }
+
+        if ($matches[7]==='Z' || is_null($tz)) {
+            $tz = new DateTimeZone('UTC');
+        }
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
+
+        // Still resetting the timezone, to normalize everything to UTC
+        $date->setTimeZone(new DateTimeZone('UTC'));
+        return $date;
+
+    }
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted date and returns a DateTime object
+     *
+     * @param string $date
+     * @return DateTime
+     */
+    static public function parseDate($date) {
+
+        // Format is YYYYMMDD
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
+        }
+
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
+        return $date;
+
+    }
+
+    /**
+     * Parses an iCalendar (RFC5545) formatted duration value.
+     *
+     * This method will either return a DateTimeInterval object, or a string
+     * suitable for strtotime or DateTime::modify.
+     *
+     * @param string $duration
+     * @param bool $asString
+     * @return DateInterval|string
+     */
+    static public function parseDuration($duration, $asString = false) {
+
+        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
+        }
+
+        if (!$asString) {
+            $invert = false;
+            if ($matches['plusminus']==='-') {
+                $invert = true;
+            }
+
+
+            $parts = array(
+                'week',
+                'day',
+                'hour',
+                'minute',
+                'second',
+            );
+            foreach($parts as $part) {
+                $matches[$part] = isset($matches[$part])&&$matches[$part]?(int)$matches[$part]:0;
+            }
+
+
+            // We need to re-construct the $duration string, because weeks and
+            // days are not supported by DateInterval in the same string.
+            $duration = 'P';
+            $days = $matches['day'];
+            if ($matches['week']) {
+                $days+=$matches['week']*7;
+            }
+            if ($days)
+                $duration.=$days . 'D';
+
+            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
+                $duration.='T';
+
+                if ($matches['hour'])
+                    $duration.=$matches['hour'].'H';
+
+                if ($matches['minute'])
+                    $duration.=$matches['minute'].'M';
+
+                if ($matches['second'])
+                    $duration.=$matches['second'].'S';
+
+            }
+
+            if ($duration==='P') {
+                $duration = 'PT0S';
+            }
+            $iv = new DateInterval($duration);
+            if ($invert) $iv->invert = true;
+
+            return $iv;
+
+        }
+
+
+
+        $parts = array(
+            'week',
+            'day',
+            'hour',
+            'minute',
+            'second',
+        );
+
+        $newDur = '';
+        foreach($parts as $part) {
+            if (isset($matches[$part]) && $matches[$part]) {
+                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
+            }
+        }
+
+        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
+        if ($newDur === '+') { $newDur = '+0 seconds'; };
+        return $newDur;
+
+    }
+
+    /**
+     * Parses either a Date or DateTime, or Duration value.
+     *
+     * @param string $date
+     * @param DateTimeZone|string $referenceTZ
+     * @return DateTime|DateInterval
+     */
+    static public function parse($date, $referenceTZ = null) {
+
+        if ($date[0]==='P' || ($date[0]==='-' && $date[1]==='P')) {
+            return self::parseDuration($date);
+        } elseif (strlen($date)===8) {
+            return self::parseDate($date);
+        } else {
+            return self::parseDateTime($date, $referenceTZ);
+        }
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/VObject/Element.php b/3rdparty/Sabre/VObject/Element.php
new file mode 100755
index 0000000000..e20ff0b353
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Base class for all elements
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_VObject_Element extends Sabre_VObject_Node {
+
+    public $parent = null;
+
+}
diff --git a/3rdparty/Sabre/VObject/Element/DateTime.php b/3rdparty/Sabre/VObject/Element/DateTime.php
new file mode 100755
index 0000000000..5e5eb7ab6f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element/DateTime.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * DateTime property
+ *
+ * this class got renamed to Sabre_VObject_Property_DateTime
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @deprecated
+ */
+class Sabre_VObject_Element_DateTime extends Sabre_VObject_Property_DateTime {
+
+    /**
+     * Local 'floating' time
+     */
+    const LOCAL = 1;
+
+    /**
+     * UTC-based time
+     */
+    const UTC = 2;
+
+    /**
+     * Local time plus timezone
+     */
+    const LOCALTZ = 3;
+
+    /**
+     * Only a date, time is ignored
+     */
+    const DATE = 4;
+
+}
diff --git a/3rdparty/Sabre/VObject/Element/MultiDateTime.php b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
new file mode 100755
index 0000000000..8a12ced94a
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Multi-DateTime property
+ *
+ * This class got renamed to Sabre_VObject_Property_MultiDateTime
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @deprecated
+ */
+class Sabre_VObject_Element_MultiDateTime extends Sabre_VObject_Property_MultiDateTime {
+
+}
diff --git a/3rdparty/Sabre/VObject/ElementList.php b/3rdparty/Sabre/VObject/ElementList.php
new file mode 100755
index 0000000000..7e508db20f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/ElementList.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * VObject ElementList
+ *
+ * This class represents a list of elements. Lists are the result of queries,
+ * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_ElementList implements Iterator, Countable, ArrayAccess {
+
+    /**
+     * Inner elements
+     *
+     * @var array
+     */
+    protected $elements = array();
+
+    /**
+     * Creates the element list.
+     *
+     * @param array $elements
+     */
+    public function __construct(array $elements) {
+
+        $this->elements = $elements;
+
+    }
+
+    /* {{{ Iterator interface */
+
+    /**
+     * Current position
+     *
+     * @var int
+     */
+    private $key = 0;
+
+    /**
+     * Returns current item in iteration
+     *
+     * @return Sabre_VObject_Element
+     */
+    public function current() {
+
+        return $this->elements[$this->key];
+
+    }
+
+    /**
+     * To the next item in the iterator
+     *
+     * @return void
+     */
+    public function next() {
+
+        $this->key++;
+
+    }
+
+    /**
+     * Returns the current iterator key
+     *
+     * @return int
+     */
+    public function key() {
+
+        return $this->key;
+
+    }
+
+    /**
+     * Returns true if the current position in the iterator is a valid one
+     *
+     * @return bool
+     */
+    public function valid() {
+
+        return isset($this->elements[$this->key]);
+
+    }
+
+    /**
+     * Rewinds the iterator
+     *
+     * @return void
+     */
+    public function rewind() {
+
+        $this->key = 0;
+
+    }
+
+    /* }}} */
+
+    /* {{{ Countable interface */
+
+    /**
+     * Returns the number of elements
+     *
+     * @return int
+     */
+    public function count() {
+
+        return count($this->elements);
+
+    }
+
+    /* }}} */
+
+    /* {{{ ArrayAccess Interface */
+
+
+    /**
+     * Checks if an item exists through ArrayAccess.
+     *
+     * @param int $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+
+        return isset($this->elements[$offset]);
+
+    }
+
+    /**
+     * Gets an item through ArrayAccess.
+     *
+     * @param int $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+
+        return $this->elements[$offset];
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * @param int $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset,$value) {
+
+        throw new LogicException('You can not add new objects to an ElementList');
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return void
+     */
+    public function offsetUnset($offset) {
+
+        throw new LogicException('You can not remove objects from an ElementList');
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/FreeBusyGenerator.php b/3rdparty/Sabre/VObject/FreeBusyGenerator.php
new file mode 100755
index 0000000000..1c96a64a00
--- /dev/null
+++ b/3rdparty/Sabre/VObject/FreeBusyGenerator.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+ * This class helps with generating FREEBUSY reports based on existing sets of
+ * objects.
+ *
+ * It only looks at VEVENT and VFREEBUSY objects from the sourcedata, and
+ * generates a single VFREEBUSY object.
+ *
+ * VFREEBUSY components are described in RFC5545, The rules for what should
+ * go in a single freebusy report is taken from RFC4791, section 7.10.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_FreeBusyGenerator {
+
+    /**
+     * Input objects
+     *
+     * @var array
+     */
+    protected $objects;
+
+    /**
+     * Start of range
+     *
+     * @var DateTime|null
+     */
+    protected $start;
+
+    /**
+     * End of range
+     *
+     * @var DateTime|null
+     */
+    protected $end;
+
+    /**
+     * VCALENDAR object
+     *
+     * @var Sabre_VObject_Component
+     */
+    protected $baseObject;
+
+    /**
+     * Sets the VCALENDAR object.
+     *
+     * If this is set, it will not be generated for you. You are responsible
+     * for setting things like the METHOD, CALSCALE, VERSION, etc..
+     *
+     * The VFREEBUSY object will be automatically added though.
+     *
+     * @param Sabre_VObject_Component $vcalendar
+     * @return void
+     */
+    public function setBaseObject(Sabre_VObject_Component $vcalendar) {
+
+        $this->baseObject = $vcalendar;
+
+    }
+
+    /**
+     * Sets the input objects
+     *
+     * Every object must either be a string or a Sabre_VObject_Component.
+     *
+     * @param array $objects
+     * @return void
+     */
+    public function setObjects(array $objects) {
+
+        $this->objects = array();
+        foreach($objects as $object) {
+
+            if (is_string($object)) {
+                $this->objects[] = Sabre_VObject_Reader::read($object);
+            } elseif ($object instanceof Sabre_VObject_Component) {
+                $this->objects[] = $object;
+            } else {
+                throw new InvalidArgumentException('You can only pass strings or Sabre_VObject_Component arguments to setObjects');
+            }
+
+        }
+
+    }
+
+    /**
+     * Sets the time range
+     *
+     * Any freebusy object falling outside of this time range will be ignored.
+     *
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return void
+     */
+    public function setTimeRange(DateTime $start = null, DateTime $end = null) {
+
+        $this->start = $start;
+        $this->end = $end;
+
+    }
+
+    /**
+     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
+     * a VCALENDAR.
+     *
+     * @return Sabre_VObject_Component
+     */
+    public function getResult() {
+
+        $busyTimes = array();
+
+        foreach($this->objects as $object) {
+
+            foreach($object->getBaseComponents() as $component) {
+
+                switch($component->name) {
+
+                    case 'VEVENT' :
+
+                        $FBTYPE = 'BUSY';
+                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
+                            break;
+                        }
+                        if (isset($component->STATUS)) {
+                            $status = strtoupper($component->STATUS);
+                            if ($status==='CANCELLED') {
+                                break;
+                            }
+                            if ($status==='TENTATIVE') {
+                                $FBTYPE = 'BUSY-TENTATIVE';
+                            }
+                        }
+
+                        $times = array();
+
+                        if ($component->RRULE) {
+
+                            $iterator = new Sabre_VObject_RecurrenceIterator($object, (string)$component->uid);
+                            if ($this->start) {
+                                $iterator->fastForward($this->start);
+                            }
+
+                            $maxRecurrences = 200;
+
+                            while($iterator->valid() && --$maxRecurrences) {
+
+                                $startTime = $iterator->getDTStart();
+                                if ($this->end && $startTime > $this->end) {
+                                    break;
+                                }
+                                $times[] = array(
+                                    $iterator->getDTStart(),
+                                    $iterator->getDTEnd(),
+                                );
+
+                                $iterator->next();
+
+                            }
+
+                        } else {
+
+                            $startTime = $component->DTSTART->getDateTime();
+                            if ($this->end && $startTime > $this->end) {
+                                break;
+                            }
+                            $endTime = null;
+                            if (isset($component->DTEND)) {
+                                $endTime = $component->DTEND->getDateTime();
+                            } elseif (isset($component->DURATION)) {
+                                $duration = Sabre_VObject_DateTimeParser::parseDuration((string)$component->DURATION);
+                                $endTime = clone $startTime;
+                                $endTime->add($duration);
+                            } elseif ($component->DTSTART->getDateType() === Sabre_VObject_Property_DateTime::DATE) {
+                                $endTime = clone $startTime;
+                                $endTime->modify('+1 day');
+                            } else {
+                                // The event had no duration (0 seconds)
+                                break;
+                            }
+
+                            $times[] = array($startTime, $endTime);
+
+                        }
+
+                        foreach($times as $time) {
+
+                            if ($this->end && $time[0] > $this->end) break;
+                            if ($this->start && $time[1] < $this->start) break;
+
+                            $busyTimes[] = array(
+                                $time[0],
+                                $time[1],
+                                $FBTYPE,
+                            );
+                        }
+                        break;
+
+                    case 'VFREEBUSY' :
+                        foreach($component->FREEBUSY as $freebusy) {
+
+                            $fbType = isset($freebusy['FBTYPE'])?strtoupper($freebusy['FBTYPE']):'BUSY';
+
+                            // Skipping intervals marked as 'free'
+                            if ($fbType==='FREE')
+                                continue;
+
+                            $values = explode(',', $freebusy);
+                            foreach($values as $value) {
+                                list($startTime, $endTime) = explode('/', $value);
+                                $startTime = Sabre_VObject_DateTimeParser::parseDateTime($startTime);
+
+                                if (substr($endTime,0,1)==='P' || substr($endTime,0,2)==='-P') {
+                                    $duration = Sabre_VObject_DateTimeParser::parseDuration($endTime);
+                                    $endTime = clone $startTime;
+                                    $endTime->add($duration);
+                                } else {
+                                    $endTime = Sabre_VObject_DateTimeParser::parseDateTime($endTime);
+                                }
+
+                                if($this->start && $this->start > $endTime) continue;
+                                if($this->end && $this->end < $startTime) continue;
+                                $busyTimes[] = array(
+                                    $startTime,
+                                    $endTime,
+                                    $fbType
+                                );
+
+                            }
+
+
+                        }
+                        break;
+
+
+
+                }
+
+
+            }
+
+        }
+
+        if ($this->baseObject) {
+            $calendar = $this->baseObject;
+        } else {
+            $calendar = new Sabre_VObject_Component('VCALENDAR');
+            $calendar->version = '2.0';
+            if (Sabre_DAV_Server::$exposeVersion) {
+                $calendar->prodid = '-//SabreDAV//Sabre VObject ' . Sabre_VObject_Version::VERSION . '//EN';
+            } else {
+                $calendar->prodid = '-//SabreDAV//Sabre VObject//EN';
+            }
+            $calendar->calscale = 'GREGORIAN';
+        }
+
+        $vfreebusy = new Sabre_VObject_Component('VFREEBUSY');
+        $calendar->add($vfreebusy);
+
+        if ($this->start) {
+            $dtstart = new Sabre_VObject_Property_DateTime('DTSTART');
+            $dtstart->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
+            $vfreebusy->add($dtstart);
+        }
+        if ($this->end) {
+            $dtend = new Sabre_VObject_Property_DateTime('DTEND');
+            $dtend->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
+            $vfreebusy->add($dtend);
+        }
+        $dtstamp = new Sabre_VObject_Property_DateTime('DTSTAMP');
+        $dtstamp->setDateTime(new DateTime('now'), Sabre_VObject_Property_DateTime::UTC);
+        $vfreebusy->add($dtstamp);
+
+        foreach($busyTimes as $busyTime) {
+
+            $busyTime[0]->setTimeZone(new DateTimeZone('UTC'));
+            $busyTime[1]->setTimeZone(new DateTimeZone('UTC'));
+
+            $prop = new Sabre_VObject_Property(
+                'FREEBUSY',
+                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
+            );
+            $prop['FBTYPE'] = $busyTime[2];
+            $vfreebusy->add($prop);
+
+        }
+
+        return $calendar;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/VObject/Node.php b/3rdparty/Sabre/VObject/Node.php
new file mode 100755
index 0000000000..d89e01b56c
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Node.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Base class for all nodes
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_VObject_Node implements IteratorAggregate, ArrayAccess, Countable {
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    abstract function serialize();
+
+    /**
+     * Iterator override
+     *
+     * @var Sabre_VObject_ElementList
+     */
+    protected $iterator = null;
+
+    /**
+     * A link to the parent node
+     *
+     * @var Sabre_VObject_Node
+     */
+    public $parent = null;
+
+    /* {{{ IteratorAggregator interface */
+
+    /**
+     * Returns the iterator for this object
+     *
+     * @return Sabre_VObject_ElementList
+     */
+    public function getIterator() {
+
+        if (!is_null($this->iterator))
+            return $this->iterator;
+
+        return new Sabre_VObject_ElementList(array($this));
+
+    }
+
+    /**
+     * Sets the overridden iterator
+     *
+     * Note that this is not actually part of the iterator interface
+     *
+     * @param Sabre_VObject_ElementList $iterator
+     * @return void
+     */
+    public function setIterator(Sabre_VObject_ElementList $iterator) {
+
+        $this->iterator = $iterator;
+
+    }
+
+    /* }}} */
+
+    /* {{{ Countable interface */
+
+    /**
+     * Returns the number of elements
+     *
+     * @return int
+     */
+    public function count() {
+
+        $it = $this->getIterator();
+        return $it->count();
+
+    }
+
+    /* }}} */
+
+    /* {{{ ArrayAccess Interface */
+
+
+    /**
+     * Checks if an item exists through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetExists($offset);
+
+    }
+
+    /**
+     * Gets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetGet($offset);
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset,$value) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetSet($offset,$value);
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return void
+     */
+    public function offsetUnset($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetUnset($offset);
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/Parameter.php b/3rdparty/Sabre/VObject/Parameter.php
new file mode 100755
index 0000000000..2e39af5f78
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Parameter.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * VObject Parameter
+ *
+ * This class represents a parameter. A parameter is always tied to a property.
+ * In the case of:
+ *   DTSTART;VALUE=DATE:20101108
+ * VALUE=DATE would be the parameter name and value.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Parameter extends Sabre_VObject_Node {
+
+    /**
+     * Parameter name
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Parameter value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * Sets up the object
+     *
+     * @param string $name
+     * @param string $value
+     */
+    public function __construct($name, $value = null) {
+
+        $this->name = strtoupper($name);
+        $this->value = $value;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    public function serialize() {
+
+        if (is_null($this->value)) {
+            return $this->name;
+        }
+        $src = array(
+            '\\',
+            "\n",
+            ';',
+            ',',
+        );
+        $out = array(
+            '\\\\',
+            '\n',
+            '\;',
+            '\,',
+        );
+
+        return $this->name . '=' . str_replace($src, $out, $this->value);
+
+    }
+
+    /**
+     * Called when this object is being cast to a string
+     *
+     * @return string
+     */
+    public function __toString() {
+
+        return $this->value;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/ParseException.php b/3rdparty/Sabre/VObject/ParseException.php
new file mode 100755
index 0000000000..1b5e95bf16
--- /dev/null
+++ b/3rdparty/Sabre/VObject/ParseException.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Exception thrown by Sabre_VObject_Reader if an invalid object was attempted to be parsed.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_ParseException extends Exception { }
diff --git a/3rdparty/Sabre/VObject/Property.php b/3rdparty/Sabre/VObject/Property.php
new file mode 100755
index 0000000000..ce74fe3865
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property.php
@@ -0,0 +1,348 @@
+<?php
+
+/**
+ * VObject Property
+ *
+ * A property in VObject is usually in the form PARAMNAME:paramValue.
+ * An example is : SUMMARY:Weekly meeting
+ *
+ * Properties can also have parameters:
+ * SUMMARY;LANG=en:Weekly meeting.
+ *
+ * Parameters can be accessed using the ArrayAccess interface.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property extends Sabre_VObject_Element {
+
+    /**
+     * Propertyname
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Group name
+     *
+     * This may be something like 'HOME' for vcards.
+     *
+     * @var string
+     */
+    public $group;
+
+    /**
+     * Property parameters
+     *
+     * @var array
+     */
+    public $parameters = array();
+
+    /**
+     * Property value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * If properties are added to this map, they will be automatically mapped
+     * to their respective classes, if parsed by the reader or constructed with
+     * the 'create' method.
+     *
+     * @var array
+     */
+    static public $classMap = array(
+        'COMPLETED'     => 'Sabre_VObject_Property_DateTime',
+        'CREATED'       => 'Sabre_VObject_Property_DateTime',
+        'DTEND'         => 'Sabre_VObject_Property_DateTime',
+        'DTSTAMP'       => 'Sabre_VObject_Property_DateTime',
+        'DTSTART'       => 'Sabre_VObject_Property_DateTime',
+        'DUE'           => 'Sabre_VObject_Property_DateTime',
+        'EXDATE'        => 'Sabre_VObject_Property_MultiDateTime',
+        'LAST-MODIFIED' => 'Sabre_VObject_Property_DateTime',
+        'RECURRENCE-ID' => 'Sabre_VObject_Property_DateTime',
+        'TRIGGER'       => 'Sabre_VObject_Property_DateTime',
+    );
+
+    /**
+     * Creates the new property by name, but in addition will also see if
+     * there's a class mapped to the property name.
+     *
+     * @param string $name
+     * @param string $value
+     * @return void
+     */
+    static public function create($name, $value = null) {
+
+        $name = strtoupper($name);
+        $shortName = $name;
+        $group = null;
+        if (strpos($shortName,'.')!==false) {
+            list($group, $shortName) = explode('.', $shortName);
+        }
+
+        if (isset(self::$classMap[$shortName])) {
+            return new self::$classMap[$shortName]($name, $value);
+        } else {
+            return new self($name, $value);
+        }
+
+    }
+
+    /**
+     * Creates a new property object
+     *
+     * By default this object will iterate over its own children, but this can
+     * be overridden with the iterator argument
+     *
+     * @param string $name
+     * @param string $value
+     * @param Sabre_VObject_ElementList $iterator
+     */
+    public function __construct($name, $value = null, $iterator = null) {
+
+        $name = strtoupper($name);
+        $group = null;
+        if (strpos($name,'.')!==false) {
+            list($group, $name) = explode('.', $name);
+        }
+        $this->name = $name;
+        $this->group = $group;
+        if (!is_null($iterator)) $this->iterator = $iterator;
+        $this->setValue($value);
+
+    }
+
+
+
+    /**
+     * Updates the internal value
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue($value) {
+
+        $this->value = $value;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    public function serialize() {
+
+        $str = $this->name;
+        if ($this->group) $str = $this->group . '.' . $this->name;
+
+        if (count($this->parameters)) {
+            foreach($this->parameters as $param) {
+
+                $str.=';' . $param->serialize();
+
+            }
+        }
+        $src = array(
+            '\\',
+            "\n",
+        );
+        $out = array(
+            '\\\\',
+            '\n',
+        );
+        $str.=':' . str_replace($src, $out, $this->value);
+
+        $out = '';
+        while(strlen($str)>0) {
+            if (strlen($str)>75) {
+                $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
+                $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
+            } else {
+                $out.=$str . "\r\n";
+                $str='';
+                break;
+            }
+        }
+
+        return $out;
+
+    }
+
+    /**
+     * Adds a new componenten or element
+     *
+     * You can call this method with the following syntaxes:
+     *
+     * add(Sabre_VObject_Parameter $element)
+     * add(string $name, $value)
+     *
+     * The first version adds an Parameter
+     * The second adds a property as a string.
+     *
+     * @param mixed $item
+     * @param mixed $itemValue
+     * @return void
+     */
+    public function add($item, $itemValue = null) {
+
+        if ($item instanceof Sabre_VObject_Parameter) {
+            if (!is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
+            }
+            $item->parent = $this;
+            $this->parameters[] = $item;
+        } elseif(is_string($item)) {
+
+            if (!is_scalar($itemValue) && !is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must be scalar');
+            }
+            $parameter = new Sabre_VObject_Parameter($item,$itemValue);
+            $parameter->parent = $this;
+            $this->parameters[] = $parameter;
+
+        } else {
+
+            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
+
+        }
+
+    }
+
+    /* ArrayAccess interface {{{ */
+
+    /**
+     * Checks if an array element exists
+     *
+     * @param mixed $name
+     * @return bool
+     */
+    public function offsetExists($name) {
+
+        if (is_int($name)) return parent::offsetExists($name);
+
+        $name = strtoupper($name);
+
+        foreach($this->parameters as $parameter) {
+            if ($parameter->name == $name) return true;
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a parameter, or parameter list.
+     *
+     * @param string $name
+     * @return Sabre_VObject_Element
+     */
+    public function offsetGet($name) {
+
+        if (is_int($name)) return parent::offsetGet($name);
+        $name = strtoupper($name);
+
+        $result = array();
+        foreach($this->parameters as $parameter) {
+            if ($parameter->name == $name)
+                $result[] = $parameter;
+        }
+
+        if (count($result)===0) {
+            return null;
+        } elseif (count($result)===1) {
+            return $result[0];
+        } else {
+            $result[0]->setIterator(new Sabre_VObject_ElementList($result));
+            return $result[0];
+        }
+
+    }
+
+    /**
+     * Creates a new parameter
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($name, $value) {
+
+        if (is_int($name)) return parent::offsetSet($name, $value);
+
+        if (is_scalar($value)) {
+            if (!is_string($name))
+                throw new InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
+
+            $this->offsetUnset($name);
+            $parameter = new Sabre_VObject_Parameter($name, $value);
+            $parameter->parent = $this;
+            $this->parameters[] = $parameter;
+
+        } elseif ($value instanceof Sabre_VObject_Parameter) {
+            if (!is_null($name))
+                throw new InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a Sabre_VObject_Parameter. Add using $array[]=$parameterObject.');
+
+            $value->parent = $this;
+            $this->parameters[] = $value;
+        } else {
+            throw new InvalidArgumentException('You can only add parameters to the property object');
+        }
+
+    }
+
+    /**
+     * Removes one or more parameters with the specified name
+     *
+     * @param string $name
+     * @return void
+     */
+    public function offsetUnset($name) {
+
+        if (is_int($name)) return parent::offsetUnset($name);
+        $name = strtoupper($name);
+
+        foreach($this->parameters as $key=>$parameter) {
+            if ($parameter->name == $name) {
+                $parameter->parent = null;
+                unset($this->parameters[$key]);
+            }
+
+        }
+
+    }
+
+    /* }}} */
+
+    /**
+     * Called when this object is being cast to a string
+     *
+     * @return string
+     */
+    public function __toString() {
+
+        return (string)$this->value;
+
+    }
+
+    /**
+     * This method is automatically called when the object is cloned.
+     * Specifically, this will ensure all child elements are also cloned.
+     *
+     * @return void
+     */
+    public function __clone() {
+
+        foreach($this->parameters as $key=>$child) {
+            $this->parameters[$key] = clone $child;
+            $this->parameters[$key]->parent = $this;
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Property/DateTime.php b/3rdparty/Sabre/VObject/Property/DateTime.php
new file mode 100755
index 0000000000..fe2372caa8
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property/DateTime.php
@@ -0,0 +1,260 @@
+<?php
+
+/**
+ * DateTime property
+ *
+ * This element is used for iCalendar properties such as the DTSTART property.
+ * It basically provides a few helper functions that make it easier to deal
+ * with these. It supports both DATE-TIME and DATE values.
+ *
+ * In order to use this correctly, you must call setDateTime and getDateTime to
+ * retrieve and modify dates respectively.
+ *
+ * If you use the 'value' or properties directly, this object does not keep
+ * reference and results might appear incorrectly.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property_DateTime extends Sabre_VObject_Property {
+
+    /**
+     * Local 'floating' time
+     */
+    const LOCAL = 1;
+
+    /**
+     * UTC-based time
+     */
+    const UTC = 2;
+
+    /**
+     * Local time plus timezone
+     */
+    const LOCALTZ = 3;
+
+    /**
+     * Only a date, time is ignored
+     */
+    const DATE = 4;
+
+    /**
+     * DateTime representation
+     *
+     * @var DateTime
+     */
+    protected $dateTime;
+
+    /**
+     * dateType
+     *
+     * @var int
+     */
+    protected $dateType;
+
+    /**
+     * Updates the Date and Time.
+     *
+     * @param DateTime $dt
+     * @param int $dateType
+     * @return void
+     */
+    public function setDateTime(DateTime $dt, $dateType = self::LOCALTZ) {
+
+        switch($dateType) {
+
+            case self::LOCAL :
+                $this->setValue($dt->format('Ymd\\THis'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case self::UTC :
+                $dt->setTimeZone(new DateTimeZone('UTC'));
+                $this->setValue($dt->format('Ymd\\THis\\Z'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case self::LOCALTZ :
+                $this->setValue($dt->format('Ymd\\THis'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
+                break;
+            case self::DATE :
+                $this->setValue($dt->format('Ymd'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE');
+                break;
+            default :
+                throw new InvalidArgumentException('You must pass a valid dateType constant');
+
+        }
+        $this->dateTime = $dt;
+        $this->dateType = $dateType;
+
+    }
+
+    /**
+     * Returns the current DateTime value.
+     *
+     * If no value was set, this method returns null.
+     *
+     * @return DateTime|null
+     */
+    public function getDateTime() {
+
+        if ($this->dateTime)
+            return $this->dateTime;
+
+        list(
+            $this->dateType,
+            $this->dateTime
+        ) = self::parseData($this->value, $this);
+        return $this->dateTime;
+
+    }
+
+    /**
+     * Returns the type of Date format.
+     *
+     * This method returns one of the format constants. If no date was set,
+     * this method will return null.
+     *
+     * @return int|null
+     */
+    public function getDateType() {
+
+        if ($this->dateType)
+            return $this->dateType;
+
+        list(
+            $this->dateType,
+            $this->dateTime,
+        ) = self::parseData($this->value, $this);
+        return $this->dateType;
+
+    }
+
+    /**
+     * Parses the internal data structure to figure out what the current date
+     * and time is.
+     *
+     * The returned array contains two elements:
+     *   1. A 'DateType' constant (as defined on this class), or null.
+     *   2. A DateTime object (or null)
+     *
+     * @param string|null $propertyValue The string to parse (yymmdd or
+     *                                   ymmddThhmmss, etc..)
+     * @param Sabre_VObject_Property|null $property The instance of the
+     *                                              property we're parsing.
+     * @return array
+     */
+    static public function parseData($propertyValue, Sabre_VObject_Property $property = null) {
+
+        if (is_null($propertyValue)) {
+            return array(null, null);
+        }
+
+        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
+        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
+        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
+
+        if (!preg_match($regex, $propertyValue, $matches)) {
+            throw new InvalidArgumentException($propertyValue . ' is not a valid DateTime or Date string');
+        }
+
+        if (!isset($matches['hour'])) {
+            // Date-only
+            return array(
+                self::DATE,
+                new DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00'),
+            );
+        }
+
+        $dateStr =
+            $matches['year'] .'-' .
+            $matches['month'] . '-' .
+            $matches['date'] . ' ' .
+            $matches['hour'] . ':' .
+            $matches['minute'] . ':' .
+            $matches['second'];
+
+        if (isset($matches['isutc'])) {
+            $dt = new DateTime($dateStr,new DateTimeZone('UTC'));
+            $dt->setTimeZone(new DateTimeZone('UTC'));
+            return array(
+                self::UTC,
+                $dt
+            );
+        }
+
+        // Finding the timezone.
+        $tzid = $property['TZID'];
+        if (!$tzid) {
+            return array(
+                self::LOCAL,
+                new DateTime($dateStr)
+            );
+        }
+
+        try {
+            // tzid an Olson identifier?
+            $tz = new DateTimeZone($tzid->value);
+        } catch (Exception $e) {
+
+            // Not an Olson id, we're going to try to find the information 
+            // through the time zone name map.
+            $newtzid = Sabre_VObject_WindowsTimezoneMap::lookup($tzid->value);
+            if (is_null($newtzid)) {
+
+                // Not a well known time zone name either, we're going to try 
+                // to find the information through the VTIMEZONE object.
+
+                // First we find the root object
+                $root = $property;
+                while($root->parent) {
+                    $root = $root->parent;
+                }
+
+                if (isset($root->VTIMEZONE)) {
+                    foreach($root->VTIMEZONE as $vtimezone) {
+                        if (((string)$vtimezone->TZID) == $tzid) {
+                            if (isset($vtimezone->{'X-LIC-LOCATION'})) {
+                                $newtzid = (string)$vtimezone->{'X-LIC-LOCATION'};
+                            } else {
+                                // No libical location specified. As a last resort we could 
+                                // try matching $vtimezone's DST rules against all known 
+                                // time zones returned by DateTimeZone::list*
+
+                                // TODO
+                            }
+                        }
+                    }
+                }
+            }
+
+            try {
+                $tz = new DateTimeZone($newtzid);
+            } catch (Exception $e) {
+                // If all else fails, we use the default PHP timezone
+                $tz = new DateTimeZone(date_default_timezone_get()); 
+            }
+        }
+        $dt = new DateTime($dateStr, $tz);
+        $dt->setTimeZone($tz);
+
+        return array(
+            self::LOCALTZ,
+            $dt
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Property/MultiDateTime.php b/3rdparty/Sabre/VObject/Property/MultiDateTime.php
new file mode 100755
index 0000000000..ae53ab6a61
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property/MultiDateTime.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Multi-DateTime property
+ *
+ * This element is used for iCalendar properties such as the EXDATE property.
+ * It basically provides a few helper functions that make it easier to deal
+ * with these. It supports both DATE-TIME and DATE values.
+ *
+ * In order to use this correctly, you must call setDateTimes and getDateTimes
+ * to retrieve and modify dates respectively.
+ *
+ * If you use the 'value' or properties directly, this object does not keep
+ * reference and results might appear incorrectly.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property_MultiDateTime extends Sabre_VObject_Property {
+
+    /**
+     * DateTime representation
+     *
+     * @var DateTime[]
+     */
+    protected $dateTimes;
+
+    /**
+     * dateType
+     *
+     * This is one of the Sabre_VObject_Property_DateTime constants.
+     *
+     * @var int
+     */
+    protected $dateType;
+
+    /**
+     * Updates the value
+     *
+     * @param array $dt Must be an array of DateTime objects.
+     * @param int $dateType
+     * @return void
+     */
+    public function setDateTimes(array $dt, $dateType = Sabre_VObject_Property_DateTime::LOCALTZ) {
+
+        foreach($dt as $i)
+            if (!$i instanceof DateTime)
+                throw new InvalidArgumentException('You must pass an array of DateTime objects');
+
+        $this->offsetUnset('VALUE');
+        $this->offsetUnset('TZID');
+        switch($dateType) {
+
+            case Sabre_VObject_Property_DateTime::LOCAL :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd\\THis');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case Sabre_VObject_Property_DateTime::UTC :
+                $val = array();
+                foreach($dt as $i) {
+                    $i->setTimeZone(new DateTimeZone('UTC'));
+                    $val[] = $i->format('Ymd\\THis\\Z');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case Sabre_VObject_Property_DateTime::LOCALTZ :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd\\THis');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
+                break;
+            case Sabre_VObject_Property_DateTime::DATE :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE');
+                break;
+            default :
+                throw new InvalidArgumentException('You must pass a valid dateType constant');
+
+        }
+        $this->dateTimes = $dt;
+        $this->dateType = $dateType;
+
+    }
+
+    /**
+     * Returns the current DateTime value.
+     *
+     * If no value was set, this method returns null.
+     *
+     * @return array|null
+     */
+    public function getDateTimes() {
+
+        if ($this->dateTimes)
+            return $this->dateTimes;
+
+        $dts = array();
+
+        if (!$this->value) {
+            $this->dateTimes = null;
+            $this->dateType = null;
+            return null;
+        }
+
+        foreach(explode(',',$this->value) as $val) {
+            list(
+                $type,
+                $dt
+            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
+            $dts[] = $dt;
+            $this->dateType = $type;
+        }
+        $this->dateTimes = $dts;
+        return $this->dateTimes;
+
+    }
+
+    /**
+     * Returns the type of Date format.
+     *
+     * This method returns one of the format constants. If no date was set,
+     * this method will return null.
+     *
+     * @return int|null
+     */
+    public function getDateType() {
+
+        if ($this->dateType)
+            return $this->dateType;
+
+        if (!$this->value) {
+            $this->dateTimes = null;
+            $this->dateType = null;
+            return null;
+        }
+
+        $dts = array();
+        foreach(explode(',',$this->value) as $val) {
+            list(
+                $type,
+                $dt
+            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
+            $dts[] = $dt;
+            $this->dateType = $type;
+        }
+        $this->dateTimes = $dts;
+        return $this->dateType;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Reader.php b/3rdparty/Sabre/VObject/Reader.php
new file mode 100755
index 0000000000..eea73fa3dc
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Reader.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * VCALENDAR/VCARD reader
+ *
+ * This class reads the vobject file, and returns a full element tree.
+ *
+ * TODO: this class currently completely works 'statically'. This is pointless,
+ * and defeats OOP principals. Needs refactoring in a future version.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Reader {
+
+    /**
+     * Parses the file and returns the top component
+     *
+     * @param string $data
+     * @return Sabre_VObject_Element
+     */
+    static function read($data) {
+
+        // Normalizing newlines
+        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
+
+        $lines = explode("\n", $data);
+
+        // Unfolding lines
+        $lines2 = array();
+        foreach($lines as $line) {
+
+            // Skipping empty lines
+            if (!$line) continue;
+
+            if ($line[0]===" " || $line[0]==="\t") {
+                $lines2[count($lines2)-1].=substr($line,1);
+            } else {
+                $lines2[] = $line;
+            }
+
+        }
+
+        unset($lines);
+
+        reset($lines2);
+
+        return self::readLine($lines2);
+
+    }
+
+    /**
+     * Reads and parses a single line.
+     *
+     * This method receives the full array of lines. The array pointer is used
+     * to traverse.
+     *
+     * @param array $lines
+     * @return Sabre_VObject_Element
+     */
+    static private function readLine(&$lines) {
+
+        $line = current($lines);
+        $lineNr = key($lines);
+        next($lines);
+
+        // Components
+        if (stripos($line,"BEGIN:")===0) {
+
+            $componentName = strtoupper(substr($line,6));
+            $obj = Sabre_VObject_Component::create($componentName);
+
+            $nextLine = current($lines);
+
+            while(stripos($nextLine,"END:")!==0) {
+
+                $obj->add(self::readLine($lines));
+
+                $nextLine = current($lines);
+
+                if ($nextLine===false)
+                    throw new Sabre_VObject_ParseException('Invalid VObject. Document ended prematurely.');
+
+            }
+
+            // Checking component name of the 'END:' line.
+            if (substr($nextLine,4)!==$obj->name) {
+                throw new Sabre_VObject_ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
+            }
+            next($lines);
+
+            return $obj;
+
+        }
+
+        // Properties
+        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
+
+
+        $token = '[A-Z0-9-\.]+';
+        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
+        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
+
+        $result = preg_match($regex,$line,$matches);
+
+        if (!$result) {
+            throw new Sabre_VObject_ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
+        }
+
+        $propertyName = strtoupper($matches['name']);
+        $propertyValue = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
+            if ($matches[2]==='n' || $matches[2]==='N') {
+                return "\n";
+            } else {
+                return $matches[2];
+            }
+        }, $matches['value']);
+
+        $obj = Sabre_VObject_Property::create($propertyName, $propertyValue);
+
+        if ($matches['parameters']) {
+
+            foreach(self::readParameters($matches['parameters']) as $param) {
+                $obj->add($param);
+            }
+
+        }
+
+        return $obj;
+
+
+    }
+
+    /**
+     * Reads a parameter list from a property
+     *
+     * This method returns an array of Sabre_VObject_Parameter
+     *
+     * @param string $parameters
+     * @return array
+     */
+    static private function readParameters($parameters) {
+
+        $token = '[A-Z0-9-]+';
+
+        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
+
+        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
+        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
+
+        $params = array();
+        foreach($matches as $match) {
+
+            $value = isset($match['paramValue'])?$match['paramValue']:null;
+
+            if (isset($value[0])) {
+                // Stripping quotes, if needed
+                if ($value[0] === '"') $value = substr($value,1,strlen($value)-2);
+            } else {
+                $value = '';
+            }
+
+            $value = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
+                if ($matches[2]==='n' || $matches[2]==='N') {
+                    return "\n";
+                } else {
+                    return $matches[2];
+                }
+            }, $value);
+
+            $params[] = new Sabre_VObject_Parameter($match['paramName'], $value);
+
+        }
+
+        return $params;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/VObject/RecurrenceIterator.php b/3rdparty/Sabre/VObject/RecurrenceIterator.php
new file mode 100755
index 0000000000..833aa091ab
--- /dev/null
+++ b/3rdparty/Sabre/VObject/RecurrenceIterator.php
@@ -0,0 +1,1009 @@
+<?php
+
+/**
+ * This class is used to determine new for a recurring event, when the next
+ * events occur.
+ *
+ * This iterator may loop infinitely in the future, therefore it is important
+ * that if you use this class, you set hard limits for the amount of iterations
+ * you want to handle.
+ *
+ * Note that currently there is not full support for the entire iCalendar
+ * specification, as it's very complex and contains a lot of permutations
+ * that's not yet used very often in software.
+ *
+ * For the focus has been on features as they actually appear in Calendaring
+ * software, but this may well get expanded as needed / on demand
+ *
+ * The following RRULE properties are supported
+ *   * UNTIL
+ *   * INTERVAL
+ *   * COUNT
+ *   * FREQ=DAILY
+ *     * BYDAY
+ *   * FREQ=WEEKLY
+ *     * BYDAY
+ *     * WKST
+ *   * FREQ=MONTHLY
+ *     * BYMONTHDAY
+ *     * BYDAY
+ *     * BYSETPOS
+ *   * FREQ=YEARLY
+ *     * BYMONTH
+ *     * BYMONTHDAY (only if BYMONTH is also set)
+ *     * BYDAY (only if BYMONTH is also set)
+ *
+ * Anything beyond this is 'undefined', which means that it may get ignored, or
+ * you may get unexpected results. The effect is that in some applications the
+ * specified recurrence may look incorrect, or is missing.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_RecurrenceIterator implements Iterator {
+
+    /**
+     * The initial event date
+     *
+     * @var DateTime
+     */
+    public $startDate;
+
+    /**
+     * The end-date of the initial event
+     *
+     * @var DateTime
+     */
+    public $endDate;
+
+    /**
+     * The 'current' recurrence.
+     *
+     * This will be increased for every iteration.
+     *
+     * @var DateTime
+     */
+    public $currentDate;
+
+
+    /**
+     * List of dates that are excluded from the rules.
+     *
+     * This list contains the items that have been overriden by the EXDATE
+     * property.
+     *
+     * @var array
+     */
+    public $exceptionDates = array();
+
+    /**
+     * Base event
+     *
+     * @var Sabre_VObject_Component_VEvent
+     */
+    public $baseEvent;
+
+    /**
+     * List of dates that are overridden by other events.
+     * Similar to $overriddenEvents, but this just contains the original dates.
+     *
+     * @var array
+     */
+    public $overriddenDates = array();
+
+    /**
+     * list of events that are 'overridden'.
+     *
+     * This is an array of Sabre_VObject_Component_VEvent objects.
+     *
+     * @var array
+     */
+    public $overriddenEvents = array();
+
+
+    /**
+     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
+     * yearly.
+     *
+     * @var string
+     */
+    public $frequency;
+
+    /**
+     * The last instance of this recurrence, inclusively
+     *
+     * @var DateTime|null
+     */
+    public $until;
+
+    /**
+     * The number of recurrences, or 'null' if infinitely recurring.
+     *
+     * @var int
+     */
+    public $count;
+
+    /**
+     * The interval.
+     *
+     * If for example frequency is set to daily, interval = 2 would mean every
+     * 2 days.
+     *
+     * @var int
+     */
+    public $interval = 1;
+
+    /**
+     * Which seconds to recur.
+     *
+     * This is an array of integers (between 0 and 60)
+     *
+     * @var array
+     */
+    public $bySecond;
+
+    /**
+     * Which minutes to recur
+     *
+     * This is an array of integers (between 0 and 59)
+     *
+     * @var array
+     */
+    public $byMinute;
+
+    /**
+     * Which hours to recur
+     *
+     * This is an array of integers (between 0 and 23)
+     *
+     * @var array
+     */
+    public $byHour;
+
+    /**
+     * Which weekdays to recur.
+     *
+     * This is an array of weekdays
+     *
+     * This may also be preceeded by a positive or negative integer. If present,
+     * this indicates the nth occurrence of a specific day within the monthly or
+     * yearly rrule. For instance, -2TU indicates the second-last tuesday of
+     * the month, or year.
+     *
+     * @var array
+     */
+    public $byDay;
+
+    /**
+     * Which days of the month to recur
+     *
+     * This is an array of days of the months (1-31). The value can also be
+     * negative. -5 for instance means the 5th last day of the month.
+     *
+     * @var array
+     */
+    public $byMonthDay;
+
+    /**
+     * Which days of the year to recur.
+     *
+     * This is an array with days of the year (1 to 366). The values can also
+     * be negative. For instance, -1 will always represent the last day of the
+     * year. (December 31st).
+     *
+     * @var array
+     */
+    public $byYearDay;
+
+    /**
+     * Which week numbers to recur.
+     *
+     * This is an array of integers from 1 to 53. The values can also be
+     * negative. -1 will always refer to the last week of the year.
+     *
+     * @var array
+     */
+    public $byWeekNo;
+
+    /**
+     * Which months to recur
+     *
+     * This is an array of integers from 1 to 12.
+     *
+     * @var array
+     */
+    public $byMonth;
+
+    /**
+     * Which items in an existing st to recur.
+     *
+     * These numbers work together with an existing by* rule. It specifies
+     * exactly which items of the existing by-rule to filter.
+     *
+     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
+     * used to recur the last workday of the month.
+     *
+     * This would be done by setting frequency to 'monthly', byDay to
+     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
+     *
+     * @var array
+     */
+    public $bySetPos;
+
+    /**
+     * When a week starts
+     *
+     * @var string
+     */
+    public $weekStart = 'MO';
+
+    /**
+     * The current item in the list
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Simple mapping from iCalendar day names to day numbers
+     *
+     * @var array
+     */
+    private $dayMap = array(
+        'SU' => 0,
+        'MO' => 1,
+        'TU' => 2,
+        'WE' => 3,
+        'TH' => 4,
+        'FR' => 5,
+        'SA' => 6,
+    );
+
+    /**
+     * Mappings between the day number and english day name.
+     *
+     * @var array
+     */
+    private $dayNames = array(
+        0 => 'Sunday',
+        1 => 'Monday',
+        2 => 'Tuesday',
+        3 => 'Wednesday',
+        4 => 'Thursday',
+        5 => 'Friday',
+        6 => 'Saturday',
+    );
+
+    /**
+     * If the current iteration of the event is an overriden event, this
+     * property will hold the VObject
+     *
+     * @var Sabre_Component_VObject
+     */
+    private $currentOverriddenEvent;
+
+    /**
+     * This property may contain the date of the next not-overridden event.
+     * This date is calculated sometimes a bit early, before overridden events
+     * are evaluated.
+     *
+     * @var DateTime
+     */
+    private $nextDate;
+
+    /**
+     * Creates the iterator
+     *
+     * You should pass a VCALENDAR component, as well as the UID of the event
+     * we're going to traverse.
+     *
+     * @param Sabre_VObject_Component $vcal
+     * @param string|null $uid
+     */
+    public function __construct(Sabre_VObject_Component $vcal, $uid=null) {
+
+        if (is_null($uid)) {
+            if ($vcal->name === 'VCALENDAR') {
+                throw new InvalidArgumentException('If you pass a VCALENDAR object, you must pass a uid argument as well');
+            }
+            $components = array($vcal);
+            $uid = (string)$vcal->uid;
+        } else {
+            $components = $vcal->select('VEVENT');
+        }
+        foreach($components as $component) {
+            if ((string)$component->uid == $uid) {
+                if (isset($component->{'RECURRENCE-ID'})) {
+                    $this->overriddenEvents[$component->DTSTART->getDateTime()->getTimeStamp()] = $component;
+                    $this->overriddenDates[] = $component->{'RECURRENCE-ID'}->getDateTime();
+                } else {
+                    $this->baseEvent = $component;
+                }
+            }
+        }
+        if (!$this->baseEvent) {
+            throw new InvalidArgumentException('Could not find a base event with uid: ' . $uid);
+        }
+
+        $this->startDate = clone $this->baseEvent->DTSTART->getDateTime();
+
+        $this->endDate = null;
+        if (isset($this->baseEvent->DTEND)) {
+            $this->endDate = clone $this->baseEvent->DTEND->getDateTime();
+        } else {
+            $this->endDate = clone $this->startDate;
+            if (isset($this->baseEvent->DURATION)) {
+                $this->endDate->add(Sabre_VObject_DateTimeParser::parse($this->baseEvent->DURATION->value));
+            }
+        }
+        $this->currentDate = clone $this->startDate;
+
+        $rrule = (string)$this->baseEvent->RRULE;
+
+        $parts = explode(';', $rrule);
+
+        foreach($parts as $part) {
+
+            list($key, $value) = explode('=', $part, 2);
+
+            switch(strtoupper($key)) {
+
+                case 'FREQ' :
+                    if (!in_array(
+                        strtolower($value),
+                        array('secondly','minutely','hourly','daily','weekly','monthly','yearly')
+                    )) {
+                        throw new InvalidArgumentException('Unknown value for FREQ=' . strtoupper($value));
+
+                    }
+                    $this->frequency = strtolower($value);
+                    break;
+
+                case 'UNTIL' :
+                    $this->until = Sabre_VObject_DateTimeParser::parse($value);
+                    break;
+
+                case 'COUNT' :
+                    $this->count = (int)$value;
+                    break;
+
+                case 'INTERVAL' :
+                    $this->interval = (int)$value;
+                    break;
+
+                case 'BYSECOND' :
+                    $this->bySecond = explode(',', $value);
+                    break;
+
+                case 'BYMINUTE' :
+                    $this->byMinute = explode(',', $value);
+                    break;
+
+                case 'BYHOUR' :
+                    $this->byHour = explode(',', $value);
+                    break;
+
+                case 'BYDAY' :
+                    $this->byDay = explode(',', strtoupper($value));
+                    break;
+
+                case 'BYMONTHDAY' :
+                    $this->byMonthDay = explode(',', $value);
+                    break;
+
+                case 'BYYEARDAY' :
+                    $this->byYearDay = explode(',', $value);
+                    break;
+
+                case 'BYWEEKNO' :
+                    $this->byWeekNo = explode(',', $value);
+                    break;
+
+                case 'BYMONTH' :
+                    $this->byMonth = explode(',', $value);
+                    break;
+
+                case 'BYSETPOS' :
+                    $this->bySetPos = explode(',', $value);
+                    break;
+
+                case 'WKST' :
+                    $this->weekStart = strtoupper($value);
+                    break;
+
+            }
+
+        }
+
+        // Parsing exception dates
+        if (isset($this->baseEvent->EXDATE)) {
+            foreach($this->baseEvent->EXDATE as $exDate) {
+
+                foreach(explode(',', (string)$exDate) as $exceptionDate) {
+
+                    $this->exceptionDates[] =
+                        Sabre_VObject_DateTimeParser::parse($exceptionDate, $this->startDate->getTimeZone());
+
+                }
+
+            }
+
+        }
+
+    }
+
+    /**
+     * Returns the current item in the list
+     *
+     * @return DateTime
+     */
+    public function current() {
+
+        if (!$this->valid()) return null;
+        return clone $this->currentDate;
+
+    }
+
+    /**
+     * This method returns the startdate for the current iteration of the
+     * event.
+     *
+     * @return DateTime
+     */
+    public function getDtStart() {
+
+        if (!$this->valid()) return null;
+        return clone $this->currentDate;
+
+    }
+
+    /**
+     * This method returns the enddate for the current iteration of the
+     * event.
+     *
+     * @return DateTime
+     */
+    public function getDtEnd() {
+
+        if (!$this->valid()) return null;
+        $dtEnd = clone $this->currentDate;
+        $dtEnd->add( $this->startDate->diff( $this->endDate ) );
+        return clone $dtEnd;
+
+    }
+
+    /**
+     * Returns a VEVENT object with the updated start and end date.
+     *
+     * Any recurrence information is removed, and this function may return an
+     * 'overridden' event instead.
+     *
+     * This method always returns a cloned instance.
+     *
+     * @return void
+     */
+    public function getEventObject() {
+
+        if ($this->currentOverriddenEvent) {
+            return clone $this->currentOverriddenEvent;
+        }
+        $event = clone $this->baseEvent;
+        unset($event->RRULE);
+        unset($event->EXDATE);
+        unset($event->RDATE);
+        unset($event->EXRULE);
+
+        $event->DTSTART->setDateTime($this->getDTStart(), $event->DTSTART->getDateType());
+        if (isset($event->DTEND)) {
+            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTSTART->getDateType());
+        }
+        if ($this->counter > 0) {
+            $event->{'RECURRENCE-ID'} = (string)$event->DTSTART;
+        }
+
+        return $event;
+
+    }
+
+    /**
+     * Returns the current item number
+     *
+     * @return int
+     */
+    public function key() {
+
+        return $this->counter;
+
+    }
+
+    /**
+     * Whether or not there is a 'next item'
+     *
+     * @return bool
+     */
+    public function valid() {
+
+        if (!is_null($this->count)) {
+            return $this->counter < $this->count;
+        }
+        if (!is_null($this->until)) {
+            return $this->currentDate <= $this->until;
+        }
+        return true;
+
+    }
+
+    /**
+     * Resets the iterator
+     *
+     * @return void
+     */
+    public function rewind() {
+
+        $this->currentDate = clone $this->startDate;
+        $this->counter = 0;
+
+    }
+
+    /**
+     * This method allows you to quickly go to the next occurrence after the
+     * specified date.
+     *
+     * Note that this checks the current 'endDate', not the 'stardDate'. This
+     * means that if you forward to January 1st, the iterator will stop at the
+     * first event that ends *after* January 1st.
+     *
+     * @param DateTime $dt
+     * @return void
+     */
+    public function fastForward(DateTime $dt) {
+
+        while($this->valid() && $this->getDTEnd() < $dt) {
+            $this->next();
+        }
+
+    }
+
+    /**
+     * Goes on to the next iteration
+     *
+     * @return void
+     */
+    public function next() {
+
+        /*
+        if (!is_null($this->count) && $this->counter >= $this->count) {
+            $this->currentDate = null;
+        }*/
+
+
+        $previousStamp = $this->currentDate->getTimeStamp();
+
+        while(true) {
+
+            $this->currentOverriddenEvent = null;
+
+            // If we have a next date 'stored', we use that
+            if ($this->nextDate) {
+                $this->currentDate = $this->nextDate;
+                $currentStamp = $this->currentDate->getTimeStamp();
+                $this->nextDate = null;
+            } else {
+
+                // Otherwise, we calculate it
+                switch($this->frequency) {
+
+                    case 'daily' :
+                        $this->nextDaily();
+                        break;
+
+                    case 'weekly' :
+                        $this->nextWeekly();
+                        break;
+
+                    case 'monthly' :
+                        $this->nextMonthly();
+                        break;
+
+                    case 'yearly' :
+                        $this->nextYearly();
+                        break;
+
+                }
+                $currentStamp = $this->currentDate->getTimeStamp();
+
+                // Checking exception dates
+                foreach($this->exceptionDates as $exceptionDate) {
+                    if ($this->currentDate == $exceptionDate) {
+                        $this->counter++;
+                        continue 2;
+                    }
+                }
+                foreach($this->overriddenDates as $overriddenDate) {
+                    if ($this->currentDate == $overriddenDate) {
+                        continue 2;
+                    }
+                }
+
+            }
+
+            // Checking overriden events
+            foreach($this->overriddenEvents as $index=>$event) {
+                if ($index > $previousStamp && $index <= $currentStamp) {
+
+                    // We're moving the 'next date' aside, for later use.
+                    $this->nextDate = clone $this->currentDate;
+
+                    $this->currentDate = $event->DTSTART->getDateTime();
+                    $this->currentOverriddenEvent = $event;
+
+                    break;
+                }
+            }
+
+            break;
+
+        }
+
+        /*
+        if (!is_null($this->until)) {
+            if($this->currentDate > $this->until) {
+                $this->currentDate = null;
+            }
+        }*/
+
+        $this->counter++;
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for daily frequency.
+     *
+     * @return void
+     */
+    protected function nextDaily() {
+
+        if (!$this->byDay) {
+            $this->currentDate->modify('+' . $this->interval . ' days');
+            return;
+        }
+
+        $recurrenceDays = array();
+        foreach($this->byDay as $byDay) {
+
+            // The day may be preceeded with a positive (+n) or
+            // negative (-n) integer. However, this does not make
+            // sense in 'weekly' so we ignore it here.
+            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
+
+        }
+
+        do {
+
+            $this->currentDate->modify('+' . $this->interval . ' days');
+
+            // Current day of the week
+            $currentDay = $this->currentDate->format('w');
+
+        } while (!in_array($currentDay, $recurrenceDays));
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for weekly frequency.
+     *
+     * @return void
+     */
+    protected function nextWeekly() {
+
+        if (!$this->byDay) {
+            $this->currentDate->modify('+' . $this->interval . ' weeks');
+            return;
+        }
+
+        $recurrenceDays = array();
+        foreach($this->byDay as $byDay) {
+
+            // The day may be preceeded with a positive (+n) or
+            // negative (-n) integer. However, this does not make
+            // sense in 'weekly' so we ignore it here.
+            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
+
+        }
+
+        // Current day of the week
+        $currentDay = $this->currentDate->format('w');
+
+        // First day of the week:
+        $firstDay = $this->dayMap[$this->weekStart];
+
+        $time = array(
+            $this->currentDate->format('H'),
+            $this->currentDate->format('i'),
+            $this->currentDate->format('s')
+        );
+
+        // Increasing the 'current day' until we find our next
+        // occurrence.
+        while(true) {
+
+            $currentDay++;
+
+            if ($currentDay>6) {
+                $currentDay = 0;
+            }
+
+            // We need to roll over to the next week
+            if ($currentDay === $firstDay) {
+                $this->currentDate->modify('+' . $this->interval . ' weeks');
+
+                // We need to go to the first day of this week, but only if we
+                // are not already on this first day of this week.
+                if($this->currentDate->format('w') != $firstDay) {
+                    $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
+                    $this->currentDate->setTime($time[0],$time[1],$time[2]);
+                }
+            }
+
+            // We have a match
+            if (in_array($currentDay ,$recurrenceDays)) {
+                $this->currentDate->modify($this->dayNames[$currentDay]);
+                $this->currentDate->setTime($time[0],$time[1],$time[2]);
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for monthly frequency.
+     *
+     * @return void
+     */
+    protected function nextMonthly() {
+
+        $currentDayOfMonth = $this->currentDate->format('j');
+        if (!$this->byMonthDay && !$this->byDay) {
+
+            // If the current day is higher than the 28th, rollover can
+            // occur to the next month. We Must skip these invalid
+            // entries.
+            if ($currentDayOfMonth < 29) {
+                $this->currentDate->modify('+' . $this->interval . ' months');
+            } else {
+                $increase = 0;
+                do {
+                    $increase++;
+                    $tempDate = clone $this->currentDate;
+                    $tempDate->modify('+ ' . ($this->interval*$increase) . ' months');
+                } while ($tempDate->format('j') != $currentDayOfMonth);
+                $this->currentDate = $tempDate;
+            }
+            return;
+        }
+
+        while(true) {
+
+            $occurrences = $this->getMonthlyOccurrences();
+
+            foreach($occurrences as $occurrence) {
+
+                // The first occurrence thats higher than the current
+                // day of the month wins.
+                if ($occurrence > $currentDayOfMonth) {
+                    break 2;
+                }
+
+            }
+
+            // If we made it all the way here, it means there were no
+            // valid occurrences, and we need to advance to the next
+            // month.
+            $this->currentDate->modify('first day of this month');
+            $this->currentDate->modify('+ ' . $this->interval . ' months');
+
+            // This goes to 0 because we need to start counting at hte
+            // beginning.
+            $currentDayOfMonth = 0;
+
+        }
+
+        $this->currentDate->setDate($this->currentDate->format('Y'), $this->currentDate->format('n'), $occurrence);
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for yearly frequency.
+     *
+     * @return void
+     */
+    protected function nextYearly() {
+
+        if (!$this->byMonth) {
+            $this->currentDate->modify('+' . $this->interval . ' years');
+            return;
+        }
+
+        $currentMonth = $this->currentDate->format('n');
+        $currentYear = $this->currentDate->format('Y');
+        $currentDayOfMonth = $this->currentDate->format('j');
+
+        $advancedToNewMonth = false;
+
+        // If we got a byDay or getMonthDay filter, we must first expand
+        // further.
+        if ($this->byDay || $this->byMonthDay) {
+
+            while(true) {
+
+                $occurrences = $this->getMonthlyOccurrences();
+
+                foreach($occurrences as $occurrence) {
+
+                    // The first occurrence that's higher than the current
+                    // day of the month wins.
+                    // If we advanced to the next month or year, the first
+                    // occurence is always correct.
+                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
+                        break 2;
+                    }
+
+                }
+
+                // If we made it here, it means we need to advance to
+                // the next month or year.
+                $currentDayOfMonth = 1;
+                $advancedToNewMonth = true;
+                do {
+
+                    $currentMonth++;
+                    if ($currentMonth>12) {
+                        $currentYear+=$this->interval;
+                        $currentMonth = 1;
+                    }
+                } while (!in_array($currentMonth, $this->byMonth));
+
+                $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+
+            }
+
+            // If we made it here, it means we got a valid occurrence
+            $this->currentDate->setDate($currentYear, $currentMonth, $occurrence);
+            return;
+
+        } else {
+
+            // no byDay or byMonthDay, so we can just loop through the
+            // months.
+            do {
+
+                $currentMonth++;
+                if ($currentMonth>12) {
+                    $currentYear+=$this->interval;
+                    $currentMonth = 1;
+                }
+            } while (!in_array($currentMonth, $this->byMonth));
+            $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+            return;
+
+        }
+
+    }
+
+    /**
+     * Returns all the occurrences for a monthly frequency with a 'byDay' or
+     * 'byMonthDay' expansion for the current month.
+     *
+     * The returned list is an array of integers with the day of month (1-31).
+     *
+     * @return array
+     */
+    protected function getMonthlyOccurrences() {
+
+        $startDate = clone $this->currentDate;
+
+        $byDayResults = array();
+
+        // Our strategy is to simply go through the byDays, advance the date to
+        // that point and add it to the results.
+        if ($this->byDay) foreach($this->byDay as $day) {
+
+            $dayName = $this->dayNames[$this->dayMap[substr($day,-2)]];
+
+            // Dayname will be something like 'wednesday'. Now we need to find
+            // all wednesdays in this month.
+            $dayHits = array();
+
+            $checkDate = clone $startDate;
+            $checkDate->modify('first day of this month');
+            $checkDate->modify($dayName);
+
+            do {
+                $dayHits[] = $checkDate->format('j');
+                $checkDate->modify('next ' . $dayName);
+            } while ($checkDate->format('n') === $startDate->format('n'));
+
+            // So now we have 'all wednesdays' for month. It is however
+            // possible that the user only really wanted the 1st, 2nd or last
+            // wednesday.
+            if (strlen($day)>2) {
+                $offset = (int)substr($day,0,-2);
+
+                if ($offset>0) {
+                    // It is possible that the day does not exist, such as a
+                    // 5th or 6th wednesday of the month.
+                    if (isset($dayHits[$offset-1])) {
+                        $byDayResults[] = $dayHits[$offset-1];
+                    }
+                } else {
+
+                    // if it was negative we count from the end of the array
+                    $byDayResults[] = $dayHits[count($dayHits) + $offset];
+                }
+            } else {
+                // There was no counter (first, second, last wednesdays), so we
+                // just need to add the all to the list).
+                $byDayResults = array_merge($byDayResults, $dayHits);
+
+            }
+
+        }
+
+        $byMonthDayResults = array();
+        if ($this->byMonthDay) foreach($this->byMonthDay as $monthDay) {
+
+            // Removing values that are out of range for this month
+            if ($monthDay > $startDate->format('t') ||
+                $monthDay < 0-$startDate->format('t')) {
+                    continue;
+            }
+            if ($monthDay>0) {
+                $byMonthDayResults[] = $monthDay;
+            } else {
+                // Negative values
+                $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
+            }
+        }
+
+        // If there was just byDay or just byMonthDay, they just specify our
+        // (almost) final list. If both were provided, then byDay limits the
+        // list.
+        if ($this->byMonthDay && $this->byDay) {
+            $result = array_intersect($byMonthDayResults, $byDayResults);
+        } elseif ($this->byMonthDay) {
+            $result = $byMonthDayResults;
+        } else {
+            $result = $byDayResults;
+        }
+        $result = array_unique($result);
+        sort($result, SORT_NUMERIC);
+
+        // The last thing that needs checking is the BYSETPOS. If it's set, it
+        // means only certain items in the set survive the filter.
+        if (!$this->bySetPos) {
+            return $result;
+        }
+
+        $filteredResult = array();
+        foreach($this->bySetPos as $setPos) {
+
+            if ($setPos<0) {
+                $setPos = count($result)-($setPos+1);
+            }
+            if (isset($result[$setPos-1])) {
+                $filteredResult[] = $result[$setPos-1];
+            }
+        }
+
+        sort($filteredResult, SORT_NUMERIC);
+        return $filteredResult;
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/VObject/Version.php b/3rdparty/Sabre/VObject/Version.php
new file mode 100755
index 0000000000..2617c7b129
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the version number for the VObject package
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.3.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/VObject/WindowsTimezoneMap.php b/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
new file mode 100755
index 0000000000..5e1cc5d479
--- /dev/null
+++ b/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Time zone name translation
+ *
+ * This file translates well-known time zone names into "Olson database" time zone names.
+ *
+ * @package Sabre
+ * @subpackage VObject 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Frank Edelhaeuser (fedel@users.sourceforge.net) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_WindowsTimezoneMap {
+
+    protected static $map = array(
+
+        // from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
+        // snapshot taken on 2012/01/16
+
+        // windows
+        'AUS Central Standard Time'=>'Australia/Darwin',
+        'AUS Eastern Standard Time'=>'Australia/Sydney',
+        'Afghanistan Standard Time'=>'Asia/Kabul',
+        'Alaskan Standard Time'=>'America/Anchorage',
+        'Arab Standard Time'=>'Asia/Riyadh',
+        'Arabian Standard Time'=>'Asia/Dubai',
+        'Arabic Standard Time'=>'Asia/Baghdad',
+        'Argentina Standard Time'=>'America/Buenos_Aires',
+        'Armenian Standard Time'=>'Asia/Yerevan',
+        'Atlantic Standard Time'=>'America/Halifax',
+        'Azerbaijan Standard Time'=>'Asia/Baku',
+        'Azores Standard Time'=>'Atlantic/Azores',
+        'Bangladesh Standard Time'=>'Asia/Dhaka',
+        'Canada Central Standard Time'=>'America/Regina',
+        'Cape Verde Standard Time'=>'Atlantic/Cape_Verde',
+        'Caucasus Standard Time'=>'Asia/Yerevan',
+        'Cen. Australia Standard Time'=>'Australia/Adelaide',
+        'Central America Standard Time'=>'America/Guatemala',
+        'Central Asia Standard Time'=>'Asia/Almaty',
+        'Central Brazilian Standard Time'=>'America/Cuiaba',
+        'Central Europe Standard Time'=>'Europe/Budapest',
+        'Central European Standard Time'=>'Europe/Warsaw',
+        'Central Pacific Standard Time'=>'Pacific/Guadalcanal',
+        'Central Standard Time'=>'America/Chicago',
+        'Central Standard Time (Mexico)'=>'America/Mexico_City',
+        'China Standard Time'=>'Asia/Shanghai',
+        'Dateline Standard Time'=>'Etc/GMT+12',
+        'E. Africa Standard Time'=>'Africa/Nairobi',
+        'E. Australia Standard Time'=>'Australia/Brisbane',
+        'E. Europe Standard Time'=>'Europe/Minsk',
+        'E. South America Standard Time'=>'America/Sao_Paulo',
+        'Eastern Standard Time'=>'America/New_York',
+        'Egypt Standard Time'=>'Africa/Cairo',
+        'Ekaterinburg Standard Time'=>'Asia/Yekaterinburg',
+        'FLE Standard Time'=>'Europe/Kiev',
+        'Fiji Standard Time'=>'Pacific/Fiji',
+        'GMT Standard Time'=>'Europe/London',
+        'GTB Standard Time'=>'Europe/Istanbul',
+        'Georgian Standard Time'=>'Asia/Tbilisi',
+        'Greenland Standard Time'=>'America/Godthab',
+        'Greenwich Standard Time'=>'Atlantic/Reykjavik',
+        'Hawaiian Standard Time'=>'Pacific/Honolulu',
+        'India Standard Time'=>'Asia/Calcutta',
+        'Iran Standard Time'=>'Asia/Tehran',
+        'Israel Standard Time'=>'Asia/Jerusalem',
+        'Jordan Standard Time'=>'Asia/Amman',
+        'Kamchatka Standard Time'=>'Asia/Kamchatka',
+        'Korea Standard Time'=>'Asia/Seoul',
+        'Magadan Standard Time'=>'Asia/Magadan',
+        'Mauritius Standard Time'=>'Indian/Mauritius',
+        'Mexico Standard Time'=>'America/Mexico_City',
+        'Mexico Standard Time 2'=>'America/Chihuahua',
+        'Mid-Atlantic Standard Time'=>'Etc/GMT+2',
+        'Middle East Standard Time'=>'Asia/Beirut',
+        'Montevideo Standard Time'=>'America/Montevideo',
+        'Morocco Standard Time'=>'Africa/Casablanca',
+        'Mountain Standard Time'=>'America/Denver',
+        'Mountain Standard Time (Mexico)'=>'America/Chihuahua',
+        'Myanmar Standard Time'=>'Asia/Rangoon',
+        'N. Central Asia Standard Time'=>'Asia/Novosibirsk',
+        'Namibia Standard Time'=>'Africa/Windhoek',
+        'Nepal Standard Time'=>'Asia/Katmandu',
+        'New Zealand Standard Time'=>'Pacific/Auckland',
+        'Newfoundland Standard Time'=>'America/St_Johns',
+        'North Asia East Standard Time'=>'Asia/Irkutsk',
+        'North Asia Standard Time'=>'Asia/Krasnoyarsk',
+        'Pacific SA Standard Time'=>'America/Santiago',
+        'Pacific Standard Time'=>'America/Los_Angeles',
+        'Pacific Standard Time (Mexico)'=>'America/Santa_Isabel',
+        'Pakistan Standard Time'=>'Asia/Karachi',
+        'Paraguay Standard Time'=>'America/Asuncion',
+        'Romance Standard Time'=>'Europe/Paris',
+        'Russian Standard Time'=>'Europe/Moscow',
+        'SA Eastern Standard Time'=>'America/Cayenne',
+        'SA Pacific Standard Time'=>'America/Bogota',
+        'SA Western Standard Time'=>'America/La_Paz',
+        'SE Asia Standard Time'=>'Asia/Bangkok',
+        'Samoa Standard Time'=>'Pacific/Apia',
+        'Singapore Standard Time'=>'Asia/Singapore',
+        'South Africa Standard Time'=>'Africa/Johannesburg',
+        'Sri Lanka Standard Time'=>'Asia/Colombo',
+        'Syria Standard Time'=>'Asia/Damascus',
+        'Taipei Standard Time'=>'Asia/Taipei',
+        'Tasmania Standard Time'=>'Australia/Hobart',
+        'Tokyo Standard Time'=>'Asia/Tokyo',
+        'Tonga Standard Time'=>'Pacific/Tongatapu',
+        'US Eastern Standard Time'=>'America/Indianapolis',
+        'US Mountain Standard Time'=>'America/Phoenix',
+        'UTC'=>'Etc/GMT',
+        'UTC+12'=>'Etc/GMT-12',
+        'UTC-02'=>'Etc/GMT+2',
+        'UTC-11'=>'Etc/GMT+11',
+        'Ulaanbaatar Standard Time'=>'Asia/Ulaanbaatar',
+        'Venezuela Standard Time'=>'America/Caracas',
+        'Vladivostok Standard Time'=>'Asia/Vladivostok',
+        'W. Australia Standard Time'=>'Australia/Perth',
+        'W. Central Africa Standard Time'=>'Africa/Lagos',
+        'W. Europe Standard Time'=>'Europe/Berlin',
+        'West Asia Standard Time'=>'Asia/Tashkent',
+        'West Pacific Standard Time'=>'Pacific/Port_Moresby',
+        'Yakutsk Standard Time'=>'Asia/Yakutsk',
+    );
+
+    static public function lookup($tzid) {
+        return isset(self::$map[$tzid]) ? self::$map[$tzid] : null;
+    }
+}
diff --git a/3rdparty/Sabre/VObject/includes.php b/3rdparty/Sabre/VObject/includes.php
new file mode 100755
index 0000000000..0177a8f1ba
--- /dev/null
+++ b/3rdparty/Sabre/VObject/includes.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Sabre_VObject includes file
+ *
+ * Including this file will automatically include all files from the VObject
+ * package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/DateTimeParser.php';
+include __DIR__ . '/ElementList.php';
+include __DIR__ . '/FreeBusyGenerator.php';
+include __DIR__ . '/Node.php';
+include __DIR__ . '/Parameter.php';
+include __DIR__ . '/ParseException.php';
+include __DIR__ . '/Reader.php';
+include __DIR__ . '/RecurrenceIterator.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/WindowsTimezoneMap.php';
+include __DIR__ . '/Element.php';
+include __DIR__ . '/Property.php';
+include __DIR__ . '/Component.php';
+include __DIR__ . '/Property/DateTime.php';
+include __DIR__ . '/Property/MultiDateTime.php';
+include __DIR__ . '/Component/VAlarm.php';
+include __DIR__ . '/Component/VCalendar.php';
+include __DIR__ . '/Component/VEvent.php';
+include __DIR__ . '/Component/VJournal.php';
+include __DIR__ . '/Component/VTodo.php';
+include __DIR__ . '/Element/DateTime.php';
+include __DIR__ . '/Element/MultiDateTime.php';
+// End includes
diff --git a/3rdparty/Sabre/autoload.php b/3rdparty/Sabre/autoload.php
new file mode 100755
index 0000000000..c7b537d83d
--- /dev/null
+++ b/3rdparty/Sabre/autoload.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * SabreDAV's PHP autoloader
+ *
+ * If you love the autoloader, and don't care as much about performance, this
+ * file register a new autoload function using spl_autoload_register.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * @param string $className
+ * @return void
+ */
+function Sabre_autoload($className) {
+
+    if(strpos($className,'Sabre_')===0) {
+
+        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
+
+    }
+
+}
+
+spl_autoload_register('Sabre_autoload');
+

From c04aa8d6a99869aa51595b61207063f97488eb8e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 20 Jul 2012 15:45:17 +0200
Subject: [PATCH 1021/1537] Add CSRF checks

---
 apps/calendar/ajax/share/changepermission.php | 4 +++-
 apps/calendar/ajax/share/share.php            | 2 ++
 apps/calendar/ajax/share/unshare.php          | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
index e807c164a2..5aff7666f7 100644
--- a/apps/calendar/ajax/share/changepermission.php
+++ b/apps/calendar/ajax/share/changepermission.php
@@ -5,7 +5,9 @@
  * later.
  * See the COPYING-README file.
  */
- 
+
+OCP\JSON::callCheck();
+
 $id = strip_tags($_POST['id']);
 $idtype = strip_tags($_POST['idtype']);
 $permission = (int) strip_tags($_POST['permission']);
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
index 838db619f6..77e1ab9d65 100644
--- a/apps/calendar/ajax/share/share.php
+++ b/apps/calendar/ajax/share/share.php
@@ -6,6 +6,8 @@
  * See the COPYING-README file.
  */
  
+OCP\JSON::callCheck();
+
 $id = strip_tags($_POST['id']);
 $idtype = strip_tags($_POST['idtype']);
 switch($idtype){
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
index 1ce04677fb..c7c0611318 100644
--- a/apps/calendar/ajax/share/unshare.php
+++ b/apps/calendar/ajax/share/unshare.php
@@ -5,7 +5,9 @@
  * later.
  * See the COPYING-README file.
  */
- 
+
+OCP\JSON::callCheck();
+
 $id = strip_tags($_POST['id']);
 $idtype = strip_tags($_POST['idtype']);
 switch($idtype){

From 23c71b15a02551c33a63b32a33de233d8d4462f5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 16:34:57 +0200
Subject: [PATCH 1022/1537] remove unused variables from webdav file backend

---
 apps/files_external/lib/webdav.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 3d13518f57..84d64b6519 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -77,16 +77,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array(),1);
-			$stripLength=strlen($this->root)+strlen($path);
 			$id=md5('webdav'.$this->root.$path);
 			OC_FakeDirStream::$dirs[$id]=array();
-			$skip = true;
-			foreach($response as $file=>$data){
-				// Skip the first file, because it is the current directory
-				if ($skip) {
-					$skip = false;
-					continue;
-				}
+			$files=array_keys($response);
+			array_shift($files);//the first entry is the current directory
+			foreach($files as $file){
 				$file = urldecode(basename($file));
 				OC_FakeDirStream::$dirs[$id][]=$file;
 			}
@@ -120,7 +115,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	public function file_exists($path){
 		$path=$this->cleanPath($path);
 		try{
-			$response=$this->client->propfind($path, array('{DAV:}resourcetype'));
+			$this->client->propfind($path, array('{DAV:}resourcetype'));
 			return true;//no 404 exception
 		}catch(Exception $e){
 			return false;
@@ -201,7 +196,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$mtime=time();
 		}
 		$path=$this->cleanPath($path);
-		$this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime,));
+		$this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime));
 	}
 
 	public function getFile($path,$target){

From 445f52ef8ba9698d21cea262a8c227ddc6564945 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 16:35:24 +0200
Subject: [PATCH 1023/1537] dont check for filecache updates when getting quota
 info over webdav

---
 lib/connector/sabre/directory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index b75bb5c50f..f3f6541a8d 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -146,7 +146,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * @return array
 	 */
 	public function getQuotaInfo() {
-		$rootInfo=OC_FileCache::get('');
+		$rootInfo=OC_FileCache_Cached::get('');
 		return array(
 			$rootInfo['size'],
 			OC_Filesystem::free_space()

From 1224d7ec01fc7ed7f273939aa88c356846648aa6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 16:47:26 +0200
Subject: [PATCH 1024/1537] minor fixes for the google filestorage backend

---
 apps/files_external/lib/google.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 41b560ae84..2ad85d09d5 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -178,7 +178,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		if ($collection == '/' || $collection == '\.' || $collection == '.') {
 			$uri = 'https://docs.google.com/feeds/default/private/full';
 		// Get parent content link
-		} else if ($dom = $this->getResource(basename($dir))) {
+		} else if ($dom = $this->getResource(basename($collection))) {
 			$uri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
 		}
 		if (isset($uri)) {
@@ -341,7 +341,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 						break;
 					}
 				}
-				$title = basename($path);
+				$title = basename($path2);
 				// Construct post data
 				$postData = '<?xml version="1.0" encoding="UTF-8"?>';
 				$postData .= '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007" xmlns:gd="http://schemas.google.com/g/2005" gd:etag='.$etag.'>';
@@ -352,13 +352,13 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			} else {
 				// Move to different collection
 				if ($collectionEntry = $this->getResource($collection)) {
-					$feedUri = $colelctionEntry->getElementsByTagName('content')->item(0)->getAttribute('src');
+					$feedUri = $collectionEntry->getElementsByTagName('content')->item(0)->getAttribute('src');
 					// Construct post data
 					$postData = '<?xml version="1.0" encoding="UTF-8"?>';
 					$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
 					$postData .= '<id>'.$entry->getElementsByTagName('id')->item(0).'</id>';
 					$postData .= '</entry>';
-					$this->sendRequest($uri, 'POST', $postData);
+					$this->sendRequest($feedUri, 'POST', $postData);
 					return true;
 				}
 			}
@@ -424,7 +424,6 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			}
 		}
 		if (!isset($uploadUri) && $entry) {
-			$etag = $entry->getAttribute('gd:etag');
 			$links = $entry->getElementsByTagName('link');
 			foreach ($links as $link) {
 				if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-create-media') {

From 3c2967074f0d817bff8f1d511f08aa84a9d09bde Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 16:48:28 +0200
Subject: [PATCH 1025/1537] remove unused variable from dropbox filestorage
 backend

---
 apps/files_external/lib/dropbox.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 35663d431f..c849db3843 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -208,7 +208,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 		if (isset(self::$tempFiles[$tmpFile])) {
 			$handle = fopen($tmpFile, 'r');
 			try {
-				$response = $this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
+				$this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
 				unlink($tmpFile);
 			} catch (Exception $exception) {
 				

From 7fff38667953028d499f978798b44deccbd55a84 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 17:09:03 +0200
Subject: [PATCH 1026/1537] Code style.

---
 apps/contacts/ajax/addproperty.php         | 11 ++--
 apps/contacts/ajax/savecrop.php            |  2 +-
 apps/contacts/ajax/saveproperty.php        |  2 +-
 apps/contacts/appinfo/app.php              |  2 +-
 apps/contacts/appinfo/migrate.php          | 15 +++---
 apps/contacts/appinfo/remote.php           |  4 +-
 apps/contacts/carddav.php                  |  6 +--
 apps/contacts/export.php                   | 18 ++++---
 apps/contacts/import.php                   | 58 ++++++++++++++++++----
 apps/contacts/index.php                    | 43 +++++++++-------
 apps/contacts/lib/addressbook.php          |  2 +-
 apps/contacts/lib/connector_sabre.php      |  6 +--
 apps/contacts/lib/vcard.php                |  4 +-
 apps/contacts/photo.php                    | 23 +++++----
 apps/contacts/templates/index.php          |  2 +-
 apps/contacts/templates/part.cropphoto.php |  1 -
 apps/contacts/thumbnail.php                | 27 +++++++---
 apps/contacts/tmpphoto.php                 |  2 +-
 18 files changed, 142 insertions(+), 86 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 96f27b2b9b..58b857547f 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -48,10 +48,11 @@ if(!$vcard) {
 
 if(!is_array($value)) {
 	$value = trim($value);
-	if(!$value && in_array(
-			$name, 
-			array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))
-		) {
+	if(!$value 
+		&& in_array(
+		$name, 
+		array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))
+	) {
 		bailOut($l10n->t('Cannot add empty property.'));
 	}
 } elseif($name === 'ADR') { // only add if non-empty elements.
@@ -129,7 +130,7 @@ foreach ($parameters as $key=>$element) {
 		// NOTE: Maybe this doesn't only apply for TYPE?
 		// And it probably shouldn't be done here anyways :-/
 		foreach($element as $e) {
-			if($e != '' && !is_null($e)){
+			if($e != '' && !is_null($e)) {
 				$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
 			}
 		}
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 3958af5c07..8ee2e46bf0 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -89,7 +89,7 @@ if($data) {
 				}
 				$now = new DateTime;
 				$card->setString('REV', $now->format(DateTime::W3C));
-				if(!OC_Contacts_VCard::edit($id,$card)) {
+				if(!OC_Contacts_VCard::edit($id, $card)) {
 					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
 				}
 				$tmpl = new OCP\Template("contacts", "part.contactphoto");
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index c3aaf5a959..5d743c99df 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -129,7 +129,7 @@ if(!$value) {
 }
 //debug('New checksum: '.$checksum);
 
-if(!OC_Contacts_VCard::edit($id,$vcard)) {
+if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error updating contact property.'));
 	exit();
 }
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 33e89c3e9b..cbbbbc79e5 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -19,6 +19,6 @@ OCP\App::addNavigationEntry( array(
   'name' => OC_L10N::get('contacts')->t('Contacts') ));
 
 
-OCP\App::registerPersonal('contacts','settings');
+OCP\App::registerPersonal('contacts', 'settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
index 02026c5979..2559b4ea45 100644
--- a/apps/contacts/appinfo/migrate.php
+++ b/apps/contacts/appinfo/migrate.php
@@ -2,7 +2,7 @@
 class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 	
 	// Create the xml for the user supplied
-	function export( ){
+	function export( ) {
 		$options = array(
 			'table'=>'contacts_addressbooks',
 			'matchcol'=>'userid',
@@ -21,9 +21,8 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 		$ids2 = $this->content->copyRows( $options );
 		
 		// If both returned some ids then they worked
-		if( is_array( $ids ) && is_array( $ids2 ) )
-		{
-			return true;	
+		if(is_array($ids) && is_array($ids2)) {
+			return true;
 		} else {
 			return false;
 		}
@@ -31,14 +30,14 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 	}
 	
 	// Import function for contacts
-	function import( ){
-		switch( $this->appinfo->version ){
+	function import( ) {
+		switch( $this->appinfo->version ) {
 			default:
 				// All versions of the app have had the same db structure, so all can use the same import function
 				$query = $this->content->prepare( "SELECT * FROM contacts_addressbooks WHERE userid LIKE ?" );
 				$results = $query->execute( array( $this->olduid ) );
 				$idmap = array();
-				while( $row = $results->fetchRow() ){
+				while( $row = $results->fetchRow() ) {
 					// Import each addressbook	
 					$addressbookquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
 					$addressbookquery->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
@@ -48,7 +47,7 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 					OC_Contacts_Addressbook::setActive($idmap[$row['id']], true);
 				}
 				// Now tags
-				foreach($idmap as $oldid => $newid){
+				foreach($idmap as $oldid => $newid) {
 					
 					$query = $this->content->prepare( "SELECT * FROM contacts_cards WHERE addressbookid LIKE ?" );
 					$results = $query->execute( array( $oldid ) );
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 09c2de1799..fd5604aec6 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -22,7 +22,7 @@
 
 OCP\App::checkAppEnabled('contacts');
 
-if(substr($_SERVER["REQUEST_URI"],0,strlen(OC_App::getAppWebPath('contacts').'/carddav.php')) == OC_App::getAppWebPath('contacts').'/carddav.php'){
+if(substr($_SERVER["REQUEST_URI"], 0, strlen(OC_App::getAppWebPath('contacts').'/carddav.php')) == OC_App::getAppWebPath('contacts').'/carddav.php') {
 	$baseuri = OC_App::getAppWebPath('contacts').'/carddav.php';
 }
 
@@ -45,7 +45,7 @@ $nodes = array(
 $server = new Sabre_DAV_Server($nodes);
 $server->setBaseUri($baseuri);
 // Add plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
+$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
index e0579e625d..264eb30836 100644
--- a/apps/contacts/carddav.php
+++ b/apps/contacts/carddav.php
@@ -1,6 +1,6 @@
 <?php
-if(!file_exists('../../lib/base.php')){
+if(!file_exists('../../lib/base.php')) {
 	die('Please update the path to /lib/base.php in carddav.php or make use of /remote.php/carddav/');
 }
-require_once('../../lib/base.php');
-require_once('appinfo/remote.php');
\ No newline at end of file
+require_once '../../lib/base.php';
+require_once 'appinfo/remote.php';
\ No newline at end of file
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index eb506506c4..161ca8047a 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -9,26 +9,30 @@
  
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
-$bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
-$contactid = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
+$bookid = isset($_GET['bookid']) ? $_GET['bookid'] : null;
+$contactid = isset($_GET['contactid']) ? $_GET['contactid'] : null;
 $nl = "\n";
-if(isset($bookid)){
+if(isset($bookid)) {
 	$addressbook = OC_Contacts_App::getAddressbook($bookid);
 	//$cardobjects = OC_Contacts_VCard::all($bookid);
 	header('Content-Type: text/directory');
-	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
+	header('Content-Disposition: inline; filename=' 
+		. str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
 
 	$start = 0;
-	$batchsize = OCP\Config::getUserValue(OCP\User::getUser(), 'contacts', 'export_batch_size', 20);
+	$batchsize = OCP\Config::getUserValue(OCP\User::getUser(), 
+		'contacts', 
+		'export_batch_size', 20);
 	while($cardobjects = OC_Contacts_VCard::all($bookid, $start, $batchsize)){
 		foreach($cardobjects as $card) {
 			echo $card['carddata'] . $nl;
 		}
 		$start += $batchsize;
 	}
-}elseif(isset($contactid)){
+}elseif(isset($contactid)) {
 	$data = OC_Contacts_App::getContactObject($contactid);
 	header('Content-Type: text/vcard');
-	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
+	header('Content-Disposition: inline; filename=' 
+		. str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
 }
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 7d3acf86cf..1986d79f6d 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -38,17 +38,29 @@ if(!$file) {
 	OCP\JSON::error(array('data' => array('message' => 'Import file was empty.')));
 	exit();
 }
-if(isset($_POST['method']) && $_POST['method'] == 'new'){
-	$id = OC_Contacts_Addressbook::add(OCP\USER::getUser(), $_POST['addressbookname']);
+if(isset($_POST['method']) && $_POST['method'] == 'new') {
+	$id = OC_Contacts_Addressbook::add(OCP\USER::getUser(), 
+		$_POST['addressbookname']);
 	if(!$id) {
-		OCP\JSON::error(array('data' => array('message' => 'Error creating address book.')));
+		OCP\JSON::error(
+			array(
+				'data' => array('message' => 'Error creating address book.')
+			)
+		);
 		exit();
 	}
 	OC_Contacts_Addressbook::setActive($id, 1);
 }else{
 	$id = $_POST['id'];
 	if(!$id) {
-		OCP\JSON::error(array('data' => array('message' => 'Error getting the ID of the address book.', 'file'=>$_POST['file'])));
+		OCP\JSON::error(
+			array(
+				'data' => array(
+					'message' => 'Error getting the ID of the address book.', 
+					'file'=>$_POST['file']
+				)
+			)
+		);
 		exit();
 	}
 	OC_Contacts_App::getAddressbook($id); // is owner access check
@@ -62,7 +74,7 @@ $inelement = false;
 $parts = array();
 $card = array();
 foreach($lines as $line){
-	if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
+	if(strtoupper(trim($line)) == 'BEGIN:VCARD') {
 		$inelement = true;
 	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
 		$card[] = $line;
@@ -79,10 +91,20 @@ writeProgress('70');
 $imported = 0;
 $failed = 0;
 if(!count($parts) > 0) {
-	OCP\JSON::error(array('data' => array('message' => 'No contacts to import in '.$_POST['file'].'. Please check if the file is corrupted.', 'file'=>$_POST['file'])));
+	OCP\JSON::error(
+		array(
+			'data' => array(
+				'message' => 'No contacts to import in '
+					. $_POST['file'].'. Please check if the file is corrupted.', 
+				'file'=>$_POST['file']
+			)
+		)
+	);
 	if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
 		if(!$view->unlink('/imports/' . $_POST['file'])) {
-			OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', 
+				'Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], 
+				OCP\Util::ERROR);
 		}
 	}
 	exit();
@@ -91,14 +113,18 @@ foreach($parts as $part){
 	$card = OC_VObject::parse($part);
 	if (!$card) {
 		$failed += 1;
-		OCP\Util::writeLog('contacts','Import: skipping card. Error parsing VCard: '.$part, OCP\Util::ERROR);
+		OCP\Util::writeLog('contacts', 
+			'Import: skipping card. Error parsing VCard: ' . $part, 
+				OCP\Util::ERROR);
 		continue; // Ditch cards that can't be parsed by Sabre.
 	}
 	try {
 		OC_Contacts_VCard::add($id, $card);
 		$imported += 1;
 	} catch (Exception $e) {
-		OCP\Util::writeLog('contacts', 'Error importing vcard: '.$e->getMessage().$nl.$card, OCP\Util::ERROR);
+		OCP\Util::writeLog('contacts', 
+			'Error importing vcard: ' . $e->getMessage() . $nl . $card, 
+			OCP\Util::ERROR);
 		$failed += 1;
 	}
 }
@@ -108,7 +134,17 @@ sleep(3);
 OC_Cache::remove($progresskey);
 if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
 	if(!$view->unlink('/imports/' . $_POST['file'])) {
-		OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
+		OCP\Util::writeLog('contacts', 
+			'Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], 
+			OCP\Util::ERROR);
 	}
 }
-OCP\JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed, 'file'=>$_POST['file'])));
+OCP\JSON::success(
+	array(
+		'data' => array(
+			'imported'=>$imported, 
+			'failed'=>$failed, 
+			'file'=>$_POST['file'],
+		)
+	)
+);
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 00b1b4f7a9..c35e1b85d4 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -14,13 +14,17 @@ OCP\App::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 ? true : false); // just to check if there are any contacts.
+$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 
+	? true 
+	: false); // just to check if there are any contacts.
 if($has_contacts === false) {
-	OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG);
+	OCP\Util::writeLog('contacts', 
+		'index.html: No contacts found.', 
+		OCP\Util::DEBUG);
 }
 
 // Load the files we need
-OCP\App::setActiveNavigationEntry( 'contacts_index' );
+OCP\App::setActiveNavigationEntry('contacts_index');
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
@@ -34,30 +38,31 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
 $freeSpace=OC_Filesystem::free_space('/');
-$freeSpace=max($freeSpace,0);
-$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+$freeSpace=max($freeSpace, 0);
+$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 
-OCP\Util::addscript('','jquery.multiselect');
-OCP\Util::addscript('','oc-vcategories');
-OCP\Util::addscript('contacts','contacts');
-OCP\Util::addscript('contacts','expanding');
-OCP\Util::addscript('contacts','jquery.combobox');
+OCP\Util::addscript('', 'jquery.multiselect');
+OCP\Util::addscript('', 'oc-vcategories');
+OCP\Util::addscript('contacts', 'contacts');
+OCP\Util::addscript('contacts', 'expanding');
+OCP\Util::addscript('contacts', 'jquery.combobox');
 OCP\Util::addscript('files', 'jquery.fileupload');
-OCP\Util::addscript('contacts','jquery.inview');
-OCP\Util::addscript('contacts','jquery.Jcrop');
-OCP\Util::addscript('contacts','jquery.multi-autocomplete');
-OCP\Util::addStyle('','jquery.multiselect');
-OCP\Util::addStyle('contacts','jquery.combobox');
-OCP\Util::addStyle('contacts','jquery.Jcrop');
-OCP\Util::addStyle('contacts','contacts');
+OCP\Util::addscript('contacts', 'jquery.inview');
+OCP\Util::addscript('contacts', 'jquery.Jcrop');
+OCP\Util::addscript('contacts', 'jquery.multi-autocomplete');
+OCP\Util::addStyle('', 'jquery.multiselect');
+OCP\Util::addStyle('contacts', 'jquery.combobox');
+OCP\Util::addStyle('contacts', 'jquery.Jcrop');
+OCP\Util::addStyle('contacts', 'contacts');
 
 $tmpl = new OCP\Template( "contacts", "index", "user" );
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize, false);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize), false);
+$tmpl->assign('uploadMaxHumanFilesize', 
+	OCP\Util::humanFileSize($maxUploadFilesize), false);
 $tmpl->assign('property_types', $property_types, false);
 $tmpl->assign('phone_types', $phone_types, false);
 $tmpl->assign('email_types', $email_types, false);
 $tmpl->assign('categories', $categories, false);
 $tmpl->assign('has_contacts', $has_contacts, false);
-$tmpl->assign('id',$id, false);
+$tmpl->assign('id', $id, false);
 $tmpl->printPage();
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 65e02312bd..eb61b6dbce 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -133,7 +133,7 @@ class OC_Contacts_Addressbook {
 		if(is_null($uid)) {
 			$uid = OCP\USER::getUser();
 		}
-		$id = self::add($uid,'Contacts', 'Default Address Book');
+		$id = self::add($uid, 'Contacts', 'Default Address Book');
 		if($id !== false) {
 			self::setActive($id, true);
 		}
diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/connector_sabre.php
index 99b94fc767..9fcfff08fa 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/connector_sabre.php
@@ -79,7 +79,7 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 			}
 		}
 
-		OC_Contacts_Addressbook::edit($addressbookid,$name,$description);
+		OC_Contacts_Addressbook::edit($addressbookid, $name, $description);
 
 		return true;
 
@@ -113,7 +113,7 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 
 		}
 
-		OC_Contacts_Addressbook::addFromDAVData($principaluri,$url,$name,$description);
+		OC_Contacts_Addressbook::addFromDAVData($principaluri, $url, $name, $description);
 	}
 
 	/**
@@ -156,7 +156,7 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 	 * @return array
 	 */
 	public function getCard($addressbookid, $carduri) {
-		return OC_Contacts_VCard::findWhereDAVDataIs($addressbookid,$carduri);
+		return OC_Contacts_VCard::findWhereDAVDataIs($addressbookid, $carduri);
 
 	}
 
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 732c5a2258..6b9a4c04f1 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -212,7 +212,7 @@ class OC_Contacts_VCard{
 		// Add version if needed
 		if($version && $version < '3.0') {
 			$upgrade = true;
-			OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version,OCP\Util::DEBUG);
 		}
 		foreach($vcard->children as &$property){
 			// Decode string properties and remove obsolete properties.
@@ -487,7 +487,7 @@ class OC_Contacts_VCard{
 	public static function unescapeDelimiters($value, $delimiter=';') {
 		$array = explode($delimiter, $value);
 		for($i=0;$i<count($array);$i++) {
-			if(substr($array[$i],-1, 1)=="\\") {
+			if(substr($array[$i], -1, 1)=="\\") {
 				if(isset($array[$i+1])) {
 					$array[$i] = substr($array[$i], 0, count($array[$i])-2).$delimiter.$array[$i+1];
 					unset($array[$i+1]);
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 4660d61f61..efdf157cd9 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -13,7 +13,7 @@
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 
-function getStandardImage(){
+function getStandardImage() {
 	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person_large.png'));
@@ -27,37 +27,39 @@ if(is_null($id)) {
 }
 
 if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	OCP\Util::writeLog('contacts','photo.php. GD module not installed',OCP\Util::DEBUG);
+	OCP\Util::writeLog('contacts', 
+		'photo.php. GD module not installed', OCP\Util::DEBUG);
 	getStandardImage();
 }
 
 $contact = OC_Contacts_App::getContactVCard($id);
 $image = new OC_Image();
-if(!$image) {
+if (!$image) {
 	getStandardImage();
 }
 // invalid vcard
-if( is_null($contact)) {
-	OCP\Util::writeLog('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OCP\Util::ERROR);
+if (is_null($contact)) {
+	OCP\Util::writeLog('contacts', 
+		'photo.php. The VCard for ID ' . $id . ' is not RFC compatible', 
+		OCP\Util::ERROR);
 } else {
 	OCP\Response::enableCaching($caching);
 	OC_Contacts_App::setLastModifiedHeader($contact);
 
 	// Photo :-)
-	if($image->loadFromBase64($contact->getAsString('PHOTO'))) {
+	if ($image->loadFromBase64($contact->getAsString('PHOTO'))) {
 		// OK
 		OCP\Response::setETagHeader(md5($contact->getAsString('PHOTO')));
 	}
 	else
 	// Logo :-/
-	if($image->loadFromBase64($contact->getAsString('LOGO'))) {
+	if ($image->loadFromBase64($contact->getAsString('LOGO'))) {
 		// OK
 		OCP\Response::setETagHeader(md5($contact->getAsString('LOGO')));
 	}
 	if ($image->valid()) {
 		$max_size = 200;
-		if($image->width() > $max_size ||
-		   $image->height() > $max_size) {
+		if ($image->width() > $max_size || $image->height() > $max_size) {
 			$image->resize($max_size);
 		}
 	}
@@ -65,8 +67,7 @@ if( is_null($contact)) {
 if (!$image->valid()) {
 	// Not found :-(
 	getStandardImage();
-	//$image->loadFromFile('img/person_large.png');
 }
 header('Content-Type: '.$image->mimeType());
 $image->show();
-//echo OC_Contacts_App::$l10n->t('This card does not contain a photo.');
+
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 98cb67a26e..1bc4a19553 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -25,7 +25,7 @@
 </div>
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
 	<?php
-		if($_['has_contacts']){
+		if($_['has_contacts']) {
 			echo $this->inc('part.contact');
 		}
 		else{
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 6d7b1e4477..3f5817622b 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -2,7 +2,6 @@
 $id = $_['id'];
 $tmpkey = $_['tmpkey'];
 $requesttoken = $_['requesttoken'];
-OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 ?>
 <script type="text/javascript">
 	jQuery(function($) {
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index a69e9c74f7..6deb5ca379 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -25,14 +25,15 @@ OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 session_write_close();
 
-function getStandardImage(){
+function getStandardImage() {
 	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person.png'));
 }
 
 if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	OCP\Util::writeLog('contacts','thumbnail.php. GD module not installed',OCP\Util::DEBUG);
+	OCP\Util::writeLog('contacts', 
+		'thumbnail.php. GD module not installed', OCP\Util::DEBUG);
 	getStandardImage();
 	exit();
 }
@@ -43,8 +44,10 @@ $caching = isset($_GET['refresh']) ? 0 : null;
 $contact = OC_Contacts_App::getContactVCard($id);
 
 // invalid vcard
-if(is_null($contact)){
-	OCP\Util::writeLog('contacts','thumbnail.php. The VCard for ID '.$id.' is not RFC compatible',OCP\Util::ERROR);
+if(is_null($contact)) {
+	OCP\Util::writeLog('contacts', 
+		'thumbnail.php. The VCard for ID ' . $id . ' is not RFC compatible', 
+		OCP\Util::ERROR);
 	getStandardImage();
 	exit();
 }
@@ -64,16 +67,24 @@ if($photo) {
 				if($image->show()) {
 					exit();
 				} else {
-					OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OCP\Util::ERROR);
+					OCP\Util::writeLog('contacts', 
+						'thumbnail.php. Couldn\'t display thumbnail for ID ' . $id, 
+						OCP\Util::ERROR);
 				}
 			} else {
-				OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', 
+					'thumbnail.php. Couldn\'t resize thumbnail for ID ' . $id, 
+					OCP\Util::ERROR);
 			}
 		}else{
-			OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', 
+				'thumbnail.php. Couldn\'t crop thumbnail for ID ' . $id, 
+				OCP\Util::ERROR);
 		}
 	} else {
-		OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OCP\Util::ERROR);
+		OCP\Util::writeLog('contacts', 
+			'thumbnail.php. Couldn\'t load image string for ID ' . $id, 
+			OCP\Util::ERROR);
 	}
 }
 getStandardImage();
diff --git a/apps/contacts/tmpphoto.php b/apps/contacts/tmpphoto.php
index 5fde8de997..156d5c8030 100644
--- a/apps/contacts/tmpphoto.php
+++ b/apps/contacts/tmpphoto.php
@@ -24,7 +24,7 @@ $tmpkey = $_GET['tmpkey'];
 $maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
 header("Cache-Control: no-cache, no-store, must-revalidate");
 
-OCP\Util::writeLog('contacts','tmpphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
+OCP\Util::writeLog('contacts', 'tmpphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 
 $image = new OC_Image();
 $image->loadFromData(OC_Cache::get($tmpkey));

From ecf8e77dabc5b3e4e0215134a4cd083296aedbd7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 17:10:52 +0200
Subject: [PATCH 1027/1537] Remove unused file.

---
 .../templates/part.edit_categories_dialog.php    | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 apps/contacts/templates/part.edit_categories_dialog.php

diff --git a/apps/contacts/templates/part.edit_categories_dialog.php b/apps/contacts/templates/part.edit_categories_dialog.php
deleted file mode 100644
index 8997fa586b..0000000000
--- a/apps/contacts/templates/part.edit_categories_dialog.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$categories = isset($_['categories'])?$_['categories']:array();
-?>
-<div id="edit_categories_dialog" title="<?php echo $l->t('Edit categories'); ?>">
-<!-- ?php print_r($types); ? -->
-	<form method="post" id="categoryform">
-	<div class="scrollarea">
-	<ul id="categorylist">
-	<?php foreach($categories as $category) { ?>
-	<li><input type="checkbox" name="categories[]" value="<?php echo $category; ?>" /><?php echo $category; ?></li>
-	<?php } ?>
-	</ul>
-	</div>
-	<div class="bottombuttons"><input type="text" id="category_addinput" name="category" /><button id="category_addbutton" disabled="disabled"><?php echo $l->t('Add'); ?></button></div>
-	</form>
-</div>

From bf9b6e9ccc6b2677247aa0a8348337248e7cd25e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 20 Jul 2012 17:18:40 +0200
Subject: [PATCH 1028/1537] don't show label 'add group' for subadmins and
 remove some debug code

---
 settings/js/users.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index f1fb0f5f6d..c184db4374 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -83,7 +83,6 @@ $(document).ready(function(){
 	}
 	
 	function applyMultiplySelect(element){
-		console.log(element);
 		var checked=[];
 		var user=element.data('username');
 		if($(element).attr('class') == 'groupsselect'){		
@@ -114,9 +113,15 @@ $(document).ready(function(){
 					}
 				})
 			};
+			var label;
+			if(isadmin){
+				label = t('files', 'add group');
+			}else{
+				label = null;
+			}
 			element.multiSelect({
 				createCallback:addGroup,
-				createText:'add group',
+				createText:label,
 				checked:checked,
 				oncheck:checkHandeler,
 				onuncheck:checkHandeler,
@@ -142,8 +147,6 @@ $(document).ready(function(){
 			};
 			
 			var addSubAdmin = function(group) {
-				console.log('addSubAdmin called');
-				console.log(group);
 				$('select[multiple]').each(function(index, element) {
 					if ($(element).find('option[value="'+group +'"]').length == 0) {
 						$(element).append('<option value="'+group+'">'+group+'</option>');
@@ -294,7 +297,6 @@ $(document).ready(function(){
 				}
 				else {
 					groups = result.data.groups;
-					console.log(groups);
 					var tr=$('#content table tbody tr').first().clone();
 					tr.attr('data-uid',username);
 					tr.find('td.name').text(username);

From 57ed83f2665ef571f5de25a65764640a38c26acd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 16:54:29 +0200
Subject: [PATCH 1029/1537] fix eventsource fallback when more then one
 eventsource is active

---
 lib/eventsource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eventsource.php b/lib/eventsource.php
index cf10660b94..2a8c6b9290 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -36,7 +36,7 @@ class OC_EventSource{
 		header('Cache-Control: no-cache');
 		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
 		if($this->fallback){
-			$fallBackId=$_GET['fallback_id'];
+			$this->fallBackId=$_GET['fallback_id'];
 			header("Content-Type: text/html");
 			echo str_repeat('<span></span>'.PHP_EOL,10); //dummy data to keep IE happy
 		}else{

From 0e111e1a17140a8a42a3dbf2ecce41e424b2afab Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 16:56:07 +0200
Subject: [PATCH 1030/1537] fix increasing folder sizes in filecache for custom
 roots

---
 lib/filecache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index d956f34dc4..4b1774925c 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -126,7 +126,7 @@ class OC_FileCache{
 		$query=OC_DB::prepare($sql);
 		$result=$query->execute($arguments);
 		if(OC_DB::isError($result)){
-			OC_Log::write('files','error while updating file('.$path.') in cache',OC_Log::ERROR);
+			OC_Log::write('files','error while updating file('.$id.') in cache',OC_Log::ERROR);
 		}
 	}
 
@@ -303,7 +303,7 @@ class OC_FileCache{
 	 */
 	public static function increaseSize($path,$sizeDiff, $root=false){
 		if($sizeDiff==0) return;
-		$id=self::getId($path,'');
+		$id=self::getId($path,$root);
 		while($id!=-1){//walk up the filetree increasing the size of all parent folders
 			$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
 			$query->execute(array($sizeDiff,$id));

From 48306a3c4f708b80143757acbe9b270be476aab4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 17:51:50 +0200
Subject: [PATCH 1031/1537] fix unused variables

---
 lib/app.php            |  1 -
 lib/db.php             |  9 ++++-----
 lib/filestorage.php    |  2 +-
 lib/filesystem.php     | 17 ++++++++---------
 lib/filesystemview.php |  2 +-
 lib/helper.php         |  6 +++---
 lib/image.php          |  9 +++------
 lib/migrate.php        |  2 +-
 lib/ocs.php            |  6 +-----
 lib/ocsclient.php      |  2 +-
 lib/preferences.php    |  8 ++++----
 lib/setup.php          |  1 -
 lib/streamwrappers.php |  5 -----
 lib/template.php       |  1 -
 lib/templatelayout.php |  2 +-
 lib/util.php           |  2 --
 16 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index caf8bd8252..2b975de9ef 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -27,7 +27,6 @@
  * upgrading and removing apps.
  */
 class OC_App{
-	static private $init = false;
 	static private $activeapp = '';
 	static private $navigation = array();
 	static private $settingsForms = array();
diff --git a/lib/db.php b/lib/db.php
index 2a06d72ea3..6f083d17cf 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -33,8 +33,6 @@ class OC_DB {
 	static private $MDB2=false;
 	static private $PDO=false;
 	static private $schema=false;
-	static private $affected=0;
-	static private $result=false;
 	static private $inTransaction=false;
 	static private $prefix=null;
 	static private $type=null;
@@ -222,7 +220,7 @@ class OC_DB {
 				echo( '<b>can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')</center>');
 				OC_Log::write('core',self::$MDB2->getUserInfo(),OC_Log::FATAL);
 				OC_Log::write('core',self::$MDB2->getMessage(),OC_Log::FATAL);
-				die( $error );
+				die();
 			}
 			
 			// We always, really always want associative arrays
@@ -519,8 +517,9 @@ class OC_DB {
 		
 		// Delete our temporary file
 		unlink( $file2 );
-		foreach($definition['tables'] as $name=>$table){
-			self::dropTable($name);
+		$tables=array_keys($definition['tables']);
+		foreach($tables as $table){
+			self::dropTable($table);
 		}
 	}
 	
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 71ef4aed00..e786127d52 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -24,7 +24,7 @@
  * Provde a common interface to all different storage options
  */
 abstract class OC_Filestorage{
-	public function __construct($parameters){}
+	abstract public function __construct($parameters);
 	abstract public function mkdir($path);
 	abstract public function rmdir($path);
 	abstract public function opendir($path);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 65318fa3ab..5b31ed6c70 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -46,9 +46,10 @@
 class OC_Filesystem{
 	static private $storages=array();
 	static private $mounts=array();
-	static private $storageTypes=array();
 	public static $loaded=false;
-	private $fakeRoot='';
+	/**
+	 * @var OC_Filestorage $defaultInstance
+	 */
 	static private $defaultInstance;
 
 
@@ -155,7 +156,8 @@ class OC_Filesystem{
 		}
 		$path=str_replace('//', '/',$path);
 		$foundMountPoint='';
-		foreach(OC_Filesystem::$mounts as $mountpoint=>$storage){
+		$mountPoints=array_keys(OC_Filesystem::$mounts);
+		foreach($mountPoints as $mountpoint){
 			if($mountpoint==$path){
 				return $mountpoint;
 			}
@@ -260,10 +262,7 @@ class OC_Filesystem{
 	 * tear down the filesystem, removing all storage providers
 	 */
 	static public function tearDown(){
-		foreach(self::$storages as $mountpoint=>$storage){
-			unset(self::$storages[$mountpoint]);
-		}
-		$fakeRoot='';
+		self::$storages=array();
 	}
 	
 	/**
@@ -287,7 +286,7 @@ class OC_Filesystem{
 	* @return bool
 	*/
 	static public function chroot($fakeRoot){
-		return self::$defaultInstance->chroot($path);
+		return self::$defaultInstance->chroot($fakeRoot);
 	}
 
 	/**
@@ -485,7 +484,7 @@ class OC_Filesystem{
 	 * @return bool
 	 */
 	static public function hasUpdated($path,$time){
-		return self::$defaultInstance->hasUpdated($path);
+		return self::$defaultInstance->hasUpdated($path,$time);
 	}
 }
 
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 448663bb08..a23d7bbe7f 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -393,7 +393,7 @@ class OC_FilesystemView {
 		return $this->basicOperation('getMimeType',$path);
 	}
 	public function hash($type,$path){
-		return $this->basicOperation('hash',$path,array('read'));
+		return $this->basicOperation('hash',$path,array('read'),$type);
 	}
 
 	public function free_space($path='/'){
diff --git a/lib/helper.php b/lib/helper.php
index 0d18098a4e..c4f7e8b2e1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -676,10 +676,10 @@ class OC_Helper {
 	*/
 	public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
 		$offset = -1;
-		$length = mb_strlen($search, 'UTF-8');
-		while(($i = mb_strrpos($subject, $search, $offset, 'UTF-8'))) {
+		$length = mb_strlen($search, $encoding);
+		while(($i = mb_strrpos($subject, $search, $offset, $encoding))) {
 			$subject = OC_Helper::mb_substr_replace($subject, $replace, $i, $length);
-			$offset = $i - mb_strlen($subject, 'UTF-8') - 1;
+			$offset = $i - mb_strlen($subject, $encoding) - 1;
 			$count++;
 		}
 		return $subject;
diff --git a/lib/image.php b/lib/image.php
index 01e843d831..c438b3d67f 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -24,8 +24,8 @@
 //From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
 if ( ! function_exists( 'exif_imagetype' ) ) {
     function exif_imagetype ( $filename ) {
-        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
-            return $type;
+        if ( ( $info = getimagesize( $filename ) ) !== false ) {
+            return $info[2];
         }
     return false;
     }
@@ -364,7 +364,7 @@ class OC_Image {
 	public function load($imageref) {
 		if(is_resource($imageref)) {
 			if(get_resource_type($imageref) == 'gd') {
-				$this->resource = $res;
+				$this->resource = $imageref;
 				return $this->resource;
 			} elseif(in_array(get_resource_type($imageref), array('file','stream'))) {
 				return $this->loadFromFileHandle($imageref);
@@ -650,9 +650,6 @@ class OC_Image {
 			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
 			return false;
 		}
-		$width_orig=imageSX($this->resource);
-		$height_orig=imageSY($this->resource);
-		//OC_Log::write('core',__METHOD__.'(): Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
 			OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
diff --git a/lib/migrate.php b/lib/migrate.php
index f788a637d3..1b6367ed6e 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -91,7 +91,7 @@ class OC_Migrate{
 	 	if( self::$exporttype == 'user' ){
 	 		// Check user exists
 	 		if( !is_null($uid) ){
-                                $db = new OC_User_Database;
+				$db = new OC_User_Database;
 		 		if( !$db->userExists( $uid ) ){
 					OC_Log::write('migration', 'User: '.$uid.' is not in the database and so cannot be exported.', OC_Log::ERROR);
 					return json_encode( array( 'success' => false ) );
diff --git a/lib/ocs.php b/lib/ocs.php
index 1be41202d7..77dd437d6c 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -88,7 +88,6 @@ class OC_OCS {
        $method='get';
     }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
        $method='put';
-       parse_str(file_get_contents("php://input"),$put_vars);
     }elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
        $method='post';
     }else{
@@ -356,9 +355,6 @@ class OC_OCS {
    * @return string xml/json
    */
   private static function apiConfig($format) {
-    $user=OC_OCS::checkpassword(false);
-    $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
-
     $xml['version']='1.5';
     $xml['website']='ownCloud';
     $xml['host']=OCP\Util::getServerHost();
@@ -416,7 +412,7 @@ class OC_OCS {
    */
   private static function activityPut($format,$message) {
     // not implemented in ownCloud
-    $user=OC_OCS::checkpassword();
+    OC_OCS::checkpassword();
     echo(OC_OCS::generatexml($format,'ok',100,''));
   }
 
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 951d761d7e..ae35470cff 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -71,7 +71,7 @@ class OC_OCSClient{
 		$tmp=$data->data;
 		$cats=array();
 
-		foreach($tmp->category as $key=>$value) {
+		foreach($tmp->category as $value) {
 
 			$id= (int) $value->id;
 			$name= (string) $value->name;
diff --git a/lib/preferences.php b/lib/preferences.php
index f72378ce94..c91423e69b 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -165,7 +165,7 @@ class OC_Preferences{
 	public static function deleteKey( $user, $app, $key ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
-		$result = $query->execute( array( $user, $app, $key ));
+		$query->execute( array( $user, $app, $key ));
 
 		return true;
 	}
@@ -181,7 +181,7 @@ class OC_Preferences{
 	public static function deleteApp( $user, $app ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ?' );
-		$result = $query->execute( array( $user, $app ));
+		$query->execute( array( $user, $app ));
 
 		return true;
 	}
@@ -196,7 +196,7 @@ class OC_Preferences{
 	public static function deleteUser( $user ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ?' );
-		$result = $query->execute( array( $user ));
+		$query->execute( array( $user ));
 
 		return true;
 	}
@@ -211,7 +211,7 @@ class OC_Preferences{
 	public static function deleteAppFromAllUsers( $app ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE appid = ?' );
-		$result = $query->execute( array( $app ));
+		$query->execute( array( $app ));
 
 		return true;
 	}
diff --git a/lib/setup.php b/lib/setup.php
index 027c84db09..4d71bed86e 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -102,7 +102,6 @@ class OC_Setup {
 				}
 				else {
 					$oldUser=OC_Config::getValue('dbuser', false);
-					$oldPassword=OC_Config::getValue('dbpassword', false);
 					
 					$query="SELECT user FROM mysql.user WHERE user='$dbuser'"; //this should be enough to check for admin rights in mysql
 					if(mysql_query($query, $connection)) {
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index f1e0fa0e1d..f502c6170b 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -1,6 +1,4 @@
 <?php
-global $FAKEDIRS;
-$FAKEDIRS=array();
 
 class OC_FakeDirStream{
 	public static $dirs=array();
@@ -8,8 +6,6 @@ class OC_FakeDirStream{
 	private $index;
 
 	public function dir_opendir($path,$options){
-		global $FAKEDIRS;
-		$url=parse_url($path);
 		$this->name=substr($path,strlen('fakedir://'));
 		$this->index=0;
 		if(!isset(self::$dirs[$this->name])){
@@ -161,7 +157,6 @@ class OC_StaticStreamWrapper {
 	public function stream_write($data) {
 		if (!$this->writable) return 0;
 		$size = strlen($data);
-		$len = strlen(self::$data[$this->path]);
 		if ($this->stream_eof()) {
 			self::$data[$this->path] .= $data;
 		} else {
diff --git a/lib/template.php b/lib/template.php
index 3b48c27b9b..5b6999af53 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -82,7 +82,6 @@ function relative_modified_date($timestamp) {
 	$diffhours = round($diffminutes/60);
 	$diffdays = round($diffhours/24);
 	$diffmonths = round($diffdays/31);
-	$diffyears = round($diffdays/365);
 
 	if($timediff < 60) { return $l->t('seconds ago'); }
 	else if($timediff < 120) { return $l->t('1 minute ago'); }
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index d33a87e9e4..588a784599 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -123,7 +123,7 @@ class OC_TemplateLayout extends OC_Template {
 					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { $append =true; break; }
 				}
 				if(! $append) {
-					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();
 				}
 			}
diff --git a/lib/util.php b/lib/util.php
index 2a7b8a922f..f35e5a18e4 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -189,8 +189,6 @@ class OC_Util {
 		if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')){
 			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint
 		}
-		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-		$CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );
 
 		//common hint for all file permissons error messages
 		$permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory";

From 0e6238c66fc5f37b11800e632dbcccd72833628f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 17:57:18 +0200
Subject: [PATCH 1032/1537] fix OC_Cache_File tests if encryption is not
 enabled

---
 tests/lib/cache/file.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 54e60e6569..c33c513fcf 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -30,8 +30,10 @@ class Test_Cache_File extends Test_Cache {
 		OC_FileProxy::clearProxies();
 		OC_Hook::clear('OC_Filesystem');
 		
-		//enable only the encryption hook
-		OC_FileProxy::register(new OC_FileProxy_Encryption());
+		//enable only the encryption hook if needed
+		if(OC_App::isEnabled('files_encryption')){
+			OC_FileProxy::register(new OC_FileProxy_Encryption());
+		}
 		
 		//set up temporary storage
 		OC_Filesystem::clearMounts();

From 39086ef63e451871dfd9778f64cdbc4df142bd19 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 17:57:51 +0200
Subject: [PATCH 1033/1537] dont try to create mountpoints automatically

---
 lib/filesystem.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 5b31ed6c70..148656be00 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -319,9 +319,6 @@ class OC_Filesystem{
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
-		if (self::getView() != null && $mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
-			self::mkdir(basename($mountpoint));
-		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
 

From 7152b8b4ee2f0d4de640868b614992e8aaf00803 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 18:32:40 +0200
Subject: [PATCH 1034/1537] remove unused and depricated getFolderSize

---
 apps/files_sharing/sharedstorage.php | 31 +---------------------------
 lib/filestorage/local.php            | 12 +----------
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 4138fc2b39..e1c6e8f2eb 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -190,7 +190,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function filesize($path) {
 		if ($path == "" || $path == "/" || $this->is_dir($path)) {
-			return $this->getFolderSize($path);
+			return 0;
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
@@ -200,35 +200,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 
-	public function getFolderSize($path) {
-		return 0; //depricated
-	}
-	
-	private function calculateFolderSize($path) {
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$size = 0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if ($filename != "." && $filename != "..") {
-					$subFile = $path."/".$filename;
-					if ($this->is_file($subFile)) {
-						$size += $this->filesize($subFile);
-					} else {
-						$size += $this->getFolderSize($subFile);
-					}
-				}
-			}
-			if ($size > 0) {
-				$dbpath = rtrim($this->datadir.$path, "/");
-// 				$query = OCP\DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-// 				$result = $query->execute(array($dbpath, $size));
-			}
-		}
-		return $size;
-	}
-
 	private function clearFolderSizeCache($path) {
 		$path = rtrim($path, "/");
 		$path = preg_replace('{(/)\1+}', "/", $path);
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b2eba05151..0ed184c802 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -4,7 +4,6 @@
  */
 class OC_Filestorage_Local extends OC_Filestorage_Common{
 	protected $datadir;
-	private static $mimetypes=null;
 	public function __construct($arguments){
 		$this->datadir=$arguments['datadir'];
 		if(substr($this->datadir,-1)!=='/'){
@@ -41,7 +40,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	}
 	public function filesize($path){
 		if($this->is_dir($path)){
-			return $this->getFolderSize($path);
+			return 0;
 		}else{
 			return filesize($this->datadir.$path);
 		}
@@ -186,15 +185,6 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $files;
 	}
 
-	/**
-	 * @brief get the size of folder and it's content
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function getFolderSize($path){
-		return 0;//depricated, use OC_FileCach instead
-	}
-
 	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time

From c9be9ab251681d96cfb620ca26778ba0005023d3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 18:56:18 +0200
Subject: [PATCH 1035/1537] remove unused variables

---
 apps/files_encryption/lib/cryptstream.php |  3 ---
 apps/files_external/lib/smb.php           |  2 --
 apps/files_external/tests/ftp.php         |  1 -
 apps/files_external/tests/google.php      |  1 -
 apps/files_external/tests/smb.php         |  1 -
 apps/files_external/tests/swift.php       |  1 -
 apps/files_external/tests/webdav.php      |  1 -
 apps/gallery/lib/album.php                |  2 +-
 apps/gallery/lib/managers.php             |  1 -
 apps/gallery/lib/tiles.php                |  2 +-
 apps/media/lib_ampache.php                |  1 -
 apps/media/lib_collection.php             |  3 +--
 apps/media/lib_media.php                  |  6 +++---
 apps/remoteStorage/lib_remoteStorage.php  | 13 ++++++-------
 lib/archive/zip.php                       |  1 -
 lib/filecache/update.php                  |  1 -
 lib/filestorage/common.php                |  2 +-
 lib/group/database.php                    |  5 ++---
 lib/group/dummy.php                       |  3 ++-
 lib/group/example.php                     | 18 +++++++++---------
 lib/public/app.php                        | 22 ----------------------
 lib/search/provider.php                   | 10 +++++++---
 lib/user/database.php                     |  8 +++-----
 lib/user/example.php                      | 12 +++---------
 tests/lib/user/database.php               |  1 -
 25 files changed, 39 insertions(+), 82 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index e002053756..46471911d9 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -31,9 +31,7 @@ class OC_CryptStream{
 	public static $sourceStreams=array();
 	private $source;
 	private $path;
-	private $readBuffer;//for streams that dont support seeking
 	private $meta=array();//header/meta for source stream
-	private $count;
 	private $writeCache;
 	private $size;
 	private static $rootView;
@@ -100,7 +98,6 @@ class OC_CryptStream{
 	
 	public function stream_write($data){
 		$length=strlen($data);
-		$written=0;
 		$currentPos=ftell($this->source);
 		if($this->writeCache){
 			$data=$this->writeCache.$data;
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 5e34deb233..8a5e993b1d 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -15,8 +15,6 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	private $root;
 	private $share;
 
-	private static $tempFiles=array();
-
 	public function __construct($params){
 		$this->host=$params['host'];
 		$this->user=$params['user'];
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 68481b4e66..97796bca12 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -13,7 +13,6 @@ if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 }else{
 	class Test_Filestorage_FTP extends Test_FileStorage {
 		private $config;
-		private $id;
 
 		public function setUp(){
 			$id=uniqid();
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 08116f0e74..806db5a6aa 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -28,7 +28,6 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 	class Test_Filestorage_Google extends Test_FileStorage {
 		
 		private $config;
-		private $id;
 
 		public function setUp(){
 			$id=uniqid();
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index e1495b7480..001ef84227 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -14,7 +14,6 @@ if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']){
 }else{
 	class Test_Filestorage_SMB extends Test_FileStorage {
 		private $config;
-		private $id;
 
 		public function setUp(){
 			$id=uniqid();
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index f0bde6ed60..1520c9473d 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -13,7 +13,6 @@ if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
 }else{
 	class Test_Filestorage_SWIFT extends Test_FileStorage {
 		private $config;
-		private $id;
 
 		public function setUp(){
 			$id=uniqid();
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 144659819b..14abbef2cb 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -13,7 +13,6 @@ if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run'])
 }else{
 	class Test_Filestorage_DAV extends Test_FileStorage {
 		private $config;
-		private $id;
 
 		public function setUp(){
 			$id=uniqid();
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 39d6d3aded..701949d4d8 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -58,7 +58,7 @@ class OC_Gallery_Album {
 		return $stmt->execute($args);
 	}
 
-	public static function removeByName($owner, $name) { self::remove($ownmer, $name); }
+	public static function removeByName($owner, $name) { self::remove($owner, $name); }
 	public static function removeByPath($owner, $path) { self::remove($owner, null, $path); }
 	public static function removeByParentPath($owner, $parent) { self::remove($owner, null, null, $parent); }
 	
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index b6ade3d1b1..575d962dbe 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -29,7 +29,6 @@ class DatabaseManager {
 		$stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
 		$stmt->execute(array(\OCP\USER::getUser(), $path, $width, $height));
 		$ret = array('path' => $path, 'width' => $width, 'height' => $height);
-		unset($image);
 		$dir = dirname($path);
 		$this->cache[$dir][$path] = $ret;
 		return $ret;
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 754734e609..e36d26d319 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -33,7 +33,7 @@ class TilesLine {
 	}
 
 	public function setAvailableSpace($space) {
-		$available_space = $space;
+		$this->available_space = $space;
 	}
 
 	public function getTilesCount() {
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index d35cca150b..d5a093338c 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -271,7 +271,6 @@ class OC_MEDIA_AMPACHE{
 </root>");
 			return;
 		}
-		global $SITEROOT;
 		$filter=$params['filter'];
 		$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
 		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index e65930f551..cacab8e959 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -27,7 +27,6 @@ class OC_MEDIA_COLLECTION{
 	public static $uid;
 	private static $artistIdCache=array();
 	private static $albumIdCache=array();
-	private static $songIdCache=array();
 	private static $queries=array();
 	
 	/**
@@ -152,7 +151,7 @@ class OC_MEDIA_COLLECTION{
 			return $artistId;
 		}else{
 			$query=OCP\DB::prepare("INSERT INTO `*PREFIX*media_artists` (`artist_name`) VALUES (?)");
-			$result=$query->execute(array($name));
+			$query->execute(array($name));
 			return self::getArtistId($name);;
 		}
 	}
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 9e687a4af2..54502f4257 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -27,12 +27,12 @@ class OC_MEDIA{
 	 * @param array $params, parameters passed from OC_Hook
 	 */
 	public static function loginListener($params){
-		if(isset($_POST['user']) and $_POST['password']){
-			$name=$_POST['user'];
+		if(isset($params['uid']) and $params['password']){
+			$name=$params['uid'];
 			$query=OCP\DB::prepare("SELECT user_id from *PREFIX*media_users WHERE user_id LIKE ?");
 			$uid=$query->execute(array($name))->fetchAll();
 			if(count($uid)==0){
-				$password=hash('sha256',$_POST['password']);
+				$password=hash('sha256',$params['password']);
 				$query=OCP\DB::prepare("INSERT INTO *PREFIX*media_users (user_id, user_password_sha256) VALUES (?, ?);");
 				$query->execute(array($name,$password));
 			}
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index 42cd9c90f6..c1765640c5 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -17,12 +17,11 @@ class OC_remoteStorage {
 		$user=OCP\USER::getUser();
 		$query=OCP\DB::prepare("SELECT token FROM *PREFIX*authtoken WHERE user=? AND appUrl=? AND category=? LIMIT 1");
 		$result=$query->execute(array($user, $appUrl, $categories));
-		$ret = array();
 		if($row=$result->fetchRow()) {
-		  return base64_encode('remoteStorage:'.$row['token']);
-    } else {
-      return false;
-    }
+			return base64_encode('remoteStorage:'.$row['token']);
+		} else {
+			return false;
+		}
 	}
 
 	public static function getAllTokens() {
@@ -42,13 +41,13 @@ class OC_remoteStorage {
 	public static function deleteToken($token) {
 		$user=OCP\USER::getUser();
 		$query=OCP\DB::prepare("DELETE FROM *PREFIX*authtoken WHERE token=? AND user=?");
-		$result=$query->execute(array($token,$user));
+		$query->execute(array($token,$user));
 		return 'unknown';//how can we see if any rows were affected?
 	}
 	private static function addToken($token, $appUrl, $categories){
 		$user=OCP\USER::getUser();
 		$query=OCP\DB::prepare("INSERT INTO *PREFIX*authtoken (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
-		$result=$query->execute(array($token,$appUrl,$user,$categories));
+		$query->execute(array($token,$appUrl,$user,$categories));
 	}
 	public static function createCategories($appUrl, $categories) {
 		$token=uniqid();
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index ff405ce098..b2d6674d63 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -11,7 +11,6 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @var ZipArchive zip
 	 */
 	private $zip=null;
-	private $success=false;
 	private $path;
 	
 	function __construct($source){
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index dd77f491ca..93b632acb4 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -207,7 +207,6 @@ class OC_FileCache_Update{
 
 		$cached=OC_FileCache_Cached::get($oldPath,$root);
 		$oldSize=$cached['size'];
-		$size=$view->filesize($newPath);
 		OC_FileCache::increaseSize(dirname($oldPath),-$oldSize,$root);
 		OC_FileCache::increaseSize(dirname($newPath),$oldSize,$root);
 		OC_FileCache::move($oldPath,$newPath);
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index ba78fca80e..fd389d3e2d 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -220,7 +220,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		}
 		$tmpFile=OC_Helper::tmpFile($extension);
 		$target=fopen($tmpFile,'w');
-		$count=OC_Helper::streamCopy($source,$target);
+		OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
 	}
 // 	abstract public function touch($path, $mtime=null);
diff --git a/lib/group/database.php b/lib/group/database.php
index fb173665eb..2770ec185c 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -41,7 +41,6 @@
  * Class for group management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_Group_Database extends OC_Group_Backend {
-	private $userGroupCache=array();
 
 	/**
 	 * @brief Try to create a new group
@@ -116,7 +115,7 @@ class OC_Group_Database extends OC_Group_Backend {
 		// No duplicate entries!
 		if( !$this->inGroup( $uid, $gid )){
 			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" );
-			$result = $query->execute( array( $uid, $gid ));
+			$query->execute( array( $uid, $gid ));
 			return true;
 		}else{
 			return false;
@@ -133,7 +132,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 */
 	public function removeFromGroup( $uid, $gid ){
 		$query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" );
-		$result = $query->execute( array( $uid, $gid ));
+		$query->execute( array( $uid, $gid ));
 
 		return true;
 	}
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 0825b10708..1243891023 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -126,7 +126,8 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 */
 	public function getUserGroups($uid){
 		$groups=array();
-		foreach($this->groups as $group=>$user){
+		$allGroups=array_keys($this->groups);
+		foreach($allGroups as $group){
 			if($this->inGroup($uid,$group)){
 				$groups[]=$group;
 			}
diff --git a/lib/group/example.php b/lib/group/example.php
index c18562db7a..f9c62fb978 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -34,7 +34,7 @@ abstract class OC_Group_Example {
 	 * Trys to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public static function createGroup($gid){}
+	abstract public static function createGroup($gid);
 
 	/**
 	 * @brief delete a group
@@ -43,7 +43,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public static function deleteGroup($gid){}
+	abstract public static function deleteGroup($gid);
 
 	/**
 	 * @brief is user in group?
@@ -53,7 +53,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup($uid, $gid){}
+	abstract public static function inGroup($uid, $gid);
 
 	/**
 	 * @brief Add a user to a group
@@ -63,7 +63,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Adds a user to a group.
 	 */
-	public static function addToGroup($uid, $gid){}
+	abstract public static function addToGroup($uid, $gid);
 
 	/**
 	 * @brief Removes a user from a group
@@ -73,7 +73,7 @@ abstract class OC_Group_Example {
 	 *
 	 * removes the user from a group.
 	 */
-	public static function removeFromGroup($uid,$gid){}
+	abstract public static function removeFromGroup($uid,$gid);
 
 	/**
 	 * @brief Get all groups a user belongs to
@@ -83,7 +83,7 @@ abstract class OC_Group_Example {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public static function getUserGroups($uid){}
+	abstract public static function getUserGroups($uid);
 
 	/**
 	 * @brief get a list of all groups
@@ -91,19 +91,19 @@ abstract class OC_Group_Example {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){}
+	abstract public static function getGroups();
 
 	/**
 	 * check if a group exists
 	 * @param string $gid
 	 * @return bool
 	 */
-	public function groupExists($gid){}
+	public function groupExists($gid);
 
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){}
+	abstract public static function usersInGroup($gid);
 
 }
diff --git a/lib/public/app.php b/lib/public/app.php
index 38c51af9cd..28411933be 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,28 +34,6 @@ namespace OCP;
  * This class provides functions to manage apps in ownCloud
  */
 class App {
-
-        /**
-         * @brief Makes owncloud aware of this app
-         * @brief This call is deprecated and not necessary to use.
-         * @param $data array with all information
-         * @returns true/false
-         *
-         * This function registers the application. $data is an associative array.
-         * The following keys are required:
-         *   - id: id of the application, has to be unique ('addressbook')
-         *   - name: Human readable name ('Addressbook')
-         *   - version: array with Version (major, minor, bugfix) ( array(1, 0, 2))
-         *
-         * The following keys are optional:
-         *   - order: integer, that influences the position of your application in
-         *     a list of applications. Lower values come first.
-         *
-         */
-        public static function register( $data ){
-        }
-
-
         /**
          * @brief adds an entry to the navigation
          * @param $data array containing the data
diff --git a/lib/search/provider.php b/lib/search/provider.php
index 838ab696d0..b3ee79b477 100644
--- a/lib/search/provider.php
+++ b/lib/search/provider.php
@@ -2,13 +2,17 @@
 /**
  * provides search functionalty
  */
-class OC_Search_Provider {
-	public function __construct($options){}
+abstract class OC_Search_Provider {
+	private $options;
+	
+	public function __construct($options){
+		$this->options=$options;
+	}
 	
 	/**
 	 * search for $query
 	 * @param string $query
 	 * @return array An array of OC_Search_Result's
 	 */
-	public function search($query){}
+	abstract public function search($query);
 }
diff --git a/lib/user/database.php b/lib/user/database.php
index a48b8357d6..cc27b3ddbf 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -39,7 +39,6 @@ require_once 'phpass/PasswordHash.php';
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_User_Database extends OC_User_Backend {
-	static private $userGroupCache=array();
 	/**
 	 * @var PasswordHash
 	 */
@@ -87,7 +86,7 @@ class OC_User_Database extends OC_User_Backend {
 	public function deleteUser( $uid ){
 		// Delete user-group-relation
 		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*users` WHERE uid = ?" );
-		$result = $query->execute( array( $uid ));
+		$query->execute( array( $uid ));
 		return true;
 	}
 
@@ -104,11 +103,10 @@ class OC_User_Database extends OC_User_Backend {
 			$hasher=$this->getHasher();
 			$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare( "UPDATE *PREFIX*users SET password = ? WHERE uid = ?" );
-			$result = $query->execute( array( $hash, $uid ));
+			$query->execute( array( $hash, $uid ));
 
 			return true;
-		}
-		else{
+		}else{
 			return false;
 		}
 	}
diff --git a/lib/user/example.php b/lib/user/example.php
index 7f3fd1b857..77246d8136 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -35,9 +35,7 @@ abstract class OC_User_Example extends OC_User_Backend {
 		* Creates a new user. Basic checking of username is done in OC_User
 		* itself, not in its subclasses.
 		*/
-	public function createUser($uid, $password){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
+	abstract public function createUser($uid, $password);
 
 	/**
 		* @brief Set password
@@ -47,9 +45,7 @@ abstract class OC_User_Example extends OC_User_Backend {
 		*
 		* Change the password of a user
 		*/
-	public function setPassword($uid, $password){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
+	abstract public function setPassword($uid, $password);
 
 	/**
 		* @brief Check if the password is correct
@@ -60,7 +56,5 @@ abstract class OC_User_Example extends OC_User_Backend {
 		* Check if the password is correct without logging in the user
 		* returns the user id or false
 		*/
-	public function checkPassword($uid, $password){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
+	abstract public function checkPassword($uid, $password);
 }
diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php
index b2fcce93c5..f484ffa78f 100644
--- a/tests/lib/user/database.php
+++ b/tests/lib/user/database.php
@@ -21,7 +21,6 @@
 */
 
 class Test_User_Database extends Test_User_Backend {
-	private $user=array();
 	/**
 	 * get a new unique user name
 	 * test cases can override this in order to clean up created user

From d393638cc89d029ce07688c98ee4a16161f8d8ab Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 19:03:33 +0200
Subject: [PATCH 1036/1537] forgot to make one function abstract

---
 lib/group/example.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/group/example.php b/lib/group/example.php
index f9c62fb978..9c9ece5ac7 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -98,7 +98,7 @@ abstract class OC_Group_Example {
 	 * @param string $gid
 	 * @return bool
 	 */
-	public function groupExists($gid);
+	abstract public function groupExists($gid);
 
 	/**
 	 * @brief get a list of all users in a group

From 10337c059c7eb822944973b6febe8234cbbbca3e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 20:15:00 +0200
Subject: [PATCH 1037/1537] Added some documentation for OCP\JSON::callCheck()

---
 lib/public/json.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/public/json.php b/lib/public/json.php
index 1bc1e3ab4d..19c563ed83 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -55,6 +55,21 @@ class JSON {
 
 	/**
 	 * @brief Check an ajax get/post call if the request token is valid.
+	 * 
+	 * This method checks for a valid variable 'requesttoken' in $_GET,
+	 * $_POST and $_SERVER. If a valid token is not found, an json error
+	 * response will be return and the method will exit from execution
+	 * of the script.
+	 * The returned json will be in the format:
+	 * 
+	 * {"status":"error","data":{"message":"Token expired. Please reload page."}}
+	 * 
+	 * Add this call to the start of all ajax method files that creates, 
+	 * updates or deletes anything.
+	 * In cases where you e.g. use an ajax call to load a dialog containing
+	 * a submittable form, you will need to add the requesttoken first as a
+	 * parameter to the ajax call, then assign it to the template and finally
+	 * add a hidden input field also named 'requesttoken' containing the value.
 	 * @return json Error msg if not valid.
 	 */
 	public static function callCheck(){

From de8ed98541936d2e109bcdc99875637d671c1bcd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 21:20:51 +0200
Subject: [PATCH 1038/1537] Added some more documentation to OCP\JSON.

---
 lib/public/json.php | 65 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 8 deletions(-)

diff --git a/lib/public/json.php b/lib/public/json.php
index 19c563ed83..d639de0175 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -47,22 +47,34 @@ class JSON {
 
 
 	/**
-	* @brief Check if the user is logged in, send json error msg if not
-	*/
+	 * Check if the user is logged in, send json error msg if not.
+	 * 
+	 * This method checks if a user is logged in. If not, a json error
+	 * response will be return and the method will exit from execution
+	 * of the script.
+	 * The returned json will be in the format:
+	 * 
+	 *     {"status":"error","data":{"message":"Authentication error."}}
+	 * 
+	 * Add this call to the start of all ajax method files that requires
+	 * an authenticated user.
+	 * 
+	 * @return json Error msg if not valid.
+	 */
 	public static function checkLoggedIn(){
 		return(\OC_JSON::checkLoggedIn());
 	}
 
 	/**
-	 * @brief Check an ajax get/post call if the request token is valid.
+	 * Check an ajax get/post call if the request token is valid.
 	 * 
 	 * This method checks for a valid variable 'requesttoken' in $_GET,
-	 * $_POST and $_SERVER. If a valid token is not found, an json error
+	 * $_POST and $_SERVER. If a valid token is not found, a json error
 	 * response will be return and the method will exit from execution
 	 * of the script.
 	 * The returned json will be in the format:
 	 * 
-	 * {"status":"error","data":{"message":"Token expired. Please reload page."}}
+	 *     {"status":"error","data":{"message":"Token expired. Please reload page."}}
 	 * 
 	 * Add this call to the start of all ajax method files that creates, 
 	 * updates or deletes anything.
@@ -70,6 +82,7 @@ class JSON {
 	 * a submittable form, you will need to add the requesttoken first as a
 	 * parameter to the ajax call, then assign it to the template and finally
 	 * add a hidden input field also named 'requesttoken' containing the value.
+	 * 
 	 * @return json Error msg if not valid.
 	 */
 	public static function callCheck(){
@@ -86,8 +99,22 @@ class JSON {
 
 
 	/**
-	* @brief Send json error msg
+	* Send json error msg
+	* 
+	* Return a json error message with optional extra data for 
+	* error message or app specific data.
+	* 
+	* Example use:
+	* 
+	*     $id = [some value]
+	*     OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id)));
+	* 
+	* Will return the json formatted string:
+	* 
+	*     {"status":"error","data":{"message":"An error happened", "id":[some value]}}
+	* 
 	* @param array $data The data to use
+	* @return json formatted error string.
 	*/
 	public static function error( $data = array() ){
 		return(\OC_JSON::error( $data ));
@@ -104,7 +131,18 @@ class JSON {
 
 
 	/**
-	 * @brief Check if the App is enabled and send JSON error message instead
+	 * Check if the App is enabled and send JSON error message instead
+	 * 
+	 * This method checks if a specific app is enabled. If not, a json error
+	 * response will be return and the method will exit from execution
+	 * of the script.
+	 * The returned json will be in the format:
+	 * 
+	 *     {"status":"error","data":{"message":"Application is not enabled."}}
+	 * 
+	 * Add this call to the start of all ajax method files that requires
+	 * a specific app to be enabled.
+	 * 
 	 * @param string $app The app to check
 	 */
 	public static function checkAppEnabled( $app ){
@@ -113,7 +151,18 @@ class JSON {
 
 
 	/**
-	* @brief Check if the user is a admin, send json error msg if not
+	 * Check if the user is a admin, send json error msg if not
+	 * 
+	 * This method checks if the current user has admin rights. If not, a json error
+	 * response will be return and the method will exit from execution
+	 * of the script.
+	 * The returned json will be in the format:
+	 * 
+	 *     {"status":"error","data":{"message":"Authentication error."}}
+	 * 
+	 * Add this call to the start of all ajax method files that requires
+	 * administrative rights.
+	 * 
 	*/
 	public static function checkAdminUser(){
 		return(\OC_JSON::checkAdminUser());

From 29d16f61fae1a1a658ae1edc35f3dd15ca582ca7 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 20 Jul 2012 19:27:51 +0000
Subject: [PATCH 1039/1537] Fix strict standards warnings

---
 lib/MDB2/Driver/sqlite3.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 25927aff63..6bfccadad9 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -1221,7 +1221,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
             return $affected_rows;
         }
 
-        $result =& $this->db->_wrapResult($result, $this->result_types,
+        $result = $this->db->_wrapResult($result, $this->result_types,
             $result_class, $result_wrap_class, $this->limit, $this->offset);
         $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
         return $result;

From 3103a4cb3f506b6ff5d19833bac1a8fb1b949dc6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 21:53:34 +0200
Subject: [PATCH 1040/1537] Corrected retry count for uploaded imports.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 5aead47888..62938698c2 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1841,7 +1841,7 @@ $(document).ready(function(){
 					if(numfiles != uploadedfiles) {
 						Contacts.UI.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
 						retries += 1;
-						if(retries > 0) {
+						if(retries > 3) {
 							numfiles = uploadedfiles = retries = aid = 0;
 							uploadingFiles = {};
 							OC.dialogs.alert(t('contacts', 'Something went wrong with the upload, please retry.'), t('contacts', 'Error'));

From 42fbc111a253633db1a1eef63e54ca0547a36263 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 22:25:09 +0200
Subject: [PATCH 1041/1537] Hide progressbar on error.

---
 apps/contacts/js/contacts.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 62938698c2..9f5803706a 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1844,6 +1844,7 @@ $(document).ready(function(){
 						if(retries > 3) {
 							numfiles = uploadedfiles = retries = aid = 0;
 							uploadingFiles = {};
+							$('#uploadprogressbar').fadeOut();
 							OC.dialogs.alert(t('contacts', 'Something went wrong with the upload, please retry.'), t('contacts', 'Error'));
 							return;
 						}
@@ -1917,6 +1918,7 @@ $(document).ready(function(){
 								});
 							}
 						} else {
+							$('#uploadprogressbar').fadeOut();
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 						}
 					});

From 0af454a23bed216ffb21c2d0398e79648c688bcb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jul 2012 23:11:06 +0200
Subject: [PATCH 1042/1537] Trying to get documentation to "Do The Right Thing"
 (TM)

---
 lib/public/json.php | 143 ++++++++++++++++++++++----------------------
 1 file changed, 73 insertions(+), 70 deletions(-)

diff --git a/lib/public/json.php b/lib/public/json.php
index d639de0175..99df79173e 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -35,69 +35,72 @@ namespace OCP;
  */
 class JSON {
 
-
 	/**
 	* @brief Encode and print $data in JSON format
 	* @param array $data The data to use
 	* @param string $setContentType the optional content type
+	* @return string json formatted string.
 	*/
 	public static function encodedPrint( $data, $setContentType=true ){
 		return(\OC_JSON::encodedPrint( $data, $setContentType ));
 	}
 
-
 	/**
-	 * Check if the user is logged in, send json error msg if not.
-	 * 
-	 * This method checks if a user is logged in. If not, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 * 
-	 *     {"status":"error","data":{"message":"Authentication error."}}
-	 * 
-	 * Add this call to the start of all ajax method files that requires
-	 * an authenticated user.
-	 * 
-	 * @return json Error msg if not valid.
-	 */
+	* Check if the user is logged in, send json error msg if not.
+	* 
+	* This method checks if a user is logged in. If not, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Authentication error."}}
+	* 
+	* Add this call to the start of all ajax method files that requires
+	* an authenticated user.
+	* 
+	* @return string json formatted error string if not authenticated.
+	*/
 	public static function checkLoggedIn(){
 		return(\OC_JSON::checkLoggedIn());
 	}
 
 	/**
-	 * Check an ajax get/post call if the request token is valid.
-	 * 
-	 * This method checks for a valid variable 'requesttoken' in $_GET,
-	 * $_POST and $_SERVER. If a valid token is not found, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 * 
-	 *     {"status":"error","data":{"message":"Token expired. Please reload page."}}
-	 * 
-	 * Add this call to the start of all ajax method files that creates, 
-	 * updates or deletes anything.
-	 * In cases where you e.g. use an ajax call to load a dialog containing
-	 * a submittable form, you will need to add the requesttoken first as a
-	 * parameter to the ajax call, then assign it to the template and finally
-	 * add a hidden input field also named 'requesttoken' containing the value.
-	 * 
-	 * @return json Error msg if not valid.
-	 */
+	* Check an ajax get/post call if the request token is valid.
+	* 
+	* This method checks for a valid variable 'requesttoken' in $_GET,
+	* $_POST and $_SERVER. If a valid token is not found, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Token expired. Please reload page."}}
+	* 
+	* Add this call to the start of all ajax method files that creates, 
+	* updates or deletes anything.
+	* In cases where you e.g. use an ajax call to load a dialog containing
+	* a submittable form, you will need to add the requesttoken first as a
+	* parameter to the ajax call, then assign it to the template and finally
+	* add a hidden input field also named 'requesttoken' containing the value.
+	* 
+	* @return string json formatted error string if not valid.
+	*/
 	public static function callCheck(){
 		return(\OC_JSON::callCheck());
 	}
 
 	/**
-	* @brief Send json success msg
+	* Send json success msg
+	* 
+	* Return a json success message with optional extra data.
+	* @see OCP\JSON::error() 		for the format to use.
+	* 
 	* @param array $data The data to use
+	* @return string json formatted string.
 	*/
 	public static function success( $data = array() ){
 		return(\OC_JSON::success( $data ));
 	}
 
-
 	/**
 	* Send json error msg
 	* 
@@ -114,55 +117,55 @@ class JSON {
 	*     {"status":"error","data":{"message":"An error happened", "id":[some value]}}
 	* 
 	* @param array $data The data to use
-	* @return json formatted error string.
+	* @return string json formatted error string.
 	*/
 	public static function error( $data = array() ){
 		return(\OC_JSON::error( $data ));
 	}
 
-
 	/**
-	 * @brief set Content-Type header to jsonrequest
-	 * @param array $type The contwnt type header
-	 */
+	* @brief set Content-Type header to jsonrequest
+	* @param array $type The contwnt type header
+	* @return string json formatted string.
+	*/
 	public static function setContentTypeHeader( $type='application/json' ){
 		return(\OC_JSON::setContentTypeHeader( $type ));
 	}
 
-
 	/**
-	 * Check if the App is enabled and send JSON error message instead
-	 * 
-	 * This method checks if a specific app is enabled. If not, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 * 
-	 *     {"status":"error","data":{"message":"Application is not enabled."}}
-	 * 
-	 * Add this call to the start of all ajax method files that requires
-	 * a specific app to be enabled.
-	 * 
-	 * @param string $app The app to check
-	 */
+	* Check if the App is enabled and send JSON error message instead
+	* 
+	* This method checks if a specific app is enabled. If not, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Application is not enabled."}}
+	* 
+	* Add this call to the start of all ajax method files that requires
+	* a specific app to be enabled.
+	* 
+	* @param string $app The app to check
+	* @return string json formatted string if not enabled.
+	*/
 	public static function checkAppEnabled( $app ){
 		return(\OC_JSON::checkAppEnabled( $app ));
 	}
 
-
 	/**
-	 * Check if the user is a admin, send json error msg if not
-	 * 
-	 * This method checks if the current user has admin rights. If not, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 * 
-	 *     {"status":"error","data":{"message":"Authentication error."}}
-	 * 
-	 * Add this call to the start of all ajax method files that requires
-	 * administrative rights.
-	 * 
+	* Check if the user is a admin, send json error msg if not
+	* 
+	* This method checks if the current user has admin rights. If not, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Authentication error."}}
+	* 
+	* Add this call to the start of all ajax method files that requires
+	* administrative rights.
+	* 
+	* @return string json formatted string if not admin user.
 	*/
 	public static function checkAdminUser(){
 		return(\OC_JSON::checkAdminUser());

From 53bdb049cb3d2b005e5f6d17117f878b74aa0194 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 20 Jul 2012 23:31:08 +0200
Subject: [PATCH 1043/1537] adapted to new SabreDav version

---
 lib/connector/sabre/client.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/connector/sabre/client.php b/lib/connector/sabre/client.php
index 87f9d59b3a..7e8f21264f 100644
--- a/lib/connector/sabre/client.php
+++ b/lib/connector/sabre/client.php
@@ -68,18 +68,13 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 				// Automatically follow redirects
 				CURLOPT_FOLLOWLOCATION => true,
 				CURLOPT_MAXREDIRS => 5,
-				CURLOPT_SSL_VERIFYPEER => true,
-				//CURLOPT_SSL_VERIFYPEER	=> false,
 		);
-		
+	
 		if($this->trustedCertificates) {
 			$curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;
 		}
-	
+		
 		switch ($method) {
-			case 'PUT':
-				$curlSettings[CURLOPT_PUT] = true;
-				break;
 			case 'HEAD' :
 	
 				// do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD
@@ -110,8 +105,15 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 			$curlSettings[CURLOPT_PROXY] = $this->proxy;
 		}
 	
-		if ($this->userName) {
-			$curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
+		if ($this->userName && $this->authType) {
+			$curlType = 0;
+			if ($this->authType & self::AUTH_BASIC) {
+				$curlType |= CURLAUTH_BASIC;
+			}
+			if ($this->authType & self::AUTH_DIGEST) {
+				$curlType |= CURLAUTH_DIGEST;
+			}
+			$curlSettings[CURLOPT_HTTPAUTH] = $curlType;
 			$curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
 		}
 	
@@ -167,5 +169,5 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 	
 		return $response;
 	
-	}
+	}	
 }
\ No newline at end of file

From cdd9ffc8a5dba2d4c3d83d77fc7806fd017a6b97 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 20 Jul 2012 23:52:47 +0200
Subject: [PATCH 1044/1537] Add ETag support to the Sabre file connector.

This is based on the md5 of the file, can be changed later
---
 lib/connector/sabre/directory.php | 22 +++++++++++++++++++---
 lib/connector/sabre/file.php      | 25 +++++++++++++++++++++----
 lib/connector/sabre/node.php      | 26 ++++++++++++++++++++++++++
 lib/filesystem.php                |  8 ++++++++
 4 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index f3f6541a8d..0842fc4fc6 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -26,17 +26,33 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	/**
 	 * Creates a new file in the directory
 	 *
-	 * data is a readable stream resource
+	 * Data will either be supplied as a stream resource, or in certain cases
+	 * as a string. Keep in mind that you may have to support either.
+	 *
+	 * After succesful creation of the file, you may choose to return the ETag
+	 * of the new file here.
+	 *
+	 * The returned ETag must be surrounded by double-quotes (The quotes should
+	 * be part of the actual string).
+	 *
+	 * If you cannot accurately determine the ETag, you should not return it.
+	 * If you don't store the file exactly as-is (you're transforming it
+	 * somehow) you should also not return an ETag.
+	 *
+	 * This means that if a subsequent GET to this new file does not exactly
+	 * return the same contents of what was submitted here, you are strongly
+	 * recommended to omit the ETag.
 	 *
 	 * @param string $name Name of the file
-	 * @param resource $data Initial payload
-	 * @return void
+	 * @param resource|string $data Initial payload
+	 * @return null|string
 	 */
 	public function createFile($name, $data = null) {
 
 		$newPath = $this->path . '/' . $name;
 		OC_Filesystem::file_put_contents($newPath,$data);
 
+		return OC_Connector_Sabre_Node::getETagPropertyForFile($newPath);
 	}
 
 	/**
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 4700dbf8b8..80f0a0ab4d 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -26,13 +26,28 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	/**
 	 * Updates the data
 	 *
+	 * The data argument is a readable stream resource.
+	 *
+	 * After a succesful put operation, you may choose to return an ETag. The
+	 * etag must always be surrounded by double-quotes. These quotes must
+	 * appear in the actual string you're returning.
+	 *
+	 * Clients may use the ETag from a PUT request to later on make sure that
+	 * when they update the file, the contents haven't changed in the mean
+	 * time.
+	 *
+	 * If you don't plan to store the file byte-by-byte, and you return a
+	 * different object on a subsequent GET you are strongly recommended to not
+	 * return an ETag, and just return null.
+	 *
 	 * @param resource $data
-	 * @return void
+	 * @return string|null
 	 */
 	public function put($data) {
 
 		OC_Filesystem::file_put_contents($this->path,$data);
 
+		return OC_Connector_Sabre_Node::getETagPropertyForFile($this->path);
 	}
 
 	/**
@@ -79,9 +94,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * @return mixed
 	 */
 	public function getETag() {
-
-		return null;
-
+		$properties = $this->getProperties(array(self::GETETAG_PROPERTYNAME));
+		if (isset($properties[self::GETETAG_PROPERTYNAME])) {
+			return $properties[self::GETETAG_PROPERTYNAME];
+		}
+		return $this->getETagPropertyForFile($this->path);
 	}
 
 	/**
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index be315a0ffd..5bb92922f8 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -22,6 +22,7 @@
  */
 
 abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IProperties {
+	const GETETAG_PROPERTYNAME = '{DAV:}getetag';
 
 	/**
 	 * The path to the current node
@@ -200,4 +201,29 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		}
 		return $props;
 	}
+
+	/**
+	 * Returns the ETag surrounded by double-quotes for this path.
+	 * @param string $path Path of the file
+	 * @return string|null Returns null if the ETag can not effectively be determined
+	 */
+	static public function getETagPropertyForFile($path) {
+		$tag = OC_Filesystem::hash('md5', $path);
+		if (empty($tag)) {
+			return null;
+		}
+		$etag = '"'.$tag.'"';
+		$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
+		$query->execute( array( OC_User::getUser(), $path, self::GETETAG_PROPERTYNAME, $etag ));
+		return $etag;
+	}
+
+	/**
+	 * Remove the ETag from the cache.
+	 * @param string $path Path of the file
+	 */
+	static public function removeETagPropertyForFile($path) {
+		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
+		$query->execute( array( OC_User::getUser(), $path, self::GETETAG_PROPERTYNAME ));
+	}
 }
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 148656be00..67dff95a18 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -483,7 +483,15 @@ class OC_Filesystem{
 	static public function hasUpdated($path,$time){
 		return self::$defaultInstance->hasUpdated($path,$time);
 	}
+
+	static public function removeETagHook() {
+		$path=$params['path'];
+		OC_Connector_Sabre_Node::removeETagPropertyForFile($path);
+	}
 }
+OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_Filesystem','removeETagHook');
+OC_Hook::connect('OC_Filesystem','post_rename','OC_Filesystem','removeETagHook');
 
 OC_Util::setupFS();
 require_once('filecache.php');

From 14af503374f5667e474de9c7f3762c7624d179a1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 21 Jul 2012 00:12:04 +0200
Subject: [PATCH 1045/1537] Fix parameter order in OC_Filestorage_Common->hash

---
 lib/filestorage/local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 0ed184c802..d60f32b15b 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -156,7 +156,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $return;
 	}
 
-	public function hash($type,$path,$raw){
+	public function hash($path,$type,$raw=false){
 		return hash_file($type,$this->datadir.$path,$raw);
 	}
 

From 0b338a7a413a3975ac1865e56c70b9c5a668a21f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 21 Jul 2012 00:13:23 +0200
Subject: [PATCH 1046/1537] Add missing public to function definition

---
 lib/connector/sabre/node.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 5bb92922f8..3cb5412f09 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -179,7 +179,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param array $properties
 	 * @return void
 	 */
-	function getProperties($properties) {
+	public function getProperties($properties) {
 		if (is_null($this->property_cache)) {
 			$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ? AND propertypath = ?' );
 			$result = $query->execute( array( OC_User::getUser(), $this->path ));

From aa118a4c64c5958dcea1cdef299a8b22293ed2db Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 21 Jul 2012 00:06:01 +0200
Subject: [PATCH 1047/1537] remove obsolete oc_filesystem::mountall

---
 lib/filesystem.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 67dff95a18..7402d2cc25 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -321,17 +321,6 @@ class OC_Filesystem{
 		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
-
-	/**
-	 * create all storage backends mounted in the filesystem
-	 */
-	static private function mountAll(){
-		foreach(self::$mounts as $mountPoint=>$mount){
-			if(!isset(self::$storages[$mountPoint])){
-				self::$storages[$mountPoint]=self::createStorage($mount['type'],$mount['arguments']);
-			}
-		}
-	}
 	
 	/**
 	* return the path to a local version of the file

From 48ec78299ec1b8b3cb7878d469a10e982f83934d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 21 Jul 2012 00:12:12 +0200
Subject: [PATCH 1048/1537] cleanup some obsolete foldersize code from the
 shared storage backend

---
 apps/files_sharing/sharedstorage.php | 35 +---------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index e1c6e8f2eb..32fd212442 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -67,7 +67,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	public function rmdir($path) {
 		// The folder will be removed from the database, but won't be deleted from the owner's filesystem
 		OC_Share::unshareFromMySelf($this->datadir.$path);
-		$this->clearFolderSizeCache($path);
 	}
 	
 	public function opendir($path) {
@@ -200,26 +199,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 
-	private function clearFolderSizeCache($path) {
-		$path = rtrim($path, "/");
-		$path = preg_replace('{(/)\1+}', "/", $path);
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$dbpath = rtrim($this->datadir.$path, "/");
-// 		$query = OCP\DB::prepare("DELETE FROM *PREFIX*/*foldersize*/ WHERE path = ?");
-// 		$result = $query->execute(array($dbpath));
-		if ($path != "/" && $path != "") {
-			$parts = explode("/", $path);
-			$part = array_pop($parts);
-			if (empty($part)) {
-				array_pop($parts);
-			}
-			$parent = implode("/", $parts);
-			$this->clearFolderSizeCache($parent);
-		}
-	}
-
 	public function is_readable($path) {
 		return true;
 	}
@@ -312,9 +291,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 				OCP\Util::emitHook('OC_Filestorage_Shared', 'file_put_contents', $info);
 				$storage = OC_Filesystem::getStorage($source);
 				$result = $storage->file_put_contents($this->getInternalPath($source), $data);
-				if ($result) {
-					$this->clearFolderSizeCache($path);
-				}
 				return $result;
 			}
 		}
@@ -336,7 +312,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		} else {
 			OC_Share::unshareFromMySelf($target);
 		}
-		$this->clearFolderSizeCache($this->getInternalPath($target));
 		return true;
 	}
 	
@@ -372,8 +347,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		} else {
 			OC_Share::setTarget($oldTarget, $newTarget);
 		}
-		$this->clearFolderSizeCache($this->getInternalPath($oldTarget));
-		$this->clearFolderSizeCache($this->getInternalPath($newTarget));
 		return true;
 	}
 	
@@ -384,9 +357,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			if ($this->is_writable($path2)) {
 				$tmpFile = $this->toTmpFile($path1);
 				$result = $this->fromTmpFile($tmpFile, $path2);
-				if ($result) {
-					$this->clearFolderSizeCache($path2);
-				}
 				return $result;
 			} else {
 				return false;
@@ -422,9 +392,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				$result = $storage->fromTmpFile($tmpFile, $this->getInternalPath($source));
-				if ($result) {
-					$this->clearFolderSizeCache($path);
-				}
 				return $result;
 			}
 		} else {
@@ -491,7 +458,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$source = $this->getSource($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
-			return $storage->touch($this->getInternalPath($source),$time);
+			return $storage->touch($this->getInternalPath($source),$mtime);
 		}
 	}
 

From 8a19e134df09dd9a3e49736489f28ad0aee79803 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 21 Jul 2012 00:20:04 +0200
Subject: [PATCH 1049/1537] fix ununsed variables

---
 apps/files_versions/lib/versions.php | 6 +++---
 lib/connector/sabre/locks.php        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 0ce884c3ea..f146676757 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -227,13 +227,13 @@ class Storage {
 			}
 				
 			$versions = array_reverse( $versions );
-				
+			
 			foreach( $versions as $key => $value ) {
 
 				// flag the first matched file in array (which will have latest modification date) as current version
-				if ( $versions[$key]['fileMatch'] ) {
+				if ( $value['fileMatch'] ) {
 
-					$versions[$key]['cur'] = 1;
+					$value['cur'] = 1;
 					break;
 						
 				}
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 94382e68a1..e95dcf02d2 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -108,7 +108,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 
 		$locks = $this->getLocks($uri,false);
 		$exists = false;
-		foreach($locks as $k=>$lock) {
+		foreach($locks as $lock) {
 			if ($lock->token == $lockInfo->token) $exists = true;
 		}
 	

From 06b5e05c86d29de51a18f13e1d44787a3021a8f0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 00:42:21 +0200
Subject: [PATCH 1050/1537] Damn, that Jenkins dude is tough ;)

---
 apps/contacts/lib/VCFExportPlugin.php |  8 ++++----
 apps/contacts/lib/hooks.php           | 18 ++++++++++++------
 apps/contacts/lib/vcard.php           |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/apps/contacts/lib/VCFExportPlugin.php b/apps/contacts/lib/VCFExportPlugin.php
index 6554cb258e..9a64c964b0 100644
--- a/apps/contacts/lib/VCFExportPlugin.php
+++ b/apps/contacts/lib/VCFExportPlugin.php
@@ -31,7 +31,7 @@ class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
     public function initialize(Sabre_DAV_Server $server) {
 
         $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+        $this->server->subscribeEvent('beforeMethod', array($this,'beforeMethod'), 90);
 
     }
 
@@ -49,7 +49,7 @@ class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
         if ($this->server->httpRequest->getQueryString()!='export') return;
 
         // splitting uri
-        list($uri) = explode('?',$uri,2);
+        list($uri) = explode('?', $uri, 2);
 
         $node = $this->server->tree->getNodeForPath($uri);
 
@@ -60,12 +60,12 @@ class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
             $aclPlugin->checkPrivileges($uri, '{DAV:}read');
         }
 
-        $this->server->httpResponse->setHeader('Content-Type','text/directory');
+        $this->server->httpResponse->setHeader('Content-Type', 'text/directory');
         $this->server->httpResponse->sendStatus(200);
 
         $nodes = $this->server->getPropertiesForPath($uri, array(
             '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data',
-        ),1);
+        ), 1);
 
         $this->server->httpResponse->sendBody($this->generateVCF($nodes));
 
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 6239aec49e..3344e3d693 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -61,8 +61,8 @@ class OC_Contacts_Hooks{
 	static public function getCalenderSources($parameters) {
 		$base_url = OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id=';
 		foreach(OC_Contacts_Addressbook::all(OCP\USER::getUser()) as $addressbook) {
-			$parameters['sources'][] =
-				array(
+			$parameters['sources'][] 
+				= array(
 					'url' => $base_url.'birthday_'. $addressbook['id'],
 					'backgroundColor' => '#cccccc',
 					'borderColor' => '#888',
@@ -91,18 +91,24 @@ class OC_Contacts_Hooks{
 				$date = new DateTime($birthday);
 				$vevent = new OC_VObject('VEVENT');
 				//$vevent->setDateTime('LAST-MODIFIED', new DateTime($vcard->REV));
-				$vevent->setDateTime('DTSTART', $date, Sabre_VObject_Element_DateTime::DATE);
+				$vevent->setDateTime('DTSTART', $date, 
+					Sabre_VObject_Element_DateTime::DATE);
 				$vevent->setString('DURATION', 'P1D');
-				$vevent->setString('UID', substr(md5(rand().time()),0,10));
+				$vevent->setString('UID', substr(md5(rand().time()), 0, 10));
 				// DESCRIPTION?
 				$vevent->setString('RRULE', 'FREQ=YEARLY');
-				$title = str_replace('{name}', $vcard->getAsString('FN'), OC_Contacts_App::$l10n->t('{name}\'s Birthday'));
+				$title = str_replace('{name}',
+					$vcard->getAsString('FN'), 
+					OC_Contacts_App::$l10n->t('{name}\'s Birthday'));
 				$parameters['events'][] = array(
 					'id' => 0,//$card['id'],
 					'vevent' => $vevent,
 					'repeating' => true,
 					'summary' => $title,
-					'calendardata' => "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Contacts " . OCP\App::getAppVersion('contacts') . "\n" . $vevent->serialize() .  "END:VCALENDAR"
+					'calendardata' => "BEGIN:VCALENDAR\nVERSION:2.0\n"
+						. "PRODID:ownCloud Contacts " 
+						. OCP\App::getAppVersion('contacts') . "\n" 
+						. $vevent->serialize() .  "END:VCALENDAR"
 					);
 			}
 		}
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 6b9a4c04f1..ca171e792f 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -212,7 +212,7 @@ class OC_Contacts_VCard{
 		// Add version if needed
 		if($version && $version < '3.0') {
 			$upgrade = true;
-			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version,OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version, OCP\Util::DEBUG);
 		}
 		foreach($vcard->children as &$property){
 			// Decode string properties and remove obsolete properties.

From 1c30a97833235e585528da288d20663f65ac25b3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 21 Jul 2012 00:44:34 +0200
Subject: [PATCH 1051/1537] Style fixes

---
 apps/tasks/index.php   |  4 ++--
 apps/tasks/lib/app.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/tasks/index.php b/apps/tasks/index.php
index 4ff304a560..f1c4d1e765 100644
--- a/apps/tasks/index.php
+++ b/apps/tasks/index.php
@@ -21,8 +21,8 @@ OCP\Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker');
 OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');
 OCP\Util::addScript('tasks', 'tasks');
 OCP\Util::addStyle('tasks', 'style');
-OCP\Util::addScript('contacts','jquery.multi-autocomplete');
-OCP\Util::addScript('','oc-vcategories');
+OCP\Util::addScript('contacts', 'jquery.multi-autocomplete');
+OCP\Util::addScript('', 'oc-vcategories');
 OCP\App::setActiveNavigationEntry('tasks_index');
 
 $categories = OC_Calendar_App::getCategoryOptions();
diff --git a/apps/tasks/lib/app.php b/apps/tasks/lib/app.php
index 1b42968f0b..7c23bbc1f4 100644
--- a/apps/tasks/lib/app.php
+++ b/apps/tasks/lib/app.php
@@ -77,7 +77,7 @@ class OC_Task_App {
 	public static function validateRequest($request)
 	{
 		$errors = array();
-		if($request['summary'] == ''){
+		if($request['summary'] == '') {
 			$errors['summary'] = self::$l10n->t('Empty Summary');
 		}
 
@@ -89,10 +89,10 @@ class OC_Task_App {
 			$errors['due'] = self::$l10n->t('Invalid date/time');
 		}
 
-		if ($request['percent_complete'] < 0 || $request['percent_complete'] > 100){
+		if ($request['percent_complete'] < 0 || $request['percent_complete'] > 100) {
 			$errors['percent_complete'] = self::$l10n->t('Invalid percent complete');
 		}
-		if ($request['percent_complete'] == 100 && !empty($request['completed'])){
+		if ($request['percent_complete'] == 100 && !empty($request['completed'])) {
 			try {
 				$timezone = OCP\Config::getUserValue(OCP\User::getUser(), "calendar", "timezone", "Europe/London");
 				$timezone = new DateTimeZone($timezone);
@@ -168,8 +168,8 @@ class OC_Task_App {
 			$vtodo->__unset('PERCENT-COMPLETE');
 		}
 
-		if ($percent_complete == 100){
-			if (!$completed){
+		if ($percent_complete == 100) {
+			if (!$completed) {
 				$completed = 'now';
 			}
 		} else {

From 060b8865a4701cfe400e424765031c219330fa1a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 21 Jul 2012 00:45:13 +0200
Subject: [PATCH 1052/1537] DRY for getting calendar timezone setting

---
 apps/calendar/ajax/event/new.form.php |  2 +-
 apps/calendar/lib/app.php             | 14 ++++++++++++--
 apps/calendar/lib/object.php          |  2 +-
 apps/calendar/lib/search.php          |  2 +-
 apps/tasks/ajax/addtask.php           |  2 +-
 apps/tasks/ajax/edittask.php          |  2 +-
 apps/tasks/ajax/gettasks.php          |  2 +-
 apps/tasks/ajax/update_property.php   |  4 ++--
 apps/tasks/lib/app.php                |  8 ++++----
 9 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
index 0b19e7e92f..db04cdf2d4 100644
--- a/apps/calendar/ajax/event/new.form.php
+++ b/apps/calendar/ajax/event/new.form.php
@@ -27,7 +27,7 @@ if (!$end){
 }
 $start = new DateTime('@'.$start);
 $end = new DateTime('@'.$end);
-$timezone = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+$timezone = OC_Calendar_App::getTimezone();
 $start->setTimezone(new DateTimeZone($timezone));
 $end->setTimezone(new DateTimeZone($timezone));
 
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 1a13f2958c..29e5ab5b0c 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -9,7 +9,7 @@
  * This class manages our app actions
  */
 OC_Calendar_App::$l10n = new OC_L10N('calendar');
-OC_Calendar_App::$tz = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+OC_Calendar_App::$tz = OC_Calendar_App::getTimezone();
 class OC_Calendar_App{
 	const CALENDAR = 'calendar';
 	const EVENT = 'event';
@@ -282,7 +282,17 @@ class OC_Calendar_App{
 	public static function getWeekofMonth(){
 		return OC_Calendar_Object::getWeekofMonth(self::$l10n);
 	}
-	
+
+	/**
+	 * @return (string) $timezone as set by user or the default timezone
+	 */
+	public static function getTimezone() {
+		return OCP\Config::getUserValue(OCP\User::getUser(),
+						'calendar',
+						'timezone',
+						date_default_timezone_get());
+	}
+
 	/**
 	 * @brief checks the access for a calendar / an event
 	 * @param (int) $id - id of the calendar / event
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 140542bf4f..3467683020 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -856,7 +856,7 @@ class OC_Calendar_Object{
 			$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::DATE);
 			$vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::DATE);
 		}else{
-			$timezone = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+			$timezone = OC_Calendar_App::getTimezone();
 			$timezone = new DateTimeZone($timezone);
 			$start = new DateTime($from.' '.$fromtime, $timezone);
 			$end = new DateTime($to.' '.$totime, $timezone);
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 560330f65e..551489672b 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -12,7 +12,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 		}else{
 			$searchquery[] = $query;
 		}
-		$user_timezone = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+		$user_timezone = OC_Calendar_App::getTimezone();
 		$l = new OC_l10n('calendar');
 		foreach($calendars as $calendar){
 			$objects = OC_Calendar_Object::all($calendar['id']);
diff --git a/apps/tasks/ajax/addtask.php b/apps/tasks/ajax/addtask.php
index 188e179236..d98fdbf388 100644
--- a/apps/tasks/ajax/addtask.php
+++ b/apps/tasks/ajax/addtask.php
@@ -22,7 +22,7 @@ $request['description'] = null;
 $vcalendar = OC_Task_App::createVCalendarFromRequest($request);
 $id = OC_Calendar_Object::add($cid, $vcalendar->serialize());
 
-$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+$user_timezone = OC_Calendar_App::getTimezone();
 $task = OC_Task_App::arrayForJSON($id, $vcalendar->VTODO, $user_timezone);
 
 OCP\JSON::success(array('task' => $task));
diff --git a/apps/tasks/ajax/edittask.php b/apps/tasks/ajax/edittask.php
index 77ecff13e6..e1475c7d45 100644
--- a/apps/tasks/ajax/edittask.php
+++ b/apps/tasks/ajax/edittask.php
@@ -26,7 +26,7 @@ $tmpl->assign('details', $vcalendar->VTODO);
 $tmpl->assign('id', $id);
 $page = $tmpl->fetchPage();
 
-$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+$user_timezone = OC_Calendar_App::getTimezone();
 $task = OC_Task_App::arrayForJSON($id, $vcalendar->VTODO, $user_timezone);
 
 OCP\JSON::success(array('data' => array( 'id' => $id, 'page' => $page, 'task' => $task )));
diff --git a/apps/tasks/ajax/gettasks.php b/apps/tasks/ajax/gettasks.php
index 011730d0a1..b6183d9cb6 100644
--- a/apps/tasks/ajax/gettasks.php
+++ b/apps/tasks/ajax/gettasks.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('tasks');
 
 $calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+$user_timezone = OC_Calendar_App::getTimezone();
 
 $tasks = array();
 foreach( $calendars as $calendar ){
diff --git a/apps/tasks/ajax/update_property.php b/apps/tasks/ajax/update_property.php
index f47040a77d..679cfdefe4 100644
--- a/apps/tasks/ajax/update_property.php
+++ b/apps/tasks/ajax/update_property.php
@@ -39,7 +39,7 @@ switch($property) {
 		$type = null;
 		if ($due != 'false') {
 			try {
-				$timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+				$timezone = OC_Calendar_App::getTimezone();
 				$timezone = new DateTimeZone($timezone);
 				$due = new DateTime('@'.$due);
 				$due->setTimezone($timezone);
@@ -64,6 +64,6 @@ switch($property) {
 }
 OC_Calendar_Object::edit($id, $vcalendar->serialize());
 
-$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+$user_timezone = OC_Calendar_App::getTimezone();
 $task_info = OC_Task_App::arrayForJSON($id, $vtodo, $user_timezone);
 OCP\JSON::success(array('data' => $task_info));
diff --git a/apps/tasks/lib/app.php b/apps/tasks/lib/app.php
index 7c23bbc1f4..a97c6b95d1 100644
--- a/apps/tasks/lib/app.php
+++ b/apps/tasks/lib/app.php
@@ -82,7 +82,7 @@ class OC_Task_App {
 		}
 
 		try {
-			$timezone = OCP\Config::getUserValue(OCP\User::getUser(), "calendar", "timezone", "Europe/London");
+			$timezone = OC_Calendar_App::getTimezone();
 			$timezone = new DateTimeZone($timezone);
 			new DateTime($request['due'], $timezone);
 		} catch (Exception $e) {
@@ -94,7 +94,7 @@ class OC_Task_App {
 		}
 		if ($request['percent_complete'] == 100 && !empty($request['completed'])) {
 			try {
-				$timezone = OCP\Config::getUserValue(OCP\User::getUser(), "calendar", "timezone", "Europe/London");
+				$timezone = OC_Calendar_App::getTimezone();
 				$timezone = new DateTimeZone($timezone);
 				new DateTime($request['completed'], $timezone);
 			} catch (Exception $e) {
@@ -147,7 +147,7 @@ class OC_Task_App {
 		$vtodo->setString('PRIORITY', $priority);
 
 		if ($due) {
-			$timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+			$timezone = OC_Calendar_App::getTimezone();
 			$timezone = new DateTimeZone($timezone);
 			$due = new DateTime($due, $timezone);
 			$vtodo->setDateTime('DUE', $due);
@@ -176,7 +176,7 @@ class OC_Task_App {
 			$completed = null;
 		}
 		if ($completed) {
-			$timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+			$timezone = OC_Calendar_App::getTimezone();
 			$timezone = new DateTimeZone($timezone);
 			$completed = new DateTime($completed, $timezone);
 			$vtodo->setDateTime('COMPLETED', $completed);

From ad12e13f1473dfdf963bb69a196de5aa16e7ebe8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 21 Jul 2012 00:52:49 +0200
Subject: [PATCH 1053/1537] Tasks: Remove unused code

---
 apps/tasks/ajax/addtaskform.php            | 20 -------
 apps/tasks/ajax/edittask.php               | 32 -----------
 apps/tasks/ajax/edittaskform.php           | 24 ---------
 apps/tasks/ajax/getdetails.php             | 24 ---------
 apps/tasks/js/tasks.js                     | 62 ----------------------
 apps/tasks/templates/part.addtaskform.php  | 15 ------
 apps/tasks/templates/part.details.php      | 42 ---------------
 apps/tasks/templates/part.edittaskform.php |  5 --
 apps/tasks/templates/part.property.php     | 22 --------
 apps/tasks/templates/part.taskform.php     | 36 -------------
 apps/tasks/templates/part.tasks.php        |  3 --
 11 files changed, 285 deletions(-)
 delete mode 100644 apps/tasks/ajax/addtaskform.php
 delete mode 100644 apps/tasks/ajax/edittask.php
 delete mode 100644 apps/tasks/ajax/edittaskform.php
 delete mode 100644 apps/tasks/ajax/getdetails.php
 delete mode 100644 apps/tasks/templates/part.addtaskform.php
 delete mode 100644 apps/tasks/templates/part.details.php
 delete mode 100644 apps/tasks/templates/part.edittaskform.php
 delete mode 100644 apps/tasks/templates/part.property.php
 delete mode 100644 apps/tasks/templates/part.taskform.php
 delete mode 100644 apps/tasks/templates/part.tasks.php

diff --git a/apps/tasks/ajax/addtaskform.php b/apps/tasks/ajax/addtaskform.php
deleted file mode 100644
index d86232e2da..0000000000
--- a/apps/tasks/ajax/addtaskform.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-$category_options = OC_Calendar_App::getCategoryOptions();
-$percent_options = range(0, 100, 10);
-$priority_options = OC_Task_App::getPriorityOptions();
-$tmpl = new OCP\Template('tasks','part.addtaskform');
-$tmpl->assign('calendars',$calendars);
-$tmpl->assign('category_options', $category_options);
-$tmpl->assign('percent_options', $percent_options);
-$tmpl->assign('priority_options', $priority_options);
-$tmpl->assign('details', new OC_VObject('VTODO'));
-$tmpl->assign('categories', '');
-$page = $tmpl->fetchPage();
-
-OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/tasks/ajax/edittask.php b/apps/tasks/ajax/edittask.php
deleted file mode 100644
index e1475c7d45..0000000000
--- a/apps/tasks/ajax/edittask.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-OCP\JSON::callCheck();
-
-$l10n = new OC_L10N('tasks');
-
-$id = $_POST['id'];
-$vcalendar = OC_Calendar_App::getVCalendar($id);
-
-$errors = OC_Task_App::validateRequest($_POST);
-if (!empty($errors)) {
-	OCP\JSON::error(array('data' => array( 'errors' => $errors )));
-	exit();
-}
-
-OC_Task_App::updateVCalendarFromRequest($_POST, $vcalendar);
-OC_Calendar_Object::edit($id, $vcalendar->serialize());
-
-$priority_options = OC_Task_App::getPriorityOptions();
-$tmpl = new OCP\Template('tasks','part.details');
-$tmpl->assign('priority_options', $priority_options);
-$tmpl->assign('details', $vcalendar->VTODO);
-$tmpl->assign('id', $id);
-$page = $tmpl->fetchPage();
-
-$user_timezone = OC_Calendar_App::getTimezone();
-$task = OC_Task_App::arrayForJSON($id, $vcalendar->VTODO, $user_timezone);
-
-OCP\JSON::success(array('data' => array( 'id' => $id, 'page' => $page, 'task' => $task )));
diff --git a/apps/tasks/ajax/edittaskform.php b/apps/tasks/ajax/edittaskform.php
deleted file mode 100644
index e5a0a7297c..0000000000
--- a/apps/tasks/ajax/edittaskform.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-
-$id = $_GET['id'];
-$details = OC_Calendar_App::getVCalendar($id)->VTODO;
-$categories = $details->getAsString('CATEGORIES');
-
-$category_options = OC_Calendar_App::getCategoryOptions();
-$percent_options = range(0, 100, 10);
-$priority_options = OC_Task_App::getPriorityOptions();
-
-$tmpl = new OCP\Template('tasks','part.edittaskform');
-$tmpl->assign('category_options', $category_options);
-$tmpl->assign('percent_options', $percent_options);
-$tmpl->assign('priority_options', $priority_options);
-$tmpl->assign('id',$id);
-$tmpl->assign('details',$details);
-$tmpl->assign('categories', $categories);
-$page = $tmpl->fetchPage();
-
-OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/tasks/ajax/getdetails.php b/apps/tasks/ajax/getdetails.php
deleted file mode 100644
index 4ce469e0c9..0000000000
--- a/apps/tasks/ajax/getdetails.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-
-$l10n = new OC_L10N('tasks');
-
-$id = $_GET['id'];
-$task = OC_Calendar_Object::find($id);
-$details = OC_VObject::parse($task['calendardata']);
-if (!$details){
-	OCP\JSON::error();
-	exit;
-}
-
-$priority_options = OC_Task_App::getPriorityOptions();
-$tmpl = new OCP\Template('tasks','part.details');
-$tmpl->assign('priority_options', $priority_options);
-$tmpl->assign('details',$details->VTODO);
-$tmpl->assign('id',$id);
-$page = $tmpl->fetchPage();
-
-OCP\JSON::success(array('data' => array( 'id' => $id, 'page' => $page )));
diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index bc92965bb0..de62792750 100644
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -469,67 +469,5 @@ $(document).ready(function(){
 		return false;
 	});
 
-	$('#tasks_addtaskform input[type="submit"]').live('click',function(){
-		$.post('ajax/addtask.php',$('#tasks_addtaskform').serialize(),function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#task_details').data('id',jsondata.data.id);
-				$('#task_details').html(jsondata.data.page);
-				$('#tasks_list').append(OC.Tasks.create_task_div(jsondata.data.task));
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		}, 'json');
-		return false;
-	});
-
-	$('#tasks_edit').live('click',function(){
-		var id = $('#task_details').data('id');
-		$.getJSON('ajax/edittaskform.php',{'id':id},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#task_details').html(jsondata.data.page);
-				$('#task_details #categories').multiple_autocomplete({source: categories});
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		return false;
-	});
-
-	$('#tasks_edittaskform #percent_complete').live('change',function(event){
-		if ($(event.target).val() == 100){
-			$('#tasks_edittaskform #complete').show();
-		}else{
-			$('#tasks_edittaskform #complete').hide();
-		}
-	});
-
-	$('#tasks_edittaskform input[type="submit"]').live('click',function(){
-		$.post('ajax/edittask.php',$('#tasks_edittaskform').serialize(),function(jsondata){
-			$('.error_msg').remove();
-			$('.error').removeClass('error');
-			if(jsondata.status == 'success'){
-				var id = jsondata.data.id;
-				$('#task_details').data('id',id);
-				$('#task_details').html(jsondata.data.page);
-				var task = jsondata.data.task;
-				$('#tasks .task[data-id='+id+']')
-					.data('task', task)
-					.html(OC.Tasks.create_task_div(task).html());
-			}
-			else{
-				var errors = jsondata.data.errors;
-				for (k in errors){
-					$('#'+k).addClass('error')
-						.after('<span class="error_msg">'+errors[k]+'</span>');
-				}
-				$('.error_msg').effect('highlight', {}, 3000);
-				$('.error').effect('highlight', {}, 3000);
-			}
-		}, 'json');
-		return false;
-	});
-
 	OCCategories.app = 'calendar';
 });
diff --git a/apps/tasks/templates/part.addtaskform.php b/apps/tasks/templates/part.addtaskform.php
deleted file mode 100644
index 0fad5592aa..0000000000
--- a/apps/tasks/templates/part.addtaskform.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<form id="tasks_addtaskform">
-	<?php if(count($_['calendars'])==1): ?>
-		<input type="hidden" name="id" value="<?php echo $_['calendars'][0]['id']; ?>">
-	<?php else: ?>
-		<label for="id"><?php echo $l->t('Calendar'); ?></label>
-		<select name="id" size="1">
-			<?php foreach($_['calendars'] as $calendar): ?>
-				<option value="<?php echo $calendar['id']; ?>"><?php echo $calendar['displayname']; ?></option>
-			<?php endforeach; ?>
-		</select>
-		<br>
-	<?php endif; ?>
-	<?php echo $this->inc('part.taskform'); ?>
-	<input type="submit" name="submit" value="<?php echo $l->t('Create Task'); ?>">
-</form>
diff --git a/apps/tasks/templates/part.details.php b/apps/tasks/templates/part.details.php
deleted file mode 100644
index 89636b6e76..0000000000
--- a/apps/tasks/templates/part.details.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php if(isset($_['details']->SUMMARY)): ?>
-<table>
-<?php
-echo $this->inc('part.property', array('label' => $l->t('Summary'), 'property' => $_['details']->SUMMARY));
-if(isset($_['details']->LOCATION)):
-	echo $this->inc('part.property', array('label' => $l->t('Location'), 'property' => $_['details']->LOCATION));
-endif;
-if(isset($_['details']->CATEGORIES)):
-	echo $this->inc('part.property', array('label' => $l->t('Categories'), 'property' => $_['details']->CATEGORIES));
-endif;
-if(isset($_['details']->DUE)):
-	echo $this->inc('part.property', array('label' => $l->t('Due'), 'property' => $_['details']->DUE[0]));
-endif;
-if(isset($_['details']->PRIORITY)):
-	echo $this->inc('part.property', array('label' => $l->t('Priority'), 'property' => $_['details']->PRIORITY[0], 'options' => $_['priority_options']));
-endif;
-if($_['details']->__isset('PERCENT-COMPLETE') || isset($_['details']->COMPLETED)):
-?>
-<tr>
-	<th>
-		<?php echo $l->t('Complete') ?>
-	</th>
-	<td>
-<?php if($_['details']->__isset('PERCENT-COMPLETE')):
-		echo $_['details']->__get('PERCENT-COMPLETE')->value.' % ';
-	endif;
-	if(isset($_['details']->COMPLETED)):
-		echo $l->t('on '). $l->l('datetime', $_['details']->COMPLETED[0]->getDateTime());
-	endif;
-	echo '</tr>';
-endif;
-if(isset($_['details']->DESCRIPTION)):
-	echo $this->inc('part.property', array('label' => $l->t('Description'), 'property' => $_['details']->DESCRIPTION));
-endif; ?>
-</table>
-<form>
-	<input type="button" id="tasks_delete" value="<?php echo $l->t('Delete');?>">
-	<input type="button" id="tasks_edit" value="<?php echo $l->t('Edit');?>">
-</form>
-<?php else: ?>
-<?php //var_dump($_['details']); ?>
-<?php endif ?>
diff --git a/apps/tasks/templates/part.edittaskform.php b/apps/tasks/templates/part.edittaskform.php
deleted file mode 100644
index fe123f07ac..0000000000
--- a/apps/tasks/templates/part.edittaskform.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<form id="tasks_edittaskform">
-	<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
-	<?php echo $this->inc('part.taskform'); ?>
-	<input type="submit" name="submit" value="<?php echo $l->t('Update Task'); ?>">
-</form>
diff --git a/apps/tasks/templates/part.property.php b/apps/tasks/templates/part.property.php
deleted file mode 100644
index 591fd363e6..0000000000
--- a/apps/tasks/templates/part.property.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<tr>
-	<th>
-		<?php echo $_['label'] ?>
-	</th>
-	<td>
-		<?php
-			switch (get_class($_['property']))
-			{
-				case 'Sabre_VObject_Element_DateTime':
-					echo $l->l('datetime', $_['property']->getDateTime());
-					break;
-				default:
-					$value = $_['property']->value;
-					if (isset($_['options']))
-					{
-						$value = $_['options'][$value];
-					}
-					echo nl2br($value);
-			}
-		?>
-	</td>
-</tr>
diff --git a/apps/tasks/templates/part.taskform.php b/apps/tasks/templates/part.taskform.php
deleted file mode 100644
index 0a25ed33c9..0000000000
--- a/apps/tasks/templates/part.taskform.php
+++ /dev/null
@@ -1,36 +0,0 @@
-	<label for="summary"><?php echo $l->t('Summary'); ?></label>
-	<input type="text" id="summary" name="summary" placeholder="<?php echo $l->t('Summary of the task');?>" value="<?php echo isset($_['details']->SUMMARY) ? $_['details']->SUMMARY[0]->value : '' ?>">
-	<br>
-	<label for="location"><?php echo $l->t('Location'); ?></label>
-	<input type="text" id="location" name="location" placeholder="<?php echo $l->t('Location of the task');?>" value="<?php echo isset($_['details']->LOCATION) ? $_['details']->LOCATION[0]->value : '' ?>">
-	<br>
-	<label for="categories"><?php echo $l->t('Categories'); ?></label>
-	<input id="categories" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
-	<a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
-	<br>
-	<label for="due"><?php echo $l->t('Due'); ?></label>
-	<input type="text" id="due" name="due" placeholder="<?php echo $l->t('Due date') ?>" value="<?php echo isset($_['details']->DUE) ? $l->l('datetime', $_['details']->DUE[0]->getDateTime()) : '' ?>">
-	<br>
-	<select name="percent_complete" id="percent_complete">
-		<?php
-		foreach($_['percent_options'] as $percent){
-			echo '<option value="' . $percent . '"' . (($_['details']->__get('PERCENT-COMPLETE') && $percent == $_['details']->__get('PERCENT-COMPLETE')->value) ? ' selected="selected"' : '') . '>' . $percent . ' %</option>';
-		}
-		?>
-	</select>
-	<label for="percent_complete"><?php echo $l->t('Complete'); ?></label>
-	<span id="complete"<?php echo ($_['details']->__get('PERCENT-COMPLETE') && $_['details']->__get('PERCENT-COMPLETE')->value == 100) ? '' : ' style="display:none;"' ?>><label for="completed"><?php echo $l->t('completed on'); ?></label>
-	<input type="text" id="completed" name="completed" value="<?php echo isset($_['details']->COMPLETED) ? $l->l('datetime', $_['details']->COMPLETED[0]->getDateTime()) : '' ?>"></span>
-	<br>
-	<label for="priority"><?php echo $l->t('Priority'); ?></label>
-	<select name="priority">
-		<?php
-		foreach($_['priority_options'] as $priority => $label){
-			echo '<option value="' . $priority . '"' . ((isset($_['details']->PRIORITY) && $priority == $_['details']->PRIORITY->value) ? ' selected="selected"' : '') . '>' . $label . '</option>';
-		}
-		?>
-	</select>
-	<br>
-	<label for="description"><?php echo $l->t('Description'); ?></label><br>
-	<textarea placeholder="<?php echo $l->t('Description of the task');?>" name="description"><?php echo isset($_['details']->DESCRIPTION) ? $_['details']->DESCRIPTION[0]->value : '' ?></textarea>
-	<br>
diff --git a/apps/tasks/templates/part.tasks.php b/apps/tasks/templates/part.tasks.php
deleted file mode 100644
index 50be1cd6be..0000000000
--- a/apps/tasks/templates/part.tasks.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php foreach( $_['tasks'] as $task ): ?>
-	<li data-id="<?php echo $task['id']; ?>"><a href="index.php?id=<?php echo $task['id']; ?>"><?php echo $task['name']; ?></a> </li>
-<?php endforeach; ?>

From 5381cc74188961899c3797c7d1634122bc8d0979 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 21 Jul 2012 01:18:51 +0200
Subject: [PATCH 1054/1537] Fix missing parameter decleration, thanks Jenkins
 :-)

---
 lib/filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 7402d2cc25..ec30ffb8f4 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -473,7 +473,7 @@ class OC_Filesystem{
 		return self::$defaultInstance->hasUpdated($path,$time);
 	}
 
-	static public function removeETagHook() {
+	static public function removeETagHook($params) {
 		$path=$params['path'];
 		OC_Connector_Sabre_Node::removeETagPropertyForFile($path);
 	}

From 88f66460a36f7809289313b30ef4fbe58bd8cced Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 21 Jul 2012 13:10:51 +0200
Subject: [PATCH 1055/1537] some js improvements for subadmins

---
 settings/js/users.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/settings/js/users.js b/settings/js/users.js
index c184db4374..e46c6446b8 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -94,6 +94,9 @@ $(document).ready(function(){
 					if(user==OC.currentUser && group=='admin'){
 						return false;
 					}
+					if(!isadmin && checked.length == 1 && checked[0] == group){
+						return false;
+					}
 					$.post(
 						OC.filePath('settings','ajax','togglegroups.php'),
 						{

From 687c87bc5b4d4c04cdb05adcab2465d8dfbb34cc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 13:12:50 +0200
Subject: [PATCH 1056/1537] DRYed inserting into contacts list.

---
 apps/contacts/js/contacts.js | 71 +++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9f5803706a..8d88149876 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -187,20 +187,14 @@ Contacts={
 			// Name has changed. Update it and reorder.
 			$('#fn').change(function(){
 				var name = $('#fn').val().strip_tags();
-				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]');
+				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]').detach();
 				$(item).find('a').html(name);
 				Contacts.UI.Card.fn = name;
-				var added = false;
-				$('.contacts li[data-bookid="'+Contacts.UI.Card.bookid+'"]').each(function(){
-					if ($(this).text().toLowerCase() > name.toLowerCase()) {
-						$(this).before(item).fadeIn('fast');
-						added = true;
-						return false;
-					}
+				Contacts.UI.Contacts.insertContact({
+					contactlist:$('#contacts ul[data-id="'+Contacts.UI.Card.bookid+'"]'),
+					contacts:$('#contacts ul[data-id="'+Contacts.UI.Card.bookid+'"] li'),
+					contact:item,
 				});
-				if(!added) {
-					$('#contacts ul[data-id="'+Contacts.UI.Card.bookid+'"]').append(item);
-				}
 				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
 			});
 
@@ -321,12 +315,15 @@ Contacts={
 							if(jsondata.status == 'success'){
 								if(bookid == 'unknown') { 
 									bookid = jsondata.data.addressbookid; 
-									var entry = Contacts.UI.Card.createEntry(jsondata.data);
-									$('#contacts ul[data-id="'+bookid+'"]').append(entry);
+									var contact = Contacts.UI.Contacts.insertContact({
+										contactlist:$('#contacts ul[data-id="'+bookid+'"]'), 
+										data:jsondata.data
+									});
 								}
 								$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
 								$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
 								Contacts.UI.Card.loadContact(jsondata.data, bookid);
+								Contacts.UI.Contacts.scrollTo(newid);
 							} else {
 								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 							}
@@ -374,9 +371,6 @@ Contacts={
 				Contacts.UI.Card.add(';;;;;', '', '', true);
 				return false;
 			},
-			createEntry:function(data) {
-				return $('<li data-id="'+data.id+'" data-bookid="'+data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+data.id+') no-repeat scroll 0% 0% transparent;">'+data.displayname+'</a></li>');
-			},
 			add:function(n, fn, aid, isnew){ // add a new contact
 				console.log('Adding ' + fn);
 				aid = aid?aid:$('#contacts h3.active').first().data('id');
@@ -1503,6 +1497,33 @@ Contacts={
 			dropAddressbook:function(event, dragitem, droptarget) {
 				alert('Dropping address books not implemented yet');
 			},
+			/**
+			 * @params params An object with the propeties 'contactlist':a jquery object of the ul to insert into,
+			 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties 
+			 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
+			 * If 'contacts' is defined the new contact will be inserted alphabetically into the list, otherwise
+			 * it will be appended.
+			 */
+			insertContact:function(params) {
+				var contact = params.data
+					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'+params.data.displayname+'</a></li>')
+					: params.contact;
+				var added = false;
+				var name = params.data ? params.data.displayname.toLowerCase() : contact.find('a').text().toLowerCase();
+				if(params.contacts) {
+					params.contacts.each(function() {
+						if ($(this).text().toLowerCase() > name) {
+							$(this).before(contact);
+							added = true;
+							return false;
+						}
+					});
+				}
+				if(!added || !params.contacts) {
+					params.contactlist.append(contact);
+				}
+				return contact;
+			},
 			// Reload the contacts list.
 			update:function(params){
 				if(!params) { params = {}; }
@@ -1564,7 +1585,7 @@ Contacts={
 							for(var c in book.contacts) {
 								if(book.contacts[c].id == undefined) { continue; }
 								if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
-									var contact = Contacts.UI.Card.createEntry(book.contacts[c]);
+									var contact = Contacts.UI.Contacts.insertContact({contactlist:contactlist, contacts:contacts, data:book.contacts[c]});
 									if(c == self.batchnum-10) {
 										contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 											$(this).unbind(event);
@@ -1576,17 +1597,6 @@ Contacts={
 											}
 										});
 									}
-									var added = false;
-									contacts.each(function(){
-										if ($(this).text().toLowerCase() > book.contacts[c].displayname.toLowerCase()) {
-											$(this).before(contact);
-											added = true;
-											return false;
-										}
-									});
-									if(!added) {
-										contactlist.append(contact);
-									}
 								}
 							}
 						});
@@ -1617,9 +1627,10 @@ Contacts={
 			},
 			scrollTo:function(id){
 				var item = $('#contacts li[data-id="'+id+'"]');
+				console.log('scrollTo, found item '+id+'? ' + item.length);
 				if(item) {
-					$('.contacts').animate({
-						scrollTop: $('#contacts li[data-id="'+id+'"]').offset().top-20}, 'slow','swing');
+					$('#contacts').animate({
+						scrollTop: item.offset().top-40}, 'slow','swing');
 				}
 			}
 		}

From 11aa571751015b31332e2c113c238a050928b191 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 14:24:26 +0200
Subject: [PATCH 1057/1537] Added option to notify method.

---
 apps/contacts/js/contacts.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 8d88149876..130d6b6431 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -12,10 +12,28 @@ String.prototype.strip_tags = function(){
 
 Contacts={
 	UI:{
+		/**
+		 * Arguments:
+		 * message: The text message to show. The only mandatory parameter.
+		 * timeout: The timeout in seconds before the notification disappears. Default 10.
+		 * timeouthandler: A function to run on timeout.
+		 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
+		 */
 		notify:function(params) {
-			$('#notification').text(params.message);
-			$('#notification').fadeIn();
-			setTimeout(function() {$('#notification').fadeOut();}, 10000);
+			var notifier = $('#notification');
+			notifier.text(params.message);
+			notifier.fadeIn();
+			var timer = setTimeout(function() {
+				notifier.fadeOut();
+				if(params.timeouthandler && $.isFunction(params.timeouthandler)) { params.timeouthandler();}
+			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
+			if(params.clickhandler && $.isFunction(params.clickhandler)) {
+				notifier.on('click', function() {
+					clearTimeout(timer);
+					notifier.off('click');
+					params.clickhandler();
+				});
+			}
 		},
 		notImplemented:function() {
 			OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));

From 00de757169f7ac6787d087de0fb47f5a948cded3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 14:26:26 +0200
Subject: [PATCH 1058/1537] White space.

---
 apps/contacts/js/contacts.js | 74 ++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 130d6b6431..994e1f87fd 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -114,7 +114,7 @@ Contacts={
 			$('.addresscard,.propertylist li,.propertycontainer').hover(
 				function () {
 					$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
-				}, 
+				},
 				function () {
 					$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
 				}
@@ -125,7 +125,7 @@ Contacts={
 				obj.tipsy('hide');
 				Contacts.UI.Card.deleteProperty(obj, 'single');
 			}
-			
+
 			var goToUrl = function(obj) {
 				var url = Contacts.UI.propertyContainerFor(obj).find('#url').val();
 				if(url != '') {
@@ -133,7 +133,7 @@ Contacts={
 					newWindow.focus();
 				}
 			}
-			
+
 			$('#identityprops a.delete').click( function() { deleteItem($(this)) });
 			$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
 			$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
@@ -158,7 +158,7 @@ Contacts={
 												});
 			$('#edit_name').click(function(){Contacts.UI.Card.editName()});
 			$('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
-			
+
 			$('#phototools li a').click(function() {
 				$(this).tipsy('hide');
 			});
@@ -185,13 +185,13 @@ Contacts={
 				OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true);
 			});
 			/* Initialize the photo edit dialog */
-			$('#edit_photo_dialog').dialog({ 
+			$('#edit_photo_dialog').dialog({
 				autoOpen: false, modal: true, height: 'auto', width: 'auto'
 			});
 			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
 				{
 					text: "Ok",
-					click: function() { 
+					click: function() {
 						Contacts.UI.Card.savePhoto(this);
 						$(this).dialog('close');
 					}
@@ -201,7 +201,7 @@ Contacts={
 					click: function() { $(this).dialog('close'); }
 				}
 			] );
-			
+
 			// Name has changed. Update it and reorder.
 			$('#fn').change(function(){
 				var name = $('#fn').val().strip_tags();
@@ -217,7 +217,7 @@ Contacts={
 			});
 
 			$('#contacts_deletecard').click( function() { Contacts.UI.Card.doDelete();return false;} );
-			$('#contacts_deletecard').keydown( function(event) { 
+			$('#contacts_deletecard').keydown( function(event) {
 				if(event.which == 13 || event.which == 32) {
 					Contacts.UI.Card.doDelete();
 				}
@@ -225,7 +225,7 @@ Contacts={
 			});
 
 			$('#contacts_downloadcard').click( function() { Contacts.UI.Card.doExport();return false;} );
-			$('#contacts_downloadcard').keydown( function(event) { 
+			$('#contacts_downloadcard').keydown( function(event) {
 				if(event.which == 13 || event.which == 32) {
 					Contacts.UI.Card.doExport();
 				}
@@ -240,12 +240,12 @@ Contacts={
 			$('#contacts_details_photo_wrapper').bind('dragover',function(event){
 				$(event.target).addClass('droppable');
 				event.stopPropagation();
-				event.preventDefault();  
+				event.preventDefault();
 			});
 			$('#contacts_details_photo_wrapper').bind('dragleave',function(event){
 				$(event.target).removeClass('droppable');
 				//event.stopPropagation();
-				//event.preventDefault();  
+				//event.preventDefault();
 			});
 			$('#contacts_details_photo_wrapper').bind('drop',function(event){
 				event.stopPropagation();
@@ -331,10 +331,10 @@ Contacts={
 					if($('.contacts li').length > 0) {
 						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 							if(jsondata.status == 'success'){
-								if(bookid == 'unknown') { 
-									bookid = jsondata.data.addressbookid; 
+								if(bookid == 'unknown') {
+									bookid = jsondata.data.addressbookid;
 									var contact = Contacts.UI.Contacts.insertContact({
-										contactlist:$('#contacts ul[data-id="'+bookid+'"]'), 
+										contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
 										data:jsondata.data
 									});
 								}
@@ -348,7 +348,7 @@ Contacts={
 						});
 					}
 				}
-				
+
 				// Make sure proper DOM is loaded.
 				if(!$('#card').length && newid) {
 					console.log('Loading card DOM');
@@ -433,7 +433,7 @@ Contacts={
 						}
 					});
 				}
-			
+
 				if(!$('#card').length) {
 					console.log('Loading card DOM');
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
@@ -470,7 +470,7 @@ Contacts={
 								$('#rightcontent').data('id',newid);
 								this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
 								this.data = undefined;
-								
+
 								if($('.contacts li').length > 0) { // Load first in list.
 									Contacts.UI.Card.update({cid:newid, aid:bookid});
 								} else {
@@ -542,7 +542,7 @@ Contacts={
 						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
 						var property = this.data[propname][0];
 						var value = property['value'], checksum = property['checksum'];
-						
+
 						if(propname == 'BDAY') {
 							var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
 							value = $.datepicker.formatDate('dd-mm-yy', val);
@@ -607,7 +607,7 @@ Contacts={
 				$.each(names, function(key, value) {
 					$('#fn_select')
 						.append($('<option></option>')
-						.text(value)); 
+						.text(value));
 				});
 				$('#fn_select').combobox('value', this.fn);
 				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
@@ -858,7 +858,7 @@ Contacts={
 								title:  t('contacts', 'Edit name'),
 								height: 'auto', width: 'auto',
 								buttons: {
-									'Ok':function() { 
+									'Ok':function() {
 										Contacts.UI.Card.saveName(this);
 										$(this).dialog('close');
 									},
@@ -909,9 +909,9 @@ Contacts={
 				$.each(names, function(key, value) {
 					$('#fn_select')
 						.append($('<option></option>')
-						.text(value)); 
+						.text(value));
 				});
-				
+
 				if(this.id == '') {
 					var aid = $(dlg).find('#aid').val();
 					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
@@ -975,7 +975,7 @@ Contacts={
 					container = $('#addressdisplay dl').last();
 					container.removeClass('template').addClass('propertycontainer');
 				} else {
-					params['checksum'] = Contacts.UI.checksumFor(obj); 
+					params['checksum'] = Contacts.UI.checksumFor(obj);
 				}
 				/* Initialize the address edit dialog */
 				if($('#edit_address_dialog').dialog('isOpen') == true){
@@ -1191,7 +1191,7 @@ Contacts={
 				$('#phototools li a').tipsy('hide');
 				var wrapper = $('#contacts_details_photo_wrapper');
 				wrapper.addClass('loading').addClass('wait');
-				
+
 				var img = new Image();
 				$(img).load(function () {
 					$('img.contacts_details_photo').remove()
@@ -1200,9 +1200,9 @@ Contacts={
 					$(this).insertAfter($('#phototools')).fadeIn();
 				}).error(function () {
 					// notify the user that the image could not be loaded
-					$(t('contacts','something went wrong.')).insertAfter($('#phototools'));
+					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
 				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
-		
+
 				$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
@@ -1448,7 +1448,7 @@ Contacts={
 				var displayname = $("#displayname_"+bookid).val().trim();
 				var active = $("#edit_active_"+bookid+":checked").length;
 				var description = $("#description_"+bookid).val();
-				
+
 				if(displayname.length == 0) {
 					OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error'));
 					return false;
@@ -1517,7 +1517,7 @@ Contacts={
 			},
 			/**
 			 * @params params An object with the propeties 'contactlist':a jquery object of the ul to insert into,
-			 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties 
+			 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
 			 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
 			 * If 'contacts' is defined the new contact will be inserted alphabetically into the list, otherwise
 			 * it will be appended.
@@ -1563,7 +1563,7 @@ Contacts={
 				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
 					if(jsondata.status == 'success'){
 						var books = jsondata.data.entries;
-						$.each(books, function(b, book) { 
+						$.each(books, function(b, book) {
 							if($('#contacts h3[data-id="'+b+'"]').length == 0) {
 								firstrun = true;
 								if($('#contacts h3').length == 0) {
@@ -1582,7 +1582,7 @@ Contacts={
 										if(!added) {
 											$('#contacts').append(item);
 										}
-										
+
 									}
 								}
 								$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
@@ -1662,13 +1662,13 @@ $(document).ready(function(){
 	$('#notification').click(function(){
 		$('#notification').fadeOut();
 	});
-	
+
 	$('#chooseaddressbook').click(Contacts.UI.Addressbooks.overview);
 	$('#chooseaddressbook').keydown(Contacts.UI.Addressbooks.overview);
 
 	$('#contacts_newcontact').click(Contacts.UI.Card.editNew);
 	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
-	
+
 	// Load a contact.
 	$('.contacts').keydown(function(event) {
 		if(event.which == 13 || event.which == 32) {
@@ -1740,7 +1740,7 @@ $(document).ready(function(){
 					}
 				}
 			};
-		
+
 			fileUpload.onprogress = function(e){
 				if (e.lengthComputable){
 					var _progress = Math.round((e.loaded * 100) / e.total);
@@ -1770,7 +1770,7 @@ $(document).ready(function(){
 	$(function() {
 		var uploadingFiles = {}, numfiles = 0, uploadedfiles = 0, retries = 0;
 		var aid;
-		
+
 		$('#import_upload_start').fileupload({
 			dropZone: $('#contacts'), // restrict dropZone to contacts list.
 			acceptFileTypes:  /^text\/(directory|vcard|x-vcard)$/i,
@@ -1932,7 +1932,7 @@ $(document).ready(function(){
 													$(this).dialog('close');
 												}
 											},
-											'Cancel':function() { 
+											'Cancel':function() {
 												$(this).dialog('close');
 												numfiles = uploadedfiles = retries = aid = 0;
 												uploadingFiles = {};
@@ -1959,11 +1959,11 @@ $(document).ready(function(){
 				}
 				if(data.dataType != 'iframe ') {
 					$('#upload input.stop').hide();
-				}	
+				}
 			}
 		})
 	});
-	
+
 	Contacts.UI.loadHandlers();
 	Contacts.UI.Contacts.update({cid:id});
 });

From 51bafd32d6182612af1b911d178bac5bd3c16909 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 14:26:57 +0200
Subject: [PATCH 1059/1537] Made contactlist optional in insertContact().

---
 apps/contacts/js/contacts.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 994e1f87fd..c190b2d3ea 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1523,6 +1523,11 @@ Contacts={
 			 * it will be appended.
 			 */
 			insertContact:function(params) {
+				if(!params.contactlist) {
+					params['contactlist'] = params.data
+						? $('#contacts ul[data-id="'+params.data.addressbookid+'"]')
+						: contact.data('bookid');
+				}
 				var contact = params.data
 					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'+params.data.displayname+'</a></li>')
 					: params.contact;

From e07cd265717c31b3a9bd1e056aa3e80d98f70144 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 16:02:12 +0200
Subject: [PATCH 1060/1537] Implemented undelete for contacts.

---
 apps/contacts/js/contacts.js | 120 +++++++++++++++++++++--------------
 1 file changed, 71 insertions(+), 49 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c190b2d3ea..337f51839d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -18,6 +18,7 @@ Contacts={
 		 * timeout: The timeout in seconds before the notification disappears. Default 10.
 		 * timeouthandler: A function to run on timeout.
 		 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
+		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
 		 */
 		notify:function(params) {
 			var notifier = $('#notification');
@@ -25,13 +26,22 @@ Contacts={
 			notifier.fadeIn();
 			var timer = setTimeout(function() {
 				notifier.fadeOut();
-				if(params.timeouthandler && $.isFunction(params.timeouthandler)) { params.timeouthandler();}
+				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
+					params.timeouthandler(notifier.data(dataid));
+					notifier.off('click');
+					notifier.data(dataid, null);
+				}
 			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
+			var dataid = timer.toString();
+			if(params.data) {
+				notifier.data(dataid, params.data);
+			}
 			if(params.clickhandler && $.isFunction(params.clickhandler)) {
 				notifier.on('click', function() {
 					clearTimeout(timer);
 					notifier.off('click');
-					params.clickhandler();
+					params.clickhandler(notifier.data(dataid));
+					notifier.data(dataid, null);
 				});
 			}
 		},
@@ -216,10 +226,10 @@ Contacts={
 				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
 			});
 
-			$('#contacts_deletecard').click( function() { Contacts.UI.Card.doDelete();return false;} );
+			$('#contacts_deletecard').click( function() { Contacts.UI.Card.delayedDelete();return false;} );
 			$('#contacts_deletecard').keydown( function(event) {
 				if(event.which == 13 || event.which == 32) {
-					Contacts.UI.Card.doDelete();
+					Contacts.UI.Card.delayedDelete();
 				}
 				return false;
 			});
@@ -450,47 +460,56 @@ Contacts={
 					localAddcontact(n, fn, aid, isnew);
 				}
 			},
-			doDelete:function() {
+			delayedDelete:function() {
 				$('#contacts_deletecard').tipsy('hide');
-				OC.dialogs.confirm(t('contacts', 'Are you sure you want to delete this contact?'), t('contacts', 'Warning'), function(answer) {
-					if(answer == true) {
-						$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':Contacts.UI.Card.id},function(jsondata){
-							if(jsondata.status == 'success'){
-								var newid = '', bookid;
-								var curlistitem = $('#contacts li[data-id="'+jsondata.data.id+'"]');
-								var newlistitem = curlistitem.prev('li');
-								if(!newlistitem) {
-									newlistitem = curlistitem.next('li');
-								}
-								curlistitem.remove();
-								if($(newlistitem).is('li')) {
-									newid = newlistitem.data('id');
-									bookid = newlistitem.data('bookid');
-								}
-								$('#rightcontent').data('id',newid);
-								this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
-								this.data = undefined;
+				var newid = '', bookid;
+				var curlistitem = $('#contacts li[data-id="'+Contacts.UI.Card.id+'"]');
+				curlistitem.removeClass('active');
+				var newlistitem = curlistitem.prev('li');
+				if(!newlistitem) {
+					newlistitem = curlistitem.next('li');
+				}
+				curlistitem.detach();
+				if($(newlistitem).is('li')) {
+					newid = newlistitem.data('id');
+					bookid = newlistitem.data('bookid');
+				}
+				$('#rightcontent').data('id',newid);
+				this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
+				this.data = undefined;
 
-								if($('.contacts li').length > 0) { // Load first in list.
-									Contacts.UI.Card.update({cid:newid, aid:bookid});
-								} else {
-									// load intro page
-									$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
-										if(jsondata.status == 'success'){
-											id = '';
-											$('#rightcontent').data('id','');
-											$('#rightcontent').html(jsondata.data.page);
-										}
-										else{
-											OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-										}
-									});
-								}
-							}
-							else{
-								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							}
-						});
+				if($('.contacts li').length > 0) { // Load first in list.
+					Contacts.UI.Card.update({cid:newid, aid:bookid});
+				} else {
+					// load intro page
+					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+						if(jsondata.status == 'success'){
+							id = '';
+							$('#rightcontent').data('id','');
+							$('#rightcontent').html(jsondata.data.page);
+						}
+						else{
+							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						}
+					});
+				}
+				Contacts.UI.notify({
+					data:curlistitem,
+					message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
+					timeouthandler:function(contact) {
+						Contacts.UI.Card.doDelete(contact.data('id'));
+						delete contact;
+					},
+					clickhandler:function(contact) {
+						Contacts.UI.Contacts.insertContact({contact:contact});
+						Contacts.UI.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
+					}
+				});
+			},
+			doDelete:function(id) {
+				$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
+					if(jsondata.status == 'error'){
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
 				return false;
@@ -1516,17 +1535,20 @@ Contacts={
 				alert('Dropping address books not implemented yet');
 			},
 			/**
-			 * @params params An object with the propeties 'contactlist':a jquery object of the ul to insert into,
+			 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
 			 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
 			 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
-			 * If 'contacts' is defined the new contact will be inserted alphabetically into the list, otherwise
-			 * it will be appended.
+			 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
 			 */
 			insertContact:function(params) {
 				if(!params.contactlist) {
-					params['contactlist'] = params.data
-						? $('#contacts ul[data-id="'+params.data.addressbookid+'"]')
-						: contact.data('bookid');
+					// FIXME: Check if contact really exists.
+					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
+				}
+				if(!params.contacts) {
+					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
 				}
 				var contact = params.data
 					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'+params.data.displayname+'</a></li>')

From 11725efd7e897be9588042e02f5d7a83d20d4d86 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 21 Jul 2012 16:43:39 +0200
Subject: [PATCH 1061/1537] add some hooks for subadmins

---
 lib/subadmin.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/subadmin.php b/lib/subadmin.php
index 04e6143081..0806f27a6b 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -19,7 +19,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_SubAdmin', 'post_deleteUser');
+OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC_SubAdmin', 'post_deleteGroup');
 /**
  * This class provides all methods needed for managing groups.
  *
@@ -155,4 +156,26 @@ class OC_SubAdmin{
 	public static function isGroupAccessible($subadmin, $group){
 		return self::isSubAdminofGroup($subadmin, $group);
 	}
+
+	/**
+	 * @brief delete all SubAdmins by uid
+	 * @param $parameters 
+	 * @return boolean
+	 */
+	public static function post_deleteUser($parameters){
+		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE uid = ?');
+		$result = $stmt->execute(array($parameters['uid']));
+		return true;
+	}
+
+	/**
+	 * @brief delete all SubAdmins8 by gid
+	 * @param $parameters
+	 * @return boolean
+	 */
+	public static function post_deleteGroup($parameters){
+		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE gid = ?');
+		$result = $stmt->execute(array($parameters['gid']));
+		return true;
+	}
 }

From 57207ddb82875f7e3e36b0dfb2811ab161a0f08c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 21 Jul 2012 17:09:10 +0200
Subject: [PATCH 1062/1537] some style fixes for calendar

---
 apps/calendar/js/settings.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index 03e4217573..60741f2b6f 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -34,6 +34,7 @@ $(document).ready(function(){
 	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'timeformat.php'), function(jsondata, status) {
 		$('#' + jsondata.timeformat).attr('selected',true);
 		$('#timeformat').chosen();
+		$('#timeformat_chzn').css('width', '100px');
 	});
 	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'gettimezonedetection.php'), function(jsondata, status){
 		if(jsondata.detection == 'true'){
@@ -43,6 +44,7 @@ $(document).ready(function(){
 	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'getfirstday.php'), function(jsondata, status) {
 		$('#' + jsondata.firstday).attr('selected',true);
 		$('#firstday').chosen();
+		$('#firstday_chzn').css('width', '100px');
 	});
 	$('#cleancalendarcache').click(function(){
 		$.getJSON(OC.filePath('calendar', 'ajax/cache', 'rescan.php'), function(){
@@ -55,7 +57,7 @@ function calendarcachecheck(){
 	$.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) {
 		$('#cleancalendarcache').attr('title', jsondata.l10n.text);
 		if(jsondata.status == 'success'){
-			$('#cleancalendarcache').css('background', '#90EE90');
+			$('#cleancalendarcache').css('background', '#F8F8F8');
 			$('#cleancalendarcache').css('color', '#333');
 			$('#cleancalendarcache').css('text-shadow', '#fff 0 1px 0');
 		}else{

From 81b917b2f63a881ddb3c3db73e7adcefb9f46e2f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 21 Jul 2012 19:50:45 +0200
Subject: [PATCH 1063/1537] increase width of user migrates form in personal
 settings, so you can read the whole label in all languages

---
 apps/user_migrate/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
index 1718abe9e0..bce5fb2d7c 100644
--- a/apps/user_migrate/templates/settings.php
+++ b/apps/user_migrate/templates/settings.php
@@ -12,7 +12,7 @@
 		<?php } ?>
         <legend><strong><?php echo $l->t('Import user account');?></strong></legend>
         </p>
-        <p><input type="file" id="owncloud_import" name="owncloud_import" style="width:180px;"><label for="owncloud_import"> <?php echo $l->t('ownCloud User Zip');?></label>
+        <p><input type="file" id="owncloud_import" name="owncloud_import" style="width:280px;"><label for="owncloud_import"> <?php echo $l->t('ownCloud User Zip');?></label>
         </p>
         <input type="submit" name="user_import" value="<?php echo $l->t('Import'); ?>" />
     </fieldset>

From 0eade1b0d5ed6431c90b02a5b9df31b46674dcb9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 21:44:10 +0200
Subject: [PATCH 1064/1537] Code style. One down...

---
 lib/filesystemview.php | 434 +++++++++++++++++++++++++----------------
 1 file changed, 261 insertions(+), 173 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index a23d7bbe7f..9beda01e5a 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -22,19 +22,19 @@
 
 
 /**
- * Class to provide access to ownCloud filesystem via a "view", and methods for 
- * working with files within that view (e.g. read, write, delete, etc.). Each 
- * view is restricted to a set of directories via a virtual root. The default view 
- * uses the currently logged in user's data directory as root (parts of 
+ * Class to provide access to ownCloud filesystem via a "view", and methods for
+ * working with files within that view (e.g. read, write, delete, etc.). Each
+ * view is restricted to a set of directories via a virtual root. The default view
+ * uses the currently logged in user's data directory as root (parts of
  * OC_Filesystem are merely a wrapper for OC_FilesystemView).
- * 
+ *
  * Apps that need to access files outside of the user data folders (to modify files
  * belonging to a user other than the one currently logged in, for example) should
  * use this class directly rather than using OC_Filesystem, or making use of PHP's
- * built-in file manipulation functions. This will ensure all hooks and proxies 
+ * built-in file manipulation functions. This will ensure all hooks and proxies
  * are triggered correctly.
  *
- * Filesystem functions are not called directly; they are passed to the correct 
+ * Filesystem functions are not called directly; they are passed to the correct
  * OC_Filestorage object
  */
 
@@ -43,11 +43,11 @@ class OC_FilesystemView {
 	private $internal_path_cache=array();
 	private $storage_cache=array();
 
-	public function __construct($root){
+	public function __construct($root) {
 		$this->fakeRoot=$root;
 	}
 
-	public function getAbsolutePath($path){
+	public function getAbsolutePath($path) {
 		if(!$path){
 			$path='/';
 		}
@@ -63,9 +63,9 @@ class OC_FilesystemView {
 	* @param  string  fakeRoot
 	* @return bool
 	*/
-	public function chroot($fakeRoot){
+	public function chroot($fakeRoot) {
 		if(!$fakeRoot==''){
-			if($fakeRoot[0]!=='/'){
+			if($fakeRoot[0]!=='/') {
 				$fakeRoot='/'.$fakeRoot;
 			}
 		}
@@ -76,7 +76,7 @@ class OC_FilesystemView {
 	 * get the fake root
 	 * @return string
 	 */
-	public function getRoot(){
+	public function getRoot() {
 		return $this->fakeRoot;
 	}
 
@@ -85,7 +85,7 @@ class OC_FilesystemView {
 	* @param  string  path
 	* @return bool
 	*/
-	public function getInternalPath($path){
+	public function getInternalPath($path) {
 		if (!isset($this->internal_path_cache[$path])) {
 			$this->internal_path_cache[$path] = OC_Filesystem::getInternalPath($this->getAbsolutePath($path));
 		}
@@ -97,23 +97,23 @@ class OC_FilesystemView {
 	 * @param string path
 	 * @return string
 	 */
-	public function getRelativePath($path){
-		if($this->fakeRoot==''){
+	public function getRelativePath($path) {
+		if($this->fakeRoot=='') {
 			return $path;
 		}
-		if(strpos($path,$this->fakeRoot)!==0){
+		if(strpos($path, $this->fakeRoot)!==0) {
 			return null;
 		}else{
-			return substr($path,strlen($this->fakeRoot));
+			return substr($path, strlen($this->fakeRoot));
 		}
 	}
-	
+
 	/**
 	* get the storage object for a path
 	* @param string path
 	* @return OC_Filestorage
 	*/
-	public function getStorage($path){
+	public function getStorage($path) {
 		if (!isset($this->storage_cache[$path])) {
 			$this->storage_cache[$path] = OC_Filesystem::getStorage($this->getAbsolutePath($path));
 		}
@@ -127,7 +127,7 @@ class OC_FilesystemView {
 	* @param string path
 	* @return string
 	*/
-	public function getMountPoint($path){
+	public function getMountPoint($path) {
 		return OC_Filesystem::getMountPoint($this->getAbsolutePath($path));
 	}
 
@@ -137,55 +137,55 @@ class OC_FilesystemView {
 	* @param string path
 	* @return string
 	*/
-	public function getLocalFile($path){
-		$parent=substr($path,0,strrpos($path,'/'));
-		if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)){
+	public function getLocalFile($path) {
+		$parent=substr($path, 0, strrpos($path,'/'));
+		if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)) {
 			return $storage->getLocalFile($this->getInternalPath($path));
 		}
 	}
 
 	/**
-	 * the following functions operate with arguments and return values identical 
-	 * to those of their PHP built-in equivalents. Mostly they are merely wrappers 
+	 * the following functions operate with arguments and return values identical
+	 * to those of their PHP built-in equivalents. Mostly they are merely wrappers
 	 * for OC_Filestorage via basicOperation().
 	 */
-	public function mkdir($path){
-		return $this->basicOperation('mkdir',$path,array('create','write'));
+	public function mkdir($path) {
+		return $this->basicOperation('mkdir', $path, array('create', 'write'));
 	}
-	public function rmdir($path){
-		return $this->basicOperation('rmdir',$path,array('delete'));
+	public function rmdir($path) {
+		return $this->basicOperation('rmdir', $path, array('delete'));
 	}
-	public function opendir($path){
-		return $this->basicOperation('opendir',$path,array('read'));
+	public function opendir($path) {
+		return $this->basicOperation('opendir', $path, array('read'));
 	}
-	public function readdir($handle){
+	public function readdir($handle) {
 		$fsLocal= new OC_Filestorage_Local( array( 'datadir' => '/' ) );
 		return $fsLocal->readdir( $handle );
 	}
-	public function is_dir($path){
+	public function is_dir($path) {
 		if($path=='/'){
 			return true;
 		}
-		return $this->basicOperation('is_dir',$path);
+		return $this->basicOperation('is_dir', $path);
 	}
-	public function is_file($path){
+	public function is_file($path) {
 		if($path=='/'){
 			return false;
 		}
-		return $this->basicOperation('is_file',$path);
+		return $this->basicOperation('is_file', $path);
 	}
-	public function stat($path){
-		return $this->basicOperation('stat',$path);
+	public function stat($path) {
+		return $this->basicOperation('stat', $path);
 	}
-	public function filetype($path){
-		return $this->basicOperation('filetype',$path);
+	public function filetype($path) {
+		return $this->basicOperation('filetype', $path);
 	}
-	public function filesize($path){
-		return $this->basicOperation('filesize',$path);
+	public function filesize($path) {
+		return $this->basicOperation('filesize', $path);
 	}
-	public function readfile($path){
+	public function readfile($path) {
 		@ob_end_clean();
-		$handle=$this->fopen($path,'rb');
+		$handle=$this->fopen($path, 'rb');
 		if ($handle) {
 			$chunkSize = 8192;// 8 MB chunks
 			while (!feof($handle)) {
@@ -197,137 +197,210 @@ class OC_FilesystemView {
 		}
 		return false;
 	}
-	public function is_readable($path){
-		return $this->basicOperation('is_readable',$path);
+	public function is_readable($path) {
+		return $this->basicOperation('is_readable', $path);
 	}
-	public function is_writable($path){
-		return $this->basicOperation('is_writable',$path);
+	public function is_writable($path) {
+		return $this->basicOperation('is_writable', $path);
 	}
-	public function file_exists($path){
+	public function file_exists($path) {
 		if($path=='/'){
 			return true;
 		}
-		return $this->basicOperation('file_exists',$path);
+		return $this->basicOperation('file_exists', $path);
 	}
-	public function filectime($path){
-		return $this->basicOperation('filectime',$path);
+	public function filectime($path) {
+		return $this->basicOperation('filectime', $path);
 	}
-	public function filemtime($path){
-		return $this->basicOperation('filemtime',$path);
+	public function filemtime($path) {
+		return $this->basicOperation('filemtime', $path);
 	}
-	public function touch($path, $mtime=null){
+	public function touch($path, $mtime=null) {
 		return $this->basicOperation('touch', $path, array('write'), $mtime);
 	}
-	public function file_get_contents($path){
-		return $this->basicOperation('file_get_contents',$path,array('read'));
+	public function file_get_contents($path) {
+		return $this->basicOperation('file_get_contents', $path, array('read'));
 	}
-	public function file_put_contents($path,$data){
-		if(is_resource($data)){//not having to deal with streams in file_put_contents makes life easier
-			$exists=$this->file_exists($path);
-			$run=true;
-			if(!$exists){
-				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
+	public function file_put_contents($path, $data) {
+		if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier
+			$exists = $this->file_exists($path);
+			$run = true;
+			if(!$exists) {
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_create,
+					array(
+						OC_Filesystem::signal_param_path => $path,
+						OC_Filesystem::signal_param_run => &$run
+					)
+				);
 			}
-			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
-			if(!$run){
+			OC_Hook::emit(
+				OC_Filesystem::CLASSNAME,
+				OC_Filesystem::signal_write,
+				array(
+					OC_Filesystem::signal_param_path => $path,
+					OC_Filesystem::signal_param_run => &$run
+				)
+			);
+			if(!$run) {
 				return false;
 			}
-			$target=$this->fopen($path,'w');
-			if($target){
-				$count=OC_Helper::streamCopy($data,$target);
+			$target=$this->fopen($path, 'w');
+			if($target) {
+				$count=OC_Helper::streamCopy($data, $target);
 				fclose($target);
 				fclose($data);
-				if(!$exists){
-					OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path));
+				if(!$exists) {
+					OC_Hook::emit(
+						OC_Filesystem::CLASSNAME,
+						OC_Filesystem::signal_post_create,
+						array( OC_Filesystem::signal_param_path => $path)
+					);
 				}
-				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path));
-				return $count>0;
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_post_write,
+					array( OC_Filesystem::signal_param_path => $path)
+				);
+				return $count > 0;
 			}else{
 				return false;
 			}
 		}else{
-			return $this->basicOperation('file_put_contents',$path,array('create','write'),$data);
+			return $this->basicOperation('file_put_contents', $path, array('create', 'write'), $data);
 		}
 	}
-	public function unlink($path){
-		return $this->basicOperation('unlink',$path,array('delete'));
+	public function unlink($path) {
+		return $this->basicOperation('unlink', $path, array('delete'));
 	}
 	public function deleteAll( $directory, $empty = false ) {
 		return $this->basicOperation( 'deleteAll', $directory, array('delete'), $empty );
 	}
-	public function rename($path1,$path2){
-		$absolutePath1=$this->getAbsolutePath($path1);
-		$absolutePath2=$this->getAbsolutePath($path2);
-		if(OC_FileProxy::runPreProxies('rename',$absolutePath1,$absolutePath2) and OC_Filesystem::isValidPath($path2)){
-			$path1=$this->getRelativePath($absolutePath1);
-			$path2=$this->getRelativePath($absolutePath2);
-			if($path1==null or $path2==null){
+	public function rename($path1, $path2) {
+		$absolutePath1 = $this->getAbsolutePath($path1);
+		$absolutePath2 = $this->getAbsolutePath($path2);
+		if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
+			$path1 = $this->getRelativePath($absolutePath1);
+			$path2 = $this->getRelativePath($absolutePath2);
+			if($path1 == null or $path2 == null) {
 				return false;
 			}
 			$run=true;
-			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
-			if($run){
-				$mp1=$this->getMountPoint($path1);
-				$mp2=$this->getMountPoint($path2);
-				if($mp1==$mp2){
-					if($storage=$this->getStorage($path1)){
-						$result=$storage->rename($this->getInternalPath($path1),$this->getInternalPath($path2));
+			OC_Hook::emit(
+				OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename,
+					array(
+						OC_Filesystem::signal_param_oldpath => $path1,
+						OC_Filesystem::signal_param_newpath => $path2,
+						OC_Filesystem::signal_param_run => &$run
+					)
+			);
+			if($run) {
+				$mp1 = $this->getMountPoint($path1);
+				$mp2 = $this->getMountPoint($path2);
+				if($mp1 == $mp2) {
+					if($storage = $this->getStorage($path1)) {
+						$result = $storage->rename($this->getInternalPath($path1), $this->getInternalPath($path2));
 					}
-				}else{
-					$source=$this->fopen($path1,'r');
-					$target=$this->fopen($path2,'w');
-					$count=OC_Helper::streamCopy($source,$target);
-					$storage1=$this->getStorage($path1);
+				} else {
+					$source = $this->fopen($path1, 'r');
+					$target = $this->fopen($path2, 'w');
+					$count = OC_Helper::streamCopy($source, $target);
+					$storage1 = $this->getStorage($path1);
 					$storage1->unlink($this->getInternalPath($path1));
-					$result=$count>0;
+					$result = $count>0;
 				}
-				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, array( OC_Filesystem::signal_param_oldpath => $path1, OC_Filesystem::signal_param_newpath=>$path2));
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_post_rename,
+					array(
+						OC_Filesystem::signal_param_oldpath => $path1,
+						OC_Filesystem::signal_param_newpath => $path2
+					)
+				);
 				return $result;
 			}
 		}
 	}
-	public function copy($path1,$path2){
-		$absolutePath1=$this->getAbsolutePath($path1);
-		$absolutePath2=$this->getAbsolutePath($path2);
-		if(OC_FileProxy::runPreProxies('copy',$absolutePath1,$absolutePath2) and OC_Filesystem::isValidPath($path2)){
-			$path1=$this->getRelativePath($absolutePath1);
-			$path2=$this->getRelativePath($absolutePath2);
-			if($path1==null or $path2==null){
+	public function copy($path1, $path2) {
+		$absolutePath1 = $this->getAbsolutePath($path1);
+		$absolutePath2 = $this->getAbsolutePath($path2);
+		if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
+			$path1 = $this->getRelativePath($absolutePath1);
+			$path2 = $this->getRelativePath($absolutePath2);
+			if($path1 == null or $path2 == null) {
 				return false;
 			}
 			$run=true;
-			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
+			OC_Hook::emit(
+				OC_Filesystem::CLASSNAME,
+				OC_Filesystem::signal_copy,
+				array(
+					OC_Filesystem::signal_param_oldpath => $path1,
+					OC_Filesystem::signal_param_newpath=>$path2,
+					OC_Filesystem::signal_param_run => &$run
+				)
+			);
 			$exists=$this->file_exists($path2);
-			if($run and !$exists){
-				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, array( OC_Filesystem::signal_param_path => $path2, OC_Filesystem::signal_param_run => &$run));
+			if($run and !$exists) {
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_create,
+					array(
+						OC_Filesystem::signal_param_path => $path2,
+						OC_Filesystem::signal_param_run => &$run
+					)
+				);
 			}
-			if($run){
-				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, array( OC_Filesystem::signal_param_path => $path2, OC_Filesystem::signal_param_run => &$run));
+			if($run) {
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_write,
+					array(
+						OC_Filesystem::signal_param_path => $path2,
+						OC_Filesystem::signal_param_run => &$run
+					)
+				);
 			}
-			if($run){
+			if($run) {
 				$mp1=$this->getMountPoint($path1);
 				$mp2=$this->getMountPoint($path2);
-				if($mp1==$mp2){
-					if($storage=$this->getStorage($path1)){
-						$result=$storage->copy($this->getInternalPath($path1),$this->getInternalPath($path2));
+				if($mp1 == $mp2){
+					if($storage = $this->getStorage($path1)) {
+						$result=$storage->copy($this->getInternalPath($path1), $this->getInternalPath($path2));
 					}
-				}else{
-					$source=$this->fopen($path1,'r');
-					$target=$this->fopen($path2,'w');
-					$result=OC_Helper::streamCopy($source,$target);
+				} else {
+					$source = $this->fopen($path1, 'r');
+					$target = $this->fopen($path2, 'w');
+					$result = OC_Helper::streamCopy($source, $target);
 				}
-        OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2));
-				if(!$exists){
-          OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path2));
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_post_copy,
+					array(
+						OC_Filesystem::signal_param_oldpath => $path1,
+						OC_Filesystem::signal_param_newpath=>$path2
+					)
+				);
+				if(!$exists) {
+					OC_Hook::emit(
+						OC_Filesystem::CLASSNAME,
+						OC_Filesystem::signal_post_create,
+						array(OC_Filesystem::signal_param_path => $path2)
+					);
 				}
-        OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path2));
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_post_write,
+					array( OC_Filesystem::signal_param_path => $path2)
+				);
 				return $result;
 			}
 		}
 	}
-	public function fopen($path,$mode){
+	public function fopen($path, $mode) {
 		$hooks=array();
-		switch($mode){
+		switch($mode) {
 			case 'r':
 			case 'rb':
 				$hooks[]='read';
@@ -355,49 +428,49 @@ class OC_FilesystemView {
 				OC_Log::write('core','invalid mode ('.$mode.') for '.$path,OC_Log::ERROR);
 		}
 
-		return $this->basicOperation('fopen',$path,$hooks,$mode);
+		return $this->basicOperation('fopen', $path, $hooks, $mode);
 	}
-	public function toTmpFile($path){
-		if(OC_Filesystem::isValidPath($path)){
-			$source=$this->fopen($path,'r');
-			if($source){
+	public function toTmpFile($path) {
+		if(OC_Filesystem::isValidPath($path)) {
+			$source = $this->fopen($path, 'r');
+			if($source) {
 				$extension='';
-				$extOffset=strpos($path,'.');
+				$extOffset=strpos($path, '.');
 				if($extOffset !== false) {
-					$extension=substr($path,strrpos($path,'.'));
+					$extension=substr($path, strrpos($path,'.'));
 				}
-				$tmpFile=OC_Helper::tmpFile($extension);
-				file_put_contents($tmpFile,$source);
+				$tmpFile = OC_Helper::tmpFile($extension);
+				file_put_contents($tmpFile, $source);
 				return $tmpFile;
 			}
 		}
 	}
-	public function fromTmpFile($tmpFile,$path){
-		if(OC_Filesystem::isValidPath($path)){
-			if(!$tmpFile){
+	public function fromTmpFile($tmpFile, $path) {
+		if(OC_Filesystem::isValidPath($path)) {
+			if(!$tmpFile) {
 				debug_print_backtrace();
 			}
-			$source=fopen($tmpFile,'r');
-			if($source){
-				$this->file_put_contents($path,$source);
+			$source=fopen($tmpFile, 'r');
+			if($source) {
+				$this->file_put_contents($path, $source);
 				unlink($tmpFile);
 				return true;
-			}else{
+			} else {
 			}
-		}else{
+		} else {
 			return false;
 		}
 	}
 
-	public function getMimeType($path){
-		return $this->basicOperation('getMimeType',$path);
+	public function getMimeType($path) {
+		return $this->basicOperation('getMimeType', $path);
 	}
-	public function hash($type,$path){
-		return $this->basicOperation('hash',$path,array('read'),$type);
+	public function hash($type, $path) {
+		return $this->basicOperation('hash', $path, array('read'), $type);
 	}
 
-	public function free_space($path='/'){
-		return $this->basicOperation('free_space',$path);
+	public function free_space($path='/') {
+		return $this->basicOperation('free_space', $path);
 	}
 
 	/**
@@ -407,41 +480,56 @@ class OC_FilesystemView {
 	 * @param array (optional) hooks
 	 * @param mixed (optional) $extraParam
 	 * @return mixed
-	 * 
-	 * This method takes requests for basic filesystem functions (e.g. reading & writing 
-	 * files), processes hooks and proxies, sanitises paths, and finally passes them on to 
+	 *
+	 * This method takes requests for basic filesystem functions (e.g. reading & writing
+	 * files), processes hooks and proxies, sanitises paths, and finally passes them on to
 	 * OC_Filestorage for delegation to a storage backend for execution
 	 */
-	private function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		$absolutePath=$this->getAbsolutePath($path);
-		if(OC_FileProxy::runPreProxies($operation,$absolutePath, $extraParam) and OC_Filesystem::isValidPath($path)){
-			$path=$this->getRelativePath($absolutePath);
-			if($path==null){
+	private function basicOperation($operation, $path, $hooks=array(), $extraParam=null) {
+		$absolutePath = $this->getAbsolutePath($path);
+		if(OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and OC_Filesystem::isValidPath($path)) {
+			$path = $this->getRelativePath($absolutePath);
+			if($path == null) {
 				return false;
 			}
-			$internalPath=$this->getInternalPath($path);
-			$run=true;
-			if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
-				foreach($hooks as $hook){
-					if($hook!='read'){
-						OC_Hook::emit( OC_Filesystem::CLASSNAME, $hook, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
-					}else{
-						OC_Hook::emit( OC_Filesystem::CLASSNAME, $hook, array( OC_Filesystem::signal_param_path => $path));
+			$internalPath = $this->getInternalPath($path);
+			$run = true;
+			if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
+				foreach($hooks as $hook) {
+					if($hook!='read') {
+						OC_Hook::emit(
+							OC_Filesystem::CLASSNAME,
+							$hook,
+							array(
+								OC_Filesystem::signal_param_path => $path,
+								OC_Filesystem::signal_param_run => &$run
+							)
+						);
+					} else {
+						OC_Hook::emit(
+							OC_Filesystem::CLASSNAME,
+							$hook,
+							array( OC_Filesystem::signal_param_path => $path)
+						);
 					}
 				}
 			}
-			if($run and $storage=$this->getStorage($path)){
-				if(!is_null($extraParam)){
-					$result=$storage->$operation($internalPath,$extraParam);
-				}else{
-					$result=$storage->$operation($internalPath);
+			if($run and $storage = $this->getStorage($path)) {
+				if(!is_null($extraParam)) {
+					$result = $storage->$operation($internalPath, $extraParam);
+				} else {
+					$result = $storage->$operation($internalPath);
 				}
-				$result=OC_FileProxy::runPostProxies($operation,$this->getAbsolutePath($path),$result);
-				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
-					if($operation!='fopen'){//no post hooks for fopen, the file stream is still open
-						foreach($hooks as $hook){
+				$result = OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
+				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
+					if($operation!='fopen') {//no post hooks for fopen, the file stream is still open
+						foreach($hooks as $hook) {
 							if($hook!='read'){
-								OC_Hook::emit( OC_Filesystem::CLASSNAME, 'post_'.$hook, array( OC_Filesystem::signal_param_path => $path));
+								OC_Hook::emit(
+									OC_Filesystem::CLASSNAME,
+									'post_'.$hook,
+									array( OC_Filesystem::signal_param_path => $path)
+								);
 							}
 						}
 					}
@@ -457,7 +545,7 @@ class OC_FilesystemView {
 	 * @param int $time
 	 * @return bool
 	 */
-	public function hasUpdated($path,$time){
-		return $this->basicOperation('hasUpdated',$path,array(),$time);
+	public function hasUpdated($path, $time) {
+		return $this->basicOperation('hasUpdated', $path, array(), $time);
 	}
 }

From 7d520bc7a9f395497c1793da3990a6f52a56086f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 21:57:21 +0200
Subject: [PATCH 1065/1537] Remove wrong comment.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 337f51839d..bf53753b14 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -478,7 +478,7 @@ Contacts={
 				this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
 				this.data = undefined;
 
-				if($('.contacts li').length > 0) { // Load first in list.
+				if($('.contacts li').length > 0) {
 					Contacts.UI.Card.update({cid:newid, aid:bookid});
 				} else {
 					// load intro page

From eb57544518cc0a12618fdb72b65b129c7d18c923 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 21:58:09 +0200
Subject: [PATCH 1066/1537] Added next/previous methods to contacts list.

---
 apps/contacts/js/contacts.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index bf53753b14..a0ad77d074 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1569,6 +1569,21 @@ Contacts={
 				}
 				return contact;
 			},
+			next:function(reverse) {
+				// TODO: Check if we're last-child/first-child and jump to next/prev address book.
+				var curlistitem = $('#contacts li[data-id="'+Contacts.UI.Card.id+'"]');
+				var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
+				if(newlistitem) {
+					curlistitem.removeClass('active');
+					Contacts.UI.Card.update({
+						cid:newlistitem.data('id'),
+						aid:newlistitem.data('bookid')
+					});
+				}
+			},
+			previous:function() {
+				this.next(true);
+			},
 			// Reload the contacts list.
 			update:function(params){
 				if(!params) { params = {}; }

From 359dc8736a98118f50ae449bd05f164458bad5ce Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 21:59:04 +0200
Subject: [PATCH 1067/1537] Improved scrollTo method. Still not quite there...

---
 apps/contacts/js/contacts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index a0ad77d074..514821a44f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1687,10 +1687,10 @@ Contacts={
 			},
 			scrollTo:function(id){
 				var item = $('#contacts li[data-id="'+id+'"]');
-				console.log('scrollTo, found item '+id+'? ' + item.length);
-				if(item) {
+				if(item && $.isNumeric(item.offset().top)) {
+					console.log('scrollTo ' + parseInt(item.offset().top));
 					$('#contacts').animate({
-						scrollTop: item.offset().top-40}, 'slow','swing');
+						scrollTop: parseInt(item.offset()).top-40}, 'slow','swing');
 				}
 			}
 		}

From 38d38c17972dbb0e7718d1a0e5fc7db9cd8277fb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 21 Jul 2012 21:59:54 +0200
Subject: [PATCH 1068/1537] First stab at Ninja mode ;-)

---
 apps/contacts/js/contacts.js | 66 +++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 514821a44f..1aa4c2a32d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1711,7 +1711,71 @@ $(document).ready(function(){
 	$('#contacts_newcontact').click(Contacts.UI.Card.editNew);
 	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
 
-	// Load a contact.
+	$(document).on('keyup', function(event) {
+		console.log(event.which + ' ' + event.target.nodeName);
+		if(event.target.nodeName.toUpperCase() != 'BODY'
+			|| $('#contacts li').length == 0
+			|| !Contacts.UI.Card.id) {
+			return;
+		}
+		/**
+		 * To add:
+		 * (Shift)n/p: next/prev addressbook
+		 */
+		switch(event.which) {
+			case 46:
+				if(event.shiftKey) {
+					Contacts.UI.Card.delayedDelete();
+				}
+				break;
+			case 32: // space
+				if(event.shiftKey) {
+					Contacts.UI.Contacts.previous();
+					break;
+				}
+			case 40: // down
+			case 75: // k
+				Contacts.UI.Contacts.next();
+				break;
+			case 38: // up
+			case 65: // a
+				if(event.shiftKey) {
+					// add addressbook
+					break;
+				}
+				Contacts.UI.Card.editNew();
+				break;
+			case 74: // j
+				Contacts.UI.Contacts.previous();
+				break;
+			case 78: // n
+				// next addressbook
+				break;
+			case 13: // Enter
+			case 79: // o
+				var aid = $('#contacts h3.active').first().data('id');
+				if(aid) {
+					$('#contacts ul[data-id="'+aid+'"]').slideToggle(300);
+				}
+				break;
+			case 80: // p
+				// prev addressbook
+				break;
+			case 82: // r
+				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
+				break;
+			case 191: // ?
+				console.log("Keyboard shorcuts:\nk or up key: Previous contact");
+				console.log("j or down key: Next contact");
+				console.log("o or Enter key: Expand/collapse");
+				console.log("n: New contact");
+				console.log("Shift-Delete: Delete current contact");
+				break;
+		}
+
+	});
+
+			// Load a contact.
 	$('.contacts').keydown(function(event) {
 		if(event.which == 13 || event.which == 32) {
 			$('.contacts').click();

From ab8ce89df34ea1fefd457973fd80651dba72a278 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 00:15:28 +0200
Subject: [PATCH 1069/1537] Added help for keyboard shortcuts.

---
 apps/contacts/css/contacts.css    |  9 +++++++++
 apps/contacts/js/contacts.js      | 20 +++++++++++++------
 apps/contacts/templates/index.php | 32 +++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 927e730980..ddae27da21 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -125,3 +125,12 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb} /* for multiselect */
 .typelist[type="button"]:hover { color: #777; } /* for multiselect */
 .addresslist { clear: both; font-weight: bold; }
+#ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; border: thin solid #eee; border-radius: 5px; background-color: #DBDBDB; opacity: 0.9; }
+#ninjahelp .close { position: absolute; top: 5px; right: 5px; height: 20px; width: 20px; }
+#ninjahelp h2, .help-section h3 { width: 100%; font-weight: bold; text-align: center; }
+#ninjahelp h2 { font-size: 1.4em; }
+.help-section { width: 45%; min-width: 35em; float: left; }
+.help-section h3 { font-size: 1.2em; }
+.help-section dl { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
+.help-section dt { display: table-cell; clear: left; float: left; width: 35%; margin: 0; padding: 0.2em; text-align: right; text-overflow: ellipsis; vertical-align: text-bottom; font-weight: bold: }
+.help-section dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0.2em; white-space: nowrap; vertical-align: text-bottom; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 1aa4c2a32d..dcfd8e71d9 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1711,6 +1711,10 @@ $(document).ready(function(){
 	$('#contacts_newcontact').click(Contacts.UI.Card.editNew);
 	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
 
+	$('#ninjahelp .close').on('click keydown',function() {
+		$('#ninjahelp').hide();
+	});
+
 	$(document).on('keyup', function(event) {
 		console.log(event.which + ' ' + event.target.nodeName);
 		if(event.target.nodeName.toUpperCase() != 'BODY'
@@ -1721,8 +1725,13 @@ $(document).ready(function(){
 		/**
 		 * To add:
 		 * (Shift)n/p: next/prev addressbook
+		 * u (85): hide/show leftcontent
+		 * f (70): add field
 		 */
 		switch(event.which) {
+			case 27: // Esc
+				$('#ninjahelp').hide();
+				break;
 			case 46:
 				if(event.shiftKey) {
 					Contacts.UI.Card.delayedDelete();
@@ -1737,19 +1746,21 @@ $(document).ready(function(){
 			case 75: // k
 				Contacts.UI.Contacts.next();
 				break;
-			case 38: // up
 			case 65: // a
 				if(event.shiftKey) {
 					// add addressbook
+					Contacts.UI.notImplemented();
 					break;
 				}
 				Contacts.UI.Card.editNew();
 				break;
+			case 38: // up
 			case 74: // j
 				Contacts.UI.Contacts.previous();
 				break;
 			case 78: // n
 				// next addressbook
+				Contacts.UI.notImplemented();
 				break;
 			case 13: // Enter
 			case 79: // o
@@ -1760,16 +1771,13 @@ $(document).ready(function(){
 				break;
 			case 80: // p
 				// prev addressbook
+				Contacts.UI.notImplemented();
 				break;
 			case 82: // r
 				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
 				break;
 			case 191: // ?
-				console.log("Keyboard shorcuts:\nk or up key: Previous contact");
-				console.log("j or down key: Next contact");
-				console.log("o or Enter key: Expand/collapse");
-				console.log("n: New contact");
-				console.log("Shift-Delete: Delete current contact");
+				$('#ninjahelp').toggle('fast');
 				break;
 		}
 
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 1bc4a19553..b2dde12684 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -32,6 +32,38 @@
 			echo $this->inc('part.no_contacts');
 		}
 	?>
+	<div class="hidden" id="ninjahelp">
+		<a class="close" tabindex="0" role="button">
+			<img class="svg" src="core/img/actions/delete.svg" alt="<?php echo $l->t('Close'); ?>" />
+		</a>
+		<h2><?php echo $l->t('Keyboard shortcuts'); ?></h2>
+		<div class="help-section">
+			<h3><?php echo $l->t('Navigation'); ?></h3>
+			<dl>
+				<dt>j/Down/Space</dt>
+				<dd><?php echo $l->t('Next contact in list'); ?></dd>
+				<dt>k/Up/Shift-Space</dt>
+				<dd><?php echo $l->t('Previous contact in list'); ?></dd>
+				<dt>o/Enter</dt>
+				<dd><?php echo $l->t('Expand/collapse current addressbook'); ?></dd>
+				<dt>n/p</dt>
+				<dd><?php echo $l->t('Next/previous addressbook'); ?></dd>
+			</dl>
+		</div>
+		<div class="help-section">
+			<h3><?php echo $l->t('Actions'); ?></h3>
+			<dl>
+				<dt>r</dt>
+				<dd><?php echo $l->t('Refresh contacts list'); ?></dd>
+				<dt>a</dt>
+				<dd><?php echo $l->t('Add new contact'); ?></dd>
+				<dt>Shift-a</dt>
+				<dd><?php echo $l->t('Add new addressbook'); ?></dd>
+				<dt>Shift-Delete</dt>
+				<dd><?php echo $l->t('Delete current contact'); ?></dd>
+			</dl>
+		</div>
+	</div>
 </div>
 <!-- Dialogs -->
 <div id="dialog_holder"></div>

From 2a73678fef47f8230f6caf546e42b22d722973b0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 01:49:42 +0200
Subject: [PATCH 1070/1537] use file extension for determining mimetypes on
 default

should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
---
 lib/helper.php            | 29 +++++++++++++----------------
 lib/mimetypes.fixlist.php | 22 ----------------------
 lib/mimetypes.list.php    | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 39 deletions(-)
 delete mode 100644 lib/mimetypes.fixlist.php

diff --git a/lib/helper.php b/lib/helper.php
index c4f7e8b2e1..59d88f46da 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -345,18 +345,24 @@ class OC_Helper {
 	 */
 	static function getMimeType($path){
 		$isWrapped=(strpos($path,'://')!==false) and (substr($path,0,7)=='file://');
-		$mimeType='application/octet-stream';
-		if ($mimeType=='application/octet-stream') {
-			self::$mimetypes = include('mimetypes.fixlist.php');
-			$extension=strtolower(strrchr(basename($path), "."));
-			$extension=substr($extension,1);//remove leading .
-			$mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
 
-		}
 		if (@is_dir($path)) {
 			// directories are easy
 			return "httpd/unix-directory";
 		}
+
+		if(strpos($path,'.')){
+			//try to guess the type by the file extension
+			if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')){
+				self::$mimetypes=include('mimetypes.list.php');
+			}
+			$extension=strtolower(strrchr(basename($path), "."));
+			$extension=substr($extension,1);//remove leading .
+			$mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
+		}else{
+			$mimeType='application/octet-stream';
+		}
+		
 		if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
 			$info = @strtolower(finfo_file($finfo,$path));
 			if($info){
@@ -385,15 +391,6 @@ class OC_Helper {
 			}
 
 		}
-		if ($mimeType=='application/octet-stream') {
-			// Fallback solution: (try to guess the type by the file extension
-			if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')){
-				self::$mimetypes=include('mimetypes.list.php');
-			}
-			$extension=strtolower(strrchr(basename($path), "."));
-			$extension=substr($extension,1);//remove leading .
-			$mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
-		}
 		return $mimeType;
 	}
 
diff --git a/lib/mimetypes.fixlist.php b/lib/mimetypes.fixlist.php
deleted file mode 100644
index 13e3f16b36..0000000000
--- a/lib/mimetypes.fixlist.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-return array(
-	'ics'=>'text/calendar',
-	'ical'=>'text/calendar',
-	'js'=>'application/javascript',
-	'odt'=>'application/vnd.oasis.opendocument.text',
-	'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
-	'odg'=>'application/vnd.oasis.opendocument.graphics',
-	'odp'=>'application/vnd.oasis.opendocument.presentation',
-	'pl'=>'text/x-script.perl',
-	'py'=>'text/x-script.phyton',
-	'vcf' => 'text/vcard',
-	'vcard' => 'text/vcard',
-	'doc'=>'application/msword',
-	'docx'=>'application/msword',
-	'xls'=>'application/msexcel',
-	'xlsx'=>'application/msexcel',
-	'ppt'=>'application/mspowerpoint',
-	'pptx'=>'application/mspowerpoint',
-	'sgf' => 'application/sgf',
-	'cdr' => 'application/coreldraw'
-);
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index ccf47999b1..f7207493f7 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -78,5 +78,16 @@ return array(
 	'mpeg'=>'video/mpeg',
 	'mov'=>'video/quicktime',
 	'webm'=>'video/webm',
-	'wmv'=>'video/x-ms-asf'
+	'wmv'=>'video/x-ms-asf',
+	'py'=>'text/x-script.phyton',
+	'vcf' => 'text/vcard',
+	'vcard' => 'text/vcard',
+	'doc'=>'application/msword',
+	'docx'=>'application/msword',
+	'xls'=>'application/msexcel',
+	'xlsx'=>'application/msexcel',
+	'ppt'=>'application/mspowerpoint',
+	'pptx'=>'application/mspowerpoint',
+	'sgf' => 'application/sgf',
+	'cdr' => 'application/coreldraw',
 );

From 2b747789588e34bce24bd558f7e979a6e0ea8047 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 02:23:24 +0200
Subject: [PATCH 1071/1537] add method to OC_Cache to check whether a fast
 cache (apc/xdebug/etc) is available

---
 lib/cache.php | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/lib/cache.php b/lib/cache.php
index 1f269174fa..6f4b3e6e3f 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -7,9 +7,20 @@
  */
 
 class OC_Cache {
+	/**
+	 * @var OC_Cache $user_cache
+	 */
 	static protected $user_cache;
+	/**
+	 * @var OC_Cache $global_cache
+	 */
 	static protected $global_cache;
+	static protected $isFast=null;
 
+	/**
+	 * get the global cache
+	 * @return OC_Cache
+	 */
 	static public function getGlobalCache() {
 		if (!self::$global_cache) {
 			$fast_cache = null;
@@ -27,6 +38,10 @@ class OC_Cache {
 		return self::$global_cache;
 	}
 
+	/**
+	 * get the user cache
+	 * @return OC_Cache
+	 */
 	static public function getUserCache() {
 		if (!self::$user_cache) {
 			$fast_cache = null;
@@ -44,11 +59,19 @@ class OC_Cache {
 		return self::$user_cache;
 	}
 
+	/**
+	 * get a value from the user cache
+	 * @return mixed
+	 */
 	static public function get($key) {
 		$user_cache = self::getUserCache();
 		return $user_cache->get($key);
 	}
 
+	/**
+	 * set a value in the user cache
+	 * @return bool
+	 */
 	static public function set($key, $value, $ttl=0) {
 		if (empty($key)) {
 			return false;
@@ -57,19 +80,42 @@ class OC_Cache {
 		return $user_cache->set($key, $value, $ttl);
 	}
 
+	/**
+	 * check if a value is set in the user cache
+	 * @return bool
+	 */
 	static public function hasKey($key) {
 		$user_cache = self::getUserCache();
 		return $user_cache->hasKey($key);
 	}
 
+	/**
+	 * remove an item from the user cache
+	 * @return bool
+	 */
 	static public function remove($key) {
 		$user_cache = self::getUserCache();
 		return $user_cache->remove($key);
 	}
 
+	/**
+	 * clear the user cache
+	 * @return bool
+	 */
 	static public function clear() {
 		$user_cache = self::getUserCache();
 		return $user_cache->clear();
 	}
 
+	/**
+	 * check if a fast memory based cache is available
+	 * @return true
+	 */
+	static public function isFast() {
+		if(is_null(self::$isFast)){
+			self::$isFast=function_exists('xcache_set') || function_exists('apc_store');
+		}
+		return self::$isFast;
+	}
+
 }

From 51566e87c7343385ae3b6854386c20974c94a53d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 02:31:43 +0200
Subject: [PATCH 1072/1537] add prefix option to OC_Cache::clear

---
 lib/cache.php        |  7 ++++---
 lib/cache/apc.php    |  5 +++--
 lib/cache/broker.php |  6 +++---
 lib/cache/file.php   |  5 +++--
 lib/cache/xcache.php |  5 +++--
 tests/lib/cache.php  | 21 +++++++++++++++++++++
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/lib/cache.php b/lib/cache.php
index 6f4b3e6e3f..36f409ab71 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -99,12 +99,13 @@ class OC_Cache {
 	}
 
 	/**
-	 * clear the user cache
+	 * clear the user cache of all entries starting with a prefix
+	 * @param string prefix (optional)
 	 * @return bool
 	 */
-	static public function clear() {
+	static public function clear($prefix='') {
 		$user_cache = self::getUserCache();
-		return $user_cache->clear();
+		return $user_cache->clear($prefix);
 	}
 
 	/**
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
index 6cf47d0c15..c192fe2f19 100644
--- a/lib/cache/apc.php
+++ b/lib/cache/apc.php
@@ -43,14 +43,15 @@ class OC_Cache_APC {
 		return apc_delete($this->getNamespace().$key);
 	}
 
-	public function clear(){
-		$ns = $this->getNamespace();
+	public function clear($prefix=''){
+		$ns = $this->getNamespace().$prefix;
 		$cache = apc_cache_info('user');
 		foreach($cache['cache_list'] as $entry) {
 			if (strpos($entry['info'], $ns) === 0) {
 				apc_delete($entry['info']);
 			}
 		}
+		return true;
 	}
 }
 if(!function_exists('apc_exists')) {
diff --git a/lib/cache/broker.php b/lib/cache/broker.php
index 931d0dd407..c2aceabaf5 100644
--- a/lib/cache/broker.php
+++ b/lib/cache/broker.php
@@ -46,8 +46,8 @@ class OC_Cache_Broker {
 		return $this->slow_cache->remove($key);
 	}
 
-	public function clear(){
-		$this->fast_cache->clear();
-		$this->slow_cache->clear();
+	public function clear($prefix=''){
+		$this->fast_cache->clear($prefix);
+		$this->slow_cache->clear($prefix);
 	}
 }
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 0b7d3e3050..562c3d1716 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -62,15 +62,16 @@ class OC_Cache_File{
 		return $storage->unlink($key);
 	}
 
-	public function clear(){
+	public function clear($prefix=''){
 		$storage = $this->getStorage();
 		if($storage and $storage->is_dir('/')){
 			$dh=$storage->opendir('/');
 			while($file=readdir($dh)){
-				if($file!='.' and $file!='..'){
+				if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)){
 					$storage->unlink('/'.$file);
 				}
 			}
 		}
+		return true;
 	}
 }
diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index bd55cee8f6..951f9b4754 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -43,7 +43,8 @@ class OC_Cache_XCache {
 		return xcache_unset($this->getNamespace().$key);
 	}
 
-	public function clear(){
-		return xcache_unset_by_prefix($this->getNamespace());
+	public function clear($prefix=''){
+		xcache_unset_by_prefix($this->getNamespace().$prefix);
+		return true;
 	}
 }
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index bb5cfc6ee1..511999be95 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -42,6 +42,27 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
 
 		$this->assertTrue($this->instance->remove('value1'));
+		$this->assertFalse($this->instance->hasKey('value1'));
+	}
+
+	function testClear(){
+		$value='ipsum lorum';
+		$this->instance->set('1_value1',$value);
+		$this->instance->set('1_value2',$value);
+		$this->instance->set('2_value1',$value);
+		$this->instance->set('3_value1',$value);
+
+		$this->assertTrue($this->instance->clear('1_'));
+		$this->assertFalse($this->instance->hasKey('1_value1'));
+		$this->assertFalse($this->instance->hasKey('1_value2'));
+		$this->assertTrue($this->instance->hasKey('2_value1'));
+		$this->assertTrue($this->instance->hasKey('3_value1'));
+
+		$this->assertTrue($this->instance->clear());
+		$this->assertFalse($this->instance->hasKey('1_value1'));
+		$this->assertFalse($this->instance->hasKey('1_value2'));
+		$this->assertFalse($this->instance->hasKey('2_value1'));
+		$this->assertFalse($this->instance->hasKey('3_value1'));
 	}
 
 	function testTTL(){

From 6843beeae97835573cf792c8367b41ecfeef5342 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 03:21:20 +0200
Subject: [PATCH 1073/1537] add option to only get fast cache

---
 lib/cache.php | 57 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/lib/cache.php b/lib/cache.php
index 36f409ab71..55f189a5da 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -15,24 +15,40 @@ class OC_Cache {
 	 * @var OC_Cache $global_cache
 	 */
 	static protected $global_cache;
+	/**
+	 * @var OC_Cache $global_cache_fast
+	 */
+	static protected $global_cache_fast;
+	/**
+	 * @var OC_Cache $user_cache_fast
+	 */
+	static protected $user_cache_fast;
 	static protected $isFast=null;
 
 	/**
 	 * get the global cache
 	 * @return OC_Cache
 	 */
-	static public function getGlobalCache() {
+	static public function getGlobalCache($fast=false) {
 		if (!self::$global_cache) {
-			$fast_cache = null;
-			if (!$fast_cache && function_exists('xcache_set')) {
-				$fast_cache = new OC_Cache_XCache(true);
+			self::$global_cache_fast = null;
+			if (!self::$global_cache_fast && function_exists('xcache_set')) {
+				self::$global_cache_fast = new OC_Cache_XCache(true);
 			}
-			if (!$fast_cache && function_exists('apc_store')) {
-				$fast_cache = new OC_Cache_APC(true);
+			if (!self::$global_cache_fast && function_exists('apc_store')) {
+				self::$global_cache_fast = new OC_Cache_APC(true);
 			}
+			
 			self::$global_cache = new OC_Cache_FileGlobal();
-			if ($fast_cache) {
-				self::$global_cache = new OC_Cache_Broker($fast_cache, self::$global_cache);
+			if (self::$global_cache_fast) {
+				self::$global_cache = new OC_Cache_Broker(self::$global_cache_fast, self::$global_cache);
+			}
+		}
+		if($fast){
+			if(self::$global_cache_fast){
+				return self::$global_cache_fast;
+			}else{
+				return false;
 			}
 		}
 		return self::$global_cache;
@@ -42,18 +58,27 @@ class OC_Cache {
 	 * get the user cache
 	 * @return OC_Cache
 	 */
-	static public function getUserCache() {
+	static public function getUserCache($fast=false) {
 		if (!self::$user_cache) {
-			$fast_cache = null;
-			if (!$fast_cache && function_exists('xcache_set')) {
-				$fast_cache = new OC_Cache_XCache();
+			self::$user_cache_fast = null;
+			if (!self::$user_cache_fast && function_exists('xcache_set')) {
+				self::$user_cache_fast = new OC_Cache_XCache();
 			}
-			if (!$fast_cache && function_exists('apc_store')) {
-				$fast_cache = new OC_Cache_APC();
+			if (!self::$user_cache_fast && function_exists('apc_store')) {
+				self::$user_cache_fast = new OC_Cache_APC();
 			}
+			
 			self::$user_cache = new OC_Cache_File();
-			if ($fast_cache) {
-				self::$user_cache = new OC_Cache_Broker($fast_cache, self::$user_cache);
+			if (self::$user_cache_fast) {
+				self::$user_cache = new OC_Cache_Broker(self::$user_cache_fast, self::$user_cache);
+			}
+		}
+
+		if($fast){
+			if(self::$user_cache_fast){
+				return self::$user_cache_fast;
+			}else{
+				return false;
 			}
 		}
 		return self::$user_cache;

From 59ab8b14c74c491fc1309e96f58d4ebc6ffd95d4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 03:24:34 +0200
Subject: [PATCH 1074/1537] cache fileid's in oc_cache

---
 apps/files/ajax/scan.php |  5 +++++
 lib/filecache.php        | 32 +++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 6fcf97688c..eef3885851 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -16,6 +16,11 @@ session_write_close();
 if($force or !OC_FileCache::inCache('')){
 	if(!$checkOnly){
 		OCP\DB::beginTransaction();
+		
+		if(OC_Cache::isFast()){
+			OC_Cache::clear('fileid/'); //make sure the old fileid's don't mess things up
+		}
+		
 		OC_FileCache::scan($dir,$eventSource);
 		OC_FileCache::clean();
 		OCP\DB::commit();
diff --git a/lib/filecache.php b/lib/filecache.php
index 4b1774925c..22f7427ae4 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -98,6 +98,10 @@ class OC_FileCache{
 		if(OC_DB::isError($result)){
 			OC_Log::write('files','error while writing file('.$path.') to cache',OC_Log::ERROR);
 		}
+
+		if($cache=OC_Cache::getUserCache(true)){
+			$cache->remove('fileid/'.$path);//ensure we don't have -1 cached
+		}
 	}
 
 	/**
@@ -146,6 +150,11 @@ class OC_FileCache{
 		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET parent=? ,name=?, path=?, path_hash=? WHERE path_hash=?');
 		$query->execute(array($newParent,basename($newPath),$newPath,md5($newPath),md5($oldPath)));
 
+		if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$oldPath)){
+			$cache->set('fileid/'.$newPath,$cache->get('fileid/'.$oldPath));
+			$cache->remove('fileid/'.$oldPath);
+		}
+
 		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE path LIKE ?');
 		$oldLength=strlen($oldPath);
 		$updateQuery=OC_DB::prepare('UPDATE *PREFIX*fscache SET path=?, path_hash=? WHERE path_hash=?');
@@ -153,6 +162,11 @@ class OC_FileCache{
 			$old=$row['path'];
 			$new=$newPath.substr($old,$oldLength);
 			$updateQuery->execute(array($new,md5($new),md5($old)));
+
+			if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$old)){
+				$cache->set('fileid/'.$new,$cache->get('fileid/'.$old));
+				$cache->remove('fileid/'.$old);
+			}
 		}
 	}
 
@@ -171,6 +185,8 @@ class OC_FileCache{
 		//delete everything inside the folder
 		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE path LIKE ?');
 		$query->execute(array($root.$path.'/%'));
+
+		OC_Cache::remove('fileid/'.$root.$path);
 	}
 	
 	/**
@@ -245,9 +261,14 @@ class OC_FileCache{
 		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
+
+		$fullPath=$root.$path;
+		if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$fullPath)){
+			return $cache->get('fileid/'.$fullPath);
+		}
 		
 		$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path_hash=?');
-		$result=$query->execute(array(md5($root.$path)));
+		$result=$query->execute(array(md5($fullPath)));
 		if(OC_DB::isError($result)){
 			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
 			return -1;
@@ -255,10 +276,15 @@ class OC_FileCache{
 		
 		$result=$result->fetchRow();
 		if(is_array($result)){
-			return $result['id'];
+			$id=$result['id'];
 		}else{
-			return -1;
+			$id=-1;
 		}
+		if($cache=OC_Cache::getUserCache(true)){
+			$cache->set('fileid/'.$fullPath,$id);
+		}
+		
+		return $id;
 	}
 	
 	/**

From a49c07cf88f5093ab9a5af15384296aa2acbcd6d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 03:56:51 +0200
Subject: [PATCH 1075/1537] progressbar for New->From Url

---
 apps/files/ajax/newfile.php | 56 +++++++++++++++++++++++++++++--------
 apps/files/js/files.js      | 36 +++++++++++++-----------
 2 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 7236deb65c..de054d9ce0 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -1,16 +1,23 @@
 <?php
 
 // Init owncloud
+global $eventSource;
 
+if(!OC_User::isLoggedIn()){
+	exit;
+}
 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
+session_write_close();
 
 // Get the params
-$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
-$filename = isset( $_POST['filename'] ) ? stripslashes($_POST['filename']) : '';
-$content = isset( $_POST['content'] ) ? $_POST['content'] : '';
-$source = isset( $_POST['source'] ) ? stripslashes($_POST['source']) : '';
+$dir = isset( $_REQUEST['dir'] ) ? stripslashes($_REQUEST['dir']) : '';
+$filename = isset( $_REQUEST['filename'] ) ? stripslashes($_REQUEST['filename']) : '';
+$content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
+$source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
+
+if($source){
+	$eventSource=new OC_EventSource();
+}
 
 if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
@@ -21,22 +28,49 @@ if(strpos($filename,'/')!==false){
 	exit();
 }
 
+function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max){
+	static $filesize = 0;
+	static $lastsize = 0;
+	global $eventSource;
+
+	switch($notification_code) {
+		case STREAM_NOTIFY_FILE_SIZE_IS:
+			$filesize = $bytes_max;
+			break;
+			
+		case STREAM_NOTIFY_PROGRESS:
+			if ($bytes_transferred > 0) {
+				if (!isset($filesize)) {
+				} else {
+					$progress = (int)(($bytes_transferred/$filesize)*100);
+					if($progress>$lastsize){//limit the number or messages send
+						$eventSource->send('progress',$progress);
+					}
+					$lastsize=$progress;
+				}
+			}
+			break;
+	}
+}
+
 if($source){
 	if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
 		OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
 		exit();
 	}
-	$sourceStream=fopen($source,'rb');
+
+	$ctx = stream_context_create(null, array('notification' =>'progress'));
+	$sourceStream=fopen($source,'rb', false, $ctx);
 	$target=$dir.'/'.$filename;
 	$result=OC_Filesystem::file_put_contents($target,$sourceStream);
 	if($result){
 		$mime=OC_Filesystem::getMimetype($target);
-		OCP\JSON::success(array("data" => array('mime'=>$mime)));
-		exit();
+		$eventSource->send('success',$mime);
 	}else{
-		OCP\JSON::error(array("data" => array( "message" => "Error while downloading ".$source. ' to '.$target )));
-		exit();
+		$eventSource->send('error',"Error while downloading ".$source. ' to '.$target);
 	}
+	$eventSource->close();
+	exit();
 }else{
 	if($content){
 		if(OC_Filesystem::file_put_contents($dir.'/'.$filename,$content)){
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 86c5185bf7..a4e2361fee 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -497,23 +497,27 @@ $(document).ready(function() {
 						localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.','');
 					}
 					localName = getUniqueName(localName);
-					$.post(
-						OC.filePath('files','ajax','newfile.php'),
-						{dir:$('#dir').val(),source:name,filename:localName},
-						function(result){
-							if(result.status == 'success'){
-								var date=new Date();
-								FileList.addFile(localName,0,date);
-								var tr=$('tr').filterAttr('data-file',localName);
-								tr.data('mime',result.data.mime);
-								getMimeIcon(result.data.mime,function(path){
-									tr.find('td.filename').attr('style','background-image:url('+path+')');
-								});
-							}else{
+					$('#uploadprogressbar').progressbar({value:0});
+					$('#uploadprogressbar').fadeIn();
 
-							}
-						}
-					);
+					var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+					eventSource.listen('progress',function(progress){
+						$('#uploadprogressbar').progressbar('value',progress);
+					});
+					eventSource.listen('success',function(mime){
+						$('#uploadprogressbar').fadeOut();
+						var date=new Date();
+						FileList.addFile(localName,0,date);
+						var tr=$('tr').filterAttr('data-file',localName);
+						tr.data('mime',mime);
+						getMimeIcon(mime,function(path){
+							tr.find('td.filename').attr('style','background-image:url('+path+')');
+						});
+					});
+					eventSource.listen('error',function(error){
+						$('#uploadprogressbar').fadeOut();
+						alert(error);
+					});
 					break;
 			}
 			var li=$(this).parent();

From b1010160b363223c1e1c1cc7137dfb8e9aa3ab5b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 22 Jul 2012 16:36:09 +0200
Subject: [PATCH 1076/1537] CSRF protection for eventsource

---
 apps/files/ajax/newfile.php    | 2 ++
 core/js/eventsource.js         | 1 +
 core/templates/layout.user.php | 1 +
 lib/eventsource.php            | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index de054d9ce0..cc9208ad08 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -17,6 +17,8 @@ $source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
 
 if($source){
 	$eventSource=new OC_EventSource();
+}else{
+	OC_JSON::callCheck();
 }
 
 if($filename == '') {
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 08259e02ca..e3ad7e3a67 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/templates/layout.user.php b/core/templates/layout.user.php
index 7e98fdedc2..dc303ffc1a 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -33,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);
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 2a8c6b9290..95af2e471b 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -42,6 +42,9 @@ class OC_EventSource{
 		}else{
 			header("Content-Type: text/event-stream");
 		}
+		if( !OC_Util::isCallRegistered()){
+			exit();
+		}
 		flush();
 
 	}

From 9e70f64d44f7ffcc03bdbbd8c312b52f97d33c7b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 22 Jul 2012 15:38:23 +0200
Subject: [PATCH 1077/1537] Fix oc-1163: gzdecode function not always defined

This function is only found in newer php versions
---
 lib/minimizer.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/minimizer.php b/lib/minimizer.php
index 3bf5ff9980..3dc89e331a 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -46,3 +46,13 @@ abstract class OC_Minimizer {
 		echo $out;
 	}
 }
+
+if (!function_exists('gzdecode')) {
+	function gzdecode($data,$maxlength=null,&$filename='',&$error='')
+	{
+		if (strcmp(substr($data,0,9),"\x1f\x8b\x8\0\0\0\0\0\0")) {
+			return null;  // Not the GZIP format we expect (See RFC 1952)
+		}
+		return gzinflate(substr($data,10,-8));
+	}
+}

From 641bd7a456dc811c7b6c8f721f1c20028d8bc53e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 00:54:19 +0200
Subject: [PATCH 1078/1537] Whitespace

---
 apps/contacts/js/loader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 577ad10306..5bca0ab723 100644
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -78,9 +78,9 @@ Contacts_Import={
 }
 $(document).ready(function(){
 	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog); 
+		FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog);
 		FileActions.setDefault('text/vcard','importaddressbook');
-		FileActions.register('text/x-vcard','importaddressbook', '', Contacts_Import.importdialog); 
+		FileActions.register('text/x-vcard','importaddressbook', '', Contacts_Import.importdialog);
 		FileActions.setDefault('text/x-vcard','importaddressbook');
 	};
 });
\ No newline at end of file

From 294e65fa38b3ba5575285c65f11eeb80000ffbe2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 01:34:05 +0200
Subject: [PATCH 1079/1537] Use insertContact

---
 apps/contacts/js/contacts.js | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index dcfd8e71d9..7c1304c559 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1510,21 +1510,12 @@ Contacts={
 				$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
 					function(jsondata){
 						if(jsondata.status == 'success'){
-							// Do some inserting/removing/sorting magic
-							var name = $(dragitem).find('a').html();
-							var added = false;
-							$(droplist).children().each(function(){
-								if ($(this).text().toLowerCase() > name.toLowerCase()) {
-									$(this).before(dragitem.detach()); //.fadeIn('slow');
-									added = true;
-									return false;
-								}
-							});
-							if(!added) {
-								$(droplist).append(dragitem.detach());
-							}
 							dragitem.attr('data-bookid', droptarget.data('id'))
 							dragitem.data('bookid', droptarget.data('id'));
+							Contacts.UI.Contacts.insertContact({
+								contactlist:droplist,
+								contact:dragitem.detach()
+							});
 							Contacts.UI.Contacts.scrollTo(dragitem.data('id'));
 						} else {
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));

From dc05fd7b920eee413124a67af7747106c8a652e0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 14:36:20 +0200
Subject: [PATCH 1080/1537] No need to set checksum for PHOTO.

---
 apps/contacts/ajax/loadphoto.php |  46 --------------
 apps/contacts/js/contacts.js     | 104 +++++++++++++++----------------
 2 files changed, 49 insertions(+), 101 deletions(-)
 delete mode 100644 apps/contacts/ajax/loadphoto.php

diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
deleted file mode 100644
index be924b5db4..0000000000
--- a/apps/contacts/ajax/loadphoto.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
- 
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-require_once 'loghandler.php';
-
-$id = isset($_GET['id']) ? $_GET['id'] : '';
-$refresh = isset($_GET['refresh']) ? true : false;
-
-if($id == '') {
-	bailOut(OC_Contacts_App::$l10n->t('Missing contact id.'));
-}
-
-$checksum = '';
-$vcard = OC_Contacts_App::getContactVCard( $id );
-foreach($vcard->children as $property){
-	if($property->name == 'PHOTO') {
-		$checksum = md5($property->serialize());
-		break;
-	}
-}
-
-OCP\JSON::success(array('data' => array('checksum'=>$checksum)));
-
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 7c1304c559..de6060a111 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -21,27 +21,31 @@ Contacts={
 		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
 		 */
 		notify:function(params) {
-			var notifier = $('#notification');
-			notifier.text(params.message);
-			notifier.fadeIn();
+			self = this;
+			if(!self.notifier) {
+				self.notifier = $('#notification');
+			}
+			self.notifier.text(params.message);
+			self.notifier.fadeIn();
+			self.notifier.on('click', function() { $(this).fadeOut();});
 			var timer = setTimeout(function() {
-				notifier.fadeOut();
+				self.notifier.fadeOut();
 				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
-					params.timeouthandler(notifier.data(dataid));
-					notifier.off('click');
-					notifier.data(dataid, null);
+					params.timeouthandler(self.notifier.data(dataid));
+					self.notifier.off('click');
+					self.notifier.removeData(dataid);
 				}
 			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
 			var dataid = timer.toString();
 			if(params.data) {
-				notifier.data(dataid, params.data);
+				self.notifier.data(dataid, params.data);
 			}
 			if(params.clickhandler && $.isFunction(params.clickhandler)) {
-				notifier.on('click', function() {
+				self.notifier.on('click', function() {
 					clearTimeout(timer);
-					notifier.off('click');
-					params.clickhandler(notifier.data(dataid));
-					notifier.data(dataid, null);
+					self.notifier.off('click');
+					params.clickhandler(self.notifier.data(dataid));
+					self.notifier.removeData(dataid);
 				});
 			}
 		},
@@ -295,16 +299,6 @@ Contacts={
 			$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 		},
 		Card:{
-			id:'',
-			fn:'',
-			fullname:'',
-			shortname:'',
-			famname:'',
-			givname:'',
-			addname:'',
-			honpre:'',
-			honsuf:'',
-			data:undefined,
 			update:function(params) { // params {cid:int, aid:int}
 				if(!params) { params = {}; }
 				$('#contacts li,#contacts h3').removeClass('active');
@@ -584,8 +578,12 @@ Contacts={
 						$(this).find('input').val('');
 					}
 				});
-				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
-				var narray = undefined;
+
+				with(this) {
+					delete fn; delete fullname; delete givname; delete famname;
+					delete addname; delete honpre; delete honsuf;
+				}
+
 				if(this.data.FN) {
 					this.fn = this.data.FN[0]['value'];
 				}
@@ -1210,28 +1208,17 @@ Contacts={
 				$('#phototools li a').tipsy('hide');
 				var wrapper = $('#contacts_details_photo_wrapper');
 				wrapper.addClass('loading').addClass('wait');
-
-				var img = new Image();
-				$(img).load(function () {
+				delete this.photo;
+				this.photo = new Image();
+				$(this.photo).load(function () {
 					$('img.contacts_details_photo').remove()
-					$(this).addClass('contacts_details_photo').hide();
+					$(this).addClass('contacts_details_photo');
 					wrapper.removeClass('loading').removeClass('wait');
-					$(this).insertAfter($('#phototools')).fadeIn();
+					$(this).insertAfter($('#phototools')).fadeIn('fast');
 				}).error(function () {
 					// notify the user that the image could not be loaded
 					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
 				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
-
-				$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
-						Contacts.UI.Card.loadPhotoHandlers();
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-				$('#file_upload_form').show();
 			},
 			editCurrentPhoto:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
@@ -1493,7 +1480,15 @@ Contacts={
 			}
 		},
 		Contacts:{
+			contacts:{},
 			batchnum:50,
+			get:function(id) {
+				if(!this.contacts[id]) {
+					// TODO: Check if item isn't loaded yet. If so insert it.
+					this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
+				}
+				return this.contacts[id];
+			},
 			drop:function(event, ui) {
 				var dragitem = ui.draggable, droptarget = $(this);
 				if(dragitem.is('li')) {
@@ -1532,13 +1527,16 @@ Contacts={
 			 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
 			 */
 			insertContact:function(params) {
+				var id, bookid;
 				if(!params.contactlist) {
 					// FIXME: Check if contact really exists.
-					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					id = params.data ? params.data.id : params.contact.data('id');
 					params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
 				}
 				if(!params.contacts) {
-					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					id = params.data ? params.data.id : params.contact.data('id');
 					params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
 				}
 				var contact = params.data
@@ -1558,6 +1556,7 @@ Contacts={
 				if(!added || !params.contacts) {
 					params.contactlist.append(contact);
 				}
+				//this.contacts[id] = contact;
 				return contact;
 			},
 			next:function(reverse) {
@@ -1692,18 +1691,13 @@ $(document).ready(function(){
 	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	$('#notification').click(function(){
-		$('#notification').fadeOut();
-	});
+	$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
+	$('#contacts_newcontact').on('click keydown', Contacts.UI.Card.editNew);
 
-	$('#chooseaddressbook').click(Contacts.UI.Addressbooks.overview);
-	$('#chooseaddressbook').keydown(Contacts.UI.Addressbooks.overview);
+	var ninjahelp = $('#ninjahelp');
 
-	$('#contacts_newcontact').click(Contacts.UI.Card.editNew);
-	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
-
-	$('#ninjahelp .close').on('click keydown',function() {
-		$('#ninjahelp').hide();
+	ninjahelp.find('.close').on('click keydown',function() {
+		ninjahelp.hide();
 	});
 
 	$(document).on('keyup', function(event) {
@@ -1721,7 +1715,7 @@ $(document).ready(function(){
 		 */
 		switch(event.which) {
 			case 27: // Esc
-				$('#ninjahelp').hide();
+				ninjahelp.hide();
 				break;
 			case 46:
 				if(event.shiftKey) {
@@ -1768,7 +1762,7 @@ $(document).ready(function(){
 				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
 				break;
 			case 191: // ?
-				$('#ninjahelp').toggle('fast');
+				ninjahelp.toggle('fast');
 				break;
 		}
 
@@ -1780,7 +1774,7 @@ $(document).ready(function(){
 			$('.contacts').click();
 		}
 	});
-	$(document).on('click', '.contacts', function(event){
+	$(document).on('click', '#contacts', function(event){
 		var $tgt = $(event.target);
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();

From 644b6e60d555cf5bae1c03e32c7330fe4d8dce56 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 14:49:38 +0200
Subject: [PATCH 1081/1537] Revert "No need to set checksum for PHOTO."

This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
---
 apps/contacts/ajax/loadphoto.php |  46 ++++++++++++++
 apps/contacts/js/contacts.js     | 104 ++++++++++++++++---------------
 2 files changed, 101 insertions(+), 49 deletions(-)
 create mode 100644 apps/contacts/ajax/loadphoto.php

diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
new file mode 100644
index 0000000000..be924b5db4
--- /dev/null
+++ b/apps/contacts/ajax/loadphoto.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * 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/>.
+ *
+ */
+ 
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+
+require_once 'loghandler.php';
+
+$id = isset($_GET['id']) ? $_GET['id'] : '';
+$refresh = isset($_GET['refresh']) ? true : false;
+
+if($id == '') {
+	bailOut(OC_Contacts_App::$l10n->t('Missing contact id.'));
+}
+
+$checksum = '';
+$vcard = OC_Contacts_App::getContactVCard( $id );
+foreach($vcard->children as $property){
+	if($property->name == 'PHOTO') {
+		$checksum = md5($property->serialize());
+		break;
+	}
+}
+
+OCP\JSON::success(array('data' => array('checksum'=>$checksum)));
+
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index de6060a111..7c1304c559 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -21,31 +21,27 @@ Contacts={
 		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
 		 */
 		notify:function(params) {
-			self = this;
-			if(!self.notifier) {
-				self.notifier = $('#notification');
-			}
-			self.notifier.text(params.message);
-			self.notifier.fadeIn();
-			self.notifier.on('click', function() { $(this).fadeOut();});
+			var notifier = $('#notification');
+			notifier.text(params.message);
+			notifier.fadeIn();
 			var timer = setTimeout(function() {
-				self.notifier.fadeOut();
+				notifier.fadeOut();
 				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
-					params.timeouthandler(self.notifier.data(dataid));
-					self.notifier.off('click');
-					self.notifier.removeData(dataid);
+					params.timeouthandler(notifier.data(dataid));
+					notifier.off('click');
+					notifier.data(dataid, null);
 				}
 			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
 			var dataid = timer.toString();
 			if(params.data) {
-				self.notifier.data(dataid, params.data);
+				notifier.data(dataid, params.data);
 			}
 			if(params.clickhandler && $.isFunction(params.clickhandler)) {
-				self.notifier.on('click', function() {
+				notifier.on('click', function() {
 					clearTimeout(timer);
-					self.notifier.off('click');
-					params.clickhandler(self.notifier.data(dataid));
-					self.notifier.removeData(dataid);
+					notifier.off('click');
+					params.clickhandler(notifier.data(dataid));
+					notifier.data(dataid, null);
 				});
 			}
 		},
@@ -299,6 +295,16 @@ Contacts={
 			$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 		},
 		Card:{
+			id:'',
+			fn:'',
+			fullname:'',
+			shortname:'',
+			famname:'',
+			givname:'',
+			addname:'',
+			honpre:'',
+			honsuf:'',
+			data:undefined,
 			update:function(params) { // params {cid:int, aid:int}
 				if(!params) { params = {}; }
 				$('#contacts li,#contacts h3').removeClass('active');
@@ -578,12 +584,8 @@ Contacts={
 						$(this).find('input').val('');
 					}
 				});
-
-				with(this) {
-					delete fn; delete fullname; delete givname; delete famname;
-					delete addname; delete honpre; delete honsuf;
-				}
-
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+				var narray = undefined;
 				if(this.data.FN) {
 					this.fn = this.data.FN[0]['value'];
 				}
@@ -1208,17 +1210,28 @@ Contacts={
 				$('#phototools li a').tipsy('hide');
 				var wrapper = $('#contacts_details_photo_wrapper');
 				wrapper.addClass('loading').addClass('wait');
-				delete this.photo;
-				this.photo = new Image();
-				$(this.photo).load(function () {
+
+				var img = new Image();
+				$(img).load(function () {
 					$('img.contacts_details_photo').remove()
-					$(this).addClass('contacts_details_photo');
+					$(this).addClass('contacts_details_photo').hide();
 					wrapper.removeClass('loading').removeClass('wait');
-					$(this).insertAfter($('#phototools')).fadeIn('fast');
+					$(this).insertAfter($('#phototools')).fadeIn();
 				}).error(function () {
 					// notify the user that the image could not be loaded
 					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
 				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
+
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
+						Contacts.UI.Card.loadPhotoHandlers();
+					}
+					else{
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+				$('#file_upload_form').show();
 			},
 			editCurrentPhoto:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
@@ -1480,15 +1493,7 @@ Contacts={
 			}
 		},
 		Contacts:{
-			contacts:{},
 			batchnum:50,
-			get:function(id) {
-				if(!this.contacts[id]) {
-					// TODO: Check if item isn't loaded yet. If so insert it.
-					this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
-				}
-				return this.contacts[id];
-			},
 			drop:function(event, ui) {
 				var dragitem = ui.draggable, droptarget = $(this);
 				if(dragitem.is('li')) {
@@ -1527,16 +1532,13 @@ Contacts={
 			 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
 			 */
 			insertContact:function(params) {
-				var id, bookid;
 				if(!params.contactlist) {
 					// FIXME: Check if contact really exists.
-					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-					id = params.data ? params.data.id : params.contact.data('id');
+					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
 					params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
 				}
 				if(!params.contacts) {
-					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-					id = params.data ? params.data.id : params.contact.data('id');
+					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
 					params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
 				}
 				var contact = params.data
@@ -1556,7 +1558,6 @@ Contacts={
 				if(!added || !params.contacts) {
 					params.contactlist.append(contact);
 				}
-				//this.contacts[id] = contact;
 				return contact;
 			},
 			next:function(reverse) {
@@ -1691,13 +1692,18 @@ $(document).ready(function(){
 	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
-	$('#contacts_newcontact').on('click keydown', Contacts.UI.Card.editNew);
+	$('#notification').click(function(){
+		$('#notification').fadeOut();
+	});
 
-	var ninjahelp = $('#ninjahelp');
+	$('#chooseaddressbook').click(Contacts.UI.Addressbooks.overview);
+	$('#chooseaddressbook').keydown(Contacts.UI.Addressbooks.overview);
 
-	ninjahelp.find('.close').on('click keydown',function() {
-		ninjahelp.hide();
+	$('#contacts_newcontact').click(Contacts.UI.Card.editNew);
+	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
+
+	$('#ninjahelp .close').on('click keydown',function() {
+		$('#ninjahelp').hide();
 	});
 
 	$(document).on('keyup', function(event) {
@@ -1715,7 +1721,7 @@ $(document).ready(function(){
 		 */
 		switch(event.which) {
 			case 27: // Esc
-				ninjahelp.hide();
+				$('#ninjahelp').hide();
 				break;
 			case 46:
 				if(event.shiftKey) {
@@ -1762,7 +1768,7 @@ $(document).ready(function(){
 				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
 				break;
 			case 191: // ?
-				ninjahelp.toggle('fast');
+				$('#ninjahelp').toggle('fast');
 				break;
 		}
 
@@ -1774,7 +1780,7 @@ $(document).ready(function(){
 			$('.contacts').click();
 		}
 	});
-	$(document).on('click', '#contacts', function(event){
+	$(document).on('click', '.contacts', function(event){
 		var $tgt = $(event.target);
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();

From b00de0258be84d6a1b2309b95f23e10068865ed3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 14:56:00 +0200
Subject: [PATCH 1082/1537] Make sure notifier cleans up.

---
 apps/contacts/js/contacts.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 7c1304c559..e53f695f97 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -21,27 +21,31 @@ Contacts={
 		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
 		 */
 		notify:function(params) {
-			var notifier = $('#notification');
-			notifier.text(params.message);
-			notifier.fadeIn();
+			self = this;
+			if(!self.notifier) {
+				self.notifier = $('#notification');
+			}
+			self.notifier.text(params.message);
+			self.notifier.fadeIn();
+			self.notifier.on('click', function() { $(this).fadeOut();});
 			var timer = setTimeout(function() {
-				notifier.fadeOut();
+				self.notifier.fadeOut();
 				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
-					params.timeouthandler(notifier.data(dataid));
-					notifier.off('click');
-					notifier.data(dataid, null);
+					params.timeouthandler(self.notifier.data(dataid));
+					self.notifier.off('click');
+					self.notifier.removeData(dataid);
 				}
 			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
 			var dataid = timer.toString();
 			if(params.data) {
-				notifier.data(dataid, params.data);
+				self.notifier.data(dataid, params.data);
 			}
 			if(params.clickhandler && $.isFunction(params.clickhandler)) {
-				notifier.on('click', function() {
+				self.notifier.on('click', function() {
 					clearTimeout(timer);
-					notifier.off('click');
-					params.clickhandler(notifier.data(dataid));
-					notifier.data(dataid, null);
+					self.notifier.off('click');
+					params.clickhandler(self.notifier.data(dataid));
+					self.notifier.removeData(dataid);
 				});
 			}
 		},

From 0439a1832466cf1b2dce067c16bc30fa6378ef3b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 14:58:57 +0200
Subject: [PATCH 1083/1537] Cleaner variable handling.

---
 apps/contacts/js/contacts.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index e53f695f97..db089b8d23 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -299,16 +299,6 @@ Contacts={
 			$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
 		},
 		Card:{
-			id:'',
-			fn:'',
-			fullname:'',
-			shortname:'',
-			famname:'',
-			givname:'',
-			addname:'',
-			honpre:'',
-			honsuf:'',
-			data:undefined,
 			update:function(params) { // params {cid:int, aid:int}
 				if(!params) { params = {}; }
 				$('#contacts li,#contacts h3').removeClass('active');
@@ -588,8 +578,12 @@ Contacts={
 						$(this).find('input').val('');
 					}
 				});
-				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
-				var narray = undefined;
+
+				with(this) {
+					delete fn; delete fullname; delete givname; delete famname;
+					delete addname; delete honpre; delete honsuf;
+				}
+
 				if(this.data.FN) {
 					this.fn = this.data.FN[0]['value'];
 				}

From fb9ef90c45d9993febc4c9481f6b74ca8f467d73 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 15:00:12 +0200
Subject: [PATCH 1084/1537] No need to set checksum on PHOTO.

---
 apps/contacts/js/contacts.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index db089b8d23..d33f16e4e9 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1208,28 +1208,17 @@ Contacts={
 				$('#phototools li a').tipsy('hide');
 				var wrapper = $('#contacts_details_photo_wrapper');
 				wrapper.addClass('loading').addClass('wait');
-
-				var img = new Image();
-				$(img).load(function () {
+				delete this.photo;
+				this.photo = new Image();
+				$(this.photo).load(function () {
 					$('img.contacts_details_photo').remove()
-					$(this).addClass('contacts_details_photo').hide();
+					$(this).addClass('contacts_details_photo');
 					wrapper.removeClass('loading').removeClass('wait');
 					$(this).insertAfter($('#phototools')).fadeIn();
 				}).error(function () {
 					// notify the user that the image could not be loaded
 					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
 				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
-
-				$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
-						Contacts.UI.Card.loadPhotoHandlers();
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-				$('#file_upload_form').show();
 			},
 			editCurrentPhoto:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){

From b60e5942a526ffa87ca118261f13debdafdda810 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Jul 2012 15:01:35 +0200
Subject: [PATCH 1085/1537] Cleaner event handling.

---
 apps/contacts/js/contacts.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d33f16e4e9..f9b60a0e4f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1679,18 +1679,13 @@ $(document).ready(function(){
 	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	$('#notification').click(function(){
-		$('#notification').fadeOut();
-	});
+	$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
+	$('#contacts_newcontact').on('click keydown', Contacts.UI.Card.editNew);
 
-	$('#chooseaddressbook').click(Contacts.UI.Addressbooks.overview);
-	$('#chooseaddressbook').keydown(Contacts.UI.Addressbooks.overview);
+	var ninjahelp = $('#ninjahelp');
 
-	$('#contacts_newcontact').click(Contacts.UI.Card.editNew);
-	$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
-
-	$('#ninjahelp .close').on('click keydown',function() {
-		$('#ninjahelp').hide();
+	ninjahelp.find('.close').on('click keydown',function() {
+		ninjahelp.hide();
 	});
 
 	$(document).on('keyup', function(event) {
@@ -1708,7 +1703,7 @@ $(document).ready(function(){
 		 */
 		switch(event.which) {
 			case 27: // Esc
-				$('#ninjahelp').hide();
+				ninjahelp.hide();
 				break;
 			case 46:
 				if(event.shiftKey) {
@@ -1755,7 +1750,7 @@ $(document).ready(function(){
 				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
 				break;
 			case 191: // ?
-				$('#ninjahelp').toggle('fast');
+				ninjahelp.toggle('fast');
 				break;
 		}
 
@@ -1767,7 +1762,7 @@ $(document).ready(function(){
 			$('.contacts').click();
 		}
 	});
-	$(document).on('click', '.contacts', function(event){
+	$(document).on('click', '#contacts', function(event){
 		var $tgt = $(event.target);
 		if ($tgt.is('li') || $tgt.is('a')) {
 			var item = $tgt.is('li')?$($tgt):($tgt).parent();

From 67b6ff22bc2db42b53723e86d33e34cc49503d3c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 23 Jul 2012 01:15:20 +0200
Subject: [PATCH 1086/1537] Cache DOM lookups, general cleanup.

---
 apps/contacts/js/contacts.js | 245 +++++++++++++++++++----------------
 1 file changed, 132 insertions(+), 113 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index f9b60a0e4f..4c6c8bf3d9 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -222,11 +222,7 @@ Contacts={
 				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]').detach();
 				$(item).find('a').html(name);
 				Contacts.UI.Card.fn = name;
-				Contacts.UI.Contacts.insertContact({
-					contactlist:$('#contacts ul[data-id="'+Contacts.UI.Card.bookid+'"]'),
-					contacts:$('#contacts ul[data-id="'+Contacts.UI.Card.bookid+'"] li'),
-					contact:item,
-				});
+				Contacts.UI.Contacts.insertContact({contact:item});
 				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
 			});
 
@@ -315,10 +311,11 @@ Contacts={
 					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
 				} else if(parseInt(params.cid) && !parseInt(params.aid)) {
 					newid = parseInt(params.cid);
-					var listitem = $('#contacts li[data-id="'+newid+'"]');
+					var listitem = Contacts.UI.Contacts.getContact(newid); //$('#contacts li[data-id="'+newid+'"]');
 					console.log('Is contact in list? ' + listitem.length);
 					if(listitem.length) {
-						bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
+						//bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
+						bookid = parseInt(Contacts.UI.Contacts.getContact(newid).data('bookid'));
 					} else { // contact isn't in list yet.
 						bookid = 'unknown';
 					}
@@ -406,19 +403,7 @@ Contacts={
 							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 								if(jsondata.status == 'success'){
 									Contacts.UI.Card.loadContact(jsondata.data, aid);
-									$('#contacts .active').removeClass('active');
-									var item = $('<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>');
-									var added = false;
-									$('#contacts ul[data-id="'+aid+'"] li').each(function(){
-										if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
-											$(this).before(item).fadeIn('fast');
-											added = true;
-											return false;
-										}
-									});
-									if(!added) {
-										$('#contacts ul[data-id="'+aid+'"]').append(item);
-									}
+									var item = Contacts.UI.Contacts.insertContact({data:jsondata.data});
 									if(isnew) { // add some default properties
 										Contacts.UI.Card.addProperty('EMAIL');
 										Contacts.UI.Card.addProperty('TEL');
@@ -455,9 +440,14 @@ Contacts={
 				}
 			},
 			delayedDelete:function() {
+				/* TODO:
+				$(window).unload(function() {
+					deleteFilesInQueue();
+				});
+				*/
 				$('#contacts_deletecard').tipsy('hide');
 				var newid = '', bookid;
-				var curlistitem = $('#contacts li[data-id="'+Contacts.UI.Card.id+'"]');
+				var curlistitem = Contacts.UI.Contacts.getContact(this.id);
 				curlistitem.removeClass('active');
 				var newlistitem = curlistitem.prev('li');
 				if(!newlistitem) {
@@ -468,9 +458,12 @@ Contacts={
 					newid = newlistitem.data('id');
 					bookid = newlistitem.data('bookid');
 				}
-				$('#rightcontent').data('id',newid);
-				this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
-				this.data = undefined;
+				$('#rightcontent').data('id', newid);
+
+				with(this) {
+					delete id; delete fn; delete fullname; delete shortname; delete famname;
+					delete givname; delete addname; delete honpre; delete honsuf; delete data;
+				}
 
 				if($('.contacts li').length > 0) {
 					Contacts.UI.Card.update({cid:newid, aid:bookid});
@@ -479,8 +472,7 @@ Contacts={
 					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
 						if(jsondata.status == 'success'){
 							id = '';
-							$('#rightcontent').data('id','');
-							$('#rightcontent').html(jsondata.data.page);
+							$('#rightcontent').html(jsondata.data.page).removeData('id');
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -520,21 +512,22 @@ Contacts={
 				this.loadAddresses();
 				this.loadSingleProperties();
 				Contacts.UI.loadListHandlers();
+				var note = $('#note');
 				if(this.data.NOTE) {
-					$('#note').data('checksum', this.data.NOTE[0]['checksum']);
-					var note = $('#note').find('textarea');
+					note.data('checksum', this.data.NOTE[0]['checksum']);
+					var textarea = note.find('textarea');
 					var txt = this.data.NOTE[0]['value'];
 					var nheight = txt.split('\n').length > 4 ? txt.split('\n').length+2 : 5;
-					note.css('min-height', nheight+'em');
-					note.attr('rows', nheight);
-					note.val(txt);
-					$('#note').show();
-					note.expandingTextarea();
+					textarea.css('min-height', nheight+'em');
+					textarea.attr('rows', nheight);
+					textarea.val(txt);
+					note.show();
+					textarea.expandingTextarea();
 					$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
 				} else {
-					$('#note').data('checksum', '');
-					$('#note').find('textarea').val('');
-					$('#note').hide();
+					note.removeData('checksum');
+					note.find('textarea').val('');
+					note.hide();
 					$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
 				}
 			},
@@ -560,10 +553,11 @@ Contacts={
 							var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
 							value = $.datepicker.formatDate('dd-mm-yy', val);
 						}
-						$('#contact_identity').find('#'+propname.toLowerCase()).val(value);
-						$('#contact_identity').find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
-						$('#contact_identity').find('#'+propname.toLowerCase()+'_label').show();
-						$('#contact_identity').find('#'+propname.toLowerCase()+'_value').show();
+						var identcontainer = $('#contact_identity');
+						identcontainer.find('#'+propname.toLowerCase()).val(value);
+						identcontainer.find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
+						identcontainer.find('#'+propname.toLowerCase()+'_label').show();
+						identcontainer.find('#'+propname.toLowerCase()+'_value').show();
 					} else {
 						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
 					}
@@ -767,17 +761,9 @@ Contacts={
 			},
 			addProperty:function(type){
 				switch (type) {
-					case 'PHOTO':
-						this.loadPhoto(true);
-						$('#file_upload_form').show();
-						$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-						$('#file_upload_start').trigger('click');
-						break;
 					case 'NOTE':
-						$('#note').show();
 						$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-						$('#note').find('textarea').expandingTextarea();
-						$('#note').find('textarea').focus();
+						$('#note').find('textarea').expandingTextarea().show().focus();
 						break;
 					case 'EMAIL':
 						if($('#emaillist>li').length == 1) {
@@ -832,8 +818,7 @@ Contacts={
 									}
 								} else {
 									$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-									$('dl dd[data-element="'+proptype+'"]').data('checksum', '');
-									$('dl dd[data-element="'+proptype+'"]').find('input').val('');
+									$('dl dd[data-element="'+proptype+'"]').data('checksum', '').find('input').val('');
 								}
 								$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
 								Contacts.UI.loading(obj, false);
@@ -860,14 +845,14 @@ Contacts={
 					}
 				}
 			},
-			editName:function(){
+			editName:function() {
 				var params = {id: this.id};
 				/* Initialize the name edit dialog */
-				if($('#edit_name_dialog').dialog('isOpen') == true){
+				if($('#edit_name_dialog').dialog('isOpen') == true) {
 					$('#edit_name_dialog').dialog('moveToTop');
-				}else{
-					$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata){
-						if(jsondata.status == 'success'){
+				} else {
+					$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata) {
+						if(jsondata.status == 'success') {
 							$('body').append('<div id="name_dialog"></div>');
 							$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
 								modal: true,
@@ -939,10 +924,11 @@ Contacts={
 			loadAddresses:function(){
 				$('#addresses').hide();
 				$('#addressdisplay dl.propertycontainer').remove();
+				var addresscontainer = $('#addressdisplay');
 				for(var adr in this.data.ADR) {
-					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
-					$('#addressdisplay dl').last().removeClass('template').addClass('propertycontainer');
-					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+					addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
+					addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
 					var adrarray = this.data.ADR[adr]['value'];
 					var adrtxt = '';
 					if(adrarray[0] && adrarray[0].length > 0) {
@@ -954,7 +940,7 @@ Contacts={
 					if(adrarray[2] && adrarray[2].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
 					}
-					if((adrarray[3] && adrarray[5]) && adrarray[3].length > 0 || adrarray[5].length > 0) {
+					if((3 in adrarray && 5 in adrarray) && adrarray[3].length > 0 || adrarray[5].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
 					}
 					if(adrarray[4] && adrarray[4].length > 0) {
@@ -963,7 +949,7 @@ Contacts={
 					if(adrarray[6] && adrarray[6].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
 					}
-					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
+					addresscontainer.find('dl').last().find('.addresslist').html(adrtxt);
 					var types = new Array();
 					var ttypes = new Array();
 					for(var param in this.data.ADR[adr]['parameters']) {
@@ -972,12 +958,12 @@ Contacts={
 							ttypes.push(this.data.ADR[adr]['parameters'][param]);
 						}
 					}
-					$('#addressdisplay dl').last().find('.adr_type_label').text(types.join('/'));
-					$('#addressdisplay dl').last().find('.adr_type').val(ttypes.join(','));
-					$('#addressdisplay dl').last().find('.adr').val(adrarray.join(';'));
-					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+					addresscontainer.find('dl').last().find('.adr_type_label').text(types.join('/'));
+					addresscontainer.find('dl').last().find('.adr_type').val(ttypes.join(','));
+					addresscontainer.find('dl').last().find('.adr').val(adrarray.join(';'));
+					addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
 				}
-				if($('#addressdisplay dl').length > 1) {
+				if(addresscontainer.find('dl').length > 1) {
 					$('#addresses').show();
 					$('#contact_communication').show();
 				}
@@ -1022,9 +1008,6 @@ Contacts={
 								close : function(event, ui) {
 									$(this).dialog('destroy').remove();
 									$('#address_dialog').remove();
-									if(isnew) {
-										container.remove();
-									}
 								},
 								open : function(event, ui) {
 									$( "#adr_city" ).autocomplete({
@@ -1063,7 +1046,7 @@ Contacts={
 											$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
 										}
 									});
-									$( "#adr_country" ).autocomplete({
+									$('#adr_country').autocomplete({
 										source: function( request, response ) {
 											$.ajax({
 												url: "http://ws.geonames.org/searchJSON",
@@ -1114,15 +1097,23 @@ Contacts={
 			saveAddress:function(dlg, obj, isnew){
 				if(isnew) {
 					container = $('#addressdisplay dl').last();
-					obj = $('#addressdisplay dl:last-child').find('input').first();
+					obj = container.find('input').first();
 				} else {
 					checksum = Contacts.UI.checksumFor(obj);
 					container = Contacts.UI.propertyContainerFor(obj);
 				}
-				var adr = new Array($(dlg).find('#adr_pobox').val().strip_tags(),$(dlg).find('#adr_extended').val().strip_tags(),$(dlg).find('#adr_street').val().strip_tags(),$(dlg).find('#adr_city').val().strip_tags(),$(dlg).find('#adr_region').val().strip_tags(),$(dlg).find('#adr_zipcode').val().strip_tags(),$(dlg).find('#adr_country').val().strip_tags());
-				$(container).find('.adr').val(adr.join(';'));
-				$(container).find('.adr_type').val($(dlg).find('#adr_type').val());
-				$(container).find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
+				var adr = new Array(
+					$(dlg).find('#adr_pobox').val().strip_tags(),
+					$(dlg).find('#adr_extended').val().strip_tags(),
+					$(dlg).find('#adr_street').val().strip_tags(),
+					$(dlg).find('#adr_city').val().strip_tags(),
+					$(dlg).find('#adr_region').val().strip_tags(),
+					$(dlg).find('#adr_zipcode').val().strip_tags(),
+					$(dlg).find('#adr_country').val().strip_tags()
+				);
+				container.find('.adr').val(adr.join(';'));
+				container.find('.adr_type').val($(dlg).find('#adr_type').val());
+				container.find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
 				Contacts.UI.Card.saveProperty($(container).find('input').first());
 				var adrtxt = '';
 				if(adr[0].length > 0) {
@@ -1143,7 +1134,7 @@ Contacts={
 				if(adr[6].length > 0) {
 					adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
 				}
-				$(container).find('.addresslist').html(adrtxt);
+				container.find('.addresslist').html(adrtxt);
 			},
 			uploadPhoto:function(filelist) {
 				if(!filelist) {
@@ -1170,24 +1161,25 @@ Contacts={
 					form.submit();
 				}
 			},
-			loadPhotoHandlers:function(){
-				$('#phototools li a').tipsy('hide');
-				$('#phototools li a').tipsy();
+			loadPhotoHandlers:function() {
+				var phototools = $('#phototools');
+				phototools.find('li a').tipsy('hide');
+				phototools.find('li a').tipsy();
 				if(this.data.PHOTO) {
-					$('#phototools .delete').click(function() {
+					phototools.find('.delete').click(function() {
 						$(this).tipsy('hide');
 						Contacts.UI.Card.deleteProperty($('#contacts_details_photo'), 'single');
 						$(this).hide();
 					});
-					$('#phototools .edit').click(function() {
+					phototools.find('.edit').click(function() {
 						$(this).tipsy('hide');
 						Contacts.UI.Card.editCurrentPhoto();
 					});
-					$('#phototools .delete').show();
-					$('#phototools .edit').show();
+					phototools.find('.delete').show();
+					phototools.find('.edit').show();
 				} else {
-					$('#phototools .delete').hide();
-					$('#phototools .edit').hide();
+					phototools.find('.delete').hide();
+					phototools.find('.edit').hide();
 				}
 			},
 			cloudPhotoSelected:function(path){
@@ -1219,6 +1211,7 @@ Contacts={
 					// notify the user that the image could not be loaded
 					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
 				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
+				this.loadPhotoHandlers()
 			},
 			editCurrentPhoto:function(){
 				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
@@ -1272,10 +1265,11 @@ Contacts={
 			},
 			addMail:function() {
 				//alert('addMail');
-				$('#emaillist li.template:first-child').clone(true).appendTo($('#emaillist')).show().find('a .tip').tipsy();
-				$('#emaillist li.template:last-child').find('select').addClass('contacts_property');
-				$('#emaillist li.template:last-child').removeClass('template').addClass('propertycontainer');
-				$('#emaillist li:last-child').find('input[type="email"]').focus();
+				var emaillist = $('#emaillist');
+				emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
+				emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
+				emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+				emaillist.find('li:last-child').find('input[type="email"]').focus();
 				return false;
 			},
 			loadMails:function() {
@@ -1311,35 +1305,37 @@ Contacts={
 				return false;
 			},
 			addPhone:function() {
-				$('#phonelist li.template:first-child').clone(true).appendTo($('#phonelist')); //.show();
-				$('#phonelist li.template:last-child').find('select').addClass('contacts_property');
-				$('#phonelist li.template:last-child').removeClass('template').addClass('propertycontainer');
-				$('#phonelist li:last-child').find('input[type="text"]').focus();
-				$('#phonelist li:last-child').find('select').multiselect({
+				var phonelist = $('#phonelist');
+				phonelist.find('li.template:first-child').clone(true).appendTo(phonelist); //.show();
+				phonelist.find('li.template:last-child').find('select').addClass('contacts_property');
+				phonelist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+				phonelist.find('li:last-child').find('input[type="text"]').focus();
+				phonelist.find('li:last-child').find('select').multiselect({
 														noneSelectedText: t('contacts', 'Select type'),
 														header: false,
 														selectedList: 4,
 														classes: 'typelist'
 													});
-				$('#phonelist li:last-child').show();
+				phonelist.find('li:last-child').show();
 				return false;
 			},
 			loadPhones:function() {
 				$('#phones').hide();
 				$('#phonelist li.propertycontainer').remove();
+				var phonelist = $('#phonelist');
 				for(var phone in this.data.TEL) {
 					this.addPhone();
-					$('#phonelist li:last-child').find('select').multiselect('destroy');
-					$('#phonelist li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
-					$('#phonelist li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+					phonelist.find('li:last-child').find('select').multiselect('destroy');
+					phonelist.find('li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
+					phonelist.find('li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
 					for(var param in this.data.TEL[phone]['parameters']) {
 						if(param.toUpperCase() == 'PREF') {
-							$('#phonelist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+							phonelist.find('li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
 						}
 						else if(param.toUpperCase() == 'TYPE') {
 							for(ptype in this.data.TEL[phone]['parameters'][param]) {
 								var pt = this.data.TEL[phone]['parameters'][param][ptype];
-								$('#phonelist li:last-child').find('select option').each(function(){
+								phonelist.find('li:last-child').find('select option').each(function(){
 									//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
 									if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
 										$(this).attr('selected', 'selected');
@@ -1348,14 +1344,14 @@ Contacts={
 							}
 						}
 					}
-					$('#phonelist li:last-child').find('select').multiselect({
-														noneSelectedText: t('contacts', 'Select type'),
-														header: false,
-														selectedList: 4,
-														classes: 'typelist'
-													});
+					phonelist.find('li:last-child').find('select').multiselect({
+											noneSelectedText: t('contacts', 'Select type'),
+											header: false,
+											selectedList: 4,
+											classes: 'typelist'
+										});
 				}
-				if($('#phonelist li').length > 1) {
+				if(phonelist.find('li').length > 1) {
 					$('#phones').show();
 					$('#contact_communication').show();
 				}
@@ -1480,7 +1476,25 @@ Contacts={
 			}
 		},
 		Contacts:{
+			contacts:{},
 			batchnum:50,
+			getContact:function(id) {
+				if(!this.contacts[id]) {
+					this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
+						if(!this.contacts[id]) {
+							self = this;
+							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+								if(jsondata.status == 'success'){
+									self.contacts[id] = self.insertContact({data:jsondata.data});
+								}
+								else{
+									OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+								}
+							});
+						}
+				}
+				return this.contacts[id];
+			},
 			drop:function(event, ui) {
 				var dragitem = ui.draggable, droptarget = $(this);
 				if(dragitem.is('li')) {
@@ -1519,13 +1533,16 @@ Contacts={
 			 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
 			 */
 			insertContact:function(params) {
+				var id, bookid;
 				if(!params.contactlist) {
 					// FIXME: Check if contact really exists.
-					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					id = params.data ? params.data.id : params.contact.data('id');
 					params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
 				}
 				if(!params.contacts) {
-					var bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+					id = params.data ? params.data.id : params.contact.data('id');
 					params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
 				}
 				var contact = params.data
@@ -1545,6 +1562,7 @@ Contacts={
 				if(!added || !params.contacts) {
 					params.contactlist.append(contact);
 				}
+				//this.contacts[id] = contact;
 				return contact;
 			},
 			next:function(reverse) {
@@ -1991,14 +2009,15 @@ $(document).ready(function(){
 								$('#selectaddressbook_dialog').dialog('moveToTop');
 							} else {
 								$('#dialog_holder').html(jsondata.data.page).ready(function($) {
-									$('#selectaddressbook_dialog').dialog({
+									var select_dlg = $('#selectaddressbook_dialog');
+									select_dlg.dialog({
 										modal: true, height: 'auto', width: 'auto',
 										buttons: {
 											'Ok':function() {
-												aid = $('#selectaddressbook_dialog').find('input:checked').val();
+												aid = select_dlg.find('input:checked').val();
 												if(aid == 'new') {
-													var displayname = $('#selectaddressbook_dialog').find('input.name').val();
-													var description = $('#selectaddressbook_dialog').find('input.desc').val();
+													var displayname = select_dlg.find('input.name').val();
+													var description = select_dlg.find('input.desc').val();
 													if(!displayname.trim()) {
 														OC.dialogs.alert(t('contacts', 'The address book name cannot be empty.'), t('contacts', 'Error'));
 														return false;

From 25e1c13ef7dbbcea0dd3ad80533aa9005ea3e978 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 23 Jul 2012 01:16:45 +0200
Subject: [PATCH 1087/1537] Remove unused ajax file.

---
 apps/contacts/ajax/loadphoto.php | 46 --------------------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 apps/contacts/ajax/loadphoto.php

diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
deleted file mode 100644
index be924b5db4..0000000000
--- a/apps/contacts/ajax/loadphoto.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
- 
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-require_once 'loghandler.php';
-
-$id = isset($_GET['id']) ? $_GET['id'] : '';
-$refresh = isset($_GET['refresh']) ? true : false;
-
-if($id == '') {
-	bailOut(OC_Contacts_App::$l10n->t('Missing contact id.'));
-}
-
-$checksum = '';
-$vcard = OC_Contacts_App::getContactVCard( $id );
-foreach($vcard->children as $property){
-	if($property->name == 'PHOTO') {
-		$checksum = md5($property->serialize());
-		break;
-	}
-}
-
-OCP\JSON::success(array('data' => array('checksum'=>$checksum)));
-

From 708c771296bfc839a54dce7e50fa9793fb636457 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 19 Jul 2012 14:35:28 +0200
Subject: [PATCH 1088/1537] update routine to fix broken file properties in db

---
 apps/files/appinfo/update.php | 11 +++++++++++
 apps/files/appinfo/version    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index f9953ba4de..88db08e7e2 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -1,5 +1,16 @@
 <?php
 
+// fix webdav properties, remove namespace information between curly bracket
+$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
+if (version_compare($installedVersion, '1.1.4', '<')) {
+	$query = OC_DB::prepare( "SELECT propertyname, propertypath, userid FROM `*PREFIX*properties`" );
+	$result = $query->execute();
+	while( $row = $result->fetchRow()){
+		$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyname = ? WHERE userid = ? AND propertypath = ?' );
+		$query->execute( array( preg_replace("/{.*}/", "", $row["propertyname"]),$row["userid"], $row["propertypath"] ));
+	}
+}
+
 //update from OC 3
 
 //try to remove remaining files.
diff --git a/apps/files/appinfo/version b/apps/files/appinfo/version
index 9c1218c201..1b87bcd0b0 100644
--- a/apps/files/appinfo/version
+++ b/apps/files/appinfo/version
@@ -1 +1 @@
-1.1.3
\ No newline at end of file
+1.1.4
\ No newline at end of file

From c0e37c7d69196ae34a01cfda95394625d79e7c29 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 19 Jul 2012 15:03:41 +0200
Subject: [PATCH 1089/1537] quick fix for broken properties

---
 lib/connector/sabre/node.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 3cb5412f09..a70a1e0721 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -142,6 +142,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	public function updateProperties($properties) {
 		$existing = $this->getProperties(array());
 		foreach($properties as $propertyName => $propertyValue) {
+			$propertyName = preg_replace("/^{.*}/", "", $propertyName); // fix broken property name
 			// If it was null, we need to delete the property
 			if (is_null($propertyValue)) {
 				if(array_key_exists( $propertyName, $existing )){

From bd63fddbf44312f7c388711b6f7b990245654283 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 23 Jul 2012 10:34:01 +0200
Subject: [PATCH 1090/1537] fix broken properties in the database

---
 apps/files/appinfo/update.php | 4 ++--
 lib/connector/sabre/node.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index 88db08e7e2..5514aed197 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -1,13 +1,13 @@
 <?php
 
-// fix webdav properties, remove namespace information between curly bracket
+// fix webdav properties, remove namespace information between curly bracket (update from OC4 to OC5)
 $installedVersion=OCP\Config::getAppValue('files', 'installed_version');
 if (version_compare($installedVersion, '1.1.4', '<')) {
 	$query = OC_DB::prepare( "SELECT propertyname, propertypath, userid FROM `*PREFIX*properties`" );
 	$result = $query->execute();
 	while( $row = $result->fetchRow()){
 		$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyname = ? WHERE userid = ? AND propertypath = ?' );
-		$query->execute( array( preg_replace("/{.*}/", "", $row["propertyname"]),$row["userid"], $row["propertypath"] ));
+		$query->execute( array( preg_replace("/^{.*}/", "", $row["propertyname"]),$row["userid"], $row["propertypath"] ));
 	}
 }
 
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index a70a1e0721..663970487f 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -142,7 +142,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	public function updateProperties($properties) {
 		$existing = $this->getProperties(array());
 		foreach($properties as $propertyName => $propertyValue) {
-			$propertyName = preg_replace("/^{.*}/", "", $propertyName); // fix broken property name
+			$propertyName = preg_replace("/^{.*}/", "", $propertyName); // remove leading namespace from property name
 			// If it was null, we need to delete the property
 			if (is_null($propertyValue)) {
 				if(array_key_exists( $propertyName, $existing )){

From e7e1f234dd38732c0667e46f036fd0894b54ef4b Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 23 Jul 2012 18:34:21 +0200
Subject: [PATCH 1091/1537] first part of the new new OCS CLOUD module. So far
 only quota is implemented. The specification is developed here:
 http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
 will be moved to
 http://www.freedesktop.org/wiki/Specifications/open-collaboration-services as
 soon as everything is done.

---
 lib/ocs.php       | 815 ++++++++++++++++++++++++----------------------
 ocs/providers.php |   4 +-
 2 files changed, 436 insertions(+), 383 deletions(-)

diff --git a/lib/ocs.php b/lib/ocs.php
index 77dd437d6c..48f34cc639 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -4,7 +4,9 @@
 * ownCloud
 *
 * @author Frank Karlitschek
+* @author Michael Gapczynski
 * @copyright 2012 Frank Karlitschek frank@owncloud.org
+* @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
@@ -29,425 +31,438 @@
  */
 class OC_OCS {
 
-  /**
-   * reads input date from get/post/cookies and converts the date to a special data-type
-   *
-   * @param variable $key
-   * @param variable-type $type
-   * @param priority $getpriority
-   * @param default  $default
-   * @return data
-   */
-  public static function readData($key,$type='raw',$getpriority=false,$default='') {
-    if($getpriority) {
-      if(isset($_GET[$key])) {
-        $data=$_GET[$key];
-      } elseif(isset($_POST[$key])) {
-        $data=$_POST[$key];
-      } else {
-        if($default=='') {
-          if(($type=='int') or ($type=='float')) $data=0; else $data='';
-        } else {
-          $data=$default;
-        }
-      }
-    } else {
-      if(isset($_POST[$key])) {
-        $data=$_POST[$key];
-      } elseif(isset($_GET[$key])) {
-        $data=$_GET[$key];
-      } elseif(isset($_COOKIE[$key])) {
-        $data=$_COOKIE[$key];
-      } else {
-        if($default=='') {
-          if(($type=='int') or ($type=='float')) $data=0; else $data='';
-        } else {
-          $data=$default;
-        }
-      }
-    }
+	/**
+	* reads input date from get/post/cookies and converts the date to a special data-type
+	*
+	* @param string HTTP method to read the key from
+	* @param string Parameter to read
+	* @param string Variable type to format data
+	* @param mixed Default value to return if the key is not found
+	* @return mixed Data or if the key is not found and no default is set it will exit with a 400 Bad request
+	*/
+	public static function readData($method, $key, $type = 'raw', $default = null) {
+		if ($method == 'get') {
+			if (isset($_GET[$key])) {
+				$data = $_GET[$key];
+			} else if (isset($default)) {
+				return $default;
+			} else {
+				$data = false;
+			}
+		} else if ($method == 'post') {
+			if (isset($_POST[$key])) {
+				$data = $_POST[$key];
+			} else if (isset($default)) {
+				return $default;
+			} else {
+				$data = false;
+			}
+		}
+		if ($data === false) {
+			echo self::generateXml('', 'fail', 400, 'Bad request. Please provide a valid '.$key);
+			exit();
+		} else {
+			// NOTE: Is the raw type necessary? It might be a little risky without sanitization
+			if ($type == 'raw') return $data;
+			elseif ($type == 'text') return OC_Util::sanitizeHTML($data);
+			elseif ($type == 'int')  return (int) $data;
+			elseif ($type == 'float') return (float) $data;
+			elseif ($type == 'array') return OC_Util::sanitizeHTML($data);
+			else return OC_Util::sanitizeHTML($data);
+		}
+	}
 
-    if($type=='raw') return($data);
-    elseif($type=='text') return(addslashes(strip_tags($data)));
-    elseif($type=='int')  { $data = (int) $data; return($data); }
-    elseif($type=='float')  { $data = (float) $data; return($data); }
-    elseif($type=='array')  { $data = $data; return($data); }
-  }
+	/**
+	main function to handle the REST request
+	**/
+	public static function handle() {
+		// overwrite the 404 error page returncode
+		header("HTTP/1.0 200 OK");
 
 
-  /**
-    main function to handle the REST request
-  **/
-  public static function handle() {
+		if($_SERVER['REQUEST_METHOD'] == 'GET') {
+			$method='get';
+		}elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
+			$method='put';
+			parse_str(file_get_contents("php://input"),$put_vars);
+		}elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$method='post';
+		}else{
+			echo('internal server error: method not supported');
+			exit();
+		}
 
-    // overwrite the 404 error page returncode
-    header("HTTP/1.0 200 OK");
+		// preprocess url
+		$url = strtolower($_SERVER['REQUEST_URI']);
+		if(substr($url,(strlen($url)-1))<>'/') $url.='/';
+		$ex=explode('/',$url);
+		$paracount=count($ex);
+		$format = self::readData($method, 'format', 'text', '');
+
+		// eventhandler
+		// CONFIG
+		// apiconfig - GET - CONFIG
+		if(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'config')){
+			OC_OCS::apiconfig($format);
+
+		// PERSON
+		// personcheck - POST - PERSON/CHECK
+		}elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')){
+			$login = self::readData($method, 'login', 'text');
+			$passwd = self::readData($method, 'password', 'text');
+			OC_OCS::personcheck($format,$login,$passwd);
+/*
+		} else if ($method == 'post' && $ex[$paracount - 4] == 'v1.php' && $ex[$paracount - 3] == 'person' && $ex[$paracount - 2] == 'add') {
+			if (OC_Group::inGroup(self::checkPassword(), 'admin')) {
+				$login = self::readData($method, 'login', 'text');
+				$password = self::readData($method, 'password', 'text');
+				try {
+					OC_User::createUser($login, $password);
+					echo self::generateXml($format, 'ok', 201, '');
+				} catch (Exception $exception) {
+					echo self::generateXml($format, 'fail', 400, $exception->getMessage());
+				}
+			} else {
+				echo self::generateXml($format, 'fail', 403, 'Permission denied');
+			}
+*/
+
+		// ACTIVITY
+		// activityget - GET ACTIVITY   page,pagesize als urlparameter
+		}elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){
+			$page = self::readData($method, 'page', 'int', 0);
+			$pagesize = self::readData($method, 'pagesize','int', 10);
+			if($pagesize<1 or $pagesize>100) $pagesize=10;
+			OC_OCS::activityget($format,$page,$pagesize);
+
+		// activityput - POST ACTIVITY
+		}elseif(($method=='post') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){
+			$message = self::readData($method, 'message', 'text');
+			OC_OCS::activityput($format,$message);
 
 
-    if($_SERVER['REQUEST_METHOD'] == 'GET') {
-       $method='get';
-    }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
-       $method='put';
-    }elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
-       $method='post';
-    }else{
-      echo('internal server error: method not supported');
-      exit();
-    }
+		// PRIVATEDATA
+		// get - GET DATA
+		}elseif(($method=='get') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-2] == 'getattribute')){
+			OC_OCS::privateDataGet($format);
 
-    // preprocess url
-    $url=$_SERVER['REQUEST_URI'];
-    if(substr($url,(strlen($url)-1))<>'/') $url.='/';
-    $ex=explode('/',$url);
-    $paracount=count($ex);
+		}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-3] == 'getattribute')){
+			$app=$ex[$paracount-2];
+			OC_OCS::privateDataGet($format, $app);
+				}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'getattribute')){
+			
+			$key=$ex[$paracount-2];
+			$app=$ex[$paracount-3];
+			OC_OCS::privateDataGet($format, $app,$key);
 
-    // eventhandler
-    // CONFIG
-    // apiconfig - GET - CONFIG
-    if(($method=='get') and (strtolower($ex[$paracount-3])=='v1.php') and (strtolower($ex[$paracount-2])=='config')){
-      $format=OC_OCS::readdata('format','text');
-      OC_OCS::apiconfig($format);
+		// set - POST DATA
+		}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')){
+			$key=$ex[$paracount-2];
+			$app=$ex[$paracount-3];
+			$value = self::readData($method, 'value', 'text');
+			OC_OCS::privatedataset($format, $app, $key, $value);
+		// delete - POST DATA
+		}elseif(($method=='post') and ($ex[$paracount-6] =='v1.php') and ($ex[$paracount-4] == 'deleteattribute')){
+			$key=$ex[$paracount-2];
+			$app=$ex[$paracount-3];
+			OC_OCS::privatedatadelete($format, $app, $key);
 
-    // PERSON
-    // personcheck - POST - PERSON/CHECK
-    }elseif(($method=='post') and (strtolower($ex[$paracount-4])=='v1.php') and (strtolower($ex[$paracount-3])=='person') and  (strtolower($ex[$paracount-2])=='check')){
-      $format=OC_OCS::readdata('format','text');
-      $login=OC_OCS::readdata('login','text');
-      $passwd=OC_OCS::readdata('password','text');
-      OC_OCS::personcheck($format,$login,$passwd);
-
-    // ACTIVITY
-    // activityget - GET ACTIVITY   page,pagesize als urlparameter
-    }elseif(($method=='get') and (strtolower($ex[$paracount-3])=='v1.php')and (strtolower($ex[$paracount-2])=='activity')){
-      $format=OC_OCS::readdata('format','text');
-      $page=OC_OCS::readdata('page','int');
-      $pagesize=OC_OCS::readdata('pagesize','int');
-      if($pagesize<1 or $pagesize>100) $pagesize=10;
-      OC_OCS::activityget($format,$page,$pagesize);
-
-    // activityput - POST ACTIVITY
-    }elseif(($method=='post') and (strtolower($ex[$paracount-3])=='v1.php')and (strtolower($ex[$paracount-2])=='activity')){
-      $format=OC_OCS::readdata('format','text');
-      $message=OC_OCS::readdata('message','text');
-      OC_OCS::activityput($format,$message);
-
-    // PRIVATEDATA
-    // get - GET DATA
-    }elseif(($method=='get') and (strtolower($ex[$paracount-4])=='v1.php')and (strtolower($ex[$paracount-2])=='getattribute')){
-      $format=OC_OCS::readdata('format','text');
-      OC_OCS::privateDataGet($format);
-
-    }elseif(($method=='get') and (strtolower($ex[$paracount-5])=='v1.php')and (strtolower($ex[$paracount-3])=='getattribute')){
-      $format=OC_OCS::readdata('format','text');
-      $app=$ex[$paracount-2];
-      OC_OCS::privateDataGet($format, $app);
-	}elseif(($method=='get') and (strtolower($ex[$paracount-6])=='v1.php')and (strtolower($ex[$paracount-4])=='getattribute')){
-      $format=OC_OCS::readdata('format','text');
-      $key=$ex[$paracount-2];
-      $app=$ex[$paracount-3];
-      OC_OCS::privateDataGet($format, $app,$key);
-
-    // set - POST DATA
-    }elseif(($method=='post') and (strtolower($ex[$paracount-6])=='v1.php')and (strtolower($ex[$paracount-4])=='setattribute')){
-      $format=OC_OCS::readdata('format','text');
-      $key=$ex[$paracount-2];
-      $app=$ex[$paracount-3];
-      $value=OC_OCS::readdata('value','text');
-      OC_OCS::privatedataset($format, $app, $key, $value);
-    // delete - POST DATA
-    }elseif(($method=='post') and (strtolower($ex[$paracount-6])=='v1.php')and (strtolower($ex[$paracount-4])=='deleteattribute')){
-      $format=OC_OCS::readdata('format','text');
-      $key=$ex[$paracount-2];
-      $app=$ex[$paracount-3];
-      OC_OCS::privatedatadelete($format, $app, $key);
-
-    }else{
-      $format=OC_OCS::readdata('format','text');
-      $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
-      $txt.=OC_OCS::getdebugoutput();
-      echo(OC_OCS::generatexml($format,'failed',999,$txt));
-    }
-    exit();
-  }
-
-  /**
-   * generated some debug information to make it easier to find faild API calls
-   * @return debug data string
-   */
-  private static function getDebugOutput() {
-    $txt='';
-    $txt.="debug output:\n";
-    if(isset($_SERVER['REQUEST_METHOD'])) $txt.='http request method: '.$_SERVER['REQUEST_METHOD']."\n";
-    if(isset($_SERVER['REQUEST_URI'])) $txt.='http request uri: '.$_SERVER['REQUEST_URI']."\n";
-    if(isset($_GET)) foreach($_GET as $key=>$value) $txt.='get parameter: '.$key.'->'.$value."\n";
-    if(isset($_POST)) foreach($_POST as $key=>$value) $txt.='post parameter: '.$key.'->'.$value."\n";
-    return($txt);
-  }
-
-  /**
-   * checks if the user is authenticated
-   * checks the IP whitlist, apikeys and login/password combination
-   * if $forceuser is true and the authentication failed it returns an 401 http response.
-   * if $forceuser is false and authentification fails it returns an empty username string
-   * @param bool $forceuser
-   * @return username string
-   */
-  private static function checkPassword($forceuser=true) {
-    //valid user account ?
-    if(isset($_SERVER['PHP_AUTH_USER'])) $authuser=$_SERVER['PHP_AUTH_USER']; else $authuser='';
-    if(isset($_SERVER['PHP_AUTH_PW']))   $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw='';
-
-    if(empty($authuser)) {
-      if($forceuser){
-        header('WWW-Authenticate: Basic realm="your valid user account or api key"');
-        header('HTTP/1.0 401 Unauthorized');
-        exit;
-      }else{
-        $identifieduser='';
-      }
-    }else{
-      if(!OC_User::login($authuser,$authpw)){
-        if($forceuser){
-          header('WWW-Authenticate: Basic realm="your valid user account or api key"');
-          header('HTTP/1.0 401 Unauthorized');
-          exit;
-        }else{
-          $identifieduser='';
-        }
-      }else{
-        $identifieduser=$authuser;
-      }
-    }
-
-    return($identifieduser);
-  }
+		// CLOUD
+		// quotaget - GET QUOTA   parameter
+		}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-4]=='cloud') and ($ex[$paracount-3] == 'files') and ($ex[$paracount-2] == 'quota')){
+			OC_OCS::quotaget($format);
 
 
-  /**
-   * generates the xml or json response for the API call from an multidimenional data array.
-   * @param string $format
-   * @param string $status
-   * @param string $statuscode
-   * @param string $message
-   * @param array $data
-   * @param string $tag
-   * @param string $tagattribute
-   * @param int $dimension
-   * @param int $itemscount
-   * @param int $itemsperpage
-   * @return string xml/json
-   */
-  private static function generateXml($format,$status,$statuscode,$message,$data=array(),$tag='',$tagattribute='',$dimension=-1,$itemscount='',$itemsperpage='') {
-    if($format=='json') {
-
-      $json=array();
-      $json['status']=$status;
-      $json['statuscode']=$statuscode;
-      $json['message']=$message;
-      $json['totalitems']=$itemscount;
-      $json['itemsperpage']=$itemsperpage;
-      $json['data']=$data;
-      return(json_encode($json));
+// add more calls here
+// please document all the call in the draft spec
+// http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
 
 
-    }else{
-      $txt='';
-      $writer = xmlwriter_open_memory();
-      xmlwriter_set_indent( $writer, 2 );
-      xmlwriter_start_document($writer );
-      xmlwriter_start_element($writer,'ocs');
-      xmlwriter_start_element($writer,'meta');
-      xmlwriter_write_element($writer,'status',$status);
-      xmlwriter_write_element($writer,'statuscode',$statuscode);
-      xmlwriter_write_element($writer,'message',$message);
-      if($itemscount<>'') xmlwriter_write_element($writer,'totalitems',$itemscount);
-      if(!empty($itemsperpage)) xmlwriter_write_element($writer,'itemsperpage',$itemsperpage);
-      xmlwriter_end_element($writer);
-      if($dimension=='0') {
-        // 0 dimensions
-        xmlwriter_write_element($writer,'data',$data);
+		}else{
+			$txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
+			$txt.=OC_OCS::getdebugoutput();
+			echo(OC_OCS::generatexml($format,'failed',999,$txt));
+		}
+		exit();
+	}
 
-      }elseif($dimension=='1') {
-        xmlwriter_start_element($writer,'data');
-        foreach($data as $key=>$entry) {
-          xmlwriter_write_element($writer,$key,$entry);
-        }
-        xmlwriter_end_element($writer);
+	/**
+	* generated some debug information to make it easier to find faild API calls
+	* @return debug data string
+	*/
+	private static function getDebugOutput() {
+		$txt='';
+		$txt.="debug output:\n";
+		if(isset($_SERVER['REQUEST_METHOD'])) $txt.='http request method: '.$_SERVER['REQUEST_METHOD']."\n";
+		if(isset($_SERVER['REQUEST_URI'])) $txt.='http request uri: '.$_SERVER['REQUEST_URI']."\n";
+		if(isset($_GET)) foreach($_GET as $key=>$value) $txt.='get parameter: '.$key.'->'.$value."\n";
+		if(isset($_POST)) foreach($_POST as $key=>$value) $txt.='post parameter: '.$key.'->'.$value."\n";
+		return($txt);
+	}
 
-      }elseif($dimension=='2') {
-        xmlwriter_start_element($writer,'data');
-        foreach($data as $entry) {
-          xmlwriter_start_element($writer,$tag);
-          if(!empty($tagattribute)) {
-            xmlwriter_write_attribute($writer,'details',$tagattribute);
-          }
-          foreach($entry as $key=>$value) {
-            if(is_array($value)){
-              foreach($value as $k=>$v) {
-                xmlwriter_write_element($writer,$k,$v);
-              }
-            } else {
-              xmlwriter_write_element($writer,$key,$value);
-            }
-          }
-          xmlwriter_end_element($writer);
-        }
-        xmlwriter_end_element($writer);
+	/**
+	* checks if the user is authenticated
+	* checks the IP whitlist, apikeys and login/password combination
+	* if $forceuser is true and the authentication failed it returns an 401 http response.
+	* if $forceuser is false and authentification fails it returns an empty username string
+	* @param bool $forceuser
+	* @return username string
+	*/
+	private static function checkPassword($forceuser=true) {
+		//valid user account ?
+		if(isset($_SERVER['PHP_AUTH_USER'])) $authuser=$_SERVER['PHP_AUTH_USER']; else $authuser='';
+		if(isset($_SERVER['PHP_AUTH_PW']))   $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw='';
 
-      }elseif($dimension=='3') {
-        xmlwriter_start_element($writer,'data');
-        foreach($data as $entrykey=>$entry) {
-          xmlwriter_start_element($writer,$tag);
-          if(!empty($tagattribute)) {
-            xmlwriter_write_attribute($writer,'details',$tagattribute);
-          }
-          foreach($entry as $key=>$value) {
-            if(is_array($value)){
-              xmlwriter_start_element($writer,$entrykey);
-              foreach($value as $k=>$v) {
-                xmlwriter_write_element($writer,$k,$v);
-              }
-              xmlwriter_end_element($writer);
-            } else {
-              xmlwriter_write_element($writer,$key,$value);
-            }
-          }
-          xmlwriter_end_element($writer);
-        }
-        xmlwriter_end_element($writer);
-      }elseif($dimension=='dynamic') {
-        xmlwriter_start_element($writer,'data');
-        OC_OCS::toxml($writer,$data,'comment');
-        xmlwriter_end_element($writer);
-      }
+		if(empty($authuser)) {
+			if($forceuser){
+				header('WWW-Authenticate: Basic realm="your valid user account or api key"');
+				header('HTTP/1.0 401 Unauthorized');
+				exit;
+			}else{
+				$identifieduser='';
+			}
+		}else{
+			if(!OC_User::login($authuser,$authpw)){
+				if($forceuser){
+					header('WWW-Authenticate: Basic realm="your valid user account or api key"');
+					header('HTTP/1.0 401 Unauthorized');
+					exit;
+				}else{
+					$identifieduser='';
+				}
+			}else{
+				$identifieduser=$authuser;
+			}
+		}
 
-      xmlwriter_end_element($writer);
+		return($identifieduser);
+	}
 
-      xmlwriter_end_document( $writer );
-      $txt.=xmlwriter_output_memory( $writer );
-      unset($writer);
-      return($txt);
-    }
-  }
 
-  public static function toXml($writer,$data,$node) {
-    foreach($data as $key => $value) {
-      if (is_numeric($key)) {
-        $key = $node;
-      }
-      if (is_array($value)){
-        xmlwriter_start_element($writer,$key);
-        OC_OCS::toxml($writer,$value,$node);
-        xmlwriter_end_element($writer);
-      }else{
-        xmlwriter_write_element($writer,$key,$value);
-      }
+	/**
+	* generates the xml or json response for the API call from an multidimenional data array.
+	* @param string $format
+	* @param string $status
+	* @param string $statuscode
+	* @param string $message
+	* @param array $data
+	* @param string $tag
+	* @param string $tagattribute
+	* @param int $dimension
+	* @param int $itemscount
+	* @param int $itemsperpage
+	* @return string xml/json
+	*/
+	private static function generateXml($format,$status,$statuscode,$message,$data=array(),$tag='',$tagattribute='',$dimension=-1,$itemscount='',$itemsperpage='') {
+		if($format=='json') {
+			$json=array();
+			$json['status']=$status;
+			$json['statuscode']=$statuscode;
+			$json['message']=$message;
+			$json['totalitems']=$itemscount;
+			$json['itemsperpage']=$itemsperpage;
+			$json['data']=$data;
+			return(json_encode($json));
+		}else{
+			$txt='';
+			$writer = xmlwriter_open_memory();
+			xmlwriter_set_indent( $writer, 2 );
+			xmlwriter_start_document($writer );
+			xmlwriter_start_element($writer,'ocs');
+			xmlwriter_start_element($writer,'meta');
+			xmlwriter_write_element($writer,'status',$status);
+			xmlwriter_write_element($writer,'statuscode',$statuscode);
+			xmlwriter_write_element($writer,'message',$message);
+			if($itemscount<>'') xmlwriter_write_element($writer,'totalitems',$itemscount);
+			if(!empty($itemsperpage)) xmlwriter_write_element($writer,'itemsperpage',$itemsperpage);
+			xmlwriter_end_element($writer);
+			if($dimension=='0') {
+				// 0 dimensions
+				xmlwriter_write_element($writer,'data',$data);
 
-    }
-  }
+			}elseif($dimension=='1') {
+				xmlwriter_start_element($writer,'data');
+				foreach($data as $key=>$entry) {
+				xmlwriter_write_element($writer,$key,$entry);
+				}
+				xmlwriter_end_element($writer);
+
+			}elseif($dimension=='2') {
+				xmlwriter_start_element($writer,'data');
+				foreach($data as $entry) {
+				xmlwriter_start_element($writer,$tag);
+				if(!empty($tagattribute)) {
+				xmlwriter_write_attribute($writer,'details',$tagattribute);
+				}
+				foreach($entry as $key=>$value) {
+				if(is_array($value)){
+				foreach($value as $k=>$v) {
+					xmlwriter_write_element($writer,$k,$v);
+				}
+				} else {
+				xmlwriter_write_element($writer,$key,$value);
+				}
+				}
+				xmlwriter_end_element($writer);
+				}
+				xmlwriter_end_element($writer);
+
+			}elseif($dimension=='3') {
+				xmlwriter_start_element($writer,'data');
+				foreach($data as $entrykey=>$entry) {
+				xmlwriter_start_element($writer,$tag);
+				if(!empty($tagattribute)) {
+				xmlwriter_write_attribute($writer,'details',$tagattribute);
+				}
+				foreach($entry as $key=>$value) {
+				if(is_array($value)){
+				xmlwriter_start_element($writer,$entrykey);
+				foreach($value as $k=>$v) {
+					xmlwriter_write_element($writer,$k,$v);
+				}
+				xmlwriter_end_element($writer);
+				} else {
+				xmlwriter_write_element($writer,$key,$value);
+				}
+				}
+				xmlwriter_end_element($writer);
+				}
+				xmlwriter_end_element($writer);
+			}elseif($dimension=='dynamic') {
+				xmlwriter_start_element($writer,'data');
+				OC_OCS::toxml($writer,$data,'comment');
+				xmlwriter_end_element($writer);
+			}
+
+			xmlwriter_end_element($writer);
+
+			xmlwriter_end_document( $writer );
+			$txt.=xmlwriter_output_memory( $writer );
+			unset($writer);
+			return($txt);
+		}
+	}
+
+	public static function toXml($writer,$data,$node) {
+		foreach($data as $key => $value) {
+			if (is_numeric($key)) {
+				$key = $node;
+			}
+			if (is_array($value)){
+				xmlwriter_start_element($writer,$key);
+				OC_OCS::toxml($writer,$value,$node);
+				xmlwriter_end_element($writer);
+			}else{
+				xmlwriter_write_element($writer,$key,$value);
+			}
+		}
+	}
 
 
 
 
-  /**
-   * return the config data of this server
-   * @param string $format
-   * @return string xml/json
-   */
-  private static function apiConfig($format) {
-    $xml['version']='1.5';
-    $xml['website']='ownCloud';
-    $xml['host']=OCP\Util::getServerHost();
-    $xml['contact']='';
-    $xml['ssl']='false';
-    echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1));
-  }
+	/**
+	* return the config data of this server
+	* @param string $format
+	* @return string xml/json
+	*/
+	private static function apiConfig($format) {
+		$user=OC_OCS::checkpassword(false);
+		$url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
+
+		$xml['version']='1.7';
+		$xml['website']='ownCloud';
+		$xml['host']=OCP\Util::getServerHost();
+		$xml['contact']='';
+		$xml['ssl']='false';
+		echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1));
+	}
 
 
-  /**
-   * check if the provided login/apikey/password is valid
-   * @param string $format
-   * @param string $login
-   * @param string $passwd
-   * @return string xml/json
-   */
-  private static function personCheck($format,$login,$passwd) {
-    if($login<>''){
-      if(OC_User::login($login,$passwd)){
-        $xml['person']['personid']=$login;
-        echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2));
-      }else{
-        echo(OC_OCS::generatexml($format,'failed',102,'login not valid'));
-      }
-    }else{
-      echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields'));
-    }
-  }
+	/**
+	* check if the provided login/apikey/password is valid
+	* @param string $format
+	* @param string $login
+	* @param string $passwd
+	* @return string xml/json
+	*/
+	private static function personCheck($format,$login,$passwd) {
+		if($login<>''){
+			if(OC_User::login($login,$passwd)){
+				$xml['person']['personid']=$login;
+				echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2));
+			}else{
+				echo(OC_OCS::generatexml($format,'failed',102,'login not valid'));
+			}
+		}else{
+			echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields'));
+		}
+	}
 
 
 
-  // ACTIVITY API #############################################
+	// ACTIVITY API #############################################
 
-  /**
-   * get my activities
-   * @param string $format
-   * @param string $page
-   * @param string $pagesize
-   * @return string xml/json
-   */
-  private static function activityGet($format,$page,$pagesize) {
-    $user=OC_OCS::checkpassword();
-    
-	//TODO
+	/**
+	* get my activities
+	* @param string $format
+	* @param string $page
+	* @param string $pagesize
+	* @return string xml/json
+	*/
+	private static function activityGet($format,$page,$pagesize) {
+		$user=OC_OCS::checkpassword();
 
-    $txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize);
-    echo($txt);
-  }
+			//TODO
 
-  /**
-   * submit a activity
-   * @param string $format
-   * @param string $message
-   * @return string xml/json
-   */
-  private static function activityPut($format,$message) {
-    // not implemented in ownCloud
-    OC_OCS::checkpassword();
-    echo(OC_OCS::generatexml($format,'ok',100,''));
-  }
+		$txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize);
+		echo($txt);
+	}
 
-  // PRIVATEDATA API #############################################
+	/**
+	* submit a activity
+	* @param string $format
+	* @param string $message
+	* @return string xml/json
+	*/
+	private static function activityPut($format,$message) {
+		// not implemented in ownCloud
+		$user=OC_OCS::checkpassword();
+		echo(OC_OCS::generatexml($format,'ok',100,''));
+	}
 
-  /**
-   * get private data and create the xml for ocs
-   * @param string $format
-   * @param string $app
-   * @param string $key
-   * @return string xml/json
-   */
-  private static function privateDataGet($format,$app="",$key="") {
-    $user=OC_OCS::checkpassword();
-	$result=OC_OCS::getData($user,$app,$key);
-    $xml=array();
-    foreach($result as $i=>$log) {
-      $xml[$i]['key']=$log['key'];
-      $xml[$i]['app']=$log['app'];
-      $xml[$i]['value']=$log['value'];
-    }
+	// PRIVATEDATA API #############################################
+
+	/**
+	* get private data and create the xml for ocs
+	* @param string $format
+	* @param string $app
+	* @param string $key
+	* @return string xml/json
+	*/
+	private static function privateDataGet($format,$app="",$key="") {
+		$user=OC_OCS::checkpassword();
+		$result=OC_OCS::getData($user,$app,$key);
+		$xml=array();
+		foreach($result as $i=>$log) {
+			$xml[$i]['key']=$log['key'];
+			$xml[$i]['app']=$log['app'];
+			$xml[$i]['value']=$log['value'];
+		}
 
 
-    $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'privatedata', 'full', 2, count($xml), 0);//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
-    echo($txt);
-  }
+		$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'privatedata', 'full', 2, count($xml), 0);//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
+		echo($txt);
+	}
 
-  /**
-   * set private data referenced by $key to $value and generate the xml for ocs
-   * @param string $format
-   * @param string $app
-   * @param string $key
-   * @param string $value
-   * @return string xml/json
-   */
+	/**
+	* set private data referenced by $key to $value and generate the xml for ocs
+	* @param string $format
+	* @param string $app
+	* @param string $key
+	* @param string $value
+	* @return string xml/json
+	*/
 	private static function privateDataSet($format, $app, $key, $value) {
 		$user=OC_OCS::checkpassword();
 		if(OC_OCS::setData($user,$app,$key,$value)){
@@ -525,4 +540,40 @@ class OC_OCS {
 	public static function deleteData($user, $app, $key) {
 		return OC_Preferences::deleteKey($user,$app,$key);
 	}
+
+
+        // CLOUD API #############################################
+
+        /**
+        * get the quota of the current user
+        * @param string $format
+        * @return string xml/json
+        */
+        private static function quotaGet($format) {
+                $user=OC_OCS::checkpassword();
+
+		// calculate the disc space
+		$user_dir = '/'.$user.'/files';
+		OC_Filesystem::init($user_dir);
+		$rootInfo=OC_FileCache::get('');
+		$sharedInfo=OC_FileCache::get('/Shared');
+		$used=$rootInfo['size']-$sharedInfo['size'];
+		$free=OC_Filesystem::free_space();
+		$total=$free+$used;
+		if($total==0) $total=1;  // prevent division by zero
+		$relative=round(($used/$total)*10000)/100;
+
+                $xml=array();
+                $xml['quota']=$total;
+                $xml['free']=$free;
+                $xml['used']=$used;
+                $xml['relative']=$relative;
+
+                $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
+                echo($txt);
+
+        }
+
+
+
 }
diff --git a/ocs/providers.php b/ocs/providers.php
index f9cafd20b0..cc6de32266 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -35,7 +35,9 @@ echo('
  <termsofuse></termsofuse>
  <register></register>
  <services>
-   <activity ocsversion="1.5" />
+   <config ocsversion="1.7" />
+   <activity ocsversion="1.7" />
+   <cloud ocsversion="1.7" />
  </services>
 </provider>
 </providers>

From 21631be2ff0fc1ce9181d619cfd793b5482d18b7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 23 Jul 2012 19:43:28 +0200
Subject: [PATCH 1092/1537] make it generic and implement a dummy call for
 quota set

---
 lib/ocs.php | 95 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 71 insertions(+), 24 deletions(-)

diff --git a/lib/ocs.php b/lib/ocs.php
index 48f34cc639..0cd7888fcf 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -168,15 +168,31 @@ class OC_OCS {
 			OC_OCS::privatedatadelete($format, $app, $key);
 
 		// CLOUD
-		// quotaget - GET QUOTA   parameter
-		}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-4]=='cloud') and ($ex[$paracount-3] == 'files') and ($ex[$paracount-2] == 'quota')){
-			OC_OCS::quotaget($format);
+		// quotaget 
+		}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')){
+			$user=$ex[$paracount-3];
+			OC_OCS::quotaget($format,$user);
+
+		// quotaset 
+		}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')){
+			$user=$ex[$paracount-3];
+			$quota = self::readData('post', 'quota', 'int');
+			OC_OCS::quotaset($format,$user,$quota);
 
 
 // add more calls here
 // please document all the call in the draft spec
 // http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
 
+// TODO:
+// users
+// groups
+// bookmarks
+// sharing
+// versioning
+// news (rss)
+
+
 
 		}else{
 			$txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
@@ -545,35 +561,66 @@ class OC_OCS {
         // CLOUD API #############################################
 
         /**
-        * get the quota of the current user
+        * get the quota of a user
         * @param string $format
+        * @param string $user
         * @return string xml/json
         */
-        private static function quotaGet($format) {
-                $user=OC_OCS::checkpassword();
+        private static function quotaGet($format,$user) {
+                $login=OC_OCS::checkpassword();
+		if(OC_Group::inGroup($login, 'admin') or ($login==$user)) {
 
-		// calculate the disc space
-		$user_dir = '/'.$user.'/files';
-		OC_Filesystem::init($user_dir);
-		$rootInfo=OC_FileCache::get('');
-		$sharedInfo=OC_FileCache::get('/Shared');
-		$used=$rootInfo['size']-$sharedInfo['size'];
-		$free=OC_Filesystem::free_space();
-		$total=$free+$used;
-		if($total==0) $total=1;  // prevent division by zero
-		$relative=round(($used/$total)*10000)/100;
+			if(OC_User::userExists($user)){
+				// calculate the disc space
+				$user_dir = '/'.$user.'/files';
+				OC_Filesystem::init($user_dir);
+				$rootInfo=OC_FileCache::get('');
+				$sharedInfo=OC_FileCache::get('/Shared');
+				$used=$rootInfo['size']-$sharedInfo['size'];
+				$free=OC_Filesystem::free_space();
+				$total=$free+$used;
+				if($total==0) $total=1;  // prevent division by zero
+				$relative=round(($used/$total)*10000)/100;
 
-                $xml=array();
-                $xml['quota']=$total;
-                $xml['free']=$free;
-                $xml['used']=$used;
-                $xml['relative']=$relative;
+				$xml=array();
+				$xml['quota']=$total;
+				$xml['free']=$free;
+				$xml['used']=$used;
+				$xml['relative']=$relative;
 
-                $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
-                echo($txt);
+				$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
+				echo($txt);
+			}else{
+			echo self::generateXml('', 'fail', 300, 'User does not exist');
+			}
+		}else{
+			echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
+		}
+        }
 
+        /**
+        * set the quota of a user
+        * @param string $format
+        * @param string $user
+        * @param string $quota
+        * @return string xml/json
+        */
+        private static function quotaSet($format,$user,$quota) {
+                $login=OC_OCS::checkpassword();
+                if(OC_Group::inGroup($login, 'admin')) {
+
+			// todo
+			// not yet implemented
+			// edit logic here
+			error_log('OCS call: user:'.$user.' quota:'.$quota);
+
+                        $xml=array();
+                        $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
+                        echo($txt);
+                }else{
+                        echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
+                }
         }
 
 
-
 }

From ab7a2d43e810da66087f3abf4a87afff219a33c0 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 23 Jul 2012 22:07:42 +0200
Subject: [PATCH 1093/1537] create a user for Test_Cache_File to allow unit
 tesing within ci

---
 tests/lib/cache/file.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index c33c513fcf..be2a2a7277 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -22,7 +22,7 @@
 
 class Test_Cache_File extends Test_Cache {
 	function skip() {
-		$this->skipUnless(OC_User::isLoggedIn());
+		//$this->skipUnless(OC_User::isLoggedIn());
 	}
 	
 	public function setUp(){
@@ -39,6 +39,13 @@ class Test_Cache_File extends Test_Cache {
 		OC_Filesystem::clearMounts();
 		OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
 
+		//login
+		if (OC_User::userExists('test'))
+			OC_User::deleteUser('test');
+		OC_User::createUser('test', 'testtesttest');
+
+		OC_User::login('test', 'testtesttest');
+
 		//set up the users dir
 		$rootView=new OC_FilesystemView('');
 		$rootView->mkdir('/'.OC_User::getUser());

From e49666d36bdd10c02144878e83a6cdefd4342256 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 23 Jul 2012 22:31:48 +0200
Subject: [PATCH 1094/1537] add option to clear user backends

---
 lib/user.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index 356be4decf..549319b3a7 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -104,10 +104,16 @@ class OC_User {
 					break;
 			}
 		}
-
 		true;
 	}
 
+	/**
+	 * remove all used backends
+	 */
+	public static function clearBackends(){
+		self::$_usedBackends=array();
+	}
+
 	/**
 	 * @brief Create a new user
 	 * @param $uid The username of the user to create

From 59364366d8c69ca217fb817535d1b5d1df316841 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 23 Jul 2012 22:32:07 +0200
Subject: [PATCH 1095/1537] use dummy user backend for oc_cache_file tests

---
 tests/lib/cache/file.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index be2a2a7277..28778efb68 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -21,6 +21,8 @@
 */
 
 class Test_Cache_File extends Test_Cache {
+	private $user;
+	
 	function skip() {
 		//$this->skipUnless(OC_User::isLoggedIn());
 	}
@@ -39,17 +41,23 @@ class Test_Cache_File extends Test_Cache {
 		OC_Filesystem::clearMounts();
 		OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
 
+		OC_User::clearBackends();
+		OC_User::useBackend(new OC_User_Dummy());
+		
 		//login
-		if (OC_User::userExists('test'))
-			OC_User::deleteUser('test');
-		OC_User::createUser('test', 'testtesttest');
-
-		OC_User::login('test', 'testtesttest');
+		OC_User::createUser('test', 'test');
+		
+		$this->user=OC_User::getUser();
+		OC_User::setUserId('test');
 
 		//set up the users dir
 		$rootView=new OC_FilesystemView('');
-		$rootView->mkdir('/'.OC_User::getUser());
+		$rootView->mkdir('/test');
 		
 		$this->instance=new OC_Cache_File();
 	}
+
+	public function tearDown(){
+		OC_User::setUserId($this->user);
+	}
 }

From 796768577154dc9cc2542e33d8d81c6a5fa77dea Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 24 Jul 2012 00:02:01 +0200
Subject: [PATCH 1096/1537] move some openid files to 3rdparty

---
 {apps/user_openid => 3rdparty/openid}/class.openid.v3.php | 0
 {apps/user_openid => 3rdparty/openid}/phpmyid.php         | 0
 apps/user_openid/appinfo/app.php                          | 2 +-
 apps/user_openid/user.php                                 | 2 +-
 apps/user_openid/user_openid.php                          | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {apps/user_openid => 3rdparty/openid}/class.openid.v3.php (100%)
 rename {apps/user_openid => 3rdparty/openid}/phpmyid.php (100%)

diff --git a/apps/user_openid/class.openid.v3.php b/3rdparty/openid/class.openid.v3.php
similarity index 100%
rename from apps/user_openid/class.openid.v3.php
rename to 3rdparty/openid/class.openid.v3.php
diff --git a/apps/user_openid/phpmyid.php b/3rdparty/openid/phpmyid.php
similarity index 100%
rename from apps/user_openid/phpmyid.php
rename to 3rdparty/openid/phpmyid.php
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index fe57b189fa..a5fb6a0f45 100644
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -19,7 +19,7 @@ OCP\Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OCP\Util::lin
 
 OCP\App::registerPersonal('user_openid','settings');
 
-require_once 'apps/user_openid/user_openid.php';
+require_once 'openid/user_openid.php';
 
 //active the openid backend
 OC_User::useBackend('openid');
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index d25b95259e..88571ba618 100644
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -44,4 +44,4 @@ if(!OCP\User::userExists($USERNAME)){
 }
 $IDENTITY=OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME;
 
-require_once 'phpmyid.php';
+require_once 'openid/phpmyid.php';
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index 70b193a30b..19f2f719b0 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -21,7 +21,7 @@
  *
  */
 
-require_once('class.openid.v3.php');
+require_once('openid/class.openid.v3.php');
 
 /**
  * Class for user OpenId backend

From 856d9c0b54cc971940df4ed64429d994faf770f9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 24 Jul 2012 00:39:59 +0200
Subject: [PATCH 1097/1537] some indention fixes

---
 lib/app.php        |   6 +-
 lib/db.php         |   6 +-
 lib/filesystem.php | 164 ++++++++++++++++++++++-----------------------
 lib/helper.php     |   2 -
 lib/image.php      |  13 ++--
 lib/installer.php  |  30 ++++-----
 lib/json.php       |  14 ++--
 lib/ocs.php        |  19 +-----
 lib/util.php       |  59 +++++++---------
 9 files changed, 141 insertions(+), 172 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 2b975de9ef..56132c0867 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -195,7 +195,7 @@ class OC_App{
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			$version=OC_Util::getVersion();
-	                if(!isset($info['require']) or ($version[0]>$info['require'])){
+			if(!isset($info['require']) or ($version[0]>$info['require'])){
 				OC_Log::write('core','App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				return false;
 			}else{
@@ -331,8 +331,8 @@ class OC_App{
 	}
 
 	/**
-	* Get the path where to install apps
-  */
+	 * Get the path where to install apps
+	 */
 	public static function getInstallPath() {
 		if(OC_Config::getValue('appstoreenabled', true)==false) {
 			return false;
diff --git a/lib/db.php b/lib/db.php
index 6f083d17cf..6971fe4a58 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -368,9 +368,6 @@ class OC_DB {
 		if( $definition instanceof MDB2_Schema_Error ){
 			die( $definition->getMessage().': '.$definition->getUserInfo());
 		}
-// 		if(OC_Config::getValue('dbtype','sqlite')=='sqlite'){
-// 			$definition['overwrite']=true;//always overwrite for sqlite
-// 		}
 		$ret=self::$schema->createDatabase( $definition );
 
 		// Die in case something went wrong
@@ -527,8 +524,7 @@ class OC_DB {
 	 * @brief replaces the owncloud tables with a new set
 	 * @param $file string path to the MDB2 xml db export file
 	 */
-	 public static function replaceDB( $file ){
-	 	
+	public static function replaceDB( $file ){
 	 	$apps = OC_App::getAllApps();
 	 	self::beginTransaction();
 	 	// Delete the old tables
diff --git a/lib/filesystem.php b/lib/filesystem.php
index ec30ffb8f4..a5edcf5bab 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -53,99 +53,99 @@ class OC_Filesystem{
 	static private $defaultInstance;
 
 
-  /**
-   * classname which used for hooks handling
-   * used as signalclass in OC_Hooks::emit()
-   */
-  const CLASSNAME = 'OC_Filesystem';
+	/**
+	 * classname which used for hooks handling
+	 * used as signalclass in OC_Hooks::emit()
+	 */
+	const CLASSNAME = 'OC_Filesystem';
 
-  /**
-   * signalname emited before file renaming
-   * @param oldpath
-   * @param newpath
-   */
-  const signal_rename = 'rename';
+	/**
+	 * signalname emited before file renaming
+	 * @param oldpath
+	 * @param newpath
+	 */
+	const signal_rename = 'rename';
 
-  /**
-   * signal emited after file renaming
-   * @param oldpath
-   * @param newpath
-   */
-  const signal_post_rename = 'post_rename';
-	
-  /**
-   * signal emited before file/dir creation
-   * @param path
-   * @param run changing this flag to false in hook handler will cancel event
-   */
-  const signal_create = 'create';
+	/**
+	 * signal emited after file renaming
+	 * @param oldpath
+	 * @param newpath
+	 */
+	const signal_post_rename = 'post_rename';
 
-  /**
-   * signal emited after file/dir creation
-   * @param path
-   * @param run changing this flag to false in hook handler will cancel event
-   */
-  const signal_post_create = 'post_create';
+	/**
+	 * signal emited before file/dir creation
+	 * @param path
+	 * @param run changing this flag to false in hook handler will cancel event
+	 */
+	const signal_create = 'create';
 
-  /**
-   * signal emits before file/dir copy
-   * @param oldpath
-   * @param newpath
-   * @param run changing this flag to false in hook handler will cancel event
-   */
-  const signal_copy = 'copy';
+	/**
+	 * signal emited after file/dir creation
+	 * @param path
+	 * @param run changing this flag to false in hook handler will cancel event
+	 */
+	const signal_post_create = 'post_create';
 
-  /**
-   * signal emits after file/dir copy
-   * @param oldpath
-   * @param newpath
-   */
-  const signal_post_copy = 'post_copy';
+	/**
+	 * signal emits before file/dir copy
+	* @param oldpath
+	 * @param newpath
+	  * @param run changing this flag to false in hook handler will cancel event
+	 */
+	const signal_copy = 'copy';
 
-  /**
-   * signal emits before file/dir save
-   * @param path
-   * @param run changing this flag to false in hook handler will cancel event
-   */
-  const signal_write = 'write';
+	/**
+	 * signal emits after file/dir copy
+	 * @param oldpath
+	 * @param newpath
+	 */
+	const signal_post_copy = 'post_copy';
 
-  /**
-   * signal emits after file/dir save
-   * @param path
-   */
-  const signal_post_write = 'post_write';
-	
-  /**
-   * signal emits when reading file/dir
-   * @param path
-   */
-  const signal_read = 'read';
+	/**
+	 * signal emits before file/dir save
+	 * @param path
+	 * @param run changing this flag to false in hook handler will cancel event
+	 */
+	const signal_write = 'write';
 
-  /**
-   * signal emits when removing file/dir
-   * @param path
-   */
-  const signal_delete = 'delete';
+	/**
+	 * signal emits after file/dir save
+	 * @param path
+	 */
+	const signal_post_write = 'post_write';
 
-  /**
-   * parameters definitions for signals
-   */
-  const signal_param_path = 'path';
-  const signal_param_oldpath = 'oldpath';
-  const signal_param_newpath = 'newpath';
+	/**
+	 * signal emits when reading file/dir
+	 * @param path
+	 */
+	const signal_read = 'read';
 
-  /**
-   * run - changing this flag to false in hook handler will cancel event
-   */
-  const signal_param_run = 'run';
+	/**
+	 * signal emits when removing file/dir
+	 * @param path
+	 */
+	const signal_delete = 'delete';
 
-  /**
-	* get the mountpoint of the storage object for a path
-	( note: because a storage is not always mounted inside the fakeroot, the returned mountpoint is relative to the absolute root of the filesystem and doesn't take the chroot into account
-	*
-	* @param string path
-	* @return string
-	*/
+	/**
+	 * parameters definitions for signals
+	 */
+	const signal_param_path = 'path';
+	const signal_param_oldpath = 'oldpath';
+	const signal_param_newpath = 'newpath';
+
+	/**
+	 * run - changing this flag to false in hook handler will cancel event
+	 */
+	const signal_param_run = 'run';
+
+	/**
+	 * get the mountpoint of the storage object for a path
+	 ( note: because a storage is not always mounted inside the fakeroot, the returned mountpoint is relative to the absolute root of the filesystem and doesn't take the chroot into account
+	 *
+	 * @param string path
+	  * @return string
+	 */
 	static public function getMountPoint($path){
 		OC_Hook::emit(self::CLASSNAME,'get_mountpoint',array('path'=>$path));
 		if(!$path){
diff --git a/lib/helper.php b/lib/helper.php
index 59d88f46da..f328c14ac7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -175,10 +175,8 @@ class OC_Helper {
 	 */
 	public static function mimetypeIcon( $mimetype ){
 		$alias=array('application/xml'=>'code/xml');
-// 		echo $mimetype;
 		if(isset($alias[$mimetype])){
 			$mimetype=$alias[$mimetype];
-// 			echo $mimetype;
 		}
 		// Replace slash with a minus
 		$mimetype = str_replace( "/", "-", $mimetype );
diff --git a/lib/image.php b/lib/image.php
index c438b3d67f..90c64320a7 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -23,12 +23,12 @@
 
 //From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
 if ( ! function_exists( 'exif_imagetype' ) ) {
-    function exif_imagetype ( $filename ) {
-        if ( ( $info = getimagesize( $filename ) ) !== false ) {
-            return $info[2];
-        }
-    return false;
-    }
+	function exif_imagetype ( $filename ) {
+		if ( ( $info = getimagesize( $filename ) ) !== false ) {
+			return $info[2];
+		}
+		return false;
+	}
 }
 
 function ellipsis($str, $maxlen) {
@@ -66,7 +66,6 @@ class OC_Image {
 	public function __construct($imageref = null) {
 		//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
 		if(!extension_loaded('gd') || !function_exists('gd_info')) {
-		//if(!function_exists('imagecreatefromjpeg')) {
 			OC_Log::write('core',__METHOD__.'(): GD module not installed', OC_Log::ERROR);
 			return false;
 		}
diff --git a/lib/installer.php b/lib/installer.php
index 00feb6d470..a8b56cb34f 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -126,19 +126,19 @@ class OC_Installer{
 			return false;
 		}
 		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true);
-                // check the code for not allowed calls
-                if(!OC_Installer::checkCode($info['id'],$extractDir)){
+		// check the code for not allowed calls
+		if(!OC_Installer::checkCode($info['id'],$extractDir)){
 			OC_Log::write('core','App can\'t be installed because of not allowed code in the App',OC_Log::ERROR);
 			OC_Helper::rmdirr($extractDir);
-                        return false;
+			return false;
 		}
 
-                // check if the app is compatible with this version of ownCloud
+		// check if the app is compatible with this version of ownCloud
 		$version=OC_Util::getVersion();	
-                if(!isset($info['require']) or ($version[0]>$info['require'])){
+		if(!isset($info['require']) or ($version[0]>$info['require'])){
 			OC_Log::write('core','App can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 			OC_Helper::rmdirr($extractDir);
-                        return false;
+			return false;
 		}
 
 		//check if an app with the same id is already installed
@@ -339,12 +339,12 @@ class OC_Installer{
 	}
 
 
-        /**
-         * check the code of an app with some static code checks
-         * @param string $folder the folder of the app to check
-         * @returns true for app is o.k. and false for app is not o.k.
-         */
-        public static function checkCode($appname,$folder){
+	/**
+	 * check the code of an app with some static code checks
+	 * @param string $folder the folder of the app to check
+	 * @returns true for app is o.k. and false for app is not o.k.
+	 */
+	public static function checkCode($appname,$folder){
 
 		$blacklist=array(
 			'exec(',
@@ -377,9 +377,7 @@ class OC_Installer{
 			return true;
 			
 		}else{
-          		return true;
+			return true;
 		}
-        }
-
-
+	}
 }
diff --git a/lib/json.php b/lib/json.php
index c49b831c12..b46878375d 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -94,12 +94,12 @@ class OC_JSON{
 	* Encode and print $data in json format
 	*/
 	public static function encodedPrint($data,$setContentType=true){
-			// Disable mimesniffing, don't move this to setContentTypeHeader!
-			header( 'X-Content-Type-Options: nosniff' );
-			if($setContentType){
-				self::setContentTypeHeader();
-			}
-			array_walk_recursive($data, array('OC_JSON', 'to_string'));
-			echo json_encode($data);
+		// Disable mimesniffing, don't move this to setContentTypeHeader!
+		header( 'X-Content-Type-Options: nosniff' );
+		if($setContentType){
+			self::setContentTypeHeader();
+		}
+		array_walk_recursive($data, array('OC_JSON', 'to_string'));
+		echo json_encode($data);
 	}
 }
diff --git a/lib/ocs.php b/lib/ocs.php
index 0cd7888fcf..9d30e172f5 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -111,21 +111,6 @@ class OC_OCS {
 			$login = self::readData($method, 'login', 'text');
 			$passwd = self::readData($method, 'password', 'text');
 			OC_OCS::personcheck($format,$login,$passwd);
-/*
-		} else if ($method == 'post' && $ex[$paracount - 4] == 'v1.php' && $ex[$paracount - 3] == 'person' && $ex[$paracount - 2] == 'add') {
-			if (OC_Group::inGroup(self::checkPassword(), 'admin')) {
-				$login = self::readData($method, 'login', 'text');
-				$password = self::readData($method, 'password', 'text');
-				try {
-					OC_User::createUser($login, $password);
-					echo self::generateXml($format, 'ok', 201, '');
-				} catch (Exception $exception) {
-					echo self::generateXml($format, 'fail', 400, $exception->getMessage());
-				}
-			} else {
-				echo self::generateXml($format, 'fail', 403, 'Permission denied');
-			}
-*/
 
 		// ACTIVITY
 		// activityget - GET ACTIVITY   page,pagesize als urlparameter
@@ -149,8 +134,8 @@ class OC_OCS {
 		}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-3] == 'getattribute')){
 			$app=$ex[$paracount-2];
 			OC_OCS::privateDataGet($format, $app);
-				}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'getattribute')){
-			
+		}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'getattribute')){
+
 			$key=$ex[$paracount-2];
 			$app=$ex[$paracount-3];
 			OC_OCS::privateDataGet($format, $app,$key);
diff --git a/lib/util.php b/lib/util.php
index f35e5a18e4..0c563278cc 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -77,13 +77,13 @@ class OC_Util {
 		return '5 pre alpha';
 	}
 
-        /**
-         * get the current installed edition of ownCloud. There is the community edition that just returns an empty string and the enterprise edition that returns "Enterprise".
-         * @return string
-         */
-        public static function getEditionString(){
-                return '';
-        }
+	/**
+	 * get the current installed edition of ownCloud. There is the community edition that just returns an empty string and the enterprise edition that returns "Enterprise".
+	 * @return string
+	 */
+	public static function getEditionString(){
+			return '';
+	}
 
 	/**
 	 * add a javascript file
@@ -131,12 +131,12 @@ class OC_Util {
 		self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
 	}
 
-   /**
-     * formats a timestamp in the "right" way
-     *
-     * @param int timestamp $timestamp
-     * @param bool dateOnly option to ommit time from the result
-     */
+	/**
+	 * formats a timestamp in the "right" way
+	 *
+	 * @param int timestamp $timestamp
+	 * @param bool dateOnly option to ommit time from the result
+	 */
     public static function formatDate( $timestamp,$dateOnly=false){
 		if(isset($_SESSION['timezone'])){//adjust to clients timezone if we know it
 			$systemTimeZone = intval(date('O'));
@@ -438,26 +438,25 @@ class OC_Util {
 	}
 
 
-        /**
-         * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
-         */
-        public static function ishtaccessworking() {
-
+	/**
+	 * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
+	 */
+	public static function ishtaccessworking() {
 		// testdata
 		$filename='/htaccesstest.txt';
 		$testcontent='testcontent';
 
 		// creating a test file
-                $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
-                $fp = @fopen($testfile, 'w');
-                @fwrite($fp, $testcontent);
-                @fclose($fp);
+		$testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
+		$fp = @fopen($testfile, 'w');
+		@fwrite($fp, $testcontent);
+		@fclose($fp);
 
 		// accessing the file via http
-                $url = OC_Helper::serverProtocol(). '://'  . OC_Helper::serverHost() . OC::$WEBROOT.'/data'.$filename;
-                $fp = @fopen($url, 'r');
-                $content=@fread($fp, 2048);
-                @fclose($fp);
+		$url = OC_Helper::serverProtocol(). '://'  . OC_Helper::serverHost() . OC::$WEBROOT.'/data'.$filename;
+		$fp = @fopen($url, 'r');
+		$content=@fread($fp, 2048);
+		@fclose($fp);
 
 		// cleanup
 		@unlink($testfile);
@@ -467,13 +466,7 @@ class OC_Util {
 			return(false);
 		}else{
 			return(true);
-
 		}
-
-        }
-
-
-
-
+	}
 
 }

From 7b01e3285e59d8184aae6c1a8de54c742b35fc54 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 23 Jul 2012 20:08:05 -0400
Subject: [PATCH 1098/1537] Include a few CRUDS permissions checks in shared
 storage, plus a little clean-up in shared storage

---
 apps/files_sharing/lib/share/file.php |  24 +--
 apps/files_sharing/sharedstorage.php  | 297 ++++++++++----------------
 2 files changed, 128 insertions(+), 193 deletions(-)

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 86b82b19ac..658c42ee32 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
 * ownCloud
@@ -21,7 +22,7 @@
 
 class OC_Share_Backend_File extends OCP\Share_Backend {
 
-	const FORMAT_SOURCE_PATH = 0;
+	const FORMAT_SHARED_STORAGE = 0;
 	const FORMAT_FILE_APP = 1;
 	const FORMAT_FILE_APP_ROOT = 2;
 	const FORMAT_OPENDIR = 3;
@@ -45,6 +46,14 @@ class OC_Share_Backend_File extends OCP\Share_Backend {
 				$files[] = basename($file['file_target']);
 			}
 			return $files;
+		} else if ($format == self::FORMAT_SHARED_STORAGE) {
+			$id = $items[key($items)]['file_source'];
+			$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id = ?');
+			$result = $query->execute(array($id))->fetchAll();
+			if (isset($result[0]['path'])) {
+				return array('path' => $result[0]['path'], 'permissions' => $items[key($items)]['permissions']);
+			}
+			return false;
 		} else {
 			$shares = array();
 			$ids = array();
@@ -53,14 +62,7 @@ class OC_Share_Backend_File extends OCP\Share_Backend {
 				$ids[] = $item['file_source'];
 			}
 			$ids = "'".implode("','", $ids)."'";
-			if ($format == self::FORMAT_SOURCE_PATH) {
-				$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
-				$result = $query->execute()->fetchAll();
-				if (isset($result[0]['path'])) {
-					return $result[0]['path'];
-				}
-				return false;
-			} else if ($format == self::FORMAT_FILE_APP) {
+			if ($format == self::FORMAT_FILE_APP) {
 				$query = OCP\DB::prepare('SELECT id, path, name, ctime, mtime, mimetype, size, encrypted, versioned, writable FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
 				$result = $query->execute();
 				$files = array();
@@ -89,6 +91,4 @@ class OC_Share_Backend_File extends OCP\Share_Backend {
 		return array();
 	}
 
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 1dfdf13379..f2379b7be2 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -26,17 +26,22 @@
 class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	private $sharedFolder;
-	private $sourcePaths = array();
+	private $files = array();
 	
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
 	}
 
-	private function getSourcePath($target) {
+	/**
+	* @brief Get the source file path and the permissions granted for a shared file
+	* @param string Shared target file path
+	* @return Returns array with the keys path and permissions or false if not found
+	*/
+	private function getFile($target) {
 		$target = $this->sharedFolder.'/'.$target;
 		$target = rtrim($target, '/');
-		if (isset($this->sourcePaths[$target])) {
-			return $this->sourcePaths[$target];
+		if (isset($this->files[$target])) {
+			return $this->files[$target];
 		} else {
 			$pos = strpos($target, '/', 8);
 			// Get shared folder name
@@ -45,16 +50,48 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			} else {
 				$itemTarget = $target;
 			}
-			$sourcePath = OCP\Share::getItemSharedWith('file', $itemTarget, OC_Share_Backend_File::FORMAT_SOURCE_PATH);
-			if ($sourcePath) {
-				$this->sourcePaths[$target] = $sourcePath.substr($target, strlen($itemTarget));
-				return $this->sourcePaths[$target];
+			$file = OCP\Share::getItemSharedWith('file', $itemTarget, OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+			if ($file) {
+				$this->files[$target]['path'] = $file['path'].substr($target, strlen($itemTarget));
+				$this->files[$target]['permissions'] = $file['permissions'];
+				return $this->files[$target];
 			}
-			OCP\Util::writeLog('files_sharing', 'File source path not found for: '.$target, OCP\Util::ERROR);
+			OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, OCP\Util::ERROR);
 			return false;
 		}
 	}
 
+	/**
+	* @brief Get the source file path for a shared file
+	* @param string Shared target file path
+	* @return Returns source file path or false if not found
+	*/
+	private function getSourcePath($target) {
+		$file = $this->getFile($target);
+		if (isset($file['path'])) {
+			return $file['path'];
+		}
+		return false;
+	}
+
+	/**
+	* @brief Get the permissions granted for a shared file
+	* @param string Shared target file path
+	* @return Returns CRUDS permissions granted or false if not found
+	*/
+	private function getPermissions($target) {
+		$file = $this->getFile($target);
+		if (isset($file['permissions'])) {
+			return $file['permissions'];
+		}
+		return false;
+	}
+
+	/**
+	* @brief Get the internal path to pass to the storage filesystem call
+	* @param string Source file path
+	* @return Source file path with mount point stripped out
+	*/
 	private function getInternalPath($path) {
 		$mountPoint = OC_Filesystem::getMountPoint($path);
 		$internalPath = substr($path, strlen($mountPoint));
@@ -62,19 +99,21 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function mkdir($path) {
-		if ($path == "" || $path == "/" || !$this->is_writable($path)) {
+		if ($path == '' || $path == '/' || !$this->is_writable($path)) {
 			return false; 
-		} else {
-			if ($source = $this->getSourcePath($path)) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->mkdir($this->getInternalPath($source));
-			}
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->mkdir($this->getInternalPath($source));
 		}
+		return false;
 	}
 	
 	public function rmdir($path) {
-		// The folder will be removed from the database, but won't be deleted from the owner's filesystem
-		// TODO
+		if ($source = $this->getSourcePath($path) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->rmdir($this->getInternalPath($source));
+		}
+		return false;
 	}
 	
 	public function opendir($path) {
@@ -82,23 +121,21 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_Folder::FORMAT_OPENDIR);
 			OC_FakeDirStream::$dirs['shared'] = $files;
 			return opendir('fakedir://shared');
-		} else {
-			if ($source = $this->getSourcePath($path)) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->opendir($this->getInternalPath($source));
-			}
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->opendir($this->getInternalPath($source));
 		}
+		return false;
 	}
 
 	public function is_dir($path) {
 		if ($path == '' || $path == '/') {
 			return true;
-		} else {
-			if ($source = $this->getSourcePath($path)) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->is_dir($this->getInternalPath($source));
-			}
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->is_dir($this->getInternalPath($source));
 		}
+		return false;
 	}
 
 	public function is_file($path) {
@@ -106,6 +143,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->is_file($this->getInternalPath($source));
 		}
+		return false;
 	}
 
 	public function stat($path) {
@@ -114,67 +152,64 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$stat['mtime'] = $this->filemtime($path);
 			$stat['ctime'] = $this->filectime($path);
 			return $stat;
-		} else {
-			if ($source = $this->getSourcePath($path)) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->stat($this->getInternalPath($source));
-			}
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->stat($this->getInternalPath($source));
 		}
+		return false;
 	}
 
 	public function filetype($path) {
-		if ($path == "" || $path == "/") {
-			return "dir";
-		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->filetype($this->getInternalPath($source));
-			}
+		if ($path == '' || $path == '/') {
+			return 'dir';
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->filetype($this->getInternalPath($source));
 		}
-
+		return false;
 	}
 
 	public function filesize($path) {
-		if ($path == "" || $path == "/" || $this->is_dir($path)) {
-			return $this->getFolderSize($path);
-		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->filesize($this->getInternalPath($source));
-			}
+		if ($path == '' || $path == '/' || $this->is_dir($path)) {
+			return 0;
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->filesize($this->getInternalPath($source));
 		}
+		return false;
 	}
 
 	public function is_readable($path) {
-		return true;
+		return $this->file_exists($path);
 	}
 	
 	public function is_writable($path) {
-		if($path == "" || $path == "/"){
+		if ($path == '' || $path == '/') {
 			return false;
-		}elseif (OC_Share::getPermissions($this->sharedFolder.$path) & OC_Share::WRITE) {
+		// Folders need CREATE permission to be writable
+		} else if ($this->is_dir($path)) {
+			if ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE) {
+				return true;
+			}
+		// Files need UPDATE permission to be writable
+		} else if ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE) {
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 	
 	public function file_exists($path) {
-		if ($path == "" || $path == "/") {
+		if ($path == '' || $path == '/') {
 			return true;
-		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->file_exists($this->getInternalPath($source));
-			}
+		} else if ($source = $this->getSourcePath($path)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->file_exists($this->getInternalPath($source));
 		}
+		return false;
 	}
 	
 	public function filectime($path) {
-		if ($path == "" || $path == "/") {
+		if ($path == '' || $path == '/') {
 			$ctime = 0; 
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
@@ -195,7 +230,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function filemtime($path) {
-		if ($path == "" || $path == "/") {
+		if ($path == '' || $path == '/') {
 			$mtime = 0; 
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
@@ -248,82 +283,19 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function unlink($path) {
-		// The item will be removed from the database, but won't be touched on the owner's filesystem
-		$target = $this->sharedFolder.$path;
-		// Check if the item is inside a shared folder
-		if (OC_Share::getParentFolders($target)) {
-			// If entry for item already exists
-			if (OC_Share::getItem($target)) {
-				OC_Share::unshareFromMySelf($target, false);
-			} else {
-				OC_Share::pullOutOfFolder($target, $target);
-				OC_Share::unshareFromMySelf($target, false);
-			}
-		// Delete the database entry
-		} else {
-			OC_Share::unshareFromMySelf($target);
-		}
-		$this->clearFolderSizeCache($this->getInternalPath($target));
-		return true;
+		// TODO
 	}
 	
 	public function rename($path1, $path2) {
-		$oldTarget = $this->sharedFolder.$path1;
-		$newTarget = $this->sharedFolder.$path2;
-		// Check if the item is inside a shared folder
-		if ($folders = OC_Share::getParentFolders($oldTarget)) {
-			$root1 = substr($path1, 0, strpos($path1, "/"));
-			$root2 = substr($path1, 0, strpos($path2, "/"));
-			// Prevent items from being moved into different shared folders until versioning (cut and paste) and prevent items going into 'Shared'
-			if ($root1 !== $root2) {
-				return false;
-			// Check if both paths have write permission
-			} else if ($this->is_writable($path1) && $this->is_writable($path2)) {
-				$oldSource = $this->getSourcePath($path1);
-				$newSource = $folders['source'].substr($newTarget, strlen($folders['target']));
-				if ($oldSource) {
-					$storage = OC_Filesystem::getStorage($oldSource);
-					return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
-				}
-			// If the user doesn't have write permission, items can only be renamed and not moved
-			} else if (dirname($path1) !== dirname($path2)) {
-				return false;
-			// The item will be renamed in the database, but won't be touched on the owner's filesystem
-			} else {
-				OC_Share::pullOutOfFolder($oldTarget, $newTarget);
-				// If this is a folder being renamed, call setTarget in case there are any database entries inside the folder
-				if (self::is_dir($path1)) {
-					OC_Share::setTarget($oldTarget, $newTarget);
-				}
-			}
-		} else {
-			OC_Share::setTarget($oldTarget, $newTarget);
-		}
-		$this->clearFolderSizeCache($this->getInternalPath($oldTarget));
-		$this->clearFolderSizeCache($this->getInternalPath($newTarget));
-		return true;
+		// TODO
 	}
 	
 	public function copy($path1, $path2) {
-		if ($path2 == "" || $path2 == "/") {
-			// TODO Construct new shared item or should this not be allowed?
-		} else {
-			if ($this->is_writable($path2)) {
-				$tmpFile = $this->toTmpFile($path1);
-				$result = $this->fromTmpFile($tmpFile, $path2);
-				if ($result) {
-					$this->clearFolderSizeCache($path2);
-				}
-				return $result;
-			} else {
-				return false;
-			}
-		}
+		// TODO
 	}
 	
 	public function fopen($path, $mode) {
-		$source = $this->getSourcePath($path);
-		if ($source) {
+		if ($source = $this->getSourcePath($path)) {
 			$info = array(
 				'target' => $this->sharedFolder.$path,
 				'source' => $source,
@@ -333,46 +305,30 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->fopen($this->getInternalPath($source), $mode);
 		}
+		return false;
 	}
 	
 	public function toTmpFile($path) {
-		$source = $this->getSourcePath($path);
-		if ($source) {
+		if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->toTmpFile($this->getInternalPath($source));
 		}
-	}
-	
-	public function fromTmpFile($tmpFile, $path) {
-		if ($this->is_writable($path)) {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				$result = $storage->fromTmpFile($tmpFile, $this->getInternalPath($source));
-				if ($result) {
-					$this->clearFolderSizeCache($path);
-				}
-				return $result;
-			}
-		} else {
-			return false;
-		}
+		return false;
 	}
 	
 	public function getMimeType($path) {
-		if ($path == "" || $path == "/") {
+		if ($path == '' || $path == '/') {
 			return 'httpd/unix-directory';
 		}
-		$source = $this->getSourcePath($path);
-		if ($source) {
+		if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->getMimeType($this->getInternalPath($source));
 		}
+		return false;
 	}
 	
 	public function hash($type, $path, $raw) {
-		$source = $this->getSourcePath($path);
-		if ($source) {
+		if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->hash($type, $this->getInternalPath($source), $raw);
 		}
@@ -385,41 +341,20 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			return $storage->free_space($this->getInternalPath($source));
 		}
 	}
-	
-	public function search($query) {
-		return $this->searchInDir($query);
-	}
-
-	protected function searchInDir($query, $path = "") {
-		$files = array();
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if ($filename != "." && $filename != "..") {
-					if (strstr(strtolower($filename), strtolower($query))) {
-						$files[] = $path."/".$filename;
-					}
-					if ($this->is_dir($path."/".$filename)) {
-						$files = array_merge($files, $this->searchInDir($query, $path."/".$filename));
-					}
-				}
-			}
-		}
-		return $files;
-	}
 
 	public function getLocalFile($path) {
-		$source = $this->getSourcePath($path);
-		if ($source) {
+		if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->getLocalFile($this->getInternalPath($source));
 		}
+		return false;
 	}
-	public function touch($path, $mtime=null){
-		$source = $this->getSourcePath($path);
-		if ($source) {
+	public function touch($path, $mtime = null) {
+		if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
-			return $storage->touch($this->getInternalPath($source),$time);
+			return $storage->touch($this->getInternalPath($source), $mtime);
 		}
+		return false;
 	}
 
 	public static function setup($options) {
@@ -436,4 +371,4 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		//TODO
 		return false;
 	}
-}
+}
\ No newline at end of file

From b58e72cdb27d46188675484c73d2783102f7d050 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 23 Jul 2012 22:35:34 -0400
Subject: [PATCH 1099/1537] Alert user of errors when creating new files or
 folders

---
 apps/files/js/files.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 86c5185bf7..8d52b742c1 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -462,14 +462,18 @@ $(document).ready(function() {
 					$.post(
 						OC.filePath('files','ajax','newfile.php'),
 						{dir:$('#dir').val(),filename:name,content:" \n"},
-						function(data){
-							var date=new Date();
-							FileList.addFile(name,0,date);
-							var tr=$('tr').filterAttr('data-file',name);
-							tr.data('mime','text/plain');
-							getMimeIcon('text/plain',function(path){
-								tr.find('td.filename').attr('style','background-image:url('+path+')');
-							});
+						function(result){
+							if (result.status == 'success') {
+								var date=new Date();
+								FileList.addFile(name,0,date);
+								var tr=$('tr').filterAttr('data-file',name);
+								tr.data('mime','text/plain');
+								getMimeIcon('text/plain',function(path){
+									tr.find('td.filename').attr('style','background-image:url('+path+')');
+								});
+							} else {
+								OC.dialogs.alert(result.data.message, 'Error');
+							}
 						}
 					);
 					break;
@@ -477,9 +481,13 @@ $(document).ready(function() {
 					$.post(
 						OC.filePath('files','ajax','newfolder.php'),
 						{dir:$('#dir').val(),foldername:name},
-						function(data){
-							var date=new Date();
-							FileList.addDir(name,0,date);
+						function(result){
+							if (result.status == 'success') {
+								var date=new Date();
+								FileList.addDir(name,0,date);
+							} else {
+								OC.dialogs.alert(result.data.message, 'Error');
+							}
 						}
 					);
 					break;
@@ -510,7 +518,7 @@ $(document).ready(function() {
 									tr.find('td.filename').attr('style','background-image:url('+path+')');
 								});
 							}else{
-
+								OC.dialogs.alert(result.data.message, 'Error');
 							}
 						}
 					);

From e6678bd454145ffae917d218705cfe4836bcdf93 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 23 Jul 2012 22:39:29 -0400
Subject: [PATCH 1100/1537] Permission check should be made on parent folder
 when creating a new folder

---
 apps/files_sharing/sharedstorage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index f2379b7be2..5cdce57482 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -99,7 +99,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function mkdir($path) {
-		if ($path == '' || $path == '/' || !$this->is_writable($path)) {
+		if ($path == '' || $path == '/' || !$this->is_writable(dirname($path))) {
 			return false; 
 		} else if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);

From 20cb0af8ad3ec7ea063edb6c52d94a8a289e8a97 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 24 Jul 2012 10:06:00 +0200
Subject: [PATCH 1101/1537] migrate the webapps call to ocs

---
 webapps.php | 54 -----------------------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 webapps.php

diff --git a/webapps.php b/webapps.php
deleted file mode 100644
index 82e677a51c..0000000000
--- a/webapps.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
-* ownCloud status page. usefull if you want to check from the outside if an owncloud installation exists
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* 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/>.
-*
-*/
-
-$RUNTIME_NOAPPS = TRUE; //no apps, yet
-
-require_once('lib/base.php');
-
-
-//valid user account 
-if(isset($_SERVER['PHP_AUTH_USER'])) $authuser=$_SERVER['PHP_AUTH_USER']; else $authuser='';
-if(isset($_SERVER['PHP_AUTH_PW']))   $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw='';
-
-if(!OC_User::login($authuser,$authpw)){
-	header('WWW-Authenticate: Basic realm="your valid user account"');
-	header('HTTP/1.0 401 Unauthorized');
-	exit;
-}else{
-
-	$apps=OC_App::getEnabledApps();
-	$values=array();
-	foreach($apps as $app) {
-		$info=OC_App::getAppInfo($app);
-		if(isset($info['standalone'])) {
-			$newvalue=array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>'');
-			$values[]=$newvalue;
-		}
-
-	}
-
-	echo(json_encode($values));
-	exit;
-
-
-}

From d28be8de64a3fe6ab52782a4aaeaaf96565a8012 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 24 Jul 2012 15:18:52 +0200
Subject: [PATCH 1102/1537] add the calls for the new keyserver. Still not
 connectect to the encryption system

---
 lib/ocs.php | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 4 deletions(-)

diff --git a/lib/ocs.php b/lib/ocs.php
index 9d30e172f5..3157aae99e 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -153,6 +153,10 @@ class OC_OCS {
 			OC_OCS::privatedatadelete($format, $app, $key);
 
 		// CLOUD
+		// systemWebApps 
+		}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-4]=='cloud') and ($ex[$paracount-3] == 'system') and ($ex[$paracount-2] == 'webapps')){
+			OC_OCS::systemwebapps($format);
+
 		// quotaget 
 		}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')){
 			$user=$ex[$paracount-3];
@@ -164,6 +168,16 @@ class OC_OCS {
 			$quota = self::readData('post', 'quota', 'int');
 			OC_OCS::quotaset($format,$user,$quota);
 
+		// keygetpublic 
+		}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'publickey')){
+			$user=$ex[$paracount-3];
+			OC_OCS::publicKeyGet($format,$user);
+
+		// keygetprivate 
+		}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'privatekey')){
+			$user=$ex[$paracount-3];
+			OC_OCS::privateKeyGet($format,$user);
+
 
 // add more calls here
 // please document all the call in the draft spec
@@ -545,6 +559,29 @@ class OC_OCS {
 
         // CLOUD API #############################################
 
+        /**
+        * get a list of installed web apps
+        * @param string $format
+        * @return string xml/json
+        */
+        private static function systemWebApps($format) {
+                $login=OC_OCS::checkpassword();
+		$apps=OC_App::getEnabledApps();
+		$values=array();
+		foreach($apps as $app) {
+			$info=OC_App::getAppInfo($app);
+			if(isset($info['standalone'])) {
+				$newvalue=array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>'');
+				$values[]=$newvalue;
+			}
+
+		}
+		$txt=OC_OCS::generatexml($format, 'ok', 100, '', $values, 'cloud', '', 2, 0, 0);
+		echo($txt);
+
+        }
+
+
         /**
         * get the quota of a user
         * @param string $format
@@ -573,10 +610,10 @@ class OC_OCS {
 				$xml['used']=$used;
 				$xml['relative']=$relative;
 
-				$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
+				$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', '', 1, 0, 0);
 				echo($txt);
 			}else{
-			echo self::generateXml('', 'fail', 300, 'User does not exist');
+				echo self::generateXml('', 'fail', 300, 'User does not exist');
 			}
 		}else{
 			echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
@@ -596,16 +633,56 @@ class OC_OCS {
 
 			// todo
 			// not yet implemented
-			// edit logic here
+			// add logic here
 			error_log('OCS call: user:'.$user.' quota:'.$quota);
 
                         $xml=array();
-                        $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
+                        $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', '', 1, 0, 0);
                         echo($txt);
                 }else{
                         echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
                 }
         }
 
+        /**
+        * get the public key of a user
+        * @param string $format
+        * @param string $user
+        * @return string xml/json
+        */
+        private static function publicKeyGet($format,$user) {
+                $login=OC_OCS::checkpassword();
+
+		if(OC_User::userExists($user)){
+			// calculate the disc space
+			$txt='this is the public key of '.$user;
+			echo($txt);
+		}else{
+			echo self::generateXml('', 'fail', 300, 'User does not exist');
+		}
+	}
+
+        /**
+        * get the private key of a user
+        * @param string $format
+        * @param string $user
+        * @return string xml/json
+        */
+        private static function privateKeyGet($format,$user) {
+                $login=OC_OCS::checkpassword();
+                if(OC_Group::inGroup($login, 'admin') or ($login==$user)) {
+
+                        if(OC_User::userExists($user)){
+                                // calculate the disc space
+                                $txt='this is the private key of '.$user;
+                                echo($txt);
+                        }else{
+                                echo self::generateXml('', 'fail', 300, 'User does not exist');
+                        }
+                }else{
+                        echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
+                }
+        }
+
 
 }

From e8675586af0923a5b9395166fd93d317920dd09d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 14:22:07 -0400
Subject: [PATCH 1103/1537] Fix permission check for rmdir(), implement
 unlink(), rename(), and copy()

---
 apps/files_sharing/sharedstorage.php | 39 +++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 5cdce57482..e998dd056b 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -109,7 +109,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function rmdir($path) {
-		if ($source = $this->getSourcePath($path) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+		if (($source = $this->getSourcePath($path)) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->rmdir($this->getInternalPath($source));
 		}
@@ -283,15 +283,46 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function unlink($path) {
-		// TODO
+		// Delete the file if DELETE permission is granted
+		if (($source = $this->getSourcePath($path)) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->unlink($this->getInternalPath($source));
+		}
+		return false;
 	}
 	
 	public function rename($path1, $path2) {
-		// TODO
+		if ($oldSource = $this->getSourcePath($path1)) {
+			$root1 = substr($path1, 0, strpos($path1, '/'));
+			$root2 = substr($path2, 0, strpos($path2, '/'));
+			// Moving/renaming is only allowed within the same shared folder
+			if ($root1 == $root2) {
+				$permissions1 = $this->getPermissions($path1);
+				$permissions2 = $this->getPermissions(dirname($path2));
+				$storage = OC_Filesystem::getStorage($oldSource);
+				$newSource = substr($oldSource, 0, strpos($oldSource, $root1)).$path2;
+				if (dirname($path1) == dirname($path2)) {
+					// Rename the file if UPDATE permission is granted
+					if ($permissions1 & OCP\Share::PERMISSION_UPDATE) {
+						return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
+					}
+				// Move the file if DELETE and CREATE permissions are granted
+				} else if (($permissions1 & OCP\Share::PERMISSION_DELETE) && ($permissions2 & OCP\Share::PERMISSION_CREATE)) {
+					return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
+				}
+			}
+		}
+		return false;
 	}
 	
 	public function copy($path1, $path2) {
-		// TODO
+		// Copy the file if CREATE permission is granted
+		if (($source = $this->getSourcePath($path1)) && ($this->getPermissions(dirname($path2)) & OCP\Share::PERMISSION_CREATE)) {
+			$source = $this->fopen($path1, 'r');
+			$target = $this->fopen($path2, 'w');
+			return OC_Helper::streamCopy($source, $target);
+		}
+		return false;
 	}
 	
 	public function fopen($path, $mode) {

From eac297e8c4ed60bfe41c0a4c7687faf598e4d415 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 14:41:19 -0400
Subject: [PATCH 1104/1537] Improve file source caching for shared folders

---
 apps/files_sharing/sharedstorage.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index e998dd056b..2f68b481eb 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -46,15 +46,23 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$pos = strpos($target, '/', 8);
 			// Get shared folder name
 			if ($pos !== false) {
-				$itemTarget = substr($target, 0, $pos);
+				$folder = substr($target, 0, $pos);
+				if (isset($this->files[$folder])) {
+					$file = $this->files[$folder];
+				} else {
+					$file = OCP\Share::getItemSharedWith('file', $folder, OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+				}
+				if ($file) {
+					$this->files[$target]['path'] = $file['path'].substr($target, strlen($folder));
+					$this->files[$target]['permissions'] = $file['permissions'];
+					return $this->files[$target];
+				}
 			} else {
-				$itemTarget = $target;
-			}
-			$file = OCP\Share::getItemSharedWith('file', $itemTarget, OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
-			if ($file) {
-				$this->files[$target]['path'] = $file['path'].substr($target, strlen($itemTarget));
-				$this->files[$target]['permissions'] = $file['permissions'];
-				return $this->files[$target];
+				$file = OCP\Share::getItemSharedWith('file', $target, OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+				if ($file) {
+					$this->files[$target] = $file;
+					return $this->files[$target];
+				}
 			}
 			OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, OCP\Util::ERROR);
 			return false;

From c60c6024a7f02fc9548bc8b8f45f02efa1f9346f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 14:50:43 -0400
Subject: [PATCH 1105/1537] Remove toTmpFile() from shared storage, no longer
 needed

---
 apps/files_sharing/sharedstorage.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 2f68b481eb..e3519306e0 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -346,15 +346,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
-	public function toTmpFile($path) {
-		if ($source = $this->getSourcePath($path)) {
-			$storage = OC_Filesystem::getStorage($source);
-			return $storage->toTmpFile($this->getInternalPath($source));
-		}
-		return false;
-	}
-	
+
 	public function getMimeType($path) {
 		if ($path == '' || $path == '/') {
 			return 'httpd/unix-directory';

From f7b89f047504740224f664917d6588c1fe203877 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 17:42:07 -0400
Subject: [PATCH 1106/1537] Add CRUDS permissions calls to filesystem,
 deprecate is_readable() and is_writable()

---
 apps/files_archive/lib/storage.php        |  4 +-
 apps/files_external/lib/amazons3.php      |  4 +-
 apps/files_external/lib/dropbox.php       |  4 +-
 apps/files_external/lib/google.php        |  4 +-
 apps/files_external/lib/streamwrapper.php |  4 +-
 apps/files_external/lib/swift.php         |  4 +-
 apps/files_external/lib/webdav.php        |  4 +-
 apps/files_sharing/sharedstorage.php      | 47 +++++++++++------------
 lib/filestorage.php                       |  7 +++-
 lib/filestorage/common.php                | 13 ++++++-
 lib/filestorage/local.php                 |  4 +-
 lib/filesystem.php                        | 21 ++++++++++
 lib/filesystemview.php                    | 25 +++++++++++-
 13 files changed, 99 insertions(+), 46 deletions(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index 8676166361..0723ae08cc 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -78,10 +78,10 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 			return $this->archive->fileExists($path.'/')?'dir':'file';
 		}
 	}
-	public function is_readable($path){
+	public function isReadable($path){
 		return is_readable($this->path);
 	}
-	public function is_writable($path){
+	public function isUpdatable($path){
 		return is_writable($this->path);
 	}
 	public function file_exists($path){
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 9feb490dac..3c2e333017 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -134,12 +134,12 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 		return false;
 	}
 
-	public function is_readable($path) {
+	public function isReadable($path) {
 		// TODO Check acl and determine who grantee is
 		return true;
 	}
 
-	public function is_writable($path) {
+	public function isUpdatable($path) {
 		// TODO Check acl and determine who grantee is
 		return true;
 	}
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 35663d431f..5d726feddc 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -118,11 +118,11 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 		return false;
 	}
 
-	public function is_readable($path) {
+	public function isReadable($path) {
 		return $this->file_exists($path);
 	}
 
-	public function is_writable($path) {
+	public function isUpdatable($path) {
 		return $this->file_exists($path);
 	}
 
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 41b560ae84..1346d89926 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -280,11 +280,11 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		return false;
 	}
 
-	public function is_readable($path) {
+	public function isReadable($path) {
 		return true;
 	}
 
-	public function is_writable($path) {
+	public function isUpdatable($path) {
 		if ($path == '' || $path == '/') {
 			return true;
 		} else if ($entry = $this->getResource($path)) {
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index 7d56445361..467c5a5b84 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -32,11 +32,11 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{
 		return filetype($this->constructUrl($path));
 	}
 
-	public function is_readable($path){
+	public function isReadable($path){
 		return true;//not properly supported
 	}
 
-	public function is_writable($path){
+	public function isUpdatable($path){
 		return true;//not properly supported
 	}
 
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 58b95a6ae0..94ccde1ff8 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -353,11 +353,11 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 	}
 
-	public function is_readable($path){
+	public function isReadable($path){
 		return true;
 	}
 
-	public function is_writable($path){
+	public function isUpdatable($path){
 		return true;
 	}
 
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 3d13518f57..675fb9518b 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -109,11 +109,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 
-	public function is_readable($path){
+	public function isReadable($path){
 		return true;//not properly supported
 	}
 
-	public function is_writable($path){
+	public function isUpdatable($path){
 		return true;//not properly supported
 	}
 
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index e3519306e0..a4510f2e77 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -107,7 +107,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function mkdir($path) {
-		if ($path == '' || $path == '/' || !$this->is_writable(dirname($path))) {
+		if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
 			return false; 
 		} else if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
@@ -117,7 +117,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function rmdir($path) {
-		if (($source = $this->getSourcePath($path)) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->rmdir($this->getInternalPath($source));
 		}
@@ -187,25 +187,26 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		return false;
 	}
 
-	public function is_readable($path) {
+	public function isCreatable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE);
+	}
+
+	public function isReadable($path) {
 		return $this->file_exists($path);
 	}
-	
-	public function is_writable($path) {
-		if ($path == '' || $path == '/') {
-			return false;
-		// Folders need CREATE permission to be writable
-		} else if ($this->is_dir($path)) {
-			if ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE) {
-				return true;
-			}
-		// Files need UPDATE permission to be writable
-		} else if ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE) {
-			return true;
-		}
-		return false;
+
+	public function isUpdatable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE);
 	}
-	
+
+	public function isDeletable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE);
+	}
+
+	public function isSharable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_SHARE);
+	}
+
 	public function file_exists($path) {
 		if ($path == '' || $path == '/') {
 			return true;
@@ -292,7 +293,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function unlink($path) {
 		// Delete the file if DELETE permission is granted
-		if (($source = $this->getSourcePath($path)) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->unlink($this->getInternalPath($source));
 		}
@@ -305,17 +306,15 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$root2 = substr($path2, 0, strpos($path2, '/'));
 			// Moving/renaming is only allowed within the same shared folder
 			if ($root1 == $root2) {
-				$permissions1 = $this->getPermissions($path1);
-				$permissions2 = $this->getPermissions(dirname($path2));
 				$storage = OC_Filesystem::getStorage($oldSource);
 				$newSource = substr($oldSource, 0, strpos($oldSource, $root1)).$path2;
 				if (dirname($path1) == dirname($path2)) {
 					// Rename the file if UPDATE permission is granted
-					if ($permissions1 & OCP\Share::PERMISSION_UPDATE) {
+					if ($this->isUpdatable($path1)) {
 						return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
 					}
 				// Move the file if DELETE and CREATE permissions are granted
-				} else if (($permissions1 & OCP\Share::PERMISSION_DELETE) && ($permissions2 & OCP\Share::PERMISSION_CREATE)) {
+				} else if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
 					return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
 				}
 			}
@@ -325,7 +324,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function copy($path1, $path2) {
 		// Copy the file if CREATE permission is granted
-		if (($source = $this->getSourcePath($path1)) && ($this->getPermissions(dirname($path2)) & OCP\Share::PERMISSION_CREATE)) {
+		if (($source = $this->getSourcePath($path1)) && $this->isCreatable(dirname($path2))) {
 			$source = $this->fopen($path1, 'r');
 			$target = $this->fopen($path2, 'w');
 			return OC_Helper::streamCopy($source, $target);
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 71ef4aed00..c104fca87f 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -33,8 +33,11 @@ abstract class OC_Filestorage{
 	abstract public function stat($path);
 	abstract public function filetype($path);
 	abstract public function filesize($path);
-	abstract public function is_readable($path);
-	abstract public function is_writable($path);
+	abstract public function isCreatable($path);
+	abstract public function isReadable($path);
+	abstract public function isUpdatable($path);
+	abstract public function isDeletable($path);
+	abstract public function isSharable($path);
 	abstract public function file_exists($path);
 	abstract public function filectime($path);
 	abstract public function filemtime($path);
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index ba78fca80e..633c2fdfc7 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -54,8 +54,17 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 			return $stat['size'];
 		}
 	}
-// 	abstract public function is_readable($path);
-// 	abstract public function is_writable($path);
+	public function isCreatable($path) {
+		return $this->isUpdatable($path);
+	}
+// 	abstract public function isReadable($path);
+// 	abstract public function isUpdatable($path);
+	public function isDeletable($path) {
+		return $this->isUpdatable($path);
+	}
+	public function isSharable($path) {
+		return $this->isReadable($path);
+	}
 // 	abstract public function file_exists($path);
 	public function filectime($path) {
 		$stat = $this->stat($path);
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b2eba05151..b8b9cd0812 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -46,10 +46,10 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 			return filesize($this->datadir.$path);
 		}
 	}
-	public function is_readable($path){
+	public function isReadable($path){
 		return is_readable($this->datadir.$path);
 	}
-	public function is_writable($path){
+	public function isUpdatable($path){
 		return is_writable($this->datadir.$path);
 	}
 	public function file_exists($path){
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 65318fa3ab..5dfcaa107b 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -421,12 +421,33 @@ class OC_Filesystem{
 	static public function readfile($path){
 		return self::$defaultInstance->readfile($path);
 	}
+	/**
+	* @deprecated Replaced by isReadable() as part of CRUDS
+	*/
 	static public function is_readable($path){
 		return self::$defaultInstance->is_readable($path);
 	}
+	/**
+	* @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
+	*/
 	static public function is_writable($path){
 		return self::$defaultInstance->is_writable($path);
 	}
+	static public function isCreatable($path) {
+		return self::$defaultInstance->isCreatable($path);
+	}
+	static public function isReadable($path) {
+		return self::$defaultInstance->isReadable($path);
+	}
+	static public function isUpdatable($path) {
+		return self::$defaultInstance->isUpdatable($path);
+	}
+	static public function isDeletable($path) {
+		return self::$defaultInstance->isDeletable($path);
+	}
+	static public function isSharable($path) {
+		return self::$defaultInstance->isSharable($path);
+	}
 	static public function file_exists($path){
 		return self::$defaultInstance->file_exists($path);
 	}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 448663bb08..0573129946 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -197,11 +197,32 @@ class OC_FilesystemView {
 		}
 		return false;
 	}
+	/**
+	* @deprecated Replaced by isReadable() as part of CRUDS
+	*/
 	public function is_readable($path){
-		return $this->basicOperation('is_readable',$path);
+		return $this->basicOperation('isReadable',$path);
 	}
+	/**
+	* @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
+	*/
 	public function is_writable($path){
-		return $this->basicOperation('is_writable',$path);
+		return $this->basicOperation('isUpdatable',$path);
+	}
+	public function isCreatable($path) {
+		return $this->basicOperation('isCreatable', $path);
+	}
+	public function isReadable($path) {
+		return $this->basicOperation('isReadable', $path);
+	}
+	public function isUpdatable($path) {
+		return $this->basicOperation('isUpdatable', $path);
+	}
+	public function isDeletable($path) {
+		return $this->basicOperation('isDeletable', $path);
+	}
+	public function isSharable($path) {
+		return $this->basicOperation('isSharable', $path);
 	}
 	public function file_exists($path){
 		if($path=='/'){

From fc72d4b10f0b0a78faee2f133e833fa6ea10ced7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 21:16:47 -0400
Subject: [PATCH 1107/1537] Add root directory checks for CRUDS permissions in
 shared storage

---
 apps/files_sharing/sharedstorage.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index a4510f2e77..38d5f10e28 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -188,6 +188,9 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 
 	public function isCreatable($path) {
+		if ($path == '') {
+			return false;
+		}
 		return ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE);
 	}
 
@@ -196,14 +199,23 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 
 	public function isUpdatable($path) {
+		if ($path == '') {
+			return false;
+		}
 		return ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE);
 	}
 
 	public function isDeletable($path) {
+		if ($path == '') {
+			return false;
+		}
 		return ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE);
 	}
 
 	public function isSharable($path) {
+		if ($path == '') {
+			return false;
+		}
 		return ($this->getPermissions($path) & OCP\Share::PERMISSION_SHARE);
 	}
 

From ede2b8a55f640f7ad33fb73f78e73bbee2f64a72 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 21:17:43 -0400
Subject: [PATCH 1108/1537] Missed a is_readable() call in local filestorage

---
 lib/filestorage/local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b8b9cd0812..658e14eaf9 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -129,7 +129,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	}
 
 	public function getMimeType($path){
-		if($this->is_readable($path)){
+		if($this->isReadable($path)){
 			return OC_Helper::getMimeType($this->datadir.$path);
 		}else{
 			return false;

From 6f58eca5349d8c82f7bba3a7c0f92c0caa8e3749 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 24 Jul 2012 21:35:03 -0400
Subject: [PATCH 1109/1537] Change read only check to isCreatable

---
 apps/files/index.php           |  2 +-
 apps/files/templates/index.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index 79bed8e357..225e2d7ac1 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -93,7 +93,7 @@ $tmpl = new OCP\Template( 'files', 'index', 'user' );
 $tmpl->assign( 'fileList', $list->fetchPage(), false );
 $tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
 $tmpl->assign( 'dir', $dir);
-$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
+$tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/'));
 $tmpl->assign( 'files', $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 44000171a1..bcf683ae4a 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,8 +1,8 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
 <div id="controls">
 	<?php echo($_['breadcrumb']); ?>
-	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
-		<div class="actions <?php if (isset($_['files']) and ! $_['readonly'] and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
+	<?php if ($_['isCreatable']):?>
+		<div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
 			<div id='new' class='button'>
 				<a><?php echo $l->t('New');?></a>
 				<ul class="popup popupTop">
@@ -35,7 +35,7 @@
 </div>
 <div id='notification'></div>
 
-<?php if (isset($_['files']) and ! $_['readonly'] and count($_['files'])==0):?>
+<?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
 <?php endif; ?>
 
@@ -43,7 +43,7 @@
 	<thead>
 		<tr>
 			<th id='headerName'>
-				<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" id="select_all" /><?php } ?>
+				<input type="checkbox" id="select_all" />
 				<span class='name'><?php echo $l->t( 'Name' ); ?></span>
 				<span class='selectedActions'>
 <!-- 					<a href="" class="share"><img class='svg' alt="Share" src="<?php echo OCP\image_path("core", "actions/share.svg"); ?>" /> <?php echo $l->t('Share')?></a> -->
@@ -56,7 +56,7 @@
 			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
 		</tr>
 	</thead>
-	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
+	<tbody id="fileList">
 		<?php echo($_['fileList']); ?>
 	</tbody>
 </table>

From fdcbc23ed6bb520f50c7c4ce5f169e6716e1c5f0 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 13:09:09 +0200
Subject: [PATCH 1110/1537] define an interface for the User Backend

---
 lib/user.php           |  4 +--
 lib/user/backend.php   |  2 +-
 lib/user/interface.php | 69 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 lib/user/interface.php

diff --git a/lib/user.php b/lib/user.php
index 549319b3a7..e3c9c23eff 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -21,7 +21,7 @@
  */
 
 /**
- * This class provides wrapper methods for user management. Multiple backends are 
+ * This class provides wrapper methods for user management. Multiple backends are
  * supported. User management operations are delegated to the configured backend for
  * execution.
  *
@@ -83,7 +83,7 @@ class OC_User {
 	 * Set the User Authentication Module
 	 */
 	public static function useBackend( $backend = 'database' ){
-		if($backend instanceof OC_User_Backend){
+		if($backend instanceof OC_User_Interface){
 			self::$_usedBackends[get_class($backend)]=$backend;
 		}else{
 			// You'll never know what happens
diff --git a/lib/user/backend.php b/lib/user/backend.php
index be068a63ce..daa942d261 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -42,7 +42,7 @@ define('OC_USER_BACKEND_CHECK_PASSWORD',    0x000100);
  *
  * Subclass this for your own backends, and see OC_User_Example for descriptions
  */
-abstract class OC_User_Backend {
+abstract class OC_User_Backend implements OC_User_Interface {
 
 	protected $possibleActions = array(
 		OC_USER_BACKEND_CREATE_USER => 'createUser',
diff --git a/lib/user/interface.php b/lib/user/interface.php
new file mode 100644
index 0000000000..a04c761630
--- /dev/null
+++ b/lib/user/interface.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * ownCloud - user interface
+ *
+ * @author Arthur Schiwon
+ * @copyright 2012 Arthur Schiwon blizzz@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * 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/>.
+ *
+ */
+
+interface OC_User_Interface {
+
+	/**
+	* @brief Get all supported actions
+	* @returns bitwise-or'ed actions
+	*
+	* Returns the supported actions as int to be
+	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	*/
+	public function getSupportedActions();
+
+	/**
+	* @brief Check if backend implements actions
+	* @param $actions bitwise-or'ed actions
+	* @returns boolean
+	*
+	* Returns the supported actions as int to be
+	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	*/
+	public function implementsActions($actions);
+
+	/**
+	* @brief delete a user
+	* @param $uid The username of the user to delete
+	* @returns true/false
+	*
+	* Deletes a user
+	*/
+	public function deleteUser($uid);
+
+	/**
+	* @brief Get a list of all users
+	* @returns array with all uids
+	*
+	* Get a list of all users.
+	*/
+	public function getUsers();
+
+	/**
+	* @brief check if a user exists
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function userExists($uid);
+
+}
\ No newline at end of file

From e499bc37c839cc8b33d81e8eb360a4dfd1050ca2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 13:15:12 +0200
Subject: [PATCH 1111/1537] define an interface for the Group Backend

---
 lib/group.php           |  8 ++--
 lib/group/backend.php   |  2 +-
 lib/group/interface.php | 86 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 lib/group/interface.php

diff --git a/lib/group.php b/lib/group.php
index ceee5fa4ed..12e5f5ebb3 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -43,7 +43,7 @@ class OC_Group {
 	 * @returns true/false
 	 */
 	public static function useBackend( $backend ){
-		if($backend instanceof OC_Group_Backend){
+		if($backend instanceof OC_Group_Interface){
 			self::$_usedBackends[]=$backend;
 		}
 	}
@@ -168,7 +168,7 @@ class OC_Group {
 
 		if($run){
 			$succes=false;
-			
+
 			//add the user to the all backends that have the group
 			foreach(self::$_usedBackends as $backend){
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP))
@@ -245,7 +245,7 @@ class OC_Group {
 		asort($groups);
 		return $groups;
 	}
-	
+
 	/**
 	 * check if a group exists
 	 * @param string $gid
@@ -259,7 +259,7 @@ class OC_Group {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 24778afd1e..ebc078f152 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -37,7 +37,7 @@ define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00001000);
 /**
  * Abstract base class for user management
  */
-abstract class OC_Group_Backend {
+abstract class OC_Group_Backend implements OC_Group_Interface {
 	protected $possibleActions = array(
 		OC_GROUP_BACKEND_CREATE_GROUP => 'createGroup',
 		OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup',
diff --git a/lib/group/interface.php b/lib/group/interface.php
new file mode 100644
index 0000000000..f86a6dd089
--- /dev/null
+++ b/lib/group/interface.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * ownCloud - group interface
+ *
+ * @author Arthur Schiwon
+ * @copyright 2012 Arthur Schiwon blizzz@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * 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/>.
+ *
+ */
+
+interface OC_Group_Interface {
+
+	/**
+	* @brief Get all supported actions
+	* @returns bitwise-or'ed actions
+	*
+	* Returns the supported actions as int to be
+	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	*/
+	public function getSupportedActions();
+
+	/**
+	* @brief Check if backend implements actions
+	* @param $actions bitwise-or'ed actions
+	* @returns boolean
+	*
+	* Returns the supported actions as int to be
+	* compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
+	*/
+	public function implementsActions($actions);
+
+	/**
+	 * @brief is user in group?
+	 * @param $uid uid of the user
+	 * @param $gid gid of the group
+	 * @returns true/false
+	 *
+	 * Checks whether the user is member of a group or not.
+	 */
+	public function inGroup($uid, $gid);
+
+	/**
+	 * @brief Get all groups a user belongs to
+	 * @param $uid Name of the user
+	 * @returns array with group names
+	 *
+	 * This function fetches all groups a user belongs to. It does not check
+	 * if the user exists at all.
+	 */
+	public function getUserGroups($uid);
+
+	/**
+	 * @brief get a list of all groups
+	 * @returns array with group names
+	 *
+	 * Returns a list with all groups
+	 */
+	public function getGroups();
+
+	/**
+	 * check if a group exists
+	 * @param string $gid
+	 * @return bool
+	 */
+	public function groupExists($gid);
+
+	/**
+	 * @brief get a list of all users in a group
+	 * @returns array with user ids
+	 */
+	public function usersInGroup($gid);
+
+}
\ No newline at end of file

From 0bdebe0e4a5249e45cebce1696e3e0ed05b892d1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 13:18:02 +0200
Subject: [PATCH 1112/1537] LDAP: pass user backend as instance, not classname

---
 apps/user_ldap/appinfo/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 330574c1d4..a3c4b0cf9f 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -28,7 +28,7 @@ require_once('apps/user_ldap/group_ldap.php');
 OCP\App::registerAdmin('user_ldap','settings');
 
 // register user backend
-OC_User::useBackend( 'LDAP' );
+OC_User::useBackend( new OC_USER_LDAP() );
 OC_Group::useBackend( new OC_GROUP_LDAP() );
 
 // add settings page to navigation

From 0196e6eada346e25e080e74ea4f19e76cd878169 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 16:25:54 +0200
Subject: [PATCH 1113/1537] Offer User and Group interfaces in public API

---
 lib/public/groupinterface.php | 31 +++++++++++++++++++++++++++++++
 lib/public/userinterface.php  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 lib/public/groupinterface.php
 create mode 100644 lib/public/userinterface.php

diff --git a/lib/public/groupinterface.php b/lib/public/groupinterface.php
new file mode 100644
index 0000000000..9783302811
--- /dev/null
+++ b/lib/public/groupinterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2012 Arthur Schiwon blizzz@owncloud.org
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* 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/>.
+*
+*/
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * Group Class.
+ *
+ */
+
+namespace OCP;
+
+interface GroupInterface extends \OC_Group_Interface {}
\ No newline at end of file
diff --git a/lib/public/userinterface.php b/lib/public/userinterface.php
new file mode 100644
index 0000000000..b73a8f8d8b
--- /dev/null
+++ b/lib/public/userinterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2012 Arthur Schiwon blizzz@owncloud.org
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* 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/>.
+*
+*/
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * User Class.
+ *
+ */
+
+namespace OCP;
+
+interface UserInterface extends \OC_User_Interface {}
\ No newline at end of file

From 81c0ca4ffb1065fc5f59ee916c06758605639fc8 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 16:26:46 +0200
Subject: [PATCH 1114/1537] remove only internally used function from interface

---
 lib/user/interface.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/user/interface.php b/lib/user/interface.php
index a04c761630..dc3685dc20 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -23,15 +23,6 @@
 
 interface OC_User_Interface {
 
-	/**
-	* @brief Get all supported actions
-	* @returns bitwise-or'ed actions
-	*
-	* Returns the supported actions as int to be
-	* compared with OC_USER_BACKEND_CREATE_USER etc.
-	*/
-	public function getSupportedActions();
-
 	/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions

From afdc5bf264cbb061807d1d34a9ca451fd5eb72a4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 16:28:20 +0200
Subject: [PATCH 1115/1537] LDAP: switch user backend from extending class
 OC_User_Backend to implementing OC_User_Interface for improved flexibility

---
 apps/user_ldap/user_ldap.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index b51d9a55cc..7ff9b23af0 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -23,7 +23,7 @@
  *
  */
 
-class OC_USER_LDAP extends OC_User_Backend {
+class OC_USER_LDAP implements OCP\UserInterface {
 
 	// cached settings
 	protected $ldapUserFilter;
@@ -139,4 +139,27 @@ class OC_USER_LDAP extends OC_User_Backend {
 		return true;
 	}
 
+	/**
+	* @brief delete a user
+	* @param $uid The username of the user to delete
+	* @returns true/false
+	*
+	* Deletes a user
+	*/
+	public function deleteUser($uid) {
+		return false;
+	}
+
+	/**
+	* @brief Check if backend implements actions
+	* @param $actions bitwise-or'ed actions
+	* @returns boolean
+	*
+	* Returns the supported actions as int to be
+	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	*/
+	public function implementsActions($actions) {
+		return (bool)(OC_USER_BACKEND_CHECK_PASSWORD & $actions);
+	}
+
 }
\ No newline at end of file

From 5888cb48b6c33a19cf1b798f5bade48526afe651 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 17:41:41 +0200
Subject: [PATCH 1116/1537] Support for OCA namespace

---
 apps/user_ldap/appinfo/app.php | 1 +
 apps/user_ldap/user_ldap.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index a3c4b0cf9f..0e201a38ed 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -24,6 +24,7 @@
 require_once('apps/user_ldap/lib_ldap.php');
 require_once('apps/user_ldap/user_ldap.php');
 require_once('apps/user_ldap/group_ldap.php');
+// OC::$CLASSPATH['OCA\user_ldap\LDAP_Access']='apps/user_ldap/lib/access.php';
 
 OCP\App::registerAdmin('user_ldap','settings');
 
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 7ff9b23af0..ee5089924e 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -23,7 +23,7 @@
  *
  */
 
-class OC_USER_LDAP implements OCP\UserInterface {
+class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterface {
 
 	// cached settings
 	protected $ldapUserFilter;

From 57c375ea245d57567316254df2968b5b929733a7 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 17:42:32 +0200
Subject: [PATCH 1117/1537] Support for OCA namespace

---
 lib/base.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 631ed4fcce..888dc265d6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -83,6 +83,9 @@ class OC{
 		elseif(strpos($className,'OCP\\')===0){
 			require_once 'public/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
 		}
+		elseif(strpos($className,'OCA\\')===0){
+			require_once 'apps/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
+		}
 		elseif(strpos($className,'Sabre_')===0) {
 			require_once str_replace('_','/',$className) . '.php';
 		}

From 42492338fc708a09ada3d4ef6f4cc8aa0c670ee3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jul 2012 17:43:44 +0200
Subject: [PATCH 1118/1537] LDAP: put app under the OCA\user_ldap\ namespace

---
 apps/user_ldap/appinfo/app.php |  8 +++---
 apps/user_ldap/group_ldap.php  | 46 ++++++++++++++++++----------------
 apps/user_ldap/user_ldap.php   | 36 +++++++++++++-------------
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 0e201a38ed..b5dd718d71 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -22,15 +22,13 @@
 */
 
 require_once('apps/user_ldap/lib_ldap.php');
-require_once('apps/user_ldap/user_ldap.php');
-require_once('apps/user_ldap/group_ldap.php');
-// OC::$CLASSPATH['OCA\user_ldap\LDAP_Access']='apps/user_ldap/lib/access.php';
+// require_once('apps/user_ldap/group_ldap.php');
 
 OCP\App::registerAdmin('user_ldap','settings');
 
 // register user backend
-OC_User::useBackend( new OC_USER_LDAP() );
-OC_Group::useBackend( new OC_GROUP_LDAP() );
+OC_User::useBackend(new OCA\user_ldap\USER_LDAP());
+OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
 
 // add settings page to navigation
 $entry = array(
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index d438c7d84d..06db535490 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -21,7 +21,9 @@
  *
  */
 
-class OC_GROUP_LDAP extends OC_Group_Backend {
+namespace OCA\user_ldap;
+
+class GROUP_LDAP extends \OC_Group_Backend {
 // 	//group specific settings
 	protected $ldapGroupFilter;
 	protected $ldapGroupMemberAssocAttr;
@@ -33,8 +35,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 	protected $_groups = array();
 
 	public function __construct() {
-		$this->ldapGroupFilter          = OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
-		$this->ldapGroupMemberAssocAttr = OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
+		$this->ldapGroupFilter          = \OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
+		$this->ldapGroupMemberAssocAttr = \OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
 
 		if(!empty($this->ldapGroupFilter) && !empty($this->ldapGroupMemberAssocAttr)) {
 			$this->configured = true;
@@ -56,14 +58,14 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(isset($this->_group_user[$gid][$uid])) {
 			return $this->_group_user[$gid][$uid];
 		}
-		$dn_user = OC_LDAP::username2dn($uid);
-		$dn_group = OC_LDAP::groupname2dn($gid);
+		$dn_user = \OC_LDAP::username2dn($uid);
+		$dn_group = \OC_LDAP::groupname2dn($gid);
 		// just in case
 		if(!$dn_group || !$dn_user) {
 			return false;
 		}
 		//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
-		$members = OC_LDAP::readAttribute($dn_group, $this->ldapGroupMemberAssocAttr);
+		$members = \OC_LDAP::readAttribute($dn_group, $this->ldapGroupMemberAssocAttr);
 		if(!$members) {
 			return false;
 		}
@@ -73,8 +75,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
 			$dns = array();
 			foreach($members as $mid) {
-				$filter = str_replace('%uid', $mid, OC_LDAP::conf('ldapLoginFilter'));
-				$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
+				$filter = str_replace('%uid', $mid, \OC_LDAP::conf('ldapLoginFilter'));
+				$ldap_users = \OC_LDAP::fetchListOfUsers($filter, 'dn');
 				if(count($ldap_users) < 1) {
 					continue;
 				}
@@ -102,7 +104,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		if(isset($this->_user_groups[$uid])) {
 			return $this->_user_groups[$uid];
 		}
-		$userDN = OC_LDAP::username2dn($uid);
+		$userDN = \OC_LDAP::username2dn($uid);
 		if(!$userDN) {
 			$this->_user_groups[$uid] = array();
 			return array();
@@ -113,19 +115,19 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 			|| (strtolower($this->ldapGroupMemberAssocAttr) == 'member')) {
 			$uid = $userDN;
 		} else if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
-			$result = OC_LDAP::readAttribute($userDN, 'uid');
+			$result = \OC_LDAP::readAttribute($userDN, 'uid');
 			$uid = $result[0];
 		} else {
 			// just in case
 			$uid = $userDN;
 		}
 
-		$filter = OC_LDAP::combineFilterWithAnd(array(
+		$filter = \OC_LDAP::combineFilterWithAnd(array(
 			$this->ldapGroupFilter,
 			$this->ldapGroupMemberAssocAttr.'='.$uid
 		));
-		$groups = OC_LDAP::fetchListOfGroups($filter, array(OC_LDAP::conf('ldapGroupDisplayName'),'dn'));
-		$this->_user_groups[$uid] = array_unique(OC_LDAP::ownCloudGroupNames($groups), SORT_LOCALE_STRING);
+		$groups = \OC_LDAP::fetchListOfGroups($filter, array(\OC_LDAP::conf('ldapGroupDisplayName'),'dn'));
+		$this->_user_groups[$uid] = array_unique(\OC_LDAP::ownCloudGroupNames($groups), SORT_LOCALE_STRING);
 
 		return $this->_user_groups[$uid];
 	}
@@ -142,13 +144,13 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 			return $this->_group_users[$gid];
 		}
 
-		$groupDN = OC_LDAP::groupname2dn($gid);
+		$groupDN = \OC_LDAP::groupname2dn($gid);
 		if(!$groupDN) {
 			$this->_group_users[$gid] = array();
 			return array();
 		}
 
-		$members = OC_LDAP::readAttribute($groupDN, $this->ldapGroupMemberAssocAttr);
+		$members = \OC_LDAP::readAttribute($groupDN, $this->ldapGroupMemberAssocAttr);
 		if(!$members) {
 			$this->_group_users[$gid] = array();
 			return array();
@@ -158,21 +160,21 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 		$isMemberUid = (strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid');
 		foreach($members as $member) {
 			if($isMemberUid) {
-				$filter = OCP\Util::mb_str_replace('%uid', $member, OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
-				$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
+				$filter = \OCP\Util::mb_str_replace('%uid', $member, \OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
+				$ldap_users = \OC_LDAP::fetchListOfUsers($filter, 'dn');
 				if(count($ldap_users) < 1) {
 					continue;
 				}
-				$result[] = OC_LDAP::dn2username($ldap_users[0]);
+				$result[] = \OC_LDAP::dn2username($ldap_users[0]);
 				continue;
 			} else {
-				if($ocname = OC_LDAP::dn2username($member)){
+				if($ocname = \OC_LDAP::dn2username($member)){
 					$result[] = $ocname;
 				}
 			}
 		}
 		if(!$isMemberUid) {
-			$result = array_intersect($result, OCP\User::getUsers());
+			$result = array_intersect($result, \OCP\User::getUsers());
 		}
 		$this->_group_users[$gid] = array_unique($result, SORT_LOCALE_STRING);
 		return $this->_group_users[$gid];
@@ -189,8 +191,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
 			return array();
 		}
 		if(empty($this->_groups)) {
-			$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
-			$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
+			$ldap_groups = \OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(\OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
+			$this->_groups = \OC_LDAP::ownCloudGroupNames($ldap_groups);
 		}
 		return $this->_groups;
 	}
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index ee5089924e..e7ed4dae28 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -23,7 +23,9 @@
  *
  */
 
-class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterface {
+namespace OCA\user_ldap;
+
+class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 
 	// cached settings
 	protected $ldapUserFilter;
@@ -38,10 +40,10 @@ class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterfac
 	protected $_users = null;
 
 	public function __construct() {
-		$this->ldapUserFilter      = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter', '(objectClass=posixAccount)');
-		$this->ldapQuotaAttribute  = OCP\Config::getAppValue('user_ldap', 'ldap_quota_attr', '');
-		$this->ldapQuotaDefault    = OCP\Config::getAppValue('user_ldap', 'ldap_quota_def', '');
-		$this->ldapEmailAttribute  = OCP\Config::getAppValue('user_ldap', 'ldap_email_attr', '');
+		$this->ldapUserFilter      = \OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter', '(objectClass=posixAccount)');
+		$this->ldapQuotaAttribute  = \OCP\Config::getAppValue('user_ldap', 'ldap_quota_attr', '');
+		$this->ldapQuotaDefault    = \OCP\Config::getAppValue('user_ldap', 'ldap_quota_def', '');
+		$this->ldapEmailAttribute  = \OCP\Config::getAppValue('user_ldap', 'ldap_email_attr', '');
 	}
 
 	private function updateQuota($dn) {
@@ -50,26 +52,26 @@ class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterfac
 			$quota = $this->ldapQuotaDefault;
 		}
 		if(!empty($this->ldapQuotaAttribute)) {
-			$aQuota = OC_LDAP::readAttribute($dn, $this->ldapQuotaAttribute);
+			$aQuota = \OC_LDAP::readAttribute($dn, $this->ldapQuotaAttribute);
 
 			if($aQuota && (count($aQuota) > 0)) {
 				$quota = $aQuota[0];
 			}
 		}
 		if(!is_null($quota)) {
-			OCP\Config::setUserValue(OC_LDAP::dn2username($dn), 'files', 'quota', OCP\Util::computerFileSize($quota));
+			\OCP\Config::setUserValue(\OC_LDAP::dn2username($dn), 'files', 'quota', \OCP\Util::computerFileSize($quota));
 		}
 	}
 
 	private function updateEmail($dn) {
 		$email = null;
 		if(!empty($this->ldapEmailAttribute)) {
-			$aEmail = OC_LDAP::readAttribute($dn, $this->ldapEmailAttribute);
+			$aEmail = \OC_LDAP::readAttribute($dn, $this->ldapEmailAttribute);
 			if($aEmail && (count($aEmail) > 0)) {
 				$email = $aEmail[0];
 			}
 			if(!is_null($email)){
-				OCP\Config::setUserValue(OC_LDAP::dn2username($dn), 'settings', 'email', $email);
+				\OCP\Config::setUserValue(\OC_LDAP::dn2username($dn), 'settings', 'email', $email);
 			}
 		}
 	}
@@ -84,15 +86,15 @@ class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterfac
 	 */
 	public function checkPassword($uid, $password){
 		//find out dn of the user name
-		$filter = OCP\Util::mb_str_replace('%uid', $uid, OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
-		$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
+		$filter = \OCP\Util::mb_str_replace('%uid', $uid, \OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
+		$ldap_users = \OC_LDAP::fetchListOfUsers($filter, 'dn');
 		if(count($ldap_users) < 1) {
 			return false;
 		}
 		$dn = $ldap_users[0];
 
 		//are the credentials OK?
-		if(!OC_LDAP::areCredentialsValid($dn, $password)) {
+		if(!\OC_LDAP::areCredentialsValid($dn, $password)) {
 			return false;
 		}
 
@@ -101,7 +103,7 @@ class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterfac
 		$this->updateEmail($dn);
 
 		//give back the display name
-		return OC_LDAP::dn2username($dn);
+		return \OC_LDAP::dn2username($dn);
 	}
 
 	/**
@@ -112,8 +114,8 @@ class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterfac
 	 */
 	public function getUsers(){
 		if(is_null($this->_users)) {
-			$ldap_users = OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
-			$this->_users = OC_LDAP::ownCloudUserNames($ldap_users);
+			$ldap_users = \OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(\OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
+			$this->_users = \OC_LDAP::ownCloudUserNames($ldap_users);
 		}
 		return $this->_users;
 	}
@@ -125,13 +127,13 @@ class OC_USER_LDAP extends OCA\user_ldap\LDAP_Access implements OCP\UserInterfac
 	 */
 	public function userExists($uid){
 		//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
-		$dn = OC_LDAP::username2dn($uid);
+		$dn = \OC_LDAP::username2dn($uid);
 		if(!$dn) {
 			return false;
 		}
 
 		//if user really still exists, we will be able to read his cn
-		$cn = OC_LDAP::readAttribute($dn, 'cn');
+		$cn = \OC_LDAP::readAttribute($dn, 'cn');
 		if(!$cn || empty($cn)) {
 			return false;
 		}

From 6b320a260434712d8c558bee431dd40af58883ad Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 24 Jul 2012 10:54:56 +0200
Subject: [PATCH 1119/1537] provide recursiveArraySearch as Helper function and
 make available through API

---
 lib/helper.php      | 28 +++++++++++++++++++++++++++-
 lib/public/util.php | 11 +++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/helper.php b/lib/helper.php
index f328c14ac7..666bc6badf 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -360,7 +360,7 @@ class OC_Helper {
 		}else{
 			$mimeType='application/octet-stream';
 		}
-		
+
 		if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
 			$info = @strtolower(finfo_file($finfo,$path));
 			if($info){
@@ -679,4 +679,30 @@ class OC_Helper {
 		}
 		return $subject;
 	}
+
+	/**
+	* @brief performs a search in a nested array
+	* @param haystack the array to be searched
+	* @param needle the search string
+	* @param $index optional, only search this key name
+	* @return the key of the matching field, otherwise false
+	*
+	* performs a search in a nested array
+	*
+	* taken from http://www.php.net/manual/en/function.array-search.php#97645
+	*/
+	public static function recursiveArraySearch($haystack, $needle, $index = null) {
+		$aIt = new RecursiveArrayIterator($haystack);
+		$it = new RecursiveIteratorIterator($aIt);
+
+		while($it->valid()) {
+			if (((isset($index) AND ($it->key() == $index)) OR (!isset($index))) AND ($it->current() == $needle)) {
+				return $aIt->key();
+			}
+
+			$it->next();
+		}
+
+		return false;
+	}
 }
diff --git a/lib/public/util.php b/lib/public/util.php
index 43f9e3cee5..75ca29f712 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -320,4 +320,15 @@ class Util {
 	public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
 		return(\OC_Helper::mb_str_replace($search, $replace, $subject, $encoding, $count));
 	}
+
+	/**
+	* @brief performs a search in a nested array
+	* @param haystack the array to be searched
+	* @param needle the search string
+	* @param $index optional, only search this key name
+	* @return the key of the matching field, otherwise false
+	*/
+	public static function recursiveArraySearch($haystack, $needle, $index = null) {
+		return(\OC_Helper::recursiveArraySearch($haystack, $needle, $index));
+	}
 }

From d0aebf05bf71df6f8ad11d0464e396d2be6fa744 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 24 Jul 2012 11:18:08 +0200
Subject: [PATCH 1120/1537] LDAP: group backend now implements the interface,
 does not inherit backend class

---
 apps/user_ldap/group_ldap.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 06db535490..1585b905aa 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -23,7 +23,7 @@
 
 namespace OCA\user_ldap;
 
-class GROUP_LDAP extends \OC_Group_Backend {
+class GROUP_LDAP implements \OCP\GroupInterface {
 // 	//group specific settings
 	protected $ldapGroupFilter;
 	protected $ldapGroupMemberAssocAttr;
@@ -205,4 +205,17 @@ class GROUP_LDAP extends \OC_Group_Backend {
 	public function groupExists($gid){
 		return in_array($gid, $this->getGroups());
 	}
+
+	/**
+	* @brief Check if backend implements actions
+	* @param $actions bitwise-or'ed actions
+	* @returns boolean
+	*
+	* Returns the supported actions as int to be
+	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	*/
+	public function implementsActions($actions) {
+		//always returns false, because possible actions are modifying actions. We do not write to LDAP, at least for now.
+		return false;
+	}
 }
\ No newline at end of file

From eefe6882f977c324b2ac9141758b64be2a9c752e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 24 Jul 2012 11:38:56 +0200
Subject: [PATCH 1121/1537] method not used externally, thus not needed in
 interface

---
 lib/group/interface.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/group/interface.php b/lib/group/interface.php
index f86a6dd089..7cca6061e1 100644
--- a/lib/group/interface.php
+++ b/lib/group/interface.php
@@ -22,16 +22,6 @@
  */
 
 interface OC_Group_Interface {
-
-	/**
-	* @brief Get all supported actions
-	* @returns bitwise-or'ed actions
-	*
-	* Returns the supported actions as int to be
-	* compared with OC_USER_BACKEND_CREATE_USER etc.
-	*/
-	public function getSupportedActions();
-
 	/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions

From 25ad1d5c3e92228e6274b5b765e3fa5d47ece04b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 12:37:39 +0200
Subject: [PATCH 1122/1537] LDAP: split up LIB_LDAP into Access for LDAP
 interaction functions and Connection for configuration and resource
 management. Adjust user_ldap, group_ldap and the app accordingly.

---
 apps/user_ldap/appinfo/app.php                |  10 +-
 apps/user_ldap/group_ldap.php                 |  75 ++-
 .../{lib_ldap.php => lib/access.php}          | 477 +++++++-----------
 apps/user_ldap/lib/connection.php             | 245 +++++++++
 apps/user_ldap/user_ldap.php                  |  46 +-
 5 files changed, 480 insertions(+), 373 deletions(-)
 rename apps/user_ldap/{lib_ldap.php => lib/access.php} (50%)
 create mode 100644 apps/user_ldap/lib/connection.php

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index b5dd718d71..537f56861c 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -26,9 +26,15 @@ require_once('apps/user_ldap/lib_ldap.php');
 
 OCP\App::registerAdmin('user_ldap','settings');
 
+$connector = new OCA\user_ldap\lib\Connection('user_ldap');
+$userBackend  = new OCA\user_ldap\USER_LDAP();
+$userBackend->setConnector($connector);
+$groupBackend = new OCA\user_ldap\GROUP_LDAP();
+$groupBackend->setConnector($connector);
+
 // register user backend
-OC_User::useBackend(new OCA\user_ldap\USER_LDAP());
-OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
+OC_User::useBackend($userBackend);
+OC_Group::useBackend($groupBackend);
 
 // add settings page to navigation
 $entry = array(
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 1585b905aa..8f46a504f6 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -23,24 +23,21 @@
 
 namespace OCA\user_ldap;
 
-class GROUP_LDAP implements \OCP\GroupInterface {
+class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 // 	//group specific settings
-	protected $ldapGroupFilter;
-	protected $ldapGroupMemberAssocAttr;
-	protected $configured = false;
+	protected $enabled = false;
 
 	protected $_group_user = array();
 	protected $_user_groups = array();
 	protected $_group_users = array();
 	protected $_groups = array();
 
-	public function __construct() {
-		$this->ldapGroupFilter          = \OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
-		$this->ldapGroupMemberAssocAttr = \OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
-
-		if(!empty($this->ldapGroupFilter) && !empty($this->ldapGroupMemberAssocAttr)) {
-			$this->configured = true;
+	public function setConnector(lib\Connection &$connection) {
+		parent::setConnector($connection);
+		if(empty($this->connection->ldapGroupFilter) || empty($this->connection->ldapGroupMemberAssocAttr)) {
+			$this->enabled = false;
 		}
+		$this->enabled = true;
 	}
 
 	/**
@@ -52,31 +49,31 @@ class GROUP_LDAP implements \OCP\GroupInterface {
 	 * Checks whether the user is member of a group or not.
 	 */
 	public function inGroup($uid, $gid) {
-		if(!$this->configured) {
+		if(!$this->enabled) {
 			return false;
 		}
 		if(isset($this->_group_user[$gid][$uid])) {
 			return $this->_group_user[$gid][$uid];
 		}
-		$dn_user = \OC_LDAP::username2dn($uid);
-		$dn_group = \OC_LDAP::groupname2dn($gid);
+		$dn_user = $this->username2dn($uid);
+		$dn_group = $this->groupname2dn($gid);
 		// just in case
 		if(!$dn_group || !$dn_user) {
 			return false;
 		}
 		//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
-		$members = \OC_LDAP::readAttribute($dn_group, $this->ldapGroupMemberAssocAttr);
+		$members = $this->readAttribute($dn_group, $this->connection->ldapGroupMemberAssocAttr);
 		if(!$members) {
 			return false;
 		}
 
 		//extra work if we don't get back user DNs
 		//TODO: this can be done with one LDAP query
-		if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
+		if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
 			$dns = array();
 			foreach($members as $mid) {
-				$filter = str_replace('%uid', $mid, \OC_LDAP::conf('ldapLoginFilter'));
-				$ldap_users = \OC_LDAP::fetchListOfUsers($filter, 'dn');
+				$filter = str_replace('%uid', $mid, $this->connection->ldapLoginFilter);
+				$ldap_users = $this->fetchListOfUsers($filter, 'dn');
 				if(count($ldap_users) < 1) {
 					continue;
 				}
@@ -98,36 +95,36 @@ class GROUP_LDAP implements \OCP\GroupInterface {
 	 * if the user exists at all.
 	 */
 	public function getUserGroups($uid) {
-		if(!$this->configured) {
+		if(!$this->enabled) {
 			return array();
 		}
 		if(isset($this->_user_groups[$uid])) {
 			return $this->_user_groups[$uid];
 		}
-		$userDN = \OC_LDAP::username2dn($uid);
+		$userDN = $this->username2dn($uid);
 		if(!$userDN) {
 			$this->_user_groups[$uid] = array();
 			return array();
 		}
 
 		//uniqueMember takes DN, memberuid the uid, so we need to distinguish
-		if((strtolower($this->ldapGroupMemberAssocAttr) == 'uniquemember')
-			|| (strtolower($this->ldapGroupMemberAssocAttr) == 'member')) {
+		if((strtolower($this->connection->ldapGroupMemberAssocAttr) == 'uniquemember')
+			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')) {
 			$uid = $userDN;
-		} else if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
-			$result = \OC_LDAP::readAttribute($userDN, 'uid');
+		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+			$result = $this->readAttribute($userDN, 'uid');
 			$uid = $result[0];
 		} else {
 			// just in case
 			$uid = $userDN;
 		}
 
-		$filter = \OC_LDAP::combineFilterWithAnd(array(
-			$this->ldapGroupFilter,
-			$this->ldapGroupMemberAssocAttr.'='.$uid
+		$filter = $this->combineFilterWithAnd(array(
+			$this->connection->ldapGroupFilter,
+			$this->connection->ldapGroupMemberAssocAttr.'='.$uid
 		));
-		$groups = \OC_LDAP::fetchListOfGroups($filter, array(\OC_LDAP::conf('ldapGroupDisplayName'),'dn'));
-		$this->_user_groups[$uid] = array_unique(\OC_LDAP::ownCloudGroupNames($groups), SORT_LOCALE_STRING);
+		$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn'));
+		$this->_user_groups[$uid] = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
 
 		return $this->_user_groups[$uid];
 	}
@@ -137,38 +134,38 @@ class GROUP_LDAP implements \OCP\GroupInterface {
 	 * @returns array with user ids
 	 */
 	public function usersInGroup($gid) {
-		if(!$this->configured) {
+		if(!$this->enabled) {
 			return array();
 		}
 		if(isset($this->_group_users[$gid])) {
 			return $this->_group_users[$gid];
 		}
 
-		$groupDN = \OC_LDAP::groupname2dn($gid);
+		$groupDN = $this->groupname2dn($gid);
 		if(!$groupDN) {
 			$this->_group_users[$gid] = array();
 			return array();
 		}
 
-		$members = \OC_LDAP::readAttribute($groupDN, $this->ldapGroupMemberAssocAttr);
+		$members = $this->readAttribute($groupDN, $this->connection->ldapGroupMemberAssocAttr);
 		if(!$members) {
 			$this->_group_users[$gid] = array();
 			return array();
 		}
 
 		$result = array();
-		$isMemberUid = (strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid');
+		$isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid');
 		foreach($members as $member) {
 			if($isMemberUid) {
-				$filter = \OCP\Util::mb_str_replace('%uid', $member, \OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
-				$ldap_users = \OC_LDAP::fetchListOfUsers($filter, 'dn');
+				$filter = \OCP\Util::mb_str_replace('%uid', $member, $this->connection->ldapLoginFilter, 'UTF-8');
+				$ldap_users = $this->fetchListOfUsers($filter, 'dn');
 				if(count($ldap_users) < 1) {
 					continue;
 				}
-				$result[] = \OC_LDAP::dn2username($ldap_users[0]);
+				$result[] = $this->dn2username($ldap_users[0]);
 				continue;
 			} else {
-				if($ocname = \OC_LDAP::dn2username($member)){
+				if($ocname = $this->dn2username($member)){
 					$result[] = $ocname;
 				}
 			}
@@ -187,12 +184,12 @@ class GROUP_LDAP implements \OCP\GroupInterface {
 	 * Returns a list with all groups
 	 */
 	public function getGroups() {
-		if(!$this->configured) {
+		if(!$this->enabled) {
 			return array();
 		}
 		if(empty($this->_groups)) {
-			$ldap_groups = \OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(\OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
-			$this->_groups = \OC_LDAP::ownCloudGroupNames($ldap_groups);
+			$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
+			$this->_groups = $this->ownCloudGroupNames($ldap_groups);
 		}
 		return $this->_groups;
 	}
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib/access.php
similarity index 50%
rename from apps/user_ldap/lib_ldap.php
rename to apps/user_ldap/lib/access.php
index 08b09304d7..eef471f159 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib/access.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ownCloud – LDAP lib
+ * ownCloud – LDAP Access
  *
  * @author Arthur Schiwon
  * @copyright 2012 Arthur Schiwon blizzz@owncloud.com
@@ -21,88 +21,82 @@
  *
  */
 
-define('LDAP_GROUP_MEMBER_ASSOC_ATTR','uniqueMember');
-define('LDAP_GROUP_DISPLAY_NAME_ATTR','cn');
+namespace OCA\user_ldap\lib;
 
-//needed to unbind, because we use OC_LDAP only statically
-class OC_LDAP_DESTRUCTOR {
-	public function __destruct() {
-		OC_LDAP::destruct();
-	}
-}
+abstract class Access {
+	protected $connection;
 
-class OC_LDAP {
-	static protected $ldapConnectionRes = false;
-	static protected $configured = false;
-
-	//cached settings
-	static protected $ldapHost;
-	static protected $ldapPort;
-	static protected $ldapBase;
-	static protected $ldapBaseUsers;
-	static protected $ldapBaseGroups;
-	static protected $ldapAgentName;
-	static protected $ldapAgentPassword;
-	static protected $ldapTLS;
-	static protected $ldapNoCase;
-	static protected $ldapIgnoreNamingRules;
-	// user and group settings, that are needed in both backends
-	static protected $ldapUserDisplayName;
-	static protected $ldapUserFilter;
-	static protected $ldapGroupDisplayName;
-	static protected $ldapLoginFilter;
-
-	static protected $__d;
-
-	/**
-	 * @brief initializes the LDAP backend
-	 * @param $force read the config settings no matter what
-	 *
-	 * initializes the LDAP backend
-	 */
-	static public function init($force = false) {
-		if(is_null(self::$__d)) {
-			self::$__d = new OC_LDAP_DESTRUCTOR();
-		}
-		self::readConfiguration($force);
-		self::establishConnection();
+	public function setConnector(Connection &$connection) {
+		$this->connection = $connection;
 	}
 
-	static public function destruct() {
-		@ldap_unbind(self::$ldapConnectionRes);
+	private function checkConnection() {
+		return ($this->connection instanceof Connection);
 	}
 
 	/**
-	 * @brief returns a read-only configuration value
-	 * @param $key the name of the configuration value
-	 * @returns the value on success, otherwise null
+	 * @brief reads a given attribute for an LDAP record identified by a DN
+	 * @param $dn the record in question
+	 * @param $attr the attribute that shall be retrieved
+	 * @returns the values in an array on success, false otherwise
 	 *
-	 * returns a read-only configuration values
-	 *
-	 * we cannot work with getters, because it is a static class
+	 * Reads an attribute from an LDAP entry
 	 */
-	static public function conf($key) {
-		if(!self::$configured) {
-			self::init();
+	public function readAttribute($dn, $attr) {
+		if(!$this->checkConnection()) {
+			\OCP\Util::writeLog('user_ldap', 'No LDAP Connector assigned, access impossible for readAttribute.', \OCP\Util::WARN);
+			return false;
 		}
+		$cr = $this->connection->getConnectionResource();
+		$rr = ldap_read($cr, $dn, 'objectClass=*', array($attr));
+		$er = ldap_first_entry($cr, $rr);
+		//LDAP attributes are not case sensitive
+		$result = \OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
+		$attr = mb_strtolower($attr, 'UTF-8');
 
-		$availableProperties = array(
-			'ldapUserDisplayName',
-			'ldapGroupDisplayName',
-			'ldapLoginFilter'
+		if(isset($result[$attr]) && $result[$attr]['count'] > 0){
+			$values = array();
+			for($i=0;$i<$result[$attr]['count'];$i++) {
+				$values[] = $this->resemblesDN($attr) ? $this->sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
+			}
+			return $values;
+		}
+		return false;
+	}
+
+	/**
+	 * @brief checks wether the given attribute`s valua is probably a DN
+	 * @param $attr the attribute in question
+	 * @return if so true, otherwise false
+	 */
+	private function resemblesDN($attr) {
+		$resemblingAttributes = array(
+			'dn',
+			'uniquemember',
+			'member'
 		);
+		return in_array($attr, $resemblingAttributes);
+	}
 
-		if(in_array($key, $availableProperties)) {
-			return self::$$key;
-		}
+	/**
+	 * @brief sanitizes a DN received from the LDAP server
+	 * @param $dn the DN in question
+	 * @return the sanitized DN
+	 */
+	private function sanitizeDN($dn) {
+		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
+		$dn = preg_replace('/([^\\\]),(\s+)/u','\1,',$dn);
 
-		return null;
+		//make comparisons and everything work
+		$dn = mb_strtolower($dn, 'UTF-8');
+
+		return $dn;
 	}
 
 	/**
 	 * gives back the database table for the query
 	 */
-	static private function getMapTable($isUser) {
+	private function getMapTable($isUser) {
 		if($isUser) {
 			return '*PREFIX*ldap_user_mapping';
 		} else {
@@ -117,8 +111,8 @@ class OC_LDAP {
 	 *
 	 * returns the LDAP DN for the given internal ownCloud name of the group
 	 */
-	static public function groupname2dn($name) {
-		return self::ocname2dn($name, false);
+	public function groupname2dn($name) {
+		return $this->ocname2dn($name, false);
 	}
 
 	/**
@@ -128,20 +122,19 @@ class OC_LDAP {
 	 *
 	 * returns the LDAP DN for the given internal ownCloud name of the user
 	 */
-	static public function username2dn($name) {
-		$dn = self::ocname2dn($name, true);
+	public function username2dn($name) {
+		$dn = $this->ocname2dn($name, true);
 		if($dn) {
 			return $dn;
 		} else {
 			//fallback: user is not mapped
-			self::init();
-			$filter = self::combineFilterWithAnd(array(
-				self::$ldapUserFilter,
-				self::$ldapUserDisplayName . '=' . $name,
+			$filter = $this->combineFilterWithAnd(array(
+				$this->connection->ldapUserFilter,
+				$this->connection->ldapUserDisplayName . '=' . $name,
 			));
-			$result = self::searchUsers($filter, 'dn');
+			$result = $this->searchUsers($filter, 'dn');
 			if(isset($result[0]['dn'])) {
-				self::mapUser($result[0], $name);
+				$this->mapComponent($result[0], $name, true);
 				return $result[0];
 			}
 		}
@@ -149,10 +142,18 @@ class OC_LDAP {
 		return false;
 	}
 
-	static private function ocname2dn($name, $isUser) {
-		$table = self::getMapTable($isUser);
+	/**
+	 * @brief returns the LDAP DN for the given internal ownCloud name
+	 * @param $name the ownCloud name in question
+	 * @param $isUser is it a user? otherwise group
+	 * @returns string with the LDAP DN on success, otherwise false
+	 *
+	 * returns the LDAP DN for the given internal ownCloud name
+	 */
+	private function ocname2dn($name, $isUser) {
+		$table = $this->getMapTable($isUser);
 
-		$query = OCP\DB::prepare('
+		$query = \OCP\DB::prepare('
 			SELECT ldap_dn
 			FROM '.$table.'
 			WHERE owncloud_name = ?
@@ -170,11 +171,11 @@ class OC_LDAP {
 	 *
 	 * returns the internal ownCloud name for the given LDAP DN of the group
 	 */
-	static public function dn2groupname($dn, $ldapname = null) {
-		if(mb_strripos($dn, self::$ldapBaseGroups, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen(self::$ldapBaseGroups, 'UTF-8'))) {
+	public function dn2groupname($dn, $ldapname = null) {
+		if(mb_strripos($dn, $this->connection->ldapBaseGroups, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseGroups, 'UTF-8'))) {
 			return false;
 		}
-		return self::dn2ocname($dn, $ldapname, false);
+		return $this->dn2ocname($dn, $ldapname, false);
 	}
 
 	/**
@@ -185,23 +186,32 @@ class OC_LDAP {
 	 *
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
 	 */
-	static public function dn2username($dn, $ldapname = null) {
-		if(mb_strripos($dn, self::$ldapBaseUsers, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen(self::$ldapBaseUsers, 'UTF-8'))) {
+	public function dn2username($dn, $ldapname = null) {
+		if(mb_strripos($dn, $this->connection->ldapBaseUsers, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseUsers, 'UTF-8'))) {
 			return false;
 		}
-		return self::dn2ocname($dn, $ldapname, true);
+		return $this->dn2ocname($dn, $ldapname, true);
 	}
 
-	static public function dn2ocname($dn, $ldapname = null, $isUser = true) {
-		$dn = self::sanitizeDN($dn);
-		$table = self::getMapTable($isUser);
+	/**
+	 * @brief returns an internal ownCloud name for the given LDAP DN
+	 * @param $dn the dn of the user object
+	 * @param $ldapname optional, the display name of the object
+	 * @param $isUser optional, wether it is a user object (otherwise group assumed)
+	 * @returns string with with the name to use in ownCloud
+	 *
+	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
+	 */
+	public function dn2ocname($dn, $ldapname = null, $isUser = true) {
+		$dn = $this->sanitizeDN($dn);
+		$table = $this->getMapTable($isUser);
 		if($isUser) {
-			$nameAttribute = self::conf('ldapUserDisplayName');
+			$nameAttribute = $this->connection->ldapUserDisplayName;
 		} else {
-			$nameAttribute = self::conf('ldapGroupDisplayName');
+			$nameAttribute = $this->connection->ldapGroupDisplayName;
 		}
 
-		$query = OCP\DB::prepare('
+		$query = \OCP\DB::prepare('
 			SELECT owncloud_name
 			FROM '.$table.'
 			WHERE ldap_dn = ?
@@ -213,22 +223,23 @@ class OC_LDAP {
 		}
 
 		if(is_null($ldapname)) {
-			$ldapname = self::readAttribute($dn, $nameAttribute);
+			$ldapname = $this->readAttribute($dn, $nameAttribute);
 			$ldapname = $ldapname[0];
 		}
-		$ldapname = self::sanitizeUsername($ldapname);
+		$ldapname = $this->sanitizeUsername($ldapname);
 
 		//a new user/group! Then let's try to add it. We're shooting into the blue with the user/group name, assuming that in most cases there will not be a conflict. Otherwise an error will occur and we will continue with our second shot.
-		if(self::mapComponent($dn, $ldapname, $isUser)) {
+		if($this->mapComponent($dn, $ldapname, $isUser)) {
 			return $ldapname;
 		}
 
 		//doh! There is a conflict. We need to distinguish between users/groups. Adding indexes is an idea, but not much of a help for the user. The DN is ugly, but for now the only reasonable way. But we transform it to a readable format and remove the first part to only give the path where this object is located.
-		$oc_name = self::alternateOwnCloudName($ldapname, $dn);
-		if(self::mapComponent($dn, $oc_name, $isUser)) {
+		$oc_name = $this->alternateOwnCloudName($ldapname, $dn);
+		if($this->mapComponent($dn, $oc_name, $isUser)) {
 			return $oc_name;
 		}
 
+		//TODO: do not simple die away!
 		//and this of course should never been thrown :)
 		throw new Exception('LDAP backend: unexpected collision of DN and ownCloud Name.');
 	}
@@ -240,8 +251,8 @@ class OC_LDAP {
 	 *
 	 * gives back the user names as they are used ownClod internally
 	 */
-	static public function ownCloudUserNames($ldapUsers) {
-		return self::ldap2ownCloudNames($ldapUsers, true);
+	public function ownCloudUserNames($ldapUsers) {
+		return $this->ldap2ownCloudNames($ldapUsers, true);
 	}
 
 	/**
@@ -251,22 +262,26 @@ class OC_LDAP {
 	 *
 	 * gives back the group names as they are used ownClod internally
 	 */
-	static public function ownCloudGroupNames($ldapGroups) {
-		return self::ldap2ownCloudNames($ldapGroups, false);
+	public function ownCloudGroupNames($ldapGroups) {
+		return $this->ldap2ownCloudNames($ldapGroups, false);
 	}
 
-	static private function ldap2ownCloudNames($ldapObjects, $isUsers) {
+	private function ldap2ownCloudNames($ldapObjects, $isUsers) {
 		if($isUsers) {
-			$knownObjects = self::mappedUsers();
-			$nameAttribute = self::conf('ldapUserDisplayName');
+			$knownObjects = $this->mappedUsers();
+			$nameAttribute = $this->connection->ldapUserDisplayName;
 		} else {
-			$knownObjects = self::mappedGroups();
-			$nameAttribute = self::conf('ldapGroupDisplayName');
+			$knownObjects = $this->mappedGroups();
+			$nameAttribute = $this->connection->ldapGroupDisplayName;
 		}
 		$ownCloudNames = array();
 
 		foreach($ldapObjects as $ldapObject) {
-			$key = self::recursiveArraySearch($knownObjects, $ldapObject['dn']);
+// if(!isset($ldapObject['dn'])) {
+// 	print("<pre>");
+// 	die(var_dump($ldapObjects));
+// }
+			$key = \OCP\Util::recursiveArraySearch($knownObjects, $ldapObject['dn']);
 
 			//everything is fine when we know the group
 			if($key !== false) {
@@ -275,19 +290,20 @@ class OC_LDAP {
 			}
 
 			//a new group! Then let's try to add it. We're shooting into the blue with the group name, assuming that in most cases there will not be a conflict. But first make sure, that the display name contains only allowed characters.
-			$ocname = self::sanitizeUsername($ldapObject[$nameAttribute]);
-			if(self::mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
+			$ocname = $this->sanitizeUsername($ldapObject[$nameAttribute]);
+			if($this->mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
 				$ownCloudNames[] = $ocname;
 				continue;
 			}
 
 			//doh! There is a conflict. We need to distinguish between groups. Adding indexes is an idea, but not much of a help for the user. The DN is ugly, but for now the only reasonable way. But we transform it to a readable format and remove the first part to only give the path where this entry is located.
-			$ocname = self::alternateOwnCloudName($ocname, $ldapObject['dn']);
-			if(self::mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
+			$ocname = $this->alternateOwnCloudName($ocname, $ldapObject['dn']);
+			if($this->mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
 				$ownCloudNames[] = $ocname;
 				continue;
 			}
 
+			//TODO: do not simple die away
 			//and this of course should never been thrown :)
 			throw new Exception('LDAP backend: unexpected collision of DN and ownCloud Name.');
 		}
@@ -302,10 +318,10 @@ class OC_LDAP {
 	 *
 	 * creates a hopefully unique name for owncloud based on the display name and the dn of the LDAP object
 	 */
-	static private function alternateOwnCloudName($name, $dn) {
+	private function alternateOwnCloudName($name, $dn) {
 		$ufn = ldap_dn2ufn($dn);
-		$name = $name . '@' . trim(OCP\Util::mb_substr_replace($ufn, '', 0, mb_strpos($ufn, ',', 0, 'UTF-8'), 'UTF-8'));
-		$name = self::sanitizeUsername($name);
+		$name = $name . '@' . trim(\OCP\Util::mb_substr_replace($ufn, '', 0, mb_strpos($ufn, ',', 0, 'UTF-8'), 'UTF-8'));
+		$name = $this->sanitizeUsername($name);
 		return $name;
 	}
 
@@ -315,8 +331,8 @@ class OC_LDAP {
 	 *
 	 * retrieves all known groups from the mappings table
 	 */
-	static private function mappedGroups() {
-		return self::mappedComponents(false);
+	private function mappedGroups() {
+		return $this->mappedComponents(false);
 	}
 
 	/**
@@ -325,14 +341,14 @@ class OC_LDAP {
 	 *
 	 * retrieves all known users from the mappings table
 	 */
-	static private function mappedUsers() {
-		return self::mappedComponents(true);
+	private function mappedUsers() {
+		return $this->mappedComponents(true);
 	}
 
-	static private function mappedComponents($isUsers) {
-		$table = self::getMapTable($isUsers);
+	private function mappedComponents($isUsers) {
+		$table = $this->getMapTable($isUsers);
 
-		$query = OCP\DB::prepare('
+		$query = \OCP\DB::prepare('
 			SELECT ldap_dn, owncloud_name
 			FROM '. $table
 		);
@@ -349,17 +365,17 @@ class OC_LDAP {
 	 *
 	 * inserts a new user or group into the mappings table
 	 */
-	static private function mapComponent($dn, $ocname, $isUser = true) {
-		$table = self::getMapTable($isUser);
-		$dn = self::sanitizeDN($dn);
+	private function mapComponent($dn, $ocname, $isUser = true) {
+		$table = $this->getMapTable($isUser);
+		$dn = $this->sanitizeDN($dn);
 
 		$sqlAdjustment = '';
-		$dbtype = OCP\Config::getSystemValue('dbtype');
+		$dbtype = \OCP\Config::getSystemValue('dbtype');
 		if($dbtype == 'mysql') {
 			$sqlAdjustment = 'FROM dual';
 		}
 
-		$insert = OCP\DB::prepare('
+		$insert = \OCP\DB::prepare('
 			INSERT INTO '.$table.' (ldap_dn, owncloud_name)
 				SELECT ?,?
 				'.$sqlAdjustment.'
@@ -372,7 +388,7 @@ class OC_LDAP {
 
 		$res = $insert->execute(array($dn, $ocname, $dn, $ocname));
 
-		if(OCP\DB::isError($res)) {
+		if(\OCP\DB::isError($res)) {
 			return false;
 		}
 
@@ -385,15 +401,15 @@ class OC_LDAP {
 		return true;
 	}
 
-	static public function fetchListOfUsers($filter, $attr) {
-		return self::fetchList(OC_LDAP::searchUsers($filter, $attr), (count($attr) > 1));
+	public function fetchListOfUsers($filter, $attr) {
+		return $this->fetchList($this->searchUsers($filter, $attr), (count($attr) > 1));
 	}
 
-	static public function fetchListOfGroups($filter, $attr) {
-		return self::fetchList(OC_LDAP::searchGroups($filter, $attr), (count($attr) > 1));
+	public function fetchListOfGroups($filter, $attr) {
+		return $this->fetchList($this->searchGroups($filter, $attr), (count($attr) > 1));
 	}
 
-	static private function fetchList($list, $manyAttributes) {
+	private function fetchList($list, $manyAttributes) {
 		if(is_array($list)) {
 			if($manyAttributes) {
 				return $list;
@@ -406,32 +422,6 @@ class OC_LDAP {
 		return array();
 	}
 
-	/**
-	 * @brief reads a given attribute for an LDAP record identified by a DN
-	 * @param $dn the record in question
-	 * @param $attr the attribute that shall be retrieved
-	 * @returns the values in an array on success, false otherwise
-	 *
-	 * Reads an attribute from an LDAP entry
-	 */
-	static public function readAttribute($dn, $attr) {
-		$cr = self::getConnectionResource();
-		$rr = ldap_read($cr, $dn, 'objectClass=*', array($attr));
-		$er = ldap_first_entry($cr, $rr);
-		//LDAP attributes are not case sensitive
-		$result = OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
-		$attr = mb_strtolower($attr, 'UTF-8');
-
-		if(isset($result[$attr]) && $result[$attr]['count'] > 0){
-			$values = array();
-			for($i=0;$i<$result[$attr]['count'];$i++) {
-				$values[] = self::resemblesDN($attr) ? self::sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
-			}
-			return $values;
-		}
-		return false;
-	}
-
 	/**
 	 * @brief executes an LDAP search, optimized for Users
 	 * @param $filter the LDAP filter for the search
@@ -440,9 +430,8 @@ class OC_LDAP {
 	 *
 	 * Executes an LDAP search
 	 */
-	static public function searchUsers($filter, $attr = null) {
-		self::init();
-		return self::search($filter, self::$ldapBaseUsers, $attr);
+	public function searchUsers($filter, $attr = null) {
+		return $this->search($filter, $this->connection->ldapBaseUsers, $attr);
 	}
 
 	/**
@@ -453,9 +442,8 @@ class OC_LDAP {
 	 *
 	 * Executes an LDAP search
 	 */
-	static public function searchGroups($filter, $attr = null) {
-		self::init();
-		return self::search($filter, self::$ldapBaseGroups, $attr);
+	public function searchGroups($filter, $attr = null) {
+		return $this->search($filter, $this->connection->ldapBaseGroups, $attr);
 	}
 
 	/**
@@ -467,13 +455,13 @@ class OC_LDAP {
 	 *
 	 * Executes an LDAP search
 	 */
-	static private function search($filter, $base, $attr = null) {
+	private function search($filter, $base, $attr = null) {
 		if(!is_null($attr) && !is_array($attr)) {
 			$attr = array(mb_strtolower($attr, 'UTF-8'));
 		}
 
 		// See if we have a resource
-		$link_resource = self::getConnectionResource();
+		$link_resource = $this->connection->getConnectionResource();
 		if(is_resource($link_resource)) {
 			$sr = ldap_search($link_resource, $base, $filter, $attr);
 			$findings = ldap_get_entries($link_resource, $sr );
@@ -486,6 +474,7 @@ class OC_LDAP {
 		} else {
 			// Seems like we didn't find any resource.
 			// Return an empty array just like before.
+			\OCP\Util::writeLog('user_ldap', 'Could not search, because resource is missing.', \OCP\Util::DEBUG);
 			return array();
 		}
 
@@ -500,16 +489,16 @@ class OC_LDAP {
 				if(!is_array($item)) {
 					continue;
 				}
-				$item = OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8');
+				$item = \OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8');
 
 				if($multiarray) {
 					foreach($attr as $key) {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
 							if($key != 'dn'){
-								$selection[$i][$key] = self::resemblesDN($key) ? self::sanitizeDN($item[$key][0]) : $item[$key][0];
+								$selection[$i][$key] = $this->resemblesDN($key) ? $this->sanitizeDN($item[$key][0]) : $item[$key][0];
 							} else {
-								$selection[$i][$key] = self::sanitizeDN($item[$key]);
+								$selection[$i][$key] = $this->sanitizeDN($item[$key]);
 							}
 						}
 
@@ -520,47 +509,26 @@ class OC_LDAP {
 					$key = mb_strtolower($attr[0], 'UTF-8');
 
 					if(isset($item[$key])) {
-						if(self::resemblesDN($key)) {
-							$selection[] = self::sanitizeDN($item[$key]);
+						if($this->resemblesDN($key)) {
+							$selection[] = $this->sanitizeDN($item[$key]);
 						} else {
 							$selection[] = $item[$key];
 						}
 					}
 				}
-
 			}
 			return $selection;
 		}
-
 		return $findings;
 	}
 
-	static private function resemblesDN($attr) {
-		$resemblingAttributes = array(
-			'dn',
-			'uniquemember',
-			'member'
-		);
-		return in_array($attr, $resemblingAttributes);
-	}
-
-	static private function sanitizeDN($dn) {
-		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
-		$dn = preg_replace('/([^\\\]),(\s+)/u','\1,',$dn);
-
-		//make comparisons and everything work
-		$dn = mb_strtolower($dn, 'UTF-8');
-
-		return $dn;
-	}
-
-	static private function sanitizeUsername($name) {
-		if(self::$ldapIgnoreNamingRules) {
+	public function sanitizeUsername($name) {
+		if($this->connection->ldapIgnoreNamingRules) {
 			return $name;
 		}
 
 		//REPLACEMENTS
-		$name = OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
+		$name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
 
 		//every remaining unallowed characters will be removed
 		$name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name);
@@ -575,8 +543,8 @@ class OC_LDAP {
 	 *
 	 * Combines Filter arguments with AND
 	 */
-	static public function combineFilterWithAnd($filters) {
-		return self::combineFilter($filters,'&');
+	public function combineFilterWithAnd($filters) {
+		return $this->combineFilter($filters,'&');
 	}
 
 	/**
@@ -586,8 +554,8 @@ class OC_LDAP {
 	 *
 	 * Combines Filter arguments with AND
 	 */
-	static public function combineFilterWithOr($filters) {
-		return self::combineFilter($filters,'|');
+	public function combineFilterWithOr($filters) {
+		return $this->combineFilter($filters,'|');
 	}
 
 	/**
@@ -598,7 +566,7 @@ class OC_LDAP {
 	 *
 	 * Combines Filter arguments with AND
 	 */
-	static private function combineFilter($filters, $operator) {
+	private function combineFilter($filters, $operator) {
 		$combinedFilter = '('.$operator;
 		foreach($filters as $filter) {
 		    if($filter[0] != '(') {
@@ -610,112 +578,15 @@ class OC_LDAP {
 		return $combinedFilter;
 	}
 
-	/**
-	 * Returns the LDAP handler
-	 */
-	static private function getConnectionResource() {
-		if(!self::$ldapConnectionRes) {
-			self::init();
-		}
-		if(is_null(self::$ldapConnectionRes)) {
-			OCP\Util::writeLog('ldap', 'Connection could not be established', OCP\Util::INFO);
-		}
-		return self::$ldapConnectionRes;
-	}
-
-	/**
-	 * Caches the general LDAP configuration.
-	 */
-	static private function readConfiguration($force = false) {
-		if(!self::$configured || $force) {
-			self::$ldapHost              = OCP\Config::getAppValue('user_ldap', 'ldap_host', '');
-			self::$ldapPort              = OCP\Config::getAppValue('user_ldap', 'ldap_port', 389);
-			self::$ldapAgentName         = OCP\Config::getAppValue('user_ldap', 'ldap_dn','');
-			self::$ldapAgentPassword     = base64_decode(OCP\Config::getAppValue('user_ldap', 'ldap_agent_password',''));
-			self::$ldapBase              = OCP\Config::getAppValue('user_ldap', 'ldap_base', '');
-			self::$ldapBaseUsers         = OCP\Config::getAppValue('user_ldap', 'ldap_base_users',self::$ldapBase);
-			self::$ldapBaseGroups        = OCP\Config::getAppValue('user_ldap', 'ldap_base_groups', self::$ldapBase);
-			self::$ldapTLS               = OCP\Config::getAppValue('user_ldap', 'ldap_tls',0);
-			self::$ldapNoCase            = OCP\Config::getAppValue('user_ldap', 'ldap_nocase', 0);
-			self::$ldapUserDisplayName   = mb_strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_display_name', 'uid'), 'UTF-8');
-			self::$ldapUserFilter        = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter','objectClass=person');
-			self::$ldapLoginFilter       = OCP\Config::getAppValue('user_ldap', 'ldap_login_filter', '(uid=%uid)');
-			self::$ldapGroupDisplayName  = mb_strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR), 'UTF-8');
-			self::$ldapIgnoreNamingRules = OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
-
-			if(empty(self::$ldapBaseUsers)) {
-				OCP\Util::writeLog('ldap', 'Base for Users is empty, using Base DN', OCP\Util::INFO);
-				self::$ldapBaseUsers = self::$ldapBase;
-			}
-			if(empty(self::$ldapBaseGroups)) {
-				OCP\Util::writeLog('ldap', 'Base for Groups is empty, using Base DN', OCP\Util::INFO);
-				self::$ldapBaseGroups = self::$ldapBase;
-			}
-
-			if(
-				   !empty(self::$ldapHost)
-				&& !empty(self::$ldapPort)
-				&& (
-					   (!empty(self::$ldapAgentName) && !empty(self::$ldapAgentPassword))
-					|| ( empty(self::$ldapAgentName) &&  empty(self::$ldapAgentPassword))
-				)
-				&& !empty(self::$ldapBase)
-				&& !empty(self::$ldapUserDisplayName)
-			)
-			{
-				self::$configured = true;
-			}
-		}
-	}
-
-	/**
-	 * Connects and Binds to LDAP
-	 */
-	static private function establishConnection() {
-		if(!self::$configured) {
-			OCP\Util::writeLog('ldap', 'Configuration is invalid, cannot connect', OCP\Util::INFO);
+	public function areCredentialsValid($name, $password) {
+		$testConnection = clone $this->connection;
+		$credentials = array(
+			'ldapAgentName' => $name,
+			'ldapAgentPassword' => $password
+		);
+		if(!$testConnection->setConfiguration($credentials)) {
 			return false;
 		}
-		if(!self::$ldapConnectionRes) {
-			self::$ldapConnectionRes = ldap_connect(self::$ldapHost, self::$ldapPort);
-			if(ldap_set_option(self::$ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
-					if(ldap_set_option(self::$ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
-						if(self::$ldapTLS) {
-							ldap_start_tls(self::$ldapConnectionRes);
-						}
-					}
-			}
-
-			$ldapLogin = @ldap_bind(self::$ldapConnectionRes, self::$ldapAgentName, self::$ldapAgentPassword );
-			if(!$ldapLogin) {
-				OCP\Util::writeLog('ldap', 'Bind failed: ' . ldap_errno(self::$ldapConnectionRes) . ': ' . ldap_error(self::$ldapConnectionRes), OCP\Util::ERROR);
-				self::$ldapConnectionRes = null;
-				return false;
-			}
-		}
+		return $testConnection->bind();
 	}
-
-	static public function areCredentialsValid($name, $password) {
-		return @ldap_bind(self::getConnectionResource(), $name, $password);
-	}
-
-	/**
-	* taken from http://www.php.net/manual/en/function.array-search.php#97645
-	* TODO: move somewhere, where its better placed since it is not LDAP specific. OC_Helper maybe?
-	*/
-	static public function recursiveArraySearch($haystack, $needle, $index = null) {
-		$aIt = new RecursiveArrayIterator($haystack);
-		$it = new RecursiveIteratorIterator($aIt);
-
-		while($it->valid()) {
-			if (((isset($index) AND ($it->key() == $index)) OR (!isset($index))) AND ($it->current() == $needle)) {
-				return $aIt->key();
-			}
-
-			$it->next();
-		}
-
-		return false;
-	}
-
- }
+}
\ No newline at end of file
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
new file mode 100644
index 0000000000..44b1c20214
--- /dev/null
+++ b/apps/user_ldap/lib/connection.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * ownCloud – LDAP Access
+ *
+ * @author Arthur Schiwon
+ * @copyright 2012 Arthur Schiwon blizzz@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/>.
+ *
+ */
+
+namespace OCA\user_ldap\lib;
+
+class Connection {
+	private $ldapConnectionRes = null;
+	private $configID;
+	private $configured = false;
+
+	//cached settings
+	protected $config = array(
+		'ldapHost' => null,
+		'ldapPort' => null,
+		'ldapBase' => null,
+		'ldapBaseUsers' => null,
+		'ldapBaseGroups' => null,
+		'ldapAgentName' => null,
+		'ldapAgentPassword' => null,
+		'ldapTLS' => null,
+		'ldapNoCase' => null,
+		'ldapIgnoreNamingRules' => null,
+		'ldapUserDisplayName' => null,
+		'ldapUserFilter' => null,
+		'ldapGroupFilter' => null,
+		'ldapGroupDisplayName' => null,
+		'ldapLoginFilter' => null,
+		'ldapQuotaAttribute' => null,
+		'ldapQuotaDefault' => null,
+		'ldapEmailAttribute' => null,
+	);
+
+	public function __construct($configID = 'user_ldap') {
+		$this->configID = $configID;
+	}
+
+	public function __destruct() {
+		@ldap_unbind($this->ldapConnectionRes);
+	}
+
+	public function __get($name) {
+		if(!$this->configured) {
+			$this->readConfiguration();
+		}
+
+		if(isset($this->config[$name])) {
+			return $this->config[$name];
+		}
+	}
+
+	/**
+	 * @brief initializes the LDAP backend
+	 * @param $force read the config settings no matter what
+	 *
+	 * initializes the LDAP backend
+	 */
+	public function init($force = false) {
+		$this->readConfiguration($force);
+		$this->establishConnection();
+	}
+
+	/**
+	 * Returns the LDAP handler
+	 */
+	public function getConnectionResource() {
+		if(!$this->ldapConnectionRes) {
+			$this->init();
+		}
+		if(is_null($this->ldapConnectionRes)) {
+			\OCP\Util::writeLog('user_ldap', 'Connection could not be established', \OCP\Util::ERROR);
+		}
+		return $this->ldapConnectionRes;
+	}
+
+	/**
+	 * Caches the general LDAP configuration.
+	 */
+	private function readConfiguration($force = false) {
+		\OCP\Util::writeLog('user_ldap','Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG);
+		if((!$this->configured || $force) && !is_null($this->configID)) {
+			\OCP\Util::writeLog('user_ldap','Reading the configuration', \OCP\Util::DEBUG);
+			$this->config['ldapHost']              = \OCP\Config::getAppValue($this->configID, 'ldap_host', '');
+			$this->config['ldapPort']              = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389);
+			$this->config['ldapAgentName']         = \OCP\Config::getAppValue($this->configID, 'ldap_dn','');
+			$this->config['ldapAgentPassword']     = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password',''));
+			$this->config['ldapBase']              = \OCP\Config::getAppValue($this->configID, 'ldap_base', '');
+			$this->config['ldapBaseUsers']         = \OCP\Config::getAppValue($this->configID, 'ldap_base_users',$this->config['ldapBase']);
+			$this->config['ldapBaseGroups']        = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']);
+			$this->config['ldapTLS']               = \OCP\Config::getAppValue($this->configID, 'ldap_tls',0);
+			$this->config['ldapNoCase']            = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
+			$this->config['ldapUserDisplayName']   = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8');
+			$this->config['ldapUserFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person');
+			$this->config['ldapGroupFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
+			$this->config['ldapLoginFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)');
+			$this->config['ldapGroupDisplayName']  = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR), 'UTF-8');
+			$this->config['ldapQuotaAttribute']    = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', '');
+			$this->config['ldapQuotaDefault']      = \OCP\Config::getAppValue($this->configID, 'ldap_quota_def', '');
+			$this->config['ldapEmailAttribute']      = \OCP\Config::getAppValue($this->configID, 'ldap_email_attr', '');
+			$this->config['ldapGroupMemberAssocAttr']      = \OCP\Config::getAppValue($this->configID, 'ldap_group_member_assoc_attribute', 'uniqueMember');
+			$this->config['ldapIgnoreNamingRules'] = \OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
+
+			$this->configured = $this->validateConfiguration();
+		}
+	}
+
+	/**
+	 * @brief set LDAP configuration with values delivered by an array, not read from configuration
+	 * @param $config array that holds the config parameters in an associated array
+	 * @param &$setParameters optional; array where the set fields will be given to
+	 * @return true if config validates, false otherwise. Check with $setParameters for detailed success on single parameters
+	 */
+	public function setConfiguration($config, &$setParameters = null) {
+		if(!is_array($config)) {
+			return false;
+		}
+
+		foreach($config as $parameter => $value) {
+		    if(isset($this->config[$parameter])) {
+				$this->config[$parameter] = $value;
+				if(is_array($setParameters)) {
+					$setParameters[] = $parameter;
+				}
+		    }
+		}
+
+		$this->configured = $this->validateConfiguration();
+
+		return $this->configured;
+	}
+
+	/**
+	 * @brief Validates the user specified configuration
+	 * @returns true if configuration seems OK, false otherwise
+	 */
+	private function validateConfiguration() {
+		//first step: "soft" checks: settings that are not really necessary, but advisable. If left empty, give an info message
+		if(empty($this->config['ldapBaseUsers'])) {
+			\OCP\Util::writeLog('user_ldap', 'Base tree for Users is empty, using Base DN', \OCP\Util::INFO);
+			$this->config['ldapBaseUsers'] = $this->config['ldapBase'];
+		}
+		if(empty($this->config['ldapBaseGroups'])) {
+			\OCP\Util::writeLog('user_ldap', 'Base tree for Groups is empty, using Base DN', \OCP\Util::INFO);
+			$this->config['ldapBaseGroups'] = $this->config['ldapBase'];
+		}
+		if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
+			\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
+		}
+
+		//second step: critical checks. If left empty or filled wrong, set as unconfigured and give a warning.
+		$configurationOK = true;
+		if(empty($this->config['ldapHost'])) {
+			\OCP\Util::writeLog('user_ldap', 'No LDAP host given, won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		if(empty($this->config['ldapPort'])) {
+			\OCP\Util::writeLog('user_ldap', 'No LDAP Port given, won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		if((empty($this->config['ldapAgentName']) && !empty($this->config['ldapAgentPassword']))
+			|| (!empty($this->config['ldapAgentName']) && empty($this->config['ldapAgentPassword']))) {
+			\OCP\Util::writeLog('user_ldap', 'Either no password given for the user agent or a password is given, but no LDAP agent; won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		//TODO: check if ldapAgentName is in DN form
+		if(empty($this->config['ldapBase']) && (empty($this->config['ldapBaseUsers']) && empty($this->config['ldapBaseGroups']))) {
+			\OCP\Util::writeLog('user_ldap', 'No Base DN given, won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		if(empty($this->config['ldapUserDisplayName'])) {
+			\OCP\Util::writeLog('user_ldap', 'No user display name attribute specified, won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		if(empty($this->config['ldapGroupDisplayName'])) {
+			\OCP\Util::writeLog('user_ldap', 'No group display name attribute specified, won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		if(empty($this->config['ldapLoginFilter'])) {
+			\OCP\Util::writeLog('user_ldap', 'No login filter specified, won`t connect.', \OCP\Util::WARN);
+			$configurationOK = false;
+		}
+		if(mb_strpos($this->config['ldapLoginFilter'], '%uid', 0, 'UTF-8') === false) {
+			\OCP\Util::writeLog('user_ldap', 'Login filter does not contain %uid place holder, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap', 'Login filter was ' . $this->config['ldapLoginFilter'], \OCP\Util::DEBUG);
+			$configurationOK = false;
+		}
+
+		return $configurationOK;
+	}
+
+	/**
+	 * Connects and Binds to LDAP
+	 */
+	private function establishConnection() {
+		if(!$this->configured) {
+			\OCP\Util::writeLog('user_ldap', 'Configuration is invalid, cannot connect', \OCP\Util::WARN);
+			return false;
+		}
+		if(!$this->ldapConnectionRes) {
+			$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
+			if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
+					if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
+						if($this->config['ldapTLS']) {
+							ldap_start_tls($this->ldapConnectionRes);
+						}
+					}
+			}
+
+			return $this->bind();
+		}
+	}
+
+	/**
+	 * Binds to LDAP
+	 */
+	public function bind() {
+		$ldapLogin = @ldap_bind($this->getConnectionResource(), $this->config['ldapAgentName'], $this->config['ldapAgentPassword']);
+		if(!$ldapLogin) {
+			\OCP\Util::writeLog('user_ldap', 'Bind failed: ' . ldap_errno($this->ldapConnectionRes) . ': ' . ldap_error($this->ldapConnectionRes), \OCP\Util::ERROR);
+			$this->ldapConnectionRes = null;
+			return false;
+		}
+		return true;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index e7ed4dae28..5a7e308f00 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -27,51 +27,38 @@ namespace OCA\user_ldap;
 
 class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 
-	// cached settings
-	protected $ldapUserFilter;
-	protected $ldapQuotaAttribute;
-	protected $ldapQuotaDefault;
-	protected $ldapEmailAttribute;
-
 	// will be retrieved from LDAP server
 	protected $ldap_dc = false;
 
 	// cache getUsers()
 	protected $_users = null;
 
-	public function __construct() {
-		$this->ldapUserFilter      = \OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter', '(objectClass=posixAccount)');
-		$this->ldapQuotaAttribute  = \OCP\Config::getAppValue('user_ldap', 'ldap_quota_attr', '');
-		$this->ldapQuotaDefault    = \OCP\Config::getAppValue('user_ldap', 'ldap_quota_def', '');
-		$this->ldapEmailAttribute  = \OCP\Config::getAppValue('user_ldap', 'ldap_email_attr', '');
-	}
-
 	private function updateQuota($dn) {
 		$quota = null;
-		if(!empty($this->ldapQuotaDefault)) {
-			$quota = $this->ldapQuotaDefault;
+		if(!empty($this->connection->ldapQuotaDefault)) {
+			$quota = $this->connection->ldapQuotaDefault;
 		}
-		if(!empty($this->ldapQuotaAttribute)) {
-			$aQuota = \OC_LDAP::readAttribute($dn, $this->ldapQuotaAttribute);
+		if(!empty($this->connection->ldapQuotaAttribute)) {
+			$aQuota = $this->readAttribute($dn, $this->connection->ldapQuotaAttribute);
 
 			if($aQuota && (count($aQuota) > 0)) {
 				$quota = $aQuota[0];
 			}
 		}
 		if(!is_null($quota)) {
-			\OCP\Config::setUserValue(\OC_LDAP::dn2username($dn), 'files', 'quota', \OCP\Util::computerFileSize($quota));
+			\OCP\Config::setUserValue($this->dn2username($dn), 'files', 'quota', \OCP\Util::computerFileSize($quota));
 		}
 	}
 
 	private function updateEmail($dn) {
 		$email = null;
-		if(!empty($this->ldapEmailAttribute)) {
-			$aEmail = \OC_LDAP::readAttribute($dn, $this->ldapEmailAttribute);
+		if(!empty($this->connection->ldapEmailAttribute)) {
+			$aEmail = $this->readAttribute($dn, $this->connection->ldapEmailAttribute);
 			if($aEmail && (count($aEmail) > 0)) {
 				$email = $aEmail[0];
 			}
 			if(!is_null($email)){
-				\OCP\Config::setUserValue(\OC_LDAP::dn2username($dn), 'settings', 'email', $email);
+				\OCP\Config::setUserValue($this->dn2username($dn), 'settings', 'email', $email);
 			}
 		}
 	}
@@ -86,15 +73,16 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 */
 	public function checkPassword($uid, $password){
 		//find out dn of the user name
-		$filter = \OCP\Util::mb_str_replace('%uid', $uid, \OC_LDAP::conf('ldapLoginFilter'), 'UTF-8');
-		$ldap_users = \OC_LDAP::fetchListOfUsers($filter, 'dn');
+		$filter = \OCP\Util::mb_str_replace('%uid', $uid, $this->connection->ldapLoginFilter, 'UTF-8');
+		\OCP\Util::writeLog('user_ldap', 'Getting DN for login, filter '.$filter.' originating from '.$this->connection->ldapLoginFilter,\OCP\Util::DEBUG);
+		$ldap_users = $this->fetchListOfUsers($filter, 'dn');
 		if(count($ldap_users) < 1) {
 			return false;
 		}
 		$dn = $ldap_users[0];
 
 		//are the credentials OK?
-		if(!\OC_LDAP::areCredentialsValid($dn, $password)) {
+		if(!$this->areCredentialsValid($dn, $password)) {
 			return false;
 		}
 
@@ -103,7 +91,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 		$this->updateEmail($dn);
 
 		//give back the display name
-		return \OC_LDAP::dn2username($dn);
+		return $this->dn2username($dn);
 	}
 
 	/**
@@ -114,8 +102,8 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 */
 	public function getUsers(){
 		if(is_null($this->_users)) {
-			$ldap_users = \OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(\OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
-			$this->_users = \OC_LDAP::ownCloudUserNames($ldap_users);
+			$ldap_users = $this->fetchListOfUsers($this->connection->ldapUserFilter, array($this->connection->ldapUserDisplayName, 'dn'));
+			$this->_users = $this->ownCloudUserNames($ldap_users);
 		}
 		return $this->_users;
 	}
@@ -127,13 +115,13 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 */
 	public function userExists($uid){
 		//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
-		$dn = \OC_LDAP::username2dn($uid);
+		$dn = $this->username2dn($uid);
 		if(!$dn) {
 			return false;
 		}
 
 		//if user really still exists, we will be able to read his cn
-		$cn = \OC_LDAP::readAttribute($dn, 'cn');
+		$cn = $this->readAttribute($dn, 'cn');
 		if(!$cn || empty($cn)) {
 			return false;
 		}

From b10f7aafb7fcf31af86795d45a8d227540dfb0fe Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 12:54:23 +0200
Subject: [PATCH 1123/1537] LDAP: silence warning, but handle the error

---
 apps/user_ldap/lib/access.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index eef471f159..ff94b00a84 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -48,7 +48,12 @@ abstract class Access {
 			return false;
 		}
 		$cr = $this->connection->getConnectionResource();
-		$rr = ldap_read($cr, $dn, 'objectClass=*', array($attr));
+		$rr = @ldap_read($cr, $dn, 'objectClass=*', array($attr));
+		if(!is_resource($rr)) {
+			\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
+			//in case an error occurs , e.g. object does not exist
+			return false;
+		}
 		$er = ldap_first_entry($cr, $rr);
 		//LDAP attributes are not case sensitive
 		$result = \OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8');

From a6c5309e16817745e10bcfd5af29b24be99b2ae1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 12:54:56 +0200
Subject: [PATCH 1124/1537] LDAP: adjust test after refactoring

---
 apps/user_ldap/tests/group_ldap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 2be6b46fb2..106459580f 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -26,8 +26,8 @@ class Test_Group_Ldap extends UnitTestCase {
 	}
 
 	function testSingleBackend(){
-		OC_Group::useBackend(new OC_GROUP_LDAP());
-		$group_ldap = new OC_GROUP_LDAP();
+		OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
+		$group_ldap = new OCA\user_ldap\GROUP_LDAP();
 
  		$this->assertIsA(OC_Group::getGroups(),gettype(array()));
 		$this->assertIsA($group_ldap->getGroups(),gettype(array()));

From 92f447ca50e8b35f34c8020f867664c25703bd2c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:09:51 +0200
Subject: [PATCH 1125/1537] code style

---
 apps/user_ldap/group_ldap.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 8f46a504f6..bc9c95ffe0 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -109,7 +109,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 
 		//uniqueMember takes DN, memberuid the uid, so we need to distinguish
 		if((strtolower($this->connection->ldapGroupMemberAssocAttr) == 'uniquemember')
-			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')) {
+			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')
+		  ) {
 			$uid = $userDN;
 		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
 			$result = $this->readAttribute($userDN, 'uid');
@@ -165,7 +166,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 				$result[] = $this->dn2username($ldap_users[0]);
 				continue;
 			} else {
-				if($ocname = $this->dn2username($member)){
+				if($ocname = $this->dn2username($member)) {
 					$result[] = $ocname;
 				}
 			}

From c8404a7bfa3d462ebf8208f7647f5da1e005e9c5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:10:59 +0200
Subject: [PATCH 1126/1537] code style

---
 apps/user_ldap/group_ldap.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index bc9c95ffe0..ea2cc17733 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -24,7 +24,6 @@
 namespace OCA\user_ldap;
 
 class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
-// 	//group specific settings
 	protected $enabled = false;
 
 	protected $_group_user = array();

From 569e52b87cb1f7c709f3aad4537350a1c71c79f3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:11:42 +0200
Subject: [PATCH 1127/1537] remove unnecessary debug output

---
 apps/user_ldap/user_ldap.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 5a7e308f00..dffed5ded9 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -74,7 +74,6 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	public function checkPassword($uid, $password){
 		//find out dn of the user name
 		$filter = \OCP\Util::mb_str_replace('%uid', $uid, $this->connection->ldapLoginFilter, 'UTF-8');
-		\OCP\Util::writeLog('user_ldap', 'Getting DN for login, filter '.$filter.' originating from '.$this->connection->ldapLoginFilter,\OCP\Util::DEBUG);
 		$ldap_users = $this->fetchListOfUsers($filter, 'dn');
 		if(count($ldap_users) < 1) {
 			return false;

From 15f7d838fa9cafe536ba638e42dd7008457fbff9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:13:01 +0200
Subject: [PATCH 1128/1537] code style

---
 apps/user_ldap/user_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index dffed5ded9..a4a8921d08 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -57,7 +57,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			if($aEmail && (count($aEmail) > 0)) {
 				$email = $aEmail[0];
 			}
-			if(!is_null($email)){
+			if(!is_null($email)) {
 				\OCP\Config::setUserValue($this->dn2username($dn), 'settings', 'email', $email);
 			}
 		}

From 8664729843a16528f224becd7afe3c35f62f191a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:14:32 +0200
Subject: [PATCH 1129/1537] code style

---
 apps/user_ldap/appinfo/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 537f56861c..4862c3b8e3 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -24,7 +24,7 @@
 require_once('apps/user_ldap/lib_ldap.php');
 // require_once('apps/user_ldap/group_ldap.php');
 
-OCP\App::registerAdmin('user_ldap','settings');
+OCP\App::registerAdmin('user_ldap', 'settings');
 
 $connector = new OCA\user_ldap\lib\Connection('user_ldap');
 $userBackend  = new OCA\user_ldap\USER_LDAP();

From edfd789a8787e5c06aab0b33581e9b211572ba23 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:16:31 +0200
Subject: [PATCH 1130/1537] LDAP: remove obsolete require_once

---
 apps/user_ldap/appinfo/app.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 4862c3b8e3..3c6da47d71 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -21,9 +21,6 @@
 *
 */
 
-require_once('apps/user_ldap/lib_ldap.php');
-// require_once('apps/user_ldap/group_ldap.php');
-
 OCP\App::registerAdmin('user_ldap', 'settings');
 
 $connector = new OCA\user_ldap\lib\Connection('user_ldap');

From ab1d9507a97887fd6acd8592f079ab3e519d1687 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:18:31 +0200
Subject: [PATCH 1131/1537] code style

---
 apps/user_ldap/lib/access.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index ff94b00a84..80caa5d353 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -59,7 +59,7 @@ abstract class Access {
 		$result = \OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
 		$attr = mb_strtolower($attr, 'UTF-8');
 
-		if(isset($result[$attr]) && $result[$attr]['count'] > 0){
+		if(isset($result[$attr]) && $result[$attr]['count'] > 0) {
 			$values = array();
 			for($i=0;$i<$result[$attr]['count'];$i++) {
 				$values[] = $this->resemblesDN($attr) ? $this->sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
@@ -90,7 +90,7 @@ abstract class Access {
 	 */
 	private function sanitizeDN($dn) {
 		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
-		$dn = preg_replace('/([^\\\]),(\s+)/u','\1,',$dn);
+		$dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
 
 		//make comparisons and everything work
 		$dn = mb_strtolower($dn, 'UTF-8');
@@ -500,7 +500,7 @@ abstract class Access {
 					foreach($attr as $key) {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
-							if($key != 'dn'){
+							if($key != 'dn') {
 								$selection[$i][$key] = $this->resemblesDN($key) ? $this->sanitizeDN($item[$key][0]) : $item[$key][0];
 							} else {
 								$selection[$i][$key] = $this->sanitizeDN($item[$key]);
@@ -549,7 +549,7 @@ abstract class Access {
 	 * Combines Filter arguments with AND
 	 */
 	public function combineFilterWithAnd($filters) {
-		return $this->combineFilter($filters,'&');
+		return $this->combineFilter($filters, '&');
 	}
 
 	/**
@@ -560,7 +560,7 @@ abstract class Access {
 	 * Combines Filter arguments with AND
 	 */
 	public function combineFilterWithOr($filters) {
-		return $this->combineFilter($filters,'|');
+		return $this->combineFilter($filters, '|');
 	}
 
 	/**

From 6285cc2604de9e8d2101f4936158e81bb8a9a330 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 13:19:07 +0200
Subject: [PATCH 1132/1537] LDAP: remove debug output

---
 apps/user_ldap/lib/access.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 80caa5d353..870f6330ed 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -282,10 +282,6 @@ abstract class Access {
 		$ownCloudNames = array();
 
 		foreach($ldapObjects as $ldapObject) {
-// if(!isset($ldapObject['dn'])) {
-// 	print("<pre>");
-// 	die(var_dump($ldapObjects));
-// }
 			$key = \OCP\Util::recursiveArraySearch($knownObjects, $ldapObject['dn']);
 
 			//everything is fine when we know the group

From 4a2295b75b481cd88806acedfc63ee90651ee898 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 15:10:56 +0200
Subject: [PATCH 1133/1537] code style

---
 apps/user_ldap/group_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index ea2cc17733..b9f4bdf199 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -109,7 +109,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		//uniqueMember takes DN, memberuid the uid, so we need to distinguish
 		if((strtolower($this->connection->ldapGroupMemberAssocAttr) == 'uniquemember')
 			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')
-		  ) {
+		) {
 			$uid = $userDN;
 		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
 			$result = $this->readAttribute($userDN, 'uid');

From 71b862e5717e5026d5f88c708b20a5d1c124bf74 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 15:11:58 +0200
Subject: [PATCH 1134/1537] LDAP: replace deprecated constant

---
 apps/user_ldap/lib/connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 44b1c20214..c8ba9dad70 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -112,7 +112,7 @@ class Connection {
 			$this->config['ldapUserFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person');
 			$this->config['ldapGroupFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
 			$this->config['ldapLoginFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)');
-			$this->config['ldapGroupDisplayName']  = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR), 'UTF-8');
+			$this->config['ldapGroupDisplayName']  = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', 'uid'), 'UTF-8');
 			$this->config['ldapQuotaAttribute']    = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', '');
 			$this->config['ldapQuotaDefault']      = \OCP\Config::getAppValue($this->configID, 'ldap_quota_def', '');
 			$this->config['ldapEmailAttribute']      = \OCP\Config::getAppValue($this->configID, 'ldap_email_attr', '');

From d17eb2983f46b1a2e72f0c3c2d7cfce40f47f653 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 24 Jul 2012 18:36:13 +0200
Subject: [PATCH 1135/1537] OpenID: fix include path

---
 apps/user_openid/appinfo/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index a5fb6a0f45..fe57b189fa 100644
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -19,7 +19,7 @@ OCP\Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OCP\Util::lin
 
 OCP\App::registerPersonal('user_openid','settings');
 
-require_once 'openid/user_openid.php';
+require_once 'apps/user_openid/user_openid.php';
 
 //active the openid backend
 OC_User::useBackend('openid');

From b94631de0cf16d0ffc83dd2e805efe275d119be6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 18:40:48 +0200
Subject: [PATCH 1136/1537] LDAP: check if php-ldap is installed. If not, give
 an error output. FIX: blank Users page when the module is not installed.

---
 apps/user_ldap/lib/access.php     |  4 ++++
 apps/user_ldap/lib/connection.php | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 870f6330ed..19122b34c7 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -48,6 +48,10 @@ abstract class Access {
 			return false;
 		}
 		$cr = $this->connection->getConnectionResource();
+		if(!is_resource($cr)) {
+			//LDAP not available
+			return false;
+		}
 		$rr = @ldap_read($cr, $dn, 'objectClass=*', array($attr));
 		if(!is_resource($rr)) {
 			\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index c8ba9dad70..e54a8e2b24 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -211,11 +211,21 @@ class Connection {
 	 * Connects and Binds to LDAP
 	 */
 	private function establishConnection() {
+		static $phpLDAPinstalled = true;
+		if(!$phpLDAPinstalled) {
+			return false;
+		}
 		if(!$this->configured) {
 			\OCP\Util::writeLog('user_ldap', 'Configuration is invalid, cannot connect', \OCP\Util::WARN);
 			return false;
 		}
 		if(!$this->ldapConnectionRes) {
+			if(!function_exists('ldap_connect')) {
+				$phpLDAPinstalled = false;
+				\OCP\Util::writeLog('user_ldap', 'function ldap_connect is not available. Make sure that the PHP ldap module is installed.', \OCP\Util::ERROR);
+
+				return false;
+			}
 			$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
 			if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
 					if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {

From 37bccf54f27288b99468467457a4740f32745366 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 25 Jul 2012 22:15:24 +0200
Subject: [PATCH 1137/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/de.php    |  41 ++-
 apps/gallery/l10n/de.php     |   8 +-
 l10n/de/calendar.po          | 413 +++++++++++++--------
 l10n/de/gallery.po           |  66 +---
 l10n/templates/bookmarks.pot |   4 +-
 l10n/templates/calendar.pot  | 391 +++++++++++++-------
 l10n/templates/contacts.pot  | 689 +++++++++++++++++++----------------
 l10n/templates/core.pot      |  34 +-
 l10n/templates/files.pot     |  40 +-
 l10n/templates/gallery.pot   |  50 +--
 l10n/templates/media.pot     |   4 +-
 l10n/templates/settings.pot  |  44 ++-
 12 files changed, 1022 insertions(+), 762 deletions(-)

diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index f12a18baad..33c924ac2c 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -2,11 +2,17 @@
 "No calendars found." => "Keine Kalender gefunden",
 "No events found." => "Keine Termine gefunden",
 "Wrong calendar" => "Falscher Kalender",
+"Import failed" => "Import fehlgeschlagen",
 "New Timezone:" => "Neue Zeitzone:",
 "Timezone changed" => "Zeitzone geändert",
 "Invalid request" => "Fehlerhafte Anfrage",
 "Calendar" => "Kalender",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d.M",
+"dddd M/d" => "dddd d.M",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d. MMM yyyy",
 "Birthday" => "Geburtstag",
 "Business" => "Geschäftlich",
 "Call" => "Anruf",
@@ -22,7 +28,9 @@
 "Projects" => "Projekte",
 "Questions" => "Fragen",
 "Work" => "Arbeit",
+"by" => "von",
 "unnamed" => "unbenannt",
+"New Calendar" => "Neuer Kalender",
 "Does not repeat" => "einmalig",
 "Daily" => "täglich",
 "Weekly" => "wöchentlich",
@@ -67,8 +75,26 @@
 "by day and month" => "nach Tag und Monat",
 "Date" => "Datum",
 "Cal." => "Kal.",
+"Sun." => "So",
+"Mon." => "Mo",
+"Tue." => "Di",
+"Wed." => "Mi",
+"Thu." => "Do",
+"Fri." => "Fr",
+"Sat." => "Sa",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mär.",
+"Apr." => "Apr.",
+"May." => "Mai",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dez.",
 "All day" => "Ganztags",
-"New Calendar" => "Neuer Kalender",
 "Missing fields" => "fehlende Felder",
 "Title" => "Titel",
 "From Date" => "Startdatum",
@@ -132,18 +158,14 @@
 "Interval" => "Intervall",
 "End" => "Ende",
 "occurrences" => "Termine",
-"Import a calendar file" => "Kalenderdatei Importieren",
-"Please choose the calendar" => "Bitte wählen Sie den Kalender.",
 "create a new calendar" => "Neuen Kalender anlegen",
+"Import a calendar file" => "Kalenderdatei Importieren",
 "Name of new calendar" => "Kalendername",
 "Import" => "Importieren",
-"Importing calendar" => "Kalender wird importiert.",
-"Calendar imported successfully" => "Kalender erfolgreich importiert",
 "Close Dialog" => "Dialog schließen",
 "Create a new event" => "Neues Ereignis",
 "View an event" => "Termin öffnen",
 "No categories selected" => "Keine Kategorie ausgewählt",
-"Select category" => "Kategorie auswählen",
 "of" => "von",
 "at" => "um",
 "Timezone" => "Zeitzone",
@@ -152,9 +174,8 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "erster Wochentag",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV Synchronisationsadresse:",
-"Users" => "Nutzer",
-"select users" => "Nutzer auswählen",
+"Users" => "Benutzer",
+"select users" => "Benutzer auswählen",
 "Editable" => "editierbar",
 "Groups" => "Gruppen",
 "select groups" => "Gruppen auswählen",
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index 6c3d9fc738..cd580cf303 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
-"Settings" => "Einstellungen",
-"Rescan" => "Erneut Scannen",
-"Stop" => "Stopp",
-"Share" => "Teilen",
+"Share gallery" => "Galerie teilen",
+"Error: " => "Fehler:",
+"Internal error" => "Interner Fehler",
+"Slideshow" => "Slideshow",
 "Back" => "Zurück",
 "Remove confirmation" => "Bestätigung entfernen",
 "Do you want to remove album" => "Soll das Album entfernt werden",
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 2e5af84f5a..d129d8cae0 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -8,26 +8,36 @@
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
 #   <peddn@web.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"PO-Revision-Date: 2012-07-25 20:14+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Keine Kalender gefunden"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Keine Termine gefunden"
 
@@ -35,300 +45,395 @@ msgstr "Keine Termine gefunden"
 msgid "Wrong calendar"
 msgstr "Falscher Kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Import fehlgeschlagen"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Neue Zeitzone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zeitzone geändert"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Fehlerhafte Anfrage"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd d.M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd d.M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, d. MMM yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Urlaub"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Treffen"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Anderes"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Fragen"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "von"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Neuer Kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "einmalig"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "täglich"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "wöchentlich"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "jeden Wochentag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "jede zweite Woche"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "monatlich"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "jährlich"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "niemals"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "nach Terminen"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "nach Datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "an einem Monatstag"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "an einem Wochentag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Montag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Freitag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Samstag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "Woche des Monats vom Termin"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "erste"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "zweite"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "dritte"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "vierte"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "fünfte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "letzte"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "März"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "nach Tag des Termins"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "nach Tag des Jahres"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "nach Wochennummer"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "nach Tag und Monat"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "So"
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Mo"
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Di"
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Mi"
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Do"
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Fr"
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Sa"
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mär."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Mai"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Aug."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dez."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Ganztags"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Neuer Kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "fehlende Felder"
@@ -362,27 +467,27 @@ msgstr "Der Termin hört auf, bevor er angefangen hat."
 msgid "There was a database fail"
 msgstr "Datenbankfehler"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Woche"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Monat"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Heute"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Kalender"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Fehler beim Einlesen der Datei."
 
@@ -395,7 +500,7 @@ msgid "Your calendars"
 msgstr "Deine Kalender"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDAV-Link"
 
@@ -407,19 +512,19 @@ msgstr "geteilte Kalender"
 msgid "No shared calendars"
 msgstr "Keine geteilten Kalender"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Kalender teilen"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Löschen"
@@ -505,23 +610,23 @@ msgstr "Kategorien mit Kommas trennen"
 msgid "Edit categories"
 msgstr "Kategorien ändern"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Ganztägiges Ereignis"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "von"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "bis"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Erweiterte Optionen"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Ort"
 
@@ -529,7 +634,7 @@ msgstr "Ort"
 msgid "Location of the Event"
 msgstr "Ort"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -537,84 +642,86 @@ msgstr "Beschreibung"
 msgid "Description of the Event"
 msgstr "Beschreibung"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "wiederholen"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Wochentage auswählen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Tage auswählen"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "und den Tag des Jahres vom Termin"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "und den Tag des Monats vom Termin"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Monate auswählen"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Wochen auswählen"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "und den Tag des Jahres vom Termin"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Ende"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "Termine"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Kalenderdatei Importieren"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Bitte wählen Sie den Kalender."
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Neuen Kalender anlegen"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Kalenderdatei Importieren"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Kalendername"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importieren"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalender wird importiert."
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender erfolgreich importiert"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Dialog schließen"
 
@@ -630,15 +737,11 @@ msgstr "Termin öffnen"
 msgid "No categories selected"
 msgstr "Keine Kategorie ausgewählt"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategorie auswählen"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "von"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "um"
 
@@ -666,17 +769,41 @@ msgstr "12h"
 msgid "First day of the week"
 msgstr "erster Wochentag"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kalender CalDAV Synchronisationsadresse:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr "Nutzer"
+msgstr "Benutzer"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr "Nutzer auswählen"
+msgstr "Benutzer auswählen"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 5015175600..ec9656fa93 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -6,75 +6,41 @@
 #   <admin@s-goecker.de>, 2012.
 # Bartek  <bart.p.pl@gmail.com>, 2012.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"PO-Revision-Date: 2012-07-25 20:05+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Bilder"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Galerie teilen"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Fehler:"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Interner Fehler"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Erneut Scannen"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stopp"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Teilen"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Slideshow"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index a55aacd870..3a9362d978 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#: bookmarksHelper.php:98
+#: bookmarksHelper.php:99
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index bab1046758..c96214c465 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -29,28 +37,42 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
 msgstr ""
@@ -75,254 +97,335 @@ msgstr ""
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr ""
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -356,27 +459,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -389,7 +492,7 @@ msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -401,19 +504,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
@@ -499,23 +602,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr ""
 
@@ -523,7 +626,7 @@ msgstr ""
 msgid "Location of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr ""
 
@@ -531,84 +634,86 @@ msgstr ""
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
 #: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -624,15 +729,11 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
@@ -660,8 +761,32 @@ msgstr ""
 msgid "First day of the week"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 15859a85e5..993fd3f877 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,91 +17,87 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,117 +106,109 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
@@ -228,113 +216,75 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:389
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:691
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:717
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:826 js/contacts.js:844
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:860
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1141
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1149
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1314 js/contacts.js:1348
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,196 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:29
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:33
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:44
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:100 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:101
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:102 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:121
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:123
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:124
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:125
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:134
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:170
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +495,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,186 +509,195 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr ""
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr ""
@@ -743,7 +803,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,32 +822,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br /"
-">Please upload your VCF file with the file manager and click on it to import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -801,6 +838,18 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr ""
@@ -816,3 +865,7 @@ msgstr ""
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 46ee521dfa..4f0a33760a 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,51 +33,51 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "December"
 msgstr ""
 
@@ -106,10 +106,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -239,11 +235,11 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
+#: templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d38e5942c2..d3f9a451e4 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -51,6 +51,14 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
 #: js/filelist.js:186
 msgid "undo deletion"
 msgstr ""
@@ -79,27 +87,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -171,10 +179,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr ""
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 0cf2a7db97..658db4f6e4 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,60 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr ""
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
 msgstr ""
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
 msgstr ""
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
 msgstr ""
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr ""
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr ""
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr ""
-
-#: templates/index.php:18
-msgid "Share"
+#: templates/index.php:27
+msgid "Slideshow"
 msgstr ""
 
 #: templates/view_album.php:19
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index b722f87d43..adbef7481b 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 85b693c5c0..5b9ddb8262 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"POT-Creation-Date: 2012-07-25 22:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,15 +25,15 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/setlanguage.php:17
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
 
@@ -49,35 +49,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:41 personal.php:42
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr ""
 
@@ -169,34 +173,34 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:15 templates/users.php:60
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:17 templates/users.php:61
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:22
+#: templates/users.php:25
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:28
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:47 templates/users.php:103
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:63
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:110
 msgid "Delete"
 msgstr ""

From 4d17ed2f71c8cbb0d34c039aa7953b2427ce5c78 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 25 Jul 2012 16:33:08 -0400
Subject: [PATCH 1138/1537] Make file actions permissions aware

---
 apps/calendar/js/loader.js              |  2 +-
 apps/contacts/js/loader.js              |  4 +-
 apps/files/js/fileactions.js            | 54 +++++++++++++++----------
 apps/files/js/files.js                  |  5 ++-
 apps/files/templates/part.list.php      |  3 +-
 apps/files_archive/js/archive.js        |  4 +-
 apps/files_imageviewer/js/lightbox.js   |  2 +-
 apps/files_pdfviewer/js/viewer.js       |  2 +-
 apps/files_sharing/lib/share/file.php   | 11 ++++-
 apps/files_sharing/lib/share/folder.php | 13 +++++-
 apps/files_texteditor/js/editor.js      | 16 ++++++--
 apps/files_versions/js/versions.js      |  2 +-
 apps/media/js/loader.js                 |  4 +-
 core/js/share.js                        |  2 +-
 lib/files.php                           | 18 ++++++---
 15 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index cef95afc3a..57cf5adff0 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -75,7 +75,7 @@ Calendar_Import={
 }
 $(document).ready(function(){
 	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/calendar','importcal', '', Calendar_Import.importdialog); 
+		FileActions.register('text/calendar','importcal', FileActions.PERMISSION_READ, '', Calendar_Import.importdialog);
 		FileActions.setDefault('text/calendar','importcal');
 	};
 });
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 577ad10306..3b1f407048 100644
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -78,9 +78,9 @@ Contacts_Import={
 }
 $(document).ready(function(){
 	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog); 
+		FileActions.register('text/vcard','importaddressbook', FileActions.PERMISSION_READ, '', Contacts_Import.importdialog);
 		FileActions.setDefault('text/vcard','importaddressbook');
-		FileActions.register('text/x-vcard','importaddressbook', '', Contacts_Import.importdialog); 
+		FileActions.register('text/x-vcard','importaddressbook', FileActions.PERMISSION_READ, '', Contacts_Import.importdialog);
 		FileActions.setDefault('text/x-vcard','importaddressbook');
 	};
 });
\ No newline at end of file
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 4dc05088ee..d54dd46646 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -1,19 +1,28 @@
 FileActions={
+	PERMISSION_CREATE:4,
+	PERMISSION_READ:1,
+	PERMISSION_UPDATE:2,
+	PERMISSION_DELETE:8,
+	PERMISSION_SHARE:16,
 	actions:{},
 	defaults:{},
 	icons:{},
 	currentFile:null,
-	register:function(mime,name,icon,action){
+	register:function(mime,name,permissions,icon,action){
 		if(!FileActions.actions[mime]){
 			FileActions.actions[mime]={};
 		}
-		FileActions.actions[mime][name]=action;
+		if (!FileActions.actions[mime][name]) {
+			FileActions.actions[mime][name] = {};
+		}
+		FileActions.actions[mime][name]['action'] = action;
+		FileActions.actions[mime][name]['permissions'] = permissions;
 		FileActions.icons[name]=icon;
 	},
 	setDefault:function(mime,name){
 		FileActions.defaults[mime]=name;
 	},
-	get:function(mime,type){
+	get:function(mime,type,permissions){
 		var actions={};
 		if(FileActions.actions.all){
 			actions=$.extend( actions, FileActions.actions.all )
@@ -32,9 +41,15 @@ FileActions={
 				actions=$.extend( actions, FileActions.actions[type] )
 			}
 		}
-		return actions;
+		var filteredActions = {};
+		$.each(actions, function(name, action) {
+			if (action.permissions & permissions) {
+				filteredActions[name] = action.action;
+			}
+		});
+		return filteredActions;
 	},
-	getDefault:function(mime,type){
+	getDefault:function(mime,type,permissions){
 		if(mime){
 			var mimePart=mime.substr(0,mime.indexOf('/'));
 		}
@@ -48,22 +63,20 @@ FileActions={
 		}else{
 			name=FileActions.defaults.all;
 		}
-		var actions=this.get(mime,type);
+		var actions=this.get(mime,type,permissions);
 		return actions[name];
 	},
-	display:function(parent, filename, type){
+	display:function(parent){
 		FileActions.currentFile=parent;
 		$('#fileList span.fileactions, #fileList td.date a.action').remove();
-		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
+		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
 		var file=FileActions.getCurrentFile();
 		if($('tr').filterAttr('data-file',file).data('renaming')){
 			return;
 		}
 		parent.children('a.name').append('<span class="fileactions" />');
-		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
+		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
 		for(name in actions){
-			// no rename and share action for the 'Shared' dir
-			if((name=='Rename' || name =='Share') && type=='dir' && filename=='Shared') { continue; }
 			if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
 				var img=FileActions.icons[name];
 				if(img.call){
@@ -86,16 +99,12 @@ FileActions={
 				parent.find('a.name>span.fileactions').append(element);
 			}
 		}
-		if(actions['Delete'] && (type!='dir' || filename != 'Shared')){ // no delete action for the 'Shared' dir
+		if(actions['Delete']){
 			var img=FileActions.icons['Delete'];
 			if(img.call){
 				img=img(file);
 			}
-			if ($('#dir').val().indexOf('Shared') != -1) {
-				var html='<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" style="display:none" />';
-			} else  {
-				var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
-			}
+			var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
@@ -131,6 +140,9 @@ FileActions={
 	},
 	getCurrentType:function(){
 		return FileActions.currentFile.parent().attr('data-type');
+	},
+	getCurrentPermissions:function() {
+		return FileActions.currentFile.parent().data('permissions');
 	}
 }
 
@@ -140,12 +152,12 @@ $(document).ready(function(){
 	} else {
 		var downloadScope = 'file';
 	}
-	FileActions.register(downloadScope,'Download',function(){return OC.imagePath('core','actions/download')},function(filename){
+	FileActions.register(downloadScope,'Download', FileActions.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){
 		window.location=OC.filePath('files', 'ajax', 'download.php') + encodeURIComponent('?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()));
 	});
 });
 
-FileActions.register('all','Delete',function(){return OC.imagePath('core','actions/delete')},function(filename){
+FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){
 	if(Files.cancelUpload(filename)) {
 		if(filename.substr){
 			filename=[filename];
@@ -162,11 +174,11 @@ FileActions.register('all','Delete',function(){return OC.imagePath('core','actio
 	}
 });
 
-FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){
+FileActions.register('all','Rename', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){
 	FileList.rename(filename);
 });
 
-FileActions.register('dir','Open','',function(filename){
+FileActions.register('dir','Open', FileActions.PERMISSION_READ, '', function(filename){
 	window.location=OC.linkTo('files', 'index.php') + '&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 });
 
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8d52b742c1..2f06f15f89 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -56,7 +56,7 @@ $(document).ready(function() {
 
 	// Sets the file-action buttons behaviour :
 	$('tr').live('mouseenter',function(event) {
-		FileActions.display($(this).children('td.filename'), $(this).attr('data-file'), $(this).attr('data-type'));
+		FileActions.display($(this).children('td.filename'));
 	});
 	$('tr').live('mouseleave',function(event) {
 		FileActions.hide();
@@ -106,7 +106,8 @@ $(document).ready(function() {
 			if(!renaming && !FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
-				var action=FileActions.getDefault(mime,type);
+				var permissions = $(this).parent().parent().data('permissions');
+				var action=FileActions.getDefault(mime,type, permissions);
 				if(action){
 					action(filename);
 				}
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 4506630c16..6667b5488a 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,5 +1,4 @@
 		<?php foreach($_['files'] as $file):
-			$write = ($file['writable']) ? 'true' : 'false';
 			$simple_file_size = OCP\simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
 			if($simple_size_color<0) $simple_size_color = 0;
@@ -10,7 +9,7 @@
 			$name = str_replace('%2F','/', $name);
 			$directory = str_replace('+','%20',urlencode($file['directory']));
 			$directory = str_replace('%2F','/', $directory); ?>
-			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-write='<?php echo $write;?>'>
+			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
 					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
diff --git a/apps/files_archive/js/archive.js b/apps/files_archive/js/archive.js
index 9fb9853e29..6bcbe09266 100644
--- a/apps/files_archive/js/archive.js
+++ b/apps/files_archive/js/archive.js
@@ -7,11 +7,11 @@
 
 $(document).ready(function() {
 	if(typeof FileActions!=='undefined'){
-		FileActions.register('application/zip','Open','',function(filename){
+		FileActions.register('application/zip','Open', FileActions.PERMISSION_READ, '',function(filename){
 			window.location=OC.linkTo('files', 'index.php')+'&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 		});
 		FileActions.setDefault('application/zip','Open');
-		FileActions.register('application/x-gzip','Open','',function(filename){
+		FileActions.register('application/x-gzip','Open', FileActions.PERMISSION_READ, '',function(filename){
 			window.location=OC.linkTo('files', 'index.php')+'&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 		});
 		FileActions.setDefault('application/x-gzip','Open');
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 31f08456d2..ff12d808bc 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	if(typeof FileActions!=='undefined'){
-		FileActions.register('image','View','',function(filename){
+		FileActions.register('image','View', FileActions.PERMISSION_READ, '',function(filename){
 			viewImage($('#dir').val(),filename);
 		});
 		FileActions.setDefault('image','View');
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 2c9cbb9b43..29db2ea7f2 100644
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -40,7 +40,7 @@ $(document).ready(function(){
 		if(location.href.indexOf("files")!=-1) {
 			PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
 			if(typeof FileActions!=='undefined'){
-				FileActions.register('application/pdf','Edit','',function(filename){
+				FileActions.register('application/pdf','Edit', FileActions.PERMISSION_READ, '',function(filename){
 					showPDFviewer($('#dir').val(),filename);
 				});
 				FileActions.setDefault('application/pdf','Edit');
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 658c42ee32..dd63539cdf 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -70,7 +70,14 @@ class OC_Share_Backend_File extends OCP\Share_Backend {
 					// Set target path
 					$file['path'] = $shares[$file['id']]['file_target'];
 					$file['name'] = basename($file['path']);
-					// TODO Set permissions: $file['writable']
+					$file['directory'] = $parameters['folder'];
+					$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
+					$permissions = $shares[$file['id']]['permissions'];
+					if ($file['type'] == 'file') {
+						// Remove Create permission if type is file
+						$permissions &= ~OCP\Share::PERMISSION_CREATE;
+					}
+					$file['permissions'] = $permissions;
 					$files[] = $file;
 				}
 				return $files;
@@ -85,7 +92,7 @@ class OC_Share_Backend_File extends OCP\Share_Backend {
 					}
 					$size += $file['size'];
 				}
-				return array(0 => array('name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false));
+				return array(0 => array('name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\Share::PERMISSION_READ));
 			}
 		}
 		return array();
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 033e2ba966..a43ce2b2ca 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -43,7 +43,18 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 				$pos = strpos($result['path'], $folder['item']);
 				$path = substr($result['path'], $pos).substr($parameters['folder'], strlen($folder['file_target']));
 				$root = substr($result['path'], 0, $pos);
-				return OC_FileCache::getFolderContent($path, $root, $mimetype_filter);
+				$files = OC_FileCache::getFolderContent($path, $root, $mimetype_filter);
+				foreach ($files as &$file) {
+					$file['directory'] = $parameters['folder'];
+					$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
+					$permissions = $folder['permissions'];
+					if ($file['type'] == 'file') {
+						// Remove Create permission if type is file
+						$permissions &= ~OCP\Share::PERMISSION_CREATE;
+					}
+					$file['permissions'] = $permissions;
+				}
+				return $files;
 			}
 		}/* else if ($format == self::FORMAT_OPENDIR_ROOT) {
 			$query = OCP\DB::prepare('SELECT name FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 70bb74a910..3784ea1032 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -222,9 +222,17 @@ function showFileEditor(dir,filename){
 							}
 						});
 						// Add the ctrl+s event
-						window.aceEditor.commands.addCommand({
							name: "save",
							bindKey: {
							win: "Ctrl-S",
							mac: "Command-S",
							sender: "editor"
							},
							exec: function(){
+						window.aceEditor.commands.addCommand({
+							name: "save",
+							bindKey: {
+							win: "Ctrl-S",
+							mac: "Command-S",
+							sender: "editor"
+							},
+							exec: function(){
 								doFileSave();	
-							}
						});
+							}
+						});
 					});
 				} else {
 					// Failed to get the file.
@@ -297,11 +305,11 @@ $(window).resize(function() {
 var is_editor_shown = false;
 $(document).ready(function(){
 	if(typeof FileActions!=='undefined'){
-		FileActions.register('text','Edit','',function(filename){
+		FileActions.register('text','Edit', FileActions.PERMISSION_READ, '',function(filename){
 			showFileEditor($('#dir').val(),filename);
 		});
 		FileActions.setDefault('text','Edit');
-		FileActions.register('application/xml','Edit','',function(filename){
+		FileActions.register('application/xml','Edit', FileActions.PERMISSION_READ, '',function(filename){
 			showFileEditor($('#dir').val(),filename);
 		});
 		FileActions.setDefault('application/xml','Edit');
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index a090fde446..c5c1553f1a 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
 $(document).ready(function(){
 	if (typeof FileActions !== 'undefined') {
 		// Add history button to files/index.php
-		FileActions.register('file','History',function(){return OC.imagePath('core','actions/history')},function(filename){
+		FileActions.register('file','History', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){
 
 			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
 			
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index 393f8ba914..ffe9c1cdd6 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -45,8 +45,8 @@ $(document).ready(function() {
 // 	FileActions.register('application/ogg','Add to playlist','',addAudio);
 
 	if(typeof FileActions!=='undefined'){
-		FileActions.register('audio','Play','',playAudio);
-		FileActions.register('application/ogg','','Play',playAudio);
+		FileActions.register('audio','Play', FileActions.PERMISSION_READ, '',playAudio);
+		FileActions.register('application/ogg', FileActions.PERMISSION_READ, '','Play',playAudio);
 		FileActions.setDefault('audio','Play');
 		FileActions.setDefault('application/ogg','Play');
 	}
diff --git a/core/js/share.js b/core/js/share.js
index 42002ea798..4cff9ec1a6 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -164,7 +164,7 @@ $(document).ready(function() {
 	if (typeof FileActions !== 'undefined') {
 		
 		OC.Share.loadIcons('file');
-		FileActions.register('all', 'Share', function(filename) {
+		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
 			var item =  $('#dir').val() + '/' + filename;
diff --git a/lib/files.php b/lib/files.php
index f7a7aecc16..fee71b777b 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -36,7 +36,7 @@ class OC_Files {
 		$files = array();
 		if (substr($directory, 0, 7) == '/Shared') {
 			if ($directory == '/Shared') {
-				$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP, array('mimetype_filter' => $mimetype_filter));
+				$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter));
 			} else {
 				$pos = strpos($directory, '/', 8);
 				// Get shared folder name
@@ -49,15 +49,23 @@ class OC_Files {
 			}
 		} else {
 			$files = OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
+			foreach ($files as &$file) {
+				$file['directory'] = $directory;
+				$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
+				$permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE;
+				if ($file['type'] == 'dir' && $file['writable']) {
+					$permissions |= OCP\Share::PERMISSION_CREATE;
+				}
+				if ($file['writable']) {
+					$permissions |= OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE;
+				}
+				$file['permissions'] = $permissions;
+			}
 			if ($directory == '') {
 				// Add 'Shared' folder
 				$files = array_merge($files, OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT));
 			}
 		}
-		foreach ($files as &$file) {
-			$file['directory'] = $directory;
-			$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
-		}
 		usort($files, "fileCmp");//TODO: remove this once ajax is merged
 		return $files;
 	}

From f25ccaff59c135d7f1f22196bf266916ef131b35 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 25 Jul 2012 16:54:46 -0400
Subject: [PATCH 1139/1537] Fix filesystem hash, no longer using
 basicOperation()

---
 apps/files_sharing/sharedstorage.php |  2 +-
 lib/filestorage.php                  |  2 +-
 lib/filestorage/common.php           |  2 +-
 lib/filesystem.php                   |  4 ++--
 lib/filesystemview.php               | 23 +++++++++++++++++++++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 32fd212442..fc0d272b54 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -410,7 +410,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 	
-	public function hash($type, $path, $raw) {
+	public function hash($type, $path, $raw = false) {
 		$source = $this->getSource($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
diff --git a/lib/filestorage.php b/lib/filestorage.php
index e786127d52..fd4ad36530 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -45,7 +45,7 @@ abstract class OC_Filestorage{
 	abstract public function copy($path1,$path2);
 	abstract public function fopen($path,$mode);
 	abstract public function getMimeType($path);
-	abstract public function hash($type,$path,$raw);
+	abstract public function hash($type,$path,$raw = false);
 	abstract public function free_space($path);
 	abstract public function search($query);
 	abstract public function touch($path, $mtime=null);
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index fd389d3e2d..c77df38e6b 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -195,7 +195,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		unlink($tmpFile);
 		return $mime;
 	}
-	public function hash($type,$path,$raw){
+	public function hash($type,$path,$raw = false){
 		$tmpFile=$this->getLocalFile();
 		$hash=hash($type,$tmpFile,$raw);
 		unlink($tmpFile);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index a5edcf5bab..81370d4e17 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -452,8 +452,8 @@ class OC_Filesystem{
 	static public function getMimeType($path){
 		return self::$defaultInstance->getMimeType($path);
 	}
-	static public function hash($type,$path){
-		return self::$defaultInstance->hash($type,$path);
+	static public function hash($type,$path, $raw = false){
+		return self::$defaultInstance->hash($type,$path, $raw);
 	}
 	
 	static public function free_space($path='/'){
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 9beda01e5a..3c989d7c36 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -465,8 +465,27 @@ class OC_FilesystemView {
 	public function getMimeType($path) {
 		return $this->basicOperation('getMimeType', $path);
 	}
-	public function hash($type, $path) {
-		return $this->basicOperation('hash', $path, array('read'), $type);
+	public function hash($type, $path, $raw = false) {
+		$absolutePath = $this->getAbsolutePath($path);
+		if (OC_FileProxy::runPreProxies('hash', $absolutePath) && OC_Filesystem::isValidPath($path)) {
+			$path = $this->getRelativePath($absolutePath);
+			if ($path == null) {
+				return false;
+			}
+			if (OC_Filesystem::$loaded && $this->fakeRoot == OC_Filesystem::getRoot()) {
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_read,
+					array( OC_Filesystem::signal_param_path => $path)
+				);
+			}
+			if ($storage = $this->getStorage($path)) {
+				$result = $storage->hash($type, $this->getInternalPath($path), $raw);
+				$result = OC_FileProxy::runPostProxies('hash', $absolutePath, $result);
+				return $result;
+			}
+		}
+		return null;
 	}
 
 	public function free_space($path='/') {

From 381e493a8c777a4e5e95fd72c6a7ed8114c3c978 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 25 Jul 2012 23:07:10 +0200
Subject: [PATCH 1140/1537] Rename functions

getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
---
 lib/connector/sabre/directory.php | 2 +-
 lib/connector/sabre/file.php      | 4 ++--
 lib/connector/sabre/node.php      | 4 ++--
 lib/filesystem.php                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 0842fc4fc6..7003a92027 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -52,7 +52,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		$newPath = $this->path . '/' . $name;
 		OC_Filesystem::file_put_contents($newPath,$data);
 
-		return OC_Connector_Sabre_Node::getETagPropertyForFile($newPath);
+		return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
 	}
 
 	/**
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 80f0a0ab4d..4fd5059107 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -47,7 +47,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 
 		OC_Filesystem::file_put_contents($this->path,$data);
 
-		return OC_Connector_Sabre_Node::getETagPropertyForFile($this->path);
+		return OC_Connector_Sabre_Node::getETagPropertyForPath($this->path);
 	}
 
 	/**
@@ -98,7 +98,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		if (isset($properties[self::GETETAG_PROPERTYNAME])) {
 			return $properties[self::GETETAG_PROPERTYNAME];
 		}
-		return $this->getETagPropertyForFile($this->path);
+		return $this->getETagPropertyForPath($this->path);
 	}
 
 	/**
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 663970487f..77aff92cc3 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -208,7 +208,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param string $path Path of the file
 	 * @return string|null Returns null if the ETag can not effectively be determined
 	 */
-	static public function getETagPropertyForFile($path) {
+	static public function getETagPropertyForPath($path) {
 		$tag = OC_Filesystem::hash('md5', $path);
 		if (empty($tag)) {
 			return null;
@@ -223,7 +223,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * Remove the ETag from the cache.
 	 * @param string $path Path of the file
 	 */
-	static public function removeETagPropertyForFile($path) {
+	static public function removeETagPropertyForPath($path) {
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
 		$query->execute( array( OC_User::getUser(), $path, self::GETETAG_PROPERTYNAME ));
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 81370d4e17..c87bc9ed9c 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -475,7 +475,7 @@ class OC_Filesystem{
 
 	static public function removeETagHook($params) {
 		$path=$params['path'];
-		OC_Connector_Sabre_Node::removeETagPropertyForFile($path);
+		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
 	}
 }
 OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');

From 783d67be6285d730ab7f365e3643bde0c116611a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 25 Jul 2012 23:08:53 +0200
Subject: [PATCH 1141/1537] Create uniqid ETag for directories

---
 lib/connector/sabre/directory.php | 20 ++++++++++++++++++++
 lib/connector/sabre/file.php      |  9 +++++++++
 lib/connector/sabre/node.php      | 11 ++++++++++-
 lib/filesystem.php                |  1 +
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 7003a92027..7f8434c715 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -170,5 +170,25 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 
 	}
 
+	/**
+	 * Returns a list of properties for this nodes.;
+	 *
+	 * The properties list is a list of propertynames the client requested,
+	 * encoded as xmlnamespace#tagName, for example:
+	 * http://www.example.org/namespace#author
+	 * If the array is empty, all properties should be returned
+	 *
+	 * @param array $properties
+	 * @return void
+	 */
+	public function getProperties($properties) {
+		$props = parent::getProperties($properties);
+		if (in_array(self::GETETAG_PROPERTYNAME, $properties)
+		    && !isset($props[self::GETETAG_PROPERTYNAME])) {
+			$props[self::GETETAG_PROPERTYNAME] =
+				OC_Connector_Sabre_Node::getETagPropertyForPath($this->path);
+		}
+		return $props;
+	}
 }
 
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 4fd5059107..9d571fceb0 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -101,6 +101,15 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		return $this->getETagPropertyForPath($this->path);
 	}
 
+	/**
+	 * Creates a ETag for this path.
+	 * @param string $path Path of the file
+	 * @return string|null Returns null if the ETag can not effectively be determined
+	 */
+	static protected function createETag($path) {
+		return OC_Filesystem::hash('md5', $path);
+	}
+
 	/**
 	 * Returns the mime-type for a file
 	 *
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 77aff92cc3..22506f27cf 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -203,13 +203,22 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		return $props;
 	}
 
+	/**
+	 * Creates a ETag for this path.
+	 * @param string $path Path of the file
+	 * @return string|null Returns null if the ETag can not effectively be determined
+	 */
+	static protected function createETag($path) {
+		return uniqid('', true);
+	}
+
 	/**
 	 * Returns the ETag surrounded by double-quotes for this path.
 	 * @param string $path Path of the file
 	 * @return string|null Returns null if the ETag can not effectively be determined
 	 */
 	static public function getETagPropertyForPath($path) {
-		$tag = OC_Filesystem::hash('md5', $path);
+		$tag = self::createETag($path);
 		if (empty($tag)) {
 			return null;
 		}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index c87bc9ed9c..d88b30c2f6 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -476,6 +476,7 @@ class OC_Filesystem{
 	static public function removeETagHook($params) {
 		$path=$params['path'];
 		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
+		OC_Connector_Sabre_Node::removeETagPropertyForPath(dirname($path));
 	}
 }
 OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');

From add8f093554242e64ce650e9252735b02881bda7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 25 Jul 2012 17:13:48 -0400
Subject: [PATCH 1142/1537] No longer need hash() in shared storage, already
 implemented by the common file storage

---
 apps/files_sharing/sharedstorage.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index df884834ca..2071942b06 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -365,14 +365,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
-	public function hash($type, $path, $raw = false) {
-		if ($source = $this->getSourcePath($path)) {
-			$storage = OC_Filesystem::getStorage($source);
-			return $storage->hash($type, $this->getInternalPath($source), $raw);
-		}
-	}
-	
+
 	public function free_space($path) {
 		$source = $this->getSourcePath($path);
 		if ($source) {

From 586fe8f9407581c1d6f4dc8790dcf611d96569cc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 25 Jul 2012 17:39:28 -0400
Subject: [PATCH 1143/1537] Change is_writable() call to isUpdatable()

---
 lib/filestorage/local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 6be04db96a..94b3147b73 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -85,7 +85,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $this->delTree($path);
 	}
 	public function rename($path1,$path2){
-		if (!$this->is_writable($path1)) {
+		if (!$this->isUpdatable($path1)) {
 			OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR);
 			return false;
 		}

From efbd7ca16626f6d066c19354710e29f50bbfddc9 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 01:12:58 +0200
Subject: [PATCH 1144/1537] Updated packages

---
 apps/files_imageviewer/js/jquery.fancybox-1.3.4.js      | 4 +---
 apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
index a1db7b6198..e5493cd939 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
@@ -124,9 +124,7 @@
 				} else if (href.indexOf("#") === 0) {
 					type = 'inline';
 
-				} else {
-					type = 'ajax';
-				}
+				} 
 			}
 
 			if (!type) {
diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
index e5ee2ae359..260f2c2d46 100644
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+++ b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
@@ -1 +1 @@
-(function(B){var L,T,Q,M,d,m,J,A,O,z,C=0,H={},j=[],e=0,G={},y=[],f=null,o=new Image(),i=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,k=/[^\.]\.(swf)\s*$/i,p,N=1,h=0,t="",b,c,P=false,s=B.extend(B("<div/>")[0],{prop:0}),S=B.browser.msie&&B.browser.version<7&&!window.XMLHttpRequest,r=function(){T.hide();o.onerror=o.onload=null;if(f){f.abort()}L.empty()},x=function(){if(false===H.onError(j,C,H)){T.hide();P=false;return}H.titleShow=false;H.width="auto";H.height="auto";L.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');n()},w=function(){var Z=j[C],W,Y,ab,aa,V,X;r();H=B.extend({},B.fn.fancybox.defaults,(typeof B(Z).data("fancybox")=="undefined"?H:B(Z).data("fancybox")));X=H.onStart(j,C,H);if(X===false){P=false;return}else{if(typeof X=="object"){H=B.extend(H,X)}}ab=H.title||(Z.nodeName?B(Z).attr("title"):Z.title)||"";if(Z.nodeName&&!H.orig){H.orig=B(Z).children("img:first").length?B(Z).children("img:first"):B(Z)}if(ab===""&&H.orig&&H.titleFromAlt){ab=H.orig.attr("alt")}ab=ab.replace(/</,"&lt;").replace(/>/,"&gt;");W=H.href||(Z.nodeName?B(Z).attr("href"):Z.href)||null;if((/^(?:javascript)/i).test(W)||W=="#"){W=null}if(H.type){Y=H.type;if(!W){W=H.content}}else{if(H.content){Y="html"}else{if(W){if(W.match(i)){Y="image"}else{if(W.match(k)){Y="swf"}else{if(B(Z).hasClass("iframe")){Y="iframe"}else{if(W.indexOf("#")===0){Y="inline"}else{Y="ajax"}}}}}}}if(!Y){x();return}if(Y=="inline"){Z=W.substr(W.indexOf("#"));Y=B(Z).length>0?"inline":"ajax"}H.type=Y;H.href=W;H.title=ab;if(H.autoDimensions){if(H.type=="html"||H.type=="inline"||H.type=="ajax"){H.width="auto";H.height="auto"}else{H.autoDimensions=false}}if(H.modal){H.overlayShow=true;H.hideOnOverlayClick=false;H.hideOnContentClick=false;H.enableEscapeButton=false;H.showCloseButton=false}H.padding=parseInt(H.padding,10);H.margin=parseInt(H.margin,10);L.css("padding",(H.padding+H.margin));B(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){B(this).replaceWith(m.children())});switch(Y){case"html":L.html(H.content);n();break;case"inline":if(B(Z).parent().is("#fancybox-content")===true){P=false;return}B('<div class="fancybox-inline-tmp" />').hide().insertBefore(B(Z)).bind("fancybox-cleanup",function(){B(this).replaceWith(m.children())}).bind("fancybox-cancel",function(){B(this).replaceWith(L.children())});B(Z).appendTo(L);n();break;case"image":P=false;B.fancybox.showActivity();o=new Image();o.onerror=function(){x()};o.onload=function(){P=true;o.onerror=o.onload=null;F()};o.src=W;break;case"swf":H.scrolling="no";aa='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+H.width+'" height="'+H.height+'"><param name="movie" value="'+W+'"></param>';V="";B.each(H.swf,function(ac,ad){aa+='<param name="'+ac+'" value="'+ad+'"></param>';V+=" "+ac+'="'+ad+'"'});aa+='<embed src="'+W+'" type="application/x-shockwave-flash" width="'+H.width+'" height="'+H.height+'"'+V+"></embed></object>";L.html(aa);n();break;case"ajax":P=false;B.fancybox.showActivity();H.ajax.win=H.ajax.success;f=B.ajax(B.extend({},H.ajax,{url:W,data:H.ajax.data||{},error:function(ac,ae,ad){if(ac.status>0){x()}},success:function(ad,af,ac){var ae=typeof ac=="object"?ac:f;if(ae.status==200){if(typeof H.ajax.win=="function"){X=H.ajax.win(W,ad,af,ac);if(X===false){T.hide();return}else{if(typeof X=="string"||typeof X=="object"){ad=X}}}L.html(ad);n()}}}));break;case"iframe":E();break}},n=function(){var V=H.width,W=H.height;if(V.toString().indexOf("%")>-1){V=parseInt((B(window).width()-(H.margin*2))*parseFloat(V)/100,10)+"px"}else{V=V=="auto"?"auto":V+"px"}if(W.toString().indexOf("%")>-1){W=parseInt((B(window).height()-(H.margin*2))*parseFloat(W)/100,10)+"px"}else{W=W=="auto"?"auto":W+"px"}L.wrapInner('<div style="width:'+V+";height:"+W+";overflow: "+(H.scrolling=="auto"?"auto":(H.scrolling=="yes"?"scroll":"hidden"))+';position:relative;"></div>');H.width=L.width();H.height=L.height();E()},F=function(){H.width=o.width;H.height=o.height;B("<img />").attr({id:"fancybox-img",src:o.src,alt:H.title}).appendTo(L);E()},E=function(){var W,V;T.hide();if(M.is(":visible")&&false===G.onCleanup(y,e,G)){B.event.trigger("fancybox-cancel");P=false;return}P=true;B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");if(M.is(":visible")&&G.titlePosition!=="outside"){M.css("height",M.height())}y=j;e=C;G=H;if(G.overlayShow){Q.css({"background-color":G.overlayColor,opacity:G.overlayOpacity,cursor:G.hideOnOverlayClick?"pointer":"auto",height:B(document).height()});if(!Q.is(":visible")){if(S){B("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"})}Q.show()}}else{Q.hide()}c=R();l();if(M.is(":visible")){B(J.add(O).add(z)).hide();W=M.position(),b={top:W.top,left:W.left,width:M.width(),height:M.height()};V=(b.width==c.width&&b.height==c.height);m.fadeTo(G.changeFade,0.3,function(){var X=function(){m.html(L.contents()).fadeTo(G.changeFade,1,v)};B.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":G.padding,width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2});if(V){X()}else{s.prop=0;B(s).animate({prop:1},{duration:G.changeSpeed,easing:G.easingChange,step:U,complete:X})}});return}M.removeAttr("style");m.css("border-width",G.padding);if(G.transitionIn=="elastic"){b=I();m.html(L.contents());M.show();if(G.opacity){c.opacity=0}s.prop=0;B(s).animate({prop:1},{duration:G.speedIn,easing:G.easingIn,step:U,complete:v});return}if(G.titlePosition=="inside"&&h>0){A.show()}m.css({width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2}).html(L.contents());M.css(c).fadeIn(G.transitionIn=="none"?0:G.speedIn,v)},D=function(V){if(V&&V.length){if(G.titlePosition=="float"){return'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+V+'</td><td id="fancybox-title-float-right"></td></tr></table>'}return'<div id="fancybox-title-'+G.titlePosition+'">'+V+"</div>"}return false},l=function(){t=G.title||"";h=0;A.empty().removeAttr("style").removeClass();if(G.titleShow===false){A.hide();return}t=B.isFunction(G.titleFormat)?G.titleFormat(t,y,e,G):D(t);if(!t||t===""){A.hide();return}A.addClass("fancybox-title-"+G.titlePosition).html(t).appendTo("body").show();switch(G.titlePosition){case"inside":A.css({width:c.width-(G.padding*2),marginLeft:G.padding,marginRight:G.padding});h=A.outerHeight(true);A.appendTo(d);c.height+=h;break;case"over":A.css({marginLeft:G.padding,width:c.width-(G.padding*2),bottom:G.padding}).appendTo(d);break;case"float":A.css("left",parseInt((A.width()-c.width-40)/2,10)*-1).appendTo(M);break;default:A.css({width:c.width-(G.padding*2),paddingLeft:G.padding,paddingRight:G.padding}).appendTo(M);break}A.hide()},g=function(){if(G.enableEscapeButton||G.enableKeyboardNav){B(document).bind("keydown.fb",function(V){if(V.keyCode==27&&G.enableEscapeButton){V.preventDefault();B.fancybox.close()}else{if((V.keyCode==37||V.keyCode==39)&&G.enableKeyboardNav&&V.target.tagName!=="INPUT"&&V.target.tagName!=="TEXTAREA"&&V.target.tagName!=="SELECT"){V.preventDefault();B.fancybox[V.keyCode==37?"prev":"next"]()}}})}if(!G.showNavArrows){O.hide();z.hide();return}if((G.cyclic&&y.length>1)||e!==0){O.show()}if((G.cyclic&&y.length>1)||e!=(y.length-1)){z.show()}},v=function(){if(!B.support.opacity){m.get(0).style.removeAttribute("filter");M.get(0).style.removeAttribute("filter")}if(H.autoDimensions){m.css("height","auto")}M.css("height","auto");if(t&&t.length){A.show()}if(G.showCloseButton){J.show()}g();if(G.hideOnContentClick){m.bind("click",B.fancybox.close)}if(G.hideOnOverlayClick){Q.bind("click",B.fancybox.close)}B(window).bind("resize.fb",B.fancybox.resize);if(G.centerOnScroll){B(window).bind("scroll.fb",B.fancybox.center)}if(G.type=="iframe"){B('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" '+(B.browser.msie?'allowtransparency="true""':"")+' scrolling="'+H.scrolling+'" src="'+G.href+'"></iframe>').appendTo(m)}M.show();P=false;B.fancybox.center();G.onComplete(y,e,G);K()},K=function(){var V,W;if((y.length-1)>e){V=y[e+1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}if(e>0){V=y[e-1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}},U=function(W){var V={width:parseInt(b.width+(c.width-b.width)*W,10),height:parseInt(b.height+(c.height-b.height)*W,10),top:parseInt(b.top+(c.top-b.top)*W,10),left:parseInt(b.left+(c.left-b.left)*W,10)};if(typeof c.opacity!=="undefined"){V.opacity=W<0.5?0.5:W}M.css(V);m.css({width:V.width-G.padding*2,height:V.height-(h*W)-G.padding*2})},u=function(){return[B(window).width()-(G.margin*2),B(window).height()-(G.margin*2),B(document).scrollLeft()+G.margin,B(document).scrollTop()+G.margin]},R=function(){var V=u(),Z={},W=G.autoScale,X=G.padding*2,Y;if(G.width.toString().indexOf("%")>-1){Z.width=parseInt((V[0]*parseFloat(G.width))/100,10)}else{Z.width=G.width+X}if(G.height.toString().indexOf("%")>-1){Z.height=parseInt((V[1]*parseFloat(G.height))/100,10)}else{Z.height=G.height+X}if(W&&(Z.width>V[0]||Z.height>V[1])){if(H.type=="image"||H.type=="swf"){Y=(G.width)/(G.height);if((Z.width)>V[0]){Z.width=V[0];Z.height=parseInt(((Z.width-X)/Y)+X,10)}if((Z.height)>V[1]){Z.height=V[1];Z.width=parseInt(((Z.height-X)*Y)+X,10)}}else{Z.width=Math.min(Z.width,V[0]);Z.height=Math.min(Z.height,V[1])}}Z.top=parseInt(Math.max(V[3]-20,V[3]+((V[1]-Z.height-40)*0.5)),10);Z.left=parseInt(Math.max(V[2]-20,V[2]+((V[0]-Z.width-40)*0.5)),10);return Z},q=function(V){var W=V.offset();W.top+=parseInt(V.css("paddingTop"),10)||0;W.left+=parseInt(V.css("paddingLeft"),10)||0;W.top+=parseInt(V.css("border-top-width"),10)||0;W.left+=parseInt(V.css("border-left-width"),10)||0;W.width=V.width();W.height=V.height();return W},I=function(){var Y=H.orig?B(H.orig):false,X={},W,V;if(Y&&Y.length){W=q(Y);X={width:W.width+(G.padding*2),height:W.height+(G.padding*2),top:W.top-G.padding-20,left:W.left-G.padding-20}}else{V=u();X={width:G.padding*2,height:G.padding*2,top:parseInt(V[3]+V[1]*0.5,10),left:parseInt(V[2]+V[0]*0.5,10)}}return X},a=function(){if(!T.is(":visible")){clearInterval(p);return}B("div",T).css("top",(N*-40)+"px");N=(N+1)%12};B.fn.fancybox=function(V){if(!B(this).length){return this}B(this).data("fancybox",B.extend({},V,(B.metadata?B(this).metadata():{}))).unbind("click.fb").bind("click.fb",function(X){X.preventDefault();if(P){return}P=true;B(this).blur();j=[];C=0;var W=B(this).attr("rel")||"";if(!W||W==""||W==="nofollow"){j.push(this)}else{j=B("a[rel="+W+"], area[rel="+W+"]");C=j.index(this)}w();return});return this};B.fancybox=function(Y){var X;if(P){return}P=true;X=typeof arguments[1]!=="undefined"?arguments[1]:{};j=[];C=parseInt(X.index,10)||0;if(B.isArray(Y)){for(var W=0,V=Y.length;W<V;W++){if(typeof Y[W]=="object"){B(Y[W]).data("fancybox",B.extend({},X,Y[W]))}else{Y[W]=B({}).data("fancybox",B.extend({content:Y[W]},X))}}j=jQuery.merge(j,Y)}else{if(typeof Y=="object"){B(Y).data("fancybox",B.extend({},X,Y))}else{Y=B({}).data("fancybox",B.extend({content:Y},X))}j.push(Y)}if(C>j.length||C<0){C=0}w()};B.fancybox.showActivity=function(){clearInterval(p);T.show();p=setInterval(a,66)};B.fancybox.hideActivity=function(){T.hide()};B.fancybox.next=function(){return B.fancybox.pos(e+1)};B.fancybox.prev=function(){return B.fancybox.pos(e-1)};B.fancybox.pos=function(V){if(P){return}V=parseInt(V);j=y;if(V>-1&&V<y.length){C=V;w()}else{if(G.cyclic&&y.length>1){C=V>=y.length?0:y.length-1;w()}}return};B.fancybox.cancel=function(){if(P){return}P=true;B.event.trigger("fancybox-cancel");r();H.onCancel(j,C,H);P=false};B.fancybox.close=function(){if(P||M.is(":hidden")){return}P=true;if(G&&false===G.onCleanup(y,e,G)){P=false;return}r();B(J.add(O).add(z)).hide();B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");m.find("iframe").attr("src",S&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");if(G.titlePosition!=="inside"){A.empty()}M.stop();function V(){Q.fadeOut("fast");A.empty().hide();M.hide();B.event.trigger("fancybox-cleanup");m.empty();G.onClosed(y,e,G);y=H=[];e=C=0;G=H={};P=false}if(G.transitionOut=="elastic"){b=I();var W=M.position();c={top:W.top,left:W.left,width:M.width(),height:M.height()};if(G.opacity){c.opacity=1}A.empty().hide();s.prop=1;B(s).animate({prop:0},{duration:G.speedOut,easing:G.easingOut,step:U,complete:V})}else{M.fadeOut(G.transitionOut=="none"?0:G.speedOut,V)}};B.fancybox.resize=function(){if(Q.is(":visible")){Q.css("height",B(document).height())}B.fancybox.center(true)};B.fancybox.center=function(){var V,W;if(P){return}W=arguments[0]===true?1:0;V=u();if(!W&&(M.width()>V[0]||M.height()>V[1])){return}M.stop().animate({top:parseInt(Math.max(V[3]-20,V[3]+((V[1]-m.height()-40)*0.5)-G.padding)),left:parseInt(Math.max(V[2]-20,V[2]+((V[0]-m.width()-40)*0.5)-G.padding))},typeof arguments[0]=="number"?arguments[0]:200)};B.fancybox.init=function(){if(B("#fancybox-wrap").length){return}B("body").append(L=B('<div id="fancybox-tmp"></div>'),T=B('<div id="fancybox-loading"><div></div></div>'),Q=B('<div id="fancybox-overlay"></div>'),M=B('<div id="fancybox-wrap"></div>'));d=B('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(M);d.append(m=B('<div id="fancybox-content"></div>'),J=B('<a id="fancybox-close"></a>'),A=B('<div id="fancybox-title"></div>'),O=B('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=B('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));J.click(B.fancybox.close);T.click(B.fancybox.cancel);O.click(function(V){V.preventDefault();B.fancybox.prev()});z.click(function(V){V.preventDefault();B.fancybox.next()});if(B.fn.mousewheel){M.bind("mousewheel.fb",function(V,W){if(P){V.preventDefault()}else{if(B(V.target).get(0).clientHeight==0||B(V.target).get(0).scrollHeight===B(V.target).get(0).clientHeight){V.preventDefault();B.fancybox[W>0?"prev":"next"]()}}})}if(!B.support.opacity){M.addClass("fancybox-ie")}if(S){T.addClass("fancybox-ie6");M.addClass("fancybox-ie6");B('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(d)}};B.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};B(document).ready(function(){B.fancybox.init()})})(jQuery);
\ No newline at end of file
+(function(B){var L,T,Q,M,d,m,J,A,O,z,C=0,H={},j=[],e=0,G={},y=[],f=null,o=new Image(),i=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,k=/[^\.]\.(swf)\s*$/i,p,N=1,h=0,t="",b,c,P=false,s=B.extend(B("<div/>")[0],{prop:0}),S=B.browser.msie&&B.browser.version<7&&!window.XMLHttpRequest,r=function(){T.hide();o.onerror=o.onload=null;if(f){f.abort()}L.empty()},x=function(){if(false===H.onError(j,C,H)){T.hide();P=false;return}H.titleShow=false;H.width="auto";H.height="auto";L.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');n()},w=function(){var Z=j[C],W,Y,ab,aa,V,X;r();H=B.extend({},B.fn.fancybox.defaults,(typeof B(Z).data("fancybox")=="undefined"?H:B(Z).data("fancybox")));X=H.onStart(j,C,H);if(X===false){P=false;return}else{if(typeof X=="object"){H=B.extend(H,X)}}ab=H.title||(Z.nodeName?B(Z).attr("title"):Z.title)||"";if(Z.nodeName&&!H.orig){H.orig=B(Z).children("img:first").length?B(Z).children("img:first"):B(Z)}if(ab===""&&H.orig&&H.titleFromAlt){ab=H.orig.attr("alt")}ab=ab.replace(/</,"&lt;").replace(/>/,"&gt;");W=H.href||(Z.nodeName?B(Z).attr("href"):Z.href)||null;if((/^(?:javascript)/i).test(W)||W=="#"){W=null}if(H.type){Y=H.type;if(!W){W=H.content}}else{if(H.content){Y="html"}else{if(W){if(W.match(i)){Y="image"}else{if(W.match(k)){Y="swf"}else{if(B(Z).hasClass("iframe")){Y="iframe"}else{if(W.indexOf("#")===0){Y="inline"}}}}}}}if(!Y){x();return}if(Y=="inline"){Z=W.substr(W.indexOf("#"));Y=B(Z).length>0?"inline":"ajax"}H.type=Y;H.href=W;H.title=ab;if(H.autoDimensions){if(H.type=="html"||H.type=="inline"||H.type=="ajax"){H.width="auto";H.height="auto"}else{H.autoDimensions=false}}if(H.modal){H.overlayShow=true;H.hideOnOverlayClick=false;H.hideOnContentClick=false;H.enableEscapeButton=false;H.showCloseButton=false}H.padding=parseInt(H.padding,10);H.margin=parseInt(H.margin,10);L.css("padding",(H.padding+H.margin));B(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){B(this).replaceWith(m.children())});switch(Y){case"html":L.html(H.content);n();break;case"inline":if(B(Z).parent().is("#fancybox-content")===true){P=false;return}B('<div class="fancybox-inline-tmp" />').hide().insertBefore(B(Z)).bind("fancybox-cleanup",function(){B(this).replaceWith(m.children())}).bind("fancybox-cancel",function(){B(this).replaceWith(L.children())});B(Z).appendTo(L);n();break;case"image":P=false;B.fancybox.showActivity();o=new Image();o.onerror=function(){x()};o.onload=function(){P=true;o.onerror=o.onload=null;F()};o.src=W;break;case"swf":H.scrolling="no";aa='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+H.width+'" height="'+H.height+'"><param name="movie" value="'+W+'"></param>';V="";B.each(H.swf,function(ac,ad){aa+='<param name="'+ac+'" value="'+ad+'"></param>';V+=" "+ac+'="'+ad+'"'});aa+='<embed src="'+W+'" type="application/x-shockwave-flash" width="'+H.width+'" height="'+H.height+'"'+V+"></embed></object>";L.html(aa);n();break;case"ajax":P=false;B.fancybox.showActivity();H.ajax.win=H.ajax.success;f=B.ajax(B.extend({},H.ajax,{url:W,data:H.ajax.data||{},error:function(ac,ae,ad){if(ac.status>0){x()}},success:function(ad,af,ac){var ae=typeof ac=="object"?ac:f;if(ae.status==200){if(typeof H.ajax.win=="function"){X=H.ajax.win(W,ad,af,ac);if(X===false){T.hide();return}else{if(typeof X=="string"||typeof X=="object"){ad=X}}}L.html(ad);n()}}}));break;case"iframe":E();break}},n=function(){var V=H.width,W=H.height;if(V.toString().indexOf("%")>-1){V=parseInt((B(window).width()-(H.margin*2))*parseFloat(V)/100,10)+"px"}else{V=V=="auto"?"auto":V+"px"}if(W.toString().indexOf("%")>-1){W=parseInt((B(window).height()-(H.margin*2))*parseFloat(W)/100,10)+"px"}else{W=W=="auto"?"auto":W+"px"}L.wrapInner('<div style="width:'+V+";height:"+W+";overflow: "+(H.scrolling=="auto"?"auto":(H.scrolling=="yes"?"scroll":"hidden"))+';position:relative;"></div>');H.width=L.width();H.height=L.height();E()},F=function(){H.width=o.width;H.height=o.height;B("<img />").attr({id:"fancybox-img",src:o.src,alt:H.title}).appendTo(L);E()},E=function(){var W,V;T.hide();if(M.is(":visible")&&false===G.onCleanup(y,e,G)){B.event.trigger("fancybox-cancel");P=false;return}P=true;B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");if(M.is(":visible")&&G.titlePosition!=="outside"){M.css("height",M.height())}y=j;e=C;G=H;if(G.overlayShow){Q.css({"background-color":G.overlayColor,opacity:G.overlayOpacity,cursor:G.hideOnOverlayClick?"pointer":"auto",height:B(document).height()});if(!Q.is(":visible")){if(S){B("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"})}Q.show()}}else{Q.hide()}c=R();l();if(M.is(":visible")){B(J.add(O).add(z)).hide();W=M.position(),b={top:W.top,left:W.left,width:M.width(),height:M.height()};V=(b.width==c.width&&b.height==c.height);m.fadeTo(G.changeFade,0.3,function(){var X=function(){m.html(L.contents()).fadeTo(G.changeFade,1,v)};B.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":G.padding,width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2});if(V){X()}else{s.prop=0;B(s).animate({prop:1},{duration:G.changeSpeed,easing:G.easingChange,step:U,complete:X})}});return}M.removeAttr("style");m.css("border-width",G.padding);if(G.transitionIn=="elastic"){b=I();m.html(L.contents());M.show();if(G.opacity){c.opacity=0}s.prop=0;B(s).animate({prop:1},{duration:G.speedIn,easing:G.easingIn,step:U,complete:v});return}if(G.titlePosition=="inside"&&h>0){A.show()}m.css({width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2}).html(L.contents());M.css(c).fadeIn(G.transitionIn=="none"?0:G.speedIn,v)},D=function(V){if(V&&V.length){if(G.titlePosition=="float"){return'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+V+'</td><td id="fancybox-title-float-right"></td></tr></table>'}return'<div id="fancybox-title-'+G.titlePosition+'">'+V+"</div>"}return false},l=function(){t=G.title||"";h=0;A.empty().removeAttr("style").removeClass();if(G.titleShow===false){A.hide();return}t=B.isFunction(G.titleFormat)?G.titleFormat(t,y,e,G):D(t);if(!t||t===""){A.hide();return}A.addClass("fancybox-title-"+G.titlePosition).html(t).appendTo("body").show();switch(G.titlePosition){case"inside":A.css({width:c.width-(G.padding*2),marginLeft:G.padding,marginRight:G.padding});h=A.outerHeight(true);A.appendTo(d);c.height+=h;break;case"over":A.css({marginLeft:G.padding,width:c.width-(G.padding*2),bottom:G.padding}).appendTo(d);break;case"float":A.css("left",parseInt((A.width()-c.width-40)/2,10)*-1).appendTo(M);break;default:A.css({width:c.width-(G.padding*2),paddingLeft:G.padding,paddingRight:G.padding}).appendTo(M);break}A.hide()},g=function(){if(G.enableEscapeButton||G.enableKeyboardNav){B(document).bind("keydown.fb",function(V){if(V.keyCode==27&&G.enableEscapeButton){V.preventDefault();B.fancybox.close()}else{if((V.keyCode==37||V.keyCode==39)&&G.enableKeyboardNav&&V.target.tagName!=="INPUT"&&V.target.tagName!=="TEXTAREA"&&V.target.tagName!=="SELECT"){V.preventDefault();B.fancybox[V.keyCode==37?"prev":"next"]()}}})}if(!G.showNavArrows){O.hide();z.hide();return}if((G.cyclic&&y.length>1)||e!==0){O.show()}if((G.cyclic&&y.length>1)||e!=(y.length-1)){z.show()}},v=function(){if(!B.support.opacity){m.get(0).style.removeAttribute("filter");M.get(0).style.removeAttribute("filter")}if(H.autoDimensions){m.css("height","auto")}M.css("height","auto");if(t&&t.length){A.show()}if(G.showCloseButton){J.show()}g();if(G.hideOnContentClick){m.bind("click",B.fancybox.close)}if(G.hideOnOverlayClick){Q.bind("click",B.fancybox.close)}B(window).bind("resize.fb",B.fancybox.resize);if(G.centerOnScroll){B(window).bind("scroll.fb",B.fancybox.center)}if(G.type=="iframe"){B('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" '+(B.browser.msie?'allowtransparency="true""':"")+' scrolling="'+H.scrolling+'" src="'+G.href+'"></iframe>').appendTo(m)}M.show();P=false;B.fancybox.center();G.onComplete(y,e,G);K()},K=function(){var V,W;if((y.length-1)>e){V=y[e+1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}if(e>0){V=y[e-1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}},U=function(W){var V={width:parseInt(b.width+(c.width-b.width)*W,10),height:parseInt(b.height+(c.height-b.height)*W,10),top:parseInt(b.top+(c.top-b.top)*W,10),left:parseInt(b.left+(c.left-b.left)*W,10)};if(typeof c.opacity!=="undefined"){V.opacity=W<0.5?0.5:W}M.css(V);m.css({width:V.width-G.padding*2,height:V.height-(h*W)-G.padding*2})},u=function(){return[B(window).width()-(G.margin*2),B(window).height()-(G.margin*2),B(document).scrollLeft()+G.margin,B(document).scrollTop()+G.margin]},R=function(){var V=u(),Z={},W=G.autoScale,X=G.padding*2,Y;if(G.width.toString().indexOf("%")>-1){Z.width=parseInt((V[0]*parseFloat(G.width))/100,10)}else{Z.width=G.width+X}if(G.height.toString().indexOf("%")>-1){Z.height=parseInt((V[1]*parseFloat(G.height))/100,10)}else{Z.height=G.height+X}if(W&&(Z.width>V[0]||Z.height>V[1])){if(H.type=="image"||H.type=="swf"){Y=(G.width)/(G.height);if((Z.width)>V[0]){Z.width=V[0];Z.height=parseInt(((Z.width-X)/Y)+X,10)}if((Z.height)>V[1]){Z.height=V[1];Z.width=parseInt(((Z.height-X)*Y)+X,10)}}else{Z.width=Math.min(Z.width,V[0]);Z.height=Math.min(Z.height,V[1])}}Z.top=parseInt(Math.max(V[3]-20,V[3]+((V[1]-Z.height-40)*0.5)),10);Z.left=parseInt(Math.max(V[2]-20,V[2]+((V[0]-Z.width-40)*0.5)),10);return Z},q=function(V){var W=V.offset();W.top+=parseInt(V.css("paddingTop"),10)||0;W.left+=parseInt(V.css("paddingLeft"),10)||0;W.top+=parseInt(V.css("border-top-width"),10)||0;W.left+=parseInt(V.css("border-left-width"),10)||0;W.width=V.width();W.height=V.height();return W},I=function(){var Y=H.orig?B(H.orig):false,X={},W,V;if(Y&&Y.length){W=q(Y);X={width:W.width+(G.padding*2),height:W.height+(G.padding*2),top:W.top-G.padding-20,left:W.left-G.padding-20}}else{V=u();X={width:G.padding*2,height:G.padding*2,top:parseInt(V[3]+V[1]*0.5,10),left:parseInt(V[2]+V[0]*0.5,10)}}return X},a=function(){if(!T.is(":visible")){clearInterval(p);return}B("div",T).css("top",(N*-40)+"px");N=(N+1)%12};B.fn.fancybox=function(V){if(!B(this).length){return this}B(this).data("fancybox",B.extend({},V,(B.metadata?B(this).metadata():{}))).unbind("click.fb").bind("click.fb",function(X){X.preventDefault();if(P){return}P=true;B(this).blur();j=[];C=0;var W=B(this).attr("rel")||"";if(!W||W==""||W==="nofollow"){j.push(this)}else{j=B("a[rel="+W+"], area[rel="+W+"]");C=j.index(this)}w();return});return this};B.fancybox=function(Y){var X;if(P){return}P=true;X=typeof arguments[1]!=="undefined"?arguments[1]:{};j=[];C=parseInt(X.index,10)||0;if(B.isArray(Y)){for(var W=0,V=Y.length;W<V;W++){if(typeof Y[W]=="object"){B(Y[W]).data("fancybox",B.extend({},X,Y[W]))}else{Y[W]=B({}).data("fancybox",B.extend({content:Y[W]},X))}}j=jQuery.merge(j,Y)}else{if(typeof Y=="object"){B(Y).data("fancybox",B.extend({},X,Y))}else{Y=B({}).data("fancybox",B.extend({content:Y},X))}j.push(Y)}if(C>j.length||C<0){C=0}w()};B.fancybox.showActivity=function(){clearInterval(p);T.show();p=setInterval(a,66)};B.fancybox.hideActivity=function(){T.hide()};B.fancybox.next=function(){return B.fancybox.pos(e+1)};B.fancybox.prev=function(){return B.fancybox.pos(e-1)};B.fancybox.pos=function(V){if(P){return}V=parseInt(V);j=y;if(V>-1&&V<y.length){C=V;w()}else{if(G.cyclic&&y.length>1){C=V>=y.length?0:y.length-1;w()}}return};B.fancybox.cancel=function(){if(P){return}P=true;B.event.trigger("fancybox-cancel");r();H.onCancel(j,C,H);P=false};B.fancybox.close=function(){if(P||M.is(":hidden")){return}P=true;if(G&&false===G.onCleanup(y,e,G)){P=false;return}r();B(J.add(O).add(z)).hide();B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");m.find("iframe").attr("src",S&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");if(G.titlePosition!=="inside"){A.empty()}M.stop();function V(){Q.fadeOut("fast");A.empty().hide();M.hide();B.event.trigger("fancybox-cleanup");m.empty();G.onClosed(y,e,G);y=H=[];e=C=0;G=H={};P=false}if(G.transitionOut=="elastic"){b=I();var W=M.position();c={top:W.top,left:W.left,width:M.width(),height:M.height()};if(G.opacity){c.opacity=1}A.empty().hide();s.prop=1;B(s).animate({prop:0},{duration:G.speedOut,easing:G.easingOut,step:U,complete:V})}else{M.fadeOut(G.transitionOut=="none"?0:G.speedOut,V)}};B.fancybox.resize=function(){if(Q.is(":visible")){Q.css("height",B(document).height())}B.fancybox.center(true)};B.fancybox.center=function(){var V,W;if(P){return}W=arguments[0]===true?1:0;V=u();if(!W&&(M.width()>V[0]||M.height()>V[1])){return}M.stop().animate({top:parseInt(Math.max(V[3]-20,V[3]+((V[1]-m.height()-40)*0.5)-G.padding)),left:parseInt(Math.max(V[2]-20,V[2]+((V[0]-m.width()-40)*0.5)-G.padding))},typeof arguments[0]=="number"?arguments[0]:200)};B.fancybox.init=function(){if(B("#fancybox-wrap").length){return}B("body").append(L=B('<div id="fancybox-tmp"></div>'),T=B('<div id="fancybox-loading"><div></div></div>'),Q=B('<div id="fancybox-overlay"></div>'),M=B('<div id="fancybox-wrap"></div>'));d=B('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(M);d.append(m=B('<div id="fancybox-content"></div>'),J=B('<a id="fancybox-close"></a>'),A=B('<div id="fancybox-title"></div>'),O=B('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=B('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));J.click(B.fancybox.close);T.click(B.fancybox.cancel);O.click(function(V){V.preventDefault();B.fancybox.prev()});z.click(function(V){V.preventDefault();B.fancybox.next()});if(B.fn.mousewheel){M.bind("mousewheel.fb",function(V,W){if(P){V.preventDefault()}else{if(B(V.target).get(0).clientHeight==0||B(V.target).get(0).scrollHeight===B(V.target).get(0).clientHeight){V.preventDefault();B.fancybox[W>0?"prev":"next"]()}}})}if(!B.support.opacity){M.addClass("fancybox-ie")}if(S){T.addClass("fancybox-ie6");M.addClass("fancybox-ie6");B('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(d)}};B.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};B(document).ready(function(){B.fancybox.init()})})(jQuery);
\ No newline at end of file

From 1554d7a2c01a97305d67f9ba04f736814705e839 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 00:06:51 +0200
Subject: [PATCH 1145/1537] Check for admin user

---
 core/ajax/appconfig.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index f815d71063..de91d458ed 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -6,6 +6,7 @@
  */
 
 require_once ("../../lib/base.php");
+OC_Util::checkAdminUser();
 OC_JSON::checkLoggedIn();
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;

From d425740dc2efb2328daa27d291253e0229619330 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 01:19:46 +0200
Subject: [PATCH 1146/1537] Remove unused files

---
 core/ajax/userlist.php     | 46 --------------------------------------
 core/ajax/validateuser.php | 38 -------------------------------
 2 files changed, 84 deletions(-)
 delete mode 100644 core/ajax/userlist.php
 delete mode 100644 core/ajax/validateuser.php

diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php
deleted file mode 100644
index 85ca004ae6..0000000000
--- a/core/ajax/userlist.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
-* ownCloud - ajax user list
-*
-* @author Hans Bakker
-* @copyright 2011 hansmbakker+kde@gmail.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/>.
-*
-*/
-
-$RUNTIME_NOAPPS = TRUE; //no apps, yet
-require_once('../../lib/base.php');
-
-if(!OC_User::isLoggedIn()){
-        if(!isset($_SERVER['PHP_AUTH_USER'])){
-                header('WWW-Authenticate: Basic realm="ownCloud Server"');
-                header('HTTP/1.0 401 Unauthorized');
-                echo 'Valid credentials must be supplied';
-                exit();
-        } else {
-                if(!OC_User::checkPassword($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){
-                        exit();
-                }
-        }
-}
-
-$users = array();
-
-foreach( OC_User::getUsers() as $i ){
-       	$users[] = array( "username" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ));
-}
-
-OC_JSON::encodedPrint($users);
diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php
deleted file mode 100644
index 78ec451fac..0000000000
--- a/core/ajax/validateuser.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Hans Bakker
-* @copyright 2011 Hans Bakker hansmbakker+kde@gmail.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/>.
-*
-*/
-
-$RUNTIME_NOAPPS = TRUE; //no apps, yet
-require_once('../../lib/base.php');
-
-if(!isset($_SERVER['PHP_AUTH_USER'])){
-        header('WWW-Authenticate: Basic realm="ownCloud Server"');
-        header('HTTP/1.0 401 Unauthorized');
-        echo 'Valid credentials must be supplied';
-        exit();
-} else {
-        if(OC_User::checkPassword($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){
-		OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "true"));
-	} else {
-	        OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "false"));
-	}
-}

From d24326ecce85fd103e186cfc3a00ebf8423bf4dc Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 01:38:20 +0200
Subject: [PATCH 1147/1537] Updated style

---
 core/ajax/appconfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index de91d458ed..84e0710c74 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -7,7 +7,7 @@
 
 require_once ("../../lib/base.php");
 OC_Util::checkAdminUser();
-OC_JSON::checkLoggedIn();
+
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;
 switch($action){

From 42c22bee369c46f29b84e665b2edd8c2875fdaf0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 26 Jul 2012 02:02:50 +0200
Subject: [PATCH 1148/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/it.php    |  50 +-
 apps/contacts/l10n/it.php    | 103 +++-
 apps/files/l10n/es.php       |  14 +-
 apps/files/l10n/it.php       |  14 +-
 apps/gallery/l10n/es.php     |   8 +-
 apps/gallery/l10n/it.php     |   8 +-
 l10n/es/files.po             |  69 +--
 l10n/es/gallery.po           |  65 +--
 l10n/es/settings.po          |  63 +--
 l10n/it/calendar.po          | 405 ++++++++++------
 l10n/it/contacts.po          | 916 ++++++++++++++++++-----------------
 l10n/it/files.po             |  68 +--
 l10n/it/gallery.po           |  64 +--
 l10n/it/settings.po          |  62 +--
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 settings/l10n/es.php         |   7 +
 settings/l10n/it.php         |   7 +
 24 files changed, 1095 insertions(+), 844 deletions(-)

diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index cdb2d99c82..b91e8b0df0 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Non tutti i calendari sono mantenuti completamente in cache",
+"Everything seems to be completely cached" => "Tutto sembra essere mantenuto completamente in cache",
 "No calendars found." => "Nessun calendario trovato.",
 "No events found." => "Nessun evento trovato.",
 "Wrong calendar" => "Calendario sbagliato",
+"The file contained either no events or all events are already saved in your calendar." => "Il file non conteneva alcun evento o tutti gli eventi erano già salvati nel tuo calendario.",
+"events has been saved in the new calendar" => "gli eventi sono stati salvati nel nuovo calendario",
+"Import failed" => "Importazione non riuscita",
+"events has been saved in your calendar" => "gli eventi sono stati salvati nel tuo calendario",
 "New Timezone:" => "Nuovo fuso orario:",
 "Timezone changed" => "Fuso orario cambiato",
 "Invalid request" => "Richiesta non valida",
 "Calendar" => "Calendario",
+"ddd" => "ggg",
+"ddd M/d" => "ggg M/g",
+"dddd M/d" => "gggg M/g",
+"MMMM yyyy" => "MMMM aaaa",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "gggg, MMM g, aaaa",
 "Birthday" => "Compleanno",
 "Business" => "Azienda",
 "Call" => "Chiama",
@@ -22,7 +33,9 @@
 "Projects" => "Progetti",
 "Questions" => "Domande",
 "Work" => "Lavoro",
+"by" => "da",
 "unnamed" => "senza nome",
+"New Calendar" => "Nuovo calendario",
 "Does not repeat" => "Non ripetere",
 "Daily" => "Giornaliero",
 "Weekly" => "Settimanale",
@@ -67,8 +80,26 @@
 "by day and month" => "per giorno e mese",
 "Date" => "Data",
 "Cal." => "Cal.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Gio.",
+"Fri." => "Ven.",
+"Sat." => "Sab.",
+"Jan." => "Gen.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Mag.",
+"Jun." => "Giu.",
+"Jul." => "Lug.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Ott.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "All day" => "Tutti il giorno",
-"New Calendar" => "Nuovo calendario",
 "Missing fields" => "Campi mancanti",
 "Title" => "Titolo",
 "From Date" => "Dal giorno",
@@ -132,18 +163,17 @@
 "Interval" => "Intervallo",
 "End" => "Fine",
 "occurrences" => "occorrenze",
-"Import a calendar file" => "Importa un file di calendario",
-"Please choose the calendar" => "Scegli il calendario",
 "create a new calendar" => "Crea un nuovo calendario",
+"Import a calendar file" => "Importa un file di calendario",
+"Please choose a calendar" => "Scegli un calendario",
 "Name of new calendar" => "Nome del nuovo calendario",
+"Take an available name!" => "Usa un nome disponibile!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Un calendario con questo nome esiste già. Se continui, i due calendari saranno uniti.",
 "Import" => "Importa",
-"Importing calendar" => "Importazione del calendario in corso",
-"Calendar imported successfully" => "Calendario importato correttamente",
 "Close Dialog" => "Chiudi la finestra di dialogo",
 "Create a new event" => "Crea un nuovo evento",
 "View an event" => "Visualizza un evento",
 "No categories selected" => "Nessuna categoria selezionata",
-"Select category" => "Seleziona una categoria",
 "of" => "di",
 "at" => "alle",
 "Timezone" => "Fuso orario",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Primo giorno della settimana",
-"Calendar CalDAV syncing address:" => "Indirizzo sincronizzazione calendario CalDAV:",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Cancella gli eventi che si ripetono dalla cache",
+"Calendar CalDAV syncing addresses" => "Indirizzi di sincronizzazione calendari CalDAV",
+"more info" => "ulteriori informazioni",
+"Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Collegamento(i) iCalendar sola lettura",
 "Users" => "Utenti",
 "select users" => "seleziona utenti",
 "Editable" => "Modificabile",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 2a5478e6c4..820104b777 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
 "There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
+"element name is not set." => "il nome dell'elemento non è impostato.",
+"id is not set." => "ID non impostato.",
+"Could not parse contact: " => "Impossibile elaborare il contatto: ",
 "Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
 "At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo.",
 "Trying to add duplicate property: " => "P",
-"Error adding contact property." => "Errore durante l'aggiunta della proprietà del contatto.",
+"Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
 "No ID provided" => "Nessun ID fornito",
 "Error setting checksum." => "Errore di impostazione del codice di controllo.",
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
@@ -12,22 +15,23 @@
 "No contacts found." => "Nessun contatto trovato.",
 "Missing ID" => "ID mancante",
 "Error parsing VCard for ID: \"" => "Errore in fase di elaborazione del file VCard per l'ID: \"",
-"Cannot add addressbook with an empty name." => "Impossibile aggiungere una rubrica senza nome.",
-"Error adding addressbook." => "Errore durante l'aggiunta della rubrica.",
-"Error activating addressbook." => "Errore durante l'attivazione della rubrica.",
 "No contact ID was submitted." => "Nessun ID di contatto inviato.",
 "Error reading contact photo." => "Errore di lettura della foto del contatto.",
 "Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
 "The loading photo is not valid." => "La foto caricata non è valida.",
-"id is not set." => "ID non impostato.",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard non corrette. Ricarica la pagina.",
 "Error deleting contact property." => "Errore durante l'eliminazione della proprietà del contatto.",
 "Contact ID is missing." => "Manca l'ID del contatto.",
-"Missing contact id." => "ID di contatto mancante.",
 "No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
 "File doesn't exist:" => "Il file non esiste:",
 "Error loading image." => "Errore di caricamento immagine.",
-"element name is not set." => "il nome dell'elemento non è impostato.",
+"Error getting contact object." => "Errore di recupero dell'oggetto contatto.",
+"Error getting PHOTO property." => "Errore di recupero della proprietà FOTO.",
+"Error saving contact." => "Errore di salvataggio del contatto.",
+"Error resizing image" => "Errore di ridimensionamento dell'immagine",
+"Error cropping image" => "Errore di ritaglio dell'immagine",
+"Error creating temporary image" => "Errore durante la creazione dell'immagine temporanea",
+"Error finding image: " => "Errore durante la ricerca dell'immagine: ",
 "checksum is not set." => "il codice di controllo non è impostato.",
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
 "Something went FUBAR. " => "Qualcosa è andato storto. ",
@@ -41,8 +45,27 @@
 "The uploaded file was only partially uploaded" => "Il file è stato inviato solo parzialmente",
 "No file was uploaded" => "Nessun file è stato inviato",
 "Missing a temporary folder" => "Manca una cartella temporanea",
+"Couldn't save temporary image: " => "Impossibile salvare l'immagine temporanea: ",
+"Couldn't load temporary image: " => "Impossibile caricare l'immagine temporanea: ",
+"No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
 "Contacts" => "Contatti",
-"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
+"Sorry, this functionality has not been implemented yet" => "Siamo spiacenti, questa funzionalità non è stata ancora implementata",
+"Not implemented" => "Non implementata",
+"Couldn't get a valid address." => "Impossibile ottenere un indirizzo valido.",
+"Error" => "Errore",
+"Contact" => "Contatto",
+"New" => "Nuovo",
+"New Contact" => "Nuovo contatto",
+"This property has to be non-empty." => "Questa proprietà non può essere vuota.",
+"Couldn't serialize elements." => "Impossibile serializzare gli elementi.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org",
+"Edit name" => "Modifica il nome",
+"No files selected for upload." => "Nessun file selezionato per l'invio",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server.",
+"Select type" => "Seleziona il tipo",
+"Result: " => "Risultato: ",
+" imported, " => " importato, ",
+" failed." => " non riuscito.",
 "Addressbook not found." => "Rubrica non trovata.",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
@@ -60,25 +83,54 @@
 "Video" => "Video",
 "Pager" => "Cercapersone",
 "Internet" => "Internet",
+"Birthday" => "Compleanno",
+"Business" => "Lavoro",
+"Call" => "Chiama",
+"Clients" => "Client",
+"Deliverer" => "Corriere",
+"Holidays" => "Festività",
+"Ideas" => "Idee",
+"Journey" => "Viaggio",
+"Jubilee" => "Anniversario",
+"Meeting" => "Riunione",
+"Other" => "Altro",
+"Personal" => "Personale",
+"Projects" => "Progetti",
+"Questions" => "Domande",
 "{name}'s Birthday" => "Data di nascita di {name}",
-"Contact" => "Contatto",
 "Add Contact" => "Aggiungi contatto",
+"Import" => "Importa",
 "Addressbooks" => "Rubriche",
+"Close" => "Chiudi",
+"Keyboard shortcuts" => "Scorciatoie da tastiera",
+"Navigation" => "Navigazione",
+"Next contact in list" => "Contatto successivo in elenco",
+"Previous contact in list" => "Contatto precedente in elenco",
+"Expand/collapse current addressbook" => "Espandi/Contrai la rubrica corrente",
+"Next/previous addressbook" => "Rubrica successiva/precedente",
+"Actions" => "Azioni",
+"Refresh contacts list" => "Aggiorna l'elenco dei contatti",
+"Add new contact" => "Aggiungi un nuovo contatto",
+"Add new addressbook" => "Aggiungi una nuova rubrica",
+"Delete current contact" => "Elimina il contatto corrente",
 "Configure Address Books" => "Configura rubrica",
 "New Address Book" => "Nuova rubrica",
-"Import from VCF" => "Importa da VCF",
 "CardDav Link" => "Link CardDav",
 "Download" => "Scarica",
 "Edit" => "Modifica",
 "Delete" => "Elimina",
-"Download contact" => "Scarica contatto",
-"Delete contact" => "Elimina contatto",
 "Drop photo to upload" => "Rilascia una foto da inviare",
+"Delete current photo" => "Elimina la foto corrente",
+"Edit current photo" => "Modifica la foto corrente",
+"Upload new photo" => "Invia una nuova foto",
+"Select photo from ownCloud" => "Seleziona la foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola",
 "Edit name details" => "Modifica dettagli del nome",
 "Nickname" => "Pseudonimo",
 "Enter nickname" => "Inserisci pseudonimo",
-"Birthday" => "Compleanno",
+"Web site" => "Sito web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Vai al sito web",
 "dd-mm-yyyy" => "gg-mm-aaaa",
 "Groups" => "Gruppi",
 "Separate groups with commas" => "Separa i gruppi con virgole",
@@ -94,24 +146,24 @@
 "Edit address details" => "Modifica dettagli dell'indirizzo",
 "Add notes here." => "Aggiungi qui le note.",
 "Add field" => "Aggiungi campo",
-"Profile picture" => "Immagine del profilo",
 "Phone" => "Telefono",
 "Note" => "Nota",
-"Delete current photo" => "Elimina la foto corrente",
-"Edit current photo" => "Modifica la foto corrente",
-"Upload new photo" => "Invia una nuova foto",
-"Select photo from ownCloud" => "Seleziona la foto da ownCloud",
+"Download contact" => "Scarica contatto",
+"Delete contact" => "Elimina contatto",
+"The temporary image has been removed from cache." => "L'immagine temporanea è stata rimossa dalla cache.",
 "Edit address" => "Modifica indirizzo",
 "Type" => "Tipo",
 "PO Box" => "Casella postale",
+"Street address" => "Indirizzo",
+"Street and number" => "Via e numero",
 "Extended" => "Esteso",
-"Street" => "Via",
+"Apartment number etc." => "Numero appartamento ecc.",
 "City" => "Città",
 "Region" => "Regione",
+"E.g. state or province" => "Ad es. stato o provincia",
 "Zipcode" => "CAP",
+"Postal code" => "CAP",
 "Country" => "Stato",
-"Edit categories" => "Modifica categorie",
-"Add" => "Aggiungi",
 "Addressbook" => "Rubrica",
 "Hon. prefixes" => "Prefissi onorifici",
 "Miss" => "Sig.na",
@@ -143,15 +195,16 @@
 "Please choose the addressbook" => "Scegli la rubrica",
 "create a new addressbook" => "crea una nuova rubrica",
 "Name of new addressbook" => "Nome della nuova rubrica",
-"Import" => "Importa",
 "Importing contacts" => "Importazione contatti",
-"Select address book to import to:" => "Seleziona la rubrica di destinazione:",
-"Select from HD" => "Seleziona da disco",
 "You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
 "Add contact" => "Aggiungi contatto",
 "Configure addressbooks" => "Configura rubriche",
+"Select Address Books" => "Seleziona rubriche",
+"Enter name" => "Inserisci il nome",
+"Enter description" => "Inserisci una descrizione",
 "CardDAV syncing addresses" => "Indirizzi di sincronizzazione CardDAV",
 "more info" => "altre informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "Collegamento(i) cartella vCard sola lettura"
 );
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 67bfb4702e..506218815b 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
+"Unshare" => "No compartir",
+"Delete" => "Eliminado",
+"undo deletion" => "deshacer la eliminación",
+"generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
+"Upload Error" => "Error al subir el archivo",
+"Pending" => "Pendiente",
+"Upload cancelled." => "Subida cancelada.",
+"Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
+"folder" => "carpeta",
+"folders" => "carpetas",
+"file" => "archivo",
+"files" => "archivos",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
@@ -26,7 +39,6 @@
 "Name" => "Nombre",
 "Share" => "Compartir",
 "Download" => "Descargar",
-"Delete" => "Eliminado",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 82871826c1..0bf113eba1 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Files" => "File",
+"Unshare" => "Rimuovi condivisione",
+"Delete" => "Elimina",
+"undo deletion" => "annulla l'eliminazione",
+"generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
+"Upload Error" => "Errore di invio",
+"Pending" => "In corso",
+"Upload cancelled." => "Invio annullato",
+"Invalid name, '/' is not allowed." => "Nome non valido",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
+"folder" => "cartella",
+"folders" => "cartelle",
+"file" => "file",
+"files" => "file",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
 "max. possible: " => "numero mass.: ",
@@ -26,7 +39,6 @@
 "Name" => "Nome",
 "Share" => "Condividi",
 "Download" => "Scarica",
-"Delete" => "Elimina",
 "Upload too large" => "Il file caricato è troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
index 03e8d6a456..aa425a0bd0 100644
--- a/apps/gallery/l10n/es.php
+++ b/apps/gallery/l10n/es.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Imágenes",
-"Settings" => "Preferencias",
-"Rescan" => "Refrescar",
-"Stop" => "Parar",
-"Share" => "Compartir",
+"Share gallery" => "Compartir galería",
+"Error: " => "Fallo ",
+"Internal error" => "Fallo interno",
+"Slideshow" => "Presentación",
 "Back" => "Atrás",
 "Remove confirmation" => "Borrar confirmación",
 "Do you want to remove album" => "¿Quieres eliminar el álbum",
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
index e21a1d6524..ef8d596e7e 100644
--- a/apps/gallery/l10n/it.php
+++ b/apps/gallery/l10n/it.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Immagini",
-"Settings" => "Impostazioni",
-"Rescan" => "Nuova scansione",
-"Stop" => "Ferma",
-"Share" => "Condividi",
+"Share gallery" => "Condividi la galleria",
+"Error: " => "Errore: ",
+"Internal error" => "Errore interno",
+"Slideshow" => "Presentazione",
 "Back" => "Indietro",
 "Remove confirmation" => "Rimuovi conferma",
 "Do you want to remove album" => "Vuoi rimuovere l'album",
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 4e4b0b0c2d..ccd3fc76a0 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -4,48 +4,49 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+#   <juanma@kde.org.ar>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 23:05+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "No se ha producido ningún error, el archivo se ha subido con éxito"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentas subir solo se subió parcialmente"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
@@ -53,57 +54,65 @@ msgstr "La escritura en disco ha fallado"
 msgid "Files"
 msgstr "Archivos"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "No compartir"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Eliminado"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "deshacer la eliminación"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "generando un fichero ZIP, puede llevar un tiempo."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Error al subir el archivo"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Subida cancelada."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "carpeta"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "carpetas"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "archivo"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "archivos"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +182,6 @@ msgstr "Compartir"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Eliminado"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
index 94068028c6..8a67c77187 100644
--- a/l10n/es/gallery.po
+++ b/l10n/es/gallery.po
@@ -5,76 +5,41 @@
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2012.
+#   <rodrigo.calvo@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 23:13+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Imágenes"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Compartir galería"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Fallo "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Fallo interno"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Preferencias"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Refrescar"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Parar"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Compartir"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Presentación"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index a8cb655556..d594551c6e 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -7,16 +7,17 @@
 #   <juanma@kde.org.ar>, 2011, 2012.
 #   <monty_2731@hotmail.com>, 2011.
 # oSiNaReF  <>, 2012.
+#   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 23:06+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,65 +26,69 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Correo salvado"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Correo Incorrecto"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID cambiado"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Solicitud no válida"
 
-#: ajax/setlanguage.php:17
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Desactivar"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Salvando.."
 
-#: personal.php:40 personal.php:41
+#: personal.php:41 personal.php:42
 msgid "__language_name__"
 msgstr "Castellano"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Advertencia de seguridad"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Más"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Añade tu aplicación"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Revisa la web de apps apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-autorizado"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "por"
 
@@ -175,34 +180,34 @@ msgstr "Ayúdanos a traducir"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "utiliza esta dirección para conectar a tu ownCloud desde tu gestor de archivos"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:15 templates/users.php:60
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:17 templates/users.php:61
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:22
+#: templates/users.php:25
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:25
+#: templates/users.php:28
 msgid "Default Quota"
 msgstr "Cuota predeterminada"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:47 templates/users.php:103
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:47
+#: templates/users.php:63
 msgid "Quota"
 msgstr "Cuota"
 
-#: templates/users.php:80
+#: templates/users.php:110
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index ed36e36d84..67fa300db8 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,21 +15,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 20:45+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Non tutti i calendari sono mantenuti completamente in cache"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Tutto sembra essere mantenuto completamente in cache"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nessun calendario trovato."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nessun evento trovato."
 
@@ -37,43 +45,57 @@ msgstr "Nessun evento trovato."
 msgid "Wrong calendar"
 msgstr "Calendario sbagliato"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Il file non conteneva alcun evento o tutti gli eventi erano già salvati nel tuo calendario."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "gli eventi sono stati salvati nel nuovo calendario"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Importazione non riuscita"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "gli eventi sono stati salvati nel tuo calendario"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nuovo fuso orario:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fuso orario cambiato"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ggg"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ggg M/g"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "gggg M/g"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM aaaa"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -81,256 +103,337 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "gggg, MMM g, aaaa"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Azienda"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clienti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Consegna"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vacanze"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Domande"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "da"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "senza nome"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nuovo calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Non ripetere"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Giornaliero"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Settimanale"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Ogni giorno della settimana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Ogni due settimane"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensile"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Annuale"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "mai"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "per occorrenze"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "per data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "per giorno del mese"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "per giorno della settimana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Lunedì"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Venerdì"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sabato"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Domenica"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "settimana del mese degli eventi"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primo"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "secondo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terzo"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ultimo"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Gennaio"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Febbraio"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzo"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprile"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maggio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Giugno"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Luglio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Settembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Ottobre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dicembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "per data evento"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "per giorno/i dell'anno"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "per numero/i settimana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "per giorno e mese"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Dom."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Lun."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Mar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Mer."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Gio."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Ven."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Sab."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Gen."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Mag."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Giu."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Lug."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Ago."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Set."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Ott."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dic."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Tutti il giorno"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nuovo calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Campi mancanti"
@@ -364,27 +467,27 @@ msgstr "L'evento finisce prima d'iniziare"
 msgid "There was a database fail"
 msgstr "Si è verificato un errore del database"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Settimana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mese"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Elenco"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Oggi"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Calendari"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Si è verificato un errore durante l'analisi del file."
 
@@ -397,7 +500,7 @@ msgid "Your calendars"
 msgstr "I tuoi calendari"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Collegamento CalDav"
 
@@ -409,19 +512,19 @@ msgstr "Calendari condivisi"
 msgid "No shared calendars"
 msgstr "Nessun calendario condiviso"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Condividi calendario"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Modifica"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Elimina"
@@ -507,23 +610,23 @@ msgstr "Categorie separate con virgole"
 msgid "Edit categories"
 msgstr "Modifica le categorie"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Evento che occupa tutta la giornata"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Da"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "A"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opzioni avanzate"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Luogo"
 
@@ -531,7 +634,7 @@ msgstr "Luogo"
 msgid "Location of the Event"
 msgstr "Luogo dell'evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrizione"
 
@@ -539,84 +642,86 @@ msgstr "Descrizione"
 msgid "Description of the Event"
 msgstr "Descrizione dell'evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleziona i giorni della settimana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleziona i giorni"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e il giorno dell'anno degli eventi."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e il giorno del mese degli eventi."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleziona i mesi"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleziona le settimane"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e la settimana dell'anno degli eventi."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervallo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fine"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "occorrenze"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importa un file di calendario"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Scegli il calendario"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importa un file di calendario"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Scegli un calendario"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome del nuovo calendario"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Usa un nome disponibile!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Un calendario con questo nome esiste già. Se continui, i due calendari saranno uniti."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importa"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importazione del calendario in corso"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendario importato correttamente"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Chiudi la finestra di dialogo"
 
@@ -632,15 +737,11 @@ msgstr "Visualizza un evento"
 msgid "No categories selected"
 msgstr "Nessuna categoria selezionata"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Seleziona una categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "di"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "alle"
 
@@ -668,9 +769,33 @@ msgstr "12h"
 msgid "First day of the week"
 msgstr "Primo giorno della settimana"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Indirizzo sincronizzazione calendario CalDAV:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Cache"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr "Cancella gli eventi che si ripetono dalla cache"
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Indirizzi di sincronizzazione calendari CalDAV"
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "ulteriori informazioni"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Indirizzo principale (Kontact e altri)"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr "Collegamento(i) iCalendar sola lettura"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 0e1a62a6f9..64b9e1e0a1 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,101 +11,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 21:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Errore nel (dis)attivare la rubrica."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Si è verificato un errore nell'aggiunta del contatto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "il nome dell'elemento non è impostato."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID non impostato."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Impossibile elaborare il contatto: "
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Impossibile aggiungere una proprietà vuota."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Deve essere riempito almeno un indirizzo."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "P"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Errore durante l'aggiunta della proprietà del contatto."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Errore durante l'aggiunta della proprietà del contatto: "
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nessun ID fornito"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Errore di impostazione del codice di controllo."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nessuna categoria selezionata per l'eliminazione."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nessuna rubrica trovata."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nessun contatto trovato."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID mancante"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Impossibile aggiungere una rubrica senza nome."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Errore durante l'aggiunta della rubrica."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Errore durante l'attivazione della rubrica."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nessun ID di contatto inviato."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr "Errore di lettura della foto del contatto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Errore di salvataggio del file temporaneo."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "La foto caricata non è valida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID non impostato."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard non corrette. Ricarica la pagina."
@@ -114,328 +110,387 @@ msgstr "Informazioni sulla vCard non corrette. Ricarica la pagina."
 msgid "Error deleting contact property."
 msgstr "Errore durante l'eliminazione della proprietà del contatto."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Manca l'ID del contatto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "ID di contatto mancante."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Non è stato inviato alcun percorso a una foto."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Il file non esiste:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Errore di caricamento immagine."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Errore di recupero dell'oggetto contatto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Errore di recupero della proprietà FOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Errore durante la ricerca dell'immagine: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "il nome dell'elemento non è impostato."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "il codice di controllo non è impostato."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Impossibile aggiornare una rubrica senza nome."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Errore durante l'aggiornamento della rubrica."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato inviato correttamente"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file inviato supera la direttiva upload_max_filesize nel php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato inviato solo parzialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nessun file è stato inviato"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Impossibile salvare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Impossibile caricare l'immagine temporanea: "
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contatti"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "Non implementata"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Impossibile ottenere un indirizzo valido."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Rilascia un file VCF per importare i contatti."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Rubrica non trovata."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Questa non è la tua rubrica."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Il contatto non può essere trovato."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Indirizzo"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefono"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Email"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organizzazione"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Lavoro"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Casa"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Cellulare"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Testo"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Voce"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Messaggio"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Cercapersone"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Data di nascita di {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Contatto"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Nuovo"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Nuovo contatto"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Questa proprietà non può essere vuota."
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "Impossibile serializzare gli elementi."
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Modifica il nome"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "Nessun file selezionato per l'invio"
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Seleziona il tipo"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Risultato: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importato, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " non riuscito."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "Rubrica non trovata."
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Questa non è la tua rubrica."
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "Il contatto non può essere trovato."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Indirizzo"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Telefono"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organizzazione"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Lavoro"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Casa"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Cellulare"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "Testo"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Voce"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Messaggio"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Cercapersone"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Compleanno"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Lavoro"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr "Chiama"
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Client"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr "Corriere"
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Festività"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr "Idee"
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr "Viaggio"
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr "Anniversario"
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr "Riunione"
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Altro"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr "Personale"
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr "Progetti"
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Domande"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Data di nascita di {name}"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Importa"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Rubriche"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Chiudi"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr "Scorciatoie da tastiera"
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr "Navigazione"
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr "Contatto successivo in elenco"
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr "Contatto precedente in elenco"
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr "Espandi/Contrai la rubrica corrente"
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr "Rubrica successiva/precedente"
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Azioni"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Aggiorna l'elenco dei contatti"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Aggiungi un nuovo contatto"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Aggiungi una nuova rubrica"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Elimina il contatto corrente"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configura rubrica"
@@ -444,11 +499,7 @@ msgstr "Configura rubrica"
 msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importa da VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Link CardDav"
@@ -462,186 +513,195 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Scarica contatto"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Elimina contatto"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Rilascia una foto da inviare"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Modifica dettagli del nome"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Pseudonimo"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Inserisci pseudonimo"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Compleanno"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "gg-mm-aaaa"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Gruppi"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separa i gruppi con virgole"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Modifica gruppi"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferito"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Specifica un indirizzo email valido"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Inserisci indirizzo email"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Invia per email"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Elimina l'indirizzo email"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Inserisci il numero di telefono"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Elimina il numero di telefono"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Visualizza sulla mappa"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Modifica dettagli dell'indirizzo"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Aggiungi qui le note."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Aggiungi campo"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Immagine del profilo"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefono"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Nota"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Elimina la foto corrente"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Modifica la foto corrente"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Invia una nuova foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
-msgstr ""
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Modifica dettagli del nome"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Pseudonimo"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Inserisci pseudonimo"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Sito web"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Vai al sito web"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "gg-mm-aaaa"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Gruppi"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separa i gruppi con virgole"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Modifica gruppi"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferito"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Specifica un indirizzo email valido"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Inserisci indirizzo email"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Invia per email"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Elimina l'indirizzo email"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Inserisci il numero di telefono"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Elimina il numero di telefono"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Visualizza sulla mappa"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Modifica dettagli dell'indirizzo"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Aggiungi qui le note."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Aggiungi campo"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefono"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Nota"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Scarica contatto"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Elimina contatto"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "L'immagine temporanea è stata rimossa dalla cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Modifica indirizzo"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Casella postale"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Indirizzo"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Via e numero"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Esteso"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Via"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Numero appartamento ecc."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Città"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regione"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "Ad es. stato o provincia"
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "CAP"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "CAP"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Stato"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Modifica categorie"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Aggiungi"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Rubrica"
@@ -747,7 +807,6 @@ msgid "Submit"
 msgstr "Invia"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -767,33 +826,10 @@ msgstr "crea una nuova rubrica"
 msgid "Name of new addressbook"
 msgstr "Nome della nuova rubrica"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importa"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importazione contatti"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Seleziona la rubrica di destinazione:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Seleziona da disco"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Non hai contatti nella rubrica."
@@ -806,6 +842,18 @@ msgstr "Aggiungi contatto"
 msgid "Configure addressbooks"
 msgstr "Configura rubriche"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Seleziona rubriche"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Inserisci il nome"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Inserisci una descrizione"
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "Indirizzi di sincronizzazione CardDAV"
@@ -821,3 +869,7 @@ msgstr "Indirizzo principale (Kontact e altri)"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr "Collegamento(i) cartella vCard sola lettura"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 8db41dc647..196985d5f8 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,43 +11,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 20:35+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, file caricato con successo"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file caricato supera il valore upload_max_filesize in php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato parzialmente caricato"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Cartella temporanea mancante"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
@@ -55,57 +55,65 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Files"
 msgstr "File"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Rimuovi condivisione"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Elimina"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "annulla l'eliminazione"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "creazione file ZIP, potrebbe richiedere del tempo."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Errore di invio"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "In corso"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Invio annullato"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nome non valido"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "cartella"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "cartelle"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "file"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "file"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -175,10 +183,6 @@ msgstr "Condividi"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Elimina"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Il file caricato è troppo grande"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 794458ec1f..d60292cea1 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -10,71 +10,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 20:36+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Immagini"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Condividi la galleria"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Errore: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Errore interno"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Nuova scansione"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Ferma"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Condividi"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Presentazione"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 56936ed81f..6ae91a7c78 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"PO-Revision-Date: 2012-07-25 20:36+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,65 +26,69 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email salvata"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Email non valida"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID modificato"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
-#: ajax/setlanguage.php:17
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Lingua modificata"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Disabilita"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Abilita"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Salvataggio in corso..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:41 personal.php:42
 msgid "__language_name__"
 msgstr "Italiano"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Avviso di sicurezza"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Altro"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Aggiungi la tua applicazione"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-rilasciato"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "da"
 
@@ -176,34 +180,34 @@ msgstr "Migliora la traduzione"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:15 templates/users.php:60
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:17 templates/users.php:61
 msgid "Password"
 msgstr "Password"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/users.php:22
+#: templates/users.php:25
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:25
+#: templates/users.php:28
 msgid "Default Quota"
 msgstr "Quota predefinita"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:47 templates/users.php:103
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:47
+#: templates/users.php:63
 msgid "Quota"
 msgstr "Quote"
 
-#: templates/users.php:80
+#: templates/users.php:110
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 3a9362d978..bae23f3a63 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index c96214c465..60b6126208 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 993fd3f877..cb2045e027 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4f0a33760a..6bcaf6d4c5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d3f9a451e4..a607c408a3 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 658db4f6e4..694bdf4a58 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index adbef7481b..528fcdce23 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 5b9ddb8262..44a2173caf 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
+"POT-Creation-Date: 2012-07-26 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index c8ddb412ec..305728d3dc 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Correo salvado",
+"Invalid email" => "Correo Incorrecto",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
 "Language changed" => "Idioma cambiado",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
+"Saving..." => "Salvando..",
 "__language_name__" => "Castellano",
+"Security Warning" => "Advertencia de seguridad",
 "Log" => "Registro",
 "More" => "Más",
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
+"See application page at apps.owncloud.com" => "Revisa la web de apps apps.owncloud.com",
 "-licensed" => "-autorizado",
 "by" => "por",
 "Documentation" => "Documentación",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index a4b255546a..ca138cf8c1 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email salvata",
+"Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
 "Language changed" => "Lingua modificata",
+"Disable" => "Disabilita",
+"Enable" => "Abilita",
+"Saving..." => "Salvataggio in corso...",
 "__language_name__" => "Italiano",
+"Security Warning" => "Avviso di sicurezza",
 "Log" => "Registro",
 "More" => "Altro",
 "Add your App" => "Aggiungi la tua applicazione",
 "Select an App" => "Seleziona un'applicazione",
+"See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
 "-licensed" => "-rilasciato",
 "by" => "da",
 "Documentation" => "Documentazione",

From ba0ea210744479e7cbf092fe0115c4d27fff1c48 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 26 Jul 2012 08:04:12 +0200
Subject: [PATCH 1149/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/vi.php    | 135 ++++++
 apps/contacts/l10n/vi.php    |  48 ++
 apps/files/l10n/vi.php       |  31 ++
 apps/gallery/l10n/vi.php     |  11 +
 apps/media/l10n/vi.php       |  14 +
 core/l10n/vi.php             |  64 +++
 l10n/ar_SA/calendar.po       | 814 ++++++++++++++++++++++++++++++++
 l10n/ar_SA/contacts.po       | 871 ++++++++++++++++++++++++++++++++++
 l10n/ar_SA/core.po           | 268 +++++++++++
 l10n/ar_SA/files.po          | 198 ++++++++
 l10n/ar_SA/gallery.po        |  58 +++
 l10n/ar_SA/media.po          |  66 +++
 l10n/ar_SA/settings.po       | 206 +++++++++
 l10n/id_ID/calendar.po       | 814 ++++++++++++++++++++++++++++++++
 l10n/id_ID/contacts.po       | 871 ++++++++++++++++++++++++++++++++++
 l10n/id_ID/core.po           | 268 +++++++++++
 l10n/id_ID/files.po          | 198 ++++++++
 l10n/id_ID/gallery.po        |  58 +++
 l10n/id_ID/media.po          |  66 +++
 l10n/id_ID/settings.po       | 206 +++++++++
 l10n/so/calendar.po          | 814 ++++++++++++++++++++++++++++++++
 l10n/so/contacts.po          | 871 ++++++++++++++++++++++++++++++++++
 l10n/so/core.po              | 268 +++++++++++
 l10n/so/files.po             | 198 ++++++++
 l10n/so/gallery.po           |  58 +++
 l10n/so/media.po             |  66 +++
 l10n/so/settings.po          | 206 +++++++++
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       | 112 +++++
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 l10n/vi/calendar.po          | 816 ++++++++++++++++++++++++++++++++
 l10n/vi/contacts.po          | 872 +++++++++++++++++++++++++++++++++++
 l10n/vi/core.po              | 269 +++++++++++
 l10n/vi/files.po             | 199 ++++++++
 l10n/vi/gallery.po           |  60 +++
 l10n/vi/media.po             |  67 +++
 l10n/vi/settings.po          | 208 +++++++++
 settings/l10n/vi.php         |  48 ++
 44 files changed, 10405 insertions(+), 8 deletions(-)
 create mode 100644 apps/calendar/l10n/vi.php
 create mode 100644 apps/contacts/l10n/vi.php
 create mode 100644 apps/files/l10n/vi.php
 create mode 100644 apps/gallery/l10n/vi.php
 create mode 100644 apps/media/l10n/vi.php
 create mode 100644 core/l10n/vi.php
 create mode 100644 l10n/ar_SA/calendar.po
 create mode 100644 l10n/ar_SA/contacts.po
 create mode 100644 l10n/ar_SA/core.po
 create mode 100644 l10n/ar_SA/files.po
 create mode 100644 l10n/ar_SA/gallery.po
 create mode 100644 l10n/ar_SA/media.po
 create mode 100644 l10n/ar_SA/settings.po
 create mode 100644 l10n/id_ID/calendar.po
 create mode 100644 l10n/id_ID/contacts.po
 create mode 100644 l10n/id_ID/core.po
 create mode 100644 l10n/id_ID/files.po
 create mode 100644 l10n/id_ID/gallery.po
 create mode 100644 l10n/id_ID/media.po
 create mode 100644 l10n/id_ID/settings.po
 create mode 100644 l10n/so/calendar.po
 create mode 100644 l10n/so/contacts.po
 create mode 100644 l10n/so/core.po
 create mode 100644 l10n/so/files.po
 create mode 100644 l10n/so/gallery.po
 create mode 100644 l10n/so/media.po
 create mode 100644 l10n/so/settings.po
 create mode 100644 l10n/templates/lib.pot
 create mode 100644 l10n/vi/calendar.po
 create mode 100644 l10n/vi/contacts.po
 create mode 100644 l10n/vi/core.po
 create mode 100644 l10n/vi/files.po
 create mode 100644 l10n/vi/gallery.po
 create mode 100644 l10n/vi/media.po
 create mode 100644 l10n/vi/settings.po
 create mode 100644 settings/l10n/vi.php

diff --git a/apps/calendar/l10n/vi.php b/apps/calendar/l10n/vi.php
new file mode 100644
index 0000000000..059b89e163
--- /dev/null
+++ b/apps/calendar/l10n/vi.php
@@ -0,0 +1,135 @@
+<?php $TRANSLATIONS = array(
+"No calendars found." => "Không tìm thấy lịch.",
+"No events found." => "Không tìm thấy sự kiện nào",
+"Wrong calendar" => "Sai lịch",
+"New Timezone:" => "Múi giờ mới :",
+"Timezone changed" => "Thay đổi múi giờ",
+"Invalid request" => "Yêu cầu không hợp lệ",
+"Calendar" => "Lịch",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
+"Birthday" => "Ngày sinh nhật",
+"Business" => "Công việc",
+"Call" => "Số điện thoại",
+"Clients" => "Máy trạm",
+"Holidays" => "Ngày lễ",
+"Ideas" => "Ý tưởng",
+"Jubilee" => "Lễ kỷ niệm",
+"Meeting" => "Hội nghị",
+"Other" => "Khác",
+"Personal" => "Cá nhân",
+"Projects" => "Dự án",
+"Questions" => "Câu hỏi",
+"Work" => "Công việc",
+"New Calendar" => "Lịch mới",
+"Does not repeat" => "Không lặp lại",
+"Daily" => "Hàng ngày",
+"Weekly" => "Hàng tuần",
+"Every Weekday" => "Mỗi ngày trong tuần",
+"Bi-Weekly" => "Hai tuần một lần",
+"Monthly" => "Hàng tháng",
+"Yearly" => "Hàng năm",
+"never" => "không thay đổi",
+"by occurrences" => "bởi xuất hiện",
+"by date" => "bởi ngày",
+"by monthday" => "bởi ngày trong tháng",
+"by weekday" => "bởi ngày trong tuần",
+"Monday" => "Thứ 2",
+"Tuesday" => "Thứ 3",
+"Wednesday" => "Thứ 4",
+"Thursday" => "Thứ 5",
+"Friday" => "Thứ ",
+"Saturday" => "Thứ 7",
+"Sunday" => "Chủ nhật",
+"events week of month" => "sự kiện trong tuần của tháng",
+"first" => "đầu tiên",
+"second" => "Thứ hai",
+"third" => "Thứ ba",
+"fourth" => "Thứ tư",
+"fifth" => "Thứ năm",
+"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",
+"by events date" => "Theo ngày tháng sự kiện",
+"by weeknumber(s)" => "số tuần",
+"by day and month" => "ngày, tháng",
+"Date" => "Ngày",
+"Cal." => "Cal.",
+"All day" => "Tất cả các ngày",
+"Title" => "Tiêu đề",
+"From Date" => "Từ ngày",
+"From Time" => "Từ thời gian",
+"To Date" => "Tới ngày",
+"To Time" => "Tới thời gian",
+"The event ends before it starts" => "Sự kiện này kết thúc trước khi nó bắt đầu",
+"Week" => "Tuần",
+"Month" => "Tháng",
+"List" => "Danh sách",
+"Today" => "Hôm nay",
+"Calendars" => "Lịch",
+"There was a fail, while parsing the file." => "Có một thất bại, trong khi phân tích các tập tin.",
+"Choose active calendars" => "Chọn lịch hoạt động",
+"Your calendars" => "Lịch của bạn",
+"CalDav Link" => "Liên kết CalDav ",
+"Shared calendars" => "Chia sẻ lịch",
+"No shared calendars" => "Không chia sẻ lcihj",
+"Share Calendar" => "Chia sẻ lịch",
+"Download" => "Tải về",
+"Edit" => "Chỉnh sửa",
+"Delete" => "Xóa",
+"shared with you by" => "Chia sẻ bởi",
+"New calendar" => "Lịch mới",
+"Edit calendar" => "sửa Lịch",
+"Displayname" => "Hiển thị tên",
+"Active" => "Kích hoạt",
+"Calendar color" => "Màu lịch",
+"Save" => "Lưu",
+"Submit" => "Submit",
+"Cancel" => "Hủy",
+"Edit an event" => "Sửa sự kiện",
+"Share" => "Chia sẻ",
+"Title of the Event" => "Tên sự kiện",
+"Category" => "Danh mục",
+"All Day Event" => "Sự kiện trong ngày",
+"From" => "Từ",
+"To" => "Tới",
+"Advanced options" => "Tùy chọn nâng cao",
+"Location" => "Nơi",
+"Location of the Event" => "Nơi tổ chức sự kiện",
+"Description" => "Mô tả",
+"Description of the Event" => "Mô tả sự kiện",
+"Repeat" => "Lặp lại",
+"Advanced" => "Nâng cao",
+"Select weekdays" => "Chọn ngày trong tuần",
+"Select days" => "Chọn ngày",
+"and the events day of year." => "và sự kiện của ngày trong năm",
+"and the events day of month." => "và sự kiện của một ngày trong năm",
+"Select months" => "Chọn tháng",
+"Select weeks" => "Chọn tuần",
+"and the events week of year." => "và sự kiện của tuần trong năm.",
+"create a new calendar" => "Tạo lịch mới",
+"Name of new calendar" => "Tên lịch mới",
+"Close Dialog" => "Đóng hộp thoại",
+"Create a new event" => "Tạo một sự kiện mới",
+"View an event" => "Xem một sự kiện",
+"No categories selected" => "Không danh sách nào được chọn",
+"of" => "của",
+"at" => "tại",
+"Timezone" => "Múi giờ",
+"Check always for changes of the timezone" => "Luôn kiểm tra múi giờ",
+"24h" => "24h",
+"12h" => "12h"
+);
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
new file mode 100644
index 0000000000..5713ede7b0
--- /dev/null
+++ b/apps/contacts/l10n/vi.php
@@ -0,0 +1,48 @@
+<?php $TRANSLATIONS = array(
+"element name is not set." => "tên phần tử không được thiết lập.",
+"id is not set." => "id không được thiết lập.",
+"No ID provided" => "Không có ID được cung cấp",
+"No address books found." => "Không tìm thấy sổ địa chỉ.",
+"No contacts found." => "Không tìm thấy danh sách",
+"Missing ID" => "Missing ID",
+"Error reading contact photo." => "Lỗi đọc liên lạc hình ảnh.",
+"The loading photo is not valid." => "Các hình ảnh tải không hợp lệ.",
+"File doesn't exist:" => "Tập tin không tồn tại",
+"Error loading image." => "Lỗi khi tải hình ảnh.",
+"Error uploading contacts to storage." => "Lỗi tải lên danh sách địa chỉ để lưu trữ.",
+"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin tải lên thành công",
+"Contacts" => "Liên lạc",
+"Contact" => "Danh sách",
+"Address" => "Địa chỉ",
+"Telephone" => "Điện thoại bàn",
+"Email" => "Email",
+"Organization" => "Tổ chức",
+"Work" => "Công việc",
+"Home" => "Nhà",
+"Mobile" => "Di động",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "số trang",
+"Birthday" => "Ngày sinh nhật",
+"Add Contact" => "Thêm liên lạc",
+"Addressbooks" => "Sổ địa chỉ",
+"CardDav Link" => "CardDav Link",
+"Download" => "Tải về",
+"Edit" => "Sửa",
+"Delete" => "Xóa",
+"Phone" => "Điện thoại",
+"Delete contact" => "Xóa liên lạc",
+"PO Box" => "Hòm thư bưu điện",
+"City" => "Thành phố",
+"Region" => "Vùng/miền",
+"Zipcode" => "Mã bưu điện",
+"Country" => "Quốc gia",
+"Addressbook" => "Sổ địa chỉ",
+"New Addressbook" => "Sổ địa chỉ mới",
+"Edit Addressbook" => "Sửa sổ địa chỉ",
+"Displayname" => "Hiển thị tên",
+"Active" => "Kích hoạt",
+"Save" => "Lưu",
+"Submit" => "Submit",
+"Cancel" => "Hủy"
+);
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
new file mode 100644
index 0000000000..c2284d5feb
--- /dev/null
+++ b/apps/files/l10n/vi.php
@@ -0,0 +1,31 @@
+<?php $TRANSLATIONS = array(
+"Files" => "Tập tin",
+"Delete" => "Xóa",
+"Upload Error" => "Tải lên lỗi",
+"Pending" => "Chờ",
+"Upload cancelled." => "Hủy tải lên",
+"Invalid name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'",
+"Size" => "Kích cỡ",
+"Modified" => "Thay đổi",
+"folder" => "folder",
+"folders" => "folders",
+"file" => "file",
+"files" => "files",
+"File handling" => "Xử lý tập tin",
+"Maximum upload size" => "Kích thước tối đa ",
+"Enable ZIP-download" => "Cho phép ZIP-download",
+"0 is unlimited" => "0 là không giới hạn",
+"Maximum input size for ZIP files" => "Kích thước tối đa cho các tập tin ZIP",
+"New" => "Mới",
+"Text file" => "Tập tin văn bản",
+"Folder" => "Folder",
+"From url" => "Từ url",
+"Upload" => "Tải lên",
+"Cancel upload" => "Hủy upload",
+"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
+"Name" => "Tên",
+"Share" => "Chia sẻ",
+"Download" => "Tải xuống",
+"Upload too large" => "File tải lên quá lớn",
+"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ."
+);
diff --git a/apps/gallery/l10n/vi.php b/apps/gallery/l10n/vi.php
new file mode 100644
index 0000000000..d1d7fc64fc
--- /dev/null
+++ b/apps/gallery/l10n/vi.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Hình ảnh",
+"Share gallery" => "Chia sẻ gallery",
+"Error: " => "Lỗi :",
+"Internal error" => "Lỗi nội bộ",
+"Back" => "Trở lại",
+"Remove confirmation" => "Xóa xác nhận",
+"Do you want to remove album" => "Bạn muốn xóa album này ",
+"Change album name" => "Đổi tên album",
+"New album name" => "Tên album mới"
+);
diff --git a/apps/media/l10n/vi.php b/apps/media/l10n/vi.php
new file mode 100644
index 0000000000..01942ba173
--- /dev/null
+++ b/apps/media/l10n/vi.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Âm nhạc",
+"Add album to playlist" => "Thêm album vào playlist",
+"Play" => "Play",
+"Pause" => "Tạm dừng",
+"Previous" => "Trang trước",
+"Next" => "Tiếp theo",
+"Mute" => "Tắt",
+"Unmute" => "Bật",
+"Rescan Collection" => "Quét lại bộ sưu tập",
+"Artist" => "Nghệ sỹ",
+"Album" => "Album",
+"Title" => "Tiêu đề"
+);
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
new file mode 100644
index 0000000000..b0b750303a
--- /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+=",
+"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",
+"Settings" => "Cài đặ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/l10n/ar_SA/calendar.po b/l10n/ar_SA/calendar.po
new file mode 100644
index 0000000000..32a7e56e62
--- /dev/null
+++ b/l10n/ar_SA/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
new file mode 100644
index 0000000000..16f62d246d
--- /dev/null
+++ b/l10n/ar_SA/contacts.po
@@ -0,0 +1,871 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:67
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:76
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:93
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:58
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:170
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:15
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
new file mode 100644
index 0000000000..5c1cf5518c
--- /dev/null
+++ b/l10n/ar_SA/core.po
@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:519
+msgid "January"
+msgstr ""
+
+#: js/js.js:519
+msgid "February"
+msgstr ""
+
+#: js/js.js:519
+msgid "March"
+msgstr ""
+
+#: js/js.js:519
+msgid "April"
+msgstr ""
+
+#: js/js.js:519
+msgid "May"
+msgstr ""
+
+#: js/js.js:519
+msgid "June"
+msgstr ""
+
+#: js/js.js:520
+msgid "July"
+msgstr ""
+
+#: js/js.js:520
+msgid "August"
+msgstr ""
+
+#: js/js.js:520
+msgid "September"
+msgstr ""
+
+#: js/js.js:520
+msgid "October"
+msgstr ""
+
+#: js/js.js:520
+msgid "November"
+msgstr ""
+
+#: js/js.js:520
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
new file mode 100644
index 0000000000..3b87221937
--- /dev/null
+++ b/l10n/ar_SA/files.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:659
+msgid "folder"
+msgstr ""
+
+#: js/files.js:661
+msgid "folders"
+msgstr ""
+
+#: js/files.js:669
+msgid "file"
+msgstr ""
+
+#: js/files.js:671
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/ar_SA/gallery.po b/l10n/ar_SA/gallery.po
new file mode 100644
index 0000000000..9d60ea7bc6
--- /dev/null
+++ b/l10n/ar_SA/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/ar_SA/media.po b/l10n/ar_SA/media.po
new file mode 100644
index 0000000000..9f152efa42
--- /dev/null
+++ b/l10n/ar_SA/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
new file mode 100644
index 0000000000..d4a0b64800
--- /dev/null
+++ b/l10n/ar_SA/settings.po
@@ -0,0 +1,206 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:41 personal.php:42
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:60
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:61
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:25
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:47 templates/users.php:103
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:63
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:110
+msgid "Delete"
+msgstr ""
diff --git a/l10n/id_ID/calendar.po b/l10n/id_ID/calendar.po
new file mode 100644
index 0000000000..ac6c2362a0
--- /dev/null
+++ b/l10n/id_ID/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
new file mode 100644
index 0000000000..6bbcb889ca
--- /dev/null
+++ b/l10n/id_ID/contacts.po
@@ -0,0 +1,871 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:67
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:76
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:93
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:58
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:170
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:15
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
new file mode 100644
index 0000000000..2a3c3b516c
--- /dev/null
+++ b/l10n/id_ID/core.po
@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:519
+msgid "January"
+msgstr ""
+
+#: js/js.js:519
+msgid "February"
+msgstr ""
+
+#: js/js.js:519
+msgid "March"
+msgstr ""
+
+#: js/js.js:519
+msgid "April"
+msgstr ""
+
+#: js/js.js:519
+msgid "May"
+msgstr ""
+
+#: js/js.js:519
+msgid "June"
+msgstr ""
+
+#: js/js.js:520
+msgid "July"
+msgstr ""
+
+#: js/js.js:520
+msgid "August"
+msgstr ""
+
+#: js/js.js:520
+msgid "September"
+msgstr ""
+
+#: js/js.js:520
+msgid "October"
+msgstr ""
+
+#: js/js.js:520
+msgid "November"
+msgstr ""
+
+#: js/js.js:520
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
new file mode 100644
index 0000000000..6fc758f596
--- /dev/null
+++ b/l10n/id_ID/files.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:659
+msgid "folder"
+msgstr ""
+
+#: js/files.js:661
+msgid "folders"
+msgstr ""
+
+#: js/files.js:669
+msgid "file"
+msgstr ""
+
+#: js/files.js:671
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/id_ID/gallery.po b/l10n/id_ID/gallery.po
new file mode 100644
index 0000000000..6d62fde891
--- /dev/null
+++ b/l10n/id_ID/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/id_ID/media.po b/l10n/id_ID/media.po
new file mode 100644
index 0000000000..1db3e2f400
--- /dev/null
+++ b/l10n/id_ID/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
new file mode 100644
index 0000000000..ec3c94d41f
--- /dev/null
+++ b/l10n/id_ID/settings.po
@@ -0,0 +1,206 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:41 personal.php:42
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:60
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:61
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:25
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:47 templates/users.php:103
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:63
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:110
+msgid "Delete"
+msgstr ""
diff --git a/l10n/so/calendar.po b/l10n/so/calendar.po
new file mode 100644
index 0000000000..139a523a52
--- /dev/null
+++ b/l10n/so/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
new file mode 100644
index 0000000000..c5aa568cb3
--- /dev/null
+++ b/l10n/so/contacts.po
@@ -0,0 +1,871 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:67
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:76
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:93
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:58
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:170
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:15
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
new file mode 100644
index 0000000000..17556c7d3e
--- /dev/null
+++ b/l10n/so/core.po
@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:519
+msgid "January"
+msgstr ""
+
+#: js/js.js:519
+msgid "February"
+msgstr ""
+
+#: js/js.js:519
+msgid "March"
+msgstr ""
+
+#: js/js.js:519
+msgid "April"
+msgstr ""
+
+#: js/js.js:519
+msgid "May"
+msgstr ""
+
+#: js/js.js:519
+msgid "June"
+msgstr ""
+
+#: js/js.js:520
+msgid "July"
+msgstr ""
+
+#: js/js.js:520
+msgid "August"
+msgstr ""
+
+#: js/js.js:520
+msgid "September"
+msgstr ""
+
+#: js/js.js:520
+msgid "October"
+msgstr ""
+
+#: js/js.js:520
+msgid "November"
+msgstr ""
+
+#: js/js.js:520
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/so/files.po b/l10n/so/files.po
new file mode 100644
index 0000000000..d4b3a6c136
--- /dev/null
+++ b/l10n/so/files.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:659
+msgid "folder"
+msgstr ""
+
+#: js/files.js:661
+msgid "folders"
+msgstr ""
+
+#: js/files.js:669
+msgid "file"
+msgstr ""
+
+#: js/files.js:671
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/so/gallery.po b/l10n/so/gallery.po
new file mode 100644
index 0000000000..e520c32b94
--- /dev/null
+++ b/l10n/so/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/so/media.po b/l10n/so/media.po
new file mode 100644
index 0000000000..ed91c8d409
--- /dev/null
+++ b/l10n/so/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
new file mode 100644
index 0000000000..f505b8ba5e
--- /dev/null
+++ b/l10n/so/settings.po
@@ -0,0 +1,206 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:41 personal.php:42
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:60
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:61
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:25
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:47 templates/users.php:103
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:63
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:110
+msgid "Delete"
+msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index bae23f3a63..1ee9f5a85a 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 60b6126208..eb31c594a8 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index cb2045e027..6b03be705c 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 6bcaf6d4c5..e19f805928 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index a607c408a3..7c8581071c 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 694bdf4a58..e0f819f9df 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
new file mode 100644
index 0000000000..410e16d9dc
--- /dev/null
+++ b/l10n/templates/lib.pot
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:306
+msgid "Apps"
+msgstr ""
+
+#: app.php:308
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 528fcdce23..6406b0120e 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 44a2173caf..e8d0757e9f 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/vi/calendar.po b/l10n/vi/calendar.po
new file mode 100644
index 0000000000..f0f4660844
--- /dev/null
+++ b/l10n/vi/calendar.po
@@ -0,0 +1,816 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mattheu_9x@yahoo.com>, 2012.
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr "Không tìm thấy lịch."
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr "Không tìm thấy sự kiện nào"
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr "Sai lịch"
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr "Múi giờ mới :"
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr "Thay đổi múi giờ"
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr "Yêu cầu không hợp lệ"
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr "Lịch"
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr "ddd"
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr "ddd M/d"
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr "dddd, MMM d, yyyy"
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr "Ngày sinh nhật"
+
+#: lib/app.php:122
+msgid "Business"
+msgstr "Công việc"
+
+#: lib/app.php:123
+msgid "Call"
+msgstr "Số điện thoại"
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr "Máy trạm"
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr "Ngày lễ"
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr "Ý tưởng"
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr "Lễ kỷ niệm"
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr "Hội nghị"
+
+#: lib/app.php:131
+msgid "Other"
+msgstr "Khác"
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr "Dự án"
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr "Câu hỏi"
+
+#: lib/app.php:135
+msgid "Work"
+msgstr "Công việc"
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Lịch mới"
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr "Không lặp lại"
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr "Hàng ngày"
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr "Hàng tuần"
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr "Mỗi ngày trong tuần"
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr "Hai tuần một lần"
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr "Hàng tháng"
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr "Hàng năm"
+
+#: lib/object.php:388
+msgid "never"
+msgstr "không thay đổi"
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr "bởi xuất hiện"
+
+#: lib/object.php:390
+msgid "by date"
+msgstr "bởi ngày"
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr "bởi ngày trong tháng"
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr "bởi ngày trong tuần"
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr "Thứ 2"
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr "Thứ 3"
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr "Thứ 4"
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr "Thứ 5"
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr "Thứ "
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr "Thứ 7"
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr "Chủ nhật"
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr "sự kiện trong tuần của tháng"
+
+#: lib/object.php:428
+msgid "first"
+msgstr "đầu tiên"
+
+#: lib/object.php:429
+msgid "second"
+msgstr "Thứ hai"
+
+#: lib/object.php:430
+msgid "third"
+msgstr "Thứ ba"
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr "Thứ tư"
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr "Thứ năm"
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr "Tháng 1"
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr "Tháng 2"
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr "Tháng 3"
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr "Tháng 4"
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr "Tháng 5"
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr "Tháng 6"
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr "Tháng 7"
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr "Tháng 8"
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr "Tháng 9"
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr "Tháng 10"
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr "Tháng 11"
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr "Tháng 12"
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr "Theo ngày tháng sự kiện"
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr "số tuần"
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr "ngày, tháng"
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr "Ngày"
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr "Cal."
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr "Tất cả các ngày"
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr "Tiêu đề"
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr "Từ ngày"
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr "Từ thời gian"
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr "Tới ngày"
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr "Tới thời gian"
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr "Sự kiện này kết thúc trước khi nó bắt đầu"
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Tuần"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Tháng"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Danh sách"
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr "Hôm nay"
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr "Lịch"
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr "Có một thất bại, trong khi phân tích các tập tin."
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Chọn lịch hoạt động"
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr "Lịch của bạn"
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr "Liên kết CalDav "
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr "Chia sẻ lịch"
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr "Không chia sẻ lcihj"
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr "Chia sẻ lịch"
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr "Chỉnh sửa"
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Xóa"
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr "Chia sẻ bởi"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Lịch mới"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "sửa Lịch"
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr "Hiển thị tên"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Kích hoạt"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Màu lịch"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Lưu"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Submit"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Hủy"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Sửa sự kiện"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr "Chia sẻ"
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr "Tên sự kiện"
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr "Danh mục"
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr "Sự kiện trong ngày"
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr "Từ"
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr "Tới"
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr "Tùy chọn nâng cao"
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr "Nơi"
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr "Nơi tổ chức sự kiện"
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr "Mô tả"
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr "Mô tả sự kiện"
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr "Lặp lại"
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr "Nâng cao"
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr "Chọn ngày trong tuần"
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr "Chọn ngày"
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr "và sự kiện của ngày trong năm"
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr "và sự kiện của một ngày trong năm"
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr "Chọn tháng"
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr "Chọn tuần"
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr "và sự kiện của tuần trong năm."
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Tạo lịch mới"
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr "Tên lịch mới"
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr "Đóng hộp thoại"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Tạo một sự kiện mới"
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr "Xem một sự kiện"
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr "Không danh sách nào được chọn"
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr "của"
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr "tại"
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr "Múi giờ"
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr "Luôn kiểm tra múi giờ"
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
new file mode 100644
index 0000000000..41383998b6
--- /dev/null
+++ b/l10n/vi/contacts.po
@@ -0,0 +1,872 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "tên phần tử không được thiết lập."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id không được thiết lập."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr "Không có ID được cung cấp"
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr "Không tìm thấy sổ địa chỉ."
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr "Không tìm thấy danh sách"
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr "Missing ID"
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Lỗi đọc liên lạc hình ảnh."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Các hình ảnh tải không hợp lệ."
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr "Tập tin không tồn tại"
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr "Lỗi khi tải hình ảnh."
+
+#: ajax/savecrop.php:67
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:76
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:93
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr "Lỗi tải lên danh sách địa chỉ để lưu trữ."
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr "Không có lỗi, các tập tin tải lên thành công"
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19 templates/settings.php:3
+msgid "Contacts"
+msgstr "Liên lạc"
+
+#: js/contacts.js:53
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:58
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
+msgstr "Danh sách"
+
+#: js/contacts.js:389
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Địa chỉ"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Điện thoại bàn"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Tổ chức"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Công việc"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Nhà"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Di động"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "số trang"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Ngày sinh nhật"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:15
+msgid "Add Contact"
+msgstr "Thêm liên lạc"
+
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Addressbooks"
+msgstr "Sổ địa chỉ"
+
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr "CardDav Link"
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr "Sửa"
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
+msgid "Delete"
+msgstr "Xóa"
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Điện thoại"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Xóa liên lạc"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr "Hòm thư bưu điện"
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr "Thành phố"
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr "Vùng/miền"
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr "Mã bưu điện"
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Quốc gia"
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr "Sổ địa chỉ"
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr "Sổ địa chỉ mới"
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr "Sửa sổ địa chỉ"
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr "Hiển thị tên"
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr "Kích hoạt"
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr "Lưu"
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr "Submit"
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr "Hủy"
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
new file mode 100644
index 0000000000..b00d507167
--- /dev/null
+++ b/l10n/vi/core.po
@@ -0,0 +1,269 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Son Nguyen <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr "Tên ứng dụng không tồn tại"
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr "Không có danh mục được thêm?"
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr "Danh mục này đã được tạo :"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:519
+msgid "January"
+msgstr "Tháng 1"
+
+#: js/js.js:519
+msgid "February"
+msgstr "Tháng 2"
+
+#: js/js.js:519
+msgid "March"
+msgstr "Tháng 3"
+
+#: js/js.js:519
+msgid "April"
+msgstr "Tháng 4"
+
+#: js/js.js:519
+msgid "May"
+msgstr "Tháng 5"
+
+#: js/js.js:519
+msgid "June"
+msgstr "Tháng 6"
+
+#: js/js.js:520
+msgid "July"
+msgstr "Tháng 7"
+
+#: js/js.js:520
+msgid "August"
+msgstr "Tháng 8"
+
+#: js/js.js:520
+msgid "September"
+msgstr "Tháng 9"
+
+#: js/js.js:520
+msgid "October"
+msgstr "Tháng 10"
+
+#: js/js.js:520
+msgid "November"
+msgstr "Tháng 11"
+
+#: js/js.js:520
+msgid "December"
+msgstr "Tháng 12"
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr "Hủy"
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr "No"
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr "Yes"
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr "Ok"
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr "Không có thể loại nào được chọn để xóa."
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr "Lỗi"
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr "Khôi phục mật khẩu Owncloud "
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}"
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Yêu cầu"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Bạn đã nhập sai mật khẩu hay tên người dùng !"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr "Tên người dùng"
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr "Yêu cầu thiết lập lại "
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Mật khẩu của bạn đã được khôi phục"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "Trang đăng nhập"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Mật khẩu mới"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Khôi phục mật khẩu"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Người sử dụng"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Ứng dụng"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Quản trị"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Giúp đỡ"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr "Truy cập bị cấm "
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Không tìm thấy Clound"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr "Sửa thể loại"
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr "Thêm"
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr "Tạo một <strong>tài khoản quản trị</strong>"
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr "Nâng cao"
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr "Thư mục dữ liệu"
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr "Cấu hình Cơ Sở Dữ Liệu"
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr "được sử dụng"
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr "Người dùng cơ sở dữ liệu"
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr "Mật khẩu cơ sở dữ liệu"
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr "Tên cơ sở dữ liệu"
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr "Database host"
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr "Cài đặt hoàn tất"
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr "Đăng xuất"
+
+#: templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Cài đặt"
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr "Bạn quên mật khẩu ?"
+
+#: templates/login.php:17
+msgid "remember"
+msgstr "Nhớ"
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr "Đăng nhập"
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Bạn đã đăng xuất."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "Lùi lại"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "Kế tiếp"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
new file mode 100644
index 0000000000..c7b868c5bc
--- /dev/null
+++ b/l10n/vi/files.po
@@ -0,0 +1,199 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "Tập tin"
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Xóa"
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr "Tải lên lỗi"
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr "Chờ"
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr "Hủy tải lên"
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr "Tên không hợp lệ ,không được phép dùng '/'"
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr "Kích cỡ"
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr "Thay đổi"
+
+#: js/files.js:659
+msgid "folder"
+msgstr "folder"
+
+#: js/files.js:661
+msgid "folders"
+msgstr "folders"
+
+#: js/files.js:669
+msgid "file"
+msgstr "file"
+
+#: js/files.js:671
+msgid "files"
+msgstr "files"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr "Xử lý tập tin"
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "Kích thước tối đa "
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr "Cho phép ZIP-download"
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr "0 là không giới hạn"
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr "Kích thước tối đa cho các tập tin ZIP"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "Mới"
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr "Tập tin văn bản"
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr "Folder"
+
+#: templates/index.php:11
+msgid "From url"
+msgstr "Từ url"
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr "Tải lên"
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr "Hủy upload"
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
+
+#: templates/index.php:47
+msgid "Name"
+msgstr "Tên"
+
+#: templates/index.php:49
+msgid "Share"
+msgstr "Chia sẻ"
+
+#: templates/index.php:51
+msgid "Download"
+msgstr "Tải xuống"
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr "File tải lên quá lớn"
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr "Tập tin đang được quét ,vui lòng chờ."
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/vi/gallery.po b/l10n/vi/gallery.po
new file mode 100644
index 0000000000..741f026c53
--- /dev/null
+++ b/l10n/vi/gallery.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Son Nguyen <sonnghit@gmail.com>, 2012.
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr "Hình ảnh"
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr "Chia sẻ gallery"
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr "Lỗi :"
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr "Lỗi nội bộ"
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr "Trở lại"
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr "Xóa xác nhận"
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr "Bạn muốn xóa album này "
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr "Đổi tên album"
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr "Tên album mới"
diff --git a/l10n/vi/media.po b/l10n/vi/media.po
new file mode 100644
index 0000000000..9c4613fa2b
--- /dev/null
+++ b/l10n/vi/media.po
@@ -0,0 +1,67 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-23 06:41+0000\n"
+"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr "Âm nhạc"
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr "Thêm album vào playlist"
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr "Play"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr "Tạm dừng"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Trang trước"
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr "Tiếp theo"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Tắt"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Bật"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Quét lại bộ sưu tập"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Nghệ sỹ"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Tiêu đề"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
new file mode 100644
index 0000000000..e387aaaa9e
--- /dev/null
+++ b/l10n/vi/settings.po
@@ -0,0 +1,208 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Son Nguyen <sonnghit@gmail.com>, 2012.
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr "Lưu email"
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr "Email không hợp lệ"
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr "Đổi OpenID"
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "Yêu cầu không hợp lệ"
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr "Ngôn ngữ đã được thay đổi"
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr "Vô hiệu"
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr "Cho phép"
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr "Đang tiến hành lưu ..."
+
+#: personal.php:41 personal.php:42
+msgid "__language_name__"
+msgstr "__Ngôn ngữ___"
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr "Log"
+
+#: templates/admin.php:55
+msgid "More"
+msgstr "nhiều hơn"
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr "Thêm ứng dụng của bạn"
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr "Chọn một ứng dụng"
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr "Xem ứng dụng tại apps.owncloud.com"
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr "Giấy phép đã được cấp"
+
+#: templates/apps.php:28
+msgid "by"
+msgstr "bởi"
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr "Tài liệu"
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr "Quản lý tập tin lớn"
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr "Đặt câu hỏi"
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr "Vấn đề kết nối đến cơ sở dữ liệu."
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr "Đến bằng thủ công"
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr "trả lời"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Bạn sử dụng"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "có sẵn"
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr "Đồng bộ dữ liệu"
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr "Mật khẩu đã được thay đổi"
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr "Không thể đổi mật khẩu"
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr "Mật khẩu cũ"
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr "Mật khẩu mới "
+
+#: templates/personal.php:23
+msgid "show"
+msgstr "Hiện"
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr "Đổi mật khẩu"
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr "Email của bạn"
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr "Dịch "
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin "
+
+#: templates/users.php:15 templates/users.php:60
+msgid "Name"
+msgstr "Tên"
+
+#: templates/users.php:17 templates/users.php:61
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+msgid "Groups"
+msgstr "Nhóm"
+
+#: templates/users.php:25
+msgid "Create"
+msgstr "Tạo"
+
+#: templates/users.php:28
+msgid "Default Quota"
+msgstr "Hạn ngạch mặt định"
+
+#: templates/users.php:47 templates/users.php:103
+msgid "Other"
+msgstr "Khác"
+
+#: templates/users.php:63
+msgid "Quota"
+msgstr "Hạn ngạch"
+
+#: templates/users.php:110
+msgid "Delete"
+msgstr "Xóa"
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
new file mode 100644
index 0000000000..41e4441b1c
--- /dev/null
+++ b/settings/l10n/vi.php
@@ -0,0 +1,48 @@
+<?php $TRANSLATIONS = array(
+"Email saved" => "Lưu email",
+"Invalid email" => "Email không hợp lệ",
+"OpenID Changed" => "Đổi OpenID",
+"Invalid request" => "Yêu cầu không hợp lệ",
+"Language changed" => "Ngôn ngữ đã được thay đổi",
+"Disable" => "Vô hiệu",
+"Enable" => "Cho phép",
+"Saving..." => "Đang tiến hành lưu ...",
+"__language_name__" => "__Ngôn ngữ___",
+"Log" => "Log",
+"More" => "nhiều hơn",
+"Add your App" => "Thêm ứng dụng của bạn",
+"Select an App" => "Chọn một ứng dụng",
+"See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com",
+"-licensed" => "Giấy phép đã được cấp",
+"by" => "bởi",
+"Documentation" => "Tài liệu",
+"Managing Big Files" => "Quản lý tập tin lớn",
+"Ask a question" => "Đặt câu hỏi",
+"Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
+"Go there manually." => "Đến bằng thủ công",
+"Answer" => "trả lời",
+"You use" => "Bạn sử dụng",
+"of the available" => "có sẵn",
+"Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
+"Download" => "Tải về",
+"Your password got changed" => "Mật khẩu đã được thay đổi",
+"Unable to change your password" => "Không thể đổi mật khẩu",
+"Current password" => "Mật khẩu cũ",
+"New password" => "Mật khẩu mới ",
+"show" => "Hiện",
+"Change password" => "Đổi mật khẩu",
+"Email" => "Email",
+"Your email address" => "Email của bạn",
+"Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
+"Language" => "Ngôn ngữ",
+"Help translate" => "Dịch ",
+"use this address to connect to your ownCloud in your file manager" => "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin ",
+"Name" => "Tên",
+"Password" => "Mật khẩu",
+"Groups" => "Nhóm",
+"Create" => "Tạo",
+"Default Quota" => "Hạn ngạch mặt định",
+"Other" => "Khác",
+"Quota" => "Hạn ngạch",
+"Delete" => "Xóa"
+);

From f7155b42765fe0fb69c36a01750f046f34e9eaaf Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 14:46:03 +0200
Subject: [PATCH 1150/1537] convert through caldav transmitted rgba
 calendarcolor to rgb

---
 apps/calendar/lib/connector_sabre.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php
index 263fb7ffde..8eea06da7e 100644
--- a/apps/calendar/lib/connector_sabre.php
+++ b/apps/calendar/lib/connector_sabre.php
@@ -105,6 +105,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
 		if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
 		if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0;
 		if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
+		if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
+			$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
+		}
 		
 		return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
 	}
@@ -192,7 +195,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
 		if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
 		if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null;
 		if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
-
+		if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
+			$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
+		}
+		
 		OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
 
 		return true;

From e4679770c4d85896bef3e81125e86e272bb6cd64 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 15:12:57 +0200
Subject: [PATCH 1151/1537] declare OCP\App::register as deprecated

---
 lib/public/app.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/public/app.php b/lib/public/app.php
index 28411933be..5689f53ffb 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,6 +34,21 @@ namespace OCP;
  * This class provides functions to manage apps in ownCloud
  */
 class App {
+        /**
+         * @brief Makes owncloud aware of this app
+         * @brief This call is deprecated and not necessary to use.
+         * @param $data array with all information
+         * @returns true/false
+         *
+         * @deprecated this method is deprecated
+         * Do not call it anymore
+         * It'll remain in our public API for compatibility reasons
+         *
+         */
+        public static function register( $data ){
+		return \OC_App::register( $data );
+        }
+
         /**
          * @brief adds an entry to the navigation
          * @param $data array containing the data

From c8de77b3fddf52eeaf0f81224e9b4aa2085bcc59 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 16:03:19 +0200
Subject: [PATCH 1152/1537] fix errors like Failed opening required
 ownCloudcalendar/appinfo/remote.php

---
 remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote.php b/remote.php
index 8461eea19a..8dc4df1bd2 100644
--- a/remote.php
+++ b/remote.php
@@ -34,7 +34,7 @@ switch ($app) {
 	default:
 		OC_Util::checkAppEnabled($app);
 		OC_App::loadApp($app);
-		$file = OC_App::getAppPath($app) .'/'. $parts[1];
+		$file = '/' . OC_App::getAppPath($app) .'/'. $parts[1];
 		break;
 }
 $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';

From b893aa9567d8c2a5f82359374ecaef4f6c3bd8c4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 19:01:31 +0200
Subject: [PATCH 1153/1537] code style

---
 apps/user_ldap/lib/connection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index e54a8e2b24..96ffea4b64 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -110,13 +110,13 @@ class Connection {
 			$this->config['ldapNoCase']            = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
 			$this->config['ldapUserDisplayName']   = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8');
 			$this->config['ldapUserFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person');
-			$this->config['ldapGroupFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
+			$this->config['ldapGroupFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
 			$this->config['ldapLoginFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)');
 			$this->config['ldapGroupDisplayName']  = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', 'uid'), 'UTF-8');
 			$this->config['ldapQuotaAttribute']    = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', '');
 			$this->config['ldapQuotaDefault']      = \OCP\Config::getAppValue($this->configID, 'ldap_quota_def', '');
-			$this->config['ldapEmailAttribute']      = \OCP\Config::getAppValue($this->configID, 'ldap_email_attr', '');
-			$this->config['ldapGroupMemberAssocAttr']      = \OCP\Config::getAppValue($this->configID, 'ldap_group_member_assoc_attribute', 'uniqueMember');
+			$this->config['ldapEmailAttribute']    = \OCP\Config::getAppValue($this->configID, 'ldap_email_attr', '');
+			$this->config['ldapGroupMemberAssocAttr'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_member_assoc_attribute', 'uniqueMember');
 			$this->config['ldapIgnoreNamingRules'] = \OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
 
 			$this->configured = $this->validateConfiguration();

From e0121ea75e85db681b4c7e50aa73b0b519c4d989 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 26 Jul 2012 13:45:32 +0200
Subject: [PATCH 1154/1537] LDAP: some cleanup

---
 apps/user_ldap/user_ldap.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index a4a8921d08..61f84047f1 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -27,9 +27,6 @@ namespace OCA\user_ldap;
 
 class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 
-	// will be retrieved from LDAP server
-	protected $ldap_dc = false;
-
 	// cache getUsers()
 	protected $_users = null;
 

From 6c92a85d49822dba180fe949d211db60c5b40d51 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 26 Jul 2012 16:11:23 +0200
Subject: [PATCH 1155/1537] LDAP: use OC_Cache to cache results from LDAP.
 Default is set to 10 min. Should improve performance especially when LDAP
 users use the sync client, because userExists checks with the LDAP server are
 reduced.

---
 apps/user_ldap/group_ldap.php         | 53 +++++++++++++-----------
 apps/user_ldap/lib/connection.php     | 59 ++++++++++++++++++++++++++-
 apps/user_ldap/settings.php           | 12 ++++--
 apps/user_ldap/templates/settings.php |  1 +
 apps/user_ldap/user_ldap.php          | 18 +++++---
 5 files changed, 109 insertions(+), 34 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index b9f4bdf199..aff25593ef 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -26,11 +26,6 @@ namespace OCA\user_ldap;
 class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	protected $enabled = false;
 
-	protected $_group_user = array();
-	protected $_user_groups = array();
-	protected $_group_users = array();
-	protected $_groups = array();
-
 	public function setConnector(lib\Connection &$connection) {
 		parent::setConnector($connection);
 		if(empty($this->connection->ldapGroupFilter) || empty($this->connection->ldapGroupMemberAssocAttr)) {
@@ -51,18 +46,20 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$this->enabled) {
 			return false;
 		}
-		if(isset($this->_group_user[$gid][$uid])) {
-			return $this->_group_user[$gid][$uid];
+		if($this->connection->isCached('inGroup'.$uid.':'.$gid)) {
+			return $this->connection->getFromCache('inGroup'.$uid.':'.$gid);
 		}
 		$dn_user = $this->username2dn($uid);
 		$dn_group = $this->groupname2dn($gid);
 		// just in case
 		if(!$dn_group || !$dn_user) {
+			$this->connection->writeToCache('inGroup'.$uid.':'.$gid, false);
 			return false;
 		}
 		//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
 		$members = $this->readAttribute($dn_group, $this->connection->ldapGroupMemberAssocAttr);
 		if(!$members) {
+			$this->connection->writeToCache('inGroup'.$uid.':'.$gid, false);
 			return false;
 		}
 
@@ -81,8 +78,10 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			$members = $dns;
 		}
 
-		$this->_group_user[$gid][$uid] = in_array($dn_user, $members);
-		return $this->_group_user[$gid][$uid];
+		$isInGroup = in_array($dn_user, $members);
+		$this->connection->writeToCache('inGroup'.$uid.':'.$gid, $isInGroup);
+
+		return $isInGroup;
 	}
 
 	/**
@@ -97,12 +96,12 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$this->enabled) {
 			return array();
 		}
-		if(isset($this->_user_groups[$uid])) {
-			return $this->_user_groups[$uid];
+		if($this->connection->isCached('getUserGroups'.$uid)) {
+			return $this->connection->getFromCache('getUserGroups'.$uid);
 		}
 		$userDN = $this->username2dn($uid);
 		if(!$userDN) {
-			$this->_user_groups[$uid] = array();
+			$this->connection->writeToCache('getUserGroups'.$uid, array());
 			return array();
 		}
 
@@ -124,9 +123,10 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			$this->connection->ldapGroupMemberAssocAttr.'='.$uid
 		));
 		$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn'));
-		$this->_user_groups[$uid] = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
+		$groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
+		$this->connection->writeToCache('getUserGroups'.$uid, $groups);
 
-		return $this->_user_groups[$uid];
+		return $groups;
 	}
 
 	/**
@@ -137,19 +137,19 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$this->enabled) {
 			return array();
 		}
-		if(isset($this->_group_users[$gid])) {
-			return $this->_group_users[$gid];
+		if($this->connection->isCached('usersInGroup'.$gid)) {
+			return $this->connection->getFromCache('usersInGroup'.$gid);
 		}
 
 		$groupDN = $this->groupname2dn($gid);
 		if(!$groupDN) {
-			$this->_group_users[$gid] = array();
+			$this->connection->writeToCache('usersInGroup'.$gid, array());
 			return array();
 		}
 
 		$members = $this->readAttribute($groupDN, $this->connection->ldapGroupMemberAssocAttr);
 		if(!$members) {
-			$this->_group_users[$gid] = array();
+			$this->connection->writeToCache('usersInGroup'.$gid, array());
 			return array();
 		}
 
@@ -173,8 +173,10 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$isMemberUid) {
 			$result = array_intersect($result, \OCP\User::getUsers());
 		}
-		$this->_group_users[$gid] = array_unique($result, SORT_LOCALE_STRING);
-		return $this->_group_users[$gid];
+		$groupUsers = array_unique($result, SORT_LOCALE_STRING);
+		$this->connection->writeToCache('usersInGroup'.$gid, $groupUsers);
+
+		return $groupUsers;
 	}
 
 	/**
@@ -187,11 +189,14 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$this->enabled) {
 			return array();
 		}
-		if(empty($this->_groups)) {
-			$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
-			$this->_groups = $this->ownCloudGroupNames($ldap_groups);
+		if($this->connection->isCached('getGroups')) {
+			return $this->connection->getFromCache('getGroups');
 		}
-		return $this->_groups;
+		$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
+		$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
+		$this->connection->writeToCache('getGroups', $ldap_groups);
+
+		return $ldap_groups;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 96ffea4b64..cd9c83ff33 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -28,7 +28,10 @@ class Connection {
 	private $configID;
 	private $configured = false;
 
-	//cached settings
+	//cache handler
+	protected $cache;
+
+	//settings
 	protected $config = array(
 		'ldapHost' => null,
 		'ldapPort' => null,
@@ -48,10 +51,12 @@ class Connection {
 		'ldapQuotaAttribute' => null,
 		'ldapQuotaDefault' => null,
 		'ldapEmailAttribute' => null,
+		'ldapCacheTTL' => null,
 	);
 
 	public function __construct($configID = 'user_ldap') {
 		$this->configID = $configID;
+		$this->cache = \OC_Cache::getGlobalCache();
 	}
 
 	public function __destruct() {
@@ -92,6 +97,57 @@ class Connection {
 		return $this->ldapConnectionRes;
 	}
 
+	private function getCacheKey($key) {
+		$prefix = 'LDAP-'.$this->configID.'-';
+		if(is_null($key)) {
+			return $prefix;
+		}
+		return $prefix.md5($key);
+	}
+
+	public function getFromCache($key) {
+		if(!$this->configured) {
+			$this->readConfiguration();
+		}
+		if(!$this->config['ldapCacheTTL']) {
+			return null;
+		}
+		if(!$this->isCached($key)) {
+			return null;
+
+		}
+		$key = $this->getCacheKey($key);
+
+		return unserialize(base64_decode($this->cache->get($key)));
+	}
+
+	public function isCached($key) {
+		if(!$this->configured) {
+			$this->readConfiguration();
+		}
+		if(!$this->config['ldapCacheTTL']) {
+			return false;
+		}
+		$key = $this->getCacheKey($key);
+		return $this->cache->hasKey($key);
+	}
+
+	public function writeToCache($key, $value) {
+		if(!$this->configured) {
+			$this->readConfiguration();
+		}
+		if(!$this->config['ldapCacheTTL']) {
+			return null;
+		}
+		$key   = $this->getCacheKey($key);
+		$value = base64_encode(serialize($value));
+		$this->cache->set($key, $value, $this->config['ldapCacheTTL']);
+	}
+
+	public function clearCache() {
+		$this->cache->clear($this->getCacheKey(null));
+	}
+
 	/**
 	 * Caches the general LDAP configuration.
 	 */
@@ -118,6 +174,7 @@ class Connection {
 			$this->config['ldapEmailAttribute']    = \OCP\Config::getAppValue($this->configID, 'ldap_email_attr', '');
 			$this->config['ldapGroupMemberAssocAttr'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_member_assoc_attribute', 'uniqueMember');
 			$this->config['ldapIgnoreNamingRules'] = \OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
+			$this->config['ldapCacheTTL']          = \OCP\Config::getAppValue($this->configID, 'ldap_cache_ttl', 10*60);
 
 			$this->configured = $this->validateConfiguration();
 		}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 42084855e8..135c735e70 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl');
 
 OCP\Util::addscript('user_ldap', 'settings');
 
@@ -29,18 +29,23 @@ if ($_POST) {
 		if(isset($_POST[$param])){
 			if('ldap_agent_password' == $param) {
 				OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param]));
+			} elseif('ldap_cache_ttl' == $param) {
+				if(OCP\Config::getAppValue('user_ldap', $param,'') != $_POST[$param]) {
+					$ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
+					$ldap->clearCache();
+					OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
+				}
 			} else {
 				OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
 			}
 		}
 		elseif('ldap_tls' == $param) {
 			// unchecked checkboxes are not included in the post paramters
-				OCP\Config::setAppValue('user_ldap', $param, 0);
+			OCP\Config::setAppValue('user_ldap', $param, 0);
 		}
 		elseif('ldap_nocase' == $param) {
 			OCP\Config::setAppValue('user_ldap', $param, 0);
 		}
-
 	}
 }
 
@@ -57,5 +62,6 @@ $tmpl->assign( 'ldap_display_name', OCP\Config::getAppValue('user_ldap', 'ldap_d
 $tmpl->assign( 'ldap_group_display_name', OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', 'cn'));
 $tmpl->assign( 'ldap_group_member_assoc_attribute', OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember'));
 $tmpl->assign( 'ldap_agent_password', base64_decode(OCP\Config::getAppValue('user_ldap', 'ldap_agent_password')));
+$tmpl->assign( 'ldap_cache_ttl', OCP\Config::getAppValue('user_ldap', 'ldap_cache_ttl', '600'));
 
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 31f453b5a5..cc61598a26 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -26,6 +26,7 @@
 		<p><label for="ldap_quota_attr">Quota Attribute</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" />
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
+		<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" /><small><?php echo $l->t('in seconds');?></small></p>
 	</fieldset>
 	<input type="submit" value="Save" /> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 61f84047f1..57b2ef489b 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -27,9 +27,6 @@ namespace OCA\user_ldap;
 
 class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 
-	// cache getUsers()
-	protected $_users = null;
-
 	private function updateQuota($dn) {
 		$quota = null;
 		if(!empty($this->connection->ldapQuotaDefault)) {
@@ -97,11 +94,13 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 * Get a list of all users.
 	 */
 	public function getUsers(){
-		if(is_null($this->_users)) {
+		$ldap_users = $this->connection->getFromCache('getUsers');
+		if(is_null($ldap_users)) {
 			$ldap_users = $this->fetchListOfUsers($this->connection->ldapUserFilter, array($this->connection->ldapUserDisplayName, 'dn'));
-			$this->_users = $this->ownCloudUserNames($ldap_users);
+			$ldap_users = $this->ownCloudUserNames($ldap_users);
+			$this->connection->writeToCache('getUsers', $ldap_users);
 		}
-		return $this->_users;
+		return $ldap_users;
 	}
 
 	/**
@@ -110,18 +109,25 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 * @return boolean
 	 */
 	public function userExists($uid){
+		if($this->connection->isCached('userExists'.$uid)) {
+			return $this->connection->getFromCache('userExists'.$uid);
+		}
+
 		//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
 		$dn = $this->username2dn($uid);
 		if(!$dn) {
+			$this->connection->writeToCache('userExists'.$uid, false);
 			return false;
 		}
 
 		//if user really still exists, we will be able to read his cn
 		$cn = $this->readAttribute($dn, 'cn');
 		if(!$cn || empty($cn)) {
+			$this->connection->writeToCache('userExists'.$uid, false);
 			return false;
 		}
 
+		$this->connection->writeToCache('userExists'.$uid, true);
 		return true;
 	}
 

From 0810f9289409f54c374bb60da8e0262b64b15417 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 10:30:14 -0400
Subject: [PATCH 1156/1537] Fix used space calculation if shared folder does
 not exist, fixes bug oc-1331

---
 settings/personal.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index d82db0d0e7..8ad3af0873 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -18,7 +18,12 @@ OC_App::setActiveNavigationEntry( 'personal' );
 // calculate the disc space
 $rootInfo=OC_FileCache::get('');
 $sharedInfo=OC_FileCache::get('/Shared');
-$used=$rootInfo['size']-$sharedInfo['size'];
+if (!isset($sharedInfo)) {
+	$sharedSize = 0;
+} else {
+	$sharedSize = $sharedInfo['size'];
+}
+$used=$rootInfo['size']-$sharedSize;
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
 if($total==0) $total=1;  // prevent division by zero

From 3725cd079b96dff489d60aadfbd585045af033f8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 26 Jul 2012 17:41:57 +0200
Subject: [PATCH 1157/1537] Fix oc-1362: post_rename has no path param but
 newpath and oldpath

---
 lib/filesystem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index d88b30c2f6..530d50139b 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -474,7 +474,11 @@ class OC_Filesystem{
 	}
 
 	static public function removeETagHook($params) {
-		$path=$params['path'];
+		if (isset($params['path'])) {
+			$path=$params['path'];
+		} else {
+			$path=$params['oldpath'];
+		}
 		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
 		OC_Connector_Sabre_Node::removeETagPropertyForPath(dirname($path));
 	}

From d26f87e738314db7820f39f74f42865ff20f7bd7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 26 Jul 2012 17:56:32 +0200
Subject: [PATCH 1158/1537] Smarter remove of etag properties for path

---
 lib/connector/sabre/node.php | 20 ++++++++++++++++++--
 lib/filesystem.php           |  1 -
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 22506f27cf..f268f8b57c 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -233,7 +233,23 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param string $path Path of the file
 	 */
 	static public function removeETagPropertyForPath($path) {
-		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
-		$query->execute( array( OC_User::getUser(), $path, self::GETETAG_PROPERTYNAME ));
+		// remove tags from this and parent paths
+		$paths = array();
+		while ($path != '/' && $path != '') {
+			$paths[] = $path;
+			$path = dirname($path);
+		}
+		if (empty($paths)) {
+			return;
+		}
+		$paths[] = $path;
+		$path_placeholders = join(',', array_fill(0, count($paths), '?'));
+		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties'
+			.' WHERE userid = ?'
+			.' AND propertyname = ?'
+			.' AND propertypath IN ('.$path_placeholders.')'
+			);
+		$vals = array( OC_User::getUser(), self::GETETAG_PROPERTYNAME );
+		$query->execute(array_merge( $vals, $paths ));
 	}
 }
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 530d50139b..47626c05ae 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -480,7 +480,6 @@ class OC_Filesystem{
 			$path=$params['oldpath'];
 		}
 		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
-		OC_Connector_Sabre_Node::removeETagPropertyForPath(dirname($path));
 	}
 }
 OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');

From 6fbed6a5881c83f14777a4881996ac6d760bb251 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 26 Jul 2012 18:10:53 +0200
Subject: [PATCH 1159/1537] LDAP: add Test Configuration functionality in the
 settings

---
 apps/user_ldap/ajax/testConfiguration.php | 39 +++++++++++++++++++++++
 apps/user_ldap/js/settings.js             | 22 +++++++++++++
 apps/user_ldap/lib/connection.php         |  9 ++++++
 apps/user_ldap/templates/settings.php     |  2 +-
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 apps/user_ldap/ajax/testConfiguration.php

diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
new file mode 100644
index 0000000000..a82f7e4c17
--- /dev/null
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * ownCloud - user_ldap
+ *
+ * @author Arthur Schiwon
+ * @copyright 2012 Arthur Schiwon blizzz@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/>.
+ *
+ */
+
+// Check user and app status
+OCP\JSON::checkAdminUser();
+OCP\JSON::checkAppEnabled('user_ldap');
+OCP\JSON::callCheck();
+
+$connection = new \OCA\user_ldap\lib\Connection(null);
+if($connection->setConfiguration($_POST)) {
+	//Configuration is okay
+	if($connection->bind()) {
+		OCP\JSON::success(array('message' => 'The configuration is valid and the connection could be established!'));
+	} else {
+		OCP\JSON::error(array('message' => 'The configuration is valid, but the Bind failed. Please check the server settings and credentials.'));
+	}
+} else {
+	OCP\JSON::error(array('message' => 'The configuration is invalid. Please look in the ownCloud log for further details.'));
+}
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index cae9655e3d..4e5923406e 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -1,3 +1,25 @@
 $(document).ready(function() {
 	$('#ldapSettings').tabs();
+	$('#ldap_action_test_connection').button();
+	$('#ldap_action_test_connection').click(function(event){
+		event.preventDefault();
+		$.post(
+			OC.filePath('user_ldap','ajax','testConfiguration.php'),
+			$('#ldap').serialize(),
+			function (result) {
+				if (result.status == 'success') {
+					OC.dialogs.alert(
+						result.message,
+						'Connection test succeeded'
+					);
+				} else {
+					$('#ldap_action_test_connection').css('background-color', 'red');
+					OC.dialogs.alert(
+						result.message,
+						'Connection test failed'
+					);
+				}
+			}
+		);
+	});
 });
\ No newline at end of file
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index cd9c83ff33..a84174d1df 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -191,12 +191,21 @@ class Connection {
 			return false;
 		}
 
+		$params = array('ldap_host'=>'ldapHost', 'ldap_port'=>'ldapPort', 'ldap_dn'=>'ldapAgentName', 'ldap_agent_password'=>'ldapAgentPassword', 'ldap_base'=>'ldapBase', 'ldap_base_users'=>'ldapBaseUsers', 'ldap_base_groups'=>'ldapBaseGroups', 'ldap_userlist_filter'=>'ldapUserFilter', 'ldap_login_filter'=>'ldapLoginFilter', 'ldap_group_filter'=>'ldapGroupFilter', 'ldap_display_name'=>'ldapUserDisplayName', 'ldap_group_display_name'=>'ldapGroupDisplayName',
+
+		'ldap_tls'=>'ldapTLS', 'ldap_nocase'=>'ldapNoCase', 'ldap_quota_def'=>'ldapQuotaDefault', 'ldap_quota_attr'=>'ldapQuotaAttribute', 'ldap_email_attr'=>'ldapEmailAttribute', 'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr', 'ldap_cache_ttl'=>'ldapCacheTTL');
+
 		foreach($config as $parameter => $value) {
 		    if(isset($this->config[$parameter])) {
 				$this->config[$parameter] = $value;
 				if(is_array($setParameters)) {
 					$setParameters[] = $parameter;
 				}
+		    } else if(isset($params[$parameter])) {
+				$this->config[$params[$parameter]] = $value;
+				if(is_array($setParameters)) {
+					$setParameters[] = $params[$parameter];
+				}
 		    }
 		}
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index cc61598a26..893d93c3c4 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -28,7 +28,7 @@
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
 		<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" /><small><?php echo $l->t('in seconds');?></small></p>
 	</fieldset>
-	<input type="submit" value="Save" /> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
+	<input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>
 
 </form>

From 16928f4d59799eb99c1e0c25a62b5adc4ab39f0f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 18:50:59 +0200
Subject: [PATCH 1160/1537] fix spelling fail

---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index 6971fe4a58..f1928e6823 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -43,7 +43,7 @@ class OC_DB {
 	 */
 	private static function getDBBackend(){
 		$backend=self::BACKEND_MDB2;
-		if(class_exists('PDO') && OC_Config::getValue('installed', false)){//check if we can use PDO, else use MDB2 (instalation always needs to be done my mdb2)
+		if(class_exists('PDO') && OC_Config::getValue('installed', false)){//check if we can use PDO, else use MDB2 (installation always needs to be done my mdb2)
 			$type = OC_Config::getValue( "dbtype", "sqlite" );
 			if($type=='sqlite3') $type='sqlite';
 			$drivers=PDO::getAvailableDrivers();

From 0a9c33e15119f0cc1f0227357e571f6f8f712302 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 27 Jul 2012 02:04:26 +0200
Subject: [PATCH 1161/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/ca.php    |  52 +-
 apps/calendar/l10n/de.php    |  15 +
 apps/calendar/l10n/el.php    |  47 +-
 apps/calendar/l10n/fi_FI.php |  33 +-
 apps/calendar/l10n/fr.php    |  50 +-
 apps/contacts/l10n/ca.php    | 103 +++-
 apps/contacts/l10n/de.php    | 121 +++--
 apps/contacts/l10n/el.php    | 114 +++--
 apps/contacts/l10n/fi_FI.php |  64 ++-
 apps/contacts/l10n/fr.php    | 111 ++++-
 apps/files/l10n/ca.php       |  14 +-
 apps/files/l10n/el.php       |  14 +-
 apps/files/l10n/fi_FI.php    |  14 +-
 apps/files/l10n/fr.php       |  14 +-
 apps/files/l10n/lv.php       |  21 +
 apps/gallery/l10n/ca.php     |   8 +-
 apps/gallery/l10n/el.php     |   8 +-
 apps/gallery/l10n/fi_FI.php  |   8 +-
 apps/gallery/l10n/fr.php     |   8 +-
 core/l10n/lv.php             |  35 ++
 l10n/af/settings.po          |  62 ++-
 l10n/ar/settings.po          |  62 ++-
 l10n/ar_SA/settings.po       |  34 +-
 l10n/bg_BG/settings.po       |  62 ++-
 l10n/ca/calendar.po          | 407 +++++++++------
 l10n/ca/contacts.po          | 916 ++++++++++++++++++----------------
 l10n/ca/files.po             |  68 +--
 l10n/ca/gallery.po           |  64 +--
 l10n/ca/settings.po          |  74 +--
 l10n/cs_CZ/settings.po       |  74 +--
 l10n/da/settings.po          |  75 +--
 l10n/de/calendar.po          |  36 +-
 l10n/de/contacts.po          | 925 ++++++++++++++++++----------------
 l10n/de/settings.po          |  75 +--
 l10n/el/calendar.po          | 408 +++++++++------
 l10n/el/contacts.po          | 926 ++++++++++++++++++----------------
 l10n/el/files.po             |  69 +--
 l10n/el/gallery.po           |  65 +--
 l10n/el/settings.po          |  75 +--
 l10n/eo/settings.po          |  74 +--
 l10n/es/settings.po          |  36 +-
 l10n/et_EE/settings.po       |  74 +--
 l10n/eu/settings.po          |  78 +--
 l10n/fa/settings.po          |  74 +--
 l10n/fi_FI/calendar.po       | 395 ++++++++++-----
 l10n/fi_FI/contacts.po       | 730 ++++++++++++++-------------
 l10n/fi_FI/files.po          |  68 +--
 l10n/fi_FI/gallery.po        |  64 +--
 l10n/fi_FI/settings.po       |  74 +--
 l10n/fr/calendar.po          | 408 +++++++++------
 l10n/fr/contacts.po          | 934 +++++++++++++++++++----------------
 l10n/fr/files.po             |  70 +--
 l10n/fr/gallery.po           |  66 +--
 l10n/fr/settings.po          |  78 +--
 l10n/gl/settings.po          |  74 +--
 l10n/he/settings.po          |  75 +--
 l10n/hr/settings.po          |  76 +--
 l10n/hu_HU/settings.po       |  74 +--
 l10n/hy/settings.po          |  62 ++-
 l10n/ia/settings.po          |  62 ++-
 l10n/id/settings.po          |  62 ++-
 l10n/id_ID/settings.po       |  34 +-
 l10n/it/settings.po          |  36 +-
 l10n/ja_JP/settings.po       |  74 +--
 l10n/ko/settings.po          |  74 +--
 l10n/lb/settings.po          |  62 ++-
 l10n/lt_LT/settings.po       |  70 ++-
 l10n/lv/calendar.po          | 814 ++++++++++++++++++++++++++++++
 l10n/lv/contacts.po          | 871 ++++++++++++++++++++++++++++++++
 l10n/lv/core.po              | 269 ++++++++++
 l10n/lv/files.po             | 199 ++++++++
 l10n/lv/gallery.po           |  58 +++
 l10n/lv/media.po             |  66 +++
 l10n/lv/settings.po          | 219 ++++++++
 l10n/mk/settings.po          |  75 +--
 l10n/ms_MY/settings.po       |  92 ++--
 l10n/nb_NO/settings.po       |  79 +--
 l10n/nl/settings.po          |  75 +--
 l10n/nn_NO/settings.po       |  62 ++-
 l10n/pl/settings.po          |  75 +--
 l10n/pt_BR/settings.po       |  75 +--
 l10n/pt_PT/settings.po       |  74 +--
 l10n/ro/settings.po          |  62 ++-
 l10n/ru/settings.po          |  75 +--
 l10n/sk_SK/settings.po       |  74 +--
 l10n/sl/settings.po          |  74 +--
 l10n/so/settings.po          |  34 +-
 l10n/sr/settings.po          |  62 ++-
 l10n/sr@latin/settings.po    |  62 ++-
 l10n/sv/settings.po          |  75 +--
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       |   8 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |  32 +-
 l10n/th_TH/settings.po       |  74 +--
 l10n/tr/settings.po          |  75 +--
 l10n/uk/settings.po          |  62 ++-
 l10n/vi/settings.po          |  34 +-
 l10n/zh_CN/settings.po       |  75 +--
 l10n/zh_TW/settings.po       |  62 ++-
 settings/l10n/ca.php         |   7 +
 settings/l10n/cs_CZ.php      |   6 +
 settings/l10n/da.php         |   6 +
 settings/l10n/de.php         |   7 +
 settings/l10n/el.php         |   7 +
 settings/l10n/eo.php         |   6 +
 settings/l10n/et_EE.php      |   6 +
 settings/l10n/eu.php         |   8 +
 settings/l10n/fa.php         |   6 +
 settings/l10n/fi_FI.php      |   7 +
 settings/l10n/fr.php         |   9 +-
 settings/l10n/gl.php         |   6 +
 settings/l10n/he.php         |   6 +
 settings/l10n/hr.php         |   6 +
 settings/l10n/hu_HU.php      |   6 +
 settings/l10n/ja_JP.php      |   6 +
 settings/l10n/ko.php         |   6 +
 settings/l10n/lt_LT.php      |   4 +
 settings/l10n/lv.php         |  49 ++
 settings/l10n/mk.php         |   6 +
 settings/l10n/ms_MY.php      |  15 +
 settings/l10n/nb_NO.php      |   9 +
 settings/l10n/nl.php         |   6 +
 settings/l10n/pl.php         |   6 +
 settings/l10n/pt_BR.php      |   6 +
 settings/l10n/pt_PT.php      |   6 +
 settings/l10n/ru.php         |   6 +
 settings/l10n/sk_SK.php      |   6 +
 settings/l10n/sl.php         |   6 +
 settings/l10n/sv.php         |   6 +
 settings/l10n/th_TH.php      |   6 +
 settings/l10n/tr.php         |   6 +
 settings/l10n/zh_CN.php      |   6 +
 138 files changed, 9209 insertions(+), 4497 deletions(-)
 create mode 100644 apps/files/l10n/lv.php
 create mode 100644 core/l10n/lv.php
 create mode 100644 l10n/lv/calendar.po
 create mode 100644 l10n/lv/contacts.po
 create mode 100644 l10n/lv/core.po
 create mode 100644 l10n/lv/files.po
 create mode 100644 l10n/lv/gallery.po
 create mode 100644 l10n/lv/media.po
 create mode 100644 l10n/lv/settings.po
 create mode 100644 settings/l10n/lv.php

diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index afb1c799d9..2d298a31a4 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "No tots els calendaris estan en memòria",
+"Everything seems to be completely cached" => "Sembla que tot està en memòria",
 "No calendars found." => "No s'han trobat calendaris.",
 "No events found." => "No s'han trobat events.",
 "Wrong calendar" => "Calendari erroni",
+"The file contained either no events or all events are already saved in your calendar." => "El fitxer no contenia esdeveniments o aquests ja estaven desats en el vostre caledari",
+"events has been saved in the new calendar" => "els esdeveniments s'han desat en el calendari nou",
+"Import failed" => "Ha fallat la importació",
+"events has been saved in your calendar" => "els esdveniments s'han desat en el calendari",
 "New Timezone:" => "Nova zona horària:",
 "Timezone changed" => "La zona horària ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "Calendar" => "Calendari",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d [MMM ][yyyy ]{'&#8212;' d MMM yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
 "Birthday" => "Aniversari",
 "Business" => "Feina",
 "Call" => "Trucada",
@@ -22,7 +33,9 @@
 "Projects" => "Projectes",
 "Questions" => "Preguntes",
 "Work" => "Feina",
+"by" => "per",
 "unnamed" => "sense nom",
+"New Calendar" => "Calendari nou",
 "Does not repeat" => "No es repeteix",
 "Daily" => "Diari",
 "Weekly" => "Mensual",
@@ -67,8 +80,26 @@
 "by day and month" => "per dia del mes",
 "Date" => "Data",
 "Cal." => "Cal.",
+"Sun." => "Dg.",
+"Mon." => "Dl.",
+"Tue." => "Dm.",
+"Wed." => "Dc.",
+"Thu." => "Dj.",
+"Fri." => "Dv.",
+"Sat." => "Ds.",
+"Jan." => "Gen.",
+"Feb." => "Febr.",
+"Mar." => "Març",
+"Apr." => "Abr.",
+"May." => "Maig",
+"Jun." => "Juny",
+"Jul." => "Jul.",
+"Aug." => "Ag.",
+"Sep." => "Set.",
+"Oct." => "Oct.",
+"Nov." => "Nov.",
+"Dec." => "Des.",
 "All day" => "Tot el dia",
-"New Calendar" => "Calendari nou",
 "Missing fields" => "Els camps que falten",
 "Title" => "Títol",
 "From Date" => "Des de la data",
@@ -132,18 +163,17 @@
 "Interval" => "Interval",
 "End" => "Final",
 "occurrences" => "aparicions",
-"Import a calendar file" => "Importa un fitxer de calendari",
-"Please choose the calendar" => "Escolliu el calendari",
 "create a new calendar" => "crea un nou calendari",
+"Import a calendar file" => "Importa un fitxer de calendari",
+"Please choose a calendar" => "Escolliu un calendari",
 "Name of new calendar" => "Nom del nou calendari",
+"Take an available name!" => "Escolliu un nom disponible!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ja hi ha un calendari amb aquest nom. Si continueu, els calendaris es combinaran.",
 "Import" => "Importa",
-"Importing calendar" => "S'està important el calendari",
-"Calendar imported successfully" => "El calendari s'ha importat amb èxit",
 "Close Dialog" => "Tanca el diàleg",
 "Create a new event" => "Crea un nou esdeveniment",
 "View an event" => "Mostra un event",
 "No categories selected" => "No hi ha categories seleccionades",
-"Select category" => "Seleccioneu categoria",
 "of" => "de",
 "at" => "a",
 "Timezone" => "Zona horària",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Primer dia de la setmana",
-"Calendar CalDAV syncing address:" => "Adreça de sincronització del calendari CalDAV:",
+"Cache" => "Memòria de cau",
+"Clear cache for repeating events" => "Neteja la memòria de cau pels esdveniments amb repetició",
+"Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
+"more info" => "més informació",
+"Primary address (Kontact et al)" => "Adreça primària (Kontact et al)",
+"iOS/OS X" => "IOS/OS X",
+"Read only iCalendar link(s)" => "Enllaç(os) del calendari només de lectura",
 "Users" => "Usuaris",
 "select users" => "seleccioneu usuaris",
 "Editable" => "Editable",
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 33c924ac2c..8270b6785e 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Noch sind nicht alle Kalender zwischengespeichert.",
+"Everything seems to be completely cached" => "Es sieht so aus, als wäre alles vollständig zwischengespeichert.",
 "No calendars found." => "Keine Kalender gefunden",
 "No events found." => "Keine Termine gefunden",
 "Wrong calendar" => "Falscher Kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Entweder enthielt die Datei keine Termine oder alle Termine waren schon im Kalender gespeichert.",
+"events has been saved in the new calendar" => "Der Termin wurde im neuen Kalender gespeichert.",
 "Import failed" => "Import fehlgeschlagen",
+"events has been saved in your calendar" => "Der Termin wurde im Kalender gespeichert.",
 "New Timezone:" => "Neue Zeitzone:",
 "Timezone changed" => "Zeitzone geändert",
 "Invalid request" => "Fehlerhafte Anfrage",
@@ -160,7 +165,10 @@
 "occurrences" => "Termine",
 "create a new calendar" => "Neuen Kalender anlegen",
 "Import a calendar file" => "Kalenderdatei Importieren",
+"Please choose a calendar" => "Wählen Sie bitte einen Kalender.",
 "Name of new calendar" => "Kalendername",
+"Take an available name!" => "Wählen Sie einen verfügbaren Namen.",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ein Kalender mit diesem Namen existiert schon. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
 "Import" => "Importieren",
 "Close Dialog" => "Dialog schließen",
 "Create a new event" => "Neues Ereignis",
@@ -174,6 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "erster Wochentag",
+"Cache" => "Zwischenspeicher",
+"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen.",
+"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab.",
+"more info" => "weitere Informationen",
+"Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Nur lesende(r) iCalender-Link(s)",
 "Users" => "Benutzer",
 "select users" => "Benutzer auswählen",
 "Editable" => "editierbar",
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
index 0b289fbcf6..e478316bba 100644
--- a/apps/calendar/l10n/el.php
+++ b/apps/calendar/l10n/el.php
@@ -1,17 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Everything seems to be completely cached" => "Όλα έχουν αποθηκευτεί στη cache",
 "No calendars found." => "Δε βρέθηκαν ημερολόγια.",
 "No events found." => "Δε βρέθηκαν γεγονότα.",
 "Wrong calendar" => "Λάθος ημερολόγιο",
+"events has been saved in the new calendar" => "τα συμβάντα αποθηκεύτηκαν σε ένα νέο ημερολόγιο",
+"Import failed" => "Η εισαγωγή απέτυχε",
+"events has been saved in your calendar" => "το συμβάν αποθηκεύτηκε στο ημερολογιό σου",
 "New Timezone:" => "Νέα ζώνη ώρας:",
 "Timezone changed" => "Η ζώνη ώρας άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Calendar" => "Ημερολόγιο",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Γενέθλια",
 "Business" => "Επιχείρηση",
 "Call" => "Κλήση",
 "Clients" => "Πελάτες",
-"Deliverer" => "Παραδώσας",
+"Deliverer" => "Προμηθευτής",
 "Holidays" => "Διακοπές",
 "Ideas" => "Ιδέες",
 "Journey" => "Ταξίδι",
@@ -22,7 +31,9 @@
 "Projects" => "Έργα",
 "Questions" => "Ερωτήσεις",
 "Work" => "Εργασία",
+"by" => "από",
 "unnamed" => "ανώνυμο",
+"New Calendar" => "Νέα Ημερολόγιο",
 "Does not repeat" => "Μη επαναλαμβανόμενο",
 "Daily" => "Καθημερινά",
 "Weekly" => "Εβδομαδιαία",
@@ -67,8 +78,26 @@
 "by day and month" => "κατά ημέρα και μήνα",
 "Date" => "Ημερομηνία",
 "Cal." => "Ημερ.",
+"Sun." => "Κυρ.",
+"Mon." => "Δευ.",
+"Tue." => "Τρί.",
+"Wed." => "Τετ.",
+"Thu." => "Πέμ.",
+"Fri." => "Παρ.",
+"Sat." => "Σάβ.",
+"Jan." => "Ιαν.",
+"Feb." => "Φεβ.",
+"Mar." => "Μάρ.",
+"Apr." => "Απρ.",
+"May." => "Μαΐ.",
+"Jun." => "Ιούν.",
+"Jul." => "Ιούλ.",
+"Aug." => "Αύγ.",
+"Sep." => "Σεπ.",
+"Oct." => "Οκτ.",
+"Nov." => "Νοέ.",
+"Dec." => "Δεκ.",
 "All day" => "Ολοήμερο",
-"New Calendar" => "Νέα Ημερολόγιο",
 "Missing fields" => "Πεδία που λείπουν",
 "Title" => "Τίτλος",
 "From Date" => "Από Ημερομηνία",
@@ -132,18 +161,16 @@
 "Interval" => "Διάστημα",
 "End" => "Τέλος",
 "occurrences" => "περιστατικά",
-"Import a calendar file" => "Εισαγωγή αρχείου ημερολογίου",
-"Please choose the calendar" => "Παρακαλώ επιλέξτε το ημερολόγιο",
 "create a new calendar" => "δημιουργία νέου ημερολογίου",
+"Import a calendar file" => "Εισαγωγή αρχείου ημερολογίου",
+"Please choose a calendar" => "Παρακαλώ επέλεξε ένα ημερολόγιο",
 "Name of new calendar" => "Όνομα νέου ημερολογίου",
+"Take an available name!" => "Επέλεξε ένα διαθέσιμο όνομα!",
 "Import" => "Εισαγωγή",
-"Importing calendar" => "Εισαγωγή ημερολογίου",
-"Calendar imported successfully" => "Το ημερολόγιο εισήχθει επιτυχώς",
 "Close Dialog" => "Κλείσιμο Διαλόγου",
 "Create a new event" => "Δημιουργήστε ένα νέο συμβάν",
 "View an event" => "Εμφάνισε ένα γεγονός",
 "No categories selected" => "Δεν επελέγησαν  κατηγορίες",
-"Select category" => "Επιλέξτε κατηγορία",
 "of" => "του",
 "at" => "στο",
 "Timezone" => "Ζώνη ώρας",
@@ -152,7 +179,11 @@
 "24h" => "24ω",
 "12h" => "12ω",
 "First day of the week" => "Πρώτη μέρα της εβδομάδας",
-"Calendar CalDAV syncing address:" => "Διεύθυνση για το συγχρονισμού του ημερολογίου CalDAV:",
+"Cache" => "Cache",
+"more info" => "περισσότερες πλροφορίες",
+"Primary address (Kontact et al)" => "Κύρια Διεύθυνση(Επαφή και άλλα)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => " iCalendar link(s) μόνο για ανάγνωση",
 "Users" => "Χρήστες",
 "select users" => "επέλεξε χρήστες",
 "Editable" => "Επεξεργάσιμο",
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
index 4de94b7b7b..e67f77909a 100644
--- a/apps/calendar/l10n/fi_FI.php
+++ b/apps/calendar/l10n/fi_FI.php
@@ -2,6 +2,8 @@
 "No calendars found." => "Kalentereita ei löytynyt",
 "No events found." => "Tapahtumia ei löytynyt.",
 "Wrong calendar" => "Väärä kalenteri",
+"Import failed" => "Tuonti epäonnistui",
+"events has been saved in your calendar" => "tapahtumaa on tallennettu kalenteriisi",
 "New Timezone:" => "Uusi aikavyöhyke:",
 "Timezone changed" => "Aikavyöhyke vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
@@ -21,6 +23,7 @@
 "Questions" => "Kysymykset",
 "Work" => "Työ",
 "unnamed" => "nimetön",
+"New Calendar" => "Uusi kalenteri",
 "Does not repeat" => "Ei toistoa",
 "Daily" => "Päivittäin",
 "Weekly" => "Viikottain",
@@ -55,8 +58,26 @@
 "November" => "Marraskuu",
 "December" => "Joulukuu",
 "Date" => "Päivämäärä",
+"Sun." => "Su",
+"Mon." => "Ma",
+"Tue." => "Ti",
+"Wed." => "Ke",
+"Thu." => "To",
+"Fri." => "Pe",
+"Sat." => "La",
+"Jan." => "Tammi",
+"Feb." => "Helmi",
+"Mar." => "Maalis",
+"Apr." => "Huhti",
+"May." => "Touko",
+"Jun." => "Kesä",
+"Jul." => "Heinä",
+"Aug." => "Elo",
+"Sep." => "Syys",
+"Oct." => "Loka",
+"Nov." => "Marras",
+"Dec." => "Joulu",
 "All day" => "Koko päivä",
-"New Calendar" => "Uusi kalenteri",
 "Missing fields" => "Puuttuvat kentät",
 "Title" => "Otsikko",
 "The event ends before it starts" => "Tapahtuma päättyy ennen alkamistaan",
@@ -110,25 +131,23 @@
 "Select months" => "Valitse kuukaudet",
 "Select weeks" => "Valitse viikot",
 "Interval" => "Intervalli",
-"Import a calendar file" => "Tuo kalenteritiedosto",
-"Please choose the calendar" => "Valitse kalenteri",
 "create a new calendar" => "luo uusi kalenteri",
+"Import a calendar file" => "Tuo kalenteritiedosto",
+"Please choose a calendar" => "Valitse kalenteri",
 "Name of new calendar" => "Uuden kalenterin nimi",
 "Import" => "Tuo",
-"Importing calendar" => "Tuodaan kalenteria",
-"Calendar imported successfully" => "Kalenteri tuotu onnistuneesti",
 "Close Dialog" => "Sulje ikkuna",
 "Create a new event" => "Luo uusi tapahtuma",
 "View an event" => "Avaa tapahtuma",
 "No categories selected" => "Luokkia ei ole valittu",
-"Select category" => "Valitse luokka",
 "Timezone" => "Aikavyöhyke",
 "Check always for changes of the timezone" => "Tarkista aina aikavyöhykkeen muutokset",
 "Timeformat" => "Ajan esitysmuoto",
 "24h" => "24 tuntia",
 "12h" => "12 tuntia",
 "First day of the week" => "Viikon ensimmäinen päivä",
-"Calendar CalDAV syncing address:" => "Kalenterin CalDAV-synkronointiosoite:",
+"Calendar CalDAV syncing addresses" => "Kalenterin CalDAV-synkronointiosoitteet",
+"iOS/OS X" => "iOS/OS X",
 "Users" => "Käyttäjät",
 "select users" => "valitse käyttäjät",
 "Editable" => "Muoktattava",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 506453af42..289bc905b3 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Tous les calendriers ne sont pas mis en cache",
+"Everything seems to be completely cached" => "Tout semble être en cache",
 "No calendars found." => "Aucun calendrier n'a été trouvé.",
 "No events found." => "Aucun événement n'a été trouvé.",
 "Wrong calendar" => "Mauvais calendrier",
+"The file contained either no events or all events are already saved in your calendar." => "Soit le fichier ne contient aucun événement soit tous les événements sont déjà enregistrés dans votre calendrier.",
+"events has been saved in the new calendar" => "Les événements ont été enregistrés dans le nouveau calendrier",
+"Import failed" => "Échec de l'import",
+"events has been saved in your calendar" => "Les événements ont été enregistrés dans votre calendrier",
 "New Timezone:" => "Nouveau fuseau horaire :",
 "Timezone changed" => "Fuseau horaire modifié",
 "Invalid request" => "Requête invalide",
 "Calendar" => "Calendrier",
+"ddd" => "jjj",
+"ddd M/d" => "jjj M/j",
+"dddd M/d" => "jjjj M/j",
+"MMMM yyyy" => "MMMM aaaa",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "jjjj, MMM j, aaaa",
 "Birthday" => "Anniversaire",
 "Business" => "Professionnel",
 "Call" => "Appel",
@@ -22,7 +33,9 @@
 "Projects" => "Projets",
 "Questions" => "Questions",
 "Work" => "Travail",
+"by" => "par",
 "unnamed" => "sans-nom",
+"New Calendar" => "Nouveau Calendrier",
 "Does not repeat" => "Pas de répétition",
 "Daily" => "Tous les jours",
 "Weekly" => "Hebdomadaire",
@@ -67,8 +80,26 @@
 "by day and month" => "par jour et mois",
 "Date" => "Date",
 "Cal." => "Cal.",
+"Sun." => "Dim.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Jeu",
+"Fri." => "Ven.",
+"Sat." => "Sam.",
+"Jan." => "Jan.",
+"Feb." => "Fév.",
+"Mar." => "Mars",
+"Apr." => "Avr.",
+"May." => "Mai",
+"Jun." => "Juin",
+"Jul." => "Juil.",
+"Aug." => "Août",
+"Sep." => "Sep.",
+"Oct." => "Oct.",
+"Nov." => "Nov.",
+"Dec." => "Déc.",
 "All day" => "Journée entière",
-"New Calendar" => "Nouveau Calendrier",
 "Missing fields" => "Champs manquants",
 "Title" => "Titre",
 "From Date" => "De la date",
@@ -132,18 +163,17 @@
 "Interval" => "Intervalle",
 "End" => "Fin",
 "occurrences" => "occurrences",
-"Import a calendar file" => "Importer un fichier de calendriers",
-"Please choose the calendar" => "Choisissez le calendrier svp",
 "create a new calendar" => "Créer un nouveau calendrier",
+"Import a calendar file" => "Importer un fichier de calendriers",
+"Please choose a calendar" => "Veuillez sélectionner un calendrier",
 "Name of new calendar" => "Nom pour le nouveau calendrier",
+"Take an available name!" => "Choisissez un nom disponible !",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Un calendrier de ce nom existe déjà. Si vous choisissez de continuer les calendriers seront fusionnés.",
 "Import" => "Importer",
-"Importing calendar" => "Import du calendrier",
-"Calendar imported successfully" => "Calendrier importé avec succès",
 "Close Dialog" => "Fermer la fenêtre",
 "Create a new event" => "Créer un nouvel événement",
 "View an event" => "Voir un événement",
 "No categories selected" => "Aucune catégorie sélectionnée",
-"Select category" => "Sélectionner une catégorie",
 "of" => "de",
 "at" => "à",
 "Timezone" => "Fuseau horaire",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Premier jour de la semaine",
-"Calendar CalDAV syncing address:" => "Adresse de synchronisation du calendrier CalDAV :",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Nettoyer le cache des événements répétitifs",
+"Calendar CalDAV syncing addresses" => "Adresses de synchronisation des calendriers CalDAV",
+"more info" => "plus d'infos",
+"Primary address (Kontact et al)" => "Adresses principales (Kontact et assimilés)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "lien(s) iCalendar en lecture seule",
 "Users" => "Utilisateurs",
 "select users" => "sélectionner les utilisateurs",
 "Editable" => "Modifiable",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 0c95b83d5e..285f96e64a 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
 "There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
+"element name is not set." => "no s'ha establert el nom de l'element.",
+"id is not set." => "no s'ha establert la id.",
+"Could not parse contact: " => "No s'ha pogut processar el contacte:",
 "Cannot add empty property." => "No es pot afegir una propietat buida.",
 "At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
 "Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
-"Error adding contact property." => "Error en afegir la propietat del contacte.",
+"Error adding contact property: " => "Error en afegir la propietat del contacte:",
 "No ID provided" => "No heu facilitat cap ID",
 "Error setting checksum." => "Error en establir la suma de verificació.",
 "No categories selected for deletion." => "No heu seleccionat les categories a eliminar.",
@@ -12,22 +15,23 @@
 "No contacts found." => "No s'han trobat contactes.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error en analitzar la ID de la VCard: \"",
-"Cannot add addressbook with an empty name." => "No es pot afegir una llibreta d'adreces amb un nom buit.",
-"Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
-"Error activating addressbook." => "Error en activar la llibreta d'adreces.",
 "No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
 "Error reading contact photo." => "Error en llegir la foto del contacte.",
 "Error saving temporary file." => "Error en desar el fitxer temporal.",
 "The loading photo is not valid." => "La foto carregada no és vàlida.",
-"id is not set." => "no s'ha establert la id.",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
 "Error deleting contact property." => "Error en eliminar la propietat del contacte.",
 "Contact ID is missing." => "falta la ID del contacte.",
-"Missing contact id." => "Falta la id del contacte.",
 "No photo path was submitted." => "No heu tramès el camí de la foto.",
 "File doesn't exist:" => "El fitxer no existeix:",
 "Error loading image." => "Error en carregar la imatge.",
-"element name is not set." => "no s'ha establert el nom de l'element.",
+"Error getting contact object." => "Error en obtenir l'objecte contacte.",
+"Error getting PHOTO property." => "Error en obtenir la propietat PHOTO.",
+"Error saving contact." => "Error en desar el contacte.",
+"Error resizing image" => "Error en modificar la mida de la imatge",
+"Error cropping image" => "Error en retallar la imatge",
+"Error creating temporary image" => "Error en crear la imatge temporal",
+"Error finding image: " => "Error en trobar la imatge:",
 "checksum is not set." => "no s'ha establert la suma de verificació.",
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
 "Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
@@ -41,8 +45,27 @@
 "The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
 "No file was uploaded" => "No s'ha carregat cap fitxer",
 "Missing a temporary folder" => "Falta un fitxer temporal",
+"Couldn't save temporary image: " => "No s'ha pogut desar la imatge temporal: ",
+"Couldn't load temporary image: " => "No s'ha pogut carregar la imatge temporal: ",
+"No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
 "Contacts" => "Contactes",
-"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
+"Sorry, this functionality has not been implemented yet" => "Aquesta funcionalitat encara no està implementada",
+"Not implemented" => "No implementada",
+"Couldn't get a valid address." => "No s'ha pogut obtenir una adreça vàlida.",
+"Error" => "Error",
+"Contact" => "Contacte",
+"New" => "Nou",
+"New Contact" => "Contate nou",
+"This property has to be non-empty." => "Aquesta propietat no pot ser buida.",
+"Couldn't serialize elements." => "No s'han pogut serialitzar els elements.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org",
+"Edit name" => "Edita el nom",
+"No files selected for upload." => "No s'han seleccionat fitxers per a la pujada.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor.",
+"Select type" => "Seleccioneu un tipus",
+"Result: " => "Resultat: ",
+" imported, " => " importat, ",
+" failed." => " fallada.",
 "Addressbook not found." => "No s'ha trobat la llibreta d'adreces.",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
@@ -60,25 +83,54 @@
 "Video" => "Vídeo",
 "Pager" => "Paginador",
 "Internet" => "Internet",
+"Birthday" => "Aniversari",
+"Business" => "Negocis",
+"Call" => "Trucada",
+"Clients" => "Clients",
+"Deliverer" => "Emissari",
+"Holidays" => "Vacances",
+"Ideas" => "Idees",
+"Journey" => "Viatge",
+"Jubilee" => "Aniversari",
+"Meeting" => "Reunió",
+"Other" => "Altres",
+"Personal" => "Personal",
+"Projects" => "Projectes",
+"Questions" => "Preguntes",
 "{name}'s Birthday" => "Aniversari de {name}",
-"Contact" => "Contacte",
 "Add Contact" => "Afegeix un contacte",
+"Import" => "Importa",
 "Addressbooks" => "Llibretes d'adreces",
+"Close" => "Tanca",
+"Keyboard shortcuts" => "Dreceres de teclat",
+"Navigation" => "Navegació",
+"Next contact in list" => "Següent contacte de la llista",
+"Previous contact in list" => "Contacte anterior de la llista",
+"Expand/collapse current addressbook" => "Expandeix/col·lapsa la llibreta d'adreces",
+"Next/previous addressbook" => "Següent/anterior llibreta d'adreces",
+"Actions" => "Accions",
+"Refresh contacts list" => "Carrega de nou la llista de contactes",
+"Add new contact" => "Afegeix un contacte nou",
+"Add new addressbook" => "Afegeix una llibreta d'adreces nova",
+"Delete current contact" => "Esborra el contacte",
 "Configure Address Books" => "Configura les llibretes d'adreces",
 "New Address Book" => "Nova llibreta d'adreces",
-"Import from VCF" => "Importa de VFC",
 "CardDav Link" => "Enllaç CardDav",
 "Download" => "Baixa",
 "Edit" => "Edita",
 "Delete" => "Suprimeix",
-"Download contact" => "Baixa el contacte",
-"Delete contact" => "Suprimeix el contacte",
 "Drop photo to upload" => "Elimina la foto a carregar",
+"Delete current photo" => "Elimina la foto actual",
+"Edit current photo" => "Edita la foto actual",
+"Upload new photo" => "Carrega una foto nova",
+"Select photo from ownCloud" => "Selecciona una foto de ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma",
 "Edit name details" => "Edita detalls del nom",
 "Nickname" => "Sobrenom",
 "Enter nickname" => "Escriviu el sobrenom",
-"Birthday" => "Aniversari",
+"Web site" => "Adreça web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Vés a la web",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grups",
 "Separate groups with commas" => "Separeu els grups amb comes",
@@ -94,24 +146,24 @@
 "Edit address details" => "Edita els detalls de l'adreça",
 "Add notes here." => "Afegiu notes aquí.",
 "Add field" => "Afegeix un camp",
-"Profile picture" => "Foto de perfil",
 "Phone" => "Telèfon",
 "Note" => "Nota",
-"Delete current photo" => "Elimina la foto actual",
-"Edit current photo" => "Edita la foto actual",
-"Upload new photo" => "Carrega una foto nova",
-"Select photo from ownCloud" => "Selecciona una foto de ownCloud",
+"Download contact" => "Baixa el contacte",
+"Delete contact" => "Suprimeix el contacte",
+"The temporary image has been removed from cache." => "La imatge temporal ha estat eliminada de la memòria de cau.",
 "Edit address" => "Edita l'adreça",
 "Type" => "Tipus",
 "PO Box" => "Adreça postal",
+"Street address" => "Adreça",
+"Street and number" => "Carrer i número",
 "Extended" => "Addicional",
-"Street" => "Carrer",
+"Apartment number etc." => "Número d'apartament, etc.",
 "City" => "Ciutat",
 "Region" => "Comarca",
+"E.g. state or province" => "p. ex. Estat o província ",
 "Zipcode" => "Codi postal",
+"Postal code" => "Codi postal",
 "Country" => "País",
-"Edit categories" => "Edita categories",
-"Add" => "Afegeix",
 "Addressbook" => "Llibreta d'adreces",
 "Hon. prefixes" => "Prefix honorífic:",
 "Miss" => "Srta",
@@ -143,15 +195,16 @@
 "Please choose the addressbook" => "Escolliu la llibreta d'adreces",
 "create a new addressbook" => "crea una llibreta d'adreces nova",
 "Name of new addressbook" => "Nom de la nova llibreta d'adreces",
-"Import" => "Importa",
 "Importing contacts" => "S'estan important contactes",
-"Select address book to import to:" => "Seleccioneu la llibreta d'adreces a la que voleu importar:",
-"Select from HD" => "Selecciona de HD",
 "You have no contacts in your addressbook." => "No teniu contactes a la llibreta d'adreces.",
 "Add contact" => "Afegeix un contacte",
 "Configure addressbooks" => "Configura les llibretes d'adreces",
+"Select Address Books" => "Selecccioneu llibretes d'adreces",
+"Enter name" => "Escriviu un nom",
+"Enter description" => "Escriviu una descripció",
 "CardDAV syncing addresses" => "Adreces de sincronització CardDAV",
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "Enllaç(os) només de lectura vCard"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 3a1013eb4f..b76c5ce071 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
 "There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
+"element name is not set." => "Kein Name für das Element angegeben.",
+"id is not set." => "ID ist nicht angegeben.",
+"Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
 "Cannot add empty property." => "Feld darf nicht leer sein.",
 "At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
 "Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
-"Error adding contact property." => "Kontakt ändern fehlgeschlagen",
+"Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
 "No ID provided" => "Keine ID angegeben",
 "Error setting checksum." => "Fehler beim Setzen der Prüfsumme.",
 "No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
@@ -12,22 +15,23 @@
 "No contacts found." => "Keine Kontakte gefunden.",
 "Missing ID" => "Fehlende ID",
 "Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
-"Cannot add addressbook with an empty name." => "Bitte einen Namen für das Adressbuch angeben.",
-"Error adding addressbook." => "Adressbuch hinzufügen fehlgeschlagen",
-"Error activating addressbook." => "Adressbuchaktivierung fehlgeschlagen",
 "No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
-"Error reading contact photo." => "Fehler beim auslesen des Kontaktfotos.",
+"Error reading contact photo." => "Fehler beim Auslesen des Kontaktfotos.",
 "Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
 "The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
-"id is not set." => "ID ist nicht angegeben.",
 "Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
 "Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
 "Contact ID is missing." => "Keine Kontakt-ID angegeben.",
-"Missing contact id." => "Fehlende Kontakt-ID.",
 "No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
 "File doesn't exist:" => "Datei existiert nicht: ",
 "Error loading image." => "Fehler beim Laden des Bildes.",
-"element name is not set." => "Kein Name für das Element angegeben.",
+"Error getting contact object." => "Fehler beim Abruf des Kontakt-Objektes.",
+"Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO Eigenschaft.",
+"Error saving contact." => "Fehler beim Speichern des Kontaktes",
+"Error resizing image" => "Fehler bei der Größenänderung des Bildes",
+"Error cropping image" => "Fehler beim Zuschneiden des Bildes",
+"Error creating temporary image" => "Fehler beim erstellen des temporären Bildes",
+"Error finding image: " => "Fehler beim Suchen des Bildes: ",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
 "Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
@@ -41,14 +45,33 @@
 "The uploaded file was only partially uploaded" => "Datei konnte nur teilweise übertragen werden",
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
+"Couldn't save temporary image: " => "Konnte das temporäre Bild nicht speichern:",
+"Couldn't load temporary image: " => "Konnte das temporäre Bild nicht laden:",
+"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "Contacts" => "Kontakte",
-"Drop a VCF file to import contacts." => "Zieh' eine VCF Datei hierher zum Kontaktimport",
+"Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung",
+"Not implemented" => "Nicht Verfügbar",
+"Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen",
+"Error" => "Fehler",
+"Contact" => "Kontakt",
+"New" => "Neu",
+"New Contact" => "Neuer Kontakt",
+"This property has to be non-empty." => "Dieses Feld darf nicht Leer sein.",
+"Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org",
+"Edit name" => "Name ändern",
+"No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"Select type" => "Wähle Typ",
+"Result: " => "Ergebnis: ",
+" imported, " => " importiert, ",
+" failed." => " fehlgeschlagen.",
 "Addressbook not found." => "Adressbuch nicht gefunden.",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
 "Address" => "Adresse",
 "Telephone" => "Telefon",
-"Email" => "Email",
+"Email" => "E-Mail",
 "Organization" => "Organisation",
 "Work" => "Arbeit",
 "Home" => "Zuhause",
@@ -60,28 +83,57 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Geburtstag",
+"Business" => "Geschäftlich",
+"Call" => "Anruf",
+"Clients" => "Kunden",
+"Deliverer" => "Lieferant",
+"Holidays" => "Feiertage",
+"Ideas" => "Ideen",
+"Journey" => "Reise",
+"Jubilee" => "Jubiläum",
+"Meeting" => "Besprechung",
+"Other" => "Andere",
+"Personal" => "Persönlich",
+"Projects" => "Projekte",
+"Questions" => "Fragen",
 "{name}'s Birthday" => "Geburtstag von {name}",
-"Contact" => "Kontakt",
 "Add Contact" => "Kontakt hinzufügen",
+"Import" => "Importieren",
 "Addressbooks" => "Adressbücher",
+"Close" => "Schließen",
+"Keyboard shortcuts" => "Tastaturbefehle",
+"Navigation" => "Navigation",
+"Next contact in list" => "Nächster Kontakt aus der Liste",
+"Previous contact in list" => "Vorheriger Kontakt aus der Liste",
+"Expand/collapse current addressbook" => "Ausklappen/Einklappen des Adressbuches",
+"Next/previous addressbook" => "Nächstes/Vorhergehendes Adressbuch",
+"Actions" => "Aktionen",
+"Refresh contacts list" => "Kontaktliste neu laden",
+"Add new contact" => "Neuen Kontakt hinzufügen",
+"Add new addressbook" => "Neues Adressbuch hinzufügen",
+"Delete current contact" => "Aktuellen Kontakt löschen",
 "Configure Address Books" => "Adressbücher konfigurieren",
 "New Address Book" => "Neues Adressbuch",
-"Import from VCF" => "Import von VCF Datei",
-"CardDav Link" => "CardDav Link",
+"CardDav Link" => "CardDav-Link",
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
 "Delete" => "Löschen",
-"Download contact" => "Kontakt herunterladen",
-"Delete contact" => "Kontakt löschen",
-"Drop photo to upload" => "Zieh' ein Foto hierher zum hochladen",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts order Rückwärts mit Komma",
-"Edit name details" => "Namen ändern",
+"Drop photo to upload" => "Zieh' ein Foto hierher zum Hochladen",
+"Delete current photo" => "Derzeitiges Foto löschen",
+"Edit current photo" => "Foto ändern",
+"Upload new photo" => "Neues Foto hochladen",
+"Select photo from ownCloud" => "Foto aus ownCloud auswählen",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
+"Edit name details" => "Name ändern",
 "Nickname" => "Spitzname",
-"Enter nickname" => "Spitznamen angeben",
-"Birthday" => "Geburtstag",
-"dd-mm-yyyy" => "TT-MM-JJJJ",
+"Enter nickname" => "Spitzname angeben",
+"Web site" => "Webseite",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Webseite aufrufen",
+"dd-mm-yyyy" => "dd.mm.yyyy",
 "Groups" => "Gruppen",
-"Separate groups with commas" => "Gruppen mit Komma trennt",
+"Separate groups with commas" => "Gruppen mit Komma getrennt",
 "Edit groups" => "Gruppen editieren",
 "Preferred" => "Bevorzugt",
 "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
@@ -94,24 +146,24 @@
 "Edit address details" => "Adressinformationen ändern",
 "Add notes here." => "Füge hier Notizen ein.",
 "Add field" => "Feld hinzufügen",
-"Profile picture" => "Profil Bild",
 "Phone" => "Telefon",
 "Note" => "Notiz",
-"Delete current photo" => "Derzeitiges Foto löschen",
-"Edit current photo" => "Foto ändern",
-"Upload new photo" => "Neues Foto hochladen",
-"Select photo from ownCloud" => "Foto aus ownCloud auswählen",
+"Download contact" => "Kontakt herunterladen",
+"Delete contact" => "Kontakt löschen",
+"The temporary image has been removed from cache." => "Das temporäre Bild wurde aus dem Cache gelöscht.",
 "Edit address" => "Adresse ändern",
 "Type" => "Typ",
 "PO Box" => "Postfach",
+"Street address" => "Straßenanschrift",
+"Street and number" => "Straße und Nummer",
 "Extended" => "Erweitert",
-"Street" => "Straße",
+"Apartment number etc." => "Wohnungsnummer usw.",
 "City" => "Stadt",
 "Region" => "Region",
+"E.g. state or province" => "Z.B. Staat oder Bezirk",
 "Zipcode" => "Postleitzahl",
+"Postal code" => "PLZ",
 "Country" => "Land",
-"Edit categories" => "Kategorie ändern",
-"Add" => "Hinzufügen",
 "Addressbook" => "Adressbuch",
 "Hon. prefixes" => "Höflichkeitspräfixe",
 "Miss" => "Frau",
@@ -143,15 +195,16 @@
 "Please choose the addressbook" => "Bitte Adressbuch auswählen",
 "create a new addressbook" => "Neues Adressbuch erstellen",
 "Name of new addressbook" => "Name des neuen Adressbuchs",
-"Import" => "Importieren",
 "Importing contacts" => "Kontakte werden importiert",
-"Select address book to import to:" => "Adressbuch, in das importiert werden soll",
-"Select from HD" => "Von der Festplatte auswählen",
 "You have no contacts in your addressbook." => "Du hast keine Kontakte im Adressbuch.",
 "Add contact" => "Kontakt hinzufügen",
 "Configure addressbooks" => "Adressbücher konfigurieren",
+"Select Address Books" => "Wähle Adressbuch",
+"Enter name" => "Name eingeben",
+"Enter description" => "Beschreibung eingeben",
 "CardDAV syncing addresses" => "CardDAV Sync-Adressen",
 "more info" => "mehr Info",
 "Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index f015f0ca36..9538e630a5 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -1,36 +1,40 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
 "There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
+"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
+"id is not set." => "δεν ορίστηκε id",
+"Could not parse contact: " => "Δε αναγνώστηκε η επαφή",
 "Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
 "At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
 "Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
-"Error adding contact property." => "Σφάλμα προσθήκης ιδιότητας επαφής.",
-"No ID provided" => "Δε δώθηκε ID",
+"Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
+"No ID provided" => "Δε δόθηκε ID",
 "Error setting checksum." => "Λάθος κατά τον ορισμό checksum ",
 "No categories selected for deletion." => "Δε επελέγησαν κατηγορίες για διαγραφή",
 "No address books found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "No contacts found." => "Δεν βρέθηκαν επαφές",
 "Missing ID" => "Λείπει ID",
 "Error parsing VCard for ID: \"" => "Σφάλμα κατά την ανάγνωση του VCard για το ID:\"",
-"Cannot add addressbook with an empty name." => "Δε μπορεί να προστεθεί βιβλίο διευθύνσεων με κενό όνομα",
-"Error adding addressbook." => "Σφάλμα προσθήκης βιβλίου διευθύνσεων.",
-"Error activating addressbook." => "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων",
 "No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
 "Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
 "Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
 "The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
-"id is not set." => "δεν ορίστηκε id",
 "Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
 "Error deleting contact property." => "Σφάλμα διαγραφής ιδιότητας επαφής.",
 "Contact ID is missing." => "Λείπει ID επαφής",
-"Missing contact id." => "Απουσιαζει ID επαφής",
 "No photo path was submitted." => "Δε δόθηκε διαδρομή εικόνας",
 "File doesn't exist:" => "Το αρχείο δεν υπάρχει:",
 "Error loading image." => "Σφάλμα φόρτωσης εικόνας",
-"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
+"Error getting contact object." => "Σφάλμα κατά τη λήψη αντικειμένου επαφής",
+"Error getting PHOTO property." => "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ.",
+"Error saving contact." => "Σφάλμα κατά την αποθήκευση επαφής.",
+"Error resizing image" => "Σφάλμα κατά την αλλαγή μεγέθους εικόνας",
+"Error cropping image" => "Σφάλμα κατά την περικοπή εικόνας",
+"Error creating temporary image" => "Σφάλμα κατά την δημιουργία προσωρινής εικόνας",
+"Error finding image: " => "Σφάλμα κατά την εύρεση της εικόνας: ",
 "checksum is not set." => "δε ορίστηκε checksum ",
-"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα:",
-"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο",
+"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
+"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
 "Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
 "Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
 "Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
@@ -41,8 +45,27 @@
 "The uploaded file was only partially uploaded" => "Το αρχείο ανέβηκε μερικώς",
 "No file was uploaded" => "Δεν ανέβηκε κάποιο αρχείο",
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
+"Couldn't save temporary image: " => "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: ",
+"Couldn't load temporary image: " => "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: ",
+"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
 "Contacts" => "Επαφές",
-"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
+"Sorry, this functionality has not been implemented yet" => "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα",
+"Not implemented" => "Δεν έχει υλοποιηθεί",
+"Couldn't get a valid address." => "Αδυναμία λήψης έγκυρης διεύθυνσης",
+"Error" => "Σφάλμα",
+"Contact" => "Επαφή",
+"New" => "Νέο",
+"New Contact" => "Νέα επαφή",
+"This property has to be non-empty." => "Το πεδίο δεν πρέπει να είναι άδειο.",
+"Couldn't serialize elements." => "Αδύνατο να μπουν σε σειρά τα στοιχεία",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org",
+"Edit name" => "Αλλαγή ονόματος",
+"No files selected for upload." => "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server.",
+"Select type" => "Επιλογή τύπου",
+"Result: " => "Αποτέλεσμα: ",
+" imported, " => " εισάγεται,",
+" failed." => " απέτυχε.",
 "Addressbook not found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
@@ -55,30 +78,58 @@
 "Mobile" => "Κινητό",
 "Text" => "Κείμενο",
 "Voice" => "Ομιλία",
-"Message" => "Μήνυμα ",
+"Message" => "Μήνυμα",
 "Fax" => "Φαξ",
 "Video" => "Βίντεο",
 "Pager" => "Βομβητής",
 "Internet" => "Διαδίκτυο",
+"Birthday" => "Γενέθλια",
+"Business" => "Επιχείρηση",
+"Call" => "Κάλεσε",
+"Clients" => "Πελάτες",
+"Deliverer" => "Προμηθευτής",
+"Holidays" => "Διακοπές",
+"Ideas" => "Ιδέες",
+"Journey" => "Ταξίδι",
+"Jubilee" => "Ιωβηλαίο",
+"Meeting" => "Συνάντηση",
+"Other" => "Άλλο",
+"Personal" => "Προσωπικό",
+"Projects" => "Έργα",
+"Questions" => "Ερωτήσεις",
 "{name}'s Birthday" => "{name} έχει Γενέθλια",
-"Contact" => "Επαφή",
 "Add Contact" => "Προσθήκη επαφής",
+"Import" => "Εισαγωγή",
 "Addressbooks" => "Βιβλία διευθύνσεων",
+"Close" => "Κλείσιμο  ",
+"Keyboard shortcuts" => "Συντομεύσεις πλητρολογίου",
+"Navigation" => "Πλοήγηση",
+"Next contact in list" => "Επόμενη επαφή στη λίστα",
+"Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
+"Next/previous addressbook" => "Επόμενο/προηγούμενο βιβλίο διευθύνσεων",
+"Actions" => "Ενέργειες",
+"Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
+"Add new contact" => "Προσθήκη νέας επαφής",
+"Add new addressbook" => "Προσθήκη νέου βιβλίου επαφών",
+"Delete current contact" => "Διαγραφή τρέχουσας επαφής",
 "Configure Address Books" => "Ρυθμίστε το βιβλίο διευθύνσεων ",
 "New Address Book" => "Νέο βιβλίο διευθύνσεων",
-"Import from VCF" => "Εισαγωγή από VCF αρχείο",
 "CardDav Link" => "Σύνδεσμος CardDav",
 "Download" => "Λήψη",
 "Edit" => "Επεξεργασία",
 "Delete" => "Διαγραφή",
-"Download contact" => "Λήψη επαφής",
-"Delete contact" => "Διαγραφή επαφής",
 "Drop photo to upload" => "Ρίξε μια φωτογραφία για ανέβασμα",
+"Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
+"Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
+"Upload new photo" => "Ανέβασε νέα φωτογραφία",
+"Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα",
 "Edit name details" => "Αλλάξτε τις λεπτομέρειες ονόματος",
 "Nickname" => "Παρατσούκλι",
-"Enter nickname" => "Εισάγεται παρατσούκλι",
-"Birthday" => "Γενέθλια",
+"Enter nickname" => "Εισάγετε παρατσούκλι",
+"Web site" => "Ιστότοπος",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Πήγαινε στον ιστότοπο",
 "dd-mm-yyyy" => "ΗΗ-ΜΜ-ΕΕΕΕ",
 "Groups" => "Ομάδες",
 "Separate groups with commas" => "Διαχώρισε τις ομάδες με κόμμα ",
@@ -94,24 +145,24 @@
 "Edit address details" => "Επεξεργασία λεπτομερειών διεύθυνσης",
 "Add notes here." => "Πρόσθεσε τις σημειώσεις εδώ",
 "Add field" => "Προσθήκη πεδίου",
-"Profile picture" => "Φωτογραφία προφίλ",
 "Phone" => "Τηλέφωνο",
 "Note" => "Σημείωση",
-"Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
-"Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
-"Upload new photo" => "Ανέβασε νέα φωτογραφία",
-"Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
+"Download contact" => "Λήψη επαφής",
+"Delete contact" => "Διαγραφή επαφής",
+"The temporary image has been removed from cache." => "Η προσωρινή εικόνα αφαιρέθηκε από την κρυφή μνήμη.",
 "Edit address" => "Επεξεργασία διεύθυνσης",
 "Type" => "Τύπος",
 "PO Box" => "Ταχ. Θυρίδα",
+"Street address" => "Διεύθυνση οδού",
+"Street and number" => "Οδός και αριθμός",
 "Extended" => "Εκτεταμένη",
-"Street" => "Οδός",
+"Apartment number etc." => "Αριθμός διαμερίσματος",
 "City" => "Πόλη",
 "Region" => "Περιοχή",
+"E.g. state or province" => "Π.χ. Πολιτεία ή επαρχεία",
 "Zipcode" => "Τ.Κ.",
+"Postal code" => "Ταχυδρομικός Κωδικός",
 "Country" => "Χώρα",
-"Edit categories" => "Επεξεργασία κατηγορίας",
-"Add" => "Προσθήκη",
 "Addressbook" => "Βιβλίο διευθύνσεων",
 "Hon. prefixes" => "προθέματα",
 "Miss" => "Δις",
@@ -134,7 +185,7 @@
 "Sn." => "Sn.",
 "New Addressbook" => "Νέο βιβλίο διευθύνσεων",
 "Edit Addressbook" => "Επεξεργασία βιβλίου διευθύνσεων",
-"Displayname" => "Προβαλόμενο όνομα",
+"Displayname" => "Προβαλλόμενο όνομα",
 "Active" => "Ενεργό",
 "Save" => "Αποθήκευση",
 "Submit" => "Καταχώρηση",
@@ -143,15 +194,16 @@
 "Please choose the addressbook" => "Παρακαλώ επέλεξε βιβλίο διευθύνσεων",
 "create a new addressbook" => "Δημιουργία νέου βιβλίου διευθύνσεων",
 "Name of new addressbook" => "Όνομα νέου βιβλίου διευθύνσεων",
-"Import" => "Εισαγωγή",
 "Importing contacts" => "Εισαγωγή επαφών",
-"Select address book to import to:" => "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:",
-"Select from HD" => "Επιλογή από HD",
 "You have no contacts in your addressbook." => "Δεν έχεις επαφές στο βιβλίο διευθύνσεων",
 "Add contact" => "Προσθήκη επαφής",
 "Configure addressbooks" => "Ρύθμισε το βιβλίο διευθύνσεων",
+"Select Address Books" => "Επέλεξε βιβλίο διευθύνσεων",
+"Enter name" => "Εισαγωγή ονόματος",
+"Enter description" => "Εισαγωγή περιγραφής",
 "CardDAV syncing addresses" => "συγχρονισμός διευθύνσεων μέσω CardDAV ",
 "more info" => "περισσότερες πληροφορίες",
 "Primary address (Kontact et al)" => "Κύρια διεύθυνση",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
 );
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 2e3e91611b..5c9a81eba0 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -2,18 +2,19 @@
 "There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
 "Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
 "At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
-"Error adding contact property." => "Virhe lisättäessä ominaisuutta yhteystietoon.",
 "No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
 "No address books found." => "Osoitekirjoja ei löytynyt.",
 "No contacts found." => "Yhteystietoja ei löytynyt.",
 "Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
-"Cannot add addressbook with an empty name." => "Ilman nimeä olevaa osoitekirjaa ei voi lisätä.",
-"Error adding addressbook." => "Virhe lisättäessä osoitekirjaa.",
-"Error activating addressbook." => "Virhe aktivoitaessa osoitekirjaa.",
 "Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"Information about vCard is incorrect. Please reload the page." => "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen.",
 "Error deleting contact property." => "Virhe poistettaessa yhteystiedon ominaisuutta.",
 "File doesn't exist:" => "Tiedostoa ei ole olemassa:",
 "Error loading image." => "Virhe kuvaa ladatessa.",
+"Error saving contact." => "Virhe yhteystietoa tallennettaessa.",
+"Error resizing image" => "Virhe asettaessa kuvaa uuteen kokoon",
+"Error cropping image" => "Virhe rajatessa kuvaa",
+"Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
 "Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
 "Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
@@ -21,7 +22,17 @@
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
 "No file was uploaded" => "Tiedostoa ei lähetetty",
 "Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "Contacts" => "Yhteystiedot",
+"Error" => "Virhe",
+"Contact" => "Yhteystieto",
+"New" => "Uusi",
+"New Contact" => "Uusi yhteystieto",
+"Edit name" => "Muokkaa nimeä",
+"No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
+"Result: " => "Tulos: ",
+" imported, " => " tuotu, ",
+" failed." => " epäonnistui.",
 "Addressbook not found." => "Osoitekirjaa ei löytynyt.",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
@@ -39,22 +50,36 @@
 "Video" => "Video",
 "Pager" => "Hakulaite",
 "Internet" => "Internet",
+"Birthday" => "Syntymäpäivä",
+"Business" => "Työ",
+"Other" => "Muu",
+"Questions" => "Kysymykset",
 "{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
-"Contact" => "Yhteystieto",
 "Add Contact" => "Lisää yhteystieto",
+"Import" => "Tuo",
 "Addressbooks" => "Osoitekirjat",
+"Close" => "Sulje",
+"Actions" => "Toiminnot",
+"Refresh contacts list" => "Päivitä yhteystietoluettelo",
+"Add new contact" => "Lisää uusi yhteystieto",
+"Add new addressbook" => "Lisää uusi osoitekirja",
+"Delete current contact" => "Poista nykyinen yhteystieto",
 "Configure Address Books" => "Muokkaa osoitekirjoja",
 "New Address Book" => "Uusi osoitekirja",
-"Import from VCF" => "Tuo VCF-tiedostosta",
 "CardDav Link" => "CardDav-linkki",
 "Download" => "Lataa",
 "Edit" => "Muokkaa",
 "Delete" => "Poista",
-"Download contact" => "Lataa yhteystieto",
-"Delete contact" => "Poista yhteystieto",
+"Delete current photo" => "Poista nykyinen valokuva",
+"Edit current photo" => "Muokkaa nykyistä valokuvaa",
+"Upload new photo" => "Lähetä uusi valokuva",
+"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
+"Edit name details" => "Muokkaa nimitietoja",
 "Nickname" => "Kutsumanimi",
 "Enter nickname" => "Anna kutsumanimi",
-"Birthday" => "Syntymäpäivä",
+"Web site" => "Verkkosivu",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Siirry verkkosivulle",
 "Groups" => "Ryhmät",
 "Separate groups with commas" => "Erota ryhmät pilkuilla",
 "Edit groups" => "Muokkaa ryhmiä",
@@ -64,26 +89,26 @@
 "Enter phone number" => "Anna puhelinnumero",
 "Delete phone number" => "Poista puhelinnumero",
 "View on map" => "Näytä kartalla",
+"Edit address details" => "Muokkaa osoitetietoja",
 "Add notes here." => "Lisää huomiot tähän.",
 "Add field" => "Lisää kenttä",
-"Profile picture" => "Profiilikuva",
 "Phone" => "Puhelin",
 "Note" => "Huomio",
-"Delete current photo" => "Poista nykyinen valokuva",
-"Edit current photo" => "Muokkaa nykyistä valokuvaa",
-"Upload new photo" => "Lähetä uusi valokuva",
-"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
+"Download contact" => "Lataa yhteystieto",
+"Delete contact" => "Poista yhteystieto",
+"The temporary image has been removed from cache." => "Väliaikainen kuva on poistettu välimuistista.",
 "Edit address" => "Muokkaa osoitetta",
 "Type" => "Tyyppi",
 "PO Box" => "Postilokero",
+"Street address" => "Katuosoite",
+"Street and number" => "Katu ja numero",
 "Extended" => "Laajennettu",
-"Street" => "Katuosoite",
+"Apartment number etc." => "Asunnon numero jne.",
 "City" => "Paikkakunta",
 "Region" => "Alue",
 "Zipcode" => "Postinumero",
+"Postal code" => "Postinumero",
 "Country" => "Maa",
-"Edit categories" => "Muokkaa luokkia",
-"Add" => "Lisää",
 "Addressbook" => "Osoitekirja",
 "Given name" => "Etunimi",
 "Additional names" => "Lisänimet",
@@ -98,12 +123,13 @@
 "Please choose the addressbook" => "Valitse osoitekirja",
 "create a new addressbook" => "luo uusi osoitekirja",
 "Name of new addressbook" => "Uuden osoitekirjan nimi",
-"Import" => "Tuo",
 "Importing contacts" => "Tuodaan yhteystietoja",
-"Select address book to import to:" => "Valitse osoitekirja, johon yhteystiedot tuodaan:",
 "You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
 "Add contact" => "Lisää yhteystieto",
 "Configure addressbooks" => "Muokkaa osoitekirjoja",
+"Select Address Books" => "Valitse osoitekirjat",
+"Enter name" => "Anna nimi",
+"Enter description" => "Anna kuvaus",
 "CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
 "iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 0a2a4e58b9..dd59a68aaf 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
 "There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
+"element name is not set." => "Le champ Nom n'est pas défini.",
+"id is not set." => "L'ID n'est pas défini.",
+"Could not parse contact: " => "Impossible de lire le contact :",
 "Cannot add empty property." => "Impossible d'ajouter un champ vide.",
 "At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
 "Trying to add duplicate property: " => "Ajout d'une propriété en double:",
-"Error adding contact property." => "Erreur lors de l'ajout du champ.",
+"Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
 "No ID provided" => "Aucun ID fourni",
 "Error setting checksum." => "Erreur lors du paramétrage du hachage.",
 "No categories selected for deletion." => "Pas de catégories sélectionnées pour la suppression.",
@@ -12,22 +15,23 @@
 "No contacts found." => "Aucun contact trouvé.",
 "Missing ID" => "ID manquant",
 "Error parsing VCard for ID: \"" => "Erreur lors de l'analyse du VCard pour l'ID: \"",
-"Cannot add addressbook with an empty name." => "Ne peut être ajouté avec un nom vide.",
-"Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
-"Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
 "No contact ID was submitted." => "Aucun ID de contact envoyé",
 "Error reading contact photo." => "Erreur de lecture de la photo du contact.",
 "Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
 "The loading photo is not valid." => "La photo chargée est invalide.",
-"id is not set." => "L'ID n'est pas défini.",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
 "Error deleting contact property." => "Erreur lors de la suppression du champ.",
 "Contact ID is missing." => "L'ID du contact est manquant.",
-"Missing contact id." => "ID contact manquant.",
 "No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
 "File doesn't exist:" => "Fichier inexistant:",
 "Error loading image." => "Erreur lors du chargement de l'image.",
-"element name is not set." => "Le champ Nom n'est pas défini.",
+"Error getting contact object." => "Erreur lors de l'obtention de l'objet contact",
+"Error getting PHOTO property." => "Erreur lors de l'obtention des propriétés de la photo",
+"Error saving contact." => "Erreur de sauvegarde du contact",
+"Error resizing image" => "Erreur de redimensionnement de l'image",
+"Error cropping image" => "Erreur lors du rognage de l'image",
+"Error creating temporary image" => "Erreur de création de l'image temporaire",
+"Error finding image: " => "Erreur pour trouver l'image :",
 "checksum is not set." => "L'hachage n'est pas défini.",
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
 "Something went FUBAR. " => "Quelque chose est FUBAR.",
@@ -41,8 +45,27 @@
 "The uploaded file was only partially uploaded" => "Le fichier envoyé n'a été que partiellement envoyé.",
 "No file was uploaded" => "Pas de fichier envoyé.",
 "Missing a temporary folder" => "Absence de dossier temporaire.",
+"Couldn't save temporary image: " => "Impossible de sauvegarder l'image temporaire :",
+"Couldn't load temporary image: " => "Impossible de charger l'image temporaire :",
+"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
 "Contacts" => "Contacts",
-"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
+"Sorry, this functionality has not been implemented yet" => "Désolé cette fonctionnalité n'a pas encore été implementée",
+"Not implemented" => "Pas encore implémenté",
+"Couldn't get a valid address." => "Impossible de trouver une adresse valide.",
+"Error" => "Erreur",
+"Contact" => "Contact",
+"New" => "Nouveau",
+"New Contact" => "Nouveau Contact",
+"This property has to be non-empty." => "Cette valeur ne doit pas être vide",
+"Couldn't serialize elements." => "Impossible de sérialiser les éléments",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org",
+"Edit name" => "Éditer le nom",
+"No files selected for upload." => "Aucun fichiers choisis pour être chargés",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
+"Select type" => "Sélectionner un type",
+"Result: " => "Résultat :",
+" imported, " => "importé,",
+" failed." => "échoué.",
 "Addressbook not found." => "Carnet d'adresses introuvable.",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
@@ -60,25 +83,54 @@
 "Video" => "Vidéo",
 "Pager" => "Bipeur",
 "Internet" => "Internet",
+"Birthday" => "Anniversaire",
+"Business" => "Business",
+"Call" => "Appel",
+"Clients" => "Clients",
+"Deliverer" => "Livreur",
+"Holidays" => "Vacances",
+"Ideas" => "Idées",
+"Journey" => "Trajet",
+"Jubilee" => "Jubilé",
+"Meeting" => "Rendez-vous",
+"Other" => "Autre",
+"Personal" => "Personnel",
+"Projects" => "Projets",
+"Questions" => "Questions",
 "{name}'s Birthday" => "Anniversaire de {name}",
-"Contact" => "Contact",
 "Add Contact" => "Ajouter un Contact",
+"Import" => "Importer",
 "Addressbooks" => "Carnets d'adresses",
+"Close" => "Fermer",
+"Keyboard shortcuts" => "Raccourcis clavier",
+"Navigation" => "Navigation",
+"Next contact in list" => "Contact suivant dans la liste",
+"Previous contact in list" => "Contact précédent dans la liste",
+"Expand/collapse current addressbook" => "Dé/Replier le carnet d'adresses courant",
+"Next/previous addressbook" => "Passer au carnet d'adresses suivant/précédent",
+"Actions" => "Actions",
+"Refresh contacts list" => "Actualiser la liste des contacts",
+"Add new contact" => "Ajouter un nouveau contact",
+"Add new addressbook" => "Ajouter un nouveau carnet d'adresses",
+"Delete current contact" => "Effacer le contact sélectionné",
 "Configure Address Books" => "Paramétrer carnet d'adresses",
 "New Address Book" => "Nouveau Carnet d'adresses",
-"Import from VCF" => "Importer depuis VCF",
 "CardDav Link" => "Lien CardDav",
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "Delete" => "Supprimer",
-"Download contact" => "Télécharger le contact",
-"Delete contact" => "Supprimer le contact",
 "Drop photo to upload" => "Glisser une photo pour l'envoi",
+"Delete current photo" => "Supprimer la photo actuelle",
+"Edit current photo" => "Editer la photo actuelle",
+"Upload new photo" => "Envoyer une nouvelle photo",
+"Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule",
 "Edit name details" => "Editer les noms",
 "Nickname" => "Surnom",
 "Enter nickname" => "Entrer un surnom",
-"Birthday" => "Anniversaire",
+"Web site" => "Page web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Allez à la page web",
 "dd-mm-yyyy" => "jj-mm-aaaa",
 "Groups" => "Groupes",
 "Separate groups with commas" => "Séparer les groupes avec des virgules",
@@ -86,6 +138,7 @@
 "Preferred" => "Préféré",
 "Please specify a valid email address." => "Merci d'entrer une adresse e-mail valide.",
 "Enter email address" => "Entrer une adresse e-mail",
+"Mail to address" => "Envoyer à l'adresse",
 "Delete email address" => "Supprimer l'adresse e-mail",
 "Enter phone number" => "Entrer un numéro de téléphone",
 "Delete phone number" => "Supprimer le numéro de téléphone",
@@ -93,24 +146,24 @@
 "Edit address details" => "Editer les adresses",
 "Add notes here." => "Ajouter des notes ici.",
 "Add field" => "Ajouter un champ.",
-"Profile picture" => "Photo de profil",
 "Phone" => "Téléphone",
 "Note" => "Note",
-"Delete current photo" => "Supprimer la photo actuelle",
-"Edit current photo" => "Editer la photo actuelle",
-"Upload new photo" => "Envoyer une nouvelle photo",
-"Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
+"Download contact" => "Télécharger le contact",
+"Delete contact" => "Supprimer le contact",
+"The temporary image has been removed from cache." => "L'image temporaire a été supprimée du cache.",
 "Edit address" => "Editer l'adresse",
 "Type" => "Type",
 "PO Box" => "Boîte postale",
+"Street address" => "Adresse postale",
+"Street and number" => "Rue et numéro",
 "Extended" => "Étendu",
-"Street" => "Rue",
+"Apartment number etc." => "Numéro d'appartement, etc.",
 "City" => "Ville",
 "Region" => "Région",
+"E.g. state or province" => "Ex: état ou province",
 "Zipcode" => "Code postal",
+"Postal code" => "Code postal",
 "Country" => "Pays",
-"Edit categories" => "Editer les catégories",
-"Add" => "Ajouter",
 "Addressbook" => "Carnet d'adresses",
 "Hon. prefixes" => "Préfixe hon.",
 "Miss" => "Mlle",
@@ -123,7 +176,14 @@
 "Additional names" => "Nom supplémentaires",
 "Family name" => "Nom de famille",
 "Hon. suffixes" => "Suffixes hon.",
+"J.D." => "J.D.",
+"M.D." => "Dr.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
 "Ph.D." => "Dr",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Nouveau carnet d'adresses",
 "Edit Addressbook" => "Éditer le carnet d'adresses",
 "Displayname" => "Nom",
@@ -135,15 +195,16 @@
 "Please choose the addressbook" => "Choisissez le carnet d'adresses SVP",
 "create a new addressbook" => "Créer un nouveau carnet d'adresses",
 "Name of new addressbook" => "Nom du nouveau carnet d'adresses",
-"Import" => "Importer",
 "Importing contacts" => "Importation des contacts",
-"Select address book to import to:" => "Selectionner le carnet d'adresses à importer vers:",
-"Select from HD" => "Selectionner depuis le disque dur",
 "You have no contacts in your addressbook." => "Il n'y a pas de contact dans votre carnet d'adresses.",
 "Add contact" => "Ajouter un contact",
 "Configure addressbooks" => "Paramétrer carnet d'adresses",
+"Select Address Books" => "Choix du carnet d'adresses",
+"Enter name" => "Saisissez le nom",
+"Enter description" => "Saisissez une description",
 "CardDAV syncing addresses" => "Synchronisation des contacts CardDAV",
 "more info" => "Plus d'infos",
 "Primary address (Kontact et al)" => "Adresse principale",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "Lien(s) vers le répertoire de vCards en lecture seule"
 );
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index baa6b3b7d4..bce5579010 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Files" => "Fitxers",
+"Unshare" => "Deixa de compartir",
+"Delete" => "Suprimeix",
+"undo deletion" => "desfés l'eliminació",
+"generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
+"Upload Error" => "Error en la pujada",
+"Pending" => "Pendents",
+"Upload cancelled." => "La pujada s'ha cancel·lat.",
+"Invalid name, '/' is not allowed." => "El nom no és vàlid, no es permet '/'.",
 "Size" => "Mida",
 "Modified" => "Modificat",
+"folder" => "carpeta",
+"folders" => "carpetes",
+"file" => "fitxer",
+"files" => "fitxers",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
 "max. possible: " => "màxim possible:",
@@ -26,7 +39,6 @@
 "Name" => "Nom",
 "Share" => "Comparteix",
 "Download" => "Baixa",
-"Delete" => "Suprimeix",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 93be024615..042643a6e0 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος",
 "Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε",
 "Files" => "Αρχεία",
+"Unshare" => "Ακύρωση Διαμοιρασμού",
+"Delete" => "Διαγραφή",
+"undo deletion" => "αναίρεση διαγραφής",
+"generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
+"Upload Error" => "Σφάλμα Μεταφόρτωσης",
+"Pending" => "Εν αναμονή",
+"Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.",
+"Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
+"folder" => "φάκελος",
+"folders" => "φάκελοι",
+"file" => "αρχείο",
+"files" => "αρχεία",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος μεταφόρτωσης",
 "max. possible: " => "μέγιστο δυνατό:",
@@ -26,7 +39,6 @@
 "Name" => "Όνομα",
 "Share" => "Διαμοίρασε",
 "Download" => "Λήψη",
-"Delete" => "Διαγραφή",
 "Upload too large" => "Πολύ μεγάλο το αρχείο προς μεταφόρτωση",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index c99d4408f6..8b51d15a91 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Files" => "Tiedostot",
+"Unshare" => "Lopeta jakaminen",
+"Delete" => "Poista",
+"undo deletion" => "kumoa poisto",
+"generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
+"Upload Error" => "Lähetysvirhe.",
+"Pending" => "Odottaa",
+"Upload cancelled." => "Lähetys peruttu.",
+"Invalid name, '/' is not allowed." => "Virheellinen nimi, merkki '/' ei ole sallittu.",
 "Size" => "Koko",
 "Modified" => "Muutettu",
+"folder" => "kansio",
+"folders" => "kansiota",
+"file" => "tiedosto",
+"files" => "tiedostoa",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
 "Needed for multi-file and folder downloads." => "Tarvitaan useampien tiedostojen ja kansioiden latausta varten.",
@@ -25,7 +38,6 @@
 "Name" => "Nimi",
 "Share" => "Jaa",
 "Download" => "Lataa",
-"Delete" => "Poista",
 "Upload too large" => "Lähetettävä tiedosto on liian suuri",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki."
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index ab2f4ea13d..6f5e1ec6b8 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Files" => "Fichiers",
+"Unshare" => "Ne plus partager",
+"Delete" => "Supprimer",
+"undo deletion" => "Annuler la suppression",
+"generating ZIP-file, it may take some time." => "Générer un fichier ZIP, cela peut prendre du temps",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
+"Upload Error" => "Erreur de chargement",
+"Pending" => "En cours",
+"Upload cancelled." => "Chargement annulé",
+"Invalid name, '/' is not allowed." => "Nom invalide, '/' n'est pas autorisé.",
 "Size" => "Taille",
 "Modified" => "Modifié",
+"folder" => "dossier",
+"folders" => "dossiers",
+"file" => "fichier",
+"files" => "fichiers",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
 "max. possible: " => "Max. possible :",
@@ -26,7 +39,6 @@
 "Name" => "Nom",
 "Share" => "Partager",
 "Download" => "Téléchargement",
-"Delete" => "Supprimer",
 "Upload too large" => "Fichier trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont analysés, patientez svp.",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
new file mode 100644
index 0000000000..3fa3246d7c
--- /dev/null
+++ b/apps/files/l10n/lv.php
@@ -0,0 +1,21 @@
+<?php $TRANSLATIONS = array(
+"Files" => "Faili",
+"Unshare" => "Pārtraukt līdzdalīšanu",
+"Delete" => "Izdzēst",
+"Upload Error" => "Augšuplādēšanas laikā radās kļūda",
+"Pending" => "Gaida savu kārtu",
+"Upload cancelled." => "Augšuplāde ir atcelta",
+"Invalid name, '/' is not allowed." => "Šis simbols '/', nav atļauts.",
+"Size" => "Izmērs",
+"Modified" => "Izmainīts",
+"folder" => "mape",
+"folders" => "mapes",
+"file" => "fails",
+"files" => "faili",
+"Maximum upload size" => "Maksimālais failu augšuplādes apjoms",
+"Upload" => "Augšuplādet",
+"Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšuplādēt",
+"Name" => "Nosaukums",
+"Download" => "Lejuplādēt",
+"Upload too large" => "Fails ir par lielu lai to augšuplādetu"
+);
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
index 165414fba2..1c5848cee2 100644
--- a/apps/gallery/l10n/ca.php
+++ b/apps/gallery/l10n/ca.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Fotos",
-"Settings" => "Arranjament",
-"Rescan" => "Escaneja de nou",
-"Stop" => "Atura",
-"Share" => "Comparteix",
+"Share gallery" => "Comperteix la galeria",
+"Error: " => "Error: ",
+"Internal error" => "Error intern",
+"Slideshow" => "Passi de diapositives",
 "Back" => "Enrera",
 "Remove confirmation" => "Elimina la confirmació",
 "Do you want to remove album" => "Voleu eliminar l'àlbum",
diff --git a/apps/gallery/l10n/el.php b/apps/gallery/l10n/el.php
index 3983011a0c..47bc3af2bb 100644
--- a/apps/gallery/l10n/el.php
+++ b/apps/gallery/l10n/el.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Εικόνες",
-"Settings" => "Ρυθμίσεις",
-"Rescan" => "Επανασάρωση",
-"Stop" => "Διακοπή",
-"Share" => "Κοινοποίηση",
+"Share gallery" => "Κοινοποίηση συλλογής",
+"Error: " => "Σφάλμα: ",
+"Internal error" => "Εσωτερικό σφάλμα",
+"Slideshow" => "Προβολή Διαφανειών",
 "Back" => "Επιστροφή",
 "Remove confirmation" => "Αφαίρεση επιβεβαίωσης",
 "Do you want to remove album" => "Θέλετε να αφαιρέσετε το άλμπουμ",
diff --git a/apps/gallery/l10n/fi_FI.php b/apps/gallery/l10n/fi_FI.php
index 267bb5e547..659289ae41 100644
--- a/apps/gallery/l10n/fi_FI.php
+++ b/apps/gallery/l10n/fi_FI.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Kuvat",
-"Settings" => "Asetukset",
-"Rescan" => "Etsi uusia",
-"Stop" => "Pysäytä",
-"Share" => "Jaa",
+"Share gallery" => "Jaa galleria",
+"Error: " => "Virhe: ",
+"Internal error" => "Sisäinen virhe",
+"Slideshow" => "Diaesitys",
 "Back" => "Takaisin",
 "Remove confirmation" => "Poiston vahvistus",
 "Do you want to remove album" => "Tahdotko poistaa albumin",
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
index dfd668ebe8..04421236e1 100644
--- a/apps/gallery/l10n/fr.php
+++ b/apps/gallery/l10n/fr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Images",
-"Settings" => "Préférences",
-"Rescan" => "Analyser à nouveau",
-"Stop" => "Arrêter",
-"Share" => "Partager",
+"Share gallery" => "Partager la galerie",
+"Error: " => "Erreur :",
+"Internal error" => "Erreur interne",
+"Slideshow" => "Diaporama",
 "Back" => "Retour",
 "Remove confirmation" => "Enlever la confirmation",
 "Do you want to remove album" => "Voulez-vous supprimer l'album",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
new file mode 100644
index 0000000000..1a363a4aed
--- /dev/null
+++ b/core/l10n/lv.php
@@ -0,0 +1,35 @@
+<?php $TRANSLATIONS = array(
+"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",
+"Settings" => "Iestatījumi",
+"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/l10n/af/settings.po b/l10n/af/settings.po
index c861f1ae1c..59aa93b425 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,15 +25,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
 
@@ -49,35 +53,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr ""
 
@@ -169,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 60fc1db8e1..cb1df6d275 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "تم تغيير ال OpenID"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "طلبك غير مفهوم"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
@@ -51,35 +55,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-مسجل"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "من قبل"
 
@@ -171,34 +179,42 @@ msgstr "ساعد في الترجمه"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام الملفات "
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "الاسم"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "كلمات السر"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "مجموعات"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "انشئ"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "حصه"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "حذف"
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index d4a0b64800..f6e11e306c 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
@@ -49,7 +53,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
@@ -173,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index b997c96de7..4b57953ba0 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID е сменено"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Невалидна заявка"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Езика е сменен"
 
@@ -51,35 +55,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Изберете програма"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-лицензирано"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "от"
 
@@ -171,34 +179,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Име"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Парола"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Ново"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index f4527ce92e..a8a5c77878 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 10:41+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "No tots els calendaris estan en memòria"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Sembla que tot està en memòria"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "No s'han trobat calendaris."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "No s'han trobat events."
 
@@ -31,300 +39,395 @@ msgstr "No s'han trobat events."
 msgid "Wrong calendar"
 msgstr "Calendari erroni"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "El fitxer no contenia esdeveniments o aquests ja estaven desats en el vostre caledari"
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "els esdeveniments s'han desat en el calendari nou"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Ha fallat la importació"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "els esdveniments s'han desat en el calendari"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova zona horària:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "La zona horària ha canviat"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendari"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd d/M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd d/M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "d [MMM ][yyyy ]{'&#8212;' d MMM yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, d MMM, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Feina"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Trucada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Remitent"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idees"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Viatge"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Sant"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunió"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Preguntes"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "per"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sense nom"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Calendari nou"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "No es repeteix"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diari"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Mensual"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Cada setmana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Bisetmanalment"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensualment"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Cada any"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "mai"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "per aparicions"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "per data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "per dia del mes"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "per dia de la setmana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Dilluns"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Dijous"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Divendres"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "esdeveniments la setmana del mes"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primer"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segon"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tercer"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quart"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "cinquè"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "últim"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Gener"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Febrer"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Març"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maig"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juny"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juliol"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agost"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octubre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Desembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "per data d'esdeveniments"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "per ahir(s)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "per número(s) de la setmana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "per dia del mes"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Dg."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Dl."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Dm."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Dc."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Dj."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Dv."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Ds."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Gen."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Febr."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Març"
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Abr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maig"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Juny"
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Ag."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Set."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Oct."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Des."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Tot el dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Calendari nou"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Els camps que falten"
@@ -358,27 +461,27 @@ msgstr "L'esdeveniment acaba abans que comenci"
 msgid "There was a database fail"
 msgstr "Hi ha un error de base de dades"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Setmana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Llista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Avui"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Calendaris"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "S'ha produït un error en analitzar el fitxer."
 
@@ -391,7 +494,7 @@ msgid "Your calendars"
 msgstr "Els vostres calendaris"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Enllaç CalDav"
 
@@ -403,19 +506,19 @@ msgstr "Calendaris compartits"
 msgid "No shared calendars"
 msgstr "No hi ha calendaris compartits"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Comparteix el calendari"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Edita"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Suprimeix"
@@ -501,23 +604,23 @@ msgstr "Separeu les categories amb comes"
 msgid "Edit categories"
 msgstr "Edita categories"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Esdeveniment de tot el dia"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Des de"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Fins a"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opcions avançades"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Ubicació"
 
@@ -525,7 +628,7 @@ msgstr "Ubicació"
 msgid "Location of the Event"
 msgstr "Ubicació de l'esdeveniment"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descripció"
 
@@ -533,84 +636,86 @@ msgstr "Descripció"
 msgid "Description of the Event"
 msgstr "Descripció de l'esdeveniment"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetició"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Dies de la setmana seleccionats"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleccionar dies"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "i dies d'esdeveniment de l'any."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "i dies d'esdeveniment del mes."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleccionar mesos"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleccionar setmanes"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "i setmanes d'esdeveniment de l'any."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Final"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "aparicions"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importa un fitxer de calendari"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Escolliu el calendari"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "crea un nou calendari"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importa un fitxer de calendari"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Escolliu un calendari"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nom del nou calendari"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Escolliu un nom disponible!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Ja hi ha un calendari amb aquest nom. Si continueu, els calendaris es combinaran."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importa"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "S'està important el calendari"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "El calendari s'ha importat amb èxit"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Tanca el diàleg"
 
@@ -626,15 +731,11 @@ msgstr "Mostra un event"
 msgid "No categories selected"
 msgstr "No hi ha categories seleccionades"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Seleccioneu categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "a"
 
@@ -662,9 +763,33 @@ msgstr "12h"
 msgid "First day of the week"
 msgstr "Primer dia de la setmana"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adreça de sincronització del calendari CalDAV:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Memòria de cau"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr "Neteja la memòria de cau pels esdveniments amb repetició"
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Adreça de sincronització del calendari CalDAV"
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "més informació"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Adreça primària (Kontact et al)"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "IOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr "Enllaç(os) del calendari només de lectura"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index cc7086cd14..507042e9ce 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,101 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 10:52+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Error en (des)activar la llibreta d'adreces."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "S'ha produït un error en afegir el contacte."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "no s'ha establert el nom de l'element."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "no s'ha establert la id."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "No s'ha pogut processar el contacte:"
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "No es pot afegir una propietat buida."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Almenys heu d'omplir un dels camps d'adreça."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Esteu intentant afegir una propietat duplicada:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Error en afegir la propietat del contacte."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Error en afegir la propietat del contacte:"
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No heu facilitat cap ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Error en establir la suma de verificació."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "No heu seleccionat les categories a eliminar."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "No s'han trobat llibretes d'adreces."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "No s'han trobat contactes."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Falta la ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Error en analitzar la ID de la VCard: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "No es pot afegir una llibreta d'adreces amb un nom buit."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Error en afegir la llibreta d'adreces."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Error en activar la llibreta d'adreces."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "No s'ha tramès cap ID de contacte."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr "Error en llegir la foto del contacte."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Error en desar el fitxer temporal."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "La foto carregada no és vàlida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "no s'ha establert la id."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
@@ -112,328 +108,387 @@ msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 msgid "Error deleting contact property."
 msgstr "Error en eliminar la propietat del contacte."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "falta la ID del contacte."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Falta la id del contacte."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "No heu tramès el camí de la foto."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "El fitxer no existeix:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Error en carregar la imatge."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Error en obtenir l'objecte contacte."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Error en obtenir la propietat PHOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Error en trobar la imatge:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "no s'ha establert el nom de l'element."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "no s'ha establert la suma de verificació."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Error en actualitzar la llibreta d'adreces."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer carregat supera la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "No s'ha pogut desar la imatge temporal: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "No s'ha pogut carregar la imatge temporal: "
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactes"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Aquesta funcionalitat encara no està implementada"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "No implementada"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "No s'ha pogut obtenir una adreça vàlida."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Elimina un fitxer VCF per importar contactes."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "No s'ha trobat la llibreta d'adreces."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Aquesta no és la vostra llibreta d'adreces"
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "No s'ha trobat el contacte."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adreça"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telèfon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Correu electrònic"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organització"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Feina"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Casa"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mòbil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Veu"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Missatge"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Paginador"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Aniversari de {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Contacte"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Nou"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Contate nou"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Aquesta propietat no pot ser buida."
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "No s'han pogut serialitzar els elements."
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Edita el nom"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "No s'han seleccionat fitxers per a la pujada."
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Seleccioneu un tipus"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultat: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importat, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " fallada."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "No s'ha trobat la llibreta d'adreces."
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Aquesta no és la vostra llibreta d'adreces"
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "No s'ha trobat el contacte."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adreça"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Telèfon"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "Correu electrònic"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organització"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Feina"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Casa"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Mòbil"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Veu"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Missatge"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Paginador"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversari"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Negocis"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr "Trucada"
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Clients"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr "Emissari"
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Vacances"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr "Idees"
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr "Viatge"
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr "Aniversari"
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr "Reunió"
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Altres"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr "Personal"
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr "Projectes"
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Preguntes"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Aniversari de {name}"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Afegeix un contacte"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Importa"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Tanca"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr "Dreceres de teclat"
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr "Navegació"
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr "Següent contacte de la llista"
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr "Contacte anterior de la llista"
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr "Expandeix/col·lapsa la llibreta d'adreces"
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr "Següent/anterior llibreta d'adreces"
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Accions"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Carrega de nou la llista de contactes"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Afegeix un contacte nou"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Afegeix una llibreta d'adreces nova"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Esborra el contacte"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configura les llibretes d'adreces"
@@ -442,11 +497,7 @@ msgstr "Configura les llibretes d'adreces"
 msgid "New Address Book"
 msgstr "Nova llibreta d'adreces"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importa de VFC"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Enllaç CardDav"
@@ -460,186 +511,195 @@ msgid "Edit"
 msgstr "Edita"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Baixa el contacte"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Suprimeix el contacte"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Elimina la foto a carregar"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Edita detalls del nom"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Sobrenom"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Escriviu el sobrenom"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversari"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grups"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separeu els grups amb comes"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Edita els grups"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferit"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Especifiqueu una adreça de correu electrònic correcta"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Escriviu una adreça de correu electrònic"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Envia per correu electrònic a l'adreça"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Elimina l'adreça de correu electrònic"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Escriviu el número de telèfon"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Elimina el número de telèfon"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Visualitza al mapa"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Edita els detalls de l'adreça"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Afegiu notes aquí."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Afegeix un camp"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Foto de perfil"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telèfon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Nota"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Elimina la foto actual"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Edita la foto actual"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Carrega una foto nova"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
-msgstr ""
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Edita detalls del nom"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Sobrenom"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Escriviu el sobrenom"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Adreça web"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Vés a la web"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grups"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separeu els grups amb comes"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Edita els grups"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferit"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Especifiqueu una adreça de correu electrònic correcta"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Escriviu una adreça de correu electrònic"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Envia per correu electrònic a l'adreça"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Elimina l'adreça de correu electrònic"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Escriviu el número de telèfon"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Elimina el número de telèfon"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Visualitza al mapa"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Edita els detalls de l'adreça"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Afegiu notes aquí."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Afegeix un camp"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telèfon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Nota"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Baixa el contacte"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Suprimeix el contacte"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "La imatge temporal ha estat eliminada de la memòria de cau."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Edita l'adreça"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipus"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Adreça postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Adreça"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Carrer i número"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Addicional"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Carrer"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Número d'apartament, etc."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Ciutat"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Comarca"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "p. ex. Estat o província "
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Codi postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "Codi postal"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edita categories"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Afegeix"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Llibreta d'adreces"
@@ -745,7 +805,6 @@ msgid "Submit"
 msgstr "Envia"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -765,33 +824,10 @@ msgstr "crea una llibreta d'adreces nova"
 msgid "Name of new addressbook"
 msgstr "Nom de la nova llibreta d'adreces"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importa"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "S'estan important contactes"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Seleccioneu la llibreta d'adreces a la que voleu importar:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Selecciona de HD"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "No teniu contactes a la llibreta d'adreces."
@@ -804,6 +840,18 @@ msgstr "Afegeix un contacte"
 msgid "Configure addressbooks"
 msgstr "Configura les llibretes d'adreces"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Selecccioneu llibretes d'adreces"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Escriviu un nom"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Escriviu una descripció"
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "Adreces de sincronització CardDAV"
@@ -819,3 +867,7 @@ msgstr "Adreça primària (Kontact i al)"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr "Enllaç(os) només de lectura vCard"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 0d3c2693b4..c66676acba 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 07:07+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "El fitxer s'ha pujat correctament"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer de pujada excedeix la directiva upload_max_filesize establerta a php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha pujat parcialment"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "El fitxer no s'ha pujat"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "S'ha perdut un fitxer temporal"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
@@ -53,57 +53,65 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Files"
 msgstr "Fitxers"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Deixa de compartir"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Suprimeix"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "desfés l'eliminació"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Error en la pujada"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Pendents"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "La pujada s'ha cancel·lat."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "El nom no és vàlid, no es permet '/'."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "carpeta"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "carpetes"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fitxer"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "fitxers"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +181,6 @@ msgstr "Comparteix"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Suprimeix"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index 72f3cf5c80..7be2fa1525 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -8,71 +8,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 07:08+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Fotos"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Comperteix la galeria"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Error: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Error intern"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Arranjament"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Escaneja de nou"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Atura"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Comparteix"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Passi de diapositives"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 62b4b97539..8629118121 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "S'ha desat el correu electrònic"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "El correu electrònic no és vàlid"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID ha canviat"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Desactiva"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Activa"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "S'està desant..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Català"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Avís de seguretat"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Més"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Afegeiu la vostra aplicació"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "- amb llicència"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "de"
 
@@ -171,34 +179,42 @@ msgstr "Ajudeu-nos amb la traducció"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nom"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Quota per defecte"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Altre"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 360a7fe9d9..59288cbf81 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +24,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-mail uložen"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Neplatný e-mail"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID změněn"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Chybný dotaz"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Vypnout"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Zapnout"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Ukládám..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Česky"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Více"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Přidat vaší aplikaci"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencováno"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "podle"
 
@@ -174,34 +182,42 @@ msgstr "Pomoci překládat"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Jméno"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Vytvořit"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Výchozí kvóta"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Jiné"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Vymazat"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index deab93e2ed..d4d081a64d 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,14 +8,15 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +25,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email adresse gemt"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ugyldig email adresse"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID ændret"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Sprog ændret"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Deaktiver"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Aktiver"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Gemmer..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Dansk"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Mere"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Tilføj din App"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vælg en App"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Se applikationens side på apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licenseret"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "af"
 
@@ -174,34 +183,42 @@ msgstr "Hjælp med oversættelsen"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "benyt denne adresse til at forbinde til din ownCloud i din filbrowser"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Navn"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Standard kvote"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Slet"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index d129d8cae0..fb8cc41c66 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-25 22:14+0200\n"
-"PO-Revision-Date: 2012-07-25 20:14+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 18:09+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +27,11 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Noch sind nicht alle Kalender zwischengespeichert."
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Es sieht so aus, als wäre alles vollständig zwischengespeichert."
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
@@ -49,11 +49,11 @@ msgstr "Falscher Kalender"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Entweder enthielt die Datei keine Termine oder alle Termine waren schon im Kalender gespeichert."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "Der Termin wurde im neuen Kalender gespeichert."
 
 #: ajax/import/import.php:56
 msgid "Import failed"
@@ -61,7 +61,7 @@ msgstr "Import fehlgeschlagen"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "Der Termin wurde im Kalender gespeichert."
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -701,7 +701,7 @@ msgstr "Kalenderdatei Importieren"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
-msgstr ""
+msgstr "Wählen Sie bitte einen Kalender."
 
 #: templates/part.import.php:36
 msgid "Name of new calendar"
@@ -709,13 +709,13 @@ msgstr "Kalendername"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "Wählen Sie einen verfügbaren Namen."
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Ein Kalender mit diesem Namen existiert schon. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -771,31 +771,31 @@ msgstr "erster Wochentag"
 
 #: templates/settings.php:47
 msgid "Cache"
-msgstr ""
+msgstr "Zwischenspeicher"
 
 #: templates/settings.php:48
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen."
 
 #: templates/settings.php:53
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "CalDAV-Kalender gleicht Adressen ab."
 
 #: templates/settings.php:53
 msgid "more info"
-msgstr ""
+msgstr "weitere Informationen"
 
 #: templates/settings.php:55
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primäre Adresse (Kontakt u.a.)"
 
 #: templates/settings.php:57
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
 
 #: templates/settings.php:59
 msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Nur lesende(r) iCalender-Link(s)"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 067ce64126..e91d917df7 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -9,111 +9,110 @@
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 # Melvin Gundlach <mail@melvin-gundlach.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <mi.sc@gmx.net>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
 # Susi  <>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 18:13+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Erstellen des Kontakts fehlgeschlagen"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Kein Name für das Element angegeben."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID ist nicht angegeben."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Konnte folgenden Kontakt nicht verarbeiten:"
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Feld darf nicht leer sein."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Mindestens eines der Adressfelder muss ausgefüllt werden."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Kontakt ändern fehlgeschlagen"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Keine ID angegeben"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Fehler beim Setzen der Prüfsumme."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Keine Kategorien zum Löschen ausgewählt."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Keine Adressbücher gefunden."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Keine Kontakte gefunden."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Fehlende ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Fehler beim Einlesen der VCard für die ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Bitte einen Namen für das Adressbuch angeben."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Adressbuch hinzufügen fehlgeschlagen"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Adressbuchaktivierung fehlgeschlagen"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Es wurde keine Kontakt-ID übermittelt."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
-msgstr "Fehler beim auslesen des Kontaktfotos."
+msgstr "Fehler beim Auslesen des Kontaktfotos."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Fehler beim Speichern der temporären Datei."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "Das Kontaktfoto ist fehlerhaft."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID ist nicht angegeben."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
@@ -122,328 +121,387 @@ msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 msgid "Error deleting contact property."
 msgstr "Kontakteigenschaft löschen fehlgeschlagen"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Keine Kontakt-ID angegeben."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Fehlende Kontakt-ID."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Kein Foto-Pfad übermittelt."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Datei existiert nicht: "
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Fehler beim Laden des Bildes."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fehler beim Abruf des Kontakt-Objektes."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Fehler beim Speichern des Kontaktes"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Fehler beim Suchen des Bildes: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "Kein Name für das Element angegeben."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "Keine Prüfsumme angegeben."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Adressbuch aktualisieren fehlgeschlagen"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Alles bestens, Datei erfolgreich übertragen."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datei konnte nur teilweise übertragen werden"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Konnte das temporäre Bild nicht speichern:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Konnte das temporäre Bild nicht laden:"
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "Nicht Verfügbar"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Konnte keine gültige Adresse abrufen"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Zieh' eine VCF Datei hierher zum Kontaktimport"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Adressbuch nicht gefunden."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Dies ist nicht dein Adressbuch."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kontakt konnte nicht gefunden werden."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adresse"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Email"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organisation"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Arbeit"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Zuhause"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Anruf"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Mitteilung"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Geburtstag von {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Neu"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Dieses Feld darf nicht Leer sein."
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "Konnte Elemente nicht serialisieren"
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Name ändern"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "Keine Datei(en) zum Hochladen ausgewählt"
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Wähle Typ"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Ergebnis: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importiert, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "Adressbuch nicht gefunden."
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Dies ist nicht dein Adressbuch."
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "Kontakt konnte nicht gefunden werden."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-Mail"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organisation"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Arbeit"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Zuhause"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Anruf"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Mitteilung"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Geburtstag"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Geschäftlich"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr "Anruf"
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Kunden"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr "Lieferant"
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Feiertage"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr "Ideen"
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr "Reise"
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr "Jubiläum"
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr "Besprechung"
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Andere"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr "Persönlich"
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr "Projekte"
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Fragen"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Geburtstag von {name}"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Importieren"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Schließen"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr "Tastaturbefehle"
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr "Navigation"
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr "Nächster Kontakt aus der Liste"
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr "Vorheriger Kontakt aus der Liste"
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr "Ausklappen/Einklappen des Adressbuches"
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr "Nächstes/Vorhergehendes Adressbuch"
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Aktionen"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Kontaktliste neu laden"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Neuen Kontakt hinzufügen"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Neues Adressbuch hinzufügen"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Aktuellen Kontakt löschen"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Adressbücher konfigurieren"
@@ -452,14 +510,10 @@ msgstr "Adressbücher konfigurieren"
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Import von VCF Datei"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr "CardDav Link"
+msgstr "CardDav-Link"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
@@ -470,186 +524,195 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Kontakt herunterladen"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kontakt löschen"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
-msgstr "Zieh' ein Foto hierher zum hochladen"
+msgstr "Zieh' ein Foto hierher zum Hochladen"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts order Rückwärts mit Komma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Namen ändern"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Spitznamen angeben"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Geburtstag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "TT-MM-JJJJ"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Gruppen"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Gruppen mit Komma trennt"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Gruppen editieren"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Bevorzugt"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Bitte eine gültige E-Mail-Adresse angeben."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "E-Mail-Adresse angeben."
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "E-Mail an diese Adresse schreiben"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "E-Mail-Adresse löschen"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Telefonnummer angeben"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Telefonnummer löschen"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Auf Karte anzeigen"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Adressinformationen ändern"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Füge hier Notizen ein."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Feld hinzufügen"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profil Bild"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Notiz"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Derzeitiges Foto löschen"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Foto ändern"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Neues Foto hochladen"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Foto aus ownCloud auswählen"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
-msgstr ""
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Name ändern"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Spitzname angeben"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Webseite"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Webseite aufrufen"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd.mm.yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Gruppen"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Gruppen mit Komma getrennt"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Gruppen editieren"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Bevorzugt"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Bitte eine gültige E-Mail-Adresse angeben."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "E-Mail-Adresse angeben."
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "E-Mail an diese Adresse schreiben"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "E-Mail-Adresse löschen"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Telefonnummer angeben"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Telefonnummer löschen"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Auf Karte anzeigen"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Adressinformationen ändern"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Füge hier Notizen ein."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Feld hinzufügen"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Notiz"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kontakt herunterladen"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kontakt löschen"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Das temporäre Bild wurde aus dem Cache gelöscht."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Adresse ändern"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postfach"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Straßenanschrift"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Straße und Nummer"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Erweitert"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Straße"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Wohnungsnummer usw."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Stadt"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "Z.B. Staat oder Bezirk"
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postleitzahl"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "PLZ"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorie ändern"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Hinzufügen"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressbuch"
@@ -755,7 +818,6 @@ msgid "Submit"
 msgstr "Eintragen"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -775,33 +837,10 @@ msgstr "Neues Adressbuch erstellen"
 msgid "Name of new addressbook"
 msgstr "Name des neuen Adressbuchs"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importieren"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kontakte werden importiert"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Adressbuch, in das importiert werden soll"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Von der Festplatte auswählen"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Du hast keine Kontakte im Adressbuch."
@@ -814,6 +853,18 @@ msgstr "Kontakt hinzufügen"
 msgid "Configure addressbooks"
 msgstr "Adressbücher konfigurieren"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Wähle Adressbuch"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Name eingeben"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Beschreibung eingeben"
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV Sync-Adressen"
@@ -829,3 +880,7 @@ msgstr "primäre Adresse (für Kontact o.ä. Programme)"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index f80377f656..9051386acc 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -8,14 +8,15 @@
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +25,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-Mail gespeichert"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ungültige E-Mail"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID geändert"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Sprache geändert"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Deaktivieren"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Aktivieren"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Speichern..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Deutsch"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Sicherheitshinweis"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "mehr"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Füge deine App hinzu"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Weitere Anwendungen auf apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-lizenziert"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "von"
 
@@ -174,34 +183,42 @@ msgstr "Hilf bei der Übersetzung!"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden."
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Name"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Standard Quota"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "andere"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index 6b6a6acedb..0be7c6d22c 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -4,27 +4,36 @@
 # 
 # Translators:
 #   <christosvas@in.gr>, 2011.
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 09:47+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Όλα έχουν αποθηκευτεί στη cache"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Δε βρέθηκαν ημερολόγια."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Δε βρέθηκαν γεγονότα."
 
@@ -32,43 +41,57 @@ msgstr "Δε βρέθηκαν γεγονότα."
 msgid "Wrong calendar"
 msgstr "Λάθος ημερολόγιο"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "τα συμβάντα αποθηκεύτηκαν σε ένα νέο ημερολόγιο"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Η εισαγωγή απέτυχε"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "το συμβάν αποθηκεύτηκε στο ημερολογιό σου"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Νέα ζώνη ώρας:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Η ζώνη ώρας άλλαξε"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Μη έγκυρο αίτημα"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -76,256 +99,337 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Επιχείρηση"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Κλήση"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
-msgstr "Παραδώσας"
+msgstr "Προμηθευτής"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Γιορτή"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "από"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "ανώνυμο"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Νέα Ημερολόγιο"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Μη επαναλαμβανόμενο"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Καθημερινά"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Εβδομαδιαία"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Κάθε μέρα"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Δύο φορές την εβδομάδα"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Μηνιαία"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Ετήσια"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ποτέ"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "κατά συχνότητα πρόσβασης"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "κατά ημερομηνία"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "κατά ημέρα"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "κατά εβδομάδα"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "συμβάντα της εβδομάδας του μήνα"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "πρώτο"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "δεύτερο"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "τρίτο"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "τέταρτο"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "πέμπτο"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "τελευταίο"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Μάρτιος"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Απρίλιος"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Μάϊος"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Ιούνιος"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Ιούλιος"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Αύγουστος"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "κατά ημερομηνία συμβάντων"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "κατά ημέρα(ες) του έτους"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "κατά εβδομάδα(ες)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "κατά ημέρα και μήνα"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Ημερ."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Κυρ."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Δευ."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Τρί."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Τετ."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Πέμ."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Παρ."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Σάβ."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Ιαν."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Φεβ."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Μάρ."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Απρ."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Μαΐ."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Ιούν."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Ιούλ."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Αύγ."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Σεπ."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Οκτ."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Νοέ."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Δεκ."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Ολοήμερο"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Νέα Ημερολόγιο"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Πεδία που λείπουν"
@@ -359,27 +463,27 @@ msgstr "Το συμβάν ολοκληρώνεται πριν από την έν
 msgid "There was a database fail"
 msgstr "Υπήρξε σφάλμα στη βάση δεδομένων"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Λίστα"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Σήμερα"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Ημερολόγια"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Υπήρξε μια αποτυχία, κατά την σάρωση του αρχείου."
 
@@ -392,7 +496,7 @@ msgid "Your calendars"
 msgstr "Τα ημερολόγια σου"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Σύνδεση CalDAV"
 
@@ -404,19 +508,19 @@ msgstr "Κοινόχρηστα ημερολόγια"
 msgid "No shared calendars"
 msgstr "Δεν υπάρχουν κοινόχρηστα ημερολόγια"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Διαμοίρασε ένα ημερολόγιο"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -502,23 +606,23 @@ msgstr "Διαχώρισε τις κατηγορίες με κόμμα"
 msgid "Edit categories"
 msgstr "Επεξεργασία κατηγοριών"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Ολοήμερο συμβάν"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Από"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Έως"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Επιλογές για προχωρημένους"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Τοποθεσία"
 
@@ -526,7 +630,7 @@ msgstr "Τοποθεσία"
 msgid "Location of the Event"
 msgstr "Τοποθεσία συμβάντος"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -534,84 +638,86 @@ msgstr "Περιγραφή"
 msgid "Description of the Event"
 msgstr "Περιγραφή του συμβάντος"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Επαναλαμβανόμενο"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Επιλογή ημερών εβδομάδας"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Επιλογή ημερών"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "και των ημερών του χρόνου που υπάρχουν συμβάντα."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "και των ημερών του μήνα που υπάρχουν συμβάντα."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Επιλογή μηνών"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Επιλογή εβδομάδων"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "και των εβδομάδων του χρόνου που υπάρουν συμβάντα."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Διάστημα"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Τέλος"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "περιστατικά"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Εισαγωγή αρχείου ημερολογίου"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Παρακαλώ επιλέξτε το ημερολόγιο"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "δημιουργία νέου ημερολογίου"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Εισαγωγή αρχείου ημερολογίου"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Παρακαλώ επέλεξε ένα ημερολόγιο"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Όνομα νέου ημερολογίου"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Επέλεξε ένα διαθέσιμο όνομα!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Εισαγωγή ημερολογίου"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Το ημερολόγιο εισήχθει επιτυχώς"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Κλείσιμο Διαλόγου"
 
@@ -627,15 +733,11 @@ msgstr "Εμφάνισε ένα γεγονός"
 msgid "No categories selected"
 msgstr "Δεν επελέγησαν  κατηγορίες"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Επιλέξτε κατηγορία"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "του"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "στο"
 
@@ -663,9 +765,33 @@ msgstr "12ω"
 msgid "First day of the week"
 msgstr "Πρώτη μέρα της εβδομάδας"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Διεύθυνση για το συγχρονισμού του ημερολογίου CalDAV:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Cache"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "περισσότερες πλροφορίες"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Κύρια Διεύθυνση(Επαφή και άλλα)"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr " iCalendar link(s) μόνο για ανάγνωση"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index c5718b30c8..1e03429730 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -4,108 +4,106 @@
 # 
 # Translators:
 #   <christosvas@in.gr>, 2011.
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
+#   <vagelis@cyberdest.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 08:32+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Σφάλμα κατά την προσθήκη επαφής."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "δεν ορίστηκε όνομα στοιχείου"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "δεν ορίστηκε id"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Δε αναγνώστηκε η επαφή"
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Αδύνατη προσθήκη κενής ιδιότητας."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Σφάλμα προσθήκης ιδιότητας επαφής."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr "Δε δώθηκε ID"
+msgstr "Δε δόθηκε ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Λάθος κατά τον ορισμό checksum "
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Δε επελέγησαν κατηγορίες για διαγραφή"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Δεν βρέθηκαν επαφές"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Λείπει ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Δε μπορεί να προστεθεί βιβλίο διευθύνσεων με κενό όνομα"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Σφάλμα προσθήκης βιβλίου διευθύνσεων."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Δε υπεβλήθει ID επαφής"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "δεν ορίστηκε id"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα."
@@ -114,328 +112,387 @@ msgstr "Οι πληροφορίες σχετικά με vCard είναι εσφ
 msgid "Error deleting contact property."
 msgstr "Σφάλμα διαγραφής ιδιότητας επαφής."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Λείπει ID επαφής"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Απουσιαζει ID επαφής"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Δε δόθηκε διαδρομή εικόνας"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Το αρχείο δεν υπάρχει:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Σφάλμα φόρτωσης εικόνας"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Σφάλμα κατά τη λήψη αντικειμένου επαφής"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "δεν ορίστηκε όνομα στοιχείου"
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "δε ορίστηκε checksum "
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα:"
+msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr "Κάτι χάθηκε στο άγνωστο"
+msgstr "Κάτι χάθηκε στο άγνωστο. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία "
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο ανέβηκε μερικώς"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Δεν ανέβηκε κάποιο αρχείο"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: "
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "Δεν έχει υλοποιηθεί"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Σφάλμα"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Τηλέφωνο"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Email"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Οργανισμός"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Εργασία"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Σπίτι"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Κινητό"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Κείμενο"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Ομιλία"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Μήνυμα "
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Φαξ"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Βίντεο"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Βομβητής"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Διαδίκτυο"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name} έχει Γενέθλια"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Επαφή"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Νέο"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Νέα επαφή"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Αλλαγή ονόματος"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Επιλογή τύπου"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Αποτέλεσμα: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " εισάγεται,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " απέτυχε."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Διεύθυνση"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Τηλέφωνο"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Οργανισμός"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Εργασία"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Σπίτι"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Κινητό"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "Κείμενο"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Ομιλία"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Μήνυμα"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Φαξ"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Βίντεο"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Βομβητής"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Διαδίκτυο"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Γενέθλια"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Επιχείρηση"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr "Κάλεσε"
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Πελάτες"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr "Προμηθευτής"
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Διακοπές"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr "Ιδέες"
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr "Ταξίδι"
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr "Ιωβηλαίο"
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr "Συνάντηση"
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Άλλο"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr "Προσωπικό"
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr "Έργα"
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Ερωτήσεις"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} έχει Γενέθλια"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Προσθήκη επαφής"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Εισαγωγή"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Βιβλία διευθύνσεων"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Κλείσιμο  "
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr "Συντομεύσεις πλητρολογίου"
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr "Πλοήγηση"
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr "Επόμενη επαφή στη λίστα"
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr "Προηγούμενη επαφή στη λίστα"
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Ενέργειες"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Ανανέωσε τη λίστα επαφών"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Προσθήκη νέας επαφής"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Προσθήκη νέου βιβλίου επαφών"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Διαγραφή τρέχουσας επαφής"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Ρυθμίστε το βιβλίο διευθύνσεων "
@@ -444,11 +501,7 @@ msgstr "Ρυθμίστε το βιβλίο διευθύνσεων "
 msgid "New Address Book"
 msgstr "Νέο βιβλίο διευθύνσεων"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Εισαγωγή από VCF αρχείο"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Σύνδεσμος CardDav"
@@ -462,186 +515,195 @@ msgid "Edit"
 msgstr "Επεξεργασία"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Λήψη επαφής"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Διαγραφή επαφής"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Ρίξε μια φωτογραφία για ανέβασμα"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Παρατσούκλι"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Εισάγεται παρατσούκλι"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Γενέθλια"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Ομάδες"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Διαχώρισε τις ομάδες με κόμμα "
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Επεξεργασία ομάδων"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Προτιμώμενο"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Αποστολή σε διεύθυνση"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Διαγραφή διεύθυνση email"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Εισήγαγε αριθμό τηλεφώνου"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Διέγραψε αριθμό τηλεφώνου"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Προβολή στο χάρτη"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Πρόσθεσε τις σημειώσεις εδώ"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Προσθήκη πεδίου"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Φωτογραφία προφίλ"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Σημείωση"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Διαγραφή τρέχουσας φωτογραφίας"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Επεξεργασία τρέχουσας φωτογραφίας"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Ανέβασε νέα φωτογραφία"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
-msgstr ""
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Παρατσούκλι"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Εισάγετε παρατσούκλι"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Ιστότοπος"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Πήγαινε στον ιστότοπο"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Ομάδες"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Διαχώρισε τις ομάδες με κόμμα "
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Επεξεργασία ομάδων"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Προτιμώμενο"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Αποστολή σε διεύθυνση"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Διαγραφή διεύθυνση email"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Εισήγαγε αριθμό τηλεφώνου"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Διέγραψε αριθμό τηλεφώνου"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Προβολή στο χάρτη"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Πρόσθεσε τις σημειώσεις εδώ"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Προσθήκη πεδίου"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Σημείωση"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Λήψη επαφής"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Διαγραφή επαφής"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Η προσωρινή εικόνα αφαιρέθηκε από την κρυφή μνήμη."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Επεξεργασία διεύθυνσης"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Τύπος"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Ταχ. Θυρίδα"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Διεύθυνση οδού"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Οδός και αριθμός"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Εκτεταμένη"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Οδός"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Αριθμός διαμερίσματος"
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Πόλη"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Περιοχή"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "Π.χ. Πολιτεία ή επαρχεία"
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Τ.Κ."
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "Ταχυδρομικός Κωδικός"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Χώρα"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Επεξεργασία κατηγορίας"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Προσθήκη"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Βιβλίο διευθύνσεων"
@@ -732,7 +794,7 @@ msgstr "Επεξεργασία βιβλίου διευθύνσεων"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr "Προβαλόμενο όνομα"
+msgstr "Προβαλλόμενο όνομα"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
@@ -747,7 +809,6 @@ msgid "Submit"
 msgstr "Καταχώρηση"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -767,33 +828,10 @@ msgstr "Δημιουργία νέου βιβλίου διευθύνσεων"
 msgid "Name of new addressbook"
 msgstr "Όνομα νέου βιβλίου διευθύνσεων"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Εισαγωγή"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Εισαγωγή επαφών"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Επιλογή από HD"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Δεν έχεις επαφές στο βιβλίο διευθύνσεων"
@@ -806,6 +844,18 @@ msgstr "Προσθήκη επαφής"
 msgid "Configure addressbooks"
 msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Επέλεξε βιβλίο διευθύνσεων"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Εισαγωγή ονόματος"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Εισαγωγή περιγραφής"
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "συγχρονισμός διευθύνσεων μέσω CardDAV "
@@ -821,3 +871,7 @@ msgstr "Κύρια διεύθυνση"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 87cbcd3e9b..abadb91274 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,49 +3,50 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 08:08+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει λάθος, το αρχείο μεταφορτώθηκε επιτυχώς"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το αρχείο που μεταφορτώθηκε υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο μεταφορώθηκε μόνο εν μέρει"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Το αρχείο δεν μεταφορτώθηκε"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Λείπει ένας προσωρινός φάκελος"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Η εγγραφή στο δίσκο απέτυχε"
 
@@ -53,57 +54,65 @@ msgstr "Η εγγραφή στο δίσκο απέτυχε"
 msgid "Files"
 msgstr "Αρχεία"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Ακύρωση Διαμοιρασμού"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Διαγραφή"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "αναίρεση διαγραφής"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Σφάλμα Μεταφόρτωσης"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Εν αναμονή"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Η μεταφόρτωση ακυρώθηκε."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "φάκελος"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "φάκελοι"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "αρχείο"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "αρχεία"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +182,6 @@ msgstr "Διαμοίρασε"
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Διαγραφή"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο το αρχείο προς μεταφόρτωση"
diff --git a/l10n/el/gallery.po b/l10n/el/gallery.po
index 71bb2bf4bc..57be7acc26 100644
--- a/l10n/el/gallery.po
+++ b/l10n/el/gallery.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
@@ -10,71 +11,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 08:11+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Εικόνες"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Κοινοποίηση συλλογής"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Σφάλμα: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Εσωτερικό σφάλμα"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Επανασάρωση"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Διακοπή"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Κοινοποίηση"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Προβολή Διαφανειών"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 50279c5c14..8a66091272 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
@@ -12,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +25,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Το Email αποθηκεύτηκε "
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Μη έγκυρο email"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "Το OpenID άλλαξε"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Μη έγκυρο αίτημα"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Απενεργοποίηση"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Ενεργοποίηση"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Αποθήκευση..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Προειδοποίηση Ασφαλείας"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Περισσότερο"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Πρόσθεσε τη δικιά σου εφαρμογή "
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Επιλέξτε μια εφαρμογή"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Η σελίδα εφαρμογών στο apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-με άδεια"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "από"
 
@@ -174,34 +183,42 @@ msgstr "Βοηθήστε στην μετάφραση"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "χρησιμοποιήστε αυτή τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Κωδικός"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Προεπιλεγμένο όριο"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Άλλα"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Σύνολο χώρου"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index eadd0fca66..662744f091 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,65 +20,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "La retpoŝtadreso konserviĝis"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Nevalida retpoŝtadreso"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "La agordo de OpenID estas ŝanĝita"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Nevalida peto"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Malkapabligi"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Kapabligi"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Konservante..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Esperanto"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Pli"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Aldonu vian aplikaĵon"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-permesila"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "de"
 
@@ -170,34 +178,42 @@ msgstr "Helpu traduki"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "uzu ĉi tiun adreson por konektiĝi al via ownCloud per via dosieradministrilo"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Krei"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Defaŭlta kvoto"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvoto"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index d594551c6e..194013f4b0 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 23:06+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,6 +40,10 @@ msgstr "OpenID cambiado"
 msgid "Invalid request"
 msgstr "Solicitud no válida"
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Idioma cambiado"
@@ -56,7 +60,7 @@ msgstr "Activar"
 msgid "Saving..."
 msgstr "Salvando.."
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -180,34 +184,42 @@ msgstr "Ayúdanos a traducir"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "utiliza esta dirección para conectar a tu ownCloud desde tu gestor de archivos"
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Cuota predeterminada"
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Cuota"
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 6b303c8c23..e9ec42e530 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Kiri on salvestatud"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Vigane e-post"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID on muudetud"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Lülita välja"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Lülita sisse"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Salvestamine..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Eesti"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Veel"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Lisa oma rakendus"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-litsenseeritud"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "kelle poolt"
 
@@ -171,34 +179,42 @@ msgstr "Aita tõlkida"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Parool"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Lisa"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Vaikimisi kvoot"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Mahupiir"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index cca5da2a9c..5b5b358bca 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,65 +22,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Eposta gorde da"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Baliogabeko eposta"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID aldatuta"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Baliogabeko eskaria"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Ez-gaitu"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Gaitu"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Gordetzen..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Euskera"
 
-#: templates/admin.php:13
-msgid "Log"
+#: templates/admin.php:14
+msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:28
+msgid "Log"
+msgstr "Egunkaria"
+
+#: templates/admin.php:55
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Gehitu zure aplikazioa"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "lizentziarekin"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr " Egilea:"
 
@@ -172,34 +180,42 @@ msgstr "Lagundu itzultzen"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Izena"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Sortu"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
-msgstr ""
+msgstr "Kuota lehentsia"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Besteak"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 1ee3d62cdb..ab1c42e295 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,65 +20,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "ایمیل ذخیره شد"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "ایمیل غیر قابل قبول"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID تغییر کرد"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "درخواست غیر قابل قبول"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "زبان تغییر کرد"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "غیرفعال"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "فعال"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "درحال ذخیره ..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "بیشتر"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "برنامه خود را بیافزایید"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "مجوزنامه"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "به وسیله"
 
@@ -170,34 +178,42 @@ msgstr "به ترجمه آن کمک کنید"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "از این نشانی برای وصل شدن به ابرهایتان در مدیرپرونده استفاده کنید"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "نام"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "ایجاد کردن"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "سهم پیش فرض"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "سایر"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "سهم"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "پاک کردن"
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index 17475e37a0..db9bb175eb 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 10:40+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Kalentereita ei löytynyt"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Tapahtumia ei löytynyt."
 
@@ -32,28 +40,42 @@ msgstr "Tapahtumia ei löytynyt."
 msgid "Wrong calendar"
 msgstr "Väärä kalenteri"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Tuonti epäonnistui"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "tapahtumaa on tallennettu kalenteriisi"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Uusi aikavyöhyke:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Aikavyöhyke vaihdettu"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Virheellinen pyyntö"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
 msgstr ""
@@ -78,254 +100,335 @@ msgstr ""
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Ota yhteyttä"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Asiakkaat"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Toimittaja"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vapaapäivät"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideat"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Matkustus"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Vuosipäivät"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Tapaamiset"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Muut"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektit"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Kysymykset"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nimetön"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Uusi kalenteri"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ei toistoa"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Päivittäin"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Viikottain"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Arkipäivisin"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Joka toinen viikko"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Kuukausittain"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Vuosittain"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "Ei koskaan"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Maanantai"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torstai"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Perjantai"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "ensimmäinen"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "toinen"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "kolmas"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "neljäs"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "viides"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "viimeinen"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Tammikuu"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Helmikuu"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Maaliskuu"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Huhtikuu"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Toukokuu"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Kesäkuu"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Heinäkuu"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Elokuu"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Syyskuu"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Lokakuu"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Marraskuu"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Joulukuu"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Su"
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Ma"
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Ti"
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Ke"
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "To"
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Pe"
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "La"
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Tammi"
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Helmi"
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Maalis"
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Huhti"
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Touko"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Kesä"
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Heinä"
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Elo"
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Syys"
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Loka"
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Marras"
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Joulu"
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Koko päivä"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Uusi kalenteri"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Puuttuvat kentät"
@@ -359,27 +462,27 @@ msgstr "Tapahtuma päättyy ennen alkamistaan"
 msgid "There was a database fail"
 msgstr "Tapahtui tietokantavirhe"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Viikko"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Kuukausi"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Tänään"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Kalenterit"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Tiedostoa jäsennettäessä tapahtui virhe."
 
@@ -392,7 +495,7 @@ msgid "Your calendars"
 msgstr "Omat kalenterisi"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-linkki"
 
@@ -404,19 +507,19 @@ msgstr "Jaetut kalenterit"
 msgid "No shared calendars"
 msgstr "Ei jaettuja kalentereita"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Jaa kalenteri"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Poista"
@@ -502,23 +605,23 @@ msgstr "Erota luokat pilkuilla"
 msgid "Edit categories"
 msgstr "Muokkaa luokkia"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Koko päivän tapahtuma"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Alkaa"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Päättyy"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Tarkemmat asetukset"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Sijainti"
 
@@ -526,7 +629,7 @@ msgstr "Sijainti"
 msgid "Location of the Event"
 msgstr "Tapahtuman sijainti"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -534,84 +637,86 @@ msgstr "Kuvaus"
 msgid "Description of the Event"
 msgstr "Tapahtuman kuvaus"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Toisto"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Valitse viikonpäivät"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Valitse päivät"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Valitse kuukaudet"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Valitse viikot"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalli"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Tuo kalenteritiedosto"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Valitse kalenteri"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "luo uusi kalenteri"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Tuo kalenteritiedosto"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Valitse kalenteri"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Uuden kalenterin nimi"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Tuo"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Tuodaan kalenteria"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalenteri tuotu onnistuneesti"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Sulje ikkuna"
 
@@ -627,15 +732,11 @@ msgstr "Avaa tapahtuma"
 msgid "No categories selected"
 msgstr "Luokkia ei ole valittu"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Valitse luokka"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
@@ -663,9 +764,33 @@ msgstr "12 tuntia"
 msgid "First day of the week"
 msgstr "Viikon ensimmäinen päivä"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kalenterin CalDAV-synkronointiosoite:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Kalenterin CalDAV-synkronointiosoitteet"
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 4748623176..a6bb8bb156 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,431 +11,486 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 10:36+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Virhe yhteystietoa lisättäessä."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Tyhjää ominaisuutta ei voi lisätä."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Vähintään yksi osoitekenttä tulee täyttää."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Virhe lisättäessä ominaisuutta yhteystietoon."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Luokkia ei ole valittu poistettavaksi."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Osoitekirjoja ei löytynyt."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Yhteystietoja ei löytynyt."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Ilman nimeä olevaa osoitekirjaa ei voi lisätä."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Virhe lisättäessä osoitekirjaa."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Virhe aktivoitaessa osoitekirjaa."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Virhe tallennettaessa tilapäistiedostoa."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Tiedostoa ei ole olemassa:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Virhe kuvaa ladatessa."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Virhe päivitettäessä osoitekirjaa."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virhettä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lähetetty tiedosto lähetettiin vain osittain"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Tiedostoa ei lähetetty"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
+msgstr "Yhteystieto"
 
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
+#: js/contacts.js:389
+msgid "New"
+msgstr "Uusi"
 
-#: js/contacts.js:605
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Uusi yhteystieto"
+
+#: js/contacts.js:691
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:717
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:826 js/contacts.js:844
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:860
 msgid "Edit name"
-msgstr ""
+msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1141
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1149
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1314 js/contacts.js:1348
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Tulos: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " tuotu, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " epäonnistui."
 
-#: lib/app.php:30
+#: lib/app.php:29
 msgid "Addressbook not found."
 msgstr "Osoitekirjaa ei löytynyt."
 
-#: lib/app.php:34
+#: lib/app.php:33
 msgid "This is not your addressbook."
 msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:45
+#: lib/app.php:44
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:100 templates/part.contact.php:116
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/app.php:102
+#: lib/app.php:101
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:102 templates/part.contact.php:115
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:122
+#: lib/app.php:121
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:124
+#: lib/app.php:123
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:125
+#: lib/app.php:124
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:126
+#: lib/app.php:125
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:127
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:128
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:135
+#: lib/app.php:134
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Syntymäpäivä"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Työ"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Muu"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Kysymykset"
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Henkilön {name} syntymäpäivä"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: templates/index.php:13
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Lisää yhteystieto"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Tuo"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Osoitekirjat"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Sulje"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Toiminnot"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Päivitä yhteystietoluettelo"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Lisää uusi yhteystieto"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Lisää uusi osoitekirja"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Poista nykyinen yhteystieto"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Muokkaa osoitekirjoja"
@@ -444,11 +499,7 @@ msgstr "Muokkaa osoitekirjoja"
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Tuo VCF-tiedostosta"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav-linkki"
@@ -462,186 +513,195 @@ msgid "Edit"
 msgstr "Muokkaa"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Lataa yhteystieto"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Poista yhteystieto"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Kutsumanimi"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Anna kutsumanimi"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Syntymäpäivä"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Ryhmät"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Erota ryhmät pilkuilla"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Muokkaa ryhmiä"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Anna kelvollinen sähköpostiosoite."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Anna sähköpostiosoite"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Poista sähköpostiosoite"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Anna puhelinnumero"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Poista puhelinnumero"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Näytä kartalla"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Lisää huomiot tähän."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Lisää kenttä"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profiilikuva"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Puhelin"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Huomio"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Poista nykyinen valokuva"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Muokkaa nykyistä valokuvaa"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Lähetä uusi valokuva"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Valitse valokuva ownCloudista"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Muokkaa nimitietoja"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Kutsumanimi"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Anna kutsumanimi"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Verkkosivu"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Siirry verkkosivulle"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Ryhmät"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Erota ryhmät pilkuilla"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Muokkaa ryhmiä"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Anna kelvollinen sähköpostiosoite."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Anna sähköpostiosoite"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Poista sähköpostiosoite"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Anna puhelinnumero"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Poista puhelinnumero"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Näytä kartalla"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Muokkaa osoitetietoja"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Lisää huomiot tähän."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Lisää kenttä"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Puhelin"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Huomio"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Lataa yhteystieto"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Poista yhteystieto"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Väliaikainen kuva on poistettu välimuistista."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Muokkaa osoitetta"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tyyppi"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postilokero"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Katuosoite"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Katu ja numero"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Laajennettu"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Katuosoite"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Asunnon numero jne."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Paikkakunta"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Alue"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postinumero"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "Postinumero"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Maa"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Muokkaa luokkia"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Lisää"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Osoitekirja"
@@ -747,7 +807,6 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Peru"
 
@@ -767,33 +826,10 @@ msgstr "luo uusi osoitekirja"
 msgid "Name of new addressbook"
 msgstr "Uuden osoitekirjan nimi"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Tuo"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Tuodaan yhteystietoja"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Valitse osoitekirja, johon yhteystiedot tuodaan:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Osoitekirjassasi ei ole yhteystietoja."
@@ -806,6 +842,18 @@ msgstr "Lisää yhteystieto"
 msgid "Configure addressbooks"
 msgstr "Muokkaa osoitekirjoja"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Valitse osoitekirjat"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Anna nimi"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Anna kuvaus"
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV-synkronointiosoitteet"
@@ -821,3 +869,7 @@ msgstr ""
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 529f183e46..6a784e5631 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,43 +11,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 10:42+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Lähetetty tiedosto ylittää upload_max_filesize-arvon rajan php.ini-tiedostossa"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lähetys onnistui vain osittain"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Yhtäkään tiedostoa ei lähetetty"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Väliaikaiskansiota ei ole olemassa"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
@@ -55,57 +55,65 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Files"
 msgstr "Tiedostot"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Lopeta jakaminen"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Poista"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "kumoa poisto"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Lähetysvirhe."
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Odottaa"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Lähetys peruttu."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "kansio"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "kansiota"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "tiedosto"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "tiedostoa"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -175,10 +183,6 @@ msgstr "Jaa"
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Poista"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
diff --git a/l10n/fi_FI/gallery.po b/l10n/fi_FI/gallery.po
index b4ea780216..275d7d08ab 100644
--- a/l10n/fi_FI/gallery.po
+++ b/l10n/fi_FI/gallery.po
@@ -9,71 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 10:43+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Jaa galleria"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Virhe: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Sisäinen virhe"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Asetukset"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Etsi uusia"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Pysäytä"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Jaa"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Diaesitys"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 4034113155..4b7cfc4375 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Sähköposti tallennettu"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Virheellinen sähköposti"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID on vaihdettu"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Virheellinen pyyntö"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Kieli on vaihdettu"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Poista käytöstä"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Käytä"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Tallennetaan..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Turvallisuusvaroitus"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Lisää"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Lisää ohjelmasi"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Valitse ohjelma"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-lisenssöity"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "henkilölle"
 
@@ -171,34 +179,42 @@ msgstr "Auta kääntämisessä"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Luo"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Oletuskiintiö"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kiintiö"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Poista"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index b9d0abab86..ee964a08fb 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -6,28 +6,39 @@
 #   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+# Nicolas  <boolet.is@free.fr>, 2012.
 #   <pierreamiel.giraud@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 # Yann Yann <chezyann@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 09:15+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Tous les calendriers ne sont pas mis en cache"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Tout semble être en cache"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Aucun calendrier n'a été trouvé."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Aucun événement n'a été trouvé."
 
@@ -35,43 +46,57 @@ msgstr "Aucun événement n'a été trouvé."
 msgid "Wrong calendar"
 msgstr "Mauvais calendrier"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Soit le fichier ne contient aucun événement soit tous les événements sont déjà enregistrés dans votre calendrier."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "Les événements ont été enregistrés dans le nouveau calendrier"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Échec de l'import"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "Les événements ont été enregistrés dans votre calendrier"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nouveau fuseau horaire :"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fuseau horaire modifié"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "jjj"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "jjj M/j"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "jjjj M/j"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM aaaa"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -79,256 +104,337 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "jjjj, MMM j, aaaa"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Professionnel"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientèle"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Livraison"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Déplacement"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Meeting"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Questions"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "par"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sans-nom"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nouveau Calendrier"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Pas de répétition"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Tous les jours"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Hebdomadaire"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Quotidien"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Bi-hebdomadaire"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensuel"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Annuel"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "jamais"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "par occurrences"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "par date"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "par jour du mois"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "par jour de la semaine"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Lundi"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Vendredi"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Samedi"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "événements du mois par semaine"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "premier"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "deuxième"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "troisième"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quatrième"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "cinquième"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "dernier"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Janvier"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Février"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mars"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Avril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juin"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juillet"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Août"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octobre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Décembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "par date d’événements"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "par jour(s) de l'année"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "par numéro de semaine(s)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "par jour et mois"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Date"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Dim."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Lun."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Mar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Mer."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Jeu"
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Ven."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Sam."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Fév."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mars"
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Avr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Mai"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Juin"
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Juil."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Août"
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Oct."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Déc."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Journée entière"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nouveau Calendrier"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Champs manquants"
@@ -362,27 +468,27 @@ msgstr "L'évènement s'est terminé avant qu'il ne commence"
 msgid "There was a database fail"
 msgstr "Il y a eu un échec dans la base de donnée"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Semaine"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mois"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Calendriers"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Une erreur est survenue pendant la lecture du fichier."
 
@@ -395,7 +501,7 @@ msgid "Your calendars"
 msgstr "Vos calendriers"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Lien CalDav"
 
@@ -407,19 +513,19 @@ msgstr "Calendriers partagés"
 msgid "No shared calendars"
 msgstr "Aucun calendrier partagé"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Partager le calendrier"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Éditer"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Supprimer"
@@ -505,23 +611,23 @@ msgstr "Séparer les catégories par des virgules"
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Journée entière"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "À"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Options avancées"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Emplacement"
 
@@ -529,7 +635,7 @@ msgstr "Emplacement"
 msgid "Location of the Event"
 msgstr "Emplacement de l'événement"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Description"
 
@@ -537,84 +643,86 @@ msgstr "Description"
 msgid "Description of the Event"
 msgstr "Description de l'événement"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Répétition"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avancé"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Sélection des jours de la semaine"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Sélection des jours"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "et les événements de l'année par jour."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "et les événements du mois par jour."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Sélection des mois"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Sélection des semaines"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "et les événements de l'année par semaine."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalle"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "occurrences"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importer un fichier de calendriers"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Choisissez le calendrier svp"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Créer un nouveau calendrier"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importer un fichier de calendriers"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Veuillez sélectionner un calendrier"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nom pour le nouveau calendrier"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Choisissez un nom disponible !"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Un calendrier de ce nom existe déjà. Si vous choisissez de continuer les calendriers seront fusionnés."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importer"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Import du calendrier"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendrier importé avec succès"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fermer la fenêtre"
 
@@ -630,15 +738,11 @@ msgstr "Voir un événement"
 msgid "No categories selected"
 msgstr "Aucune catégorie sélectionnée"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Sélectionner une catégorie"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "à"
 
@@ -666,9 +770,33 @@ msgstr "12h"
 msgid "First day of the week"
 msgstr "Premier jour de la semaine"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresse de synchronisation du calendrier CalDAV :"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Cache"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr "Nettoyer le cache des événements répétitifs"
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Adresses de synchronisation des calendriers CalDAV"
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "plus d'infos"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Adresses principales (Kontact et assimilés)"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr "lien(s) iCalendar en lecture seule"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 4702c3bc4a..64b3e82ca1 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -8,106 +8,106 @@
 #   <gp4004@arghh.org>, 2011.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+# Nicolas  <boolet.is@free.fr>, 2012.
+# Robert Di Rosa <>, 2012.
 #   <rom1dep@gmail.com>, 2011, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 09:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Une erreur s'est produite lors de l'ajout du contact."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Le champ Nom n'est pas défini."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "L'ID n'est pas défini."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Impossible de lire le contact :"
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Impossible d'ajouter un champ vide."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Au moins un des champs d'adresses doit être complété."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Ajout d'une propriété en double:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Erreur lors de l'ajout du champ."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Erreur pendant l'ajout de la propriété du contact :"
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Aucun ID fourni"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Erreur lors du paramétrage du hachage."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Pas de catégories sélectionnées pour la suppression."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Pas de carnet d'adresses trouvé."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Aucun contact trouvé."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID manquant"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Ne peut être ajouté avec un nom vide."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Erreur lors de l'ajout du carnet d'adresses."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Erreur lors de l'activation du carnet d'adresses."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Aucun ID de contact envoyé"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr "Erreur de lecture de la photo du contact."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Erreur de sauvegarde du fichier temporaire."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "La photo chargée est invalide."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "L'ID n'est pas défini."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page."
@@ -116,328 +116,387 @@ msgstr "Les informations relatives à cette vCard sont incorrectes. Veuillez rec
 msgid "Error deleting contact property."
 msgstr "Erreur lors de la suppression du champ."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "L'ID du contact est manquant."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "ID contact manquant."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Le chemin de la photo n'a pas été envoyé."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Fichier inexistant:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Erreur lors du chargement de l'image."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erreur lors de l'obtention de l'objet contact"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erreur lors de l'obtention des propriétés de la photo"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Erreur pour trouver l'image :"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "Le champ Nom n'est pas défini."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "L'hachage n'est pas défini."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Impossible de sauvegarder l'image temporaire :"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Impossible de charger l'image temporaire :"
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "Pas encore implémenté"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Impossible de trouver une adresse valide."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Glisser un fichier VCF pour importer des contacts."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Carnet d'adresses introuvable."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Ce n'est pas votre carnet d'adresses."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Ce contact n'a pu être trouvé."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adresse"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Téléphone"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-mail"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Société"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Travail"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Maison"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobile"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Texte"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Voix"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Message"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Vidéo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Bipeur"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Anniversaire de {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Nouveau"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Nouveau Contact"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Cette valeur ne doit pas être vide"
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "Impossible de sérialiser les éléments"
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Éditer le nom"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "Aucun fichiers choisis pour être chargés"
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Sélectionner un type"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Résultat :"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "importé,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "échoué."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "Carnet d'adresses introuvable."
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Ce n'est pas votre carnet d'adresses."
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "Ce contact n'a pu être trouvé."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Téléphone"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Société"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Travail"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Maison"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Mobile"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "Texte"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Voix"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Message"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Vidéo"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Bipeur"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Anniversaire"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Business"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr "Appel"
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Clients"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr "Livreur"
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Vacances"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr "Idées"
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr "Trajet"
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr "Jubilé"
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr "Rendez-vous"
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Autre"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr "Personnel"
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr "Projets"
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Questions"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Anniversaire de {name}"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Fermer"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr "Raccourcis clavier"
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr "Navigation"
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr "Contact suivant dans la liste"
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr "Contact précédent dans la liste"
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr "Dé/Replier le carnet d'adresses courant"
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr "Passer au carnet d'adresses suivant/précédent"
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Actions"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Actualiser la liste des contacts"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Ajouter un nouveau contact"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Ajouter un nouveau carnet d'adresses"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Effacer le contact sélectionné"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Paramétrer carnet d'adresses"
@@ -446,11 +505,7 @@ msgstr "Paramétrer carnet d'adresses"
 msgid "New Address Book"
 msgstr "Nouveau Carnet d'adresses"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importer depuis VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Lien CardDav"
@@ -464,186 +519,195 @@ msgid "Edit"
 msgstr "Modifier"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Télécharger le contact"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Supprimer le contact"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Glisser une photo pour l'envoi"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Editer les noms"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Surnom"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Entrer un surnom"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Anniversaire"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "jj-mm-aaaa"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Groupes"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Séparer les groupes avec des virgules"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editer les groupes"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Préféré"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Merci d'entrer une adresse e-mail valide."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Entrer une adresse e-mail"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Supprimer l'adresse e-mail"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Entrer un numéro de téléphone"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Supprimer le numéro de téléphone"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Voir sur une carte"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Editer les adresses"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Ajouter des notes ici."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Ajouter un champ."
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Photo de profil"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Téléphone"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Note"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Supprimer la photo actuelle"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Editer la photo actuelle"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Envoyer une nouvelle photo"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
-msgstr ""
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Editer les noms"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Surnom"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Entrer un surnom"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Page web"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Allez à la page web"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "jj-mm-aaaa"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Groupes"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Séparer les groupes avec des virgules"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editer les groupes"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Préféré"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Merci d'entrer une adresse e-mail valide."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Entrer une adresse e-mail"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Envoyer à l'adresse"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Supprimer l'adresse e-mail"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Entrer un numéro de téléphone"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Supprimer le numéro de téléphone"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Voir sur une carte"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Editer les adresses"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Ajouter des notes ici."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Ajouter un champ."
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Téléphone"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Note"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Télécharger le contact"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Supprimer le contact"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "L'image temporaire a été supprimée du cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editer l'adresse"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Boîte postale"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Adresse postale"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Rue et numéro"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Étendu"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rue"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Numéro d'appartement, etc."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Ville"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Région"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "Ex: état ou province"
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Code postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "Code postal"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Pays"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editer les catégories"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Ajouter"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
@@ -694,19 +758,19 @@ msgstr "Suffixes hon."
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
@@ -714,15 +778,15 @@ msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -749,7 +813,6 @@ msgid "Submit"
 msgstr "Envoyer"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -769,33 +832,10 @@ msgstr "Créer un nouveau carnet d'adresses"
 msgid "Name of new addressbook"
 msgstr "Nom du nouveau carnet d'adresses"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importation des contacts"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selectionner le carnet d'adresses à importer vers:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Selectionner depuis le disque dur"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Il n'y a pas de contact dans votre carnet d'adresses."
@@ -808,6 +848,18 @@ msgstr "Ajouter un contact"
 msgid "Configure addressbooks"
 msgstr "Paramétrer carnet d'adresses"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Choix du carnet d'adresses"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Saisissez le nom"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Saisissez une description"
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "Synchronisation des contacts CardDAV"
@@ -823,3 +875,7 @@ msgstr "Adresse principale"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index b510e4ac0d..cc037ee774 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -4,48 +4,50 @@
 # 
 # Translators:
 #   <guiguidu31300@gmail.com>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 09:03+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Aucune erreur, le fichier a été téléversé avec succès"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier téléversé excède la valeur de upload_max_filesize spécifiée dans php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a été que partiellement téléversé"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Aucun fichier n'a été téléversé"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Il manque un répertoire temporaire"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
@@ -53,57 +55,65 @@ msgstr "Erreur d'écriture sur le disque"
 msgid "Files"
 msgstr "Fichiers"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Ne plus partager"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Supprimer"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "Annuler la suppression"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Générer un fichier ZIP, cela peut prendre du temps"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Erreur de chargement"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "En cours"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Chargement annulé"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "dossier"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "dossiers"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fichier"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "fichiers"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +183,6 @@ msgstr "Partager"
 msgid "Download"
 msgstr "Téléchargement"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Supprimer"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Fichier trop volumineux"
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index 1bd0947079..ea45c42e53 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -3,77 +3,43 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 09:05+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Images"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Partager la galerie"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Erreur :"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Erreur interne"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Préférences"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Analyser à nouveau"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Arrêter"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Partager"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Diaporama"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 5184f5e460..5cfd59dbba 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -6,16 +6,18 @@
 #   <fboulogne@april.org>, 2011.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <pierreamiel.giraud@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +26,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-mail sauvegardé"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "E-mail invalide"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "Identifiant OpenID changé"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Langue changée"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Désactivé"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Activé"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Sauvegarde..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Français"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Alertes de sécurité"
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Plus"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
-msgstr "Ajouter votre application"
+msgstr "Ajoutez votre application"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Sélectionner une Application"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "sous licence"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "par"
 
@@ -174,34 +184,42 @@ msgstr "Aidez à traduire"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nom"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Créer"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Quota par défaut"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 2d3b9ac338..622cde377c 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Correo electrónico gardado"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "correo electrónico non válido"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "Mudou o OpenID"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Petición incorrecta"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "O idioma mudou"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Deshabilitar"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Habilitar"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Gardando..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Galego"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Máis"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Engade o teu aplicativo"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Escolla un Aplicativo"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Vexa a páxina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "por"
 
@@ -171,34 +179,42 @@ msgstr "Axude na tradución"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "utilice este enderezo para conectar ao seu ownCloud no xestor de ficheiros"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Cuota por omisión"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Borrar"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index c98f33ca80..0e2b48f3e6 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +22,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "הדוא״ל נשמר"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "דוא״ל לא חוקי"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID השתנה"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "בקשה לא חוקית"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "בטל"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "הפעל"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "שומר.."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "עברית"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "עוד"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "הוספת היישום שלך"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "בחירת יישום"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "צפה בעמוד הישום ב apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "רשיון"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "מאת"
 
@@ -171,34 +180,42 @@ msgstr "עזרה בתרגום"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "שם"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "ססמה"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "יצירה"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "מכסת בררת המחדל"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "מכסה"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "מחיקה"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 8d0166d701..d853ac5b27 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011.
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
 # Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email spremljen"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Neispravan email"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID promijenjen"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Neispravan zahtjev"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Isključi"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Uključi"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Spremanje..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "više"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Dodajte vašu aplikaciju"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencirano"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "od"
 
@@ -171,34 +179,42 @@ msgstr "Pomoć prevesti"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Ime"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Izradi"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "standardni kvota"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "kvota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 76b3a2b040..5a646b0f67 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email mentve"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Hibás email"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID megváltozott"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Érvénytelen kérés"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Letiltás"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Engedélyezés"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Mentés..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Tovább"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "App hozzáadása"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Egy App kiválasztása"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencelt"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr ":"
 
@@ -171,34 +179,42 @@ msgstr "Segíts lefordítani!"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "Használd ezt a címet hogy csatlakozz a saját ownCloud rendszeredhez a fájlkezelődben"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Név"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Létrehozás"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Alapértelmezett kvóta"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Egyéb"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 36ffa29c8e..9538d201b8 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,15 +25,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
 
@@ -49,35 +53,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr ""
 
@@ -169,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 304d175a07..20a6dc619a 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID cambiate"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Requesta invalide"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
@@ -51,35 +55,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Interlingua"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Plus"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adder tu application"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selectionar un app"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "per"
 
@@ -171,34 +179,42 @@ msgstr "Adjuta a traducer"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "usa iste addresse pro connecter a tu ownCloud in tu administrator de files"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nomine"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Quota predeterminate"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index f0fe672de8..e33802637f 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID telah dirubah"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Permintaan tidak valid"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
@@ -51,35 +55,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Lebih"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Tambahkan App anda"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Pilih satu aplikasi"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-terlisensi"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "oleh"
 
@@ -171,34 +179,42 @@ msgstr "Bantu menerjemahkan"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nama"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Password"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Group"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Kuota default"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Lain-lain"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Hapus"
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index ec3c94d41f..e28f303b92 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
@@ -49,7 +53,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
@@ -173,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 6ae91a7c78..47885e9b06 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 20:36+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,6 +40,10 @@ msgstr "OpenID modificato"
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Lingua modificata"
@@ -56,7 +60,7 @@ msgstr "Abilita"
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -180,34 +184,42 @@ msgstr "Migliora la traduzione"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file"
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Password"
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Quota predefinita"
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quote"
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index e0b699f743..1bc2d2cc7f 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,65 +20,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "メールアドレスを保存しました"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "無効なメールアドレス"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenIDが変更されました"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "言語が変更されました"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "無効"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "有効"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "保存中..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "もっと"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "アプリを追加"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "apps.owncloud.com でアプリケーションのページを見てください"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "ライセンス"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "@"
 
@@ -170,34 +178,42 @@ msgstr "翻訳に協力する"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "名前"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "作成"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "デフォルトのクォータサイズ"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "クオータ"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "削除"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 1e84863d07..51dbed056b 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "이메일 저장"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "잘못된 이메일"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID 변경됨"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "잘못된 요청"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "언어가 변경되었습니다"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "비활성화"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "활성화"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "저장..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "한국어"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "더"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "앱 추가"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "프로그램 선택"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "application page at apps.owncloud.com을 보시오."
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr " 라이선스 사용"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr " by "
 
@@ -171,34 +179,42 @@ msgstr "번역 돕기"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "파일 관리자에서 내 ownCloud에 연결할 때 이 주소를 사용하십시오"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "이름"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "암호"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "만들기"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "기본 할당량"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "다른"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "할당량"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 533133695f..705509ed4d 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +26,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID huet geännert"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
@@ -50,35 +54,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Méi"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Setz deng App bei"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-Lizenséiert"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "vun"
 
@@ -170,34 +178,42 @@ msgstr "Hëllef iwwersetzen"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Numm"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Standard Quota"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Läschen"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index c39cde8a33..0986258c8b 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,61 +24,69 @@ msgstr ""
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Netinkamas el. paštas"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID pakeistas"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Klaidinga užklausa"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Išjungti"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Įjungti"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Saugoma.."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Kalba"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Pridėti programėlę"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencijuota"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr ""
 
@@ -170,34 +178,42 @@ msgstr "Padėkite išversti"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "naudokite šį adresą, jei norite pasiekti savo ownCloud per failų tvarkyklę"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Vardas"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupės"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Sukurti"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Numatytoji kvota"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Limitas"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lv/calendar.po b/l10n/lv/calendar.po
new file mode 100644
index 0000000000..48780d51cd
--- /dev/null
+++ b/l10n/lv/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2011-09-03 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
new file mode 100644
index 0000000000..8cc7933bb0
--- /dev/null
+++ b/l10n/lv/contacts.po
@@ -0,0 +1,871 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2011-09-23 17:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:67
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:76
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:93
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:53
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:58
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:389 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:170
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:15
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
new file mode 100644
index 0000000000..f9e9e23477
--- /dev/null
+++ b/l10n/lv/core.po
@@ -0,0 +1,269 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <aldis@udris.lv>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 12:27+0000\n"
+"Last-Translator: CPDZ <aldis@udris.lv>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:519
+msgid "January"
+msgstr ""
+
+#: js/js.js:519
+msgid "February"
+msgstr ""
+
+#: js/js.js:519
+msgid "March"
+msgstr ""
+
+#: js/js.js:519
+msgid "April"
+msgstr ""
+
+#: js/js.js:519
+msgid "May"
+msgstr ""
+
+#: js/js.js:519
+msgid "June"
+msgstr ""
+
+#: js/js.js:520
+msgid "July"
+msgstr ""
+
+#: js/js.js:520
+msgid "August"
+msgstr ""
+
+#: js/js.js:520
+msgid "September"
+msgstr ""
+
+#: js/js.js:520
+msgid "October"
+msgstr ""
+
+#: js/js.js:520
+msgid "November"
+msgstr ""
+
+#: js/js.js:520
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr "Izmantojiet šo linku lai mainītu paroli"
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Obligāts"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Neizdevās ielogoties."
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr "Lietotājvārds"
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr "Pieprasīt paroles maiņu"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Jūsu parole tika nomainīta"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "Uz ielogošanās lapu"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Jauna parole"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Mainīt paroli"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Personīgi"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Lietotāji"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Aplikācijas"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Administrators"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Palīdzība"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Mākonis netika atrasts"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr "Parole"
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr "Datu mape"
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr "Nokonfigurēt datubāzi"
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr "tiks izmantots"
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr "Datubāzes lietotājs"
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr "Datubāzes parole"
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr "Datubāzes nosaukums"
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr "Datubāzes mājvieta"
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr "Pabeigt uzstādījumus"
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr "Izlogoties"
+
+#: templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Iestatījumi"
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr "Aizmirsāt paroli?"
+
+#: templates/login.php:17
+msgid "remember"
+msgstr "atcerēties"
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr "Ielogoties"
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Jūs esat veiksmīgi izlogojies."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "iepriekšējā"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "nākamā"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
new file mode 100644
index 0000000000..ebe4eba051
--- /dev/null
+++ b/l10n/lv/files.po
@@ -0,0 +1,199 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <aldis@udris.lv>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-26 12:41+0000\n"
+"Last-Translator: CPDZ <aldis@udris.lv>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "Faili"
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Pārtraukt līdzdalīšanu"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Izdzēst"
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr "Augšuplādēšanas laikā radās kļūda"
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr "Gaida savu kārtu"
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr "Augšuplāde ir atcelta"
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr "Šis simbols '/', nav atļauts."
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr "Izmērs"
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr "Izmainīts"
+
+#: js/files.js:659
+msgid "folder"
+msgstr "mape"
+
+#: js/files.js:661
+msgid "folders"
+msgstr "mapes"
+
+#: js/files.js:669
+msgid "file"
+msgstr "fails"
+
+#: js/files.js:671
+msgid "files"
+msgstr "faili"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "Maksimālais failu augšuplādes apjoms"
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr "Augšuplādet"
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr "Te vēl nekas nav. Rīkojies, sāc augšuplādēt"
+
+#: templates/index.php:47
+msgid "Name"
+msgstr "Nosaukums"
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr "Lejuplādēt"
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr "Fails ir par lielu lai to augšuplādetu"
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/lv/gallery.po b/l10n/lv/gallery.po
new file mode 100644
index 0000000000..03b337f7da
--- /dev/null
+++ b/l10n/lv/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/lv/media.po b/l10n/lv/media.po
new file mode 100644
index 0000000000..8f717c8e6e
--- /dev/null
+++ b/l10n/lv/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
new file mode 100644
index 0000000000..fbc7ad0283
--- /dev/null
+++ b/l10n/lv/settings.po
@@ -0,0 +1,219 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <aldis@udris.lv>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr "Epasts tika saglabāts"
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr "Nepareizs epasts"
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr "OpenID nomainīts"
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "Nepareizs vaicājums"
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr "Valoda tika nomainīta"
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr "Atvienot"
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr "Pievienot"
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr "Saglabā..."
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr "__valodas_nosaukums__"
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "Brīdinājums par drošību"
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr "Log"
+
+#: templates/admin.php:55
+msgid "More"
+msgstr "Vairāk"
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr "Pievieno savu aplikāciju"
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr "Izvēlies aplikāciju"
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr "Apskatie aplikāciju lapu - apps.owncloud.com"
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr "licenzēts"
+
+#: templates/apps.php:28
+msgid "by"
+msgstr "no"
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr "Dokumentācija"
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr "Rīkoties ar apjomīgiem failiem"
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr "Uzdod jautajumu"
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr "Problēmas ar datubāzes savienojumu"
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr "Nokļūt tur pašrocīgi"
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr "Atbildēt"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Jūs iymantojat"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "no pieejamajiem"
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr "Desktop un mobīlo ierīču sinhronizācijas rīks"
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr "Lejuplādēt"
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr "Jūsu parole tika nomainīta"
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr "Nav iespējams nomainīt jūsu paroli"
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr "Pašreizējā parole"
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr "Jauna parole"
+
+#: templates/personal.php:23
+msgid "show"
+msgstr "parādīt"
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr "Nomainīt paroli"
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr "Epasts"
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr "Jūsu epasta adrese"
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība"
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr "Valoda"
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr "Palīdzi tulkot"
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka"
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr "Vārds"
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Parole"
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr "Grupas"
+
+#: templates/users.php:32
+msgid "Create"
+msgstr "Izveidot"
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr "Apjoms pēc noklusējuma"
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr "Cits"
+
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr "Apjoms"
+
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
+msgid "Delete"
+msgstr "Izdzēst"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 3f9e5cf176..ef930d9659 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Електронската пошта е снимена"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Неисправна електронска пошта"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID сменето"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "неправилно барање"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Јазикот е сменет"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Оневозможи"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Овозможи"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Снимам..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Додадете ја Вашата апликација"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Избери аппликација"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Види ја страницата со апликации на apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licensed"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "од"
 
@@ -170,34 +179,42 @@ msgstr "Помогни во преводот"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "користете ја оваа адреса во менаџерот за датотеки да се поврзете  со Вашиот ownCloud"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Име"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Создај"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Предефинирана квота"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 9a11c70825..ac98298148 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -5,14 +5,16 @@
 # Translators:
 # Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,75 +23,83 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Emel disimpan"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Emel tidak sah"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID ditukar"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Bahasa ditukar"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Nyahaktif"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Aktif"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Simpan..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
-msgstr ""
+msgstr "Lanjutan"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
-msgstr ""
+msgstr "Tambah apps anda"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Pilih aplikasi"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-dilesen"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "oleh"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentasi"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Mengurus Fail Besar"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -117,11 +127,11 @@ msgstr "yang tersedia"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Klien Selarian untuk Desktop dan Mobile"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Muat turun"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -171,34 +181,42 @@ msgstr "Bantu terjemah"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "guna alamat ini untuk menyambung owncloud anda dalam pengurus fail anda"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nama"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Kata laluan "
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
-msgstr ""
+msgstr "Kuota Lalai"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
+msgstr "Lain"
+
+#: templates/users.php:80
+msgid "SubAdmin"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 0b26d8f505..f423532a21 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <ajarmund@gmail.com>, 2011.
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
@@ -11,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,65 +24,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Epost lagret"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ugyldig epost"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID endret"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Språk endret"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Slå avBehandle "
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Slå på"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Lagrer..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Mer"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Legg til din App"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Se applikasjonens side på apps.owncloud.org"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "av"
 
@@ -91,7 +100,7 @@ msgstr "Dokumentasjon"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Håndtere store filer"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -119,7 +128,7 @@ msgstr "av den tilgjengelige"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Klienter for datamaskiner og mobile enheter"
 
 #: templates/personal.php:13
 msgid "Download"
@@ -173,34 +182,42 @@ msgstr "Bidra til oversettelsen"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "bruk denne adressen for å koble til din ownCloud gjennom filhåndtereren"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Navn"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Passord"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Opprett"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Standard Kvote"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
+msgstr "Annet"
+
+#: templates/users.php:80
+msgid "SubAdmin"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 977be9bdbc..daccd5ac07 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -6,16 +6,17 @@
 #   <bart.formosus@gmail.com>, 2011.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011, 2012.
+#   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +25,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-mail bewaard"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ongeldige e-mail"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID is aangepast"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ongeldig verzoek"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Taal aangepast"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Uitschakelen"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Inschakelen"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Aan het bewaren....."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Nederlands"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Meer"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Voeg je App toe"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-gelicentieerd"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "door"
 
@@ -174,34 +183,42 @@ msgstr "Help met vertalen"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "gebruik dit adres om verbinding te maken met ownCloud in uw bestandsbeheerprogramma"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Naam"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Creëer"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Standaard limiet"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Limieten"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "verwijderen"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f8c099c030..99195922f1 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID endra"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ugyldig førespurnad"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Språk endra"
 
@@ -51,35 +55,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Nynorsk"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vel ein applikasjon"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "av"
 
@@ -171,34 +179,42 @@ msgstr "Hjelp oss å oversett"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "bruk denne adressa for å kopla til ownCloud i filhandsamaren din"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Namn"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Passord"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Lag"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 25b7eda775..c929566d19 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
@@ -13,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,65 +26,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email zapisany"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Niepoprawny email"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "Zmieniono OpenID"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Język zmieniony"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Wyłączone"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Włączone"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Zapisywanie..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Polski"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Więcej"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Dodaj aplikacje"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Zaznacz aplikacje"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencjonowany"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "przez"
 
@@ -175,34 +184,42 @@ msgstr "Pomóż w tłumaczeniu"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "Proszę użyć tego adresu, aby uzyskać dostęp do usługi ownCloud w menedżerze plików."
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nazwa"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Utwórz"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Domyślny udział"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Udział"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Usuń"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 88a8425439..7f26bc7340 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -5,16 +5,17 @@
 # Translators:
 #   <duda.nogueira@metasys.com.br>, 2011.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+# Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,65 +24,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email gravado"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Email inválido"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "Mudou OpenID"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Desabilitado"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Habilitado"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Gravando..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Português"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Mais"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adicione seu Aplicativo"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecione uma Aplicação"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Ver página do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licenciados"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "por"
 
@@ -173,34 +182,42 @@ msgstr "Ajude a traduzir"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "use este endereço para se conectar ao seu ownCloud no seu gerenciador de arquvos"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Senha"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Quota Padrão"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 9a87a9c31f..4a6eac5818 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email guardado"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Email inválido"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID alterado"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Idioma alterado"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Desativar"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Ativar"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "A guardar..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Mais"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adicione a sua aplicação"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Ver a página da aplicação em apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "por"
 
@@ -171,34 +179,42 @@ msgstr "Ajude a traduzir"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "utilize este endereço para conectar ao seu ownCloud através do seu gerenciador de ficheiros"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Palavra-chave"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Quota por defeito"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 542bfa8f1c..f106c9706f 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,15 +29,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID schimbat"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
@@ -53,35 +57,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "_language_name_"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adaugă aplicația ta"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-autorizat"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "de"
 
@@ -173,34 +181,42 @@ msgstr "Ajută la traducere"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "folosește această adresă pentru a te conecta la managerul tău de fișiere din ownCloud"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Nume"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Crează"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Cotă implicită"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Cotă"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Șterge"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 05b03aad0b..aaac8ba254 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,14 +8,15 @@
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
+# Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,65 +25,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email сохранен"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Неправильный Email"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID изменён"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Язык изменён"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Отключить"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Включить"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Сохранение..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Русский "
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Ещё"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Добавить приложение"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Выберите приложение"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Смотрите дополнения на apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-лицензия"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "от"
 
@@ -174,34 +183,42 @@ msgstr "Помочь с переводом"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "используйте данный адрес для подключения к ownCloud в вашем файловом менеджере"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Имя"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Создать"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Квота по умолчанию"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Удалить"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index bbf5f21cce..38d8e42187 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,65 +22,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email uložený"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Neplatný email"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID zmenené"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Zakázať"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Povoliť"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Ukladám..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "Slovensky"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Viac"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Pridať vašu aplikáciu"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Pozrite si stránku aplikácie na apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencované"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "od"
 
@@ -172,34 +180,42 @@ msgstr "Pomôcť s prekladom"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Meno"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Predvolená kvóta"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Odstrániť"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index b5b8a14fb3..57e7366edc 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,65 +22,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-poštni naslov je bil shranjen"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Neveljaven e-poštni naslov"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID je bil spremenjen"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Neveljaven zahtevek"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Onemogoči"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Omogoči"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Shranjevanje..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Več"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Dodajte vašo aplikacijo"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Izberite aplikacijo"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Obiščite spletno stran aplikacije na apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licencirana"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "s strani"
 
@@ -172,34 +180,42 @@ msgstr "Pomagajte pri prevajanju"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek."
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Ime"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Ustvari"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Privzeta količinska omejitev"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Količinska omejitev"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index f505b8ba5e..4a50494e55 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
@@ -49,7 +53,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
@@ -173,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index f6582fdc74..f9bdbc9753 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +26,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID је измењен"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Неисправан захтев"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Језик је измењен"
 
@@ -50,35 +54,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Изаберите програм"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-лиценциран"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "од"
 
@@ -170,34 +178,42 @@ msgstr " Помозите у превођењу"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "користите ову адресу да би се повезали на ownCloud путем менаџњера фајлова"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Име"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Групе"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Направи"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index cd74e98410..076b4a92d7 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +26,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID je izmenjen"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
@@ -50,35 +54,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Izaberite program"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licenciran"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "od"
 
@@ -170,34 +178,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "koristite ovu adresu da bi se povezali na ownCloud putem menadžnjera fajlova"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Ime"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Napravi"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 557d08cbe8..0c533799d1 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
@@ -11,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,65 +24,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-post sparad"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ogiltig e-post"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID ändrat"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ogiltig begäran"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Språk ändrades"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Avaktivera"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Aktivera"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Sparar..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Mera"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Lägg till din applikation"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Välj en App"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Se programsida på apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-licensierat"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "av"
 
@@ -173,34 +182,42 @@ msgstr "Hjälp att översätta"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "använd denna adress för att ansluta ownCloud till din filhanterare"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Namn"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Förvald datakvot"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kvot"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Ta bort"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 1ee9f5a85a..ad981106b9 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index eb31c594a8..afbeda74eb 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 6b03be705c..f398764150 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e19f805928..6e2f9257a8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 7c8581071c..d73c91f0eb 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index e0f819f9df..744a280635 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 410e16d9dc..847ecdf872 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,11 +33,11 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: app.php:306
+#: app.php:311
 msgid "Apps"
 msgstr ""
 
-#: app.php:308
+#: app.php:313
 msgid "Admin"
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:63
+#: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
 msgstr ""
 
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 6406b0120e..33d07d122c 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e8d0757e9f..2f77cd01e5 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
@@ -49,7 +53,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
@@ -173,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b753a75150..33c12981c4 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,65 +22,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "อีเมลถูกบันทึกแล้ว"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "อีเมลไม่ถูกต้อง"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "เปลี่ยนชื่อบัญชี OpenID แล้ว"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถูกต้อง"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "ปิดใช้งาน"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "เปิดใช้งาน"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "กำลังบันทึุกข้อมูล..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "เพิ่มเติม"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "เพิ่มแอปของคุณ"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "เลือก App"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-ได้รับอนุญาติแล้ว"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "โดย"
 
@@ -172,34 +180,42 @@ msgstr "ช่วยกันแปล"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "ใช้ที่อยู่นี้ในการเชื่อมต่อกับบัญชี ownCloud ของคุณในเครื่องมือจัดการไฟล์ของคุณ"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "ชื่อ"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "สร้าง"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "โควต้าที่กำหนดไว้เริ่มต้น"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "พื้นที่"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 3ffe00954d..b9af026aba 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,65 +21,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Eposta kaydedildi"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Geçersiz eposta"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID Değiştirildi"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Geçersiz istek"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Etkin değil"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Etkin"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Kaydediliyor..."
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__dil_adı__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "Devamı"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "Uygulamanı Ekle"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Bir uygulama seçin"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-lisanslı"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "yapan"
 
@@ -170,34 +179,42 @@ msgstr "Çevirilere yardım edin"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanın"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Ad"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Parola"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "Oluştur"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Varsayılan Kota"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Diğer"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Kota"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 3e271d5055..1dd51bd45e 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,15 +25,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr ""
 
@@ -49,35 +53,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr ""
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr ""
 
@@ -169,34 +177,42 @@ msgstr ""
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr ""
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index e387aaaa9e..ab28333467 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:30+0000\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "Đổi OpenID"
 msgid "Invalid request"
 msgstr "Yêu cầu không hợp lệ"
 
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Ngôn ngữ đã được thay đổi"
@@ -51,7 +55,7 @@ msgstr "Cho phép"
 msgid "Saving..."
 msgstr "Đang tiến hành lưu ..."
 
-#: personal.php:41 personal.php:42
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
@@ -175,34 +179,42 @@ msgstr "Dịch "
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin "
 
-#: templates/users.php:15 templates/users.php:60
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "Tên"
 
-#: templates/users.php:17 templates/users.php:61
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/users.php:19 templates/users.php:62 templates/users.php:78
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "Nhóm"
 
-#: templates/users.php:25
+#: templates/users.php:32
 msgid "Create"
 msgstr "Tạo"
 
-#: templates/users.php:28
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "Hạn ngạch mặt định"
 
-#: templates/users.php:47 templates/users.php:103
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:63
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "Hạn ngạch"
 
-#: templates/users.php:110
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "Xóa"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index c566e5d060..8af9222105 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +22,73 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "电子邮件已保存"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "无效的电子邮件"
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID 已修改"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "语言已修改"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "禁用"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "启用"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "正在保存"
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "简体中文"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "更多"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "添加应用"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "选择一个应用"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "查看在 app.owncloud.com 的应用程序页面"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-许可证"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "由"
 
@@ -171,34 +180,42 @@ msgstr "帮助翻译"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "在文件管理器中使用这个地址来连接到您的 ownCloud"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "名称"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "密码"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "组"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "创建"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "默认配额"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "配额"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index bcbaafd6e8..5e9690d52b 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +26,19 @@ msgstr ""
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:15
+#: ajax/openid.php:16
 msgid "OpenID Changed"
 msgstr "OpenID 已變更"
 
-#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "無效請求"
 
-#: ajax/setlanguage.php:17
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "語言已變更"
 
@@ -50,35 +54,39 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:40 personal.php:41
+#: personal.php:46 personal.php:47
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
-#: templates/admin.php:13
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:40
+#: templates/admin.php:55
 msgid "More"
 msgstr "更多"
 
-#: templates/apps.php:8
+#: templates/apps.php:10
 msgid "Add your App"
 msgstr "添加你的 App"
 
-#: templates/apps.php:22
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "選擇一個應用程式"
 
-#: templates/apps.php:25
+#: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "-licensed"
 msgstr "-已許可"
 
-#: templates/apps.php:26
+#: templates/apps.php:28
 msgid "by"
 msgstr "由"
 
@@ -170,34 +178,42 @@ msgstr "幫助翻譯"
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "使用這個位址去連接到你的私有雲檔案管理員"
 
-#: templates/users.php:15 templates/users.php:44
+#: templates/users.php:21 templates/users.php:76
 msgid "Name"
 msgstr "名稱"
 
-#: templates/users.php:16 templates/users.php:45
+#: templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "密碼"
 
-#: templates/users.php:17 templates/users.php:46 templates/users.php:60
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr "群組"
 
-#: templates/users.php:22
+#: templates/users.php:32
 msgid "Create"
 msgstr "創造"
 
-#: templates/users.php:25
+#: templates/users.php:35
 msgid "Default Quota"
 msgstr "預設容量限制"
 
-#: templates/users.php:35 templates/users.php:74
+#: templates/users.php:55 templates/users.php:138
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:47
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
 msgid "Quota"
 msgstr "容量限制"
 
-#: templates/users.php:80
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
 msgid "Delete"
 msgstr "刪除"
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 56e67c1a13..00da37ee1a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "S'ha desat el correu electrònic",
+"Invalid email" => "El correu electrònic no és vàlid",
 "OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "Language changed" => "S'ha canviat l'idioma",
+"Disable" => "Desactiva",
+"Enable" => "Activa",
+"Saving..." => "S'està desant...",
 "__language_name__" => "Català",
+"Security Warning" => "Avís de seguretat",
 "Log" => "Registre",
 "More" => "Més",
 "Add your App" => "Afegeiu la vostra aplicació",
 "Select an App" => "Seleccioneu una aplicació",
+"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "-licensed" => "- amb llicència",
 "by" => "de",
 "Documentation" => "Documentació",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index bef172a9f5..d71ae497d3 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-mail uložen",
+"Invalid email" => "Neplatný e-mail",
 "OpenID Changed" => "OpenID změněn",
 "Invalid request" => "Chybný dotaz",
 "Language changed" => "Jazyk byl změněn",
+"Disable" => "Vypnout",
+"Enable" => "Zapnout",
+"Saving..." => "Ukládám...",
 "__language_name__" => "Česky",
 "Log" => "Log",
 "More" => "Více",
 "Add your App" => "Přidat vaší aplikaci",
 "Select an App" => "Vyberte aplikaci",
+"See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
 "-licensed" => "-licencováno",
 "by" => "podle",
 "Documentation" => "Dokumentace",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 4cd7abfc90..148a8becc9 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email adresse gemt",
+"Invalid email" => "Ugyldig email adresse",
 "OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Language changed" => "Sprog ændret",
+"Disable" => "Deaktiver",
+"Enable" => "Aktiver",
+"Saving..." => "Gemmer...",
 "__language_name__" => "Dansk",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
 "Select an App" => "Vælg en App",
+"See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "-licensed" => "-licenseret",
 "by" => "af",
 "Documentation" => "Dokumentation",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index d1659e4d18..b4486e0aef 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-Mail gespeichert",
+"Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
 "Language changed" => "Sprache geändert",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
+"Saving..." => "Speichern...",
 "__language_name__" => "Deutsch",
+"Security Warning" => "Sicherheitshinweis",
 "Log" => "Log",
 "More" => "mehr",
 "Add your App" => "Füge deine App hinzu",
 "Select an App" => "Wähle eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen auf apps.owncloud.com",
 "-licensed" => "-lizenziert",
 "by" => "von",
 "Documentation" => "Dokumentation",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3d063daa3b..9008b85cec 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Το Email αποθηκεύτηκε ",
+"Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Disable" => "Απενεργοποίηση",
+"Enable" => "Ενεργοποίηση",
+"Saving..." => "Αποθήκευση...",
 "__language_name__" => "__όνομα_γλώσσας__",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Log" => "Αρχείο καταγραφής",
 "More" => "Περισσότερο",
 "Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
 "Select an App" => "Επιλέξτε μια εφαρμογή",
+"See application page at apps.owncloud.com" => "Η σελίδα εφαρμογών στο apps.owncloud.com",
 "-licensed" => "-με άδεια",
 "by" => "από",
 "Documentation" => "Τεκμηρίωση",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index c79817a272..348bee92c7 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "La retpoŝtadreso konserviĝis",
+"Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Disable" => "Malkapabligi",
+"Enable" => "Kapabligi",
+"Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
 "Log" => "Registro",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
 "Select an App" => "Elekti aplikaĵon",
+"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "-licensed" => "-permesila",
 "by" => "de",
 "Documentation" => "Dokumentaro",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 75ba2b72f0..4ab799a7f0 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Kiri on salvestatud",
+"Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
 "Language changed" => "Keel on muudetud",
+"Disable" => "Lülita välja",
+"Enable" => "Lülita sisse",
+"Saving..." => "Salvestamine...",
 "__language_name__" => "Eesti",
 "Log" => "Logi",
 "More" => "Veel",
 "Add your App" => "Lisa oma rakendus",
 "Select an App" => "Vali programm",
+"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "-licensed" => "-litsenseeritud",
 "by" => "kelle poolt",
 "Documentation" => "Dokumentatsioon",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4ef58dd112..1e8379b752 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,11 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Eposta gorde da",
+"Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
 "Language changed" => "Hizkuntza aldatuta",
+"Disable" => "Ez-gaitu",
+"Enable" => "Gaitu",
+"Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
+"Log" => "Egunkaria",
 "More" => "Gehiago",
 "Add your App" => "Gehitu zure aplikazioa",
 "Select an App" => "Aukeratu programa bat",
+"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
 "-licensed" => "lizentziarekin",
 "by" => " Egilea:",
 "Documentation" => "Dokumentazioa",
@@ -34,6 +41,7 @@
 "Password" => "Pasahitza",
 "Groups" => "Taldeak",
 "Create" => "Sortu",
+"Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 892de2d9ec..b5345972ac 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "ایمیل ذخیره شد",
+"Invalid email" => "ایمیل غیر قابل قبول",
 "OpenID Changed" => "OpenID تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
 "Language changed" => "زبان تغییر کرد",
+"Disable" => "غیرفعال",
+"Enable" => "فعال",
+"Saving..." => "درحال ذخیره ...",
 "__language_name__" => "__language_name__",
 "Log" => "کارنامه",
 "More" => "بیشتر",
 "Add your App" => "برنامه خود را بیافزایید",
 "Select an App" => "یک برنامه انتخاب کنید",
+"See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
 "-licensed" => "مجوزنامه",
 "by" => "به وسیله",
 "Documentation" => "مستندات",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 76964b3080..bbfcdec384 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Sähköposti tallennettu",
+"Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
 "Language changed" => "Kieli on vaihdettu",
+"Disable" => "Poista käytöstä",
+"Enable" => "Käytä",
+"Saving..." => "Tallennetaan...",
 "__language_name__" => "_kielen_nimi_",
+"Security Warning" => "Turvallisuusvaroitus",
 "Log" => "Loki",
 "More" => "Lisää",
 "Add your App" => "Lisää ohjelmasi",
 "Select an App" => "Valitse ohjelma",
+"See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
 "-licensed" => "-lisenssöity",
 "by" => "henkilölle",
 "Documentation" => "Dokumentaatio",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7e9a92f6bb..83a2ca7b38 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-mail sauvegardé",
+"Invalid email" => "E-mail invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
 "Language changed" => "Langue changée",
+"Disable" => "Désactivé",
+"Enable" => "Activé",
+"Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
+"Security Warning" => "Alertes de sécurité",
 "Log" => "Journaux",
 "More" => "Plus",
-"Add your App" => "Ajouter votre application",
+"Add your App" => "Ajoutez votre application",
 "Select an App" => "Sélectionner une Application",
+"See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
 "-licensed" => "sous licence",
 "by" => "par",
 "Documentation" => "Documentation",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 0459d940b4..5ab1f91e6d 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Correo electrónico gardado",
+"Invalid email" => "correo electrónico non válido",
 "OpenID Changed" => "Mudou o OpenID",
 "Invalid request" => "Petición incorrecta",
 "Language changed" => "O idioma mudou",
+"Disable" => "Deshabilitar",
+"Enable" => "Habilitar",
+"Saving..." => "Gardando...",
 "__language_name__" => "Galego",
 "Log" => "Conectar",
 "More" => "Máis",
 "Add your App" => "Engade o teu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
+"See application page at apps.owncloud.com" => "Vexa a páxina do aplicativo en apps.owncloud.com",
 "-licensed" => "-licenciado",
 "by" => "por",
 "Documentation" => "Documentación",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 39055c2139..17e803a325 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "הדוא״ל נשמר",
+"Invalid email" => "דוא״ל לא חוקי",
 "OpenID Changed" => "OpenID השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Language changed" => "שפה השתנתה",
+"Disable" => "בטל",
+"Enable" => "הפעל",
+"Saving..." => "שומר..",
 "__language_name__" => "עברית",
 "Log" => "יומן",
 "More" => "עוד",
 "Add your App" => "הוספת היישום שלך",
 "Select an App" => "בחירת יישום",
+"See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
 "-licensed" => "רשיון",
 "by" => "מאת",
 "Documentation" => "תיעוד",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 5f357a85d2..6fb29ce79c 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email spremljen",
+"Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
 "Language changed" => "Jezik promijenjen",
+"Disable" => "Isključi",
+"Enable" => "Uključi",
+"Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
 "Log" => "dnevnik",
 "More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
+"See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
 "-licensed" => "-licencirano",
 "by" => "od",
 "Documentation" => "dokumentacija",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 7eb7772f6d..819fc0a2c3 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email mentve",
+"Invalid email" => "Hibás email",
 "OpenID Changed" => "OpenID megváltozott",
 "Invalid request" => "Érvénytelen kérés",
 "Language changed" => "A nyelv megváltozott",
+"Disable" => "Letiltás",
+"Enable" => "Engedélyezés",
+"Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
 "Log" => "Napló",
 "More" => "Tovább",
 "Add your App" => "App hozzáadása",
 "Select an App" => "Egy App kiválasztása",
+"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
 "-licensed" => "-licencelt",
 "by" => ":",
 "Documentation" => "Dokumentáció",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 69e5698374..7050b85762 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "メールアドレスを保存しました",
+"Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Language changed" => "言語が変更されました",
+"Disable" => "無効",
+"Enable" => "有効",
+"Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
 "Log" => "ログ",
 "More" => "もっと",
 "Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
+"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
 "-licensed" => "ライセンス",
 "by" => "@",
 "Documentation" => "ドキュメント",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index a2c1210af6..828426dc1d 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "이메일 저장",
+"Invalid email" => "잘못된 이메일",
 "OpenID Changed" => "OpenID 변경됨",
 "Invalid request" => "잘못된 요청",
 "Language changed" => "언어가 변경되었습니다",
+"Disable" => "비활성화",
+"Enable" => "활성화",
+"Saving..." => "저장...",
 "__language_name__" => "한국어",
 "Log" => "로그",
 "More" => "더",
 "Add your App" => "앱 추가",
 "Select an App" => "프로그램 선택",
+"See application page at apps.owncloud.com" => "application page at apps.owncloud.com을 보시오.",
 "-licensed" => " 라이선스 사용",
 "by" => " by ",
 "Documentation" => "문서",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 504217a9db..409fa9517f 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Invalid email" => "Netinkamas el. paštas",
 "OpenID Changed" => "OpenID pakeistas",
 "Invalid request" => "Klaidinga užklausa",
 "Language changed" => "Kalba pakeista",
+"Disable" => "Išjungti",
+"Enable" => "Įjungti",
+"Saving..." => "Saugoma..",
 "__language_name__" => "Kalba",
 "Log" => "Žurnalas",
 "More" => "Daugiau",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
new file mode 100644
index 0000000000..9fa1ccdcfe
--- /dev/null
+++ b/settings/l10n/lv.php
@@ -0,0 +1,49 @@
+<?php $TRANSLATIONS = array(
+"Email saved" => "Epasts tika saglabāts",
+"Invalid email" => "Nepareizs epasts",
+"OpenID Changed" => "OpenID nomainīts",
+"Invalid request" => "Nepareizs vaicājums",
+"Language changed" => "Valoda tika nomainīta",
+"Disable" => "Atvienot",
+"Enable" => "Pievienot",
+"Saving..." => "Saglabā...",
+"__language_name__" => "__valodas_nosaukums__",
+"Security Warning" => "Brīdinājums par drošību",
+"Log" => "Log",
+"More" => "Vairāk",
+"Add your App" => "Pievieno savu aplikāciju",
+"Select an App" => "Izvēlies aplikāciju",
+"See application page at apps.owncloud.com" => "Apskatie aplikāciju lapu - apps.owncloud.com",
+"-licensed" => "licenzēts",
+"by" => "no",
+"Documentation" => "Dokumentācija",
+"Managing Big Files" => "Rīkoties ar apjomīgiem failiem",
+"Ask a question" => "Uzdod jautajumu",
+"Problems connecting to help database." => "Problēmas ar datubāzes savienojumu",
+"Go there manually." => "Nokļūt tur pašrocīgi",
+"Answer" => "Atbildēt",
+"You use" => "Jūs iymantojat",
+"of the available" => "no pieejamajiem",
+"Desktop and Mobile Syncing Clients" => "Desktop un mobīlo ierīču sinhronizācijas rīks",
+"Download" => "Lejuplādēt",
+"Your password got changed" => "Jūsu parole tika nomainīta",
+"Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
+"Current password" => "Pašreizējā parole",
+"New password" => "Jauna parole",
+"show" => "parādīt",
+"Change password" => "Nomainīt paroli",
+"Email" => "Epasts",
+"Your email address" => "Jūsu epasta adrese",
+"Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība",
+"Language" => "Valoda",
+"Help translate" => "Palīdzi tulkot",
+"use this address to connect to your ownCloud in your file manager" => "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka",
+"Name" => "Vārds",
+"Password" => "Parole",
+"Groups" => "Grupas",
+"Create" => "Izveidot",
+"Default Quota" => "Apjoms pēc noklusējuma",
+"Other" => "Cits",
+"Quota" => "Apjoms",
+"Delete" => "Izdzēst"
+);
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 4a61ba9d51..38e3cc6e09 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Електронската пошта е снимена",
+"Invalid email" => "Неисправна електронска пошта",
 "OpenID Changed" => "OpenID сменето",
 "Invalid request" => "неправилно барање",
 "Language changed" => "Јазикот е сменет",
+"Disable" => "Оневозможи",
+"Enable" => "Овозможи",
+"Saving..." => "Снимам...",
 "__language_name__" => "__language_name__",
 "Log" => "Записник",
 "More" => "Повеќе",
 "Add your App" => "Додадете ја Вашата апликација",
 "Select an App" => "Избери аппликација",
+"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
 "-licensed" => "-licensed",
 "by" => "од",
 "Documentation" => "Документација",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index f0fba7a7c0..b701bf09eb 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,17 +1,30 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Emel disimpan",
+"Invalid email" => "Emel tidak sah",
 "OpenID Changed" => "OpenID ditukar",
 "Invalid request" => "Permintaan tidak sah",
 "Language changed" => "Bahasa ditukar",
+"Disable" => "Nyahaktif",
+"Enable" => "Aktif",
+"Saving..." => "Simpan...",
 "__language_name__" => "_nama_bahasa_",
+"Log" => "Log",
+"More" => "Lanjutan",
+"Add your App" => "Tambah apps anda",
 "Select an App" => "Pilih aplikasi",
+"See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
 "-licensed" => "-dilesen",
 "by" => "oleh",
+"Documentation" => "Dokumentasi",
+"Managing Big Files" => "Mengurus Fail Besar",
 "Ask a question" => "Tanya soalan",
 "Problems connecting to help database." => "Masalah menghubung untuk membantu pengkalan data",
 "Go there manually." => "Pergi ke sana secara manual",
 "Answer" => "Jawapan",
 "You use" => "Anda menggunakan",
 "of the available" => "yang tersedia",
+"Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
+"Download" => "Muat turun",
 "Your password got changed" => "Kata laluan anda ditukar",
 "Unable to change your password" => "Gagal menukar kata laluan anda ",
 "Current password" => "Kata laluan terkini",
@@ -28,6 +41,8 @@
 "Password" => "Kata laluan ",
 "Groups" => "Kumpulan",
 "Create" => "Buat",
+"Default Quota" => "Kuota Lalai",
+"Other" => "Lain",
 "Quota" => "Kuota",
 "Delete" => "Padam"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 1379bb9c2e..2a5188a9cc 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,21 +1,29 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Epost lagret",
+"Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
 "Language changed" => "Språk endret",
+"Disable" => "Slå avBehandle ",
+"Enable" => "Slå på",
+"Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
 "Select an App" => "Velg en app",
+"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "-licensed" => "-lisensiert",
 "by" => "av",
 "Documentation" => "Dokumentasjon",
+"Managing Big Files" => "Håndtere store filer",
 "Ask a question" => "Still et spørsmål",
 "Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
 "Go there manually." => "Gå dit manuelt",
 "Answer" => "Svar",
 "You use" => "Du bruker",
 "of the available" => "av den tilgjengelige",
+"Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
 "Download" => "Last ned",
 "Your password got changed" => "Passordet ditt ble endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
@@ -34,6 +42,7 @@
 "Groups" => "Grupper",
 "Create" => "Opprett",
 "Default Quota" => "Standard Kvote",
+"Other" => "Annet",
 "Quota" => "Kvote",
 "Delete" => "Slett"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 939907ef71..a1db0f457f 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-mail bewaard",
+"Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
 "Language changed" => "Taal aangepast",
+"Disable" => "Uitschakelen",
+"Enable" => "Inschakelen",
+"Saving..." => "Aan het bewaren.....",
 "__language_name__" => "Nederlands",
 "Log" => "Log",
 "More" => "Meer",
 "Add your App" => "Voeg je App toe",
 "Select an App" => "Selecteer een app",
+"See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
 "-licensed" => "-gelicentieerd",
 "by" => "door",
 "Documentation" => "Documentatie",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d9dac06c00..575b01432e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email zapisany",
+"Invalid email" => "Niepoprawny email",
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Language changed" => "Język zmieniony",
+"Disable" => "Wyłączone",
+"Enable" => "Włączone",
+"Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",
 "Select an App" => "Zaznacz aplikacje",
+"See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
 "-licensed" => "-licencjonowany",
 "by" => "przez",
 "Documentation" => "Dokumentacja",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 35cf507194..e8154dfca7 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email gravado",
+"Invalid email" => "Email inválido",
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
 "Language changed" => "Mudou Idioma",
+"Disable" => "Desabilitado",
+"Enable" => "Habilitado",
+"Saving..." => "Gravando...",
 "__language_name__" => "Português",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione seu Aplicativo",
 "Select an App" => "Selecione uma Aplicação",
+"See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
 "-licensed" => "-licenciados",
 "by" => "por",
 "Documentation" => "Documentação",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index af7088daa1..159c3a7d07 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email guardado",
+"Invalid email" => "Email inválido",
 "OpenID Changed" => "OpenID alterado",
 "Invalid request" => "Pedido inválido",
 "Language changed" => "Idioma alterado",
+"Disable" => "Desativar",
+"Enable" => "Ativar",
+"Saving..." => "A guardar...",
 "__language_name__" => "__language_name__",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione a sua aplicação",
 "Select an App" => "Selecione uma aplicação",
+"See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
 "-licensed" => "-licenciado",
 "by" => "por",
 "Documentation" => "Documentação",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4ab514815c..253625b486 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email сохранен",
+"Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
 "Language changed" => "Язык изменён",
+"Disable" => "Отключить",
+"Enable" => "Включить",
+"Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
 "Log" => "Журнал",
 "More" => "Ещё",
 "Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
+"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "-licensed" => "-лицензия",
 "by" => "от",
 "Documentation" => "Документация",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index fe755aecb4..edf908ce09 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email uložený",
+"Invalid email" => "Neplatný email",
 "OpenID Changed" => "OpenID zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Language changed" => "Jazyk zmenený",
+"Disable" => "Zakázať",
+"Enable" => "Povoliť",
+"Saving..." => "Ukladám...",
 "__language_name__" => "Slovensky",
 "Log" => "Záznam",
 "More" => "Viac",
 "Add your App" => "Pridať vašu aplikáciu",
 "Select an App" => "Vyberte aplikáciu",
+"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácie na apps.owncloud.com",
 "-licensed" => "-licencované",
 "by" => "od",
 "Documentation" => "Dokumentácia",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 58afe21f45..e4f5a500cc 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-poštni naslov je bil shranjen",
+"Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
 "Language changed" => "Jezik je bil spremenjen",
+"Disable" => "Onemogoči",
+"Enable" => "Omogoči",
+"Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
 "Log" => "Dnevnik",
 "More" => "Več",
 "Add your App" => "Dodajte vašo aplikacijo",
 "Select an App" => "Izberite aplikacijo",
+"See application page at apps.owncloud.com" => "Obiščite spletno stran aplikacije na apps.owncloud.com",
 "-licensed" => "-licencirana",
 "by" => "s strani",
 "Documentation" => "Dokumentacija",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 40a370aabe..05d64302ea 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-post sparad",
+"Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
 "Language changed" => "Språk ändrades",
+"Disable" => "Avaktivera",
+"Enable" => "Aktivera",
+"Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
 "Log" => "Logg",
 "More" => "Mera",
 "Add your App" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
+"See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "-licensed" => "-licensierat",
 "by" => "av",
 "Documentation" => "Dokumentation",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 5b744cb6be..2d6798ff29 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "อีเมลถูกบันทึกแล้ว",
+"Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Disable" => "ปิดใช้งาน",
+"Enable" => "เปิดใช้งาน",
+"Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
 "Add your App" => "เพิ่มแอปของคุณ",
 "Select an App" => "เลือก App",
+"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
 "-licensed" => "-ได้รับอนุญาติแล้ว",
 "by" => "โดย",
 "Documentation" => "เอกสารคู่มือการใช้งาน",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 01ad142a3d..42e6eac5f3 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Eposta kaydedildi",
+"Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
 "Language changed" => "Dil değiştirildi",
+"Disable" => "Etkin değil",
+"Enable" => "Etkin",
+"Saving..." => "Kaydediliyor...",
 "__language_name__" => "__dil_adı__",
 "Log" => "Günlük",
 "More" => "Devamı",
 "Add your App" => "Uygulamanı Ekle",
 "Select an App" => "Bir uygulama seçin",
+"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
 "-licensed" => "-lisanslı",
 "by" => "yapan",
 "Documentation" => "Dökümantasyon",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index d274b372ee..2e043f0266 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "电子邮件已保存",
+"Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
 "Language changed" => "语言已修改",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "正在保存",
 "__language_name__" => "简体中文",
 "Log" => "日志",
 "More" => "更多",
 "Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
+"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
 "-licensed" => "-许可证",
 "by" => "由",
 "Documentation" => "文档",

From d1dee2843798891463d38a839b2253588db88578 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 20:45:32 -0400
Subject: [PATCH 1162/1537] Check if size isset, try to fix used space
 calculation again, fixs bug oc-1331

---
 settings/personal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index 8ad3af0873..82626526d5 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -18,7 +18,7 @@ OC_App::setActiveNavigationEntry( 'personal' );
 // calculate the disc space
 $rootInfo=OC_FileCache::get('');
 $sharedInfo=OC_FileCache::get('/Shared');
-if (!isset($sharedInfo)) {
+if (!isset($sharedInfo['size'])) {
 	$sharedSize = 0;
 } else {
 	$sharedSize = $sharedInfo['size'];

From cb21406e18cf492b5e0356ba04d341acb20cafd6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 21:56:22 -0400
Subject: [PATCH 1163/1537] Implement CRUDS in share dropdown, and some
 clean-up

---
 apps/files_sharing/css/sharing.css |  10 +--
 core/js/share.js                   | 103 ++++++++++++++++++++++-------
 2 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css
index a2fa870c43..f1d6faa6b0 100644
--- a/apps/files_sharing/css/sharing.css
+++ b/apps/files_sharing/css/sharing.css
@@ -7,9 +7,11 @@
 -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; }
-#privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
+#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; }
-#share_with { width: 16em; }
-#privateLink label, .edit { font-weight:normal; }
-#share_with_chzn { display: block; }
+#privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
\ No newline at end of file
diff --git a/core/js/share.js b/core/js/share.js
index 4cff9ec1a6..18e68ce78d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -2,6 +2,11 @@ OC.Share={
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
 	SHARE_TYPE_PRIVATE_LINK:3,
+	PERMISSION_CREATE:4,
+	PERMISSION_READ:1,
+	PERMISSION_UPDATE:2,
+	PERMISSION_DELETE:8,
+	PERMISSION_SHARE:16,
 	item:[],
 	statuses:[],
 	loadIcons:function(itemType) {
@@ -66,18 +71,14 @@ OC.Share={
 	showDropDown:function(itemType, item, appendTo, privateLink) {
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
 		// TODO replace with autocomplete textbox
-		html += '<input id="shareWith" type="text" placeholder="Share with" />';
+		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 += '<form id="emailPrivateLink">';
-			html += '<input id="privateLinkText" style="display:none; width:90%;" />';
-			html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
-			html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
-			html += '</form>';
+			html += '<input id="privateLinkText" style="display:none; width:90%;" readonly="readonly" />';
 			html += '</div>';
 		}
 		html += '</div>';
@@ -88,12 +89,11 @@ OC.Share={
 				if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
 					OC.Share.showPrivateLink(item, share.share_with);
 				} else {
-					OC.Share.addShareWith(share.share_with, share.permissions);
+					OC.Share.addShareWith(share.share_type, share.share_with, share.permissions);
 				}
 			});
 		}
 		$('#dropdown').show('blind');
-		$('#share_with').chosen();
 	},
 	hideDropDown:function(callback) {
 		$('#dropdown').hide('blind', function() {
@@ -103,12 +103,34 @@ OC.Share={
 			}
 		});
 	},
-	addShareWith:function(shareWith, permissions) {
-		var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
-		var style = ((permissions == 0) ? 'style="display:none;"' : '');
-		var html = '<li >';
+	addShareWith:function(shareType, shareWith, permissions) {
+		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 data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
 		html += shareWith;
-		html += '<a href="" class="unshare" data-share-with="'+shareWith+'" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
+		html += '<label><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;">';
+		html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.Share.PERMISSION_CREATE+'" />create</label>';
+		html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.Share.PERMISSION_UPDATE+'" />update</label>';
+		html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.Share.PERMISSION_DELETE+'" />delete</label>';
+		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');
 		
@@ -224,36 +246,69 @@ $(document).ready(function() {
 
 	$('#shareWithList li').live('mouseenter', function(event) {
 		// Show permissions and unshare button
-		$(':hidden', this).show();
+		$(':hidden', this).filter(':not(.cruds)').show();
 	});
 	
 	$('#shareWithList li').live('mouseleave', function(event) {
 		// Hide permissions and unshare button
-		$('a', this).hide();
-		if (!$('input:[type=checkbox]', this).is(':checked')) {
-			$('input:[type=checkbox]', this).hide();
-			$('label', this).hide();
+		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();
 		}
 	});
 	
 	$('#shareWith').live('change', function() {
+		var shareType = $(li).data('share-type');
 		var shareWith = $(this).val();
-		OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item'), 0, shareWith, 0, function() {
-			OC.Share.addShareWith(shareWith, 0);
+		// 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'), shareType, shareWith, permissions, function() {
+			OC.Share.addShareWith(shareType, shareWith, permissions);
 			$('#shareWith').val('');
 		});
 	});
-	
+
+	$('.showCruds').live('click', function() {
+		$(this).parent().find('.cruds').toggle();
+	});
+
 	$('.unshare').live('click', function() {
 		var li = $(this).parent();
-		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item'), 0, $(this).data('share-with'), function() {
+		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item'), $(li).data('share-type'), $(li).data('share-with'), function() {
 			$(li).remove();
 		});
 	});
 	
 	$('.permissions').live('change', function() {
-		var permissions = (this.checked) ? 1 : 0;
-		OC.Share.changePermissions($('#dropdown').data('item'), $(this).parent().data('uid_shared_with'), permissions);
+		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'), $(li).data('share-type'), $(li).data('share-with'), permissions);
 	});
 	
 	$('#privateLinkCheckbox').live('change', function() {

From d006a551f4a90e9e6ed797cf1357e1b12623f1f6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 22:53:55 -0400
Subject: [PATCH 1164/1537] Run pre and post proxies for file_put_contents()
 streams

---
 lib/filesystemview.php | 67 +++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 3c989d7c36..e78e5e8ef6 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -223,49 +223,54 @@ class OC_FilesystemView {
 	}
 	public function file_put_contents($path, $data) {
 		if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier
-			$exists = $this->file_exists($path);
-			$run = true;
-			if(!$exists) {
+			$absolutePath = $this->getAbsolutePath($path);
+			if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath) && OC_Filesystem::isValidPath($path)) {
+				$path = $this->getRelativePath($absolutePath);
+				$exists = $this->file_exists($path);
+				$run = true;
+				if(!$exists) {
+					OC_Hook::emit(
+						OC_Filesystem::CLASSNAME,
+						OC_Filesystem::signal_create,
+						array(
+							OC_Filesystem::signal_param_path => $path,
+							OC_Filesystem::signal_param_run => &$run
+						)
+					);
+				}
 				OC_Hook::emit(
 					OC_Filesystem::CLASSNAME,
-					OC_Filesystem::signal_create,
+					OC_Filesystem::signal_write,
 					array(
 						OC_Filesystem::signal_param_path => $path,
 						OC_Filesystem::signal_param_run => &$run
 					)
 				);
-			}
-			OC_Hook::emit(
-				OC_Filesystem::CLASSNAME,
-				OC_Filesystem::signal_write,
-				array(
-					OC_Filesystem::signal_param_path => $path,
-					OC_Filesystem::signal_param_run => &$run
-				)
-			);
-			if(!$run) {
-				return false;
-			}
-			$target=$this->fopen($path, 'w');
-			if($target) {
-				$count=OC_Helper::streamCopy($data, $target);
-				fclose($target);
-				fclose($data);
-				if(!$exists) {
+				if(!$run) {
+					return false;
+				}
+				$target=$this->fopen($path, 'w');
+				if($target) {
+					$count=OC_Helper::streamCopy($data, $target);
+					fclose($target);
+					fclose($data);
+					if(!$exists) {
+						OC_Hook::emit(
+							OC_Filesystem::CLASSNAME,
+							OC_Filesystem::signal_post_create,
+							array( OC_Filesystem::signal_param_path => $path)
+						);
+					}
 					OC_Hook::emit(
 						OC_Filesystem::CLASSNAME,
-						OC_Filesystem::signal_post_create,
+						OC_Filesystem::signal_post_write,
 						array( OC_Filesystem::signal_param_path => $path)
 					);
+					OC_FileProxy::runPostProxies('hash', $absolutePath, $count);
+					return $count > 0;
+				}else{
+					return false;
 				}
-				OC_Hook::emit(
-					OC_Filesystem::CLASSNAME,
-					OC_Filesystem::signal_post_write,
-					array( OC_Filesystem::signal_param_path => $path)
-				);
-				return $count > 0;
-			}else{
-				return false;
 			}
 		}else{
 			return $this->basicOperation('file_put_contents', $path, array('create', 'write'), $data);

From ea2e76eecc8b02ba3a10a803e8490b91aac2fe95 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 23:10:21 -0400
Subject: [PATCH 1165/1537] Forgot data parameter for file_put_contents()
 streams pre proxies

---
 lib/filesystemview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index e78e5e8ef6..d1bab03e43 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -224,7 +224,7 @@ class OC_FilesystemView {
 	public function file_put_contents($path, $data) {
 		if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier
 			$absolutePath = $this->getAbsolutePath($path);
-			if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath) && OC_Filesystem::isValidPath($path)) {
+			if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) && OC_Filesystem::isValidPath($path)) {
 				$path = $this->getRelativePath($absolutePath);
 				$exists = $this->file_exists($path);
 				$run = true;

From 7050f0fa67ac4dd17e9712f9cc823f98c7452d1d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 23:54:25 -0400
Subject: [PATCH 1166/1537] Cast groups as string, fixes bug oc-1309. Thanks to
 nderambure.

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index e46c6446b8..7f3b027b4d 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -87,7 +87,7 @@ $(document).ready(function(){
 		var user=element.data('username');
 		if($(element).attr('class') == 'groupsselect'){		
 			if(element.data('userGroups')){
-				checked=element.data('userGroups').split(', ');
+				checked=String(element.data('userGroups')).split(', ');
 			}
 			if(user){
 				var checkHandeler=function(group){

From 680eed6bacbbc1f8352c9e8c01521b9c7fa5fff9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 27 Jul 2012 15:35:36 +0200
Subject: [PATCH 1167/1537] fix for bug #1295, don't escape password reset link

---
 core/lostpassword/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index bd2a3e897e..8f86fe23aa 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -19,7 +19,7 @@ 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@' . OCP\Util::getServerHost();

From 4c822df28d6d0ece03468b4283bef235f9496b9e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 09:37:11 -0400
Subject: [PATCH 1168/1537] Fix incorrect copy/paste for file_put_contents()

---
 lib/filesystemview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index d1bab03e43..faf3f0bd4c 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -266,7 +266,7 @@ class OC_FilesystemView {
 						OC_Filesystem::signal_post_write,
 						array( OC_Filesystem::signal_param_path => $path)
 					);
-					OC_FileProxy::runPostProxies('hash', $absolutePath, $count);
+					OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
 					return $count > 0;
 				}else{
 					return false;

From db72ce398b9463f1f6547b864494e1c8b3267f1c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 10:13:23 -0400
Subject: [PATCH 1169/1537] Add support for configuring which permissions are
 possible for items

---
 core/js/share.js | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 18e68ce78d..8ab92c2a85 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -68,7 +68,7 @@ OC.Share={
 			}
 		});
 	},
-	showDropDown:function(itemType, item, appendTo, privateLink) {
+	showDropDown:function(itemType, item, appendTo, privateLink, possiblePermissions) {
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
 		// TODO replace with autocomplete textbox
 		html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
@@ -89,7 +89,7 @@ OC.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);
+					OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
 				}
 			});
 		}
@@ -103,7 +103,7 @@ OC.Share={
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, permissions) {
+	addShareWith:function(shareType, shareWith, permissions, possiblePermissions) {
 		var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
 		if (permissions & OC.Share.PERMISSION_CREATE) {
 			createChecked = 'checked="checked"';
@@ -122,14 +122,24 @@ OC.Share={
 		}
 		var html = '<li data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
 		html += shareWith;
-		html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
+		if (possiblePermissions & OC.Share.PERMISSION_CREATE || possiblePermissions & OC.Share.PERMISSION_UPDATE || possiblePermissions & OC.Share.PERMISSION_DELETE) {
+			html += '<label><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;">';
-		html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.Share.PERMISSION_CREATE+'" />create</label>';
-		html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.Share.PERMISSION_UPDATE+'" />update</label>';
-		html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.Share.PERMISSION_DELETE+'" />delete</label>';
-		html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.Share.PERMISSION_SHARE+'" />share</label>';
+			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');
@@ -179,7 +189,7 @@ $(document).ready(function() {
 			if ($(this).data('private-link') !== undefined && $(this).data('private-link') == true) {
 				privateLink = true;
 			}
-			OC.Share.showDropDown($(this).data('item-type'), $(this).data('item'), $(this).parent().parent(), privateLink);
+			OC.Share.showDropDown($(this).data('item-type'), $(this).data('item'), $(this).parent().parent(), privateLink, $(this).data('possible-permissions'));
 		}
 	});
 	
@@ -214,8 +224,10 @@ $(document).ready(function() {
 			var item = $('#dir').val() + '/' + filename;
 			if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
 				var itemType = 'folder';
+				var possiblePermissions = OC.Share.PERMISSION_CREATE | OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
 			} else {
 				var itemType = 'file';
+				var possiblePermissions = OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
 			}
 			var appendTo = $('tr').filterAttr('data-file', filename).find('td.filename');
 			// Check if drop down is already visible for a different file
@@ -224,12 +236,12 @@ $(document).ready(function() {
 					OC.Share.hideDropDown(function () {
 						$('tr').removeClass('mouseOver');
 						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
-						OC.Share.showDropDown(itemType, item, appendTo, true);
+						OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
 					});
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, item, appendTo, true);
+				OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
 			}
 		});
 	}

From 48f33be848f027ec5a2a4aa8e2b270e8f7e2ff20 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 12:32:03 -0400
Subject: [PATCH 1170/1537] Only call mkdir() if the root folder does not exist
 for FTP external storage

---
 apps/files_external/lib/ftp.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 4d5ae670de..63f14a2877 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -24,9 +24,10 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 		if(!$this->root || $this->root[0]!='/'){
 			$this->root='/'.$this->root;
 		}
-		
 		//create the root folder if necesary
-		mkdir($this->constructUrl(''));
+		if (!$this->is_dir('')) {
+			$this->mkdir('');
+		}
 	}
 
 	/**

From 2d85ef0e045380691b1dcf136b4b61b46104c2c6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 27 Jul 2012 11:59:52 +0200
Subject: [PATCH 1171/1537] Chunked upload: Refactor to static class

---
 lib/connector/sabre/directory.php | 23 +++-----------
 lib/filechunking.php              | 53 +++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 lib/filechunking.php

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index bed75015ae..b88d0f3286 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -49,25 +49,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function createFile($name, $data = null) {
 		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			$cache = new OC_Cache_File();
-			$cache->set($name, $data);
-			preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
-			$prefix = $matches['name'].'-chunking-'.$matches['transferid'].'-'.$matches['chunkcount'].'-';
-			$parts = 0;
-			for($i=0; $i < $matches['chunkcount']; $i++) {
-				if ($cache->hasKey($prefix.$i)) {
-					$parts ++;
-				}
-			}
-			if ($parts == $matches['chunkcount']) {
-				$newPath = $this->path . '/' . $matches['name'];
+			OC_FileChunking::store($name, $data);
+			$info = OC_FileChunking::decodeName($name);
+			if (OC_FileChunking::isComplete($info)) {
+				$newPath = $this->path . '/' . $info['name'];
 				$f = OC_Filesystem::fopen($newPath, 'w');
-				for($i=0; $i < $matches['chunkcount']; $i++) {
-					$chunk = $cache->get($prefix.$i);
-					$cache->remove($prefix.$i);
-					fwrite($f,$chunk);
-				}
-				fclose($f);
+				OC_FileChunking::assemble($info, $f);
 				return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
 			}
 		} else {
diff --git a/lib/filechunking.php b/lib/filechunking.php
new file mode 100644
index 0000000000..4e4918d49d
--- /dev/null
+++ b/lib/filechunking.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+class OC_FileChunking {
+	static public function decodeName($name) {
+		preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
+		return $matches;
+	}
+
+	static public function getPrefix($name, $transferid, $chunkcount) {
+		return $name.'-chunking-'.$transferid.'-'.$chunkcount.'-';
+	}
+
+	static public function store($name, $data) {
+		$cache = new OC_Cache_File();
+		$cache->set($name, $data);
+	}
+
+	static public function isComplete($info) {
+		$prefix = OC_FileChunking::getPrefix($info['name'],
+				$info['transferid'],
+				$info['chunkcount']
+			);
+		$parts = 0;
+		$cache = new OC_Cache_File();
+		for($i=0; $i < $info['chunkcount']; $i++) {
+			if ($cache->hasKey($prefix.$i)) {
+				$parts ++;
+			}
+		}
+		return $parts == $info['chunkcount'];
+	}
+
+	static public function assemble($info, $f) {
+		$cache = new OC_Cache_File();
+		$prefix = OC_FileChunking::getPrefix($info['name'],
+				$info['transferid'],
+				$info['chunkcount']
+			);
+		for($i=0; $i < $info['chunkcount']; $i++) {
+			$chunk = $cache->get($prefix.$i);
+			$cache->remove($prefix.$i);
+			fwrite($f,$chunk);
+		}
+		fclose($f);
+	}
+}

From 1ea33ff36bf70ee2099f8d225f488dc220e3bcff Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 27 Jul 2012 12:14:18 +0200
Subject: [PATCH 1172/1537] Chunked upload: Refactor OC_FileChunking to object

---
 lib/connector/sabre/directory.php |  7 +++--
 lib/filechunking.php              | 49 +++++++++++++++++++------------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index b88d0f3286..09c65f19b8 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -49,12 +49,13 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function createFile($name, $data = null) {
 		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			OC_FileChunking::store($name, $data);
 			$info = OC_FileChunking::decodeName($name);
-			if (OC_FileChunking::isComplete($info)) {
+			$chunk_handler = new OC_FileChunking($info);
+			$chunk_handler->store($info['index'], $data);
+			if ($chunk_handler->isComplete()) {
 				$newPath = $this->path . '/' . $info['name'];
 				$f = OC_Filesystem::fopen($newPath, 'w');
-				OC_FileChunking::assemble($info, $f);
+				$chunk_handler->assemble($f);
 				return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
 			}
 		} else {
diff --git a/lib/filechunking.php b/lib/filechunking.php
index 4e4918d49d..9aead4c12f 100644
--- a/lib/filechunking.php
+++ b/lib/filechunking.php
@@ -8,42 +8,55 @@
 
 
 class OC_FileChunking {
+	protected $info;
+	protected $cache;
+
 	static public function decodeName($name) {
 		preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
 		return $matches;
 	}
 
-	static public function getPrefix($name, $transferid, $chunkcount) {
+	public function __construct($info) {
+		$this->info = $info;
+	}
+
+	public function getPrefix() {
+		$name = $this->info['name'];
+		$transferid = $this->info['transferid'];
+		$chunkcount = $this->info['chunkcount'];
+
 		return $name.'-chunking-'.$transferid.'-'.$chunkcount.'-';
 	}
 
-	static public function store($name, $data) {
-		$cache = new OC_Cache_File();
+	protected function getCache() {
+		if (!isset($this->cache)) {
+			$this->cache = new OC_Cache_File();
+		}
+		return $this->cache;
+	}
+
+	public function store($index, $data) {
+		$cache = $this->getCache();
+		$name = $this->getPrefix().$index;
 		$cache->set($name, $data);
 	}
 
-	static public function isComplete($info) {
-		$prefix = OC_FileChunking::getPrefix($info['name'],
-				$info['transferid'],
-				$info['chunkcount']
-			);
+	public function isComplete() {
+		$prefix = $this->getPrefix();
 		$parts = 0;
-		$cache = new OC_Cache_File();
-		for($i=0; $i < $info['chunkcount']; $i++) {
+		$cache = $this->getCache();
+		for($i=0; $i < $this->info['chunkcount']; $i++) {
 			if ($cache->hasKey($prefix.$i)) {
 				$parts ++;
 			}
 		}
-		return $parts == $info['chunkcount'];
+		return $parts == $this->info['chunkcount'];
 	}
 
-	static public function assemble($info, $f) {
-		$cache = new OC_Cache_File();
-		$prefix = OC_FileChunking::getPrefix($info['name'],
-				$info['transferid'],
-				$info['chunkcount']
-			);
-		for($i=0; $i < $info['chunkcount']; $i++) {
+	public function assemble($f) {
+		$cache = $this->getCache();
+		$prefix = $this->getPrefix();
+		for($i=0; $i < $this->info['chunkcount']; $i++) {
 			$chunk = $cache->get($prefix.$i);
 			$cache->remove($prefix.$i);
 			fwrite($f,$chunk);

From 896d27de36dd26515f30fa3b0748c9c6089600af Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 27 Jul 2012 19:02:23 +0200
Subject: [PATCH 1173/1537] Chunked upload: Support reusing local chunks

---
 apps/files/appinfo/filesync.php | 64 +++++++++++++++++++++++++++++++++
 apps/files/appinfo/info.xml     |  1 +
 apps/files/appinfo/version      |  2 +-
 lib/filechunking.php            | 32 +++++++++++++++--
 4 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 apps/files/appinfo/filesync.php

diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php
new file mode 100644
index 0000000000..707ee2435c
--- /dev/null
+++ b/apps/files/appinfo/filesync.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * filesync can be called with a PUT method.
+ * PUT takes a stream starting with a 2 byte blocksize,
+ *     followed by binary md5 of the blocks. Everything in big-endian.
+ *     The return is a json encoded with:
+ *       - 'transferid'
+ *       - 'needed' chunks
+ *       - 'last' checked chunk
+ * The URL is made of 3 parts, the service url (remote.php/filesync/), the sync
+ * type and the path in ownCloud.
+ * At the moment the only supported sync type is 'oc_chunked'.
+ * The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file
+ */
+
+// only need filesystem apps
+$RUNTIME_APPTYPES=array('filesystem','authentication');
+OC_App::loadApps($RUNTIME_APPTYPES);
+if(!OC_User::isLoggedIn()){
+        if(!isset($_SERVER['PHP_AUTH_USER'])){
+                header('WWW-Authenticate: Basic realm="ownCloud Server"');
+                header('HTTP/1.0 401 Unauthorized');
+                echo 'Valid credentials must be supplied';
+                exit();
+        } else {
+                if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){
+                        exit();
+                }
+        }
+}
+
+list($type,$file) = explode('/', substr($path_info,1+strlen($service)+1), 2);
+
+if ($type != 'oc_chunked') {
+	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+	die;
+}
+
+if (!OC_Filesystem::is_file($file)) {
+	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+	die;
+}
+
+switch($_SERVER['REQUEST_METHOD']) {
+	case 'PUT':
+		$input = fopen("php://input", "r");
+		$org_file = OC_Filesystem::fopen($file, 'rb');
+		$info = array(
+			'name' => basename($file),
+		);
+		$sync = new OC_FileChunking($info);
+		$result = $sync->signature_split($org_file, $input);
+		echo json_encode($result);
+		break;
+	default:
+		OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+}
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 105df092ce..e58f83c5a0 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -15,5 +15,6 @@
 	<remote>
 		<files>appinfo/remote.php</files>
 		<webdav>appinfo/remote.php</webdav>
+		<filesync>appinfo/filesync.php</filesync>
 	</remote>
 </info>
diff --git a/apps/files/appinfo/version b/apps/files/appinfo/version
index 1b87bcd0b0..e25d8d9f35 100644
--- a/apps/files/appinfo/version
+++ b/apps/files/appinfo/version
@@ -1 +1 @@
-1.1.4
\ No newline at end of file
+1.1.5
diff --git a/lib/filechunking.php b/lib/filechunking.php
index 9aead4c12f..d03af226d8 100644
--- a/lib/filechunking.php
+++ b/lib/filechunking.php
@@ -23,9 +23,8 @@ class OC_FileChunking {
 	public function getPrefix() {
 		$name = $this->info['name'];
 		$transferid = $this->info['transferid'];
-		$chunkcount = $this->info['chunkcount'];
 
-		return $name.'-chunking-'.$transferid.'-'.$chunkcount.'-';
+		return $name.'-chunking-'.$transferid.'-';
 	}
 
 	protected function getCache() {
@@ -63,4 +62,33 @@ class OC_FileChunking {
 		}
 		fclose($f);
 	}
+
+	public function signature_split($orgfile, $input) {
+		$info = unpack('n', fread($input, 2));
+		$blocksize = $info[1];
+		$this->info['transferid'] = mt_rand();
+		$count = 0;
+		$needed = array();
+		$cache = $this->getCache();
+		$prefix = $this->getPrefix();
+		while (!feof($orgfile)) {
+			$new_md5 = fread($input, 16);
+			if (feof($input)) {
+				break;
+			}
+			$data = fread($orgfile, $blocksize);
+			$org_md5 = md5($data, true);
+			if ($org_md5 == $new_md5) {
+				$cache->set($prefix.$count, $data);
+			} else {
+				$needed[] = $count;
+			}
+			$count++;
+		}
+		return array(
+			'transferid' => $this->info['transferid'],
+			'needed' => $needed,
+			'count' => $count,
+		);
+	}
 }

From df9f5b902a39d94c0da221b5d767b19e1c35e680 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 15:34:51 -0400
Subject: [PATCH 1174/1537] Fix group detection for sharing in case username
 contains '@', fix for oc-1270

---
 apps/files_sharing/ajax/getitem.php | 7 ++++++-
 apps/files_sharing/lib_share.php    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index ff6c29b6a0..06a80102de 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -22,8 +22,13 @@ while ($path != $userDirectory) {
 				}
 			} else {
 				// Check if uid_shared_with is a group
-				if (($pos = strpos($uid_shared_with, '@')) !== false) {
+				$pos = strrpos($uid_shared_with, '@');
+				if ($pos !== false) {
 					$gid = substr($uid_shared_with, $pos + 1);
+				} else {
+					$gid = false;
+				}
+				if ($gid && OC_Group::groupExists($gid)) {
 					// Include users in the group so the users can be removed from the list of people to share with
 					if ($path == $source) {
 						$group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => false));
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 0237acfc1a..3bedd9bebc 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -179,7 +179,7 @@ class OC_Share {
 				$uid_shared_with = OC_Group::usersInGroup($uid_shared_with);
 				// Remove the owner from the list of users in the group
 				$uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser()));
-			} else if ($uid = strstr($uid_shared_with, '@', true)) {
+			} else if ($uid = strrchr($uid_shared_with, '@', true)) {
 				$uid_shared_with = array($uid);
 			} else {
 				$uid_shared_with = array($uid_shared_with);

From 6a4c46e2c29eac2c6c0344c46ab18375608b5c5f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:05:18 -0400
Subject: [PATCH 1175/1537] Set the user id when authenticating user for
 Ampache, fixes bug oc-219

---
 apps/media/lib_ampache.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index d5a093338c..a041e9a884 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -71,6 +71,7 @@ class OC_MEDIA_AMPACHE{
 				$pass=$users[0]['user_password_sha256'];
 				$key=hash('sha256',$time.$pass);
 				if($key==$auth){
+					
 					$token=hash('sha256','oc_media_'.$key);
 					OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
 					$date=date('c');//todo proper update/add/clean dates
@@ -150,6 +151,7 @@ class OC_MEDIA_AMPACHE{
 		$users=$query->execute(array($auth))->fetchAll();
 		if(count($users)>0){
 			OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
+			OC_User::setUserId($users[0]['user_id']);
 			return $users[0]['user_id'];
 		}else{
 			return false;

From dd4765ad1654f1fb52585a093ab3438b0810c88b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:10:40 -0400
Subject: [PATCH 1176/1537] Set filter to empty if not set by Ampache client

---
 apps/media/lib_ampache.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index a041e9a884..4951399fa1 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -71,7 +71,6 @@ class OC_MEDIA_AMPACHE{
 				$pass=$users[0]['user_password_sha256'];
 				$key=hash('sha256',$time.$pass);
 				if($key==$auth){
-					
 					$token=hash('sha256','oc_media_'.$key);
 					OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
 					$date=date('c');//todo proper update/add/clean dates
@@ -273,7 +272,7 @@ class OC_MEDIA_AMPACHE{
 </root>");
 			return;
 		}
-		$filter=$params['filter'];
+		$filter = isset($params['filter']) ? $params['filter'] : '';
 		$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
 		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
 		echo('<?xml version="1.0" encoding="UTF-8"?>');
@@ -402,7 +401,7 @@ class OC_MEDIA_AMPACHE{
 </root>");
 			return;
 		}
-		$filter=$params['filter'];
+		$filter = isset($params['filter']) ? $params['filter'] : '';
 		$artists=OC_MEDIA_COLLECTION::getArtists($filter);
 		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter);
 		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter);

From 6bc45f11f7ec66a610b5cfa50f7621718b770694 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 28 Jul 2012 00:25:13 +0200
Subject: [PATCH 1177/1537] bookmarks.pot and lib.pot added to transifex

---
 l10n/.tx/config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/l10n/.tx/config b/l10n/.tx/config
index 3a0c6c28dc..814fb9a37d 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -36,3 +36,15 @@ file_filter = <lang>/gallery.po
 source_file = templates/gallery.pot
 source_lang = en
 
+[owncloud.bookmarks]
+file_filter = <lang>/bookmarks.po
+source_file = templates/bookmarks.pot
+source_lang = en
+type = PO
+
+[owncloud.lib]
+file_filter = <lang>/lib.po
+source_file = templates/lib.pot
+source_lang = en
+type = PO
+

From fa4052d6f1385647b15aee84456f7ec7484bb04f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 28 Jul 2012 02:05:38 +0200
Subject: [PATCH 1178/1537] [tx-robot] updated from transifex

---
 apps/bookmarks/l10n/fi_FI.php |  12 +
 apps/calendar/l10n/ca.php     |   4 +-
 apps/contacts/l10n/ca.php     |   2 +-
 apps/contacts/l10n/sk_SK.php  |  86 +++-
 l10n/af/bookmarks.po          |  60 +++
 l10n/af/lib.po                | 112 +++++
 l10n/ar/bookmarks.po          |  60 +++
 l10n/ar/lib.po                | 112 +++++
 l10n/ar_SA/bookmarks.po       |  60 +++
 l10n/ar_SA/lib.po             | 112 +++++
 l10n/bg_BG/bookmarks.po       |  60 +++
 l10n/bg_BG/lib.po             | 112 +++++
 l10n/ca/bookmarks.po          |  60 +++
 l10n/ca/calendar.po           |   8 +-
 l10n/ca/contacts.po           |   6 +-
 l10n/ca/lib.po                | 112 +++++
 l10n/ca/settings.po           |  12 +-
 l10n/cs_CZ/bookmarks.po       |  60 +++
 l10n/cs_CZ/lib.po             | 112 +++++
 l10n/da/bookmarks.po          |  60 +++
 l10n/da/lib.po                | 112 +++++
 l10n/de/bookmarks.po          |  60 +++
 l10n/de/lib.po                | 112 +++++
 l10n/de/settings.po           |  13 +-
 l10n/el/bookmarks.po          |  60 +++
 l10n/el/lib.po                | 112 +++++
 l10n/eo/bookmarks.po          |  60 +++
 l10n/eo/lib.po                | 112 +++++
 l10n/es/bookmarks.po          |  60 +++
 l10n/es/lib.po                | 112 +++++
 l10n/et_EE/bookmarks.po       |  60 +++
 l10n/et_EE/lib.po             | 112 +++++
 l10n/eu/bookmarks.po          |  60 +++
 l10n/eu/lib.po                | 112 +++++
 l10n/fa/bookmarks.po          |  60 +++
 l10n/fa/lib.po                | 112 +++++
 l10n/fi_FI/bookmarks.po       |  61 +++
 l10n/fi_FI/lib.po             | 113 +++++
 l10n/fr/bookmarks.po          |  60 +++
 l10n/fr/lib.po                | 112 +++++
 l10n/fr/settings.po           |  12 +-
 l10n/gl/bookmarks.po          |  60 +++
 l10n/gl/lib.po                | 112 +++++
 l10n/he/bookmarks.po          |  60 +++
 l10n/he/lib.po                | 112 +++++
 l10n/hr/bookmarks.po          |  60 +++
 l10n/hr/lib.po                | 112 +++++
 l10n/hu_HU/bookmarks.po       |  60 +++
 l10n/hu_HU/lib.po             | 112 +++++
 l10n/hy/bookmarks.po          |  60 +++
 l10n/hy/lib.po                | 112 +++++
 l10n/ia/bookmarks.po          |  60 +++
 l10n/ia/lib.po                | 112 +++++
 l10n/id/bookmarks.po          |  60 +++
 l10n/id/lib.po                | 112 +++++
 l10n/id_ID/bookmarks.po       |  60 +++
 l10n/id_ID/lib.po             | 112 +++++
 l10n/it/bookmarks.po          |  60 +++
 l10n/it/lib.po                | 112 +++++
 l10n/it/settings.po           |  12 +-
 l10n/ja_JP/bookmarks.po       |  60 +++
 l10n/ja_JP/lib.po             | 112 +++++
 l10n/ko/bookmarks.po          |  60 +++
 l10n/ko/lib.po                | 112 +++++
 l10n/lb/bookmarks.po          |  60 +++
 l10n/lb/lib.po                | 112 +++++
 l10n/lt_LT/bookmarks.po       |  60 +++
 l10n/lt_LT/lib.po             | 112 +++++
 l10n/lv/bookmarks.po          |  60 +++
 l10n/lv/lib.po                | 112 +++++
 l10n/mk/bookmarks.po          |  60 +++
 l10n/mk/lib.po                | 112 +++++
 l10n/ms_MY/bookmarks.po       |  60 +++
 l10n/ms_MY/lib.po             | 112 +++++
 l10n/nb_NO/bookmarks.po       |  60 +++
 l10n/nb_NO/lib.po             | 112 +++++
 l10n/nl/bookmarks.po          |  60 +++
 l10n/nl/lib.po                | 112 +++++
 l10n/nn_NO/bookmarks.po       |  60 +++
 l10n/nn_NO/lib.po             | 112 +++++
 l10n/pl/bookmarks.po          |  60 +++
 l10n/pl/lib.po                | 112 +++++
 l10n/pt_BR/bookmarks.po       |  60 +++
 l10n/pt_BR/lib.po             | 112 +++++
 l10n/pt_PT/bookmarks.po       |  60 +++
 l10n/pt_PT/lib.po             | 112 +++++
 l10n/ro/bookmarks.po          |  60 +++
 l10n/ro/lib.po                | 112 +++++
 l10n/ru/bookmarks.po          |  60 +++
 l10n/ru/lib.po                | 112 +++++
 l10n/sk_SK/bookmarks.po       |  60 +++
 l10n/sk_SK/contacts.po        | 919 ++++++++++++++++++----------------
 l10n/sk_SK/lib.po             | 112 +++++
 l10n/sl/bookmarks.po          |  60 +++
 l10n/sl/lib.po                | 112 +++++
 l10n/so/bookmarks.po          |  60 +++
 l10n/so/lib.po                | 112 +++++
 l10n/sr/bookmarks.po          |  60 +++
 l10n/sr/lib.po                | 112 +++++
 l10n/sr@latin/bookmarks.po    |  60 +++
 l10n/sr@latin/lib.po          | 112 +++++
 l10n/sv/bookmarks.po          |  60 +++
 l10n/sv/lib.po                | 112 +++++
 l10n/templates/bookmarks.pot  |   2 +-
 l10n/templates/calendar.pot   |   2 +-
 l10n/templates/contacts.pot   |   2 +-
 l10n/templates/core.pot       |   2 +-
 l10n/templates/files.pot      |   2 +-
 l10n/templates/gallery.pot    |   2 +-
 l10n/templates/lib.pot        |   2 +-
 l10n/templates/media.pot      |   2 +-
 l10n/templates/settings.pot   |   2 +-
 l10n/th_TH/bookmarks.po       |  60 +++
 l10n/th_TH/lib.po             | 112 +++++
 l10n/tr/bookmarks.po          |  60 +++
 l10n/tr/lib.po                | 112 +++++
 l10n/uk/bookmarks.po          |  60 +++
 l10n/uk/lib.po                | 112 +++++
 l10n/vi/bookmarks.po          |  60 +++
 l10n/vi/lib.po                | 112 +++++
 l10n/zh_CN/bookmarks.po       |  60 +++
 l10n/zh_CN/lib.po             | 112 +++++
 l10n/zh_TW/bookmarks.po       |  60 +++
 l10n/zh_TW/lib.po             | 112 +++++
 lib/l10n/fi_FI.php            |  20 +
 settings/l10n/ca.php          |   3 +
 settings/l10n/de.php          |   3 +
 settings/l10n/fr.php          |   3 +
 settings/l10n/it.php          |   3 +
 129 files changed, 9582 insertions(+), 500 deletions(-)
 create mode 100644 apps/bookmarks/l10n/fi_FI.php
 create mode 100644 l10n/af/bookmarks.po
 create mode 100644 l10n/af/lib.po
 create mode 100644 l10n/ar/bookmarks.po
 create mode 100644 l10n/ar/lib.po
 create mode 100644 l10n/ar_SA/bookmarks.po
 create mode 100644 l10n/ar_SA/lib.po
 create mode 100644 l10n/bg_BG/bookmarks.po
 create mode 100644 l10n/bg_BG/lib.po
 create mode 100644 l10n/ca/bookmarks.po
 create mode 100644 l10n/ca/lib.po
 create mode 100644 l10n/cs_CZ/bookmarks.po
 create mode 100644 l10n/cs_CZ/lib.po
 create mode 100644 l10n/da/bookmarks.po
 create mode 100644 l10n/da/lib.po
 create mode 100644 l10n/de/bookmarks.po
 create mode 100644 l10n/de/lib.po
 create mode 100644 l10n/el/bookmarks.po
 create mode 100644 l10n/el/lib.po
 create mode 100644 l10n/eo/bookmarks.po
 create mode 100644 l10n/eo/lib.po
 create mode 100644 l10n/es/bookmarks.po
 create mode 100644 l10n/es/lib.po
 create mode 100644 l10n/et_EE/bookmarks.po
 create mode 100644 l10n/et_EE/lib.po
 create mode 100644 l10n/eu/bookmarks.po
 create mode 100644 l10n/eu/lib.po
 create mode 100644 l10n/fa/bookmarks.po
 create mode 100644 l10n/fa/lib.po
 create mode 100644 l10n/fi_FI/bookmarks.po
 create mode 100644 l10n/fi_FI/lib.po
 create mode 100644 l10n/fr/bookmarks.po
 create mode 100644 l10n/fr/lib.po
 create mode 100644 l10n/gl/bookmarks.po
 create mode 100644 l10n/gl/lib.po
 create mode 100644 l10n/he/bookmarks.po
 create mode 100644 l10n/he/lib.po
 create mode 100644 l10n/hr/bookmarks.po
 create mode 100644 l10n/hr/lib.po
 create mode 100644 l10n/hu_HU/bookmarks.po
 create mode 100644 l10n/hu_HU/lib.po
 create mode 100644 l10n/hy/bookmarks.po
 create mode 100644 l10n/hy/lib.po
 create mode 100644 l10n/ia/bookmarks.po
 create mode 100644 l10n/ia/lib.po
 create mode 100644 l10n/id/bookmarks.po
 create mode 100644 l10n/id/lib.po
 create mode 100644 l10n/id_ID/bookmarks.po
 create mode 100644 l10n/id_ID/lib.po
 create mode 100644 l10n/it/bookmarks.po
 create mode 100644 l10n/it/lib.po
 create mode 100644 l10n/ja_JP/bookmarks.po
 create mode 100644 l10n/ja_JP/lib.po
 create mode 100644 l10n/ko/bookmarks.po
 create mode 100644 l10n/ko/lib.po
 create mode 100644 l10n/lb/bookmarks.po
 create mode 100644 l10n/lb/lib.po
 create mode 100644 l10n/lt_LT/bookmarks.po
 create mode 100644 l10n/lt_LT/lib.po
 create mode 100644 l10n/lv/bookmarks.po
 create mode 100644 l10n/lv/lib.po
 create mode 100644 l10n/mk/bookmarks.po
 create mode 100644 l10n/mk/lib.po
 create mode 100644 l10n/ms_MY/bookmarks.po
 create mode 100644 l10n/ms_MY/lib.po
 create mode 100644 l10n/nb_NO/bookmarks.po
 create mode 100644 l10n/nb_NO/lib.po
 create mode 100644 l10n/nl/bookmarks.po
 create mode 100644 l10n/nl/lib.po
 create mode 100644 l10n/nn_NO/bookmarks.po
 create mode 100644 l10n/nn_NO/lib.po
 create mode 100644 l10n/pl/bookmarks.po
 create mode 100644 l10n/pl/lib.po
 create mode 100644 l10n/pt_BR/bookmarks.po
 create mode 100644 l10n/pt_BR/lib.po
 create mode 100644 l10n/pt_PT/bookmarks.po
 create mode 100644 l10n/pt_PT/lib.po
 create mode 100644 l10n/ro/bookmarks.po
 create mode 100644 l10n/ro/lib.po
 create mode 100644 l10n/ru/bookmarks.po
 create mode 100644 l10n/ru/lib.po
 create mode 100644 l10n/sk_SK/bookmarks.po
 create mode 100644 l10n/sk_SK/lib.po
 create mode 100644 l10n/sl/bookmarks.po
 create mode 100644 l10n/sl/lib.po
 create mode 100644 l10n/so/bookmarks.po
 create mode 100644 l10n/so/lib.po
 create mode 100644 l10n/sr/bookmarks.po
 create mode 100644 l10n/sr/lib.po
 create mode 100644 l10n/sr@latin/bookmarks.po
 create mode 100644 l10n/sr@latin/lib.po
 create mode 100644 l10n/sv/bookmarks.po
 create mode 100644 l10n/sv/lib.po
 create mode 100644 l10n/th_TH/bookmarks.po
 create mode 100644 l10n/th_TH/lib.po
 create mode 100644 l10n/tr/bookmarks.po
 create mode 100644 l10n/tr/lib.po
 create mode 100644 l10n/uk/bookmarks.po
 create mode 100644 l10n/uk/lib.po
 create mode 100644 l10n/vi/bookmarks.po
 create mode 100644 l10n/vi/lib.po
 create mode 100644 l10n/zh_CN/bookmarks.po
 create mode 100644 l10n/zh_CN/lib.po
 create mode 100644 l10n/zh_TW/bookmarks.po
 create mode 100644 l10n/zh_TW/lib.po
 create mode 100644 lib/l10n/fi_FI.php

diff --git a/apps/bookmarks/l10n/fi_FI.php b/apps/bookmarks/l10n/fi_FI.php
new file mode 100644
index 0000000000..c814747411
--- /dev/null
+++ b/apps/bookmarks/l10n/fi_FI.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Kirjanmerkit",
+"unnamed" => "nimetön",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:",
+"Read later" => "Lue myöhemmin",
+"Address" => "Osoite",
+"Title" => "Otsikko",
+"Tags" => "Tunnisteet",
+"Save bookmark" => "Tallenna kirjanmerkki",
+"You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
+"Bookmarklet <br />" => "Kirjanmerkitsin <br />"
+);
diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index 2d298a31a4..d999eaf473 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -183,12 +183,12 @@
 "12h" => "12h",
 "First day of the week" => "Primer dia de la setmana",
 "Cache" => "Memòria de cau",
-"Clear cache for repeating events" => "Neteja la memòria de cau pels esdveniments amb repetició",
+"Clear cache for repeating events" => "Neteja la memòria de cau pels esdeveniments amb repetició",
 "Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact et al)",
 "iOS/OS X" => "IOS/OS X",
-"Read only iCalendar link(s)" => "Enllaç(os) del calendari només de lectura",
+"Read only iCalendar link(s)" => "Enllaç(os) iCalendar només de lectura",
 "Users" => "Usuaris",
 "select users" => "seleccioneu usuaris",
 "Editable" => "Editable",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 285f96e64a..256182f02c 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -206,5 +206,5 @@
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Enllaç(os) només de lectura vCard"
+"Read only vCard directory link(s)" => "Enllaç(os) vCard només de lectura"
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 6e5ebe3bd3..79db2dbcf6 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
 "There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
+"element name is not set." => "meno elementu nie je nastavené.",
+"id is not set." => "ID nie je nastavené.",
 "Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
 "At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
 "Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
-"Error adding contact property." => "Chyba pridania údaju kontaktu",
 "No ID provided" => "ID nezadané",
 "Error setting checksum." => "Chyba pri nastavovaní kontrolného súčtu.",
 "No categories selected for deletion." => "Žiadne kategórie neboli vybraté na odstránenie.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Žiadne kontakty nenájdené.",
 "Missing ID" => "Chýba ID",
 "Error parsing VCard for ID: \"" => "Chyba pri vyňatí ID z VCard:",
-"Cannot add addressbook with an empty name." => "Nedá sa pridať adresár s prázdnym menom.",
-"Error adding addressbook." => "Chyba počas pridávania adresára.",
-"Error activating addressbook." => "Chyba aktivovania adresára.",
 "No contact ID was submitted." => "Nebolo nastavené ID kontaktu.",
 "Error reading contact photo." => "Chyba pri čítaní fotky kontaktu.",
 "Error saving temporary file." => "Chyba pri ukladaní dočasného súboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
-"id is not set." => "ID nie je nastavené.",
 "Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
 "Error deleting contact property." => "Chyba odstránenia údaju kontaktu.",
 "Contact ID is missing." => "Chýba ID kontaktu.",
-"Missing contact id." => "Chýba ID kontaktu.",
 "No photo path was submitted." => "Žiadna fotka nebola poslaná.",
 "File doesn't exist:" => "Súbor neexistuje:",
 "Error loading image." => "Chyba pri nahrávaní obrázka.",
-"element name is not set." => "meno elementu nie je nastavené.",
+"Error getting contact object." => "Chyba počas prevzatia objektu kontakt.",
+"Error getting PHOTO property." => "Chyba počas získavania fotky.",
+"Error saving contact." => "Chyba počas ukladania kontaktu.",
+"Error resizing image" => "Chyba počas zmeny obrázku.",
+"Error cropping image" => "Chyba počas orezania obrázku.",
+"Error creating temporary image" => "Chyba počas vytvárania dočasného obrázku.",
+"Error finding image: " => "Chyba vyhľadania obrázku: ",
 "checksum is not set." => "kontrolný súčet nie je nastavený.",
 "Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Niečo sa pokazilo.",
@@ -41,8 +43,27 @@
 "The uploaded file was only partially uploaded" => "Ukladaný súbor sa nahral len čiastočne",
 "No file was uploaded" => "Žiadny súbor nebol uložený",
 "Missing a temporary folder" => "Chýba dočasný priečinok",
+"Couldn't save temporary image: " => "Nemôžem uložiť dočasný obrázok: ",
+"Couldn't load temporary image: " => "Nemôžem načítať dočasný obrázok: ",
+"No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
 "Contacts" => "Kontakty",
-"Drop a VCF file to import contacts." => "Pretiahnite VCF súbor pre import kontaktov.",
+"Sorry, this functionality has not been implemented yet" => "Bohužiaľ, táto funkcia ešte nebola implementovaná",
+"Not implemented" => "Neimplementované",
+"Couldn't get a valid address." => "Nemôžem získať platnú adresu.",
+"Error" => "Chyba",
+"Contact" => "Kontakt",
+"New" => "Nový",
+"New Contact" => "Nový kontakt",
+"This property has to be non-empty." => "Tento parameter nemôže byť prázdny.",
+"Couldn't serialize elements." => "Nemôžem previesť prvky.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org",
+"Edit name" => "Upraviť meno",
+"No files selected for upload." => "Žiadne súbory neboli vybrané k nahratiu",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť.",
+"Select type" => "Vybrať typ",
+"Result: " => "Výsledok: ",
+" imported, " => " importovaných, ",
+" failed." => " zlyhaných.",
 "Addressbook not found." => "Adresár sa nenašiel.",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
@@ -60,25 +81,44 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Narodeniny",
+"Business" => "Biznis",
+"Clients" => "Klienti",
+"Holidays" => "Prázdniny",
+"Meeting" => "Stretnutie",
+"Other" => "Iné",
+"Projects" => "Projekty",
+"Questions" => "Otázky",
 "{name}'s Birthday" => "Narodeniny {name}",
-"Contact" => "Kontakt",
 "Add Contact" => "Pridať Kontakt.",
+"Import" => "Importovať",
 "Addressbooks" => "Adresáre",
+"Close" => "Zatvoriť",
+"Keyboard shortcuts" => "Klávesové skratky",
+"Navigation" => "Navigácia",
+"Next contact in list" => "Ďalší kontakt v zozname",
+"Previous contact in list" => "Predchádzajúci kontakt v zozname",
+"Next/previous addressbook" => "Ďalší/predošlí adresár",
+"Actions" => "Akcie",
+"Refresh contacts list" => "Obnov zoznam kontaktov",
+"Add new contact" => "Pridaj nový kontakt",
+"Add new addressbook" => "Pridaj nový adresár",
+"Delete current contact" => "Vymaž súčasný kontakt",
 "Configure Address Books" => "Nastaviť adresáre",
 "New Address Book" => "Nový adresár",
-"Import from VCF" => "Importovať z VCF",
 "CardDav Link" => "CardDav odkaz",
 "Download" => "Stiahnuť",
 "Edit" => "Upraviť",
 "Delete" => "Odstrániť",
-"Download contact" => "Stiahnuť kontakt",
-"Delete contact" => "Odstrániť kontakt",
 "Drop photo to upload" => "Pretiahnite sem fotku pre nahratie",
+"Delete current photo" => "Odstrániť súčasnú fotku",
+"Edit current photo" => "Upraviť súčasnú fotku",
+"Upload new photo" => "Nahrať novú fotku",
+"Select photo from ownCloud" => "Vybrať fotku z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami",
 "Edit name details" => "Upraviť podrobnosti mena",
 "Nickname" => "Prezývka",
 "Enter nickname" => "Zadajte prezývku",
-"Birthday" => "Narodeniny",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupiny",
 "Separate groups with commas" => "Oddelte skupiny čiarkami",
@@ -94,24 +134,22 @@
 "Edit address details" => "Upraviť podrobnosti adresy",
 "Add notes here." => "Tu môžete pridať poznámky.",
 "Add field" => "Pridať pole",
-"Profile picture" => "Profilová fotka",
 "Phone" => "Telefón",
 "Note" => "Poznámka",
-"Delete current photo" => "Odstrániť súčasnú fotku",
-"Edit current photo" => "Upraviť súčasnú fotku",
-"Upload new photo" => "Nahrať novú fotku",
-"Select photo from ownCloud" => "Vybrať fotku z ownCloud",
+"Download contact" => "Stiahnuť kontakt",
+"Delete contact" => "Odstrániť kontakt",
+"The temporary image has been removed from cache." => "Dočasný obrázok bol odstránený z cache.",
 "Edit address" => "Upraviť adresu",
 "Type" => "Typ",
 "PO Box" => "PO Box",
+"Street address" => "Ulica",
+"Street and number" => "Ulica a číslo",
 "Extended" => "Rozšírené",
-"Street" => "Ulica",
 "City" => "Mesto",
 "Region" => "Región",
 "Zipcode" => "PSČ",
+"Postal code" => "PSČ",
 "Country" => "Krajina",
-"Edit categories" => "Upraviť kategórie",
-"Add" => "Pridať",
 "Addressbook" => "Adresár",
 "Hon. prefixes" => "Tituly pred",
 "Miss" => "Slečna",
@@ -126,6 +164,8 @@
 "Hon. suffixes" => "Tituly za",
 "J.D." => "JUDr.",
 "M.D." => "MUDr.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
 "Ph.D." => "Ph.D.",
 "Esq." => "Esq.",
 "Jr." => "ml.",
@@ -141,13 +181,11 @@
 "Please choose the addressbook" => "Prosím zvolte adresár",
 "create a new addressbook" => "vytvoriť nový adresár",
 "Name of new addressbook" => "Meno nového adresára",
-"Import" => "Importovať",
 "Importing contacts" => "Importovanie kontaktov",
-"Select address book to import to:" => "Vyberte adresár, do ktorého chcete importovať:",
-"Select from HD" => "Vyberte z pevného disku",
 "You have no contacts in your addressbook." => "Nemáte žiadne kontakty v adresári.",
 "Add contact" => "Pridať kontakt",
 "Configure addressbooks" => "Nastaviť adresáre",
+"Enter name" => "Zadaj meno",
 "CardDAV syncing addresses" => "Adresy pre synchronizáciu s CardDAV",
 "more info" => "viac informácií",
 "Primary address (Kontact et al)" => "Predvolená adresa (Kontakt etc)",
diff --git a/l10n/af/bookmarks.po b/l10n/af/bookmarks.po
new file mode 100644
index 0000000000..f9c5316dd5
--- /dev/null
+++ b/l10n/af/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/af/lib.po b/l10n/af/lib.po
new file mode 100644
index 0000000000..a5cbac2624
--- /dev/null
+++ b/l10n/af/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ar/bookmarks.po b/l10n/ar/bookmarks.po
new file mode 100644
index 0000000000..50d8ccbf67
--- /dev/null
+++ b/l10n/ar/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
new file mode 100644
index 0000000000..36dea95d34
--- /dev/null
+++ b/l10n/ar/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ar_SA/bookmarks.po b/l10n/ar_SA/bookmarks.po
new file mode 100644
index 0000000000..476c475f46
--- /dev/null
+++ b/l10n/ar_SA/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ar_SA/lib.po b/l10n/ar_SA/lib.po
new file mode 100644
index 0000000000..1d1cba42b7
--- /dev/null
+++ b/l10n/ar_SA/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/bg_BG/bookmarks.po b/l10n/bg_BG/bookmarks.po
new file mode 100644
index 0000000000..7375ecb18e
--- /dev/null
+++ b/l10n/bg_BG/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
new file mode 100644
index 0000000000..04f21db7de
--- /dev/null
+++ b/l10n/bg_BG/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ca/bookmarks.po b/l10n/ca/bookmarks.po
new file mode 100644
index 0000000000..4dc33835a3
--- /dev/null
+++ b/l10n/ca/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index a8a5c77878..e5c6761343 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 10:41+0000\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 06:17+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -769,7 +769,7 @@ msgstr "Memòria de cau"
 
 #: templates/settings.php:48
 msgid "Clear cache for repeating events"
-msgstr "Neteja la memòria de cau pels esdveniments amb repetició"
+msgstr "Neteja la memòria de cau pels esdeveniments amb repetició"
 
 #: templates/settings.php:53
 msgid "Calendar CalDAV syncing addresses"
@@ -789,7 +789,7 @@ msgstr "IOS/OS X"
 
 #: templates/settings.php:59
 msgid "Read only iCalendar link(s)"
-msgstr "Enllaç(os) del calendari només de lectura"
+msgstr "Enllaç(os) iCalendar només de lectura"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 507042e9ce..5d7e0b0fc2 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 10:52+0000\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 06:18+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -870,4 +870,4 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:10
 msgid "Read only vCard directory link(s)"
-msgstr "Enllaç(os) només de lectura vCard"
+msgstr "Enllaç(os) vCard només de lectura"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
new file mode 100644
index 0000000000..2d23400a99
--- /dev/null
+++ b/l10n/ca/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 8629118121..43be7c44b6 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 06:08+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "Sol.licitud no vàlida"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Error d'autenticació"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -205,7 +205,7 @@ msgstr "Altre"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -213,7 +213,7 @@ msgstr "Quota"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "SubAdmin per a ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/cs_CZ/bookmarks.po b/l10n/cs_CZ/bookmarks.po
new file mode 100644
index 0000000000..74239f80fa
--- /dev/null
+++ b/l10n/cs_CZ/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
new file mode 100644
index 0000000000..2d67565ff5
--- /dev/null
+++ b/l10n/cs_CZ/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/da/bookmarks.po b/l10n/da/bookmarks.po
new file mode 100644
index 0000000000..7d336705b2
--- /dev/null
+++ b/l10n/da/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
new file mode 100644
index 0000000000..8d65f903fe
--- /dev/null
+++ b/l10n/da/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/de/bookmarks.po b/l10n/de/bookmarks.po
new file mode 100644
index 0000000000..a00546e020
--- /dev/null
+++ b/l10n/de/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
new file mode 100644
index 0000000000..1230fa0545
--- /dev/null
+++ b/l10n/de/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 9051386acc..85ded96f8c 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -8,14 +8,15 @@
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 05:12+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "Ungültige Anfrage"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Anmeldungsfehler"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -209,7 +210,7 @@ msgstr "andere"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "Unteradministrator"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -217,7 +218,7 @@ msgstr "Quota"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "Unteradministrator für..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/el/bookmarks.po b/l10n/el/bookmarks.po
new file mode 100644
index 0000000000..a5f983f2bf
--- /dev/null
+++ b/l10n/el/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
new file mode 100644
index 0000000000..9f817d1a46
--- /dev/null
+++ b/l10n/el/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/eo/bookmarks.po b/l10n/eo/bookmarks.po
new file mode 100644
index 0000000000..4df36ca031
--- /dev/null
+++ b/l10n/eo/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
new file mode 100644
index 0000000000..c4d6f1228b
--- /dev/null
+++ b/l10n/eo/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/es/bookmarks.po b/l10n/es/bookmarks.po
new file mode 100644
index 0000000000..7cd3e5bf34
--- /dev/null
+++ b/l10n/es/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
new file mode 100644
index 0000000000..870f4ec141
--- /dev/null
+++ b/l10n/es/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/et_EE/bookmarks.po b/l10n/et_EE/bookmarks.po
new file mode 100644
index 0000000000..0370bec552
--- /dev/null
+++ b/l10n/et_EE/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
new file mode 100644
index 0000000000..c170dc40f9
--- /dev/null
+++ b/l10n/et_EE/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/eu/bookmarks.po b/l10n/eu/bookmarks.po
new file mode 100644
index 0000000000..d443167a5b
--- /dev/null
+++ b/l10n/eu/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
new file mode 100644
index 0000000000..f8625e4759
--- /dev/null
+++ b/l10n/eu/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/fa/bookmarks.po b/l10n/fa/bookmarks.po
new file mode 100644
index 0000000000..1a79cdbe0a
--- /dev/null
+++ b/l10n/fa/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
new file mode 100644
index 0000000000..f0abd9d4d8
--- /dev/null
+++ b/l10n/fa/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/fi_FI/bookmarks.po b/l10n/fi_FI/bookmarks.po
new file mode 100644
index 0000000000..70bd07ab62
--- /dev/null
+++ b/l10n/fi_FI/bookmarks.po
@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:21+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr "nimetön"
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:"
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr "Lue myöhemmin"
+
+#: templates/list.php:13
+msgid "Address"
+msgstr "Osoite"
+
+#: templates/list.php:14
+msgid "Title"
+msgstr "Otsikko"
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr "Tunnisteet"
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr "Tallenna kirjanmerkki"
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr "Sinulla ei ole kirjanmerkkejä"
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr "Kirjanmerkitsin <br />"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
new file mode 100644
index 0000000000..8191bf7710
--- /dev/null
+++ b/l10n/fi_FI/lib.po
@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:27+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr "Ohje"
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr "Asetukset"
+
+#: app.php:304
+msgid "Users"
+msgstr "Käyttäjät"
+
+#: app.php:311
+msgid "Apps"
+msgstr "Sovellukset"
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr "ZIP-lataus on poistettu käytöstä."
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr "Tiedostot on ladattava yksittäin."
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr "Takaisin tiedostoihin"
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr "sekuntia sitten"
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr "1 minuutti sitten"
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr "%d minuuttia sitten"
+
+#: template.php:91
+msgid "today"
+msgstr "tänään"
+
+#: template.php:92
+msgid "yesterday"
+msgstr "eilen"
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr "%d päivää sitten"
+
+#: template.php:94
+msgid "last month"
+msgstr "viime kuussa"
+
+#: template.php:95
+msgid "months ago"
+msgstr "kuukautta sitten"
+
+#: template.php:96
+msgid "last year"
+msgstr "viime vuonna"
+
+#: template.php:97
+msgid "years ago"
+msgstr "vuotta sitten"
diff --git a/l10n/fr/bookmarks.po b/l10n/fr/bookmarks.po
new file mode 100644
index 0000000000..ba57cdc64f
--- /dev/null
+++ b/l10n/fr/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
new file mode 100644
index 0000000000..90c10f690e
--- /dev/null
+++ b/l10n/fr/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 5cfd59dbba..a519d0f7b9 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 10:05+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Requête invalide"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Erreur d'authentification"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -210,7 +210,7 @@ msgstr "Autre"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -218,7 +218,7 @@ msgstr "Quota"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "SubAdmin pour ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/gl/bookmarks.po b/l10n/gl/bookmarks.po
new file mode 100644
index 0000000000..9086620a94
--- /dev/null
+++ b/l10n/gl/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
new file mode 100644
index 0000000000..2e675b5678
--- /dev/null
+++ b/l10n/gl/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/he/bookmarks.po b/l10n/he/bookmarks.po
new file mode 100644
index 0000000000..14546978e0
--- /dev/null
+++ b/l10n/he/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
new file mode 100644
index 0000000000..78686b991a
--- /dev/null
+++ b/l10n/he/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/hr/bookmarks.po b/l10n/hr/bookmarks.po
new file mode 100644
index 0000000000..b9e98477cf
--- /dev/null
+++ b/l10n/hr/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
new file mode 100644
index 0000000000..d38126e621
--- /dev/null
+++ b/l10n/hr/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/hu_HU/bookmarks.po b/l10n/hu_HU/bookmarks.po
new file mode 100644
index 0000000000..4fe0e566ab
--- /dev/null
+++ b/l10n/hu_HU/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
new file mode 100644
index 0000000000..cd149d946d
--- /dev/null
+++ b/l10n/hu_HU/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/hy/bookmarks.po b/l10n/hy/bookmarks.po
new file mode 100644
index 0000000000..74aef26301
--- /dev/null
+++ b/l10n/hy/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
new file mode 100644
index 0000000000..1a8aea0ebb
--- /dev/null
+++ b/l10n/hy/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ia/bookmarks.po b/l10n/ia/bookmarks.po
new file mode 100644
index 0000000000..1848a204c0
--- /dev/null
+++ b/l10n/ia/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
new file mode 100644
index 0000000000..4950811110
--- /dev/null
+++ b/l10n/ia/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/id/bookmarks.po b/l10n/id/bookmarks.po
new file mode 100644
index 0000000000..d9e1fba3ac
--- /dev/null
+++ b/l10n/id/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
new file mode 100644
index 0000000000..6c8b5a8c49
--- /dev/null
+++ b/l10n/id/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/id_ID/bookmarks.po b/l10n/id_ID/bookmarks.po
new file mode 100644
index 0000000000..f954c1e8a4
--- /dev/null
+++ b/l10n/id_ID/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/id_ID/lib.po b/l10n/id_ID/lib.po
new file mode 100644
index 0000000000..62fef73ca0
--- /dev/null
+++ b/l10n/id_ID/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/it/bookmarks.po b/l10n/it/bookmarks.po
new file mode 100644
index 0000000000..501cb1181c
--- /dev/null
+++ b/l10n/it/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
new file mode 100644
index 0000000000..f930daa0b6
--- /dev/null
+++ b/l10n/it/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 47885e9b06..475f87fd92 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 05:39+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Richiesta non valida"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Errore di autenticazione"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -210,7 +210,7 @@ msgstr "Altro"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -218,7 +218,7 @@ msgstr "Quote"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "SubAdmin per..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/ja_JP/bookmarks.po b/l10n/ja_JP/bookmarks.po
new file mode 100644
index 0000000000..a708697103
--- /dev/null
+++ b/l10n/ja_JP/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
new file mode 100644
index 0000000000..30b5055623
--- /dev/null
+++ b/l10n/ja_JP/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ko/bookmarks.po b/l10n/ko/bookmarks.po
new file mode 100644
index 0000000000..1992ba3b14
--- /dev/null
+++ b/l10n/ko/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
new file mode 100644
index 0000000000..2308a069de
--- /dev/null
+++ b/l10n/ko/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/lb/bookmarks.po b/l10n/lb/bookmarks.po
new file mode 100644
index 0000000000..024a705e24
--- /dev/null
+++ b/l10n/lb/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
new file mode 100644
index 0000000000..bb55ec5a6f
--- /dev/null
+++ b/l10n/lb/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/lt_LT/bookmarks.po b/l10n/lt_LT/bookmarks.po
new file mode 100644
index 0000000000..fbda0e4853
--- /dev/null
+++ b/l10n/lt_LT/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
new file mode 100644
index 0000000000..11f020d545
--- /dev/null
+++ b/l10n/lt_LT/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/lv/bookmarks.po b/l10n/lv/bookmarks.po
new file mode 100644
index 0000000000..2114fcd31a
--- /dev/null
+++ b/l10n/lv/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
new file mode 100644
index 0000000000..40959dcc42
--- /dev/null
+++ b/l10n/lv/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/mk/bookmarks.po b/l10n/mk/bookmarks.po
new file mode 100644
index 0000000000..547a2c5da2
--- /dev/null
+++ b/l10n/mk/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
new file mode 100644
index 0000000000..713abb126d
--- /dev/null
+++ b/l10n/mk/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ms_MY/bookmarks.po b/l10n/ms_MY/bookmarks.po
new file mode 100644
index 0000000000..06c58f9a86
--- /dev/null
+++ b/l10n/ms_MY/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
new file mode 100644
index 0000000000..cd3b8e2f80
--- /dev/null
+++ b/l10n/ms_MY/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/nb_NO/bookmarks.po b/l10n/nb_NO/bookmarks.po
new file mode 100644
index 0000000000..65673a48ac
--- /dev/null
+++ b/l10n/nb_NO/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
new file mode 100644
index 0000000000..dada31bd02
--- /dev/null
+++ b/l10n/nb_NO/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/nl/bookmarks.po b/l10n/nl/bookmarks.po
new file mode 100644
index 0000000000..7aa6cc6bfc
--- /dev/null
+++ b/l10n/nl/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
new file mode 100644
index 0000000000..fbe8ced9f7
--- /dev/null
+++ b/l10n/nl/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/nn_NO/bookmarks.po b/l10n/nn_NO/bookmarks.po
new file mode 100644
index 0000000000..0eb3cfe7ed
--- /dev/null
+++ b/l10n/nn_NO/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
new file mode 100644
index 0000000000..17b3f9e58d
--- /dev/null
+++ b/l10n/nn_NO/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/pl/bookmarks.po b/l10n/pl/bookmarks.po
new file mode 100644
index 0000000000..4eee797945
--- /dev/null
+++ b/l10n/pl/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
new file mode 100644
index 0000000000..5b7d557a68
--- /dev/null
+++ b/l10n/pl/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/pt_BR/bookmarks.po b/l10n/pt_BR/bookmarks.po
new file mode 100644
index 0000000000..e574ace5f8
--- /dev/null
+++ b/l10n/pt_BR/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
new file mode 100644
index 0000000000..d9a3c6dbc4
--- /dev/null
+++ b/l10n/pt_BR/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/pt_PT/bookmarks.po b/l10n/pt_PT/bookmarks.po
new file mode 100644
index 0000000000..b4ba2758a3
--- /dev/null
+++ b/l10n/pt_PT/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
new file mode 100644
index 0000000000..70d233eab3
--- /dev/null
+++ b/l10n/pt_PT/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ro/bookmarks.po b/l10n/ro/bookmarks.po
new file mode 100644
index 0000000000..e02fd456c9
--- /dev/null
+++ b/l10n/ro/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
new file mode 100644
index 0000000000..b0fd2256d6
--- /dev/null
+++ b/l10n/ro/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ru/bookmarks.po b/l10n/ru/bookmarks.po
new file mode 100644
index 0000000000..151205b731
--- /dev/null
+++ b/l10n/ru/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
new file mode 100644
index 0000000000..97723dd617
--- /dev/null
+++ b/l10n/ru/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/sk_SK/bookmarks.po b/l10n/sk_SK/bookmarks.po
new file mode 100644
index 0000000000..1f1343ccd6
--- /dev/null
+++ b/l10n/sk_SK/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index 5f8e53bfa1..d7a7d820f8 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -5,105 +5,102 @@
 # Translators:
 #   <intense.feel@gmail.com>, 2012.
 # Roman Priesol <roman@priesol.net>, 2012.
+#   <zixo@zixo.sk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 21:49+0000\n"
+"Last-Translator: zixo <zixo@zixo.sk>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Chyba (de)aktivácie adresára."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "meno elementu nie je nastavené."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID nie je nastavené."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nemôžem pridať prázdny údaj."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Musí byť uvedený aspoň jeden adresný údaj."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Pokúšate sa pridať rovnaký atribút:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Chyba pridania údaju kontaktu"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadané"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Chyba pri nastavovaní kontrolného súčtu."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Žiadne kategórie neboli vybraté na odstránenie."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Žiadny adresár nenájdený."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Žiadne kontakty nenájdené."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Chýba ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba pri vyňatí ID z VCard:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nedá sa pridať adresár s prázdnym menom."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Chyba počas pridávania adresára."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Chyba aktivovania adresára."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nebolo nastavené ID kontaktu."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr "Chyba pri čítaní fotky kontaktu."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Chyba pri ukladaní dočasného súboru."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID nie je nastavené."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
@@ -112,328 +109,387 @@ msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 msgid "Error deleting contact property."
 msgstr "Chyba odstránenia údaju kontaktu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Chýba ID kontaktu."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Chýba ID kontaktu."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Žiadna fotka nebola poslaná."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Súbor neexistuje:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Chyba pri nahrávaní obrázka."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Chyba počas prevzatia objektu kontakt."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Chyba počas získavania fotky."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Chyba vyhľadania obrázku: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "meno elementu nie je nastavené."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrolný súčet nie je nastavený."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nedá sa upraviť adresár s prázdnym menom."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Chyba aktualizácie adresára."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla sa žiadna chyba, súbor úspešne uložené."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Nemôžem uložiť dočasný obrázok: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Nemôžem načítať dočasný obrázok: "
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "Neimplementované"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Nemôžem získať platnú adresu."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Pretiahnite VCF súbor pre import kontaktov."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Adresár sa nenašiel."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Toto nie je váš adresár."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kontakt nebol nájdený."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adresa"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefón"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-mail"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organizácia"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Práca"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Domov"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "SMS"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Odkazová schránka"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Správa"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Narodeniny {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Nový"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Nový kontakt"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Tento parameter nemôže byť prázdny."
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "Nemôžem previesť prvky."
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Upraviť meno"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "Žiadne súbory neboli vybrané k nahratiu"
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Vybrať typ"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Výsledok: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importovaných, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " zlyhaných."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "Adresár sa nenašiel."
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Toto nie je váš adresár."
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "Kontakt nebol nájdený."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adresa"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Telefón"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organizácia"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Práca"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Domov"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Odkazová schránka"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Správa"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Narodeniny"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Biznis"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Klienti"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Prázdniny"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr "Stretnutie"
+
+#: lib/app.php:179
+msgid "Other"
+msgstr "Iné"
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr "Projekty"
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr "Otázky"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Narodeniny {name}"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Importovať"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Adresáre"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Zatvoriť"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr "Klávesové skratky"
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr "Navigácia"
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr "Ďalší kontakt v zozname"
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr "Predchádzajúci kontakt v zozname"
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr "Ďalší/predošlí adresár"
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr "Akcie"
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr "Obnov zoznam kontaktov"
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr "Pridaj nový kontakt"
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Pridaj nový adresár"
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr "Vymaž súčasný kontakt"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Nastaviť adresáre"
@@ -442,11 +498,7 @@ msgstr "Nastaviť adresáre"
 msgid "New Address Book"
 msgstr "Nový adresár"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importovať z VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav odkaz"
@@ -460,186 +512,195 @@ msgid "Edit"
 msgstr "Upraviť"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Stiahnuť kontakt"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Odstrániť kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Pretiahnite sem fotku pre nahratie"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Upraviť podrobnosti mena"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Prezývka"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Zadajte prezývku"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Narodeniny"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd. mm. yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Skupiny"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Oddelte skupiny čiarkami"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Úprava skupín"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Uprednostňované"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Prosím zadajte platnú e-mailovú adresu."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Zadajte e-mailové adresy"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Odoslať na adresu"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Odstrániť e-mailové adresy"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Zadajte telefónne číslo"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Odstrániť telefónne číslo"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Zobraziť na mape"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Upraviť podrobnosti adresy"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Tu môžete pridať poznámky."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Pridať pole"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilová fotka"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefón"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Poznámka"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Odstrániť súčasnú fotku"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Upraviť súčasnú fotku"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Nahrať novú fotku"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Upraviť podrobnosti mena"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Prezývka"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Zadajte prezývku"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd. mm. yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Skupiny"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Oddelte skupiny čiarkami"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Úprava skupín"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Uprednostňované"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Prosím zadajte platnú e-mailovú adresu."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Zadajte e-mailové adresy"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Odoslať na adresu"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Odstrániť e-mailové adresy"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Zadajte telefónne číslo"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Odstrániť telefónne číslo"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Zobraziť na mape"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Upraviť podrobnosti adresy"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Tu môžete pridať poznámky."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Pridať pole"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefón"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Poznámka"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Stiahnuť kontakt"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Odstrániť kontakt"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Dočasný obrázok bol odstránený z cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Upraviť adresu"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "PO Box"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Ulica"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Ulica a číslo"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Rozšírené"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Mesto"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Región"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "PSČ"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "PSČ"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Krajina"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Upraviť kategórie"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Pridať"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresár"
@@ -698,11 +759,11 @@ msgstr "MUDr."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
@@ -745,7 +806,6 @@ msgid "Submit"
 msgstr "Odoslať"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -765,33 +825,10 @@ msgstr "vytvoriť nový adresár"
 msgid "Name of new addressbook"
 msgstr "Meno nového adresára"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importovať"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importovanie kontaktov"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vyberte adresár, do ktorého chcete importovať:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vyberte z pevného disku"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žiadne kontakty v adresári."
@@ -804,6 +841,18 @@ msgstr "Pridať kontakt"
 msgid "Configure addressbooks"
 msgstr "Nastaviť adresáre"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "Zadaj meno"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "Adresy pre synchronizáciu s CardDAV"
@@ -819,3 +868,7 @@ msgstr "Predvolená adresa (Kontakt etc)"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
new file mode 100644
index 0000000000..1e1e954af8
--- /dev/null
+++ b/l10n/sk_SK/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/sl/bookmarks.po b/l10n/sl/bookmarks.po
new file mode 100644
index 0000000000..addf9cb165
--- /dev/null
+++ b/l10n/sl/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
new file mode 100644
index 0000000000..1b75d8d051
--- /dev/null
+++ b/l10n/sl/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/so/bookmarks.po b/l10n/so/bookmarks.po
new file mode 100644
index 0000000000..63be2e2801
--- /dev/null
+++ b/l10n/so/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/so/lib.po b/l10n/so/lib.po
new file mode 100644
index 0000000000..a9d32f6949
--- /dev/null
+++ b/l10n/so/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/sr/bookmarks.po b/l10n/sr/bookmarks.po
new file mode 100644
index 0000000000..c0abe8d98b
--- /dev/null
+++ b/l10n/sr/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
new file mode 100644
index 0000000000..2ee133933b
--- /dev/null
+++ b/l10n/sr/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/sr@latin/bookmarks.po b/l10n/sr@latin/bookmarks.po
new file mode 100644
index 0000000000..e78fc1875c
--- /dev/null
+++ b/l10n/sr@latin/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
new file mode 100644
index 0000000000..7b9a1d577a
--- /dev/null
+++ b/l10n/sr@latin/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/sv/bookmarks.po b/l10n/sv/bookmarks.po
new file mode 100644
index 0000000000..f08502dd14
--- /dev/null
+++ b/l10n/sv/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
new file mode 100644
index 0000000000..7078e2cdb0
--- /dev/null
+++ b/l10n/sv/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index ad981106b9..3ec283b080 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:01+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index afbeda74eb..cfdab722b6 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index f398764150..4ff7729e08 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 6e2f9257a8..3581e9fd9b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d73c91f0eb..43182f333d 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 744a280635..4acfa253ec 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 847ecdf872..2dabe2fa37 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 33d07d122c..001bda203f 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 2f77cd01e5..053de66e30 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/bookmarks.po b/l10n/th_TH/bookmarks.po
new file mode 100644
index 0000000000..e5a515c7dc
--- /dev/null
+++ b/l10n/th_TH/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
new file mode 100644
index 0000000000..2a9f5b46d5
--- /dev/null
+++ b/l10n/th_TH/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/tr/bookmarks.po b/l10n/tr/bookmarks.po
new file mode 100644
index 0000000000..34e76f301d
--- /dev/null
+++ b/l10n/tr/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
new file mode 100644
index 0000000000..a1b4a5a664
--- /dev/null
+++ b/l10n/tr/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/uk/bookmarks.po b/l10n/uk/bookmarks.po
new file mode 100644
index 0000000000..2183661f9f
--- /dev/null
+++ b/l10n/uk/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
new file mode 100644
index 0000000000..fd95f1c130
--- /dev/null
+++ b/l10n/uk/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/vi/bookmarks.po b/l10n/vi/bookmarks.po
new file mode 100644
index 0000000000..38181e5d1f
--- /dev/null
+++ b/l10n/vi/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
new file mode 100644
index 0000000000..40d92269ac
--- /dev/null
+++ b/l10n/vi/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/zh_CN/bookmarks.po b/l10n/zh_CN/bookmarks.po
new file mode 100644
index 0000000000..1164856a06
--- /dev/null
+++ b/l10n/zh_CN/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
new file mode 100644
index 0000000000..35460873c8
--- /dev/null
+++ b/l10n/zh_CN/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/zh_TW/bookmarks.po b/l10n/zh_TW/bookmarks.po
new file mode 100644
index 0000000000..5735653faa
--- /dev/null
+++ b/l10n/zh_TW/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
new file mode 100644
index 0000000000..43e6429a60
--- /dev/null
+++ b/l10n/zh_TW/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
new file mode 100644
index 0000000000..032818da51
--- /dev/null
+++ b/lib/l10n/fi_FI.php
@@ -0,0 +1,20 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ohje",
+"Settings" => "Asetukset",
+"Users" => "Käyttäjät",
+"Apps" => "Sovellukset",
+"ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.",
+"Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
+"Back to Files" => "Takaisin tiedostoihin",
+"Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
+"seconds ago" => "sekuntia sitten",
+"1 minute ago" => "1 minuutti sitten",
+"%d minutes ago" => "%d minuuttia sitten",
+"today" => "tänään",
+"yesterday" => "eilen",
+"%d days ago" => "%d päivää sitten",
+"last month" => "viime kuussa",
+"months ago" => "kuukautta sitten",
+"last year" => "viime vuonna",
+"years ago" => "vuotta sitten"
+);
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 00da37ee1a..dae698dbde 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -3,6 +3,7 @@
 "Invalid email" => "El correu electrònic no és vàlid",
 "OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
+"Authentication error" => "Error d'autenticació",
 "Language changed" => "S'ha canviat l'idioma",
 "Disable" => "Desactiva",
 "Enable" => "Activa",
@@ -44,6 +45,8 @@
 "Create" => "Crea",
 "Default Quota" => "Quota per defecte",
 "Other" => "Altre",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
+"SubAdmin for ..." => "SubAdmin per a ...",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index b4486e0aef..cab1982ec6 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
+"Authentication error" => "Anmeldungsfehler",
 "Language changed" => "Sprache geändert",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -44,6 +45,8 @@
 "Create" => "Anlegen",
 "Default Quota" => "Standard Quota",
 "Other" => "andere",
+"SubAdmin" => "Unteradministrator",
 "Quota" => "Quota",
+"SubAdmin for ..." => "Unteradministrator für...",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 83a2ca7b38..c22ca72396 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -3,6 +3,7 @@
 "Invalid email" => "E-mail invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
+"Authentication error" => "Erreur d'authentification",
 "Language changed" => "Langue changée",
 "Disable" => "Désactivé",
 "Enable" => "Activé",
@@ -44,6 +45,8 @@
 "Create" => "Créer",
 "Default Quota" => "Quota par défaut",
 "Other" => "Autre",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
+"SubAdmin for ..." => "SubAdmin pour ...",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index ca138cf8c1..1ef27ce331 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
+"Authentication error" => "Errore di autenticazione",
 "Language changed" => "Lingua modificata",
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
@@ -44,6 +45,8 @@
 "Create" => "Crea",
 "Default Quota" => "Quota predefinita",
 "Other" => "Altro",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Quote",
+"SubAdmin for ..." => "SubAdmin per...",
 "Delete" => "Elimina"
 );

From e02d8d7f7e3c1958e28ddaf9b388fc062ff35a8c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 21:28:25 -0400
Subject: [PATCH 1179/1537] Remove delete tipsy if file is deleted, fixes bug
 oc-958

---
 apps/files/js/fileactions.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 4dc05088ee..b6f4d0b089 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -160,6 +160,7 @@ FileActions.register('all','Delete',function(){return OC.imagePath('core','actio
 	}else{
 		FileList.do_delete(filename);
 	}
+	$('.tipsy').remove();
 });
 
 FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){

From 7ff04be091ce7c75a749feba1ab184869c915e63 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 28 Jul 2012 11:06:36 -0400
Subject: [PATCH 1180/1537] Correction for 'Fix group detection for sharing in
 case username contains '@', fix for oc-1270'

---
 apps/files_sharing/lib_share.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 3bedd9bebc..1c061cde07 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -179,10 +179,13 @@ class OC_Share {
 				$uid_shared_with = OC_Group::usersInGroup($uid_shared_with);
 				// Remove the owner from the list of users in the group
 				$uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser()));
-			} else if ($uid = strrchr($uid_shared_with, '@', true)) {
-				$uid_shared_with = array($uid);
 			} else {
-				$uid_shared_with = array($uid_shared_with);
+				$pos = strrpos($uid_shared_with, '@');
+				if ($pos !== false && OC_Group::groupExists(substr($uid_shared_with, $pos + 1))) {
+					$uid_shared_with = array(substr($uid_shared_with, 0, $pos));
+				} else {
+					$uid_shared_with = array($uid_shared_with);
+				}
 			}
 			foreach ($uid_shared_with as $uid) {
 				$sharedFolder = $uid.'/files/Shared';

From 18f6552a086a94fd0dda5e7a47755c4560b15755 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 29 Jul 2012 02:06:29 +0200
Subject: [PATCH 1181/1537] [tx-robot] updated from transifex

---
 apps/bookmarks/l10n/ca.php   | 12 +++++++
 apps/bookmarks/l10n/de.php   | 12 +++++++
 apps/bookmarks/l10n/el.php   | 12 +++++++
 apps/bookmarks/l10n/sl.php   | 12 +++++++
 apps/calendar/l10n/el.php    |  5 +++
 apps/calendar/l10n/fi_FI.php |  2 ++
 apps/contacts/l10n/el.php    |  1 +
 apps/files/l10n/sl.php       | 14 +++++++-
 apps/gallery/l10n/sl.php     |  8 ++---
 l10n/ca/bookmarks.po         | 27 +++++++-------
 l10n/ca/lib.po               | 53 ++++++++++++++--------------
 l10n/de/bookmarks.po         | 28 ++++++++-------
 l10n/de/lib.po               | 17 ++++-----
 l10n/de/settings.po          | 15 ++++----
 l10n/el/bookmarks.po         | 28 ++++++++-------
 l10n/el/calendar.po          | 17 ++++-----
 l10n/el/contacts.po          |  8 ++---
 l10n/el/lib.po               | 53 ++++++++++++++--------------
 l10n/el/settings.po          | 12 +++----
 l10n/fi_FI/calendar.po       |  8 ++---
 l10n/fi_FI/lib.po            |  8 ++---
 l10n/fi_FI/settings.po       |  8 ++---
 l10n/sl/bookmarks.po         | 27 +++++++-------
 l10n/sl/files.po             | 68 +++++++++++++++++++-----------------
 l10n/sl/gallery.po           | 64 ++++++++-------------------------
 l10n/sl/lib.po               | 47 +++++++++++++------------
 l10n/sl/settings.po          | 14 ++++----
 l10n/templates/bookmarks.pot |  2 +-
 l10n/templates/calendar.pot  |  2 +-
 l10n/templates/contacts.pot  |  2 +-
 l10n/templates/core.pot      |  2 +-
 l10n/templates/files.pot     |  2 +-
 l10n/templates/gallery.pot   |  2 +-
 l10n/templates/lib.pot       |  2 +-
 l10n/templates/media.pot     |  2 +-
 l10n/templates/settings.pot  |  2 +-
 lib/l10n/ca.php              | 25 +++++++++++++
 lib/l10n/de.php              |  7 ++++
 lib/l10n/el.php              | 25 +++++++++++++
 lib/l10n/fi_FI.php           |  2 ++
 lib/l10n/sl.php              | 22 ++++++++++++
 settings/l10n/de.php         |  8 ++---
 settings/l10n/el.php         |  3 ++
 settings/l10n/fi_FI.php      |  1 +
 settings/l10n/sl.php         |  4 +++
 45 files changed, 416 insertions(+), 279 deletions(-)
 create mode 100644 apps/bookmarks/l10n/ca.php
 create mode 100644 apps/bookmarks/l10n/de.php
 create mode 100644 apps/bookmarks/l10n/el.php
 create mode 100644 apps/bookmarks/l10n/sl.php
 create mode 100644 lib/l10n/ca.php
 create mode 100644 lib/l10n/de.php
 create mode 100644 lib/l10n/el.php
 create mode 100644 lib/l10n/sl.php

diff --git a/apps/bookmarks/l10n/ca.php b/apps/bookmarks/l10n/ca.php
new file mode 100644
index 0000000000..cf90d9a887
--- /dev/null
+++ b/apps/bookmarks/l10n/ca.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Adreces d'interès",
+"unnamed" => "sense nom",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:",
+"Read later" => "Llegeix més tard",
+"Address" => "Adreça",
+"Title" => "Títol",
+"Tags" => "Etiquetes",
+"Save bookmark" => "Desa l'adreça d'interès",
+"You have no bookmarks" => "No teniu adreces d'interès",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/bookmarks/l10n/de.php b/apps/bookmarks/l10n/de.php
new file mode 100644
index 0000000000..9e0f137382
--- /dev/null
+++ b/apps/bookmarks/l10n/de.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Lesezeichen",
+"unnamed" => "unbenannt",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst.",
+"Read later" => "Später lesen",
+"Address" => "Adresse",
+"Title" => "Title",
+"Tags" => "Tags",
+"Save bookmark" => "Lesezeichen speichern",
+"You have no bookmarks" => "Du hast keine Lesezeichen",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/bookmarks/l10n/el.php b/apps/bookmarks/l10n/el.php
new file mode 100644
index 0000000000..f282a1bbf8
--- /dev/null
+++ b/apps/bookmarks/l10n/el.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Σελιδοδείκτες",
+"unnamed" => "ανώνυμο",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
+"Read later" => "Ανάγνωση αργότερα",
+"Address" => "Διεύθυνση",
+"Title" => "Τίτλος",
+"Tags" => "Ετικέτες",
+"Save bookmark" => "Αποθήκευση σελιδοδείκτη",
+"You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
+"Bookmarklet <br />" => "Εφαρμογίδιο Σελιδοδεικτών <br />"
+);
diff --git a/apps/bookmarks/l10n/sl.php b/apps/bookmarks/l10n/sl.php
new file mode 100644
index 0000000000..32a4162908
--- /dev/null
+++ b/apps/bookmarks/l10n/sl.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Zaznamki",
+"unnamed" => "neimenovano",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Povlecite to povezavo med zaznamke v vašem brskalniku in jo, ko želite ustvariti zaznamek trenutne strani, preprosto kliknite:",
+"Read later" => "Preberi kasneje",
+"Address" => "Naslov",
+"Title" => "Ime",
+"Tags" => "Oznake",
+"Save bookmark" => "Shrani zaznamek",
+"You have no bookmarks" => "Nimate zaznamkov",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
index e478316bba..4657213848 100644
--- a/apps/calendar/l10n/el.php
+++ b/apps/calendar/l10n/el.php
@@ -1,8 +1,10 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Δεν έχει δημιουργηθεί λανθάνουσα μνήμη για όλα τα ημερολόγια",
 "Everything seems to be completely cached" => "Όλα έχουν αποθηκευτεί στη cache",
 "No calendars found." => "Δε βρέθηκαν ημερολόγια.",
 "No events found." => "Δε βρέθηκαν γεγονότα.",
 "Wrong calendar" => "Λάθος ημερολόγιο",
+"The file contained either no events or all events are already saved in your calendar." => "Το αρχείο που περιέχει είτε κανένα γεγονός είτε όλα τα γεγονότα έχουν ήδη αποθηκευτεί στο ημερολόγιό σας.",
 "events has been saved in the new calendar" => "τα συμβάντα αποθηκεύτηκαν σε ένα νέο ημερολόγιο",
 "Import failed" => "Η εισαγωγή απέτυχε",
 "events has been saved in your calendar" => "το συμβάν αποθηκεύτηκε στο ημερολογιό σου",
@@ -166,6 +168,7 @@
 "Please choose a calendar" => "Παρακαλώ επέλεξε ένα ημερολόγιο",
 "Name of new calendar" => "Όνομα νέου ημερολογίου",
 "Take an available name!" => "Επέλεξε ένα διαθέσιμο όνομα!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ένα ημερολόγιο με αυτό το όνομα υπάρχει ήδη. Εάν θέλετε να συνεχίσετε, αυτά τα 2 ημερολόγια θα συγχωνευθούν.",
 "Import" => "Εισαγωγή",
 "Close Dialog" => "Κλείσιμο Διαλόγου",
 "Create a new event" => "Δημιουργήστε ένα νέο συμβάν",
@@ -180,6 +183,8 @@
 "12h" => "12ω",
 "First day of the week" => "Πρώτη μέρα της εβδομάδας",
 "Cache" => "Cache",
+"Clear cache for repeating events" => "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων",
+"Calendar CalDAV syncing addresses" => "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV",
 "more info" => "περισσότερες πλροφορίες",
 "Primary address (Kontact et al)" => "Κύρια Διεύθυνση(Επαφή και άλλα)",
 "iOS/OS X" => "iOS/OS X",
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
index e67f77909a..23096d7365 100644
--- a/apps/calendar/l10n/fi_FI.php
+++ b/apps/calendar/l10n/fi_FI.php
@@ -2,6 +2,7 @@
 "No calendars found." => "Kalentereita ei löytynyt",
 "No events found." => "Tapahtumia ei löytynyt.",
 "Wrong calendar" => "Väärä kalenteri",
+"The file contained either no events or all events are already saved in your calendar." => "Tiedosto ei joko sisältänyt tapahtumia tai vaihtoehtoisesti kaikki tapahtumat on jo tallennettu kalenteriisi.",
 "Import failed" => "Tuonti epäonnistui",
 "events has been saved in your calendar" => "tapahtumaa on tallennettu kalenteriisi",
 "New Timezone:" => "Uusi aikavyöhyke:",
@@ -135,6 +136,7 @@
 "Import a calendar file" => "Tuo kalenteritiedosto",
 "Please choose a calendar" => "Valitse kalenteri",
 "Name of new calendar" => "Uuden kalenterin nimi",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Samalla nimellä on jo olemassa kalenteri. Jos jatkat kaikesta huolimatta, kalenterit yhdistetään.",
 "Import" => "Tuo",
 "Close Dialog" => "Sulje ikkuna",
 "Create a new event" => "Luo uusi tapahtuma",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 9538e630a5..c67f27ab2a 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -106,6 +106,7 @@
 "Navigation" => "Πλοήγηση",
 "Next contact in list" => "Επόμενη επαφή στη λίστα",
 "Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
+"Expand/collapse current addressbook" => "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων",
 "Next/previous addressbook" => "Επόμενο/προηγούμενο βιβλίο διευθύνσεων",
 "Actions" => "Ενέργειες",
 "Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index b0ea2dc373..80df2b385f 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -7,8 +7,21 @@
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Files" => "Datoteke",
+"Unshare" => "Vzemi iz souporabe",
+"Delete" => "Izbriši",
+"undo deletion" => "prekliči izbris",
+"generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
+"Upload Error" => "Napaka pri nalaganju",
+"Pending" => "Na čakanju",
+"Upload cancelled." => "Nalaganje je bilo preklicano.",
+"Invalid name, '/' is not allowed." => "Neveljavno ime. Znak '/' ni dovoljen.",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
+"folder" => "mapa",
+"folders" => "mape",
+"file" => "datoteka",
+"files" => "datoteke",
 "File handling" => "Rokovanje z datotekami",
 "Maximum upload size" => "Največja velikost za nalaganje",
 "max. possible: " => "največ mogoče:",
@@ -26,7 +39,6 @@
 "Name" => "Ime",
 "Share" => "Souporaba",
 "Download" => "Prejmi",
-"Delete" => "Izbriši",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",
 "Files are being scanned, please wait." => "Preiskujem datoteke, prosimo počakajte.",
diff --git a/apps/gallery/l10n/sl.php b/apps/gallery/l10n/sl.php
index 5e06123986..8d3bb9f588 100644
--- a/apps/gallery/l10n/sl.php
+++ b/apps/gallery/l10n/sl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Slike",
-"Settings" => "Nastavitve",
-"Rescan" => "Ponovno preišči",
-"Stop" => "Stop",
-"Share" => "Deli",
+"Share gallery" => "Daj galerijo v souporabo",
+"Error: " => "Napaka: ",
+"Internal error" => "Notranja napaka",
+"Slideshow" => "predstavitev",
 "Back" => "Nazaj",
 "Remove confirmation" => "Odstrani potrditev",
 "Do you want to remove album" => "Ali želite odstraniti album",
diff --git a/l10n/ca/bookmarks.po b/l10n/ca/bookmarks.po
index 4dc33835a3..c7e3b09a60 100644
--- a/l10n/ca/bookmarks.po
+++ b/l10n/ca/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rcalvoi@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 13:38+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Adreces d'interès"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "sense nom"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Llegeix més tard"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adreça"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Títol"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetes"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Desa l'adreça d'interès"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "No teniu adreces d'interès"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 2d23400a99..397969d686 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rcalvoi@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 13:42+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Configuració"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Usuaris"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Aplicacions"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administració"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "La baixada en ZIP està desactivada."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Els fitxers s'han de baixar d'un en un."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Torna a Fitxers"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "L'aplicació no està habilitada"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Error d'autenticació"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "El testimoni ha expirat. Torneu a carregar la pàgina."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "segons enrere"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "fa 1 minut"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "fa %d minuts"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "avui"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "ahir"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "fa %d dies"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "el mes passat"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "mesos enrere"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "l'any passat"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "fa anys"
diff --git a/l10n/de/bookmarks.po b/l10n/de/bookmarks.po
index a00546e020..449e392591 100644
--- a/l10n/de/bookmarks.po
+++ b/l10n/de/bookmarks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phi Lieb <>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 20:46+0000\n"
+"Last-Translator: Phi Lieb <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +21,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Lesezeichen"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "unbenannt"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst."
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Später lesen"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Title"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Lesezeichen speichern"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Du hast keine Lesezeichen"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 1230fa0545..cb3103a3eb 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 14:29+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +20,23 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Hilfe"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Persönlich"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Benutzer"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Apps"
 
 #: app.php:313
 msgid "Admin"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 85ded96f8c..c996adc2c5 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -9,14 +9,15 @@
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
+# Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 05:12+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 20:42+0000\n"
+"Last-Translator: Phi Lieb <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,11 +103,11 @@ msgstr "Dokumentation"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr "große Dateien verwalten"
+msgstr "Große Dateien verwalten"
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr "Stell eine Frage"
+msgstr "Stell' eine Frage"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
@@ -130,7 +131,7 @@ msgstr "der verfügbaren"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop und mobile synchronierungs Clients"
+msgstr "Desktop- und mobile Synchronierungs-Clients"
 
 #: templates/personal.php:13
 msgid "Download"
@@ -206,7 +207,7 @@ msgstr "Standard Quota"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
-msgstr "andere"
+msgstr "Andere"
 
 #: templates/users.php:80
 msgid "SubAdmin"
diff --git a/l10n/el/bookmarks.po b/l10n/el/bookmarks.po
index a5f983f2bf..0030d2d395 100644
--- a/l10n/el/bookmarks.po
+++ b/l10n/el/bookmarks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 11:33+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +21,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Σελιδοδείκτες"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "ανώνυμο"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Ανάγνωση αργότερα"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Διεύθυνση"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Τίτλος"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Ετικέτες"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Αποθήκευση σελιδοδείκτη"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Δεν έχετε σελιδοδείκτες"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Εφαρμογίδιο Σελιδοδεικτών <br />"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index 0be7c6d22c..4f8562971b 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -5,15 +5,16 @@
 # Translators:
 #   <christosvas@in.gr>, 2011.
 # Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:47+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 11:39+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Δεν έχει δημιουργηθεί λανθάνουσα μνήμη για όλα τα ημερολόγια"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
@@ -45,7 +46,7 @@ msgstr "Λάθος ημερολόγιο"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Το αρχείο που περιέχει είτε κανένα γεγονός είτε όλα τα γεγονότα έχουν ήδη αποθηκευτεί στο ημερολόγιό σας."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
@@ -711,7 +712,7 @@ msgstr "Επέλεξε ένα διαθέσιμο όνομα!"
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Ένα ημερολόγιο με αυτό το όνομα υπάρχει ήδη. Εάν θέλετε να συνεχίσετε, αυτά τα 2 ημερολόγια θα συγχωνευθούν."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -771,11 +772,11 @@ msgstr "Cache"
 
 #: templates/settings.php:48
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων"
 
 #: templates/settings.php:53
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV"
 
 #: templates/settings.php:53
 msgid "more info"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 1e03429730..9d72a185a0 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 08:32+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 11:43+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -467,7 +467,7 @@ msgstr "Προηγούμενη επαφή στη λίστα"
 
 #: templates/index.php:48
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
 #: templates/index.php:50
 msgid "Next/previous addressbook"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 9f817d1a46..da331c0cb8 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 11:45+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Βοήθεια"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Προσωπικά"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Ρυθμίσεις"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Χρήστες"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Εφαρμογές"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Διαχειριστής"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Πίσω στα Αρχεία"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Δεν ενεργοποιήθηκε η εφαρμογή"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Σφάλμα πιστοποίησης"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Το αναγνωριστικό έληξε. Παρακαλώ επανα-φορτώστε την σελίδα."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "δευτερόλεπτα πριν"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 λεπτό πριν"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d λεπτά πριν"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "σήμερα"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "χθές"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d ημέρες πριν"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "τον προηγούμενο μήνα"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "μήνες πριν"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "τον προηγούμενο χρόνο"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "χρόνια πριν"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 8a66091272..02857c416c 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 11:41+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +41,7 @@ msgstr "Μη έγκυρο αίτημα"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Σφάλμα πιστοποίησης"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -209,7 +209,7 @@ msgstr "Άλλα"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -217,7 +217,7 @@ msgstr "Σύνολο χώρου"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "SubAdmin για ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index db9bb175eb..d280acc0f2 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 10:40+0000\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 15:53+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "Väärä kalenteri"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Tiedosto ei joko sisältänyt tapahtumia tai vaihtoehtoisesti kaikki tapahtumat on jo tallennettu kalenteriisi."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
@@ -710,7 +710,7 @@ msgstr ""
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Samalla nimellä on jo olemassa kalenteri. Jos jatkat kaikesta huolimatta, kalenterit yhdistetään."
 
 #: templates/part.import.php:47
 msgid "Import"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 8191bf7710..4d360e13dd 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:27+0000\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 15:54+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr "Sovellukset"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Ylläpitäjä"
 
 #: files.php:245
 msgid "ZIP download is turned off."
@@ -64,7 +64,7 @@ msgstr ""
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Todennusvirhe"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 4b7cfc4375..d79aad9bbd 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 15:51+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "Virheellinen pyyntö"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Todennusvirhe"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
diff --git a/l10n/sl/bookmarks.po b/l10n/sl/bookmarks.po
index addf9cb165..7a522308d4 100644
--- a/l10n/sl/bookmarks.po
+++ b/l10n/sl/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 02:18+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Zaznamki"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "neimenovano"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Povlecite to povezavo med zaznamke v vašem brskalniku in jo, ko želite ustvariti zaznamek trenutne strani, preprosto kliknite:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Preberi kasneje"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Naslov"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Ime"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Oznake"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Shrani zaznamek"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Nimate zaznamkov"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 7c9c372c04..fd263bc60e 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,43 +10,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 01:58+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je bila uspešno naložena."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je bila le delno naložena"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
@@ -54,57 +54,65 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Vzemi iz souporabe"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Izbriši"
+
 #: js/filelist.js:186
 msgid "undo deletion"
-msgstr ""
+msgstr "prekliči izbris"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Ustvarjam ZIP datoteko. To lahko traja nekaj časa."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Napaka pri nalaganju"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Na čakanju"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Nalaganje je bilo preklicano."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "mapa"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mape"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "datoteka"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "datoteke"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -174,10 +182,6 @@ msgstr "Souporaba"
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Izbriši"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Nalaganje ni mogoče, ker je preveliko"
diff --git a/l10n/sl/gallery.po b/l10n/sl/gallery.po
index 1fe6c5af7b..f9c47144b6 100644
--- a/l10n/sl/gallery.po
+++ b/l10n/sl/gallery.po
@@ -10,71 +10,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"PO-Revision-Date: 2012-07-28 02:03+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Slike"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Daj galerijo v souporabo"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Napaka: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Notranja napaka"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Ponovno preišči"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stop"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Deli"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "predstavitev"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 1b75d8d051..fb1e393186 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 02:09+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,55 +20,55 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Pomoč"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Osebno"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Uporabniki"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Aplikacije"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Skrbnik"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP prenos je onemogočen."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Datoteke morajo biti prenešene posamezno."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Nazaj na datoteke"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Izbrane datoteke so prevelike, da bi lahko ustvarili zip datoteko."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikacija ni omogočena"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Napaka overitve"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
 
 #: template.php:86
 msgid "seconds ago"
@@ -75,29 +76,29 @@ msgstr ""
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "pred minuto"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "pred %d minutami"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "danes"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "včeraj"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "pred %d dnevi"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "prejšnji mesec"
 
 #: template.php:95
 msgid "months ago"
@@ -105,7 +106,7 @@ msgstr ""
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "lani"
 
 #: template.php:97
 msgid "years ago"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 57e7366edc..25758a9537 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"PO-Revision-Date: 2012-07-28 02:03+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr "Neveljaven zahtevek"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Napaka overitve"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -62,7 +62,7 @@ msgstr "__ime_jezika__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Varnostno opozorilo"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -206,7 +206,7 @@ msgstr "Drugo"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "PodSkrbnik"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -214,7 +214,7 @@ msgstr "Količinska omejitev"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "PodSkrbnik za ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 3ec283b080..0cc6b48719 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index cfdab722b6..feb2ff4bd9 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 4ff7729e08..696c3b7b1c 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 3581e9fd9b..522d4104cd 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 43182f333d..5f5750d16a 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 4acfa253ec..1969f7b410 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 2dabe2fa37..0fe46e895a 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 001bda203f..68f2dd0d3f 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 053de66e30..52b7bbdb0b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
+"POT-Creation-Date: 2012-07-29 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
new file mode 100644
index 0000000000..8e4c30caec
--- /dev/null
+++ b/lib/l10n/ca.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ajuda",
+"Personal" => "Personal",
+"Settings" => "Configuració",
+"Users" => "Usuaris",
+"Apps" => "Aplicacions",
+"Admin" => "Administració",
+"ZIP download is turned off." => "La baixada en ZIP està desactivada.",
+"Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
+"Back to Files" => "Torna a Fitxers",
+"Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.",
+"Application is not enabled" => "L'aplicació no està habilitada",
+"Authentication error" => "Error d'autenticació",
+"Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
+"seconds ago" => "segons enrere",
+"1 minute ago" => "fa 1 minut",
+"%d minutes ago" => "fa %d minuts",
+"today" => "avui",
+"yesterday" => "ahir",
+"%d days ago" => "fa %d dies",
+"last month" => "el mes passat",
+"months ago" => "mesos enrere",
+"last year" => "l'any passat",
+"years ago" => "fa anys"
+);
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
new file mode 100644
index 0000000000..19746ba028
--- /dev/null
+++ b/lib/l10n/de.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hilfe",
+"Personal" => "Persönlich",
+"Settings" => "Einstellungen",
+"Users" => "Benutzer",
+"Apps" => "Apps"
+);
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
new file mode 100644
index 0000000000..d9f272258e
--- /dev/null
+++ b/lib/l10n/el.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Βοήθεια",
+"Personal" => "Προσωπικά",
+"Settings" => "Ρυθμίσεις",
+"Users" => "Χρήστες",
+"Apps" => "Εφαρμογές",
+"Admin" => "Διαχειριστής",
+"ZIP download is turned off." => "Η λήψη ZIP απενεργοποιήθηκε.",
+"Files need to be downloaded one by one." => "Τα αρχεία πρέπει να ληφθούν ένα-ένα.",
+"Back to Files" => "Πίσω στα Αρχεία",
+"Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.",
+"Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
+"Authentication error" => "Σφάλμα πιστοποίησης",
+"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ επανα-φορτώστε την σελίδα.",
+"seconds ago" => "δευτερόλεπτα πριν",
+"1 minute ago" => "1 λεπτό πριν",
+"%d minutes ago" => "%d λεπτά πριν",
+"today" => "σήμερα",
+"yesterday" => "χθές",
+"%d days ago" => "%d ημέρες πριν",
+"last month" => "τον προηγούμενο μήνα",
+"months ago" => "μήνες πριν",
+"last year" => "τον προηγούμενο χρόνο",
+"years ago" => "χρόνια πριν"
+);
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 032818da51..81f4aa9584 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -3,10 +3,12 @@
 "Settings" => "Asetukset",
 "Users" => "Käyttäjät",
 "Apps" => "Sovellukset",
+"Admin" => "Ylläpitäjä",
 "ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.",
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
 "Back to Files" => "Takaisin tiedostoihin",
 "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
+"Authentication error" => "Todennusvirhe",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
 "%d minutes ago" => "%d minuuttia sitten",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
new file mode 100644
index 0000000000..7889335d97
--- /dev/null
+++ b/lib/l10n/sl.php
@@ -0,0 +1,22 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoč",
+"Personal" => "Osebno",
+"Settings" => "Nastavitve",
+"Users" => "Uporabniki",
+"Apps" => "Aplikacije",
+"Admin" => "Skrbnik",
+"ZIP download is turned off." => "ZIP prenos je onemogočen.",
+"Files need to be downloaded one by one." => "Datoteke morajo biti prenešene posamezno.",
+"Back to Files" => "Nazaj na datoteke",
+"Selected files too large to generate zip file." => "Izbrane datoteke so prevelike, da bi lahko ustvarili zip datoteko.",
+"Application is not enabled" => "Aplikacija ni omogočena",
+"Authentication error" => "Napaka overitve",
+"Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
+"1 minute ago" => "pred minuto",
+"%d minutes ago" => "pred %d minutami",
+"today" => "danes",
+"yesterday" => "včeraj",
+"%d days ago" => "pred %d dnevi",
+"last month" => "prejšnji mesec",
+"last year" => "lani"
+);
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index cab1982ec6..fbaab6d6c9 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -18,14 +18,14 @@
 "-licensed" => "-lizenziert",
 "by" => "von",
 "Documentation" => "Dokumentation",
-"Managing Big Files" => "große Dateien verwalten",
-"Ask a question" => "Stell eine Frage",
+"Managing Big Files" => "Große Dateien verwalten",
+"Ask a question" => "Stell' eine Frage",
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
 "You use" => "Du nutzt",
 "of the available" => "der verfügbaren",
-"Desktop and Mobile Syncing Clients" => "Desktop und mobile synchronierungs Clients",
+"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Synchronierungs-Clients",
 "Download" => "Download",
 "Your password got changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
@@ -44,7 +44,7 @@
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Quota" => "Standard Quota",
-"Other" => "andere",
+"Other" => "Andere",
 "SubAdmin" => "Unteradministrator",
 "Quota" => "Quota",
 "SubAdmin for ..." => "Unteradministrator für...",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 9008b85cec..c2340c1641 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
+"Authentication error" => "Σφάλμα πιστοποίησης",
 "Language changed" => "Η γλώσσα άλλαξε",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
@@ -44,6 +45,8 @@
 "Create" => "Δημιουργία",
 "Default Quota" => "Προεπιλεγμένο όριο",
 "Other" => "Άλλα",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Σύνολο χώρου",
+"SubAdmin for ..." => "SubAdmin για ...",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index bbfcdec384..4fbdca8024 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
+"Authentication error" => "Todennusvirhe",
 "Language changed" => "Kieli on vaihdettu",
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index e4f5a500cc..f1ac1f1642 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
+"Authentication error" => "Napaka overitve",
 "Language changed" => "Jezik je bil spremenjen",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
 "Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
+"Security Warning" => "Varnostno opozorilo",
 "Log" => "Dnevnik",
 "More" => "Več",
 "Add your App" => "Dodajte vašo aplikacijo",
@@ -43,6 +45,8 @@
 "Create" => "Ustvari",
 "Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
+"SubAdmin" => "PodSkrbnik",
 "Quota" => "Količinska omejitev",
+"SubAdmin for ..." => "PodSkrbnik za ...",
 "Delete" => "Izbriši"
 );

From 0836366d8703b2663d11e2989f8dbbb3f7c0c18b Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 29 Jul 2012 16:07:51 +0000
Subject: [PATCH 1182/1537] Methods to disable and enable users

---
 lib/user.php | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index e3c9c23eff..49a0a2a10c 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -208,8 +208,9 @@ class OC_User {
 		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
 
 		if( $run ){
-			$uid=self::checkPassword( $uid, $password );
-			if($uid){
+			$uid = self::checkPassword( $uid, $password );
+			$enabled = self::isEnabled($uid);
+			if($uid && $enabled){
 				session_regenerate_id(true);
 				self::setUserId($uid);
 				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
@@ -363,6 +364,38 @@ class OC_User {
 		}
 		return false;
 	}
+	
+	/**
+	 * disables a user
+	 * @param string $userid the user to disable
+	 */
+	public static function disableUser($userid){
+		$query = "INSERT INTO *PREFIX*preferences (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
+		$query = OC_DB::prepare($query);
+		$query->execute(array($userid, 'core', 'enabled', 'false'));
+	}
+	
+	/**
+	 * enable a user
+	 * @param string $userid
+	 */
+	public static function enableUser($userid){
+		$query = "DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ? AND configvalue = ?";
+		$query = OC_DB::prepare($query);
+		$query->execute(array($userid, 'core', 'enabled', 'false'));
+	}
+	
+	/**
+	 * checks if a user is enabled
+	 * @param string $userid
+	 * @return bool
+	 */
+	public static function isEnabled($userid){
+		$query = "SELECT userid FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ? AND configvalue = ?";
+		$query = OC_DB::prepare($query);
+		$results = $query->execute(array($userid, 'core', 'enabled', 'false'));
+		return $results->numRows() ? false : true;
+	}
 
 	/**
 	 * @brief Set cookie value to use in next page load

From e18639551d4c2915af706c70f98c67aa04b9c89e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 29 Jul 2012 16:00:46 -0400
Subject: [PATCH 1183/1537] Tweak appearance of undo delete notification

---
 apps/files/css/files.css  | 1 +
 apps/files/js/filelist.js | 5 ++---
 core/css/styles.css       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index dc298e4d44..e08d69f08d 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -89,3 +89,4 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #navigation>ul>li:first-child+li { padding-top:2.9em; }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
+#notification .undo { cursor:pointer; font-weight:bold; margin-left:1em; }
\ No newline at end of file
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3645258f98..aaf2e681ab 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -183,7 +183,7 @@ FileList={
 		procesSelection();
 		FileList.deleteCanceled=false;
 		FileList.deleteFiles=files;
-		$('#notification').text(t('files','undo deletion'));
+		$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
 		$('#notification').data('deletefile',true);
 		$('#notification').fadeIn();
 	},
@@ -214,12 +214,11 @@ FileList={
 
 $(document).ready(function(){
 	$('#notification').hide();
-	$('#notification').click(function(){
+	$('#notification .undo').live('click', function(){
 		if($('#notification').data('deletefile'))
 		{
 			$.each(FileList.deleteFiles,function(index,file){
 				$('tr').filterAttr('data-file',file).show();
-// 			alert(file);
 			});
 			FileList.deleteCanceled=true;
 			FileList.deleteFiles=null;
diff --git a/core/css/styles.css b/core/css/styles.css
index b818caa279..c61d0a9a1a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -108,7 +108,7 @@ label.infield { cursor: text !important; }
 .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; }
 
 .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; }

From 5262cde6a6dbf7c924508423093aaac0d17a95b5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 29 Jul 2012 18:01:43 -0400
Subject: [PATCH 1184/1537] Add additional error handling for emailing private
 links

---
 apps/files_sharing/ajax/email.php |  7 ++++++-
 apps/files_sharing/js/share.js    | 18 +++++++++++++-----
 lib/mail.php                      |  3 ++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 3026eb7467..aba4f699fa 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -10,4 +10,9 @@ $subject = $user.' shared a '.$type.' with you';
 $link = $_POST['link'];
 $text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
 $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
-OCP\Util::sendMail($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
+try {
+	OCP\Util::sendMail($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
+	OCP\JSON::success();
+} catch (Exception $exception) {
+	OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 39e6bd7859..3cfa3583b1 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -202,11 +202,19 @@ OC.Share={
 	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');
+		var email = $('#email').val();
+		if (email != '') {
+			$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, file: file }, function(result) {
+				if (result && result.status == 'success') {
+					$('#email').css('font-weight', 'bold');
+					$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+						$(this).val('');
+					}).val('Email sent');
+				} else {
+					OC.dialogs.alert(result.data.message, 'Error while sharing');
+				}
+			});
+		}
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
diff --git a/lib/mail.php b/lib/mail.php
index 7eb2c4770c..0ac9a97c1b 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -83,7 +83,8 @@ class OC_Mail {
 			unset($mailo);
 			OC_Log::write('mail', 'Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject, OC_Log::DEBUG);
 		} catch (Exception $exception) {
-			OC_Log::write('mail', $exception->getMessage(), OC_Log::DEBUG);
+			OC_Log::write('mail', $exception->getMessage(), OC_Log::ERROR);
+			throw($exception);
 		}
 	}
 

From 3430dcd367a0053b97feaa8e59be0ebda44e1dc4 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 30 Jul 2012 02:05:41 +0200
Subject: [PATCH 1185/1537] [tx-robot] updated from transifex

---
 apps/bookmarks/l10n/es.php   |  12 +
 apps/bookmarks/l10n/sv.php   |  12 +
 apps/calendar/l10n/sv.php    |  50 +-
 apps/contacts/l10n/sv.php    |  67 ++-
 apps/files/l10n/ar.php       |   2 +-
 apps/files/l10n/bg_BG.php    |   2 +-
 apps/files/l10n/ca.php       |   1 -
 apps/files/l10n/cs_CZ.php    |  12 +-
 apps/files/l10n/da.php       |  12 +-
 apps/files/l10n/de.php       |  17 +-
 apps/files/l10n/el.php       |   1 -
 apps/files/l10n/eo.php       |  12 +-
 apps/files/l10n/es.php       |   1 -
 apps/files/l10n/et_EE.php    |  12 +-
 apps/files/l10n/eu.php       |  12 +-
 apps/files/l10n/fa.php       |  12 +-
 apps/files/l10n/fi_FI.php    |   1 -
 apps/files/l10n/fr.php       |   1 -
 apps/files/l10n/gl.php       |  12 +-
 apps/files/l10n/he.php       |  12 +-
 apps/files/l10n/hr.php       |  12 +-
 apps/files/l10n/hu_HU.php    |  12 +-
 apps/files/l10n/ia.php       |   2 +-
 apps/files/l10n/id.php       |   2 +-
 apps/files/l10n/it.php       |   1 -
 apps/files/l10n/ja_JP.php    |  12 +-
 apps/files/l10n/ko.php       |  11 +-
 apps/files/l10n/lb.php       |   2 +-
 apps/files/l10n/lt_LT.php    |  18 +-
 apps/files/l10n/mk.php       |  12 +-
 apps/files/l10n/ms_MY.php    |  26 +-
 apps/files/l10n/nb_NO.php    |   8 +-
 apps/files/l10n/nl.php       |  12 +-
 apps/files/l10n/nn_NO.php    |   2 +-
 apps/files/l10n/pl.php       |  12 +-
 apps/files/l10n/pt_BR.php    |  12 +-
 apps/files/l10n/pt_PT.php    |  12 +-
 apps/files/l10n/ro.php       |   2 +-
 apps/files/l10n/ru.php       |  12 +-
 apps/files/l10n/sk_SK.php    |  12 +-
 apps/files/l10n/sl.php       |   1 -
 apps/files/l10n/sr.php       |   2 +-
 apps/files/l10n/sr@latin.php |   2 +-
 apps/files/l10n/sv.php       |  13 +-
 apps/files/l10n/th_TH.php    |  12 +-
 apps/files/l10n/tr.php       |  12 +-
 apps/files/l10n/uk.php       |   2 +-
 apps/files/l10n/zh_CN.php    |  12 +-
 apps/files/l10n/zh_TW.php    |   2 +-
 apps/gallery/l10n/sv.php     |   8 +-
 core/l10n/de.php             |  40 +-
 core/l10n/sv.php             |  20 +-
 l10n/af/files.po             |  52 +-
 l10n/ar/files.po             |  52 +-
 l10n/ar_SA/files.po          |  10 +-
 l10n/bg_BG/files.po          |  52 +-
 l10n/ca/files.po             |  14 +-
 l10n/cs_CZ/files.po          |  72 +--
 l10n/da/files.po             |  73 +--
 l10n/de/core.po              | 103 ++--
 l10n/de/files.po             |  77 +--
 l10n/de/lib.po               |  43 +-
 l10n/de/settings.po          |   6 +-
 l10n/el/files.po             |  14 +-
 l10n/eo/files.po             |  72 +--
 l10n/es/bookmarks.po         |  27 +-
 l10n/es/files.po             |  14 +-
 l10n/es/settings.po          |  12 +-
 l10n/et_EE/files.po          |  72 +--
 l10n/eu/files.po             |  72 +--
 l10n/fa/files.po             |  72 +--
 l10n/fi_FI/files.po          |  14 +-
 l10n/fr/files.po             |  14 +-
 l10n/gl/files.po             |  72 +--
 l10n/he/files.po             |  73 +--
 l10n/hr/files.po             |  74 +--
 l10n/hu_HU/files.po          |  72 +--
 l10n/hy/files.po             |  52 +-
 l10n/ia/files.po             |  52 +-
 l10n/id/files.po             |  52 +-
 l10n/id_ID/files.po          |  10 +-
 l10n/it/files.po             |  14 +-
 l10n/ja_JP/files.po          |  72 +--
 l10n/ko/files.po             |  70 +--
 l10n/lb/files.po             |  52 +-
 l10n/lt_LT/files.po          |  81 ++--
 l10n/lv/files.po             |  12 +-
 l10n/mk/files.po             |  73 +--
 l10n/ms_MY/files.po          |  98 ++--
 l10n/nb_NO/files.po          |  65 +--
 l10n/nl/files.po             |  73 +--
 l10n/nn_NO/files.po          |  52 +-
 l10n/pl/files.po             |  72 +--
 l10n/pl/settings.po          |   8 +-
 l10n/pt_BR/files.po          |  73 +--
 l10n/pt_PT/files.po          |  72 +--
 l10n/ro/files.po             |  52 +-
 l10n/ru/files.po             |  73 +--
 l10n/sk_SK/files.po          |  72 +--
 l10n/sl/files.po             |  14 +-
 l10n/so/files.po             |  10 +-
 l10n/sr/files.po             |  52 +-
 l10n/sr@latin/files.po       |  52 +-
 l10n/sv/bookmarks.po         |  27 +-
 l10n/sv/calendar.po          | 406 ++++++++++------
 l10n/sv/contacts.po          | 911 ++++++++++++++++++-----------------
 l10n/sv/core.po              |  81 ++--
 l10n/sv/files.po             |  73 +--
 l10n/sv/gallery.po           |  65 +--
 l10n/sv/lib.po               |  53 +-
 l10n/sv/settings.po          |  15 +-
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   8 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       |   2 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 l10n/th_TH/files.po          |  72 +--
 l10n/tr/files.po             |  72 +--
 l10n/uk/files.po             |  52 +-
 l10n/vi/files.po             |  10 +-
 l10n/zh_CN/files.po          |  72 +--
 l10n/zh_TW/files.po          |  52 +-
 lib/l10n/de.php              |  20 +-
 lib/l10n/sv.php              |  25 +
 settings/l10n/de.php         |   2 +-
 settings/l10n/es.php         |   3 +
 settings/l10n/pl.php         |   1 +
 settings/l10n/sv.php         |   4 +
 132 files changed, 3101 insertions(+), 2128 deletions(-)
 create mode 100644 apps/bookmarks/l10n/es.php
 create mode 100644 apps/bookmarks/l10n/sv.php
 create mode 100644 lib/l10n/sv.php

diff --git a/apps/bookmarks/l10n/es.php b/apps/bookmarks/l10n/es.php
new file mode 100644
index 0000000000..071b0dda70
--- /dev/null
+++ b/apps/bookmarks/l10n/es.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Marcadores",
+"unnamed" => "sin nombre",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:",
+"Read later" => "Leer después",
+"Address" => "Dirección",
+"Title" => "Título",
+"Tags" => "Etiquetas",
+"Save bookmark" => "Guardar marcador",
+"You have no bookmarks" => "No tienes marcadores",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/bookmarks/l10n/sv.php b/apps/bookmarks/l10n/sv.php
new file mode 100644
index 0000000000..689bd452f1
--- /dev/null
+++ b/apps/bookmarks/l10n/sv.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Bokmärken",
+"unnamed" => "namnlös",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:",
+"Read later" => "Läs senare",
+"Address" => "Adress",
+"Title" => "Titel",
+"Tags" => "Taggar",
+"Save bookmark" => "Spara bokmärke",
+"You have no bookmarks" => "Du har inga bokmärken",
+"Bookmarklet <br />" => "Skriptbokmärke <br />"
+);
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
index 59f8c6e6b5..e29e96b463 100644
--- a/apps/calendar/l10n/sv.php
+++ b/apps/calendar/l10n/sv.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Alla kalendrar är inte fullständigt sparade i cache",
+"Everything seems to be completely cached" => "Allt verkar vara fullständigt sparat i cache",
 "No calendars found." => "Inga kalendrar funna",
 "No events found." => "Inga händelser funna.",
 "Wrong calendar" => "Fel kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Filen innehöll inga händelser eller så är alla händelser redan sparade i kalendern.",
+"events has been saved in the new calendar" => "händelser har sparats i den nya kalendern",
+"Import failed" => "Misslyckad import",
+"events has been saved in your calendar" => "händelse har sparats i din kalender",
 "New Timezone:" => "Ny tidszon:",
 "Timezone changed" => "Tidszon ändrad",
 "Invalid request" => "Ogiltig begäran",
 "Calendar" => "Kalender",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM åååå",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "ddd, MMM d, åååå",
 "Birthday" => "Födelsedag",
 "Business" => "Företag",
 "Call" => "Ringa",
@@ -22,7 +33,9 @@
 "Projects" => "Projekt",
 "Questions" => "Frågor",
 "Work" => "Arbetet",
+"by" => "av",
 "unnamed" => "Namn saknas",
+"New Calendar" => "Ny kalender",
 "Does not repeat" => "Upprepas inte",
 "Daily" => "Dagligen",
 "Weekly" => "Varje vecka",
@@ -67,8 +80,26 @@
 "by day and month" => "efter dag och månad",
 "Date" => "Datum",
 "Cal." => "Kal.",
+"Sun." => "Sön.",
+"Mon." => "Mån.",
+"Tue." => "Tis.",
+"Wed." => "Ons.",
+"Thu." => "Tor.",
+"Fri." => "Fre.",
+"Sat." => "Lör.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Maj.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "Hela dagen",
-"New Calendar" => "Ny kalender",
 "Missing fields" => "Saknade fält",
 "Title" => "Rubrik",
 "From Date" => "Från datum",
@@ -132,18 +163,17 @@
 "Interval" => "Hur ofta",
 "End" => "Slut",
 "occurrences" => "Händelser",
-"Import a calendar file" => "Importera en kalenderfil",
-"Please choose the calendar" => "Välj kalender",
 "create a new calendar" => "skapa en ny kalender",
+"Import a calendar file" => "Importera en kalenderfil",
+"Please choose a calendar" => "Välj en kalender",
 "Name of new calendar" => "Namn på ny kalender",
+"Take an available name!" => "Ta ett ledigt namn!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "En kalender med detta namn finns redan. Om du fortsätter ändå så kommer dessa kalendrar att slås samman.",
 "Import" => "Importera",
-"Importing calendar" => "Importerar kalender",
-"Calendar imported successfully" => "Kalender importerades utan problem",
 "Close Dialog" => "Stäng ",
 "Create a new event" => "Skapa en ny händelse",
 "View an event" => "Visa en händelse",
 "No categories selected" => "Inga kategorier valda",
-"Select category" => "Välj kategori",
 "of" => "av",
 "at" => "på",
 "Timezone" => "Tidszon",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Första dagen av veckan",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Töm cache för upprepade händelser",
+"Calendar CalDAV syncing addresses" => "Kalender CalDAV synkroniserar adresser",
+"more info" => "mer info",
+"Primary address (Kontact et al)" => "Primary address (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Read only iCalendar link(s)",
 "Users" => "Användare",
 "select users" => "välj användare",
 "Editable" => "Redigerbar",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index 8d5d37d248..bb8f0d0a30 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -1,30 +1,32 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
 "There was an error adding the contact." => "Det uppstod ett fel när kontakt skulle läggas till",
+"id is not set." => "ID är inte satt.",
+"Could not parse contact: " => "Kunde inte läsa kontakt:",
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
-"Error adding contact property." => "Fel när kontaktegenskap skulle läggas till",
+"Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
 "No ID provided" => "Inget ID angett",
 "Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
 "No categories selected for deletion." => "Inga kategorier valda för borttaging",
 "No address books found." => "Ingen adressbok funnen.",
 "No contacts found." => "Inga kontakter funna.",
 "Missing ID" => "ID saknas",
-"Cannot add addressbook with an empty name." => "Kan inte lägga till adressbok med ett tomt namn.",
-"Error adding addressbook." => "Fel när adressbok skulle läggas till",
-"Error activating addressbook." => "Fel uppstod när adressbok skulle aktiveras",
 "No contact ID was submitted." => "Inget kontakt-ID angavs.",
 "Error reading contact photo." => "Fel uppstod när ",
 "Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
 "The loading photo is not valid." => "Det laddade fotot är inte giltigt.",
-"id is not set." => "ID är inte satt.",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
 "Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort",
 "Contact ID is missing." => "Kontakt-ID saknas.",
-"Missing contact id." => "Saknar kontakt-ID.",
 "No photo path was submitted." => "Ingen sökväg till foto angavs.",
 "File doesn't exist:" => "Filen existerar inte.",
 "Error loading image." => "Fel uppstod när bild laddades.",
+"Error saving contact." => "Fel vid sparande av kontakt.",
+"Error resizing image" => "Fel vid storleksförändring av bilden",
+"Error cropping image" => "Fel vid beskärning av bilden",
+"Error creating temporary image" => "Fel vid skapande av tillfällig bild",
+"Error finding image: " => "Kunde inte hitta bild",
 "checksum is not set." => "kontrollsumma är inte satt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
 "Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
@@ -37,8 +39,27 @@
 "The uploaded file was only partially uploaded" => "Den uppladdade filen var bara delvist uppladdad",
 "No file was uploaded" => "Ingen fil laddades upp",
 "Missing a temporary folder" => "En temporär mapp saknas",
+"Couldn't save temporary image: " => "Kunde inte spara tillfällig bild:",
+"Couldn't load temporary image: " => "Kunde inte ladda tillfällig bild:",
+"No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
 "Contacts" => "Kontakter",
-"Drop a VCF file to import contacts." => "Släpp en VCF-fil för att importera kontakter.",
+"Sorry, this functionality has not been implemented yet" => "Tyvärr är denna funktion inte införd än",
+"Not implemented" => "Inte införd",
+"Couldn't get a valid address." => "Kunde inte hitta en giltig adress.",
+"Error" => "Fel",
+"Contact" => "Kontakt",
+"New" => "Ny",
+"New Contact" => "Ny kontakt",
+"This property has to be non-empty." => "Denna egenskap får inte vara tom.",
+"Couldn't serialize elements." => "Kunde inte serialisera element.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org",
+"Edit name" => "Ändra namn",
+"No files selected for upload." => "Inga filer valda för uppladdning",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server.",
+"Select type" => "Välj typ",
+"Result: " => "Resultat:",
+" imported, " => "importerad,",
+" failed." => "misslyckades.",
 "Addressbook not found." => "Hittade inte adressboken",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
@@ -56,25 +77,33 @@
 "Video" => "Video",
 "Pager" => "Personsökare",
 "Internet" => "Internet",
+"Birthday" => "Födelsedag",
+"Business" => "Företag",
+"Call" => "Ring",
+"Clients" => "Kunder",
+"Deliverer" => "Leverera",
+"Holidays" => "Helgdagar",
+"Ideas" => "Idéer",
 "{name}'s Birthday" => "{name}'s födelsedag",
-"Contact" => "Kontakt",
 "Add Contact" => "Lägg till kontakt",
+"Import" => "Importera",
 "Addressbooks" => "Adressböcker",
+"Close" => "Stäng",
 "Configure Address Books" => "Konfigurera adressböcker",
 "New Address Book" => "Ny adressbok",
-"Import from VCF" => "Importera från VCF",
 "CardDav Link" => "CardDAV länk",
 "Download" => "Nedladdning",
 "Edit" => "Redigera",
 "Delete" => "Radera",
-"Download contact" => "Ladda ner kontakt",
-"Delete contact" => "Radera kontakt",
 "Drop photo to upload" => "Släpp foto för att ladda upp",
+"Delete current photo" => "Ta bort aktuellt foto",
+"Edit current photo" => "Redigera aktuellt foto",
+"Upload new photo" => "Ladda upp ett nytt foto",
+"Select photo from ownCloud" => "Välj foto från ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
 "Edit name details" => "Redigera detaljer för namn",
 "Nickname" => "Smeknamn",
 "Enter nickname" => "Ange smeknamn",
-"Birthday" => "Födelsedag",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Separera grupperna med kommatecken",
@@ -90,24 +119,19 @@
 "Edit address details" => "Redigera detaljer för adress",
 "Add notes here." => "Lägg till noteringar här.",
 "Add field" => "Lägg till fält",
-"Profile picture" => "Profilbild",
 "Phone" => "Telefon",
 "Note" => "Notering",
-"Delete current photo" => "Ta bort aktuellt foto",
-"Edit current photo" => "Redigera aktuellt foto",
-"Upload new photo" => "Ladda upp ett nytt foto",
-"Select photo from ownCloud" => "Välj foto från ownCloud",
+"Download contact" => "Ladda ner kontakt",
+"Delete contact" => "Radera kontakt",
+"The temporary image has been removed from cache." => "Den tillfälliga bilden har raderats från cache.",
 "Edit address" => "Editera adress",
 "Type" => "Typ",
 "PO Box" => "Postbox",
 "Extended" => "Utökad",
-"Street" => "Gata",
 "City" => "Stad",
 "Region" => "Län",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Edit categories" => "Editera kategorier",
-"Add" => "Ny",
 "Addressbook" => "Adressbok",
 "Miss" => "Herr",
 "Ms" => "Ingen adressbok funnen.",
@@ -129,10 +153,7 @@
 "Please choose the addressbook" => "Vänligen välj adressboken",
 "create a new addressbook" => "skapa en ny adressbok",
 "Name of new addressbook" => "Namn för ny adressbok",
-"Import" => "Importera",
 "Importing contacts" => "Importerar kontakter",
-"Select address book to import to:" => "Importera till adressbok:",
-"Select from HD" => "Välj från hårddisk",
 "You have no contacts in your addressbook." => "Du har inga kontakter i din adressbok.",
 "Add contact" => "Lägg till en kontakt",
 "Configure addressbooks" => "Konfigurera adressböcker",
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 91e748e300..52480ce7ff 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "لم يتم ترفيع أي من الملفات",
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Files" => "الملفات",
+"Delete" => "محذوف",
 "Size" => "حجم",
 "Modified" => "معدل",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
@@ -16,7 +17,6 @@
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
 "Name" => "الاسم",
 "Download" => "تحميل",
-"Delete" => "محذوف",
 "Upload too large" => "حجم الترفيع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 );
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 83b3608731..329f306d9e 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временната папка",
 "Files" => "Файлове",
+"Delete" => "Изтриване",
 "Size" => "Размер",
 "Modified" => "Променено",
 "Maximum upload size" => "Макс. размер за качване",
@@ -13,7 +14,6 @@
 "Nothing in here. Upload something!" => "Няма нищо, качете нещо!",
 "Name" => "Име",
 "Download" => "Изтегляне",
-"Delete" => "Изтриване",
 "Upload too large" => "Файлът е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 );
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index bce5579010..c23746ac5a 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -9,7 +9,6 @@
 "Files" => "Fitxers",
 "Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
-"undo deletion" => "desfés l'eliminació",
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
 "Upload Error" => "Error en la pujada",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 9a4be26dad..ddaf923d1b 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
 "Failed to write to disk" => "Zápis na disk se nezdařil",
 "Files" => "Soubory",
+"Delete" => "Vymazat",
+"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to chvíli trvat",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nemohu nahrát váš soubor neboť to je adresář a nebo má nulovou délku.",
+"Upload Error" => "Chyba při nahrávání",
+"Pending" => "Očekává se",
+"Upload cancelled." => "Nahrávání zrušeno",
+"Invalid name, '/' is not allowed." => "Špatné jméno, znak '/' není povolen",
 "Size" => "Velikost",
 "Modified" => "Změněno",
+"folder" => "adresář",
+"folders" => "adresáře",
+"file" => "soubor",
+"files" => "soubory",
 "File handling" => "Nastavení chování k souborům",
 "Maximum upload size" => "Maximální velikost ukládaných souborů",
 "max. possible: " => "největší možná:",
@@ -26,7 +37,6 @@
 "Name" => "Název",
 "Share" => "Sdílet",
 "Download" => "Stáhnout",
-"Delete" => "Vymazat",
 "Upload too large" => "Příliš velký soubor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte uložit, překračují maximální velikosti uploadu na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 3683ab8484..d24e2a8dcb 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Files" => "Filer",
+"Delete" => "Slet",
+"generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
+"Upload Error" => "Fejl ved upload",
+"Pending" => "Afventer",
+"Upload cancelled." => "Upload afbrudt.",
+"Invalid name, '/' is not allowed." => "Ugyldigt navn, '/' er ikke tilladt.",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
+"folder" => "mappe",
+"folders" => "mapper",
+"file" => "fil",
+"files" => "filer",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
 "max. possible: " => "max. mulige: ",
@@ -26,7 +37,6 @@
 "Name" => "Navn",
 "Share" => "Del",
 "Download" => "Download",
-"Delete" => "Slet",
 "Upload too large" => "Upload for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 9c5310c43b..ea7ffa5ac5 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -6,11 +6,23 @@
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf Festplatte",
-"Files" => "Files",
+"Files" => "Dateien",
+"Unshare" => "Nicht mehr teilen",
+"Delete" => "Löschen",
+"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Datei kann nicht hochgeladen werden da sie ein Verzeichniss ist oder 0 bytes hat.",
+"Upload Error" => "Fehler beim Hochladen",
+"Pending" => "Anstehend",
+"Upload cancelled." => "Hochladen abgebrochen.",
+"Invalid name, '/' is not allowed." => "Ungültiger Name, \"/\" ist nicht erlaubt.",
 "Size" => "Größe",
 "Modified" => "Bearbeitet",
+"folder" => "Ordner",
+"folders" => "Ordner",
+"file" => "Datei",
+"files" => "Dateien",
 "File handling" => "Dateibehandlung",
-"Maximum upload size" => "Maximum upload size",
+"Maximum upload size" => "Maximale Upload-Größe",
 "max. possible: " => "maximal möglich:",
 "Needed for multi-file and folder downloads." => "Für Mehrfachdateien- und Ordnerdownloads benötigt:",
 "Enable ZIP-download" => "ZIP-Download aktivieren",
@@ -26,7 +38,6 @@
 "Name" => "Name",
 "Share" => "Teilen",
 "Download" => "Herunterladen",
-"Delete" => "Löschen",
 "Upload too large" => "Upload zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Daten werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 042643a6e0..ce154bacb7 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -9,7 +9,6 @@
 "Files" => "Αρχεία",
 "Unshare" => "Ακύρωση Διαμοιρασμού",
 "Delete" => "Διαγραφή",
-"undo deletion" => "αναίρεση διαγραφής",
 "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
 "Upload Error" => "Σφάλμα Μεταφόρτωσης",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 64c380d600..fa9e5eca42 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Files" => "Dosieroj",
+"Delete" => "Forigi",
+"generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
+"Upload Error" => "Alŝuta eraro",
+"Pending" => "Traktotaj",
+"Upload cancelled." => "La alŝuto nuliĝis.",
+"Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
 "Size" => "Grando",
 "Modified" => "Modifita",
+"folder" => "dosierujo",
+"folders" => "dosierujoj",
+"file" => "dosiero",
+"files" => "dosieroj",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
 "max. possible: " => "maks. ebla: ",
@@ -26,7 +37,6 @@
 "Name" => "Nomo",
 "Share" => "Kunhavigi",
 "Download" => "Elŝuti",
-"Delete" => "Forigi",
 "Upload too large" => "Elŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 506218815b..e1376aa42b 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -9,7 +9,6 @@
 "Files" => "Archivos",
 "Unshare" => "No compartir",
 "Delete" => "Eliminado",
-"undo deletion" => "deshacer la eliminación",
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 89bb96581c..a5dd345f8e 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
+"Delete" => "Kustuta",
+"generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
+"Upload Error" => "Üleslaadimise viga",
+"Pending" => "Ootel",
+"Upload cancelled." => "Üleslaadimine tühistati.",
+"Invalid name, '/' is not allowed." => "Vigane nimi, '/' pole lubatud.",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
+"folder" => "kaust",
+"folders" => "kausta",
+"file" => "fail",
+"files" => "faili",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "max. possible: " => "maks. võimalik: ",
@@ -26,7 +37,6 @@
 "Name" => "Nimi",
 "Share" => "Jaga",
 "Download" => "Lae alla",
-"Delete" => "Kustuta",
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index a7ca21f496..588df210a1 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
+"Delete" => "Ezabatu",
+"generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
+"Upload Error" => "Igotzean errore bat suertatu da",
+"Pending" => "Zain",
+"Upload cancelled." => "Igoera ezeztatuta",
+"Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
+"folder" => "karpeta",
+"folders" => "Karpetak",
+"file" => "fitxategia",
+"files" => "fitxategiak",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -26,7 +37,6 @@
 "Name" => "Izena",
 "Share" => "Elkarbanatu",
 "Download" => "Deskargatu",
-"Delete" => "Ezabatu",
 "Upload too large" => "Igotakoa handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 4bb46e1fcf..77173d2836 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "یک پوشه موقت گم شده است",
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
+"Delete" => "پاک کردن",
+"generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
+"Upload Error" => "خطا در بار گذاری",
+"Pending" => "در انتظار",
+"Upload cancelled." => "بار گذاری لغو شد",
+"Invalid name, '/' is not allowed." => "نام نامناسب '/' غیرفعال است",
 "Size" => "اندازه",
 "Modified" => "تغییر یافته",
+"folder" => "پوشه",
+"folders" => "پوشه ها",
+"file" => "پرونده",
+"files" => "پرونده ها",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
 "max. possible: " => "حداکثرمقدارممکن:",
@@ -26,7 +37,6 @@
 "Name" => "نام",
 "Share" => "به اشتراک گذاری",
 "Download" => "بارگیری",
-"Delete" => "پاک کردن",
 "Upload too large" => "حجم بارگذاری بسیار زیاد است",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 8b51d15a91..1b1cfd394c 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -9,7 +9,6 @@
 "Files" => "Tiedostot",
 "Unshare" => "Lopeta jakaminen",
 "Delete" => "Poista",
-"undo deletion" => "kumoa poisto",
 "generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
 "Upload Error" => "Lähetysvirhe.",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 6f5e1ec6b8..ca3d03ad6f 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -9,7 +9,6 @@
 "Files" => "Fichiers",
 "Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
-"undo deletion" => "Annuler la suppression",
 "generating ZIP-file, it may take some time." => "Générer un fichier ZIP, cela peut prendre du temps",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
 "Upload Error" => "Erreur de chargement",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 36eafaefe2..cbbd65217b 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Falta un cartafol temporal",
 "Failed to write to disk" => "Erro ao escribir no disco",
 "Files" => "Ficheiros",
+"Delete" => "Eliminar",
+"generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
+"Upload Error" => "Erro na subida",
+"Pending" => "Pendentes",
+"Upload cancelled." => "Subida cancelada.",
+"Invalid name, '/' is not allowed." => "Nome non válido, '/' non está permitido.",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
+"folder" => "cartafol",
+"folders" => "cartafoles",
+"file" => "ficheiro",
+"files" => "ficheiros",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo de envío",
 "max. possible: " => "máx. posible: ",
@@ -26,7 +37,6 @@
 "Name" => "Nome",
 "Share" => "Compartir",
 "Download" => "Descargar",
-"Delete" => "Eliminar",
 "Upload too large" => "Envío demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros, espere por favor.",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 0876eb952c..65d093e366 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "תיקייה זמנית חסרה",
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
+"Delete" => "מחיקה",
+"generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
+"Upload Error" => "שגיאת העלאה",
+"Pending" => "ממתין",
+"Upload cancelled." => "ההעלאה בוטלה.",
+"Invalid name, '/' is not allowed." => "שם לא חוקי, '/' אסור לשימוש.",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
+"folder" => "תקיה",
+"folders" => "תקיות",
+"file" => "קובץ",
+"files" => "קבצים",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
 "max. possible: " => "המרבי האפשרי: ",
@@ -26,7 +37,6 @@
 "Name" => "שם",
 "Share" => "שיתוף",
 "Download" => "הורדה",
-"Delete" => "מחיקה",
 "Upload too large" => "העלאה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
 "Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 3281d20a61..7d5e61b354 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Nedostaje privremena mapa",
 "Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
+"Delete" => "Briši",
+"generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
+"Upload Error" => "Pogreška pri slanju",
+"Pending" => "U tijeku",
+"Upload cancelled." => "Slanje poništeno.",
+"Invalid name, '/' is not allowed." => "Neispravan naziv, znak '/' nije dozvoljen.",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
+"folder" => "mapa",
+"folders" => "mape",
+"file" => "datoteka",
+"files" => "datoteke",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
 "max. possible: " => "maksimalna moguća: ",
@@ -26,7 +37,6 @@
 "Name" => "Naziv",
 "Share" => "podjeli",
 "Download" => "Preuzmi",
-"Delete" => "Briši",
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
 "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 41255cb409..22d3958516 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
+"Delete" => "Törlés",
+"generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
+"Upload Error" => "Feltöltési hiba",
+"Pending" => "Folyamatban",
+"Upload cancelled." => "Feltöltés megszakítva",
+"Invalid name, '/' is not allowed." => "Érvénytelen név, a '/' nem megengedett",
 "Size" => "Méret",
 "Modified" => "Módosítva",
+"folder" => "mappa",
+"folders" => "mappák",
+"file" => "fájl",
+"files" => "fájlok",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
 "max. possible: " => "max. lehetséges",
@@ -26,7 +37,6 @@
 "Name" => "Név",
 "Share" => "Megosztás",
 "Download" => "Letöltés",
-"Delete" => "Törlés",
 "Upload too large" => "Feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.",
 "Files are being scanned, please wait." => "File-ok vizsgálata, kis türelmet",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 645eba48a1..f9205cb5f6 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -2,6 +2,7 @@
 "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
 "No file was uploaded" => "Nulle file esseva incargate",
 "Files" => "Files",
+"Delete" => "Deler",
 "Size" => "Dimension",
 "Modified" => "Modificate",
 "Maximum upload size" => "Dimension maxime de incargamento",
@@ -12,6 +13,5 @@
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
 "Name" => "Nomine",
 "Download" => "Discargar",
-"Delete" => "Deler",
 "Upload too large" => "Incargamento troppo longe"
 );
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 1f9dc3290a..47ce6429c9 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -5,6 +5,7 @@
 "Missing a temporary folder" => "Kehilangan folder temporer",
 "Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
+"Delete" => "Hapus",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
 "File handling" => "Penanganan berkas",
@@ -24,7 +25,6 @@
 "Name" => "Nama",
 "Share" => "Bagikan",
 "Download" => "Unduh",
-"Delete" => "Hapus",
 "Upload too large" => "Unggahan terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silahkan tunggu.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 0bf113eba1..35ee7a5fdd 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -9,7 +9,6 @@
 "Files" => "File",
 "Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
-"undo deletion" => "annulla l'eliminazione",
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
 "Upload Error" => "Errore di invio",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index c04d0836df..231bbe3dcb 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "テンポラリフォルダが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Files" => "ファイル",
+"Delete" => "削除",
+"generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
+"Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
+"Upload Error" => "アップロードエラー",
+"Pending" => "保留",
+"Upload cancelled." => "アップロードはキャンセルされました。",
+"Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
 "Size" => "サイズ",
 "Modified" => "更新日時",
+"folder" => "フォルダ",
+"folders" => "フォルダ",
+"file" => "ファイル",
+"files" => "ファイル",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
 "max. possible: " => "最大容量: ",
@@ -26,7 +37,6 @@
 "Name" => "名前",
 "Share" => "共有",
 "Download" => "ダウンロード",
-"Delete" => "削除",
 "Upload too large" => "ファイルサイズが大きすぎます",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 70575f0975..218dd0ea2d 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -7,8 +7,18 @@
 "Missing a temporary folder" => "임시 폴더가 사라짐",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Files" => "파일",
+"Delete" => "삭제",
+"generating ZIP-file, it may take some time." => "ZIP파일 생성에 시간이 걸릴 수 있습니다.",
+"Upload Error" => "업로드 에러",
+"Pending" => "보류 중",
+"Upload cancelled." => "업로드 취소.",
+"Invalid name, '/' is not allowed." => "잘못된 이름, '/' 은 허용이 되지 않습니다.",
 "Size" => "크기",
 "Modified" => "수정됨",
+"folder" => "폴더",
+"folders" => "폴더",
+"file" => "파일",
+"files" => "파일",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
 "max. possible: " => "최대. 가능한:",
@@ -26,7 +36,6 @@
 "Name" => "이름",
 "Share" => "공유",
 "Download" => "다운로드",
-"Delete" => "삭제",
 "Upload too large" => "업로드 용량 초과",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색중입니다, 기다려 주십시오.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 548ef4895d..f7a10fbc5c 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Et feelt en temporären Dossier",
 "Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
+"Delete" => "Läschen",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
 "File handling" => "Fichier handling",
@@ -26,7 +27,6 @@
 "Name" => "Numm",
 "Share" => "Share",
 "Download" => "Eroflueden",
-"Delete" => "Läschen",
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
 "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index e876e743a4..14c7a1a6ff 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -7,9 +7,22 @@
 "Missing a temporary folder" => "Nėra laikinojo katalogo",
 "Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Files" => "Failai",
+"Delete" => "Ištrinti",
+"generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
+"Upload Error" => "Įkėlimo klaida",
+"Upload cancelled." => "Įkėlimas atšauktas.",
+"Invalid name, '/' is not allowed." => "Pavadinime negali būti naudojamas ženklas \"/\".",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
+"folder" => "katalogas",
+"folders" => "katalogai",
+"file" => "failas",
+"files" => "failai",
 "Maximum upload size" => "Maksimalus failo dydis",
+"Enable ZIP-download" => "Įjungti atsisiuntimą ZIP archyvu",
+"0 is unlimited" => "0 yra neribotas",
+"Maximum input size for ZIP files" => "Maksimalus ZIP archyvo failo dydis",
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
@@ -20,7 +33,8 @@
 "Name" => "Pavadinimas",
 "Share" => "Dalintis",
 "Download" => "Atsisiųsti",
-"Delete" => "Ištrinti",
 "Upload too large" => "Įkėlimui failas per didelis",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje",
+"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
+"Current scanning" => "Šiuo metu skenuojama"
 );
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index d3efa4d022..4e1eccff25 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Не постои привремена папка",
 "Failed to write to disk" => "Неуспеав да запишам на диск",
 "Files" => "Датотеки",
+"Delete" => "Избриши",
+"generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
+"Upload Error" => "Грешка при преземање",
+"Pending" => "Чека",
+"Upload cancelled." => "Преземањето е прекинато.",
+"Invalid name, '/' is not allowed." => "неисправно име, '/' не е дозволено.",
 "Size" => "Големина",
 "Modified" => "Променето",
+"folder" => "фолдер",
+"folders" => "фолдери",
+"file" => "датотека",
+"files" => "датотеки",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
 "max. possible: " => "макс. можно:",
@@ -26,7 +37,6 @@
 "Name" => "Име",
 "Share" => "Сподели",
 "Download" => "Преземи",
-"Delete" => "Избриши",
 "Upload too large" => "Датотеката е премногу голема",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 1a1d72a01b..f0870c79ed 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -5,18 +5,40 @@
 "The uploaded file was only partially uploaded" => "Sebahagian daripada fail telah dimuat naik. ",
 "No file was uploaded" => "Tiada fail yang dimuat naik",
 "Missing a temporary folder" => "Folder sementara hilang",
+"Failed to write to disk" => "Gagal untuk disimpan",
 "Files" => "fail",
+"Delete" => "Padam",
+"generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
+"Upload Error" => "Muat naik ralat",
+"Pending" => "Dalam proses",
+"Upload cancelled." => "Muatnaik dibatalkan.",
+"Invalid name, '/' is not allowed." => "penggunaa nama tidak sah, '/' tidak dibenarkan.",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
+"folder" => "direktori",
+"folders" => "direktori",
+"file" => "fail",
+"files" => "fail",
+"File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
+"max. possible: " => "maksimum:",
+"Needed for multi-file and folder downloads." => "Diperlukan untuk muatturun fail pelbagai ",
+"Enable ZIP-download" => "Aktifkan muatturun ZIP",
+"0 is unlimited" => "0 adalah tanpa had",
+"Maximum input size for ZIP files" => "Saiz maksimum input untuk fail ZIP",
 "New" => "Baru",
 "Text file" => "Fail teks",
 "Folder" => "Folder",
+"From url" => "Dari url",
 "Upload" => "Muat naik",
+"Cancel upload" => "Batal muat naik",
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
 "Name" => "Nama ",
+"Share" => "Kongsi",
 "Download" => "Muat turun",
-"Delete" => "Padam",
 "Upload too large" => "Muat naik terlalu besar",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
+"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
+"Current scanning" => "Imbasan semasa"
 );
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 0f4cc33ae3..f02de12615 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -7,8 +7,15 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
+"Delete" => "Slett",
+"generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
+"Pending" => "Ventende",
 "Size" => "Størrelse",
 "Modified" => "Endret",
+"folder" => "mappe",
+"folders" => "mapper",
+"file" => "fil",
+"files" => "filer",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
 "max. possible: " => "max. mulige:",
@@ -26,7 +33,6 @@
 "Name" => "Navn",
 "Share" => "Del",
 "Download" => "Last ned",
-"Delete" => "Slett",
 "Upload too large" => "Opplasting for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 119f6034f1..b093dc3ce1 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
+"Delete" => "Verwijder",
+"generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
+"Upload Error" => "Upload Fout",
+"Pending" => "Wachten",
+"Upload cancelled." => "Uploaden geannuleerd.",
+"Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
 "Size" => "Bestandsgrootte",
 "Modified" => "Laatst aangepast",
+"folder" => "map",
+"folders" => "mappen",
+"file" => "bestand",
+"files" => "bestanden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
@@ -26,7 +37,6 @@
 "Name" => "Naam",
 "Share" => "Delen",
 "Download" => "Download",
-"Delete" => "Verwijder",
 "Upload too large" => "Bestanden te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 002e85de5c..d6af730249 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "Ingen filer vart lasta opp",
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Files" => "Filer",
+"Delete" => "Slett",
 "Size" => "Storleik",
 "Modified" => "Endra",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
@@ -16,7 +17,6 @@
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Name" => "Namn",
 "Download" => "Last ned",
-"Delete" => "Slett",
 "Upload too large" => "For stor opplasting",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
 );
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index bfdd04659d..67a29b4661 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Brak katalogu tymczasowego",
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
+"Delete" => "Usuwa element",
+"generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
+"Upload Error" => "Błąd wczytywania",
+"Pending" => "Oczekujące",
+"Upload cancelled." => "Wczytywanie anulowane.",
+"Invalid name, '/' is not allowed." => "Nieprawidłowa nazwa '/' jest niedozwolone.",
 "Size" => "Rozmiar",
 "Modified" => "Czas modyfikacji",
+"folder" => "folder",
+"folders" => "foldery",
+"file" => "plik",
+"files" => "pliki",
 "File handling" => "Zarządzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
 "max. possible: " => "max. możliwych",
@@ -26,7 +37,6 @@
 "Name" => "Nazwa",
 "Share" => "Współdziel",
 "Download" => "Pobiera element",
-"Delete" => "Usuwa element",
 "Upload too large" => "Wysyłany plik ma za duży rozmiar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index b70406f517..b783c37cb0 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Pasta temporária não encontrada",
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Files" => "Arquivos",
+"Delete" => "Excluir",
+"generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
+"Upload Error" => "Erro de envio",
+"Pending" => "Pendente",
+"Upload cancelled." => "Envio cancelado.",
+"Invalid name, '/' is not allowed." => "Nome inválido, '/' não é permitido.",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
+"folder" => "pasta",
+"folders" => "pastas",
+"file" => "arquivo",
+"files" => "arquivos",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
@@ -26,7 +37,6 @@
 "Name" => "Nome",
 "Share" => "Compartilhar",
 "Download" => "Baixar",
-"Delete" => "Excluir",
 "Upload too large" => "Arquivo muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index ac22430282..6e5ffce797 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Falta uma pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Files" => "Ficheiros",
+"Delete" => "Apagar",
+"generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possivel fazer o upload do ficheiro devido a ser uma pasta ou ter 0 bytes",
+"Upload Error" => "Erro no upload",
+"Pending" => "Pendente",
+"Upload cancelled." => "O upload foi cancelado.",
+"Invalid name, '/' is not allowed." => "nome inválido, '/' não permitido.",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
+"folder" => "pasta",
+"folders" => "pastas",
+"file" => "ficheiro",
+"files" => "ficheiros",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
 "max. possible: " => "max. possivel: ",
@@ -26,7 +37,6 @@
 "Name" => "Nome",
 "Share" => "Partilhar",
 "Download" => "Transferir",
-"Delete" => "Apagar",
 "Upload too large" => "Envio muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index e6f0294fd3..58a6d2454f 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Lipsește un dosar temporar",
 "Failed to write to disk" => "Eroare la scriere pe disc",
 "Files" => "Fișiere",
+"Delete" => "Șterge",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
 "File handling" => "Manipulare fișiere",
@@ -26,7 +27,6 @@
 "Name" => "Nume",
 "Share" => "Partajează",
 "Download" => "Descarcă",
-"Delete" => "Șterge",
 "Upload too large" => "Fișierul încărcat este prea mare",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
 "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 45648012a1..99bb6df8f8 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Delete" => "Удалить",
+"generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
+"Upload Error" => "Ошибка загрузки",
+"Pending" => "Ожидание",
+"Upload cancelled." => "Загрузка отменена.",
+"Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
 "Size" => "Размер",
 "Modified" => "Изменен",
+"folder" => "папка",
+"folders" => "папки",
+"file" => "файл",
+"files" => "файлы",
 "File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер файла",
 "max. possible: " => "макс. возможно: ",
@@ -26,7 +37,6 @@
 "Name" => "Название",
 "Share" => "Поделиться",
 "Download" => "Скачать",
-"Delete" => "Удалить",
 "Upload too large" => "Файл слишком большой",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь закачать, превышают лимит для файлов на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 2a7e84af6c..8a31c55032 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Chýbajúci dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Files" => "Súbory",
+"Delete" => "Odstrániť",
+"generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
+"Upload Error" => "Chyba nahrávania",
+"Pending" => "Čaká sa",
+"Upload cancelled." => "Nahrávanie zrušené",
+"Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
+"folder" => "priečinok",
+"folders" => "priečinky",
+"file" => "súbor",
+"files" => "súbory",
 "File handling" => "Nastavenie správanie k súborom",
 "Maximum upload size" => "Maximálna veľkosť nahratia",
 "max. possible: " => "najväčšie možné:",
@@ -26,7 +37,6 @@
 "Name" => "Meno",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
-"Delete" => "Odstrániť",
 "Upload too large" => "Nahrávanie príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Súbory sa práve prehľadávajú, prosím čakajte.",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 80df2b385f..a4f3b57888 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -9,7 +9,6 @@
 "Files" => "Datoteke",
 "Unshare" => "Vzemi iz souporabe",
 "Delete" => "Izbriši",
-"undo deletion" => "prekliči izbris",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
 "Upload Error" => "Napaka pri nalaganju",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 68c50d5282..84164e25c6 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "Ниједан фајл није послат",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Files" => "Фајлови",
+"Delete" => "Обриши",
 "Size" => "Величина",
 "Modified" => "Задња измена",
 "Maximum upload size" => "Максимална величина пошиљке",
@@ -16,7 +17,6 @@
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
 "Name" => "Име",
 "Download" => "Преузми",
-"Delete" => "Обриши",
 "Upload too large" => "Пошиљка је превелика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
 );
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index 63843fc8b5..96c567aec4 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "Nijedan fajl nije poslat",
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
+"Delete" => "Obriši",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
@@ -13,7 +14,6 @@
 "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
 "Name" => "Ime",
 "Download" => "Preuzmi",
-"Delete" => "Obriši",
 "Upload too large" => "Pošiljka je prevelika",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 );
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index f508f22f3c..f3d936ff84 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -7,8 +7,20 @@
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
+"Unshare" => "Sluta dela",
+"Delete" => "Ta bort",
+"generating ZIP-file, it may take some time." => "Gererar ZIP-fil. Det kan ta lite tid.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
+"Upload Error" => "Uppladdningsfel",
+"Pending" => "Väntar",
+"Upload cancelled." => "Uppladdning avbruten.",
+"Invalid name, '/' is not allowed." => "Ogiltigt namn, '/' är inte tillåten.",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
+"folder" => "mapp",
+"folders" => "mappar",
+"file" => "fil",
+"files" => "filer",
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
 "max. possible: " => "max. möjligt:",
@@ -26,7 +38,6 @@
 "Name" => "Namn",
 "Share" => "Dela",
 "Download" => "Ladda ned",
-"Delete" => "Ta bort",
 "Upload too large" => "För stor uppladdning",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
 "Files are being scanned, please wait." => "Filerna skannas, var god vänta",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index ec538262e0..4299c31a45 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Delete" => "ลบ",
+"generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
+"Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
+"Pending" => "อยู่ระหว่างดำเนินการ",
+"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
+"Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน",
 "Size" => "ขนาด",
 "Modified" => "ปรับปรุงล่าสุด",
+"folder" => "โฟลเดอร์",
+"folders" => "โฟลเดอร์",
+"file" => "ไฟล์",
+"files" => "ไฟล์",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
 "max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ",
@@ -26,7 +37,6 @@
 "Name" => "ชื่อ",
 "Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
-"Delete" => "ลบ",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index b8de8249a1..0ecbcadb48 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Delete" => "Sil",
+"generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
+"Upload Error" => "Yükleme hatası",
+"Pending" => "Bekliyor",
+"Upload cancelled." => "Yükleme iptal edildi.",
+"Invalid name, '/' is not allowed." => "Geçersiz isim, '/' işaretine izin verilmiyor.",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",
+"folder" => "dizin",
+"folders" => "dizinler",
+"file" => "dosya",
+"files" => "dosyalar",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
 "max. possible: " => "mümkün olan en fazla: ",
@@ -26,7 +37,6 @@
 "Name" => "Ad",
 "Share" => "Paylaş",
 "Download" => "İndir",
-"Delete" => "Sil",
 "Upload too large" => "Yüklemeniz çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 8b21cb26a3..743bc57fee 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
+"Delete" => "Видалити",
 "Size" => "Розмір",
 "Modified" => "Змінено",
 "Maximum upload size" => "Максимальний розмір відвантажень",
@@ -16,7 +17,6 @@
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Name" => "Ім'я",
 "Download" => "Завантажити",
-"Delete" => "Видалити",
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index c2e6541f2a..80693ba1d4 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,8 +7,19 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Files" => "文件",
+"Delete" => "删除",
+"generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
+"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
+"Upload Error" => "上传错误",
+"Pending" => "操作等待中",
+"Upload cancelled." => "上传已取消",
+"Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。",
 "Size" => "大小",
 "Modified" => "修改日期",
+"folder" => "文件夹",
+"folders" => "文件夹",
+"file" => "文件",
+"files" => "文件",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能: ",
@@ -26,7 +37,6 @@
 "Name" => "名称",
 "Share" => "共享",
 "Download" => "下载",
-"Delete" => "删除",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大大小",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 91a1344ca3..bc8aa4ff89 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "遺失暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
+"Delete" => "刪除",
 "Size" => "大小",
 "Modified" => "修改",
 "File handling" => "檔案處理",
@@ -26,7 +27,6 @@
 "Name" => "名稱",
 "Share" => "分享",
 "Download" => "下載",
-"Delete" => "刪除",
 "Upload too large" => "上傳過大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
diff --git a/apps/gallery/l10n/sv.php b/apps/gallery/l10n/sv.php
index 520d271df1..b63a89d90f 100644
--- a/apps/gallery/l10n/sv.php
+++ b/apps/gallery/l10n/sv.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
-"Settings" => "Inställningar",
-"Rescan" => "Sök igen",
-"Stop" => "Stoppa",
-"Share" => "Dela",
+"Share gallery" => "Dela galleri",
+"Error: " => "Fel:",
+"Internal error" => "Internt fel",
+"Slideshow" => "Bildspel",
 "Back" => "Tillbaka",
 "Remove confirmation" => "Vill du säkert ta bort",
 "Do you want to remove album" => "Vill du ta bort albumet",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 9fcd5c8496..549f184c26 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -2,36 +2,54 @@
 "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",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"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}" => "Nutze folgenden Link, um dein 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.",
+"You will receive a link to reset your password via Email." => "Du erhälst einen Link, um dein 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.",
+"Your password was reset" => "Dein 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",
 "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",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index fd53952184..7dcb0d7aac 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -2,7 +2,25 @@
 "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+=",
+"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.",
diff --git a/l10n/af/files.po b/l10n/af/files.po
index 142439d4d9..c6bfa607c9 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,43 +7,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -51,8 +51,20 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -79,27 +91,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -171,10 +183,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr ""
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr ""
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index eaf684ef80..318a459be4 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "تم ترفيع الملفات بنجاح."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حجم الملف الذي تريد ترفيعه أعلى مما upload_max_filesize يسمح به في ملف php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "لم يتم ترفيع أي من الملفات"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "المجلد المؤقت غير موجود"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -52,8 +52,20 @@ msgstr ""
 msgid "Files"
 msgstr "الملفات"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "محذوف"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -80,27 +92,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -172,10 +184,6 @@ msgstr ""
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "محذوف"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index 3b87221937..ddc698c369 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,11 @@ msgid "Delete"
 msgstr ""
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index e81c2f2a9c..c87744a21d 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Файлът е качен успешно"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Файлът който се опитвате да качите, надвишава зададените стойности в upload_max_filesize в PHP.INI"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файлът е качен частично"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Фахлът не бе качен"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Липсва временната папка"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -52,8 +52,20 @@ msgstr ""
 msgid "Files"
 msgstr "Файлове"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Изтриване"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -80,27 +92,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -172,10 +184,6 @@ msgstr ""
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Изтриване"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Файлът е прекалено голям"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index c66676acba..538b9da7fe 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 07:07+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,8 +62,12 @@ msgid "Delete"
 msgstr "Suprimeix"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "desfés l'eliminació"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 23b3d0b036..8ba79199e8 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Soubor byl odeslán úspěšně"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Odeslaný soubor přesáhl velikostí parametr upload_max_filesize v php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Odeslaný soubor přesáhl velikostí parametr MAX_FILE_SIZE specifikovaný v HTML formuláři"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslán pouze částečně"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Soubor nebyl odeslán"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Chybí adresář pro sočasné soubory"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Zápis na disk se nezdařil"
 
@@ -53,57 +53,69 @@ msgstr "Zápis na disk se nezdařil"
 msgid "Files"
 msgstr "Soubory"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Vymazat"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "generuji ZIP soubor, může to chvíli trvat"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nemohu nahrát váš soubor neboť to je adresář a nebo má nulovou délku."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Chyba při nahrávání"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Očekává se"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Nahrávání zrušeno"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Špatné jméno, znak '/' není povolen"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "adresář"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "adresáře"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "soubor"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "soubory"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "Sdílet"
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Vymazat"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Příliš velký soubor"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index d7990d5d94..fdf9ce4e67 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -6,47 +6,48 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Der er ingen fejl, filen blev uploadet med success"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uploadede fil overskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uploadede file blev kun delvist uploadet"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uploadet"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
@@ -54,57 +55,69 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Files"
 msgstr "Filer"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Slet"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "genererer ZIP-fil, det kan tage lidt tid."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Fejl ved upload"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Afventer"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Upload afbrudt."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ugyldigt navn, '/' er ikke tilladt."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "mappe"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mapper"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fil"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "filer"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -174,10 +187,6 @@ msgstr "Del"
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Slet"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Upload for stor"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 2d88b3ef59..9d8ff1066c 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -8,14 +8,17 @@
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
+# Phi Lieb <>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 18:47+0000\n"
+"Last-Translator: Phi Lieb <>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,87 +39,83 @@ msgstr "Kategorie existiert bereits:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-msgstr ""
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "March"
-msgstr ""
+msgstr "März"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "May"
-msgstr ""
+msgstr "Mai"
+
+#: js/js.js:519
+msgid "June"
+msgstr "Juni"
 
 #: js/js.js:520
-msgid "June"
-msgstr ""
-
-#: js/js.js:521
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "December"
-msgstr ""
+msgstr "Dezember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nein"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Keine Kategorien zum Löschen angegeben."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "ownCloud Passwort zurücksetzen"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr "ownCloud Passwort zurücksetzen"
+msgstr "ownCloud-Passwort zurücksetzen"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -124,7 +123,7 @@ msgstr "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen."
+msgstr "Du erhälst einen Link, um dein Passwort per E-Mail zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -137,7 +136,7 @@ msgstr "Login fehlgeschlagen!"
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
 msgid "Username"
-msgstr "Nutzername"
+msgstr "Benutzername"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
@@ -145,7 +144,7 @@ msgstr "Anfrage zurückgesetzt"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Ihr Passwort wurde zurückgesetzt."
+msgstr "Dein Passwort wurde zurückgesetzt."
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -165,7 +164,7 @@ msgstr "Persönlich"
 
 #: strings.php:6
 msgid "Users"
-msgstr "Nutzer"
+msgstr "Benutzer"
 
 #: strings.php:7
 msgid "Apps"
@@ -173,7 +172,7 @@ msgstr "Anwendungen"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Verwaltung"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -197,7 +196,7 @@ msgstr "Hinzufügen"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr "<strong>Admin-Konto</strong> anlegen"
+msgstr "<strong>Administrator-Konto</strong> anlegen"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -222,15 +221,15 @@ msgstr "wird genutzt"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Datenbanknutzer"
+msgstr "Datenbank-Benutzer"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr "Datenbankpasswort"
+msgstr "Datenbank-Passwort"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr "Datenbankname"
+msgstr "Datenbank-Name"
 
 #: templates/installation.php:96
 msgid "Database host"
@@ -244,11 +243,11 @@ msgstr "Installation abschließen"
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
+#: templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Einstellungen"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index b7f6cb08c3..61d7972e88 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -9,106 +9,119 @@
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Datei fehlerfrei hochgeladen."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Temporärer Ordner fehlt."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
 #: appinfo/app.php:6
 msgid "Files"
-msgstr "Files"
+msgstr "Dateien"
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Nicht mehr teilen"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Löschen"
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Datei kann nicht hochgeladen werden da sie ein Verzeichniss ist oder 0 bytes hat."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Fehler beim Hochladen"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Anstehend"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Hochladen abgebrochen."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ungültiger Name, \"/\" ist nicht erlaubt."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "Ordner"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "Ordner"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "Datei"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "Dateien"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -116,7 +129,7 @@ msgstr "Dateibehandlung"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maximum upload size"
+msgstr "Maximale Upload-Größe"
 
 #: templates/admin.php:7
 msgid "max. possible: "
@@ -178,10 +191,6 @@ msgstr "Teilen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Löschen"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Upload zu groß"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index cb3103a3eb..b487d24a1d 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 14:29+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"PO-Revision-Date: 2012-07-29 16:32+0000\n"
+"Last-Translator: Phi Lieb <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,74 +41,74 @@ msgstr "Apps"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administrator"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-Download ist deaktiviert."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Zurück zu \"Dateien\""
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Die gewählten Dateien sind zu groß, um eine zip-Datei zu generieren."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Anwendung ist nicht aktiviert"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Authentifizierungs-Fehler"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token abgelaufen. Bitte Seite neuladen."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "vor wenigen Sekunden"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "Vor einer Minute"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "Vor %d Minuten"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "Heute"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "Gestern"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "Vor %d Tagen"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "Letzten Monat"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "Vor Monaten"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "Letztes Jahr"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "Vor Jahren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index c996adc2c5..92690194d8 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 20:42+0000\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"PO-Revision-Date: 2012-07-29 18:48+0000\n"
 "Last-Translator: Phi Lieb <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr "Log"
 
 #: templates/admin.php:55
 msgid "More"
-msgstr "mehr"
+msgstr "Mehr"
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index abadb91274..77eeadf487 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 08:08+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,8 +63,12 @@ msgid "Delete"
 msgstr "Διαγραφή"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "αναίρεση διαγραφής"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 70c2cce272..fa37219fcc 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "La dosiero alŝutita superas laregulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "La alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Neniu dosiero estas alŝutita"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Mankas tempa dosierujo"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
@@ -52,57 +52,69 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Files"
 msgstr "Dosieroj"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Forigi"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Alŝuta eraro"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Traktotaj"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "La alŝuto nuliĝis."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nevalida nomo, “/” ne estas permesata."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "dosierujo"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "dosierujoj"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "dosiero"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "dosieroj"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -172,10 +184,6 @@ msgstr "Kunhavigi"
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Forigi"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Elŝuto tro larĝa"
diff --git a/l10n/es/bookmarks.po b/l10n/es/bookmarks.po
index 7cd3e5bf34..d00d8c372b 100644
--- a/l10n/es/bookmarks.po
+++ b/l10n/es/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 04:30+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Marcadores"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "sin nombre"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Leer después"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetas"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Guardar marcador"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "No tienes marcadores"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index ccd3fc76a0..6de4ca7f56 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 23:05+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,8 +63,12 @@ msgid "Delete"
 msgstr "Eliminado"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "deshacer la eliminación"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 194013f4b0..e5e6215db3 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"PO-Revision-Date: 2012-07-29 04:34+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Solicitud no válida"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Error de autenticación"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -210,7 +210,7 @@ msgstr "Otro"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -218,7 +218,7 @@ msgstr "Cuota"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "SubAdmin para ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 8e2e2f4090..99d68cbc01 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi viga pole, fail on üles laetud"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Üles laetud faili suurus ületab php.ini määratud upload_max_filesize suuruse"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
@@ -52,57 +52,69 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Files"
 msgstr "Failid"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Kustuta"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "ZIP-faili loomine, see võib veidi aega võtta."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Üleslaadimise viga"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Ootel"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Üleslaadimine tühistati."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Vigane nimi, '/' pole lubatud."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "kaust"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "kausta"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fail"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "faili"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -172,10 +184,6 @@ msgstr "Jaga"
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Kustuta"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 28b55a998c..e4da710339 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da arazorik izan, fitxategia ongi igo da"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Igotako fitxategiaren tamaina php.ini-ko upload_max_filesize direktiban adierazitakoa  baino handiagoa da"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Aldi baterako karpeta falta da"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
@@ -53,57 +53,69 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Files"
 msgstr "Fitxategiak"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Ezabatu"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Igotzean errore bat suertatu da"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Zain"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Igoera ezeztatuta"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Baliogabeko izena, '/' ezin da erabili. "
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "karpeta"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "Karpetak"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fitxategia"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "fitxategiak"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "Elkarbanatu"
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Ezabatu"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Igotakoa handiegia da"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index b58f617676..ba78e2c9ca 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حداکثر حجم تعیین شده برای بارگذاری در php.ini قابل ویرایش است"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "مقدار کمی از فایل بارگذاری شده"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "هیچ فایلی بارگذاری نشده"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده است"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
@@ -52,57 +52,69 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 msgid "Files"
 msgstr "فایل ها"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "پاک کردن"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "خطا در بار گذاری"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "در انتظار"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "بار گذاری لغو شد"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "پوشه"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "پوشه ها"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "پرونده"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "پرونده ها"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -172,10 +184,6 @@ msgstr "به اشتراک گذاری"
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "پاک کردن"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "حجم بارگذاری بسیار زیاد است"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 6a784e5631..59576c1e40 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 10:42+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,8 +64,12 @@ msgid "Delete"
 msgstr "Poista"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "kumoa poisto"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index cc037ee774..13258b290f 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:03+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,8 +64,12 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "Annuler la suppression"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 971843534c..adf4d9a4f8 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Non hai erros, o ficheiro enviouse correctamente"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O ficheiro enviado supera a directiva upload_max_filesize no php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado foi só parcialmente enviado"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Falta un cartafol temporal"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Erro ao escribir no disco"
 
@@ -53,57 +53,69 @@ msgstr "Erro ao escribir no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Eliminar"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "xerando ficheiro ZIP, pode levar un anaco."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Erro na subida"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Pendentes"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Subida cancelada."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nome non válido, '/' non está permitido."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "cartafol"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "cartafoles"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "ficheiro"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "ficheiros"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "Compartir"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Eliminar"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 12ed075b22..a690a80bc3 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -3,49 +3,50 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "לא אירעה תקלה, הקבצים הועלו בהצלחה"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "הקובץ שהועלה חרג מההנחיה upload_max_filesize בקובץ php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ שהועלה הועלה בצורה חלקית"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "לא הועלו קבצים"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "תיקייה זמנית חסרה"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
@@ -53,57 +54,69 @@ msgstr "הכתיבה לכונן נכשלה"
 msgid "Files"
 msgstr "קבצים"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "מחיקה"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "יוצר קובץ ZIP, אנא המתן."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "שגיאת העלאה"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "ממתין"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "ההעלאה בוטלה."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "שם לא חוקי, '/' אסור לשימוש."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "תקיה"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "תקיות"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "קובץ"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "קבצים"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +186,6 @@ msgstr "שיתוף"
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "מחיקה"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index e9ae4069b9..f94c9ee4bc 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -3,49 +3,49 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011.
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
 # Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je poslana uspješno i bez pogrešaka"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Poslana datoteka izlazi iz okvira upload_max_size direktive postavljene u php.ini konfiguracijskoj datoteci"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je poslana samo djelomično"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ni jedna datoteka nije poslana"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena mapa"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
@@ -53,57 +53,69 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Briši"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "generiranje ZIP datoteke, ovo može potrajati."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Pogreška pri slanju"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "U tijeku"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Slanje poništeno."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Neispravan naziv, znak '/' nije dozvoljen."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "mapa"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mape"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "datoteka"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "datoteke"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "podjeli"
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Briši"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 12a4d449b2..a7826f3be5 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,43 +10,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Nincs hiba, a fájl sikeresen feltöltve."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "A feltöltött file meghaladja az upload_max_filesize direktívát a php.ini-ben."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a HTML form-ban."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fájl csak részlegesen van feltöltve."
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nem lett fájl feltöltve."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Hiányzik az ideiglenes könyvtár"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Nem írható lemezre"
 
@@ -54,57 +54,69 @@ msgstr "Nem írható lemezre"
 msgid "Files"
 msgstr "Fájlok"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Törlés"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Feltöltési hiba"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Folyamatban"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Feltöltés megszakítva"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Érvénytelen név, a '/' nem megengedett"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "mappa"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mappák"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fájl"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "fájlok"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -174,10 +186,6 @@ msgstr "Megosztás"
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Törlés"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Feltöltés túl nagy"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index e0a959181a..a89c7b0efe 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,43 +7,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -51,8 +51,20 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -79,27 +91,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -171,10 +183,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr ""
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 6d9a5ffc3f..ac35031953 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -53,8 +53,20 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Deler"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -81,27 +93,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -173,10 +185,6 @@ msgstr ""
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Deler"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 8e1f3da575..266e210ae2 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Tidak ada galat, berkas sukses diunggah"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Kehilangan folder temporer"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
@@ -53,8 +53,20 @@ msgstr "Gagal menulis ke disk"
 msgid "Files"
 msgstr "Berkas"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Hapus"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -81,27 +93,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -173,10 +185,6 @@ msgstr "Bagikan"
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Hapus"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Unggahan terlalu besar"
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index 6fc758f596..80f24e91fe 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_ID/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,11 @@ msgid "Delete"
 msgstr ""
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 196985d5f8..ae00b01ac9 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 20:35+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,8 +64,12 @@ msgid "Delete"
 msgstr "Elimina"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "annulla l'eliminazione"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 6e34a2dc60..9be02066db 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "アップロードされたファイルはphp.iniのupload_max_filesizeに設定されたサイズを超えています"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "ファイルは一部分しかアップロードされませんでした"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "テンポラリフォルダが見つかりません"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "ディスクへの書き込みに失敗しました"
 
@@ -52,57 +52,69 @@ msgstr "ディスクへの書き込みに失敗しました"
 msgid "Files"
 msgstr "ファイル"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "削除"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "アップロードエラー"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "保留"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "アップロードはキャンセルされました。"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "フォルダ"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "フォルダ"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "ファイル"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "ファイル"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -172,10 +184,6 @@ msgstr "共有"
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "削除"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "ファイルサイズが大きすぎます"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 07ce95f06a..ff96bf8195 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "업로드에 성공하였습니다."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "업로드한 파일이 php.ini에서 지정한 upload_max_filesize보다 더 큼"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "파일이 부분적으로 업로드됨"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "업로드된 파일 없음"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "임시 폴더가 사라짐"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
@@ -53,13 +53,25 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Files"
 msgstr "파일"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "삭제"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -67,43 +79,43 @@ msgstr ""
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "업로드 에러"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "보류 중"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "업로드 취소."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "폴더"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "폴더"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "파일"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "파일"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "공유"
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "삭제"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "업로드 용량 초과"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 5936d91124..f2d9007576 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Déi ropgelueden Datei ass méi grouss wei d'upload_max_filesize Eegenschaft an der php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Et ass keng Datei ropgelueden ginn"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporären Dossier"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
@@ -52,8 +52,20 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Files"
 msgstr "Dateien"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Läschen"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -80,27 +92,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -172,10 +184,6 @@ msgstr "Share"
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Läschen"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Upload ze grouss"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index b1643eeead..a3f2ed1f7b 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,48 +3,49 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denisas Kulumbegašvili <>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Klaidų nėra, failas įkeltas sėkmingai"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Įkeliamo failo dydis viršija upload_max_filesize parametrą php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas nė vienas failas"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Nėra laikinojo katalogo"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
@@ -52,21 +53,33 @@ msgstr "Nepavyko įrašyti į diską"
 msgid "Files"
 msgstr "Failai"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Ištrinti"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Įkėlimo klaida"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
@@ -74,35 +87,35 @@ msgstr ""
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Įkėlimas atšauktas."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "katalogas"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "katalogai"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "failas"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "failai"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -122,15 +135,15 @@ msgstr ""
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Įjungti atsisiuntimą ZIP archyvu"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 yra neribotas"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksimalus ZIP archyvo failo dydis"
 
 #: templates/index.php:7
 msgid "New"
@@ -172,10 +185,6 @@ msgstr "Dalintis"
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Ištrinti"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
@@ -188,8 +197,8 @@ msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame ser
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Skenuojami failai, prašome palaukti."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Šiuo metu skenuojama"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index ebe4eba051..055364d0d7 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 12:41+0000\n"
-"Last-Translator: CPDZ <aldis@udris.lv>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +61,11 @@ msgid "Delete"
 msgstr "Izdzēst"
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index e4ad1541e9..010215ad8b 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -4,48 +4,49 @@
 # 
 # Translators:
 # Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Нема грешка, датотеката беше подигната успешно"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Не постои привремена папка"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
@@ -53,57 +54,69 @@ msgstr "Неуспеав да запишам на диск"
 msgid "Files"
 msgstr "Датотеки"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Избриши"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Грешка при преземање"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Чека"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Преземањето е прекинато."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "неисправно име, '/' не е дозволено."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "фолдер"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "фолдери"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "датотека"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "датотеки"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +186,6 @@ msgstr "Сподели"
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Избриши"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Датотеката е премногу голема"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 3720c95152..6220c70851 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -5,109 +5,123 @@
 # Translators:
 # Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat, fail berjaya dimuat naik."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Fail yang dimuat naik melebihi penyata upload_max_filesize dalam php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Sebahagian daripada fail telah dimuat naik. "
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Tiada fail yang dimuat naik"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Folder sementara hilang"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Gagal untuk disimpan"
 
 #: appinfo/app.php:6
 msgid "Files"
 msgstr "fail"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Padam"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Muat naik ralat"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Dalam proses"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Muatnaik dibatalkan."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "direktori"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "direktori"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fail"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "fail"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Pengendalian fail"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -115,23 +129,23 @@ msgstr "Saiz maksimum muat naik"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "maksimum:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Diperlukan untuk muatturun fail pelbagai "
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Aktifkan muatturun ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 adalah tanpa had"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Saiz maksimum input untuk fail ZIP"
 
 #: templates/index.php:7
 msgid "New"
@@ -147,7 +161,7 @@ msgstr "Folder"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Dari url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -155,7 +169,7 @@ msgstr "Muat naik"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Batal muat naik"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -167,16 +181,12 @@ msgstr "Nama "
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Kongsi"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Padam"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Muat naik terlalu besar"
@@ -189,8 +199,8 @@ msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Fail sedang diimbas, harap bersabar."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Imbasan semasa"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index ced2b12359..94f07c07b4 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -4,49 +4,50 @@
 # 
 # Translators:
 #   <ajarmund@gmail.com>, 2011, 2012.
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Det er ingen feil. Filen ble lastet opp."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filopplastningen ble bare delvis gjennomført"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ingen fil ble lastet opp"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
@@ -54,13 +55,25 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Files"
 msgstr "Filer"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Slett"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "opprettet ZIP-fil, dette kan ta litt tid"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -72,7 +85,7 @@ msgstr ""
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Ventende"
 
 #: js/files.js:332
 msgid "Upload cancelled."
@@ -82,29 +95,29 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "mappe"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mapper"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fil"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "filer"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -174,10 +187,6 @@ msgstr "Del"
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Slett"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Opplasting for stor"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index d6e80473b0..f7f4ade327 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -7,49 +7,50 @@
 #   <bartv@thisnet.nl>, 2011.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011.
+#   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Geen fout opgetreden, bestand successvol geupload."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Het geüploade bestand is groter dan de upload_max_filesize instelling in php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is slechts gedeeltelijk geupload"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Geen bestand geüpload"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Een tijdelijke map mist"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
@@ -57,57 +58,69 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Files"
 msgstr "Bestanden"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Verwijder"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Upload Fout"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Wachten"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Uploaden geannuleerd."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ongeldige naam, '/' is niet toegestaan."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "map"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mappen"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "bestand"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "bestanden"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -177,10 +190,6 @@ msgstr "Delen"
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Verwijder"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Bestanden te groot"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index c5cc1159e3..1bd790c788 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den opplasta fila er større enn variabelen upload_max_filesize i php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -53,8 +53,20 @@ msgstr ""
 msgid "Files"
 msgstr "Filer"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Slett"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -81,27 +93,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -173,10 +185,6 @@ msgstr ""
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Slett"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "For stor opplasting"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index b37c9903ee..89fc6e75af 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -11,43 +11,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Przesłano plik"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą w pliku php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Plik przesłano tylko częściowo"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nie przesłano żadnego pliku"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Brak katalogu tymczasowego"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Błąd zapisu na dysk"
 
@@ -55,57 +55,69 @@ msgstr "Błąd zapisu na dysk"
 msgid "Files"
 msgstr "Pliki"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Usuwa element"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Błąd wczytywania"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Oczekujące"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Wczytywanie anulowane."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "folder"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "foldery"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "plik"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "pliki"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -175,10 +187,6 @@ msgstr "Współdziel"
 msgid "Download"
 msgstr "Pobiera element"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Usuwa element"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Wysyłany plik ma za duży rozmiar"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index c929566d19..b2dc4fe1f6 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"PO-Revision-Date: 2012-07-29 14:04+0000\n"
+"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Nieprawidłowe żądanie"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Błąd uwierzytelniania"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index ef9cf274d9..bb08e22da8 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -5,48 +5,49 @@
 # Translators:
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
+# Unforgiving Fallout <>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O tamanho do arquivo excede o limed especifiicado em upload_max_filesize no php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi transferido parcialmente"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo foi transferido"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Pasta temporária não encontrada"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
@@ -54,57 +55,69 @@ msgstr "Falha ao escrever no disco"
 msgid "Files"
 msgstr "Arquivos"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Excluir"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "gerando arquivo ZIP, isso pode levar um tempo."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Erro de envio"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Envio cancelado."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nome inválido, '/' não é permitido."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "pasta"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "pastas"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "arquivo"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "arquivos"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -174,10 +187,6 @@ msgstr "Compartilhar"
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Excluir"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Arquivo muito grande"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 8779bcac2b..c1eaa89957 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erro, ficheiro enviado com sucesso"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O ficheiro enviado escede o diretivo upload_max_filesize no php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado só foi enviado parcialmente"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Não foi enviado nenhum ficheiro"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Falta uma pasta temporária"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
@@ -53,57 +53,69 @@ msgstr "Falhou a escrita no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Apagar"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Não é possivel fazer o upload do ficheiro devido a ser uma pasta ou ter 0 bytes"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Erro no upload"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "O upload foi cancelado."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "nome inválido, '/' não permitido."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "pasta"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "pastas"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "ficheiro"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "ficheiros"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "Partilhar"
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Apagar"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Envio muito grande"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 06c259c228..ef7d5e76b6 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,43 +10,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Nicio eroare, fișierul a fost încărcat cu succes"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Fișierul are o dimensiune mai mare decât cea specificată în variabila upload_max_filesize din php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Niciun fișier încărcat"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Lipsește un dosar temporar"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Eroare la scriere pe disc"
 
@@ -54,8 +54,20 @@ msgstr "Eroare la scriere pe disc"
 msgid "Files"
 msgstr "Fișiere"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Șterge"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -82,27 +94,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -174,10 +186,6 @@ msgstr "Partajează"
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Șterge"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index bda5204072..b1ef507162 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -7,47 +7,48 @@
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
+# Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успешно загружен"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Файл превышает допустимые размеры (описаны как upload_max_filesize в php.ini)"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл был загружен не полностью"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Невозможно найти временную папку"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Ошибка записи на диск"
 
@@ -55,57 +56,69 @@ msgstr "Ошибка записи на диск"
 msgid "Files"
 msgstr "Файлы"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Удалить"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "создание ZIP-файла, это может занять некоторое время."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Не удается загрузить файл размером 0 байт в каталог"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Ошибка загрузки"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Ожидание"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Загрузка отменена."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Неверное имя, '/' не допускается."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Изменен"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "папка"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "папки"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "файл"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "файлы"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -175,10 +188,6 @@ msgstr "Поделиться"
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Удалить"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Файл слишком большой"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 4b6d83e8ca..7c4437b6a2 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Nahraný súbor presiahol direktívu upload_max_filesize v php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný súbor bol iba čiastočne nahraný"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Žiaden súbor nebol nahraný"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Chýbajúci dočasný priečinok"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
@@ -53,57 +53,69 @@ msgstr "Zápis na disk sa nepodaril"
 msgid "Files"
 msgstr "Súbory"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Odstrániť"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Chyba nahrávania"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Čaká sa"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Nahrávanie zrušené"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Chybný názov, \"/\" nie je povolené"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "priečinok"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "priečinky"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "súbor"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "súbory"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "Zdielať"
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Odstrániť"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Nahrávanie príliš veľké"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index fd263bc60e..49b3c8c317 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 01:58+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,8 +63,12 @@ msgid "Delete"
 msgstr "Izbriši"
 
 #: js/filelist.js:186
-msgid "undo deletion"
-msgstr "prekliči izbris"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
+msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/so/files.po b/l10n/so/files.po
index d4b3a6c136..7b869f9830 100644
--- a/l10n/so/files.po
+++ b/l10n/so/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,11 @@ msgid "Delete"
 msgstr ""
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index af2fa73a8c..cc98fd8895 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Нема грешке, фајл је успешно послат"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Послати фајл превазилази директиву upload_max_filesize из "
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Послати фајл превазилази директиву MAX_FILE_SIZE која је наведена у ХТМЛ форми"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Послати фајл је само делимично отпремљен!"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ниједан фајл није послат"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -52,8 +52,20 @@ msgstr ""
 msgid "Files"
 msgstr "Фајлови"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Обриши"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -80,27 +92,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Задња измена"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -172,10 +184,6 @@ msgstr ""
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Обриши"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Пошиљка је превелика"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 1f04e28190..035317f6ca 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema greške, fajl je uspešno poslat"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Poslati fajl prevazilazi direktivu upload_max_filesize iz "
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimično otpremljen!"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -52,8 +52,20 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Obriši"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -80,27 +92,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -172,10 +184,6 @@ msgstr ""
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Obriši"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
diff --git a/l10n/sv/bookmarks.po b/l10n/sv/bookmarks.po
index f08502dd14..cd3fb598da 100644
--- a/l10n/sv/bookmarks.po
+++ b/l10n/sv/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 20:39+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Bokmärken"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "namnlös"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Läs senare"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adress"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Taggar"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Spara bokmärke"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Du har inga bokmärken"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Skriptbokmärke <br />"
diff --git a/l10n/sv/calendar.po b/l10n/sv/calendar.po
index f8c88e6587..b2bce445e1 100644
--- a/l10n/sv/calendar.po
+++ b/l10n/sv/calendar.po
@@ -5,26 +5,35 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
+#   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 20:35+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Alla kalendrar är inte fullständigt sparade i cache"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Allt verkar vara fullständigt sparat i cache"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Inga kalendrar funna"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Inga händelser funna."
 
@@ -32,43 +41,57 @@ msgstr "Inga händelser funna."
 msgid "Wrong calendar"
 msgstr "Fel kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Filen innehöll inga händelser eller så är alla händelser redan sparade i kalendern."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "händelser har sparats i den nya kalendern"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Misslyckad import"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "händelse har sparats i din kalender"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidszon:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tidszon ändrad"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ogiltig begäran"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM åååå"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -76,256 +99,337 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "ddd, MMM d, åååå"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Ringa"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienter"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Leverantör"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Semester"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Resa"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Möte"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Annat"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personlig"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Frågor"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbetet"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "av"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "Namn saknas"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Upprepas inte"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dagligen"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Varje vecka"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Varje vardag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Varannan vecka"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Varje månad"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Årligen"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldrig"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "efter händelser"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "efter datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "efter dag i månaden"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "efter veckodag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Måndag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Lördag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Söndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "händelse vecka av månad"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "första"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "andra"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjärde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "sist"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januari"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februari"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mars"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augusti"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "efter händelsedatum"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "efter årsdag(ar)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "efter veckonummer"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "efter dag och månad"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Sön."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Mån."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Tis."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Ons."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Tor."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Fre."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Lör."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Aug."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dec."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hela dagen"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Saknade fält"
@@ -359,27 +463,27 @@ msgstr "Händelsen slutar innan den börjar"
 msgid "There was a database fail"
 msgstr "Det blev ett databasfel"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Vecka"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Månad"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Idag"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Kalendrar"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Det blev ett fel medan filen analyserades."
 
@@ -392,7 +496,7 @@ msgid "Your calendars"
 msgstr "Dina kalendrar"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDAV-länk"
 
@@ -404,19 +508,19 @@ msgstr "Delade kalendrar"
 msgid "No shared calendars"
 msgstr "Inga delade kalendrar"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Dela kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Redigera"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Radera"
@@ -502,23 +606,23 @@ msgstr "Separera kategorier med komman"
 msgid "Edit categories"
 msgstr "Redigera kategorier"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Hela dagen"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Från"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Till"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avancerade alternativ"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Plats"
 
@@ -526,7 +630,7 @@ msgstr "Plats"
 msgid "Location of the Event"
 msgstr "Platsen för händelsen"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -534,84 +638,86 @@ msgstr "Beskrivning"
 msgid "Description of the Event"
 msgstr "Beskrivning av händelse"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Upprepa"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Välj veckodagar"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Välj dagar"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "och händelsedagen för året."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "och händelsedagen för månaden."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Välj månader"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Välj veckor"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "och händelsevecka för året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Hur ofta"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Slut"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "Händelser"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importera en kalenderfil"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Välj kalender"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "skapa en ny kalender"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importera en kalenderfil"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Välj en kalender"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Namn på ny kalender"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Ta ett ledigt namn!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "En kalender med detta namn finns redan. Om du fortsätter ändå så kommer dessa kalendrar att slås samman."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importera"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerar kalender"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender importerades utan problem"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Stäng "
 
@@ -627,15 +733,11 @@ msgstr "Visa en händelse"
 msgid "No categories selected"
 msgstr "Inga kategorier valda"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Välj kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "av"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "på"
 
@@ -663,9 +765,33 @@ msgstr "12h"
 msgid "First day of the week"
 msgstr "Första dagen av veckan"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synkroniseringsadress för CalDAV kalender:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Cache"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr "Töm cache för upprepade händelser"
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Kalender CalDAV synkroniserar adresser"
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "mer info"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Primary address (Kontact et al)"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr "Read only iCalendar link(s)"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 0de8591cea..1d2a7f6b0a 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -5,107 +5,104 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
+#   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 21:01+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Fel när (av)aktivera adressbok"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Det uppstod ett fel när kontakt skulle läggas till"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID är inte satt."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Kunde inte läsa kontakt:"
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan inte lägga till en tom egenskap"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minst ett fält måste fyllas i"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Fel när kontaktegenskap skulle läggas till"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Kunde inte lägga till egenskap för kontakt:"
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Inget ID angett"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Fel uppstod när kontrollsumma skulle sättas."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Inga kategorier valda för borttaging"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ingen adressbok funnen."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Inga kontakter funna."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID saknas"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan inte lägga till adressbok med ett tomt namn."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Fel när adressbok skulle läggas till"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Fel uppstod när adressbok skulle aktiveras"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Inget kontakt-ID angavs."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
 msgstr "Fel uppstod när "
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
 msgstr "Fel uppstod när temporär fil skulle sparas."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:51
 msgid "The loading photo is not valid."
 msgstr "Det laddade fotot är inte giltigt."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID är inte satt."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
@@ -114,328 +111,387 @@ msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 msgid "Error deleting contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle tas bort"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakt-ID saknas."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Saknar kontakt-ID."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Ingen sökväg till foto angavs."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Filen existerar inte."
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Fel uppstod när bild laddades."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:67
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:93
 msgid "Error saving contact."
-msgstr ""
+msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:103
 msgid "Error resizing image"
-msgstr ""
+msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:106
 msgid "Error cropping image"
-msgstr ""
+msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:109
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:112
 msgid "Error finding image: "
-msgstr ""
+msgstr "Kunde inte hitta bild"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrollsumma är inte satt."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan inte uppdatera adressboken med ett tomt namn."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Fel uppstod när adressbok skulle uppdateras"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fel uppstod när kontakt skulle lagras."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var bara delvist uppladdad"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Kunde inte spara tillfällig bild:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Kunde inte ladda tillfällig bild:"
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Tyvärr är denna funktion inte införd än"
 
-#: js/contacts.js:24
+#: js/contacts.js:53
 msgid "Not implemented"
-msgstr ""
+msgstr "Inte införd"
 
-#: js/contacts.js:29
+#: js/contacts.js:58
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Kunde inte hitta en giltig adress."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
+#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
+#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
+#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
+#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
+#: js/contacts.js:1260 js/contacts.js:1522
 msgid "Error"
-msgstr ""
+msgstr "Fel"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Släpp en VCF-fil för att importera kontakter."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Hittade inte adressboken"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Det här är inte din adressbok."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kontakt kunde inte hittas."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adress"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-post"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organisation"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Arbete"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Hem"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Röst"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Meddelande"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Personsökare"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name}'s födelsedag"
-
-#: lib/search.php:22
+#: js/contacts.js:389 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/index.php:13
+#: js/contacts.js:389
+msgid "New"
+msgstr "Ny"
+
+#: js/contacts.js:389
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: js/contacts.js:691
+msgid "This property has to be non-empty."
+msgstr "Denna egenskap får inte vara tom."
+
+#: js/contacts.js:717
+msgid "Couldn't serialize elements."
+msgstr "Kunde inte serialisera element."
+
+#: js/contacts.js:826 js/contacts.js:844
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
+
+#: js/contacts.js:860
+msgid "Edit name"
+msgstr "Ändra namn"
+
+#: js/contacts.js:1141
+msgid "No files selected for upload."
+msgstr "Inga filer valda för uppladdning"
+
+#: js/contacts.js:1149
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
+
+#: js/contacts.js:1314 js/contacts.js:1348
+msgid "Select type"
+msgstr "Välj typ"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultat:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "importerad,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "misslyckades."
+
+#: lib/app.php:29
+msgid "Addressbook not found."
+msgstr "Hittade inte adressboken"
+
+#: lib/app.php:33
+msgid "This is not your addressbook."
+msgstr "Det här är inte din adressbok."
+
+#: lib/app.php:44
+msgid "Contact could not be found."
+msgstr "Kontakt kunde inte hittas."
+
+#: lib/app.php:100 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adress"
+
+#: lib/app.php:101
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:102 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-post"
+
+#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organisation"
+
+#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+msgid "Work"
+msgstr "Arbete"
+
+#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+msgid "Home"
+msgstr "Hem"
+
+#: lib/app.php:121
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:123
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:124
+msgid "Voice"
+msgstr "Röst"
+
+#: lib/app.php:125
+msgid "Message"
+msgstr "Meddelande"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "Personsökare"
+
+#: lib/app.php:134
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:169 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Födelsedag"
+
+#: lib/app.php:170
+msgid "Business"
+msgstr "Företag"
+
+#: lib/app.php:171
+msgid "Call"
+msgstr "Ring"
+
+#: lib/app.php:172
+msgid "Clients"
+msgstr "Kunder"
+
+#: lib/app.php:173
+msgid "Deliverer"
+msgstr "Leverera"
+
+#: lib/app.php:174
+msgid "Holidays"
+msgstr "Helgdagar"
+
+#: lib/app.php:175
+msgid "Ideas"
+msgstr "Idéer"
+
+#: lib/app.php:176
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:177
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:178
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:179
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:180
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}'s födelsedag"
+
+#: templates/index.php:15
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+msgid "Import"
+msgstr "Importera"
+
+#: templates/index.php:20
 msgid "Addressbooks"
 msgstr "Adressböcker"
 
+#: templates/index.php:37 templates/part.import.php:24
+msgid "Close"
+msgstr "Stäng"
+
+#: templates/index.php:39
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfigurera adressböcker"
@@ -444,11 +500,7 @@ msgstr "Konfigurera adressböcker"
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importera från VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAV länk"
@@ -462,186 +514,195 @@ msgid "Edit"
 msgstr "Redigera"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Ladda ner kontakt"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Radera kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Släpp foto för att ladda upp"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Redigera detaljer för namn"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Smeknamn"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Ange smeknamn"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Födelsedag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-åååå"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupper"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separera grupperna med kommatecken"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editera grupper"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Föredragen"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Vänligen ange en giltig e-postadress"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Ange e-postadress"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Posta till adress."
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Ta bort e-postadress"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Ange ett telefonnummer"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Ta bort telefonnummer"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Visa på karta"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Redigera detaljer för adress"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Lägg till noteringar här."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Lägg till fält"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilbild"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Notering"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Ta bort aktuellt foto"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Redigera aktuellt foto"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Ladda upp ett nytt foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Välj foto från ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Redigera detaljer för namn"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Ange smeknamn"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-åååå"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupper"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separera grupperna med kommatecken"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editera grupper"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Föredragen"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Vänligen ange en giltig e-postadress"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Ange e-postadress"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Posta till adress."
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Ta bort e-postadress"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Ange ett telefonnummer"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Ta bort telefonnummer"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Visa på karta"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Redigera detaljer för adress"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Lägg till noteringar här."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Lägg till fält"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Notering"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Ladda ner kontakt"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Radera kontakt"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Den tillfälliga bilden har raderats från cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editera adress"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postbox"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Utökad"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gata"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Län"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editera kategorier"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Ny"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressbok"
@@ -747,7 +808,6 @@ msgid "Submit"
 msgstr "Skicka in"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -767,33 +827,10 @@ msgstr "skapa en ny adressbok"
 msgid "Name of new addressbook"
 msgstr "Namn för ny adressbok"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importera"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importerar kontakter"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Importera till adressbok:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Välj från hårddisk"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Du har inga kontakter i din adressbok."
@@ -806,6 +843,18 @@ msgstr "Lägg till en kontakt"
 msgid "Configure addressbooks"
 msgstr "Konfigurera adressböcker"
 
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synkningsadresser"
@@ -821,3 +870,7 @@ msgstr "Primär adress (Kontakt o.a.)"
 #: templates/settings.php:8
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:10
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 2dc7248b2f..cc20278cfd 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -6,15 +6,16 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
+#   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 20:37+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,85 +36,81 @@ msgstr "Denna kategori finns redan:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-msgstr ""
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:519
 msgid "May"
-msgstr ""
+msgstr "Maj"
+
+#: js/js.js:519
+msgid "June"
+msgstr "Juni"
 
 #: js/js.js:520
-msgid "June"
-msgstr ""
-
-#: js/js.js:521
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:520
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nej"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Inga kategorier valda för radering."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fel"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud lösenordsåterställning"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
 
@@ -243,11 +240,11 @@ msgstr "Avsluta installation"
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
+#: templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Inställningar"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 60c136d611..799224c381 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -5,49 +5,50 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
+#   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvist uppladdad"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uppladdad"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Saknar en tillfällig mapp"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
@@ -55,57 +56,69 @@ msgstr "Misslyckades spara till disk"
 msgid "Files"
 msgstr "Filer"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "Sluta dela"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Ta bort"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Gererar ZIP-fil. Det kan ta lite tid."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Uppladdningsfel"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Väntar"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Uppladdning avbruten."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "mapp"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "mappar"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "fil"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "filer"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -175,10 +188,6 @@ msgstr "Dela"
 msgid "Download"
 msgstr "Ladda ned"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Ta bort"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "För stor uppladdning"
diff --git a/l10n/sv/gallery.po b/l10n/sv/gallery.po
index 8af72bc519..3bb99841a7 100644
--- a/l10n/sv/gallery.po
+++ b/l10n/sv/gallery.po
@@ -4,77 +4,42 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+#   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2012.
 #   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-29 07:37+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Bilder"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Dela galleri"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Fel:"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Internt fel"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Inställningar"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Sök igen"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stoppa"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Dela"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Bildspel"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 7078e2cdb0..eda07bdbe0 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"PO-Revision-Date: 2012-07-29 07:56+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Hjälp"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personligt"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Inställningar"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Program"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Nedladdning av ZIP är avstängd."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Filer laddas ner en åt gången."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Tillbaka till Filer"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Valda filer är för stora för att skapa zip-fil."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Applikationen är inte aktiverad"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Fel vid autentisering"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Ogiltig token. Ladda om sidan."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekunder sedan"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minut sedan"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minuter sedan"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "idag"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "igår"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dagar sedan"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "förra månaden"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "månader sedan"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "förra året"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "år sedan"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 0c533799d1..a1a94b378f 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -6,15 +6,16 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
+#   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"PO-Revision-Date: 2012-07-29 20:26+0000\n"
+"Last-Translator: maghog <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgstr "Ogiltig begäran"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentiseringsfel"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -64,7 +65,7 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Säkerhetsvarning"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -208,7 +209,7 @@ msgstr "Annat"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "Underadministratör"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -216,7 +217,7 @@ msgstr "Kvot"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "Underadministratör för ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 0cc6b48719..5ba1e16f7d 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index feb2ff4bd9..a3cbc60da6 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 696c3b7b1c..2be8f276fc 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 522d4104cd..a92c4d850a 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 5f5750d16a..e334f679d9 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,7 +60,11 @@ msgid "Delete"
 msgstr ""
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 1969f7b410..1971a7d641 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0fe46e895a..5c59b13647 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 68f2dd0d3f..adf07f571b 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 52b7bbdb0b..e3e49ed11a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
+"POT-Creation-Date: 2012-07-30 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 5e8c76459a..6425a4d7c6 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง upload_max_filesize ที่ระบุเอาไว้ในไฟล์ php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "ยังไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
@@ -53,57 +53,69 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Files"
 msgstr "ไฟล์"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "ลบ"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "อยู่ระหว่างดำเนินการ"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "การอัพโหลดถูกยกเลิก"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "โฟลเดอร์"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "โฟลเดอร์"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "ไฟล์"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "ไฟล์"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "แชร์"
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "ลบ"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 94f7c3d109..6d792546a4 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Bir hata yok, dosya başarıyla yüklendi"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Yüklenen dosya php.ini de belirtilen upload_max_filesize sınırını aşıyor"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Hiç dosya yüklenmedi"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Geçici bir klasör eksik"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
@@ -53,57 +53,69 @@ msgstr "Diske yazılamadı"
 msgid "Files"
 msgstr "Dosyalar"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Sil"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Yükleme hatası"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Bekliyor"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Yükleme iptal edildi."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "dizin"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "dizinler"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "dosya"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "dosyalar"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -173,10 +185,6 @@ msgstr "Paylaş"
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Sil"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Yüklemeniz çok büyük"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 4019b885f5..dd7bbef902 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успішно відвантажено без помилок."
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Розмір відвантаженого файлу перевищує директиву upload_max_filesize в php.ini"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл відвантажено лише частково"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "Не відвантажено жодного файлу"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "Відсутній тимчасовий каталог"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr ""
 
@@ -53,8 +53,20 @@ msgstr ""
 msgid "Files"
 msgstr "Файли"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "Видалити"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -81,27 +93,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -173,10 +185,6 @@ msgstr ""
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "Видалити"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "Файл занадто великий"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index c7b868c5bc..65038a686e 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,11 @@ msgid "Delete"
 msgstr "Xóa"
 
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 7410d7462d..1433f41f26 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "没有发生错误，文件上传成功。"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "上传的文件大小超过了php.ini 中指定的upload_max_filesize"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "只上传了文件的一部分"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "文件没有上传"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
@@ -52,57 +52,69 @@ msgstr "写入磁盘失败"
 msgid "Files"
 msgstr "文件"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "删除"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "正在生成 ZIP 文件，可能需要一些时间"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "上传错误"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "操作等待中"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "上传已取消"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "文件夹"
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "文件夹"
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "文件"
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "文件"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -172,10 +184,6 @@ msgstr "共享"
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "删除"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "上传文件过大"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 4af073269d..f868758276 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,43 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
 msgstr "無錯誤，檔案上傳成功"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "上傳的檔案超過了 php.ini 中的 upload_max_filesize 設定"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上傳黨案的超過 HTML 表單中指定 MAX_FILE_SIZE 限制"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
 msgstr "只有部分檔案被上傳"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid "No file was uploaded"
 msgstr "無已上傳檔案"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:25
 msgid "Missing a temporary folder"
 msgstr "遺失暫存資料夾"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
@@ -53,8 +53,20 @@ msgstr "寫入硬碟失敗"
 msgid "Files"
 msgstr "檔案"
 
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "刪除"
+
 #: js/filelist.js:186
-msgid "undo deletion"
+msgid "deleted"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "undo"
 msgstr ""
 
 #: js/files.js:170
@@ -81,27 +93,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:626 templates/index.php:55
+#: js/files.js:631 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:627 templates/index.php:56
+#: js/files.js:632 templates/index.php:56
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:654
+#: js/files.js:659
 msgid "folder"
 msgstr ""
 
-#: js/files.js:656
+#: js/files.js:661
 msgid "folders"
 msgstr ""
 
-#: js/files.js:664
+#: js/files.js:669
 msgid "file"
 msgstr ""
 
-#: js/files.js:666
+#: js/files.js:671
 msgid "files"
 msgstr ""
 
@@ -173,10 +185,6 @@ msgstr "分享"
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:56
-msgid "Delete"
-msgstr "刪除"
-
 #: templates/index.php:64
 msgid "Upload too large"
 msgstr "上傳過大"
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 19746ba028..d3548c7a13 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -3,5 +3,23 @@
 "Personal" => "Persönlich",
 "Settings" => "Einstellungen",
 "Users" => "Benutzer",
-"Apps" => "Apps"
+"Apps" => "Apps",
+"Admin" => "Administrator",
+"ZIP download is turned off." => "ZIP-Download ist deaktiviert.",
+"Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
+"Back to Files" => "Zurück zu \"Dateien\"",
+"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine zip-Datei zu generieren.",
+"Application is not enabled" => "Anwendung ist nicht aktiviert",
+"Authentication error" => "Authentifizierungs-Fehler",
+"Token expired. Please reload page." => "Token abgelaufen. Bitte Seite neuladen.",
+"seconds ago" => "vor wenigen Sekunden",
+"1 minute ago" => "Vor einer Minute",
+"%d minutes ago" => "Vor %d Minuten",
+"today" => "Heute",
+"yesterday" => "Gestern",
+"%d days ago" => "Vor %d Tagen",
+"last month" => "Letzten Monat",
+"months ago" => "Vor Monaten",
+"last year" => "Letztes Jahr",
+"years ago" => "Vor Jahren"
 );
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
new file mode 100644
index 0000000000..4d9a63c34b
--- /dev/null
+++ b/lib/l10n/sv.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hjälp",
+"Personal" => "Personligt",
+"Settings" => "Inställningar",
+"Users" => "Användare",
+"Apps" => "Program",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Nedladdning av ZIP är avstängd.",
+"Files need to be downloaded one by one." => "Filer laddas ner en åt gången.",
+"Back to Files" => "Tillbaka till Filer",
+"Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.",
+"Application is not enabled" => "Applikationen är inte aktiverad",
+"Authentication error" => "Fel vid autentisering",
+"Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
+"seconds ago" => "sekunder sedan",
+"1 minute ago" => "1 minut sedan",
+"%d minutes ago" => "%d minuter sedan",
+"today" => "idag",
+"yesterday" => "igår",
+"%d days ago" => "%d dagar sedan",
+"last month" => "förra månaden",
+"months ago" => "månader sedan",
+"last year" => "förra året",
+"years ago" => "år sedan"
+);
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index fbaab6d6c9..010146283f 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -11,7 +11,7 @@
 "__language_name__" => "Deutsch",
 "Security Warning" => "Sicherheitshinweis",
 "Log" => "Log",
-"More" => "mehr",
+"More" => "Mehr",
 "Add your App" => "Füge deine App hinzu",
 "Select an App" => "Wähle eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen auf apps.owncloud.com",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 305728d3dc..ad599402d3 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Correo Incorrecto",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
+"Authentication error" => "Error de autenticación",
 "Language changed" => "Idioma cambiado",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -44,6 +45,8 @@
 "Create" => "Crear",
 "Default Quota" => "Cuota predeterminada",
 "Other" => "Otro",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Cuota",
+"SubAdmin for ..." => "SubAdmin para ...",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 575b01432e..59185d68e3 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Niepoprawny email",
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
+"Authentication error" => "Błąd uwierzytelniania",
 "Language changed" => "Język zmieniony",
 "Disable" => "Wyłączone",
 "Enable" => "Włączone",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 05d64302ea..b942b86ed2 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
+"Authentication error" => "Autentiseringsfel",
 "Language changed" => "Språk ändrades",
 "Disable" => "Avaktivera",
 "Enable" => "Aktivera",
 "Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Säkerhetsvarning",
 "Log" => "Logg",
 "More" => "Mera",
 "Add your App" => "Lägg till din applikation",
@@ -43,6 +45,8 @@
 "Create" => "Skapa",
 "Default Quota" => "Förvald datakvot",
 "Other" => "Annat",
+"SubAdmin" => "Underadministratör",
 "Quota" => "Kvot",
+"SubAdmin for ..." => "Underadministratör för ...",
 "Delete" => "Ta bort"
 );

From fa6d26b53c020940e38f632940f73dbbb56f6847 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 27 Jul 2012 04:29:15 +0200
Subject: [PATCH 1186/1537] Removed text/plain header.

---
 apps/contacts/ajax/currentphoto.php | 2 --
 apps/contacts/ajax/savecrop.php     | 3 ---
 apps/contacts/ajax/uploadphoto.php  | 2 --
 3 files changed, 7 deletions(-)

diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index 96080e661e..c8cccf83a6 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -20,8 +20,6 @@
  *
  */
 
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 require_once 'loghandler.php';
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 8ee2e46bf0..07de138757 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -24,9 +24,6 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
-
 require_once 'loghandler.php';
 
 $image = null;
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 4cd38db8c7..63abeb1fee 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -25,8 +25,6 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
 require_once 'loghandler.php';
 $l10n = OC_Contacts_App::$l10n;
 // If it is a Drag'n'Drop transfer it's handled here.

From b25b73b5b41618247e8a239a332a148b45d7f75b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 30 Jul 2012 01:20:33 +0200
Subject: [PATCH 1187/1537] Fixed potential error in logging.

---
 apps/contacts/lib/vcard.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index ca171e792f..990e790c03 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -79,7 +79,7 @@ class OC_Contacts_VCard{
 				return false;
 			}
 		} else {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.'. Addressbook id(s) argument is empty: '. $id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.'. Addressbook id(s) argument is empty: '. print_r($id, true), OCP\Util::DEBUG);
 			return false;
 		}
 		$cards = array();
@@ -129,7 +129,7 @@ class OC_Contacts_VCard{
 		return $result->fetchRow();
 	}
 
-	/** 
+	/**
 	* @brief Format property TYPE parameters for upgrading from v. 2.1
 	* @param $property Reference to a Sabre_VObject_Property.
 	* In version 2.1 e.g. a phone can be formatted like: TEL;HOME;CELL:123456789
@@ -145,7 +145,7 @@ class OC_Contacts_VCard{
 		}
 	}
 
-	/** 
+	/**
 	* @brief Decode properties for upgrading from v. 2.1
 	* @param $property Reference to a Sabre_VObject_Property.
 	* The only encoding allowed in version 3.0 is 'b' for binary. All encoded strings

From 118d9e17b6afe5c3c763737226a90307f67a03b9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 30 Jul 2012 04:56:20 +0200
Subject: [PATCH 1188/1537] Check if the are contacts marked as deleted and
 warn if so.

---
 apps/contacts/js/contacts.js | 60 +++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 4c6c8bf3d9..34961360ee 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -14,17 +14,28 @@ Contacts={
 	UI:{
 		/**
 		 * Arguments:
-		 * message: The text message to show. The only mandatory parameter.
+		 * message: The text message to show.
 		 * timeout: The timeout in seconds before the notification disappears. Default 10.
 		 * timeouthandler: A function to run on timeout.
 		 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
 		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
+		 * cancel: If set cancel all ongoing timer events and hide the notification.
 		 */
 		notify:function(params) {
 			self = this;
 			if(!self.notifier) {
 				self.notifier = $('#notification');
 			}
+			if(params.cancel) {
+				self.notifier.off('click');
+				for(var id in self.notifier.data()) {
+					if($.isNumeric(id)) {
+						clearTimeout(parseInt(id));
+					}
+				}
+				self.notifier.text('').fadeOut().removeData();
+				return;
+			}
 			self.notifier.text(params.message);
 			self.notifier.fadeIn();
 			self.notifier.on('click', function() { $(this).fadeOut();});
@@ -460,6 +471,11 @@ Contacts={
 				}
 				$('#rightcontent').data('id', newid);
 
+				Contacts.UI.Contacts.deletionQueue.push(this.id);
+				if(!window.onbeforeunload) {
+					window.onbeforeunload = Contacts.UI.Contacts.warnNotDeleted;
+				}
+
 				with(this) {
 					delete id; delete fn; delete fullname; delete shortname; delete famname;
 					delete givname; delete addname; delete honpre; delete honsuf; delete data;
@@ -483,7 +499,7 @@ Contacts={
 					data:curlistitem,
 					message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
 					timeouthandler:function(contact) {
-						Contacts.UI.Card.doDelete(contact.data('id'));
+						Contacts.UI.Card.doDelete(contact.data('id'), true);
 						delete contact;
 					},
 					clickhandler:function(contact) {
@@ -492,13 +508,21 @@ Contacts={
 					}
 				});
 			},
-			doDelete:function(id) {
+			doDelete:function(id, removeFromQueue) {
+				if(Contacts.UI.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
+					return;
+				}
 				$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
 					if(jsondata.status == 'error'){
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
+					if(removeFromQueue) {
+						Contacts.UI.Contacts.deletionQueue.splice(Contacts.UI.Contacts.deletionQueue.indexOf(id), 1);
+					}
+					if(Contacts.UI.Contacts.deletionQueue.length == 0) {
+						window.onbeforeunload = null;
+					}
 				});
-				return false;
 			},
 			loadContact:function(jsondata, bookid){
 				this.data = jsondata;
@@ -1477,7 +1501,31 @@ Contacts={
 		},
 		Contacts:{
 			contacts:{},
+			deletionQueue:[],
 			batchnum:50,
+			warnNotDeleted:function(e) {
+				e = e || window.event;
+				var warn = t('contacts', 'Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted.');
+				if (e) {
+					e.returnValue = String(warn);
+				}
+				if(Contacts.UI.Contacts.deletionQueue.length > 0) {
+					setTimeout(Contacts.UI.Contacts.deleteFilesInQueue, 1);
+				}
+				return warn;
+			},
+			deleteFilesInQueue:function() {
+				var queue = Contacts.UI.Contacts.deletionQueue;
+				if(queue.length > 0) {
+					Contacts.UI.notify({cancel:true});
+					while(queue.length > 0) {
+						var id = queue.pop();
+						if(id) {
+							Contacts.UI.Card.doDelete(id, false);
+						}
+					}
+				}
+			},
 			getContact:function(id) {
 				if(!this.contacts[id]) {
 					this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
@@ -1774,7 +1822,9 @@ $(document).ready(function(){
 
 	});
 
-			// Load a contact.
+	//$(window).on('beforeunload', Contacts.UI.Contacts.deleteFilesInQueue);
+
+	// Load a contact.
 	$('.contacts').keydown(function(event) {
 		if(event.which == 13 || event.which == 32) {
 			$('.contacts').click();

From d614c3b1d5be7e05ce7248dc4a7b67f04a64a3d8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 30 Jul 2012 05:31:06 +0200
Subject: [PATCH 1189/1537] Code style.

---
 apps/contacts/lib/app.php | 105 +++++++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 36 deletions(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 689149367f..46e03240dc 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -23,14 +23,30 @@ class OC_Contacts_App {
 
 	public static function getAddressbook($id) {
 		$addressbook = OC_Contacts_Addressbook::find( $id );
-		if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
+		if($addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
 			if ($addressbook === false) {
-				OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR);
-				OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.'))));
+				OCP\Util::writeLog('contacts',
+					'Addressbook not found: '. $id,
+					OCP\Util::ERROR);
+				OCP\JSON::error(
+					array(
+						'data' => array(
+							'message' => self::$l10n->t('Addressbook not found.')
+						)
+					)
+				);
 			}
 			else {
-				OCP\Util::writeLog('contacts', 'Addressbook('.$id.') is not from '.OCP\USER::getUser(), OCP\Util::ERROR);
-				OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.'))));
+				OCP\Util::writeLog('contacts',
+					'Addressbook('.$id.') is not from '.OCP\USER::getUser(),
+					OCP\Util::ERROR);
+				OCP\JSON::error(
+					array(
+						'data' => array(
+							'message' => self::$l10n->t('This is not your addressbook.')
+						)
+					)
+				);
 			}
 			exit();
 		}
@@ -40,8 +56,17 @@ class OC_Contacts_App {
 	public static function getContactObject($id) {
 		$card = OC_Contacts_VCard::find( $id );
 		if( $card === false ) {
-			OCP\Util::writeLog('contacts', 'Contact could not be found: '.$id, OCP\Util::ERROR);
-			OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.print_r($id, true))));
+			OCP\Util::writeLog('contacts',
+				'Contact could not be found: '.$id,
+				OCP\Util::ERROR);
+			OCP\JSON::error(
+				array(
+					'data' => array(
+						'message' => self::$l10n->t('Contact could not be found.')
+							.' '.print_r($id, true)
+					)
+				)
+			);
 			exit();
 		}
 
@@ -110,29 +135,29 @@ class OC_Contacts_App {
 	public static function getTypesOfProperty($prop) {
 		$l = self::$l10n;
 		switch($prop) {
-		case 'ADR':
-			return array(
-				'WORK' => $l->t('Work'),
-				'HOME' => $l->t('Home'),
-			);
-		case 'TEL':
-			return array(
-				'HOME'  =>  $l->t('Home'),
-				'CELL'  =>  $l->t('Mobile'),
-				'WORK'  =>  $l->t('Work'),
-				'TEXT'  =>  $l->t('Text'),
-				'VOICE' =>  $l->t('Voice'),
-				'MSG'   =>  $l->t('Message'),
-				'FAX'   =>  $l->t('Fax'),
-				'VIDEO' =>  $l->t('Video'),
-				'PAGER' =>  $l->t('Pager'),
-			);
-		case 'EMAIL':
-			return array(
-				'WORK' => $l->t('Work'),
-				'HOME' => $l->t('Home'),
-				'INTERNET' => $l->t('Internet'),
-			);
+			case 'ADR':
+				return array(
+					'WORK' => $l->t('Work'),
+					'HOME' => $l->t('Home'),
+				);
+			case 'TEL':
+				return array(
+					'HOME'  =>  $l->t('Home'),
+					'CELL'  =>  $l->t('Mobile'),
+					'WORK'  =>  $l->t('Work'),
+					'TEXT'  =>  $l->t('Text'),
+					'VOICE' =>  $l->t('Voice'),
+					'MSG'   =>  $l->t('Message'),
+					'FAX'   =>  $l->t('Fax'),
+					'VIDEO' =>  $l->t('Video'),
+					'PAGER' =>  $l->t('Pager'),
+				);
+			case 'EMAIL':
+				return array(
+					'WORK' => $l->t('Work'),
+					'HOME' => $l->t('Home'),
+					'INTERNET' => $l->t('Internet'),
+				);
 		}
 	}
 
@@ -142,11 +167,13 @@ class OC_Contacts_App {
 	 */
 	protected static function getVCategories() {
 		if (is_null(self::$categories)) {
-			self::$categories = new OC_VCategories('contacts', null, self::getDefaultCategories());
+			self::$categories = new OC_VCategories('contacts',
+				null,
+				self::getDefaultCategories());
 		}
 		return self::$categories;
 	}
-	
+
 	/**
 	 * @brief returns the categories for the user
 	 * @return (Array) $categories
@@ -183,7 +210,7 @@ class OC_Contacts_App {
 			(string)self::$l10n->t('Work'),
 		);
 	}
-	
+
 	/**
 	 * scan vcards for categories.
 	 * @param $vccontacts VCards to scan. null to check all vcards for the current user.
@@ -198,14 +225,20 @@ class OC_Contacts_App {
 				}
 				$start = 0;
 				$batchsize = 10;
-				while($vccontacts = OC_Contacts_VCard::all($vcaddressbookids, $start, $batchsize)){
+				while($vccontacts =
+					OC_Contacts_VCard::all($vcaddressbookids, $start, $batchsize)) {
 					$cards = array();
 					foreach($vccontacts as $vccontact) {
 						$cards[] = $vccontact['carddata'];
 					}
-					OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', scanning: '.$batchsize.' starting from '.$start, OCP\Util::DEBUG);
+					OCP\Util::writeLog('contacts',
+						__CLASS__.'::'.__METHOD__
+							.', scanning: '.$batchsize.' starting from '.$start,
+						OCP\Util::DEBUG);
 					// only reset on first batch.
-					self::getVCategories()->rescan($cards, true, ($start == 0 ? true : false));
+					self::getVCategories()->rescan($cards,
+						true,
+						($start == 0 ? true : false));
 					$start += $batchsize;
 				}
 			}

From fa62ff62d2e48bee72aaf5b7d306abe77d90308b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 30 Jul 2012 05:31:48 +0200
Subject: [PATCH 1190/1537] Remove deprecated code.

---
 apps/contacts/lib/app.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 46e03240dc..67dfe8f640 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -82,22 +82,6 @@ class OC_Contacts_App {
 		$card = self::getContactObject( $id );
 
 		$vcard = OC_VObject::parse($card['carddata']);
-		// Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly...
-		if(!is_null($vcard) && !$vcard->__isset('N')) {
-			$version = OCP\App::getAppVersion('contacts');
-			if($version >= 5) {
-				OCP\Util::writeLog('contacts', 'OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OCP\Util::DEBUG);
-			}
-			OCP\Util::writeLog('contacts', 'getContactVCard, Missing N field', OCP\Util::DEBUG);
-			if($vcard->__isset('FN')) {
-				OCP\Util::writeLog('contacts', 'getContactVCard, found FN field: '.$vcard->__get('FN'), OCP\Util::DEBUG);
-				$n = implode(';', array_reverse(array_slice(explode(' ', $vcard->__get('FN')), 0, 2))).';;;';
-				$vcard->setString('N', $n);
-				OC_Contacts_VCard::edit( $id, $vcard);
-			} else { // Else just add an empty 'N' field :-P
-				$vcard->setString('N', 'Unknown;Name;;;');
-			}
-		}
 		if (!is_null($vcard) && !isset($vcard->REV)) {
 			$rev = new DateTime('@'.$card['lastmodified']);
 			$vcard->setString('REV', $rev->format(DateTime::W3C));

From 530e7f03cd2a5c8b348408cb33ea14a424c48f49 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 10:34:12 -0400
Subject: [PATCH 1191/1537] Remove accidently added 3rd party apps

---
 apps/journal/.gitignore                       |   51 -
 apps/journal/COPYING-AGPL                     |  661 ----
 apps/journal/COPYING-README                   |   10 -
 apps/journal/Changelog                        |    5 -
 apps/journal/README.md                        |   38 -
 apps/journal/TODO                             |   13 -
 .../journal/ajax/categories/categoriesfor.php |   28 -
 apps/journal/ajax/categories/delete.php       |   54 -
 apps/journal/ajax/categories/list.php         |   17 -
 apps/journal/ajax/categories/rescan.php       |   42 -
 apps/journal/ajax/delete.php                  |   37 -
 apps/journal/ajax/entries.php                 |   36 -
 apps/journal/ajax/saveproperty.php            |  138 -
 apps/journal/ajax/setdefaultcalendar.php      |   36 -
 apps/journal/ajax/util.php                    |   40 -
 apps/journal/appinfo/app.php                  |   18 -
 apps/journal/appinfo/info.xml                 |   11 -
 apps/journal/css/journal.css                  |   19 -
 apps/journal/css/rte.css                      |    7 -
 apps/journal/img/bold.svg                     |   11 -
 apps/journal/img/indent-less.svg              |  300 --
 apps/journal/img/indent-more.svg              |  295 --
 apps/journal/img/italic.svg                   |    8 -
 apps/journal/img/journal.png                  |  Bin 581 -> 0 bytes
 apps/journal/img/journal.svg                  |  104 -
 apps/journal/img/justify-center.svg           |  269 --
 apps/journal/img/justify-fill.svg             |  269 --
 apps/journal/img/justify-left.svg             |  199 -
 apps/journal/img/justify-right.svg            |  269 --
 apps/journal/img/list.svg                     |   12 -
 apps/journal/img/strikethrough.svg            |   10 -
 apps/journal/img/underline.svg                |   10 -
 apps/journal/index.php                        |   72 -
 apps/journal/js/expanding.js                  |  118 -
 apps/journal/js/journal.js                    |  432 ---
 apps/journal/js/jquery.rte.js                 |  244 --
 apps/journal/js/jquery.textchange.js          |   76 -
 apps/journal/js/settings.js                   |   15 -
 apps/journal/lib/app.php                      |  135 -
 apps/journal/lib/hooks.php                    |   53 -
 apps/journal/lib/search.php                   |   45 -
 apps/journal/lib/vjournal.php                 |   27 -
 apps/journal/settings.php                     |   45 -
 apps/journal/templates/index.pt               |  101 -
 apps/journal/templates/rtfm.php               |    7 -
 apps/journal/templates/settings.pt            |   15 -
 apps/news/.gitignore                          |    5 -
 apps/news/ajax/createfeed.php                 |   37 -
 apps/news/ajax/createfolder.php               |   41 -
 apps/news/ajax/deletefeed.php                 |   33 -
 apps/news/ajax/deletefolder.php               |   33 -
 apps/news/ajax/feeddialog.php                 |    7 -
 apps/news/ajax/folderdialog.php               |    7 -
 apps/news/ajax/markitem.php                   |   35 -
 apps/news/ajax/populateroot.php               |   18 -
 apps/news/appinfo/app.php                     |   42 -
 apps/news/appinfo/database.xml                |  186 -
 apps/news/appinfo/info.xml                    |   10 -
 apps/news/css/news.css                        |   52 -
 apps/news/index.php                           |   44 -
 apps/news/js/news.js                          |  196 -
 apps/news/js/settings.js                      |   15 -
 apps/news/lib/collection.php                  |   32 -
 apps/news/lib/feed.php                        |   46 -
 apps/news/lib/feedmapper.php                  |  182 -
 apps/news/lib/folder.php                      |   56 -
 apps/news/lib/foldermapper.php                |  148 -
 apps/news/lib/item.php                        |  122 -
 apps/news/lib/itemmapper.php                  |  171 -
 apps/news/lib/utils.php                       |   46 -
 apps/news/settings.php                        |    8 -
 apps/news/templates/main.php                  |   36 -
 apps/news/templates/part.addfeed.php          |   22 -
 apps/news/templates/part.addfolder.php        |   22 -
 apps/news/templates/part.feeds.php            |   31 -
 apps/news/templates/part.folderlist.php       |   12 -
 apps/news/templates/part.items.php            |   23 -
 apps/news/templates/part.nofeeds.php          |    3 -
 apps/news/templates/settings.php              |    8 -
 apps/news/templates/test.php                  |   85 -
 apps/shorty/.htaccess                         |   45 -
 .../shorty/3rdparty/js/jquery.tinysort.min.js |    1 -
 apps/shorty/3rdparty/php/phpqrcode.php        | 3312 -----------------
 apps/shorty/ajax/add.php                      |  101 -
 apps/shorty/ajax/click.php                    |   67 -
 apps/shorty/ajax/count.php                    |   54 -
 apps/shorty/ajax/del.php                      |   63 -
 apps/shorty/ajax/edit.php                     |   88 -
 apps/shorty/ajax/list.php                     |   77 -
 apps/shorty/ajax/meta.php                     |   56 -
 apps/shorty/ajax/preferences.php              |  119 -
 apps/shorty/ajax/settings.php                 |  109 -
 apps/shorty/ajax/status.php                   |   67 -
 apps/shorty/appinfo/app.php                   |   53 -
 apps/shorty/appinfo/database.xml              |  148 -
 apps/shorty/appinfo/info.xml                  |   56 -
 apps/shorty/appinfo/migrate.php               |  101 -
 apps/shorty/css/preferences.css               |  109 -
 apps/shorty/css/settings.css                  |   59 -
 apps/shorty/css/shorty.css                    |  488 ---
 apps/shorty/doc/CHANGELOG                     |   59 -
 apps/shorty/doc/CONFIGURATION                 |  113 -
 apps/shorty/doc/COPYRIGHT                     |   23 -
 apps/shorty/doc/CREDITS                       |   32 -
 apps/shorty/doc/INSTALLATION                  |   53 -
 apps/shorty/doc/ISSUES                        |   58 -
 apps/shorty/doc/README                        |   42 -
 apps/shorty/doc/ROADMAP                       |   96 -
 apps/shorty/doc/STATUS                        |   42 -
 apps/shorty/doc/USAGE                         |   64 -
 apps/shorty/img/actions/down.png              |  Bin 250 -> 0 bytes
 apps/shorty/img/actions/down.svg              |    9 -
 apps/shorty/img/actions/external.png          |  Bin 421 -> 0 bytes
 apps/shorty/img/actions/external.svg          |   11 -
 apps/shorty/img/actions/info.png              |  Bin 297 -> 0 bytes
 apps/shorty/img/actions/info.svg              |   70 -
 apps/shorty/img/actions/left.png              |  Bin 221 -> 0 bytes
 apps/shorty/img/actions/left.svg              |    9 -
 apps/shorty/img/actions/minus.png             |  Bin 288 -> 0 bytes
 apps/shorty/img/actions/open.png              |  Bin 320 -> 0 bytes
 apps/shorty/img/actions/open.svg              |   10 -
 apps/shorty/img/actions/plus.png              |  Bin 297 -> 0 bytes
 apps/shorty/img/actions/recycle.png           |  Bin 751 -> 0 bytes
 apps/shorty/img/actions/recycle.svg           |   93 -
 apps/shorty/img/actions/reload.png            |  Bin 1083 -> 0 bytes
 apps/shorty/img/actions/right.png             |  Bin 220 -> 0 bytes
 apps/shorty/img/actions/right.svg             |    9 -
 apps/shorty/img/actions/shade.png             |  Bin 434 -> 0 bytes
 apps/shorty/img/actions/shade.svg             |   78 -
 apps/shorty/img/actions/up.png                |  Bin 235 -> 0 bytes
 apps/shorty/img/actions/up.svg                |    9 -
 apps/shorty/img/blank.png                     |  Bin 219 -> 0 bytes
 apps/shorty/img/calendar.png                  |  Bin 659 -> 0 bytes
 apps/shorty/img/drag_me.png                   |  Bin 5189 -> 0 bytes
 apps/shorty/img/drag_me.svg                   |  135 -
 apps/shorty/img/loading-bar.gif               |  Bin 1190 -> 0 bytes
 apps/shorty/img/loading-disk.gif              |  Bin 6894 -> 0 bytes
 apps/shorty/img/loading-led.gif               |  Bin 684 -> 0 bytes
 apps/shorty/img/scheme/A.png                  |  Bin 973 -> 0 bytes
 apps/shorty/img/scheme/B.png                  |  Bin 1111 -> 0 bytes
 apps/shorty/img/scheme/C.png                  |  Bin 978 -> 0 bytes
 apps/shorty/img/scheme/D.png                  |  Bin 1035 -> 0 bytes
 apps/shorty/img/scheme/E.png                  |  Bin 988 -> 0 bytes
 apps/shorty/img/scheme/F.png                  |  Bin 969 -> 0 bytes
 apps/shorty/img/scheme/G.png                  |  Bin 995 -> 0 bytes
 apps/shorty/img/scheme/H.png                  |  Bin 991 -> 0 bytes
 apps/shorty/img/scheme/J.png                  |  Bin 935 -> 0 bytes
 apps/shorty/img/scheme/K.png                  |  Bin 980 -> 0 bytes
 apps/shorty/img/scheme/L.png                  |  Bin 910 -> 0 bytes
 apps/shorty/img/scheme/M.png                  |  Bin 985 -> 0 bytes
 apps/shorty/img/scheme/N.png                  |  Bin 996 -> 0 bytes
 apps/shorty/img/scheme/O.png                  |  Bin 1016 -> 0 bytes
 apps/shorty/img/scheme/P.png                  |  Bin 950 -> 0 bytes
 apps/shorty/img/scheme/Q.png                  |  Bin 1041 -> 0 bytes
 apps/shorty/img/scheme/R.png                  |  Bin 983 -> 0 bytes
 apps/shorty/img/scheme/S.png                  |  Bin 950 -> 0 bytes
 apps/shorty/img/scheme/T.png                  |  Bin 904 -> 0 bytes
 apps/shorty/img/scheme/U.png                  |  Bin 977 -> 0 bytes
 apps/shorty/img/scheme/V.png                  |  Bin 967 -> 0 bytes
 apps/shorty/img/scheme/W.png                  |  Bin 1026 -> 0 bytes
 apps/shorty/img/scheme/X.png                  |  Bin 959 -> 0 bytes
 apps/shorty/img/scheme/Y.png                  |  Bin 927 -> 0 bytes
 apps/shorty/img/scheme/Z.png                  |  Bin 956 -> 0 bytes
 apps/shorty/img/shorty.png                    |  Bin 746 -> 0 bytes
 apps/shorty/img/shorty.svg                    |   11 -
 apps/shorty/img/status/active.png             |  Bin 485 -> 0 bytes
 apps/shorty/img/status/active.svg             |    9 -
 apps/shorty/img/status/bad.png                |  Bin 795 -> 0 bytes
 apps/shorty/img/status/good.png               |  Bin 794 -> 0 bytes
 apps/shorty/img/status/neutral.png            |  Bin 763 -> 0 bytes
 apps/shorty/img/status/strike.png             |  Bin 355 -> 0 bytes
 apps/shorty/img/usage/64/arrow.png            |  Bin 3309 -> 0 bytes
 apps/shorty/img/usage/64/clipboard.png        |  Bin 3402 -> 0 bytes
 apps/shorty/img/usage/64/email.png            |  Bin 4302 -> 0 bytes
 apps/shorty/img/usage/64/globe.png            |  Bin 5242 -> 0 bytes
 apps/shorty/img/usage/64/home.png             |  Bin 4009 -> 0 bytes
 apps/shorty/img/usage/64/info.png             |  Bin 2817 -> 0 bytes
 apps/shorty/img/usage/64/locked.png           |  Bin 3091 -> 0 bytes
 apps/shorty/img/usage/64/network.png          |  Bin 3451 -> 0 bytes
 apps/shorty/img/usage/64/qrcode.png           |  Bin 6373 -> 0 bytes
 apps/shorty/img/usage/64/sms.png              |  Bin 3700 -> 0 bytes
 apps/shorty/img/usage/64/team.png             |  Bin 3539 -> 0 bytes
 apps/shorty/img/usage/64/unlocked.png         |  Bin 3115 -> 0 bytes
 apps/shorty/img/usage/64/workstation.png      |  Bin 3218 -> 0 bytes
 apps/shorty/img/usage/_.svg                   |   19 -
 apps/shorty/img/usage/arrow.svg               |   22 -
 apps/shorty/img/usage/clipboard.svg           |   34 -
 apps/shorty/img/usage/email.svg               |   21 -
 apps/shorty/img/usage/globe.svg               |   19 -
 apps/shorty/img/usage/home.svg                |   23 -
 apps/shorty/img/usage/info.svg                |   21 -
 apps/shorty/img/usage/locked.svg              |   23 -
 apps/shorty/img/usage/network.svg             |   34 -
 apps/shorty/img/usage/qrcode.svg              |  271 --
 apps/shorty/img/usage/sms.svg                 |   19 -
 apps/shorty/img/usage/team.svg                |   20 -
 apps/shorty/img/usage/unlocked.svg            |   23 -
 apps/shorty/img/usage/workstation.svg         |   22 -
 apps/shorty/index.php                         |  149 -
 apps/shorty/js/add.js                         |   51 -
 apps/shorty/js/debug.js                       |   71 -
 apps/shorty/js/init.js                        |   92 -
 apps/shorty/js/list.js                        |   39 -
 apps/shorty/js/preferences.js                 |   69 -
 apps/shorty/js/settings.js                    |   53 -
 apps/shorty/js/shorty.js                      | 1489 --------
 apps/shorty/l10n/de.php                       |  157 -
 apps/shorty/lib/backend.php                   |  286 --
 apps/shorty/lib/exception.php                 |  162 -
 apps/shorty/lib/hooks.php                     |   64 -
 apps/shorty/lib/l10n.php                      |   93 -
 apps/shorty/lib/meta.php                      |  213 --
 apps/shorty/lib/query.php                     |   57 -
 apps/shorty/lib/tools.php                     |  235 --
 apps/shorty/lib/type.php                      |  291 --
 apps/shorty/preferences.php                   |   68 -
 apps/shorty/qrcode.php                        |  100 -
 apps/shorty/relay.php                         |  140 -
 apps/shorty/settings.php                      |   52 -
 apps/shorty/templates/tmpl_dlg_qrcode.php     |   52 -
 apps/shorty/templates/tmpl_dlg_verify.php     |   70 -
 apps/shorty/templates/tmpl_http_status.php    |   41 -
 apps/shorty/templates/tmpl_index.php          |   66 -
 apps/shorty/templates/tmpl_preferences.php    |  257 --
 apps/shorty/templates/tmpl_settings.php       |   70 -
 apps/shorty/templates/tmpl_url_add.php        |   86 -
 apps/shorty/templates/tmpl_url_edit.php       |  100 -
 apps/shorty/templates/tmpl_url_list.php       |  167 -
 apps/shorty/templates/tmpl_url_share.php      |   89 -
 apps/shorty/templates/tmpl_url_show.php       |   85 -
 apps/storage_charts/ajax/config.php           |   44 -
 apps/storage_charts/ajax/data.php             |   37 -
 apps/storage_charts/appinfo/app.php           |   51 -
 apps/storage_charts/appinfo/app_admin.php     |   58 -
 apps/storage_charts/appinfo/database.xml      |   99 -
 apps/storage_charts/appinfo/info.xml          |   11 -
 apps/storage_charts/charts.php                |   46 -
 apps/storage_charts/css/styles.css            |   32 -
 apps/storage_charts/img/chart.png             |  Bin 441 -> 0 bytes
 apps/storage_charts/img/loader.gif            |  Bin 1849 -> 0 bytes
 apps/storage_charts/img/move.png              |  Bin 457 -> 0 bytes
 .../js/highCharts-2.2.1/highcharts.min.js     |  202 -
 apps/storage_charts/js/units.min.js           |   23 -
 apps/storage_charts/l10n/de.php               |   58 -
 apps/storage_charts/l10n/en.php               |   58 -
 apps/storage_charts/l10n/fr.php               |   58 -
 apps/storage_charts/l10n/pt_BR.php            |   59 -
 apps/storage_charts/lib/db.class.php          |  290 --
 apps/storage_charts/lib/loader.class.php      |  102 -
 apps/storage_charts/settings.php              |   43 -
 apps/storage_charts/templates/charts.tpl.php  |   77 -
 .../storage_charts/templates/settings.tpl.php |   40 -
 apps/tal/.gitignore                           |   51 -
 apps/tal/COPYING-AGPL                         |  661 ----
 apps/tal/COPYING-README                       |   10 -
 apps/tal/README.md                            |   26 -
 apps/tal/TODO                                 |    2 -
 apps/tal/ajax/loadpage.php                    |   23 -
 apps/tal/appinfo/app.php                      |   11 -
 apps/tal/appinfo/info.xml                     |   11 -
 apps/tal/css/tal.css                          |   25 -
 apps/tal/index.php                            |   30 -
 apps/tal/js/modernizr.js                      | 1265 -------
 apps/tal/js/tal.js                            |   32 -
 apps/tal/lib/paths.php                        |   13 -
 apps/tal/lib/tall10n.php                      |  105 -
 apps/tal/lib/taltemplate.php                  |  372 --
 apps/tal/settings.php                         |   16 -
 apps/tal/templates/layout.guest.pt            |   43 -
 apps/tal/templates/layout.user.pt             |   78 -
 apps/tal/templates/macros.util.pt             |   56 -
 apps/tal/templates/manual.pt                  |   23 -
 apps/tal/templates/sections.pt                |  142 -
 apps/tal/templates/settings.pt                |   10 -
 apps/tanghus-journal-2c506aa.tar.gz           |  Bin 41637 -> 0 bytes
 apps/tanghus-tal-7f8befe.tar.gz               |  Bin 37994 -> 0 bytes
 276 files changed, 22402 deletions(-)
 delete mode 100644 apps/journal/.gitignore
 delete mode 100644 apps/journal/COPYING-AGPL
 delete mode 100644 apps/journal/COPYING-README
 delete mode 100644 apps/journal/Changelog
 delete mode 100644 apps/journal/README.md
 delete mode 100644 apps/journal/TODO
 delete mode 100644 apps/journal/ajax/categories/categoriesfor.php
 delete mode 100644 apps/journal/ajax/categories/delete.php
 delete mode 100644 apps/journal/ajax/categories/list.php
 delete mode 100644 apps/journal/ajax/categories/rescan.php
 delete mode 100644 apps/journal/ajax/delete.php
 delete mode 100644 apps/journal/ajax/entries.php
 delete mode 100644 apps/journal/ajax/saveproperty.php
 delete mode 100644 apps/journal/ajax/setdefaultcalendar.php
 delete mode 100644 apps/journal/ajax/util.php
 delete mode 100644 apps/journal/appinfo/app.php
 delete mode 100644 apps/journal/appinfo/info.xml
 delete mode 100644 apps/journal/css/journal.css
 delete mode 100644 apps/journal/css/rte.css
 delete mode 100644 apps/journal/img/bold.svg
 delete mode 100644 apps/journal/img/indent-less.svg
 delete mode 100644 apps/journal/img/indent-more.svg
 delete mode 100644 apps/journal/img/italic.svg
 delete mode 100644 apps/journal/img/journal.png
 delete mode 100644 apps/journal/img/journal.svg
 delete mode 100644 apps/journal/img/justify-center.svg
 delete mode 100644 apps/journal/img/justify-fill.svg
 delete mode 100644 apps/journal/img/justify-left.svg
 delete mode 100644 apps/journal/img/justify-right.svg
 delete mode 100644 apps/journal/img/list.svg
 delete mode 100644 apps/journal/img/strikethrough.svg
 delete mode 100644 apps/journal/img/underline.svg
 delete mode 100644 apps/journal/index.php
 delete mode 100644 apps/journal/js/expanding.js
 delete mode 100644 apps/journal/js/journal.js
 delete mode 100644 apps/journal/js/jquery.rte.js
 delete mode 100644 apps/journal/js/jquery.textchange.js
 delete mode 100644 apps/journal/js/settings.js
 delete mode 100644 apps/journal/lib/app.php
 delete mode 100644 apps/journal/lib/hooks.php
 delete mode 100644 apps/journal/lib/search.php
 delete mode 100644 apps/journal/lib/vjournal.php
 delete mode 100644 apps/journal/settings.php
 delete mode 100644 apps/journal/templates/index.pt
 delete mode 100644 apps/journal/templates/rtfm.php
 delete mode 100644 apps/journal/templates/settings.pt
 delete mode 100644 apps/news/.gitignore
 delete mode 100644 apps/news/ajax/createfeed.php
 delete mode 100644 apps/news/ajax/createfolder.php
 delete mode 100644 apps/news/ajax/deletefeed.php
 delete mode 100644 apps/news/ajax/deletefolder.php
 delete mode 100644 apps/news/ajax/feeddialog.php
 delete mode 100644 apps/news/ajax/folderdialog.php
 delete mode 100644 apps/news/ajax/markitem.php
 delete mode 100644 apps/news/ajax/populateroot.php
 delete mode 100644 apps/news/appinfo/app.php
 delete mode 100644 apps/news/appinfo/database.xml
 delete mode 100644 apps/news/appinfo/info.xml
 delete mode 100644 apps/news/css/news.css
 delete mode 100644 apps/news/index.php
 delete mode 100644 apps/news/js/news.js
 delete mode 100644 apps/news/js/settings.js
 delete mode 100644 apps/news/lib/collection.php
 delete mode 100644 apps/news/lib/feed.php
 delete mode 100644 apps/news/lib/feedmapper.php
 delete mode 100644 apps/news/lib/folder.php
 delete mode 100644 apps/news/lib/foldermapper.php
 delete mode 100644 apps/news/lib/item.php
 delete mode 100644 apps/news/lib/itemmapper.php
 delete mode 100644 apps/news/lib/utils.php
 delete mode 100644 apps/news/settings.php
 delete mode 100644 apps/news/templates/main.php
 delete mode 100644 apps/news/templates/part.addfeed.php
 delete mode 100644 apps/news/templates/part.addfolder.php
 delete mode 100644 apps/news/templates/part.feeds.php
 delete mode 100644 apps/news/templates/part.folderlist.php
 delete mode 100644 apps/news/templates/part.items.php
 delete mode 100644 apps/news/templates/part.nofeeds.php
 delete mode 100644 apps/news/templates/settings.php
 delete mode 100644 apps/news/templates/test.php
 delete mode 100644 apps/shorty/.htaccess
 delete mode 100644 apps/shorty/3rdparty/js/jquery.tinysort.min.js
 delete mode 100644 apps/shorty/3rdparty/php/phpqrcode.php
 delete mode 100644 apps/shorty/ajax/add.php
 delete mode 100644 apps/shorty/ajax/click.php
 delete mode 100644 apps/shorty/ajax/count.php
 delete mode 100644 apps/shorty/ajax/del.php
 delete mode 100644 apps/shorty/ajax/edit.php
 delete mode 100644 apps/shorty/ajax/list.php
 delete mode 100644 apps/shorty/ajax/meta.php
 delete mode 100644 apps/shorty/ajax/preferences.php
 delete mode 100644 apps/shorty/ajax/settings.php
 delete mode 100644 apps/shorty/ajax/status.php
 delete mode 100644 apps/shorty/appinfo/app.php
 delete mode 100644 apps/shorty/appinfo/database.xml
 delete mode 100644 apps/shorty/appinfo/info.xml
 delete mode 100644 apps/shorty/appinfo/migrate.php
 delete mode 100644 apps/shorty/css/preferences.css
 delete mode 100644 apps/shorty/css/settings.css
 delete mode 100644 apps/shorty/css/shorty.css
 delete mode 100644 apps/shorty/doc/CHANGELOG
 delete mode 100644 apps/shorty/doc/CONFIGURATION
 delete mode 100644 apps/shorty/doc/COPYRIGHT
 delete mode 100644 apps/shorty/doc/CREDITS
 delete mode 100644 apps/shorty/doc/INSTALLATION
 delete mode 100644 apps/shorty/doc/ISSUES
 delete mode 100644 apps/shorty/doc/README
 delete mode 100644 apps/shorty/doc/ROADMAP
 delete mode 100644 apps/shorty/doc/STATUS
 delete mode 100644 apps/shorty/doc/USAGE
 delete mode 100644 apps/shorty/img/actions/down.png
 delete mode 100644 apps/shorty/img/actions/down.svg
 delete mode 100644 apps/shorty/img/actions/external.png
 delete mode 100644 apps/shorty/img/actions/external.svg
 delete mode 100644 apps/shorty/img/actions/info.png
 delete mode 100644 apps/shorty/img/actions/info.svg
 delete mode 100644 apps/shorty/img/actions/left.png
 delete mode 100644 apps/shorty/img/actions/left.svg
 delete mode 100644 apps/shorty/img/actions/minus.png
 delete mode 100644 apps/shorty/img/actions/open.png
 delete mode 100644 apps/shorty/img/actions/open.svg
 delete mode 100644 apps/shorty/img/actions/plus.png
 delete mode 100644 apps/shorty/img/actions/recycle.png
 delete mode 100644 apps/shorty/img/actions/recycle.svg
 delete mode 100644 apps/shorty/img/actions/reload.png
 delete mode 100644 apps/shorty/img/actions/right.png
 delete mode 100644 apps/shorty/img/actions/right.svg
 delete mode 100644 apps/shorty/img/actions/shade.png
 delete mode 100644 apps/shorty/img/actions/shade.svg
 delete mode 100644 apps/shorty/img/actions/up.png
 delete mode 100644 apps/shorty/img/actions/up.svg
 delete mode 100644 apps/shorty/img/blank.png
 delete mode 100644 apps/shorty/img/calendar.png
 delete mode 100644 apps/shorty/img/drag_me.png
 delete mode 100644 apps/shorty/img/drag_me.svg
 delete mode 100644 apps/shorty/img/loading-bar.gif
 delete mode 100644 apps/shorty/img/loading-disk.gif
 delete mode 100644 apps/shorty/img/loading-led.gif
 delete mode 100644 apps/shorty/img/scheme/A.png
 delete mode 100644 apps/shorty/img/scheme/B.png
 delete mode 100644 apps/shorty/img/scheme/C.png
 delete mode 100644 apps/shorty/img/scheme/D.png
 delete mode 100644 apps/shorty/img/scheme/E.png
 delete mode 100644 apps/shorty/img/scheme/F.png
 delete mode 100644 apps/shorty/img/scheme/G.png
 delete mode 100644 apps/shorty/img/scheme/H.png
 delete mode 100644 apps/shorty/img/scheme/J.png
 delete mode 100644 apps/shorty/img/scheme/K.png
 delete mode 100644 apps/shorty/img/scheme/L.png
 delete mode 100644 apps/shorty/img/scheme/M.png
 delete mode 100644 apps/shorty/img/scheme/N.png
 delete mode 100644 apps/shorty/img/scheme/O.png
 delete mode 100644 apps/shorty/img/scheme/P.png
 delete mode 100644 apps/shorty/img/scheme/Q.png
 delete mode 100644 apps/shorty/img/scheme/R.png
 delete mode 100644 apps/shorty/img/scheme/S.png
 delete mode 100644 apps/shorty/img/scheme/T.png
 delete mode 100644 apps/shorty/img/scheme/U.png
 delete mode 100644 apps/shorty/img/scheme/V.png
 delete mode 100644 apps/shorty/img/scheme/W.png
 delete mode 100644 apps/shorty/img/scheme/X.png
 delete mode 100644 apps/shorty/img/scheme/Y.png
 delete mode 100644 apps/shorty/img/scheme/Z.png
 delete mode 100644 apps/shorty/img/shorty.png
 delete mode 100644 apps/shorty/img/shorty.svg
 delete mode 100644 apps/shorty/img/status/active.png
 delete mode 100644 apps/shorty/img/status/active.svg
 delete mode 100644 apps/shorty/img/status/bad.png
 delete mode 100644 apps/shorty/img/status/good.png
 delete mode 100644 apps/shorty/img/status/neutral.png
 delete mode 100644 apps/shorty/img/status/strike.png
 delete mode 100644 apps/shorty/img/usage/64/arrow.png
 delete mode 100644 apps/shorty/img/usage/64/clipboard.png
 delete mode 100644 apps/shorty/img/usage/64/email.png
 delete mode 100644 apps/shorty/img/usage/64/globe.png
 delete mode 100644 apps/shorty/img/usage/64/home.png
 delete mode 100644 apps/shorty/img/usage/64/info.png
 delete mode 100644 apps/shorty/img/usage/64/locked.png
 delete mode 100644 apps/shorty/img/usage/64/network.png
 delete mode 100644 apps/shorty/img/usage/64/qrcode.png
 delete mode 100644 apps/shorty/img/usage/64/sms.png
 delete mode 100644 apps/shorty/img/usage/64/team.png
 delete mode 100644 apps/shorty/img/usage/64/unlocked.png
 delete mode 100644 apps/shorty/img/usage/64/workstation.png
 delete mode 100644 apps/shorty/img/usage/_.svg
 delete mode 100644 apps/shorty/img/usage/arrow.svg
 delete mode 100644 apps/shorty/img/usage/clipboard.svg
 delete mode 100644 apps/shorty/img/usage/email.svg
 delete mode 100644 apps/shorty/img/usage/globe.svg
 delete mode 100644 apps/shorty/img/usage/home.svg
 delete mode 100644 apps/shorty/img/usage/info.svg
 delete mode 100644 apps/shorty/img/usage/locked.svg
 delete mode 100644 apps/shorty/img/usage/network.svg
 delete mode 100644 apps/shorty/img/usage/qrcode.svg
 delete mode 100644 apps/shorty/img/usage/sms.svg
 delete mode 100644 apps/shorty/img/usage/team.svg
 delete mode 100644 apps/shorty/img/usage/unlocked.svg
 delete mode 100644 apps/shorty/img/usage/workstation.svg
 delete mode 100644 apps/shorty/index.php
 delete mode 100644 apps/shorty/js/add.js
 delete mode 100644 apps/shorty/js/debug.js
 delete mode 100644 apps/shorty/js/init.js
 delete mode 100644 apps/shorty/js/list.js
 delete mode 100644 apps/shorty/js/preferences.js
 delete mode 100644 apps/shorty/js/settings.js
 delete mode 100644 apps/shorty/js/shorty.js
 delete mode 100644 apps/shorty/l10n/de.php
 delete mode 100644 apps/shorty/lib/backend.php
 delete mode 100644 apps/shorty/lib/exception.php
 delete mode 100644 apps/shorty/lib/hooks.php
 delete mode 100644 apps/shorty/lib/l10n.php
 delete mode 100644 apps/shorty/lib/meta.php
 delete mode 100644 apps/shorty/lib/query.php
 delete mode 100644 apps/shorty/lib/tools.php
 delete mode 100644 apps/shorty/lib/type.php
 delete mode 100644 apps/shorty/preferences.php
 delete mode 100644 apps/shorty/qrcode.php
 delete mode 100644 apps/shorty/relay.php
 delete mode 100644 apps/shorty/settings.php
 delete mode 100644 apps/shorty/templates/tmpl_dlg_qrcode.php
 delete mode 100644 apps/shorty/templates/tmpl_dlg_verify.php
 delete mode 100644 apps/shorty/templates/tmpl_http_status.php
 delete mode 100644 apps/shorty/templates/tmpl_index.php
 delete mode 100644 apps/shorty/templates/tmpl_preferences.php
 delete mode 100644 apps/shorty/templates/tmpl_settings.php
 delete mode 100644 apps/shorty/templates/tmpl_url_add.php
 delete mode 100644 apps/shorty/templates/tmpl_url_edit.php
 delete mode 100644 apps/shorty/templates/tmpl_url_list.php
 delete mode 100644 apps/shorty/templates/tmpl_url_share.php
 delete mode 100644 apps/shorty/templates/tmpl_url_show.php
 delete mode 100644 apps/storage_charts/ajax/config.php
 delete mode 100644 apps/storage_charts/ajax/data.php
 delete mode 100644 apps/storage_charts/appinfo/app.php
 delete mode 100644 apps/storage_charts/appinfo/app_admin.php
 delete mode 100644 apps/storage_charts/appinfo/database.xml
 delete mode 100644 apps/storage_charts/appinfo/info.xml
 delete mode 100644 apps/storage_charts/charts.php
 delete mode 100644 apps/storage_charts/css/styles.css
 delete mode 100644 apps/storage_charts/img/chart.png
 delete mode 100644 apps/storage_charts/img/loader.gif
 delete mode 100644 apps/storage_charts/img/move.png
 delete mode 100644 apps/storage_charts/js/highCharts-2.2.1/highcharts.min.js
 delete mode 100644 apps/storage_charts/js/units.min.js
 delete mode 100644 apps/storage_charts/l10n/de.php
 delete mode 100644 apps/storage_charts/l10n/en.php
 delete mode 100644 apps/storage_charts/l10n/fr.php
 delete mode 100644 apps/storage_charts/l10n/pt_BR.php
 delete mode 100644 apps/storage_charts/lib/db.class.php
 delete mode 100644 apps/storage_charts/lib/loader.class.php
 delete mode 100644 apps/storage_charts/settings.php
 delete mode 100644 apps/storage_charts/templates/charts.tpl.php
 delete mode 100644 apps/storage_charts/templates/settings.tpl.php
 delete mode 100644 apps/tal/.gitignore
 delete mode 100644 apps/tal/COPYING-AGPL
 delete mode 100644 apps/tal/COPYING-README
 delete mode 100644 apps/tal/README.md
 delete mode 100644 apps/tal/TODO
 delete mode 100644 apps/tal/ajax/loadpage.php
 delete mode 100644 apps/tal/appinfo/app.php
 delete mode 100644 apps/tal/appinfo/info.xml
 delete mode 100644 apps/tal/css/tal.css
 delete mode 100644 apps/tal/index.php
 delete mode 100644 apps/tal/js/modernizr.js
 delete mode 100644 apps/tal/js/tal.js
 delete mode 100644 apps/tal/lib/paths.php
 delete mode 100644 apps/tal/lib/tall10n.php
 delete mode 100644 apps/tal/lib/taltemplate.php
 delete mode 100644 apps/tal/settings.php
 delete mode 100644 apps/tal/templates/layout.guest.pt
 delete mode 100644 apps/tal/templates/layout.user.pt
 delete mode 100644 apps/tal/templates/macros.util.pt
 delete mode 100644 apps/tal/templates/manual.pt
 delete mode 100644 apps/tal/templates/sections.pt
 delete mode 100644 apps/tal/templates/settings.pt
 delete mode 100644 apps/tanghus-journal-2c506aa.tar.gz
 delete mode 100644 apps/tanghus-tal-7f8befe.tar.gz

diff --git a/apps/journal/.gitignore b/apps/journal/.gitignore
deleted file mode 100644
index e2ff07d14d..0000000000
--- a/apps/journal/.gitignore
+++ /dev/null
@@ -1,51 +0,0 @@
-# the default generated dir + db file
-data
-owncloud
-config/config.php
-config/mount.php
-apps/inc.php
-
-# just sane ignores
-.*.sw[po]
-*.bak
-*.BAK
-*~
-*.orig
-*.class
-.cvsignore
-Thumbs.db
-*.py[co]
-_darcs/*
-CVS/*
-.svn/*
-RCS/*
-
-# kdevelop
-.kdev
-*.kdev4
-
-# Lokalize
-*lokalize*
-
-# eclipse
-.project
-.settings
-
-# netbeans 
-nbproject
-
-# geany
-*.geany
-
-# Cloud9IDE
-.settings.xml
-
-# vim ex mode
-.vimrc
-	
-# Mac OS
-.DS_Store
-
-# WebFinger
-.well-known
-/.buildpath
diff --git a/apps/journal/COPYING-AGPL b/apps/journal/COPYING-AGPL
deleted file mode 100644
index dba13ed2dd..0000000000
--- a/apps/journal/COPYING-AGPL
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/apps/journal/COPYING-README b/apps/journal/COPYING-README
deleted file mode 100644
index 18f06caa3e..0000000000
--- a/apps/journal/COPYING-README
+++ /dev/null
@@ -1,10 +0,0 @@
-Files in TAL Templating System for ownCloud are licensed under the Affero General Public License version 3,
-the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
-unless otherwise noted.
-
-Licensing of components:
-* PHPTAL - http://phptal.org/ : LGPL
-
-All unmodified files from these and other sources retain their original copyright
-and license notices: see the relevant individual files.
-
diff --git a/apps/journal/Changelog b/apps/journal/Changelog
deleted file mode 100644
index 08b20831be..0000000000
--- a/apps/journal/Changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Changelog
-
-### 0.1
-
-- First release.
\ No newline at end of file
diff --git a/apps/journal/README.md b/apps/journal/README.md
deleted file mode 100644
index 7c06e4f038..0000000000
--- a/apps/journal/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Journal/Notes app for ownCloud
-
-## Features
-
-- Saves notes/journal entries as VJOURNAL records in the ownCloud Calendar.
-
-- Integrates with ownClouds search backend.
-
-- Sort entries by date/time ascending/descending or summary ascending/descending.
-
-- Plain text or rich text editing (rich text editing is still buggy and immature).
-
-- Syncs with KDEPIMs Journal part.
-
-- Completed tasks from the Task app can be automatically added as journal entries.
-
-- Stores entry data as json objects in each element for quich access and to minimize ajax calls.
-
-To install this app you will first have to install the [TAL Page Templates for ownCloud](/tanghus/tal#readme) app.
-
-## Installation from git
-
-1. Go to your ownCloud apps dir and clone the repo there:
-   <pre>
-	 cd owncloud/apps
-	 git clone git://github.com/tanghus/journal.git</pre>
-	
-2. From your browser go to the ownCloud apps page (`/settings/apps.php`) and enable the Journal app.
-
-3. After a page refresh you should see the Journal app in the main menu.
-
-
-## DISCLAIMER
-
-There's no garantee this app won't eat your data, chew it up and spit it out. It works directly on the calendar app data
-though not touching anything but VJOURNAL entries. [Always backup!](http://tanghus.net/2012/04/backup-owncloud-calendar-and-contacts/)
-
-Please report any issues at the [github issue tracker](https://github.com/tanghus/journal/issues)
\ No newline at end of file
diff --git a/apps/journal/TODO b/apps/journal/TODO
deleted file mode 100644
index 2827136581..0000000000
--- a/apps/journal/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
- 
-- Fix categories.
-
-- Hide empty elements?
-
-- Check if entered text in one mode gets transfered when changing modes.
-
-- Make edit area fit size and scrollable.
-
-- Add an "only read from this calendar" checkbox.
-
-- Test, test, test in other browser as well.
-
diff --git a/apps/journal/ajax/categories/categoriesfor.php b/apps/journal/ajax/categories/categoriesfor.php
deleted file mode 100644
index 846af300de..0000000000
--- a/apps/journal/ajax/categories/categoriesfor.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$id = isset($_GET['id'])?$_GET['id']:null;
-if(is_null($id)) {
-	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('No ID provided'))));
-	exit();
-}
-$vcard = OC_Contacts_App::getContactVCard( $id );
-foreach($vcard->children as $property){
-	//OCP\Util::writeLog('contacts','ajax/categories/checksumfor.php: '.$property->name, OCP\Util::DEBUG);
-	if($property->name == 'CATEGORIES') {
-		$checksum = md5($property->serialize());
-		OCP\JSON::success(array('data' => array('value'=>$property->value, 'checksum'=>$checksum)));
-		exit();
-	}
-}
-OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
-?>
diff --git a/apps/journal/ajax/categories/delete.php b/apps/journal/ajax/categories/delete.php
deleted file mode 100644
index e68d608c5d..0000000000
--- a/apps/journal/ajax/categories/delete.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.print_r($element, true));
-}
-
-require_once('../util.php');
-
-$categories = isset($_POST['categories'])?$_POST['categories']:null;
-
-if(is_null($categories)) {
-	bailOut(OC_Contacts_App::$l10n->t('No categories selected for deletion.'));
-}
-
-debug(print_r($categories, true));
-
-$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-if(count($addressbooks) == 0) {
-	bailOut(OC_Contacts_App::$l10n->t('No address books found.'));
-}
-$addressbookids = array();
-foreach($addressbooks as $addressbook) {
-	$addressbookids[] = $addressbook['id'];
-} 
-$contacts = OC_Contacts_VCard::all($addressbookids);
-if(count($contacts) == 0) {
-	bailOut(OC_Contacts_App::$l10n->t('No contacts found.'));
-}
-
-$cards = array();
-foreach($contacts as $contact) {
-	$cards[] = array($contact['id'], $contact['carddata']);
-} 
-
-debug('Before delete: '.print_r($categories, true));
-
-$catman = new OC_VCategories('contacts');
-$catman->delete($categories, $cards);
-debug('After delete: '.print_r($catman->categories(), true));
-OC_Contacts_VCard::updateDataByID($cards);
-OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
-
-?>
diff --git a/apps/journal/ajax/categories/list.php b/apps/journal/ajax/categories/list.php
deleted file mode 100644
index ac8976fa0e..0000000000
--- a/apps/journal/ajax/categories/list.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('journal');
-
-$categories = OC_Journal_App::getCategories();
-
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>
diff --git a/apps/journal/ajax/categories/rescan.php b/apps/journal/ajax/categories/rescan.php
deleted file mode 100644
index d746f9179f..0000000000
--- a/apps/journal/ajax/categories/rescan.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('journal');
-
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.print_r($element, true));
-}
-
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('journal','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('journal','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-}
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-if(count($calendars) == 0) {
-	bailOut(OC_Calendar_App::$l10n->t('No calendars found.'));
-}
-$events = array();
-foreach($calendars as $calendar) {
-	$calendar_events = OC_Calendar_Object::all($calendar['id']);
-	$events = $events + $calendar_events;
-}
-if(count($events) == 0) {
-	bailOut(OC_Calendar_App::$l10n->t('No events found.'));
-}
-
-OC_Calendar_App::scanCategories($events);
-$categories = OC_Calendar_App::getCategoryOptions();
-
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
\ No newline at end of file
diff --git a/apps/journal/ajax/delete.php b/apps/journal/ajax/delete.php
deleted file mode 100644
index 4013e4440a..0000000000
--- a/apps/journal/ajax/delete.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * ownCloud - Journal
- *
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('journal');
-OCP\JSON::callCheck();
-
-$id = isset($_POST['id'])?$_POST['id']:null;
-if(is_null($id)) {
-	OCP\JSON::error(array('data'=>array('message' => OC_Journal_App::$l10n->t('ID is not set!'))));
-	exit;
-}
-$journal = OC_Calendar_App::getEventObject($id);
-if($journal) {
-	OC_Calendar_Object::delete($id);
-	OCP\JSON::success(array('data' => array( 'id' => $id )));
-} else {
-	OCP\JSON::error(array('data' => array('id' => $id, 'message' => OC_Journal_App::$l10n->t('Could not find journal entry: '.$id))));
-}
\ No newline at end of file
diff --git a/apps/journal/ajax/entries.php b/apps/journal/ajax/entries.php
deleted file mode 100644
index 03f2366d33..0000000000
--- a/apps/journal/ajax/entries.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('journal');
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
-session_write_close();
-$journals = array();
-foreach( $calendars as $calendar ){
-	$calendar_journals = OC_Calendar_Object::all($calendar['id']);
-	foreach( $calendar_journals as $journal ) {
-		if($journal['objecttype']!='VJOURNAL') {
-			continue;
-		}
-		if(is_null($journal['summary'])) {
-			continue;
-		}
-		$object = OC_VObject::parse($journal['calendardata']);
-		$vjournalobj = $object->VJOURNAL;
-		try {
-			$journals[] = OC_Journal_App::arrayForJSON($journal['id'], $vjournalobj, $user_timezone);
-		} catch(Exception $e) {
-			OCP\Util::writeLog('journal', 'ajax/getentries.php. id: '.$journal['id'].' '.$e->getMessage(), OCP\Util::ERROR);
-		}
-	}
-}
-
-OCP\JSON::success(array('data' => array('entries' => $journals)));
diff --git a/apps/journal/ajax/saveproperty.php b/apps/journal/ajax/saveproperty.php
deleted file mode 100644
index 016f922a9a..0000000000
--- a/apps/journal/ajax/saveproperty.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-$htmlwrap = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"><html><head></head><body>%s</body></html>';
-$divwrap = '<div>%s</div>';
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('journal');
-OCP\JSON::callCheck();
-
-$id = isset($_POST['id'])?$_POST['id']:null;
-$property = isset($_POST['type'])?$_POST['type']:null;
-$value = isset($_POST['value'])?$_POST['value']:null;
-if(is_null($id)) {
-	OCP\JSON::error(array('data'=>array('message' => OC_Journal_App::$l10n->t('ID is not set!'))));
-	exit;
-}
-if(is_null($property)) {
-	OCP\JSON::error(array('data'=>array('message' => OC_Journal_App::$l10n->t('Property name is not set!'))));
-	exit;
-}
-if(is_null($value)) {
-	OCP\JSON::error(array('data'=>array('message' => OC_Journal_App::$l10n->t('Property value is not set!'))));
-	exit;
-}
-
-foreach($_POST as $key => $val) {
-    error_log($key.': '.print_r($val, true));
-}
-
-$parameters = isset($_POST['parameters'])? $_POST['parameters']:null;
-if($id == 'new') {
-	$vcalendar = OC_Journal_App::createVCalendar();
-} else {
-	$vcalendar = OC_Calendar_App::getVCalendar( $id );
-}
-error_log('saveproperty: '.$property.': '.print_r($value, true));
-$vjournal = $vcalendar->VJOURNAL;
-switch($property) {
-	case 'DESCRIPTION':
-		$hasgenericformat = false;
-		$haskdeformat = false;
-		if(!$vjournal->DESCRIPTION) {
-			$vjournal->setString('DESCRIPTION', $value);
-		}
-		if($parameters && isset($parameters['FORMAT']) && strtoupper($parameters['FORMAT']) == 'HTML') {
-			if($value[0] != '<') { // Fugly hack coming up
-				$value = sprintf($divwrap, $value);
-			}
-			$vjournal->DESCRIPTION->value = sprintf($htmlwrap, $value);
-			foreach($vjournal->DESCRIPTION->parameters as $parameter){
-				if(stripos($parameter->name, 'X-KDE-TEXTFORMAT') !== false && stripos($parameter->value, 'HTML') !== false){
-					$haskdeformat = true;
-				}
-				if(stripos($parameter->name, 'X-TEXTFORMAT') !== false && stripos($parameter->value, 'HTML') !== false){
-					$hasgenericformat = true;
-				}
-			}
-			if(!$haskdeformat) {
-				try {
-					$vjournal->DESCRIPTION->add(new Sabre_VObject_Parameter('X-KDE-TEXTFORMAT', 'HTML'));
-				} catch (Exception $e) {
-					OCP\JSON::error(array('data'=>array('message'=>OC_Journal_App::$l10n->t('Error setting rich text format parameter: '.$e->getMessage()))));
-					exit();
-				}
-			}
-			if(!$hasgenericformat) { // Add a more generic text formatting parameter in case other clients would use VJOURNAL this way.
-				try {
-					$vjournal->DESCRIPTION->add(new Sabre_VObject_Parameter('X-TEXTFORMAT', 'HTML'));
-				} catch (Exception $e) {
-					OCP\JSON::error(array('data'=>array('message'=>OC_Journal_App::$l10n->t('Error setting rich text format parameter: '.$e->getMessage()))));
-					exit();
-				}
-			}
-		} else {
-			$vjournal->DESCRIPTION->value = $value;
-		}
-		break;
-	case 'DTSTART':
-		try {
-			$date_only = isset($_POST['date_only']) && (bool)$_POST['date_only'] == true?true:false;
-			$timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
-			$timezone = new DateTimeZone($timezone);
-			//$dtstart = new DateTime($value, $timezone);
-			$dtstart = new DateTime('@'.$value);
-			$dtstart->setTimezone($timezone);
-			$type = Sabre_VObject_Property_DateTime::LOCALTZ;
-			if ($date_only) {
-				$type = Sabre_VObject_Property_DateTime::DATE;
-			}
-			$vjournal->setDateTime('DTSTART', $value, $type);
-		} catch (Exception $e) {
-			OCP\JSON::error(array('data'=>array('message'=>OC_Journal_App::$l10n->t('Invalid date/time: '.$e->getMessage()))));
-			exit();
-		}
-		break;
-	case 'ORGANIZER':
-	case 'SUMMARY':
-	case 'CATEGORIES':
-		$vobject = $vjournal->getVObject();
-		if(isset($vobject[$property])) {
-			$vobject[$property]['value'] = $value;
-		} else {
-			$vjournal->setString($property, $value);
-		}
-		break;
-		$vjournal->setString($property, $value);
-		break;
-	default:
-		OCP\JSON::error(array('data'=>array('message'=>'Unknown type: '.$property)));
-		exit();
-}
-
-$vjournal->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-$vjournal->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
-
-if($id == 'new') {
-	// TODO: Have a calendar ID parameter in request.
-	$cid = OCP\Config::getUserValue(OCP\User::getUser(), 'journal', 'default_calendar', null);
-	// Check that the calendar exists and that it's ours.
-	$cid = OC_Calendar_App::getCalendar($cid, true);
-	if(!$cid) {
-		OCP\Util::writeLog('journal', 'The default calendar '.$cid.' is either not owned by '.OCP\User::getUser().' or doesn\'t exist.', OCP\Util::WARN);
-		$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-		$first_calendar = reset($calendars);
-		$cid = $first_calendar['id'];
-	}
-	$id = OC_Calendar_Object::add($cid, $vcalendar->serialize());
-} else {
-	OC_Calendar_Object::edit($id, $vcalendar->serialize());
-}
-$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get());
-$journal_info = OC_Journal_App::arrayForJSON($id, $vjournal, $user_timezone);
-OCP\JSON::success(array('data' => $journal_info));
diff --git a/apps/journal/ajax/setdefaultcalendar.php b/apps/journal/ajax/setdefaultcalendar.php
deleted file mode 100644
index a82c1e3cf1..0000000000
--- a/apps/journal/ajax/setdefaultcalendar.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('journal');
-OCP\JSON::callCheck();
-
-$id = isset($_POST['id'])?$_POST['id']:null;
-if(is_null($id)) {
-	OCP\JSON::error(array('data'=>array('message' => OC_Journal_App::$l10n->t('ID is not set!'))));
-	exit;
-}
-if(OCP\Config::setUserValue(OCP\USER::getUser(), 'journal', 'default_calendar', $id)) {
-	OC_Calendar_Object::delete($id);
-	OCP\JSON::success(array('data' => array( 'id' => $id )));
-} else {
-	OCP\JSON::error(array('data' => array('id' => $id, 'message' => OC_Journal_App::$l10n->t('Could not set default calendar: '.$id))));
-}
\ No newline at end of file
diff --git a/apps/journal/ajax/util.php b/apps/journal/ajax/util.php
deleted file mode 100644
index b690b2e194..0000000000
--- a/apps/journal/ajax/util.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-
-function bailOut($msg, $tracelevel=1, $debuglevel=OCP\Util::ERROR) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	debug($msg, $tracelevel, $debuglevel);
-	exit();
-}
-
-function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) {
-	if(PHP_VERSION >= "5.4") {
-		$call = debug_backtrace(false, $tracelevel+1);
-	} else {
-		$call = debug_backtrace(false);
-	}
-	error_log('trace: '.print_r($call, true));
-	$call = $call[$tracelevel];
-	if($debuglevel !== false) {
-		OCP\Util::writeLog('journal', $call['file'].'. Line: '.$call['line'].': '.$msg, $debuglevel);
-	}
-}
diff --git a/apps/journal/appinfo/app.php b/apps/journal/appinfo/app.php
deleted file mode 100644
index 5f33d40399..0000000000
--- a/apps/journal/appinfo/app.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$l=new OC_L10N('journal');
-OC::$CLASSPATH['OC_Calendar_Calendar'] = 'calendar/lib/calendar.php';
-OC::$CLASSPATH['OC_Journal_App'] = 'journal/lib/app.php';
-OC::$CLASSPATH['OC_Search_Provider_Journal'] = 'journal/lib/search.php';
-OC::$CLASSPATH['OC_Journal_Hooks'] = 'journal/lib/hooks.php';
-
-OCP\Util::connectHook('OC_Task', 'taskCompleted', 'OC_Journal_Hooks', 'taskToJournalEntry');
-
-OCP\App::addNavigationEntry( array(
-  'id' => 'journal_index',
-  'order' => 11,
-  'href' => OCP\Util::linkTo( 'journal', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'journal', 'journal.png' ),
-  'name' => $l->t('Journal')));
-
-OC_Search::registerProvider('OC_Search_Provider_Journal');
-OCP\App::registerPersonal('journal','settings');
\ No newline at end of file
diff --git a/apps/journal/appinfo/info.xml b/apps/journal/appinfo/info.xml
deleted file mode 100644
index 426e38eb9f..0000000000
--- a/apps/journal/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>journal</id>
-	<name>Journal</name>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Thomas Tanghus</author>
-	<require>5</require>
-	<shipped>true</shipped>
-	<description>Journal view from calendar</description>
-</info>
diff --git a/apps/journal/css/journal.css b/apps/journal/css/journal.css
deleted file mode 100644
index ac2ae74c65..0000000000
--- a/apps/journal/css/journal.css
+++ /dev/null
@@ -1,19 +0,0 @@
-#leftcontent a { font-weight: bold; }
-#metadata { position: fixed; background-color: #ccc; width: 20em; right: 0; top: 6.5em; bottom: 0; overflow: auto; padding: 1em; margin: 0; font-size: 1em; font-weight: bold; }
-#metadata :disabled.property { background-color: #ccc; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
-#entry { position: fixed; background: #fff; top: 6.5em; bottom: 0; left: 32.5em !important; right: 22em;  padding: 1em; margin: 0; }
-div.propertycontainer[data-type="DESCRIPTION"] { height: 90%; }
-#description { width: 95%; height: 90%; }
-.rte-content { position: absolute; left: 1em; right: 1em; top: 7em; bottom: 1em; overflow: auto; }
-#summary { width: 95%; font-size: 1.4em; font-weight: bold; height: 1.6em; }
-.editable,.content { font-size: 1.2em; background-color: #fff !important; border: 1px solid #fff !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; cursor: text; }
-.editable:hover,.editable:focus,.editable:hover:active { border: 1px solid #1d2d44 !important; }
-#categories,#organizer,#location,#link { width: 18em; clear: right; }
-#dtstartdate { width: 10em; }
-#dtstarttime { width: 5em; }
-.loading { background: url('%webroot%/core/img/loading.gif') no-repeat center !important; cursor: wait; }
-.action { padding-left: 0.5em; }
-label,dt { color: #aaa; }
-label:hover, dt:hover { color: #333; }
-.required { color: red; border: 3px solid red; }
-input { font-size: 1em; font-weight: bold; }
\ No newline at end of file
diff --git a/apps/journal/css/rte.css b/apps/journal/css/rte.css
deleted file mode 100644
index e786599002..0000000000
--- a/apps/journal/css/rte.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.rte-toolbar { margin: 0; width:100%; height:22px; padding:0; list-style-type:none; }
-.rte-toolbar li button, .rte-toolbar li a { float:left; cursor:pointer; opacity: 0.6; padding:0; margin: 0; border: 0; border-radius: 0; outline: 0; background: inherit; }
-.rte-toolbar li button:hover { opacity: 0.8; }
-.rte-content { cursor:text;position:absolute; border-color:#000;border-style:solid;white-space: pre-wrap;word-wrap:break-word; padding: 0.2em; }
-.rte-content ul { list-style: circle inside; }
-.rte-content li { padding-left: 1em; }
-
diff --git a/apps/journal/img/bold.svg b/apps/journal/img/bold.svg
deleted file mode 100644
index 2b06228258..0000000000
--- a/apps/journal/img/bold.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-<defs/>
-<g id="layer4">
-  <g id="g2464" transform="translate(-3.90271, -4.31297)" fill="none">
-   <path id="path2277" transform="translate(4.74736, 5.23002)" fill="#000000" fill-rule="evenodd" stroke="#000000" stroke-width="1.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" d="M5.13684 0L0 13.8281L3.42454 13.8281L4.1862 11.5856L10.1818 11.5856L10.9586 13.8281L14.3831 13.8281L9.24627 0L8.21891 0L6.1642 0ZM7.19155 3.17671L9.10715 8.59582L5.27595 8.59582Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/journal/img/indent-less.svg b/apps/journal/img/indent-less.svg
deleted file mode 100644
index 246089c293..0000000000
--- a/apps/journal/img/indent-less.svg
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4198"
-   sodipodi:version="0.32"
-   inkscape:version="0.42+devel"
-   sodipodi:docbase="/home/jimmac/gfx/ximian/tango-icon-theme/scalable/actions"
-   sodipodi:docname="format-indent-less.svg">
-  <defs
-     id="defs4200">
-    <linearGradient
-       id="linearGradient5157">
-      <stop
-         style="stop-color:#555753"
-         offset="0"
-         id="stop5159" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0;"
-         offset="1"
-         id="stop5161" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         style="stop-color:#9db029;stop-opacity:1;"
-         offset="0"
-         id="stop2593" />
-      <stop
-         style="stop-color:#869623;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3558">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3560" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3558"
-       id="radialGradient3564"
-       cx="22.571428"
-       cy="30.857143"
-       fx="22.571428"
-       fy="30.857143"
-       r="15.571428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651376,4.638648e-15,10.75754)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f8f8f7;stop-opacity:1;"
-         offset="0"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2e2de;stop-opacity:1;"
-         offset="1"
-         id="stop15222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient15224"
-       x1="22.308331"
-       y1="18.992140"
-       x2="35.785294"
-       y2="39.498238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.060837,0.000000,0.000000,0.987595,4.641161,4.108291)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2259">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2261" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2263" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2259"
-       id="linearGradient2265"
-       x1="26.076092"
-       y1="26.696676"
-       x2="30.811172"
-       y2="42.007351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993566,0.000000,0.000000,1.000000,6.219859,4.033411)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2216">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2218" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2220" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2216"
-       id="linearGradient2222"
-       x1="36.8125"
-       y1="39.15625"
-       x2="39.0625"
-       y2="42.0625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.161836,4.033411)" />
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#7c7c7c;stop-opacity:1;"
-         offset="0"
-         id="stop2226" />
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:1;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient2240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.342704,0.000000,0.000000,1.235378,-8.219611,-6.577189)"
-       x1="20.794008"
-       y1="18.378813"
-       x2="35.596001"
-       y2="39.60046" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5157"
-       id="linearGradient5163"
-       x1="10.729691"
-       y1="26.422195"
-       x2="2.3941064"
-       y2="26.422195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.188000,0.000000,0.000000,1.188000,38.20277,4.174916)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#bebebe"
-     borderopacity="0.28627451"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="32.761989"
-     inkscape:cy="19.079251"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="770"
-     inkscape:window-height="852"
-     inkscape:window-x="395"
-     inkscape:window-y="881"
-     inkscape:showpageshadow="false"
-     fill="#555753" />
-  <metadata
-     id="metadata4203">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Unindent</dc:title>
-        <dc:date></dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>indent</rdf:li>
-            <rdf:li>less</rdf:li>
-            <rdf:li>unindent</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.47368421;color:#000000;fill:url(#radialGradient3564);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3556"
-       sodipodi:cx="22.571428"
-       sodipodi:cy="30.857143"
-       sodipodi:rx="15.571428"
-       sodipodi:ry="10.142858"
-       d="M 38.142857 30.857143 A 15.571428 10.142858 0 1 1  7,30.857143 A 15.571428 10.142858 0 1 1  38.142857 30.857143 z"
-       transform="matrix(1.472335,0.000000,0.000000,0.266385,-9.159070,37.48203)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2240);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4238"
-       width="38.996792"
-       height="45.003101"
-       x="4.5016017"
-       y="1.4968988"
-       rx="0.56650788"
-       ry="0.56650823" />
-    <rect
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4248"
-       width="17.63052"
-       height="2"
-       x="10"
-       y="6" />
-    <rect
-       y="10"
-       x="10"
-       height="2"
-       width="16.324554"
-       id="rect4250"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4252"
-       width="15"
-       height="2"
-       x="10"
-       y="14" />
-    <rect
-       y="18"
-       x="10"
-       height="2"
-       width="17.63052"
-       id="rect4254"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2245"
-       width="37.025566"
-       height="43.022316"
-       x="5.4997125"
-       y="2.4997177"
-       rx="0"
-       ry="0" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 35.851425,26.743533 L 35.851425,38.610554 L 22.739004,38.610554 L 22.739004,44.458667 L 9,32.651858 L 22.741562,21 L 22.741562,26.747164 L 35.851425,26.743533 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient5163);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>
diff --git a/apps/journal/img/indent-more.svg b/apps/journal/img/indent-more.svg
deleted file mode 100644
index 4e137cf452..0000000000
--- a/apps/journal/img/indent-more.svg
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4198"
-   sodipodi:version="0.32"
-   inkscape:version="0.42+devel"
-   sodipodi:docbase="/home/jimmac/gfx/ximian/tango-icon-theme/scalable/actions"
-   sodipodi:docname="format-indent-more.svg">
-  <defs
-     id="defs4200">
-    <linearGradient
-       id="linearGradient5157">
-      <stop
-         style="stop-color:#555753"
-         offset="0"
-         id="stop5159" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0;"
-         offset="1"
-         id="stop5161" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         style="stop-color:#9db029;stop-opacity:1;"
-         offset="0"
-         id="stop2593" />
-      <stop
-         style="stop-color:#869623;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3558">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3560" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3558"
-       id="radialGradient3564"
-       cx="22.571428"
-       cy="30.857143"
-       fx="22.571428"
-       fy="30.857143"
-       r="15.571428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651376,4.638648e-15,10.75754)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f8f8f7;stop-opacity:1;"
-         offset="0"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2e2de;stop-opacity:1;"
-         offset="1"
-         id="stop15222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient15224"
-       x1="22.308331"
-       y1="18.992140"
-       x2="35.785294"
-       y2="39.498238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.060837,0.000000,0.000000,0.987595,4.641161,4.108291)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2259">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2261" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2263" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2259"
-       id="linearGradient2265"
-       x1="26.076092"
-       y1="26.696676"
-       x2="30.811172"
-       y2="42.007351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993566,0.000000,0.000000,1.000000,6.219859,4.033411)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2216">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2218" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2220" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2216"
-       id="linearGradient2222"
-       x1="36.8125"
-       y1="39.15625"
-       x2="39.0625"
-       y2="42.0625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.161836,4.033411)" />
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#7c7c7c;stop-opacity:1;"
-         offset="0"
-         id="stop2226" />
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:1;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient2240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.342704,0.000000,0.000000,1.235378,-8.219611,-6.577189)"
-       x1="20.794008"
-       y1="18.378813"
-       x2="35.596001"
-       y2="39.60046" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5157"
-       id="linearGradient5163"
-       x1="10.729691"
-       y1="26.422195"
-       x2="2.3941064"
-       y2="26.422195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.188000,0.000000,0.000000,1.188000,6.648659,4.174916)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#bebebe"
-     borderopacity="0.28627451"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="32.761989"
-     inkscape:cy="19.079251"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="770"
-     inkscape:window-height="852"
-     inkscape:window-x="395"
-     inkscape:window-y="881"
-     inkscape:showpageshadow="false"
-     fill="#555753" />
-  <metadata
-     id="metadata4203">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Indent More</dc:title>
-        <dc:date></dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>indent</rdf:li>
-            <rdf:li>more</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:identifier>http://jimmac.musichall.cz</dc:identifier>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.47368421;color:#000000;fill:url(#radialGradient3564);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3556"
-       sodipodi:cx="22.571428"
-       sodipodi:cy="30.857143"
-       sodipodi:rx="15.571428"
-       sodipodi:ry="10.142858"
-       d="M 38.142857 30.857143 A 15.571428 10.142858 0 1 1  7,30.857143 A 15.571428 10.142858 0 1 1  38.142857 30.857143 z"
-       transform="matrix(1.472335,0.000000,0.000000,0.266385,-9.159070,37.48203)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2240);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4238"
-       width="38.996792"
-       height="45.003101"
-       x="4.5016017"
-       y="1.4968988"
-       rx="0.56650788"
-       ry="0.56650823" />
-    <rect
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4248"
-       width="12.000005"
-       height="2"
-       x="26.00001"
-       y="6" />
-    <rect
-       y="10"
-       x="26.00001"
-       height="2"
-       width="11.111115"
-       id="rect4250"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4252"
-       width="10.209573"
-       height="2"
-       x="26.00001"
-       y="14" />
-    <rect
-       y="18"
-       x="26.00001"
-       height="2"
-       width="12.000005"
-       id="rect4254"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2245"
-       width="37.025566"
-       height="43.022316"
-       x="5.4997125"
-       y="2.4997177"
-       rx="0"
-       ry="0" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 9,26.743533 L 9,38.610554 L 22.112421,38.610554 L 22.112421,44.458667 L 35.851425,32.651858 L 22.109863,21 L 22.109863,26.747164 L 9,26.743533 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient5163);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>
diff --git a/apps/journal/img/italic.svg b/apps/journal/img/italic.svg
deleted file mode 100644
index 1eeb4fc132..0000000000
--- a/apps/journal/img/italic.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-<g id="layer5"/><g id="layer2">
-  <path id="path2211" transform="translate(1.99698, 0.976621)" fill="#000000" fill-rule="evenodd" stroke="#000000" stroke-width="1.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" d="M9.01429 0L0 13.4464L1.9531 13.4464L3.90334 10.5391L9.76548 10.5391L9.76548 13.4464L11.2679 13.4464L11.2679 0ZM9.76548 1.81708L9.76548 8.72201L5.12224 8.72201Z"/>
- </g>
-</svg>
diff --git a/apps/journal/img/journal.png b/apps/journal/img/journal.png
deleted file mode 100644
index f95dd8e9f3aab75e8d5ce35984c0dad972eda924..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10m4Z{K~y-6m6JcK+E5tApOajLCdNOBT5)K=!C4UDj-f-KgN_Ej
zfSVsdaC9-wegjbu!BIMQa~0e~Zj%x{il9MlPC69j+Vr;9XF71+=Xrnd@RDAyxAZ*k
z6CM!H^FQkKdIkWV7-QLTxeT7?-yJX>k3U}DPmgQ{0LO9Qx-MF+*0<$y`Q<KPFc?5l
zlpD?Yd<M_+a2yAUqM%SHU^E&bo6SO&<>zQL`t>fLTCM(bbEDBfI2=Ygorb1qAcSNC
z1d=3yF$Pf-0RX=5<9Ixx+wH=#EX3n+FvhT0EUf*0|M|ZJ>-8FjVZgR+0Kjgy1Em!G
ze!sL@tzH5Ij4{Zv3`!{?kqFxDHn!XCZ6=jULDzMEI2`^2{%GMf!Dh38VHg3kX_}bL
zX1?pX9|8fdTX0<$s;a`Wted&h=|Glc2!eo0rSkG7!R2zn;c!5yR6?`a#C$%7X`0An
zGDs$q5Cj3mVi9i=oK7cbng#%<)oKt$5xHCru~-a*5D-HAt0zF<c^-6Kha^c*RTcSs
z9*UwM6bjw7lSm{;AmFO$bPA5+{`M76AmF`6W!v^|0*>RpPbQN`&zVw6JplLx=8&(j
TN?Z-m00000NkvXXu0mjfK_B*2

diff --git a/apps/journal/img/journal.svg b/apps/journal/img/journal.svg
deleted file mode 100644
index 2ee85ef069..0000000000
--- a/apps/journal/img/journal.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="translate(-0.54277, -2.50102)" gradientUnits="objectBoundingBox" x1="0.46156580718" y1="0.26673472489" x2="0.46156580718" y2="1.13340132578" spreadMethod="pad">
-   <stop stop-color="#ffffff" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#e6e6e6" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient1" gradientTransform="translate(-0.54277, -2.50102)" gradientUnits="objectBoundingBox" x1="0.15385526906" y1="1.20006799200" x2="0.15385526906" y2="0.13340137911" spreadMethod="pad">
-   <stop stop-color="#969696" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#bebebe" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient2" gradientTransform="matrix(0.415777 -0.417494 0.518983 0.514619 -17.796 1.86487)" gradientUnits="objectBoundingBox" x1="1.77989041379" y1="1.91182142950" x2="1.77989041379" y2="2.35319620460" spreadMethod="pad">
-   <stop stop-color="#181818" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#dbdbdb" offset="0.13482947648" stop-opacity="1.00000000000"/>
-   <stop stop-color="#a4a4a4" offset="0.20224422216" stop-opacity="1.00000000000"/>
-   <stop stop-color="#ffffff" offset="0.26965895295" stop-opacity="1.00000000000"/>
-   <stop stop-color="#8d8d8d" offset="0.44650277495" stop-opacity="1.00000000000"/>
-   <stop stop-color="#959595" offset="0.57114136219" stop-opacity="1.00000000000"/>
-   <stop stop-color="#cecece" offset="0.72038066387" stop-opacity="1.00000000000"/>
-   <stop stop-color="#181818" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient3" gradientTransform="matrix(0.404023 -0.405692 0.607375 0.602268 -27.0463 -3.00744)" gradientUnits="objectBoundingBox" x1="9.40879825249" y1="7.83967975733" x2="9.40879825249" y2="9.41157739957" spreadMethod="pad">
-   <stop stop-color="#565656" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#9a9a9a" offset="0.50000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#545454" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient4" gradientTransform="matrix(0.404023 -0.405692 0.607375 0.602268 -27.0463 -3.00744)" gradientUnits="objectBoundingBox" x1="9.40879584896" y1="7.83967765054" x2="9.40879584896" y2="9.41157487035" spreadMethod="pad">
-   <stop stop-color="#b1b1b1" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#ffffff" offset="0.50000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#8f8f8f" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient5" gradientTransform="matrix(0.404023 -0.405692 0.607375 0.602268 -27.0463 -3.00744)" gradientUnits="objectBoundingBox" x1="9.40879155931" y1="7.83968201339" x2="9.40879155931" y2="9.41158010798" spreadMethod="pad">
-   <stop stop-color="#565656" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#9a9a9a" offset="0.50000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#545454" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient6" gradientTransform="matrix(0.404023 -0.405692 0.607375 0.602268 -27.0463 -3.00744)" gradientUnits="objectBoundingBox" x1="9.40879343487" y1="7.83967992981" x2="9.40879343487" y2="9.41157760663" spreadMethod="pad">
-   <stop stop-color="#b1b1b1" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#ffffff" offset="0.50000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#8f8f8f" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient7" gradientTransform="matrix(0.404023 -0.405692 0.607375 0.602268 -27.0463 -3.00744)" gradientUnits="objectBoundingBox" x1="9.40879945977" y1="7.83968103847" x2="9.40879945977" y2="9.41157893758" spreadMethod="pad">
-   <stop stop-color="#565656" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#9a9a9a" offset="0.50000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#545454" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient8" gradientTransform="matrix(0.404023 -0.405692 0.607375 0.602268 -27.0463 -3.00744)" gradientUnits="objectBoundingBox" x1="9.40879596769" y1="7.83968060850" x2="9.40879596769" y2="9.41157842140" spreadMethod="pad">
-   <stop stop-color="#b1b1b1" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#ffffff" offset="0.50000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#8f8f8f" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
-  <linearGradient id="gradient9" gradientTransform="matrix(0.37638 0.0361526 0.0367 0.374874 -2.47809 -12.1224)" gradientUnits="objectBoundingBox" x1="1.13556603092" y1="7.77791347304" x2="1.95960901921" y2="8.61454878179" spreadMethod="pad">
-   <stop stop-color="#dbce48" offset="0.00000000000" stop-opacity="1.00000000000"/>
-   <stop stop-color="#c5b625" offset="1.00000000000" stop-opacity="1.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="g3433">
-  <g id="layer1-3" transform="translate(0.0427701, 1.4e-07)" fill="none">
-   <path id="path2855" transform="translate(0.5, 0.5)" fill="url(#gradient0)" stroke="url(#gradient1)" stroke-width="1.00000012000" stroke-linecap="round" stroke-linejoin="round" d="M4.44089e-16 0L12.9572 0.01L12.9992 15L1e-08 15L0 1e-07Z"/>
-   <g id="g4198" transform="translate(3, 3)" fill="none">
-    <path id="path6035" transform="matrix(1.01954 0 0 1 0 -5.55112e-16)" fill="#686868" opacity="0.70000000000" d="M0 0L1.12407 0L1.12407 1L0 1Z"/>
-    <path id="path6033" transform="matrix(1.01954 0 0 1 1.30215 0)" fill="#686868" opacity="0.70000000000" d="M0 0L1.06061 0L1.06061 1L0 1Z"/>
-    <path id="path6031" transform="matrix(1.01954 0 0 1 2.5396 0)" fill="#686868" opacity="0.70000000000" d="M0 0L0.933684 0L0.933684 1L0 1Z"/>
-    <path id="path6029" transform="matrix(1.01954 0 0 1 3.64764 0)" fill="#686868" opacity="0.70000000000" d="M0 0L0.410114 0L0.410114 1L0 1Z"/>
-    <path id="path6027" transform="matrix(1.01954 0 0 1 4.22189 0)" fill="#686868" opacity="0.70000000000" d="M0 0L0.917815 0L0.917815 1L0 1Z"/>
-    <path id="path6025" transform="matrix(1.01954 0 0 1 5.31375 0)" fill="#686868" opacity="0.70000000000" d="M0 0L2.37746 0L2.37746 1L0 1Z"/>
-    <path id="path6017" transform="matrix(1.01954 0 0 1 5.55112e-16 6)" fill="#686868" opacity="0.70000000000" d="M0 0L1.12407 0L1.12407 1L0 1Z"/>
-    <path id="path6015" transform="matrix(1.01954 0 0 1 1.30215 6)" fill="#686868" opacity="0.70000000000" d="M0 0L1.06061 0L1.06061 1L0 1Z"/>
-    <path id="path6013" transform="matrix(1.01954 0 0 1 2.5396 6)" fill="#686868" opacity="0.70000000000" d="M0 0L0.933683 0L0.933683 1L0 1Z"/>
-    <path id="path6011" transform="matrix(1.01954 0 0 1 3.64764 6)" fill="#686868" opacity="0.70000000000" d="M0 0L0.410114 0L0.410114 1L0 1Z"/>
-    <path id="path6009" transform="matrix(1.01954 0 0 1 4.22188 6)" fill="#686868" opacity="0.70000000000" d="M0 0L0.917814 0L0.917814 1L0 1Z"/>
-    <path id="path5999" transform="matrix(1.01954 0 0 1 5.55112e-16 2)" fill="#686868" opacity="0.70000000000" d="M0 0L1.74283 0L1.74283 1L0 1Z"/>
-    <path id="path5997" transform="matrix(1.01954 0 0 1 1.93908 2)" fill="#686868" opacity="0.70000000000" d="M0 0L0.838487 0L0.838487 1L0 1Z"/>
-    <path id="path5995" transform="matrix(1.01954 0 0 1 2.95613 2)" fill="#686868" opacity="0.70000000000" d="M0 0L0.394245 0L0.394245 1L0 1Z"/>
-    <path id="path5993" transform="matrix(1.01954 0 0 1 3.52026 2)" fill="#686868" opacity="0.70000000000" d="M0 0L0.759159 0L0.759159 1L0 1Z"/>
-    <path id="path5991" transform="matrix(1.01954 0 0 1 4.45643 2)" fill="#686868" opacity="0.70000000000" d="M0 0L0.759159 0L0.759159 1L0 1Z"/>
-    <path id="path5989" transform="matrix(1.01954 0 0 1 5.39261 2)" fill="#686868" opacity="0.70000000000" d="M0 0L1.21926 0L1.21926 1L0 1Z"/>
-    <path id="path5981" transform="matrix(1.01954 0 0 1 5.55112e-16 4)" fill="#686868" opacity="0.70000000000" d="M0 0L1.99668 0L1.99668 1L0 1Z"/>
-    <path id="path5979" transform="matrix(1.01954 0 0 1 2.19529 4)" fill="#686868" opacity="0.70000000000" d="M0 0L2.13947 0L2.13947 1L0 1Z"/>
-    <path id="path5977" transform="matrix(1.01954 0 0 1 4.53615 4)" fill="#686868" opacity="0.70000000000" d="M0 0L0.854355 0L0.854355 1L0 1Z"/>
-    <path id="path5975" transform="matrix(1.01954 0 0 1 5.56679 4)" fill="#686868" opacity="0.70000000000" d="M0 0L2.01255 0L2.01255 1L0 1Z"/>
-    <path id="path2916" transform="matrix(1.01954 0 0 1 5.55112e-16 8)" fill="#686868" opacity="0.70000000000" d="M0 0L1.12407 0L1.12407 1L0 1Z"/>
-    <path id="path2918" transform="matrix(1.01954 0 0 1 1.30215 8)" fill="#686868" opacity="0.70000000000" d="M0 0L1.06061 0L1.06061 1L0 1Z"/>
-    <path id="path2920" transform="matrix(1.01954 0 0 1 2.5396 8)" fill="#686868" opacity="0.70000000000" d="M0 0L0.933683 0L0.933683 1L0 1Z"/>
-   </g>
-   <path id="path2422" transform="translate(4.99643, 5.67071)" fill="#0c0c0c" fill-rule="evenodd" opacity="0.15000000000" d="M8.25732 0.0337698C8.17317 -0.0162002 8.10805 -0.00320017 8.06503 0.0245698L2.33547 3.70464L1.28095 4.38385L1.24848 4.39759L0 7.23529L3.09408 7.32929L3.11977 7.31195L4.18107 6.63633L9.9092 2.92453C10.0813 2.81332 9.80913 2.07626 9.29872 1.26826C8.91592 0.662266 8.50978 0.183633 8.25732 0.0337318Z"/>
-  </g>
-  <g id="g8626" transform="translate(5.00026, 1.99974)" fill="none">
-   <path id="path3041" transform="matrix(0.702577 0 0 0.704261 1.4709 0.216394)" fill="url(#gradient2)" stroke="#0c0c0c" stroke-width="0.60797864000" stroke-linecap="butt" stroke-linejoin="round" d="M0 10.2519C0.286542 10.0442 1.14795 10.5083 1.96034 11.3138C2.77078 12.1174 3.22054 12.9551 3.0179 13.2444C3.01713 13.2455 3.03767 13.2621 3.03688 13.2632L13.1753 3.08288C13.4327 2.82441 12.9622 1.93926 12.1241 1.10813C11.2859 0.277 10.3959 -0.186931 10.1385 0.0715409Z"/>
-   <path id="path3045" transform="matrix(0.702577 0 0 0.704261 1.4709 2.44622)" fill="#0c0c0c" opacity="0.60000000000" d="M0 7.08568C0.286543 6.87797 1.14795 7.34207 1.96034 8.14762C2.77078 8.95125 3.22054 9.78895 3.0179 10.0782C3.01713 10.0793 3.03767 10.0959 3.03688 10.097L10.0189 3.08615L10.0442 3.0608C10.0449 3.05972 10.0244 3.04308 10.0252 3.04198C10.2278 2.75273 9.77807 1.91503 8.96762 1.1114C8.15523 0.305847 7.29382 -0.158247 7.00728 0.0494597L6.98203 0.0748147L4e-07 7.08568Z"/>
-   <path id="path3047" transform="matrix(0.702577 0 0 0.704261 6.48008 2.26929)" fill="url(#gradient3)" d="M0 0.176239C0.286541 -0.031468 1.14795 0.432627 1.96034 1.23818C2.77078 2.04181 3.22054 2.87951 3.0179 3.16876C3.01712 3.16986 3.03767 3.18649 3.03688 3.18758L3.16313 3.0608C3.16392 3.05972 3.14338 3.04308 3.14415 3.04198C3.3468 2.75273 2.89704 1.91503 2.0866 1.1114C1.27421 0.305848 0.412799 -0.158247 0.126257 0.0494596Z"/>
-   <path id="path3049" transform="matrix(0.702577 0 0 0.704261 6.39879 2.35112)" fill="url(#gradient4)" d="M0 0.176239C0.286544 -0.0314677 1.14795 0.432627 1.96034 1.23818C2.77078 2.04181 3.22054 2.87951 3.0179 3.16876C3.01712 3.16986 3.03767 3.1865 3.03688 3.18758L3.16313 3.0608C3.16392 3.05972 3.14338 3.04308 3.14415 3.04198C3.3468 2.75273 2.89704 1.91503 2.0866 1.1114C1.27421 0.305848 0.4128 -0.158247 0.126257 0.0494597Z"/>
-   <path id="path3051" transform="matrix(0.702577 0 0 0.704261 6.76258 1.98495)" fill="url(#gradient5)" d="M0 0.176239C0.286543 -0.0314683 1.14795 0.432626 1.96034 1.23818C2.77078 2.04181 3.22054 2.87951 3.0179 3.16876C3.01712 3.16986 3.03767 3.18649 3.03688 3.18758L3.16313 3.0608C3.16393 3.05972 3.14338 3.04308 3.14415 3.04198C3.3468 2.75273 2.89704 1.91503 2.0866 1.1114C1.27421 0.305847 0.412801 -0.158247 0.126257 0.0494597Z"/>
-   <path id="path3053" transform="matrix(0.702577 0 0 0.704261 6.68128 2.06678)" fill="url(#gradient6)" d="M0 0.176239C0.286544 -0.0314685 1.14795 0.432626 1.96034 1.23818C2.77078 2.04181 3.22054 2.87951 3.0179 3.16876C3.01713 3.16986 3.03767 3.18649 3.03688 3.18758L3.16313 3.0608C3.16392 3.05972 3.14338 3.04308 3.14415 3.04198C3.3468 2.75273 2.89704 1.91503 2.0866 1.1114C1.27421 0.305848 0.412801 -0.158247 0.126257 0.0494597Z"/>
-   <path id="path3055" transform="matrix(0.702577 0 0 0.704261 7.04643 1.69924)" fill="url(#gradient7)" d="M0 0.176238C0.286541 -0.0314683 1.14795 0.432626 1.96034 1.23818C2.77078 2.04181 3.22054 2.87951 3.0179 3.16876C3.01713 3.16986 3.03767 3.18649 3.03688 3.18758L3.16313 3.0608C3.16392 3.05972 3.14338 3.04308 3.14415 3.04198C3.3468 2.75273 2.89704 1.91503 2.08659 1.1114C1.27421 0.305847 0.412799 -0.158247 0.126256 0.0494597Z"/>
-   <path id="path3057" transform="matrix(0.702577 0 0 0.704261 6.96514 1.78107)" fill="url(#gradient8)" d="M0 0.176238C0.286541 -0.0314687 1.14795 0.432626 1.96034 1.23818C2.77078 2.04181 3.22054 2.87951 3.0179 3.16876C3.01712 3.16986 3.03767 3.18649 3.03688 3.18758L3.16313 3.0608C3.16392 3.05972 3.14338 3.04308 3.14415 3.04198C3.3468 2.75273 2.89704 1.91503 2.0866 1.1114C1.27421 0.305848 0.412799 -0.158247 0.126257 0.0494599Z"/>
-   <path id="path3059" transform="matrix(0.702577 0 0 0.704261 0.213987 7.40255)" fill="#dcdcdc" fill-rule="evenodd" stroke="#cccccc" stroke-width="0.60797864000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" d="M0 4.80486L4.77186 3.07937L4.81116 3.04011C5.01381 2.75087 4.55877 1.91283 3.74832 1.1092C2.93593 0.303642 2.07564 -0.158082 1.7891 0.0496248Z"/>
-   <path id="path3061" transform="matrix(0.702577 0 0 0.704261 0.213576 9.8794)" fill="#0c0c0c" fill-rule="evenodd" stroke="#0c0c0c" stroke-width="0.60797864000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" d="M0.485212 0L0 1.28269L1.30137 0.809298C1.18769 0.676163 1.08209 0.541463 0.947014 0.407525C0.791507 0.253326 0.639934 0.126858 0.485212 0Z"/>
-   <path id="path3043" transform="matrix(0.702577 0 0 0.704261 7.45448 0.214088)" fill="#c0c0c0" stroke="#cccccc" stroke-width="0.60797864000" stroke-linecap="butt" stroke-linejoin="round" opacity="0.80000000000" d="M0 1.70187C0.286542 1.49416 1.14795 1.95826 1.96034 2.76381C2.77078 3.56744 3.22054 4.40514 3.01789 4.69439C3.01713 4.69549 3.03766 4.71213 3.03688 4.71321L4.58881 3.15609C4.99729 2.74751 4.55953 2.06327 3.60744 1.1114C2.79505 0.305848 1.93364 -0.158247 1.6471 0.0494596L1.62185 0.0748155L3e-06 1.70187Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/journal/img/justify-center.svg b/apps/journal/img/justify-center.svg
deleted file mode 100644
index 7a3a7ffb97..0000000000
--- a/apps/journal/img/justify-center.svg
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4198"
-   sodipodi:version="0.32"
-   inkscape:version="0.42+0.43pre1"
-   sodipodi:docbase="/home/andreas/projekt/bild/tango/scalable"
-   sodipodi:docname="format-justify-center.svg">
-  <defs
-     id="defs4200">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3558">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3560" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3558"
-       id="radialGradient3564"
-       cx="22.571428"
-       cy="30.857143"
-       fx="22.571428"
-       fy="30.857143"
-       r="15.571428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651376,4.638648e-15,10.75754)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f8f8f7;stop-opacity:1;"
-         offset="0"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2e2de;stop-opacity:1;"
-         offset="1"
-         id="stop15222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient15224"
-       x1="22.308331"
-       y1="18.992140"
-       x2="35.785294"
-       y2="39.498238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.060837,0.000000,0.000000,0.987595,4.641161,4.108291)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2259">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2261" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2263" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2259"
-       id="linearGradient2265"
-       x1="26.076092"
-       y1="26.696676"
-       x2="30.811172"
-       y2="42.007351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993566,0.000000,0.000000,1.000000,6.219859,4.033411)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2216">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2218" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2220" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2216"
-       id="linearGradient2222"
-       x1="36.8125"
-       y1="39.15625"
-       x2="39.0625"
-       y2="42.0625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.161836,4.033411)" />
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#7c7c7c;stop-opacity:1;"
-         offset="0"
-         id="stop2226" />
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:1;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient2240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.342704,0.000000,0.000000,1.235378,-8.219611,-6.577189)"
-       x1="20.794008"
-       y1="18.378813"
-       x2="35.596001"
-       y2="39.60046" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#bebebe"
-     borderopacity="1.0000000"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="26.391074"
-     inkscape:cy="26.321697"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="885"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4203">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Justify Center</dc:title>
-        <dc:date>2005-10-29</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>justify</rdf:li>
-            <rdf:li>center</rdf:li>
-            <rdf:li>format</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.47368421;color:#000000;fill:url(#radialGradient3564);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3556"
-       sodipodi:cx="22.571428"
-       sodipodi:cy="30.857143"
-       sodipodi:rx="15.571428"
-       sodipodi:ry="10.142858"
-       d="M 38.142857 30.857143 A 15.571428 10.142858 0 1 1  7,30.857143 A 15.571428 10.142858 0 1 1  38.142857 30.857143 z"
-       transform="matrix(1.472335,0.000000,0.000000,0.266385,-9.159070,37.48203)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2240);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4238"
-       width="38.996792"
-       height="45.003101"
-       x="4.5016017"
-       y="1.4968988"
-       rx="0.56650788"
-       ry="0.56650823" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4248"
-       width="26"
-       height="2"
-       x="-37"
-       y="10"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       y="16"
-       x="-35"
-       height="2"
-       width="23"
-       id="rect4250"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4252"
-       width="21"
-       height="2"
-       x="-34"
-       y="22"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       y="28"
-       x="-37"
-       height="2"
-       width="26"
-       id="rect4254"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4256"
-       width="17"
-       height="2"
-       x="-32"
-       y="34"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2245"
-       width="37.025566"
-       height="43.022316"
-       x="5.4997125"
-       y="2.4997177"
-       rx="0"
-       ry="0" />
-  </g>
-</svg>
diff --git a/apps/journal/img/justify-fill.svg b/apps/journal/img/justify-fill.svg
deleted file mode 100644
index f9a530bdae..0000000000
--- a/apps/journal/img/justify-fill.svg
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4198"
-   sodipodi:version="0.32"
-   inkscape:version="0.42+0.43pre1"
-   sodipodi:docbase="/home/andreas/projekt/bild/tango/scalable"
-   sodipodi:docname="format-justify-fill.svg">
-  <defs
-     id="defs4200">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3558">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3560" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3558"
-       id="radialGradient3564"
-       cx="22.571428"
-       cy="30.857143"
-       fx="22.571428"
-       fy="30.857143"
-       r="15.571428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651376,4.638648e-15,10.75754)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f8f8f7;stop-opacity:1;"
-         offset="0"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2e2de;stop-opacity:1;"
-         offset="1"
-         id="stop15222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient15224"
-       x1="22.308331"
-       y1="18.992140"
-       x2="35.785294"
-       y2="39.498238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.060837,0.000000,0.000000,0.987595,4.641161,4.108291)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2259">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2261" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2263" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2259"
-       id="linearGradient2265"
-       x1="26.076092"
-       y1="26.696676"
-       x2="30.811172"
-       y2="42.007351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993566,0.000000,0.000000,1.000000,6.219859,4.033411)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2216">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2218" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2220" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2216"
-       id="linearGradient2222"
-       x1="36.8125"
-       y1="39.15625"
-       x2="39.0625"
-       y2="42.0625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.161836,4.033411)" />
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#7c7c7c;stop-opacity:1;"
-         offset="0"
-         id="stop2226" />
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:1;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient2240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.342704,0.000000,0.000000,1.235378,-8.219611,-6.577189)"
-       x1="20.794008"
-       y1="18.378813"
-       x2="35.596001"
-       y2="39.60046" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#bebebe"
-     borderopacity="1.0000000"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="35.467019"
-     inkscape:cy="15.522316"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="885"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4203">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Justify Center</dc:title>
-        <dc:date>2005-10-29</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>justify</rdf:li>
-            <rdf:li>center</rdf:li>
-            <rdf:li>format</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.47368421;color:#000000;fill:url(#radialGradient3564);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3556"
-       sodipodi:cx="22.571428"
-       sodipodi:cy="30.857143"
-       sodipodi:rx="15.571428"
-       sodipodi:ry="10.142858"
-       d="M 38.142857 30.857143 A 15.571428 10.142858 0 1 1  7,30.857143 A 15.571428 10.142858 0 1 1  38.142857 30.857143 z"
-       transform="matrix(1.472335,0.000000,0.000000,0.266385,-9.159070,37.48203)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2240);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4238"
-       width="38.996792"
-       height="45.003101"
-       x="4.5016017"
-       y="1.4968988"
-       rx="0.56650788"
-       ry="0.56650823" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4248"
-       width="30"
-       height="2"
-       x="-39"
-       y="10"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       y="16"
-       x="-39"
-       height="2"
-       width="30"
-       id="rect4250"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4252"
-       width="30"
-       height="2"
-       x="-39"
-       y="22"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       y="28"
-       x="-39"
-       height="2"
-       width="30"
-       id="rect4254"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4256"
-       width="30"
-       height="2"
-       x="-39"
-       y="34"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2245"
-       width="37.025566"
-       height="43.022316"
-       x="5.4997125"
-       y="2.4997177"
-       rx="0"
-       ry="0" />
-  </g>
-</svg>
diff --git a/apps/journal/img/justify-left.svg b/apps/journal/img/justify-left.svg
deleted file mode 100644
index ed5bab4651..0000000000
--- a/apps/journal/img/justify-left.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4198"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   sodipodi:docname="format-justify-left.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4200">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3558">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3560" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3558"
-       id="radialGradient3564"
-       cx="22.571428"
-       cy="30.857143"
-       fx="22.571428"
-       fy="30.857143"
-       r="15.571428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651376,4.638648e-15,10.75754)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f8f8f7;stop-opacity:1;"
-         offset="0"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2e2de;stop-opacity:1;"
-         offset="1"
-         id="stop15222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient2240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.342704,0.000000,0.000000,1.235378,-8.219611,-6.577189)"
-       x1="20.794008"
-       y1="18.378813"
-       x2="35.596001"
-       y2="39.60046" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#bebebe"
-     borderopacity="1.0000000"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="39.426031"
-     inkscape:cy="27.632093"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="885"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4203">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Justify Left</dc:title>
-        <dc:date>2005-10-29</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>justify</rdf:li>
-            <rdf:li>left</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.47368421;color:#000000;fill:url(#radialGradient3564);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3556"
-       sodipodi:cx="22.571428"
-       sodipodi:cy="30.857143"
-       sodipodi:rx="15.571428"
-       sodipodi:ry="10.142858"
-       d="M 38.142857 30.857143 A 15.571428 10.142858 0 1 1  7,30.857143 A 15.571428 10.142858 0 1 1  38.142857 30.857143 z"
-       transform="matrix(1.472335,0.000000,0.000000,0.266385,-9.159070,37.48203)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2240);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4238"
-       width="38.996792"
-       height="45.003101"
-       x="4.5016017"
-       y="1.4968988"
-       rx="0.56650788"
-       ry="0.56650823" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4248"
-       width="27"
-       height="2"
-       x="9"
-       y="10" />
-    <rect
-       y="16"
-       x="9"
-       height="2"
-       width="25"
-       id="rect4250"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4252"
-       width="22.971531"
-       height="2"
-       x="9"
-       y="22" />
-    <rect
-       y="28"
-       x="9"
-       height="2"
-       width="27"
-       id="rect4254"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4256"
-       width="17"
-       height="2"
-       x="9"
-       y="34" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2245"
-       width="37.025566"
-       height="43.022316"
-       x="5.4997125"
-       y="2.4997177"
-       rx="0"
-       ry="0" />
-  </g>
-</svg>
diff --git a/apps/journal/img/justify-right.svg b/apps/journal/img/justify-right.svg
deleted file mode 100644
index affb129539..0000000000
--- a/apps/journal/img/justify-right.svg
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4198"
-   sodipodi:version="0.32"
-   inkscape:version="0.42+0.43pre1"
-   sodipodi:docbase="/home/andreas/projekt/bild/tango/scalable"
-   sodipodi:docname="format-justify-right.svg">
-  <defs
-     id="defs4200">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3558">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3560" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3558"
-       id="radialGradient3564"
-       cx="22.571428"
-       cy="30.857143"
-       fx="22.571428"
-       fy="30.857143"
-       r="15.571428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651376,4.638648e-15,10.75754)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f8f8f7;stop-opacity:1;"
-         offset="0"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2e2de;stop-opacity:1;"
-         offset="1"
-         id="stop15222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient15224"
-       x1="22.308331"
-       y1="18.992140"
-       x2="35.785294"
-       y2="39.498238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.060837,0.000000,0.000000,0.987595,4.641161,4.108291)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2259">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2261" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2263" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2259"
-       id="linearGradient2265"
-       x1="26.076092"
-       y1="26.696676"
-       x2="30.811172"
-       y2="42.007351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993566,0.000000,0.000000,1.000000,6.219859,4.033411)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2216">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2218" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2220" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2216"
-       id="linearGradient2222"
-       x1="36.8125"
-       y1="39.15625"
-       x2="39.0625"
-       y2="42.0625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.161836,4.033411)" />
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#7c7c7c;stop-opacity:1;"
-         offset="0"
-         id="stop2226" />
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:1;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient2240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.342704,0.000000,0.000000,1.235378,-8.219611,-6.577189)"
-       x1="20.794008"
-       y1="18.378813"
-       x2="35.596001"
-       y2="39.60046" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#bebebe"
-     borderopacity="1.0000000"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="31.951275"
-     inkscape:cy="22.207013"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="885"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4203">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Justify Right</dc:title>
-        <dc:date>2005-10-29</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>justify</rdf:li>
-            <rdf:li>left</rdf:li>
-            <rdf:li>format</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.47368421;color:#000000;fill:url(#radialGradient3564);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3556"
-       sodipodi:cx="22.571428"
-       sodipodi:cy="30.857143"
-       sodipodi:rx="15.571428"
-       sodipodi:ry="10.142858"
-       d="M 38.142857 30.857143 A 15.571428 10.142858 0 1 1  7,30.857143 A 15.571428 10.142858 0 1 1  38.142857 30.857143 z"
-       transform="matrix(1.472335,0.000000,0.000000,0.266385,-9.159070,37.48203)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2240);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4238"
-       width="38.996792"
-       height="45.003101"
-       x="4.5016017"
-       y="1.4968988"
-       rx="0.56650788"
-       ry="0.56650823" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4248"
-       width="27"
-       height="2"
-       x="-38.971531"
-       y="10"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       y="16"
-       x="-38.971531"
-       height="2"
-       width="25"
-       id="rect4250"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4252"
-       width="22.971531"
-       height="2"
-       x="-38.971531"
-       y="22"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       y="28"
-       x="-38.971531"
-       height="2"
-       width="27"
-       id="rect4254"
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4256"
-       width="17"
-       height="2"
-       x="-38.971531"
-       y="34"
-       transform="scale(-1.000000,1.000000)" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2245"
-       width="37.025566"
-       height="43.022316"
-       x="5.4997125"
-       y="2.4997177"
-       rx="0"
-       ry="0" />
-  </g>
-</svg>
diff --git a/apps/journal/img/list.svg b/apps/journal/img/list.svg
deleted file mode 100644
index b253c0ab50..0000000000
--- a/apps/journal/img/list.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="layer0">
-  <path id="path2407" transform="translate(6, 4.5)" fill="none" stroke="#000000" stroke-width="0.99999994000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" opacity="1" d="M0 4L8 4M0 0L8 0M0 8L8 8"/>
-  <rect id="rect3728" transform="translate(2, 3)" fill="#000000" opacity="1" width="2pt" height="2pt"/>
-  <rect id="rect2434" transform="translate(2, 11)" fill="#000000" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="0.00000000000" opacity="1" width="2pt" height="2pt"/>
-  <rect id="rect2440" transform="translate(2, 7)" fill="#000000" opacity="1" width="2pt" height="2pt"/>
- </g>
-</svg>
diff --git a/apps/journal/img/strikethrough.svg b/apps/journal/img/strikethrough.svg
deleted file mode 100644
index 528907cebe..0000000000
--- a/apps/journal/img/strikethrough.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-<defs/>
-<g id="layer5"/><g id="layer2">
-  <path id="path2211" transform="translate(0.833333, 0.627451)" fill="#000000" fill-rule="evenodd" stroke="#000000" stroke-width="1.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" d="M5.67248 0L0 14.3831L2.26899 14.3831L3.49803 11.2732L10.8723 11.2732L12.1013 14.3831L14.3703 14.3831L8.69781 0ZM7.18514 1.94366L10.1041 9.32958L4.26616 9.32958Z"/>
-  <rect id="rect2331" transform="translate(0.603318, 6.51584)" fill="#000000" fill-rule="evenodd" stroke="#000000" stroke-width="1.00000000000" stroke-linecap="round" stroke-linejoin="round" width="11.75746606335pt" height="0.48265460030pt"/>
- </g>
-</svg>
diff --git a/apps/journal/img/underline.svg b/apps/journal/img/underline.svg
deleted file mode 100644
index 534bed6ea2..0000000000
--- a/apps/journal/img/underline.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-<defs/>
-<g id="layer1">
-  <path id="path2211" transform="translate(1.46667, 0.658333)" fill="#000000" fill-rule="evenodd" stroke="#000000" stroke-width="1.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" d="M5.17763 0L0 12.4667L2.07105 12.4667L3.19287 9.77117L9.92379 9.77117L11.0456 12.4667L13.1167 12.4667L7.93904 0ZM6.55833 1.68468L9.22264 8.08649L3.89399 8.08649Z"/>
-  <rect id="rect2331" transform="matrix(1 0 0 -1 1.23333 15)" fill="#000000" fill-rule="evenodd" stroke="#000000" stroke-width="1.00000000000" stroke-linecap="round" stroke-linejoin="round" width="10.90000000000pt" height="0.44664000000pt"/>
- </g>
-</svg>
diff --git a/apps/journal/index.php b/apps/journal/index.php
deleted file mode 100644
index bfe882376e..0000000000
--- a/apps/journal/index.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * ownCloud - Journal
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-$errors = array();
-$l = new OC_L10N('journal');
-OCP\User::checkLoggedIn();
-
-$required_apps = array(
-    array('id' => 'tal', 'name' => 'TAL Page Templates'),
-    array('id' => 'journal', 'name' => 'Journal'),
-    array('id' => 'contacts', 'name' => 'Contacts'),
-);
-foreach($required_apps as $app) {
-	if(!OCP\App::isEnabled($app['id'])) {
-		$error = (string)$l->t('The %%s app isn\'t enabled! Please enable it here: <strong><a href="%%s?appid=%%s">Enable %%s app</a></strong>');
-		$errors[] = sprintf($error, $app['name'],OCP\Util::linkTo('settings', 'apps'), $app['id'], $app['name']);
-	}
-}
-
-if(count($errors) == 0) {
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-	if( count($calendars) == 0 ) {
-		$error = (string)$l->t('You have no calendars. Please add one at the <strong><a href="%%s">Calendar app</a></strong>');
-		$errors[] = sprintf($error, OCP\Util::linkTo('calendar', 'index.php'));
-	}
-	// Load a specific entry?
-	$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-
-	OCP\Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker');
-	OCP\Util::addScript('contacts','jquery.multi-autocomplete');
-	OCP\Util::addScript('','oc-vcategories');
-	OCP\Util::addScript('journal', 'jquery.rte');
-	OCP\Util::addScript('journal', 'jquery.textchange');
-	OCP\Util::addScript('journal', 'journal');
-	OCP\Util::addscript('tal','modernizr');
-	OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');
-	OCP\Util::addStyle('journal', 'rte');
-	OCP\Util::addStyle('journal', 'journal');
-	OCP\App::setActiveNavigationEntry('journal_index');
-
-	$categories = OC_Calendar_App::getCategoryOptions();
-}
-
-//$tmpl = new OCP\Template('journal', 'journals', 'user');
-if($errors) {
-	$tmpl = new OCP\Template( "journal", "rtfm", "user" );
-	$tmpl->assign('errors',$errors, false);
-} else {
-	$tmpl = new OC_TALTemplate('journal', 'index', 'user');
-	$tmpl->assign('categories', $categories);
-	$tmpl->assign('calendars', $calendars);
-	$tmpl->assign('id',$id);
-}
-$tmpl->printPage();
diff --git a/apps/journal/js/expanding.js b/apps/journal/js/expanding.js
deleted file mode 100644
index 17139f27ff..0000000000
--- a/apps/journal/js/expanding.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Expanding Textareas
-// https://github.com/bgrins/ExpandingTextareas
-
-(function(factory) {
-    // Add jQuery via AMD registration or browser globals
-    if (typeof define === 'function' && define.amd) {
-        define([ 'jquery' ], factory);
-    }
-    else {
-        factory(jQuery);
-    }
-}(function ($) {
-    $.expandingTextarea = $.extend({
-        autoInitialize: true,
-        initialSelector: "textarea.expanding",
-        opts: {
-            resize: function() { }
-        }
-    }, $.expandingTextarea || {});
-    
-    var cloneCSSProperties = [
-        'lineHeight', 'textDecoration', 'letterSpacing',
-        'fontSize', 'fontFamily', 'fontStyle', 
-        'fontWeight', 'textTransform', 'textAlign', 
-        'direction', 'wordSpacing', 'fontSizeAdjust', 
-        'wordWrap', 
-        'borderLeftWidth', 'borderRightWidth',
-        'borderTopWidth','borderBottomWidth',
-        'paddingLeft', 'paddingRight',
-        'paddingTop','paddingBottom',
-        'marginLeft', 'marginRight',
-        'marginTop','marginBottom',
-        'boxSizing', 'webkitBoxSizing', 'mozBoxSizing', 'msBoxSizing'
-    ];
-    
-    var textareaCSS = {
-        position: "absolute",
-        height: "100%",
-        resize: "none"
-    };
-    
-    var preCSS = {
-        visibility: "hidden",
-        border: "0 solid",
-        whiteSpace: "pre-wrap" 
-    };
-    
-    var containerCSS = {
-        position: "relative"
-    };
-    
-    function resize() {
-        $(this).closest('.expandingText').find("div").text(this.value + ' ');
-        $(this).trigger("resize.expanding");
-    }
-    
-    $.fn.expandingTextarea = function(o) {
-        
-        var opts = $.extend({ }, $.expandingTextarea.opts, o);
-        
-        if (o === "resize") {
-            return this.trigger("input.expanding");
-        }
-        
-        if (o === "destroy") {
-            this.filter(".expanding-init").each(function() {
-                var textarea = $(this).removeClass('expanding-init');
-                var container = textarea.closest('.expandingText');
-                
-                container.before(textarea).remove();
-                textarea
-                    .attr('style', textarea.data('expanding-styles') || '')
-                    .removeData('expanding-styles');
-            });
-            
-            return this;
-        }
-        
-        this.filter("textarea").not(".expanding-init").addClass("expanding-init").each(function() {
-            var textarea = $(this);
-            
-            textarea.wrap("<div class='expandingText'></div>");
-            textarea.after("<pre class='textareaClone'><div></div></pre>");
-            
-            var container = textarea.parent().css(containerCSS);
-            var pre = container.find("pre").css(preCSS);
-            
-            // Store the original styles in case of destroying.
-            textarea.data('expanding-styles', textarea.attr('style'));
-            textarea.css(textareaCSS);
-            
-            $.each(cloneCSSProperties, function(i, p) {
-                var val = textarea.css(p);
-                
-                // Only set if different to prevent overriding percentage css values.
-                if (pre.css(p) !== val) {
-                    pre.css(p, val);
-                }
-            });
-            
-            textarea.bind("input.expanding propertychange.expanding", resize);
-            resize.apply(this);
-            
-            if (opts.resize) {
-                textarea.bind("resize.expanding", opts.resize);
-            }
-        });
-        
-        return this;
-    };
-    
-    $(function () {
-        if ($.expandingTextarea.autoInitialize) {
-            $($.expandingTextarea.initialSelector).expandingTextarea();
-        }
-    });
-    
-}));
diff --git a/apps/journal/js/journal.js b/apps/journal/js/journal.js
deleted file mode 100644
index 2611b09c55..0000000000
--- a/apps/journal/js/journal.js
+++ /dev/null
@@ -1,432 +0,0 @@
-String.prototype.unEscape = function(){
-	str = this;
-	return str.replace(/\\"/g, '"');
-};
-String.prototype.stripTags = function(){
-	tags = this;
-	stripped = tags.replace(/<(.|\n)*?>/g, '');
-	return stripped;
-};
-String.prototype.zeroPad = function(digits) {
-	n = this.toString();
-	while (n.length < digits) {
-		n = '0' + n;
-	}
-	return n;
-}
-
-OC.Journal = {
-	init:function() {
-		this.setEnabled(false);
-		// Fetch journal entries. If it's a direct link 'id' will be loaded.
-		OC.Journal.Journals.update(id);
-	},
-	categoriesChanged:function(newcategories) { // Categories added/deleted.
-		categories = $.map(newcategories, function(v) {return v;});
-		$('#categories').multiple_autocomplete('option', 'source', categories);
-		var categorylist = $('#categories_value').find('input');
-		$.getJSON(OC.filePath('journal', 'ajax', 'categories/categoriesfor.php'),{'id':Contacts.UI.Card.id},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#categories_value').data('checksum', jsondata.data.checksum);
-				categorylist.val(jsondata.data.value);
-			} else {
-				OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-			}
-		});
-	},
-	propertyContainerFor:function(obj) {
-		if($(obj).hasClass('propertycontainer')) {
-			return $(obj);
-		}
-		return $(obj).parents('.propertycontainer').first();
-	},
-	required:function(event){ // eventhandler for required elements
-			// FIXME: This doesn't seem to work.
-			console.log('blur on required');
-			var obj = $(event.target);
-			$(obj).addClass('required');
-			if($(this).val().trim() == '') {
-				$('<strong>This field is required!</strong>').appendTo($(obj));
-				return;
-			} else {
-				$(obj).removeClass('required');
-				$(obj).off('blur', OC.Journal.required);
-			}
-	},
-	setEnabled:function(state) {
-		if(state == undefined) { state = true; }
-		console.log('OC.Journal.setEnabled: ' + state);
-		if(state) {
-			$('#description').rte('setEnabled', true);
-			if($('#description').rte('mode') == 'html') {
-				$('#editortoolbar li').show();
-			}
-			$('#togglemode').show();
-			$('#summary').addClass('editable');
-			$('.property,#also_time').each(function () {
-				$(this).attr('disabled', false);
-			});
-		} else {
-			$('#description').rte('setEnabled', false);
-			$('#editortoolbar .richtext, #togglemode').hide();
-			$('#summary').removeClass('editable');
-			$('.property,#also_time').each(function () {
-				$(this).attr('disabled', true);
-			});
-		}
-	},
-	toggleMode:function() {
-		console.log('togglemode');
-		$('#description').rte('toggleMode');
-		$('#editortoolbar li.richtext').toggle();
-	},
-	Entry:{
-		id:'',
-		data:undefined,
-		add:function() {
-			// TODO: wrap a DIV around the summary field with a suggestion(?) to fill out this field first. See OC.Journal.required
-			// Remember to reenable all controls.
-			$('#leftcontent lidata-id="'+this.id+'"').removeClass('active');
-			this.id = 'new';
-			this.data = undefined;
-			$('.property').each(function () {
-				switch($(this).get(0).nodeName) {
-					case 'DIV':
-						$(this).html('');
-						break;
-					case 'INPUT':
-					case 'TEXTAREA':
-						$(this).val('');
-						break;
-					default:
-						console.log('OC.Journal.Entry.add. Forgot: ' + $(this).get(0).nodeName);
-						break;
-				}
-			});
-			$('#description').rte('setEnabled', false);
-			$('#editortoolbar li.richtext').hide();
-			$('#editable').attr('checked', true);
-			OC.Journal.setEnabled(true);
-		},
-		createEntry:function(data) {
-			var date = new Date(parseInt(data.dtstart)*1000);
-			var timestring = (data.only_date?'':' ' + date.toLocaleTimeString());
-			return $('<li data-id="'+data.id+'"><a href="'+OC.linkTo('journal', 'index.php')+'&id='+data.id+'">'+data.summary.unEscape()+'</a><br /><em>'+date.toDateString()+timestring+'<em></li>').data('entry', data);
-		},
-		loadEntry:function(id, data) {
-			//$(document).off('change', '.property');
-			console.log('loadEntry: ' + id + ': ' + data.summary);
-			this.id = id;
-			this.data = data;
-			$('#entry').data('id', id);
-			console.log('summary: ' + data.summary.unEscape());
-			$('#summary').val(data.summary.unEscape());
-			$('#organizer').val(data.organizer.value.split(':')[1]);
-			var format = data.description.format;
-			console.log('format: '+format);
-			$('#description').rte(format, data.description.value.unEscape());
-			$('#description').rte('mode', format);
-			//$('#description').expandingTextarea('resize');
-			(format=='html'&&$('#editable').get(0).checked?$('#editortoolbar li.richtext').show():$('#editortoolbar li.richtext').hide());
-			$('#location').val(data.location);
-			$('#categories').val(data.categories.join(','));
-			$('#categories').multiple_autocomplete('option', 'source', categories);
-			console.log('Trying to parse: '+data.dtstart);
-			var date = new Date(parseInt(data.dtstart)*1000);
-			//$('#dtstartdate').val(date.getDate()+'-'+date.getMonth()+'-'+date.getFullYear()); //
-			$('#dtstartdate').datepicker('setDate', date);
-			if(data.only_date) {
-				$('#dtstarttime').hide();
-				$('#also_time').attr('checked', false);
-				//$('#also_time').get(0).checked = false;
-			} else {
-				// timepicker('setTime', ...) triggers a 'change' event, so you have to jump through hoops here ;-)
-				$('#dtstarttime').val(date.getHours().toString().zeroPad(2)+':'+date.getMinutes().toString().zeroPad(2));
-				$('#dtstarttime').show();
-				$('#also_time').attr('checked', true);
-				//$('#also_time').get(0).checked = true;
-			}
-			console.log('dtstart: '+date);
-		},
-		saveproperty:function(obj) {
-			if(!this.id) { // we are adding an entry and want a response back from the server.
-				this.id = 'new';
-				console.log('OC.Journal.Entry.saveproperty: We need to add a new one.');
-				//return;
-			}
-			var container = OC.Journal.propertyContainerFor(obj);
-			var params = {'id':this.id};
-			params['type'] = container.data('type');
-			params['parameters'] = {};
-			switch(params['type']) {
-				case 'ORGANIZER':
-				case 'LOCATION':
-				case 'CATEGORIES':
-					params['value'] = $(obj).val();
-					break;
-				case 'SUMMARY':
-					if(this.id == 'new' && $(obj).val().trim() == '') {
-						$(obj).focus();
-						$(obj).addClass('required');
-						$(obj).on('blur', OC.Journal.required);
-						return;
-					}
-					params['value'] = $(obj).val();
-					break;
-				case 'DESCRIPTION':
-					// Check if we get the description from the textarea or the contenteditable.
-					var format = ($(obj).get(0).nodeName == 'DIV' ? 'html' : 'text'); // FIXME: should check rte instead.
-					var value = $('#description').rte(format); // calls either the 'text' or 'html' method of the rte.
-					//var value = ($(obj).get(0).nodeName == 'DIV' ? $(obj).html() : $(obj).text());
-					console.log('nodeName: ' + $(obj).get(0).nodeName);
-					params['value'] = value;
-					params['parameters']['FORMAT'] = format.toUpperCase();
-					break;
-				case 'DTSTART':
-					var date = $('#dtstartdate').val();
-					var time = $('#dtstarttime').val();
-					var datetime = new Date(parseInt(date.substring(6, 10)), parseInt(date.substring(3, 5)), parseInt(date.substring(0, 2)) , parseInt(time.substring(0, 2)), parseInt(time.substring(3, 5)), 0, 0);
-					params['value'] = datetime.getTime()/1000;
-					break;
-				default:
-					$.extend(1, $(obj).serializeArray(), params);
-					break;
-			}
-			self = this;
-			$.post(OC.filePath('journal', 'ajax', 'saveproperty.php'), params, function(jsondata) {
-				if(jsondata.status == 'success') {
-					if(self.id == 'new') {
-						self.loadEntry(jsondata.data.id, jsondata.data);
-					} else {
-						$('#leftcontent li[data-id="'+self.id+'"]').remove();
-					}
-					var item = self.createEntry(jsondata.data);
-					$('#leftcontent').append(item);
-					OC.Journal.Journals.doSort();
-					OC.Journal.Journals.scrollTo(self.id);
-					// add error checking
-					console.log('successful save');
-				} else {
-					OC.dialogs.alert(jsondata.data.message.text, t('contacts', 'Error'));
-				}
-			});
-		},
-		doExport:function() {
-			document.location.href = OC.linkTo('calendar', 'export.php') + '?eventid=' + this.id;
-		},
-		doDelete:function() {
-			// TODO: Do something when there are no more entries.
-			if(this.id == 'new') { return; }
-			$('#delete').tipsy('hide');
-			self = this;
-			OC.dialogs.confirm(t('contacts', 'Are you sure you want to delete this entry?'), t('journal', 'Warning'), function(answer) {
-				if(answer == true) {
-					$.post(OC.filePath('journal', 'ajax', 'delete.php'), {'id': self.id}, function(jsondata) {
-						if(jsondata.status == 'success') {
-							var curlistitem = $('#leftcontent li[data-id="'+self.id+'"]');
-							var newlistitem = curlistitem.prev('li');
-							if(!$(newlistitem).is('li')) {
-								newlistitem = curlistitem.next('li');
-							}
-							if(!$(newlistitem).is('li')) {
-								alert('No more entries. Do something!!!');
-							}
-							$(newlistitem).addClass('active');
-							console.log('newlistitem: ' + newlistitem.toString());
-							curlistitem.remove();
-							var data = newlistitem.data('entry');
-							self.loadEntry(data.id, data);
-							console.log('successful delete');
-						} else {
-							OC.dialogs.alert(jsondata.data.message.text, t('contacts', 'Error'));
-						}
-					});
-				}
-			});
-		},
-	},
-	Journals:{
-		sortmethod:undefined,
-		doSort:function(method) {
-			if(method) {
-				this.sortmethod = method;
-			} else {
-				 method = this.sortmethod;
-			}
-			// Thanks to http://www.java2s.com/Tutorial/JavaScript/0220__Array/Usinganalphabeticalsortmethodonstrings.html
-			// and http://stackoverflow.com/questions/4258974/sort-list-based-on-data-attribute-using-jquery-metadata-plugin#4259074
-			// and http://stackoverflow.com/questions/8882418/jquery-sorting-lib-that-supports-multilanguage-sorting
-			compareDateTimeAsc = function(a, b){
-				return (parseInt(a.dtstart) > parseInt(b.dtstart)?-1:1);
-			}
-			compareDateTimeDesc = function(a, b){
-				return (parseInt(b.dtstart) < parseInt(a.dtstart)?-1:1);
-			}
-			compareSummaryAsc = function(a, b){
-				return b.summary.toLowerCase().localeCompare(a.summary.toLowerCase());
-			}
-			compareSummaryDesc = function(a, b){
-				return a.summary.toLowerCase().localeCompare(b.summary.toLowerCase());
-			}
-			var func;
-			switch(method) {
-				case 'dtasc':
-					func = compareDateTimeAsc;
-					break;
-				case 'dtdesc':
-					func = compareDateTimeDesc;
-					break;
-				case 'sumasc':
-					func = compareSummaryAsc;
-					break;
-				case 'sumdesc':
-					func = compareSummaryDesc;
-					break;
-				default:
-					var func = compareDateTimeDesc;
-					break;
-			}
-
-			var arr = []
-			// loop through each list item and get the metadata
-			$('#leftcontent li').each(function () {  
-				var meta = $(this).data('entry');
-				meta.elem = $(this);
-				arr.push(meta);
-			});
-			arr.sort(func);
-
-			//Foreach item append it to the container. The first i arr will then end up in the top
-			$.each(arr, function(index, item){
-				item.elem.appendTo(item.elem.parent());
-			});
-		},
-		update:function(id) {
-			console.log('update: ' + id);
-			self = this;
-			$('#leftcontent').addClass('loading');
-			$.getJSON(OC.filePath('journal', 'ajax', 'entries.php'), function(jsondata) {
-				if(jsondata.status == 'success') {
-					var entries = $('#leftcontent').empty();
-					$(jsondata.data.entries).each(function(i, entry) {
-						entries.append(OC.Journal.Entry.createEntry(entry));
-					});
-					$('#leftcontent').removeClass('loading');
-					self.doSort('dtasc');
-					console.log('Count: ' + $('#leftcontent li').length);
-					if($('#leftcontent li').length > 0 ){
-						var firstitem;
-						if(id) {
-							firstitem = $('#leftcontent li[data-id="'+id+'"]');
-						} else {
-							firstitem = $('#leftcontent li').first();
-							id = firstitem.data('entry').id;
-						}
-						firstitem.addClass('active');
-						self.scrollTo(id);
-						OC.Journal.Entry.loadEntry(firstitem.data('id'), firstitem.data('entry'));
-					}
-				} else {
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-		},
-		scrollTo:function(id){
-			var item = $('#leftcontent li[data-id="'+id+'"]');
-			if(item) {
-				try {
-					$('#leftcontent').animate({scrollTop: $('#leftcontent li[data-id="'+id+'"]').offset().top-70}, 'slow','swing');
-				} catch(e) {}
-			}
-		}
-	}
-};
-
-$(document).ready(function(){
-	OCCategories.changed = OC.Journal.categoriesChanged;
-	OCCategories.app = 'calendar';
-
-	// Initialize controls.
-	$('#categories').multiple_autocomplete({source: categories});
-	//$('#categories').multiple_autocomplete('option', 'source', categories);
-	$('#dtstartdate').datepicker({dateFormat: 'dd-mm-yy'});
-	$('#dtstarttime').timepicker({timeFormat: 'hh:mm', showPeriodLabels:false});
-	$('#description').rte({classes: ['property','content']});
-	$('.tip').tipsy();
-	
-	OC.Journal.init();
-	
-	// Show the input with a direcy link the journal entry, binds an event to close
-	// it on blur and removes the binding again afterwards.
-	$('#showlink').on('click', function(event){
-		console.log('showlink');
-		$('#link').toggle('slow').val(totalurl+'&id='+OC.Journal.Entry.id).focus().
-			on('blur',function(event) {$(this).hide()}).off('blur', $(this));
-		return false;
-	});
-
-	$('#rightcontent').on('change', '.property', function(event){
-		OC.Journal.Entry.saveproperty(this);
-	});
-
-	$('#controls').on('click', '#add', function(event){
-		OC.Journal.Entry.add();
-	});
-
-	$('#metadata').on('change', '#also_time', function(event){
-		$('#dtstarttime').toggle().trigger('change');
-	});
-	
-	$('#metadata').on('click', '#export', function(event){
-		OC.Journal.Entry.doExport();
-	});
-
-	$('#metadata').on('click', '#editcategories', function(event){
-		OCCategories.edit();
-	});
-
-	$('#metadata').on('click', '#delete', function(event){
-		OC.Journal.Entry.doDelete();
-	});
-
-	$('#controls').on('change', '#entrysort', function(event){
-		OC.Journal.Journals.doSort($(this).val());
-	});
-
-	// Proxy click.
-	$('#leftcontent').on('keydown', '#leftcontent', function(event){
-		if(event.which == 13) {
-			$('#leftcontent').click(event);
-		}
-	});
-	// Journal entry clicked
-	$(document).on('click', '#leftcontent', function(event){
-		var $tgt = $(event.target);
-		var item = $tgt.is('li')?$($tgt):($tgt).parents('li').first();
-		var id = item.data('id');
-		item.addClass('active');
-		var oldid = $('#entry').data('id');
-		console.log('oldid: ' + oldid);
-		if(oldid != 0){
-			$('#leftcontent li[data-id="'+oldid+'"]').removeClass('active');
-		}
-		OC.Journal.Entry.loadEntry(id, item.data('entry'));
-		return false;
-	});
-	// Editor command.
-	$('.rte-toolbar button').on('click', function(event){
-		console.log('cmd: ' + $(this).data('cmd'));
-		$('#description').rte('formatText', $(this).data('cmd'));
-		event.preventDefault();
-		return false;
-	});
-	// Toggle text/html editing mode.
-	$('#togglemode').on('click', function(event){
-		OC.Journal.toggleMode(true);
-		return false;
-	});
-	$('#editable').on('change', function(event){
-		OC.Journal.setEnabled($(this).get(0).checked);
-	});
-	
-});
diff --git a/apps/journal/js/jquery.rte.js b/apps/journal/js/jquery.rte.js
deleted file mode 100644
index ca7b61d719..0000000000
--- a/apps/journal/js/jquery.rte.js
+++ /dev/null
@@ -1,244 +0,0 @@
-// http://wiki.jqueryui.com/w/page/12138135/Widget%20factory
-
-(function( $ ) {
-
-$.widget( 'ui.rte', {
-	// These options will be used as defaults
-	options: {
-		disabled: true,
-		mode: 'html'
-	},
-	// Set up the widget
-	_create: function() {
-		console.log('_create');
-		var self = this,
-			dirty = false,
-			textarea = this.element; //.hide(),
-			pos = textarea.position();
-			//this.element.text = this.text;
-		this.mirror = $('<div class="rte-content" contenteditable="true" style="top:'+pos.top+';left:'+pos.left+';" ></div>').insertAfter(textarea).show();
-		textarea.hide();
-		this.formatText('styleWithCSS', true);
-		this.validtags = ['A','P','STRONG', 'B', 'I',  'SPAN', 'DIV', 'OL', 'UL', 'LI', 'DL', 'DT', 'DD'];
-		this.enabled = true;
-		
-		/*$(window).resize(function() {
-			console.log('resize: ');
-		});*/
-
-		this.mirror.keydown(function(event){
-			if(event.which == 13) {
-				self.insertAtCaret('<br />');
-			}
-		});
-		this.mirror.keyup(function() {
-			console.log('keyup, set dirty.');
-			self.dirty = true;
-		});
-		this.mirror.blur(function() {
-			console.log('blur: ');
-			if(self.dirty) {
-				self.mirror.trigger('change');
-				self.dirty = false;
-			}
-		});
-		
-	},
-	_init: function() {
-		console.log('_init');
-		self = this;
-		$.each(this.options, function(key, value) {
-			self._setOption(key, value);
-		});
-	},
-	text: function(str) {
-		console.log('function text');
-		if(str != undefined) {
-			this.mirror.html(str);
-			this.element.text(str);
-		} else {
-			console.log('returning: ' + this.element.val());
-			return this.element.val();
-		}
-	},
-	html: function(str) {
-		console.log('function html');
-		if(str != undefined) {
-			console.log('str: ' + str);
-			var $str;
-			try {
-				$str = $(str);
-				this.mirror.empty().html($str); // Call empty() for IE 8.
-				this.element.text($str.text());
-			} catch(e) {
-				console.log(e.message);
-				this.mirror.empty().html(str);
-				this.element.text(str);
-			}
-			//console.log('length: ' + $str.length);
-			//this.mirror.get(0).contenteditable=false;
-		} else {
-			console.log('returning: ' + this.mirror.html());
-			return this.mirror.html();
-		}
-	},
-	insertAtCaret: function(myValue){
-		// Found this at stackoverflow
-		return this.mirror.each(function(i) {
-			if (document.selection) {
-				console.log('IE');
-				//For browsers like Internet Explorer
-				this.focus();
-				sel = document.selection.createRange();
-				sel.text = myValue;
-				this.focus();
-			}
-			else if (this.selectionStart || this.selectionStart == '0') {
-				console.log('FF');
-				//For browsers like Firefox and Webkit based
-				var startPos = this.selectionStart;
-				var endPos = this.selectionEnd;
-				var scrollTop = this.scrollTop;
-				this.value = this.value.substring(0, startPos)+myValue+this.value.substring(endPos,this.value.length);
-				this.focus();
-				this.selectionStart = startPos + myValue.length;
-				this.selectionEnd = startPos + myValue.length;
-				this.scrollTop = scrollTop;
-			} else {
-				console.log('Smth.');
-				this.value += myValue;
-				this.focus();
-			}
-		})
-	},
-	showSelection: function() {
-		var textComponent = this.mirror.get(0); //document.getElementById('Editor');
-		var selectedText;
-		// IE version
-		if (document.selection != undefined) {
-			textComponent.focus();
-			var sel = document.selection.createRange();
-			selectedText = sel.text;
-		}
-		// Mozilla version
-		else if (textComponent.selectionStart != undefined) {
-			var startPos = textComponent.selectionStart;
-			var endPos = textComponent.selectionEnd;
-			selectedText = textComponent.value.substring(startPos, endPos)
-		}
-		alert("You selected: " + selectedText);
-	},
-	formatText: function(command, option) {
-		self = this, useDialog = false;
-		switch(command) {
-			case 'ulist':
-				command = 'insertUnorderedList';
-				break;
-			case 'olist':
-				command = 'insertOrderedList';
-				break;
-			case 'createlink':
-				self.showSelection();
-				option=prompt('Write the URL here')
-				useDialog = true;
-			default:
-				break;
-		}
-		try{
-			document.execCommand(command, useDialog, option);
-			self.dirty = true; // FIXME: This doesn't work because blur is triggered before dirty is set.
-			self.mirror.trigger('blur'); // Dirty hack to trigger save. Hmm, if it only worked...
-		}catch(e){
-			console.log('Error: ' + e)
-		}
-	},
-	setEnabled: function(state) {
-		console.log('function setEnabled: ' + state);
-		if(state != undefined) {
-			this._setOption('disabled', !state);
-		}
-		return this.options['disabled'];
-	},
-	mode: function(mode) {
-		if(mode != undefined) {
-			this._setOption('mode', mode);
-		}
-		return this.options['mode'];
-	},
-	/*toggle: function() {
-		this._setOption('disabled', !this.options['disabled']);
-		return !this.options['disabled'];
-	},*/
-	toggleMode: function() {
-		this._setOption('mode', (this.options['mode'] == 'html'?'text':'html'));
-		return this.options['mode'];
-	},
-	// Use the _setOption method to respond to changes to options
-	_setOption: function( key, value ) {
-		console.log('option ' + key + ': ' + value);
-		switch( key ) {
-			case 'disabled':
-				if(value) {
-					this.mirror.get(0).contenteditable = false;
-					this.mirror.attr('contenteditable', false);
-					this.mirror.removeClass('editable');
-					this.element.attr('disabled', true);
-					this.element.removeClass('editable');
-				} else {
-					this.mirror.get(0).contenteditable = true;
-					this.mirror.attr('contenteditable', true);
-					this.mirror.addClass('editable');
-					this.element.attr('disabled', false);
-					this.element.addClass('editable');
-				}
-				break;
-			case 'mode':
-				switch(value) {
-					case 'html':
-						this.mirror.show();
-						this.element.hide();
-						break;
-					case 'text':
-						this.mirror.hide();
-						this.element.show();
-						this.element.trigger('resize');
-						break;
-					default:
-						throw { name: 'UnknownMode', message: 'Invalid mode: ' + value }
-						break;
-				}
-				break;
-			case 'classes':
-				if($.isArray(value)) {
-					var mirror = this.mirror;
-					$.each(this.options['classes'], function(key, value) {
-						mirror.addClass(value);
-					});
-				} else {
-					this.mirror.addClass(value);
-				}
-				break;
-			default:
-				this.options[key] = value;
-				break;
-		}
-		// In jQuery UI 1.8, you have to manually invoke the _setOption method from the base widget
-
-		$.Widget.prototype._setOption.apply( this, arguments );
-		// In jQuery UI 1.9 and above, you use the _super method instead
-		//this._super( "_setOption", key, value );
-	},
-	// Use the destroy method to clean up any modifications your widget has made to the DOM
-	destroy: function() {
-		this.mirror.remove();
-		this.element.show();
-		// In jQuery UI 1.8, you must invoke the destroy method from the base widget
-		$.Widget.prototype.destroy.call( this );
-		// In jQuery UI 1.9 and above, you would define _destroy instead of destroy and not call the base method
-	}
-
-});
-
-}( jQuery ) );
-
-
diff --git a/apps/journal/js/jquery.textchange.js b/apps/journal/js/jquery.textchange.js
deleted file mode 100644
index 66a07fc5bc..0000000000
--- a/apps/journal/js/jquery.textchange.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * jQuery TextChange Plugin
- * http://www.zurb.com/playground/jquery-text-change-custom-event
- *
- * Copyright 2010, ZURB
- * Released under the MIT License
- */
-(function ($) {
-	
-	$.event.special.textchange = {
-		
-		setup: function (data, namespaces) {
-		  $(this).data('lastValue', this.contentEditable === 'true' ? $(this).html() : $(this).val());
-			$(this).bind('keyup.textchange', $.event.special.textchange.handler);
-			$(this).bind('cut.textchange paste.textchange input.textchange', $.event.special.textchange.delayedHandler);
-		},
-		
-		teardown: function (namespaces) {
-			$(this).unbind('.textchange');
-		},
-		
-		handler: function (event) {
-			$.event.special.textchange.triggerIfChanged($(this));
-		},
-		
-		delayedHandler: function (event) {
-			var element = $(this);
-			setTimeout(function () {
-				$.event.special.textchange.triggerIfChanged(element);
-			}, 25);
-		},
-		
-		triggerIfChanged: function (element) {
-		  var current = element[0].contentEditable === 'true' ? element.html() : element.val();
-			if (current !== element.data('lastValue')) {
-				element.trigger('textchange',  [element.data('lastValue')]);
-				element.data('lastValue', current);
-			}
-		}
-	};
-	
-	$.event.special.hastext = {
-		
-		setup: function (data, namespaces) {
-			$(this).bind('textchange', $.event.special.hastext.handler);
-		},
-		
-		teardown: function (namespaces) {
-			$(this).unbind('textchange', $.event.special.hastext.handler);
-		},
-		
-		handler: function (event, lastValue) {
-			if ((lastValue === '') && lastValue !== $(this).val()) {
-				$(this).trigger('hastext');
-			}
-		}
-	};
-	
-	$.event.special.notext = {
-		
-		setup: function (data, namespaces) {
-			$(this).bind('textchange', $.event.special.notext.handler);
-		},
-		
-		teardown: function (namespaces) {
-			$(this).unbind('textchange', $.event.special.notext.handler);
-		},
-		
-		handler: function (event, lastValue) {
-			if ($(this).val() === '' && $(this).val() !== lastValue) {
-				$(this).trigger('notext');
-			}
-		}
-	};	
-
-})(jQuery);
\ No newline at end of file
diff --git a/apps/journal/js/settings.js b/apps/journal/js/settings.js
deleted file mode 100644
index 8cd1b25f6e..0000000000
--- a/apps/journal/js/settings.js
+++ /dev/null
@@ -1,15 +0,0 @@
-$(document).ready(function(){
-	$('#journal_calendar').on('change', function(event){
-		$.post(OC.filePath('journal', 'ajax', 'setdefaultcalendar.php'), {'id':$('#journal_calendar option:selected').val()}, function(jsondata) {
-			var success = {padding: 0.5em, background-color:green, color: white, font-weight: bold, float: left};
-			var failure = {padding: 0.5em, background-color:red, color: white, font-weight: bold, float: left};
-			if(jsondata.status == 'success') {
-				$('#journal_status');
-				$('#journal_status').css(success).html(t('journal', 'Saved')).fadeIn().fadeOut(5000);
-			} else {
-				$('#journal_status').css(failure);
-				$('#journal_status').html(t('journal', 'Error saving: ')+jsondata.data.message).fadeIn().fadeOut(5000);
-			}
-		});
-	});
-});
diff --git a/apps/journal/lib/app.php b/apps/journal/lib/app.php
deleted file mode 100644
index d3d9b3bf11..0000000000
--- a/apps/journal/lib/app.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * ownCloud - Journal
- *
- * @author Bart Visscher
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-
-/**
- * This class manages our journal.
- */
-OC_Journal_App::$l10n = new OC_L10N('journal');
-class OC_Journal_App {
-	public static $l10n;
-	/*
-	 * @brief categories of the user
-	 */
-	protected static $categories = null;
-	
-	public static function arrayForJSON($id, $vjournal, $user_timezone) {
-		// Possible properties: URL
-		$journal = array( 'id' => $id );
-		$journal['summary'] = $vjournal->getAsString('SUMMARY');
-		$format = 'text';
-		if($vjournal->DESCRIPTION) {
-			foreach($vjournal->DESCRIPTION->parameters as $parameter){
-				if(stripos($parameter->name, 'FORMAT') !== false && stripos($parameter->value, 'HTML') !== false){
-					$format = 'html'; // an educated guess ;-)
-					break;
-				}
-			}
-			$desc = $vjournal->getAsString('DESCRIPTION');
-			$journal['description'] = array(
-											'value' => ($format=='html'?$body = preg_replace("/.*<body[^>]*>|<\/body>.*/si", "", $desc):$desc),
-											'format' => $format,
-											'parameters' => self::parametersForProperty($vjournal->DESCRIPTION)
-											);
-		} else {
-			$journal['description'] = array('value' => '', 'format' => 'text');
-		}
-		$journal['organizer'] = array(
-										'value' => $vjournal->getAsString('ORGANIZER'),
-										'parameters' => self::parametersForProperty($vjournal->ORGANIZER)
-										);
-		$journal['categories'] = $vjournal->getAsArray('CATEGORIES');
-		//error_log('DTSTART: '.print_r($vjournal->DTSTART, true));
-		$dtprop = $vjournal->DTSTART;
-		if($dtprop) {
-			$dtstart = $vjournal->DTSTART->getDateTime();
-			if($dtstart) {
-				//if(!)
-				$tz = new DateTimeZone($user_timezone);
-				if($tz->getName() != $dtstart->getTimezone()->getName() && !$vjournal->DTSTART->offsetExists('TZID')) {
-					//error_log($tz->getName().' != '.$dtstart->getTimezone()->getName());
-					//error_log('TZ offset: '.$tz->getOffset(new DateTime("now"))/60);
-					$dtstart->setTimezone($tz);
-				}
-				$journal['dtstart'] = $dtstart->format('U');
-				$journal['only_date'] = ($dtprop->getDateType() == Sabre_VObject_Property_DateTime::DATE);
-			} else {
-				OCP\Util::writeLog('journal', 'Could not get DTSTART DateTime for '.$journal['summary'], OCP\Util::ERROR);
-			}
-		} else {
-			OCP\Util::writeLog('journal', 'Could not get DTSTART for '.$journal['summary'], OCP\Util::ERROR);
-		}
-		return $journal;
-	}
-
-	/** Get a map of a properties parameters for JSON
-	 * @param $property Sabre_VObject_Property
-	 * @return array of parameters in { name => value, } format
-	 */
-	public static function parametersForProperty($property) {
-		$temp = array();
-		if(!$property) {
-			return;
-		}
-		foreach($property->parameters as $parameter){
-			$temp[$parameter->name] = $parameter->value;
-		}
-		return $temp;
-	}
-
-	/*
-	 * @brief returns the vcategories object of the user
-	 * @return (object) $vcategories
-	 */
-	protected static function getVCategories() {
-		if (is_null(self::$categories)) {
-			self::$categories = new OC_VCategories('calendar');
-		}
-		return self::$categories;
-	}
-	
-	
-	/**
-	 * Create a stub for a new journal entry.
-	 * @return OC_VObject The newly created stub.
-	 */	 
-	public static function createVCalendar()	{
-		$vcalendar = new OC_VObject('VCALENDAR');
-		$appinfo = OCP\App::getAppInfo('journal');
-		$appversion = OCP\App::getAppVersion('journal');
-		$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appversion.'//EN';
-		$vcalendar->add('PRODID', $prodid);
-		$vcalendar->add('VERSION', '2.0');
-
-		$vjournal = new OC_VObject('VJOURNAL');
-		$vjournal->setDateTime('DTSTART', 'now', Sabre_VObject_Property_DateTime::LOCALTZ);
-		$vjournal->setDateTime('CREATED', 'now', Sabre_VObject_Property_DateTime::UTC);
-		$vjournal->setUID();
-		$email = OCP\Config::getUserValue(OCP\User::getUser(), 'settings', 'email', '');
-		if($email) {
-			$vjournal->setString('ORGANIZER', 'mailto:'.$email);
-		}
-		$vcalendar->add($vjournal);
-		return $vcalendar;
-	}
-
-}
diff --git a/apps/journal/lib/hooks.php b/apps/journal/lib/hooks.php
deleted file mode 100644
index 2298871148..0000000000
--- a/apps/journal/lib/hooks.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * ownCloud - Journal
- *
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-
-/**
- * This class manages our journal.
- */
-class OC_Journal_Hooks {
-	/**
-	 * Hook to convert a completed Task (VTODO) to a journal entry and add it to the calendar.
-	 * @param $vtodo An OC_VObject of type VTODO.
-	 */
-	public static function taskToJournalEntry($vtodo) {
-		if(!$vtodo) { return; }
-		
-		OCP\Util::writeLog('journal', 'Completed task: '.$vtodo->getAsString('SUMMARY'), OCP\Util::DEBUG);
-		$vcalendar = OC_Journal_App::createVCalendar();
-		$vjournal = $vcalendar->VJOURNAL;
-		$vjournal->setDateTime('DTSTART',$vtodo->COMPLETED->getDateTime());
-		$vjournal->SUMMARY = $vtodo->SUMMARY;
-		$vjournal->setString('SUMMARY', OC_Journal_App::$l10n->t('Completed task: ').$vjournal->getAsString('SUMMARY'));
-		$vjournal->DESCRIPTION = $vtodo->DESCRIPTION;
-
-		$cid = OCP\Config::getUserValue(OCP\User::getUser(), 'journal', 'default_calendar', null);
-		if(!$cid) {
-			$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-			$first_calendar = reset($calendars);
-			$cid = $first_calendar['id'];
-		}
-		try {
-			$id = OC_Calendar_Object::add($cid, $vcalendar->serialize());
-		} catch (Exception $e) {
-			OCP\Util::writeLog('journal', 'Error adding completed Task to calendar: "'.$cid.'" '. $e->getMessage(), OCP\Util::ERROR);
-		}
-	}
-}
diff --git a/apps/journal/lib/search.php b/apps/journal/lib/search.php
deleted file mode 100644
index 27b9b87b03..0000000000
--- a/apps/journal/lib/search.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-class OC_Search_Provider_Journal extends OC_Search_Provider {
-	function search($query){
-		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-		if(count($calendars)==0 || !OCP\App::isEnabled('calendar')) {
-			//return false;
-		}
-		$results=array();
-		$searchquery=array();
-		if(substr_count($query, ' ') > 0) {
-			$searchquery = explode(' ', $query);
-		}else{
-			$searchquery[] = $query;
-		}
-		error_log('search');
-		$user_timezone = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
-		$l = new OC_l10n('journal');
-		foreach($calendars as $calendar) {
-			$objects = OC_Calendar_Object::all($calendar['id']);
-			foreach($objects as $object) {
-				if($object['objecttype']!='VJOURNAL') {
-					continue;
-				}
-				if(substr_count(strtolower($object['summary']), strtolower($query)) > 0) {
-					$calendardata = OC_VObject::parse($object['calendardata']);
-					$vjournal = $calendardata->VJOURNAL;
-					$dtstart = $vjournal->DTSTART;
-					if($dtstart) {
-						continue;
-					}
-					$start_dt = $dtstart->getDateTime();
-					$start_dt->setTimezone(new DateTimeZone($user_timezone));
-					if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE) {
-						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y');
-					}else{
-						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i');
-					}
-					$link = OCP\Util::linkTo('journal', 'index.php').'&id='.urlencode($object['id']);
-					$results[]=new OC_Search_Result($object['summary'],$info, $link,(string)$l->t('Journal'));//$name,$text,$link,$type
-				}
-			}
-		}
-		return $results;
-	}
-}
diff --git a/apps/journal/lib/vjournal.php b/apps/journal/lib/vjournal.php
deleted file mode 100644
index b9aedea041..0000000000
--- a/apps/journal/lib/vjournal.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * ownCloud - Journal
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * 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/>.
- *
- */
-
-/**
- * This class manages our journals
- */
-class OC_Task_VJournal extends OC_Calendar_Object{
-}
diff --git a/apps/journal/settings.php b/apps/journal/settings.php
deleted file mode 100644
index 35f0ee7d6c..0000000000
--- a/apps/journal/settings.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-
-$errors = array();
-
-$required_apps = array(
-    array('id' => 'tal', 'name' => 'TAL Page Templates'),
-    array('id' => 'journal', 'name' => 'Journal'),
-    array('id' => 'contacts', 'name' => 'Contacts'),
-);
-foreach($required_apps as $app) {
-	if(!OCP\App::isEnabled($app['id'])) {
-		$error = (string)$l->t('The %%s app isn\'t enabled! Please enable it here: <strong><a href="%%s?appid=%%s">Enable %%s app</a></strong>');
-		$errors[] = sprintf($error, $app['name'],OCP\Util::linkTo('settings', 'apps'), $app['id'], $app['name']);
-	}
-}
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-if( count($calendars) == 0 ) {
-	$error = (string)$l->t('You have no calendars. Please add one at the <strong><a href="%%s">Calendar app</a></strong>');
-	$errors[] = sprintf($error, OCP\Util::linkTo('calendar', 'index.php'));
-}
-
-if(count($errors) > 0) {
-	$tmpl = new OCP\Template('journal', 'rtfm');
-	$tmpl->assign('errors',$errors, false);
-} else {
-	$cid = OCP\Config::getUserValue(OCP\User::getUser(), 'journal', 'default_calendar', null);
-	OCP\Util::addScript('journal', 'settings');
-	$tmpl = new OC_TALTemplate('journal', 'settings', 'user');
-	$tmpl->assign('calendars', $calendars);
-		$tmpl->assign('cid', $cid);
-}
-
-return $tmpl->fetchPage();
-
-?>
diff --git a/apps/journal/templates/index.pt b/apps/journal/templates/index.pt
deleted file mode 100644
index 40ce351a54..0000000000
--- a/apps/journal/templates/index.pt
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html metal:use-macro="${maintemplate}/page">
-<head>
-	<title>Journal</title>
-</head>
-<body>
-<div id="content" metal:fill-slot="content">
-	<form onsubmit="return false;">
-	<div id="controls">
-		<select class="tip" id="entrysort" title="Sort journal entries" i18n:attributes="title">
-			<option value="dtdesc">Date - descending</option>
-			<option value="dtasc">Date - ascending</option>
-			<option value="sumdesc">Summary - descending</option>
-			<option value="sumasc">Summary - ascending</option>
-		</select>
-		<button class="tip" id="add" title="Add new journal entry" i18n:attributes="title" i18n:translate="">Add</button>
-	</div>
-	<ul id="leftcontent"></ul>
-	<div id="rightcontent">
-		<div id="entry">
-			<input class="property propertycontainer content" id="summary" name="value" type="text" size="80" placeholder="First enter a short summary" value="" required="required" data-type="SUMMARY" i18n:attributes="placeholder" />
-			<ul id="editortoolbar" class="rte-toolbar svg">
-				<li class="richtext">
-					<button class="tip" data-cmd="bold" title="Bold" i18n:attributes="title">
-						<img tal:attributes="src image:string:journal/bold.svg" />
-					</button>
-				</li>
-				<li class="richtext">
-					<button class="tip" data-cmd="italic" title="Italic" i18n:attributes="title">
-						<img tal:attributes="src image:string:journal/italic.svg" />
-					</button>
-				</li>
-				<li class="richtext">
-					<button class="tip" data-cmd="strikethrough" title="Strike-through" i18n:attributes="title">
-						<img tal:attributes="src image:string:journal/strikethrough.svg" />
-					</button>
-				</li>
-				<li class="richtext">
-					<button class="tip" data-cmd="underline" title="Underline" i18n:attributes="title">
-						<img tal:attributes="src image:string:journal/underline.svg" />
-					</button>
-				</li>
-				<li class="richtext">
-					<button class="tip" data-cmd="ulist" title="Unordered list" i18n:attributes="title">
-						<img tal:attributes="src image:string:journal/list.svg" />
-					</button>
-				</li>
-				<li class="richtext">
-					<button class="tip" data-cmd="createlink" title="Link (URL)" i18n:attributes="title">
-						<img tal:attributes="src image:string:core/actions/public.svg" />
-					</button>
-				</li>
-				<li><a id="togglemode" class="hidden" i18n:translate="">Switch edit mode</a></li>
-			</ul>
-			<div class="propertycontainer" data-type="DESCRIPTION"><textarea class="property content" id="description" name="value"></textarea></div>
-		</div>
-		<dl id="metadata">
-			<div>
-				<input type="checkbox" id="editable" /><label class="tip" for="editable" title="Set this journal entry in edit mode" i18n:attributes="title" i18n:translate="">Edit</label>
-				<a class="tip" id="export" title="Export as iCal file" i18n:attributes="title">
-					<img class="svg action" tal:attributes="src image:string:core/actions/download.svg" />
-				</a>
-				<a class="tip" id="showlink" title="Direct link to this journal entry" i18n:attributes="title">
-					<img class="svg action" tal:attributes="src image:string:core/actions/public.svg" />
-				</a>
-				<a class="tip" id="delete" title="Delete this journal entry" i18n:attributes="title">
-					<img class="svg action" tal:attributes="src image:string:core/actions/delete.svg" />
-				</a>
-				<input class="hidden" id="link" type="text" />
-			</div>
-			<dt><label for="organizer" i18n:translate="">Author</label></dt>
-			<dd>
-				<input class="property propertycontainer" id="organizer" name="value" type="text" size="16" placeholder="Who has written this" value="" data-type="ORGANIZER" disabled="true" i18n:attributes="placeholder" />
-			</dd>
-			<dt id="categories_label"><label for="categories" i18n:translate="">Categories</label></dt>
-			<dd class="propertycontainer" id="categories_value" data-type="CATEGORIES">
-				<input class="property" id="categories" name="value" type="text" size="16" placeholder="Separate with commas" value="" disabled="true" i18n:attributes="placeholder" />
-				<a role="button" class="tip action" id="editcategories" title="Edit groups" i18n:attributes="title">
-					<img class="svg action" tal:attributes="src image:string:core/actions/rename.svg" />
-				</a>
-			</dd>
-			<dt>
-				<label for="dtstartdate" i18n:translate="">Date</label>
-				<input type="checkbox" id="also_time" />
-				<label class="tip" for="also_time" title="Select if this entry also has a time associated." i18n:attributes="title" i18n:translate="">Include time</label>
-			</dt>
-			<dd class="propertycontainer" data-type="DTSTART">
-				<input class="property" id="dtstartdate" name="value" type="date" size="10" placeholder="dd-mm-yyyy" value="" i18n:attributes="placeholder" disabled="true" />
-				<input class="property" id="dtstarttime" name="value" type="time" size="5" placeholder="hh-mm" value="" i18n:attributes="placeholder" disabled="true" />
-			</dd>
-		</dl>
-	</div>
-	<script type="text/javascript">
-		var categories = ${structure php:json_encode(categories)};
-		var id = '${id}';
-		var totalurl = '${url:string:journal/index.php}';
-	</script>
-</form>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/apps/journal/templates/rtfm.php b/apps/journal/templates/rtfm.php
deleted file mode 100644
index 8fd51fb8d0..0000000000
--- a/apps/journal/templates/rtfm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul style="margin: 2em; font-size: 1.4em; line-spacing: 2em;">
-<?php 
-foreach($_['errors'] as $error) { ?>
-    <li><?php echo $error; ?></li>
-<?php } ?>
-</ul>
-
diff --git a/apps/journal/templates/settings.pt b/apps/journal/templates/settings.pt
deleted file mode 100644
index 3e788f5881..0000000000
--- a/apps/journal/templates/settings.pt
+++ /dev/null
@@ -1,15 +0,0 @@
-<form id="journal">
-	<fieldset class="personalblock">
-		<legend i18n:translate="">Journal</legend>
-		<dl>
-			<dt i18n:translate="">Select default calendar<br />for storing journals</dt>
-			<dd>
-				<select id="journal_calendar" style="float:left;">
-					<tal:block repeat="calendar calendars">
-					<option tal:define="id calendar/id" tal:attributes="value id; selected php:(cid == id ? 'selected' : null )" tal:content="calendar/displayname"></option>
-					</tal:block>
-				</select>
-			</dd><span id="journal_status"></span>
-		</dl>
-	</fieldset>
-</form>
diff --git a/apps/news/.gitignore b/apps/news/.gitignore
deleted file mode 100644
index 16469399de..0000000000
--- a/apps/news/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-3rdparty/*
-news.kdev4
-*~
-.kdev4
-img/*
diff --git a/apps/news/ajax/createfeed.php b/apps/news/ajax/createfeed.php
deleted file mode 100644
index 754d874957..0000000000
--- a/apps/news/ajax/createfeed.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-*
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-*
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-OCP\JSON::callCheck();
-
-$userid = OCP\USER::getUser();
-
-$feedurl = trim($_POST['feedurl']);
-$folderid = trim($_POST['folderid']);
-
-$feed = OC_News_Utils::fetch($feedurl);
-$feedmapper = new OC_News_FeedMapper();
-$feedid = $feedmapper->save($feed, $folderid);
-
-$l = OC_L10N::get('news');
-
-if(!$feedid) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error adding folder.'))));
-	OCP\Util::writeLog('news','ajax/createfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR);
-	exit();
-}
-
-//TODO: replace the following with a real success case. see contact/ajax/createaddressbook.php for inspirations
-OCP\JSON::success(array('data' => array('message' => $l->t('Feed added!'))));
-
diff --git a/apps/news/ajax/createfolder.php b/apps/news/ajax/createfolder.php
deleted file mode 100644
index b5f624604d..0000000000
--- a/apps/news/ajax/createfolder.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-*
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-*
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-OCP\JSON::callCheck();
-
-$userid = OCP\USER::getUser();
-
-$name = trim($_POST['name']);
-$parentid = trim($_POST['parentid']);
-
-$foldermapper = new OC_News_FolderMapper($userid);
-
-if($parentid != 0)
-    $folder = new OC_News_Folder($name, NULL, $foldermapper->find($parentid));
-else
-    $folder = new OC_News_Folder($name);
-
-$folderid = $foldermapper->save($folder);
-
-$l = OC_L10N::get('news');
-
-if(!$folderid) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error adding folder.'))));
-	OCP\Util::writeLog('news','ajax/createfolder.php: Error adding folder: '.$_POST['name'], OCP\Util::ERROR);
-}
-else {
-	//TODO: replace the following with a real success case. see contact/ajax/createaddressbook.php for inspirations
-	OCP\JSON::success(array('data' => array('message' => $l->t('Folder added!'))));
-}
\ No newline at end of file
diff --git a/apps/news/ajax/deletefeed.php b/apps/news/ajax/deletefeed.php
deleted file mode 100644
index d31a9417d1..0000000000
--- a/apps/news/ajax/deletefeed.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-OCP\JSON::callCheck();
-
-$userid = OCP\USER::getUser();
-
-$feedid = $_POST['feedid'];
-
-$feedmapper = new OC_News_FeedMapper();
-$success = $feedmapper->deleteById($feedid);
-
-$l = OC_L10N::get('news');
-
-if(!$success) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing feed.'))));
-	OCP\Util::writeLog('news','ajax/deletefeed.php: Error removing feed: '.$_POST['feedid'], OCP\Util::ERROR);
-	exit();
-}
-
-OCP\JSON::success(array('data' => array( 'feedid' => $feedid )));
diff --git a/apps/news/ajax/deletefolder.php b/apps/news/ajax/deletefolder.php
deleted file mode 100644
index bf975c6c32..0000000000
--- a/apps/news/ajax/deletefolder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-*
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-*
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-OCP\JSON::callCheck();
-
-$userid = OCP\USER::getUser();
-
-$folderid = trim($_POST['folderid']);
-
-$foldermapper = new OC_News_FolderMapper();
-$success = $foldermapper->deleteById($folderid);
-
-$l = OC_L10N::get('news');
-
-if(!$success) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing folder.'))));
-	OCP\Util::writeLog('news','ajax/deletefolder.php: Error removing folder: '.$_POST['folderid'], OCP\Util::ERROR);
-	exit();
-}
-
-OCP\JSON::success(array('data' => array( 'folderid' => $folderid )));
diff --git a/apps/news/ajax/feeddialog.php b/apps/news/ajax/feeddialog.php
deleted file mode 100644
index c42771c988..0000000000
--- a/apps/news/ajax/feeddialog.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-include("populateroot.php");
-
-$output = new OCP\Template("news", "part.addfeed");
-$output -> assign('allfeeds', $allfeeds);
-$output -> printpage();
\ No newline at end of file
diff --git a/apps/news/ajax/folderdialog.php b/apps/news/ajax/folderdialog.php
deleted file mode 100644
index 97b679e662..0000000000
--- a/apps/news/ajax/folderdialog.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-include("populateroot.php");
-
-$output = new OCP\Template("news", "part.addfolder");
-$output -> assign('allfeeds', $allfeeds);
-$output -> printpage();
\ No newline at end of file
diff --git a/apps/news/ajax/markitem.php b/apps/news/ajax/markitem.php
deleted file mode 100644
index c42dc9350c..0000000000
--- a/apps/news/ajax/markitem.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-OCP\JSON::callCheck();
-
-$itemid = $_POST['itemid'];
-
-$itemmapper = new OC_News_ItemMapper();
-$item = $itemmapper->find($itemid);
-$item->setRead();
-$success = $itemmapper->update($item);
-
-$l = OC_L10N::get('news');
-
-if(!$success) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error marking item as read.'))));
-	OCP\Util::writeLog('news','ajax/markitem.php: Error marking item as read: '.$_POST['itemid'], OCP\Util::ERROR);
-	exit();
-}
-
-//TODO: replace the following with a real success case. see contact/ajax/createaddressbook.php for inspirations
-OCP\JSON::success(array('data' => array('itemid' => $itemid )));
-
diff --git a/apps/news/ajax/populateroot.php b/apps/news/ajax/populateroot.php
deleted file mode 100644
index a408c25ec5..0000000000
--- a/apps/news/ajax/populateroot.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-
-$foldermapper = new OC_News_FolderMapper(OCP\USER::getUser());
-
-$allfeeds = $foldermapper->populate('Everything', 0);
-
-if ($allfeeds) {
-	$feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null;
-	if ($feedid == null) {
-
-	}
-}
-else {
-	$feedid = 0;
-}
diff --git a/apps/news/appinfo/app.php b/apps/news/appinfo/app.php
deleted file mode 100644
index eb1b54455d..0000000000
--- a/apps/news/appinfo/app.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-OC::$CLASSPATH['OC_News_Item'] = 'apps/news/lib/item.php';
-OC::$CLASSPATH['OC_News_Collection'] = 'apps/news/lib/collection.php';
-OC::$CLASSPATH['OC_News_Feed'] = 'apps/news/lib/feed.php';
-OC::$CLASSPATH['OC_News_Folder'] = 'apps/news/lib/folder.php';
-
-OC::$CLASSPATH['OC_News_FeedMapper'] = 'apps/news/lib/feedmapper.php';
-OC::$CLASSPATH['OC_News_ItemMapper'] = 'apps/news/lib/itemmapper.php';
-OC::$CLASSPATH['OC_News_FolderMapper'] = 'apps/news/lib/foldermapper.php';
-
-OC::$CLASSPATH['OC_News_Utils'] = 'apps/news/lib/utils.php';
-
-
-$l = new OC_l10n('news');
-
-OCP\App::registerPersonal('news', 'settings');
-
-OCP\App::register( array( 
-  'order' => 70, 
-  'id' => 'news', 
-  'name' => 'News' 
-));
-
-OCP\App::addNavigationEntry( array( 
-  'id' => 'news', 
-  'order' => 74, 
-  'href' => OC_Helper::linkTo( 'news', 'index.php' ), 
-  'icon' => OC_Helper::imagePath( 'news', 'icon.svg' ), 
-  'name' => $l->t('News')
-));
-
diff --git a/apps/news/appinfo/database.xml b/apps/news/appinfo/database.xml
deleted file mode 100644
index 3f5f6c44af..0000000000
--- a/apps/news/appinfo/database.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	<name>*dbname*</name>
-	<create>true</create>
-	<overwrite>false</overwrite>
-	<charset>latin1</charset>
-	<table>
-		<name>*dbprefix*news_folders</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-    				<autoincrement>1</autoincrement>
-				<length>4</length>
-			</field>
-			<field>
-				<name>parent_id</name>
-				<type>integer</type>
-				<notnull>false</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>name</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>100</length>
-			</field>
-			<field>
-				<name>user_id</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			
-			<index>
-				<name>folder_id</name>
-				<unique>true</unique>
-				<field>
-					<name>id</name>
-					<sorting>descending</sorting>
-				</field>
-			</index>
-			<index>
-				<name>user_id</name>
-				<field>
-					<name>user_id</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-	
-	<table>
-		<name>*dbprefix*news_feeds</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-    				<autoincrement>1</autoincrement>
-				<length>4</length>
-			</field>
-			<field>
-				<name>url</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>100</length>
-			</field>
-			<field>
-				<name>title</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>100</length>
-			</field>
-			<field>
-				<name>added</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>false</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>lastmodified</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>false</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>folder_id</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			
-			<index>
-				<name>feed_id</name>
-				<unique>true</unique>
-				<primary>true</primary>
-				<field>
-					<name>id</name>
-					<sorting>descending</sorting>
-				</field>
-			</index>
-			
-			<index>
-				<name>feed_url</name>
-				<unique>true</unique>
-				<primary>false</primary>
-				<field>
-					<name>url</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-	
-	<table>
-		<name>*dbprefix*news_items</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<length>4</length>
-			</field>
-			<field>
-				<name>guid</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>100</length>
-			</field>
-			<field>
-				<name>url</name>
-				<type>text</type>
-				<length>100</length>
-			</field>
-			<field>
-				<name>title</name>
-				<type>text</type>
-				<length>100</length>
-			</field>
-			<field>
-				<name>feed_id</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>body</name>
-				<type>text</type>
-				<length>4000</length>			
-			</field>
-			<field>
-				<name>status</name>
-				<type>integer</type>
-				<length>1</length>
-			</field>
-			
-			<index>
-				<name>item_id</name>
-				<unique>true</unique>
-				<field>
-					<name>id</name>
-					<sorting>descending</sorting>
-				</field>
-			</index>
-			<index>
-				<name>item_guid</name>
-				<unique>true</unique>
-				<field>
-					<name>guid</name>
-				</field>
-				<field>
-					<name>feed_id</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/news/appinfo/info.xml b/apps/news/appinfo/info.xml
deleted file mode 100644
index 0ada6e75c0..0000000000
--- a/apps/news/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>news</id>
-	<name>News</name>
-	<description>An RSS/Atom feed reader</description>
-	<version>5.5</version>
-	<licence>AGPL</licence>
-	<author>Alessandro Cosentino</author>
-	<require>4</require>
-</info>
diff --git a/apps/news/css/news.css b/apps/news/css/news.css
deleted file mode 100644
index 04ce0d2e73..0000000000
--- a/apps/news/css/news.css
+++ /dev/null
@@ -1,52 +0,0 @@
-li { padding-right: 0px !important; }
-
-.collapsable { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px;}
-.news_input { float:left; font-size:12px; padding:4px 2px; border:solid 1px #aacfe4; width:200px; }
-.svg { border: inherit; background: inherit; }
-
-#leftcontent { top: 3.5em !important; padding: 0; margin: 0; }
-#rightcontent { top: 3.5em !important; padding-top: 5px; }
-#feeds { background: #fff; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0; }
-/* #feeds a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; } */
-#bottomcontrols { padding: 0; bottom:0px; overflow:visible; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
-#feeds_delete { position: absolute; right: 0px; background: url('%webroot%/core/img/actions/delete.svg') no-repeat center; display: inline; }
-#feeds_edit { position: absolute; right: 1.6em; background: url('%webroot%/core/img/actions/rename.svg') no-repeat center; display: inline; }
-
-#dropdownBtn { width: 9em; padding-left: 0; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; }
-
-#addfolder { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px; }
-#addfeed { background: url('%appswebroot%/apps/news/img/rss.svg') no-repeat left center; padding-left: 20px; }
-
-ul.controls li { float: left; }
-
-.accordion .title_unread { background: #DCDCDC; font-size: 12px; border-bottom:1px solid #ccc; font-weight:bold;}
-.accordion .title_read { background: #DCDCDC; font-size: 12px; border-bottom:1px solid #ccc;}
-
-ul.menu { position: absolute; z-index:100; margin-left: 0.3em;
-	display: none;
-	background:#EEEEEE; /* default background for browsers without gradient support */
-	/* css3 */
-	background:-webkit-gradient(linear, 0 0, 0 100%, from(#DCDCDC), to(#EEEEEE));
-	background:-moz-linear-gradient(#DCDCDC, #EEEEEE);
-	background:-o-linear-gradient(#DCDCDC, #EEEEEE);
-	background:linear-gradient(#DCDCDC, #EEEEEE);
-	/*
-	-webkit-border-radius:10px;
-	-moz-border-radius:10px;
-	border-radius:10px;
-	*/
-}
-
-ul#dropdownmenu { left: 0em; box-shadow: 0px 0px 10px rgb(0, 0, 0); }
-
-ul#feedfoldermenu { position:fixed; margin-left: 0; bottom: 2.8em; border-left:1px solid #ccc; border-top:1px solid #ccc; border-right:1px solid #ccc; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
-
-li.menuItem { margin-left:0.7em; margin-right:0.7em; float: none !important; text-align: left; }
-
-li.folder_list:hover { color: rgb(0, 0, 0) !important; background: none !important; }
-li.feeds_list:hover { background: none repeat scroll 0% 0% rgb(221, 221, 221) !important; }
-div.collapsable:hover { background-color: rgb(221, 221, 221); }
-div.add_parentfolder { position: relative; }
-
-div.dialog { overflow: visible; }
-
diff --git a/apps/news/index.php b/apps/news/index.php
deleted file mode 100644
index e75ec19d67..0000000000
--- a/apps/news/index.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-*
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-*
-*/
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-
-OCP\App::checkAppEnabled('news');
-OCP\App::setActiveNavigationEntry('news');
-
-OCP\Util::addscript('news','news');
-OCP\Util::addStyle('news','news');
-
-$l = OC_L10N::get('news');
-
-$foldermapper = new OC_News_FolderMapper(OCP\USER::getUser());
-
-$allfeeds = $foldermapper->populate($l->t('Everything'), 0);
-
-if ($allfeeds) {
-	$feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null;
-	if ($feedid == null) {
-		
-	}
-}
-else {
-	$feedid = 0;
-}
-
-$tmpl = new OCP\Template( 'news', 'main', 'user' );
-$tmpl->assign('allfeeds', $allfeeds);
-$tmpl->assign('feedid', $feedid);
-$tmpl->printPage();
-
-?>
diff --git a/apps/news/js/news.js b/apps/news/js/news.js
deleted file mode 100644
index 96c3f60b7d..0000000000
--- a/apps/news/js/news.js
+++ /dev/null
@@ -1,196 +0,0 @@
-News={
-	DropDownMenu: {
-		fade:function(menu){
-			var list = $(menu).toggle();
-			return false;
-		},
-		dropdown:function(button){
-			var list = $(button).parent().find('ul#dropdownmenu');
-			if (list.css('display') == 'none')
-				list.slideDown('fast').show();
-			else
-				list.slideUp('fast');
-
-			return false;
-		},
-		selectItem:function(item, folderid){
-			var parent = $(item).parent().parent();
-			parent.find('#dropdownBtn').text($(item).text());
-			parent.find(':input[name="folderid"]').val(folderid);
-			parent.find('ul#dropdownmenu').slideUp('fast');
-		}
-	},
-	UI: {
-		overview:function(dialogtype, dialogfile){
-		    	if($(dialogtype).dialog('isOpen') == true){
-				$(dialogtype).dialog('moveToTop');
-			}else{
-				$('#dialog_holder').load(OC.filePath('news', 'ajax', dialogfile), function(jsondata){
-					if(jsondata.status != 'error'){
-						$(dialogtype).dialog({
-							dialogClass:'dialog',
-							minWidth: 600,
-							close: function(event, ui) {
-								$(this).dialog('destroy').remove();
-							}
-						}).css('overflow','visible');
-					} else {
-						alert(jsondata.data.message);
-					}
-				});
-			}
-			return false;
-		}
-	},
-	Folder: {
-		submit:function(button){
-			var displayname = $("#folder_add_name").val().trim();
-
-			if(displayname.length == 0) {
-				OC.dialogs.alert(t('news', 'Displayname cannot be empty.'), t('news', 'Error'));
-				return false;
-			}
-
-			$(button).attr("disabled", true);
-			//translation here!!!
-			$(button).prop('value', 'Adding...');
-
-			var folderid = $('#inputfolderid:input[name="folderid"]').val();
-
-			var url;
-			url = OC.filePath('news', 'ajax', 'createfolder.php');
-
-			$.post(url, { name: displayname, parentid: folderid },
-				function(jsondata){
-					if(jsondata.status == 'success'){
-						//$(button).closest('tr').prev().html(jsondata.page).show().next().remove();
-						OC.dialogs.alert(jsondata.data.message, t('news', 'Success!'));
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
-					}
-					$("#folder_add_name").val('');
-					$(button).attr("disabled", false);
-					//translation here!!!
-					$(button).prop('value', 'Add folder');
-			});
-		},
-		'delete':function(folderid) {
-			$('#feeds_delete').tipsy('hide');
-			OC.dialogs.confirm(t('news', 'Are you sure you want to delete this folder and all its feeds?'), t('news', 'Warning'), function(answer) {
-				if(answer == true) {
-					$.post(OC.filePath('news', 'ajax', 'deletefolder.php'),{'folderid':folderid},function(jsondata){
-						if(jsondata.status == 'success'){
-							alert('removed!');
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
-						}
-					});
-				}
-			});
-			return false;
-		}
-	},
-	Feed: {
-		id:'',
-		submit:function(button){
-			var feedurl = $("#feed_add_url").val().trim();
-
-			if(feedurl.length == 0) {
-				OC.dialogs.alert(t('news', 'URL cannot be empty.'), t('news', 'Error'));
-				return false;
-			}
-
-			$(button).attr("disabled", true);
-			//translation here!!!
-			$(button).prop('value', 'Adding...');
-
-			var folderid = $('#inputfolderid:input[name="folderid"]').val();
-
-			var url;
-			url = OC.filePath('news', 'ajax', 'createfeed.php');
-
-			$.post(url, { feedurl: feedurl, folderid: folderid },
-				function(jsondata){
-					if(jsondata.status == 'success'){
-						OC.dialogs.alert(jsondata.data.message, t('news', 'Success!'));
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
-					}
-				$("#feed_add_url").val('');
-				$(button).attr("disabled", false);
-				//translation here!!!
-				$(button).prop('value', 'Add feed');
-			});
-		},
-		'delete':function(feedid) {
-			$('#feeds_delete').tipsy('hide');
-			OC.dialogs.confirm(t('news', 'Are you sure you want to delete this feed?'), t('news', 'Warning'), function(answer) {
-				if(answer == true) {
-					$.post(OC.filePath('news', 'ajax', 'deletefeed.php'),{'feedid':feedid},function(jsondata){
-						if(jsondata.status == 'success'){
-							$('#leftcontent [data-id="'+jsondata.data.feedid+'"]').remove();
-							//change the right view too (maybe a message to subscribe, like in Google Reader?)
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
-						}
-					});
-				}
-			});
-			return false;
-		},
-		markItem:function(itemid) {
-			$.post(OC.filePath('news', 'ajax', 'markitem.php'),{'itemid':itemid},function(jsondata){
-				if(jsondata.status == 'success'){
-					var $currentitem = $('#rightcontent [data-id="'+jsondata.data.itemid+'"]');
-					$currentitem.removeClass('title_unread');
-					$currentitem.addClass('title_read');
-					//set a timeout for this
-				}
-				else{
-					OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
-				}
-			});
-		}
-	}
-}
-
-$(document).ready(function(){
-
-	$('#addfeed').click(function() {
-		News.UI.overview('#addfeed_dialog','feeddialog.php');
-		$(this).parent().toggle();
-	});
-	$('#addfolder').click(function() {
-		News.UI.overview('#addfolder_dialog','folderdialog.php');
-		$(this).parent().toggle();
-	});
-
-	$('.collapsable').click(function(){
-		$(this).parent().children().toggle();
-		$(this).toggle();
-	});
-
-	$('.accordion .title_unread').click(function() {
-		$(this).next().toggle();
-		return false;
-	}).next().hide();
-
-	$('.accordion .title_read').click(function() {
-		$(this).next().toggle();
-		return false;
-	}).next().hide();
-
-        var list = $('.collapsable,.feeds_list').hover(function() {
-                var elem = $(this).find('#feeds_delete,#feeds_edit');
-                if(elem.css('display') == 'none')
-                        elem.css('display', 'inline');
-                else
-                        elem.css('display', 'none');
-
-                return false;
-        });
-        list.find('#feeds_delete').hide();
-        list.find('#feeds_edit').hide();
-});
diff --git a/apps/news/js/settings.js b/apps/news/js/settings.js
deleted file mode 100644
index 4c645d241e..0000000000
--- a/apps/news/js/settings.js
+++ /dev/null
@@ -1,15 +0,0 @@
-$(document).ready(function(){
-
-
-
-	$('#somesetting').blur(function(event){
-		event.preventDefault();
-		var post = $( "#somesetting" ).serialize();
-		$.post( OC.filePath('apptemplate','ajax','seturl.php') , post, function(data){ OC.msg.finishedSaving('#somesetting .msg', data);   });
-	});
-
-
-
-});
-
-
diff --git a/apps/news/lib/collection.php b/apps/news/lib/collection.php
deleted file mode 100644
index 2ebbb646f0..0000000000
--- a/apps/news/lib/collection.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-/**
- * This class models a collection, which is either a feed or a folder.
- */
-class OC_News_Collection {
-	
-	private $id;
-	
-	public function __construct($id){
-		$this->id = $id;
-	}
-
-	public function getId(){
-		return $this->id;
-	}
-	
-	public function setId($id){
-		$this->id = $id;
-	}
-	
-}
\ No newline at end of file
diff --git a/apps/news/lib/feed.php b/apps/news/lib/feed.php
deleted file mode 100644
index bbed8d5982..0000000000
--- a/apps/news/lib/feed.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-/**
- * This class models a feed.
- */
-class OC_News_Feed extends OC_News_Collection {
-
-	private $url;
-	private $spfeed; //encapsulate a SimplePie_Core object
-	private $items;  //array that contains all the items of the feed
-
-	public function __construct($url, $title, $items, $id = null){
-		$this->url = $url;
-		$this->title = $title;
-		$this->items = $items;
-		if ($id !== null){
-			parent::__construct($id);
-		}
-	}
-	
-	public function getUrl(){
-		return $this->url;
-	}
-
-	public function getTitle(){
-		return $this->title;
-	}
-
-	public function setItems($items){
-		$this->items = $items;
-	}
-
-	public function getItems(){
-		return $this->items;
-	}
-}
diff --git a/apps/news/lib/feedmapper.php b/apps/news/lib/feedmapper.php
deleted file mode 100644
index 73afa0e864..0000000000
--- a/apps/news/lib/feedmapper.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-/**
- * This class maps a feed to an entry in the feeds table of the database.
- */
-class OC_News_FeedMapper {
-
-	const tableName = '*PREFIX*news_feeds';
-	
-	/**
-	 * @brief Retrieve a feed from the database
-	 * @param id The id of the feed in the database table.
-	 * @returns  
-	 */
-	public function findById($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?');
-		$result = $stmt->execute(array($id));
-		$row = $result->fetchRow();
-		$url = $row['url'];
-		$title = $row['title'];
-		$feed = new OC_News_Feed($url, $title, null, $id);
-		return $feed;
-	}
-
-	/**
-	 * @brief Retrieve a feed from the database
-	 * @param id The id of the feed in the database table.
-	 * @returns  
-	 */
-	public function findByFolderId($folderid){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE folder_id = ?');
-		$result = $stmt->execute(array($folderid));
-		$feeds = array();
-		while ($row = $result->fetchRow()) {
-			$url = $row['url'];
-			$title = $row['title'];
-			$id = $row['id'];
-			$feed = new OC_News_Feed($url, $title, null, $id);
-			$feeds[] = $feed;
-		}
-		return $feeds;
-	}
-
-	
-	/**
-	 * @brief Retrieve a feed and all its items from the database
-	 * @param id The id of the feed in the database table.
-	 * @returns 
-	 */
-	public function findWithItems($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?');
-		$result = $stmt->execute(array($id));
-		$row = $result->fetchRow();
-		$url = $row['url'];
-		$title = $row['title'];
-		$feed = new OC_News_Feed($url, $title, null,$id);
-
-		$itemMapper = new OC_News_ItemMapper();
-		$items = $itemMapper->findAll($id);
-		$feed->setItems($items);
-		
-		return $feed;
-	}
-
-	/**
-	 * @brief Find the id of a feed and all its items from the database
-	 * @param url url of the feed
-	 * @return id of the feed corresponding to the url passed as parameters 
-	 *	null - if there is no such feed 
-	 */
-	public function findIdFromUrl($url){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE url = ?');
-		$result = $stmt->execute(array($url));
-		$row = $result->fetchRow();
-		$id = null;
-		if ($row != null){
-			$id = $row['id'];
-		}
-		return $id;
-	}
-
-	/**
-	 * @brief Save the feed and all its items into the database
-	 * @param feed the feed to be saved
-	 * @returns The id of the feed in the database table.
-	 */
-	 //TODO: handle error case
-	public function save(OC_News_Feed $feed, $folderid){
-		$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
-		if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-			$_ut = "strftime('%s','now')";
-		} elseif($CONFIG_DBTYPE == 'pgsql') {
-			$_ut = 'date_part(\'epoch\',now())::integer';
-		} else {
-			$_ut = "UNIX_TIMESTAMP()";
-		}
-
-		$title = $feed->getTitle();
-		$url = htmlspecialchars_decode($feed->getUrl());
-
-		if(empty($title)) {
-			$l = OC_L10N::get('news');
-			$title = $l->t('no title');
-		}
-
-		//FIXME: Detect when feed contains already a database id
-		$feedid =  $this->findIdFromUrl($url);
-		if ($feedid == null){
-			$query = OCP\DB::prepare('
-				INSERT INTO ' . self::tableName .
-				'(url, title, folder_id, added, lastmodified)
-				VALUES (?, ?, ?, ?, ?)
-				');
-
-			$params=array(
-				$url,
-				htmlspecialchars_decode($title),
-				$folderid,
-				$_ut, 
-				$_ut
-			);
-			$query->execute($params);
-			
-			$feedid = OCP\DB::insertid(self::tableName);
-		}
-		$feed->setId($feedid);
-
-		$itemMapper = new OC_News_ItemMapper();
-		
-		$items = $feed->getItems();
-		foreach($items as $item){
-			$itemMapper->save($item, $feedid);
-		}
-		
-		return $feedid;
-	}
-	
-	public function deleteById($id){
-		if ($id == null) {
-			return false;
-		}
-		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE id = ?');
-
-		$result = $stmt->execute(array($id));
-		
-		$itemMapper = new OC_News_ItemMapper();
-		//TODO: handle the value that the execute returns
-		$itemMapper->deleteAll($id);
-		
-		return true;
-	}
-	public function delete(OC_News_Feed $feed){
-		$id = $feed->getId();
-		return deleteById($id);
-	}
-	
-	//it's more complicated tan this...recursive delete, or delete with a join
-	public function deleteAll($folderdid){	
-		if ($folderid == null) {
-			return false;
-		}
-		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE folder_id = ?');
-
-		$result = $stmt->execute(array($folderid));
-		
-		$itemMapper = new OC_News_ItemMapper();
-		//TODO: handle the value that the execute returns
-		$itemMapper->deleteAll($id);
-		
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/apps/news/lib/folder.php b/apps/news/lib/folder.php
deleted file mode 100644
index 6654b2f5e9..0000000000
--- a/apps/news/lib/folder.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-*
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-*
-*/
-
-/**
- * This class models a folder that contains feeds.
- */
-class OC_News_Folder extends OC_News_Collection {
-
-	private $name;
-	private $children;
-	private $parent;
-
-	public function __construct($name, $id = null, OC_News_Collection $parent = null){
-		$this->name = $name;
-		if ($id !== null){
-			parent::__construct($id);
-		}
-		$this->children = array();
-		if ($parent !== null){
-			$this->parent = $parent;
-		}
-	}
-
-	public function getName(){
-		return $this->name;
-	}
-
-	public function setName($name){
-		$this->name = $name;
-	}
-
-	public function getParentId(){
-		if ($this->parent === null){
-			return 0;
-		}
-		return $this->parent->getId();
-	}
-
-	public function addChild(OC_News_Collection $child){
-		$this->children[] = $child;
-	}
-
-	public function getChildren(){
-		return $this->children;
-	}
-
-}
\ No newline at end of file
diff --git a/apps/news/lib/foldermapper.php b/apps/news/lib/foldermapper.php
deleted file mode 100644
index 45dc53c424..0000000000
--- a/apps/news/lib/foldermapper.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-*
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-*
-*/
-
-/**
- * This class maps a feed to an entry in the feeds table of the database.
- */
-class OC_News_FolderMapper {
-
-	const tableName = '*PREFIX*news_folders';
-
-	private $userid;
-
-	public function __construct($userid = null){
-		if ($userid !== null) {
-			$this->userid = $userid;
-		}
-		$userid = OCP\USER::getUser();
-	}
-
-	/**
-	 * @brief Create a folder and populate with children from the database
-	 * @param id The id of the folder.
-	 * @param name The name of the folder.
-	 * @returns  an instance of OC_News_Folder
-	 */
-	public function populate($name, $id){
-		$root = new OC_News_Folder($name, $id);
-		$stmt = OCP\DB::prepare('SELECT *
-					FROM ' . self::tableName .
-					' WHERE user_id = ? AND parent_id = ?');
-		$result = $stmt->execute(array($this->userid, $id));
-
-		while( $row = $result->fetchRow()){
-			$child = OC_News_FolderMapper::populate($row['name'], $row['id']);
-			$root->addChild($child);
-		}
-
-		$feedmapper = new OC_News_FeedMapper();
-		$feeds = $feedmapper->findByFolderId($id);
-		foreach ($feeds as $feed){
-			$root->addChild($feed);
-		}
-
-		return $root;
-	}
-
-	/**
-	 * @brief Retrieve a folder from the database
-	 * @param id The id of the folder in the database table.
-	 * @returns  an instance of OC_News_Folder
-	 */
-	public function find($id){
-		$stmt = OCP\DB::prepare('SELECT *
-					FROM ' . self::tableName .
-					' WHERE user_id = ? AND id = ?');
-		$result = $stmt->execute(array($this->userid, $id));
-
-		$row = $result->fetchRow();
-		$folder = new OC_News_Folder($row['name'], $row['id']);
-
-		return $folder;
-	}
-
-	/**
-	 * @brief Retrieve a feed and all its items from the database
-	 * @param id The id of the feed in the database table.
-	 * @returns
-	 */
-	public function findWithItems($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?');
-		$result = $stmt->execute(array($id));
-		$row = $result->fetchRow();
-		$url = $row['url'];
-		$title = $row['title'];
-		$feed = new OC_News_Feed($url, $title, null,$id);
-
-		$itemMapper = new OC_News_ItemMapper($feed);
-		$items = $itemMapper->findAll();
-		$feed->setItems($items);
-
-		return $feed;
-	}
-
-	/**
-	 * @brief Store the folder and all its feeds into the database
-	 * @param folder the folder to be saved
-	 * @returns The id of the folder in the database table.
-	 */
-	public function save(OC_News_Folder $folder){
-		$query = OCP\DB::prepare('
-			INSERT INTO ' . self::tableName .
-			'(name, parent_id, user_id)
-			VALUES (?, ?, ?)
-			');
-
-		$name = $folder->getName();
-
-		if(empty($name)) {
-			$l = OC_L10N::get('news');
-			$name = $l->t('no name');
-		}
-
-		$parentid = $folder->getParentId();
-
-		$params=array(
-		htmlspecialchars_decode($name),
-		$parentid,
-		$this->userid
-		);
-		$query->execute($params);
-		$folderid = OCP\DB::insertid(self::tableName);
-
-		$folder->setId($folderid);
-		return $folderid;
-	}
-
-	public function delete(OC_News_Folder $folder){
-		$folderid = $folder->getId();
-		return deleteById(folderid);
-	}
-
-	//TODO: replace it with a DELETE INNER JOIN operation
-	public function deleteById($folderid){
-		if ($folderid == null){
-			return false;
-		}
-
-		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE id = ?');
-
-		$result = $stmt->execute(array($folderid));
-
-		$feedMapper = new OC_News_FeedMapper();
-		//TODO: handle the value that the execute returns
-		$feedMapper->deleteAll($folderid);
-
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/apps/news/lib/item.php b/apps/news/lib/item.php
deleted file mode 100644
index 64ae368c36..0000000000
--- a/apps/news/lib/item.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-class StatusFlag{
-	const Unread    = 0x02;
-	const Important = 0x04;
-	const Deleted   = 0x08;
-	const Updated   = 0x16;
-}
-
-/**
- * This class models an item.
- *
- * It encapsulate a SimplePie_Item object and adds a status flag to it
- */
-class OC_News_Item {
-
-	private $url;
-	private $title;
-	private $guid;
-	private $body;
-	private $status;  //a bit-field set with status flags
-	private $id;      //id of the item in the database table
-
-	public function __construct($url, $title, $guid, $body, $id = null){
-		$this->title = $title;
-		$this->url = $url;
-		$this->guid = $guid;
-		$this->body = $body;
-		if ($id == null) {
-			$this->status |= StatusFlag::Unread;
-		}
-		else {
-			$this->id = $id;
-		}
-	}
-
-	public function getGuid(){
-		return $this->guid;
-	}
-
-	public function setGuid($guid){
-		$this->guid = $guid;
-	}
-
-	public function getId(){
-		return $this->id;
-	}
-
-	public function setId($id){
-		$this->id = $id;
-	}
-
-	public function setRead(){
-		$this->status &= ~StatusFlag::Unread;
-	}
-
-	public function setUnread(){
-		$this->status |= StatusFlag::Unread; 
-	}
-
-	public function isRead(){
-		return !($this->status & StatusFlag::Unread);
-	}
-	
-	public function setImportant(){
-		$this->status |= StatusFlag::Important; 
-	}
-	
-	public function setUnimportant(){
-		$this->status &= ~StatusFlag::Important;
-	}
-	
-	public function isImportant(){
-		return ($this->status & StatusFlag::Important);
-	}
-		
-	/**
-	 * NOTE: this is needed to store items in the database, otherwise 
-	 * the status of an item should be retrieved with methods: isRead(), isImportant(), ...
-	 */
-	public function getStatus(){
-		return $this->status;
-	}
-	
-	public function setStatus($status){
-		$this->status = $status;
-	}
-
-	public function getTitle(){
-		return $this->title;
-	}
-
-	public function setTitle($title){
-		$this->title = $title;
-	}
-
-	public function getUrl(){
-		return $this->url;
-	}
-
-	public function setUrl($url){
-		$this->url = $url;
-	}
-
-	public function getBody(){
-		return $this->body;
-	}
-
-	public function setBody($body){
-		$this->body = $body;
-	}
-}
diff --git a/apps/news/lib/itemmapper.php b/apps/news/lib/itemmapper.php
deleted file mode 100644
index 8d6a755b16..0000000000
--- a/apps/news/lib/itemmapper.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-/**
- * This class maps an item to a row of the items table in the database.
- * It follows the Data Mapper pattern (see http://martinfowler.com/eaaCatalog/dataMapper.html).
- */
-class OC_News_ItemMapper {
-
-	const tableName = '*PREFIX*news_items';
-
-	public function fromRow($row){
-		$url = $row['url'];
-		$title = $row['title'];
-		$guid = $row['guid'];
-		$status = $row['status'];
-		$body = $row['body'];
-		$id = $row['id'];
-		$item = new OC_News_Item($url, $title, $guid, $body, $id);
-		$item->setStatus($status);
-		
-		return $item;
-	}
-	
-	/**
-	 * @brief Retrieve all the item corresponding to a feed from the database
-	 * @param feedid The id of the feed in the database table.
-	 */
-	public function findAll($feedid){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE feed_id = ?');
-		$result = $stmt->execute(array($feedid));
-	
-		$items = array();
-		while ($row = $result->fetchRow()) {
-			$item = $this->fromRow($row);
-			$items[] = $item;
-		}
-
-		return $items;
-	}
-
-	public function findIdFromGuid($guid, $feedid){
-		$stmt = OCP\DB::prepare('
-				SELECT * FROM ' . self::tableName . ' 
-				WHERE guid = ?
-				AND feed_id = ?
-				');
-		$result = $stmt->execute(array($guid, $feedid));
-		$row = $result->fetchRow();
-		$id = null;
-		if ($row != null){
-			$id = $row['id'];
-		}
-		return $id;
-	}
-
-	/**
-	 * @brief Update the item after its status has changed
-	 * @returns The item whose status has changed.
-	 */
-	public function update(OC_News_Item $item){
-		
-		$itemid = $item->getId();
-		$status = $item->getStatus();
-		
-		$stmt = OCP\DB::prepare('
-				UPDATE ' . self::tableName .
-				' SET status = ?
-				WHERE id = ?
-				');
-			
-		$params=array(
-			$status,
-			$itemid
-			);
-		$stmt->execute($params);
-		
-		return true;
-	}
-	
-	/**
-	 * @brief Save the feed and all its items into the database
-	 * @returns The id of the feed in the database table.
-	 */
-	public function save(OC_News_Item $item, $feedid){
-		$guid = $item->getGuid();
-		$status = $item->getStatus();
-
-		$itemid =  $this->findIdFromGuid($guid, $feedid);
-		
-		if ($itemid == null){
-			$title = $item->getTitle();
-			$body = $item->getBody();
-
-			$stmt = OCP\DB::prepare('
-				INSERT INTO ' . self::tableName .
-				'(url, title, body, guid, feed_id, status)
-				VALUES (?, ?, ?, ?, ?, ?)
-				');
-
-			if(empty($title)) {
-				$l = OC_L10N::get('news');
-				$title = $l->t('no title');
-			}
-
-			if(empty($body)) {
-				$l = OC_L10N::get('news');
-				$body = $l->t('no body');
-			}
-
-			$params=array(
-				htmlspecialchars_decode($item->getUrl()),
-				htmlspecialchars_decode($title),
-				$body,
-				$guid,
-				$feedid,
-				$status
-			);
-			
-			$stmt->execute($params);
-			
-			$itemid = OCP\DB::insertid(self::tableName);
-		}
-		else {
-			$this->update($item);
-		}
-		$item->setId($itemid);
-		return $itemid;
-	}
-	
-	/**
-	 * @brief Retrieve an item from the database
-	 * @param id The id of the feed in the database table.
-	 */
-	public function find($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?');
-		$result = $stmt->execute(array($id));
-		$row = $result->fetchRow();
-
-		$item = $this->fromRow($row);
-		
-		return $item;
-
-	}
-
-	
-	/**
-	 * @brief Permanently delete all items belonging to a feed from the database
-	 * @param feedid The id of the feed that we wish to delete
-	 * @return 
-	 */
-	public function deleteAll($feedid){
-		if ($feedid == null) {
-			return false;
-		}
-		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE feed_id = ?');
-
-		$result = $stmt->execute(array($feedid));
-		
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/apps/news/lib/utils.php b/apps/news/lib/utils.php
deleted file mode 100644
index e18ce2969e..0000000000
--- a/apps/news/lib/utils.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-* ownCloud - News app
-*
-* @author Alessandro Cosentino
-* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
-* This file is licensed under the Affero General Public License version 3 or later.
-* See the COPYING-README file
-* 
-*/
-
-// load SimplePie library
-//TODO: is this file a suitable place for the following require?
-require_once('news/3rdparty/SimplePie/SimplePieAutoloader.php');
-
-class OC_News_Utils {
-
-	/**
-	 * @brief Fetch a feed from remote
-	 * @param url remote url of the feed 
-	 * @returns 
-	 */
-	public static function fetch($url){
-	//TODO: handle the case where fetching of the feed fails
-		$spfeed = new SimplePie_Core();
-		$spfeed->set_feed_url( $url );
-		$spfeed->enable_cache( false );
-		$spfeed->init();
-		$spfeed->handle_content_type();
-		$title = $spfeed->get_title();
-		
-		$spitems = $spfeed->get_items();
-		$items = array();
-		foreach($spitems as $spitem) { //FIXME: maybe we can avoid this loop
-			$itemUrl = $spitem->get_permalink();
-			$itemTitle = $spitem->get_title();
-			$itemGUID = $spitem->get_id();
-			$itemBody = $spitem->get_content();
-			$items[] = new OC_News_Item($itemUrl, $itemTitle, $itemGUID, $itemBody); 
-		}
-
-		$feed = new OC_News_Feed($url, $title, $items);
-		return $feed;
-	}
-}
\ No newline at end of file
diff --git a/apps/news/settings.php b/apps/news/settings.php
deleted file mode 100644
index 94d0573589..0000000000
--- a/apps/news/settings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-//OCP\Util::addscript( "news", "admin" );
-
-$tmpl = new OCP\Template( 'news', 'settings');
-
-return $tmpl->fetchPage();
-
diff --git a/apps/news/templates/main.php b/apps/news/templates/main.php
deleted file mode 100644
index 6ab1bc64ea..0000000000
--- a/apps/news/templates/main.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="leftcontent" class="leftcontent">
-	<ul id="feeds">
-		<?php echo $this->inc("part.feeds"); ?>
-	</ul>
-</div>
-
-<ul class="menu" id="feedfoldermenu">
-	<li class="menuItem" id="addfeed"><?php echo $l->t('Feed'); ?></li>
-	<li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li>
-</ul>
-
-<div id="bottomcontrols">
-	<ul class="controls">
-		<li>
-			<button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>"   /></button>
-		</li>
-		<li><button class="svg" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>
-		<li><button class="svg" title="<?php echo $l->t('Settings'); ?>">Settings</button></li>
-	<ul>
-</div>
-
-<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
-	<?php
-		if ($_['feedid']){
-			echo $this->inc("part.items");
-		}
-		else {
-			echo $this->inc("part.nofeeds");
-		}
-	?>
-</div>
-
-<!-- Dialogs -->
-<div id="dialog_holder"></div>
-<!-- End of Dialogs -->
-
diff --git a/apps/news/templates/part.addfeed.php b/apps/news/templates/part.addfeed.php
deleted file mode 100644
index 6807f3c5b3..0000000000
--- a/apps/news/templates/part.addfeed.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<div id="addfeed_dialog" title="<?php echo $l->t("Add Feed"); ?>">
-<table width="100%" style="border: 0;">
-<tr>
-	<td>Add new feed</td>
-	<td>
-		<div class="add_parentfolder">
-			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
-			    <?php echo $l->t('EVERYTHING'); ?>
-			</button>
-			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
-			<ul class="menu" id="dropdownmenu">
-				<?php echo $this->inc("part.folderlist"); ?>
-			</ul>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" /></td>
-	<td><input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td>
-</tr>
-</table>
\ No newline at end of file
diff --git a/apps/news/templates/part.addfolder.php b/apps/news/templates/part.addfolder.php
deleted file mode 100644
index e1217160ce..0000000000
--- a/apps/news/templates/part.addfolder.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<div id="addfolder_dialog" title="<?php echo $l->t("Add Folder"); ?>">
-<table width="100%" style="border: 0;">
-<tr>
-	<td>Add new folder</td>
-	<td>
-		<div class="add_parentfolder">
-			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
-			    <?php echo $l->t('EVERYTHING'); ?>
-			</button>
-			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
-			<ul class="menu" id="dropdownmenu">
-				<?php echo $this->inc("part.folderlist"); ?>
-			</ul>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td><input type="text" id="folder_add_name" placeholder="<?php echo $l->t('Folder name'); ?>" class="news_input" /></td>
-	<td><input type="submit" value="<?php echo $l->t('Add folder'); ?>" onclick="News.Folder.submit(this)" id="folder_add_submit" /></td>
-</tr>
-</table>
\ No newline at end of file
diff --git a/apps/news/templates/part.feeds.php b/apps/news/templates/part.feeds.php
deleted file mode 100644
index 587e73f366..0000000000
--- a/apps/news/templates/part.feeds.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-	function print_folder(OC_News_Folder $folder, $depth){
-		$l = new OC_l10n('news');
-
-		echo '<ul style="margin-left:' . 10*$depth . 'px;"> <li class="folder_list" >' .
-			'<div class="collapsable" >' . strtoupper($folder->getName()) .
-                        ( ($depth != 0) ? '<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' . 
-				'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>': '' ) .
-                        '</div>';
-		echo '<ul>';
-		$children = $folder->getChildren();
-		foreach($children as $child) {
-			if ($child instanceOf OC_News_Folder){
-				print_folder($child, $depth+1);
-			}
-			elseif ($child instanceOf OC_News_Feed) { //onhover $(element).attr('id', 'newID');
-
-				echo '<li class="feeds_list" data-id="' . $child->getId() . '"><a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '">' . $child->getTitle() .'</a>';
-				echo '<button class="svg action" id="feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
-				echo '<button class="svg action" id="feeds_edit" title="' . $l->t('Edit feed') . '"></button>';
-				echo '</li>';
-			}
-			else {
-			//TODO:handle error in this case
-			}
-		}
-		echo '</ul></li></ul>';
-	}
-
-	print_folder($_['allfeeds'], 0);
-?>
\ No newline at end of file
diff --git a/apps/news/templates/part.folderlist.php b/apps/news/templates/part.folderlist.php
deleted file mode 100644
index 670684fd4c..0000000000
--- a/apps/news/templates/part.folderlist.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-	function print_folder(OC_News_Folder $folder, $depth){
-		echo '<li class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>';
-		$children = $folder->getChildren();
-		foreach($children as $child) {
-			if ($child instanceOf OC_News_Folder){
-				print_folder($child, $depth+1);
-			}
-		}
-	}
-	print_folder($_['allfeeds'], 0);
-?>
\ No newline at end of file
diff --git a/apps/news/templates/part.items.php b/apps/news/templates/part.items.php
deleted file mode 100644
index 24ca958e98..0000000000
--- a/apps/news/templates/part.items.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-$feedid = isset($_['feedid']) ? $_['feedid'] : '';
-
-$itemmapper = new OC_News_ItemMapper();
-
-$items = $itemmapper->findAll($feedid);
-
-echo '<ul class="accordion">';
-foreach($items as $item) {
-	$title = $item->getTitle();
-	echo '<li>';
-	echo '<div data-id="' . $item->getId() . '"';
-	if ($item->isRead()) {
-		echo ' class="title_read">';
-	}
-	else {
-		echo ' class="title_unread" onClick="News.Feed.markItem(' . $item->getId() . ')">';
-	}
-	echo $title . '</div><div class="body">' . $item->getBody() . '</div>';
-	echo '</li>';
-}
-echo '</ul>';
diff --git a/apps/news/templates/part.nofeeds.php b/apps/news/templates/part.nofeeds.php
deleted file mode 100644
index bb78dedbf8..0000000000
--- a/apps/news/templates/part.nofeeds.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="firstrun">
-	<?php echo $l->t('You have no feeds in your reader.') ?>
-</div>
\ No newline at end of file
diff --git a/apps/news/templates/settings.php b/apps/news/templates/settings.php
deleted file mode 100644
index ccbb004f00..0000000000
--- a/apps/news/templates/settings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<form id="news">
-	<fieldset class="personalblock">
-		<strong>News</strong><br />
-		<input type="text" name="opml_file" id="opml_file" placeholder="<?php echo $l->t('.opml file');?>" />
-                <br />
-
-	</fieldset>
-</form>
diff --git a/apps/news/templates/test.php b/apps/news/templates/test.php
deleted file mode 100644
index d8e31e6759..0000000000
--- a/apps/news/templates/test.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php 
-
-$feedmapper = new OC_News_FeedMapper();
-$foldermapper = new OC_News_FolderMapper();
-$itemmapper = new OC_News_ItemMapper();
-
-$folder = new OC_News_Folder( 'Friends' );
-$folderid = $foldermapper->save($folder);
-
-$feed = OC_News_Utils::fetch( 'http://www.dabacon.org/newpontiff/?feed=rss2' );
-
-$feedmapper->save($feed, $folder->getId());
-
-$feed = $feedmapper->findWithItems($feed->getId());
-echo '<br>' . $feed->getTitle() . '<br>';
-$items = $feed->getItems();
-
-foreach($items as $item) {
-
-	echo $item->getTitle() . ' - ';
-	if ($item->isRead()) {
-		echo $l->t('Read');
-	}
-	else {
-		echo $l->t('Unread');
-	}
-	echo ' - ';
-	if ($item->isImportant()) {
-		echo $l->t('Important');
-	}
-	else {
-		echo $l->t('Not important');
-	}
-	echo '<br>';
-	$item->setImportant();
-}
-
-echo '<br>...after changing status';
-echo '<br>' . $feed->getTitle() . '<br>';
-
-foreach($items as $item) {
-	echo $item->getTitle() . ' - ';
-	if ($item->isRead()) {
-		echo $l->t('Read');
-	}
-	else {
-		echo $l->t('Unread');
-	}
-	echo ' - ';
-	if ($item->isImportant()) {
-		echo $l->t('Important');
-	}
-	else {
-		echo $l->t('Not important');
-	}
-	echo '<br>';
-	$item->setUnimportant();
-}
-
-$feedmapper->save($feed, $folder->getId());
-
-echo '<br>...after saving and reloading';
-
-$feed = $feedmapper->findWithItems($feed->getId());
-echo '<br>' . $feed->getTitle() . '<br>';
-$items = $feed->getItems();
-
-foreach($items as &$item) {
-
-	echo $item->getTitle() . ' - ';
-	if ($item->isRead()) {
-		echo $l->t('Read');
-	}
-	else {
-		echo $l->t('Unread');
-	}
-	echo ' - ';
-	if ($item->isImportant()) {
-		echo $l->t('Important');
-	}
-	else {
-		echo $l->t('Not important');
-	}
-	echo '<br>';
-}
\ No newline at end of file
diff --git a/apps/shorty/.htaccess b/apps/shorty/.htaccess
deleted file mode 100644
index b7c4189ae4..0000000000
--- a/apps/shorty/.htaccess
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# @package shorty an ownCloud url shortener plugin
-# @category internet
-# @author Christian Reiner
-# @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-# @license GNU Affero General Public license (AGPL)
-# @link information
-# @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-#
-# 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/>.
-#
-
-# @file .htaccess
-# These rules try to detect any requests that carry a "shorty id" and map them to forward.php?<shorty id>
-# That way you can use shorter (or more simple) urls to publish or relay links
-# @author Christian Reiner
-
-RewriteEngine On
-
-# example: http://.../apps/shorty/index.php/0123456789
-RewriteRule     index\.php/([a-z0-9]{4,12})$     ../../public.php?service=shorty_relay&id=$1 [NC,L]
-
-# example: http://.../apps/shorty/index.php?0123456789
-RewriteCond     %{QUERY_STRING}                 ^([a-z0-9]{4,12})$         [NC]
-RewriteRule     index\.php                     ../../public.php?service=shorty_relay&id=%{QUERY_STRING} [L]
-
-# example: http://.../apps/shorty/?0123456789
-RewriteCond     %{QUERY_STRING}                ^([a-z0-9]{4,12})$          [NC]
-RewriteCond     %{REQUEST_URI}                 meta/.+\.php
-RewriteRule     -                              ../../public.php?service=shorty_relay&id=%{QUERY_STRING} [L]
-
-# example: http://.../apps/shorty/0123456789
-RewriteRule     ^([a-z0-9]{4,12})$             ../../public.php?service=shorty_relay&id=$1 [NC,L]
diff --git a/apps/shorty/3rdparty/js/jquery.tinysort.min.js b/apps/shorty/3rdparty/js/jquery.tinysort.min.js
deleted file mode 100644
index 225f799ca9..0000000000
--- a/apps/shorty/3rdparty/js/jquery.tinysort.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){var o=!1,d=null,u=parseFloat,j=String.fromCharCode,q=Math.min,l=/(\d+\.?\d*)$/g,g,a=[],h,m,t=9472,f={},c;for(var p=32,k=j(p),r=255;p<r;p++,k=j(p).toLowerCase()){if(!~a.indexOf(k)){a.push(k)}}a.sort();b.tinysort={id:"TinySort",version:"1.3.20",copyright:"Copyright (c) 2008-2012 Ron Valstar",uri:"http://tinysort.sjeiti.com/",licenced:{MIT:"http://www.opensource.org/licenses/mit-license.php",GPL:"http://www.gnu.org/licenses/gpl.html"},defaults:{order:"asc",attr:d,data:d,useVal:o,place:"start",returns:o,cases:o,forceStrings:o,sortFunction:d,charOrder:g}};b.fn.extend({tinysort:function(V,L){if(V&&typeof(V)!="string"){L=V;V=d}var T=b.extend({},b.tinysort.defaults,L),v,Q=this,z=b(this).length,ae={},W=!(!V||V==""),H=!(T.attr===d||T.attr==""),ah=T.data!==d,J=W&&V[0]==":",C=J?Q.filter(V):Q,F=T.sortFunction,s=T.order=="asc"?1:-1,P=[];if(T.charOrder!=g){g=T.charOrder;if(!T.charOrder){m=false;t=9472;f={};c=h=d}else{h=a.slice(0);m=false;for(var S=[],B=function(i,ai){S.push(ai);f[T.cases?i:i.toLowerCase()]=ai},N="",X="z",aa=g.length,ac,Z,ad=0;ad<aa;ad++){var x=g[ad],ab=x.charCodeAt(),I=ab>96&&ab<123;if(!I){if(x=="["){var D=S.length,M=D?S[D-1]:X,w=g.substr(ad+1).match(/[^\]]*/)[0],R=w.match(/{[^}]*}/g);if(R){for(ac=0,Z=R.length;ac<Z;ac++){var O=R[ac];ad+=O.length;w=w.replace(O,"");B(O.replace(/[{}]/g,""),M);m=true}}for(ac=0,Z=w.length;ac<Z;ac++){B(M,w[ac])}ad+=w.length+1}else{if(x=="{"){var G=g.substr(ad+1).match(/[^}]*/)[0];B(G,j(t++));ad+=G.length+1;m=true}else{S.push(x)}}}if(S.length&&(I||ad===aa-1)){var E=S.join("");N+=E;b.each(E,function(i,ai){h.splice(h.indexOf(ai),1)});var A=S.slice(0);A.splice(0,0,h.indexOf(X)+1,0);Array.prototype.splice.apply(h,A);S.length=0}if(ad+1===aa){c=new RegExp("["+N+"]","gi")}else{if(I){X=x}}}}}if(!F){F=T.order=="rand"?function(){return Math.random()<0.5?1:-1}:function(av,at){var au=o,am=!T.cases?n(av.s):av.s,ak=!T.cases?n(at.s):at.s;if(!T.forceStrings){var aj=am&&am.match(l),aw=ak&&ak.match(l);if(aj&&aw){var ar=am.substr(0,am.length-aj[0].length),aq=ak.substr(0,ak.length-aw[0].length);if(ar==aq){au=!o;am=u(aj[0]);ak=u(aw[0])}}}var ai=s*(am<ak?-1:(am>ak?1:0));if(!au&&T.charOrder){if(m){for(var ax in f){var al=f[ax];am=am.replace(ax,al);ak=ak.replace(ax,al)}}if(am.match(c)!==d||ak.match(c)!==d){for(var ap=0,ao=q(am.length,ak.length);ap<ao;ap++){var an=h.indexOf(am[ap]),i=h.indexOf(ak[ap]);if(ai=s*(an<i?-1:(an>i?1:0))){break}}}}return ai}}Q.each(function(ak,al){var am=b(al),ai=W?(J?C.filter(al):am.find(V)):am,an=ah?ai.data(T.data):(H?ai.attr(T.attr):(T.useVal?ai.val():ai.text())),aj=am.parent();if(!ae[aj]){ae[aj]={s:[],n:[]}}if(ai.length>0){ae[aj].s.push({s:an,e:am,n:ak})}else{ae[aj].n.push({e:am,n:ak})}});for(v in ae){ae[v].s.sort(F)}for(v in ae){var ag=ae[v],K=[],Y=z,af=[0,0],ad;switch(T.place){case"first":b.each(ag.s,function(ai,aj){Y=q(Y,aj.n)});break;case"org":b.each(ag.s,function(ai,aj){K.push(aj.n)});break;case"end":Y=ag.n.length;break;default:Y=0}for(ad=0;ad<z;ad++){var y=e(K,ad)?!o:ad>=Y&&ad<Y+ag.s.length,U=(y?ag.s:ag.n)[af[y?0:1]].e;U.parent().append(U);if(y||!T.returns){P.push(U.get(0))}af[y?0:1]++}}Q.length=0;Array.prototype.push.apply(Q,P);return Q}});function n(i){return i&&i.toLowerCase?i.toLowerCase():i}function e(v,x){for(var w=0,s=v.length;w<s;w++){if(v[w]==x){return !o}}return o}b.fn.TinySort=b.fn.Tinysort=b.fn.tsort=b.fn.tinysort})(jQuery);
\ No newline at end of file
diff --git a/apps/shorty/3rdparty/php/phpqrcode.php b/apps/shorty/3rdparty/php/phpqrcode.php
deleted file mode 100644
index 80adb9df23..0000000000
--- a/apps/shorty/3rdparty/php/phpqrcode.php
+++ /dev/null
@@ -1,3312 +0,0 @@
-<?php
-
-/*
- * PHP QR Code encoder
- *
- * This file contains MERGED version of PHP QR Code library.
- * It was auto-generated from full version for your convenience.
- *
- * This merged version was configured to not requre any external files,
- * with disabled cache, error loging and weker but faster mask matching.
- * If you need tune it up please use non-merged version.
- *
- * For full version, documentation, examples of use please visit:
- *
- *    http://phpqrcode.sourceforge.net/
- *    https://sourceforge.net/projects/phpqrcode/
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
- 
-
-/*
- * Version: 1.1.4
- * Build: 2010100721
- */
-
-
-
-//---- qrconst.php -----------------------------
-
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Common constants
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-	// Encoding modes
-	 
-	define('QR_MODE_NUL', -1);
-	define('QR_MODE_NUM', 0);
-	define('QR_MODE_AN', 1);
-	define('QR_MODE_8', 2);
-	define('QR_MODE_KANJI', 3);
-	define('QR_MODE_STRUCTURE', 4);
-
-	// Levels of error correction.
-
-	define('QR_ECLEVEL_L', 0);
-	define('QR_ECLEVEL_M', 1);
-	define('QR_ECLEVEL_Q', 2);
-	define('QR_ECLEVEL_H', 3);
-	
-	// Supported output formats
-	
-	define('QR_FORMAT_TEXT', 0);
-	define('QR_FORMAT_PNG',  1);
-	
-	class qrstr {
-		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
-		}
-	}	
-
-
-
-//---- merged_config.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Config file, tuned-up for merged verion
- */
-     
-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there
-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true
-    define('QR_LOG_DIR', false);         // default error logs dir   
-    
-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
-    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
-                                                  
-    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
-                                                  
-
-
-
-//---- qrtools.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Toolset, handy and debug utilites.
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-    class QRtools {
-    
-        //----------------------------------------------------------------------
-        public static function binarize($frame)
-        {
-            $len = count($frame);
-            foreach ($frame as &$frameLine) {
-                
-                for($i=0; $i<$len; $i++) {
-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
-                }
-            }
-            
-            return $frame;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function tcpdfBarcodeArray($code, $mode = 'QR,L', $tcPdfVersion = '4.5.037')
-        {
-            $barcode_array = array();
-            
-            if (!is_array($mode))
-                $mode = explode(',', $mode);
-                
-            $eccLevel = 'L';
-                
-            if (count($mode) > 1) {
-                $eccLevel = $mode[1];
-            }
-                
-            $qrTab = QRcode::text($code, false, $eccLevel);
-            $size = count($qrTab);
-                
-            $barcode_array['num_rows'] = $size;
-            $barcode_array['num_cols'] = $size;
-            $barcode_array['bcode'] = array();
-                
-            foreach ($qrTab as $line) {
-                $arrAdd = array();
-                foreach(str_split($line) as $char)
-                    $arrAdd[] = ($char=='1')?1:0;
-                $barcode_array['bcode'][] = $arrAdd;
-            }
-                    
-            return $barcode_array;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function clearCache()
-        {
-            self::$frames = array();
-        }
-        
-        //----------------------------------------------------------------------
-        public static function buildCache()
-        {
-			QRtools::markTime('before_build_cache');
-			
-			$mask = new QRmask();
-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
-                $frame = QRspec::newFrame($a);
-                if (QR_IMAGE) {
-                    $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
-                    QRimage::png(self::binarize($frame), $fileName, 1, 0);
-                }
-				
-				$width = count($frame);
-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-				for ($maskNo=0; $maskNo<8; $maskNo++)
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
-            }
-			
-			QRtools::markTime('after_build_cache');
-        }
-
-        //----------------------------------------------------------------------
-        public static function log($outfile, $err)
-        {
-            if (QR_LOG_DIR !== false) {
-                if ($err != '') {
-                    if ($outfile !== false) {
-                        file_put_contents(QR_LOG_DIR.basename($outfile).'-errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
-                    } else {
-                        file_put_contents(QR_LOG_DIR.'errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
-                    }
-                }    
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public static function dumpMask($frame) 
-        {
-            $width = count($frame);
-            for($y=0;$y<$width;$y++) {
-                for($x=0;$x<$width;$x++) {
-                    echo ord($frame[$y][$x]).',';
-                }
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public static function markTime($markerId)
-        {
-            list($usec, $sec) = explode(" ", microtime());
-            $time = ((float)$usec + (float)$sec);
-            
-            if (!isset($GLOBALS['qr_time_bench']))
-                $GLOBALS['qr_time_bench'] = array();
-            
-            $GLOBALS['qr_time_bench'][$markerId] = $time;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function timeBenchmark()
-        {
-            self::markTime('finish');
-        
-            $lastTime = 0;
-            $startTime = 0;
-            $p = 0;
-
-            echo '<table cellpadding="3" cellspacing="1">
-                    <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>
-                    <tbody>';
-
-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
-                if ($p > 0) {
-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';
-                } else {
-                    $startTime = $thisTime;
-                }
-                
-                $p++;
-                $lastTime = $thisTime;
-            }
-            
-            echo '</tbody><tfoot>
-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>
-            </tfoot>
-            </table>';
-        }
-        
-    }
-    
-    //##########################################################################
-    
-    QRtools::markTime('start');
-    
-
-
-
-//---- qrspec.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * QR Code specifications
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * The following data / specifications are taken from
- * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004)
- *  or
- * "Automatic identification and data capture techniques -- 
- *  QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-    define('QRSPEC_VERSION_MAX', 40);
-    define('QRSPEC_WIDTH_MAX',   177);
-
-    define('QRCAP_WIDTH',        0);
-    define('QRCAP_WORDS',        1);
-    define('QRCAP_REMINDER',     2);
-    define('QRCAP_EC',           3);
-
-    class QRspec {
-    
-        public static $capacity = array(
-            array(  0,    0, 0, array(   0,    0,    0,    0)),
-            array( 21,   26, 0, array(   7,   10,   13,   17)), // 1
-            array( 25,   44, 7, array(  10,   16,   22,   28)),
-            array( 29,   70, 7, array(  15,   26,   36,   44)),
-            array( 33,  100, 7, array(  20,   36,   52,   64)),
-            array( 37,  134, 7, array(  26,   48,   72,   88)), // 5
-            array( 41,  172, 7, array(  36,   64,   96,  112)),
-            array( 45,  196, 0, array(  40,   72,  108,  130)),
-            array( 49,  242, 0, array(  48,   88,  132,  156)),
-            array( 53,  292, 0, array(  60,  110,  160,  192)),
-            array( 57,  346, 0, array(  72,  130,  192,  224)), //10
-            array( 61,  404, 0, array(  80,  150,  224,  264)),
-            array( 65,  466, 0, array(  96,  176,  260,  308)),
-            array( 69,  532, 0, array( 104,  198,  288,  352)),
-            array( 73,  581, 3, array( 120,  216,  320,  384)),
-            array( 77,  655, 3, array( 132,  240,  360,  432)), //15
-            array( 81,  733, 3, array( 144,  280,  408,  480)),
-            array( 85,  815, 3, array( 168,  308,  448,  532)),
-            array( 89,  901, 3, array( 180,  338,  504,  588)),
-            array( 93,  991, 3, array( 196,  364,  546,  650)),
-            array( 97, 1085, 3, array( 224,  416,  600,  700)), //20
-            array(101, 1156, 4, array( 224,  442,  644,  750)),
-            array(105, 1258, 4, array( 252,  476,  690,  816)),
-            array(109, 1364, 4, array( 270,  504,  750,  900)),
-            array(113, 1474, 4, array( 300,  560,  810,  960)),
-            array(117, 1588, 4, array( 312,  588,  870, 1050)), //25
-            array(121, 1706, 4, array( 336,  644,  952, 1110)),
-            array(125, 1828, 4, array( 360,  700, 1020, 1200)),
-            array(129, 1921, 3, array( 390,  728, 1050, 1260)),
-            array(133, 2051, 3, array( 420,  784, 1140, 1350)),
-            array(137, 2185, 3, array( 450,  812, 1200, 1440)), //30
-            array(141, 2323, 3, array( 480,  868, 1290, 1530)),
-            array(145, 2465, 3, array( 510,  924, 1350, 1620)),
-            array(149, 2611, 3, array( 540,  980, 1440, 1710)),
-            array(153, 2761, 3, array( 570, 1036, 1530, 1800)),
-            array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35
-            array(161, 3034, 0, array( 600, 1120, 1680, 1980)),
-            array(165, 3196, 0, array( 630, 1204, 1770, 2100)),
-            array(169, 3362, 0, array( 660, 1260, 1860, 2220)),
-            array(173, 3532, 0, array( 720, 1316, 1950, 2310)),
-            array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40
-        );
-        
-        //----------------------------------------------------------------------
-        public static function getDataLength($version, $level)
-        {
-            return self::$capacity[$version][QRCAP_WORDS] - self::$capacity[$version][QRCAP_EC][$level];
-        }
-        
-        //----------------------------------------------------------------------
-        public static function getECCLength($version, $level)
-        {
-            return self::$capacity[$version][QRCAP_EC][$level];
-        }
-        
-        //----------------------------------------------------------------------
-        public static function getWidth($version)
-        {
-            return self::$capacity[$version][QRCAP_WIDTH];
-        }
-        
-        //----------------------------------------------------------------------
-        public static function getRemainder($version)
-        {
-            return self::$capacity[$version][QRCAP_REMINDER];
-        }
-        
-        //----------------------------------------------------------------------
-        public static function getMinimumVersion($size, $level)
-        {
-
-            for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
-                $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
-                if($words >= $size) 
-                    return $i;
-            }
-
-            return -1;
-        }
-    
-        //######################################################################
-        
-        public static $lengthTableBits = array(
-            array(10, 12, 14),
-            array( 9, 11, 13),
-            array( 8, 16, 16),
-            array( 8, 10, 12)
-        );
-        
-        //----------------------------------------------------------------------
-        public static function lengthIndicator($mode, $version)
-        {
-            if ($mode == QR_MODE_STRUCTURE)
-                return 0;
-                
-            if ($version <= 9) {
-                $l = 0;
-            } else if ($version <= 26) {
-                $l = 1;
-            } else {
-                $l = 2;
-            }
-
-            return self::$lengthTableBits[$mode][$l];
-        }
-        
-        //----------------------------------------------------------------------
-        public static function maximumWords($mode, $version)
-        {
-            if($mode == QR_MODE_STRUCTURE) 
-                return 3;
-                
-            if($version <= 9) {
-                $l = 0;
-            } else if($version <= 26) {
-                $l = 1;
-            } else {
-                $l = 2;
-            }
-
-            $bits = self::$lengthTableBits[$mode][$l];
-            $words = (1 << $bits) - 1;
-            
-            if($mode == QR_MODE_KANJI) {
-                $words *= 2; // the number of bytes is required
-            }
-
-            return $words;
-        }
-
-        // Error correction code -----------------------------------------------
-        // Table of the error correction code (Reed-Solomon block)
-        // See Table 12-16 (pp.30-36), JIS X0510:2004.
-
-        public static $eccTable = array(
-            array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)),
-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), // 1
-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)),
-            array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)),
-            array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)),
-            array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), // 5
-            array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)),
-            array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)),
-            array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)),
-            array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)),
-            array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), //10
-            array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)),
-            array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)),
-            array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)),
-            array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)),
-            array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), //15
-            array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)),
-            array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)),
-            array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)),
-            array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)),
-            array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), //20
-            array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)),
-            array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)),
-            array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)),
-            array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)),
-            array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), //25
-            array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)),
-            array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)),
-            array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)),
-            array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)),
-            array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30
-            array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)),
-            array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)),
-            array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)),
-            array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)),
-            array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), //35
-            array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)),
-            array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)),
-            array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),
-            array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),
-            array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40
-        );                                                                       
-
-        //----------------------------------------------------------------------
-        // CACHEABLE!!!
-        
-        public static function getEccSpec($version, $level, array &$spec)
-        {
-            if (count($spec) < 5) {
-                $spec = array(0,0,0,0,0);
-            }
-
-            $b1   = self::$eccTable[$version][$level][0];
-            $b2   = self::$eccTable[$version][$level][1];
-            $data = self::getDataLength($version, $level);
-            $ecc  = self::getECCLength($version, $level);
-
-            if($b2 == 0) {
-                $spec[0] = $b1;
-                $spec[1] = (int)($data / $b1);
-                $spec[2] = (int)($ecc / $b1);
-                $spec[3] = 0; 
-                $spec[4] = 0;
-            } else {
-                $spec[0] = $b1;
-                $spec[1] = (int)($data / ($b1 + $b2));
-                $spec[2] = (int)($ecc  / ($b1 + $b2));
-                $spec[3] = $b2;
-                $spec[4] = $spec[1] + 1;
-            }
-        }
-
-        // Alignment pattern ---------------------------------------------------
-
-        // Positions of alignment patterns.
-        // This array includes only the second and the third position of the 
-        // alignment patterns. Rest of them can be calculated from the distance 
-        // between them.
-         
-        // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
-         
-        public static $alignmentPattern = array(      
-            array( 0,  0),
-            array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5
-            array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
-            array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15
-            array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20
-            array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25
-            array(30, 58), array(34, 62), array(26, 50), array(30, 54), array(26, 52), //26-30
-            array(30, 56), array(34, 60), array(30, 58), array(34, 62), array(30, 54), //31-35
-            array(24, 50), array(28, 54), array(32, 58), array(26, 54), array(30, 58), //35-40
-        );                                                                                  
-
-        
-        /** --------------------------------------------------------------------
-         * Put an alignment marker.
-         * @param frame
-         * @param width
-         * @param ox,oy center coordinate of the pattern
-         */
-        public static function putAlignmentMarker(array &$frame, $ox, $oy)
-        {
-            $finder = array(
-                "\xa1\xa1\xa1\xa1\xa1",
-                "\xa1\xa0\xa0\xa0\xa1",
-                "\xa1\xa0\xa1\xa0\xa1",
-                "\xa1\xa0\xa0\xa0\xa1",
-                "\xa1\xa1\xa1\xa1\xa1"
-            );                        
-            
-            $yStart = $oy-2;         
-            $xStart = $ox-2;
-            
-            for($y=0; $y<5; $y++) {
-                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);
-            }
-        }
-
-        //----------------------------------------------------------------------
-        public static function putAlignmentPattern($version, &$frame, $width)
-        {
-            if($version < 2)
-                return;
-
-            $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
-            if($d < 0) {
-                $w = 2;
-            } else {
-                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);
-            }
-
-            if($w * $w - 3 == 1) {
-                $x = self::$alignmentPattern[$version][0];
-                $y = self::$alignmentPattern[$version][0];
-                self::putAlignmentMarker($frame, $x, $y);
-                return;
-            }
-
-            $cx = self::$alignmentPattern[$version][0];
-            for($x=1; $x<$w - 1; $x++) {
-                self::putAlignmentMarker($frame, 6, $cx);
-                self::putAlignmentMarker($frame, $cx,  6);
-                $cx += $d;
-            }
-
-            $cy = self::$alignmentPattern[$version][0];
-            for($y=0; $y<$w-1; $y++) {
-                $cx = self::$alignmentPattern[$version][0];
-                for($x=0; $x<$w-1; $x++) {
-                    self::putAlignmentMarker($frame, $cx, $cy);
-                    $cx += $d;
-                }
-                $cy += $d;
-            }
-        }
-
-        // Version information pattern -----------------------------------------
-
-		// Version information pattern (BCH coded).
-        // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
-        
-		// size: [QRSPEC_VERSION_MAX - 6]
-		
-        public static $versionPattern = array(
-            0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,
-            0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9,
-            0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75,
-            0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64,
-            0x27541, 0x28c69
-        );
-
-        //----------------------------------------------------------------------
-        public static function getVersionPattern($version)
-        {
-            if($version < 7 || $version > QRSPEC_VERSION_MAX)
-                return 0;
-
-            return self::$versionPattern[$version -7];
-        }
-
-        // Format information --------------------------------------------------
-        // See calcFormatInfo in tests/test_qrspec.c (orginal qrencode c lib)
-        
-        public static $formatInfo = array(
-            array(0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976),
-            array(0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0),
-            array(0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed),
-            array(0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b)
-        );
-
-        public static function getFormatInfo($mask, $level)
-        {
-            if($mask < 0 || $mask > 7)
-                return 0;
-                
-            if($level < 0 || $level > 3)
-                return 0;                
-
-            return self::$formatInfo[$level][$mask];
-        }
-
-        // Frame ---------------------------------------------------------------
-        // Cache of initial frames.
-         
-        public static $frames = array();
-
-        /** --------------------------------------------------------------------
-         * Put a finder pattern.
-         * @param frame
-         * @param width
-         * @param ox,oy upper-left coordinate of the pattern
-         */
-        public static function putFinderPattern(&$frame, $ox, $oy)
-        {
-            $finder = array(
-                "\xc1\xc1\xc1\xc1\xc1\xc1\xc1",
-                "\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
-                "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-                "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-                "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-                "\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
-                "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
-            );                            
-            
-            for($y=0; $y<7; $y++) {
-                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);
-            }
-        }
-
-        //----------------------------------------------------------------------
-        public static function createFrame($version)
-        {
-            $width = self::$capacity[$version][QRCAP_WIDTH];
-            $frameLine = str_repeat ("\0", $width);
-            $frame = array_fill(0, $width, $frameLine);
-
-            // Finder pattern
-            self::putFinderPattern($frame, 0, 0);
-            self::putFinderPattern($frame, $width - 7, 0);
-            self::putFinderPattern($frame, 0, $width - 7);
-            
-            // Separator
-            $yOffset = $width - 7;
-            
-            for($y=0; $y<7; $y++) {
-                $frame[$y][7] = "\xc0";
-                $frame[$y][$width - 8] = "\xc0";
-                $frame[$yOffset][7] = "\xc0";
-                $yOffset++;
-            }
-            
-            $setPattern = str_repeat("\xc0", 8);
-            
-            QRstr::set($frame, 0, 7, $setPattern);
-            QRstr::set($frame, $width-8, 7, $setPattern);
-            QRstr::set($frame, 0, $width - 8, $setPattern);
-        
-            // Format info
-            $setPattern = str_repeat("\x84", 9);
-            QRstr::set($frame, 0, 8, $setPattern);
-            QRstr::set($frame, $width - 8, 8, $setPattern, 8);
-            
-            $yOffset = $width - 8;
-
-            for($y=0; $y<8; $y++,$yOffset++) {
-                $frame[$y][8] = "\x84";
-                $frame[$yOffset][8] = "\x84";
-            }
-
-            // Timing pattern  
-            
-            for($i=1; $i<$width-15; $i++) {
-                $frame[6][7+$i] = chr(0x90 | ($i & 1));
-                $frame[7+$i][6] = chr(0x90 | ($i & 1));
-            }
-            
-            // Alignment pattern  
-            self::putAlignmentPattern($version, $frame, $width);
-            
-            // Version information 
-            if($version >= 7) {
-                $vinf = self::getVersionPattern($version);
-
-                $v = $vinf;
-                
-                for($x=0; $x<6; $x++) {
-                    for($y=0; $y<3; $y++) {
-                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
-                        $v = $v >> 1;
-                    }
-                }
-
-                $v = $vinf;
-                for($y=0; $y<6; $y++) {
-                    for($x=0; $x<3; $x++) {
-                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
-                        $v = $v >> 1;
-                    }
-                }
-            }
-    
-            // and a little bit...  
-            $frame[$width - 8][8] = "\x81";
-            
-            return $frame;
-        }
-
-        //----------------------------------------------------------------------
-        public static function debug($frame, $binary_mode = false)
-        {
-            if ($binary_mode) {
-            
-                    foreach ($frame as &$frameLine) {
-                        $frameLine = join('<span class="m">&nbsp;&nbsp;</span>', explode('0', $frameLine));
-                        $frameLine = join('&#9608;&#9608;', explode('1', $frameLine));
-                    }
-                    
-                    ?>
-                <style>
-                    .m { background-color: white; }
-                </style>
-                <?php
-                    echo '<pre><tt><br/ ><br/ ><br/ >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-                    echo join("<br/ >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $frame);
-                    echo '</tt></pre><br/ ><br/ ><br/ ><br/ ><br/ ><br/ >';
-            
-            } else {
-            
-                foreach ($frame as &$frameLine) {
-                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));
-                    $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));
-                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));
-                    $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));
-                    $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0
-                    $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1
-                    $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit
-                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0
-                    $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1
-                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version
-                    $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version
-                    $frameLine = join('&#9830;', explode("\x01", $frameLine));
-                    $frameLine = join('&#8901;', explode("\0", $frameLine));
-                }
-                
-                ?>
-                <style>
-                    .p { background-color: yellow; }
-                    .m { background-color: #00FF00; }
-                    .s { background-color: #FF0000; }
-                    .c { background-color: aqua; }
-                    .x { background-color: pink; }
-                    .f { background-color: gold; }
-                </style>
-                <?php
-                echo "<pre><tt>";
-                echo join("<br/ >", $frame);
-                echo "</tt></pre>";
-            
-            }
-        }
-
-        //----------------------------------------------------------------------
-        public static function serial($frame)
-        {
-            return gzcompress(join("\n", $frame), 9);
-        }
-        
-        //----------------------------------------------------------------------
-        public static function unserial($code)
-        {
-            return explode("\n", gzuncompress($code));
-        }
-        
-        //----------------------------------------------------------------------
-        public static function newFrame($version)
-        {
-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
-                return null;
-
-            if(!isset(self::$frames[$version])) {
-                
-                $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';
-                
-                if (QR_CACHEABLE) {
-                    if (file_exists($fileName)) {
-                        self::$frames[$version] = self::unserial(file_get_contents($fileName));
-                    } else {
-                        self::$frames[$version] = self::createFrame($version);
-                        file_put_contents($fileName, self::serial(self::$frames[$version]));
-                    }
-                } else {
-                    self::$frames[$version] = self::createFrame($version);
-                }
-            }
-            
-            if(is_null(self::$frames[$version]))
-                return null;
-
-            return self::$frames[$version];
-        }
-
-        //----------------------------------------------------------------------
-        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }
-        public static function rsBlockNum1($spec)    { return $spec[0]; }
-        public static function rsDataCodes1($spec)   { return $spec[1]; }
-        public static function rsEccCodes1($spec)    { return $spec[2]; }
-        public static function rsBlockNum2($spec)    { return $spec[3]; }
-        public static function rsDataCodes2($spec)   { return $spec[4]; }
-        public static function rsEccCodes2($spec)    { return $spec[2]; }
-        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }
-        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }
-        
-    }
-
-
-
-//---- qrimage.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Image output of code using GD2
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-    define('QR_IMAGE', true);
-
-    class QRimage {
-    
-        //----------------------------------------------------------------------
-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) 
-        {
-            $image = self::image($frame, $pixelPerPoint, $outerFrame);
-            
-            if ($filename === false) {
-                Header("Content-type: image/png");
-                ImagePng($image);
-            } else {
-                if($saveandprint===TRUE){
-                    ImagePng($image, $filename);
-                    header("Content-type: image/png");
-                    ImagePng($image);
-                }else{
-                    ImagePng($image, $filename);
-                }
-            }
-            
-            ImageDestroy($image);
-        }
-    
-        //----------------------------------------------------------------------
-        public static function jpg($frame, $filename = false, $pixelPerPoint = 8, $outerFrame = 4, $q = 85) 
-        {
-            $image = self::image($frame, $pixelPerPoint, $outerFrame);
-            
-            if ($filename === false) {
-                Header("Content-type: image/jpeg");
-                ImageJpeg($image, null, $q);
-            } else {
-                ImageJpeg($image, $filename, $q);            
-            }
-            
-            ImageDestroy($image);
-        }
-    
-        //----------------------------------------------------------------------
-        private static function image($frame, $pixelPerPoint = 4, $outerFrame = 4) 
-        {
-            $h = count($frame);
-            $w = strlen($frame[0]);
-            
-            $imgW = $w + 2*$outerFrame;
-            $imgH = $h + 2*$outerFrame;
-            
-            $base_image =ImageCreate($imgW, $imgH);
-            
-            $col[0] = ImageColorAllocate($base_image,255,255,255);
-            $col[1] = ImageColorAllocate($base_image,0,0,0);
-
-            imagefill($base_image, 0, 0, $col[0]);
-
-            for($y=0; $y<$h; $y++) {
-                for($x=0; $x<$w; $x++) {
-                    if ($frame[$y][$x] == '1') {
-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 
-                    }
-                }
-            }
-            
-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);
-            ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);
-            ImageDestroy($base_image);
-            
-            return $target_image;
-        }
-    }
-
-
-
-//---- qrinput.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Input encoding class
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-    define('STRUCTURE_HEADER_BITS',  20);
-    define('MAX_STRUCTURED_SYMBOLS', 16);
-
-    class QRinputItem {
-    
-        public $mode;
-        public $size;
-        public $data;
-        public $bstream;
-
-        public function __construct($mode, $size, $data, $bstream = null) 
-        {
-            $setData = array_slice($data, 0, $size);
-            
-            if (count($setData) < $size) {
-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));
-            }
-        
-            if(!QRinput::check($mode, $size, $setData)) {
-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));
-                return null;
-            }
-            
-            $this->mode = $mode;
-            $this->size = $size;
-            $this->data = $setData;
-            $this->bstream = $bstream;
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeModeNum($version)
-        {
-            try {
-            
-                $words = (int)($this->size / 3);
-                $bs = new QRbitstream();
-                
-                $val = 0x1;
-                $bs->appendNum(4, $val);
-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);
-
-                for($i=0; $i<$words; $i++) {
-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;
-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;
-                    $val += (ord($this->data[$i*3+2]) - ord('0'));
-                    $bs->appendNum(10, $val);
-                }
-
-                if($this->size - $words * 3 == 1) {
-                    $val = ord($this->data[$words*3]) - ord('0');
-                    $bs->appendNum(4, $val);
-                } else if($this->size - $words * 3 == 2) {
-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;
-                    $val += (ord($this->data[$words*3+1]) - ord('0'));
-                    $bs->appendNum(7, $val);
-                }
-
-                $this->bstream = $bs;
-                return 0;
-                
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeModeAn($version)
-        {
-            try {
-                $words = (int)($this->size / 2);
-                $bs = new QRbitstream();
-                
-                $bs->appendNum(4, 0x02);
-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);
-
-                for($i=0; $i<$words; $i++) {
-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;
-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));
-
-                    $bs->appendNum(11, $val);
-                }
-
-                if($this->size & 1) {
-                    $val = QRinput::lookAnTable(ord($this->data[$words * 2]));
-                    $bs->appendNum(6, $val);
-                }
-        
-                $this->bstream = $bs;
-                return 0;
-            
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeMode8($version)
-        {
-            try {
-                $bs = new QRbitstream();
-
-                $bs->appendNum(4, 0x4);
-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);
-
-                for($i=0; $i<$this->size; $i++) {
-                    $bs->appendNum(8, ord($this->data[$i]));
-                }
-
-                $this->bstream = $bs;
-                return 0;
-            
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeModeKanji($version)
-        {
-            try {
-
-                $bs = new QRbitrtream();
-                
-                $bs->appendNum(4, 0x8);
-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));
-
-                for($i=0; $i<$this->size; $i+=2) {
-                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);
-                    if($val <= 0x9ffc) {
-                        $val -= 0x8140;
-                    } else {
-                        $val -= 0xc140;
-                    }
-                    
-                    $h = ($val >> 8) * 0xc0;
-                    $val = ($val & 0xff) + $h;
-
-                    $bs->appendNum(13, $val);
-                }
-
-                $this->bstream = $bs;
-                return 0;
-            
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-
-        //----------------------------------------------------------------------
-        public function encodeModeStructure()
-        {
-            try {
-                $bs =  new QRbitstream();
-                
-                $bs->appendNum(4, 0x03);
-                $bs->appendNum(4, ord($this->data[1]) - 1);
-                $bs->appendNum(4, ord($this->data[0]) - 1);
-                $bs->appendNum(8, ord($this->data[2]));
-
-                $this->bstream = $bs;
-                return 0;
-            
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public function estimateBitStreamSizeOfEntry($version)
-        {
-            $bits = 0;
-
-            if($version == 0) 
-                $version = 1;
-
-            switch($this->mode) {
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
-                default:
-                    return 0;
-            }
-
-            $l = QRspec::lengthIndicator($this->mode, $version);
-            $m = 1 << $l;
-            $num = (int)(($this->size + $m - 1) / $m);
-
-            $bits += $num * (4 + $l);
-
-            return $bits;
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeBitStream($version)
-        {
-            try {
-            
-                unset($this->bstream);
-                $words = QRspec::maximumWords($this->mode, $version);
-                
-                if($this->size > $words) {
-                
-                    $st1 = new QRinputItem($this->mode, $words, $this->data);
-                    $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));
-
-                    $st1->encodeBitStream($version);
-                    $st2->encodeBitStream($version);
-                    
-                    $this->bstream = new QRbitstream();
-                    $this->bstream->append($st1->bstream);
-                    $this->bstream->append($st2->bstream);
-                    
-                    unset($st1);
-                    unset($st2);
-                    
-                } else {
-                    
-                    $ret = 0;
-                    
-                    switch($this->mode) {
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
-                        
-                        default:
-                            break;
-                    }
-                    
-                    if($ret < 0)
-                        return -1;
-                }
-
-                return $this->bstream->size();
-            
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-    };
-    
-    //##########################################################################
-
-    class QRinput {
-
-        public $items;
-        
-        private $version;
-        private $level;
-        
-        //----------------------------------------------------------------------
-        public function __construct($version = 0, $level = QR_ECLEVEL_L)
-        {
-            if ($version < 0 || $version > QRSPEC_VERSION_MAX || $level > QR_ECLEVEL_H) {
-                throw new Exception('Invalid version no');
-                return NULL;
-            }
-            
-            $this->version = $version;
-            $this->level = $level;
-        }
-        
-        //----------------------------------------------------------------------
-        public function getVersion()
-        {
-            return $this->version;
-        }
-        
-        //----------------------------------------------------------------------
-        public function setVersion($version)
-        {
-            if($version < 0 || $version > QRSPEC_VERSION_MAX) {
-                throw new Exception('Invalid version no');
-                return -1;
-            }
-
-            $this->version = $version;
-
-            return 0;
-        }
-        
-        //----------------------------------------------------------------------
-        public function getErrorCorrectionLevel()
-        {
-            return $this->level;
-        }
-
-        //----------------------------------------------------------------------
-        public function setErrorCorrectionLevel($level)
-        {
-            if($level > QR_ECLEVEL_H) {
-                throw new Exception('Invalid ECLEVEL');
-                return -1;
-            }
-
-            $this->level = $level;
-
-            return 0;
-        }
-        
-        //----------------------------------------------------------------------
-        public function appendEntry(QRinputItem $entry)
-        {
-            $this->items[] = $entry;
-        }
-        
-        //----------------------------------------------------------------------
-        public function append($mode, $size, $data)
-        {
-            try {
-                $entry = new QRinputItem($mode, $size, $data);
-                $this->items[] = $entry;
-                return 0;
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        
-        public function insertStructuredAppendHeader($size, $index, $parity)
-        {
-            if( $size > MAX_STRUCTURED_SYMBOLS ) {
-                throw new Exception('insertStructuredAppendHeader wrong size');
-            }
-            
-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {
-                throw new Exception('insertStructuredAppendHeader wrong index');
-            }
-
-            $buf = array($size, $index, $parity);
-            
-            try {
-                $entry = new QRinputItem(QR_MODE_STRUCTURE, 3, buf);
-                array_unshift($this->items, $entry);
-                return 0;
-            } catch (Exception $e) {
-                return -1;
-            }
-        }
-
-        //----------------------------------------------------------------------
-        public function calcParity()
-        {
-            $parity = 0;
-            
-            foreach($this->items as $item) {
-                if($item->mode != QR_MODE_STRUCTURE) {
-                    for($i=$item->size-1; $i>=0; $i--) {
-                        $parity ^= $item->data[$i];
-                    }
-                }
-            }
-
-            return $parity;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function checkModeNum($size, $data)
-        {
-            for($i=0; $i<$size; $i++) {
-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        //----------------------------------------------------------------------
-        public static function estimateBitsModeNum($size)
-        {
-            $w = (int)$size / 3;
-            $bits = $w * 10;
-            
-            switch($size - $w * 3) {
-                case 1:
-                    $bits += 4;
-                    break;
-                case 2:
-                    $bits += 7;
-                    break;
-                default:
-                    break;
-            }
-
-            return $bits;
-        }
-        
-        //----------------------------------------------------------------------
-        public static $anTable = array(
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
-            -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
-            25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-        );
-        
-        //----------------------------------------------------------------------
-        public static function lookAnTable($c)
-        {
-            return (($c > 127)?-1:self::$anTable[$c]);
-        }
-        
-        //----------------------------------------------------------------------
-        public static function checkModeAn($size, $data)
-        {
-            for($i=0; $i<$size; $i++) {
-                if (self::lookAnTable(ord($data[$i])) == -1) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function estimateBitsModeAn($size)
-        {
-            $w = (int)($size / 2);
-            $bits = $w * 11;
-            
-            if($size & 1) {
-                $bits += 6;
-            }
-
-            return $bits;
-        }
-    
-        //----------------------------------------------------------------------
-        public static function estimateBitsMode8($size)
-        {
-            return $size * 8;
-        }
-        
-        //----------------------------------------------------------------------
-        public function estimateBitsModeKanji($size)
-        {
-            return (int)(($size / 2) * 13);
-        }
-        
-        //----------------------------------------------------------------------
-        public static function checkModeKanji($size, $data)
-        {
-            if($size & 1)
-                return false;
-
-            for($i=0; $i<$size; $i+=2) {
-                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
-                if( $val < 0x8140 
-                || ($val > 0x9ffc && $val < 0xe040) 
-                || $val > 0xebbf) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        /***********************************************************************
-         * Validation
-         **********************************************************************/
-
-        public static function check($mode, $size, $data)
-        {
-            if($size <= 0) 
-                return false;
-
-            switch($mode) {
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
-                case QR_MODE_8:         return true; break;
-                case QR_MODE_STRUCTURE: return true; break;
-                
-                default:
-                    break;
-            }
-
-            return false;
-        }
-        
-        
-        //----------------------------------------------------------------------
-        public function estimateBitStreamSize($version)
-        {
-            $bits = 0;
-
-            foreach($this->items as $item) {
-                $bits += $item->estimateBitStreamSizeOfEntry($version);
-            }
-
-            return $bits;
-        }
-        
-        //----------------------------------------------------------------------
-        public function estimateVersion()
-        {
-            $version = 0;
-            $prev = 0;
-            do {
-                $prev = $version;
-                $bits = $this->estimateBitStreamSize($prev);
-                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-                if ($version < 0) {
-                    return -1;
-                }
-            } while ($version > $prev);
-
-            return $version;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function lengthOfCode($mode, $version, $bits)
-        {
-            $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
-            switch($mode) {
-                case QR_MODE_NUM:
-                    $chunks = (int)($payload / 10);
-                    $remain = $payload - $chunks * 10;
-                    $size = $chunks * 3;
-                    if($remain >= 7) {
-                        $size += 2;
-                    } else if($remain >= 4) {
-                        $size += 1;
-                    }
-                    break;
-                case QR_MODE_AN:
-                    $chunks = (int)($payload / 11);
-                    $remain = $payload - $chunks * 11;
-                    $size = $chunks * 2;
-                    if($remain >= 6) 
-                        $size++;
-                    break;
-                case QR_MODE_8:
-                    $size = (int)($payload / 8);
-                    break;
-                case QR_MODE_KANJI:
-                    $size = (int)(($payload / 13) * 2);
-                    break;
-                case QR_MODE_STRUCTURE:
-                    $size = (int)($payload / 8);
-                    break;
-                default:
-                    $size = 0;
-                    break;
-            }
-            
-            $maxsize = QRspec::maximumWords($mode, $version);
-            if($size < 0) $size = 0;
-            if($size > $maxsize) $size = $maxsize;
-
-            return $size;
-        }
-        
-        //----------------------------------------------------------------------
-        public function createBitStream()
-        {
-            $total = 0;
-
-            foreach($this->items as $item) {
-                $bits = $item->encodeBitStream($this->version);
-                
-                if($bits < 0) 
-                    return -1;
-                    
-                $total += $bits;
-            }
-
-            return $total;
-        }
-        
-        //----------------------------------------------------------------------
-        public function convertData()
-        {
-            $ver = $this->estimateVersion();
-            if($ver > $this->getVersion()) {
-                $this->setVersion($ver);
-            }
-
-            for(;;) {
-                $bits = $this->createBitStream();
-                
-                if($bits < 0) 
-                    return -1;
-                    
-                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-                if($ver < 0) {
-                    throw new Exception('WRONG VERSION');
-                    return -1;
-                } else if($ver > $this->getVersion()) {
-                    $this->setVersion($ver);
-                } else {
-                    break;
-                }
-            }
-
-            return 0;
-        }
-        
-        //----------------------------------------------------------------------
-        public function appendPaddingBit(&$bstream)
-        {
-            $bits = $bstream->size();
-            $maxwords = QRspec::getDataLength($this->version, $this->level);
-            $maxbits = $maxwords * 8;
-
-            if ($maxbits == $bits) {
-                return 0;
-            }
-
-            if ($maxbits - $bits < 5) {
-                return $bstream->appendNum($maxbits - $bits, 0);
-            }
-
-            $bits += 4;
-            $words = (int)(($bits + 7) / 8);
-
-            $padding = new QRbitstream();
-            $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
-            
-            if($ret < 0) 
-                return $ret;
-
-            $padlen = $maxwords - $words;
-            
-            if($padlen > 0) {
-                
-                $padbuf = array();
-                for($i=0; $i<$padlen; $i++) {
-                    $padbuf[$i] = ($i&1)?0x11:0xec;
-                }
-                
-                $ret = $padding->appendBytes($padlen, $padbuf);
-                
-                if($ret < 0)
-                    return $ret;
-                
-            }
-
-            $ret = $bstream->append($padding);
-            
-            return $ret;
-        }
-
-        //----------------------------------------------------------------------
-        public function mergeBitStream()
-        {
-            if($this->convertData() < 0) {
-                return null;
-            }
-
-            $bstream = new QRbitstream();
-            
-            foreach($this->items as $item) {
-                $ret = $bstream->append($item->bstream);
-                if($ret < 0) {
-                    return null;
-                }
-            }
-
-            return $bstream;
-        }
-
-        //----------------------------------------------------------------------
-        public function getBitStream()
-        {
-
-            $bstream = $this->mergeBitStream();
-            
-            if($bstream == null) {
-                return null;
-            }
-            
-            $ret = $this->appendPaddingBit($bstream);
-            if($ret < 0) {
-                return null;
-            }
-
-            return $bstream;
-        }
-        
-        //----------------------------------------------------------------------
-        public function getByteStream()
-        {
-            $bstream = $this->getBitStream();
-            if($bstream == null) {
-                return null;
-            }
-            
-            return $bstream->toByte();
-        }
-    }
-        
-        
-    
-
-
-
-//---- qrbitstream.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Bitstream class
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-     
-    class QRbitstream {
-    
-        public $data = array();
-        
-        //----------------------------------------------------------------------
-        public function size()
-        {
-            return count($this->data);
-        }
-        
-        //----------------------------------------------------------------------
-        public function allocate($setLength)
-        {
-            $this->data = array_fill(0, $setLength, 0);
-            return 0;
-        }
-    
-        //----------------------------------------------------------------------
-        public static function newFromNum($bits, $num)
-        {
-            $bstream = new QRbitstream();
-            $bstream->allocate($bits);
-            
-            $mask = 1 << ($bits - 1);
-            for($i=0; $i<$bits; $i++) {
-                if($num & $mask) {
-                    $bstream->data[$i] = 1;
-                } else {
-                    $bstream->data[$i] = 0;
-                }
-                $mask = $mask >> 1;
-            }
-
-            return $bstream;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function newFromBytes($size, $data)
-        {
-            $bstream = new QRbitstream();
-            $bstream->allocate($size * 8);
-            $p=0;
-
-            for($i=0; $i<$size; $i++) {
-                $mask = 0x80;
-                for($j=0; $j<8; $j++) {
-                    if($data[$i] & $mask) {
-                        $bstream->data[$p] = 1;
-                    } else {
-                        $bstream->data[$p] = 0;
-                    }
-                    $p++;
-                    $mask = $mask >> 1;
-                }
-            }
-
-            return $bstream;
-        }
-        
-        //----------------------------------------------------------------------
-        public function append(QRbitstream $arg)
-        {
-            if (is_null($arg)) {
-                return -1;
-            }
-            
-            if($arg->size() == 0) {
-                return 0;
-            }
-            
-            if($this->size() == 0) {
-                $this->data = $arg->data;
-                return 0;
-            }
-            
-            $this->data = array_values(array_merge($this->data, $arg->data));
-
-            return 0;
-        }
-        
-        //----------------------------------------------------------------------
-        public function appendNum($bits, $num)
-        {
-            if ($bits == 0) 
-                return 0;
-
-            $b = QRbitstream::newFromNum($bits, $num);
-            
-            if(is_null($b))
-                return -1;
-
-            $ret = $this->append($b);
-            unset($b);
-
-            return $ret;
-        }
-
-        //----------------------------------------------------------------------
-        public function appendBytes($size, $data)
-        {
-            if ($size == 0) 
-                return 0;
-
-            $b = QRbitstream::newFromBytes($size, $data);
-            
-            if(is_null($b))
-                return -1;
-
-            $ret = $this->append($b);
-            unset($b);
-
-            return $ret;
-        }
-        
-        //----------------------------------------------------------------------
-        public function toByte()
-        {
-        
-            $size = $this->size();
-
-            if($size == 0) {
-                return array();
-            }
-            
-            $data = array_fill(0, (int)(($size + 7) / 8), 0);
-            $bytes = (int)($size / 8);
-
-            $p = 0;
-            
-            for($i=0; $i<$bytes; $i++) {
-                $v = 0;
-                for($j=0; $j<8; $j++) {
-                    $v = $v << 1;
-                    $v |= $this->data[$p];
-                    $p++;
-                }
-                $data[$i] = $v;
-            }
-            
-            if($size & 7) {
-                $v = 0;
-                for($j=0; $j<($size & 7); $j++) {
-                    $v = $v << 1;
-                    $v |= $this->data[$p];
-                    $p++;
-                }
-                $data[$bytes] = $v;
-            }
-
-            return $data;
-        }
-
-    }
-
-
-
-
-//---- qrsplit.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Input splitting classes
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * The following data / specifications are taken from
- * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004)
- *  or
- * "Automatic identification and data capture techniques -- 
- *  QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-    class QRsplit {
-
-        public $dataStr = '';
-        public $input;
-        public $modeHint;
-
-        //----------------------------------------------------------------------
-        public function __construct($dataStr, $input, $modeHint) 
-        {
-            $this->dataStr  = $dataStr;
-            $this->input    = $input;
-            $this->modeHint = $modeHint;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function isdigitat($str, $pos)
-        {    
-            if ($pos >= strlen($str))
-                return false;
-            
-            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
-        }
-        
-        //----------------------------------------------------------------------
-        public static function isalnumat($str, $pos)
-        {
-            if ($pos >= strlen($str))
-                return false;
-                
-            return (QRinput::lookAnTable(ord($str[$pos])) >= 0);
-        }
-
-        //----------------------------------------------------------------------
-        public function identifyMode($pos)
-        {
-            if ($pos >= strlen($this->dataStr)) 
-                return QR_MODE_NUL;
-                
-            $c = $this->dataStr[$pos];
-            
-            if(self::isdigitat($this->dataStr, $pos)) {
-                return QR_MODE_NUM;
-            } else if(self::isalnumat($this->dataStr, $pos)) {
-                return QR_MODE_AN;
-            } else if($this->modeHint == QR_MODE_KANJI) {
-            
-                if ($pos+1 < strlen($this->dataStr)) 
-                {
-                    $d = $this->dataStr[$pos+1];
-                    $word = (ord($c) << 8) | ord($d);
-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
-                        return QR_MODE_KANJI;
-                    }
-                }
-            }
-
-            return QR_MODE_8;
-        } 
-        
-        //----------------------------------------------------------------------
-        public function eatNum()
-        {
-            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
-
-            $p = 0;
-            while(self::isdigitat($this->dataStr, $p)) {
-                $p++;
-            }
-            
-            $run = $p;
-            $mode = $this->identifyMode($p);
-            
-            if($mode == QR_MODE_8) {
-                $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
-                     + QRinput::estimateBitsMode8(1)         // + 4 + l8
-                     - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
-                if($dif > 0) {
-                    return $this->eat8();
-                }
-            }
-            if($mode == QR_MODE_AN) {
-                $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
-                     + QRinput::estimateBitsModeAn(1)        // + 4 + la
-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la
-                if($dif > 0) {
-                    return $this->eatAn();
-                }
-            }
-            
-            $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
-            if($ret < 0)
-                return -1;
-
-            return $run;
-        }
-        
-        //----------------------------------------------------------------------
-        public function eatAn()
-        {
-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());
-            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
-
-            $p = 0;
-            
-            while(self::isalnumat($this->dataStr, $p)) {
-                if(self::isdigitat($this->dataStr, $p)) {
-                    $q = $p;
-                    while(self::isdigitat($this->dataStr, $q)) {
-                        $q++;
-                    }
-                    
-                    $dif = QRinput::estimateBitsModeAn($p) // + 4 + la
-                         + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
-                         - QRinput::estimateBitsModeAn($q); // - 4 - la
-                         
-                    if($dif < 0) {
-                        break;
-                    } else {
-                        $p = $q;
-                    }
-                } else {
-                    $p++;
-                }
-            }
-
-            $run = $p;
-
-            if(!self::isalnumat($this->dataStr, $p)) {
-                $dif = QRinput::estimateBitsModeAn($run) + 4 + $la
-                     + QRinput::estimateBitsMode8(1) // + 4 + l8
-                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
-                if($dif > 0) {
-                    return $this->eat8();
-                }
-            }
-
-            $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
-            if($ret < 0)
-                return -1;
-
-            return $run;
-        }
-        
-        //----------------------------------------------------------------------
-        public function eatKanji()
-        {
-            $p = 0;
-            
-            while($this->identifyMode($p) == QR_MODE_KANJI) {
-                $p += 2;
-            }
-            
-            $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
-            if($ret < 0)
-                return -1;
-
-            return $run;
-        }
-
-        //----------------------------------------------------------------------
-        public function eat8()
-        {
-            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());
-            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
-
-            $p = 1;
-            $dataStrLen = strlen($this->dataStr);
-            
-            while($p < $dataStrLen) {
-                
-                $mode = $this->identifyMode($p);
-                if($mode == QR_MODE_KANJI) {
-                    break;
-                }
-                if($mode == QR_MODE_NUM) {
-                    $q = $p;
-                    while(self::isdigitat($this->dataStr, $q)) {
-                        $q++;
-                    }
-                    $dif = QRinput::estimateBitsMode8($p) // + 4 + l8
-                         + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
-                         - QRinput::estimateBitsMode8($q); // - 4 - l8
-                    if($dif < 0) {
-                        break;
-                    } else {
-                        $p = $q;
-                    }
-                } else if($mode == QR_MODE_AN) {
-                    $q = $p;
-                    while(self::isalnumat($this->dataStr, $q)) {
-                        $q++;
-                    }
-                    $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8
-                         + QRinput::estimateBitsModeAn($q - $p) + 4 + $la
-                         - QRinput::estimateBitsMode8($q); // - 4 - l8
-                    if($dif < 0) {
-                        break;
-                    } else {
-                        $p = $q;
-                    }
-                } else {
-                    $p++;
-                }
-            }
-
-            $run = $p;
-            $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
-            
-            if($ret < 0)
-                return -1;
-
-            return $run;
-        }
-
-        //----------------------------------------------------------------------
-        public function splitString()
-        {
-            while (strlen($this->dataStr) > 0)
-            {
-                if($this->dataStr == '')
-                    return 0;
-
-                $mode = $this->identifyMode(0);
-                
-                switch ($mode) {
-                    case QR_MODE_NUM: $length = $this->eatNum(); break;
-                    case QR_MODE_AN:  $length = $this->eatAn(); break;
-                    case QR_MODE_KANJI:
-                        if ($hint == QR_MODE_KANJI)
-                                $length = $this->eatKanji();
-                        else    $length = $this->eat8();
-                        break;
-                    default: $length = $this->eat8(); break;
-                
-                }
-
-                if($length == 0) return 0;
-                if($length < 0)  return -1;
-                
-                $this->dataStr = substr($this->dataStr, $length);
-            }
-        }
-
-        //----------------------------------------------------------------------
-        public function toUpper()
-        {
-            $stringLen = strlen($this->dataStr);
-            $p = 0;
-            
-            while ($p<$stringLen) {
-                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);
-                if($mode == QR_MODE_KANJI) {
-                    $p += 2;
-                } else {
-                    if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {
-                        $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
-                    }
-                    $p++;
-                }
-            }
-
-            return $this->dataStr;
-        }
-
-        //----------------------------------------------------------------------
-        public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)
-        {
-            if(is_null($string) || $string == '\0' || $string == '') {
-                throw new Exception('empty string!!!');
-            }
-
-            $split = new QRsplit($string, $input, $modeHint);
-            
-            if(!$casesensitive)
-                $split->toUpper();
-                
-            return $split->splitString();
-        }
-    }
-
-
-
-//---- qrrscode.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Reed-Solomon error correction support
- * 
- * Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q
- * (libfec is released under the GNU Lesser General Public License.)
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-    class QRrsItem {
-    
-        public $mm;                  // Bits per symbol 
-        public $nn;                  // Symbols per block (= (1<<mm)-1) 
-        public $alpha_to = array();  // log lookup table 
-        public $index_of = array();  // Antilog lookup table 
-        public $genpoly = array();   // Generator polynomial 
-        public $nroots;              // Number of generator roots = number of parity symbols 
-        public $fcr;                 // First consecutive root, index form 
-        public $prim;                // Primitive element, index form 
-        public $iprim;               // prim-th root of 1, index form 
-        public $pad;                 // Padding bytes in shortened block 
-        public $gfpoly;
-    
-        //----------------------------------------------------------------------
-        public function modnn($x)
-        {
-            while ($x >= $this->nn) {
-                $x -= $this->nn;
-                $x = ($x >> $this->mm) + ($x & $this->nn);
-            }
-            
-            return $x;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
-        {
-            // Common code for intializing a Reed-Solomon control block (char or int symbols)
-            // Copyright 2004 Phil Karn, KA9Q
-            // May be used under the terms of the GNU Lesser General Public License (LGPL)
-
-            $rs = null;
-            
-            // Check parameter ranges
-            if($symsize < 0 || $symsize > 8)                     return $rs;
-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
-            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding
-
-            $rs = new QRrsItem();
-            $rs->mm = $symsize;
-            $rs->nn = (1<<$symsize)-1;
-            $rs->pad = $pad;
-
-            $rs->alpha_to = array_fill(0, $rs->nn+1, 0);
-            $rs->index_of = array_fill(0, $rs->nn+1, 0);
-          
-            // PHP style macro replacement ;)
-            $NN =& $rs->nn;
-            $A0 =& $NN;
-            
-            // Generate Galois field lookup tables
-            $rs->index_of[0] = $A0; // log(zero) = -inf
-            $rs->alpha_to[$A0] = 0; // alpha**-inf = 0
-            $sr = 1;
-          
-            for($i=0; $i<$rs->nn; $i++) {
-                $rs->index_of[$sr] = $i;
-                $rs->alpha_to[$i] = $sr;
-                $sr <<= 1;
-                if($sr & (1<<$symsize)) {
-                    $sr ^= $gfpoly;
-                }
-                $sr &= $rs->nn;
-            }
-            
-            if($sr != 1){
-                // field generator polynomial is not primitive!
-                $rs = NULL;
-                return $rs;
-            }
-
-            /* Form RS code generator polynomial from its roots */
-            $rs->genpoly = array_fill(0, $nroots+1, 0);
-        
-            $rs->fcr = $fcr;
-            $rs->prim = $prim;
-            $rs->nroots = $nroots;
-            $rs->gfpoly = $gfpoly;
-
-            /* Find prim-th root of 1, used in decoding */
-            for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)
-            ; // intentional empty-body loop!
-            
-            $rs->iprim = (int)($iprim / $prim);
-            $rs->genpoly[0] = 1;
-            
-            for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-                $rs->genpoly[$i+1] = 1;
-
-                // Multiply rs->genpoly[] by  @**(root + x)
-                for ($j = $i; $j > 0; $j--) {
-                    if ($rs->genpoly[$j] != 0) {
-                        $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];
-                    } else {
-                        $rs->genpoly[$j] = $rs->genpoly[$j-1];
-                    }
-                }
-                // rs->genpoly[0] can never be zero
-                $rs->genpoly[0] = $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[0]] + $root)];
-            }
-            
-            // convert rs->genpoly[] to index form for quicker encoding
-            for ($i = 0; $i <= $nroots; $i++)
-                $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
-
-            return $rs;
-        }
-        
-        //----------------------------------------------------------------------
-        public function encode_rs_char($data, &$parity)
-        {
-            $MM       =& $this->mm;
-            $NN       =& $this->nn;
-            $ALPHA_TO =& $this->alpha_to;
-            $INDEX_OF =& $this->index_of;
-            $GENPOLY  =& $this->genpoly;
-            $NROOTS   =& $this->nroots;
-            $FCR      =& $this->fcr;
-            $PRIM     =& $this->prim;
-            $IPRIM    =& $this->iprim;
-            $PAD      =& $this->pad;
-            $A0       =& $NN;
-
-            $parity = array_fill(0, $NROOTS, 0);
-
-            for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {
-                
-                $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
-                if($feedback != $A0) {      
-                    // feedback term is non-zero
-            
-                    // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
-                    // always be for the polynomials constructed by init_rs()
-                    $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);
-            
-                    for($j=1;$j<$NROOTS;$j++) {
-                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];
-                    }
-                }
-                
-                // Shift 
-                array_shift($parity);
-                if($feedback != $A0) {
-                    array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);
-                } else {
-                    array_push($parity, 0);
-                }
-            }
-        }
-    }
-    
-    //##########################################################################
-    
-    class QRrs {
-    
-        public static $items = array();
-        
-        //----------------------------------------------------------------------
-        public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
-        {
-            foreach(self::$items as $rs) {
-                if($rs->pad != $pad)       continue;
-                if($rs->nroots != $nroots) continue;
-                if($rs->mm != $symsize)    continue;
-                if($rs->gfpoly != $gfpoly) continue;
-                if($rs->fcr != $fcr)       continue;
-                if($rs->prim != $prim)     continue;
-
-                return $rs;
-            }
-
-            $rs = QRrsItem::init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad);
-            array_unshift(self::$items, $rs);
-
-            return $rs;
-        }
-    }
-
-
-
-//---- qrmask.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Masking
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-	define('N1', 3);
-	define('N2', 3);
-	define('N3', 40);
-	define('N4', 10);
-
-	class QRmask {
-	
-		public $runLength = array();
-		
-		//----------------------------------------------------------------------
-		public function __construct() 
-        {
-            $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
-        }
-        
-        //----------------------------------------------------------------------
-        public function writeFormatInformation($width, &$frame, $mask, $level)
-        {
-            $blacks = 0;
-            $format =  QRspec::getFormatInfo($mask, $level);
-
-            for($i=0; $i<8; $i++) {
-                if($format & 1) {
-                    $blacks += 2;
-                    $v = 0x85;
-                } else {
-                    $v = 0x84;
-                }
-                
-                $frame[8][$width - 1 - $i] = chr($v);
-                if($i < 6) {
-                    $frame[$i][8] = chr($v);
-                } else {
-                    $frame[$i + 1][8] = chr($v);
-                }
-                $format = $format >> 1;
-            }
-            
-            for($i=0; $i<7; $i++) {
-                if($format & 1) {
-                    $blacks += 2;
-                    $v = 0x85;
-                } else {
-                    $v = 0x84;
-                }
-                
-                $frame[$width - 7 + $i][8] = chr($v);
-                if($i == 0) {
-                    $frame[8][7] = chr($v);
-                } else {
-                    $frame[8][6 - $i] = chr($v);
-                }
-                
-                $format = $format >> 1;
-            }
-
-            return $blacks;
-        }
-        
-        //----------------------------------------------------------------------
-        public function mask0($x, $y) { return ($x+$y)&1;                       }
-        public function mask1($x, $y) { return ($y&1);                          }
-        public function mask2($x, $y) { return ($x%3);                          }
-        public function mask3($x, $y) { return ($x+$y)%3;                       }
-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }
-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }
-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }
-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }
-        
-        //----------------------------------------------------------------------
-        private function generateMaskNo($maskNo, $width, $frame)
-        {
-            $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-            
-            for($y=0; $y<$width; $y++) {
-                for($x=0; $x<$width; $x++) {
-                    if(ord($frame[$y][$x]) & 0x80) {
-                        $bitMask[$y][$x] = 0;
-                    } else {
-                        $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;
-                    }
-                    
-                }
-            }
-            
-            return $bitMask;
-        }
-        
-        //----------------------------------------------------------------------
-        public static function serial($bitFrame)
-        {
-            $codeArr = array();
-            
-            foreach ($bitFrame as $line)
-                $codeArr[] = join('', $line);
-                
-            return gzcompress(join("\n", $codeArr), 9);
-        }
-        
-        //----------------------------------------------------------------------
-        public static function unserial($code)
-        {
-            $codeArr = array();
-            
-            $codeLines = explode("\n", gzuncompress($code));
-            foreach ($codeLines as $line)
-                $codeArr[] = str_split($line);
-            
-            return $codeArr;
-        }
-        
-        //----------------------------------------------------------------------
-        public function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) 
-        {
-            $b = 0;
-            $bitMask = array();
-            
-            $fileName = QR_CACHE_DIR.'mask_'.$maskNo.DIRECTORY_SEPARATOR.'mask_'.$width.'_'.$maskNo.'.dat';
-
-            if (QR_CACHEABLE) {
-                if (file_exists($fileName)) {
-                    $bitMask = self::unserial(file_get_contents($fileName));
-                } else {
-                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
-                    file_put_contents($fileName, self::serial($bitMask));
-                }
-            } else {
-                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-            }
-
-            if ($maskGenOnly)
-                return;
-                
-            $d = $s;
-
-            for($y=0; $y<$width; $y++) {
-                for($x=0; $x<$width; $x++) {
-                    if($bitMask[$y][$x] == 1) {
-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
-                    }
-                    $b += (int)(ord($d[$y][$x]) & 1);
-                }
-            }
-
-            return $b;
-        }
-        
-        //----------------------------------------------------------------------
-        public function makeMask($width, $frame, $maskNo, $level)
-        {
-            $masked = array_fill(0, $width, str_repeat("\0", $width));
-            $this->makeMaskNo($maskNo, $width, $frame, $masked);
-            $this->writeFormatInformation($width, $masked, $maskNo, $level);
-       
-            return $masked;
-        }
-        
-        //----------------------------------------------------------------------
-        public function calcN1N3($length)
-        {
-            $demerit = 0;
-
-            for($i=0; $i<$length; $i++) {
-                
-                if($this->runLength[$i] >= 5) {
-                    $demerit += (N1 + ($this->runLength[$i] - 5));
-                }
-                if($i & 1) {
-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {
-                        $fact = (int)($this->runLength[$i] / 3);
-                        if(($this->runLength[$i-2] == $fact) &&
-                           ($this->runLength[$i-1] == $fact) &&
-                           ($this->runLength[$i+1] == $fact) &&
-                           ($this->runLength[$i+2] == $fact)) {
-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {
-                                $demerit += N3;
-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {
-                                $demerit += N3;
-                            }
-                        }
-                    }
-                }
-            }
-            return $demerit;
-        }
-        
-        //----------------------------------------------------------------------
-        public function evaluateSymbol($width, $frame)
-        {
-            $head = 0;
-            $demerit = 0;
-
-            for($y=0; $y<$width; $y++) {
-                $head = 0;
-                $this->runLength[0] = 1;
-                
-                $frameY = $frame[$y];
-                
-                if ($y>0)
-                    $frameYM = $frame[$y-1];
-                
-                for($x=0; $x<$width; $x++) {
-                    if(($x > 0) && ($y > 0)) {
-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
-                        
-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     
-                            $demerit += N2;
-                        }
-                    }
-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {
-                        $this->runLength[0] = -1;
-                        $head = 1;
-                        $this->runLength[$head] = 1;
-                    } else if($x > 0) {
-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
-                            $head++;
-                            $this->runLength[$head] = 1;
-                        } else {
-                            $this->runLength[$head]++;
-                        }
-                    }
-                }
-    
-                $demerit += $this->calcN1N3($head+1);
-            }
-
-            for($x=0; $x<$width; $x++) {
-                $head = 0;
-                $this->runLength[0] = 1;
-                
-                for($y=0; $y<$width; $y++) {
-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {
-                        $this->runLength[0] = -1;
-                        $head = 1;
-                        $this->runLength[$head] = 1;
-                    } else if($y > 0) {
-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
-                            $head++;
-                            $this->runLength[$head] = 1;
-                        } else {
-                            $this->runLength[$head]++;
-                        }
-                    }
-                }
-            
-                $demerit += $this->calcN1N3($head+1);
-            }
-
-            return $demerit;
-        }
-        
-        
-        //----------------------------------------------------------------------
-        public function mask($width, $frame, $level)
-        {
-            $minDemerit = PHP_INT_MAX;
-            $bestMaskNum = 0;
-            $bestMask = array();
-            
-            $checked_masks = array(0,1,2,3,4,5,6,7);
-            
-            if (QR_FIND_FROM_RANDOM !== false) {
-            
-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
-                for ($i = 0; $i <  $howManuOut; $i++) {
-                    $remPos = rand (0, count($checked_masks)-1);
-                    unset($checked_masks[$remPos]);
-                    $checked_masks = array_values($checked_masks);
-                }
-            
-            }
-            
-            $bestMask = $frame;
-             
-            foreach($checked_masks as $i) {
-                $mask = array_fill(0, $width, str_repeat("\0", $width));
-
-                $demerit = 0;
-                $blacks = 0;
-                $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
-                $blacks += $this->writeFormatInformation($width, $mask, $i, $level);
-                $blacks  = (int)(100 * $blacks / ($width * $width));
-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
-                $demerit += $this->evaluateSymbol($width, $mask);
-                
-                if($demerit < $minDemerit) {
-                    $minDemerit = $demerit;
-                    $bestMask = $mask;
-                    $bestMaskNum = $i;
-                }
-            }
-            
-            return $bestMask;
-        }
-        
-        //----------------------------------------------------------------------
-    }
-
-
-
-
-//---- qrencode.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Main encoder classes.
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
-    class QRrsblock {
-        public $dataLength;
-        public $data = array();
-        public $eccLength;
-        public $ecc = array();
-        
-        public function __construct($dl, $data, $el, &$ecc, QRrsItem $rs)
-        {
-            $rs->encode_rs_char($data, $ecc);
-        
-            $this->dataLength = $dl;
-            $this->data = $data;
-            $this->eccLength = $el;
-            $this->ecc = $ecc;
-        }
-    };
-    
-    //##########################################################################
-
-    class QRrawcode {
-        public $version;
-        public $datacode = array();
-        public $ecccode = array();
-        public $blocks;
-        public $rsblocks = array(); //of RSblock
-        public $count;
-        public $dataLength;
-        public $eccLength;
-        public $b1;
-        
-        //----------------------------------------------------------------------
-        public function __construct(QRinput $input)
-        {
-            $spec = array(0,0,0,0,0);
-            
-            $this->datacode = $input->getByteStream();
-            if(is_null($this->datacode)) {
-                throw new Exception('null imput string');
-            }
-
-            QRspec::getEccSpec($input->getVersion(), $input->getErrorCorrectionLevel(), $spec);
-
-            $this->version = $input->getVersion();
-            $this->b1 = QRspec::rsBlockNum1($spec);
-            $this->dataLength = QRspec::rsDataLength($spec);
-            $this->eccLength = QRspec::rsEccLength($spec);
-            $this->ecccode = array_fill(0, $this->eccLength, 0);
-            $this->blocks = QRspec::rsBlockNum($spec);
-            
-            $ret = $this->init($spec);
-            if($ret < 0) {
-                throw new Exception('block alloc error');
-                return null;
-            }
-
-            $this->count = 0;
-        }
-        
-        //----------------------------------------------------------------------
-        public function init(array $spec)
-        {
-            $dl = QRspec::rsDataCodes1($spec);
-            $el = QRspec::rsEccCodes1($spec);
-            $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-            
-
-            $blockNo = 0;
-            $dataPos = 0;
-            $eccPos = 0;
-            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {
-                $ecc = array_slice($this->ecccode,$eccPos);
-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);
-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
-                
-                $dataPos += $dl;
-                $eccPos += $el;
-                $blockNo++;
-            }
-
-            if(QRspec::rsBlockNum2($spec) == 0)
-                return 0;
-
-            $dl = QRspec::rsDataCodes2($spec);
-            $el = QRspec::rsEccCodes2($spec);
-            $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-            
-            if($rs == NULL) return -1;
-            
-            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
-                $ecc = array_slice($this->ecccode,$eccPos);
-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
-                
-                $dataPos += $dl;
-                $eccPos += $el;
-                $blockNo++;
-            }
-
-            return 0;
-        }
-        
-        //----------------------------------------------------------------------
-        public function getCode()
-        {
-            $ret;
-
-            if($this->count < $this->dataLength) {
-                $row = $this->count % $this->blocks;
-                $col = $this->count / $this->blocks;
-                if($col >= $this->rsblocks[0]->dataLength) {
-                    $row += $this->b1;
-                }
-                $ret = $this->rsblocks[$row]->data[$col];
-            } else if($this->count < $this->dataLength + $this->eccLength) {
-                $row = ($this->count - $this->dataLength) % $this->blocks;
-                $col = ($this->count - $this->dataLength) / $this->blocks;
-                $ret = $this->rsblocks[$row]->ecc[$col];
-            } else {
-                return 0;
-            }
-            $this->count++;
-            
-            return $ret;
-        }
-    }
-
-    //##########################################################################
-    
-    class QRcode {
-    
-        public $version;
-        public $width;
-        public $data; 
-        
-        //----------------------------------------------------------------------
-        public function encodeMask(QRinput $input, $mask)
-        {
-            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
-                throw new Exception('wrong version');
-            }
-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
-                throw new Exception('wrong level');
-            }
-
-            $raw = new QRrawcode($input);
-            
-            QRtools::markTime('after_raw');
-            
-            $version = $raw->version;
-            $width = QRspec::getWidth($version);
-            $frame = QRspec::newFrame($version);
-            
-            $filler = new FrameFiller($width, $frame);
-            if(is_null($filler)) {
-                return NULL;
-            }
-
-            // inteleaved data and ecc codes
-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {
-                $code = $raw->getCode();
-                $bit = 0x80;
-                for($j=0; $j<8; $j++) {
-                    $addr = $filler->next();
-                    $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
-                    $bit = $bit >> 1;
-                }
-            }
-            
-            QRtools::markTime('after_filler');
-            
-            unset($raw);
-            
-            // remainder bits
-            $j = QRspec::getRemainder($version);
-            for($i=0; $i<$j; $i++) {
-                $addr = $filler->next();
-                $filler->setFrameAt($addr, 0x02);
-            }
-            
-            $frame = $filler->frame;
-            unset($filler);
-            
-            
-            // masking
-            $maskObj = new QRmask();
-            if($mask < 0) {
-            
-                if (QR_FIND_BEST_MASK) {
-                    $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());
-                } else {
-                    $masked = $maskObj->makeMask($width, $frame, (intval(QR_DEFAULT_MASK) % 8), $input->getErrorCorrectionLevel());
-                }
-            } else {
-                $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());
-            }
-            
-            if($masked == NULL) {
-                return NULL;
-            }
-            
-            QRtools::markTime('after_mask');
-            
-            $this->version = $version;
-            $this->width = $width;
-            $this->data = $masked;
-            
-            return $this;
-        }
-    
-        //----------------------------------------------------------------------
-        public function encodeInput(QRinput $input)
-        {
-            return $this->encodeMask($input, -1);
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeString8bit($string, $version, $level)
-        {
-            if(string == NULL) {
-                throw new Exception('empty string!');
-                return NULL;
-            }
-
-            $input = new QRinput($version, $level);
-            if($input == NULL) return NULL;
-
-            $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
-            if($ret < 0) {
-                unset($input);
-                return NULL;
-            }
-            return $this->encodeInput($input);
-        }
-
-        //----------------------------------------------------------------------
-        public function encodeString($string, $version, $level, $hint, $casesensitive)
-        {
-
-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
-                throw new Exception('bad hint');
-                return NULL;
-            }
-
-            $input = new QRinput($version, $level);
-            if($input == NULL) return NULL;
-
-            $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
-            if($ret < 0) {
-                return NULL;
-            }
-
-            return $this->encodeInput($input);
-        }
-        
-        //----------------------------------------------------------------------
-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 
-        {
-            $enc = QRencode::factory($level, $size, $margin);
-            return $enc->encodePNG($text, $outfile, $saveandprint=false);
-        }
-
-        //----------------------------------------------------------------------
-        public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 
-        {
-            $enc = QRencode::factory($level, $size, $margin);
-            return $enc->encode($text, $outfile);
-        }
-
-        //----------------------------------------------------------------------
-        public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 
-        {
-            $enc = QRencode::factory($level, $size, $margin);
-            return $enc->encodeRAW($text, $outfile);
-        }
-    }
-    
-    //##########################################################################
-    
-    class FrameFiller {
-    
-        public $width;
-        public $frame;
-        public $x;
-        public $y;
-        public $dir;
-        public $bit;
-        
-        //----------------------------------------------------------------------
-        public function __construct($width, &$frame)
-        {
-            $this->width = $width;
-            $this->frame = $frame;
-            $this->x = $width - 1;
-            $this->y = $width - 1;
-            $this->dir = -1;
-            $this->bit = -1;
-        }
-        
-        //----------------------------------------------------------------------
-        public function setFrameAt($at, $val)
-        {
-            $this->frame[$at['y']][$at['x']] = chr($val);
-        }
-        
-        //----------------------------------------------------------------------
-        public function getFrameAt($at)
-        {
-            return ord($this->frame[$at['y']][$at['x']]);
-        }
-        
-        //----------------------------------------------------------------------
-        public function next()
-        {
-            do {
-            
-                if($this->bit == -1) {
-                    $this->bit = 0;
-                    return array('x'=>$this->x, 'y'=>$this->y);
-                }
-
-                $x = $this->x;
-                $y = $this->y;
-                $w = $this->width;
-
-                if($this->bit == 0) {
-                    $x--;
-                    $this->bit++;
-                } else {
-                    $x++;
-                    $y += $this->dir;
-                    $this->bit--;
-                }
-
-                if($this->dir < 0) {
-                    if($y < 0) {
-                        $y = 0;
-                        $x -= 2;
-                        $this->dir = 1;
-                        if($x == 6) {
-                            $x--;
-                            $y = 9;
-                        }
-                    }
-                } else {
-                    if($y == $w) {
-                        $y = $w - 1;
-                        $x -= 2;
-                        $this->dir = -1;
-                        if($x == 6) {
-                            $x--;
-                            $y -= 8;
-                        }
-                    }
-                }
-                if($x < 0 || $y < 0) return null;
-
-                $this->x = $x;
-                $this->y = $y;
-
-            } while(ord($this->frame[$y][$x]) & 0x80);
-                        
-            return array('x'=>$x, 'y'=>$y);
-        }
-        
-    } ;
-    
-    //##########################################################################    
-    
-    class QRencode {
-    
-        public $casesensitive = true;
-        public $eightbit = false;
-        
-        public $version = 0;
-        public $size = 3;
-        public $margin = 4;
-        
-        public $structured = 0; // not supported yet
-        
-        public $level = QR_ECLEVEL_L;
-        public $hint = QR_MODE_8;
-        
-        //----------------------------------------------------------------------
-        public static function factory($level = QR_ECLEVEL_L, $size = 3, $margin = 4)
-        {
-            $enc = new QRencode();
-            $enc->size = $size;
-            $enc->margin = $margin;
-            
-            switch ($level.'') {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                        $enc->level = $level;
-                    break;
-                case 'l':
-                case 'L':
-                        $enc->level = QR_ECLEVEL_L;
-                    break;
-                case 'm':
-                case 'M':
-                        $enc->level = QR_ECLEVEL_M;
-                    break;
-                case 'q':
-                case 'Q':
-                        $enc->level = QR_ECLEVEL_Q;
-                    break;
-                case 'h':
-                case 'H':
-                        $enc->level = QR_ECLEVEL_H;
-                    break;
-            }
-            
-            return $enc;
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeRAW($intext, $outfile = false) 
-        {
-            $code = new QRcode();
-
-            if($this->eightbit) {
-                $code->encodeString8bit($intext, $this->version, $this->level);
-            } else {
-                $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
-            }
-            
-            return $code->data;
-        }
-
-        //----------------------------------------------------------------------
-        public function encode($intext, $outfile = false) 
-        {
-            $code = new QRcode();
-
-            if($this->eightbit) {
-                $code->encodeString8bit($intext, $this->version, $this->level);
-            } else {
-                $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
-            }
-            
-            QRtools::markTime('after_encode');
-            
-            if ($outfile!== false) {
-                file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));
-            } else {
-                return QRtools::binarize($code->data);
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 
-        {
-            try {
-            
-                ob_start();
-                $tab = $this->encode($intext);
-                $err = ob_get_contents();
-                ob_end_clean();
-                
-                if ($err != '')
-                    QRtools::log($outfile, $err);
-                
-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
-                
-                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);
-            
-            } catch (Exception $e) {
-            
-                QRtools::log($outfile, $e->getMessage());
-            
-            }
-        }
-    }
-
-
diff --git a/apps/shorty/ajax/add.php b/apps/shorty/ajax/add.php
deleted file mode 100644
index b1130e47db..0000000000
--- a/apps/shorty/ajax/add.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/add.php
- * @brief Ajax method to add a new shorty defined by request arguments
- * @param title (string) Human readable title of the shorty
- * @param target (url) Remote target url meant to be shortened
- * @param until (date) Date until when the created shorty is valid and usable
- * @param notes (string) Any additional information in text form
- * @param favicon (url) Reference to the shortcut icon used in target url
- * @returns (json) success/error state indicator
- * @returns (json) Associative array of attributes of the generated shorty
- * @returns (json) Human readable message
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
- //no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $p_id      = OC_Shorty_Tools::shorty_id ( );
-  $p_status  = OC_Shorty_Type::req_argument ( 'status',  OC_Shorty_Type::STATUS, FALSE );
-  $p_title   = OC_Shorty_Type::req_argument ( 'title',   OC_Shorty_Type::STRING, FALSE );
-  $p_target  = OC_Shorty_Type::req_argument ( 'target',  OC_Shorty_Type::URL,    TRUE  );
-  $p_until   = OC_Shorty_Type::req_argument ( 'until',   OC_Shorty_Type::DATE,   FALSE );
-  $p_notes   = OC_Shorty_Type::req_argument ( 'notes',   OC_Shorty_Type::STRING, FALSE );
-  $p_favicon = OC_Shorty_Type::req_argument ( 'favicon', OC_Shorty_Type::URL,    FALSE );
-  // register shorty at backend
-  $p_source = OC_Shorty_Backend::registerUrl ( $p_id );
-  // fallback title: choose hostname if no title is specified
-  $p_title = $p_title ? trim($p_title) : parse_url($p_target,PHP_URL_HOST);
-  // insert new shorty into our database
-  $param = array
-  (
-    ':user'    => OCP\User::getUser(),
-    ':id'      => $p_id,
-    ':status'  => $p_status  ? $p_status  : '',
-    ':title'   => $p_title   ? $p_title   : '',
-    ':favicon' => $p_favicon ? $p_favicon : '',
-    ':source'  => $p_source  ? $p_source  : '',
-    ':target'  => $p_target  ? $p_target  : '',
-    ':notes'   => $p_notes   ? $p_notes   : '',
-    ':until'   => $p_until,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_INSERT );
-  $query->execute ( $param );
-
-  // read new entry for feedback
-  $param = array
-  (
-    ':user' => OCP\User::getUser(),
-    ':id'   => $p_id,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_VERIFY );
-  $entries = $query->execute($param)->FetchAll();
-  if (  (1==count($entries))
-      &&(isset($entries[0]['id']))
-      &&($p_id==$entries[0]['id']) )
-    $entries[0]['relay']=OC_Shorty_Tools::relayUrl ( $entries[0]['id'] );
-  else 
-    throw new OC_Shorty_Exception ( "failed to verify stored shorty with id '%1s'", array($p_id) );
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\Util::writeLog( 'shorty', sprintf("Url shortened to: %s",$p_source), OC_Log::INFO );
-  OCP\JSON::success ( array ( 'data'    => $entries[0],
-                              'message' => OC_Shorty_L10n::t("Url shortened to: %s",$p_source) ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/click.php b/apps/shorty/ajax/click.php
deleted file mode 100644
index c88f6eec4f..0000000000
--- a/apps/shorty/ajax/click.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/click.php
- * @brief Ajax method to register a 'click', a single hit on an existing and valid shorty
- * @param id (string) Internal id of a referenced shorty
- * @returns (json) success/error state indicator
- * @returns (json) Associative array holding the id of the shorty whose click was registered
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  if (isset($_GET['id']))
-  {
-    $p_id  = OC_Shorty_Type::req_argument ( $_GET['id'], OC_Shorty_Type::ID, TRUE );
-    $param = array
-    (
-      'user' => OCP\User::getUser(),
-      'id'   => $p_id,
-    );
-    $query = OCP\DB::prepare ( OC_Shorty_Query::URL_CLICK );
-    $query->execute ( $param );
-    OCP\JSON::success ( array ( 'data'    => array('id'=>$p_id),
-                                'message' => OC_Shorty_L10n::t('Click registered') ) );
-  }
-  else
-    throw new OC_Shorty_Exception ( "request failed: missing mandatory argument 'id'" );
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/count.php b/apps/shorty/ajax/count.php
deleted file mode 100644
index 9a00083bb9..0000000000
--- a/apps/shorty/ajax/count.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/count.php
- * @brief Ajax method to retrieve a list of important sums, counts of the existing set of shortys
- * @returns (json) success/error state indicator
- * @returns (json) Associative array of counts
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = TRUE;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $countResult = OC_Shorty_Tools::countShorties ( );
-  
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\JSON::success ( array ( 'data'    => $countResult,
-                              'message' => OC_Shorty_L10n::t('Counted entries and clicks') ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/del.php b/apps/shorty/ajax/del.php
deleted file mode 100644
index b24f83915e..0000000000
--- a/apps/shorty/ajax/del.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/del.php
- * @brief Ajax method to delete an existing shorty
- * @param id (string) Internal id of a referenced shorty
- * @returns (json) success/error state indicator
- * @returns (json) Key of shorty that was deleted
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $p_id  = OC_Shorty_Type::req_argument ( 'id', OC_Shorty_Type::ID, TRUE );
-  $param = array
-  (
-    'user' => OCP\User::getUser(),
-    'id'   => $p_id,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_DELETE );
-  $query->execute($param);
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\Util::writeLog( 'shorty', sprintf("Shorty with id '%s' deleted",$p_id), OC_Log::INFO );
-  OCP\JSON::success ( array ( 'data'    => array('id'=>$p_id),
-                              'message' => OC_Shorty_L10n::t("Shorty with id '%s' deleted",$p_id) ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/edit.php b/apps/shorty/ajax/edit.php
deleted file mode 100644
index 252e4fe5c2..0000000000
--- a/apps/shorty/ajax/edit.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/edit.php
- * @brief Ajax method to modify aspects of an existing shorty
- * @param id (string) Internal id of the referenced shorty
- * @param title (string) Human readable title
- * @param notes (string) Any additional information in free text form
- * @returns (json) success/error state indicator
- * @returns (json) Associative array holding the id of the shorty whose click was registered
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $p_id      = OC_Shorty_Type::req_argument ( 'id',      OC_Shorty_Type::ID,     TRUE );
-  $p_status  = OC_Shorty_Type::req_argument ( 'status',  OC_Shorty_Type::STATUS, FALSE );
-  $p_title   = OC_Shorty_Type::req_argument ( 'title',   OC_Shorty_Type::STRING, FALSE );
-  $p_until   = OC_Shorty_Type::req_argument ( 'until',   OC_Shorty_Type::DATE,   FALSE );
-  $p_notes   = OC_Shorty_Type::req_argument ( 'notes',   OC_Shorty_Type::STRING, FALSE );
-  $param = array
-  (
-    ':user'  => OCP\User::getUser ( ),
-    ':id'    => $p_id,
-    ':status'=> $p_status  ? $p_status  : '',
-    ':title' => $p_title   ? $p_title   : '',
-    ':notes' => $p_notes   ? $p_notes   : '',
-    ':until' => $p_until,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_UPDATE );
-  $query->execute ( $param );
-  
-  // read new entry for feedback
-  $param = array
-  (
-    'user' => OCP\User::getUser(),
-    'id'   => $p_id,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_VERIFY );
-  $entries = $query->execute($param)->FetchAll();
-  if (  (1==count($entries))
-      &&(isset($entries[0]['id']))
-      &&($p_id==$entries[0]['id']) )
-    $entries[0]['relay']=OC_Shorty_Tools::relayUrl ( $entries[0]['id'] );
-  else
-    throw new OC_Shorty_Exception ( "failed to verify stored shorty with id '%1s'", array($p_id) );
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\Util::writeLog( 'shorty', sprintf("Modifications for shorty with id '%s' saved",$p_id), OC_Log::INFO );
-  OCP\JSON::success ( array ( 'data'    => $entries[0],
-                              'message' => OC_Shorty_L10n::t("Modifications for shorty with id '%s' saved",$p_id) ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/list.php b/apps/shorty/ajax/list.php
deleted file mode 100644
index 8b4e9b3e81..0000000000
--- a/apps/shorty/ajax/list.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/list.php
- * @brief Ajax method to retrieve a list of existing shortys
- * @returns (json) success/error state indicator
- * @returns (number) Total number of shortys in the list
- * @returns (json) Numeric array of all shortys, associative array of attributes as values for every single shorty contained
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = TRUE;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  // first remove any entries already marked as 'deleted'
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_REMOVE );
-  $result = $query->execute(array(':user'=>OCP\User::getUser()));
-  // now comes the real list selection
-//   define ('PAGE_SIZE', 100);
-//   $p_offset = OC_Shorty_Type::req_argument ( 'page', OC_Shorty_Type::INTEGER, FALSE) * PAGE_SIZE;
-  // pre-sort list according to user preferences
-  $p_sort = OC_Shorty_Type::$SORTING[OCP\Config::getUserValue(OCP\User::getUser(),'shorty','list-sort-code','cd')];
-  $param = array
-  (
-    ':user'   => OCP\User::getUser ( ),
-    ':sort'   => $p_sort,
-//     ':offset' => $p_offset,
-//     ':limit'  => PAGE_SIZE,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_LIST );
-  $result = $query->execute($param);
-  $reply = $result->fetchAll();
-  // enhance all entries with the relay url
-  foreach (array_keys($reply) as $key)
-    if (isset($reply[$key]['id']))
-      $reply[$key]['relay']=OC_Shorty_Tools::relayUrl ( $reply[$key]['id'] );
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\JSON::success ( array ( 'data'    => $reply,
-                              'count'   => sizeof($reply),
-                              'message' => OC_Shorty_L10n::t('Number of entries: %s', count($reply)) ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/meta.php b/apps/shorty/ajax/meta.php
deleted file mode 100644
index 5f9d5c3c31..0000000000
--- a/apps/shorty/ajax/meta.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/meta.php
- * @brief Ajax method to query meta information about a given remote url
- * @param target (string) Url of a remote web resource
- * @returns (json) success/error state indicator
- * @returns (array) Associative array of meta data aspects
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $target  = OC_Shorty_Type::req_argument ( 'target', OC_Shorty_Type::URL, TRUE );
-  $meta    = OC_Shorty_Meta::fetchMetaData(htmlspecialchars_decode($target));
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\JSON::success ( array ( 'data'    => $meta,
-                              'message' => OC_Shorty_L10n::t("Target url '%s' is valid", $meta['target']) ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/preferences.php b/apps/shorty/ajax/preferences.php
deleted file mode 100644
index e35a2f7aff..0000000000
--- a/apps/shorty/ajax/preferences.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/preferences.php
- * @brief Ajax method to store one or more personal preferences
- * @param backend-type (string) Identifier of chosen backend type
- * @param backend-static-base (string) Url to use as a base when the static backend is active
- * @param backend-google-key (string) Personal authentication key to use when the google backend is active
- * @param backend-bitly-key (string) Personal authentication key to use when the bit.li backend is active
- * @param backend-bitly-user (string) Personal authentication user to use when the bit.li backend is active
- * @param sms-control (string) Controls wether a 'send as sms' action should be offered is the sharing dialog
- * @param list-sort-code (string) Two character sorting key controlling the active sorting of shorty lists
- * @returns (json) success/error state indicator
- * @returns (json) Associative array holding the stored values by their key
- * @returns (json) Human readable message describing the result
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $data = array();
-  switch ( $_SERVER['REQUEST_METHOD'] )
-  {
-    case 'POST':
-      // detect provided preferences
-      $data = array();
-      foreach (array_keys($_POST) as $key)
-        if ( isset(OC_Shorty_Type::$PREFERENCE[$key]) ) // ignore unknown preference keys
-        {
-          $type = OC_Shorty_Type::$PREFERENCE[$key];
-          $data[$key] = OC_Shorty_Type::req_argument ( $key, $type, FALSE );
-        }
-      // eliminate settings not explicitly set
-      $data = array_diff ( $data, array(FALSE) );
-      // store settings
-      foreach ( $data as $key=>$val )
-        OCP\Config::setUserValue( OCP\User::getUser(), 'shorty', $key, $val );
-      // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-      OC_Shorty_Tools::ob_control ( FALSE );
-      OCP\Util::writeLog( 'shorty', sprintf("Preference(s) '%s' saved.",implode(',',array_keys($data))), OC_Log::INFO );
-      OCP\JSON::success ( array ( 'data'    => $data,
-                                  'message' => OC_Shorty_L10n::t("Preference(s) '%s' saved.",implode(',',array_keys($data))) ) );
-      break;
-    case 'GET':
-      // detect requested preferences
-      foreach (array_keys($_GET) as $key)
-      {
-        if ( isset(OC_Shorty_Type::$PREFERENCE[$key]) ) // ignore unknown preference keys
-        {
-          $type = OC_Shorty_Type::$PREFERENCE[$key];
-          $data[$key] = OCP\Config::getUserValue( OCP\User::getUser(), 'shorty', $key);
-          // morph value into an explicit type
-          switch ($type)
-          {
-            case OC_Shorty_Type::ID:
-            case OC_Shorty_Type::STATUS:
-            case OC_Shorty_Type::SORTKEY:
-            case OC_Shorty_Type::SORTVAL:
-            case OC_Shorty_Type::STRING:
-            case OC_Shorty_Type::URL:
-            case OC_Shorty_Type::DATE:
-              settype ( $data[$key], 'string' );
-              break;
-            case OC_Shorty_Type::INTEGER:
-            case OC_Shorty_Type::TIMESTAMP:
-              settype ( $data[$key], 'integer' );
-              break;
-            case OC_Shorty_Type::FLOAT:
-              settype ( $data[$key], 'float' );
-              break;
-            default:
-          } // switch
-        }
-      } // foreach
-      // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-      OC_Shorty_Tools::ob_control ( FALSE );
-      OCP\Util::writeLog( 'shorty', sprintf("Preference(s) '%s' saved.",implode(',',array_keys($data))), OC_Log::INFO );
-      OCP\JSON::success ( array ( 'data'    => $data,
-                                  'message' => OC_Shorty_L10n::t('Preference(s) retrieved.') ) );
-      break;
-    default:
-      throw new OC_Shorty_Exception ( "unexpected request method '%s'", $_SERVER['REQUEST_METHOD'] );
-  } // switch
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/settings.php b/apps/shorty/ajax/settings.php
deleted file mode 100644
index af76b69e07..0000000000
--- a/apps/shorty/ajax/settings.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/settings.php
- * @brief Ajax method to store one or more system settings  (plugin settings)
- * @param backend-static-base (string) Url to use as a base when the static backend is active (plugins default, may be overridden by user preference)
- * @returns (json) success/error state indicator
- * @returns (json) Associative array holding the stored values by their key
- * @returns (json) Human readable message describing the result
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkAdminUser ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $data = array();
-  switch ( $_SERVER['REQUEST_METHOD'] )
-  {
-    case 'POST':
-      // detect provided settings
-      $data = array();
-      foreach (array_keys($_POST) as $key)
-        if ( isset(OC_Shorty_Type::$SETTING[$key]) ) // ignore unknown preference keys
-        {
-          $type = OC_Shorty_Type::$SETTING[$key];
-          $data[$key] = OC_Shorty_Type::req_argument ( $key, $type, FALSE );
-        }
-      // eliminate settings not explicitly set
-      $data = array_diff ( $data, array(FALSE) );
-      // store settings one by one
-      foreach ( $data as $key=>$val )
-        OCP\Config::setAppValue( 'shorty', $key, $val );
-      break;
-    case 'GET':
-      // detect requested settings
-      foreach (array_keys($_GET) as $key)
-      {
-        if ( isset(OC_Shorty_Type::$SETTING[$key]) ) // ignore unknown preference keys
-        {
-          $type = OC_Shorty_Type::$SETTING[$key];
-          $data[$key] = OCP\Config::getUserValue( OCP\User::getUser(), 'shorty', $key);
-          // morph value into an explicit type
-          switch ($type)
-          {
-            case OC_Shorty_Type::ID:
-            case OC_Shorty_Type::STATUS:
-            case OC_Shorty_Type::SORTKEY:
-            case OC_Shorty_Type::SORTVAL:
-            case OC_Shorty_Type::STRING:
-            case OC_Shorty_Type::URL:
-            case OC_Shorty_Type::DATE:
-              settype ( $data[$key], 'string' );
-              break;
-            case OC_Shorty_Type::INTEGER:
-            case OC_Shorty_Type::TIMESTAMP:
-              settype ( $data[$key], 'integer' );
-              break;
-            case OC_Shorty_Type::FLOAT:
-              settype ( $data[$key], 'float' );
-              break;
-            default:
-          } // switch
-        }
-      } // foreach
-      break;
-    default:
-      throw new OC_Shorty_Exception ( "unexpected request method '%s'", $_SERVER['REQUEST_METHOD'] );
-  } // switch
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\Util::writeLog( 'shorty', sprintf("Setting(s) '%s' saved.",implode(',',array_keys($data))), OC_Log::INFO );
-  OCP\JSON::success ( array ( 'data'    => $data,
-                              'message' => OC_Shorty_L10n::t('Setting saved.') ) );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/ajax/status.php b/apps/shorty/ajax/status.php
deleted file mode 100644
index 6d00bf5885..0000000000
--- a/apps/shorty/ajax/status.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file ajax/status.php
- * @brief Ajax method to modify the status of an existing shorty
- * @param id (string) Internal id of the referenced shorty
- * @param title (string) Human readable title
- * @param notes (string) Any additional information in free text form
- * @returns (json) success/error state indicator
- * @returns (json) Associative array holding the id of the shorty whose click was registered
- * @author Christian Reiner
- */
-
-// swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-OC_Shorty_Tools::ob_control ( TRUE );
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS = true;
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn ( );
-OCP\JSON::checkAppEnabled ( 'shorty' );
-
-try
-{
-  $p_id     = OC_Shorty_Type::req_argument ( 'id',     OC_Shorty_Type::ID,     TRUE );
-  $p_status = OC_Shorty_Type::req_argument ( 'status', OC_Shorty_Type::STATUS, FALSE );
-  $param = array
-  (
-    'user'   => OCP\User::getUser ( ),
-    'id'     => $p_id,
-    'status' => $p_status,
-  );
-  $query = OCP\DB::prepare ( OC_Shorty_Query::URL_STATUS );
-  $query->execute ( $param );
-
-  // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-  OC_Shorty_Tools::ob_control ( FALSE );
-  OCP\Util::writeLog( 'shorty', sprintf("Status change for shorty with id '%s' saved",$p_id), OC_Log::INFO );
-  OCP\JSON::success ( array ( 'data'    => array('id'=>$p_id),
-                              'message' => sprintf(OC_Shorty_L10n::t("Status change for shorty with id '%s' saved"),$p_id) )  );
-} catch ( Exception $e ) { OC_Shorty_Exception::JSONerror($e); }
-?>
diff --git a/apps/shorty/appinfo/app.php b/apps/shorty/appinfo/app.php
deleted file mode 100644
index 635fda4ee2..0000000000
--- a/apps/shorty/appinfo/app.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file appinfo/app.php
- * @brief Basic registration of plugin at ownCloud
- * @author Christian Reiner
- */
-
-OC::$CLASSPATH['OC_Shorty_Backend']       = 'apps/shorty/lib/backend.php';
-OC::$CLASSPATH['OC_Shorty_Exception']     = 'apps/shorty/lib/exception.php';
-OC::$CLASSPATH['OC_Shorty_HttpException'] = 'apps/shorty/lib/exception.php';
-OC::$CLASSPATH['OC_Shorty_L10n']          = 'apps/shorty/lib/l10n.php';
-OC::$CLASSPATH['OC_Shorty_Meta']          = 'apps/shorty/lib/meta.php';
-OC::$CLASSPATH['OC_Shorty_Query']         = 'apps/shorty/lib/query.php';
-OC::$CLASSPATH['OC_Shorty_Tools']         = 'apps/shorty/lib/tools.php';
-OC::$CLASSPATH['OC_Shorty_Type']          = 'apps/shorty/lib/type.php';
-
-OCP\App::addNavigationEntry ( array ( 'id' => 'shorty_index',
-                                     'order' => 71,
-                                     'href' => OCP\Util::linkTo   ( 'shorty', 'index.php' ),
-                                     'icon' => OCP\Util::imagePath( 'shorty', 'shorty.svg' ),
-                                     'name' => 'Shorty' ) );
-
-OCP\App::register         ( array ( 'order' => 71, 'id' => 'shorty', 'name' => 'Shorty' ) );
-OCP\App::registerAdmin    ( 'shorty', 'settings' );
-OCP\App::registerPersonal ( 'shorty', 'preferences' );
-OCP\Util::connectHook ( 'OC_User', 'post_deleteUser', 'OC_Shorty_Hooks', 'deleteUser');
-
-?>
diff --git a/apps/shorty/appinfo/database.xml b/apps/shorty/appinfo/database.xml
deleted file mode 100644
index 0cac24dbf2..0000000000
--- a/apps/shorty/appinfo/database.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
--->
-
-<!--
-  /**
-  * @file appinfo/database.xml
-  * @brief Database scheme definition for plugins tables
-  * @author Christian Reiner
-  */
- -->
-
-<database>
-  <name>*dbname*</name>
-  <create>true</create>
-  <overwrite>false</overwrite>
-  <charset>latin1</charset>
-  <table>
-    <name>*dbprefix*shorty</name>
-    <declaration>
-      <field>
-        <name>id</name>
-        <type>text</type>
-        <notnull>true</notnull>
-        <length>12</length>
-      </field>
-      <field>
-        <name>status</name>
-        <type>text</type>
-        <default>'shared'</default>
-        <notnull>true</notnull>
-        <length>10</length>
-      </field>
-      <field>
-        <name>title</name>
-        <type>text</type>
-        <default>''</default>
-        <notnull>true</notnull>
-        <length>80</length>
-      </field>
-      <field>
-        <name>favicon</name>
-        <type>text</type>
-        <default>''</default>
-        <notnull>false</notnull>
-        <length>1024</length>
-      </field>
-      <field>
-        <name>source</name>
-        <type>text</type>
-        <notnull>true</notnull>
-        <length>4096</length>
-      </field>
-      <field>
-        <name>target</name>
-        <type>text</type>
-        <notnull>true</notnull>
-        <length>4096</length>
-      </field>
-      <field>
-        <name>user</name>
-        <type>text</type>
-        <notnull>true</notnull>
-        <length>64</length>
-      </field>
-      <field>
-        <name>until</name>
-        <type>date</type>
-        <notnull>false</notnull>
-        <default></default>
-      </field>
-      <field>
-        <name>created</name>
-        <type>date</type>
-        <notnull>false</notnull>
-        <default></default>
-      </field>
-      <field>
-        <name>accessed</name>
-        <type>timestamp</type>
-        <notnull>false</notnull>
-        <default></default>
-      </field>
-      <field>
-        <name>clicks</name>
-        <type>integer</type>
-        <default>0</default>
-        <notnull>true</notnull>
-        <unsigned>true</unsigned>
-        <length>10</length>
-      </field>
-      <field>
-        <name>notes</name>
-        <type>text</type>
-        <default>''</default>
-        <notnull>true</notnull>
-        <length>4096</length>
-      </field>
-
-      <index>
-        <name>shorty_id</name>
-        <unique>true</unique>
-        <field>
-          <name>id</name>
-          <sorting>descending</sorting>
-        </field>
-      </index>
-      <index>
-        <name>shorty_user</name>
-        <unique>false</unique>
-        <field>
-          <name>user</name>
-          <sorting>ascending</sorting>
-        </field>
-      </index>
-      <index>
-        <name>shorty_source</name>
-        <unique>false</unique>
-        <field>
-          <name>source</name>
-          <sorting>ascending</sorting>
-        </field>
-      </index>
-    </declaration>
- </table>
-</database>
diff --git a/apps/shorty/appinfo/info.xml b/apps/shorty/appinfo/info.xml
deleted file mode 100644
index bbee9dd673..0000000000
--- a/apps/shorty/appinfo/info.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!--
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
--->
-
-<!--
-  /**
-  * @file appinfo/info.xml
-  * @brief Definition of central information about this plugin
-  * @author Christian Reiner
-  /*
- -->
-
-<info>
-	<id>shorty</id>
-	<name>Shorty</name>
-	<description>Shorty offers a service to store, manage and use a collection of short links
-pointing to ressources in the web. The features are a combination of a
-centralized bookmarks collection, an url shortener and an access control.
-The collection is presented as a link of "shorties", a shorty can be created
-either manually in the list ("New") or by using the "Shortlet". The Shortlet
-is something like a Booklet, a JS based bookmark meant to be stored inside the
-bookmark toolbar or area of a web browser. When clicked, the page currently
-open in the browser will be offered to be added to the list of existing shorties.
-For more information see: http://apps.owncloud.com/content/show.php/Shorty?content=150401
-Current version: 0.2.2 (06.06.2012)</description>
-	<version>0.2.2</version>
-	<licence>AGPL</licence>
-	<author>Christian Reiner</author>
-	<require>4</require>
-        <public>
-          <shorty_relay>relay.php</shorty_relay>
-          <shorty_qrcode>qrcode.php</shorty_qrcode>
-        </public>
-</info>
diff --git a/apps/shorty/appinfo/migrate.php b/apps/shorty/appinfo/migrate.php
deleted file mode 100644
index 5efce251a6..0000000000
--- a/apps/shorty/appinfo/migrate.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file appinfo/migrate.php
- * @brief OC migration support
- * @author Christian Reiner
- */
-
-class OC_Migration_Provider_Shorty extends OC_Migration_Provider
-{
-
-  function export ( )
-  {
-    OCP\Util::writeLog ( 'migration','starting export for Shorty', OCP\Util::INFO );
-    $options = array(
-      'table'=>'shorty',
-      'matchcol'=>'user',
-      'matchval'=>$this->uid,
-      'idcol'=>'id'
-    );
-    $ids = $this->content->copyRows( $options );
-    $count = OC_Shorty_Tools::countShorties();
-    // check for success
-    if(   (is_array($ids) && is_array($count))
-      && (count($ids)==$count['sum_shortys']) )
-        return true;
-    else return false;
-  } // function export
-
-  function import ( )
-  {
-    switch( $this->appinfo->version )
-    {
-      default:
-      $query  = $this->content->prepare( "SELECT * FROM shorty WHERE user_id LIKE ?" );
-      $result = $query->execute( array( $this->olduid ) );
-      if (is_array(is_array($result)))
-      {
-        while( $row = $result->fetchRow() )
-        {
-          $param = array (
-            'id'       => $row['id'],
-            'status'   => $row['status'],
-            'title'    => $row['title'],
-            'favicon'  => $row['favicon'],
-            'source'   => $row['source'],
-            'target'   => $row['target'],
-            'user'     => $row['user'],
-            'until'    => $row['until'],
-            'created'  => $row['created'],
-            'accessed' => $row['accessed'],
-            'clicks'   => $row['clicks'],
-            'notes'    => $row['notes'],
-          );
-          // import each shorty one by one, no special treatment required, since no autoincrement id is used
-          $query = OCP\DB::prepare( sprintf ( "INSERT INTO *PREFIX*shorty(%s) VALUES (%s)",
-                                              implode(',',array_keys($param)),
-                                              implode(',',array_fill(0,count($param),'?')) ) );
-          $query->execute( $param );
-        } // while
-      } // if
-      break;
-    } // switch
-    // check for success by counting the generated entries
-    $count = OC_Shorty_Tools::countShorties();
-    if(   (is_array($result) && is_array($count))
-      && (count($result)==$count['sum_shortys']) )
-        return true;
-    else return false;
-  } // function import
-
-} // class OC_Migration_Provider_Shorty
-
-// Load the provider
-new OC_Migration_Provider_Shorty ( 'shortys' );
-
-?>
diff --git a/apps/shorty/css/preferences.css b/apps/shorty/css/preferences.css
deleted file mode 100644
index 37a86a534a..0000000000
--- a/apps/shorty/css/preferences.css
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file css/preferences.css
- * @brief Style definitions for the user preference dialog
- * @author Christian Reiner
- */
-
-#shorty img {
-  vertical-align: middle;
-  margin:0;
-  padding:0;
-}
-#shorty #shortlet {
-  outline: medium none;
-  padding: 0.6em 0.8em;
-  background-image: -moz-linear-gradient(center bottom, Lavender 0%, white 50%);
-  border: 1px solid #DDDDDD;
-  border-radius: 0.5em 0.5em 0.5em 0.5em;
-  box-shadow: 0 1px 0 #BBBBBB inset;
-}
-#shorty #shortlet a {
-  font-style: italic;
-  color: DarkSlateGray;
-}
-#shorty #shortlet:after {
-  content: url("%appswebroot%/apps/shorty/img/drag_me.png");
-  position: relative;
-  top: -12px;
-  margin-left: -160px;
-}
-#shorty .chzn-container {
-    vertical-align: middle;
-}
-
-#shorty .title {
-  margin-bottom: 0.6em;
-}
-
-#shorty .aspect {
-  display: inline-block;
-  font-weight: bold;
-  width: 6em;
-  margin: 0 0.2em 0.4em 0;
-}
-
-#shorty .explain {
-  display: inline-block;
-  font-style: italic;
-  margin: 0.3em;
-}
-
-#shorty .example {
-  font-family: Monospace;
-  margin: 0.3em;
-}
-
-#shorty a.external {
-  text-decoration:underline;
-}
-#shorty a.external:after {
-  content:url("%appswebroot%/apps/shorty/img/actions/external.png");
-  margin-left:0.3em;
-}
-
-#verification #hourglass {
-  display: block;
-  text-align: center;
-  width: 100%; height: 100%;
-  margin-top: 20px;
-}
-
-#verification #failure {
-  display: none;
-  position: absolute;
-}
-
-#verification #success {
-  display: none;
-  position: absolute;
-}
-
-#verification legend {
-  width: 100%;
-  text-align: center;
-}
diff --git a/apps/shorty/css/settings.css b/apps/shorty/css/settings.css
deleted file mode 100644
index e92031d891..0000000000
--- a/apps/shorty/css/settings.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file css/settings.css
- * @brief Style definitions for the system settings dialog
- * @author Christian Reiner
- */
-
-#shorty img {
-  vertical-align: middle;
-  margin:0;
-  padding:0;
-}
-#shorty .aspect {
-  display: inline-block;
-  font-weight: bold;
-  width: 6em;
-  margin: 0 0.2em 0.4em;
-}
-
-#shorty .explain {
-  display: inline-block;
-  font-style: italic;
-  margin: 0.3em;
-}
-
-#shorty .example {
-  font-family: Monospace;
-  margin: 0.3em;
-  text-decoration: underline;
-  color: blue;
-}
-
-#shorty .title {
-  margin-bottom: 0.6em;
-}
diff --git a/apps/shorty/css/shorty.css b/apps/shorty/css/shorty.css
deleted file mode 100644
index b071f06f77..0000000000
--- a/apps/shorty/css/shorty.css
+++ /dev/null
@@ -1,488 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file css/shorty.css
- * @brief Style definitions of the plugins own view
- * @author Christian Reiner
- */
-
-/* everything :-) */
-#content { overflow: auto; }
-
-/* a case sensitive help button */
-#content #controls #help {
-/*   float:right; */
-}
-/* adapt optical appearance in case the help button is pushed into the header */
-#header #help {
-  float:right;
-  background-color:blue;
-}
-
-/* the shorty desktop, a canvas, contains all elements except of those pushed into the header */
-#desktop {
-  display: inline-block;
-  position: absolute;
-/*   width: 100%; height: 100%; */
-  background: transparent;
-  text-align: left;
-  margin-top: 30px;
-  padding: 2.5em 0.5em;
-  padding-top: 20px;
-}
-/* top bar, holding main control elements */
-#controls {
-  display: none;
-}
-/* a dialog for verification of the static backend setup */
-#verification {
-  overflow: hidden;
-}
-#verification p {
-  padding-bottom:0.4em;
-}
-
-/* an activity visualizer, currently a 'rotating timer wheel' */
-#hourglass {
-  display: none;
-  position: absolute;
-  width: 100%; height: 100%;
-  z-index: 1;
-  background: transparent;
-}
-#hourglass img {
-  margin:4em 8em;
-}
-/* a replacement list visualized in case the 'real' list is empty */
-#vacuum {
-  display: none;
-  position: absolute;
-  left:8em; top:9em;
-  width: 100%; height: 100%;
-  z-index: 2;
-  white-space: nowrap;
-  font-style: italic;
-  background: transparent;
-}
-.shorty-standalone #busy {
-  display: none;
-  float: right;
-}
-
-/* the list of shorties */
-#list {
-  display: inline;
-  position: absolute;
-  z-index: 3;
-  margin: 0.4em;
-  background: transparent;
-  table-layout: fixed;
-  width: 100%;
-}
-/* the collapsable toolbar below the lists column title row */
-#list thead #toolbar img {
-  cursor: pointer;
-  vertical-align: middle;
-}
-#list thead #toolbar img.shorty-sorter {
-  opacity:0.6;
-}
-/* last column in the list, content usually invisible, except when hovered */
-#list thead #toolbar img.shorty-active {
-  border:1px solid #888888;
-  border-radius: 0.3em;
-}
-#list thead tr:nth-child(2) > th {
-  padding-bottom:0.5em;
-}
-/* somewhat more fixed layout for the table */
-#list thead #titlebar th span {
-  display:inline-block;
-}
-#list tbody th#title,
-#list tbody td#title,
-#list tbody th#target,
-#list tbody td#target {
-  width:10em;
-}
-#list thead #clicks span {
-  width:3em;
-}
-#list thead #until span {
-  width:5em;
-}
-#list thead #toolbar input,
-#list thead #toolbar .chzn-container {
-  width:6em;
-  font-size: 11px;
-  margin: 0;
-  padding: 0.4em 0.3em 0.2em;
-  vertical-align: baseline;
-  background-color:#FFFFFF;
-}
-
-/* column title apeparance */
-#list thead th {
-  font-weight: bold;
-  padding: 1px 6px;
-}
-#list thead th#clicks,
-#list thead th#until,
-#list thead th#actions {
-  text-align: center;
-}
-/* hide the dummy row */
-#list thead tr:last-child { display: none; }
-/* hide the content of the 'actions' column, except when being hovered */
-#list tbody tr td span.shorty-actions {
-  visibility:visible;
-  opacity:0;
-  transition: opacity 500ms;
-  -moz-transition: opacity 500ms;
-  -webkit-transition: opacity 500ms;
-  -ms-transition: opacity 500ms;
-  -o-transition: opacity 500ms;
-  width:100px;
-  overflow:auto;
-}
-#list tbody tr:hover td span.shorty-actions {
-  opacity:1;
-  transition: opacity 500ms;
-  -moz-transition: opacity 500ms;
-  -webkit-transition: opacity 500ms;
-  -ms-transition: opacity 500ms;
-  -o-transition: opacity 500ms;
-}
-/* highlight a specific, 'clicked' row in the list */
-#list tbody tr.clicked {
-  border-radius: 0.5em;
-  background-color:#EEEEEE;
-  box-shadow: 0 0 0.5px #777777;
-  transition: background-color 500ms;
-  -moz-transition: background-color 500ms;
-  -webkit-transition: background-color 500ms;
-  -ms-transition: background-color 500ms;
-  -o-transition: background-color 500ms;
-}
-/* strike through visible content of rows (entries) marked as deleted */
-#list tbody tr.deleted>#title,
-#list tbody tr.deleted>#target,
-#list tbody tr.deleted>#clicks,
-#list tbody tr.deleted>#until {
-  color: gray;
-  text-decoration: line-through;
-  background: transparent url('%appswebroot%/apps/shorty/img/status/strike.png') 0 50% repeat-x;
-}
-/* replace the 'delete' action icon by an 'undelete' icon */
-#list tbody tr.deleted>#actions #del:after {
-  content: url("%appswebroot%/apps/shorty/img/actions/recycle.png");
-  position: relative;
-  top: 3px;
-  margin-left: -19px;
-  padding: 0;
-  opacity: 0;
-}
-#list tbody tr.deleted:hover>#actions #del>img {
-  opacity: 0;
-}
-#list tbody tr.deleted:hover>#actions #del:after {
-  opacity: 1;
-}
-/* general table cell appearance */
-#list tbody td {
-  padding: 1px 6px;
-}
-#list tbody td#until {
-  text-align: center;
-}
-#list tbody td#clicks {
-  text-align: right;
-  margin-right: 0.4em;
-}
-/* prettyfied select boxes */
-#content span.shorty-select select {
-  width: 6.4em;
-  margin: 0;
-  padding: 0.2em;
-  opacity:0.8;
-  border:0 none;
-  font-size: 10px;
-}
-#content span.shorty-select {
-  border: 1px solid #DDDDDD;
-  border-radius: 0.5em 0.5em 0.5em 0.5em;
-  box-shadow: 0 1px 1px #FFFFFF, 0 1px 0 #BBBBBB inset;
-  outline: medium none;
-  padding: 2px;
-}
-/* general style of interactive dialogs */
-.shorty-dialog {
-  display: none;
-  color: black;
-  border-bottom-left-radius: 1em;
-  border-bottom-right-radius: 1em;
-  box-shadow: 0 2px 1px #777777;
-  vertical-align:middle;
-  z-index:100;
-}
-.shorty-dialog fieldset {
-  position:relative;
-  border-bottom-left-radius: 0.5em;
-  border-bottom-right-radius: 0.5em;
-  border: 1px solid gray;
-  padding: 2px 4px 8px;
-}
-.shorty-dialog br {
-  clear: left;
-}
-.shorty-dialog legend {
-  font-weight: bold;
-  margin: 0 0 0 5px;
-  padding: 0 0.5em 0 0.2em;
-}
-.shorty-dialog legend a {
-  padding: 0;
-}
-.shorty-dialog textarea {
-  width: 80%; height: 5em;
-  background: none repeat scroll 0 0 #F8F8F8;
-  color: #555555;
-  border: 1px solid #DDDDDD;
-  border-radius: 0.5em;
-  cursor: text;
-  vertical-align:baseline;
-  margin: 0.3em;
-}
-.shorty-dialog textarea:hover,
-.shorty-dialog textarea:active {
-  background-color: #FFFFFF;
-  color: #333333;
-  opacity: 1;
-}
-.shorty-dialog input {
-  width: 80%;
-}
-.shorty-dialog a,
-.shorty-dialog input,
-.shorty-dialog select,
-.shorty-dialog textarea,
-.shorty-dialog button {
-  padding: 0.4em 0.2em;
-}
-.shorty-dialog input[readonly],
-.shorty-dialog select[readonly],
-.shorty-dialog textarea[readonly],
-.shorty-dialog button[readonly] {
-  border: 0 none;
-/*   box-shadow: 0 0 0; */
-  box-shadow: 0 0 0 #FFFFFF;
-  outline: none;
-  background: none;
-  background-color: #F7F7F7;
-  padding: 0.3em 0.3em;
-}
-.shorty-dialog button#confirm {
-  width: 12em; height: 2em;
-  border: 1px solid lightgray;
-  background-color: #EEEEEE;
-}
-.shorty-dialog button#confirm.sharp {
-  background-color: white;
-}
-.shorty-dialog button#confirm.sharp:hover {
-/*   border-color: green; */
-  border: 1px solid gray;
-}
-
-/* dialogs floating above other content ('standing alone') */
-.shorty-standalone {
-  width: 46em;
-  margin: -1px 1em 0;
-  padding: 0.5em;
-  background: none repeat scroll 0 0 #F7F7F7;
-}
-.shorty-standalone fieldset {
-  width: 45em;
-}
-/* dialogs related to elements ('embedded in the content') */
-.shorty-embedded {
-  left: 6em;
-  width: 34em;
-  margin: -1px 4em 0;
-  padding: 0.5em;
-  background: none repeat scroll 0 0 #EEEEEE;
-  position: absolute;
-}
-.shorty-embedded fieldset {
-/*   width: 32em; */
-}
-.shorty-embedded a#source,
-.shorty-embedded a#relay,
-.shorty-embedded a#target {
-  display: inline-block;
-  width: 26em;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  vertical-align: middle;
-}
-.shorty-embedded a.shorty-clickable:before {
-  content:url("%appswebroot%/apps/shorty/img/actions/external.png");
-  margin-right:0.3em;
-}
-.shorty-embedded select {
-  margin: 0 0 0.2em 1.0em;
-  padding: 0.2em 0.4em 0.2em 0.2em;
-  border: 0 none;
-  background-color: #F4F4F4;
-}
-.shorty-embedded img.shorty-usage {
-  opacity: 0.6;
-  margin: 1em 1.5em 0.2em;
-  padding: 0;
-}
-.shorty-embedded img.shorty-usage.disabled {
-  opacity: 0.2;
-}
-.shorty-embedded img.shorty-usage:not(.disabled):hover {
-  cursor: pointer;
-}
-.shorty-dialog label {
-  display: inline-block;
-  clear:none;
-  width: 5.5em;
-  text-align: left;
-  vertical-align: baseline;
-  padding: 0.6em 0.5em 0.4em 0.3em;
-  cursor: default;
-}
-.shorty-dialog span {
-  padding: 0.6em 0.5em 0.4em 0.3em;
-}
-.shorty-dialog span.label-line {
-  display: inline;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-/* elements (rows) freshly added to the list, this calss might trigger visual effects like pulsation */
-.shorty-fresh {
-  display: none;
-}
-/* elements (rows) currently filtered out (toolbars column filter options) */
-.shorty-filtered {
-  display: none;
-}
-/* style of all icons (as opposed to all images) */
-.shorty-icon {
-  display: inline;
-  background: transparent;
-  vertical-align: middle;
-  padding: 1px;
-}
-/* dim entries with expired 'until' dates */
-.shorty-expired {
-  color: gray;
-}
-/* but keep embedded dialogs readable */
-.shorty-expired .shorty-dialog {
-  color: black;
-}
-.shorty-expired img {
-  opacity : 0.2;
-}
-.shorty-expired .shorty-dialog img {
-  opacity : 1;
-}
-.shorty-expired #until {
-  text-decoration: line-through;
-}
-/* some general style flavours */
-.shorty-prompt {
-  margin-left: 4px;
-}
-.shorty-value {
-  margin-right: 4px;
-}
-.shorty-single {
-  padding: 0.5em 1em;
-}
-.shorty-single:hover {
-  background-color: #EAEAEA;
-}
-.shorty-single:hover .shorty-actions {
-  display: block;
-}
-.shorty-id {
-  color: black;
-}
-.shorty-date {
-  width: 40%;
-}
-.shorty-notes {
-  color: blue;
-  text-decoration: none;
-}
-.shorty-source {
-  color: gray;
-}
-.shorty-target {
-  color: green;
-}
-.shorty-meta {
-  margin: 0.1em;
-}
-/* close buttons in dialogs, embedded or standalone */
-.shorty-close-button {
-  display:inline;
-  float:left;
-  margin:0 0.8em 0 0.3em;
-  padding:0;
-}
-.shorty-close-button img {
-  vertical-align: middle;
-  margin:0;
-  padding:0;
-}
-/* unlike elsewhere we underline clickable links in dialogs */
-.shorty-clickable {
-  white-space: nowrap;
-  text-decoration: underline;
-}
-.shorty-framed {
-  display:inline-block;
-  padding:1em;
-  background-color:white;
-  border:1px solid black;
-}
-/* keep long entries like urls from disrupting the compact appearance of the list */
-.ellipsis {
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  width: inherit;
-}
\ No newline at end of file
diff --git a/apps/shorty/doc/CHANGELOG b/apps/shorty/doc/CHANGELOG
deleted file mode 100644
index b1b09b50fb..0000000000
--- a/apps/shorty/doc/CHANGELOG
+++ /dev/null
@@ -1,59 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-Changelog: 
-
-* Wed Jun 06 2012 Christian Reiner: version 0.2.2
-Added swallowing of accidential outputs during ajax requests.
-This protects the replies JSON struction from being corrupted.
-Additional server side log entries on level INFO
-* Sat Jun 02 2012 Christian Reiner: version 0.2.1
-Fixed broken Shortlet
-* Fri Jun 01 2012 Christian Reiner: version 0.2.0
-Support of ownCloud version 4 (app interface incompatible to prior versions)
-Additional status 'private' for Shortys only accessible for the owner himself
-Rudimentary SMS support for smart phones (more an assistance, can be disabled)
-Additional QRCodes to publish Shorty source urls on the web (or elsewhere)
-Data migration support as introduced by OC4
-Cleanup of Shortys upon user account deletion
-* Sun May 28 2012 Christian Reiner: version 0.1.6
-Activation of Shorty sharing via SMS. 
-Enhanced backend descriptions. 
-* Sat Apr 28 2012 Christian Reiner: version 0.1.5
-Target url verification is less strict now, this way also more 'exotic' urls notations are accepted.
-A few changes to the initilization scripts to prevent race conditions at startup.
-Changed url specification in the Shortlet to prevent conflicts with a serverside suhosin protection. 
-* Fri Apr 27 2012 Christian Reiner: version 0.1.4
-Visualization of busy state in dialogs whilst fetch meta data from targets.
-* Fri Apr 27 2012 Christian Reiner: version 0.1.3
-Prevented untimely submission of dialogs before having validated their contents.
-* Fri Apr 27 2012 Christian Reiner: version 0.1.2
-Fixed race conditions during initialization.
-* Thu Apr 26 2012 Christian Reiner: version 0.1.1
-Minor appearance corrections. 
-* Wed Apr 25 2012 Christian Reiner: version 0.1.0
-First official release. 
-* Tue Apr 24 2012 Christian Reiner: version 0.0.9
-Initial release.
-Buggy, but some parts actually working. 
diff --git a/apps/shorty/doc/CONFIGURATION b/apps/shorty/doc/CONFIGURATION
deleted file mode 100644
index 2a7dab60d1..0000000000
--- a/apps/shorty/doc/CONFIGURATION
+++ /dev/null
@@ -1,113 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-There are five aspects that can be configured:
-1.) System wide "static backend" (optional)
-2.) Selection of a backend per user (optional)
-3.) Import of the "shortlet" into a web browser (optional)
-4.) Access control inside each single "shorty" (implicit)
-5.) Sending of Shortys as SMS
-
-1.) System wide "static backend" (optional)
-(Requires adminisstrative rights)
-This optional setting enables a 'static backend'. That is a backend generting
-source urls based on a static base url, thus the name. That base url should be
-chosen as short as possible, since this defines the total length of all links
-to be posted and used. Most likely the definition of that url requires the
-configuration of rewrite rules on the server side. So it is only an option for
-experienced adminsitrators with access to the server configuration, be it
-centralized or based on decentralized per-directory rules (".htaccess files").
-A basic example is packed in the .htaccess file (might be hidden in a directory
-listing because of the leading dot (.) in the name). The rules must be
-configured such that all requests to urls of the scheme <base url><shorty key>
-are mapped directly onto the web url of the shorty plugin
-(http://<domain>/<owncloud>/apps/shorty/). The <shorty key> is a string, 6-12
-characters long, hard to predict. It is guaranteed to be unique throughout the
-system (though in a technically crude manner...). The perfect situation for the
-definition of a meaningful static backend would be a domain with a very short
-name and configuration access to something close to the web root.
-A random example is my own domain "christian-reiner.info". Since that is not
-exactly short I would love to use the additional domain "c-r.info" for the sole
-purpose of a static backend. Unfortunately that domain has been reserved by a
-domain grabber who asks thousands of Euros for it ! So that's no option. At
-least you should try to find a setup where the web path of the ownCloud
-application is not part of the base url. So that you get something like
-http://<domain name>/<shorty key>.
-(Note that the shorty key is NOT part of the base url configuration).
-You can easily test your setup any time by clicking on the example dynamically
-visualized next to the configuration option. It runs a simple self-tests of the
-setup in background.
-There is no need that the base url must be served by the same http server that
-serves the owncoud system. A static rewrite setup may well forward short source
-urls to the shorty plugin inside a remote ownCloud installation. However, it is
-a known issue that the internal validation of the setup won't work with such
-scenario. 
-
-2.) Selection of a backend per user (optional)
-To generate the a source url that is part of every shorty the plugin uses a
-backend. The configuration is done by using a preference option in the personal
-preference section of the configuration. You can simply chose one of the
-offered backends (combo box). Changing the backend does not affect any
-previously generated shorties. Meaning they stay valid and usable and keep
-their once defined source url.
-
-Different backends are implemented:
-i.) "-none-"
-As you have guessed this is something like a "dummy" backend without any
-implemented logic. That means the source urls generated are exactly based on
-the web url of the shorty plugin in your ownCloud system. This is not a very
-clever setup, but it certainly works and keeps your data private.
-ii.) "static backend"
-If configured in the system administration a "static backend" is offered. For a
-description see C-1. This backend typically offers shorter source urls, but its
-setup required administrative rights on some http server system.
-iii.) online services (url shorteners)
-A few online services are offered as backends to generate short source urls.
-Usage of some of those services requires you to open a free account at their
-site. Detailed configuration requirements are displayed for the chosen backend.
-If you don't care for details and just want short urls then have a try with the
-tin.ny backend. No registration required, reliable service. But keep in mind
-you depend on an external service as opposed to using a local static backend.
-
-3.) Import of the "shortlet" into a web browser  (optional)
-Shorty comes with a neat little "Shortlet" offered in the personal preferneces
-section of ownCloud. It is a "button" you can import into your web browsers
-bookmark toolbar or area by simple drag & drop. The Shortlet should work with
-most modern browsers, though probably not all. Just have a try with it.
-
-4.) Access control inside each single "shorty" (implicit)
-There are a few attributres you can configure freely inside each stored shorty:
-- a title just shown inside the shorty plugin (serves recognition).
-- a notes area, maybe you want to write down whom you send the shorty ?
-- a status option that controls the usage of the shorty.
-
-5.) Sending of Shortys as SMS
-Besides sending of Shortys as email message and copying a Shortys source url 
-to the clipboard a third action can be enabled inside the sharing dialog: 
-To send a Shortys source url as SMS. 
-However, the approach is extremely minimalistic, it relies on the client system 
-to correctly handle a 'sms url'. This is typically only given on a mobile 
-device, a smart phone. In addition, such url does not allow to specify a message
-body, so the Shortys source url has to be copied and pasted manually. 
-The option is disabled by default. 
diff --git a/apps/shorty/doc/COPYRIGHT b/apps/shorty/doc/COPYRIGHT
deleted file mode 100644
index 5e501826f2..0000000000
--- a/apps/shorty/doc/COPYRIGHT
+++ /dev/null
@@ -1,23 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
diff --git a/apps/shorty/doc/CREDITS b/apps/shorty/doc/CREDITS
deleted file mode 100644
index 8f7a3dd037..0000000000
--- a/apps/shorty/doc/CREDITS
+++ /dev/null
@@ -1,32 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-The shorty plugin has been developed by:
-
-Christian Reiner, Hamburg, Germany
-E-Mail: foss@christian-reiner.information
-
-Contributions:
-I'd be more than happy to welcome all contributions to this little experiment.
-Drop me a note, an idea, a patch, a good bottle of wine, anything !
diff --git a/apps/shorty/doc/INSTALLATION b/apps/shorty/doc/INSTALLATION
deleted file mode 100644
index 0a98605376..0000000000
--- a/apps/shorty/doc/INSTALLATION
+++ /dev/null
@@ -1,53 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-This package is a plugin for the ownCloud web application ("ownCloud app").
-
-There are two ways of installation: automatic and manual
-
-* Automatic installation:
-You need login to your ownCloud using an account with administrative rights.
-Open the 'Apps' section of the adminstration and select 'shorty', enable it.
-Then go on below with the basic configuration steps. 
-
-* Manual installation:
-Download the package from here: 
-http://apps.owncloud.com/content/show.php/Shorty?content=150401
-Create a subfolder 'shorty' in the "apps" subfolder of your ownCloud web root.
-Unpack the contents of the package into the new folder 'shorty'.
-Now load ownCloud in your favorite web browser and login with an administrative
-account.
-Enable the plugin in the "Apps" section of the configuration ("*") inside
-ownClouds web gui (requires admin rights).
-
-* Basic configuration steps for BOTH types of installation: 
-The "Admin" section of the configuration allows to configure a base url to
-enable usage of the static backend (see USAGE).
-The "Preferences" section of that configuration now offers two elements:
-- a "Shortlet" to be dragged to the browsers bookmark area (see USAGE).
-- a configuration of a backend to use to generate source urls (see USAGE).
-The main part of the plugin can be accessed in the navigation menu as "Shorty".
-
-***
-Have fun !
diff --git a/apps/shorty/doc/ISSUES b/apps/shorty/doc/ISSUES
deleted file mode 100644
index 083c464863..0000000000
--- a/apps/shorty/doc/ISSUES
+++ /dev/null
@@ -1,58 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-This is a short list of known issues:
-
-- The datepicker popup in the edit dialog fails to set the expiration date: 
-I have no idea what the problem is. Exactly the same object works flawlessly
-in the dialog to create a new shorty. I can't see any difference, except in
-the edit dialog the date is taken from the existing row entry (working fine).
-Maybe there is some sort of magic spell to awake a datepicker after changing
-its date value ? No idea...
-
-- Clicking on a source or relay url from within the sharing dialog updates the
-clicks counter and access time correctly, but the shown list entry is not
-updated accordingly. 
-
-- Shorty does not work in the konqueror web browser
-All appears to be working fine except for one annoying thing:
-the standalone dialogs won't open ! (show, create and edit entries)
-Therefore Shorty is currently more or less useless in this browser.
-
-- Shorty does not work in the rekonq web browser
-The basic navigation elements (menu left) work, but the desktop stays empty.
-Apparently no script is executed, an issue with the js document.ready event.
-
-- It appears there is an issue with setting opacity in the Safari browser:
-The status filter in the lists toolbar shows an ugly black brick instead of a
-dimmed icon overlay. Also some other style issues appear, but the plugin seems
-to be completely usable.
-
-- When internally validating the setup of the base url used in the static
-backend you get a false positive ("doesn't work") although things are fine, if
-the mapping of base url to shorty plugin is done via a redirect. This is for
-exaple the case if you implement the mapping on a remote server because you
-want to use a different domain name for statically shortened urls.
-The reason is that jqueries ajax calls won't handle redirects internally. A
-wrapper will have to be implemented. 
diff --git a/apps/shorty/doc/README b/apps/shorty/doc/README
deleted file mode 100644
index 4f590f30cd..0000000000
--- a/apps/shorty/doc/README
+++ /dev/null
@@ -1,42 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-This "shorty" package implements a plugin for the ownCloud web application.
-Shorty offers a service to store, manage and use a collection of short links
-pointing to ressources in the web. The features are a combination of a
-centralized bookmarks collection, an url shortener and a basic access control.
-The collection is presented as a list of "shorties". A shorty can be created
-either manually in the list ("New shorty") or by using the "Shortlet". The
-Shortlet is something like a Bookmarklet, a script based bookmark meant to be
-stored inside the bookmark collection of a web browser. When clicked, the page
-currently open in the browser will be added to the list of existing shorties.
-
-Each Shorty contains a source and a target url. The source url can be used to
-be posted in forums, sent inside an email message or whatever. It is typically
-shorter than the target url, a full blown web url. But that actually depends
-on the target url and the backend used. The target url is the ressource
-identified by the shorty. Basic access control is implemented to control the
-access of shorties posted to forums or sent per email, but not on a per user or
-per group base. Existing shorties can be blocked for usage, set to expire on a
-certain date and obviously can be removed permanently again.
diff --git a/apps/shorty/doc/ROADMAP b/apps/shorty/doc/ROADMAP
deleted file mode 100644
index b18099c9af..0000000000
--- a/apps/shorty/doc/ROADMAP
+++ /dev/null
@@ -1,96 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-Future versions might implement additional features and services. Currently
-planned are the following:
-
-* Ability to create Shortys directly from shared files inside ownCloud
-Creating a Shorty based on the public url generated for shared files works like
-charm. However it is not very convenient to do that manually. It would be great
-to offer that option directly where file sharing is done, in that very dialog.
-However I currently do not see any means to achieve that on ownCloud. There is
-no feature offered to hook additional functionality into exsiting apps.
-This means either the existing file sharing app has to be modified or such a
-modifying core feature has to be implemented into the ownCLoud core. 
-Or maybe someone has got another idea ?
-
-* Integrated proxy function as an alternative to forwarding:
-Currently all browser requests are forwarded to the final target url, provided
-that the referenced shorty is still valid and accessible. This is a simple but
-effective strategy. Offering a transparent proxy service as an alternative
-would greatly enhance the privacy protection, since the final target url of a
-referenced web ressource would never be handed out. 
-
-* Better, more fine grained access control:
-Currently the only means of access control, apart from defining or removing a
-shorty are its "status". The status can block an otherwise valid shorty from
-usage from outside ownCloud, it can restrict its access to authenticated users
-or it can make an existing shorty freely accessible to the public. Other
-ownCloud plugins allow to define individual access to content on per-user or
-per-group rules.
-
-* Support of further backends: 
-Currently the usage of six url shortener services is implemented, besides the
-two private or local ones. Unfortunately three of these had to be disabled due
-to stability issues. Besides correcting the implementation for the disabled it
-might make sense to support further backends, especially other types besides
-online services.
-
-* Performance, stability and usability enhancements: 
-"Shorty" is my first web application using up to date web technologies.
-Therefore the implementation certainly is far from the quality one could expect
-from a serious and experienced web developer. One could also put this into more
-constructive terms: there is definately much room for enhancements   :-) 
-
-* Translations of the shorty module itself (i18n/l10n):
-Main development language is english (us), a german translation exists. I do
-not feel fit enough in other languages to create a translation myself. So I
-certainly welcome any assistance in that aspect. The effort consists of editing
-one single file, take a look at the german example in file l10n/de.php. 
-
-* Usage of svg icons instead of png graphics:
-I created all icons in svg format. ownCloud implements a mechanism to use those
-in browsers supporting svg directly. However I did not yet figure out how to
-use that feature without adding too much scripting overhead. Is it possible
-to reference icons the ownCloud way directly in a php based template, without
-the need to explicit handling via javascript ?
-I wish a better API documentation would exist for ownCloud !
-
-* Localization for the date picker fields
-Currently date inputs (expiration date) are not validated explicitly.
-A number of formats work, are accepted correct, but there is no localization
-of the input format to the users language.
-
-* Integrated help button
-One thing I miss throughout the ownCloud application is a context sensitive
-help, or a help button at all ! Originally I planned to integrate on into this 
-plugin. However I think that is more something that should be implemented as a
-core feature of ownCloud. Maybe as a separate plugin (app). SOmehing like a
-help framework with a documented api where other plugins (and core apps) can
-attach help texts or documents to. Context sensivity would then simply mean to
-update the reference in the help button for each action taken.
-
-Contributions:
-I'd be more than happy to welcome all contributions to this little experiment.
-Drop me a note, an idea, a patch, a good bottle of wine, anything !
diff --git a/apps/shorty/doc/STATUS b/apps/shorty/doc/STATUS
deleted file mode 100644
index 0b85d14702..0000000000
--- a/apps/shorty/doc/STATUS
+++ /dev/null
@@ -1,42 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-The current status of this package is as follows:
-
-The initial release is definately buggy and contains annoying shortcomings.
-It has been developed on a linux system using a firefox browser, so this is
-most likely the best working combination. Basic usage test have been made with
-a few other browsers. The package appears to be working in general though there
-might be some minor differences in apeparance.
-
-Known shortcomings are:
-- only very basic input validation is done. 
-- access control is not yet fine grained, no user or group support exists.
-- markup, scripting and style definitions are the work of a web app newbie.
-
-So "sorry for any inconveniences" !
-
-Contributions:
-I'd be more than happy to welcome all contributions to this little experiment.
-Drop me a note, an idea, a patch, a good bottle of wine, anything !
diff --git a/apps/shorty/doc/USAGE b/apps/shorty/doc/USAGE
deleted file mode 100644
index a82f881992..0000000000
--- a/apps/shorty/doc/USAGE
+++ /dev/null
@@ -1,64 +0,0 @@
-*****
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*****
-
-=== Overview ===
-See file README.
-
-=== Installation ===
-See file INSTALLATION.
-
-=== Requirements ===
-ownCloud version 2 or newer on the server side.
-A css3 capable and reasonably standards conform web browser.
-A scripting capable bookmarks feature for the optional Shortlet thing. 
-
-=== Usage ===
-This is only a very basic description. The plugin should be fairly intuitive to
-use, just have a try with a few web urls. To get going I suggest that you
-- chose a backend (see configuration below).
-- import the shortlet into your preferred web browser (see configuration below).
-- define a few shorties either manually ("New") or by using the shortlet.
-All actions on existing shorties are accessed using the action icons shown to
-the right of the shorty in the list. Daily uses is probably based on selection
-the 'share' action and grabbing the visualized "source url".
-By clicking on the header row of the list of shorties you can open (and close)
-a "toolbox" offering options to sort, filter and reload the list. The sorting
-you chose is stored in a persistant manner, not so any filters defined. You
-cannot accidentially close the toolbox when there are still filters active. 
-You can remove (delete) existing shorties, but those shorties will only be
-marked as deleted. This way you can 'undelete' them if required. Permanent
-removal is done next time you access the shorty plugin. If you really want to
-make sure the removal is done NOW then simply reload the list. This is done in
-the "toolbox" of the list (click on the header row) by chosing the "reload"
-icon on the left (or by a simple browser reload). 
-
-=== PRIVACY ===
-Shorty allows you to stay more in control over links you post or send. It is up
-to you to decide wether a once posted link should stay valid and usable or not.
-However it is also very important to keep in mind that such form of control can
-never replace any serious form of access control over the content published via
-a published link. Shorty works as a short url resolver, meaning it forwards any
-requesting web browser to the real address of the published content. This might
-change when if future an integrated proxy function gets implemented, as opposed
-to the current forwarding mechanism. 
diff --git a/apps/shorty/img/actions/down.png b/apps/shorty/img/actions/down.png
deleted file mode 100644
index d2627e525eeeef58cbfb3b7e2056c39f89b3fb68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQrgJT^vI!
zdY4W<&D&tW<1Bk5L9+MarkR!v0vG<Qa(lJ%<7ewFPD0w7b(b<WsN``oA9%J={X5eO
z76<kNEv>ai_72CLoE;7yYO7_R5ShX0q0{z_=RqXTTg3w#3vO#SguPW!ycsVbxI2Ee
on|1Y!ea|%B6*r&L`F~7!PLfmF-5b%;KqoMGy85}Sb4q9e00IkFApigX

diff --git a/apps/shorty/img/actions/down.svg b/apps/shorty/img/actions/down.svg
deleted file mode 100644
index b01642681c..0000000000
--- a/apps/shorty/img/actions/down.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="layer1">
-  <path id="path3086" transform="matrix(0.000287724 1 -1 0.000287724 13.9983 1.99816)" fill="#000000" d="M2.22045e-15 0L12 6L0 12Z"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/actions/external.png b/apps/shorty/img/actions/external.png
deleted file mode 100644
index 5da1c41c45d4aa9d02f1136625e63cab26e00d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00004b3#c}2nYxW
zd<bNS00009a7bBm000Y#000Y#0XNCZtpET38FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10U}96K~xx(RgbZ1gHRZSk9skgV&T#f3f(fakR_na;LvvO<|O(Q
z!66PJxVYsJN}j-7nx$k4NG0e{2;3JCp$P<}c)6Vn=4}7RclbGy5CZ+o=X1(AzwNW8
zX&C7PUDqEqP5Uwo<E~@-{T@|SJza^M^9M@ljqAFYPNx8X<#LJ5W&>i|_PwTQAA}Iq
zG)*bb^Cn3WwG+F@k|d4B<FVm+-Wz~d%d$p65Fm;olx2Al2>=WR1HRpEK`F&zvA}Az
zLYk(hvMh&nUH>YIQpsJzaU7_siZBep7{hEf`#u~F@5kfuWw+ba7g3gF_`Z+HWCG9g
z06^q<{+VUj&*e2^Y#7IJ)s@!kwbHijUw;f~+m@Zr=jWm*u2u>mPW}5I_Qh}{)k8Bb
P00000NkvXXu0mjfi7c{{

diff --git a/apps/shorty/img/actions/external.svg b/apps/shorty/img/actions/external.svg
deleted file mode 100644
index 32453b1ca2..0000000000
--- a/apps/shorty/img/actions/external.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9.6pt" height="9.6pt">
-<defs/>
-<g id="defitem0">
-  <rect id="rect" transform="translate(1.5, 4.5)" fill="#ffffff" stroke="#585858" stroke-width="1.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4.00000000000" width="4.80000000000pt" height="4.80000000000pt"/>
-  <path id="arrow" transform="translate(2.75, 1)" fill="#303030" fill-rule="evenodd" d="M1.25 1.5L2.25 2.5L2.5 3.25L0 5.5L2.75 8.25L5 5.75L5.75 6L6.75 7L8.25 5.5L8.25 0L2.75 0Z"/>
-  <path id="gap" transform="translate(4, 2)" fill="#ffffff" fill-rule="evenodd" d="M2 0L6 0L6 4L5.5 4.75L4.25 2.75L1.25 6L0 4.75L3.25 1.75L1.25 0.5Z"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/actions/info.png b/apps/shorty/img/actions/info.png
deleted file mode 100644
index 2febafa33e53dc9e2b6ea32abaa8ed4d459801f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^+(0bA!3HD`>}{<BQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?i-Fp&gD|6$#_S59AbW|YuPgf<7GWMH1v$6L*+8L{o-U3d8t3<3
zSeVt6DANA%e#y}+iMYlMih8$M_OdqTo;8}Ld#@=xQFvPJy{3bufr8Dext)K6oqNE$
zuP&nI(!)9J_RnQL@oYRWTPW*?YvcO=X{O5algkdUSZ|-?UFRUq`zCfGTg1_Q%S(RD
zxN?5RBlh(dqn`);u5i*0;_f;9?uW;dvY9sgA0^CFRz9$Pa&u|oDehN+`j1QB?|c%t
m={?*0jAu{ewkek0>9yx&RrtQsu2~i6Xa-MLKbLh*2~7ZQ&~;$|

diff --git a/apps/shorty/img/actions/info.svg b/apps/shorty/img/actions/info.svg
deleted file mode 100644
index e92ab4fbf0..0000000000
--- a/apps/shorty/img/actions/info.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="595.277pt"
-   height="841.891pt"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="info.svg"
-   inkscape:export-filename="/srv/www/htdocs/owncloud/apps/shorty/img/actions/info.png"
-   inkscape:export-xdpi="1.4732735"
-   inkscape:export-ydpi="1.4732735">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="0.22425706"
-     inkscape:cx="372.0481"
-     inkscape:cy="526.18188"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4" />
-  <g
-     id="layer0"
-     transform="matrix(1,0,0,0.92242868,0,1.2000589)">
-    <g
-       id="g4314"
-       transform="translate(212.946,163.839)"
-       style="fill:none">
-      <path
-         id="path3536"
-         transform="translate(-61.9006,-148.543)"
-         d="m 0,487.048 c 12.4425,24.828 26.0633,44.836 51.6189,16.019 C 84.1849,485.573 192.482,410.026 184.704,480.779 155.218,612.203 117.891,742.51 90.9063,874.249 59.539,946.936 141.764,1009.03 222.092,959.781 308.42,926.996 381.595,875.821 456.598,828.62 445.035,807.645 436.536,777.24 408.795,806.094 371.289,821.672 291.128,891.94 272.933,836.765 298.192,694.682 351.067,556.912 382.294,415.755 414.151,350.273 353.103,270.879 270.187,326.914 169.549,367.14 86.8111,430.152 0,487.048 z M 357.158,0.174395 C 252.436,-0.955228 204.536,139.982 305.684,174.775 387.572,199.404 471.99,128.261 449.008,60.7166 441.179,25.4089 401.168,-2.47535 357.159,0.174395 z"
-         inkscape:connector-curvature="0"
-         style="fill:#000000" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/shorty/img/actions/left.png b/apps/shorty/img/actions/left.png
deleted file mode 100644
index e76cf4df2ed583874eea5fe14f75bed0a0d9b811..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQq6#T^vI!
zdXG-_<~m@&!TS7bie**aw_PvN11H?j3OR9z-B`dkWwuwY>aT8xOA}1qA1Hgpz&xXY
z|IL~EO_`1?daT+8A}I%#FW7TzpY|5sjk&$K{F*|sd+Yx9S_l8|zh&^yA{J;1gQu&X
J%Q~loCIH|5N;Uuh

diff --git a/apps/shorty/img/actions/left.svg b/apps/shorty/img/actions/left.svg
deleted file mode 100644
index 670f0c3069..0000000000
--- a/apps/shorty/img/actions/left.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="layer1">
-  <path id="path3086" transform="matrix(-1 0 0 1 14 2)" fill="#000000" d="M0 0L12 6L0 12Z"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/actions/minus.png b/apps/shorty/img/actions/minus.png
deleted file mode 100644
index 72ee0f69ff23c9ad4c44ddbc26bd27d33712efe3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m7>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?01-?S=o$tZ~RyY6mrcBi70W-&&^HE
zD*<vD81l>WoOAL^Qxu9b@{39;6$)}n(=+q95|c|Z^Ye=Jb2IZwi@7wMH5HsQiZY8!
zG86L@f>JZ{Qj0D|J8c5$5B79%4AD5B{O7!bgn=QCovRMVvz!0l2QIm1++viZQFZ=7
z)1noVz4EI1@A~opLG=S2@jG2H3zl&#nsKD%tWt<-gvh}u4+<_<tN1Urnp-HajERBO
WOW1bC(pS4c?(=l@b6Mw<&;$Vf6<!1Y

diff --git a/apps/shorty/img/actions/open.png b/apps/shorty/img/actions/open.png
deleted file mode 100644
index 54cdd3a2a4c63372579461d79d9d328f6c86067f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQt5dx;Tbd
z^sb$3%f)0U(7K;PEbc(m20{PiT-|SFV$nA{T3f|G*nGS8t!$Hh-uAw;3cC$wiY7g9
zbo#U}QBGK0X~`PLNx$V8T%IT=Fke}v9>Ay?z_9bxy^mY?xlS?|hRkMYeN)GJ#7H7K
z*4_BRtJCwuR%LJ>@NwSEkSf5?(~#XC*`UN`A-znv;6m*`R)%K>v=eF=y2B>c3M`ne
z&0oZ*);M8%SV#5(#=ZjvCd&Kf{Fk0v94xp~viL&n{9kkL-xbr#_?TR{0q7A1Pgg&e
IbxsLQ0H!o?_W%F@

diff --git a/apps/shorty/img/actions/open.svg b/apps/shorty/img/actions/open.svg
deleted file mode 100644
index 46e137d73f..0000000000
--- a/apps/shorty/img/actions/open.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon14, part of koffice: http://www.koffice.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-  <defs>
-  </defs>
-  <g id="layer1">
-    <path id="path3086" fill="#000000" d="M9 14L5 14L4 7L0 7L7 0L14 7L10 7Z"  transform="matrix(0.704343 0.70986 -0.70986 0.704343 8.03052 -1.90816)" />
-  </g>
-</svg>
diff --git a/apps/shorty/img/actions/plus.png b/apps/shorty/img/actions/plus.png
deleted file mode 100644
index f18d9c6c31ae9278df376035ef29bf51661b9d90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m7>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?01-?S=pq1GH1#Hg<LX2B1)X|b8}Pk
zN`PDjhWzq8=bZe~6oul9{GyUdg@T;Y^vpc2#N?99{Jdg)Ah(!H!&y_oIio1ExFj<%
zPa!BZGcUEM|MAS%K<%-fE{-7@=ac`OcaShJ<gs(r;dplQ|NFot_l#SNk~FH$KWJLC
zLU?{@HOKCkwo<)mvWKSF^6+ScE!HebOh~wKIN^*!N0QJr1&7e4tG;?X?+by-CM^$~
dd(MI*80d`$A}?-vhJ6M()YH|^Wt~$(69BjxVh{iT

diff --git a/apps/shorty/img/actions/recycle.png b/apps/shorty/img/actions/recycle.png
deleted file mode 100644
index 29444fd7fd9be41d17e5c25fb8f92361a6845333..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFxG%D<EC9b=|Dlr64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1TeL5e~$
zOL9^fic*s+lXFs=E{0SBCB#7zj-@3T`9%!Q8AX}JC7FqN3PGuvd8tLK;yK>}l?a2B
zxTF>*7iAWdWaj6=OxP-avJ)sR1d?_xN=*dGDTHL^rZN~A7#gj}Nxcb_bpgxf7gQEy
zre~BeI6EsimXs7_CY6F!XOxr_Sn2C0gLRjsCg<no=I0fI+^wIJnVgzeoLa1(RH<*Q
zXQ2P(`1>b7Z!h+AaSXBOt(|P09qK63x<6ljy->4;i=JDL%SOYkH#E$Y!kaES?G9<0
zV6R}ds5jz9<gJK~sVi#|6+7m-P3R~Ukq*}Q!Lj6m#Jg=XS5J1H)R=f~&E{)K>u(yT
zseKJN-k_PlC&BL4!0#acW6n(Z>l{XtlQxOYV61XrIDS>#Vf!N)W<Q>9Gk@M!P<qGU
z&i!%Eu2pIUqBjC(mNaa3_<WvW2anJ6_nxJ$XS4owbVwiYc*w)3&i?WE)zk%yR<EW{
z+cEF-ft^Y=9B-7A@>b<@NxZtF#<ubw3!lipnJ3O@evP%fP?vU&q5ek2n~?OYY&V1t
z<Rw&Jo%(&IC8y5RZFUTGTYdT%gbxV3Dlgrb=c}3TRLhgY_-)naQjrHr7o2Ou8iI2t
zPfHB{8zLFQuIG}rPh;u5;N8-!=g+L4S-G|;jwzYZM*qNyUmkb&pJe=}_j>y#JDEF&
zqC@woKHw@?A(}XQ*Mc;cJM2|oeRHlXfBof8?oazw`=lNS7D~TZQ_1acd6ml5&<B%t
zMSRnCwXwOd^IWl=jNs*&l~Om@d6+-HdR@1_-rQI`>tFnWNN$d^$vdNf(a+%N>gTe~
HDWM4fnX@cN

diff --git a/apps/shorty/img/actions/recycle.svg b/apps/shorty/img/actions/recycle.svg
deleted file mode 100644
index 61ee3ac840..0000000000
--- a/apps/shorty/img/actions/recycle.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="119.308pt"
-   height="121.472pt"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="recycle_arrows.svg">
-  <title
-     id="title2987">recycle</title>
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>recycle</dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
-        <dc:date>2012</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Christian Reiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>Copyright 2012: Christian Reiner</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:description>recycle</dc:description>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="965"
-     inkscape:window-height="679"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="1.5542677"
-     inkscape:cx="74.567497"
-     inkscape:cy="75.919998"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4" />
-  <g
-     id="layer0"
-     transform="matrix(-1,0,0,1,149.13468,0)"
-     inkscape:export-xdpi="9.6599998"
-     inkscape:export-ydpi="9.6599998"
-     inkscape:export-filename="/home/arkascha/Downloads/icons/recycle.png">
-    <path
-       id="path1298"
-       d="M 70.8025,151.722 C 37.2549,149.448 11.1077,128.26 2.59247,96.4481 -1.14036,82.5027 -0.820931,65.3241 3.41386,52.2741 10.1512,31.5121 26.9843,13.3207 46.7093,5.48511 82.2059,-8.61567 120.257,5.14042 139.563,39.0531 c 7.34,12.8923 10.355,26.3175 9.4,41.853 -0.76,12.368 -2.629,19.5529 -7.945,30.5419 -3.422,7.074 -5.716,10.094 -13.664,18 -6.689,6.653 -11.649,10.604 -16.551,13.184 -12.0281,6.329 -27.8135,9.916 -40.0005,9.09 z m 4.5,-19.274 0.5,-7.481 5.5,-0.737 c 12.7535,-1.708 24.6295,-7.529 34.4625,-16.892 11.858,-11.2904 18.207,-24.78 19.251,-40.9052 0.739,-11.3966 -0.975,-20.6043 -5.72,-30.7354 C 122.022,20.167 104.421,6.43624 87.9323,3.42918 78.3665,1.68465 61.6527,2.66382 53.3025,5.45794 32.3445,12.4709 14.6307,28.9197 7.32185,48.1551 c -8.71433,22.9342 -5.7724,50.0896 7.63305,70.4559 4.2466,6.452 11.0409,13.477 12.0541,12.464 0.2731,-0.273 -1.1342,-3.139 -3.1273,-6.368 -6.2607,-10.143 -10.5792,-24.58 -10.5792,-35.3665 0,-5.978 2.4851,-18.5157 4.962,-25.0345 6.7044,-17.6444 24.9878,-32.6283 45.6647,-37.4235 3.7707,-0.8745 7.4223,-2.0601 8.1146,-2.6347 0.7686,-0.6379 1.2587,-3.5049 1.2587,-7.3632 0,-3.4751 0.4448,-6.5934 0.9885,-6.9294 1.3812,-0.85363 8.7657,2.5714 15.6814,7.2734 7.1284,4.8465 13.9516,12.0276 19.3896,20.4063 3.307,5.0959 3.997,6.944 3.578,9.5846 -1.425,8.9891 -17.7832,27.9223 -29.4402,34.0753 -3.4665,1.8297 -6.8857,3.1031 -7.5982,2.8297 -0.7624,-0.2926 -1.5662,-3.0878 -1.9535,-6.793 -0.3619,-3.4627 -1.0505,-6.6884 -1.5303,-7.1681 -1.2221,-1.2221 -9.6586,3.2474 -16.2231,8.5948 -9.0772,7.3942 -17.8922,20.3499 -17.8922,26.2968 0,9.067 14.0387,25.185 28.5,32.72 7.3326,3.821 7.9129,3.458 8.5,-5.327 z"
-       inkscape:connector-curvature="0"
-       style="fill:#010101" />
-  </g>
-</svg>
diff --git a/apps/shorty/img/actions/reload.png b/apps/shorty/img/actions/reload.png
deleted file mode 100644
index 06df1f194e08eb4fdc722721be89ddbb5357d48c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1083
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47>@?{gt!8^&Fwu6EuCd`^>xkd
zRdvl}RrST?HAQ9BHI1z$6}1&Ljp^A1IR&N3={fPq8HuS`2`QO{rL{2$sabhNshN2x
z8M$#u>Dl=u|Ns978ij_MTDx1?dz;$2(NKMJM}12NkOW!^v>lFs+N&E{fL7NwwgE{r
z1eB_*ZGs@6Q-QKTHjn{CaPiX0I-nQIs~dnW2O=OFh=78HrBy%#^cNgKMDmKtfhf1I
z42~coS$V}k4`$>PX66<F89*-3k7-%?5Crr%5W%^?Kmdjh5GAE$0}+q`lmdnogbkDh
z1{x3n0}zOS!39JRHbgu&F%1m?gBOUR<5S=WA`%gk2n;Kr$AO*#x(a9rP-B%5<6>Y$
zPAm!X14b+^z@?!m!OO(WWPJC^fqFjG<uNR}Z+>Jk^UT~NpmgoqpOr$k@1D6aiBBrI
z{mr|2F)ND@>*QX>`Txq2{%&Cc(FuPyG1V?)WtuRN(c$A0N8{T+0(s~CJ8sX+WVUCW
zu=>G=i%N^<-8pTfx#-ik)dqadEh|=bdI&Nu>bEulI*BpK+ucR-P2ScHAcwQSBeEDs
zdw{Xq$!t3y<F%)YV~E7%<b(!BHv@)^GiJ<im@;Kc&zd<l9Y@zJIKi}J%9PNMt5+I%
z!gzgka~0Muwhr{a&v3%PWL8QJ(-PmaXLNPe-jKMlHaF+(n?@$SKEHE%>tuM|<W0V7
zYthIwFYcb*<l3DQfBrBt?Q~2lE-q$gZErDZX?1t`<PdX6SX5T{^Z{veRl7$1BhS5k
zW=)!N=)mk*)8-x2KX5=nVaCj<bCr)Am@s>Kd_aVXPE1VDtoSg!LkAS10xh?$+O=%k
zy1Fdq#Tp*#BZ7-hn<!-DW<O_@KBs^0;?1jfFW<hde~$m_&J7!mv~W&3bm)+S8H4qD
z!#5wM-2VdfwrYuML`h0wNvc(HQ7VvPFfuSS(ls#BH8Kk^GO#kS03vMzLn{M=SDrif
zp=ij>PsvQH#I0er2qP0vgCxj?;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6xT
Mp00i_>zopr03ji;1poj5

diff --git a/apps/shorty/img/actions/right.png b/apps/shorty/img/actions/right.png
deleted file mode 100644
index a252a751554e142eb9dda6daecf529b41ffb0bed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQlkLT^vI!
zdXHXq<YG|dVLotV`p=SjF@3ITjl0*HxOQ?#u5k5odb%a(H}?b?mFlPoEv9W@Yz_O~
z|4(AnJi+V~z*4Y~C&B5dX`JN4AA)xmvA1-IP0)Jx;b;DwstNwLZr%Qu3$%p6)78&q
Iol`;+0J=a((*OVf

diff --git a/apps/shorty/img/actions/right.svg b/apps/shorty/img/actions/right.svg
deleted file mode 100644
index 997068063e..0000000000
--- a/apps/shorty/img/actions/right.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="layer1">
-  <path id="path3086" transform="translate(2, 2)" fill="#000000" d="M0 0L12 6L0 12Z"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/actions/shade.png b/apps/shorty/img/actions/shade.png
deleted file mode 100644
index a49b9ad34c439039bf6abc7b315f3abb03c8c208..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 434
zcmV;j0ZsmiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm00076000760X~Lo!2kdN8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10WV2JK~y-6t<$keTu~4P;BT&*GGJk|*yc7#A>twyzCvChPY{IL
zr_&<%06u`PAiH2CmJ4pDl_|x-CNH2)iajfb>kT5wz`$W<{{PJR`A=k~IwGRQH%zco
z$_rfKG&67O`KAIk5z*liffH<%JSk%r5z$4&3r^Xf!8vBw%uGXxF{Wj<$;=mm4zs@j
z2Z(0qR?ly7KXfy;u{BWNESNTMh{((zJux@%3s3lznZJAeBV<$5o_ig~_=t7<9O%yr
z)&s`975DLsEcuMR0YM*L5nzNHJXQpcxW=eY&{&#eQmytKpRrce*6;-fRc(UB$kJiE
zI4g}0mI@C=ROj7-)#9$N!y7&r7ff3lY5ER=sg;rbi<K*quDt&UUkhMd&WB~~ZUxRv
c@vq<c56Cbl8ak&^>;M1&07*qoM6N<$g1H&6@Bjb+

diff --git a/apps/shorty/img/actions/shade.svg b/apps/shorty/img/actions/shade.svg
deleted file mode 100644
index 1823941c79..0000000000
--- a/apps/shorty/img/actions/shade.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="94.337173"
-   height="94.337173"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="up.svg">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview9"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="0.65555556"
-     inkscape:cx="76.57817"
-     inkscape:cy="35.476003"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4" />
-  <g
-     id="layer1"
-     transform="translate(-103.42183,-121.13883)">
-    <path
-       id="shape0"
-       transform="translate(132.93,152.141)"
-       d="m 0,28.8704 35.4331,0 L 17.6016,0 z"
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:8.58899117;stroke-linecap:round;stroke-linejoin:round" />
-    <circle
-       id="shape1"
-       transform="translate(106.299,124.016)"
-       r="44.291416"
-       cx="44.291416"
-       cy="44.291416"
-       stroke-miterlimit="2.00000000000"
-       sodipodi:cx="44.291416"
-       sodipodi:cy="44.291416"
-       sodipodi:rx="44.291416"
-       sodipodi:ry="44.291416"
-       style="fill:none;stroke:#000000;stroke-width:5.75434065;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2"
-       d="m 88.582832,44.291416 c 0,24.461474 -19.829942,44.291416 -44.291416,44.291416 C 19.829942,88.582832 0,68.75289 0,44.291416 0,19.829942 19.829942,0 44.291416,0 68.75289,0 88.582832,19.829942 88.582832,44.291416 z" />
-  </g>
-</svg>
diff --git a/apps/shorty/img/actions/up.png b/apps/shorty/img/actions/up.png
deleted file mode 100644
index c878f84396c6a41574fe479fd7e69d92750e3ac4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQm9aT^vI!
zdY4W<$a}zmgZZuBu@^bd>VB<|TA(oDN8@`XR<A?L)?NJ;&)}(?`PAnt%OpOANuLBf
z6PXPds%~A{sdONo(T?lK1@CUYy<1*f3hvgk-8$ofb2q2$mKm4$yEXrA(AZzJ{Mz*j
Z=4TyFS-1IC-vrvp;OXk;vd$@?2>{vGQ+)sc

diff --git a/apps/shorty/img/actions/up.svg b/apps/shorty/img/actions/up.svg
deleted file mode 100644
index 728243b3b5..0000000000
--- a/apps/shorty/img/actions/up.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="layer1">
-  <path id="path3086" transform="matrix(0.000287724 -1 -1 -0.000287724 13.9983 14.0016)" fill="#000000" d="M2.22045e-15 0L12 6L0 12Z"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/blank.png b/apps/shorty/img/blank.png
deleted file mode 100644
index 9386bf3e17b85ac9191dda1a43be821bc3414865..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<CTUhKHplH%aX=y4%#er@=ltB<
z)VvZPmw_R_JkL2NzcfXmI3vHPq*9?Er!+k?k1HuBF)y1-!&y_oIio1ExFj<%Pa!BZ
zGcUF1lcU-(pgti_7sn8b)5!@Etcw#wdYCvE7+3@t7+dXE6@iTPboFyt=akR{0RLAx
AlK=n!

diff --git a/apps/shorty/img/calendar.png b/apps/shorty/img/calendar.png
deleted file mode 100644
index 0e5fdb75bb6e432de1b08ab138554b7147a77f20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW1
z1qvLz)q^Ae002N~R9JLFZ*6U5Zgc<u0001QcWy&$Z*^oKb7*gJba^0fY;|X8ZVF>z
zY-Mg_VR8y6Ln$CbXmV+DbZKF3AW~&%Ze?<r2qq=~00GBIL_t(I%Y~A$YZO5ghrc(w
z$OZLIbKxLG&cf!vg=}@H1PigUu~8BHGlYPhwUxDnsqBIQ{{=-YPFvwR1#=d9cLt2R
zJMU+6346<FrkM|ZGsE}Z8w1Gm9N?yzy#&q!&&+IhG#YVMo@QA_S(a&%B-enEnSGQr
zaQCe&%K)gVstO@wjr>xc=hM{PyTFqe;{)J>q|(f80dJ|T7~@6YeJ$TFisG>i27`OR
zbKnnf43rB^V|fWEYIz$tNUN$^2i}Dc9+_FSxG2CEYz-C=-Tk4YoixT6fXR3~{shqP
z_W@c!7dTp&EwQ9&nx>zDVbX55hmy8tv)MjCr_%wr4IBXLz_})y*@mQvr0q1uNTXQ*
zaiOh$u%DbieW2IttpOWlS^f$kyaDb4hro0Ne+6y;B&}9!=<b`6DoL*-U3Pceeb3!n
z?rtl1&E3Dd`%(#Y)svkSY(Qw1kN{_CABGUV0Xx9d-R}S-X_^itZA$tr>4l`0B$Kq)
z;0uyo&*$@bk|c$s?dBBXf3yW4sXnRG5`IeRO8R1E_kklx$E(=guY?dNio!z(SIz8)
tg%EncQ%Tns7FPTFb*9!l114s+`xp8|MQ|{P%WnVx002ovPDHLkV1kfZ6(j%v

diff --git a/apps/shorty/img/drag_me.png b/apps/shorty/img/drag_me.png
deleted file mode 100644
index 3ebac17d2d36f6ce4ce8d9357307a15a5107b000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5189
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
Hoge)VmsRiC

diff --git a/apps/shorty/img/drag_me.svg b/apps/shorty/img/drag_me.svg
deleted file mode 100644
index f1d44cdfb9..0000000000
--- a/apps/shorty/img/drag_me.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="595.277pt" height="841.891pt">
-<defs/>
-<g id="Bubbles">
-  <ellipse id="shape0" transform="translate(162.259, 571.542)" rx="20.11097874441pt" ry="8.61849622845pt" cx="20.11097874441pt" cy="8.61849622845pt" fill="none" stroke="#989898" stroke-width="3.45827370760" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000"/>
-  <path id="shape1" transform="translate(172.543, 536.388)" fill="none" stroke="#707071" stroke-width="3.45827370760" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" d="M63.9895 13.6082C63.9895 6.09258 49.6649 4.60196e-16 31.9947 0C14.3245 -4.60196e-16 2.16398e-15 6.09258 0 13.6082C-2.16398e-15 21.1237 14.3245 27.2163 31.9947 27.2163C49.6649 27.2163 63.9895 21.1237 63.9895 13.6082"/>
-  <path id="shape2" transform="translate(238.818, 495.564)" fill="none" stroke="#535353" stroke-width="3.45827370760" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" d="M254.815 38.5564C254.815 17.2623 197.773 1.30389e-15 127.408 0C57.0423 -1.30389e-15 8.61726e-15 17.2623 0 38.5564C-8.61726e-15 59.8506 57.0423 77.1129 127.408 77.1129C197.773 77.1129 254.815 59.8506 254.815 38.5564"/>
- </g><g id="Text">
-  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.2" baseProfile="tiny">
-<title>Qt Svg Document</title>
-<desc>Generated with Qt</desc>
-<defs>
-</defs>
-<g fill="none" stroke="black" stroke-width="1" fill-rule="evenodd" stroke-linecap="square" stroke-linejoin="bevel" >
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,0,0)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,-0.235294,-0.346925)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#333333" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-<text fill="#333333" fill-opacity="1" stroke="none" xml:space="preserve" x="0" y="33" font-family="Vahika" font-size="32" font-weight="700" font-style="normal" 
- >Drag</text>
-<text fill="#333333" fill-opacity="1" stroke="none" xml:space="preserve" x="59.0156" y="33" font-family="Vahika" font-size="32" font-weight="700" font-style="normal" 
- > me !</text>
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1,0,0,1,0,0)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#1f1c1b" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1.25123,0,0,1.25123,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,0,0)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,288,508.189)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,-0.235294,-0.346925)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="none" transform="matrix(1,0,0,1,-0.235294,-0.346925)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1,0,0,1,0,0)"
-font-family="Sans Serif" font-size="9" font-weight="400" font-style="normal" 
->
-</g>
-</g>
-</svg>
-
- </g>
-</svg>
diff --git a/apps/shorty/img/loading-bar.gif b/apps/shorty/img/loading-bar.gif
deleted file mode 100644
index b02798a87ebd7cc1d19151adb4cf7cd8a3c661ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1190
zcmV;X1X=q>Nk%w1VcY-{0E7Sl|Ns90006$ezNV(8oSdAvxVW;ivdGBD*x1;_#KhFp
z)ZE<M;Nalo<m9lhu)Msy=;-L|?Ci?Q%JTB^^z`)3&d&Ds_QuA>(9qEC?(Wvs*22QV
zs;a8^`1qippq7@FEC2ui0Nel*000I4ARvxpX`X1Ru59bRa4gSsZQppV?|kq7z@TtQ
z1PBI%q;kn@I-k&}bV{vSuh^`1IuNu3g@VKIC=WP}v?1;A6gKeq=FF~p9*MkujyCxJ
z19%A=d4wE&e|~|3g@cE6Y=MN036E@mf|QScV+M<ia0zsmikXv@h-+z|dXA}>r+SBp
zfNuhMWg7)vD+37z0umJ%zk7sW0vgK72nZVngwce%&DG7%dYRPL&A*|Ox&qwY27}+>
z;|Si;3CQWi(ToKT>Dck@^Y7)~dHLh^?EG<C7YZLeYZxT#8o+`8Fa--3ASiG^g2jsx
z9yEZ!vEzaV2NGP&wy`6}j}rbwrnGoLqe+eoKw`Y;@+HcZ2@+;3X)>nBp9x#??C5hO
z&7mjpj0{@S<j0CecfN$+GY>|gQ)AAwIA~~t1{#17XedAd1CE0bU_hWiLC^&g;>w*M
zQh_zM0^rV_kU=EdY8Vvc-5b~MTDxoq6E@t;tzf-->#nW#m~dYSZkuUH40*0d4Tu{n
zjx6Et-^z<Iw?&M4?q#*0MR$&SS;E*A1P&~KFu~co3KJ{@7v6irI0Y8vS|G0OH{sq1
zoC_yDVL|lJY=s5iYu$9?<Z+kBwcfUIH{gWH+f}ex9s2O&6R^Llov=Fg__M#CYdtpQ
z`rF0l)@>>fAOQmrK>o0SW9_viz;k_NR-S_p%GVY%6v9W_g88wfzy=vu#vwBvf~X;1
z3u2%QYY$pxp=KpQxL|vYeHh|i8Kn5vGA0IyqFc=H7-9z<$d%)Klzm882N8lsU<w8z
zXc38`F`yiAQ-ao@09F!a5qtir)1{A}X<1DIdWknd2U)JD%m!ly*d~}7B*4IQ)U~;c
z25@et=9Ji}vw(Pb>WP3dcKRuoMVf7f=%9Emmt{4G#wk~s8a#=DfeQ$hnP~}BKqPz}
zFz})^BKb(9sm_sFYIGichu*01-Q^Z|qpk{Tjkm@{D|D27CjpVUzRGJ`77<&duB(L>
zs<Ong%2tEI{wV7!tDzw)L2%Gw+l;0s<R(}Jh;7zZkFIeT>$x(n78|=K9*G^iKFT|7
zj3Qn*p^a-6xnX&y@%!tM<~E3~uXIVUVvQU4>hF&iGQ1{^90GjqkPqAYEeiw0^uREy
z1*X_?BqwB=1|q{nU0h$zo7Zx`whUNh(=CcwgPaXVT|)257T%u+NN6sXin6SlX@Xfv
z9F|9)Ml{Jx16(E4HmikX(#pw&!2wop#?T62gaoo<;0>oM(%Ef0T)zy=7^X-Rq?glb
z!p6<r+;k&%fZfzt7Z}~@ND%k0ey_KlFmbE-Dh7dpcI)12$M^Sq$O$gDiu6HFs0F45
zmSjRN6i~NZ=j$Qx054!8vBm1Fx9<Auu*XhC7e&-=`|Y^ruKVu1_wM`ezy~k<2_XOg
EJD53Bn*aa+

diff --git a/apps/shorty/img/loading-disk.gif b/apps/shorty/img/loading-disk.gif
deleted file mode 100644
index 22c961011cd6db1f937239801fe2821ba265edd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6894
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

diff --git a/apps/shorty/img/loading-led.gif b/apps/shorty/img/loading-led.gif
deleted file mode 100644
index 78893c90606c099fef56559a739a6480ee43c601..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 684
zcmZ?wbhEHb6ky<HXklRZ|NlP&1H-Lbw=P_`@aokoHa0dOS5Hr`si`R;Az|09T}nzy
zUS3{ZU0o?DDf{;AQ&Ur8VPWy}^LzH}*^L`FzI^#&VPSFS&Ye%6K5g5!ZNY*Cr%s)E
z_wF6gSO`%3&+X?L671|4;A*62z|06VUGXOiCpUvUgAS0*0CENctL_8!zLd;)OBQfF
zI#svML7>^<%-8bE)%R}in9s-lM6i9!BZm__dd2Imak;LY=7h}zm4rlzqv`WjWXiNp
z+;{)hp_OkgE$@B)X7B6W5&9Z)SR1VcJ0+N~X*2^`-JPiOxI=|gNs1?VNzx*XlhWt6
z^u9K_b$t5o15JCQKc4UwY&?7M@(y9YnTJBTwM3@*9TLE1lqt}tB^<7TA$7fvO_EeR
zFTS$r7d~HF`P_OI@ABU#TI`ZGxc?IEKQpn|l0~X=^|kI@T62RGv6*B936E==BA&Sf
zPTt{hDJdw__2ib=M^<rfr`@hiI~*VQLYcAm#IqBu$@9EcUi~VC)o<nyV^j)bTUKmJ
zT9$dUHF0{z<3-zYXT`o#e)G3!d*a8(%zD#(Rr+U`FvYLsH#0lEVBdov4s1@+hnV#Q
z=$;ju-mNN<Q4QMi_o3<f-`iyhrgMMmIx?%URpwXRT7DBY=g9R-zyZXF7R@A^VGRJJ
Cq7HWe

diff --git a/apps/shorty/img/scheme/A.png b/apps/shorty/img/scheme/A.png
deleted file mode 100644
index 65163556babe2a177a0798d197ff405b0a4a2aa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmXAne{2$G7{{+@r(#&mG@H(uH2&dgj4_%m*|M3m<!YgF$CW#N6y(<xC|Bswv<H;Z
zmLED`$R@DRx)ut7Q4njBb*$E|Ce0*SvJvB^fAkN#btalE%QB7qZ&|X3_}uq--{*bu
z-t*q`dGAvK?-uai<|7Cq5Q|V5%m*62cNdIpr&~yvnnq>aoygMtcm6~W-kXGk>hcHt
z(=*fQOgfv(<_q~^u~;gXZh%#8l*;AeLa|UN<Z`*pd}exPX394e`z)5v=NA?hUTv#X
zDmTFvZ^Hg^xm+rhph)y;G#m+E|MEI06bc0|2d~Aif#58t5RODZ6O$9;-f@2*0P>7`
zoG#~>XAHzSIo842hwLB-25p08iy71i1}r+gUT@G_1}sL}sOnSosr!umv{t8;kt9ix
zTD=Z37>?mmT&+>d6>^bSB<c|>lnRAP2}ubik>D7H<5EJ36H?eI!LW;%1Y)I1*(>Xn
zD-;kw5zQqHl!fCA1_QWGuY+ntFEKkeI|r6-*c?2WbQ~-ZPo+||+P(Gl^<*-cNF?Hk
z1Q38WL*Y<1o8A6>duwYe+(<-xexJ_|?pyw5x%zFjR;vL_z~XYdCZ{IXzFPx&^Yim7
zD=R>Q8Dy+h>y;~)0k6$&bGzNZ%F0-weeZ-9Xd8?MBTcI{8t9kqr&H4@pgr#O0^4Xb
z3ZG5MDUzZ9CR_xx29$smT%yTj0w5+cj8Z8<0A2tq?hy-7RM>^eub%B`{4SgfCz1AN
zo0i6czSxZ-k>+C}SnL}X^^GFP{(}u~LT1y4A-RVWV_kb5^Nu#Z{+861Eko)<hEj1t
z$Iy_O<zR^*4mT^bJDjH0QLAHw^Ry1zodXQZ@8GuyPqqrJBg`nr7}-{tnPJT%|Ne{$
z;GJK^Xa{xpVZUJm33h&eJWoG)Lg(K|%6@5Yy7Q>I6N^>ri?LY!Jx|UrbKyA7>ZUr3
zz4+(ni1u5nt6x<Y*N@*`uB@WR+H!I&Noth8J=mm3vLHD0z{avHGi3YckKN~X0=x@a
z?bi9blm9sno^Uyj>}sx`z-FoV**i?n(?`q~^#D)taG;)k-+TYD=aZKu>Fw9}o2ON)
z))&d*PtVTiza9>pCpMU;Kgv%jmUMS5f3KxZWdc0*uY~_2V#9Xt!Uvn%f<w<=w(R9v
i_<X*rWuIXG4?7<t?*`S~;Y&MX4Lss599`-(1pfyQcAd-s

diff --git a/apps/shorty/img/scheme/B.png b/apps/shorty/img/scheme/B.png
deleted file mode 100644
index a556248882489c6d449f229c913e5582604f6707..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1111
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m?Q&yLR=df8>UU4HfQdf`3vSR
zTD)lK(xuB+EMK{D<<ezK7cXACV8Md9^X38-)YaGZ^!6-Tv}oC~We^3cR;^kM1Z!5W
zT(xq=iWSS3F9&Mx>h5aqXrD221`xHiwKX+2^-t&rBA_im6WTjEfT*UnrmDKCp|KH&
zDyu3>%StOMD}bn^v?MP-FDEw#h=7c&?5xzZR3HK|($nJN<Kq+J)6&xtlM*8$BO;?B
z6O)r-<6?t?gM&kYW8>q1BEEjUe*S(@(NUpcp&p(d9$ubd;bCDB;XpwjUmqVoUtd2z
z{{Vl#0DquLA75W@UmqYlJR&?WC@?fE49EZ)5*-r_G!|%GLP7!%$Hm71O$!JNm^FLW
zY#^8eL?AE$2qsRLJbChg0|(BWJ#*sZiNi+@14CfK#EHNV=<V&japT7J?c4Y4*>m;U
z)pj80=%{a~Z)t5kefsp=xpS+ltNZ%<E?>ShapJ_f`uh5YhO+Xq>YD0(`}Q?9H7;DZ
zaO0+pRn^s*S($lxc^fvY2Zr?g`SXBrR8UZmnVAU;gtWA@+S=Nr<fM7?=5=;;CL|^%
zCM88hM+03xdCKI%qC!Y0b#!(BeH0QJ0t~v&&W?<XjNs6akkC+InE3ho`v(L7gE}`a
zFFPkYCN{>?%M%!G&Mq#_t}ZoNHEqDOl3Wtx7p$6B2nRXx!QcMDz$e$>@1IG+{%<}*
z!E+~ZXE#>}a1xHrWjF@3j<dicvKUBvfU(=jY&!-9Mqy7E#}J9j$q5N5Nok3x$?55j
zA3S;V>|yGI$KnDaLSllVqJm<=(<e+xnlR1N&(qh_*W1(A-`{uQ)Z_`_Cr+F>b?)TZ
z)8}<goCyg@3JBBG(b3ZL)YLt#qrWB~G&$h<iZyFity{Tvb$&)p)}<>+7p?)rJkvKn
z`~8cYyu52ylP{RRc=hVt%eSvz&NtY&`t*g4gEvwxEjjr%cv+e6Y`f%VD#6BV#odvc
z)6UPd&aZpe6v>?)8D$u8TPMmS-|_P!PVZ@Y(fdwZ>pOTa@#v}0?(p@IyYrr&nyM``
zS7J`=we|7)8Ce>>RE3+fmG}3~evq(uxp?#T{`K?sXFE7JEXWQh@W_yGu5d{SDe=jP
zsd4ft2}wy3VmNg<wQ_UTvvgoMsg}4#l%yn<q*^5xr2;7iBLhPtT?0d1Lz55#11m#A
rD-&~V14AnV19rzE8x#$>`6-!cmAEyO$((8cYGCkm^>bP0l+XkKcIEPx

diff --git a/apps/shorty/img/scheme/C.png b/apps/shorty/img/scheme/C.png
deleted file mode 100644
index 61b873de73f85af0c3cc1cdffffddab21ee1fc68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmXAndrVVz6vr<#j9G$`X)=6}H2$%%KelCaFHKC4meH%dx3@3o`?ejG-a>Ef?QIJP
z?WKfLphjw-GAOYt_5m%1Esfx2GUpbT2?$nngs`|6=C)+7EdH~^B|FW&IluEe=lp)>
z=AKV}!vx-3%|FCP5TqIvi{!A^l-7$p@b$0nQ@~c{mNz#d*X|wp6+y}m5)x%ofD6Q8
zvG`2<O5#d#HknGLGMP+vuB1#hlS-$Ov$KgrVrFJ0b~)w`_#=_XC&^?worY7mGY`t;
za(P&}Y&HwM@R5<xk)iO=<j0d>gQ3CTK=9(&MKG?P^ZWfn;V_)`_VxCh@8SCUq1e^k
z<?(vJgRvf#cG8`WPA~`UpzL<*St}T2r@$LYk~EPJm@Q_tMy=6mATSsWa)m;nR6qa~
z499RO4uPsgB}T>K(`ZX;3m6n7m_&kO7>?tFR7yzUrUb*zU=m1M)vbg~1}zZi^g1JH
zBuys0!2lIPModjlO@rbk0SaIR#HQoZW1#3*^ip(jadCZPy;!`zc5f}ekdH>AFe3=C
zY;Ap?$)qPHCIDukP#75jIN<=t0r^lUw6eMa(E9v+fj|K8avbONd4WcFc=*n@cS1uU
z7~E#F0i~s->o&>;^P0?NhGFLB=Uj}-Y_Vu{I{4M`iE&`7(Q36iEg;hA^)Q7}rBtd^
z_73}KWYpvF*eHr+-9Df1e;T+{syFCqns&Kd6h)z@(Go5c6^cZ{CXwsqU{&eGuyS01
zG(6opTS_cvnng&sqD~CSo^xW28$qh}msS}v6|aS2C5vKBl{@8!D{A(~o7-q89jBCP
zR_Js%tTYQLf;fG&u+!;j6S!?ohV2%d>-4l!G+)TC7rrJC+8D~sQf68pw^Fo~dDws9
z0`&ZdicTqOAADrGg#;UKA5B`GJb5X3^pd>TP<G?$?)c_z;aOyNbG5BI!O2^^UYs`i
zPnl)j>u(bc3(Lz_3;CPL&*nd0{;;k-q0+TJ-q_mQDQ;_Zx#|NO9UXuE@|)es<Mkyt
znNR8@&j;SGt>sm$z9Nag(|z}wImN4z$rE24sW-jr*nW2KSo_-4$@V{PQjZ$SzWAr=
z>6`jO*LOwh%FpXdmHZDD)Hj%)<{x%EdV~Cw89YYZa@5u2$uG_Sz99I0?}5Lzm-p;_
suZLIh{5h}uhk@Y0z>cu->)UUg+=ujbY5(pC%{oee&?a1Tt<e<x4{OS$Pyhe`

diff --git a/apps/shorty/img/scheme/D.png b/apps/shorty/img/scheme/D.png
deleted file mode 100644
index 6ab7451d04aa9d8bf1a5814b22b4f47c8b37a876..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1035
zcmXAndrVt(6vuDt5Unmw#f11sy1#}|6B8B*8WUVg=+*W1_Vz&^wDdtAx4pe3^!7FA
z18|fLu>8?Zpgh{z(OaB^ITG1ovd)-D99=R>CL{AT8QZdDQS8vLe>{!foZs(v&iUo!
zp7Z(LQ#jUkkoPJNL6C!}NJzkWsJfnc3igI~UXa1T@epmtki~1S-$xK`6MkIY+CR`g
zF)=YaJDbU5a=F}mex5C`3!pC-*g|1GpU<7mWwM#Mxw(nSiD)!BIyMSnHk&;?aym8~
zgIdtZp_2oH1MztLvv@q(9}P#sa0S*E>O0YU0y1EMV9@LH`U8G{Ai#JT+D$ttigHmd
z+U0OMx-1rp)j~Q**!7+IPD3X+Mw3ycR;ko#aCCYdAtPjR88~W<T8xRs7^c>06iP)K
zDiWb0WxG<PQA-IahD#(;9G6PLhY~_2!=<<c$1z9~QmF0Fb(qYiE=!lyX0?-c_&Rg~
zZBVq!NjXWU18%jtj<fSHeI95OKvg1DCWVD+oM%}8H3dpdrBW$?13&-^V2qE)lV_6U
za(VOS=KA`2u~-B?<KyG8SZpXZ1c<h_wo=onwY9a?)zy*Fkw`QWjzmhO(&W@+C>$Cc
z8@s-KJsb`LtG-a^a`7^-0%#X6u0X5qZuippC3rHM-9|bbESpaz695O4{UU2H8mv}p
zBoZ+g3>vK_nM~3&4FEM-t>5oYBoZdGS+0-+f#Flb@H8IA)7#fOI5-HXWpX(t!6dju
zr_;gsp#OmbWD$y@AEP2LR0OC6LV-Xiblz@kuKrI9fyt1TolR>sFn!V{M22hL5JB*4
zw@B?lkmp{mE)Fs^T@T4x1{Jr~-r~Mi^Wxi$?+0FjR5K}8F#@;CWuX}e5yb7M1(e&{
z#rN3VJxq|_O?ho3%@gt(1aI;M_8!v1kVcwMSV-E^v!uFEf|@6&@FRJB*$ji5tVWCZ
z?r+<-cYe1Z+$$^pe)@fGJF&g7TzUR*I%>BneHg6|TYWy?nR>kC>vVdFUCFV_=hEMH
z@EZ79sai2Z;4*D{r}S`b9ZuQLQ4X3UT~}#0&gHQ_hVd!9{z_%X>t{JNN1yEPA2~j~
z(G>h~0}W|fI6sr+Bc*$j%^~G451Y%CD0j$n_u6z*<jQxgBcHF$I1kjltGmS9+<oP(
z_OJ98eD{gQbo9<8?}H}l)^hOb4ex^+YEBLHjqBI*o}U(HS{y&T_dz=P$D<E>_Z~jY
sJ#^<lUANcs&!3guy}jMaUyuK`6%l0rs6qT##DuHt&{j;ic+4>HAN(lFKmY&$

diff --git a/apps/shorty/img/scheme/E.png b/apps/shorty/img/scheme/E.png
deleted file mode 100644
index d9c4e07001b8386d76ad57498ce7db65c34f839c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 988
zcmX9+ZA@Eb6uy)cX0cJHGmD$rEHT3$`?DX5`>}-4R(hemE$waThqS$AExk}~J7_6o
zl$HW*VT`XLTg$!dTGB6QFeAgzIb&U-i315z66b`>EJkA>`bUj3#(1hvp7XxvoSgT(
z?|Jf$DX<1U?=>ERAbeCJQo{aX*^X7hT6^vV6>Jqf%7%Jmb^G+s2*P<&A;rbPq2T<@
zd77bbv$vB=$y6$p$!2o7Tq>PfT3TXRmRV$=U@$N^abqHxOs3Q6{|lA@E6Xc@{7P;)
zm(6A~nGAFozdjy`MsCG#0mI>NXgD-AJq3h|ph+Ye1rGQJ`mgl|hlYT@exIk;)9330
zx;<{nNjbV4KyW%bJFGS<u<W$kj3$%GY_hf62n(UrX?1!X(Pn8iwklOB6|QPE86hLX
zWSAV&8}w?8T7pU>ji{zYqtUiNQYw>5F_{d*<O(^akVB<ZCTo&O!Ee#FG%K6c8Vxwm
z#PFU0+QM~avl+~2GD0^+vm&vOSOCxq48wq2><1tZOEU~j)6;;NX&7^(u(7}Y-EL{O
zR4P5(d>D_%L5*-ETr3thw>IYh@6W|zv9a+n&>;{E1cGH**4Nhy_X-1kzkkr*>+J<W
zvbpTc?9AxsDA_^UNqZs@Ut7Bqn~Q;rBuRn-gvDYeh{>tR+1PCPp#(&P-e7>o!}!A^
z!;we?X3^=(z|}aeR;zH_+t(M3MqPlbE{dW+7ECVxPh?x$l{TeHi8i7V6etmjL_)DB
zG5XHO<$vQ=Vk)HW$49nuU}<U)AyMw@5(u7iNpw93QuA`zDv$(y5|Y(!R3@(8=bYlc
zbY?H4J^`tVB(8M}on2j4$_*icIK7n6;q+V)^w^!<ZlA#A@U)W@Pt2<ozAX^iyU89m
zNl*f%m87iQ8P_*_IP(K4x{RMJwV8{^-<(kWgEL7>^1;*Nv&y=PZ|C;z{x-3-l|Q2I
z;uqPVg)$CaCYrCJq|vx|Tv4~4&)-k3E#FIjl+R=QT2}XD=h5E&?qltfogJ3@%1&2j
z=dbqd!=sK$&LuWTc)fC`De(Kq*ulZUyLA;MG?tMv7yMsreHl9|KVQkyZYM6a|8oCX
z&8y&Cn?Io__I~~Jt)`pjOn18fNq&C)D9D*y(R`Tr)b`b5&*9MXXW8Ikn1AX5#o-7(
z`HWxteZg0A+VKa6_vc^FsyDb*RaFIUWF$=Vzk%%iWLV6tHr^<Ugo-iIYP~u1FJzvo
A_y7O^

diff --git a/apps/shorty/img/scheme/F.png b/apps/shorty/img/scheme/F.png
deleted file mode 100644
index 2663b5eb30814a042398bd67d9ec2568352acc9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 969
zcmXAnYiwF&7{?D~l?}64w|!`I8e(En<K=^kANIkdD_}Vr=RmoYOACj?t*2bar2}la
zslZCLXd+;tg&pM5maNO-7UQU^x=*H|ce9vA<`SpVZeM0P{pLe_@_*j<d7ixQ^S<xz
zoXcW-@HqPgHi96>Q2|c^b5F;QGGXj{^EoL@43A`R0J+*a{SZOAdc;B*KN5{(vYEns
zp;#)?Wx7(S)atcGu%*RXy<VwS%H?vYRGMFy&t$WqaA@Y^8Jec6)$0GtmcW*mmmA>A
zu%%wF*J?HBGo6}FBonzWa-euT9{V6Ro1O*1anK}@OoAq-CWG$>Bhe@*5DfSxeExtR
z<n?(SPKV8I13@ru9XFXxpiW>hYjrvup)*^|dQz`cDOGBf-aw9OM<r6JR3;tOX`zDQ
z7%sxq8ns*@7oY;cc~mj1P$-9?D8z(99K&#2Bo^Uf5v&wq*ab`o@vw4uNHQc>C?J3)
znh_1Oh2sc<0N3iY&`mrfp3BeW!3rG%EDOa2pqDS?(_o*bXVYmQxwp5sy|cZwwbg31
zfF7WTC*s9ovE6Q8p|50f+0;x52!tcyaHInylgVssY$Puyr$SQ`mnHzkojX6IQmI%h
z7L7*zem^x%jZtH_nzw4TYPn3iF1jd+0s?xHB=iIjgAZqS*o`J5X&}`a4O||cZ?)O7
z*(_-=KtU##$>egWOlB||H6tT{0vCx)CKEgvJ&yt<E|16M^FF!#<zJm2#Vf(3NdJSo
z=1xLh7~~<z?w16R9CHa&9t3&zWXBoET%i|=EH8@jS^HftcAt2@KWtfp(pgHT^m3hc
zyUF2&6hWMq99)~zXXJRsoNjM`<FffIl!N^qyN~-Chdbt`JYGug;7ClA!{lB#8pL4F
zJ(PD&*1KaM){xl1_pi|8{re~A&m`M#_cQ+e>hGEL#=*fsVSV4*U5dE1p>z77izubi
zhQ4Ks`&XMy`ufs0)#}Y=6KD37M%$ZrclWn{R<<`cOUzT7POEk0(H{qYKBlbJGYGr)
z>EYpxLs2ewmU25+j)~VMf83>ZEbE1LtcSac(l;VqKY1Rs^0$d!n|#mjt$73U)HPkx
z`0#q`w^SDSj%1Z0Po_VAJ=0LHlCSnOTnzTtD~#9;D`$<_cW>44?&-!82Kyh@k!J!&
hSgeHq!}v#oMDS(gt*4ruUzi(22N24~c~=LB*ni=Vr(6I4

diff --git a/apps/shorty/img/scheme/G.png b/apps/shorty/img/scheme/G.png
deleted file mode 100644
index d1d965d34cb522f770e4098ab05a52379cdbb623..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 995
zcmXAnZA@EL7{_mmz^s{?Ng~nd8b6rMsM*ZSvTv2Pp%;2@OW)|r`UdOEZOiTL%LR(F
zT)G4bZW$1S(H2@t+R}nu7p2(}hX!Ld5~;joL>FczGmr%uJ}>TrPxYVwx#u}go^wvl
z@43S=y!j;O9S(vZCsDCb4)dGUaiRvkyieXxz{K*)o12hA`Sf!HVe@1XrHC0|CZ{Ij
zGx0<+k(y7X)9LI&HkZq#GwJ#H`D8LVGdlwXq5jbI8`o2*R3?-8zaXE_FD@?T^0|eD
zg={tpdq=(=8Hx<un!W`d92^W^3*Q{Q35F|R`%okTzWUYGzAyWjfdO!^FGzROy}@2^
zfDVuz(%t0-L*R5dtu`yT8rW?{lgVT@+3Yq;hee~+XmwgkXNSRPkSi1lrNUq`LI%Sz
zT#D=TI+a=_M#bV5RNbytYuX_x!6XtK!*E<Glj1TdR7x<c6_Y^Ru4!+Rx2e=>2;dO?
zWj!1V*O|>`7)Fy3PLs9CqOoWU6pzQ^u|y&P9A;-{AvFpb8=ab(T3K1y-rfRjY;N4W
zcXwi90#E?42M-^tt*woXk1a1RkB^TJfg+K9rXPUJrRK`z^6<!TC=_BCrk`QDd%8h|
z+XWDi0X|{SwQx^w58))BBhhHo?y%D|4Xr5_Z#xJF0I_uZr_N5wOF<(jiZWX)I=voH
zcqq?wblT~1!P5XH^u^(DC{;>$F97#?z0fj)(FllesTAN`HW*wk7fF%?L7**Y6(foY
zghGKxxcdFME7cz;AjcI5fB$z|b<xq<EJPx;?}=gYDkawX5#+VEs)L0@<BgE451^Q+
zewY1j?Www-m-gx*b%{`F0s>E0mz4~_5<xsYq`>W=uW<bik1r79Qf}H#kep@?PjHqi
zaQFy+fUuBUxs@QTzG3eBH(<{mD*Qs(xZP>~33<s5H?4la=YIUrho7<<M)4LL#qieO
z9=;;~jL&+pbhH%T{o!SJHFe~!O)@^O7bUd5pi^X3Epuf2`<YT<W$sStPAPX!Tf<8}
z*?PS5=jI=e4A9I}O~b}<rE-`!cb?w*d*|%^IzH=JPVt>TgC)-UcaAP8FowPFKUg;v
zsm;_ct&`=Li`7sxmfSB!^4}<Q>TivuU+Z}0A8nN=eR$Emd%^SM@#nAeSqJO<V(p0%
zn|M3P{8Oq>#q}EA)5^2MgT3S9Gfz)7Hk=MW4<Z*My1yQs*}qUlgo<!sp~)Qn7lL`Q
A)c^nh

diff --git a/apps/shorty/img/scheme/H.png b/apps/shorty/img/scheme/H.png
deleted file mode 100644
index c644a77bfc5c1d5b199963ce37faccd3a47902fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 991
zcmXAne@q*76u_?-+}33o*_h(gq#;YhKM08l6aO&j+5+v?yZ*TTuC&)eS+BI$+FrZC
z20e<Sg|blz+Y0?bx&FiwvPBl>;vdV9m^s&0A-ZHtqQN;6jfqnilg0RmFYmqYd+*-&
zd-p!yn~-DO2e?PM2!b4th($_R8+L8)3*cK?58|+Je9CSCvQl~N7X+zmmP=Kg48vTx
zdL@}kE@T$iESt~gi>2by(o(*V&t|ikOeU31LBmLJWNK=PW!XZZ@PETcAmws-8LV6?
zm5Rk8Y@duyh9lwlTpaYm_=V6|XgW3x%8W8_LO2qEr{{;y51kugMn|D|cJQn};0F&%
z`)SHeIbBXr7v*vcIBfkkP|`tyH<`_5!VH1MYSHO+dV?N<9#fAJ$8i-70aQ>7#bg)+
zYK>Yf5sObsG+GTP6s4$CilHcm$>cIjE`v@fik?EH5NmZ>g;Jr0MxEC9o)KO|5CoXX
zY=U#-3i*6uK9NWylgV^C4WLq~R3e#(#bVR3ShZG7FQj81#(+$vT7juy!0~Vxh&}rL
z(Rg?qsBUdNoSB&kgG3@hh6x6P7cX6`)oR1T!?TxXtJTWH<V4_1z#j;VeK5AZz7D`M
zi<z~xwICA=1OhO=owVP)`N<-?n9XHx+*tMcympd=@j(C-+?3nnfe!{gKH8Vd<s1%&
z!DuuX4S*{ij}JJV)?TYht%8Z7Q&GZV!PP2UrRweLgZqM!fsYbb0!Ecu-Dk4_4arFf
z02GQu!cNg2uOvEle;rzh;RyfngZ|ybda7H5MCxA`L$c2!*831-|KVNZAoIy4DDI&p
zXy=}-x>xHD?|t{+zbByd4yn@7LbuChqi9GG#C?VmI^F(0p3m;~(t|vY(|?+zxMFUL
z@J*i3?j?ORX`y&Z8%f!`>RT_~hdnzI(Fs-4MlW$2d0rP1+-YW6>m9+5hi3SkxzBSu
zvzwcntFt?Q9@A$SL0A8fCV+KOrjf2o&2oM|bFI{IJ(pWu{)|-~X~`(mJ$OQ))o#~x
zJ^6i&HPS(mu6uXM-=F;I_@<uQL_eed`unG!pUL7KOAi}bh_?p6+$1+nf0b-MSJ}B+
z;B%s%K7HKwWbSRZ<!g4(*E(8vJo<8*{+9Ef$;)L;o5{Jq(WCpg|F`G<fp3?$uf2c&
zXm^IWS3ncT-JwG(e9m;M@dqOMhWz#y-&MEUc|2aNy`|$=<Hl3ufyQ8Yseu5X2qNjk
JL@NR!^dGvutdal#

diff --git a/apps/shorty/img/scheme/J.png b/apps/shorty/img/scheme/J.png
deleted file mode 100644
index 0eaa189f4f698a52155206ec33782740312995fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 935
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1JbPXRt5t__V1
z)22_GGk4DX1@jjzUbJ-S(&a0buUxru>9VDZ7cXA0V8PsZbAbx#>g#%XdloHPv~1Zj
zh=NtCR;>ntHLF*yTDfAyisj3f1GRT`ceQu4&zLy_h}zoPnwp#XC-egm&=#Nx?HwIJ
zR8w11RbAE4*a$?GRh6Y>r4^MGKvYs%l9!*ClbZuXKt@(}R%%)*5P=x!X>sxK@d@#1
z>1l~ci4l<zkx`L}$w{$su|dJX!6Cu1@o_*AUq4?zf4`{csL-%b4^IydFVC>>u&{`5
zprDVhkB^_Pub-cPfWKdWKTxHQudlbS50D)m5gr&67#bD^WB?6`j)?{u3$!jFApwZv
z;^Tm(1q24nnmuba5X=FAxpU_NLuU4z*%N?Z;)ID4Cj$L``O0M=3+R2IAAz8)y=~sS
zd3W#Loib%gdwY9*Lw$V%C=jMjoqFNIh3@X|`uh5^@-m?Jfq{1D@S(=0#?rE~%&g3e
z%#7OFnk`#4mz0zMJ)4-6l#rNETv7~-n(UnHsOV^*3xV#OF=Iw@N;1&1A)z55p`nFE
zg>`jx&CN|fUjY5<=kE{nR7z@UW>%J`mnSGRJUyLVT%289WV&3mK}n$`$S;_|;n|He
z5GTpo-G!lpRn`N@;VkfoEM{Qf76xHPhFNnYfP(BLp1!W^cbKGEg@w0gnXd&3S!RYr
zlsM<-=BDPA0J#hd`Q>@eIr*h23dI@uMJ1IA1v#bZnR#4ZTpG@r3eFitnZ+fUiFpb^
zshN4HMb)p)`vUdc@pN$vk+__kaDd?tQ<KvnrA10ghmsx%O>$tI`DDtKEnB|yeA%+)
zj7a2y2B)yHGQY6AxT3PUvTaHM4oep-*sx;9k}YfYtXL2rs<9w2FfuYSG&VSzeTiu!
zlhs#;3m0x&xx=)iw2_Hzt;2<D_b%RKTf*DOq!tT|72CbFe;sz67STvBOnh{tbMh~B
z|Cv^Wk664HG@RY?^0L~w8J5}KfQ;ognOJ3>otbN#|F7w0@w0Ptt&a<8JlG__A*LI}
zvq)?g6RXWMoz`a6c@B*7@%HuC8yXrMt}l2nA;9N6GsEndu#DEDDxX1t<LT<>vd$@?
F2>|ZfijDvP

diff --git a/apps/shorty/img/scheme/K.png b/apps/shorty/img/scheme/K.png
deleted file mode 100644
index 3d587ae4478b2048cfaa180d6299e10342001803..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 980
zcmX9+YfM{Z7(Oi$SPgN`#Y{I1E?H8O`ESl(vIJ-eJwneZy<h0%be6WZJ)OM*veQ$p
zr4&Y~c2L^Vwe&)1V5zV<qOdMb;zTpIy3I(U@<Ux>^oRP(WcpU0yx;e|*YBL?IcHLU
zbvChHWFZLBgz~sTI1krWV;$`5*Pao<!Eg#Y+mW@ePCP~s<_m&uafgrgMWfMpBEFPb
zN@vp9Y&M_I7glP>7xLL$Hl4|&QmI5D5xpFxd{ihDx{^-kayh6%PqA2B1(a3`g#rx1
z4Z&b=A}}$(Fb_61J~liud};O)fcDcDDQY4Rfa=i2p~1mH+V6*C|3JUn<Axo~<#v&F
z(rUAU*+`rD9kZd&0QSG5(Q36iErf)gkSpX0r2?E@jan!YiNqqcMlDw=_!ys$V^ESv
zB|MbJLs5xLDwRnw9P8qDcS9A!z{dnQF2FGyhyHHJ;W+dNdIT^flgm`Ss$R8Pqt$42
zI(VW|rBWzr7vcgzY%#V7i2sK~d@;T_3kc5w$CctrrBaDRBIR;<dwY8>G6zh@$H&*#
z*Q?)DCxes8rR0N$4?v;`Kp^0wX^Nsi@ZH_r>6z)<pWV(ZXDFY~<Mp`R?uFRG&dyHx
z!?MTg1^PylX=*BX{ra`d&5hBqQIp98+zGv2N9g>1e=?aI85x1kWVKoef`AtW3JRst
z>-C1iVITtHh$UjNL;^yQBnf04PDf1#95<Sbz{_H>^azFMTPP^T;c_`0+?h{5>a6`S
zE+HmDT7P=fR}1uAom?bP{}K;^Ll<}oCxSfvTx~IsSo|0y8(b*AqhX(Uy#DB^H^OKB
zfK-cFEO&A2Hk*NTL5LuBFUhgm-ETKLO?HQCp!tH;Z8VdtE*6{fYBR^=Fgsmlf@~HV
z%%s6#y|p?GGY2TQO?>SBdEHH9xc%12wEo~gpFVkHPT0!$wz~0WD73d%3WZ8%T2i#$
zgOM7l%|rCOi_IJnv~DghZ<Ibxmy27uWoZ*TrI5+Kzx$}Ve@`is<?D~$wOK5`|MF|`
zH?od-E=3bKZrA=ZIvE+HZ#J@ZZw}n4n(rI;;;+AV=l#$7S{YxoIDh_9d-dvu{_FS+
zXNhKBo4R~jE!`Tz9tTf#J^vk}{)B8z+2Z{x_JQ-^n(D^AL+l^6UT!>#JbQTETgU1r
v_n&Gw{t3<8rk*hTZI#L^{woCa<9xCKiFuTNKT)1LU6Tmyz_@Gey5WBT5dNi9

diff --git a/apps/shorty/img/scheme/L.png b/apps/shorty/img/scheme/L.png
deleted file mode 100644
index 4e37b9f36457efdc4fc7f394a9d08eea278a6654..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 910
zcmX9-TTByK7@mRzDI%`$Ktz(pXhai3cH^#>sHwC-i=AQUeR`c%do%5{(kW^~%TQyf
zN@8nD#nM7)=|$LeMcG6j%+?DpM2Lw(RMZ%=S>xrwM13*Q_*cLD=bZol{&ObteJAG(
zj&;<qH?R=|sSyhJVp!Le#_DpIn|IVoU}3q%9j(Zf#f@(ue~F8vZT(DtEEY>76XU7z
zbS9n6X7l-c;c^N2LOz?zrZbsTDwRwoV;5uoe*e(W&_p_&%jKX8d#0wQrU8FW7YYS9
z2wymR?(AS_aOBbm#OdJaz^TCb@OcPkfbseLgP{;~`+R*~ua_AZ0P@7i6P{iV%n-DP
zrks@BVTW)~4%<<i$!vo7ndtO-J*kJ%U^FNRC7~i9(de{di9{lmXmwhpia;?G>%yQV
zlgk7`fuK_;SI8lN6rmy!hN2jT;ay#L7wi<F=pj@Dr9!E|yKy)IiCUx9>2-RN)M&N9
z03RQXj{*`ukW7pwM#F$ecsMpZH#Y~8Bauir5&>Nxb7ke}WOgzb42DWdL;VZ`4lgb)
zfOWmcdwqUi@pcjPf+B$Hm}}<ROdt@jTCJePU^Hej8SsHLkSetr{)99b;C8?hB|)gv
zDyd8=mB|Q|3QPvC%oel7Vo_@}pbi5~-8h&g>=gbK&g1iWZTyMNi{DBYPm3`L!u|iT
zxl|Yrb?}i;MUw!EDwlw8BS>{!X|RxZq5;TCT8Oq)J}YaisIPs${p%K>_SmFKn&)&l
zOcV_zf;f*;JiF6#gyXh4d+3uKm)&ErQEU;rnYWF@v-a5Bw9P<q#3mbM>ZxiRUVt-8
zLjFN%!^6X55ec;3*_1ZEdSy&+T7N;zWj(n!`Cl{|ee@_Ao!z`A#TdQq?Phte7sIIb
z;Ch_<drM2pzp1N*8#i|U&97-rfeSIkn6jH)rsA@m&(F_Kz5NvLT=$@y-LSm8ytHfQ
zA4>t|7rZ!oGkf#$KY!h-SRG$r%3@8)Chhb6w|u^2vPsTmt$eHcTDKJ)`^~c<Y^bbv
zB@P_^az8glT;I#A*_vYB**PQStK0*#jd;=hqHp)e>x%jhpFh^Rs@JgDboJV*n!BI&
XA-^gl<hJRDrI&{Y+c5r>Rx<D%5jAyl

diff --git a/apps/shorty/img/scheme/M.png b/apps/shorty/img/scheme/M.png
deleted file mode 100644
index a4a02e60b40df88f82f93a651680faf248d69481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 985
zcmXAndrVq)6vr<%){VxrwTUxb*O4w+*qWx<I=igPGA9^8x%VRA0~A5vD%bE(xY&Xg
zuUKE`5FbSgq6~vzf!0*pY{_aD7o7v`ADe8(G|Sd7Yisw%vb0OH>~Y9WzUTbTIltez
z$?tQ21467cmwB9tAV@Bs#}&bPB;zj~fXF^`SPTopEGjKVZrnfd7(ud52?dgpPP)_M
z@l5%rW&$(8*<dIX3Wvjy`HY1l;m}+tI6E5%1pI!#XToFev=0ppeHIMP&CS6soVgAb
zjYebO(fRB1kw^r_;XBSjXJ3Ec<h4mqPj8Q-+cE4O2GL!#-EQye?}y!v%N@3M8{O3f
z%}drxmNpAS5M`kZMuSeT1L+NVvbmXPBtT>{39(+GP$(6UG^iSCq%~5R6cTy8TqG8Y
zC1OaRgJLL#V~|u<Rr2^eUKzitx(WnM0V)t+D2id25XXf$oD`sFIVym%x~5uKQ2`^6
z)YjG3E9w<WWu06O9btvg>+^#7d_G|1oASY3VzF2vk%0TU-R_Z*5kQwnd<z_U`+Aq}
zE${C?+1T9ppTmH2V10dkZ*TAJ@?BuKbbD!abv2nxj$a)g8y{QyW^Lu`mBpn+AOJ|?
z@pxoDVrgrO#ba7h>+^a2(|($!7Zz@|np#a}Q#>96ZeH&-tyZgSP`ZX)qobo5f|#D3
z29gsK6DqaJ<#NetW!+c00YZC6yL-fKrYQIeQkhIFkyve3fDgFfj!vf&m;)KLTCE{8
zzyvs>IL0sIbGTei3D>rs+|E25N`#4#qTTJrOra_-<s$vrukoOGxrHY+Bgmm+8D}8g
zsRC%`P<*r`=Rwx1*~bcrrdvX2eLzZTD2`FDCkzyn2x7cw;OLAN4a=-GnkXx)MQ3Ru
z4NR2D=Dfw?XicP<A{z`W5kVRV)5&wc=fccSeC{Wbg74MJuMkJ^%Bi60;lsS(sOY<Q
zix@A`>G7@iSUjAMRU%Awlcte)l-}J<|N4q1f@E(U8g!PIB@>C$Z%3Jhbk<I)@V4by
zDwX>wx|zCA#Q59u!yU(Sm+R@5_n+q<2+*z77jdKF-zx)Swm0#27|coBfBy2?#uMq{
zBf-pvsVuhgBcuHnN6(-s|17)i*49C`@}BO6^J>&obyj{ywON)Ep#Rvh?Eh%k{@niC
z&NK7*FOcj9@4vw~9H9U7#9J0tbJ#z>exx9M^h93X)1$}pPj)@FB8_deA7A+A;9nU$
M{1S|Nqgd(q4_EfGApigX

diff --git a/apps/shorty/img/scheme/N.png b/apps/shorty/img/scheme/N.png
deleted file mode 100644
index 6c860f77347a8eeef65b3068f2e4444e5dc7da26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmWlXdrVtZ9LH}V&0Ljea4|%uX%-(fZnDHJO0vXCi}a4(+tLSp(c6c%+}p=(18uh=
zwxwh(ZjhD7N-4$O^*uJQfkkw~3<#UaNTmuU?iJ^<EN*6h>E>TPe*NWp&iVa*=bW2-
zKj(fS#oHS=FLMwCX+T9n8LThV#xwOW^A0>OhlSNAYi~sse%SjELF(R+iWP0aP%s{k
zr)E=WCY{M<^7(wRSS+2ZMX^-O7xI~GmSLFL+1dD1JP-_wjEtPkWD11>?82G3xw-QY
z7tWVTCAbJ*IC<)1bU2!rPJm8CPK1ZTr(>r<p}|lf5Qq*B!|uT61O1=%hXx0sdE9^8
z>+`}4@_0S8i*`62ASdmlY&MJ40-|gb%!I*UFd85+nN4bqTBFrKq9^n+xm>Q0LjoNP
z$8ZS_iLy&6LPesZXqT!B1Whp}7ULL(<G55JkxJmC7{fX+F_bE`O4`{8S0K@K>j(p3
zFdDn{dgw?yrOBD(3`A-MC_%(xF|d<Prz@38xm=Eo#io<f*S^07z9NxGHk*C)=;5tf
zHzy}20qmVSx0A_aBpLzZ!B7YQZf<UFY-}tpEsl<kZdJF&#>N7{pzoLuAY5L#ytcL$
z4u{v**TFJLl0a{MVIG(O|D~lxzu!+%B)B%3jDQQ?1!!b*S-|LayNxE3R;SbIv@W-6
zd}17M1%tt<#8eMSDwGPjLeWF^M59qa2Oi;>CMG7pCXi99)nF5sNC<+k+wH&;J&KA@
zkVqgD3fhFfCH^tg{vMAEmm~ZKzgTO9xuac(46|PqL9yE{()1z7voF>L3rVJ$pt;L~
zVr{!_*S*4Se670L-wCZ2N}=`$Tu!Hj_CSdsu4A;o;qrdU?IT^i9zWOZ@b*wN2j}nv
zZ*v7?FV*LvOf*+!p=e9*TOHjP+<AZsKT<Spe_~uk!maE3GUj{t%$a?S<1#+$#zyXb
zE(hp$cJ9C4!i3D){*SF)J|9lov|l$$`G=dYFy+z*S8^9Gth6@p7>(wPS})frRlio%
z=h%CyP8)7V?FU@;W*7ZaJ*Ua%@p=FL%X;X^6Upxf>o^HKb;y5x=Syn4SV^?}_#DsJ
zVt<<Y_D}0pGf{Rw-Tw{~dYrl15r0>Aap3B8<*Ao$u-JQ5UlH$_9$)(TkM|wj-`(8J
zyL*Y+E>yTHY|%F?_K{_JXlS0`vkV{phb*r$41f7<ta?zqRgWZ&X#PF?=2=}06WWFg
J7g~+s{{iY0uLJ-9

diff --git a/apps/shorty/img/scheme/O.png b/apps/shorty/img/scheme/O.png
deleted file mode 100644
index 14a05847b5c785ba51184fef2204f8586f267270..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1016
zcmX9+eM}o=96s1Ow3BSvW+aM+EHPq;i&;z@(HNj5^nl)V{r>(qWNT^fO6avf%gRBe
ztymbaS_%|e+O_4gOf&X@{-O0BSlT(I>eMADCc3$)$)d!~nD}da?s?z$_xawv&wK9*
zu%>eMvup%G%26Iy2<zeEcw!&S)vp{9!BS!qHZ>rbo0azvr1W(`tGKbB=?{fMk=aNz
z7L6z3$z(E}PA@DLkzPnAQ^|ND5sSrUXJ<o`A$Pw!5D3i2<Ec~%vQV?Mw6qLZSzcIJ
zfJWG1_`PAD-xr<=1BbjrgPy_jW9Na)0CUdm_WAvg?K{`!bUK-V0SNZ=_ShYEn1QsN
zrmU2Ov;awpG<BHT&$I*oH?%sPPOk&kKp5l-xk9M`L#@>aMIw<{q|s{RN(CR|^KlGP
z5~+lT@_5atR3-&tIM%{%ZG|j`fsF}pT!3RZ4)v`N6W~(0OmJENT{5{$rB<mm8m&&N
z)9c}lN|j2XC~gP^(=*dEfJkHpo=60oF~IoPWO#C8V<VT#<!|P**-vNZ=HQqkqa!zN
zY;A6C&d<+BqtR?OTllIF3<iAwzrUYhK+nX*L_VK)yWO65JX>3vnM}sf?O0n|%VbvV
z4hJX$!meLg@9yaa5jxBrAp6wxl+k27YcvMm4=yh+nJs3}0WNWTV%z{A2)#i+IyxE-
zPZ9(HAFos?U45<#!3!WD9BN`>!s&8~C1RCY?e%(loxN}u9*?Ie3yy<UBuUaVZKG{s
zi3Dv%c_@&Fwlt&7&7dcT%jGn3>p$9gv-m&JLQI6z{e1gO(IHxzxQL(iJP({FJ9!El
zf*d?r93{wfqymCvG|F!*yHolc>+l<k4|72X)tba|nqwu&c8UfUL9E>r$6~d=U1c*`
zyXfAkPK*7liDKjIYR=159AlTsMw<*&m9X7JwRgSRc4`EA?xNg!am99<{u5-dA$vSd
z?Cuir<3}chbtT^xF8>)Q<Z>&4T;R3Z7(+NP2c>n_8%{g0(IbMo^=sEIUS9b){^8O_
zN?KkWQ^<C1$-gfY?tH1#rCG;rk!JHBcP-}ozy5xY+}_8o*!v3)pIThAJ`65yKMpXZ
zsqOUV;ac<FgIe1!`6zYZ*d_I)&M$UfJowBB&6U0%OKW1xZ^KX5$X4gxa^=4ps*&C<
zVO4&!s=I3VDV6_M#XR*=jJf~ys_H7a^MUQ36IGv;SO0L`b*S>eUMc(U$B)YPA7GXF
e_ItgLhT5DjAmmAn@p@O#QWOep#JHIT{osFi(!V?a

diff --git a/apps/shorty/img/scheme/P.png b/apps/shorty/img/scheme/P.png
deleted file mode 100644
index e53d3ee9801d83988b2afd7f3ee590778b2b5b00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 950
zcmX9+ZA=?w9KQ}5W({g^I_755EHPq?`=WkWvbaiH=)v`RwAYtwY42KB+Qar*d)ER@
zM_(qT5Rx$i6`_Q)^bN)c9~z2tO5-Obqb?Dm(<LAwOXf#oG|@!;H~#MbJkS5-`9FDn
zzk4PLyr)g}vJ63xHdLe1!}@%4oNj@+^UdcBut<1)PZzS$xbOu0e+Z0J#}n~vHk(_@
zEsM+fm3*;SESJlb)h5c7a<Np*udIloxU{sC{UkdUADf<@{w$v_l}b>BJ!@-gw*l+7
zE0qc~!U<DTQxlnq`A_G;#?#}e8>yQ!Hvx%c;`-RwL?#2(*!5U68cigVkQ^Bu2}i;(
zg9%}Q3vfQa56sW`*&)_F=mz`WanLl)&=5LZP77tBtQ0r{4!ho9Fpvhj!)~!sT3oBu
z;ZQP~j2cv<K~baGWHOs@9gb-+45~N|K2GR#gbp@iT5X>egV1C#5&Z;onJs49fXzWW
zXoeZE+aUw_g~f$MKrXikUoJNTxHSWc-QT+p*xlW&)oOFuIiQwKrwfI`;n88KTmnH3
z4i4^pc`wssorxzBAmCnOFBXdxiiJj_0s4Uck>Lm^P_Nf{fxr93-O=bM@b!AV$yBmd
z+XBJw+*$XsULfmqxfmxiJTd~ZPfkt-KMY!JHn^?TW(@=bAPx{GjU;I_8c5RP@xZ^J
ztkx!9oz85rutP)r`hK(*1zD6Tl~S$hJIlP(d=`QpHz10~KMpnnS6`0`$w*((K=5=>
zL-7dm%nQvSK^AfykZcuDt-AHmsq@nIH`4r9AxK?jNsFKi`2B89fDl0f!<^C=2w#))
z-atqgl?Q!c56j62S*P-KxzZbAd4Y9ua=n}7+#&U|L(|Z6h^pQrJHCIPsUxYbuP^3Z
z$H%Vx#rBW&3dzI5$?X2g>`9?o-M@BOOt_-m(LqxL=N#SL>2^Z#&ea`pv$9>Nu3y>d
zYU>m!ikc(sgu!M$Bvz$o9>A084Q#OA`urdG_FH5fTeV>!688MQ|L0ciyhMuq{nu+)
z?(NU{UYd?CpCjs_U#m~v`faeW@UH)->Z(a0`S~ILxUsmy{Bc1(?{7U59N6~$a{OxF
z*-NKV<G4cdgIlo~JNMMKM0&-%{?UyW9SRA3_1{EYJUSBVGY>X{*mo_+Bh)<0d~++=
N)CX1Ls*Nrt^&em?l&=5)

diff --git a/apps/shorty/img/scheme/Q.png b/apps/shorty/img/scheme/Q.png
deleted file mode 100644
index d07c42a76de45b0fe73b54792e006a6de5e6deff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1041
zcmWlXZA@BM7{@PltQ(D+X-#IjE+PG3ToyiWO|#AlM5u5<-jR1G$Ti*zg$pR_03E0x
zZQZ(n!%GVYLM>?=7TcLNBTLL&YAa1=`jTyR#@Kb);y&1BANKa}-2XY}|2*fMo1EV{
zQ8C)x%s9+I5Tu#U<49m^X|&gxpzmP4DTRUNmUMR^*X|v8jv)K^Vu6es3<VR31eK;P
zXD;VvbA>{oSS*&VG@@847Ul}M+1X4clTN1-$wVL+h{xmETyAb|4rXD^{QUe?i1O7^
zsRSG053$ME_{8}1m(!rgSY-6m(F;=-K%tRPAP^Xzn1I={pPco7><^8MKyhez$m8`u
z4<bDz;UEU_K@d*h*ua3*W(8pb81#CB!C*9iF_}#&wMyNm2BXvKBvPqVCItf(Au1G#
zP%v_ZoX6+!PVp5=1qc<P0--<vvnUE46^le-5iAx6g*`$6q)L@i+}jJgz-Y7@y+Lm<
z8nrqdRK&gF)J$pyf}+xwfJAzR0!vLnd^QDeR#sNl>+AJ;y;iHGQYknfL^7G&*w|QJ
zUS3^YUAwz>?)*78JJ5!xR;vvfLEsUH#bWjQb$}lXg}gqm-|xSD`xfc(_=bE-OG|(h
z;Mg(D;c!$IE5NqjZU-9q{A@Z+*)cm1uv)FzY&IMT8%;)&*=)90qOoY7Ml&`xHW{CU
zv-D~D0Eo?IOHL<of{@8&Mw2NTje5Oai^XE=?+=H=kw{pfR5r+nL@Ko!$8ne2<#amX
zQV4>OD-`@wd>$XvKnm#K763S#!(nqdZ1}jG$_VSP#tS1Qs1)hkd1PxO=ALd2GC_Zb
z2g&PBp4yEd2M#qF4M|aLP~1=Qh1~r=?t7cw!qT-5uR!S-CR34Y2aa0_5>f<l_z3o(
z!*iPHwmV$pFw;5c>Bk60FQbF~E|YC{VQvyL5lo2{Bdjh-`x^q-v&-k4l(jvu7;DIA
z*SAM==B+Jr?&!hKC7ra#`Ry;Zw|}_4y%*m*eJm3)+Y~l0O6UV8ZHmM}ac6a*bTfaQ
zSuNknEl8R>GHSW*qCum4T7M*aSf;nuaSZRl9oX|<fB%iR-^6Hpx%cvgX!?UQTlw#$
z?T2Y}K@pufVc98PS-kjcjT(5hb%8qW`}uGBfwx%t3i*rny-etjiuI1NtgZU*KJna1
zJf_i)JankOIrCtL^`YhlZrFXL)%nv`mhbNAj(c~XEc%|J?`J~K{%vY;{<)d`N8d>^
neDq(amf76Q)TZhSPQiK;^7Xp*=J^*pHyXV7T$FRI%Q*T!h>*%>

diff --git a/apps/shorty/img/scheme/R.png b/apps/shorty/img/scheme/R.png
deleted file mode 100644
index 9b522d6c5a0dd2f64f6f597cf6bcff3ce3d19968..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 983
zcmX9+eM}o=7{6|*8wH%%FcQWRvY3c5%VJ#2i2i}Jh2GY?)_#A`Pi^VZ_6q$t)&iw`
z72L=`))j=K90#S9P13oNaLt^{FvblX3oHv8CK`e>>P$@BH2RlM<CEX}zR&Y}-sf_^
z-`z)Yys2DJB|s3Q9F>R^aK2Pr2lvBXd*YB14qiaf)POACtNsN+_EpQJDsfM&Cz(vr
zGxRJo%g(dubUKsCWIruNCYwnwrrG&<hGAxAW|9-hXis!xWMqzI7Z(?y3wM^5maaft
zy^_slVGy2h{=)g8;i1V-CIN%-!M^^!(XmlLtT)yjjSdYDL$|BDD-wysdV7I97d{uF
zLa+mZp&;oaJzfvMOL~b`!r^oP{!h#ni^Xbz(q^~m^g6vk4@tAxq);lADy7M6(i!v^
zj^Q#KT5642f=VQ3P>ogt08)xcr8tJ+I4+mT<TAJ^#jvxO6iTg5D}P@OBaj%Ijb@A4
zVzoA#Ouzs?H9a*ALDSQ8F{5dE4C3Q45CslwY;3H5yME{Ho$J>>zm&KH>f-TuekH&C
zXnT&G17~)2c5=B~d?*gudt$L@GzzAzt*wFcUESSWfxCJ03#x+(g+i&>6vuG`g9EGF
zDtH2_TU@R}fn!;AWhFl`IpKD@L9)$mx7w`WEqoLg;p!jgPo+`@qY>U*Z!mOrc3vF4
z2olD}$HU>U!DvvaRVuX_ENb`r)f$abrE2%LYjryC1eeLcH)o3z3<0rjj|V-2N>EfN
z5(&j3v$IND{Aq#;T#3{_*>)BS``IQDGR!|Ffuf{Mq7NWQ>5<~%AyafEkOzV&CO+`}
zzN7pj$K;z;OF-2TDqT?M^Lia*5K08`b&x`jFZ5wez~%D?!!>Q5Pzyl{6oOje>or1`
zp9lmA8(E`p5TwKJHqV#A%q}W=PgS|~f%O*B*KqqdYv0|qv&RpQE9!ZVzFOEzBoYe`
z^7+K8bxh12X>@8RoHR!p8{>!N^(zdM%dRfuuiju8MR_fwSF24*qxOgUI;}d*uek4R
zZ6%4%NVn`)SL^0}K_x{|4(jh`e?9M@s45;``kItJ6~6m`*m?&t>kAb*`pv+@r*&`r
zd~f<o>yxrKnAq>P#TO=|#)9Xcy_ZX0dCcQiYnKgN<h#e0e|vbcncFO>{jtD1_;$m!
zqw-sUE$8X&J$}U>&;LBsR$3+y1WR8mDPMc`F7owL{l8P+{Ip)Q2o>X^<pyite=h;0
AX8-^I

diff --git a/apps/shorty/img/scheme/S.png b/apps/shorty/img/scheme/S.png
deleted file mode 100644
index 1aff52f7525caa635514e0ee8c9f3a26873cda51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 950
zcmWkse@q%@7(VQXt&7>#HMQNk#57x?TN+H(HgQ{1Ca8CnJ5COe<HzyCq9SnT5Uy4b
zk*0#yu2cwh0`-a@)K<Fwh%T;4ja%kF%QRX47)g`1W^*x1O}1>w{@Y%jJm34h@B4l4
z<(?<s1WB~l*1S`LAV@8S%2lwxSy}t{L2Nkj1_hgFP}Saolzuw43;DmKLftwV8cimX
z=}dY~n9I&*^Z9(CP$=H6pinI27xLNpc|i~|nN0FVGB_HXnwq+m%`Pk~z$x5WTwJ^Z
zxO=BqEW#jsVe-mkBpR9dY6f_D{BrnG_*(25Ff<kl27{4k6ix#pfnon}Xlx9cLl=j9
zybmJK>+`Z4>vFq*Zr1JS@3;5ZfsTF$M8<43Tg;GHZB`wvqxCc-CdQ<qC`wI10v(*d
z2_*rEMyo+F6g`J&yR<-PDsY8@z;S{gNTrfg!c7H^ci;*ryL4S-XD5t6VlWyQGh?<`
zj3yIw$WC%LHJbvYD*zu-=~N7GJr<A0mzS3}w>DQ-SL2BU=o*iVgDvH98GOjx%#=!{
zt6yFP$)ll)_NCI&#>NIn9tn<sli)mmfd}mqlN0OTt%t*5p65X+AP@-Ta`O)!+;_U1
zpwVixSs--V{C+=p4%S($7QMj$ziKcV^#(ny*H6c%{Q<vPqgHD)9AJQpPDDX9p;UsC
z9*+k*hoKk{mC5C@R{5uAe8$Ry@Tv$3k?#D`Qz>j6?Q$e4eh-D>zyL}QBFO7+SC$Bw
zO&@_~wHL!%tDjZ9D}L+nKc{aA&}w$5bzT|gcH3DmlnBCIU}Y}OcfNkGkMnph)(^OR
zy$-g9s%ell*30@ljzO=(%GRsw4%Y4o@EbqE%x{?dbM=v*yDe)-xMlr#*0#NE%N{>C
zt&)n$-{*c!<eomwB@&O`Zx%wf;kLFOEzc8dTif_SQhG`vc_MsW{3dr&a!*m)AkYlc
zNo!1$p^ITk;zL_Y_qaaShkfkr>Z&tB$m(=D4gU7t;kuahwL?v>_I7voUi~rG^o2^f
za+F;2{FP{=3i#Y7-8+9b#+O1>%MW`tZ+^VO?LFS3ANH0-;$y!{X3mbh%r;Xy5?#~t
z0}U@$hyL9DprcMgSLN!y6^TE)aUycb&PYY(v;QG0Yl0wMc@f)cQf%%+QXgr5K=b#n
OR9wPZ33;i-68;~hAdn6K

diff --git a/apps/shorty/img/scheme/T.png b/apps/shorty/img/scheme/T.png
deleted file mode 100644
index 1736eedc47b4890ef2bca05dd7085c576d2ee1ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 904
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Jb#{oVet_=+h
z)22_GGk4DX1@jjzUbJ-S(&a0buUxru>9VDZ7cXA0V8PsZbAbx#>g#%XdKN8Ov~1Zj
zh=NtCR;>ntHLF*yTDfAyisj3f1GRT`ceQu4&zLy_h+5lPo0^;YC-ehRLt_Kbg!YaO
zAgZaYsj9AOXlw)uR#sM)mX%giRsc~+X-QswUQTWf5CIuk*;%P+sX&yOl?f!{;^X5J
z;(?6Bq{N8Gh{&i&AR{&|HYhkaI3yUz0E+nf`TF_$MMg)3hJ|`~dU$wwhJ}X#5m3;_
z*T=`t*VoU_FTmeFz#pj6$Jf`}*9XWAj|dM43<PQcGJu9e$3(})$HgZk#Kgt|1p@*D
zX3d^88wlnA5eQ6}FahYJdGqI;JbCiWnKS3lpFel*+~LEAr%#_gVd4a!_j~(#fq}Vj
z(ZXxjt{p#qeD2)2U0uLn>8NjLsBfqThC_XQ{egoA)~#DtQ(IeBURGXSzGdqcU}%??
zmI6JSnU%F{+0v;~r(|Sg0R5Pll$4a51Pss4&d!9ygsA9fpbLR<5g8Q~5*iW`8VYn|
zV^bqA5P;tF^Y@2@m8X}dho`5ri;J_XOTtRqKcKiT3GxeOaCmkj4a7<Ec6VXuV3qX%
zaySb-B8wRqxP?KOkzv*x37{Z*iKnkC`yD1}RzdD*24^dQLYA2!5hc#~xw)x%B|t6%
zLw<Rlb54F~ib8Qleo;xKLP1VxdS)J12$zPlrh;=uQD$*TW@4T~P-<pgYLVpnpFKc5
zXFOdTLnJOICmdk-!_?$-NNLd`r9(-NgeEyK&OEXtMZm)o7>kowxipq6O;1TneV+34
z+0v)lOspYXTwL8<-d^3OPH}66G%`s|of>-8bZhC?tD#e;&T?R!%chW#la<GKahC&Q
zbC^O#_WKts7uy^dC$D?=Zr!|l`~KxA<Z_8@m|-Bup%&`THc42gk;yE0ncrNi+^W+&
z3Z_TJG#(ffiwT^W$Gj-biitJmS<?X<1Iz288V?NX8D-9VXW{zs<JZsKY%FYSJJ?v;
cTav2e7(By6>n}<rG=T!c)78&qol`;+01w@AsQ>@~

diff --git a/apps/shorty/img/scheme/U.png b/apps/shorty/img/scheme/U.png
deleted file mode 100644
index 320938cedf1a1b21dcb3f0a0ef3f096e5b03b38e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 977
zcmWksYfM^a7(PghN@u&YwlTXTW`D+(*z6Y5C0phM73$$|7m)(zs33>I0S^Z(;<%X#
zI*dp*@N$T!SOjb5mO-*MX`-Q*HA^$hbd5h|)|qA5{w<wz+4g5IZ{F|yp7;5__ax8r
zof!qz+bnoNfFMY-R3cWv{(NmU@}Uab&!}PJc~re!$kul+{f;1Y7Zj+bI}{G3(`h!#
zu5zonwOl@*FBA&Jjan3nh5ULxx3<P{TsE6cXVSq?Fp)@H&*j$F*WncI+=STN+`I*A
zbK~Ylu~>w0_|EJnv$1$=acL3q+Vr*PRCGQ$4;hYxgTY`d9*5J(k0&Pr6X8e%$gBRV
zUY{2#B;#c$7v*p|Af1$xwA(FK3nXbLp_<HQGj0Yz3=sqR0sWvJfYD@Bsnu$Y8UQdd
zOoquZ0NQ@7L@JS7miFuVA%R3?D2mBs7=|h2a)lgjqB2>Z424!Vpi?N7Fap4E#b7d<
z%s76<Xaq)~R4lJ7uRyRXEJT(~CX*lsoO$@o!^~nPxsY61UIJ0mv1#r)cX)W1N~L14
z7<da}L*X!3m&s(RyVaT5nNTP+H#fJtTU|&k_{M!8JTaH3R4P6nVBgf#ROMa;#M($(
zsq_`?p=~5tDwX^beo%@NIJ}YFZYK!B>2$is+&DoD8VrMm!BN{NxDBeoH+Zb!kztKi
z1F8d)fk-q0j#;hNXf&$PYQYCgE?22lG)<4uV<VOk5H7te1+PS6v8Y?Tjd!lqeiufC
zsgcfK53IFjsIOOy#Oq&{K-1)w=sgH>>RfH{kY%<N$Oc9#>u&h5?#23Zum9%S&I9!>
zsTp8IE~nE%G0-B2Yn&1}T;7p3kIh9h{x-M6J4#Xltw1PxtxaU3Ne@F3RGZ2|QWpAj
zEQ`X-kyQMlrgd)^-$9~Xl~-~@M@MIKDb@FHb@KlC<<tHB^6~L;xxC*}&xPq8YrhYp
zD3foZXG@^ye1Dt!vUvN(jk53#hw_D-(WKOCjcT<)XI5_UTXtPGhy9|9bbeHIIo?17
zt>erS#``zZadP7IEh6=g|9kZvjNSjh|Ly&ay?@)obx-z2AG1Ha88~6@{AoqM<_Qj}
ztK0a`xd(mej*EtlpLoKjcPAe_`|NGq=cdwyM{b_r_80u<UwE0yHYj!i_j)cJJmt6i
oai;OPXN{+unob&<PtETfzlYpv*K_gnkHj^Lq}`Z!s|%0*4{XGsZ~y=R

diff --git a/apps/shorty/img/scheme/V.png b/apps/shorty/img/scheme/V.png
deleted file mode 100644
index 2fe5e5a16219df3b30a60e7490c430f4905d3999..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 967
zcmXAndrVq)6vr<(V@Ky6t?8P&C8XIpy2iw8vD^Mxs9@v@_kx!TA_y0#Jg(zmfa?R>
z3T!-lLT#l5r6pKIaG;x+)+H{+m^JA#P1a;}blIAwbLl@zm&N|EEb9*0$@lmBopW-|
zxjCQQ5gFcE%Q?Y85Tq6r2?=;#t(-$uaPt~ok;B7s6RpiiY3Ge62*N%plaMVwzb}3*
zKAW1onZB8s%Ve|J+(Is&&u8beb8~a)bUJk-1qGLeFO5%(XEK@j`T73~3WdTV*yoG+
zLVjUkA(zWR`{>wcI1;{|xDE=1LV-^M(O47&Ux5kXNCb4@;sx)J*XQ?x2EBt!A2TpG
z0P-*%htpxR+d$y-e9~hwn?M!EV%AX<rKijmv%zRkb*ehmord#9txikG<#JN4rF4+N
za158?YK>Z<RESWKs0~$iD3z)XNJ=n?1jjHO$7NEfObV3}3=?A#2s>0A?L<4YfCED`
zT^bmxqjZ#B-=)<;Ue+#4&Ln5RW@i8tSS%J>TU%TIdOdczV$;*p+uPfK4mOQljsXGK
zy;v;n{j?X2MnmCHDwQffD97XRFjyoq>>CCHR=c~q$z&496ida8Z#IC^u+P`m-?y|>
zDl8U&jMwYEy?z_`GYmub&{nH87z!>gFFAXiLqkJux7$k70K{N4(libH`v>}`u1u*l
z8rUKj3{Fl?xLhu^T1_fQQlXHOBmj(zL;w*m!KG4yAnbN~x2YR#Lq#Ym5DEn?LhZLZ
ze^>q$4}r@O{{Ei15*Wp;LL^fCrU-%;dqtgY1UY=Pa#%=m_BbSKJSf&u^E11?x~~4&
z)6*(QeMFNgkHBfSn;aep5yaW=5ZIhdH`i@-x;%s2UK?Yf9ULWxCpgU&SY5Q+LmM1i
z!bCevt`D9!z63oFP~kc9_`UP`P2?YTpn2<LCUbJj_~^(KpOv`v`07=XD?-I+yqd$i
zm9uo4O_tvu@Bj8Xk6lf2#zw_$hrhdf=H11D!p}a@^c8bZJ28QM-_TS{@>!|X)zxQ{
zJEcEv{IYshoA#ZfsOO)JTsgHSO_c9j4%Ia#&R#5!Csyv7rB&}q{On`y{hieNOTGUF
zg8cFko_@vp=cBj9E7uxoei*a)*)N|_mb$*^IY>_Pm$zQyJ^b?63qKaC<Rv~UdQksR
szwwT2^UnR<Uz@m%jhjup58tZ0_ZRXps&?La5_(!;gSOzpQnNnrAIBh^LI3~&

diff --git a/apps/shorty/img/scheme/W.png b/apps/shorty/img/scheme/W.png
deleted file mode 100644
index e7b37b011f252c279081acd1a9607ac9131ab497..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1026
zcmX9+YfPGF6#meeZZ2faX3}PBGqZGwOSYuhuQkgyDi{Ib;}ejJ7jBlDmk-ND1qFd7
zPzAYFLAfYJ1*8gFr5$d~*6hc!MOP_~POWoIe{^Zwx@6tz{w&=gJ9*ykocDa^J#WtQ
zyyF<!Ossvq7C{gqjY?sIKVDfcR>Qa9y;nHk2s(CiBa*#y>M?>;kue6h$!fC(L&0b)
zIv<};EF_kemQv}|GFWCgl};}umlhTl;_-NFE*1=hEMpe;q&tyFB$LVi%QBhFHL#Uy
zP@hhxQ>hd*nQ%=wFFR*uX8;a|!+y!`@p=Go7j$qq9e`2usA<Gx1+!U=CZl1{Fl-zK
z=nZ;YgZK6K0U+q<?U5_wfJ&fLh{R&CM66IMq%x^MC=j*_rQNbFQ5T!T;cz)!Vi9DR
zC=+F&?H%oHyf!M0N~P0yd>&80hhz(r!9bZz6h$!>3uB=y78ElefwA}kKGxa_M<9SE
z9i1JWU0ouvNGy@SjqM#BLZJ};Vy)P0I2?&aqS0t15&_=AV39BkzLsC}2mC(2Kby<?
zD&Fr81Qr(;ftJ1ddp@7f>2!L%-h+dKa=GksyLR_>fh(8GRV;3WW<qAOd3t)fv|R%8
z`n+a~8Q9y{+yEwrhKKSu@<6*zubZ2jD-;U3TyAh^P^nV&_Vr#(Tpb@DpAJrgg1{0;
z<8n<XRZ59eqSfg@KCM<8i^Vh=4d^&<aX=!K0y!|0-EQ}IJTRlITQ)Uy#b&cjPEG=u
zFf6x?Ycv`IfdGs=HZ}&LaJXC`5G0ezWG0h|MyJtR=wu3o+(a2AMb1{<mY$7r5YnR^
zMP(yvX{I2TYfe*P^U?rSs6&vKU#lzv5{{mP<S{*s*>r5b>W!MZ7e@X$vkIwmYOX*}
z*7WzwaXoAiL^Fhw`!t3N^*WVCt2fpU^cj?Dyp~_vKz^s5tkSA=dbJd<XUo;NTwDJW
zcN5M$qEXIsPi}WhZX@=_Z{AAC9zK*MUJbBIB*J<=|Cignxw+zY|8~k4x3Y1O<-A2C
zZM{enEx(VER#$E%u4leT-n?GOicUAg%f+1^_e*>C4({%jSBZ7S!^giL&SM{Zw)VB9
zbio|A-knP9FK;KeX3q6Ki>`l5BCHvoo_M!2Ur>HudfOG6t*%)K=DriJ_xv5cad=O&
zqaxOQdOxpz8vG%06W{pdtL`fwVYk)4-XVU;`(uB7Wb4n^hcR0fK63Qr=g&{j3)MBZ
xp1o<k^zQ+Q@X2#4=_vl-!SSQw+2;d{t!l*ovH0-G&Y7_aO|&MIl5LdO{{sh@*lGX(

diff --git a/apps/shorty/img/scheme/X.png b/apps/shorty/img/scheme/X.png
deleted file mode 100644
index 4a3d8bd38167ba116c0c5379b47511a7a2ad1358..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 959
zcmX9+Z)_T67(cp96m8VG4~yEQ@q_6;^n*(@HO7P$upH%%<ImCKKgWdiSm7ufU7>&Y
zV?u9(WUyg7TPTbcxV5-7k+in4wi-2Ji&>_L8eL`<-QoxR)cC<@;zRc2_ul(FzdY}A
z_xrtfiNJ@tB`-=41nEYVavki?b=H%|;Mv#ztR6N|NH;Wy-1_$AKM<r#OsEZtcp^T(
zFkdJZO65{zrBba{>q7k|#M;feAXIDBm6erpxm;W>&Mz#?#%42_Or=t()oPF1*4Eb6
zAsXw@F9<@tUWXx<)0gM?x$7TX2c%M|<a^00*((5e7fhJrdBF6{baW~jPb2`5Xe2xl
zo{UTaxG?8u{bRl{03_ZEUbn{$c%0ZB4u{j>Iq#ueG-aYpW)pqRWwYCKdcEGDw>j*<
zU^s?raI?is8c8LpRH{(ph!Fs!8dIxr48w7p&}aw^bgD6I7*j(zLX8kwEgXRahFGi?
z7;AUf9Zsj!W&@tk5{pZVOAv)6unV$6p^(jH^Y7=kx3@tx#OBuKwfwbgE(`K`p5NQs
zJ8U0<8wUpmJ3Bi-#p3Z;ES65E+wFF#R9apxwpuOz5<hWq0vy=g-G#egyv!)WjE|3R
zZEZH2AF(XUFbwFWT`ni>1m9LyS0mA=*<yi@q-i>LH5cMSkw_$$%Yiut(qJG-urZNL
zfNIKQf-3;+V9|ImXti0jIxVU~QI$$H3>cQl<uZjl&HQ|#^M7zUT#rZ}{^;oxuHhj$
z!XNKZLh)2UX$m38(=T+E2w5zg0#eMOm_qzZ*GtErA2|JMg9YkM#z1j0*5`BkIVcf?
zz37*XvEg@nL!)evi}VJ@!si*kgp%~hPWQ@2gG`8HXn(KH&G_BHe=&6i&fG`kXAP&m
zJLlX-l7pYWQgJ<a;HsRss=F%{ZRfvl=9@=H&CFrb5GluXM&ktTHyZ7;XXzVf2<eA{
z@bPN1(fFhy2)drWGD(s)y=CP79m+;lyHDP^;Pra(eunWqapow|^^VWy`?IHLyZ5#<
z^%}9?*t&f?Hu%>U=zlXayAP$J^_KosP4SJHuMSPp)a%5)|L?+2p+{}U#>TO)H^h>G
zesgoObyt!8=dJmE^KZ|b3|Ky${_>mOr5h6dUZTss{=@!fUbY-B#iZpaA`r+<DMzV+
X+9MGiq~snkXYKfdDscI&L1*%RHO-rJ

diff --git a/apps/shorty/img/scheme/Y.png b/apps/shorty/img/scheme/Y.png
deleted file mode 100644
index af76045e8978fb0708f58ac1ba49ffa88295bcbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 927
zcmWksT})GV6u;mI8yjk{QKGOl`mmae2hj(4Kp8F23%$3u-`}6JtQUH33$(>{u3vnV
zj~WY_Dy5ZjS!uP6f+;Axlq|gP04$6|AKXVAaWTtY9GWdzvYnosbN;_`&i~xp-!K1h
z0`I7<I$ebzNHxmmiQzn6iVu%K<}@6Wz)?0J?r23G?bN*i{FV?%+x!84EEY>76LYCK
zW`Rkk)0s>r`=Df*Y$m;!W)>DwsZ=tVjNOg-{JuyeGS4uJi;FOYI}gEfxm+G1m(6Bj
z7d|pEIT0QU-<!DyJ~BEI8VcQt-U1H<13sTGJT?Z?8{gjWe&Y=UgV4P0x$bhiAcH$y
zPTEe}C>uCMQ)Ew%rP~5d_K=YE27|$90AMnklq#i4tpcFa>%<a?L@EIQ9Sp}XAr3$$
zm+?_PzY~=!<lwjv7hnPbOmQ4AP6&mB5H1TatP2xBDOV~8kqEXFN`*$N(Hryzqfx8V
zL5C0#@!9w+SYkE-mP|yW(V6&6u~>{wMS=V3>gv?=6!4miOz!UPtgo++hDReeBYS&$
z%TJbpvOf?2^|rUS$0x?`&)whJ+6srmAijIh?eTh6R#rf_!b$;j0H#*bIy4koTYHwz
z=Nx?wk|cqq$!rGV3^Q*u8PysM{GnE-1y#LXuS%_!%A``6Os0?zj|}(q_kkKEj=~bh
zURy7ShIXP{9*^6`GyFZ#P<jeZF)l$`Uccxr73QuE9x_%@&xhh82VXUSARnJ7MHv!L
z)Izh;iDGS)FU!wV)Lbs#{x1)$CQ_<&a_tmlp`B17h<%Xe+U%}t>;bF2-|1mHY_6|K
zx=K~W;htx6t^MSHlQhw6v4x~9{eM_E0@&F{d0$FvfBee0frMJWKg*b3y{ci(PK)<i
z%GM6<>>m^k5BKjB_F0}(K-}KmEmynSaa!+QZ6sP6t`<{E*=OGs@|TO+dQM6v63wV(
zI*CSM5Y1P!e(1GYt+pN-r79W^gXQfMMg3Wy)cw@lGJ1j7$UlAj_^H43-R2cGb(FOf
zzvOv)a9)zZD#f?+!E*P-?w!Pi-uH>Mi@`!Ou|fX)?>~Q?`a=5w^SbFs#mkfD$_7(`
y=hJD&(&ib?ufKnGyp~m0Q&Yz}ee%=b8xQi!CyJ}T4Sn8K5(RC;d5>C+q5lE1@P*d^

diff --git a/apps/shorty/img/scheme/Z.png b/apps/shorty/img/scheme/Z.png
deleted file mode 100644
index 0d00ced9c149e1d641f2f274efb9eb88a753358c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 956
zcmX9+OH3PQ5MG;FCQhTKsT-wjA{lxihenZ*s`StZun{(R*Y-aAtnFPV1~2gg;q`-;
zy>?YF6g4~|g0Ug4>G}Z(LWK~As&R5jDoTW)hoD4h6<Lu`)gG#-r>N>!eEMc*{?Yui
zGvDsG9_u(G`&fn`$Qg}Vg@Zp^v-&!CHhuOU0ZtUeJKB)-rx%YAL@d>7$#$OS=kCsB
z7qj<r_wvhmK@f_iV!2!v3c~X8axRx!Tv~*JSUfg4IhoJr3x&c-!OF_YDqwB3yizWe
zO2uLku1|bBF_s#ePtOBKM@N%iCvQ*P2J#6WI*g@Kz~PbM!J$DukpK=14ury?=s*<6
zg*bn}@AY|s5cJ;ab$7dgCxOH1bkff5o^Hm)m@Q_D)xz9x*&TMAAPADMI~|ZgF%;8b
zR-2VFQfiG_-KjB}j6g_gQLPq3Q4G`Rb(mfUm0A?-LbVW^%q9bFprFuff+n`FY|s{7
zN7FQz!|8x-dV_u;vycH~vkQQl&t|fjDZum;i1wiJ08pt^Ha9n?XQn{}Ksue?xW939
zboBVi<J5R<_c+hT<MCK5Has#iJ3G6(yE`*G6OM$3hK9Dcw?S=CgY9KKtfyQqfe0+i
z!oG~lMKesGF97<}3~ja9PKF$x7zbftUy>q8iXuqzme&iP$?bN-*sy}#ZinGveN3kV
zB_q*D5Woe!KA!={HJzHyu1=*&rEFJuuiN%({|AR-1k&>QS$FN=>grG-Daj=@98UGA
zEkOi1{Xxw{$U^o4B&D1NZI`|fe<C@n`1GzM3aKwx(#$CXKA+pq!4W|M5x>$K2;Ec!
zJ%N61K+)$7^{{@KRo0}utWbLT*&xR<eg*Dk{qFvQOW(W;cV1{zt>lHn8*~MED^9jO
zYRu;wAGuzgn`sfHt9O38vsJBD-%S20x8(RXW7vrK9gbKl6W(srw+N-u&JSB#TWde%
zOZbOPIRiyecEV=*U2ms^Q}TWGokZdFoKYd1mS6SMCI4Of?&%eUuU>xj`0wN6zy1s?
z?jIf=`egF^^Vir{)yqT?&3w)tsJe3e-kXn_d-j%^BQM`dnhVdxl8fiBSa+ho90<E}
z8|Iz;_nZFs@m#$zflP%Zvgn$lPP+PKLVW$_*njIHktng=`mo{q`6VgRFl_p#Vb9rE
N6GzjIsn*-*<o~7mkC^}f

diff --git a/apps/shorty/img/shorty.png b/apps/shorty/img/shorty.png
deleted file mode 100644
index 3fa8a55f9d845b24c3042c4b2ea27c0dcc15c427..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fj000fj0Rjx>ApigX8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10%u7?K~y-6#gk1)RACf`pYOZhosx2lnaqU7pTU&!u8efXzg6Q;
zKj4tLDJZgK5k;E<p^!Eyxycr7qY@dLl>|~MkqQNZ&aJ>u42{50(b0^?d%rf$X0|Rm
zs{`+Q-otx1uh3evo07Yl22{F<MqBsp2ueW2<FRBWIT~$E<1!wP{RI#$E$8<DuYvju
z{tMt1kODe^>lyeb;H)xD^D5}ZU@$1k%1VWlQY<e1U}|dm3NWs<-UM!!mL64wg#}tl
zDd*?Ei<z03de_z0RDS;9ONE66Mngkn1Q-H1aiXF+JA41RMB?)`rBte@sK9gP%;|T)
z2Y^ths&RDmedx=VuWf2;YpXO62)wi`>*9{jyMU9Im$#TqCQk|>n45Ecc68iN0vqvo
ztlPHj2f<+R^U2A{CiVOG)`39aNKe{WR#w)XR4V0NSy>iBNU61Eb#?WSQtGV7V^#s(
zmSt(6XM215g7W!%qO0q%7#Qfswr$zgcHXnRyrMQXHkh8a0Vpp&X5{4L;Pd&M^rFtr
zhns%CU#i^PgUMua{YEs}dO04Cxj=hK3CH{T`lH3gMI};7V`=Hvw}ytu0Pry_;PvL*
z^!xqmqPO?y#PINFh2uCA=_3MRrBq`ia%$8xRo39(n@Y!VhJcYByxuU3=9-%DqzZ>a
zv4w@j(CqA7jn=wS2;nHD%-Y&&GaRmZ<~WXbZEd|~Y;3$qYaIbF3_}KkL9?!|_LWE^
z68nI+Kq%u;9s&0N6L{jfZo3cyAw(J<0h&cROtx)%02gpA%W^Zsux;B5=pBw@S=Ju_
c@!!+<4>h6TMycH}Z2$lO07*qoM6N<$f<zZzX8-^I

diff --git a/apps/shorty/img/shorty.svg b/apps/shorty/img/shorty.svg
deleted file mode 100644
index 79b2ee6901..0000000000
--- a/apps/shorty/img/shorty.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="g4185">
-  <path id="path4189" transform="translate(-0.0314065, 3.97605)" fill="#d3d3d3" d="M5.90496 5.36366e-05L2.03624 0.0483836C0.896812 0.0603836 -0.00985361 2.07369 8.08645e-05 4.5713C0.0100142 7.06891 0.928138 9.07722 2.06757 9.06522L5.93628 9.01689C6.91266 9.00662 7.71351 7.51489 7.91762 5.5184L8.09775 5.5184C8.29805 7.56949 9.13062 9.09502 10.1261 9.08454L13.9948 9.04589C15.1342 9.03389 16.0409 7.01093 16.031 4.51331C16.021 2.0157 15.1029 0.0170616 13.9635 0.0290566L10.0869 0.0677066C9.14538 0.0776066 8.36671 1.46464 8.12907 3.35358L7.90196 3.35358C7.66674 1.41099 6.86557 -0.0100594 5.90496 5.36366e-05ZM4.99651 1.48836C5.86074 1.48036 6.59686 2.24823 6.90737 3.35358L4.47181 3.35358C4.19414 3.35358 3.9706 3.83634 3.9706 4.43599C3.9706 5.03564 4.19414 5.5184 4.47181 5.5184L6.95436 5.5184C6.67695 6.7007 5.92436 7.54932 5.02784 7.55758L2.99951 7.57691C1.86007 7.58743 0.931832 6.24436 0.924186 4.56163C0.916536 2.8789 1.82875 1.50853 2.96818 1.49803L4.99651 1.48843ZM13.055 1.51735C14.1945 1.50686 15.1149 2.84023 15.1225 4.52297C15.1301 6.2057 14.218 7.57607 13.0785 7.58656L11.0502 7.59616C10.1318 7.60466 9.35598 6.73612 9.0845 5.51833L11.4887 5.51833C11.7664 5.51833 11.99 5.03557 11.99 4.43592C11.99 3.83627 11.7664 3.35351 11.4887 3.35351L9.15499 3.35351C9.46901 2.2831 10.1849 1.53477 11.0267 1.52702L13.055 1.51742Z"/>
- </g><g id="g4849">
-  <path id="path4851" transform="translate(-8.08646e-05, 2.9323)" fill="#505053" fill-opacity="0.95294117647" d="M5.90496 5.36369e-05L2.03624 0.0483836C0.896812 0.0603756 -0.00985362 2.07368 8.08646e-05 4.5713C0.0100142 7.06891 0.928138 9.07721 2.06757 9.06522L5.93628 9.01689C6.91266 9.00662 7.71351 7.51488 7.91762 5.51839L8.09775 5.51839C8.29805 7.56948 9.13062 9.09502 10.1261 9.08454L13.9948 9.04589C15.1342 9.03389 16.0409 7.01092 16.031 4.51331C16.0211 2.01569 15.1029 0.0170526 13.9635 0.0290466L10.0869 0.0676976C9.14538 0.0775976 8.36671 1.46464 8.12907 3.35358L7.90196 3.35358C7.66674 1.41098 6.86557 -0.0100594 5.90496 5.36369e-05ZM4.99651 1.48836C5.86074 1.48036 6.59686 2.24823 6.90737 3.35358L4.47181 3.35358C4.19414 3.35358 3.9706 3.83634 3.9706 4.43599C3.9706 5.03564 4.19414 5.5184 4.47181 5.5184L6.95436 5.5184C6.67695 6.7007 5.92436 7.54931 5.02784 7.55758L2.99951 7.5769C1.86007 7.5874 0.931832 6.24436 0.924186 4.56162C0.91654 2.87889 1.82875 1.50853 2.96818 1.49803L4.99651 1.48843ZM13.055 1.51735C14.1945 1.50686 15.1149 2.84024 15.1225 4.52297C15.1301 6.2057 14.218 7.57607 13.0785 7.58657L11.0502 7.59617C10.1318 7.60467 9.35598 6.73612 9.0845 5.51833L11.4887 5.51833C11.7664 5.51833 11.99 5.03558 11.99 4.43592C11.99 3.83627 11.7664 3.35352 11.4887 3.35352L9.15499 3.35352C9.46901 2.28304 10.1849 1.53471 11.0267 1.52695Z"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/status/active.png b/apps/shorty/img/status/active.png
deleted file mode 100644
index 51d013cd058037cb6872362c679b617dd9ccdc48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000yv000zC0dQ>q7ytkPhe<?1R5*>5lRb*^P!xvWahho74svq?
z?jVpr+GGI%8$m3@bqv^~nSDe<z(BCbCSs8;CIr`z9}D6A3Q=@m=F_J<m*+ij&p96?
zi3i%Y#b&cXnx?3#3IHIbgzLJPPNx`+MtFh`1VKPmRk>QN7{@X5JZGNg-0gN;E|(NS
zFbu;-h4+B<dQIE5c{-i=8+BdNvMl<({~Qnm0d3o6-}k@DH@dE)X_}0p=o-*84OLbB
zv-3}?s-h5rUDxqbO8KQI3TCqzUS&KU<8V0Od_LoII2?X?o`=a~@^SzGTrL;v_j?Sg
zs)CgAEg1lGT}N4#7`$!%U?8Q$@pyb&EQ$iUu4CZ3E|Mg9J0M9CIF19fZA&2p>$-k<
zj73pU(=_&de_f<73~5;wyRQ4M+%ydh!(bf8*G0NL_`XlmG+9;EpPdcE;P?0Uz4mlW
zQ4~=K!Np?1FbtVx8M7?ocDv<#KBuN>_s%yy$metJ`yNpgAx%@1WeMOqbH{Puc^(u+
bdHT$M`nmYhAK5#(00000NkvXXu0mjfch=50

diff --git a/apps/shorty/img/status/active.svg b/apps/shorty/img/status/active.svg
deleted file mode 100644
index bb4c0573af..0000000000
--- a/apps/shorty/img/status/active.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="75.4697pt" height="75.4697pt">
-<defs/>
-<g id="layer1">
-  <circle id="shape1" transform="translate(2.87717, 2.87717)" r="35.43313280000pt" cx="35.43313280000pt" cy="35.43313280000pt" fill="none" stroke="#000000" stroke-width="5.75434065000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/status/bad.png b/apps/shorty/img/status/bad.png
deleted file mode 100644
index 11627a21feedfad70dc1133a7af5be7bfc096851..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00FxI00FxJI_%@(00007bV*G`2iyW1
z1q=gchbdP8002U1R9JLFZ*6U5Zgc<u0001QcWy&$Z*^oKb7*gJba^0fY;|X8ZVGdB
zVRUtKFJfV23MfM<AVX+!X>)XGVQwH&Wod3@auBhtz5oCMO-V#SR5;6}lfg@qaTv!x
zKU*(M-FjK5fddH#%Qs>qj1FBo)@5EA<jqmgMdUr~=4nEg{((-B7?Q6Jk}<_w7q{x*
zYpxlrOK;h98jM#=G@E<6yojcD>4D$n%lG$z=Xt)55)uBVd}oPDDIahfxZ+7QpdccR
zQ)Ur4@qq4NFgRk{_UgV@wr#HlgTWD?`;`CK$6jF2G|dUub+;>)CAoN97UFUFVp-z4
z?zU-~6Tl$QdjbITn5H>VtJSvFOC@=gNXToDPaqp0MUc5fLbggJsnu#*9;in|Xz@Df
z42Q#k50=&OEEeN1m!rop2m)O|cO*h<E=M*N<FjRTgu~$g&<Pv?>g95|9teeK6XCL9
z5L;T}AbFqf_wEv2UPdzv0wT19LX^wpI#53vBA`d3(WhT+yZHoU3S=djl;+-^9PaGM
z#|KGyr;ryQ>$csDMx##w{dfy*rBbQxx3xKXUmp$N_pg2AumKl+?6<%H&}ta`Y;Sie
zl}Z(Gk8&U)D5aLO*{pqMXz1$Z_&7JGEJ}}4G<+@eKc8S>WtD3WA2BmCV*|@a0X(+G
zfUfIfKi1ZECnFJ=Hw;<zUyyGhP2SwNF7uIy)T`B9UDwBez^NQ~kb!hMJy~5`Y`*mS
zWfo*kA+vtJY!(X5bUHl=44fGx51;|V`Fy^xQ7p=0DkX1IDcLF(C7;h1fMGy87vMp<
zG))`LWHQr^<E%N3vzEzZrZr6)1-kzBtFx|ADRl|B1@wE84ZIhT?Ni==owHI(d4oRJ
Z^apFDh;`6vWJ>@5002ovPDHLkV1g{UQOf`T

diff --git a/apps/shorty/img/status/good.png b/apps/shorty/img/status/good.png
deleted file mode 100644
index 08ce0a4453a1670c51a38d4a423fd0afa47412d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00FxI00FxJI_%@(00007bV*G`2iyW1
z1q&tm%Q|fU002X2R9JLFZ*6U5Zgc<u0001QcWy&$Z*^oKb7*gJba^0fY;|X8ZVGdB
zVRUtKFK2IWWC|!lDIh~=a%ppPX<=?4Qe|mwWpX&j3snFB0!v9mK~y-)rISxclW`cw
zKd&ik&Q~{7kXTTlf*Z6Fcjy?=$#&}+IP~Iay9gc~L6iqkcCbq@REqbVmgr6f9!fXJ
z+G0#(Ctn=tu=YpEbV)uPS~A;i{@{1{@_j!1p6B;{6cOPvr@oe`C`u#n0O%-7S>T<B
z{H!vI$b}0yR8<{KBodpYQt6~rDxD+}iA_~iM*&BbzoM`g820&mvxP$8K#ObQ4!Xtt
z!Yx`-lR}|z;Pd%rfnlKc0s!dt`~5T7Y<54nlN3+TBRoZzMR<cSjd)&qB>6Qd*=%;-
z@AuCD-6BF=xf9iHx2yU`z1{W1#d2;LtUx2s25N^&>@0?B(uMv-Z@1g+Dxd=AfLtn-
z%G*>Ma#jA0wh?Fn^-N{;)+$T)mk^6!Q*ESDsXUOY1mt6}Sk8IFDV%}!P(!<|(Olom
zihYGvODo=2Uib~p>rRQqVmTmx{*5AXs3^*|<<w&IwDsIv_^?3magdFp4H~XA(Eqxh
z^tCjOqJyTBCL^6rZ;Qxb<qH7f^WpjUz}*4#Jstm?9|SxL9=7gn!4DYf8zLMI$ANfN
z4gj;&Y8}gb%N%u%cM9VOlL(&?=8&%GF4_IQdt|j*#{l!cy1EL`aj{rjn|eOA7<v>E
zbIA<9fcIeDGZX3$$;7jX#bU9zCL+f*lUQzPFcOKZM~$d>-+INn=#}VBR3eecIxq;-
z)l6aqq{U=1jRXP#-7t)dVHlY}AfTH}rV*g!f4@>|8x=)q0PX;NW$6=;5Rua=?`7Bd
Y50#T;_-i<clK=n!07*qoM6N<$f>D58jQ{`u

diff --git a/apps/shorty/img/status/neutral.png b/apps/shorty/img/status/neutral.png
deleted file mode 100644
index 5b2ad589cb9827c888e2a9b21c02fe3336eefa3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00FxI00FxJI_%@(00007bV*G`2iyW1
z1q(8H7{96j002g5R9JLFZ*6U5Zgc<u0001QcWy&$Z*^oKb7*gJba^0fY;|X8ZVGdB
zVRUtKFK%UZbaG*A3MfM<AVX+!X>)XGVQwH&Wod3@aud`nu>b%9DM>^@R5;6}lfO?B
zVHn3hFXBllR|*K#(1f8nC<E~l;$Y(H1~Z!^j)dIMjj8@AHE2prh**L@660VgCgvJQ
z87|S}2v$#Gk2|DBf%b9mg2jT1Px3C`=lgz==a&)@{wF$56O~e(z%AfXD7ipUM2_0b
zB68vZ!?9Rw*0QY4A7NOQwHb@WW`W^0f6K=dFlCx%*7yCuwR5tX9hbES<MPGMiSPS?
zX_{GJ3P_y*03)VpW?k3asej#&^5TTNe~1Lj$o>kll|$B_Ovv}zhPbY~6M{xWgpRP1
zp=2_t|NN92{P1*)%Pf)TgFBfU+@3Q?3_wyXv9&zL!ROpyGMUtYA>bI`RVo#)tGk~*
zUFg!_+=V}V>d+w)<#(>TpGu|T0bVPhRw|WhJr_r%(F6hL22?l|9i$T)4d@vdl~Sox
z18S`R-?r^))r&eE(Q62x&cjh7%tk;2h+gNT*W=i>T?PDOK-kD~KL6P2P2EKVqzP+}
z%Dh{&Ktb~W^wd4_`Md>`j~B3IjCwpCzyED_yY9cbBEd_<FbpvaL+V9j@AXyL532Qe
zJboY0+x8%YOs3Q6`GeY<=I%;Ff@jFyb0l~XkwdT8OsCWHz~rfm6aqA0rcfvp54}~X
zuTM*TeOeB^RVfq-MPLTd&IE*zgr;e8nM`KEahz?(akev=%z~zAb3o#6zdG$2l~TRH
tO~42x3wSFcL7Vqq=d6@cVWZD9{Q_#?dao1uaLfPz002ovPDHLkV1m~>QhNXZ

diff --git a/apps/shorty/img/status/strike.png b/apps/shorty/img/status/strike.png
deleted file mode 100644
index d9a867fa004f79adc6ab14499fbc5a7ddba700b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J
zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwIg<D)#r@`pT8K97BW=KSdbAE1a
zYF-JD%fOIdp68sCUz(y&oRMEtQmIgoQ<|Qc$5mXCSW;T7UtCg@nVrg|;jF3PoKcin
zT#}iXrx28ynU`ABqC5LMQ2!)P7sn8b({HD2<Z3n$arO7oT-ZIk*uCAa_WvXGC&JcG
z#V_p)exbjmqocXdQ*lLtZr{$+r>l3$REP_SIwkna-iVZ((OCZ?W9{08^f#+T|EpWh
zXRu|idLO-jLF&OChRozz#=XUU%pE5fVwR<)_Wb<%*0$mHt5Zrr%;gK1y&lNEZ&P`k
muM=x@om((A^q-7T!EU$EUy62`^7Fbt-t%<zb6Mw<&;$VPsCxGR

diff --git a/apps/shorty/img/usage/64/arrow.png b/apps/shorty/img/usage/64/arrow.png
deleted file mode 100644
index ac35f78ad1c8cd050f9ffc5da585351898286f0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3309
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

diff --git a/apps/shorty/img/usage/64/clipboard.png b/apps/shorty/img/usage/64/clipboard.png
deleted file mode 100644
index 701bb6a7796d1b85a5d94866ad8458a01a0ce3d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3402
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

diff --git a/apps/shorty/img/usage/64/email.png b/apps/shorty/img/usage/64/email.png
deleted file mode 100644
index cfa1f7678215206522db0fa434a7b869d1abd556..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4302
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

diff --git a/apps/shorty/img/usage/64/globe.png b/apps/shorty/img/usage/64/globe.png
deleted file mode 100644
index 2d41da4819afbd5f848529168df0a3ee6fbcb023..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5242
zcmV-=6ou=FP)<h;3K|Lk000e1NJLTq002M$002P<1^@s6VKt(A00004b3#c}2nYxW
zd<bNS00009a7bBm000yv000zC0dQ>q7ytki97#k$RCt`toO^s!)wRdJ`^;p9kc5zs
z00~J5gaj~zfI*8UD5xNy5e21SwLY-Qg`!|v^s2oAN?WZDZoL(11+i!q!T4!?1_d7o
z1QY`Z!SF~R5FQiqBCp9z&e`{mGjlR0Gm}h2uXpiT`OG<I?e+NWeb!!k&mM%7k{^?V
z5O&}aAQKn{WB_qMl!q0d6{rQy0_DI#U=Q%Ml+yX5`uAf1AcRN)W&x9cJRscnx!rCj
z%x1$DW<vsQmkXEMg{!r-qbe7$9e5wuAf-J1gZuhJ0U(610yBU)z%_sX=+h^Tq~sL(
z_UlhfOf0=)VzF8+0d=_DZtCi4sjaEu?AbG%JW)YyO|`Gcr@$(pKuX#6gZO=+00<$%
zfZKpafFS^J@$n2Bp2^^}bb9ve2|$-tWZ;XYrbfz+9HI2P5~{1ud2b&BmIJR!Dcu+3
z|Ahb`gcuL3M1Qv#oHm5)(PM~<kJkk*5ZsQf&s90t^UZFKl^^xqItbh^rTpak+W1}o
z2q9vC6~He6QU<0n=900*#Kv~nRtCH3h8s22)qMR`5hqVncyGN5ER<5#g|0=XZUZ2M
z7z1noQhWA{VC?023`|Wmp8v2pwOv^ty~oPS*j2QRmX;QP<G|0Qlsmg)p<4h5A?5%t
z0=DFof#i-GkIiNap{2i#9|kB%Yildpwti0K$rGT@8uv*l*M_PgBmjgE0{Bm0xe$U;
zqjSj28X3r+Kp#V(E~G=yyMNyvzTLM6PdxtxJSjs6u1f$s!9NB3PEiyt%e{h>fvH`4
z+7)#RtkCoxKUPN3_HAAe{scVI6$qgK@G$U4i^W3jxGPCW9MCO4eQ#N<7UJXMiH?pY
zJUkplQE<6joIih_`uck6>Vo93F7*0dovJ*^j%{1fG!5V}DdqCu4tD{75aJGCtq_9C
za>p@XKys(XJCem>VfgUjWMyTMk&!|F{{2xD1)<kSe$?31NJT{j2M->kxVV_JXU}%#
zdr%ino~&T!j&0t{+ohDR1#21<03pQ1zz)EcJvxW9A?aNj_EJnt4A)$94VPbjIgwG3
zUHb21)1>#<v14rByqR6QcG1?>7SLcY_>UYeW&ggtpszD>rIfn^+6)AM5F!fr1{g9h
zbugnZ&IxFwW6Ow$2yVFH1}03HfYoYk56Dlr^VhE9Q-{MrK|ujKcLtc@I??;h?ytPH
zLK!ehO4-n{c`yLh0Cz=3MRCRWtFc%D*Y551Bsn=b+;PVpL`O#l6g_qNG=~lyqO!7*
zs;VlQnwrow4V%qIzkdD5%E}@$GZVYr9(0b}zkffgSFfg~rY5*6KGfFM#@5fb(A?An
z@RF4BzAga}LgWHp3L(fHcO}u$y#ojDA&bSr>|1YT(xgd#&+6;z*|KE|+qZ4w%$YOB
z{fLMNMvorN$dMySPfsT<F3#6}r$IG0H}k>^f8pD2zYS?}sH>}`X#1Dmnc)g4<yKR?
zz5sYubYBD6DXD|FC^M^rI`iCRv)Nd*Xb~evnrniFh6V}>3fQt`i|5_dX~>WvOqn{B
zF=NJHwORv**hNr62sBM&&6+iA-n==WjO?J~!2W$yo;U&e9>W+ZrRsfV?a=mCAUiC~
zMp{}rnyM0vY&IJYJ@gR6hYvRy-oAZ1Yu2oxv7ynppOlou?YG}fc6N4qAU=Q15t>5*
zaJk*o*Vhvl7l)J*Ap~>g%mHB2rcFV8^io<{24_#7rmd}Q6#72J>)vMu073`_co-mc
z&>$=p1x-@}<`^La3l=P3*sx*7BX6%178V-!tX3;G-+VLErcLwfafw9JG|J1%IaGRx
zQ>RXmot@2?F=GrHUNmfBHnwluPEt}5IXUeKdCr`>^&wtV)X_!Lg~ehaIVF|yvLgV$
z7ec%trPNFS0MmfsR;!i%2?J17EhwV1XV2o2OU4*h+-^6|Jo5}+fBm%~6B855;>C-}
z$jI<%sRwlQ=utLp+QiPCJ2`*;JOHCcjpDAm?xZ~hNTas_rc9a4qD70StE=PctFQKe
zq_AMY{Zv+-;@Gic0X%JoBQY_NisR*|syY<79{6`h0PX`wNF0Eo2sF(+{Jp6nGc%Lv
z(`OjhQc9kA=2>>`+-1lP9GJr6k3UXKObi~N0exOyyLK&m_wF_6O-M-K!3Q5iQ7neu
z!ootTtE;*7)>{EdSXdah+;R&mR;<8g3nMQt4*;7jjD-sy;K2tUH07I)6NykP^y{C<
zsmc=obG-m4I+7v*m<Z6fUw>3p^RQ~Lrl}~3VBWm{@br=dB>(uwtL)gZ9Zl0^l9Q8o
z@`)#jjfwSCd;+(-jWugtVd26>eDh7QNw3vv;o*lLA|j%vp>xlkVpgqM$=h#l<jk4V
z2q6$caK*SQh>wfs`RAVJ@Zlri(Vvo%!i*U+{QT|6ef#zG;xSnWk!S#bo*0zK$SCY~
zyH6vnomGwNrd~&4;sC?&o;`cmxN)OlG$tm7rAwC*85N22{Hv}$$Ku7mqoCkz+S=TH
zdgtCZm(+o&23VDqr})Dk{(#Hn!s&GK+H0>NrRQ}}1e2#s#@XuRsi*#g%hieydcK%3
zV+Or@_cr<KWv_pBdk^mxoj~8eGyu2`Ahu5*6N<iUv09iuW4gzn&Z}0f@}R9@Q7k<A
z$fHKj3j~#wl`LGikng_xE}+ib+*~G3n&`!o)>bD^Jh6<1h6W>$&p!Q(n(7)u=Y;VS
zKuRi4p5(Q4>kM#gHXAc%&TQAOwX-kav3-o1<9Yzavu~dZ(5qK;Km;{aWy1LJ#Psg1
zzg!-kJ9jR2yB$?kx$XAb$QYVo1XFdcip7f;<8V0qMv|s#ME8p3*YoF_^u6$xzffLQ
zW&+9OcJayPPYk`WePT(^$UxOJ-YzJhs;WwVMSw{YClcPH2b!t|WK~s(jEwREaHSB!
zt^k(;J*-wMHcv1e5mYseYbQ^})cry*dh}?Xd+s?d88e0%)2ADOxLR9z?9oSYoIPt8
z?x^?v2kxg=bhM#s^Oh}qR9J{=0!w#%>la^`fEtyZji#!!I-P8I>n)Ia>0|HFgYgq4
zplVtG)?aIT54*Rtw*xr}kOL4A5ot~uKFIZnjb+%-p(ZE1Jb2I`o?N~h#bWWKF!<X`
zFLCJbVZ(Swy?MF0Tz=VQNKHd(8dVMlE1rMezsEf7OAa2SxuwO>KXlkIBd8BP{D4+h
ztKrYMyu2VIKp%Nhll1Hv;T;7z3i?-7dh+v496sn>oRb4W7>TXmodTL$nvH9(aRHQm
z_Z@F<+!)ZfrfS&ic7DBJfoUW?_4HHJpReyQ>e}14x!oK&eAxRIkUDUnp||0D1G{$a
zGIWj1&elh=2cSS~v)jD@j8K4~0AV&;yHE%8vPO*X7#B!Q^77wbX8yeSoU1ygrzX!d
zC6PF)99XQDz{XXT+i$y#__#PDn2$GYqG(4^hn(YK&#RznDitRx48Y_2#-qvh?7m~i
z4ntp<)k^x1A%4L7<}+JZm=}P-3XlR|wTAf^ZXdF$rjj-!%`kqv;y876b(EHt^4s73
z)?93$&(*K2d4-`FL;Z~R?HkX`nYVyPS3_e1EB<?h37|l%sT$Sis*RZ-%o;`ydk+Jk
z0|)jSHH1Wxo{{bcd^>ActOfwd3i>y+2q8>DUe;8Nqyb5W@$#~A1DuO48g3Z&<&=Rb
z{OzT`@vD1(g~ehq^v;=c4>p_K1C?OS>NQlKs}2Z!M{aF(8Z!YxUuSsr9z9y-sr+=k
z{rmOrFp|u=l=cNz9|iF2S;>HgtyT+>kr9UBGiT2j;EWx6nc<P!-9}SWvwkflR*QwZ
z?!1%NUw@69oQp|LPGaiRDF#TDl_y!h{>=_Or3Gan6eDR$O~dVW89q9lE!5T38oJ}-
z<2u#rQziFQfS#b|u|S6H_8w@OGz>R3G#G}nvqu_6zx{R}vuDp@@7_Izb}1n_IfcLe
z^+i^$Tm=YEzLdQ9;)^()PII#CWCTP<_cC$~Kz;prlb;O@jYd(VC-mTYefB`Y6rc@2
z1~Dw9W|W)yW`smlHTv|4BRV?TFuHf|UMeaoxa+RFc=p+6aXOu*vLQY`&iH)n*fBo*
z@IzC9WCq?p5A^HT&j7Zzw$?NP+Wl+?D45=s=4Ps@99~s!1!x9nYf}RnZ)|Me*Z>F*
z?}4VNBqa?n3<@DQa^wh_rqSkZ<JGmVa?_1Bv32WK10XL0^zYxF`|rP>n3$L#ix<t0
zGtx7RG;^%H+*IAEs!Dix`xy+U)9I(z>1?6O;lSZIORLj3bkd{%)c|d3TR`K@&CRql
zw;0Cb<Koaf3m;!Pb?TI<(yKU8!Q8oXdGygoO+e`&hI8kgcT)J#M=V>qlwm`M`UT|6
z@$vB_BqkVnX#ar&K1G&>qA0}rd^26;a2WbpnwvORRmHg~hn`5yRILCf0cvY%Xl!V}
z?RNV)aN^_%!+7eTL8zK$LL4OZ^>uy~q^7Dwcn(MeBAeaLP1C2dVdF;LT)&=MX3ius
zGSa65^xhjk{z~5ofUkD#GTBHPFu=3pq*G;OB@K-YR8={st*yo7@;iFtr4tJJo;hx}
zi}UB}sdAj9wx*iqrbd1Fs;V3+Ej6mWjP!K9knkyorSy4)I@I7d-*O95YDlT!bhhx!
zGk?b6IO|tZXN?%alE)us+m~Om^2Haq>BbxB)hilR)wurpd^9Q1q{P|U%GNKxG*x<8
zBeMXBK!VgLD%wF)V<V~>d{5IuWme$Zj(1%y7cQ3z8XB-#trQg%aee;vNC_6Jl}ms2
zGn$&4kVs=C79QTiZxb~$Gn1h{TVn6O{{bsku447-HB6f}jl1u@oAmT_e7CN`Y++2e
zY626knt-Nhl$4Y(B6EcC{IgF#rNOg}rfC{&ZEh~T^ipF%q-h$(#l>9(?xp<-5b!G_
zFSWI`QCRqqr`Feb;x$)u=JXj9A$)Q}yx;08|Au^1@$%MN>y3o8{>?YJcG4tnojsfP
z-hB_Z%dKyU_|#O2P#BRp!l*(elFZDDcyjrZ%$oIcMvopvLP7$QCQdZ`-MxD^wY9aO
z0`RpJ_zG|XVZo%19z9A)NeLHSbP)jg`T49`waRxsB_$=9R%Z)BC@6}~Q>RQdI=8a2
zlAT3GMjLO-ZQHl8ZTmKQ_3FixDN~p>Z5o%29gD@{eWxWzjLp)dq$Fm~ngz3F1@!g3
z_udON_!i(BMM~KWeA$)sKmYkp<8yd;IM-f#t!auJHEI-2r<0bJW}2EB88Re|#KZ)=
z-TBTt@6goLM00a9&CM;eG&dXE+|<PBQ>R(8dNnuX=aZ3<!Q#cgGhp)lim@|txm>*Y
z=9{4c@R^j-<=ql{w=3z_Uw_>c@cjAnIextT++uESuKvBAhbB*+Y-<1RyZ`o?S=u^m
zU}~O3sRvwFSI4+<<4o;$?b^lq_3J4uEe)F7{`IeaQB_sdRVZH4hl<B&GN2J?W#hw-
zJo1RFsi`rzy1LqQecg4}8M2!<Z#M3imX=CIQ99M_%gdH6GwCfWE0c+diN<rg-7c@X
z>MH4QI1Cww!y(hs(n7VN0{x}8F86>?*j2;G$Vhqc;6amfzPw?>1_{XCy?e`Z=gt}T
zSFT(cl4C*$xn#)_KahQa1*D=Va>IrVCb_4demZ1;fp?9#eE_&Il*ak_`9T4wuCA6@
zSy^)G)TyTXvu4feQg1{=gnZ?dSNwD?TC~VdcKPz<CYil^_sYn~$nF3zH4p$6;7}+E
zUU=b!pdb_!6!;C{<mBW|_2uQ|$=$nm`{`P`bg7^0!w)}fl5sd3GA}Q$JHhV<6h8nw
zAlx2`61&|lKmPdRpdgf&mm8lC95@hE&&ZJ@<+^q20*<8L{N^_%*|4xM`RudL`pMpV
z@4ej#UIH^sF?RsKg8m(Pmx|)z;$%@#QBV-Pyl&k(Q@iBkWO>g$_sGJ+!hrI}j~|!$
z`T3?cX=!P4)22;+vP+gM>2C15e0yI?8SsS26~O0&K=JYM6ciMYnVA_>rntD6J$v>r
zV88%Ij2J;;Vq#F)&6_u~Xwf20o;(RaR8$o6=g;SX2Ocm@u>dPptYF!)Wuds~B?(+E
zr7SYv?XX_=0P=T2L^UcZO1|;N8(ofs&UowAt#b0@$%f91j10MC$r4#sR^}&r=FA!S
zi(mYryFD*~{|OXpXQ#yW0)s+<RtUkodGmPevB&&+sxvAsE@u7u_3YojpFx8Lk)55*
zl~-QrSs?jSNl6Lw=FMZ@zI`Fv@X#UPVku>lpYNTV6C49<1420s4Zz^RgL&eKCzvv2
zN_QRXl<Mp2S+QaTD_5@6SE=2j7GSKDG9YSQofQ2g`dR#LQBF<{3l=P3>eQ*Gjf(El
z>C>lKyLK%vzx;A{R(Kuh=TgeIf;|l7tnlxFZe<%U#mC2!pP$d9Ns|~mb}YSm_3Bh!
zN=aE+8J~atIUjuR0bhLah3VAC_n^g6%0G7|5bA01KLQV3h$o7okeZrGT3Q+j2?<0+
zMIog`RaL60syKc6G$kb^)YsQvh#6mcLQ45xT}lPYi~(i^0X#<cGw)Bui$jUauMi3W
zh&#{^AOF+=2ICfBcDG{cj<5%WOVNMb`BMkmkq@I!b=`}nyA3=bL<6t<KM2~(F9A{C
zE0*um$Onk4&{tPKRp5Kj4?uta7%rr-2Lvl{Cvf!tFz`d@zgD$eu>TjTzy}Bm`q{fr
zex#r^;3M>nn+p!y%RlC?$7i6Q#mfVFd{0#^=quCr(SI;~>WA^LoqiMmOa}CGh@*jQ
zU^w~$t1l3X4vYkxnE(HP67<DbvAn<^M|Va43;N;Y?jqb1hyVZp07*qoM6N<$f@&Nu
A+W-In

diff --git a/apps/shorty/img/usage/64/home.png b/apps/shorty/img/usage/64/home.png
deleted file mode 100644
index 8cff03b28c6e01f21988214a005b625042816e88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4009
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
P00000NkvXXu0mjf78#JT

diff --git a/apps/shorty/img/usage/64/info.png b/apps/shorty/img/usage/64/info.png
deleted file mode 100644
index 2069088f64a0dac45185a825b4e4bf89f7a7274b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2817
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
TVr4r|00000NkvXXu0mjfH-<yF

diff --git a/apps/shorty/img/usage/64/locked.png b/apps/shorty/img/usage/64/locked.png
deleted file mode 100644
index 841d2d4483f5b40efa0fde456273613d6f7f7f9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3091
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

diff --git a/apps/shorty/img/usage/64/network.png b/apps/shorty/img/usage/64/network.png
deleted file mode 100644
index fac47ac7b75c54d12b303dc2d028028173092b56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3451
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

diff --git a/apps/shorty/img/usage/64/qrcode.png b/apps/shorty/img/usage/64/qrcode.png
deleted file mode 100644
index 207741888d309535d87ce477499f8094afd20333..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6373
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

diff --git a/apps/shorty/img/usage/64/sms.png b/apps/shorty/img/usage/64/sms.png
deleted file mode 100644
index 5dcd2c122318024cbb2990f300c3fe98b122f96b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3700
zcmV-)4vX=LP)<h;3K|Lk000e1NJLTq002M$002P<1^@s6VKt(A00004b3#c}2nYxW
zd<bNS00009a7bBm000yv000zC0dQ>q7ytkc7D+@wRCt`toO^IoRi4K`r{4)lfB;E&
z1`}c#1B5I=UTYYcLfo3sa&VCWgsEM^uB=FvD-{REQR9xaqYhgtx&yjCD2J`x9VlyN
zU29!3>>%P~!$SlLdBgxFAq4Uwm`6YEJ^RP)+kJ2M?N`!>zph_Z`kr%skMHky&-tBm
zZ%0TextSz{$N(yVSwJap8;}o-23)~zKA;=80$c=61IK|QQp&-bYTwNOKnQUgupIaS
zFduLl+ud$APL~Up(}e{5J|8~651-c?DasFg2K*QBA5zLoX}2|900<$Rz(c?Wph~|!
zX3SV7O`bwtegUIL=Q3(^E)Iv?Qik8}r>Ccz?yfG{+po~l{59QOoyIPI1a<&>rIdlR
z*gaeTgb*&^uYj$<6o9eg#&Jh!8AZh<WM*apkWh=X{?ga?4NZ-WoIP`z&dv_~@+IH}
z;5{j&e^~Yp2LK_&eZZ^0?Epo^(<rZ~WbC+cT8CkR8#%h;+EtDpJIciiU+I_50Gp(g
z`-ZAxNB{^Sa)Ir@Du5}4Q>mOYkI}ig3CGG<-%>E6tFx0MhwEu+{#w8EJ{k}`$xG2F
zWdMW_3xR(FCS_)hVBUg1r*P`jP<wjk)UYrsxfd@q(NKSgfq?;luYna(%KB6^qy&Hv
zVm<KBfMfEMLKfcrJzOqVqG4EtH$6Z}yk0Md4j!Pjr5UtU<8P&u?<OlDDFB2J0(c&H
zS_r|cirJLSm}zB?)t^aFg5F8UJ$2$ZCr=zF=+AS&^D+tN5&{r({v}|u&1Pf%!YZZ|
zPEBlSB1#FY<m6tu*hKwjhjb8L1hymsAsGN_foJS?I}7h##P|slQ?fJWq?Zb%Aop@>
z3x7Iv5LHzHelDf_MLf}Q0T4p`HSo3&g82*YX5z%jag`@cF^0%A0o2m+HUIagL;BaX
zQp)#Z4UGwa5MnNH5O9`P%%*r+NkYZewxtgs%gHoG&&Km-Id$R-057mmN_o_(pCtf7
zh>^e-Kw;t3A}aoDc4~Ge>>Ph&y5t@^dRVU&nt)kS${Ufx9Wlhd0u*LtXHzy~CW>}H
z#ZjKFX-w~&de&HtD4S7ES63(feSJm1HsEg}`$T1c5aRnloe+YBcQ0b($WcR5ZtgI&
zdpq_hnWSRq>FK8avrqMvVUd*b6Jxt61B4I`wA!A@g;UAO&WVV=rm?WFki2nuXe(rD
zlyCw~;8dheDJ2~p9W*sH8AODIWas2CVbUa8o0|b%6GF_EQYw0T<SnoUD04bp6c?AE
zDvGJm<MHss6HicHUT$feX~Ij<5o?msqGHHBefl)pwr%5^Z@!6YD=xmB_O><xfj~L1
z68MeYW-}OM2c8C)dfRQ-?KV_ZK{4<nk37Q6nKO}6hS=nk@guC55KH4nMzbz4LTXHT
zWo36#UA@j^ucBydx7(RKWvXuGGeKX?000jHMGl99g7Fhk6ct5LQG+a1NmW%<lwvI;
z(QE~f?oe!}63dMx4+L}P&co?&hHO?<CBzdZOu%lp1C#*wTLG{EVElxM*lfZySXDI?
zola-aF%qy52sHs4BOhB{m}ASb*#w!H8CvElN+^hmq9SZ|@(U)Id<_90geU~Q50IB%
zU>F!qBPrE5QIV$T8KWB+C5?@gggiY%V#*DZs%mye22fQM^78ZaZcBs^lZ+YgmjGE=
z*|^<q!yq-xiW*n3DN2Tq*^vl`VmcKW^+a;R@{IQCtOwEU_UK1+0`2@V1i<|Oxnstd
zqHbbUiL2P^6Vnmn{9y1qS-IL2q1_*mGL81?Yz$=Xn6Y}yehA<YLW}?w0_5b3)OS%)
zYmZdbuwu+zT3T9o{q@&5d-g1&MvY?0k|nHMxe}YrMoUWzH8nLn`|PvS*Vps$e}7C~
zULG|yHFR`b<Bd1opufML<;$1zzyl8e;Pv@<>#esqaNqy{6%`e%U%#Gl`dOnP`$B&O
z?NSvbYWX(Wo0XNVf2|TiWH^91fWzT%;BvcBVhmPPRiB<s%Kd&nKYi*cIyyQiFE8i9
zg$um<&N~QT)v8sTJ#&Wk_I6%);RRY-TLEal+Rk&e&(YS_Mt^@l0IzM|&h!~GC@L!A
z?YH0NgAYESxTpvzC4Z=^<I=^8?A*E2(l%o-R4HSW?phDG$Bo@?M^O|PP-z2Z1B@7v
zWu7#YXttW7&wTkMm)qL-(XwT{_|i+fwtYKJmy4svjv<2vsj5O-+hu<BtC#twZQD>4
zh4bgmF=P64{&n|mO7FM>B@p2F=buB+;qe6p?AW=Joo~L$tcnWGo;yeHjT@1RZRn%h
zV`aC-;pIFtbA*n{YzHs{w5K(yqDJ6l&H$^etv}#LRTMryc8vBbR~TPVz>B~9B_59_
zbjzrU%AGUrq+(VD5*U${MQ?8}Yu2tMFF&8kIhC9^d4itnJxC<}fS>E_*E!tKz+HFU
z#m}~G<@oXA<YZ?@Xb)$k6k$8V8DL#Dy4-Hi_Jz}JKoNk`<uX-JRw!CcN7Kuulb@f@
z>C>lK{_t`h-}E?L-CdO2UV=oTN)<&_$S=qbne4FJQ5A)P{Cou9a=Jnh5(pOGvzWnw
zL7sf_Nmi^_!S8<mJLWH#Z>}CAoYUu0sj5*?H?xAv8G2GzYy&0%IAT;##@W<LvCHM+
zl~-P2-n@CJiptR=N7=e%D?5I@Lz}N9sEUfy;l!A{imKpnIy8BL&}<E`apOi-uU?JE
z<Dt2^nKyU7$@=Q`_`JTTRVEziu-qs%t!OHCM+ksPHXs+YrN`JQvJ}>%qbW95dOn|*
zmtTH~y?ghtX3Zl=B=7&`efs+QLQ9k8oE9e~LY`E$+e9z6u3TxOx_TWSe)yj}^UTi~
zGbWew=g(31hdS$8%CMGNMm?e+vW3TwwE-h^6s@W!V<v=^hZTPE$w5}E_%TgQ7bqwg
z&xQ?u$Mmu?{5~HydV7&lGr(9$>N1Vfn3e$&zdyjrm8*F7-S=?2J=}NSU$A!VPf!$<
zp6+g>s%mT~fsFyN%3NbW6-71XaHfsmmRL%nI+`;<iBb-dj0_KffS=mh=lJTYMoygg
zg2u*1va_=pH!d$ES5?Ecez?327Bj*779<Xb9jDX5u3hi(>8A&|e7Tha2mXkvDomR;
zEmR;GgJ9e<gi2u}M+DQbNpm{To~AgZs-R*$Yia;Vgb=2~9VsQ1m6a@5uz-UH5Ax7M
z4~5#cY}ta{ZVPQrMvTY|l@S>k83-Y?l|l$IGc!>XHMl$pHf`EOZEY<ZH*O5cn>%+d
zbLPwmC%xryLbwzT+i3CvpV!Ov-s}1WzXRw8Mg{^3Hao;xI`jg`tXPZ2tFOMwzJ2>R
zdGaJ~mz%1pD$2{tky0{${(RQ0TgS3x%R(S--n^NsSFhp>&c;iZE~T}#mHY4iAws}|
z4?ajqNeTP+?`LpukkZmpmfpJ*o3I7Vi>^lX0~S5IBFPuLCB0tL3nzU7_zEb>%P+v;
zh;c?LAu}_RhK7c)${`$wMa#7Sdzf<Xx#u3*uUrXz_j(8E>+8qoi+cM6pwR)e07czh
zU1Vfr;P!a1*=$igLz7_i6pSfrLih-)Rx>4ZHat>T>W%KHsw#m%fPujQ1_uUWmi9qv
zcA%Y^SNZ)u{C*$wUdQEf;dZ-mx!qdY0ZJec^K{qhs`)f1x<?|1B1c(2U@-tBG>O-H
zy6NofusDsfq$US&D)Oq&=fmgo!HpX@91fgL7yf`Bug_<A94<|YqbxR&uy820Bj!=@
z<qDzgH;|HmqR`QiwDSO`Y`~FtJpzFM0|Wi^ba%6N&u<Y(Y{63>n|8VxVylgc^?pC{
zjL1;kSsV~W9)w6!AtpmWee}^sq1|PYbVQ&PLOsNON))1;oE&!T+Qp(pi!9qCm&s@{
zG{(9A1;)Egs~-|g7Yz*!tX{pE&d$#G9mC`WMv36k^uNIOk{wx5Q9*HWvE^hLN#T?h
z1}F4#S|j~H^xk`yux#0~gfjQ+*+X4j9iUBmmo8o6$dMzdq&~p^NGX@<gZ`d)C!XID
zdpsUlUtce~y1L@>qmMqC4t<YHDMM$1za`F8^KH@K;2_o2)!GCchY~Dp$&dv0Lhw*j
zO4$t54OeP9=+voG)YjI<?UM!oK9*8m2J?fFUk_Jmx@gCa9qiw~KW2L%FzmNvL%tdT
z_&v}#T*>JmDJ2^=Y~b3pYnJW9%z!h%hx(Tg0KrGb|1ccM>7;AduJPDok6F&_!vx@Y
zsqN(fa|QtH22Kn|dOE4DuFmo(d>8;61ODB3!301s3pNc^`pux)+FDMYJZZW%3;-TC
zMjxUx04e1G;9rKSA>HKlda16i*53yPhCB)GkWzjYc`;Tg_aty(C|Yg?oj-q`nwpx>
z_aOjq9@uQvU<rVfvKM$5?YBJN3EI7TH+%N%0a6BF5O`Qh*=O0B;OXrez5^w)&RJPm
z^6=rqa`EEDsf_z^Tp!~#20?iGRy%Iw($Z2nYu2n}`#+V?za#(<z(3w<$A`ebNaR~m
z02n~{*>}LHWcjDb_?0vO1|Zg=9VFap2V?O7usS85Qt2E7VGi0s>aBJ*k{f~9Df^S^
zfFKAXfp@+GPV4*@kUb<{hBC+i#A38l<y+<W7icd)58a313=V?e0Dclo!Eej)b7(b+
zec1L7SAYQsJKDQ<`+)dwRSu0+;A7xN>2O@<oAvAQiD)lh{s8TV)b1gQ8UzlY{d#<_
z3?5^plWqzCCI#A$t1EzV;7-E-KVU5233eL*I??`rzy;t-wEO#WDdkPwkNiJ%_(NrL
S(n}lw0000<MNUMnLSTZ;ujB^+

diff --git a/apps/shorty/img/usage/64/team.png b/apps/shorty/img/usage/64/team.png
deleted file mode 100644
index e6ea3375807f0678b5bb25916742a7c6fdde9f9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3539
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
N002ovPDHLkV1oZluK54}

diff --git a/apps/shorty/img/usage/64/unlocked.png b/apps/shorty/img/usage/64/unlocked.png
deleted file mode 100644
index 54501bbd11f17ae76f1ec980abc9673fa1feeda9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3115
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
FV1hpizit2k

diff --git a/apps/shorty/img/usage/64/workstation.png b/apps/shorty/img/usage/64/workstation.png
deleted file mode 100644
index 909098c9d8d25184321e5ecaedf30b00e0227237..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3218
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
Eg1MJ9<p2Nx

diff --git a/apps/shorty/img/usage/_.svg b/apps/shorty/img/usage/_.svg
deleted file mode 100644
index e0ef15d83c..0000000000
--- a/apps/shorty/img/usage/_.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5381" transform="translate(-5.94477e-06, 2.56921e-06)" fill="none">
-   <path id="path4167" transform="matrix(0.758527 0 0 0.768105 -8.17197e-15 -3.02746e-16)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4169" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="text4182" transform="translate(66.8213, 30.5499)" fill="none"/>
-   <path id="path4171" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/arrow.svg b/apps/shorty/img/usage/arrow.svg
deleted file mode 100644
index 94b2bf96ab..0000000000
--- a/apps/shorty/img/usage/arrow.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5327" transform="translate(5.00882e-07, -1.00277e-06)" fill="none">
-   <path id="path4155" transform="matrix(0.758527 0 0 0.768105 -6.61744e-23 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4157" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="g4149" transform="translate(32.6557, 32.5571)" fill="none">
-    <path id="path4138" transform="matrix(-0.168373 -0.438415 0.36134 -0.202146 27.838 126.426)" fill="#eeeeee" d="M160.243 0.00621995C156.111 0.109866 152.106 1.44866 148.743 3.84997L8.68012 103.631C2.66423 107.918 -0.608526 115.089 0.0939771 122.442C0.79648 129.796 5.36759 136.217 12.0864 139.287L168.524 210.694C175.246 213.766 183.097 213.018 189.118 208.731C195.139 204.444 198.415 197.27 197.711 189.912L181.336 18.725C180.308 7.91607 171.097 -0.257837 160.243 0.00621995Z"/>
-    <rect id="rect4143" transform="matrix(0.624447 0 0 0.610576 81.3708 26.8172)" fill="#eeeeee" width="16.29353760000pt" height="62.66744960000pt" rx="8.14676880000pt" ry="15.60399600000pt"/>
-   </g>
-   <path id="path4159" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/clipboard.svg b/apps/shorty/img/usage/clipboard.svg
deleted file mode 100644
index a470bdaae4..0000000000
--- a/apps/shorty/img/usage/clipboard.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5381" transform="translate(-5.94477e-06, 2.56921e-06)" fill="none">
-   <path id="path4167" transform="matrix(0.758527 0 0 0.768105 -8.17197e-15 -3.02746e-16)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4169" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="text4182" transform="translate(66.8213, 30.5499)" fill="none"/>
-   <path id="path4171" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
-  <g id="g4549" transform="translate(42.322, 7.02379)" fill="none">
-   <g id="g4542" transform="translate(-3.5, 49.2276)" fill="none">
-    <rect id="rect812" transform="translate(3.5, 3.5)" fill="none" stroke="#ffffff" stroke-width="7.00000000000" stroke-linecap="butt" stroke-linejoin="round" width="52.59049680000pt" height="52.21751680000pt" rx="2.07274704000pt" ry="2.07274704000pt"/>
-    <path id="path842" transform="translate(10.9597, 16.8727)" fill="none" stroke="#ffffff" stroke-width="7.00000000000" stroke-linecap="round" stroke-linejoin="round" d="M0 0L49.8864 0"/>
-    <path id="path845" transform="translate(10.9597, 29.7461)" fill="none" stroke="#ffffff" stroke-width="7.00000000000" stroke-linecap="round" stroke-linejoin="round" d="M0 0L49.8864 0"/>
-    <path id="path846" transform="translate(10.9597, 42.6194)" fill="none" stroke="#ffffff" stroke-width="7.00000000000" stroke-linecap="round" stroke-linejoin="round" d="M0 0L49.8864 0"/>
-    <path id="path848" transform="translate(10.8847, 55.4927)" fill="none" stroke="#ffffff" stroke-width="7.00000000000" stroke-linecap="round" stroke-linejoin="round" d="M0 0L27.6572 0"/>
-   </g>
-   <g id="g886" transform="translate(24.5258, 32.1333)" fill="none">
-    <path id="path599" transform="translate(1.56892, 48.6283)" fill="#ffffff" stroke="#b3b3b3" stroke-width="3.13784003000" stroke-linecap="round" stroke-linejoin="round" d="M16.3475 5.47447C0 17.0594 0 17.0594 0 17.0594L10.0728 0Z"/>
-    <rect id="rect598" transform="matrix(-0.911191 -0.824059 0.824059 -0.911191 17.3856 54.0244)" fill="#ffffff" stroke="#b3b3b3" stroke-width="3.13783836000" stroke-linecap="round" stroke-linejoin="round" width="5.23702200000pt" height="37.70656160000pt"/>
-    <path id="path600" transform="translate(4.47967, 60.1754)" fill="#ffffff" stroke="#b3b3b3" stroke-width="2.31749964000" stroke-linecap="butt" stroke-linejoin="round" d="M0.264548 0.337176C0.643913 -0.0822999 1.2915 -0.114817 1.71098 0.264548C2.13045 0.643913 2.16297 1.2915 1.7836 1.71098C1.40424 2.13045 0.756651 2.16297 0.337175 1.7836C-0.0823005 1.40424 -0.114816 0.756651 0.264548 0.337176Z"/>
-    <rect id="rect601" transform="matrix(-0.911191 -0.824059 0.824059 -0.911191 56.463 11.5345)" fill="#ffffff" stroke="#b3b3b3" stroke-width="3.13783836000" stroke-linecap="butt" stroke-linejoin="round" width="5.97020528000pt" height="3.24695360000pt" rx="1.64633232000pt" ry="1.62347680000pt"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/email.svg b/apps/shorty/img/usage/email.svg
deleted file mode 100644
index 7283939e37..0000000000
--- a/apps/shorty/img/usage/email.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062868749" y1="-2.28811738018" x2="1.88917986746" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5473" transform="translate(1.28609e-06, 3.64259e-06)" fill="none">
-   <path id="path5063" transform="matrix(0.758527 0 0 0.768105 -2.64698e-22 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path5065" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="text5197" transform="translate(30.5827, 32.9153)" fill="none">
-    <path id="path5202" transform="matrix(0.794213 0 0 0.724445 -1.42109e-13 4.44089e-15)" fill="#eeeeee" d="M80.7728 37.0436L82.4783 29.4711L100.488 29.4711L90.119 78.3851C89.4822 81.4778 89.1638 83.5244 89.1639 84.5249C89.1638 85.571 89.4139 86.3896 89.9143 86.9808C90.46 87.5721 91.0967 87.8677 91.8245 87.8677C94.2803 87.8677 97.4412 86.2759 101.307 83.0923C105.218 79.8632 108.607 75.4971 111.472 69.994C114.382 64.4454 115.838 58.3966 115.838 51.8474C115.838 46.3898 114.792 41.2506 112.7 36.4296C110.653 31.6088 107.674 27.4246 103.763 23.8771C99.8516 20.3297 95.008 17.5554 89.2321 15.5542C83.5015 13.5532 76.9979 12.5526 69.7211 12.5525C62.3078 12.5526 55.5085 13.5304 49.3233 15.486C43.1379 17.3962 37.703 20.1705 33.0186 23.8089C28.3341 27.4019 24.4228 31.8589 21.2847 37.18C18.5104 41.8191 16.3956 46.9583 14.9402 52.5978C13.4849 58.2374 12.7572 63.9906 12.7572 69.8575C12.7572 77.6802 14.3035 84.8433 17.3962 91.3469C20.5343 97.8051 25.0596 103.217 30.972 107.583C36.9299 111.995 44.1157 115.11 52.5296 116.93C60.9434 118.794 70.4487 119.181 81.0457 118.089C89.4594 117.089 96.5771 115.179 102.399 112.359C108.265 109.539 113.223 105.582 117.271 100.488L131.802 100.488C129.436 105.355 126.344 109.698 122.524 113.519C118.749 117.339 114.314 120.545 109.221 123.138C104.127 125.775 98.419 127.777 92.0974 129.141C85.7755 130.505 78.8853 131.188 71.4266 131.188C60.2384 131.188 50.1646 129.709 41.205 126.753C32.2454 123.843 24.6957 119.613 18.5559 114.064C12.4616 108.561 7.84532 101.989 4.7072 94.3486C1.56906 86.6625 -9.99995e-06 78.1805 4.79758e-11 68.9025C-9.99995e-06 59.2152 1.61454 50.1647 4.84364 41.7508C8.07272 33.337 12.7117 26.0375 18.7606 19.8521C24.8549 13.6214 32.2682 8.75503 41.0004 5.25296C49.778 1.75109 59.4425 0.0001 69.994 0C78.6352 0.0001 86.5487 1.27355 93.7347 3.82034C100.966 6.32184 107.151 9.93751 112.291 14.6674C117.43 19.3974 121.341 25.0142 124.024 31.5178C126.753 37.976 128.117 45.1164 128.118 52.9389C128.117 59.0333 127.026 65.0139 124.843 70.8809C122.66 76.7023 119.522 81.9553 115.429 86.6397C111.381 91.2787 106.605 94.9626 101.102 97.6914C95.5992 100.375 89.6641 101.716 83.297 101.716C79.613 101.716 76.7477 101.102 74.7012 99.8745C72.6545 98.601 71.2901 96.5999 70.608 93.8711C66.6511 97.7824 62.1031 100.261 56.9639 101.307C51.8246 102.308 46.8445 101.83 42.0237 99.8745C37.2027 97.8733 33.2915 94.5305 30.2898 89.8461C27.3336 85.1616 25.8555 79.3857 25.8555 72.5181C25.8555 65.3778 27.379 58.3511 30.4262 51.4381C33.5189 44.5251 37.8849 38.8629 43.5245 34.4512C49.2095 30.0397 55.6222 27.8339 62.7627 27.8339C70.949 27.8339 76.9524 30.9038 80.7728 37.0436M43.4563 72.3817C43.4563 77.8393 44.5933 82.0235 46.8673 84.9342C49.1413 87.845 52.1202 89.3003 55.8042 89.3003C60.0793 89.3003 63.8314 87.5948 67.0605 84.1838C70.335 80.7728 72.8137 76.4749 74.4965 71.2902C76.1792 66.06 77.0206 61.0117 77.0207 56.1453C77.0206 53.7349 76.725 51.5746 76.1338 49.6643C75.588 47.7088 74.7466 46.0032 73.6097 44.5478C72.5181 43.0925 71.1764 42.001 69.5847 41.2733C68.0383 40.5002 66.2646 40.1136 64.2635 40.1135C60.2612 40.1136 56.6455 41.6826 53.4165 44.8207C50.2328 47.9134 47.7769 51.9611 46.0487 56.9639C44.3204 61.9213 43.4563 67.0606 43.4563 72.3817"/>
-   </g>
-   <path id="path5067" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/globe.svg b/apps/shorty/img/usage/globe.svg
deleted file mode 100644
index 018f161dbf..0000000000
--- a/apps/shorty/img/usage/globe.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811733465" x2="1.88918016404" y2="-1.09199167635" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5362" transform="translate(-3.40191e-06, 5.08678e-06)" fill="none">
-   <path id="path4239" transform="matrix(0.758527 0 0 0.768105 5.29396e-22 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4241" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47748)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path244" transform="matrix(0.758527 0 0 0.758527 23.1973 27.4649)" fill="#eeeeee" d="M80.5927 0.0948932C60.0949 -0.911807 40.4347 6.11839 25.2406 19.8968C10.0239 33.6889 1.10091 52.5655 0.0948972 73.0487C-0.911853 93.5465 6.11847 113.207 19.9112 128.409C33.6819 143.61 52.5585 152.533 73.0563 153.54C115.377 155.618 151.469 122.891 153.547 80.5855C155.625 38.2798 122.913 2.17339 80.5927 0.0948932ZM141.304 79.9841C140.952 87.1558 139.42 93.9908 136.945 100.317C131.792 99.6461 126.706 98.7947 121.689 97.7487C126.836 85.2521 128.594 71.5547 126.644 57.7998C124.785 44.717 119.689 32.8544 112.313 22.9264C130.73 35.0912 142.463 56.3835 141.304 79.9841ZM92.0321 26.1704C79.4068 40.6691 68.6314 56.7845 60.0807 74.2049C52.8482 70.0132 45.8857 65.4019 39.2203 60.4163C44.6575 50.0833 52.8087 41.3948 63.0583 35.2373C72.1673 29.7501 82.0974 26.8121 92.0321 26.1704ZM54.9821 85.4129C49.529 98.3126 45.2546 111.857 42.3271 125.908C41.8765 125.226 41.4339 124.529 41.0136 123.826C32.1223 109.048 29.5275 91.6818 33.686 74.9699C33.9167 74.0056 34.1893 73.0873 34.4639 72.1252C41.0431 76.9231 47.8895 81.3601 54.9821 85.4129ZM59.6738 132.526C57.583 132.827 55.4987 132.996 53.4253 133.092C56.1068 118.523 60.2937 104.519 65.8325 91.2201C77.7539 97.1755 90.2767 102.089 103.311 105.84C102.95 106.335 102.586 106.868 102.209 107.377C91.8412 121.166 76.7464 130.085 59.6738 132.526ZM70.8853 80.0467C79.4919 62.3869 90.5152 46.1516 103.52 31.6862C109.148 39.7311 113.028 49.1426 114.5 59.5069C116.233 71.7252 114.484 83.8752 109.573 94.8576C96.0784 91.2018 83.1341 86.2087 70.8853 80.0467ZM33.472 28.994C46.248 17.4001 62.7647 11.4919 79.9914 12.338C83.8846 12.5292 87.6863 13.0901 91.3568 13.9305C79.4801 14.6823 67.6153 18.1782 56.7378 24.723C45.2255 31.6472 35.9361 41.2556 29.501 52.6399C26.5147 50.1165 23.5977 47.5232 20.7443 44.8302C24.0834 38.9789 28.3438 33.6351 33.472 28.994ZM12.3453 73.6503C12.6332 67.7886 13.7123 62.0978 15.4974 56.669C18.3272 59.2435 21.2192 61.7475 24.1803 64.1891C23.2561 66.7258 22.4531 69.3346 21.7789 72.0084C18.4881 85.2417 18.776 98.7975 22.4326 111.573C15.2371 100.355 11.6786 87.2253 12.3453 73.6503ZM75.343 141.335C89.8738 136.43 102.603 127.284 112.015 114.74C113.396 112.9 114.692 111.006 115.896 109.055C120.881 110.158 125.911 111.094 131.015 111.873C119.175 130.1 98.4601 141.884 75.343 141.335Z"/>
-   <path id="path4243" transform="matrix(0.758527 0 0 0.758527 5.33865 4.46648)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 -1.13687e-13 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/home.svg b/apps/shorty/img/usage/home.svg
deleted file mode 100644
index 8c29644503..0000000000
--- a/apps/shorty/img/usage/home.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5314" transform="translate(-8.17503e-06, -2.94544e-06)" fill="none">
-   <path id="path4087" transform="matrix(0.758527 0 0 0.768105 1.05879e-21 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4089" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="g4126" transform="translate(27.3419, 27.8174)" fill="none">
-    <path id="path4109" transform="matrix(0.646168 0 0 0.646168 2.22045e-14 1.77636e-14)" fill="#eeeeee" d="M83.9733 0.0146219C81.7822 0.0969449 79.6354 0.511418 77.6608 1.23337C74.7217 2.30249 72.2731 4.0111 70.6295 6.13962L2.22329 94.9209C-0.141455 97.987 -0.646597 101.673 0.836575 105.04C2.31975 108.407 5.648 111.13 9.97329 112.515L71.4108 32.7959C73.0479 30.6558 75.4972 28.9358 78.442 27.8584C86.1818 25.036 95.4931 27.2205 99.7545 32.8584L160.005 112.39C163.905 110.818 166.796 108.12 168.021 104.912C169.245 101.704 168.698 98.2572 166.505 95.3584L98.9733 6.23337C95.9221 2.19242 90.1245 -0.211173 83.9733 0.0146219Z"/>
-    <path id="rect4116" transform="matrix(0.646168 0 0 0.646168 20.0253 26.3303)" fill="#eeeeee" d="M52.6562 0.00858529C51.3133 0.0537124 49.9957 0.308743 48.7812 0.758585C46.9652 1.43702 45.452 2.5257 44.4375 3.88359L2.4062 60.2898C2.26096 60.4729 2.12543 60.6606 1.99995 60.8523C1.98995 60.8666 2.00995 60.9004 1.99995 60.9148C1.96841 60.9459 1.93718 60.9771 1.90625 61.0085C0.67894 62.8827 0 65.1221 0 67.5398L0 116.571C0 123.169 5.28309 128.477 11.875 128.477L36.4375 128.477L36.4375 85.571C36.4375 78.9733 41.7206 73.6648 48.3125 73.6648L57.4375 73.6648C64.0294 73.6648 69.3125 78.9733 69.3125 85.571L69.3125 128.477L93.8437 128.477C100.436 128.477 105.75 123.169 105.75 116.571L105.75 67.5398C105.75 64.4233 104.538 61.6268 102.594 59.5085L61.8437 3.94604C59.9691 1.39179 56.4219 -0.128436 52.6562 0.00853529Z"/>
-    <rect id="rect4124" transform="matrix(0.646168 0 0 0.646168 21.5365 9.64032)" fill="#eeeeee" width="18.17356080000pt" height="31.33372480000pt" rx="9.08678040000pt" ry="14.74450800000pt"/>
-   </g>
-   <path id="path4091" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/info.svg b/apps/shorty/img/usage/info.svg
deleted file mode 100644
index 31a3b6387e..0000000000
--- a/apps/shorty/img/usage/info.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5381" transform="translate(-5.94477e-06, 2.56921e-06)" fill="none">
-   <path id="path4167" transform="matrix(0.758527 0 0 0.768105 0 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4169" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="text4182" transform="translate(66.8213, 30.5499)" fill="none">
-    <path id="path4187" transform="matrix(1.54651 0 0 0.965127 -2.30926e-13 8.88178e-15)" fill="#eeeeee" d="M19.1953 38.6016L19.1953 94.0781C19.1953 97.9219 18.2812 100.828 16.4531 102.797C14.625 104.766 12.3047 105.75 9.49218 105.75C6.67967 105.75 4.38279 104.742 2.60156 102.727C0.86717 100.711 -9.99991e-06 97.8281 8.66294e-11 94.0781L8.66294e-11 39.1641C-9.99991e-06 35.3673 0.86717 32.5079 2.60156 30.5859C4.38279 28.6641 6.67967 27.7032 9.49218 27.7031C12.3047 27.7032 14.625 28.6641 16.4531 30.5859C18.2812 32.5079 19.1953 35.1798 19.1953 38.6016M9.70312 18.7734C7.03123 18.7735 4.73436 17.9532 2.8125 16.3125C0.93748 14.672 -9.99991e-06 12.3517 8.66294e-11 9.35156C-9.99991e-06 6.63291 0.96092 4.40634 2.88281 2.67187C4.85154 0.89072 7.12498 0.0001 9.70312 0C12.1875 0.0001 14.3906 0.79697 16.3125 2.39062C18.2343 3.98447 19.1953 6.30478 19.1953 9.35156C19.1953 12.3048 18.2578 14.6251 16.3828 16.3125C14.5078 17.9532 12.2812 18.7735 9.70312 18.7734"/>
-   </g>
-   <path id="path4171" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/locked.svg b/apps/shorty/img/usage/locked.svg
deleted file mode 100644
index 1691a9dfa4..0000000000
--- a/apps/shorty/img/usage/locked.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5393" transform="translate(-2.11465e-06, -2.863e-06)" fill="none">
-   <path id="path4197" transform="matrix(0.758527 0 0 0.768105 2.64698e-22 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4199" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="g4220" transform="translate(46.2074, 35.1119)" fill="none">
-    <path id="rect4189" transform="matrix(0.758527 0 0 0.758527 10.0979 0)" fill="#eeeeee" d="M11.875 0C5.28309 0 0 5.3085 0 11.9062L0 37.0938L12.7188 37.0938L12.7188 22.9688C12.7188 16.371 18.0331 11.0625 24.625 11.0625L50.125 11.0625C56.7169 11.0625 62.0312 16.371 62.0312 22.9688L62.0312 37.0938L74.2188 37.0938L74.2188 11.9062C74.2188 5.3085 68.9044 0 62.3125 0Z"/>
-    <path id="rect4193" transform="matrix(0.758527 0 0 0.758527 0 32.6878)" fill="#eeeeee" d="M11.9062 0C5.31434 0 0 5.3085 0 11.9062L0 26.875C0 33.4728 5.31434 38.7812 11.9062 38.7812L87.8125 38.7812C93.6895 38.7812 98.5472 34.5601 99.5312 28.9687L87.9375 28.9687C81.3456 28.9687 76.0312 25.575 76.0312 21.3438C76.0312 17.1125 81.3456 13.6875 87.9375 13.6875L99.7188 13.6875L99.7188 11.9062C99.7188 5.3085 94.4044 0 87.8125 0Z"/>
-    <path id="path4218" transform="matrix(0.758527 0 0 0.758527 0 67.4477)" fill="#eeeeee" d="M11.9062 0C5.31434 0 0 5.3085 0 11.9062L0 26.875C0 33.4728 5.31434 38.7812 11.9062 38.7812L87.8125 38.7812C93.6895 38.7812 98.5472 34.5601 99.5312 28.9687L87.9375 28.9687C81.3456 28.9687 76.0312 25.575 76.0312 21.3438C76.0312 17.1125 81.3456 13.6875 87.9375 13.6875L99.7188 13.6875L99.7188 11.9062C99.7188 5.3085 94.4044 0 87.8125 0Z"/>
-   </g>
-   <path id="path4201" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/network.svg b/apps/shorty/img/usage/network.svg
deleted file mode 100644
index 1d3a025712..0000000000
--- a/apps/shorty/img/usage/network.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062886879" y1="-2.28811738018" x2="1.88918005155" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5449" transform="translate(-8.40215e-06, -2.8318e-06)" fill="none">
-   <path id="path5051" transform="matrix(0.758527 0 0 0.768105 1.05879e-21 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path5053" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="g5152" transform="translate(24.1282, 25.4609)" fill="none">
-    <path id="path5092" transform="matrix(0.7132 0 0 0.7132 29.7461 0)" fill="#eeeeee" d="M9.9163 0C4.4218 0 0 4.14395 0 9.293L0 44.7222C0 49.8712 4.4218 54.0153 9.9163 54.0153L73.1505 54.0153C78.645 54.0153 83.0668 49.8712 83.0668 44.7222L83.0668 9.293C83.0668 4.14395 78.645 0 73.1505 0ZM19.0295 8.14427L64.0374 8.14427C69.5318 8.14427 73.9537 12.2882 73.9537 17.4373L73.9537 36.5778C73.9537 41.7269 69.5318 45.8709 64.0374 45.8709L19.0295 45.8709C13.535 45.8709 9.1132 41.7269 9.1132 36.5778L9.1132 17.4373C9.1132 12.2882 13.535 8.14427 19.0295 8.14427Z"/>
-    <rect id="rect5098" transform="matrix(0.7132 0 0 0.7132 0 75.1881)" fill="#eeeeee" width="38.99506800000pt" height="30.13255280000pt" rx="11.21705440000pt" ry="11.21705440000pt"/>
-    <rect id="rect5114" transform="matrix(0.7132 0 0 0.7132 86.1201 75.9782)" fill="#eeeeee" width="38.99506800000pt" height="30.13255280000pt" rx="11.21705440000pt" ry="11.21705440000pt"/>
-    <rect id="rect5116" transform="matrix(0.7132 0 0 0.7132 42.665 75.9782)" fill="#eeeeee" width="38.99506800000pt" height="30.13255280000pt" rx="11.21705440000pt" ry="11.21705440000pt"/>
-    <g id="g5138" transform="translate(8.18351, 44.967)" fill="none">
-     <rect id="rect5126" transform="matrix(0.7132 0 0 0.7132 48.3081 8.88178e-15)" fill="#eeeeee" width="7.31157528000pt" height="29.91099280000pt"/>
-     <rect id="rect5128" transform="matrix(0.7132 0 0 0.7132 91.8912 8.69104)" fill="#eeeeee" width="7.53313824000pt" height="20.16222400000pt"/>
-     <rect id="rect5134" transform="matrix(0.7132 0 0 0.7132 0 8.69104)" fill="#eeeeee" width="7.53313824000pt" height="20.16222400000pt"/>
-     <rect id="rect5136" transform="matrix(0.7132 0 0 0.7132 -8.88178e-15 8.69104)" fill="#eeeeee" width="110.60805600000pt" height="8.61677440000pt"/>
-    </g>
-    <rect id="rect5144" transform="matrix(0.7132 0 0 0.7132 42.2636 10.4152)" fill="#eeeeee" width="39.63716160000pt" height="4.23005296000pt"/>
-    <rect id="rect5146" transform="matrix(0.7132 0 0 0.7132 42.2636 10.4152)" fill="#eeeeee" width="39.63716160000pt" height="4.23005296000pt"/>
-    <rect id="rect5148" transform="matrix(0.7132 0 0 0.7132 42.2636 17.5472)" fill="#eeeeee" width="39.63716160000pt" height="4.23005296000pt"/>
-    <rect id="rect5150" transform="matrix(0.7132 0 0 0.7132 42.2636 24.6792)" fill="#eeeeee" width="39.63716160000pt" height="4.23005296000pt"/>
-   </g>
-   <path id="path5055" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/qrcode.svg b/apps/shorty/img/usage/qrcode.svg
deleted file mode 100644
index 83802042f7..0000000000
--- a/apps/shorty/img/usage/qrcode.svg
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811738018" x2="1.88918016404" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5381" transform="translate(-5.94477e-06, 2.56921e-06)" fill="none">
-   <path id="path4167" transform="matrix(0.758527 0 0 0.768105 1.41962e-15 -6.05492e-16)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4169" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47751)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="text4182" transform="translate(5.94477e-06, -2.56921e-06)" fill="none"/>
-   <path id="path4171" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46647)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
-  <g id="group0" transform="translate(31.4638, 31.6895)" fill="none">
-   <rect id="p" transform="translate(0, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p1" transform="translate(0, 7.66166)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p2" transform="translate(0, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p3" transform="translate(0, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p4" transform="translate(0, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p5" transform="translate(0, 27.1293)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p6" transform="translate(0, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p7" transform="translate(0, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p8" transform="translate(0, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p9" transform="translate(0, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p10" transform="translate(0, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p11" transform="translate(0, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p12" transform="translate(0, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p13" transform="translate(0, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p14" transform="translate(0, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p15" transform="translate(0, 95.2662)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p16" transform="translate(0, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p17" transform="translate(4.95608, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p18" transform="translate(4.95608, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p19" transform="translate(4.95608, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p20" transform="translate(4.95608, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p21" transform="translate(4.95608, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p22" transform="translate(4.95608, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p23" transform="translate(9.91217, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p24" transform="translate(9.91217, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p25" transform="translate(9.91217, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p26" transform="translate(9.91217, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p27" transform="translate(9.91217, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p28" transform="translate(9.91217, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p29" transform="translate(9.91217, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p30" transform="translate(9.91217, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p31" transform="translate(9.91217, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p32" transform="translate(9.91217, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p33" transform="translate(9.91217, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p34" transform="translate(9.91217, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p35" transform="translate(9.91217, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p36" transform="translate(9.91217, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p37" transform="translate(14.8683, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p38" transform="translate(14.8683, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p39" transform="translate(14.8683, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p40" transform="translate(14.8683, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p41" transform="translate(14.8683, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p42" transform="translate(14.8683, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p43" transform="translate(14.8683, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p44" transform="translate(14.8683, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p45" transform="translate(14.8683, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p46" transform="translate(14.8683, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p47" transform="translate(14.8683, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p48" transform="translate(14.8683, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p49" transform="translate(14.8683, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p50" transform="translate(19.8243, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p51" transform="translate(19.8243, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p52" transform="translate(19.8243, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p53" transform="translate(19.8243, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p54" transform="translate(19.8243, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p55" transform="translate(19.8243, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p56" transform="translate(19.8243, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p57" transform="translate(19.8243, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p58" transform="translate(19.8243, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p59" transform="translate(19.8243, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p60" transform="translate(19.8243, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p61" transform="translate(19.8243, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p62" transform="translate(24.7804, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p63" transform="translate(24.7804, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p64" transform="translate(24.7804, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p65" transform="translate(24.7804, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p66" transform="translate(24.7804, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p67" transform="translate(24.7804, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p68" transform="translate(24.7804, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p69" transform="translate(29.7365, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p70" transform="translate(29.7365, 7.66166)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p71" transform="translate(29.7365, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p72" transform="translate(29.7365, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p73" transform="translate(29.7365, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p74" transform="translate(29.7365, 27.1293)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p75" transform="translate(29.7365, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p76" transform="translate(29.7365, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p77" transform="translate(29.7365, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p78" transform="translate(29.7365, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p79" transform="translate(29.7365, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p80" transform="translate(29.7365, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p81" transform="translate(29.7365, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p82" transform="translate(29.7365, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p83" transform="translate(29.7365, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p84" transform="translate(29.7365, 95.2662)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p85" transform="translate(29.7365, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p86" transform="translate(34.6926, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p87" transform="translate(34.6926, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p88" transform="translate(34.6926, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p89" transform="translate(39.6487, 7.66166)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p90" transform="translate(39.6487, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p91" transform="translate(39.6487, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p92" transform="translate(39.6487, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p93" transform="translate(39.6487, 36.8632)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p94" transform="translate(39.6487, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p95" transform="translate(39.6487, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p96" transform="translate(39.6487, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p97" transform="translate(39.6487, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p98" transform="translate(39.6487, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p99" transform="translate(39.6487, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p100" transform="translate(44.6048, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p101" transform="translate(44.6048, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p102" transform="translate(44.6048, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p103" transform="translate(44.6048, 27.1293)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p104" transform="translate(44.6048, 36.8632)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p105" transform="translate(44.6048, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p106" transform="translate(44.6048, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p107" transform="translate(44.6048, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p108" transform="translate(44.6048, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p109" transform="translate(44.6048, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p110" transform="translate(44.6048, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p111" transform="translate(44.6048, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p112" transform="translate(49.5608, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p113" transform="translate(49.5608, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p114" transform="translate(49.5608, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p115" transform="translate(49.5608, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p116" transform="translate(49.5608, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p117" transform="translate(49.5608, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p118" transform="translate(49.5608, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p119" transform="translate(49.5608, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p120" transform="translate(49.5608, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p121" transform="translate(54.5169, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p122" transform="translate(54.5169, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p123" transform="translate(54.5169, 36.8632)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p124" transform="translate(54.5169, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p125" transform="translate(54.5169, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p126" transform="translate(54.5169, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p127" transform="translate(54.5169, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p128" transform="translate(59.473, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p129" transform="translate(59.473, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p130" transform="translate(59.473, 27.1293)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p131" transform="translate(59.473, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p132" transform="translate(59.473, 36.8632)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p133" transform="translate(59.473, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p134" transform="translate(59.473, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p135" transform="translate(59.473, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p136" transform="translate(59.473, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p137" transform="translate(59.473, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p138" transform="translate(59.473, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p139" transform="translate(59.473, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p140" transform="translate(64.4291, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p141" transform="translate(64.4291, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p142" transform="translate(64.4291, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p143" transform="translate(64.4291, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p144" transform="translate(64.4291, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p145" transform="translate(64.4291, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p146" transform="translate(64.4291, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p147" transform="translate(69.3852, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p148" transform="translate(69.3852, 7.66166)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p149" transform="translate(69.3852, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p150" transform="translate(69.3852, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p151" transform="translate(69.3852, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p152" transform="translate(69.3852, 27.1293)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p153" transform="translate(69.3852, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p154" transform="translate(69.3852, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p155" transform="translate(69.3852, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p156" transform="translate(69.3852, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p157" transform="translate(69.3852, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p158" transform="translate(69.3852, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p159" transform="translate(69.3852, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p160" transform="translate(74.3413, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p161" transform="translate(74.3413, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p162" transform="translate(74.3413, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p163" transform="translate(74.3413, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p164" transform="translate(74.3413, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p165" transform="translate(74.3413, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p166" transform="translate(74.3413, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p167" transform="translate(74.3413, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p168" transform="translate(74.3413, 95.2662)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p169" transform="translate(74.3413, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p170" transform="translate(79.2974, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p171" transform="translate(79.2974, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p172" transform="translate(79.2974, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p173" transform="translate(79.2974, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p174" transform="translate(79.2974, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p175" transform="translate(79.2974, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p176" transform="translate(79.2974, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p177" transform="translate(79.2974, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p178" transform="translate(79.2974, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p179" transform="translate(79.2974, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p180" transform="translate(79.2974, 95.2662)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p181" transform="translate(84.2534, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p182" transform="translate(84.2534, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p183" transform="translate(84.2534, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p184" transform="translate(84.2534, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p185" transform="translate(84.2534, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p186" transform="translate(84.2534, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p187" transform="translate(84.2534, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p188" transform="translate(84.2534, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p189" transform="translate(84.2534, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p190" transform="translate(84.2534, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p191" transform="translate(84.2534, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p192" transform="translate(84.2534, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p193" transform="translate(84.2534, 95.2662)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p194" transform="translate(84.2534, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p195" transform="translate(89.2095, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p196" transform="translate(89.2095, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p197" transform="translate(89.2095, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p198" transform="translate(89.2095, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p199" transform="translate(89.2095, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p200" transform="translate(89.2095, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p201" transform="translate(89.2095, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p202" transform="translate(89.2095, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p203" transform="translate(89.2095, 56.3308)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p204" transform="translate(89.2095, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p205" transform="translate(89.2095, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p206" transform="translate(89.2095, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p207" transform="translate(89.2095, 85.5323)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p208" transform="translate(89.2095, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p209" transform="translate(89.2095, 95.2662)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p210" transform="translate(94.1656, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p211" transform="translate(94.1656, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p212" transform="translate(94.1656, 41.7301)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p213" transform="translate(94.1656, 46.597)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p214" transform="translate(94.1656, 51.4639)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p215" transform="translate(94.1656, 61.1977)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p216" transform="translate(94.1656, 70.9316)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p217" transform="translate(94.1656, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p218" transform="translate(94.1656, 100.133)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p219" transform="translate(99.1217, 2.79474)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p220" transform="translate(99.1217, 7.66166)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p221" transform="translate(99.1217, 12.5286)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p222" transform="translate(99.1217, 17.3955)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p223" transform="translate(99.1217, 22.2624)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p224" transform="translate(99.1217, 27.1293)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p225" transform="translate(99.1217, 31.9962)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p226" transform="translate(99.1217, 66.0647)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p227" transform="translate(99.1217, 75.7985)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p228" transform="translate(99.1217, 80.6654)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-   <rect id="p229" transform="translate(99.1217, 90.3992)" fill="#ffffff" stroke="#000000" stroke-width="0.00000000000" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="3.96486751181pt" height="3.89353363095pt"/>
-  </g>
-  <rect id="shape0" transform="translate(73.7513, 37.3739)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape1" transform="translate(84.0513, 39.0469)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape2" transform="translate(82.9589, 61.8606)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape3" transform="translate(73.7513, 37.3739)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape4" transform="translate(72.6589, 52.2789)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape5" transform="translate(83.8952, 72.507)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape6" transform="translate(48.4696, 74.18)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape7" transform="translate(34.2682, 77.8302)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape8" transform="translate(73.9074, 95.1686)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape9" transform="translate(73.4392, 120.112)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape10" transform="translate(72.0347, 107.792)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape11" transform="translate(118.384, 85.7389)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape12" transform="translate(125.719, 114.18)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape13" transform="translate(90.6058, 123.762)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape14" transform="translate(87.7967, 92.8872)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape15" transform="translate(104.651, 105.207)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape16" transform="translate(93.8831, 115.853)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape17" transform="translate(106.836, 76.3093)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape18" transform="translate(108.553, 125.739)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
-  <rect id="shape19" transform="translate(125.251, 75.5488)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" width="7.74057149730pt" height="8.39543189174pt"/>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/sms.svg b/apps/shorty/img/usage/sms.svg
deleted file mode 100644
index 5d519df957..0000000000
--- a/apps/shorty/img/usage/sms.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062891915" y1="-2.28811733465" x2="1.88918010268" y2="-1.09199167635" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5434" transform="translate(-6.50233e-06, 2.52429e-06)" fill="none">
-   <path id="path5075" transform="matrix(0.758527 0 0 0.768105 1.05879e-21 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path5077" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47756)" fill="#000000" stroke="#000000" stroke-width="1.25000000000" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="2.00000000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="rect5206" transform="matrix(0.758527 0 0 0.758527 28.5135 43.1225)" fill="#eeeeee" d="M12 0C5.352 0 0 5.352 0 12L0 72.5937C0 79.2417 5.352 84.5937 12 84.5937L83.4687 84.5937C92.9385 97.8632 117.244 131.838 117.469 130.938C117.697 130.027 118.047 97.894 118.188 84.5937L129 84.5937C135.648 84.5937 141 79.2417 141 72.5937L141 12C141 5.352 135.648 1.13687e-13 129 1.13687e-13ZM29.8125 25.2812C31.4969 25.2813 33.0089 25.5233 34.3437 26C35.6946 26.4768 36.7976 27.1045 37.6875 27.9063C38.5932 28.7081 39.2892 29.6186 39.75 30.5937C40.2268 31.5689 40.4687 32.5057 40.4687 33.4375C40.4687 34.456 40.1959 35.2874 39.6875 35.9375C39.1948 36.5876 38.4842 36.9063 37.5625 36.9062C36.8951 36.9063 36.3205 36.6451 35.8437 36.125C35.383 35.6049 34.8537 34.8527 34.25 33.8125C33.7573 32.9457 33.1984 32.2388 32.5313 31.7187C31.8637 31.1987 30.9566 30.9375 29.8125 30.9375C28.6366 30.9375 27.6536 31.2753 26.875 31.9687C26.0963 32.6405 25.7187 33.4815 25.7187 34.5C25.7187 35.4318 25.9904 36.2057 26.5625 36.8125C27.1345 37.3976 27.9056 37.8912 28.875 38.2812C29.8444 38.6713 31.1747 39.1553 32.875 39.7187C34.8932 40.3905 36.5412 41.1932 37.8125 42.125C39.0997 43.0568 40.0673 44.1589 40.7187 45.4375C41.3863 46.6944 41.7187 48.1247 41.7187 49.75C41.7187 52.1988 41.2802 54.3072 40.4063 56.0625C39.5322 57.7961 38.2474 59.1211 36.5313 60.0312C34.8308 60.9197 32.7597 61.375 30.3125 61.375C27.9765 61.375 25.9811 60.8814 24.3125 59.9062C22.6439 58.9311 21.3884 57.7019 20.5937 56.25C19.7993 54.7764 19.4063 53.3173 19.4063 51.8437C19.4063 50.8686 19.679 50.0372 20.1875 49.3437C20.696 48.6503 21.3151 48.2813 22.0937 48.2812C22.7773 48.2813 23.322 48.5137 23.6875 48.9687C24.053 49.4238 24.3852 50.0828 24.7187 50.9062C25.3863 52.4882 26.2033 53.6573 27.125 54.4375C28.0625 55.2176 29.3325 55.625 30.9375 55.625C32.2405 55.625 33.2987 55.2176 34.125 54.4375C34.9672 53.6357 35.375 52.7373 35.375 51.7187C35.375 50.1585 34.9364 48.9964 34.0625 48.2812C33.2044 47.5661 31.7988 46.9001 29.8125 46.25C27.5719 45.4915 25.7268 44.6985 24.3125 43.875C22.9141 43.0299 21.811 41.9277 20.9687 40.5625C20.1267 39.1973 19.6875 37.5249 19.6875 35.5312C19.6875 33.7543 20.0964 32.0507 20.875 30.4687C21.6536 28.8868 22.8028 27.6506 24.3125 26.7188C25.838 25.7653 27.6673 25.2813 29.8125 25.2812ZM49.9687 25.2812C50.8587 25.2813 51.5995 25.7078 52.1875 26.5312C52.7912 27.3331 53.0937 28.4448 53.0937 29.875L53.0937 30.7187C54.2221 28.8768 55.4316 27.5231 56.7187 26.6563C58.006 25.7895 59.4268 25.3438 61 25.3438C62.6368 25.3438 64.0429 25.799 65.2187 26.6875C66.3947 27.576 67.3621 28.9201 68.125 30.7187C69.2214 28.8985 70.4007 27.5544 71.6563 26.6875C72.9115 25.799 74.3182 25.3438 75.8437 25.3438C77.6236 25.3438 79.1503 25.8278 80.4375 26.7812C81.7247 27.7348 82.6768 29.098 83.3125 30.875C83.8686 32.4786 84.1561 34.9919 84.1563 38.4375L84.1563 55.7812C84.156 57.6449 83.8385 59.0369 83.2187 59.9687C82.5991 60.9006 81.7982 61.375 80.7813 61.375C79.7959 61.375 78.9794 60.9006 78.3437 59.9687C77.7241 59.0152 77.4063 57.6232 77.4063 55.7812L77.4063 40.8437C77.4063 38.9368 77.3463 37.4298 77.2187 36.2812C77.1078 35.1327 76.7744 34.1551 76.25 33.375C75.7256 32.5949 74.9397 32.2188 73.875 32.2187C73.0169 32.2188 72.2161 32.5566 71.4375 33.25C70.6747 33.9435 70.0541 34.8611 69.625 36.0312C69.1483 37.5265 68.9063 40.1764 68.9063 43.9687L68.9063 55.7812C68.9063 57.6449 68.6197 59.0369 68 59.9687C67.3802 60.9006 66.5482 61.375 65.5313 61.375C64.5459 61.375 63.7447 60.9006 63.125 59.9687C62.5211 59.0369 62.2187 57.6449 62.2187 55.7812L62.2187 41.625C62.2187 39.3929 62.1737 37.6727 62.0625 36.4375C61.9514 35.2023 61.6487 34.1864 61.1563 33.4062C60.6636 32.6045 59.8772 32.2188 58.8125 32.2187C56.6831 32.2188 55.2772 33.1938 54.5937 35.1875C53.9264 37.1812 53.5937 40.0539 53.5937 43.7812L53.5937 55.7812C53.5937 57.6232 53.2759 59.0152 52.6563 59.9687C52.0523 60.9006 51.2511 61.375 50.25 61.375C49.2648 61.375 48.4482 60.9006 47.8125 59.9687C47.1928 59.0152 46.9061 57.6232 46.9063 55.7812L46.9063 30.375C46.9063 28.7064 47.1627 27.4606 47.7187 26.5937C48.291 25.727 49.0471 25.2813 49.9687 25.2812ZM99.5 25.2812C101.184 25.2813 102.697 25.5233 104.031 26C105.382 26.4768 106.516 27.1045 107.406 27.9063C108.312 28.7081 108.977 29.6186 109.438 30.5937C109.914 31.5689 110.156 32.5057 110.156 33.4375C110.156 34.456 109.915 35.2874 109.406 35.9375C108.914 36.5876 108.203 36.9063 107.281 36.9062C106.614 36.9063 106.039 36.6451 105.562 36.125C105.102 35.6049 104.573 34.8527 103.969 33.8125C103.476 32.9457 102.886 32.2388 102.219 31.7187C101.551 31.1987 100.644 30.9375 99.5 30.9375C98.324 30.9375 97.3412 31.2753 96.5625 31.9687C95.7839 32.6405 95.4062 33.4815 95.4063 34.5C95.4063 35.4318 95.678 36.2057 96.25 36.8125C96.8221 37.3976 97.5931 37.8912 98.5625 38.2812C99.5318 38.6713 100.862 39.1553 102.562 39.7187C104.581 40.3905 106.229 41.1932 107.5 42.125C108.787 43.0568 109.755 44.1589 110.406 45.4375C111.074 46.6944 111.406 48.1247 111.406 49.75C111.406 52.1988 110.968 54.3072 110.094 56.0625C109.22 57.7961 107.935 59.1211 106.219 60.0312C104.519 60.9197 102.447 61.375 100 61.375C97.6641 61.375 95.6686 60.8814 94 59.9062C92.3314 58.9311 91.1071 57.7019 90.3125 56.25C89.518 54.7764 89.0938 53.3173 89.0937 51.8437C89.0937 50.8686 89.3665 50.0372 89.875 49.3437C90.3834 48.6503 91.0339 48.2813 91.8125 48.2812C92.4958 48.2813 93.0095 48.5137 93.375 48.9687C93.7404 49.4238 94.1038 50.0828 94.4375 50.9062C95.1049 52.4882 95.8907 53.6573 96.8125 54.4375C97.75 55.2176 99.0199 55.625 100.625 55.625C101.928 55.625 102.986 55.2176 103.813 54.4375C104.655 53.6357 105.094 52.7373 105.094 51.7187C105.094 50.1585 104.655 48.9964 103.781 48.2812C102.923 47.5661 101.486 46.9001 99.5 46.25C97.2593 45.4915 95.4456 44.6985 94.0313 43.875C92.6329 43.0299 91.4985 41.9277 90.6563 40.5625C89.814 39.1973 89.4063 37.5249 89.4063 35.5312C89.4063 33.7543 89.7839 32.0507 90.5625 30.4687C91.3411 28.8868 92.4903 27.6506 94 26.7188C95.5255 25.7653 97.3548 25.2813 99.5 25.2812Z"/>
-   <path id="path5079" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46648)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/team.svg b/apps/shorty/img/usage/team.svg
deleted file mode 100644
index c2d3c0075d..0000000000
--- a/apps/shorty/img/usage/team.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062898865" y1="-2.28811738018" x2="1.88918017325" y2="-1.09199169808" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5258" transform="translate(-2.67397e-06, 5.0533e-06)" fill="none">
-   <path id="path4049" transform="matrix(0.758527 0 0 0.768105 5.29396e-22 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4051" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47748)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4066" transform="matrix(0.758527 0 0 0.758527 28.6825 27.5818)" fill="#eeeeee" d="M51.3117 0C34.1148 0 20.1891 15.2419 20.1891 34.0447C20.1891 44.7741 24.7371 54.3331 31.8306 60.5733C16.506 70.8805 4.63895 92.9893 0 120.395L55.1922 120.395C59.0298 99.7894 68.1076 83.2199 79.7599 75.3826C75.6622 71.7778 72.6402 66.7497 71.3435 60.9909C71.1645 60.8664 70.999 60.7224 70.8191 60.6012C70.9527 60.4838 71.0806 60.359 71.2124 60.2393C70.8546 58.4247 70.6355 56.5482 70.6355 54.6162C70.6355 44.9453 75.3345 36.4865 82.3819 31.8177C81.3314 14.0536 67.8239 0 51.3117 0Z"/>
-   <path id="path4076" transform="matrix(0.758527 0 0 0.758527 79.2535 53.036)" fill="#eeeeee" d="M40.1579 0C26.6991 0 15.8005 11.9287 15.8005 26.6442C15.8005 35.0414 19.3599 42.5225 24.9114 47.4063C12.918 55.4729 3.63055 72.7758 0 94.2243L80.3158 94.2243C76.6873 72.791 67.4064 55.5019 55.4248 47.428C60.9821 42.5445 64.5358 35.0463 64.5358 26.6442C64.5358 11.9287 53.6166 0 40.1579 0Z"/>
-   <path id="path4053" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46644)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.896 205.25 106.73 205.25 106.562C205.25 47.725 159.299 0 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/unlocked.svg b/apps/shorty/img/usage/unlocked.svg
deleted file mode 100644
index b993bd1458..0000000000
--- a/apps/shorty/img/usage/unlocked.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811733465" x2="1.88918016404" y2="-1.09199167635" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5416" transform="translate(-2.95322e-06, -2.15252e-07)" fill="none">
-   <path id="path4251" transform="matrix(0.758527 0 0 0.768105 5.29396e-22 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4253" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47756)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="g5406" transform="translate(23.3294, 40.9941)" fill="none">
-    <path id="path4263" transform="matrix(0.758527 0 0 0.758527 0 0)" fill="#eeeeee" d="M11.875 0C5.28309 0 0 5.3085 0 11.9062L0 37.0938L12.7188 37.0938L12.7188 22.9688C12.7188 16.371 18.0331 11.0625 24.625 11.0625L50.125 11.0625C56.7169 11.0625 62.0312 16.371 62.0312 22.9688L62.0312 37.0938L74.2188 37.0938L74.2188 11.9062C74.2188 5.3085 68.9044 0 62.3125 0Z"/>
-    <path id="path4265" transform="matrix(0.758527 0 0 0.758527 37.7996 31.8475)" fill="#eeeeee" d="M11.9062 1.13687e-13C5.31434 1.13687e-13 0 5.3085 0 11.9062L0 26.875C0 33.4727 5.31434 38.7812 11.9062 38.7812L87.8125 38.7812C93.6895 38.7812 98.5472 34.5601 99.5312 28.9687L87.9375 28.9687C81.3456 28.9687 76.0312 25.575 76.0312 21.3437C76.0312 17.1125 81.3456 13.6875 87.9375 13.6875L99.7188 13.6875L99.7188 11.9062C99.7188 5.3085 94.4044 0 87.8125 0Z"/>
-    <path id="path4267" transform="matrix(0.758527 0 0 0.758527 37.7996 66.6074)" fill="#eeeeee" d="M11.9062 0C5.31434 0 0 5.3085 0 11.9063L0 26.875C0 33.4728 5.31434 38.7813 11.9062 38.7813L87.8125 38.7813C93.6895 38.7813 98.5472 34.5601 99.5312 28.9688L87.9375 28.9688C81.3456 28.9688 76.0312 25.575 76.0312 21.3438C76.0312 17.1126 81.3456 13.6875 87.9375 13.6875L99.7188 13.6875L99.7188 11.9063C99.7188 5.3085 94.4044 0 87.8125 0Z"/>
-   </g>
-   <path id="path4255" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46648)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.562C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.062C205.251 106.895 205.25 106.73 205.25 106.562C205.25 47.725 159.299 -1.13687e-13 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/img/usage/workstation.svg b/apps/shorty/img/usage/workstation.svg
deleted file mode 100644
index 104d98f855..0000000000
--- a/apps/shorty/img/usage/workstation.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="133.098pt" height="134.778pt">
-<defs>
-  <linearGradient id="gradient0" gradientTransform="matrix(0.935714 0 0 0.971429 -260.198 309.044)" gradientUnits="objectBoundingBox" x1="1.86062897958" y1="-2.28811733465" x2="1.88918016404" y2="-1.09199167635" spreadMethod="pad">
-   <stop stop-color="#edf4fd" offset="0.00000000000" stop-opacity="0.52845044633"/>
-   <stop stop-color="#175bb3" offset="1.00000000000" stop-opacity="0.00000000000"/>
-  </linearGradient>
- </defs>
-<g id="layer1">
-  <g id="g5228" transform="translate(7.95475e-07, 1.12198e-05)" fill="none">
-   <path id="path4227" transform="matrix(0.758527 0 0 0.768105 0 0)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <path id="path4229" transform="matrix(0.709764 0 0 0.736855 5.34768 4.47748)" fill="#000000" d="M219.336 109.668C219.336 170.236 170.236 219.336 109.668 219.336C49.1001 219.336 0 170.236 0 109.668C0 49.1001 49.1001 0 109.668 0C170.236 0 219.336 49.1001 219.336 109.668Z"/>
-   <g id="g5179" transform="translate(32.168, 32.4772)" fill="none">
-    <path id="rect5085" transform="matrix(0.758527 0 0 0.758527 5.76033 -8.88178e-15)" fill="#eeeeee" d="M14.0643 1.13687e-13C6.27157 1.13687e-13 0 6.74806 0 15.1328L0 72.8262C0 81.211 6.27157 87.959 14.0643 87.959L103.749 87.959C111.542 87.959 117.814 81.211 117.814 72.8262L117.814 15.1328C117.814 6.74806 111.542 0 103.749 0ZM26.9895 13.2622L90.8242 13.2622C98.6169 13.2622 104.889 20.0103 104.889 28.3951L104.889 59.5638C104.889 67.9486 98.6169 74.6968 90.8242 74.6968L26.9895 74.6968C19.1968 74.6968 12.9252 67.9486 12.9252 59.5638L12.9252 28.3951C12.9252 20.0103 19.1968 13.2622 26.9895 13.2622Z"/>
-    <path id="rect5167" transform="matrix(0.758527 0 0 0.758527 -4.44089e-15 73.5695)" fill="#eeeeee" d="M5 0C2.23 0 0 2.23 0 5L0 31.125C0 33.895 2.23 36.125 5 36.125L127.938 36.125C130.708 36.125 132.938 33.895 132.938 31.125L132.938 5C132.938 2.23 130.708 0 127.938 0ZM15.375 9C19.5823 9 22.9688 12.0823 22.9688 15.9062C22.9688 19.7302 19.5823 22.8438 15.375 22.8438C11.1677 22.8438 7.75 19.7302 7.75 15.9062C7.75 12.0823 11.1677 9 15.375 9ZM78.0938 9.53125L118.5 9.53125C121.27 9.53125 123.5 11.7613 123.5 14.5312L123.5 16.1875C123.5 18.9575 121.27 21.1875 118.5 21.1875L78.0938 21.1875C75.3237 21.1875 73.0938 18.9575 73.0938 16.1875L73.0938 14.5312C73.0938 11.7613 75.3237 9.53125 78.0938 9.53125Z"/>
-   </g>
-   <path id="path4231" transform="matrix(0.758527 0 0 0.758527 5.33866 4.46648)" fill="url(#gradient0)" d="M102.625 0C45.9507 0 0 47.725 0 106.563C0 110.315 0.1979 114.004 0.5625 117.656C50.6291 136.382 127.144 150.025 205.25 107.063C205.251 106.896 205.25 106.73 205.25 106.563C205.25 47.725 159.299 1.13687e-13 102.625 0Z"/>
-  </g>
- </g>
-</svg>
diff --git a/apps/shorty/index.php b/apps/shorty/index.php
deleted file mode 100644
index 8c729bae14..0000000000
--- a/apps/shorty/index.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file index.php
- * This is the plugins central position
- * All requests to the plugin are handled by this file.
- * Exceptions: system settings, user preferences and relaying
- * @access public
- * @author Christian Reiner
- */
-
-OCP\App::setActiveNavigationEntry ( 'shorty_index' );
-
-OCP\Util::addStyle  ( 'shorty',  'shorty' );
-
-OCP\Util::addScript ( 'shorty/3rdparty','jquery.tinysort.min' );
-OCP\Util::addScript ( 'shorty',  'shorty' );
-OCP\Util::addScript ( 'shorty',  'init' );
-if ( OC_Log::DEBUG==OC_Config::getValue( "loglevel", OC_Log::WARN ) )
-  OCP\Util::addScript ( 'shorty',  'debug' );
-
-// strategy:
-// - first: decide which action is requested
-// - second: execute that action with an optional argument provided
-
-// defaults:
-$act = 'index';
-$arg = NULL;
-// we try to guess what the request indicates:
-// - a (shorty) id to be looked up in the database resulting in a forwarding to the stored target
-// - a (target) url to be added as a new shorty
-// - none of the two, so just a plain list of existing shortys
-foreach ($_GET as $key=>$val) // in case there are unexpected, additional arguments like a timestamp added by some stupid proxy
-{
-  switch ($key)
-  {
-    // this is the OC4 argument used to identify the app called, we ignore it:
-    case 'app':
-      break;
-    // any recognizable argument key indicating a url to be added as new shorty ?
-    case 'url':
-    case 'uri':
-    case 'target':
-    case 'link':
-      // example: http://.../shorty/index.php?url=http%...
-      $act = 'acquire';
-      $arg = OC_Shorty_Type::req_argument($key,OC_Shorty_Type::URL,FALSE);
-      break 2; // skip switch AND foreach
-    // no recognizable key but something else, hm...
-    // this _might_ be some unexcepted argument, or:
-    // it is an expected argument, but without recognizable key, so we try to guess by examining the content
-    // we restrict this 'guessing' to cases where only a single argument is specified
-    default:
-      if (  (1==sizeof($_GET))  // only one single request argument
-          &&( ! reset($_GET)) ) // no value, so maybe just an id
-      {
-        // use that source instead of $key, since $key contains replaced chars (php specific exceptions due to var name problems)
-        $raw = urldecode($_SERVER['QUERY_STRING']);
-        // now try to interpret its content
-        if (NULL!==($value=OC_Shorty_Type::normalize($raw,OC_Shorty_Type::URL,FALSE)))
-        {
-          // the query string is a url, acquire it as a new shorty
-          $act = 'acquire';
-          $arg = $raw;
-          break 2;
-        }
-        else
-        {
-          // no pattern recognized, so we assume an ordinary index action
-          $act = 'index';
-          break 2;
-        }
-      } // if
-      $act='index';
-      break 2;
-  } // switch key
-} // foreach key
-
-// next, execute the "act" whilst considering the 'arg'
-switch ($act)
-{
-  case 'acquire': // add url as new shorty
-    // keep the url specified as referer, that is the one we want to store
-    $_SESSION['shorty-referrer'] = $arg;
-    OCP\Util::writeLog( 'shorty', sprintf("Detected an incoming Shortlet request for url '%s...'",substr($arg,0,80)), OC_Log::INFO );
-    header ( sprintf('Location: %s', OCP\Util::linkTo('shorty','index.php')) );
-    exit();
-  // =====
-  case 'index': // action 'index': list of shortys
-  default:
-    try
-    {
-      // is this a redirect from a call with a target url to be added ? 
-      if ( isset($_SESSION['shorty-referrer']) )
-      {
-        // this takes care of handling the url on the client side
-        OCP\Util::addScript ( 'shorty', 'add' );
-        // add url taked from the session vars to anything contained in the query string
-        $_SERVER['QUERY_STRING'] = implode('&',array_merge(array('url'=>$_SESSION['shorty-referrer']),explode('&',$_SERVER['QUERY_STRING'])));
-      }
-      else
-      {
-        // simple desktop initialization, no special actions contained
-        OCP\Util::addScript ( 'shorty', 'list' );
-      }
-      $tmpl = new OCP\Template( 'shorty', 'tmpl_index', 'user' );
-      // the (remote) base url of the qrcode generator
-      $tmpl->assign ( 'qrcode-url', sprintf('%s?service=%s&url=',OCP\Util::linkToAbsolute("", "public.php"),'shorty_qrcode') );
-      // available status (required for select filter in toolbox)
-      $shorty_status['']=sprintf('- %s -',OC_Shorty_L10n::t('all'));
-      foreach ( OC_Shorty_Type::$STATUS as $status )
-        $shorty_status[$status] = OC_Shorty_L10n::t($status);
-      $tmpl->assign ( 'shorty-status', $shorty_status );
-      // any referrer we want to hand over to the browser ?
-      if ( array_key_exists('shorty-referrer',$_SESSION) )
-        $tmpl->assign ( 'shorty-referrer', $_SESSION['shorty-referrer'] );
-      // is sending sms enabled in the personal preferences ?
-      $tmpl->assign ( 'sms-control', OCP\Config::getUserValue(OCP\User::getUser(),'shorty','sms-control','disabled') );
-      // clean up session var so that a browser reload does not trigger the same action again
-      unset ( $_SESSION['shorty-referrer'] );
-      $tmpl->printPage();
-    } catch ( OC_Shorty_Exception $e ) { OCP\JSON::error ( array ( 'message'=>$e->getTranslation(), 'data'=>$result ) ); }
-} // switch
-
-?>
diff --git a/apps/shorty/js/add.js b/apps/shorty/js/add.js
deleted file mode 100644
index 7b120d888c..0000000000
--- a/apps/shorty/js/add.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file js/add.js
- * @brief Client side desktop initialization in case of a call with an url to add
- * @author Christian Reiner
- */
-
-$(document).ready(function(){
-  // initialize desktop
-  var dialog = $('#dialog-add');
-  $.when(
-    Shorty.WUI.Controls.init()
-  ).pipe(function(){
-    Shorty.WUI.List.build();
-  }).done(function(){
-    $.when(
-      Shorty.WUI.Dialog.toggle(dialog)
-    ).done(function(){
-      // any referrer handed over from php (explicitly in markup) ?
-      var target=$('#controls').attr('data-referrer');
-      $('#controls').removeAttr('data-referrer');
-      dialog.find('#target').val(target);
-      dialog.find('#title').focus();
-      Shorty.WUI.Meta.collect(dialog);
-    })
-  })
-}); // document.ready
diff --git a/apps/shorty/js/debug.js b/apps/shorty/js/debug.js
deleted file mode 100644
index a45819152e..0000000000
--- a/apps/shorty/js/debug.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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 wpayloadanty 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/>.
-*
-*/
-
-/**
- * @file js/debug.js
- * @brief Client side debugging methods
- * The inclusion of these definitions trigger additional debug outputs
- * @author Christian Reiner
- */
-
-$(document).ready(function(){
-  $.extend(Shorty,{
-    Debug:{
-      log: function(issue){
-        switch (typeof(issue)){
-          case 'string':
-            console.log(issue);
-            break;
-          default:
-            console.log(this.dump(issue));
-        } // switch
-      }, // Shorty.Debuglog()
-
-      dump: function(payload,level){
-        var dumped_text = "";
-        if(!level) level = 0;
-        // some padding given at the beginning of the line
-        var level_padding = "";
-        for(var j=0;j<level+1;j++) level_padding += "    ";
-
-        if(typeof(payload) == 'object') {
-          for(var item in payload) {
-            var value = payload[item];
-
-            if(typeof(value) == 'object') {
-              dumped_text += level_padding + "'" + item + "' ...\n";
-              dumped_text += dump(value,level+1);
-            } else {
-              dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n";
-            }
-          }
-        } else { //Stings/Chars/Numbers etc.
-          dumped_text = "==>"+payload+"<==("+typeof(payload)+")";
-        }
-        return dumped_text;
-      } // Shorty.Debug.dump()
-    } // Shorty.Debug
-  });
-});
diff --git a/apps/shorty/js/init.js b/apps/shorty/js/init.js
deleted file mode 100644
index 3ab9fa7091..0000000000
--- a/apps/shorty/js/init.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file js/init.js
- * @brief Client side initialization of desktop actionss
- * @author Christian Reiner
- */
-
-$(document).ready(function(){
-  // make notification closeable
-  $('#content #notification').bind('click',Shorty.WUI.Notification.hide);
-  // button to open the 'add' dialog
-  $('#controls #add').bind('click',function(){Shorty.WUI.Dialog.toggle($('#dialog-add'))});
-  // close button in dialogs
-  $('.shorty-dialog #close').bind('click',function(){Shorty.WUI.Dialog.hide($(this).parents('form').eq(0));});
-  // status selection in embedded share dialog
-  $('.shorty-embedded#dialog-share #status').bind('change',function(){
-    Shorty.Action.Url.status($(this).siblings('#id').val(),$(this).val());
-  });
-  // button to open the tools header row in the list
-  $('#list #titlebar').bind('click',Shorty.WUI.List.Toolbar.toggle);
-  // button to reload the list
-  $('#list #toolbar').find('#reload').bind('click',Shorty.WUI.List.build);
-  // sort buttons
-  $('#list #toolbar').find('shorty-sorter').bind('click',Shorty.WUI.List.sort);
-  // add date picker options
-  $.datepicker.setDefaults({
-    dateFormat :'yy-mm-dd',
-    appendText: "(yyyy-mm-dd)",
-    changeMonth: true,
-    changeYear: true,
-    showOtherMonths: true,
-    selectOtherMonths: true,
-    showOn: 'button',
-    buttonImage: $('#controls').find('#until').eq(0).attr('icon'),
-    buttonImageOnly: true
-  });
-  $('#controls #until:not([readonly])').datepicker();
-  // bind usage to the usage icons
-  $('#dialog-share img.shorty-usage:not(.disabled)').live('click',function(e){Shorty.WUI.Entry.send(e,$(this));});
-  // bind actions to the actions icons
-  $('#list tbody .shorty-actions a').live('click',function(e){Shorty.WUI.Entry.click(e,$(this));});
-  // bind highlighting to clicks on a row, except for the action icons
-  $('#list tbody tr td:not(#actions)').live('click',function(){
-    Shorty.WUI.List.highlight($(this).parents('tr'));
-    Shorty.WUI.Dialog.hide($('.shorty-embedded').eq(0));
-  });
-  // pretty select boxes where applicable (class controlled)
-  $('.chosen').chosen();
-  // title & target filter reaction
-  $('#list thead tr#toolbar').find('th#target,th#title').find('#filter').bind('keyup',function(){
-    Shorty.WUI.List.filter(
-      $($(this).context.parentElement.parentElement).attr('id'),
-      $(this).val()
-    );
-  });
-  // status filter reaction
-  $('#list thead tr#toolbar th#status select').change(function(){
-    Shorty.WUI.List.filter(
-      $(this).parents('th').attr('id'),
-      $(this).find(':selected').val()
-    );
-  });
-  // column sorting reaction
-  $('#list thead tr#toolbar div img.shorty-sorter').bind('click',function(){
-    Shorty.WUI.List.sort($(this).attr('data-sort-code'));
-  });
-}); // document.ready
-
diff --git a/apps/shorty/js/list.js b/apps/shorty/js/list.js
deleted file mode 100644
index 89f319e2e3..0000000000
--- a/apps/shorty/js/list.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file js/list.js
- * @brief Client side desktop initialization for normal calls of the plugin
- * @author Christian Reiner
- */
-
-$(document).ready(function(){
-  // initialize desktop
-  $.when(
-    Shorty.WUI.Controls.init()
-  ).then(function(){
-    Shorty.WUI.List.build();
-  });
-}); // document.ready
diff --git a/apps/shorty/js/preferences.js b/apps/shorty/js/preferences.js
deleted file mode 100644
index 4cda3ab37a..0000000000
--- a/apps/shorty/js/preferences.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file js/preferences.js
- * @brief Client side activity initialization for the user preferences dialog
- * @author Christian Reiner
- */
-
-$(document).ready(function(){
-  // backend preferences, activate hints for currently selected backend
-  var type=$('#shorty #backend-type').val()||'';
-  if (type.length){
-    $('#shorty #backend-'+type).show();
-  }
-  // backend 'static': initialize example that depends on backend-base system setting
-  if ($('#shorty #backend-static #backend-static-base').val().length)
-    $('#shorty #backend-static #example').text($('#shorty #backend-static #backend-static-base').val()+'<shorty id>');
-  // backend 'static': offer a clickable example link to verify the correct setup
-  $('#shorty #backend-static #example').bind('click',function(event){
-    event.preventDefault();
-    Shorty.Action.Setting.verify();
-  });
-  // react with a matching explanation and example url when backend type is chosen
-  $('.chosen').chosen();
-  $('#shorty #backend-type').change(
-    function(){
-      var type=$('#shorty #backend-type').val();
-      $('#shorty .backend-supplement').hide();
-      if (type.length){
-        $('#shorty .backend-supplement').filter('#backend-'+type).fadeIn('slow');
-        // save preference
-        Shorty.Action.Preference.set($('#shorty #backend-type').serialize());
-        return false;
-      }
-    }
-  );
-  // safe preferences
-  $('#shorty .backend-supplement').focusout(function(){
-    // save preference
-    Shorty.Action.Preference.set($(this).find('input').serialize());
-  });
-  // safe sms-control
-  $('#shorty #sms-control').change(function(){
-    Shorty.Action.Preference.set($('#shorty #sms-control').serialize());
-  });
-});
diff --git a/apps/shorty/js/settings.js b/apps/shorty/js/settings.js
deleted file mode 100644
index 254ab4f0c1..0000000000
--- a/apps/shorty/js/settings.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file js/settings.js
- * @brief Client side activity initialization for the system settings dialog
- * @author Christian Reiner
- */
-
-$(document).ready(function(){
-  // initialize example that depends on backend-base
-  if ($('#shorty #backend-static-base').val().length)
-    $('#shorty #backend-static #example').text($('#shorty #backend-static-base').val()+'<shorty id>');
-  // modify example upon input of a base
-  $('#shorty #backend-static-base').bind('input',function(){
-    $('#shorty #backend-static #example').text($('#shorty #backend-static-base').val()+'<shorty id>');
-  });
-  // backend 'static': offer a clickable example link to verify the correct setup
-  $('#shorty #backend-static #example').bind('click',function(event){
-    event.preventDefault();
-    Shorty.Action.Setting.verify();
-  });
-  // store setting
-  $('#shorty #backend-static-base').focusout(function(){
-    // modify example
-    $('#shorty #backend-static #example').text($('#shorty #backend-static-base').val()+'<shorty id>');
-    // save setting
-    Shorty.Action.Setting.set($('#shorty #backend-static-base').serialize());
-    return false;
-  });
-});
diff --git a/apps/shorty/js/shorty.js b/apps/shorty/js/shorty.js
deleted file mode 100644
index 688c3e6e15..0000000000
--- a/apps/shorty/js/shorty.js
+++ /dev/null
@@ -1,1489 +0,0 @@
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file js/shorty.js
- * @brief Client side activity library
- * @author Christian Reiner
- */
-
-// max()-selector
-// usage: var maxWidth = $("a").max(function() {return $(this).width(); });
-$.fn.max = function(selector) {
-  return Math.max.apply(null, this.map(function(index, el) { return selector.apply(el); }).get() );
-}
-// min()-selector
-// usage: var minWidth = $("a").min(function() {return $(this).width(); });
-$.fn.min = function(selector) {
-  return Math.min.apply(null, this.map(function(index, el) { return selector.apply(el); }).get() );
-}
-
-/**
- * @class Shorty
- * @brief Central activity library for the client side
- * @author Christian Reiner
- */
-Shorty =
-{
-  // ===== Shorty.WUI =====
-  WUI:
-  {
-    // ===== Shorty.WUI.Controls =====
-    Controls:
-    {
-      // ===== Shorty.WUI.Controls.init =====
-      init: function(){
-        if (Shorty.Debug) Shorty.Debug.log("init controls");
-        var dfd = new $.Deferred();
-        $.when(
-          Shorty.WUI.Controls.toggle(),
-          Shorty.WUI.Sums.fill()
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Controls.init
-      // ===== Shorty.WUI.Controls.toggle =====
-      toggle: function(){
-        if (Shorty.Debug) Shorty.Debug.log("toggle controls");
-        var dfd = new $.Deferred();
-        Shorty.WUI.Notification.hide();
-        // show or hide dialog
-        var controls = $('#controls');
-        if ( ! controls.is(':visible')){
-          $.when(
-            $.when(
-              controls.slideDown('slow')
-            ).done(Shorty.WUI.Sums.fill)
-          ).done(dfd.resolve)
-        }else{
-          $.when(
-            controls.slideUp('fast')
-          ).done(dfd.resolve)
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.Controls.toggle
-    }, // Shorty.WUI.Controls
-    // ===== Shorty.WUI.Desktop =====
-    Desktop:
-    {
-      // ===== Shorty.WUI.Desktop.show =====
-      show: function(duration){
-        if (Shorty.Debug) Shorty.Debug.log("show desktop");
-        duration = duration || 'slow';
-        var dfd = new $.Deferred();
-        $.when($('#desktop').fadeTo(duration,1.0)).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Desktop.show
-      // ===== Shorty.WUI.Desktop.hide =====
-      hide: function(duration){
-        if (Shorty.Debug) Shorty.Debug.log("hide desktop");
-        duration = duration || 'slow';
-        var dfd = new $.Deferred();
-        $.when($('#desktop').fadeTo(duration,0.3)).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Desktop.hide
-    }, // Shorty.WUI.Desktop
-    // ===== Shorty.WUI.Dialog =====
-    Dialog:
-    {
-      // ===== Shorty.WUI.Dialog.execute =====
-      execute: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("execute dialog "+dialog.attr('id'));
-        var dfd = new $.Deferred();
-        switch ( dialog.attr('id') ){
-          case 'dialog-add':
-            $.when(
-              Shorty.WUI.Notification.hide(),
-              Shorty.Action.Url.add()
-            ).done(dfd.resolve)
-            break;
-          case 'dialog-edit':
-            $.when(
-              Shorty.WUI.Notification.hide(),
-              Shorty.Action.Url.edit()
-            ).done(dfd.resolve)
-            break;
-          case 'dialog-del':
-            $.when(
-              Shorty.WUI.Notification.hide(),
-              Shorty.Action.Url.del()
-            ).done(dfd.resolve)
-            break;
-          default:
-            dfd.resolve();
-        } // switch
-        return dfd.promise();
-      }, // Shorty.WUI.Dialog.execute
-      // ===== Shorty.WUI.Dialog.hide =====
-      hide: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("hide dialog "+dialog.attr('id'));
-        var duration = 'slow';
-        var dfd = new $.Deferred();
-        if (!dialog.is(':visible'))
-          dfd.resolve();
-        else{
-          $.when(
-            dialog.slideUp(duration)
-          ).pipe(function(){
-            switch ( dialog.attr('id') ){
-              case 'dialog-add':
-                dialog.find('#confirm').unbind('click');
-                dialog.find('#target').unbind('focusout');
-                break;
-              default:
-            } // switch
-          }).pipe(function(){
-            if (dialog.hasClass('shorty-standalone'))
-              Shorty.WUI.Desktop.show();
-          }).done(dfd.resolve)
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.Dialog.hide
-      // ===== Shorty.WUI.Dialog.reset =====
-      reset: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("reset dialog "+dialog.attr('id'));
-        var dfd = new $.Deferred();
-        if (dialog){
-          // reset dialog fields
-          $.when(
-            $.each(dialog.find('#status'),function(){
-              if($(this).is('[data]'))
-                   $(this).val($(this).attr('data'));
-              else $(this).val('');
-            }),
-            $.each(dialog.find('input,textarea'),function(){
-              if($(this).is('[data]'))
-                   $(this).val($(this).attr('data')).attr('placeholder',$(this).attr('data'));
-              else $(this).val('').attr('placeholder','');
-            }),
-            $.each(dialog.find('.shorty-value'),function(){
-              if($(this).is('[data]'))
-                   $(this).text($(this).attr('data'));
-              else $(this).text('');
-            }),
-            $.each(dialog.find('.shorty-icon'), function(){
-              if($(this).is('[data]'))
-                   $(this).attr('src',$(this).attr('data'));
-              else $(this).attr('src','');
-            }),
-            Shorty.WUI.Dialog.sharpen(dialog,false)
-          ).done(dfd.resolve)
-        }
-        else
-          dfd.resolve();
-        return dfd.promise();
-      }, // Shorty.WUI.Dialog.reset
-      // ===== Shorty.WUI.Dialog.sharpen =====
-      sharpen: function(dialog,sharpness){
-        if (Shorty.Debug) Shorty.Debug.log("toggle sharpness of dialog '"+dialog.attr('id')+"' to "+sharpness);
-        var confirm=dialog.find('#confirm');
-        if (sharpness){
-          $('#dialog-add #busy').fadeOut('slow');
-          confirm.unbind('click');
-          confirm.bind('click',{dialog: dialog}, function(event){event.preventDefault();Shorty.WUI.Dialog.execute(event.data.dialog);});
-          confirm.addClass('sharp');
-        }else{
-          confirm.unbind('click');
-          confirm.bind('click',function(event){event.preventDefault();dialog.find('#target').effect('highlight',{'color':'#CCCCCC'},500);});
-          confirm.removeClass('sharp');
-        }
-      }, // Shorty.WUI.Dialog.sharpen
-      // ===== Shorty.WUI.Dialog.show =====
-      show: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("show dialog "+dialog.attr('id'));
-        var duration = 'slow';
-        var dfd = new $.Deferred();
-        if (dialog.is(':visible'))
-          // dialog already open, nothing to do...
-          dfd.resolve();
-        else{
-          $('#content form.shorty-dialog').each(function(){
-            Shorty.WUI.Dialog.hide($(this));
-          });
-          // hide 'old' notifications
-          Shorty.WUI.Notification.hide(),
-          // some preparations
-          $.when(
-            function(){
-              var dfd = new $.Deferred();
-              if (dialog.hasClass('shorty-standalone'))
-                $.when(Shorty.WUI.Desktop.hide()).done(dfd.resolve)
-              else dfd.resolve();
-              return dfd.promise();
-            }()
-          ).pipe(function(){
-            // prevent submission before entering anything
-            Shorty.WUI.Dialog.sharpen(dialog,false);
-            // show dialog
-            dialog.slideDown(duration);
-          }).pipe(function(){
-            // initialize dialog actions
-            switch(dialog.attr('id')){
-              case 'dialog-add':
-                dialog.find('#target').focus();
-                dialog.find('#target').bind('focusout', {dialog: dialog}, function(event){Shorty.WUI.Meta.collect(event.data.dialog);});
-                break;
-              case 'dialog-edit':
-                dialog.find('#title').focus();
-                Shorty.WUI.Dialog.sharpen(dialog,true);
-                break;
-            } // switch
-          }).done(dfd.resolve)
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.Dialog.show
-      // ===== Shorty.WUI.Dialog.toggle =====
-      toggle: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("toggle dialog "+dialog.attr('id'));
-        var dfd = new $.Deferred();
-        Shorty.WUI.Notification.hide();
-        // show or hide dialog
-        if ( ! dialog.is(':visible'))
-          $.when(Shorty.WUI.Dialog.show(dialog)).done(dfd.resolve)
-        else
-          $.when(Shorty.WUI.Dialog.hide(dialog)).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Dialog.toggle
-      // ===== Shorty.WUI.Dialog.wipe =====
-      wipe: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("wipe dialog "+dialog.attr('id'));
-        var dfd = new $.Deferred();
-        if (dialog){
-          // wipe dialog fields
-          $.when(
-            $.each(dialog.find('#status'),      function(){$(this).attr('data','blocked');$(this).val('blocked');}),
-            $.each(dialog.find('input'),        function(){$(this).attr('data','');$(this).val('');}),
-            $.each(dialog.find('textarea'),     function(){$(this).attr('data','');$(this).val('');}),
-            $.each(dialog.find('.shorty-value'),function(){$(this).attr('data','');$(this).text('');}),
-            $.each(dialog.find('.shorty-icon'), function(){$(this).attr('data','');$(this).attr('src','');}),
-            Shorty.WUI.Dialog.sharpen(dialog,false)
-          ).done(dfd.resolve)
-        }
-        else
-          dfd.resolve();
-        return dfd.promise();
-      }, // Shorty.WUI.Dialog.wipe
-    }, // Shorty.WUI.Dialog
-    // ===== Shorty.WUI.Entry =====
-    Entry:
-    {
-      // ===== Shorty.WUI.Entry.click =====
-      click: function(event,element){
-        var dfd = new $.Deferred();
-        var entry=element.parents('tr').eq(0);
-        if (Shorty.Debug) Shorty.Debug.log(event.type+" on action "+element.attr('id')+" for entry "+entry.attr('id'));
-        //
-        if ($('.shorty-dialog').is(':visible'))
-          $('.shorty-dialog').each(function(){Shorty.WUI.Dialog.hide($(this));});
-        else{
-          // highlight clicked row as active entry
-          $.when(
-            Shorty.WUI.List.highlight(entry)
-          ).pipe(function(){
-            if ('click'==event.type){
-              switch(element.attr('id')){
-                case 'del':   Shorty.WUI.Entry.del(entry);      break;
-                case 'edit':  Shorty.WUI.Entry.edit(entry);     break;
-                case 'open':  Shorty.Action.Url.forward(entry); break;
-                case 'share': Shorty.WUI.Entry.share(entry);    break;
-                case 'show':  Shorty.WUI.Entry.show(entry);     break;
-              } // switch
-            } // if click
-          }).done(dfd.resolve)
-        } // else
-        return dfd.promise();
-      }, // Shorty.WUI.Entry.click
-      // ===== Shorty.WUI.Entry.del =====
-      del: function(entry){
-        if (Shorty.Debug) Shorty.Debug.log("delete entry "+entry.attr('id'));
-        if (entry.hasClass('deleted')){
-          // change status to deleted
-          Shorty.Action.Url.status(entry.attr('data-id'),'blocked');
-          // mark row as undeleted
-          entry.removeClass('deleted');
-        }else{
-          // change status to deleted
-          Shorty.Action.Url.status(entry.attr('data-id'),'deleted');
-          // mark row as deleted
-          entry.addClass('deleted');
-        }
-      }, // Shorty.WUI.Entry.del
-      // ===== Shorty.WUI.Entry.edit =====
-      edit: function(entry){
-        if (Shorty.Debug) Shorty.Debug.log("modify entry "+entry.attr('id'));
-        var dfd = new $.Deferred();
-        // use the existing edit dialog for this
-        var dialog=$('#controls #dialog-edit');
-        // load entry into dialog
-        dialog.find('#id').val(entry.attr('data-id'));
-        dialog.find('#status').val(entry.attr('data-status')||'');
-        dialog.find('#source').val(entry.attr('data-source'||''));
-        dialog.find('#target').val(entry.attr('data-target'||''));
-        dialog.find('#title').val(entry.attr('data-title')||'');
-        dialog.find('#clicks').val(entry.attr('data-clicks')||'');
-        dialog.find('#created').val(entry.attr('data-created')||'');
-        dialog.find('#accessed').val(entry.attr('data-accessed')||'');
-        dialog.find('#notes').val(entry.attr('data-notes')||'');
-//         dialog.find('#until').datepicker('setDate',new Date(entry.attr('data-until'))||'');
-        dialog.find('#until').datepicker('setDate',new Date(entry.attr('data-until'))||'')
-                             .datepicker('refresh');
-        // open edit dialog
-        Shorty.WUI.Dialog.show(dialog)
-        $.when(
-          Shorty.WUI.Meta.get(entry.attr('data-target'))
-        ).pipe(function(response){
-          var meta=response.data;
-          if (meta.final)
-            dialog.find('#target').val(meta.final);
-          dialog.find('#title').attr('placeholder',meta.title);
-          dialog.find('#meta').fadeTo('fast',0,function(){
-            Shorty.WUI.Meta.reset(dialog);
-            // specify the icons and information to be shown as meta data
-            dialog.find('#staticon').attr('src',meta.staticon);
-            dialog.find('#schemicon').attr('src',meta.schemicon);
-            dialog.find('#favicon').attr('src',meta.favicon);
-            dialog.find('#mimicon').attr('src',meta.mimicon);
-            dialog.find('#explanation').html(meta.title?meta.title:'[ '+meta.explanation+' ]');
-            dialog.find('#meta').fadeTo('fast',1);
-          })
-        }).done(function(){
-          Shorty.WUI.Dialog.sharpen(dialog,true);
-          dfd.resolve();
-        }).fail(function(){
-          Shorty.WUI.Dialog.sharpen(dialog,false);
-          dfd.reject();
-        })
-        return dfd.promise();
-      }, // Shorty.WUI.Entry.edit
-      // ===== Shorty.WUI.Entry.send =====
-      send: function(event,element){
-        var dfd = new $.Deferred();
-        var action=element.attr('id');
-        var entry=element.parents('tr');
-        if (Shorty.Debug) Shorty.Debug.log("send action "+action+" on entry "+entry.attr('data-id'));
-        // take action
-        $.when(
-          Shorty.Action.Url.send(action,entry)
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Entry.send
-      // ===== Shorty.WUI.Entry.share =====
-      share: function(entry){
-        if (Shorty.Debug) Shorty.Debug.log("share entry "+entry.attr('id'));
-        var dfd = new $.Deferred();
-        // use the existing 'share' dialog for this
-        var dialog=$('#dialog-share');
-        // fill and show dialog
-        dialog.find('#id').val(entry.attr('data-id'))
-                           .attr('data',entry.attr('data-id'));
-        dialog.find('#source').attr('href',entry.attr('data-source'))
-                              .text(entry.attr('data-source'));
-        dialog.find('#relay').attr('href',entry.attr('data-relay'))
-                              .text(entry.attr('data-relay'));
-        dialog.find('#target').attr('href',entry.attr('data-target'))
-                              .text(entry.attr('data-target'));
-        dialog.find('#status').attr('value',entry.attr('data-status'))
-                              .attr('data',entry.attr('data-status'));
-        // move 'share' dialog towards entry
-        dialog.appendTo(entry.find('td#actions')),
-        // open dialog
-        $.when(
-          Shorty.WUI.Dialog.show(dialog)
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Entry.share
-      // ===== Shorty.WUI.Entry.show =====
-      show: function(entry){
-        if (Shorty.Debug) Shorty.Debug.log("show entry "+entry.attr('id'));
-        var dfd = new $.Deferred();
-        // use the existing edit dialog for this
-        var dialog=$('#controls #dialog-show');
-        // load entry into dialog
-        dialog.find('#id').attr('data-id',entry.attr('data-id')).val(entry.attr('data-id'));
-        dialog.find('#status').attr('data-status',entry.attr('data-status')||'').val(t('shorty',entry.attr('data-status'))||'');
-        dialog.find('#source').attr('data-source',entry.attr('data-source')).val(entry.attr('data-source'));
-        dialog.find('#target').attr('data-target',entry.attr('data-target')).val(entry.attr('data-target'));
-        dialog.find('#title').attr('data-title',entry.attr('data-title')).val(entry.attr('data-title'));
-        dialog.find('#until').attr('data-until',entry.attr('data-until')||'').val(entry.attr('data-until')||'');
-        dialog.find('#clicks').attr('data-clicks',entry.attr('data-clicks')||'').val(entry.attr('data-clicks')||'');
-        dialog.find('#created').attr('data-created',entry.attr('data-created')||'').val(entry.attr('data-created')||'');
-        dialog.find('#accessed').attr('data-accessed',entry.attr('data-accessed')||'').val(entry.attr('data-accessed')||'');
-        dialog.find('#notes').attr('data-notes',entry.attr('data-notes')).val(entry.attr('data-notes'));
-        // open edit dialog
-        Shorty.WUI.Dialog.show(dialog)
-        $.when(
-          Shorty.WUI.Meta.get(entry.attr('data-target'))
-        ).pipe(function(response){
-          var meta=response.data;
-          if (meta.final)
-            dialog.find('#target').val(meta.final);
-          dialog.find('#title').attr('placeholder',meta.title);
-          dialog.find('#meta').fadeTo('fast',0,function(){
-            Shorty.WUI.Meta.reset(dialog);
-            // specify the icons and information to be shown as meta data
-            dialog.find('#staticon').attr('src',meta.staticon);
-            dialog.find('#schemicon').attr('src',meta.schemicon);
-            dialog.find('#favicon').attr('src',meta.favicon);
-            dialog.find('#mimicon').attr('src',meta.mimicon);
-            dialog.find('#explanation').html(meta.title?meta.title:'[ '+meta.explanation+' ]');
-            dialog.find('#meta').fadeTo('fast',1);
-          })
-        }).done(function(){
-          dfd.resolve();
-        }).fail(function(){
-          dfd.reject();
-        })
-        return dfd.promise();
-      } // Shorty.WUI.Entry.show
-    }, // Shorty.WUI.Entry
-    // ===== Shorty.WUI.Hourglass =====
-    // Shorty.WUI.Hourglass
-    Hourglass:
-    {
-      // ===== Shorty.WUI.Hourglass.toggle =====
-      toggle: function(show){
-        if (Shorty.Debug) Shorty.Debug.log("toggle hourglass to "+show?"true":"false");
-        var dfd = new $.Deferred();
-        var hourglass = $('#desktop .shorty-hourglass');
-        if (show){
-          if (hourglass.is(':visible'))
-            dfd.resolve();
-          else
-            $.when(
-              hourglass.fadeIn('fast')
-            ).done(dfd.resolve)
-        }else{
-          if (!hourglass.is(':visible'))
-            dfd.resolve();
-          else
-            $.when(
-              hourglass.fadeOut('slow')
-            ).done(dfd.resolve)
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.Hourglass.toggle
-    }, // Shorty.WUI.Hourglass
-    // ===== Shorty.WUI.List =====
-    List:
-    {
-      // ===== Shorty.WUI.List.add =====
-      add: function(list,hidden){
-        if (Shorty.Debug) Shorty.Debug.log("add entry to list holding "+list.length+" entries");
-        var dfd = new $.Deferred();
-        // insert list elements (sets) one by one
-        var row,set;
-        $.each(list,function(i,set){
-          // clone dummy row from list header: dummy is the last row
-          row = $('#desktop #list thead tr:last-child').eq(0).clone();
-          // set row id to entry id
-          row.attr('id',set.id);
-          // add attributes to row, as data and value
-          $.each(['id','status','title','source','relay','target','clicks','created','accessed','until','notes','favicon'],
-                 function(j,aspect){
-            if (hidden)
-              row.addClass('shorty-fresh'); // might lead to a pulsate effect later
-            // we wrap the cells content into a span tag
-            var span=$('<span>');
-            // enhance row with real set values
-            if ('undefined'==set[aspect])
-                 row.attr('data-'+this,'');
-            else row.attr('data-'+this,set[aspect]);
-            // fill data into corresponsing column
-            var title, content, classes=[];
-            switch(aspect)
-            {
-              case 'favicon':
-                span.html('<img class="shorty-icon" width="16" src="'+set[aspect]+'">');
-                break;
-              case 'until':
-                if (null==set[aspect])
-                  span.text('-never-');
-                else{
-                  span.text(set[aspect]);
-                  if (Shorty.Date.expired(set[aspect]))
-                    row.addClass('shorty-expired');
-                }
-                break;
-              case 'title':
-                span.text(set[aspect]);
-                span.addClass('ellipsis');
-                break;
-              case 'target':
-                span.text(set[aspect]);
-                span.attr('title',set[aspect]);
-                span.addClass('ellipsis');
-                break;
-              case 'status':
-                if ('deleted'==set[aspect])
-                  row.addClass('deleted');
-//                 span.text(set[aspect]);
-                span.text(t('shorty',set[aspect]));
-                break;
-              default:
-                span.text(set[aspect]);
-            } // switch
-            row.find('td#'+aspect).empty().append(span);
-          }) // each aspect
-          // insert new row in table
-          $('#desktop #list tbody').prepend(row);
-        }) // each
-        return dfd.promise();
-      }, // Shorty.WUI.List.add
-      // ===== Shorty.WUI.List.build =====
-      build: function()
-      {
-        if (Shorty.Debug) Shorty.Debug.log("build list");
-        var dfd = new $.Deferred();
-        // prepare loading
-        $.when(
-          Shorty.WUI.Hourglass.toggle(true),
-          Shorty.WUI.List.dim(false)
-        ).done(function(){
-          // retrieve new entries
-          $.when(
-            Shorty.WUI.List.get()
-          ).pipe(function(response){
-            Shorty.WUI.List.fill(response.data);
-          }).done(function(){
-            $.when(
-              Shorty.WUI.List.show(),
-              Shorty.WUI.List.dim(true)
-            ).always(function(){
-              Shorty.WUI.Hourglass.toggle(false)
-              dfd.resolve();
-            })
-          }).fail(function(){
-            dfd.reject();
-          })
-        })
-        return dfd.promise();
-      }, // Shorty.WUI.List.build
-      // ===== Shorty.WUI.List.dim =====
-      dim: function(show){
-        if (Shorty.Debug) Shorty.Debug.log("dim list to "+(show?"true":"false"));
-        var duration='slow';
-        var dfd =new $.Deferred();
-        var list=$('#desktop #list');
-        var body=list.find('tbody');
-        if (show)
-        {
-          var rows=body.find('tr.shorty-fresh');
-          Shorty.WUI.List.highlight(rows.eq(0));
-          rows.each(function(){
-            $(this).removeClass('shorty-fresh');
-            $(this).find('td').effect('pulsate');
-          });
-          $.when(
-            Shorty.WUI.List.vacuum(),
-            body.fadeIn(duration)
-          ).done(dfd.resolve)
-        }else{
-          if (!body.is(':visible'))
-            dfd.resolve();
-          else
-          {
-            $.when(
-              body.fadeOut(duration)
-            ).done(dfd.resolve)
-          }
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.List.dim
-      // ===== Shorty.WUI.List.empty =====
-      empty: function(){
-        if (Shorty.Debug) Shorty.Debug.log("empty list");
-        var dfd = new $.Deferred();
-        // move embedded dialogs back to their safe place in the controls
-        $('.shorty-embedded').appendTo($('#controls #dialog-show'));
-        // remove all rows, one by one
-        $.when(
-          $('#desktop').find('#list tbody tr').each(function(){
-            if(''!=$(this).attr('id'))
-              $(this).remove();
-          })
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.List.empty
-      // ===== Shorty.WUI.List.fill =====
-      fill: function(list){
-        if (Shorty.Debug) Shorty.Debug.log("fill list");
-        var dfd = new $.Deferred();
-        $.when(
-          Shorty.WUI.Sums.fill(),
-          Shorty.WUI.List.empty(),
-          Shorty.WUI.List.add(list,false)
-        ).pipe(
-          // filter list
-          Shorty.WUI.List.filter('target',$('#list thead tr#toolbar th#target #filter').val()),
-          Shorty.WUI.List.filter('title', $('#list thead tr#toolbar th#title #filter').val()),
-          Shorty.WUI.List.filter('status',$('#list thead tr#toolbar th#status select :selected').val())
-        ).pipe(
-          // sort list
-          $.when(
-            Shorty.Action.Preference.get('list-sort-code')
-          ).done(function(pref){
-            Shorty.WUI.List.sort(pref['list-sort-code']);
-          })
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.List.fill
-      // ===== Shorty.WUI.List.filter =====
-      filter: function(column,pattern){
-        if (Shorty.Debug) Shorty.Debug.log("filter list by column "+column);
-        var dfd = new $.Deferred();
-        $.when(
-          $('#list tbody tr').filter(function(){
-            return (-1==$(this).find('td#'+column+' span').text().toLowerCase().indexOf(pattern.toLowerCase()));
-          }).addClass('shorty-filtered'),
-          $('#list tbody tr').not(function(){
-            return (-1==$(this).find('td#'+column+' span').text().toLowerCase().indexOf(pattern.toLowerCase()));
-          }).removeClass('shorty-filtered')
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.List.filter
-      // ===== Shorty.WUI.List.get =====
-      get: function(){
-        if (Shorty.Debug) Shorty.Debug.log("get list");
-        var dfd = new $.Deferred();
-        $.when(
-          $.ajax({
-            type:  'GET',
-            url:   OC.filePath('shorty','ajax','list.php'),
-            cache: false
-          }).pipe(
-            function(response){return Shorty.Ajax.eval(response)},
-            function(response){return Shorty.Ajax.fail(response)}
-          )
-        ).done(function(response){
-          dfd.resolve(response);
-        }).fail(function(response){
-          dfd.reject(response);
-        })
-        return dfd.promise();
-      }, // Shorty.WUI.List.get
-      // ===== Shorty.WUI.List.hide =====
-      hide: function(duration){
-        if (Shorty.Debug) Shorty.Debug.log("hide list");
-        duration = 'slow';
-        var dfd = new $.Deferred();
-        var list = $('#desktop #list');
-        if ( ! list.is(':visible'))
-          dfd.resolve();
-        else
-        {
-          $.when(
-            list.fadeOut(duration)
-          ).done(dfd.resolve)
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.List.hide
-      // ===== Shorty.WUI.List.highlight =====
-      highlight: function(entry){
-        if (Shorty.Debug) Shorty.Debug.log("highlighting list entry "+entry.attr('id'));
-        var dfd = new $.Deferred();
-        // close any open embedded dialog
-        $.when(
-          Shorty.WUI.Dialog.hide($('.shorty-dialog'))
-        ).pipe(function(){
-          // neutralize all rows that might have been highlighted
-          $('#desktop #list tr').removeClass('clicked');
-          entry.addClass('clicked');
-        }).always(dfd.resolve);
-        return dfd.promise();
-      }, // Shorty.WUI.List.highlight
-      // ===== Shorty.WUI.List.modify =====
-      modify: function(list,hidden){
-        if (Shorty.Debug) Shorty.Debug.log("modify entry in list holding "+list.length+" entries");
-        var dfd = new $.Deferred();
-        // modify list elements (sets) one by one
-        var row,set;
-        $.each(list,function(i,set){
-          // select row from list by id
-          row=$('#desktop #list tbody tr#'+set.id);
-          // modify attributes in row, as data and value
-          $.each(['status','title','until','notes'],
-                 function(j,aspect){
-            if (set[aspect]){
-              // enhance row with actual set values
-              row.attr('data-'+this,set[aspect]);
-              if (hidden) row.addClass('shorty-fresh');
-              // fill data into corresponsing column
-              var content, classes=[];
-              switch(aspect)
-              {
-                case 'until':
-                  if (null==set[aspect])
-                    content='-never-';
-                  else{
-                    content=set[aspect];
-                    if (Shorty.Date.expired(set[aspect]))
-                      row.addClass('shorty-expired');
-                  }
-                  break;
-                case 'title':
-                  classes.push('ellipsis');
-                  content=set[aspect];
-                  break;
-                case 'status':
-                  if ('deleted'==set[aspect])
-                    row.addClass('deleted');
-                  content=set[aspect];
-                  break;
-                default:
-                  content=set[aspect];
-              } // switch
-              // show modified column immediately or keep it for a later pulsation effect ?
-              row.find('td').filter('#'+aspect).html('<span class="'+classes.join(' ')+'">'+content+'</span>');
-            } // if aspect
-          }) // each aspect
-        }) // each entry
-        return dfd.resolve().promise();
-      }, // Shorty.WUI.List.modify
-      // ===== Shorty.WUI.List.show =====
-      show: function(duration){
-        if (Shorty.Debug) Shorty.Debug.log("show list");
-        duration = 'slow';
-        var dfd = new $.Deferred();
-        var list = $('#desktop #list');
-        if (list.is(':visible'))
-          dfd.resolve();
-        else
-        {
-          // list currently not visible, show it
-          $.when(
-            list.find('tbody').show(),
-            list.fadeIn(duration)
-          ).done(function(){
-            dfd.resolve();
-            Shorty.WUI.List.vacuum();
-          })
-        }
-        return dfd.promise();
-      }, // Shorty.WUI.List.show
-      // ===== Shorty.WUI.List.sort =====
-      sort: function(sortCode){
-        sortCore = sortCode || 'cd';
-        var icon=$('#list thead tr#toolbar th div img[data-sort-code="'+sortCode+'"]');
-        var sortCol=icon.parents('th').attr('id');
-        var sortDir=icon.attr('data-sort-direction');
-        if (Shorty.Debug) Shorty.Debug.log("sorting list column "+sortCol+" "+(sortDir=='asc'?'ascending':'descending'));
-        // use the 'tinysort' jquery plugin for sorting
-        switch (sortCol){
-          case 'until':
-            $('#list tbody>tr').tsort('td#until',{order:sortDir});
-            break;
-          default:
-            $('#list tbody>tr').tsort({attr:'data-'+sortCol,order:sortDir});
-        } // switch 
-        // mark currently active sort icon
-        var icons=$('#list thead tr#toolbar img.shorty-sorter');
-        icons.removeClass('shorty-active');
-        icons.filter('[data-sort-code="'+sortCode+'"]').addClass('shorty-active');
-        // store the sorting code as preference, for returning list retrievals
-        Shorty.Action.Preference.set({'list-sort-code':sortCode});
-      }, // Shorty.WUI.List.sort
-      // ===== Shorty.WUI.List.toggle =====
-      toggle: function(duration){
-        if (Shorty.Debug) Shorty.Debug.log("toggle list");
-        duration = 'slow';
-        var dfd = new $.Deferred();
-        if (list.is(':visible'))
-          return Shorty.WUI.List.hide();
-        else
-          return Shorty.WUI.List.show();
-      }, // Shorty.WUI.List.toggle
-      // ===== Shorty.WUI.List.vacuum =====
-      vacuum: function(){
-        if (Shorty.Debug) Shorty.Debug.log("vacuum list");
-        // list is empty if no row exists
-        if (0!=$('#list tbody').find('tr').length)
-          $('#vacuum').fadeOut('fast');
-        else
-          $('#vacuum').fadeIn('slow');
-      }, // Shorty.WUI.List.vacuum
-      // ===== Shorty.WUI.List.Toolbar =====
-      Toolbar:
-      {
-        // ===== Shorty.WUI.List.Toolbar.toggle =====
-        toggle: function(duration){
-          if (Shorty.Debug) Shorty.Debug.log("toggle list toolbar");
-          duration = duration || 'slow';
-          var button=$('#list #tools');
-          var toolbar=$('#list #toolbar');
-          var dfd = new $.Deferred();
-          if (!toolbar.find('div').is(':visible')){
-            // tool NOT visible: open toolbar
-            $.when(
-              toolbar.find('div').slideDown(duration)
-              ).pipe(
-              button.attr('src',button.attr('data-minus'))
-            ).done(dfd.resolve)
-          }else{ // toolbar IS visible
-            // any filters active? prevent closing of toolbar !
-            if (  (  (toolbar.find('th#title,#target').find('div input#filter:[value!=""]').length)
-                   &&(toolbar.find('th#title,#target').find('div input#filter:[value!=""]').effect('pulsate')) )
-                ||(  (toolbar.find('th#status select :selected').val())
-//                   &&(toolbar.find('#status div.chzn-container').effect('pulsate')) )
-                   &&(toolbar.find('#status').effect('pulsate')) )
-               ) {
-              if (Shorty.Debug) Shorty.Debug.log('active filter prevents closing of toolbar');
-            }else{
-              // close toolbar
-              $.when(
-                toolbar.find('div').slideUp(duration)
-              ).pipe(
-                button.attr('src',button.attr('data-plus'))
-              ).done(dfd.resolve)
-            }
-          }
-          return dfd.promise();
-        }, // Shorty.WUI.List.Toolbar.toggle
-      }, // Shorty.WUI.List.Toolbar
-    }, // Shorty.WUI.List
-    // ===== Shorty.WUI.Notification =====
-    Notification:
-    {
-      // ===== Shorty.WUI.Notification.hide =====
-      hide: function(){
-        if (Shorty.Debug) Shorty.Debug.log("hide notification");
-        var dfd = new $.Deferred();
-        $.when(
-          $('#notification').slideUp('fast')
-        ).pipe(function(){
-          $('#notification').text('');
-        }).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Notification.hide
-      // ===== Shorty.WUI.Notification.show =====
-      show: function(message,level){
-        if (Shorty.Debug) Shorty.Debug.log("show notification with level "+level);
-        level = level || 'info';
-        var dfd = new $.Deferred();
-        var duration = 'slow';
-        var notification = $('#notification');
-        if (message && message.length){
-          $.when(
-            notification.slideUp('fast')
-          ).done(function(){
-            switch(level){
-              case 'debug':
-                // detect debug mode by checking, of function 'debug()' exists
-                if ( Shorty.Debug ){
-                  Shorty.Debug.log('Debug: '+message);
-                  $.when(
-                    notification.attr('title', 'debug message'),
-                    notification.text('Debug: '+message),
-                    notification.slideDown(duration)
-                  ).done(dfd.resolve)
-                }
-                else
-                  dfd.resolve();
-                break;
-              case 'error':
-                if (Shorty.Debug)
-                  Shorty.Debug.log('Error: '+message);
-                $.when(
-                  notification.attr('title', 'error message'),
-                  notification.text('Error: ' + message),
-                  notification.slideDown(duration)
-                ).done(dfd.resolve)
-                break;
-              default: // 'info'
-                if ( message.length ){
-                  if (Shorty.Debug)
-                    Shorty.Debug.log('Info: '+message);
-                  $.when(
-                    notification.text(message),
-                    notification.slideDown(duration)
-                  ).done(dfd.resolve)
-                }else{
-                  $.when(
-                    notification.text('')
-                  ).done(dfd.resolve)
-                }
-            } // switch
-          })
-        } // if message
-        return dfd.promise();
-      }, // Shorty.WUI.Notification.show
-    }, // Shorty.WUI.Notification
-    // ===== Shorty.WUI.Meta: =====
-    Meta:
-    {
-      // ===== Shorty.WUI.Meta.collect =====
-      collect: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("collect meta data");
-        var dfd = new $.Deferred();
-        var target = $('#dialog-add #target').val().trim();
-        // don't bother getting active on empty input
-        if ( ! target.length ){
-          dialog.find('#target').focus();
-          dfd.resolve();
-          return dfd.promise();
-        }
-        // start expressing activity
-        $('#dialog-add #busy').fadeIn('fast');
-        // fill in fallback protocol scheme 'http' if none is specified
-        var regexp = /^[a-zA-Z0-9]+\:\//;
-        if ( ! regexp.test(target) ){
-          target = 'http://' + target;
-          dialog.find('#target').val(target);
-        }
-        // query meta data from target
-        $.when(
-          Shorty.WUI.Meta.get(target)
-        ).done(function(response){
-          var meta=response.data;
-          if (meta.final)
-            dialog.find('#target').val(meta.final);
-          dialog.find('#title').attr('placeholder',meta.title);
-          dialog.find('#meta').fadeTo('fast',0,function(){
-            Shorty.WUI.Meta.reset(dialog);
-            // specify the icons and information to be shown as meta data
-            dialog.find('#staticon').attr('src',meta.staticon);
-            dialog.find('#schemicon').attr('src',meta.schemicon);
-            dialog.find('#favicon').attr('src',meta.favicon);
-            dialog.find('#mimicon').attr('src',meta.mimicon);
-            dialog.find('#explanation').html(meta.title?meta.title:'[ '+meta.explanation+' ]');
-            dialog.find('#meta').fadeTo('fast',1);
-            Shorty.WUI.Dialog.sharpen(dialog,true);
-            // stop expressing activity
-            $('#dialog-add #busy').fadeOut('slow');
-          });
-          dfd.resolve(response);
-        }).fail(function(reponse){
-          Shorty.WUI.Dialog.sharpen(dialog,false);
-          dfd.reject(response);
-        })
-        return dfd.promise();
-      }, // Shorty.WUI.Meta.collect
-      // ===== Shorty.WUI.Meta.get =====
-      get: function(target){
-        if (Shorty.Debug) Shorty.Debug.log("get meta data for target "+target);
-        var dfd = new $.Deferred();
-        $.ajax({
-          type:  'GET',
-          url:   OC.filePath('shorty','ajax','meta.php'),
-          cache: false,
-          data:  { target: encodeURIComponent(target) }
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response);},
-          function(response){return Shorty.Ajax.fail(response);}
-        ).done(function(response){
-          dfd.resolve(response);
-        }).fail(function(response){
-          dfd.reject(response);
-        })
-        return dfd.promise();
-      }, // Shorty.WUI.Meta.get
-      // ===== Shorty.WUI.Meta.reset =====
-      reset: function(dialog){
-        if (Shorty.Debug) Shorty.Debug.log("reset meta data");
-        dialog.find('#staticon').attr('src',dialog.find('#staticon').attr('data'));
-        dialog.find('#schemicon').attr('src',dialog.find('#schemicon').attr('data'));
-        dialog.find('#favicon').attr('src',dialog.find('#favicon').attr('data'));
-        dialog.find('#mimicon').attr('src',dialog.find('#mimicon').attr('data'));
-        dialog.find('#explanation').html(dialog.find('#explanation').attr('data'));
-        dialog.find('#meta').fadeTo('fast',1);
-      }, // Shorty.WUI.Meta.reset
-    }, // Shorty.WUI.Meta
-    // ===== Shorty.WUI.Sums =====
-    Sums:
-    {
-      // ===== Shorty.WUI.Sums.fill =====
-      fill: function(){
-        if (Shorty.Debug) Shorty.Debug.log("fill sums");
-        var dfd = new $.Deferred();
-        $.when(
-          // update (set) sum values in the control bar
-          Shorty.WUI.Sums.get(function(data){
-            $('#controls #sum_shortys').text(data.sum_shortys);
-            $('#controls #sum_clicks').text(data.sum_clicks);
-          })
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.WUI.Sums.fill
-      // ===== Shorty.WUI.Sums.get =====
-      get: function(callback){
-        if (Shorty.Debug) Shorty.Debug.log("get sums");
-        var dfd = new $.Deferred();
-        $.when(
-          $.ajax({
-            type:  'GET',
-            url:   OC.filePath('shorty','ajax','count.php'),
-            cache: false,
-            data:  { }
-          }).pipe(
-            function(response){return Shorty.Ajax.eval(response)},
-            function(response){return Shorty.Ajax.fail(response)}
-          )
-        ).done(function(response){
-          if (callback) callback(response.data);
-          dfd.resolve(response);
-        }).fail(function(response){
-          dfd.reject(response);
-        })
-        return dfd.promise();
-      }, // Shorty.WUI.Sums.get
-    }, // Shorty.WUI.Sums
-  }, // Shorty.WUI
-
-  //==========
-
-  Action:
-  {
-    // ===== Shorty.Action.Preference =====
-    Preference:
-    {
-      // ===== Shorty.Action.Preference.get =====
-      get:function(data){
-        if (Shorty.Debug){Shorty.Debug.log("get preference(s):");Shorty.Debug.log(data);}
-        var dfd = new $.Deferred();
-        $.ajax({
-          type:  'GET',
-          url:   OC.filePath('shorty','ajax','preferences.php'),
-          cache: false,
-          data:  data
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response)},
-          function(response){return Shorty.Ajax.fail(response)}
-        ).always(function(response){
-          if (Shorty.Debug){Shorty.Debug.log("got preference(s):");Shorty.Debug.log(response.data);}
-        }).done(function(response){
-          dfd.resolve(response.data);
-        }).fail(function(response){
-          dfd.reject({});
-        })
-        return dfd.promise();
-      }, // Shorty.Action.Preference.get
-      // ===== Shorty.Action.Preference.set =====
-      set:function(data){
-        if (Shorty.Debug){Shorty.Debug.log("set preference(s):");Shorty.Debug.log(data);}
-        var dfd = new $.Deferred();
-        $.ajax({
-          type:  'POST',
-          url:   OC.filePath('shorty','ajax','preferences.php'),
-          cache: false,
-          data:  data
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response)},
-          function(response){return Shorty.Ajax.fail(response)}
-        ).always(function(response){
-          if (Shorty.Debug){Shorty.Debug.log("got preference(s):");Shorty.Debug.log(response.data);}
-        }).done(function(response){
-          dfd.resolve(response.data);
-        }).fail(function(response){
-          dfd.reject({});
-        })
-        return dfd.promise();
-      }, // Shorty.Action.Preference.set
-    }, // Shorty.Action.Preference
-    // ===== Shorty.Action.Setting =====
-    Setting:
-    {
-      // ===== Shorty.Action.Setting.get =====
-      get:function(data){
-        if (Shorty.Debug){Shorty.Debug.log("get setting(s):");Shorty.Debug.log(data);}
-        var dfd = new $.Deferred();
-        $.ajax({
-          type:  'GET',
-          url:   OC.filePath('shorty','ajax','settings.php'),
-          cache: false,
-          data:  data
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response)},
-          function(response){return Shorty.Ajax.fail(response)}
-        ).always(function(response){
-          if (Shorty.Debug){Shorty.Debug.log("got preference(s):");Shorty.Debug.log(response.data);}
-        }).done(function(response){
-          dfd.resolve(response.data);
-        }).fail(function(response){
-          dfd.reject({});
-        })
-        return dfd.promise();
-      }, // Shorty.Action.Setting.get
-      // ===== Shorty.Action.Setting.set =====
-      set:function(data){
-        if (Shorty.Debug){Shorty.Debug.log("set setting(s):");Shorty.Debug.log(data);}
-        var dfd = new $.Deferred();
-        $.ajax({
-          type:  'POST',
-          url:   OC.filePath('shorty','ajax','settings.php'),
-          cache: false,
-          data:  data
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response)},
-          function(response){return Shorty.Ajax.fail(response)}
-        ).always(function(response){
-          if (Shorty.Debug){Shorty.Debug.log("got preference(s):");Shorty.Debug.log(response.data);}
-        }).done(function(response){
-          dfd.resolve(response.data);
-        }).fail(function(response){
-          dfd.reject({});
-        })
-        return dfd.promise();
-      }, // Shorty.Action.Setting.set
-      // ===== Shorty.Action.Setting.popup =====
-      popup:{},
-      // ===== Shorty.Action.Setting.verify =====
-      verify:function(){
-        if (!Shorty.Action.Setting.popup.dialog){
-         Shorty.Action.Setting.popup=$('#shorty #dialog-verification');
-         Shorty.Action.Setting.popup.dialog({show:'fade',autoOpen:false,modal:true});
-         Shorty.Action.Setting.popup.dialog('option','minHeight',240 );
-        }
-        var dfd = new $.Deferred();
-        $.when(
-          this.check(Shorty.Action.Setting.popup,
-                     $('#shorty #backend-static #backend-static-base').val())
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // Shorty.Action.Setting.verify
-      // ===== Shorty.Action.Setting.check =====
-      check:function(popup,target){
-        popup.find('#verification-target').text(target);
-        popup.dialog('open');
-        popup.find('#success').hide();
-        popup.find('#failure').hide();
-        popup.find('#hourglass').fadeIn('fast');
-        var dfd = new $.Deferred();
-        $.ajax({
-          // the '0000000000' below is a special id recognized for testing purposes
-          url:     target+'0000000000',
-          cache:   false,
-          data:    { },
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response)},
-          function(response){return Shorty.Ajax.fail(response)}
-        ).done(function(response){
-          $.when(
-            popup.find('#hourglass').fadeOut('fast')
-          ).then(function(){
-            popup.find('#success').fadeIn('fast');
-            dfd.resolve(response);
-          })
-        }).fail(function(response){
-          $.when(
-            popup.find('#hourglass').fadeOut('fast')
-          ).then(function(){
-            popup.find('#failure').fadeIn('fast');
-            dfd.reject(response);
-          })
-        })
-        return dfd.promise();
-      } // Shorty.Action.Setting.check
-    }, // Shorty.Action.Setting
-    // ===== Shorty.Action.Url =====
-    Url:
-    {
-      // ===== Shorty.Action.Url.add =====
-      add:function(){
-        if (Shorty.Debug) Shorty.Debug.log("action add url");
-        var dfd=new $.Deferred();
-        var dialog=$('#dialog-add');
-        var status=dialog.find('#status').val()||'public';
-        var target=dialog.find('#target').val()||'';
-        var title =dialog.find('#title').val()||'';
-        var notes =dialog.find('#notes').val()||'';
-        var until =dialog.find('#until').val()||'';
-        // store favicon from meta data, except it is the internal default blank
-        var favicon = dialog.find('#meta #favicon').attr('src');
-        favicon=(favicon==dialog.find('#meta #favicon').attr('data'))?'':favicon;
-        // perform upload of new shorty
-        $.when(
-          Shorty.WUI.Notification.hide(),
-          // close and neutralize dialog
-          Shorty.WUI.Dialog.hide(dialog),
-          Shorty.WUI.List.dim(false),
-          Shorty.WUI.List.show()
-        ).done(function(){
-          var data={status:  status,
-                    target:  target,
-                    title:   title,
-                    notes:   notes,
-                    until:   until,
-                    favicon: favicon};
-          if (Shorty.Debug) Shorty.Debug.log(data);
-          $.ajax({
-            type:  'POST',
-            url:   OC.filePath('shorty','ajax','add.php'),
-            cache: false,
-            data:  data
-          }).pipe(
-            function(response){return Shorty.Ajax.eval(response)},
-            function(response){return Shorty.Ajax.fail(response)}
-          ).done(function(response){
-            // wipe entries in dialog
-            Shorty.WUI.Dialog.reset(dialog)
-          }).done(function(response){
-            // add shorty to existing list
-            Shorty.WUI.List.add([response.data],true);
-            Shorty.WUI.List.dim(true)
-            dfd.resolve(response);
-          }).fail(function(response){
-            Shorty.WUI.List.dim(true)
-            dfd.reject(response);
-          })
-        })
-        return dfd.promise();
-      }, // ===== Shorty.Action.Url.add =====
-      // ===== Shorty.Action.Url.edit =====
-      edit: function(){
-        if (Shorty.Debug) Shorty.Debug.log("action modify url");
-        var dfd=new $.Deferred();
-        var dialog=$('#dialog-edit');
-        var id    =dialog.find('#id').val();
-        var status=dialog.find('#status').val()||'blocked';
-        var title =dialog.find('#title').val()||'';
-        var until =dialog.find('#until').val()||'';
-        var notes =dialog.find('#notes').val()||'';
-        // perform modification of existing shorty
-        $.when(
-          Shorty.WUI.Notification.hide(),
-          // close and neutralize dialog
-          Shorty.WUI.Dialog.hide(dialog),
-          Shorty.WUI.List.dim(false),
-          Shorty.WUI.List.show()
-        ).done(function(){
-          var data={id: id,
-                    status: status,
-                    title:  title,
-                    notes:  notes,
-                    until:  until};
-          if (Shorty.Debug) Shorty.Debug.log(data);
-          $.ajax({
-            type:  'POST',
-            url:   OC.filePath('shorty','ajax','edit.php'),
-            cache: false,
-            data:  data,
-          }).pipe(
-            function(response){return Shorty.Ajax.eval(response)},
-            function(response){return Shorty.Ajax.fail(response)}
-          ).done(function(response){
-            // wipe entries in dialog
-            Shorty.WUI.Dialog.reset(dialog);
-            // modify existing entry in list
-            Shorty.WUI.List.modify([response.data],true);
-            Shorty.WUI.List.dim(true)
-            dfd.resolve(response);
-          }).fail(function(response){
-            dfd.reject(response);
-          })
-        })
-        return dfd.promise();
-      }, // ===== Shorty.Action.Url.edit =====
-      // ===== Shorty.Action.Url.del =====
-      del: function(){
-        if (Shorty.Debug) Shorty.Debug.log("action delete url");
-        var dfd = new $.Deferred();
-        var dialog = $('#dialog-edit');
-        var id     = dialog.find('#id').val();
-        $.when(
-//          Shorty.WUI.Notification.hide(),
-          $.ajax({
-            type:  'GET',
-            url:   OC.filePath('shorty','ajax','del.php'),
-            cache: false,
-            data:  { id: id }
-          }).pipe(
-            function(response){return Shorty.Ajax.eval(response)},
-            function(response){return Shorty.Ajax.fail(response)}
-          )
-        ).done(function(response){
-          // close and neutralize dialog
-          Shorty.WUI.Dialog.hide(dialog);
-          // hide and remove deleted entry
-          // ...
-          dfd.resolve(response.data);
-        }).fail(function(response){
-          dfd.reject(response.data);
-        })
-        return dfd.promise();
-      }, // ===== Shorty.Action.Url.del =====
-      // ===== Shorty.Action.Url.forward =====
-      forward: function(entry){
-        if (Shorty.Debug) Shorty.Debug.log("action forward to entry "+entry.attr('id'));
-        var url=entry.attr('data-target');
-        if (Shorty.Debug) Shorty.Debug.log("opening target url '"+url+"' in new window");
-        window.open(url);
-      }, // Shorty.Action.Url.forward
-      // ===== Shorty.Action.Url.send =====
-      send: function(action,entry){
-        if (Shorty.Debug) Shorty.Debug.log("action send via "+action+" with entry "+entry.attr('id'));
-        switch (action){
-          case 'usage-email':
-            var mailSubject=entry.attr('data-title')||'';
-            var mailBody=entry.attr('data-notes')+"\n\n"+entry.attr('data-source');
-            window.location='mailto:""?'
-                           +'subject='+encodeURIComponent(mailSubject)
-                           +'&body='+encodeURIComponent(mailBody);
-            break;
-          case 'usage-sms':
-            var smsBody=entry.attr('data-title')+" - "+entry.attr('data-notes')+" - "+entry.attr('data-source');
-            // unfortunately there is no way to get the body over into the sms application on "sms urls"...
-            window.prompt(t('shorty',"Copy to clipboard: Ctrl+C, then paste into SMS: Ctrl-V"), smsBody );
-            window.location='sms:';
-            break;
-          case 'usage-qrcode':
-            var title =entry.attr('data-title');
-            var source=entry.attr('data-source');
-            var target=entry.attr('data-target');
-            Shorty.Action.Usage.Dialog.qrcode(title,source,target);
-            break;
-          case 'usage-clipboard':
-            window.prompt(t('shorty',"Copy to clipboard: Ctrl+C"), entry.attr('data-source'));
-            break;
-          default:
-            if (Shorty.Debug) Shorty.Debug.log("usage action '"+action+"' is disabled, refusing to comply");
-        }
-      }, // Shorty.Action.Url.send
-      // ===== Shorty.Action.Url.show =====
-      show: function(){
-        var dfd = new $.Deferred();
-        var dialog = $('#dialog-show');
-        var id     = dialog.find('#id').val();
-        var record = $(this).parent().parent();
-        $('#shorty-add-id').val(record.attr('data-id'));
-        $('#shorty-add-id').val(record.attr('data-status'));
-        $('#shorty-add-source').val(record.children('.shorty-source:first').text());
-        $('#shorty-add-target').val(record.children('.shorty-target:first').text());
-        $('#shorty-add-notes').val(record.children('.shorty-notes:first').text());
-        $('#shorty-add-until').val(record.children('.shorty-until:first').text());
-        $.when(
-          function(){
-            if ($('.shorty-add').css('display') == 'none'){
-              $('.shorty-add').slideToggle();
-            }
-          },
-          $('html, body').animate({ scrollTop: $('.shorty-menu').offset().top }, 500)
-        ).done(dfd.resolve)
-        return dfd.promise();
-      }, // ===== Shorty.Action.Url.show =====
-      // ===== Shorty.Action.Url.status =====
-      status: function(id,status){
-        if (Shorty.Debug) Shorty.Debug.log("changing status of id "+id+" to "+status);
-        var dfd = new $.Deferred();
-        $.ajax({
-          type:  'GET',
-          url:   OC.filePath('shorty','ajax','status.php'),
-          cache: false,
-          data:  { id    : id,
-                   status: status }
-        }).pipe(
-          function(response){return Shorty.Ajax.eval(response)},
-          function(response){return Shorty.Ajax.fail(response)}
-        ).done(function(){
-          // update the rows content
-          var row=$('#list tbody tr#'+id);
-          row.attr('data-status',status);
-          row.find('td#status span').text(t('shorty',status));
-          dfd.resolve();
-        }).fail(dfd.reject)
-        return dfd.promise();
-      } // Shorty.Action.Url.status
-    }, // ===== Shorty.Action.Url =====
-    // ===== Shorty.Action.Usage =====
-    Usage:
-    {
-      // ===== Shorty.Action.Usage.Popup =====
-      Popup:
-      {
-        // ===== Shorty.Action.Usage.Popup.qrcode =====
-        qrcode:{},
-      }, // Shorty.Action.Usage.Popup
-      // ===== Shorty.Action.Usage.Dialog =====
-      Dialog:
-      {
-        // ===== Shorty.Action.Usage.Dialog.qrcode =====
-        qrcode:function(title,source,target){
-          var qrcode=Shorty.Action.Usage.Popup.qrcode;
-          if (!qrcode.dialog){
-            qrcode=$('#dialog-qrcode');
-            qrcode.dialog({show:'fade',autoOpen:false,modal:true});
-            qrcode.dialog('option','width',240 );
-            //qrcode.dialog('option','height',80 );
-          }
-          // a hidden input field ('qrcode-url') holds the base url to the qrcode generator
-          // we just add the url parameter for this specific entrys source url
-          var url=qrcode.find('#qrcode-url').val()+encodeURIComponent(source);
-          qrcode.dialog('option','title',title);
-          qrcode.find('#qrcode-img img').attr('src',url).attr('title',source);
-          qrcode.find('#qrcode-val a').text(url);
-          qrcode.bind('click',function(){
-            qrcode.find('#qrcode-img').toggle();
-            qrcode.find('#qrcode-val').toggle();
-          });
-          qrcode.dialog('open');
-        } // Shorty.Action.Usage.Dialog.qrcode
-      } // Shorty.Action.Usage.Dialog
-    } // Shorty.Action.Usage
-  }, // Shorty.Action
-
-  // ===========
-
-  // ===== Shorty.Ajax =====
-  Ajax:
-  {
-    // ===== Shorty.Ajax.eval =====
-    eval:function(response){
-      if (Shorty.Debug) Shorty.Debug.log("eval ajax response of status "+response.status);
-      // Check to see if the response is truely successful.
-      if (response.status){
-        // this is a valid response
-        if ('success'==response.status){
-          Shorty.WUI.Notification.show(response.message,'debug');
-          return new $.Deferred().resolve(response);
-        } else {
-          Shorty.WUI.Notification.show(response.message,'error');
-          return new $.Deferred().reject(response);
-        }
-//       }else{
-  // TEST (regex) if this is a DB error:
-  // DB Error: "SQLSTATE[HY000]: General error: 1 near "WHERE": syntax error".....
-//         // not a valid response, maybe a DB error ?
-//         if ('DB error'==response)
-      }
-    }, // Shorty.Ajax.eval
-
-    // ===== Shorty.Ajax.fail =====
-    fail:function(response){
-      if (Shorty.Debug) Shorty.Debug.log("handle ajax failure");
-      return new $.Deferred().reject({
-        status: 'error',
-        data: null,
-        message: [ "Unexpected error: " + response.status + " " + response.statusText ]
-      });
-    } // Shorty.Ajax.fail
-  }, // Shorty.Ajax
-
-  // ==== Shorty.Date =====
-  Date:
-  {
-    // ===== Shorty.Date.expired =====
-    expired:function(date){
-      return (Date.parse(date)<=Date.parse(Date()));
-    } // Shorty.Date.expired
-  } // Shorty.Date
-
-} // Shorty
diff --git a/apps/shorty/l10n/de.php b/apps/shorty/l10n/de.php
deleted file mode 100644
index cc4eb624a0..0000000000
--- a/apps/shorty/l10n/de.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php $TRANSLATIONS = array(
-// folder js
-"all"                                                        => "alle",
-"blocked"                                                    => "geblockt",
-"deleted"                                                    => "gelöscht",
-"disabled"                                                   => "deaktiviert",
-"enabled"                                                    => "aktiviert",
-"never"                                                      => "niemals",
-"private"                                                    => "privat",
-"public"                                                     => "öffentlich",
-"shared"                                                     => "geteilt",
-
-"bitly.com service"                                          => "bitly.com-Service",
-"cli.gs service"                                             => "cli.gs-Service",
-"goo.gl service"                                             => "goo.gl-Service",
-"is.gd service"                                              => "is.gd-Service",
-"ti.ny service"                                              => "ti.ny-Service",
-"tiny.cc service"                                            => "tiny.cc-Service",
-"static backend"                                             => "statisches Backend",
-
-"Access"                                                     => "Zugriff",
-"Add a new shorty"                                           => "Neuen Shorty hinzufügen",
-"Add as new"                                                 => "Neu hinzufügen",
-"Add page as 'Shorty' to ownCloud"                           => "Seite als 'Shorty' zu ownCloud hinzufügen",
-"Anything that appears helpful …"                            => "Alles, was hilfreich erscheint …",
-"Backend"                                                    => "Backend",
-"Base url"                                                   => "Basis-Url",
-"Choose a service…"                                          => "Wähle einen Dienst…",
-"Click for qrcode image"                                     => "Klicken für QRCode-Bild",
-"Click for qrcode url"                                       => "Klicken für QRCode-Url",
-"Click it, for whatever site you want to create a Shorty."   => "Klicke es, für welche Seite auch immer Du ein 'Shorty' generieren willst.",
-"Click registered"                                           => "Click registriert",
-"Clicks"                                                     => "Klicks",
-"Close"                                                      => "Schließen",
-"Copy to clipboard"                                          => "In die Zwischenablage kopieren",
-"Copy to clipboard: Ctrl+C"                                  => "In Zwischenablage kopieren: Strg-C",
-"Copy to clipboard: Ctrl+C, then paste into SMS: Ctrl-V"     => "In Zwischenablage kopieren: Strg-C, dann in SMS einfügen: Strg-V",
-"Counted entries and clicks"                                 => "Einträge und Klicks gezählt",
-"Creation"                                                   => "Generierung",
-"Delete shorty"                                              => "Shorty löschen",
-"Drag this to your browser bookmarks."                       => "Zieh' dies in die Lesezeichen Deines Browsers.",
-"Example"                                                    => "Beispiel",
-"Exception"                                                  => "Ausnahme",
-"Exception (%s)"                                             => "Ausnahme (%s)",
-"Expiration"                                                 => "Verfall",
-"List currently empty."                                      => "Liste derzeit leer.",
-"Loading"                                                    => "Lade",
-"Modifications for shorty with id '%s' saved"                => "Änderungen zu Shorty mit Kennung '%s' gespeichert",
-"Modify attributes"                                          => "Attribute ändern",
-"Modify shorty"                                              => "Shorty ändern",
-"New Shorty"                                                 => "Neuer Shorty",
-"Notes"                                                      => "Notizen",
-"Number of entries"                                          => "Anzahl der Einträge",
-"Number of entries: %s"                                      => "Anzahl der Einträge: %s",
-"QRCode"                                                     => "QRCode",
-"Open source url"                                            => "Quell-Url öffnen",
-"Open relay url"                                             => "Relais-Url öffnen",
-"Open target"                                                => "Ziel öffnen",
-"Open target url"                                            => "Ziel-Url öffnen",
-"Preference saved."                                          => "Präferenz gespeichert.",
-"Preference(s) retrieved."                                   => "Präferenz(en) abgefragt.",
-"Relay url"                                                  => "Relais-Url",
-"Reload list"                                                => "Liste neu laden",
-"Save"                                                       => "Speichern",
-"Send by email"                                              => "Als E-Mail verschicken",
-"Send by SMS"                                                => "Als SMS verschicken",
-"Setting saved."                                             => "Einstellung gespeichert.",
-"Shortlet"                                                   => "Shortlet",
-"Shorty with id '%s' deleted"                                => "Shorty mit Kennung '%s' gelöscht",
-"Shorty source url"                                          => "Shorty Quell-Url",
-"Shorty title"                                               => "Shorty-Titel",
-"Show details"                                               => "Details zeigen",
-"Show as QRCode"                                             => "Als QRCode anzeigen",
-"Sort ascending"                                             => "aufsteigend sortieren",
-"Sort descending"                                            => "absteigend sortieren",
-"Source url"                                                 => "Quell-Url",
-"Specify a backend base url…"                                => "Lege eine Basis-Url für das Backend fest…",
-"Status"                                                     => "Status",
-"Status change for shorty with id '%s' saved"                => "Statusänderung für Shorty mit Kennung '%s' gespeichert",
-"Target"                                                     => "Ziel",
-"Target url"                                                 => "Ziel-Url",
-"Target url '%s' is valid"                                   => "Ziel-Url '%s' ist valide",
-"Test and use"                                               => "Testen und nutzen",
-"Title"                                                      => "Titel",
-"Total of clicks"                                            => "Summe der Klicks",
-"Unexpected type of exception caught: %s"                    => "Unerwarteter Type einer Ausnahme aufgetreten: %s",
-"Unknown object of type caught: %s"                          => "Unbekanntes Objekttyp aufgetreten: %s",
-"Url shortened to: %s"                                       => "Url gekürzt zu: %s",
-"Verification by click"                                      => "Prüfung durch Klicken",
-
-"%s\nMessage(code): %s (%s)\nFile(line): %s (%s)\nInfo: %%s" => "%s\Nachricht(Code): %s (%s)\nDatei(Zeile): %s (%s)\nInfo: %%s",
-
-"API access key"      => "API-Zugriffsschlüssel",
-"Account"             => "Nutzerkonto",
-"API key"             => "API-Schlüssel",
-"bit.ly user"         => "bit.ly-Nutzer",
-"bit.ly user name"    => "bit.ly-Nutzerkennung",
-"bit.ly key"          => "bit.ly-Schlüssel",
-"bit.ly users key"    => "bit.ly-Nutzerschlüssel",
-"Google API key"      => "Google API-Schlüssel",
-"Google API account"  => "Google API-Nutzerkonto",
-"tiny.cc user"        => "tiny.cc-Nutzer",
-"tiny.cc user name"   => "tiny.cc-Nutzerkennung",
-"tiny.cc key"         => "tiny.cc-Schlüssel",
-"tiny.cc user key"    => "tiny.cc-Nutzerschlüssel",
-
-"The external 'bitly.com' service is used to register a short url for each generated shorty."
-=> "Der externe 'bitly.com'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"This means you have to register an '%s' at their site first."
-=> "Das bedeutet, zunächst muss ein '%s' auf deren Seite registriert werden.",
-"The external 'turl' service is used to register a short url for each generated shorty."
-=> "Der externe 'turl'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"The external 'ti.ny' service is used to register a short url for each generated shorty."
-=> "Der externe 'ti.ny'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"The external 'cli.gs' service is used to register a short url for each generated shorty."
-=> "Der externe 'cli.gs'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"The external 'is.gd' service is used to register a short url for each generated shorty."
-=> "Der externe 'is.gd'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"The external 'tiny.cc' service is used to register a short url for each generated shorty."
-=>"Der externe 'tiny.cc'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"No backend is used, direct links pointing to your ownCloud are generated."
-=> "Kein Backend wird verwendet, einfache direkte Links zur ownCloud werden erzeugt.",
-"The service requires you to authenticate yourself by providing a valid bit.ly user name and an '%s'."
-=> "Dieser Dienst erfordert die Authentifizierung durch eine valide bit.ly-Nutzerkennung und einen '%s'",
-"Such links are most likely longer than those generated when using a backend."
-=> "Solche Links werden sicherlich länger sein, als wenn ein Backend eingesetzt wird.",
-"However this option does not rely on any third party service and keeps your shortys under your control."
-=> "Dafür stützt sich diese Option aber nicht auf fremde Angebote und belässt die Shorties unter eigener Kontrolle.",
-"A static, rule-based backend is used, shorty links are generated relative to a given base url."
-=> "Ein statisches, regelbasiertes Backend wird genutzt, Shorty-Links werden relativ zu einer gegebenen Basis-Url generiert.",
-"Since this setup depends on server based configuration rules the base url can only be specified in the 'Admin' section of the configuration."
-=> "Da diese Konfiguration von serverseitigen Konfigurationsregeln abhängt, kann die Basis-Url nur unter 'Verwaltung' in der Konfiguration festgelegt werden.",
-"You have to take care that any request to the url configured here is internally mapped to the 'shorty' module."
-=> "Es muss sicher gestellt werden, dass jede Anfrage an die hier konfigurierte URL intern umgesetzt wird auf das 'Shorty'-Modul",
-"Have a try with the example link provided, click it, it should result in a confirmation that your setup is working."
-=> "Einfach den verfügbaren Beispiel-Link durch Anklicken testen. Das sollte zu einer Bestätigung führen, dass die Konfiguration funktioniert.",
-"Leave empty if you can't provide a short base url that is mapped the described way."
-=> "Einfach leer lassen, wenn keine Basis-URL angegeben werden kann, die wir beschrieben umgesetzt wird.",
-"Only use this backend, if you can provide a short base url that is mapped the described way. Your shorties won't work otherwise."
-=> "Dieses Backend kann nur verwendet werden, wenn die Basis-Url in der beschriebenen Art umgesetzt wird. Die Shorties werden andernfalls nicht nutzbar sein.",
-"Googles external 'goo.gl service' is used to register a short url for each generated shorty."
-=> "Googles externer 'goo.gl'-Dienst wird genutzt, um eine Kurz-Url für jeden generierten Shorty zu registrieren.",
-"You must provide a valid '%s' to use this service."
-=> "Es muss eine valide '%s' angegeben werden um diesen Dienst nutzen zu können. ",
-"This means you require a 'Google API console account'."
-=> "Das bedeutet, dass ein 'Google API console account' benötigt wird",
-"Register a new '%s' at their pages."
-=> "Einen neuen '%s' auf deren Seite registrieren.",
-"Enabling the SMS option will offer sending a Shorty via SMS."
-=> "Aktivieren der SMS-Option bietet das Versenden von Shortys via SMS an.",
-"Unfortunately support for 'SMS url handling' is usually only found on mobile devices like smart phones."
-=> "Unglücklicherweise werden 'SMS-Urls' typischerweise nur auf mobilen Geräten wie etwa Smartphones unterstützt.",
-"In addition, the implementations found in Android or iOS are minimalistic, buggy and differ from system to system."
-=> "Darüber hinaus sind die Implementierungen, etwa die in Adroid oder auch iOS minimalistisch, fehlerhaft und unterschiedlich von System zu System.",
-"In short: this might not work for you, therefore you can disable it…"
-=> "Kurz gesagt: die mag nicht funktionieren, daher can die Option deaktiviert werden…",
-);
\ No newline at end of file
diff --git a/apps/shorty/lib/backend.php b/apps/shorty/lib/backend.php
deleted file mode 100644
index aa6c58b449..0000000000
--- a/apps/shorty/lib/backend.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/backend.php
- * Routines to use remote (online) shortening services as backends in a local workflow
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Backend
- * @brief Library to register urls using backends, typically remote (online) url shortening services
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_Backend
-{
-  /**
-   * @method OC_Shorty_Backend::registerUrl
-   * @brief Wrapper function around the specific backend routines
-   * @param id (string) Internal shorty id used to reference a shorty upon usage.
-   * @returns (string) The shortened url as generated by a specific backend.
-   * @throws OC_Shorty_Exception taking over the explaining of the failure from the specific backend
-   * @access public
-   * @author Christian Reiner
-   */
-  static function registerUrl ( $id )
-  {
-    try
-    {
-      // construct the $relay, the url to be called to reach THIS service (ownclouds shorty plugin)
-      $relay = OC_Shorty_Tools::relayUrl ( $id );
-      // call backend specific work horse
-      switch ( $type=OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-type','none') )
-      {
-        default:        return OC_Shorty_Backend::registerUrl_default ( $id, $relay );
-        case 'static':  return OC_Shorty_Backend::registerUrl_static  ( $id, $relay );
-        case 'bitly':   return OC_Shorty_Backend::registerUrl_bitly   ( $id, $relay );
-        case 'cligs':   return OC_Shorty_Backend::registerUrl_cligs   ( $id, $relay );
-        case 'google':  return OC_Shorty_Backend::registerUrl_google  ( $id, $relay );
-        case 'isgd':    return OC_Shorty_Backend::registerUrl_isgd    ( $id, $relay );
-        case 'tinyurl': return OC_Shorty_Backend::registerUrl_tinyurl ( $id, $relay );
-        case 'tinycc':  return OC_Shorty_Backend::registerUrl_tinycc  ( $id, $relay );
-      } // switch
-    } // try
-    catch (OC_Shorty_Exception $e)
-    {
-      throw $e;
-    } // catch
-    catch (Exception $e)
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url '%s' at '%s' backend", array($relay,$type) );
-    } // catch
-  } // OC_Shorty_Backend::registerUrl
-
-  /**
-   * @method OC_Shorty_Backend::registerUrl_default
-   * @brief Pseudo-registers a given local relay url
-   * @param id (string)
-   * @param relay (url)
-   * @returns validated and pseudo-registered relay
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_default ( $id, $relay )
-  {
-    return OC_Shorty_Type::validate ( $relay, OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_default
-  
-  /**
-   * @method OC_Shorty_Backend::registerUrl_static
-   * @brief Registers a given local relay url as local static shorty
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_static ( $id, $relay )
-  {
-    if (  (FALSE===($base=trim ( OCP\Config::getAppValue('shorty','backend-static-base',FALSE))))
-        ||(empty($base)) )
-      throw new OC_Shorty_Exception ( 'No base url defined for the static backend' );
-    return OC_Shorty_Type::validate ( $base.$id, OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_static
-  
-  /**
-   * @method OC_Shorty_Backend::registerUrl_bitly
-   * @brief Registers a given local relay url at the bit.ly shortening service
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_bitly ( $id, $relay )
-  {
-    $bitly_api_user = OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-bitly-user','');
-    $bitly_api_key  = OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-bitly-key', '');
-    if ( ! $bitly_api_key || ! $bitly_api_user )
-      throw new OC_Shorty_Exception ( 'No API user or key configured' );
-    $curl = curl_init ( );
-    curl_setopt ( $curl, CURLOPT_URL, 'https://api-ssl.bit.ly/shorten' );
-    curl_setopt ( $curl, CURLOPT_SSL_VERIFYHOST, TRUE );
-    curl_setopt ( $curl, CURLOPT_POST, TRUE );
-    curl_setopt ( $curl, CURLOPT_HTTPHEADER, array('Content-Type: application/json') );
-    curl_setopt ( $curl, CURLOPT_POSTFIELDS, json_encode(array('version'=>'2.0.1',
-                                                               'longUrl'=>$relay,
-                                                               'format'=>'json',
-                                                               'login'=>$bitly_api_user,
-                                                               'apiKey'=>$bitly_api_key) ) );
-    curl_setopt ( $curl, CURLOPT_RETURNTRANSFER, TRUE );
-    if (  (FALSE===($reply=curl_exec($curl)))
-        ||(NULL===($payload=json_decode($reply)))
-        ||(!is_object($payload))
-        ||(!property_exists($payload,'id')) )
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url at backend 'static'" );
-    }
-    curl_close ( $curl );
-    return OC_Shorty_Type::validate ( $payload->id, OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_bitly
-
-  /**
-   * @method OC_Shorty_Backend::registerUrl_cligs
-   * @brief Registers a given local relay url at the cli.gs shortening service
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_cligs ( $id, $relay )
-  {
-    $curl = curl_init ( );
-    curl_setopt ( $curl, CURLOPT_URL, sprintf('http://cli.gs/api/v2/cligs/create?url=%s&appid=owncloud_shorty&test=1', urlencode(trim($relay))) );
-    curl_setopt ( $curl, CURLOPT_RETURNTRANSFER, TRUE );
-    if (  (FALSE===($reply=curl_exec($curl)))
-        ||( ! preg_match( '/^(.+)$/', $reply, $match )) )
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url at backend 'cli.gs'" );
-    }
-    curl_close ( $curl );
-    return OC_Shorty_Type::validate ( $match[1], OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_cligs
-
-  /**
-   * @method OC_Shorty_Backend::registerUrl_isgd
-   * @brief Registers a given local relay url at the is.gd shortening service
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_isgd ( $id, $relay )
-  {
-    $curl = curl_init ( );
-    curl_setopt ( $curl, CURLOPT_URL, sprintf('http://is.gd/create.php?format=simple&url=%s', urlencode(trim($relay))) );
-    curl_setopt ( $curl, CURLOPT_RETURNTRANSFER, TRUE );
-    if (  (FALSE===($reply=curl_exec($curl)))
-        ||( ! preg_match( '/^(.+)$/', $reply, $match )) )
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url at backend 'is.gd'" );
-    }
-    curl_close ( $curl );
-    return OC_Shorty_Type::validate ( $match[1], OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_isgd
-
-  /**
-   * @method OC_Shorty_Backend::registerUrl_google
-   * @brief Registers a given local relay url at the google shortening service
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_google ( $id, $relay )
-  {
-    $api_key = OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-google-key','');
-    if ( ! $api_key )
-      throw new OC_Shorty_Exception ( 'No goo.gl API key configured' );
-    $curl = curl_init ( );
-    curl_setopt ( $curl, CURLOPT_URL, 'https://www.googleapis.com/urlshortener/v1/url' );
-    curl_setopt ( $curl, CURLOPT_SSL_VERIFYHOST, TRUE );
-    curl_setopt ( $curl, CURLOPT_POST, TRUE );
-    curl_setopt ( $curl, CURLOPT_HTTPHEADER, array('Content-Type: application/json') );
-    curl_setopt ( $curl, CURLOPT_POSTFIELDS, json_encode(array('longUrl'=>$relay,
-                                                               'key'=>$api_key) ) );
-    curl_setopt ( $curl, CURLOPT_RETURNTRANSFER, TRUE );
-    if (  (FALSE===($reply=curl_exec($curl)))
-        ||(NULL===($payload=json_decode($reply)))
-        ||(!is_object($payload))
-        ||(!property_exists($payload,'id')) )
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url at backend 'goo.gl'" );
-    }
-    curl_close ( $curl );
-    return OC_Shorty_Type::validate ( $payload->id, OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_google
-  
-  /**
-   * @method OC_Shorty_Backend::registerUrl_tinycc
-   * @brief Registers a given local relay url at the tiny.cc shortening service
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_tinycc ( $id, $relay )
-  {
-    $api_user = OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-tinycc-user','');
-    $api_key  = OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-tinycc-key','');
-    if ( ! $api_key || ! $api_user )
-      throw new OC_Shorty_Exception ( 'No goo.gl API key configured' );
-    $curl = curl_init ( );
-    curl_setopt ( $curl, CURLOPT_URL, 'http://tiny.cc/?c=shorten' );
-    curl_setopt ( $curl, CURLOPT_SSL_VERIFYHOST, TRUE );
-    curl_setopt ( $curl, CURLOPT_POST, TRUE );
-    curl_setopt ( $curl, CURLOPT_HEADER, TRUE );
-    curl_setopt ( $curl, CURLOPT_POSTFIELDS, array('longUrl'=>$relay,
-                                                   'version'=>'2.0.3',
-                                                   'format'=>'json',
-                                                   'login'=>$api_user,
-                                                   'apiKey'=>$api_key) );
-    curl_setopt ( $curl, CURLOPT_RETURNTRANSFER, TRUE );
-    if (  (FALSE===($reply=curl_exec($curl)))
-        ||(NULL===($payload=json_decode($reply)))
-        ||(!is_object($payload))
-        ||(!property_exists($payload,'id')) )
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url at backend 'tiny.cc'" );
-    }
-    curl_close ( $curl );
-    return OC_Shorty_Type::validate ( $payload->id, OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_google
-
-  /**
-   * @method OC_Shorty_Backend::registerUrl_tinyurl
-   * @brief Registers a given local relay url at the tinyURL shortening service
-   * @param id (string)
-   * @param relay (url)
-   * @returns registered and validated relay url
-   * @access public
-   * @author Chrisian Reiner
-   */
-  static function registerUrl_tinyurl ( $id, $relay )
-  {
-    $curl = curl_init ( );
-    curl_setopt ( $curl, CURLOPT_URL, sprintf('http://tinyurl.com/api-create.php?url=%s', urlencode(trim($relay))) );
-    curl_setopt ( $curl, CURLOPT_RETURNTRANSFER, TRUE );
-    if (  (FALSE===($reply=curl_exec($curl)))
-        ||( ! preg_match( '/^(.+)$/', $reply, $match )) )
-    {
-      throw new OC_Shorty_Exception ( "Failed to register url at backend 'tinyUrl'" );
-    }
-    curl_close ( $curl );
-    return OC_Shorty_Type::validate ( $match[1], OC_Shorty_Type::URL );
-  } // OC_Shorty_Backend::registerUrl_tinyurl
-
-} // class OC_Shorty_Backend
diff --git a/apps/shorty/lib/exception.php b/apps/shorty/lib/exception.php
deleted file mode 100644
index daeb9d10a9..0000000000
--- a/apps/shorty/lib/exception.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/exception.php
- * Application specific exception class
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Exception
- * @brief Application specific exception class
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_Exception extends Exception
-{
-  protected $phrase = '';
-  protected $param  = array ( );
-
-  /**
-   * @method OC_Shorty_Exception::__construct
-   * @brief: Constructs an exception based on a phrase and a set of parameters
-   * @param phrase (string) Human readable message that should be translatable
-   * @param param  (array) Set of parameters to be used as sprintf arguments to fill the phrase
-   * @access public
-   * @author Christian Reiner
-   */
-  public function __construct ( $phrase, $param=array() )
-  {
-    if ( is_array($param) )
-         $this->param = $param;
-    else $this->param = array($param);
-    $this->phrase  = $phrase;
-//    $this->message = vsprintf ( $phrase, $this->params );
-    Exception::__construct ( vsprintf($phrase,$this->param), 1 );
-  }
-
-  /**
-   * @method OC_Shorty_Exception::getTranslation
-   * @brief: Returns the translated message of the exception
-   * @returns (string) Translated message including the filled in set of arguments
-   * @access public
-   * @author Christian Reiner
-   */
-  public function getTranslation ( )
-  {
-    return OC_Shorty_L10n::t ( $this->phrase, $this->param );
-  }
-
-  /**
-   * @method OC_Shorty_Exception::JSONerror
-   * @brief Calls OCP\JSON::error with a pretty formated version of an exception
-   * @param e (exception) an exception object holding information
-   * @returns (json) OCP\JSON::error
-   * @access public
-   * @author Christian Reiner
-   */
-  static function JSONerror ( $e )
-  {
-    $title = OC_Shorty_L10n::t("Exception");
-    switch ( get_class($e) )
-    {
-      case 'OC_Shorty_Exception':
-        $message = $e->getTranslation();
-        break;
-      case 'PDOException':
-        $message = sprintf ( OC_Shorty_L10n::t( "%s\nMessage(code): %s (%s)\nFile(line): %s (%s)\nInfo: %%s",
-                                                OC_Shorty_L10n::t("Exception (%s)", get_class($e)),
-                                                htmlspecialchars($e->getMessage()),
-                                                htmlspecialchars($e->getCode()),
-                                                htmlspecialchars($e->getFile()),
-                                                htmlspecialchars($e->getLine()) ),
-                             (method_exists($e,'errorInfo') ? trim($e->errorInfo()) : '-/-') );
-        break;
-      default:
-        if ( is_a($e,'Exception') )
-             $message = OC_Shorty_L10n::t("Unexpected type of exception caught: %s", get_class($e));
-        else $message = OC_Shorty_L10n::t("Unknown object of type caught: %s", get_class($e));
-    } // switch
-    // swallow any accidential output generated by php notices and stuff to preserve a clean JSON reply structure
-    $output = trim ( OC_Shorty_Tools::ob_control(FALSE) );
-    if ( $output )
-    {
-      $message = "! Swallowing accidential output from ajax routines ! \n"
-                 ."Please fix this ! Here is the first line: \n"
-                 .substr ( $output, 0, strpos($output,"\n") );
-      OCP\Util::writeLog( 'shorty', $message, OC_Log::WARN );
-    } // output
-    // return a clean JSON error
-    return OCP\JSON::error ( array ( 'title'   => $title,
-                                     'message' => sprintf("%s: %s", $title, $message) ) );
-  } // function error
-} // class OC_Shorty_Exception
-
-/**
- * @class OC_Shorty_HttpException
- * @brief Application specific exception class: protocol layer
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_HttpException extends OC_Shorty_Exception
-{
-
-  /**
-   * @method OC_Shorty_HttpException::__construct
-   * @brief: Constructs an exception based on a phrase and a set of parameters
-   * @param status (integer) Http status code
-   * @access public
-   * @author Christian Reiner
-   */
-  public function __construct ( $status )
-  {
-    if (   is_numeric($status)
-        && array_key_exists($status,OC_Shorty_Type::$HTTPCODE) )
-    {
-      $status = intval($status);
-      $phrase = OC_Shorty_Type::$HTTPCODE[$status];
-    }
-    else
-    {
-      $status = 400;
-      $phrase = OC_Shorty_Type::$HTTPCODE[400]; // "Bad Request"
-    } // switch
-
-    // return http status code to client (browser)
-    if ( ! headers_sent() )
-    {
-      header ( sprintf("HTTP/1.0 %s %s",$status,$phrase) );
-    }
-    $tmpl = new OCP\Template("shorty", "tmpl_http_status", "guest");
-    $tmpl->assign("explanation", OC_Shorty_L10n::t($phrase));
-    $tmpl->printPage();
-    exit;
-  } // function __construct
-
-} // class OC_Shorty_HttpException
-
-?>
diff --git a/apps/shorty/lib/hooks.php b/apps/shorty/lib/hooks.php
deleted file mode 100644
index 6ba59eccbd..0000000000
--- a/apps/shorty/lib/hooks.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/hooks.php
- * Static class providing routines to populate hooks called by other parts of ownCloud
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Hooks
- * @brief Static 'namespace' class for api hook population
- * ownCloud propagates to use static classes as namespaces instead of OOP.
- * This 'namespace' defines routines to populate hooks called by other parts of ownCloud
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_Hooks
-{
-  /**
-   * @brief Deletes all Shortys and preferences of a certain user
-   * @param paramters (array) parameters from postDeleteUser-Hook
-   * @return bool
-   */
-  public static function deleteUser ( $parameters )
-  {
-    OCP\Util::writeLog ( 'user post delete','wiping all users Shortys', OCP\Util::INFO );
-    $result = TRUE;
-    $param  = array ( 'user' => OCP\User::getUser() );
-    // wipe shortys
-    $query = OCP\DB::prepare ( OC_Shorty_Query::WIPE_SHORTYS );
-    if ( FALSE===$query->execute($param) )
-      $result = FALSE;
-    // wipe preferences
-    $query = OCP\DB::prepare ( OC_Shorty_Query::WIPE_PREFERENCES );
-    if ( FALSE===$query->execute($param) )
-      $result = FALSE;
-    // report completion success
-    return $result;
-  }
-}
diff --git a/apps/shorty/lib/l10n.php b/apps/shorty/lib/l10n.php
deleted file mode 100644
index 648130645a..0000000000
--- a/apps/shorty/lib/l10n.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/l10n.php
- * Translation singleton
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_L10n
- * @brief Convenient translation singleton
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_L10n
-{
-  /**
-   * @var OC_Shorty_L10n::dictionary
-   * @brief An internal dictionary file filled from the translation files provided.
-   * @access private
-   * @author Christian Reiner
-   */
-  private $dictionary;
-
-    /**
-   * @var OC_Shorty_L10n::instance
-   * @brief Internal singleton object
-   * @access private
-   * @author Christian Reiner
-   */
-  static private $instance=NULL;
-
-  /**
-   * @method OC_Shorty_L10n::__construct
-   * @brief
-   * @access private
-   * @author Christian Reiner
-   */
-  private function __construct ( ) { $this->dictionary = new OC_L10n('shorty'); }
-
-  /**
-   * @method OC_Shorty_L10n::t
-   * @brief Translates a given string into the users session language and fills any placeolders
-   * @param phrase to be translated
-   * @param … further arguments used as filling tokens in the tradition of printf strategies
-   * @returns translated phrase or the original phrase incase no translation could be found
-   * @access public
-   * @author Christian Reiner
-   */
-  static public function t ( $phrase )
-  {
-    // create singleton instance, if required
-    if ( ! self::$instance )
-      self::$instance = new OC_Shorty_L10n ( );
-    // handle different styles of how arguments can be handed over to this method
-    switch ( func_num_args() )
-    {
-      case 1:   return self::$instance->dictionary->t ( $phrase, array() );
-      case 2:   $arg = func_get_arg(1);
-                if ( is_array($arg) )
-                     return self::$instance->dictionary->t ( $phrase, $arg );
-                else return self::$instance->dictionary->t ( $phrase, array($arg) );
-      default:  $args = func_get_args();
-                array_shift ( $args );
-                return self::$instance->dictionary->t ( $phrase, $args );
-    }
-  }
-} // class OC_Shorty_L10n
-?>
diff --git a/apps/shorty/lib/meta.php b/apps/shorty/lib/meta.php
deleted file mode 100644
index 91937bd3c8..0000000000
--- a/apps/shorty/lib/meta.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/meta.php
- * Routines to retrieve meta information about a remote url
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Meta
- * @brief Static 'namespace' class for url meta information retrieval
- * ownCloud propagates to use static classes as namespaces instead of OOP.
- * This 'namespace' defines routines for the retrieval of meta information about remote urls. 
- * @access public
- * @author Christian Reiner
- */ 
-class OC_Shorty_Meta
-{
-
-  /**
-   * @method OC_Shorty_Meta::fetchMetaData
-   * @brief Retrieves the meta information to a given remote url
-   * @param url decoded target url for which meta information if requested
-   * @returns associative array holding the requested meta data
-   * @access public
-   * @author Christian Reiner
-   */
-  static function fetchMetaData ( $url )
-  {
-    $url_token = parse_url ( $url );
-    // some sane fallback values, in case we cannot get the meta data
-    $meta = array();
-    $meta['target']    = $url;
-    $meta['title']     = strtolower ( $url_token['host'] );
-    $meta['scheme']    = strtolower ( $url_token['scheme'] );
-    $meta['mimetype']  = 'application/octet-stream';
-    $meta['schemicon'] = self::selectIcon ( 'scheme', strtolower($url_token['scheme']) );
-    // we wont bother retrieving data about other protocols than http or ftp
-    if ( ! in_array(strtolower($url_token['scheme']),array('http','https','ftp','ftps')) )
-      return $meta;
-    // to fetch meta data we rely on curl being installed
-    if ( ! function_exists('curl_init') )
-      return $meta;
-    // try to retrieve the meta data
-    $handle = curl_init ( );
-    curl_setopt ( $handle, CURLOPT_URL, $url );
-    curl_setopt ( $handle, CURLOPT_RETURNTRANSFER, 1 );
-    curl_setopt ( $handle, CURLOPT_FOLLOWLOCATION, TRUE );
-    curl_setopt ( $handle, CURLOPT_MAXREDIRS, 10 );
-    if ( FALSE!==($page=curl_exec($handle)) )
-    {
-      // try to extract title from page
-      preg_match ( "/<head>.*<title>(.*)<\/title>.*<\/head>/si", $page, $match );
-      $meta['title']    = htmlspecialchars_decode ( $match[1] );
-      $meta['staticon'] = self::selectIcon ( 'state', TRUE );
-      // final url after a possible redirection
-      $meta['final']       = curl_getinfo ( $handle, CURLINFO_EFFECTIVE_URL );
-      // try to extract favicon from page
-      preg_match ( '/<[^>]*link[^>]*(rel=["\']icon["\']|rel=["\']shortcut icon["\']) .*href=["\']([^>]*)["\'].*>/iU', $page, $match );
-      if (1<sizeof($match))
-      {
-        // the specified uri might be an url, an absolute or a relative path
-        // we have to turn it into an url to be able to display it out of context
-        $favicon = htmlspecialchars_decode ( $match[2] );
-        // test for an url
-        if (parse_url($favicon,PHP_URL_SCHEME))
-        {
-          $meta['favicon'] = $favicon;
-        }
-        // test for an absolute path
-        elseif ( 0===strpos(parse_url($favicon,PHP_URL_PATH),'/') )
-        {
-          $url_token = parse_url($meta['final']);
-          $meta['favicon'] = sprintf( '%s://%s/%s', $url_token['scheme'], $url_token['host'], $favicon );
-        }
-        // so it appears to be a relative path
-        else
-        {
-          $url_token = parse_url($meta['final']);
-          $meta['favicon'] = sprintf( '%s://%s%s%s', $url_token['scheme'], $url_token['host'], dirname($url_token['path']), $favicon );
-        }
-      }
-      $meta['mimetype']    = preg_replace ( '/^([^;]+);.*/i', '$1', curl_getinfo($handle,CURLINFO_CONTENT_TYPE) );
-      $meta['mimicon']     = self::selectIcon ( 'mimetype', $meta['mimetype'] );
-      $meta['code']        = curl_getinfo ( $handle, CURLINFO_HTTP_CODE );
-      $meta['status']      = OC_Shorty_L10n::t ( self::selectCode('status',$meta['code']) );
-      $meta['explanation'] = OC_Shorty_L10n::t ( self::selectCode('explanation',$meta['code']) );
-    }
-    curl_close ( $handle );
-    // that's it !
-    return $meta;
-  } // function fetchMetaData
-
-  /**
-   * @method OC_Shorty_Meta::selectCode
-   * @brief Some helper utility used to resolve numeric http status codes into human readable strings
-   * @param aspect a string indicating a section/pool a code is to be resolved in
-   * @param identifier a string indicating a specific code to be resolved
-   * @returns a human readable string resolving the specified numeric status code
-   * @throws OC_Shorty_Exception in case of an undefined code to be resolved
-   * @access public
-   * @author Christian Reiner
-   */
-  static function selectCode ( $aspect, $identifier )
-  {
-    // map of official http status codes
-    $_code_map = array
-    (
-      'status' => OC_Shorty_Type::$HTTPCODE,
-      'explanation' => array
-      (
-        200 => 'Target url is valid and resolved.',
-        201 => 'The request has been fulfilled and created a new ressource.',
-        202 => 'The request has been accepted.',
-        203 => 'The request yielded in non-authorative information.',
-        204 => 'The request has been fulfilled but not produced any content.',
-        205 => 'The request has been fulfilled and the view should be reset.',
-        206 => 'The request has been fulfilled partially.',
-      )
-    );
-    // resolve specified code against map or provide some fallback content
-    if ( key_exists($aspect,$_code_map) && key_exists($identifier,$_code_map[$aspect]) )
-      return $_code_map[$aspect][$identifier];
-    else
-    {
-      switch ( $aspect )
-      {
-        case 'status':      return sprintf("Status %s [unknown]",$identifier);
-        case 'explanation': return sprintf("[Undefined status code '%s']",$identifier);
-        default: throw new OC_Shorty_Exception ( "unknown aspect '%s' requested to resolve code '%s'",
-                                                 array($aspect,$identifier) );
-      } // switch
-    }
-  } // function selectCode
-
-  /**
-   * @method OC_Shorty_Meta::selectIcon
-   * @brief Some helper utility for the easy integrate of icon references into templates and alike
-   * @param aspect a string indicating a section/pool an icon is to be chosen from
-   * @param identifier a string indicating a specific icon to be referenced
-   * @returns a hyper reference to an icon in form of a string
-   * @access public
-   * @author Christian Reiner
-   */
-  static function selectIcon ( $aspect, $identifier )
-  {
-    switch ( $aspect )
-    {
-      case 'state':
-        switch ($identifier)
-        {
-          case TRUE:  return OCP\Util::imagePath('shorty', 'status/good.png');
-          case FALSE: return OCP\Util::imagePath('shorty', 'status/bad.png');
-          default:    return OCP\Util::imagePath('shorty', 'status/neutral.png');
-        } // switch identifier
-      case 'scheme':
-        switch ($identifier)
-        {
-          case 'http':
-          case 'https':   return OCP\Util::imagePath('shorty', 'scheme/H.png');
-          case 'ftp':
-          case 'ftps':    return OCP\Util::imagePath('shorty', 'scheme/F.png');
-          case 'sftp':    return OCP\Util::imagePath('shorty', 'scheme/S.png');
-          case 'mailto':  return OCP\Util::imagePath('shorty', 'scheme/M.png');
-          case 'gopher':  return OCP\Util::imagePath('shorty', 'scheme/G.png');
-          case 'webdav':
-          case 'webdavs': return OCP\Util::imagePath('shorty', 'scheme/W.png');
-          default:        return OCP\Util::imagePath('shorty', 'blank.png');
-        } // switch identifier
-      case 'mimetype':
-        $identifier = explode('/',$identifier);
-        switch ($identifier[0])
-        {
-          case 'audio':       return OCP\Util::imagePath('core', 'filetypes/audio.png');
-          case 'text':        return OCP\Util::imagePath('core', 'filetypes/text.png');
-          case 'video':       return OCP\Util::imagePath('core', 'filetypes/video.png');
-          case 'application':
-            switch ($identifier[1])
-            {
-              case 'pdf':     return OCP\Util::imagePath('core', 'filetypes/application-pdf.png');
-              default:        return OCP\Util::imagePath('shorty', 'blank.png');
-            } // switch identifier[1]
-          default:            return OCP\Util::imagePath('shorty', 'blank.png');
-        } // switch identifier[0]
-    } // switch aspect
-  } // function selectIcon
-
-} // class OC_Shorty_Meta
-?>
diff --git a/apps/shorty/lib/query.php b/apps/shorty/lib/query.php
deleted file mode 100644
index 6501a54d92..0000000000
--- a/apps/shorty/lib/query.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/query.php
- * Static catalog of sql queries
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Query
- * @brief Static catalog of sql queries
- * These query templates are referenced by a OC_Shorty_Query::URL_...
- * They have to be prapared by adding an array of parameters
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_Query
-{
-  const URL_INSERT            = "INSERT INTO *PREFIX*shorty (id,status,favicon,title,source,target,user,until,created,notes) VALUES (:id,:status,:favicon,:title,:source,:target,:user,:until,CURRENT_DATE,:notes)";
-  const URL_DELETE            = "DELETE FROM *PREFIX*shorty WHERE user=:user AND id=:id";
-  const URL_REMOVE            = "DELETE FROM *PREFIX*shorty WHERE user=:user AND 'deleted'=status";
-  const URL_UPDATE            = "UPDATE *PREFIX*shorty SET status=:status,title=:title,until=:until,notes=:notes WHERE user=:user AND id=:id";
-  const URL_STATUS            = "UPDATE *PREFIX*shorty SET status=:status WHERE user=:user AND id=:id";
-  const URL_CLICK             = "UPDATE *PREFIX*shorty SET accessed=CURRENT_TIMESTAMP, clicks=(clicks+1) WHERE id=:id";
-  const URL_FORWARD           = "SELECT user,source,target,status,(until IS NOT NULL AND until!='' AND until<CURRENT_TIMESTAMP) AS expired FROM *PREFIX*shorty WHERE id=:id";
-  const URL_SOURCE            = "SELECT id,source,target,status,(until IS NOT NULL AND until!='' AND until<CURRENT_TIMESTAMP) AS expired FROM *PREFIX*shorty WHERE source=:source";
-  const URL_VERIFY            = "SELECT id,status,favicon,title,source,target,clicks,created,accessed,until,notes FROM *PREFIX*shorty WHERE user=:user AND id=:id LIMIT 1";
-  const URL_LIST              = "SELECT id,status,favicon,title,source,target,clicks,created,accessed,until,notes FROM *PREFIX*shorty WHERE user=:user ORDER BY :sort";
-  const URL_COUNT             = "SELECT count(*) AS sum_shortys,IFNULL(sum(clicks),0) AS sum_clicks FROM *PREFIX*shorty WHERE user=:user";
-  const WIPE_SHORTYS          = "DELETE FROM *PREFIX*shorty WHERE user=:user";
-  const WIPE_PREFERENCES      = "DELETE FROM *PREFIX*preferences WHERE user=:user";
-} // class OC_Shorty_Query
-?>
diff --git a/apps/shorty/lib/tools.php b/apps/shorty/lib/tools.php
deleted file mode 100644
index 2b3bac7067..0000000000
--- a/apps/shorty/lib/tools.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/tools.php
- * A collection of general utility routines
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Tools
- * @brief Collection of a few practical routines, a tool box
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_Tools
-{
-  // internal flag indicating if output buffering should be used to prevent accidentially output during ajax requests
-  static $ob_usage  = TRUE;
-  // internal flag indicating if there is currently an output buffer active
-  static $ob_active = FALSE;
-
-  /**
-   * @method OC_Shorty_Tools::ob_control
-   * @param on (boolean) wether to activate or deactivate the buffer
-   * @access public
-   * @author Christian Reiner
-   */
-  static function ob_control ( $on=TRUE )
-  {
-    $output = NULL;
-    if ( self::$ob_usage )
-    {
-      // attempt to use outpout buffering
-      if ( $on )
-      {
-        // start buffering if possible and not yet started before
-        if (   function_exists('ob_start')       // output buffers installed at all ?
-            && ! self::$ob_active  )  // don't stack buffers (create buffer only, if not yet started)
-        {
-          ob_implicit_flush ( FALSE );
-          ob_start ( );
-          self::$ob_active = TRUE;
-        }
-      } // if $on==TRUE
-      else
-      {
-        // end buffering _if_ it has been started before
-        if ( self::$ob_active )
-        {
-          $output = ob_get_contents ( );
-          ob_end_clean ( );
-          self::$ob_active = FALSE;
-        }
-      } // if $on==FALSE
-    } // if ob_usage
-    return $output;
-  } // function ob_control
-  
-  /**
-   * @method OC_Shorty_Tools::db_escape
-   * @brief escape a value for incusion in db statements
-   * @param value (string) value to be escaped
-   * @returns (string) escaped string value
-   * @throws OC_Shorty_Exception in case of an unknown database engine
-   * @access public
-   * @author Christian Reiner
-   * @todo use mdb2::quote() / mdb2:.escape() instead ?
-   */
-  static function db_escape ( $value )
-  {
-    $type = OCP\Config::getSystemValue ( 'dbtype', 'sqlite' );
-    switch ( $type )
-    {
-      case 'sqlite':
-      case 'sqlite3':
-        return sqlite_escape_string     ( $value );
-      case 'pgsql':
-        return pg_escape_string         ( $value );
-      case 'mysql':
-        if (get_magic_quotes_gpc())
-             return mysql_real_escape_string ( stripslashes($value) );
-        else return mysql_real_escape_string ( $value );
-    }
-    throw new OC_Shorty_Exception ( "unknown database backend type '%1'", array($type) );
-  } // function db_escape
-
-  /**
-   * @method OC_Shorty_Tools::db_timestamp
-   * @brief current timestamp as required by db engine
-   * @returns (string) current timestamp as required by db engine
-   * @throws OC_Shorty_Exception in case of an unknown database engine
-   * @access public
-   * @author Christian Reiner
-   * @todo not really required any more, we rely on CURRENT_TIMESTAMP instead
-   */
-  static function db_timestamp ( )
-  {
-    $type = OCP\Config::getSystemValue( "dbtype", "sqlite" );
-    switch ( $type )
-    {
-      case 'sqlite':
-      case 'sqlite3': return "strftime('%s','now')";
-      case 'mysql':   return 'UNIX_TIMESTAMP()';
-      case 'pgsql':   return "date_part('epoch',now())::integer";
-    }
-    throw new OC_Shorty_Exception ( "unknown database backend type '%1'", array($type) );
-  } // function db_timestamp
-
-  /**
-   * @method OC_Shorty_Tools::shorty_id
-   * @brief Creates a unique id to be used for a new shorty entry
-   * @returns (string) valid and unique id
-   * @access public
-   * @author Christian Reiner
-   */
-  static function shorty_id ( )
-  {
-    // each shorty installation uses a (once self generated) 62 char alphabet
-    $alphabet=OCP\Config::getAppValue('shorty','id-alphabet');
-    if ( empty($alphabet) )
-    {
-      $alphabet = self::randomAlphabet(62);
-      OCP\Config::setAppValue ( 'shorty', 'id-alphabet', $alphabet );
-    }
-    // use alphabet to generate a id being unique over time
-    return self::convertToAlphabet ( str_replace(array(' ','.'),'',microtime()), $alphabet );
-  } // function shorty_id
-
-  /**
-   *
-   */
-  static function randomAlphabet ($length)
-  {
-    if ( ! is_integer($length) )
-      return FALSE;
-    $c = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxwz0123456789";
-    for($l=0;$l<$length;$l++) $s .= $c{rand(0,strlen($c))};
-    return str_shuffle($s);
-  } // function randomAlphabet
-
-  /**
-   * @method OC_Shorty_Tools::convertToAlphabet
-   * @brief Converts a given decimal number into an arbitrary base (alphabet)
-   * @param number decimal value to be converted
-   * @returns (string) converted value in string notation
-   * @access public
-   * @author Christian Reiner
-   */
-  static function convertToAlphabet ( $number, $alphabet )
-  {
-    $alphabetLen = strlen($alphabet);
-    $decVal = (int) $number;
-    $number = FALSE;
-    $nslen = 0;
-    $pos = 1;
-    while ($decVal > 0)
-    {
-      $valPerChar = pow($alphabetLen, $pos);
-      $curChar = floor($decVal / $valPerChar);
-      if ($curChar >= $alphabetLen)
-      {
-        $pos++;
-      } else {
-        $decVal -= ($curChar * $valPerChar);
-        if ($number === FALSE)
-        {
-          $number = str_repeat($alphabet{1}, $pos);
-          $nslen = $pos;
-        }
-        $number = substr($number, 0, ($nslen - $pos)) . $alphabet{$curChar} . substr($number, (($nslen - $pos) + 1));
-        $pos--;
-      }
-    }
-    if ($number === FALSE) $number = $alphabet{1};
-    return $number;
-  }
-
-  /**
-   * @method OC_Shorty_Tools::relayUrl
-   * @brief Generates a relay url for a given id acting as a href target for all backends
-   * @param id (string) shorty id as shorty identification
-   * @returns (string) generated absolute relay url
-   * @access public
-   * @author Christian Reiner
-   */
-  static function relayUrl ($id)
-  {
-    return sprintf ( '%s?service=%s&id=%s', OCP\Util::linkToAbsolute("", "public.php"), 'shorty_relay', $id );
-  } // function relayUrl
-
-  /**
-   * @method OC_Shorty_Tools::countShortys
-   * @brief Returns the total number of entries and clicks from the database
-   * @returns (array) two elements sum_shortys & sum_clicks holding an integer each
-   * @access public
-   * @author Christian Reiner
-   */
-  static function countShorties ()
-  {
-    $param = array
-    (
-      ':user'   => OCP\User::getUser ( ),
-    );
-    $query = OCP\DB::prepare ( OC_Shorty_Query::URL_COUNT );
-    $result = $query->execute($param);
-    $reply = $result->fetchAll();
-    return $reply[0];
-  } // function countShorties
-
-} // class OC_Shorty_Tools
-?>
diff --git a/apps/shorty/lib/type.php b/apps/shorty/lib/type.php
deleted file mode 100644
index 97cbf04ddb..0000000000
--- a/apps/shorty/lib/type.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file lib/type.php
- * Type handling, recognition and verification routines
- * @author Christian Reiner
- */
-
-/**
- * @class OC_Shorty_Type
- * @brief Static 'namespace' class offering routines and constants used to handle type recognition and value verification
- * @access public
- * @author Christian Reiner
- */
-class OC_Shorty_Type
-{
-  // the 'types' of values we deal with, actually more something like flavours
-  const ID          = 'id';
-  const STATUS      = 'status';
-  const SORTKEY     = 'sortkey';
-  const SORTVAL     = 'sortval';
-  const STRING      = 'string';
-  const URL         = 'url';
-  const INTEGER     = 'integer';
-  const FLOAT       = 'float';
-  const DATE        = 'date';
-  const TIMESTAMP   = 'timestamp';
-  // a list of all valid list sorting codes
-  static $SORTING = array (
-    ''  =>'created DESC', // default
-    'aa'=>'accessed', 'ad'=>'accessed DESC',
-    'ca'=>'created',  'cd'=>'created DESC',
-    'da'=>'until',    'dd'=>'until DESC',
-    'ha'=>'clicks',   'hd'=>'clicks DESC',
-    'ka'=>'id',       'kd'=>'id DESC',
-    'sa'=>'status',   'sd'=>'status DESC',
-    'ta'=>'title',    'td'=>'title DESC',
-    'ua'=>'target',   'ud'=>'target DESC' );
-  // a list of all valid user preferences
-  static $PREFERENCE = array (
-    'backend-type'        => OC_Shorty_Type::STRING,
-    'backend-static-base' => OC_Shorty_Type::URL,
-    'backend-bitly-user'  => OC_Shorty_Type::STRING,
-    'backend-bitly-key'   => OC_Shorty_Type::STRING,
-    'backend-google-key'  => OC_Shorty_Type::STRING,
-    'backend-tinycc-user' => OC_Shorty_Type::STRING,
-    'backend-tinycc-key'  => OC_Shorty_Type::STRING,
-    'sms-control'         => OC_Shorty_Type::STRING,
-    'list-sort-code'      => OC_Shorty_Type::SORTKEY,
-  );
-  // valid status for entries
-  static $STATUS = array (
-    'blocked',
-    'private',
-    'shared',
-    'public',
-    'deleted',
-  );
-  // a list of implemented backends
-  static $BACKENDS = array (
-    'none'    => ' [ none ] ',
-    'static'  => 'static backend',
-//     'bitly'   => 'bitly.com service',
-//     'cligs'   => 'cli.gs service',
-    'isgd'    => 'is.gd service',
-    'google'  => 'goo.gl service',
-//     'tinycc'  => 'tiny.cc service',
-    'tinyurl' => 'ti.ny service',
-  );
-  // a list of all valid system settings
-  static $SETTING = array (
-    'backend-static-base' => OC_Shorty_Type::URL,
-  );
-  static $HTTPCODE = array (
-    200 => 'Ok',
-    201 => 'Created',
-    202 => 'Accepted',
-    203 => 'Non-Authoritative Information',
-    204 => 'No Content',
-    205 => 'Reset Content',
-    206 => 'Partial Content',
-    300 => 'Multiple Choices',
-    301 => 'Moved Permanently',
-    302 => 'Found',
-    303 => 'See Other',
-    304 => 'Not Modified',
-    305 => 'Use Proxy',
-    306 => '(unused)',
-    307 => 'Temporary Redirect',
-    400 => 'Bad Request',
-    401 => 'Unauthorized',
-    402 => 'Payment Required',
-    403 => 'Forbidden',
-    404 => 'Not Found',
-    405 => 'Method Not Allowed',
-    406 => 'Not Acceptable',
-    407 => 'Proxy Authentication Required',
-    408 => 'Request Timeout',
-    409 => 'Conflict',
-    410 => 'Gone',
-    411 => 'Length Required',
-    412 => 'Precondition Failed',
-    413 => 'Request Entity Too Large',
-    414 => 'Request-URI Too Long',
-    415 => 'Unsupported Media Type',
-    416 => 'Requested Range Not Satisfiable',
-    417 => 'Expectation Failed',
-    500 => 'Internal Server Error',
-    501 => 'Not Implemented',
-    502 => 'Bad Gateway',
-    503 => 'Service Unavailable',
-    504 => 'Gateway Timeout',
-    505 => 'HTTP Version Not Supported',
-  );
-
-  /**
-   * @method OC_Shorty_Type::validate
-   * @brief Validates a given value against a type specific regular expression
-   * Validates a given value according to the claimed type of the value.
-   * Validation is done by matching the value against a type specific regular expression. 
-   * @param value the value to be verified according to the specified type
-   * @param type the type the value is said to belong to, important for verification
-   * @param strict flag indicating if the verification should be done strict, that is if an exception should be thrown in case of a failure
-   * @returns the value itself in case of a positive validation, NULL or an exception in case of a failure, depending on the flag indication strict mode
-   * @throws error indicating a failed validation in case of strict mode
-   * @access public
-   * @author Christian Reiner
-   */
-  static function validate ( $value, $type, $strict=FALSE )
-  {
-    switch ( $type )
-    {
-      case self::ID:
-        if ( preg_match ( '/^[a-z0-9]{2,20}$/i', $value ) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::STATUS:
-        if ( in_array($value,OC_Shorty_Type::$STATUS) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::SORTKEY:
-        if ( array_key_exists ( trim($value), self::$SORTING ) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::SORTVAL:
-        if ( in_array ( trim($value), self::$SORTING ) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::STRING:
-        if ( preg_match ( '/^.*$/x', str_replace("\n","\\n",$value) ) )
-          return str_replace("\n","\\n",$value);
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::URL:
-//        $pattern = '/^([a-zA-Z][a-zA-Z][a-zA-Z0-9]+)\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&amp;%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(\/($|[a-zA-Z0-9\.\;\:\,\@\?\'\\\+&amp;%\$#\=~_\-]+)?)*$/';
-        $pattern = '/^([a-zA-Z][a-zA-Z][a-zA-Z0-9]+)\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&amp;%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(\/($|.+)?)*$/';
-        if ( preg_match ( $pattern, $value ) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::INTEGER:
-        if ( preg_match ( '/^[0-9]+$/', $value ) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::FLOAT:
-        if ( preg_match ( '/^[0-9]+(\.[0-9]+)?$/', $value ) )
-          return $value;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::TIMESTAMP:
-        if ( preg_match ( '/^[0-9]{10}$/', $value ) )
-          return $value;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-      case self::DATE:
-        if (FALSE!==($time=strtotime($value)))
-          return $time;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "invalid value '%s' for type '%s'", array( ((24<sizeof($value))?$value:substr($value,0,21).'…'),$type) );
-    } // switch $type
-    throw new OC_Shorty_Exception ( "unknown request argument type '%s'", array($type) );
-  } // function is_valid
-
-  /**
-   * @method OC_Shorty_Type::normalize
-   * @brief cleanup and formal normalization of a given value according to its type
-   * Normalizes a given value according to its claimed type.
-   * This typically means trimming of string values, but sometimes also more specific actions. 
-   * @param value the value to be normalized
-   * @param type the supposed type of the value
-   * @param strict boolean flag indicating if the normalization should be done in a strict way
-   * @returns the normalized value
-   * @throws error indicating a parameter violation
-   * @access public
-   * @author Christian Reiner
-   */
-  static function normalize ( $value, $type, $strict=FALSE )
-  {
-    if (NULL===(self::validate($value,$type,$strict)))
-    {
-      if ( ! $strict)
-        return NULL;
-      else
-        throw new OC_Shorty_Exception ( "invalid value '%1\$s' for type '%2\$s'", array($value,$type) );
-    } // if
-    switch ( $type )
-    {
-      case self::ID:        return trim ( $value );
-      case self::STATUS:    return trim ( $value );
-      case self::SORTKEY:   return trim ( $value );
-      case self::SORTVAL:   return trim ( $value );
-      case self::STRING:    return trim ( $value );
-      case self::URL:       return trim ( $value );
-      case self::INTEGER:   return sprintf ( '%d', $value );
-      case self::FLOAT:     return sprintf ( '%f', $value );
-      case self::TIMESTAMP: return trim ( $value );
-      case self::DATE:      return date ( 'Y-m-d', self::validate($value,OC_Shorty_Type::DATE) );
-    } // switch $type
-    throw new OC_Shorty_Exception ( "unknown request argument type '%s'", array($type) );
-  } // function normalize
-
-  /**
-   * @method OC_Shorty_Type::req_argument
-   * @brief returns checked request argument or throws an error
-   * @param arg (string) name of the request argument to get_argument
-   * @param strict (bool) controls if an exception will be thrown upon a missing argument
-   * @returns (string) checked and prepared value of request argument
-   * @throws error indicating a parameter violation
-   * @access public
-   * @author Christian Reiner
-   */
-  static function req_argument ( $arg, $type, $strict=FALSE )
-  {
-    switch ( $_SERVER['REQUEST_METHOD'] )
-    {
-      case 'POST':
-        if ( isset($_POST[$arg]) && !empty($_POST[$arg]) )
-          return self::normalize ( urldecode($_POST[$arg]), $type ) ;
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "missing mandatory argument '%1s'", array($arg) );
-      case 'GET':
-        if ( isset($_GET[$arg]) && !empty($_GET[$arg]) )
-          return self::normalize ( urldecode(trim($_GET[$arg])), $type, $strict );
-        elseif ( ! $strict)
-          return NULL;
-        throw new OC_Shorty_Exception ( "missing mandatory argument '%1s'", array($arg) );
-      default:
-        throw new OC_Shorty_Exception ( "unexpected http request method '%1s'", array($_SERVER['REQUEST_METHOD']) );
-    }
-  } // function req_argument
-
-} // class OC_Shorty_Query
-?>
diff --git a/apps/shorty/preferences.php b/apps/shorty/preferences.php
deleted file mode 100644
index 6e122fe410..0000000000
--- a/apps/shorty/preferences.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file settings.php
- * This plugins user preferences dialog
- * The dialog will be included in the general framework of the user preferences page
- * @access public
- * @author Christian Reiner
- */
-
-OCP\Util::addStyle  ( '3rdparty', 'chosen/chosen' );
-OCP\Util::addStyle  ( 'shorty',   'shorty' );
-OCP\Util::addStyle  ( 'shorty',   'preferences' );
-
-OCP\Util::addScript ( '3rdparty', 'chosen/chosen.jquery.min' );
-OCP\Util::addScript ( 'shorty',   'shorty' );
-OCP\Util::addScript ( 'shorty',   'preferences' );
-if ( OC_Log::DEBUG==OC_Config::getValue( "loglevel", OC_Log::WARN ) )
-  OCP\Util::addScript ( 'shorty',  'debug' );
-
-
-// fetch template
-$tmpl = new OCP\Template ( 'shorty', 'tmpl_preferences' );
-// inflate template
-$backend_types = OC_Shorty_Type::$BACKENDS;
-// kick out static option again if no global backend base has been specified in the system settings
-$backend_static_base = OCP\Config::getAppValue('shorty','backend-static-base','');
-if (   empty($backend_static_base)
-    || !parse_url($backend_static_base,PHP_URL_SCHEME)
-    || !parse_url($backend_static_base,PHP_URL_HOST) )
-  unset($backend_types['static']);
-// feed template engine
-$tmpl->assign ( 'backend-types',       $backend_types );
-$tmpl->assign ( 'backend-static-base', $backend_static_base );
-$tmpl->assign ( 'backend-bitly-user',  OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-bitly-user','') );
-$tmpl->assign ( 'backend-bitly-key',   OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-bitly-key','') );
-$tmpl->assign ( 'backend-google-key',  OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-google-key','') );
-$tmpl->assign ( 'backend-tinycc-user', OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-tinycc-user','') );
-$tmpl->assign ( 'backend-tinycc-key',  OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-tinycc-key','') );
-$tmpl->assign ( 'backend-type',        OCP\Config::getUserValue(OCP\User::getUser(),'shorty','backend-type','') );
-$tmpl->assign ( 'sms-control',         OCP\Config::getUserValue(OCP\User::getUser(),'shorty','sms-control','disabled') );
-// render template
-return $tmpl->fetchPage ( );
-?>
diff --git a/apps/shorty/qrcode.php b/apps/shorty/qrcode.php
deleted file mode 100644
index 43b91b22af..0000000000
--- a/apps/shorty/qrcode.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file qrcode.php
- * Generates qr code barcodes cading a specified url
- * @access public
- * @author Christian Reiner
- */
-
-require_once ( '3rdparty/php/phpqrcode.php' );
-
-$source = NULL;
-// we try to guess what the request indicates:
-// - a (source) url to be looked up in the database
-foreach ($_GET as $key=>$val) // in case there are unexpected, additional arguments like a timestamp added by some stupid proxy
-{
-  switch ($key)
-  {
-    default:
-      // unrecognized key, we ignore it
-      break;
-    case 'url':
-    case 'uri':
-    case 'ref':
-    case 'source':
-    case 'target':
-      // a recognized argument key indicating an id to be looked up
-      $source = OC_Shorty_Type::req_argument($key,OC_Shorty_Type::URL,FALSE);
-      break 2; // skip switch AND foreach
-  } // switch
-} // foreach
-
-// generate qr code for the specified url, IF it exists and is usable in the database
-try
-{
-  if ( $source )
-  {
-    $param = array ( 'source' => OC_Shorty_Type::normalize($source,OC_Shorty_Type::URL) );
-    $query  = OCP\DB::prepare ( OC_Shorty_Query::URL_SOURCE );
-    $result = $query->execute($param)->FetchAll();
-
-    if ( FALSE===$result )
-      throw new OC_Shorty_HttpException ( 500 );
-    elseif ( ! is_array($result) )
-      throw new OC_Shorty_HttpException ( 500 );
-    elseif ( 0==sizeof($result) )
-    {
-      // no entry found => 404: Not Found
-      throw new OC_Shorty_HttpException ( 404 );
-    }
-    elseif ( 1<sizeof($result) )
-    {
-      // multiple matches => 409: Conflict
-      throw new OC_Shorty_HttpException ( 409 );
-    }
-    elseif ( (!array_key_exists(0,$result)) || (!is_array($result[0])) || (!array_key_exists('source',$result[0])) )
-    {
-      // invalid entry => 500: Internal Server Error
-      throw new OC_Shorty_HttpException ( 500 );
-    }
-    elseif ( (!array_key_exists('source',$result[0])) || ('1'==$result[0]['expired']) )
-    {
-      // entry expired => 410: Gone
-      throw new OC_Shorty_HttpException ( 410 );
-    }
-    // generate qrcode, regardless of who sends the request
-    QRcode::png ( $source );
-  } // if $source
-  else
-  {
-    // refuse forwarding => 403: Forbidden
-    throw new OC_Shorty_HttpException ( 403 );
-  }
-} catch ( OC_Shorty_Exception $e ) { header($e->getMessage()); }
-
-?>
diff --git a/apps/shorty/relay.php b/apps/shorty/relay.php
deleted file mode 100644
index 077a3625af..0000000000
--- a/apps/shorty/relay.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file relay.php
- * This is the plugins central relaying feature
- * All relay requests are handled by this file.
- * @access public
- * @author Christian Reiner
- */
-
-OCP\App::setActiveNavigationEntry ( 'shorty_index' );
-
-$arg = NULL;
-// we try to guess what the request indicates:
-// - a (shorty) id to be looked up in the database resulting in a forwarding to the stored target
-// - a (target) url to be added as a new shorty
-// - none of the two, so just a plain list of existing shortys
-foreach ($_GET as $key=>$val) // in case there are unexpected, additional arguments like a timestamp added by some stupid proxy
-{
-  switch ($key)
-  {
-    default:
-      // unrecognized key, we ignore it
-      break;
-    case 'id':
-    case 'shorty':
-    case 'ref':
-    case 'entry':
-      // a recognized argument key indicating an id to be looked up
-      $arg = OC_Shorty_Type::req_argument($key,OC_Shorty_Type::ID,FALSE);
-      break 2; // skip switch AND foreach
-  } // switch
-} // foreach
-
-// an id was specified, ordinary or special meaning ?
-if ( '0000000000'==$arg )
-{
-  // this is a pseudo id, used to test the setup, so just return a positive message.
-  // this is used to test the setup of the static backend, shorty calls itself from there
-  OCP\Util::writeLog( 'shorty', "Positiv validation of static backend base url", OC_Log::INFO );
-  OCP\JSON::success ( array ( ) );
-  exit();
-}
-
-// now construct the target url and relay to it (if applicable)
-try
-{
-  // detect requested shorty id from request
-  $p_id = trim ( OC_Shorty_Type::normalize($arg,OC_Shorty_Type::ID) ) ;
-  if ( $p_id )
-  {
-    $param = array
-    (
-      'id' => $p_id,
-    );
-    $query  = OCP\DB::prepare ( OC_Shorty_Query::URL_FORWARD );
-    $result = $query->execute($param)->FetchAll();
-    if ( FALSE===$result )
-      throw new OC_Shorty_HttpException ( 500 );
-    elseif ( ! is_array($result) )
-      throw new OC_Shorty_HttpException ( 500 );
-    elseif ( 0==sizeof($result) )
-    {
-      // no entry found => 404: Not Found
-      throw new OC_Shorty_HttpException ( 404 );
-    }
-    elseif ( 1<sizeof($result) )
-    {
-      // multiple matches => 409: Conflict
-      throw new OC_Shorty_HttpException ( 409 );
-    }
-    elseif ( (!array_key_exists(0,$result)) || (!is_array($result[0])) || (!array_key_exists('target',$result[0])) )
-    {
-      // invalid entry => 500: Internal Server Error
-      throw new OC_Shorty_HttpException ( 500 );
-    }
-    elseif ( (!array_key_exists('target',$result[0])) || ('1'==$result[0]['expired']) )
-    {
-      // entry expired => 410: Gone
-      throw new OC_Shorty_HttpException ( 410 );
-    }
-    // an usable target !
-    $target = trim($result[0]['target']);
-    // check status of matched entry
-    switch (trim($result[0]['status']))
-    {
-      default:
-      case 'blocked':
-        // refuse forwarding => 403: Forbidden
-        throw new OC_Shorty_HttpException ( 403 );
-      case 'private':
-        // check if user owns the Shorty, deny access if not
-        if ( $result[0]['user']!=OCP\User::getUser() )
-          // refuse forwarding => 403: Forbidden
-          throw new OC_Shorty_HttpException ( 403 );
-        // NO break; but fall through to the action in 'case public:'
-      case 'shared':
-        // check if we are a user, deny access if not
-        if ( ! OCP\User::isLoggedIn() )
-          // refuse forwarding => 403: Forbidden
-          throw new OC_Shorty_HttpException ( 403 );
-        // NO break; but fall through to the action in 'case public:'
-      case 'public':
-        // forward to target, regardless of who sends the request
-        header("HTTP/1.0 301 Moved Permanently");
-        // http forwarding header
-        header ( sprintf('Location: %s', $target) );
-    } // switch status
-    // register click in shorty
-    $query = OCP\DB::prepare ( OC_Shorty_Query::URL_CLICK );
-    $query->execute ( $param );
-    exit();
-  } // if id
-} catch ( OC_Shorty_Exception $e ) { header($e->getMessage()); }
-
-?>
diff --git a/apps/shorty/settings.php b/apps/shorty/settings.php
deleted file mode 100644
index f10e354a7b..0000000000
--- a/apps/shorty/settings.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-
-/**
- * @file settings.php
- * This plugins system settings dialog
- * The dialog will be included in the general framework of the system settings page
- * @access public
- * @author Christian Reiner
- */
-
-OCP\Util::addStyle  ( '3rdparty', 'chosen/chosen' );
-OCP\Util::addStyle  ( 'shorty',   'shorty' );
-OCP\Util::addStyle  ( 'shorty',   'settings' );
-
-OCP\Util::addScript ( '3rdparty', 'chosen/chosen.jquery.min' );
-OCP\Util::addScript ( 'shorty',   'shorty' );
-OCP\Util::addScript ( 'shorty',   'settings' );
-if ( OC_Log::DEBUG==OC_Config::getValue( "loglevel", OC_Log::WARN ) )
-  OCP\Util::addScript ( 'shorty',  'debug' );
-
-
-// fetch template
-$tmpl = new OCP\Template ( 'shorty', 'tmpl_settings' );
-// inflate template
-$tmpl->assign ( 'backend-static-base', OCP\Config::getAppValue('shorty','backend-static-base','') );
-// render template
-return $tmpl->fetchPage ( );
-?>
diff --git a/apps/shorty/templates/tmpl_dlg_qrcode.php b/apps/shorty/templates/tmpl_dlg_qrcode.php
deleted file mode 100644
index 15b0eb2c36..0000000000
--- a/apps/shorty/templates/tmpl_dlg_qrcode.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_dlg_qrcode.php
- * Dialog popup to visualize and offer an url as a QRCode (2D barcode)
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- additional (hidden) popup dialogs for specific usage actions -->
-<fieldset id="dialog-qrcode" style="display:none;" class="" style="align:center;">
-  <input id="qrcode-url" type="hidden" value="<?php echo $_['qrcode-url']; ?>">
-  <span id='qrcode-img'>
-    <?php echo $l->t("Click for qrcode url").":"; ?>
-    <br>
-  <img width="100%" class="shorty-status" border="1" alt="<?php echo $l->t("QRCode"); ?>"
-       src="<?php echo OCP\Util::imagePath('shorty','loading-disk.gif'); ?>" >
-  </span>
-  <span id='qrcode-val' style="display:none;">
-    <?php echo $l->t("Click for qrcode image").":"; ?>
-    <br>
-    <span class="shorty-framed"><a title="<?php echo $l->t("QRCode url").":"; ?>"></a></span>
-  </span>
-</fieldset>
-<!-- end of qrcode dialog -->
diff --git a/apps/shorty/templates/tmpl_dlg_verify.php b/apps/shorty/templates/tmpl_dlg_verify.php
deleted file mode 100644
index 14b10d8417..0000000000
--- a/apps/shorty/templates/tmpl_dlg_verify.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_dlg_verify.php
- * Dialog popup to validate a configured static backend base
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- a (usually hidden) dialog used for verification of the correct setup of the 'static' backend -->
-<div id="dialog-verification" style="display:none;" title="<?php echo $l->t("'Static' backend: base url verification"); ?>">
-  <!-- verification-in-progress -->
-  <div id="hourglass">
-    <img src="<?php echo OCP\Util::imagePath('shorty', 'loading-disk.gif'); ?>">
-  </div>
-  <!-- success -->
-  <div id="success" style="display:none;">
-    <fieldset>
-      <legend>
-        <img class="shorty-status" src="<?php echo OCP\Util::imagePath('shorty','status/good.png'); ?>" alt="<?php $l->t('Success') ?>" title="<?php $l->t('Verification successful') ?>">
-        <span id="title" class="title"><strong>Verification successful !</strong></span>
-      </legend>
-      <?php echo $l->t("<p>Great, your setup appears to be working fine ! </p>".
-                       "<p>Requests to the configured base url '%s' are mapped to this ownClouds shorty module at '%1\$s'</p>".
-                       "<p>Usage of that static backend is fine and safe as long as this setup is not altered.</p>",
-                       array('<a id="verification-target" style="font-family:Monospace;"></a>',OCP\Util::linkToAbsolute('shorty','index.php')) );?>
-    </fieldset>
-  </div>
-  <!-- failure -->
-  <div id="failure" style="display:none;">
-    <fieldset>
-      <legend>
-        <img class="shorty-status" src="<?php echo OCP\Util::imagePath('shorty','status/bad.png'); ?>" alt="<?php $l->t('Success') ?>" title="<?php $l->t('Verification successful') ?>">
-        <span id="title" class="title"><strong>Verification failed !</strong></span>
-      </legend>
-      <?php echo $l->t("Sorry, but your setup appears not be be working correctly yet.<p>".
-                       "Please check your setup and make sure that the configured base url '%1\$s' is indeed correct ".
-                       "and that all requests to it are somehow mapped to ownClouds shorty module at '%2\$s'.",
-                       array('<a id="verification-target" style="font-family:Monospace;"></a>',OCP\Util::linkToAbsolute('shorty','index.php')) );?>
-    </fieldset>
-  </div>
-</div>
-<!-- end of verification dialog -->
diff --git a/apps/shorty/templates/tmpl_http_status.php b/apps/shorty/templates/tmpl_http_status.php
deleted file mode 100644
index a43b4e3c32..0000000000
--- a/apps/shorty/templates/tmpl_http_status.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_http_status.php
- * Displays a human readable version of a classical http status error
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<ul>
-  <li class='error'>
-    <?php echo $_['explanation']; ?>
-  </li>
-</ul>
diff --git a/apps/shorty/templates/tmpl_index.php b/apps/shorty/templates/tmpl_index.php
deleted file mode 100644
index fc4c4f9161..0000000000
--- a/apps/shorty/templates/tmpl_index.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_index.php
- * The general html environment where specific templates are bedded into. 
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- central notification area -->
-<div id='notification'></div>
-
-<!-- top control bar -->
-<div id="controls" class="controls shorty-controls" data-referrer="<?php if (array_key_exists('shorty-referrer',$_)) echo $_['shorty-referrer']; ?>">
-  <!-- button to add a new entry to list -->
-  <input type="button" id="add" value="<?php echo OC_Shorty_L10n::t('New Shorty'); ?>"/>
-  <!-- display label: number of entries in list -->
-  <span>
-        <a class="shorty-prompt"><?php echo OC_Shorty_L10n::t('Number of entries') ?>:</a>
-        <a id="sum_shortys" class="shorty-value">
-        <img src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></a>
-  </span>
-  <!-- display label: total of clicks in list -->
-  <span>
-        <a class="shorty-prompt"><?php echo OC_Shorty_L10n::t('Total of clicks') ?>:</a>
-        <a id="sum_clicks" class="shorty-value">
-        <img src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></a>
-  </span>
-  <!-- the dialogs, hidden by default --> 
-<?php require_once('tmpl_url_add.php'); ?>
-<?php require_once('tmpl_url_edit.php'); ?>
-<?php require_once('tmpl_url_show.php'); ?>
-<?php require_once('tmpl_url_share.php'); ?>
-</div>
-
-<!-- the "desktop where the action takes place -->
-<div id="desktop" class="right-content shorty-desktop">
-<?php require_once('tmpl_url_list.php'); ?>
-</div>
diff --git a/apps/shorty/templates/tmpl_preferences.php b/apps/shorty/templates/tmpl_preferences.php
deleted file mode 100644
index 61294c1914..0000000000
--- a/apps/shorty/templates/tmpl_preferences.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_preferences.php
- * Dialog to change user preferences, to be included in the clouds preferences page.
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<form id="shorty">
-  <fieldset class="personalblock">
-    <div id="title" class="title">
-      <img class="" src="<?php echo OCP\Util::imagePath("shorty","shorty.png"); ?> ">
-      <strong>Shorty</strong>
-    </div>
-    <div id="settings">
-      <!-- shortlet -->
-      <label for="shortlet" class="aspect"><?php echo $l->t("Shortlet").":";?></label>
-      <span id="shortlet">
-        <a class="shortlet"
-           href="javascript:(function(){url=encodeURIComponent(location.href);window.open('<?php echo OCP\Util::linkToAbsolute('shorty', 'index.php'); ?>&url='+url, 'owncloud-shorty')%20})()">
-          <?php echo $l->t("Add page as 'Shorty' to ownCloud"); ?>
-        </a>
-      </span>
-      <p>
-      <span class="explain"><em><?php echo $l->t("Drag this to your browser bookmarks.");
-                                      echo $l->t("Click it, for whatever site you want to create a Shorty."); ?></em></span>
-      </p>
-      <p>
-      <!-- backend selection -->
-      <label for="backend-type" class="aspect"><?php echo $l->t("Backend").":";?></label>
-      <!-- list of available backend types -->
-      <span style="margin-right:1em;">
-        <select id="backend-type" name="backend-type" style="width:11em;" class="chosen"
-                placeholder="<?php echo $l->t("Choose service…"); ?>" >
-          <?php
-            foreach ( $_['backend-types'] as $value=>$display )
-              echo sprintf ( "        <option value=\"%s\" %s>%s</option>\n",
-                             $value,
-                             ($value==$_['backend-type']?'selected':''),
-                             $l->t($display) );
-          ?>
-        </select>
-      </span>
-      <!-- some additional fields: input, explanation and example -->
-      <!-- depending on the chosen backend-type above only one of the following span tags will be displayed -->
-      <span id="backend-none" class="backend-supplement" style="display:none;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <span id="example" class="example"><?php echo sprintf('http://%s%s<em>&lt;shorty id&gt;</em>',$_SERVER['SERVER_NAME'],OCP\Util::linkTo('shorty','',false)) ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo sprintf('%s<br />%s<br />%s',
-                             $l->t("No backend is used, direct links pointing to your ownCloud are generated."),
-                             $l->t("Such links are most likely longer than those generated when using a backend."),
-                             $l->t("However this option does not rely on any third party service and keeps your shortys under your control.") ); ?>
-        </span>
-      </span>
-      <!-- backend -static- -->
-      <span id="backend-static" class="backend-supplement" style="display:none;">
-        <label for="backend-static-base" class="aspect"><?php echo $l->t("Base url").':';?></label>
-        <input id="backend-static-base" type="text" name="backend-static-base"
-               readonly disabled value="<?php echo $_['backend-static-base']; ?>"
-               placeholder="<?php echo $l->t("Specify a backend base url…"); ?>" style="width:25em;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <a id="example" class="example" title="<?php echo $l->t("Verification by click");?>">
-            <?php echo sprintf('http://%s/<em>&lt;service&gt;</em>/<em>&lt;shorty id&gt;</em>',$_SERVER['SERVER_NAME']) ?>
-          </a>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo sprintf("%s<br />\n%s<br />\n%s<br />\n%s",
-                             $l->t("A static, rule-based backend is used, shorty links are generated relative to a given base url."),
-                             $l->t("Since this setup depends on server based configuration rules the base url can only be specified in the 'Admin' section of the configuration."),
-                             $l->t("Have a try with the example link provided, click it, it should result in a confirmation that your setup is working."),
-                             $l->t("Only use this backend, if you can provide a short base url that is mapped the described way. Your shorties won't work otherwise.") ); ?>
-        </span>
-      </span>
-      <!-- backend bit.ly -->
-      <span id="backend-bitly" class="backend-supplement" style="display:none;">
-        <label for="backend-bitly-user" class="aspect"><?php echo $l->t("bit.ly user").':';?></label>
-        <input id="backend-bitly-user" type="text" name="backend-bitly-user" value="<?php echo $_['backend-bitly-user']; ?>"
-               maxlength="256" placeholder="<?php echo $l->t("bit.ly user name");?>" style="width:10em;">
-        <label for="backend-bitly-key" class="aspect"><?php echo $l->t("bit.ly key").':';?></label>
-        <input id="backend-bitly-key" type="text" name="backend-bitly-key" value="<?php echo $_['backend-bitly-key']; ?>"
-               maxlength="256" placeholder="<?php echo $l->t("bit.ly users key");?>" style="width:18em;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <span id="example" class="example"><?php echo sprintf('http://bitly.com/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo sprintf("%s<br />\n%s<br />\n%s",
-                             $l->t("The external 'bitly.com' service is used to register a short url for each generated shorty."),
-                             $l->t("The service requires you to authenticate yourself by providing a valid bit.ly user name and an '%s'.",
-                                   sprintf('<a class="external" href="http://bitly.com/a/your_api_key" target="_blank">%s</a>',$l->t("API access key")) ),
-                             $l->t("This means you have to '%s' at their site first.", 
-                                   sprintf('<a class="external" href="http://bitly.com/a/sign_up" target="_blank">%s</a>',$l->t("register an account")) ) ); ?>
-        </span>
-      </span>
-      <!-- backend cligs -->
-      <span id="backend-cligs" class="backend-supplement" style="display:none;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <span id="example" class="example"><?php echo sprintf('http://cli.gs/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo $l->t("The external 'cli.gs' service is used to register a short url for each generated shorty.");?>
-        </span>
-      </span>
-      <!-- backend is.gd -->
-      <span id="backend-isgd" class="backend-supplement" style="display:none;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <span id="example" class="example"><?php echo sprintf('http://is.gd/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo $l->t("The external 'is.gd' service is used to register a short url for each generated shorty.");?>
-        </span>
-      </span>
-      <!-- backend google -->
-      <span id="backend-google" class="backend-supplement" style="display:none;">
-        <label for="backend-google-key" class="aspect"><?php echo $l->t("API key").':';?></label>
-        <input id="backend-google-key" type="text" name="backend-google-key" value="<?php echo $_['backend-google-key']; ?>"
-               maxlength="256" placeholder="<?php echo $l->t("Google API key");?>" style="width:24em;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <span id="example" class="example"><?php echo sprintf('http://goo.gl/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo sprintf("%s<br />\n%s<br />\n%s<br />\n%s",
-                             $l->t("Googles external 'goo.gl service' is used to register a short url for each generated shorty."),
-                             $l->t("You must provide a valid '%s' to use this service.",
-                                   sprintf('<a class="external" href="https://code.google.com/apis/console/" target="_blank">%s</a>',$l->t("Google API key")) ),
-                             $l->t("This means you require a 'Google API console account'."),
-                             $l->t("Register a new '%s' at their pages.", array(
-                                   sprintf('<a class="external" href="https://code.google.com/apis/console/" target="_blank">%s</a>',$l->t("Google API account")) ) ) );?>
-        </span>
-      </span>
-      <!-- backend tinycc -->
-      <span id="backend-tinycc" class="backend-supplement" style="display:none;">
-        <label for="backend-tinycc-user" class="aspect"><?php echo $l->t("tiny.cc user").':'; ?></label>
-        <input id="backend-tinycc-user" type="text" name="backend-tinycc-user" value="<?php echo $_['backend-tinycc-user']; ?>"
-               maxlength="256" placeholder="<?php echo $l->t("tiny.cc user name"); ?>" style="width:10em;">
-        <label for="backend-tinycc-key" class="aspect"><?php echo $l->t("tiny.cc key").':'; ?></label>
-        <input id="backend-tinycc-key" type="text" name="backend-tinycc-key" value="<?php echo $_['backend-tinycc-key']; ?>"
-               maxlength="256" placeholder="<?php echo $l->t("tiny.cc user key"); ?>" style="width:19em;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-          <span id="example" class="example"><?php echo sprintf('http://tiny.cc/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo sprintf ( "%s<br />\n%s<br />\n%s",
-                               $l->t("The external 'tiny.cc' service is used to register a short url for each generated shorty."),
-                               $l->t("The service requires you to authenticate yourself by providing a valid tiny.cc user name and an api access key."),
-                               $l->t("This means you have to register an '%s' at their site first.", array (
-                                     sprintf('<a class="external" href="http://tiny.ccc/" target="_blank">%s</a>', $l->t("account") ) ) ) ); ?>
-        </span>
-      </span>
-      <!-- backend tinyURL -->
-      <span id="backend-tinyurl" class="backend-supplement" style="display:none;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':'; ?></label>
-          <span id="example" class="example"><?php echo sprintf('http://ti.ny/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo $l->t("The external 'ti.ny' service is used to register a short url for each generated shorty.");?>
-        </span>
-      </span>
-      <!-- backend turl -->
-      <span id="backend-turl" class="backend-supplement" style="display:none;">
-        <br/>
-        <label for="backend-example" class="aspect"> </label>
-        <span id="backend-example">
-          <label for="example" class="aspect"><?php echo $l->t("Example").':'; ?></label>
-          <span id="example" class="example"><?php echo sprintf('http://turl.ca/<em>&lt;shorty id&gt;</em>') ?></span>
-        </span>
-        <br/>
-        <span id="explain" class="explain">
-          <?php echo $l->t("The external 'turl' service is used to register a short url for each generated shorty."); ?>
-        </span>
-      </span>
-      </p>
-      <p>
-      <!-- sms -->
-      <label for="sms" class="aspect"><?php echo $l->t("SMS").":";?></label>
-      <span id="sms" style="margin-right:1em;">
-        <select id="sms-control" name="sms-control" style="width:11em;" class="chosen">
-          <?php echo sprintf("<option value=\"disabled\" %s>%s</option>\n",
-                             ('enabled'!=$_['sms-control']?'selected':''),
-                             $l->t('disabled') ); ?>
-          <?php echo sprintf("<option value=\"enabled\" %s>%s</option>\n",
-                             ('enabled'==$_['sms-control']?'selected':''),
-                             $l->t('enabled')); ?>
-        </select>
-        <em><?php echo $l->t("Enabling the SMS option will offer sending a Shorty via SMS."); ?></em>
-      </span>
-      <p>
-      <span class="explain"><em><?php echo $l->t("Unfortunately support for 'SMS url handling' is usually only found on mobile devices like smart phones.")."<br>\n";
-                                      echo $l->t("In addition, the implementations found in Android or iOS are minimalistic, buggy and differ from system to system.")."<br>\n";
-                                      echo $l->t("In short: this might not work for you, therefore you can disable it…")."<br>\n";?></em></span>
-      </p>
-    </div>
-    <!-- a (usually hidden) dialog used for verification of the correct setup of the 'static' backend -->
-    <?php require_once('tmpl_dlg_verify.php'); ?>
-  </fieldset>
-</form>
diff --git a/apps/shorty/templates/tmpl_settings.php b/apps/shorty/templates/tmpl_settings.php
deleted file mode 100644
index bcbab5ae01..0000000000
--- a/apps/shorty/templates/tmpl_settings.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_settings.php
- * Dialog to change plugin settings, to be included in the clouds settings page.
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- settings of app 'shorty' -->
-<form id="shorty">
-  <fieldset class="personalblock">
-    <legend>
-      <span id="title" class="title">
-        <img class="" src="<?php echo OCP\Util::imagePath("shorty","shorty.png"); ?> ">
-        <strong>Shorty</strong>
-      </span>
-    </legend>
-    <div id="backend-static" class="backend-supplement">
-      <label for="backend-static-base" class="aspect"><?php echo $l->t("Base url").':';?></label>
-      <input id="backend-static-base" type="text" name="backend-static-base"
-            value="<?php echo $_['backend-static-base']; ?>"
-            maxlength="256" placeholder="<?php echo $l->t('Specify a static base url…');?>" style="width:25em;">
-      <br/>
-      <label for="backend-example" class="aspect"> </label>
-      <span id="backend-example">
-        <label for="example" class="aspect"><?php echo $l->t("Example").':';?></label>
-        <a id="example" class="example" title="<?php echo $l->t("Verification by click");?>">
-          <?php echo sprintf('http://%s/<em>&lt;service&gt;</em>/<em>&lt;shorty id&gt;</em>',$_SERVER['SERVER_NAME']) ?>
-        </a>
-      </span>
-      <br/>
-      <span id="explain" class="explain"><?php echo sprintf("%s<br />\n%s<br />\n%s<br />\n%s",
-        $l->t("Static, rule-based backend, generates shorty links relative to a given base url."),
-        $l->t("You have to take care that any request to the url configured here is internally mapped to the 'shorty' module."),
-        $l->t("Have a try with the example link provided, click it, it should result in a confirmation that your setup is working."),
-        $l->t("Leave empty if you can't provide a short base url that is mapped the described way.") ); ?>
-      </span>
-    </div>
-
-    <?php require_once('tmpl_dlg_verify.php'); ?>
-  </fieldset>
-</form>
diff --git a/apps/shorty/templates/tmpl_url_add.php b/apps/shorty/templates/tmpl_url_add.php
deleted file mode 100644
index abf51bdab7..0000000000
--- a/apps/shorty/templates/tmpl_url_add.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_url_add.php
- * A dialog to add a remote target url as a new shorty.
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- (hidden) dialog to add a new shorty -->
-<form id="dialog-add" class="shorty-dialog shorty-standalone">
-  <fieldset>
-    <legend class="">
-      <a id="close" class="shorty-close-button"
-        title="<?php echo OC_Shorty_L10n::t('Close'); ?>">
-        <img alt="<?php echo OC_Shorty_L10n::t('Close'); ?>"
-            src="<?php echo OCP\Util::imagePath('shorty','actions/shade.png');  ?>">
-      </a>
-      <?php echo OC_Shorty_L10n::t('Add a new shorty').':'; ?>
-    </legend>
-    <label for="target"><?php echo OC_Shorty_L10n::t('Target url').':'; ?></label>
-    <input id="target" name="target" type="text" maxlength="4096" data="" class=""/>
-    <br />
-    <label for="meta">&nbsp;<img id="busy" height="12px" src="<?php echo OCP\Util::imagePath('shorty', 'loading-led.gif'); ?>"></label>
-    <span id="meta" class="shorty-meta">
-    <img id="staticon"  class="shorty-icon" src="" width="16" data="<?php echo OCP\Util::imagePath('shorty', 'status/neutral.png'); ?>">
-    <img id="schemicon" class="shorty-icon" src="" width="16" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-    <img id="favicon"   class="shorty-icon" src="" width="16" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-    <img id="mimicon"   class="shorty-icon" src="" width="16" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-    <a id="explanation" maxlength="80" data="" class="shorty-value"></a>
-    </span>
-    <br />
-    <label for="title"><?php echo OC_Shorty_L10n::t('Shorty title').':'; ?></label>
-    <input id="title" name="title" type="text" maxlength="80" data="" class="" placeholder=""/>
-    <br />
-    <label for="status"><?php echo OC_Shorty_L10n::t('Status').':'; ?></label>
-    <select id="status" name="status" data="shared" value="shared" class="">
-    <?php
-      foreach ( OC_Shorty_Type::$STATUS as $status )
-        if ( 'deleted'!=$status )
-          echo sprintf ( "<option value=\"%s\">%s</option>\n", $status, OC_Shorty_L10n::t($status) );
-    ?>
-    </select>
-    <span style="display:inline-block;">
-    <label for="until"><?php echo OC_Shorty_L10n::t('Expiration').':'; ?></label>
-    <input id="until" name="until" type="text" maxlength="10" value=""
-           data="" class="" style="width:8em;"
-           placeholder="-<?php echo OC_Shorty_L10n::t('never'); ?>-"
-           icon="<?php echo OCP\Util::imagePath('shorty', 'calendar.png'); ?>"/>
-    </span>
-    <br />
-    <label for="notes"><?php echo OC_Shorty_L10n::t('Notes').':'; ?></label>
-    <textarea id="notes" name="notes" maxlength="4096" data="" class=""
-              placeholder="<?php echo OC_Shorty_L10n::t('Anything that appears helpful …'); ?>"></textarea>
-    <br />
-    <label for="confirm"></label>
-    <button id="confirm" class="shorty-button-submit"><?php echo OC_Shorty_L10n::t('Add as new'); ?></button>
-  </fieldset>
-</form>
diff --git a/apps/shorty/templates/tmpl_url_edit.php b/apps/shorty/templates/tmpl_url_edit.php
deleted file mode 100644
index 395b75ecab..0000000000
--- a/apps/shorty/templates/tmpl_url_edit.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_url_edit.php
- * A dialog to modify some aspects of a selected shorty.
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- (hidden) dialog to modify a stored shorty -->
-<form id="dialog-edit" class="shorty-dialog shorty-standalone">
-  <fieldset>
-    <legend class="">
-      <a id="close" class="shorty-close-button"
-        title="<?php echo OC_Shorty_L10n::t('Close'); ?>">
-        <img alt="<?php echo OC_Shorty_L10n::t('Close'); ?>"
-            src="<?php echo OCP\Util::imagePath('shorty','actions/shade.png');  ?>">
-      </a>    
-      <?php echo OC_Shorty_L10n::t('Modify shorty').':'; ?>
-    </legend>
-    <input id="id" name="id" type="hidden" readonly data="" class="" readonly disabled />
-    <label for="source"><?php echo OC_Shorty_L10n::t('Source url').':'; ?></label>
-    <input id="source" name="source" type="text" data="" class="" readonly disabled />
-    <br />
-    <label for="target"><?php echo OC_Shorty_L10n::t('Target url').':'; ?></label>
-    <input id="target" name="target" type="text" data="" class="" readonly />
-    <br />
-    <label for="meta">&nbsp;</label>
-    <span id="meta">
-    <img id="staticon"  class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'status/neutral.png'); ?>">
-    <img id="schemicon" class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-    <img id="favicon"   class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-    <img id="mimicon"   class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-    <a id="explanation" maxlength="80" data="" class="shorty-value"></a>
-    </span>
-    <br />
-    <label for="title"><?php echo OC_Shorty_L10n::t('Shorty title').':'; ?></label>
-    <input id="title" name="title" type="text" maxlength="80" data="" class="" />
-    <br />
-    <label for="status"><?php echo OC_Shorty_L10n::t('Status').':'; ?></label>
-    <select id="status" name="status" data="shared" value="shared" style="width:8em;" class="">
-    <?php
-      foreach ( OC_Shorty_Type::$STATUS as $status )
-        if ( 'deleted'!=$status )
-          echo sprintf ( "<option value=\"%s\">%s</option>\n", $status, OC_Shorty_L10n::t($status) );
-    ?>
-    </select>
-    <span style="display:inline;">
-    <label for="until"><?php echo OC_Shorty_L10n::t('Expiration').':'; ?></label>
-    <input id="until" name="until" type="text" value=""
-           maxlength="10" data="" class="" style="width:8em;"
-           placeholder="-<?php echo OC_Shorty_L10n::t('never'); ?>-"
-           icon="<?php echo OCP\Util::imagePath('shorty', 'calendar.png'); ?>" />
-    </span>
-    <br />
-    <label for="notes"><?php echo OC_Shorty_L10n::t('Notes').':'; ?></label>
-    <textarea id="notes" name="notes" maxlength="4096" data="" class=""
-              placeholder="<?php echo OC_Shorty_L10n::t('Anything that appears helpful …'); ?>">
-    </textarea>
-    <br />
-    <span class="label-line">
-    <label for="clicks"><?php echo OC_Shorty_L10n::t('Clicks').':'; ?></label>
-    <input id="clicks" name="clicks" data="" type="textarea" class="" style="width:1em;" readonly disabled />
-    <label for="created"><?php echo OC_Shorty_L10n::t('Creation').':'; ?></label>
-    <input id="created" name="created" type="text" data="" class="" style="width:7em;" readonly disabled />
-    <label for="accessed"><?php echo OC_Shorty_L10n::t('Access').':'; ?></label>
-    <input id="accessed" name="accessed" type="text" data="" class="" style="width:10em;" readonly disabled />
-    </span>
-    <br />
-    <label for="confirm"></label>
-    <button id="confirm" class="shorty-button-submit"><?php echo OC_Shorty_L10n::t('Save'); ?></button>
-  </fieldset>
-</form>
diff --git a/apps/shorty/templates/tmpl_url_list.php b/apps/shorty/templates/tmpl_url_list.php
deleted file mode 100644
index 7a93eab9d8..0000000000
--- a/apps/shorty/templates/tmpl_url_list.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_url_list.php
- * A table to visualize the list of existing shortys.
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<div id="hourglass" class="shorty-hourglass" style="left:10em;top:10em;"><img src="<?php echo OCP\Util::imagePath('shorty', 'loading-disk.gif'); ?>"></div>
-<div id="vacuum" class="shorty-vacuum"><span class="shorty-label"><?php echo OC_Shorty_L10n::t('List currently empty.') ?></span></div>
-
-<!-- the list of urls -->
-<table id="list" class="shorty-list" style="display:none;">
-  <thead>
-    <tr id="titlebar">
-      <!-- a button to open/close the toolbar below -->
-      <th id="favicon"><span><img id="tools" alt="toolbar" title="toggle toolbar"
-                                  src="<?php echo OCP\Util::imagePath('shorty','actions/plus.png'); ?>"
-                                  data-plus="<?php echo OCP\Util::imagePath('shorty','actions/plus.png'); ?>"
-                                  data-minus="<?php echo OCP\Util::imagePath('shorty','actions/minus.png'); ?>"></span></th>
-      <th id="title"  ><span><?php echo OC_Shorty_L10n::t('Title')      ?></span></th>
-      <th id="target" ><span><?php echo OC_Shorty_L10n::t('Target')     ?></span></th>
-      <th id="clicks" ><span><?php echo OC_Shorty_L10n::t('Clicks')     ?></span></th>
-      <th id="until"  ><span><?php echo OC_Shorty_L10n::t('Expiration') ?></span></th>
-      <th id="status" ><span><?php echo OC_Shorty_L10n::t('Status')     ?></span></th>
-      <th id="action" ><span>&nbsp;</span></th>
-    </tr>
-    <!-- toolbar opened/closed by the button above -->
-    <tr id="toolbar">
-      <th id="favicon">
-        <div style="display:none;">
-          <a id="reload"><img alt="<?php echo $l->t('reload'); ?>" title="<?php echo $l->t('Reload list'); ?>" src="<?php echo OCP\Util::imagePath('shorty','actions/reload.png'); ?>"></a>
-        </div>
-      </th>
-      <th id="title">
-        <div style="display:none;">
-          <img id="sort-up" class="shorty-sorter" data-sort-code="ta" data-sort-type="string" data-sort-direction='asc' 
-               alt="<?php echo $l->t('up');   ?>" title="<?php echo $l->t('Sort ascending');  ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/up.png');   ?>">
-          <img id="sort-down" class="shorty-sorter" data-sort-code="td" data-sort-type="string" data-sort-direction='desc' 
-               alt="<?php echo $l->t('down'); ?>" title="<?php echo $l->t('Sort descending'); ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/down.png'); ?>">
-          <input id='filter' type="text" value="">
-        </div>
-      </th>
-      <th id="target">
-        <div style="display:none;">
-          <img id="sort-up" class="shorty-sorter" data-sort-code="ua" data-sort-type="string" data-sort-direction='asc'
-               alt="<?php echo $l->t('up');   ?>" title="<?php echo $l->t('Sort ascending');  ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/up.png');   ?>">
-          <img id="sort-down" class="shorty-sorter" data-sort-code="ud" data-sort-type="string" data-sort-direction='desc'
-               alt="<?php echo $l->t('down'); ?>" title="<?php echo $l->t('Sort descending'); ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/down.png'); ?>">
-          <input id='filter' type="text" value="">
-        </div>
-      </th>
-      <th id="clicks">
-        <div style="display:none;">
-          <img id="sort-up"   class="shorty-sorter" data-sort-code="ha" data-sort-type="int" data-sort-direction='asc'
-               alt="<?php echo $l->t('up');   ?>" title="<?php echo $l->t('Sort ascending');  ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/up.png');   ?>">
-          <img id="sort-down" class="shorty-sorter" data-sort-code="hd" data-sort-type="int" data-sort-direction='desc'
-               alt="<?php echo $l->t('down'); ?>" title="<?php echo $l->t('Sort descending'); ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/down.png'); ?>">
-        </div>
-      </th>
-      <th id="until">
-        <div style="display:none;">
-          <img id="sort-up"   class="shorty-sorter" data-sort-code="da" data-sort-type="date" data-sort-direction='asc'
-               alt="<?php echo $l->t('up');   ?>" title="<?php echo $l->t('Sort ascending');  ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/up.png');   ?>">
-          <img id="sort-down" class="shorty-sorter" data-sort-code="dd" data-sort-type="date" data-sort-direction='desc'
-               alt="<?php echo $l->t('down'); ?>" title="<?php echo $l->t('Sort descending'); ?>"
-               src="<?php echo OCP\Util::imagePath('shorty','actions/down.png'); ?>">
-        </div>
-      </th>
-      <!-- status filter, colspan 2 to prevent width enhancement of column -->
-      <th id="status" colspan=2>
-        <div style="display:none;">
-          <span id="horst" class="shorty-select">
-            <select id='filter' value="" data-placeholder=" ">
-              <?php foreach($_['shorty-status'] as $status=>$label)
-                echo sprintf("<option value=\"%s\">%s</option>\n",($status?$label:''),$label);
-              ?>
-            </select>
-          </span>
-        </div>
-      </th>
-    </tr>
-    <!-- the 'dummy' row, a blueprint -->
-    <tr id=""
-        data-id=""
-        data-status=""
-        data-source=""
-        data-relay=""
-        data-title=""
-        data-favicon=""
-        data-target=""
-        data-clicks=""
-        data-until=""
-        data-created=""
-        data-accessed=""
-        data-notes="">
-      <td id="favicon"></td>
-      <td id="title"  ></td>
-      <td id="target" ></td>
-      <td id="clicks" ></td>
-      <td id="until"  ></td>
-      <td id="status" ></td>
-      <td id="actions">
-        <span class="shorty-actions">
-          <a id="show"  title="<?php echo $l->t('show');   ?>"   class="">
-            <img class="shorty-icon" alt="<?php echo $l->t('show'); ?>"   title="<?php echo $l->t('Show details'); ?>"
-                 src="<?php echo OCP\Util::imagePath('shorty','actions/info.png');   ?>" />
-          </a>
-          <a id="edit"  title="<?php echo $l->t('edit');   ?>"   class="">
-            <img class="shorty-icon" alt="<?php echo $l->t('modify'); ?>"   title="<?php echo $l->t('Modify shorty'); ?>"
-                 src="<?php echo OCP\Util::imagePath('core','actions/rename.png'); ?>" />
-          </a>
-          <a id="del"   title="<?php echo $l->t('delete'); ?>" class="">
-            <img class="shorty-icon" alt="<?php echo $l->t('delete'); ?>" title="<?php echo $l->t('Delete shorty'); ?>"
-                 src="<?php echo OCP\Util::imagePath('core','actions/delete.png'); ?>" />
-          </a>
-          <a id="share" title="<?php echo $l->t('share');  ?>"   class="">
-            <img class="shorty-icon" alt="<?php echo $l->t('share'); ?>"  title="<?php echo $l->t('Test and use links'); ?>"
-                 src="<?php echo OCP\Util::imagePath('core','actions/share.png');  ?>" />
-          </a>
-          <a id="open"  title="<?php echo $l->t('open');   ?>"   class="">
-            <img class="shorty-icon" alt="<?php echo $l->t('open'); ?>"   title="<?php echo $l->t('Open target'); ?>"
-                 src="<?php echo OCP\Util::imagePath('shorty','actions/open.png'); ?>" />
-          </a>
-        </span>
-      </td>
-    </tr>
-  </thead>
-  <!-- the standard body for non-empty lists -->
-  <tbody>
-  </tbody>
-</table>
diff --git a/apps/shorty/templates/tmpl_url_share.php b/apps/shorty/templates/tmpl_url_share.php
deleted file mode 100644
index b42396d6a0..0000000000
--- a/apps/shorty/templates/tmpl_url_share.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_url_share.php
- * A dialog offering control over an entries state and offers the source url
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- (hidden) dialog to share a shorty from the list -->
-<form id="dialog-share" class="shorty-dialog shorty-embedded">
-  <fieldset>
-    <legend class="">
-      <a id="close" class="shorty-close-button"
-        title="<?php echo OC_Shorty_L10n::t('Close'); ?>">
-        <img alt="<?php echo OC_Shorty_L10n::t('Close'); ?>"
-            src="<?php echo OCP\Util::imagePath('apps/shorty','actions/shade.png');  ?>">
-      </a>
-      <?php echo OC_Shorty_L10n::t('Test and use').':'; ?>
-    </legend>
-    <input id="id" name="id" type="hidden" readonly data="" class="" readonly disabled />
-    <label for="status"><?php echo OC_Shorty_L10n::t('Status').':'; ?></label>
-    <select id="status" name="status" data="" class="" value="">
-    <?php
-      foreach ( OC_Shorty_Type::$STATUS as $status )
-        if ( 'deleted'!=$status )
-          echo sprintf ( "<option value=\"%s\">%s</option>\n", $status, OC_Shorty_L10n::t($status) );
-    ?>
-    </select>
-    <br />
-    <label for="source"><?php echo OC_Shorty_L10n::t('Source url').':'; ?></label>
-    <a id="source" class="shorty-clickable" target="_blank"
-       title="<?php echo OC_Shorty_L10n::t('Open source url'); ?>"
-       href=""></a>
-    <br />
-    <label for="relay"><?php echo OC_Shorty_L10n::t('Relay url').':'; ?></label>
-    <a id="relay" class="shorty-clickable" target="_blank"
-       title="<?php echo OC_Shorty_L10n::t('Open relay url'); ?>"
-       href=""></a>
-    <br />
-    <label for="target"><?php echo OC_Shorty_L10n::t('Target url').':'; ?></label>
-    <a id="target" class="shorty-clickable" target="_blank"
-       title="<?php echo OC_Shorty_L10n::t('Open target url'); ?>"
-       href=""></a>
-    <br />
-    <img id="usage-email" name="usage-email" class="shorty-usage" alt="email"
-         src="<?php echo OCP\Util::imagePath('apps/shorty','usage/64/email.png'); ?>"
-         title="<?php echo OC_Shorty_L10n::t("Send by email"); ?>" />
-    <img id="usage-sms" type="image" name="usage-sms" alt="sms"
-         class="shorty-usage <?php echo $_['sms-control']; ?>"
-         src="<?php echo OCP\Util::imagePath('apps/shorty','usage/64/sms.png'); ?>"
-         title="<?php echo OC_Shorty_L10n::t("Send by SMS"); ?>" />
-    <img id="usage-qrcode" type="image" name="usage-qrcode" class="shorty-usage" alt="qrcode"
-         src="<?php echo OCP\Util::imagePath('apps/shorty','usage/64/qrcode.png'); ?>"
-         title="<?php echo OC_Shorty_L10n::t("Show as QRCode"); ?>" />
-    <img id="usage-clipboard" type="image" name="usage-clipboard" class="shorty-usage" alt="clipbaord"
-         src="<?php echo OCP\Util::imagePath('apps/shorty','usage/64/clipboard.png'); ?>"
-         title="<?php echo OC_Shorty_L10n::t("Copy to clipboard"); ?>" />
-  </fieldset>
-</form>
-
-<?php require_once('tmpl_dlg_qrcode.php'); ?>
diff --git a/apps/shorty/templates/tmpl_url_show.php b/apps/shorty/templates/tmpl_url_show.php
deleted file mode 100644
index 462d8e8b9c..0000000000
--- a/apps/shorty/templates/tmpl_url_show.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
-* @package shorty an ownCloud url shortener plugin
-* @category internet
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-* @license GNU Affero General Public license (AGPL)
-* @link information 
-* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
-*
-* 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/>.
-*
-*/
-?>
-
-<?php
-/**
- * @file templates/tmpl_url_show.php
- * A read-only dialog visualizing all aspects of a selected shorty.
- * @access public
- * @author Christian Reiner
- */
-?>
-
-<!-- (hidden) dialog to show a shorty from the list -->
-<form id="dialog-show" class="shorty-dialog shorty-standalone">
-  <fieldset>
-    <legend class="">
-      <a id="close" class="shorty-close-button"
-        title="<?php echo OC_Shorty_L10n::t('Close'); ?>">
-        <img alt="<?php echo OC_Shorty_L10n::t('Close'); ?>"
-            src="<?php echo OCP\Util::imagePath('shorty','actions/shade.png');  ?>">
-      </a>
-      <?php echo OC_Shorty_L10n::t('Show details').':'; ?>
-    </legend>
-    <label for="source"><?php echo OC_Shorty_L10n::t('Source url').':'; ?></label>
-    <input id="source" name="source" type="text" data="" class="" readonly disabled />
-    <br />
-    <label for="target"><?php echo OC_Shorty_L10n::t('Target url').':'; ?></label>
-    <input id="target" name="target" data="" class="" readonly disabled />
-    <br />
-    <label for="meta">&nbsp;</label>
-    <span id="meta">
-      <img id="staticon"  class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'status/neutral.png'); ?>">
-      <img id="schemicon" class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-      <img id="favicon"   class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-      <img id="mimicon"   class="shorty-icon" src="" data="<?php echo OCP\Util::imagePath('shorty', 'blank.png'); ?>">
-      <a id="explanation" maxlength="80" data="" class="shorty-value"></a>
-    </span>
-    <br />
-    <label for="title"><?php echo OC_Shorty_L10n::t('Shorty title').':'; ?></label>
-    <input id="title" name="title" type="text" data="" class="" readonly disabled />
-    <br />
-    <label for="status"><?php echo OC_Shorty_L10n::t('Status').':'; ?></label>
-    <input id="status" name="status" type="text" data="" class="" style="width:8em;" readonly disabled />
-    <span class="label-line">
-    <label for="until"><?php echo OC_Shorty_L10n::t('Expiration').':'; ?></label>
-    <input id="until" name="until" type="text" data="" class="" style="width:12em;" readonly disabled />
-    </span>
-    <br />
-    <label for="notes"><?php echo OC_Shorty_L10n::t('Notes').':'; ?></label>
-    <input id="notes" name="notes" data="" class="" readonly disabled />
-    <br />
-    <span class="label-line">
-    <label for="clicks"><?php echo OC_Shorty_L10n::t('Clicks').':'; ?></label>
-    <input id="clicks" name="clicks" data="" type="textarea" class="" style="width:1em;" readonly disabled />
-    <label for="created"><?php echo OC_Shorty_L10n::t('Creation').':'; ?></label>
-    <input id="created" name="created" type="text" data="" class="" style="width:7em;" readonly disabled />
-    <label for="accessed"><?php echo OC_Shorty_L10n::t('Access').':'; ?></label>
-    <input id="accessed" name="accessed" type="text" data="" class="" style="width:10em;" readonly disabled />
-    </span>
-  </fieldset>
-</form>
diff --git a/apps/storage_charts/ajax/config.php b/apps/storage_charts/ajax/config.php
deleted file mode 100644
index 22fa038429..0000000000
--- a/apps/storage_charts/ajax/config.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('storage_charts');
-
-if(in_array($_POST['k'], Array('hu_size','sc_sort','hu_size_hus'))){
-	switch($_POST['o']){
-		case 'set':
-			$i = NULL;
-			if(is_array($_POST['i'])){
-				$i = serialize($_POST['i']);
-				
-			}elseif(is_numeric($_POST['i'])){
-				$i = $_POST['i'];
-			}
-			OC_DLStCharts::setUConfValue($_POST['k'], $i);
-		break;
-		case 'get':
-			$v = OC_DLStCharts::getUConfValue($_POST['k']);
-			OCP\JSON::encodedPrint(Array('r' => $v['uc_val']));
-		break;
-	}
-}
diff --git a/apps/storage_charts/ajax/data.php b/apps/storage_charts/ajax/data.php
deleted file mode 100644
index a9a36d3c64..0000000000
--- a/apps/storage_charts/ajax/data.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('storage_charts');
-
-$l = new OC_L10N('storage_charts');
-
-// Update and save the new configuration
-if(is_numeric($_POST['s']) && in_array($_POST['k'], Array('hu_size','hu_size_hus'))){
-	OC_DLStCharts::setUConfValue($_POST['k'], $_POST['s']);
-	if(strcmp($_POST['k'],'hu_size') == 0){
-		OCP\JSON::encodedPrint(Array('r' => OC_DLStChartsLoader::loadChart('clines_usse', $l)));
-	}else{
-		OCP\JSON::encodedPrint(Array('r' => OC_DLStChartsLoader::loadChart('chisto_us', $l)));
-	}
-}
diff --git a/apps/storage_charts/appinfo/app.php b/apps/storage_charts/appinfo/app.php
deleted file mode 100644
index 3efec67ea8..0000000000
--- a/apps/storage_charts/appinfo/app.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\App::checkAppEnabled('storage_charts');
-
-OC::$CLASSPATH['OC_DLStCharts'] = "apps/storage_charts/lib/db.class.php";
-OC::$CLASSPATH['OC_DLStChartsLoader'] = "apps/storage_charts/lib/loader.class.php";
-
-OCP\App::register(Array(
-	'order' => 60,
-	'id' => 'storage_charts',
-	'name' => 'Storage Charts'
-));
-
-OCP\App::addNavigationEntry(Array(
-	'id' => 'storage_charts',
-	'order' => 60,
-	'href' => OCP\Util::linkTo('storage_charts', 'charts.php'),
-	'icon' => OCP\Util::imagePath('storage_charts', 'chart.png'),
-	'name' => 'DL Charts'
-));
-
-OCP\App::registerPersonal('storage_charts','settings');
-
-$data_dir = OCP\Config::getSystemValue('datadirectory', '');
-if(OCP\User::getUser() && strlen($data_dir) != 0){
-	$fs = OCP\Files::getStorage('files');
-	$used = OC_DLStCharts::getTotalDataSize(OC::$CONFIG_DATADIRECTORY);
-	$total = OC_DLStCharts::getTotalDataSize($data_dir) + $fs->free_space();
-	OC_DLStCharts::update($used, $total);
-}
diff --git a/apps/storage_charts/appinfo/app_admin.php b/apps/storage_charts/appinfo/app_admin.php
deleted file mode 100644
index 9181d2f54b..0000000000
--- a/apps/storage_charts/appinfo/app_admin.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\App::checkAppEnabled('storage_charts');
-
-$l = OC_L10N::get('storage_charts');
-
-OC::$CLASSPATH['OC_DLStCharts'] = "apps/storage_charts/lib/db.class.php";
-OC::$CLASSPATH['OC_DLStChartsLoader'] = "apps/storage_charts/lib/loader.class.php";
-
-if(OC_Group::inGroup(OCP\User::getUser(), 'admin')){
-	OCP\App::register(Array(
-		'order' => 60,
-		'id' => 'storage_charts',
-		'name' => 'Storage Charts'
-	));
-	
-	OCP\App::addNavigationEntry(Array(
-		'id' => 'storage_charts',
-		'order' => 60,
-		'href' => OCP\Util::linkTo('storage_charts', 'charts.php'),
-		'icon' => OCP\Util::imagePath('storage_charts', 'chart.png'),
-		'name' => 'DL Charts'
-	));
-	
-	OCP\App::registerPersonal('storage_charts','settings');
-}elseif(OCP\User::isLoggedIn() && $_GET['app'] == 'storage_charts'){
-	die($l->t('Permission denied.'));
-}
-
-// Get storage value for logged in user
-$data_dir = OCP\Config::getSystemValue('datadirectory', '');
-if(OCP\User::getUser() && strlen($data_dir) != 0){
-	$fs = OCP\Files::getStorage('files');
-	$used = OC_DLStCharts::getTotalDataSize(OC::$CONFIG_DATADIRECTORY);
-	$total = OC_DLStCharts::getTotalDataSize($data_dir) + $fs->free_space();
-	OC_DLStCharts::update($used, $total);
-}
\ No newline at end of file
diff --git a/apps/storage_charts/appinfo/database.xml b/apps/storage_charts/appinfo/database.xml
deleted file mode 100644
index cac8136d2e..0000000000
--- a/apps/storage_charts/appinfo/database.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	 <name>*dbname*</name>
-	 <create>true</create>
-	 <overwrite>false</overwrite>
-	 <charset>utf8</charset>
-	 <table>
-		<name>*dbprefix*dlstcharts</name>
-		<declaration>
-			<field>
-				<name>stc_id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>oc_uid</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>stc_month</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>6</length>
-			</field>
-			<field>
-				<name>stc_dayts</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>11</length>
-			</field>
-			<field>
-				<name>stc_used</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>30</length>
-			</field>
-			<field>
-				<name>stc_total</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>30</length>
-			</field>
-			<index>
-				<name>stc_pk</name>
-			    <primary>true</primary>
-			    <field>
-					<name>stc_id</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-	<table>
-		<name>*dbprefix*dlstcharts_uconf</name>
-		<declaration>
-			<field>
-				<name>uc_id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>oc_uid</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>uc_key</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>uc_val</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
-			<index>
-				<name>uc_pk</name>
-			    <primary>true</primary>
-			    <field>
-					<name>uc_id</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/storage_charts/appinfo/info.xml b/apps/storage_charts/appinfo/info.xml
deleted file mode 100644
index 435c5a4093..0000000000
--- a/apps/storage_charts/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>storage_charts</id>
-	<name>Storage Charts</name>
-	<description>Display storage charts, using HighCharts non-commercial free library (www.highcharts.com)</description>
-	<version>2.2</version>
-	<licence>AGPL</licence>
-	<author>Xavier Beurois (www.djazz-lab.net)</author>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/storage_charts/charts.php b/apps/storage_charts/charts.php
deleted file mode 100644
index 774f113554..0000000000
--- a/apps/storage_charts/charts.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('storage_charts');
-
-$tmpl = new OCP\Template('storage_charts', 'charts.tpl', 'user');
-
-// Get data for all users if admin or just for the current user
-$displays = OC_DLStCharts::getUConfValue('c_disp', Array('uc_val' => 'a:3:{s:10:"cpie_rfsus";i:1;s:11:"clines_usse";i:1;s:9:"chisto_us";i:1;}'));
-$displays = unserialize($displays['uc_val']);
-$tmpl->assign('c_disp', $displays);
-
-$sc_sort = OC_DLStCharts::getUConfValue('sc_sort', Array('uc_val' => 'a:3:{i:0;s:10:"cpie_rfsus";i:1;s:11:"clines_usse";i:2;s:9:"chisto_us";}'));
-$tmpl->assign('sc_sort', unserialize($sc_sort['uc_val']));
-
-if($displays['clines_usse']){
-	$hu_size = OC_DLStCharts::getUConfValue('hu_size', Array('uc_val' => 3));
-	$tmpl->assign('hu_size', $hu_size['uc_val']);
-}
-if($displays['chisto_us']){
-	$hu_size_hus = OC_DLStCharts::getUConfValue('hu_size_hus', Array('uc_val' => 3));
-	$tmpl->assign('hu_size_hus', $hu_size_hus['uc_val']);
-}
-
-$tmpl->printPage();
diff --git a/apps/storage_charts/css/styles.css b/apps/storage_charts/css/styles.css
deleted file mode 100644
index e5fb7a3dad..0000000000
--- a/apps/storage_charts/css/styles.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-#storage-charts div.personalblock.topblock span{float:right;color:#BBB;font-style:italic;}
-
-#stc_sortable div.personalblock.bottomblock, #storage-charts div.personalblock.bottomblock{margin-bottom:1em;}
-#stc_sortable div.personalblock.titleblock, #storage-charts div.personalblock.titleblock{font-weight:bold;}
-#stc_sortable div.personalblock, #storage-charts div.personalblock{margin:1em 1em 0;padding:0.5em 1em;background: none repeat scroll 0 0 #F8F8F8;border-radius:0.5em 0.5em 0.5em 0.5em;color:#555555;text-shadow:0 1px 0 #FFFFFF;border:1px solid #DDDDDD;box-shadow:0 1px 1px #FFFFFF,0 1px 1px #FFFFFF inset;}
-
-#stc_frame{margin:1em 1em 0;}
-#stc_frame #stc_sortable div.personalblock{margin:0;margin-bottom:1em;}
-#stc_frame #stc_sortable div.personalblock h3{line-height:2.6;}
-#stc_frame #stc_sortable div.personalblock h3 img{vertical-align:middle;margin-right:10px;}
-#stc_frame #stc_sortable div.personalblock h3 span#selunits,#stc_frame #stc_sortable div.personalblock h3 span#selunits_hus{float:right;}
diff --git a/apps/storage_charts/img/chart.png b/apps/storage_charts/img/chart.png
deleted file mode 100644
index d8a998166419c14c573b2911b2c03aed5c2f0239..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000jN1^@s6?Q>5r0004iNkl<ZD3Ohm
zF^dyX9K?U~e7m9%0~UAMcpRd(f*(LoxXy#PakaLy@l*I6B%O^Q+XMtf1Pet$1kuA%
z4k6fBC@P}HWZ&4_N({@!=^n#x-W30lZ5owjc>vg!bQRbF4u%jmQ%dJ0eE@d*{r+S$
z8qFF;O+Z<erzPD7POzX5!e(99TMO@R)9Li#cs%|B5CDe5;YmqPmf<#~ln!TEcCjqW
zK7a;;!CIc@FKutM0m}^*^c@(7JkJNVkFWZ9S(18nU9Uyk*8u$|WZMaNKby^VVvMIE
zaCQ|KLih;mN?K1TodGUnS$0{HBe1UvuIpMMgrm040X^y8vJt4eLP7}FZCg@r*|VJj
z@T#kU?HiJA+y2#JPlD}RfLqK)`)xmy^tQ!&9_I7;14)yv7Qm5|(k0-9_fFULr!33f
z$Tme$9E&l&2G&;u-2vVKhiu=hs_N_CEfhtu5o3Hz_c{LtuGoHBRn=!$7!$OwanJez
jJhFWkxK~xx&xZK}Z4{<Os<94c00000NkvXXu0mjf`|`ti

diff --git a/apps/storage_charts/img/loader.gif b/apps/storage_charts/img/loader.gif
deleted file mode 100644
index 190582b822618e226f1beed6cee1135fcfaf5984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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
EFV2k%n*aa+

diff --git a/apps/storage_charts/img/move.png b/apps/storage_charts/img/move.png
deleted file mode 100644
index afb605ed9a8959c77d76fbdb6d0ddc943439fcde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004yNkl<ZIE{_d
zziX309LMqZ!IM>Rl|nj*ps1KqikmTm;E-%xG`q$@{0~Z}&N}45{h4$M&mUlP5Q{&G
zscDvurJF>om%DquN53wONb?w<?{s{Rd)?>YduA{g^no7BEA4bTPmD2d095tvd?Sf5
z_S)?>s#<!|7(<@tJ!8zPzj{qo9nJx)wTMV5P^;A#jYg>I&=}J^OE8=xCd)EywOV-Z
zOMz~;%XB(rGMQ`xch1^x=j)^>3Sx{DMNtZ<Dyqu;hqt#5_m2R$d}F0~xPQdS4|kl1
z2qHoVp%lonjDEk*gWd)&U%Uq3(bG*n?;c<;e7}^05D<}nCJ+(o^*X!nzw+tB7=T;r
zS6JJ)%DaPO5)oPYgcu_t!p+7ir+Ny&wZ<x598wh30T(Pg>0<y~umFVMNkk;g^L*(b
zU0hMDU%VhVhdDn$&z|4Ywd;*#-k<vNZI9%9)4Lhg|EvUfH!A_W<Cj0F26(p!1V3XI
zssX{5BnZLd3R?{bei4Ylr{j;~|9x)&jFSEaKW*{>ChEjc00000NkvXXu0mjfL&nf!

diff --git a/apps/storage_charts/js/highCharts-2.2.1/highcharts.min.js b/apps/storage_charts/js/highCharts-2.2.1/highcharts.min.js
deleted file mode 100644
index 203d89b6ea..0000000000
--- a/apps/storage_charts/js/highCharts-2.2.1/highcharts.min.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- Highcharts JS v2.2.1 (2012-03-15)
-
- (c) 2009-2011 Torstein H?nsi
-
- License: www.highcharts.com/license
-*/
-(function(){function L(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function za(){for(var a=0,b=arguments,c=b.length,d={};a<c;a++)d[b[a++]]=b[a];return d}function S(a,b){return parseInt(a,b||10)}function Ab(a){return typeof a==="string"}function mb(a){return typeof a==="object"}function Fb(a){return Object.prototype.toString.call(a)==="[object Array]"}function Bb(a){return typeof a==="number"}function nb(a){return oa.log(a)/oa.LN10}function cb(a){return oa.pow(10,a)}function Gb(a,b){for(var c=
-a.length;c--;)if(a[c]===b){a.splice(c,1);break}}function s(a){return a!==X&&a!==null}function A(a,b,c){var d,e;if(Ab(b))s(c)?a.setAttribute(b,c):a&&a.getAttribute&&(e=a.getAttribute(b));else if(s(b)&&mb(b))for(d in b)a.setAttribute(d,b[d]);return e}function Hb(a){return Fb(a)?a:[a]}function p(){var a=arguments,b,c,d=a.length;for(b=0;b<d;b++)if(c=a[b],typeof c!=="undefined"&&c!==null)return c}function P(a,b){if(Qb&&b&&b.opacity!==X)b.filter="alpha(opacity="+b.opacity*100+")";L(a.style,b)}function Aa(a,
-b,c,d,e){a=x.createElement(a);b&&L(a,b);e&&P(a,{padding:0,border:Ma,margin:0});c&&P(a,c);d&&d.appendChild(a);return a}function pa(a,b){var c=function(){};c.prototype=new a;L(c.prototype,b);return c}function dc(a,b,c,d){var e=Ea.lang,f=isNaN(b=Ba(b))?2:b,b=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=a<0?"-":"",c=String(S(a=Ba(+a||0).toFixed(f))),g=c.length>3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Ba(a-c).toFixed(f).slice(2):"")}
-function Na(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function ec(a,b,c,d){var e,c=p(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d<b.length;d++)if(a=b[d],e<=(b[d]+(b[d+1]||b[d]))/2)break;a*=c;return a}function Kc(a,b){var c=b||[[Rb,[1,2,5,10,20,25,50,100,200,500]],[ob,[1,2,5,10,15,30]],[pb,[1,2,5,10,15,30]],[va,[1,2,3,4,6,8,12]],[Ca,[1,2]],[Ya,[1,2]],[Da,[1,2,3,4,6]],[Za,null]],d=c[c.length-1],e=E[d[0]],f=d[1],g;for(g=0;g<c.length;g++)if(d=
-c[g],e=E[d[0]],f=d[1],c[g+1]&&a<=(e*f[f.length-1]+E[c[g+1][0]])/2)break;e===E[Za]&&a<5*e&&(f=[1,2,5]);e===E[Za]&&a<5*e&&(f=[1,2,5]);c=ec(a/e,f);return{unitRange:e,count:c,unitName:d[0]}}function Lc(a,b,c,d){var e=[],f={},g=Ea.global.useUTC,h,i=new Date(b),b=a.unitRange,k=a.count;b>=E[ob]&&(i.setMilliseconds(0),i.setSeconds(b>=E[pb]?0:k*Ta(i.getSeconds()/k)));if(b>=E[pb])i[pc](b>=E[va]?0:k*Ta(i[fc]()/k));if(b>=E[va])i[qc](b>=E[Ca]?0:k*Ta(i[gc]()/k));if(b>=E[Ca])i[hc](b>=E[Da]?1:k*Ta(i[db]()/k));b>=
-E[Da]&&(i[rc](b>=E[Za]?0:k*Ta(i[qb]()/k)),h=i[rb]());b>=E[Za]&&(h-=h%k,i[sc](h));if(b===E[Ya])i[hc](i[db]()-i[ic]()+p(d,1));d=1;h=i[rb]();for(var j=i.getTime(),l=i[qb](),i=i[db]();j<c;)e.push(j),b===E[Za]?j=sb(h+d*k,0):b===E[Da]?j=sb(h,l+d*k):!g&&(b===E[Ca]||b===E[Ya])?j=sb(h,l,i+d*k*(b===E[Ca]?1:7)):(j+=b*k,b<=E[va]&&j%E[Ca]===0&&(f[j]=Ca)),d++;e.push(j);e.info=L(a,{higherRanks:f,totalRange:b*k});return e}function tc(){this.symbol=this.color=0}function uc(a,b,c,d,e,f,g,h,i){var k=g.x,g=g.y,i=k+c+
-(i?h:-a-h),j=g-b+d+15,l;i<7&&(i=c+k+h);i+a>c+e&&(i-=i+a-(c+e),j=g-b+d-h,l=!0);j<d+5?(j=d+5,l&&g>=j&&g<=j+b&&(j=g+d+h)):j+b>d+f&&(j=d+f-b-h);return{x:i,y:j}}function Mc(a,b){var c=a.length,d,e;for(e=0;e<c;e++)a[e].ss_i=e;a.sort(function(a,c){d=b(a,c);return d===0?a.ss_i-c.ss_i:d});for(e=0;e<c;e++)delete a[e].ss_i}function Sb(a){for(var b=a.length,c=a[0];b--;)a[b]<c&&(c=a[b]);return c}function Ib(a){for(var b=a.length,c=a[0];b--;)a[b]>c&&(c=a[b]);return c}function Jb(a){for(var b in a)a[b]&&a[b].destroy&&
-a[b].destroy(),delete a[b]}function Tb(a){tb||(tb=Aa(Ra));a&&tb.appendChild(a);tb.innerHTML=""}function jc(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else ca.console&&console.log(c)}function Cb(a){return parseFloat(a.toPrecision(14))}function Kb(a,b){Ub=p(a,b.animation)}function vc(){var a=Ea.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";sb=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,p(c,1),p(g,0),p(h,0),p(i,0))).getTime()};fc=b+"Minutes";gc=b+"Hours";
-ic=b+"Day";db=b+"Date";qb=b+"Month";rb=b+"FullYear";pc=c+"Minutes";qc=c+"Hours";hc=c+"Date";rc=c+"Month";sc=c+"FullYear"}function Sa(){}function wc(a,b){function c(a){function b(a,c){this.pos=a;this.type=c||"";this.isNew=!0;c||this.addLabel()}function c(a){if(a)this.options=a,this.id=a.id;return this}function d(a,b,c,e){this.isNegative=b;this.options=a;this.x=c;this.stack=e;this.alignOptions={align:a.align||(U?b?"left":"right":"center"),verticalAlign:a.verticalAlign||(U?"middle":b?"bottom":"top"),
-y:p(a.y,U?4:b?14:-6),x:p(a.x,U?b?-6:6:0)};this.textAlign=a.textAlign||(U?b?"right":"left":"center")}function e(){var a=[],b=[],c;C=M=null;o(B.series,function(e){if(e.visible||!q.ignoreHiddenSeries){var f=e.options,g,h,i,j,k,m,l,n,Y,ea=f.threshold,B,o=[],xc=0;if(R&&ea<=0)ea=f.threshold=null;if(t)f=e.xData,f.length&&(C=Ua(p(C,f[0]),Sb(f)),M=W(p(M,f[0]),Ib(f)));else{var y,r,G,v=e.cropped,Z=e.xAxis.getExtremes(),V=!!e.modifyValue;g=f.stacking;Ha=g==="percent";if(g)k=f.stack,j=e.type+p(k,""),m="-"+j,e.stackKey=
-j,h=a[j]||[],a[j]=h,i=b[m]||[],b[m]=i;Ha&&(C=0,M=99);f=e.processedXData;l=e.processedYData;B=l.length;for(c=0;c<B;c++)if(n=f[c],Y=l[c],Y!==null&&Y!==X&&(g?(r=(y=Y<ea)?i:h,G=y?m:j,Y=r[n]=s(r[n])?r[n]+Y:Y,qa[G]||(qa[G]={}),qa[G][n]||(qa[G][n]=new d(u.stackLabels,y,n,k)),qa[G][n].setTotal(Y)):V&&(Y=e.modifyValue(Y)),v||(f[c+1]||n)>=Z.min&&(f[c-1]||n)<=Z.max))if(n=Y.length)for(;n--;)Y[n]!==null&&(o[xc++]=Y[n]);else o[xc++]=Y;!Ha&&o.length&&(C=Ua(p(C,o[0]),Sb(o)),M=W(p(M,o[0]),Ib(o)));s(ea)&&(C>=ea?(C=
-ea,Ma=!0):M<ea&&(M=ea,Na=!0))}}})}function f(a,b,c){for(var d,b=Cb(Ta(b/a)*a),c=Cb(Yb(c/a)*a),e=[];b<=c;){e.push(b);b=Cb(b+a);if(b===d)break;d=b}return e}function g(a,b,c,d){var e=[];if(!d)B._minorAutoInterval=null;if(a>=0.5)a=z(a),e=f(a,b,c);else if(a>=0.08){var h=Ta(b),i,j,k,n,m,l;for(i=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];h<c+1&&!l;h++){k=i.length;for(j=0;j<k&&!l;j++)n=nb(cb(h)*i[j]),n>b&&e.push(m),m>c&&(l=!0),m=n}}else if(b=cb(b),c=cb(c),a=u[d?"minorTickInterval":"tickInterval"],
-a=p(a==="auto"?null:a,B._minorAutoInterval,(c-b)*(u.tickPixelInterval/(d?5:1))/((d?D/N.length:D)||1)),a=ec(a,null,oa.pow(10,Ta(oa.log(a)/oa.LN10))),e=Vb(f(a,b,c),nb),!d)B._minorAutoInterval=a/5;d||(Oa=a);return e}function h(){var a=[],b,c;if(R){c=N.length;for(b=1;b<c;b++)a=a.concat(g(Ga,N[b-1],N[b],!0))}else for(b=F+(N[0]-F)%Ga;b<=H;b+=Ga)a.push(b);return a}function i(){var a,b=M-C>=fb,c,d,e,f,g,h;t&&fb===X&&!R&&(s(u.min)||s(u.max)?fb=null:(o(B.series,function(a){f=a.xData;for(d=g=a.xIncrement?1:
-f.length-1;d>0;d--)if(e=f[d]-f[d-1],c===X||e<c)c=e}),fb=Ua(c*5,M-C)));H-F<fb&&(a=(fb-H+F)/2,a=[F-a,p(u.min,F-a)],b&&(a[2]=C),F=Ib(a),h=[F+fb,p(u.max,F+fb)],b&&(h[2]=M),H=Sb(h),H-F<fb&&(a[0]=H-fb,a[1]=p(u.min,H-fb),F=Ib(a)))}function j(a){var b,c=u.tickInterval,d=u.tickPixelInterval;da?(na=m[t?"xAxis":"yAxis"][u.linkedTo],b=na.getExtremes(),F=p(b.min,b.dataMin),H=p(b.max,b.dataMax),u.type!==na.options.type&&jc(11,1)):(F=p(ba,u.min,C),H=p(ca,u.max,M));R&&(!a&&Ua(F,C)<=0&&jc(10,1),F=nb(F),H=nb(H));ja&&
-(ba=F=W(F,H-ja),ca=H,a&&(ja=null));i();if(!Va&&!Ha&&!da&&s(F)&&s(H)){b=H-F||1;if(!s(u.min)&&!s(ba)&&Ea&&(C<0||!Ma))F-=b*Ea;if(!s(u.max)&&!s(ca)&&Ja&&(M>0||!Na))H+=b*Ja}Oa=F===H||F===void 0||H===void 0?1:da&&!c&&d===na.options.tickPixelInterval?na.tickInterval:p(c,Va?1:(H-F)*d/(D||1));t&&!a&&o(B.series,function(a){a.processData(F!==ma||H!==za)});ib();B.beforeSetTickPositions&&B.beforeSetTickPositions();B.postProcessTickInterval&&(Oa=B.postProcessTickInterval(Oa));!V&&!R&&(Wa=oa.pow(10,Ta(oa.log(Oa)/
-oa.LN10)),s(u.tickInterval)||(Oa=ec(Oa,null,Wa,u)));B.tickInterval=Oa;Ga=u.minorTickInterval==="auto"&&Oa?Oa/5:u.minorTickInterval;(N=u.tickPositions||Xa&&Xa.apply(B,[F,H]))||(N=V?(B.getNonLinearTimeTicks||Lc)(Kc(Oa,u.units),F,H,u.startOfWeek,B.ordinalPositions,B.closestPointRange,!0):R?g(Oa,F,H):f(Oa,F,H));if(!da&&(a=N[0],c=N[N.length-1],u.startOnTick?F=a:F>a&&N.shift(),u.endOnTick?H=c:H<c&&N.pop(),gb||(gb={x:0,y:0}),!V&&N.length>gb[w]&&u.alignTicks!==!1))gb[w]=N.length}function k(a){a=(new c(a)).render();
-ta.push(a);return a}function l(){var a=u.title,d=u.stackLabels,e=u.alternateGridColor,f=u.lineWidth,g,i,j=m.hasRendered&&s(ma)&&!isNaN(ma),n=(g=B.series.length&&s(F)&&s(H))||p(u.showEmpty,!0),Y,q;if(g||da)if(Ga&&!Va&&o(h(),function(a){va[a]||(va[a]=new b(a,"minor"));j&&va[a].isNew&&va[a].render(null,!0);va[a].isActive=!0;va[a].render()}),o(N.slice(1).concat([N[0]]),function(a,c){c=c===N.length-1?0:c+1;if(!da||a>=F&&a<=H)Pa[a]||(Pa[a]=new b(a)),j&&Pa[a].isNew&&Pa[a].render(c,!0),Pa[a].isActive=!0,
-Pa[a].render(c)}),e&&o(N,function(a,b){if(b%2===0&&a<H)Da[a]||(Da[a]=new c),Y=a,q=N[b+1]!==X?N[b+1]:H,Da[a].options={from:R?cb(Y):Y,to:R?cb(q):q,color:e},Da[a].render(),Da[a].isActive=!0}),!B._addedPlotLB)o((u.plotLines||[]).concat(u.plotBands||[]),function(a){k(a)}),B._addedPlotLB=!0;o([Pa,va,Da],function(a){for(var b in a)a[b].isActive?a[b].isActive=!1:(a[b].destroy(),delete a[b])});f&&(g=x+(y?A:0)+T,i=ra-Lb-(y?hb:0)+T,g=I.crispLine([wa,G?x:g,G?i:E,fa,G?sa-Zb:g,G?i:ra-Lb],f),$?$.animate({d:g}):
-$=I.path(g).attr({stroke:u.lineColor,"stroke-width":f,zIndex:7}).add(),$[n?"show":"hide"]());if(v&&n)n=G?x:E,f=S(a.style.fontSize||12),n={low:n+(G?0:D),middle:n+D/2,high:n+(G?D:0)}[a.align],f=(G?E+hb:x)+(G?1:-1)*(y?-1:1)*Ya+(r===2?f:0),v[v.isNew?"attr":"animate"]({x:G?n:f+(y?A:0)+T+(a.x||0),y:G?f-(y?hb:0)+T:n+(a.y||0)}),v.isNew=!1;if(d&&d.enabled){var t,yc,d=B.stackTotalGroup;if(!d)B.stackTotalGroup=d=I.g("stack-labels").attr({visibility:eb,zIndex:6}).translate(O,J).add();for(t in qa)for(yc in a=
-qa[t],a)a[yc].render(d)}B.isDirty=!1}function n(a){for(var b=ta.length;b--;)ta[b].id===a&&ta[b].destroy()}var t=a.isX,y=a.opposite,G=U?!t:t,r=G?y?0:2:y?1:3,qa={},u=K(t?$b:kc,[Nc,Oc,zc,Pc][r],a),B=this,v,Z=u.type,V=Z==="datetime",R=Z==="logarithmic",T=u.offset||0,w=t?"x":"y",D=0,ua,ia,bb,jb,x,E,A,hb,Lb,Zb,Mb,ib,P,Q,bc,$,C,M,fb=u.minRange||u.maxZoom,ja=u.range,ba,ca,Aa,Ca,H=null,F=null,ma,za,Ea=u.minPadding,Ja=u.maxPadding,Ka=0,da=s(u.linkedTo),na,Ma,Na,Ha,Z=u.events,Sa,ta=[],Oa,Ga,Wa,N,Xa=u.tickPositioner,
-Pa={},va={},Da={},Fa,La,Ya,Va=u.categories,db=u.labels.formatter||function(){var a=this.value,b=this.dateTimeLabelFormat;return b?ac(b,a):Oa%1E6===0?a/1E6+"M":Oa%1E3===0?a/1E3+"k":!Va&&a>=1E3?dc(a,0):a},Ra=G&&u.labels.staggerLines,ya=u.reversed,Ia=Va&&u.tickmarkPlacement==="between"?0.5:0;b.prototype={addLabel:function(){var a=this.pos,b=u.labels,c=Va&&G&&Va.length&&!b.step&&!b.staggerLines&&!b.rotation&&ka/Va.length||!G&&ka/2,d=a===N[0],e=a===N[N.length-1],f=Va&&s(Va[a])?Va[a]:a,g=this.label,h=N.info,
-i;V&&h&&(i=u.dateTimeLabelFormats[h.higherRanks[a]||h.unitName]);this.isFirst=d;this.isLast=e;a=db.call({axis:B,chart:m,isFirst:d,isLast:e,dateTimeLabelFormat:i,value:R?Cb(cb(f)):f});c=c&&{width:W(1,z(c-2*(b.padding||10)))+ga};c=L(c,b.style);s(g)?g&&g.attr({text:a}).css(c):this.label=s(a)&&b.enabled?I.text(a,0,0,b.useHTML).attr({align:b.align,rotation:b.rotation}).css(c).add(Q):null},getLabelSize:function(){var a=this.label;return a?(this.labelBBox=a.getBBox())[G?"height":"width"]:0},getLabelSides:function(){var a=
-u.labels,b=this.labelBBox.width,a=b*{left:0,center:0.5,right:1}[a.align]-a.x;return[-a,b-a]},handleOverflow:function(a){var b=!0,c=this.isFirst,d=this.isLast,e=this.label,f=e.x;if(c||d){var g=this.getLabelSides(),h=g[0],g=g[1],i=m.plotLeft,j=i+B.len,k=(a=Pa[N[a+(c?1:-1)]])&&a.label.x+a.getLabelSides()[c?0:1];c&&!ya||d&&ya?f+h<i&&(f=i-h,a&&f+g>k&&(b=!1)):f+g>j&&(f=j-g,a&&f+h<k&&(b=!1));e.x=f}return b},render:function(a,b){var c=this.type,d=this.label,e=this.pos,f=u.labels,g=this.gridLine,h=c?c+"Grid":
-"grid",i=c?c+"Tick":"tick",j=u[h+"LineWidth"],k=u[h+"LineColor"],n=u[h+"LineDashStyle"],m=u[i+"Length"],h=u[i+"Width"]||0,l=u[i+"Color"],Y=u[i+"Position"],i=this.mark,q=f.step,ea=b&&Za||ra,qa=!0,o;o=G?Mb(e+Ia,null,null,b)+bb:x+T+(y?(b&&$a||sa)-Zb-x:0);ea=G?ea-Lb+T-(y?hb:0):ea-Mb(e+Ia,null,null,b)-bb;if(j){e=P(e+Ia,j,b);if(g===X){g={stroke:k,"stroke-width":j};if(n)g.dashstyle=n;if(!c)g.zIndex=1;this.gridLine=g=j?I.path(e).attr(g).add(bc):null}!b&&g&&e&&g.animate({d:e})}if(h)Y==="inside"&&(m=-m),y&&
-(m=-m),c=I.crispLine([wa,o,ea,fa,o+(G?0:-m),ea+(G?m:0)],h),i?i.animate({d:c}):this.mark=I.path(c).attr({stroke:l,"stroke-width":h}).add(Q);if(d&&!isNaN(o))o=o+f.x-(Ia&&G?Ia*ia*(ya?-1:1):0),ea=ea+f.y-(Ia&&!G?Ia*ia*(ya?1:-1):0),s(f.y)||(ea+=S(d.styles.lineHeight)*0.9-d.getBBox().height/2),Ra&&(ea+=a/(q||1)%Ra*16),d.x=o,d.y=ea,this.isFirst&&!p(u.showFirstLabel,1)||this.isLast&&!p(u.showLastLabel,1)?qa=!1:!Ra&&G&&f.overflow==="justify"&&!this.handleOverflow(a)&&(qa=!1),q&&a%q&&(qa=!1),qa?(d[this.isNew?
-"attr":"animate"]({x:d.x,y:d.y}),d.show(),this.isNew=!1):d.hide()},destroy:function(){Jb(this)}};c.prototype={render:function(){var a=this,b=(B.pointRange||0)/2,c=a.options,d=c.label,e=a.label,f=c.width,g=c.to,h=c.from,i=c.value,j,k=c.dashStyle,n=a.svgElem,m=[],l,Y,u=c.color;Y=c.zIndex;var ea=c.events;R&&(h=nb(h),g=nb(g),i=nb(i));if(f){if(m=P(i,f),b={stroke:u,"stroke-width":f},k)b.dashstyle=k}else if(s(h)&&s(g))h=W(h,F-b),g=Ua(g,H+b),j=P(g),(m=P(h))&&j?m.push(j[4],j[5],j[1],j[2]):m=null,b={fill:u};
-else return;if(s(Y))b.zIndex=Y;if(n)m?n.animate({d:m},null,n.onGetPath):(n.hide(),n.onGetPath=function(){n.show()});else if(m&&m.length&&(a.svgElem=n=I.path(m).attr(b).add(),ea))for(l in k=function(b){n.on(b,function(c){ea[b].apply(a,[c])})},ea)k(l);if(d&&s(d.text)&&m&&m.length&&A>0&&hb>0){d=K({align:G&&j&&"center",x:G?!j&&4:10,verticalAlign:!G&&j&&"middle",y:G?j?16:10:j?6:-4,rotation:G&&!j&&90},d);if(!e)a.label=e=I.text(d.text,0,0).attr({align:d.textAlign||d.align,rotation:d.rotation,zIndex:Y}).css(d.style).add();
-j=[m[1],m[4],p(m[6],m[1])];m=[m[2],m[5],p(m[7],m[2])];l=Sb(j);Y=Sb(m);e.align(d,!1,{x:l,y:Y,width:Ib(j)-l,height:Ib(m)-Y});e.show()}else e&&e.hide();return a},destroy:function(){Jb(this);Gb(ta,this)}};d.prototype={destroy:function(){Jb(this)},setTotal:function(a){this.cum=this.total=a},render:function(a){var b=this.options.formatter.call(this);this.label?this.label.attr({text:b,visibility:ab}):this.label=m.renderer.text(b,0,0).css(this.options.style).attr({align:this.textAlign,rotation:this.options.rotation,
-visibility:ab}).add(a)},setOffset:function(a,b){var c=this.isNegative,d=B.translate(this.total,0,0,0,1),e=B.translate(0),e=Ba(d-e),f=m.xAxis[0].translate(this.x)+a,g=m.plotHeight,c={x:U?c?d:d-e:f,y:U?g-f-b:c?g-d-e:g-d,width:U?e:b,height:U?b:e};this.label&&this.label.align(this.alignOptions,null,c).attr({visibility:eb})}};Mb=function(a,b,c,d,e){var f=1,g=0,h=d?jb:ia,d=d?ma:F,e=u.ordinal||R&&e;h||(h=ia);c&&(f*=-1,g=D);ya&&(f*=-1,g-=f*D);b?(ya&&(a=D-a),a=a/h+d,e&&(a=B.lin2val(a))):(e&&(a=B.val2lin(a)),
-a=f*(a-d)*h+g+f*Ka);return a};P=function(a,b,c){var d,e,f,a=Mb(a,null,null,c),g=c&&Za||ra,h=c&&$a||sa,i,c=e=z(a+bb);d=f=z(g-a-bb);if(isNaN(a))i=!0;else if(G){if(d=E,f=g-Lb,c<x||c>x+A)i=!0}else if(c=x,e=h-Zb,d<E||d>E+hb)i=!0;return i?null:I.crispLine([wa,c,d,fa,e,f],b||0)};ib=function(){var a=H-F,b=0,c,d;if(t)da?b=na.pointRange:o(B.series,function(a){b=W(b,a.pointRange);d=a.closestPointRange;!a.noSharedTooltip&&s(d)&&(c=s(c)?Ua(c,d):d)}),B.pointRange=b,B.closestPointRange=c;jb=ia;B.translationSlope=
-ia=D/(a+b||1);bb=G?x:Lb;Ka=ia*(b/2)};xa.push(B);m[t?"xAxis":"yAxis"].push(B);U&&t&&ya===X&&(ya=!0);L(B,{addPlotBand:k,addPlotLine:k,adjustTickAmount:function(){if(gb&&gb[w]&&!V&&!Va&&!da&&u.alignTicks!==!1){var a=Fa,b=N.length;Fa=gb[w];if(b<Fa){for(;N.length<Fa;)N.push(Cb(N[N.length-1]+Oa));ia*=(b-1)/(Fa-1);H=N[N.length-1]}if(s(a)&&Fa!==a)B.isDirty=!0}},categories:Va,getExtremes:function(){return{min:R?Cb(cb(F)):F,max:R?Cb(cb(H)):H,dataMin:C,dataMax:M,userMin:ba,userMax:ca}},getPlotLinePath:P,getThreshold:function(a){var b=
-R?cb(F):F,c=R?cb(H):H;b>a||a===null?a=b:c<a&&(a=c);return Mb(a,0,1,0,1)},isXAxis:t,options:u,plotLinesAndBands:ta,getOffset:function(){var a=B.series.length&&s(F)&&s(H),c=a||p(u.showEmpty,!0),d=0,e,f=0,g=u.title,h=u.labels,i=[-1,1,1,-1][r],j;Q||(Q=I.g("axis").attr({zIndex:7}).add(),bc=I.g("grid").attr({zIndex:u.gridZIndex||1}).add());La=0;if(a||da)o(N,function(a){Pa[a]?Pa[a].addLabel():Pa[a]=new b(a)}),o(N,function(a){if(r===0||r===2||{1:"left",3:"right"}[r]===h.align)La=W(Pa[a].getLabelSize(),La)}),
-Ra&&(La+=(Ra-1)*16);else for(j in Pa)Pa[j].destroy(),delete Pa[j];if(g&&g.text){if(!v)v=B.axisTitle=I.text(g.text,0,0,g.useHTML).attr({zIndex:7,rotation:g.rotation||0,align:g.textAlign||{low:"left",middle:"center",high:"right"}[g.align]}).css(g.style).add(),v.isNew=!0;if(c)d=v.getBBox()[G?"height":"width"],f=p(g.margin,G?5:10),e=g.offset;v[c?"show":"hide"]()}T=i*p(u.offset,pa[r]);Ya=p(e,La+f+(r!==2&&La&&i*u.labels[G?"y":"x"]));pa[r]=W(pa[r],Ya+d+i*T)},render:l,setAxisSize:function(){var a=u.offsetLeft||
-0,b=u.offsetRight||0;x=p(u.left,O+a);E=p(u.top,J);A=p(u.width,ka-a+b);hb=p(u.height,la);Lb=ra-hb-E;Zb=sa-A-x;D=G?A:hb;B.left=x;B.top=E;B.len=D},setAxisTranslation:ib,setCategories:function(b,c){B.categories=a.categories=Va=b;o(B.series,function(a){a.translate();a.setTooltipPoints(!0)});B.isDirty=!0;p(c,!0)&&m.redraw()},setExtremes:function(a,b,c,d,e){c=p(c,!0);e=L(e,{min:a,max:b});aa(B,"setExtremes",e,function(){ba=a;ca=b;B.isDirtyExtremes=!0;c&&m.redraw(d)})},setScale:function(){var a,b,c,d;ma=F;
-za=H;ua=D;D=G?A:hb;d=D!==ua;o(B.series,function(a){if(a.isDirtyData||a.isDirty||a.xAxis.isDirty)c=!0});if(d||c||da||ba!==Aa||ca!==Ca){e();j();Aa=ba;Ca=ca;if(!t)for(a in qa)for(b in qa[a])qa[a][b].cum=qa[a][b].total;if(!B.isDirty)B.isDirty=d||F!==ma||H!==za}},setTickPositions:j,translate:Mb,redraw:function(){ub.resetTracker&&ub.resetTracker();l();o(ta,function(a){a.render()});o(B.series,function(a){a.isDirty=!0})},removePlotBand:n,removePlotLine:n,reversed:ya,setTitle:function(a,b){u.title=K(u.title,
-a);v=v.destroy();B.isDirty=!0;p(b,!0)&&m.redraw()},series:[],stacks:qa,destroy:function(){var a;Qa(B);for(a in qa)Jb(qa[a]),qa[a]=null;if(B.stackTotalGroup)B.stackTotalGroup=B.stackTotalGroup.destroy();o([Pa,va,Da,ta],function(a){Jb(a)});o([$,Q,bc,v],function(a){a&&a.destroy()});$=Q=bc=v=null}});for(Sa in Z)ha(B,Sa,Z[Sa]);if(R)B.val2lin=nb,B.lin2val=cb}function d(a){function b(){var c=this.points||Hb(this),d=c[0].series,e;e=[d.tooltipHeaderFormatter(c[0].key)];o(c,function(a){d=a.series;e.push(d.tooltipFormatter&&
-d.tooltipFormatter(a)||a.point.tooltipFormatter(d.tooltipOptions.pointFormat))});e.push(a.footerFormat||"");return e.join("")}function c(a,b){l=n?a:(2*l+a)/3;q=n?b:(q+b)/2;t.attr({x:l,y:q});lb=Ba(a-l)>1||Ba(b-q)>1?function(){c(a,b)}:null}function d(){if(!n){var a=m.hoverPoints;t.hide();a&&o(a,function(a){a.setState()});m.hoverPoints=null;n=!0}}var e,f=a.borderWidth,g=a.crosshairs,h=[],i=a.style,j=a.shared,k=S(i.padding),n=!0,l=0,q=0;i.padding=0;var t=I.label("",0,0,null,null,null,a.useHTML).attr({padding:k,
-fill:a.backgroundColor,"stroke-width":f,r:a.borderRadius,zIndex:8}).css(i).hide().add();Fa||t.shadow(a.shadow);return{shared:j,refresh:function(f){var i,k,l,q,r={},y=[];l=f.tooltipPos;i=a.formatter||b;var r=m.hoverPoints,v;j&&(!f.series||!f.series.noSharedTooltip)?(q=0,r&&o(r,function(a){a.setState()}),m.hoverPoints=f,o(f,function(a){a.setState(ta);q+=a.plotY;y.push(a.getLabelConfig())}),k=f[0].plotX,q=z(q)/f.length,r={x:f[0].category},r.points=y,f=f[0]):r=f.getLabelConfig();r=i.call(r);e=f.series;
-k=p(k,f.plotX);q=p(q,f.plotY);i=z(l?l[0]:U?ka-q:k);k=z(l?l[1]:U?la-k:q);l=j||!e.isCartesian||e.tooltipOutsidePlot||Db(i,k);r===!1||!l?d():(n&&(t.show(),n=!1),t.attr({text:r}),v=a.borderColor||f.color||e.color||"#606060",t.attr({stroke:v}),l=uc(t.width,t.height,O,J,ka,la,{x:i,y:k},p(a.distance,12),U),c(z(l.x),z(l.y)));if(g){g=Hb(g);var R;l=g.length;for(var Z;l--;)if(R=f.series[l?"yAxis":"xAxis"],g[l]&&R)if(R=R.getPlotLinePath(l?p(f.stackY,f.y):f.x,1),h[l])h[l].attr({d:R,visibility:eb});else{Z={"stroke-width":g[l].width||
-1,stroke:g[l].color||"#C0C0C0",zIndex:g[l].zIndex||2};if(g[l].dashStyle)Z.dashstyle=g[l].dashStyle;h[l]=I.path(R).attr(Z).add()}}aa(m,"tooltipRefresh",{text:r,x:i+O,y:k+J,borderColor:v})},hide:d,hideCrosshairs:function(){o(h,function(a){a&&a.hide()})},destroy:function(){o(h,function(a){a&&a.destroy()});t&&(t=t.destroy())}}}function e(a){function b(a){var c,d,e,a=a||ca.event;if(!a.target)a.target=a.srcElement;if(a.originalEvent)a=a.originalEvent;if(a.event)a=a.event;c=a.touches?a.touches.item(0):a;
-ya=Ac(D);d=ya.left;e=ya.top;Qb?(d=a.x,c=a.y):(d=c.pageX-d,c=c.pageY-e);return L(a,{chartX:z(d),chartY:z(c)})}function c(a){var b={xAxis:[],yAxis:[]};o(xa,function(c){var d=c.translate,e=c.isXAxis;b[e?"xAxis":"yAxis"].push({axis:c,value:d((U?!e:e)?a.chartX-O:la-a.chartY+J,!0)})});return b}function e(){var a=m.hoverSeries,b=m.hoverPoint;if(b)b.onMouseOut();if(a)a.onMouseOut();vb&&(vb.hide(),vb.hideCrosshairs());ob=null}function f(){if(n){var a={xAxis:[],yAxis:[]},b=n.getBBox(),c=b.x-O,d=b.y-J;k&&(o(xa,
-function(e){if(e.options.zoomEnabled!==!1){var f=e.translate,g=e.isXAxis,h=U?!g:g,i=f(h?c:la-d-b.height,!0,0,0,1),f=f(h?c+b.width:la-d,!0,0,0,1);a[g?"xAxis":"yAxis"].push({axis:e,min:Ua(i,f),max:W(i,f)})}}),aa(m,"selection",a,zb));n=n.destroy()}P(D,{cursor:"auto"});m.mouseIsDown=Da=k=!1;Qa(x,Ga?"touchend":"mouseup",f)}function g(a){var b=s(a.pageX)?a.pageX:a.page.x,a=s(a.pageX)?a.pageY:a.page.y;ya&&!Db(b-ya.left-O,a-ya.top-J)&&e()}function h(){e();ya=null}var i,j,k,n,l=Fa?"":q.zoomType,t=/x/.test(l),
-r=/y/.test(l),y=t&&!U||r&&U,p=r&&!U||t&&U;if(!db)m.trackerGroup=db=I.g("tracker").attr({zIndex:9}).add();if(a.enabled)m.tooltip=vb=d(a),Bb=setInterval(function(){lb&&lb()},32);(function(){D.onmousedown=function(a){a=b(a);!Ga&&a.preventDefault&&a.preventDefault();m.mouseIsDown=Da=!0;m.mouseDownX=i=a.chartX;j=a.chartY;ha(x,Ga?"touchend":"mouseup",f)};var d=function(c){if(!c||!(c.touches&&c.touches.length>1)){c=b(c);if(!Ga)c.returnValue=!1;var d=c.chartX,e=c.chartY,f=!Db(d-O,e-J);Ga&&c.type==="touchstart"&&
-(A(c.target,"isTracker")?m.runTrackerClick||c.preventDefault():!kb&&!f&&c.preventDefault());f&&(d<O?d=O:d>O+ka&&(d=O+ka),e<J?e=J:e>J+la&&(e=J+la));if(Da&&c.type!=="touchstart"){if(k=Math.sqrt(Math.pow(i-d,2)+Math.pow(j-e,2)),k>10){var g=Db(i-O,j-J);if(Nb&&(t||r)&&g)n||(n=I.rect(O,J,y?1:ka,p?1:la,0).attr({fill:q.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add());n&&y&&(c=d-i,n.attr({width:Ba(c),x:(c>0?0:c)+i}));n&&p&&(e-=j,n.attr({height:Ba(e),y:(e>0?0:e)+j}));g&&!n&&q.panning&&m.pan(d)}}else if(!f){var h,
-d=m.hoverPoint,e=m.hoverSeries,l,o,g=sa,R=U?c.chartY:c.chartX-O;if(vb&&a.shared&&(!e||!e.noSharedTooltip)){h=[];l=Q.length;for(o=0;o<l;o++)if(Q[o].visible&&Q[o].options.enableMouseTracking!==!1&&!Q[o].noSharedTooltip&&Q[o].tooltipPoints.length)c=Q[o].tooltipPoints[R],c._dist=Ba(R-c.plotX),g=Ua(g,c._dist),h.push(c);for(l=h.length;l--;)h[l]._dist>g&&h.splice(l,1);if(h.length&&h[0].plotX!==ob)vb.refresh(h),ob=h[0].plotX}if(e&&e.tracker&&(c=e.tooltipPoints[R])&&c!==d)c.onMouseOver()}return f||!Nb}};D.onmousemove=
-d;ha(D,"mouseleave",h);ha(x,"mousemove",g);D.ontouchstart=function(a){if(t||r)D.onmousedown(a);d(a)};D.ontouchmove=d;D.ontouchend=function(){k&&e()};D.onclick=function(a){var d=m.hoverPoint,a=b(a);a.cancelBubble=!0;if(!k)if(d&&(A(a.target,"isTracker")||A(a.target.parentNode,"isTracker"))){var e=d.plotX,f=d.plotY;L(d,{pageX:ya.left+O+(U?ka-f:e),pageY:ya.top+J+(U?la-e:f)});aa(d.series,"click",L(a,{point:d}));d.firePointEvent("click",a)}else L(a,c(a)),Db(a.chartX-O,a.chartY-J)&&aa(m,"click",a);k=!1}})();
-L(this,{zoomX:t,zoomY:r,resetTracker:e,normalizeMouseEvent:b,destroy:function(){if(m.trackerGroup)m.trackerGroup=db=m.trackerGroup.destroy();Qa(D,"mouseleave",h);Qa(x,"mousemove",g);D.onclick=D.onmousedown=D.onmousemove=D.ontouchstart=D.ontouchend=D.ontouchmove=null}})}function f(a){var b=a.type||q.type||q.defaultSeriesType,c=Ha[b],d=m.hasRendered;if(d)if(U&&b==="column")c=Ha.bar;else if(!U&&b==="bar")c=Ha.column;b=new c;b.init(m,a);!d&&b.inverted&&(U=!0);if(b.isCartesian)Nb=b.isCartesian;Q.push(b);
-return b}function g(){q.alignTicks!==!1&&o(xa,function(a){a.adjustTickAmount()});gb=null}function h(a){var b=m.isDirtyLegend,c,d=m.isDirtyBox,e=Q.length,f=e,h=m.clipRect;for(Kb(a,m);f--;)if(a=Q[f],a.isDirty&&a.options.stacking){c=!0;break}if(c)for(f=e;f--;)if(a=Q[f],a.options.stacking)a.isDirty=!0;o(Q,function(a){a.isDirty&&a.options.legendType==="point"&&(b=!0)});if(b&&Xa.renderLegend)Xa.renderLegend(),m.isDirtyLegend=!1;Nb&&(La||(gb=null,o(xa,function(a){a.setScale()})),g(),Wb(),o(xa,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=
-!1,aa(a,"afterSetExtremes",a.getExtremes());if(a.isDirty||d)a.redraw(),d=!0}));d&&(qb(),h&&(Ob(h),h.animate({width:m.plotSizeX,height:m.plotSizeY+1})));o(Q,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});ub&&ub.resetTracker&&ub.resetTracker();I.draw();aa(m,"redraw")}function i(){var a=v.xAxis||{},b=v.yAxis||{},a=Hb(a);o(a,function(a,b){a.index=b;a.isX=!0});b=Hb(b);o(b,function(a,b){a.index=b});a=a.concat(b);o(a,function(a){new c(a)});g()}function k(){var a=Ea.lang,b=q.resetZoomButton,
-c=b.theme,d=c.states,e=b.relativeTo==="chart"?null:{x:O,y:J,width:ka,height:la};m.resetZoomButton=I.button(a.resetZoom,null,null,Fb,c,d&&d.hover).attr({align:b.position.align,title:a.resetZoomTitle}).add().align(b.position,!1,e)}function j(a,b){$=K(v.title,a);ja=K(v.subtitle,b);o([["title",a,$],["subtitle",b,ja]],function(a){var b=a[0],c=m[b],d=a[1],a=a[2];c&&d&&(c=c.destroy());a&&a.text&&!c&&(m[b]=I.text(a.text,0,0,a.useHTML).attr({align:a.align,"class":Ia+b,zIndex:a.zIndex||4}).css(a.style).add().align(a,
-!1,ib))})}function l(){Ja=q.renderTo;na=Ia+lc++;Ab(Ja)&&(Ja=x.getElementById(Ja));Ja||jc(13,!0);Ja.innerHTML="";Ja.offsetWidth||(C=Ja.cloneNode(0),P(C,{position:wb,top:"-9999px",display:""}),x.body.appendChild(C));za=(C||Ja).offsetWidth;Ca=(C||Ja).offsetHeight;m.chartWidth=sa=q.width||za||600;m.chartHeight=ra=q.height||(Ca>19?Ca:400);m.container=D=Aa(Ra,{className:Ia+"container"+(q.className?" "+q.className:""),id:na},L({position:mc,overflow:ab,width:sa+ga,height:ra+ga,textAlign:"left",lineHeight:"normal"},
-q.style),C||Ja);m.renderer=I=q.forExport?new Eb(D,sa,ra,!0):new Xb(D,sa,ra);Fa&&I.create(m,D,sa,ra);var a,b;Bc&&D.getBoundingClientRect&&(a=function(){P(D,{left:0,top:0});b=D.getBoundingClientRect();P(D,{left:-(b.left-S(b.left))+ga,top:-(b.top-S(b.top))+ga})},a(),ha(ca,"resize",a),ha(m,"destroy",function(){Qa(ca,"resize",a)}))}function n(){function a(c){var d=q.width||Ja.offsetWidth,e=q.height||Ja.offsetHeight,c=c?c.target:ca;if(d&&e&&(c===ca||c===x)){if(d!==za||e!==Ca)clearTimeout(b),b=setTimeout(function(){tb(d,
-e,!1)},100);za=d;Ca=e}}var b;ha(ca,"resize",a);ha(m,"destroy",function(){Qa(ca,"resize",a)})}function t(){m&&aa(m,"endResize",null,function(){La-=1})}function r(){for(var a=U||q.inverted||q.type==="bar"||q.defaultSeriesType==="bar",b=v.series,c=b&&b.length;!a&&c--;)b[c].type==="bar"&&(a=!0);m.inverted=U=a}function Z(){var a=v.labels,b=v.credits,c;j();Xa=m.legend=new Rb;o(xa,function(a){a.setScale()});Wb();o(xa,function(a){a.setTickPositions(!0)});g();Wb();qb();Nb&&o(xa,function(a){a.render()});if(!m.seriesGroup)m.seriesGroup=
-I.g("series-group").attr({zIndex:3}).add();o(Q,function(a){a.translate();a.setTooltipPoints();a.render()});a.items&&o(a.items,function(){var b=L(a.style,this.style),c=S(b.left)+O,d=S(b.top)+J+12;delete b.left;delete b.top;I.text(this.html,c,d).attr({zIndex:2}).css(b).add()});if(b.enabled&&!m.credits)c=b.href,m.credits=I.text(b.text,0,0).on("click",function(){if(c)location.href=c}).attr({align:b.position.align,zIndex:8}).css(b.style).add().align(b.position);m.hasRendered=!0}function V(){if(!Pb&&ca==
-ca.top&&x.readyState!=="complete"||Fa&&!ca.canvg)Fa?Cc.push(V,v.global.canvasToolsURL):x.attachEvent("onreadystatechange",function(){x.detachEvent("onreadystatechange",V);x.readyState==="complete"&&V()});else{l();aa(m,"init");if(Highcharts.RangeSelector&&v.rangeSelector.enabled)m.rangeSelector=new Highcharts.RangeSelector(m);rb();sb();r();i();o(v.series||[],function(a){f(a)});if(Highcharts.Scroller&&(v.navigator.enabled||v.scrollbar.enabled))m.scroller=new Highcharts.Scroller(m);m.render=Z;m.tracker=
-ub=new e(v.tooltip);Z();I.draw();b&&b.apply(m,[m]);o(m.callbacks,function(a){a.apply(m,[m])});C&&(Ja.appendChild(D),Tb(C));aa(m,"load")}}var v,y=a.series;a.series=null;v=K(Ea,a);v.series=a.series=y;var q=v.chart,y=q.margin,y=mb(y)?y:[y,y,y,y],T=p(q.marginTop,y[0]),w=p(q.marginRight,y[1]),E=p(q.marginBottom,y[2]),bb=p(q.marginLeft,y[3]),ia=q.spacingTop,ua=q.spacingRight,R=q.spacingBottom,jb=q.spacingLeft,ib,$,ja,J,ba,M,O,pa,Ja,C,D,na,za,Ca,sa,ra,$a,Za,ma,Na,Sa,da,m=this,kb=(y=q.events)&&!!y.click,
-va,Db,vb,Da,xb,pb,Ya,la,ka,ub,db,Xa,Wa,yb,ya,Nb=q.showAxes,La=0,xa=[],gb,Q=[],U,I,lb,Bb,ob,qb,Wb,rb,sb,tb,zb,Fb,Rb=function(){function a(b,c){var d=b.legendItem,e=b.legendLine,g=b.legendSymbol,h=q.color,i=c?f.itemStyle.color:h,h=c?b.color:h;d&&d.css({fill:i});e&&e.attr({stroke:h});g&&g.attr({stroke:h,fill:h})}function b(a){var c=a.legendItem,d=a.legendLine,e=a._legendItemPos,f=e[0],e=e[1],g=a.legendSymbol,a=a.checkbox;c&&c.attr({x:r?f:Wa-f,y:e});d&&d.translate(r?f:Wa-f,e-4);g&&(c=f+g.xOff,g.attr({x:r?
-c:Wa-c,y:e+g.yOff}));if(a)a.x=f,a.y=e}function c(){o(j,function(a){var b=a.checkbox,c=A.alignAttr;b&&P(b,{left:c.translateX+a.legendItemWidth+b.x-40+ga,top:c.translateY+b.y-11+ga})})}function d(b){var c,e,j,k,m=b.legendItem;k=b.series||b;var o=k.options,v=o&&o.borderWidth||0;if(!m){k=/^(bar|pie|area|column)$/.test(k.type);b.legendItem=m=I.text(f.labelFormatter.call(b),0,0,f.useHTML).css(b.visible?n:q).on("mouseover",function(){b.setState(ta);m.css(l)}).on("mouseout",function(){m.css(b.visible?n:q);
-b.setState()}).on("click",function(){var a=function(){b.setVisible()};b.firePointEvent?b.firePointEvent("legendItemClick",null,a):aa(b,"legendItemClick",null,a)}).attr({align:r?"left":"right",zIndex:2}).add(A);if(!k&&o&&o.lineWidth){var u={"stroke-width":o.lineWidth,zIndex:2};if(o.dashStyle)u.dashstyle=o.dashStyle;b.legendLine=I.path([wa,(-h-i)*(r?1:-1),0,fa,-i*(r?1:-1),0]).attr(u).add(A)}if(k)j=I.rect(c=-h-i,e=-11,h,12,2).attr({zIndex:3}).add(A),r||(c+=h);else if(o&&o.marker&&o.marker.enabled)j=
-o.marker.radius,j=I.symbol(b.symbol,c=-h/2-i-j,e=-4-j,2*j,2*j).attr(b.pointAttr[Ka]).attr({zIndex:3}).add(A),r||(c+=h/2);if(j)j.xOff=c+v%2/2,j.yOff=e+v%2/2;b.legendSymbol=j;a(b,b.visible);if(o&&o.showCheckbox)b.checkbox=Aa("input",{type:"checkbox",checked:b.selected,defaultChecked:b.selected},f.itemCheckboxStyle,D),ha(b.checkbox,"click",function(a){aa(b,"checkboxClick",{checked:a.target.checked},function(){b.select()})})}c=m.getBBox();e=b.legendItemWidth=f.itemWidth||h+i+c.width+t;w=c.height;if(g&&
-s-V+e>(J||sa-2*t-V))s=V,z+=y+w+p;!g&&z+f.y+w>ra-ia-R&&(z=T,s+=Z,Z=0);Z=W(Z,e);x=W(x,z+p);b._legendItemPos=[s,z];g?s+=e:z+=y+w+p;C=J||W(s-V+(g?0:e),C)}function e(){s=V;z=T;x=C=0;A||(A=I.g("legend").attr({zIndex:7}).add());j=[];o(M,function(a){var b=a.options;b.showInLegend&&(j=j.concat(a.legendItems||(b.legendType==="point"?a.data:a)))});Mc(j,function(a,b){return(a.options.legendIndex||0)-(b.options.legendIndex||0)});jb&&j.reverse();o(j,d);Wa=J||C;yb=x-v+w;if(E||bb){Wa+=2*t;yb+=2*t;if(ua){if(Wa>0&&
-yb>0)ua[ua.isNew?"attr":"animate"](ua.crisp(null,null,null,Wa,yb)),ua.isNew=!1}else ua=I.rect(0,0,Wa,yb,f.borderRadius,E||0).attr({stroke:f.borderColor,"stroke-width":E||0,fill:bb||Ma}).add(A).shadow(f.shadow),ua.isNew=!0;ua[j.length?"show":"hide"]()}o(j,b);for(var a=["left","right","top","bottom"],g,h=4;h--;)g=a[h],k[g]&&k[g]!=="auto"&&(f[h<2?"align":"verticalAlign"]=g,f[h<2?"x":"y"]=S(k[g])*(h%2?-1:1));j.length&&A.align(L(f,{width:Wa,height:yb}),!0,ib);La||c()}var f=m.options.legend;if(f.enabled){var g=
-f.layout==="horizontal",h=f.symbolWidth,i=f.symbolPadding,j,k=f.style,n=f.itemStyle,l=f.itemHoverStyle,q=K(n,f.itemHiddenStyle),t=f.padding||S(k.padding),r=!f.rtl,y=f.itemMarginTop||0,p=f.itemMarginBottom||0,v=18,Z=0,V=4+t+h+i,T=t+y+v-5,s,z,x,w=0,ua,E=f.borderWidth,bb=f.backgroundColor,A,C,J=f.width,M=m.series,jb=f.reversed;e();ha(m,"endResize",c);return{colorizeItem:a,destroyItem:function(a){var b=a.checkbox;o(["legendItem","legendLine","legendSymbol"],function(b){a[b]&&a[b].destroy()});b&&Tb(a.checkbox)},
-renderLegend:e,destroy:function(){ua&&(ua=ua.destroy());A&&(A=A.destroy())}}}};Db=function(a,b){return a>=0&&a<=ka&&b>=0&&b<=la};Fb=function(){var a=m.resetZoomButton;aa(m,"selection",{resetSelection:!0},zb);if(a)m.resetZoomButton=a.destroy()};zb=function(a){var b;m.resetZoomEnabled!==!1&&!m.resetZoomButton&&k();!a||a.resetSelection?o(xa,function(a){a.options.zoomEnabled!==!1&&(a.setExtremes(null,null,!1),b=!0)}):o(a.xAxis.concat(a.yAxis),function(a){var c=a.axis;if(m.tracker[c.isXAxis?"zoomX":"zoomY"])c.setExtremes(a.min,
-a.max,!1),b=!0});b&&h(p(q.animation,m.pointCount<100))};m.pan=function(a){var b=m.xAxis[0],c=m.mouseDownX,d=b.pointRange/2,e=b.getExtremes(),f=b.translate(c-a,!0)+d,c=b.translate(c+ka-a,!0)-d;(d=m.hoverPoints)&&o(d,function(a){a.setState()});f>Ua(e.dataMin,e.min)&&c<W(e.dataMax,e.max)&&b.setExtremes(f,c,!0,!1);m.mouseDownX=a;P(D,{cursor:"move"})};Wb=function(){var a=v.legend,b=p(a.margin,10),c=a.x,d=a.y,e=a.align,f=a.verticalAlign,g;rb();if((m.title||m.subtitle)&&!s(T))(g=W(m.title&&!$.floating&&
-!$.verticalAlign&&$.y||0,m.subtitle&&!ja.floating&&!ja.verticalAlign&&ja.y||0))&&(J=W(J,g+p($.margin,15)+ia));a.enabled&&!a.floating&&(e==="right"?s(w)||(ba=W(ba,Wa-c+b+ua)):e==="left"?s(bb)||(O=W(O,Wa+c+b+jb)):f==="top"?s(T)||(J=W(J,yb+d+b+ia)):f==="bottom"&&(s(E)||(M=W(M,yb-d+b+R))));m.extraBottomMargin&&(M+=m.extraBottomMargin);m.extraTopMargin&&(J+=m.extraTopMargin);Nb&&o(xa,function(a){a.getOffset()});s(bb)||(O+=pa[3]);s(T)||(J+=pa[0]);s(E)||(M+=pa[2]);s(w)||(ba+=pa[1]);sb()};tb=function(a,b,
-c){var d=m.title,e=m.subtitle;La+=1;Kb(c,m);Za=ra;$a=sa;if(s(a))m.chartWidth=sa=z(a);if(s(b))m.chartHeight=ra=z(b);P(D,{width:sa+ga,height:ra+ga});I.setSize(sa,ra,c);ka=sa-O-ba;la=ra-J-M;gb=null;o(xa,function(a){a.isDirty=!0;a.setScale()});o(Q,function(a){a.isDirty=!0});m.isDirtyLegend=!0;m.isDirtyBox=!0;Wb();d&&d.align(null,null,ib);e&&e.align(null,null,ib);h(c);Za=null;aa(m,"resize");Ub===!1?t():setTimeout(t,Ub&&Ub.duration||500)};sb=function(){m.plotLeft=O=z(O);m.plotTop=J=z(J);m.plotWidth=ka=
-z(sa-O-ba);m.plotHeight=la=z(ra-J-M);m.plotSizeX=U?la:ka;m.plotSizeY=U?ka:la;ib={x:jb,y:ia,width:sa-jb-ua,height:ra-ia-R};o(xa,function(a){a.setAxisSize();a.setAxisTranslation()})};rb=function(){J=p(T,ia);ba=p(w,ua);M=p(E,R);O=p(bb,jb);pa=[0,0,0,0]};qb=function(){var a=q.borderWidth||0,b=q.backgroundColor,c=q.plotBackgroundColor,d=q.plotBackgroundImage,e,f={x:O,y:J,width:ka,height:la};e=a+(q.shadow?8:0);if(a||b)ma?ma.animate(ma.crisp(null,null,null,sa-e,ra-e)):ma=I.rect(e/2,e/2,sa-e,ra-e,q.borderRadius,
-a).attr({stroke:q.borderColor,"stroke-width":a,fill:b||Ma}).add().shadow(q.shadow);c&&(Na?Na.animate(f):Na=I.rect(O,J,ka,la,0).attr({fill:c}).add().shadow(q.plotShadow));d&&(Sa?Sa.animate(f):Sa=I.image(d,O,J,ka,la).add());q.plotBorderWidth&&(da?da.animate(da.crisp(null,O,J,ka,la)):da=I.rect(O,J,ka,la,0,q.plotBorderWidth).attr({stroke:q.plotBorderColor,"stroke-width":q.plotBorderWidth,zIndex:4}).add());m.isDirtyBox=!1};q.reflow!==!1&&ha(m,"load",n);if(y)for(va in y)ha(m,va,y[va]);m.options=v;m.series=
-Q;m.xAxis=[];m.yAxis=[];m.addSeries=function(a,b,c){var d;a&&(Kb(c,m),b=p(b,!0),aa(m,"addSeries",{options:a},function(){d=f(a);d.isDirty=!0;m.isDirtyLegend=!0;b&&m.redraw()}));return d};m.animation=Fa?!1:p(q.animation,!0);m.Axis=c;m.destroy=function(){var a,b=D&&D.parentNode;if(m!==null){aa(m,"destroy");Qa(m);for(a=xa.length;a--;)xa[a]=xa[a].destroy();for(a=Q.length;a--;)Q[a]=Q[a].destroy();o("title,subtitle,seriesGroup,clipRect,credits,tracker,scroller,rangeSelector".split(","),function(a){var b=
-m[a];b&&(m[a]=b.destroy())});o([ma,da,Na,Xa,vb,I,ub],function(a){a&&a.destroy&&a.destroy()});ma=da=Na=Xa=vb=I=ub=null;if(D)D.innerHTML="",Qa(D),b&&Tb(D),D=null;clearInterval(Bb);for(a in m)delete m[a];v=m=null}};m.get=function(a){var b,c,d;for(b=0;b<xa.length;b++)if(xa[b].options.id===a)return xa[b];for(b=0;b<Q.length;b++)if(Q[b].options.id===a)return Q[b];for(b=0;b<Q.length;b++){d=Q[b].points||[];for(c=0;c<d.length;c++)if(d[c].id===a)return d[c]}return null};m.getSelectedPoints=function(){var a=
-[];o(Q,function(b){a=a.concat(nc(b.points,function(a){return a.selected}))});return a};m.getSelectedSeries=function(){return nc(Q,function(a){return a.selected})};m.hideLoading=function(){xb&&cc(xb,{opacity:0},{duration:v.loading.hideDuration||100,complete:function(){P(xb,{display:Ma})}});Ya=!1};m.initSeries=f;m.isInsidePlot=Db;m.redraw=h;m.setSize=tb;m.setTitle=j;m.showLoading=function(a){var b=v.loading;xb||(xb=Aa(Ra,{className:Ia+"loading"},L(b.style,{left:O+ga,top:J+ga,width:ka+ga,height:la+ga,
-zIndex:10,display:Ma}),D),pb=Aa("span",null,b.labelStyle,xb));pb.innerHTML=a||v.lang.loading;Ya||(P(xb,{opacity:0,display:""}),cc(xb,{opacity:b.style.opacity},{duration:b.showDuration||0}),Ya=!0)};m.pointCount=0;m.counters=new tc;V()}var X,x=document,ca=window,oa=Math,z=oa.round,Ta=oa.floor,Yb=oa.ceil,W=oa.max,Ua=oa.min,Ba=oa.abs,ja=oa.cos,C=oa.sin,da=oa.PI,Dc=da*2/360,kb=navigator.userAgent,Qb=/msie/i.test(kb)&&!ca.opera,Xa=x.documentMode===8,Ec=/AppleWebKit/.test(kb),Bc=/Firefox/.test(kb),Pb=!!x.createElementNS&&
-!!x.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,Qc=Bc&&parseInt(kb.split("Firefox/")[1],10)<4,Fa=!Pb&&!Qb&&!!x.createElement("canvas").getContext,Xb,Ga=x.documentElement.ontouchstart!==X,Fc={},lc=0,tb,Ea,ac,Ub,La,E,Ra="div",wb="absolute",mc="relative",ab="hidden",Ia="highcharts-",eb="visible",ga="px",Ma="none",wa="M",fa="L",Gc="rgba(192,192,192,"+(Pb?1.0E-6:0.0020)+")",Ka="",ta="hover",Rb="millisecond",ob="second",pb="minute",va="hour",Ca="day",Ya="week",Da="month",Za="year",
-sb,fc,gc,ic,db,qb,rb,pc,qc,hc,rc,sc,w=ca.HighchartsAdapter,na=w||{},Hc=na.getScript,o=na.each,nc=na.grep,Ac=na.offset,Vb=na.map,K=na.merge,ha=na.addEvent,Qa=na.removeEvent,aa=na.fireEvent,cc=na.animate,Ob=na.stop,Ha={};ca.Highcharts={};ac=function(a,b,c){if(!s(b)||isNaN(b))return"Invalid date";var a=p(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b),e,f=d[gc](),g=d[ic](),h=d[db](),i=d[qb](),k=d[rb](),j=Ea.lang,l=j.weekdays,b={a:l[g].substr(0,3),A:l[g],d:Na(h),e:h,b:j.shortMonths[i],B:j.months[i],m:Na(i+1),y:k.toString().substr(2,
-2),Y:k,H:Na(f),I:Na(f%12||12),l:f%12||12,M:Na(d[fc]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:Na(d.getSeconds()),L:Na(z(b%1E3),3)};for(e in b)a=a.replace("%"+e,b[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};tc.prototype={wrapColor:function(a){if(this.color>=a)this.color=0},wrapSymbol:function(a){if(this.symbol>=a)this.symbol=0}};E=za(Rb,1,ob,1E3,pb,6E4,va,36E5,Ca,864E5,Ya,6048E5,Da,2592E6,Za,31556952E3);La={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),
-c=[].concat(c),h,i,k=function(a){for(g=a.length;g--;)a[g]===wa&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(k(b),k(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));d===1&&(c=[].concat(c).splice(0,f).concat(c));a.shift=0;if(b.length)for(a=c.length;b.length<a;)d=[].concat(b).splice(b.length-f,f),e&&(d[f-6]=d[f-2],d[f-5]=d[f-1]),b=b.concat(d);h&&(b=b.concat(h),c=c.concat(i));return[b,c]},step:function(a,b,c,d){var e=[],f=a.length;if(c===1)e=d;else if(f===b.length&&c<1)for(;f--;)d=
-parseFloat(a[f]),e[f]=isNaN(d)?a[f]:c*parseFloat(b[f]-d)+d;else e=b;return e}};w&&w.init&&w.init(La);if(!w&&ca.jQuery){var ba=jQuery,Hc=ba.getScript,o=function(a,b){for(var c=0,d=a.length;c<d;c++)if(b.call(a[c],a[c],c,a)===!1)return c},nc=ba.grep,Vb=function(a,b){for(var c=[],d=0,e=a.length;d<e;d++)c[d]=b.call(a[d],a[d],d,a);return c},K=function(){var a=arguments;return ba.extend(!0,null,a[0],a[1],a[2],a[3])},Ac=function(a){return ba(a).offset()},ha=function(a,b,c){ba(a).bind(b,c)},Qa=function(a,
-b,c){var d=x.removeEventListener?"removeEventListener":"detachEvent";x[d]&&!a[d]&&(a[d]=function(){});ba(a).unbind(b,c)},aa=function(a,b,c,d){var e=ba.Event(b),f="detached"+b,g;L(e,c);a[b]&&(a[f]=a[b],a[b]=null);o(["preventDefault","stopPropagation"],function(a){var b=e[a];e[a]=function(){try{b.call(e)}catch(c){a==="preventDefault"&&(g=!0)}}});ba(a).trigger(e);a[f]&&(a[b]=a[f],a[f]=null);d&&!e.isDefaultPrevented()&&!g&&d(e)},cc=function(a,b,c){var d=ba(a);if(b.d)a.toD=b.d,b.d=1;d.stop();d.animate(b,
-c)},Ob=function(a){ba(a).stop()};ba.extend(ba.easing,{easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c}});var Ic=jQuery.fx,Jc=Ic.step;o(["cur","_default","width","height"],function(a,b){var c=b?Jc:Ic.prototype,d=c[a],e;d&&(c[a]=function(a){a=b?a:this;e=a.elem;return e.attr?e.attr(a.prop,a.now):d.apply(this,arguments)})});Jc.d=function(a){var b=a.elem;if(!a.started){var c=La.init(b,b.d,b.toD);a.start=c[0];a.end=c[1];a.started=!0}b.attr("d",La.step(a.start,a.end,a.pos,b.toD))}}w={enabled:!0,
-align:"center",x:0,y:15,style:{color:"#666",fontSize:"11px",lineHeight:"14px"}};Ea={colors:"#4572A7,#AA4643,#89A54E,#80699B,#3D96AE,#DB843D,#92A8CD,#A47D7C,#B5CA92".split(","),symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),shortMonths:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),weekdays:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
-decimalPoint:".",resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:","},global:{useUTC:!0,canvasToolsURL:"http://code.highcharts.com/2.2.1/modules/canvas-tools.js"},chart:{borderColor:"#4572A7",borderRadius:5,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacingTop:10,spacingRight:10,spacingBottom:15,spacingLeft:10,style:{fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif',fontSize:"12px"},backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0",
-resetZoomButton:{theme:{zIndex:20},position:{align:"right",x:-10,y:10}}},title:{text:"Chart title",align:"center",y:15,style:{color:"#3E576F",fontSize:"16px"}},subtitle:{text:"",align:"center",y:30,style:{color:"#6D869F"}},plotOptions:{line:{allowPointSelect:!1,showCheckbox:!1,animation:{duration:1E3},events:{},lineWidth:2,shadow:!0,marker:{enabled:!0,lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{},select:{fillColor:"#FFFFFF",lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:K(w,
-{enabled:!1,y:-6,formatter:function(){return this.y}}),cropThreshold:300,pointRange:0,showInLegend:!0,states:{hover:{marker:{}},select:{marker:{}}},stickyTracking:!0}},labels:{style:{position:wb,color:"#3E576F"}},legend:{enabled:!0,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},borderWidth:1,borderColor:"#909090",borderRadius:5,shadow:!1,style:{padding:"5px"},itemStyle:{cursor:"pointer",color:"#3E576F"},itemHoverStyle:{color:"#000000"},itemHiddenStyle:{color:"#C0C0C0"},
-itemCheckboxStyle:{position:wb,width:"13px",height:"13px"},symbolWidth:16,symbolPadding:5,verticalAlign:"bottom",x:0,y:0},loading:{labelStyle:{fontWeight:"bold",position:mc,top:"1em"},style:{position:wb,backgroundColor:"white",opacity:0.5,textAlign:"center"}},tooltip:{enabled:!0,backgroundColor:"rgba(255, 255, 255, .85)",borderWidth:2,borderRadius:5,headerFormat:'<span style="font-size: 10px">{point.key}</span><br/>',pointFormat:'<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b><br/>',
-shadow:!0,shared:Fa,snap:Ga?25:10,style:{color:"#333333",fontSize:"12px",padding:"5px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"10px"}}};var $b={dateTimeLabelFormats:za(Rb,"%H:%M:%S.%L",ob,"%H:%M:%S",pb,"%H:%M",va,"%H:%M",Ca,"%e. %b",Ya,"%e. %b",Da,"%b '%y",Za,"%Y"),endOnTick:!1,gridLineColor:"#C0C0C0",labels:w,lineColor:"#C0D0E0",lineWidth:1,
-max:null,min:null,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:5,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#6D869F",fontWeight:"bold"}},type:"linear"},kc=K($b,{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{align:"right",x:-8,
-y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Y-values"},stackLabels:{enabled:!1,formatter:function(){return this.total},style:w.style}}),Pc={labels:{align:"right",x:-8,y:null},title:{rotation:270}},Oc={labels:{align:"left",x:8,y:null},title:{rotation:90}},zc={labels:{align:"center",x:0,y:14,overflow:"justify"},title:{rotation:0}},Nc=K(zc,{labels:{y:-5,overflow:"justify"}}),M=Ea.plotOptions,w=M.line;M.spline=K(w);M.scatter=K(w,{lineWidth:0,states:{hover:{lineWidth:0}},
-tooltip:{headerFormat:'<span style="font-size: 10px; color:{series.color}">{series.name}</span><br/>',pointFormat:"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"}});M.area=K(w,{threshold:0});M.areaspline=K(M.area);M.column=K(w,{borderColor:"#FFFFFF",borderWidth:1,borderRadius:0,groupPadding:0.2,marker:null,pointPadding:0.1,minPointLength:0,cropThreshold:50,pointRange:null,states:{hover:{brightness:0.1,shadow:!1},select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}},dataLabels:{y:null,verticalAlign:null},
-threshold:0});M.bar=K(M.column,{dataLabels:{align:"left",x:5,y:null,verticalAlign:"middle"}});M.pie=K(w,{borderColor:"#FFFFFF",borderWidth:1,center:["50%","50%"],colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name},y:5},legendType:"point",marker:null,size:"75%",showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}}});vc();var ma=function(a){var b=[],c;(function(a){(c=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(a))?
-b=[S(c[1]),S(c[2]),S(c[3]),parseFloat(c[4],10)]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(a))&&(b=[S(c[1],16),S(c[2],16),S(c[3],16),1])})(a);return{get:function(c){return b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a},brighten:function(a){if(Bb(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=S(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},setOpacity:function(a){b[3]=a;return this}}};Sa.prototype={init:function(a,b){this.element=
-b==="span"?Aa(b):x.createElementNS("http://www.w3.org/2000/svg",b);this.renderer=a;this.attrSetters={}},animate:function(a,b,c){b=p(b,Ub,!0);Ob(this);if(b){b=K(b);if(c)b.complete=c;cc(this,a,b)}else this.attr(a),c&&c()},attr:function(a,b){var c,d,e,f,g=this.element,h=g.nodeName,i=this.renderer,k,j=this.attrSetters,l=this.shadows,n,o=this;Ab(a)&&s(b)&&(c=a,a={},a[c]=b);if(Ab(a))c=a,h==="circle"?c={x:"cx",y:"cy"}[c]||c:c==="strokeWidth"&&(c="stroke-width"),o=A(g,c)||this[c]||0,c!=="d"&&c!=="visibility"&&
-(o=parseFloat(o));else for(c in a)if(k=!1,d=a[c],e=j[c]&&j[c](d,c),e!==!1){e!==X&&(d=e);if(c==="d")d&&d.join&&(d=d.join(" ")),/(NaN| {2}|^$)/.test(d)&&(d="M 0 0"),this.d=d;else if(c==="x"&&h==="text"){for(e=0;e<g.childNodes.length;e++)f=g.childNodes[e],A(f,"x")===A(g,"x")&&A(f,"x",d);this.rotation&&A(g,"transform","rotate("+this.rotation+" "+d+" "+S(a.y||A(g,"y"))+")")}else if(c==="fill")d=i.color(d,g,c);else if(h==="circle"&&(c==="x"||c==="y"))c={x:"cx",y:"cy"}[c]||c;else if(h==="rect"&&c==="r")A(g,
-{rx:d,ry:d}),k=!0;else if(c==="translateX"||c==="translateY"||c==="rotation"||c==="verticalAlign")this[c]=d,this.updateTransform(),k=!0;else if(c==="stroke")d=i.color(d,g,c);else if(c==="dashstyle")if(c="stroke-dasharray",d=d&&d.toLowerCase(),d==="solid")d=Ma;else{if(d){d=d.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").split(",");
-for(e=d.length;e--;)d[e]=S(d[e])*a["stroke-width"];d=d.join(",")}}else c==="isTracker"?this[c]=d:c==="width"?d=S(d):c==="align"?(c="text-anchor",d={left:"start",center:"middle",right:"end"}[d]):c==="title"&&(e=x.createElementNS("http://www.w3.org/2000/svg","title"),e.appendChild(x.createTextNode(d)),g.appendChild(e));c==="strokeWidth"&&(c="stroke-width");Ec&&c==="stroke-width"&&d===0&&(d=1.0E-6);this.symbolName&&/^(x|y|r|start|end|innerR|anchorX|anchorY)/.test(c)&&(n||(this.symbolAttr(a),n=!0),k=
-!0);if(l&&/^(width|height|visibility|x|y|d|transform)$/.test(c))for(e=l.length;e--;)A(l[e],c,d);if((c==="width"||c==="height")&&h==="rect"&&d<0)d=0;c==="text"?(this.textStr=d,this.added&&i.buildText(this)):k||A(g,c,d)}if(Ec&&/Chrome\/(18|19)/.test(kb)&&h==="text"&&(a.x!==X||a.y!==X))c=g.parentNode,d=g.nextSibling,c&&(c.removeChild(g),d?c.insertBefore(g,d):c.appendChild(g));return o},symbolAttr:function(a){var b=this;o("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),function(c){b[c]=
-p(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](b.x,b.y,b.width,b.height,b)})},clip:function(a){return this.attr("clip-path","url("+this.renderer.url+"#"+a.id+")")},crisp:function(a,b,c,d,e){var f,g={},h={},i,a=a||this.strokeWidth||this.attr&&this.attr("stroke-width")||0;i=z(a)%2/2;h.x=Ta(b||this.x||0)+i;h.y=Ta(c||this.y||0)+i;h.width=Ta((d||this.width||0)-2*i);h.height=Ta((e||this.height||0)-2*i);h.strokeWidth=a;for(f in h)this[f]!==h[f]&&(this[f]=g[f]=h[f]);return g},css:function(a){var b=
-this.element,b=a&&a.width&&b.nodeName==="text",c,d="",e=function(a,b){return"-"+b.toLowerCase()};if(a&&a.color)a.fill=a.color;this.styles=a=L(this.styles,a);if(Qb&&!Pb)b&&delete a.width,P(this.element,a);else{for(c in a)d+=c.replace(/([A-Z])/g,e)+":"+a[c]+";";this.attr({style:d})}b&&this.added&&this.renderer.buildText(this);return this},on:function(a,b){var c=b;Ga&&a==="click"&&(a="touchstart",c=function(a){a.preventDefault();b()});this.element["on"+a]=c;return this},translate:function(a,b){return this.attr({translateX:a,
-translateY:b})},invert:function(){this.inverted=!0;this.updateTransform();return this},htmlCss:function(a){var b=this.element;if(b=a&&b.tagName==="SPAN"&&a.width)delete a.width,this.textWidth=b,this.updateTransform();this.styles=L(this.styles,a);P(this.element,a);return this},htmlGetBBox:function(a){var b=this.element,c=this.bBox;if(!c||a){if(b.nodeName==="text")b.style.position=wb;c=this.bBox={x:b.offsetLeft,y:b.offsetTop,width:b.offsetWidth,height:b.offsetHeight}}return c},htmlUpdateTransform:function(){if(this.added){var a=
-this.renderer,b=this.element,c=this.translateX||0,d=this.translateY||0,e=this.x||0,f=this.y||0,g=this.textAlign||"left",h={left:0,center:0.5,right:1}[g],i=g&&g!=="left",k=this.shadows;if(c||d)P(b,{marginLeft:c,marginTop:d}),k&&o(k,function(a){P(a,{marginLeft:c+1,marginTop:d+1})});this.inverted&&o(b.childNodes,function(c){a.invertChild(c,b)});if(b.tagName==="SPAN"){var j,l,k=this.rotation,n;j=0;var t=1,r=0,Z;n=S(this.textWidth);var V=this.xCorr||0,v=this.yCorr||0,y=[k,g,b.innerHTML,this.textWidth].join(",");
-if(y!==this.cTT)s(k)&&(j=k*Dc,t=ja(j),r=C(j),P(b,{filter:k?["progid:DXImageTransform.Microsoft.Matrix(M11=",t,", M12=",-r,", M21=",r,", M22=",t,", sizingMethod='auto expand')"].join(""):Ma})),j=p(this.elemWidth,b.offsetWidth),l=p(this.elemHeight,b.offsetHeight),j>n&&(P(b,{width:n+ga,display:"block",whiteSpace:"normal"}),j=n),n=a.fontMetrics(b.style.fontSize).b,V=t<0&&-j,v=r<0&&-l,Z=t*r<0,V+=r*n*(Z?1-h:h),v-=t*n*(k?Z?h:1-h:1),i&&(V-=j*h*(t<0?-1:1),k&&(v-=l*h*(r<0?-1:1)),P(b,{textAlign:g})),this.xCorr=
-V,this.yCorr=v;P(b,{left:e+V+ga,top:f+v+ga});this.cTT=y}}else this.alignOnAdd=!0},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.inverted,d=this.rotation,e=[];c&&(a+=this.attr("width"),b+=this.attr("height"));(a||b)&&e.push("translate("+a+","+b+")");c?e.push("rotate(90) scale(-1,1)"):d&&e.push("rotate("+d+" "+this.x+" "+this.y+")");e.length&&A(this.element,"transform",e.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,
-b,c){a?(this.alignOptions=a,this.alignByTranslate=b,c||this.renderer.alignedObjects.push(this)):(a=this.alignOptions,b=this.alignByTranslate);var c=p(c,this.renderer),d=a.align,e=a.verticalAlign,f=(c.x||0)+(a.x||0),g=(c.y||0)+(a.y||0),h={};/^(right|center)$/.test(d)&&(f+=(c.width-(a.width||0))/{right:1,center:2}[d]);h[b?"translateX":"x"]=z(f);/^(bottom|middle)$/.test(e)&&(g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1));h[b?"translateY":"y"]=z(g);this[this.placed?"animate":"attr"](h);this.placed=
-!0;this.alignAttr=h;return this},getBBox:function(a){var b,c,d=this.rotation;c=this.element;var e=d*Dc;if(c.namespaceURI==="http://www.w3.org/2000/svg"){try{b=c.getBBox?L({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(f){}if(!b||b.width<0)b={width:0,height:0};a=b.width;c=b.height;if(d)b.width=Ba(c*C(e))+Ba(a*ja(e)),b.height=Ba(c*ja(e))+Ba(a*C(e))}else b=this.htmlGetBBox(a);return b},show:function(){return this.attr({visibility:eb})},hide:function(){return this.attr({visibility:ab})},
-add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=d.childNodes,f=this.element,g=A(f,"zIndex"),h;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);if(g)c.handleZ=!0,g=S(g);if(c.handleZ)for(c=0;c<e.length;c++)if(a=e[c],b=A(a,"zIndex"),a!==f&&(S(b)>g||!s(g)&&s(b))){d.insertBefore(f,a);h=!0;break}h||d.appendChild(f);this.added=!0;aa(this,"add");return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||
-{},c=a.shadows,d=a.box,e,f;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=null;Ob(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(f=0;f<a.stops.length;f++)a.stops[f]=a.stops[f].destroy();a.stops=null}a.safeRemoveChild(b);c&&o(c,function(b){a.safeRemoveChild(b)});d&&d.destroy();Gb(a.renderer.alignedObjects,a);for(e in a)delete a[e];return null},empty:function(){for(var a=this.element,b=a.childNodes,c=b.length;c--;)a.removeChild(b[c])},shadow:function(a,b){var c=[],d,e,f=this.element,
-g=this.parentInverted?"(-1,-1)":"(1,1)";if(a){for(d=1;d<=3;d++)e=f.cloneNode(0),A(e,{isShadow:"true",stroke:"rgb(0, 0, 0)","stroke-opacity":0.05*d,"stroke-width":7-2*d,transform:"translate"+g,fill:Ma}),b?b.element.appendChild(e):f.parentNode.insertBefore(e,f),c.push(e);this.shadows=c}return this}};var Eb=function(){this.init.apply(this,arguments)};Eb.prototype={Element:Sa,init:function(a,b,c,d){var e=location,f;f=this.createElement("svg").attr({xmlns:"http://www.w3.org/2000/svg",version:"1.1"});a.appendChild(f.element);
-this.isSVG=!0;this.box=f.element;this.boxWrapper=f;this.alignedObjects=[];this.url=Qb?"":e.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1");this.defs=this.createElement("defs").add();this.forExport=d;this.gradients={};this.setSize(b,c,!1)},destroy:function(){var a=this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();Jb(this.gradients||{});this.gradients=null;if(a)this.defs=a.destroy();return this.alignedObjects=null},createElement:function(a){var b=new this.Element;b.init(this,a);
-return b},draw:function(){},buildText:function(a){for(var b=a.element,c=p(a.textStr,"").toString().replace(/<(b|strong)>/g,'<span style="font-weight:bold">').replace(/<(i|em)>/g,'<span style="font-style:italic">').replace(/<a/g,"<span").replace(/<\/(b|strong|i|em|a)>/g,"</span>").split(/<br.*?>/g),d=b.childNodes,e=/style="([^"]+)"/,f=/href="([^"]+)"/,g=A(b,"x"),h=a.styles,i=h&&S(h.width),k=h&&h.lineHeight,j,h=d.length;h--;)b.removeChild(d[h]);i&&!a.added&&this.box.appendChild(b);c[c.length-1]===""&&
-c.pop();o(c,function(c,d){var h,r=0,p,c=c.replace(/<span/g,"|||<span").replace(/<\/span>/g,"</span>|||");h=c.split("|||");o(h,function(c){if(c!==""||h.length===1){var l={},o=x.createElementNS("http://www.w3.org/2000/svg","tspan");e.test(c)&&A(o,"style",c.match(e)[1].replace(/(;| |^)color([ :])/,"$1fill$2"));f.test(c)&&(A(o,"onclick",'location.href="'+c.match(f)[1]+'"'),P(o,{cursor:"pointer"}));c=(c.replace(/<(.|\n)*?>/g,"")||" ").replace(/&lt;/g,"<").replace(/&gt;/g,">");o.appendChild(x.createTextNode(c));
-r?l.dx=3:l.x=g;if(!r){if(d){!Pb&&a.renderer.forExport&&P(o,{display:"block"});p=ca.getComputedStyle&&S(ca.getComputedStyle(j,null).getPropertyValue("line-height"));if(!p||isNaN(p))p=k||j.offsetHeight||18;A(o,"dy",p)}j=o}A(o,l);b.appendChild(o);r++;if(i)for(var c=c.replace(/-/g,"- ").split(" "),q,T=[];c.length||T.length;)q=a.getBBox().width,l=q>i,!l||c.length===1?(c=T,T=[],c.length&&(o=x.createElementNS("http://www.w3.org/2000/svg","tspan"),A(o,{dy:k||16,x:g}),b.appendChild(o),q>i&&(i=q))):(o.removeChild(o.firstChild),
-T.unshift(c.pop())),c.length&&o.appendChild(x.createTextNode(c.join(" ").replace(/- /g,"-")))}})})},button:function(a,b,c,d,e,f,g){var h=this.label(a,b,c),i=0,k,j,l,n,o,a={x1:0,y1:0,x2:0,y2:1},e=K(za("stroke-width",1,"stroke","#999","fill",za("linearGradient",a,"stops",[[0,"#FFF"],[1,"#DDD"]]),"r",3,"padding",3,"style",za("color","black")),e);l=e.style;delete e.style;f=K(e,za("stroke","#68A","fill",za("linearGradient",a,"stops",[[0,"#FFF"],[1,"#ACF"]])),f);n=f.style;delete f.style;g=K(e,za("stroke",
-"#68A","fill",za("linearGradient",a,"stops",[[0,"#9BD"],[1,"#CDF"]])),g);o=g.style;delete g.style;ha(h.element,"mouseenter",function(){h.attr(f).css(n)});ha(h.element,"mouseleave",function(){k=[e,f,g][i];j=[l,n,o][i];h.attr(k).css(j)});h.setState=function(a){(i=a)?a===2&&h.attr(g).css(o):h.attr(e).css(l)};return h.on("click",function(){d.call(h)}).attr(e).css(L({cursor:"default"},l))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=z(a[1])+b%2/2);a[2]===a[5]&&(a[2]=a[5]=z(a[2])+b%2/2);return a},path:function(a){return this.createElement("path").attr({d:a,
-fill:Ma})},circle:function(a,b,c){a=mb(a)?a:{x:a,y:b,r:c};return this.createElement("circle").attr(a)},arc:function(a,b,c,d,e,f){if(mb(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;return this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||0,end:f||0})},rect:function(a,b,c,d,e,f){if(mb(a))b=a.y,c=a.width,d=a.height,e=a.r,f=a.strokeWidth,a=a.x;e=this.createElement("rect").attr({rx:e,ry:e,fill:Ma});return e.attr(e.crisp(f,a,b,W(c,0),W(d,0)))},setSize:function(a,b,c){var d=this.alignedObjects,
-e=d.length;this.width=a;this.height=b;for(this.boxWrapper[p(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return s(a)?b.attr({"class":Ia+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:Ma};arguments.length>1&&L(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,
-b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(z(b),z(c),d,e,f),i=/^url\((.*?)\)$/,k;if(h)g=this.path(h),L(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&L(g,f);else if(i.test(a)){var j=function(a,b){a.attr({width:b[0],height:b[1]}).translate(-z(b[0]/2),-z(b[1]/2))};k=a.match(i)[1];a=Fc[k];g=this.image(k).attr({x:b,y:c});a?j(g,a):(g.attr({width:0,height:0}),Aa("img",{onload:function(){j(g,Fc[k]=[this.width,this.height])},src:k}))}return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return[wa,a+c/2,
-b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return[wa,a,b,fa,a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return[wa,a+c/2,b,fa,a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return[wa,a,b,fa,a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return[wa,a+c/2,b,fa,a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-1.0E-6,d=e.innerR,h=ja(f),i=C(f),k=ja(g),g=C(g),e=e.end-f<da?0:1;return[wa,a+c*h,b+c*i,
-"A",c,c,0,e,1,a+c*k,b+c*g,fa,a+d*k,b+d*g,"A",d,d,0,e,0,a+d*h,b+d*i,"Z"]}},clipRect:function(a,b,c,d){var e=Ia+lc++,f=this.createElement("clipPath").attr({id:e}).add(this.defs),a=this.rect(a,b,c,d,0).add(f);a.id=e;a.clipPath=f;return a},color:function(a,b,c){var d,e=/^rgba/;if(a&&a.linearGradient){var f=this,g=a.linearGradient,b=!Fb(g),c=f.gradients,h,i=g.x1||g[0]||0,k=g.y1||g[1]||0,j=g.x2||g[2]||0,l=g.y2||g[3]||0,n,t,r=[b,i,k,j,l,a.stops.join(",")].join(",");c[r]?g=A(c[r].element,"id"):(g=Ia+lc++,
-h=f.createElement("linearGradient").attr(L({id:g,x1:i,y1:k,x2:j,y2:l},b?null:{gradientUnits:"userSpaceOnUse"})).add(f.defs),h.stops=[],o(a.stops,function(a){e.test(a[1])?(d=ma(a[1]),n=d.get("rgb"),t=d.get("a")):(n=a[1],t=1);a=f.createElement("stop").attr({offset:a[0],"stop-color":n,"stop-opacity":t}).add(h);h.stops.push(a)}),c[r]=h);return"url("+this.url+"#"+g+")"}else return e.test(a)?(d=ma(a),A(b,c+"-opacity",d.get("a")),d.get("rgb")):(b.removeAttribute(c+"-opacity"),a)},text:function(a,b,c,d){var e=
-Ea.chart.style;if(d&&!this.forExport)return this.html(a,b,c);b=z(p(b,0));c=z(p(c,0));a=this.createElement("text").attr({x:b,y:c,text:a}).css({fontFamily:e.fontFamily,fontSize:e.fontSize});a.x=b;a.y=c;return a},html:function(a,b,c){var d=Ea.chart.style,e=this.createElement("span"),f=e.attrSetters,g=e.element,h=e.renderer;f.text=function(a){g.innerHTML=a;return!1};f.x=f.y=f.align=function(a,b){b==="align"&&(b="textAlign");e[b]=a;e.htmlUpdateTransform();return!1};e.attr({text:a,x:z(b),y:z(c)}).css({position:wb,
-whiteSpace:"nowrap",fontFamily:d.fontFamily,fontSize:d.fontSize});e.css=e.htmlCss;if(h.isSVG)e.add=function(a){var b,c,d=h.box.parentNode;if(a){if(b=a.div,!b)b=a.div=Aa(Ra,{className:A(a.element,"class")},{position:wb,left:a.attr("translateX")+ga,top:a.attr("translateY")+ga},d),c=b.style,L(a.attrSetters,{translateX:function(a){c.left=a+ga},translateY:function(a){c.top=a+ga},visibility:function(a,b){c[b]=a}})}else b=d;b.appendChild(g);e.added=!0;e.alignOnAdd&&e.htmlUpdateTransform();return e};return e},
-fontMetrics:function(a){var a=S(a||11),a=a<24?a+4:z(a*1.2),b=z(a*0.8);return{h:a,b:b}},label:function(a,b,c,d,e,f,g,h){function i(){var a=n.styles,a=a&&a.textAlign,b=v,c;c=h?0:ia;if(s(y)&&(a==="center"||a==="right"))b+={center:0.5,right:1}[a]*(y-p.width);(b!==t.x||c!==t.y)&&t.attr({x:b,y:c});t.x=b;t.y=c}function k(a,b){r?r.attr(a,b):x[a]=b}function j(){n.attr({text:a,x:b,y:c,anchorX:e,anchorY:f})}var l=this,n=l.g(),t=l.text("",0,0,g).attr({zIndex:1}).add(n),r,p,V="left",v=3,y,q,T,A,w=0,x={},ia,g=
-n.attrSetters;ha(n,"add",j);g.width=function(a){y=a;return!1};g.height=function(a){q=a;return!1};g.padding=function(a){s(a)&&a!==v&&(v=a,i());return!1};g.align=function(a){V=a;return!1};g.text=function(a,b){t.attr(b,a);var c;c=t.element.style;p=(y===void 0||q===void 0||n.styles.textAlign)&&t.getBBox(!0);n.width=(y||p.width)+2*v;n.height=(q||p.height)+2*v;ia=v+l.fontMetrics(c&&c.fontSize).b;if(!r)c=h?-ia:0,n.box=r=d?l.symbol(d,0,c,n.width,n.height):l.rect(0,c,n.width,n.height,0,x["stroke-width"]),
-r.add(n);r.attr(K({width:n.width,height:n.height},x));x=null;i();return!1};g["stroke-width"]=function(a,b){w=a%2/2;k(b,a);return!1};g.stroke=g.fill=g.r=function(a,b){k(b,a);return!1};g.anchorX=function(a,b){e=a;k(b,a+w-T);return!1};g.anchorY=function(a,b){f=a;k(b,a-A);return!1};g.x=function(a){a-={left:0,center:0.5,right:1}[V]*((y||p.width)+v);T=n.x=z(a);n.attr("translateX",T);return!1};g.y=function(a){A=n.y=z(a);n.attr("translateY",a);return!1};var ua=n.css;return L(n,{css:function(a){if(a){var b=
-{},a=K({},a);o("fontSize,fontWeight,fontFamily,color,lineHeight,width".split(","),function(c){a[c]!==X&&(b[c]=a[c],delete a[c])});t.css(b)}return ua.call(n,a)},getBBox:function(){return r.getBBox()},shadow:function(a){r.shadow(a);return n},destroy:function(){Qa(n,"add",j);Qa(n.element,"mouseenter");Qa(n.element,"mouseleave");t&&(t=t.destroy());Sa.prototype.destroy.call(n)}})}};Xb=Eb;var $a;if(!Pb&&!Fa)$a={init:function(a,b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ",wb,";"];(b==="shape"||
-b===Ra)&&d.push("left:0;top:0;width:10px;height:10px;");Xa&&d.push("visibility: ",b===Ra?ab:eb);c.push(' style="',d.join(""),'"/>');if(b)c=b===Ra||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=Aa(c);this.renderer=a;this.attrSetters={}},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);Xa&&d.gVis===ab&&P(c,{visibility:ab});d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&this.updateTransform();aa(this,
-"add");return this},toggleChildren:function(a,b){for(var c=a.childNodes,d=c.length;d--;)P(c[d],{visibility:b}),c[d].nodeName==="DIV"&&this.toggleChildren(c[d],b)},updateTransform:Sa.prototype.htmlUpdateTransform,attr:function(a,b){var c,d,e,f=this.element||{},g=f.style,h=f.nodeName,i=this.renderer,k=this.symbolName,j,l=this.shadows,n,o=this.attrSetters,r=this;Ab(a)&&s(b)&&(c=a,a={},a[c]=b);if(Ab(a))c=a,r=c==="strokeWidth"||c==="stroke-width"?this.strokeweight:this[c];else for(c in a)if(d=a[c],n=!1,
-e=o[c]&&o[c](d,c),e!==!1&&d!==null){e!==X&&(d=e);if(k&&/^(x|y|r|start|end|width|height|innerR|anchorX|anchorY)/.test(c))j||(this.symbolAttr(a),j=!0),n=!0;else if(c==="d"){d=d||[];this.d=d.join(" ");e=d.length;for(n=[];e--;)n[e]=Bb(d[e])?z(d[e]*10)-5:d[e]==="Z"?"x":d[e];d=n.join(" ")||"x";f.path=d;if(l)for(e=l.length;e--;)l[e].path=d;n=!0}else if(c==="zIndex"||c==="visibility"){if(Xa&&c==="visibility"&&h==="DIV")f.gVis=d,this.toggleChildren(f,d),d===eb&&(d=null);d&&(g[c]=d);n=!0}else if(c==="width"||
-c==="height")d=W(0,d),this[c]=d,this.updateClipping?(this[c]=d,this.updateClipping()):g[c]=d,n=!0;else if(c==="x"||c==="y")this[c]=d,g[{x:"left",y:"top"}[c]]=d;else if(c==="class")f.className=d;else if(c==="stroke")d=i.color(d,f,c),c="strokecolor";else if(c==="stroke-width"||c==="strokeWidth")f.stroked=d?!0:!1,c="strokeweight",this[c]=d,Bb(d)&&(d+=ga);else if(c==="dashstyle")(f.getElementsByTagName("stroke")[0]||Aa(i.prepVML(["<stroke/>"]),null,null,f))[c]=d||"solid",this.dashstyle=d,n=!0;else if(c===
-"fill")h==="SPAN"?g.color=d:(f.filled=d!==Ma?!0:!1,d=i.color(d,f,c),c="fillcolor");else if(c==="translateX"||c==="translateY"||c==="rotation")this[c]=d,this.updateTransform(),n=!0;else if(c==="text")this.bBox=null,f.innerHTML=d,n=!0;if(l&&c==="visibility")for(e=l.length;e--;)l[e].style[c]=d;n||(Xa?f[c]=d:A(f,c,d))}return r},clip:function(a){var b=this,c=a.members;c.push(b);b.destroyClip=function(){Gb(c,b)};return b.css(a.getCSS(b.inverted))},css:Sa.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&
-Tb(a)},destroy:function(){this.destroyClip&&this.destroyClip();return Sa.prototype.destroy.apply(this)},empty:function(){for(var a=this.element.childNodes,b=a.length,c;b--;)c=a[b],c.parentNode.removeChild(c)},on:function(a,b){this.element["on"+a]=function(){var a=ca.event;a.target=a.srcElement;b(a)};return this},shadow:function(a,b){var c=[],d,e=this.element,f=this.renderer,g,h=e.style,i,k=e.path;k&&typeof k.value!=="string"&&(k="x");if(a){for(d=1;d<=3;d++)i=['<shape isShadow="true" strokeweight="',
-7-2*d,'" filled="false" path="',k,'" coordsize="100,100" style="',e.style.cssText,'" />'],g=Aa(f.prepVML(i),null,{left:S(h.left)+1,top:S(h.top)+1}),i=['<stroke color="black" opacity="',0.05*d,'"/>'],Aa(f.prepVML(i),null,null,g),b?b.element.appendChild(g):e.parentNode.insertBefore(g,e),c.push(g);this.shadows=c}return this}},$a=pa(Sa,$a),w={Element:$a,isIE8:kb.indexOf("MSIE 8.0")>-1,init:function(a,b,c){var d,e;this.alignedObjects=[];d=this.createElement(Ra);e=d.element;e.style.position=mc;a.appendChild(d.element);
-this.box=e;this.boxWrapper=d;this.setSize(b,c,!1);if(!x.namespaces.hcv)x.namespaces.add("hcv","urn:schemas-microsoft-com:vml"),x.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "},clipRect:function(a,b,c,d){var e=this.createElement();return L(e,{members:[],left:a,top:b,width:c,height:d,getCSS:function(a){var b=this.top,c=this.left,d=c+this.width,e=b+this.height,b={clip:"rect("+z(a?c:b)+"px,"+z(a?e:d)+"px,"+z(a?d:e)+
-"px,"+z(a?b:c)+"px)"};!a&&Xa&&L(b,{width:d+ga,height:e+ga});return b},updateClipping:function(){o(e.members,function(a){a.css(e.getCSS(a.inverted))})}})},color:function(a,b,c){var d,e=/^rgba/;if(a&&a.linearGradient){var f,g,h=a.linearGradient,i=h.x1||h[0]||0,k=h.y1||h[1]||0,j=h.x2||h[2]||0,h=h.y2||h[3]||0,l,n,p,r;o(a.stops,function(a,b){e.test(a[1])?(d=ma(a[1]),f=d.get("rgb"),g=d.get("a")):(f=a[1],g=1);b?(p=f,r=g):(l=f,n=g)});if(c==="fill")a=90-oa.atan((h-k)/(j-i))*180/da,a=['<fill colors="0% ',l,
-",100% ",p,'" angle="',a,'" opacity="',r,'" o:opacity2="',n,'" type="gradient" focus="100%" method="sigma" />'],Aa(this.prepVML(a),null,null,b);else return f}else if(e.test(a)&&b.tagName!=="IMG")return d=ma(a),a=["<",c,' opacity="',d.get("a"),'"/>'],Aa(this.prepVML(a),null,null,b),d.get("rgb");else{b=b.getElementsByTagName(c);if(b.length)b[0].opacity=1;return a}},prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===
--1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","<hcv:");return a},text:Eb.prototype.html,path:function(a){return this.createElement("shape").attr({coordsize:"100 100",d:a})},circle:function(a,b,c){return this.symbol("circle").attr({x:a-c,y:b-c,width:2*c,height:2*c})},g:function(a){var b;a&&(b={className:Ia+a,"class":Ia+a});return this.createElement(Ra).attr(b)},image:function(a,
-b,c,d,e){var f=this.createElement("img").attr({src:a});arguments.length>1&&f.css({left:b,top:c,width:d,height:e});return f},rect:function(a,b,c,d,e,f){if(mb(a))b=a.y,c=a.width,d=a.height,f=a.strokeWidth,a=a.x;var g=this.symbol("rect");g.r=e;return g.attr(g.crisp(f,a,b,W(c,0),W(d,0)))},invertChild:function(a,b){var c=b.style;P(a,{flip:"x",left:S(c.width)-10,top:S(c.height)-10,rotation:-90})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,c=e.r||c||d,d=ja(f),h=C(f),i=ja(g),k=C(g),e=e.innerR,
-j=0.08/c,l=e&&0.25/e||0;if(g-f===0)return["x"];else 2*da-g+f<j?i=-j:g-f<l&&(i=ja(f+l));return["wa",a-c,b-c,a+c,b+c,a+c*d,b+c*h,a+c*i,b+c*k,"at",a-e,b-e,a+e,b+e,a+e*i,b+e*k,a+e*d,b+e*h,"x","e"]},circle:function(a,b,c,d){return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){if(!s(e))return[];var f=a+c,g=b+d,c=Ua(e.r||0,c,d);return[wa,a+c,b,fa,f-c,b,"wa",f-2*c,b,f,b+2*c,f-c,b,f,b+c,fa,f,g-c,"wa",f-2*c,g-2*c,f,g,f,g-c,f-c,g,fa,a+c,g,"wa",a,g-2*c,a+2*c,g,a+c,g,a,g-c,fa,a,b+c,"wa",
-a,b,a+2*c,b+2*c,a,b+c,a+c,b,"x","e"]}}},$a=function(){this.init.apply(this,arguments)},$a.prototype=K(Eb.prototype,w),Xb=$a;var oc,Cc;Fa&&(oc=function(){},Cc=function(){function a(){var a=b.length,d;for(d=0;d<a;d++)b[d]();b=[]}var b=[];return{push:function(c,d){b.length===0&&Hc(d,a);b.push(c)}}}());Xb=$a||oc||Eb;wc.prototype.callbacks=[];var lb=function(){};lb.prototype={init:function(a,b,c){var d=a.chart.counters;this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint){b=
-a.chart.options.colors;if(!this.options)this.options={};this.color=this.options.color=this.color||b[d.color++];d.wrapColor(b.length)}a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=typeof a;this.config=a;if(d==="number"||a===null)this.y=a;else if(typeof a[0]==="number")this.x=a[0],this.y=a[1];else if(d==="object"&&typeof a.length!=="number"){if(L(this,a),this.options=a,a.dataLabels)c._hasPointLabels=!0}else if(typeof a[0]==="string")this.name=a[0],this.y=a[1];if(this.x===
-X)this.x=b===X?c.autoIncrement():b},destroy:function(){var a=this.series,b=a.chart.hoverPoints,c;a.chart.pointCount--;b&&(this.setState(),Gb(b,this));if(this===a.chart.hoverPoint)this.onMouseOut();a.chart.hoverPoints=null;if(this.graphic||this.dataLabel)Qa(this),this.destroyElements();this.legendItem&&this.series.chart.legend.destroyItem(this);for(c in this)this[c]=null},destroyElements:function(){for(var a="graphic,tracker,dataLabel,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&
-(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},select:function(a,b){var c=this,d=c.series.chart,a=p(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=a;c.setState(a&&"select");b||o(d.getSelectedPoints(),function(a){if(a.selected&&a!==c)a.selected=!1,a.setState(Ka),a.firePointEvent("unselect")})})},
-onMouseOver:function(){var a=this.series,b=a.chart,c=b.tooltip,d=b.hoverPoint;if(d&&d!==this)d.onMouseOut();this.firePointEvent("mouseOver");c&&(!c.shared||a.noSharedTooltip)&&c.refresh(this);this.setState(ta);b.hoverPoint=this},onMouseOut:function(){this.firePointEvent("mouseOut");this.setState();this.series.chart.hoverPoint=null},tooltipFormatter:function(a){var b=this.series,c=b.tooltipOptions,d=String(this.y).split("."),d=d[1]?d[1].length:0,e=a.match(/\{(series|point)\.[a-zA-Z]+\}/g),f=/[{\.}]/,
-g,h,i,k;for(k in e)h=e[k],Ab(h)&&h!==a&&(i=(" "+h).split(f),g={point:this,series:b}[i[1]],i=i[2],g=g===this&&(i==="y"||i==="open"||i==="high"||i==="low"||i==="close")?(c.valuePrefix||c.yPrefix||"")+dc(this[i],p(c.valueDecimals,c.yDecimals,d))+(c.valueSuffix||c.ySuffix||""):g[i],a=a.replace(h,g));return a},update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g,h=e.data,i=h.length,k=e.chart,b=p(b,!0);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);mb(a)&&(e.getAttribs(),f&&f.attr(d.pointAttr[e.state]));
-for(g=0;g<i;g++)if(h[g]===d){e.xData[g]=d.x;e.yData[g]=d.y;e.options.data[g]=a;break}e.isDirty=!0;e.isDirtyData=!0;b&&k.redraw(c)})},remove:function(a,b){var c=this,d=c.series,e=d.chart,f,g=d.data,h=g.length;Kb(b,e);a=p(a,!0);c.firePointEvent("remove",null,function(){for(f=0;f<h;f++)if(g[f]===c){g.splice(f,1);d.options.data.splice(f,1);d.xData.splice(f,1);d.yData.splice(f,1);break}c.destroy();d.isDirty=!0;d.isDirtyData=!0;a&&e.redraw()})},firePointEvent:function(a,b,c){var d=this,e=this.series.options;
-(e.point.events[a]||d.options&&d.options.events&&d.options.events[a])&&this.importEvents();a==="click"&&e.allowPointSelect&&(c=function(a){d.select(null,a.ctrlKey||a.metaKey||a.shiftKey)});aa(this,a,b,c)},importEvents:function(){if(!this.hasImportedEvents){var a=K(this.series.options.point,this.options).events,b;this.events=a;for(b in a)ha(this,b,a[b]);this.hasImportedEvents=!0}},setState:function(a){var b=this.plotX,c=this.plotY,d=this.series,e=d.options.states,f=M[d.type].marker&&d.options.marker,
-g=f&&!f.enabled,h=f&&f.states[a],i=h&&h.enabled===!1,k=d.stateMarkerGraphic,j=d.chart,l=this.pointAttr,a=a||Ka;if(!(a===this.state||this.selected&&a!=="select"||e[a]&&e[a].enabled===!1||a&&(i||g&&!h.enabled))){if(this.graphic)e=f&&this.graphic.symbolName&&l[a].r,this.graphic.attr(K(l[a],e?{x:b-e,y:c-e,width:2*e,height:2*e}:{}));else{if(a){if(!k)e=f.radius,d.stateMarkerGraphic=k=j.renderer.symbol(d.symbol,-e,-e,2*e,2*e).attr(l[a]).add(d.group);k.translate(b,c)}if(k)k[a?"show":"hide"]()}this.state=
-a}}};var $=function(){};$.prototype={isCartesian:!0,type:"line",pointClass:lb,sorted:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},init:function(a,b){var c,d;d=a.series.length;this.chart=a;this.options=b=this.setOptions(b);this.bindAxes();L(this,{index:d,name:b.name||"Series "+(d+1),state:Ka,pointAttr:{},visible:b.visible!==!1,selected:b.selected===!0});if(Fa)b.animation=!1;d=b.events;for(c in d)ha(this,c,d[c]);if(d&&d.click||b.point&&b.point.events&&
-b.point.events.click||b.allowPointSelect)a.runTrackerClick=!0;this.getColor();this.getSymbol();this.setData(b.data,!1)},bindAxes:function(){var a=this,b=a.options,c=a.chart,d;a.isCartesian&&o(["xAxis","yAxis"],function(e){o(c[e],function(c){d=c.options;if(b[e]===d.index||b[e]===X&&d.index===0)c.series.push(a),a[e]=c,c.isDirty=!0})})},autoIncrement:function(){var a=this.options,b=this.xIncrement,b=p(b,a.pointStart,0);this.pointInterval=p(this.pointInterval,a.pointInterval,1);this.xIncrement=b+this.pointInterval;
-return b},getSegments:function(){var a=-1,b=[],c,d=this.points,e=d.length;if(e)if(this.options.connectNulls){for(c=e;c--;)d[c].y===null&&d.splice(c,1);d.length&&(b=[d])}else o(d,function(c,g){c.y===null?(g>a+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart.options,c=b.plotOptions,d=a.data;a.data=null;c=K(c[this.type],c.series,a);c.data=a.data=d;this.tooltipOptions=K(b.tooltip,c.tooltip);return c},getColor:function(){var a=
-this.chart.options.colors,b=this.chart.counters;this.color=this.options.color||a[b.color++]||"#0000ff";b.wrapColor(a.length)},getSymbol:function(){var a=this.options.marker,b=this.chart,c=b.options.symbols,b=b.counters;this.symbol=a.symbol||c[b.symbol++];if(/^url/.test(this.symbol))a.radius=0;b.wrapSymbol(c.length)},addPoint:function(a,b,c,d){var e=this.data,f=this.graph,g=this.area,h=this.chart,i=this.xData,k=this.yData,j=f&&f.shift||0,l=this.options.data;Kb(d,h);if(f&&c)f.shift=j+1;if(g){if(c)g.shift=
-j+1;g.isArea=!0}b=p(b,!0);d={series:this};this.pointClass.prototype.applyOptions.apply(d,[a]);i.push(d.x);k.push(this.valueCount===4?[d.open,d.high,d.low,d.close]:d.y);l.push(a);c&&(e[0]?e[0].remove(!1):(e.shift(),i.shift(),k.shift(),l.shift()));this.getAttribs();this.isDirtyData=this.isDirty=!0;b&&h.redraw()},setData:function(a,b){var c=this.points,d=this.options,e=this.initialColor,f=this.chart,g=null;this.xIncrement=null;this.pointRange=this.xAxis&&this.xAxis.categories&&1||d.pointRange;if(s(e))f.counters.color=
-e;var h=[],i=[],k=a?a.length:[],j=this.valueCount===4;if(k>(d.turboThreshold||1E3)){for(e=0;g===null&&e<k;)g=a[e],e++;if(Bb(g)){g=p(d.pointStart,0);d=p(d.pointInterval,1);for(e=0;e<k;e++)h[e]=g,i[e]=a[e],g+=d;this.xIncrement=g}else if(Fb(g))if(j)for(e=0;e<k;e++)d=a[e],h[e]=d[0],i[e]=d.slice(1,5);else for(e=0;e<k;e++)d=a[e],h[e]=d[0],i[e]=d[1]}else for(e=0;e<k;e++)d={series:this},this.pointClass.prototype.applyOptions.apply(d,[a[e]]),h[e]=d.x,i[e]=j?[d.open,d.high,d.low,d.close]:d.y;this.data=[];this.options.data=
-a;this.xData=h;this.yData=i;for(e=c&&c.length||0;e--;)c[e]&&c[e].destroy&&c[e].destroy();this.isDirty=this.isDirtyData=f.isDirtyBox=!0;p(b,!0)&&f.redraw(!1)},remove:function(a,b){var c=this,d=c.chart,a=p(a,!0);if(!c.isRemoving)c.isRemoving=!0,aa(c,"remove",null,function(){c.destroy();d.isDirtyLegend=d.isDirtyBox=!0;a&&d.redraw(b)});c.isRemoving=!1},processData:function(a){var b=this.xData,c=this.yData,d=b.length,e=0,f=d,g,h,i=this.xAxis,k=this.options,j=k.cropThreshold,l=this.isCartesian;if(l&&!this.isDirty&&
-!i.isDirty&&!this.yAxis.isDirty&&!a)return!1;if(l&&this.sorted&&(!j||d>j||this.forceCrop))if(a=i.getExtremes(),i=a.min,j=a.max,b[d-1]<i||b[0]>j)b=[],c=[];else if(b[0]<i||b[d-1]>j){for(a=0;a<d;a++)if(b[a]>=i){e=W(0,a-1);break}for(;a<d;a++)if(b[a]>j){f=a+1;break}b=b.slice(e,f);c=c.slice(e,f);g=!0}for(a=b.length-1;a>0;a--)if(d=b[a]-b[a-1],d>0&&(h===X||d<h))h=d;this.cropped=g;this.cropStart=e;this.processedXData=b;this.processedYData=c;if(k.pointRange===null)this.pointRange=h||1;this.closestPointRange=
-h},generatePoints:function(){var a=this.options.data,b=this.data,c,d=this.processedXData,e=this.processedYData,f=this.pointClass,g=d.length,h=this.cropStart||0,i,k=this.hasGroupedData,j,l=[],n;if(!b&&!k)b=[],b.length=a.length,b=this.data=b;for(n=0;n<g;n++)i=h+n,k?l[n]=(new f).init(this,[d[n]].concat(Hb(e[n]))):(b[i]?j=b[i]:b[i]=j=(new f).init(this,a[i],d[n]),l[n]=j);if(b&&(g!==(c=b.length)||k))for(n=0;n<c;n++)n===h&&!k&&(n+=g),b[n]&&b[n].destroyElements();this.data=b;this.points=l},translate:function(){this.processedXData||
-this.processData();this.generatePoints();for(var a=this.chart,b=this.options,c=b.stacking,d=this.xAxis,e=d.categories,f=this.yAxis,g=this.points,h=g.length,i=!!this.modifyValue,k,j=f.series,l=j.length;l--;)if(j[l].visible){l===this.index&&(k=!0);break}for(l=0;l<h;l++){var j=g[l],n=j.x,o=j.y,r=j.low,p=f.stacks[(o<b.threshold?"-":"")+this.stackKey];j.plotX=z(d.translate(n,0,0,0,1)*10)/10;if(c&&this.visible&&p&&p[n]){r=p[n];n=r.total;r.cum=r=r.cum-o;o=r+o;if(k)r=b.threshold;c==="percent"&&(r=n?r*100/
-n:0,o=n?o*100/n:0);j.percentage=n?j.y*100/n:0;j.stackTotal=n;j.stackY=o}j.yBottom=s(r)?f.translate(r,0,1,0,1):null;i&&(o=this.modifyValue(o,j));j.plotY=typeof o==="number"?z(f.translate(o,0,1,0,1)*10)/10:X;j.clientX=a.inverted?a.plotHeight-j.plotX:j.plotX;j.category=e&&e[j.x]!==X?e[j.x]:j.x}this.getSegments()},setTooltipPoints:function(a){var b=this.chart,c=b.inverted,d=[],b=z((c?b.plotTop:b.plotLeft)+b.plotSizeX),e,f;e=this.xAxis;var g,h,i=[];if(this.options.enableMouseTracking!==!1){if(a)this.tooltipPoints=
-null;o(this.segments||this.points,function(a){d=d.concat(a)});e&&e.reversed&&(d=d.reverse());a=d.length;for(h=0;h<a;h++){g=d[h];e=d[h-1]?d[h-1]._high+1:0;for(f=g._high=d[h+1]?Ta((g.plotX+(d[h+1]?d[h+1].plotX:b))/2):b;e<=f;)i[c?b-e++:e++]=g}this.tooltipPoints=i}},tooltipHeaderFormatter:function(a){var b=this.tooltipOptions,c=b.xDateFormat||"%A, %b %e, %Y",d=this.xAxis;return b.headerFormat.replace("{point.key}",d&&d.options.type==="datetime"?ac(c,a):a).replace("{series.name}",this.name).replace("{series.color}",
-this.color)},onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(Ga||!a.mouseIsDown){if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&aa(this,"mouseOver");this.setState(ta);a.hoverSeries=this}},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut();this&&a.events.mouseOut&&aa(this,"mouseOut");c&&!a.stickyTracking&&!c.shared&&c.hide();this.setState();b.hoverSeries=null},animate:function(a){var b=this.chart,c=this.clipRect,d=this.options.animation;
-d&&!mb(d)&&(d={});if(a){if(!c.isAnimating)c.attr("width",0),c.isAnimating=!0}else c.animate({width:b.plotSizeX},d),this.animate=null},drawPoints:function(){var a,b=this.points,c=this.chart,d,e,f,g,h,i,k,j;if(this.options.marker.enabled)for(f=b.length;f--;)if(g=b[f],d=g.plotX,e=g.plotY,j=g.graphic,e!==X&&!isNaN(e))if(a=g.pointAttr[g.selected?"select":Ka],h=a.r,i=p(g.marker&&g.marker.symbol,this.symbol),k=i.indexOf("url")===0,j)j.animate(L({x:d-h,y:e-h},j.symbolName?{width:2*h,height:2*h}:{}));else if(h>
-0||k)g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(this.group)},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=p(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=M[a.type].marker?a.options.marker:a.options,c=b.states,d=c[ta],e,f=a.color,g={stroke:f,fill:f},h=a.points,i=[],k,j=a.pointAttrToOptions,l;a.options.marker?(d.radius=d.radius||b.radius+2,d.lineWidth=d.lineWidth||b.lineWidth+1):d.color=
-d.color||ma(d.color||f).brighten(d.brightness).get();i[Ka]=a.convertAttribs(b,g);o([ta,"select"],function(b){i[b]=a.convertAttribs(c[b],i[Ka])});a.pointAttr=i;for(f=h.length;f--;){g=h[f];if((b=g.options&&g.options.marker||g.options)&&b.enabled===!1)b.radius=0;e=!1;if(g.options)for(l in j)s(b[j[l]])&&(e=!0);if(e){k=[];c=b.states||{};e=c[ta]=c[ta]||{};if(!a.options.marker)e.color=ma(e.color||g.options.color).brighten(e.brightness||d.brightness).get();k[Ka]=a.convertAttribs(b,i[Ka]);k[ta]=a.convertAttribs(c[ta],
-i[ta],k[Ka]);k.select=a.convertAttribs(c.select,i.select,k[Ka])}else k=i;g.pointAttr=k}},destroy:function(){var a=this,b=a.chart,c=a.clipRect,d=/AppleWebKit\/533/.test(kb),e,f,g=a.data||[],h,i,k;aa(a,"destroy");Qa(a);o(["xAxis","yAxis"],function(b){if(k=a[b])Gb(k.series,a),k.isDirty=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(f=g.length;f--;)(h=g[f])&&h.destroy&&h.destroy();a.points=null;if(c&&c!==b.clipRect)a.clipRect=c.destroy();o(["area","graph","dataLabelsGroup","group","tracker"],function(b){a[b]&&
-(e=d&&b==="group"?"hide":"destroy",a[b][e]())});if(b.hoverSeries===a)b.hoverSeries=null;Gb(b.series,a);for(i in a)delete a[i]},drawDataLabels:function(){var a=this,b=a.options,c=b.dataLabels;if(c.enabled||a._hasPointLabels){var d,e,f=a.points,g,h,i,k=a.dataLabelsGroup,j=a.chart,l=a.xAxis,l=l?l.left:j.plotLeft,n=a.yAxis,n=n?n.top:j.plotTop,t=j.renderer,r=j.inverted,Z=a.type,V=b.stacking,v=Z==="column"||Z==="bar",y=c.verticalAlign===null,q=c.y===null,T=t.fontMetrics(c.style.fontSize),A=T.h,x=T.b,w,
-ia;v&&(T={top:x,middle:x-A/2,bottom:-A+x},V?(y&&(c=K(c,{verticalAlign:"middle"})),q&&(c=K(c,{y:T[c.verticalAlign]}))):y?c=K(c,{verticalAlign:"top"}):q&&(c=K(c,{y:T[c.verticalAlign]})));k?k.translate(l,n):k=a.dataLabelsGroup=t.g("data-labels").attr({visibility:a.visible?eb:ab,zIndex:6}).translate(l,n).add();h=c;o(f,function(f){w=f.dataLabel;c=h;(g=f.options)&&g.dataLabels&&(c=K(c,g.dataLabels));if(ia=c.enabled){var l=f.barX&&f.barX+f.barW/2||p(f.plotX,-999),n=p(f.plotY,-999),o=c.y===null?f.y>=b.threshold?
--A+x:x:c.y;d=(r?j.plotWidth-n:l)+c.x;e=z((r?j.plotHeight-l:n)+o)}if(w&&a.isCartesian&&(!j.isInsidePlot(d,e)||!ia))f.dataLabel=w.destroy();else if(ia){l=c.align;i=c.formatter.call(f.getLabelConfig(),c);Z==="column"&&(d+={left:-1,right:1}[l]*f.barW/2||0);!V&&r&&f.y<0&&(l="right",d-=10);c.style.color=p(c.color,c.style.color,a.color,"black");if(w)w.attr({text:i}).animate({x:d,y:e});else if(s(i))w=f.dataLabel=t[c.rotation?"text":"label"](i,d,e,null,null,null,c.useHTML,!0).attr({align:l,fill:c.backgroundColor,
-stroke:c.borderColor,"stroke-width":c.borderWidth,r:c.borderRadius,rotation:c.rotation,padding:c.padding,zIndex:1}).css(c.style).add(k).shadow(c.shadow);if(v&&b.stacking&&w)l=f.barX,n=f.barY,o=f.barW,f=f.barH,w.align(c,null,{x:r?j.plotWidth-n-f:l,y:r?j.plotHeight-l-o:n,width:r?f:o,height:r?o:f})}})}},drawGraph:function(){var a=this,b=a.options,c=a.graph,d=[],e,f=a.area,g=a.group,h=b.lineColor||a.color,i=b.lineWidth,k=b.dashStyle,j,l=a.chart.renderer,n=a.yAxis.getThreshold(b.threshold),t=/^area/.test(a.type),
-r=[],s=[];o(a.segments,function(c){j=[];o(c,function(d,e){a.getPointSpline?j.push.apply(j,a.getPointSpline(c,d,e)):(j.push(e?fa:wa),e&&b.step&&j.push(d.plotX,c[e-1].plotY),j.push(d.plotX,d.plotY))});c.length>1?d=d.concat(j):r.push(c[0]);if(t){var e=[],f,g=j.length;for(f=0;f<g;f++)e.push(j[f]);g===3&&e.push(fa,j[1],j[2]);if(b.stacking&&a.type!=="areaspline")for(f=c.length-1;f>=0;f--)f<c.length-1&&b.step&&e.push(c[f+1].plotX,c[f].yBottom),e.push(c[f].plotX,c[f].yBottom);else e.push(fa,c[c.length-1].plotX,
-n,fa,c[0].plotX,n);s=s.concat(e)}});a.graphPath=d;a.singlePoints=r;if(t)e=p(b.fillColor,ma(a.color).setOpacity(b.fillOpacity||0.75).get()),f?f.animate({d:s}):a.area=a.chart.renderer.path(s).attr({fill:e}).add(g);if(c)Ob(c),c.animate({d:d});else if(i){c={stroke:h,"stroke-width":i};if(k)c.dashstyle=k;a.graph=l.path(d).attr(c).add(g).shadow(b.shadow)}},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};c.attr(a).invert();d&&d.attr(a).invert()}var b=this,c=b.group,d=b.trackerGroup,
-e=b.chart;ha(e,"resize",a);ha(b,"destroy",function(){Qa(e,"resize",a)});a();b.invertGroups=a},render:function(){var a=this,b=a.chart,c,d=a.options,e=d.clip!==!1,f=d.animation,g=f&&a.animate,f=g?f&&f.duration||500:0,h=a.clipRect,i=b.renderer;if(!h&&(h=a.clipRect=!b.hasRendered&&b.clipRect?b.clipRect:i.clipRect(0,0,b.plotSizeX,b.plotSizeY+1),!b.clipRect))b.clipRect=h;if(!a.group)c=a.group=i.g("series"),c.attr({visibility:a.visible?eb:ab,zIndex:d.zIndex}).translate(a.xAxis.left,a.yAxis.top).add(b.seriesGroup);
-a.drawDataLabels();g&&a.animate(!0);a.getAttribs();a.drawGraph&&a.drawGraph();a.drawPoints();a.options.enableMouseTracking!==!1&&a.drawTracker();b.inverted&&a.invertGroups();e&&!a.hasRendered&&(c.clip(h),a.trackerGroup&&a.trackerGroup.clip(b.clipRect));g&&a.animate();setTimeout(function(){h.isAnimating=!1;if((c=a.group)&&h!==b.clipRect&&h.renderer){if(e)c.clip(a.clipRect=b.clipRect);h.destroy()}},f);a.isDirty=a.isDirtyData=!1;a.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,
-c=this.group;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:this.xAxis.left,translateY:this.yAxis.top}));this.translate();this.setTooltipPoints(!0);this.render();b&&aa(this,"updatedData")},setState:function(a){var b=this.options,c=this.graph,d=b.states,b=b.lineWidth,a=a||Ka;if(this.state!==a)this.state=a,d[a]&&d[a].enabled===!1||(a&&(b=d[a].lineWidth||b+1),c&&!c.dashstyle&&c.attr({"stroke-width":b},a?0:500))},setVisible:function(a,b){var c=this.chart,d=this.legendItem,
-e=this.group,f=this.tracker,g=this.dataLabelsGroup,h,i=this.points,k=c.options.chart.ignoreHiddenSeries;h=this.visible;h=(this.visible=a=a===X?!h:a)?"show":"hide";if(e)e[h]();if(f)f[h]();else if(i)for(e=i.length;e--;)if(f=i[e],f.tracker)f.tracker[h]();if(g)g[h]();d&&c.legend.colorizeItem(this,a);this.isDirty=!0;this.options.stacking&&o(c.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});if(k)c.isDirtyBox=!0;b!==!1&&c.redraw();aa(this,h)},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},
-select:function(a){this.selected=a=a===X?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;aa(this,a?"select":"unselect")},drawTrackerGroup:function(){var a=this.trackerGroup,b=this.chart;if(this.isCartesian){if(!a)this.trackerGroup=a=b.renderer.g().attr({zIndex:this.options.zIndex||1}).add(b.trackerGroup);a.translate(this.xAxis.left,this.yAxis.top)}return a},drawTracker:function(){var a=this,b=a.options,c=[].concat(a.graphPath),d=c.length,e=a.chart,f=e.renderer,g=e.options.tooltip.snap,h=
-a.tracker,i=b.cursor,i=i&&{cursor:i},k=a.singlePoints,j=a.drawTrackerGroup(),l;if(d)for(l=d+1;l--;)c[l]===wa&&c.splice(l+1,0,c[l+1]-g,c[l+2],fa),(l&&c[l]===wa||l===d)&&c.splice(l,0,fa,c[l-2]+g,c[l-1]);for(l=0;l<k.length;l++)d=k[l],c.push(wa,d.plotX-g,d.plotY,fa,d.plotX+g,d.plotY);h?h.attr({d:c}):a.tracker=f.path(c).attr({isTracker:!0,stroke:Gc,fill:Ma,"stroke-linejoin":"bevel","stroke-width":b.lineWidth+2*g,visibility:a.visible?eb:ab}).on(Ga?"touchstart":"mouseover",function(){if(e.hoverSeries!==
-a)a.onMouseOver()}).on("mouseout",function(){if(!b.stickyTracking)a.onMouseOut()}).css(i).add(j)}};w=pa($);Ha.line=w;w=pa($,{type:"area"});Ha.area=w;w=pa($,{type:"spline",getPointSpline:function(a,b,c){var d=b.plotX,e=b.plotY,f=a[c-1],g=a[c+1],h,i,k,j;if(c&&c<a.length-1){a=f.plotY;k=g.plotX;var g=g.plotY,l;h=(1.5*d+f.plotX)/2.5;i=(1.5*e+a)/2.5;k=(1.5*d+k)/2.5;j=(1.5*e+g)/2.5;l=(j-i)*(k-d)/(k-h)+e-j;i+=l;j+=l;i>a&&i>e?(i=W(a,e),j=2*e-i):i<a&&i<e&&(i=Ua(a,e),j=2*e-i);j>g&&j>e?(j=W(g,e),i=2*e-j):j<g&&
-j<e&&(j=Ua(g,e),i=2*e-j);b.rightContX=k;b.rightContY=j}c?(b=["C",f.rightContX||f.plotX,f.rightContY||f.plotY,h||d,i||e,d,e],f.rightContX=f.rightContY=null):b=[wa,d,e];return b}});Ha.spline=w;w=pa(w,{type:"areaspline"});Ha.areaspline=w;var zb=pa($,{type:"column",tooltipOutsidePlot:!0,pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color",r:"borderRadius"},init:function(){$.prototype.init.apply(this,arguments);var a=this,b=a.chart;b.hasRendered&&o(b.series,function(b){if(b.type===
-a.type)b.isDirty=!0})},translate:function(){var a=this,b=a.chart,c=a.options,d=c.stacking,e=c.borderWidth,f=0,g=a.xAxis,h=g.reversed,i={},k,j;$.prototype.translate.apply(a);o(b.series,function(b){if(b.type===a.type&&b.visible&&a.options.group===b.options.group)b.options.stacking?(k=b.stackKey,i[k]===X&&(i[k]=f++),j=i[k]):j=f++,b.columnIndex=j});var b=a.points,g=Ba(g.translationSlope)*(g.ordinalSlope||g.closestPointRange||1),l=g*c.groupPadding,n=(g-2*l)/f,t=c.pointWidth,r=s(t)?(n-t)/2:n*c.pointPadding,
-w=Yb(W(p(t,n-2*r),1+2*e)),x=r+(l+((h?f-a.columnIndex:a.columnIndex)||0)*n-g/2)*(h?-1:1),v=a.yAxis.getThreshold(c.threshold),y=p(c.minPointLength,5);o(b,function(b){var f=b.plotY,g=p(b.yBottom,v),h=b.plotX+x,i=Yb(Ua(f,g)),j=Yb(W(f,g)-i),k=a.yAxis.stacks[(b.y<0?"-":"")+a.stackKey];d&&a.visible&&k&&k[b.x]&&k[b.x].setOffset(x,w);Ba(j)<y&&y&&(j=y,i=Ba(i-v)>y?g-y:v-(f<=v?y:0));L(b,{barX:h,barY:i,barW:w,barH:j});b.shapeType="rect";f={x:h,y:i,width:w,height:j,r:c.borderRadius,strokeWidth:e};e%2&&(f.y-=1,
-f.height+=1);b.shapeArgs=f;b.trackerArgs=Ba(j)<3&&K(b.shapeArgs,{height:6,y:i-3})})},getSymbol:function(){},drawGraph:function(){},drawPoints:function(){var a=this,b=a.options,c=a.chart.renderer,d,e;o(a.points,function(f){var g=f.plotY;if(g!==X&&!isNaN(g)&&f.y!==null)d=f.graphic,e=f.shapeArgs,d?(Ob(d),d.animate(c.Element.prototype.crisp.apply({},[e.strokeWidth,e.x,e.y,e.width,e.height]))):f.graphic=d=c[f.shapeType](e).attr(f.pointAttr[f.selected?"select":Ka]).add(a.group).shadow(b.shadow)})},drawTracker:function(){var a=
-this,b=a.chart,c=b.renderer,d,e,f=+new Date,g=a.options,h=g.cursor,i=h&&{cursor:h},k=a.drawTrackerGroup(),j;o(a.points,function(h){e=h.tracker;d=h.trackerArgs||h.shapeArgs;delete d.strokeWidth;if(h.y!==null)e?e.attr(d):h.tracker=c[h.shapeType](d).attr({isTracker:f,fill:Gc,visibility:a.visible?eb:ab}).on(Ga?"touchstart":"mouseover",function(c){j=c.relatedTarget||c.fromElement;if(b.hoverSeries!==a&&A(j,"isTracker")!==f)a.onMouseOver();h.onMouseOver()}).on("mouseout",function(b){if(!g.stickyTracking&&
-(j=b.relatedTarget||b.toElement,A(j,"isTracker")!==f))a.onMouseOut()}).css(i).add(h.group||k)})},animate:function(a){var b=this,c=b.points,d=b.options;if(!a)o(c,function(a){var c=a.graphic,a=a.shapeArgs,g=b.yAxis,h=d.threshold;c&&(c.attr({height:0,y:s(h)?g.getThreshold(h):g.translate(g.getExtremes().min,0,1,0,1)}),c.animate({height:a.height,y:a.y},d.animation))}),b.animate=null},remove:function(){var a=this,b=a.chart;b.hasRendered&&o(b.series,function(b){if(b.type===a.type)b.isDirty=!0});$.prototype.remove.apply(a,
-arguments)}});Ha.column=zb;w=pa(zb,{type:"bar",init:function(){this.inverted=!0;zb.prototype.init.apply(this,arguments)}});Ha.bar=w;w=pa($,{type:"scatter",sorted:!1,translate:function(){var a=this;$.prototype.translate.apply(a);o(a.points,function(b){b.shapeType="circle";b.shapeArgs={x:b.plotX,y:b.plotY,r:a.chart.options.tooltip.snap}})},drawTracker:function(){for(var a=this,b=a.options.cursor,b=b&&{cursor:b},c=a.points,d=c.length,e;d--;)if(e=c[d].graphic)e.element._i=d;a._hasTracking?a._hasTracking=
-!0:a.group.attr({isTracker:!0}).on(Ga?"touchstart":"mouseover",function(b){a.onMouseOver();if(b.target._i!==X)c[b.target._i].onMouseOver()}).on("mouseout",function(){if(!a.options.stickyTracking)a.onMouseOut()}).css(b)}});Ha.scatter=w;w=pa(lb,{init:function(){lb.prototype.init.apply(this,arguments);var a=this,b;L(a,{visible:a.visible!==!1,name:p(a.name,"Slice")});b=function(){a.slice()};ha(a,"select",b);ha(a,"unselect",b);return a},setVisible:function(a){var b=this.series.chart,c=this.tracker,d=this.dataLabel,
-e=this.connector,f=this.shadowGroup,g;g=(this.visible=a=a===X?!this.visible:a)?"show":"hide";this.group[g]();if(c)c[g]();if(d)d[g]();if(e)e[g]();if(f)f[g]();this.legendItem&&b.legend.colorizeItem(this,a)},slice:function(a,b,c){var d=this.series.chart,e=this.slicedTranslation;Kb(c,d);p(b,!0);a=this.sliced=s(a)?a:!this.sliced;a={translateX:a?e[0]:d.plotLeft,translateY:a?e[1]:d.plotTop};this.group.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)}});w=pa($,{type:"pie",isCartesian:!1,pointClass:w,
-pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:function(){this.initialColor=this.chart.counters.color},animate:function(){var a=this;o(a.points,function(b){var c=b.graphic,b=b.shapeArgs,d=-da/2;c&&(c.attr({r:0,start:d,end:d}),c.animate({r:b.r,start:b.start,end:b.end},a.options.animation))});a.animate=null},setData:function(){$.prototype.setData.apply(this,arguments);this.processData();this.generatePoints()},translate:function(){this.generatePoints();var a=
-0,b=-0.25,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f=c.center.concat([c.size,c.innerSize||0]),g=this.chart,h=g.plotWidth,i=g.plotHeight,k,j,l,n=this.points,p=2*da,r,s=Ua(h,i),w,v,y,q=c.dataLabels.distance,f=Vb(f,function(a,b){return(w=/%$/.test(a))?[h,i,s,s][b]*S(a)/100:a});this.getX=function(a,b){l=oa.asin((a-f[1])/(f[2]/2+q));return f[0]+(b?-1:1)*ja(l)*(f[2]/2+q)};this.center=f;o(n,function(b){a+=b.y});o(n,function(c){r=a?c.y/a:0;k=z(b*p*1E3)/1E3;b+=r;j=z(b*p*1E3)/1E3;c.shapeType="arc";
-c.shapeArgs={x:f[0],y:f[1],r:f[2]/2,innerR:f[3]/2,start:k,end:j};l=(j+k)/2;c.slicedTranslation=Vb([ja(l)*d+g.plotLeft,C(l)*d+g.plotTop],z);v=ja(l)*f[2]/2;y=C(l)*f[2]/2;c.tooltipPos=[f[0]+v*0.7,f[1]+y*0.7];c.labelPos=[f[0]+v+ja(l)*q,f[1]+y+C(l)*q,f[0]+v+ja(l)*e,f[1]+y+C(l)*e,f[0]+v,f[1]+y,q<0?"center":l<p/4?"left":"right",l];c.percentage=r*100;c.total=a});this.setTooltipPoints()},render:function(){this.getAttribs();this.drawPoints();this.options.enableMouseTracking!==!1&&this.drawTracker();this.drawDataLabels();
-this.options.animation&&this.animate&&this.animate();this.isDirty=!1},drawPoints:function(){var a=this.chart,b=a.renderer,c,d,e,f=this.options.shadow,g,h;o(this.points,function(i){d=i.graphic;h=i.shapeArgs;e=i.group;g=i.shadowGroup;if(f&&!g)g=i.shadowGroup=b.g("shadow").attr({zIndex:4}).add();if(!e)e=i.group=b.g("point").attr({zIndex:5}).add();c=i.sliced?i.slicedTranslation:[a.plotLeft,a.plotTop];e.translate(c[0],c[1]);g&&g.translate(c[0],c[1]);d?d.animate(h):i.graphic=b.arc(h).attr(L(i.pointAttr[Ka],
-{"stroke-linejoin":"round"})).add(i.group).shadow(f,g);i.visible===!1&&i.setVisible(!1)})},drawDataLabels:function(){var a=this.data,b,c=this.chart,d=this.options.dataLabels,e=p(d.connectorPadding,10),f=p(d.connectorWidth,1),g,h,i=p(d.softConnector,!0),k=d.distance,j=this.center,l=j[2]/2,j=j[1],n=k>0,t=[[],[]],r,s,w,v,y=2,q;if(d.enabled){$.prototype.drawDataLabels.apply(this);o(a,function(a){a.dataLabel&&t[a.labelPos[7]<da/2?0:1].push(a)});t[1].reverse();v=function(a,b){return b.y-a.y};for(a=t[0][0]&&
-t[0][0].dataLabel&&t[0][0].dataLabel.getBBox().height;y--;){var x=[],A=[],z=t[y],E=z.length,C;for(q=j-l-k;q<=j+l+k;q+=a)x.push(q);w=x.length;if(E>w){h=[].concat(z);h.sort(v);for(q=E;q--;)h[q].rank=q;for(q=E;q--;)z[q].rank>=w&&z.splice(q,1);E=z.length}for(q=0;q<E;q++){b=z[q];h=b.labelPos;b=9999;for(s=0;s<w;s++)g=Ba(x[s]-h[1]),g<b&&(b=g,C=s);if(C<q&&x[q]!==null)C=q;else for(w<E-q+C&&x[q]!==null&&(C=w-E+q);x[C]===null;)C++;A.push({i:C,y:x[C]});x[C]=null}A.sort(v);for(q=0;q<E;q++){b=z[q];h=b.labelPos;
-g=b.dataLabel;s=A.pop();r=h[1];w=b.visible===!1?ab:eb;C=s.i;s=s.y;if(r>s&&x[C+1]!==null||r<s&&x[C-1]!==null)s=r;r=this.getX(C===0||C===x.length-1?r:s,y);g.attr({visibility:w,align:h[6]})[g.moved?"animate":"attr"]({x:r+d.x+({left:e,right:-e}[h[6]]||0),y:s+d.y});g.moved=!0;if(n&&f)g=b.connector,h=i?[wa,r+(h[6]==="left"?5:-5),s,"C",r,s,2*h[2]-h[4],2*h[3]-h[5],h[2],h[3],fa,h[4],h[5]]:[wa,r+(h[6]==="left"?5:-5),s,fa,h[2],h[3],fa,h[4],h[5]],g?(g.animate({d:h}),g.attr("visibility",w)):b.connector=g=this.chart.renderer.path(h).attr({"stroke-width":f,
-stroke:d.connectorColor||b.color||"#606060",visibility:w,zIndex:3}).translate(c.plotLeft,c.plotTop).add()}}}},drawTracker:zb.prototype.drawTracker,getSymbol:function(){}});Ha.pie=w;L(Highcharts,{Chart:wc,dateFormat:ac,pathAnim:La,getOptions:function(){return Ea},hasBidiBug:Qc,numberFormat:dc,Point:lb,Color:ma,Renderer:Xb,SVGRenderer:Eb,VMLRenderer:$a,CanVGRenderer:oc,seriesTypes:Ha,setOptions:function(a){$b=K($b,a.xAxis);kc=K(kc,a.yAxis);a.xAxis=a.yAxis=X;Ea=K(Ea,a);vc();return Ea},Series:$,addEvent:ha,
-removeEvent:Qa,createElement:Aa,discardElement:Tb,css:P,each:o,extend:L,map:Vb,merge:K,pick:p,splat:Hb,extendClass:pa,placeBox:uc,product:"Highcharts",version:"2.2.1"})})();
diff --git a/apps/storage_charts/js/units.min.js b/apps/storage_charts/js/units.min.js
deleted file mode 100644
index 5815f75fbb..0000000000
--- a/apps/storage_charts/js/units.min.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-function getLinesUsseUnitsSelect(s){$('#clines_usse h3').append('<span id="selunits"><span id="selloader"></span><select id="chunits"><option value="1"'+(s==1?' selected':'')+'>'+t('storage_charts','Kilobytes (KB)')+'</option><option value="2"'+(s==2?' selected':'')+'>'+t('storage_charts','Megabytes (MB)')+'</option><option value="3"'+(s==3?' selected':'')+'>'+t('storage_charts','Gigabytes (GB)')+'</option><option value="4"'+(s==4?' selected':'')+'>'+t('storage_charts','Terabytes (TB)')+'</option></select></span>');$('#chunits').chosen();$('#chunits').change(function(){$('#selloader').html('<img src="'+OC.imagePath('storage_charts','loader.gif')+'" />');$.ajax({type:'POST',url:OC.linkTo('storage_charts','ajax/data.php'),dataType:'json',data:{s:$('#chunits').val(),k:'hu_size'},async:true,success:function(s){eval(s.r);$('#selloader img').remove();}});});}
-function getHistoUsUnitsSelect(s){$('#chisto_us h3').append('<span id="selunits_hus"><span id="selloader_hus"></span><select id="chunits_hus"><option value="1"'+(s==1?' selected':'')+'>'+t('storage_charts','Kilobytes (KB)')+'</option><option value="2"'+(s==2?' selected':'')+'>'+t('storage_charts','Megabytes (MB)')+'</option><option value="3"'+(s==3?' selected':'')+'>'+t('storage_charts','Gigabytes (GB)')+'</option><option value="4"'+(s==4?' selected':'')+'>'+t('storage_charts','Terabytes (TB)')+'</option></select></span>');$('#chunits_hus').chosen();$('#chunits_hus').change(function(){$('#selloader_hus').html('<img src="'+OC.imagePath('storage_charts','loader.gif')+'" />');$.ajax({type:'POST',url:OC.linkTo('storage_charts','ajax/data.php'),dataType:'json',data:{s:$('#chunits_hus').val(),k:'hu_size_hus'},async:true,success:function(s){eval(s.r);$('#selloader_hus img').remove();}});});}
diff --git a/apps/storage_charts/l10n/de.php b/apps/storage_charts/l10n/de.php
deleted file mode 100644
index e58e8acde2..0000000000
--- a/apps/storage_charts/l10n/de.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* English texts
-* 
-*/
-
-$TRANSLATIONS = Array(
-	'all users' => 'Alle Benutzer',
-	'April' => 'April',
-	'August' => 'August',
-	'December' => 'Dezember',
-	'February' => 'Februar',
-	'January' => 'Januar',
-	'July' => 'Juli',
-	'June' => 'Juni',
-	'March' => 'März',
-	'May' => 'Mai',
-	'November' => 'November',
-	'October' => 'Oktober',
-	'September' => 'September',
-	'Monthly Used Space Evolution' => 'Entwicklung des monatlich genutzten Speichers',
-	'Last 7 days' => 'Die letzten 7 Tage',
-	'Daily Used Space Evolution' => 'Entwicklung des täglich genutzten Speichers',
-	'Current ratio free space / used space' => 'Aktuelles Verhältnis zwischen freier Speicher / genutzter Speicher',
-	'for' => 'für',
-	'Free space' => 'Freier Speicher',
-	'Drag\'N\'Drop on the chart title to re-order' => 'Drag\'N\'Drop der Diagrammnamen zum neuordnern',
-	'Gigabytes (GB)' => 'Gigabytes (GB)',
-	'Kilobytes (KB)' => 'Kilobytes (KB)',
-	'Megabytes (MB)' => 'Megabytes (MB)',
-	'Terabytes (TB)' => 'Terabytes (TB)',
-	'Used space' => 'Genutzter Speicher',
-	'Average used space' => 'Durchschnittlich verbrauchter Speicher',
-	
-	// Personal settings
-	'Save' => 'Speichern',
-	'Save OK' => 'Speichern erfolgreich',
-	'Uncheck charts you do not want to display' => 'Diagramme abwählen die nicht angezeigt werden sollen'
-);
\ No newline at end of file
diff --git a/apps/storage_charts/l10n/en.php b/apps/storage_charts/l10n/en.php
deleted file mode 100644
index 7676107aa3..0000000000
--- a/apps/storage_charts/l10n/en.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* English texts
-* 
-*/
-
-$TRANSLATIONS = Array(
-	'all users' => 'all users',
-	'April' => 'April',
-	'August' => 'August',
-	'Average used space' => 'Average used space',
-	'December' => 'December',
-	'February' => 'February',
-	'January' => 'January',
-	'July' => 'July',
-	'June' => 'June',
-	'March' => 'March',
-	'May' => 'May',
-	'November' => 'November',
-	'October' => 'October',
-	'September' => 'September',
-	'Monthly Used Space Evolution' => 'Monthly Used Space Evolution',
-	'Last 7 days' => 'Last 7 days',
-	'Daily Used Space Evolution' => 'Daily Used Space Evolution',
-	'Current ratio free space / used space' => 'Current ratio free space / used space',
-	'for' => 'for',
-	'Free space' => 'Free space',
-	'Drag\'N\'Drop on the chart title to re-order' => 'Drag\'N\'Drop on the chart title to re-order',
-	'Gigabytes (GB)' => 'Gigabytes (GB)',
-	'Kilobytes (KB)' => 'Kilobytes (KB)',
-	'Megabytes (MB)' => 'Megabytes (MB)',
-	'Terabytes (TB)' => 'Terabytes (TB)',
-	'Used space' => 'Used space',
-	
-	// Personal settings
-	'Save' => 'Save',
-	'Save OK' => 'Save OK',
-	'Uncheck charts you do not want to display' => 'Uncheck charts you do not want to display'
-);
\ No newline at end of file
diff --git a/apps/storage_charts/l10n/fr.php b/apps/storage_charts/l10n/fr.php
deleted file mode 100644
index 9d1b23b34d..0000000000
--- a/apps/storage_charts/l10n/fr.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* French texts
-* 
-*/
-
-$TRANSLATIONS = Array(
-	'all users' => 'tous les utilisateurs',
-	'April' => 'Avril',
-	'August' => 'Août',
-	'December' => 'Décembre',
-	'February' => 'Février',
-	'January' => 'Janvier',
-	'July' => 'Juillet',
-	'June' => 'Juin',
-	'March' => 'Mars',
-	'May' => 'Mai',
-	'November' => 'Novembre',
-	'October' => 'Octobre',
-	'September' => 'Septembre',
-	'Monthly Used Space Evolution' => 'Evolution mensuelle de l\'espace utilisé',
-	'Last 7 days' => 'Les 7 derniers jours',
-	'Daily Used Space Evolution' => 'Evolution quotidienne de l\'espace utilisé',
-	'Current ratio free space / used space' => 'Ratio Espace libre / Espace utilisé actuel',
-	'for' => 'pour',
-	'Free space' => 'Espace libre',
-	'Drag\'N\'Drop on the chart title to re-order' => 'Drag\'N\'Drop sur le titre du graph pour changer l\'ordre',
-	'Gigabytes (GB)' => 'Gigabytes (GB)',
-	'Kilobytes (KB)' => 'Kilobytes (KB)',
-	'Megabytes (MB)' => 'Megabytes (MB)',
-	'Terabytes (TB)' => 'Terabytes (TB)',
-	'Used space' => 'Espace utilisé',
-	'Average used space' => 'Espace utilisé moyen',
-	
-	// Personal settings
-	'Save' => 'Enregistrer',
-	'Save OK' => 'Enregistrement OK',
-	'Uncheck charts you do not want to display' => 'Décochez les graphs que vous ne voulez pas afficher'
-);
\ No newline at end of file
diff --git a/apps/storage_charts/l10n/pt_BR.php b/apps/storage_charts/l10n/pt_BR.php
deleted file mode 100644
index 823e19a6ed..0000000000
--- a/apps/storage_charts/l10n/pt_BR.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* Portuguese texts
-* 26/May/2012 - Translated by Tiago Soares (tbsoares@gmail.com)
-* 
-*/
-
-$TRANSLATIONS = Array(
-	'all users' => 'Todos os usuários',
-	'April' => 'Abril',
-	'August' => 'Agosto',
-	'Average used space' => 'Média de espaço utilizado',
-	'December' => 'Dezembro',
-	'February' => 'Fevereiro',
-	'January' => 'Janeiro',
-	'July' => 'Julho',
-	'June' => 'Junho',
-	'March' => 'Março',
-	'May' => 'Maio',
-	'November' => 'Novembro',
-	'October' => 'Outubro',
-	'September' => 'Setembro',
-	'Monthly Used Space Evolution' => 'Evolução mensal do espaço utilizado',
-	'Last 7 days' => 'Últimos 7 dias',
-	'Daily Used Space Evolution' => 'Evolução diária do espaço utilizado',
-	'Current ratio free space / used space' => 'Proporção atual entre espaço livre / espaço utilizado',
-	'for' => 'para',
-	'Free space' => 'Espaço livre',
-	'Drag\'N\'Drop on the chart title to re-order' => 'Arraste e solte no título do gráfico para reordenar',
-	'Gigabytes (GB)' => 'Gigabytes (GB)',
-	'Kilobytes (KB)' => 'Kilobytes (KB)',
-	'Megabytes (MB)' => 'Megabytes (MB)',
-	'Terabytes (TB)' => 'Terabytes (TB)',
-	'Used space' => 'Espaço utlizado',
-	
-	// Personal settings
-	'Save' => 'Salvar',
-	'Save OK' => 'Salvo',
-	'Uncheck charts you do not want to display' => 'Desmarque os gráficos que não deseja exibir'
-);
diff --git a/apps/storage_charts/lib/db.class.php b/apps/storage_charts/lib/db.class.php
deleted file mode 100644
index 4479622180..0000000000
--- a/apps/storage_charts/lib/db.class.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-/**
- * This class manages storage_charts. 
- */
-class OC_DLStCharts {
-	
-	/**
-	 * UPDATE day use for a user
-	 * @param $used user used space
-	 * @param $total total users used space
-	 */
-	public static function update($used, $total){
-		$query = OCP\DB::prepare("SELECT stc_id FROM *PREFIX*dlstcharts WHERE oc_uid = ? AND stc_dayts = ?");
-		$result = $query->execute(Array(OCP\User::getUser(), mktime(0,0,0)))->fetchRow();
-		if($result){
-			$query = OCP\DB::prepare("UPDATE *PREFIX*dlstcharts SET stc_used = ?, stc_total = ? WHERE stc_id = ?");
-			$query->execute(Array($used, $total, $result['stc_id']));
-		}else{
-			$query = OCP\DB::prepare("INSERT INTO *PREFIX*dlstcharts (oc_uid,stc_month,stc_dayts,stc_used,stc_total) VALUES (?,?,?,?,?)");
-			$query->execute(Array(OCP\User::getUser(), date('Ym'), mktime(0,0,0), $used, $total));
-		}
-	}
-	
-	/**
-	 * Get the size of the data folder
-	 * @param $path path to the folder you want to calculate the total size
-	 */
-	public static function getTotalDataSize($path){
-		if(is_file($path)){
-			$path = dirname($path);
-		}
-		$path = str_replace('//', '/', $path);
-		if(is_dir($path) and strcmp(substr($path, -1), '/') != 0){
-			$path .= '/';
-		}
-		$size = 0;
-		if($dh = opendir($path)){
-			while(($filename = readdir($dh)) !== false) {
-				if(strcmp($filename, '.') != 0 and strcmp($filename, '..') != 0){
-					$subFile = $path . '/' . $filename;
-					if(is_file($subFile)){
-						$size += filesize($subFile);
-					}else{
-						$size += self::getTotalDataSize($subFile);
-					}
-				}
-			}
-		}
-		return $size;
-	}
-	
-	/**
-	 * Get data to build the pie about the Free-Used space ratio
-	 */
-	public static function getPieFreeUsedSpaceRatio(){
-		if(OC_Group::inGroup(OCP\User::getUser(), 'admin')){
-			$query = OCP\DB::prepare("SELECT stc_id, stc_dayts, oc_uid FROM (SELECT * FROM *PREFIX*dlstcharts ORDER BY stc_dayts DESC) last GROUP BY oc_uid");
-			$results = $query->execute()->fetchAll();
-		}else{
-			$query = OCP\DB::prepare("SELECT stc_id, MAX(stc_dayts) as stc_dayts FROM *PREFIX*dlstcharts WHERE oc_uid = ?");
-			$results = $query->execute(Array(OCP\User::getUser()))->fetchAll();
-		}
-		
-		$return = Array();
-		foreach($results as $result){
-			$query = OCP\DB::prepare("SELECT oc_uid, stc_used, stc_total FROM *PREFIX*dlstcharts WHERE stc_id = ?");
-			$return[] = $query->execute(Array($result['stc_id']))->fetchAll();
-		}
-		
-		return $return;
-	}
-	
-	/**
-	 * Get data to build the line chart about last 7 days used space evolution
-	 */
-	public static function getUsedSpaceOverTime($time){
-		$return = Array();
-		if(OC_Group::inGroup(OCP\User::getUser(), 'admin')){
-			foreach(OCP\User::getUsers() as $user){
-				if(strcmp($time, 'daily') == 0){
-					$return[$user] = self::getDataByUserToLineChart($user);
-				}else{
-					$return[$user] = self::getDataByUserToHistoChart($user);
-				}
-			}
-		}else{
-			if(strcmp($time, 'daily') == 0){
-				$return[OCP\User::getUser()] = self::getDataByUserToLineChart(OCP\User::getUser());
-			}else{
-				$return[OCP\User::getUser()] = self::getDataByUserToHistoChart(OCP\User::getUser());
-			}
-		}
-		return $return;
-	}
-	
-	/**
-	 * Get configuration values stored in the database
-	 * @param $key The conf key
-	 * @return Array The conf value
-	 */
-	public static function getUConfValue($key, $default = NULL){
-		$query = OCP\DB::prepare("SELECT uc_id,uc_val FROM *PREFIX*dlstcharts_uconf WHERE oc_uid = ? AND uc_key = ?");
-		$result = $query->execute(Array(OCP\User::getUser(), $key))->fetchRow();
-		if($result){
-			return $result;
-		}
-		return $default;
-	}
-	
-	/**
-	 * Set configuration values stored in the database
-	 * @param $key The conf key
-	 * @param $val The conf value
-	 */
-	public static function setUConfValue($key,$val){
-		$conf = self::getUConfValue($key);
-		if(!is_null($conf)){
-			$query = OCP\DB::prepare("UPDATE *PREFIX*dlstcharts_uconf SET uc_val = ? WHERE uc_id = ?");
-			$query->execute(Array($val, $conf['uc_id']));
-		}else{
-			$query = OCP\DB::prepare("INSERT INTO *PREFIX*dlstcharts_uconf (oc_uid,uc_key,uc_val) VALUES (?,?,?)");
-			$query->execute(Array(OCP\User::getUser(), $key, $val));
-		}
-	}
-	
-	/**
-	 * Parse an array and return data in the highCharts format
-	 * @param $operation operation to do 
-	 * @param $elements elements to parse
-	 */
-	public static function arrayParser($operation, $elements, $l, $data_sep = ',', $ck = 'hu_size'){
-		$return = "";
-		switch($operation){
-			case 'pie':
-				$free = $total = 0;
-				foreach($elements as $element){
-					$element = $element[0];
-					
-					$total = $element['stc_total'];
-					$free += $element['stc_used'];
-					
-					$return .= "['" . $element['oc_uid'] . "', " . $element['stc_used'] . "],";
-				}
-				$return .= "['" . $l->t('Free space') . "', " . ($total - $free) . "]";
-			break;
-			case 'histo':
-			case 'line':
-				$conf = self::getUConfValue($ck, Array('uc_val' => 3));
-				$div = 1;
-				switch($conf['uc_val']){
-					case 4:
-						$div = 1024;
-					case 3:
-						$div *= 1024;
-					case 2:
-						$div *= 1024;
-					case 1:
-						$div *= 1024;
-				}
-				
-				foreach($elements as $user => $data){
-					$return_tmp = '{"name":"' . $user . '","data":[';
-					foreach($data as $number){
-						$return_tmp .= round($number/$div, 2) . ",";
-					}
-					$return_tmp = substr($return_tmp, 0, -1) . "]}";
-					
-					$return .= $return_tmp . $data_sep;
-				}
-				$return = substr($return, 0, -(strlen($data_sep)));
-			break;
-		}
-		return $return;
-	}
-	
-	/**
-	 * Get data by user for Seven Days Line Chart
-	 * @param $user the user
-	 * @return Array
-	 */
-	private static function getDataByUserToLineChart($user){
-		$dates = Array(
-			mktime(0,0,0,date('m'),date('d')-6),
-			mktime(0,0,0,date('m'),date('d')-5),
-			mktime(0,0,0,date('m'),date('d')-4),
-			mktime(0,0,0,date('m'),date('d')-3),
-			mktime(0,0,0,date('m'),date('d')-2),
-			mktime(0,0,0,date('m'),date('d')-1),
-			mktime(0,0,0,date('m'),date('d'))
-		);
-		
-		$return = Array();
-		foreach($dates as $kd => $date){
-			$query = OCP\DB::prepare("SELECT stc_used FROM *PREFIX*dlstcharts WHERE oc_uid = ? AND stc_dayts = ?");
-			$result = $query->execute(Array($user, $date))->fetchAll();
-			
-			if(count($result) > 0){
-				$return[] = $result[0]['stc_used'];
-			}else{
-				if($kd == 0){
-					$query = OCP\DB::prepare("SELECT stc_used FROM *PREFIX*dlstcharts WHERE oc_uid = ? AND stc_dayts < ? ORDER BY stc_dayts DESC");
-					$result = $query->execute(Array($user, $date))->fetchAll();
-					
-					if(count($result) > 0){
-						$return[] = $result[0]['stc_used'];
-					}else{
-						$return[] = 0;
-					}
-				}else{
-					$return[] = 0;
-				}
-			}
-		}
-		
-		$last = 0;
-		foreach ($return as $key => $value) {
-			if($value == 0){
-				$return[$key] = $last;
-			}
-			$last = $return[$key];
-		}
-		return $return;
-	}
-
-	/**
-	 * Get data by users for monthly evolution
-	 * @param $user The user
-	 * @return Array
-	 */
-	private static function getDataByUserToHistoChart($user){
-		$months = Array(
-			date('Ym',mktime(0,0,0,date('m')-11)),
-			date('Ym',mktime(0,0,0,date('m')-10)),
-			date('Ym',mktime(0,0,0,date('m')-9)),
-			date('Ym',mktime(0,0,0,date('m')-8)),
-			date('Ym',mktime(0,0,0,date('m')-7)),
-			date('Ym',mktime(0,0,0,date('m')-6)),
-			date('Ym',mktime(0,0,0,date('m')-5)),
-			date('Ym',mktime(0,0,0,date('m')-4)),
-			date('Ym',mktime(0,0,0,date('m')-3)),
-			date('Ym',mktime(0,0,0,date('m')-2)),
-			date('Ym',mktime(0,0,0,date('m')-1)),
-			date('Ym',mktime(0,0,0,date('m')))
-		);
-		
-		$return = Array();
-		foreach($months as $km => $month){
-			$query = OCP\DB::prepare("SELECT AVG(stc_used) as stc_used FROM *PREFIX*dlstcharts WHERE oc_uid = ? AND stc_month = ?");
-			$result = $query->execute(Array($user, $month))->fetchAll();
-			
-			if(count($result) > 0){
-				$return[] = $result[0]['stc_used'];
-			}else{
-				$return[] = 0;
-			}
-		}
-		
-		$last = 0;
-		foreach ($return as $key => $value) {
-			if($value == 0){
-				$return[$key] = $last;
-			}
-			$last = $return[$key];
-		}
-		return $return;
-	}
-	
-}
\ No newline at end of file
diff --git a/apps/storage_charts/lib/loader.class.php b/apps/storage_charts/lib/loader.class.php
deleted file mode 100644
index 3df5abe584..0000000000
--- a/apps/storage_charts/lib/loader.class.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-/**
- * This class load charts for storage_charts. 
- */
-class OC_DLStChartsLoader {
-	
-	private static $l;
-	
-	/**
-	 * Loader
-	 * @param $chart_id The chart iD
-	 * @return String
-	 */
-	public static function loadChart($chart_id, $l){
-		self::$l = $l;
-		
-		switch($chart_id){
-			case 'cpie_rfsus':
-				return self::loadPieFreeUsedSpaceRatioChart();
-				break;
-			case 'clines_usse':
-				return self::loadLinesLastSevenDaysUsedSpaceChart();
-				break;
-			case 'chisto_us':
-				return self::loadHistoMonthlyUsedSpaceChart();
-				break;
-		}
-	}
-	
-	/**
-	 * Get free/used space ratio chart
-	 * @return String
-	 */
-	private static function loadPieFreeUsedSpaceRatioChart(){
-		return 'pierfsus=new Highcharts.Chart({chart:{renderTo:\'pie_rfsus\',backgroundColor:\'#F8F8F8\',plotBackgroundColor:\'#F8F8F8\',plotBorderWidth:false,plotShadow:false},title:{text:\'\'},tooltip:{formatter:function(){return \'<b>\'+this.point.name+\'</b>: \'+(Math.round(this.percentage*100)/100)+\' %\';}},plotOptions:{pie:{allowPointSelect:true,cursor:\'pointer\',dataLabels:{enabled:true,color:\'#000000\',connectorColor:\'#000000\',formatter:function(){return\'<b>\'+this.point.name+\'</b>: \'+Math.round(this.percentage)+\' %\';}}}},series:[{type:\'pie\',name:\'Used-Free space ratio\',data:[' . OC_DLStCharts::arrayParser('pie',OC_DLStCharts::getPieFreeUsedSpaceRatio(), self::$l) . ']}],exporting:{enabled:false}});';
-	}
-	
-	/**
-	 * Get seven days used space evolution chart
-	 * @return String 
-	 */
-	private static function loadLinesLastSevenDaysUsedSpaceChart(){
-		$units = Array('', 'KB', 'MB', 'GB', 'TB');
-		$u = OC_DLStCharts::getUConfValue('hu_size', Array('uc_val' => 3));
-		$u = $units[$u['uc_val']];
-		return 'linesusse=new Highcharts.Chart({chart:{renderTo:\'lines_usse\',backgroundColor:\'#F8F8F8\',plotBackgroundColor:\'#F8F8F8\',type:\'line\'},title:{text:\'\'},subtitle:{text:\''.self::$l->t('Last 7 days').'\',x:-20},xAxis:{categories:["'.date('m/d', mktime(0,0,0,date('m'),date('d')-6)).'","'.date('m/d', mktime(0,0,0,date('m'),date('d')-5)).'","'.date('m/d', mktime(0,0,0,date('m'),date('d')-4)).'","'.date('m/d', mktime(0,0,0,date('m'),date('d')-3)).'","'.date('m/d', mktime(0,0,0,date('m'),date('d')-2)).'","'.date('m/d', mktime(0,0,0,date('m'),date('d')-1)).'","'.date('m/d', mktime(0,0,0,date('m'),date('d'))).'"]},yAxis:{title:{text:\''.self::$l->t('Used space').' ('.$u.')\'},plotLines:[{value:0,width:1,color:\'#808080\'}],startOnTick:false,min:0},tooltip:{crosshairs:true,formatter:function(){return \'<b>\'+this.series.name+\'</b><br/>\'+this.x+\': \'+this.y+\' '.$u.'\';}},legend:{layout:\'horizontal\',align:\'center\',verticalAlign:\'top\',x:-25,y:40,borderWidth:0},series:['.OC_DLStCharts::arrayParser('line', OC_DLStCharts::getUsedSpaceOverTime('daily'), self::$l).'],exporting:{enabled:false}});';
-	}
-
-	/**
-	 * Get monthly used space evolution chart
-	 * @return String
-	 */
-	private static function loadHistoMonthlyUsedSpaceChart(){
-		$units = Array('', 'KB', 'MB', 'GB', 'TB');
-		$u = OC_DLStCharts::getUConfValue('hu_size_hus', Array('uc_val' => 3));
-		$u = $units[$u['uc_val']];
-		
-		$months = self::getMonths();
-		
-		return 'histous=new Highcharts.Chart({chart:{renderTo:\'histo_us\',backgroundColor:\'#F8F8F8\',plotBackgroundColor:\'#F8F8F8\',type:\'column\'},title:{text:\'\'},xAxis:{categories:["'.self::$l->t($months[0]).' '.date('Y',mktime(0,0,0,date('m')-11)).'","'.self::$l->t($months[1]).' '.date('Y',mktime(0,0,0,date('m')-10)).'","'.self::$l->t($months[2]).' '.date('Y',mktime(0,0,0,date('m')-9)).'","'.self::$l->t($months[3]).' '.date('Y',mktime(0,0,0,date('m')-8)).'","'.self::$l->t($months[4]).' '.date('Y',mktime(0,0,0,date('m')-7)).'","'.self::$l->t($months[5]).' '.date('Y',mktime(0,0,0,date('m')-6)).'","'.self::$l->t($months[6]).' '.date('Y',mktime(0,0,0,date('m')-5)).'","'.self::$l->t($months[7]).' '.date('Y',mktime(0,0,0,date('m')-4)).'","'.self::$l->t($months[8]).' '.date('Y',mktime(0,0,0,date('m')-3)).'","'.self::$l->t($months[9]).' '.date('Y',mktime(0,0,0,date('m')-2)).'","'.self::$l->t($months[10]).' '.date('Y',mktime(0,0,0,date('m')-1)).'","'.self::$l->t($months[11]).' '.date('Y',mktime(0,0,0,date('m'))).'"]},yAxis:{min:0,title:{text:\''.self::$l->t('Average used space').' ('.$u.')\'},stackLabels:{enabled:true,style:{fontWeight:\'bold\',color:(Highcharts.theme&&Highcharts.theme.textColor)||\'gray\'},formatter:function(){return(Math.round(this.total*100)/100);}}},legend:{align:\'center\',x:-20,verticalAlign:\'top\',y:20,floating:true,backgroundColor:(Highcharts.theme&&Highcharts.theme.legendBackgroundColorSolid)||\'white\',borderColor:\'#CCC\',borderWidth:1,shadow:false},tooltip:{formatter:function(){return \'<b>\'+this.x+\'</b><br/>\'+this.series.name+\': \'+(Math.round(this.y*100)/100)+\' '.$u.'<br/>\'+\'Total: \'+(Math.round(this.point.stackTotal*100)/100)+\' '.$u.'\';}},plotOptions:{column:{stacking:\'normal\',dataLabels:{enabled:false,color:(Highcharts.theme&&Highcharts.theme.dataLabelsColor)||\'white\'}}},series:['.OC_DLStCharts::arrayParser('histo',OC_DLStCharts::getUsedSpaceOverTime('monthly'),self::$l,',','hu_size_hus').'],exporting:{enabled:false}});';
-	}
-
-	/**
-	 * Get months
-	 */
-	private static function getMonths(){
-		$months = Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		
-		$tmp = Array();
-		for($i=date('n');$i<12;$i++){
-			$tmp[] = $months[$i];
-		}
-		for($i=0;$i<date('n');$i++){
-			$tmp[] = $months[$i];
-		}
-		
-		return $tmp;
-	}
-	
-}
\ No newline at end of file
diff --git a/apps/storage_charts/settings.php b/apps/storage_charts/settings.php
deleted file mode 100644
index 6a43684452..0000000000
--- a/apps/storage_charts/settings.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('storage_charts');
-
-$tmpl = new OCP\Template('storage_charts', 'settings.tpl');
-
-if(isset($_POST['storage_charts_disp']) && count($_POST['storage_charts_disp']) <= 3){
-	$c = $_POST['storage_charts_disp'];
-	$c_disp = Array('cpie_rfsus'=>0,'clines_usse'=>0,'chisto_us'=>0);
-	foreach(array_keys($c_disp) as $chart){
-		if(in_array($chart, $c)){
-			$c_disp[$chart] = 1;
-		}
-	}
-	OC_DLStCharts::setUConfValue('c_disp', serialize($c_disp));
-	$tmpl->assign('stc_save_ok', TRUE);
-}
-
-$displays = OC_DLStCharts::getUConfValue('c_disp', Array('uc_val' => 'a:3:{s:10:"cpie_rfsus";i:1;s:11:"clines_usse";i:1;s:9:"chisto_us";i:1;}'));
-$tmpl->assign('displays', unserialize($displays['uc_val']));
-return $tmpl->fetchPage();
\ No newline at end of file
diff --git a/apps/storage_charts/templates/charts.tpl.php b/apps/storage_charts/templates/charts.tpl.php
deleted file mode 100644
index 98d20706df..0000000000
--- a/apps/storage_charts/templates/charts.tpl.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* JS minified by http://fmarcia.info/jsmin/test.html
-* 
-*/
-
-OCP\Util::addStyle('storage_charts', 'styles');
-OCP\Util::addScript('storage_charts', 'highCharts-2.2.1/highcharts.min');
-OCP\Util::addScript('3rdparty','chosen/chosen.jquery.min');
-OCP\Util::addStyle('3rdparty','chosen');
-OCP\Util::addScript('storage_charts', 'units.min');
-
-?>
-
-<script type="text/javascript">
-    $(document).ready(function(){
-    	$('#stc_sortable').sortable({
-    		axis:'y',handle:'h3',placeholder:'ui-state-highlight',update:function(e,u){
-    			$.ajax({
-		        	type:'POST',
-		        	url:OC.linkTo('storage_charts','ajax/config.php'),
-		        	dataType:'json',
-		        	data:{o:'set',k:'sc_sort',i:$('#stc_sortable').sortable('toArray')},
-		        	async:true
-		        });
-    		}
-    	});
-    	$('#stc_sortable').disableSelection();
-    });
-</script>
-
-<div id="storage-charts">
-	<div class="personalblock topblock titleblock">
-		DjazzLab Storage Charts<span><?php print($l->t('Drag\'N\'Drop on the chart title to re-order')); ?></span>
-	</div>
-</div>
-<div id="stc_frame">
-	<div id="stc_sortable">
-		<?php foreach($_['sc_sort'] as $sc_sort){
-			if(strcmp($sc_sort, 'cpie_rfsus') == 0){
-				$sc_sort_title = 'Current ratio free space / used space';
-			}elseif(strcmp($sc_sort, 'clines_usse') == 0){
-				$sc_sort_title = 'Daily Used Space Evolution';
-			}else{
-				$sc_sort_title = 'Monthly Used Space Evolution';
-			}
-			if($_['c_disp'][$sc_sort]){ ?>
-			<div id="<?php print($sc_sort); ?>" class="personalblock">
-				<h3><img src="<?php print(OCP\Util::imagePath('storage_charts', 'move.png')); ?>" /><?php print($l->t($sc_sort_title).' '.$l->t('for')); ?> "<?php print(OC_Group::inGroup(OCP\User::getUser(), 'admin')?$l->t('all users'):OCP\User::getUser()); ?>"</h3>
-				<div id="<?php print(substr($sc_sort, 1)); ?>" style="max-width:100%;height:400px;margin:0 auto"></div>
-				<script type="text/javascript">$(document).ready(function(){<?php print(OC_DLStChartsLoader::loadChart($sc_sort, $l)); ?>});</script>
-			</div>
-			<?php }
-		} ?>
-	</div>
-	<?php if($_['c_disp']['clines_usse']){print('<script type="text/javascript">$(document).ready(function(){getLinesUsseUnitsSelect('.$_['hu_size'].');});</script>');}
-	if($_['c_disp']['chisto_us']){print('<script type="text/javascript">$(document).ready(function(){getHistoUsUnitsSelect(' . $_['hu_size_hus'] . ');});</script>');} ?>
-</div>
\ No newline at end of file
diff --git a/apps/storage_charts/templates/settings.tpl.php b/apps/storage_charts/templates/settings.tpl.php
deleted file mode 100644
index 6b86850c93..0000000000
--- a/apps/storage_charts/templates/settings.tpl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
-* ownCloud - DjazzLab Storage Charts plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-?>
-<form id="storage_charts" method="POST" action="<?php print(OC_Helper::linkTo('settings','personal.php')); ?>">
-	<fieldset class="personalblock">
-		<strong>DjazzLab Storage Charts</strong><span style="margin-left:10px;color:#BBB;font-style:italic;"><?php print($l->t('Uncheck charts you do not want to display')); ?></span>
-		<?php foreach($_['displays'] as $chart => $is_enable){
-			if(strcmp($chart, 'cpie_rfsus') == 0){
-				$chart_title = 'Current ratio free space / used space';
-			}elseif(strcmp($chart, 'clines_usse') == 0){
-				$chart_title = 'Daily Used Space Evolution';
-			}else{
-				$chart_title = 'Monthly Used Space Evolution'; 
-			} ?>
-			<div><input type="checkbox" name="storage_charts_disp[]" id="<?php print($chart); ?>_e" style="margin-right:10px;"<?php print($is_enable?' checked':'') ?> value="<?php print($chart); ?>" /><?php print($l->t($chart_title)); ?></div>
-		<?php } ?>
-		<input type="submit" value="<?php print($l->t('Save')); ?>" /><span style="color:#00A220;"><?php if(isset($_['stc_save_ok'])){print($l->t('Save OK'));} ?></span>
-	</fieldset>
-</form>
diff --git a/apps/tal/.gitignore b/apps/tal/.gitignore
deleted file mode 100644
index e2ff07d14d..0000000000
--- a/apps/tal/.gitignore
+++ /dev/null
@@ -1,51 +0,0 @@
-# the default generated dir + db file
-data
-owncloud
-config/config.php
-config/mount.php
-apps/inc.php
-
-# just sane ignores
-.*.sw[po]
-*.bak
-*.BAK
-*~
-*.orig
-*.class
-.cvsignore
-Thumbs.db
-*.py[co]
-_darcs/*
-CVS/*
-.svn/*
-RCS/*
-
-# kdevelop
-.kdev
-*.kdev4
-
-# Lokalize
-*lokalize*
-
-# eclipse
-.project
-.settings
-
-# netbeans 
-nbproject
-
-# geany
-*.geany
-
-# Cloud9IDE
-.settings.xml
-
-# vim ex mode
-.vimrc
-	
-# Mac OS
-.DS_Store
-
-# WebFinger
-.well-known
-/.buildpath
diff --git a/apps/tal/COPYING-AGPL b/apps/tal/COPYING-AGPL
deleted file mode 100644
index dba13ed2dd..0000000000
--- a/apps/tal/COPYING-AGPL
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/apps/tal/COPYING-README b/apps/tal/COPYING-README
deleted file mode 100644
index 18f06caa3e..0000000000
--- a/apps/tal/COPYING-README
+++ /dev/null
@@ -1,10 +0,0 @@
-Files in TAL Templating System for ownCloud are licensed under the Affero General Public License version 3,
-the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
-unless otherwise noted.
-
-Licensing of components:
-* PHPTAL - http://phptal.org/ : LGPL
-
-All unmodified files from these and other sources retain their original copyright
-and license notices: see the relevant individual files.
-
diff --git a/apps/tal/README.md b/apps/tal/README.md
deleted file mode 100644
index 756221c07a..0000000000
--- a/apps/tal/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# TAL Page Templates for ownCloud
-
-Develop using the Template Attribute Language instead of having clumsy
-`<?php echo $var; ?>` tags in your markup.
-
-Read more at the [PHPTAL site](http://phptal.org/introduction.html)
-
-## Install from git
-
-1. Go to your ownCloud apps dir and clone the repo there:
-	 <pre>
-	 cd owncloud/apps
-	 git clone git://github.com/tanghus/tal.git
-	 </pre>
-	
-2. Go to the `lib`directory of the newly created `tal` folder and clone the [PHPTAL repo](https://github.com/pornel/PHPTAL):
-
-	 <pre>
-	cd tal/lib
-	git clone git://github.com/pornel/PHPTAL.git
-	 </pre>
-	
-3. From your browser go to the ownCloud apps page (`/settings/apps.php`) and enable the "TAL Page Templates for ownCloud" app.
-
-4. Go to the Personal page (`/settings/personal.php`) and check if the installation has succeeded. You will find a section with a link to the manual.
-
diff --git a/apps/tal/TODO b/apps/tal/TODO
deleted file mode 100644
index ef1e495249..0000000000
--- a/apps/tal/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-TODO
-- Create script to extract translatable strings.
diff --git a/apps/tal/ajax/loadpage.php b/apps/tal/ajax/loadpage.php
deleted file mode 100644
index f6a1499f45..0000000000
--- a/apps/tal/ajax/loadpage.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tal');
-
-$id = isset($_GET['id'])?trim(strip_tags($_GET['id'])):'';
-
-if($id) {
-	$tmpl = new OC_TALTemplate('tal', 'sections');
-	$tmpl->assign('id',$id);
-	$page = $tmpl->fetchPage();
-	OCP\JSON::success(array('data' => array('id'=>$id, 'page'=>$page)));
-	exit();
-} else {
-	$l10n = new OC_L10N('tal');
-	OCP\JSON::error(array('data' => array('message' => $l10n->t('Page name missing from request.'))));
-}
\ No newline at end of file
diff --git a/apps/tal/appinfo/app.php b/apps/tal/appinfo/app.php
deleted file mode 100644
index 65c1c4b5bd..0000000000
--- a/apps/tal/appinfo/app.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-OC::$CLASSPATH['OC_TALTemplate'] =				'tal/lib/taltemplate.php';
-OC::$CLASSPATH['OC_TALL10N'] =					'tal/lib/tall10n.php';
-OC::$CLASSPATH['PHPTAL'] =						'tal/lib/PHPTAL/classes/PHPTAL.php';
-OC::$CLASSPATH['PHPTAL_TranslationService'] =	'tal/lib/PHPTAL/classes/PHPTAL/TranslationService.php';
-
-OCP\App::register( array(
-	'id' => 'tal',
-	'name' => 'TAL Page Templates' ));
-
-OCP\App::registerPersonal('tal','settings');
\ No newline at end of file
diff --git a/apps/tal/appinfo/info.xml b/apps/tal/appinfo/info.xml
deleted file mode 100644
index 40224f29ff..0000000000
--- a/apps/tal/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>tal</id>
-	<name>TAL Page Templates for ownCloud</name>
-	<description>This is an alternative to OC_Template and OC_L10N - the templating and internationalization classes used in ownCloud.
-	</description>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Thomas Tanghus</author>
-	<require>5</require>
-</info>
diff --git a/apps/tal/css/tal.css b/apps/tal/css/tal.css
deleted file mode 100644
index ed51bc5038..0000000000
--- a/apps/tal/css/tal.css
+++ /dev/null
@@ -1,25 +0,0 @@
-#manual { 
-	float: left;
-	position: absolute; left: 0; top: 0; right: 0; bottom: 0;
-	margin: 0.5em; 
-	padding: 1em; 
-	overflow: auto; 
-	background-color :#f8f8f8;
-	color: #555;
-	border: 1px solid #ddd;
-	border-radius: 0.5em 0.5em 0.5em 0.5em;
-	-webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms;
-}
-#manual nav { position: fixed; top: 5em; width: 15%; font-weight: bold; font-size: 1.2em; }
-#manual ol { list-style: decimal; padding-left: 3em; }
-#manual section { float:right; width: 80%; height: 95%; padding: 1em; font-size: 1.2em; }
-#manual a { color: #555; }
-#manual a:hover { color: #333; }
-#manual li:hover { color: #333; background-color:#eee; }
-code, pre { font-family: "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
-code { margin: 0; padding: 0; }
-pre { overflow:auto; display:block; margin: 1em; padding: 1em; background-color:#f5f5f5; border:1px solid rgba(0, 0, 0, 0.15); border-radius:4px;white-space:pre;}
-h1 { font-size: 1.6em; font-weight: bold; padding: 0.2em 0.2em 0.8em 0.2em; }
-h2 { font-size: 1.2em; font-weight: bold; padding: 1em 0.2em 0.8em 0em;  }
-h3 { font-size: 1em; font-weight: bold; }
-.readmore { font-weight: bold; }
diff --git a/apps/tal/index.php b/apps/tal/index.php
deleted file mode 100644
index d847195dc9..0000000000
--- a/apps/tal/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('tal');
-
-OCP\Util::addscript('tal','tal');
-OCP\Util::addscript('tal','modernizr');
-OCP\Util::addStyle('tal','tal');
-
-$sections = array(
-		array('id' => 'intro', 'title' => 'Introduction'),
-		array('id' => 'example-1', 'title' => 'A simple example'),
-		array('id' => 'gotchas', 'title' => 'Caveats & Gotchas'),
-		array('id' => 'ref', 'title' => 'References'),
-		);
-$page = isset($_GET['page'])?trim(strip_tags($_GET['page'])):$sections[0]['id'];
-
-$tmpl = new OC_TALTemplate('tal', 'manual', 'user');
-$tmpl->assign('application', 'TAL');
-$tmpl->assign('page', $page);
-$tmpl->assign('sections', $sections);
-$tmpl->printPage();
-?>
diff --git a/apps/tal/js/modernizr.js b/apps/tal/js/modernizr.js
deleted file mode 100644
index c1a6a9a51d..0000000000
--- a/apps/tal/js/modernizr.js
+++ /dev/null
@@ -1,1265 +0,0 @@
-/*!
- * Modernizr v2.5.3
- * www.modernizr.com
- *
- * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
- * Available under the BSD and MIT licenses: www.modernizr.com/license/
- */
-
-/*
- * Modernizr tests which native CSS3 and HTML5 features are available in
- * the current UA and makes the results available to you in two ways:
- * as properties on a global Modernizr object, and as classes on the
- * <html> element. This information allows you to progressively enhance
- * your pages with a granular level of control over the experience.
- *
- * Modernizr has an optional (not included) conditional resource loader
- * called Modernizr.load(), based on Yepnope.js (yepnopejs.com).
- * To get a build that includes Modernizr.load(), as well as choosing
- * which tests to include, go to www.modernizr.com/download/
- *
- * Authors        Faruk Ates, Paul Irish, Alex Sexton
- * Contributors   Ryan Seddon, Ben Alman
- */
-
-window.Modernizr = (function( window, document, undefined ) {
-
-    var version = '2.5.3',
-
-    Modernizr = {},
-    
-    // option for enabling the HTML classes to be added
-    enableClasses = true,
-
-    docElement = document.documentElement,
-
-    /**
-     * Create our "modernizr" element that we do most feature tests on.
-     */
-    mod = 'modernizr',
-    modElem = document.createElement(mod),
-    mStyle = modElem.style,
-
-    /**
-     * Create the input element for various Web Forms feature tests.
-     */
-    inputElem = document.createElement('input'),
-
-    smile = ':)',
-
-    toString = {}.toString,
-
-    // List of property values to set for css tests. See ticket #21
-    prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),
-
-    // Following spec is to expose vendor-specific style properties as:
-    //   elem.style.WebkitBorderRadius
-    // and the following would be incorrect:
-    //   elem.style.webkitBorderRadius
-
-    // Webkit ghosts their properties in lowercase but Opera & Moz do not.
-    // Microsoft uses a lowercase `ms` instead of the correct `Ms` in IE8+
-    //   erik.eae.net/archives/2008/03/10/21.48.10/
-
-    // More here: github.com/Modernizr/Modernizr/issues/issue/21
-    omPrefixes = 'Webkit Moz O ms',
-
-    cssomPrefixes = omPrefixes.split(' '),
-
-    domPrefixes = omPrefixes.toLowerCase().split(' '),
-
-    ns = {'svg': 'http://www.w3.org/2000/svg'},
-
-    tests = {},
-    inputs = {},
-    attrs = {},
-
-    classes = [],
-
-    slice = classes.slice,
-
-    featureName, // used in testing loop
-
-
-    // Inject element with style element and some CSS rules
-    injectElementWithStyles = function( rule, callback, nodes, testnames ) {
-
-      var style, ret, node,
-          div = document.createElement('div'),
-          // After page load injecting a fake body doesn't work so check if body exists
-          body = document.body, 
-          // IE6 and 7 won't return offsetWidth or offsetHeight unless it's in the body element, so we fake it.
-          fakeBody = body ? body : document.createElement('body');
-
-      if ( parseInt(nodes, 10) ) {
-          // In order not to give false positives we create a node for each test
-          // This also allows the method to scale for unspecified uses
-          while ( nodes-- ) {
-              node = document.createElement('div');
-              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
-              div.appendChild(node);
-          }
-      }
-
-      // <style> elements in IE6-9 are considered 'NoScope' elements and therefore will be removed
-      // when injected with innerHTML. To get around this you need to prepend the 'NoScope' element
-      // with a 'scoped' element, in our case the soft-hyphen entity as it won't mess with our measurements.
-      // msdn.microsoft.com/en-us/library/ms533897%28VS.85%29.aspx
-      // Documents served as xml will throw if using &shy; so use xml friendly encoded version. See issue #277
-      style = ['&#173;','<style>', rule, '</style>'].join('');
-      div.id = mod;
-      // IE6 will false positive on some tests due to the style element inside the test div somehow interfering offsetHeight, so insert it into body or fakebody.
-      // Opera will act all quirky when injecting elements in documentElement when page is served as xml, needs fakebody too. #270
-      fakeBody.innerHTML += style;
-      fakeBody.appendChild(div);
-      if(!body){
-          //avoid crashing IE8, if background image is used
-          fakeBody.style.background = "";
-          docElement.appendChild(fakeBody);
-      }
-
-      ret = callback(div, rule);
-      // If this is done after page load we don't want to remove the body so check if body exists
-      !body ? fakeBody.parentNode.removeChild(fakeBody) : div.parentNode.removeChild(div);
-
-      return !!ret;
-
-    },
-
-
-    // adapted from matchMedia polyfill
-    // by Scott Jehl and Paul Irish
-    // gist.github.com/786768
-    testMediaQuery = function( mq ) {
-
-      var matchMedia = window.matchMedia || window.msMatchMedia;
-      if ( matchMedia ) {
-        return matchMedia(mq).matches;
-      }
-
-      var bool;
-
-      injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) {
-        bool = (window.getComputedStyle ?
-                  getComputedStyle(node, null) :
-                  node.currentStyle)['position'] == 'absolute';
-      });
-
-      return bool;
-
-     },
-
-
-    /**
-      * isEventSupported determines if a given element supports the given event
-      * function from yura.thinkweb2.com/isEventSupported/
-      */
-    isEventSupported = (function() {
-
-      var TAGNAMES = {
-        'select': 'input', 'change': 'input',
-        'submit': 'form', 'reset': 'form',
-        'error': 'img', 'load': 'img', 'abort': 'img'
-      };
-
-      function isEventSupported( eventName, element ) {
-
-        element = element || document.createElement(TAGNAMES[eventName] || 'div');
-        eventName = 'on' + eventName;
-
-        // When using `setAttribute`, IE skips "unload", WebKit skips "unload" and "resize", whereas `in` "catches" those
-        var isSupported = eventName in element;
-
-        if ( !isSupported ) {
-          // If it has no `setAttribute` (i.e. doesn't implement Node interface), try generic element
-          if ( !element.setAttribute ) {
-            element = document.createElement('div');
-          }
-          if ( element.setAttribute && element.removeAttribute ) {
-            element.setAttribute(eventName, '');
-            isSupported = is(element[eventName], 'function');
-
-            // If property was created, "remove it" (by setting value to `undefined`)
-            if ( !is(element[eventName], 'undefined') ) {
-              element[eventName] = undefined;
-            }
-            element.removeAttribute(eventName);
-          }
-        }
-
-        element = null;
-        return isSupported;
-      }
-      return isEventSupported;
-    })();
-
-    // hasOwnProperty shim by kangax needed for Safari 2.0 support
-    var _hasOwnProperty = ({}).hasOwnProperty, hasOwnProperty;
-    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
-      hasOwnProperty = function (object, property) {
-        return _hasOwnProperty.call(object, property);
-      };
-    }
-    else {
-      hasOwnProperty = function (object, property) { /* yes, this can give false positives/negatives, but most of the time we don't care about those */
-        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
-      };
-    }
-
-    // Taken from ES5-shim https://github.com/kriskowal/es5-shim/blob/master/es5-shim.js
-    // ES-5 15.3.4.5
-    // http://es5.github.com/#x15.3.4.5
-
-    if (!Function.prototype.bind) {
-      
-      Function.prototype.bind = function bind(that) {
-        
-        var target = this;
-        
-        if (typeof target != "function") {
-            throw new TypeError();
-        }
-        
-        var args = slice.call(arguments, 1),
-            bound = function () {
-
-            if (this instanceof bound) {
-              
-              var F = function(){};
-              F.prototype = target.prototype;
-              var self = new F;
-
-              var result = target.apply(
-                  self,
-                  args.concat(slice.call(arguments))
-              );
-              if (Object(result) === result) {
-                  return result;
-              }
-              return self;
-
-            } else {
-              
-              return target.apply(
-                  that,
-                  args.concat(slice.call(arguments))
-              );
-
-            }
-
-        };
-        
-        return bound;
-      };
-    }
-
-    /**
-     * setCss applies given styles to the Modernizr DOM node.
-     */
-    function setCss( str ) {
-        mStyle.cssText = str;
-    }
-
-    /**
-     * setCssAll extrapolates all vendor-specific css strings.
-     */
-    function setCssAll( str1, str2 ) {
-        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
-    }
-
-    /**
-     * is returns a boolean for if typeof obj is exactly type.
-     */
-    function is( obj, type ) {
-        return typeof obj === type;
-    }
-
-    /**
-     * contains returns a boolean for if substr is found within str.
-     */
-    function contains( str, substr ) {
-        return !!~('' + str).indexOf(substr);
-    }
-
-    /**
-     * testProps is a generic CSS / DOM property test; if a browser supports
-     *   a certain property, it won't return undefined for it.
-     *   A supported CSS property returns empty string when its not yet set.
-     */
-    function testProps( props, prefixed ) {
-        for ( var i in props ) {
-            if ( mStyle[ props[i] ] !== undefined ) {
-                return prefixed == 'pfx' ? props[i] : true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * testDOMProps is a generic DOM property test; if a browser supports
-     *   a certain property, it won't return undefined for it.
-     */
-    function testDOMProps( props, obj, elem ) {
-        for ( var i in props ) {
-            var item = obj[props[i]];
-            if ( item !== undefined) {
-
-                // return the property name as a string
-                if (elem === false) return props[i];
-
-                // let's bind a function
-                if (is(item, 'function')){
-                  // default to autobind unless override
-                  return item.bind(elem || obj);
-                }
-                
-                // return the unbound function or obj or value
-                return item;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * testPropsAll tests a list of DOM properties we want to check against.
-     *   We specify literally ALL possible (known and/or likely) properties on
-     *   the element including the non-vendor prefixed one, for forward-
-     *   compatibility.
-     */
-    function testPropsAll( prop, prefixed, elem ) {
-
-        var ucProp  = prop.charAt(0).toUpperCase() + prop.substr(1),
-            props   = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
-
-        // did they call .prefixed('boxSizing') or are we just testing a prop?
-        if(is(prefixed, "string") || is(prefixed, "undefined")) {
-          return testProps(props, prefixed);
-
-        // otherwise, they called .prefixed('requestAnimationFrame', window[, elem])
-        } else {
-          props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');
-          return testDOMProps(props, prefixed, elem);
-        }
-    }
-
-    /**
-     * testBundle tests a list of CSS features that require element and style injection.
-     *   By bundling them together we can reduce the need to touch the DOM multiple times.
-     */
-    /*>>testBundle*/
-    var testBundle = (function( styles, tests ) {
-        var style = styles.join(''),
-            len = tests.length;
-
-        injectElementWithStyles(style, function( node, rule ) {
-            var style = document.styleSheets[document.styleSheets.length - 1],
-                // IE8 will bork if you create a custom build that excludes both fontface and generatedcontent tests.
-                // So we check for cssRules and that there is a rule available
-                // More here: github.com/Modernizr/Modernizr/issues/288 & github.com/Modernizr/Modernizr/issues/293
-                cssText = style ? (style.cssRules && style.cssRules[0] ? style.cssRules[0].cssText : style.cssText || '') : '',
-                children = node.childNodes, hash = {};
-
-            while ( len-- ) {
-                hash[children[len].id] = children[len];
-            }
-
-             /*>>touch*/          Modernizr['touch'] = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch || (hash['touch'] && hash['touch'].offsetTop) === 9; /*>>touch*/
-            /*>>csstransforms3d*/ Modernizr['csstransforms3d'] = (hash['csstransforms3d'] && hash['csstransforms3d'].offsetLeft) === 9 && hash['csstransforms3d'].offsetHeight === 3;          /*>>csstransforms3d*/
-            /*>>generatedcontent*/Modernizr['generatedcontent'] = (hash['generatedcontent'] && hash['generatedcontent'].offsetHeight) >= 1;       /*>>generatedcontent*/
-            /*>>fontface*/        Modernizr['fontface'] = /src/i.test(cssText) &&
-                                                                  cssText.indexOf(rule.split(' ')[0]) === 0;        /*>>fontface*/
-        }, len, tests);
-
-    })([
-        // Pass in styles to be injected into document
-        /*>>fontface*/        '@font-face {font-family:"font";src:url("https://")}'         /*>>fontface*/
-        
-        /*>>touch*/           ,['@media (',prefixes.join('touch-enabled),('),mod,')',
-                                '{#touch{top:9px;position:absolute}}'].join('')           /*>>touch*/
-                                
-        /*>>csstransforms3d*/ ,['@media (',prefixes.join('transform-3d),('),mod,')',
-                                '{#csstransforms3d{left:9px;position:absolute;height:3px;}}'].join('')/*>>csstransforms3d*/
-                                
-        /*>>generatedcontent*/,['#generatedcontent:after{content:"',smile,'";visibility:hidden}'].join('')  /*>>generatedcontent*/
-    ],
-      [
-        /*>>fontface*/        'fontface'          /*>>fontface*/
-        /*>>touch*/           ,'touch'            /*>>touch*/
-        /*>>csstransforms3d*/ ,'csstransforms3d'  /*>>csstransforms3d*/
-        /*>>generatedcontent*/,'generatedcontent' /*>>generatedcontent*/
-        
-    ]);/*>>testBundle*/
-
-
-    /**
-     * Tests
-     * -----
-     */
-
-    // The *new* flexbox
-    // dev.w3.org/csswg/css3-flexbox
-
-    tests['flexbox'] = function() {
-      return testPropsAll('flexOrder');
-    };
-
-    // The *old* flexbox
-    // www.w3.org/TR/2009/WD-css3-flexbox-20090723/
-
-    tests['flexbox-legacy'] = function() {
-        return testPropsAll('boxDirection');
-    };
-
-    // On the S60 and BB Storm, getContext exists, but always returns undefined
-    // so we actually have to call getContext() to verify
-    // github.com/Modernizr/Modernizr/issues/issue/97/
-
-    tests['canvas'] = function() {
-        var elem = document.createElement('canvas');
-        return !!(elem.getContext && elem.getContext('2d'));
-    };
-
-    tests['canvastext'] = function() {
-        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
-    };
-
-    // this test initiates a new webgl context. 
-    // webk.it/70117 is tracking a legit feature detect proposal
-    
-    tests['webgl'] = function() {
-        try {
-            var canvas = document.createElement('canvas'),
-                ret;
-            ret = !!(window.WebGLRenderingContext && (canvas.getContext('experimental-webgl') || canvas.getContext('webgl')));
-            canvas = undefined;
-        } catch (e){
-            ret = false;
-        }
-        return ret;
-    };
-
-    /*
-     * The Modernizr.touch test only indicates if the browser supports
-     *    touch events, which does not necessarily reflect a touchscreen
-     *    device, as evidenced by tablets running Windows 7 or, alas,
-     *    the Palm Pre / WebOS (touch) phones.
-     *
-     * Additionally, Chrome (desktop) used to lie about its support on this,
-     *    but that has since been rectified: crbug.com/36415
-     *
-     * We also test for Firefox 4 Multitouch Support.
-     *
-     * For more info, see: modernizr.github.com/Modernizr/touch.html
-     */
-
-    tests['touch'] = function() {
-        return Modernizr['touch'];
-    };
-
-    /**
-     * geolocation tests for the new Geolocation API specification.
-     *   This test is a standards compliant-only test; for more complete
-     *   testing, including a Google Gears fallback, please see:
-     *   code.google.com/p/geo-location-javascript/
-     * or view a fallback solution using google's geo API:
-     *   gist.github.com/366184
-     */
-    tests['geolocation'] = function() {
-        return !!navigator.geolocation;
-    };
-
-    // Per 1.6:
-    // This used to be Modernizr.crosswindowmessaging but the longer
-    // name has been deprecated in favor of a shorter and property-matching one.
-    // The old API is still available in 1.6, but as of 2.0 will throw a warning,
-    // and in the first release thereafter disappear entirely.
-    tests['postmessage'] = function() {
-      return !!window.postMessage;
-    };
-
-
-    // Chrome incognito mode used to throw an exception when using openDatabase 
-    // It doesn't anymore.
-    tests['websqldatabase'] = function() {
-      return !!window.openDatabase;
-    };
-
-    // Vendors had inconsistent prefixing with the experimental Indexed DB:
-    // - Webkit's implementation is accessible through webkitIndexedDB
-    // - Firefox shipped moz_indexedDB before FF4b9, but since then has been mozIndexedDB
-    // For speed, we don't test the legacy (and beta-only) indexedDB
-    tests['indexedDB'] = function() {
-      return !!testPropsAll("indexedDB",window);
-    };
-
-    // documentMode logic from YUI to filter out IE8 Compat Mode
-    //   which false positives.
-    tests['hashchange'] = function() {
-      return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);
-    };
-
-    // Per 1.6:
-    // This used to be Modernizr.historymanagement but the longer
-    // name has been deprecated in favor of a shorter and property-matching one.
-    // The old API is still available in 1.6, but as of 2.0 will throw a warning,
-    // and in the first release thereafter disappear entirely.
-    tests['history'] = function() {
-      return !!(window.history && history.pushState);
-    };
-
-    tests['draganddrop'] = function() {
-        var div = document.createElement('div');
-        return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);
-    };
-
-    // FIXME: Once FF10 is sunsetted, we can drop prefixed MozWebSocket
-    // bugzil.la/695635
-    tests['websockets'] = function() {
-        for ( var i = -1, len = cssomPrefixes.length; ++i < len; ){
-          if ( window[cssomPrefixes[i] + 'WebSocket'] ){
-            return true;
-          }
-        }
-        return 'WebSocket' in window;
-    };
-
-
-    // css-tricks.com/rgba-browser-support/
-    tests['rgba'] = function() {
-        // Set an rgba() color and check the returned value
-
-        setCss('background-color:rgba(150,255,150,.5)');
-
-        return contains(mStyle.backgroundColor, 'rgba');
-    };
-
-    tests['hsla'] = function() {
-        // Same as rgba(), in fact, browsers re-map hsla() to rgba() internally,
-        //   except IE9 who retains it as hsla
-
-        setCss('background-color:hsla(120,40%,100%,.5)');
-
-        return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');
-    };
-
-    tests['multiplebgs'] = function() {
-        // Setting multiple images AND a color on the background shorthand property
-        //  and then querying the style.background property value for the number of
-        //  occurrences of "url(" is a reliable method for detecting ACTUAL support for this!
-
-        setCss('background:url(https://),url(https://),red url(https://)');
-
-        // If the UA supports multiple backgrounds, there should be three occurrences
-        //   of the string "url(" in the return value for elemStyle.background
-
-        return /(url\s*\(.*?){3}/.test(mStyle.background);
-    };
-
-
-    // In testing support for a given CSS property, it's legit to test:
-    //    `elem.style[styleName] !== undefined`
-    // If the property is supported it will return an empty string,
-    // if unsupported it will return undefined.
-
-    // We'll take advantage of this quick test and skip setting a style
-    // on our modernizr element, but instead just testing undefined vs
-    // empty string.
-
-
-    tests['backgroundsize'] = function() {
-        return testPropsAll('backgroundSize');
-    };
-
-    tests['borderimage'] = function() {
-        return testPropsAll('borderImage');
-    };
-
-
-    // Super comprehensive table about all the unique implementations of
-    // border-radius: muddledramblings.com/table-of-css3-border-radius-compliance
-
-    tests['borderradius'] = function() {
-        return testPropsAll('borderRadius');
-    };
-
-    // WebOS unfortunately false positives on this test.
-    tests['boxshadow'] = function() {
-        return testPropsAll('boxShadow');
-    };
-
-    // FF3.0 will false positive on this test
-    tests['textshadow'] = function() {
-        return document.createElement('div').style.textShadow === '';
-    };
-
-
-    tests['opacity'] = function() {
-        // Browsers that actually have CSS Opacity implemented have done so
-        //  according to spec, which means their return values are within the
-        //  range of [0.0,1.0] - including the leading zero.
-
-        setCssAll('opacity:.55');
-
-        // The non-literal . in this regex is intentional:
-        //   German Chrome returns this value as 0,55
-        // github.com/Modernizr/Modernizr/issues/#issue/59/comment/516632
-        return /^0.55$/.test(mStyle.opacity);
-    };
-
-
-    // Note, Android < 4 will pass this test, but can only animate 
-    //   a single property at a time
-    //   daneden.me/2011/12/putting-up-with-androids-bullshit/
-    tests['cssanimations'] = function() {
-        return testPropsAll('animationName');
-    };
-
-
-    tests['csscolumns'] = function() {
-        return testPropsAll('columnCount');
-    };
-
-
-    tests['cssgradients'] = function() {
-        /**
-         * For CSS Gradients syntax, please see:
-         * webkit.org/blog/175/introducing-css-gradients/
-         * developer.mozilla.org/en/CSS/-moz-linear-gradient
-         * developer.mozilla.org/en/CSS/-moz-radial-gradient
-         * dev.w3.org/csswg/css3-images/#gradients-
-         */
-
-        var str1 = 'background-image:',
-            str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',
-            str3 = 'linear-gradient(left top,#9f9, white);';
-
-        setCss(
-             // legacy webkit syntax (FIXME: remove when syntax not in use anymore)
-              (str1 + '-webkit- '.split(' ').join(str2 + str1) 
-             // standard syntax             // trailing 'background-image:' 
-              + prefixes.join(str3 + str1)).slice(0, -str1.length)
-        );
-
-        return contains(mStyle.backgroundImage, 'gradient');
-    };
-
-
-    tests['cssreflections'] = function() {
-        return testPropsAll('boxReflect');
-    };
-
-
-    tests['csstransforms'] = function() {
-        return !!testPropsAll('transform');
-    };
-
-
-    tests['csstransforms3d'] = function() {
-
-        var ret = !!testPropsAll('perspective');
-
-        // Webkit's 3D transforms are passed off to the browser's own graphics renderer.
-        //   It works fine in Safari on Leopard and Snow Leopard, but not in Chrome in
-        //   some conditions. As a result, Webkit typically recognizes the syntax but
-        //   will sometimes throw a false positive, thus we must do a more thorough check:
-        if ( ret && 'webkitPerspective' in docElement.style ) {
-
-          // Webkit allows this media query to succeed only if the feature is enabled.
-          // `@media (transform-3d),(-o-transform-3d),(-moz-transform-3d),(-ms-transform-3d),(-webkit-transform-3d),(modernizr){ ... }`
-          ret = Modernizr['csstransforms3d'];
-        }
-        return ret;
-    };
-
-
-    tests['csstransitions'] = function() {
-        return testPropsAll('transition');
-    };
-
-
-    /*>>fontface*/
-    // @font-face detection routine by Diego Perini
-    // javascript.nwbox.com/CSSSupport/
-
-    // false positives in WebOS: github.com/Modernizr/Modernizr/issues/342
-    tests['fontface'] = function() {
-        return Modernizr['fontface'];
-    };
-    /*>>fontface*/
-
-    // CSS generated content detection
-    tests['generatedcontent'] = function() {
-        return Modernizr['generatedcontent'];
-    };
-
-
-
-    // These tests evaluate support of the video/audio elements, as well as
-    // testing what types of content they support.
-    //
-    // We're using the Boolean constructor here, so that we can extend the value
-    // e.g.  Modernizr.video     // true
-    //       Modernizr.video.ogg // 'probably'
-    //
-    // Codec values from : github.com/NielsLeenheer/html5test/blob/9106a8/index.html#L845
-    //                     thx to NielsLeenheer and zcorpan
-
-    // Note: in some older browsers, "no" was a return value instead of empty string.
-    //   It was live in FF3.5.0 and 3.5.1, but fixed in 3.5.2
-    //   It was also live in Safari 4.0.0 - 4.0.4, but fixed in 4.0.5
-
-    tests['video'] = function() {
-        var elem = document.createElement('video'),
-            bool = false;
-            
-        // IE9 Running on Windows Server SKU can cause an exception to be thrown, bug #224
-        try {
-            if ( bool = !!elem.canPlayType ) {
-                bool      = new Boolean(bool);
-                bool.ogg  = elem.canPlayType('video/ogg; codecs="theora"')      .replace(/^no$/,'');
-
-                bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,'');
-
-                bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,'');
-            }
-            
-        } catch(e) { }
-        
-        return bool;
-    };
-
-    tests['audio'] = function() {
-        var elem = document.createElement('audio'),
-            bool = false;
-
-        try { 
-            if ( bool = !!elem.canPlayType ) {
-                bool      = new Boolean(bool);
-                bool.ogg  = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,'');
-                bool.mp3  = elem.canPlayType('audio/mpeg;')               .replace(/^no$/,'');
-
-                // Mimetypes accepted:
-                //   developer.mozilla.org/En/Media_formats_supported_by_the_audio_and_video_elements
-                //   bit.ly/iphoneoscodecs
-                bool.wav  = elem.canPlayType('audio/wav; codecs="1"')     .replace(/^no$/,'');
-                bool.m4a  = ( elem.canPlayType('audio/x-m4a;')            || 
-                              elem.canPlayType('audio/aac;'))             .replace(/^no$/,'');
-            }
-        } catch(e) { }
-        
-        return bool;
-    };
-
-
-    // In FF4, if disabled, window.localStorage should === null.
-
-    // Normally, we could not test that directly and need to do a
-    //   `('localStorage' in window) && ` test first because otherwise Firefox will
-    //   throw bugzil.la/365772 if cookies are disabled
-
-    // Also in iOS5 Private Browsing mode, attepting to use localStorage.setItem
-    // will throw the exception:
-    //   QUOTA_EXCEEDED_ERRROR DOM Exception 22.
-    // Peculiarly, getItem and removeItem calls do not throw.
-
-    // Because we are forced to try/catch this, we'll go aggressive.
-
-    // Just FWIW: IE8 Compat mode supports these features completely:
-    //   www.quirksmode.org/dom/html5.html
-    // But IE8 doesn't support either with local files
-
-    tests['localstorage'] = function() {
-        try {
-            localStorage.setItem(mod, mod);
-            localStorage.removeItem(mod);
-            return true;
-        } catch(e) {
-            return false;
-        }
-    };
-
-    tests['sessionstorage'] = function() {
-        try {
-            sessionStorage.setItem(mod, mod);
-            sessionStorage.removeItem(mod);
-            return true;
-        } catch(e) {
-            return false;
-        }
-    };
-
-
-    tests['webworkers'] = function() {
-        return !!window.Worker;
-    };
-
-
-    tests['applicationcache'] = function() {
-        return !!window.applicationCache;
-    };
-
-
-    // Thanks to Erik Dahlstrom
-    tests['svg'] = function() {
-        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
-    };
-
-    // specifically for SVG inline in HTML, not within XHTML
-    // test page: paulirish.com/demo/inline-svg
-    tests['inlinesvg'] = function() {
-      var div = document.createElement('div');
-      div.innerHTML = '<svg/>';
-      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
-    };
-
-    // SVG SMIL animation
-    tests['smil'] = function() {
-        return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate')));
-    };
-
-    // This test is only for clip paths in SVG proper, not clip paths on HTML content
-    // demo: srufaculty.sru.edu/david.dailey/svg/newstuff/clipPath4.svg
-
-    // However read the comments to dig into applying SVG clippaths to HTML content here:
-    //   github.com/Modernizr/Modernizr/issues/213#issuecomment-1149491
-    tests['svgclippaths'] = function() {
-        return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
-    };
-
-    // input features and input types go directly onto the ret object, bypassing the tests loop.
-    // Hold this guy to execute in a moment.
-    function webforms() {
-        // Run through HTML5's new input attributes to see if the UA understands any.
-        // We're using f which is the <input> element created early on
-        // Mike Taylr has created a comprehensive resource for testing these attributes
-        //   when applied to all input types:
-        //   miketaylr.com/code/input-type-attr.html
-        // spec: www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary
-        
-        // Only input placeholder is tested while textarea's placeholder is not. 
-        // Currently Safari 4 and Opera 11 have support only for the input placeholder
-        // Both tests are available in feature-detects/forms-placeholder.js
-        Modernizr['input'] = (function( props ) {
-            for ( var i = 0, len = props.length; i < len; i++ ) {
-                attrs[ props[i] ] = !!(props[i] in inputElem);
-            }
-            if (attrs.list){
-              // safari false positive's on datalist: webk.it/74252
-              // see also github.com/Modernizr/Modernizr/issues/146
-              attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement);
-            }
-            return attrs;
-        })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));
-
-        // Run through HTML5's new input types to see if the UA understands any.
-        //   This is put behind the tests runloop because it doesn't return a
-        //   true/false like all the other tests; instead, it returns an object
-        //   containing each input type with its corresponding true/false value
-
-        // Big thanks to @miketaylr for the html5 forms expertise. miketaylr.com/
-        Modernizr['inputtypes'] = (function(props) {
-
-            for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {
-
-                inputElem.setAttribute('type', inputElemType = props[i]);
-                bool = inputElem.type !== 'text';
-
-                // We first check to see if the type we give it sticks..
-                // If the type does, we feed it a textual value, which shouldn't be valid.
-                // If the value doesn't stick, we know there's input sanitization which infers a custom UI
-                if ( bool ) {
-
-                    inputElem.value         = smile;
-                    inputElem.style.cssText = 'position:absolute;visibility:hidden;';
-
-                    if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {
-
-                      docElement.appendChild(inputElem);
-                      defaultView = document.defaultView;
-
-                      // Safari 2-4 allows the smiley as a value, despite making a slider
-                      bool =  defaultView.getComputedStyle &&
-                              defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&
-                              // Mobile android web browser has false positive, so must
-                              // check the height to see if the widget is actually there.
-                              (inputElem.offsetHeight !== 0);
-
-                      docElement.removeChild(inputElem);
-
-                    } else if ( /^(search|tel)$/.test(inputElemType) ){
-                      // Spec doesnt define any special parsing or detectable UI
-                      //   behaviors so we pass these through as true
-
-                      // Interestingly, opera fails the earlier test, so it doesn't
-                      //  even make it here.
-
-                    } else if ( /^(url|email)$/.test(inputElemType) ) {
-                      // Real url and email support comes with prebaked validation.
-                      bool = inputElem.checkValidity && inputElem.checkValidity() === false;
-
-                    } else if ( /^color$/.test(inputElemType) ) {
-                        // chuck into DOM and force reflow for Opera bug in 11.00
-                        // github.com/Modernizr/Modernizr/issues#issue/159
-                        docElement.appendChild(inputElem);
-                        docElement.offsetWidth;
-                        bool = inputElem.value != smile;
-                        docElement.removeChild(inputElem);
-
-                    } else {
-                      // If the upgraded input compontent rejects the :) text, we got a winner
-                      bool = inputElem.value != smile;
-                    }
-                }
-
-                inputs[ props[i] ] = !!bool;
-            }
-            return inputs;
-        })('search tel url email datetime date month week time datetime-local number range color'.split(' '));
-    }
-
-
-    // End of test definitions
-    // -----------------------
-
-
-
-    // Run through all tests and detect their support in the current UA.
-    // todo: hypothetically we could be doing an array of tests and use a basic loop here.
-    for ( var feature in tests ) {
-        if ( hasOwnProperty(tests, feature) ) {
-            // run the test, throw the return value into the Modernizr,
-            //   then based on that boolean, define an appropriate className
-            //   and push it into an array of classes we'll join later.
-            featureName  = feature.toLowerCase();
-            Modernizr[featureName] = tests[feature]();
-
-            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
-        }
-    }
-
-    // input tests need to run.
-    Modernizr.input || webforms();
-
-
-    /**
-     * addTest allows the user to define their own feature tests
-     * the result will be added onto the Modernizr object,
-     * as well as an appropriate className set on the html element
-     *
-     * @param feature - String naming the feature
-     * @param test - Function returning true if feature is supported, false if not
-     */
-     Modernizr.addTest = function ( feature, test ) {
-       if ( typeof feature == 'object' ) {
-         for ( var key in feature ) {
-           if ( hasOwnProperty( feature, key ) ) {
-             Modernizr.addTest( key, feature[ key ] );
-           }
-         }
-       } else {
-
-         feature = feature.toLowerCase();
-
-         if ( Modernizr[feature] !== undefined ) {
-           // we're going to quit if you're trying to overwrite an existing test
-           // if we were to allow it, we'd do this:
-           //   var re = new RegExp("\\b(no-)?" + feature + "\\b");
-           //   docElement.className = docElement.className.replace( re, '' );
-           // but, no rly, stuff 'em.
-           return Modernizr;
-         }
-
-         test = typeof test == 'function' ? test() : test;
-
-         docElement.className += ' ' + (test ? '' : 'no-') + feature;
-         Modernizr[feature] = test;
-
-       }
-
-       return Modernizr; // allow chaining.
-     };
-
-
-    // Reset modElem.cssText to nothing to reduce memory footprint.
-    setCss('');
-    modElem = inputElem = null;
-
-    //>>BEGIN IEPP
-    // Enable HTML 5 elements for styling in IE & add HTML5 css
-    /*! HTML5 Shiv v3.4 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
-    ;(function(window, document) {
-    
-      /** Preset options */
-      var options = window.html5 || {};
-    
-      /** Used to skip problem elements */
-      var reSkip = /^<|^(?:button|form|map|select|textarea)$/i;
-    
-      /** Detect whether the browser supports default html5 styles */
-      var supportsHtml5Styles;
-    
-      /** Detect whether the browser supports unknown elements */
-      var supportsUnknownElements;
-    
-      (function() {
-        var a = document.createElement('a');
-    
-        a.innerHTML = '<xyz></xyz>';
-    
-        //if the hidden property is implemented we can assume, that the browser supports HTML5 Styles
-        supportsHtml5Styles = ('hidden' in a);
-        supportsUnknownElements = a.childNodes.length == 1 || (function() {
-          // assign a false positive if unable to shiv
-          try {
-            (document.createElement)('a');
-          } catch(e) {
-            return true;
-          }
-          var frag = document.createDocumentFragment();
-          return (
-            typeof frag.cloneNode == 'undefined' ||
-            typeof frag.createDocumentFragment == 'undefined' ||
-            typeof frag.createElement == 'undefined'
-          );
-        }());
-    
-      }());
-    
-      /*--------------------------------------------------------------------------*/
-    
-      /**
-       * Creates a style sheet with the given CSS text and adds it to the document.
-       * @private
-       * @param {Document} ownerDocument The document.
-       * @param {String} cssText The CSS text.
-       * @returns {StyleSheet} The style element.
-       */
-      function addStyleSheet(ownerDocument, cssText) {
-        var p = ownerDocument.createElement('p'),
-            parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
-    
-        p.innerHTML = 'x<style>' + cssText + '</style>';
-        return parent.insertBefore(p.lastChild, parent.firstChild);
-      }
-    
-      /**
-       * Returns the value of `html5.elements` as an array.
-       * @private
-       * @returns {Array} An array of shived element node names.
-       */
-      function getElements() {
-        var elements = html5.elements;
-        return typeof elements == 'string' ? elements.split(' ') : elements;
-      }
-    
-      /**
-       * Shivs the `createElement` and `createDocumentFragment` methods of the document.
-       * @private
-       * @param {Document|DocumentFragment} ownerDocument The document.
-       */
-      function shivMethods(ownerDocument) {
-        var cache = {},
-            docCreateElement = ownerDocument.createElement,
-            docCreateFragment = ownerDocument.createDocumentFragment,
-            frag = docCreateFragment();
-    
-        ownerDocument.createElement = function(nodeName) {
-          // Avoid adding some elements to fragments in IE < 9 because
-          // * Attributes like `name` or `type` cannot be set/changed once an element
-          //   is inserted into a document/fragment
-          // * Link elements with `src` attributes that are inaccessible, as with
-          //   a 403 response, will cause the tab/window to crash
-          // * Script elements appended to fragments will execute when their `src`
-          //   or `text` property is set
-          var node = (cache[nodeName] || (cache[nodeName] = docCreateElement(nodeName))).cloneNode();
-          return html5.shivMethods && node.canHaveChildren && !reSkip.test(nodeName) ? frag.appendChild(node) : node;
-        };
-    
-        ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
-          'var n=f.cloneNode(),c=n.createElement;' +
-          'h.shivMethods&&(' +
-            // unroll the `createElement` calls
-            getElements().join().replace(/\w+/g, function(nodeName) {
-              cache[nodeName] = docCreateElement(nodeName);
-              frag.createElement(nodeName);
-              return 'c("' + nodeName + '")';
-            }) +
-          ');return n}'
-        )(html5, frag);
-      }
-    
-      /*--------------------------------------------------------------------------*/
-    
-      /**
-       * Shivs the given document.
-       * @memberOf html5
-       * @param {Document} ownerDocument The document to shiv.
-       * @returns {Document} The shived document.
-       */
-      function shivDocument(ownerDocument) {
-        var shived;
-        if (ownerDocument.documentShived) {
-          return ownerDocument;
-        }
-        if (html5.shivCSS && !supportsHtml5Styles) {
-          shived = !!addStyleSheet(ownerDocument,
-            // corrects block display not defined in IE6/7/8/9
-            'article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}' +
-            // corrects audio display not defined in IE6/7/8/9
-            'audio{display:none}' +
-            // corrects canvas and video display not defined in IE6/7/8/9
-            'canvas,video{display:inline-block;*display:inline;*zoom:1}' +
-            // corrects 'hidden' attribute and audio[controls] display not present in IE7/8/9
-            '[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}' +
-            // adds styling not present in IE6/7/8/9
-            'mark{background:#FF0;color:#000}'
-          );
-        }
-        if (!supportsUnknownElements) {
-          shived = !shivMethods(ownerDocument);
-        }
-        if (shived) {
-          ownerDocument.documentShived = shived;
-        }
-        return ownerDocument;
-      }
-    
-      /*--------------------------------------------------------------------------*/
-    
-      /**
-       * The `html5` object is exposed so that more elements can be shived and
-       * existing shiving can be detected on iframes.
-       * @type Object
-       * @example
-       *
-       * // options can be changed before the script is included
-       * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
-       */
-      var html5 = {
-    
-        /**
-         * An array or space separated string of node names of the elements to shiv.
-         * @memberOf html5
-         * @type Array|String
-         */
-        'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video',
-    
-        /**
-         * A flag to indicate that the HTML5 style sheet should be inserted.
-         * @memberOf html5
-         * @type Boolean
-         */
-        'shivCSS': !(options.shivCSS === false),
-    
-        /**
-         * A flag to indicate that the document's `createElement` and `createDocumentFragment`
-         * methods should be overwritten.
-         * @memberOf html5
-         * @type Boolean
-         */
-        'shivMethods': !(options.shivMethods === false),
-    
-        /**
-         * A string to describe the type of `html5` object ("default" or "default print").
-         * @memberOf html5
-         * @type String
-         */
-        'type': 'default',
-    
-        // shivs the document according to the specified `html5` object options
-        'shivDocument': shivDocument
-      };
-    
-      /*--------------------------------------------------------------------------*/
-    
-      // expose html5
-      window.html5 = html5;
-    
-      // shiv the document
-      shivDocument(document);
-    
-    }(this, document));
-
-    //>>END IEPP
-
-    // Assign private properties to the return object with prefix
-    Modernizr._version      = version;
-
-    // expose these for the plugin API. Look in the source for how to join() them against your input
-    Modernizr._prefixes     = prefixes;
-    Modernizr._domPrefixes  = domPrefixes;
-    Modernizr._cssomPrefixes  = cssomPrefixes;
-    
-    // Modernizr.mq tests a given media query, live against the current state of the window
-    // A few important notes:
-    //   * If a browser does not support media queries at all (eg. oldIE) the mq() will always return false
-    //   * A max-width or orientation query will be evaluated against the current state, which may change later.
-    //   * You must specify values. Eg. If you are testing support for the min-width media query use: 
-    //       Modernizr.mq('(min-width:0)')
-    // usage:
-    // Modernizr.mq('only screen and (max-width:768)')
-    Modernizr.mq            = testMediaQuery;   
-    
-    // Modernizr.hasEvent() detects support for a given event, with an optional element to test on
-    // Modernizr.hasEvent('gesturestart', elem)
-    Modernizr.hasEvent      = isEventSupported; 
-
-    // Modernizr.testProp() investigates whether a given style property is recognized
-    // Note that the property names must be provided in the camelCase variant.
-    // Modernizr.testProp('pointerEvents')
-    Modernizr.testProp      = function(prop){
-        return testProps([prop]);
-    };        
-
-    // Modernizr.testAllProps() investigates whether a given style property,
-    //   or any of its vendor-prefixed variants, is recognized
-    // Note that the property names must be provided in the camelCase variant.
-    // Modernizr.testAllProps('boxSizing')    
-    Modernizr.testAllProps  = testPropsAll;     
-
-
-    
-    // Modernizr.testStyles() allows you to add custom styles to the document and test an element afterwards
-    // Modernizr.testStyles('#modernizr { position:absolute }', function(elem, rule){ ... })
-    Modernizr.testStyles    = injectElementWithStyles; 
-
-
-    // Modernizr.prefixed() returns the prefixed or nonprefixed property name variant of your input
-    // Modernizr.prefixed('boxSizing') // 'MozBoxSizing'
-    
-    // Properties must be passed as dom-style camelcase, rather than `box-sizing` hypentated style.
-    // Return values will also be the camelCase variant, if you need to translate that to hypenated style use:
-    //
-    //     str.replace(/([A-Z])/g, function(str,m1){ return '-' + m1.toLowerCase(); }).replace(/^ms-/,'-ms-');
-    
-    // If you're trying to ascertain which transition end event to bind to, you might do something like...
-    // 
-    //     var transEndEventNames = {
-    //       'WebkitTransition' : 'webkitTransitionEnd',
-    //       'MozTransition'    : 'transitionend',
-    //       'OTransition'      : 'oTransitionEnd',
-    //       'msTransition'     : 'MsTransitionEnd',
-    //       'transition'       : 'transitionend'
-    //     },
-    //     transEndEventName = transEndEventNames[ Modernizr.prefixed('transition') ];
-    
-    Modernizr.prefixed      = function(prop, obj, elem){
-      if(!obj) {
-        return testPropsAll(prop, 'pfx');
-      } else {
-        // Testing DOM property e.g. Modernizr.prefixed('requestAnimationFrame', window) // 'mozRequestAnimationFrame'
-        return testPropsAll(prop, obj, elem);
-      }
-    };
-
-
-
-    // Remove "no-js" class from <html> element, if it exists:
-    docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2') +
-                            
-                            // Add the new classes to the <html> element.
-                            (enableClasses ? ' js ' + classes.join(' ') : '');
-
-    return Modernizr;
-
-})(this, this.document);
diff --git a/apps/tal/js/tal.js b/apps/tal/js/tal.js
deleted file mode 100644
index c4c6469440..0000000000
--- a/apps/tal/js/tal.js
+++ /dev/null
@@ -1,32 +0,0 @@
- 
-$(document).ready(function(){
-	$('#manual nav').keydown(function(event) {
-		if(event.which == 13) {
-			$('#manual ol').click();
-		}
-	});
-	$('#manual nav').click(function(event){
-		var $tgt = $(event.target);
-		if ($tgt.is('li') || $tgt.is('a')) {
-			var item = $tgt.is('li')?$($tgt):($tgt).parent();
-			var section = $('#manual section');
-			var id = item.data('id');
-			item.addClass('active');
-			var oldpage = section.data('id');
-			if(oldpage){
-				$('#manual li[data-id="'+oldpage+'"]').removeClass('active');
-			}
-			$.getJSON(OC.filePath('tal', 'ajax', 'loadpage.php'),{'id':id},function(jsondata){
-				if(jsondata.status == 'success'){
-					$('#manual li[data-id="'+id+'"]').addClass('active');
-					section.replaceWith(jsondata.data.page);
-					section.data('id', id);
-				}
-				else{
-					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-				}
-			});
-		}
-		return false;
-	});
-});
\ No newline at end of file
diff --git a/apps/tal/lib/paths.php b/apps/tal/lib/paths.php
deleted file mode 100644
index b61d52c0f4..0000000000
--- a/apps/tal/lib/paths.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * This class provides TAL templates for owncloud.
- */
-class OC_TALTemplate extends OC_Template {
-}
\ No newline at end of file
diff --git a/apps/tal/lib/tall10n.php b/apps/tal/lib/tall10n.php
deleted file mode 100644
index 81ebfe4904..0000000000
--- a/apps/tal/lib/tall10n.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once 'PHPTAL/TranslationService.php';
-
-
-class OC_TALL10N extends OC_L10N implements PHPTAL_TranslationService {
-	private $encoding = 'UTF-8';
-    private $vars = array();
-	//private $lang = '';
-	//private $app = '';
-
-	/**
-	 * @brief The constructor
-	 * @param $app the app requesting l10n
-	 * @param $lang default: null Language
-	 * @returns OC_L10N-Object
-	 *
-	 * If language is not set, the constructor tries to find the right
-	 * language.
-	 */
-	public function __construct($app, $lang = null){
-		//$this->app = $app;
-		//$this->lang = $lang;
-		parent::__construct($app, $lang);
-	}
-
-	/**
-	* Set the target language for translations.
-	* @return string - chosen language
-	*/
-	function setLanguage(/*...*/) {
-		$langs = func_get_args();
-		$this->language = $langs[0];
-	}
-
-	/**
-	* PHPTAL will inform translation service what encoding page uses.
-	* Output of translate() must be in this encoding.
-	* NOTE: Currently not used (and probably won't be as we use utf-8 all over?).
-	*/
-	function setEncoding($encoding) {
-		$this->encoding = $encoding;
-	}
-
-	/**
-	* Set the domain to use for translations (if different parts of application are translated in different files. This is not for language selection).
-	*/
-    function useDomain($domain) {
-		if(!$domain) {
-			return;
-		}
-		error_log('useDomain: '.$domain);
-		$this->app = $domain;
-		$this->init();
-	}
-
-	/**
-	* Set value of a variable used in translation key.
-	*
-	* You should use it to replace all {key}s with values in translated strings.
-	*
-	* @param string $key - name of the variable
-	* @param string $value
-	*/
-    public function setVar($key, $value) {
-		error_log('setVar: '.$key.'=>'.$value);
-        $this->vars[$key] = $value;
-    }
-
-	/**
-	* Translate a gettext key and interpolate variables.
-	*
-	* @param string $key - translation key, e.g. "hello {username}!"
-	* @param string $htmlescape - if true, you should HTML-escape translated string. You should never HTML-escape interpolated variables.
-	*/
-	function translate($key, $escape=true) {
-		$translations = $this->getTranslations();
-		if (array_key_exists($key, $translations)) {
-			$v = $translations[$key];
-		} else {
-			$v = $key;
-		}
-
-		if ($escape) {
-			$v = htmlspecialchars($v);
-		}
-
-		//while (preg_match('/\{(.*?)\}/sm', $v, $m)) {
-        while (preg_match('/\$\{(.*?)\}/sm', $v, $m)) {
-			list($src, $var) = $m;
-			if (!isset($this->vars[$var])) {
-				$v = str_replace($src, 'undefined', $v);
-			} else {
-				$v = str_replace($src, $this->vars[$var], $v);
-			}
-		}
-		return $v;
-	}
-}
\ No newline at end of file
diff --git a/apps/tal/lib/taltemplate.php b/apps/tal/lib/taltemplate.php
deleted file mode 100644
index 523e857e6f..0000000000
--- a/apps/tal/lib/taltemplate.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-/**
- * kate: replace-tabs off; indent-mode Normal; keep-extra-spaces: off; tab-indents: on; 
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-function phptal_tales_remote($exp, $nothrow) {
-	//$exp = trim($exp, ' \t\r\n/');
-	error_log(phptal_tales($exp, $nothrow));
-	return "OCP\Util::linkToRemote(".phptal_tales($exp, $nothrow).")";
-}
-
-function phptal_tales_url($src, $nothrow) {
-	//$exp = trim($exp, ' \t\r\n/');
-	error_log(phptal_tales($src, $nothrow));
-	return "OC_TALTemplate::linkToAbsolute(".phptal_tales($src, $nothrow).")";
-}
-
-function phptal_tales_linkto($src, $nothrow) {
-	return "OC_TALTemplate::linkTo(".phptal_tales($src, $nothrow).")";
-}
-
-function phptal_tales_image($src, $nothrow) {
-	return "OC_TALTemplate::imagePath(".phptal_tales($src, $nothrow).")";
-}
-
-function phptal_tales_config($src, $nothrow) {
-	return "OC_TALTemplate::config(".phptal_tales($src, $nothrow).")";
-}
-
-/**
- * This class provides TAL templates for owncloud.
- */
-class OC_TALTemplate extends OC_Template {
-	/**
-	*/
-	protected $_engine = null;
-	protected $scripts = Array();
-	protected $styles = Array();
-	protected $_headers = Array();
-	protected $renderas;
-	protected static $app = '';
-
-	public function __construct($app, $name, $renderas = "") {
-		//if(defined('DEBUG') && DEBUG) {
-			ini_set('display_errors', true);
-		//}
-		$this->renderas = $renderas;
-		$this->i18n = new OC_TALL10N($app);
-		$this->setEngine(new PHPTAL());
-		parent::__construct($app, $name, $renderas);
-		//$this->fetchHeadVars();
-		self::$app = $app;
-		//$this->assign('application', $this->app);
-		$this->assign('i18n', $this->i18n);
-		$this->assign('user', OCP\User::getUser());
-		$this->assign('appinfo', OCP\App::getAppInfo($app));
-		$this->assign('appajaxpath', OC::$SERVERROOT.OC_App::getAppPath($app).'/ajax');
-		$this->assign('appjspath', OC::$SERVERROOT.OC_App::getAppPath($app).'/js');
-		$this->assign('apptemplatepath', OC::$SERVERROOT.OC_App::getAppPath($app).'/templates');
-		if($renderas) {
-			$this->assign('maintemplate', OC_App::getAppPath('tal').'/templates/layout.'.$renderas.'.pt');
-			if($renderas == 'user') {
-				$this->assign('requesttoken', OC_Util::callRegister());
-			}
-		}
-		//$this->assign('styles', $this->styles);
-		$this->assign('core_styles', !empty(OC_Util::$core_styles)?'core.css':null);
-		$this->assign('core_scripts', !empty(OC_Util::$core_scripts)?'core.js':null);
-		$request = isset($_REQUEST)?$_REQUEST:array();
-		$request['post'] = isset($_POST)?$_POST:array();
-		$request['get'] = isset($_GET)?$_GET:array();
-		$this->assign('request', $request);
-		$this->assign('server', $_SERVER);
-		$this->assign('webroot', OC::$WEBROOT);
-		$this->assign('theme', OC_Config::getValue('theme'));
-
-		$apps_paths = array();
-		foreach(OC_App::getEnabledApps() as $app){
-			$apps_paths[$app] = OC_App::getAppWebPath($app);
-		}
-		$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
-
-		// Add the js files
-		$jsfiles = OC_TemplateLayout::findJavascriptFiles(OC_Util::$scripts);
-		
-		foreach($jsfiles as $info) {
-			$root = $info[0];
-			$web = $info[1];
-			$file = $info[2];
-			$this->scripts[] = $web.'/'.$file;
-		}
-		$this->assign('scripts',$this->scripts);
-
-		// Add the css files
-		$cssfiles = OC_TemplateLayout::findStylesheetFiles(OC_Util::$styles);
-
-		foreach($cssfiles as $info) {
-			$root = $info[0];
-			$web = $info[1];
-			$file = $info[2];
-			$paths = explode('/', $file);
-
-			$in_root = false;
-			foreach(OC::$APPSROOTS as $app_root) {
-				if($root == $app_root['path']) {
-					$in_root = true;
-					break;
-				}
-			}
-
-			if($in_root ) {
-				$app = $paths[0];
-				unset($paths[0]);
-				$path = implode('/', $paths);
-				$this->styles[] = OC_Helper::linkTo($app, $path);
-			}
-			else {
-				$this->styles[] = $web.'/'.$file;
-			}
-		}
-		$this->assign('styles', $this->styles);
-		
-	}
-
-	/**
-	* Plug in PHPTAL object into View
-	*
-	* @name setEngine
-	* @access public
-	* @param object PHPTAL $engine
-	*/
-	public function setEngine(PHPTAL $engine) {
-		$view = new OC_FilesystemView('/'.OC_User::getUser());
-		if(!$view->file_exists('phptal')) {
-			$view->mkdir('phptal');
-		}
-		$this->_engine = $engine;
-		$this->_engine->setPhpCodeDestination($view->getLocalFile('/phptal/'));
-		$this->_engine->setTemplateRepository($_SERVER['DOCUMENT_ROOT'].OCP\Util::linkTo(self::$app, 'templates'));
-		$this->_engine->set('this', $this);
-		$this->_engine->setOutputMode(PHPTAL::HTML5);
-		$this->_engine->setTranslator($this->i18n);
-		return $this;
-	}
-
-	/**
-	 * Forces reparsing of all templates all the time. It should be used only for testing and debugging. 
-	 * It's useful if you're testing pre filters or changing code of PHPTAL itself.
-	 * WARNING: This slows down PHPTAL very much. Never enable this on production servers!
-	 */
-	public function setForceReparse() {
-		OCP\Util::writeLog('tal','ForceReparse is enabled!', OCP\Util::WARN);
-		$this->_engine->setForceReparse();
-	}
-	
-	/**
-	* Get PHPTAL object from View
-	*
-	* @name getEngine
-	* @access public
-	*/
-	public function getEngine() {
-		return $this->_engine;
-	}
-
-	/**
-	* Clone PHPTAL object
-	*
-	* @access public
-	*/
-	public function __clone() {
-		$this->_engine = clone $this->_engine;
-	}
-
-	/**
-	* Display template
-	*
-	* @access protected
-	*/
-	protected function _run() {
-		$this->_engine->setTemplate(func_get_arg(0));
-		try {
-			echo $this->_engine->execute();
-		} catch (Exception $e) {
-			throw new Exception($e);
-		}
-	}
-
-	/**
-	 * @brief check Path For Template with and without $fext
-	 * @param $path to check
-	 * @param $name of the template file (without suffix)
-	 * @param $fext formfactor extension
-	 * @return bool true when found
-	 *
-	 * Will set $this->template and $this->path if there is a template at
-	 * the specified $path
-	 */
-	protected function checkPathForTemplate($path, $name, $fext) {
-		if ($name =='') return false;
-		$template = null;
-		if( is_file( $path.$name.$fext.'.pt' )){
-			$template = $path.$name.$fext.'.pt';
-		}elseif( is_file( $path.$name.'.pt' )){
-			$template = $path.$name.'.pt';
-		}
-		//error_log('Template: '.$template);
-		if ($template) {
-			$this->template = $template;
-			$this->path = $path;
-			$this->_engine->template = $this->template;
-			$this->_engine->setTemplate($this->template);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @brief Assign variables
-	 * @param $key key
-	 * @param $value value
-	 * @param $sanitizeHTML Ignored, as values are always sanitized unless explicitly specified not to.
-	 * @returns true
-	 *
-	 * This function assigns a variable. It can be accessed via TALES expressions or ${$key} in
-	 * the template.
-	 *
-	 * If the key existed before, it will be overwritten
-	 */
-	public function assign( $key, $value, $sanitizeHTML=false ){
-		$this->_engine->set($key, $value);
-		return true;
-	}
-
-	/**
-	 * @brief Add a custom element to the header
-	 * @param string tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element
-	 */
-	public function addHeader( $tag, $attributes, $text=''){
-		$this->_headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
-	}
-
-	/**
-	 * @brief Prints the proceeded template
-	 * @returns true/false
-	 *
-	 * This function proceeds the template and prints its output.
-	 */
-	public function printPage(){
-		echo $this->fetchPage();
-	}
-
-	/**
-	 * @brief Proceeds the template
-	 * @returns content
-	 *
-	 * This function proceeds the template. If $this->renderas is set, it
-	 * will produce a full page.
-	 */
-	public function fetchPage(){
-		error_log('renderas: '.$this->renderas);
-		if($this->renderas) {
-			// Add custom headers
-			$this->assign('headers',array_merge($this->_headers, OC_Util::$headers));
-			// Add navigation entry
-			$navigation = OC_App::getNavigation();
-			$this->assign( "navigation", $navigation);
-			$this->assign( "settingsnavigation", OC_App::getSettingsNavigation());
-			if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
-				$this->assign('bodyid','body-settings');
-			}else{
-				$this->assign('bodyid','body-user');
-			}
-			foreach($navigation as $entry) {
-				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
-					break;
-				}
-			}
-		}
-		//error_log('utilheaders'.print_r(array_merge($this->_headers, OC_Util::$headers), true));
-		return $this->_engine->execute();
-	}
-
-	static function linkTo($src) {
-		//error_log('linkTo '.$src);
-		$parts = is_array($src)?$src:explode('/', rtrim($src, ' \t\r\n/'));
-		if($parts[0] == '') {
-			array_shift($parts);
-			return OCP\Util::linkTo('', implode('/', $parts));
-		} elseif(count($parts) == 1) {
-			return OCP\Util::linkTo('', implode('/', $parts));
-		} elseif(trim($parts[0] == 'core')) {
-			array_shift($parts);
-			return OCP\Util::linkTo('', implode('/', $parts));
-		} else { // This should be an app.
-			return OCP\Util::linkTo(array_shift($parts), implode('/', $parts));
-		}
-	}
-
-	static function linkToAbsolute($src) {
-		//error_log('linkTo '.$src);
-		$parts = is_array($src)?$src:explode('/', rtrim($src, ' \t\r\n/'));
-		if($parts[0] == '') {
-			array_shift($parts);
-			return OCP\Util::linkToAbsolute('', implode('/', $parts));
-		} elseif(count($parts) == 1) {
-			return OCP\Util::linkToAbsolute('', implode('/', $parts));
-		} elseif(trim($parts[0] == 'core')) {
-			array_shift($parts);
-			return OCP\Util::linkToAbsolute('', implode('/', $parts));
-		} else { // This should be an app.
-			return OCP\Util::linkToAbsolute(array_shift($parts), implode('/', $parts));
-		}
-	}
-
-	static function imagePath($src) {
-		//error_log('imagePath '.$src);
-		$parts = is_array($src)?$src:explode('/', rtrim($src, ' \t\r\n/'));
-		if($parts[0] == '') {
-			array_shift($parts);
-			return OCP\Util::imagePath('', implode('/', $parts));
-		} elseif(count($parts) == 1) {
-			return OCP\Util::imagePath('', implode('/', $parts));
-		} elseif(trim($parts[0] == 'core')) {
-			array_shift($parts);
-			return OCP\Util::imagePath('', implode('/', $parts));
-		} else { // This should be an app.
-			return OCP\Util::imagePath(array_shift($parts), implode('/', $parts));
-		}
-	}
-
-	static function config($src) {
-		error_log('pref '.$src);
-		$parts = is_array($src)?$src:explode('/', rtrim($src, ' \t\r\n/'));
-		if(count($parts) < 2) {
-			throw new PHPTAL_Exception('Wrong argument count: config: takes no less than 2 arguments.');
-		} else {
-			switch ($parts[0]) {
-			    case 'sys':
-					return OCP\Config::getSystemValue($parts[1]);
-			        break;
-			    case 'app':
-					if(count($parts) == 2) {
-						return OCP\Config::getAppValue(self::app, $parts[1]);
-					} elseif(count($parts) == 3) {
-						return OCP\Config::getAppValue($parts[1], $parts[2]);
-					} else {
-						throw new PHPTAL_Exception('Wrong argument count: config:$app takes no more than 3 arguments.');
-					}
-			        break;
-			    case 'user':
-					if(count($parts) == 2) {
-						return OCP\Config::getUserValue(OCP\User::getUser(), self::app, $parts[1]);
-					} elseif(count($parts) == 3) {
-						return OCP\Config::getUserValue(OCP\User::getUser(), $parts[1], $parts[2]);
-					} elseif(count($parts) == 4) {
-						return OCP\Config::getUserValue($parts[1], $parts[2], $parts[3]);
-					} else {
-						throw new PHPTAL_Exception('Wrong argument count: config: takes no more than 4 arguments.');
-					}
-			        break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/apps/tal/settings.php b/apps/tal/settings.php
deleted file mode 100644
index a4eeb33344..0000000000
--- a/apps/tal/settings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tal');
-
-$tmpl = new OC_TALTemplate('tal', 'settings');
-return $tmpl->fetchPage();
-
-?>
diff --git a/apps/tal/templates/layout.guest.pt b/apps/tal/templates/layout.guest.pt
deleted file mode 100644
index 884b44a582..0000000000
--- a/apps/tal/templates/layout.guest.pt
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html metal:define-macro="page">
-<head>
-	<title>ownCloud</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="shortcut icon" href="/owncloud/core/img/favicon.png" tal:attributes="href string:${webroot}/core/img/favicon.png" />
-	<link rel="apple-touch-icon-precomposed" href="/owncloud/core/img/favicon-touch.png" tal:attributes="href string:${webroot}/core/img/favicon-touch.png" />
-
-	<link rel="stylesheet" href="core.css" type="text/css" media="screen" tal:condition="php:OC_Util::$core_styles" tal:attributes="href php:OC_Helper::linkToRemote('core.css', false)" />
-
-	<tal:block tal:repeat="style styles">
-	<link rel="stylesheet" href="/owncloud/core/css/styles.css" type="text/css" media="screen" tal:attributes="href style" />
-	</tal:block>
-	<script type="text/javascript">
-	var oc_webroot = '${webroot}';
-	var oc_appswebroot = '${appswebroot}';
-	</script>
-
-	<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>" tal:condition="php:OC_Util::$core_scripts" tal:attributes="src php:OC_Helper::linkToRemote('core.js', false)"></script>
-
-	<tal:block tal:repeat="script scripts">
-	<script type="text/javascript" tal:attributes="src script"></script>
-	</tal:block>
-	
-	<tal:block tal:repeat="header headers">
-		<tal:block tal:replace='structure string:<${header/tag}' /> <tal:block tal:repeat="attribute header/attributes"><tal:block tal:replace='structure string:${repeat/attribute/key}="${attribute}"' /></tal:block> />
-	</tal:block>
-</head>
-
-<body id="body-login">
-	<div id="login">
-		<header>
-			<div id="header">
-				<img src="/owncloud/core/img/logo.png" alt="ownCloud" tal:attributes="href string:${webroot}/core/img/logo.png" />
-			</div>
-		</header>
-		<div id="content" metal:define-slot="content">
-			This is the content.
-		</div>
-	</div>
-	<footer><p class="info"><a href="http://owncloud.org/" i18n:translate="">ownCloud</a> &ndash; web services under your control</p></footer>
-</body>
-</html>
diff --git a/apps/tal/templates/layout.user.pt b/apps/tal/templates/layout.user.pt
deleted file mode 100644
index a945e1af7a..0000000000
--- a/apps/tal/templates/layout.user.pt
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html metal:define-macro="page">
-<head>
-	<title tal:define="pretitle php:(!empty(application)) ? application . ' | ' : null" tal:content="string:${pretitle} ownCloud (${user}@${server/SERVER_NAME})">
-		Scripts and Styles
-	</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="shortcut icon" href="/owncloud/core/img/favicon.png" tal:attributes="href string:${webroot}/core/img/favicon.png" />
-	<link rel="apple-touch-icon-precomposed" href="favicon-touch.png" tal:attributes="href string:${webroot}/core/img/favicon-touch.png" />
-
-	<link rel="stylesheet" href="core.css" type="text/css" media="screen" tal:condition="core_styles" tal:attributes="href remote:core_styles" />
-	<tal:block tal:repeat="style styles">
-	<link rel="stylesheet" href="/owncloud/core/css/styles.css" type="text/css" media="screen" tal:attributes="href style" />
-	</tal:block>
-
-	<script type="text/javascript">
-	var oc_webroot = '${webroot}';
-	var oc_appswebroots = ${structure apps_paths};
-	var oc_current_user = '${user}';
-	</script>
-
-	<script type="text/javascript" src="core.js" tal:condition="core_scripts" tal:attributes="src remote:core_scripts"></script>
-	<tal:block tal:repeat="script scripts">
-	<script type="text/javascript" tal:attributes="src script"></script>
-	</tal:block>
-
-	<script type="text/javascript">
-		$(function() {
-			requesttoken = '${requesttoken}';
-			$(document).bind('ajaxSend', function(elm, xhr, s){
-				if(requesttoken) {
-					xhr.setRequestHeader('requesttoken', requesttoken);
-				}
-			});
-		});
-	</script>
-
-	<tal:block tal:repeat="header headers">
-		<tal:block tal:replace='structure string:${header/tag}' /> <tal:block tal:repeat="attribute header/attributes"><tal:block tal:replace='structure string:${repeat/attribute/key}="${attribute}"' /></tal:block> />
-	</tal:block>
-</head>
-<body tal:attributes="id bodyid">
-<header>
-	<div id="header" tal:define="index linkto:string:/index.php">
-		<a id="owncloud" tal:attributes="href index"><img class="svg" tal:attributes="src image:string:logo-wide.svg" src="logo-wide.svg" alt="ownCloud" /></a>
-			<a class="header-right header-action" id="logout" tal:attributes="href string:${index}?logout=true"><img class="svg" tal:attributes="src image:string:/actions/logout.svg" i18n:attributes="alt;title" alt="Log out" title="Log out" src="actions/logout.svg" /></a>
-			<form class="searchbox header-right" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" tal:attributes="value request/post/query|nothing" value="" autocomplete="off" />
-			</form>
-	</div>
-</header>
-
-<nav i18n:domain="core">
-	<div id="navigation">
-	<ul id="apps" class="svg">
-		<li tal:repeat="entry navigation">
-			<a tal:attributes="style structure string:background-image:url(${entry/icon});href entry/href;class php:entry['active']?'active':null" tal:content="entry/name">Name</a>
-		</li>
-	</ul>
-
-	<ul id="settings" class="svg">
-		<img role="button" tabindex="0" id="expand" class="svg"
-			i18n:attributes="alt Settings" alt="Settings" tal:attributes="src image:string:/actions/settings.svg" src="actions/settings.svg" />
-		<span i18n:translate="">Settings</span>
-		<div id="expanddiv" 
-			tal:attributes="class structure php:bodyid EQ 'body-user' ? 'hidden' : nothing">
-			<li tal:repeat="entry settingsnavigation">
-<a  tal:attributes="style structure string:background-image:url(${entry/icon});href entry/href;class entry/active|nothing" tal:content="entry/name">Name</a></li>
-		</div>
-	</ul>
-	</div>
-</nav>
-
-<div id="content" metal:define-slot="content">
-      This is the content.
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/apps/tal/templates/macros.util.pt b/apps/tal/templates/macros.util.pt
deleted file mode 100644
index 0e8c590e0e..0000000000
--- a/apps/tal/templates/macros.util.pt
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>
-		Utility macros
-	</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-<body tal:attributes="id bodyid">
-<header>
-	<div id="header" tal:define="index php:OCP\Util::linkTo('', 'index.php')">
-		<a id="owncloud" tal:attributes="href index"><img class="svg" tal:attributes="src php:OCP\Util::imagePath('', 'logo-wide.svg')" src="logo-wide.svg" alt="ownCloud" /></a>
-			<form class="searchbox" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" tal:attributes="value request/post/query|nothing" value="" autocomplete="off" />
-			</form>
-			<a id="logout" tal:attributes="href string:${index}?logout=true"><img class="svg" tal:attributes="src php:OCP\Util::imagePath('', 'actions/logout.svg')" i18n:attributes="alt Log out;title Log out" alt="Log out" title="Log out" src="actions/logout.svg" /></a>
-	</div>
-</header>
-<body>
-<tal:block metal:define-macro="html_select_options">
-	<tal:block condition="options">
-		<tal:block tal:define="options php:isset('combine') AND array_combine(options, options) OR options" repeat="option options">
-			<option tal:content="option" tal:attributes></option>
-		</tal:block>
-	</tal:block>
-</tal:block>
-function html_select_options($options, $selected, $params=array()) {
-	if (!is_array($selected)){
-		$selected=array($selected);
-	}
-	if (isset($params['combine']) && $params['combine']){
-		$options = array_combine($options, $options);
-	}
-	$value_name = $label_name = false;
-	if (isset($params['value'])){
-		$value_name = $params['value'];
-	}
-	if (isset($params['label'])){
-		$label_name = $params['label'];
-	}
-	$html = '';
-	foreach($options as $value => $label){
-		if ($value_name && is_array($label)){
-			$value = $label[$value_name];
-		}
-		if ($label_name && is_array($label)){
-			$label = $label[$label_name];
-		}
-		$select = in_array($value, $selected) ? ' selected="selected"' : '';
-		$html .= '<option value="' . $value . '"' . $select . '>' . $label . '</option>'."\n";
-	}
-	return $html;
-}
-
-</body>
-</html>
\ No newline at end of file
diff --git a/apps/tal/templates/manual.pt b/apps/tal/templates/manual.pt
deleted file mode 100644
index 9ad03db30b..0000000000
--- a/apps/tal/templates/manual.pt
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html metal:use-macro="${maintemplate}/page">
-<head>
-	<title>TAL Page Templates</title>
-</head>
-<body>
-<div id="content" metal:fill-slot="content">
-	<article id="manual" i18n:domain="tal" tal:define="page page|string:intro">
-		<nav>
-			<ol>
-				<li tal:repeat="section sections" tal:attributes="data-id section/id" data-page="intro">
-					<a tal:content="section/title">Introduction</a>
-				</li>
-			</ol>
-		</nav>
-		<section metal:use-macro="sections.pt/${page}">
-		<h1>Manual</h1>
-		rest of the content
-		</section>
-	</article>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/apps/tal/templates/sections.pt b/apps/tal/templates/sections.pt
deleted file mode 100644
index 9dcda6ebf4..0000000000
--- a/apps/tal/templates/sections.pt
+++ /dev/null
@@ -1,142 +0,0 @@
-<span metal:use-macro="${id}">
-TRUT
-</span>
-<section data-id="intro" metal:define-macro="intro">
-	<h1>Introduction</h1>
-	<h2>Initializing a template</h2>
-	<strong>Before:</strong>
-	<pre>$output = new OCP\Template('app', 'template', 'user');</pre>
-	<strong>After:</strong>
-	<pre>$tmpl = new OC_TALTemplate('app', 'template', 'user');</pre>
-	<h2>Assigning a variable</h2>
-	<strong>Before:</strong>
-	<pre>$tmpl->assign('myvar', $myvar);</pre>
-	<strong>After:</strong>
-	<pre>$tmpl->assign('myvar', $myvar);</pre>
-	The sharp minds may have noticed that there is no difference ;-)
-	<h2>Linking to an image</h2>
-	<strong>Before:</strong>
-	<pre>
-&lt;img class="svg" src="&lt;?php echo image_path('', 'logo-wide.svg'); ?&gt;" alt="ownCloud" /&gt;
-&lt;img class="svg" src="&lt;?php echo image_path('app', 'someimage.png'); ?&gt;" alt="ownCloud" /&gt;</pre>
-	<strong>After:</strong>
-	<pre>
-&lt;img class="svg" tal:attributes="src image:string:logo-wide.svg" alt="ownCloud" /&gt;
-&lt;img class="svg" tal:attributes="src image:string:app/someimage.png" alt="ownCloud" /&gt;</pre>
-	<h2>Constructing a link</h2>
-	<strong>Before:</strong>
-	<pre>
-&lt;a href="&lt;?php echo link_to('', 'index.php'); ?&gt;"&gt;Home&lt;/a&gt;
-&lt;a href="&lt;?php echo link_to('app', 'index.php'); ?&gt;"&gt;Some app&lt;/a&gt;</pre>
-	<strong>After:</strong>
-	<pre>
-&lt;a tal:attributes="href linkto:string:index.php"&gt;Home&lt;/a&gt;
-&lt;a tal:attributes="href linkto:string:app/index.php"&gt;Some app&lt;/a&gt;</pre>
-	<h2>Link to remote service</h2>
-	<strong>Before:</strong>
-	<pre>
-&lt;link rel="stylesheet" href="&lt;?php echo OC_Helper::linkToRemote('core.css') ?&gt;" type="text/css" media="screen" /&gt;
-&lt;a href="&lt;?php echo OC_Helper::linkToRemote('webdav') ?&gt;"&gt;WebDAV&lt;/a&gt;</pre>
-	<strong>After:</strong>
-	<pre>
-&lt;link rel="stylesheet" type="text/css" media="screen" tal:attributes="href remote:string:core.css" /&gt;
-&lt;a tal:attributes="href remote:string:webdav"&gt;WebDAV&lt;/a&gt;</pre>
-	<p>The latter produces a link to the WebDAV service on the current instance:
-	<a tal:attributes="href remote:string:webdav">WebDAV</a></p>
-	<h2>Accessing configuration</h2>
-	<strong>Before:</strong>
-	<pre>
-ownCloud version: &lt;?php echo OCP\Config::getSystemValue('version'); ?&gt;
-Default quota: &lt;?php echo OCP\Config::getAppValue('files', 'default_quota'); ?&gt;
-Calendar time zone: &lt;?php echo OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone'); ?&gt;</pre>
-	<strong>After:</strong>
-	<pre>
-ownCloud version: $${config:string:sys/version}
-Default quota: $${config:string:app/files/default_quota}
-Calendar time zone: $${config:string:user/calendar/timezone}</pre>
-	ownCloud version: ${config:string:sys/version}<br />
-	Default quota: ${config:string:app/files/default_quota}<br />
-	Calendar time zone: ${config:string:user/calendar/timezone}<br />
-	<h2>Translating content</h2>
-	<strong>Before:</strong>
-	<pre>&lt;p&gt;&lt;?php echo $l-&gt;t('This will be translated.'); ?&gt;&lt;p&gt;</pre>
-	<strong>After:</strong>
-	<pre>&lt;p i18n:translate=""&gt;This will be translated.&lt;p&gt;</pre>
-	<a class="readmore" href="http://phptal.org/manual/en/split/i18n-content.html" target="_blank">Read more...</a>
-	<h2>Translating content with variables</h2>
-	<strong>Before:</strong>
-	<p>There is no standardized way to do this currently. I have seen both translation keys using printf formatting
-	and custom interpolation using e.g. curly brackets.</p>
-	<strong>After:</strong>
-	<pre>
-&lt;tal:block i18n:name="username" tal:content="user" /&gt;
-&lt;p i18n:translate=""&gt;Your user name is &#36;{username}.&lt;/p&gt;</pre>
-	<tal:block i18n:name="username" tal:content="user" />
-	<p i18n:translate="">Your user name is ${username}.</p>
-	<p>Or you can wrap it in some markup:</p>
-	<pre>
-&lt;p i18n:translate=""&gt;
-Welcome back &lt;span i18n:name="username" tal:replace="user"/&gt;.
-&lt;/p&gt;</pre>
-	<p i18n:translate="">
-	Welcome back <span i18n:name="username" tal:replace="user"/>.
-	</p>
-	<a class="readmore" href="http://phptal.org/manual/en/split/i18n-name.html" target="_blank">Read more...</a>
-	<h2>Translating attributes.</h2>
-	<strong>Before:</strong>
-	<pre>&lt;img alt="&lt;?php echo $l->t('Log out');?&gt;" title="&lt;?php echo $l-&gt;t('Log out');?&gt;" src="&lt;?php echo image_path('', 'actions/logout.svg'); ?&gt;" /&gt;</pre>
-	<strong>After:</strong>
-	<pre>&lt;img tal:attributes="src image:string:/actions/logout.svg" i18n:attributes="alt;title" alt="Log out" title="Log out" /&gt;</pre>
-	<a href="http://phptal.org/manual/en/split/i18n-attributes.html" target="_blank">See more...</a>
-	<h2>Iterating</h2>
-	<pre>
-$$arr = array('color' => 'red',
-            'taste' => 'sweet',
-            'shape' => 'round',
-            'name'  => 'apple');
-	</pre>
-	<strong>Before:</strong>
-	<pre>
-&lt;select size="4"&gt;
-&lt;?php foreach($$arr as $key=&gt;$value) { ?&gt;
-&lt;option value="&lt;php echo $key; &gt;" &gt;&lt;php echo $value; &gt;&lt;/option&gt;
-&lt;/select&gt;
-&lt;?php } ?&gt;</pre>
-	<strong>After:</strong>
-	<pre>
-&lt;select size="4"&gt;
-&lt;option tal:repeat="item arr" tal:attributes="value repeat/item/key" tal:content="item"&gt;&lt;/option&gt;
-&lt;/select&gt;</pre>
-	<form>
-	<select size="4" tal:define="arr php:array('color' => 'red', 'taste' => 'sweet', 'shape' => 'round', 'name'  => 'apple')">
-	<option tal:repeat="item arr" tal:attributes="value repeat/item/key" tal:content="item"></option>
-	</select>
-	</form>
-	<a class="readmore" href="http://phptal.org/manual/en/split/tal-repeat.html" target="_blank">Read more...</a>
-	<h2>Initializing a template</h2>
-	<strong>Before:</strong>
-	<pre></pre>
-	<strong>After:</strong>
-	<pre></pre>
-</section>
-<section data-id="example-1" metal:define-macro="example-1">
-	<h1>A simple example</h1>
-	This is actually the main template for this manual.
-	<pre tal:define="dut php:file_get_contents(apptemplatepath . '/manual.pt')" tal:content="dut">
-	</pre>
-</section>
-<section data-id="gotchas" metal:define-macro="gotchas">
-	<h1>Caveats &amp; Gotchas</h1>
-	I know
-</section>
-<section data-id="ref" metal:define-macro="ref">
-	<h1>References</h1>
-	<dl>
-		<dt><a href="http://phptal.org/" target="_blank">PHPTAL</a></dt><dd>The PHP TAL implementation</dd>
-		<dt><a href="http://phptal.org/manual/en/split/tal-namespace.html" target="_blank">TAL</a></dt><dd>Template Attribute Language</dd>
-		<dt><a href="http://phptal.org/manual/en/split/phptales.html" target="_blank">TALES</a></dt><dd>TAL Expression Syntax</dd>
-		<dt><a href="http://phptal.org/manual/en/split/metal.html" target="_blank">METAL</a></dt><dd>Macro Expansion Template Attribute Language</dd>
-		<dt><a href="http://phptal.org/manual/en/split/i18n.html" target="_blank">i18n namespace</a></dt><dd>Internationalization in TAL</dd>
-		<dt><a href="http://phptal.org/wiki/doku.php/zopepagetemplates" target="_blank">Zope Page Templates</a></dt><dd>Links and specifications from the original TAL implementation</dd>
-	</dl>
-</section>
diff --git a/apps/tal/templates/settings.pt b/apps/tal/templates/settings.pt
deleted file mode 100644
index 1ae6eea9e7..0000000000
--- a/apps/tal/templates/settings.pt
+++ /dev/null
@@ -1,10 +0,0 @@
-<form id="tal">
-	<fieldset class="personalblock">
-		<legend i18n:translate="">TAL Page Templates for ownCloud</legend>
-		<p i18n:translate="">You can now create templates using TAL. As a matter of fact this section is using the internationalization namespace defined in TAL.<br />
-		Read more about it from the links below</p>
-		<ul>
-		<li><a href="" tal:attributes="href php:OCP\Util::linkTo('tal', 'index.php')" i18n:translate="">HOWTO use it in ownCloud</a></li>
-		</ul>
-	</fieldset>
-</form>
diff --git a/apps/tanghus-journal-2c506aa.tar.gz b/apps/tanghus-journal-2c506aa.tar.gz
deleted file mode 100644
index faa1ccfe477ed1467151c94011c7c83c49f23470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41637
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

diff --git a/apps/tanghus-tal-7f8befe.tar.gz b/apps/tanghus-tal-7f8befe.tar.gz
deleted file mode 100644
index fae360b2a90bcd5a4f920aaecd9428e8256fc066..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 37994
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%0Dr)WxdLjCfX9Or2fLo#>%J+Wh
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
C@R!#B


From 29dab0846e8bf8926d47eb8fa4743f21f85dac9c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 10:37:54 -0400
Subject: [PATCH 1192/1537] Remove another accidently added 3rdparty app

---
 apps/atnotes/ajax/browse.php             | 112 -----------------------
 apps/atnotes/ajax/check.php              |  56 ------------
 apps/atnotes/ajax/delete.php             |  34 -------
 apps/atnotes/ajax/export.php             |  56 ------------
 apps/atnotes/ajax/save.php               |  36 --------
 apps/atnotes/appinfo/app.php             |  39 --------
 apps/atnotes/appinfo/database.xml        |  79 ----------------
 apps/atnotes/appinfo/info.xml            |  11 ---
 apps/atnotes/atnotes.php                 |  29 ------
 apps/atnotes/css/atnotes.min.css         |  22 -----
 apps/atnotes/css/jquery-te-1.0.3.min.css |  11 ---
 apps/atnotes/css/jquery.qtip.min.css     |   1 -
 apps/atnotes/img/action.png              | Bin 697 -> 0 bytes
 apps/atnotes/img/icon.png                | Bin 117 -> 0 bytes
 apps/atnotes/img/jquery-te-toolbar.png   | Bin 53849 -> 0 bytes
 apps/atnotes/img/save.png                | Bin 201 -> 0 bytes
 apps/atnotes/js/atnotes.min.js           |  22 -----
 apps/atnotes/js/jquery-te-1.0.3.min.js   |  10 --
 apps/atnotes/js/jquery.qtip.min.js       |  13 ---
 apps/atnotes/lib/atnotes.class.php       |  88 ------------------
 apps/atnotes/templates/main.tpl.php      |  71 --------------
 remote/.gitignore                        |   2 -
 22 files changed, 692 deletions(-)
 delete mode 100644 apps/atnotes/ajax/browse.php
 delete mode 100644 apps/atnotes/ajax/check.php
 delete mode 100644 apps/atnotes/ajax/delete.php
 delete mode 100644 apps/atnotes/ajax/export.php
 delete mode 100644 apps/atnotes/ajax/save.php
 delete mode 100644 apps/atnotes/appinfo/app.php
 delete mode 100644 apps/atnotes/appinfo/database.xml
 delete mode 100644 apps/atnotes/appinfo/info.xml
 delete mode 100644 apps/atnotes/atnotes.php
 delete mode 100644 apps/atnotes/css/atnotes.min.css
 delete mode 100644 apps/atnotes/css/jquery-te-1.0.3.min.css
 delete mode 100644 apps/atnotes/css/jquery.qtip.min.css
 delete mode 100644 apps/atnotes/img/action.png
 delete mode 100644 apps/atnotes/img/icon.png
 delete mode 100644 apps/atnotes/img/jquery-te-toolbar.png
 delete mode 100644 apps/atnotes/img/save.png
 delete mode 100644 apps/atnotes/js/atnotes.min.js
 delete mode 100644 apps/atnotes/js/jquery-te-1.0.3.min.js
 delete mode 100644 apps/atnotes/js/jquery.qtip.min.js
 delete mode 100644 apps/atnotes/lib/atnotes.class.php
 delete mode 100644 apps/atnotes/templates/main.tpl.php
 delete mode 100644 remote/.gitignore

diff --git a/apps/atnotes/ajax/browse.php b/apps/atnotes/ajax/browse.php
deleted file mode 100644
index 475b5e8614..0000000000
--- a/apps/atnotes/ajax/browse.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-require_once('../../../lib/base.php');
-require_once('../../../lib/template.php');
-
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('atnotes');
-
-$p = trim($_POST['p']);
-$top = FALSE;
-if($p == '/'){
-	$p = OC::$CONFIG_DATADIRECTORY;
-	$top = TRUE;
-}
-
-$files = Array();
-foreach(OC_Files::getdirectorycontent($p) as $i){
-	$elt = '';
-	
-	if($i['type'] == 'file'){
-		$fileinfo = pathinfo($i['name']);
-		$i['basename'] = $fileinfo['filename'];
-		if (!empty($fileinfo['extension'])){
-			$i['extention'] = '.'.$fileinfo['extension'];
-		}else{
-			$i['extention'] = '';
-		}
-	}
-	if($i['directory'] == '/'){
-		$i['directory'] = '';
-	}
-	if($i['extention'] == '.txt' || $i['type'] == 'dir'){
-		$i["date"] = OC_Util::formatDate($i["mtime"]);
-		
-		$write = ($i['writeable'])?'true':'false';
-		$simple_file_size = simple_file_size($i['size']);
-		$simple_size_color = intval(200 - $i['size'] / (1024 * 1024) * 2);
-		
-		if($simple_size_color < 0){
-			$simple_size_color = 0;
-		}
-		
-		$relative_modified_date = relative_modified_date($i['mtime']);
-		$relative_date_color = round((time() - $i['mtime']) / 60 / 60 / 24 * 14);
-		
-		if($relative_date_color > 200){
-			$relative_date_color = 200;
-		}
-		
-		$name = str_replace('+', '%20', urlencode($i['name']));
-		$name = str_replace('%2F', '/', $name);
-		$directory = str_replace('+', '%20', urlencode($i['directory']));
-		$directory = str_replace('%2F', '/', $directory);
-		
-		$elt .= '<tr data-file="'.$name.'" data-type="'.(($i['type'] == 'dir')?'dir':'file').'" data-mime="'.$i['mime'].'" data-size="'.$i['size'].'" data-write="'.$write.'">';
-		$elt .= '<td class="filename svg" data-rel="'.$directory.'/'.$name.'" style="background-image:url('.(($i['type'] == 'dir')?mimetype_icon('dir'):mimetype_icon($i['mime'])).')">';
-		$elt .= '<span class="nametext">';
-		if($i['type'] == 'dir'){
-			$elt .= htmlspecialchars($i['name']);
-		}else{
-			$elt .= htmlspecialchars($i['basename']).'<span class="extention">'.$i['extention'].'</span>';
-		}
-		$elt .= '</span>';
-		$elt .= '</td>';
-		$elt .= '<td class="filesize" title="'.human_file_size($i['size']).'" style="color:rgb('.$simple_size_color.','.$simple_size_color.','.$simple_size_color.')">'.$simple_file_size.'</td>';
-		$elt .= '<td class="date"><span class="modified" title="'.$i['date'].'" style="color:rgb('.$relative_date_color.','.$relative_date_color.','.$relative_date_color.')">'.$relative_modified_date.'</span></td>';
-		$elt .= '</tr>';
-				
-		$files[] = $elt;
-	}
-}
-
-if(!$top){
-	$p = str_replace('+', '%20', urlencode($p));
-	$p = str_replace('%2F', '/', $p);
-	$p = substr($p,0,strrpos($p,'/'));
-	if(strlen($p) == 0){
-		$p = '/';
-	}
-	
-	$elt = '<tr>';
-	$elt .= '<td class="filename svg" data-rel="'.$p.'" style="background-image:url('.mimetype_icon('dir').')">';
-	$elt .= '<span class="nametext">..</span>';
-	$elt .= '</td>';
-	$elt .= '<td class="filesize">&nbsp;</td>';
-	$elt .= '<td class="date">&nbsp;</td>';
-	$elt .= '</tr>';
-	array_unshift($files, $elt);
-}
-
-OC_JSON::encodedPrint($files);
\ No newline at end of file
diff --git a/apps/atnotes/ajax/check.php b/apps/atnotes/ajax/check.php
deleted file mode 100644
index c2642b620f..0000000000
--- a/apps/atnotes/ajax/check.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('atnotes');
-
-$p = trim($_POST['p']);
-$t = trim($_POST['t']);
-
-$normalizeChars = array(
-	'Á'=>'A', 'À'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Å'=>'A', 'Ä'=>'A', 'Æ'=>'AE', 'Ç'=>'C',
-	'É'=>'E', 'È'=>'E', 'Ê'=>'E', 'Ë'=>'E', 'Í'=>'I', 'Ì'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ð'=>'Eth',
-	'Ñ'=>'N', 'Ó'=>'O', 'Ò'=>'O', 'Ô'=>'O', 'Õ'=>'O', 'Ö'=>'O', 'Ø'=>'O',
-	'Ú'=>'U', 'Ù'=>'U', 'Û'=>'U', 'Ü'=>'U', 'Ý'=>'Y',
-	'á'=>'a', 'à'=>'a', 'â'=>'a', 'ã'=>'a', 'å'=>'a', 'ä'=>'a', 'æ'=>'ae', 'ç'=>'c',
-	'é'=>'e', 'è'=>'e', 'ê'=>'e', 'ë'=>'e', 'í'=>'i', 'ì'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'eth',
-	'ñ'=>'n', 'ó'=>'o', 'ò'=>'o', 'ô'=>'o', 'õ'=>'o', 'ö'=>'o', 'ø'=>'o',
-	'ú'=>'u', 'ù'=>'u', 'û'=>'u', 'ü'=>'u', 'ý'=>'y',
-	'ß'=>'sz', 'þ'=>'thorn', 'ÿ'=>'y', ' ' => '_', '"' => '', "'" => ' ', '/' => '-'
-);
-
-$r = Array('e' => FALSE, 'p' => '');
-if(strlen($p) != 0 && strlen($t) != 0){
-	$fs = OCP\Files::getStorage('files');
-	if($fs->is_dir($p)){
-		$r['p'] = $p.'/'.strtr($t, $normalizeChars).'.txt';
-	}else{
-		$r['p'] = $p;
-	}
-	
-	if($fs->file_exists($r['p'])){
-		$r['e'] = TRUE;
-	}
-}
-
-OCP\JSON::encodedPrint($r);
diff --git a/apps/atnotes/ajax/delete.php b/apps/atnotes/ajax/delete.php
deleted file mode 100644
index dfb9e11647..0000000000
--- a/apps/atnotes/ajax/delete.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('atnotes');
-
-$i = trim($_POST['i']);
-
-$r = Array('e' => 1);
-if(is_numeric($i)){
-	$r['e'] = OC_ATNotes::deleteNote($i);
-}
-
-OCP\JSON::encodedPrint($r);
\ No newline at end of file
diff --git a/apps/atnotes/ajax/export.php b/apps/atnotes/ajax/export.php
deleted file mode 100644
index d158f6b3c0..0000000000
--- a/apps/atnotes/ajax/export.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('atnotes');
-
-$p = trim($_POST['p']);
-$t = trim($_POST['t']);
-$c = trim($_POST['c']);
-
-$r = Array('e' => '');
-if(strlen($p) != 0 && strlen($t) != 0 && strlen($c) != 0){
-	$fs = OCP\Files::getStorage('files');
-	if(!$fp = $fs->fopen($p, 'w')){
-		$r['e'] = 'Can not open file '.$p;
-	}else{
-		 if(fwrite($fp, $t."\n") === FALSE){
-		 	$r['e'] = 'Can not write to file '.$p;
-		 }else{
-		 	$c = preg_replace('/<br[.*]{0,}>/',"\n",$c);
-		 	$c = preg_replace('/<u[.*]{0,}>/','',$c);$c = preg_replace('/<\/u>/','',$c);
-			$c = preg_replace('/<b[.*]{0,}>/','',$c);$c = preg_replace('/<\/b>/','',$c);
-			$c = preg_replace('/<i[.*]{0,}>/','',$c);$c = preg_replace('/<\/i>/','',$c);
-			$c = preg_replace('/<hr.*>/',"------------------------\n",$c);
-			$c = preg_replace('/<sup[.*]{0,}>/','(',$c);$c = preg_replace('/<\/sup>/',')',$c);
-			$c = preg_replace('/<sub[.*]{0,}>/','(',$c);$c = preg_replace('/<\/sub>/',')',$c);
-		 	if(fwrite($fp, $c) === FALSE){
-			 	$r['e'] = 'Can not write to file '.$p;
-			 }else{
-			 	fclose($fp);
-			 }
-		 }
-	}
-}
-
-OCP\JSON::encodedPrint($r);
diff --git a/apps/atnotes/ajax/save.php b/apps/atnotes/ajax/save.php
deleted file mode 100644
index 1212c9ea4c..0000000000
--- a/apps/atnotes/ajax/save.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('atnotes');
-
-$i = trim($_POST['i']);
-$t = trim($_POST['t']);
-$c = trim($_POST['c']);
-
-$r = Array('e' => '', 'i' => 0);
-if(strlen($t) != 0){
-	$r['i'] = OC_ATNotes::saveNote($i,$t,$c);
-}
-
-OCP\JSON::encodedPrint($r);
\ No newline at end of file
diff --git a/apps/atnotes/appinfo/app.php b/apps/atnotes/appinfo/app.php
deleted file mode 100644
index 4304e17871..0000000000
--- a/apps/atnotes/appinfo/app.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\App::checkAppEnabled('atnotes');
-OC::$CLASSPATH['OC_ATNotes'] = 'apps/atnotes/lib/atnotes.class.php';
-
-OCP\App::register(Array(
-	'order' => 29,
-	'id' => 'atnotes',
-	'name' => 'ATNotes'
-));
-
-OCP\App::addNavigationEntry(Array(
-	'id' => 'atnotes_index',
-	'order' => 29,
-	'href' => OCP\Util::linkTo('atnotes', 'atnotes.php'),
-	'icon' => OCP\Util::imagePath('atnotes', 'icon.png'),
-	'name' => 'ATNotes'
-));
\ No newline at end of file
diff --git a/apps/atnotes/appinfo/database.xml b/apps/atnotes/appinfo/database.xml
deleted file mode 100644
index d075c90f5d..0000000000
--- a/apps/atnotes/appinfo/database.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	 <name>*dbname*</name>
-	 <create>true</create>
-	 <overwrite>false</overwrite>
-	 <charset>utf8</charset>
-	 <table>
-		<name>*dbprefix*atnotes</name>
-		<declaration>
-			<field>
-				<name>note_id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>oc_uid</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>create_ts</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>11</length>
-			</field>
-			<field>
-				<name>update_ts</name>
-				<type>integer</type>
-				<notnull>false</notnull>
-				<default>0</default>
-				<length>11</length>
-			</field>
-			<field>
-				<name>note_title</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
-			<field>
-				<name>note_content</name>
-				<type>clob</type>
-				<notnull>false</notnull>
-			</field>
-			<field>
-				<name>note_file</name>
-				<type>text</type>
-				<notnull>false</notnull>
-				<length>255</length>
-			</field>
-			<field>
-				<name>is_deleted</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>1</length>
-			</field>
-			<field>
-				<name>is_shared</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>1</length>
-			</field>
-			<index>
-				<name>note_pk</name>
-			    <primary>true</primary>
-			    <field>
-					<name>note_id</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
\ No newline at end of file
diff --git a/apps/atnotes/appinfo/info.xml b/apps/atnotes/appinfo/info.xml
deleted file mode 100644
index 0ea9a74200..0000000000
--- a/apps/atnotes/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>atnotes</id>
-	<name>ATNotes</name>
-	<description>ATNotes for Always Take Notes. Create/Edit/Delete notes in the application. You can export notes to save them in your ownCloud filesystem and you can access them through the WebDAV protocol.</description>
-	<version>1.0</version>
-	<licence>AGPL</licence>
-	<author>Xavier Beurois (www.djazz-lab.net)</author>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/atnotes/atnotes.php b/apps/atnotes/atnotes.php
deleted file mode 100644
index b028f0adce..0000000000
--- a/apps/atnotes/atnotes.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('atnotes');
-
-$tmpl = new OCP\Template('atnotes', 'main.tpl', 'user');
-$tmpl->assign('notes_list', OC_ATNotes::getNotesList());
-$tmpl->printPage();
diff --git a/apps/atnotes/css/atnotes.min.css b/apps/atnotes/css/atnotes.min.css
deleted file mode 100644
index b98a2c50a8..0000000000
--- a/apps/atnotes/css/atnotes.min.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-#atnotes_container{min-width:830px}#atnotes_container div#controls div.title{color:#BBB;font-style:italic;padding:.7em .5em .5em}#atnotes_container ul.atnotes-noteslist{background:none repeat scroll 0 0 #f8f8f8;border-right:1px solid #DDD;overflow:auto;position:fixed;top:6.3em;width:20em;box-shadow:-2px -3px 7px #000;z-index:2}#atnotes_container ul.atnotes-noteslist li.atnotes-elt{border-bottom:1px solid #CCC;padding:.3em .8em 1em;-moz-transition:background-color 500ms ease 0s;background:none repeat scroll 0 0 #f8f8f8;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#atnotes_container ul.atnotes-noteslist li.atnotes-elt:hover,#atnotes_container ul.atnotes-noteslist li.atnotes-elt.active{background:none repeat scroll 0 0 #eee}#atnotes_container ul.atnotes-noteslist li.atnotes-elt:hover div{cursor:pointer}#atnotes_container ul.atnotes-noteslist li.atnotes-elt div.atnotes-elt-title{font-weight:bold;white-space:pre-wrap;width:18.4em}#atnotes_container ul.atnotes-noteslist li.atnotes-elt div.atnotes-elt-state{float:left;width:10em;font-style:italic;color:#AAA}#atnotes_container ul.atnotes-noteslist li.atnotes-elt div.atnotes-elt-date{color:#999;float:right;width:7em;text-align:right}#atnotes_container ul.atnotes-noteslist li.atnotes-elt div.atnotes-elt-prerender{display:none}#atnotes_container div.atnotes-notesedit{left:20em;position:absolute;top:2.9em}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-states{box-shadow:0 4px 7px #AAA}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-states div.atnotes-saved{float:right}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-title,#atnotes_container div.atnotes-notesedit div.anotes-notesedit-states{padding:.5em 2em;background-color:#FFF;border-bottom:1px solid #CCC;height:1.8em;z-index:1;min-width:350px}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-states{padding:.5em 2em .5em 22em}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-title input#note_title{box-shadow:none;background:0;-moz-border-radius:0;-webkit-border-radius:0;padding:0;margin:0;border:0 none}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-title div.atnotes-actions-btns{float:right;margin-top:.5em}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-title div.atnotes-actions-btns img{cursor:pointer}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-title div.atnotes-actions-btns img.atnotes-actions-list{margin-right:1em}#atnotes_container div.atnotes-notesedit div.anotes-notesedit-title div.atnotes-actions-btns div.atnotes-actions-ddmenu{display:none}#atnotes_container div.jqte{left:20em;position:absolute;top:5.8em;border:0 none;resize:none;min-width:350px}#save_dialog div.atnotes-explorer{background-color:#FFF;border:1px solid #AAA;height:100%;width:100%;overflow-x:auto;overflow-y:visible}#save_dialog div.atnotes-explorer table{width:100%}#save_dialog div.atnotes-explorer table tr td.filename{width:70%;background-position:0 .1em;background-repeat:no-repeat;padding-left:1.7em;cursor:pointer}#save_dialog div.atnotes-explorer table tr td.filename span{cursor:pointer}#save_dialog div.atnotes-explorer table tr td.filesize{width:10%;text-align:center}#save_dialog div.atnotes-explorer table tr td.date{width:20%;text-align:center}.ui-tooltip-content ul li:hover{color:#AAA;background-color:#1a1a1a}
diff --git a/apps/atnotes/css/jquery-te-1.0.3.min.css b/apps/atnotes/css/jquery-te-1.0.3.min.css
deleted file mode 100644
index b60e50b159..0000000000
--- a/apps/atnotes/css/jquery-te-1.0.3.min.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * http://jqueryte.com
- * jQuery Text Editor 1.0.2
- * Copyright (C) 2012, Fatih Koca (fatihkoca@me.com), AUTHOR.txt (http://jqueryte.com/about)
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program 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 General Public License for more details.
-You should have received a copy of the GNU General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
-
-.jqte{overflow:hidden}.jqte *{font-family:Arial,Helvetica,sans-serif;font-size:14px;color:#333}.jqte_Panel{height:25px;padding:5px 8px}.jqte_Panel a{display:block;float:left;width:22px;height:22px;border:#FFF 1px solid;text-align:center;background:url('/apps/atnotes/img/jquery-te-toolbar.png') no-repeat;font-weight:bold;cursor:pointer;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.jqte_Panel a.bold{background-position:0 0}.jqte_Panel a.italic{background-position:-22px 0}.jqte_Panel a.underline{background-position:-44px 0}.jqte_Panel a.orderedlist{background-position:-66px 0}.jqte_Panel a.unorderedlist{background-position:-88px 0}.jqte_Panel a.subscript{background-position:-110px 0}.jqte_Panel a.superscript{background-position:-132px 0}.jqte_Panel a.strike{background-position:-154px 0}.jqte_Panel a.remove{background-position:-176px 0}.jqte_Panel a.rule{background-position:-198px 0}.jqte_Panel a:hover,.jqte_Active{border:#CCC 1px solid!important;box-shadow:inset 0 0 2px #999;background-color:#FFF}.jqte_Panel a:active,.jqte_Active{background-color:#DDD!important}.jqte_Content{overflow-y:auto;position:absolute;top:3.3em;left:.7em;padding-right:.3em}.jqte_Content div,.jqte_Content p{margin:7px 0}.jqte_Content ul{list-style-type:disc}.jqte_Content ol{list-style-type:decimal}.jqte_Content ol,.jqte_Content ul{list-style-position:inside}
\ No newline at end of file
diff --git a/apps/atnotes/css/jquery.qtip.min.css b/apps/atnotes/css/jquery.qtip.min.css
deleted file mode 100644
index 3f5e39adc7..0000000000
--- a/apps/atnotes/css/jquery.qtip.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.ui-tooltip,.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;border-width:1px;border-style:solid;}.ui-tooltip-fluid{display:block;visibility:hidden;position:static!important;float:left!important;}.ui-tooltip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word;overflow:hidden;}.ui-tooltip-titlebar{position:relative;min-height:14px;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:bold;}.ui-tooltip-titlebar+.ui-tooltip-content{border-top-width:0!important;}/*!Default close button class */ .ui-tooltip-titlebar .ui-state-default{position:absolute;right:4px;top:50%;margin-top:-9px;cursor:pointer;outline:medium none;border-width:1px;border-style:solid;}* html .ui-tooltip-titlebar .ui-state-default{top:16px;}.ui-tooltip-titlebar .ui-icon,.ui-tooltip-icon .ui-icon{display:block;text-indent:-1000em;}.ui-tooltip-icon,.ui-tooltip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.ui-tooltip-icon .ui-icon{width:18px;height:14px;text-align:center;text-indent:0;font:normal bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em;}/*!Default tooltip style */ .ui-tooltip-default{border-color:#F1D031;background-color:#FFFFA3;color:#555;}.ui-tooltip-default .ui-tooltip-titlebar{background-color:#FFEF93;}.ui-tooltip-default .ui-tooltip-icon{border-color:#CCC;background:#F1F1F1;color:#777;}.ui-tooltip-default .ui-tooltip-titlebar .ui-state-hover{border-color:#AAA;color:#111;}/*!Light tooltip style */ .ui-tooltip-light{background-color:white;border-color:#E2E2E2;color:#454545;}.ui-tooltip-light .ui-tooltip-titlebar{background-color:#f1f1f1;}/*!Dark tooltip style */ .ui-tooltip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3;}.ui-tooltip-dark .ui-tooltip-titlebar{background-color:#404040;}.ui-tooltip-dark .ui-tooltip-icon{border-color:#444;}.ui-tooltip-dark .ui-tooltip-titlebar .ui-state-hover{border-color:#303030;}/*!Cream tooltip style */ .ui-tooltip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35;}.ui-tooltip-cream .ui-tooltip-titlebar{background-color:#F0DE7D;}.ui-tooltip-cream .ui-state-default .ui-tooltip-icon{background-position:-82px 0;}/*!Red tooltip style */ .ui-tooltip-red{background-color:#F78B83;border-color:#D95252;color:#912323;}.ui-tooltip-red .ui-tooltip-titlebar{background-color:#F06D65;}.ui-tooltip-red .ui-state-default .ui-tooltip-icon{background-position:-102px 0;}.ui-tooltip-red .ui-tooltip-icon{border-color:#D95252;}.ui-tooltip-red .ui-tooltip-titlebar .ui-state-hover{border-color:#D95252;}/*!Green tooltip style */ .ui-tooltip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219;}.ui-tooltip-green .ui-tooltip-titlebar{background-color:#B0DE78;}.ui-tooltip-green .ui-state-default .ui-tooltip-icon{background-position:-42px 0;}/*!Blue tooltip style */ .ui-tooltip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD;}.ui-tooltip-blue .ui-tooltip-titlebar{background-color:#D0E9F5;}.ui-tooltip-blue .ui-state-default .ui-tooltip-icon{background-position:-2px 0;}/*!Add shadows to your tooltips in:FF3+,Chrome 2+,Opera 10.6+,IE6+,Safari 2+*/ .ui-tooltip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,0.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,0.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,0.15);}.ui-tooltip-shadow .ui-tooltip-titlebar,.ui-tooltip-shadow .ui-tooltip-content{filter:progid:DXImageTransform.Microsoft.Shadow(Color='gray',Direction=135,Strength=3);-ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Color='gray',Direction=135,Strength=3)";_margin-bottom:-3px;.margin-bottom:-3px;}/*!Add rounded corners to your tooltips in:FF3+,Chrome 2+,Opera 10.6+,IE9+,Safari 2+*/ .ui-tooltip-rounded,.ui-tooltip-tipsy,.ui-tooltip-youtube,.ui-tooltip-youtube>div,.ui-tooltip-bootstrap{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}/*!Youtube tooltip style */ .ui-tooltip-youtube{-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:white;border-color:#CCC;background:transparent;background:rgba(0,0,0,0.85);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#D9000000,endColorstr=#D9000000);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#D9000000,endColorstr=#D9000000)";}.ui-tooltip-youtube .ui-tooltip-titlebar{background-color:transparent;}.ui-tooltip-youtube .ui-tooltip-icon{border-color:#222;}.ui-tooltip-youtube .ui-tooltip-titlebar .ui-state-hover{border-color:#303030;}.ui-tooltip-jtools{background:#232323;background:rgba(0,0,0,0.7);background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333;}.ui-tooltip-jtools .ui-tooltip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)";}.ui-tooltip-jtools .ui-tooltip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)";}.ui-tooltip-jtools .ui-tooltip-titlebar,.ui-tooltip-jtools .ui-tooltip-content{background:transparent;color:white;border:0 dashed transparent;}.ui-tooltip-jtools .ui-tooltip-icon{border-color:#555;}.ui-tooltip-jtools .ui-tooltip-titlebar .ui-state-hover{border-color:#333;}.ui-tooltip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,0.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,0.4);box-shadow:4px 4px 5px rgba(0,0,0,0.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent;}.ui-tooltip-cluetip .ui-tooltip-titlebar{background-color:#87876A;color:white;border:0 dashed transparent;}.ui-tooltip-cluetip .ui-tooltip-icon{border-color:#808064;}.ui-tooltip-cluetip .ui-tooltip-titlebar .ui-state-hover{border-color:#696952;color:#696952;}.ui-tooltip-tipsy{background:black;background:rgba(0,0,0,.87);color:white;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:bold;line-height:16px;text-shadow:0 1px black;}.ui-tooltip-tipsy .ui-tooltip-titlebar{padding:6px 35px 0 10;background-color:transparent;}.ui-tooltip-tipsy .ui-tooltip-content{padding:6px 10;}.ui-tooltip-tipsy .ui-tooltip-icon{border-color:#222;text-shadow:none;}.ui-tooltip-tipsy .ui-tooltip-titlebar .ui-state-hover{border-color:#303030;}.ui-tooltip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:normal;font-family:serif;}.ui-tooltip-tipped .ui-tooltip-titlebar{border-bottom-width:0;color:white;background:#3A79B8;background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)";}.ui-tooltip-tipped .ui-tooltip-icon{border:2px solid #285589;background:#285589;}.ui-tooltip-tipped .ui-tooltip-icon .ui-icon{background-color:#FBFBFB;color:#555;}.ui-tooltip-bootstrap{font-size:13px;line-height:18px;color:#333;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.ui-tooltip-bootstrap .ui-tooltip-titlebar{font-size:18px;line-height:22px;border-bottom:1px solid #ccc;background-color:transparent;}.ui-tooltip-bootstrap .ui-tooltip-titlebar .ui-state-default{right:9px;top:49%;border-style:none;}.ui-tooltip-bootstrap .ui-tooltip-icon{background:white;}.ui-tooltip-bootstrap .ui-tooltip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20);}.ui-tooltip-bootstrap .ui-tooltip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40);}.ui-tooltip:not(.ie9haxors) div.ui-tooltip-content,.ui-tooltip:not(.ie9haxors) div.ui-tooltip-titlebar{filter:none;-ms-filter:none;}
\ No newline at end of file
diff --git a/apps/atnotes/img/action.png b/apps/atnotes/img/action.png
deleted file mode 100644
index 5b24257a0e7ddad59d0db12277650a354d10bbcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0007jNkl<ZNQteL
zv1=1i9LK-k-=)wPI>Z<X5kV(~LLF3SEyC-jrfbd6!9{7Wn}e>ki%XYGJq`pHmsF%n
zBRC}>p-OP*aQFvUlvaq)mZp&0`#JQkq|v6u^a}^~?)Tn(zVN>9{ivz{fW^f{saC5}
ztyV)-)%p4PF#zj0)cEr9@@JAX#yG|pyRfieaSo!YVsdgaF)}i8%UXL=Rm;}e-y|Q3
z$U6YA)=sPH2N6k=%!|lI5CmT<l}fu`0}e?^rBb)8wXXm?C7BVCF_JR?E&~9`Ya()$
z<O2XNRQ3As@bI^Kz5de}qx~321VO+|CX*vM3LpvKF@S-td3U0x71c(=Fw6x(z<%HW
zAS){?A%Ggm_Z@(fGytF#&8<ai`%(e`thIY2ce~&}RJ8;EBntp?u?bb(wbt(S3kLva
zdwYA#ah$s(p8&Yj0e|Fq-s`EUsgG-GYhOs-2QU;Fx+o&Q%H?t@pU-dhV;})wJwA%D
zRJG)JUM(Jbo>y~Sw?y(;RKEe>ZB#zWL7`CS8OTzp^jBu&|Gl3La9T|Oj9Y7`0o3D<
zBnz(VPQ+u^btj@6#HvSY#?J!kWsItd+1c3(j^n%p@VujTQV0QHDGbAxzVGj!^y7Ft
zdcgr8L6UQGb7=r+96yG+c+b1k0+5bw#in)#DAH-*SYnKENag{|MDSLR`LV$nl6hl{
za~8;H2CRr|;IQ%Rh{ziNOX$c%^u83;b^xr4$c8bd?}l`&8MWK(D}#fBpPJ3)?!TH*
zGMOAYI5@bMNF=_WS2Gd-s8lNLY&KhOG#abLVsXp&{e2NRx?n_P)A#-TVzIc@Xf#%{
f*=+qh-~jLkoERA`^NwHT00000NkvXXu0mjf4aq}0

diff --git a/apps/atnotes/img/icon.png b/apps/atnotes/img/icon.png
deleted file mode 100644
index cce8f39255ef59e0a45723eff58b3247e43cc470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!2%=?hN|xZQZ}A0jv*QolmDDQa6sVS{KiC8
zWwo<M8rTi~rE~o6kL@}+(U7NIgqfK!`J>k+0|SScHoimujSYHkc}|?mAQL7k;4lBX
Q5oivBr>mdKI;Vst0BY4FdH?_b

diff --git a/apps/atnotes/img/jquery-te-toolbar.png b/apps/atnotes/img/jquery-te-toolbar.png
deleted file mode 100644
index a330302d9f1bdcbb48a4c1e01413900aa21a548f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53849
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
IZ|WZLFZk4|?*IS*

diff --git a/apps/atnotes/img/save.png b/apps/atnotes/img/save.png
deleted file mode 100644
index 49581985227dd47813f95b38fac4bc59b9dd6450..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6FglULo9lqPTI)JWXR*XU+^TG
z&jAUK%(b@_w11RnZ)h{-+PgHFm#u;G(hNRV%UJ=66?e-&rrezGa>UR>^C`!JXYc&>
zDl9F@D()#{YKVG$^vpH4qJr<o_icYZXMOIx=asAsp|-PcX6q@HGi;HL-T$1M)x~7%
z%$ee8aZVh6{5JeN#IfqvWcNSLj63UNm>CWTf3Mfw!V-4vKG1Cpp00i_>zopr0G}sL
AX#fBK

diff --git a/apps/atnotes/js/atnotes.min.js b/apps/atnotes/js/atnotes.min.js
deleted file mode 100644
index 007c53c6fd..0000000000
--- a/apps/atnotes/js/atnotes.min.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-function atnotes(){if(typeof atnotes.initialized=="undefined"){atnotes.prototype.A=function(c,g){if(c.val().length!=0){if(c.attr("rel")==0){if($("ul.atnotes-noteslist li.atnotes-elt.active").length!=0){$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-title").html(c.val());$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-prerender").html(g.html())}else{this.N(1)}}else{$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-title").html(c.val());$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-state").html("Unsaved");$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-date").html(this.B());$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-prerender").html(g.html())}$(window).bind("beforeunload",function(){return false})}};atnotes.prototype.B=function(){var j=new Date(),k,b,c;k=j.getDate();if(k<10){k="0"+k}b=parseInt(j.getMonth()+1);if(b<10){b="0"+b}c=j.getFullYear();j=b+"/"+k+"/"+c;return j};atnotes.prototype.C=function(g,e){if(e.val().length==0){e.val("Untitled note")}this.A(e,g)};atnotes.prototype.D=function(){d=$(".atnotes-elt.active");a=this;if(parseInt(d.attr("rel"))>0){$.ajax({type:"POST",dataType:"json",url:OC.linkTo("atnotes","ajax/delete.php"),data:{i:parseInt(d.attr("rel"))},async:false,success:function(c){if(c.e==0){a.E(d,1)}}})}else{a.E(d,1)}};atnotes.prototype.E=function(g,e){if(e==1){g.remove()}$("#note_title").val("");$("#note_title").attr("rel","0");$("#note_path").val("");$(".jqte_Content").html("");$("#note_title").focus()};atnotes.prototype.F=function(c,g){if(c.val().length==0){c.val("Untitled note");this.A($("#note_title"),g)}$.ajax({type:"POST",dataType:"json",url:OC.linkTo("atnotes","ajax/save.php"),data:{i:c.attr("rel"),t:c.val(),c:g.html()},async:false,error:function(b){alert(b.responseText)},success:function(b){if(!b.e){$("ul.atnotes-noteslist li.atnotes-elt.active div.atnotes-elt-state").empty();$("ul.atnotes-noteslist li.atnotes-elt.active").attr("rel",b.i);$("ul.atnotes-noteslist li.atnotes-elt.active").removeClass("unsaved");c.attr("rel",b.i);$(".atnotes-saved").empty().fadeIn(400);$(".atnotes-saved").css("color","#009700");$(".atnotes-saved").html("Saved !").delay(1000).fadeOut(400);if($("ul.atnotes-noteslist li.atnotes-elt.unsaved").length==0){$(window).unbind("beforeunload")}}}})};atnotes.prototype.G=function(i,c,h){if(h.html().length==0){$(".atnotes-saved").empty().fadeIn(400);$(".atnotes-saved").css("color","#990000");$(".atnotes-saved").html("File not exported: empty content ...").delay(1000).fadeOut(400)}else{$.ajax({type:"POST",dataType:"json",url:OC.linkTo("atnotes","ajax/check.php"),data:{p:i.val(),t:c.val()},async:false,success:function(b){f=true;if(b.e){if(!confirm("The file already exists. Are you sure to override it ?")){f=false}}if(f){$.ajax({type:"POST",dataType:"json",url:OC.linkTo("atnotes","ajax/export.php"),data:{p:b.p,t:c.val(),c:h.html()},async:false,success:function(e){$("#save_dialog").dialog("close")}})}}})}};atnotes.prototype.H=function(c,b){c.css("height",$("#content").height()-b+"px")};atnotes.prototype.I=function(e,g){if(typeof g=="undefined"){g="/"}a=this;e=e.find("div.atnotes-explorer table");$.ajax({type:"POST",dataType:"json",url:OC.linkTo("atnotes","ajax/browse.php"),data:{p:g},async:false,success:function(b){e.empty();$.each(b,function(c,i){e.append(i)});t=e.find("td.filename");t.click(function(c){var i=this;setTimeout(function(){var h=parseInt($(this).data("double"),10);if(h>0){$(this).data("double",h-1)}else{$("#note_path").val($(this).attr("data-rel"))}},300)}).dblclick(function(c){$(this).data("double",2);$("#note_path").val($(this).attr("data-rel"));a.I($("#save_dialog"),$(this).attr("data-rel"))})}})};atnotes.prototype.J=function(c){if(c.val().length==0){c.val("Untitled note")}$("#save_dialog").dialog("open")};atnotes.prototype.K=function(i,c,h){c.val(i.find("div.atnotes-elt-title").text());c.attr("rel",i.attr("rel"));h.html(i.find("div.atnotes-elt-prerender").html())};atnotes.prototype.N=function(c){$(".active").removeClass("active");if(c==1){$("ul.atnotes-noteslist").prepend('<li class="atnotes-elt active unsaved" rel="0"><div class="atnotes-elt-title">'+$("#note_title").val()+'</div><div class="atnotes-elt-state">Unsaved</div><div class="atnotes-elt-date">'+this.B()+'</div><div class="atnotes-elt-prerender">'+$(".jqte_Content").html()+"</div></li>")}else{$("ul.atnotes-noteslist").prepend('<li class="atnotes-elt active unsaved" rel="0"><div class="atnotes-elt-title">New note</div><div class="atnotes-elt-state">Unsaved</div><div class="atnotes-elt-date">'+this.B()+'</div><div class="atnotes-elt-prerender"></div></li>');this.E(0,0)}$("ul.atnotes-noteslist li.atnotes-elt.active").bind("click",function(){$(".active").removeClass("active");$(this).addClass("active");A.K($(this),$("#note_title"),$(".jqte_Content"))});$(window).bind("beforeunload",function(){return false})};atnotes.prototype.W=function(c,b){c.css("width",$("#content").width()-$(".atnotes-noteslist").width()-b+"px")}}}$(document).ready(function(){A=new atnotes();$(".atnotes-editor").jqte();$(window).resize(function(){A.H($(".atnotes-noteslist"),36);A.W($(".atnotes-notesedit"),0);A.H($(".jqte"),75);A.W($(".jqte"),0);A.H($(".jqte_Content"),122);A.W($(".jqte_Content"),0);$("#note_title").css("width",$(".anotes-notesedit-title").width()-70+"px")});$(window).trigger("resize");$("#save_dialog").dialog({autoOpen:false,height:300,width:550,modal:true,resizable:false,buttons:{Cancel:function(){$("#save_dialog").dialog("close")},Ok:function(){if($("#note_path").val().length==0){$("#note_path").val("/")}A.G($("#note_path"),$("#note_title"),$(".jqte_Content"))}},open:function(g,e){A.I($(this))}});$("#note_title").change(function(){A.A($(this),$(".jqte_Content"))});$("#note_title").keyup(function(){$(this).change()});$(".jqte_Content").keyup(function(){A.C($(this),$("#note_title"))});$(".atnotes-actions-btns img.atnotes-save").bind("click",function(){A.F($("#note_title"),$(".jqte_Content"))});$(".atnotes-elt").bind("click",function(){$(".active").removeClass("active");$(this).addClass("active");A.K($(this),$("#note_title"),$(".jqte_Content"))});$(".atnotes-actions-list").qtip({prerender:true,overwrite:false,content:{text:$(".atnotes-actions-ddmenu").html()},position:{my:"top right",at:"bottom right"},events:{show:function(g,e){$(".atnotes-delete").bind("click",function(){A.D()});$(".atnotes-new").bind("click",function(){A.N(0)})},hide:function(g,e){$(".atnotes-delete").unbind("click");$(".atnotes-new").unbind("click")}},hide:{delay:100,event:"unfocus mouseleave",fixed:true},style:{classes:"ui-tooltip-shadow ui-tooltip-rounded ui-tooltip-youtube",tip:false,width:150}});$("#note_title").focus()});
\ No newline at end of file
diff --git a/apps/atnotes/js/jquery-te-1.0.3.min.js b/apps/atnotes/js/jquery-te-1.0.3.min.js
deleted file mode 100644
index b94db89e8e..0000000000
--- a/apps/atnotes/js/jquery-te-1.0.3.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * http://jqueryte.com
- * jQuery TE 1.0.3
- * Copyright (C) 2012, Fatih Koca (fatihkoca@me.com), AUTHOR.txt (http://jqueryte.com/about)
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program 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 General Public License for more details.
-You should have received a copy of the GNU General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
-(function(a){a.fn.jqte=function(b){var c=a.extend({css:"jqte",b:true,i:true,u:true,ol:true,ul:true,sub:true,sup:true,strike:true,remove:true,rule:true},b);var d=a.extend({b:{cls:"bold",command:"Bold",key:"B",tags:["b","strong"]},i:{cls:"italic",command:"Italic",key:"I",tags:["i","em"]},u:{cls:"underline",command:"Underline",key:"U",tags:["u"]},ol:{cls:"orderedlist",command:"insertorderedlist",key:"O",tags:["ol"]},ul:{cls:"unorderedlist",command:"insertunorderedlist",key:"F",tags:["ul"]},sub:{cls:"subscript",command:"subscript",key:"(",tags:["sub"]},sup:{cls:"superscript",command:"superscript",key:"&",tags:["sup"]},strike:{cls:"strike",command:"strikeThrough",key:"S",tags:["strike"]},remove:{cls:"remove",command:"removeformat",key:".",css:false},hr:{cls:"rule",command:"inserthorizontalrule",key:"H",tags:["hr"]}},b);return this.each(function(){function i(a){var b,c,d=navigator.userAgent.toLowerCase();if(window.getSelection){c=window.getSelection();if(c.getRangeAt){b=c.getRangeAt(0)}if(b){c.removeAllRanges();c.addRange(b)}if(!d.match(/msie/))document.execCommand("StyleWithCSS",false,false);document.execCommand(a,false,null)}else if(document.selection&&document.selection.createRange&&document.selection.type!="None"){b=document.selection.createRange();b.execCommand(a,false,null)}}function k(b,c){var d=false,e=j(),f,g;a.each(b,function(b,c){f=e.prop("tagName").toLowerCase();g=e.attr("style");if(f==c)d=true;else{e.parents().each(function(){f=a(this).prop("tagName").toLowerCase();if(f==c)d=true})}});return d}function l(b){if(c.b)k(d.b.tags,d.b.css)?f.find("."+d.b.cls).addClass(h):a("."+d.b.cls).removeClass(h);if(c.i)k(d.i.tags,d.i.css)?f.find("."+d.i.cls).addClass(h):a("."+d.i.cls).removeClass(h);if(c.u)k(d.u.tags,d.u.css)?f.find("."+d.u.cls).addClass(h):a("."+d.u.cls).removeClass(h);if(c.ol)k(d.ol.tags,d.ol.css)?f.find("."+d.ol.cls).addClass(h):a("."+d.ol.cls).removeClass(h);if(c.ul)k(d.ul.tags,d.ul.css)?f.find("."+d.ul.cls).addClass(h):a("."+d.ul.cls).removeClass(h);if(c.sub)k(d.sub.tags,d.sub.css)?f.find("."+d.sub.cls).addClass(h):a("."+d.sub.cls).removeClass(h);if(c.sup)k(d.sup.tags,d.sup.css)?f.find("."+d.sup.cls).addClass(h):a("."+d.sup.cls).removeClass(h);if(c.strike)k(d.strike.tags,d.strike.css)?f.find("."+d.strike.cls).addClass(h):a("."+d.strike.cls).removeClass(h)}function m(){var a=g.html().replace(/<p><\/p>/g,"").replace(/ /g," ").replace(/<p> <\/p>/g,""),c,d;c=[/\<div>(.*?)\<\/div>/ig,/\<br>(.*?)\<br>/ig,/\<br\/>(.*?)\<br\/>/ig,/\<strong>(.*?)\<\/strong>/ig,/\<em>(.*?)\<\/em>/ig];d=["<p>$1</p>","<p>$1</p>","<p>$1</p>","<b>$1</b>","<i>$1</i>"];for(var e=0;e<c.length;e++){a=a.replace(c[e],d[e])}b.val(g.html())}var b=a(this);b.hide().before('<div class="'+c.css+'" ></div>');var e=b.prev("."+c.css);e.html('<div class="'+c.css+"_Panel"+'" unselectable="on"></div> <div class="'+c.css+"_Content"+'" contenteditable="true"></div>');var f=e.find("."+c.css+"_Panel");var g=e.find("."+c.css+"_Content");var h=c.css+"_Active";g.html(b.val());f.bind("selectstart mousedown",function(a){a.preventDefault()});if(c.b)f.append('<a class="'+d.b.cls+'" toggletag="'+d.b.command+'" unselectable="on"></a>');if(c.i)f.append('<a class="'+d.i.cls+'" toggletag="'+d.i.command+'" unselectable="on"></a>');if(c.u)f.append('<a class="'+d.u.cls+'" toggletag="'+d.u.command+'" unselectable="on"></a>');if(c.ol)f.append('<a class="'+d.ol.cls+'" toggletag="'+d.ol.command+'" unselectable="on"></a>');if(c.ul)f.append('<a class="'+d.ul.cls+'" toggletag="'+d.ul.command+'" unselectable="on"></a>');if(c.sub)f.append('<a class="'+d.sub.cls+'" toggletag="'+d.sub.command+'" unselectable="on"></a>');if(c.sup)f.append('<a class="'+d.sup.cls+'" toggletag="'+d.sup.command+'" unselectable="on"></a>');if(c.strike)f.append('<a class="'+d.strike.cls+'" toggletag="'+d.strike.command+'" unselectable="on"></a>');if(c.remove)f.append('<a class="'+d.remove.cls+'" toggletag="'+d.remove.command+'" unselectable="on"></a>');if(c.rule)f.append('<a class="'+d.hr.cls+'" toggletag="'+d.hr.command+'" unselectable="on"></a>');g.focusout(function(){f.find("a").removeClass(h)});var j=function(){var b,c;if(window.getSelection){c=getSelection();b=c.anchorNode}if(!b&&document.selection){c=document.selection;var d=c.getRangeAt?c.getRangeAt(0):c.createRange();b=d.commonAncestorContainer?d.commonAncestorContainer:d.parentElement?d.parentElement():d.item(0)}if(b){return b.nodeName=="#text"?a(b.parentNode):a(b)}};g.bind("mouseup keyup",l);f.find("a").click(function(){$('.jqte_Content').focus();i(a(this).attr("toggletag"));m();a(this).hasClass(h)||a(this).is("[toggletag="+d.remove.command+"]")||a(this).is("[toggletag="+d.hr.command+"]")?a(this).removeClass(h):a(this).addClass(h)});a.ctrl=function(a,b,c){var d=false;g.keydown(function(e){if(!c)c=[];if(e.ctrlKey)d=true;if(e.keyCode==a.charCodeAt(0)&&d){b.apply(this,c);return false}}).keyup(function(a){if(a.ctrlKey)d=false})};a.ctrl(d.b.key,function(){i(d.b.command)});a.ctrl(d.i.key,function(){i(d.i.command)});a.ctrl(d.u.key,function(){i(d.u.command)});a.ctrl(d.ol.key,function(){i(d.ol.command)});a.ctrl(d.ul.key,function(){i(d.ul.command)});a.ctrl(d.sub.key,function(){i(d.sub.command)});a.ctrl(d.sup.key,function(){i(d.sup.command)});a.ctrl(d.strike.key,function(){i(d.strike.command)});a.ctrl(d.remove.key,function(){i(d.remove.command)});a.ctrl(d.hr.key,function(){i(d.hr.command)});g.bind("keypress keyup keydown drop",function(){setTimeout(m,0)})})}})(jQuery)
\ No newline at end of file
diff --git a/apps/atnotes/js/jquery.qtip.min.js b/apps/atnotes/js/jquery.qtip.min.js
deleted file mode 100644
index 5be4613f94..0000000000
--- a/apps/atnotes/js/jquery.qtip.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* qTip2 - Pretty powerful tooltips
-* http://craigsworks.com/projects/qtip2/
-*
-* Version: nightly
-* Copyright 2009-2010 Craig Michael Thompson - http://craigsworks.com
-*
-* Dual licensed under MIT or GPLv2 licenses
-*   http://en.wikipedia.org/wiki/MIT_License
-*   http://en.wikipedia.org/wiki/GNU_General_Public_License
-*
-* Date: Sun May 13 12:07:36.0000000000 2012
-*//*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true *//*global window: false, jQuery: false, console: false, define: false */(function(a){typeof define==="function"&&define.amd?define(["jquery"],a):a(jQuery)})(function(a){function y(e,h){var i,j,k,l,m,n=a(this),o=a(document.body),p=this===document?o:n,q=n.metadata?n.metadata(h.metadata):d,r=h.metadata.type==="html5"&&q?q[h.metadata.name]:d,s=n.data(h.metadata.name||"qtipopts");try{s=typeof s==="string"?(new Function("return "+s))():s}catch(u){v("Unable to parse HTML5 attribute data: "+s)}l=a.extend(b,{},f.defaults,h,typeof s==="object"?w(s):d,w(r||q)),j=l.position,l.id=e;if("boolean"===typeof l.content.text){k=n.attr(l.content.attr);if(l.content.attr!==c&&k)l.content.text=k;else{v("Unable to locate content for tooltip! Aborting render of tooltip on element: ",n);return c}}j.container.length||(j.container=o),j.target===c&&(j.target=p),l.show.target===c&&(l.show.target=p),l.show.solo===b&&(l.show.solo=j.container.closest("body")),l.hide.target===c&&(l.hide.target=p),l.position.viewport===b&&(l.position.viewport=j.container),j.container=j.container.eq(0),j.at=new g.Corner(j.at),j.my=new g.Corner(j.my);if(a.data(this,"qtip"))if(l.overwrite)n.qtip("destroy");else if(l.overwrite===c)return c;l.suppress&&(m=a.attr(this,"title"))&&a(this).removeAttr("title").attr(t,m),i=new x(n,l,e,!!k),a.data(this,"qtip",i),n.bind("remove.qtip-"+e+" removeqtip.qtip-"+e,function(){i.destroy()});return i}function x(r,s,v,x){function Q(){var b=[s.show.target[0],s.hide.target[0],y.rendered&&F.tooltip[0],s.position.container[0],s.position.viewport[0],window,document];y.rendered?a([]).pushStack(a.grep(b,function(a){return typeof a==="object"})).unbind(E):s.show.target.unbind(E+"-create")}function P(){function o(a){y.rendered&&D[0].offsetWidth>0&&y.reposition(a)}function n(a){if(D.hasClass(l))return c;clearTimeout(y.timers.inactive),y.timers.inactive=setTimeout(function(){y.hide(a)},s.hide.inactive)}function k(b){if(D.hasClass(l)||B||C)return c;var f=a(b.relatedTarget||b.target),g=f.closest(m)[0]===D[0],h=f[0]===e.show[0];clearTimeout(y.timers.show),clearTimeout(y.timers.hide);if(d.target==="mouse"&&g||s.hide.fixed&&(/mouse(out|leave|move)/.test(b.type)&&(g||h)))try{b.preventDefault(),b.stopImmediatePropagation()}catch(i){}else s.hide.delay>0?y.timers.hide=setTimeout(function(){y.hide(b)},s.hide.delay):y.hide(b)}function j(a){if(D.hasClass(l))return c;clearTimeout(y.timers.show),clearTimeout(y.timers.hide);var d=function(){y.toggle(b,a)};s.show.delay>0?y.timers.show=setTimeout(d,s.show.delay):d()}var d=s.position,e={show:s.show.target,hide:s.hide.target,viewport:a(d.viewport),document:a(document),body:a(document.body),window:a(window)},g={show:a.trim(""+s.show.event).split(" "),hide:a.trim(""+s.hide.event).split(" ")},i=a.browser.msie&&parseInt(a.browser.version,10)===6;D.bind("mouseenter"+E+" mouseleave"+E,function(a){var b=a.type==="mouseenter";b&&y.focus(a),D.toggleClass(p,b)}),s.hide.fixed&&(e.hide=e.hide.add(D),D.bind("mouseover"+E,function(){D.hasClass(l)||clearTimeout(y.timers.hide)})),/mouse(out|leave)/i.test(s.hide.event)?s.hide.leave==="window"&&e.window.bind("mouseout"+E+" blur"+E,function(a){/select|option/.test(a.target)&&!a.relatedTarget&&y.hide(a)}):/mouse(over|enter)/i.test(s.show.event)&&e.hide.bind("mouseleave"+E,function(a){clearTimeout(y.timers.show)}),(""+s.hide.event).indexOf("unfocus")>-1&&d.container.closest("html").bind("mousedown"+E,function(b){var c=a(b.target),d=y.rendered&&!D.hasClass(l)&&D[0].offsetWidth>0,e=c.parents(m).filter(D[0]).length>0;c[0]!==r[0]&&c[0]!==D[0]&&!e&&!r.has(c[0]).length&&!c.attr("disabled")&&y.hide(b)}),"number"===typeof s.hide.inactive&&(e.show.bind("qtip-"+v+"-inactive",n),a.each(f.inactiveEvents,function(a,b){e.hide.add(F.tooltip).bind(b+E+"-inactive",n)})),a.each(g.hide,function(b,c){var d=a.inArray(c,g.show),f=a(e.hide);d>-1&&f.add(e.show).length===f.length||c==="unfocus"?(e.show.bind(c+E,function(a){D[0].offsetWidth>0?k(a):j(a)}),delete g.show[d]):e.hide.bind(c+E,k)}),a.each(g.show,function(a,b){e.show.bind(b+E,j)}),"number"===typeof s.hide.distance&&e.show.add(D).bind("mousemove"+E,function(a){var b=G.origin||{},c=s.hide.distance,d=Math.abs;(d(a.pageX-b.pageX)>=c||d(a.pageY-b.pageY)>=c)&&y.hide(a)}),d.target==="mouse"&&(e.show.bind("mousemove"+E,function(a){h={pageX:a.pageX,pageY:a.pageY,type:"mousemove"}}),d.adjust.mouse&&(s.hide.event&&(D.bind("mouseleave"+E,function(a){(a.relatedTarget||a.target)!==e.show[0]&&y.hide(a)}),F.target.bind("mouseenter"+E+" mouseleave"+E,function(a){G.onTarget=a.type==="mouseenter"})),e.document.bind("mousemove"+E,function(a){y.rendered&&G.onTarget&&!D.hasClass(l)&&D[0].offsetWidth>0&&y.reposition(a||h)}))),(d.adjust.resize||e.viewport.length)&&(a.event.special.resize?e.viewport:e.window).bind("resize"+E,o),(e.viewport.length||i&&D.css("position")==="fixed")&&e.viewport.bind("scroll"+E,o)}function O(b,d){function g(b){function i(e){e&&(delete h[e.src],clearTimeout(y.timers.img[e.src]),a(e).unbind(E)),a.isEmptyObject(h)&&(y.redraw(),d!==c&&y.reposition(G.event),b())}var g,h={};if((g=f.find("img[src]:not([height]):not([width])")).length===0)return i();g.each(function(b,c){if(h[c.src]===e){var d=0,f=3;(function g(){if(c.height||c.width||d>f)return i(c);d+=1,y.timers.img[c.src]=setTimeout(g,700)})(),a(c).bind("error"+E+" load"+E,function(){i(this)}),h[c.src]=c}})}var f=F.content;if(!y.rendered||!b)return c;a.isFunction(b)&&(b=b.call(r,G.event,y)||""),b.jquery&&b.length>0?f.empty().append(b.css({display:"block"})):f.html(b),y.rendered<0?D.queue("fx",g):(C=0,g(a.noop));return y}function N(b,d){var e=F.title;if(!y.rendered||!b)return c;a.isFunction(b)&&(b=b.call(r,G.event,y));if(b===c||!b&&b!=="")return J(c);b.jquery&&b.length>0?e.empty().append(b.css({display:"block"})):e.html(b),y.redraw(),d!==c&&y.rendered&&D[0].offsetWidth>0&&y.reposition(G.event)}function M(a){var b=F.button,d=F.title;if(!y.rendered)return c;a?(d||L(),K()):b.remove()}function L(){var c=A+"-title";F.titlebar&&J(),F.titlebar=a("<div />",{"class":j+"-titlebar "+(s.style.widget?"ui-widget-header":"")}).append(F.title=a("<div />",{id:c,"class":j+"-title","aria-atomic":b})).insertBefore(F.content).delegate(".ui-tooltip-close","mousedown keydown mouseup keyup mouseout",function(b){a(this).toggleClass("ui-state-active ui-state-focus",b.type.substr(-4)==="down")}).delegate(".ui-tooltip-close","mouseover mouseout",function(b){a(this).toggleClass("ui-state-hover",b.type==="mouseover")}),s.content.title.button?K():y.rendered&&y.redraw()}function K(){var b=s.content.title.button,d=typeof b==="string",e=d?b:"Close tooltip";F.button&&F.button.remove(),b.jquery?F.button=b:F.button=a("<a />",{"class":"ui-state-default ui-tooltip-close "+(s.style.widget?"":j+"-icon"),title:e,"aria-label":e}).prepend(a("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),F.button.appendTo(F.titlebar).attr("role","button").click(function(a){D.hasClass(l)||y.hide(a);return c}),y.redraw()}function J(a){F.title&&(F.titlebar.remove(),F.titlebar=F.title=F.button=d,a!==c&&y.reposition())}function I(){var a=s.style.widget;D.toggleClass(k,a).toggleClass(n,s.style.def&&!a),F.content.toggleClass(k+"-content",a),F.titlebar&&F.titlebar.toggleClass(k+"-header",a),F.button&&F.button.toggleClass(j+"-icon",!a)}function H(a){var b=0,c,d=s,e=a.split(".");while(d=d[e[b++]])b<e.length&&(c=d);return[c||s,e.pop()]}var y=this,z=document.body,A=j+"-"+v,B=0,C=0,D=a(),E=".qtip-"+v,F,G;y.id=v,y.destroyed=y.rendered=c,y.elements=F={target:r},y.timers={img:{}},y.options=s,y.checks={},y.plugins={},y.cache=G={event:{},target:a(),disabled:c,attr:x,onTarget:c},y.checks.builtin={"^id$":function(d,e,g){var h=g===b?f.nextid:g,i=j+"-"+h;h!==c&&h.length>0&&!a("#"+i).length&&(D[0].id=i,F.content[0].id=i+"-content",F.title[0].id=i+"-title")},"^content.text$":function(a,b,c){O(c)},"^content.title.text$":function(a,b,c){if(!c)return J();!F.title&&c&&L(),N(c)},"^content.title.button$":function(a,b,c){M(c)},"^position.(my|at)$":function(a,b,c){"string"===typeof c&&(a[b]=new g.Corner(c))},"^position.container$":function(a,b,c){y.rendered&&D.appendTo(c)},"^show.ready$":function(){y.rendered?y.toggle(b):y.render(1)},"^style.classes$":function(a,b,c){D.attr("class",j+" qtip ui-helper-reset "+c)},"^style.widget|content.title":I,"^events.(render|show|move|hide|focus|blur)$":function(b,c,d){D[(a.isFunction(d)?"":"un")+"bind"]("tooltip"+c,d)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){var a=s.position;D.attr("tracking",a.target==="mouse"&&a.adjust.mouse),Q(),P()}},a.extend(y,{render:function(d){if(y.rendered)return y;var e=s.content.text,f=s.content.title.text,h=s.position,i=a.Event("tooltiprender");a.attr(r[0],"aria-describedby",A),D=F.tooltip=a("<div/>",{id:A,"class":j+" qtip ui-helper-reset "+n+" "+s.style.classes+" "+j+"-pos-"+s.position.my.abbrev(),width:s.style.width||"",height:s.style.height||"",tracking:h.target==="mouse"&&h.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":c,"aria-describedby":A+"-content","aria-hidden":b}).toggleClass(l,G.disabled).data("qtip",y).appendTo(s.position.container).append(F.content=a("<div />",{"class":j+"-content",id:A+"-content","aria-atomic":b})),y.rendered=-1,B=C=1,f&&(L(),a.isFunction(f)||N(f,c)),a.isFunction(e)||O(e,c),y.rendered=b,I(),a.each(s.events,function(b,c){a.isFunction(c)&&D.bind(b==="toggle"?"tooltipshow tooltiphide":"tooltip"+b,c)}),a.each(g,function(){this.initialize==="render"&&this(y)}),P(),D.queue("fx",function(a){i.originalEvent=G.event,D.trigger(i,[y]),B=C=0,y.redraw(),(s.show.ready||d)&&y.toggle(b,G.event,c),a()});return y},get:function(a){var b,c;switch(a.toLowerCase()){case"dimensions":b={height:D.outerHeight(),width:D.outerWidth()};break;case"offset":b=g.offset(D,s.position.container);break;default:c=H(a.toLowerCase()),b=c[0][c[1]],b=b.precedance?b.string():b}return b},set:function(e,f){function m(a,b){var c,d,e;for(c in k)for(d in k[c])if(e=(new RegExp(d,"i")).exec(a))b.push(e),k[c][d].apply(y,b)}var g=/^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,h=/^content\.(title|attr)|style/i,i=c,j=c,k=y.checks,l;"string"===typeof e?(l=e,e={},e[l]=f):e=a.extend(b,{},e),a.each(e,function(b,c){var d=H(b.toLowerCase()),f;f=d[0][d[1]],d[0][d[1]]="object"===typeof c&&c.nodeType?a(c):c,e[b]=[d[0],d[1],c,f],i=g.test(b)||i,j=h.test(b)||j}),w(s),B=C=1,a.each(e,m),B=C=0,y.rendered&&D[0].offsetWidth>0&&(i&&y.reposition(s.position.target==="mouse"?d:G.event),j&&y.redraw());return y},toggle:function(e,f){function t(){e?(a.browser.msie&&D[0].style.removeAttribute("filter"),D.css("overflow",""),"string"===typeof i.autofocus&&a(i.autofocus,D).focus(),i.target.trigger("qtip-"+v+"-inactive")):D.css({display:"",visibility:"",opacity:"",left:"",top:""}),r=a.Event("tooltip"+(e?"visible":"hidden")),r.originalEvent=f?G.event:d,D.trigger(r,[y])}if(!y.rendered)return e?y.render(1):y;var g=e?"show":"hide",i=s[g],j=s[e?"hide":"show"],k=s.position,l=s.content,n=D[0].offsetWidth>0,o=e||i.target.length===1,p=!f||i.target.length<2||G.target[0]===f.target,q,r;(typeof e).search("boolean|number")&&(e=!n);if(!D.is(":animated")&&n===e&&p)return y;if(f){if(/over|enter/.test(f.type)&&/out|leave/.test(G.event.type)&&s.show.target.add(f.target).length===s.show.target.length&&D.has(f.relatedTarget).length)return y;G.event=a.extend({},f)}r=a.Event("tooltip"+g),r.originalEvent=f?G.event:d,D.trigger(r,[y,90]);if(r.isDefaultPrevented())return y;a.attr(D[0],"aria-hidden",!e),e?(G.origin=a.extend({},h),y.focus(f),a.isFunction(l.text)&&O(l.text,c),a.isFunction(l.title.text)&&N(l.title.text,c),!u&&k.target==="mouse"&&k.adjust.mouse&&(a(document).bind("mousemove.qtip",function(a){h={pageX:a.pageX,pageY:a.pageY,type:"mousemove"}}),u=b),y.reposition(f,arguments[2]),(r.solo=!!i.solo)&&a(m,i.solo).not(D).qtip("hide",r)):(clearTimeout(y.timers.show),delete G.origin,u&&!a(m+'[tracking="true"]:visible',i.solo).not(D).length&&(a(document).unbind("mousemove.qtip"),u=c),y.blur(f)),i.effect===c||o===c?(D[g](),t.call(D)):a.isFunction(i.effect)?(D.stop(1,1),i.effect.call(D,y),D.queue("fx",function(a){t(),a()})):D.fadeTo(90,e?1:0,t),e&&i.target.trigger("qtip-"+v+"-inactive");return y},show:function(a){return y.toggle(b,a)},hide:function(a){return y.toggle(c,a)},focus:function(b){if(!y.rendered)return y;var c=a(m),d=parseInt(D[0].style.zIndex,10),e=f.zindex+c.length,g=a.extend({},b),h,i;D.hasClass(o)||(i=a.Event("tooltipfocus"),i.originalEvent=g,D.trigger(i,[y,e]),i.isDefaultPrevented()||(d!==e&&(c.each(function(){this.style.zIndex>d&&(this.style.zIndex=this.style.zIndex-1)}),c.filter("."+o).qtip("blur",g)),D.addClass(o)[0].style.zIndex=e));return y},blur:function(b){var c=a.extend({},b),d;D.removeClass(o),d=a.Event("tooltipblur"),d.originalEvent=c,D.trigger(d,[y]);return y},reposition:function(b,d){if(!y.rendered||B)return y;B=1;var e=s.position.target,f=s.position,i=f.my,k=f.at,l=f.adjust,m=l.method.split(" "),n=D.outerWidth(),o=D.outerHeight(),p=0,q=0,r=a.Event("tooltipmove"),t=D.css("position")==="fixed",u=f.viewport,v={left:0,top:0},w=f.container,x=c,A=y.plugins.tip,C=D[0].offsetWidth>0,E={horizontal:m[0],vertical:m[1]=m[1]||m[0],enabled:u.jquery&&e[0]!==window&&e[0]!==z&&l.method!=="none",left:function(a){var b=E.horizontal==="shift",c=l.x*(E.horizontal.substr(-6)==="invert"?2:0),d=-w.offset.left+u.offset.left+u.scrollLeft,e=i.x==="left"?n:i.x==="right"?-n:-n/2,f=k.x==="left"?p:k.x==="right"?-p:-p/2,g=A&&A.size?A.size.width||0:0,h=A&&A.corner&&A.corner.precedance==="x"&&!b?g:0,j=d-a+h,m=a+n-u.width-d+h,o=e-(i.precedance==="x"||i.x===i.y?f:0)-(k.x==="center"?p/2:0),q=i.x==="center";b?(h=A&&A.corner&&A.corner.precedance==="y"?g:0,o=(i.x==="left"?1:-1)*e-h,v.left+=j>0?j:m>0?-m:0,v.left=Math.max(-w.offset.left+u.offset.left+(h&&A.corner.x==="center"?A.offset:0),a-o,Math.min(Math.max(-w.offset.left+u.offset.left+u.width,a+o),v.left))):(j>0&&(i.x!=="left"||m>0)?v.left-=o+c:m>0&&(i.x!=="right"||j>0)&&(v.left-=(q?-o:o)+c),v.left<d&&-v.left>m&&(v.left=a));return v.left-a},top:function(a){var b=E.vertical==="shift",c=l.y*(E.vertical.substr(-6)==="invert"?2:0),d=-w.offset.top+u.offset.top+u.scrollTop,e=i.y==="top"?o:i.y==="bottom"?-o:-o/2,f=k.y==="top"?q:k.y==="bottom"?-q:-q/2,g=A&&A.size?A.size.height||0:0,h=A&&A.corner&&A.corner.precedance==="y"&&!b?g:0,j=d-a+h,m=a+o-u.height-d+h,n=e-(i.precedance==="y"||i.x===i.y?f:0)-(k.y==="center"?q/2:0),p=i.y==="center";b?(h=A&&A.corner&&A.corner.precedance==="x"?g:0,n=(i.y==="top"?1:-1)*e-h,v.top+=j>0?j:m>0?-m:0,v.top=Math.max(-w.offset.top+u.offset.top+(h&&A.corner.x==="center"?A.offset:0),a-n,Math.min(Math.max(-w.offset.top+u.offset.top+u.height,a+n),v.top))):(j>0&&(i.y!=="top"||m>0)?v.top-=n+c:m>0&&(i.y!=="bottom"||j>0)&&(v.top-=(p?-n:n)+c),v.top<0&&-v.top>m&&(v.top=a));return v.top-a}},H;if(a.isArray(e)&&e.length===2)k={x:"left",y:"top"},v={left:e[0],top:e[1]};else if(e==="mouse"&&(b&&b.pageX||G.event.pageX))k={x:"left",y:"top"},b=(b&&(b.type==="resize"||b.type==="scroll")?G.event:b&&b.pageX&&b.type==="mousemove"?b:h&&h.pageX&&(l.mouse||!b||!b.pageX)?{pageX:h.pageX,pageY:h.pageY}:!l.mouse&&G.origin&&G.origin.pageX&&s.show.distance?G.origin:b)||b||G.event||h||{},v={top:b.pageY,left:b.pageX};else{e==="event"?b&&b.target&&b.type!=="scroll"&&b.type!=="resize"?e=G.target=a(b.target):e=G.target:e=G.target=a(e.jquery?e:F.target),e=a(e).eq(0);if(e.length===0)return y;e[0]===document||e[0]===window?(p=g.iOS?window.innerWidth:e.width(),q=g.iOS?window.innerHeight:e.height(),e[0]===window&&(v={top:(u||e).scrollTop(),left:(u||e).scrollLeft()})):e.is("area")&&g.imagemap?v=g.imagemap(e,k,E.enabled?m:c):e[0].namespaceURI==="http://www.w3.org/2000/svg"&&g.svg?v=g.svg(e,k):(p=e.outerWidth(),q=e.outerHeight(),v=g.offset(e,w)),v.offset&&(p=v.width,q=v.height,x=v.flipoffset,v=v.offset);if(g.iOS<4.1&&g.iOS>3.1||g.iOS==4.3||!g.iOS&&t)H=a(window),v.left-=H.scrollLeft(),v.top-=H.scrollTop();v.left+=k.x==="right"?p:k.x==="center"?p/2:0,v.top+=k.y==="bottom"?q:k.y==="center"?q/2:0}v.left+=l.x+(i.x==="right"?-n:i.x==="center"?-n/2:0),v.top+=l.y+(i.y==="bottom"?-o:i.y==="center"?-o/2:0),E.enabled?(u={elem:u,height:u[(u[0]===window?"h":"outerH")+"eight"](),width:u[(u[0]===window?"w":"outerW")+"idth"](),scrollLeft:t?0:u.scrollLeft(),scrollTop:t?0:u.scrollTop(),offset:u.offset()||{left:0,top:0}},w={elem:w,scrollLeft:w.scrollLeft(),scrollTop:w.scrollTop(),offset:w.offset()||{left:0,top:0}},v.adjusted={left:E.horizontal!=="none"?E.left(v.left):0,top:E.vertical!=="none"?E.top(v.top):0},v.adjusted.left+v.adjusted.top&&D.attr("class",D[0].className.replace(/ui-tooltip-pos-\w+/i,j+"-pos-"+i.abbrev())),x&&v.adjusted.left&&(v.left+=x.left),x&&v.adjusted.top&&(v.top+=x.top)):v.adjusted={left:0,top:0},r.originalEvent=a.extend({},b),D.trigger(r,[y,v,u.elem||u]);if(r.isDefaultPrevented())return y;delete v.adjusted,d===c||!C||isNaN(v.left)||isNaN(v.top)||e==="mouse"||!a.isFunction(f.effect)?D.css(v):a.isFunction(f.effect)&&(f.effect.call(D,y,a.extend({},v)),D.queue(function(b){a(this).css({opacity:"",height:""}),a.browser.msie&&this.style.removeAttribute("filter"),b()})),B=0;return y},redraw:function(){if(y.rendered<1||C)return y;var a=s.position.container,b,c,d,e;C=1,s.style.height&&D.css("height",s.style.height),s.style.width?D.css("width",s.style.width):(D.css("width","").addClass(q),c=D.width()+1,d=D.css("max-width")||"",e=D.css("min-width")||"",b=(d+e).indexOf("%")>-1?a.width()/100:0,d=(d.indexOf("%")>-1?b:1)*parseInt(d,10)||c,e=(e.indexOf("%")>-1?b:1)*parseInt(e,10)||0,c=d+e?Math.min(Math.max(c,e),d):c,D.css("width",Math.round(c)).removeClass(q)),C=0;return y},disable:function(b){"boolean"!==typeof b&&(b=!D.hasClass(l)&&!G.disabled),y.rendered?(D.toggleClass(l,b),a.attr(D[0],"aria-disabled",b)):G.disabled=!!b;return y},enable:function(){return y.disable(c)},destroy:function(){var c=r[0],d=a.attr(c,t),e=r.data("qtip");y.destroyed=b,y.rendered&&(D.stop(1,0).remove(),a.each(y.plugins,function(){this.destroy&&this.destroy()})),clearTimeout(y.timers.show),clearTimeout(y.timers.hide),Q();if(!e||y===e)a.removeData(c,"qtip"),s.suppress&&d&&(a.attr(c,"title",d),r.removeAttr(t)),r.removeAttr("aria-describedby");r.unbind(".qtip-"+v),delete i[y.id];return r}})}function w(b){var e;if(!b||"object"!==typeof b)return c;if(b.metadata===d||"object"!==typeof b.metadata)b.metadata={type:b.metadata};if("content"in b){if(b.content===d||"object"!==typeof b.content||b.content.jquery)b.content={text:b.content};e=b.content.text||c,!a.isFunction(e)&&(!e&&!e.attr||e.length<1||"object"===typeof e&&!e.jquery)&&(b.content.text=c);if("title"in b.content){if(b.content.title===d||"object"!==typeof b.content.title)b.content.title={text:b.content.title};e=b.content.title.text||c,!a.isFunction(e)&&(!e&&!e.attr||e.length<1||"object"===typeof e&&!e.jquery)&&(b.content.title.text=c)}}if("position"in b)if(b.position===d||"object"!==typeof b.position)b.position={my:b.position,at:b.position};if("show"in b)if(b.show===d||"object"!==typeof b.show)b.show.jquery?b.show={target:b.show}:b.show={event:b.show};if("hide"in b)if(b.hide===d||"object"!==typeof b.hide)b.hide.jquery?b.hide={target:b.hide}:b.hide={event:b.hide};if("style"in b)if(b.style===d||"object"!==typeof b.style)b.style={classes:b.style};a.each(g,function(){this.sanitize&&this.sanitize(b)});return b}function v(){v.history=v.history||[],v.history.push(arguments);if("object"===typeof console){var a=console[console.warn?"warn":"log"],b=Array.prototype.slice.call(arguments),c;typeof arguments[0]==="string"&&(b[0]="qTip2: "+b[0]),c=a.apply?a.apply(console,b):a(b)}}"use strict";var b=!0,c=!1,d=null,e,f,g,h,i={},j="ui-tooltip",k="ui-widget",l="ui-state-disabled",m="div.qtip."+j,n=j+"-default",o=j+"-focus",p=j+"-hover",q=j+"-fluid",r="-31000px",s="_replacedByqTip",t="oldtitle",u;f=a.fn.qtip=function(g,h,i){var j=(""+g).toLowerCase(),k=d,l=a.makeArray(arguments).slice(1),m=l[l.length-1],n=this[0]?a.data(this[0],"qtip"):d;if(!arguments.length&&n||j==="api")return n;if("string"===typeof g){this.each(function(){var d=a.data(this,"qtip");if(!d)return b;m&&m.timeStamp&&(d.cache.event=m);if(j!=="option"&&j!=="options"||!h)d[j]&&d[j].apply(d[j],l);else if(a.isPlainObject(h)||i!==e)d.set(h,i);else{k=d.get(h);return c}});return k!==d?k:this}if("object"===typeof g||!arguments.length){n=w(a.extend(b,{},g));return f.bind.call(this,n,m)}},f.bind=function(d,j){return this.each(function(k){function r(b){function d(){p.render(typeof b==="object"||l.show.ready),m.show.add(m.hide).unbind(o)}if(p.cache.disabled)return c;p.cache.event=a.extend({},b),p.cache.target=b?a(b.target):[e],l.show.delay>0?(clearTimeout(p.timers.show),p.timers.show=setTimeout(d,l.show.delay),n.show!==n.hide&&m.hide.bind(n.hide,function(){clearTimeout(p.timers.show)})):d()}var l,m,n,o,p,q;q=a.isArray(d.id)?d.id[k]:d.id,q=!q||q===c||q.length<1||i[q]?f.nextid++:i[q]=q,o=".qtip-"+q+"-create",p=y.call(this,q,d);if(p===c)return b;l=p.options,a.each(g,function(){this.initialize==="initialize"&&this(p)}),m={show:l.show.target,hide:l.hide.target},n={show:a.trim(""+l.show.event).replace(/ /g,o+" ")+o,hide:a.trim(""+l.hide.event).replace(/ /g,o+" ")+o},/mouse(over|enter)/i.test(n.show)&&!/mouse(out|leave)/i.test(n.hide)&&(n.hide+=" mouseleave"+o),m.show.bind("mousemove"+o,function(a){h={pageX:a.pageX,pageY:a.pageY,type:"mousemove"},p.cache.onTarget=b}),m.show.bind(n.show,r),(l.show.ready||l.prerender)&&r(j)})},g=f.plugins={Corner:function(a){a=(""+a).replace(/([A-Z])/," $1").replace(/middle/gi,"center").toLowerCase(),this.x=(a.match(/left|right/i)||a.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(a.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase();var b=a.charAt(0);this.precedance=b==="t"||b==="b"?"y":"x",this.string=function(){return this.precedance==="y"?this.y+this.x:this.x+this.y},this.abbrev=function(){var a=this.x.substr(0,1),b=this.y.substr(0,1);return a===b?a:a==="c"||a!=="c"&&b!=="c"?b+a:a+b},this.clone=function(){return{x:this.x,y:this.y,precedance:this.precedance,string:this.string,abbrev:this.abbrev,clone:this.clone}}},offset:function(b,c){function j(a,b){d.left+=b*a.scrollLeft(),d.top+=b*a.scrollTop()}var d=b.offset(),e=b.closest("body")[0],f=c,g,h,i;if(f){do f.css("position")!=="static"&&(h=f.position(),d.left-=h.left+(parseInt(f.css("borderLeftWidth"),10)||0)+(parseInt(f.css("marginLeft"),10)||0),d.top-=h.top+(parseInt(f.css("borderTopWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0),!g&&(i=f.css("overflow"))!=="hidden"&&i!=="visible"&&(g=f));while((f=a(f[0].offsetParent)).length);g&&g[0]!==e&&j(g,1)}return d},iOS:parseFloat((""+(/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_","."))||c,fn:{attr:function(b,c){if(this.length){var d=this[0],e="title",f=a.data(d,"qtip");if(b===e&&f&&"object"===typeof f&&f.options.suppress){if(arguments.length<2)return a.attr(d,t);f&&f.options.content.attr===e&&f.cache.attr&&f.set("content.text",c);return this.attr(t,c)}}return a.fn["attr"+s].apply(this,arguments)},clone:function(b){var c=a([]),d="title",e=a.fn["clone"+s].apply(this,arguments);b||e.filter("["+t+"]").attr("title",function(){return a.attr(this,t)}).removeAttr(t);return e}}},a.each(g.fn,function(c,d){if(!d||a.fn[c+s])return b;var e=a.fn[c+s]=a.fn[c];a.fn[c]=function(){return d.apply(this,arguments)||e.apply(this,arguments)}}),a.ui||(a["cleanData"+s]=a.cleanData,a.cleanData=function(b){for(var c=0,d;(d=b[c])!==e;c++)try{a(d).triggerHandler("removeqtip")}catch(f){}a["cleanData"+s](b)}),f.version="nightly",f.nextid=0,f.inactiveEvents="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),f.zindex=15e3,f.defaults={prerender:c,id:c,overwrite:b,suppress:b,content:{text:b,attr:"title",title:{text:c,button:c}},position:{my:"top left",at:"bottom right",target:c,container:c,viewport:c,adjust:{x:0,y:0,mouse:b,resize:b,method:"flip flip"},effect:function(b,d,e){a(this).animate(d,{duration:200,queue:c})}},show:{target:c,event:"mouseenter",effect:b,delay:90,solo:c,ready:c,autofocus:c},hide:{target:c,event:"mouseleave",effect:b,delay:0,fixed:c,inactive:c,leave:"window",distance:c},style:{classes:"",widget:c,width:c,height:c,def:b},events:{render:d,move:d,show:d,hide:d,toggle:d,visible:d,hidden:d,focus:d,blur:d}}})
\ No newline at end of file
diff --git a/apps/atnotes/lib/atnotes.class.php b/apps/atnotes/lib/atnotes.class.php
deleted file mode 100644
index 42100004ed..0000000000
--- a/apps/atnotes/lib/atnotes.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-/**
- * This class manages atnote db. 
- */
-class OC_ATNotes {
-
-	/**
-	 * Save note
-	 * @param $title Title of the note
-	 * @param $content Content of the note
-	 * @return $id Id of the saved note
-	 */
-	public static function saveNote($id,$title,$content){
-		if($id == 0){
-			$query = OCP\DB::prepare('INSERT INTO *PREFIX*atnotes (oc_uid,create_ts,update_ts,note_title,note_content) VALUES (?,?,?,?,?)');
-			$query->execute(Array(OCP\User::getUser(),time(),time(),$title,$content));
-			$id = OCP\DB::insertid('*PREFIX*atnotes');
-		}else{
-			$query = OCP\DB::prepare('UPDATE *PREFIX*atnotes SET update_ts=?,note_title=?,note_content=? WHERE note_id=?');
-			$query->execute(Array(time(),$title,$content,$id));
-		}
-		return $id;
-	}
-	
-	/**
-	 * Get list
-	 * @return Array()
-	 */
-	public static function getNotesList(){
-		$query = OCP\DB::prepare('SELECT * FROM *PREFIX*atnotes WHERE oc_uid=? AND is_deleted=? ORDER BY update_ts DESC');
-		$results = $query->execute(Array(OCP\User::getUser(),0))->fetchAll();
-		return $results;
-	}
-	
-	/**
-	 * Get note
-	 * @param $id The note db id
-	 * @return Array if note found or Boolean FALSE
-	 */
-	public static function getNote($id){
-		$query = OCP\DB::prepare('SELECT * FROM *PREFIX*atnotes WHERE oc_uid=? AND is_deleted=? AND note_id=?');
-		$result = $query->execute(Array(OCP\User::getUser(),0,$id))->fetchRow();
-		if($result){
-			return $result;
-		}else{
-			return FALSE;
-		}
-	}
-	
-	/**
-	 * Delete note
-	 * @param $id The note db id
-	 * @return Boolean
-	 */
-	public static function deleteNote($id){
-		if(self::getNote($id)){
-			$query = OCP\DB::prepare('DELETE FROM *PREFIX*atnotes WHERE oc_uid=? AND note_id=?');
-			$query->execute(Array(OCP\User::getUser(),$id));
-			if(!self::getNote($id)){
-				return 0;
-			}
-		}
-		return 1;
-	}
-	
-}
diff --git a/apps/atnotes/templates/main.tpl.php b/apps/atnotes/templates/main.tpl.php
deleted file mode 100644
index 907785c4af..0000000000
--- a/apps/atnotes/templates/main.tpl.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
-* ownCloud - ATNotes plugin
-*
-* @author Xavier Beurois
-* @copyright 2012 Xavier Beurois www.djazz-lab.net
-* 
-* 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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\Util::addStyle('atnotes','jquery-te-1.0.3.min');
-OCP\Util::addScript('atnotes','jquery-te-1.0.3.min');
-OCP\Util::addStyle('atnotes','jquery.qtip.min');
-OCP\Util::addScript('atnotes','jquery.qtip.min');
-OCP\Util::addStyle('atnotes','atnotes.min');
-OCP\Util::addScript('atnotes','atnotes.min');
-
-?>
-
-<div id="atnotes_container">
-	<div id="save_dialog">
-		<div class="atnotes-explorer"><table border="0" cellpadding="0" cellspacing="0"></table></div>
-	</div>
-	<div id="controls">
-		<div class="title"><?php print('Always Take Notes !'); ?></div>
-	</div>
-	<ul class="atnotes-noteslist">
-		<?php foreach($_['notes_list'] as $note){ ?>
-		<li class="atnotes-elt" rel="<?php print($note['note_id']); ?>">
-			<div class="atnotes-elt-title"><?php print($note['note_title']); ?></div>
-			<div class="atnotes-elt-state"></div>
-			<div class="atnotes-elt-date"><?php print(date('m/d/Y', $note['update_ts'])); ?></div>
-			<div class="atnotes-elt-prerender"><?php print($note['note_content']); ?></div>
-		</li>
-		<?php } ?>
-	</ul>
-	<div class="atnotes-notesedit">
-		<div class="anotes-notesedit-title">
-			<input type="text" id="note_title" rel="0" maxlength="255" />
-			<input type="hidden" id="note_path" maxlength="255" />
-			<div class="atnotes-actions-btns">
-				<img class="atnotes-actions-list" src="<?php print(OCP\Util::imagePath('atnotes','action.png')); ?>" />
-				<div class="atnotes-actions-ddmenu">
-					<ul>
-						<li class="atnotes-new">New note</li>
-						<li class="atnotes-delete">Delete note</li>
-					</ul>
-				</div>
-				<img class="atnotes-save" src="<?php print(OCP\Util::imagePath('atnotes','save.png')); ?>" />
-			</div>
-		</div>
-		<div class="anotes-notesedit-states">
-			<div class="atnotes-created"></div>
-			<div class="atnotes-saved"></div>
-		</div>
-	</div>
-	<textarea class="atnotes-editor"></textarea>
-</div>
diff --git a/remote/.gitignore b/remote/.gitignore
deleted file mode 100644
index c96a04f008..0000000000
--- a/remote/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file

From 98c020d954f6a8dac93c5e93309807c7a66456eb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 10:42:44 -0400
Subject: [PATCH 1193/1537] Remove more accidentally added files

---
 config/mount.sample.php | 13 ---------
 sharing.patch           | 63 -----------------------------------------
 2 files changed, 76 deletions(-)
 delete mode 100644 config/mount.sample.php
 delete mode 100644 sharing.patch

diff --git a/config/mount.sample.php b/config/mount.sample.php
deleted file mode 100644
index 8943b6a705..0000000000
--- a/config/mount.sample.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php return array(
-	'global' => array(
-			'/' => array('class' => 'OC_Filestorage_Local', 'options' => array())
-		),
-	'group' => array(
-			'admin' => array('/$user/files/Admin Stuff' => array('class' => 'OC_Filestorage_Local', 'options' => array()))
-		),
-	'user' => array(
-			'all' => array('/$user/files/Pictures' => array('class' => 'OC_Filestorage_DAV', 'options' => array())),
-			'MTGap' => array('/$user/files/Test' => array('class' => 'OC_Filestorage_FTP', 'options' => array()))
-		)
-	);
-?>
\ No newline at end of file
diff --git a/sharing.patch b/sharing.patch
deleted file mode 100644
index ac1693cd2d..0000000000
--- a/sharing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -u -r -N owncloud/apps/files_sharing/css/sharing.css owncloud/apps/files_sharing/css/sharing.css
---- owncloud/apps/files_sharing/css/sharing.css	2012-01-29 14:50:19.000000000 +0100
-+++ owncloud/apps/files_sharing/css/sharing.css	2012-03-28 11:45:02.000000000 +0200
-@@ -5,4 +5,7 @@
- #shared_list { padding:0.5em; list-style-type: none; }
- #public { border-top:1px solid #ddd; padding-top:0.5em; }
- a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; opacity:.5; }
--a.unshare:hover { opacity:1; }
-\ Kein Zeilenumbruch am Dateiende.
-+a.unshare:hover { opacity:1; }
-+
-+div.actionsSharing { font-weight: bold; padding-left: .65em; padding-top: .65em; color: #555; }
-+table td.source, table td.uid_shared_with, table td.permissions { padding: .5em ; }
-\ Kein Zeilenumbruch am Dateiende.
-diff -u -r -N owncloud/apps/files_sharing/list.php owncloud/apps/files_sharing/list.php
---- owncloud/apps/files_sharing/list.php	2012-01-29 14:50:19.000000000 +0100
-+++ owncloud/apps/files_sharing/list.php	2012-03-28 11:43:31.000000000 +0200
-@@ -29,6 +29,7 @@
- OC_App::setActiveNavigationEntry("files_sharing_list");
- 
- OC_Util::addScript("files_sharing", "list");
-+OC_Util::addStyle("files", "files");
- 
- $tmpl = new OC_Template("files_sharing", "list", "user");
- $tmpl->assign("shared_items", OC_Share::getMySharedItems());
-diff -u -r -N owncloud/apps/files_sharing/templates/list.php owncloud/apps/files_sharing/templates/list.php
---- owncloud/apps/files_sharing/templates/list.php	2012-01-29 14:50:19.000000000 +0100
-+++ owncloud/apps/files_sharing/templates/list.php	2012-03-28 11:44:11.000000000 +0200
-@@ -1,5 +1,10 @@
--<fieldset>
--	<legend><?php echo $l->t('Your Shared Files');?></legend>
-+<div id="controls">
-+	<div class="actionsSharing">
-+		<?php echo $l->t('My shared files'); ?>
-+	</div>
-+</div>
-+
-+<div id='list'>
- 	<table id="itemlist">
- 		<thead>
- 			<tr>
-@@ -14,17 +19,17 @@
- 					<td class="source"><?php echo substr($item['source'], strlen("/".$_SESSION['user_id']."/files/"));?></td>
- 					<td class="uid_shared_with"><?php echo $item['uid_shared_with'];?></td>
- 					<td class="permissions"><?php echo $l->t('Read'); echo($item['permissions'] & OC_SHARE::WRITE ? ", ".$l->t('Edit') : ""); echo($item['permissions'] & OC_SHARE::DELETE ? ", ".$l->t('Delete') : "");?></td>
--					<td><button class="delete" data-source="<?php echo $item['source'];?>" data-uid_shared_with="<?php echo $item['uid_shared_with'];?>"><?php echo $l->t('Delete');?></button></td>
-+<!--					<td><button class="delete" data-source="<?php echo $item['source'];?>" data-uid_shared_with="<?php echo $item['uid_shared_with'];?>"><?php echo $l->t('Delete');?></button></td> //-->
- 				</tr>
- 			<?php endforeach;?>
--			<tr id="share_item_row">
-+<!--			<tr id="share_item_row">
- 				<form action="#" id="share_item">
- 					<td class="source"><input placeholder="Item" id="source" /></td>
- 					<td class="uid_shared_with"><input placeholder="Share With" id="uid_shared_with" /></td>
- 					<td class="permissions"><input placeholder="Permissions" id="permissions" /></td>
- 					<td><input type="submit" value="Share" /></td>
- 				</form>
--			</tr>
-+			</tr> //-->
- 		</tbody>
- 	</table>
--</fieldset>
-+</div>

From b465fc84ae9fd1f678ce8cf1bd0c5a91d3665a05 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 30 Jul 2012 17:42:33 +0200
Subject: [PATCH 1194/1537] LDAP: don't die on unexpected collisions, handle
 empty display-name attributes properly

---
 apps/user_ldap/lib/access.php | 24 ++++++++++++++++--------
 apps/user_ldap/user_ldap.php  | 17 ++++++++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 19122b34c7..a50afd0d60 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -178,7 +178,7 @@ abstract class Access {
 	 * @param $ldapname optional, the display name of the object
 	 * @returns string with with the name to use in ownCloud, false on DN outside of search DN
 	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the group
+	 * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
 	 */
 	public function dn2groupname($dn, $ldapname = null) {
 		if(mb_strripos($dn, $this->connection->ldapBaseGroups, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseGroups, 'UTF-8'))) {
@@ -193,7 +193,7 @@ abstract class Access {
 	 * @param $ldapname optional, the display name of the object
 	 * @returns string with with the name to use in ownCloud
 	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
+	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
 	 */
 	public function dn2username($dn, $ldapname = null) {
 		if(mb_strripos($dn, $this->connection->ldapBaseUsers, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseUsers, 'UTF-8'))) {
@@ -233,6 +233,10 @@ abstract class Access {
 
 		if(is_null($ldapname)) {
 			$ldapname = $this->readAttribute($dn, $nameAttribute);
+			if(!isset($ldapname[0]) && empty($ldapname[0])) {
+				\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$dn.'.', \OCP\Util::INFO);
+				return false;
+			}
 			$ldapname = $ldapname[0];
 		}
 		$ldapname = $this->sanitizeUsername($ldapname);
@@ -248,9 +252,8 @@ abstract class Access {
 			return $oc_name;
 		}
 
-		//TODO: do not simple die away!
-		//and this of course should never been thrown :)
-		throw new Exception('LDAP backend: unexpected collision of DN and ownCloud Name.');
+		//if everything else did not help..
+		OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
 	}
 
 	/**
@@ -294,6 +297,12 @@ abstract class Access {
 				continue;
 			}
 
+			//we do not take empty usernames
+			if(!isset($ldapObject[$nameAttribute]) || empty($ldapObject[$nameAttribute])) {
+				\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$ldapObject['dn'].', skipping.', \OCP\Util::INFO);
+				continue;
+			}
+
 			//a new group! Then let's try to add it. We're shooting into the blue with the group name, assuming that in most cases there will not be a conflict. But first make sure, that the display name contains only allowed characters.
 			$ocname = $this->sanitizeUsername($ldapObject[$nameAttribute]);
 			if($this->mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
@@ -308,9 +317,8 @@ abstract class Access {
 				continue;
 			}
 
-			//TODO: do not simple die away
-			//and this of course should never been thrown :)
-			throw new Exception('LDAP backend: unexpected collision of DN and ownCloud Name.');
+			//if everything else did not help..
+			\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$ldapObject['dn'].', skipping.', \OCP\Util::INFO);
 		}
 		return $ownCloudNames;
 	}
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 57b2ef489b..2059d5b0c6 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -79,12 +79,19 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			return false;
 		}
 
-		//update some settings, if necessary
-		$this->updateQuota($dn);
-		$this->updateEmail($dn);
+		//do we have a username for him/her?
+		$ocname = $this->dn2username($dn);
 
-		//give back the display name
-		return $this->dn2username($dn);
+		if($ocname){
+			//update some settings, if necessary
+			$this->updateQuota($dn);
+			$this->updateEmail($dn);
+
+			//give back the display name
+			return $ocname;
+		}
+
+		return false;
 	}
 
 	/**

From dfae77dec1650f171d09d4bde88ab74029f6e8c7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 12:21:58 -0400
Subject: [PATCH 1195/1537] Add notifications and undo support for replacing
 files when renaming

---
 apps/files/css/files.css  |   2 +-
 apps/files/js/filelist.js | 122 ++++++++++++++++++++++++++++++++------
 2 files changed, 104 insertions(+), 20 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e08d69f08d..317c0b8a1e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -89,4 +89,4 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #navigation>ul>li:first-child+li { padding-top:2.9em; }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
-#notification .undo { cursor:pointer; font-weight:bold; margin-left:1em; }
\ No newline at end of file
+#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
\ No newline at end of file
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index aaf2e681ab..a414c5f830 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -136,24 +136,39 @@ FileList={
 			event.stopPropagation();
 			event.preventDefault();
 			var newname=input.val();
-			tr.attr('data-file',newname);
-			td.children('a.name').empty();
+			if (newname != name) {
+				if ($('tr').filterAttr('data-file', newname).length > 0) {
+					$('#notification').html(newname+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+					$('#notification').data('oldName', name);
+					$('#notification').data('newName', newname);
+					$('#notification').fadeIn();
+					newname = name;
+				} else {
+					$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
+						if (!result || result.status == 'error') {
+							OC.dialogs.alert(result.data.message, 'Error moving file');
+							newname = name;
+						}
+					});
+				}
+				
+			}
+			tr.attr('data-file', newname);
 			var path = td.children('a.name').attr('href');
 			td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
-			if(newname.indexOf('.')>0){
-				basename=newname.substr(0,newname.lastIndexOf('.'));
-			}else{
-				basename=newname;
+			if (newname.indexOf('.') > 0) {
+				var basename=newname.substr(0,newname.lastIndexOf('.'));
+			} else {
+				var basename=newname;
 			}
+			td.children('a.name').empty();
 			var span=$('<span class="nametext"></span>');
 			span.text(basename);
 			td.children('a.name').append(span);
-			if(newname.indexOf('.')>0){
+			if (newname.indexOf('.') > 0) {
 				span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
 			}
-			$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(){
-				tr.data('renaming',false);
-			});
+			tr.data('renaming',false);
 			return false;
 		});
 		input.click(function(event){
@@ -164,12 +179,64 @@ FileList={
 			form.trigger('submit');
 		});
 	},
+	replace:function(oldName, newName) {
+		// Finish any existing actions
+		if (FileList.lastAction || !FileList.useUndo) {
+			FileList.lastAction();
+		}
+		var tr = $('tr').filterAttr('data-file', oldName);
+		tr.hide();
+		FileList.replaceCanceled = false;
+		FileList.replaceOldName = oldName;
+		FileList.replaceNewName = newName;
+		FileList.lastAction = function() { 
+			FileList.finishReplace();
+		};
+		$('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>');
+		$('#notification').fadeIn();
+	},
+	finishReplace:function() {
+		if (!FileList.replaceCanceled && FileList.replaceOldName && FileList.replaceNewName) {
+			// Delete the file being replaced and rename the replacement
+			FileList.deleteCanceled = false;
+			FileList.deleteFiles = [FileList.replaceNewName];
+			FileList.finishDelete(function() {
+				$.ajax({url: OC.filePath('files', 'ajax', 'rename.php'), async: false, data: { dir: $('#dir').val(), newname: FileList.replaceNewName, file: FileList.replaceOldName }, success: function(result) {
+					if (result && result.status == 'success') {
+						var tr = $('tr').filterAttr('data-file', FileList.replaceOldName);
+						tr.attr('data-file', FileList.replaceNewName);
+						var td = tr.children('td.filename');
+						td.children('a.name .span').text(FileList.replaceNewName);
+						var path = td.children('a.name').attr('href');
+						td.children('a.name').attr('href', path.replace(encodeURIComponent(FileList.replaceOldName), encodeURIComponent(FileList.replaceNewName)));
+						if (FileList.replaceNewName.indexOf('.') > 0) {
+							var basename = FileList.replaceNewName.substr(0, FileList.replaceNewName.lastIndexOf('.'));
+						} else {
+							var basename = FileList.replaceNewName;
+						}
+						td.children('a.name').empty();
+						var span = $('<span class="nametext"></span>');
+						span.text(basename);
+						td.children('a.name').append(span);
+						if (FileList.replaceNewName.indexOf('.') > 0) {
+							span.append($('<span class="extension">'+FileList.replaceNewName.substr(FileList.replaceNewName.lastIndexOf('.'))+'</span>'));
+						}
+						tr.show();
+					} else {
+						OC.dialogs.alert(result.data.message, 'Error moving file');
+					}
+					FileList.replaceCanceled = true;
+					FileList.replaceOldName = null;
+					FileList.replaceNewName = null;
+					FileList.lastAction = null;
+				}});
+			}, true);
+		}
+	},
 	do_delete:function(files){
-		if(FileList.deleteFiles || !FileList.useUndo){//finish any ongoing deletes first
-			FileList.finishDelete(function(){
-				FileList.do_delete(files);
-			});
-			return;
+		// Finish any existing actions
+		if (FileList.lastAction || !FileList.useUndo) {
+			FileList.lastAction();
 		}
 		if(files.substr){
 			files=[files];
@@ -183,8 +250,10 @@ FileList={
 		procesSelection();
 		FileList.deleteCanceled=false;
 		FileList.deleteFiles=files;
+		FileList.lastAction = function() {
+			FileList.finishDelete(null, true);
+		};
 		$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
-		$('#notification').data('deletefile',true);
 		$('#notification').fadeIn();
 	},
 	finishDelete:function(ready,sync){
@@ -202,6 +271,7 @@ FileList={
 						});
 						FileList.deleteCanceled=true;
 						FileList.deleteFiles=null;
+						FileList.lastAction = null;
 						if(ready){
 							ready();
 						}
@@ -215,18 +285,32 @@ FileList={
 $(document).ready(function(){
 	$('#notification').hide();
 	$('#notification .undo').live('click', function(){
-		if($('#notification').data('deletefile'))
-		{
+		if (FileList.deleteFiles) {
 			$.each(FileList.deleteFiles,function(index,file){
 				$('tr').filterAttr('data-file',file).show();
 			});
 			FileList.deleteCanceled=true;
 			FileList.deleteFiles=null;
+		} else if (FileList.replaceOldName && FileList.replaceNewName) {
+			$('tr').filterAttr('data-file', FileList.replaceOldName).show();
+			FileList.replaceCanceled = true;
+			FileList.replaceOldName = null;
+			FileList.replaceNewName = null;
 		}
 		$('#notification').fadeOut();
 	});
+	$('#notification .replace').live('click', function() {
+		$('#notification').fadeOut('400', function() {
+			FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'));
+		});
+	});
+	$('#notification .cancel').live('click', function() {
+		$('#notification').fadeOut();
+	});
 	FileList.useUndo=('onbeforeunload' in window)
 	$(window).bind('beforeunload', function (){
-		FileList.finishDelete(null,true);
+		if (FileList.lastAction) {
+			FileList.lastAction();
+		}
 	});
 });

From 8a92cd21d6768fc27c4892583bef327da9a7e5f4 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Mon, 30 Jul 2012 21:26:14 +0200
Subject: [PATCH 1196/1537] Remove OC_App::register call in OCP\App::register

---
 lib/public/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/app.php b/lib/public/app.php
index 5689f53ffb..e74f155074 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -46,7 +46,7 @@ class App {
          *
          */
         public static function register( $data ){
-		return \OC_App::register( $data );
+		return true; // don't do anything
         }
 
         /**

From ed71343df8a3d35c2a0fe7d6c91778278f8d7dd1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 15:30:21 -0400
Subject: [PATCH 1197/1537] Autocomplete for share with search in sharing
 dropdown

---
 core/ajax/share.php | 23 ++++++++++++++++++-----
 core/js/share.js    | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 4c5ef310b7..41c9e80fd7 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -49,21 +49,34 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 			}
 			break;
 	}
-} else if (isset($_GET['fetch']) && isset($_GET['itemType'])) {
+} else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
 		case 'getItemsSharedStatuses':
-			$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
-			($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+			if (isset($_GET['itemType'])) {
+				$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
+				($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+			}
 			break;
 		case 'getItem':
 			// TODO Check if the item was shared to the current user
-			if (isset($_GET['item'])) {
+			if (isset($_GET['itemType']) && isset($_GET['item'])) {
 				$return = OCP\Share::getItemShared($_GET['itemType'], $_GET['item']);
 				($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			}
 			break;
 		case 'getShareWith':
-			// TODO Autocomplete for all users, groups, etc.
+			if (isset($_GET['search'])) {
+				$shareWith = array();
+				$users = OC_User::getUsers();
+				foreach ($users as $user) {
+					$shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user));
+				}
+				$groups = OC_Group::getGroups();
+				foreach ($groups as $group) {
+					$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+				}
+				OC_JSON::success(array('data' => $shareWith));
+			}
 			break;
 	}
 }
diff --git a/core/js/share.js b/core/js/share.js
index 8ab92c2a85..64fcb77c0b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -94,6 +94,32 @@ OC.Share={
 			});
 		}
 		$('#dropdown').show('blind');
+		$('#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 }, function(result) {
+					if (result.status == 'success') {
+						response(result.data);
+					} else {
+						// Suggest sharing via email
+						response();
+					}
+				});
+// 			}
+		}, 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'), shareType, shareWith, permissions, function() {
+				OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
+				$('#shareWith').val('');
+			});
+			return false;
+		}
+		});
 	},
 	hideDropDown:function(callback) {
 		$('#dropdown').hide('blind', function() {
@@ -273,17 +299,6 @@ $(document).ready(function() {
 			$('a.unshare', this).hide();
 		}
 	});
-	
-	$('#shareWith').live('change', function() {
-		var shareType = $(li).data('share-type');
-		var shareWith = $(this).val();
-		// 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'), shareType, shareWith, permissions, function() {
-			OC.Share.addShareWith(shareType, shareWith, permissions);
-			$('#shareWith').val('');
-		});
-	});
 
 	$('.showCruds').live('click', function() {
 		$(this).parent().find('.cruds').toggle();

From 2f1a990cadc5202dd20c3ec87e886685f6733595 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 20:20:46 -0400
Subject: [PATCH 1198/1537] Add search, limit, and offset parameters to
 getUsers() and getGroups()

---
 lib/group.php           |  8 ++++----
 lib/group/backend.php   |  2 +-
 lib/group/database.php  | 12 +++++-------
 lib/group/interface.php |  2 +-
 lib/public/user.php     |  2 +-
 lib/user.php            | 12 ++++++------
 lib/user/backend.php    |  2 +-
 lib/user/database.php   | 13 ++++++-------
 lib/user/interface.php  |  2 +-
 9 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/lib/group.php b/lib/group.php
index 12e5f5ebb3..eb6a582809 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -237,10 +237,10 @@ class OC_Group {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){
-		$groups=array();
-		foreach(self::$_usedBackends as $backend){
-			$groups=array_merge($backend->getGroups(),$groups);
+	public static function getGroups($search = '', $limit = 10, $offset = 0) {
+		$groups = array();
+		foreach (self::$_usedBackends as $backend) {
+			$groups = array_merge($backend->getGroups($search, $limit, $offset), $groups);
 		}
 		asort($groups);
 		return $groups;
diff --git a/lib/group/backend.php b/lib/group/backend.php
index ebc078f152..3f2909caa1 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -105,7 +105,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
+	public function getGroups($search = '', $limit = 10, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index 2770ec185c..6314a12743 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -164,15 +164,13 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
-		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups`" );
-		$result = $query->execute();
-
+	public function getGroups($search = '', $limit = 10, $offset = 0) {
+		$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		$result = $query->execute(array($search.'%'));
 		$groups = array();
-		while( $row = $result->fetchRow()){
-			$groups[] = $row["gid"];
+		while ($row = $result->fetchRow()) {
+			$groups[] = $row['gid'];
 		}
-
 		return $groups;
 	}
 
diff --git a/lib/group/interface.php b/lib/group/interface.php
index 7cca6061e1..6e492e7274 100644
--- a/lib/group/interface.php
+++ b/lib/group/interface.php
@@ -58,7 +58,7 @@ interface OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups();
+	public function getGroups($search = '', $limit = 10, $offset = 0);
 
 	/**
 	 * check if a group exists
diff --git a/lib/public/user.php b/lib/public/user.php
index 713e366b96..178d1dddd3 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -51,7 +51,7 @@ class User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers(){
+	public static function getUsers($search = '', $limit = 10, $offset = 0) {
 		return \OC_USER::getUsers();
 	}
 
diff --git a/lib/user.php b/lib/user.php
index e3c9c23eff..681fd82b99 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -337,12 +337,12 @@ class OC_User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers(){
-		$users=array();
-		foreach(self::$_usedBackends as $backend){
-			$backendUsers=$backend->getUsers();
-			if(is_array($backendUsers)){
-				$users=array_merge($users,$backendUsers);
+	public static function getUsers($search = '', $limit = 10, $offset = 0) {
+		$users = array();
+		foreach (self::$_usedBackends as $backend) {
+			$backendUsers = $backend->getUsers($search, $limit, $offset);
+			if (is_array($backendUsers)) {
+				$users = array_merge($users, $backendUsers);
 			}
 		}
 		asort($users);
diff --git a/lib/user/backend.php b/lib/user/backend.php
index daa942d261..ff00ef08f6 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -97,7 +97,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers(){
+	public function getUsers($search = '', $limit = 10, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/user/database.php b/lib/user/database.php
index cc27b3ddbf..968814d9d5 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -154,13 +154,12 @@ class OC_User_Database extends OC_User_Backend {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers(){
-		$query = OC_DB::prepare( "SELECT uid FROM *PREFIX*users" );
-		$result = $query->execute();
-
-		$users=array();
-		while( $row = $result->fetchRow()){
-			$users[] = $row["uid"];
+	public function getUsers($search = '', $limit = 10, $offset = 0) {
+		$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		$result = $query->execute(array($search.'%'));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['uid'];
 		}
 		return $users;
 	}
diff --git a/lib/user/interface.php b/lib/user/interface.php
index dc3685dc20..b3286cd2f9 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -48,7 +48,7 @@ interface OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers();
+	public function getUsers($search = '', $limit = 10, $offset = 0);
 
 	/**
 	* @brief check if a user exists

From d66f071d3e41ce81ab80f8edd4688d3adacef96f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 20:21:48 -0400
Subject: [PATCH 1199/1537] Use search and limit parameters for share with
 search in sharing dropdown

---
 core/ajax/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 41c9e80fd7..3d3436c71f 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -67,11 +67,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
 				$shareWith = array();
-				$users = OC_User::getUsers();
+				$users = OC_User::getUsers($_GET['search'], 4);
 				foreach ($users as $user) {
 					$shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user));
 				}
-				$groups = OC_Group::getGroups();
+				$groups = OC_Group::getGroups($_GET['search'], 4);
 				foreach ($groups as $group) {
 					$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
 				}

From 553773f2e1d2b8af7da757b7551a436ffc27a129 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 12:21:06 +0200
Subject: [PATCH 1200/1537] Popup for app specific settings.

---
 core/css/styles.css | 11 ++++++++++
 core/js/js.js       | 53 +++++++++++++++++++++++++++++++--------------
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index c61d0a9a1a..d032dcab2e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -157,3 +157,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: absolute; z-index: 200; }
+.popup.topright { top: -8px; right: 1em; }
+.popup.bottomleft { bottom: 1em; left: 8px; }
+.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/js/js.js b/core/js/js.js
index df834157cd..c5bbc12c0c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -82,7 +82,7 @@ OC={
 			if(type){
 				link+=type+'/';
 			}
-			link+=file;	
+			link+=file;
 		}
 		return link;
 	},
@@ -91,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';
@@ -105,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){
@@ -155,7 +155,28 @@ OC={
     var date = new Date(1000*mtime);
     var ret = date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
     return ret;
-  }
+  },
+
+	appSettings:function(app) {
+		var settings = $('#appsettings');
+		if(settings.is(':visible')) {
+			settings.hide().find('.arrow').hide();
+		} else {
+			if($('#journal.settings').length == 0) {
+				var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
+				var jqxhr = $.get(OC.linkTo(app, 'settings.php'), function(data) {
+					$('#appsettings').html(data).ready(function() {
+						settings.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
+						settings.find('.close').bind('click', function() {
+							settings.hide();
+						})
+					});
+				}, 'html');
+			} else {
+				settings.show().find('.arrow').show();
+			}
+		}
+	}
 };
 OC.search.customResults={};
 OC.search.currentResult=-1;
@@ -202,7 +223,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++) {
@@ -222,14 +243,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 &&
@@ -306,7 +327,7 @@ function replaceSVG(){
 
 /**
  * prototypal inharitence functions
- * 
+ *
  * usage:
  * MySubObject=object(MyObject)
  */
@@ -352,7 +373,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{
@@ -395,7 +416,7 @@ $(document).ready(function(){
 		}
 	});
 
-	// 'show password' checkbox	
+	// 'show password' checkbox
 	$('#pass2').showPassword();
 
 	//use infield labels
@@ -462,15 +483,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,7 +499,7 @@ if (!Array.prototype.map){
 				res[i] = fun.call(thisp, t[i], i, t);
 			}
 		}
-		
+
 	    return res;
 	};
 }
@@ -486,7 +507,7 @@ if (!Array.prototype.map){
 /**
  * Filter Jquery selector by attribute value
  **/
-$.fn.filterAttr = function(attr_name, attr_value) {  
+$.fn.filterAttr = function(attr_name, attr_value) {
    return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
 

From 19c55e2d4470ff37cf14a20ccfdab0fa6ae14ed9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 12:21:45 +0200
Subject: [PATCH 1201/1537] Implemented app settings in popup.

---
 apps/contacts/css/contacts.css       |  4 ++--
 apps/contacts/js/contacts.js         | 10 ++++++++--
 apps/contacts/settings.php           |  2 +-
 apps/contacts/templates/index.php    | 11 ++++++-----
 apps/contacts/templates/settings.php |  3 +--
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index ddae27da21..5350fdd5d3 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -14,8 +14,8 @@
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #bottomcontrols img { margin-top: 0.35em; }
 #uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
-#contacts_newcontact, #contacts_import, #chooseaddressbook { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
-#chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
+#contacts_newcontact, #bottomcontrols .settings { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
+#bottomcontrols .settings { float: right; margin: 0.2em 1em 0 0; }
 #actionbar { clear: both; height: 30px;}
 #contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
 #contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 34961360ee..b79608a8e6 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -279,7 +279,7 @@ Contacts={
 			$('#contacts_deletecard').tipsy({gravity: 'ne'});
 			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
 			$('#contacts_propertymenu_button').tipsy();
-			$('#contacts_newcontact, #contacts_import, #chooseaddressbook').tipsy({gravity: 'sw'});
+			$('#contacts_newcontact, #contacts_import, #bottomcontrols .settings').tipsy({gravity: 'sw'});
 
 			$('body').click(function(e){
 				if(!$(e.target).is('#contacts_propertymenu_button')) {
@@ -1745,7 +1745,13 @@ $(document).ready(function(){
 	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
+	//$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
+	$('#bottomcontrols .settings').on('click keydown', function() {
+		OC.appSettings('contacts');
+	});
+	$('#bottomcontrols .import').click(function() {
+		$('#import_upload_start').trigger('click');
+	});
 	$('#contacts_newcontact').on('click keydown', Contacts.UI.Card.editNew);
 
 	var ninjahelp = $('#ninjahelp');
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
index a079499381..5f639399c9 100644
--- a/apps/contacts/settings.php
+++ b/apps/contacts/settings.php
@@ -3,4 +3,4 @@
 $tmpl = new OCP\Template( 'contacts', 'settings');
 $tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
 
-return $tmpl->fetchPage();
+$tmpl->printPage();
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index b2dde12684..7ff139e31c 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -11,19 +11,20 @@
 	</div>
 	<div id="uploadprogressbar"></div>
 	<div id="bottomcontrols">
-		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
 			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
-			<span class="svg" id="contacts_import" title="<?php echo $l->t('Import'); ?>">
-				<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
+			<button class="svg import tip" title="<?php echo $l->t('Import'); ?>">
 				<img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" />
-			</span>
-			<button class="svg" id="chooseaddressbook" title="<?php echo $l->t('Addressbooks'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
+			</button>
+			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
+		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
+			<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 		</form>
 		<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
 	</div>
 </div>
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
+	<div id="appsettings" class="popup bottomleft hidden"></div>
 	<?php
 		if($_['has_contacts']) {
 			echo $this->inc('part.contact');
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index f520559d14..c42de12fa7 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -1,6 +1,5 @@
-<form id="contacts">
+<form id="contacts-settings">
 	<fieldset class="personalblock">
-		<legend><?php echo $l->t('Contacts'); ?></legend>
 		<?php echo $l->t('CardDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
 		<dl>
 		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>

From 90a1b5a758acc48563a42d9fa722dc0c4723e2e2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 12:22:55 +0200
Subject: [PATCH 1202/1537] Unregister from personal settings.

---
 apps/contacts/appinfo/app.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index cbbbbc79e5..7e73f315dd 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -18,7 +18,5 @@ OCP\App::addNavigationEntry( array(
   'icon' => OCP\Util::imagePath( 'settings', 'users.svg' ),
   'name' => OC_L10N::get('contacts')->t('Contacts') ));
 
-
-OCP\App::registerPersonal('contacts', 'settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');

From 084866cb1e69e731a6aca06e1e287a700da134fd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 14:06:44 +0200
Subject: [PATCH 1203/1537] White space

---
 core/js/js.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index c5bbc12c0c..7bbf70991a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -150,13 +150,12 @@ 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;
+	},
 	appSettings:function(app) {
 		var settings = $('#appsettings');
 		if(settings.is(':visible')) {

From fb14cb87bdbdb46dcac2fe4e8054078a0ef8e8ee Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 14:17:28 +0200
Subject: [PATCH 1204/1537] Made the parameter for OC.appSettings() an object
 to be able to extend it.

---
 core/js/js.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 7bbf70991a..f1d7e864a1 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -156,14 +156,17 @@ OC={
 		var ret = date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
 		return ret;
 	},
-	appSettings:function(app) {
+	appSettings:function(args) {
+		if(typeof args === 'undefined' || typeof args.appid === 'undefined') {
+			throw { name: 'MissingParameter', message: 'The parameter appid is missing' }
+		}
 		var settings = $('#appsettings');
 		if(settings.is(':visible')) {
 			settings.hide().find('.arrow').hide();
 		} else {
 			if($('#journal.settings').length == 0) {
 				var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
-				var jqxhr = $.get(OC.linkTo(app, 'settings.php'), function(data) {
+				var jqxhr = $.get(OC.linkTo(args.appid, 'settings.php'), function(data) {
 					$('#appsettings').html(data).ready(function() {
 						settings.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
 						settings.find('.close').bind('click', function() {

From 5eed59bd54c7ef6525ea142ca84a6e615d5b4818 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 14:18:32 +0200
Subject: [PATCH 1205/1537] Changed fix parameter to OC.appSettings().

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index b79608a8e6..fa99878174 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1747,7 +1747,7 @@ $(document).ready(function(){
 
 	//$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
 	$('#bottomcontrols .settings').on('click keydown', function() {
-		OC.appSettings('contacts');
+		OC.appSettings({appid:'contacts'});
 	});
 	$('#bottomcontrols .import').click(function() {
 		$('#import_upload_start').trigger('click');

From 8837576ce7de7d60cddf40b0b540d81294463043 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 16:03:08 +0200
Subject: [PATCH 1206/1537] Added some more options to OC.appSettings().

---
 core/js/js.js | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index f1d7e864a1..006cd92050 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -156,22 +156,53 @@ OC={
 		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' }
+			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.' };
+		}
 		if(settings.is(':visible')) {
 			settings.hide().find('.arrow').hide();
 		} else {
 			if($('#journal.settings').length == 0) {
 				var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
-				var jqxhr = $.get(OC.linkTo(args.appid, 'settings.php'), function(data) {
+				var jqxhr = $.get(OC.filePath(props.appid, '', 'settings.php'), function(data) {
 					$('#appsettings').html(data).ready(function() {
 						settings.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
 						settings.find('.close').bind('click', function() {
 							settings.hide();
 						})
+						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, exception) {
+								settings.append('<span>'+t('core', 'Error loading script for the settings')+'</span>');
+							});
+						}
 					});
 				}, 'html');
 			} else {

From 6df95db8e85c29ef01c8cf7aaf660006a1973c54 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jul 2012 16:05:58 +0200
Subject: [PATCH 1207/1537] Forgot to also use the options I added :-P

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/js.js b/core/js/js.js
index 006cd92050..f053c97b49 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -180,7 +180,7 @@ OC={
 		} else {
 			if($('#journal.settings').length == 0) {
 				var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
-				var jqxhr = $.get(OC.filePath(props.appid, '', 'settings.php'), function(data) {
+				var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) {
 					$('#appsettings').html(data).ready(function() {
 						settings.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
 						settings.find('.close').bind('click', function() {

From 8729119d4baa6a9c7f27314b175b67dc3693ebdd Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 31 Jul 2012 10:18:26 -0400
Subject: [PATCH 1208/1537] Add suggestion to share with search for sharing via
 email

---
 core/js/share.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 64fcb77c0b..811f900708 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -2,6 +2,7 @@ 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,
@@ -99,11 +100,16 @@ OC.Share={
 // 				response(cache[search.term]);
 // 			} else {
 				$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term }, function(result) {
-					if (result.status == 'success') {
+					if (result.status == 'success' && result.data.length > 0) {
 						response(result.data);
 					} else {
-						// Suggest sharing via email
-						response();
+						// 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']);
+						}
 					}
 				});
 // 			}

From 8d01e1a3555e303deed72636d0d7fabce447cf1c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 31 Jul 2012 13:06:32 -0400
Subject: [PATCH 1209/1537] Don't show self or already shared with users and
 groups in the share with search

---
 core/ajax/share.php | 35 +++++++++++++++++++++++++++++------
 core/js/share.js    |  9 +++++++--
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3d3436c71f..c613baa7f5 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -66,14 +66,37 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 			break;
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
+				// TODO Include contacts
 				$shareWith = array();
-				$users = OC_User::getUsers($_GET['search'], 4);
-				foreach ($users as $user) {
-					$shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user));
+				$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'][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++;
+						}
+					}
 				}
-				$groups = OC_Group::getGroups($_GET['search'], 4);
-				foreach ($groups as $group) {
-					$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+				$count = 0;
+				$groups = array();
+				$limit = 0;
+				$offset = 0;
+				while ($count < 4 && count($groups) == $limit) {
+					$limit = 4 - $count;
+					$groups = OC_Group::getGroups($_GET['search'], $limit, $offset);
+					$offset += $limit;
+					foreach ($groups as $group) {
+						if (!isset($_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++;
+						}
+					}
 				}
 				OC_JSON::success(array('data' => $shareWith));
 			}
diff --git a/core/js/share.js b/core/js/share.js
index 811f900708..44abc14ede 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -8,7 +8,7 @@ OC.Share={
 	PERMISSION_UPDATE:2,
 	PERMISSION_DELETE:8,
 	PERMISSION_SHARE:16,
-	item:[],
+	itemShares:[],
 	statuses:[],
 	loadIcons:function(itemType) {
 		// Load all share icons
@@ -91,6 +91,7 @@ OC.Share={
 					OC.Share.showPrivateLink(item, share.share_with);
 				} else {
 					OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
+					
 				}
 			});
 		}
@@ -99,7 +100,7 @@ OC.Share={
 // 			if (cache[search.term]) {
 // 				response(cache[search.term]);
 // 			} else {
-				$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term }, function(result) {
+				$.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 {
@@ -136,6 +137,10 @@ OC.Share={
 		});
 	},
 	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"';

From 9e4c3b83427c4c226e64543b4c7d198a598a8164 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 31 Jul 2012 14:21:46 -0400
Subject: [PATCH 1210/1537] Remove break, it broke the statuses :)

---
 lib/public/share.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 75dea92eea..3053da47e8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -538,7 +538,6 @@ class Share {
 					foreach ($items as $item) {
 						if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
 							$statuses[$item['item']] = true;
-							break;
 						} else if (!isset($statuses[$item['item']])) {
 							$statuses[$item['item']] = false;
 						}

From 269922543eaf9e69dbf5a15fa0ba34704040b09c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 31 Jul 2012 14:48:19 -0400
Subject: [PATCH 1211/1537] Give share with search focus when sharing dropdown
 appears

---
 core/js/share.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 44abc14ede..2d6bc653fa 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -95,7 +95,6 @@ OC.Share={
 				}
 			});
 		}
-		$('#dropdown').show('blind');
 		$('#shareWith').autocomplete({minLength: 2, source: function(search, response) {
 // 			if (cache[search.term]) {
 // 				response(cache[search.term]);
@@ -127,6 +126,8 @@ OC.Share={
 			return false;
 		}
 		});
+		$('#dropdown').show('blind');
+		$('#shareWith').focus();
 	},
 	hideDropDown:function(callback) {
 		$('#dropdown').hide('blind', function() {

From 36ccaf51ed548e1afb7819493142532623c17e69 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 31 Jul 2012 22:57:24 +0200
Subject: [PATCH 1212/1537] [tx-robot] updated from transifex

---
 apps/bookmarks/l10n/bg_BG.php   |  12 +
 apps/bookmarks/l10n/et_EE.php   |  10 +
 apps/bookmarks/l10n/fr.php      |  12 +
 apps/bookmarks/l10n/it.php      |  12 +
 apps/calendar/l10n/bg_BG.php    |  50 +-
 apps/calendar/l10n/fr.php       |  10 +-
 apps/calendar/l10n/it.php       |  12 +-
 apps/calendar/l10n/ru.php       |  44 +-
 apps/calendar/l10n/tr.php       |  50 +-
 apps/contacts/l10n/ar.php       |  13 +-
 apps/contacts/l10n/cs_CZ.php    |  61 +-
 apps/contacts/l10n/da.php       |  73 ++-
 apps/contacts/l10n/eo.php       |  59 +-
 apps/contacts/l10n/es.php       |  61 +-
 apps/contacts/l10n/et_EE.php    |  58 +-
 apps/contacts/l10n/eu.php       |  71 ++-
 apps/contacts/l10n/fa.php       |  61 +-
 apps/contacts/l10n/gl.php       | 131 ++++-
 apps/contacts/l10n/he.php       | 102 +++-
 apps/contacts/l10n/hr.php       |  61 +-
 apps/contacts/l10n/hu_HU.php    |  61 +-
 apps/contacts/l10n/ia.php       |  24 +-
 apps/contacts/l10n/ja_JP.php    |  62 +-
 apps/contacts/l10n/ko.php       | 103 +++-
 apps/contacts/l10n/lb.php       |  65 ++-
 apps/contacts/l10n/lt_LT.php    |  25 +-
 apps/contacts/l10n/mk.php       |  61 +-
 apps/contacts/l10n/ms_MY.php    | 132 ++++-
 apps/contacts/l10n/nb_NO.php    |  53 +-
 apps/contacts/l10n/nl.php       |  35 +-
 apps/contacts/l10n/nn_NO.php    |  13 +-
 apps/contacts/l10n/pl.php       |  61 +-
 apps/contacts/l10n/pt_BR.php    |  61 +-
 apps/contacts/l10n/pt_PT.php    |  81 ++-
 apps/contacts/l10n/ro.php       |  19 +-
 apps/contacts/l10n/ru.php       |  87 ++-
 apps/contacts/l10n/sl.php       |  61 +-
 apps/contacts/l10n/sr.php       |  10 +-
 apps/contacts/l10n/sr@latin.php |   3 +-
 apps/contacts/l10n/th_TH.php    |  61 +-
 apps/contacts/l10n/tr.php       | 103 +++-
 apps/contacts/l10n/uk.php       |   7 +-
 apps/contacts/l10n/zh_CN.php    |  83 ++-
 apps/contacts/l10n/zh_TW.php    |  15 +-
 apps/files/l10n/bg_BG.php       |  17 +-
 apps/files/l10n/ca.php          |   2 +
 apps/files/l10n/de.php          |   2 +
 apps/files/l10n/es.php          |   2 +
 apps/files/l10n/fr.php          |   2 +
 apps/files/l10n/it.php          |   2 +
 apps/files/l10n/pl.php          |   2 +
 apps/files/l10n/ru.php          |   3 +
 apps/files/l10n/sl.php          |   4 +-
 apps/files/l10n/sv.php          |   2 +
 apps/files/l10n/tr.php          |   3 +
 apps/files/l10n/uk.php          |  22 +-
 apps/gallery/l10n/pl.php        |   8 +-
 apps/gallery/l10n/tr.php        |   8 +-
 apps/media/l10n/bg_BG.php       |   1 +
 apps/media/l10n/uk.php          |  14 +
 core/l10n/ar.php                |   3 +-
 core/l10n/bg_BG.php             |  25 +-
 core/l10n/ca.php                |  22 +-
 core/l10n/cs_CZ.php             |  22 +-
 core/l10n/da.php                |  22 +-
 core/l10n/de.php                |   2 +-
 core/l10n/el.php                |  22 +-
 core/l10n/eo.php                |  29 +-
 core/l10n/es.php                |  22 +-
 core/l10n/et_EE.php             |  22 +-
 core/l10n/eu.php                |  22 +-
 core/l10n/fa.php                |  22 +-
 core/l10n/fi_FI.php             |  21 +-
 core/l10n/fr.php                |  24 +-
 core/l10n/gl.php                |  22 +-
 core/l10n/he.php                |  21 +-
 core/l10n/hr.php                |  22 +-
 core/l10n/hu_HU.php             |  48 +-
 core/l10n/ia.php                |   3 +-
 core/l10n/id.php                |   3 +-
 core/l10n/it.php                |  22 +-
 core/l10n/ja_JP.php             |  22 +-
 core/l10n/ko.php                |  22 +-
 core/l10n/lb.php                |   3 +-
 core/l10n/lt_LT.php             |  24 +-
 core/l10n/lv.php                |   2 +-
 core/l10n/mk.php                |  22 +-
 core/l10n/ms_MY.php             |  28 +-
 core/l10n/nb_NO.php             |  21 +-
 core/l10n/nl.php                |  21 +-
 core/l10n/nn_NO.php             |   3 +-
 core/l10n/pl.php                |  22 +-
 core/l10n/pt_BR.php             |  22 +-
 core/l10n/pt_PT.php             |  22 +-
 core/l10n/ro.php                |   3 +-
 core/l10n/ru.php                |  22 +-
 core/l10n/sk_SK.php             |  22 +-
 core/l10n/sl.php                |  22 +-
 core/l10n/sr.php                |   3 +-
 core/l10n/sr@latin.php          |   2 +-
 core/l10n/sv.php                |   2 +-
 core/l10n/th_TH.php             |  22 +-
 core/l10n/tr.php                |  22 +-
 core/l10n/uk.php                |   2 +-
 core/l10n/vi.php                |   2 +-
 core/l10n/zh_CN.php             |  21 +-
 core/l10n/zh_TW.php             |   3 +-
 l10n/af/contacts.po             | 712 ++++++++++++-----------
 l10n/af/core.po                 |  50 +-
 l10n/af/files.po                |  30 +-
 l10n/ar/contacts.po             | 716 ++++++++++++-----------
 l10n/ar/core.po                 |  50 +-
 l10n/ar/files.po                |  30 +-
 l10n/ar_SA/contacts.po          | 192 ++++---
 l10n/ar_SA/core.po              |  40 +-
 l10n/ar_SA/files.po             |  30 +-
 l10n/bg_BG/bookmarks.po         |  27 +-
 l10n/bg_BG/calendar.po          | 500 ++++++++++------
 l10n/bg_BG/contacts.po          | 712 ++++++++++++-----------
 l10n/bg_BG/core.po              |  97 ++--
 l10n/bg_BG/files.po             |  61 +-
 l10n/bg_BG/media.po             |  13 +-
 l10n/bg_BG/settings.po          |  33 +-
 l10n/ca/contacts.po             | 194 ++++---
 l10n/ca/core.po                 |  86 +--
 l10n/ca/files.po                |  32 +-
 l10n/cs_CZ/contacts.po          | 930 ++++++++++++++++--------------
 l10n/cs_CZ/core.po              |  86 +--
 l10n/cs_CZ/files.po             |  30 +-
 l10n/da/contacts.po             | 935 ++++++++++++++++--------------
 l10n/da/core.po                 |  87 +--
 l10n/da/files.po                |  30 +-
 l10n/de/contacts.po             | 194 ++++---
 l10n/de/core.po                 |  42 +-
 l10n/de/files.po                |  32 +-
 l10n/el/contacts.po             | 194 ++++---
 l10n/el/core.po                 |  87 +--
 l10n/el/files.po                |  30 +-
 l10n/eo/contacts.po             | 764 ++++++++++++------------
 l10n/eo/core.po                 | 100 ++--
 l10n/eo/files.po                |  30 +-
 l10n/es/contacts.po             | 931 ++++++++++++++++--------------
 l10n/es/core.po                 |  87 +--
 l10n/es/files.po                |  32 +-
 l10n/es/lib.po                  |  53 +-
 l10n/et_EE/bookmarks.po         |  23 +-
 l10n/et_EE/contacts.po          | 762 ++++++++++++------------
 l10n/et_EE/core.po              |  86 +--
 l10n/et_EE/files.po             |  30 +-
 l10n/et_EE/lib.po               |  53 +-
 l10n/eu/contacts.po             | 952 +++++++++++++++---------------
 l10n/eu/core.po                 |  86 +--
 l10n/eu/files.po                |  30 +-
 l10n/eu_ES/bookmarks.po         |  60 ++
 l10n/eu_ES/calendar.po          | 814 ++++++++++++++++++++++++++
 l10n/eu_ES/contacts.po          | 875 ++++++++++++++++++++++++++++
 l10n/eu_ES/core.po              | 272 +++++++++
 l10n/eu_ES/files.po             | 222 +++++++
 l10n/eu_ES/gallery.po           |  58 ++
 l10n/eu_ES/lib.po               | 112 ++++
 l10n/eu_ES/media.po             |  66 +++
 l10n/eu_ES/settings.po          | 218 +++++++
 l10n/fa/contacts.po             | 930 ++++++++++++++++--------------
 l10n/fa/core.po                 |  86 +--
 l10n/fa/files.po                |  30 +-
 l10n/fi_FI/contacts.po          | 194 ++++---
 l10n/fi_FI/core.po              |  86 +--
 l10n/fi_FI/files.po             |  30 +-
 l10n/fr/bookmarks.po            |  28 +-
 l10n/fr/calendar.po             |  14 +-
 l10n/fr/contacts.po             | 194 ++++---
 l10n/fr/core.po                 |  91 +--
 l10n/fr/files.po                |  33 +-
 l10n/fr/lib.po                  |  54 +-
 l10n/fr/settings.po             |  10 +-
 l10n/gl/contacts.po             | 984 ++++++++++++++++---------------
 l10n/gl/core.po                 |  86 +--
 l10n/gl/files.po                |  30 +-
 l10n/he/contacts.po             | 773 +++++++++++++------------
 l10n/he/core.po                 |  87 +--
 l10n/he/files.po                |  30 +-
 l10n/hr/contacts.po             | 850 ++++++++++++++-------------
 l10n/hr/core.po                 |  88 +--
 l10n/hr/files.po                |  30 +-
 l10n/hu_HU/contacts.po          | 930 ++++++++++++++++--------------
 l10n/hu_HU/core.po              | 112 ++--
 l10n/hu_HU/files.po             |  30 +-
 l10n/hy/contacts.po             | 712 ++++++++++++-----------
 l10n/hy/core.po                 |  50 +-
 l10n/hy/files.po                |  30 +-
 l10n/ia/contacts.po             | 714 ++++++++++++-----------
 l10n/ia/core.po                 |  50 +-
 l10n/ia/files.po                |  30 +-
 l10n/id/contacts.po             | 712 ++++++++++++-----------
 l10n/id/core.po                 |  50 +-
 l10n/id/files.po                |  30 +-
 l10n/id_ID/contacts.po          | 192 ++++---
 l10n/id_ID/core.po              |  40 +-
 l10n/id_ID/files.po             |  30 +-
 l10n/it/bookmarks.po            |  27 +-
 l10n/it/calendar.po             |  16 +-
 l10n/it/contacts.po             | 194 ++++---
 l10n/it/core.po                 |  86 +--
 l10n/it/files.po                |  32 +-
 l10n/it/lib.po                  |  53 +-
 l10n/ja_JP/contacts.po          | 932 ++++++++++++++++--------------
 l10n/ja_JP/core.po              |  86 +--
 l10n/ja_JP/files.po             |  30 +-
 l10n/ko/contacts.po             | 924 ++++++++++++++++--------------
 l10n/ko/core.po                 |  86 +--
 l10n/ko/files.po                |  30 +-
 l10n/lb/contacts.po             | 798 ++++++++++++++------------
 l10n/lb/core.po                 |  50 +-
 l10n/lb/files.po                |  30 +-
 l10n/lt_LT/contacts.po          | 742 +++++++++++++-----------
 l10n/lt_LT/core.po              |  90 +--
 l10n/lt_LT/files.po             |  30 +-
 l10n/lv/contacts.po             | 194 ++++---
 l10n/lv/core.po                 |  42 +-
 l10n/lv/files.po                |  30 +-
 l10n/mk/contacts.po             | 931 ++++++++++++++++--------------
 l10n/mk/core.po                 |  87 +--
 l10n/mk/files.po                |  30 +-
 l10n/ms_MY/contacts.po          | 987 +++++++++++++++++---------------
 l10n/ms_MY/core.po              |  99 ++--
 l10n/ms_MY/files.po             |  30 +-
 l10n/nb_NO/contacts.po          | 760 ++++++++++++------------
 l10n/nb_NO/core.po              |  86 +--
 l10n/nb_NO/files.po             |  30 +-
 l10n/nl/contacts.po             | 716 ++++++++++++-----------
 l10n/nl/core.po                 |  87 +--
 l10n/nl/files.po                |  30 +-
 l10n/nn_NO/contacts.po          | 716 ++++++++++++-----------
 l10n/nn_NO/core.po              |  50 +-
 l10n/nn_NO/files.po             |  30 +-
 l10n/pl/contacts.po             | 930 ++++++++++++++++--------------
 l10n/pl/core.po                 |  87 +--
 l10n/pl/files.po                |  32 +-
 l10n/pl/gallery.po              |  65 +--
 l10n/pt_BR/contacts.po          | 932 ++++++++++++++++--------------
 l10n/pt_BR/core.po              |  87 +--
 l10n/pt_BR/files.po             |  30 +-
 l10n/pt_PT/contacts.po          | 976 ++++++++++++++++---------------
 l10n/pt_PT/core.po              |  86 +--
 l10n/pt_PT/files.po             |  30 +-
 l10n/ro/contacts.po             | 716 ++++++++++++-----------
 l10n/ro/core.po                 |  50 +-
 l10n/ro/files.po                |  30 +-
 l10n/ru/calendar.po             | 412 ++++++++-----
 l10n/ru/contacts.po             | 977 ++++++++++++++++---------------
 l10n/ru/core.po                 |  87 +--
 l10n/ru/files.po                |  35 +-
 l10n/ru/settings.po             |  11 +-
 l10n/sk_SK/contacts.po          | 194 ++++---
 l10n/sk_SK/core.po              |  86 +--
 l10n/sk_SK/files.po             |  30 +-
 l10n/sl/contacts.po             | 930 ++++++++++++++++--------------
 l10n/sl/core.po                 |  86 +--
 l10n/sl/files.po                |  34 +-
 l10n/so/contacts.po             | 192 ++++---
 l10n/so/core.po                 |  40 +-
 l10n/so/files.po                |  30 +-
 l10n/sr/contacts.po             | 714 ++++++++++++-----------
 l10n/sr/core.po                 |  50 +-
 l10n/sr/files.po                |  30 +-
 l10n/sr@latin/contacts.po       | 714 ++++++++++++-----------
 l10n/sr@latin/core.po           |  50 +-
 l10n/sr@latin/files.po          |  30 +-
 l10n/sv/contacts.po             | 194 ++++---
 l10n/sv/core.po                 |  42 +-
 l10n/sv/files.po                |  32 +-
 l10n/templates/bookmarks.pot    |   2 +-
 l10n/templates/calendar.pot     |   2 +-
 l10n/templates/contacts.pot     | 190 +++---
 l10n/templates/core.pot         |  38 +-
 l10n/templates/files.pot        |  28 +-
 l10n/templates/gallery.pot      |   2 +-
 l10n/templates/lib.pot          |   2 +-
 l10n/templates/media.pot        |   2 +-
 l10n/templates/settings.pot     |   2 +-
 l10n/th_TH/contacts.po          | 930 ++++++++++++++++--------------
 l10n/th_TH/core.po              |  86 +--
 l10n/th_TH/files.po             |  30 +-
 l10n/tr/calendar.po             | 407 ++++++++-----
 l10n/tr/contacts.po             | 931 ++++++++++++++++--------------
 l10n/tr/core.po                 |  87 +--
 l10n/tr/files.po                |  35 +-
 l10n/tr/gallery.po              |  66 +--
 l10n/tr/settings.po             |  15 +-
 l10n/uk/contacts.po             | 714 ++++++++++++-----------
 l10n/uk/core.po                 |  50 +-
 l10n/uk/files.po                |  68 ++-
 l10n/uk/lib.po                  |  51 +-
 l10n/uk/media.po                |  35 +-
 l10n/uk/settings.po             |  49 +-
 l10n/vi/contacts.po             | 192 ++++---
 l10n/vi/core.po                 |  40 +-
 l10n/vi/files.po                |  30 +-
 l10n/zh_CN/contacts.po          | 981 ++++++++++++++++---------------
 l10n/zh_CN/core.po              |  87 +--
 l10n/zh_CN/files.po             |  30 +-
 l10n/zh_TW/contacts.po          | 716 ++++++++++++-----------
 l10n/zh_TW/core.po              |  50 +-
 l10n/zh_TW/files.po             |  30 +-
 lib/l10n/es.php                 |  25 +
 lib/l10n/et_EE.php              |  25 +
 lib/l10n/fr.php                 |  25 +
 lib/l10n/it.php                 |  25 +
 lib/l10n/uk.php                 |  24 +
 settings/l10n/bg_BG.php         |  13 +
 settings/l10n/fr.php            |   6 +-
 settings/l10n/ru.php            |   2 +
 settings/l10n/tr.php            |   4 +
 settings/l10n/uk.php            |  23 +
 314 files changed, 28583 insertions(+), 20383 deletions(-)
 create mode 100644 apps/bookmarks/l10n/bg_BG.php
 create mode 100644 apps/bookmarks/l10n/et_EE.php
 create mode 100644 apps/bookmarks/l10n/fr.php
 create mode 100644 apps/bookmarks/l10n/it.php
 create mode 100644 apps/media/l10n/uk.php
 create mode 100644 l10n/eu_ES/bookmarks.po
 create mode 100644 l10n/eu_ES/calendar.po
 create mode 100644 l10n/eu_ES/contacts.po
 create mode 100644 l10n/eu_ES/core.po
 create mode 100644 l10n/eu_ES/files.po
 create mode 100644 l10n/eu_ES/gallery.po
 create mode 100644 l10n/eu_ES/lib.po
 create mode 100644 l10n/eu_ES/media.po
 create mode 100644 l10n/eu_ES/settings.po
 create mode 100644 lib/l10n/es.php
 create mode 100644 lib/l10n/et_EE.php
 create mode 100644 lib/l10n/fr.php
 create mode 100644 lib/l10n/it.php
 create mode 100644 lib/l10n/uk.php
 create mode 100644 settings/l10n/uk.php

diff --git a/apps/bookmarks/l10n/bg_BG.php b/apps/bookmarks/l10n/bg_BG.php
new file mode 100644
index 0000000000..04d731b107
--- /dev/null
+++ b/apps/bookmarks/l10n/bg_BG.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Отметки",
+"unnamed" => "неозаглавено",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
+"Read later" => "Отмятане",
+"Address" => "Адрес",
+"Title" => "Заглавие",
+"Tags" => "Етикети",
+"Save bookmark" => "Запис на отметката",
+"You have no bookmarks" => "Нямате отметки",
+"Bookmarklet <br />" => "Бутон за отметки <br />"
+);
diff --git a/apps/bookmarks/l10n/et_EE.php b/apps/bookmarks/l10n/et_EE.php
new file mode 100644
index 0000000000..da9e4d92a6
--- /dev/null
+++ b/apps/bookmarks/l10n/et_EE.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Järjehoidjad",
+"unnamed" => "nimetu",
+"Read later" => "Loe hiljem",
+"Address" => "Aadress",
+"Title" => "Pealkiri",
+"Tags" => "Sildid",
+"Save bookmark" => "Salvesta järjehoidja",
+"You have no bookmarks" => "Sul pole järjehoidjaid"
+);
diff --git a/apps/bookmarks/l10n/fr.php b/apps/bookmarks/l10n/fr.php
new file mode 100644
index 0000000000..508c82369f
--- /dev/null
+++ b/apps/bookmarks/l10n/fr.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Favoris",
+"unnamed" => "sans titre",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :",
+"Read later" => "Lire plus tard",
+"Address" => "Adresse",
+"Title" => "Titre",
+"Tags" => "Étiquettes",
+"Save bookmark" => "Sauvegarder le favori",
+"You have no bookmarks" => "Vous n'avez aucun favori",
+"Bookmarklet <br />" => "Gestionnaire de favoris <br />"
+);
diff --git a/apps/bookmarks/l10n/it.php b/apps/bookmarks/l10n/it.php
new file mode 100644
index 0000000000..862d75bde4
--- /dev/null
+++ b/apps/bookmarks/l10n/it.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Segnalibri",
+"unnamed" => "senza nome",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:",
+"Read later" => "Leggi dopo",
+"Address" => "Indirizzo",
+"Title" => "Titolo",
+"Tags" => "Tag",
+"Save bookmark" => "Salva segnalibro",
+"You have no bookmarks" => "Non hai segnalibri",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
index e4f73d24a9..592502b268 100644
--- a/apps/calendar/l10n/bg_BG.php
+++ b/apps/calendar/l10n/bg_BG.php
@@ -1,7 +1,23 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Не са открити календари.",
+"No events found." => "Не са открити събития.",
+"Import failed" => "Грешка при внасяне",
+"New Timezone:" => "Нов часови пояс:",
 "Timezone changed" => "Часовата зона е сменена",
 "Invalid request" => "Невалидна заявка",
 "Calendar" => "Календар",
+"Birthday" => "Роджен ден",
+"Clients" => "Клиенти",
+"Holidays" => "Празници",
+"Ideas" => "Идеи",
+"Journey" => "Пътуване",
+"Meeting" => "Среща",
+"Other" => "Друго",
+"Personal" => "Лично",
+"Projects" => "Проекти",
+"Questions" => "Въпроси",
+"Work" => "Работа",
+"New Calendar" => "Нов календар",
 "Does not repeat" => "Не се повтаря",
 "Daily" => "Дневно",
 "Weekly" => "Седмично",
@@ -9,32 +25,64 @@
 "Bi-Weekly" => "Двуседмично",
 "Monthly" => "Месечно",
 "Yearly" => "Годишно",
+"never" => "никога",
+"Monday" => "Понеделник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Сряда",
+"Thursday" => "Четвъртък",
+"Friday" => "Петък",
+"Saturday" => "Събота",
+"Sunday" => "Неделя",
 "All day" => "Всички дни",
+"Missing fields" => "Липсват полета",
 "Title" => "Заглавие",
 "Week" => "Седмица",
 "Month" => "Месец",
+"List" => "Списък",
 "Today" => "Днес",
 "Calendars" => "Календари",
 "There was a fail, while parsing the file." => "Възникна проблем с разлистването на файла.",
 "Choose active calendars" => "Изберете активен календар",
+"Your calendars" => "Вашите календари",
+"Shared calendars" => "Споделени календари",
+"No shared calendars" => "Няма споделени календари",
+"Share Calendar" => "Споделяне на календар",
 "Download" => "Изтегляне",
 "Edit" => "Промяна",
+"Delete" => "Изтриване",
+"New calendar" => "Нов календар",
 "Edit calendar" => "Промени календар",
 "Displayname" => "Екранно име",
 "Active" => "Активен",
 "Calendar color" => "Цвят на календара",
+"Save" => "Запис",
 "Submit" => "Продължи",
+"Cancel" => "Отказ",
 "Edit an event" => "Промяна на събитие",
+"Export" => "Изнасяне",
+"Share" => "Споделяне",
 "Title of the Event" => "Наименование",
 "Category" => "Категория",
+"Separate categories with commas" => "Отделете категориите със запетаи",
+"Edit categories" => "Редактиране на категориите",
 "All Day Event" => "Целодневно събитие",
 "From" => "От",
 "To" => "До",
+"Advanced options" => "Разширени настройки",
 "Location" => "Локация",
 "Location of the Event" => "Локация",
 "Description" => "Описание",
 "Description of the Event" => "Описание",
 "Repeat" => "Повтори",
+"create a new calendar" => "създаване на нов календар",
+"Please choose a calendar" => "Изберете календар",
+"Name of new calendar" => "Име на новия календар",
+"Import" => "Внасяне",
+"Close Dialog" => "Затваряне на прозореца",
 "Create a new event" => "Ново събитие",
-"Timezone" => "Часова зона"
+"View an event" => "Преглед на събитие",
+"No categories selected" => "Няма избрани категории",
+"Timezone" => "Часова зона",
+"First day of the week" => "Първи ден на седмицата",
+"Groups" => "Групи"
 );
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 289bc905b3..c43b16631e 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -12,12 +12,12 @@
 "Timezone changed" => "Fuseau horaire modifié",
 "Invalid request" => "Requête invalide",
 "Calendar" => "Calendrier",
-"ddd" => "jjj",
-"ddd M/d" => "jjj M/j",
-"dddd M/d" => "jjjj M/j",
-"MMMM yyyy" => "MMMM aaaa",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "jjjj, MMM j, aaaa",
+"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
 "Birthday" => "Anniversaire",
 "Business" => "Professionnel",
 "Call" => "Appel",
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index b91e8b0df0..68f3e89dae 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -12,12 +12,12 @@
 "Timezone changed" => "Fuso orario cambiato",
 "Invalid request" => "Richiesta non valida",
 "Calendar" => "Calendario",
-"ddd" => "ggg",
-"ddd M/d" => "ggg M/g",
-"dddd M/d" => "gggg M/g",
-"MMMM yyyy" => "MMMM aaaa",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "gggg, MMM g, aaaa",
+"dddd, MMM d, yyyy" => "dddd, d MMM yyyy",
 "Birthday" => "Compleanno",
 "Business" => "Azienda",
 "Call" => "Chiama",
@@ -141,7 +141,7 @@
 "Share" => "Condividi",
 "Title of the Event" => "Titolo dell'evento",
 "Category" => "Categoria",
-"Separate categories with commas" => "Categorie separate con virgole",
+"Separate categories with commas" => "Categorie separate da virgole",
 "Edit categories" => "Modifica le categorie",
 "All Day Event" => "Evento che occupa tutta la giornata",
 "From" => "Da",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index af40b06b9f..934e2c4840 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -1,11 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Не все календари полностью кешированы",
+"Everything seems to be completely cached" => "Все, вроде бы, закешировано",
 "No calendars found." => "Календари не найдены.",
 "No events found." => "События не найдены.",
 "Wrong calendar" => "Неверный календарь",
+"The file contained either no events or all events are already saved in your calendar." => "Файл либо не собержит событий, либо все события уже есть в календаре",
+"events has been saved in the new calendar" => "события были сохранены в новый календарь",
+"Import failed" => "Ошибка импорта",
+"events has been saved in your calendar" => "события были сохранены в вашем календаре",
 "New Timezone:" => "Новый часовой пояс:",
 "Timezone changed" => "Часовой пояс изменён",
 "Invalid request" => "Неверный запрос",
 "Calendar" => "Календарь",
+"ddd" => "ддд",
+"ddd M/d" => "ддд М/д",
+"dddd M/d" => "дддд М/д",
+"MMMM yyyy" => "ММММ гггг",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
 "Birthday" => "День рождения",
 "Business" => "Бизнес",
 "Call" => "Звонить",
@@ -22,6 +34,7 @@
 "Questions" => "Вопросы",
 "Work" => "Работа",
 "unnamed" => "без имени",
+"New Calendar" => "Новый Календарь",
 "Does not repeat" => "Не повторяется",
 "Daily" => "Ежедневно",
 "Weekly" => "Еженедельно",
@@ -66,8 +79,26 @@
 "by day and month" => "по дню и месяцу",
 "Date" => "Дата",
 "Cal." => "Кал.",
+"Sun." => "Вс.",
+"Mon." => "Пн.",
+"Tue." => "Вт.",
+"Wed." => "Ср.",
+"Thu." => "Чт.",
+"Fri." => "Пт.",
+"Sat." => "Сб.",
+"Jan." => "Янв.",
+"Feb." => "Фев.",
+"Mar." => "Мар.",
+"Apr." => "Апр.",
+"May." => "Май.",
+"Jun." => "Июн.",
+"Jul." => "Июл.",
+"Aug." => "Авг.",
+"Sep." => "Сен.",
+"Oct." => "Окт.",
+"Nov." => "Ноя.",
+"Dec." => "Дек.",
 "All day" => "Весь день",
-"New Calendar" => "Новый Календарь",
 "Missing fields" => "Незаполненные поля",
 "Title" => "Название",
 "From Date" => "Дата начала",
@@ -131,25 +162,24 @@
 "Interval" => "Интервал",
 "End" => "Окончание",
 "occurrences" => "повторений",
-"Import a calendar file" => "Импортировать календарь из файла",
-"Please choose the calendar" => "Пожалуйста, выберите календарь",
 "create a new calendar" => "Создать новый календарь",
+"Import a calendar file" => "Импортировать календарь из файла",
+"Please choose a calendar" => "Пожалуйста, выберите календарь",
 "Name of new calendar" => "Название нового календаря",
 "Import" => "Импортировать",
-"Importing calendar" => "Импортируется календарь",
-"Calendar imported successfully" => "Календарь успешно импортирован",
 "Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое событие",
 "View an event" => "Показать событие",
 "No categories selected" => "Категории не выбраны",
-"Select category" => "Выбрать категорию",
+"of" => "из",
+"at" => "на",
 "Timezone" => "Часовой пояс",
 "Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
 "Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
 "First day of the week" => "Первый день недели",
-"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:",
+"more info" => "подробнее",
 "Users" => "Пользователи",
 "select users" => "выбрать пользователей",
 "Editable" => "Редактируемо",
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
index a72e4c39f6..912228dc72 100644
--- a/apps/calendar/l10n/tr.php
+++ b/apps/calendar/l10n/tr.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Bütün takvimler tamamen  ön belleğe alınmadı",
+"Everything seems to be completely cached" => "Bütün herşey tamamen ön belleğe alınmış görünüyor",
 "No calendars found." => "Takvim yok.",
 "No events found." => "Etkinlik yok.",
 "Wrong calendar" => "Yanlış takvim",
+"The file contained either no events or all events are already saved in your calendar." => "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı.",
+"events has been saved in the new calendar" => "Etkinlikler yeni takvimde saklandı",
+"Import failed" => "İçeri aktarma başarısız oldu.",
+"events has been saved in your calendar" => "Etkinlikler takviminizde saklandı",
 "New Timezone:" => "Yeni Zamandilimi:",
 "Timezone changed" => "Zaman dilimi değiştirildi",
 "Invalid request" => "Geçersiz istek",
 "Calendar" => "Takvim",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Doğum günü",
 "Business" => "İş",
 "Call" => "Arama",
@@ -22,7 +33,9 @@
 "Projects" => "Projeler",
 "Questions" => "Sorular",
 "Work" => "İş",
+"by" => "hazırlayan",
 "unnamed" => "isimsiz",
+"New Calendar" => "Yeni Takvim",
 "Does not repeat" => "Tekrar etmiyor",
 "Daily" => "Günlük",
 "Weekly" => "Haftalı",
@@ -67,8 +80,26 @@
 "by day and month" => "gün ve aya göre",
 "Date" => "Tarih",
 "Cal." => "Takv.",
+"Sun." => "Paz.",
+"Mon." => "Pzt.",
+"Tue." => "Sal.",
+"Wed." => "Çar.",
+"Thu." => "Per.",
+"Fri." => "Cum.",
+"Sat." => "Cmt.",
+"Jan." => "Oca.",
+"Feb." => "Şbt.",
+"Mar." => "Mar.",
+"Apr." => "Nis",
+"May." => "May.",
+"Jun." => "Haz.",
+"Jul." => "Tem.",
+"Aug." => "Agu.",
+"Sep." => "Eyl.",
+"Oct." => "Eki.",
+"Nov." => "Kas.",
+"Dec." => "Ara.",
 "All day" => "Tüm gün",
-"New Calendar" => "Yeni Takvim",
 "Missing fields" => "Eksik alanlar",
 "Title" => "Başlık",
 "From Date" => "Bu Tarihten",
@@ -132,18 +163,17 @@
 "Interval" => "Aralık",
 "End" => "Son",
 "occurrences" => "olaylar",
-"Import a calendar file" => "Takvim dosyasını içeri aktar",
-"Please choose the calendar" => "Lütfen takvimi seçin",
 "create a new calendar" => "Yeni bir takvim oluştur",
+"Import a calendar file" => "Takvim dosyasını içeri aktar",
+"Please choose a calendar" => "Lütfen takvim seçiniz",
 "Name of new calendar" => "Yeni takvimin adı",
+"Take an available name!" => "Müsait ismi al !",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir.",
 "Import" => "İçe Al",
-"Importing calendar" => "Takvim içe aktarılıyor",
-"Calendar imported successfully" => "Takvim başarıyla içe aktarıldı",
 "Close Dialog" => "Diyalogu kapat",
 "Create a new event" => "Yeni olay oluştur",
 "View an event" => "Bir olay görüntüle",
 "No categories selected" => "Kategori seçilmedi",
-"Select category" => "Kategori seçin",
 "of" => "nın",
 "at" => "üzerinde",
 "Timezone" => "Zaman dilimi",
@@ -152,7 +182,13 @@
 "24h" => "24s",
 "12h" => "12s",
 "First day of the week" => "Haftanın ilk günü",
-"Calendar CalDAV syncing address:" => "CalDAV Takvim eşzamanlama adresi:",
+"Cache" => "Önbellek",
+"Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.",
+"Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.",
+"more info" => "daha fazla bilgi",
+"Primary address (Kontact et al)" => "Öncelikli adres",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Sadece okunabilir iCalendar link(ler)i",
 "Users" => "Kullanıcılar",
 "select users" => "kullanıcıları seç",
 "Editable" => "Düzenlenebilir",
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 6bebda3b6a..2b3a0c97be 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -3,14 +3,12 @@
 "There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
-"Error adding contact property." => "خطء خلال اضافة صفة المعرفه.",
-"Error adding addressbook." => "خطء خلال اضافة كتاب عناوين.",
-"Error activating addressbook." => "خطء خلال تفعيل كتاب العناوين.",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
 "Error deleting contact property." => "خطء خلال محي الصفه.",
 "Error updating contact property." => "خطء خلال تعديل الصفه.",
 "Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "Contacts" => "المعارف",
+"Contact" => "معرفه",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
 "Address" => "عنوان",
@@ -25,7 +23,7 @@
 "Fax" => "الفاكس",
 "Video" => "الفيديو",
 "Pager" => "الرنان",
-"Contact" => "معرفه",
+"Birthday" => "تاريخ الميلاد",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
 "New Address Book" => "كتاب عناوين جديد",
@@ -33,20 +31,17 @@
 "Download" => "انزال",
 "Edit" => "تعديل",
 "Delete" => "حذف",
-"Download contact" => "انزال المعرفه",
-"Delete contact" => "امحي المعرفه",
-"Birthday" => "تاريخ الميلاد",
 "Preferred" => "مفضل",
 "Phone" => "الهاتف",
+"Download contact" => "انزال المعرفه",
+"Delete contact" => "امحي المعرفه",
 "Type" => "نوع",
 "PO Box" => "العنوان البريدي",
 "Extended" => "إضافة",
-"Street" => "شارع",
 "City" => "المدينة",
 "Region" => "المنطقة",
 "Zipcode" => "رقم المنطقة",
 "Country" => "البلد",
-"Add" => "أدخل",
 "Addressbook" => "كتاب العناوين",
 "New Addressbook" => "كتاب عناوين جديد",
 "Edit Addressbook" => "عدل كتاب العناوين",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 391a62010b..834fa47240 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
 "There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
+"element name is not set." => "jméno elementu není nastaveno.",
+"id is not set." => "id neni nastaveno.",
 "Cannot add empty property." => "Nelze přidat prazdný údaj.",
 "At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
 "Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
-"Error adding contact property." => "Chyba během přdávání údaje kontaktu.",
 "No ID provided" => "ID nezadáno",
 "Error setting checksum." => "Chyba při nastavování kontrolního součtu.",
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány k smazání.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Žádné kontakty nenalezeny.",
 "Missing ID" => "Chybí ID",
 "Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
-"Cannot add addressbook with an empty name." => "Nelze přidat adresář s prázdným jménem.",
-"Error adding addressbook." => "Chyba při přidávání adresáře.",
-"Error activating addressbook." => "Chyba při aktivaci adresáře.",
 "No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
 "Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
 "Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
-"id is not set." => "id neni nastaveno.",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
 "Contact ID is missing." => "Chybí ID kontaktu.",
-"Missing contact id." => "Chybí id kontaktu.",
 "No photo path was submitted." => "Žádná fotka nebyla nahrána.",
 "File doesn't exist:" => "Soubor neexistuje:",
 "Error loading image." => "Chyba při načítání obrázku.",
-"element name is not set." => "jméno elementu není nastaveno.",
+"Error getting contact object." => "Chyba při převzetí objektu kontakt.",
+"Error getting PHOTO property." => "Chyba při získávání fotky.",
+"Error saving contact." => "Chyba při ukládání kontaktu.",
+"Error resizing image" => "Chyba při změně velikosti obrázku.",
+"Error cropping image" => "Chyba při osekávání obrázku.",
+"Error creating temporary image" => "Chyba při vytváření dočasného obrázku.",
+"Error finding image: " => "Chyba při hledání obrázku:",
 "checksum is not set." => "kontrolní součet není nastaven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Něco se pokazilo. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Nahrávaný soubor se nahrál pouze z části",
 "No file was uploaded" => "Žádný soubor nebyl nahrán",
 "Missing a temporary folder" => "Chybí dočasný adresář",
+"Couldn't save temporary image: " => "Nemohu uložit dočasný obrázek: ",
+"Couldn't load temporary image: " => "Nemohu načíst dočasný obrázek: ",
+"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
 "Contacts" => "Kontakty",
-"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
+"Sorry, this functionality has not been implemented yet" => "Bohužel, tato funkce nebyla ještě implementována.",
+"Not implemented" => "Neimplementováno",
+"Couldn't get a valid address." => "Nelze získat platnou adresu.",
+"Error" => "Chyba",
+"Contact" => "Kontakt",
+"This property has to be non-empty." => "Tento parametr nemuže zůstat nevyplněn.",
+"Couldn't serialize elements." => "Prvky nelze převést..",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org",
+"Edit name" => "Upravit jméno",
+"No files selected for upload." => "Žádné soubory nebyly vybrány k nahrání.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost.",
+"Select type" => "Vybrat typ",
+"Result: " => "Výsledek: ",
+" imported, " => "importováno v pořádku,",
+" failed." => "neimportováno.",
 "Addressbook not found." => "Adresář nenalezen.",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Narozeniny",
 "{name}'s Birthday" => "Narozeniny {name}",
-"Contact" => "Kontakt",
 "Add Contact" => "Přidat kontakt",
+"Import" => "Import",
 "Addressbooks" => "Adresáře",
+"Close" => "Zavřít",
 "Configure Address Books" => "Nastavit adresáře",
 "New Address Book" => "Nový adresář",
-"Import from VCF" => "Importovat z VCF",
 "CardDav Link" => "CardDav odkaz",
 "Download" => "Stažení",
 "Edit" => "Editovat",
 "Delete" => "Odstranit",
-"Download contact" => "Stáhnout kontakt",
-"Delete contact" => "Odstranit kontakt",
 "Drop photo to upload" => "Přetáhněte sem fotku pro její nahrání",
+"Delete current photo" => "Smazat současnou fotku",
+"Edit current photo" => "Upravit současnou fotku",
+"Upload new photo" => "Nahrát novou fotku",
+"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami",
 "Edit name details" => "Upravit podrobnosti jména",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
-"Birthday" => "Narozeniny",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupiny",
 "Separate groups with commas" => "Oddělte skupiny čárkami",
@@ -94,24 +115,19 @@
 "Edit address details" => "Upravit podrobnosti adresy",
 "Add notes here." => "Zde můžete připsat poznámky.",
 "Add field" => "Přidat políčko",
-"Profile picture" => "Profilová fotka",
 "Phone" => "Telefon",
 "Note" => "Poznámka",
-"Delete current photo" => "Smazat současnou fotku",
-"Edit current photo" => "Upravit současnou fotku",
-"Upload new photo" => "Nahrát novou fotku",
-"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
+"Download contact" => "Stáhnout kontakt",
+"Delete contact" => "Odstranit kontakt",
+"The temporary image has been removed from cache." => "Obrázek byl odstraněn z dočasné paměti.",
 "Edit address" => "Upravit adresu",
 "Type" => "Typ",
 "PO Box" => "PO box",
 "Extended" => "Rozšířené",
-"Street" => "Ulice",
 "City" => "Město",
 "Region" => "Kraj",
 "Zipcode" => "PSČ",
 "Country" => "Země",
-"Edit categories" => "Upravit kategorie",
-"Add" => "Přidat",
 "Addressbook" => "Adresář",
 "Hon. prefixes" => "Tituly před",
 "Miss" => "Slečna",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Prosím zvolte adresář",
 "create a new addressbook" => "vytvořit nový adresář",
 "Name of new addressbook" => "Jméno nového adresáře",
-"Import" => "Import",
 "Importing contacts" => "Importování kontaktů",
-"Select address book to import to:" => "Vyberte adresář do kterého chcete importovat:",
-"Select from HD" => "Vybrat z disku",
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
 "Configure addressbooks" => "Nastavit adresář",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 28753edda4..cae783d297 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,33 +1,35 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
 "There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
+"element name is not set." => "Elementnavnet er ikke medsendt.",
+"id is not set." => "Intet ID medsendt.",
 "Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
 "At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
 "Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
-"Error adding contact property." => "Fejl ved tilføjelse af egenskab.",
 "No ID provided" => "Intet ID medsendt",
 "Error setting checksum." => "Kunne ikke sætte checksum.",
 "No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
 "No address books found." => "Der blev ikke fundet nogen adressebøger.",
 "No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
 "Missing ID" => "Manglende ID",
-"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'en: \"",
-"Cannot add addressbook with an empty name." => "Kan ikke tilføje adressebog uden et navn.",
-"Error adding addressbook." => "Fejl ved tilføjelse af adressebog.",
-"Error activating addressbook." => "Fejl ved aktivering af adressebog.",
+"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'et: \"",
 "No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
 "Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
 "Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
 "The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
-"id is not set." => "Intet ID medsendt.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
 "Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
 "Contact ID is missing." => "Kontaktperson ID mangler.",
-"Missing contact id." => "Kontaktperson ID mangler.",
 "No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
 "Error loading image." => "Kunne ikke indlæse billede.",
-"element name is not set." => "Element navnet er ikke medsendt.",
+"Error getting contact object." => "Fejl ved indlæsning af kontaktpersonobjektet.",
+"Error getting PHOTO property." => "Fejl ved indlæsning af PHOTO feltet.",
+"Error saving contact." => "Kunne ikke gemme kontaktpersonen.",
+"Error resizing image" => "Kunne ikke ændre billedets størrelse",
+"Error cropping image" => "Kunne ikke beskære billedet",
+"Error creating temporary image" => "Kunne ikke oprette midlertidigt billede",
+"Error finding image: " => "Kunne ikke finde billedet: ",
 "checksum is not set." => "Checksum er ikke medsendt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
 "Something went FUBAR. " => "Noget gik grueligt galt. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
 "No file was uploaded" => "Ingen fil uploadet",
 "Missing a temporary folder" => "Manglende midlertidig mappe.",
+"Couldn't save temporary image: " => "Kunne ikke gemme midlertidigt billede: ",
+"Couldn't load temporary image: " => "Kunne ikke indlæse midlertidigt billede",
+"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
 "Contacts" => "Kontaktpersoner",
-"Drop a VCF file to import contacts." => "Drop en VCF fil for at importere kontaktpersoner.",
+"Sorry, this functionality has not been implemented yet" => "Denne funktion er desværre ikke implementeret endnu",
+"Not implemented" => "Ikke implementeret",
+"Couldn't get a valid address." => "Kunne ikke finde en gyldig adresse.",
+"Error" => "Fejl",
+"Contact" => "Kontaktperson",
+"This property has to be non-empty." => "Dette felt må ikke være tomt.",
+"Couldn't serialize elements." => "Kunne ikke serialisere elementerne.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org",
+"Edit name" => "Rediger navn",
+"No files selected for upload." => "Der er ikke valgt nogen filer at uploade.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Dr.",
+"Select type" => "Vælg type",
+"Result: " => "Resultat:",
+" imported, " => " importeret ",
+" failed." => " fejl.",
 "Addressbook not found." => "Adressebogen blev ikke fundet.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Personsøger",
 "Internet" => "Internet",
-"{name}'s Birthday" => "{name}'s fødselsdag",
-"Contact" => "Kontaktperson",
+"Birthday" => "Fødselsdag",
+"{name}'s Birthday" => "{name}s fødselsdag",
 "Add Contact" => "Tilføj kontaktperson",
+"Import" => "Importer",
 "Addressbooks" => "Adressebøger",
+"Close" => "Luk",
 "Configure Address Books" => "Konfigurer adressebøger",
 "New Address Book" => "Ny adressebog",
-"Import from VCF" => "Importer fra VCF",
 "CardDav Link" => "CardDav-link",
 "Download" => "Download",
 "Edit" => "Rediger",
 "Delete" => "Slet",
-"Download contact" => "Download kontaktperson",
-"Delete contact" => "Slet kontaktperson",
 "Drop photo to upload" => "Drop foto for at uploade",
+"Delete current photo" => "Slet nuværende foto",
+"Edit current photo" => "Rediger nuværende foto",
+"Upload new photo" => "Upload nyt foto",
+"Select photo from ownCloud" => "Vælg foto fra ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
 "Edit name details" => "Rediger navnedetaljer.",
-"Nickname" => "Øgenavn",
-"Enter nickname" => "Indtast øgenavn",
-"Birthday" => "Fødselsdag",
+"Nickname" => "Kaldenavn",
+"Enter nickname" => "Indtast kaldenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Opdel gruppenavne med kommaer",
@@ -93,25 +114,20 @@
 "View on map" => "Vis på kort",
 "Edit address details" => "Rediger adresse detaljer",
 "Add notes here." => "Tilføj noter her.",
-"Add field" => "Tilfæj element",
-"Profile picture" => "Profilbillede",
+"Add field" => "Tilføj element",
 "Phone" => "Telefon",
 "Note" => "Note",
-"Delete current photo" => "Slet nuværende foto",
-"Edit current photo" => "Rediger nuværende foto",
-"Upload new photo" => "Upload nyt foto",
-"Select photo from ownCloud" => "Vælg foto fra ownCloud",
+"Download contact" => "Download kontaktperson",
+"Delete contact" => "Slet kontaktperson",
+"The temporary image has been removed from cache." => "Det midlertidige billede er ikke længere tilgængeligt.",
 "Edit address" => "Rediger adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
-"Street" => "Vej",
 "City" => "By",
 "Region" => "Region",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Edit categories" => "Rediger grupper",
-"Add" => "Tilføj",
 "Addressbook" => "Adressebog",
 "Hon. prefixes" => "Foranstillede titler",
 "Miss" => "Frøken",
@@ -119,7 +135,7 @@
 "Mr" => "Hr.",
 "Sir" => "Sir",
 "Mrs" => "Fru",
-"Dr" => "Dr",
+"Dr" => "Dr.",
 "Given name" => "Fornavn",
 "Additional names" => "Mellemnavne",
 "Family name" => "Efternavn",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Vælg venligst adressebog",
 "create a new addressbook" => "Opret ny adressebog",
 "Name of new addressbook" => "Navn på ny adressebog",
-"Import" => "Importer",
 "Importing contacts" => "Importerer kontaktpersoner",
-"Select address book to import to:" => "Vælg hvilken adressebog, der skal importeres til:",
-"Select from HD" => "Vælg fra harddisk.",
 "You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
 "Add contact" => "Tilføj kontaktpeson.",
 "Configure addressbooks" => "Konfigurer adressebøger",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index ffc885a41a..e62077fe5d 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
 "There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
+"element name is not set." => "eronomo ne agordiĝis.",
+"id is not set." => "identigilo ne agordiĝis.",
 "Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
 "At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
 "Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
-"Error adding contact property." => "Eraro dum aldono de kontaktopropraĵo.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
 "Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
@@ -12,34 +13,50 @@
 "No contacts found." => "Neniu kontakto troviĝis.",
 "Missing ID" => "Mankas identigilo",
 "Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
-"Cannot add addressbook with an empty name." => "Ne eblas aldoni adresaron kun malplena nomo.",
-"Error adding addressbook." => "Eraro dum aldono de adresaro.",
-"Error activating addressbook." => "Eraro dum aktivigo de adresaro.",
 "No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
 "Error reading contact photo." => "Eraro dum lego de kontakta foto.",
 "Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
 "The loading photo is not valid." => "La alŝutata foto ne validas.",
-"id is not set." => "identigilo ne agordiĝis.",
 "Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
 "Error deleting contact property." => "Eraro dum forigo de kontaktopropraĵo.",
 "Contact ID is missing." => "Kontaktidentigilo mankas.",
-"Missing contact id." => "Mankas kontaktidentigilo.",
 "No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
 "File doesn't exist:" => "Dosiero ne ekzistas:",
 "Error loading image." => "Eraro dum ŝargado de bildo.",
-"element name is not set." => "eronomo ne agordiĝis.",
+"Error getting contact object." => "Eraro dum ekhaviĝis kontakta objekto.",
+"Error getting PHOTO property." => "Eraro dum ekhaviĝis la propraĵon PHOTO.",
+"Error saving contact." => "Eraro dum konserviĝis kontakto.",
+"Error resizing image" => "Eraro dum aligrandiĝis bildo",
+"Error cropping image" => "Eraro dum stuciĝis bildo.",
+"Error creating temporary image" => "Eraro dum kreiĝis provizora bildo.",
+"Error finding image: " => "Eraro dum serĉo de bildo: ",
 "checksum is not set." => "kontrolsumo ne agordiĝis.",
 "Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
 "Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
 "Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
+"Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
+"Couldn't save temporary image: " => "Ne eblis konservi provizoran bildon: ",
+"Couldn't load temporary image: " => "Ne eblis ŝargi provizoran bildon: ",
+"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
 "Contacts" => "Kontaktoj",
-"Drop a VCF file to import contacts." => "Demetu VCF-dosieron por enporti kontaktojn.",
+"Sorry, this functionality has not been implemented yet" => "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita.",
+"Not implemented" => "Ne disponebla",
+"Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
+"Error" => "Eraro",
+"Contact" => "Kontakto",
+"This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
+"Edit name" => "Redakti nomon",
+"No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
+"Select type" => "Elektu tipon",
+"Result: " => "Rezulto: ",
+" imported, " => " enportoj, ",
+" failed." => "malsukcesoj.",
 "Addressbook not found." => "Adresaro ne troviĝis.",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
@@ -57,25 +74,27 @@
 "Video" => "Videaĵo",
 "Pager" => "Televokilo",
 "Internet" => "Interreto",
+"Birthday" => "Naskiĝotago",
 "{name}'s Birthday" => "Naskiĝtago de {name}",
-"Contact" => "Kontakto",
 "Add Contact" => "Aldoni kontakton",
+"Import" => "Enporti",
 "Addressbooks" => "Adresaroj",
+"Close" => "Fermi",
 "Configure Address Books" => "Agordi adresarojn",
 "New Address Book" => "Nova adresaro",
-"Import from VCF" => "Enporti el VCF",
 "CardDav Link" => "CardDav-ligilo",
 "Download" => "Elŝuti",
 "Edit" => "Redakti",
 "Delete" => "Forigi",
-"Download contact" => "Elŝuti kontakton",
-"Delete contact" => "Forigi kontakton",
 "Drop photo to upload" => "Demeti foton por alŝuti",
+"Delete current photo" => "Forigi nunan foton",
+"Edit current photo" => "Redakti nunan foton",
+"Upload new photo" => "Alŝuti novan foton",
+"Select photo from ownCloud" => "Elekti foton el ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo",
 "Edit name details" => "Redakti detalojn de nomo",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
-"Birthday" => "Naskiĝotago",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Grupoj",
 "Separate groups with commas" => "Disigi grupojn per komoj",
@@ -91,24 +110,19 @@
 "Edit address details" => "Redakti detalojn de adreso",
 "Add notes here." => "Aldoni notojn ĉi tie.",
 "Add field" => "Aldoni kampon",
-"Profile picture" => "Profila bildo",
 "Phone" => "Telefono",
 "Note" => "Noto",
-"Delete current photo" => "Forigi nunan foton",
-"Edit current photo" => "Redakti nunan foton",
-"Upload new photo" => "Alŝuti novan foton",
-"Select photo from ownCloud" => "Elekti foton el ownCloud",
+"Download contact" => "Elŝuti kontakton",
+"Delete contact" => "Forigi kontakton",
+"The temporary image has been removed from cache." => "La provizora bildo estas forigita de la kaŝmemoro.",
 "Edit address" => "Redakti adreson",
 "Type" => "Tipo",
 "PO Box" => "Abonkesto",
 "Extended" => "Etendita",
-"Street" => "Strato",
 "City" => "Urbo",
 "Region" => "Regiono",
 "Zipcode" => "Poŝtokodo",
 "Country" => "Lando",
-"Edit categories" => "Redakti kategoriojn",
-"Add" => "Aldoni",
 "Addressbook" => "Adresaro",
 "Hon. prefixes" => "Honoraj antaŭmetaĵoj",
 "Miss" => "f-ino",
@@ -132,10 +146,7 @@
 "Please choose the addressbook" => "Bonvolu elekti adresaron",
 "create a new addressbook" => "krei novan adresaron",
 "Name of new addressbook" => "Nomo de nova adresaro",
-"Import" => "Enporti",
 "Importing contacts" => "Enportante kontaktojn",
-"Select address book to import to:" => "Elektu adresaron kien enporti:",
-"Select from HD" => "Elekti el malmoldisko",
 "You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
 "Add contact" => "Aldoni kontakton",
 "Configure addressbooks" => "Agordi adresarojn",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 2bdb300aa8..813cedc6e8 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
 "There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
+"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"id is not set." => "no se ha puesto ninguna ID.",
 "Cannot add empty property." => "No se puede añadir una propiedad vacía.",
 "At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
 "Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
-"Error adding contact property." => "Error al añadir una propiedad del contacto.",
 "No ID provided" => "No se ha proporcionado una ID",
 "Error setting checksum." => "Error al establecer la suma de verificación.",
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
@@ -12,22 +13,23 @@
 "No contacts found." => "No se encontraron contactos.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
-"Cannot add addressbook with an empty name." => "No se puede añadir una libreta de direcciones sin nombre",
-"Error adding addressbook." => "Error al añadir la libreta de direcciones.",
-"Error activating addressbook." => "Error al activar la libreta de direcciones.",
 "No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
 "Error reading contact photo." => "Error leyendo fotografía del contacto.",
 "Error saving temporary file." => "Error al guardar archivo temporal.",
 "The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
-"id is not set." => "no se ha puesto ninguna ID.",
 "Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
 "Error deleting contact property." => "Error al borrar una propiedad del contacto.",
 "Contact ID is missing." => "Falta la ID del contacto.",
-"Missing contact id." => "Falta la id del contacto.",
 "No photo path was submitted." => "No se ha introducido la ruta de la foto.",
 "File doesn't exist:" => "Archivo inexistente:",
 "Error loading image." => "Error cargando imagen.",
-"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"Error getting contact object." => "Fallo al coger el contacto.",
+"Error getting PHOTO property." => "Fallo al coger las propiedades de la foto .",
+"Error saving contact." => "Fallo al salvar un contacto",
+"Error resizing image" => "Fallo al cambiar de tamaño una foto",
+"Error cropping image" => "Fallo al cortar el tamaño de la foto",
+"Error creating temporary image" => "Fallo al crear la foto temporal",
+"Error finding image: " => "Fallo al encontrar la imagen",
 "checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
 "Something went FUBAR. " => "Plof. Algo ha fallado.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
 "No file was uploaded" => "No se ha subido ningún archivo",
 "Missing a temporary folder" => "Falta la carpeta temporal",
+"Couldn't save temporary image: " => "Fallo no pudo salvar a una imagen temporal",
+"Couldn't load temporary image: " => "Fallo no pudo cargara de una imagen temporal",
+"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
 "Contacts" => "Contactos",
-"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
+"Sorry, this functionality has not been implemented yet" => "Perdón esta función no esta aún implementada",
+"Not implemented" => "No esta implementada",
+"Couldn't get a valid address." => "Fallo : no hay dirección valida",
+"Error" => "Fallo",
+"Contact" => "Contacto",
+"This property has to be non-empty." => "Este campo no puede estar vacío.",
+"Couldn't serialize elements." => "Fallo no podido ordenar los elementos",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org",
+"Edit name" => "Edita el Nombre",
+"No files selected for upload." => "No hay ficheros seleccionados para subir",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fichero que quieres subir excede el tamaño máximo permitido en este servidor.",
+"Select type" => "Selecciona el tipo",
+"Result: " => "Resultado :",
+" imported, " => "Importado.",
+" failed." => "Fallo.",
 "Addressbook not found." => "Libreta de direcciones no encontrada.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
@@ -60,25 +79,27 @@
 "Video" => "Vídeo",
 "Pager" => "Localizador",
 "Internet" => "Internet",
+"Birthday" => "Cumpleaños",
 "{name}'s Birthday" => "Cumpleaños de {name}",
-"Contact" => "Contacto",
 "Add Contact" => "Añadir contacto",
+"Import" => "Importar",
 "Addressbooks" => "Libretas de direcciones",
+"Close" => "Cierra.",
 "Configure Address Books" => "Configurar libretas de direcciones",
 "New Address Book" => "Nueva libreta de direcciones",
-"Import from VCF" => "Importar desde VCF",
 "CardDav Link" => "Enlace CardDav",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Borrar",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Eliminar contacto",
 "Drop photo to upload" => "Suelta una foto para subirla",
+"Delete current photo" => "Eliminar fotografía actual",
+"Edit current photo" => "Editar fotografía actual",
+"Upload new photo" => "Subir nueva fotografía",
+"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma",
 "Edit name details" => "Editar los detalles del nombre",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
-"Birthday" => "Cumpleaños",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separa los grupos con comas",
@@ -94,24 +115,19 @@
 "Edit address details" => "Editar detalles de la dirección",
 "Add notes here." => "Añade notas aquí.",
 "Add field" => "Añadir campo",
-"Profile picture" => "Foto del perfil",
 "Phone" => "Teléfono",
 "Note" => "Nota",
-"Delete current photo" => "Eliminar fotografía actual",
-"Edit current photo" => "Editar fotografía actual",
-"Upload new photo" => "Subir nueva fotografía",
-"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Eliminar contacto",
+"The temporary image has been removed from cache." => "La foto temporal se ha borrado del cache.",
 "Edit address" => "Editar dirección",
 "Type" => "Tipo",
 "PO Box" => "Código postal",
 "Extended" => "Extendido",
-"Street" => "Calle",
 "City" => "Ciudad",
 "Region" => "Región",
 "Zipcode" => "Código postal",
 "Country" => "País",
-"Edit categories" => "Editar categorías",
-"Add" => "Añadir",
 "Addressbook" => "Libreta de direcciones",
 "Hon. prefixes" => "Prefijos honoríficos",
 "Miss" => "Srta",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Por favor escoge la agenda",
 "create a new addressbook" => "crear una nueva agenda",
 "Name of new addressbook" => "Nombre de la nueva agenda",
-"Import" => "Importar",
 "Importing contacts" => "Importando contactos",
-"Select address book to import to:" => "Selecciona una agenda para importar a:",
-"Select from HD" => "Seleccionar del disco duro",
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
 "Configure addressbooks" => "Configurar agenda",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 39a287c961..08b110ca23 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
 "There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
+"element name is not set." => "elemendi nime pole määratud.",
+"id is not set." => "ID on määramata.",
 "Cannot add empty property." => "Tühja omadust ei saa lisada.",
 "At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
 "Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
-"Error adding contact property." => "Viga konktakti korralikul lisamisel.",
 "No ID provided" => "ID-d pole sisestatud",
 "Error setting checksum." => "Viga kontrollsumma määramisel.",
 "No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Ühtegi kontakti ei leitud.",
 "Missing ID" => "Puudub ID",
 "Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
-"Cannot add addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa lisada.",
-"Error adding addressbook." => "Viga aadressiraamatu lisamisel.",
-"Error activating addressbook." => "Viga aadressiraamatu aktiveerimisel.",
 "No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
 "Error reading contact photo." => "Viga kontakti foto lugemisel.",
 "Error saving temporary file." => "Viga ajutise faili salvestamisel.",
 "The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
-"id is not set." => "ID on määramata.",
 "Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
 "Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
 "Contact ID is missing." => "Kontakti ID puudub.",
-"Missing contact id." => "Puuduv kontakti ID.",
 "No photo path was submitted." => "Foto asukohta pole määratud.",
 "File doesn't exist:" => "Faili pole olemas:",
 "Error loading image." => "Viga pildi laadimisel.",
-"element name is not set." => "elemendi nime pole määratud.",
+"Error getting contact object." => "Viga kontakti objekti hankimisel.",
+"Error getting PHOTO property." => "Viga PHOTO omaduse hankimisel.",
+"Error saving contact." => "Viga kontakti salvestamisel.",
+"Error resizing image" => "Viga pildi suuruse muutmisel",
+"Error cropping image" => "Viga pildi lõikamisel",
+"Error creating temporary image" => "Viga ajutise pildi loomisel",
+"Error finding image: " => "Viga pildi leidmisel: ",
 "checksum is not set." => "kontrollsummat pole määratud.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
 "Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
@@ -41,8 +43,22 @@
 "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
+"Couldn't save temporary image: " => "Ajutise pildi salvestamine ebaõnnestus: ",
+"Couldn't load temporary image: " => "Ajutise pildi laadimine ebaõnnestus: ",
+"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
 "Contacts" => "Kontaktid",
-"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
+"Sorry, this functionality has not been implemented yet" => "Vabandust, aga see funktsioon pole veel valmis",
+"Not implemented" => "Pole implementeeritud",
+"Couldn't get a valid address." => "Kehtiva aadressi hankimine ebaõnnestus",
+"Error" => "Viga",
+"Contact" => "Kontakt",
+"This property has to be non-empty." => "See omadus ei tohi olla tühi.",
+"Edit name" => "Muuda nime",
+"No files selected for upload." => "Üleslaadimiseks pole faile valitud.",
+"Select type" => "Vali tüüp",
+"Result: " => "Tulemus: ",
+" imported, " => " imporditud, ",
+" failed." => " ebaõnnestus.",
 "Addressbook not found." => "Aadressiraamatut ei leitud",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
@@ -60,25 +76,27 @@
 "Video" => "Video",
 "Pager" => "Piipar",
 "Internet" => "Internet",
+"Birthday" => "Sünnipäev",
 "{name}'s Birthday" => "{name} sünnipäev",
-"Contact" => "Kontakt",
 "Add Contact" => "Lisa kontakt",
+"Import" => "Impordi",
 "Addressbooks" => "Aadressiraamatud",
+"Close" => "Sule",
 "Configure Address Books" => "Seadista aadressiraamatut",
 "New Address Book" => "Uus aadressiraamat",
-"Import from VCF" => "Impordi VCF-ist",
 "CardDav Link" => "CardDav link",
 "Download" => "Lae alla",
 "Edit" => "Muuda",
 "Delete" => "Kustuta",
-"Download contact" => "Lae kontakt alla",
-"Delete contact" => "Kustuta kontakt",
 "Drop photo to upload" => "Lohista üleslaetav foto siia",
+"Delete current photo" => "Kustuta praegune foto",
+"Edit current photo" => "Muuda praegust pilti",
+"Upload new photo" => "Lae üles uus foto",
+"Select photo from ownCloud" => "Vali foto ownCloudist",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
 "Edit name details" => "Muuda nime üksikasju",
 "Nickname" => "Hüüdnimi",
 "Enter nickname" => "Sisesta hüüdnimi",
-"Birthday" => "Sünnipäev",
 "dd-mm-yyyy" => "dd.mm.yyyy",
 "Groups" => "Grupid",
 "Separate groups with commas" => "Eralda grupid komadega",
@@ -94,24 +112,19 @@
 "Edit address details" => "Muuda aaressi infot",
 "Add notes here." => "Lisa märkmed siia.",
 "Add field" => "Lisa väli",
-"Profile picture" => "Profiili pilt",
 "Phone" => "Telefon",
 "Note" => "Märkus",
-"Delete current photo" => "Kustuta praegune foto",
-"Edit current photo" => "Muuda praegust pilti",
-"Upload new photo" => "Lae üles uus foto",
-"Select photo from ownCloud" => "Vali foto ownCloudist",
+"Download contact" => "Lae kontakt alla",
+"Delete contact" => "Kustuta kontakt",
+"The temporary image has been removed from cache." => "Ajutine pilt on puhvrist eemaldatud.",
 "Edit address" => "Muuda aadressi",
 "Type" => "Tüüp",
 "PO Box" => "Postkontori postkast",
 "Extended" => "Laiendatud",
-"Street" => "Tänav",
 "City" => "Linn",
 "Region" => "Piirkond",
 "Zipcode" => "Postiindeks",
 "Country" => "Riik",
-"Edit categories" => "Muuda kategooriat",
-"Add" => "Lisa",
 "Addressbook" => "Aadressiraamat",
 "Hon. prefixes" => "Eesliited",
 "Miss" => "Preili",
@@ -143,10 +156,7 @@
 "Please choose the addressbook" => "Palun vali aadressiraamat",
 "create a new addressbook" => "loo uus aadressiraamat",
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
-"Import" => "Impordi",
 "Importing contacts" => "Kontaktide importimine",
-"Select address book to import to:" => "Vali aadressiraamat, millesse importida:",
-"Select from HD" => "Vali kõvakettalt",
 "You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
 "Add contact" => "Lisa kontakt",
 "Configure addressbooks" => "Seadista aadressiraamatuid",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 6dfbf0a7b2..3e78c84d39 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -1,35 +1,66 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
 "There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
+"element name is not set." => "elementuaren izena ez da ezarri.",
+"id is not set." => "IDa ez da ezarri.",
 "Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
 "At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
-"Error adding contact property." => "Errorea kontaktu propietatea gehitzean.",
+"Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
 "No ID provided" => "Ez da IDrik eman",
+"Error setting checksum." => "Errorea kontrol-batura ezartzean.",
 "No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
 "No address books found." => "Ez da helbide libururik aurkitu.",
 "No contacts found." => "Ez da kontakturik aurkitu.",
 "Missing ID" => "ID falta da",
-"Error adding addressbook." => "Errore bat egon da helbide liburua gehitzean.",
-"Error activating addressbook." => "Errore bat egon da helbide-liburua aktibatzen.",
+"Error parsing VCard for ID: \"" => "Errorea VCard analizatzean hurrengo IDrako: \"",
+"No contact ID was submitted." => "Ez da kontaktuaren IDrik eman.",
 "Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
+"Error saving temporary file." => "Errore bat izan da aldi bateko fitxategia gordetzerakoan.",
 "The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
-"id is not set." => "IDa ez da ezarri.",
 "Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
 "Error deleting contact property." => "Errorea kontaktu propietatea ezabatzean.",
 "Contact ID is missing." => "Kontaktuaren IDa falta da.",
-"Missing contact id." => "Kontaktuaren IDa falta da.",
+"No photo path was submitted." => "Ez da argazkiaren bide-izenik eman.",
 "File doesn't exist:" => "Fitxategia ez da existitzen:",
 "Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
-"element name is not set." => "elementuaren izena ez da ezarri.",
+"Error getting contact object." => "Errore bat izan da kontaktu objetua lortzean.",
+"Error getting PHOTO property." => "Errore bat izan da PHOTO propietatea lortzean.",
+"Error saving contact." => "Errore bat izan da kontaktua gordetzean.",
+"Error resizing image" => "Errore bat izan da irudiaren tamaina aldatzean",
+"Error cropping image" => "Errore bat izan da irudia mozten",
+"Error creating temporary image" => "Errore bat izan da aldi bateko irudia sortzen",
+"Error finding image: " => "Ezin izan da irudia aurkitu:",
+"checksum is not set." => "Kontrol-batura ezarri gabe dago.",
+"Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
 "Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
 "Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
 "Error uploading contacts to storage." => "Errore bat egon da kontaktuak biltegira igotzerakoan.",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
 "No file was uploaded" => "Ez da fitxategirik igo",
+"Missing a temporary folder" => "Aldi bateko karpeta falta da",
+"Couldn't save temporary image: " => "Ezin izan da aldi bateko irudia gorde:",
+"Couldn't load temporary image: " => "Ezin izan da aldi bateko irudia kargatu:",
+"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "Contacts" => "Kontaktuak",
-"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
+"Sorry, this functionality has not been implemented yet" => "Barkatu, aukera hau ez da oriandik inplementatu",
+"Not implemented" => "Inplementatu gabe",
+"Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
+"Error" => "Errorea",
+"Contact" => "Kontaktua",
+"This property has to be non-empty." => "Propietate hau ezin da hutsik egon.",
+"Couldn't serialize elements." => "Ezin izan dira elementuak serializatu.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en",
+"Edit name" => "Editatu izena",
+"No files selected for upload." => "Ez duzu igotzeko fitxategirik hautatu.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da.",
+"Select type" => "Hautatu mota",
+"Result: " => "Emaitza:",
+" imported, " => " inportatua, ",
+" failed." => "huts egin du.",
 "Addressbook not found." => "Helbide liburua ez da aurkitu",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
@@ -47,24 +78,26 @@
 "Video" => "Bideoa",
 "Pager" => "Bilagailua",
 "Internet" => "Internet",
+"Birthday" => "Jaioteguna",
 "{name}'s Birthday" => "{name}ren jaioteguna",
-"Contact" => "Kontaktua",
 "Add Contact" => "Gehitu kontaktua",
+"Import" => "Inportatu",
 "Addressbooks" => "Helbide Liburuak",
+"Close" => "Itxi",
 "Configure Address Books" => "Konfiguratu Helbide Liburuak",
 "New Address Book" => "Helbide-liburu berria",
-"Import from VCF" => "VCFtik inportatu",
 "CardDav Link" => "CardDav lotura",
 "Download" => "Deskargatu",
 "Edit" => "Editatu",
 "Delete" => "Ezabatu",
-"Download contact" => "Deskargatu kontaktua",
-"Delete contact" => "Ezabatu kontaktua",
 "Drop photo to upload" => "Askatu argazkia igotzeko",
+"Delete current photo" => "Ezabatu oraingo argazkia",
+"Edit current photo" => "Editatu oraingo argazkia",
+"Upload new photo" => "Igo argazki berria",
+"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
 "Edit name details" => "Editatu izenaren zehaztasunak",
 "Nickname" => "Ezizena",
 "Enter nickname" => "Sartu ezizena",
-"Birthday" => "Jaioteguna",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Taldeak",
 "Separate groups with commas" => "Banatu taldeak komekin",
@@ -80,24 +113,19 @@
 "Edit address details" => "Editatu helbidearen zehaztasunak",
 "Add notes here." => "Gehitu oharrak hemen.",
 "Add field" => "Gehitu eremua",
-"Profile picture" => "Profilaren irudia",
 "Phone" => "Telefonoa",
 "Note" => "Oharra",
-"Delete current photo" => "Ezabatu oraingo argazkia",
-"Edit current photo" => "Editatu oraingo argazkia",
-"Upload new photo" => "Igo argazki berria",
-"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
+"Download contact" => "Deskargatu kontaktua",
+"Delete contact" => "Ezabatu kontaktua",
+"The temporary image has been removed from cache." => "Aldi bateko irudia cachetik ezabatu da.",
 "Edit address" => "Editatu helbidea",
 "Type" => "Mota",
 "PO Box" => "Posta kutxa",
 "Extended" => "Hedatua",
-"Street" => "Kalea",
 "City" => "Hiria",
 "Region" => "Eskualdea",
 "Zipcode" => "Posta kodea",
 "Country" => "Herrialdea",
-"Edit categories" => "Editatu kategoriak",
-"Add" => "Gehitu",
 "Addressbook" => "Helbide-liburua",
 "New Addressbook" => "Helbide-liburu berria",
 "Edit Addressbook" => "Editatu helbide-liburua",
@@ -110,10 +138,7 @@
 "Please choose the addressbook" => "Mesedez, aukeratu helbide liburua",
 "create a new addressbook" => "sortu helbide liburu berria",
 "Name of new addressbook" => "Helbide liburuaren izena",
-"Import" => "Inportatu",
 "Importing contacts" => "Kontaktuak inportatzen",
-"Select address book to import to:" => "Hautau helburuko helbide liburua:",
-"Select from HD" => "Hautatu disko gogorretik",
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
 "Configure addressbooks" => "Konfiguratu helbide liburuak",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 9278975c40..08b4eb221b 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
 "There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
+"element name is not set." => "نام اصلی تنظیم نشده است",
+"id is not set." => "شناسه تعیین نشده",
 "Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
 "At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
 "Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
-"Error adding contact property." => "خطا درهنگام افزودن ویژگی",
 "No ID provided" => "هیچ شناسه ای ارائه نشده",
 "Error setting checksum." => "خطا در تنظیم checksum",
 "No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
@@ -12,22 +13,23 @@
 "No contacts found." => "هیچ شخصی پیدا نشد",
 "Missing ID" => "نشانی گم شده",
 "Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
-"Cannot add addressbook with an empty name." => "نمیتوانید یک نام خالی را به کتابچه نشانی ها افزود",
-"Error adding addressbook." => "خطا درهنگام افزودن کتابچه نشانی ها",
-"Error activating addressbook." => "خطا درهنگام فعال سازیکتابچه نشانی ها",
 "No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
 "Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
 "Error saving temporary file." => "خطا در ذخیره پرونده موقت",
 "The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
-"id is not set." => "شناسه تعیین نشده",
 "Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
 "Error deleting contact property." => "خطا در هنگام پاک کرد ویژگی",
 "Contact ID is missing." => "اطلاعات شناسه گم شده",
-"Missing contact id." => "شما اطلاعات شناسه را فراموش کرده اید",
 "No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
 "File doesn't exist:" => "پرونده وجود ندارد",
 "Error loading image." => "خطا در بارگزاری تصویر",
-"element name is not set." => "نام اصلی تنظیم نشده است",
+"Error getting contact object." => "خطا در گرفتن اطلاعات شخص",
+"Error getting PHOTO property." => "خطا در دربافت تصویر ویژگی شخصی",
+"Error saving contact." => "خطا در ذخیره سازی اطلاعات",
+"Error resizing image" => "خطا در تغییر دادن اندازه تصویر",
+"Error cropping image" => "خطا در برداشت تصویر",
+"Error creating temporary image" => "خطا در ساخت تصویر  temporary",
+"Error finding image: " => "خطا در پیدا کردن تصویر:",
 "checksum is not set." => "checksum تنظیم شده نیست",
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
 "Something went FUBAR. " => "چند چیز به FUBAR رفتند",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
 "No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
 "Missing a temporary folder" => "یک پوشه موقت گم شده",
+"Couldn't save temporary image: " => "قابلیت ذخیره تصویر  موقت وجود ندارد:",
+"Couldn't load temporary image: " => "قابلیت بارگذاری تصویر  موقت وجود ندارد:",
+"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
 "Contacts" => "اشخاص",
-"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
+"Sorry, this functionality has not been implemented yet" => "با عرض پوزش،این قابلیت هنوز اجرا نشده است",
+"Not implemented" => "انجام نشد",
+"Couldn't get a valid address." => "Couldn't get a valid address.",
+"Error" => "خطا",
+"Contact" => "اشخاص",
+"This property has to be non-empty." => "این ویژگی باید به صورت غیر تهی عمل کند",
+"Couldn't serialize elements." => "قابلیت مرتب سازی عناصر وجود ندارد",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org",
+"Edit name" => "نام تغییر",
+"No files selected for upload." => "هیچ فایلی برای آپلود انتخاب نشده است",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است",
+"Select type" => "نوع را انتخاب کنید",
+"Result: " => "نتیجه:",
+" imported, " => "وارد شد،",
+" failed." => "ناموفق",
 "Addressbook not found." => "کتابچه نشانی ها یافت نشد",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
@@ -60,25 +79,27 @@
 "Video" => "رسانه تصویری",
 "Pager" => "صفحه",
 "Internet" => "اینترنت",
+"Birthday" => "روزتولد",
 "{name}'s Birthday" => "روز تولد {name} است",
-"Contact" => "اشخاص",
 "Add Contact" => "افزودن اطلاعات شخص مورد نظر",
+"Import" => "وارد کردن",
 "Addressbooks" => "کتابچه ی نشانی ها",
+"Close" => "بستن",
 "Configure Address Books" => "پیکر بندی کتابچه نشانی ها",
 "New Address Book" => "کتابچه نشانه های جدید",
-"Import from VCF" => "وارد شده از VCF",
 "CardDav Link" => "CardDav Link",
 "Download" => "بارگیری",
 "Edit" => "ویرایش",
 "Delete" => "پاک کردن",
-"Download contact" => "دانلود مشخصات اشخاص",
-"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
 "Drop photo to upload" => "تصویر را به اینجا بکشید تا بار گذازی شود",
+"Delete current photo" => "پاک کردن تصویر کنونی",
+"Edit current photo" => "ویرایش تصویر کنونی",
+"Upload new photo" => "بار گذاری یک تصویر جدید",
+"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "ویرایش نام جزئیات",
 "Nickname" => "نام مستعار",
 "Enter nickname" => "یک نام مستعار وارد کنید",
-"Birthday" => "روزتولد",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "گروه ها",
 "Separate groups with commas" => "جدا کردن گروه ها به وسیله درنگ نما",
@@ -94,24 +115,19 @@
 "Edit address details" => "ویرایش جزئیات نشانی ها",
 "Add notes here." => "اینجا یادداشت ها را بیافزایید",
 "Add field" => "اضافه کردن فیلد",
-"Profile picture" => "تصویر پروفایل",
 "Phone" => "شماره تلفن",
 "Note" => "یادداشت",
-"Delete current photo" => "پاک کردن تصویر کنونی",
-"Edit current photo" => "ویرایش تصویر کنونی",
-"Upload new photo" => "بار گذاری یک تصویر جدید",
-"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
+"Download contact" => "دانلود مشخصات اشخاص",
+"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
+"The temporary image has been removed from cache." => "تصویر موقت از کش پاک شد.",
 "Edit address" => "ویرایش نشانی",
 "Type" => "نوع",
 "PO Box" => "صندوق پستی",
 "Extended" => "تمدید شده",
-"Street" => "خیابان",
 "City" => "شهر",
 "Region" => "ناحیه",
 "Zipcode" => "کد پستی",
 "Country" => "کشور",
-"Edit categories" => "ویرایش گروه",
-"Add" => "افزودن",
 "Addressbook" => "کتابچه ی نشانی ها",
 "Hon. prefixes" => "پیشوند های محترمانه",
 "Miss" => "خانم",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "لطفا یک کتابچه نشانی انتخاب کنید",
 "create a new addressbook" => "یک کتابچه نشانی بسازید",
 "Name of new addressbook" => "نام کتابچه نشانی جدید",
-"Import" => "وارد کردن",
 "Importing contacts" => "وارد کردن اشخاص",
-"Select address book to import to:" => "یک کتابچه نشانی انتخاب کنید تا وارد شود",
-"Select from HD" => "انتخاب از دیسک سخت",
 "You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
 "Add contact" => "افزودن اطلاعات شخص مورد نظر",
 "Configure addressbooks" => "پیکربندی کتابچه ی نشانی ها",
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index bc3ec7449c..a822b55469 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -1,16 +1,67 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
 "There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
+"element name is not set." => "non se nomeou o elemento.",
+"id is not set." => "non se estableceu o id.",
 "Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
 "At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
-"Error adding contact property." => "Produciuse un erro engadindo unha propiedade do contacto.",
-"Error adding addressbook." => "Produciuse un erro engadindo a axenda.",
-"Error activating addressbook." => "Produciuse un erro activando a axenda.",
+"Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
+"No ID provided" => "Non se proveeu ID",
+"Error setting checksum." => "Erro establecendo a suma de verificación",
+"No categories selected for deletion." => "Non se seleccionaron categorías para borrado.",
+"No address books found." => "Non se atoparon libretas de enderezos.",
+"No contacts found." => "Non se atoparon contactos.",
+"Missing ID" => "ID perdido",
+"Error parsing VCard for ID: \"" => "Erro procesando a VCard para o ID: \"",
+"No contact ID was submitted." => "Non se enviou ningún ID de contacto.",
+"Error reading contact photo." => "Erro lendo a fotografía do contacto.",
+"Error saving temporary file." => "Erro gardando o ficheiro temporal.",
+"The loading photo is not valid." => "A fotografía cargada non é válida.",
 "Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
 "Error deleting contact property." => "Produciuse un erro borrando a propiedade do contacto.",
+"Contact ID is missing." => "Falta o ID do contacto.",
+"No photo path was submitted." => "Non se enviou a ruta a unha foto.",
+"File doesn't exist:" => "O ficheiro non existe:",
+"Error loading image." => "Erro cargando imaxe.",
+"Error getting contact object." => "Erro obtendo o obxeto contacto.",
+"Error getting PHOTO property." => "Erro obtendo a propiedade PHOTO.",
+"Error saving contact." => "Erro gardando o contacto.",
+"Error resizing image" => "Erro cambiando o tamaño da imaxe",
+"Error cropping image" => "Erro recortando a imaxe",
+"Error creating temporary image" => "Erro creando a imaxe temporal",
+"Error finding image: " => "Erro buscando a imaxe: ",
+"checksum is not set." => "non se estableceu a suma de verificación.",
+"Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
 "Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
+"Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
 "Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
+"Error uploading contacts to storage." => "Erro subindo os contactos ao almacén.",
+"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro subeuse con éxito",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente subido",
+"No file was uploaded" => "Non se subeu ningún ficheiro",
+"Missing a temporary folder" => "Falta o cartafol temporal",
+"Couldn't save temporary image: " => "Non se puido gardar a imaxe temporal: ",
+"Couldn't load temporary image: " => "Non se puido cargar a imaxe temporal: ",
+"No file was uploaded. Unknown error" => "Non se subeu ningún ficheiro. Erro descoñecido.",
 "Contacts" => "Contactos",
+"Sorry, this functionality has not been implemented yet" => "Sentímolo, esta función aínda non foi implementada.",
+"Not implemented" => "Non implementada.",
+"Couldn't get a valid address." => "Non se puido obter un enderezo de correo válido.",
+"Error" => "Erro",
+"Contact" => "Contacto",
+"This property has to be non-empty." => "Esta propiedade non pode quedar baldeira.",
+"Couldn't serialize elements." => "Non se puido serializar os elementos.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Sen ficheiros escollidos para subir.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor.",
+"Select type" => "Seleccione tipo",
+"Result: " => "Resultado: ",
+" imported, " => " importado, ",
+" failed." => " fallou.",
+"Addressbook not found." => "Non se atopou a libreta de enderezos.",
 "This is not your addressbook." => "Esta non é a súa axenda.",
 "Contact could not be found." => "Non se atopou o contacto.",
 "Address" => "Enderezo",
@@ -22,37 +73,97 @@
 "Mobile" => "Móbil",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensaxe",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Paxinador",
-"Contact" => "Contacto",
+"Internet" => "Internet",
+"Birthday" => "Aniversario",
+"{name}'s Birthday" => "Cumpleanos de {name}",
 "Add Contact" => "Engadir contacto",
+"Import" => "Importar",
 "Addressbooks" => "Axendas",
+"Close" => "Pechar",
+"Configure Address Books" => "Configurar Libretas de enderezos",
 "New Address Book" => "Nova axenda",
 "CardDav Link" => "Ligazón CardDav",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Eliminar",
+"Drop photo to upload" => "Solte a foto a subir",
+"Delete current photo" => "Borrar foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Upload new photo" => "Subir unha nova foto",
+"Select photo from ownCloud" => "Escoller foto desde ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma",
+"Edit name details" => "Editar detalles do nome",
+"Nickname" => "Apodo",
+"Enter nickname" => "Introuza apodo",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe grupos con comas",
+"Edit groups" => "Editar grupos",
+"Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor indique un enderezo de correo electrónico válido.",
+"Enter email address" => "Introduza enderezo de correo electrónico",
+"Mail to address" => "Correo ao enderezo",
+"Delete email address" => "Borrar enderezo de correo electrónico",
+"Enter phone number" => "Introducir número de teléfono",
+"Delete phone number" => "Borrar número de teléfono",
+"View on map" => "Ver no mapa",
+"Edit address details" => "Editar detalles do enderezo",
+"Add notes here." => "Engadir aquí as notas.",
+"Add field" => "Engadir campo",
+"Phone" => "Teléfono",
+"Note" => "Nota",
 "Download contact" => "Descargar contacto",
 "Delete contact" => "Borrar contacto",
-"Birthday" => "Aniversario",
-"Preferred" => "Preferido",
-"Phone" => "Teléfono",
+"The temporary image has been removed from cache." => "A imaxe temporal foi eliminada da caché.",
+"Edit address" => "Editar enderezo",
 "Type" => "Escribir",
 "PO Box" => "Apartado de correos",
 "Extended" => "Ampliado",
-"Street" => "Rúa",
 "City" => "Cidade",
 "Region" => "Autonomía",
 "Zipcode" => "Código postal",
 "Country" => "País",
-"Add" => "Engadir",
 "Addressbook" => "Axenda",
+"Hon. prefixes" => "Prefixos honoríficos",
+"Miss" => "Srta",
+"Ms" => "Sra/Srta",
+"Mr" => "Sr",
+"Sir" => "Sir",
+"Mrs" => "Sra",
+"Dr" => "Dr",
+"Given name" => "Apodo",
+"Additional names" => "Nomes adicionais",
+"Family name" => "Nome familiar",
+"Hon. suffixes" => "Sufixos honorarios",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Nova axenda",
 "Edit Addressbook" => "Editar axenda",
 "Displayname" => "Nome a mostrar",
 "Active" => "Activo",
 "Save" => "Gardar",
 "Submit" => "Enviar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"Import a contacts file" => "Importar un ficheiro de contactos",
+"Please choose the addressbook" => "Por favor escolla unha libreta de enderezos",
+"create a new addressbook" => "crear unha nova libreta de enderezos",
+"Name of new addressbook" => "Nome da nova libreta de enderezos",
+"Importing contacts" => "Importando contactos",
+"You have no contacts in your addressbook." => "Non ten contactos na súa libreta de enderezos.",
+"Add contact" => "Engadir contacto",
+"Configure addressbooks" => "Configurar libretas de enderezos",
+"CardDAV syncing addresses" => "Enderezos CardDAV a sincronizar",
+"more info" => "máis información",
+"Primary address (Kontact et al)" => "Enderezo primario (Kontact et al)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 6e40ad71e1..e4fffbbf72 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,23 +1,48 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
 "There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
+"element name is not set." => "שם האלמנט לא נקבע.",
+"id is not set." => "מספר מזהה לא נקבע.",
 "Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
 "At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
 "Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
-"Error adding contact property." => "שגיאה בהוספת מאפיין לאיש הקשר.",
 "No ID provided" => "לא צוין מזהה",
 "Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
 "No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
 "No address books found." => "לא נמצאו פנקסי כתובות.",
 "No contacts found." => "לא נמצאו אנשי קשר.",
 "Missing ID" => "מזהה חסר",
-"Error adding addressbook." => "שגיאה בהוספת פנקס הכתובות.",
-"Error activating addressbook." => "שגיאה בהפעלת פנקס הכתובות.",
+"Error parsing VCard for ID: \"" => "שגיאה בפענוח ה VCard עבור מספר המזהה: \"",
+"No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
+"Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
+"Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
+"The loading photo is not valid." => "התמונה הנטענת אינה תקנית.",
 "Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
 "Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
+"Contact ID is missing." => "מספר מזהה של אישר הקשר חסר.",
+"No photo path was submitted." => "כתובת התמונה לא נשלחה",
+"File doesn't exist:" => "קובץ לא קיים:",
+"Error loading image." => "שגיאה בטעינת התמונה.",
+"Error getting contact object." => "שגיאה בקבלת אוביאקט איש הקשר",
+"Error getting PHOTO property." => "שגיאה בקבלת מידע של תמונה",
+"Error saving contact." => "שגיאה בשמירת איש הקשר",
+"Error resizing image" => "שגיאה בשינוי גודל התמונה",
+"checksum is not set." => "סיכום ביקורת לא נקבע.",
+"Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
+"Something went FUBAR. " => "משהו לא התנהל כצפוי.",
 "Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
+"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
 "Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
+"Error uploading contacts to storage." => "התרשה שגיאה בהעלאת אנשי הקשר לאכסון.",
+"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
+"No file was uploaded" => "שום קובץ לא הועלה",
+"Missing a temporary folder" => "תקיה זמנית חסרה",
 "Contacts" => "אנשי קשר",
+"Contact" => "איש קשר",
+"Addressbook not found." => "ספר כתובות לא נמצא",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -29,37 +54,94 @@
 "Mobile" => "נייד",
 "Text" => "טקסט",
 "Voice" => "קולי",
+"Message" => "הודעה",
 "Fax" => "פקס",
 "Video" => "וידאו",
 "Pager" => "זימונית",
-"Contact" => "איש קשר",
+"Internet" => "אינטרנט",
+"Birthday" => "יום הולדת",
+"{name}'s Birthday" => "יום ההולדת של {name}",
 "Add Contact" => "הוספת איש קשר",
+"Import" => "יבא",
 "Addressbooks" => "פנקסי כתובות",
+"Configure Address Books" => "הגדר ספרי כתובות",
 "New Address Book" => "פנקס כתובות חדש",
 "CardDav Link" => "קישור ",
 "Download" => "הורדה",
 "Edit" => "עריכה",
 "Delete" => "מחיקה",
+"Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
+"Delete current photo" => "מחק תמונה נוכחית",
+"Edit current photo" => "ערוך תמונה נוכחית",
+"Upload new photo" => "העלה תמונה חדשה",
+"Select photo from ownCloud" => "בחר תמונה מ ownCloud",
+"Edit name details" => "ערוך פרטי שם",
+"Nickname" => "כינוי",
+"Enter nickname" => "הכנס כינוי",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "קבוצות",
+"Separate groups with commas" => "הפרד קבוצות עם פסיקים",
+"Edit groups" => "ערוך קבוצות",
+"Preferred" => "מועדף",
+"Please specify a valid email address." => "אנא הזן כתובת דוא\"ל חוקית",
+"Enter email address" => "הזן כתובת דוא\"ל",
+"Mail to address" => "כתובת",
+"Delete email address" => "מחק כתובת דוא\"ל",
+"Enter phone number" => "הכנס מספר טלפון",
+"Delete phone number" => "מחק מספר טלפון",
+"View on map" => "ראה במפה",
+"Edit address details" => "ערוך פרטי כתובת",
+"Add notes here." => "הוסף הערות כאן.",
+"Add field" => "הוסף שדה",
+"Phone" => "טלפון",
+"Note" => "הערה",
 "Download contact" => "הורדת איש קשר",
 "Delete contact" => "מחיקת איש קשר",
-"Birthday" => "יום הולדת",
-"Preferred" => "מועדף",
-"Phone" => "טלפון",
+"Edit address" => "ערוך כתובת",
 "Type" => "סוג",
 "PO Box" => "תא דואר",
 "Extended" => "מורחב",
-"Street" => "רחוב",
 "City" => "עיר",
 "Region" => "אזור",
 "Zipcode" => "מיקוד",
 "Country" => "מדינה",
-"Add" => "הוספה",
 "Addressbook" => "פנקס כתובות",
+"Hon. prefixes" => "קידומות שם",
+"Miss" => "גב'",
+"Ms" => "גב'",
+"Mr" => "מר'",
+"Sir" => "אדון",
+"Mrs" => "גב'",
+"Dr" => "ד\"ר",
+"Given name" => "שם",
+"Additional names" => "שמות נוספים",
+"Family name" => "שם משפחה",
+"Hon. suffixes" => "סיומות שם",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "פנקס כתובות חדש",
 "Edit Addressbook" => "עריכת פנקס הכתובות",
 "Displayname" => "שם התצוגה",
 "Active" => "פעיל",
 "Save" => "שמירה",
 "Submit" => "ביצוע",
-"Cancel" => "ביטול"
+"Cancel" => "ביטול",
+"Import a contacts file" => "יבא קובץ אנשי קשר",
+"Please choose the addressbook" => "אנא בחר ספר כתובות",
+"create a new addressbook" => "צור ספר כתובות חדש",
+"Name of new addressbook" => "שם ספר כתובות החדש",
+"Importing contacts" => "מיבא אנשי קשר",
+"You have no contacts in your addressbook." => "איך לך אנשי קשר בספר הכתובות",
+"Add contact" => "הוסף איש קשר",
+"Configure addressbooks" => "הגדר ספרי כתובות",
+"CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
+"more info" => "מידע נוסף",
+"Primary address (Kontact et al)" => "כתובת ראשית",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index d381bf4fa9..c0ba8afbf6 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,7 +1,44 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
+"There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
+"element name is not set." => "naziv elementa nije postavljen.",
+"id is not set." => "id nije postavljen.",
+"Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
+"At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
+"Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
+"No ID provided" => "Nema dodijeljenog ID identifikatora",
+"Error setting checksum." => "Pogreška pri postavljanju checksuma.",
+"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
+"No address books found." => "Nema adresara.",
+"No contacts found." => "Nema kontakata.",
+"Missing ID" => "Nedostupan ID identifikator",
+"Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
+"No contact ID was submitted." => "ID kontakta nije podnešen.",
+"Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
+"Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
+"The loading photo is not valid." => "Fotografija nije valjana.",
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
+"Error deleting contact property." => "Pogreška pri brisanju svojstva kontakta.",
+"Contact ID is missing." => "ID kontakta nije dostupan.",
+"No photo path was submitted." => "Putanja do fotografije nije podnešena.",
 "File doesn't exist:" => "Datoteka ne postoji:",
+"Error loading image." => "Pogreška pri učitavanju slike.",
+"checksum is not set." => "checksum nije postavljen.",
+"Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
+"Something went FUBAR. " => "Nešto je otišlo... krivo...",
+"Error updating contact property." => "Pogreška pri ažuriranju svojstva kontakta.",
+"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
+"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
+"Error uploading contacts to storage." => "Pogreška pri slanju kontakata.",
+"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
+"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
+"No file was uploaded" => "Datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Contacts" => "Kontakti",
+"Contact" => "Kontakt",
+"Addressbook not found." => "Adresar nije pronađen.",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
 "Address" => "Adresa",
@@ -13,26 +50,31 @@
 "Mobile" => "Mobitel",
 "Text" => "Tekst",
 "Voice" => "Glasovno",
+"Message" => "Poruka",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
-"Contact" => "Kontakt",
+"Internet" => "Internet",
+"Birthday" => "Rođendan",
+"{name}'s Birthday" => "{name} Rođendan",
 "Add Contact" => "Dodaj kontakt",
+"Import" => "Uvezi",
 "Addressbooks" => "Adresari",
+"Configure Address Books" => "Konfiguracija Adresara",
 "New Address Book" => "Novi adresar",
 "CardDav Link" => "CardDav poveznica",
 "Download" => "Preuzimanje",
 "Edit" => "Uredi",
 "Delete" => "Obriši",
-"Download contact" => "Preuzmi kontakt",
-"Delete contact" => "Izbriši kontakt",
+"Drop photo to upload" => "Dovucite fotografiju za slanje",
+"Edit current photo" => "Uredi trenutnu sliku",
 "Edit name details" => "Uredi detalje imena",
 "Nickname" => "Nadimak",
 "Enter nickname" => "Unesi nadimank",
-"Birthday" => "Rođendan",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupe",
 "Edit groups" => "Uredi grupe",
+"Preferred" => "Preferirano",
 "Enter email address" => "Unesi email adresu",
 "Enter phone number" => "Unesi broj telefona",
 "View on map" => "Prikaži na karti",
@@ -41,23 +83,22 @@
 "Add field" => "Dodaj polje",
 "Phone" => "Telefon",
 "Note" => "Bilješka",
-"Edit current photo" => "Uredi trenutnu sliku",
+"Download contact" => "Preuzmi kontakt",
+"Delete contact" => "Izbriši kontakt",
 "Edit address" => "Uredi adresu",
 "Type" => "Tip",
 "PO Box" => "Poštanski Pretinac",
 "Extended" => "Prošireno",
-"Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Poštanski broj",
 "Country" => "Država",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Addressbook" => "Adresar",
 "New Addressbook" => "Novi adresar",
 "Edit Addressbook" => "Uredi adresar",
+"Displayname" => "Prikazani naziv",
+"Active" => "Aktivno",
 "Save" => "Spremi",
 "Submit" => "Pošalji",
-"Cancel" => "Prekini",
-"Import" => "Uvezi"
+"Cancel" => "Prekini"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 68f7b2607e..5db680b1ac 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
 "There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
+"element name is not set." => "az elem neve nincs beállítva",
+"id is not set." => "ID nincs beállítva",
 "Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
 "At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
 "Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
-"Error adding contact property." => "Hiba a kapcsolat-tulajdonság hozzáadásakor",
 "No ID provided" => "Nincs ID megadva",
 "Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nem található kontakt",
 "Missing ID" => "Hiányzó ID",
 "Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
-"Cannot add addressbook with an empty name." => "Nem adható hozzá névtelen címlista",
-"Error adding addressbook." => "Hiba a címlista hozzáadásakor",
-"Error activating addressbook." => "Címlista aktiválása sikertelen",
 "No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
 "Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
 "Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
 "The loading photo is not valid." => "A kép érvénytelen",
-"id is not set." => "ID nincs beállítva",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
 "Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
 "Contact ID is missing." => "Hiányzik a kapcsolat ID",
-"Missing contact id." => "Hiányzik a kontakt ID",
 "No photo path was submitted." => "Nincs fénykép-útvonal megadva",
 "File doesn't exist:" => "A fájl nem létezik:",
 "Error loading image." => "Kép betöltése sikertelen",
-"element name is not set." => "az elem neve nincs beállítva",
+"Error getting contact object." => "A kontakt-objektum feldolgozása sikertelen",
+"Error getting PHOTO property." => "A PHOTO-tulajdonság  feldolgozása sikertelen",
+"Error saving contact." => "A kontakt mentése sikertelen",
+"Error resizing image" => "Képméretezés sikertelen",
+"Error cropping image" => "Képvágás sikertelen",
+"Error creating temporary image" => "Ideiglenes kép létrehozása sikertelen",
+"Error finding image: " => "A kép nem található",
 "checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
 "No file was uploaded" => "Nincs feltöltött fájl",
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
+"Couldn't save temporary image: " => "Ideiglenes kép létrehozása sikertelen",
+"Couldn't load temporary image: " => "Ideiglenes kép betöltése sikertelen",
+"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
 "Contacts" => "Kapcsolatok",
-"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kapcsolatok importálásához",
+"Sorry, this functionality has not been implemented yet" => "Sajnáljuk, ez a funkció még nem támogatott",
+"Not implemented" => "Nem támogatott",
+"Couldn't get a valid address." => "Érvényes cím lekérése sikertelen",
+"Error" => "Hiba",
+"Contact" => "Kapcsolat",
+"This property has to be non-empty." => "Ezt a tulajdonságot muszáj kitölteni",
+"Couldn't serialize elements." => "Sorbarakás sikertelen",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát.",
+"Edit name" => "Név szerkesztése",
+"No files selected for upload." => "Nincs kiválasztva feltöltendő fájl",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő fájl mérete meghaladja a megengedett mértéket",
+"Select type" => "Típus kiválasztása",
+"Result: " => "Eredmény: ",
+" imported, " => "  beimportálva,  ",
+" failed." => "  sikertelen",
 "Addressbook not found." => "Címlista nem található",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Személyhívó",
 "Internet" => "Internet",
+"Birthday" => "Születésnap",
 "{name}'s Birthday" => "{name} születésnapja",
-"Contact" => "Kapcsolat",
 "Add Contact" => "Kapcsolat hozzáadása",
+"Import" => "Import",
 "Addressbooks" => "Címlisták",
+"Close" => "Bezár",
 "Configure Address Books" => "Címlisták beállítása",
 "New Address Book" => "Új címlista",
-"Import from VCF" => "Importálás VCF-ből",
 "CardDav Link" => "CardDav hivatkozás",
 "Download" => "Letöltés",
 "Edit" => "Szerkesztés",
 "Delete" => "Törlés",
-"Download contact" => "Kapcsolat letöltése",
-"Delete contact" => "Kapcsolat törlése",
 "Drop photo to upload" => "Húzza ide a feltöltendő képet",
+"Delete current photo" => "Aktuális kép törlése",
+"Edit current photo" => "Aktuális kép szerkesztése",
+"Upload new photo" => "Új kép feltöltése",
+"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
 "Nickname" => "Becenév",
 "Enter nickname" => "Becenév megadása",
-"Birthday" => "Születésnap",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Csoportok",
 "Separate groups with commas" => "Vesszővel válassza el a csoportokat",
@@ -94,24 +115,19 @@
 "Edit address details" => "Cím részleteinek szerkesztése",
 "Add notes here." => "Megjegyzések",
 "Add field" => "Mező hozzáadása",
-"Profile picture" => "Profilkép",
 "Phone" => "Telefonszám",
 "Note" => "Jegyzet",
-"Delete current photo" => "Aktuális kép törlése",
-"Edit current photo" => "Aktuális kép szerkesztése",
-"Upload new photo" => "Új kép feltöltése",
-"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
+"Download contact" => "Kapcsolat letöltése",
+"Delete contact" => "Kapcsolat törlése",
+"The temporary image has been removed from cache." => "Az ideiglenes kép el lett távolítva a gyorsítótárból",
 "Edit address" => "Cím szerkesztése",
 "Type" => "Típus",
 "PO Box" => "Postafiók",
 "Extended" => "Kiterjesztett",
-"Street" => "Utca",
 "City" => "Város",
 "Region" => "Megye",
 "Zipcode" => "Irányítószám",
 "Country" => "Ország",
-"Edit categories" => "Kategóriák szerkesztése",
-"Add" => "Hozzáad",
 "Addressbook" => "Címlista",
 "Hon. prefixes" => "Előtag",
 "Miss" => "Miss",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Válassza ki a címlistát",
 "create a new addressbook" => "Címlista létrehozása",
 "Name of new addressbook" => "Új címlista neve",
-"Import" => "Import",
 "Importing contacts" => "Kapcsolatok importálása",
-"Select address book to import to:" => "Melyik címlistába történjen az importálás:",
-"Select from HD" => "Kiválasztás merevlemezről",
 "You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
 "Add contact" => "Kapcsolat hozzáadása",
 "Configure addressbooks" => "Címlisták beállítása",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index f420b48d84..0fbe1777f5 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -2,13 +2,12 @@
 "Cannot add empty property." => "Non pote adder proprietate vacue.",
 "No address books found." => "Nulle adressario trovate",
 "No contacts found." => "Nulle contactos trovate.",
-"Error adding addressbook." => "Error durante que il addeva le adressario.",
-"Error activating addressbook." => "Error in activar adressario",
 "Error saving temporary file." => "Error durante le scriptura in le file temporari",
 "Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
+"Contact" => "Contacto",
 "Addressbook not found." => "Adressario non trovate.",
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
@@ -26,19 +25,21 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
-"Contact" => "Contacto",
+"Birthday" => "Anniversario",
 "Add Contact" => "Adder contacto",
+"Import" => "Importar",
 "Addressbooks" => "Adressarios",
 "New Address Book" => "Nove adressario",
 "CardDav Link" => "Ligamine CardDav",
 "Download" => "Discargar",
 "Edit" => "Modificar",
 "Delete" => "Deler",
-"Download contact" => "Discargar contacto",
-"Delete contact" => "Deler contacto",
+"Delete current photo" => "Deler photo currente",
+"Edit current photo" => "Modificar photo currente",
+"Upload new photo" => "Incargar nove photo",
+"Select photo from ownCloud" => "Seliger photo ex ownCloud",
 "Nickname" => "Pseudonymo",
 "Enter nickname" => "Inserer pseudonymo",
-"Birthday" => "Anniversario",
 "Groups" => "Gruppos",
 "Edit groups" => "Modificar gruppos",
 "Preferred" => "Preferite",
@@ -49,24 +50,18 @@
 "View on map" => "Vider in un carta",
 "Add notes here." => "Adder notas hic",
 "Add field" => "Adder campo",
-"Profile picture" => "Imagine de profilo",
 "Phone" => "Phono",
 "Note" => "Nota",
-"Delete current photo" => "Deler photo currente",
-"Edit current photo" => "Modificar photo currente",
-"Upload new photo" => "Incargar nove photo",
-"Select photo from ownCloud" => "Seliger photo ex ownCloud",
+"Download contact" => "Discargar contacto",
+"Delete contact" => "Deler contacto",
 "Edit address" => "Modificar adresses",
 "Type" => "Typo",
 "PO Box" => "Cassa postal",
 "Extended" => "Extendite",
-"Street" => "Strata",
 "City" => "Citate",
 "Region" => "Region",
 "Zipcode" => "Codice postal",
 "Country" => "Pais",
-"Edit categories" => "Modificar categorias",
-"Add" => "Adder",
 "Addressbook" => "Adressario",
 "Hon. prefixes" => "Prefixos honorific",
 "Miss" => "Senioretta",
@@ -87,7 +82,6 @@
 "Please choose the addressbook" => "Per favor selige le adressario",
 "create a new addressbook" => "Crear un nove adressario",
 "Name of new addressbook" => "Nomine del nove gruppo:",
-"Import" => "Importar",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
 "iOS/OS X" => "iOS/OS X"
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index d98e58f94d..014dd7a3b1 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,31 +1,34 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
+"element name is not set." => "要素名が設定されていません。",
+"id is not set." => "idが設定されていません。",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
 "At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
-"Error adding contact property." => "連絡先の追加に失敗しました。",
+"Trying to add duplicate property: " => "重複する属性を追加: ",
 "No ID provided" => "IDが提供されていません",
 "Error setting checksum." => "チェックサムの設定エラー。",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
 "No address books found." => "アドレスブックが見つかりません。",
 "No contacts found." => "連絡先が見つかりません。",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
-"Cannot add addressbook with an empty name." => "名前を空白にしたままでアドレスブックを追加することはできません。",
-"Error adding addressbook." => "アドレスブックの追加に失敗しました。",
-"Error activating addressbook." => "アドレスブックの有効化に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
 "Error saving temporary file." => "一時ファイルの保存エラー。",
 "The loading photo is not valid." => "写真の読み込みは無効です。",
-"id is not set." => "idが設定されていません。",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
 "Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Contact ID is missing." => "コンタクトIDが見つかりません。",
-"Missing contact id." => "コンタクトIDが設定されていません。",
 "No photo path was submitted." => "写真のパスが登録されていません。",
 "File doesn't exist:" => "ファイルが存在しません:",
 "Error loading image." => "画像の読み込みエラー。",
-"element name is not set." => "要素名が設定されていません。",
+"Error getting contact object." => "コンタクトオブジェクトの取得エラー。",
+"Error getting PHOTO property." => "写真属性の取得エラー。",
+"Error saving contact." => "コンタクトの保存エラー。",
+"Error resizing image" => "画像のリサイズエラー",
+"Error cropping image" => "画像の切り抜きエラー",
+"Error creating temporary image" => "一時画像の生成エラー",
+"Error finding image: " => "画像検索エラー: ",
 "checksum is not set." => "チェックサムが設定されていません。",
 "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
@@ -38,8 +41,25 @@
 "The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
 "Missing a temporary folder" => "一時保存フォルダが見つかりません",
+"Couldn't save temporary image: " => "一時的な画像の保存ができませんでした: ",
+"Couldn't load temporary image: " => "一時的な画像の読み込みができませんでした: ",
+"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
 "Contacts" => "連絡先",
-"Drop a VCF file to import contacts." => "連絡先をインポートするVCFファイルをドロップしてください。",
+"Sorry, this functionality has not been implemented yet" => "申し訳ありません。この機能はまだ実装されていません",
+"Not implemented" => "未実装",
+"Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
+"Error" => "エラー",
+"Contact" => "連絡先",
+"This property has to be non-empty." => "この属性は空にできません。",
+"Couldn't serialize elements." => "要素をシリアライズできませんでした。",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。",
+"Edit name" => "名前を編集",
+"No files selected for upload." => "アップロードするファイルが選択されていません。",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
+"Select type" => "タイプを選択",
+"Result: " => "結果: ",
+" imported, " => " をインポート、 ",
+" failed." => " は失敗しました。",
 "Addressbook not found." => "アドレスブックが見つかりませんでした。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
@@ -57,24 +77,26 @@
 "Video" => "テレビ電話",
 "Pager" => "ポケベル",
 "Internet" => "インターネット",
+"Birthday" => "誕生日",
 "{name}'s Birthday" => "{name}の誕生日",
-"Contact" => "連絡先",
 "Add Contact" => "連絡先の追加",
+"Import" => "インポート",
 "Addressbooks" => "電話帳",
+"Close" => "閉じる",
 "Configure Address Books" => "アドレスブックを設定",
 "New Address Book" => "新規電話帳",
-"Import from VCF" => "VCFからインポート",
 "CardDav Link" => "CardDAVリンク",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
-"Download contact" => "連絡先のダウンロード",
-"Delete contact" => "連絡先の削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
+"Delete current photo" => "現在の写真を削除",
+"Edit current photo" => "現在の写真を編集",
+"Upload new photo" => "新しい写真をアップロード",
+"Select photo from ownCloud" => "ownCloudから写真を選択",
 "Edit name details" => "名前の詳細を編集",
 "Nickname" => "ニックネーム",
 "Enter nickname" => "ニックネームを入力",
-"Birthday" => "誕生日",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -90,24 +112,19 @@
 "Edit address details" => "住所の詳細を編集",
 "Add notes here." => "ここにメモを追加。",
 "Add field" => "項目を追加",
-"Profile picture" => "プロフィール写真",
 "Phone" => "電話番号",
 "Note" => "メモ",
-"Delete current photo" => "現在の写真を削除",
-"Edit current photo" => "現在の写真を編集",
-"Upload new photo" => "新しい写真をアップロード",
-"Select photo from ownCloud" => "ownCloudから写真を選択",
+"Download contact" => "連絡先のダウンロード",
+"Delete contact" => "連絡先の削除",
+"The temporary image has been removed from cache." => "一時画像はキャッシュから削除されました。",
 "Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
 "Extended" => "番地2",
-"Street" => "番地1",
 "City" => "都市",
 "Region" => "都道府県",
 "Zipcode" => "郵便番号",
 "Country" => "国名",
-"Edit categories" => "カテゴリを編集",
-"Add" => "追加",
 "Addressbook" => "アドレスブック",
 "Miss" => "Miss",
 "Ms" => "Ms",
@@ -138,10 +155,7 @@
 "Please choose the addressbook" => "アドレスブックを選択してください",
 "create a new addressbook" => "新しいアドレスブックを作成",
 "Name of new addressbook" => "新しいアドレスブックの名前",
-"Import" => "インポート",
 "Importing contacts" => "コンタクトをインポート",
-"Select address book to import to:" => "インポートするアドレスブックを選択:",
-"Select from HD" => "HDから選択",
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index fcdc1d08c6..aa51eea797 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -1,34 +1,65 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
 "There was an error adding the contact." => "연락처를 추가하는 중 오류가 발생하였습니다.",
+"element name is not set." => "element 이름이 설정되지 않았습니다.",
+"id is not set." => "아이디가 설정되어 있지 않습니다. ",
 "Cannot add empty property." => "빈 속성을 추가할 수 없습니다.",
 "At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
-"Error adding contact property." => "연락처 속성을 추가할 수 없습니다.",
+"Trying to add duplicate property: " => "중복 속성 추가 시도: ",
 "No ID provided" => "제공되는 아이디 없음",
 "Error setting checksum." => "오류 검사합계 설정",
 "No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다. ",
 "No address books found." => "주소록을 찾을 수 없습니다.",
 "No contacts found." => "연락처를 찾을 수 없습니다.",
 "Missing ID" => "아이디 분실",
-"Cannot add addressbook with an empty name." => "성명란이 비어 주소록에 추가 할 수 없습니다.",
-"Error adding addressbook." => "주소록을 추가할 수 없습니다.",
-"Error activating addressbook." => "주소록을 활성화할 수 없습니다.",
+"Error parsing VCard for ID: \"" => "아이디에 대한 VCard 분석 오류",
 "No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
 "Error reading contact photo." => "사진 읽기 오류",
 "Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
 "The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
-"id is not set." => "아이디가 설정되어 있지 않습니다. ",
 "Information about vCard is incorrect. Please reload the page." => "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
 "Error deleting contact property." => "연락처 속성을 삭제할 수 없습니다.",
 "Contact ID is missing." => "접속 아이디가 없습니다. ",
-"Missing contact id." => "접속 아이디 분실",
+"No photo path was submitted." => "사진 경로가 제출되지 않았습니다. ",
 "File doesn't exist:" => "파일이 존재하지 않습니다. ",
 "Error loading image." => "로딩 이미지 오류입니다.",
+"Error getting contact object." => "연락처 개체를 가져오는 중 오류가 발생했습니다. ",
+"Error getting PHOTO property." => "사진 속성을 가져오는 중 오류가 발생했습니다. ",
+"Error saving contact." => "연락처 저장 중 오류가 발생했습니다.",
+"Error resizing image" => "이미지 크기 조정 중 오류가 발생했습니다.",
+"Error cropping image" => "이미지를 자르던 중 오류가 발생했습니다.",
+"Error creating temporary image" => "임시 이미지를 생성 중 오류가 발생했습니다.",
+"Error finding image: " => "이미지를 찾던 중 오류가 발생했습니다:",
+"checksum is not set." => "체크섬이 설정되지 않았습니다.",
+"Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
 "Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
+"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
 "Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
+"Error uploading contacts to storage." => "스토리지 에러 업로드 연락처.",
+"There is no error, the file uploaded with success" => "오류없이 파일업로드 성공.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "HTML형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
+"The uploaded file was only partially uploaded" => "이 업로드된 파일은 부분적으로만 업로드 되었습니다.",
 "No file was uploaded" => "파일이 업로드 되어있지 않습니다",
 "Missing a temporary folder" => "임시 폴더 분실",
+"Couldn't save temporary image: " => "임시 이미지를 저장할 수 없습니다:",
+"Couldn't load temporary image: " => "임시 이미지를 불러올 수 없습니다. ",
+"No file was uploaded. Unknown error" => "파일이 업로드 되지 않았습니다. 알 수 없는 오류.",
 "Contacts" => "연락처",
+"Sorry, this functionality has not been implemented yet" => "죄송합니다. 이 기능은 아직 구현되지 않았습니다. ",
+"Not implemented" => "구현되지 않음",
+"Couldn't get a valid address." => "유효한 주소를 얻을 수 없습니다.",
+"Error" => "오류",
+"Contact" => "연락처",
+"Couldn't serialize elements." => "요소를 직렬화 할 수 없습니다.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. ",
+"Edit name" => "이름 편집",
+"No files selected for upload." => "업로드를 위한 파일이 선택되지 않았습니다. ",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. ",
+"Select type" => "유형 선택",
+"Result: " => "결과:",
+" imported, " => "불러오기,",
+" failed." => "실패.",
 "Addressbook not found." => "주소록을 찾을 수 없습니다.",
 "This is not your addressbook." => "내 주소록이 아닙니다.",
 "Contact could not be found." => "연락처를 찾을 수 없습니다.",
@@ -46,24 +77,27 @@
 "Video" => "영상 번호",
 "Pager" => "호출기",
 "Internet" => "인터넷",
+"Birthday" => "생일",
 "{name}'s Birthday" => "{이름}의 생일",
-"Contact" => "연락처",
 "Add Contact" => "연락처 추가",
+"Import" => "입력",
 "Addressbooks" => "주소록",
+"Close" => "닫기",
 "Configure Address Books" => "주소록 구성",
 "New Address Book" => "새 주소록",
-"Import from VCF" => "VCF에서 가져오기",
 "CardDav Link" => "CardDav 링크",
 "Download" => "다운로드",
 "Edit" => "편집",
 "Delete" => "삭제",
-"Download contact" => "연락처 다운로드",
-"Delete contact" => "연락처 삭제",
 "Drop photo to upload" => "Drop photo to upload",
+"Delete current photo" => "현재 사진 삭제",
+"Edit current photo" => "현재 사진 편집",
+"Upload new photo" => "새로운 사진 업로드",
+"Select photo from ownCloud" => "ownCloud에서 사진 선택",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "이름 세부사항을 편집합니다. ",
 "Nickname" => "별명",
 "Enter nickname" => "별명 입력",
-"Birthday" => "생일",
 "dd-mm-yyyy" => "일-월-년",
 "Groups" => "그룹",
 "Separate groups with commas" => "쉼표로 그룹 구분",
@@ -71,22 +105,63 @@
 "Preferred" => "선호함",
 "Please specify a valid email address." => "올바른 이메일 주소를 입력하세요.",
 "Enter email address" => "이메일 주소 입력",
+"Delete email address" => "이메일 주소 삭제",
+"Enter phone number" => "전화번호 입력",
+"Delete phone number" => "전화번호 삭제",
+"View on map" => "지도에서 보기",
+"Edit address details" => "상세 주소 수정",
+"Add notes here." => "여기에 노트 추가.",
+"Add field" => "파일 추가",
 "Phone" => "전화 번호",
+"Note" => "노트",
+"Download contact" => "연락처 다운로드",
+"Delete contact" => "연락처 삭제",
+"The temporary image has been removed from cache." => "임시 이미지가 캐시에서 제거 되었습니다. ",
+"Edit address" => "주소 수정",
 "Type" => "종류",
 "PO Box" => "사서함",
 "Extended" => "확장",
-"Street" => "거리",
 "City" => "도시",
 "Region" => "지역",
 "Zipcode" => "우편 번호",
 "Country" => "국가",
-"Add" => "추가",
 "Addressbook" => "주소록",
+"Hon. prefixes" => "Hon. prefixes",
+"Miss" => "Miss",
+"Ms" => "Ms",
+"Mr" => "Mr",
+"Sir" => "Sir",
+"Mrs" => "Mrs",
+"Dr" => "Dr",
+"Given name" => "Given name",
+"Additional names" => "추가 이름",
+"Family name" => "성",
+"Hon. suffixes" => "Hon. suffixes",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "새 주소록",
 "Edit Addressbook" => "주소록 편집",
 "Displayname" => "표시 이름",
 "Active" => "활성",
 "Save" => "저장",
 "Submit" => "보내기",
-"Cancel" => "취소"
+"Cancel" => "취소",
+"Import a contacts file" => "연락처 파일 입력",
+"Please choose the addressbook" => "주소록을 선택해 주세요.",
+"create a new addressbook" => "새 주소록 만들기",
+"Name of new addressbook" => "새 주소록 이름",
+"Importing contacts" => "연락처 입력",
+"You have no contacts in your addressbook." => "당신의 주소록에는 연락처가 없습니다. ",
+"Add contact" => "연락처 추가",
+"Configure addressbooks" => "주소록 구성",
+"CardDAV syncing addresses" => "CardDAV 주소 동기화",
+"more info" => "더 많은 정보",
+"Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 361e1cb93e..f4a9f7b7dc 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -1,5 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
+"There was an error adding the contact." => "Fehler beim bäisetzen vun engem Kontakt.",
+"id is not set." => "ID ass net gesat.",
+"Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
+"Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
+"No ID provided" => "Keng ID uginn",
+"Error setting checksum." => "Fehler beim setzen vun der Checksum.",
+"No categories selected for deletion." => "Keng Kategorien fir ze läschen ausgewielt.",
+"No address books found." => "Keen Adressbuch fonnt.",
+"No contacts found." => "Keng Kontakter fonnt.",
+"Missing ID" => "ID fehlt",
+"No contact ID was submitted." => "Kontakt ID ass net mat geschéckt ginn.",
+"Error reading contact photo." => "Fehler beim liesen vun der Kontakt Photo.",
+"Error saving temporary file." => "Fehler beim späicheren vum temporäre Fichier.",
+"The loading photo is not valid." => "Déi geluede Photo ass net gülteg.",
 "Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
+"Error deleting contact property." => "Fehler beim läschen vun der Kontakt Proprietéit.",
+"Contact ID is missing." => "Kontakt ID fehlt.",
+"File doesn't exist:" => "Fichier existéiert net:",
+"Error loading image." => "Fehler beim lueden vum Bild.",
+"Error updating contact property." => "Fehler beim updaten vun der Kontakt Proprietéit.",
+"Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
+"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
+"Contacts" => "Kontakter",
+"Error" => "Fehler",
+"Contact" => "Kontakt",
+"Result: " => "Resultat: ",
+" imported, " => " importéiert, ",
+"Addressbook not found." => "Adressbuch net fonnt.",
 "This is not your addressbook." => "Dat do ass net däin Adressbuch.",
 "Contact could not be found." => "Konnt den Kontakt net fannen.",
 "Address" => "Adress",
@@ -11,34 +39,59 @@
 "Mobile" => "GSM",
 "Text" => "SMS",
 "Voice" => "Voice",
+"Message" => "Message",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
-"Contact" => "Kontakt",
+"Internet" => "Internet",
+"Birthday" => "Gebuertsdag",
+"{name}'s Birthday" => "{name} säi Gebuertsdag",
 "Add Contact" => "Kontakt bäisetzen",
 "Addressbooks" => "Adressbicher ",
+"Close" => "Zoumaachen",
+"Configure Address Books" => "Adressbicher konfigureiren",
 "New Address Book" => "Neit Adressbuch",
 "CardDav Link" => "CardDav Link",
 "Download" => "Download",
 "Edit" => "Editéieren",
 "Delete" => "Läschen",
-"Delete contact" => "Kontakt läschen",
-"Birthday" => "Gebuertsdag",
+"Nickname" => "Spëtznumm",
+"Enter nickname" => "Gëff e Spëtznumm an",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Gruppen",
+"Edit groups" => "Gruppen editéieren",
+"Enter phone number" => "Telefonsnummer aginn",
+"Delete phone number" => "Telefonsnummer läschen",
+"View on map" => "Op da Kaart uweisen",
+"Edit address details" => "Adress Detailer editéieren",
 "Phone" => "Telefon",
+"Note" => "Note",
+"Download contact" => "Kontakt eroflueden",
+"Delete contact" => "Kontakt läschen",
 "Type" => "Typ",
 "PO Box" => "Postleetzuel",
 "Extended" => "Erweidert",
-"Street" => "Strooss",
 "City" => "Staat",
 "Region" => "Regioun",
 "Zipcode" => "Postleetzuel",
 "Country" => "Land",
-"Add" => "Dobäisetzen",
 "Addressbook" => "Adressbuch",
+"Mr" => "M",
+"Sir" => "Sir",
+"Mrs" => "Mme",
+"Dr" => "Dr",
+"Given name" => "Virnumm",
+"Additional names" => "Weider Nimm",
+"Family name" => "Famillje Numm",
+"Ph.D." => "Ph.D.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Neit Adressbuch",
 "Edit Addressbook" => "Adressbuch editéieren",
 "Displayname" => "Ugewisene Numm",
+"Active" => "Aktiv",
 "Save" => "Späicheren",
 "Submit" => "Fortschécken",
-"Cancel" => "Ofbriechen"
+"Cancel" => "Ofbriechen",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index 435927a247..db931cea00 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -1,10 +1,20 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
 "There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
-"Error adding addressbook." => "Klaida pridedant adresų knygą.",
-"Error activating addressbook." => "Klaida aktyvuojant adresų knygą.",
+"No contacts found." => "Kontaktų nerasta.",
+"Error reading contact photo." => "Klaida skaitant kontakto nuotrauką.",
+"The loading photo is not valid." => "Netinkama įkeliama nuotrauka.",
 "Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
+"File doesn't exist:" => "Failas neegzistuoja:",
+"Error loading image." => "Klaida įkeliant nuotrauką.",
+"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Įkeliamo failo dydis viršija upload_max_filesize nustatymą php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
+"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
+"No file was uploaded" => "Nebuvo įkeltas joks failas",
 "Contacts" => "Kontaktai",
+"Contact" => "Kontaktas",
+"Addressbook not found." => "Nerasta adresų knyga.",
 "This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
 "Contact could not be found." => "Kontaktas nerastas",
 "Address" => "Adresas",
@@ -16,29 +26,30 @@
 "Mobile" => "Mobilusis",
 "Text" => "Žinučių",
 "Voice" => "Balso",
+"Message" => "Žinutė",
 "Fax" => "Faksas",
 "Video" => "Vaizdo",
 "Pager" => "Pranešimų gaviklis",
-"Contact" => "Kontaktas",
+"Internet" => "Internetas",
+"Birthday" => "Gimtadienis",
 "Add Contact" => "Pridėti kontaktą",
 "Addressbooks" => "Adresų knygos",
+"Configure Address Books" => "Konfigūruoti adresų knygas",
 "New Address Book" => "Nauja adresų knyga",
 "CardDav Link" => "CardDAV nuoroda",
 "Download" => "Atsisiųsti",
 "Edit" => "Keisti",
 "Delete" => "Trinti",
+"Nickname" => "Slapyvardis",
+"Phone" => "Telefonas",
 "Download contact" => "Atsisųsti kontaktą",
 "Delete contact" => "Ištrinti kontaktą",
-"Birthday" => "Gimtadienis",
-"Phone" => "Telefonas",
 "Type" => "Tipas",
 "PO Box" => "Pašto dėžutė",
-"Street" => "Gatvė",
 "City" => "Miestas",
 "Region" => "Regionas",
 "Zipcode" => "Pašto indeksas",
 "Country" => "Šalis",
-"Add" => "Pridėti",
 "Addressbook" => "Adresų knyga",
 "New Addressbook" => "Nauja adresų knyga",
 "Edit Addressbook" => "Redaguoti adresų knygą",
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 2b81a5d877..894d527515 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
 "There was an error adding the contact." => "Имаше грешка при додавање на контактот.",
+"element name is not set." => "име за елементот не е поставена.",
+"id is not set." => "ид не е поставено.",
 "Cannot add empty property." => "Неможе да се додаде празна вредност.",
 "At least one of the address fields has to be filled out." => "Барем една од полињата за адреса треба да биде пополнето.",
 "Trying to add duplicate property: " => "Се обидовте да внесете дупликат вредност:",
-"Error adding contact property." => "Грешка при додавање на вредност за контактот.",
 "No ID provided" => "Нема доставено ИД",
 "Error setting checksum." => "Грешка во поставување сума за проверка.",
 "No categories selected for deletion." => "Нема избрано категории за бришење.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Не се најдени контакти.",
 "Missing ID" => "Недостасува ИД",
 "Error parsing VCard for ID: \"" => "Грешка при парсирање VCard за ИД: \"",
-"Cannot add addressbook with an empty name." => "Неможе да се внесе адресар со празно име.",
-"Error adding addressbook." => "Грешки при додавање на адресарот.",
-"Error activating addressbook." => "Грешка при активирање на адресарот.",
 "No contact ID was submitted." => "Не беше доставено ИД за контакт.",
 "Error reading contact photo." => "Грешка во читање на контакт фотографија.",
 "Error saving temporary file." => "Грешка во снимање на привремена датотека.",
 "The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
-"id is not set." => "ид не е поставено.",
 "Information about vCard is incorrect. Please reload the page." => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава.",
 "Error deleting contact property." => "Греш при бришење на вредноста за контакт.",
 "Contact ID is missing." => "ИД за контакт недостасува.",
-"Missing contact id." => "Недостасува ид за контакт.",
 "No photo path was submitted." => "Не беше поднесена патека за фотографија.",
 "File doesn't exist:" => "Не постои датотеката:",
 "Error loading image." => "Грешка во вчитување на слика.",
-"element name is not set." => "име за елементот не е поставена.",
+"Error getting contact object." => "Грешка при преземањето на контакт објектот,",
+"Error getting PHOTO property." => "Грешка при утврдувањето на карактеристиките на фотографијата.",
+"Error saving contact." => "Грешка при снимање на контактите.",
+"Error resizing image" => "Грешка при скалирање на фотографијата",
+"Error cropping image" => "Грешка при сечење на фотографијата",
+"Error creating temporary image" => "Грешка при креирањето на привремената фотографија",
+"Error finding image: " => "Грешка при наоѓањето на фотографијата:",
 "checksum is not set." => "сумата за проверка не е поставена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
 "Something went FUBAR. " => "Нешто се расипа.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
 "No file was uploaded" => "Не беше подигната датотека.",
 "Missing a temporary folder" => "Недостасува привремена папка",
+"Couldn't save temporary image: " => "Не можеше да се сними привремената фотографија:",
+"Couldn't load temporary image: " => "Не можеше да се вчита привремената фотографија:",
+"No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
 "Contacts" => "Контакти",
-"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
+"Sorry, this functionality has not been implemented yet" => "Жалам, оваа функционалност уште не е имплементирана",
+"Not implemented" => "Не е имплементирано",
+"Couldn't get a valid address." => "Не можев да добијам исправна адреса.",
+"Error" => "Грешка",
+"Contact" => "Контакт",
+"This property has to be non-empty." => "Својството не смее да биде празно.",
+"Couldn't serialize elements." => "Не може да се серијализираат елементите.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org",
+"Edit name" => "Уреди го името",
+"No files selected for upload." => "Ниту еден фајл не е избран за вчитување.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер.",
+"Select type" => "Одбери тип",
+"Result: " => "Резултат: ",
+" imported, " => "увезено,",
+" failed." => "неуспешно.",
 "Addressbook not found." => "Адресарот не е најден.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
@@ -60,25 +79,27 @@
 "Video" => "Видео",
 "Pager" => "Пејџер",
 "Internet" => "Интернет",
+"Birthday" => "Роденден",
 "{name}'s Birthday" => "Роденден на {name}",
-"Contact" => "Контакт",
 "Add Contact" => "Додади контакт",
+"Import" => "Внеси",
 "Addressbooks" => "Адресари",
+"Close" => "Затвои",
 "Configure Address Books" => "Конфигурирај адресар",
 "New Address Book" => "Нов адресар",
-"Import from VCF" => "Внеси од VCF",
 "CardDav Link" => "Врска за CardDav",
 "Download" => "Преземи",
 "Edit" => "Уреди",
 "Delete" => "Избриши",
-"Download contact" => "Преземи го контактот",
-"Delete contact" => "Избриши го контактот",
 "Drop photo to upload" => "Довлечкај фотографија за да се подигне",
+"Delete current photo" => "Избриши моментална фотографија",
+"Edit current photo" => "Уреди моментална фотографија",
+"Upload new photo" => "Подигни нова фотографија",
+"Select photo from ownCloud" => "Изберете фотографија од ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка",
 "Edit name details" => "Уреди детали за име",
 "Nickname" => "Прекар",
 "Enter nickname" => "Внеси прекар",
-"Birthday" => "Роденден",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Групи",
 "Separate groups with commas" => "Одвоете ги групите со запирка",
@@ -94,24 +115,19 @@
 "Edit address details" => "Уреди детали за адреса",
 "Add notes here." => "Внесете забелешки тука.",
 "Add field" => "Додади поле",
-"Profile picture" => "Фотографија за профил",
 "Phone" => "Телефон",
 "Note" => "Забелешка",
-"Delete current photo" => "Избриши моментална фотографија",
-"Edit current photo" => "Уреди моментална фотографија",
-"Upload new photo" => "Подигни нова фотографија",
-"Select photo from ownCloud" => "Изберете фотографија од ownCloud",
+"Download contact" => "Преземи го контактот",
+"Delete contact" => "Избриши го контактот",
+"The temporary image has been removed from cache." => "Привремената слика е отстранета од кешот.",
 "Edit address" => "Уреди адреса",
 "Type" => "Тип",
 "PO Box" => "Поштенски фах",
 "Extended" => "Дополнително",
-"Street" => "Улица",
 "City" => "Град",
 "Region" => "Регион",
 "Zipcode" => "Поштенски код",
 "Country" => "Држава",
-"Edit categories" => "Уреди категории",
-"Add" => "Додади",
 "Addressbook" => "Адресар",
 "Hon. prefixes" => "Префикси за титула",
 "Miss" => "Г-ца",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Ве молам изберете адресар",
 "create a new addressbook" => "креирај нов адресар",
 "Name of new addressbook" => "Име на новиот адресар",
-"Import" => "Внеси",
 "Importing contacts" => "Внесување контакти",
-"Select address book to import to:" => "Изберете адресар да се внесе:",
-"Select from HD" => "Изберете од хард диск",
 "You have no contacts in your addressbook." => "Немате контакти во Вашиот адресар.",
 "Add contact" => "Додади контакт",
 "Configure addressbooks" => "Уреди адресари",
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 7d8a4c7d12..734668e869 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -1,16 +1,68 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
 "There was an error adding the contact." => "Terdapat masalah menambah maklumat.",
+"element name is not set." => "nama elemen tidak ditetapkan.",
+"id is not set." => "ID tidak ditetapkan.",
 "Cannot add empty property." => "Tidak boleh menambah ruang kosong.",
 "At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
-"Error adding contact property." => "Terdapat masalah menambah maklumat.",
-"Error adding addressbook." => "Masalah menambah buku alamat.",
-"Error activating addressbook." => "Masalah mengaktifkan buku alamat.",
+"Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
+"No ID provided" => "tiada ID diberi",
+"Error setting checksum." => "Ralat menetapkan checksum.",
+"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
+"No address books found." => "Tiada buku alamat dijumpai.",
+"No contacts found." => "Tiada kenalan dijumpai.",
+"Missing ID" => "ID Hilang",
+"Error parsing VCard for ID: \"" => "Ralat VCard untuk ID: \"",
+"No contact ID was submitted." => "Tiada ID kenalan yang diberi.",
+"Error reading contact photo." => "Ralat pada foto kenalan.",
+"Error saving temporary file." => "Ralat menyimpan fail sementara",
+"The loading photo is not valid." => "Foto muatan tidak sah.",
 "Information about vCard is incorrect. Please reload the page." => "Maklumat vCard tidak tepat. Sila reload semula halaman ini.",
 "Error deleting contact property." => "Masalah memadam maklumat.",
+"Contact ID is missing." => "ID Kenalan telah hilang.",
+"No photo path was submitted." => "Tiada direktori gambar yang diberi.",
+"File doesn't exist:" => "Fail tidak wujud:",
+"Error loading image." => "Ralat pada muatan imej.",
+"Error getting contact object." => "Ralat mendapatkan objek pada kenalan.",
+"Error getting PHOTO property." => "Ralat mendapatkan maklumat gambar.",
+"Error saving contact." => "Ralat menyimpan kenalan.",
+"Error resizing image" => "Ralat mengubah saiz imej",
+"Error cropping image" => "Ralat memotong imej",
+"Error creating temporary image" => "Ralat mencipta imej sementara",
+"Error finding image: " => "Ralat mencari imej: ",
+"checksum is not set." => "checksum tidak ditetapkan.",
+"Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
+"Something went FUBAR. " => "Sesuatu tidak betul.",
 "Error updating contact property." => "Masalah mengemaskini maklumat.",
+"Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
 "Error updating addressbook." => "Masalah mengemaskini buku alamat.",
+"Error uploading contacts to storage." => "Ralat memuatnaik senarai kenalan.",
+"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
+"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
+"No file was uploaded" => "Tiada fail dimuatnaik",
+"Missing a temporary folder" => "Direktori sementara hilang",
+"Couldn't save temporary image: " => "Tidak boleh menyimpan imej sementara: ",
+"Couldn't load temporary image: " => "Tidak boleh membuka imej sementara: ",
+"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
 "Contacts" => "Hubungan-hubungan",
+"Sorry, this functionality has not been implemented yet" => "Maaf, fungsi ini masih belum boleh diguna lagi",
+"Not implemented" => "Tidak digunakan",
+"Couldn't get a valid address." => "Tidak boleh mendapat alamat yang sah.",
+"Error" => "Ralat",
+"Contact" => "Hubungan",
+"This property has to be non-empty." => "Nilai ini tidak boleh kosong.",
+"Couldn't serialize elements." => "Tidak boleh menggabungkan elemen.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org",
+"Edit name" => "Ubah nama",
+"No files selected for upload." => "Tiada fail dipilih untuk muatnaik.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan.",
+"Select type" => "PIlih jenis",
+"Result: " => "Hasil: ",
+" imported, " => " import, ",
+" failed." => " gagal.",
+"Addressbook not found." => "Buku alamat tidak dijumpai.",
 "This is not your addressbook." => "Ini bukan buku alamat anda.",
 "Contact could not be found." => "Hubungan tidak dapat ditemui",
 "Address" => "Alamat",
@@ -22,37 +74,97 @@
 "Mobile" => "Mudah alih",
 "Text" => "Teks",
 "Voice" => "Suara",
+"Message" => "Mesej",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Alat Kelui",
-"Contact" => "Hubungan",
+"Internet" => "Internet",
+"Birthday" => "Hari lahir",
+"{name}'s Birthday" => "Hari Lahir {name}",
 "Add Contact" => "Tambah kenalan",
+"Import" => "Import",
 "Addressbooks" => "Senarai Buku Alamat",
+"Close" => "Tutup",
+"Configure Address Books" => "Konfigurasi Buku Alamat",
 "New Address Book" => "Buku Alamat Baru",
 "CardDav Link" => "Sambungan CardDav",
 "Download" => "Muat naik",
 "Edit" => "Sunting",
 "Delete" => "Padam",
+"Drop photo to upload" => "Letak foto disini untuk muatnaik",
+"Delete current photo" => "Padam foto semasa",
+"Edit current photo" => "Ubah foto semasa",
+"Upload new photo" => "Muatnaik foto baru",
+"Select photo from ownCloud" => "Pilih foto dari ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma",
+"Edit name details" => "Ubah butiran nama",
+"Nickname" => "Nama Samaran",
+"Enter nickname" => "Masukkan nama samaran",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Kumpulan",
+"Separate groups with commas" => "Asingkan kumpulan dengan koma",
+"Edit groups" => "Ubah kumpulan",
+"Preferred" => "Pilihan",
+"Please specify a valid email address." => "Berikan alamat emel yang sah.",
+"Enter email address" => "Masukkan alamat emel",
+"Mail to address" => "Hantar ke alamat",
+"Delete email address" => "Padam alamat emel",
+"Enter phone number" => "Masukkan nombor telefon",
+"Delete phone number" => "Padam nombor telefon",
+"View on map" => "Lihat pada peta",
+"Edit address details" => "Ubah butiran alamat",
+"Add notes here." => "Letak nota disini.",
+"Add field" => "Letak ruangan",
+"Phone" => "Telefon",
+"Note" => "Nota",
 "Download contact" => "Muat turun hubungan",
 "Delete contact" => "Padam hubungan",
-"Birthday" => "Hari lahir",
-"Preferred" => "Pilihan",
-"Phone" => "Telefon",
+"The temporary image has been removed from cache." => "Imej sementara telah dibuang dari cache.",
+"Edit address" => "Ubah alamat",
 "Type" => "Jenis",
 "PO Box" => "Peti surat",
 "Extended" => "Sambungan",
-"Street" => "Jalan",
 "City" => "bandar",
 "Region" => "Wilayah",
 "Zipcode" => "Poskod",
 "Country" => "Negara",
-"Add" => "Tambah",
 "Addressbook" => "Buku alamat",
+"Hon. prefixes" => "Awalan nama",
+"Miss" => "Cik",
+"Ms" => "Cik",
+"Mr" => "Encik",
+"Sir" => "Tuan",
+"Mrs" => "Puan",
+"Dr" => "Dr",
+"Given name" => "Nama diberi",
+"Additional names" => "Nama tambahan",
+"Family name" => "Nama keluarga",
+"Hon. suffixes" => "Awalan nama",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Buku Alamat Baru",
 "Edit Addressbook" => "Kemaskini Buku Alamat",
 "Displayname" => "Paparan nama",
 "Active" => "Aktif",
 "Save" => "Simpan",
 "Submit" => "Hantar",
-"Cancel" => "Batal"
+"Cancel" => "Batal",
+"Import a contacts file" => "Import fail kenalan",
+"Please choose the addressbook" => "Sila pilih buku alamat",
+"create a new addressbook" => "Cipta buku alamat baru",
+"Name of new addressbook" => "Nama buku alamat",
+"Importing contacts" => "Import senarai kenalan",
+"You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.",
+"Add contact" => "Letak kenalan",
+"Configure addressbooks" => "Konfigurasi buku alamat",
+"CardDAV syncing addresses" => "alamat selarian CardDAV",
+"more info" => "maklumat lanjut",
+"Primary address (Kontact et al)" => "Alamat utama",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 3f7731bede..663909eeeb 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -1,38 +1,52 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
 "There was an error adding the contact." => "Et problem oppsto med å legge til kontakten.",
+"id is not set." => "id er ikke satt.",
 "Cannot add empty property." => "Kan ikke legge til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
-"Error adding contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
 "No contacts found." => "Ingen kontakter funnet.",
 "Missing ID" => "Manglende ID",
-"Cannot add addressbook with an empty name." => "Kan ikke legge til en adressebok uten navn.",
-"Error adding addressbook." => "Et problem oppsto med å legge til adresseboken.",
-"Error activating addressbook." => "Et problem oppsto med å aktivere adresseboken.",
 "Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
 "Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
 "The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
-"id is not set." => "id er ikke satt.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
 "Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
-"Missing contact id." => "Mangler kontakt-id.",
+"Contact ID is missing." => "Kontakt-ID mangler.",
 "No photo path was submitted." => "Ingen filsti ble lagt inn.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
 "Error loading image." => "Klarte ikke å laste bilde.",
+"Error saving contact." => "Klarte ikke å lagre kontakt.",
+"Error resizing image" => "Klarte ikke å endre størrelse på bildet",
+"Error cropping image" => "Klarte ikke å beskjære bildet",
+"Error creating temporary image" => "Klarte ikke å lage et midlertidig bilde",
+"Error finding image: " => "Kunne ikke finne bilde:",
 "Something went FUBAR. " => "Noe gikk fryktelig galt.",
 "Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
 "Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
+"Error uploading contacts to storage." => "Klarte ikke å laste opp kontakter til lagringsplassen",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
 "The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
 "No file was uploaded" => "Ingen filer ble lastet opp",
 "Missing a temporary folder" => "Mangler midlertidig mappe",
+"Couldn't save temporary image: " => "Kunne ikke lagre midlertidig bilde:",
+"Couldn't load temporary image: " => "Kunne ikke laste midlertidig bilde:",
+"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "Contacts" => "Kontakter",
+"Error" => "Feil",
+"Contact" => "Kontakt",
+"Edit name" => "Endre navn",
+"No files selected for upload." => "Ingen filer valgt for opplasting.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du prøver å laste opp er for stor.",
+"Select type" => "Velg type",
+"Result: " => "Resultat:",
+" imported, " => "importert,",
+" failed." => "feilet.",
 "Addressbook not found." => "Adresseboken ble ikke funnet.",
 "This is not your addressbook." => "Dette er ikke dine adressebok.",
 "Contact could not be found." => "Kontakten ble ikke funnet.",
@@ -50,24 +64,26 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internett",
-"{name}'s Birthday" => "bursdagen til {name}",
-"Contact" => "Kontakt",
+"Birthday" => "Bursdag",
+"{name}'s Birthday" => "{name}s bursdag",
 "Add Contact" => "Ny kontakt",
+"Import" => "Importer",
 "Addressbooks" => "Adressebøker",
+"Close" => "Lukk",
 "Configure Address Books" => "Konfigurer adressebok",
 "New Address Book" => "Ny adressebok",
-"Import from VCF" => "Importer fra VDF",
 "CardDav Link" => "CardDAV-lenke",
 "Download" => "Hent ned",
 "Edit" => "Rediger",
 "Delete" => "Slett",
-"Download contact" => "Hend ned kontakten",
-"Delete contact" => "Slett kontakt",
 "Drop photo to upload" => "Dra bilder hit for å laste opp",
+"Delete current photo" => "Fjern nåværende bilde",
+"Edit current photo" => "Rediger nåværende bilde",
+"Upload new photo" => "Last opp nytt bilde",
+"Select photo from ownCloud" => "Velg bilde fra ownCloud",
 "Edit name details" => "Endre detaljer rundt navn",
 "Nickname" => "Kallenavn",
 "Enter nickname" => "Skriv inn kallenavn",
-"Birthday" => "Bursdag",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Skill gruppene med komma",
@@ -83,25 +99,21 @@
 "Edit address details" => "Endre detaljer rundt adresse",
 "Add notes here." => "Legg inn notater her.",
 "Add field" => "Legg til felt",
-"Profile picture" => "Profilbilde",
 "Phone" => "Telefon",
 "Note" => "Notat",
-"Delete current photo" => "Fjern nåværende bilde",
-"Edit current photo" => "Rediger nåværende bilde",
-"Upload new photo" => "Last opp nytt bilde",
-"Select photo from ownCloud" => "Velg bilde fra ownCloud",
+"Download contact" => "Hend ned kontakten",
+"Delete contact" => "Slett kontakt",
+"The temporary image has been removed from cache." => "Det midlertidige bildet er fjernet fra cache.",
 "Edit address" => "Endre adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Utvidet",
-"Street" => "Gate",
 "City" => "By",
 "Region" => "Området",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Edit categories" => "Endre kategorier",
-"Add" => "Ny",
 "Addressbook" => "Adressebok",
+"Hon. prefixes" => "Ærestitler",
 "Miss" => "Frøken",
 "Mr" => "Herr",
 "Mrs" => "Fru",
@@ -124,7 +136,6 @@
 "Please choose the addressbook" => "Vennligst velg adressebok",
 "create a new addressbook" => "Lag ny adressebok",
 "Name of new addressbook" => "Navn på ny adressebok",
-"Import" => "Importer",
 "Importing contacts" => "Importerer kontakter",
 "You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
 "Add contact" => "Ny kontakt",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index fd7e50ba4d..eccd757c24 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
 "There was an error adding the contact." => "Er was een fout bij het toevoegen van het contact.",
+"element name is not set." => "onderdeel naam is niet opgegeven.",
+"id is not set." => "id is niet ingesteld.",
 "Cannot add empty property." => "Kan geen lege eigenschap toevoegen.",
 "At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
 "Trying to add duplicate property: " => "Eigenschap bestaat al: ",
-"Error adding contact property." => "Fout bij het toevoegen van de contacteigenschap.",
 "No ID provided" => "Geen ID opgegeven",
 "Error setting checksum." => "Instellen controlegetal mislukt",
 "No categories selected for deletion." => "Geen categorieën geselecteerd om te verwijderen.",
@@ -12,22 +13,16 @@
 "No contacts found." => "Geen contracten gevonden",
 "Missing ID" => "Ontbrekend ID",
 "Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
-"Cannot add addressbook with an empty name." => "Kan geen adresboek toevoegen zonder naam.",
-"Error adding addressbook." => "Fout bij het toevoegen van het adresboek.",
-"Error activating addressbook." => "Fout bij het activeren van het adresboek.",
 "No contact ID was submitted." => "Geen contact ID opgestuurd.",
 "Error reading contact photo." => "Lezen van contact foto mislukt.",
 "Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
 "The loading photo is not valid." => "De geladen foto is niet goed.",
-"id is not set." => "id is niet ingesteld.",
 "Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
 "Error deleting contact property." => "Fout bij het verwijderen van de contacteigenschap.",
 "Contact ID is missing." => "Contact ID ontbreekt.",
-"Missing contact id." => "Ontbrekende contact id.",
 "No photo path was submitted." => "Geen fotopad opgestuurd.",
 "File doesn't exist:" => "Bestand bestaat niet:",
 "Error loading image." => "Fout bij laden plaatje.",
-"element name is not set." => "onderdeel naam is niet opgegeven.",
 "checksum is not set." => "controlegetal is niet opgegeven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
 "Something went FUBAR. " => "Er ging iets totaal verkeerd. ",
@@ -42,7 +37,7 @@
 "No file was uploaded" => "Er is geen bestand geüpload",
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
-"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
+"Contact" => "Contact",
 "Addressbook not found." => "Adresboek niet gevonden.",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
@@ -60,25 +55,26 @@
 "Video" => "Video",
 "Pager" => "Pieper",
 "Internet" => "Internet",
+"Birthday" => "Verjaardag",
 "{name}'s Birthday" => "{name}'s verjaardag",
-"Contact" => "Contact",
 "Add Contact" => "Contact toevoegen",
+"Import" => "Importeer",
 "Addressbooks" => "Adresboeken",
 "Configure Address Books" => "Instellen adresboeken",
 "New Address Book" => "Nieuw Adresboek",
-"Import from VCF" => "Importeer uit VCF",
 "CardDav Link" => "CardDav Link",
 "Download" => "Download",
 "Edit" => "Bewerken",
 "Delete" => "Verwijderen",
-"Download contact" => "Download contact",
-"Delete contact" => "Verwijder contact",
 "Drop photo to upload" => "Verwijder foto uit upload",
+"Delete current photo" => "Verwijdere huidige foto",
+"Edit current photo" => "Wijzig huidige foto",
+"Upload new photo" => "Upload nieuwe foto",
+"Select photo from ownCloud" => "Selecteer foto uit ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma",
 "Edit name details" => "Wijzig naam gegevens",
 "Nickname" => "Roepnaam",
 "Enter nickname" => "Voer roepnaam in",
-"Birthday" => "Verjaardag",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Groepen",
 "Separate groups with commas" => "Gebruik komma bij meerder groepen",
@@ -94,24 +90,18 @@
 "Edit address details" => "Wijzig adres gegevens",
 "Add notes here." => "Voeg notitie toe",
 "Add field" => "Voeg veld toe",
-"Profile picture" => "Profiel foto",
 "Phone" => "Telefoon",
 "Note" => "Notitie",
-"Delete current photo" => "Verwijdere huidige foto",
-"Edit current photo" => "Wijzig huidige foto",
-"Upload new photo" => "Upload nieuwe foto",
-"Select photo from ownCloud" => "Selecteer foto uit ownCloud",
+"Download contact" => "Download contact",
+"Delete contact" => "Verwijder contact",
 "Edit address" => "Wijzig adres",
 "Type" => "Type",
 "PO Box" => "Postbus",
 "Extended" => "Uitgebreide",
-"Street" => "Straat",
 "City" => "Stad",
 "Region" => "Regio",
 "Zipcode" => "Postcode",
 "Country" => "Land",
-"Edit categories" => "Wijzig categorieën",
-"Add" => "Voeg toe",
 "Addressbook" => "Adresboek",
 "Hon. prefixes" => "Hon. prefixes",
 "Given name" => "Voornaam",
@@ -128,10 +118,7 @@
 "Please choose the addressbook" => "Kies een adresboek",
 "create a new addressbook" => "Maak een nieuw adresboek",
 "Name of new addressbook" => "Naam van nieuw adresboek",
-"Import" => "Importeer",
 "Importing contacts" => "Importeren van contacten",
-"Select address book to import to:" => "Selecteer adresboek voor import:",
-"Select from HD" => "Selecteer van schijf",
 "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
 "Add contact" => "Contactpersoon toevoegen",
 "Configure addressbooks" => "Bewerken adresboeken",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 5b3fc5b1ab..53f863ce81 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -3,14 +3,12 @@
 "There was an error adding the contact." => "Det kom ei feilmelding då kontakta vart lagt til.",
 "Cannot add empty property." => "Kan ikkje leggja til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst eit av adressefelta må fyllast ut.",
-"Error adding contact property." => "Eit problem oppstod ved å leggja til kontakteltet.",
-"Error adding addressbook." => "Eit problem oppstod ved å leggja til adresseboka.",
-"Error activating addressbook." => "Eit problem oppstod ved aktivering av adresseboka.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
 "Error deleting contact property." => "Eit problem oppstod ved å slette kontaktfeltet.",
 "Error updating contact property." => "Eit problem oppstod ved å endre kontaktfeltet.",
 "Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
 "Contacts" => "Kotaktar",
+"Contact" => "Kontakt",
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
 "Contact could not be found." => "Fann ikkje kontakten.",
 "Address" => "Adresse",
@@ -25,7 +23,7 @@
 "Fax" => "Faks",
 "Video" => "Video",
 "Pager" => "Personsøkjar",
-"Contact" => "Kontakt",
+"Birthday" => "Bursdag",
 "Add Contact" => "Legg til kontakt",
 "Addressbooks" => "Adressebøker",
 "New Address Book" => "Ny adressebok",
@@ -33,20 +31,17 @@
 "Download" => "Last ned",
 "Edit" => "Endra",
 "Delete" => "Slett",
-"Download contact" => "Last ned kontakt",
-"Delete contact" => "Slett kontakt",
-"Birthday" => "Bursdag",
 "Preferred" => "Føretrekt",
 "Phone" => "Telefonnummer",
+"Download contact" => "Last ned kontakt",
+"Delete contact" => "Slett kontakt",
 "Type" => "Skriv",
 "PO Box" => "Postboks",
 "Extended" => "Utvida",
-"Street" => "Gate",
 "City" => "Stad",
 "Region" => "Region/fylke",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Add" => "Legg til",
 "Addressbook" => "Adressebok",
 "New Addressbook" => "Ny adressebok",
 "Edit Addressbook" => "Endre adressebok",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index a99f190695..8e5fe3b44e 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
 "There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
+"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"id is not set." => "id nie ustawione.",
 "Cannot add empty property." => "Nie można dodać pustego elementu.",
 "At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
 "Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
-"Error adding contact property." => "Błąd dodawania elementu.",
 "No ID provided" => "Brak opatrzonego ID ",
 "Error setting checksum." => "Błąd ustawień sumy kontrolnej",
 "No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nie znaleziono kontaktów.",
 "Missing ID" => "Brak ID",
 "Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
-"Cannot add addressbook with an empty name." => "Nie można dodać książki adresowej z pusta nazwą",
-"Error adding addressbook." => "Błąd dodawania książki adresowej.",
-"Error activating addressbook." => "Błąd aktywowania książki adresowej.",
 "No contact ID was submitted." => "ID kontaktu nie został utworzony.",
 "Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
 "Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
 "The loading photo is not valid." => "Wczytywane zdjęcie nie jest poprawne.",
-"id is not set." => "id nie ustawione.",
 "Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
 "Error deleting contact property." => "Błąd usuwania elementu.",
 "Contact ID is missing." => "Brak kontaktu id.",
-"Missing contact id." => "Brak kontaktu id.",
 "No photo path was submitted." => "Ścieżka do zdjęcia nie została podana.",
 "File doesn't exist:" => "Plik nie istnieje:",
 "Error loading image." => "Błąd ładowania obrazu.",
-"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"Error getting contact object." => "Błąd pobrania kontaktu.",
+"Error getting PHOTO property." => "Błąd uzyskiwania właściwości ZDJĘCIA.",
+"Error saving contact." => "Błąd zapisu kontaktu.",
+"Error resizing image" => "Błąd zmiany rozmiaru obrazu",
+"Error cropping image" => "Błąd przycinania obrazu",
+"Error creating temporary image" => "Błąd utworzenia obrazu tymczasowego",
+"Error finding image: " => "Błąd znajdowanie obrazu: ",
 "checksum is not set." => "checksum-a nie ustawiona",
 "Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
 "Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Załadowany plik tylko częściowo został wysłany.",
 "No file was uploaded" => "Plik nie został załadowany",
 "Missing a temporary folder" => "Brak folderu tymczasowego",
+"Couldn't save temporary image: " => "Nie można zapisać obrazu tymczasowego: ",
+"Couldn't load temporary image: " => "Nie można wczytać obrazu tymczasowego: ",
+"No file was uploaded. Unknown error" => "Plik nie został załadowany. Nieznany błąd",
 "Contacts" => "Kontakty",
-"Drop a VCF file to import contacts." => "Upuść plik VCF do importu kontaktów.",
+"Sorry, this functionality has not been implemented yet" => "Niestety, ta funkcja nie została jeszcze zaimplementowana",
+"Not implemented" => "Nie wdrożono",
+"Couldn't get a valid address." => "Nie można pobrać prawidłowego adresu.",
+"Error" => "Błąd",
+"Contact" => "Kontakt",
+"This property has to be non-empty." => "Ta właściwość nie może być pusta.",
+"Couldn't serialize elements." => "Nie można serializować elementów.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org",
+"Edit name" => "Zmień nazwę",
+"No files selected for upload." => "Żadne pliki nie zostały zaznaczone do wysłania.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze.",
+"Select type" => "Wybierz typ",
+"Result: " => "Wynik: ",
+" imported, " => " importowane, ",
+" failed." => "  nie powiodło się.",
 "Addressbook not found." => "Nie znaleziono książki adresowej",
 "This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
@@ -60,25 +79,27 @@
 "Video" => "Połączenie wideo",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Urodziny",
 "{name}'s Birthday" => "{name} Urodzony",
-"Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
+"Import" => "Import",
 "Addressbooks" => "Książki adresowe",
+"Close" => "Zamknij",
 "Configure Address Books" => "Konfiguruj książkę adresową",
 "New Address Book" => "Nowa książka adresowa",
-"Import from VCF" => "Importuj z VFC",
 "CardDav Link" => "Wyświetla odnośnik CardDav",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
 "Delete" => "Usuwa książkę adresową",
-"Download contact" => "Pobiera kontakt",
-"Delete contact" => "Usuwa kontakt",
 "Drop photo to upload" => "Upuść fotografię aby załadować",
+"Delete current photo" => "Usuń aktualne zdjęcie",
+"Edit current photo" => "Edytuj aktualne zdjęcie",
+"Upload new photo" => "Wczytaj nowe zdjęcie",
+"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
 "Edit name details" => "Edytuj szczegóły nazwy",
 "Nickname" => "Nazwa",
 "Enter nickname" => "Wpisz nazwę",
-"Birthday" => "Urodziny",
 "dd-mm-yyyy" => "dd-mm-rrrr",
 "Groups" => "Grupy",
 "Separate groups with commas" => "Oddziel grupy przecinkami",
@@ -94,24 +115,19 @@
 "Edit address details" => "Edytuj szczegóły adresu",
 "Add notes here." => "Dodaj notatkę tutaj.",
 "Add field" => "Dodaj pole",
-"Profile picture" => "Zdjęcie profilu",
 "Phone" => "Telefon",
 "Note" => "Uwaga",
-"Delete current photo" => "Usuń aktualne zdjęcie",
-"Edit current photo" => "Edytuj aktualne zdjęcie",
-"Upload new photo" => "Wczytaj nowe zdjęcie",
-"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
+"Download contact" => "Pobiera kontakt",
+"Delete contact" => "Usuwa kontakt",
+"The temporary image has been removed from cache." => "Tymczasowy obraz został usunięty z pamięci podręcznej.",
 "Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
 "Extended" => "Rozszerzony",
-"Street" => "Ulica",
 "City" => "Miasto",
 "Region" => "Region",
 "Zipcode" => "Kod pocztowy",
 "Country" => "Kraj",
-"Edit categories" => "Edytuj kategorie",
-"Add" => "Dodaj",
 "Addressbook" => "Książka adresowa",
 "Hon. prefixes" => "Prefiksy Hon.",
 "Miss" => "Panna",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Proszę wybrać książkę adresową",
 "create a new addressbook" => "utwórz nową książkę adresową",
 "Name of new addressbook" => "Nazwa nowej książki adresowej",
-"Import" => "Import",
 "Importing contacts" => "importuj kontakty",
-"Select address book to import to:" => "Zaznacz książkę adresową do importu do:",
-"Select from HD" => "Wybierz z HD",
 "You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
 "Add contact" => "Dodaj kontakt",
 "Configure addressbooks" => "Konfiguruj książkę adresową",
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index e0da0a771a..45ae8206df 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Erro ao (des)ativar agenda.",
 "There was an error adding the contact." => "Ocorreu um erro ao adicionar o contato.",
+"element name is not set." => "nome do elemento não definido.",
+"id is not set." => "ID não definido.",
 "Cannot add empty property." => "Não é possível adicionar propriedade vazia.",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
 "Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
-"Error adding contact property." => "Erro ao adicionar propriedade de contato.",
 "No ID provided" => "Nenhum ID fornecido",
 "Error setting checksum." => "Erro ajustando checksum.",
 "No categories selected for deletion." => "Nenhum categoria selecionada para remoção.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nenhum contato encontrado.",
 "Missing ID" => "Faltando ID",
 "Error parsing VCard for ID: \"" => "Erro de identificação VCard para ID:",
-"Cannot add addressbook with an empty name." => "Não é possivel adicionar uma agenda de endereços com o nome em branco.",
-"Error adding addressbook." => "Erro ao adicionar agenda.",
-"Error activating addressbook." => "Erro ao ativar agenda.",
 "No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
 "Error reading contact photo." => "Erro de leitura na foto do contato.",
 "Error saving temporary file." => "Erro ao salvar arquivo temporário.",
 "The loading photo is not valid." => "Foto carregada não é válida.",
-"id is not set." => "ID não definido.",
 "Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
 "Error deleting contact property." => "Erro ao excluir propriedade de contato.",
 "Contact ID is missing." => "ID do contato está faltando.",
-"Missing contact id." => "Faltando ID do contato.",
 "No photo path was submitted." => "Nenhum caminho para foto foi submetido.",
 "File doesn't exist:" => "Arquivo não existe:",
 "Error loading image." => "Erro ao carregar imagem.",
-"element name is not set." => "nome do elemento não definido.",
+"Error getting contact object." => "Erro ao obter propriedade de contato.",
+"Error getting PHOTO property." => "Erro ao obter propriedade da FOTO.",
+"Error saving contact." => "Erro ao salvar contato.",
+"Error resizing image" => "Erro ao modificar tamanho da imagem",
+"Error cropping image" => "Erro ao recortar imagem",
+"Error creating temporary image" => "Erro ao criar imagem temporária",
+"Error finding image: " => "Erro ao localizar imagem:",
 "checksum is not set." => "checksum não definido.",
 "Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
 "Something went FUBAR. " => "Something went FUBAR. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "O arquivo foi parcialmente carregado",
 "No file was uploaded" => "Nenhum arquivo carregado",
 "Missing a temporary folder" => "Diretório temporário não encontrado",
+"Couldn't save temporary image: " => "Não foi possível salvar a imagem temporária:",
+"Couldn't load temporary image: " => "Não foi possível carregar a imagem temporária:",
+"No file was uploaded. Unknown error" => "Nenhum arquivo foi transferido. Erro desconhecido",
 "Contacts" => "Contatos",
-"Drop a VCF file to import contacts." => "Arraste um arquivo VCF para importar contatos.",
+"Sorry, this functionality has not been implemented yet" => "Desculpe, esta funcionalidade não foi implementada ainda",
+"Not implemented" => "não implementado",
+"Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
+"Error" => "Erro",
+"Contact" => "Contato",
+"This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
+"Couldn't serialize elements." => "Não foi possível serializar elementos.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Nenhum arquivo selecionado para carregar.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor.",
+"Select type" => "Selecione o tipo",
+"Result: " => "Resultado:",
+" imported, " => "importado,",
+" failed." => "falhou.",
 "Addressbook not found." => "Lista de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
@@ -60,25 +79,27 @@
 "Video" => "Vídeo",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Aniversário",
 "{name}'s Birthday" => "Aniversário de {name}",
-"Contact" => "Contato",
 "Add Contact" => "Adicionar Contato",
+"Import" => "Importar",
 "Addressbooks" => "Agendas de Endereço",
+"Close" => "Fechar.",
 "Configure Address Books" => "Configurar Livro de Endereços",
 "New Address Book" => "Nova agenda",
-"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Link CardDav",
 "Download" => "Baixar",
 "Edit" => "Editar",
 "Delete" => "Excluir",
-"Download contact" => "Baixar contato",
-"Delete contact" => "Apagar contato",
 "Drop photo to upload" => "Arraste a foto para ser carregada",
+"Delete current photo" => "Deletar imagem atual",
+"Edit current photo" => "Editar imagem atual",
+"Upload new photo" => "Carregar nova foto",
+"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
 "Edit name details" => "Editar detalhes do nome",
 "Nickname" => "Apelido",
 "Enter nickname" => "Digite o apelido",
-"Birthday" => "Aniversário",
 "dd-mm-yyyy" => "dd-mm-aaaa",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separe grupos por virgula",
@@ -94,24 +115,19 @@
 "Edit address details" => "Editar detalhes de endereço",
 "Add notes here." => "Adicionar notas",
 "Add field" => "Adicionar campo",
-"Profile picture" => "Imagem do Perfil",
 "Phone" => "Telefone",
 "Note" => "Nota",
-"Delete current photo" => "Deletar imagem atual",
-"Edit current photo" => "Editar imagem atual",
-"Upload new photo" => "Carregar nova foto",
-"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
+"Download contact" => "Baixar contato",
+"Delete contact" => "Apagar contato",
+"The temporary image has been removed from cache." => "A imagem temporária foi removida cache.",
 "Edit address" => "Editar endereço",
 "Type" => "Digite",
 "PO Box" => "Caixa Postal",
 "Extended" => "Estendido",
-"Street" => "Rua",
 "City" => "Cidade",
 "Region" => "Região",
 "Zipcode" => "CEP",
 "Country" => "País",
-"Edit categories" => "Editar categorias",
-"Add" => "Adicionar",
 "Addressbook" => "Agenda de Endereço",
 "Hon. prefixes" => "Exmo. Prefixos ",
 "Miss" => "Senhorita",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Por favor, selecione uma agenda de endereços",
 "create a new addressbook" => "Criar nova agenda de endereços",
 "Name of new addressbook" => "Nome da nova agenda de endereços",
-"Import" => "Importar",
 "Importing contacts" => "Importar contatos",
-"Select address book to import to:" => "Selecione agenda de endereços para importar ao destino:",
-"Select from HD" => "Selecione do disco rigído",
 "You have no contacts in your addressbook." => "Voce não tem contatos em sua agenda de endereços.",
 "Add contact" => "Adicionar contatos",
 "Configure addressbooks" => "Configurar agenda de endereços",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 7a4861abf9..380320216c 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
 "There was an error adding the contact." => "Erro ao adicionar contato",
+"element name is not set." => "o nome do elemento não está definido.",
+"id is not set." => "id não está definido",
 "Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
 "Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
-"Error adding contact property." => "Erro ao adicionar propriedade do contato",
 "No ID provided" => "Nenhum ID inserido",
 "Error setting checksum." => "Erro a definir checksum.",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nenhum contacto encontrado.",
 "Missing ID" => "Falta ID",
 "Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
-"Cannot add addressbook with an empty name." => "Não é possivel adicionar Livro de endereços com nome vazio.",
-"Error adding addressbook." => "Erro ao adicionar livro de endereços",
-"Error activating addressbook." => "Erro ao ativar livro de endereços",
 "No contact ID was submitted." => "Nenhum ID de contacto definido.",
 "Error reading contact photo." => "Erro a ler a foto do contacto.",
 "Error saving temporary file." => "Erro a guardar ficheiro temporário.",
 "The loading photo is not valid." => "A foto carregada não é valida.",
-"id is not set." => "id não está definido",
 "Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
 "Error deleting contact property." => "Erro ao apagar propriedade do contato",
 "Contact ID is missing." => "Falta o ID do contacto.",
-"Missing contact id." => "Falta o ID do contacto.",
 "No photo path was submitted." => "Nenhum caminho da foto definido.",
 "File doesn't exist:" => "O ficheiro não existe:",
 "Error loading image." => "Erro a carregar a imagem.",
-"element name is not set." => "o nome do elemento não está definido.",
+"Error getting contact object." => "Erro a obter o objecto dos contactos",
+"Error getting PHOTO property." => "Erro a obter a propriedade Foto",
+"Error saving contact." => "Erro a guardar o contacto.",
+"Error resizing image" => "Erro a redimensionar a imagem",
+"Error cropping image" => "Erro a recorar a imagem",
+"Error creating temporary image" => "Erro a criar a imagem temporária",
+"Error finding image: " => "Erro enquanto pesquisava pela imagem: ",
 "checksum is not set." => "Checksum não está definido.",
 "Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
 "Something went FUBAR. " => "Algo provocou um FUBAR. ",
@@ -36,8 +38,30 @@
 "Error updating addressbook." => "Erro a atualizar o livro de endereços",
 "Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
 "There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
 "No file was uploaded" => "Nenhum ficheiro foi submetido",
+"Missing a temporary folder" => "Está a faltar a pasta temporária",
+"Couldn't save temporary image: " => "Não foi possível guardar a imagem temporária: ",
+"Couldn't load temporary image: " => "Não é possível carregar a imagem temporária: ",
+"No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
 "Contacts" => "Contactos",
+"Sorry, this functionality has not been implemented yet" => "Desculpe, esta funcionalidade ainda não está implementada",
+"Not implemented" => "Não implementado",
+"Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
+"Error" => "Erro",
+"Contact" => "Contacto",
+"This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
+"Couldn't serialize elements." => "Não foi possivel serializar os elementos",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Nenhum ficheiro seleccionado para enviar.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor.",
+"Select type" => "Seleccionar tipo",
+"Result: " => "Resultado: ",
+" imported, " => " importado, ",
+" failed." => " falhou.",
 "Addressbook not found." => "Livro de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
@@ -55,23 +79,27 @@
 "Video" => "Vídeo",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Aniversário",
 "{name}'s Birthday" => "Aniversário de {name}",
-"Contact" => "Contacto",
 "Add Contact" => "Adicionar Contacto",
+"Import" => "Importar",
 "Addressbooks" => "Livros de endereços",
+"Close" => "Fechar",
 "Configure Address Books" => "Configurar livros de endereços",
 "New Address Book" => "Novo livro de endereços",
-"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Endereço CardDav",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "Delete" => "Apagar",
-"Download contact" => "Transferir contacto",
-"Delete contact" => "Apagar contato",
+"Drop photo to upload" => "Arraste e solte fotos para carregar",
+"Delete current photo" => "Eliminar a foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Upload new photo" => "Carregar nova foto",
+"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula",
 "Edit name details" => "Editar detalhes do nome",
 "Nickname" => "Alcunha",
 "Enter nickname" => "Introduza alcunha",
-"Birthday" => "Aniversário",
 "dd-mm-yyyy" => "dd-mm-aaaa",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separe os grupos usando virgulas",
@@ -87,30 +115,39 @@
 "Edit address details" => "Editar os detalhes do endereço",
 "Add notes here." => "Insira notas aqui.",
 "Add field" => "Adicionar campo",
-"Profile picture" => "Foto do perfil",
 "Phone" => "Telefone",
 "Note" => "Nota",
-"Delete current photo" => "Eliminar a foto actual",
-"Edit current photo" => "Editar a foto actual",
-"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
+"Download contact" => "Transferir contacto",
+"Delete contact" => "Apagar contato",
+"The temporary image has been removed from cache." => "A imagem temporária foi retirada do cache.",
 "Edit address" => "Editar endereço",
 "Type" => "Tipo",
 "PO Box" => "Apartado",
 "Extended" => "Extendido",
-"Street" => "Rua",
 "City" => "Cidade",
 "Region" => "Região",
 "Zipcode" => "Código Postal",
 "Country" => "País",
-"Edit categories" => "Editar categorias",
-"Add" => "Adicionar",
 "Addressbook" => "Livro de endereços",
+"Hon. prefixes" => "Prefixos honoráveis",
+"Miss" => "Menina",
 "Ms" => "Sra",
 "Mr" => "Sr",
 "Sir" => "Sr",
+"Mrs" => "Senhora",
 "Dr" => "Dr",
+"Given name" => "Nome introduzido",
 "Additional names" => "Nomes adicionais",
 "Family name" => "Nome de familia",
+"Hon. suffixes" => "Sufixos Honoráveis",
+"J.D." => "D.J.",
+"M.D." => "D.M.",
+"D.O." => "Dr.",
+"D.C." => "Dr.",
+"Ph.D." => "Dr.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "r.",
 "New Addressbook" => "Novo livro de endereços",
 "Edit Addressbook" => "Editar livro de endereços",
 "Displayname" => "Nome de exibição",
@@ -121,9 +158,13 @@
 "Import a contacts file" => "Importar um ficheiro de contactos",
 "Please choose the addressbook" => "Por favor seleccione o livro de endereços",
 "create a new addressbook" => "Criar um novo livro de endereços",
-"Import" => "Importar",
+"Name of new addressbook" => "Nome do novo livro de endereços",
 "Importing contacts" => "A importar os contactos",
+"You have no contacts in your addressbook." => "Não tem contactos no seu livro de endereços.",
 "Add contact" => "Adicionar contacto",
+"Configure addressbooks" => "Configurar livros de endereços",
+"CardDAV syncing addresses" => "CardDAV a sincronizar endereços",
 "more info" => "mais informação",
+"Primary address (Kontact et al)" => "Endereço primario (Kontact et al)",
 "iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 0160975671..9972d0b66a 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
 "There was an error adding the contact." => "O eroare a împiedicat adăugarea contactului.",
+"element name is not set." => "numele elementului nu este stabilit.",
+"id is not set." => "ID-ul nu este stabilit",
 "Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
 "At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
-"Error adding contact property." => "Contactul nu a putut fi adăugat.",
 "No ID provided" => "Nici un ID nu a fost furnizat",
 "Error setting checksum." => "Eroare la stabilirea sumei de control",
 "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
@@ -11,26 +12,21 @@
 "No contacts found." => "Nici un contact găsit",
 "Missing ID" => "ID lipsă",
 "Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
-"Cannot add addressbook with an empty name." => "Nu e posibil de adăugat o carte de adrese fără nume",
-"Error adding addressbook." => "Agenda nu a putut fi adăugată.",
-"Error activating addressbook." => "Eroare la activarea agendei.",
 "No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
 "Error reading contact photo." => "Eroare la citerea fotografiei de contact",
 "Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
 "The loading photo is not valid." => "Fotografia care se încarcă nu este validă.",
-"id is not set." => "ID-ul nu este stabilit",
 "Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
 "Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
 "Contact ID is missing." => "ID-ul de contact lipsește.",
-"Missing contact id." => "ID de contact lipsă.",
 "No photo path was submitted." => "Nici o adresă către fotografie nu a fost transmisă",
 "File doesn't exist:" => "Fișierul nu există:",
 "Error loading image." => "Eroare la încărcarea imaginii.",
-"element name is not set." => "numele elementului nu este stabilit.",
 "checksum is not set." => "suma de control nu este stabilită.",
 "Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "Error updating addressbook." => "Eroare la actualizarea agendei.",
 "Contacts" => "Contacte",
+"Contact" => "Contact",
 "This is not your addressbook." => "Nu se găsește în agendă.",
 "Contact could not be found." => "Contactul nu a putut fi găsit.",
 "Address" => "Adresă",
@@ -47,8 +43,8 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Zi de naștere",
 "{name}'s Birthday" => "Ziua de naștere a {name}",
-"Contact" => "Contact",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
 "New Address Book" => "Agendă nouă",
@@ -56,12 +52,9 @@
 "Download" => "Descarcă",
 "Edit" => "Editează",
 "Delete" => "Șterge",
-"Download contact" => "Descarcă acest contact",
-"Delete contact" => "Șterge contact",
 "Edit name details" => "Introdu detalii despre nume",
 "Nickname" => "Pseudonim",
 "Enter nickname" => "Introdu pseudonim",
-"Birthday" => "Zi de naștere",
 "dd-mm-yyyy" => "zz-ll-aaaa",
 "Groups" => "Grupuri",
 "Separate groups with commas" => "Separă grupurile cu virgule",
@@ -72,15 +65,15 @@
 "Mail to address" => "Trimite mesaj la e-mail",
 "Delete email address" => "Șterge e-mail",
 "Phone" => "Telefon",
+"Download contact" => "Descarcă acest contact",
+"Delete contact" => "Șterge contact",
 "Type" => "Tip",
 "PO Box" => "CP",
 "Extended" => "Extins",
-"Street" => "Stradă",
 "City" => "Oraș",
 "Region" => "Regiune",
 "Zipcode" => "Cod poștal",
 "Country" => "Țară",
-"Add" => "Adaugă",
 "Addressbook" => "Agendă",
 "New Addressbook" => "Agendă nouă",
 "Edit Addressbook" => "Modifică agenda",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 01a0e2642b..63217baf32 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,9 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
 "There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
+"element name is not set." => "имя элемента не установлено.",
+"id is not set." => "id не установлен.",
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
-"Error adding contact property." => "Ошибка добавления информации к контакту.",
+"Trying to add duplicate property: " => "При попытке добавить дубликат:",
 "No ID provided" => "ID не предоставлен",
 "Error setting checksum." => "Ошибка установки контрольной суммы.",
 "No categories selected for deletion." => "Категории для удаления не установлены.",
@@ -11,21 +13,26 @@
 "No contacts found." => "Контакты не найдены.",
 "Missing ID" => "Отсутствует ID",
 "Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
-"Cannot add addressbook with an empty name." => "Нельзя добавить адресную книгу без имени.",
-"Error adding addressbook." => "Ошибка добавления адресной книги.",
-"Error activating addressbook." => "Ошибка активации адресной книги.",
+"No contact ID was submitted." => "Нет контакта ID",
 "Error reading contact photo." => "Ошибка чтения фотографии контакта.",
 "Error saving temporary file." => "Ошибка сохранения временного файла.",
 "The loading photo is not valid." => "Загружаемая фотография испорчена.",
-"id is not set." => "id не установлен.",
 "Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
 "Error deleting contact property." => "Ошибка удаления информации из контакта.",
 "Contact ID is missing." => "ID контакта отсутствует.",
+"No photo path was submitted." => "Нет фото по адресу.",
 "File doesn't exist:" => "Файл не существует:",
 "Error loading image." => "Ошибка загрузки картинки.",
-"element name is not set." => "имя элемента не установлено.",
+"Error getting contact object." => "Ошибка при получении контактов",
+"Error getting PHOTO property." => "Ошибка при получении ФОТО.",
+"Error saving contact." => "Ошибка при сохранении контактов.",
+"Error resizing image" => "Ошибка изменения размера изображений",
+"Error cropping image" => "Ошибка обрезки изображений",
+"Error creating temporary image" => "Ошибка создания временных изображений",
+"Error finding image: " => "Ошибка поиска изображений:",
 "checksum is not set." => "контрольная сумма не установлена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
+"Something went FUBAR. " => "Что-то пошло FUBAR.",
 "Error updating contact property." => "Ошибка обновления информации контакта.",
 "Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
 "Error updating addressbook." => "Ошибка обновления адресной книги.",
@@ -36,7 +43,25 @@
 "The uploaded file was only partially uploaded" => "Файл загружен частично",
 "No file was uploaded" => "Файл не был загружен",
 "Missing a temporary folder" => "Отсутствует временная папка",
+"Couldn't save temporary image: " => "Не удалось сохранить временное изображение:",
+"Couldn't load temporary image: " => "Не удалось загрузить временное изображение:",
+"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
 "Contacts" => "Контакты",
+"Sorry, this functionality has not been implemented yet" => "К сожалению, эта функция не была реализована",
+"Not implemented" => "Не реализовано",
+"Couldn't get a valid address." => "Не удалось получить адрес.",
+"Error" => "Ошибка",
+"Contact" => "Контакт",
+"This property has to be non-empty." => "Это свойство должно быть не пустым.",
+"Couldn't serialize elements." => "Не удалось сериализовать элементы.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' called without type argument. Please report at bugs.owncloud.org",
+"Edit name" => "Изменить имя",
+"No files selected for upload." => "Нет выбранных файлов для загрузки.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере.",
+"Select type" => "Выберите тип",
+"Result: " => "Результат:",
+" imported, " => "импортировано, ",
+" failed." => "не удалось.",
 "Addressbook not found." => "Адресная книга не найдена.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
@@ -54,25 +79,30 @@
 "Video" => "Видео",
 "Pager" => "Пейджер",
 "Internet" => "Интернет",
+"Birthday" => "День рождения",
 "{name}'s Birthday" => "День рождения {name}",
-"Contact" => "Контакт",
 "Add Contact" => "Добавить Контакт",
+"Import" => "Импорт",
 "Addressbooks" => "Адресные книги",
+"Close" => "Закрыть",
 "Configure Address Books" => "Настроить Адресную книгу",
 "New Address Book" => "Новая адресная книга",
-"Import from VCF" => "Импортировать из VCF",
 "CardDav Link" => "Ссылка CardDAV",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
-"Download contact" => "Скачать контакт",
-"Delete contact" => "Удалить контакт",
 "Drop photo to upload" => "Перетяните фотографии для загрузки",
+"Delete current photo" => "Удалить текущую фотографию",
+"Edit current photo" => "Редактировать текущую фотографию",
+"Upload new photo" => "Загрузить новую фотографию",
+"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Формат Краткое имя, Полное имя",
+"Edit name details" => "Изменить детали имени",
 "Nickname" => "Псевдоним",
 "Enter nickname" => "Введите псевдоним",
-"Birthday" => "День рождения",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Группы",
+"Separate groups with commas" => "Разделить группы запятыми",
 "Edit groups" => "Редактировать группы",
 "Preferred" => "Предпочитаемый",
 "Please specify a valid email address." => "Укажите действительный адрес электронной почты.",
@@ -85,28 +115,39 @@
 "Edit address details" => "Ввести детали адреса",
 "Add notes here." => "Добавьте заметки здесь.",
 "Add field" => "Добавить поле",
-"Profile picture" => "Фото профиля",
 "Phone" => "Телефон",
 "Note" => "Заметка",
-"Delete current photo" => "Удалить текущую фотографию",
-"Edit current photo" => "Редактировать текущую фотографию",
-"Upload new photo" => "Загрузить новую фотографию",
-"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
+"Download contact" => "Скачать контакт",
+"Delete contact" => "Удалить контакт",
+"The temporary image has been removed from cache." => "Временный образ был удален из кэша.",
 "Edit address" => "Редактировать адрес",
 "Type" => "Тип",
 "PO Box" => "АО",
 "Extended" => "Расширенный",
-"Street" => "Улица",
 "City" => "Город",
 "Region" => "Область",
 "Zipcode" => "Почтовый индекс",
 "Country" => "Страна",
-"Edit categories" => "Редактировать категрии",
-"Add" => "Добавить",
 "Addressbook" => "Адресная книга",
+"Hon. prefixes" => "Уважительные префиксы",
+"Miss" => "Мисс",
+"Ms" => "Г-жа",
+"Mr" => "Г-н",
+"Sir" => "Сэр",
+"Mrs" => "Г-жа",
+"Dr" => "Доктор",
 "Given name" => "Имя",
 "Additional names" => "Дополнительные имена (отчество)",
 "Family name" => "Фамилия",
+"Hon. suffixes" => "Hon. suffixes",
+"J.D." => "Уважительные суффиксы",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Новая адресная книга",
 "Edit Addressbook" => "Редактировать адресную книгу",
 "Displayname" => "Отображаемое имя",
@@ -118,10 +159,12 @@
 "Please choose the addressbook" => "Выберите адресную книгу",
 "create a new addressbook" => "создать новую адресную книгу",
 "Name of new addressbook" => "Имя новой адресной книги",
-"Import" => "Импорт",
 "Importing contacts" => "Импорт контактов",
-"You have no contacts in your addressbook." => "В адресной книге есть контакты.",
+"You have no contacts in your addressbook." => "В адресной книге нет контактов.",
 "Add contact" => "Добавить контакт",
 "Configure addressbooks" => "Настроить адресную книгу",
-"more info" => "дополнительная информация"
+"CardDAV syncing addresses" => "CardDAV синхронизации адресов",
+"more info" => "дополнительная информация",
+"Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index bfba23fabc..7ff30a34f1 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
 "There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
+"element name is not set." => "ime elementa ni nastavljeno.",
+"id is not set." => "id ni nastavljen.",
 "Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
 "At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
 "Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
-"Error adding contact property." => "Napaka pri dodajanju informacije o stiku.",
 "No ID provided" => "ID ni bil podan",
 "Error setting checksum." => "Napaka pri nastavljanju nadzorne vsote.",
 "No categories selected for deletion." => "Nobena kategorija ni bila izbrana za izbris.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Ni bilo najdenih stikov.",
 "Missing ID" => "Manjkajoč ID",
 "Error parsing VCard for ID: \"" => "Napaka pri razčlenjevanju VCard za ID: \"",
-"Cannot add addressbook with an empty name." => "Ne morem dodati imenika s praznim imenom.",
-"Error adding addressbook." => "Napaka pri dodajanju imenika.",
-"Error activating addressbook." => "Napaka pri aktiviranju imenika.",
 "No contact ID was submitted." => "ID stika ni bil poslan.",
 "Error reading contact photo." => "Napaka pri branju slike stika.",
 "Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
 "The loading photo is not valid." => "Slika, ki se nalaga ni veljavna.",
-"id is not set." => "id ni nastavljen.",
 "Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
 "Error deleting contact property." => "Napaka pri brisanju lastnosti stika.",
 "Contact ID is missing." => "Manjka ID stika.",
-"Missing contact id." => "Manjka id stika.",
 "No photo path was submitted." => "Pot slike ni bila poslana.",
 "File doesn't exist:" => "Datoteka ne obstaja:",
 "Error loading image." => "Napaka pri nalaganju slike.",
-"element name is not set." => "ime elementa ni nastavljeno.",
+"Error getting contact object." => "Napaka pri pridobivanju kontakta predmeta.",
+"Error getting PHOTO property." => "Napaka pri pridobivanju lastnosti fotografije.",
+"Error saving contact." => "Napaka pri shranjevanju stika.",
+"Error resizing image" => "Napaka pri spreminjanju velikosti slike",
+"Error cropping image" => "Napaka pri obrezovanju slike",
+"Error creating temporary image" => "Napaka pri ustvarjanju začasne slike",
+"Error finding image: " => "Napaka pri iskanju datoteke: ",
 "checksum is not set." => "nadzorna vsota ni nastavljena.",
 "Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
 "Something went FUBAR. " => "Nekaj je šlo v franže. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Datoteka je bila le delno naložena",
 "No file was uploaded" => "Nobena datoteka ni bila naložena",
 "Missing a temporary folder" => "Manjka začasna mapa",
+"Couldn't save temporary image: " => "Začasne slike ni bilo mogoče shraniti: ",
+"Couldn't load temporary image: " => "Začasne slike ni bilo mogoče naložiti: ",
+"No file was uploaded. Unknown error" => "Nobena datoteka ni bila naložena. Neznana napaka",
 "Contacts" => "Stiki",
-"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
+"Sorry, this functionality has not been implemented yet" => "Žal ta funkcionalnost še ni podprta",
+"Not implemented" => "Ni podprto",
+"Couldn't get a valid address." => "Ne morem dobiti veljavnega naslova.",
+"Error" => "Napaka",
+"Contact" => "Stik",
+"This property has to be non-empty." => "Ta lastnost ne sme biti prazna",
+"Couldn't serialize elements." => "Predmetov ni bilo mogoče dati v zaporedje.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org",
+"Edit name" => "Uredi ime",
+"No files selected for upload." => "Nobena datoteka ni bila izbrana za nalaganje.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku.",
+"Select type" => "Izberite vrsto",
+"Result: " => "Rezultati: ",
+" imported, " => " uvoženih, ",
+" failed." => " je spodletelo.",
 "Addressbook not found." => "Imenik ni bil najden.",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Pozivnik",
 "Internet" => "Internet",
+"Birthday" => "Rojstni dan",
 "{name}'s Birthday" => "{name} - rojstni dan",
-"Contact" => "Stik",
 "Add Contact" => "Dodaj stik",
+"Import" => "Uvozi",
 "Addressbooks" => "Imeniki",
+"Close" => "Zapri",
 "Configure Address Books" => "Nastavi imenike",
 "New Address Book" => "Nov imenik",
-"Import from VCF" => "Uvozi iz VCF",
 "CardDav Link" => "CardDav povezava",
 "Download" => "Prenesi",
 "Edit" => "Uredi",
 "Delete" => "Izbriši",
-"Download contact" => "Prenesi stik",
-"Delete contact" => "Izbriši stik",
 "Drop photo to upload" => "Spustite sliko tukaj, da bi jo naložili",
+"Delete current photo" => "Izbriši trenutno sliko",
+"Edit current photo" => "Uredi trenutno sliko",
+"Upload new photo" => "Naloži novo sliko",
+"Select photo from ownCloud" => "Izberi sliko iz ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico",
 "Edit name details" => "Uredite podrobnosti imena",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
-"Birthday" => "Rojstni dan",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupine",
 "Separate groups with commas" => "Skupine ločite z vejicami",
@@ -94,24 +115,19 @@
 "Edit address details" => "Uredi podrobnosti",
 "Add notes here." => "Opombe dodajte tukaj.",
 "Add field" => "Dodaj polje",
-"Profile picture" => "Slika profila",
 "Phone" => "Telefon",
 "Note" => "Opomba",
-"Delete current photo" => "Izbriši trenutno sliko",
-"Edit current photo" => "Uredi trenutno sliko",
-"Upload new photo" => "Naloži novo sliko",
-"Select photo from ownCloud" => "Izberi sliko iz ownCloud",
+"Download contact" => "Prenesi stik",
+"Delete contact" => "Izbriši stik",
+"The temporary image has been removed from cache." => "Začasna slika je bila odstranjena iz predpomnilnika.",
 "Edit address" => "Uredi naslov",
 "Type" => "Vrsta",
 "PO Box" => "Poštni predal",
 "Extended" => "Razširjeno",
-"Street" => "Ulica",
 "City" => "Mesto",
 "Region" => "Regija",
 "Zipcode" => "Poštna št.",
 "Country" => "Dežela",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Addressbook" => "Imenik",
 "Hon. prefixes" => "Predpone",
 "Miss" => "gdč.",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Prosimo, če izberete imenik",
 "create a new addressbook" => "Ustvari nov imenik",
 "Name of new addressbook" => "Ime novega imenika",
-"Import" => "Uvozi",
 "Importing contacts" => "Uvažam stike",
-"Select address book to import to:" => "Izberite imenik v katerega boste uvažali:",
-"Select from HD" => "Izberi iz HD",
 "You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
 "Add contact" => "Dodaj stik",
 "Configure addressbooks" => "Nastavi imenike",
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index aad88f3603..3db20c55b8 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
 "Contacts" => "Контакти",
+"Contact" => "Контакт",
 "This is not your addressbook." => "Ово није ваш адресар.",
 "Contact could not be found." => "Контакт се не може наћи.",
 "Address" => "Адреса",
@@ -15,27 +16,24 @@
 "Fax" => "Факс",
 "Video" => "Видео",
 "Pager" => "Пејџер",
-"Contact" => "Контакт",
+"Birthday" => "Рођендан",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "Адресар",
 "New Address Book" => "Нови адресар",
 "Download" => "Преузимање",
 "Edit" => "Уреди",
 "Delete" => "Обриши",
-"Download contact" => "Преузми контакт",
-"Delete contact" => "Обриши контакт",
-"Birthday" => "Рођендан",
 "Preferred" => "Пожељан",
 "Phone" => "Телефон",
+"Download contact" => "Преузми контакт",
+"Delete contact" => "Обриши контакт",
 "Type" => "Тип",
 "PO Box" => "Поштански број",
 "Extended" => "Прошири",
-"Street" => "Улица",
 "City" => "Град",
 "Region" => "Регија",
 "Zipcode" => "Зип код",
 "Country" => "Земља",
-"Add" => "Додај",
 "Addressbook" => "Адресар",
 "New Addressbook" => "Нови адресар",
 "Edit Addressbook" => "Уреди адресар",
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index a76c104790..6238b2385b 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -14,14 +14,13 @@
 "Fax" => "Faks",
 "Video" => "Video",
 "Pager" => "Pejdžer",
+"Birthday" => "Rođendan",
 "Add Contact" => "Dodaj kontakt",
 "Edit" => "Uredi",
 "Delete" => "Obriši",
-"Birthday" => "Rođendan",
 "Phone" => "Telefon",
 "PO Box" => "Poštanski broj",
 "Extended" => "Proširi",
-"Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Zip kod",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index acf382c6a4..d7af2ae13f 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
 "There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
+"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"id is not set." => "ยังไม่ได้กำหนดรหัส",
 "Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
 "At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
 "Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
-"Error adding contact property." => "เกิดข้อผิดพลาดในการเพิ่มรายละเอียดการติดต่อ",
 "No ID provided" => "ยังไม่ได้ใส่รหัส",
 "Error setting checksum." => "เกิดข้อผิดพลาดในการตั้งค่า checksum",
 "No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
@@ -12,22 +13,23 @@
 "No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
 "Missing ID" => "รหัสสูญหาย",
 "Error parsing VCard for ID: \"" => "พบข้อผิดพลาดในการแยกรหัส VCard:\"",
-"Cannot add addressbook with an empty name." => "ไม่สามารถเพิ่มสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
-"Error adding addressbook." => "เกิดข้อผิดพลาดในการเพิ่มสมุดบันทึกที่อยู่ใหม่",
-"Error activating addressbook." => "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่",
 "No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
 "Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
 "Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
 "The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
-"id is not set." => "ยังไม่ได้กำหนดรหัส",
 "Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
 "Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Contact ID is missing." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
-"Missing contact id." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
 "No photo path was submitted." => "ไม่พบตำแหน่งพาธของรูปภาพ",
 "File doesn't exist:" => "ไม่มีไฟล์ดังกล่าว",
 "Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
-"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"Error getting contact object." => "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ",
+"Error getting PHOTO property." => "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ",
+"Error saving contact." => "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ",
+"Error resizing image" => "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ",
+"Error cropping image" => "เกิดข้อผิดพลาดในการครอบตัดภาพ",
+"Error creating temporary image" => "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว",
+"Error finding image: " => "เกิดข้อผิดพลาดในการค้นหารูปภาพ: ",
 "checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
 "Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
 "Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
 "No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
 "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
+"Couldn't save temporary image: " => "ไม่สามารถบันทึกรูปภาพชั่วคราวได้: ",
+"Couldn't load temporary image: " => "ไม่สามารถโหลดรูปภาพชั่วคราวได้: ",
+"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
 "Contacts" => "ข้อมูลการติดต่อ",
-"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
+"Sorry, this functionality has not been implemented yet" => "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ",
+"Not implemented" => "ยังไม่ได้ถูกดำเนินการ",
+"Couldn't get a valid address." => "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้",
+"Error" => "พบข้อผิดพลาด",
+"Contact" => "ข้อมูลการติดต่อ",
+"This property has to be non-empty." => "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่",
+"Couldn't serialize elements." => "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org",
+"Edit name" => "แก้ไขชื่อ",
+"No files selected for upload." => "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
+"Select type" => "เลือกชนิด",
+"Result: " => "ผลลัพธ์: ",
+" imported, " => " นำเข้าข้อมูลแล้ว, ",
+" failed." => " ล้มเหลว.",
 "Addressbook not found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
@@ -60,25 +79,27 @@
 "Video" => "วีดีโอ",
 "Pager" => "เพจเจอร์",
 "Internet" => "อินเทอร์เน็ต",
+"Birthday" => "วันเกิด",
 "{name}'s Birthday" => "วันเกิดของ {name}",
-"Contact" => "ข้อมูลการติดต่อ",
 "Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
+"Import" => "นำเข้า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
+"Close" => "ปิด",
 "Configure Address Books" => "กำหนดค่าสมุดบันทึกที่อยู่",
 "New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
-"Import from VCF" => "นำเข้าจาก VCF",
 "CardDav Link" => "ลิงค์ CardDav",
 "Download" => "ดาวน์โหลด",
 "Edit" => "แก้ไข",
 "Delete" => "ลบ",
-"Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
-"Delete contact" => "ลบข้อมูลการติดต่อ",
 "Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
+"Delete current photo" => "ลบรูปภาพปัจจุบัน",
+"Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
+"Upload new photo" => "อัพโหลดรูปภาพใหม่",
+"Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง",
 "Edit name details" => "แก้ไขรายละเอียดของชื่อ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
-"Birthday" => "วันเกิด",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "กลุ่ม",
 "Separate groups with commas" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
@@ -94,24 +115,19 @@
 "Edit address details" => "แก้ไขรายละเอียดที่อยู่",
 "Add notes here." => "เพิ่มหมายเหตุกำกับไว้ที่นี่",
 "Add field" => "เพิ่มช่องรับข้อมูล",
-"Profile picture" => "รูปภาพโปรไฟล์",
 "Phone" => "โทรศัพท์",
 "Note" => "หมายเหตุ",
-"Delete current photo" => "ลบรูปภาพปัจจุบัน",
-"Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
-"Upload new photo" => "อัพโหลดรูปภาพใหม่",
-"Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
+"Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
+"Delete contact" => "ลบข้อมูลการติดต่อ",
+"The temporary image has been removed from cache." => "รูปภาพชั่วคราวดังกล่าวได้ถูกลบออกจากหน่วยความจำแคชแล้ว",
 "Edit address" => "แก้ไขที่อยู่",
 "Type" => "ประเภท",
 "PO Box" => "ตู้ ปณ.",
 "Extended" => "เพิ่ม",
-"Street" => "ถนน",
 "City" => "เมือง",
 "Region" => "ภูมิภาค",
 "Zipcode" => "รหัสไปรษณีย์",
 "Country" => "ประเทศ",
-"Edit categories" => "แก้ไขหมวดหมู่",
-"Add" => "เพิ่ม",
 "Addressbook" => "สมุดบันทึกที่อยู่",
 "Hon. prefixes" => "คำนำหน้าชื่อคนรัก",
 "Miss" => "นางสาว",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "กรุณาเลือกสมุดบันทึกที่อยู่",
 "create a new addressbook" => "สร้างสมุดบันทึกที่อยู่ใหม่",
 "Name of new addressbook" => "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่",
-"Import" => "นำเข้า",
 "Importing contacts" => "นำเข้าข้อมูลการติดต่อ",
-"Select address book to import to:" => "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:",
-"Select from HD" => "เลือกจากฮาร์ดดิส",
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
 "Configure addressbooks" => "กำหนดค่าสมุดบันทึกที่อยู่",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 65e8e34c30..e10d36753c 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
 "There was an error adding the contact." => "Kişi eklenirken hata oluştu.",
+"element name is not set." => "eleman ismi atanmamış.",
+"id is not set." => "id atanmamış.",
+"Could not parse contact: " => "Kişi bilgisi ayrıştırılamadı.",
 "Cannot add empty property." => "Boş özellik eklenemiyor.",
 "At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
 "Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
-"Error adding contact property." => "Kişi özelliği eklenirken hata oluştu.",
+"Error adding contact property: " => "Kişi özelliği eklenirken hata oluştu.",
 "No ID provided" => "ID verilmedi",
 "Error setting checksum." => "İmza oluşturulurken hata.",
 "No categories selected for deletion." => "Silmek için bir kategori seçilmedi.",
@@ -12,22 +15,23 @@
 "No contacts found." => "Bağlantı bulunamadı.",
 "Missing ID" => "Eksik ID",
 "Error parsing VCard for ID: \"" => "ID için VCard ayrıştırılamadı:\"",
-"Cannot add addressbook with an empty name." => "Adres defterini isimsiz ekleyemezsiniz.",
-"Error adding addressbook." => "Adres defteri eklenirken hata oluştu.",
-"Error activating addressbook." => "Adres defteri etkinleştirilirken hata oluştu.",
 "No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
 "Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
 "Error saving temporary file." => "Geçici dosya kaydetme hatası.",
 "The loading photo is not valid." => "Yüklenecek fotograf geçerli değil.",
-"id is not set." => "id atanmamış.",
 "Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
 "Error deleting contact property." => "Kişi özelliği silinirken hata oluştu.",
 "Contact ID is missing." => "Bağlantı ID'si eksik.",
-"Missing contact id." => "Eksik bağlantı id'si.",
 "No photo path was submitted." => "Fotoğraf girilmedi.",
 "File doesn't exist:" => "Dosya mevcut değil:",
 "Error loading image." => "İmaj yükleme hatası.",
-"element name is not set." => "eleman ismi atanmamış.",
+"Error getting contact object." => "Bağlantı nesnesini kaydederken hata.",
+"Error getting PHOTO property." => "Resim özelleğini alırken hata oluştu.",
+"Error saving contact." => "Bağlantıyı kaydederken hata",
+"Error resizing image" => "Görüntü yeniden boyutlandırılamadı.",
+"Error cropping image" => "Görüntü kırpılamadı.",
+"Error creating temporary image" => "Geçici resim oluştururken hata oluştu",
+"Error finding image: " => "Resim ararken hata oluştu:",
 "checksum is not set." => "checksum atanmamış.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
 "Something went FUBAR. " => "Bir şey FUBAR gitti.",
@@ -41,8 +45,27 @@
 "The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
 "No file was uploaded" => "Hiç dosya gönderilmedi",
 "Missing a temporary folder" => "Geçici dizin eksik",
+"Couldn't save temporary image: " => "Geçici resmi saklayamadı : ",
+"Couldn't load temporary image: " => "Geçici resmi yükleyemedi :",
+"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
 "Contacts" => "Kişiler",
-"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
+"Sorry, this functionality has not been implemented yet" => "Üzgünüz, bu özellik henüz tamamlanmadı.",
+"Not implemented" => "Tamamlanmadı.",
+"Couldn't get a valid address." => "Geçerli bir adres alınamadı.",
+"Error" => "Hata",
+"Contact" => "Kişi",
+"New" => "Yeni",
+"New Contact" => "Yeni Kişi",
+"This property has to be non-empty." => "Bu özellik boş bırakılmamalı.",
+"Couldn't serialize elements." => "Öğeler seri hale getiremedi",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz.",
+"Edit name" => "İsmi düzenle",
+"No files selected for upload." => "Yükleme için dosya seçilmedi.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. ",
+"Select type" => "Tür seç",
+"Result: " => "Sonuç: ",
+" imported, " => " içe aktarıldı, ",
+" failed." => " hatalı.",
 "Addressbook not found." => "Adres defteri bulunamadı.",
 "This is not your addressbook." => "Bu sizin adres defteriniz değil.",
 "Contact could not be found." => "Kişi bulunamadı.",
@@ -60,25 +83,54 @@
 "Video" => "Video",
 "Pager" => "Sayfalayıcı",
 "Internet" => "İnternet",
+"Birthday" => "Doğum günü",
+"Business" => "İş",
+"Call" => "Çağrı",
+"Clients" => "Müşteriler",
+"Deliverer" => "Dağıtıcı",
+"Holidays" => "Tatiller",
+"Ideas" => "Fikirler",
+"Journey" => "Seyahat",
+"Jubilee" => "Yıl Dönümü",
+"Meeting" => "Toplantı",
+"Other" => "Diğer",
+"Personal" => "Kişisel",
+"Projects" => "Projeler",
+"Questions" => "Sorular",
 "{name}'s Birthday" => "{name}'nin Doğumgünü",
-"Contact" => "Kişi",
 "Add Contact" => "Kişi Ekle",
+"Import" => "İçe aktar",
 "Addressbooks" => "Adres defterleri",
+"Close" => "Kapat",
+"Keyboard shortcuts" => "Klavye kısayolları",
+"Navigation" => "Dolaşım",
+"Next contact in list" => "Listedeki sonraki kişi",
+"Previous contact in list" => "Listedeki önceki kişi",
+"Expand/collapse current addressbook" => "Şuanki adres defterini genişlet/daralt",
+"Next/previous addressbook" => "Sonraki/Önceki adres defteri",
+"Actions" => "Eylemler",
+"Refresh contacts list" => "Kişi listesini tazele",
+"Add new contact" => "Yeni kişi ekle",
+"Add new addressbook" => "Yeni adres defteri ekle",
+"Delete current contact" => "Şuanki kişiyi sil",
 "Configure Address Books" => "Adres Defterlerini Yapılandır",
 "New Address Book" => "Yeni Adres Defteri",
-"Import from VCF" => "VCF'den içeri aktar",
 "CardDav Link" => "CardDav Bağlantısı",
 "Download" => "İndir",
 "Edit" => "Düzenle",
 "Delete" => "Sil",
-"Download contact" => "Kişiyi indir",
-"Delete contact" => "Kişiyi sil",
 "Drop photo to upload" => "Fotoğrafı yüklenmesi için bırakın",
+"Delete current photo" => "Mevcut fotoğrafı sil",
+"Edit current photo" => "Mevcut fotoğrafı düzenle",
+"Upload new photo" => "Yeni fotoğraf yükle",
+"Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters",
 "Edit name details" => "İsim detaylarını düzenle",
 "Nickname" => "Takma ad",
 "Enter nickname" => "Takma adı girin",
-"Birthday" => "Doğum günü",
+"Web site" => "Web sitesi",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Web sitesine git",
 "dd-mm-yyyy" => "gg-aa-yyyy",
 "Groups" => "Gruplar",
 "Separate groups with commas" => "Grupları birbirinden virgülle ayırın",
@@ -94,24 +146,24 @@
 "Edit address details" => "Adres detaylarını düzenle",
 "Add notes here." => "Notları buraya ekleyin.",
 "Add field" => "Alan ekle",
-"Profile picture" => "Profil resmi",
 "Phone" => "Telefon",
 "Note" => "Not",
-"Delete current photo" => "Mevcut fotoğrafı sil",
-"Edit current photo" => "Mevcut fotoğrafı düzenle",
-"Upload new photo" => "Yeni fotoğraf yükle",
-"Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
+"Download contact" => "Kişiyi indir",
+"Delete contact" => "Kişiyi sil",
+"The temporary image has been removed from cache." => "Geçici resim ön bellekten silinmiştir.",
 "Edit address" => "Adresi düzenle",
 "Type" => "Tür",
 "PO Box" => "Posta Kutusu",
+"Street address" => "Sokak adresi",
+"Street and number" => "Sokak ve Numara",
 "Extended" => "Uzatılmış",
-"Street" => "Sokak",
+"Apartment number etc." => "Apartman numarası vb.",
 "City" => "Şehir",
 "Region" => "Bölge",
+"E.g. state or province" => "Örn. eyalet veya il",
 "Zipcode" => "Posta kodu",
+"Postal code" => "Posta kodu",
 "Country" => "Ülke",
-"Edit categories" => "Kategorileri düzenle",
-"Add" => "Ekle",
 "Addressbook" => "Adres defteri",
 "Hon. prefixes" => "Kısaltmalar",
 "Miss" => "Bayan",
@@ -143,15 +195,16 @@
 "Please choose the addressbook" => "Yeni adres defterini seç",
 "create a new addressbook" => "Yeni adres defteri oluştur",
 "Name of new addressbook" => "Yeni adres defteri için isim",
-"Import" => "İçe aktar",
 "Importing contacts" => "Bağlantıları içe aktar",
-"Select address book to import to:" => "İçe aktarılacak adres defterini seçin:",
-"Select from HD" => "HD'den seç",
 "You have no contacts in your addressbook." => "Adres defterinizde hiç bağlantı yok.",
 "Add contact" => "Bağlatı ekle",
 "Configure addressbooks" => "Adres defterini yapılandır",
+"Select Address Books" => "Adres deftelerini seçiniz",
+"Enter name" => "İsim giriniz",
+"Enter description" => "Tanım giriniz",
 "CardDAV syncing addresses" => "CardDAV adresleri eşzamanlıyor",
 "more info" => "daha fazla bilgi",
 "Primary address (Kontact et al)" => "Birincil adres (Bağlantı ve arkadaşları)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "Sadece okunabilir vCard dizin link(ler)i"
 );
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
index 4c27acf543..5959f1ff7e 100644
--- a/apps/contacts/l10n/uk.php
+++ b/apps/contacts/l10n/uk.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "At least one of the address fields has to be filled out." => "Має бути заповнено щонайменше одне поле.",
-"Error adding addressbook." => "Помилка при додаванні адресної книги.",
 "This is not your addressbook." => "Це не ваша адресна книга.",
 "Address" => "Адреса",
 "Telephone" => "Телефон",
@@ -12,18 +11,16 @@
 "Fax" => "Факс",
 "Video" => "Відео",
 "Pager" => "Пейджер",
+"Birthday" => "День народження",
 "Add Contact" => "Додати контакт",
 "New Address Book" => "Нова адресна книга",
 "Download" => "Завантажити",
 "Delete" => "Видалити",
-"Delete contact" => "Видалити контакт",
-"Birthday" => "День народження",
 "Phone" => "Телефон",
+"Delete contact" => "Видалити контакт",
 "Extended" => "Розширено",
-"Street" => "Вулиця",
 "City" => "Місто",
 "Zipcode" => "Поштовий індекс",
 "Country" => "Країна",
-"Add" => "Додати",
 "Displayname" => "Відображуване ім'я"
 );
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index dcf9b99bc8..affc75e3df 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "(取消)激活地址簿错误。",
 "There was an error adding the contact." => "添加联系人时出错。",
+"element name is not set." => "元素名称未设置",
+"id is not set." => "没有设置 id。",
 "Cannot add empty property." => "无法添加空属性。",
 "At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
 "Trying to add duplicate property: " => "试图添加重复属性： ",
-"Error adding contact property." => "添加联系人属性错误。",
 "No ID provided" => "未提供 ID",
 "Error setting checksum." => "设置校验值错误。",
 "No categories selected for deletion." => "未选中要删除的分类。",
@@ -12,28 +13,55 @@
 "No contacts found." => "找不到联系人。",
 "Missing ID" => "缺少 ID",
 "Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
-"Cannot add addressbook with an empty name." => "无法无姓名的地址簿。",
-"Error adding addressbook." => "添加地址簿错误。",
-"Error activating addressbook." => "激活地址簿错误。",
 "No contact ID was submitted." => "未提交联系人 ID。",
 "Error reading contact photo." => "读取联系人照片错误。",
 "Error saving temporary file." => "保存临时文件错误。",
 "The loading photo is not valid." => "装入的照片不正确。",
-"id is not set." => "没有设置 id。",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
 "Error deleting contact property." => "删除联系人属性错误。",
 "Contact ID is missing." => "缺少联系人 ID。",
-"Missing contact id." => "缺少联系人 ID。",
 "No photo path was submitted." => "未提供照片路径。",
 "File doesn't exist:" => "文件不存在:",
 "Error loading image." => "加载图片错误。",
+"Error getting contact object." => "获取联系人目标时出错。",
+"Error getting PHOTO property." => "获取照片属性时出错。",
+"Error saving contact." => "保存联系人时出错。",
+"Error resizing image" => "缩放图像时出错",
+"Error cropping image" => "裁切图像时出错",
+"Error creating temporary image" => "创建临时图像时出错",
+"Error finding image: " => "查找图像时出错: ",
 "checksum is not set." => "未设置校验值。",
+"Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
+"Something went FUBAR. " => "有一些信息无法被处理。",
 "Error updating contact property." => "更新联系人属性错误。",
+"Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
 "Error updating addressbook." => "更新地址簿错误",
+"Error uploading contacts to storage." => "上传联系人到存储空间时出错",
+"There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
 "The uploaded file was only partially uploaded" => "已上传文件只上传了部分",
 "No file was uploaded" => "没有文件被上传",
 "Missing a temporary folder" => "缺少临时目录",
+"Couldn't save temporary image: " => "无法保存临时图像: ",
+"Couldn't load temporary image: " => "无法加载临时图像: ",
+"No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
 "Contacts" => "联系人",
+"Sorry, this functionality has not been implemented yet" => "抱歉，这个功能暂时还没有被实现",
+"Not implemented" => "未实现",
+"Couldn't get a valid address." => "无法获取一个合法的地址。",
+"Error" => "错误",
+"Contact" => "联系人",
+"This property has to be non-empty." => "这个属性必须是非空的",
+"Couldn't serialize elements." => "无法序列化元素",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误",
+"Edit name" => "编辑名称",
+"No files selected for upload." => "没有选择文件以上传",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "您试图上传的文件超出了该服务器的最大文件限制",
+"Select type" => "选择类型",
+"Result: " => "结果: ",
+" imported, " => " 已导入， ",
+" failed." => " 失败。",
 "Addressbook not found." => "未找到地址簿。",
 "This is not your addressbook." => "这不是您的地址簿。",
 "Contact could not be found." => "无法找到联系人。",
@@ -51,24 +79,27 @@
 "Video" => "视频",
 "Pager" => "传呼机",
 "Internet" => "互联网",
+"Birthday" => "生日",
 "{name}'s Birthday" => "{name} 的生日",
-"Contact" => "联系人",
 "Add Contact" => "添加联系人",
+"Import" => "导入",
 "Addressbooks" => "地址簿",
+"Close" => "关闭",
 "Configure Address Books" => "配置地址簿",
 "New Address Book" => "新建地址簿",
-"Import from VCF" => "从 VCF 导入",
 "CardDav Link" => "CardDav 链接",
 "Download" => "下载",
 "Edit" => "编辑",
 "Delete" => "删除",
-"Download contact" => "下载联系人",
-"Delete contact" => "删除联系人",
 "Drop photo to upload" => "拖拽图片进行上传",
+"Delete current photo" => "删除当前照片",
+"Edit current photo" => "编辑当前照片",
+"Upload new photo" => "上传新照片",
+"Select photo from ownCloud" => "从 ownCloud 选择照片",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "自定义格式，简称，全名，姓在前，姓在前并用逗号分割",
 "Edit name details" => "编辑名称详情",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
-"Birthday" => "生日",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "分组",
 "Separate groups with commas" => "用逗号隔开分组",
@@ -84,27 +115,39 @@
 "Edit address details" => "编辑地址细节。",
 "Add notes here." => "添加注释。",
 "Add field" => "添加字段",
-"Profile picture" => "联系人图片",
 "Phone" => "电话",
 "Note" => "注释",
-"Delete current photo" => "删除当前照片",
-"Edit current photo" => "编辑当前照片",
-"Upload new photo" => "上传新照片",
-"Select photo from ownCloud" => "从 ownCloud 选择照片",
+"Download contact" => "下载联系人",
+"Delete contact" => "删除联系人",
+"The temporary image has been removed from cache." => "临时图像文件已从缓存中删除",
 "Edit address" => "编辑地址",
 "Type" => "类型",
 "PO Box" => "邮箱",
 "Extended" => "扩展",
-"Street" => "街道",
 "City" => "城市",
 "Region" => "地区",
 "Zipcode" => "邮编",
 "Country" => "国家",
-"Edit categories" => "编辑分类",
-"Add" => "添加",
 "Addressbook" => "地址簿",
+"Hon. prefixes" => "名誉字首",
+"Miss" => "小姐",
+"Ms" => "女士",
+"Mr" => "先生",
+"Sir" => "先生",
+"Mrs" => "夫人",
+"Dr" => "博士",
 "Given name" => "名",
+"Additional names" => "其他名称",
 "Family name" => "姓",
+"Hon. suffixes" => "名誉后缀",
+"J.D." => "法律博士",
+"M.D." => "医学博士",
+"D.O." => "骨科医学博士",
+"D.C." => "教育学博士",
+"Ph.D." => "哲学博士",
+"Esq." => "先生",
+"Jr." => "小",
+"Sn." => "老",
 "New Addressbook" => "新建地址簿",
 "Edit Addressbook" => "编辑地址簿",
 "Displayname" => "显示名称",
@@ -116,8 +159,8 @@
 "Please choose the addressbook" => "请选择地址簿",
 "create a new addressbook" => "创建新地址簿",
 "Name of new addressbook" => "新地址簿名称",
-"Import" => "导入",
 "Importing contacts" => "导入联系人",
+"You have no contacts in your addressbook." => "您的地址簿中没有联系人。",
 "Add contact" => "添加联系人",
 "Configure addressbooks" => "配置地址簿",
 "CardDAV syncing addresses" => "CardDAV 同步地址",
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index d4c2efc47a..5647c6bcaa 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -3,18 +3,16 @@
 "There was an error adding the contact." => "添加通訊錄發生錯誤",
 "Cannot add empty property." => "不可添加空白內容",
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
-"Error adding contact property." => "添加通訊錄內容中發生錯誤",
 "No ID provided" => "未提供 ID",
 "No contacts found." => "沒有找到聯絡人",
 "Missing ID" => "遺失ID",
-"Error adding addressbook." => "添加電話簿中發生錯誤",
-"Error activating addressbook." => "啟用電話簿中發生錯誤",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
 "Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "Error updating addressbook." => "電話簿更新中發生錯誤",
 "No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
+"Contact" => "通訊錄",
 "Addressbook not found." => "找不到通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
@@ -32,23 +30,19 @@
 "Video" => "影片",
 "Pager" => "呼叫器",
 "Internet" => "網際網路",
+"Birthday" => "生日",
 "{name}'s Birthday" => "{name}的生日",
-"Contact" => "通訊錄",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
 "Configure Address Books" => "設定通訊錄",
 "New Address Book" => "新電話簿",
-"Import from VCF" => "從VCF匯入",
 "CardDav Link" => "CardDav 聯結",
 "Download" => "下載",
 "Edit" => "編輯",
 "Delete" => "刪除",
-"Download contact" => "下載通訊錄",
-"Delete contact" => "刪除通訊錄",
 "Edit name details" => "編輯姓名詳細資訊",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
-"Birthday" => "生日",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "群組",
 "Separate groups with commas" => "用逗號分隔群組",
@@ -63,18 +57,17 @@
 "Edit address details" => "電子郵件住址詳細資訊",
 "Add notes here." => "在這裡新增註解",
 "Add field" => "新增欄位",
-"Profile picture" => "個人資料照片",
 "Phone" => "電話",
 "Note" => "註解",
+"Download contact" => "下載通訊錄",
+"Delete contact" => "刪除通訊錄",
 "Type" => "類型",
 "PO Box" => "通訊地址",
 "Extended" => "分機",
-"Street" => "街道",
 "City" => "城市",
 "Region" => "地區",
 "Zipcode" => "郵遞區號",
 "Country" => "國家",
-"Add" => "添加",
 "Addressbook" => "電話簿",
 "Mr" => "先生",
 "Sir" => "先生",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 329f306d9e..624e08959f 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "Файлът е качен частично",
 "No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временната папка",
+"Failed to write to disk" => "Грешка при запис на диска",
 "Files" => "Файлове",
 "Delete" => "Изтриване",
+"Upload Error" => "Грешка при качване",
+"Upload cancelled." => "Качването е отменено.",
+"Invalid name, '/' is not allowed." => "Неправилно име – \"/\" не е позволено.",
 "Size" => "Размер",
 "Modified" => "Променено",
+"folder" => "папка",
+"folders" => "папки",
+"file" => "файл",
 "Maximum upload size" => "Макс. размер за качване",
+"0 is unlimited" => "0 означава без ограничение",
+"New" => "Нов",
+"Text file" => "Текстов файл",
+"Folder" => "Папка",
+"From url" => "От url-адрес",
 "Upload" => "Качване",
+"Cancel upload" => "Отказване на качването",
 "Nothing in here. Upload something!" => "Няма нищо, качете нещо!",
 "Name" => "Име",
+"Share" => "Споделяне",
 "Download" => "Изтегляне",
 "Upload too large" => "Файлът е прекалено голям",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
 );
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index c23746ac5a..35be269269 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -9,6 +9,8 @@
 "Files" => "Fitxers",
 "Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
+"undo" => "desfés",
+"deleted" => "esborrat",
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
 "Upload Error" => "Error en la pujada",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index ea7ffa5ac5..1f4b076ee4 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -9,6 +9,8 @@
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr teilen",
 "Delete" => "Löschen",
+"undo" => "rückgängig machen",
+"deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Datei kann nicht hochgeladen werden da sie ein Verzeichniss ist oder 0 bytes hat.",
 "Upload Error" => "Fehler beim Hochladen",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index e1376aa42b..6b6414f925 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -9,6 +9,8 @@
 "Files" => "Archivos",
 "Unshare" => "No compartir",
 "Delete" => "Eliminado",
+"undo" => "deshacer",
+"deleted" => "borrado",
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index ca3d03ad6f..e037c7a2f4 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -9,6 +9,8 @@
 "Files" => "Fichiers",
 "Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
+"undo" => "annuler",
+"deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Générer un fichier ZIP, cela peut prendre du temps",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
 "Upload Error" => "Erreur de chargement",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 35ee7a5fdd..d3dc1a3d08 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -9,6 +9,8 @@
 "Files" => "File",
 "Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
+"undo" => "annulla",
+"deleted" => "eliminati",
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
 "Upload Error" => "Errore di invio",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 67a29b4661..811e983bb9 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -8,6 +8,8 @@
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
 "Delete" => "Usuwa element",
+"undo" => "wróć",
+"deleted" => "skasuj",
 "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
 "Upload Error" => "Błąd wczytywania",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 99bb6df8f8..145dc6ce0b 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,7 +7,10 @@
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Unshare" => "Снять общий доступ",
 "Delete" => "Удалить",
+"undo" => "отмена",
+"deleted" => "удален",
 "generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
 "Upload Error" => "Ошибка загрузки",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index a4f3b57888..0fd9e9a06c 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -9,6 +9,8 @@
 "Files" => "Datoteke",
 "Unshare" => "Vzemi iz souporabe",
 "Delete" => "Izbriši",
+"undo" => "razveljavi",
+"deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
 "Upload Error" => "Napaka pri nalaganju",
@@ -37,7 +39,7 @@
 "Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",
 "Name" => "Ime",
 "Share" => "Souporaba",
-"Download" => "Prejmi",
+"Download" => "Prenesi",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",
 "Files are being scanned, please wait." => "Preiskujem datoteke, prosimo počakajte.",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index f3d936ff84..bdce67c3d4 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -9,6 +9,8 @@
 "Files" => "Filer",
 "Unshare" => "Sluta dela",
 "Delete" => "Ta bort",
+"undo" => "ångra",
+"deleted" => "raderad",
 "generating ZIP-file, it may take some time." => "Gererar ZIP-fil. Det kan ta lite tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
 "Upload Error" => "Uppladdningsfel",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 0ecbcadb48..faa5cc10b7 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,7 +7,10 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Unshare" => "Paylaşılmayan",
 "Delete" => "Sil",
+"undo" => "geri al",
+"deleted" => "silindi",
 "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
 "Upload Error" => "Yükleme hatası",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 743bc57fee..0b535bf384 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,17 +6,37 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
+"Unshare" => "Заборонити доступ",
 "Delete" => "Видалити",
+"undo" => "відмінити",
+"deleted" => "видалені",
+"generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
+"Upload Error" => "Помилка завантаження",
+"Pending" => "Очікування",
+"Upload cancelled." => "Завантаження перервано.",
+"Invalid name, '/' is not allowed." => "Некоректне ім'я, '/' не дозволено.",
 "Size" => "Розмір",
 "Modified" => "Змінено",
+"folder" => "тека",
+"folders" => "теки",
+"file" => "файл",
+"files" => "файли",
 "Maximum upload size" => "Максимальний розмір відвантажень",
+"max. possible: " => "макс.можливе:",
+"0 is unlimited" => "0 є безліміт",
 "New" => "Створити",
 "Text file" => "Текстовий файл",
 "Folder" => "Папка",
+"From url" => "З URL",
 "Upload" => "Відвантажити",
+"Cancel upload" => "Перервати завантаження",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Name" => "Ім'я",
+"Share" => "Поділитися",
 "Download" => "Завантажити",
 "Upload too large" => "Файл занадто великий",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
+"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
+"Current scanning" => "Поточне сканування"
 );
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index 1ff636ac2a..8c0bd0cb98 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Zdjęcia",
-"Settings" => "Ustawienia",
-"Rescan" => "Przeszukaj",
-"Stop" => "Stop",
-"Share" => "Współdziel",
+"Share gallery" => "Udostępnij galerię",
+"Error: " => "Błąd: ",
+"Internal error" => "Błąd wewnętrzny",
+"Slideshow" => "Pokaz slajdów",
 "Back" => "Wróć",
 "Remove confirmation" => "Usuń potwierdzenie",
 "Do you want to remove album" => "Czy chcesz usunąć album",
diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php
index c42592448c..7d007fa66e 100644
--- a/apps/gallery/l10n/tr.php
+++ b/apps/gallery/l10n/tr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Resimler",
-"Settings" => "Ayarlar",
-"Rescan" => "Yeniden Tara ",
-"Stop" => "Durdur",
-"Share" => "Paylaş",
+"Share gallery" => "Galeriyi paylaş",
+"Error: " => "Hata: ",
+"Internal error" => "İç hata",
+"Slideshow" => "Slide Gösterim",
 "Back" => "Geri",
 "Remove confirmation" => "Doğrulamayı kaldır",
 "Do you want to remove album" => "Albümü silmek istiyor musunuz",
diff --git a/apps/media/l10n/bg_BG.php b/apps/media/l10n/bg_BG.php
index 1b71b26a16..e6c3c02d17 100644
--- a/apps/media/l10n/bg_BG.php
+++ b/apps/media/l10n/bg_BG.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Музика",
+"Add album to playlist" => "Добавяне на албума към списъка за изпълнение",
 "Play" => "Пусни",
 "Pause" => "Пауза",
 "Previous" => "Предишна",
diff --git a/apps/media/l10n/uk.php b/apps/media/l10n/uk.php
new file mode 100644
index 0000000000..4ac7abbf2b
--- /dev/null
+++ b/apps/media/l10n/uk.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Музика",
+"Add album to playlist" => "Додати альбом до плейлиста",
+"Play" => "Грати",
+"Pause" => "Пауза",
+"Previous" => "Попередній",
+"Next" => "Наступний",
+"Mute" => "Звук вкл.",
+"Unmute" => "Звук викл.",
+"Rescan Collection" => "Повторне сканування колекції",
+"Artist" => "Виконавець",
+"Album" => "Альбом",
+"Title" => "Заголовок"
+);
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 8a6ba6e9a7..4b694f33bd 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 46047a3535..19b32a700b 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 baeb8bd55b..9be2fe6adf 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 4ad9508f81..7daeb52e63 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 f7b5b48f6f..5e62b5b95d 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 549f184c26..121d17f6a8 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -3,6 +3,7 @@
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
 "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",
@@ -54,7 +55,6 @@
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "web services under your control",
 "Log out" => "Abmelden",
-"Settings" => "Einstellungen",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 1adf14af96..d8f32fb51e 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 0ae2aeac69..f5e5ca9d0e 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 2d6068ed5f..31d8d792a4 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nombre de la aplicación no provisto.",
 "No category to add?" => "¿Ninguna categoría para agregar?",
 "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" => "Vale",
+"No categories selected for deletion." => "No hay categorias 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 7ecfb278af..734021605c 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 3159350183..2e5a2c00e2 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 e3cc3feddd..5fe98629ba 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 6dc65ed495..64bb4dca63 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 8459fbbb66..43917917ad 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 8d839a6ac6..eeff78826f 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 1929681e06..f0a18103a8 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 92be804804..d4e773afc1 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 fc1337d8de..dbfe2781d5 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 97e8dfc147..e202daafa3 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 f9fa7d2bb9..296e2d62a4 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 ce2352f033..1c0bf94ca7 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 50b8e9e616..5f9b9da33a 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 44396b94f8..5a330581ff 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 dd94201138..eafdcc3737 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 5dedfffabd..f36f697b67 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
index 1a363a4aed..6435c50158 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,4 +1,5 @@
 <?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",
@@ -25,7 +26,6 @@
 "Database host" => "Datubāzes mājvieta",
 "Finish setup" => "Pabeigt uzstādījumus",
 "Log out" => "Izlogoties",
-"Settings" => "Iestatījumi",
 "Lost your password?" => "Aizmirsāt paroli?",
 "remember" => "atcerēties",
 "Log in" => "Ielogoties",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 7baac36f39..af49a04f11 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 5cf7a04b41..25da7cd862 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 80b9da0e1e..a8bfebb8a5 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 0b804f4d17..874a710a75 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 aeb8051738..9dfce36049 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 3c6f28c856..4eb5f1f9ae 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 6f01d666f7..46d601e6eb 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 55c4c96e5c..29135f0d66 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 b6170d8e96..484a47727d 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 ff86f29b26..edb5557777 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 b09b4f5611..b6bff1e049 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 5cd8498ea2..2f998c9549 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 6bd6275df4..c2f2f07640 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 e240de011e..8bc20cf1a6 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 7dcb0d7aac..6be057768d 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -3,6 +3,7 @@
 "No category to add?" => "Ingen kategori att lägga till?",
 "This category already exists: " => "Denna kategori finns redan:",
 "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",
@@ -54,7 +55,6 @@
 "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",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 2828381856..8bd4d36524 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 fc0f791d59..e2d0d9b073 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 091a8c9329..4a10a9fc74 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
index b0b750303a..4a4c97032f 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -3,6 +3,7 @@
 "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",
@@ -54,7 +55,6 @@
 "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",
-"Settings" => "Cài đặt",
 "Lost your password?" => "Bạn quên mật khẩu ?",
 "remember" => "Nhớ",
 "Log in" => "Đăng nhập",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index e07add7cbb..1f5216a2ff 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 d958c62872..37c0d8cc9d 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/l10n/af/contacts.po b/l10n/af/contacts.po
index c71bea4932..2333c2fb29 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,101 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,186 +513,195 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr ""
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr ""
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index ad5808d2ff..527198ed85 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -106,10 +114,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -239,14 +243,10 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/af/files.po b/l10n/af/files.po
index c6bfa607c9..0c8cce8a4a 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 518656c953..2c712f7692 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "خطء خلال توقيف كتاب العناوين."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "خطء خلال اضافة معرفه جديده."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "لا يمكنك اضافه صفه خاليه."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "يجب ملء على الاقل خانه واحده من العنوان."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "خطء خلال اضافة صفة المعرفه."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "خطء خلال اضافة كتاب عناوين."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "خطء خلال تفعيل كتاب العناوين."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة."
@@ -111,231 +107,185 @@ msgstr "المعلومات الموجودة في ال vCard غير صحيحة. 
 msgid "Error deleting contact property."
 msgstr "خطء خلال محي الصفه."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "خطء خلال تعديل كتاب العناوين"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "المعارف"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "معرفه"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "تاريخ الميلاد"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "معرفه"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "أضف شخص "
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "كتب العناوين"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "كتاب عناوين جديد"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "وصلة CardDav"
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "تعديل"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "انزال المعرفه"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "امحي المعرفه"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "تاريخ الميلاد"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "مفضل"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "الهاتف"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "مفضل"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "الهاتف"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "انزال المعرفه"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "امحي المعرفه"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "نوع"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "العنوان البريدي"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "إضافة"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "شارع"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "المدينة"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "المنطقة"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "رقم المنطقة"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "البلد"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "أدخل"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "البلد"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 049f3ebca5..40dbd44069 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "تعديلات"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "استرجاع كلمة السر"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -240,14 +244,10 @@ msgstr "انهاء التعديلات"
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "تعديلات"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 318a459be4..1e85ee962b 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "محذوف"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 16f62d246d..555fd8a481 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 5c1cf5518c..367bc89fa5 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index ddc698c369..84a992f187 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/bg_BG/bookmarks.po b/l10n/bg_BG/bookmarks.po
index 7375ecb18e..b55c57ce25 100644
--- a/l10n/bg_BG/bookmarks.po
+++ b/l10n/bg_BG/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:53+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Отметки"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "неозаглавено"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Отмятане"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Адрес"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Заглавие"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Етикети"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Запис на отметката"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Нямате отметки"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Бутон за отметки <br />"
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index 7edfe71490..b07eef2d00 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -4,54 +4,77 @@
 # 
 # Translators:
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:51+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
-msgid "No calendars found."
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
 msgstr ""
 
-#: ajax/categories/rescan.php:36
-msgid "No events found."
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
 msgstr ""
 
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr "Не са открити календари."
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr "Не са открити събития."
+
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
 msgstr ""
 
-#: ajax/settings/guesstimezone.php:25
-msgid "New Timezone:"
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Грешка при внасяне"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr "Нов часови пояс:"
+
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Часовата зона е сменена"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Невалидна заявка"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
 msgstr ""
@@ -76,257 +99,338 @@ msgstr ""
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
-msgstr ""
+msgstr "Роджен ден"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
-msgstr ""
+msgstr "Клиенти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
-msgstr ""
+msgstr "Празници"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
-msgstr ""
+msgstr "Идеи"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
-msgstr ""
+msgstr "Пътуване"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
-msgstr ""
+msgstr "Среща"
+
+#: lib/app.php:131
+msgid "Other"
+msgstr "Друго"
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr "Лично"
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr "Проекти"
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr "Въпроси"
 
 #: lib/app.php:135
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:136
-msgid "Personal"
-msgstr ""
-
-#: lib/app.php:137
-msgid "Projects"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Questions"
-msgstr ""
-
-#: lib/app.php:139
 msgid "Work"
+msgstr "Работа"
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Нов календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не се повтаря"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Дневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Седмично"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Всеки делничен ден"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Двуседмично"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Месечно"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Годишно"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
-msgstr ""
+msgstr "никога"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "Понеделник"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Сряда"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
-msgstr ""
+msgstr "Четвъртък"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
-msgstr ""
+msgstr "Петък"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
-msgstr ""
+msgstr "Събота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "Неделя"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Всички дни"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "Липсват полета"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
@@ -357,27 +461,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Седмица"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
-msgstr ""
+msgstr "Списък"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Днес"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Възникна проблем с разлистването на файла."
 
@@ -387,37 +491,37 @@ msgstr "Изберете активен календар"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Вашите календари"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Споделени календари"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Няма споделени календари"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
-msgstr ""
+msgstr "Споделяне на календар"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Промяна"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Изтриване"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
@@ -425,7 +529,7 @@ msgstr ""
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Нов календар"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -445,7 +549,7 @@ msgstr "Цвят на календара"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Запис"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
@@ -454,7 +558,7 @@ msgstr "Продължи"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
@@ -462,7 +566,7 @@ msgstr "Промяна на събитие"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Изнасяне"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
@@ -482,7 +586,7 @@ msgstr ""
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Споделяне"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -494,29 +598,29 @@ msgstr "Категория"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Отделете категориите със запетаи"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактиране на категориите"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Целодневно събитие"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "От"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
-msgstr ""
+msgstr "Разширени настройки"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Локация"
 
@@ -524,7 +628,7 @@ msgstr "Локация"
 msgid "Location of the Event"
 msgstr "Локация"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Описание"
 
@@ -532,108 +636,106 @@ msgstr "Описание"
 msgid "Description of the Event"
 msgstr "Описание"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повтори"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "създаване на нов календар"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr ""
-
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
+msgid "Please choose a calendar"
+msgstr "Изберете календар"
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr "Име на новия календар"
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Внасяне"
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr "Затваряне на прозореца"
+
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Ново събитие"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Преглед на събитие"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
-
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
+msgstr "Няма избрани категории"
 
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
@@ -659,10 +761,34 @@ msgstr ""
 
 #: templates/settings.php:40
 msgid "First day of the week"
+msgstr "Първи ден на седмицата"
+
+#: templates/settings.php:47
+msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
@@ -679,7 +805,7 @@ msgstr ""
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 40582ffea9..d351153184 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,101 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,186 +513,195 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr ""
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr ""
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 477b4f2e81..96d5aeb216 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -6,14 +6,15 @@
 #   <adn.adin@gmail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,89 +31,93 @@ msgstr ""
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "Категорията вече съществува:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Настройки"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Януари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Февруари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Март"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Април"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Май"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Юни"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Юли"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Август"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Септември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Октомври"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Ноември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Декември"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Добре"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Няма избрани категории за изтриване"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -179,7 +184,7 @@ msgstr "Помощ"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Достъпът е забранен"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -187,11 +192,11 @@ msgstr "облакът не намерен"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактиране на категориите"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Добавяне"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -242,14 +247,10 @@ msgstr "Завършване на настройките"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Изход"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Настройки"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Забравена парола?"
@@ -260,7 +261,7 @@ msgstr "запомни"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Вход"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index c87744a21d..3e542a9008 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +47,7 @@ msgstr "Липсва временната папка"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Грешка при запис на диска"
 
 #: appinfo/app.php:6
 msgid "Files"
@@ -60,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
@@ -78,7 +99,7 @@ msgstr ""
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Грешка при качване"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
@@ -86,11 +107,11 @@ msgstr ""
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Качването е отменено."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Неправилно име – \"/\" не е позволено."
 
 #: js/files.js:631 templates/index.php:55
 msgid "Size"
@@ -102,15 +123,15 @@ msgstr "Променено"
 
 #: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "папка"
 
 #: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "папки"
 
 #: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "файл"
 
 #: js/files.js:671
 msgid "files"
@@ -138,7 +159,7 @@ msgstr ""
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 означава без ограничение"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
@@ -146,19 +167,19 @@ msgstr ""
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Нов"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Текстов файл"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "От url-адрес"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -166,7 +187,7 @@ msgstr "Качване"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Отказване на качването"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -178,7 +199,7 @@ msgstr "Име"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Споделяне"
 
 #: templates/index.php:51
 msgid "Download"
@@ -196,7 +217,7 @@ msgstr "Файловете които се опитвате да качите с
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Файловете се претърсват, изчакайте."
 
 #: templates/index.php:74
 msgid "Current scanning"
diff --git a/l10n/bg_BG/media.po b/l10n/bg_BG/media.po
index 16a6c478ec..48b61366ff 100644
--- a/l10n/bg_BG/media.po
+++ b/l10n/bg_BG/media.po
@@ -4,27 +4,28 @@
 # 
 # Translators:
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:39+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Добавяне на албума към списъка за изпълнение"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 4b57953ba0..00bd674afa 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <adn.adin@gmail.com>, 2011.
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:43+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Е-пощата е записана"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Неправилна е-поща"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -45,15 +46,15 @@ msgstr "Езика е сменен"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Изключване"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Включване"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Записване..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -93,7 +94,7 @@ msgstr "от"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Документация"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
@@ -129,7 +130,7 @@ msgstr ""
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Изтегляне"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -157,15 +158,15 @@ msgstr "Промяна на парола"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Е-поща"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Адресът на е-пощата ви"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Въведете е-поща за възстановяване на паролата"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -173,7 +174,7 @@ msgstr "Език"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Помощ за превода"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -197,7 +198,7 @@ msgstr "Ново"
 
 #: templates/users.php:35
 msgid "Default Quota"
-msgstr ""
+msgstr "Квота по подразбиране"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
@@ -209,7 +210,7 @@ msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
-msgstr ""
+msgstr "Квота"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 5d7e0b0fc2..f73ac25510 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:18+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,20 +83,20 @@ msgstr "Falta la ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Error en analitzar la ID de la VCard: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "No s'ha tramès cap ID de contacte."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Error en llegir la foto del contacte."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Error en desar el fitxer temporal."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La foto carregada no és vàlida."
 
@@ -124,31 +124,31 @@ msgstr "El fitxer no existeix:"
 msgid "Error loading image."
 msgstr "Error en carregar la imatge."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Error en obtenir l'objecte contacte."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Error en obtenir la propietat PHOTO."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Error en trobar la imatge:"
 
@@ -180,110 +180,110 @@ msgstr "Error en actualitzar la llibreta d'adreces."
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer carregat supera la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "No s'ha pogut desar la imatge temporal: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "No s'ha pogut carregar la imatge temporal: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactes"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Aquesta funcionalitat encara no està implementada"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "No implementada"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contacte"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nou"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Contate nou"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
@@ -299,129 +299,129 @@ msgstr " importat, "
 msgid " failed."
 msgstr " fallada."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "No s'ha trobat la llibreta d'adreces."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Negocis"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Trucada"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Emissari"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idees"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Viatge"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Aniversari"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Reunió"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Preguntes"
 
@@ -429,63 +429,67 @@ msgstr "Preguntes"
 msgid "{name}'s Birthday"
 msgstr "Aniversari de {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Afegeix un contacte"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importa"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Tanca"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navegació"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Següent contacte de la llista"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contacte anterior de la llista"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Següent/anterior llibreta d'adreces"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Carrega de nou la llista de contactes"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Afegeix un contacte nou"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Esborra el contacte"
 
@@ -852,22 +856,22 @@ msgstr "Escriviu un nom"
 msgid "Enter description"
 msgstr "Escriviu una descripció"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Adreces de sincronització CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "més informació"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Adreça primària (Kontact i al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Enllaç(os) vCard només de lectura"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 361164d2ef..65b3ff1583 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Aquesta categoria ja existeix:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Arranjament"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Març"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "D'acord"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "No hi ha categories per eliminar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Restableix la contrasenya d'Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
 
@@ -241,14 +245,10 @@ msgstr "Acaba la configuració"
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Arranjament"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 538b9da7fe..a453eb9803 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr "Deixa de compartir"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "desfés"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "esborrat"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 6c392a1f09..2b16024e2b 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,101 +10,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Chyba při (de)aktivaci adresáře."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Během přidávání kontaktu nastala chyba."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "jméno elementu není nastaveno."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id neni nastaveno."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nelze přidat prazdný údaj."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Musí být uveden nejméně jeden z adresních údajů"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Pokoušíte se přidat duplicitní atribut: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Chyba během přdávání údaje kontaktu."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadáno"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Chyba při nastavování kontrolního součtu."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Žádné kategorie nebyly vybrány k smazání."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Žádný adresář nenalezen."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Žádné kontakty nenalezeny."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Chybí ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba při parsování VCard pro ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nelze přidat adresář s prázdným jménem."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Chyba při přidávání adresáře."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Chyba při aktivaci adresáře."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nebylo nastaveno ID kontaktu."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Chyba při načítání fotky kontaktu."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Chyba při ukládání dočasného souboru."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id neni nastaveno."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
@@ -113,328 +109,391 @@ msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 msgid "Error deleting contact property."
 msgstr "Chyba při odstraňování údaje kontaktu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Chybí ID kontaktu."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Chybí id kontaktu."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Žádná fotka nebyla nahrána."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Soubor neexistuje:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Chyba při načítání obrázku."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Chyba při převzetí objektu kontakt."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Chyba při získávání fotky."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Chyba při ukládání kontaktu."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Chyba při změně velikosti obrázku."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Chyba při osekávání obrázku."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Chyba při vytváření dočasného obrázku."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Chyba při hledání obrázku:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "jméno elementu není nastaveno."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrolní součet není nastaven."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nelze aktualizovat adresář s prázdným jménem."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Chyba při aktualizaci adresáře."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba při nahrávání kontaktů do úložiště."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný soubor se nahrál pouze z části"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl nahrán"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Chybí dočasný adresář"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Nemohu uložit dočasný obrázek: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Nemohu načíst dočasný obrázek: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Soubor nebyl odeslán. Neznámá chyba"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Bohužel, tato funkce nebyla ještě implementována."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Neimplementováno"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Nelze získat platnou adresu."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Pro import kontaktů sem přetáhněte soubor VCF"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Adresář nenalezen."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Toto není Váš adresář."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kontakt nebyl nalezen."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adresa"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Email"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organizace"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Pracovní"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Domácí"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Hlas"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Zpráva"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Narozeniny {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Tento parametr nemuže zůstat nevyplněn."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Prvky nelze převést.."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Upravit jméno"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Žádné soubory nebyly vybrány k nahrání."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Vybrat typ"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Výsledek: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "importováno v pořádku,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "neimportováno."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Adresář nenalezen."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Toto není Váš adresář."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Kontakt nebyl nalezen."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adresa"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organizace"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Pracovní"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Domácí"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Hlas"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Zpráva"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Narozeniny"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Narozeniny {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Přidat kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresáře"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zavřít"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Nastavit adresáře"
@@ -443,11 +502,7 @@ msgstr "Nastavit adresáře"
 msgid "New Address Book"
 msgstr "Nový adresář"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importovat z VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav odkaz"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Editovat"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Odstranit"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Stáhnout kontakt"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Odstranit kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Přetáhněte sem fotku pro její nahrání"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Upravit podrobnosti jména"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Přezdívka"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Zadejte přezdívku"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Narozeniny"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd. mm. yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Skupiny"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Oddělte skupiny čárkami"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Upravit skupiny"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferovaný"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Prosím zadejte platnou e-mailovou adresu"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Zadat e-mailovou adresu"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Odeslat na adresu"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Smazat e-mail"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Zadat telefoní číslo"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Smazat telefoní číslo"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Zobrazit na mapě"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Upravit podrobnosti adresy"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Zde můžete připsat poznámky."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Přidat políčko"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilová fotka"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Poznámka"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Smazat současnou fotku"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Upravit současnou fotku"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Nahrát novou fotku"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Upravit podrobnosti jména"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Přezdívka"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Zadejte přezdívku"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd. mm. yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Skupiny"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Oddělte skupiny čárkami"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Upravit skupiny"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferovaný"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Prosím zadejte platnou e-mailovou adresu"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Zadat e-mailovou adresu"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Odeslat na adresu"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Smazat e-mail"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Zadat telefoní číslo"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Smazat telefoní číslo"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Zobrazit na mapě"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Upravit podrobnosti adresy"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Zde můžete připsat poznámky."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Přidat políčko"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Poznámka"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Stáhnout kontakt"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Odstranit kontakt"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Obrázek byl odstraněn z dočasné paměti."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Upravit adresu"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "PO box"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Rozšířené"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulice"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Město"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Kraj"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "PSČ"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Země"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Upravit kategorie"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Přidat"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresář"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Potvrdit"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Storno"
 
@@ -766,33 +829,10 @@ msgstr "vytvořit nový adresář"
 msgid "Name of new addressbook"
 msgstr "Jméno nového adresáře"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importování kontaktů"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vyberte adresář do kterého chcete importovat:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vybrat z disku"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žádné kontakty v adresáři."
@@ -805,18 +845,34 @@ msgstr "Přidat kontakt"
 msgid "Configure addressbooks"
 msgstr "Nastavit adresář"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Adresa pro synchronizaci pomocí CardDAV:"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "víc informací"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Hlavní adresa (Kontakt etc)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 594e0635dc..bfc8ad14e3 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Tato kategorie již existuje:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Nastavení"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Září"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ano"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Budiž"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Žádné kategorie nebyly vybrány ke smazání."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reset hesla Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reset hesla pro ownCloud"
 
@@ -242,14 +246,10 @@ msgstr "Dokončit instalaci"
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nastavení"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Zapomenuté heslo?"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 8ba79199e8..b168a2b7e1 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Vymazat"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generuji ZIP soubor, může to chvíli trvat"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index be2ce3917f..d6f33b75f3 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -7,105 +7,102 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Fejl ved (de)aktivering af adressebogen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Elementnavnet er ikke medsendt."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "Intet ID medsendt."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan ikke tilføje en egenskab uden indhold."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Der skal udfyldes mindst et adressefelt."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Kan ikke tilføje overlappende element."
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Fejl ved tilføjelse af egenskab."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Intet ID medsendt"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Kunne ikke sætte checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Der ikke valgt nogle grupper at slette."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Der blev ikke fundet nogen adressebøger."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Der blev ikke fundet nogen kontaktpersoner."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Manglende ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr "Kunne ikke indlæse VCard med ID'en: \""
+msgstr "Kunne ikke indlæse VCard med ID'et: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan ikke tilføje adressebog uden et navn."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Fejl ved tilføjelse af adressebog."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Fejl ved aktivering af adressebog."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Ingen ID for kontakperson medsendt."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Kunne ikke indlæse foto for kontakperson."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Kunne ikke gemme midlertidig fil."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Billedet under indlæsning er ikke gyldigt."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "Intet ID medsendt."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
@@ -114,328 +111,391 @@ msgstr "Informationen om vCard er forkert. Genindlæs siden."
 msgid "Error deleting contact property."
 msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktperson ID mangler."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Kontaktperson ID mangler."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Der blev ikke medsendt en sti til fotoet."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Filen eksisterer ikke:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Kunne ikke indlæse billede."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fejl ved indlæsning af kontaktpersonobjektet."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fejl ved indlæsning af PHOTO feltet."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Kunne ikke gemme kontaktpersonen."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Kunne ikke ændre billedets størrelse"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Kunne ikke beskære billedet"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Kunne ikke oprette midlertidigt billede"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Kunne ikke finde billedet: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "Element navnet er ikke medsendt."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "Checksum er ikke medsendt."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan ikke opdatére adressebogen med et tomt navn."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Fejl ved opdatering af adressebog"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ingen fil uploadet"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manglende midlertidig mappe."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Kunne ikke gemme midlertidigt billede: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Kunne ikke indlæse midlertidigt billede"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Denne funktion er desværre ikke implementeret endnu"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Ikke implementeret"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Kunne ikke finde en gyldig adresse."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Fejl"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Drop en VCF fil for at importere kontaktpersoner."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Adressebogen blev ikke fundet."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Dette er ikke din adressebog."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kontaktperson kunne ikke findes."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adresse"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Email"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organisation"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Arbejde"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Hjemme"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "SMS"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Telefonsvarer"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Besked"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Personsøger"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name}'s fødselsdag"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktperson"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Dette felt må ikke være tomt."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Kunne ikke serialisere elementerne."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Rediger navn"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Der er ikke valgt nogen filer at uploade."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Dr."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Vælg type"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultat:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importeret "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " fejl."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Adressebogen blev ikke fundet."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Dette er ikke din adressebog."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Kontaktperson kunne ikke findes."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organisation"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Arbejde"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Hjemme"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Telefonsvarer"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Besked"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Personsøger"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Fødselsdag"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}s fødselsdag"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tilføj kontaktperson"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressebøger"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Luk"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfigurer adressebøger"
@@ -444,11 +504,7 @@ msgstr "Konfigurer adressebøger"
 msgid "New Address Book"
 msgstr "Ny adressebog"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importer fra VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav-link"
@@ -462,186 +518,195 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Download kontaktperson"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Slet kontaktperson"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Drop foto for at uploade"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Rediger navnedetaljer."
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Øgenavn"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Indtast øgenavn"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Fødselsdag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-åååå"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupper"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Opdel gruppenavne med kommaer"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Rediger grupper"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Foretrukken"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Indtast venligst en gyldig email-adresse."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Indtast email-adresse"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Send mail til adresse"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Slet email-adresse"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Indtast telefonnummer"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Slet telefonnummer"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Vis på kort"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Rediger adresse detaljer"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Tilføj noter her."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Tilfæj element"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilbillede"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Note"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Slet nuværende foto"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Rediger nuværende foto"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Upload nyt foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Vælg foto fra ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Rediger navnedetaljer."
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Kaldenavn"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Indtast kaldenavn"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-åååå"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupper"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Opdel gruppenavne med kommaer"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Rediger grupper"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Foretrukken"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Indtast venligst en gyldig email-adresse."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Indtast email-adresse"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Send mail til adresse"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Slet email-adresse"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Indtast telefonnummer"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Slet telefonnummer"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Vis på kort"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Rediger adresse detaljer"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Tilføj noter her."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Tilføj element"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Note"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Download kontaktperson"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Slet kontaktperson"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Det midlertidige billede er ikke længere tilgængeligt."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Rediger adresse"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Udvidet"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Vej"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "By"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Rediger grupper"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Tilføj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressebog"
@@ -672,7 +737,7 @@ msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr "Dr"
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -747,7 +812,6 @@ msgid "Submit"
 msgstr "Gem"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -767,33 +831,10 @@ msgstr "Opret ny adressebog"
 msgid "Name of new addressbook"
 msgstr "Navn på ny adressebog"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importerer kontaktpersoner"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vælg hvilken adressebog, der skal importeres til:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vælg fra harddisk."
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontaktpersoner i din adressebog."
@@ -806,18 +847,34 @@ msgstr "Tilføj kontaktpeson."
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøger"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synkroniserings adresse"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mere info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Primær adresse (Kontak m. fl.)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 045cd42915..324afe6129 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,14 +7,15 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,85 +36,89 @@ msgstr "Denne kategori eksisterer allerede: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marts"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Fortryd"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nej"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ingen kategorier valgt"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fejl"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Nulstil adgangskode til Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
@@ -243,14 +248,10 @@ msgstr "Afslut opsætning"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Indstillinger"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index fdf9ce4e67..aef6a95763 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Slet"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "genererer ZIP-fil, det kan tage lidt tid."
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index e91d917df7..62fdc32565 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 18:13+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,20 +96,20 @@ msgstr "Fehlende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fehler beim Einlesen der VCard für die ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Es wurde keine Kontakt-ID übermittelt."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Fehler beim Auslesen des Kontaktfotos."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Fehler beim Speichern der temporären Datei."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Das Kontaktfoto ist fehlerhaft."
 
@@ -137,31 +137,31 @@ msgstr "Datei existiert nicht: "
 msgid "Error loading image."
 msgstr "Fehler beim Laden des Bildes."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Fehler beim Abruf des Kontakt-Objektes."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Fehler beim Speichern des Kontaktes"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Fehler beim Suchen des Bildes: "
 
@@ -193,110 +193,110 @@ msgstr "Adressbuch aktualisieren fehlgeschlagen"
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Alles bestens, Datei erfolgreich übertragen."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datei konnte nur teilweise übertragen werden"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Konnte das temporäre Bild nicht speichern:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Konnte das temporäre Bild nicht laden:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Nicht Verfügbar"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Neu"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht Leer sein."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Wähle Typ"
 
@@ -312,129 +312,129 @@ msgstr " importiert, "
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adressbuch nicht gefunden."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Andere"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Fragen"
 
@@ -442,63 +442,67 @@ msgstr "Fragen"
 msgid "{name}'s Birthday"
 msgstr "Geburtstag von {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importieren"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Schließen"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Nächster Kontakt aus der Liste"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Vorheriger Kontakt aus der Liste"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Ausklappen/Einklappen des Adressbuches"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Nächstes/Vorhergehendes Adressbuch"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Kontaktliste neu laden"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Aktuellen Kontakt löschen"
 
@@ -865,22 +869,22 @@ msgstr "Name eingeben"
 msgid "Enter description"
 msgstr "Beschreibung eingeben"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV Sync-Adressen"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mehr Info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "primäre Adresse (für Kontact o.ä. Programme)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 9d8ff1066c..d2ab1e7a26 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 18:47+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,51 +41,59 @@ msgstr "Kategorie existiert bereits:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr "März"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr "April"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr "August"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr "September"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr "November"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr "Dezember"
 
@@ -247,10 +255,6 @@ msgstr "web services under your control"
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 61d7972e88..e79d129b34 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -67,14 +67,34 @@ msgstr "Nicht mehr teilen"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "rückgängig machen"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "gelöscht"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 9d72a185a0..59ca23304e 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 11:43+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,20 +87,20 @@ msgstr "Λείπει ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Δε υπεβλήθει ID επαφής"
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
 
@@ -128,31 +128,31 @@ msgstr "Το αρχείο δεν υπάρχει:"
 msgid "Error loading image."
 msgstr "Σφάλμα φόρτωσης εικόνας"
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Σφάλμα κατά τη λήψη αντικειμένου επαφής"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
@@ -184,110 +184,110 @@ msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία "
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο ανέβηκε μερικώς"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Δεν ανέβηκε κάποιο αρχείο"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Δεν έχει υλοποιηθεί"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Επαφή"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Νέο"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Νέα επαφή"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
@@ -303,129 +303,129 @@ msgstr " εισάγεται,"
 msgid " failed."
 msgstr " απέτυχε."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Επιχείρηση"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Κάλεσε"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Προμηθευτής"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Ιωβηλαίο"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
@@ -433,63 +433,67 @@ msgstr "Ερωτήσεις"
 msgid "{name}'s Birthday"
 msgstr "{name} έχει Γενέθλια"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Προσθήκη επαφής"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Βιβλία διευθύνσεων"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Κλείσιμο  "
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Συντομεύσεις πλητρολογίου"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Επόμενη επαφή στη λίστα"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Προηγούμενη επαφή στη λίστα"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Ανανέωσε τη λίστα επαφών"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Προσθήκη νέου βιβλίου επαφών"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Διαγραφή τρέχουσας επαφής"
 
@@ -856,22 +860,22 @@ msgstr "Εισαγωγή ονόματος"
 msgid "Enter description"
 msgstr "Εισαγωγή περιγραφής"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "συγχρονισμός διευθύνσεων μέσω CardDAV "
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "περισσότερες πληροφορίες"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Κύρια διεύθυνση"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index c383ae1a88..97808b122b 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
@@ -10,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +35,89 @@ msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Ιανουάριος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Φεβρουάριος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Μάρτιος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Απρίλιος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Μάϊος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Ιούνιος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Ιούλιος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Αύγουστος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Σεπτέμβριος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Οκτώβριος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Νοέμβριος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Δεκέμβριος"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Ακύρωση"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Όχι"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ναι"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Οκ"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Δεν επιλέχτηκαν κατηγορίες για διαγραφή"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Σφάλμα"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Επανέκδοση κωδικού για το Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Επαναφορά κωδικού ownCloud"
 
@@ -242,14 +247,10 @@ msgstr "Ολοκλήρωση εγκατάστασης"
 msgid "web services under your control"
 msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ξεχάσατε τον κωδικό σας;"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 77eeadf487..dcbe78cd0a 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr "Ακύρωση Διαμοιρασμού"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7b4b003e48..b040e06d2c 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Eraro dum (mal)aktivigo de adresaro."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Eraro okazis dum aldono de kontakto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "eronomo ne agordiĝis."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "identigilo ne agordiĝis."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Ne eblas aldoni malplenan propraĵon."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Almenaŭ unu el la adreskampoj necesas pleniĝi."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Provante aldoni duobligitan propraĵon:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Eraro dum aldono de kontaktopropraĵo."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Neniu identigilo proviziĝis."
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Eraro dum agordado de kontrolsumo."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Neniu kategorio elektiĝis por forigi."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Neniu adresaro troviĝis."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Neniu kontakto troviĝis."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Mankas identigilo"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Eraro dum analizo de VCard por identigilo:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Ne eblas aldoni adresaron kun malplena nomo."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Eraro dum aldono de adresaro."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Eraro dum aktivigo de adresaro."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Neniu kontaktidentigilo sendiĝis."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Eraro dum lego de kontakta foto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Eraro dum konservado de provizora dosiero."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La alŝutata foto ne validas."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "identigilo ne agordiĝis."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
@@ -111,328 +107,391 @@ msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
 msgid "Error deleting contact property."
 msgstr "Eraro dum forigo de kontaktopropraĵo."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktidentigilo mankas."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Mankas kontaktidentigilo."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Neniu vojo al foto sendiĝis."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Dosiero ne ekzistas:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Eraro dum ŝargado de bildo."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Eraro dum ekhaviĝis kontakta objekto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Eraro dum ekhaviĝis la propraĵon PHOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Eraro dum konserviĝis kontakto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Eraro dum aligrandiĝis bildo"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Eraro dum stuciĝis bildo."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Eraro dum kreiĝis provizora bildo."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Eraro dum serĉo de bildo: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "eronomo ne agordiĝis."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrolsumo ne agordiĝis."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Eraro dum ĝisdatigo de adresaro."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Eraro dum alŝutiĝis kontaktoj al konservejo."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ne eblis konservi provizoran bildon: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ne eblis ŝargi provizoran bildon: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Ne disponebla"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Ne eblis ekhavi validan adreson."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
+msgstr "Eraro"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakto"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Redakti nomon"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Demetu VCF-dosieron por enporti kontaktojn."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Elektu tipon"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Rezulto: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " enportoj, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "malsukcesoj."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresaro ne troviĝis."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Interreto"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Naskiĝotago"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Naskiĝtago de {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakto"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aldoni kontakton"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Enporti"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresaroj"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Fermi"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Agordi adresarojn"
@@ -441,11 +500,7 @@ msgstr "Agordi adresarojn"
 msgid "New Address Book"
 msgstr "Nova adresaro"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Enporti el VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav-ligilo"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "Redakti"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Elŝuti kontakton"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Forigi kontakton"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Demeti foton por alŝuti"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Redakti detalojn de nomo"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Kromnomo"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Enigu kromnomon"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Naskiĝotago"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "yyyy-mm-dd"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupoj"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Disigi grupojn per komoj"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Redakti grupojn"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferata"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Bonvolu specifi validan retpoŝtadreson."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Enigi retpoŝtadreson"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Retpoŝtmesaĝo al adreso"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Forigi retpoŝþadreson"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Enigi telefonnumeron"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Forigi telefonnumeron"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Vidi en mapo"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Redakti detalojn de adreso"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Aldoni notojn ĉi tie."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Aldoni kampon"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profila bildo"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefono"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Noto"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Forigi nunan foton"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Redakti nunan foton"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Alŝuti novan foton"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Redakti detalojn de nomo"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Kromnomo"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Enigu kromnomon"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "yyyy-mm-dd"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupoj"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Disigi grupojn per komoj"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Redakti grupojn"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferata"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Bonvolu specifi validan retpoŝtadreson."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Enigi retpoŝtadreson"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Retpoŝtmesaĝo al adreso"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Forigi retpoŝþadreson"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Enigi telefonnumeron"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Forigi telefonnumeron"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Vidi en mapo"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Redakti detalojn de adreso"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Aldoni notojn ĉi tie."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Aldoni kampon"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefono"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Noto"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Elŝuti kontakton"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Forigi kontakton"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "La provizora bildo estas forigita de la kaŝmemoro."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Redakti adreson"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Abonkesto"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Etendita"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Strato"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Urbo"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regiono"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poŝtokodo"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Lando"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Redakti kategoriojn"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Aldoni"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresaro"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Sendi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -764,33 +827,10 @@ msgstr "krei novan adresaron"
 msgid "Name of new addressbook"
 msgstr "Nomo de nova adresaro"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Enporti"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Enportante kontaktojn"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Elektu adresaron kien enporti:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Elekti el malmoldisko"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Vi ne havas kontaktojn en via adresaro"
@@ -803,18 +843,34 @@ msgstr "Aldoni kontakton"
 msgid "Configure addressbooks"
 msgstr "Agordi adresarojn"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "adresoj por CardDAV-sinkronigo"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "pli da informo"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 4adb4f254f..88e04e3e10 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,99 +21,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nomo de aplikaĵo ne proviziiĝis."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ĉu neniu kategorio estas aldonota?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "Ĉi tiu kategorio jam ekzistas: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Agordo"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januaro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februaro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marto"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Aprilo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Majo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Aŭgusto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktobro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Decembro"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Nuligi"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Jes"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Akcepti"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Neniu kategorio elektiĝis por forigo."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Eraro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "La pasvorto de Owncloud estas restarigita"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "La pasvorto de ownCloud restariĝis."
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -178,7 +182,7 @@ msgstr "Helpo"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Aliro estas malpermesata"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -186,11 +190,11 @@ msgstr "La nubo ne estas trovita"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Redakti kategoriojn"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Aldoni"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -241,14 +245,10 @@ msgstr "Fini la instalon"
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Agordo"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index fa37219fcc..365883ce5a 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index ec82648c8b..cecb721b9a 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -6,106 +6,103 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+#   <rodrigo.calvo@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Error al (des)activar libreta de direcciones."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Se ha producido un error al añadir el contacto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "no se ha puesto ningún nombre de elemento."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "no se ha puesto ninguna ID."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "No se puede añadir una propiedad vacía."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Al menos uno de los campos de direcciones se tiene que rellenar."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Intentando añadir una propiedad duplicada: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Error al añadir una propiedad del contacto."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No se ha proporcionado una ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Error al establecer la suma de verificación."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "No se seleccionaron categorías para borrar."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "No se encontraron libretas de direcciones."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "No se encontraron contactos."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Falta la ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Error al analizar el VCard para la ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "No se puede añadir una libreta de direcciones sin nombre"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Error al añadir la libreta de direcciones."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Error al activar la libreta de direcciones."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "No se ha mandado ninguna ID de contacto."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Error leyendo fotografía del contacto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Error al guardar archivo temporal."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La foto que se estaba cargando no es válida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "no se ha puesto ninguna ID."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página."
@@ -114,328 +111,391 @@ msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar
 msgid "Error deleting contact property."
 msgstr "Error al borrar una propiedad del contacto."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta la ID del contacto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Falta la id del contacto."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "No se ha introducido la ruta de la foto."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Archivo inexistente:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Error cargando imagen."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fallo al coger el contacto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fallo al coger las propiedades de la foto ."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Fallo al salvar un contacto"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Fallo al cambiar de tamaño una foto"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Fallo al cortar el tamaño de la foto"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Fallo al crear la foto temporal"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Fallo al encontrar la imagen"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "no se ha puesto ningún nombre de elemento."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "no se ha puesto ninguna suma de comprobación."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "No se puede actualizar una libreta de direcciones sin nombre."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Error al actualizar la libreta de direcciones."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo se ha subido parcialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Fallo no pudo salvar a una imagen temporal"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Fallo no pudo cargara de una imagen temporal"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Fallo no se subió el fichero"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Perdón esta función no esta aún implementada"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "No esta implementada"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Fallo : no hay dirección valida"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Fallo"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Suelta un archivo VCF para importar contactos."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Libreta de direcciones no encontrada."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Esta no es tu agenda de contactos."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "No se ha podido encontrar el contacto."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Dirección"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organización"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Trabajo"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Particular"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Móvil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Mensaje"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Localizador"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Cumpleaños de {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Este campo no puede estar vacío."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Fallo no podido ordenar los elementos"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Edita el Nombre"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "No hay ficheros seleccionados para subir"
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Selecciona el tipo"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultado :"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "Importado."
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "Fallo."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Libreta de direcciones no encontrada."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Esta no es tu agenda de contactos."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "No se ha podido encontrar el contacto."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Dirección"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organización"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Trabajo"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Particular"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Móvil"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Mensaje"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Localizador"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Cumpleaños de {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Añadir contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Libretas de direcciones"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Cierra."
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configurar libretas de direcciones"
@@ -444,11 +504,7 @@ msgstr "Configurar libretas de direcciones"
 msgid "New Address Book"
 msgstr "Nueva libreta de direcciones"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importar desde VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Enlace CardDav"
@@ -462,186 +518,195 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Descargar contacto"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Eliminar contacto"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Suelta una foto para subirla"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Editar los detalles del nombre"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Alias"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Introduce un alias"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupos"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separa los grupos con comas"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editar grupos"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferido"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Por favor especifica una dirección de correo electrónico válida."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Introduce una dirección de correo electrónico"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Enviar por correo a la dirección"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Eliminar dirección de correo electrónico"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Introduce un número de teléfono"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Eliminar número de teléfono"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Ver en el mapa"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Editar detalles de la dirección"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Añade notas aquí."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Añadir campo"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Foto del perfil"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Teléfono"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Nota"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Eliminar fotografía actual"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Editar fotografía actual"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Subir nueva fotografía"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Editar los detalles del nombre"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Alias"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Introduce un alias"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupos"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separa los grupos con comas"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editar grupos"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferido"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Por favor especifica una dirección de correo electrónico válida."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Introduce una dirección de correo electrónico"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Enviar por correo a la dirección"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Eliminar dirección de correo electrónico"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Introduce un número de teléfono"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Eliminar número de teléfono"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Ver en el mapa"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Editar detalles de la dirección"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Añade notas aquí."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Añadir campo"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Teléfono"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Nota"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Descargar contacto"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Eliminar contacto"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "La foto temporal se ha borrado del cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editar dirección"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Código postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extendido"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Calle"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Ciudad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Región"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Código postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorías"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Añadir"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
@@ -747,7 +812,6 @@ msgid "Submit"
 msgstr "Aceptar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -767,33 +831,10 @@ msgstr "crear una nueva agenda"
 msgid "Name of new addressbook"
 msgstr "Nombre de la nueva agenda"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selecciona una agenda para importar a:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Seleccionar del disco duro"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "No hay contactos en tu agenda."
@@ -806,18 +847,34 @@ msgstr "Añadir contacto"
 msgid "Configure addressbooks"
 msgstr "Configurar agenda"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Sincronizando direcciones"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "más información"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Dirección primaria (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 1e802ebc93..e55ee41958 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,16 +6,17 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+#   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,85 +37,89 @@ msgstr "Esta categoría ya existe: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Ajustes"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Vale"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "No hay categorias seleccionadas para borrar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fallo"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Restablecer contraseña de ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reiniciar contraseña de ownCloud"
 
@@ -244,14 +249,10 @@ msgstr "Completar la instalación"
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ajustes"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "¿Has perdido tu contraseña?"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 6de4ca7f56..642d976601 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr "No compartir"
 msgid "Delete"
 msgstr "Eliminado"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "deshacer"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "borrado"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generando un fichero ZIP, puede llevar un tiempo."
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 870f4ec141..a8931cbabc 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 05:46+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Ajustes"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Aplicaciones"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administración"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "La descarga en ZIP está desactivada."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Los archivos deben ser descargados uno por uno."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Volver a Archivos"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "La aplicación no está habilitada"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Error de autenticación"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token expirado. Por favor, recarga la página."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "hace segundos"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "hace 1 minuto"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "hace %d minutos"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "hoy"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "ayer"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "hace %d días"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "este mes"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "hace meses"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "este año"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "hace años"
diff --git a/l10n/et_EE/bookmarks.po b/l10n/et_EE/bookmarks.po
index 0370bec552..91cf36ab0d 100644
--- a/l10n/et_EE/bookmarks.po
+++ b/l10n/et_EE/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 10:22+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Järjehoidjad"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "nimetu"
 
 #: templates/bookmarklet.php:5
 msgid ""
@@ -33,27 +34,27 @@ msgstr ""
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Loe hiljem"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Aadress"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Pealkiri"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Sildid"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Salvesta järjehoidja"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Sul pole järjehoidjaid"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index c78d9e4307..41ce51e36a 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Konktakti lisamisel tekkis viga."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "elemendi nime pole määratud."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID on määramata."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Tühja omadust ei saa lisada."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Vähemalt üks aadressiväljadest peab olema täidetud."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Proovitakse lisada topeltomadust: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Viga konktakti korralikul lisamisel."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID-d pole sisestatud"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Viga kontrollsumma määramisel."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Kustutamiseks pole valitud ühtegi kategooriat."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ei leitud ühtegi aadressiraamatut."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ühtegi kontakti ei leitud."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Puudub ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Viga VCard-ist ID parsimisel: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Tühja nimega aadressiraamatut ei saa lisada."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Viga aadressiraamatu lisamisel."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Viga aadressiraamatu aktiveerimisel."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Kontakti ID-d pole sisestatud."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Viga kontakti foto lugemisel."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Viga ajutise faili salvestamisel."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Laetav pilt pole korrektne pildifail."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID on määramata."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
@@ -111,328 +107,391 @@ msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 msgid "Error deleting contact property."
 msgstr "Viga konktaki korralikul kustutamisel."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakti ID puudub."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Puuduv kontakti ID."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Foto asukohta pole määratud."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Faili pole olemas:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Viga pildi laadimisel."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Viga kontakti objekti hankimisel."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Viga PHOTO omaduse hankimisel."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Viga kontakti salvestamisel."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Viga pildi suuruse muutmisel"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Viga pildi lõikamisel"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Viga ajutise pildi loomisel"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Viga pildi leidmisel: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "elemendi nime pole määratud."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrollsummat pole määratud."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Viga aadressiraamatu uuendamisel."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ajutise pildi salvestamine ebaõnnestus: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ajutise pildi laadimine ebaõnnestus: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Vabandust, aga see funktsioon pole veel valmis"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Pole implementeeritud"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
+msgstr "Viga"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Muuda nime"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Lohista siia VCF-fail, millest kontakte importida."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Vali tüüp"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Tulemus: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " imporditud, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " ebaõnnestus."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Aadressiraamatut ei leitud"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Sünnipäev"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name} sünnipäev"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisa kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Impordi"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Aadressiraamatud"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Sule"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Seadista aadressiraamatut"
@@ -441,11 +500,7 @@ msgstr "Seadista aadressiraamatut"
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Impordi VCF-ist"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav link"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "Muuda"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Lae kontakt alla"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kustuta kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Lohista üleslaetav foto siia"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Muuda nime üksikasju"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Hüüdnimi"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Sisesta hüüdnimi"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Sünnipäev"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd.mm.yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupid"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Eralda grupid komadega"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Muuda gruppe"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Eelistatud"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Palun sisesta korrektne e-posti aadress."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Sisesta e-posti aadress"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Kiri aadressile"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Kustuta e-posti aadress"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Sisesta telefoninumber"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Kustuta telefoninumber"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Vaata kaardil"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Muuda aaressi infot"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Lisa märkmed siia."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Lisa väli"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profiili pilt"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Märkus"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Kustuta praegune foto"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Muuda praegust pilti"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Lae üles uus foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Muuda nime üksikasju"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Hüüdnimi"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Sisesta hüüdnimi"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd.mm.yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupid"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Eralda grupid komadega"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Muuda gruppe"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Eelistatud"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Palun sisesta korrektne e-posti aadress."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Sisesta e-posti aadress"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Kiri aadressile"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Kustuta e-posti aadress"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Sisesta telefoninumber"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Kustuta telefoninumber"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Vaata kaardil"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Muuda aaressi infot"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Lisa märkmed siia."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Lisa väli"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Märkus"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Lae kontakt alla"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kustuta kontakt"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Ajutine pilt on puhvrist eemaldatud."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Muuda aadressi"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tüüp"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postkontori postkast"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Laiendatud"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Tänav"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Linn"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Piirkond"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postiindeks"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Riik"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Muuda kategooriat"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Lisa"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Aadressiraamat"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Saada"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -764,33 +827,10 @@ msgstr "loo uus aadressiraamat"
 msgid "Name of new addressbook"
 msgstr "Uue aadressiraamatu nimi"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Impordi"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kontaktide importimine"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vali aadressiraamat, millesse importida:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vali kõvakettalt"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Sinu aadressiraamatus pole ühtegi kontakti."
@@ -803,18 +843,34 @@ msgstr "Lisa kontakt"
 msgid "Configure addressbooks"
 msgstr "Seadista aadressiraamatuid"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV sünkroniseerimise aadressid"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "lisainfo"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Peamine aadress"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 7ef4059934..a98c7fc276 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +32,89 @@ msgstr "See kategooria on juba olemas: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Seaded"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Jaanuar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Veebruar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Märts"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Aprill"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juuni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juuli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktoober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Detsember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Loobu"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Jah"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Kustutamiseks pole kategooriat valitud."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Viga"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud parooli taastamine"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
 
@@ -240,14 +244,10 @@ msgstr "Lõpeta seadistamine"
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Seaded"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 99d68cbc01..3c6cb58d64 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-faili loomine, see võib veidi aega võtta."
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index c170dc40f9..323ca13114 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 10:25+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Abiinfo"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Isiklik"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Seaded"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Kasutajad"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Rakendused"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Failid tuleb alla laadida ükshaaval."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Tagasi failide juurde"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Rakendus pole sisse lülitatud"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentimise viga"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Kontrollkood aegus. Paelun lae leht uuesti."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekundit tagasi"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minut tagasi"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minutit tagasi"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "täna"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "eile"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d päeva tagasi"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "eelmisel kuul"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "kuud tagasi"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "eelmisel aastal"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "aastat tagasi"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 1009fa2d06..a35dba2f95 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,101 +10,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Errore bat egon da kontaktua gehitzerakoan"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "elementuaren izena ez da ezarri."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "IDa ez da ezarri."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Ezin da propieta hutsa gehitu."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Behintzat helbide eremuetako bat bete behar da."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Errorea kontaktu propietatea gehitzean."
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Ez da IDrik eman"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Errorea kontrol-batura ezartzean."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Ez dira ezabatzeko kategoriak hautatu."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ez da helbide libururik aurkitu."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ez da kontakturik aurkitu."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID falta da"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Errorea VCard analizatzean hurrengo IDrako: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Errore bat egon da helbide liburua gehitzean."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Errore bat egon da helbide-liburua aktibatzen."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Ez da kontaktuaren IDrik eman."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Errore bat izan da kontaktuaren argazkia igotzerakoan."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Errore bat izan da aldi bateko fitxategia gordetzerakoan."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Kargatzen ari den argazkia ez da egokia."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "IDa ez da ezarri."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
@@ -113,328 +109,391 @@ msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.
 msgid "Error deleting contact property."
 msgstr "Errorea kontaktu propietatea ezabatzean."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktuaren IDa falta da."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Kontaktuaren IDa falta da."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Ez da argazkiaren bide-izenik eman."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Fitxategia ez da existitzen:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Errore bat izan da irudia kargatzearkoan."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Errore bat izan da kontaktu objetua lortzean."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Errore bat izan da PHOTO propietatea lortzean."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Errore bat izan da kontaktua gordetzean."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Errore bat izan da irudiaren tamaina aldatzean"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Errore bat izan da irudia mozten"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Errore bat izan da aldi bateko irudia sortzen"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Ezin izan da irudia aurkitu:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "elementuaren izena ez da ezarri."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "Kontrol-batura ezarri gabe dago."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Errore bat egon da helbide liburua eguneratzen."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Aldi bateko karpeta falta da"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ezin izan da aldi bateko irudia gorde:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ezin izan da aldi bateko irudia kargatu:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Barkatu, aukera hau ez da oriandik inplementatu"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Inplementatu gabe"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Ezin izan da eposta baliagarri bat hartu."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Errorea"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Askatu VCF fitxategia kontaktuak inportatzeko."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Helbide liburua ez da aurkitu"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Hau ez da zure helbide liburua."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Ezin izan da kontaktua aurkitu."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Helbidea"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefonoa"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Eposta"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Erakundea"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Lana"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Etxea"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mugikorra"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Testua"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Ahotsa"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Mezua"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax-a"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Bideoa"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Bilagailua"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name}ren jaioteguna"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Propietate hau ezin da hutsik egon."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Ezin izan dira elementuak serializatu."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Editatu izena"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Ez duzu igotzeko fitxategirik hautatu."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Hautatu mota"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Emaitza:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " inportatua, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "huts egin du."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Helbide liburua ez da aurkitu"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Hau ez da zure helbide liburua."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Ezin izan da kontaktua aurkitu."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Helbidea"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefonoa"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Eposta"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Erakundea"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Lana"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Etxea"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mugikorra"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Testua"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Ahotsa"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Mezua"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax-a"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Bideoa"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Bilagailua"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Jaioteguna"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}ren jaioteguna"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Gehitu kontaktua"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Inportatu"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Helbide Liburuak"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Itxi"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfiguratu Helbide Liburuak"
@@ -443,11 +502,7 @@ msgstr "Konfiguratu Helbide Liburuak"
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCFtik inportatu"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav lotura"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Editatu"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Deskargatu kontaktua"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Ezabatu kontaktua"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Askatu argazkia igotzeko"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Editatu izenaren zehaztasunak"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Ezizena"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Sartu ezizena"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Jaioteguna"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "yyyy-mm-dd"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Taldeak"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Banatu taldeak komekin"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editatu taldeak"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Hobetsia"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Mesedez sartu eposta helbide egoki bat"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Sartu eposta helbidea"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Bidali helbidera"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Ezabatu eposta helbidea"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Sartu telefono zenbakia"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Ezabatu telefono zenbakia"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Ikusi mapan"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Editatu helbidearen zehaztasunak"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Gehitu oharrak hemen."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Gehitu eremua"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilaren irudia"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefonoa"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Oharra"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Ezabatu oraingo argazkia"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Editatu oraingo argazkia"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Igo argazki berria"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Editatu izenaren zehaztasunak"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Ezizena"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Sartu ezizena"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "yyyy-mm-dd"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Taldeak"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Banatu taldeak komekin"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editatu taldeak"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Hobetsia"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Mesedez sartu eposta helbide egoki bat"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Sartu eposta helbidea"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Bidali helbidera"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Ezabatu eposta helbidea"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Sartu telefono zenbakia"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Ezabatu telefono zenbakia"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Ikusi mapan"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Editatu helbidearen zehaztasunak"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Gehitu oharrak hemen."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Gehitu eremua"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefonoa"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Oharra"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Deskargatu kontaktua"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Ezabatu kontaktua"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Aldi bateko irudia cachetik ezabatu da."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editatu helbidea"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Mota"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Posta kutxa"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Hedatua"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Kalea"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Hiria"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Eskualdea"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Posta kodea"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Herrialdea"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editatu kategoriak"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Gehitu"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Helbide-liburua"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Bidali"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -766,33 +829,10 @@ msgstr "sortu helbide liburu berria"
 msgid "Name of new addressbook"
 msgstr "Helbide liburuaren izena"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Inportatu"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kontaktuak inportatzen"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Hautau helburuko helbide liburua:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Hautatu disko gogorretik"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Ez duzu kontakturik zure helbide liburuan."
@@ -805,18 +845,34 @@ msgstr "Gehitu kontaktua"
 msgid "Configure addressbooks"
 msgstr "Konfiguratu helbide liburuak"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV sinkronizazio helbideak"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "informazio gehiago"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Helbide nagusia"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 070d14864c..8fdfcdcd07 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Urtarrila"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Otsaila"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Martxoa"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Apirila"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maiatza"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Ekaina"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Uztaila"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Abuztua"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Iraila"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Urria"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Azaroa"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Abendua"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Ezeztatu"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ez"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Bai"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ados"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ez da ezabatzeko kategoriarik hautatu."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Errorea"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloudeko pasahitza berrezarri"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
 
@@ -241,14 +245,10 @@ msgstr "Bukatu konfigurazioa"
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ezarpenak"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index e4da710339..e62061a695 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
diff --git a/l10n/eu_ES/bookmarks.po b/l10n/eu_ES/bookmarks.po
new file mode 100644
index 0000000000..c012dfcd46
--- /dev/null
+++ b/l10n/eu_ES/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/eu_ES/calendar.po b/l10n/eu_ES/calendar.po
new file mode 100644
index 0000000000..3a9d6f6d23
--- /dev/null
+++ b/l10n/eu_ES/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2011-09-03 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
new file mode 100644
index 0000000000..ff9ad67017
--- /dev/null
+++ b/l10n/eu_ES/contacts.po
@@ -0,0 +1,875 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:34
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:46
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:49
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:64
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:73
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:90
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:100
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:69
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:64
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:64
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:69
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:136
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
new file mode 100644
index 0000000000..98e3012b65
--- /dev/null
+++ b/l10n/eu_ES/core.po
@@ -0,0 +1,272 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
+msgid "January"
+msgstr ""
+
+#: js/js.js:573
+msgid "February"
+msgstr ""
+
+#: js/js.js:573
+msgid "March"
+msgstr ""
+
+#: js/js.js:573
+msgid "April"
+msgstr ""
+
+#: js/js.js:573
+msgid "May"
+msgstr ""
+
+#: js/js.js:573
+msgid "June"
+msgstr ""
+
+#: js/js.js:574
+msgid "July"
+msgstr ""
+
+#: js/js.js:574
+msgid "August"
+msgstr ""
+
+#: js/js.js:574
+msgid "September"
+msgstr ""
+
+#: js/js.js:574
+msgid "October"
+msgstr ""
+
+#: js/js.js:574
+msgid "November"
+msgstr ""
+
+#: js/js.js:574
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
new file mode 100644
index 0000000000..9b84201583
--- /dev/null
+++ b/l10n/eu_ES/files.po
@@ -0,0 +1,222 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:659
+msgid "folder"
+msgstr ""
+
+#: js/files.js:661
+msgid "folders"
+msgstr ""
+
+#: js/files.js:669
+msgid "file"
+msgstr ""
+
+#: js/files.js:671
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/eu_ES/gallery.po b/l10n/eu_ES/gallery.po
new file mode 100644
index 0000000000..54096c308b
--- /dev/null
+++ b/l10n/eu_ES/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
new file mode 100644
index 0000000000..366fbd9fb9
--- /dev/null
+++ b/l10n/eu_ES/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/eu_ES/media.po b/l10n/eu_ES/media.po
new file mode 100644
index 0000000000..7b6fee29b9
--- /dev/null
+++ b/l10n/eu_ES/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
new file mode 100644
index 0000000000..6e77d37cb4
--- /dev/null
+++ b/l10n/eu_ES/settings.po
@@ -0,0 +1,218 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 15075e66e4..f453f6e2c6 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "نام اصلی تنظیم نشده است"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "شناسه تعیین نشده"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "نمیتوان یک  خاصیت خالی ایجاد کرد"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "At least one of the address fields has to be filled out. "
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "امتحان کردن برای وارد کردن مشخصات تکراری"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "خطا درهنگام افزودن ویژگی"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "هیچ شناسه ای ارائه نشده"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "خطا در تنظیم checksum"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "هیچ گروهی برای حذف شدن در نظر گرفته نشده"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "هیچ کتابچه نشانی پیدا نشد"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "هیچ شخصی پیدا نشد"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "نشانی گم شده"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "خطا در تجزیه کارت ویزا برای شناسه:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "نمیتوانید یک نام خالی را به کتابچه نشانی ها افزود"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "خطا درهنگام افزودن کتابچه نشانی ها"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "خطا درهنگام فعال سازیکتابچه نشانی ها"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "هیچ اطلاعاتی راجع به شناسه ارسال نشده"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "خطا در خواندن اطلاعات تصویر"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "خطا در ذخیره پرونده موقت"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "بارگزاری تصویر امکان پذیر نیست"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "شناسه تعیین نشده"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید"
@@ -111,328 +107,391 @@ msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا ص
 msgid "Error deleting contact property."
 msgstr "خطا در هنگام پاک کرد ویژگی"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "اطلاعات شناسه گم شده"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "شما اطلاعات شناسه را فراموش کرده اید"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "هیچ نشانی از تصویرارسال نشده"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "پرونده وجود ندارد"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "خطا در بارگزاری تصویر"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "خطا در گرفتن اطلاعات شخص"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "خطا در دربافت تصویر ویژگی شخصی"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "خطا در ذخیره سازی اطلاعات"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "خطا در تغییر دادن اندازه تصویر"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "خطا در برداشت تصویر"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "خطا در ساخت تصویر  temporary"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "خطا در پیدا کردن تصویر:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "نام اصلی تنظیم نشده است"
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum تنظیم شده نیست"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حجم آپلود از طریق Php.ini تعیین می شود"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "قابلیت ذخیره تصویر  موقت وجود ندارد:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "قابلیت بارگذاری تصویر  موقت وجود ندارد:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "با عرض پوزش،این قابلیت هنوز اجرا نشده است"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "انجام نشد"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Couldn't get a valid address."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "خطا"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "کتابچه نشانی ها یافت نشد"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "این کتابچه ی نشانه های شما نیست"
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "اتصال ویا تماسی یافت نشد"
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "نشانی"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "تلفن"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "نشانی پست الکترنیک"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "نهاد(ارگان)"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "کار"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "خانه"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "موبایل"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "متن"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "صدا"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "پیغام"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "دورنگار:"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "رسانه تصویری"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "صفحه"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "اینترنت"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "روز تولد {name} است"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "اشخاص"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "نام تغییر"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "نوع را انتخاب کنید"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "نتیجه:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "وارد شد،"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "ناموفق"
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "کتابچه نشانی ها یافت نشد"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "این کتابچه ی نشانه های شما نیست"
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "اتصال ویا تماسی یافت نشد"
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "نشانی"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "تلفن"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "نشانی پست الکترنیک"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "نهاد(ارگان)"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "کار"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "خانه"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "موبایل"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "متن"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "صدا"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "پیغام"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "دورنگار:"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "رسانه تصویری"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "صفحه"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "اینترنت"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "روزتولد"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "روز تولد {name} است"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "وارد کردن"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "کتابچه ی نشانی ها"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "بستن"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "پیکر بندی کتابچه نشانی ها"
@@ -441,11 +500,7 @@ msgstr "پیکر بندی کتابچه نشانی ها"
 msgid "New Address Book"
 msgstr "کتابچه نشانه های جدید"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "وارد شده از VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Link"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "ویرایش"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "دانلود مشخصات اشخاص"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "پاک کردن  اطلاعات شخص مورد نظر"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "تصویر را به اینجا بکشید تا بار گذازی شود"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "ویرایش نام جزئیات"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "نام مستعار"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "یک نام مستعار وارد کنید"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "روزتولد"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "گروه ها"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "جدا کردن گروه ها به وسیله درنگ نما"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "ویرایش گروه ها"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "مقدم"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "یک  پست الکترونیکی وارد کنید"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "به نشانی  ارسال شد"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "پاک کردن نشانی پست الکترونیکی"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "شماره تلفن راوارد کنید"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "پاک کردن شماره تلفن"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "دیدن روی نقشه"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "ویرایش جزئیات نشانی ها"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "اینجا یادداشت ها را بیافزایید"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "اضافه کردن فیلد"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "تصویر پروفایل"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "شماره تلفن"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "یادداشت"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "پاک کردن تصویر کنونی"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "ویرایش تصویر کنونی"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "بار گذاری یک تصویر جدید"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "ویرایش نام جزئیات"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "نام مستعار"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "یک نام مستعار وارد کنید"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "گروه ها"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "جدا کردن گروه ها به وسیله درنگ نما"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "ویرایش گروه ها"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "مقدم"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "یک  پست الکترونیکی وارد کنید"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "به نشانی  ارسال شد"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "پاک کردن نشانی پست الکترونیکی"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "شماره تلفن راوارد کنید"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "پاک کردن شماره تلفن"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "دیدن روی نقشه"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "ویرایش جزئیات نشانی ها"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "اینجا یادداشت ها را بیافزایید"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "اضافه کردن فیلد"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "شماره تلفن"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "یادداشت"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "دانلود مشخصات اشخاص"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "پاک کردن  اطلاعات شخص مورد نظر"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "تصویر موقت از کش پاک شد."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "ویرایش نشانی"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "نوع"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "صندوق پستی"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "تمدید شده"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "خیابان"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "شهر"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "ناحیه"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "کد پستی"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "کشور"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "ویرایش گروه"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "افزودن"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "کتابچه ی نشانی ها"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -764,33 +827,10 @@ msgstr "یک کتابچه نشانی بسازید"
 msgid "Name of new addressbook"
 msgstr "نام کتابچه نشانی جدید"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "وارد کردن"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "وارد کردن اشخاص"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "یک کتابچه نشانی انتخاب کنید تا وارد شود"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "انتخاب از دیسک سخت"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "شماهیچ شخصی در  کتابچه نشانی خود ندارید"
@@ -803,18 +843,34 @@ msgstr "افزودن اطلاعات شخص مورد نظر"
 msgid "Configure addressbooks"
 msgstr "پیکربندی کتابچه ی نشانی ها"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV syncing addresses "
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "اطلاعات بیشتر"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "نشانی اولیه"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X "
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 6930fb647c..e2c97e1c45 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +32,89 @@ msgstr "این گروه از قبل اضافه شده"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "ژانویه"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "فبریه"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "مارس"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "آوریل"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "می"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "ژوئن"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "جولای"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "آگوست"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "سپتامبر"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "اکتبر"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "نوامبر"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "دسامبر"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "منصرف شدن"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "نه"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "بله"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "قبول"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "خطا"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "گذرواژه ابرهای شما تغییرکرد"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
 
@@ -240,14 +244,10 @@ msgstr "اتمام نصب"
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "تنظیمات"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index ba78e2c9ca..636f1077ab 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index a6bb8bb156..8ec5c5cc62 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 10:36+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,20 +85,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Virhe tallennettaessa tilapäistiedostoa."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -126,31 +126,31 @@ msgstr "Tiedostoa ei ole olemassa:"
 msgid "Error loading image."
 msgstr "Virhe kuvaa ladatessa."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -182,110 +182,110 @@ msgstr "Virhe päivitettäessä osoitekirjaa."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virhettä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lähetetty tiedosto lähetettiin vain osittain"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Tiedostoa ei lähetetty"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Uusi"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -301,129 +301,129 @@ msgstr " tuotu, "
 msgid " failed."
 msgstr " epäonnistui."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Osoitekirjaa ei löytynyt."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -431,63 +431,67 @@ msgstr "Kysymykset"
 msgid "{name}'s Birthday"
 msgstr "Henkilön {name} syntymäpäivä"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisää yhteystieto"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Tuo"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Osoitekirjat"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Sulje"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Päivitä yhteystietoluettelo"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Lisää uusi yhteystieto"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Lisää uusi osoitekirja"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Poista nykyinen yhteystieto"
 
@@ -854,22 +858,22 @@ msgstr "Anna nimi"
 msgid "Enter description"
 msgstr "Anna kuvaus"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV-synkronointiosoitteet"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index a770488ca3..652247ff5c 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -12,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,83 +38,87 @@ msgstr "Tämä luokka on jo olemassa: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Asetukset"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Peru"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Kyllä"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Luokkia ei valittu poistettavaksi."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud-salasanan nollaus"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
 
@@ -244,14 +248,10 @@ msgstr "Viimeistele asennus"
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Asetukset"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 59576c1e40..e81152bac7 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr "Lopeta jakaminen"
 msgid "Delete"
 msgstr "Poista"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
diff --git a/l10n/fr/bookmarks.po b/l10n/fr/bookmarks.po
index ba57cdc64f..f3f172409f 100644
--- a/l10n/fr/bookmarks.po
+++ b/l10n/fr/bookmarks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +21,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Favoris"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "sans titre"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Lire plus tard"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titre"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Étiquettes"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Sauvegarder le favori"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Vous n'avez aucun favori"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Gestionnaire de favoris <br />"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index ee964a08fb..00c24da8a9 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:15+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 13:48+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -84,19 +84,19 @@ msgstr "Calendrier"
 
 #: js/calendar.js:828
 msgid "ddd"
-msgstr "jjj"
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr "jjj M/j"
+msgstr "ddd d/M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr "jjjj M/j"
+msgstr "dddd d/M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr "MMMM aaaa"
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -104,7 +104,7 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr "jjjj, MMM j, aaaa"
+msgstr "dddd, d MMM, yyyy"
 
 #: lib/app.php:121
 msgid "Birthday"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 64b3e82ca1..9d6d8f6ccd 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:26+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,20 +91,20 @@ msgstr "ID manquant"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Aucun ID de contact envoyé"
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erreur de lecture de la photo du contact."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erreur de sauvegarde du fichier temporaire."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La photo chargée est invalide."
 
@@ -132,31 +132,31 @@ msgstr "Fichier inexistant:"
 msgid "Error loading image."
 msgstr "Erreur lors du chargement de l'image."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Erreur lors de l'obtention de l'objet contact"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Erreur lors de l'obtention des propriétés de la photo"
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
@@ -188,110 +188,110 @@ msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Impossible de sauvegarder l'image temporaire :"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Impossible de charger l'image temporaire :"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Pas encore implémenté"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nouveau"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nouveau Contact"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Sélectionner un type"
 
@@ -307,129 +307,129 @@ msgstr "importé,"
 msgid " failed."
 msgstr "échoué."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Carnet d'adresses introuvable."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Business"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Livreur"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Trajet"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Rendez-vous"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Questions"
 
@@ -437,63 +437,67 @@ msgstr "Questions"
 msgid "{name}'s Birthday"
 msgstr "Anniversaire de {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importer"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Contact suivant dans la liste"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contact précédent dans la liste"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Passer au carnet d'adresses suivant/précédent"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
@@ -860,22 +864,22 @@ msgstr "Saisissez le nom"
 msgid "Enter description"
 msgstr "Saisissez une description"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Synchronisation des contacts CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "Plus d'infos"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Adresse principale"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b2609663ea..79d3b618b1 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+#   <nathaplop@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +35,89 @@ msgstr "Cette catégorie existe déjà : "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Paramètres"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Février"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Août"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annulé"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Aucune catégorie sélectionnée pour suppression"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Réinitialisation de votre mot de passe Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
@@ -218,7 +225,7 @@ msgstr "sera utilisé"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Utilisateur de la base de données"
+msgstr "Utilisateur pour la base de données"
 
 #: templates/installation.php:86
 msgid "Database password"
@@ -240,14 +247,10 @@ msgstr "Terminer l'installation"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Paramètres"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 13258b290f..23e5b17852 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +64,34 @@ msgstr "Ne plus partager"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "annuler"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "supprimé"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Générer un fichier ZIP, cela peut prendre du temps"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 90c10f690e..42c784ce91 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:22+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +21,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personnel"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Applications"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administration"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Téléchargement ZIP désactivé."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Les fichiers nécessitent d'être téléchargés un par un."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Retour aux Fichiers"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "L'application n'est pas activée"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Erreur d'authentification"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "La session a expiré. Veuillez recharger la page."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "à l'instant"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "il y a 1 minute"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "il y a %d minutes"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "aujourd'hui"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "hier"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "il y a %d jours"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "le mois dernier"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "il y a plusieurs mois"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "l'année dernière"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "il y a plusieurs années"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index a519d0f7b9..ea9e3f885e 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 10:05+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:49+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -50,11 +50,11 @@ msgstr "Langue changée"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr "Désactivé"
+msgstr "Désactiver"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr "Activé"
+msgstr "Activer"
 
 #: js/personal.js:69
 msgid "Saving..."
@@ -126,7 +126,7 @@ msgstr "Vous utilisez"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "d'espace de stockage sur un total de"
+msgstr "de votre espace de stockage d'une taille totale de"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 2ee23b52a1..521bb00899 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,100 +9,96 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Produciuse un erro (des)activando a axenda."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Produciuse un erro engadindo o contacto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "non se nomeou o elemento."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "non se estableceu o id."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Non se pode engadir unha propiedade baleira."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Polo menos un dos campos do enderezo ten que ser cuberto."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "Tentando engadir propiedade duplicada: "
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Produciuse un erro engadindo unha propiedade do contacto."
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "Non se proveeu ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Erro establecendo a suma de verificación"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Non se seleccionaron categorías para borrado."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Non se atoparon libretas de enderezos."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Non se atoparon contactos."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "ID perdido"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Erro procesando a VCard para o ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Produciuse un erro engadindo a axenda."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Produciuse un erro activando a axenda."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Non se enviou ningún ID de contacto."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Erro lendo a fotografía do contacto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Erro gardando o ficheiro temporal."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "A fotografía cargada non é válida."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -112,341 +108,400 @@ msgstr "A información sobre a vCard é incorrecta. Por favor volva cargar a pá
 msgid "Error deleting contact property."
 msgstr "Produciuse un erro borrando a propiedade do contacto."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Falta o ID do contacto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Non se enviou a ruta a unha foto."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "O ficheiro non existe:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Erro cargando imaxe."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erro obtendo o obxeto contacto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erro obtendo a propiedade PHOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erro gardando o contacto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erro cambiando o tamaño da imaxe"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erro recortando a imaxe"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erro creando a imaxe temporal"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Erro buscando a imaxe: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "non se estableceu a suma de verificación."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Produciuse un erro actualizando a axenda."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Erro subindo os contactos ao almacén."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Non houbo erros, o ficheiro subeuse con éxito"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O ficheiro so foi parcialmente subido"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Non se subeu ningún ficheiro"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Falta o cartafol temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Non se puido gardar a imaxe temporal: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Non se puido cargar a imaxe temporal: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Sentímolo, esta función aínda non foi implementada."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Non implementada."
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Non se puido obter un enderezo de correo válido."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr ""
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Esta non é a súa axenda."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Non se atopou o contacto."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Enderezo"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organización"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Traballo"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Casa"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Móbil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr ""
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Paxinador"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr ""
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr ""
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Esta propiedade non pode quedar baldeira."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Non se puido serializar os elementos."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Editar nome"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Sen ficheiros escollidos para subir."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Seleccione tipo"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultado: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importado, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " fallou."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Non se atopou a libreta de enderezos."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Esta non é a súa axenda."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Non se atopou o contacto."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Enderezo"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organización"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Traballo"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Casa"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Móbil"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Mensaxe"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Paxinador"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversario"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Cumpleanos de {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Engadir contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Axendas"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Pechar"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Configurar Libretas de enderezos"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Nova axenda"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Ligazón CardDav"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Descargar contacto"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Solte a foto a subir"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Borrar contacto"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Borrar foto actual"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "Editar a foto actual"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Subir unha nova foto"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Escoller foto desde ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "Editar detalles do nome"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversario"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
+msgstr "Apodo"
 
 #: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Introuza apodo"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupos"
+
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separe grupos con comas"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "Editar grupos"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Por favor indique un enderezo de correo electrónico válido."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
-msgstr ""
+msgstr "Introduza enderezo de correo electrónico"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
-msgstr ""
+msgstr "Correo ao enderezo"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "Borrar enderezo de correo electrónico"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "Introducir número de teléfono"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "Borrar número de teléfono"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "Ver no mapa"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "Editar detalles do enderezo"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "Engadir aquí as notas."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
+msgstr "Engadir campo"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Descargar contacto"
 
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Borrar contacto"
 
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
-
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "A imaxe temporal foi eliminada da caché."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "Editar enderezo"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Escribir"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Apartado de correos"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Ampliado"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rúa"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Autonomía"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Código postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "País"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Engadir"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "País"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -646,79 +710,79 @@ msgstr "Axenda"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Prefixos honoríficos"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Srta"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Sra/Srta"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Sra"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Apodo"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Nomes adicionais"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nome familiar"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Sufixos honorarios"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,77 +809,69 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importar un ficheiro de contactos"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Por favor escolla unha libreta de enderezos"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "crear unha nova libreta de enderezos"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "Nome da nova libreta de enderezos"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "Importando contactos"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Non ten contactos na súa libreta de enderezos."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Engadir contacto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "Configurar libretas de enderezos"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "Enderezos CardDAV a sincronizar"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
-msgstr ""
+msgstr "máis información"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Enderezo primario (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 97abae0775..8da22539ae 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Esta categoría xa existe: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Preferencias"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Xaneiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febreiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Xuño"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Xullo"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Nadal"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Non hai categorías seleccionadas para eliminar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Restablecemento do contrasinal de Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Restablecer contrasinal de ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "Rematar configuración"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Preferencias"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index adf4d9a4f8..884f224b3b 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "xerando ficheiro ZIP, pode levar un anaco."
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 76473c1487..08b2d09342 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -3,106 +3,103 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "שם האלמנט לא נקבע."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "מספר מזהה לא נקבע."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "לא ניתן להוסיף מאפיין ריק."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "יש למלא לפחות אחד משדות הכתובת."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "ניסיון להוספת מאפיין כפול: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "שגיאה בהוספת מאפיין לאיש הקשר."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "לא צוין מזהה"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "שגיאה בהגדרת נתוני הביקורת."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "לא נבחור קטגוריות למחיקה."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "לא נמצאו פנקסי כתובות."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "לא נמצאו אנשי קשר."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "מזהה חסר"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "שגיאה בפענוח ה VCard עבור מספר המזהה: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "שגיאה בהוספת פנקס הכתובות."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "שגיאה בהפעלת פנקס הכתובות."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "מספר מזהה של אישר הקשר לא נשלח."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "שגיאה בקריאת תמונת איש הקשר."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "שגיאה בשמירת קובץ זמני."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "התמונה הנטענת אינה תקנית."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -112,231 +109,185 @@ msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש
 msgid "Error deleting contact property."
 msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "מספר מזהה של אישר הקשר חסר."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "כתובת התמונה לא נשלחה"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "קובץ לא קיים:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "שגיאה בטעינת התמונה."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "שגיאה בקבלת אוביאקט איש הקשר"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "שגיאה בקבלת מידע של תמונה"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "שגיאה בשמירת איש הקשר"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "שגיאה בשינוי גודל התמונה"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "סיכום ביקורת לא נקבע."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "שגיאה בעדכון פנקס הכתובות."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "התרשה שגיאה בהעלאת אנשי הקשר לאכסון."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "הקובץ הועלה באופן חלקי בלבד"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "שום קובץ לא הועלה"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "תקיה זמנית חסרה"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "איש קשר"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,104 +300,209 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr ""
-
 #: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "ספר כתובות לא נמצא"
+
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "הודעה"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "אינטרנט"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "יום הולדת"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "יום ההולדת של {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "איש קשר"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "הוספת איש קשר"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "יבא"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "פנקסי כתובות"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "הגדר ספרי כתובות"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "פנקס כתובות חדש"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "קישור "
@@ -460,185 +516,194 @@ msgid "Edit"
 msgstr "עריכה"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "הורדת איש קשר"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "גרור ושחרר תמונה בשביל להעלות"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "מחיקת איש קשר"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "מחק תמונה נוכחית"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "ערוך תמונה נוכחית"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "העלה תמונה חדשה"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "בחר תמונה מ ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "ערוך פרטי שם"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "יום הולדת"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
+msgstr "כינוי"
 
 #: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "הכנס כינוי"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "קבוצות"
+
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "הפרד קבוצות עם פסיקים"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "ערוך קבוצות"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "מועדף"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "אנא הזן כתובת דוא\"ל חוקית"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
-msgstr ""
+msgstr "הזן כתובת דוא\"ל"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
-msgstr ""
+msgstr "כתובת"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "מחק כתובת דוא\"ל"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "הכנס מספר טלפון"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "מחק מספר טלפון"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "ראה במפה"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "ערוך פרטי כתובת"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "הוסף הערות כאן."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
+msgstr "הוסף שדה"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "טלפון"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
+msgstr "הערה"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "הורדת איש קשר"
 
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "מחיקת איש קשר"
 
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
-
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "ערוך כתובת"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "סוג"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "תא דואר"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "מורחב"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "רחוב"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "עיר"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "אזור"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "מיקוד"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "מדינה"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "הוספה"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "מדינה"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -646,79 +711,79 @@ msgstr "פנקס כתובות"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "קידומות שם"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "גב'"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "גב'"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "מר'"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "אדון"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "גב'"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "ד\"ר"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "שם"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "שמות נוספים"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "שם משפחה"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "סיומות שם"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,77 +810,69 @@ msgid "Submit"
 msgstr "ביצוע"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "ביטול"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "יבא קובץ אנשי קשר"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "אנא בחר ספר כתובות"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "צור ספר כתובות חדש"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "שם ספר כתובות החדש"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "מיבא אנשי קשר"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "איך לך אנשי קשר בספר הכתובות"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "הוסף איש קשר"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "הגדר ספרי כתובות"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV מסנכרן כתובות"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
-msgstr ""
+msgstr "מידע נוסף"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "כתובת ראשית"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 4d10be3cda..caacbd7897 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,83 +36,87 @@ msgstr "קטגוריה זאת כבר קיימת: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "הגדרות"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "ינואר"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "פברואר"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "מרץ"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "אפריל"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "מאי"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "יוני"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "יולי"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "אוגוסט"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "ספטמבר"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "אוקטובר"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "נובמבר"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "דצמבר"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "ביטול"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "לא"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "כן"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "בסדר"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "לא נבחרו קטגוריות למחיקה"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "שגיאה"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "איפוס הססמה של ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
@@ -241,14 +246,10 @@ msgstr "סיום התקנה"
 msgid "web services under your control"
 msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "הגדרות"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index a690a80bc3..760821f2eb 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "יוצר קובץ ZIP, אנא המתן."
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 14ede506d8..52acf5ffa1 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -3,340 +3,290 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011.
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
 # Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Pogreška pri (de)aktivaciji adresara."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
 
-#: ajax/addproperty.php:40
-msgid "Cannot add empty property."
-msgstr ""
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "naziv elementa nije postavljen."
 
-#: ajax/addproperty.php:52
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:62
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr ""
-
-#: ajax/categories/categoriesfor.php:15
-msgid "No ID provided"
-msgstr ""
-
-#: ajax/categories/categoriesfor.php:27
-msgid "Error setting checksum."
-msgstr ""
-
-#: ajax/categories/delete.php:29
-msgid "No categories selected for deletion."
-msgstr ""
-
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
-msgid "No address books found."
-msgstr ""
-
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
-msgid "No contacts found."
-msgstr ""
-
-#: ajax/contactdetails.php:37
-msgid "Missing ID"
-msgstr ""
-
-#: ajax/contactdetails.php:41
-msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
-msgid "No contact ID was submitted."
-msgstr ""
-
-#: ajax/currentphoto.php:40
-msgid "Error reading contact photo."
-msgstr ""
-
-#: ajax/currentphoto.php:52
-msgid "Error saving temporary file."
-msgstr ""
-
-#: ajax/currentphoto.php:55
-msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
 msgid "id is not set."
+msgstr "id nije postavljen."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Prazno svojstvo se ne može dodati."
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Morate ispuniti barem jedno od adresnih polja."
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Pokušali ste dodati duplo svojstvo:"
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr "Nema dodijeljenog ID identifikatora"
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr "Pogreška pri postavljanju checksuma."
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr "Niti jedna kategorija nije odabrana za brisanje."
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr "Nema adresara."
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr "Nema kontakata."
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr "Nedostupan ID identifikator"
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Pogreška pri raščlanjivanju VCard za ID:"
+
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
+msgid "No contact ID was submitted."
+msgstr "ID kontakta nije podnešen."
+
+#: ajax/currentphoto.php:34
+msgid "Error reading contact photo."
+msgstr "Pogreška pri čitanju kontakt fotografije."
+
+#: ajax/currentphoto.php:46
+msgid "Error saving temporary file."
+msgstr "Pogreška pri spremanju privremene datoteke."
+
+#: ajax/currentphoto.php:49
+msgid "The loading photo is not valid."
+msgstr "Fotografija nije valjana."
+
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Pogreška pri brisanju svojstva kontakta."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID kontakta nije dostupan."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Putanja do fotografije nije podnešena."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Datoteka ne postoji:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Pogreška pri učitavanju slike."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "checksum nije postavljen."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Pogreška pri ažuriranju adresara."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Pogreška pri slanju kontakata."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nema pogreške, datoteka je poslana uspješno."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Poslana datoteka je parcijalno poslana"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Datoteka nije poslana"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Nedostaje privremeni direktorij"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,104 +299,209 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr ""
-
 #: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Adresar nije pronađen."
+
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name} Rođendan"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Uvezi"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresari"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfiguracija Adresara"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav poveznica"
@@ -460,186 +515,195 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Preuzmi kontakt"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Izbriši kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Dovucite fotografiju za slanje"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Uredi detalje imena"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Nadimak"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Unesi nadimank"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Rođendan"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupe"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Uredi grupe"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Unesi email adresu"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Unesi broj telefona"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Prikaži na karti"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Uredi detalje adrese"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Dodaj bilješke ovdje."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Dodaj polje"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Bilješka"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Uredi trenutnu sliku"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Uredi detalje imena"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Nadimak"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Unesi nadimank"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupe"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Uredi grupe"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferirano"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Unesi email adresu"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Unesi broj telefona"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Prikaži na karti"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Uredi detalje adrese"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Dodaj bilješke ovdje."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Dodaj polje"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Bilješka"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Preuzmi kontakt"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Izbriši kontakt"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Uredi adresu"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tip"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Poštanski Pretinac"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Prošireno"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Grad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poštanski broj"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Država"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Uredi kategorije"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresar"
@@ -730,11 +794,11 @@ msgstr "Uredi adresar"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Prikazani naziv"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "Pošalji"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Prekini"
 
@@ -765,33 +828,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Uvezi"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index fb3ceb0808..48308caf05 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011.
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
 # Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 # Thomas Silađi <thomas.siladi@net.hr>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Ova kategorija već postoji: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Postavke"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nema odabranih kategorija za brisanje."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Pogreška"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "ownCloud resetiranje lozinke"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
 
@@ -242,14 +246,10 @@ msgstr "Završi postavljanje"
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Postavke"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index f94c9ee4bc..2cd29927c8 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Briši"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generiranje ZIP datoteke, ovo može potrajati."
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index bff0548d69..f524421d03 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,101 +11,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Címlista (de)aktiválása sikertelen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Hiba a kapcsolat hozzáadásakor"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "az elem neve nincs beállítva"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID nincs beállítva"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nem adható hozzá üres tulajdonság"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Legalább egy címmező kitöltendő"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Hiba a kapcsolat-tulajdonság hozzáadásakor"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nincs ID megadva"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Hiba az ellenőrzőösszeg beállításakor"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nincs kiválasztva törlendő kategória"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nem található címlista"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nem található kontakt"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Hiányzó ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "VCard elemzése sikertelen a következő ID-hoz: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nem adható hozzá névtelen címlista"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Hiba a címlista hozzáadásakor"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Címlista aktiválása sikertelen"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nincs ID megadva a kontakthoz"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "A kontakt képének beolvasása sikertelen"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Ideiglenes fájl mentése sikertelen"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "A kép érvénytelen"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID nincs beállítva"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
@@ -114,328 +110,391 @@ msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 msgid "Error deleting contact property."
 msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Hiányzik a kapcsolat ID"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Hiányzik a kontakt ID"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nincs fénykép-útvonal megadva"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "A fájl nem létezik:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Kép betöltése sikertelen"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "A kontakt-objektum feldolgozása sikertelen"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "A PHOTO-tulajdonság  feldolgozása sikertelen"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "A kontakt mentése sikertelen"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Képméretezés sikertelen"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Képvágás sikertelen"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "A kép nem található"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "az elem neve nincs beállítva"
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "az ellenőrzőösszeg nincs beállítva"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Üres névvel nem frissíthető a címlista"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Hiba a címlista frissítésekor"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Hiba a kapcsolatok feltöltésekor"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nincs hiba, a fájl sikeresen feltöltődött"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "A fájl csak részlegesen lett feltöltve"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nincs feltöltött fájl"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Hiányzik az ideiglenes könyvtár"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ideiglenes kép betöltése sikertelen"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Sajnáljuk, ez a funkció még nem támogatott"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Nem támogatott"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Érvényes cím lekérése sikertelen"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Hiba"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Húzza ide a VCF fájlt a kapcsolatok importálásához"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Címlista nem található"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Ez nem a te címjegyzéked."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kapcsolat nem található."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Cím"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefonszám"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-mail"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Szervezet"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Munkahelyi"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Otthoni"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobiltelefonszám"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Szöveg"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Hang"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Üzenet"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Személyhívó"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name} születésnapja"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kapcsolat"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Ezt a tulajdonságot muszáj kitölteni"
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Sorbarakás sikertelen"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Név szerkesztése"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Nincs kiválasztva feltöltendő fájl"
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Típus kiválasztása"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Eredmény: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "  beimportálva,  "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "  sikertelen"
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Címlista nem található"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Ez nem a te címjegyzéked."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Kapcsolat nem található."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Cím"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefonszám"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Szervezet"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Munkahelyi"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Otthoni"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mobiltelefonszám"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Szöveg"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Hang"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Üzenet"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Személyhívó"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Születésnap"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} születésnapja"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kapcsolat hozzáadása"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Címlisták"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Bezár"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Címlisták beállítása"
@@ -444,11 +503,7 @@ msgstr "Címlisták beállítása"
 msgid "New Address Book"
 msgstr "Új címlista"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importálás VCF-ből"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav hivatkozás"
@@ -462,186 +517,195 @@ msgid "Edit"
 msgstr "Szerkesztés"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Kapcsolat letöltése"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kapcsolat törlése"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Húzza ide a feltöltendő képet"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Név részleteinek szerkesztése"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Becenév"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Becenév megadása"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Születésnap"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "yyyy-mm-dd"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Csoportok"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Vesszővel válassza el a csoportokat"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Csoportok szerkesztése"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Előnyben részesített"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Adjon meg érvényes email címet"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Adja meg az email címet"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Postai cím"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Email cím törlése"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Adja meg a telefonszámot"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Telefonszám törlése"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Megtekintés a térképen"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Cím részleteinek szerkesztése"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Megjegyzések"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Mező hozzáadása"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilkép"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefonszám"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Jegyzet"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Aktuális kép törlése"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Aktuális kép szerkesztése"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Új kép feltöltése"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Név részleteinek szerkesztése"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Becenév"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Becenév megadása"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "yyyy-mm-dd"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Csoportok"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Vesszővel válassza el a csoportokat"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Csoportok szerkesztése"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Előnyben részesített"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Adjon meg érvényes email címet"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Adja meg az email címet"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Postai cím"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Email cím törlése"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Adja meg a telefonszámot"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Telefonszám törlése"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Megtekintés a térképen"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Cím részleteinek szerkesztése"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Megjegyzések"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Mező hozzáadása"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefonszám"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Jegyzet"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kapcsolat letöltése"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kapcsolat törlése"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Az ideiglenes kép el lett távolítva a gyorsítótárból"
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Cím szerkesztése"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Típus"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postafiók"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Kiterjesztett"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Utca"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Város"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Megye"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Irányítószám"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Ország"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategóriák szerkesztése"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Hozzáad"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Címlista"
@@ -747,7 +811,6 @@ msgid "Submit"
 msgstr "Elküld"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -767,33 +830,10 @@ msgstr "Címlista létrehozása"
 msgid "Name of new addressbook"
 msgstr "Új címlista neve"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kapcsolatok importálása"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Melyik címlistába történjen az importálás:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Kiválasztás merevlemezről"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nincsenek kapcsolatok a címlistában"
@@ -806,18 +846,34 @@ msgstr "Kapcsolat hozzáadása"
 msgid "Configure addressbooks"
 msgstr "Címlisták beállítása"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV szinkronizációs címek"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "további információ"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Elsődleges cím"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 7aba93b972..a40b764ad4 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Ez a kategória már létezik"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Beállítások"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Január"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Február"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Március"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Április"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Május"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Június"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Július"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Augusztus"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Szeptember"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Október"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nem"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Igen"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nincs törlésre jelölt kategória"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Hiba"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "ownCloud jelszó-visszaállítás"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
 
@@ -126,7 +130,7 @@ msgstr "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr "Kért"
+msgstr "Kérés elküldve"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
@@ -135,7 +139,7 @@ msgstr "Belépés sikertelen!"
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
 msgid "Username"
-msgstr "Felhasználói név"
+msgstr "Felhasználónév"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
@@ -143,7 +147,7 @@ msgstr "Visszaállítás igénylése"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Jelszó megváltoztatásra került"
+msgstr "Jelszó megváltoztatva"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -155,7 +159,7 @@ msgstr "Új jelszó"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Jelszó beállítás"
+msgstr "Jelszó-visszaállítás"
 
 #: strings.php:5
 msgid "Personal"
@@ -171,7 +175,7 @@ msgstr "Alkalmazások"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Adminisztráció"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -183,7 +187,7 @@ msgstr "Hozzáférés tiltva"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Nem talált felhő"
+msgstr "A felhő nem található"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -195,7 +199,7 @@ msgstr "Hozzáadás"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr "<strong>Adminisztrációs fiók</strong> létrehozása"
+msgstr "<strong>Rendszergazdafiók</strong> létrehozása"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -203,11 +207,11 @@ msgstr "Jelszó"
 
 #: templates/installation.php:35
 msgid "Advanced"
-msgstr "Fejlett"
+msgstr "Haladó"
 
 #: templates/installation.php:37
 msgid "Data folder"
-msgstr "Adat könyvtár"
+msgstr "Adatkönyvtár"
 
 #: templates/installation.php:44
 msgid "Configure the database"
@@ -220,7 +224,7 @@ msgstr "használva lesz"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Adatbázis felhasználó"
+msgstr "Adatbázis felhasználónév"
 
 #: templates/installation.php:86
 msgid "Database password"
@@ -236,27 +240,23 @@ msgstr "Adatbázis szerver"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr "Beállítások befejezése"
+msgstr "Beállítás befejezése"
 
 #: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webszolgáltatások az irányításod alatt"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Beállítások"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Elfelejtett jelszó?"
 
 #: templates/login.php:17
 msgid "remember"
-msgstr "emlékezni"
+msgstr "emlékezzen"
 
 #: templates/login.php:18
 msgid "Log in"
@@ -264,7 +264,7 @@ msgstr "Bejelentkezés"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Kilépés sikerült."
+msgstr "Kilépett."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index a7826f3be5..afa43a5036 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 824bab0c47..8916c610f8 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,101 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,186 +513,195 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr ""
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr ""
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 0880df331a..f7c8e7693a 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -106,10 +114,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -239,14 +243,10 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index a89c7b0efe..596ee32660 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 7c0c0d4b01..d41fa3c8fa 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,101 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Non pote adder proprietate vacue."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nulle adressario trovate"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nulle contactos trovate."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Error durante que il addeva le adressario."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Error in activar adressario"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Error durante le scriptura in le file temporari"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -112,231 +108,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Il habeva un error durante le cargamento del imagine."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,91 +299,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adressario non trovate."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Anniversario"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contacto"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adder contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressarios"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -442,11 +501,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Nove adressario"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Ligamine CardDav"
@@ -460,186 +515,195 @@ msgid "Edit"
 msgstr "Modificar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Discargar contacto"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Deler contacto"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Pseudonymo"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Inserer pseudonymo"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Anniversario"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Gruppos"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Modificar gruppos"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferite"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Entrar un adresse de e-posta"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Deler adresse de E-posta"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Entrar un numero de telephono"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Deler numero de telephono"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Vider in un carta"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Adder notas hic"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Adder campo"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Imagine de profilo"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Phono"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Nota"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Deler photo currente"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Modificar photo currente"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Incargar nove photo"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Pseudonymo"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Inserer pseudonymo"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Gruppos"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Modificar gruppos"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferite"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Entrar un adresse de e-posta"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Deler adresse de E-posta"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Entrar un numero de telephono"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Deler numero de telephono"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Vider in un carta"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Adder notas hic"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Adder campo"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Phono"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Nota"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Discargar contacto"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Deler contacto"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Modificar adresses"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Cassa postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extendite"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Strata"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Citate"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Codice postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Pais"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Modificar categorias"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adder"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressario"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "Submitter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -765,33 +828,10 @@ msgstr "Crear un nove adressario"
 msgid "Name of new addressbook"
 msgstr "Nomine del nove gruppo:"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr "Adder adressario"
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "plus info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index e81a57a40b..fe4466de6b 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr "Iste categoria jam existe:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Configurationes"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reinitialisation del contrasigno de Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
 
@@ -240,14 +244,10 @@ msgstr ""
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Configurationes"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index ac35031953..5e995f4fbf 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Deler"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 0a3d9aab36..46c23dd903 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,101 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,186 +513,195 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr ""
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr ""
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 04caad7d31..dbfdf23312 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,51 +35,59 @@ msgstr "Kategori ini sudah ada:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Setelan"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -108,10 +116,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reset password Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "reset password ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "Selesaikan instalasi"
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Setelan"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Lupa password anda?"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 266e210ae2..8b632afd50 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 6bbcb889ca..0efd77c3ec 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 2a3c3b516c..1434c85e1d 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index 80f24e91fe..cc6601b9fa 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_ID/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/it/bookmarks.po b/l10n/it/bookmarks.po
index 501cb1181c..7ed1ded6a7 100644
--- a/l10n/it/bookmarks.po
+++ b/l10n/it/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 08:36+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Segnalibri"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "senza nome"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Leggi dopo"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titolo"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Tag"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Salva segnalibro"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Non hai segnalibri"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index 67fa300db8..52db292ae4 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 20:45+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 12:15+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -83,19 +83,19 @@ msgstr "Calendario"
 
 #: js/calendar.js:828
 msgid "ddd"
-msgstr "ggg"
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr "ggg M/g"
+msgstr "ddd d/M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr "gggg M/g"
+msgstr "dddd d/M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr "MMMM aaaa"
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -103,7 +103,7 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr "gggg, MMM g, aaaa"
+msgstr "dddd, d MMM yyyy"
 
 #: lib/app.php:121
 msgid "Birthday"
@@ -604,7 +604,7 @@ msgstr "Categoria"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr "Categorie separate con virgole"
+msgstr "Categorie separate da virgole"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 64b9e1e0a1..39aa2c960f 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,20 +85,20 @@ msgstr "ID mancante"
 msgid "Error parsing VCard for ID: \""
 msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nessun ID di contatto inviato."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Errore di lettura della foto del contatto."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Errore di salvataggio del file temporaneo."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La foto caricata non è valida."
 
@@ -126,31 +126,31 @@ msgstr "Il file non esiste:"
 msgid "Error loading image."
 msgstr "Errore di caricamento immagine."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Errore di recupero dell'oggetto contatto."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Errore di recupero della proprietà FOTO."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Errore durante la ricerca dell'immagine: "
 
@@ -182,110 +182,110 @@ msgstr "Errore durante l'aggiornamento della rubrica."
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato inviato correttamente"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file inviato supera la direttiva upload_max_filesize nel php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato inviato solo parzialmente"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nessun file è stato inviato"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Impossibile salvare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Impossibile caricare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contatti"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Non implementata"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contatto"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nuovo"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
@@ -301,129 +301,129 @@ msgstr " importato, "
 msgid " failed."
 msgstr " non riuscito."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Rubrica non trovata."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Domande"
 
@@ -431,63 +431,67 @@ msgstr "Domande"
 msgid "{name}'s Birthday"
 msgstr "Data di nascita di {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importa"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Rubriche"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Contatto successivo in elenco"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contatto precedente in elenco"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Espandi/Contrai la rubrica corrente"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Rubrica successiva/precedente"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Aggiorna l'elenco dei contatti"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Aggiungi una nuova rubrica"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Elimina il contatto corrente"
 
@@ -854,22 +858,22 @@ msgstr "Inserisci il nome"
 msgid "Enter description"
 msgstr "Inserisci una descrizione"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Indirizzi di sincronizzazione CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "altre informazioni"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Indirizzo principale (Kontact e altri)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Collegamento(i) cartella vCard sola lettura"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index c2d63be3c9..facb1d047d 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,85 +36,89 @@ msgstr "Questa categoria esiste già: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sì"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nessuna categoria selezionata per l'eliminazione."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ripristino password di Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
 
@@ -244,14 +248,10 @@ msgstr "Termina la configurazione"
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Impostazioni"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index ae00b01ac9..aefaa88ad2 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr "Rimuovi condivisione"
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "annulla"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "eliminati"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "creazione file ZIP, potrebbe richiedere del tempo."
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index f930daa0b6..e34db2db96 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 10:25+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Aiuto"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personale"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Impostazioni"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Applicazioni"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "I file devono essere scaricati uno alla volta."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Torna ai file"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "L'applicazione  non è abilitata"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Errore di autenticazione"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token scaduto. Ricarica la pagina."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "secondi fa"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minuto fa"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minuti fa"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "oggi"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "ieri"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d giorni fa"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "il mese scorso"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "mesi fa"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "l'anno scorso"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "anni fa"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index f48c9cc75b..1f8cbc10ec 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "アドレスブックの有効/無効化に失敗しました。"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "連絡先の追加でエラーが発生しました。"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "要素名が設定されていません。"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "idが設定されていません。"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "項目の新規追加に失敗しました。"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "住所の項目のうち１つは入力して下さい。"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "重複する属性を追加: "
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "連絡先の追加に失敗しました。"
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "IDが提供されていません"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "チェックサムの設定エラー。"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "削除するカテゴリが選択されていません。"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "アドレスブックが見つかりません。"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "連絡先が見つかりません。"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "VCardからIDの抽出エラー: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "名前を空白にしたままでアドレスブックを追加することはできません。"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "アドレスブックの追加に失敗しました。"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "アドレスブックの有効化に失敗しました。"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "連絡先IDは登録されませんでした。"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "連絡先写真の読み込みエラー。"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "一時ファイルの保存エラー。"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "写真の読み込みは無効です。"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "idが設定されていません。"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardの情報に誤りがあります。ページをリロードして下さい。"
@@ -111,328 +107,391 @@ msgstr "vCardの情報に誤りがあります。ページをリロードして
 msgid "Error deleting contact property."
 msgstr "連絡先の削除に失敗しました。"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "コンタクトIDが見つかりません。"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "コンタクトIDが設定されていません。"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "写真のパスが登録されていません。"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "ファイルが存在しません:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "画像の読み込みエラー。"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "コンタクトオブジェクトの取得エラー。"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "写真属性の取得エラー。"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "コンタクトの保存エラー。"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "画像のリサイズエラー"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "画像の切り抜きエラー"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "一時画像の生成エラー"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "画像検索エラー: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "要素名が設定されていません。"
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "チェックサムが設定されていません。"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "空白の名前でアドレスブックを更新することはできません。"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "アドレスブックの更新に失敗しました。"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "ストレージへの連絡先のアップロードエラー。"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "一時保存フォルダが見つかりません"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "一時的な画像の保存ができませんでした: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "一時的な画像の読み込みができませんでした: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "連絡先"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "申し訳ありません。この機能はまだ実装されていません"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "未実装"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "有効なアドレスを取得できませんでした。"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "連絡先をインポートするVCFファイルをドロップしてください。"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "アドレスブックが見つかりませんでした。"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "これはあなたの電話帳ではありません。"
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "連絡先を見つける事ができません。"
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "住所"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "電話番号"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "メールアドレス"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "所属"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "勤務先"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "住居"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "携帯電話"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "TTY TDD"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "音声番号"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "メッセージ"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "FAX"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "テレビ電話"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "ポケベル"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "インターネット"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name}の誕生日"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "連絡先"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "この属性は空にできません。"
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "要素をシリアライズできませんでした。"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "名前を編集"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "アップロードするファイルが選択されていません。"
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "タイプを選択"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "結果: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " をインポート、 "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " は失敗しました。"
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "アドレスブックが見つかりませんでした。"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "これはあなたの電話帳ではありません。"
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "連絡先を見つける事ができません。"
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "住所"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "電話番号"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "メールアドレス"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "所属"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "勤務先"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "住居"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "携帯電話"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "TTY TDD"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "音声番号"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "メッセージ"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "FAX"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "テレビ電話"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "ポケベル"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "インターネット"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "誕生日"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}の誕生日"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "連絡先の追加"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "インポート"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "電話帳"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "閉じる"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "アドレスブックを設定"
@@ -441,11 +500,7 @@ msgstr "アドレスブックを設定"
 msgid "New Address Book"
 msgstr "新規電話帳"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCFからインポート"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAVリンク"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "編集"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "削除"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "連絡先のダウンロード"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "連絡先の削除"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "写真をドロップしてアップロード"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "名前の詳細を編集"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "ニックネーム"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "ニックネームを入力"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "誕生日"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "yyyy-mm-dd"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "グループ"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "コンマでグループを分割"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "グループを編集"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "推奨"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "連絡先を追加"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "メールアドレスを入力"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "アドレスへメールを送る"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "メールアドレスを削除"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "電話番号を入力"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "電話番号を削除"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "地図で表示"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "住所の詳細を編集"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "ここにメモを追加。"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "項目を追加"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "プロフィール写真"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "電話番号"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "メモ"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "現在の写真を削除"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "現在の写真を編集"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "新しい写真をアップロード"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "ownCloudから写真を選択"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "名前の詳細を編集"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "ニックネーム"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "ニックネームを入力"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "yyyy-mm-dd"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "グループ"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "コンマでグループを分割"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "グループを編集"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "推奨"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "連絡先を追加"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "メールアドレスを入力"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "アドレスへメールを送る"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "メールアドレスを削除"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "電話番号を入力"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "電話番号を削除"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "地図で表示"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "住所の詳細を編集"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "ここにメモを追加。"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "項目を追加"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "電話番号"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "メモ"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "連絡先のダウンロード"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "連絡先の削除"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "一時画像はキャッシュから削除されました。"
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "住所を編集"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "種類"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "私書箱"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "番地2"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "番地1"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "都市"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "都道府県"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "郵便番号"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "国名"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "カテゴリを編集"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "追加"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "アドレスブック"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "送信"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取り消し"
 
@@ -764,33 +827,10 @@ msgstr "新しいアドレスブックを作成"
 msgid "Name of new addressbook"
 msgstr "新しいアドレスブックの名前"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "インポート"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "コンタクトをインポート"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "インポートするアドレスブックを選択:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "HDから選択"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "アドレスブックに連絡先が登録されていません。"
@@ -803,18 +843,34 @@ msgstr "連絡先を追加"
 msgid "Configure addressbooks"
 msgstr "アドレス帳を設定"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV同期アドレス"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "詳細情報"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "プライマリアドレス（Kontact 他）"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index f0a07c435a..6aa6c326c5 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +32,89 @@ msgstr "このカテゴリはすでに存在します: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "設定"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "1月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "2月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "3月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "4月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "5月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "6月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "7月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "8月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "9月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "10月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "11月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "いいえ"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "はい"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "削除するカテゴリが選択されていません。"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud のパスワードをリセット"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
 
@@ -240,14 +244,10 @@ msgstr "セットアップを完了します"
 msgid "web services under your control"
 msgstr "管理下にあるウェブサービス"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "設定"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 9be02066db..e014bfa99f 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "削除"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 77bb4f1a39..3d9e441fab 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,101 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "주소록을 (비)활성화하는 데 실패했습니다."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "element 이름이 설정되지 않았습니다."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "아이디가 설정되어 있지 않습니다. "
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "빈 속성을 추가할 수 없습니다."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "최소한 하나의 주소록 항목을 입력해야 합니다."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "중복 속성 추가 시도: "
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "연락처 속성을 추가할 수 없습니다."
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "제공되는 아이디 없음"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "오류 검사합계 설정"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "삭제 카테고리를 선택하지 않았습니다. "
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "주소록을 찾을 수 없습니다."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "아이디 분실"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "아이디에 대한 VCard 분석 오류"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "성명란이 비어 주소록에 추가 할 수 없습니다."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "주소록을 추가할 수 없습니다."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "주소록을 활성화할 수 없습니다."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "접속 아이디가 기입되지 않았습니다."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "사진 읽기 오류"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "임시 파일을 저장하는 동안 오류가 발생했습니다. "
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "로딩 사진이 유효하지 않습니다. "
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "아이디가 설정되어 있지 않습니다. "
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오."
@@ -112,328 +108,391 @@ msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십
 msgid "Error deleting contact property."
 msgstr "연락처 속성을 삭제할 수 없습니다."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "접속 아이디가 없습니다. "
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "접속 아이디 분실"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "사진 경로가 제출되지 않았습니다. "
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "파일이 존재하지 않습니다. "
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "로딩 이미지 오류입니다."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "연락처 개체를 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "사진 속성을 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "연락처 저장 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "이미지 크기 조정 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "이미지를 자르던 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "임시 이미지를 생성 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "체크섬이 설정되지 않았습니다."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "주소록을 업데이트할 수 없습니다."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "스토리지 에러 업로드 연락처."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "오류없이 파일업로드 성공."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "HTML형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "이 업로드된 파일은 부분적으로만 업로드 되었습니다."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "파일이 업로드 되어있지 않습니다"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "임시 폴더 분실"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "임시 이미지를 저장할 수 없습니다:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "임시 이미지를 불러올 수 없습니다. "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "연락처"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "죄송합니다. 이 기능은 아직 구현되지 않았습니다. "
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "구현되지 않음"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "유효한 주소를 얻을 수 없습니다."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "오류"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "주소록을 찾을 수 없습니다."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "내 주소록이 아닙니다."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "연락처를 찾을 수 없습니다."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "주소"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "전화 번호"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "전자 우편"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "조직"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "직장"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "자택"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "휴대폰"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "문자 번호"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "음성 번호"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "메세지"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "팩스 번호"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "영상 번호"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "호출기"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "인터넷"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{이름}의 생일"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "연락처"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "요소를 직렬화 할 수 없습니다."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "이름 편집"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "유형 선택"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "결과:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "불러오기,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "실패."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "주소록을 찾을 수 없습니다."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "내 주소록이 아닙니다."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "연락처를 찾을 수 없습니다."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "주소"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "전화 번호"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "전자 우편"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "조직"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "직장"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "자택"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "휴대폰"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "문자 번호"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "음성 번호"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "메세지"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "팩스 번호"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "영상 번호"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "호출기"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "인터넷"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "생일"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{이름}의 생일"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "연락처 추가"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "입력"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "주소록"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "닫기"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "주소록 구성"
@@ -442,11 +501,7 @@ msgstr "주소록 구성"
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCF에서 가져오기"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav 링크"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "편집"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "연락처 다운로드"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "연락처 삭제"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Drop photo to upload"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "현재 사진 삭제"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr "현재 사진 편집"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "새로운 사진 업로드"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "ownCloud에서 사진 선택"
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
+
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "이름 세부사항을 편집합니다. "
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "별명"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "별명 입력"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "생일"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "일-월-년"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "쉼표로 그룹 구분"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "그룹 편집"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "선호함"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "올바른 이메일 주소를 입력하세요."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "이메일 주소 입력"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "이메일 주소 삭제"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "전화번호 입력"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "전화번호 삭제"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "지도에서 보기"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "상세 주소 수정"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "여기에 노트 추가."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
+msgstr "파일 추가"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "전화 번호"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
+msgstr "노트"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "연락처 다운로드"
 
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "연락처 삭제"
 
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
-
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "임시 이미지가 캐시에서 제거 되었습니다. "
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "주소 수정"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "종류"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "사서함"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "확장"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "거리"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "도시"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "지역"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "우편 번호"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "국가"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "추가"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "국가"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -646,79 +710,79 @@ msgstr "주소록"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Hon. prefixes"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Miss"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Mr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mrs"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Given name"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "추가 이름"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "성"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Hon. suffixes"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,77 +809,69 @@ msgid "Submit"
 msgstr "보내기"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "취소"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "연락처 파일 입력"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "주소록을 선택해 주세요."
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "새 주소록 만들기"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "새 주소록 이름"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "연락처 입력"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "당신의 주소록에는 연락처가 없습니다. "
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "연락처 추가"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "주소록 구성"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV 주소 동기화"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
-msgstr ""
+msgstr "더 많은 정보"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "기본 주소 (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 22330d05c9..948625d1cc 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "이 카테고리는 이미 존재합니다:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "설정"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "1월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "2월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "3월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "4월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "5월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "6월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "7월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "8월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "9월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "10월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "11월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "12월"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "취소"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "아니오"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "예"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "승락"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "삭제 카테고리를 선택하지 않았습니다."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "에러"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud 암호 재설정"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud 비밀번호 재설정"
 
@@ -241,14 +245,10 @@ msgstr "설치 완료"
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "설정"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index ff96bf8195..76eb1bf66d 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "삭제"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 752a81e3f7..fe4a8a044e 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,100 +8,96 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
+msgstr "Fehler beim bäisetzen vun engem Kontakt."
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID ass net gesat."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Ka keng eidel Proprietéit bäisetzen."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr ""
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "Keng ID uginn"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Fehler beim setzen vun der Checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Keng Kategorien fir ze läschen ausgewielt."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Keen Adressbuch fonnt."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Keng Kontakter fonnt."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "ID fehlt"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Kontakt ID ass net mat geschéckt ginn."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Fehler beim liesen vun der Kontakt Photo."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Fehler beim späicheren vum temporäre Fichier."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Déi geluede Photo ass net gülteg."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -109,343 +105,402 @@ msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Fehler beim läschen vun der Kontakt Proprietéit."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontakt ID fehlt."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "Fichier existéiert net:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Fehler beim lueden vum Bild."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Fehler beim updaten vum Adressbuch."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Et ass kee Fichier ropgeluede ginn"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakter"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
+msgstr "Fehler"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultat: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " importéiert, "
 
 #: js/loader.js:49
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr ""
-
 #: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Adressbuch net fonnt."
+
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Message"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Gebuertsdag"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name} säi Gebuertsdag"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt bäisetzen"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressbicher "
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zoumaachen"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Adressbicher konfigureiren"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Neit Adressbuch"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Link"
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Editéieren"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kontakt läschen"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Gebuertsdag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Spëtznumm"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Gëff e Spëtznumm an"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Gruppen"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Gruppen editéieren"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Telefonsnummer aginn"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Telefonsnummer läschen"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Op da Kaart uweisen"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Adress Detailer editéieren"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Note"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kontakt eroflueden"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kontakt läschen"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postleetzuel"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Erweidert"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Strooss"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Staat"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regioun"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postleetzuel"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Land"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dobäisetzen"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Land"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -657,31 +721,31 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "M"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mme"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Virnumm"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Weider Nimm"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Famillje Numm"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -705,7 +769,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -713,11 +777,11 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -733,7 +797,7 @@ msgstr "Ugewisene Numm"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Fortschécken"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ofbriechen"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 0304df227c..04a5957160 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr "Des Kategorie existéiert schonn:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Astellungen"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud Passwuert reset"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud Passwuert reset"
 
@@ -240,14 +244,10 @@ msgstr "Installatioun ofschléissen"
 msgid "web services under your control"
 msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Ausloggen"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Astellungen"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index f2d9007576..23fcc19514 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 7191a75575..c6f544cbda 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,100 +8,96 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Klaida (de)aktyvuojant adresų knygą."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Pridedant kontaktą įvyko klaida."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Kontaktų nerasta."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Klaida pridedant adresų knygą."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Klaida aktyvuojant adresų knygą."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Klaida skaitant kontakto nuotrauką."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Netinkama įkeliama nuotrauka."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -111,231 +107,185 @@ msgstr "Informacija apie vCard yra neteisinga. "
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "Failas neegzistuoja:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Klaida įkeliant nuotrauką."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Failas įkeltas sėkmingai, be klaidų"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Įkeliamo failo dydis viršija upload_max_filesize nustatymą php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nebuvo įkeltas joks failas"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktas"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,104 +298,209 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr ""
-
 #: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Nerasta adresų knyga."
+
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Žinutė"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internetas"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Gimtadienis"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontaktas"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridėti kontaktą"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresų knygos"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigūruoti adresų knygas"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAV nuoroda"
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Keisti"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Trinti"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Atsisųsti kontaktą"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Ištrinti kontaktą"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Gimtadienis"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefonas"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Slapyvardis"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefonas"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Atsisųsti kontaktą"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Ištrinti kontaktą"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipas"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Pašto dėžutė"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gatvė"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Miestas"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regionas"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Pašto indeksas"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Šalis"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Pridėti"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Šalis"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index c2bd15b3ef..3dfbbfaf40 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nepateiktas programos pavadinimas."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nepridėsite jokios kategorijos?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
@@ -32,85 +32,89 @@ msgstr "Tokia kategorija jau yra:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Sausis"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Vasaris"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Kovas"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Balandis"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Gegužė"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Birželis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Liepa"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Rugpjūtis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Rugsėjis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Spalis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Lapkritis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Gruodis"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Taip"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Gerai"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Trynimui nepasirinkta jokia kategorija."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Klaida"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud slaptažodžio atkūrimas"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
 
@@ -240,14 +244,10 @@ msgstr "Baigti diegimą"
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nustatymai"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index a3f2ed1f7b..2eb293733c 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 8cc7933bb0..0b80baf9b4 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2011-09-23 17:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index f9e9e23477..0c20b3c465 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 12:27+0000\n"
-"Last-Translator: CPDZ <aldis@udris.lv>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Iestatījumi"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -240,10 +248,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Izlogoties"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Iestatījumi"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 055364d0d7..621deceffc 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr "Pārtraukt līdzdalīšanu"
 msgid "Delete"
 msgstr "Izdzēst"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 6d30f17cb1..3af06736fa 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -3,106 +3,103 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Грешка (де)активирање на адресарот."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Имаше грешка при додавање на контактот."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "име за елементот не е поставена."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ид не е поставено."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Неможе да се додаде празна вредност."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Барем една од полињата за адреса треба да биде пополнето."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Се обидовте да внесете дупликат вредност:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Грешка при додавање на вредност за контактот."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Нема доставено ИД"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Грешка во поставување сума за проверка."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Нема избрано категории за бришење."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Не се најдени адресари."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Не се најдени контакти."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Недостасува ИД"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Грешка при парсирање VCard за ИД: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Неможе да се внесе адресар со празно име."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Грешки при додавање на адресарот."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Грешка при активирање на адресарот."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Не беше доставено ИД за контакт."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Грешка во читање на контакт фотографија."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Грешка во снимање на привремена датотека."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Фотографијата која се вчитува е невалидна."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ид не е поставено."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава."
@@ -111,328 +108,391 @@ msgstr "Информацијата за vCard не е точна. Ве мола
 msgid "Error deleting contact property."
 msgstr "Греш при бришење на вредноста за контакт."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ИД за контакт недостасува."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Недостасува ид за контакт."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Не беше поднесена патека за фотографија."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Не постои датотеката:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Грешка во вчитување на слика."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Грешка при преземањето на контакт објектот,"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Грешка при утврдувањето на карактеристиките на фотографијата."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Грешка при снимање на контактите."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Грешка при скалирање на фотографијата"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Грешка при сечење на фотографијата"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Грешка при креирањето на привремената фотографија"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Грешка при наоѓањето на фотографијата:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "име за елементот не е поставена."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "сумата за проверка не е поставена."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Неможе да се ажурира адресар со празно име."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Грешка при ажурирање на адресарот."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Грешка во снимање на контактите на диск."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Не можеше да се сними привремената фотографија:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Не можеше да се вчита привремената фотографија:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Жалам, оваа функционалност уште не е имплементирана"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Не е имплементирано"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Не можев да добијам исправна адреса."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Довлечкај VCF датотека да се внесат контакти."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Адресарот не е најден."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Ова не е во Вашиот адресар."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Контактот неможе да биде најден."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Адреса"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Телефон"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Е-пошта"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Организација"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Работа"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Дома"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Мобилен"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Текст"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Глас"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Порака"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Факс"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Видео"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Пејџер"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Интернет"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Роденден на {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Својството не смее да биде празно."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Не може да се серијализираат елементите."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Уреди го името"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Ниту еден фајл не е избран за вчитување."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Одбери тип"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Резултат: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "увезено,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "неуспешно."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Адресарот не е најден."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Ова не е во Вашиот адресар."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Контактот неможе да биде најден."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Адреса"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Телефон"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Е-пошта"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Организација"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Работа"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Дома"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Мобилен"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Текст"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Глас"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Порака"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Факс"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Пејџер"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Интернет"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Роденден"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Роденден на {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додади контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Внеси"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Адресари"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Затвои"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Конфигурирај адресар"
@@ -441,11 +501,7 @@ msgstr "Конфигурирај адресар"
 msgid "New Address Book"
 msgstr "Нов адресар"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Внеси од VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Врска за CardDav"
@@ -459,186 +515,195 @@ msgid "Edit"
 msgstr "Уреди"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Преземи го контактот"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Избриши го контактот"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Довлечкај фотографија за да се подигне"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Уреди детали за име"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Прекар"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Внеси прекар"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Роденден"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Групи"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Одвоете ги групите со запирка"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Уреди групи"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Претпочитано"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Ве молам внесете правилна адреса за е-пошта."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Внесете е-пошта"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Прати порака до адреса"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Избриши адреса за е-пошта"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Внесете телефонски број"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Избриши телефонски број"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Погледајте на мапа"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Уреди детали за адреса"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Внесете забелешки тука."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Додади поле"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Фотографија за профил"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Телефон"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Забелешка"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Избриши моментална фотографија"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Уреди моментална фотографија"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Подигни нова фотографија"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Уреди детали за име"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Прекар"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Внеси прекар"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Групи"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Одвоете ги групите со запирка"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Уреди групи"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Претпочитано"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Ве молам внесете правилна адреса за е-пошта."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Внесете е-пошта"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Прати порака до адреса"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Избриши адреса за е-пошта"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Внесете телефонски број"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Избриши телефонски број"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Погледајте на мапа"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Уреди детали за адреса"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Внесете забелешки тука."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Додади поле"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Телефон"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Забелешка"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Преземи го контактот"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Избриши го контактот"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Привремената слика е отстранета од кешот."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Уреди адреса"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Тип"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Поштенски фах"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Дополнително"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Улица"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Град"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Регион"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Поштенски код"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Држава"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Уреди категории"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Додади"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Адресар"
@@ -744,7 +809,6 @@ msgid "Submit"
 msgstr "Прати"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -764,33 +828,10 @@ msgstr "креирај нов адресар"
 msgid "Name of new addressbook"
 msgstr "Име на новиот адресар"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Внеси"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Внесување контакти"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Изберете адресар да се внесе:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Изберете од хард диск"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Немате контакти во Вашиот адресар."
@@ -803,18 +844,34 @@ msgstr "Додади контакт"
 msgid "Configure addressbooks"
 msgstr "Уреди адресари"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Адреса за синхронизација со CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "повеќе информации"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Примарна адреса"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index c6179ebf6f..679185b78f 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +34,89 @@ msgstr "Оваа категорија веќе постои:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Поставки"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Јануари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Февруари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Март"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Април"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Мај"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Јуни"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Јули"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Август"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Септември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Октомври"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Ноември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Декември"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Во ред"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Не е одбрана категорија за бришење."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ресетирање на Owncloud лозинка"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ресетирање на лозинка за ownCloud"
 
@@ -241,14 +246,10 @@ msgstr "Заврши го подесувањето"
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Поставки"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 010215ad8b..41b9f39120 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 8c1d5f72ca..1bab894cc6 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -6,104 +6,101 @@
 # Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2012.
 # Hafiz Ismail <mhbinet@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Ralat nyahaktif buku alamat."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Terdapat masalah menambah maklumat."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nama elemen tidak ditetapkan."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID tidak ditetapkan."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Tidak boleh menambah ruang kosong."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Sekurangnya satu ruangan alamat perlu diisikan."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "Cuba untuk letak nilai duplikasi:"
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Terdapat masalah menambah maklumat."
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "tiada ID diberi"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Ralat menetapkan checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Tiada kategori dipilih untuk dibuang."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Tiada buku alamat dijumpai."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Tiada kenalan dijumpai."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "ID Hilang"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Ralat VCard untuk ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Masalah menambah buku alamat."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Masalah mengaktifkan buku alamat."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Tiada ID kenalan yang diberi."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Ralat pada foto kenalan."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Ralat menyimpan fail sementara"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Foto muatan tidak sah."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -113,341 +110,400 @@ msgstr "Maklumat vCard tidak tepat. Sila reload semula halaman ini."
 msgid "Error deleting contact property."
 msgstr "Masalah memadam maklumat."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID Kenalan telah hilang."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Tiada direktori gambar yang diberi."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "Fail tidak wujud:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Ralat pada muatan imej."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Ralat mendapatkan objek pada kenalan."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Ralat mendapatkan maklumat gambar."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Ralat menyimpan kenalan."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Ralat mengubah saiz imej"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Ralat memotong imej"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Ralat mencipta imej sementara"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Ralat mencari imej: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "checksum tidak ditetapkan."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Maklumat tentang vCard tidak betul."
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Sesuatu tidak betul."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Masalah mengemaskini buku alamat."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Ralat memuatnaik senarai kenalan."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Fail yang dimuatnaik tidak lengkap"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Tiada fail dimuatnaik"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Direktori sementara hilang"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Tidak boleh menyimpan imej sementara: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Tidak boleh membuka imej sementara: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Maaf, fungsi ini masih belum boleh diguna lagi"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Tidak digunakan"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Tidak boleh mendapat alamat yang sah."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Ralat"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr ""
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Ini bukan buku alamat anda."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Hubungan tidak dapat ditemui"
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Alamat"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Emel"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organisasi"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Kerja"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Rumah"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mudah alih"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Teks"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Suara"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr ""
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Alat Kelui"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr ""
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr ""
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Hubungan"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Nilai ini tidak boleh kosong."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Tidak boleh menggabungkan elemen."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Ubah nama"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Tiada fail dipilih untuk muatnaik."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "PIlih jenis"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Hasil: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " import, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " gagal."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Buku alamat tidak dijumpai."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Ini bukan buku alamat anda."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Hubungan tidak dapat ditemui"
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Alamat"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Emel"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organisasi"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Kerja"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Rumah"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mudah alih"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Teks"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Suara"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Mesej"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Alat Kelui"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Hari lahir"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Hari Lahir {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tambah kenalan"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Senarai Buku Alamat"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Tutup"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigurasi Buku Alamat"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Sambungan CardDav"
@@ -461,185 +517,194 @@ msgid "Edit"
 msgstr "Sunting"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Muat turun hubungan"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Letak foto disini untuk muatnaik"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Padam hubungan"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Padam foto semasa"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "Ubah foto semasa"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Muatnaik foto baru"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Pilih foto dari ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "Ubah butiran nama"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Hari lahir"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
+msgstr "Nama Samaran"
 
 #: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Masukkan nama samaran"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Kumpulan"
+
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Asingkan kumpulan dengan koma"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "Ubah kumpulan"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Pilihan"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Berikan alamat emel yang sah."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
-msgstr ""
+msgstr "Masukkan alamat emel"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
-msgstr ""
+msgstr "Hantar ke alamat"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "Padam alamat emel"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "Masukkan nombor telefon"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "Padam nombor telefon"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "Lihat pada peta"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "Ubah butiran alamat"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "Letak nota disini."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
+msgstr "Letak ruangan"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Muat turun hubungan"
 
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Padam hubungan"
 
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
-
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Imej sementara telah dibuang dari cache."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "Ubah alamat"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Jenis"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Peti surat"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Sambungan"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Jalan"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "bandar"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Wilayah"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poskod"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Negara"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Tambah"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Negara"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -647,79 +712,79 @@ msgstr "Buku alamat"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Awalan nama"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Cik"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Cik"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Encik"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Tuan"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Puan"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Nama diberi"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Nama tambahan"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nama keluarga"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Awalan nama"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -746,77 +811,69 @@ msgid "Submit"
 msgstr "Hantar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Batal"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Import fail kenalan"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Sila pilih buku alamat"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Cipta buku alamat baru"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "Nama buku alamat"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "Import senarai kenalan"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Anda tidak mempunyai sebarang kenalan didalam buku alamat."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Letak kenalan"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "Konfigurasi buku alamat"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "alamat selarian CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
-msgstr ""
+msgstr "maklumat lanjut"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Alamat utama"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 1e876b63d1..ee0e7eeea2 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2011, 2012.
 # Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,99 +22,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "nama applikasi tidak disediakan"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Tiada kategori untuk di tambah?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "Kategori ini telah wujud"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Tetapan"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mac"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Jun"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julai"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Ogos"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Disember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Tidak"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "tiada kategori dipilih untuk penghapusan"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Ralat"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Penetapan kata laluan Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Set semula kata lalaun ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -178,7 +183,7 @@ msgstr "Bantuan"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Larangan akses"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -186,7 +191,7 @@ msgstr "Awan tidak dijumpai"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edit kategori"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
@@ -241,14 +246,10 @@ msgstr "Setup selesai"
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Tetapan"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 6220c70851..d008381d5d 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Padam"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 3c4fd0d429..291e1afa10 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,101 +11,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Et problem oppsto med å (de)aktivere adresseboken."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Et problem oppsto med å legge til kontakten."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id er ikke satt."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan ikke legge til tomt felt."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minst en av adressefeltene må oppgis."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Et problem oppsto med å legge til kontaktfeltet."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Ingen ID angitt"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Ingen kategorier valgt for sletting."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ingen adressebok funnet."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ingen kontakter funnet."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Manglende ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan ikke legge til en adressebok uten navn."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Et problem oppsto med å legge til adresseboken."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Et problem oppsto med å aktivere adresseboken."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Klarte ikke å lese kontaktbilde."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Klarte ikke å lagre midlertidig fil."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Bildet som lastes inn er ikke gyldig."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id er ikke satt."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
@@ -114,328 +110,391 @@ msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
 msgid "Error deleting contact property."
 msgstr "Et problem oppsto med å fjerne kontaktfeltet."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontakt-ID mangler."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Mangler kontakt-id."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Ingen filsti ble lagt inn."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Filen eksisterer ikke:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Klarte ikke å laste bilde."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Klarte ikke å lagre kontakt."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Klarte ikke å endre størrelse på bildet"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Klarte ikke å beskjære bildet"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Klarte ikke å lage et midlertidig bilde"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Kunne ikke finne bilde:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan ikke oppdatere adressebøker uten navn."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Et problem oppsto med å oppdatere adresseboken."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Kunne ikke lagre midlertidig bilde:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Kunne ikke laste midlertidig bilde:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
+msgstr "Feil"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Endre navn"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Velg type"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultat:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "importert,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "feilet."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresseboken ble ikke funnet."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internett"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
-msgstr "bursdagen til {name}"
+msgstr "{name}s bursdag"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ny kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Lukk"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfigurer adressebok"
@@ -444,11 +503,7 @@ msgstr "Konfigurer adressebok"
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importer fra VDF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAV-lenke"
@@ -462,193 +517,202 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Hend ned kontakten"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Slett kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Dra bilder hit for å laste opp"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Endre detaljer rundt navn"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Skriv inn kallenavn"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Bursdag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-åååå"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupper"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Skill gruppene med komma"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Endre grupper"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Foretrukket"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Vennligst angi en gyldig e-postadresse."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Skriv inn e-postadresse"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Send e-post til adresse"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Fjern e-postadresse"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Skriv inn telefonnummer"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Fjern telefonnummer"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Se på kart"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Endre detaljer rundt adresse"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Legg inn notater her."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Legg til felt"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilbilde"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Notat"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Fjern nåværende bilde"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Rediger nåværende bilde"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Last opp nytt bilde"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Endre detaljer rundt navn"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Skriv inn kallenavn"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-åååå"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupper"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Skill gruppene med komma"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Endre grupper"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Foretrukket"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Vennligst angi en gyldig e-postadresse."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Skriv inn e-postadresse"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Send e-post til adresse"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Fjern e-postadresse"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Skriv inn telefonnummer"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Fjern telefonnummer"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Se på kart"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Endre detaljer rundt adresse"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Legg inn notater her."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Legg til felt"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Notat"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Hend ned kontakten"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Slett kontakt"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Det midlertidige bildet er fjernet fra cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Endre adresse"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Utvidet"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gate"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "By"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Området"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Endre kategorier"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Ny"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressebok"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Ærestitler"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
@@ -747,7 +811,6 @@ msgid "Submit"
 msgstr "Lagre"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -767,33 +830,10 @@ msgstr "Lag ny adressebok"
 msgid "Name of new addressbook"
 msgstr "Navn på ny adressebok"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importerer kontakter"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontakter i din adressebok"
@@ -806,18 +846,34 @@ msgstr "Ny kontakt"
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøker"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Synkroniseringsadresse for CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mer info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 235bd24a6b..b22e6e9fc1 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,83 +37,87 @@ msgstr "Denne kategorien finnes allerede:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nei"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ingen kategorier merket for sletting."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "OwnCloud passordtilbakestilling"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
 
@@ -243,14 +247,10 @@ msgstr "Fullfør oppsetting"
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Innstillinger"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 94f07c07b4..60ac64821f 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Slett"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "opprettet ZIP-fil, dette kan ta litt tid"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index af8b706fd4..a67a573689 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,101 +12,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Fout bij het (de)activeren van het adresboek."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Er was een fout bij het toevoegen van het contact."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "onderdeel naam is niet opgegeven."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id is niet ingesteld."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan geen lege eigenschap toevoegen."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minstens één van de adresvelden moet ingevuld worden."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Eigenschap bestaat al: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Fout bij het toevoegen van de contacteigenschap."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Geen ID opgegeven"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Instellen controlegetal mislukt"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Geen categorieën geselecteerd om te verwijderen."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Geen adresboek gevonden"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Geen contracten gevonden"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Ontbrekend ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Fout bij inlezen VCard voor ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan geen adresboek toevoegen zonder naam."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Fout bij het toevoegen van het adresboek."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Fout bij het activeren van het adresboek."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Geen contact ID opgestuurd."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Lezen van contact foto mislukt."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Tijdelijk bestand opslaan mislukt."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "De geladen foto is niet goed."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id is niet ingesteld."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
@@ -115,231 +111,185 @@ msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 msgid "Error deleting contact property."
 msgstr "Fout bij het verwijderen van de contacteigenschap."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Contact ID ontbreekt."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Ontbrekende contact id."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Geen fotopad opgestuurd."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Bestand bestaat niet:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Fout bij laden plaatje."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "onderdeel naam is niet opgegeven."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "controlegetal is niet opgegeven."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan adresboek zonder naam niet wijzigen"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Fout bij het updaten van het adresboek."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Het bestand overschrijdt de upload_max_filesize instelling in php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacten"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Sleep een VCF bestand om de contacten te importeren."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -352,91 +302,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresboek niet gevonden."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Verjaardag"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}'s verjaardag"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contact"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Contact toevoegen"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importeer"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresboeken"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Instellen adresboeken"
@@ -445,11 +504,7 @@ msgstr "Instellen adresboeken"
 msgid "New Address Book"
 msgstr "Nieuw Adresboek"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importeer uit VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Link"
@@ -463,186 +518,195 @@ msgid "Edit"
 msgstr "Bewerken"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Download contact"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Verwijder contact"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Verwijder foto uit upload"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Wijzig naam gegevens"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Roepnaam"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Voer roepnaam in"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Verjaardag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Groepen"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Gebruik komma bij meerder groepen"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Wijzig groepen"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Voorkeur"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Geef een geldig email adres op."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Voer email adres in"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Mail naar adres"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Verwijder email adres"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Voer telefoonnummer in"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Verwijdere telefoonnummer"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Bekijk op een kaart"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Wijzig adres gegevens"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Voeg notitie toe"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Voeg veld toe"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profiel foto"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefoon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Notitie"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Verwijdere huidige foto"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Wijzig huidige foto"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Upload nieuwe foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Wijzig naam gegevens"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Roepnaam"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Voer roepnaam in"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Groepen"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Gebruik komma bij meerder groepen"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Wijzig groepen"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Voorkeur"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Geef een geldig email adres op."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Voer email adres in"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Mail naar adres"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Verwijder email adres"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Voer telefoonnummer in"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Verwijdere telefoonnummer"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Bekijk op een kaart"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Wijzig adres gegevens"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Voeg notitie toe"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Voeg veld toe"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefoon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Notitie"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Download contact"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Verwijder contact"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Wijzig adres"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postbus"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Uitgebreide"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Straat"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regio"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postcode"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Wijzig categorieën"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Voeg toe"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresboek"
@@ -748,7 +812,6 @@ msgid "Submit"
 msgstr "Opslaan"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuleren"
 
@@ -768,33 +831,10 @@ msgstr "Maak een nieuw adresboek"
 msgid "Name of new addressbook"
 msgstr "Naam van nieuw adresboek"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importeer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importeren van contacten"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selecteer adresboek voor import:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Selecteer van schijf"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Je hebt geen contacten in je adresboek"
@@ -807,18 +847,34 @@ msgstr "Contactpersoon toevoegen"
 msgid "Configure addressbooks"
 msgstr "Bewerken adresboeken"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synchroniseert de adressen"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "meer informatie"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Standaardadres"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "IOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 1bdd585b7e..587342c1fc 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -6,16 +6,17 @@
 #   <bart.formosus@gmail.com>, 2011.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011.
+#   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,83 +39,87 @@ msgstr "De categorie bestaat al."
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Instellingen"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Geen categorie geselecteerd voor verwijdering."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reset je ownCloud wachtwoord"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
 
@@ -244,14 +249,10 @@ msgstr "Installatie afronden"
 msgid "web services under your control"
 msgstr "webdiensten die je beheerst"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Instellingen"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Uw wachtwoord vergeten?"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f7f4ade327..fd294e92b5 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -66,14 +66,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 93385875c2..ceeea1a2bd 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,101 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Det kom ei feilmelding då kontakta vart lagt til."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan ikkje leggja til tomt felt."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minst eit av adressefelta må fyllast ut."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Eit problem oppstod ved å leggja til kontakteltet."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Eit problem oppstod ved å leggja til adresseboka."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Eit problem oppstod ved aktivering av adresseboka."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
@@ -112,231 +108,185 @@ msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 msgid "Error deleting contact property."
 msgstr "Eit problem oppstod ved å slette kontaktfeltet."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Eit problem oppstod ved å oppdatere adresseboka."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,91 +299,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Legg til kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -442,11 +501,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav lenkje"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "Endra"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Last ned kontakt"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Slett kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Bursdag"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Føretrekt"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefonnummer"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Føretrekt"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefonnummer"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Last ned kontakt"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Slett kontakt"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Skriv"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Utvida"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gate"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region/fylke"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Land"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Legg til"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Land"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "Send"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Kanseller"
 
@@ -765,33 +828,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index f8af21ff3e..6374219085 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,51 +35,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Innstillingar"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -108,10 +116,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud Passord tilbakestilling"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -241,14 +245,10 @@ msgstr "Fullfør oppsettet"
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Innstillingar"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 1bd790c788..5d14be6b12 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Slett"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 2219380006..c6c1bf1a2d 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,101 +11,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Błąd (de)aktywowania książki adresowej."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Wystąpił błąd podczas dodawania kontaktu."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nazwa elementu nie jest ustawiona."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id nie ustawione."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nie można dodać pustego elementu."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Należy wypełnić przynajmniej jedno pole adresu."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Próba dodania z duplikowanej właściwości:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Błąd dodawania elementu."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Brak opatrzonego ID "
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Błąd ustawień sumy kontrolnej"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nie zaznaczono kategorii do usunięcia"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nie znaleziono książek adresowych"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nie znaleziono kontaktów."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Brak ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nie można dodać książki adresowej z pusta nazwą"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Błąd dodawania książki adresowej."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Błąd aktywowania książki adresowej."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "ID kontaktu nie został utworzony."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Błąd odczytu zdjęcia kontaktu."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Wystąpił błąd podczas zapisywania pliku tymczasowego."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Wczytywane zdjęcie nie jest poprawne."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id nie ustawione."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
@@ -114,328 +110,391 @@ msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 msgid "Error deleting contact property."
 msgstr "Błąd usuwania elementu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Brak kontaktu id."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Brak kontaktu id."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Ścieżka do zdjęcia nie została podana."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Plik nie istnieje:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Błąd ładowania obrazu."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Błąd pobrania kontaktu."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Błąd uzyskiwania właściwości ZDJĘCIA."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Błąd zapisu kontaktu."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Błąd zmiany rozmiaru obrazu"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Błąd przycinania obrazu"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Błąd utworzenia obrazu tymczasowego"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Błąd znajdowanie obrazu: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "nazwa elementu nie jest ustawiona."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum-a nie ustawiona"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Błąd uaktualniania książki adresowej."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nie było błędów, plik wyczytano poprawnie."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Załadowany plik przekracza wielkość upload_max_filesize w php.ini "
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Załadowany plik tylko częściowo został wysłany."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Plik nie został załadowany"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Brak folderu tymczasowego"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Nie można zapisać obrazu tymczasowego: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Nie można wczytać obrazu tymczasowego: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Plik nie został załadowany. Nieznany błąd"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Niestety, ta funkcja nie została jeszcze zaimplementowana"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Nie wdrożono"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Nie można pobrać prawidłowego adresu."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Upuść plik VCF do importu kontaktów."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Nie znaleziono książki adresowej"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "To nie jest Twoja książka adresowa."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Nie można odnaleźć kontaktu."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adres"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-mail"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organizacja"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Praca"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Dom"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Komórka"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Połączenie tekstowe"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Połączenie głosowe"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Wiadomość"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Połączenie wideo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name} Urodzony"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Ta właściwość nie może być pusta."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Nie można serializować elementów."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Zmień nazwę"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Wybierz typ"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Wynik: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importowane, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "  nie powiodło się."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Nie znaleziono książki adresowej"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "To nie jest Twoja książka adresowa."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Nie można odnaleźć kontaktu."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adres"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organizacja"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Praca"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Dom"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Komórka"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Połączenie tekstowe"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Połączenie głosowe"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Wiadomość"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Połączenie wideo"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Urodziny"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} Urodzony"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Książki adresowe"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zamknij"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfiguruj książkę adresową"
@@ -444,11 +503,7 @@ msgstr "Konfiguruj książkę adresową"
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importuj z VFC"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Wyświetla odnośnik CardDav"
@@ -462,186 +517,195 @@ msgid "Edit"
 msgstr "Edytuje książkę adresową"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Usuwa książkę adresową"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Pobiera kontakt"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Usuwa kontakt"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Upuść fotografię aby załadować"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Edytuj szczegóły nazwy"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Nazwa"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Wpisz nazwę"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Urodziny"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-rrrr"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupy"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Oddziel grupy przecinkami"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Edytuj grupy"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferowane"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Określ prawidłowy adres e-mail."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Wpisz adres email"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Mail na adres"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Usuń adres mailowy"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Wpisz numer telefonu"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Usuń numer telefonu"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Zobacz na mapie"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Edytuj szczegóły adresu"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Dodaj notatkę tutaj."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Dodaj pole"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Zdjęcie profilu"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Uwaga"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Usuń aktualne zdjęcie"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Edytuj aktualne zdjęcie"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Wczytaj nowe zdjęcie"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Wybierz zdjęcie z ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Edytuj szczegóły nazwy"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Nazwa"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Wpisz nazwę"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-rrrr"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupy"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Oddziel grupy przecinkami"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Edytuj grupy"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferowane"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Określ prawidłowy adres e-mail."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Wpisz adres email"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Mail na adres"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Usuń adres mailowy"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Wpisz numer telefonu"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Usuń numer telefonu"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Zobacz na mapie"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Edytuj szczegóły adresu"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Dodaj notatkę tutaj."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Dodaj pole"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Uwaga"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Pobiera kontakt"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Usuwa kontakt"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Tymczasowy obraz został usunięty z pamięci podręcznej."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Edytuj adres"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Skrzynka pocztowa"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Rozszerzony"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Miasto"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Kod pocztowy"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Kraj"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edytuj kategorie"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Książka adresowa"
@@ -747,7 +811,6 @@ msgid "Submit"
 msgstr "Potwierdź"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -767,33 +830,10 @@ msgstr "utwórz nową książkę adresową"
 msgid "Name of new addressbook"
 msgstr "Nazwa nowej książki adresowej"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "importuj kontakty"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Zaznacz książkę adresową do importu do:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Wybierz z HD"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
@@ -806,18 +846,34 @@ msgstr "Dodaj kontakt"
 msgid "Configure addressbooks"
 msgstr "Konfiguruj książkę adresową"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "adres do synchronizacji CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "więcej informacji"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Pierwszy adres"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 905b545290..5049bce7f6 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
@@ -12,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,85 +37,89 @@ msgstr "Ta kategoria już istnieje"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Tak"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nie ma kategorii zaznaczonych do usunięcia."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Resetowanie hasła"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "restart hasła"
 
@@ -244,14 +249,10 @@ msgstr "Zakończ konfigurowanie"
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ustawienia"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 89fc6e75af..8f4aad1f4e 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Usuwa element"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "wróć"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "skasuj"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index b53b2545d6..ff5aef8d74 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -4,77 +4,42 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 10:41+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Zdjęcia"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Udostępnij galerię"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Błąd: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Błąd wewnętrzny"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Przeszukaj"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stop"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Współdziel"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Pokaz slajdów"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index f2be42ae68..9f9833ac2d 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -5,106 +5,102 @@
 # Translators:
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
-# Van Der Fran <transifex@vanderland.com>, 2011.
+# Van Der Fran <transifex@vanderland.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Erro ao (des)ativar agenda."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Ocorreu um erro ao adicionar o contato."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nome do elemento não definido."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID não definido."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Não é possível adicionar propriedade vazia."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Pelo menos um dos campos de endereço tem que ser preenchido."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Tentando adiciona propriedade duplicada:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Erro ao adicionar propriedade de contato."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID fornecido"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Erro ajustando checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nenhum categoria selecionada para remoção."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nenhuma agenda de endereços encontrada."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nenhum contato encontrado."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Faltando ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro de identificação VCard para ID:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Não é possivel adicionar uma agenda de endereços com o nome em branco."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Erro ao adicionar agenda."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Erro ao ativar agenda."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nenhum ID do contato foi submetido."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erro de leitura na foto do contato."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erro ao salvar arquivo temporário."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Foto carregada não é válida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID não definido."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
@@ -113,328 +109,391 @@ msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página.
 msgid "Error deleting contact property."
 msgstr "Erro ao excluir propriedade de contato."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID do contato está faltando."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Faltando ID do contato."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nenhum caminho para foto foi submetido."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Arquivo não existe:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Erro ao carregar imagem."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erro ao obter propriedade de contato."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erro ao obter propriedade da FOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erro ao salvar contato."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erro ao modificar tamanho da imagem"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erro ao recortar imagem"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erro ao criar imagem temporária"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Erro ao localizar imagem:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "nome do elemento não definido."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum não definido."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Não é possível atualizar sua agenda com um nome em branco."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Erro ao atualizar agenda."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Arquivo enviado com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi parcialmente carregado"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo carregado"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Diretório temporário não encontrado"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Não foi possível salvar a imagem temporária:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Não foi possível carregar a imagem temporária:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contatos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Desculpe, esta funcionalidade não foi implementada ainda"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "não implementado"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Não foi possível obter um endereço válido."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Arraste um arquivo VCF para importar contatos."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Lista de endereços não encontrado."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Esta não é a sua agenda de endereços."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Contato não pôde ser encontrado."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Endereço"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefone"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-mail"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organização"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Trabalho"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Home"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Móvel"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Mensagem"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Aniversário de {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contato"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Esta propriedade não pode estar vazia."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Não foi possível serializar elementos."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Editar nome"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Nenhum arquivo selecionado para carregar."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Selecione o tipo"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultado:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "importado,"
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "falhou."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Lista de endereços não encontrado."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Esta não é a sua agenda de endereços."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Contato não pôde ser encontrado."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Endereço"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefone"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organização"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Trabalho"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Home"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Móvel"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Mensagem"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Aniversário de {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contato"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Agendas de Endereço"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Fechar."
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configurar Livro de Endereços"
@@ -443,11 +502,7 @@ msgstr "Configurar Livro de Endereços"
 msgid "New Address Book"
 msgstr "Nova agenda"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importar de VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Link CardDav"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Baixar contato"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Apagar contato"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Arraste a foto para ser carregada"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Editar detalhes do nome"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Apelido"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Digite o apelido"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversário"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-aaaa"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupos"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separe grupos por virgula"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editar grupos"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferido"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Por favor, especifique um email válido."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Digite um endereço de email"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Correio para endereço"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Remover endereço de email"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Digite um número de telefone"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Remover número de telefone"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Visualizar no mapa"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Editar detalhes de endereço"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Adicionar notas"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Adicionar campo"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Imagem do Perfil"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefone"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Nota"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Deletar imagem atual"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Editar imagem atual"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Carregar nova foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Selecionar foto do OwnCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Editar detalhes do nome"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Apelido"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Digite o apelido"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-aaaa"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupos"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separe grupos por virgula"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editar grupos"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferido"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Por favor, especifique um email válido."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Digite um endereço de email"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Correio para endereço"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Remover endereço de email"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Digite um número de telefone"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Remover número de telefone"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Visualizar no mapa"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Editar detalhes de endereço"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Adicionar notas"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Adicionar campo"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefone"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Nota"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Baixar contato"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Apagar contato"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "A imagem temporária foi removida cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editar endereço"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Digite"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Caixa Postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Estendido"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rua"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Região"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "CEP"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adicionar"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Agenda de Endereço"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -766,33 +829,10 @@ msgstr "Criar nova agenda de endereços"
 msgid "Name of new addressbook"
 msgstr "Nome da nova agenda de endereços"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importar contatos"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selecione agenda de endereços para importar ao destino:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Selecione do disco rigído"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Voce não tem contatos em sua agenda de endereços."
@@ -805,18 +845,34 @@ msgstr "Adicionar contatos"
 msgid "Configure addressbooks"
 msgstr "Configurar agenda de endereços"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Sincronizando endereços CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "leia mais"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Endereço primário(Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 0c9e514fdb..2e90ce266f 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -6,15 +6,16 @@
 #   <duda.nogueira@metasys.com.br>, 2011.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
+# Unforgiving Fallout <>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,85 +36,89 @@ msgstr "Essa categoria já existe"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Configurações"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Março"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nenhuma categoria selecionada para deletar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Mudar senha do Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
@@ -243,14 +248,10 @@ msgstr "Concluir configuração"
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Configurações"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Esqueçeu sua senha?"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index bb08e22da8..66f9894b6a 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "gerando arquivo ZIP, isso pode levar um tempo."
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 4b0f48cbee..c76d7bf6d2 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,101 +10,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Erro a (des)ativar o livro de endereços"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Erro ao adicionar contato"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "o nome do elemento não está definido."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id não está definido"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Não é possivel adicionar uma propriedade vazia"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "A tentar adicionar propriedade duplicada: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Erro ao adicionar propriedade do contato"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID inserido"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Erro a definir checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nenhuma categoria selecionada para eliminar."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nenhum livro de endereços encontrado."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nenhum contacto encontrado."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Falta ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro a analisar VCard para o ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Não é possivel adicionar Livro de endereços com nome vazio."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Erro ao adicionar livro de endereços"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Erro ao ativar livro de endereços"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nenhum ID de contacto definido."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erro a ler a foto do contacto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erro a guardar ficheiro temporário."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "A foto carregada não é valida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id não está definido"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A informação sobre o vCard está incorreta. Por favor refresque a página"
@@ -113,328 +109,391 @@ msgstr "A informação sobre o vCard está incorreta. Por favor refresque a pág
 msgid "Error deleting contact property."
 msgstr "Erro ao apagar propriedade do contato"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta o ID do contacto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Falta o ID do contacto."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nenhum caminho da foto definido."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "O ficheiro não existe:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Erro a carregar a imagem."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erro a obter o objecto dos contactos"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erro a obter a propriedade Foto"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erro a guardar o contacto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erro a redimensionar a imagem"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erro a recorar a imagem"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erro a criar a imagem temporária"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Erro enquanto pesquisava pela imagem: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "o nome do elemento não está definido."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "Checksum não está definido."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Erro a atualizar o livro de endereços"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro a carregar os contactos para o armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Não ocorreu erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Está a faltar a pasta temporária"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Não foi possível guardar a imagem temporária: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Não é possível carregar a imagem temporária: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Desculpe, esta funcionalidade ainda não está implementada"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Não implementado"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Não foi possível obter um endereço válido."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Livro de endereços não encontrado."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Esta não é a sua lista de contactos"
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "O contacto não foi encontrado"
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Morada"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefone"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Email"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organização"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Emprego"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Casa"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Telemovel"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Mensagem"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "Aniversário de {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Esta propriedade não pode estar vazia."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Não foi possivel serializar os elementos"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Editar nome"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Nenhum ficheiro seleccionado para enviar."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Seleccionar tipo"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Resultado: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " importado, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " falhou."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Livro de endereços não encontrado."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Esta não é a sua lista de contactos"
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "O contacto não foi encontrado"
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Morada"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefone"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organização"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Emprego"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Casa"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Telemovel"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Mensagem"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Aniversário de {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Livros de endereços"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Fechar"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configurar livros de endereços"
@@ -443,11 +502,7 @@ msgstr "Configurar livros de endereços"
 msgid "New Address Book"
 msgstr "Novo livro de endereços"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importar de VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Endereço CardDav"
@@ -461,197 +516,206 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Apagar"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Transferir contacto"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Apagar contato"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Arraste e solte fotos para carregar"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Editar detalhes do nome"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Alcunha"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Introduza alcunha"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversário"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-aaaa"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupos"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separe os grupos usando virgulas"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editar grupos"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferido"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Por favor indique um endereço de correio válido"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Introduza endereço de email"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Enviar correio para o endereço"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Eliminar o endereço de correio"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Insira o número de telefone"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Eliminar o número de telefone"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Ver no mapa"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Editar os detalhes do endereço"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Insira notas aqui."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Adicionar campo"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Foto do perfil"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefone"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Nota"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Eliminar a foto actual"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Editar a foto actual"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
-msgstr ""
+msgstr "Carregar nova foto"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Selecionar uma foto da ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Editar detalhes do nome"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Alcunha"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Introduza alcunha"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-aaaa"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupos"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separe os grupos usando virgulas"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editar grupos"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferido"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Por favor indique um endereço de correio válido"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Introduza endereço de email"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Enviar correio para o endereço"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Eliminar o endereço de correio"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Insira o número de telefone"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Eliminar o número de telefone"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Ver no mapa"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Editar os detalhes do endereço"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Insira notas aqui."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Adicionar campo"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefone"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Nota"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Transferir contacto"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Apagar contato"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "A imagem temporária foi retirada do cache."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editar endereço"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Apartado"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extendido"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rua"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Região"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Código Postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adicionar"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Livro de endereços"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Prefixos honoráveis"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Menina"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
@@ -667,7 +731,7 @@ msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Senhora"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
@@ -675,7 +739,7 @@ msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Nome introduzido"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
@@ -687,39 +751,39 @@ msgstr "Nome de familia"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Sufixos Honoráveis"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "D.J."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "D.M."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "r."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Submeter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -764,38 +827,15 @@ msgstr "Criar um novo livro de endereços"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
+msgstr "Nome do novo livro de endereços"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "A importar os contactos"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Não tem contactos no seu livro de endereços."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -803,20 +843,36 @@ msgstr "Adicionar contacto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "Configurar livros de endereços"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV a sincronizar endereços"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mais informação"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Endereço primario (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index c1427407a8..31d1426a47 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Esta categoria já existe:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Definições"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Março"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nenhuma categoria seleccionar para eliminar"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Redefinir palavra-chave ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
 
@@ -242,14 +246,10 @@ msgstr "Acabar instalação"
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Definições"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Esqueceu a sua password?"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index c1eaa89957..346dbc3139 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Apagar"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo."
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 1a257a7947..0cff9f1cd5 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,101 +10,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "(Dez)activarea agendei a întâmpinat o eroare."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "O eroare a împiedicat adăugarea contactului."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "numele elementului nu este stabilit."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID-ul nu este stabilit"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nu se poate adăuga un câmp gol."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Cel puțin unul din câmpurile adresei trebuie completat."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Contactul nu a putut fi adăugat."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nici un ID nu a fost furnizat"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Eroare la stabilirea sumei de control"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nici o categorie selectată pentru ștergere"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nici o carte de adrese găsită"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nici un contact găsit"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID lipsă"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nu e posibil de adăugat o carte de adrese fără nume"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Agenda nu a putut fi adăugată."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Eroare la activarea agendei."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nici un ID de contact nu a fost transmis"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Eroare la citerea fotografiei de contact"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Eroare la salvarea fișierului temporar."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Fotografia care se încarcă nu este validă."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID-ul nu este stabilit"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina."
@@ -113,231 +109,185 @@ msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pag
 msgid "Error deleting contact property."
 msgstr "Eroare la ștergerea proprietăților contactului."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID-ul de contact lipsește."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "ID de contact lipsă."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nici o adresă către fotografie nu a fost transmisă"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Fișierul nu există:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Eroare la încărcarea imaginii."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "numele elementului nu este stabilit."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "suma de control nu este stabilită."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Eroare la actualizarea agendei."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacte"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -350,91 +300,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mesaj"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Zi de naștere"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Ziua de naștere a {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contact"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adaugă contact"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Agende"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -443,11 +502,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Agendă nouă"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Legătură CardDev"
@@ -461,185 +516,194 @@ msgid "Edit"
 msgstr "Editează"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Descarcă acest contact"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Șterge contact"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Introdu detalii despre nume"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Introdu pseudonim"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Zi de naștere"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "zz-ll-aaaa"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Grupuri"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Separă grupurile cu virgule"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Editează grupuri"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Preferat"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Te rog să specifici un e-mail corect"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Introdu adresa de e-mail"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Trimite mesaj la e-mail"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Șterge e-mail"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Introdu detalii despre nume"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Pseudonim"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Introdu pseudonim"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "zz-ll-aaaa"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Grupuri"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Separă grupurile cu virgule"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Editează grupuri"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Preferat"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Te rog să specifici un e-mail corect"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Introdu adresa de e-mail"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Trimite mesaj la e-mail"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Șterge e-mail"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Descarcă acest contact"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Șterge contact"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tip"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "CP"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extins"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Stradă"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Oraș"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regiune"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Cod poștal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Țară"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adaugă"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Țară"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Trimite"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -766,33 +829,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -805,18 +845,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 3aed0fedf4..c718775f6e 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,51 +36,59 @@ msgstr "Această categorie deja există:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Configurări"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -109,10 +117,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Resetarea parolei ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
 
@@ -242,14 +246,10 @@ msgstr "Finalizează instalarea"
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Configurări"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index ef7d5e76b6..d936c43c2c 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index 32c4700f8d..1d841d6166 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -7,25 +7,34 @@
 #   <jekader@gmail.com>, 2011, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
+# Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:20+0000\n"
+"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Не все календари полностью кешированы"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Все, вроде бы, закешировано"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Календари не найдены."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "События не найдены."
 
@@ -33,300 +42,395 @@ msgstr "События не найдены."
 msgid "Wrong calendar"
 msgstr "Неверный календарь"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Файл либо не собержит событий, либо все события уже есть в календаре"
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "события были сохранены в новый календарь"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Ошибка импорта"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "события были сохранены в вашем календаре"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Новый часовой пояс:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Часовой пояс изменён"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календарь"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ддд"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ддд М/д"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "дддд М/д"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "ММММ гггг"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "дддд, МММ д, гггг"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Бизнес"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Звонить"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клиенты"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Доставщик"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Праздники"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Поездка"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Юбилей"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Встреча"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Другое"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Личное"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Проекты"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Вопросы"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "без имени"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Новый Календарь"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не повторяется"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Еженедельно"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "По будням"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Каждые две недели"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Каждый месяц"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Каждый год"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "никогда"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "по числу повторений"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "по дате"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "по дню месяца"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "по дню недели"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Понедельник"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Среда"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Четверг"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Пятница"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Суббота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "неделя месяца"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "первая"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "вторая"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "третья"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "червётрая"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "пятая"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "последняя"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Январь"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Февраль"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Март"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Апрель"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Май"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Июнь"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Июль"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Август"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Сентябрь"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Октябрь"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Ноябрь"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Декабрь"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "по дате событий"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "по дням недели"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "по номерам недели"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "по дню и месяцу"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Дата"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Кал."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Вс."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Пн."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Вт."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Ср."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Чт."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Пт."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Сб."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Янв."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Фев."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Мар."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Апр."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Май."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Июн."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Июл."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Авг."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Сен."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Окт."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Ноя."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Дек."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Весь день"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Новый Календарь"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Незаполненные поля"
@@ -360,27 +464,27 @@ msgstr "Окончание события раньше, чем его начал
 msgid "There was a database fail"
 msgstr "Ошибка базы данных"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Неделя"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Список"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Сегодня"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Не удалось обработать файл."
 
@@ -393,7 +497,7 @@ msgid "Your calendars"
 msgstr "Ваши календари"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Ссылка для CalDav"
 
@@ -405,19 +509,19 @@ msgstr "Общие календари"
 msgid "No shared calendars"
 msgstr "Нет общих календарей"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Сделать календарь общим"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Редактировать"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Удалить"
@@ -503,23 +607,23 @@ msgstr "Разделяйте категории запятыми"
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Событие на весь день"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "От"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Дополнительные параметры"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Место"
 
@@ -527,7 +631,7 @@ msgstr "Место"
 msgid "Location of the Event"
 msgstr "Место события"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Описание"
 
@@ -535,84 +639,86 @@ msgstr "Описание"
 msgid "Description of the Event"
 msgstr "Описание события"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повтор"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Выбрать дни недели"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Выбрать дни"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "и день года события"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "и день месяца события"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Выбрать месяцы"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Выбрать недели"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "и номер недели события"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Интервал"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Окончание"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "повторений"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Импортировать календарь из файла"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Пожалуйста, выберите календарь"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Создать новый календарь"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Импортировать календарь из файла"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Пожалуйста, выберите календарь"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Название нового календаря"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Импортировать"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Импортируется календарь"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Календарь успешно импортирован"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Закрыть Сообщение"
 
@@ -628,17 +734,13 @@ msgstr "Показать событие"
 msgid "No categories selected"
 msgstr "Категории не выбраны"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Выбрать категорию"
-
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "из"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
-msgstr ""
+msgstr "на"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -664,9 +766,33 @@ msgstr "12ч"
 msgid "First day of the week"
 msgstr "Первый день недели"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Адрес синхронизации календаря CalDAV:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "подробнее"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index f44e9700f0..a7988b19f4 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -9,105 +9,102 @@
 #   <lankme@gmail.com>, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
+# Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Ошибка (де)активации адресной книги."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Произошла ошибка при добавлении контакта."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "имя элемента не установлено."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id не установлен."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Невозможно добавить пустой параметр."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Как минимум одно поле адреса должно быть заполнено."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
+msgstr "При попытке добавить дубликат:"
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Ошибка добавления информации к контакту."
-
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID не предоставлен"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Ошибка установки контрольной суммы."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Категории для удаления не установлены."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Адресные книги не найдены."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Контакты не найдены."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Отсутствует ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Ошибка обработки VCard для ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Нельзя добавить адресную книгу без имени."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Ошибка добавления адресной книги."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Ошибка активации адресной книги."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Нет контакта ID"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Ошибка чтения фотографии контакта."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Ошибка сохранения временного файла."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Загружаемая фотография испорчена."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id не установлен."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информация о vCard некорректна. Пожалуйста, обновите страницу."
@@ -116,328 +113,391 @@ msgstr "Информация о vCard некорректна. Пожалуйст
 msgid "Error deleting contact property."
 msgstr "Ошибка удаления информации из контакта."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID контакта отсутствует."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Нет фото по адресу."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Файл не существует:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Ошибка загрузки картинки."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Ошибка при получении контактов"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Ошибка при получении ФОТО."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Ошибка при сохранении контактов."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Ошибка изменения размера изображений"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Ошибка обрезки изображений"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Ошибка создания временных изображений"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Ошибка поиска изображений:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "имя элемента не установлено."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "контрольная сумма не установлена."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Что-то пошло FUBAR."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Нельзя обновить адресную книгу с пустым именем."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Ошибка обновления адресной книги."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ошибка загрузки контактов в хранилище."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл загружен успешно."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл загружен частично"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временная папка"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Не удалось сохранить временное изображение:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Не удалось загрузить временное изображение:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Контакты"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "К сожалению, эта функция не была реализована"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Не реализовано"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Не удалось получить адрес."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Адресная книга не найдена."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Это не ваша адресная книга."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Контакт не найден."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Адрес"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Телефон"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Ящик эл. почты"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Организация"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Рабочий"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Домашний"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Мобильный"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Текст"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Голос"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Сообщение"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Факс"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Видео"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Пейджер"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Интернет"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "День рождения {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Это свойство должно быть не пустым."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Не удалось сериализовать элементы."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Изменить имя"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Нет выбранных файлов для загрузки."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Выберите тип"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Результат:"
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr "импортировано, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr "не удалось."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Адресная книга не найдена."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Это не ваша адресная книга."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Контакт не найден."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Адрес"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Телефон"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Ящик эл. почты"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Организация"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Рабочий"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Домашний"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Текст"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Голос"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Сообщение"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Факс"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Пейджер"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Интернет"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "День рождения"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "День рождения {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Добавить Контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Импорт"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Адресные книги"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Закрыть"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Настроить Адресную книгу"
@@ -446,11 +506,7 @@ msgstr "Настроить Адресную книгу"
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Импортировать из VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Ссылка CardDAV"
@@ -464,217 +520,226 @@ msgid "Edit"
 msgstr "Редактировать"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Скачать контакт"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Удалить контакт"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Перетяните фотографии для загрузки"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Псевдоним"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Введите псевдоним"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "День рождения"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Группы"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Редактировать группы"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Предпочитаемый"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Укажите действительный адрес электронной почты."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Укажите адрес электронной почты"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Написать по адресу"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Удалить адрес электронной почты"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Ввести номер телефона"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Удалить номер телефона"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Показать на карте"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Ввести детали адреса"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Добавьте заметки здесь."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Добавить поле"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Фото профиля"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Телефон"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Заметка"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Удалить текущую фотографию"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Редактировать текущую фотографию"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Загрузить новую фотографию"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Выбрать фотографию из ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Формат Краткое имя, Полное имя"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Изменить детали имени"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Псевдоним"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Введите псевдоним"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Группы"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Разделить группы запятыми"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Редактировать группы"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Предпочитаемый"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Укажите действительный адрес электронной почты."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Укажите адрес электронной почты"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Написать по адресу"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Удалить адрес электронной почты"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Ввести номер телефона"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Удалить номер телефона"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Показать на карте"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Ввести детали адреса"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Добавьте заметки здесь."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Добавить поле"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Телефон"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Заметка"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Скачать контакт"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Удалить контакт"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Временный образ был удален из кэша."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Редактировать адрес"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Тип"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "АО"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Расширенный"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Улица"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Город"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Область"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Почтовый индекс"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Страна"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Редактировать категрии"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Добавить"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Адресная книга"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Уважительные префиксы"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Мисс"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Г-жа"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Г-н"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Сэр"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Г-жа"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Доктор"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -690,39 +755,39 @@ msgstr "Фамилия"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Hon. suffixes"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Уважительные суффиксы"
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -749,7 +814,6 @@ msgid "Submit"
 msgstr "Отправить"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -769,36 +833,13 @@ msgstr "создать новую адресную книгу"
 msgid "Name of new addressbook"
 msgstr "Имя новой адресной книги"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Импорт"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Импорт контактов"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr "В адресной книге есть контакты."
+msgstr "В адресной книге нет контактов."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -808,18 +849,34 @@ msgstr "Добавить контакт"
 msgid "Configure addressbooks"
 msgstr "Настроить адресную книгу"
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "CardDAV синхронизации адресов"
+
+#: templates/settings.php:3
 msgid "more info"
 msgstr "дополнительная информация"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Первичный адрес (Kontact и др.)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 315d1deac6..997362d18f 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -6,14 +6,15 @@
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
+# Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +35,89 @@ msgstr "Эта категория уже существует: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Настройки"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Март"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Май"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Август"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Нет"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ок"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Нет категорий для удаления."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Сброс пароля OwnCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
@@ -242,14 +247,10 @@ msgstr "Завершить установку"
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Настройки"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index b1ef507162..96d5af69cd 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -6,14 +6,15 @@
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -58,20 +59,40 @@ msgstr "Файлы"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Снять общий доступ"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "отмена"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "удален"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "создание ZIP-файла, это может занять некоторое время."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index aaac8ba254..e0e1293d2e 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -7,15 +7,16 @@
 #   <icewind1991@gmail.com>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:15+0000\n"
+"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "Неверный запрос"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Ошибка авторизации"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -65,7 +66,7 @@ msgstr "Русский "
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Предупреждение безопасности"
 
 #: templates/admin.php:28
 msgid "Log"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index d7a7d820f8..d4ab54e819 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 21:49+0000\n"
-"Last-Translator: zixo <zixo@zixo.sk>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,20 +84,20 @@ msgstr "Chýba ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba pri vyňatí ID z VCard:"
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nebolo nastavené ID kontaktu."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Chyba pri čítaní fotky kontaktu."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Chyba pri ukladaní dočasného súboru."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
@@ -125,31 +125,31 @@ msgstr "Súbor neexistuje:"
 msgid "Error loading image."
 msgstr "Chyba pri nahrávaní obrázka."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Chyba počas prevzatia objektu kontakt."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Chyba počas získavania fotky."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Chyba vyhľadania obrázku: "
 
@@ -181,110 +181,110 @@ msgstr "Chyba aktualizácie adresára."
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla sa žiadna chyba, súbor úspešne uložené."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Nemôžem uložiť dočasný obrázok: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Nemôžem načítať dočasný obrázok: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Neimplementované"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nový"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Vybrať typ"
 
@@ -300,129 +300,129 @@ msgstr " importovaných, "
 msgid " failed."
 msgstr " zlyhaných."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresár sa nenašiel."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Biznis"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Iné"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Otázky"
 
@@ -430,63 +430,67 @@ msgstr "Otázky"
 msgid "{name}'s Birthday"
 msgstr "Narodeniny {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importovať"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresáre"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigácia"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Ďalší kontakt v zozname"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Predchádzajúci kontakt v zozname"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Ďalší/predošlí adresár"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Obnov zoznam kontaktov"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Pridaj nový kontakt"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Pridaj nový adresár"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Vymaž súčasný kontakt"
 
@@ -853,22 +857,22 @@ msgstr "Zadaj meno"
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Adresy pre synchronizáciu s CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "viac informácií"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Predvolená adresa (Kontakt etc)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bff7d669a1..cd00f6ca1f 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Táto kategória už existuje:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Nastavenia"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Január"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Február"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marec"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Apríl"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Máj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Jún"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Júl"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Október"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Áno"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Obnova Owncloud hesla"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "Dokončiť inštaláciu"
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nastavenia"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 7c4437b6a2..dbbe973d3f 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index cdcf17de4e..6da58b6275 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,101 +10,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Napaka med (de)aktivacijo imenika."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Med dodajanjem stika je prišlo do napake"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "ime elementa ni nastavljeno."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id ni nastavljen."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Ne morem dodati prazne lastnosti."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Vsaj eno izmed polj je še potrebno izpolniti."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Poskušam dodati podvojeno lastnost:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Napaka pri dodajanju informacije o stiku."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID ni bil podan"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Napaka pri nastavljanju nadzorne vsote."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nobena kategorija ni bila izbrana za izbris."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ni bilo najdenih imenikov."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ni bilo najdenih stikov."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Manjkajoč ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Napaka pri razčlenjevanju VCard za ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Ne morem dodati imenika s praznim imenom."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Napaka pri dodajanju imenika."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Napaka pri aktiviranju imenika."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "ID stika ni bil poslan."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Napaka pri branju slike stika."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Napaka pri shranjevanju začasne datoteke."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Slika, ki se nalaga ni veljavna."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id ni nastavljen."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran."
@@ -113,328 +109,391 @@ msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.
 msgid "Error deleting contact property."
 msgstr "Napaka pri brisanju lastnosti stika."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Manjka ID stika."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Manjka id stika."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Pot slike ni bila poslana."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Datoteka ne obstaja:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Napaka pri nalaganju slike."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Napaka pri pridobivanju kontakta predmeta."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Napaka pri pridobivanju lastnosti fotografije."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Napaka pri shranjevanju stika."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Napaka pri spreminjanju velikosti slike"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Napaka pri obrezovanju slike"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Napaka pri ustvarjanju začasne slike"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Napaka pri iskanju datoteke: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "ime elementa ni nastavljeno."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "nadzorna vsota ni nastavljena."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne morem posodobiti imenika s praznim imenom."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Napaka pri posodabljanju imenika."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je bila uspešno naložena."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je bila le delno naložena"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Začasne slike ni bilo mogoče shraniti: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Začasne slike ni bilo mogoče naložiti: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Stiki"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Žal ta funkcionalnost še ni podprta"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Ni podprto"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Ne morem dobiti veljavnega naslova."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Za uvoz stikov spustite VCF datoteko tukaj."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Imenik ni bil najden."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "To ni vaš imenik."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Stika ni bilo mogoče najti."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Naslov"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "E-pošta"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organizacija"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "Delo"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Doma"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobilni telefon"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Besedilo"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Glas"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "Sporočilo"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Pozivnik"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name} - rojstni dan"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Stik"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Ta lastnost ne sme biti prazna"
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Predmetov ni bilo mogoče dati v zaporedje."
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "Uredi ime"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Nobena datoteka ni bila izbrana za nalaganje."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Izberite vrsto"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Rezultati: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " uvoženih, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " je spodletelo."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Imenik ni bil najden."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "To ni vaš imenik."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Stika ni bilo mogoče najti."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Naslov"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "E-pošta"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organizacija"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "Delo"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Doma"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mobilni telefon"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Besedilo"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Glas"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "Sporočilo"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Pozivnik"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Rojstni dan"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} - rojstni dan"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj stik"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Uvozi"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Imeniki"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zapri"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Nastavi imenike"
@@ -443,11 +502,7 @@ msgstr "Nastavi imenike"
 msgid "New Address Book"
 msgstr "Nov imenik"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Uvozi iz VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav povezava"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Prenesi stik"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Izbriši stik"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Spustite sliko tukaj, da bi jo naložili"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "Uredite podrobnosti imena"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Vzdevek"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Vnesite vzdevek"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Rojstni dan"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd. mm. yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Skupine"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Skupine ločite z vejicami"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Uredi skupine"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Prednosten"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Prosimo, če navedete veljaven e-poštni naslov."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Vnesite e-poštni naslov"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "E-pošta naslovnika"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Izbriši e-poštni naslov"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Vpiši telefonsko številko"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Izbriši telefonsko številko"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Prikaz na zemljevidu"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Uredi podrobnosti"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Opombe dodajte tukaj."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Dodaj polje"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Slika profila"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Opomba"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Izbriši trenutno sliko"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Uredi trenutno sliko"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Naloži novo sliko"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "Uredite podrobnosti imena"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Vzdevek"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Vnesite vzdevek"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd. mm. yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Skupine"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Skupine ločite z vejicami"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Uredi skupine"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Prednosten"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Prosimo, če navedete veljaven e-poštni naslov."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Vnesite e-poštni naslov"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "E-pošta naslovnika"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Izbriši e-poštni naslov"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Vpiši telefonsko številko"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Izbriši telefonsko številko"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Prikaz na zemljevidu"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Uredi podrobnosti"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Opombe dodajte tukaj."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Dodaj polje"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Opomba"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Prenesi stik"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Izbriši stik"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Začasna slika je bila odstranjena iz predpomnilnika."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Uredi naslov"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Vrsta"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Poštni predal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Razširjeno"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Mesto"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poštna št."
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Dežela"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Uredi kategorije"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Imenik"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Potrdi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -766,33 +829,10 @@ msgstr "Ustvari nov imenik"
 msgid "Name of new addressbook"
 msgstr "Ime novega imenika"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Uvozi"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Uvažam stike"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Izberite imenik v katerega boste uvažali:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Izberi iz HD"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "V vašem imeniku ni stikov."
@@ -805,18 +845,34 @@ msgstr "Dodaj stik"
 msgid "Configure addressbooks"
 msgstr "Nastavi imenike"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV naslovi za sinhronizacijo"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "več informacij"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Primarni naslov (za kontakt et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 18d08e1a93..4fc16e05df 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Ta kategorija že obstaja:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "januar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "februar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "marec"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "april"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "maj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "junij"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "julij"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "avgust"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "september"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "november"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Prekliči"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "V redu"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Za izbris ni bila izbrana nobena kategorija."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ponastavi ownCloud geslo"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla ownCloud"
 
@@ -242,14 +246,10 @@ msgstr "Dokončaj namestitev"
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nastavitve"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ste pozabili vaše geslo?"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 49b3c8c317..27019afd79 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr "Vzemi iz souporabe"
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "razveljavi"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "izbrisano"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Ustvarjam ZIP datoteko. To lahko traja nekaj časa."
@@ -184,7 +204,7 @@ msgstr "Souporaba"
 
 #: templates/index.php:51
 msgid "Download"
-msgstr "Prejmi"
+msgstr "Prenesi"
 
 #: templates/index.php:64
 msgid "Upload too large"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index c5aa568cb3..c96ce8db69 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 17556c7d3e..03d2be4997 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/so/files.po b/l10n/so/files.po
index 7b869f9830..f8fd36a22b 100644
--- a/l10n/so/files.po
+++ b/l10n/so/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 2ab147d01c..d526bdd6da 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти су неисправни. Поново учитајте страницу."
@@ -111,231 +107,185 @@ msgstr "Подаци о вКарти су неисправни. Поново у
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Рођендан"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Контакт"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додај контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Адресар"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Уреди"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Преузми контакт"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Обриши контакт"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Рођендан"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Пожељан"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Телефон"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Пожељан"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Телефон"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Преузми контакт"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Обриши контакт"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Тип"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Поштански број"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Прошири"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Улица"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Град"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Регија"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Зип код"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Земља"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Додај"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Земља"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Пошаљи"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index a6aac06e0f..f2a2095d88 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Подешавања"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ресетовање лозинке за Оунклауд"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -240,14 +244,10 @@ msgstr "Заврши подешавање"
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Подешавања"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index cc98fd8895..a6c92cc1ce 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 612bae6687..f767552e5c 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
@@ -111,231 +107,185 @@ msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Rođendan"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Poštanski broj"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Proširi"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Grad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Zip kod"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Zemlja"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr ""
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index c11fdd41d6..fd21f716a1 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Podešavanja"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -240,14 +244,10 @@ msgstr "Završi podešavanje"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Podešavanja"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 035317f6ca..f0c1194be7 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 1d2a7f6b0a..a786f05bf9 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 21:01+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,20 +86,20 @@ msgstr "ID saknas"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Inget kontakt-ID angavs."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Fel uppstod när "
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Fel uppstod när temporär fil skulle sparas."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Det laddade fotot är inte giltigt."
 
@@ -127,31 +127,31 @@ msgstr "Filen existerar inte."
 msgid "Error loading image."
 msgstr "Fel uppstod när bild laddades."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Kunde inte hitta bild"
 
@@ -183,110 +183,110 @@ msgstr "Fel uppstod när adressbok skulle uppdateras"
 msgid "Error uploading contacts to storage."
 msgstr "Fel uppstod när kontakt skulle lagras."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var bara delvist uppladdad"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Kunde inte spara tillfällig bild:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Kunde inte ladda tillfällig bild:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Tyvärr är denna funktion inte införd än"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Inte införd"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Ny"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Välj typ"
 
@@ -302,129 +302,129 @@ msgstr "importerad,"
 msgid " failed."
 msgstr "misslyckades."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Hittade inte adressboken"
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -432,63 +432,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}'s födelsedag"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importera"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressböcker"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Stäng"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -855,22 +859,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synkningsadresser"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mera information"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Primär adress (Kontakt o.a.)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index cc20278cfd..e836e06af4 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 20:37+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,51 +38,59 @@ msgstr "Denna kategori finns redan:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Inställningar"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr "April"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr "September"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr "November"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr "December"
 
@@ -244,10 +252,6 @@ msgstr "webbtjänster under din kontroll"
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Inställningar"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 799224c381..ae55ded494 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -64,14 +64,34 @@ msgstr "Sluta dela"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "ångra"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "raderad"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Gererar ZIP-fil. Det kan ta lite tid."
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 5ba1e16f7d..1a3b060abf 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index a3cbc60da6..21efc48ca9 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 2be8f276fc..360ad262cf 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a92c4d850a..e21d1b4ba2 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e334f679d9..3ad7347fdc 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 1971a7d641..dabcad70e5 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 5c59b13647..bb922b56c8 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index adf07f571b..6f0c62cf2d 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e3e49ed11a..de250242d3 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index c97c27d4e9..fbaf36dfc9 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,101 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "ยังไม่ได้กำหนดชื่อ"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ยังไม่ได้กำหนดรหัส"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "เกิดข้อผิดพลาดในการเพิ่มรายละเอียดการติดต่อ"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ยังไม่ได้ใส่รหัส"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "เกิดข้อผิดพลาดในการตั้งค่า checksum"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "ไม่พบข้อมูลการติดต่อที่ต้องการ"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "รหัสสูญหาย"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "พบข้อผิดพลาดในการแยกรหัส VCard:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "ไม่สามารถเพิ่มสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "เกิดข้อผิดพลาดในการเพิ่มสมุดบันทึกที่อยู่ใหม่"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "โหลดรูปภาพไม่ถูกต้อง"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ยังไม่ได้กำหนดรหัส"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง"
@@ -112,328 +108,391 @@ msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูก
 msgid "Error deleting contact property."
 msgstr "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "ไม่พบตำแหน่งพาธของรูปภาพ"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "ไม่มีไฟล์ดังกล่าว"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการครอบตัดภาพ"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการค้นหารูปภาพ: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "ยังไม่ได้กำหนดชื่อ"
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "ยังไม่ได้กำหนดค่า checksum"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "ไม่สามารถบันทึกรูปภาพชั่วคราวได้: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "ไม่สามารถโหลดรูปภาพชั่วคราวได้: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "พบข้อผิดพลาด"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "ไม่พบข้อมูลการติดต่อ"
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "ที่อยู่"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "โทรศัพท์"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "อีเมล์"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "หน่วยงาน"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "ที่ทำงาน"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "บ้าน"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "มือถือ"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "ข้อความ"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "เสียงพูด"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "ข้อความ"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "โทรสาร"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "วีดีโอ"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "เพจเจอร์"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "อินเทอร์เน็ต"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "วันเกิดของ {name}"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "ข้อมูลการติดต่อ"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "แก้ไขชื่อ"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "เลือกชนิด"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "ผลลัพธ์: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " นำเข้าข้อมูลแล้ว, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " ล้มเหลว."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "ไม่พบข้อมูลการติดต่อ"
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "ที่อยู่"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "โทรศัพท์"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "อีเมล์"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "หน่วยงาน"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "ที่ทำงาน"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "บ้าน"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "มือถือ"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "ข้อความ"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "เสียงพูด"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "ข้อความ"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "โทรสาร"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "วีดีโอ"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "เพจเจอร์"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "อินเทอร์เน็ต"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "วันเกิด"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "วันเกิดของ {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "เพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "นำเข้า"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "สมุดบันทึกที่อยู่"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "ปิด"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
@@ -442,11 +501,7 @@ msgstr "กำหนดค่าสมุดบันทึกที่อยู
 msgid "New Address Book"
 msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "นำเข้าจาก VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "ลิงค์ CardDav"
@@ -460,186 +515,195 @@ msgid "Edit"
 msgstr "แก้ไข"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "ลบข้อมูลการติดต่อ"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "วางรูปภาพที่ต้องการอัพโหลด"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "แก้ไขรายละเอียดของชื่อ"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "ชื่อเล่น"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "กรอกชื่อเล่น"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "วันเกิด"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "กลุ่ม"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "แก้ไขกลุ่ม"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "พิเศษ"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "กรอกที่อยู่อีเมล"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "ส่งอีเมลไปที่"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "ลบที่อยู่อีเมล"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "กรอกหมายเลขโทรศัพท์"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "ลบหมายเลขโทรศัพท์"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "ดูบนแผนที่"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "แก้ไขรายละเอียดที่อยู่"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "เพิ่มช่องรับข้อมูล"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "รูปภาพโปรไฟล์"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "โทรศัพท์"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "หมายเหตุ"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "ลบรูปภาพปัจจุบัน"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "แก้ไขรูปภาพปัจจุบัน"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "อัพโหลดรูปภาพใหม่"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "แก้ไขรายละเอียดของชื่อ"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "ชื่อเล่น"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "กรอกชื่อเล่น"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "กลุ่ม"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "แก้ไขกลุ่ม"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "พิเศษ"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "กรอกที่อยู่อีเมล"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "ส่งอีเมลไปที่"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "ลบที่อยู่อีเมล"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "กรอกหมายเลขโทรศัพท์"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "ลบหมายเลขโทรศัพท์"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "ดูบนแผนที่"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "แก้ไขรายละเอียดที่อยู่"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "เพิ่มช่องรับข้อมูล"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "หมายเหตุ"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "ลบข้อมูลการติดต่อ"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "รูปภาพชั่วคราวดังกล่าวได้ถูกลบออกจากหน่วยความจำแคชแล้ว"
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "แก้ไขที่อยู่"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "ประเภท"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "ตู้ ปณ."
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "เพิ่ม"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "ถนน"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "เมือง"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "ภูมิภาค"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "รหัสไปรษณีย์"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "ประเทศ"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "แก้ไขหมวดหมู่"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "เพิ่ม"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "สมุดบันทึกที่อยู่"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "ส่งข้อมูล"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -765,33 +828,10 @@ msgstr "สร้างสมุดบันทึกที่อยู่ให
 msgid "Name of new addressbook"
 msgstr "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "นำเข้า"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "นำเข้าข้อมูลการติดต่อ"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "เลือกจากฮาร์ดดิส"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ"
@@ -804,18 +844,34 @@ msgstr "เพิ่มชื่อผู้ติดต่อ"
 msgid "Configure addressbooks"
 msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "ข้อมูลเพิ่มเติม"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "ที่อยู่หลัก (สำหรับติดต่อ)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 43e255b71f..229c958879 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "ตั้งค่า"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "มกราคม"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "กุมภาพันธ์"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "มีนาคม"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "เมษายน"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "พฤษภาคม"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "มิถุนายน"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "กรกฏาคม"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "สิงหาคม"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "กันยายน"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "ตุลาคม"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "พฤศจิกายน"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "ธันวาคม"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "ไม่ตกลง"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "ตกลง"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "ตกลง"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "พบข้อผิดพลาด"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "เปลี่ยนรหัสผ่านใน Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "ตั้งค่า"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 6425a4d7c6..f1966051f3 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 65932f70ee..90156adadf 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -5,26 +5,36 @@
 # Translators:
 #   <ahmet_kaplan@hotmail.com>, 2012.
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
+#   <mesutgungor@iyte.edu.tr>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 06:05+0000\n"
+"Last-Translator: mesutgungor <mesutgungor@iyte.edu.tr>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Bütün takvimler tamamen  ön belleğe alınmadı"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Bütün herşey tamamen ön belleğe alınmış görünüyor"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Takvim yok."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Etkinlik yok."
 
@@ -32,43 +42,57 @@ msgstr "Etkinlik yok."
 msgid "Wrong calendar"
 msgstr "Yanlış takvim"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "Etkinlikler yeni takvimde saklandı"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "İçeri aktarma başarısız oldu."
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "Etkinlikler takviminizde saklandı"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Yeni Zamandilimi:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zaman dilimi değiştirildi"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Geçersiz istek"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Takvim"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -76,256 +100,337 @@ msgstr "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Doğum günü"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "İş"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Arama"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Müşteriler"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Teslimatçı"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Tatil günleri"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Fikirler"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Seyahat"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Yıl dönümü"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Diğer"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Kişisel"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projeler"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Sorular"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "hazırlayan"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "isimsiz"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Yeni Takvim"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Tekrar etmiyor"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Günlük"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Haftalı"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Haftaiçi Her gün"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "İki haftada bir"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Aylık"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Yıllı"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "asla"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "sıklığa göre"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "tarihe göre"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "ay günlerine göre"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "hafta günlerine göre"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Salı"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Cuma"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Pazar"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "ayın etkinlikler haftası"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "birinci"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "ikinci"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "üçüncü"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "dördüncü"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "beşinci"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "sonuncu"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Ocak"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Şubat"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mart"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Nisan"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mayıs"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Haziran"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Temmuz"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Ağustos"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Eylül"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Ekim"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Kasım"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Aralık"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "olay tarihine göre"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "yıl gün(ler)ine göre"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "hafta sayı(lar)ına göre"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "gün ve aya göre"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Tarih"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Takv."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Paz."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Pzt."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Sal."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Çar."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Per."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Cum."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Cmt."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Oca."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Şbt."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Nis"
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "May."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Haz."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Tem."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Agu."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Eyl."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Eki."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Kas."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Ara."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Tüm gün"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Yeni Takvim"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Eksik alanlar"
@@ -359,27 +464,27 @@ msgstr "Olay başlamadan önce bitiyor"
 msgid "There was a database fail"
 msgstr "Bir veritabanı başarısızlığı oluştu"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Hafta"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Ay"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Bugün"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Takvimler"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Dosya okunurken başarısızlık oldu."
 
@@ -392,7 +497,7 @@ msgid "Your calendars"
 msgstr "Takvimleriniz"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Bağlantısı"
 
@@ -404,19 +509,19 @@ msgstr "Paylaşılan"
 msgid "No shared calendars"
 msgstr "Paylaşılan takvim yok"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Takvimi paylaş"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "İndir"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Sil"
@@ -502,23 +607,23 @@ msgstr "Kategorileri virgülle ayırın"
 msgid "Edit categories"
 msgstr "Kategorileri düzenle"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Tüm Gün Olay"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Kimden"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Kime"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Gelişmiş opsiyonlar"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Konum"
 
@@ -526,7 +631,7 @@ msgstr "Konum"
 msgid "Location of the Event"
 msgstr "Olayın Konumu"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Açıklama"
 
@@ -534,84 +639,86 @@ msgstr "Açıklama"
 msgid "Description of the Event"
 msgstr "Olayın Açıklaması"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Tekrar"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Hafta günlerini seçin"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Günleri seçin"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "ve yılın etkinlikler günü."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "ve ayın etkinlikler günü."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Ayları seç"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Haftaları seç"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "ve yılın etkinkinlikler haftası."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Aralık"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Son"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "olaylar"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Takvim dosyasını içeri aktar"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Lütfen takvimi seçin"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Yeni bir takvim oluştur"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Takvim dosyasını içeri aktar"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Lütfen takvim seçiniz"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Yeni takvimin adı"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Müsait ismi al !"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "İçe Al"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Takvim içe aktarılıyor"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Takvim başarıyla içe aktarıldı"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Diyalogu kapat"
 
@@ -627,15 +734,11 @@ msgstr "Bir olay görüntüle"
 msgid "No categories selected"
 msgstr "Kategori seçilmedi"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategori seçin"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "nın"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "üzerinde"
 
@@ -663,9 +766,33 @@ msgstr "12s"
 msgid "First day of the week"
 msgstr "Haftanın ilk günü"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV Takvim eşzamanlama adresi:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Önbellek"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr "Tekrar eden etkinlikler için ön belleği temizle."
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "CalDAV takvimi adresleri senkronize ediyor."
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "daha fazla bilgi"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Öncelikli adres"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr "Sadece okunabilir iCalendar link(ler)i"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index ca306b53c2..041e00bf18 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -4,106 +4,103 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+#   <mesutgungor@iyte.edu.tr>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Adres defteri etkisizleştirilirken hata oluştu."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Kişi eklenirken hata oluştu."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "eleman ismi atanmamış."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id atanmamış."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Kişi bilgisi ayrıştırılamadı."
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Boş özellik eklenemiyor."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "En az bir adres alanı doldurulmalı."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID verilmedi"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "İmza oluşturulurken hata."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Silmek için bir kategori seçilmedi."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Adres defteri bulunamadı."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Bağlantı bulunamadı."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Eksik ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "ID için VCard ayrıştırılamadı:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Adres defterini isimsiz ekleyemezsiniz."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Adres defteri eklenirken hata oluştu."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Adres defteri etkinleştirilirken hata oluştu."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Bağlantı ID'si girilmedi."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Bağlantı fotoğrafı okunamadı."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Geçici dosya kaydetme hatası."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Yüklenecek fotograf geçerli değil."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id atanmamış."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
@@ -112,328 +109,391 @@ msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 msgid "Error deleting contact property."
 msgstr "Kişi özelliği silinirken hata oluştu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Bağlantı ID'si eksik."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Eksik bağlantı id'si."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Fotoğraf girilmedi."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Dosya mevcut değil:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "İmaj yükleme hatası."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Bağlantı nesnesini kaydederken hata."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Resim özelleğini alırken hata oluştu."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Bağlantıyı kaydederken hata"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Görüntü yeniden boyutlandırılamadı."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Görüntü kırpılamadı."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Geçici resim oluştururken hata oluştu"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Resim ararken hata oluştu:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "eleman ismi atanmamış."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum atanmamış."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Adres defteri güncellenirken hata oluştu."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Geçici resmi saklayamadı : "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Geçici resmi yükleyemedi :"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Üzgünüz, bu özellik henüz tamamlanmadı."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Tamamlanmadı."
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Geçerli bir adres alınamadı."
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Bağlantıları içe aktarmak için bir VCF dosyası bırakın."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "Adres defteri bulunamadı."
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "Bu sizin adres defteriniz değil."
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "Kişi bulunamadı."
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "Adres"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "Telefon"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "Eposta"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "Organizasyon"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "İş"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "Ev"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "Metin"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "Ses"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "mesaj"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "Sayfalayıcı"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "İnternet"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name}'nin Doğumgünü"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kişi"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr "Yeni"
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr "Yeni Kişi"
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "Bu özellik boş bırakılmamalı."
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "Öğeler seri hale getiremedi"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "İsmi düzenle"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "Yükleme için dosya seçilmedi."
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "Tür seç"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "Sonuç: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " içe aktarıldı, "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " hatalı."
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "Adres defteri bulunamadı."
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "Bu sizin adres defteriniz değil."
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "Kişi bulunamadı."
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "Adres"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "Eposta"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "Organizasyon"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "İş"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "Ev"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "Metin"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "Ses"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "mesaj"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "Sayfalayıcı"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "İnternet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Doğum günü"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr "İş"
+
+#: lib/app.php:182
+msgid "Call"
+msgstr "Çağrı"
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr "Müşteriler"
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr "Dağıtıcı"
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr "Tatiller"
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr "Fikirler"
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr "Seyahat"
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr "Yıl Dönümü"
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr "Toplantı"
+
+#: lib/app.php:190
+msgid "Other"
+msgstr "Diğer"
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr "Kişisel"
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr "Projeler"
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr "Sorular"
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}'nin Doğumgünü"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kişi Ekle"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "İçe aktar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adres defterleri"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Kapat"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr "Klavye kısayolları"
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr "Dolaşım"
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr "Listedeki sonraki kişi"
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr "Listedeki önceki kişi"
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr "Şuanki adres defterini genişlet/daralt"
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr "Sonraki/Önceki adres defteri"
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr "Eylemler"
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr "Kişi listesini tazele"
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr "Yeni kişi ekle"
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr "Yeni adres defteri ekle"
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr "Şuanki kişiyi sil"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Adres Defterlerini Yapılandır"
@@ -442,11 +502,7 @@ msgstr "Adres Defterlerini Yapılandır"
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCF'den içeri aktar"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Bağlantısı"
@@ -460,186 +516,195 @@ msgid "Edit"
 msgstr "Düzenle"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Kişiyi indir"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kişiyi sil"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "Fotoğrafı yüklenmesi için bırakın"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "İsim detaylarını düzenle"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "Takma ad"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "Takma adı girin"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Doğum günü"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "gg-aa-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "Gruplar"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "Grupları birbirinden virgülle ayırın"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "Grupları düzenle"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "Tercih edilen"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "Lütfen geçerli bir eposta adresi belirtin."
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "Eposta adresini girin"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "Eposta adresi"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "Eposta adresini sil"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "Telefon numarasını gir"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "Telefon numarasını sil"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "Haritada gör"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "Adres detaylarını düzenle"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "Notları buraya ekleyin."
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "Alan ekle"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profil resmi"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Telefon"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "Not"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "Mevcut fotoğrafı sil"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "Mevcut fotoğrafı düzenle"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "Yeni fotoğraf yükle"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
-msgstr ""
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "İsim detaylarını düzenle"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "Takma ad"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "Takma adı girin"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Web sitesi"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Web sitesine git"
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "gg-aa-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "Gruplar"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "Grupları birbirinden virgülle ayırın"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "Grupları düzenle"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "Tercih edilen"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "Lütfen geçerli bir eposta adresi belirtin."
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "Eposta adresini girin"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "Eposta adresi"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "Eposta adresini sil"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "Telefon numarasını gir"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "Telefon numarasını sil"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "Haritada gör"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "Adres detaylarını düzenle"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "Notları buraya ekleyin."
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "Alan ekle"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "Not"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kişiyi indir"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kişiyi sil"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "Geçici resim ön bellekten silinmiştir."
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Adresi düzenle"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tür"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Posta Kutusu"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Sokak adresi"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Sokak ve Numara"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Uzatılmış"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Sokak"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Apartman numarası vb."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Şehir"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Bölge"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "Örn. eyalet veya il"
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Posta kodu"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "Posta kodu"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Ülke"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorileri düzenle"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Ekle"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adres defteri"
@@ -745,7 +810,6 @@ msgid "Submit"
 msgstr "Gönder"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "İptal"
 
@@ -765,33 +829,10 @@ msgstr "Yeni adres defteri oluştur"
 msgid "Name of new addressbook"
 msgstr "Yeni adres defteri için isim"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "İçe aktar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Bağlantıları içe aktar"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "İçe aktarılacak adres defterini seçin:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "HD'den seç"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Adres defterinizde hiç bağlantı yok."
@@ -804,18 +845,34 @@ msgstr "Bağlatı ekle"
 msgid "Configure addressbooks"
 msgstr "Adres defterini yapılandır"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Adres deftelerini seçiniz"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "İsim giriniz"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Tanım giriniz"
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV adresleri eşzamanlıyor"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "daha fazla bilgi"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Birincil adres (Bağlantı ve arkadaşları)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr "Sadece okunabilir vCard dizin link(ler)i"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index ac6e6dec29..4f27a0126c 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +33,89 @@ msgstr "Bu kategori zaten mevcut: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Hayır"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Evet"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Silmek için bir kategori seçilmedi"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud parola sıfırlama"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
 
@@ -240,14 +245,10 @@ msgstr "Kurulumu tamamla"
 msgid "web services under your control"
 msgstr "kontrolünüzdeki web servisleri"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ayarlar"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 6d792546a4..d63bb38a57 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -55,20 +56,40 @@ msgstr "Dosyalar"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Paylaşılmayan"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
 msgstr "Sil"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "geri al"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "silindi"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
index d13585d1eb..b150c44bf8 100644
--- a/l10n/tr/gallery.po
+++ b/l10n/tr/gallery.po
@@ -5,75 +5,41 @@
 # Translators:
 #   <ahmet_kaplan@hotmail.com>, 2012.
 # Aranel Surion <aranel@aranelsurion.org>, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:13+0000\n"
+"Last-Translator: Emre Saraçoğlu <emresaracoglu@live.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Resimler"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Galeriyi paylaş"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Hata: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "İç hata"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Yeniden Tara "
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Durdur"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Paylaş"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Slide Gösterim"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index b9af026aba..66a8b77b9c 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:13+0000\n"
+"Last-Translator: Emre Saraçoğlu <emresaracoglu@live.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +38,7 @@ msgstr "Geçersiz istek"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Eşleşme hata"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -61,7 +62,7 @@ msgstr "__dil_adı__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Güvenlik Uyarisi"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -205,7 +206,7 @@ msgstr "Diğer"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "Alt Yönetici"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -213,7 +214,7 @@ msgstr "Kota"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "Alt yönetici için ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index e284cb8b0f..19ad51b596 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,101 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Має бути заповнено щонайменше одне поле."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Помилка при додаванні адресної книги."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -111,231 +107,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "День народження"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr ""
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додати контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Нова адресна книга"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Видалити контакт"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "День народження"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "Телефон"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "Телефон"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Видалити контакт"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Розширено"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Вулиця"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Місто"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Поштовий індекс"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Країна"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Додати"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Країна"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index fe1c962318..d0c31b79d5 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,51 +35,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Налаштування"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -108,10 +116,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -241,14 +245,10 @@ msgstr "Завершити налаштування"
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Налаштування"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Забули пароль?"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index dd7bbef902..ef13ab4cc1 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -55,43 +55,63 @@ msgstr "Файли"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Заборонити доступ"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
 msgstr ""
 
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "відмінити"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "видалені"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Створення ZIP-файлу, це може зайняти певний час."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Помилка завантаження"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Очікування"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Завантаження перервано."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Некоректне ім'я, '/' не дозволено."
 
 #: js/files.js:631 templates/index.php:55
 msgid "Size"
@@ -103,19 +123,19 @@ msgstr "Змінено"
 
 #: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "тека"
 
 #: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "теки"
 
 #: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "файл"
 
 #: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "файли"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -127,7 +147,7 @@ msgstr "Максимальний розмір відвантажень"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "макс.можливе:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
@@ -139,7 +159,7 @@ msgstr ""
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 є безліміт"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
@@ -159,7 +179,7 @@ msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "З URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -167,7 +187,7 @@ msgstr "Відвантажити"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Перервати завантаження"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -179,7 +199,7 @@ msgstr "Ім'я"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Поділитися"
 
 #: templates/index.php:51
 msgid "Download"
@@ -197,8 +217,8 @@ msgstr "Файли,що ви намагаєтесь відвантажити п
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Файли скануються, зачекайте, будь-ласка."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Поточне сканування"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index fd95f1c130..a818ac7d1f 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dzubchikd@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 21:26+0000\n"
+"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +20,51 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Допомога"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Особисте"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Налаштування"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Користувачі"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Додатки"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Адмін"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP завантаження вимкнено."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Файли повинні бути завантаженні послідовно."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Повернутися до файлів"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Вибрані фали завеликі для генерування zip файлу."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Додаток не увімкнений"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Помилка автентифікації"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -71,42 +72,42 @@ msgstr ""
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "секунди тому"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 хвилину тому"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d хвилин тому"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "сьогодні"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "вчора"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d днів тому"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "минулого місяця"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "місяці тому"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "минулого року"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "роки тому"
diff --git a/l10n/uk/media.po b/l10n/uk/media.po
index 5df57e8565..aef0c0eada 100644
--- a/l10n/uk/media.po
+++ b/l10n/uk/media.po
@@ -3,64 +3,65 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dzubchikd@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 21:07+0000\n"
+"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
-msgstr ""
+msgstr "Музика"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Додати альбом до плейлиста"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
-msgstr ""
+msgstr "Грати"
 
 #: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
-msgstr ""
+msgstr "Пауза"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Попередній"
 
 #: templates/music.php:6 templates/player.php:14
 msgid "Next"
-msgstr ""
+msgstr "Наступний"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Звук вкл."
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "Звук викл."
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "Повторне сканування колекції"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "Виконавець"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "Альбом"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Заголовок"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 1dd51bd45e..134236723a 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dzubchikd@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 21:39+0000\n"
+"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +28,11 @@ msgstr ""
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID змінено"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr ""
+msgstr "Помилковий запит"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
@@ -39,7 +40,7 @@ msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
-msgstr ""
+msgstr "Мова змінена"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
@@ -75,7 +76,7 @@ msgstr ""
 
 #: templates/apps.php:24
 msgid "Select an App"
-msgstr ""
+msgstr "Вибрати додаток"
 
 #: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
@@ -83,11 +84,11 @@ msgstr ""
 
 #: templates/apps.php:28
 msgid "-licensed"
-msgstr ""
+msgstr "-ліцензовано"
 
 #: templates/apps.php:28
 msgid "by"
-msgstr ""
+msgstr "по"
 
 #: templates/help.php:8
 msgid "Documentation"
@@ -99,11 +100,11 @@ msgstr ""
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr ""
+msgstr "Запитати"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Проблема при з'єднані з базою допомоги"
 
 #: templates/help.php:23
 msgid "Go there manually."
@@ -115,11 +116,11 @@ msgstr ""
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "Ви використовуєте"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "з доступної"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -131,7 +132,7 @@ msgstr ""
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr ""
+msgstr "Ваш пароль змінено"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -139,19 +140,19 @@ msgstr ""
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr ""
+msgstr "Поточний пароль"
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "Новий пароль"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr ""
+msgstr "показати"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr ""
+msgstr "Змінити пароль"
 
 #: templates/personal.php:30
 msgid "Email"
@@ -167,7 +168,7 @@ msgstr ""
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
-msgstr ""
+msgstr "Мова"
 
 #: templates/personal.php:44
 msgid "Help translate"
@@ -179,19 +180,19 @@ msgstr ""
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
-msgstr ""
+msgstr "Ім'я"
 
 #: templates/users.php:23 templates/users.php:77
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/users.php:32
 msgid "Create"
-msgstr ""
+msgstr "Створити"
 
 #: templates/users.php:35
 msgid "Default Quota"
@@ -215,4 +216,4 @@ msgstr ""
 
 #: templates/users.php:145
 msgid "Delete"
-msgstr ""
+msgstr "Видалити"
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 41383998b6..5451d95069 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -82,20 +82,20 @@ msgstr "Missing ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Lỗi đọc liên lạc hình ảnh."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Các hình ảnh tải không hợp lệ."
 
@@ -123,31 +123,31 @@ msgstr "Tập tin không tồn tại"
 msgid "Error loading image."
 msgstr "Lỗi khi tải hình ảnh."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -179,110 +179,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr "Lỗi tải lên danh sách địa chỉ để lưu trữ."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Không có lỗi, các tập tin tải lên thành công"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Danh sách"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -298,129 +298,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Điện thoại bàn"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Công việc"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Nhà"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Di động"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "số trang"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Ngày sinh nhật"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -428,63 +428,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Thêm liên lạc"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Sổ địa chỉ"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -851,22 +855,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index b00d507167..60bed8f0dc 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -34,51 +34,59 @@ msgstr "Danh mục này đã được tạo :"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Cài đặt"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr "Tháng 12"
 
@@ -240,10 +248,6 @@ msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Cài đặt"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 65038a686e..fa964a6646 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 7d48fb931a..577dc470d4 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -3,107 +3,104 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "添加联系人时出错。"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "元素名称未设置"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "没有设置 id。"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "无法添加空属性。"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "至少需要填写一项地址。"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "试图添加重复属性： "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "添加联系人属性错误。"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "设置校验值错误。"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "未选中要删除的分类。"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "找不到地址簿。"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "找不到联系人。"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "缺少 ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "无法解析如下ID的 VCard：“"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "无法无姓名的地址簿。"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "添加地址簿错误。"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "激活地址簿错误。"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "未提交联系人 ID。"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "读取联系人照片错误。"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "保存临时文件错误。"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "装入的照片不正确。"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "没有设置 id。"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信息不正确。请重新加载页面。"
@@ -112,328 +109,391 @@ msgstr "vCard 的信息不正确。请重新加载页面。"
 msgid "Error deleting contact property."
 msgstr "删除联系人属性错误。"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "缺少联系人 ID。"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "缺少联系人 ID。"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "未提供照片路径。"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "文件不存在:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "加载图片错误。"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "获取联系人目标时出错。"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "获取照片属性时出错。"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "保存联系人时出错。"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "缩放图像时出错"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "裁切图像时出错"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "创建临时图像时出错"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "查找图像时出错: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "未设置校验值。"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "vCard 信息不正确。请刷新页面: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "有一些信息无法被处理。"
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "无法使用一个空名称更新地址簿"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "更新地址簿错误"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "上传联系人到存储空间时出错"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "文件上传成功，没有错误发生"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "无法保存临时图像: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "无法加载临时图像: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "没有文件被上传。未知错误"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "联系人"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "抱歉，这个功能暂时还没有被实现"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "未实现"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "无法获取一个合法的地址。"
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
-
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
-
-#: js/contacts.js:605
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:631
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:747 js/contacts.js:765
-msgid ""
-"'deleteProperty' called without type argument. Please report at "
-"bugs.owncloud.org"
-msgstr ""
-
-#: js/contacts.js:781
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1056
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: lib/app.php:30
-msgid "Addressbook not found."
-msgstr "未找到地址簿。"
-
-#: lib/app.php:34
-msgid "This is not your addressbook."
-msgstr "这不是您的地址簿。"
-
-#: lib/app.php:45
-msgid "Contact could not be found."
-msgstr "无法找到联系人。"
-
-#: lib/app.php:101 templates/part.contact.php:109
-msgid "Address"
-msgstr "地址"
-
-#: lib/app.php:102
-msgid "Telephone"
-msgstr "电话"
-
-#: lib/app.php:103 templates/part.contact.php:108
-msgid "Email"
-msgstr "电子邮件"
-
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
-msgid "Organization"
-msgstr "组织"
-
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
-msgid "Work"
-msgstr "工作"
-
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
-msgid "Home"
-msgstr "家庭"
-
-#: lib/app.php:122
-msgid "Mobile"
-msgstr "移动电话"
-
-#: lib/app.php:124
-msgid "Text"
-msgstr "文本"
-
-#: lib/app.php:125
-msgid "Voice"
-msgstr "语音"
-
-#: lib/app.php:126
-msgid "Message"
-msgstr "消息"
-
-#: lib/app.php:127
-msgid "Fax"
-msgstr "传真"
-
-#: lib/app.php:128
-msgid "Video"
-msgstr "视频"
-
-#: lib/app.php:129
-msgid "Pager"
-msgstr "传呼机"
-
-#: lib/app.php:135
-msgid "Internet"
-msgstr "互联网"
-
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name} 的生日"
-
-#: lib/search.php:22
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "联系人"
 
-#: templates/index.php:13
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr "这个属性必须是非空的"
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr "无法序列化元素"
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr "编辑名称"
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr "没有选择文件以上传"
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "您试图上传的文件超出了该服务器的最大文件限制"
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr "选择类型"
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr "结果: "
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr " 已导入， "
+
+#: js/loader.js:49
+msgid " failed."
+msgstr " 失败。"
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr "未找到地址簿。"
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr "这不是您的地址簿。"
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr "无法找到联系人。"
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr "地址"
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr "电话"
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr "电子邮件"
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr "组织"
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr "工作"
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr "家庭"
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr "移动电话"
+
+#: lib/app.php:132
+msgid "Text"
+msgstr "文本"
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr "语音"
+
+#: lib/app.php:134
+msgid "Message"
+msgstr "消息"
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr "传真"
+
+#: lib/app.php:136
+msgid "Video"
+msgstr "视频"
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr "传呼机"
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr "互联网"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} 的生日"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加联系人"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "导入"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "地址簿"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "关闭"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "配置地址簿"
@@ -442,11 +502,7 @@ msgstr "配置地址簿"
 msgid "New Address Book"
 msgstr "新建地址簿"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "从 VCF 导入"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav 链接"
@@ -460,217 +516,226 @@ msgid "Edit"
 msgstr "编辑"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "删除"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "下载联系人"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "删除联系人"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr "拖拽图片进行上传"
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "编辑名称详情"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "昵称"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "输入昵称"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "生日"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "yyyy-mm-dd"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "分组"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "用逗号隔开分组"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "编辑分组"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "偏好"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "请指定合法的电子邮件地址"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "输入电子邮件地址"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "发送邮件到地址"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "删除电子邮件地址"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "输入电话号码"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "删除电话号码"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr "在地图上显示"
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "编辑地址细节。"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "添加注释。"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "添加字段"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "联系人图片"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "电话"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "注释"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr "删除当前照片"
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr "编辑当前照片"
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr "上传新照片"
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
-#: templates/part.cropphoto.php:64
-msgid "The temporary image has been removed from cache."
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr "自定义格式，简称，全名，姓在前，姓在前并用逗号分割"
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "编辑名称详情"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "昵称"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "输入昵称"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "yyyy-mm-dd"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "分组"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "用逗号隔开分组"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "编辑分组"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "偏好"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "请指定合法的电子邮件地址"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "输入电子邮件地址"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "发送邮件到地址"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "删除电子邮件地址"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "输入电话号码"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "删除电话号码"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr "在地图上显示"
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "编辑地址细节。"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "添加注释。"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "添加字段"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "电话"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "注释"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "下载联系人"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "删除联系人"
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr "临时图像文件已从缓存中删除"
+
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "编辑地址"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "类型"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "邮箱"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "扩展"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "街道"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "城市"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "地区"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "邮编"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "国家"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "编辑分类"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "添加"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "地址簿"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "名誉字首"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "小姐"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "女士"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "夫人"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "博士"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -678,7 +743,7 @@ msgstr "名"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "其他名称"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
@@ -686,39 +751,39 @@ msgstr "姓"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "名誉后缀"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "法律博士"
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "医学博士"
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "骨科医学博士"
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "教育学博士"
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "哲学博士"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "小"
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "老"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,7 +810,6 @@ msgid "Submit"
 msgstr "提交"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -765,36 +829,13 @@ msgstr "创建新地址簿"
 msgid "Name of new addressbook"
 msgstr "新地址簿名称"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "导入"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "导入联系人"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "您的地址簿中没有联系人。"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -804,18 +845,34 @@ msgstr "添加联系人"
 msgid "Configure addressbooks"
 msgstr "配置地址簿"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV 同步地址"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "更多信息"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "首选地址 (Kontact 等)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 54f452ded2..f9babe102e 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,83 +35,87 @@ msgstr "此分类已存在: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "设置"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "一月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "二月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "三月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "四月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "五月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "六月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "七月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "八月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "九月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "十月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "否"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "好"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "没有选择要删除的类别"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "重置 Owncloud 密码"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "重置 ownCloud 密码"
 
@@ -240,14 +245,10 @@ msgstr "安装完成"
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "设置"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "忘记密码？"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 1433f41f26..2c67531722 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "删除"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成 ZIP 文件，可能需要一些时间"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 9d49e670c5..db0b2a0c0f 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,101 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "在啟用或關閉電話簿時發生錯誤"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "添加通訊錄發生錯誤"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "不可添加空白內容"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "至少必須填寫一欄地址"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "添加通訊錄內容中發生錯誤"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "沒有找到聯絡人"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "遺失ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "添加電話簿中發生錯誤"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "啟用電話簿中發生錯誤"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "有關 vCard 的資訊不正確，請重新載入此頁。"
@@ -112,231 +108,185 @@ msgstr "有關 vCard 的資訊不正確，請重新載入此頁。"
 msgid "Error deleting contact property."
 msgstr "刪除通訊錄內容中發生錯誤"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "電話簿更新中發生錯誤"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "沒有已上傳的檔案"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "通訊錄"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,91 +299,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "找不到通訊錄"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "網際網路"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}的生日"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "通訊錄"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加通訊錄"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "電話簿"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "設定通訊錄"
@@ -442,11 +501,7 @@ msgstr "設定通訊錄"
 msgid "New Address Book"
 msgstr "新電話簿"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "從VCF匯入"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav 聯結"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "編輯"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "下載通訊錄"
-
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "刪除通訊錄"
-
-#: templates/part.contact.php:19
+#: templates/part.contact.php:16
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:29
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:30
-msgid "Edit name details"
-msgstr "編輯姓名詳細資訊"
-
-#: templates/part.contact.php:35 templates/part.contact.php:105
-msgid "Nickname"
-msgstr "綽號"
-
-#: templates/part.contact.php:36
-msgid "Enter nickname"
-msgstr "輸入綽號"
-
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "生日"
-
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
-msgstr "dd-mm-yyyy"
-
-#: templates/part.contact.php:39 templates/part.contact.php:111
-msgid "Groups"
-msgstr "群組"
-
-#: templates/part.contact.php:41
-msgid "Separate groups with commas"
-msgstr "用逗號分隔群組"
-
-#: templates/part.contact.php:42
-msgid "Edit groups"
-msgstr "編輯群組"
-
-#: templates/part.contact.php:55 templates/part.contact.php:69
-msgid "Preferred"
-msgstr "首選"
-
-#: templates/part.contact.php:56
-msgid "Please specify a valid email address."
-msgstr "註填入合法的電子郵件住址"
-
-#: templates/part.contact.php:56
-msgid "Enter email address"
-msgstr "輸入電子郵件地址"
-
-#: templates/part.contact.php:60
-msgid "Mail to address"
-msgstr "寄送住址"
-
-#: templates/part.contact.php:61
-msgid "Delete email address"
-msgstr "刪除電子郵件住址"
-
-#: templates/part.contact.php:70
-msgid "Enter phone number"
-msgstr "輸入電話號碼"
-
-#: templates/part.contact.php:74
-msgid "Delete phone number"
-msgstr "刪除電話號碼"
-
-#: templates/part.contact.php:84
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:84
-msgid "Edit address details"
-msgstr "電子郵件住址詳細資訊"
-
-#: templates/part.contact.php:95
-msgid "Add notes here."
-msgstr "在這裡新增註解"
-
-#: templates/part.contact.php:101
-msgid "Add field"
-msgstr "新增欄位"
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "個人資料照片"
-
-#: templates/part.contact.php:107
-msgid "Phone"
-msgstr "電話"
-
-#: templates/part.contact.php:110
-msgid "Note"
-msgstr "註解"
-
-#: templates/part.contactphoto.php:8
+#: templates/part.contact.php:18
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:9
+#: templates/part.contact.php:19
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:10
+#: templates/part.contact.php:20
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
+#: templates/part.contact.php:21
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr "編輯姓名詳細資訊"
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr "綽號"
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr "輸入綽號"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr "群組"
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr "用逗號分隔群組"
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr "編輯群組"
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr "首選"
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr "註填入合法的電子郵件住址"
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr "輸入電子郵件地址"
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr "寄送住址"
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr "刪除電子郵件住址"
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr "輸入電話號碼"
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr "刪除電話號碼"
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr "電子郵件住址詳細資訊"
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr "在這裡新增註解"
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr "新增欄位"
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr "電話"
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr "註解"
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "下載通訊錄"
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "刪除通訊錄"
+
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "類型"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "通訊地址"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "分機"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "街道"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "城市"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "地區"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "郵遞區號"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "國家"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "添加"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "國家"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "提出"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -765,33 +828,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 5f3860d447..9cc98c4b81 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr "此分類已經存在:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "設定"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "私有雲重設密碼"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
 
@@ -240,14 +244,10 @@ msgstr "完成設定"
 msgid "web services under your control"
 msgstr "網路服務已在你控制"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "登出"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "設定"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "忘記密碼?"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index f868758276..8c8f682614 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "刪除"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
new file mode 100644
index 0000000000..174fe0720f
--- /dev/null
+++ b/lib/l10n/es.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ayuda",
+"Personal" => "Personal",
+"Settings" => "Ajustes",
+"Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Administración",
+"ZIP download is turned off." => "La descarga en ZIP está desactivada.",
+"Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
+"Back to Files" => "Volver a Archivos",
+"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"Application is not enabled" => "La aplicación no está habilitada",
+"Authentication error" => "Error de autenticación",
+"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
+"seconds ago" => "hace segundos",
+"1 minute ago" => "hace 1 minuto",
+"%d minutes ago" => "hace %d minutos",
+"today" => "hoy",
+"yesterday" => "ayer",
+"%d days ago" => "hace %d días",
+"last month" => "este mes",
+"months ago" => "hace meses",
+"last year" => "este año",
+"years ago" => "hace años"
+);
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
new file mode 100644
index 0000000000..d8da90a3cb
--- /dev/null
+++ b/lib/l10n/et_EE.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Abiinfo",
+"Personal" => "Isiklik",
+"Settings" => "Seaded",
+"Users" => "Kasutajad",
+"Apps" => "Rakendused",
+"Admin" => "Admin",
+"ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.",
+"Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
+"Back to Files" => "Tagasi failide juurde",
+"Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
+"Application is not enabled" => "Rakendus pole sisse lülitatud",
+"Authentication error" => "Autentimise viga",
+"Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
+"seconds ago" => "sekundit tagasi",
+"1 minute ago" => "1 minut tagasi",
+"%d minutes ago" => "%d minutit tagasi",
+"today" => "täna",
+"yesterday" => "eile",
+"%d days ago" => "%d päeva tagasi",
+"last month" => "eelmisel kuul",
+"months ago" => "kuud tagasi",
+"last year" => "eelmisel aastal",
+"years ago" => "aastat tagasi"
+);
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
new file mode 100644
index 0000000000..c674b79b95
--- /dev/null
+++ b/lib/l10n/fr.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Aide",
+"Personal" => "Personnel",
+"Settings" => "Paramètres",
+"Users" => "Utilisateurs",
+"Apps" => "Applications",
+"Admin" => "Administration",
+"ZIP download is turned off." => "Téléchargement ZIP désactivé.",
+"Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
+"Back to Files" => "Retour aux Fichiers",
+"Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.",
+"Application is not enabled" => "L'application n'est pas activée",
+"Authentication error" => "Erreur d'authentification",
+"Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
+"seconds ago" => "à l'instant",
+"1 minute ago" => "il y a 1 minute",
+"%d minutes ago" => "il y a %d minutes",
+"today" => "aujourd'hui",
+"yesterday" => "hier",
+"%d days ago" => "il y a %d jours",
+"last month" => "le mois dernier",
+"months ago" => "il y a plusieurs mois",
+"last year" => "l'année dernière",
+"years ago" => "il y a plusieurs années"
+);
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
new file mode 100644
index 0000000000..2c88818dc6
--- /dev/null
+++ b/lib/l10n/it.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Aiuto",
+"Personal" => "Personale",
+"Settings" => "Impostazioni",
+"Users" => "Utenti",
+"Apps" => "Applicazioni",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.",
+"Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
+"Back to Files" => "Torna ai file",
+"Selected files too large to generate zip file." => "I  file selezionati sono troppo grandi per generare un file zip.",
+"Application is not enabled" => "L'applicazione  non è abilitata",
+"Authentication error" => "Errore di autenticazione",
+"Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
+"seconds ago" => "secondi fa",
+"1 minute ago" => "1 minuto fa",
+"%d minutes ago" => "%d minuti fa",
+"today" => "oggi",
+"yesterday" => "ieri",
+"%d days ago" => "%d giorni fa",
+"last month" => "il mese scorso",
+"months ago" => "mesi fa",
+"last year" => "l'anno scorso",
+"years ago" => "anni fa"
+);
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
new file mode 100644
index 0000000000..18f6a4a623
--- /dev/null
+++ b/lib/l10n/uk.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Допомога",
+"Personal" => "Особисте",
+"Settings" => "Налаштування",
+"Users" => "Користувачі",
+"Apps" => "Додатки",
+"Admin" => "Адмін",
+"ZIP download is turned off." => "ZIP завантаження вимкнено.",
+"Files need to be downloaded one by one." => "Файли повинні бути завантаженні послідовно.",
+"Back to Files" => "Повернутися до файлів",
+"Selected files too large to generate zip file." => "Вибрані фали завеликі для генерування zip файлу.",
+"Application is not enabled" => "Додаток не увімкнений",
+"Authentication error" => "Помилка автентифікації",
+"seconds ago" => "секунди тому",
+"1 minute ago" => "1 хвилину тому",
+"%d minutes ago" => "%d хвилин тому",
+"today" => "сьогодні",
+"yesterday" => "вчора",
+"%d days ago" => "%d днів тому",
+"last month" => "минулого місяця",
+"months ago" => "місяці тому",
+"last year" => "минулого року",
+"years ago" => "роки тому"
+);
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 6e0c6e2fee..4464f7596d 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,27 +1,40 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Е-пощата е записана",
+"Invalid email" => "Неправилна е-поща",
 "OpenID Changed" => "OpenID е сменено",
 "Invalid request" => "Невалидна заявка",
 "Language changed" => "Езика е сменен",
+"Disable" => "Изключване",
+"Enable" => "Включване",
+"Saving..." => "Записване...",
 "Select an App" => "Изберете програма",
 "-licensed" => "-лицензирано",
 "by" => "от",
+"Documentation" => "Документация",
 "Ask a question" => "Задайте въпрос",
 "Problems connecting to help database." => "Проблеми при свързване с помощната база",
 "Go there manually." => "Отидете ръчно.",
 "Answer" => "Отговор",
 "You use" => "Вие ползвате",
 "of the available" => "от наличните",
+"Download" => "Изтегляне",
 "Your password got changed" => "Вашата парола е сменена",
 "Unable to change your password" => "Невъзможна промяна на паролата",
 "Current password" => "Текуща парола",
 "New password" => "Нова парола",
 "show" => "показва",
 "Change password" => "Промяна на парола",
+"Email" => "Е-поща",
+"Your email address" => "Адресът на е-пощата ви",
+"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
 "Language" => "Език",
+"Help translate" => "Помощ за превода",
 "use this address to connect to your ownCloud in your file manager" => "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър",
 "Name" => "Име",
 "Password" => "Парола",
 "Groups" => "Групи",
 "Create" => "Ново",
+"Default Quota" => "Квота по подразбиране",
+"Quota" => "Квота",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index c22ca72396..87f75a2015 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -5,8 +5,8 @@
 "Invalid request" => "Requête invalide",
 "Authentication error" => "Erreur d'authentification",
 "Language changed" => "Langue changée",
-"Disable" => "Désactivé",
-"Enable" => "Activé",
+"Disable" => "Désactiver",
+"Enable" => "Activer",
 "Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
 "Security Warning" => "Alertes de sécurité",
@@ -24,7 +24,7 @@
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
 "You use" => "Vous utilisez",
-"of the available" => "d'espace de stockage sur un total de",
+"of the available" => "de votre espace de stockage d'une taille totale de",
 "Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
 "Download" => "Télécharger",
 "Your password got changed" => "Votre mot de passe a été changé",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 253625b486..ac169fa398 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
+"Authentication error" => "Ошибка авторизации",
 "Language changed" => "Язык изменён",
 "Disable" => "Отключить",
 "Enable" => "Включить",
 "Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
+"Security Warning" => "Предупреждение безопасности",
 "Log" => "Журнал",
 "More" => "Ещё",
 "Add your App" => "Добавить приложение",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 42e6eac5f3..e4907dfba9 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
+"Authentication error" => "Eşleşme hata",
 "Language changed" => "Dil değiştirildi",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
 "Saving..." => "Kaydediliyor...",
 "__language_name__" => "__dil_adı__",
+"Security Warning" => "Güvenlik Uyarisi",
 "Log" => "Günlük",
 "More" => "Devamı",
 "Add your App" => "Uygulamanı Ekle",
@@ -43,6 +45,8 @@
 "Create" => "Oluştur",
 "Default Quota" => "Varsayılan Kota",
 "Other" => "Diğer",
+"SubAdmin" => "Alt Yönetici",
 "Quota" => "Kota",
+"SubAdmin for ..." => "Alt yönetici için ...",
 "Delete" => "Sil"
 );
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
new file mode 100644
index 0000000000..7331ff324c
--- /dev/null
+++ b/settings/l10n/uk.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID змінено",
+"Invalid request" => "Помилковий запит",
+"Language changed" => "Мова змінена",
+"Select an App" => "Вибрати додаток",
+"-licensed" => "-ліцензовано",
+"by" => "по",
+"Ask a question" => "Запитати",
+"Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
+"You use" => "Ви використовуєте",
+"of the available" => "з доступної",
+"Your password got changed" => "Ваш пароль змінено",
+"Current password" => "Поточний пароль",
+"New password" => "Новий пароль",
+"show" => "показати",
+"Change password" => "Змінити пароль",
+"Language" => "Мова",
+"Name" => "Ім'я",
+"Password" => "Пароль",
+"Groups" => "Групи",
+"Create" => "Створити",
+"Delete" => "Видалити"
+);

From 1fe9892292ec9934742b99dea0f831b3a5637d25 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Tue, 31 Jul 2012 23:31:25 +0200
Subject: [PATCH 1213/1537] Fix #476

---
 lib/connector/sabre/locks.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index e95dcf02d2..1db4fc0944 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -41,8 +41,11 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		// NOTE: the following 10 lines or so could be easily replaced by
 		// pure sql. MySQL's non-standard string concatination prevents us
 		// from doing this though.
-		$query = 'SELECT * FROM *PREFIX*locks WHERE userid = ? AND (created + timeout) > ? AND ((uri = ?)';
-		$params = array(OC_User::getUser(),time(),$uri);
+		// NOTE: SQLite requires time() to be inserted directly. That's ugly
+		// but otherwise reading locks from SQLite Databases will return 
+		// nothing
+		$query = 'SELECT * FROM *PREFIX*locks WHERE userid = ? AND (created + timeout) > '.time().' AND (( uri = ?)';
+		$params = array(OC_User::getUser(),$uri);
 
 		// We need to check locks for every part in the uri.
 		$uriParts = explode('/',$uri);
@@ -70,8 +73,8 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		}
 		$query.=')';
 
-		$stmt = OC_DB::prepare($query);
-		$result = $stmt->execute($params);
+		$stmt = OC_DB::prepare($query );
+		$result = $stmt->execute( $params );
 		
 		$lockList = array();
 		while( $row = $result->fetchRow()){

From 274d1ef87f1824101982cc2722915ee0fadc02cf Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 1 Aug 2012 02:02:35 +0200
Subject: [PATCH 1214/1537] [tx-robot] updated from transifex

---
 apps/contacts/l10n/it.php    |  1 +
 apps/files/l10n/it.php       |  5 +++++
 core/l10n/it.php             |  1 +
 l10n/it/contacts.po          |  8 ++++----
 l10n/it/core.po              |  8 ++++----
 l10n/it/files.po             | 16 ++++++++--------
 l10n/templates/bookmarks.pot |  2 +-
 l10n/templates/calendar.pot  |  2 +-
 l10n/templates/contacts.pot  |  2 +-
 l10n/templates/core.pot      |  2 +-
 l10n/templates/files.pot     |  2 +-
 l10n/templates/gallery.pot   |  2 +-
 l10n/templates/lib.pot       |  2 +-
 l10n/templates/media.pot     |  2 +-
 l10n/templates/settings.pot  |  2 +-
 15 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 820104b777..b80bde0d42 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -100,6 +100,7 @@
 "{name}'s Birthday" => "Data di nascita di {name}",
 "Add Contact" => "Aggiungi contatto",
 "Import" => "Importa",
+"Settings" => "Impostazioni",
 "Addressbooks" => "Rubriche",
 "Close" => "Chiudi",
 "Keyboard shortcuts" => "Scorciatoie da tastiera",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index d3dc1a3d08..8764ff4550 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -9,6 +9,11 @@
 "Files" => "File",
 "Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
+"already exists" => "esiste già",
+"replace" => "sostituisci",
+"cancel" => "annulla",
+"replaced" => "sostituito",
+"with" => "con",
 "undo" => "annulla",
 "deleted" => "eliminati",
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1c0bf94ca7..6ee626a727 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -4,6 +4,7 @@
 "This category already exists: " => "Questa categoria esiste già: ",
 "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",
+"Error loading script for the settings" => "Errore di caricamento dello script per le impostazioni",
 "January" => "Gennaio",
 "February" => "Febbraio",
 "March" => "Marzo",
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 39aa2c960f..a6d51ee4f5 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"PO-Revision-Date: 2012-07-31 21:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -441,7 +441,7 @@ msgstr "Importa"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Impostazioni"
 
 #: templates/index.php:18
 msgid "Addressbooks"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index facb1d047d..034071bef1 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"PO-Revision-Date: 2012-07-31 21:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgstr "Impostazioni"
 
 #: js/js.js:203
 msgid "Error loading script for the settings"
-msgstr ""
+msgstr "Errore di caricamento dello script per le impostazioni"
 
 #: js/js.js:573
 msgid "January"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index aefaa88ad2..8e9ebacf2e 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"PO-Revision-Date: 2012-07-31 21:18+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,23 +65,23 @@ msgstr "Elimina"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "esiste già"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "sostituisci"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "annulla"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "sostituito"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "con"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 1a3b060abf..7670957eb3 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 21efc48ca9..268728145d 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 360ad262cf..a1b58e5606 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e21d1b4ba2..f0db3549bf 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 3ad7347fdc..315360d0d2 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index dabcad70e5..8af0f4a2da 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index bb922b56c8..f4b8daced5 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 6f0c62cf2d..8983942319 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index de250242d3..d6ae07cf20 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"POT-Creation-Date: 2012-08-01 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From b6aa5d2875bf171a7cf508102ef16f42b47b984a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 31 Jul 2012 21:05:00 -0400
Subject: [PATCH 1215/1537] Include contacts in share with search

---
 core/ajax/share.php  | 14 +++++++++++++-
 lib/public/share.php |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index c613baa7f5..905c28a1c2 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -66,8 +66,20 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 			break;
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
-				// TODO Include contacts
 				$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'][OCP\Share::SHARE_TYPE_CONTACT]) || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $contact));
+							}
+						}
+					}
+				}
 				$count = 0;
 				$users = array();
 				$limit = 0;
diff --git a/lib/public/share.php b/lib/public/share.php
index 3053da47e8..47181c8c1f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -34,6 +34,9 @@ class Share {
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
 	const SHARE_TYPE_PRIVATE_LINK = 3;
+	const SHARE_TYPE_EMAIL = 4;
+	const SHARE_TYPE_CONTACT = 5;
+	const SHARE_TYPE_REMOTE = 6;
 
 	/** CRUDS permissions (Create, Read, Update, Delete, Share) using a bitmask
 	* Construct permissions for share() and setPermissions with Or (|) e.g. Give user read and update permissions: PERMISSION_READ | PERMISSION_UPDATE

From 83b935a1c2cd827610a3980ed559ff286ef41431 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 31 Jul 2012 21:31:59 -0400
Subject: [PATCH 1216/1537] Prevent up and down arrow from changing the share
 with input value

---
 core/js/share.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 2d6bc653fa..5832acfd45 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -113,7 +113,11 @@ OC.Share={
 					}
 				});
 // 			}
-		}, select: function(event, selected) {
+		},
+		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);

From 98f37b93f62ce01d11234dfca2abfdae7203a92e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 1 Aug 2012 16:23:11 +0200
Subject: [PATCH 1217/1537] Propagate exceptions in OC.appSettings.

---
 core/js/js.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index f053c97b49..04fe5c2874 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -199,8 +199,8 @@ OC={
 								$.ajaxSetup({cache: true});
 							}
 							$.getScript(OC.filePath(props.appid, 'js', scriptname))
-							.fail(function(jqxhr, settings, exception) {
-								settings.append('<span>'+t('core', 'Error loading script for the settings')+'</span>');
+							.fail(function(jqxhr, settings, e) {
+								throw e;
 							});
 						}
 					});

From 8766b3286b479157cb7d6690209ff506fb01974a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 1 Aug 2012 18:03:08 +0200
Subject: [PATCH 1218/1537] fix a subadmin UI bug

---
 settings/js/users.js         | 10 ++++++++++
 settings/templates/users.php |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 7f3b027b4d..8fb587778b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -304,9 +304,13 @@ $(document).ready(function(){
 					tr.attr('data-uid',username);
 					tr.find('td.name').text(username);
 					var select=$('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+					var subadminselect=$('<select multiple="multiple" class="subadminsselect" data-placehoder="Groups" title="' + t('files', 'SubAdmin') + '">');
 					select.data('username',username);
 					select.data('userGroups',groups);
+					subadminselect.data('username',username);
+					subadminselect.data('userGroups',groups);
 					tr.find('td.groups').empty();
+					tr.find('td.subadmins').empty();
 					var allGroups=$('#content table').data('groups').split(', ');
 					for(var i=0;i<groups.length;i++){
 						if(allGroups.indexOf(groups[i])==-1){
@@ -315,12 +319,18 @@ $(document).ready(function(){
 					}
 					$.each(allGroups,function(i,group){
 						select.append($('<option value="'+group+'">'+group+'</option>'));
+						if(group != 'admin'){
+							subadminselect.append($('<option value="'+group+'">'+group+'</option>'));
+						}
 					});
 					tr.find('td.groups').append(select);
+					tr.find('td.subadmins').append(subadminselect);
 					if(tr.find('td.remove img').length==0){
 						tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
 					}
 					applyMultiplySelect(select);
+					applyMultiplySelect(subadminselect);
+					
 					$('#content table tbody').last().append(tr);
 
 					tr.find('select.quota-user option').attr('selected',null);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 3e1eb9a0bb..9b64696547 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -109,7 +109,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 				class="subadminsselect"
 				data-username="<?php echo $user['name'] ;?>"
 				data-subadmin="<?php echo $user['subadmin'] ;?>"
-				data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin for ...')?>"
+				data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin')?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
 					<option value="<?php echo $group;?>">

From 47e4793c30b9efdf419115b77343d456cf17594b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 1 Aug 2012 18:04:06 +0200
Subject: [PATCH 1219/1537] little fix for previous commit

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 8fb587778b..79c95b3729 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -304,7 +304,7 @@ $(document).ready(function(){
 					tr.attr('data-uid',username);
 					tr.find('td.name').text(username);
 					var select=$('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-					var subadminselect=$('<select multiple="multiple" class="subadminsselect" data-placehoder="Groups" title="' + t('files', 'SubAdmin') + '">');
+					var subadminselect=$('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'SubAdmin') + '">');
 					select.data('username',username);
 					select.data('userGroups',groups);
 					subadminselect.data('username',username);

From 2201074e1f1e4ec3c2f60cac74d8168738d83650 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 1 Aug 2012 17:17:28 -0400
Subject: [PATCH 1220/1537] Basic setup for sharing with contacts

---
 core/ajax/share.php  |  2 +-
 lib/public/share.php | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 905c28a1c2..6f5b927c77 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -75,7 +75,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 						foreach ($vcards as $vcard) {
 							$contact = $vcard['fullname'];
 							if (stripos($contact, $_GET['search']) !== false && (!isset($_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' => $contact));
+								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
 							}
 						}
 					}
diff --git a/lib/public/share.php b/lib/public/share.php
index 47181c8c1f..d9bcb8df81 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -187,6 +187,24 @@ class Share {
 			case self::SHARE_TYPE_PRIVATE_LINK:
 				$shareWith = md5(uniqid($item, true));
 				return self::put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions);
+			case self::SHARE_TYPE_CONTACT:
+				if (!\OC_App::isEnabled('contacts')) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the contacts app is not enabled', \OC_Log::ERROR);
+					return false;
+				}
+				$vcard = \OC_Contacts_App::getContactVCard($shareWith);
+				if (!isset($vcard)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the contact does not exist', \OC_Log::ERROR);
+					return false;
+				}
+				$details = OC_Contacts_VCard::structureContact($vcard);
+				// TODO Add ownCloud user to contacts vcard
+				if (!isset($details['EMAIL'])) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because no email address is associated with the contact', \OC_Log::ERROR);
+					return false;
+				}
+				return self::share($itemType, $item, self::SHARE_TYPE_EMAIL, $permissions);
+				break;
 			// Future share types need to include their own conditions
 			default:
 				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);

From 4933128850879f0e0590746b6742dafcf857e113 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 1 Aug 2012 17:52:29 -0400
Subject: [PATCH 1221/1537] Throw exceptions in share API for UI to display

---
 core/ajax/share.php  | 10 +++++++---
 core/js/share.js     |  2 +-
 lib/public/share.php | 43 ++++++++++++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 6f5b927c77..f7a41aa3a4 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -25,9 +25,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 	switch ($_POST['action']) {
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
-				$return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-				// TODO May need to return private link
-				($return) ? OC_JSON::success() : OC_JSON::error();
+				try {
+					OCP\Share::share($_POST['itemType'], $_POST['item'], $_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':
diff --git a/core/js/share.js b/core/js/share.js
index 5832acfd45..a3fe0f6973 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -47,7 +47,7 @@ OC.Share={
 					callback(result.data);
 				}
 			} else {
-				OC.dialogs.alert('Error', 'Error while sharing');
+				OC.dialogs.alert(result.data.message, 'Error while sharing');
 			}
 		});
 	},
diff --git a/lib/public/share.php b/lib/public/share.php
index d9bcb8df81..3cc755866e 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -156,27 +156,32 @@ class Share {
 		switch ($shareType) {
 			case self::SHARE_TYPE_USER:
 				if ($shareWith == $uidOwner) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				}
 				if (!\OC_User::userExists($shareWith)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' does not exist', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$item.' failed, because the user '.$shareWith.' does not exist';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				} else {
 					$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
 					if (empty($inGroup)) {
-						\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of', \OC_Log::ERROR);
-						return false;
+						$message = 'Sharing '.$item.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
+						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+						throw new \Exception($message);
 					}
 				}
 				break;
 			case self::SHARE_TYPE_GROUP:
 				if (!\OC_Group::groupExists($shareWith)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the group '.$shareWith.' does not exist', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$item.' failed, because the group '.$shareWith.' does not exist';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				} else if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith, \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith;
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				}
 				// Convert share with into an array with the keys group and users
 				$group = $shareWith;
@@ -189,19 +194,22 @@ class Share {
 				return self::put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions);
 			case self::SHARE_TYPE_CONTACT:
 				if (!\OC_App::isEnabled('contacts')) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the contacts app is not enabled', \OC_Log::ERROR);
+					$message = 'Sharing '.$item.' failed, because the contacts app is not enabled';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					return false;
 				}
 				$vcard = \OC_Contacts_App::getContactVCard($shareWith);
 				if (!isset($vcard)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the contact does not exist', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$item.' failed, because the contact does not exist';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				}
 				$details = OC_Contacts_VCard::structureContact($vcard);
 				// TODO Add ownCloud user to contacts vcard
 				if (!isset($details['EMAIL'])) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because no email address is associated with the contact', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$item.' failed, because no email address is associated with the contact';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				}
 				return self::share($itemType, $item, self::SHARE_TYPE_EMAIL, $permissions);
 				break;
@@ -211,8 +219,9 @@ class Share {
 				return false;
 		}
 		if (self::getItems($itemType, $item, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
-			\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith, \OC_Log::ERROR);
-			return false;
+			$message = 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith;
+			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+			throw new \Exception($message);
 		}
 		if ($collectionTypes = self::getCollectionItemTypes($itemType)) {
 			foreach ($collectionTypes as $collectionType) {

From 92d683587a54f1ef1348a040c34d1f41f1a1e0ca Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 1 Aug 2012 17:52:59 -0400
Subject: [PATCH 1222/1537] Fix contact email share type redirection

---
 lib/public/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 3cc755866e..5eb690b510 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -204,14 +204,14 @@ class Share {
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
-				$details = OC_Contacts_VCard::structureContact($vcard);
+				$details = \OC_Contacts_VCard::structureContact($vcard);
 				// TODO Add ownCloud user to contacts vcard
 				if (!isset($details['EMAIL'])) {
 					$message = 'Sharing '.$item.' failed, because no email address is associated with the contact';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
-				return self::share($itemType, $item, self::SHARE_TYPE_EMAIL, $permissions);
+				return self::share($itemType, $item, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
 				break;
 			// Future share types need to include their own conditions
 			default:

From a8faae4f421ab8b85c2bd88b9617efb191c3ff62 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 1 Aug 2012 23:59:44 +0200
Subject: [PATCH 1223/1537] Addressbooks settings rewrite and cleanup.

---
 apps/contacts/ajax/activation.php             |  32 ----
 .../add.php}                                  |   6 +-
 .../delete.php}                               |   5 +-
 .../update.php}                               |  23 +--
 apps/contacts/ajax/chooseaddressbook.php      |  15 --
 apps/contacts/ajax/createaddressbook.php      |  36 -----
 apps/contacts/ajax/editaddressbook.php        |  16 --
 apps/contacts/css/contacts.css                |   7 +
 apps/contacts/js/contacts.js                  | 144 +++---------------
 apps/contacts/lib/app.php                     |   5 +-
 apps/contacts/templates/index.php             |   1 -
 .../templates/part.chooseaddressbook.php      |  24 ---
 .../part.chooseaddressbook.rowfields.php      |  18 ---
 apps/contacts/templates/part.contact.php      |   3 +-
 .../templates/part.edit_address_dialog.php    |   1 +
 apps/contacts/templates/part.no_contacts.php  |   1 +
 apps/contacts/templates/settings.php          |  44 +++++-
 17 files changed, 98 insertions(+), 283 deletions(-)
 delete mode 100644 apps/contacts/ajax/activation.php
 rename apps/contacts/ajax/{addaddressbook.php => addressbook/add.php} (90%)
 rename apps/contacts/ajax/{deletebook.php => addressbook/delete.php} (90%)
 rename apps/contacts/ajax/{updateaddressbook.php => addressbook/update.php} (58%)
 delete mode 100644 apps/contacts/ajax/chooseaddressbook.php
 delete mode 100644 apps/contacts/ajax/createaddressbook.php
 delete mode 100644 apps/contacts/ajax/editaddressbook.php
 delete mode 100644 apps/contacts/templates/part.chooseaddressbook.php
 delete mode 100644 apps/contacts/templates/part.chooseaddressbook.rowfields.php

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
deleted file mode 100644
index 69173c54c4..0000000000
--- a/apps/contacts/ajax/activation.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-$bookid = $_POST['bookid'];
-$book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
-
-if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
-	OCP\Util::writeLog('contacts',
-		'ajax/activation.php: Error activating addressbook: '. $bookid, 
-		OCP\Util::ERROR);
-	OCP\JSON::error(array(
-		'data' => array(
-			'message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
-	exit();
-}
-
-OCP\JSON::success(array(
-	'active' => OC_Contacts_Addressbook::isActive($bookid),
-	'bookid' => $bookid,
-	'book'   => $book,
-));
diff --git a/apps/contacts/ajax/addaddressbook.php b/apps/contacts/ajax/addressbook/add.php
similarity index 90%
rename from apps/contacts/ajax/addaddressbook.php
rename to apps/contacts/ajax/addressbook/add.php
index 40773704bb..617c2fd182 100644
--- a/apps/contacts/ajax/addaddressbook.php
+++ b/apps/contacts/ajax/addressbook/add.php
@@ -6,13 +6,13 @@
  * later.
  * See the COPYING-README file.
  */
- 
+
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once 'loghandler.php';
+require_once  __DIR__.'/../loghandler.php';
 
 debug('name: '.$_POST['name']);
 
@@ -34,4 +34,4 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
 	bailOut('Error activating addressbook.');
 }
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
-OCP\JSON::success(array('data' => $addressbook));
+OCP\JSON::success(array('addressbook' => $addressbook));
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/addressbook/delete.php
similarity index 90%
rename from apps/contacts/ajax/deletebook.php
rename to apps/contacts/ajax/addressbook/delete.php
index 1b86ecf223..f59c605f4e 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/addressbook/delete.php
@@ -24,9 +24,12 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
+require_once  __DIR__.'/../loghandler.php';
 
-//$id = $_GET['id'];
 $id = $_POST['id'];
+if(!$id) {
+	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
+}
 OC_Contacts_App::getAddressbook( $id ); // is owner access check
 
 OC_Contacts_Addressbook::delete($id);
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/addressbook/update.php
similarity index 58%
rename from apps/contacts/ajax/updateaddressbook.php
rename to apps/contacts/ajax/addressbook/update.php
index a14b215843..0fc66c3a3b 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/addressbook/update.php
@@ -6,33 +6,34 @@
  * See the COPYING-README file.
  */
 
- 
+
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-require_once 'loghandler.php';
-
-$bookid = $_POST['id'];
-OC_Contacts_App::getAddressbook($bookid); // is owner access check
+require_once  __DIR__.'/../loghandler.php';
 
+$id = $_POST['id'];
 $name = trim(strip_tags($_POST['name']));
+$description = trim(strip_tags($_POST['description']));
+if(!$id) {
+	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
+}
+
 if(!$name) {
 	bailOut(OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'));
 }
 
-if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) {
+if(!OC_Contacts_Addressbook::edit($id, $name, $description)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error updating addressbook.'));
 }
 
-if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
+if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
 	bailOut(OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'));
 }
 
-$addressbook = OC_Contacts_App::getAddressbook($bookid);
-$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('addressbook', $addressbook);
+OC_Contacts_App::getAddressbook($id); // is owner access check
+$addressbook = OC_Contacts_App::getAddressbook($id);
 OCP\JSON::success(array(
-	'page' => $tmpl->fetchPage(),
 	'addressbook' => $addressbook,
 ));
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
deleted file mode 100644
index 1ce8dd46ee..0000000000
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$tmpl = new OCP\Template("contacts", "part.chooseaddressbook");
-$page = $tmpl->fetchPage();
-OCP\JSON::success(array('data' => array('page'=>$page)));
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
deleted file mode 100644
index 8dbd63f642..0000000000
--- a/apps/contacts/ajax/createaddressbook.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-require_once 'loghandler.php';
-
-$userid = OCP\USER::getUser();
-$name = trim(strip_tags($_POST['name']));
-if(!$name) {
-	bailOut('Cannot add addressbook with an empty name.');
-}
-$bookid = OC_Contacts_Addressbook::add($userid, $name, null);
-if(!$bookid) {
-	bailOut('Error adding addressbook: '.$name);
-}
-
-if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
-	bailOut('Error activating addressbook.');
-}
-$addressbook = OC_Contacts_App::getAddressbook($bookid);
-$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('addressbook', $addressbook);
-OCP\JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'addressbook' => $addressbook,
-));
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
deleted file mode 100644
index 4bc77302e5..0000000000
--- a/apps/contacts/ajax/editaddressbook.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-$addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
-$tmpl = new OCP\Template("contacts", "part.editaddressbook");
-$tmpl->assign('new', false);
-$tmpl->assign('addressbook', $addressbook);
-$tmpl->printPage();
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 5350fdd5d3..1a7935aa79 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -134,3 +134,10 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .help-section dl { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
 .help-section dt { display: table-cell; clear: left; float: left; width: 35%; margin: 0; padding: 0.2em; text-align: right; text-overflow: ellipsis; vertical-align: text-bottom; font-weight: bold: }
 .help-section dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0.2em; white-space: nowrap; vertical-align: text-bottom; }
+.contacts-settings dl { width: 100%; }
+.addressbooks-settings table { width: 100%; }
+.addressbooks-settings .actions { width: 100%; white-space: nowrap; }
+.addressbooks-settings .actions * { float: left; }
+.addressbooks-settings .actions input.name { width: 5em; }
+.addressbooks-settings .actions input.name { width: 7em; }
+
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index fa99878174..c53fc5af63 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -22,7 +22,7 @@ Contacts={
 		 * cancel: If set cancel all ongoing timer events and hide the notification.
 		 */
 		notify:function(params) {
-			self = this;
+			var self = this;
 			if(!self.notifier) {
 				self.notifier = $('#notification');
 			}
@@ -40,6 +40,10 @@ Contacts={
 			self.notifier.fadeIn();
 			self.notifier.on('click', function() { $(this).fadeOut();});
 			var timer = setTimeout(function() {
+				if(!self || !self.notifier) {
+					var self = Contacts.UI;
+					self.notifier = $('#notification');
+				}
 				self.notifier.fadeOut();
 				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
 					params.timeouthandler(self.notifier.data(dataid));
@@ -53,6 +57,10 @@ Contacts={
 			}
 			if(params.clickhandler && $.isFunction(params.clickhandler)) {
 				self.notifier.on('click', function() {
+					if(!self || !self.notifier) {
+						var self = Contacts.UI;
+						self.notifier = $(this);
+					}
 					clearTimeout(timer);
 					self.notifier.off('click');
 					params.clickhandler(self.notifier.data(dataid));
@@ -1382,123 +1390,6 @@ Contacts={
 				return false;
 			},
 		},
-		Addressbooks:{
-			overview:function(){
-				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
-					$('#chooseaddressbook_dialog').dialog('moveToTop');
-				}else{
-					$('body').append('<div id="addressbook_dialog"></div>');
-					$.getJSON(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
-						if(jsondata.status == 'success'){
-							$('#addressbook_dialog').html(jsondata.data.page).find('#chooseaddressbook_dialog').dialog({
-								minWidth : 600,
-								close : function(event, ui) {
-									$(this).dialog('destroy').remove();
-									$('#addressbook_dialog').remove();
-								}
-							}).css('overflow','visible');
-						} else {
-							alert(jsondata.data.message);
-							$('#addressbook_dialog').remove();
-						}
-					});
-				}
-				return false;
-			},
-			activation:function(checkbox, bookid){
-				var active = checkbox.checked;
-				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), {bookid: bookid, active: (active?1:0)}, function(jsondata) {
-					if (jsondata.status == 'success'){
-						if(!active) {
-							$('#contacts h3[data-id="'+bookid+'"],#contacts ul[data-id="'+bookid+'"]').remove();
-						} else {
-							Contacts.UI.Contacts.update();
-						}
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						checkbox.checked = !active;
-					}
-				  });
-			},
-			addAddressbook:function(name, description, cb) {
-				$.post(OC.filePath('contacts', 'ajax', 'addaddressbook.php'), { name: name, description: description, active: true },
-					function(jsondata){
-						if(jsondata.status == 'success'){
-							if(cb) {
-								cb(jsondata.data);
-							}
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							return false;
-						}
-				});
-
-			},
-			newAddressbook:function(object){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
-				$(object).closest('tr').after(tr).hide();
-			},
-			editAddressbook:function(object, bookid){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
-				$(object).closest('tr').after(tr).hide();
-			},
-			deleteAddressbook:function(obj, bookid){
-				var check = confirm("Do you really want to delete this address book?");
-				if(check == false){
-					return false;
-				}else{
-					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
-					  function(jsondata) {
-						if (jsondata.status == 'success'){
-							$(obj).closest('tr').remove();
-							$('#contacts h3[data-id="'+bookid+'"],#contacts ul[data-id="'+bookid+'"]').remove();
-							Contacts.UI.Contacts.update();
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					  });
-				}
-			},
-			doImport:function(file, aid){
-				$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
-					function(jsondata){
-						if(jsondata.status != 'success'){
-							Contacts.UI.notify({message:jsondata.data.message});
-						}
-				});
-				return false;
-			},
-			submit:function(button, bookid){
-				var displayname = $("#displayname_"+bookid).val().trim();
-				var active = $("#edit_active_"+bookid+":checked").length;
-				var description = $("#description_"+bookid).val();
-
-				if(displayname.length == 0) {
-					OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error'));
-					return false;
-				}
-				var url;
-				if (bookid == 'new'){
-					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
-				}else{
-					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
-				}
-				$.post(url, { id: bookid, name: displayname, active: active, description: description },
-					function(jsondata){
-						if(jsondata.status == 'success'){
-							$(button).closest('tr').prev().html(jsondata.page).show().next().remove();
-							Contacts.UI.Contacts.update();
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-				});
-			},
-			cancel:function(button, bookid){
-				$(button).closest('tr').prev().show().next().remove();
-			}
-		},
 		Contacts:{
 			contacts:{},
 			deletionQueue:[],
@@ -1613,6 +1504,15 @@ Contacts={
 				//this.contacts[id] = contact;
 				return contact;
 			},
+			doImport:function(file, aid){
+				$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
+					function(jsondata){
+						if(jsondata.status != 'success'){
+							Contacts.UI.notify({message:jsondata.data.message});
+						}
+				});
+				return false;
+			},
 			next:function(reverse) {
 				// TODO: Check if we're last-child/first-child and jump to next/prev address book.
 				var curlistitem = $('#contacts li[data-id="'+Contacts.UI.Card.id+'"]');
@@ -1747,7 +1647,11 @@ $(document).ready(function(){
 
 	//$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
 	$('#bottomcontrols .settings').on('click keydown', function() {
-		OC.appSettings({appid:'contacts'});
+		try {
+			OC.appSettings({appid:'contacts', loadJS:true, cache:false});
+		} catch(e) {
+			console.log('error:', e.message);
+		}
 	});
 	$('#bottomcontrols .import').click(function() {
 		$('#import_upload_start').trigger('click');
@@ -2045,7 +1949,7 @@ $(document).ready(function(){
 					$('#uploadprogressbar').progressbar('value',50);
 					var todo = uploadedfiles;
 					$.each(fileList, function(fileName, data) {
-						Contacts.UI.Addressbooks.doImport(fileName, aid);
+						Contacts.UI.Contacts.doImport(fileName, aid);
 						delete fileList[fileName];
 						numfiles -= 1; uploadedfiles -= 1;
 						$('#uploadprogressbar').progressbar('value',50+(50/(todo-uploadedfiles)));
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 67dfe8f640..3972d0e0a5 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -22,16 +22,18 @@ class OC_Contacts_App {
 	public static $categories = null;
 
 	public static function getAddressbook($id) {
+		// TODO: Throw an exception instead of returning json.
 		$addressbook = OC_Contacts_Addressbook::find( $id );
 		if($addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
 			if ($addressbook === false) {
 				OCP\Util::writeLog('contacts',
 					'Addressbook not found: '. $id,
 					OCP\Util::ERROR);
+				//throw new Exception('Addressbook not found: '. $id);
 				OCP\JSON::error(
 					array(
 						'data' => array(
-							'message' => self::$l10n->t('Addressbook not found.')
+							'message' => self::$l10n->t('Addressbook not found: ' . $id)
 						)
 					)
 				);
@@ -40,6 +42,7 @@ class OC_Contacts_App {
 				OCP\Util::writeLog('contacts',
 					'Addressbook('.$id.') is not from '.OCP\USER::getUser(),
 					OCP\Util::ERROR);
+				//throw new Exception('This is not your addressbook.');
 				OCP\JSON::error(
 					array(
 						'data' => array(
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 7ff139e31c..4c2a19e8d9 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -24,7 +24,6 @@
 	</div>
 </div>
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
-	<div id="appsettings" class="popup bottomleft hidden"></div>
 	<?php
 		if($_['has_contacts']) {
 			echo $this->inc('part.contact');
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
deleted file mode 100644
index caed67736c..0000000000
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<div id="chooseaddressbook_dialog" title="<?php echo $l->t("Configure Address Books"); ?>">
-<table width="100%" style="border: 0;">
-<?php
-$option_addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-for($i = 0; $i < count($option_addressbooks); $i++){
-	echo "<tr>";
-	$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-	$tmpl->assign('addressbook', $option_addressbooks[$i]);
-	$tmpl->assign('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
-	$tmpl->printpage();
-	echo "</tr>";
-}
-?>
-<tr>
-	<td colspan="5" style="padding: 0.5em;">
-		<a class="button" href="#" onclick="Contacts.UI.Addressbooks.newAddressbook(this);"><?php echo $l->t('New Address Book') ?></a>
-	</td>
-</tr>
-<tr>
-	<td colspan="5">
-		<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="carddav_url" onmouseover="$('#carddav_url').select();" title="<?php echo $l->t("CardDav Link"); ?>"><a class="action delete" id="carddav_url_close" style="height: 20px;vertical-align: middle;display: none;" title="close" onclick="$('#carddav_url').hide();$('#carddav_url_close').hide();"/></a></p>
-	</td>
-</tr>
-</table>
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
deleted file mode 100644
index 2988bb44c5..0000000000
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<td width="20px">
-	<input id="active_<?php echo $_['addressbook']["id"]; ?>" type="checkbox" onClick="Contacts.UI.Addressbooks.activation(this, <?php echo $_['addressbook']["id"]; ?>)" <?php echo (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : ''); ?>>
-</td>
-<td>
-	<label for="active_<?php echo $_['addressbook']["id"]; ?>"><?php echo $_['addressbook']["displayname"]; ?></label>
-</td>
-<td width="20px">
-	<a onclick="Contacts.UI.showCardDAVUrl('<?php echo OCP\USER::getUser(); ?>', '<?php echo rawurlencode(html_entity_decode($_['addressbook']['uri'], ENT_QUOTES, 'UTF-8')); ?>');" title="<?php echo $l->t("CardDav Link"); ?>" class="svg action globe"></a>
-</td>
-<td width="20px">
-	<a href="<?php echo OCP\Util::linkTo('contacts', 'export.php'); ?>?bookid=<?php echo $_['addressbook']["id"]; ?>" title="<?php echo $l->t("Download"); ?>" class="svg action download"></a>
-</td>
-<td width="20px">
-	<a title="<?php echo $l->t("Edit"); ?>" class="svg action edit" onclick="Contacts.UI.Addressbooks.editAddressbook(this, <?php echo $_['addressbook']["id"]; ?>);"></a>
-</td>
-<td width="20px">
-	<a onclick="Contacts.UI.Addressbooks.deleteAddressbook(this, <?php echo $_['addressbook']["id"]; ?>);" title="<?php echo $l->t("Delete"); ?>" class="svg action delete"></a>
-</td>
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 4233bffede..3670ce0389 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -1,3 +1,4 @@
+<div id="appsettings" class="popup bottomleft hidden"></div>
 <?php
 $id = isset($_['id']) ? $_['id'] : '';
 ?>
@@ -73,7 +74,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<div id="phones">
 			<ul id="phonelist" class="propertylist">
 				<li class="template hidden" data-element="TEL">
-				<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /> 
+				<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
 				<input type="text" required="required" class="nonempty contacts_property" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
 				<select multiple="multiple" name="parameters[TYPE][]">
 					<?php echo OCP\html_select_options($_['phone_types'], array()) ?>
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
index d5ea95ba46..81e24ba4d0 100644
--- a/apps/contacts/templates/part.edit_address_dialog.php
+++ b/apps/contacts/templates/part.edit_address_dialog.php
@@ -57,6 +57,7 @@ $types = isset($_['types'])?$_['types']:array();
 				<input type="text" id="adr_country" name="value[ADR][6]" placeholder="<?php echo $l->t('Country'); ?>" value="<?php echo isset($adr[6])?$adr[6]:''; ?>">
 			</dd>
 		</dl>
+		<div style="width: 100%; text-align:center;">Powered by <a href="http://geonames.org/" target="_blank">geonames.org</a></div>
 	</fieldset>
 	</form>
 </div>
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
index 5faa481bc3..be12092d45 100644
--- a/apps/contacts/templates/part.no_contacts.php
+++ b/apps/contacts/templates/part.no_contacts.php
@@ -1,3 +1,4 @@
+<div id="appsettings" class="popup bottomleft hidden"></div>
 <div id="firstrun">
 	<?php echo $l->t('You have no contacts in your addressbook.') ?>
 	<div id="selections">
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index c42de12fa7..85dbca36fa 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -6,13 +6,49 @@
 		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?></code></dd>
 		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
 		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
-		<dt><?php echo $l->t('Read only vCard directory link(s)'); ?></dt>
-		<dd>
+		<dt class="hidden"><?php echo $l->t('Addressbooks'); ?></dt>
+		<dd class="addressbooks-settings hidden">
+			<table>
 			<?php foreach($_['addressbooks'] as $addressbook) { ?>
-			<a href="<?php echo OCP\Util::linkToRemote('carddav').'addressbooks/'.OCP\USER::getUser().'/'.rawurlencode($addressbook['uri']) ?>?export"><?php echo $addressbook['displayname'] ?></a><br />
+			<tr class="addressbook" data-id="<?php echo $addressbook['id'] ?>" data-uri="<?php echo $addressbook['uri'] ?>">
+				<td class="active">
+					<input type="checkbox" <?php echo (($addressbook['active']) == '1' ? ' checked="checked"' : ''); ?> />
+				</td>
+				<td class="name"><?php echo $addressbook['displayname'] ?></td>
+				<td class="description"><?php echo $addressbook['description'] ?></td>
+				<td class="action">
+					<a class="svg action globe" title="<?php echo $l->t('Show CardDav link'); ?>"></a>
+				</td>
+				<td class="action">
+					<a class="svg action cloud" title="<?php echo $l->t('Show read-only VCF link'); ?>"></a>
+				</td>
+				<td class="action">
+					<a class="svg action download" title="<?php echo $l->t('Download'); ?>"
+						href="<?php echo OCP\Util::linkToRemote('carddav').'addressbooks/'.OCP\USER::getUser().'/'
+						.rawurlencode($addressbook['uri']) ?>?export"></a>
+				</td>
+				<td class="action">
+					<a class="svg action edit" title="<?php echo $l->t("Edit"); ?>"></a>
+				</td>
+				<td class="action">
+					<a class="svg action delete" title="<?php echo $l->t("Delete"); ?>"></a>
+				</td>
+			</tr>
 			<?php } ?>
+			</table>
+			<div class="actions" style="width: 100%;">
+				<input class="active hidden" type="checkbox" />
+				<button class="new"><?php echo $l->t('New Address Book') ?></button>
+				<input class="name hidden" type="text" autofocus="autofocus" placeholder="<?php echo $l->t('Name'); ?>" />
+				<input class="description hidden" type="text" placeholder="<?php echo $l->t('Description'); ?>" />
+				<input class="link hidden" style="width: 80%" type="text" autofocus="autofocus" />
+				<button class="save hidden"><?php echo $l->t('Save') ?></button>
+				<button class="cancel hidden"><?php echo $l->t('Cancel') ?></button>
+			</div>
 		</dd>
 		</dl>
-		Powered by <a href="http://geonames.org/" target="_blank">geonames.org webservice</a>
+		<div style="width: 100%; clear: both;">
+			<button class="moreless"><?php echo $l->t('More...') ?></button>
+		</div>
 	</fieldset>
 </form>

From f159f607deff03201fb3b35ce1d01ef532d918fe Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 00:01:48 +0200
Subject: [PATCH 1224/1537] And then the missing files ;)

---
 apps/contacts/ajax/addressbook/activate.php |  32 ++++
 apps/contacts/js/settings.js                | 186 ++++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 apps/contacts/ajax/addressbook/activate.php
 create mode 100644 apps/contacts/js/settings.js

diff --git a/apps/contacts/ajax/addressbook/activate.php b/apps/contacts/ajax/addressbook/activate.php
new file mode 100644
index 0000000000..a8dec21dac
--- /dev/null
+++ b/apps/contacts/ajax/addressbook/activate.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
+
+$id = $_POST['id'];
+$book = OC_Contacts_App::getAddressbook($id);// is owner access check
+
+if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
+	OCP\Util::writeLog('contacts',
+		'ajax/activation.php: Error activating addressbook: '. $id,
+		OCP\Util::ERROR);
+	OCP\JSON::error(array(
+		'data' => array(
+			'message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
+	exit();
+}
+
+OCP\JSON::success(array(
+	'active' => OC_Contacts_Addressbook::isActive($id),
+	'id' => $id,
+	'addressbook'   => $book,
+));
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
new file mode 100644
index 0000000000..b79e52cb87
--- /dev/null
+++ b/apps/contacts/js/settings.js
@@ -0,0 +1,186 @@
+OC.Contacts = OC.Contacts || {};
+OC.Contacts.Settings = OC.Contacts.Settings || {
+	init:function() {
+		this.Addressbook.adrsettings = $('.addressbooks-settings').first();
+		this.Addressbook.adractions = $('#contacts-settings').find('div.actions');
+		console.log('actions: ' + this.Addressbook.adractions.length);
+	},
+	Addressbook:{
+		showActions:function(act) {
+			this.adractions.children().hide();
+			this.adractions.children('.'+act.join(',.')).show();
+		},
+		doActivate:function(id, tgt) {
+			var active = tgt.is(':checked');
+			console.log('doActivate: ', id, active);
+			$.post(OC.filePath('contacts', 'ajax', 'addressbook/activate.php'), {id: id, active: Number(active)}, function(jsondata) {
+				if (jsondata.status == 'success'){
+					if(!active) {
+						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
+					} else {
+						Contacts.UI.Contacts.update();
+					}
+				} else {
+					console.log('Error:', jsondata.data.message);
+					Contacts.UI.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
+					tgt.checked = !active;
+				}
+			});
+		},
+		doDelete:function(id) {
+			console.log('doDelete: ', id);
+			var check = confirm('Do you really want to delete this address book?');
+			if(check == false){
+				return false;
+			} else {
+				$.post(OC.filePath('contacts', 'ajax', 'addressbook/delete.php'), { id: id}, function(jsondata) {
+					if (jsondata.status == 'success'){
+						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
+						$('.addressbooks-settings tr[data-id="'+id+'"]').remove()
+						Contacts.UI.Contacts.update();
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			}
+		},
+		doEdit:function(id) {
+			console.log('doEdit: ', id);
+			this.showActions(['active', 'name', 'description', 'save', 'cancel']);
+			var name = this.adrsettings.find('[data-id="'+id+'"]').find('.name').text();
+			var description = this.adrsettings.find('[data-id="'+id+'"]').find('.description').text();
+			var active = this.adrsettings.find('[data-id="'+id+'"]').find(':checkbox').is(':checked');
+			console.log('name, desc', name, description);
+			this.adractions.find('.active').prop('checked', active);
+			this.adractions.find('.name').val(name);
+			this.adractions.find('.description').val(description);
+			this.adractions.data('id', id);
+		},
+		doSave:function() {
+			var name = this.adractions.find('.name').val();
+			var description = this.adractions.find('.description').val();
+			var active = this.adractions.find('.active').is(':checked');
+			var id = this.adractions.data('id');
+			console.log('doSave:', id, name, description, active);
+
+			if(name.length == 0) {
+				OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error'));
+				return false;
+			}
+			var url;
+			if (id == 'new'){
+				url = OC.filePath('contacts', 'ajax', 'addressbook/add.php');
+			}else{
+				url = OC.filePath('contacts', 'ajax', 'addressbook/update.php');
+			}
+			self = this;
+			$.post(url, { id: id, name: name, active: Number(active), description: description },
+				function(jsondata){
+					if(jsondata.status == 'success'){
+						self.showActions(['new',]);
+						self.adractions.removeData('id');
+						active = Boolean(Number(jsondata.addressbook.active));
+						if(id == 'new') {
+							self.adrsettings.find('table')
+								.append('<tr class="addressbook" data-id="'+jsondata.addressbook.id+'" data-uri="'+jsondata.addressbook.uri+'">'
+									+ '<td class="active"><input type="checkbox" '+(active ? 'checked="checked"' : '')+' /></td>'
+									+ '<td class="name">'+jsondata.addressbook.displayname+'</td>'
+									+ '<td class="description">'+jsondata.addressbook.description+'</td>'
+									+ '<td class="action"><a class="svg action globe" title="'+t('contacts', 'Show CardDav link')+'"></a></td>'
+									+ '<td class="action"><a class="svg action cloud" title="'+t('contacts', 'Show read-only VCF link')+'"></a></td>'
+									+ '<td class="action"><a class="svg action download" title="'+t('contacts', 'Download')+'" '
+									+ 'href="'+totalurl+'/'+encodeURIComponent(oc_current_user)+'/'
+									+ encodeURIComponent(jsondata.addressbook.uri)+'?export"></a></td>'
+									+ '<td class="action"><a class="svg action edit" title="'+t('contacts', 'Edit')+'"></a></td>'
+									+ '<td class="action"><a class="svg action delete" title="'+t('contacts', 'Delete')+'"></a></td>'
+									+ '</tr>');
+						} else {
+						var row = self.adrsettings.find('tr[data-id="'+id+'"]');
+							row.find('td.active').find('input:checkbox').prop('checked', active);
+							row.find('td.name').text(jsondata.addressbook.displayname);
+							row.find('td.description').text(jsondata.addressbook.description);
+						}
+						Contacts.UI.Contacts.update();
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+			});
+		},
+		showCardDAV:function(id) {
+			console.log('showCardDAV: ', id);
+			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
+			this.adractions.find('.link').val(totalurl+'/'+encodeURIComponent(oc_current_user)+'/');
+			this.showActions(['link','cancel']);
+		},
+		showVCF:function(id) {
+			console.log('showVCF: ', id);
+			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
+			this.adractions.find('.link').val(totalurl+'/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(row.data('uri'))+'?export');
+			this.showActions(['link','cancel']);
+		}
+	}
+};
+
+
+$(document).ready(function() {
+	OC.Contacts.Settings.init();
+
+	var moreless = $('#contacts-settings').find('.moreless').first();
+	moreless.keydown(function(event) {
+		if(event.which == 13 || event.which == 32) {
+			moreless.click();
+		}
+	});
+	moreless.on('click', function(event) {
+		event.preventDefault();
+		if(OC.Contacts.Settings.Addressbook.adrsettings.is(':visible')) {
+			OC.Contacts.Settings.Addressbook.adrsettings.slideUp();
+			OC.Contacts.Settings.Addressbook.adrsettings.prev('dt').hide();
+			moreless.text(t('contacts', 'More...'));
+		} else {
+			OC.Contacts.Settings.Addressbook.adrsettings.slideDown();
+			OC.Contacts.Settings.Addressbook.adrsettings.prev('dt').show();
+			moreless.text(t('contacts', 'Less...'));
+		}
+	});
+
+	OC.Contacts.Settings.Addressbook.adrsettings.keydown(function(event) {
+		if(event.which == 13 || event.which == 32) {
+			OC.Contacts.Settings.Addressbook.adrsettings.click();
+		}
+	});
+
+
+	OC.Contacts.Settings.Addressbook.adrsettings.on('click', function(event){
+		$('.tipsy').remove();
+		var tgt = $(event.target);
+		if(tgt.is('a') || tgt.is(':checkbox')) {
+			var id = tgt.parents('tr').first().data('id');
+			if(!id) {
+				return;
+			}
+			if(tgt.is(':checkbox')) {
+				OC.Contacts.Settings.Addressbook.doActivate(id, tgt);
+			} else if(tgt.is('a')) {
+				if(tgt.hasClass('edit')) {
+					OC.Contacts.Settings.Addressbook.doEdit(id);
+				} else if(tgt.hasClass('delete')) {
+					OC.Contacts.Settings.Addressbook.doDelete(id);
+				} else if(tgt.hasClass('globe')) {
+					OC.Contacts.Settings.Addressbook.showCardDAV(id);
+				} else if(tgt.hasClass('cloud')) {
+					OC.Contacts.Settings.Addressbook.showVCF(id);
+				}
+			}
+		} else if(tgt.is('button')) {
+			event.preventDefault();
+			if(tgt.hasClass('save')) {
+				OC.Contacts.Settings.Addressbook.doSave();
+			} else if(tgt.hasClass('cancel')) {
+				OC.Contacts.Settings.Addressbook.showActions(['new']);
+			} else if(tgt.hasClass('new')) {
+				OC.Contacts.Settings.Addressbook.doEdit('new');
+			}
+		}
+	});
+});

From 26e406c3c0ec478f29095d1d03cbb3afe04aa160 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 1 Aug 2012 18:03:00 -0400
Subject: [PATCH 1225/1537] Hide 'can edit' if not checked

---
 core/js/share.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index a3fe0f6973..e3dfd27e76 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -165,7 +165,12 @@ OC.Share={
 		var html = '<li 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) {
-			html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
+			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>';

From 91e828c6ce248a0f7d7ddde9d2c33bfea7f7428f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 2 Aug 2012 02:06:16 +0200
Subject: [PATCH 1226/1537] [tx-robot] updated from transifex

---
 apps/contacts/l10n/ar.php       |  13 +-
 apps/contacts/l10n/ca.php       |  19 +-
 apps/contacts/l10n/cs_CZ.php    |  19 +-
 apps/contacts/l10n/da.php       |  19 +-
 apps/contacts/l10n/de.php       |  19 +-
 apps/contacts/l10n/el.php       |  18 +-
 apps/contacts/l10n/eo.php       |  19 +-
 apps/contacts/l10n/es.php       |  19 +-
 apps/contacts/l10n/et_EE.php    |  19 +-
 apps/contacts/l10n/eu.php       |  55 ++++-
 apps/contacts/l10n/fa.php       |  19 +-
 apps/contacts/l10n/fi_FI.php    |  15 +-
 apps/contacts/l10n/fr.php       |  18 +-
 apps/contacts/l10n/gl.php       |  19 +-
 apps/contacts/l10n/he.php       |  19 +-
 apps/contacts/l10n/hr.php       |  19 +-
 apps/contacts/l10n/hu_HU.php    |  19 +-
 apps/contacts/l10n/ia.php       |  12 +-
 apps/contacts/l10n/it.php       |  18 +-
 apps/contacts/l10n/ja_JP.php    |  46 +++-
 apps/contacts/l10n/ko.php       |  19 +-
 apps/contacts/l10n/lb.php       |  15 +-
 apps/contacts/l10n/lt_LT.php    |  13 +-
 apps/contacts/l10n/mk.php       |  19 +-
 apps/contacts/l10n/ms_MY.php    |  19 +-
 apps/contacts/l10n/nb_NO.php    |  19 +-
 apps/contacts/l10n/nl.php       |  19 +-
 apps/contacts/l10n/nn_NO.php    |  13 +-
 apps/contacts/l10n/pl.php       |  52 +++-
 apps/contacts/l10n/pt_BR.php    |  19 +-
 apps/contacts/l10n/pt_PT.php    |  19 +-
 apps/contacts/l10n/ro.php       |  15 +-
 apps/contacts/l10n/ru.php       |  19 +-
 apps/contacts/l10n/sk_SK.php    |  19 +-
 apps/contacts/l10n/sl.php       |  19 +-
 apps/contacts/l10n/sr.php       |   8 +-
 apps/contacts/l10n/sr@latin.php |   4 +-
 apps/contacts/l10n/sv.php       |  19 +-
 apps/contacts/l10n/th_TH.php    |  19 +-
 apps/contacts/l10n/tr.php       |  18 +-
 apps/contacts/l10n/uk.php       |   6 +-
 apps/contacts/l10n/vi.php       |   7 +-
 apps/contacts/l10n/zh_CN.php    |  19 +-
 apps/contacts/l10n/zh_TW.php    |  17 +-
 core/l10n/it.php                |   1 -
 l10n/af/contacts.po             | 313 ++++++++++++------------
 l10n/af/core.po                 |   8 +-
 l10n/af/settings.po             |  10 +-
 l10n/ar/contacts.po             | 313 ++++++++++++------------
 l10n/ar/core.po                 |   8 +-
 l10n/ar/settings.po             |  10 +-
 l10n/ar_SA/contacts.po          | 313 ++++++++++++------------
 l10n/ar_SA/core.po              |   8 +-
 l10n/ar_SA/settings.po          |  10 +-
 l10n/bg_BG/contacts.po          | 313 ++++++++++++------------
 l10n/bg_BG/core.po              |   8 +-
 l10n/bg_BG/settings.po          |  12 +-
 l10n/ca/contacts.po             | 319 +++++++++++++------------
 l10n/ca/core.po                 |   8 +-
 l10n/ca/settings.po             |  12 +-
 l10n/cs_CZ/contacts.po          | 315 ++++++++++++------------
 l10n/cs_CZ/core.po              |   8 +-
 l10n/cs_CZ/settings.po          |  10 +-
 l10n/da/contacts.po             | 315 ++++++++++++------------
 l10n/da/core.po                 |   8 +-
 l10n/da/settings.po             |  10 +-
 l10n/de/contacts.po             | 319 +++++++++++++------------
 l10n/de/core.po                 |   8 +-
 l10n/de/settings.po             |  12 +-
 l10n/el/contacts.po             | 317 +++++++++++++------------
 l10n/el/core.po                 |   8 +-
 l10n/el/settings.po             |  12 +-
 l10n/eo/contacts.po             | 315 ++++++++++++------------
 l10n/eo/core.po                 |   8 +-
 l10n/eo/settings.po             |  10 +-
 l10n/es/contacts.po             | 315 ++++++++++++------------
 l10n/es/core.po                 |   8 +-
 l10n/es/settings.po             |  12 +-
 l10n/et_EE/contacts.po          | 315 ++++++++++++------------
 l10n/et_EE/core.po              |   8 +-
 l10n/et_EE/settings.po          |  10 +-
 l10n/eu/contacts.po             | 407 +++++++++++++++++---------------
 l10n/eu/core.po                 |   8 +-
 l10n/eu/settings.po             |  16 +-
 l10n/eu_ES/contacts.po          | 313 ++++++++++++------------
 l10n/eu_ES/core.po              |   8 +-
 l10n/eu_ES/settings.po          |  12 +-
 l10n/fa/contacts.po             | 315 ++++++++++++------------
 l10n/fa/core.po                 |   8 +-
 l10n/fa/settings.po             |  10 +-
 l10n/fi_FI/contacts.po          | 315 ++++++++++++------------
 l10n/fi_FI/core.po              |   8 +-
 l10n/fi_FI/settings.po          |  12 +-
 l10n/fr/contacts.po             | 317 +++++++++++++------------
 l10n/fr/core.po                 |   8 +-
 l10n/fr/settings.po             |  12 +-
 l10n/gl/contacts.po             | 315 ++++++++++++------------
 l10n/gl/core.po                 |   8 +-
 l10n/gl/settings.po             |  10 +-
 l10n/he/contacts.po             | 315 ++++++++++++------------
 l10n/he/core.po                 |   8 +-
 l10n/he/settings.po             |  10 +-
 l10n/hr/contacts.po             | 315 ++++++++++++------------
 l10n/hr/core.po                 |   8 +-
 l10n/hr/settings.po             |  10 +-
 l10n/hu_HU/contacts.po          | 315 ++++++++++++------------
 l10n/hu_HU/core.po              |   8 +-
 l10n/hu_HU/settings.po          |  10 +-
 l10n/hy/contacts.po             | 313 ++++++++++++------------
 l10n/hy/core.po                 |   8 +-
 l10n/hy/settings.po             |  10 +-
 l10n/ia/contacts.po             | 315 ++++++++++++------------
 l10n/ia/core.po                 |   8 +-
 l10n/ia/settings.po             |  10 +-
 l10n/id/contacts.po             | 313 ++++++++++++------------
 l10n/id/core.po                 |   8 +-
 l10n/id/settings.po             |  10 +-
 l10n/id_ID/contacts.po          | 313 ++++++++++++------------
 l10n/id_ID/core.po              |   8 +-
 l10n/id_ID/settings.po          |  10 +-
 l10n/it/contacts.po             | 319 +++++++++++++------------
 l10n/it/core.po                 |  10 +-
 l10n/it/settings.po             |  12 +-
 l10n/ja_JP/contacts.po          | 379 +++++++++++++++--------------
 l10n/ja_JP/core.po              |   8 +-
 l10n/ja_JP/settings.po          |  14 +-
 l10n/ko/contacts.po             | 315 ++++++++++++------------
 l10n/ko/core.po                 |   8 +-
 l10n/ko/settings.po             |  10 +-
 l10n/lb/contacts.po             | 315 ++++++++++++------------
 l10n/lb/core.po                 |   8 +-
 l10n/lb/settings.po             |  10 +-
 l10n/lt_LT/contacts.po          | 315 ++++++++++++------------
 l10n/lt_LT/core.po              |   8 +-
 l10n/lt_LT/settings.po          |  10 +-
 l10n/lv/contacts.po             | 313 ++++++++++++------------
 l10n/lv/core.po                 |   8 +-
 l10n/lv/settings.po             |  10 +-
 l10n/mk/contacts.po             | 315 ++++++++++++------------
 l10n/mk/core.po                 |   8 +-
 l10n/mk/settings.po             |  10 +-
 l10n/ms_MY/contacts.po          | 315 ++++++++++++------------
 l10n/ms_MY/core.po              |   8 +-
 l10n/ms_MY/settings.po          |  10 +-
 l10n/nb_NO/contacts.po          | 315 ++++++++++++------------
 l10n/nb_NO/core.po              |   8 +-
 l10n/nb_NO/settings.po          |  10 +-
 l10n/nl/contacts.po             | 315 ++++++++++++------------
 l10n/nl/core.po                 |   8 +-
 l10n/nl/settings.po             |  10 +-
 l10n/nn_NO/contacts.po          | 313 ++++++++++++------------
 l10n/nn_NO/core.po              |   8 +-
 l10n/nn_NO/settings.po          |  10 +-
 l10n/pl/contacts.po             | 401 ++++++++++++++++---------------
 l10n/pl/core.po                 |   8 +-
 l10n/pl/settings.po             |  16 +-
 l10n/pt_BR/contacts.po          | 315 ++++++++++++------------
 l10n/pt_BR/core.po              |   8 +-
 l10n/pt_BR/settings.po          |  10 +-
 l10n/pt_PT/contacts.po          | 315 ++++++++++++------------
 l10n/pt_PT/core.po              |   8 +-
 l10n/pt_PT/settings.po          |  10 +-
 l10n/ro/contacts.po             | 313 ++++++++++++------------
 l10n/ro/core.po                 |   8 +-
 l10n/ro/settings.po             |  10 +-
 l10n/ru/contacts.po             | 315 ++++++++++++------------
 l10n/ru/core.po                 |   8 +-
 l10n/ru/settings.po             |  12 +-
 l10n/sk_SK/contacts.po          | 315 ++++++++++++------------
 l10n/sk_SK/core.po              |   8 +-
 l10n/sk_SK/settings.po          |  10 +-
 l10n/sl/contacts.po             | 315 ++++++++++++------------
 l10n/sl/core.po                 |   8 +-
 l10n/sl/settings.po             |  12 +-
 l10n/so/contacts.po             | 313 ++++++++++++------------
 l10n/so/core.po                 |   8 +-
 l10n/so/settings.po             |  10 +-
 l10n/sr/contacts.po             | 313 ++++++++++++------------
 l10n/sr/core.po                 |   8 +-
 l10n/sr/settings.po             |  10 +-
 l10n/sr@latin/contacts.po       | 313 ++++++++++++------------
 l10n/sr@latin/core.po           |   8 +-
 l10n/sr@latin/settings.po       |  10 +-
 l10n/sv/contacts.po             | 315 ++++++++++++------------
 l10n/sv/core.po                 |   8 +-
 l10n/sv/settings.po             |  12 +-
 l10n/templates/bookmarks.pot    |   2 +-
 l10n/templates/calendar.pot     |   2 +-
 l10n/templates/contacts.pot     | 311 ++++++++++++------------
 l10n/templates/core.pot         |   6 +-
 l10n/templates/files.pot        |   2 +-
 l10n/templates/gallery.pot      |   2 +-
 l10n/templates/lib.pot          |   2 +-
 l10n/templates/media.pot        |   2 +-
 l10n/templates/settings.pot     |   8 +-
 l10n/th_TH/contacts.po          | 315 ++++++++++++------------
 l10n/th_TH/core.po              |   8 +-
 l10n/th_TH/settings.po          |  10 +-
 l10n/tr/contacts.po             | 317 +++++++++++++------------
 l10n/tr/core.po                 |   8 +-
 l10n/tr/settings.po             |  12 +-
 l10n/uk/contacts.po             | 313 ++++++++++++------------
 l10n/uk/core.po                 |   8 +-
 l10n/uk/settings.po             |  12 +-
 l10n/vi/contacts.po             | 313 ++++++++++++------------
 l10n/vi/core.po                 |   8 +-
 l10n/vi/settings.po             |  10 +-
 l10n/zh_CN/contacts.po          | 315 ++++++++++++------------
 l10n/zh_CN/core.po              |   8 +-
 l10n/zh_CN/settings.po          |  10 +-
 l10n/zh_TW/contacts.po          | 315 ++++++++++++------------
 l10n/zh_TW/core.po              |   8 +-
 l10n/zh_TW/settings.po          |  10 +-
 settings/l10n/ca.php            |   1 -
 settings/l10n/de.php            |   1 -
 settings/l10n/el.php            |   1 -
 settings/l10n/es.php            |   1 -
 settings/l10n/eu.php            |   3 +
 settings/l10n/fr.php            |   1 -
 settings/l10n/it.php            |   1 -
 settings/l10n/ja_JP.php         |   2 +
 settings/l10n/pl.php            |   2 +
 settings/l10n/sl.php            |   1 -
 settings/l10n/sv.php            |   1 -
 settings/l10n/tr.php            |   1 -
 225 files changed, 9842 insertions(+), 9273 deletions(-)

diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 2b3a0c97be..317d3ce386 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
 "There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
+"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
+"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
 "Error deleting contact property." => "خطء خلال محي الصفه.",
 "Error updating contact property." => "خطء خلال تعديل الصفه.",
-"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "Contacts" => "المعارف",
 "Contact" => "معرفه",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
@@ -26,10 +26,6 @@
 "Birthday" => "تاريخ الميلاد",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
-"New Address Book" => "كتاب عناوين جديد",
-"CardDav Link" => "وصلة CardDav",
-"Download" => "انزال",
-"Edit" => "تعديل",
 "Delete" => "حذف",
 "Preferred" => "مفضل",
 "Phone" => "الهاتف",
@@ -49,5 +45,8 @@
 "Active" => "فعال",
 "Save" => "حفظ",
 "Submit" => "ارسال",
-"Cancel" => "الغاء"
+"Cancel" => "الغاء",
+"Download" => "انزال",
+"Edit" => "تعديل",
+"New Address Book" => "كتاب عناوين جديد"
 );
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 256182f02c..4bb667a955 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
 "There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
 "element name is not set." => "no s'ha establert el nom de l'element.",
 "id is not set." => "no s'ha establert la id.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
 "Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
 "Error adding contact property: " => "Error en afegir la propietat del contacte:",
+"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
+"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
+"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
 "No ID provided" => "No heu facilitat cap ID",
 "Error setting checksum." => "Error en establir la suma de verificació.",
 "No categories selected for deletion." => "No heu seleccionat les categories a eliminar.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
 "Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
 "Error updating contact property." => "Error en actualitzar la propietat del contacte.",
-"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
-"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
 "Error uploading contacts to storage." => "Error en carregar contactes a l'emmagatzemament.",
 "There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer carregat supera la directiva upload_max_filesize de php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Resultat: ",
 " imported, " => " importat, ",
 " failed." => " fallada.",
-"Addressbook not found." => "No s'ha trobat la llibreta d'adreces.",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Address" => "Adreça",
@@ -100,6 +99,7 @@
 "{name}'s Birthday" => "Aniversari de {name}",
 "Add Contact" => "Afegeix un contacte",
 "Import" => "Importa",
+"Settings" => "Configuració",
 "Addressbooks" => "Llibretes d'adreces",
 "Close" => "Tanca",
 "Keyboard shortcuts" => "Dreceres de teclat",
@@ -113,12 +113,6 @@
 "Add new contact" => "Afegeix un contacte nou",
 "Add new addressbook" => "Afegeix una llibreta d'adreces nova",
 "Delete current contact" => "Esborra el contacte",
-"Configure Address Books" => "Configura les llibretes d'adreces",
-"New Address Book" => "Nova llibreta d'adreces",
-"CardDav Link" => "Enllaç CardDav",
-"Download" => "Baixa",
-"Edit" => "Edita",
-"Delete" => "Suprimeix",
 "Drop photo to upload" => "Elimina la foto a carregar",
 "Delete current photo" => "Elimina la foto actual",
 "Edit current photo" => "Edita la foto actual",
@@ -126,6 +120,7 @@
 "Select photo from ownCloud" => "Selecciona una foto de ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma",
 "Edit name details" => "Edita detalls del nom",
+"Delete" => "Suprimeix",
 "Nickname" => "Sobrenom",
 "Enter nickname" => "Escriviu el sobrenom",
 "Web site" => "Adreça web",
@@ -206,5 +201,7 @@
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Enllaç(os) vCard només de lectura"
+"Download" => "Baixa",
+"Edit" => "Edita",
+"New Address Book" => "Nova llibreta d'adreces"
 );
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 834fa47240..e0f70b1c64 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
 "There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
 "element name is not set." => "jméno elementu není nastaveno.",
 "id is not set." => "id neni nastaveno.",
 "Cannot add empty property." => "Nelze přidat prazdný údaj.",
 "At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
 "Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
+"Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
+"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
+"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
 "No ID provided" => "ID nezadáno",
 "Error setting checksum." => "Chyba při nastavování kontrolního součtu.",
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány k smazání.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Něco se pokazilo. ",
 "Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
-"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
-"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
 "Error uploading contacts to storage." => "Chyba při nahrávání kontaktů do úložiště.",
 "There is no error, the file uploaded with success" => "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Výsledek: ",
 " imported, " => "importováno v pořádku,",
 " failed." => "neimportováno.",
-"Addressbook not found." => "Adresář nenalezen.",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
 "Address" => "Adresa",
@@ -85,12 +84,6 @@
 "Import" => "Import",
 "Addressbooks" => "Adresáře",
 "Close" => "Zavřít",
-"Configure Address Books" => "Nastavit adresáře",
-"New Address Book" => "Nový adresář",
-"CardDav Link" => "CardDav odkaz",
-"Download" => "Stažení",
-"Edit" => "Editovat",
-"Delete" => "Odstranit",
 "Drop photo to upload" => "Přetáhněte sem fotku pro její nahrání",
 "Delete current photo" => "Smazat současnou fotku",
 "Edit current photo" => "Upravit současnou fotku",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami",
 "Edit name details" => "Upravit podrobnosti jména",
+"Delete" => "Odstranit",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
 "dd-mm-yyyy" => "dd. mm. yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Adresa pro synchronizaci pomocí CardDAV:",
 "more info" => "víc informací",
 "Primary address (Kontact et al)" => "Hlavní adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Stažení",
+"Edit" => "Editovat",
+"New Address Book" => "Nový adresář"
 );
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index cae783d297..1744199af2 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
 "There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
 "element name is not set." => "Elementnavnet er ikke medsendt.",
 "id is not set." => "Intet ID medsendt.",
 "Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
 "At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
 "Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
+"Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
+"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
+"Error updating addressbook." => "Fejl ved opdatering af adressebog",
 "No ID provided" => "Intet ID medsendt",
 "Error setting checksum." => "Kunne ikke sætte checksum.",
 "No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
 "Something went FUBAR. " => "Noget gik grueligt galt. ",
 "Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
-"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
-"Error updating addressbook." => "Fejl ved opdatering af adressebog",
 "Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
 "There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Resultat:",
 " imported, " => " importeret ",
 " failed." => " fejl.",
-"Addressbook not found." => "Adressebogen blev ikke fundet.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
 "Address" => "Adresse",
@@ -85,12 +84,6 @@
 "Import" => "Importer",
 "Addressbooks" => "Adressebøger",
 "Close" => "Luk",
-"Configure Address Books" => "Konfigurer adressebøger",
-"New Address Book" => "Ny adressebog",
-"CardDav Link" => "CardDav-link",
-"Download" => "Download",
-"Edit" => "Rediger",
-"Delete" => "Slet",
 "Drop photo to upload" => "Drop foto for at uploade",
 "Delete current photo" => "Slet nuværende foto",
 "Edit current photo" => "Rediger nuværende foto",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Vælg foto fra ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
 "Edit name details" => "Rediger navnedetaljer.",
+"Delete" => "Slet",
 "Nickname" => "Kaldenavn",
 "Enter nickname" => "Indtast kaldenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
 "more info" => "mere info",
 "Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Download",
+"Edit" => "Rediger",
+"New Address Book" => "Ny adressebog"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index b76c5ce071..2d1a3cdb2d 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
 "There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
 "element name is not set." => "Kein Name für das Element angegeben.",
 "id is not set." => "ID ist nicht angegeben.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
 "Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
 "Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
+"Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
+"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
+"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
 "No ID provided" => "Keine ID angegeben",
 "Error setting checksum." => "Fehler beim Setzen der Prüfsumme.",
 "No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
 "Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
 "Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
-"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
-"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
 "Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen",
 "There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt",
@@ -66,7 +66,6 @@
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
-"Addressbook not found." => "Adressbuch nicht gefunden.",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
 "Address" => "Adresse",
@@ -100,6 +99,7 @@
 "{name}'s Birthday" => "Geburtstag von {name}",
 "Add Contact" => "Kontakt hinzufügen",
 "Import" => "Importieren",
+"Settings" => "Einstellungen",
 "Addressbooks" => "Adressbücher",
 "Close" => "Schließen",
 "Keyboard shortcuts" => "Tastaturbefehle",
@@ -113,12 +113,6 @@
 "Add new contact" => "Neuen Kontakt hinzufügen",
 "Add new addressbook" => "Neues Adressbuch hinzufügen",
 "Delete current contact" => "Aktuellen Kontakt löschen",
-"Configure Address Books" => "Adressbücher konfigurieren",
-"New Address Book" => "Neues Adressbuch",
-"CardDav Link" => "CardDav-Link",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
-"Delete" => "Löschen",
 "Drop photo to upload" => "Zieh' ein Foto hierher zum Hochladen",
 "Delete current photo" => "Derzeitiges Foto löschen",
 "Edit current photo" => "Foto ändern",
@@ -126,6 +120,7 @@
 "Select photo from ownCloud" => "Foto aus ownCloud auswählen",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
 "Edit name details" => "Name ändern",
+"Delete" => "Löschen",
 "Nickname" => "Spitzname",
 "Enter nickname" => "Spitzname angeben",
 "Web site" => "Webseite",
@@ -206,5 +201,7 @@
 "more info" => "mehr Info",
 "Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
+"Download" => "Herunterladen",
+"Edit" => "Bearbeiten",
+"New Address Book" => "Neues Adressbuch"
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index c67f27ab2a..d4070c2c8c 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
 "There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
 "element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
 "id is not set." => "δεν ορίστηκε id",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
 "Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
 "Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
+"Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
+"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
+"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
 "No ID provided" => "Δε δόθηκε ID",
 "Error setting checksum." => "Λάθος κατά τον ορισμό checksum ",
 "No categories selected for deletion." => "Δε επελέγησαν κατηγορίες για διαγραφή",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
 "Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
 "Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
-"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
-"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
 "Error uploading contacts to storage." => "Σφάλμα κατά την αποθήκευση επαφών",
 "There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία ",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Αποτέλεσμα: ",
 " imported, " => " εισάγεται,",
 " failed." => " απέτυχε.",
-"Addressbook not found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
 "Address" => "Διεύθυνση",
@@ -113,12 +112,6 @@
 "Add new contact" => "Προσθήκη νέας επαφής",
 "Add new addressbook" => "Προσθήκη νέου βιβλίου επαφών",
 "Delete current contact" => "Διαγραφή τρέχουσας επαφής",
-"Configure Address Books" => "Ρυθμίστε το βιβλίο διευθύνσεων ",
-"New Address Book" => "Νέο βιβλίο διευθύνσεων",
-"CardDav Link" => "Σύνδεσμος CardDav",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"Delete" => "Διαγραφή",
 "Drop photo to upload" => "Ρίξε μια φωτογραφία για ανέβασμα",
 "Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
 "Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
@@ -126,6 +119,7 @@
 "Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα",
 "Edit name details" => "Αλλάξτε τις λεπτομέρειες ονόματος",
+"Delete" => "Διαγραφή",
 "Nickname" => "Παρατσούκλι",
 "Enter nickname" => "Εισάγετε παρατσούκλι",
 "Web site" => "Ιστότοπος",
@@ -206,5 +200,7 @@
 "more info" => "περισσότερες πληροφορίες",
 "Primary address (Kontact et al)" => "Κύρια διεύθυνση",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
+"Download" => "Λήψη",
+"Edit" => "Επεξεργασία",
+"New Address Book" => "Νέο βιβλίο διευθύνσεων"
 );
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index e62077fe5d..a1aaea2a65 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
 "There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
 "element name is not set." => "eronomo ne agordiĝis.",
 "id is not set." => "identigilo ne agordiĝis.",
 "Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
 "At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
 "Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
+"Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
+"Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
+"Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
 "Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
 "Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
-"Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
-"Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
 "Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
@@ -57,7 +57,6 @@
 "Result: " => "Rezulto: ",
 " imported, " => " enportoj, ",
 " failed." => "malsukcesoj.",
-"Addressbook not found." => "Adresaro ne troviĝis.",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
 "Address" => "Adreso",
@@ -80,12 +79,6 @@
 "Import" => "Enporti",
 "Addressbooks" => "Adresaroj",
 "Close" => "Fermi",
-"Configure Address Books" => "Agordi adresarojn",
-"New Address Book" => "Nova adresaro",
-"CardDav Link" => "CardDav-ligilo",
-"Download" => "Elŝuti",
-"Edit" => "Redakti",
-"Delete" => "Forigi",
 "Drop photo to upload" => "Demeti foton por alŝuti",
 "Delete current photo" => "Forigi nunan foton",
 "Edit current photo" => "Redakti nunan foton",
@@ -93,6 +86,7 @@
 "Select photo from ownCloud" => "Elekti foton el ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo",
 "Edit name details" => "Redakti detalojn de nomo",
+"Delete" => "Forigi",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
 "dd-mm-yyyy" => "yyyy-mm-dd",
@@ -153,5 +147,8 @@
 "CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
 "more info" => "pli da informo",
 "Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Elŝuti",
+"Edit" => "Redakti",
+"New Address Book" => "Nova adresaro"
 );
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 813cedc6e8..a7f1b1219c 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
 "There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
 "element name is not set." => "no se ha puesto ningún nombre de elemento.",
 "id is not set." => "no se ha puesto ninguna ID.",
 "Cannot add empty property." => "No se puede añadir una propiedad vacía.",
 "At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
 "Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
+"Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
+"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
+"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
 "No ID provided" => "No se ha proporcionado una ID",
 "Error setting checksum." => "Error al establecer la suma de verificación.",
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
 "Something went FUBAR. " => "Plof. Algo ha fallado.",
 "Error updating contact property." => "Error al actualizar una propiedad del contacto.",
-"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
-"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
 "Error uploading contacts to storage." => "Error al subir contactos al almacenamiento.",
 "There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Resultado :",
 " imported, " => "Importado.",
 " failed." => "Fallo.",
-"Addressbook not found." => "Libreta de direcciones no encontrada.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
 "Address" => "Dirección",
@@ -85,12 +84,6 @@
 "Import" => "Importar",
 "Addressbooks" => "Libretas de direcciones",
 "Close" => "Cierra.",
-"Configure Address Books" => "Configurar libretas de direcciones",
-"New Address Book" => "Nueva libreta de direcciones",
-"CardDav Link" => "Enlace CardDav",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Borrar",
 "Drop photo to upload" => "Suelta una foto para subirla",
 "Delete current photo" => "Eliminar fotografía actual",
 "Edit current photo" => "Editar fotografía actual",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma",
 "Edit name details" => "Editar los detalles del nombre",
+"Delete" => "Borrar",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Sincronizando direcciones",
 "more info" => "más información",
 "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Descargar",
+"Edit" => "Editar",
+"New Address Book" => "Nueva libreta de direcciones"
 );
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 08b110ca23..0589e2ec07 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
 "There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
 "element name is not set." => "elemendi nime pole määratud.",
 "id is not set." => "ID on määramata.",
 "Cannot add empty property." => "Tühja omadust ei saa lisada.",
 "At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
 "Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
+"Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
+"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
+"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
 "No ID provided" => "ID-d pole sisestatud",
 "Error setting checksum." => "Viga kontrollsumma määramisel.",
 "No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
 "Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
 "Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
-"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
-"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
 "Error uploading contacts to storage." => "Viga kontaktide üleslaadimisel kettale.",
 "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse",
@@ -59,7 +59,6 @@
 "Result: " => "Tulemus: ",
 " imported, " => " imporditud, ",
 " failed." => " ebaõnnestus.",
-"Addressbook not found." => "Aadressiraamatut ei leitud",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
 "Address" => "Aadress",
@@ -82,12 +81,6 @@
 "Import" => "Impordi",
 "Addressbooks" => "Aadressiraamatud",
 "Close" => "Sule",
-"Configure Address Books" => "Seadista aadressiraamatut",
-"New Address Book" => "Uus aadressiraamat",
-"CardDav Link" => "CardDav link",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"Delete" => "Kustuta",
 "Drop photo to upload" => "Lohista üleslaetav foto siia",
 "Delete current photo" => "Kustuta praegune foto",
 "Edit current photo" => "Muuda praegust pilti",
@@ -95,6 +88,7 @@
 "Select photo from ownCloud" => "Vali foto ownCloudist",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
 "Edit name details" => "Muuda nime üksikasju",
+"Delete" => "Kustuta",
 "Nickname" => "Hüüdnimi",
 "Enter nickname" => "Sisesta hüüdnimi",
 "dd-mm-yyyy" => "dd.mm.yyyy",
@@ -163,5 +157,8 @@
 "CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
 "more info" => "lisainfo",
 "Primary address (Kontact et al)" => "Peamine aadress",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Lae alla",
+"Edit" => "Muuda",
+"New Address Book" => "Uus aadressiraamat"
 );
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 3e78c84d39..c57e7ea416 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -1,11 +1,15 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
 "There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
 "element name is not set." => "elementuaren izena ez da ezarri.",
 "id is not set." => "IDa ez da ezarri.",
+"Could not parse contact: " => "Ezin izan da kontaktua analizatu:",
 "Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
 "At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
 "Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
+"Error adding contact property: " => "Errore bat egon da kontaktuaren propietatea gehitzean:",
+"Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
+"Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
+"Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
 "No ID provided" => "Ez da IDrik eman",
 "Error setting checksum." => "Errorea kontrol-batura ezartzean.",
 "No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
@@ -33,8 +37,6 @@
 "checksum is not set." => "Kontrol-batura ezarri gabe dago.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
 "Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
-"Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
-"Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
 "Error uploading contacts to storage." => "Errore bat egon da kontaktuak biltegira igotzerakoan.",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da",
@@ -51,6 +53,8 @@
 "Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
 "Error" => "Errorea",
 "Contact" => "Kontaktua",
+"New" => "Berria",
+"New Contact" => "Kontaktu berria",
 "This property has to be non-empty." => "Propietate hau ezin da hutsik egon.",
 "Couldn't serialize elements." => "Ezin izan dira elementuak serializatu.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en",
@@ -61,7 +65,6 @@
 "Result: " => "Emaitza:",
 " imported, " => " inportatua, ",
 " failed." => "huts egin du.",
-"Addressbook not found." => "Helbide liburua ez da aurkitu",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
 "Address" => "Helbidea",
@@ -79,25 +82,45 @@
 "Pager" => "Bilagailua",
 "Internet" => "Internet",
 "Birthday" => "Jaioteguna",
+"Call" => "Deia",
+"Clients" => "Bezeroak",
+"Holidays" => "Oporrak",
+"Ideas" => "Ideiak",
+"Journey" => "Bidaia",
+"Meeting" => "Bilera",
+"Other" => "Bestelakoa",
+"Personal" => "Pertsonala",
+"Projects" => "Proiektuak",
+"Questions" => "Galderak",
 "{name}'s Birthday" => "{name}ren jaioteguna",
 "Add Contact" => "Gehitu kontaktua",
 "Import" => "Inportatu",
+"Settings" => "Ezarpenak",
 "Addressbooks" => "Helbide Liburuak",
 "Close" => "Itxi",
-"Configure Address Books" => "Konfiguratu Helbide Liburuak",
-"New Address Book" => "Helbide-liburu berria",
-"CardDav Link" => "CardDav lotura",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"Delete" => "Ezabatu",
+"Keyboard shortcuts" => "Teklatuaren lasterbideak",
+"Navigation" => "Nabigazioa",
+"Next contact in list" => "Hurrengoa kontaktua zerrendan",
+"Previous contact in list" => "Aurreko kontaktua zerrendan",
+"Expand/collapse current addressbook" => "Zabaldu/tolestu uneko helbide-liburua",
+"Next/previous addressbook" => "Hurrengo/aurreko helbide-liburua",
+"Actions" => "Ekintzak",
+"Refresh contacts list" => "Gaurkotu kontaktuen zerrenda",
+"Add new contact" => "Gehitu kontaktu berria",
+"Add new addressbook" => "Gehitu helbide-liburu berria",
+"Delete current contact" => "Ezabatu uneko kontaktuak",
 "Drop photo to upload" => "Askatu argazkia igotzeko",
 "Delete current photo" => "Ezabatu oraingo argazkia",
 "Edit current photo" => "Editatu oraingo argazkia",
 "Upload new photo" => "Igo argazki berria",
 "Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
 "Edit name details" => "Editatu izenaren zehaztasunak",
+"Delete" => "Ezabatu",
 "Nickname" => "Ezizena",
 "Enter nickname" => "Sartu ezizena",
+"Web site" => "Web orria",
+"http://www.somesite.com" => "http://www.webgunea.com",
+"Go to web site" => "Web orrira joan",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Taldeak",
 "Separate groups with commas" => "Banatu taldeak komekin",
@@ -121,10 +144,14 @@
 "Edit address" => "Editatu helbidea",
 "Type" => "Mota",
 "PO Box" => "Posta kutxa",
+"Street address" => "Kalearen helbidea",
+"Street and number" => "Kalea eta zenbakia",
 "Extended" => "Hedatua",
+"Apartment number etc." => "Etxe zenbakia eab.",
 "City" => "Hiria",
 "Region" => "Eskualdea",
 "Zipcode" => "Posta kodea",
+"Postal code" => "Posta kodea",
 "Country" => "Herrialdea",
 "Addressbook" => "Helbide-liburua",
 "New Addressbook" => "Helbide-liburu berria",
@@ -142,8 +169,14 @@
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
 "Configure addressbooks" => "Konfiguratu helbide liburuak",
+"Select Address Books" => "Hautatu helbide-liburuak",
+"Enter name" => "Sartu izena",
+"Enter description" => "Sartu deskribapena",
 "CardDAV syncing addresses" => "CardDAV sinkronizazio helbideak",
 "more info" => "informazio gehiago",
 "Primary address (Kontact et al)" => "Helbide nagusia",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Deskargatu",
+"Edit" => "Editatu",
+"New Address Book" => "Helbide-liburu berria"
 );
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 08b4eb221b..c25bf9ca0c 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
 "There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
 "element name is not set." => "نام اصلی تنظیم نشده است",
 "id is not set." => "شناسه تعیین نشده",
 "Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
 "At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
 "Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
+"Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
+"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
+"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
 "No ID provided" => "هیچ شناسه ای ارائه نشده",
 "Error setting checksum." => "خطا در تنظیم checksum",
 "No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
 "Something went FUBAR. " => "چند چیز به FUBAR رفتند",
 "Error updating contact property." => "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر",
-"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
-"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
 "Error uploading contacts to storage." => "خطا در هنگام بارگذاری و ذخیره سازی",
 "There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "حجم آپلود از طریق Php.ini تعیین می شود",
@@ -62,7 +62,6 @@
 "Result: " => "نتیجه:",
 " imported, " => "وارد شد،",
 " failed." => "ناموفق",
-"Addressbook not found." => "کتابچه نشانی ها یافت نشد",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
 "Address" => "نشانی",
@@ -85,12 +84,6 @@
 "Import" => "وارد کردن",
 "Addressbooks" => "کتابچه ی نشانی ها",
 "Close" => "بستن",
-"Configure Address Books" => "پیکر بندی کتابچه نشانی ها",
-"New Address Book" => "کتابچه نشانه های جدید",
-"CardDav Link" => "CardDav Link",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"Delete" => "پاک کردن",
 "Drop photo to upload" => "تصویر را به اینجا بکشید تا بار گذازی شود",
 "Delete current photo" => "پاک کردن تصویر کنونی",
 "Edit current photo" => "ویرایش تصویر کنونی",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "ویرایش نام جزئیات",
+"Delete" => "پاک کردن",
 "Nickname" => "نام مستعار",
 "Enter nickname" => "یک نام مستعار وارد کنید",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV syncing addresses ",
 "more info" => "اطلاعات بیشتر",
 "Primary address (Kontact et al)" => "نشانی اولیه",
-"iOS/OS X" => "iOS/OS X "
+"iOS/OS X" => "iOS/OS X ",
+"Download" => "بارگیری",
+"Edit" => "ویرایش",
+"New Address Book" => "کتابچه نشانه های جدید"
 );
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 5c9a81eba0..86581f11e9 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -2,6 +2,7 @@
 "There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
 "Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
 "At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
+"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
 "No address books found." => "Osoitekirjoja ei löytynyt.",
 "No contacts found." => "Yhteystietoja ei löytynyt.",
@@ -16,7 +17,6 @@
 "Error cropping image" => "Virhe rajatessa kuvaa",
 "Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
 "Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
-"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
@@ -33,7 +33,6 @@
 "Result: " => "Tulos: ",
 " imported, " => " tuotu, ",
 " failed." => " epäonnistui.",
-"Addressbook not found." => "Osoitekirjaa ei löytynyt.",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
 "Address" => "Osoite",
@@ -64,17 +63,12 @@
 "Add new contact" => "Lisää uusi yhteystieto",
 "Add new addressbook" => "Lisää uusi osoitekirja",
 "Delete current contact" => "Poista nykyinen yhteystieto",
-"Configure Address Books" => "Muokkaa osoitekirjoja",
-"New Address Book" => "Uusi osoitekirja",
-"CardDav Link" => "CardDav-linkki",
-"Download" => "Lataa",
-"Edit" => "Muokkaa",
-"Delete" => "Poista",
 "Delete current photo" => "Poista nykyinen valokuva",
 "Edit current photo" => "Muokkaa nykyistä valokuvaa",
 "Upload new photo" => "Lähetä uusi valokuva",
 "Select photo from ownCloud" => "Valitse valokuva ownCloudista",
 "Edit name details" => "Muokkaa nimitietoja",
+"Delete" => "Poista",
 "Nickname" => "Kutsumanimi",
 "Enter nickname" => "Anna kutsumanimi",
 "Web site" => "Verkkosivu",
@@ -131,5 +125,8 @@
 "Enter name" => "Anna nimi",
 "Enter description" => "Anna kuvaus",
 "CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"New Address Book" => "Uusi osoitekirja"
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index dd59a68aaf..a3f90001e5 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
 "There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
 "element name is not set." => "Le champ Nom n'est pas défini.",
 "id is not set." => "L'ID n'est pas défini.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
 "Trying to add duplicate property: " => "Ajout d'une propriété en double:",
 "Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
+"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
+"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
+"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
 "No ID provided" => "Aucun ID fourni",
 "Error setting checksum." => "Erreur lors du paramétrage du hachage.",
 "No categories selected for deletion." => "Pas de catégories sélectionnées pour la suppression.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
 "Something went FUBAR. " => "Quelque chose est FUBAR.",
 "Error updating contact property." => "Erreur lors de la mise à jour du champ.",
-"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
-"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
 "Error uploading contacts to storage." => "Erreur lors de l'envoi des contacts vers le stockage.",
 "There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Résultat :",
 " imported, " => "importé,",
 " failed." => "échoué.",
-"Addressbook not found." => "Carnet d'adresses introuvable.",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
 "Address" => "Adresse",
@@ -113,12 +112,6 @@
 "Add new contact" => "Ajouter un nouveau contact",
 "Add new addressbook" => "Ajouter un nouveau carnet d'adresses",
 "Delete current contact" => "Effacer le contact sélectionné",
-"Configure Address Books" => "Paramétrer carnet d'adresses",
-"New Address Book" => "Nouveau Carnet d'adresses",
-"CardDav Link" => "Lien CardDav",
-"Download" => "Télécharger",
-"Edit" => "Modifier",
-"Delete" => "Supprimer",
 "Drop photo to upload" => "Glisser une photo pour l'envoi",
 "Delete current photo" => "Supprimer la photo actuelle",
 "Edit current photo" => "Editer la photo actuelle",
@@ -126,6 +119,7 @@
 "Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule",
 "Edit name details" => "Editer les noms",
+"Delete" => "Supprimer",
 "Nickname" => "Surnom",
 "Enter nickname" => "Entrer un surnom",
 "Web site" => "Page web",
@@ -206,5 +200,7 @@
 "more info" => "Plus d'infos",
 "Primary address (Kontact et al)" => "Adresse principale",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Lien(s) vers le répertoire de vCards en lecture seule"
+"Download" => "Télécharger",
+"Edit" => "Modifier",
+"New Address Book" => "Nouveau Carnet d'adresses"
 );
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index a822b55469..ac4f5f95ae 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
 "There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
 "element name is not set." => "non se nomeou o elemento.",
 "id is not set." => "non se estableceu o id.",
 "Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
 "At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
 "Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
+"Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
+"Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
+"Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
 "No ID provided" => "Non se proveeu ID",
 "Error setting checksum." => "Erro establecendo a suma de verificación",
 "No categories selected for deletion." => "Non se seleccionaron categorías para borrado.",
@@ -33,8 +35,6 @@
 "checksum is not set." => "non se estableceu a suma de verificación.",
 "Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
 "Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
-"Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
-"Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
 "Error uploading contacts to storage." => "Erro subindo os contactos ao almacén.",
 "There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro subeuse con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
@@ -61,7 +61,6 @@
 "Result: " => "Resultado: ",
 " imported, " => " importado, ",
 " failed." => " fallou.",
-"Addressbook not found." => "Non se atopou a libreta de enderezos.",
 "This is not your addressbook." => "Esta non é a súa axenda.",
 "Contact could not be found." => "Non se atopou o contacto.",
 "Address" => "Enderezo",
@@ -84,12 +83,6 @@
 "Import" => "Importar",
 "Addressbooks" => "Axendas",
 "Close" => "Pechar",
-"Configure Address Books" => "Configurar Libretas de enderezos",
-"New Address Book" => "Nova axenda",
-"CardDav Link" => "Ligazón CardDav",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Eliminar",
 "Drop photo to upload" => "Solte a foto a subir",
 "Delete current photo" => "Borrar foto actual",
 "Edit current photo" => "Editar a foto actual",
@@ -97,6 +90,7 @@
 "Select photo from ownCloud" => "Escoller foto desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma",
 "Edit name details" => "Editar detalles do nome",
+"Delete" => "Eliminar",
 "Nickname" => "Apodo",
 "Enter nickname" => "Introuza apodo",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -165,5 +159,8 @@
 "CardDAV syncing addresses" => "Enderezos CardDAV a sincronizar",
 "more info" => "máis información",
 "Primary address (Kontact et al)" => "Enderezo primario (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Descargar",
+"Edit" => "Editar",
+"New Address Book" => "Nova axenda"
 );
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index e4fffbbf72..3b4324c5df 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
 "There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
 "element name is not set." => "שם האלמנט לא נקבע.",
 "id is not set." => "מספר מזהה לא נקבע.",
 "Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
 "At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
 "Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
+"Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
+"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
+"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
 "No ID provided" => "לא צוין מזהה",
 "Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
 "No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
@@ -31,8 +33,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
 "Something went FUBAR. " => "משהו לא התנהל כצפוי.",
 "Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
-"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
-"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
 "Error uploading contacts to storage." => "התרשה שגיאה בהעלאת אנשי הקשר לאכסון.",
 "There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini",
@@ -42,7 +42,6 @@
 "Missing a temporary folder" => "תקיה זמנית חסרה",
 "Contacts" => "אנשי קשר",
 "Contact" => "איש קשר",
-"Addressbook not found." => "ספר כתובות לא נמצא",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -64,18 +63,13 @@
 "Add Contact" => "הוספת איש קשר",
 "Import" => "יבא",
 "Addressbooks" => "פנקסי כתובות",
-"Configure Address Books" => "הגדר ספרי כתובות",
-"New Address Book" => "פנקס כתובות חדש",
-"CardDav Link" => "קישור ",
-"Download" => "הורדה",
-"Edit" => "עריכה",
-"Delete" => "מחיקה",
 "Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
 "Delete current photo" => "מחק תמונה נוכחית",
 "Edit current photo" => "ערוך תמונה נוכחית",
 "Upload new photo" => "העלה תמונה חדשה",
 "Select photo from ownCloud" => "בחר תמונה מ ownCloud",
 "Edit name details" => "ערוך פרטי שם",
+"Delete" => "מחיקה",
 "Nickname" => "כינוי",
 "Enter nickname" => "הכנס כינוי",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -143,5 +137,8 @@
 "CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
 "more info" => "מידע נוסף",
 "Primary address (Kontact et al)" => "כתובת ראשית",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "הורדה",
+"Edit" => "עריכה",
+"New Address Book" => "פנקס כתובות חדש"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index c0ba8afbf6..220794f8c4 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
 "There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
 "element name is not set." => "naziv elementa nije postavljen.",
 "id is not set." => "id nije postavljen.",
 "Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
 "At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
 "Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
+"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
+"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
+"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
 "No ID provided" => "Nema dodijeljenog ID identifikatora",
 "Error setting checksum." => "Pogreška pri postavljanju checksuma.",
 "No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
@@ -27,8 +29,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
 "Something went FUBAR. " => "Nešto je otišlo... krivo...",
 "Error updating contact property." => "Pogreška pri ažuriranju svojstva kontakta.",
-"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
-"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
 "Error uploading contacts to storage." => "Pogreška pri slanju kontakata.",
 "There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini",
@@ -38,7 +38,6 @@
 "Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Contacts" => "Kontakti",
 "Contact" => "Kontakt",
-"Addressbook not found." => "Adresar nije pronađen.",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
 "Address" => "Adresa",
@@ -60,15 +59,10 @@
 "Add Contact" => "Dodaj kontakt",
 "Import" => "Uvezi",
 "Addressbooks" => "Adresari",
-"Configure Address Books" => "Konfiguracija Adresara",
-"New Address Book" => "Novi adresar",
-"CardDav Link" => "CardDav poveznica",
-"Download" => "Preuzimanje",
-"Edit" => "Uredi",
-"Delete" => "Obriši",
 "Drop photo to upload" => "Dovucite fotografiju za slanje",
 "Edit current photo" => "Uredi trenutnu sliku",
 "Edit name details" => "Uredi detalje imena",
+"Delete" => "Obriši",
 "Nickname" => "Nadimak",
 "Enter nickname" => "Unesi nadimank",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -100,5 +94,8 @@
 "Active" => "Aktivno",
 "Save" => "Spremi",
 "Submit" => "Pošalji",
-"Cancel" => "Prekini"
+"Cancel" => "Prekini",
+"Download" => "Preuzimanje",
+"Edit" => "Uredi",
+"New Address Book" => "Novi adresar"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 5db680b1ac..6745d68a2f 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
 "There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
 "element name is not set." => "az elem neve nincs beállítva",
 "id is not set." => "ID nincs beállítva",
 "Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
 "At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
 "Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
+"Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
+"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
+"Error updating addressbook." => "Hiba a címlista frissítésekor",
 "No ID provided" => "Nincs ID megadva",
 "Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
 "Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
-"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
-"Error updating addressbook." => "Hiba a címlista frissítésekor",
 "Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
@@ -62,7 +62,6 @@
 "Result: " => "Eredmény: ",
 " imported, " => "  beimportálva,  ",
 " failed." => "  sikertelen",
-"Addressbook not found." => "Címlista nem található",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
 "Address" => "Cím",
@@ -85,12 +84,6 @@
 "Import" => "Import",
 "Addressbooks" => "Címlisták",
 "Close" => "Bezár",
-"Configure Address Books" => "Címlisták beállítása",
-"New Address Book" => "Új címlista",
-"CardDav Link" => "CardDav hivatkozás",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"Delete" => "Törlés",
 "Drop photo to upload" => "Húzza ide a feltöltendő képet",
 "Delete current photo" => "Aktuális kép törlése",
 "Edit current photo" => "Aktuális kép szerkesztése",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
+"Delete" => "Törlés",
 "Nickname" => "Becenév",
 "Enter nickname" => "Becenév megadása",
 "dd-mm-yyyy" => "yyyy-mm-dd",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
 "more info" => "további információ",
 "Primary address (Kontact et al)" => "Elsődleges cím",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Letöltés",
+"Edit" => "Szerkesztés",
+"New Address Book" => "Új címlista"
 );
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index 0fbe1777f5..ceb80a9874 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -8,7 +8,6 @@
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
 "Contact" => "Contacto",
-"Addressbook not found." => "Adressario non trovate.",
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
 "Address" => "Adresse",
@@ -29,15 +28,11 @@
 "Add Contact" => "Adder contacto",
 "Import" => "Importar",
 "Addressbooks" => "Adressarios",
-"New Address Book" => "Nove adressario",
-"CardDav Link" => "Ligamine CardDav",
-"Download" => "Discargar",
-"Edit" => "Modificar",
-"Delete" => "Deler",
 "Delete current photo" => "Deler photo currente",
 "Edit current photo" => "Modificar photo currente",
 "Upload new photo" => "Incargar nove photo",
 "Select photo from ownCloud" => "Seliger photo ex ownCloud",
+"Delete" => "Deler",
 "Nickname" => "Pseudonymo",
 "Enter nickname" => "Inserer pseudonymo",
 "Groups" => "Gruppos",
@@ -84,5 +79,8 @@
 "Name of new addressbook" => "Nomine del nove gruppo:",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Discargar",
+"Edit" => "Modificar",
+"New Address Book" => "Nove adressario"
 );
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index b80bde0d42..eff63acf97 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
 "There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
 "element name is not set." => "il nome dell'elemento non è impostato.",
 "id is not set." => "ID non impostato.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo.",
 "Trying to add duplicate property: " => "P",
 "Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
+"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
+"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
+"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
 "No ID provided" => "Nessun ID fornito",
 "Error setting checksum." => "Errore di impostazione del codice di controllo.",
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
 "Something went FUBAR. " => "Qualcosa è andato storto. ",
 "Error updating contact property." => "Errore durante l'aggiornamento della proprietà del contatto.",
-"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
-"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
 "Error uploading contacts to storage." => "Errore di invio dei contatti in archivio.",
 "There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato inviato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file inviato supera la direttiva upload_max_filesize nel php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Risultato: ",
 " imported, " => " importato, ",
 " failed." => " non riuscito.",
-"Addressbook not found." => "Rubrica non trovata.",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
 "Address" => "Indirizzo",
@@ -114,12 +113,6 @@
 "Add new contact" => "Aggiungi un nuovo contatto",
 "Add new addressbook" => "Aggiungi una nuova rubrica",
 "Delete current contact" => "Elimina il contatto corrente",
-"Configure Address Books" => "Configura rubrica",
-"New Address Book" => "Nuova rubrica",
-"CardDav Link" => "Link CardDav",
-"Download" => "Scarica",
-"Edit" => "Modifica",
-"Delete" => "Elimina",
 "Drop photo to upload" => "Rilascia una foto da inviare",
 "Delete current photo" => "Elimina la foto corrente",
 "Edit current photo" => "Modifica la foto corrente",
@@ -127,6 +120,7 @@
 "Select photo from ownCloud" => "Seleziona la foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola",
 "Edit name details" => "Modifica dettagli del nome",
+"Delete" => "Elimina",
 "Nickname" => "Pseudonimo",
 "Enter nickname" => "Inserisci pseudonimo",
 "Web site" => "Sito web",
@@ -207,5 +201,7 @@
 "more info" => "altre informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Collegamento(i) cartella vCard sola lettura"
+"Download" => "Scarica",
+"Edit" => "Modifica",
+"New Address Book" => "Nuova rubrica"
 );
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 014dd7a3b1..ad83d32e5c 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,11 +1,14 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
 "element name is not set." => "要素名が設定されていません。",
 "id is not set." => "idが設定されていません。",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
 "At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
 "Trying to add duplicate property: " => "重複する属性を追加: ",
+"Error adding contact property: " => "コンタクト属性の追加エラー: ",
+"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
+"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
 "No ID provided" => "IDが提供されていません",
 "Error setting checksum." => "チェックサムの設定エラー。",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
@@ -32,8 +35,6 @@
 "checksum is not set." => "チェックサムが設定されていません。",
 "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
-"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
-"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
 "Error uploading contacts to storage." => "ストレージへの連絡先のアップロードエラー。",
 "There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています",
@@ -50,6 +51,8 @@
 "Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
 "Error" => "エラー",
 "Contact" => "連絡先",
+"New" => "新規",
+"New Contact" => "新しいコンタクト",
 "This property has to be non-empty." => "この属性は空にできません。",
 "Couldn't serialize elements." => "要素をシリアライズできませんでした。",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。",
@@ -60,7 +63,6 @@
 "Result: " => "結果: ",
 " imported, " => " をインポート、 ",
 " failed." => " は失敗しました。",
-"Addressbook not found." => "アドレスブックが見つかりませんでした。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -78,25 +80,42 @@
 "Pager" => "ポケベル",
 "Internet" => "インターネット",
 "Birthday" => "誕生日",
+"Business" => "ビジネス",
+"Clients" => "顧客",
+"Deliverer" => "運送会社",
+"Holidays" => "休日",
+"Ideas" => "アイデア",
+"Journey" => "旅行",
+"Jubilee" => "記念祭",
+"Meeting" => "打ち合わせ",
+"Other" => "その他",
+"Personal" => "個人",
+"Projects" => "プロジェクト",
+"Questions" => "質問",
 "{name}'s Birthday" => "{name}の誕生日",
 "Add Contact" => "連絡先の追加",
 "Import" => "インポート",
+"Settings" => "設定",
 "Addressbooks" => "電話帳",
 "Close" => "閉じる",
-"Configure Address Books" => "アドレスブックを設定",
-"New Address Book" => "新規電話帳",
-"CardDav Link" => "CardDAVリンク",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"Delete" => "削除",
+"Keyboard shortcuts" => "キーボードショートカット",
+"Navigation" => "ナビゲーション",
+"Next contact in list" => "リスト内の次のコンタクト",
+"Previous contact in list" => "リスト内の前のコンタクト",
+"Add new contact" => "新しいコンタクトを追加",
+"Add new addressbook" => "新しいアドレスブックを追加",
+"Delete current contact" => "現在のコンタクトを削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
 "Delete current photo" => "現在の写真を削除",
 "Edit current photo" => "現在の写真を編集",
 "Upload new photo" => "新しい写真をアップロード",
 "Select photo from ownCloud" => "ownCloudから写真を選択",
 "Edit name details" => "名前の詳細を編集",
+"Delete" => "削除",
 "Nickname" => "ニックネーム",
 "Enter nickname" => "ニックネームを入力",
+"Web site" => "ウェブサイト",
+"http://www.somesite.com" => "http://www.somesite.com",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -124,6 +143,7 @@
 "City" => "都市",
 "Region" => "都道府県",
 "Zipcode" => "郵便番号",
+"Postal code" => "郵便番号",
 "Country" => "国名",
 "Addressbook" => "アドレスブック",
 "Miss" => "Miss",
@@ -159,8 +179,12 @@
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
+"Enter name" => "名前を入力",
 "CardDAV syncing addresses" => "CardDAV同期アドレス",
 "more info" => "詳細情報",
 "Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "ダウンロード",
+"Edit" => "編集",
+"New Address Book" => "新規電話帳"
 );
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index aa51eea797..41bcb2d455 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
 "There was an error adding the contact." => "연락처를 추가하는 중 오류가 발생하였습니다.",
 "element name is not set." => "element 이름이 설정되지 않았습니다.",
 "id is not set." => "아이디가 설정되어 있지 않습니다. ",
 "Cannot add empty property." => "빈 속성을 추가할 수 없습니다.",
 "At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
 "Trying to add duplicate property: " => "중복 속성 추가 시도: ",
+"Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
+"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
+"Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
 "No ID provided" => "제공되는 아이디 없음",
 "Error setting checksum." => "오류 검사합계 설정",
 "No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다. ",
@@ -33,8 +35,6 @@
 "checksum is not set." => "체크섬이 설정되지 않았습니다.",
 "Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
 "Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
-"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
-"Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
 "Error uploading contacts to storage." => "스토리지 에러 업로드 연락처.",
 "There is no error, the file uploaded with success" => "오류없이 파일업로드 성공.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
@@ -60,7 +60,6 @@
 "Result: " => "결과:",
 " imported, " => "불러오기,",
 " failed." => "실패.",
-"Addressbook not found." => "주소록을 찾을 수 없습니다.",
 "This is not your addressbook." => "내 주소록이 아닙니다.",
 "Contact could not be found." => "연락처를 찾을 수 없습니다.",
 "Address" => "주소",
@@ -83,12 +82,6 @@
 "Import" => "입력",
 "Addressbooks" => "주소록",
 "Close" => "닫기",
-"Configure Address Books" => "주소록 구성",
-"New Address Book" => "새 주소록",
-"CardDav Link" => "CardDav 링크",
-"Download" => "다운로드",
-"Edit" => "편집",
-"Delete" => "삭제",
 "Drop photo to upload" => "Drop photo to upload",
 "Delete current photo" => "현재 사진 삭제",
 "Edit current photo" => "현재 사진 편집",
@@ -96,6 +89,7 @@
 "Select photo from ownCloud" => "ownCloud에서 사진 선택",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "이름 세부사항을 편집합니다. ",
+"Delete" => "삭제",
 "Nickname" => "별명",
 "Enter nickname" => "별명 입력",
 "dd-mm-yyyy" => "일-월-년",
@@ -163,5 +157,8 @@
 "CardDAV syncing addresses" => "CardDAV 주소 동기화",
 "more info" => "더 많은 정보",
 "Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "다운로드",
+"Edit" => "편집",
+"New Address Book" => "새 주소록"
 );
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index f4a9f7b7dc..05c7adce66 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
 "There was an error adding the contact." => "Fehler beim bäisetzen vun engem Kontakt.",
 "id is not set." => "ID ass net gesat.",
 "Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
 "Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
+"Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
+"Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
 "No ID provided" => "Keng ID uginn",
 "Error setting checksum." => "Fehler beim setzen vun der Checksum.",
 "No categories selected for deletion." => "Keng Kategorien fir ze läschen ausgewielt.",
@@ -20,14 +21,12 @@
 "File doesn't exist:" => "Fichier existéiert net:",
 "Error loading image." => "Fehler beim lueden vum Bild.",
 "Error updating contact property." => "Fehler beim updaten vun der Kontakt Proprietéit.",
-"Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
 "No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
 "Contacts" => "Kontakter",
 "Error" => "Fehler",
 "Contact" => "Kontakt",
 "Result: " => "Resultat: ",
 " imported, " => " importéiert, ",
-"Addressbook not found." => "Adressbuch net fonnt.",
 "This is not your addressbook." => "Dat do ass net däin Adressbuch.",
 "Contact could not be found." => "Konnt den Kontakt net fannen.",
 "Address" => "Adress",
@@ -49,11 +48,6 @@
 "Add Contact" => "Kontakt bäisetzen",
 "Addressbooks" => "Adressbicher ",
 "Close" => "Zoumaachen",
-"Configure Address Books" => "Adressbicher konfigureiren",
-"New Address Book" => "Neit Adressbuch",
-"CardDav Link" => "CardDav Link",
-"Download" => "Download",
-"Edit" => "Editéieren",
 "Delete" => "Läschen",
 "Nickname" => "Spëtznumm",
 "Enter nickname" => "Gëff e Spëtznumm an",
@@ -93,5 +87,8 @@
 "Save" => "Späicheren",
 "Submit" => "Fortschécken",
 "Cancel" => "Ofbriechen",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Download",
+"Edit" => "Editéieren",
+"New Address Book" => "Neit Adressbuch"
 );
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index db931cea00..75962e7891 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
 "There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
+"Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
 "No contacts found." => "Kontaktų nerasta.",
 "Error reading contact photo." => "Klaida skaitant kontakto nuotrauką.",
 "The loading photo is not valid." => "Netinkama įkeliama nuotrauka.",
@@ -14,7 +14,6 @@
 "No file was uploaded" => "Nebuvo įkeltas joks failas",
 "Contacts" => "Kontaktai",
 "Contact" => "Kontaktas",
-"Addressbook not found." => "Nerasta adresų knyga.",
 "This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
 "Contact could not be found." => "Kontaktas nerastas",
 "Address" => "Adresas",
@@ -34,11 +33,6 @@
 "Birthday" => "Gimtadienis",
 "Add Contact" => "Pridėti kontaktą",
 "Addressbooks" => "Adresų knygos",
-"Configure Address Books" => "Konfigūruoti adresų knygas",
-"New Address Book" => "Nauja adresų knyga",
-"CardDav Link" => "CardDAV nuoroda",
-"Download" => "Atsisiųsti",
-"Edit" => "Keisti",
 "Delete" => "Trinti",
 "Nickname" => "Slapyvardis",
 "Phone" => "Telefonas",
@@ -56,5 +50,8 @@
 "Displayname" => "Rodomas vardas",
 "Active" => "Aktyvus",
 "Save" => "Išsaugoti",
-"Cancel" => "Atšaukti"
+"Cancel" => "Atšaukti",
+"Download" => "Atsisiųsti",
+"Edit" => "Keisti",
+"New Address Book" => "Nauja adresų knyga"
 );
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 894d527515..d2a506f6f6 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
 "There was an error adding the contact." => "Имаше грешка при додавање на контактот.",
 "element name is not set." => "име за елементот не е поставена.",
 "id is not set." => "ид не е поставено.",
 "Cannot add empty property." => "Неможе да се додаде празна вредност.",
 "At least one of the address fields has to be filled out." => "Барем една од полињата за адреса треба да биде пополнето.",
 "Trying to add duplicate property: " => "Се обидовте да внесете дупликат вредност:",
+"Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
+"Cannot update addressbook with an empty name." => "Неможе да се ажурира адресар со празно име.",
+"Error updating addressbook." => "Грешка при ажурирање на адресарот.",
 "No ID provided" => "Нема доставено ИД",
 "Error setting checksum." => "Грешка во поставување сума за проверка.",
 "No categories selected for deletion." => "Нема избрано категории за бришење.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
 "Something went FUBAR. " => "Нешто се расипа.",
 "Error updating contact property." => "Грешка при ажурирање на вредноста за контакт.",
-"Cannot update addressbook with an empty name." => "Неможе да се ажурира адресар со празно име.",
-"Error updating addressbook." => "Грешка при ажурирање на адресарот.",
 "Error uploading contacts to storage." => "Грешка во снимање на контактите на диск.",
 "There is no error, the file uploaded with success" => "Датотеката беше успешно подигната.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Резултат: ",
 " imported, " => "увезено,",
 " failed." => "неуспешно.",
-"Addressbook not found." => "Адресарот не е најден.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
 "Address" => "Адреса",
@@ -85,12 +84,6 @@
 "Import" => "Внеси",
 "Addressbooks" => "Адресари",
 "Close" => "Затвои",
-"Configure Address Books" => "Конфигурирај адресар",
-"New Address Book" => "Нов адресар",
-"CardDav Link" => "Врска за CardDav",
-"Download" => "Преземи",
-"Edit" => "Уреди",
-"Delete" => "Избриши",
 "Drop photo to upload" => "Довлечкај фотографија за да се подигне",
 "Delete current photo" => "Избриши моментална фотографија",
 "Edit current photo" => "Уреди моментална фотографија",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Изберете фотографија од ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка",
 "Edit name details" => "Уреди детали за име",
+"Delete" => "Избриши",
 "Nickname" => "Прекар",
 "Enter nickname" => "Внеси прекар",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Адреса за синхронизација со CardDAV",
 "more info" => "повеќе информации",
 "Primary address (Kontact et al)" => "Примарна адреса",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Преземи",
+"Edit" => "Уреди",
+"New Address Book" => "Нов адресар"
 );
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 734668e869..39af4f6f8a 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
 "There was an error adding the contact." => "Terdapat masalah menambah maklumat.",
 "element name is not set." => "nama elemen tidak ditetapkan.",
 "id is not set." => "ID tidak ditetapkan.",
 "Cannot add empty property." => "Tidak boleh menambah ruang kosong.",
 "At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
 "Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
+"Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
+"Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
+"Error updating addressbook." => "Masalah mengemaskini buku alamat.",
 "No ID provided" => "tiada ID diberi",
 "Error setting checksum." => "Ralat menetapkan checksum.",
 "No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
 "Something went FUBAR. " => "Sesuatu tidak betul.",
 "Error updating contact property." => "Masalah mengemaskini maklumat.",
-"Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
-"Error updating addressbook." => "Masalah mengemaskini buku alamat.",
 "Error uploading contacts to storage." => "Ralat memuatnaik senarai kenalan.",
 "There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Hasil: ",
 " imported, " => " import, ",
 " failed." => " gagal.",
-"Addressbook not found." => "Buku alamat tidak dijumpai.",
 "This is not your addressbook." => "Ini bukan buku alamat anda.",
 "Contact could not be found." => "Hubungan tidak dapat ditemui",
 "Address" => "Alamat",
@@ -85,12 +84,6 @@
 "Import" => "Import",
 "Addressbooks" => "Senarai Buku Alamat",
 "Close" => "Tutup",
-"Configure Address Books" => "Konfigurasi Buku Alamat",
-"New Address Book" => "Buku Alamat Baru",
-"CardDav Link" => "Sambungan CardDav",
-"Download" => "Muat naik",
-"Edit" => "Sunting",
-"Delete" => "Padam",
 "Drop photo to upload" => "Letak foto disini untuk muatnaik",
 "Delete current photo" => "Padam foto semasa",
 "Edit current photo" => "Ubah foto semasa",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Pilih foto dari ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma",
 "Edit name details" => "Ubah butiran nama",
+"Delete" => "Padam",
 "Nickname" => "Nama Samaran",
 "Enter nickname" => "Masukkan nama samaran",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "alamat selarian CardDAV",
 "more info" => "maklumat lanjut",
 "Primary address (Kontact et al)" => "Alamat utama",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Muat naik",
+"Edit" => "Sunting",
+"New Address Book" => "Buku Alamat Baru"
 );
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 663909eeeb..0347519f6c 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -1,9 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
 "There was an error adding the contact." => "Et problem oppsto med å legge til kontakten.",
 "id is not set." => "id er ikke satt.",
 "Cannot add empty property." => "Kan ikke legge til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
+"Error (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
+"Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
+"Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
 "No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
@@ -25,8 +27,6 @@
 "Error finding image: " => "Kunne ikke finne bilde:",
 "Something went FUBAR. " => "Noe gikk fryktelig galt.",
 "Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
-"Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
-"Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
 "Error uploading contacts to storage." => "Klarte ikke å laste opp kontakter til lagringsplassen",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini",
@@ -47,7 +47,6 @@
 "Result: " => "Resultat:",
 " imported, " => "importert,",
 " failed." => "feilet.",
-"Addressbook not found." => "Adresseboken ble ikke funnet.",
 "This is not your addressbook." => "Dette er ikke dine adressebok.",
 "Contact could not be found." => "Kontakten ble ikke funnet.",
 "Address" => "Adresse",
@@ -70,18 +69,13 @@
 "Import" => "Importer",
 "Addressbooks" => "Adressebøker",
 "Close" => "Lukk",
-"Configure Address Books" => "Konfigurer adressebok",
-"New Address Book" => "Ny adressebok",
-"CardDav Link" => "CardDAV-lenke",
-"Download" => "Hent ned",
-"Edit" => "Rediger",
-"Delete" => "Slett",
 "Drop photo to upload" => "Dra bilder hit for å laste opp",
 "Delete current photo" => "Fjern nåværende bilde",
 "Edit current photo" => "Rediger nåværende bilde",
 "Upload new photo" => "Last opp nytt bilde",
 "Select photo from ownCloud" => "Velg bilde fra ownCloud",
 "Edit name details" => "Endre detaljer rundt navn",
+"Delete" => "Slett",
 "Nickname" => "Kallenavn",
 "Enter nickname" => "Skriv inn kallenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
@@ -142,5 +136,8 @@
 "Configure addressbooks" => "Konfigurer adressebøker",
 "CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
 "more info" => "mer info",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Hent ned",
+"Edit" => "Rediger",
+"New Address Book" => "Ny adressebok"
 );
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index eccd757c24..3e0ad4168a 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
 "There was an error adding the contact." => "Er was een fout bij het toevoegen van het contact.",
 "element name is not set." => "onderdeel naam is niet opgegeven.",
 "id is not set." => "id is niet ingesteld.",
 "Cannot add empty property." => "Kan geen lege eigenschap toevoegen.",
 "At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
 "Trying to add duplicate property: " => "Eigenschap bestaat al: ",
+"Error (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
+"Cannot update addressbook with an empty name." => "Kan adresboek zonder naam niet wijzigen",
+"Error updating addressbook." => "Fout bij het updaten van het adresboek.",
 "No ID provided" => "Geen ID opgegeven",
 "Error setting checksum." => "Instellen controlegetal mislukt",
 "No categories selected for deletion." => "Geen categorieën geselecteerd om te verwijderen.",
@@ -27,8 +29,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
 "Something went FUBAR. " => "Er ging iets totaal verkeerd. ",
 "Error updating contact property." => "Fout bij het updaten van de contacteigenschap.",
-"Cannot update addressbook with an empty name." => "Kan adresboek zonder naam niet wijzigen",
-"Error updating addressbook." => "Fout bij het updaten van het adresboek.",
 "Error uploading contacts to storage." => "Fout bij opslaan van contacten.",
 "There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Het bestand overschrijdt de upload_max_filesize instelling in php.ini",
@@ -38,7 +38,6 @@
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
 "Contact" => "Contact",
-"Addressbook not found." => "Adresboek niet gevonden.",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
 "Address" => "Adres",
@@ -60,12 +59,6 @@
 "Add Contact" => "Contact toevoegen",
 "Import" => "Importeer",
 "Addressbooks" => "Adresboeken",
-"Configure Address Books" => "Instellen adresboeken",
-"New Address Book" => "Nieuw Adresboek",
-"CardDav Link" => "CardDav Link",
-"Download" => "Download",
-"Edit" => "Bewerken",
-"Delete" => "Verwijderen",
 "Drop photo to upload" => "Verwijder foto uit upload",
 "Delete current photo" => "Verwijdere huidige foto",
 "Edit current photo" => "Wijzig huidige foto",
@@ -73,6 +66,7 @@
 "Select photo from ownCloud" => "Selecteer foto uit ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma",
 "Edit name details" => "Wijzig naam gegevens",
+"Delete" => "Verwijderen",
 "Nickname" => "Roepnaam",
 "Enter nickname" => "Voer roepnaam in",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -125,5 +119,8 @@
 "CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
 "more info" => "meer informatie",
 "Primary address (Kontact et al)" => "Standaardadres",
-"iOS/OS X" => "IOS/OS X"
+"iOS/OS X" => "IOS/OS X",
+"Download" => "Download",
+"Edit" => "Bewerken",
+"New Address Book" => "Nieuw Adresboek"
 );
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 53f863ce81..d56a8957c5 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
 "There was an error adding the contact." => "Det kom ei feilmelding då kontakta vart lagt til.",
 "Cannot add empty property." => "Kan ikkje leggja til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst eit av adressefelta må fyllast ut.",
+"Error (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
+"Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
 "Error deleting contact property." => "Eit problem oppstod ved å slette kontaktfeltet.",
 "Error updating contact property." => "Eit problem oppstod ved å endre kontaktfeltet.",
-"Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
 "Contacts" => "Kotaktar",
 "Contact" => "Kontakt",
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
@@ -26,10 +26,6 @@
 "Birthday" => "Bursdag",
 "Add Contact" => "Legg til kontakt",
 "Addressbooks" => "Adressebøker",
-"New Address Book" => "Ny adressebok",
-"CardDav Link" => "CardDav lenkje",
-"Download" => "Last ned",
-"Edit" => "Endra",
 "Delete" => "Slett",
 "Preferred" => "Føretrekt",
 "Phone" => "Telefonnummer",
@@ -49,5 +45,8 @@
 "Active" => "Aktiv",
 "Save" => "Lagre",
 "Submit" => "Send",
-"Cancel" => "Kanseller"
+"Cancel" => "Kanseller",
+"Download" => "Last ned",
+"Edit" => "Endra",
+"New Address Book" => "Ny adressebok"
 );
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 8e5fe3b44e..591ecac845 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,11 +1,15 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
 "There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
 "element name is not set." => "nazwa elementu nie jest ustawiona.",
 "id is not set." => "id nie ustawione.",
+"Could not parse contact: " => "Nie można parsować kontaktu:",
 "Cannot add empty property." => "Nie można dodać pustego elementu.",
 "At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
 "Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
+"Error adding contact property: " => "Błąd przy dodawaniu właściwości kontaktu:",
+"Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
+"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
+"Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
 "No ID provided" => "Brak opatrzonego ID ",
 "Error setting checksum." => "Błąd ustawień sumy kontrolnej",
 "No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
@@ -34,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
 "Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
 "Error updating contact property." => "Błąd uaktualniania elementu.",
-"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
-"Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
 "Error uploading contacts to storage." => "Wystąpił błąd podczas wysyłania kontaktów do magazynu.",
 "There is no error, the file uploaded with success" => "Nie było błędów, plik wyczytano poprawnie.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Załadowany plik przekracza wielkość upload_max_filesize w php.ini ",
@@ -52,6 +54,8 @@
 "Couldn't get a valid address." => "Nie można pobrać prawidłowego adresu.",
 "Error" => "Błąd",
 "Contact" => "Kontakt",
+"New" => "Nowy",
+"New Contact" => "Nowy kontakt",
 "This property has to be non-empty." => "Ta właściwość nie może być pusta.",
 "Couldn't serialize elements." => "Nie można serializować elementów.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org",
@@ -62,7 +66,6 @@
 "Result: " => "Wynik: ",
 " imported, " => " importowane, ",
 " failed." => "  nie powiodło się.",
-"Addressbook not found." => "Nie znaleziono książki adresowej",
 "This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
 "Address" => "Adres",
@@ -80,17 +83,32 @@
 "Pager" => "Pager",
 "Internet" => "Internet",
 "Birthday" => "Urodziny",
+"Business" => "Biznesowe",
+"Clients" => "Klienci",
+"Holidays" => "Święta",
+"Ideas" => "Pomysły",
+"Journey" => "Podróż",
+"Meeting" => "Spotkanie",
+"Other" => "Inne",
+"Personal" => "Osobiste",
+"Projects" => "Projekty",
+"Questions" => "Pytania",
 "{name}'s Birthday" => "{name} Urodzony",
 "Add Contact" => "Dodaj kontakt",
 "Import" => "Import",
+"Settings" => "Ustawienia",
 "Addressbooks" => "Książki adresowe",
 "Close" => "Zamknij",
-"Configure Address Books" => "Konfiguruj książkę adresową",
-"New Address Book" => "Nowa książka adresowa",
-"CardDav Link" => "Wyświetla odnośnik CardDav",
-"Download" => "Pobiera książkę adresową",
-"Edit" => "Edytuje książkę adresową",
-"Delete" => "Usuwa książkę adresową",
+"Keyboard shortcuts" => "Skróty klawiatury",
+"Navigation" => "Nawigacja",
+"Next contact in list" => "Następny kontakt na liście",
+"Previous contact in list" => "Poprzedni kontakt na liście",
+"Next/previous addressbook" => "Następna/poprzednia książka adresowa",
+"Actions" => "Akcje",
+"Refresh contacts list" => "Odśwież listę kontaktów",
+"Add new contact" => "Dodaj nowy kontakt",
+"Add new addressbook" => "Dodaj nowa książkę adresową",
+"Delete current contact" => "Usuń obecny kontakt",
 "Drop photo to upload" => "Upuść fotografię aby załadować",
 "Delete current photo" => "Usuń aktualne zdjęcie",
 "Edit current photo" => "Edytuj aktualne zdjęcie",
@@ -98,8 +116,12 @@
 "Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
 "Edit name details" => "Edytuj szczegóły nazwy",
+"Delete" => "Usuwa książkę adresową",
 "Nickname" => "Nazwa",
 "Enter nickname" => "Wpisz nazwę",
+"Web site" => "Strona www",
+"http://www.somesite.com" => "http://www.jakasstrona.pl",
+"Go to web site" => "Idż do strony www",
 "dd-mm-yyyy" => "dd-mm-rrrr",
 "Groups" => "Grupy",
 "Separate groups with commas" => "Oddziel grupy przecinkami",
@@ -123,10 +145,12 @@
 "Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
+"Street and number" => "Ulica i numer",
 "Extended" => "Rozszerzony",
 "City" => "Miasto",
 "Region" => "Region",
 "Zipcode" => "Kod pocztowy",
+"Postal code" => "Kod pocztowy",
 "Country" => "Kraj",
 "Addressbook" => "Książka adresowa",
 "Hon. prefixes" => "Prefiksy Hon.",
@@ -163,8 +187,14 @@
 "You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
 "Add contact" => "Dodaj kontakt",
 "Configure addressbooks" => "Konfiguruj książkę adresową",
+"Select Address Books" => "Wybierz książki adresowe",
+"Enter name" => "Wpisz nazwę",
+"Enter description" => "Wprowadź opis",
 "CardDAV syncing addresses" => "adres do synchronizacji CardDAV",
 "more info" => "więcej informacji",
 "Primary address (Kontact et al)" => "Pierwszy adres",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Pobiera książkę adresową",
+"Edit" => "Edytuje książkę adresową",
+"New Address Book" => "Nowa książka adresowa"
 );
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 45ae8206df..ac02cf6eff 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Erro ao (des)ativar agenda.",
 "There was an error adding the contact." => "Ocorreu um erro ao adicionar o contato.",
 "element name is not set." => "nome do elemento não definido.",
 "id is not set." => "ID não definido.",
 "Cannot add empty property." => "Não é possível adicionar propriedade vazia.",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
 "Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
+"Error (de)activating addressbook." => "Erro ao (des)ativar agenda.",
+"Cannot update addressbook with an empty name." => "Não é possível atualizar sua agenda com um nome em branco.",
+"Error updating addressbook." => "Erro ao atualizar agenda.",
 "No ID provided" => "Nenhum ID fornecido",
 "Error setting checksum." => "Erro ajustando checksum.",
 "No categories selected for deletion." => "Nenhum categoria selecionada para remoção.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
 "Something went FUBAR. " => "Something went FUBAR. ",
 "Error updating contact property." => "Erro ao atualizar propriedades do contato.",
-"Cannot update addressbook with an empty name." => "Não é possível atualizar sua agenda com um nome em branco.",
-"Error updating addressbook." => "Erro ao atualizar agenda.",
 "Error uploading contacts to storage." => "Erro enviando contatos para armazenamento.",
 "There is no error, the file uploaded with success" => "Arquivo enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O arquivo enviado excede a diretiva upload_max_filesize em php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Resultado:",
 " imported, " => "importado,",
 " failed." => "falhou.",
-"Addressbook not found." => "Lista de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
 "Address" => "Endereço",
@@ -85,12 +84,6 @@
 "Import" => "Importar",
 "Addressbooks" => "Agendas de Endereço",
 "Close" => "Fechar.",
-"Configure Address Books" => "Configurar Livro de Endereços",
-"New Address Book" => "Nova agenda",
-"CardDav Link" => "Link CardDav",
-"Download" => "Baixar",
-"Edit" => "Editar",
-"Delete" => "Excluir",
 "Drop photo to upload" => "Arraste a foto para ser carregada",
 "Delete current photo" => "Deletar imagem atual",
 "Edit current photo" => "Editar imagem atual",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Selecionar foto do OwnCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
 "Edit name details" => "Editar detalhes do nome",
+"Delete" => "Excluir",
 "Nickname" => "Apelido",
 "Enter nickname" => "Digite o apelido",
 "dd-mm-yyyy" => "dd-mm-aaaa",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Sincronizando endereços CardDAV",
 "more info" => "leia mais",
 "Primary address (Kontact et al)" => "Endereço primário(Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"New Address Book" => "Nova agenda"
 );
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 380320216c..1042a15e3d 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
 "There was an error adding the contact." => "Erro ao adicionar contato",
 "element name is not set." => "o nome do elemento não está definido.",
 "id is not set." => "id não está definido",
 "Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
 "Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
+"Error (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
+"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
+"Error updating addressbook." => "Erro a atualizar o livro de endereços",
 "No ID provided" => "Nenhum ID inserido",
 "Error setting checksum." => "Erro a definir checksum.",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
 "Something went FUBAR. " => "Algo provocou um FUBAR. ",
 "Error updating contact property." => "Erro ao atualizar propriedade do contato",
-"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
-"Error updating addressbook." => "Erro a atualizar o livro de endereços",
 "Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
 "There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Resultado: ",
 " imported, " => " importado, ",
 " failed." => " falhou.",
-"Addressbook not found." => "Livro de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
 "Address" => "Morada",
@@ -85,12 +84,6 @@
 "Import" => "Importar",
 "Addressbooks" => "Livros de endereços",
 "Close" => "Fechar",
-"Configure Address Books" => "Configurar livros de endereços",
-"New Address Book" => "Novo livro de endereços",
-"CardDav Link" => "Endereço CardDav",
-"Download" => "Transferir",
-"Edit" => "Editar",
-"Delete" => "Apagar",
 "Drop photo to upload" => "Arraste e solte fotos para carregar",
 "Delete current photo" => "Eliminar a foto actual",
 "Edit current photo" => "Editar a foto actual",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula",
 "Edit name details" => "Editar detalhes do nome",
+"Delete" => "Apagar",
 "Nickname" => "Alcunha",
 "Enter nickname" => "Introduza alcunha",
 "dd-mm-yyyy" => "dd-mm-aaaa",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV a sincronizar endereços",
 "more info" => "mais informação",
 "Primary address (Kontact et al)" => "Endereço primario (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Transferir",
+"Edit" => "Editar",
+"New Address Book" => "Novo livro de endereços"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 9972d0b66a..ab4cc73006 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
 "There was an error adding the contact." => "O eroare a împiedicat adăugarea contactului.",
 "element name is not set." => "numele elementului nu este stabilit.",
 "id is not set." => "ID-ul nu este stabilit",
 "Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
 "At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
+"Error (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
+"Error updating addressbook." => "Eroare la actualizarea agendei.",
 "No ID provided" => "Nici un ID nu a fost furnizat",
 "Error setting checksum." => "Eroare la stabilirea sumei de control",
 "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
@@ -24,7 +25,6 @@
 "Error loading image." => "Eroare la încărcarea imaginii.",
 "checksum is not set." => "suma de control nu este stabilită.",
 "Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
-"Error updating addressbook." => "Eroare la actualizarea agendei.",
 "Contacts" => "Contacte",
 "Contact" => "Contact",
 "This is not your addressbook." => "Nu se găsește în agendă.",
@@ -47,12 +47,8 @@
 "{name}'s Birthday" => "Ziua de naștere a {name}",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
-"New Address Book" => "Agendă nouă",
-"CardDav Link" => "Legătură CardDev",
-"Download" => "Descarcă",
-"Edit" => "Editează",
-"Delete" => "Șterge",
 "Edit name details" => "Introdu detalii despre nume",
+"Delete" => "Șterge",
 "Nickname" => "Pseudonim",
 "Enter nickname" => "Introdu pseudonim",
 "dd-mm-yyyy" => "zz-ll-aaaa",
@@ -81,5 +77,8 @@
 "Active" => "Activ",
 "Save" => "Salvează",
 "Submit" => "Trimite",
-"Cancel" => "Anulează"
+"Cancel" => "Anulează",
+"Download" => "Descarcă",
+"Edit" => "Editează",
+"New Address Book" => "Agendă nouă"
 );
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 63217baf32..b598b6c11d 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
 "There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
 "element name is not set." => "имя элемента не установлено.",
 "id is not set." => "id не установлен.",
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
 "Trying to add duplicate property: " => "При попытке добавить дубликат:",
+"Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
+"Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
+"Error updating addressbook." => "Ошибка обновления адресной книги.",
 "No ID provided" => "ID не предоставлен",
 "Error setting checksum." => "Ошибка установки контрольной суммы.",
 "No categories selected for deletion." => "Категории для удаления не установлены.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
 "Something went FUBAR. " => "Что-то пошло FUBAR.",
 "Error updating contact property." => "Ошибка обновления информации контакта.",
-"Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
-"Error updating addressbook." => "Ошибка обновления адресной книги.",
 "Error uploading contacts to storage." => "Ошибка загрузки контактов в хранилище.",
 "There is no error, the file uploaded with success" => "Файл загружен успешно.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Результат:",
 " imported, " => "импортировано, ",
 " failed." => "не удалось.",
-"Addressbook not found." => "Адресная книга не найдена.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
 "Address" => "Адрес",
@@ -85,12 +84,6 @@
 "Import" => "Импорт",
 "Addressbooks" => "Адресные книги",
 "Close" => "Закрыть",
-"Configure Address Books" => "Настроить Адресную книгу",
-"New Address Book" => "Новая адресная книга",
-"CardDav Link" => "Ссылка CardDAV",
-"Download" => "Скачать",
-"Edit" => "Редактировать",
-"Delete" => "Удалить",
 "Drop photo to upload" => "Перетяните фотографии для загрузки",
 "Delete current photo" => "Удалить текущую фотографию",
 "Edit current photo" => "Редактировать текущую фотографию",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Формат Краткое имя, Полное имя",
 "Edit name details" => "Изменить детали имени",
+"Delete" => "Удалить",
 "Nickname" => "Псевдоним",
 "Enter nickname" => "Введите псевдоним",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV синхронизации адресов",
 "more info" => "дополнительная информация",
 "Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Скачать",
+"Edit" => "Редактировать",
+"New Address Book" => "Новая адресная книга"
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 79db2dbcf6..cf85f4cf3e 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
 "There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
 "element name is not set." => "meno elementu nie je nastavené.",
 "id is not set." => "ID nie je nastavené.",
 "Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
 "At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
 "Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
+"Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
+"Cannot update addressbook with an empty name." => "Nedá sa upraviť adresár s prázdnym menom.",
+"Error updating addressbook." => "Chyba aktualizácie adresára.",
 "No ID provided" => "ID nezadané",
 "Error setting checksum." => "Chyba pri nastavovaní kontrolného súčtu.",
 "No categories selected for deletion." => "Žiadne kategórie neboli vybraté na odstránenie.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Niečo sa pokazilo.",
 "Error updating contact property." => "Chyba aktualizovania údaju kontaktu.",
-"Cannot update addressbook with an empty name." => "Nedá sa upraviť adresár s prázdnym menom.",
-"Error updating addressbook." => "Chyba aktualizácie adresára.",
 "Error uploading contacts to storage." => "Chyba pri ukladaní kontaktov na úložisko.",
 "There is no error, the file uploaded with success" => "Nevyskytla sa žiadna chyba, súbor úspešne uložené.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini",
@@ -64,7 +64,6 @@
 "Result: " => "Výsledok: ",
 " imported, " => " importovaných, ",
 " failed." => " zlyhaných.",
-"Addressbook not found." => "Adresár sa nenašiel.",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
 "Address" => "Adresa",
@@ -104,12 +103,6 @@
 "Add new contact" => "Pridaj nový kontakt",
 "Add new addressbook" => "Pridaj nový adresár",
 "Delete current contact" => "Vymaž súčasný kontakt",
-"Configure Address Books" => "Nastaviť adresáre",
-"New Address Book" => "Nový adresár",
-"CardDav Link" => "CardDav odkaz",
-"Download" => "Stiahnuť",
-"Edit" => "Upraviť",
-"Delete" => "Odstrániť",
 "Drop photo to upload" => "Pretiahnite sem fotku pre nahratie",
 "Delete current photo" => "Odstrániť súčasnú fotku",
 "Edit current photo" => "Upraviť súčasnú fotku",
@@ -117,6 +110,7 @@
 "Select photo from ownCloud" => "Vybrať fotku z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami",
 "Edit name details" => "Upraviť podrobnosti mena",
+"Delete" => "Odstrániť",
 "Nickname" => "Prezývka",
 "Enter nickname" => "Zadajte prezývku",
 "dd-mm-yyyy" => "dd. mm. yyyy",
@@ -189,5 +183,8 @@
 "CardDAV syncing addresses" => "Adresy pre synchronizáciu s CardDAV",
 "more info" => "viac informácií",
 "Primary address (Kontact et al)" => "Predvolená adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Stiahnuť",
+"Edit" => "Upraviť",
+"New Address Book" => "Nový adresár"
 );
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 7ff30a34f1..73d919cf0a 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
 "There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
 "element name is not set." => "ime elementa ni nastavljeno.",
 "id is not set." => "id ni nastavljen.",
 "Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
 "At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
 "Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
+"Error (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
+"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
+"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
 "No ID provided" => "ID ni bil podan",
 "Error setting checksum." => "Napaka pri nastavljanju nadzorne vsote.",
 "No categories selected for deletion." => "Nobena kategorija ni bila izbrana za izbris.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
 "Something went FUBAR. " => "Nekaj je šlo v franže. ",
 "Error updating contact property." => "Napaka pri posodabljanju lastnosti stika.",
-"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
-"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
 "Error uploading contacts to storage." => "Napaka pri nalaganju stikov v hrambo.",
 "There is no error, the file uploaded with success" => "Datoteka je bila uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "Rezultati: ",
 " imported, " => " uvoženih, ",
 " failed." => " je spodletelo.",
-"Addressbook not found." => "Imenik ni bil najden.",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
 "Address" => "Naslov",
@@ -85,12 +84,6 @@
 "Import" => "Uvozi",
 "Addressbooks" => "Imeniki",
 "Close" => "Zapri",
-"Configure Address Books" => "Nastavi imenike",
-"New Address Book" => "Nov imenik",
-"CardDav Link" => "CardDav povezava",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"Delete" => "Izbriši",
 "Drop photo to upload" => "Spustite sliko tukaj, da bi jo naložili",
 "Delete current photo" => "Izbriši trenutno sliko",
 "Edit current photo" => "Uredi trenutno sliko",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Izberi sliko iz ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico",
 "Edit name details" => "Uredite podrobnosti imena",
+"Delete" => "Izbriši",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
 "dd-mm-yyyy" => "dd. mm. yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV naslovi za sinhronizacijo",
 "more info" => "več informacij",
 "Primary address (Kontact et al)" => "Primarni naslov (za kontakt et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Prenesi",
+"Edit" => "Uredi",
+"New Address Book" => "Nov imenik"
 );
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index 3db20c55b8..77c86a9d93 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -19,9 +19,6 @@
 "Birthday" => "Рођендан",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "Адресар",
-"New Address Book" => "Нови адресар",
-"Download" => "Преузимање",
-"Edit" => "Уреди",
 "Delete" => "Обриши",
 "Preferred" => "Пожељан",
 "Phone" => "Телефон",
@@ -41,5 +38,8 @@
 "Active" => "Активан",
 "Save" => "Сними",
 "Submit" => "Пошаљи",
-"Cancel" => "Откажи"
+"Cancel" => "Откажи",
+"Download" => "Преузимање",
+"Edit" => "Уреди",
+"New Address Book" => "Нови адресар"
 );
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index 6238b2385b..3d0c0d2b8f 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -16,7 +16,6 @@
 "Pager" => "Pejdžer",
 "Birthday" => "Rođendan",
 "Add Contact" => "Dodaj kontakt",
-"Edit" => "Uredi",
 "Delete" => "Obriši",
 "Phone" => "Telefon",
 "PO Box" => "Poštanski broj",
@@ -24,5 +23,6 @@
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Zip kod",
-"Country" => "Zemlja"
+"Country" => "Zemlja",
+"Edit" => "Uredi"
 );
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index bb8f0d0a30..1795a45c09 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
 "There was an error adding the contact." => "Det uppstod ett fel när kontakt skulle läggas till",
 "id is not set." => "ID är inte satt.",
 "Could not parse contact: " => "Kunde inte läsa kontakt:",
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
 "Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
+"Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
+"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
+"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
 "No ID provided" => "Inget ID angett",
 "Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
 "No categories selected for deletion." => "Inga kategorier valda för borttaging",
@@ -30,8 +32,6 @@
 "checksum is not set." => "kontrollsumma är inte satt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
 "Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
-"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
-"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
 "Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
@@ -60,7 +60,6 @@
 "Result: " => "Resultat:",
 " imported, " => "importerad,",
 " failed." => "misslyckades.",
-"Addressbook not found." => "Hittade inte adressboken",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
 "Address" => "Adress",
@@ -89,12 +88,6 @@
 "Import" => "Importera",
 "Addressbooks" => "Adressböcker",
 "Close" => "Stäng",
-"Configure Address Books" => "Konfigurera adressböcker",
-"New Address Book" => "Ny adressbok",
-"CardDav Link" => "CardDAV länk",
-"Download" => "Nedladdning",
-"Edit" => "Redigera",
-"Delete" => "Radera",
 "Drop photo to upload" => "Släpp foto för att ladda upp",
 "Delete current photo" => "Ta bort aktuellt foto",
 "Edit current photo" => "Redigera aktuellt foto",
@@ -102,6 +95,7 @@
 "Select photo from ownCloud" => "Välj foto från ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
 "Edit name details" => "Redigera detaljer för namn",
+"Delete" => "Radera",
 "Nickname" => "Smeknamn",
 "Enter nickname" => "Ange smeknamn",
 "dd-mm-yyyy" => "dd-mm-åååå",
@@ -160,5 +154,8 @@
 "CardDAV syncing addresses" => "CardDAV synkningsadresser",
 "more info" => "mera information",
 "Primary address (Kontact et al)" => "Primär adress (Kontakt o.a.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Nedladdning",
+"Edit" => "Redigera",
+"New Address Book" => "Ny adressbok"
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index d7af2ae13f..e33d238b94 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
 "There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
 "element name is not set." => "ยังไม่ได้กำหนดชื่อ",
 "id is not set." => "ยังไม่ได้กำหนดรหัส",
 "Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
 "At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
 "Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
+"Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
+"Cannot update addressbook with an empty name." => "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
+"Error updating addressbook." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
 "No ID provided" => "ยังไม่ได้ใส่รหัส",
 "Error setting checksum." => "เกิดข้อผิดพลาดในการตั้งค่า checksum",
 "No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
 "Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
 "Error updating contact property." => "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ",
-"Cannot update addressbook with an empty name." => "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
-"Error updating addressbook." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
 "Error uploading contacts to storage." => "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล",
 "There is no error, the file uploaded with success" => "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini",
@@ -62,7 +62,6 @@
 "Result: " => "ผลลัพธ์: ",
 " imported, " => " นำเข้าข้อมูลแล้ว, ",
 " failed." => " ล้มเหลว.",
-"Addressbook not found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
 "Address" => "ที่อยู่",
@@ -85,12 +84,6 @@
 "Import" => "นำเข้า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
 "Close" => "ปิด",
-"Configure Address Books" => "กำหนดค่าสมุดบันทึกที่อยู่",
-"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
-"CardDav Link" => "ลิงค์ CardDav",
-"Download" => "ดาวน์โหลด",
-"Edit" => "แก้ไข",
-"Delete" => "ลบ",
 "Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
 "Delete current photo" => "ลบรูปภาพปัจจุบัน",
 "Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง",
 "Edit name details" => "แก้ไขรายละเอียดของชื่อ",
+"Delete" => "ลบ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV",
 "more info" => "ข้อมูลเพิ่มเติม",
 "Primary address (Kontact et al)" => "ที่อยู่หลัก (สำหรับติดต่อ)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "ดาวน์โหลด",
+"Edit" => "แก้ไข",
+"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 );
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index e10d36753c..2cbe15cef9 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
 "There was an error adding the contact." => "Kişi eklenirken hata oluştu.",
 "element name is not set." => "eleman ismi atanmamış.",
 "id is not set." => "id atanmamış.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
 "Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
 "Error adding contact property: " => "Kişi özelliği eklenirken hata oluştu.",
+"Error (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
+"Cannot update addressbook with an empty name." => "Adres defterini boş bir isimle güncelleyemezsiniz.",
+"Error updating addressbook." => "Adres defteri güncellenirken hata oluştu.",
 "No ID provided" => "ID verilmedi",
 "Error setting checksum." => "İmza oluşturulurken hata.",
 "No categories selected for deletion." => "Silmek için bir kategori seçilmedi.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
 "Something went FUBAR. " => "Bir şey FUBAR gitti.",
 "Error updating contact property." => "Kişi özelliği güncellenirken hata oluştu.",
-"Cannot update addressbook with an empty name." => "Adres defterini boş bir isimle güncelleyemezsiniz.",
-"Error updating addressbook." => "Adres defteri güncellenirken hata oluştu.",
 "Error uploading contacts to storage." => "Bağlantıları depoya yükleme hatası",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor",
@@ -66,7 +66,6 @@
 "Result: " => "Sonuç: ",
 " imported, " => " içe aktarıldı, ",
 " failed." => " hatalı.",
-"Addressbook not found." => "Adres defteri bulunamadı.",
 "This is not your addressbook." => "Bu sizin adres defteriniz değil.",
 "Contact could not be found." => "Kişi bulunamadı.",
 "Address" => "Adres",
@@ -113,12 +112,6 @@
 "Add new contact" => "Yeni kişi ekle",
 "Add new addressbook" => "Yeni adres defteri ekle",
 "Delete current contact" => "Şuanki kişiyi sil",
-"Configure Address Books" => "Adres Defterlerini Yapılandır",
-"New Address Book" => "Yeni Adres Defteri",
-"CardDav Link" => "CardDav Bağlantısı",
-"Download" => "İndir",
-"Edit" => "Düzenle",
-"Delete" => "Sil",
 "Drop photo to upload" => "Fotoğrafı yüklenmesi için bırakın",
 "Delete current photo" => "Mevcut fotoğrafı sil",
 "Edit current photo" => "Mevcut fotoğrafı düzenle",
@@ -126,6 +119,7 @@
 "Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters",
 "Edit name details" => "İsim detaylarını düzenle",
+"Delete" => "Sil",
 "Nickname" => "Takma ad",
 "Enter nickname" => "Takma adı girin",
 "Web site" => "Web sitesi",
@@ -206,5 +200,7 @@
 "more info" => "daha fazla bilgi",
 "Primary address (Kontact et al)" => "Birincil adres (Bağlantı ve arkadaşları)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Sadece okunabilir vCard dizin link(ler)i"
+"Download" => "İndir",
+"Edit" => "Düzenle",
+"New Address Book" => "Yeni Adres Defteri"
 );
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
index 5959f1ff7e..027895690d 100644
--- a/apps/contacts/l10n/uk.php
+++ b/apps/contacts/l10n/uk.php
@@ -13,8 +13,6 @@
 "Pager" => "Пейджер",
 "Birthday" => "День народження",
 "Add Contact" => "Додати контакт",
-"New Address Book" => "Нова адресна книга",
-"Download" => "Завантажити",
 "Delete" => "Видалити",
 "Phone" => "Телефон",
 "Delete contact" => "Видалити контакт",
@@ -22,5 +20,7 @@
 "City" => "Місто",
 "Zipcode" => "Поштовий індекс",
 "Country" => "Країна",
-"Displayname" => "Відображуване ім'я"
+"Displayname" => "Відображуване ім'я",
+"Download" => "Завантажити",
+"New Address Book" => "Нова адресна книга"
 );
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
index 5713ede7b0..060ca079fa 100644
--- a/apps/contacts/l10n/vi.php
+++ b/apps/contacts/l10n/vi.php
@@ -26,9 +26,6 @@
 "Birthday" => "Ngày sinh nhật",
 "Add Contact" => "Thêm liên lạc",
 "Addressbooks" => "Sổ địa chỉ",
-"CardDav Link" => "CardDav Link",
-"Download" => "Tải về",
-"Edit" => "Sửa",
 "Delete" => "Xóa",
 "Phone" => "Điện thoại",
 "Delete contact" => "Xóa liên lạc",
@@ -44,5 +41,7 @@
 "Active" => "Kích hoạt",
 "Save" => "Lưu",
 "Submit" => "Submit",
-"Cancel" => "Hủy"
+"Cancel" => "Hủy",
+"Download" => "Tải về",
+"Edit" => "Sửa"
 );
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index affc75e3df..b996095d26 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(取消)激活地址簿错误。",
 "There was an error adding the contact." => "添加联系人时出错。",
 "element name is not set." => "元素名称未设置",
 "id is not set." => "没有设置 id。",
 "Cannot add empty property." => "无法添加空属性。",
 "At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
 "Trying to add duplicate property: " => "试图添加重复属性： ",
+"Error (de)activating addressbook." => "(取消)激活地址簿错误。",
+"Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
+"Error updating addressbook." => "更新地址簿错误",
 "No ID provided" => "未提供 ID",
 "Error setting checksum." => "设置校验值错误。",
 "No categories selected for deletion." => "未选中要删除的分类。",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
 "Something went FUBAR. " => "有一些信息无法被处理。",
 "Error updating contact property." => "更新联系人属性错误。",
-"Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
-"Error updating addressbook." => "更新地址簿错误",
 "Error uploading contacts to storage." => "上传联系人到存储空间时出错",
 "There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制",
@@ -62,7 +62,6 @@
 "Result: " => "结果: ",
 " imported, " => " 已导入， ",
 " failed." => " 失败。",
-"Addressbook not found." => "未找到地址簿。",
 "This is not your addressbook." => "这不是您的地址簿。",
 "Contact could not be found." => "无法找到联系人。",
 "Address" => "地址",
@@ -85,12 +84,6 @@
 "Import" => "导入",
 "Addressbooks" => "地址簿",
 "Close" => "关闭",
-"Configure Address Books" => "配置地址簿",
-"New Address Book" => "新建地址簿",
-"CardDav Link" => "CardDav 链接",
-"Download" => "下载",
-"Edit" => "编辑",
-"Delete" => "删除",
 "Drop photo to upload" => "拖拽图片进行上传",
 "Delete current photo" => "删除当前照片",
 "Edit current photo" => "编辑当前照片",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "从 ownCloud 选择照片",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "自定义格式，简称，全名，姓在前，姓在前并用逗号分割",
 "Edit name details" => "编辑名称详情",
+"Delete" => "删除",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
 "dd-mm-yyyy" => "yyyy-mm-dd",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV 同步地址",
 "more info" => "更多信息",
 "Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "下载",
+"Edit" => "编辑",
+"New Address Book" => "新建地址簿"
 );
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index 5647c6bcaa..4751c22f1d 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -1,19 +1,18 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
 "There was an error adding the contact." => "添加通訊錄發生錯誤",
 "Cannot add empty property." => "不可添加空白內容",
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
+"Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
+"Error updating addressbook." => "電話簿更新中發生錯誤",
 "No ID provided" => "未提供 ID",
 "No contacts found." => "沒有找到聯絡人",
 "Missing ID" => "遺失ID",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
 "Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
-"Error updating addressbook." => "電話簿更新中發生錯誤",
 "No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
 "Contact" => "通訊錄",
-"Addressbook not found." => "找不到通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
 "Address" => "地址",
@@ -34,13 +33,8 @@
 "{name}'s Birthday" => "{name}的生日",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
-"Configure Address Books" => "設定通訊錄",
-"New Address Book" => "新電話簿",
-"CardDav Link" => "CardDav 聯結",
-"Download" => "下載",
-"Edit" => "編輯",
-"Delete" => "刪除",
 "Edit name details" => "編輯姓名詳細資訊",
+"Delete" => "刪除",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -82,5 +76,8 @@
 "Active" => "作用中",
 "Save" => "儲存",
 "Submit" => "提出",
-"Cancel" => "取消"
+"Cancel" => "取消",
+"Download" => "下載",
+"Edit" => "編輯",
+"New Address Book" => "新電話簿"
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 6ee626a727..1c0bf94ca7 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -4,7 +4,6 @@
 "This category already exists: " => "Questa categoria esiste già: ",
 "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",
-"Error loading script for the settings" => "Errore di caricamento dello script per le impostazioni",
 "January" => "Gennaio",
 "February" => "Febbraio",
 "March" => "Marzo",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 2333c2fb29..91dc791176 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 527198ed85..88fb86a58a 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 59aa93b425..3b7b6ab272 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 2c712f7692..88a96f503f 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "خطء خلال توقيف كتاب العناوين."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "خطء خلال اضافة معرفه جديده."
@@ -30,7 +26,9 @@ msgstr "خطء خلال اضافة معرفه جديده."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "خطء خلال توقيف كتاب العناوين."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "خطء خلال تعديل كتاب العناوين"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "خطء خلال تعديل كتاب العناوين"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "المعارف"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "معرفه"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "تاريخ الميلاد"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "كتب العناوين"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "كتاب عناوين جديد"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "وصلة CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "انزال"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "تعديل"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "حذف"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "حذف"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "مفضل"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "الهاتف"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "انزال المعرفه"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "امحي المعرفه"
 
@@ -799,7 +790,7 @@ msgstr "الاسم المعروض"
 msgid "Active"
 msgstr "فعال"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "حفظ"
 
@@ -807,7 +798,7 @@ msgstr "حفظ"
 msgid "Submit"
 msgstr "ارسال"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "انزال"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "تعديل"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "كتاب عناوين جديد"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 40dbd44069..a4cc8c065a 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index cb1df6d275..ec5ea40447 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "حصه"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "حذف"
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 555fd8a481..4b0078ce6f 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 367bc89fa5..7f31f831b3 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index f6e11e306c..97403dbc3c 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index d351153184..1e67535533 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 96d5aeb216..5cb2d7ef8a 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Януари"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 00bd674afa..ef69b440c9 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:43+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Квота по подразбиране"
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index f73ac25510..b82f58e896 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Error en (des)activar la llibreta d'adreces."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "S'ha produït un error en afegir el contacte."
@@ -31,7 +27,9 @@ msgstr "S'ha produït un error en afegir el contacte."
 msgid "element name is not set."
 msgstr "no s'ha establert el nom de l'element."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "no s'ha establert la id."
 
@@ -55,6 +53,18 @@ msgstr "Esteu intentant afegir una propietat duplicada:"
 msgid "Error adding contact property: "
 msgstr "Error en afegir la propietat del contacte:"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Error en (des)activar la llibreta d'adreces."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Error en actualitzar la llibreta d'adreces."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No heu facilitat cap ID"
@@ -168,14 +178,6 @@ msgstr "Alguna cosa ha anat FUBAR."
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Error en actualitzar la llibreta d'adreces."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
@@ -222,71 +224,78 @@ msgstr "No s'ha carregat cap fitxer. Error desconegut"
 msgid "Contacts"
 msgstr "Contactes"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Aquesta funcionalitat encara no està implementada"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "No implementada"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacte"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nou"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Contate nou"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat: "
@@ -299,129 +308,133 @@ msgstr " importat, "
 msgid " failed."
 msgstr " fallada."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "No s'ha trobat la llibreta d'adreces."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Negocis"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Trucada"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Emissari"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idees"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Viatge"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Aniversari"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Reunió"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Preguntes"
 
@@ -439,209 +452,187 @@ msgstr "Importa"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Configuració"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Tanca"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navegació"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Següent contacte de la llista"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Contacte anterior de la llista"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Següent/anterior llibreta d'adreces"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Carrega de nou la llista de contactes"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Afegeix un contacte nou"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Esborra el contacte"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configura les llibretes d'adreces"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova llibreta d'adreces"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Enllaç CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Baixa"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Edita"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Elimina la foto a carregar"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Elimina la foto actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Edita la foto actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Carrega una foto nova"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Edita detalls del nom"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Escriviu el sobrenom"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Adreça web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Vés a la web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separeu els grups amb comes"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Edita els grups"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferit"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Especifiqueu una adreça de correu electrònic correcta"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Escriviu una adreça de correu electrònic"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Envia per correu electrònic a l'adreça"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Elimina l'adreça de correu electrònic"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Escriviu el número de telèfon"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Elimina el número de telèfon"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visualitza al mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Edita els detalls de l'adreça"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Afegiu notes aquí."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Afegeix un camp"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telèfon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Baixa el contacte"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Suprimeix el contacte"
 
@@ -800,7 +791,7 @@ msgstr "Nom a mostrar"
 msgid "Active"
 msgstr "Actiu"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Desa"
 
@@ -808,7 +799,7 @@ msgstr "Desa"
 msgid "Submit"
 msgstr "Envia"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -832,15 +823,15 @@ msgstr "Nom de la nova llibreta d'adreces"
 msgid "Importing contacts"
 msgstr "S'estan important contactes"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "No teniu contactes a la llibreta d'adreces."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Afegeix un contacte"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configura les llibretes d'adreces"
 
@@ -872,6 +863,34 @@ msgstr "Adreça primària (Kontact i al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Enllaç(os) vCard només de lectura"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Baixa"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Edita"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova llibreta d'adreces"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 65b3ff1583..4d26bb008c 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Gener"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 43be7c44b6..63756ed863 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:08+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -203,7 +203,7 @@ msgstr "Quota per defecte"
 msgid "Other"
 msgstr "Altre"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -211,10 +211,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin per a ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 2b16024e2b..c59ae23b7b 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Chyba při (de)aktivaci adresáře."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Během přidávání kontaktu nastala chyba."
@@ -32,7 +28,9 @@ msgstr "Během přidávání kontaktu nastala chyba."
 msgid "element name is not set."
 msgstr "jméno elementu není nastaveno."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id neni nastaveno."
 
@@ -56,6 +54,18 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Chyba při (de)aktivaci adresáře."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nelze aktualizovat adresář s prázdným jménem."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Chyba při aktualizaci adresáře."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadáno"
@@ -169,14 +179,6 @@ msgstr "Něco se pokazilo. "
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nelze aktualizovat adresář s prázdným jménem."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Chyba při aktualizaci adresáře."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba při nahrávání kontaktů do úložiště."
@@ -223,71 +225,78 @@ msgstr "Soubor nebyl odeslán. Neznámá chyba"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužel, tato funkce nebyla ještě implementována."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Neimplementováno"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Nelze získat platnou adresu."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Tento parametr nemuže zůstat nevyplněn."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Upravit jméno"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vybrat typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Výsledek: "
@@ -300,129 +309,133 @@ msgstr "importováno v pořádku,"
 msgid " failed."
 msgstr "neimportováno."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresář nenalezen."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Import"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresáře"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zavřít"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastavit adresáře"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nový adresář"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav odkaz"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Stažení"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editovat"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Odstranit"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Přetáhněte sem fotku pro její nahrání"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Smazat současnou fotku"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Upravit současnou fotku"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Nahrát novou fotku"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Upravit podrobnosti jména"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Odstranit"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Zadejte přezdívku"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddělte skupiny čárkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Upravit skupiny"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferovaný"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Prosím zadejte platnou e-mailovou adresu"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Zadat e-mailovou adresu"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Odeslat na adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Smazat e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Zadat telefoní číslo"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Smazat telefoní číslo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Upravit podrobnosti adresy"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Zde můžete připsat poznámky."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Přidat políčko"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Stáhnout kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
@@ -801,7 +792,7 @@ msgstr "Zobrazené jméno"
 msgid "Active"
 msgstr "Aktivní"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Uložit"
 
@@ -809,7 +800,7 @@ msgstr "Uložit"
 msgid "Submit"
 msgstr "Potvrdit"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Storno"
 
@@ -833,15 +824,15 @@ msgstr "Jméno nového adresáře"
 msgid "Importing contacts"
 msgstr "Importování kontaktů"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žádné kontakty v adresáři."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Přidat kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Nastavit adresář"
 
@@ -873,6 +864,34 @@ msgstr "Hlavní adresa (Kontakt etc)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Stažení"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editovat"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nový adresář"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index bfc8ad14e3..ebca07a442 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Leden"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 59288cbf81..6b10067fe4 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Výchozí kvóta"
 msgid "Other"
 msgstr "Jiné"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -214,10 +214,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Vymazat"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index d6f33b75f3..d95f9fcb44 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fejl ved (de)aktivering af adressebogen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
@@ -34,7 +30,9 @@ msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 msgid "element name is not set."
 msgstr "Elementnavnet er ikke medsendt."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "Intet ID medsendt."
 
@@ -58,6 +56,18 @@ msgstr "Kan ikke tilføje overlappende element."
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fejl ved (de)aktivering af adressebogen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan ikke opdatére adressebogen med et tomt navn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fejl ved opdatering af adressebog"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Intet ID medsendt"
@@ -171,14 +181,6 @@ msgstr "Noget gik grueligt galt. "
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan ikke opdatére adressebogen med et tomt navn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fejl ved opdatering af adressebog"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
@@ -225,71 +227,78 @@ msgstr "Ingen fil blev uploadet. Ukendt fejl."
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Denne funktion er desværre ikke implementeret endnu"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Ikke implementeret"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Kunne ikke finde en gyldig adresse."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fejl"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktperson"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Dette felt må ikke være tomt."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Dr."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vælg type"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -302,129 +311,133 @@ msgstr " importeret "
 msgid " failed."
 msgstr " fejl."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressebogen blev ikke fundet."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Besked"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Personsøger"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressebøger"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Luk"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurer adressebøger"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebog"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Rediger"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Slet"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Drop foto for at uploade"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Slet nuværende foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Rediger nuværende foto"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Upload nyt foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vælg foto fra ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Rediger navnedetaljer."
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slet"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Indtast kaldenavn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Opdel gruppenavne med kommaer"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Rediger grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Foretrukken"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Indtast venligst en gyldig email-adresse."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Indtast email-adresse"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Send mail til adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Slet email-adresse"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Indtast telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Slet telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Rediger adresse detaljer"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Tilføj noter her."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Tilføj element"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Download kontaktperson"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Slet kontaktperson"
 
@@ -803,7 +794,7 @@ msgstr "Vist navn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Gem"
 
@@ -811,7 +802,7 @@ msgstr "Gem"
 msgid "Submit"
 msgstr "Gem"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -835,15 +826,15 @@ msgstr "Navn på ny adressebog"
 msgid "Importing contacts"
 msgstr "Importerer kontaktpersoner"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontaktpersoner i din adressebog."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Tilføj kontaktpeson."
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøger"
 
@@ -875,6 +866,34 @@ msgstr "Primær adresse (Kontak m. fl.)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebog"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 324afe6129..c2a6184506 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januar"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index d4d081a64d..4f4826be77 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +207,7 @@ msgstr "Standard kvote"
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -215,10 +215,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Slet"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 62fdc32565..8218d777fc 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -32,10 +32,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Erstellen des Kontakts fehlgeschlagen"
@@ -44,7 +40,9 @@ msgstr "Erstellen des Kontakts fehlgeschlagen"
 msgid "element name is not set."
 msgstr "Kein Name für das Element angegeben."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID ist nicht angegeben."
 
@@ -68,6 +66,18 @@ msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 msgid "Error adding contact property: "
 msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Adressbuch aktualisieren fehlgeschlagen"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Keine ID angegeben"
@@ -181,14 +191,6 @@ msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Adressbuch aktualisieren fehlgeschlagen"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
@@ -235,71 +237,78 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Nicht Verfügbar"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Neu"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht Leer sein."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Wähle Typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Ergebnis: "
@@ -312,129 +321,133 @@ msgstr " importiert, "
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressbuch nicht gefunden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Andere"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Fragen"
 
@@ -452,209 +465,187 @@ msgstr "Importieren"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Schließen"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Nächster Kontakt aus der Liste"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Vorheriger Kontakt aus der Liste"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Ausklappen/Einklappen des Adressbuches"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Nächstes/Vorhergehendes Adressbuch"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Kontaktliste neu laden"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Aktuellen Kontakt löschen"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adressbücher konfigurieren"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Neues Adressbuch"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Herunterladen"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Löschen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Zieh' ein Foto hierher zum Hochladen"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Derzeitiges Foto löschen"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Foto ändern"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Neues Foto hochladen"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Foto aus ownCloud auswählen"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Name ändern"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Spitzname angeben"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Webseite"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Webseite aufrufen"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Gruppen mit Komma getrennt"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Gruppen editieren"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Bevorzugt"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Bitte eine gültige E-Mail-Adresse angeben."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "E-Mail-Adresse angeben."
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "E-Mail an diese Adresse schreiben"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "E-Mail-Adresse löschen"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Telefonnummer angeben"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefonnummer löschen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Auf Karte anzeigen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Adressinformationen ändern"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Füge hier Notizen ein."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Feld hinzufügen"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notiz"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kontakt herunterladen"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kontakt löschen"
 
@@ -813,7 +804,7 @@ msgstr "Anzeigename"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Speichern"
 
@@ -821,7 +812,7 @@ msgstr "Speichern"
 msgid "Submit"
 msgstr "Eintragen"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -845,15 +836,15 @@ msgstr "Name des neuen Adressbuchs"
 msgid "Importing contacts"
 msgstr "Kontakte werden importiert"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du hast keine Kontakte im Adressbuch."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Adressbücher konfigurieren"
 
@@ -885,6 +876,34 @@ msgstr "primäre Adresse (für Kontact o.ä. Programme)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Herunterladen"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Neues Adressbuch"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d2ab1e7a26..bee17cb280 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -45,10 +45,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januar"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 92690194d8..7fa8d58e35 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 18:48+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -209,7 +209,7 @@ msgstr "Standard Quota"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "Unteradministrator"
 
@@ -217,10 +217,6 @@ msgstr "Unteradministrator"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Unteradministrator für..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 59ca23304e..20cd68f115 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -23,10 +23,6 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Σφάλμα κατά την προσθήκη επαφής."
@@ -35,7 +31,9 @@ msgstr "Σφάλμα κατά την προσθήκη επαφής."
 msgid "element name is not set."
 msgstr "δεν ορίστηκε όνομα στοιχείου"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "δεν ορίστηκε id"
 
@@ -59,6 +57,18 @@ msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότ
 msgid "Error adding contact property: "
 msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Δε δόθηκε ID"
@@ -172,14 +182,6 @@ msgstr "Κάτι χάθηκε στο άγνωστο. "
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
@@ -226,71 +228,78 @@ msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλ
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Δεν έχει υλοποιηθεί"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Επαφή"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Νέο"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Νέα επαφή"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Αποτέλεσμα: "
@@ -303,129 +312,133 @@ msgstr " εισάγεται,"
 msgid " failed."
 msgstr " απέτυχε."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Επιχείρηση"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Κάλεσε"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Προμηθευτής"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Ιωβηλαίο"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
@@ -445,207 +458,185 @@ msgstr "Εισαγωγή"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Βιβλία διευθύνσεων"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Κλείσιμο  "
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Συντομεύσεις πλητρολογίου"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Επόμενη επαφή στη λίστα"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Προηγούμενη επαφή στη λίστα"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Ανανέωσε τη λίστα επαφών"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Προσθήκη νέου βιβλίου επαφών"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Διαγραφή τρέχουσας επαφής"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Ρυθμίστε το βιβλίο διευθύνσεων "
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Νέο βιβλίο διευθύνσεων"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Σύνδεσμος CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Λήψη"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Ρίξε μια φωτογραφία για ανέβασμα"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Διαγραφή τρέχουσας φωτογραφίας"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Επεξεργασία τρέχουσας φωτογραφίας"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Ανέβασε νέα φωτογραφία"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Παρατσούκλι"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Εισάγετε παρατσούκλι"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Ιστότοπος"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Πήγαινε στον ιστότοπο"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Διαχώρισε τις ομάδες με κόμμα "
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Επεξεργασία ομάδων"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Προτιμώμενο"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Αποστολή σε διεύθυνση"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Διαγραφή διεύθυνση email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Εισήγαγε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Διέγραψε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Προβολή στο χάρτη"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Πρόσθεσε τις σημειώσεις εδώ"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Προσθήκη πεδίου"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Σημείωση"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Λήψη επαφής"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Διαγραφή επαφής"
 
@@ -804,7 +795,7 @@ msgstr "Προβαλλόμενο όνομα"
 msgid "Active"
 msgstr "Ενεργό"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -812,7 +803,7 @@ msgstr "Αποθήκευση"
 msgid "Submit"
 msgstr "Καταχώρηση"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -836,15 +827,15 @@ msgstr "Όνομα νέου βιβλίου διευθύνσεων"
 msgid "Importing contacts"
 msgstr "Εισαγωγή επαφών"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Δεν έχεις επαφές στο βιβλίο διευθύνσεων"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Προσθήκη επαφής"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
 
@@ -876,6 +867,34 @@ msgstr "Κύρια διεύθυνση"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Λήψη"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Νέο βιβλίο διευθύνσεων"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 97808b122b..5f3262deb6 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Ιανουάριος"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 02857c416c..d0a70f2928 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 11:41+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -207,7 +207,7 @@ msgstr "Προεπιλεγμένο όριο"
 msgid "Other"
 msgstr "Άλλα"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -215,10 +215,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Σύνολο χώρου"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin για ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index b040e06d2c..b892bbe22c 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Eraro dum (mal)aktivigo de adresaro."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Eraro okazis dum aldono de kontakto."
@@ -30,7 +26,9 @@ msgstr "Eraro okazis dum aldono de kontakto."
 msgid "element name is not set."
 msgstr "eronomo ne agordiĝis."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "identigilo ne agordiĝis."
 
@@ -54,6 +52,18 @@ msgstr "Provante aldoni duobligitan propraĵon:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Eraro dum (mal)aktivigo de adresaro."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eraro dum ĝisdatigo de adresaro."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Neniu identigilo proviziĝis."
@@ -167,14 +177,6 @@ msgstr "Io FUBAR-is."
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eraro dum ĝisdatigo de adresaro."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Eraro dum alŝutiĝis kontaktoj al konservejo."
@@ -221,71 +223,78 @@ msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Ne disponebla"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Ne eblis ekhavi validan adreson."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Eraro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Redakti nomon"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Elektu tipon"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Rezulto: "
@@ -298,129 +307,133 @@ msgstr " enportoj, "
 msgid " failed."
 msgstr "malsukcesoj."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresaro ne troviĝis."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Interreto"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Naskiĝotago"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr "Enporti"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresaroj"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermi"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Agordi adresarojn"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova adresaro"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-ligilo"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Elŝuti"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Redakti"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Forigi"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Demeti foton por alŝuti"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Forigi nunan foton"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Redakti nunan foton"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Alŝuti novan foton"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Redakti detalojn de nomo"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Enigu kromnomon"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Disigi grupojn per komoj"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Redakti grupojn"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferata"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Bonvolu specifi validan retpoŝtadreson."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Enigi retpoŝtadreson"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Retpoŝtmesaĝo al adreso"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Forigi retpoŝþadreson"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Enigi telefonnumeron"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Forigi telefonnumeron"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vidi en mapo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Redakti detalojn de adreso"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Aldoni notojn ĉi tie."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Aldoni kampon"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Noto"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Elŝuti kontakton"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Forigi kontakton"
 
@@ -799,7 +790,7 @@ msgstr "Montronomo"
 msgid "Active"
 msgstr "Aktiva"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Konservi"
 
@@ -807,7 +798,7 @@ msgstr "Konservi"
 msgid "Submit"
 msgstr "Sendi"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -831,15 +822,15 @@ msgstr "Nomo de nova adresaro"
 msgid "Importing contacts"
 msgstr "Enportante kontaktojn"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Vi ne havas kontaktojn en via adresaro"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Aldoni kontakton"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Agordi adresarojn"
 
@@ -871,6 +862,34 @@ msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Elŝuti"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Redakti"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova adresaro"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 88e04e3e10..8d72ea6ef5 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januaro"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 662744f091..3435e84663 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Defaŭlta kvoto"
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvoto"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index cecb721b9a..14340a646e 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Error al (des)activar libreta de direcciones."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Se ha producido un error al añadir el contacto."
@@ -34,7 +30,9 @@ msgstr "Se ha producido un error al añadir el contacto."
 msgid "element name is not set."
 msgstr "no se ha puesto ningún nombre de elemento."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "no se ha puesto ninguna ID."
 
@@ -58,6 +56,18 @@ msgstr "Intentando añadir una propiedad duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Error al (des)activar libreta de direcciones."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "No se puede actualizar una libreta de direcciones sin nombre."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Error al actualizar la libreta de direcciones."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No se ha proporcionado una ID"
@@ -171,14 +181,6 @@ msgstr "Plof. Algo ha fallado."
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "No se puede actualizar una libreta de direcciones sin nombre."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Error al actualizar la libreta de direcciones."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
@@ -225,71 +227,78 @@ msgstr "Fallo no se subió el fichero"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Perdón esta función no esta aún implementada"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "No esta implementada"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Fallo : no hay dirección valida"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fallo"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Este campo no puede estar vacío."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Edita el Nombre"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Selecciona el tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado :"
@@ -302,129 +311,133 @@ msgstr "Importado."
 msgid " failed."
 msgstr "Fallo."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Libreta de direcciones no encontrada."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Localizador"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Libretas de direcciones"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Cierra."
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar libretas de direcciones"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nueva libreta de direcciones"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Enlace CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Borrar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Suelta una foto para subirla"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Eliminar fotografía actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar fotografía actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Subir nueva fotografía"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar los detalles del nombre"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Borrar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Alias"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introduce un alias"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separa los grupos con comas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor especifica una dirección de correo electrónico válida."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introduce una dirección de correo electrónico"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Enviar por correo a la dirección"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Eliminar dirección de correo electrónico"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Introduce un número de teléfono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Eliminar número de teléfono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar detalles de la dirección"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Añade notas aquí."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Añadir campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Eliminar contacto"
 
@@ -803,7 +794,7 @@ msgstr "Nombre a mostrar"
 msgid "Active"
 msgstr "Activo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Guardar"
 
@@ -811,7 +802,7 @@ msgstr "Guardar"
 msgid "Submit"
 msgstr "Aceptar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -835,15 +826,15 @@ msgstr "Nombre de la nueva agenda"
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "No hay contactos en tu agenda."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Añadir contacto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar agenda"
 
@@ -875,6 +866,34 @@ msgstr "Dirección primaria (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nueva libreta de direcciones"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e55ee41958..0dfd58a77a 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Enero"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index e5e6215db3..37d1b2e534 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 04:34+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Cuota predeterminada"
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Cuota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin para ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 41ce51e36a..8ca1073883 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Viga aadressiraamatu (de)aktiveerimisel."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Konktakti lisamisel tekkis viga."
@@ -30,7 +26,9 @@ msgstr "Konktakti lisamisel tekkis viga."
 msgid "element name is not set."
 msgstr "elemendi nime pole määratud."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID on määramata."
 
@@ -54,6 +52,18 @@ msgstr "Proovitakse lisada topeltomadust: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Viga aadressiraamatu (de)aktiveerimisel."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Viga aadressiraamatu uuendamisel."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID-d pole sisestatud"
@@ -167,14 +177,6 @@ msgstr "Midagi läks tõsiselt metsa."
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Viga aadressiraamatu uuendamisel."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
@@ -221,71 +223,78 @@ msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Vabandust, aga see funktsioon pole veel valmis"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Pole implementeeritud"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Viga"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Muuda nime"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vali tüüp"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Tulemus: "
@@ -298,129 +307,133 @@ msgstr " imporditud, "
 msgid " failed."
 msgstr " ebaõnnestus."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Aadressiraamatut ei leitud"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr "Impordi"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Aadressiraamatud"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Sule"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Seadista aadressiraamatut"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Uus aadressiraamat"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Lae alla"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Muuda"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Kustuta"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Lohista üleslaetav foto siia"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Kustuta praegune foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Muuda praegust pilti"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Lae üles uus foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Muuda nime üksikasju"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Kustuta"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Sisesta hüüdnimi"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Eralda grupid komadega"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Muuda gruppe"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Eelistatud"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Palun sisesta korrektne e-posti aadress."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Sisesta e-posti aadress"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Kiri aadressile"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Kustuta e-posti aadress"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Sisesta telefoninumber"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Kustuta telefoninumber"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vaata kaardil"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Muuda aaressi infot"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Lisa märkmed siia."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Lisa väli"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Märkus"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Lae kontakt alla"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kustuta kontakt"
 
@@ -799,7 +790,7 @@ msgstr "Näidatav nimi"
 msgid "Active"
 msgstr "Aktiivne"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salvesta"
 
@@ -807,7 +798,7 @@ msgstr "Salvesta"
 msgid "Submit"
 msgstr "Saada"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -831,15 +822,15 @@ msgstr "Uue aadressiraamatu nimi"
 msgid "Importing contacts"
 msgstr "Kontaktide importimine"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Sinu aadressiraamatus pole ühtegi kontakti."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Lisa kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Seadista aadressiraamatuid"
 
@@ -871,6 +862,34 @@ msgstr "Peamine aadress"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Lae alla"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Muuda"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Uus aadressiraamat"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index a98c7fc276..8e0bb95d9f 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Jaanuar"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e9ec42e530..56a6b7f20a 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Vaikimisi kvoot"
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Mahupiir"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index a35dba2f95..1d8001bc54 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Errore bat egon da kontaktua gehitzerakoan"
@@ -32,13 +28,15 @@ msgstr "Errore bat egon da kontaktua gehitzerakoan"
 msgid "element name is not set."
 msgstr "elementuaren izena ez da ezarri."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "IDa ez da ezarri."
 
 #: ajax/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ezin izan da kontaktua analizatu:"
 
 #: ajax/addproperty.php:56
 msgid "Cannot add empty property."
@@ -54,7 +52,19 @@ msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 
 #: ajax/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Errore bat egon da helbide liburua eguneratzen."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -169,14 +179,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Errore bat egon da helbide liburua eguneratzen."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
@@ -223,71 +225,78 @@ msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Barkatu, aukera hau ez da oriandik inplementatu"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Inplementatu gabe"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Ezin izan da eposta baliagarri bat hartu."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errorea"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
-msgstr ""
+msgstr "Berria"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
-msgstr ""
+msgstr "Kontaktu berria"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Propietate hau ezin da hutsik egon."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editatu izena"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Hautatu mota"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Emaitza:"
@@ -300,131 +309,135 @@ msgstr " inportatua, "
 msgid " failed."
 msgstr "huts egin du."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Helbide liburua ez da aurkitu"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mezua"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Jaioteguna"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Deia"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Bezeroak"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:186
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:187
-msgid "Journey"
-msgstr ""
-
 #: lib/app.php:188
+msgid "Holidays"
+msgstr "Oporrak"
+
+#: lib/app.php:189
+msgid "Ideas"
+msgstr "Ideiak"
+
+#: lib/app.php:190
+msgid "Journey"
+msgstr "Bidaia"
+
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Personal"
-msgstr ""
-
 #: lib/app.php:192
-msgid "Projects"
-msgstr ""
+msgid "Meeting"
+msgstr "Bilera"
 
 #: lib/app.php:193
+msgid "Other"
+msgstr "Bestelakoa"
+
+#: lib/app.php:194
+msgid "Personal"
+msgstr "Pertsonala"
+
+#: lib/app.php:195
+msgid "Projects"
+msgstr "Proiektuak"
+
+#: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Galderak"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -440,209 +453,187 @@ msgstr "Inportatu"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Helbide Liburuak"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Itxi"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Teklatuaren lasterbideak"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
-msgstr ""
+msgstr "Nabigazioa"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
-msgstr ""
+msgstr "Hurrengoa kontaktua zerrendan"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Aurreko kontaktua zerrendan"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Zabaldu/tolestu uneko helbide-liburua"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Hurrengo/aurreko helbide-liburua"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Ekintzak"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Gaurkotu kontaktuen zerrenda"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Gehitu kontaktu berria"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Gehitu helbide-liburu berria"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Ezabatu uneko kontaktuak"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguratu Helbide Liburuak"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Helbide-liburu berria"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav lotura"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Deskargatu"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editatu"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Ezabatu"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Askatu argazkia igotzeko"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Ezabatu oraingo argazkia"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editatu oraingo argazkia"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Igo argazki berria"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editatu izenaren zehaztasunak"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Ezizena"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Sartu ezizena"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Web orria"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.webgunea.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Web orrira joan"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Banatu taldeak komekin"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editatu taldeak"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Hobetsia"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Mesedez sartu eposta helbide egoki bat"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Sartu eposta helbidea"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Bidali helbidera"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Ezabatu eposta helbidea"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Sartu telefono zenbakia"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Ezabatu telefono zenbakia"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ikusi mapan"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editatu helbidearen zehaztasunak"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Gehitu oharrak hemen."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Gehitu eremua"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Oharra"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Deskargatu kontaktua"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Ezabatu kontaktua"
 
@@ -665,11 +656,11 @@ msgstr "Posta kutxa"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Kalearen helbidea"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Kalea eta zenbakia"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -677,7 +668,7 @@ msgstr "Hedatua"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Etxe zenbakia eab."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -698,7 +689,7 @@ msgstr "Posta kodea"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Posta kodea"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -801,7 +792,7 @@ msgstr "Bistaratzeko izena"
 msgid "Active"
 msgstr "Aktibo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Gorde"
 
@@ -809,7 +800,7 @@ msgstr "Gorde"
 msgid "Submit"
 msgstr "Bidali"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -833,29 +824,29 @@ msgstr "Helbide liburuaren izena"
 msgid "Importing contacts"
 msgstr "Kontaktuak inportatzen"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Ez duzu kontakturik zure helbide liburuan."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Gehitu kontaktua"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfiguratu helbide liburuak"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Hautatu helbide-liburuak"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Sartu izena"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Sartu deskribapena"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -873,6 +864,34 @@ msgstr "Helbide nagusia"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editatu"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Helbide-liburu berria"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 8fdfcdcd07..f758d66577 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Urtarrila"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 5b5b358bca..eda83576c6 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Baliogabeko eskaria"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentifikazio errorea"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -62,7 +62,7 @@ msgstr "Euskera"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Segurtasun abisua"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -204,18 +204,14 @@ msgstr "Kuota lehentsia"
 msgid "Other"
 msgstr "Besteak"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index ff9ad67017..7b57737f95 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 98e3012b65..0a342ad7e0 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 6e77d37cb4..8b8dcb1934 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index f453f6e2c6..50dc9b76f2 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
@@ -30,7 +26,9 @@ msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 msgid "element name is not set."
 msgstr "نام اصلی تنظیم نشده است"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "شناسه تعیین نشده"
 
@@ -54,6 +52,18 @@ msgstr "امتحان کردن برای وارد کردن مشخصات تکرار
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "هیچ شناسه ای ارائه نشده"
@@ -167,14 +177,6 @@ msgstr "چند چیز به FUBAR رفتند"
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
@@ -221,71 +223,78 @@ msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "با عرض پوزش،این قابلیت هنوز اجرا نشده است"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "انجام نشد"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Couldn't get a valid address."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "خطا"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "اشخاص"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "نام تغییر"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "نتیجه:"
@@ -298,129 +307,133 @@ msgstr "وارد شد،"
 msgid " failed."
 msgstr "ناموفق"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "کتابچه نشانی ها یافت نشد"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "این کتابچه ی نشانه های شما نیست"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "نشانی"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "تلفن"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "نشانی پست الکترنیک"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "نهاد(ارگان)"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "موبایل"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "متن"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "صدا"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "پیغام"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "دورنگار:"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "رسانه تصویری"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "صفحه"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "اینترنت"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "روزتولد"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr "وارد کردن"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "کتابچه ی نشانی ها"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "بستن"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "پیکر بندی کتابچه نشانی ها"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "کتابچه نشانه های جدید"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "بارگیری"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "ویرایش"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "پاک کردن"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "تصویر را به اینجا بکشید تا بار گذازی شود"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "پاک کردن تصویر کنونی"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "ویرایش تصویر کنونی"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "بار گذاری یک تصویر جدید"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "ویرایش نام جزئیات"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "پاک کردن"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "نام مستعار"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "یک نام مستعار وارد کنید"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "جدا کردن گروه ها به وسیله درنگ نما"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "ویرایش گروه ها"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "مقدم"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "یک  پست الکترونیکی وارد کنید"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "به نشانی  ارسال شد"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "پاک کردن نشانی پست الکترونیکی"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "شماره تلفن راوارد کنید"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "پاک کردن شماره تلفن"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "دیدن روی نقشه"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "ویرایش جزئیات نشانی ها"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "اینجا یادداشت ها را بیافزایید"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "اضافه کردن فیلد"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "شماره تلفن"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "یادداشت"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "دانلود مشخصات اشخاص"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "پاک کردن  اطلاعات شخص مورد نظر"
 
@@ -799,7 +790,7 @@ msgstr "نام برای نمایش"
 msgid "Active"
 msgstr "فعال"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "ذخیره سازی"
 
@@ -807,7 +798,7 @@ msgstr "ذخیره سازی"
 msgid "Submit"
 msgstr "ارسال"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -831,15 +822,15 @@ msgstr "نام کتابچه نشانی جدید"
 msgid "Importing contacts"
 msgstr "وارد کردن اشخاص"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "شماهیچ شخصی در  کتابچه نشانی خود ندارید"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "پیکربندی کتابچه ی نشانی ها"
 
@@ -871,6 +862,34 @@ msgstr "نشانی اولیه"
 msgid "iOS/OS X"
 msgstr "iOS/OS X "
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "بارگیری"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "ویرایش"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "کتابچه نشانه های جدید"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index e2c97e1c45..05c5ea57eb 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "ژانویه"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index ab1c42e295..6ccc6f4586 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "سهم پیش فرض"
 msgid "Other"
 msgstr "سایر"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "سهم"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "پاک کردن"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 8ec5c5cc62..0df7c2a0cd 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Virhe yhteystietoa lisättäessä."
@@ -33,7 +29,9 @@ msgstr "Virhe yhteystietoa lisättäessä."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -57,6 +55,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Virhe päivitettäessä osoitekirjaa."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -170,14 +180,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Virhe päivitettäessä osoitekirjaa."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -224,71 +226,78 @@ msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Uusi"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Tulos: "
@@ -301,129 +310,133 @@ msgstr " tuotu, "
 msgid " failed."
 msgstr " epäonnistui."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Osoitekirjaa ei löytynyt."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -443,207 +456,185 @@ msgstr "Tuo"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Osoitekirjat"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Sulje"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Päivitä yhteystietoluettelo"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Lisää uusi yhteystieto"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Lisää uusi osoitekirja"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Poista nykyinen yhteystieto"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Muokkaa osoitekirjoja"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Uusi osoitekirja"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-linkki"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Lataa"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Poista"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Poista nykyinen valokuva"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Muokkaa nykyistä valokuvaa"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Lähetä uusi valokuva"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Valitse valokuva ownCloudista"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Muokkaa nimitietoja"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Poista"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Anna kutsumanimi"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Verkkosivu"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Siirry verkkosivulle"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Erota ryhmät pilkuilla"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Muokkaa ryhmiä"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Anna kelvollinen sähköpostiosoite."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Anna sähköpostiosoite"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Poista sähköpostiosoite"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Anna puhelinnumero"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Poista puhelinnumero"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Näytä kartalla"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Muokkaa osoitetietoja"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Lisää huomiot tähän."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Lisää kenttä"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Puhelin"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Huomio"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Lataa yhteystieto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Poista yhteystieto"
 
@@ -802,7 +793,7 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Tallenna"
 
@@ -810,7 +801,7 @@ msgstr "Tallenna"
 msgid "Submit"
 msgstr "Lähetä"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Peru"
 
@@ -834,15 +825,15 @@ msgstr "Uuden osoitekirjan nimi"
 msgid "Importing contacts"
 msgstr "Tuodaan yhteystietoja"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Osoitekirjassasi ei ole yhteystietoja."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Lisää yhteystieto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Muokkaa osoitekirjoja"
 
@@ -874,6 +865,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Lataa"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Uusi osoitekirja"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 652247ff5c..072f0ad9ca 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Tammikuu"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d79aad9bbd..012ddb1408 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 15:51+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -203,7 +203,7 @@ msgstr "Oletuskiintiö"
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kiintiö"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Poista"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 9d6d8f6ccd..6fac7c4382 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Une erreur s'est produite lors de l'ajout du contact."
@@ -39,7 +35,9 @@ msgstr "Une erreur s'est produite lors de l'ajout du contact."
 msgid "element name is not set."
 msgstr "Le champ Nom n'est pas défini."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "L'ID n'est pas défini."
 
@@ -63,6 +61,18 @@ msgstr "Ajout d'une propriété en double:"
 msgid "Error adding contact property: "
 msgstr "Erreur pendant l'ajout de la propriété du contact :"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erreur lors de la mise à jour du carnet d'adresses."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Aucun ID fourni"
@@ -176,14 +186,6 @@ msgstr "Quelque chose est FUBAR."
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erreur lors de la mise à jour du carnet d'adresses."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
@@ -230,71 +232,78 @@ msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Pas encore implémenté"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nouveau"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Nouveau Contact"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Sélectionner un type"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Résultat :"
@@ -307,129 +316,133 @@ msgstr "importé,"
 msgid " failed."
 msgstr "échoué."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Carnet d'adresses introuvable."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Business"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Livreur"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Trajet"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Rendez-vous"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Questions"
 
@@ -449,207 +462,185 @@ msgstr "Importer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Contact suivant dans la liste"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Contact précédent dans la liste"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Passer au carnet d'adresses suivant/précédent"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Paramétrer carnet d'adresses"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nouveau Carnet d'adresses"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Lien CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Télécharger"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modifier"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Supprimer"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Glisser une photo pour l'envoi"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Supprimer la photo actuelle"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editer la photo actuelle"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Envoyer une nouvelle photo"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editer les noms"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Supprimer"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Surnom"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Entrer un surnom"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Page web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Allez à la page web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "jj-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Séparer les groupes avec des virgules"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editer les groupes"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Préféré"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Merci d'entrer une adresse e-mail valide."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Entrer une adresse e-mail"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Envoyer à l'adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Supprimer l'adresse e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Entrer un numéro de téléphone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Supprimer le numéro de téléphone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Voir sur une carte"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editer les adresses"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Ajouter des notes ici."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Ajouter un champ."
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Téléphone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Télécharger le contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Supprimer le contact"
 
@@ -808,7 +799,7 @@ msgstr "Nom"
 msgid "Active"
 msgstr "Carnet actif"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -816,7 +807,7 @@ msgstr "Sauvegarder"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -840,15 +831,15 @@ msgstr "Nom du nouveau carnet d'adresses"
 msgid "Importing contacts"
 msgstr "Importation des contacts"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Il n'y a pas de contact dans votre carnet d'adresses."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Ajouter un contact"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Paramétrer carnet d'adresses"
 
@@ -880,6 +871,34 @@ msgstr "Adresse principale"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Télécharger"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modifier"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nouveau Carnet d'adresses"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 79d3b618b1..dfb7e40edf 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Janvier"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ea9e3f885e..ad7a053a98 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 00:49+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Quota par défaut"
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin pour ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 521bb00899..24c694cdea 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Produciuse un erro (des)activando a axenda."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Produciuse un erro engadindo o contacto."
@@ -31,7 +27,9 @@ msgstr "Produciuse un erro engadindo o contacto."
 msgid "element name is not set."
 msgstr "non se nomeou o elemento."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "non se estableceu o id."
 
@@ -55,6 +53,18 @@ msgstr "Tentando engadir propiedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Produciuse un erro (des)activando a axenda."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Produciuse un erro actualizando a axenda."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Non se proveeu ID"
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Produciuse un erro actualizando a axenda."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro subindo os contactos ao almacén."
@@ -222,71 +224,78 @@ msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Sentímolo, esta función aínda non foi implementada."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Non implementada."
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Non se puido obter un enderezo de correo válido."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Esta propiedade non pode quedar baldeira."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleccione tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado: "
@@ -299,129 +308,133 @@ msgstr " importado, "
 msgid " failed."
 msgstr " fallou."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Non se atopou a libreta de enderezos."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta non é a súa axenda."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Enderezo"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensaxe"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Paxinador"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Axendas"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Pechar"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar Libretas de enderezos"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova axenda"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ligazón CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Eliminar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Solte a foto a subir"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Borrar foto actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar a foto actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Subir unha nova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Escoller foto desde ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalles do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Apodo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introuza apodo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe grupos con comas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor indique un enderezo de correo electrónico válido."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introduza enderezo de correo electrónico"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Correo ao enderezo"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Borrar enderezo de correo electrónico"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Introducir número de teléfono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Borrar número de teléfono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar detalles do enderezo"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Engadir aquí as notas."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Engadir campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Borrar contacto"
 
@@ -800,7 +791,7 @@ msgstr "Nome a mostrar"
 msgid "Active"
 msgstr "Activo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Gardar"
 
@@ -808,7 +799,7 @@ msgstr "Gardar"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -832,15 +823,15 @@ msgstr "Nome da nova libreta de enderezos"
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Non ten contactos na súa libreta de enderezos."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Engadir contacto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar libretas de enderezos"
 
@@ -872,6 +863,34 @@ msgstr "Enderezo primario (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova axenda"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 8da22539ae..892b9c977f 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Preferencias"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Xaneiro"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 622cde377c..2248d0b031 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Cuota por omisión"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Borrar"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 08b2d09342..dca49f889e 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "אירעה שגיאה בעת הוספת איש הקשר."
@@ -32,7 +28,9 @@ msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 msgid "element name is not set."
 msgstr "שם האלמנט לא נקבע."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "מספר מזהה לא נקבע."
 
@@ -56,6 +54,18 @@ msgstr "ניסיון להוספת מאפיין כפול: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "שגיאה בעדכון פנקס הכתובות."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "לא צוין מזהה"
@@ -169,14 +179,6 @@ msgstr "משהו לא התנהל כצפוי."
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "שגיאה בעדכון פנקס הכתובות."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "התרשה שגיאה בהעלאת אנשי הקשר לאכסון."
@@ -223,71 +225,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "איש קשר"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -300,129 +309,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "ספר כתובות לא נמצא"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "הודעה"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "אינטרנט"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "יבא"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "פנקסי כתובות"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "הגדר ספרי כתובות"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "פנקס כתובות חדש"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "קישור "
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "הורדה"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "עריכה"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "מחיקה"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "גרור ושחרר תמונה בשביל להעלות"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "מחק תמונה נוכחית"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "ערוך תמונה נוכחית"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "העלה תמונה חדשה"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "בחר תמונה מ ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "ערוך פרטי שם"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "מחיקה"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "כינוי"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "הכנס כינוי"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "הפרד קבוצות עם פסיקים"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "ערוך קבוצות"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "מועדף"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "אנא הזן כתובת דוא\"ל חוקית"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "הזן כתובת דוא\"ל"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "כתובת"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "מחק כתובת דוא\"ל"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "הכנס מספר טלפון"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "מחק מספר טלפון"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "ראה במפה"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "ערוך פרטי כתובת"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "הוסף הערות כאן."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "הוסף שדה"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "טלפון"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "הערה"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "הורדת איש קשר"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "מחיקת איש קשר"
 
@@ -801,7 +792,7 @@ msgstr "שם התצוגה"
 msgid "Active"
 msgstr "פעיל"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "שמירה"
 
@@ -809,7 +800,7 @@ msgstr "שמירה"
 msgid "Submit"
 msgstr "ביצוע"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -833,15 +824,15 @@ msgstr "שם ספר כתובות החדש"
 msgid "Importing contacts"
 msgstr "מיבא אנשי קשר"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "איך לך אנשי קשר בספר הכתובות"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "הוסף איש קשר"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "הגדר ספרי כתובות"
 
@@ -873,6 +864,34 @@ msgstr "כתובת ראשית"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "הורדה"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "עריכה"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "פנקס כתובות חדש"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index caacbd7897..9f69d80ad1 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr ""
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "ינואר"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 0e2b48f3e6..17af884c07 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "מכסת בררת המחדל"
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "מכסה"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "מחיקה"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 52acf5ffa1..a8d9aea13f 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Pogreška pri (de)aktivaciji adresara."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
@@ -31,7 +27,9 @@ msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
 msgid "element name is not set."
 msgstr "naziv elementa nije postavljen."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id nije postavljen."
 
@@ -55,6 +53,18 @@ msgstr "Pokušali ste dodati duplo svojstvo:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Pogreška pri (de)aktivaciji adresara."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Pogreška pri ažuriranju adresara."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nema dodijeljenog ID identifikatora"
@@ -168,14 +178,6 @@ msgstr "Nešto je otišlo... krivo..."
 msgid "Error updating contact property."
 msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Pogreška pri ažuriranju adresara."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Pogreška pri slanju kontakata."
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresar nije pronađen."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Poruka"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Uvezi"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresari"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguracija Adresara"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Novi adresar"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav poveznica"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Preuzimanje"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Obriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Dovucite fotografiju za slanje"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Uredi trenutnu sliku"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Uredi detalje imena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Unesi nadimank"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Uredi grupe"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferirano"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Unesi email adresu"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Unesi broj telefona"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Prikaži na karti"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Uredi detalje adrese"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Dodaj bilješke ovdje."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Bilješka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Preuzmi kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Izbriši kontakt"
 
@@ -800,7 +791,7 @@ msgstr "Prikazani naziv"
 msgid "Active"
 msgstr "Aktivno"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Spremi"
 
@@ -808,7 +799,7 @@ msgstr "Spremi"
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Prekini"
 
@@ -832,15 +823,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Preuzimanje"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Novi adresar"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 48308caf05..bfd1c9f19b 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Siječanj"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index d853ac5b27..01ae9d7ee9 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "standardni kvota"
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "kvota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index f524421d03..5e5420b34d 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Címlista (de)aktiválása sikertelen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Hiba a kapcsolat hozzáadásakor"
@@ -33,7 +29,9 @@ msgstr "Hiba a kapcsolat hozzáadásakor"
 msgid "element name is not set."
 msgstr "az elem neve nincs beállítva"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID nincs beállítva"
 
@@ -57,6 +55,18 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Címlista (de)aktiválása sikertelen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Üres névvel nem frissíthető a címlista"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Hiba a címlista frissítésekor"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nincs ID megadva"
@@ -170,14 +180,6 @@ msgstr "Valami balul sült el."
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Üres névvel nem frissíthető a címlista"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Hiba a címlista frissítésekor"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Hiba a kapcsolatok feltöltésekor"
@@ -224,71 +226,78 @@ msgstr "Nem történt feltöltés. Ismeretlen hiba"
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Sajnáljuk, ez a funkció még nem támogatott"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Nem támogatott"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Érvényes cím lekérése sikertelen"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hiba"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kapcsolat"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ezt a tulajdonságot muszáj kitölteni"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Típus kiválasztása"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Eredmény: "
@@ -301,129 +310,133 @@ msgstr "  beimportálva,  "
 msgid " failed."
 msgstr "  sikertelen"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Címlista nem található"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Szervezet"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Születésnap"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -443,207 +456,185 @@ msgstr "Import"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Címlisták"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Bezár"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Címlisták beállítása"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Új címlista"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav hivatkozás"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Letöltés"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Törlés"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Húzza ide a feltöltendő képet"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Aktuális kép törlése"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Aktuális kép szerkesztése"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Új kép feltöltése"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Név részleteinek szerkesztése"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Becenév"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Becenév megadása"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Vesszővel válassza el a csoportokat"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Csoportok szerkesztése"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Előnyben részesített"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Adjon meg érvényes email címet"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Adja meg az email címet"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Postai cím"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Email cím törlése"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Adja meg a telefonszámot"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefonszám törlése"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Megtekintés a térképen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Cím részleteinek szerkesztése"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Megjegyzések"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Mező hozzáadása"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonszám"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Jegyzet"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kapcsolat letöltése"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kapcsolat törlése"
 
@@ -802,7 +793,7 @@ msgstr "Megjelenített név"
 msgid "Active"
 msgstr "Aktív"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Mentés"
 
@@ -810,7 +801,7 @@ msgstr "Mentés"
 msgid "Submit"
 msgstr "Elküld"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -834,15 +825,15 @@ msgstr "Új címlista neve"
 msgid "Importing contacts"
 msgstr "Kapcsolatok importálása"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nincsenek kapcsolatok a címlistában"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Kapcsolat hozzáadása"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Címlisták beállítása"
 
@@ -874,6 +865,34 @@ msgstr "Elsődleges cím"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Letöltés"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Új címlista"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index a40b764ad4..928cb01897 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Január"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5a646b0f67..47d040cef6 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Alapértelmezett kvóta"
 msgid "Other"
 msgstr "Egyéb"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 8916c610f8..b89ca65c8d 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f7c8e7693a..bcf3a0d20c 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 9538d201b8..1d18d1b9fd 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index d41fa3c8fa..30a6e588b4 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -31,7 +27,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -55,6 +53,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressario non trovate."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Anniversario"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressarios"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nove adressario"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ligamine CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Discargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modificar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Deler"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Deler photo currente"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Modificar photo currente"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Incargar nove photo"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Pseudonymo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Inserer pseudonymo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Modificar gruppos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferite"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Entrar un adresse de e-posta"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Deler adresse de E-posta"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Entrar un numero de telephono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Deler numero de telephono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vider in un carta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Adder notas hic"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Adder campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Phono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Discargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Deler contacto"
 
@@ -800,7 +791,7 @@ msgstr ""
 msgid "Active"
 msgstr "Active"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salveguardar"
 
@@ -808,7 +799,7 @@ msgstr "Salveguardar"
 msgid "Submit"
 msgstr "Submitter"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -832,15 +823,15 @@ msgstr "Nomine del nove gruppo:"
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Adder adressario"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Discargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modificar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nove adressario"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index fe4466de6b..bd15bf5a90 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 20a6dc619a..17d5ea3782 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Quota predeterminate"
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 46c23dd903..84104f841c 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index dbfdf23312..6245505a80 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index e33802637f..ab9bd79354 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Kuota default"
 msgid "Other"
 msgstr "Lain-lain"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Hapus"
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 0efd77c3ec..b7347b2b7d 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 1434c85e1d..0d43d3618c 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index e28f303b92..c8cf7eb0de 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index a6d51ee4f5..7a2687c796 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Errore nel (dis)attivare la rubrica."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Si è verificato un errore nell'aggiunta del contatto."
@@ -33,7 +29,9 @@ msgstr "Si è verificato un errore nell'aggiunta del contatto."
 msgid "element name is not set."
 msgstr "il nome dell'elemento non è impostato."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID non impostato."
 
@@ -57,6 +55,18 @@ msgstr "P"
 msgid "Error adding contact property: "
 msgstr "Errore durante l'aggiunta della proprietà del contatto: "
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Errore nel (dis)attivare la rubrica."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Impossibile aggiornare una rubrica senza nome."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Errore durante l'aggiornamento della rubrica."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nessun ID fornito"
@@ -170,14 +180,6 @@ msgstr "Qualcosa è andato storto. "
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Impossibile aggiornare una rubrica senza nome."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Errore durante l'aggiornamento della rubrica."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
@@ -224,71 +226,78 @@ msgstr "Nessun file è stato inviato. Errore sconosciuto"
 msgid "Contacts"
 msgstr "Contatti"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Non implementata"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contatto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nuovo"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Risultato: "
@@ -301,129 +310,133 @@ msgstr " importato, "
 msgid " failed."
 msgstr " non riuscito."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Rubrica non trovata."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Domande"
 
@@ -443,207 +456,185 @@ msgstr "Importa"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Rubriche"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Contatto successivo in elenco"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Contatto precedente in elenco"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Espandi/Contrai la rubrica corrente"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Rubrica successiva/precedente"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Aggiorna l'elenco dei contatti"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Aggiungi una nuova rubrica"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Elimina il contatto corrente"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configura rubrica"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nuova rubrica"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Link CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Scarica"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modifica"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Elimina"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Rilascia una foto da inviare"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Elimina la foto corrente"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Modifica la foto corrente"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Invia una nuova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Modifica dettagli del nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Pseudonimo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Inserisci pseudonimo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Sito web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Vai al sito web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "gg-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separa i gruppi con virgole"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Modifica gruppi"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferito"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Specifica un indirizzo email valido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Inserisci indirizzo email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Invia per email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Elimina l'indirizzo email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Inserisci il numero di telefono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Elimina il numero di telefono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Modifica dettagli dell'indirizzo"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Aggiungi qui le note."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Aggiungi campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Scarica contatto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Elimina contatto"
 
@@ -802,7 +793,7 @@ msgstr "Nome visualizzato"
 msgid "Active"
 msgstr "Attiva"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salva"
 
@@ -810,7 +801,7 @@ msgstr "Salva"
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -834,15 +825,15 @@ msgstr "Nome della nuova rubrica"
 msgid "Importing contacts"
 msgstr "Importazione contatti"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Non hai contatti nella rubrica."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Aggiungi contatto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configura rubriche"
 
@@ -874,6 +865,34 @@ msgstr "Indirizzo principale (Kontact e altri)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Collegamento(i) cartella vCard sola lettura"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Scarica"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modifica"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nuova rubrica"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 034071bef1..95cfeb14f4 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr "Errore di caricamento dello script per le impostazioni"
-
 #: js/js.js:573
 msgid "January"
 msgstr "Gennaio"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 475f87fd92..c31a629ac4 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 05:39+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Quota predefinita"
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin per..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1f8cbc10ec..687698a3cd 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "アドレスブックの有効/無効化に失敗しました。"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "連絡先の追加でエラーが発生しました。"
@@ -30,7 +26,9 @@ msgstr "連絡先の追加でエラーが発生しました。"
 msgid "element name is not set."
 msgstr "要素名が設定されていません。"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "idが設定されていません。"
 
@@ -52,7 +50,19 @@ msgstr "重複する属性を追加: "
 
 #: ajax/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "コンタクト属性の追加エラー: "
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "アドレスブックの有効/無効化に失敗しました。"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "空白の名前でアドレスブックを更新することはできません。"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "アドレスブックの更新に失敗しました。"
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "空白の名前でアドレスブックを更新することはできません。"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "アドレスブックの更新に失敗しました。"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "ストレージへの連絡先のアップロードエラー。"
@@ -221,71 +223,78 @@ msgstr "ファイルは何もアップロードされていません。不明な
 msgid "Contacts"
 msgstr "連絡先"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "申し訳ありません。この機能はまだ実装されていません"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "未実装"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "有効なアドレスを取得できませんでした。"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "エラー"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "連絡先"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
-msgstr ""
+msgstr "新規"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
-msgstr ""
+msgstr "新しいコンタクト"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "この属性は空にできません。"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "名前を編集"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "タイプを選択"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "結果: "
@@ -298,131 +307,135 @@ msgstr " をインポート、 "
 msgid " failed."
 msgstr " は失敗しました。"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "アドレスブックが見つかりませんでした。"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "これはあなたの電話帳ではありません。"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "住所"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "電話番号"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "インターネット"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "ビジネス"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:184
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:185
-msgid "Holidays"
-msgstr ""
-
 #: lib/app.php:186
-msgid "Ideas"
-msgstr ""
+msgid "Clients"
+msgstr "顧客"
 
 #: lib/app.php:187
-msgid "Journey"
-msgstr ""
+msgid "Deliverer"
+msgstr "運送会社"
 
 #: lib/app.php:188
-msgid "Jubilee"
-msgstr ""
+msgid "Holidays"
+msgstr "休日"
 
 #: lib/app.php:189
-msgid "Meeting"
-msgstr ""
+msgid "Ideas"
+msgstr "アイデア"
 
 #: lib/app.php:190
-msgid "Other"
-msgstr ""
+msgid "Journey"
+msgstr "旅行"
 
 #: lib/app.php:191
-msgid "Personal"
-msgstr ""
+msgid "Jubilee"
+msgstr "記念祭"
 
 #: lib/app.php:192
-msgid "Projects"
-msgstr ""
+msgid "Meeting"
+msgstr "打ち合わせ"
 
 #: lib/app.php:193
+msgid "Other"
+msgstr "その他"
+
+#: lib/app.php:194
+msgid "Personal"
+msgstr "個人"
+
+#: lib/app.php:195
+msgid "Projects"
+msgstr "プロジェクト"
+
+#: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "質問"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -438,209 +451,187 @@ msgstr "インポート"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "電話帳"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "閉じる"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "キーボードショートカット"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
-msgstr ""
+msgstr "ナビゲーション"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
-msgstr ""
+msgstr "リスト内の次のコンタクト"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
-msgstr ""
+msgstr "リスト内の前のコンタクト"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "新しいコンタクトを追加"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックを追加"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "現在のコンタクトを削除"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "アドレスブックを設定"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新規電話帳"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAVリンク"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "ダウンロード"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "編集"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "削除"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "写真をドロップしてアップロード"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "現在の写真を削除"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "現在の写真を編集"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "新しい写真をアップロード"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "ownCloudから写真を選択"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "名前の詳細を編集"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "削除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "ニックネームを入力"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "ウェブサイト"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "コンマでグループを分割"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "グループを編集"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "推奨"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "連絡先を追加"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "メールアドレスを入力"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "アドレスへメールを送る"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "メールアドレスを削除"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "電話番号を入力"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "電話番号を削除"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "地図で表示"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "住所の詳細を編集"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "ここにメモを追加。"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "項目を追加"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "電話番号"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "メモ"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "連絡先のダウンロード"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "連絡先の削除"
 
@@ -696,7 +687,7 @@ msgstr "郵便番号"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "郵便番号"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -799,7 +790,7 @@ msgstr "表示名"
 msgid "Active"
 msgstr "アクティブ"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "保存"
 
@@ -807,7 +798,7 @@ msgstr "保存"
 msgid "Submit"
 msgstr "送信"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "取り消し"
 
@@ -831,15 +822,15 @@ msgstr "新しいアドレスブックの名前"
 msgid "Importing contacts"
 msgstr "コンタクトをインポート"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "アドレスブックに連絡先が登録されていません。"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "連絡先を追加"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "アドレス帳を設定"
 
@@ -849,7 +840,7 @@ msgstr ""
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "名前を入力"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
@@ -871,6 +862,34 @@ msgstr "プライマリアドレス（Kontact 他）"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "ダウンロード"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "編集"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新規電話帳"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 6aa6c326c5..18c7f43a64 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "1月"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 1bc2d2cc7f..d489889001 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "無効なリクエストです"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "認証エラー"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -60,7 +60,7 @@ msgstr "Japanese (日本語)"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "セキュリティ警告"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -202,7 +202,7 @@ msgstr "デフォルトのクォータサイズ"
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "クオータ"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "削除"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 3d9e441fab..0bf8fd4604 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "주소록을 (비)활성화하는 데 실패했습니다."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
@@ -31,7 +27,9 @@ msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 msgid "element name is not set."
 msgstr "element 이름이 설정되지 않았습니다."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "아이디가 설정되어 있지 않습니다. "
 
@@ -55,6 +53,18 @@ msgstr "중복 속성 추가 시도: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "주소록을 (비)활성화하는 데 실패했습니다."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "주소록을 업데이트할 수 없습니다."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "제공되는 아이디 없음"
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "주소록을 업데이트할 수 없습니다."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "스토리지 에러 업로드 연락처."
@@ -222,71 +224,78 @@ msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 msgid "Contacts"
 msgstr "연락처"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "죄송합니다. 이 기능은 아직 구현되지 않았습니다. "
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "구현되지 않음"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "유효한 주소를 얻을 수 없습니다."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "오류"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "연락처"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "이름 편집"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "유형 선택"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "결과:"
@@ -299,129 +308,133 @@ msgstr "불러오기,"
 msgid " failed."
 msgstr "실패."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "주소록을 찾을 수 없습니다."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "내 주소록이 아닙니다."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "주소"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "전화 번호"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "전자 우편"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "조직"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "휴대폰"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "문자 번호"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "음성 번호"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "메세지"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "팩스 번호"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "영상 번호"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "호출기"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "인터넷"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "생일"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "입력"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "주소록"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "닫기"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "주소록 구성"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "새 주소록"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav 링크"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "다운로드"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "편집"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "삭제"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Drop photo to upload"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "현재 사진 삭제"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "현재 사진 편집"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "새로운 사진 업로드"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "ownCloud에서 사진 선택"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "이름 세부사항을 편집합니다. "
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "삭제"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "별명"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "별명 입력"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "일-월-년"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "쉼표로 그룹 구분"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "그룹 편집"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "선호함"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "올바른 이메일 주소를 입력하세요."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "이메일 주소 입력"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "이메일 주소 삭제"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "전화번호 입력"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "전화번호 삭제"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "지도에서 보기"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "상세 주소 수정"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "여기에 노트 추가."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "파일 추가"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "전화 번호"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "노트"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "연락처 다운로드"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "연락처 삭제"
 
@@ -800,7 +791,7 @@ msgstr "표시 이름"
 msgid "Active"
 msgstr "활성"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "저장"
 
@@ -808,7 +799,7 @@ msgstr "저장"
 msgid "Submit"
 msgstr "보내기"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "취소"
 
@@ -832,15 +823,15 @@ msgstr "새 주소록 이름"
 msgid "Importing contacts"
 msgstr "연락처 입력"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "당신의 주소록에는 연락처가 없습니다. "
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "연락처 추가"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "주소록 구성"
 
@@ -872,6 +863,34 @@ msgstr "기본 주소 (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "다운로드"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "편집"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "새 주소록"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 948625d1cc..aaed23a766 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "1월"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 51dbed056b..80fd886732 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "기본 할당량"
 msgid "Other"
 msgstr "다른"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "할당량"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index fe4a8a044e..f6717af86f 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Fehler beim bäisetzen vun engem Kontakt."
@@ -30,7 +26,9 @@ msgstr "Fehler beim bäisetzen vun engem Kontakt."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID ass net gesat."
 
@@ -54,6 +52,18 @@ msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fehler beim updaten vum Adressbuch."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Keng ID uginn"
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fehler beim updaten vum Adressbuch."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat: "
@@ -298,129 +307,133 @@ msgstr " importéiert, "
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressbuch net fonnt."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressbicher "
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zoumaachen"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adressbicher konfigureiren"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Neit Adressbuch"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editéieren"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Läschen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Läschen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Spëtznumm"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Gëff e Spëtznumm an"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Gruppen editéieren"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Telefonsnummer aginn"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefonsnummer läschen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Op da Kaart uweisen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Adress Detailer editéieren"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kontakt eroflueden"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kontakt läschen"
 
@@ -799,7 +790,7 @@ msgstr "Ugewisene Numm"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Späicheren"
 
@@ -807,7 +798,7 @@ msgstr "Späicheren"
 msgid "Submit"
 msgstr "Fortschécken"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Ofbriechen"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editéieren"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Neit Adressbuch"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 04a5957160..992723898f 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 705509ed4d..0d5bf0ad10 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Standard Quota"
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Läschen"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index c6f544cbda..b63e058e0e 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Klaida (de)aktyvuojant adresų knygą."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Pridedant kontaktą įvyko klaida."
@@ -30,7 +26,9 @@ msgstr "Pridedant kontaktą įvyko klaida."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Klaida (de)aktyvuojant adresų knygą."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktas"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Nerasta adresų knyga."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Žinutė"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internetas"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresų knygos"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigūruoti adresų knygas"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nauja adresų knyga"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV nuoroda"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Atsisiųsti"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Keisti"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Trinti"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Trinti"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Slapyvardis"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonas"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Atsisųsti kontaktą"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Ištrinti kontaktą"
 
@@ -799,7 +790,7 @@ msgstr "Rodomas vardas"
 msgid "Active"
 msgstr "Aktyvus"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Išsaugoti"
 
@@ -807,7 +798,7 @@ msgstr "Išsaugoti"
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Atsisiųsti"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Keisti"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nauja adresų knyga"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 3dfbbfaf40..60b338d51c 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Sausis"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 0986258c8b..d0f1fd4488 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Numatytoji kvota"
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Limitas"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 0b80baf9b4..c47721670c 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 0c20b3c465..a9c0fffbec 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index fbc7ad0283..03f11cf4f6 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Apjoms pēc noklusējuma"
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Apjoms"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Izdzēst"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 3af06736fa..4b32b8a1e6 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Грешка (де)активирање на адресарот."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Имаше грешка при додавање на контактот."
@@ -31,7 +27,9 @@ msgstr "Имаше грешка при додавање на контактот.
 msgid "element name is not set."
 msgstr "име за елементот не е поставена."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ид не е поставено."
 
@@ -55,6 +53,18 @@ msgstr "Се обидовте да внесете дупликат вредно
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Грешка (де)активирање на адресарот."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Неможе да се ажурира адресар со празно име."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Грешка при ажурирање на адресарот."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Нема доставено ИД"
@@ -168,14 +178,6 @@ msgstr "Нешто се расипа."
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Неможе да се ажурира адресар со празно име."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Грешка при ажурирање на адресарот."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Грешка во снимање на контактите на диск."
@@ -222,71 +224,78 @@ msgstr "Ниту еден фајл не се вчита. Непозната гр
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Жалам, оваа функционалност уште не е имплементирана"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Не е имплементирано"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Не можев да добијам исправна адреса."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Грешка"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Својството не смее да биде празно."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Уреди го името"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Одбери тип"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Резултат: "
@@ -299,129 +308,133 @@ msgstr "увезено,"
 msgid " failed."
 msgstr "неуспешно."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Адресарот не е најден."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ова не е во Вашиот адресар."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Е-пошта"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Порака"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Роденден"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Внеси"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Адресари"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Затвои"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Конфигурирај адресар"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Нов адресар"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Врска за CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Преземи"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Уреди"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Избриши"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Довлечкај фотографија за да се подигне"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Избриши моментална фотографија"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Уреди моментална фотографија"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Подигни нова фотографија"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Уреди детали за име"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Избриши"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Прекар"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Внеси прекар"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Одвоете ги групите со запирка"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Уреди групи"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Претпочитано"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Ве молам внесете правилна адреса за е-пошта."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Внесете е-пошта"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Прати порака до адреса"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Избриши адреса за е-пошта"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Внесете телефонски број"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Избриши телефонски број"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Погледајте на мапа"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Уреди детали за адреса"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Внесете забелешки тука."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Додади поле"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Забелешка"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Преземи го контактот"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Избриши го контактот"
 
@@ -800,7 +791,7 @@ msgstr "Прикажано име"
 msgid "Active"
 msgstr "Активно"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Сними"
 
@@ -808,7 +799,7 @@ msgstr "Сними"
 msgid "Submit"
 msgstr "Прати"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -832,15 +823,15 @@ msgstr "Име на новиот адресар"
 msgid "Importing contacts"
 msgstr "Внесување контакти"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Немате контакти во Вашиот адресар."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Додади контакт"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Уреди адресари"
 
@@ -872,6 +863,34 @@ msgstr "Примарна адреса"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Преземи"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нов адресар"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 679185b78f..845e2aa68c 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Јануари"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index ef930d9659..45521a471d 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Предефинирана квота"
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 1bab894cc6..0bb905bda6 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ralat nyahaktif buku alamat."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Terdapat masalah menambah maklumat."
@@ -33,7 +29,9 @@ msgstr "Terdapat masalah menambah maklumat."
 msgid "element name is not set."
 msgstr "nama elemen tidak ditetapkan."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID tidak ditetapkan."
 
@@ -57,6 +55,18 @@ msgstr "Cuba untuk letak nilai duplikasi:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ralat nyahaktif buku alamat."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Masalah mengemaskini buku alamat."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "tiada ID diberi"
@@ -170,14 +180,6 @@ msgstr "Sesuatu tidak betul."
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Masalah mengemaskini buku alamat."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ralat memuatnaik senarai kenalan."
@@ -224,71 +226,78 @@ msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Maaf, fungsi ini masih belum boleh diguna lagi"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Tidak digunakan"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Tidak boleh mendapat alamat yang sah."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ralat"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Hubungan"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Nilai ini tidak boleh kosong."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Ubah nama"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "PIlih jenis"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Hasil: "
@@ -301,129 +310,133 @@ msgstr " import, "
 msgid " failed."
 msgstr " gagal."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Buku alamat tidak dijumpai."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ini bukan buku alamat anda."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Alamat"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Emel"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisasi"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mudah alih"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Teks"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Suara"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mesej"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Alat Kelui"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -443,207 +456,185 @@ msgstr "Import"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Senarai Buku Alamat"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Tutup"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurasi Buku Alamat"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Buku Alamat Baru"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Sambungan CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Muat naik"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Sunting"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Padam"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Letak foto disini untuk muatnaik"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Padam foto semasa"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Ubah foto semasa"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Muatnaik foto baru"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Pilih foto dari ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Ubah butiran nama"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Padam"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Nama Samaran"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Masukkan nama samaran"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Asingkan kumpulan dengan koma"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Ubah kumpulan"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Pilihan"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Berikan alamat emel yang sah."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Masukkan alamat emel"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Hantar ke alamat"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Padam alamat emel"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Masukkan nombor telefon"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Padam nombor telefon"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Lihat pada peta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Ubah butiran alamat"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Letak nota disini."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Letak ruangan"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Muat turun hubungan"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Padam hubungan"
 
@@ -802,7 +793,7 @@ msgstr "Paparan nama"
 msgid "Active"
 msgstr "Aktif"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Simpan"
 
@@ -810,7 +801,7 @@ msgstr "Simpan"
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Batal"
 
@@ -834,15 +825,15 @@ msgstr "Nama buku alamat"
 msgid "Importing contacts"
 msgstr "Import senarai kenalan"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Anda tidak mempunyai sebarang kenalan didalam buku alamat."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Letak kenalan"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurasi buku alamat"
 
@@ -874,6 +865,34 @@ msgstr "Alamat utama"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Muat naik"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Sunting"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Buku Alamat Baru"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index ee0e7eeea2..468102d63d 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januari"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index ac98298148..ef9fb19e53 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -205,7 +205,7 @@ msgstr "Kuota Lalai"
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -213,10 +213,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 291e1afa10..c3a53c3380 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Et problem oppsto med å (de)aktivere adresseboken."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Et problem oppsto med å legge til kontakten."
@@ -33,7 +29,9 @@ msgstr "Et problem oppsto med å legge til kontakten."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id er ikke satt."
 
@@ -57,6 +55,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Et problem oppsto med å (de)aktivere adresseboken."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan ikke oppdatere adressebøker uten navn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Et problem oppsto med å oppdatere adresseboken."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Ingen ID angitt"
@@ -170,14 +180,6 @@ msgstr "Noe gikk fryktelig galt."
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan ikke oppdatere adressebøker uten navn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Et problem oppsto med å oppdatere adresseboken."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
@@ -224,71 +226,78 @@ msgstr "Ingen filer ble lastet opp. Ukjent feil."
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Feil"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Endre navn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Velg type"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -301,129 +310,133 @@ msgstr "importert,"
 msgid " failed."
 msgstr "feilet."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresseboken ble ikke funnet."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internett"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -443,207 +456,185 @@ msgstr "Importer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Lukk"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurer adressebok"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV-lenke"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Hent ned"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Rediger"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Dra bilder hit for å laste opp"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Fjern nåværende bilde"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Rediger nåværende bilde"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Last opp nytt bilde"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Endre detaljer rundt navn"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Skriv inn kallenavn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Skill gruppene med komma"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Endre grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Vennligst angi en gyldig e-postadresse."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Skriv inn e-postadresse"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Send e-post til adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Fjern e-postadresse"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Skriv inn telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Fjern telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Se på kart"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Endre detaljer rundt adresse"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Legg inn notater her."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Legg til felt"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notat"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Hend ned kontakten"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -802,7 +793,7 @@ msgstr "Visningsnavn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Lagre"
 
@@ -810,7 +801,7 @@ msgstr "Lagre"
 msgid "Submit"
 msgstr "Lagre"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -834,15 +825,15 @@ msgstr "Navn på ny adressebok"
 msgid "Importing contacts"
 msgstr "Importerer kontakter"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontakter i din adressebok"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Ny kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøker"
 
@@ -874,6 +865,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Hent ned"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index b22e6e9fc1..010ea33704 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januar"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index f423532a21..fbf111c4d3 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Standard Kvote"
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -214,10 +214,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index a67a573689..5c574cdc68 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fout bij het (de)activeren van het adresboek."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Er was een fout bij het toevoegen van het contact."
@@ -34,7 +30,9 @@ msgstr "Er was een fout bij het toevoegen van het contact."
 msgid "element name is not set."
 msgstr "onderdeel naam is niet opgegeven."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id is niet ingesteld."
 
@@ -58,6 +56,18 @@ msgstr "Eigenschap bestaat al: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fout bij het (de)activeren van het adresboek."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan adresboek zonder naam niet wijzigen"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fout bij het updaten van het adresboek."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Geen ID opgegeven"
@@ -171,14 +181,6 @@ msgstr "Er ging iets totaal verkeerd. "
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan adresboek zonder naam niet wijzigen"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fout bij het updaten van het adresboek."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
@@ -225,71 +227,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contacten"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -302,129 +311,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresboek niet gevonden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importeer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresboeken"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Instellen adresboeken"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nieuw Adresboek"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Bewerken"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Verwijder foto uit upload"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Verwijdere huidige foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Wijzig huidige foto"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Upload nieuwe foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Wijzig naam gegevens"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Roepnaam"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Voer roepnaam in"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Gebruik komma bij meerder groepen"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Wijzig groepen"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Voorkeur"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Geef een geldig email adres op."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Voer email adres in"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Mail naar adres"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Verwijder email adres"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Voer telefoonnummer in"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Verwijdere telefoonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Bekijk op een kaart"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Wijzig adres gegevens"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Voeg notitie toe"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Voeg veld toe"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefoon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notitie"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Download contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Verwijder contact"
 
@@ -803,7 +794,7 @@ msgstr "Weergavenaam"
 msgid "Active"
 msgstr "Actief"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Opslaan"
 
@@ -811,7 +802,7 @@ msgstr "Opslaan"
 msgid "Submit"
 msgstr "Opslaan"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Anuleren"
 
@@ -835,15 +826,15 @@ msgstr "Naam van nieuw adresboek"
 msgid "Importing contacts"
 msgstr "Importeren van contacten"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Je hebt geen contacten in je adresboek"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Contactpersoon toevoegen"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Bewerken adresboeken"
 
@@ -875,6 +866,34 @@ msgstr "Standaardadres"
 msgid "iOS/OS X"
 msgstr "IOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Bewerken"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nieuw Adresboek"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 587342c1fc..cdbdada846 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januari"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index daccd5ac07..2f18790514 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +207,7 @@ msgstr "Standaard limiet"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -215,10 +215,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Limieten"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "verwijderen"
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index ceeea1a2bd..77dbe1e05a 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Det kom ei feilmelding då kontakta vart lagt til."
@@ -31,7 +27,9 @@ msgstr "Det kom ei feilmelding då kontakta vart lagt til."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -55,6 +53,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eit problem oppstod ved å oppdatere adresseboka."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eit problem oppstod ved å oppdatere adresseboka."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav lenkje"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Last ned"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Endra"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Føretrekt"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonnummer"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Last ned kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -800,7 +791,7 @@ msgstr "Visningsnamn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Lagre"
 
@@ -808,7 +799,7 @@ msgstr "Lagre"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Kanseller"
 
@@ -832,15 +823,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Last ned"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Endra"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 6374219085..707892db95 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 99195922f1..72badad24b 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index c6c1bf1a2d..d46b2f8b6d 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Błąd (de)aktywowania książki adresowej."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Wystąpił błąd podczas dodawania kontaktu."
@@ -33,13 +29,15 @@ msgstr "Wystąpił błąd podczas dodawania kontaktu."
 msgid "element name is not set."
 msgstr "nazwa elementu nie jest ustawiona."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id nie ustawione."
 
 #: ajax/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Nie można parsować kontaktu:"
 
 #: ajax/addproperty.php:56
 msgid "Cannot add empty property."
@@ -55,7 +53,19 @@ msgstr "Próba dodania z duplikowanej właściwości:"
 
 #: ajax/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "Błąd przy dodawaniu właściwości kontaktu:"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Błąd (de)aktywowania książki adresowej."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Błąd uaktualniania książki adresowej."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -170,14 +180,6 @@ msgstr "Gdyby coś poszło FUBAR."
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Błąd uaktualniania książki adresowej."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
@@ -224,71 +226,78 @@ msgstr "Plik nie został załadowany. Nieznany błąd"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Niestety, ta funkcja nie została jeszcze zaimplementowana"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Nie wdrożono"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Nie można pobrać prawidłowego adresu."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Błąd"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
-msgstr ""
+msgstr "Nowy"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
-msgstr ""
+msgstr "Nowy kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ta właściwość nie może być pusta."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Zmień nazwę"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Wybierz typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Wynik: "
@@ -301,131 +310,135 @@ msgstr " importowane, "
 msgid " failed."
 msgstr "  nie powiodło się."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Nie znaleziono książki adresowej"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "To nie jest Twoja książka adresowa."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Połączenie tekstowe"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Wiadomość"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Biznesowe"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Klienci"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:186
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:187
-msgid "Journey"
-msgstr ""
-
 #: lib/app.php:188
+msgid "Holidays"
+msgstr "Święta"
+
+#: lib/app.php:189
+msgid "Ideas"
+msgstr "Pomysły"
+
+#: lib/app.php:190
+msgid "Journey"
+msgstr "Podróż"
+
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Personal"
-msgstr ""
-
 #: lib/app.php:192
-msgid "Projects"
-msgstr ""
+msgid "Meeting"
+msgstr "Spotkanie"
 
 #: lib/app.php:193
+msgid "Other"
+msgstr "Inne"
+
+#: lib/app.php:194
+msgid "Personal"
+msgstr "Osobiste"
+
+#: lib/app.php:195
+msgid "Projects"
+msgstr "Projekty"
+
+#: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Pytania"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -441,209 +454,187 @@ msgstr "Import"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Ustawienia"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Książki adresowe"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zamknij"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Skróty klawiatury"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
-msgstr ""
+msgstr "Nawigacja"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
-msgstr ""
+msgstr "Następny kontakt na liście"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Poprzedni kontakt na liście"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Następna/poprzednia książka adresowa"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Akcje"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Odśwież listę kontaktów"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Dodaj nowy kontakt"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Dodaj nowa książkę adresową"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Usuń obecny kontakt"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguruj książkę adresową"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nowa książka adresowa"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Wyświetla odnośnik CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Pobiera książkę adresową"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Edytuje książkę adresową"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Usuwa książkę adresową"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Upuść fotografię aby załadować"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Usuń aktualne zdjęcie"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Edytuj aktualne zdjęcie"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Wczytaj nowe zdjęcie"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Wybierz zdjęcie z ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Edytuj szczegóły nazwy"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Usuwa książkę adresową"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Nazwa"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Wpisz nazwę"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Strona www"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.jakasstrona.pl"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Idż do strony www"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-rrrr"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddziel grupy przecinkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Edytuj grupy"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferowane"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Określ prawidłowy adres e-mail."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Wpisz adres email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Mail na adres"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Usuń adres mailowy"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Wpisz numer telefonu"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Usuń numer telefonu"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Edytuj szczegóły adresu"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Dodaj notatkę tutaj."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Dodaj pole"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Uwaga"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Pobiera kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Usuwa kontakt"
 
@@ -670,7 +661,7 @@ msgstr ""
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Ulica i numer"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -699,7 +690,7 @@ msgstr "Kod pocztowy"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Kod pocztowy"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -802,7 +793,7 @@ msgstr "Wyświetlana nazwa"
 msgid "Active"
 msgstr "Aktywna"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Zapisz"
 
@@ -810,7 +801,7 @@ msgstr "Zapisz"
 msgid "Submit"
 msgstr "Potwierdź"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -834,29 +825,29 @@ msgstr "Nazwa nowej książki adresowej"
 msgid "Importing contacts"
 msgstr "importuj kontakty"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Dodaj kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfiguruj książkę adresową"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Wybierz książki adresowe"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Wpisz nazwę"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Wprowadź opis"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -874,6 +865,34 @@ msgstr "Pierwszy adres"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Pobiera książkę adresową"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Edytuje książkę adresową"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nowa książka adresowa"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 5049bce7f6..ea413953c7 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Styczeń"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index b2dc4fe1f6..5d51eda986 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 14:04+0000\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +66,7 @@ msgstr "Polski"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Ostrzeżenia bezpieczeństwa"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -208,18 +208,14 @@ msgstr "Domyślny udział"
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
 msgstr "Udział"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Usuń"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 9f9833ac2d..cce81b3b22 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Erro ao (des)ativar agenda."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Ocorreu um erro ao adicionar o contato."
@@ -32,7 +28,9 @@ msgstr "Ocorreu um erro ao adicionar o contato."
 msgid "element name is not set."
 msgstr "nome do elemento não definido."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID não definido."
 
@@ -56,6 +54,18 @@ msgstr "Tentando adiciona propriedade duplicada:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Erro ao (des)ativar agenda."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Não é possível atualizar sua agenda com um nome em branco."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erro ao atualizar agenda."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID fornecido"
@@ -169,14 +179,6 @@ msgstr "Something went FUBAR. "
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Não é possível atualizar sua agenda com um nome em branco."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erro ao atualizar agenda."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
@@ -223,71 +225,78 @@ msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 msgid "Contacts"
 msgstr "Contatos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Desculpe, esta funcionalidade não foi implementada ainda"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "não implementado"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contato"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Selecione o tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado:"
@@ -300,129 +309,133 @@ msgstr "importado,"
 msgid " failed."
 msgstr "falhou."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Lista de endereços não encontrado."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua agenda de endereços."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Agendas de Endereço"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fechar."
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar Livro de Endereços"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova agenda"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Link CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Baixar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Excluir"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Arraste a foto para ser carregada"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Deletar imagem atual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar imagem atual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Carregar nova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecionar foto do OwnCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Excluir"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Apelido"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Digite o apelido"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe grupos por virgula"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor, especifique um email válido."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Digite um endereço de email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Correio para endereço"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Remover endereço de email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Digite um número de telefone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Remover número de telefone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visualizar no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar detalhes de endereço"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Adicionar notas"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Baixar contato"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Apagar contato"
 
@@ -801,7 +792,7 @@ msgstr "Nome de exibição"
 msgid "Active"
 msgstr "Ativo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salvar"
 
@@ -809,7 +800,7 @@ msgstr "Salvar"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -833,15 +824,15 @@ msgstr "Nome da nova agenda de endereços"
 msgid "Importing contacts"
 msgstr "Importar contatos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Voce não tem contatos em sua agenda de endereços."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Adicionar contatos"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar agenda de endereços"
 
@@ -873,6 +864,34 @@ msgstr "Endereço primário(Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Baixar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova agenda"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 2e90ce266f..bdf2c828c3 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Janeiro"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 7f26bc7340..d190c95ceb 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Quota Padrão"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -214,10 +214,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index c76d7bf6d2..079871ab19 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Erro a (des)ativar o livro de endereços"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Erro ao adicionar contato"
@@ -32,7 +28,9 @@ msgstr "Erro ao adicionar contato"
 msgid "element name is not set."
 msgstr "o nome do elemento não está definido."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id não está definido"
 
@@ -56,6 +54,18 @@ msgstr "A tentar adicionar propriedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Erro a (des)ativar o livro de endereços"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erro a atualizar o livro de endereços"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID inserido"
@@ -169,14 +179,6 @@ msgstr "Algo provocou um FUBAR. "
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erro a atualizar o livro de endereços"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro a carregar os contactos para o armazenamento."
@@ -223,71 +225,78 @@ msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Desculpe, esta funcionalidade ainda não está implementada"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Não implementado"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleccionar tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado: "
@@ -300,129 +309,133 @@ msgstr " importado, "
 msgid " failed."
 msgstr " falhou."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Livro de endereços não encontrado."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Livros de endereços"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fechar"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar livros de endereços"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Novo livro de endereços"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Endereço CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Transferir"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Apagar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Arraste e solte fotos para carregar"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Eliminar a foto actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar a foto actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Carregar nova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecionar uma foto da ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Apagar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introduza alcunha"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe os grupos usando virgulas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor indique um endereço de correio válido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introduza endereço de email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Enviar correio para o endereço"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Eliminar o endereço de correio"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Insira o número de telefone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Eliminar o número de telefone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar os detalhes do endereço"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Insira notas aqui."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Transferir contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Apagar contato"
 
@@ -801,7 +792,7 @@ msgstr "Nome de exibição"
 msgid "Active"
 msgstr "Ativo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Guardar"
 
@@ -809,7 +800,7 @@ msgstr "Guardar"
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -833,15 +824,15 @@ msgstr "Nome do novo livro de endereços"
 msgid "Importing contacts"
 msgstr "A importar os contactos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Não tem contactos no seu livro de endereços."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Adicionar contacto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar livros de endereços"
 
@@ -873,6 +864,34 @@ msgstr "Endereço primario (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Transferir"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Novo livro de endereços"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 31d1426a47..18fae557ab 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Janeiro"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 4a6eac5818..fbd1ad70ba 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Quota por defeito"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 0cff9f1cd5..6b883047de 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(Dez)activarea agendei a întâmpinat o eroare."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "O eroare a împiedicat adăugarea contactului."
@@ -32,7 +28,9 @@ msgstr "O eroare a împiedicat adăugarea contactului."
 msgid "element name is not set."
 msgstr "numele elementului nu este stabilit."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID-ul nu este stabilit"
 
@@ -56,6 +54,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(Dez)activarea agendei a întâmpinat o eroare."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eroare la actualizarea agendei."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nici un ID nu a fost furnizat"
@@ -169,14 +179,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eroare la actualizarea agendei."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -223,71 +225,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contacte"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -300,129 +309,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mesaj"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Agende"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Agendă nouă"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Legătură CardDev"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descarcă"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editează"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Șterge"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Introdu detalii despre nume"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Șterge"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introdu pseudonim"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "zz-ll-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separă grupurile cu virgule"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editează grupuri"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferat"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Te rog să specifici un e-mail corect"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introdu adresa de e-mail"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Trimite mesaj la e-mail"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Șterge e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Descarcă acest contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Șterge contact"
 
@@ -801,7 +792,7 @@ msgstr "Nume afișat"
 msgid "Active"
 msgstr "Activ"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salvează"
 
@@ -809,7 +800,7 @@ msgstr "Salvează"
 msgid "Submit"
 msgstr "Trimite"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -833,15 +824,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -873,6 +864,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descarcă"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editează"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Agendă nouă"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index c718775f6e..5a733b5eb1 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index f106c9706f..64845e98ca 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -205,7 +205,7 @@ msgstr "Cotă implicită"
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -213,10 +213,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cotă"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Șterge"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index a7988b19f4..d084087a97 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -24,10 +24,6 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ошибка (де)активации адресной книги."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Произошла ошибка при добавлении контакта."
@@ -36,7 +32,9 @@ msgstr "Произошла ошибка при добавлении контак
 msgid "element name is not set."
 msgstr "имя элемента не установлено."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id не установлен."
 
@@ -60,6 +58,18 @@ msgstr "При попытке добавить дубликат:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ошибка (де)активации адресной книги."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Нельзя обновить адресную книгу с пустым именем."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Ошибка обновления адресной книги."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID не предоставлен"
@@ -173,14 +183,6 @@ msgstr "Что-то пошло FUBAR."
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Нельзя обновить адресную книгу с пустым именем."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Ошибка обновления адресной книги."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ошибка загрузки контактов в хранилище."
@@ -227,71 +229,78 @@ msgstr "Файл не был загружен. Неизвестная ошибк
 msgid "Contacts"
 msgstr "Контакты"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "К сожалению, эта функция не была реализована"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Не реализовано"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Не удалось получить адрес."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Это свойство должно быть не пустым."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Изменить имя"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Выберите тип"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Результат:"
@@ -304,129 +313,133 @@ msgstr "импортировано, "
 msgid " failed."
 msgstr "не удалось."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Адресная книга не найдена."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Это не ваша адресная книга."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адрес"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Ящик эл. почты"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Организация"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Сообщение"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -446,207 +459,185 @@ msgstr "Импорт"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Адресные книги"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Закрыть"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Настроить Адресную книгу"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Новая адресная книга"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ссылка CardDAV"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Скачать"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Редактировать"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Перетяните фотографии для загрузки"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Удалить текущую фотографию"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Редактировать текущую фотографию"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Загрузить новую фотографию"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Выбрать фотографию из ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Формат Краткое имя, Полное имя"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Изменить детали имени"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Введите псевдоним"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Разделить группы запятыми"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Редактировать группы"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Предпочитаемый"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Укажите действительный адрес электронной почты."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Укажите адрес электронной почты"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Написать по адресу"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Удалить адрес электронной почты"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Ввести номер телефона"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Удалить номер телефона"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Показать на карте"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Ввести детали адреса"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Добавьте заметки здесь."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Добавить поле"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Заметка"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Скачать контакт"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Удалить контакт"
 
@@ -805,7 +796,7 @@ msgstr "Отображаемое имя"
 msgid "Active"
 msgstr "Активно"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Сохранить"
 
@@ -813,7 +804,7 @@ msgstr "Сохранить"
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -837,15 +828,15 @@ msgstr "Имя новой адресной книги"
 msgid "Importing contacts"
 msgstr "Импорт контактов"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "В адресной книге нет контактов."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Добавить контакт"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Настроить адресную книгу"
 
@@ -877,6 +868,34 @@ msgstr "Первичный адрес (Kontact и др.)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Скачать"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Редактировать"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Новая адресная книга"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 997362d18f..eb287d6988 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Январь"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e0e1293d2e..9b23f80a3e 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:15+0000\n"
-"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Квота по умолчанию"
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -216,10 +216,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Удалить"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index d4ab54e819..bd509c1c34 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Chyba (de)aktivácie adresára."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
@@ -32,7 +28,9 @@ msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 msgid "element name is not set."
 msgstr "meno elementu nie je nastavené."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID nie je nastavené."
 
@@ -56,6 +54,18 @@ msgstr "Pokúšate sa pridať rovnaký atribút:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Chyba (de)aktivácie adresára."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nedá sa upraviť adresár s prázdnym menom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Chyba aktualizácie adresára."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadané"
@@ -169,14 +179,6 @@ msgstr "Niečo sa pokazilo."
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nedá sa upraviť adresár s prázdnym menom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Chyba aktualizácie adresára."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
@@ -223,71 +225,78 @@ msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Neimplementované"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nový"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vybrať typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Výsledok: "
@@ -300,129 +309,133 @@ msgstr " importovaných, "
 msgid " failed."
 msgstr " zlyhaných."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresár sa nenašiel."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Biznis"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Iné"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Otázky"
 
@@ -442,207 +455,185 @@ msgstr "Importovať"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresáre"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigácia"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Ďalší kontakt v zozname"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Predchádzajúci kontakt v zozname"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Ďalší/predošlí adresár"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Obnov zoznam kontaktov"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Pridaj nový kontakt"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Pridaj nový adresár"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Vymaž súčasný kontakt"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastaviť adresáre"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nový adresár"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav odkaz"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Stiahnuť"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Upraviť"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Odstrániť"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Pretiahnite sem fotku pre nahratie"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Odstrániť súčasnú fotku"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Upraviť súčasnú fotku"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Nahrať novú fotku"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Upraviť podrobnosti mena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Zadajte prezývku"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddelte skupiny čiarkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Úprava skupín"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Uprednostňované"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Prosím zadajte platnú e-mailovú adresu."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Zadajte e-mailové adresy"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Odoslať na adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Odstrániť e-mailové adresy"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Zadajte telefónne číslo"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Odstrániť telefónne číslo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Upraviť podrobnosti adresy"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Tu môžete pridať poznámky."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Pridať pole"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefón"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Stiahnuť kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Odstrániť kontakt"
 
@@ -801,7 +792,7 @@ msgstr "Zobrazené meno"
 msgid "Active"
 msgstr "Aktívny"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Uložiť"
 
@@ -809,7 +800,7 @@ msgstr "Uložiť"
 msgid "Submit"
 msgstr "Odoslať"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -833,15 +824,15 @@ msgstr "Meno nového adresára"
 msgid "Importing contacts"
 msgstr "Importovanie kontaktov"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žiadne kontakty v adresári."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Pridať kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Nastaviť adresáre"
 
@@ -873,6 +864,34 @@ msgstr "Predvolená adresa (Kontakt etc)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Upraviť"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nový adresár"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index cd00f6ca1f..42eb519975 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Január"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 38d8e42187..086d0c8683 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "Predvolená kvóta"
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Odstrániť"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 6da58b6275..60528db291 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Napaka med (de)aktivacijo imenika."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Med dodajanjem stika je prišlo do napake"
@@ -32,7 +28,9 @@ msgstr "Med dodajanjem stika je prišlo do napake"
 msgid "element name is not set."
 msgstr "ime elementa ni nastavljeno."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id ni nastavljen."
 
@@ -56,6 +54,18 @@ msgstr "Poskušam dodati podvojeno lastnost:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Napaka med (de)aktivacijo imenika."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne morem posodobiti imenika s praznim imenom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Napaka pri posodabljanju imenika."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID ni bil podan"
@@ -169,14 +179,6 @@ msgstr "Nekaj je šlo v franže. "
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne morem posodobiti imenika s praznim imenom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Napaka pri posodabljanju imenika."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
@@ -223,71 +225,78 @@ msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 msgid "Contacts"
 msgstr "Stiki"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Žal ta funkcionalnost še ni podprta"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Ni podprto"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Ne morem dobiti veljavnega naslova."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Napaka"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Stik"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ta lastnost ne sme biti prazna"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Uredi ime"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Izberite vrsto"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Rezultati: "
@@ -300,129 +309,133 @@ msgstr " uvoženih, "
 msgid " failed."
 msgstr " je spodletelo."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Imenik ni bil najden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "To ni vaš imenik."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-pošta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Uvozi"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Imeniki"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zapri"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastavi imenike"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nov imenik"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav povezava"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Prenesi"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Izbriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Spustite sliko tukaj, da bi jo naložili"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Izbriši trenutno sliko"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Uredi trenutno sliko"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Naloži novo sliko"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Uredite podrobnosti imena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Vnesite vzdevek"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Skupine ločite z vejicami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Uredi skupine"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Prednosten"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Prosimo, če navedete veljaven e-poštni naslov."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Vnesite e-poštni naslov"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "E-pošta naslovnika"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Izbriši e-poštni naslov"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Vpiši telefonsko številko"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Izbriši telefonsko številko"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Uredi podrobnosti"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Opombe dodajte tukaj."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Opomba"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Prenesi stik"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Izbriši stik"
 
@@ -801,7 +792,7 @@ msgstr "Ime za prikaz"
 msgid "Active"
 msgstr "Aktiven"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Shrani"
 
@@ -809,7 +800,7 @@ msgstr "Shrani"
 msgid "Submit"
 msgstr "Potrdi"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -833,15 +824,15 @@ msgstr "Ime novega imenika"
 msgid "Importing contacts"
 msgstr "Uvažam stike"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "V vašem imeniku ni stikov."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Dodaj stik"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Nastavi imenike"
 
@@ -873,6 +864,34 @@ msgstr "Primarni naslov (za kontakt et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Prenesi"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nov imenik"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 4fc16e05df..c3f2d15c36 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "januar"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 25758a9537..0b8d353a0c 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 02:03+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Privzeta količinska omejitev"
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "PodSkrbnik"
 
@@ -212,10 +212,6 @@ msgstr "PodSkrbnik"
 msgid "Quota"
 msgstr "Količinska omejitev"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "PodSkrbnik za ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index c96ce8db69..63337ab5cf 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 03d2be4997..81021ac3e6 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 4a50494e55..1d7081baad 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index d526bdd6da..2b4ced16c7 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Адресар"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Нови адресар"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Преузимање"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Уреди"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Обриши"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Обриши"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Пожељан"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Преузми контакт"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Обриши контакт"
 
@@ -799,7 +790,7 @@ msgstr "Приказано име"
 msgid "Active"
 msgstr "Активан"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Сними"
 
@@ -807,7 +798,7 @@ msgstr "Сними"
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Преузимање"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нови адресар"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index f2a2095d88..58a7f8706a 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index f9bdbc9753..3976e060af 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index f767552e5c..116e2d372d 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Obriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -799,7 +790,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -807,7 +798,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index fd21f716a1..4577fbf12d 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 076b4a92d7..a4a177f7db 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index a786f05bf9..6269e183cf 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fel när (av)aktivera adressbok"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Det uppstod ett fel när kontakt skulle läggas till"
@@ -34,7 +30,9 @@ msgstr "Det uppstod ett fel när kontakt skulle läggas till"
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID är inte satt."
 
@@ -58,6 +56,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr "Kunde inte lägga till egenskap för kontakt:"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fel när (av)aktivera adressbok"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan inte uppdatera adressboken med ett tomt namn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fel uppstod när adressbok skulle uppdateras"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Inget ID angett"
@@ -171,14 +181,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan inte uppdatera adressboken med ett tomt namn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fel uppstod när adressbok skulle uppdateras"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fel uppstod när kontakt skulle lagras."
@@ -225,71 +227,78 @@ msgstr "Ingen fil uppladdad. Okänt fel"
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Tyvärr är denna funktion inte införd än"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Inte införd"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Ny"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Välj typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -302,129 +311,133 @@ msgstr "importerad,"
 msgid " failed."
 msgstr "misslyckades."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Hittade inte adressboken"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importera"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressböcker"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Stäng"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurera adressböcker"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressbok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV länk"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Nedladdning"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Redigera"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Radera"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Släpp foto för att ladda upp"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Ta bort aktuellt foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Redigera aktuellt foto"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Ladda upp ett nytt foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Välj foto från ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Redigera detaljer för namn"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Ange smeknamn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separera grupperna med kommatecken"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editera grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Föredragen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Vänligen ange en giltig e-postadress"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Ange e-postadress"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Posta till adress."
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Ta bort e-postadress"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Ange ett telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Ta bort telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visa på karta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Redigera detaljer för adress"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Lägg till noteringar här."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Lägg till fält"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notering"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Ladda ner kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Radera kontakt"
 
@@ -803,7 +794,7 @@ msgstr "Visningsnamn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Spara"
 
@@ -811,7 +802,7 @@ msgstr "Spara"
 msgid "Submit"
 msgstr "Skicka in"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -835,15 +826,15 @@ msgstr "Namn för ny adressbok"
 msgid "Importing contacts"
 msgstr "Importerar kontakter"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du har inga kontakter i din adressbok."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Lägg till en kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurera adressböcker"
 
@@ -875,6 +866,34 @@ msgstr "Primär adress (Kontakt o.a.)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Nedladdning"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Redigera"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressbok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index e836e06af4..3017915cbb 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januari"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index a1a94b378f..d912085104 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 20:26+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -207,7 +207,7 @@ msgstr "Förvald datakvot"
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "Underadministratör"
 
@@ -215,10 +215,6 @@ msgstr "Underadministratör"
 msgid "Quota"
 msgstr "Kvot"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Underadministratör för ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Ta bort"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 7670957eb3..e89c3013f2 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 268728145d..7f5c94e340 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index a1b58e5606..eb813eae16 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f0db3549bf..d07f4a40df 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 315360d0d2..aba904c9b0 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 8af0f4a2da..a46ccf931a 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index f4b8daced5..7d73680418 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 8983942319..896a797b89 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d6ae07cf20..f72352b36d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index fbaf36dfc9..eb2c997995 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
@@ -31,7 +27,9 @@ msgstr "เกิดข้อผิดพลาดในการเพิ่ม
 msgid "element name is not set."
 msgstr "ยังไม่ได้กำหนดชื่อ"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ยังไม่ได้กำหนดรหัส"
 
@@ -55,6 +53,18 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ยังไม่ได้ใส่รหัส"
@@ -168,14 +178,6 @@ msgstr "มีบางอย่างเกิดการ FUBAR. "
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
@@ -222,71 +224,78 @@ msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโ
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "เลือกชนิด"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "ผลลัพธ์: "
@@ -299,129 +308,133 @@ msgstr " นำเข้าข้อมูลแล้ว, "
 msgid " failed."
 msgstr " ล้มเหลว."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "หน่วยงาน"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "มือถือ"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "ข้อความ"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "เสียงพูด"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "ข้อความ"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "วีดีโอ"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "เพจเจอร์"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "วันเกิด"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "นำเข้า"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "สมุดบันทึกที่อยู่"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "ปิด"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "ลิงค์ CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "ดาวน์โหลด"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "แก้ไข"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "ลบ"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "วางรูปภาพที่ต้องการอัพโหลด"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "ลบรูปภาพปัจจุบัน"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "แก้ไขรูปภาพปัจจุบัน"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "อัพโหลดรูปภาพใหม่"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "แก้ไขรายละเอียดของชื่อ"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "กรอกชื่อเล่น"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "แก้ไขกลุ่ม"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "พิเศษ"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "กรอกที่อยู่อีเมล"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "ส่งอีเมลไปที่"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "ลบที่อยู่อีเมล"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "กรอกหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "ลบหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "ดูบนแผนที่"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "แก้ไขรายละเอียดที่อยู่"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "เพิ่มช่องรับข้อมูล"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "โทรศัพท์"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "หมายเหตุ"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "ลบข้อมูลการติดต่อ"
 
@@ -800,7 +791,7 @@ msgstr "ชื่อที่ต้องการให้แสดง"
 msgid "Active"
 msgstr "เปิดใช้"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "บันทึก"
 
@@ -808,7 +799,7 @@ msgstr "บันทึก"
 msgid "Submit"
 msgstr "ส่งข้อมูล"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -832,15 +823,15 @@ msgstr "กำหนดชื่อของสมุดที่อยู่ท
 msgid "Importing contacts"
 msgstr "นำเข้าข้อมูลการติดต่อ"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "เพิ่มชื่อผู้ติดต่อ"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
 
@@ -872,6 +863,34 @@ msgstr "ที่อยู่หลัก (สำหรับติดต่อ)
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "แก้ไข"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 229c958879..4a078f8330 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "มกราคม"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 33c12981c4..df4bad317a 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "โควต้าที่กำหนดไว้เริ่มต้
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "พื้นที่"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 041e00bf18..821e951cc5 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Adres defteri etkisizleştirilirken hata oluştu."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Kişi eklenirken hata oluştu."
@@ -32,7 +28,9 @@ msgstr "Kişi eklenirken hata oluştu."
 msgid "element name is not set."
 msgstr "eleman ismi atanmamış."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id atanmamış."
 
@@ -56,6 +54,18 @@ msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Adres defteri etkisizleştirilirken hata oluştu."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Adres defteri güncellenirken hata oluştu."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID verilmedi"
@@ -169,14 +179,6 @@ msgstr "Bir şey FUBAR gitti."
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Adres defteri güncellenirken hata oluştu."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
@@ -223,71 +225,78 @@ msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Üzgünüz, bu özellik henüz tamamlanmadı."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Tamamlanmadı."
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Geçerli bir adres alınamadı."
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hata"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kişi"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Yeni"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Yeni Kişi"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Bu özellik boş bırakılmamalı."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "İsmi düzenle"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Tür seç"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Sonuç: "
@@ -300,129 +309,133 @@ msgstr " içe aktarıldı, "
 msgid " failed."
 msgstr " hatalı."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adres defteri bulunamadı."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz değil."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "mesaj"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "İnternet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Doğum günü"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "İş"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Çağrı"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Müşteriler"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Dağıtıcı"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Tatiller"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Fikirler"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Seyahat"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Yıl Dönümü"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Diğer"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Kişisel"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projeler"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Sorular"
 
@@ -442,207 +455,185 @@ msgstr "İçe aktar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adres defterleri"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Kapat"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Klavye kısayolları"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Dolaşım"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Listedeki sonraki kişi"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Listedeki önceki kişi"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Şuanki adres defterini genişlet/daralt"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Sonraki/Önceki adres defteri"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Eylemler"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Kişi listesini tazele"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Yeni kişi ekle"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Yeni adres defteri ekle"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Şuanki kişiyi sil"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adres Defterlerini Yapılandır"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Yeni Adres Defteri"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Bağlantısı"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "İndir"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Düzenle"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Sil"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Fotoğrafı yüklenmesi için bırakın"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Mevcut fotoğrafı sil"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Mevcut fotoğrafı düzenle"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Yeni fotoğraf yükle"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "İsim detaylarını düzenle"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Takma adı girin"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Web sitesi"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Web sitesine git"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "gg-aa-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Grupları birbirinden virgülle ayırın"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Grupları düzenle"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Tercih edilen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Lütfen geçerli bir eposta adresi belirtin."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Eposta adresini girin"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Eposta adresi"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Eposta adresini sil"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Telefon numarasını gir"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefon numarasını sil"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Haritada gör"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Adres detaylarını düzenle"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Notları buraya ekleyin."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Alan ekle"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Not"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kişiyi indir"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kişiyi sil"
 
@@ -801,7 +792,7 @@ msgstr "Görünen adı"
 msgid "Active"
 msgstr "Aktif"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Kaydet"
 
@@ -809,7 +800,7 @@ msgstr "Kaydet"
 msgid "Submit"
 msgstr "Gönder"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "İptal"
 
@@ -833,15 +824,15 @@ msgstr "Yeni adres defteri için isim"
 msgid "Importing contacts"
 msgstr "Bağlantıları içe aktar"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Adres defterinizde hiç bağlantı yok."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Bağlatı ekle"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Adres defterini yapılandır"
 
@@ -873,6 +864,34 @@ msgstr "Birincil adres (Bağlantı ve arkadaşları)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Sadece okunabilir vCard dizin link(ler)i"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "İndir"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Düzenle"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Yeni Adres Defteri"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 4f27a0126c..06136c97ff 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Ocak"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 66a8b77b9c..2ac944dd68 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:13+0000\n"
-"Last-Translator: Emre Saraçoğlu <emresaracoglu@live.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Varsayılan Kota"
 msgid "Other"
 msgstr "Diğer"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "Alt Yönetici"
 
@@ -212,10 +212,6 @@ msgstr "Alt Yönetici"
 msgid "Quota"
 msgstr "Kota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Alt yönetici için ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 19ad51b596..7cdc0357d4 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Нова адресна книга"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Завантажити"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Видалити"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Видалити"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Видалити контакт"
 
@@ -799,7 +790,7 @@ msgstr "Відображуване ім'я"
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -807,7 +798,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Завантажити"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нова адресна книга"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index d0c31b79d5..731e7d912e 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 134236723a..e2406d8e54 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 21:39+0000\n"
-"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Видалити"
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 5451d95069..dab1d3502e 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr "tên phần tử không được thiết lập."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id không được thiết lập."
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Không có ID được cung cấp"
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Lỗi tải lên danh sách địa chỉ để lưu trữ."
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Danh sách"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Điện thoại bàn"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Công việc"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Nhà"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Di động"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "số trang"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Ngày sinh nhật"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Sổ địa chỉ"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Tải về"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Sửa"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Xóa"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Xóa"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Xóa liên lạc"
 
@@ -799,7 +790,7 @@ msgstr "Hiển thị tên"
 msgid "Active"
 msgstr "Kích hoạt"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Lưu"
 
@@ -807,7 +798,7 @@ msgstr "Lưu"
 msgid "Submit"
 msgstr "Submit"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Hủy"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Sửa"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 60bed8f0dc..29ceebc712 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Tháng 1"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index ab28333467..55b0485ddf 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Hạn ngạch mặt định"
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Hạn ngạch"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Xóa"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 577dc470d4..c66057c0cb 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(取消)激活地址簿错误。"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "添加联系人时出错。"
@@ -32,7 +28,9 @@ msgstr "添加联系人时出错。"
 msgid "element name is not set."
 msgstr "元素名称未设置"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "没有设置 id。"
 
@@ -56,6 +54,18 @@ msgstr "试图添加重复属性： "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(取消)激活地址簿错误。"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "无法使用一个空名称更新地址簿"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "更新地址簿错误"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
@@ -169,14 +179,6 @@ msgstr "有一些信息无法被处理。"
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "无法使用一个空名称更新地址簿"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "更新地址簿错误"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "上传联系人到存储空间时出错"
@@ -223,71 +225,78 @@ msgstr "没有文件被上传。未知错误"
 msgid "Contacts"
 msgstr "联系人"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "抱歉，这个功能暂时还没有被实现"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "未实现"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "无法获取一个合法的地址。"
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "错误"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "联系人"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "这个属性必须是非空的"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "无法序列化元素"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "编辑名称"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "选择类型"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "结果: "
@@ -300,129 +309,133 @@ msgstr " 已导入， "
 msgid " failed."
 msgstr " 失败。"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "未找到地址簿。"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "消息"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "传呼机"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "互联网"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "导入"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "地址簿"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "关闭"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "配置地址簿"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新建地址簿"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav 链接"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "下载"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "编辑"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "删除"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "拖拽图片进行上传"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "删除当前照片"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "编辑当前照片"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "上传新照片"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "自定义格式，简称，全名，姓在前，姓在前并用逗号分割"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "编辑名称详情"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "删除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "昵称"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "输入昵称"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "分组"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "用逗号隔开分组"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "编辑分组"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "偏好"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "请指定合法的电子邮件地址"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "输入电子邮件地址"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "发送邮件到地址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "删除电子邮件地址"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "输入电话号码"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "删除电话号码"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "在地图上显示"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "编辑地址细节。"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "添加注释。"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "添加字段"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "电话"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "注释"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "下载联系人"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "删除联系人"
 
@@ -801,7 +792,7 @@ msgstr "显示名称"
 msgid "Active"
 msgstr "激活"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "保存"
 
@@ -809,7 +800,7 @@ msgstr "保存"
 msgid "Submit"
 msgstr "提交"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "取消"
 
@@ -833,15 +824,15 @@ msgstr "新地址簿名称"
 msgid "Importing contacts"
 msgstr "导入联系人"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "您的地址簿中没有联系人。"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "添加联系人"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "配置地址簿"
 
@@ -873,6 +864,34 @@ msgstr "首选地址 (Kontact 等)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "下载"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "编辑"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新建地址簿"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index f9babe102e..bc2b280087 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "一月"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 8af9222105..cb16e2cbf8 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "默认配额"
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "配额"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index db0b2a0c0f..dac86b63c6 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "在啟用或關閉電話簿時發生錯誤"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "添加通訊錄發生錯誤"
@@ -31,7 +27,9 @@ msgstr "添加通訊錄發生錯誤"
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -55,6 +53,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "在啟用或關閉電話簿時發生錯誤"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "電話簿更新中發生錯誤"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "電話簿更新中發生錯誤"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "通訊錄"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "找不到通訊錄"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "網際網路"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "電話簿"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "設定通訊錄"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新電話簿"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav 聯結"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "下載"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "編輯"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "刪除"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "編輯姓名詳細資訊"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "刪除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "綽號"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "輸入綽號"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "群組"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "用逗號分隔群組"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "編輯群組"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "首選"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "註填入合法的電子郵件住址"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "輸入電子郵件地址"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "寄送住址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "刪除電子郵件住址"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "輸入電話號碼"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "刪除電話號碼"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "電子郵件住址詳細資訊"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "在這裡新增註解"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "新增欄位"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "電話"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "註解"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "下載通訊錄"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "刪除通訊錄"
 
@@ -800,7 +791,7 @@ msgstr "顯示名稱"
 msgid "Active"
 msgstr "作用中"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "儲存"
 
@@ -808,7 +799,7 @@ msgstr "儲存"
 msgid "Submit"
 msgstr "提出"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "取消"
 
@@ -832,15 +823,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "下載"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "編輯"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新電話簿"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 9cc98c4b81..932959583c 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 5e9690d52b..2a5571a381 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "預設容量限制"
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "容量限制"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "刪除"
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index dae698dbde..2917f8a84c 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -47,6 +47,5 @@
 "Other" => "Altre",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
-"SubAdmin for ..." => "SubAdmin per a ...",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 010146283f..5610a4ec03 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -47,6 +47,5 @@
 "Other" => "Andere",
 "SubAdmin" => "Unteradministrator",
 "Quota" => "Quota",
-"SubAdmin for ..." => "Unteradministrator für...",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index c2340c1641..c0ab65a81a 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -47,6 +47,5 @@
 "Other" => "Άλλα",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Σύνολο χώρου",
-"SubAdmin for ..." => "SubAdmin για ...",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index ad599402d3..687c21259f 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -47,6 +47,5 @@
 "Other" => "Otro",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Cuota",
-"SubAdmin for ..." => "SubAdmin para ...",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 1e8379b752..009cd1a8a8 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
+"Authentication error" => "Autentifikazio errorea",
 "Language changed" => "Hizkuntza aldatuta",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
+"Security Warning" => "Segurtasun abisua",
 "Log" => "Egunkaria",
 "More" => "Gehiago",
 "Add your App" => "Gehitu zure aplikazioa",
@@ -43,6 +45,7 @@
 "Create" => "Sortu",
 "Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 87f75a2015..8ddfcc7f97 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -47,6 +47,5 @@
 "Other" => "Autre",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
-"SubAdmin for ..." => "SubAdmin pour ...",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 1ef27ce331..966f2b7f17 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -47,6 +47,5 @@
 "Other" => "Altro",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Quote",
-"SubAdmin for ..." => "SubAdmin per...",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 7050b85762..f215e5b910 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -3,11 +3,13 @@
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
+"Authentication error" => "認証エラー",
 "Language changed" => "言語が変更されました",
 "Disable" => "無効",
 "Enable" => "有効",
 "Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
+"Security Warning" => "セキュリティ警告",
 "Log" => "ログ",
 "More" => "もっと",
 "Add your App" => "アプリを追加",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 59185d68e3..c000bc4150 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -9,6 +9,7 @@
 "Enable" => "Włączone",
 "Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
+"Security Warning" => "Ostrzeżenia bezpieczeństwa",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",
@@ -44,6 +45,7 @@
 "Create" => "Utwórz",
 "Default Quota" => "Domyślny udział",
 "Other" => "Inne",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index f1ac1f1642..99c6d9d484 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -47,6 +47,5 @@
 "Other" => "Drugo",
 "SubAdmin" => "PodSkrbnik",
 "Quota" => "Količinska omejitev",
-"SubAdmin for ..." => "PodSkrbnik za ...",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index b942b86ed2..9df4ef257f 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -47,6 +47,5 @@
 "Other" => "Annat",
 "SubAdmin" => "Underadministratör",
 "Quota" => "Kvot",
-"SubAdmin for ..." => "Underadministratör för ...",
 "Delete" => "Ta bort"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e4907dfba9..e3ba426f5f 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -47,6 +47,5 @@
 "Other" => "Diğer",
 "SubAdmin" => "Alt Yönetici",
 "Quota" => "Kota",
-"SubAdmin for ..." => "Alt yönetici için ...",
 "Delete" => "Sil"
 );

From 6c7baacf8959e32c6702b68357bc85b286c67940 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 1 Aug 2012 20:08:18 -0400
Subject: [PATCH 1227/1537] Throw exception for items already shared in a
 collection

---
 lib/public/share.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 5eb690b510..2b36a06abf 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -225,11 +225,12 @@ class Share {
 		}
 		if ($collectionTypes = self::getCollectionItemTypes($itemType)) {
 			foreach ($collectionTypes as $collectionType) {
-				$collections = self::getItems($collectionType, null, self::SHARE_TYPE_USER, $shareWith, $uidOwner);
+				$collections = self::getItems($collectionType, null, self::$shareTypeUserAndGroups, $shareWith, $uidOwner);
 				if ($backend = self::getBackend($collectionType)) {
 					if ($backend->inCollection($collections, $item)) {
-						\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith.' inside a collection', \OC_Log::ERROR);
-						return false;
+						$message = 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith.' inside a collection';
+						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+						throw new \Exception($message);
 					}
 				}
 			}

From 937058cdec1b853cd1f60feeb925e3907c676679 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 01:14:50 +0200
Subject: [PATCH 1228/1537] Updated JS namespace.

---
 apps/contacts/js/contacts.js | 3114 +++++++++++++++++-----------------
 apps/contacts/js/settings.js |    8 +-
 2 files changed, 1556 insertions(+), 1566 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c53fc5af63..8108bb2590 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -10,1642 +10,1632 @@ String.prototype.strip_tags = function(){
 	return stripped;
 };
 
-Contacts={
-	UI:{
-		/**
-		 * Arguments:
-		 * message: The text message to show.
-		 * timeout: The timeout in seconds before the notification disappears. Default 10.
-		 * timeouthandler: A function to run on timeout.
-		 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
-		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
-		 * cancel: If set cancel all ongoing timer events and hide the notification.
-		 */
-		notify:function(params) {
-			var self = this;
-			if(!self.notifier) {
+OC.Contacts={
+	/**
+	 * Arguments:
+	 * message: The text message to show.
+	 * timeout: The timeout in seconds before the notification disappears. Default 10.
+	 * timeouthandler: A function to run on timeout.
+	 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
+	 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
+	 * cancel: If set cancel all ongoing timer events and hide the notification.
+	 */
+	notify:function(params) {
+		var self = this;
+		if(!self.notifier) {
+			self.notifier = $('#notification');
+		}
+		if(params.cancel) {
+			self.notifier.off('click');
+			for(var id in self.notifier.data()) {
+				if($.isNumeric(id)) {
+					clearTimeout(parseInt(id));
+				}
+			}
+			self.notifier.text('').fadeOut().removeData();
+			return;
+		}
+		self.notifier.text(params.message);
+		self.notifier.fadeIn();
+		self.notifier.on('click', function() { $(this).fadeOut();});
+		var timer = setTimeout(function() {
+			if(!self || !self.notifier) {
+				var self = OC.Contacts;
 				self.notifier = $('#notification');
 			}
-			if(params.cancel) {
+			self.notifier.fadeOut();
+			if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
+				params.timeouthandler(self.notifier.data(dataid));
 				self.notifier.off('click');
-				for(var id in self.notifier.data()) {
-					if($.isNumeric(id)) {
-						clearTimeout(parseInt(id));
-					}
-				}
-				self.notifier.text('').fadeOut().removeData();
-				return;
+				self.notifier.removeData(dataid);
 			}
-			self.notifier.text(params.message);
-			self.notifier.fadeIn();
-			self.notifier.on('click', function() { $(this).fadeOut();});
-			var timer = setTimeout(function() {
+		}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
+		var dataid = timer.toString();
+		if(params.data) {
+			self.notifier.data(dataid, params.data);
+		}
+		if(params.clickhandler && $.isFunction(params.clickhandler)) {
+			self.notifier.on('click', function() {
 				if(!self || !self.notifier) {
-					var self = Contacts.UI;
-					self.notifier = $('#notification');
+					var self = OC.Contacts;
+					self.notifier = $(this);
 				}
-				self.notifier.fadeOut();
-				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
-					params.timeouthandler(self.notifier.data(dataid));
-					self.notifier.off('click');
-					self.notifier.removeData(dataid);
-				}
-			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
-			var dataid = timer.toString();
-			if(params.data) {
-				self.notifier.data(dataid, params.data);
+				clearTimeout(timer);
+				self.notifier.off('click');
+				params.clickhandler(self.notifier.data(dataid));
+				self.notifier.removeData(dataid);
+			});
+		}
+	},
+	notImplemented:function() {
+		OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));
+	},
+	searchOSM:function(obj) {
+		var adr = OC.Contacts.propertyContainerFor(obj).find('.adr').val();
+		if(adr == undefined) {
+			OC.dialogs.alert(t('contacts', 'Couldn\'t get a valid address.'), t('contacts', 'Error'));
+			return;
+		}
+		// FIXME: I suck at regexp. /Tanghus
+		var adrarr = adr.split(';');
+		var adrstr = '';
+		if(adrarr[2].trim() != '') {
+			adrstr = adrstr + adrarr[2].trim() + ',';
+		}
+		if(adrarr[3].trim() != '') {
+			adrstr = adrstr + adrarr[3].trim() + ',';
+		}
+		if(adrarr[4].trim() != '') {
+			adrstr = adrstr + adrarr[4].trim() + ',';
+		}
+		if(adrarr[5].trim() != '') {
+			adrstr = adrstr + adrarr[5].trim() + ',';
+		}
+		if(adrarr[6].trim() != '') {
+			adrstr = adrstr + adrarr[6].trim();
+		}
+		adrstr = encodeURIComponent(adrstr);
+		var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&polygon=1&zoom=';
+		var newWindow = window.open(uri,'_blank');
+		newWindow.focus();
+	},
+	mailTo:function(obj) {
+		var adr = OC.Contacts.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
+		if(adr == '') {
+			OC.dialogs.alert(t('contacts', 'Please enter an email address.'), t('contacts', 'Error'));
+			return;
+		}
+		window.location.href='mailto:' + adr;
+	},
+	propertyContainerFor:function(obj) {
+		return $(obj).parents('.propertycontainer').first();
+	},
+	checksumFor:function(obj) {
+		return $(obj).parents('.propertycontainer').first().data('checksum');
+	},
+	propertyTypeFor:function(obj) {
+		return $(obj).parents('.propertycontainer').first().data('element');
+	},
+	loading:function(obj, state) {
+		if(state) {
+			$(obj).addClass('loading');
+		} else {
+			$(obj).removeClass('loading');
+		}
+	},
+	showCardDAVUrl:function(username, bookname){
+		$('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
+		$('#carddav_url').show();
+		$('#carddav_url_close').show();
+	},
+	loadListHandlers:function() {
+		$('.propertylist li a.delete').unbind('click');
+		$('.propertylist li a.delete').unbind('keydown');
+		var deleteItem = function(obj) {
+			obj.tipsy('hide');
+			OC.Contacts.Card.deleteProperty(obj, 'list');
+		}
+		$('.propertylist li a.delete, .addresscard .delete').click(function() { deleteItem($(this)) });
+		$('.propertylist li a.delete, .addresscard .delete').keydown(function() { deleteItem($(this)) });
+		$('.propertylist li a.mail').click(function() { OC.Contacts.mailTo(this) });
+		$('.propertylist li a.mail').keydown(function() { OC.Contacts.mailTo(this) });
+		$('.addresscard .globe').click(function() { $(this).tipsy('hide');OC.Contacts.searchOSM(this); });
+		$('.addresscard .globe').keydown(function() { $(this).tipsy('hide');OC.Contacts.searchOSM(this); });
+		$('.addresscard .edit').click(function() { $(this).tipsy('hide');OC.Contacts.Card.editAddress(this, false); });
+		$('.addresscard .edit').keydown(function() { $(this).tipsy('hide');OC.Contacts.Card.editAddress(this, false); });
+		$('.addresscard,.propertylist li,.propertycontainer').hover(
+			function () {
+				$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
+			},
+			function () {
+				$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
 			}
-			if(params.clickhandler && $.isFunction(params.clickhandler)) {
-				self.notifier.on('click', function() {
-					if(!self || !self.notifier) {
-						var self = Contacts.UI;
-						self.notifier = $(this);
-					}
-					clearTimeout(timer);
-					self.notifier.off('click');
-					params.clickhandler(self.notifier.data(dataid));
-					self.notifier.removeData(dataid);
-				});
-			}
-		},
-		notImplemented:function() {
-			OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));
-		},
-		searchOSM:function(obj) {
-			var adr = Contacts.UI.propertyContainerFor(obj).find('.adr').val();
-			if(adr == undefined) {
-				OC.dialogs.alert(t('contacts', 'Couldn\'t get a valid address.'), t('contacts', 'Error'));
-				return;
-			}
-			// FIXME: I suck at regexp. /Tanghus
-			var adrarr = adr.split(';');
-			var adrstr = '';
-			if(adrarr[2].trim() != '') {
-				adrstr = adrstr + adrarr[2].trim() + ',';
-			}
-			if(adrarr[3].trim() != '') {
-				adrstr = adrstr + adrarr[3].trim() + ',';
-			}
-			if(adrarr[4].trim() != '') {
-				adrstr = adrstr + adrarr[4].trim() + ',';
-			}
-			if(adrarr[5].trim() != '') {
-				adrstr = adrstr + adrarr[5].trim() + ',';
-			}
-			if(adrarr[6].trim() != '') {
-				adrstr = adrstr + adrarr[6].trim();
-			}
-			adrstr = encodeURIComponent(adrstr);
-			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&polygon=1&zoom=';
-			var newWindow = window.open(uri,'_blank');
+		);
+	},
+	loadHandlers:function() {
+		var deleteItem = function(obj) {
+			obj.tipsy('hide');
+			OC.Contacts.Card.deleteProperty(obj, 'single');
+		}
+		var goToUrl = function(obj) {
+		var url = OC.Contacts.propertyContainerFor(obj).find('#url').val();
+		if(url != '') {
+			var newWindow = window.open(url,'_blank');
 			newWindow.focus();
-		},
-		mailTo:function(obj) {
-			var adr = Contacts.UI.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
-			if(adr == '') {
-				OC.dialogs.alert(t('contacts', 'Please enter an email address.'), t('contacts', 'Error'));
-				return;
 			}
-			window.location.href='mailto:' + adr;
-		},
-		propertyContainerFor:function(obj) {
-			return $(obj).parents('.propertycontainer').first();
-		},
-		checksumFor:function(obj) {
-			return $(obj).parents('.propertycontainer').first().data('checksum');
-		},
-		propertyTypeFor:function(obj) {
-			return $(obj).parents('.propertycontainer').first().data('element');
-		},
-		loading:function(obj, state) {
-			if(state) {
-				$(obj).addClass('loading');
-			} else {
-				$(obj).removeClass('loading');
+		}
+
+		$('#identityprops a.delete').click( function() { deleteItem($(this)) });
+		$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
+		$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
+		$('#categories_value a.edit').keydown( function() { $(this).tipsy('hide');OCCategories.edit(); } );
+		$('#url_value a.globe').click( function() { $(this).tipsy('hide');goToUrl($(this)); } );
+		$('#url_value a.globe').keydown( function() { $(this).tipsy('hide');goToUrl($(this)); } );
+		$('#fn_select').combobox({
+			'id': 'fn',
+			'name': 'value',
+			'classes': ['contacts_property', 'nonempty', 'huge', 'tip', 'float'],
+			'attributes': {'placeholder': t('contacts', 'Enter name')},
+			'title': t('contacts', 'Format custom, Short name, Full name, Reverse or Reverse with comma')});
+		$('#bday').datepicker({
+					dateFormat : 'dd-mm-yy'
+		});
+		// Style phone types
+		$('#phonelist').find('select.contacts_property').multiselect({
+												noneSelectedText: t('contacts', 'Select type'),
+												header: false,
+												selectedList: 4,
+												classes: 'typelist'
+											});
+		$('#edit_name').click(function(){OC.Contacts.Card.editName()});
+		$('#edit_name').keydown(function(){OC.Contacts.Card.editName()});
+
+		$('#phototools li a').click(function() {
+		$(this).tipsy('hide');
+		});
+		$('#contacts_details_photo_wrapper').hover(
+			function () {
+				$('#phototools').slideDown(200);
+			},
+			function () {
+				$('#phototools').slideUp(200);
 			}
-		},
-		showCardDAVUrl:function(username, bookname){
-			$('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
-			$('#carddav_url').show();
-			$('#carddav_url_close').show();
-		},
-		loadListHandlers:function() {
-			$('.propertylist li a.delete').unbind('click');
-			$('.propertylist li a.delete').unbind('keydown');
-			var deleteItem = function(obj) {
-				obj.tipsy('hide');
-				Contacts.UI.Card.deleteProperty(obj, 'list');
+		);
+		$('#phototools').hover(
+			function () {
+				$(this).removeClass('transparent');
+			},
+			function () {
+				$(this).addClass('transparent');
 			}
-			$('.propertylist li a.delete, .addresscard .delete').click(function() { deleteItem($(this)) });
-			$('.propertylist li a.delete, .addresscard .delete').keydown(function() { deleteItem($(this)) });
-			$('.propertylist li a.mail').click(function() { Contacts.UI.mailTo(this) });
-			$('.propertylist li a.mail').keydown(function() { Contacts.UI.mailTo(this) });
-			$('.addresscard .globe').click(function() { $(this).tipsy('hide');Contacts.UI.searchOSM(this); });
-			$('.addresscard .globe').keydown(function() { $(this).tipsy('hide');Contacts.UI.searchOSM(this); });
-			$('.addresscard .edit').click(function() { $(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false); });
-			$('.addresscard .edit').keydown(function() { $(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false); });
-			$('.addresscard,.propertylist li,.propertycontainer').hover(
-				function () {
-					$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
-				},
-				function () {
-					$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
+		);
+		$('#phototools .upload').click(function() {
+			$('#file_upload_start').trigger('click');
+		});
+		$('#phototools .cloud').click(function() {
+			OC.dialogs.filepicker(t('contacts', 'Select photo'), OC.Contacts.Card.cloudPhotoSelected, false, 'image', true);
+		});
+		/* Initialize the photo edit dialog */
+		$('#edit_photo_dialog').dialog({
+			autoOpen: false, modal: true, height: 'auto', width: 'auto'
+		});
+		$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
+			{
+				text: "Ok",
+				click: function() {
+					OC.Contacts.Card.savePhoto(this);
+					$(this).dialog('close');
 				}
-			);
-		},
-		loadHandlers:function() {
-			var deleteItem = function(obj) {
-				obj.tipsy('hide');
-				Contacts.UI.Card.deleteProperty(obj, 'single');
+			},
+			{
+				text: "Cancel",
+				click: function() { $(this).dialog('close'); }
 			}
+		] );
 
-			var goToUrl = function(obj) {
-				var url = Contacts.UI.propertyContainerFor(obj).find('#url').val();
-				if(url != '') {
-					var newWindow = window.open(url,'_blank');
-					newWindow.focus();
-				}
+		// Name has changed. Update it and reorder.
+		$('#fn').change(function(){
+			var name = $('#fn').val().strip_tags();
+			var item = $('.contacts li[data-id="'+OC.Contacts.Card.id+'"]').detach();
+			$(item).find('a').html(name);
+			OC.Contacts.Card.fn = name;
+			OC.Contacts.Contacts.insertContact({contact:item});
+			OC.Contacts.Contacts.scrollTo(OC.Contacts.Card.id);
+		});
+
+		$('#contacts_deletecard').click( function() { OC.Contacts.Card.delayedDelete();return false;} );
+		$('#contacts_deletecard').keydown( function(event) {
+			if(event.which == 13 || event.which == 32) {
+				OC.Contacts.Card.delayedDelete();
 			}
+			return false;
+		});
 
-			$('#identityprops a.delete').click( function() { deleteItem($(this)) });
-			$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
-			$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
-			$('#categories_value a.edit').keydown( function() { $(this).tipsy('hide');OCCategories.edit(); } );
-			$('#url_value a.globe').click( function() { $(this).tipsy('hide');goToUrl($(this)); } );
-			$('#url_value a.globe').keydown( function() { $(this).tipsy('hide');goToUrl($(this)); } );
-			$('#fn_select').combobox({
-				'id': 'fn',
-				'name': 'value',
-				'classes': ['contacts_property', 'nonempty', 'huge', 'tip', 'float'],
-				'attributes': {'placeholder': t('contacts', 'Enter name')},
-				'title': t('contacts', 'Format custom, Short name, Full name, Reverse or Reverse with comma')});
-			$('#bday').datepicker({
-						dateFormat : 'dd-mm-yy'
-			});
-			// Style phone types
-			$('#phonelist').find('select.contacts_property').multiselect({
-													noneSelectedText: t('contacts', 'Select type'),
-													header: false,
-													selectedList: 4,
-													classes: 'typelist'
-												});
-			$('#edit_name').click(function(){Contacts.UI.Card.editName()});
-			$('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
-
-			$('#phototools li a').click(function() {
-				$(this).tipsy('hide');
-			});
-			$('#contacts_details_photo_wrapper').hover(
-				function () {
-					$('#phototools').slideDown(200);
-				},
-				function () {
-					$('#phototools').slideUp(200);
-				}
-			);
-			$('#phototools').hover(
-				function () {
-					$(this).removeClass('transparent');
-				},
-				function () {
-					$(this).addClass('transparent');
-				}
-			);
-			$('#phototools .upload').click(function() {
-				$('#file_upload_start').trigger('click');
-			});
-			$('#phototools .cloud').click(function() {
-				OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true);
-			});
-			/* Initialize the photo edit dialog */
-			$('#edit_photo_dialog').dialog({
-				autoOpen: false, modal: true, height: 'auto', width: 'auto'
-			});
-			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
-				{
-					text: "Ok",
-					click: function() {
-						Contacts.UI.Card.savePhoto(this);
-						$(this).dialog('close');
-					}
-				},
-				{
-					text: "Cancel",
-					click: function() { $(this).dialog('close'); }
-				}
-			] );
-
-			// Name has changed. Update it and reorder.
-			$('#fn').change(function(){
-				var name = $('#fn').val().strip_tags();
-				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]').detach();
-				$(item).find('a').html(name);
-				Contacts.UI.Card.fn = name;
-				Contacts.UI.Contacts.insertContact({contact:item});
-				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
-			});
-
-			$('#contacts_deletecard').click( function() { Contacts.UI.Card.delayedDelete();return false;} );
-			$('#contacts_deletecard').keydown( function(event) {
-				if(event.which == 13 || event.which == 32) {
-					Contacts.UI.Card.delayedDelete();
-				}
-				return false;
-			});
-
-			$('#contacts_downloadcard').click( function() { Contacts.UI.Card.doExport();return false;} );
-			$('#contacts_downloadcard').keydown( function(event) {
-				if(event.which == 13 || event.which == 32) {
-					Contacts.UI.Card.doExport();
-				}
-				return false;
-			});
-
-			// Profile picture upload handling
-			// New profile picture selected
-			$('#file_upload_start').change(function(){
-				Contacts.UI.Card.uploadPhoto(this.files);
-			});
-			$('#contacts_details_photo_wrapper').bind('dragover',function(event){
-				$(event.target).addClass('droppable');
-				event.stopPropagation();
-				event.preventDefault();
-			});
-			$('#contacts_details_photo_wrapper').bind('dragleave',function(event){
-				$(event.target).removeClass('droppable');
-				//event.stopPropagation();
-				//event.preventDefault();
-			});
-			$('#contacts_details_photo_wrapper').bind('drop',function(event){
-				event.stopPropagation();
-				event.preventDefault();
-				$(event.target).removeClass('droppable');
-				$.fileUpload(event.originalEvent.dataTransfer.files);
-			});
-
-			$('#categories').multiple_autocomplete({source: categories});
-			$('#contacts_deletecard').tipsy({gravity: 'ne'});
-			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
-			$('#contacts_propertymenu_button').tipsy();
-			$('#contacts_newcontact, #contacts_import, #bottomcontrols .settings').tipsy({gravity: 'sw'});
-
-			$('body').click(function(e){
-				if(!$(e.target).is('#contacts_propertymenu_button')) {
-					$('#contacts_propertymenu_dropdown').hide();
-				}
-			});
-			function propertyMenu(){
-				var menu = $('#contacts_propertymenu_dropdown');
-				if(menu.is(':hidden')) {
-					menu.show();
-					menu.find('li').first().focus();
-				} else {
-					menu.hide();
-				}
+		$('#contacts_downloadcard').click( function() { OC.Contacts.Card.doExport();return false;} );
+		$('#contacts_downloadcard').keydown( function(event) {
+			if(event.which == 13 || event.which == 32) {
+				OC.Contacts.Card.doExport();
 			}
-			$('#contacts_propertymenu_button').click(propertyMenu);
-			$('#contacts_propertymenu_button').keydown(propertyMenu);
-			function propertyMenuItem(){
-				var type = $(this).data('type');
-				Contacts.UI.Card.addProperty(type);
+			return false;
+		});
+
+		// Profile picture upload handling
+		// New profile picture selected
+		$('#file_upload_start').change(function(){
+			OC.Contacts.Card.uploadPhoto(this.files);
+		});
+		$('#contacts_details_photo_wrapper').bind('dragover',function(event){
+			$(event.target).addClass('droppable');
+			event.stopPropagation();
+			event.preventDefault();
+		});
+		$('#contacts_details_photo_wrapper').bind('dragleave',function(event){
+			$(event.target).removeClass('droppable');
+		});
+		$('#contacts_details_photo_wrapper').bind('drop',function(event){
+			event.stopPropagation();
+			event.preventDefault();
+			$(event.target).removeClass('droppable');
+			$.fileUpload(event.originalEvent.dataTransfer.files);
+		});
+
+		$('#categories').multiple_autocomplete({source: categories});
+		$('#contacts_deletecard').tipsy({gravity: 'ne'});
+		$('#contacts_downloadcard').tipsy({gravity: 'ne'});
+		$('#contacts_propertymenu_button').tipsy();
+		$('#contacts_newcontact, #contacts_import, #bottomcontrols .settings').tipsy({gravity: 'sw'});
+
+		$('body').click(function(e){
+			if(!$(e.target).is('#contacts_propertymenu_button')) {
 				$('#contacts_propertymenu_dropdown').hide();
 			}
-			$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
-			$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
+		});
+		function propertyMenu(){
+			var menu = $('#contacts_propertymenu_dropdown');
+			if(menu.is(':hidden')) {
+				menu.show();
+				menu.find('li').first().focus();
+			} else {
+				menu.hide();
+			}
+		}
+		$('#contacts_propertymenu_button').click(propertyMenu);
+		$('#contacts_propertymenu_button').keydown(propertyMenu);
+		function propertyMenuItem(){
+			var type = $(this).data('type');
+			OC.Contacts.Card.addProperty(type);
+			$('#contacts_propertymenu_dropdown').hide();
+		}
+		$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
+		$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
+	},
+	Card:{
+		update:function(params) { // params {cid:int, aid:int}
+			if(!params) { params = {}; }
+			$('#contacts li,#contacts h3').removeClass('active');
+			console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
+			var newid, bookid, firstitem;
+			if(!parseInt(params.cid) && !parseInt(params.aid)) {
+				firstitem = $('#contacts ul').first().find('li:first-child');
+				if(firstitem.length > 0) {
+					newid = parseInt(firstitem.data('id'));
+					bookid = parseInt(firstitem.data('bookid'));
+				}
+			} else if(!parseInt(params.cid) && parseInt(params.aid)) {
+				bookid = parseInt(params.aid);
+				newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
+			} else if(parseInt(params.cid) && !parseInt(params.aid)) {
+				newid = parseInt(params.cid);
+				var listitem = OC.Contacts.Contacts.getContact(newid); //$('#contacts li[data-id="'+newid+'"]');
+				console.log('Is contact in list? ' + listitem.length);
+				if(listitem.length) {
+					//bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
+					bookid = parseInt(OC.Contacts.Contacts.getContact(newid).data('bookid'));
+				} else { // contact isn't in list yet.
+					bookid = 'unknown';
+				}
+			} else {
+				newid = parseInt(params.cid);
+				bookid = parseInt(params.aid);
+			}
+			if(!bookid || !newid) {
+				bookid = parseInt($('#contacts h3').first().data('id'));
+				newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
+			}
+			console.log('newid: ' + newid + ' bookid: ' +bookid);
+			var localLoadContact = function(newid, bookid) {
+				if($('.contacts li').length > 0) {
+					$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
+						if(jsondata.status == 'success'){
+							if(bookid == 'unknown') {
+								bookid = jsondata.data.addressbookid;
+								var contact = OC.Contacts.Contacts.insertContact({
+									contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
+									data:jsondata.data
+								});
+							}
+							$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
+							$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
+							OC.Contacts.Card.loadContact(jsondata.data, bookid);
+							OC.Contacts.Contacts.scrollTo(newid);
+						} else {
+							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						}
+					});
+				}
+			}
+
+			// Make sure proper DOM is loaded.
+			if(!$('#card').length && newid) {
+				console.log('Loading card DOM');
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#rightcontent').html(jsondata.data.page).ready(function() {
+							OC.Contacts.loadHandlers();
+							localLoadContact(newid, bookid);
+						});
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			} else if(!newid) {
+				console.log('Loading intro');
+				// load intro page
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').data('id','');
+						$('#rightcontent').html(jsondata.data.page);
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			}
+			else {
+				localLoadContact(newid, bookid);
+			}
 		},
-		Card:{
-			update:function(params) { // params {cid:int, aid:int}
-				if(!params) { params = {}; }
-				$('#contacts li,#contacts h3').removeClass('active');
-				console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
-				var newid, bookid, firstitem;
-				if(!parseInt(params.cid) && !parseInt(params.aid)) {
-					firstitem = $('#contacts ul').first().find('li:first-child');
-					if(firstitem.length > 0) {
-						newid = parseInt(firstitem.data('id'));
-						bookid = parseInt(firstitem.data('bookid'));
-					}
-				} else if(!parseInt(params.cid) && parseInt(params.aid)) {
-					bookid = parseInt(params.aid);
-					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
-				} else if(parseInt(params.cid) && !parseInt(params.aid)) {
-					newid = parseInt(params.cid);
-					var listitem = Contacts.UI.Contacts.getContact(newid); //$('#contacts li[data-id="'+newid+'"]');
-					console.log('Is contact in list? ' + listitem.length);
-					if(listitem.length) {
-						//bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
-						bookid = parseInt(Contacts.UI.Contacts.getContact(newid).data('bookid'));
-					} else { // contact isn't in list yet.
-						bookid = 'unknown';
-					}
-				} else {
-					newid = parseInt(params.cid);
-					bookid = parseInt(params.aid);
-				}
-				if(!bookid || !newid) {
-					bookid = parseInt($('#contacts h3').first().data('id'));
-					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
-				}
-				console.log('newid: ' + newid + ' bookid: ' +bookid);
-				var localLoadContact = function(newid, bookid) {
-					if($('.contacts li').length > 0) {
-						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
+		doExport:function() {
+			document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
+		},
+		editNew:function(){ // add a new contact
+			this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+			OC.Contacts.Card.add(';;;;;', '', '', true);
+			return false;
+		},
+		add:function(n, fn, aid, isnew){ // add a new contact
+			console.log('Adding ' + fn);
+			aid = aid?aid:$('#contacts h3.active').first().data('id');
+			var localAddcontact = function(n, fn, aid, isnew) {
+				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
+				function(jsondata) {
+					if (jsondata.status == 'success'){
+						$('#rightcontent').data('id',jsondata.data.id);
+						var id = jsondata.data.id;
+						var aid = jsondata.data.aid;
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 							if(jsondata.status == 'success'){
-								if(bookid == 'unknown') {
-									bookid = jsondata.data.addressbookid;
-									var contact = Contacts.UI.Contacts.insertContact({
-										contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
-										data:jsondata.data
-									});
+								OC.Contacts.Card.loadContact(jsondata.data, aid);
+								var item = OC.Contacts.Contacts.insertContact({data:jsondata.data});
+								if(isnew) { // add some default properties
+									OC.Contacts.Card.addProperty('EMAIL');
+									OC.Contacts.Card.addProperty('TEL');
+									$('#fn').focus();
 								}
-								$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
-								$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
-								Contacts.UI.Card.loadContact(jsondata.data, bookid);
-								Contacts.UI.Contacts.scrollTo(newid);
-							} else {
+							}
+							else{
 								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 							}
 						});
+						$('#contact_identity').show();
+						$('#actionbar').show();
 					}
-				}
-
-				// Make sure proper DOM is loaded.
-				if(!$('#card').length && newid) {
-					console.log('Loading card DOM');
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
-						if(jsondata.status == 'success'){
-							$('#rightcontent').html(jsondata.data.page).ready(function() {
-								Contacts.UI.loadHandlers();
-								localLoadContact(newid, bookid);
-							});
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-				else if(!newid) {
-					console.log('Loading intro');
-					// load intro page
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
-						if(jsondata.status == 'success'){
-							id = '';
-							$('#rightcontent').data('id','');
-							$('#rightcontent').html(jsondata.data.page);
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-				else {
-					localLoadContact(newid, bookid);
-				}
-			},
-			doExport:function() {
-				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
-			},
-			editNew:function(){ // add a new contact
-				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
-				//Contacts.UI.Card.add(t('contacts', 'Contact')+';'+t('contacts', 'New')+';;;', t('contacts', 'New Contact'), '', true);
-				Contacts.UI.Card.add(';;;;;', '', '', true);
-				return false;
-			},
-			add:function(n, fn, aid, isnew){ // add a new contact
-				console.log('Adding ' + fn);
-				aid = aid?aid:$('#contacts h3.active').first().data('id');
-				var localAddcontact = function(n, fn, aid, isnew) {
-					$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
-					function(jsondata) {
-						if (jsondata.status == 'success'){
-							$('#rightcontent').data('id',jsondata.data.id);
-							var id = jsondata.data.id;
-							var aid = jsondata.data.aid;
-							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
-								if(jsondata.status == 'success'){
-									Contacts.UI.Card.loadContact(jsondata.data, aid);
-									var item = Contacts.UI.Contacts.insertContact({data:jsondata.data});
-									if(isnew) { // add some default properties
-										Contacts.UI.Card.addProperty('EMAIL');
-										Contacts.UI.Card.addProperty('TEL');
-										$('#fn').focus();
-									}
-								}
-								else{
-									OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-								}
-							});
-							$('#contact_identity').show();
-							$('#actionbar').show();
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-
-				if(!$('#card').length) {
-					console.log('Loading card DOM');
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
-						if(jsondata.status == 'success'){
-							$('#rightcontent').html(jsondata.data.page).ready(function() {
-								Contacts.UI.loadHandlers();
-								localAddcontact(n, fn, aid, isnew);
-							});
-						} else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				} else {
-					localAddcontact(n, fn, aid, isnew);
-				}
-			},
-			delayedDelete:function() {
-				/* TODO:
-				$(window).unload(function() {
-					deleteFilesInQueue();
-				});
-				*/
-				$('#contacts_deletecard').tipsy('hide');
-				var newid = '', bookid;
-				var curlistitem = Contacts.UI.Contacts.getContact(this.id);
-				curlistitem.removeClass('active');
-				var newlistitem = curlistitem.prev('li');
-				if(!newlistitem) {
-					newlistitem = curlistitem.next('li');
-				}
-				curlistitem.detach();
-				if($(newlistitem).is('li')) {
-					newid = newlistitem.data('id');
-					bookid = newlistitem.data('bookid');
-				}
-				$('#rightcontent').data('id', newid);
-
-				Contacts.UI.Contacts.deletionQueue.push(this.id);
-				if(!window.onbeforeunload) {
-					window.onbeforeunload = Contacts.UI.Contacts.warnNotDeleted;
-				}
-
-				with(this) {
-					delete id; delete fn; delete fullname; delete shortname; delete famname;
-					delete givname; delete addname; delete honpre; delete honsuf; delete data;
-				}
-
-				if($('.contacts li').length > 0) {
-					Contacts.UI.Card.update({cid:newid, aid:bookid});
-				} else {
-					// load intro page
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
-						if(jsondata.status == 'success'){
-							id = '';
-							$('#rightcontent').html(jsondata.data.page).removeData('id');
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-				Contacts.UI.notify({
-					data:curlistitem,
-					message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
-					timeouthandler:function(contact) {
-						Contacts.UI.Card.doDelete(contact.data('id'), true);
-						delete contact;
-					},
-					clickhandler:function(contact) {
-						Contacts.UI.Contacts.insertContact({contact:contact});
-						Contacts.UI.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
-					}
-				});
-			},
-			doDelete:function(id, removeFromQueue) {
-				if(Contacts.UI.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
-					return;
-				}
-				$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
-					if(jsondata.status == 'error'){
+					else{
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
-					if(removeFromQueue) {
-						Contacts.UI.Contacts.deletionQueue.splice(Contacts.UI.Contacts.deletionQueue.indexOf(id), 1);
-					}
-					if(Contacts.UI.Contacts.deletionQueue.length == 0) {
-						window.onbeforeunload = null;
-					}
 				});
-			},
-			loadContact:function(jsondata, bookid){
-				this.data = jsondata;
-				this.id = this.data.id;
-				this.bookid = bookid;
-				$('#rightcontent').data('id',this.id);
-				this.populateNameFields();
-				this.loadPhoto();
-				this.loadMails();
-				this.loadPhones();
-				this.loadAddresses();
-				this.loadSingleProperties();
-				Contacts.UI.loadListHandlers();
-				var note = $('#note');
-				if(this.data.NOTE) {
-					note.data('checksum', this.data.NOTE[0]['checksum']);
-					var textarea = note.find('textarea');
-					var txt = this.data.NOTE[0]['value'];
-					var nheight = txt.split('\n').length > 4 ? txt.split('\n').length+2 : 5;
-					textarea.css('min-height', nheight+'em');
-					textarea.attr('rows', nheight);
-					textarea.val(txt);
-					note.show();
-					textarea.expandingTextarea();
-					$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
-				} else {
-					note.removeData('checksum');
-					note.find('textarea').val('');
-					note.hide();
-					$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
-				}
-			},
-			loadSingleProperties:function() {
-				var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
-				// Clear all elements
-				$('#ident .propertycontainer').each(function(){
-					if(props.indexOf($(this).data('element')) > -1) {
-						$(this).data('checksum', '');
-						$(this).find('input').val('');
-						$(this).hide();
-						$(this).prev().hide();
-					}
-				});
-				for(var prop in props) {
-					var propname = props[prop];
-					if(this.data[propname] != undefined) {
-						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
-						var property = this.data[propname][0];
-						var value = property['value'], checksum = property['checksum'];
+			}
 
-						if(propname == 'BDAY') {
-							var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
-							value = $.datepicker.formatDate('dd-mm-yy', val);
-						}
-						var identcontainer = $('#contact_identity');
-						identcontainer.find('#'+propname.toLowerCase()).val(value);
-						identcontainer.find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
-						identcontainer.find('#'+propname.toLowerCase()+'_label').show();
-						identcontainer.find('#'+propname.toLowerCase()+'_value').show();
+			if(!$('#card').length) {
+				console.log('Loading card DOM');
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#rightcontent').html(jsondata.data.page).ready(function() {
+							OC.Contacts.loadHandlers();
+							localAddcontact(n, fn, aid, isnew);
+						});
+					} else{
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			} else {
+				localAddcontact(n, fn, aid, isnew);
+			}
+		},
+		delayedDelete:function() {
+			$('#contacts_deletecard').tipsy('hide');
+			var newid = '', bookid;
+			var curlistitem = OC.Contacts.Contacts.getContact(this.id);
+			curlistitem.removeClass('active');
+			var newlistitem = curlistitem.prev('li');
+			if(!newlistitem) {
+				newlistitem = curlistitem.next('li');
+			}
+			curlistitem.detach();
+			if($(newlistitem).is('li')) {
+				newid = newlistitem.data('id');
+				bookid = newlistitem.data('bookid');
+			}
+			$('#rightcontent').data('id', newid);
+
+			OC.Contacts.Contacts.deletionQueue.push(this.id);
+			if(!window.onbeforeunload) {
+				window.onbeforeunload = OC.Contacts.Contacts.warnNotDeleted;
+			}
+
+			with(this) {
+				delete id; delete fn; delete fullname; delete shortname; delete famname;
+				delete givname; delete addname; delete honpre; delete honsuf; delete data;
+			}
+
+			if($('.contacts li').length > 0) {
+				OC.Contacts.Card.update({cid:newid, aid:bookid});
+			} else {
+				// load intro page
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').html(jsondata.data.page).removeData('id');
 					} else {
-						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
-					}
-				}
-			},
-			populateNameFields:function() {
-				var props = ['FN', 'N'];
-				// Clear all elements
-				$('#ident .propertycontainer').each(function(){
-					if(props.indexOf($(this).data('element')) > -1) {
-						$(this).data('checksum', '');
-						$(this).find('input').val('');
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
+			}
+			OC.Contacts.notify({
+				data:curlistitem,
+				message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
+				timeouthandler:function(contact) {
+					OC.Contacts.Card.doDelete(contact.data('id'), true);
+					delete contact;
+				},
+				clickhandler:function(contact) {
+					OC.Contacts.Contacts.insertContact({contact:contact});
+					OC.Contacts.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
+				}
+			});
+		},
+		doDelete:function(id, removeFromQueue) {
+			if(OC.Contacts.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
+				return;
+			}
+			$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
+				if(jsondata.status == 'error'){
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+				if(removeFromQueue) {
+					OC.Contacts.Contacts.deletionQueue.splice(OC.Contacts.Contacts.deletionQueue.indexOf(id), 1);
+				}
+				if(OC.Contacts.Contacts.deletionQueue.length == 0) {
+					window.onbeforeunload = null;
+				}
+			});
+		},
+		loadContact:function(jsondata, bookid){
+			this.data = jsondata;
+			this.id = this.data.id;
+			this.bookid = bookid;
+			$('#rightcontent').data('id',this.id);
+			this.populateNameFields();
+			this.loadPhoto();
+			this.loadMails();
+			this.loadPhones();
+			this.loadAddresses();
+			this.loadSingleProperties();
+			OC.Contacts.loadListHandlers();
+			var note = $('#note');
+			if(this.data.NOTE) {
+				note.data('checksum', this.data.NOTE[0]['checksum']);
+				var textarea = note.find('textarea');
+				var txt = this.data.NOTE[0]['value'];
+				var nheight = txt.split('\n').length > 4 ? txt.split('\n').length+2 : 5;
+				textarea.css('min-height', nheight+'em');
+				textarea.attr('rows', nheight);
+				textarea.val(txt);
+				note.show();
+				textarea.expandingTextarea();
+				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
+			} else {
+				note.removeData('checksum');
+				note.find('textarea').val('');
+				note.hide();
+				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
+			}
+		},
+		loadSingleProperties:function() {
+			var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
+			// Clear all elements
+			$('#ident .propertycontainer').each(function(){
+				if(props.indexOf($(this).data('element')) > -1) {
+					$(this).data('checksum', '');
+					$(this).find('input').val('');
+					$(this).hide();
+					$(this).prev().hide();
+				}
+			});
+			for(var prop in props) {
+				var propname = props[prop];
+				if(this.data[propname] != undefined) {
+					$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
+					var property = this.data[propname][0];
+					var value = property['value'], checksum = property['checksum'];
 
-				with(this) {
-					delete fn; delete fullname; delete givname; delete famname;
-					delete addname; delete honpre; delete honsuf;
-				}
-
-				if(this.data.FN) {
-					this.fn = this.data.FN[0]['value'];
-				}
-				else {
-					this.fn = '';
-				}
-				if(this.data.N == undefined) {
-					narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
+					if(propname == 'BDAY') {
+						var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
+						value = $.datepicker.formatDate('dd-mm-yy', val);
+					}
+					var identcontainer = $('#contact_identity');
+					identcontainer.find('#'+propname.toLowerCase()).val(value);
+					identcontainer.find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
+					identcontainer.find('#'+propname.toLowerCase()+'_label').show();
+					identcontainer.find('#'+propname.toLowerCase()+'_value').show();
 				} else {
-					narray = this.data.N[0]['value'];
+					$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
 				}
-				this.famname = narray[0] || '';
-				this.givname = narray[1] || '';
-				this.addname = narray[2] || '';
-				this.honpre = narray[3] || '';
-				this.honsuf = narray[4] || '';
-				if(this.honpre.length > 0) {
-					this.fullname += this.honpre + ' ';
+			}
+		},
+		populateNameFields:function() {
+			var props = ['FN', 'N'];
+			// Clear all elements
+			$('#ident .propertycontainer').each(function(){
+				if(props.indexOf($(this).data('element')) > -1) {
+					$(this).data('checksum', '');
+					$(this).find('input').val('');
 				}
-				if(this.givname.length > 0) {
-					this.fullname += ' ' + this.givname;
-				}
-				if(this.addname.length > 0) {
-					this.fullname += ' ' + this.addname;
-				}
-				if(this.famname.length > 0) {
-					this.fullname += ' ' + this.famname;
-				}
-				if(this.honsuf.length > 0) {
-					this.fullname += ', ' + this.honsuf;
-				}
-				$('#n').val(narray.join(';'));
-				$('#fn_select option').remove();
-				var names = [this.fn, this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
-				if(this.data.ORG) {
-					names[names.length]=this.data.ORG[0].value;
-				}
-				$.each(names, function(key, value) {
-					$('#fn_select')
-						.append($('<option></option>')
-						.text(value));
-				});
+			});
+
+			with(this) {
+				delete fn; delete fullname; delete givname; delete famname;
+				delete addname; delete honpre; delete honsuf;
+			}
+
+			if(this.data.FN) {
+				this.fn = this.data.FN[0]['value'];
+			}
+			else {
+				this.fn = '';
+			}
+			if(this.data.N == undefined) {
+				narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
+			} else {
+				narray = this.data.N[0]['value'];
+			}
+			this.famname = narray[0] || '';
+			this.givname = narray[1] || '';
+			this.addname = narray[2] || '';
+			this.honpre = narray[3] || '';
+			this.honsuf = narray[4] || '';
+			if(this.honpre.length > 0) {
+				this.fullname += this.honpre + ' ';
+			}
+			if(this.givname.length > 0) {
+				this.fullname += ' ' + this.givname;
+			}
+			if(this.addname.length > 0) {
+				this.fullname += ' ' + this.addname;
+			}
+			if(this.famname.length > 0) {
+				this.fullname += ' ' + this.famname;
+			}
+			if(this.honsuf.length > 0) {
+				this.fullname += ', ' + this.honsuf;
+			}
+			$('#n').val(narray.join(';'));
+			$('#fn_select option').remove();
+			var names = [this.fn, this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
+			if(this.data.ORG) {
+				names[names.length]=this.data.ORG[0].value;
+			}
+			$.each(names, function(key, value) {
+				$('#fn_select')
+				.append($('<option></option>')
+				.text(value));
+			});
 				$('#fn_select').combobox('value', this.fn);
 				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
 				if(this.data.FN) {
 					$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
 				}
 				$('#contact_identity').show();
-			},
-			hasCategory:function(category) {
-				if(this.data.CATEGORIES) {
-					var categories = this.data.CATEGORIES[0]['value'].split(/,\s*/);
-					for(var c in categories) {
-						var cat = this.data.CATEGORIES[0]['value'][c];
-						if(typeof cat === 'string' && (cat.toUpperCase() === category.toUpperCase())) {
-							return true;
-						}
+		},
+		hasCategory:function(category) {
+			if(this.data.CATEGORIES) {
+				var categories = this.data.CATEGORIES[0]['value'].split(/,\s*/);
+				for(var c in categories) {
+					var cat = this.data.CATEGORIES[0]['value'][c];
+					if(typeof cat === 'string' && (cat.toUpperCase() === category.toUpperCase())) {
+						return true;
 					}
 				}
-				return false;
-			},
-			categoriesChanged:function(newcategories) { // Categories added/deleted.
-				categories = $.map(newcategories, function(v) {return v;});
-				$('#categories').multiple_autocomplete('option', 'source', categories);
-				var categorylist = $('#categories_value').find('input');
-				$.getJSON(OC.filePath('contacts', 'ajax', 'categories/categoriesfor.php'),{'id':Contacts.UI.Card.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#categories_value').data('checksum', jsondata.data.checksum);
-						categorylist.val(jsondata.data.value);
+			}
+			return false;
+		},
+		categoriesChanged:function(newcategories) { // Categories added/deleted.
+			categories = $.map(newcategories, function(v) {return v;});
+			$('#categories').multiple_autocomplete('option', 'source', categories);
+			var categorylist = $('#categories_value').find('input');
+			$.getJSON(OC.filePath('contacts', 'ajax', 'categories/categoriesfor.php'),{'id':OC.Contacts.Card.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					$('#categories_value').data('checksum', jsondata.data.checksum);
+					categorylist.val(jsondata.data.value);
+				} else {
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+			});
+		},
+		savePropertyInternal:function(name, fields, oldchecksum, checksum) {
+			// TODO: Add functionality for new fields.
+			//console.log('savePropertyInternal: ' + name + ', fields: ' + fields + 'checksum: ' + checksum);
+			//console.log('savePropertyInternal: ' + this.data[name]);
+			var multivalue = ['CATEGORIES'];
+			var params = {};
+			var value = multivalue.indexOf(name) != -1 ? new Array() : undefined;
+			jQuery.each(fields, function(i, field){
+				//.substring(11,'parameters[TYPE][]'.indexOf(']'))
+				if(field.name.substring(0, 5) === 'value') {
+					if(multivalue.indexOf(name) != -1) {
+						value.push(field.value);
 					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						value = field.value;
 					}
-				});
-			},
-			savePropertyInternal:function(name, fields, oldchecksum, checksum){
-				// TODO: Add functionality for new fields.
-				//console.log('savePropertyInternal: ' + name + ', fields: ' + fields + 'checksum: ' + checksum);
-				//console.log('savePropertyInternal: ' + this.data[name]);
-				var multivalue = ['CATEGORIES'];
-				var params = {};
-				var value = multivalue.indexOf(name) != -1 ? new Array() : undefined;
-				jQuery.each(fields, function(i, field){
-					//.substring(11,'parameters[TYPE][]'.indexOf(']'))
-					if(field.name.substring(0, 5) === 'value') {
-						if(multivalue.indexOf(name) != -1) {
-							value.push(field.value);
-						} else {
-							value = field.value;
-						}
-					} else if(field.name.substring(0, 10) === 'parameters') {
-						var p = field.name.substring(11,'parameters[TYPE][]'.indexOf(']'));
-						if(!(p in params)) {
-							params[p] = [];
-						}
-						params[p].push(field.value);
+				} else if(field.name.substring(0, 10) === 'parameters') {
+					var p = field.name.substring(11,'parameters[TYPE][]'.indexOf(']'));
+					if(!(p in params)) {
+						params[p] = [];
 					}
-				});
-				for(var i in this.data[name]) {
-					if(this.data[name][i]['checksum'] == oldchecksum) {
-						this.data[name][i]['checksum'] = checksum;
-						this.data[name][i]['value'] = value;
-						this.data[name][i]['parameters'] = params;
+					params[p].push(field.value);
+				}
+			});
+					for(var i in this.data[name]) {
+						if(this.data[name][i]['checksum'] == oldchecksum) {
+							this.data[name][i]['checksum'] = checksum;
+							this.data[name][i]['value'] = value;
+							this.data[name][i]['parameters'] = params;
+						}
 					}
-				}
-			},
-			saveProperty:function(obj){
-				if(!$(obj).hasClass('contacts_property')) {
-					return false;
-				}
-				if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
-					OC.dialogs.alert(t('contacts', 'This property has to be non-empty.'), t('contacts', 'Error'));
-					return false;
-				}
-				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
-				Contacts.UI.loading(obj, true);
-				var checksum = container.data('checksum');
-				var name = container.data('element');
-				var fields = container.find('input.contacts_property,select.contacts_property').serializeArray();
-				switch(name) {
-					case 'FN':
-						var nempty = true;
-						for(var i in Contacts.UI.Card.data.N[0]['value']) {
-							if(Contacts.UI.Card.data.N[0]['value'][i] != '') {
-								nempty = false;
-								break;
-							}
+		},
+		saveProperty:function(obj) {
+			if(!$(obj).hasClass('contacts_property')) {
+				return false;
+			}
+			if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
+				OC.dialogs.alert(t('contacts', 'This property has to be non-empty.'), t('contacts', 'Error'));
+				return false;
+			}
+			container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
+			OC.Contacts.loading(obj, true);
+			var checksum = container.data('checksum');
+			var name = container.data('element');
+			var fields = container.find('input.contacts_property,select.contacts_property').serializeArray();
+			switch(name) {
+				case 'FN':
+					var nempty = true;
+					for(var i in OC.Contacts.Card.data.N[0]['value']) {
+						if(OC.Contacts.Card.data.N[0]['value'][i] != '') {
+							nempty = false;
+							break;
 						}
-						if(nempty) {
-							$('#n').val(fields[0].value + ';;;;');
-							Contacts.UI.Card.data.N[0]['value'] = Array(fields[0].value, '', '', '', '');
-							setTimeout(function() {Contacts.UI.Card.saveProperty($('#n'))}, 500);
-						}
-						break;
-				}
-				var q = container.find('input.contacts_property,select.contacts_property,textarea.contacts_property').serialize();
-				if(q == '' || q == undefined) {
-					OC.dialogs.alert(t('contacts', 'Couldn\'t serialize elements.'), t('contacts', 'Error'));
-					Contacts.UI.loading(obj, false);
-					return false;
-				}
-				q = q + '&id=' + this.id + '&name=' + name;
-				if(checksum != undefined && checksum != '') { // save
+					}
+					if(nempty) {
+						$('#n').val(fields[0].value + ';;;;');
+						OC.Contacts.Card.data.N[0]['value'] = Array(fields[0].value, '', '', '', '');
+						setTimeout(function() {OC.Contacts.Card.saveProperty($('#n'))}, 500);
+					}
+					break;
+			}
+			var q = container.find('input.contacts_property,select.contacts_property,textarea.contacts_property').serialize();
+			if(q == '' || q == undefined) {
+				OC.dialogs.alert(t('contacts', 'Couldn\'t serialize elements.'), t('contacts', 'Error'));
+				OC.Contacts.loading(obj, false);
+				return false;
+			}
+			q = q + '&id=' + this.id + '&name=' + name;
+			if(checksum != undefined && checksum != '') { // save
 					q = q + '&checksum=' + checksum;
 					console.log('Saving: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'saveproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
-							Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							Contacts.UI.loading(obj, false);
+							OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return true;
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							Contacts.UI.loading(obj, false);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return false;
 						}
 					},'json');
-				} else { // add
+			} else { // add
 					console.log('Adding: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'addproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
 							// TODO: savePropertyInternal doesn't know about new fields
-							//Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							Contacts.UI.loading(obj, false);
+							//OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return true;
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							Contacts.UI.loading(obj, false);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return false;
 						}
 					},'json');
-				}
-			},
-			addProperty:function(type){
-				switch (type) {
-					case 'NOTE':
-						$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-						$('#note').find('textarea').expandingTextarea().show().focus();
-						break;
-					case 'EMAIL':
-						if($('#emaillist>li').length == 1) {
-							$('#emails').show();
-						}
-						Contacts.UI.Card.addMail();
-						break;
-					case 'TEL':
-						if($('#phonelist>li').length == 1) {
-							$('#phones').show();
-						}
-						Contacts.UI.Card.addPhone();
-						break;
-					case 'ADR':
-						if($('#addressdisplay>dl').length == 1) {
-							$('#addresses').show();
-						}
-						Contacts.UI.Card.editAddress('new', true);
-						break;
-					case 'NICKNAME':
-					case 'URL':
-					case 'ORG':
-					case 'BDAY':
-					case 'CATEGORIES':
-						$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
-						$('dd[data-element="'+type+'"]').find('input').focus();
-						$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-						break;
-				}
-			},
-			deleteProperty:function(obj, type){
-				console.log('deleteProperty');
-				Contacts.UI.loading(obj, true);
-				var checksum = Contacts.UI.checksumFor(obj);
-				if(checksum) {
-					$.post(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
-						if(jsondata.status == 'success'){
-							if(type == 'list') {
-								Contacts.UI.propertyContainerFor(obj).remove();
-							} else if(type == 'single') {
-								var proptype = Contacts.UI.propertyTypeFor(obj);
-								Contacts.UI.Card.data[proptype] = null;
-								var othertypes = ['NOTE', 'PHOTO'];
-								if(othertypes.indexOf(proptype) != -1) {
-									Contacts.UI.propertyContainerFor(obj).data('checksum', '');
-									if(proptype == 'PHOTO') {
-										Contacts.UI.Contacts.refreshThumbnail(Contacts.UI.Card.id);
-										Contacts.UI.Card.loadPhoto(true);
-									} else if(proptype == 'NOTE') {
-										$('#note').find('textarea').val('');
-										Contacts.UI.propertyContainerFor(obj).hide();
-									}
-								} else {
-									$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-									$('dl dd[data-element="'+proptype+'"]').data('checksum', '').find('input').val('');
-								}
-								$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
-								Contacts.UI.loading(obj, false);
-							} else {
-								OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
-								Contacts.UI.loading(obj, false);
-							}
-						}
-						else{
-							Contacts.UI.loading(obj, false);
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				} else { // Property hasn't been saved so there's nothing to delete.
-					if(type == 'list') {
-						Contacts.UI.propertyContainerFor(obj).remove();
-					} else if(type == 'single') {
-						var proptype = Contacts.UI.propertyTypeFor(obj);
-						$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-						$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
-						Contacts.UI.loading(obj, false);
-					} else {
-						OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
-					}
-				}
-			},
-			editName:function() {
-				var params = {id: this.id};
-				/* Initialize the name edit dialog */
-				if($('#edit_name_dialog').dialog('isOpen') == true) {
-					$('#edit_name_dialog').dialog('moveToTop');
-				} else {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata) {
-						if(jsondata.status == 'success') {
-							$('body').append('<div id="name_dialog"></div>');
-							$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
-								modal: true,
-								closeOnEscape: true,
-								title:  t('contacts', 'Edit name'),
-								height: 'auto', width: 'auto',
-								buttons: {
-									'Ok':function() {
-										Contacts.UI.Card.saveName(this);
-										$(this).dialog('close');
-									},
-									'Cancel':function() { $(this).dialog('close'); }
-								},
-								close: function(event, ui) {
-									$(this).dialog('destroy').remove();
-									$('#name_dialog').remove();
-								},
-								open: function(event, ui) {
-									// load 'N' property - maybe :-P
-								}
-							});
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-			},
-			saveName:function(dlg){
-				//console.log('saveName, id: ' + this.id);
-				var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
-				this.famname = n[0];
-				this.givname = n[1];
-				this.addname = n[2];
-				this.honpre = n[3];
-				this.honsuf = n[4];
-				this.fullname = '';
-
-				$('#n').val(n.join(';'));
-				if(n[3].length > 0) {
-					this.fullname = n[3] + ' ';
-				}
-				this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
-				if(n[4].length > 0) {
-					this.fullname += ', ' + n[4];
-				}
-
-				$('#fn_select option').remove();
-				//$('#fn_select').combobox('value', this.fn);
-				var tmp = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
-				var names = new Array();
-				for(var name in tmp) {
-					if(names.indexOf(tmp[name]) == -1) {
-						names.push(tmp[name]);
-					}
-				}
-				$.each(names, function(key, value) {
-					$('#fn_select')
-						.append($('<option></option>')
-						.text(value));
-				});
-
-				if(this.id == '') {
-					var aid = $(dlg).find('#aid').val();
-					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
-				} else {
-					Contacts.UI.Card.saveProperty($('#n'));
-				}
-			},
-			loadAddresses:function(){
-				$('#addresses').hide();
-				$('#addressdisplay dl.propertycontainer').remove();
-				var addresscontainer = $('#addressdisplay');
-				for(var adr in this.data.ADR) {
-					addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
-					addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
-					addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
-					var adrarray = this.data.ADR[adr]['value'];
-					var adrtxt = '';
-					if(adrarray[0] && adrarray[0].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
-					}
-					if(adrarray[1] && adrarray[1].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
-					}
-					if(adrarray[2] && adrarray[2].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
-					}
-					if((3 in adrarray && 5 in adrarray) && adrarray[3].length > 0 || adrarray[5].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
-					}
-					if(adrarray[4] && adrarray[4].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
-					}
-					if(adrarray[6] && adrarray[6].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
-					}
-					addresscontainer.find('dl').last().find('.addresslist').html(adrtxt);
-					var types = new Array();
-					var ttypes = new Array();
-					for(var param in this.data.ADR[adr]['parameters']) {
-						if(param.toUpperCase() == 'TYPE') {
-							types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
-							ttypes.push(this.data.ADR[adr]['parameters'][param]);
-						}
-					}
-					addresscontainer.find('dl').last().find('.adr_type_label').text(types.join('/'));
-					addresscontainer.find('dl').last().find('.adr_type').val(ttypes.join(','));
-					addresscontainer.find('dl').last().find('.adr').val(adrarray.join(';'));
-					addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
-				}
-				if(addresscontainer.find('dl').length > 1) {
-					$('#addresses').show();
-					$('#contact_communication').show();
-				}
-				return false;
-			},
-			editAddress:function(obj, isnew){
-				var container = undefined;
-				var params = {id: this.id};
-				if(obj === 'new') {
-					isnew = true;
-					$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show();
-					container = $('#addressdisplay dl').last();
-					container.removeClass('template').addClass('propertycontainer');
-				} else {
-					params['checksum'] = Contacts.UI.checksumFor(obj);
-				}
-				/* Initialize the address edit dialog */
-				if($('#edit_address_dialog').dialog('isOpen') == true){
-					$('#edit_address_dialog').dialog('moveToTop');
-				}else{
-					$.getJSON(OC.filePath('contacts', 'ajax', 'editaddress.php'),params,function(jsondata){
-						if(jsondata.status == 'success'){
-							$('body').append('<div id="address_dialog"></div>');
-							$('#address_dialog').html(jsondata.data.page).find('#edit_address_dialog' ).dialog({
-								height: 'auto', width: 'auto',
-								buttons: {
-									'Ok':function() {
-										if(isnew) {
-											Contacts.UI.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
-										} else {
-											Contacts.UI.Card.saveAddress(this, obj, isnew);
-										}
-										$(this).dialog('close');
-									},
-									'Cancel':function() {
-										$(this).dialog('close');
-										if(isnew) {
-											container.remove();
-										}
-									}
-								},
-								close : function(event, ui) {
-									$(this).dialog('destroy').remove();
-									$('#address_dialog').remove();
-								},
-								open : function(event, ui) {
-									$( "#adr_city" ).autocomplete({
-										source: function( request, response ) {
-											$.ajax({
-												url: "http://ws.geonames.org/searchJSON",
-												dataType: "jsonp",
-												data: {
-													featureClass: "P",
-													style: "full",
-													maxRows: 12,
-													lang: lang,
-													name_startsWith: request.term
-												},
-												success: function( data ) {
-													response( $.map( data.geonames, function( item ) {
-														return {
-															label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
-															value: item.name,
-															country: item.countryName
-														}
-													}));
-												}
-											});
-										},
-										minLength: 2,
-										select: function( event, ui ) {
-											if(ui.item && $('#adr_country').val().trim().length == 0) {
-												$('#adr_country').val(ui.item.country);
-											}
-										},
-										open: function() {
-											$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-										},
-										close: function() {
-											$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
-										}
-									});
-									$('#adr_country').autocomplete({
-										source: function( request, response ) {
-											$.ajax({
-												url: "http://ws.geonames.org/searchJSON",
-												dataType: "jsonp",
-												data: {
-													/*featureClass: "A",*/
-													featureCode: "PCLI",
-													/*countryBias: "true",*/
-													/*style: "full",*/
-													lang: lang,
-													maxRows: 12,
-													name_startsWith: request.term
-												},
-												success: function( data ) {
-													response( $.map( data.geonames, function( item ) {
-														return {
-															label: item.name,
-															value: item.name
-														}
-													}));
-												}
-											});
-										},
-										minLength: 2,
-										select: function( event, ui ) {
-											/*if(ui.item) {
-												$('#adr_country').val(ui.item.country);
-											}
-											log( ui.item ?
-												"Selected: " + ui.item.label :
-												"Nothing selected, input was " + this.value);*/
-										},
-										open: function() {
-											$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-										},
-										close: function() {
-											$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
-										}
-									});
-								}
-							});
-						} else {
-							alert(jsondata.data.message);
-						}
-					});
-				}
-			},
-			saveAddress:function(dlg, obj, isnew){
-				if(isnew) {
-					container = $('#addressdisplay dl').last();
-					obj = container.find('input').first();
-				} else {
-					checksum = Contacts.UI.checksumFor(obj);
-					container = Contacts.UI.propertyContainerFor(obj);
-				}
-				var adr = new Array(
-					$(dlg).find('#adr_pobox').val().strip_tags(),
-					$(dlg).find('#adr_extended').val().strip_tags(),
-					$(dlg).find('#adr_street').val().strip_tags(),
-					$(dlg).find('#adr_city').val().strip_tags(),
-					$(dlg).find('#adr_region').val().strip_tags(),
-					$(dlg).find('#adr_zipcode').val().strip_tags(),
-					$(dlg).find('#adr_country').val().strip_tags()
-				);
-				container.find('.adr').val(adr.join(';'));
-				container.find('.adr_type').val($(dlg).find('#adr_type').val());
-				container.find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
-				Contacts.UI.Card.saveProperty($(container).find('input').first());
-				var adrtxt = '';
-				if(adr[0].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
-				}
-				if(adr[1].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
-				}
-				if(adr[2].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
-				}
-				if(adr[3].length > 0 || adr[5].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
-				}
-				if(adr[4].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
-				}
-				if(adr[6].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
-				}
-				container.find('.addresslist').html(adrtxt);
-			},
-			uploadPhoto:function(filelist) {
-				if(!filelist) {
-					OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
-					return;
-				}
-				var file = filelist[0];
-				var target = $('#file_upload_target');
-				var form = $('#file_upload_form');
-				var totalSize=0;
-				if(file.size > $('#max_upload').val()){
-					OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts', 'Error'));
-					return;
-				} else {
-					target.load(function(){
-						var response=jQuery.parseJSON(target.contents().text());
-						if(response != undefined && response.status == 'success'){
-							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
-							//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
-						}else{
-							OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-						}
-					});
-					form.submit();
-				}
-			},
-			loadPhotoHandlers:function() {
-				var phototools = $('#phototools');
-				phototools.find('li a').tipsy('hide');
-				phototools.find('li a').tipsy();
-				if(this.data.PHOTO) {
-					phototools.find('.delete').click(function() {
-						$(this).tipsy('hide');
-						Contacts.UI.Card.deleteProperty($('#contacts_details_photo'), 'single');
-						$(this).hide();
-					});
-					phototools.find('.edit').click(function() {
-						$(this).tipsy('hide');
-						Contacts.UI.Card.editCurrentPhoto();
-					});
-					phototools.find('.delete').show();
-					phototools.find('.edit').show();
-				} else {
-					phototools.find('.delete').hide();
-					phototools.find('.edit').hide();
-				}
-			},
-			cloudPhotoSelected:function(path){
-				$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-						$('#edit_photo_dialog_img').html(jsondata.data.page);
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			},
-			loadPhoto:function(refresh){
-				var self = this;
-				var refreshstr = (refresh?'&refresh=1'+Math.random():'')
-				$('#phototools li a').tipsy('hide');
-				var wrapper = $('#contacts_details_photo_wrapper');
-				wrapper.addClass('loading').addClass('wait');
-				delete this.photo;
-				this.photo = new Image();
-				$(this.photo).load(function () {
-					$('img.contacts_details_photo').remove()
-					$(this).addClass('contacts_details_photo');
-					wrapper.removeClass('loading').removeClass('wait');
-					$(this).insertAfter($('#phototools')).fadeIn();
-				}).error(function () {
-					// notify the user that the image could not be loaded
-					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
-				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
-				this.loadPhotoHandlers()
-			},
-			editCurrentPhoto:function(){
-				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-						$('#edit_photo_dialog_img').html(jsondata.data.page);
-					}
-					else{
-						wrapper.removeClass('wait');
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			},
-			editPhoto:function(id, tmpkey){
-				//alert('editPhoto: ' + tmpkey);
-				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						$('#edit_photo_dialog_img').html(jsondata.data.page);
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-				if($('#edit_photo_dialog').dialog('isOpen') == true){
-					$('#edit_photo_dialog').dialog('moveToTop');
-				} else {
-					$('#edit_photo_dialog').dialog('open');
-				}
-			},
-			savePhoto:function(){
-				var target = $('#crop_target');
-				var form = $('#cropform');
-				var wrapper = $('#contacts_details_photo_wrapper');
-				var self = this;
-				wrapper.addClass('wait');
-				form.submit();
-				target.load(function(){
-					var response=jQuery.parseJSON(target.contents().text());
-					if(response != undefined && response.status == 'success'){
-						// load cropped photo.
-						self.loadPhoto(true);
-						Contacts.UI.Card.data.PHOTO = true;
-					}else{
-						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-						wrapper.removeClass('wait');
-					}
-				});
-				Contacts.UI.Contacts.refreshThumbnail(this.id);
-			},
-			addMail:function() {
-				//alert('addMail');
-				var emaillist = $('#emaillist');
-				emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
-				emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
-				emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-				emaillist.find('li:last-child').find('input[type="email"]').focus();
-				return false;
-			},
-			loadMails:function() {
-				$('#emails').hide();
-				$('#emaillist li.propertycontainer').remove();
-				for(var mail in this.data.EMAIL) {
-					this.addMail();
-					//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
-					$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
-					$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
-					for(var param in this.data.EMAIL[mail]['parameters']) {
-						if(param.toUpperCase() == 'PREF') {
-							$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
-						}
-						else if(param.toUpperCase() == 'TYPE') {
-							for(etype in this.data.EMAIL[mail]['parameters'][param]) {
-								var et = this.data.EMAIL[mail]['parameters'][param][etype];
-								$('#emaillist li:last-child').find('select option').each(function(){
-									if($.inArray($(this).val().toUpperCase(), et.toUpperCase().split(',')) > -1) {
-										$(this).attr('selected', 'selected');
-									}
-								});
-							}
-						}
-					}
-				}
-				if($('#emaillist li').length > 1) {
-					$('#emails').show();
-					$('#contact_communication').show();
-				}
-
-				$('#emaillist li:last-child').find('input[type="text"]').focus();
-				return false;
-			},
-			addPhone:function() {
-				var phonelist = $('#phonelist');
-				phonelist.find('li.template:first-child').clone(true).appendTo(phonelist); //.show();
-				phonelist.find('li.template:last-child').find('select').addClass('contacts_property');
-				phonelist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-				phonelist.find('li:last-child').find('input[type="text"]').focus();
-				phonelist.find('li:last-child').find('select').multiselect({
-														noneSelectedText: t('contacts', 'Select type'),
-														header: false,
-														selectedList: 4,
-														classes: 'typelist'
-													});
-				phonelist.find('li:last-child').show();
-				return false;
-			},
-			loadPhones:function() {
-				$('#phones').hide();
-				$('#phonelist li.propertycontainer').remove();
-				var phonelist = $('#phonelist');
-				for(var phone in this.data.TEL) {
-					this.addPhone();
-					phonelist.find('li:last-child').find('select').multiselect('destroy');
-					phonelist.find('li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
-					phonelist.find('li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
-					for(var param in this.data.TEL[phone]['parameters']) {
-						if(param.toUpperCase() == 'PREF') {
-							phonelist.find('li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
-						}
-						else if(param.toUpperCase() == 'TYPE') {
-							for(ptype in this.data.TEL[phone]['parameters'][param]) {
-								var pt = this.data.TEL[phone]['parameters'][param][ptype];
-								phonelist.find('li:last-child').find('select option').each(function(){
-									//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
-									if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
-										$(this).attr('selected', 'selected');
-									}
-								});
-							}
-						}
-					}
-					phonelist.find('li:last-child').find('select').multiselect({
-											noneSelectedText: t('contacts', 'Select type'),
-											header: false,
-											selectedList: 4,
-											classes: 'typelist'
-										});
-				}
-				if(phonelist.find('li').length > 1) {
-					$('#phones').show();
-					$('#contact_communication').show();
-				}
-				return false;
-			},
+			}
 		},
-		Contacts:{
-			contacts:{},
-			deletionQueue:[],
-			batchnum:50,
-			warnNotDeleted:function(e) {
-				e = e || window.event;
-				var warn = t('contacts', 'Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted.');
-				if (e) {
-					e.returnValue = String(warn);
-				}
-				if(Contacts.UI.Contacts.deletionQueue.length > 0) {
-					setTimeout(Contacts.UI.Contacts.deleteFilesInQueue, 1);
-				}
-				return warn;
-			},
-			deleteFilesInQueue:function() {
-				var queue = Contacts.UI.Contacts.deletionQueue;
-				if(queue.length > 0) {
-					Contacts.UI.notify({cancel:true});
-					while(queue.length > 0) {
-						var id = queue.pop();
-						if(id) {
-							Contacts.UI.Card.doDelete(id, false);
-						}
+		addProperty:function(type) {
+			switch (type) {
+				case 'NOTE':
+					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
+					$('#note').find('textarea').expandingTextarea().show().focus();
+					break;
+				case 'EMAIL':
+					if($('#emaillist>li').length == 1) {
+						$('#emails').show();
 					}
-				}
-			},
-			getContact:function(id) {
-				if(!this.contacts[id]) {
-					this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
-						if(!this.contacts[id]) {
-							self = this;
-							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
-								if(jsondata.status == 'success'){
-									self.contacts[id] = self.insertContact({data:jsondata.data});
-								}
-								else{
-									OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-								}
-							});
-						}
-				}
-				return this.contacts[id];
-			},
-			drop:function(event, ui) {
-				var dragitem = ui.draggable, droptarget = $(this);
-				if(dragitem.is('li')) {
-					Contacts.UI.Contacts.dropContact(event, dragitem, droptarget);
-				} else {
-					Contacts.UI.Contacts.dropAddressbook(event, dragitem, droptarget);
-				}
-			},
-			dropContact:function(event, dragitem, droptarget) {
-				if(dragitem.data('bookid') == droptarget.data('id')) {
-					return false;
-				}
-				var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
-				$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
-					function(jsondata){
-						if(jsondata.status == 'success'){
-							dragitem.attr('data-bookid', droptarget.data('id'))
-							dragitem.data('bookid', droptarget.data('id'));
-							Contacts.UI.Contacts.insertContact({
-								contactlist:droplist,
-								contact:dragitem.detach()
-							});
-							Contacts.UI.Contacts.scrollTo(dragitem.data('id'));
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-				});
-			},
-			dropAddressbook:function(event, dragitem, droptarget) {
-				alert('Dropping address books not implemented yet');
-			},
-			/**
-			 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
-			 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
-			 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
-			 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
-			 */
-			insertContact:function(params) {
-				var id, bookid;
-				if(!params.contactlist) {
-					// FIXME: Check if contact really exists.
-					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-					id = params.data ? params.data.id : params.contact.data('id');
-					params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
-				}
-				if(!params.contacts) {
-					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-					id = params.data ? params.data.id : params.contact.data('id');
-					params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
-				}
-				var contact = params.data
-					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'+params.data.displayname+'</a></li>')
-					: params.contact;
-				var added = false;
-				var name = params.data ? params.data.displayname.toLowerCase() : contact.find('a').text().toLowerCase();
-				if(params.contacts) {
-					params.contacts.each(function() {
-						if ($(this).text().toLowerCase() > name) {
-							$(this).before(contact);
-							added = true;
-							return false;
-						}
-					});
-				}
-				if(!added || !params.contacts) {
-					params.contactlist.append(contact);
-				}
-				//this.contacts[id] = contact;
-				return contact;
-			},
-			doImport:function(file, aid){
-				$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
-					function(jsondata){
-						if(jsondata.status != 'success'){
-							Contacts.UI.notify({message:jsondata.data.message});
-						}
-				});
-				return false;
-			},
-			next:function(reverse) {
-				// TODO: Check if we're last-child/first-child and jump to next/prev address book.
-				var curlistitem = $('#contacts li[data-id="'+Contacts.UI.Card.id+'"]');
-				var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
-				if(newlistitem) {
-					curlistitem.removeClass('active');
-					Contacts.UI.Card.update({
-						cid:newlistitem.data('id'),
-						aid:newlistitem.data('bookid')
-					});
-				}
-			},
-			previous:function() {
-				this.next(true);
-			},
-			// Reload the contacts list.
-			update:function(params){
-				if(!params) { params = {}; }
-				if(!params.start) {
-					if(params.aid) {
-						$('#contacts h3[data-id="'+params.aid+'"],#contacts ul[data-id="'+params.aid+'"]').remove();
-					} else {
-						$('#contacts').empty();
+					OC.Contacts.Card.addMail();
+					break;
+				case 'TEL':
+					if($('#phonelist>li').length == 1) {
+						$('#phones').show();
 					}
-				}
-				self = this;
-				console.log('update: ' + params.cid + ' ' + params.aid + ' ' + params.start);
-				var firstrun = false;
-				var opts = {};
-				opts['startat'] = (params.start?params.start:0);
-				if(params.aid) {
-					opts['aid'] = params.aid;
-				}
-				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
+					OC.Contacts.Card.addPhone();
+					break;
+				case 'ADR':
+					if($('#addressdisplay>dl').length == 1) {
+						$('#addresses').show();
+					}
+					OC.Contacts.Card.editAddress('new', true);
+					break;
+				case 'NICKNAME':
+				case 'URL':
+				case 'ORG':
+				case 'BDAY':
+				case 'CATEGORIES':
+					$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
+					$('dd[data-element="'+type+'"]').find('input').focus();
+					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
+					break;
+			}
+		},
+		deleteProperty:function(obj, type) {
+			console.log('deleteProperty');
+			OC.Contacts.loading(obj, true);
+			var checksum = OC.Contacts.checksumFor(obj);
+			if(checksum) {
+				$.post(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
 					if(jsondata.status == 'success'){
-						var books = jsondata.data.entries;
-						$.each(books, function(b, book) {
-							if($('#contacts h3[data-id="'+b+'"]').length == 0) {
-								firstrun = true;
-								if($('#contacts h3').length == 0) {
-									$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
-								} else {
-									if(!$('#contacts h3[data-id="'+b+'"]').length) {
-										var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
-										var added = false;
-										$('#contacts h3').each(function(){
-											if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
-												$(this).before(item).fadeIn('fast');
-												added = true;
-												return false;
-											}
-										});
-										if(!added) {
-											$('#contacts').append(item);
-										}
-
-									}
+						if(type == 'list') {
+							OC.Contacts.propertyContainerFor(obj).remove();
+						} else if(type == 'single') {
+							var proptype = OC.Contacts.propertyTypeFor(obj);
+							OC.Contacts.Card.data[proptype] = null;
+							var othertypes = ['NOTE', 'PHOTO'];
+							if(othertypes.indexOf(proptype) != -1) {
+								OC.Contacts.propertyContainerFor(obj).data('checksum', '');
+								if(proptype == 'PHOTO') {
+									OC.Contacts.Contacts.refreshThumbnail(OC.Contacts.Card.id);
+									OC.Contacts.Card.loadPhoto(true);
+								} else if(proptype == 'NOTE') {
+									$('#note').find('textarea').val('');
+									OC.Contacts.propertyContainerFor(obj).hide();
 								}
-								$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
-									$('#contacts h3').removeClass('active');
-									$(this).addClass('active');
-									$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
-									return false;
-								});
-								var accept = 'li:not([data-bookid="'+b+'"]),h3:not([data-id="'+b+'"])';
-								$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
-									drop: Contacts.UI.Contacts.drop,
-									activeClass: 'ui-state-hover',
-									accept: accept
-								});
+							} else {
+								$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+								$('dl dd[data-element="'+proptype+'"]').data('checksum', '').find('input').val('');
 							}
-							var contactlist = $('#contacts ul[data-id="'+b+'"]');
-							var contacts = $('#contacts ul[data-id="'+b+'"] li');
-							for(var c in book.contacts) {
-								if(book.contacts[c].id == undefined) { continue; }
-								if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
-									var contact = Contacts.UI.Contacts.insertContact({contactlist:contactlist, contacts:contacts, data:book.contacts[c]});
-									if(c == self.batchnum-10) {
-										contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-											$(this).unbind(event);
-											var bookid = $(this).data('bookid');
-											var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
-											if (isInView && numsiblings >= self.batchnum) {
-												console.log('This would be a good time to load more contacts.');
-												Contacts.UI.Contacts.update({cid:params.cid, aid:bookid, start:$('#contacts li[data-bookid="'+bookid+'"]').length});
-											}
-										});
-									}
-								}
+							$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
+							OC.Contacts.loading(obj, false);
+						} else {
+							OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
+							OC.Contacts.loading(obj, false);
+						}
+					}
+					else{
+						OC.Contacts.loading(obj, false);
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			} else { // Property hasn't been saved so there's nothing to delete.
+				if(type == 'list') {
+					OC.Contacts.propertyContainerFor(obj).remove();
+				} else if(type == 'single') {
+					var proptype = OC.Contacts.propertyTypeFor(obj);
+					$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+					$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
+					OC.Contacts.loading(obj, false);
+				} else {
+					OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
+				}
+			}
+		},
+		editName:function() {
+			var params = {id: this.id};
+			/* Initialize the name edit dialog */
+			if($('#edit_name_dialog').dialog('isOpen') == true) {
+				$('#edit_name_dialog').dialog('moveToTop');
+			} else {
+				$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata) {
+					if(jsondata.status == 'success') {
+						$('body').append('<div id="name_dialog"></div>');
+						$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
+							modal: true,
+							closeOnEscape: true,
+							title:  t('contacts', 'Edit name'),
+							height: 'auto', width: 'auto',
+							buttons: {
+								'Ok':function() {
+									OC.Contacts.Card.saveName(this);
+									$(this).dialog('close');
+								},
+								'Cancel':function() { $(this).dialog('close'); }
+							},
+							close: function(event, ui) {
+								$(this).dialog('destroy').remove();
+								$('#name_dialog').remove();
+							},
+							open: function(event, ui) {
+								// load 'N' property - maybe :-P
 							}
 						});
-						if($('#contacts h3').length > 1) {
-							$('#contacts li,#contacts h3').draggable({
-								distance: 10,
-								revert: 'invalid',
-								axis: 'y', containment: '#contacts',
-								scroll: true, scrollSensitivity: 40,
-								opacity: 0.7, helper: 'clone'
-							});
-						} else {
-							$('#contacts h3').first().addClass('active');
-						}
-						if(opts['startat'] == 0) { // only update card on first load.
-							Contacts.UI.Card.update(params);
-						}
-					}
-					else{
+					} else {
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-			},
-			refreshThumbnail:function(id){
-				var item = $('.contacts li[data-id="'+id+'"]').find('a');
-				item.html(Contacts.UI.Card.fn);
-				item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
-			},
-			scrollTo:function(id){
-				var item = $('#contacts li[data-id="'+id+'"]');
-				if(item && $.isNumeric(item.offset().top)) {
-					console.log('scrollTo ' + parseInt(item.offset().top));
-					$('#contacts').animate({
-						scrollTop: parseInt(item.offset()).top-40}, 'slow','swing');
+			}
+		},
+		saveName:function(dlg) {
+			//console.log('saveName, id: ' + this.id);
+			var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
+			this.famname = n[0];
+			this.givname = n[1];
+			this.addname = n[2];
+			this.honpre = n[3];
+			this.honsuf = n[4];
+			this.fullname = '';
+
+			$('#n').val(n.join(';'));
+			if(n[3].length > 0) {
+				this.fullname = n[3] + ' ';
+			}
+			this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
+			if(n[4].length > 0) {
+				this.fullname += ', ' + n[4];
+			}
+
+			$('#fn_select option').remove();
+			//$('#fn_select').combobox('value', this.fn);
+			var tmp = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
+			var names = new Array();
+			for(var name in tmp) {
+				if(names.indexOf(tmp[name]) == -1) {
+					names.push(tmp[name]);
 				}
 			}
+			$.each(names, function(key, value) {
+				$('#fn_select')
+				.append($('<option></option>')
+				.text(value));
+			});
+
+			if(this.id == '') {
+				var aid = $(dlg).find('#aid').val();
+				OC.Contacts.Card.add(n.join(';'), $('#short').text(), aid);
+			} else {
+				OC.Contacts.Card.saveProperty($('#n'));
+			}
+		},
+		loadAddresses:function() {
+			$('#addresses').hide();
+			$('#addressdisplay dl.propertycontainer').remove();
+			var addresscontainer = $('#addressdisplay');
+			for(var adr in this.data.ADR) {
+				addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+				addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
+				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+				var adrarray = this.data.ADR[adr]['value'];
+				var adrtxt = '';
+				if(adrarray[0] && adrarray[0].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
+				}
+				if(adrarray[1] && adrarray[1].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
+				}
+				if(adrarray[2] && adrarray[2].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
+				}
+				if((3 in adrarray && 5 in adrarray) && adrarray[3].length > 0 || adrarray[5].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
+				}
+				if(adrarray[4] && adrarray[4].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
+				}
+				if(adrarray[6] && adrarray[6].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
+				}
+				addresscontainer.find('dl').last().find('.addresslist').html(adrtxt);
+				var types = new Array();
+				var ttypes = new Array();
+				for(var param in this.data.ADR[adr]['parameters']) {
+					if(param.toUpperCase() == 'TYPE') {
+						types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
+						ttypes.push(this.data.ADR[adr]['parameters'][param]);
+					}
+				}
+				addresscontainer.find('dl').last().find('.adr_type_label').text(types.join('/'));
+				addresscontainer.find('dl').last().find('.adr_type').val(ttypes.join(','));
+				addresscontainer.find('dl').last().find('.adr').val(adrarray.join(';'));
+				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+			}
+			if(addresscontainer.find('dl').length > 1) {
+				$('#addresses').show();
+				$('#contact_communication').show();
+			}
+			return false;
+		},
+		editAddress:function(obj, isnew){
+			var container = undefined;
+			var params = {id: this.id};
+			if(obj === 'new') {
+				isnew = true;
+				$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show();
+				container = $('#addressdisplay dl').last();
+				container.removeClass('template').addClass('propertycontainer');
+			} else {
+				params['checksum'] = OC.Contacts.checksumFor(obj);
+			}
+			/* Initialize the address edit dialog */
+			if($('#edit_address_dialog').dialog('isOpen') == true){
+				$('#edit_address_dialog').dialog('moveToTop');
+			}else{
+				$.getJSON(OC.filePath('contacts', 'ajax', 'editaddress.php'),params,function(jsondata){
+					if(jsondata.status == 'success'){
+						$('body').append('<div id="address_dialog"></div>');
+						$('#address_dialog').html(jsondata.data.page).find('#edit_address_dialog' ).dialog({
+							height: 'auto', width: 'auto',
+							buttons: {
+								'Ok':function() {
+									if(isnew) {
+										OC.Contacts.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
+									} else {
+										OC.Contacts.Card.saveAddress(this, obj, isnew);
+									}
+									$(this).dialog('close');
+								},
+								'Cancel':function() {
+									$(this).dialog('close');
+									if(isnew) {
+										container.remove();
+									}
+								}
+							},
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+								$('#address_dialog').remove();
+							},
+							open : function(event, ui) {
+								$( "#adr_city" ).autocomplete({
+									source: function( request, response ) {
+										$.ajax({
+											url: "http://ws.geonames.org/searchJSON",
+											dataType: "jsonp",
+											data: {
+												featureClass: "P",
+												style: "full",
+												maxRows: 12,
+												lang: lang,
+												name_startsWith: request.term
+											},
+											success: function( data ) {
+												response( $.map( data.geonames, function( item ) {
+													return {
+														label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
+														value: item.name,
+														country: item.countryName
+													}
+												}));
+											}
+										});
+									},
+									minLength: 2,
+									select: function( event, ui ) {
+										if(ui.item && $('#adr_country').val().trim().length == 0) {
+											$('#adr_country').val(ui.item.country);
+										}
+									},
+									open: function() {
+										$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+									},
+									close: function() {
+										$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+									}
+								});
+								$('#adr_country').autocomplete({
+									source: function( request, response ) {
+										$.ajax({
+											url: "http://ws.geonames.org/searchJSON",
+											dataType: "jsonp",
+											data: {
+												/*featureClass: "A",*/
+												featureCode: "PCLI",
+												/*countryBias: "true",*/
+												/*style: "full",*/
+												lang: lang,
+												maxRows: 12,
+												name_startsWith: request.term
+											},
+											success: function( data ) {
+												response( $.map( data.geonames, function( item ) {
+													return {
+														label: item.name,
+														value: item.name
+													}
+												}));
+											}
+										});
+									},
+									minLength: 2,
+									select: function( event, ui ) {
+										/*if(ui.item) {
+											$('#adr_country').val(ui.item.country);
+										}
+										log( ui.item ?
+											"Selected: " + ui.item.label :
+											"Nothing selected, input was " + this.value);*/
+									},
+									open: function() {
+										$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+									},
+									close: function() {
+										$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+									}
+								});
+							}
+						});
+					} else {
+						alert(jsondata.data.message);
+					}
+				});
+			}
+		},
+		saveAddress:function(dlg, obj, isnew){
+			if(isnew) {
+				container = $('#addressdisplay dl').last();
+				obj = container.find('input').first();
+			} else {
+				checksum = OC.Contacts.checksumFor(obj);
+				container = OC.Contacts.propertyContainerFor(obj);
+			}
+			var adr = new Array(
+				$(dlg).find('#adr_pobox').val().strip_tags(),
+				$(dlg).find('#adr_extended').val().strip_tags(),
+				$(dlg).find('#adr_street').val().strip_tags(),
+				$(dlg).find('#adr_city').val().strip_tags(),
+				$(dlg).find('#adr_region').val().strip_tags(),
+				$(dlg).find('#adr_zipcode').val().strip_tags(),
+				$(dlg).find('#adr_country').val().strip_tags()
+			);
+			container.find('.adr').val(adr.join(';'));
+			container.find('.adr_type').val($(dlg).find('#adr_type').val());
+			container.find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
+			OC.Contacts.Card.saveProperty($(container).find('input').first());
+			var adrtxt = '';
+			if(adr[0].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
+			}
+			if(adr[1].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
+			}
+			if(adr[2].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
+			}
+			if(adr[3].length > 0 || adr[5].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
+			}
+			if(adr[4].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
+			}
+			if(adr[6].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
+			}
+			container.find('.addresslist').html(adrtxt);
+		},
+		uploadPhoto:function(filelist) {
+			if(!filelist) {
+				OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
+				return;
+			}
+			var file = filelist[0];
+			var target = $('#file_upload_target');
+			var form = $('#file_upload_form');
+			var totalSize=0;
+			if(file.size > $('#max_upload').val()){
+				OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts', 'Error'));
+				return;
+			} else {
+				target.load(function(){
+				var response=jQuery.parseJSON(target.contents().text());
+					if(response != undefined && response.status == 'success'){
+						OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
+						//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
+					}else{
+						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
+					}
+				});
+				form.submit();
+			}
+		},
+		loadPhotoHandlers:function() {
+			var phototools = $('#phototools');
+			phototools.find('li a').tipsy('hide');
+			phototools.find('li a').tipsy();
+			if(this.data.PHOTO) {
+				phototools.find('.delete').click(function() {
+					$(this).tipsy('hide');
+					OC.Contacts.Card.deleteProperty($('#contacts_details_photo'), 'single');
+					$(this).hide();
+				});
+				phototools.find('.edit').click(function() {
+					$(this).tipsy('hide');
+					OC.Contacts.Card.editCurrentPhoto();
+				});
+				phototools.find('.delete').show();
+				phototools.find('.edit').show();
+			} else {
+				phototools.find('.delete').hide();
+				phototools.find('.edit').hide();
+			}
+		},
+		cloudPhotoSelected:function(path){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':OC.Contacts.Card.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					OC.Contacts.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
+				}
+				else{
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+			});
+		},
+		loadPhoto:function(refresh){
+			var self = this;
+			var refreshstr = (refresh?'&refresh=1'+Math.random():'')
+			$('#phototools li a').tipsy('hide');
+			var wrapper = $('#contacts_details_photo_wrapper');
+			wrapper.addClass('loading').addClass('wait');
+			delete this.photo;
+			this.photo = new Image();
+			$(this.photo).load(function () {
+				$('img.contacts_details_photo').remove()
+				$(this).addClass('contacts_details_photo');
+				wrapper.removeClass('loading').removeClass('wait');
+				$(this).insertAfter($('#phototools')).fadeIn();
+			}).error(function () {
+				// notify the user that the image could not be loaded
+				OC.Contacts.notify({message:t('contacts','Error loading profile picture.')});
+			}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
+			this.loadPhotoHandlers()
+		},
+		editCurrentPhoto:function(){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					OC.Contacts.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
+				}
+				else{
+					wrapper.removeClass('wait');
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+			});
+		},
+		editPhoto:function(id, tmpkey){
+			//alert('editPhoto: ' + tmpkey);
+			$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
+				}
+				else{
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+			});
+			if($('#edit_photo_dialog').dialog('isOpen') == true){
+				$('#edit_photo_dialog').dialog('moveToTop');
+			} else {
+				$('#edit_photo_dialog').dialog('open');
+			}
+		},
+		savePhoto:function(){
+			var target = $('#crop_target');
+			var form = $('#cropform');
+			var wrapper = $('#contacts_details_photo_wrapper');
+			var self = this;
+			wrapper.addClass('wait');
+			form.submit();
+			target.load(function(){
+				var response=jQuery.parseJSON(target.contents().text());
+				if(response != undefined && response.status == 'success'){
+					// load cropped photo.
+					self.loadPhoto(true);
+					OC.Contacts.Card.data.PHOTO = true;
+				}else{
+					OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
+					wrapper.removeClass('wait');
+				}
+			});
+			OC.Contacts.Contacts.refreshThumbnail(this.id);
+		},
+		addMail:function() {
+			//alert('addMail');
+			var emaillist = $('#emaillist');
+			emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
+			emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
+			emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+			emaillist.find('li:last-child').find('input[type="email"]').focus();
+			return false;
+		},
+		loadMails:function() {
+			$('#emails').hide();
+			$('#emaillist li.propertycontainer').remove();
+			for(var mail in this.data.EMAIL) {
+				this.addMail();
+				//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
+				$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
+				$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
+				for(var param in this.data.EMAIL[mail]['parameters']) {
+					if(param.toUpperCase() == 'PREF') {
+						$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
+					}
+					else if(param.toUpperCase() == 'TYPE') {
+						for(etype in this.data.EMAIL[mail]['parameters'][param]) {
+							var et = this.data.EMAIL[mail]['parameters'][param][etype];
+							$('#emaillist li:last-child').find('select option').each(function(){
+								if($.inArray($(this).val().toUpperCase(), et.toUpperCase().split(',')) > -1) {
+									$(this).attr('selected', 'selected');
+								}
+							});
+						}
+					}
+				}
+			}
+			if($('#emaillist li').length > 1) {
+				$('#emails').show();
+				$('#contact_communication').show();
+			}
+			$('#emaillist li:last-child').find('input[type="text"]').focus();
+			return false;
+		},
+		addPhone:function() {
+			var phonelist = $('#phonelist');
+			phonelist.find('li.template:first-child').clone(true).appendTo(phonelist); //.show();
+			phonelist.find('li.template:last-child').find('select').addClass('contacts_property');
+			phonelist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+			phonelist.find('li:last-child').find('input[type="text"]').focus();
+			phonelist.find('li:last-child').find('select').multiselect({
+												noneSelectedText: t('contacts', 'Select type'),
+													header: false,
+													selectedList: 4,
+													classes: 'typelist'
+												});
+			phonelist.find('li:last-child').show();
+			return false;
+		},
+		loadPhones:function() {
+			$('#phones').hide();
+			$('#phonelist li.propertycontainer').remove();
+			var phonelist = $('#phonelist');
+			for(var phone in this.data.TEL) {
+				this.addPhone();
+				phonelist.find('li:last-child').find('select').multiselect('destroy');
+				phonelist.find('li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
+				phonelist.find('li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+				for(var param in this.data.TEL[phone]['parameters']) {
+					if(param.toUpperCase() == 'PREF') {
+						phonelist.find('li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+					}
+					else if(param.toUpperCase() == 'TYPE') {
+						for(ptype in this.data.TEL[phone]['parameters'][param]) {
+							var pt = this.data.TEL[phone]['parameters'][param][ptype];
+							phonelist.find('li:last-child').find('select option').each(function(){
+								//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
+								if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
+									$(this).attr('selected', 'selected');
+								}
+							});
+						}
+					}
+				}
+				phonelist.find('li:last-child').find('select').multiselect({
+										noneSelectedText: t('contacts', 'Select type'),
+										header: false,
+										selectedList: 4,
+										classes: 'typelist'
+									});
+			}
+			if(phonelist.find('li').length > 1) {
+				$('#phones').show();
+				$('#contact_communication').show();
+			}
+			return false;
+		},
+	},
+	Contacts:{
+		contacts:{},
+		deletionQueue:[],
+		batchnum:50,
+		warnNotDeleted:function(e) {
+			e = e || window.event;
+			var warn = t('contacts', 'Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted.');
+			if (e) {
+				e.returnValue = String(warn);
+			}
+			if(OC.Contacts.Contacts.deletionQueue.length > 0) {
+				setTimeout(OC.Contacts.Contacts.deleteFilesInQueue, 1);
+			}
+			return warn;
+		},
+		deleteFilesInQueue:function() {
+			var queue = OC.Contacts.Contacts.deletionQueue;
+			if(queue.length > 0) {
+				OC.Contacts.notify({cancel:true});
+				while(queue.length > 0) {
+					var id = queue.pop();
+					if(id) {
+						OC.Contacts.Card.doDelete(id, false);
+					}
+				}
+			}
+		},
+		getContact:function(id) {
+			if(!this.contacts[id]) {
+				this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
+					if(!this.contacts[id]) {
+						self = this;
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								self.contacts[id] = self.insertContact({data:jsondata.data});
+							}
+							else{
+								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+							}
+						});
+					}
+			}
+			return this.contacts[id];
+		},
+		drop:function(event, ui) {
+			var dragitem = ui.draggable, droptarget = $(this);
+			if(dragitem.is('li')) {
+				OC.Contacts.Contacts.dropContact(event, dragitem, droptarget);
+			} else {
+				OC.Contacts.Contacts.dropAddressbook(event, dragitem, droptarget);
+			}
+		},
+		dropContact:function(event, dragitem, droptarget) {
+			if(dragitem.data('bookid') == droptarget.data('id')) {
+				return false;
+			}
+			var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
+			$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
+				function(jsondata){
+					if(jsondata.status == 'success'){
+						dragitem.attr('data-bookid', droptarget.data('id'))
+						dragitem.data('bookid', droptarget.data('id'));
+						OC.Contacts.Contacts.insertContact({
+							contactlist:droplist,
+							contact:dragitem.detach()
+						});
+						OC.Contacts.Contacts.scrollTo(dragitem.data('id'));
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+			});
+		},
+		dropAddressbook:function(event, dragitem, droptarget) {
+			alert('Dropping address books not implemented yet');
+		},
+		/**
+		 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
+		 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
+		 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
+		 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
+		 */
+		insertContact:function(params) {
+			var id, bookid;
+			if(!params.contactlist) {
+				// FIXME: Check if contact really exists.
+				bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+				id = params.data ? params.data.id : params.contact.data('id');
+				params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
+			}
+			if(!params.contacts) {
+				bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+				id = params.data ? params.data.id : params.contact.data('id');
+				params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
+			}
+			var contact = params.data
+					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid
+						+ '" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='
+						+ params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')
+						+ '?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'
+						+ params.data.displayname+'</a></li>')
+					: params.contact;
+			var added = false;
+			var name = params.data ? params.data.displayname.toLowerCase() : contact.find('a').text().toLowerCase();
+			if(params.contacts) {
+				params.contacts.each(function() {
+					if ($(this).text().toLowerCase() > name) {
+						$(this).before(contact);
+						added = true;
+						return false;
+					}
+				});
+			}
+			if(!added || !params.contacts) {
+				params.contactlist.append(contact);
+			}
+			//this.contacts[id] = contact;
+			return contact;
+		},
+		doImport:function(file, aid){
+			$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
+				function(jsondata){
+					if(jsondata.status != 'success'){
+						OC.Contacts.notify({message:jsondata.data.message});
+					}
+			});
+			return false;
+		},
+		next:function(reverse) {
+			// TODO: Check if we're last-child/first-child and jump to next/prev address book.
+			var curlistitem = $('#contacts li[data-id="'+OC.Contacts.Card.id+'"]');
+			var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
+			if(newlistitem) {
+				curlistitem.removeClass('active');
+				OC.Contacts.Card.update({
+					cid:newlistitem.data('id'),
+					aid:newlistitem.data('bookid')
+				});
+			}
+		},
+		previous:function() {
+			this.next(true);
+		},
+		// Reload the contacts list.
+		update:function(params){
+			if(!params) { params = {}; }
+			if(!params.start) {
+				if(params.aid) {
+					$('#contacts h3[data-id="'+params.aid+'"],#contacts ul[data-id="'+params.aid+'"]').remove();
+				} else {
+					$('#contacts').empty();
+				}
+			}
+			self = this;
+			console.log('update: ' + params.cid + ' ' + params.aid + ' ' + params.start);
+			var firstrun = false;
+			var opts = {};
+			opts['startat'] = (params.start?params.start:0);
+			if(params.aid) {
+				opts['aid'] = params.aid;
+			}
+			$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
+				if(jsondata.status == 'success'){
+					var books = jsondata.data.entries;
+					$.each(books, function(b, book) {
+						if($('#contacts h3[data-id="'+b+'"]').length == 0) {
+							firstrun = true;
+							if($('#contacts h3').length == 0) {
+								$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'
+									+ b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
+							} else {
+								if(!$('#contacts h3[data-id="'+b+'"]').length) {
+									var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'
+										+ book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
+									var added = false;
+									$('#contacts h3').each(function(){
+										if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
+											$(this).before(item).fadeIn('fast');
+											added = true;
+											return false;
+										}
+									});
+									if(!added) {
+										$('#contacts').append(item);
+									}
+								}
+							}
+							$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
+								$('#contacts h3').removeClass('active');
+								$(this).addClass('active');
+								$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
+								return false;
+							});
+							var accept = 'li:not([data-bookid="'+b+'"]),h3:not([data-id="'+b+'"])';
+							$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
+								drop: OC.Contacts.Contacts.drop,
+								activeClass: 'ui-state-hover',
+								accept: accept
+							});
+						}
+						var contactlist = $('#contacts ul[data-id="'+b+'"]');
+						var contacts = $('#contacts ul[data-id="'+b+'"] li');
+						for(var c in book.contacts) {
+							if(book.contacts[c].id == undefined) { continue; }
+							if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
+								var contact = OC.Contacts.Contacts.insertContact({contactlist:contactlist, contacts:contacts, data:book.contacts[c]});
+								if(c == self.batchnum-10) {
+									contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+										$(this).unbind(event);
+										var bookid = $(this).data('bookid');
+										var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
+										if (isInView && numsiblings >= self.batchnum) {
+											console.log('This would be a good time to load more contacts.');
+											OC.Contacts.Contacts.update({cid:params.cid, aid:bookid, start:$('#contacts li[data-bookid="'+bookid+'"]').length});
+										}
+									});
+								}
+							}
+						}
+					});
+					if($('#contacts h3').length > 1) {
+						$('#contacts li,#contacts h3').draggable({
+							distance: 10,
+							revert: 'invalid',
+							axis: 'y', containment: '#contacts',
+							scroll: true, scrollSensitivity: 40,
+							opacity: 0.7, helper: 'clone'
+						});
+					} else {
+						$('#contacts h3').first().addClass('active');
+					}
+					if(opts['startat'] == 0) { // only update card on first load.
+						OC.Contacts.Card.update(params);
+					}
+				} else {
+					OC.Contacts.notify({message:t('contacts', 'Error')+': '+jsondata.data.message});
+				}
+			});
+		},
+		refreshThumbnail:function(id){
+			var item = $('.contacts li[data-id="'+id+'"]').find('a');
+			item.html(OC.Contacts.Card.fn);
+			item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
+		},
+		scrollTo:function(id){
+			var item = $('#contacts li[data-id="'+id+'"]');
+			if(item && $.isNumeric(item.offset().top)) {
+				console.log('scrollTo ' + parseInt(item.offset().top));
+				$('#contacts').animate({
+					scrollTop: parseInt(item.offset()).top-40}, 'slow','swing');
+			}
 		}
 	}
 }
 $(document).ready(function(){
 
-	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
+	OCCategories.changed = OC.Contacts.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	//$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
+	//$('#chooseaddressbook').on('click keydown', OC.Contacts.Addressbooks.overview);
 	$('#bottomcontrols .settings').on('click keydown', function() {
 		try {
 			OC.appSettings({appid:'contacts', loadJS:true, cache:false});
@@ -1656,7 +1646,7 @@ $(document).ready(function(){
 	$('#bottomcontrols .import').click(function() {
 		$('#import_upload_start').trigger('click');
 	});
-	$('#contacts_newcontact').on('click keydown', Contacts.UI.Card.editNew);
+	$('#contacts_newcontact').on('click keydown', OC.Contacts.Card.editNew);
 
 	var ninjahelp = $('#ninjahelp');
 
@@ -1668,7 +1658,7 @@ $(document).ready(function(){
 		console.log(event.which + ' ' + event.target.nodeName);
 		if(event.target.nodeName.toUpperCase() != 'BODY'
 			|| $('#contacts li').length == 0
-			|| !Contacts.UI.Card.id) {
+			|| !OC.Contacts.Card.id) {
 			return;
 		}
 		/**
@@ -1683,33 +1673,33 @@ $(document).ready(function(){
 				break;
 			case 46:
 				if(event.shiftKey) {
-					Contacts.UI.Card.delayedDelete();
+					OC.Contacts.Card.delayedDelete();
 				}
 				break;
 			case 32: // space
 				if(event.shiftKey) {
-					Contacts.UI.Contacts.previous();
+					OC.Contacts.Contacts.previous();
 					break;
 				}
 			case 40: // down
 			case 75: // k
-				Contacts.UI.Contacts.next();
+				OC.Contacts.Contacts.next();
 				break;
 			case 65: // a
 				if(event.shiftKey) {
 					// add addressbook
-					Contacts.UI.notImplemented();
+					OC.Contacts.notImplemented();
 					break;
 				}
-				Contacts.UI.Card.editNew();
+				OC.Contacts.Card.editNew();
 				break;
 			case 38: // up
 			case 74: // j
-				Contacts.UI.Contacts.previous();
+				OC.Contacts.Contacts.previous();
 				break;
 			case 78: // n
 				// next addressbook
-				Contacts.UI.notImplemented();
+				OC.Contacts.notImplemented();
 				break;
 			case 13: // Enter
 			case 79: // o
@@ -1720,10 +1710,10 @@ $(document).ready(function(){
 				break;
 			case 80: // p
 				// prev addressbook
-				Contacts.UI.notImplemented();
+				OC.Contacts.notImplemented();
 				break;
 			case 82: // r
-				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
+				OC.Contacts.Contacts.update({cid:OC.Contacts.Card.id});
 				break;
 			case 191: // ?
 				ninjahelp.toggle('fast');
@@ -1732,7 +1722,7 @@ $(document).ready(function(){
 
 	});
 
-	//$(window).on('beforeunload', Contacts.UI.Contacts.deleteFilesInQueue);
+	//$(window).on('beforeunload', OC.Contacts.Contacts.deleteFilesInQueue);
 
 	// Load a contact.
 	$('.contacts').keydown(function(event) {
@@ -1759,7 +1749,7 @@ $(document).ready(function(){
 			}
 			$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 				if(jsondata.status == 'success'){
-					Contacts.UI.Card.loadContact(jsondata.data, bookid);
+					OC.Contacts.Card.loadContact(jsondata.data, bookid);
 				}
 				else{
 					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -1770,7 +1760,7 @@ $(document).ready(function(){
 	});
 
 	$('.contacts_property').live('change', function(){
-		Contacts.UI.Card.saveProperty(this);
+		OC.Contacts.Card.saveProperty(this);
 	});
 
 	$(function() {
@@ -1796,7 +1786,7 @@ $(document).ready(function(){
 					response = $.parseJSON(xhr.responseText);
 					if(response.status == 'success') {
 						if(xhr.status == 200) {
-							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+							OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
 						} else {
 							OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, t('contacts', 'Error'));
 						}
@@ -1813,7 +1803,7 @@ $(document).ready(function(){
 					//}
 				}
 			};
-			xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+Contacts.UI.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
+			xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+OC.Contacts.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
 			xhr.setRequestHeader('Cache-Control', 'no-cache');
 			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 			xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
@@ -1883,13 +1873,13 @@ $(document).ready(function(){
 										// import the file
 										uploadedfiles += 1;
 									} else {
-										Contacts.UI.notify({message:jsondata.data.message});
+										OC.Contacts.notify({message:jsondata.data.message});
 									}
 									return false;
 								})
 								.error(function(jqXHR, textStatus, errorThrown) {
 									console.log(textStatus);
-									Contacts.UI.notify({message:errorThrown + ': ' + textStatus,});
+									OC.Contacts.notify({message:errorThrown + ': ' + textStatus,});
 								});
 							uploadingFiles[fileName] = jqXHR;
 						}
@@ -1906,7 +1896,7 @@ $(document).ready(function(){
 								}
 								FileList.loadingDone(file.name);
 							} else {
-								Contacts.UI.notify({message:response.data.message});
+								OC.Contacts.notify({message:response.data.message});
 							}
 						});
 					}
@@ -1914,7 +1904,7 @@ $(document).ready(function(){
 			},
 			fail: function(e, data) {
 				console.log('fail');
-				Contacts.UI.notify({message:data.errorThrown + ': ' + data.textStatus});
+				OC.Contacts.notify({message:data.errorThrown + ': ' + data.textStatus});
 				// TODO: Remove file from upload queue.
 			},
 			progressall: function(e, data) {
@@ -1933,7 +1923,7 @@ $(document).ready(function(){
 				var importFiles = function(aid, fileList) {
 					// Create a closure that can be called from different places.
 					if(numfiles != uploadedfiles) {
-						Contacts.UI.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
+						OC.Contacts.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
 						retries += 1;
 						if(retries > 3) {
 							numfiles = uploadedfiles = retries = aid = 0;
@@ -1949,7 +1939,7 @@ $(document).ready(function(){
 					$('#uploadprogressbar').progressbar('value',50);
 					var todo = uploadedfiles;
 					$.each(fileList, function(fileName, data) {
-						Contacts.UI.Contacts.doImport(fileName, aid);
+						OC.Contacts.Contacts.doImport(fileName, aid);
 						delete fileList[fileName];
 						numfiles -= 1; uploadedfiles -= 1;
 						$('#uploadprogressbar').progressbar('value',50+(50/(todo-uploadedfiles)));
@@ -1957,7 +1947,7 @@ $(document).ready(function(){
 					$('#uploadprogressbar').progressbar('value',100);
 					$('#uploadprogressbar').fadeOut();
 					setTimeout(function() {
-						Contacts.UI.Contacts.update({aid:aid});
+						OC.Contacts.Contacts.update({aid:aid});
 						numfiles = uploadedfiles = retries = aid = 0;
 					}, 1000);
 				}
@@ -1983,7 +1973,7 @@ $(document).ready(function(){
 														return false;
 													}
 													$(this).dialog('close');
-													Contacts.UI.Addressbooks.addAddressbook(displayname, description, function(addressbook){
+													OC.Contacts.Addressbooks.addAddressbook(displayname, description, function(addressbook){
 														aid = addressbook.id;
 														setTimeout(function() {
 															importFiles(aid, uploadingFiles);
@@ -2030,6 +2020,6 @@ $(document).ready(function(){
 		})
 	});
 
-	Contacts.UI.loadHandlers();
-	Contacts.UI.Contacts.update({cid:id});
+	OC.Contacts.loadHandlers();
+	OC.Contacts.Contacts.update({cid:id});
 });
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
index b79e52cb87..6f0a8b8835 100644
--- a/apps/contacts/js/settings.js
+++ b/apps/contacts/js/settings.js
@@ -18,11 +18,11 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 					if(!active) {
 						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
 					} else {
-						Contacts.UI.Contacts.update();
+						OC.Contacts.Contacts.update();
 					}
 				} else {
 					console.log('Error:', jsondata.data.message);
-					Contacts.UI.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
+					OC.Contacts.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
 					tgt.checked = !active;
 				}
 			});
@@ -37,7 +37,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 					if (jsondata.status == 'success'){
 						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
 						$('.addressbooks-settings tr[data-id="'+id+'"]').remove()
-						Contacts.UI.Contacts.update();
+						OC.Contacts.Contacts.update();
 					} else {
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
@@ -100,7 +100,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 							row.find('td.name').text(jsondata.addressbook.displayname);
 							row.find('td.description').text(jsondata.addressbook.description);
 						}
-						Contacts.UI.Contacts.update();
+						OC.Contacts.Contacts.update();
 					} else {
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}

From f84e92e6e3934f84f2ecee88af6a19ec16a0dab9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 01:15:20 +0200
Subject: [PATCH 1229/1537] More files to delete \o/

---
 apps/contacts/ajax/addbook.php                | 19 ------------
 .../templates/part.editaddressbook.php        | 31 -------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 apps/contacts/ajax/addbook.php
 delete mode 100644 apps/contacts/templates/part.editaddressbook.php

diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
deleted file mode 100644
index 751185b44f..0000000000
--- a/apps/contacts/ajax/addbook.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-$book = array(
-	'id' => 'new',
-	'displayname' => '',
-);
-$tmpl = new OCP\Template('contacts', 'part.editaddressbook');
-$tmpl->assign('new', true);
-$tmpl->assign('addressbook', $book);
-$tmpl->printPage();
diff --git a/apps/contacts/templates/part.editaddressbook.php b/apps/contacts/templates/part.editaddressbook.php
deleted file mode 100644
index c1c585687c..0000000000
--- a/apps/contacts/templates/part.editaddressbook.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<td id="<?php echo $_['new'] ? 'new' : 'edit' ?>addressbook_dialog" title="<?php echo $_['new'] ? $l->t("New Addressbook") : $l->t("Edit Addressbook"); ?>" colspan="6">
-<table width="100%" style="border: 0;">
-<tr>
-	<th><?php echo $l->t('Displayname') ?></th>
-	<td>
-		<input id="displayname_<?php echo $_['addressbook']['id'] ?>" type="text" value="<?php echo htmlspecialchars($_['addressbook']['displayname']) ?>">
-	</td>
-</tr>
-<?php if (!$_['new']): ?>
-<tr>
-	<td></td>
-	<td>
-		<input id="edit_active_<?php echo $_['addressbook']['id'] ?>" type="checkbox"<?php echo  OC_Contacts_Addressbook::isActive($_['addressbook']['id']) ? ' checked="checked"' : '' ?>>
-		<label for="edit_active_<?php echo $_['addressbook']['id'] ?>">
-			<?php echo $l->t('Active') ?>
-		</label>
-	</td>
-</tr>
-<?php endif; ?>
-</table>
-<input style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.submit(this, <?php echo $_['new'] ? "'new'" : $_['addressbook']['id'] ?>);" value="<?php echo $_['new'] ? $l->t("Save") : $l->t("Submit"); ?>">
-<input style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this, <?php echo $_['new'] ? "'new'" : $_['addressbook']['id'] ?>);" value="<?php echo $l->t("Cancel"); ?>">
-</td>

From 20f8971222200646cda29c4a2f3983bfdbaeac09 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 04:15:40 +0200
Subject: [PATCH 1230/1537] Use popup class style for ninja-mode help.

---
 apps/contacts/css/contacts.css    | 2 +-
 apps/contacts/js/contacts.js      | 8 ++++----
 apps/contacts/templates/index.php | 6 ++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 1a7935aa79..0961550c7a 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -125,7 +125,7 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb} /* for multiselect */
 .typelist[type="button"]:hover { color: #777; } /* for multiselect */
 .addresslist { clear: both; font-weight: bold; }
-#ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; border: thin solid #eee; border-radius: 5px; background-color: #DBDBDB; opacity: 0.9; }
+#ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; opacity: 0.9; }
 #ninjahelp .close { position: absolute; top: 5px; right: 5px; height: 20px; width: 20px; }
 #ninjahelp h2, .help-section h3 { width: 100%; font-weight: bold; text-align: center; }
 #ninjahelp h2 { font-size: 1.4em; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 8108bb2590..d84ce0a5bd 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1635,9 +1635,11 @@ $(document).ready(function(){
 	OCCategories.changed = OC.Contacts.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	//$('#chooseaddressbook').on('click keydown', OC.Contacts.Addressbooks.overview);
+	var ninjahelp = $('#ninjahelp');
+
 	$('#bottomcontrols .settings').on('click keydown', function() {
 		try {
+			ninjahelp.hide();
 			OC.appSettings({appid:'contacts', loadJS:true, cache:false});
 		} catch(e) {
 			console.log('error:', e.message);
@@ -1648,19 +1650,17 @@ $(document).ready(function(){
 	});
 	$('#contacts_newcontact').on('click keydown', OC.Contacts.Card.editNew);
 
-	var ninjahelp = $('#ninjahelp');
-
 	ninjahelp.find('.close').on('click keydown',function() {
 		ninjahelp.hide();
 	});
 
 	$(document).on('keyup', function(event) {
-		console.log(event.which + ' ' + event.target.nodeName);
 		if(event.target.nodeName.toUpperCase() != 'BODY'
 			|| $('#contacts li').length == 0
 			|| !OC.Contacts.Card.id) {
 			return;
 		}
+		console.log(event.which + ' ' + event.target.nodeName);
 		/**
 		 * To add:
 		 * (Shift)n/p: next/prev addressbook
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 4c2a19e8d9..270d5c203c 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -32,10 +32,8 @@
 			echo $this->inc('part.no_contacts');
 		}
 	?>
-	<div class="hidden" id="ninjahelp">
-		<a class="close" tabindex="0" role="button">
-			<img class="svg" src="core/img/actions/delete.svg" alt="<?php echo $l->t('Close'); ?>" />
-		</a>
+	<div class="hidden popup" id="ninjahelp">
+		<a class="close" tabindex="0" role="button" title="<?php echo $l->t('Close'); ?>"></a>
 		<h2><?php echo $l->t('Keyboard shortcuts'); ?></h2>
 		<div class="help-section">
 			<h3><?php echo $l->t('Navigation'); ?></h3>

From 30c3a783d94aaa312909bc55778ca5c4a1e29e28 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 05:01:54 +0200
Subject: [PATCH 1231/1537] Remove onunload handler when delete is cancelled.

---
 apps/contacts/js/contacts.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d84ce0a5bd..01301e0d53 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -501,6 +501,7 @@ OC.Contacts={
 				clickhandler:function(contact) {
 					OC.Contacts.Contacts.insertContact({contact:contact});
 					OC.Contacts.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
+					window.onbeforeunload = null;
 				}
 			});
 		},

From a1239a37aa51b5a31474a23dcf00a7532fcc4ea4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 05:02:36 +0200
Subject: [PATCH 1232/1537] Line length...

---
 apps/contacts/ajax/contacts.php       | 35 +++++++++++++++++++--------
 apps/contacts/ajax/savecrop.php       | 25 +++++++++++--------
 apps/contacts/ajax/saveproperty.php   | 31 +++++++++++++++++-------
 apps/contacts/lib/connector_sabre.php | 23 +++++++++++++-----
 4 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 67ebcaf736..c5eca292f1 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -13,7 +13,7 @@ function cmp($a, $b)
     }
     return ($a['displayname'] < $b['displayname']) ? -1 : 1;
 }
- 
+
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
@@ -37,34 +37,49 @@ $ids = array();
 foreach($active_addressbooks as $addressbook) {
 	$ids[] = $addressbook['id'];
 	if(!isset($contacts_addressbook[$addressbook['id']])) {
-		$contacts_addressbook[$addressbook['id']] = array('contacts' => array('type' => 'book',));
-		$contacts_addressbook[$addressbook['id']]['displayname'] = $addressbook['displayname'];
+		$contacts_addressbook[$addressbook['id']]
+				= array('contacts' => array('type' => 'book',));
+		$contacts_addressbook[$addressbook['id']]['displayname']
+				= $addressbook['displayname'];
 	}
-}	
+}
 
-$contacts_alphabet = array(); 
+$contacts_alphabet = array();
 
 // get next 50 for each addressbook.
 foreach($ids as $id) {
 	if($id) {
-		$contacts_alphabet = array_merge($contacts_alphabet, OC_Contacts_VCard::all($id, $start, 50));
+		$contacts_alphabet = array_merge(
+				$contacts_alphabet,
+				OC_Contacts_VCard::all($id, $start, 50)
+		);
 	}
 }
 // Our new array for the contacts sorted by addressbook
 if($contacts_alphabet) {
 	foreach($contacts_alphabet as $contact) {
-		if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
-			$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array('type' => 'book',));
+		// This should never execute.
+		if(!isset($contacts_addressbook[$contact['addressbookid']])) {
+			$contacts_addressbook[$contact['addressbookid']] = array(
+				'contacts' => array('type' => 'book',)
+			);
 		}
 		$display = trim($contact['fullname']);
 		if(!$display) {
 			$vcard = OC_Contacts_App::getContactVCard($contact['id']);
 			if(!is_null($vcard)) {
 				$struct = OC_Contacts_VCard::structureContact($vcard);
-				$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
+				$display = isset($struct['EMAIL'][0])
+					? $struct['EMAIL'][0]['value']
+					: '[UNKNOWN]';
 			}
 		}
-		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('type' => 'contact', 'id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
+		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array(
+					'type' => 'contact',
+					'id' => $contact['id'],
+					'addressbookid' => $contact['addressbookid'],
+					'displayname' => htmlspecialchars($display)
+		);
 	}
 }
 unset($contacts_alphabet);
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 07de138757..e1826b6a3c 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -54,34 +54,39 @@ if($data) {
 		$w = ($w != -1 ? $w : $image->width());
 		$h = ($h != -1 ? $h : $image->height());
 		OCP\Util::writeLog('contacts',
-			'savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, 
+			'savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h,
 			OCP\Util::DEBUG);
 		if($image->crop($x1, $y1, $w, $h)) {
-			if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
+			if(($image->width() <= 200 && $image->height() <= 200)
+						|| $image->resize(200)) {
 				$card = OC_Contacts_App::getContactVCard($id);
 				if(!$card) {
 					OC_Cache::remove($tmpkey);
-					bailOut(OC_Contacts_App::$l10n->t('Error getting contact object.'));
+					bailOut(OC_Contacts_App::$l10n
+						->t('Error getting contact object.'));
 				}
 				if($card->__isset('PHOTO')) {
 					OCP\Util::writeLog('contacts',
-						'savecrop.php: PHOTO property exists.', 
+						'savecrop.php: PHOTO property exists.',
 						OCP\Util::DEBUG);
 					$property = $card->__get('PHOTO');
 					if(!$property) {
 						OC_Cache::remove($tmpkey);
-						bailOut(OC_Contacts_App::$l10n->t('Error getting PHOTO property.'));
+						bailOut(OC_Contacts_App::$l10n
+							->t('Error getting PHOTO property.'));
 					}
 					$property->setValue($image->__toString());
-					$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
-					$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+					$property->parameters[]
+						= new Sabre_VObject_Parameter('ENCODING', 'b');
+					$property->parameters[]
+						= new Sabre_VObject_Parameter('TYPE', $image->mimeType());
 					$card->__set('PHOTO', $property);
 				} else {
 					OCP\Util::writeLog('contacts',
-						'savecrop.php: files: Adding PHOTO property.', 
+						'savecrop.php: files: Adding PHOTO property.',
 						OCP\Util::DEBUG);
-					$card->addProperty('PHOTO', 
-						$image->__toString(), array('ENCODING' => 'b', 
+					$card->addProperty('PHOTO',
+						$image->__toString(), array('ENCODING' => 'b',
 						'TYPE' => $image->mimeType()));
 				}
 				$now = new DateTime;
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 5d743c99df..ef4d1b26c5 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -41,9 +41,9 @@ if(!$checksum) {
 }
 if(is_array($value)) {
 	$value = array_map('strip_tags', $value);
-	// NOTE: Important, otherwise the compound value will be 
+	// NOTE: Important, otherwise the compound value will be
 	// set in the order the fields appear in the form!
-	ksort($value); 
+	ksort($value);
 	//if($name == 'CATEGORIES') {
 	//	$value = OC_Contacts_VCard::escapeDelimiters($value, ',');
 	//} else {
@@ -56,12 +56,16 @@ if(is_array($value)) {
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 if(is_null($line)) {
-	bailOut(OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page: ').$checksum);
+	bailOut(OC_Contacts_App::$l10n->t(
+		'Information about vCard is incorrect. Please reload the page: ').$checksum
+	);
 }
 $element = $vcard->children[$line]->name;
 
 if($element != $name) {
-	bailOut(OC_Contacts_App::$l10n->t('Something went FUBAR. ').$name.' != '.$element);
+	bailOut(OC_Contacts_App::$l10n->t(
+		'Something went FUBAR. ').$name.' != '.$element
+	);
 }
 
 /* preprocessing value */
@@ -91,11 +95,13 @@ if(!$value) {
 	/* setting value */
 	switch($element) {
 		case 'BDAY':
-			// I don't use setDateTime() because that formats it as YYYYMMDD instead of YYYY-MM-DD
-			// which is what the RFC recommends.
+			// I don't use setDateTime() because that formats it as YYYYMMDD instead
+			// of YYYY-MM-DD which is what the RFC recommends.
 			$vcard->children[$line]->setValue($value);
 			$vcard->children[$line]->parameters = array();
-			$vcard->children[$line]->add(new Sabre_VObject_Parameter('VALUE', 'DATE'));
+			$vcard->children[$line]->add(
+				new Sabre_VObject_Parameter('VALUE', 'DATE')
+			);
 			debug('Setting value:'.$name.' '.$vcard->children[$line]);
 			break;
 		case 'CATEGORIES':
@@ -114,7 +120,10 @@ if(!$value) {
 					debug('Adding parameter: '.$key);
 					foreach($parameter as $val) {
 						debug('Adding parameter: '.$key.'=>'.$val);
-						$vcard->children[$line]->add(new Sabre_VObject_Parameter($key, strtoupper(strip_tags($val))));
+						$vcard->children[$line]->add(new Sabre_VObject_Parameter(
+							$key,
+							strtoupper(strip_tags($val)))
+						);
 					}
 				}
 			}
@@ -134,4 +143,8 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
+OCP\JSON::success(array('data' => array(
+	'line' => $line,
+	'checksum' => $checksum,
+	'oldchecksum' => $_POST['checksum']))
+);
diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/connector_sabre.php
index 9fcfff08fa..2bc6c9a28c 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/connector_sabre.php
@@ -40,7 +40,8 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 				'uri' => $i['uri'],
 				'principaluri' => 'principals/'.$i['userid'],
 				'{DAV:}displayname' => $i['displayname'],
-				'{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $i['description'],
+				'{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description'
+						=> $i['description'],
 				'{http://calendarserver.org/ns/}getctag' => $i['ctag'],
 			);
 		}
@@ -69,7 +70,8 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 				case '{DAV:}displayname' :
 					$name = $newvalue;
 					break;
-				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV
+						. '}addressbook-description' :
 					$description = $newvalue;
 					break;
 				default :
@@ -104,16 +106,23 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 				case '{DAV:}displayname' :
 					$displayname = $newvalue;
 					break;
-				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV
+						. '}addressbook-description' :
 					$description = $newvalue;
 					break;
 				default :
-					throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
+					throw new Sabre_DAV_Exception_BadRequest('Unknown property: '
+						. $property);
 			}
 
 		}
 
-		OC_Contacts_Addressbook::addFromDAVData($principaluri, $url, $name, $description);
+		OC_Contacts_Addressbook::addFromDAVData(
+					$principaluri,
+					$url,
+					$name,
+					$description
+		);
 	}
 
 	/**
@@ -182,7 +191,9 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 	 * @return bool
 	 */
 	public function updateCard($addressbookid, $carduri, $carddata) {
-		return OC_Contacts_VCard::editFromDAVData($addressbookid, $carduri, $carddata);
+		return OC_Contacts_VCard::editFromDAVData(
+			$addressbookid, $carduri, $carddata
+		);
 	}
 
 	/**

From a484ee817cb1ee1daad9341d90d9b36fc0ada7d5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 18:50:20 +0200
Subject: [PATCH 1233/1537] If first addressbook was empty it was seen as if
 there where no contacts at all.

---
 apps/contacts/js/contacts.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 01301e0d53..a708352cba 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -316,8 +316,11 @@ OC.Contacts={
 			console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
 			var newid, bookid, firstitem;
 			if(!parseInt(params.cid) && !parseInt(params.aid)) {
-				firstitem = $('#contacts ul').first().find('li:first-child');
+				firstitem = $('#contacts ul').find('li:first-child');
 				if(firstitem.length > 0) {
+					if(firstitem.length > 1) {
+						firstitem = firstitem.first();
+					}
 					newid = parseInt(firstitem.data('id'));
 					bookid = parseInt(firstitem.data('bookid'));
 				}

From 8f3357c30596ff776636a8e5a8f6d3611d4fa1ba Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 18:57:03 +0200
Subject: [PATCH 1234/1537] I was a bit too fast in removing methods
 yesterday...

---
 apps/contacts/js/contacts.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index a708352cba..2521a6ce84 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1499,6 +1499,20 @@ OC.Contacts={
 			//this.contacts[id] = contact;
 			return contact;
 		},
+		addAddressbook:function(name, description, cb) {
+			$.post(OC.filePath('contacts', 'ajax/addressbook', 'add.php'), { name: name, description: description, active: true },
+				function(jsondata) {
+				if(jsondata.status == 'success'){
+					if(cb && typeof cb == 'function') {
+						console.log('addressbook:', jsondata.data.addressbook);
+						cb(jsondata.data.addressbook);
+					}
+				} else {
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					return false;
+				}
+			});
+		},
 		doImport:function(file, aid){
 			$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
 				function(jsondata){

From 40d2bb70d7867b91e06a309de26cd892f5a4e66e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 19:01:55 +0200
Subject: [PATCH 1235/1537] Remove logging

---
 apps/contacts/js/contacts.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 2521a6ce84..340e43cd1c 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1504,7 +1504,6 @@ OC.Contacts={
 				function(jsondata) {
 				if(jsondata.status == 'success'){
 					if(cb && typeof cb == 'function') {
-						console.log('addressbook:', jsondata.data.addressbook);
 						cb(jsondata.data.addressbook);
 					}
 				} else {

From d07f4a5ea81301708e68c951580a5770034a2b68 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 19:03:06 +0200
Subject: [PATCH 1236/1537] Correct namespace usage.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 340e43cd1c..4ccedf87ed 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1990,7 +1990,7 @@ $(document).ready(function(){
 														return false;
 													}
 													$(this).dialog('close');
-													OC.Contacts.Addressbooks.addAddressbook(displayname, description, function(addressbook){
+													OC.Contacts.Contacts.addAddressbook(displayname, description, function(addressbook) {
 														aid = addressbook.id;
 														setTimeout(function() {
 															importFiles(aid, uploadingFiles);

From 7dda5527f1e49014ac19a37214821992cdf0c4d8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 19:03:45 +0200
Subject: [PATCH 1237/1537] Return properly formatted jsondata.

---
 apps/contacts/ajax/addressbook/add.php |  2 +-
 apps/contacts/js/settings.js           | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/contacts/ajax/addressbook/add.php b/apps/contacts/ajax/addressbook/add.php
index 617c2fd182..65077743ed 100644
--- a/apps/contacts/ajax/addressbook/add.php
+++ b/apps/contacts/ajax/addressbook/add.php
@@ -34,4 +34,4 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
 	bailOut('Error activating addressbook.');
 }
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
-OCP\JSON::success(array('addressbook' => $addressbook));
+OCP\JSON::success(array('data' => array('addressbook' => $addressbook)));
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
index 6f0a8b8835..284f972be8 100644
--- a/apps/contacts/js/settings.js
+++ b/apps/contacts/js/settings.js
@@ -79,26 +79,26 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 					if(jsondata.status == 'success'){
 						self.showActions(['new',]);
 						self.adractions.removeData('id');
-						active = Boolean(Number(jsondata.addressbook.active));
+						active = Boolean(Number(jsondata.data.addressbook.active));
 						if(id == 'new') {
 							self.adrsettings.find('table')
-								.append('<tr class="addressbook" data-id="'+jsondata.addressbook.id+'" data-uri="'+jsondata.addressbook.uri+'">'
+								.append('<tr class="addressbook" data-id="'+jsondata.data.addressbook.id+'" data-uri="'+jsondata.data.addressbook.uri+'">'
 									+ '<td class="active"><input type="checkbox" '+(active ? 'checked="checked"' : '')+' /></td>'
-									+ '<td class="name">'+jsondata.addressbook.displayname+'</td>'
-									+ '<td class="description">'+jsondata.addressbook.description+'</td>'
+									+ '<td class="name">'+jsondata.data.addressbook.displayname+'</td>'
+									+ '<td class="description">'+jsondata.data.addressbook.description+'</td>'
 									+ '<td class="action"><a class="svg action globe" title="'+t('contacts', 'Show CardDav link')+'"></a></td>'
 									+ '<td class="action"><a class="svg action cloud" title="'+t('contacts', 'Show read-only VCF link')+'"></a></td>'
 									+ '<td class="action"><a class="svg action download" title="'+t('contacts', 'Download')+'" '
 									+ 'href="'+totalurl+'/'+encodeURIComponent(oc_current_user)+'/'
-									+ encodeURIComponent(jsondata.addressbook.uri)+'?export"></a></td>'
+									+ encodeURIComponent(jsondata.data.addressbook.uri)+'?export"></a></td>'
 									+ '<td class="action"><a class="svg action edit" title="'+t('contacts', 'Edit')+'"></a></td>'
 									+ '<td class="action"><a class="svg action delete" title="'+t('contacts', 'Delete')+'"></a></td>'
 									+ '</tr>');
 						} else {
 						var row = self.adrsettings.find('tr[data-id="'+id+'"]');
 							row.find('td.active').find('input:checkbox').prop('checked', active);
-							row.find('td.name').text(jsondata.addressbook.displayname);
-							row.find('td.description').text(jsondata.addressbook.description);
+							row.find('td.name').text(jsondata.data.addressbook.displayname);
+							row.find('td.description').text(jsondata.data.addressbook.description);
 						}
 						OC.Contacts.Contacts.update();
 					} else {

From 7dc799c16706a7e7e294950375dfec0b7f7e45b0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 3 Aug 2012 02:04:12 +0200
Subject: [PATCH 1238/1537] [tx-robot] updated from transifex

---
 apps/contacts/l10n/ar.php    |  13 +--
 apps/contacts/l10n/ca.php    |  23 ++---
 apps/contacts/l10n/cs_CZ.php |  13 +--
 apps/contacts/l10n/da.php    |  13 +--
 apps/contacts/l10n/de.php    |  23 ++---
 apps/contacts/l10n/el.php    |  20 ++---
 apps/contacts/l10n/eo.php    |  13 +--
 apps/contacts/l10n/es.php    |  13 +--
 apps/contacts/l10n/et_EE.php |  13 +--
 apps/contacts/l10n/eu.php    |  15 +---
 apps/contacts/l10n/fa.php    |  13 +--
 apps/contacts/l10n/fi_FI.php |  26 +++---
 apps/contacts/l10n/fr.php    |  15 +---
 apps/contacts/l10n/gl.php    |  13 +--
 apps/contacts/l10n/he.php    |  13 +--
 apps/contacts/l10n/hr.php    |  13 +--
 apps/contacts/l10n/hu_HU.php |  13 +--
 apps/contacts/l10n/ia.php    |  12 +--
 apps/contacts/l10n/it.php    |  23 ++---
 apps/contacts/l10n/ja_JP.php |  15 +---
 apps/contacts/l10n/ko.php    |  13 +--
 apps/contacts/l10n/lb.php    |  13 +--
 apps/contacts/l10n/lt_LT.php |  12 +--
 apps/contacts/l10n/mk.php    |  13 +--
 apps/contacts/l10n/ms_MY.php |  13 +--
 apps/contacts/l10n/nb_NO.php |  13 +--
 apps/contacts/l10n/nl.php    |  13 +--
 apps/contacts/l10n/nn_NO.php |  13 +--
 apps/contacts/l10n/pl.php    |  15 +---
 apps/contacts/l10n/pt_BR.php |  13 +--
 apps/contacts/l10n/pt_PT.php |  13 +--
 apps/contacts/l10n/ro.php    |  13 +--
 apps/contacts/l10n/ru.php    |  13 +--
 apps/contacts/l10n/sk_SK.php |  15 +---
 apps/contacts/l10n/sl.php    |  13 +--
 apps/contacts/l10n/sr.php    |  13 +--
 apps/contacts/l10n/sv.php    |  15 +---
 apps/contacts/l10n/th_TH.php |  13 +--
 apps/contacts/l10n/tr.php    |  15 +---
 apps/contacts/l10n/uk.php    |   1 -
 apps/contacts/l10n/vi.php    |  13 +--
 apps/contacts/l10n/zh_CN.php |  13 +--
 apps/contacts/l10n/zh_TW.php |  13 +--
 apps/files/l10n/el.php       |   7 ++
 apps/files/l10n/fi_FI.php    |   7 ++
 l10n/af/contacts.po          | 134 ++++++++++++-----------------
 l10n/ar/contacts.po          | 134 ++++++++++++-----------------
 l10n/ar_SA/contacts.po       | 134 ++++++++++++-----------------
 l10n/bg_BG/contacts.po       | 134 ++++++++++++-----------------
 l10n/ca/contacts.po          | 150 +++++++++++++-------------------
 l10n/cs_CZ/contacts.po       | 134 ++++++++++++-----------------
 l10n/da/contacts.po          | 134 ++++++++++++-----------------
 l10n/de/contacts.po          | 150 +++++++++++++-------------------
 l10n/el/contacts.po          | 144 +++++++++++++------------------
 l10n/el/files.po             |  20 ++---
 l10n/eo/contacts.po          | 134 ++++++++++++-----------------
 l10n/es/contacts.po          | 134 ++++++++++++-----------------
 l10n/et_EE/contacts.po       | 134 ++++++++++++-----------------
 l10n/eu/contacts.po          | 134 ++++++++++++-----------------
 l10n/eu_ES/contacts.po       | 134 ++++++++++++-----------------
 l10n/fa/contacts.po          | 134 ++++++++++++-----------------
 l10n/fi_FI/contacts.po       | 160 +++++++++++++++--------------------
 l10n/fi_FI/files.po          |  20 ++---
 l10n/fi_FI/lib.po            |  10 +--
 l10n/fr/contacts.po          | 134 ++++++++++++-----------------
 l10n/gl/contacts.po          | 134 ++++++++++++-----------------
 l10n/he/contacts.po          | 134 ++++++++++++-----------------
 l10n/hr/contacts.po          | 134 ++++++++++++-----------------
 l10n/hu_HU/contacts.po       | 134 ++++++++++++-----------------
 l10n/hy/contacts.po          | 134 ++++++++++++-----------------
 l10n/ia/contacts.po          | 134 ++++++++++++-----------------
 l10n/id/contacts.po          | 134 ++++++++++++-----------------
 l10n/id_ID/contacts.po       | 134 ++++++++++++-----------------
 l10n/it/contacts.po          | 150 +++++++++++++-------------------
 l10n/ja_JP/contacts.po       | 134 ++++++++++++-----------------
 l10n/ko/contacts.po          | 134 ++++++++++++-----------------
 l10n/lb/contacts.po          | 134 ++++++++++++-----------------
 l10n/lt_LT/contacts.po       | 134 ++++++++++++-----------------
 l10n/lv/contacts.po          | 134 ++++++++++++-----------------
 l10n/mk/contacts.po          | 134 ++++++++++++-----------------
 l10n/ms_MY/contacts.po       | 134 ++++++++++++-----------------
 l10n/nb_NO/contacts.po       | 134 ++++++++++++-----------------
 l10n/nl/contacts.po          | 134 ++++++++++++-----------------
 l10n/nn_NO/contacts.po       | 134 ++++++++++++-----------------
 l10n/pl/contacts.po          | 134 ++++++++++++-----------------
 l10n/pt_BR/contacts.po       | 134 ++++++++++++-----------------
 l10n/pt_PT/contacts.po       | 134 ++++++++++++-----------------
 l10n/ro/contacts.po          | 134 ++++++++++++-----------------
 l10n/ru/contacts.po          | 134 ++++++++++++-----------------
 l10n/sk_SK/contacts.po       | 134 ++++++++++++-----------------
 l10n/sl/contacts.po          | 134 ++++++++++++-----------------
 l10n/so/contacts.po          | 134 ++++++++++++-----------------
 l10n/sr/contacts.po          | 134 ++++++++++++-----------------
 l10n/sr@latin/contacts.po    | 134 ++++++++++++-----------------
 l10n/sv/contacts.po          | 134 ++++++++++++-----------------
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  | 132 ++++++++++++-----------------
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       |   2 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 l10n/th_TH/contacts.po       | 134 ++++++++++++-----------------
 l10n/tr/contacts.po          | 134 ++++++++++++-----------------
 l10n/uk/contacts.po          | 134 ++++++++++++-----------------
 l10n/vi/contacts.po          | 134 ++++++++++++-----------------
 l10n/zh_CN/contacts.po       | 134 ++++++++++++-----------------
 l10n/zh_TW/contacts.po       | 134 ++++++++++++-----------------
 lib/l10n/fi_FI.php           |   3 +
 111 files changed, 3162 insertions(+), 4848 deletions(-)

diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 317d3ce386..3075717ce6 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -8,7 +8,6 @@
 "Error deleting contact property." => "خطء خلال محي الصفه.",
 "Error updating contact property." => "خطء خلال تعديل الصفه.",
 "Contacts" => "المعارف",
-"Contact" => "معرفه",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
 "Address" => "عنوان",
@@ -24,6 +23,7 @@
 "Video" => "الفيديو",
 "Pager" => "الرنان",
 "Birthday" => "تاريخ الميلاد",
+"Contact" => "معرفه",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
 "Delete" => "حذف",
@@ -39,14 +39,9 @@
 "Zipcode" => "رقم المنطقة",
 "Country" => "البلد",
 "Addressbook" => "كتاب العناوين",
-"New Addressbook" => "كتاب عناوين جديد",
-"Edit Addressbook" => "عدل كتاب العناوين",
-"Displayname" => "الاسم المعروض",
-"Active" => "فعال",
-"Save" => "حفظ",
-"Submit" => "ارسال",
-"Cancel" => "الغاء",
 "Download" => "انزال",
 "Edit" => "تعديل",
-"New Address Book" => "كتاب عناوين جديد"
+"New Address Book" => "كتاب عناوين جديد",
+"Save" => "حفظ",
+"Cancel" => "الغاء"
 );
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 4bb667a955..aba320c09d 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -53,9 +53,6 @@
 "Not implemented" => "No implementada",
 "Couldn't get a valid address." => "No s'ha pogut obtenir una adreça vàlida.",
 "Error" => "Error",
-"Contact" => "Contacte",
-"New" => "Nou",
-"New Contact" => "Contate nou",
 "This property has to be non-empty." => "Aquesta propietat no pot ser buida.",
 "Couldn't serialize elements." => "No s'han pogut serialitzar els elements.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org",
@@ -63,9 +60,12 @@
 "No files selected for upload." => "No s'han seleccionat fitxers per a la pujada.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor.",
 "Select type" => "Seleccioneu un tipus",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
 "Result: " => "Resultat: ",
 " imported, " => " importat, ",
 " failed." => " fallada.",
+"Displayname cannot be empty." => "El nom a mostrar no pot ser buit",
+"Addressbook not found: " => "No s'ha trobat la llibreta d'adreces: ",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Address" => "Adreça",
@@ -97,6 +97,7 @@
 "Projects" => "Projectes",
 "Questions" => "Preguntes",
 "{name}'s Birthday" => "Aniversari de {name}",
+"Contact" => "Contacte",
 "Add Contact" => "Afegeix un contacte",
 "Import" => "Importa",
 "Settings" => "Configuració",
@@ -179,13 +180,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nova llibreta d'adreces",
-"Edit Addressbook" => "Edita la llibreta d'adreces",
-"Displayname" => "Nom a mostrar",
-"Active" => "Actiu",
-"Save" => "Desa",
-"Submit" => "Envia",
-"Cancel" => "Cancel·la",
 "Import a contacts file" => "Importa un fitxer de contactes",
 "Please choose the addressbook" => "Escolliu la llibreta d'adreces",
 "create a new addressbook" => "crea una llibreta d'adreces nova",
@@ -201,7 +195,14 @@
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Mostra l'enllaç CardDav",
+"Show read-only VCF link" => "Mostra l'enllaç VCF només de lectura",
 "Download" => "Baixa",
 "Edit" => "Edita",
-"New Address Book" => "Nova llibreta d'adreces"
+"New Address Book" => "Nova llibreta d'adreces",
+"Name" => "Nom",
+"Description" => "Descripció",
+"Save" => "Desa",
+"Cancel" => "Cancel·la",
+"More..." => "Més..."
 );
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index e0f70b1c64..8c0043cb3b 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Neimplementováno",
 "Couldn't get a valid address." => "Nelze získat platnou adresu.",
 "Error" => "Chyba",
-"Contact" => "Kontakt",
 "This property has to be non-empty." => "Tento parametr nemuže zůstat nevyplněn.",
 "Couldn't serialize elements." => "Prvky nelze převést..",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Narozeniny",
 "{name}'s Birthday" => "Narozeniny {name}",
+"Contact" => "Kontakt",
 "Add Contact" => "Přidat kontakt",
 "Import" => "Import",
 "Addressbooks" => "Adresáře",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "ml.",
 "Sn." => "st.",
-"New Addressbook" => "Nový adresář",
-"Edit Addressbook" => "Editace adresáře",
-"Displayname" => "Zobrazené jméno",
-"Active" => "Aktivní",
-"Save" => "Uložit",
-"Submit" => "Potvrdit",
-"Cancel" => "Storno",
 "Import a contacts file" => "Importovat soubor kontaktů",
 "Please choose the addressbook" => "Prosím zvolte adresář",
 "create a new addressbook" => "vytvořit nový adresář",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Stažení",
 "Edit" => "Editovat",
-"New Address Book" => "Nový adresář"
+"New Address Book" => "Nový adresář",
+"Save" => "Uložit",
+"Cancel" => "Storno"
 );
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 1744199af2..ca16603c00 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Ikke implementeret",
 "Couldn't get a valid address." => "Kunne ikke finde en gyldig adresse.",
 "Error" => "Fejl",
-"Contact" => "Kontaktperson",
 "This property has to be non-empty." => "Dette felt må ikke være tomt.",
 "Couldn't serialize elements." => "Kunne ikke serialisere elementerne.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Fødselsdag",
 "{name}'s Birthday" => "{name}s fødselsdag",
+"Contact" => "Kontaktperson",
 "Add Contact" => "Tilføj kontaktperson",
 "Import" => "Importer",
 "Addressbooks" => "Adressebøger",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Ny adressebog",
-"Edit Addressbook" => "Rediger adressebog",
-"Displayname" => "Vist navn",
-"Active" => "Aktiv",
-"Save" => "Gem",
-"Submit" => "Gem",
-"Cancel" => "Fortryd",
 "Import a contacts file" => "Importer fil med kontaktpersoner",
 "Please choose the addressbook" => "Vælg venligst adressebog",
 "create a new addressbook" => "Opret ny adressebog",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Download",
 "Edit" => "Rediger",
-"New Address Book" => "Ny adressebog"
+"New Address Book" => "Ny adressebog",
+"Save" => "Gem",
+"Cancel" => "Fortryd"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 2d1a3cdb2d..5849373e65 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -53,9 +53,6 @@
 "Not implemented" => "Nicht Verfügbar",
 "Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen",
 "Error" => "Fehler",
-"Contact" => "Kontakt",
-"New" => "Neu",
-"New Contact" => "Neuer Kontakt",
 "This property has to be non-empty." => "Dieses Feld darf nicht Leer sein.",
 "Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org",
@@ -63,9 +60,12 @@
 "No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
 "Select type" => "Wähle Typ",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ...",
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
+"Displayname cannot be empty." => "Der Anzeigename darf nicht leer sein.",
+"Addressbook not found: " => "Adressbuch nicht gefunden:",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
 "Address" => "Adresse",
@@ -97,6 +97,7 @@
 "Projects" => "Projekte",
 "Questions" => "Fragen",
 "{name}'s Birthday" => "Geburtstag von {name}",
+"Contact" => "Kontakt",
 "Add Contact" => "Kontakt hinzufügen",
 "Import" => "Importieren",
 "Settings" => "Einstellungen",
@@ -179,13 +180,6 @@
 "Esq." => "Hochwohlgeborenen",
 "Jr." => "Jr.",
 "Sn." => "Senior",
-"New Addressbook" => "Neues Adressbuch",
-"Edit Addressbook" => "Adressbuch editieren",
-"Displayname" => "Anzeigename",
-"Active" => "Aktiv",
-"Save" => "Speichern",
-"Submit" => "Eintragen",
-"Cancel" => "Abbrechen",
 "Import a contacts file" => "Kontaktdatei importieren",
 "Please choose the addressbook" => "Bitte Adressbuch auswählen",
 "create a new addressbook" => "Neues Adressbuch erstellen",
@@ -201,7 +195,14 @@
 "more info" => "mehr Info",
 "Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "CardDav-Link anzeigen",
+"Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
-"New Address Book" => "Neues Adressbuch"
+"New Address Book" => "Neues Adressbuch",
+"Name" => "Name",
+"Description" => "Beschreibung",
+"Save" => "Speichern",
+"Cancel" => "Abbrechen",
+"More..." => "Mehr..."
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index d4070c2c8c..8f6bc41a77 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -53,9 +53,6 @@
 "Not implemented" => "Δεν έχει υλοποιηθεί",
 "Couldn't get a valid address." => "Αδυναμία λήψης έγκυρης διεύθυνσης",
 "Error" => "Σφάλμα",
-"Contact" => "Επαφή",
-"New" => "Νέο",
-"New Contact" => "Νέα επαφή",
 "This property has to be non-empty." => "Το πεδίο δεν πρέπει να είναι άδειο.",
 "Couldn't serialize elements." => "Αδύνατο να μπουν σε σειρά τα στοιχεία",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org",
@@ -63,6 +60,7 @@
 "No files selected for upload." => "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server.",
 "Select type" => "Επιλογή τύπου",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν.",
 "Result: " => "Αποτέλεσμα: ",
 " imported, " => " εισάγεται,",
 " failed." => " απέτυχε.",
@@ -97,8 +95,10 @@
 "Projects" => "Έργα",
 "Questions" => "Ερωτήσεις",
 "{name}'s Birthday" => "{name} έχει Γενέθλια",
+"Contact" => "Επαφή",
 "Add Contact" => "Προσθήκη επαφής",
 "Import" => "Εισαγωγή",
+"Settings" => "Ρυθμίσεις",
 "Addressbooks" => "Βιβλία διευθύνσεων",
 "Close" => "Κλείσιμο  ",
 "Keyboard shortcuts" => "Συντομεύσεις πλητρολογίου",
@@ -178,13 +178,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Νέο βιβλίο διευθύνσεων",
-"Edit Addressbook" => "Επεξεργασία βιβλίου διευθύνσεων",
-"Displayname" => "Προβαλλόμενο όνομα",
-"Active" => "Ενεργό",
-"Save" => "Αποθήκευση",
-"Submit" => "Καταχώρηση",
-"Cancel" => "Ακύρωση",
 "Import a contacts file" => "Εισαγωγή αρχείου επαφών",
 "Please choose the addressbook" => "Παρακαλώ επέλεξε βιβλίο διευθύνσεων",
 "create a new addressbook" => "Δημιουργία νέου βιβλίου διευθύνσεων",
@@ -202,5 +195,10 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Λήψη",
 "Edit" => "Επεξεργασία",
-"New Address Book" => "Νέο βιβλίο διευθύνσεων"
+"New Address Book" => "Νέο βιβλίο διευθύνσεων",
+"Name" => "Όνομα",
+"Description" => "Περιγραφή",
+"Save" => "Αποθήκευση",
+"Cancel" => "Ακύρωση",
+"More..." => "Περισσότερα..."
 );
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index a1aaea2a65..cc64633bee 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -49,7 +49,6 @@
 "Not implemented" => "Ne disponebla",
 "Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
 "Error" => "Eraro",
-"Contact" => "Kontakto",
 "This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
 "Edit name" => "Redakti nomon",
 "No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
@@ -75,6 +74,7 @@
 "Internet" => "Interreto",
 "Birthday" => "Naskiĝotago",
 "{name}'s Birthday" => "Naskiĝtago de {name}",
+"Contact" => "Kontakto",
 "Add Contact" => "Aldoni kontakton",
 "Import" => "Enporti",
 "Addressbooks" => "Adresaroj",
@@ -129,13 +129,6 @@
 "Additional names" => "Pliaj nomoj",
 "Family name" => "Familia nomo",
 "Hon. suffixes" => "Honoraj postmetaĵoj",
-"New Addressbook" => "Nova adresaro",
-"Edit Addressbook" => "Redakti adresaron",
-"Displayname" => "Montronomo",
-"Active" => "Aktiva",
-"Save" => "Konservi",
-"Submit" => "Sendi",
-"Cancel" => "Nuligi",
 "Import a contacts file" => "Enporti kontaktodosieron",
 "Please choose the addressbook" => "Bonvolu elekti adresaron",
 "create a new addressbook" => "krei novan adresaron",
@@ -150,5 +143,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Elŝuti",
 "Edit" => "Redakti",
-"New Address Book" => "Nova adresaro"
+"New Address Book" => "Nova adresaro",
+"Save" => "Konservi",
+"Cancel" => "Nuligi"
 );
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index a7f1b1219c..8805d8dc29 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -51,7 +51,6 @@
 "Not implemented" => "No esta implementada",
 "Couldn't get a valid address." => "Fallo : no hay dirección valida",
 "Error" => "Fallo",
-"Contact" => "Contacto",
 "This property has to be non-empty." => "Este campo no puede estar vacío.",
 "Couldn't serialize elements." => "Fallo no podido ordenar los elementos",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Cumpleaños",
 "{name}'s Birthday" => "Cumpleaños de {name}",
+"Contact" => "Contacto",
 "Add Contact" => "Añadir contacto",
 "Import" => "Importar",
 "Addressbooks" => "Libretas de direcciones",
@@ -142,13 +142,6 @@
 "Esq." => "Don",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nueva libreta de direcciones",
-"Edit Addressbook" => "Editar libreta de direcciones",
-"Displayname" => "Nombre a mostrar",
-"Active" => "Activo",
-"Save" => "Guardar",
-"Submit" => "Aceptar",
-"Cancel" => "Cancelar",
 "Import a contacts file" => "Importar archivo de contactos",
 "Please choose the addressbook" => "Por favor escoge la agenda",
 "create a new addressbook" => "crear una nueva agenda",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Descargar",
 "Edit" => "Editar",
-"New Address Book" => "Nueva libreta de direcciones"
+"New Address Book" => "Nueva libreta de direcciones",
+"Save" => "Guardar",
+"Cancel" => "Cancelar"
 );
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 0589e2ec07..1a7a8bb81f 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Pole implementeeritud",
 "Couldn't get a valid address." => "Kehtiva aadressi hankimine ebaõnnestus",
 "Error" => "Viga",
-"Contact" => "Kontakt",
 "This property has to be non-empty." => "See omadus ei tohi olla tühi.",
 "Edit name" => "Muuda nime",
 "No files selected for upload." => "Üleslaadimiseks pole faile valitud.",
@@ -77,6 +76,7 @@
 "Internet" => "Internet",
 "Birthday" => "Sünnipäev",
 "{name}'s Birthday" => "{name} sünnipäev",
+"Contact" => "Kontakt",
 "Add Contact" => "Lisa kontakt",
 "Import" => "Impordi",
 "Addressbooks" => "Aadressiraamatud",
@@ -139,13 +139,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Senior.",
-"New Addressbook" => "Uus aadressiraamat",
-"Edit Addressbook" => "Muuda aadressiraamatut",
-"Displayname" => "Näidatav nimi",
-"Active" => "Aktiivne",
-"Save" => "Salvesta",
-"Submit" => "Saada",
-"Cancel" => "Loobu",
 "Import a contacts file" => "Impordi kontaktifail",
 "Please choose the addressbook" => "Palun vali aadressiraamat",
 "create a new addressbook" => "loo uus aadressiraamat",
@@ -160,5 +153,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Lae alla",
 "Edit" => "Muuda",
-"New Address Book" => "Uus aadressiraamat"
+"New Address Book" => "Uus aadressiraamat",
+"Save" => "Salvesta",
+"Cancel" => "Loobu"
 );
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index c57e7ea416..a5cdc927b8 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -52,9 +52,6 @@
 "Not implemented" => "Inplementatu gabe",
 "Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
 "Error" => "Errorea",
-"Contact" => "Kontaktua",
-"New" => "Berria",
-"New Contact" => "Kontaktu berria",
 "This property has to be non-empty." => "Propietate hau ezin da hutsik egon.",
 "Couldn't serialize elements." => "Ezin izan dira elementuak serializatu.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en",
@@ -93,6 +90,7 @@
 "Projects" => "Proiektuak",
 "Questions" => "Galderak",
 "{name}'s Birthday" => "{name}ren jaioteguna",
+"Contact" => "Kontaktua",
 "Add Contact" => "Gehitu kontaktua",
 "Import" => "Inportatu",
 "Settings" => "Ezarpenak",
@@ -154,13 +152,6 @@
 "Postal code" => "Posta kodea",
 "Country" => "Herrialdea",
 "Addressbook" => "Helbide-liburua",
-"New Addressbook" => "Helbide-liburu berria",
-"Edit Addressbook" => "Editatu helbide-liburua",
-"Displayname" => "Bistaratzeko izena",
-"Active" => "Aktibo",
-"Save" => "Gorde",
-"Submit" => "Bidali",
-"Cancel" => "Ezeztatu",
 "Import a contacts file" => "Inporatu kontaktuen fitxategia",
 "Please choose the addressbook" => "Mesedez, aukeratu helbide liburua",
 "create a new addressbook" => "sortu helbide liburu berria",
@@ -178,5 +169,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Deskargatu",
 "Edit" => "Editatu",
-"New Address Book" => "Helbide-liburu berria"
+"New Address Book" => "Helbide-liburu berria",
+"Save" => "Gorde",
+"Cancel" => "Ezeztatu"
 );
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index c25bf9ca0c..a273bbcddb 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -51,7 +51,6 @@
 "Not implemented" => "انجام نشد",
 "Couldn't get a valid address." => "Couldn't get a valid address.",
 "Error" => "خطا",
-"Contact" => "اشخاص",
 "This property has to be non-empty." => "این ویژگی باید به صورت غیر تهی عمل کند",
 "Couldn't serialize elements." => "قابلیت مرتب سازی عناصر وجود ندارد",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "اینترنت",
 "Birthday" => "روزتولد",
 "{name}'s Birthday" => "روز تولد {name} است",
+"Contact" => "اشخاص",
 "Add Contact" => "افزودن اطلاعات شخص مورد نظر",
 "Import" => "وارد کردن",
 "Addressbooks" => "کتابچه ی نشانی ها",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "کتابچه نشانی جدید",
-"Edit Addressbook" => "ویرایش کتابچه نشانی",
-"Displayname" => "نام برای نمایش",
-"Active" => "فعال",
-"Save" => "ذخیره سازی",
-"Submit" => "ارسال",
-"Cancel" => "انصراف",
 "Import a contacts file" => "وارد کردن پرونده حاوی اطلاعات",
 "Please choose the addressbook" => "لطفا یک کتابچه نشانی انتخاب کنید",
 "create a new addressbook" => "یک کتابچه نشانی بسازید",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X ",
 "Download" => "بارگیری",
 "Edit" => "ویرایش",
-"New Address Book" => "کتابچه نشانه های جدید"
+"New Address Book" => "کتابچه نشانه های جدید",
+"Save" => "ذخیره سازی",
+"Cancel" => "انصراف"
 );
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 86581f11e9..e6136c26ff 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -25,14 +25,12 @@
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "Contacts" => "Yhteystiedot",
 "Error" => "Virhe",
-"Contact" => "Yhteystieto",
-"New" => "Uusi",
-"New Contact" => "Uusi yhteystieto",
 "Edit name" => "Muokkaa nimeä",
 "No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
 "Result: " => "Tulos: ",
 " imported, " => " tuotu, ",
 " failed." => " epäonnistui.",
+"Addressbook not found: " => "Osoitekirjaa ei löytynyt:",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
 "Address" => "Osoite",
@@ -54,10 +52,16 @@
 "Other" => "Muu",
 "Questions" => "Kysymykset",
 "{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
+"Contact" => "Yhteystieto",
 "Add Contact" => "Lisää yhteystieto",
 "Import" => "Tuo",
+"Settings" => "Asetukset",
 "Addressbooks" => "Osoitekirjat",
 "Close" => "Sulje",
+"Keyboard shortcuts" => "Pikanäppäimet",
+"Next contact in list" => "Seuraava yhteystieto luettelossa",
+"Previous contact in list" => "Edellinen yhteystieto luettelossa",
+"Next/previous addressbook" => "Seuraava/edellinen osoitekirja",
 "Actions" => "Toiminnot",
 "Refresh contacts list" => "Päivitä yhteystietoluettelo",
 "Add new contact" => "Lisää uusi yhteystieto",
@@ -77,6 +81,7 @@
 "Groups" => "Ryhmät",
 "Separate groups with commas" => "Erota ryhmät pilkuilla",
 "Edit groups" => "Muokkaa ryhmiä",
+"Preferred" => "Ensisijainen",
 "Please specify a valid email address." => "Anna kelvollinen sähköpostiosoite.",
 "Enter email address" => "Anna sähköpostiosoite",
 "Delete email address" => "Poista sähköpostiosoite",
@@ -107,12 +112,6 @@
 "Given name" => "Etunimi",
 "Additional names" => "Lisänimet",
 "Family name" => "Sukunimi",
-"New Addressbook" => "Uusi osoitekirja",
-"Edit Addressbook" => "Muokkaa osoitekirjaa",
-"Active" => "Aktiivinen",
-"Save" => "Tallenna",
-"Submit" => "Lähetä",
-"Cancel" => "Peru",
 "Import a contacts file" => "Tuo yhteystiedon sisältävä tiedosto",
 "Please choose the addressbook" => "Valitse osoitekirja",
 "create a new addressbook" => "luo uusi osoitekirja",
@@ -126,7 +125,14 @@
 "Enter description" => "Anna kuvaus",
 "CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Näytä CardDav-linkki",
+"Show read-only VCF link" => "Näytä vain luku -muodossa oleva VCF-linkki",
 "Download" => "Lataa",
 "Edit" => "Muokkaa",
-"New Address Book" => "Uusi osoitekirja"
+"New Address Book" => "Uusi osoitekirja",
+"Name" => "Nimi",
+"Description" => "Kuvaus",
+"Save" => "Tallenna",
+"Cancel" => "Peru",
+"More..." => "Lisää..."
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index a3f90001e5..a967259e25 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -53,9 +53,6 @@
 "Not implemented" => "Pas encore implémenté",
 "Couldn't get a valid address." => "Impossible de trouver une adresse valide.",
 "Error" => "Erreur",
-"Contact" => "Contact",
-"New" => "Nouveau",
-"New Contact" => "Nouveau Contact",
 "This property has to be non-empty." => "Cette valeur ne doit pas être vide",
 "Couldn't serialize elements." => "Impossible de sérialiser les éléments",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org",
@@ -97,6 +94,7 @@
 "Projects" => "Projets",
 "Questions" => "Questions",
 "{name}'s Birthday" => "Anniversaire de {name}",
+"Contact" => "Contact",
 "Add Contact" => "Ajouter un Contact",
 "Import" => "Importer",
 "Addressbooks" => "Carnets d'adresses",
@@ -178,13 +176,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nouveau carnet d'adresses",
-"Edit Addressbook" => "Éditer le carnet d'adresses",
-"Displayname" => "Nom",
-"Active" => "Carnet actif",
-"Save" => "Sauvegarder",
-"Submit" => "Envoyer",
-"Cancel" => "Annuler",
 "Import a contacts file" => "Importer un fichier de contacts",
 "Please choose the addressbook" => "Choisissez le carnet d'adresses SVP",
 "create a new addressbook" => "Créer un nouveau carnet d'adresses",
@@ -202,5 +193,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Télécharger",
 "Edit" => "Modifier",
-"New Address Book" => "Nouveau Carnet d'adresses"
+"New Address Book" => "Nouveau Carnet d'adresses",
+"Save" => "Sauvegarder",
+"Cancel" => "Annuler"
 );
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index ac4f5f95ae..57f75e9dfc 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -50,7 +50,6 @@
 "Not implemented" => "Non implementada.",
 "Couldn't get a valid address." => "Non se puido obter un enderezo de correo válido.",
 "Error" => "Erro",
-"Contact" => "Contacto",
 "This property has to be non-empty." => "Esta propiedade non pode quedar baldeira.",
 "Couldn't serialize elements." => "Non se puido serializar os elementos.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org",
@@ -79,6 +78,7 @@
 "Internet" => "Internet",
 "Birthday" => "Aniversario",
 "{name}'s Birthday" => "Cumpleanos de {name}",
+"Contact" => "Contacto",
 "Add Contact" => "Engadir contacto",
 "Import" => "Importar",
 "Addressbooks" => "Axendas",
@@ -141,13 +141,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nova axenda",
-"Edit Addressbook" => "Editar axenda",
-"Displayname" => "Nome a mostrar",
-"Active" => "Activo",
-"Save" => "Gardar",
-"Submit" => "Enviar",
-"Cancel" => "Cancelar",
 "Import a contacts file" => "Importar un ficheiro de contactos",
 "Please choose the addressbook" => "Por favor escolla unha libreta de enderezos",
 "create a new addressbook" => "crear unha nova libreta de enderezos",
@@ -162,5 +155,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Descargar",
 "Edit" => "Editar",
-"New Address Book" => "Nova axenda"
+"New Address Book" => "Nova axenda",
+"Save" => "Gardar",
+"Cancel" => "Cancelar"
 );
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 3b4324c5df..336a0c10aa 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -41,7 +41,6 @@
 "No file was uploaded" => "שום קובץ לא הועלה",
 "Missing a temporary folder" => "תקיה זמנית חסרה",
 "Contacts" => "אנשי קשר",
-"Contact" => "איש קשר",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -60,6 +59,7 @@
 "Internet" => "אינטרנט",
 "Birthday" => "יום הולדת",
 "{name}'s Birthday" => "יום ההולדת של {name}",
+"Contact" => "איש קשר",
 "Add Contact" => "הוספת איש קשר",
 "Import" => "יבא",
 "Addressbooks" => "פנקסי כתובות",
@@ -119,13 +119,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "פנקס כתובות חדש",
-"Edit Addressbook" => "עריכת פנקס הכתובות",
-"Displayname" => "שם התצוגה",
-"Active" => "פעיל",
-"Save" => "שמירה",
-"Submit" => "ביצוע",
-"Cancel" => "ביטול",
 "Import a contacts file" => "יבא קובץ אנשי קשר",
 "Please choose the addressbook" => "אנא בחר ספר כתובות",
 "create a new addressbook" => "צור ספר כתובות חדש",
@@ -140,5 +133,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "הורדה",
 "Edit" => "עריכה",
-"New Address Book" => "פנקס כתובות חדש"
+"New Address Book" => "פנקס כתובות חדש",
+"Save" => "שמירה",
+"Cancel" => "ביטול"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index 220794f8c4..02e0fc481b 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -37,7 +37,6 @@
 "No file was uploaded" => "Datoteka nije poslana",
 "Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Contacts" => "Kontakti",
-"Contact" => "Kontakt",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
 "Address" => "Adresa",
@@ -56,6 +55,7 @@
 "Internet" => "Internet",
 "Birthday" => "Rođendan",
 "{name}'s Birthday" => "{name} Rođendan",
+"Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
 "Import" => "Uvezi",
 "Addressbooks" => "Adresari",
@@ -88,14 +88,9 @@
 "Zipcode" => "Poštanski broj",
 "Country" => "Država",
 "Addressbook" => "Adresar",
-"New Addressbook" => "Novi adresar",
-"Edit Addressbook" => "Uredi adresar",
-"Displayname" => "Prikazani naziv",
-"Active" => "Aktivno",
-"Save" => "Spremi",
-"Submit" => "Pošalji",
-"Cancel" => "Prekini",
 "Download" => "Preuzimanje",
 "Edit" => "Uredi",
-"New Address Book" => "Novi adresar"
+"New Address Book" => "Novi adresar",
+"Save" => "Spremi",
+"Cancel" => "Prekini"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 6745d68a2f..19a9e7120c 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Nem támogatott",
 "Couldn't get a valid address." => "Érvényes cím lekérése sikertelen",
 "Error" => "Hiba",
-"Contact" => "Kapcsolat",
 "This property has to be non-empty." => "Ezt a tulajdonságot muszáj kitölteni",
 "Couldn't serialize elements." => "Sorbarakás sikertelen",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát.",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Születésnap",
 "{name}'s Birthday" => "{name} születésnapja",
+"Contact" => "Kapcsolat",
 "Add Contact" => "Kapcsolat hozzáadása",
 "Import" => "Import",
 "Addressbooks" => "Címlisták",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Ifj.",
 "Sn." => "Id.",
-"New Addressbook" => "Új Címlista",
-"Edit Addressbook" => "Címlista szerkesztése",
-"Displayname" => "Megjelenített név",
-"Active" => "Aktív",
-"Save" => "Mentés",
-"Submit" => "Elküld",
-"Cancel" => "Mégsem",
 "Import a contacts file" => "Kapcsolat-fájl importálása",
 "Please choose the addressbook" => "Válassza ki a címlistát",
 "create a new addressbook" => "Címlista létrehozása",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Letöltés",
 "Edit" => "Szerkesztés",
-"New Address Book" => "Új címlista"
+"New Address Book" => "Új címlista",
+"Save" => "Mentés",
+"Cancel" => "Mégsem"
 );
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index ceb80a9874..0eb600f811 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
-"Contact" => "Contacto",
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
 "Address" => "Adresse",
@@ -25,6 +24,7 @@
 "Pager" => "Pager",
 "Internet" => "Internet",
 "Birthday" => "Anniversario",
+"Contact" => "Contacto",
 "Add Contact" => "Adder contacto",
 "Import" => "Importar",
 "Addressbooks" => "Adressarios",
@@ -67,12 +67,6 @@
 "Additional names" => "Nomines additional",
 "Family name" => "Nomine de familia",
 "Hon. suffixes" => "Suffixos honorific",
-"New Addressbook" => "Nove adressario",
-"Edit Addressbook" => "Modificar adressario",
-"Active" => "Active",
-"Save" => "Salveguardar",
-"Submit" => "Submitter",
-"Cancel" => "Cancellar",
 "Import a contacts file" => "Importar un file de contactos",
 "Please choose the addressbook" => "Per favor selige le adressario",
 "create a new addressbook" => "Crear un nove adressario",
@@ -82,5 +76,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Discargar",
 "Edit" => "Modificar",
-"New Address Book" => "Nove adressario"
+"New Address Book" => "Nove adressario",
+"Save" => "Salveguardar",
+"Cancel" => "Cancellar"
 );
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index eff63acf97..b5372d7411 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -53,9 +53,6 @@
 "Not implemented" => "Non implementata",
 "Couldn't get a valid address." => "Impossibile ottenere un indirizzo valido.",
 "Error" => "Errore",
-"Contact" => "Contatto",
-"New" => "Nuovo",
-"New Contact" => "Nuovo contatto",
 "This property has to be non-empty." => "Questa proprietà non può essere vuota.",
 "Couldn't serialize elements." => "Impossibile serializzare gli elementi.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org",
@@ -63,9 +60,12 @@
 "No files selected for upload." => "Nessun file selezionato per l'invio",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server.",
 "Select type" => "Seleziona il tipo",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
 "Result: " => "Risultato: ",
 " imported, " => " importato, ",
 " failed." => " non riuscito.",
+"Displayname cannot be empty." => "Il nome visualizzato non può essere vuoto.",
+"Addressbook not found: " => "Rubrica non trovata:",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
 "Address" => "Indirizzo",
@@ -97,6 +97,7 @@
 "Projects" => "Progetti",
 "Questions" => "Domande",
 "{name}'s Birthday" => "Data di nascita di {name}",
+"Contact" => "Contatto",
 "Add Contact" => "Aggiungi contatto",
 "Import" => "Importa",
 "Settings" => "Impostazioni",
@@ -179,13 +180,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nuova rubrica",
-"Edit Addressbook" => "Modifica rubrica",
-"Displayname" => "Nome visualizzato",
-"Active" => "Attiva",
-"Save" => "Salva",
-"Submit" => "Invia",
-"Cancel" => "Annulla",
 "Import a contacts file" => "Importa un file di contatti",
 "Please choose the addressbook" => "Scegli la rubrica",
 "create a new addressbook" => "crea una nuova rubrica",
@@ -201,7 +195,14 @@
 "more info" => "altre informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Mostra collegamento CardDav",
+"Show read-only VCF link" => "Mostra collegamento VCF in sola lettura",
 "Download" => "Scarica",
 "Edit" => "Modifica",
-"New Address Book" => "Nuova rubrica"
+"New Address Book" => "Nuova rubrica",
+"Name" => "Nome",
+"Description" => "Descrizione",
+"Save" => "Salva",
+"Cancel" => "Annulla",
+"More..." => "Altro..."
 );
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index ad83d32e5c..9e4fb0c8bb 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -50,9 +50,6 @@
 "Not implemented" => "未実装",
 "Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
 "Error" => "エラー",
-"Contact" => "連絡先",
-"New" => "新規",
-"New Contact" => "新しいコンタクト",
 "This property has to be non-empty." => "この属性は空にできません。",
 "Couldn't serialize elements." => "要素をシリアライズできませんでした。",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。",
@@ -93,6 +90,7 @@
 "Projects" => "プロジェクト",
 "Questions" => "質問",
 "{name}'s Birthday" => "{name}の誕生日",
+"Contact" => "連絡先",
 "Add Contact" => "連絡先の追加",
 "Import" => "インポート",
 "Settings" => "設定",
@@ -164,13 +162,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "アドレスブックの新規作成",
-"Edit Addressbook" => "アドレスブックを編集",
-"Displayname" => "表示名",
-"Active" => "アクティブ",
-"Save" => "保存",
-"Submit" => "送信",
-"Cancel" => "取り消し",
 "Import a contacts file" => "コンタクトファイルをインポート",
 "Please choose the addressbook" => "アドレスブックを選択してください",
 "create a new addressbook" => "新しいアドレスブックを作成",
@@ -186,5 +177,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "ダウンロード",
 "Edit" => "編集",
-"New Address Book" => "新規電話帳"
+"New Address Book" => "新規電話帳",
+"Save" => "保存",
+"Cancel" => "取り消し"
 );
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index 41bcb2d455..b7d62a4510 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -50,7 +50,6 @@
 "Not implemented" => "구현되지 않음",
 "Couldn't get a valid address." => "유효한 주소를 얻을 수 없습니다.",
 "Error" => "오류",
-"Contact" => "연락처",
 "Couldn't serialize elements." => "요소를 직렬화 할 수 없습니다.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. ",
 "Edit name" => "이름 편집",
@@ -78,6 +77,7 @@
 "Internet" => "인터넷",
 "Birthday" => "생일",
 "{name}'s Birthday" => "{이름}의 생일",
+"Contact" => "연락처",
 "Add Contact" => "연락처 추가",
 "Import" => "입력",
 "Addressbooks" => "주소록",
@@ -139,13 +139,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "새 주소록",
-"Edit Addressbook" => "주소록 편집",
-"Displayname" => "표시 이름",
-"Active" => "활성",
-"Save" => "저장",
-"Submit" => "보내기",
-"Cancel" => "취소",
 "Import a contacts file" => "연락처 파일 입력",
 "Please choose the addressbook" => "주소록을 선택해 주세요.",
 "create a new addressbook" => "새 주소록 만들기",
@@ -160,5 +153,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "다운로드",
 "Edit" => "편집",
-"New Address Book" => "새 주소록"
+"New Address Book" => "새 주소록",
+"Save" => "저장",
+"Cancel" => "취소"
 );
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 05c7adce66..000290b0b4 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -24,7 +24,6 @@
 "No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
 "Contacts" => "Kontakter",
 "Error" => "Fehler",
-"Contact" => "Kontakt",
 "Result: " => "Resultat: ",
 " imported, " => " importéiert, ",
 "This is not your addressbook." => "Dat do ass net däin Adressbuch.",
@@ -45,6 +44,7 @@
 "Internet" => "Internet",
 "Birthday" => "Gebuertsdag",
 "{name}'s Birthday" => "{name} säi Gebuertsdag",
+"Contact" => "Kontakt",
 "Add Contact" => "Kontakt bäisetzen",
 "Addressbooks" => "Adressbicher ",
 "Close" => "Zoumaachen",
@@ -80,15 +80,10 @@
 "Ph.D." => "Ph.D.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Neit Adressbuch",
-"Edit Addressbook" => "Adressbuch editéieren",
-"Displayname" => "Ugewisene Numm",
-"Active" => "Aktiv",
-"Save" => "Späicheren",
-"Submit" => "Fortschécken",
-"Cancel" => "Ofbriechen",
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Download",
 "Edit" => "Editéieren",
-"New Address Book" => "Neit Adressbuch"
+"New Address Book" => "Neit Adressbuch",
+"Save" => "Späicheren",
+"Cancel" => "Ofbriechen"
 );
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index 75962e7891..e61a3c631e 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -13,7 +13,6 @@
 "The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
 "No file was uploaded" => "Nebuvo įkeltas joks failas",
 "Contacts" => "Kontaktai",
-"Contact" => "Kontaktas",
 "This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
 "Contact could not be found." => "Kontaktas nerastas",
 "Address" => "Adresas",
@@ -31,6 +30,7 @@
 "Pager" => "Pranešimų gaviklis",
 "Internet" => "Internetas",
 "Birthday" => "Gimtadienis",
+"Contact" => "Kontaktas",
 "Add Contact" => "Pridėti kontaktą",
 "Addressbooks" => "Adresų knygos",
 "Delete" => "Trinti",
@@ -45,13 +45,9 @@
 "Zipcode" => "Pašto indeksas",
 "Country" => "Šalis",
 "Addressbook" => "Adresų knyga",
-"New Addressbook" => "Nauja adresų knyga",
-"Edit Addressbook" => "Redaguoti adresų knygą",
-"Displayname" => "Rodomas vardas",
-"Active" => "Aktyvus",
-"Save" => "Išsaugoti",
-"Cancel" => "Atšaukti",
 "Download" => "Atsisiųsti",
 "Edit" => "Keisti",
-"New Address Book" => "Nauja adresų knyga"
+"New Address Book" => "Nauja adresų knyga",
+"Save" => "Išsaugoti",
+"Cancel" => "Atšaukti"
 );
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index d2a506f6f6..15236e73d4 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Не е имплементирано",
 "Couldn't get a valid address." => "Не можев да добијам исправна адреса.",
 "Error" => "Грешка",
-"Contact" => "Контакт",
 "This property has to be non-empty." => "Својството не смее да биде празно.",
 "Couldn't serialize elements." => "Не може да се серијализираат елементите.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Интернет",
 "Birthday" => "Роденден",
 "{name}'s Birthday" => "Роденден на {name}",
+"Contact" => "Контакт",
 "Add Contact" => "Додади контакт",
 "Import" => "Внеси",
 "Addressbooks" => "Адресари",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Помлад.",
 "Sn." => "Постар.",
-"New Addressbook" => "Нов адресар",
-"Edit Addressbook" => "Уреди адресар",
-"Displayname" => "Прикажано име",
-"Active" => "Активно",
-"Save" => "Сними",
-"Submit" => "Прати",
-"Cancel" => "Откажи",
 "Import a contacts file" => "Внеси датотека со контакти",
 "Please choose the addressbook" => "Ве молам изберете адресар",
 "create a new addressbook" => "креирај нов адресар",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Преземи",
 "Edit" => "Уреди",
-"New Address Book" => "Нов адресар"
+"New Address Book" => "Нов адресар",
+"Save" => "Сними",
+"Cancel" => "Откажи"
 );
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 39af4f6f8a..2489239808 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Tidak digunakan",
 "Couldn't get a valid address." => "Tidak boleh mendapat alamat yang sah.",
 "Error" => "Ralat",
-"Contact" => "Hubungan",
 "This property has to be non-empty." => "Nilai ini tidak boleh kosong.",
 "Couldn't serialize elements." => "Tidak boleh menggabungkan elemen.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Hari lahir",
 "{name}'s Birthday" => "Hari Lahir {name}",
+"Contact" => "Hubungan",
 "Add Contact" => "Tambah kenalan",
 "Import" => "Import",
 "Addressbooks" => "Senarai Buku Alamat",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Buku Alamat Baru",
-"Edit Addressbook" => "Kemaskini Buku Alamat",
-"Displayname" => "Paparan nama",
-"Active" => "Aktif",
-"Save" => "Simpan",
-"Submit" => "Hantar",
-"Cancel" => "Batal",
 "Import a contacts file" => "Import fail kenalan",
 "Please choose the addressbook" => "Sila pilih buku alamat",
 "create a new addressbook" => "Cipta buku alamat baru",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Muat naik",
 "Edit" => "Sunting",
-"New Address Book" => "Buku Alamat Baru"
+"New Address Book" => "Buku Alamat Baru",
+"Save" => "Simpan",
+"Cancel" => "Batal"
 );
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 0347519f6c..bbbe80e9b1 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -39,7 +39,6 @@
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "Contacts" => "Kontakter",
 "Error" => "Feil",
-"Contact" => "Kontakt",
 "Edit name" => "Endre navn",
 "No files selected for upload." => "Ingen filer valgt for opplasting.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du prøver å laste opp er for stor.",
@@ -65,6 +64,7 @@
 "Internet" => "Internett",
 "Birthday" => "Bursdag",
 "{name}'s Birthday" => "{name}s bursdag",
+"Contact" => "Kontakt",
 "Add Contact" => "Ny kontakt",
 "Import" => "Importer",
 "Addressbooks" => "Adressebøker",
@@ -119,13 +119,6 @@
 "Ph.D." => "Stipendiat",
 "Jr." => "Jr.",
 "Sn." => "Sr.",
-"New Addressbook" => "Ny adressebok",
-"Edit Addressbook" => "Endre adressebok",
-"Displayname" => "Visningsnavn",
-"Active" => "Aktiv",
-"Save" => "Lagre",
-"Submit" => "Lagre",
-"Cancel" => "Avbryt",
 "Import a contacts file" => "Importer en fil med kontakter.",
 "Please choose the addressbook" => "Vennligst velg adressebok",
 "create a new addressbook" => "Lag ny adressebok",
@@ -139,5 +132,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Hent ned",
 "Edit" => "Rediger",
-"New Address Book" => "Ny adressebok"
+"New Address Book" => "Ny adressebok",
+"Save" => "Lagre",
+"Cancel" => "Avbryt"
 );
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index 3e0ad4168a..7ea147e879 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -37,7 +37,6 @@
 "No file was uploaded" => "Er is geen bestand geüpload",
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
-"Contact" => "Contact",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
 "Address" => "Adres",
@@ -56,6 +55,7 @@
 "Internet" => "Internet",
 "Birthday" => "Verjaardag",
 "{name}'s Birthday" => "{name}'s verjaardag",
+"Contact" => "Contact",
 "Add Contact" => "Contact toevoegen",
 "Import" => "Importeer",
 "Addressbooks" => "Adresboeken",
@@ -101,13 +101,6 @@
 "Given name" => "Voornaam",
 "Additional names" => "Extra namen",
 "Family name" => "Achternaam",
-"New Addressbook" => "Nieuw adresboek",
-"Edit Addressbook" => "Wijzig adresboek",
-"Displayname" => "Weergavenaam",
-"Active" => "Actief",
-"Save" => "Opslaan",
-"Submit" => "Opslaan",
-"Cancel" => "Anuleren",
 "Import a contacts file" => "Importeer een contacten bestand",
 "Please choose the addressbook" => "Kies een adresboek",
 "create a new addressbook" => "Maak een nieuw adresboek",
@@ -122,5 +115,7 @@
 "iOS/OS X" => "IOS/OS X",
 "Download" => "Download",
 "Edit" => "Bewerken",
-"New Address Book" => "Nieuw Adresboek"
+"New Address Book" => "Nieuw Adresboek",
+"Save" => "Opslaan",
+"Cancel" => "Anuleren"
 );
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index d56a8957c5..b7c75cd652 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -8,7 +8,6 @@
 "Error deleting contact property." => "Eit problem oppstod ved å slette kontaktfeltet.",
 "Error updating contact property." => "Eit problem oppstod ved å endre kontaktfeltet.",
 "Contacts" => "Kotaktar",
-"Contact" => "Kontakt",
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
 "Contact could not be found." => "Fann ikkje kontakten.",
 "Address" => "Adresse",
@@ -24,6 +23,7 @@
 "Video" => "Video",
 "Pager" => "Personsøkjar",
 "Birthday" => "Bursdag",
+"Contact" => "Kontakt",
 "Add Contact" => "Legg til kontakt",
 "Addressbooks" => "Adressebøker",
 "Delete" => "Slett",
@@ -39,14 +39,9 @@
 "Zipcode" => "Postnummer",
 "Country" => "Land",
 "Addressbook" => "Adressebok",
-"New Addressbook" => "Ny adressebok",
-"Edit Addressbook" => "Endre adressebok",
-"Displayname" => "Visningsnamn",
-"Active" => "Aktiv",
-"Save" => "Lagre",
-"Submit" => "Send",
-"Cancel" => "Kanseller",
 "Download" => "Last ned",
 "Edit" => "Endra",
-"New Address Book" => "Ny adressebok"
+"New Address Book" => "Ny adressebok",
+"Save" => "Lagre",
+"Cancel" => "Kanseller"
 );
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 591ecac845..d4095023ef 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -53,9 +53,6 @@
 "Not implemented" => "Nie wdrożono",
 "Couldn't get a valid address." => "Nie można pobrać prawidłowego adresu.",
 "Error" => "Błąd",
-"Contact" => "Kontakt",
-"New" => "Nowy",
-"New Contact" => "Nowy kontakt",
 "This property has to be non-empty." => "Ta właściwość nie może być pusta.",
 "Couldn't serialize elements." => "Nie można serializować elementów.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org",
@@ -94,6 +91,7 @@
 "Projects" => "Projekty",
 "Questions" => "Pytania",
 "{name}'s Birthday" => "{name} Urodzony",
+"Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
 "Import" => "Import",
 "Settings" => "Ustawienia",
@@ -172,13 +170,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nowa książka adresowa",
-"Edit Addressbook" => "Edytowanie książki adresowej",
-"Displayname" => "Wyświetlana nazwa",
-"Active" => "Aktywna",
-"Save" => "Zapisz",
-"Submit" => "Potwierdź",
-"Cancel" => "Anuluj",
 "Import a contacts file" => "Importuj plik z kontaktami",
 "Please choose the addressbook" => "Proszę wybrać książkę adresową",
 "create a new addressbook" => "utwórz nową książkę adresową",
@@ -196,5 +187,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
-"New Address Book" => "Nowa książka adresowa"
+"New Address Book" => "Nowa książka adresowa",
+"Save" => "Zapisz",
+"Cancel" => "Anuluj"
 );
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index ac02cf6eff..b4077a9ca1 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -51,7 +51,6 @@
 "Not implemented" => "não implementado",
 "Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
 "Error" => "Erro",
-"Contact" => "Contato",
 "This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
 "Couldn't serialize elements." => "Não foi possível serializar elementos.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Aniversário",
 "{name}'s Birthday" => "Aniversário de {name}",
+"Contact" => "Contato",
 "Add Contact" => "Adicionar Contato",
 "Import" => "Importar",
 "Addressbooks" => "Agendas de Endereço",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nova Agenda de Endereço",
-"Edit Addressbook" => "Editar Agenda de Endereço",
-"Displayname" => "Nome de exibição",
-"Active" => "Ativo",
-"Save" => "Salvar",
-"Submit" => "Enviar",
-"Cancel" => "Cancelar",
 "Import a contacts file" => "Importar arquivos de contato.",
 "Please choose the addressbook" => "Por favor, selecione uma agenda de endereços",
 "create a new addressbook" => "Criar nova agenda de endereços",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Baixar",
 "Edit" => "Editar",
-"New Address Book" => "Nova agenda"
+"New Address Book" => "Nova agenda",
+"Save" => "Salvar",
+"Cancel" => "Cancelar"
 );
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 1042a15e3d..3ad2d4ad7d 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Não implementado",
 "Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
 "Error" => "Erro",
-"Contact" => "Contacto",
 "This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
 "Couldn't serialize elements." => "Não foi possivel serializar os elementos",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Aniversário",
 "{name}'s Birthday" => "Aniversário de {name}",
+"Contact" => "Contacto",
 "Add Contact" => "Adicionar Contacto",
 "Import" => "Importar",
 "Addressbooks" => "Livros de endereços",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "r.",
-"New Addressbook" => "Novo livro de endereços",
-"Edit Addressbook" => "Editar livro de endereços",
-"Displayname" => "Nome de exibição",
-"Active" => "Ativo",
-"Save" => "Guardar",
-"Submit" => "Submeter",
-"Cancel" => "Cancelar",
 "Import a contacts file" => "Importar um ficheiro de contactos",
 "Please choose the addressbook" => "Por favor seleccione o livro de endereços",
 "create a new addressbook" => "Criar um novo livro de endereços",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Transferir",
 "Edit" => "Editar",
-"New Address Book" => "Novo livro de endereços"
+"New Address Book" => "Novo livro de endereços",
+"Save" => "Guardar",
+"Cancel" => "Cancelar"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index ab4cc73006..6b5f599977 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -26,7 +26,6 @@
 "checksum is not set." => "suma de control nu este stabilită.",
 "Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "Contacts" => "Contacte",
-"Contact" => "Contact",
 "This is not your addressbook." => "Nu se găsește în agendă.",
 "Contact could not be found." => "Contactul nu a putut fi găsit.",
 "Address" => "Adresă",
@@ -45,6 +44,7 @@
 "Internet" => "Internet",
 "Birthday" => "Zi de naștere",
 "{name}'s Birthday" => "Ziua de naștere a {name}",
+"Contact" => "Contact",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
 "Edit name details" => "Introdu detalii despre nume",
@@ -71,14 +71,9 @@
 "Zipcode" => "Cod poștal",
 "Country" => "Țară",
 "Addressbook" => "Agendă",
-"New Addressbook" => "Agendă nouă",
-"Edit Addressbook" => "Modifică agenda",
-"Displayname" => "Nume afișat",
-"Active" => "Activ",
-"Save" => "Salvează",
-"Submit" => "Trimite",
-"Cancel" => "Anulează",
 "Download" => "Descarcă",
 "Edit" => "Editează",
-"New Address Book" => "Agendă nouă"
+"New Address Book" => "Agendă nouă",
+"Save" => "Salvează",
+"Cancel" => "Anulează"
 );
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index b598b6c11d..63b405c9f8 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Не реализовано",
 "Couldn't get a valid address." => "Не удалось получить адрес.",
 "Error" => "Ошибка",
-"Contact" => "Контакт",
 "This property has to be non-empty." => "Это свойство должно быть не пустым.",
 "Couldn't serialize elements." => "Не удалось сериализовать элементы.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' called without type argument. Please report at bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Интернет",
 "Birthday" => "День рождения",
 "{name}'s Birthday" => "День рождения {name}",
+"Contact" => "Контакт",
 "Add Contact" => "Добавить Контакт",
 "Import" => "Импорт",
 "Addressbooks" => "Адресные книги",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Новая адресная книга",
-"Edit Addressbook" => "Редактировать адресную книгу",
-"Displayname" => "Отображаемое имя",
-"Active" => "Активно",
-"Save" => "Сохранить",
-"Submit" => "Отправить",
-"Cancel" => "Отменить",
 "Import a contacts file" => "Загрузить файл контактов",
 "Please choose the addressbook" => "Выберите адресную книгу",
 "create a new addressbook" => "создать новую адресную книгу",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
-"New Address Book" => "Новая адресная книга"
+"New Address Book" => "Новая адресная книга",
+"Save" => "Сохранить",
+"Cancel" => "Отменить"
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index cf85f4cf3e..bc4281c1f3 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -51,9 +51,6 @@
 "Not implemented" => "Neimplementované",
 "Couldn't get a valid address." => "Nemôžem získať platnú adresu.",
 "Error" => "Chyba",
-"Contact" => "Kontakt",
-"New" => "Nový",
-"New Contact" => "Nový kontakt",
 "This property has to be non-empty." => "Tento parameter nemôže byť prázdny.",
 "Couldn't serialize elements." => "Nemôžem previesť prvky.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org",
@@ -89,6 +86,7 @@
 "Projects" => "Projekty",
 "Questions" => "Otázky",
 "{name}'s Birthday" => "Narodeniny {name}",
+"Contact" => "Kontakt",
 "Add Contact" => "Pridať Kontakt.",
 "Import" => "Importovať",
 "Addressbooks" => "Adresáre",
@@ -164,13 +162,6 @@
 "Esq." => "Esq.",
 "Jr." => "ml.",
 "Sn." => "st.",
-"New Addressbook" => "Nový Adresár",
-"Edit Addressbook" => "Upraviť Adresár",
-"Displayname" => "Zobrazené meno",
-"Active" => "Aktívny",
-"Save" => "Uložiť",
-"Submit" => "Odoslať",
-"Cancel" => "Zrušiť",
 "Import a contacts file" => "Importovať súbor kontaktu",
 "Please choose the addressbook" => "Prosím zvolte adresár",
 "create a new addressbook" => "vytvoriť nový adresár",
@@ -186,5 +177,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Stiahnuť",
 "Edit" => "Upraviť",
-"New Address Book" => "Nový adresár"
+"New Address Book" => "Nový adresár",
+"Save" => "Uložiť",
+"Cancel" => "Zrušiť"
 );
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 73d919cf0a..4642b48bb6 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -51,7 +51,6 @@
 "Not implemented" => "Ni podprto",
 "Couldn't get a valid address." => "Ne morem dobiti veljavnega naslova.",
 "Error" => "Napaka",
-"Contact" => "Stik",
 "This property has to be non-empty." => "Ta lastnost ne sme biti prazna",
 "Couldn't serialize elements." => "Predmetov ni bilo mogoče dati v zaporedje.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "Internet",
 "Birthday" => "Rojstni dan",
 "{name}'s Birthday" => "{name} - rojstni dan",
+"Contact" => "Stik",
 "Add Contact" => "Dodaj stik",
 "Import" => "Uvozi",
 "Addressbooks" => "Imeniki",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "mlajši",
 "Sn." => "starejši",
-"New Addressbook" => "Nov imenik",
-"Edit Addressbook" => "Uredi imenik",
-"Displayname" => "Ime za prikaz",
-"Active" => "Aktiven",
-"Save" => "Shrani",
-"Submit" => "Potrdi",
-"Cancel" => "Prekliči",
 "Import a contacts file" => "Uvozi datoteko s stiki",
 "Please choose the addressbook" => "Prosimo, če izberete imenik",
 "create a new addressbook" => "Ustvari nov imenik",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Prenesi",
 "Edit" => "Uredi",
-"New Address Book" => "Nov imenik"
+"New Address Book" => "Nov imenik",
+"Save" => "Shrani",
+"Cancel" => "Prekliči"
 );
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index 77c86a9d93..ad8e1c28fb 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
 "Contacts" => "Контакти",
-"Contact" => "Контакт",
 "This is not your addressbook." => "Ово није ваш адресар.",
 "Contact could not be found." => "Контакт се не може наћи.",
 "Address" => "Адреса",
@@ -17,6 +16,7 @@
 "Video" => "Видео",
 "Pager" => "Пејџер",
 "Birthday" => "Рођендан",
+"Contact" => "Контакт",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "Адресар",
 "Delete" => "Обриши",
@@ -32,14 +32,9 @@
 "Zipcode" => "Зип код",
 "Country" => "Земља",
 "Addressbook" => "Адресар",
-"New Addressbook" => "Нови адресар",
-"Edit Addressbook" => "Уреди адресар",
-"Displayname" => "Приказано име",
-"Active" => "Активан",
-"Save" => "Сними",
-"Submit" => "Пошаљи",
-"Cancel" => "Откажи",
 "Download" => "Преузимање",
 "Edit" => "Уреди",
-"New Address Book" => "Нови адресар"
+"New Address Book" => "Нови адресар",
+"Save" => "Сними",
+"Cancel" => "Откажи"
 );
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index 1795a45c09..22099d6729 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -47,9 +47,6 @@
 "Not implemented" => "Inte införd",
 "Couldn't get a valid address." => "Kunde inte hitta en giltig adress.",
 "Error" => "Fel",
-"Contact" => "Kontakt",
-"New" => "Ny",
-"New Contact" => "Ny kontakt",
 "This property has to be non-empty." => "Denna egenskap får inte vara tom.",
 "Couldn't serialize elements." => "Kunde inte serialisera element.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org",
@@ -84,6 +81,7 @@
 "Holidays" => "Helgdagar",
 "Ideas" => "Idéer",
 "{name}'s Birthday" => "{name}'s födelsedag",
+"Contact" => "Kontakt",
 "Add Contact" => "Lägg till kontakt",
 "Import" => "Importera",
 "Addressbooks" => "Adressböcker",
@@ -136,13 +134,6 @@
 "Additional names" => "Mellannamn",
 "Family name" => "Efternamn",
 "Ph.D." => "Fil.dr.",
-"New Addressbook" => "Ny adressbok",
-"Edit Addressbook" => "Redigera adressbok",
-"Displayname" => "Visningsnamn",
-"Active" => "Aktiv",
-"Save" => "Spara",
-"Submit" => "Skicka in",
-"Cancel" => "Avbryt",
 "Import a contacts file" => "Importera en kontaktfil",
 "Please choose the addressbook" => "Vänligen välj adressboken",
 "create a new addressbook" => "skapa en ny adressbok",
@@ -157,5 +148,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "Nedladdning",
 "Edit" => "Redigera",
-"New Address Book" => "Ny adressbok"
+"New Address Book" => "Ny adressbok",
+"Save" => "Spara",
+"Cancel" => "Avbryt"
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index e33d238b94..cff8239e75 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -51,7 +51,6 @@
 "Not implemented" => "ยังไม่ได้ถูกดำเนินการ",
 "Couldn't get a valid address." => "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้",
 "Error" => "พบข้อผิดพลาด",
-"Contact" => "ข้อมูลการติดต่อ",
 "This property has to be non-empty." => "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่",
 "Couldn't serialize elements." => "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org",
@@ -80,6 +79,7 @@
 "Internet" => "อินเทอร์เน็ต",
 "Birthday" => "วันเกิด",
 "{name}'s Birthday" => "วันเกิดของ {name}",
+"Contact" => "ข้อมูลการติดต่อ",
 "Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
 "Import" => "นำเข้า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
@@ -142,13 +142,6 @@
 "Esq." => "Esq.",
 "Jr." => "จูเนียร์",
 "Sn." => "ซีเนียร์",
-"New Addressbook" => "สร้างสมุดบันทึกที่อยู่ใหม่",
-"Edit Addressbook" => "แก้ไขสมุดบันทึกที่อยู่",
-"Displayname" => "ชื่อที่ต้องการให้แสดง",
-"Active" => "เปิดใช้",
-"Save" => "บันทึก",
-"Submit" => "ส่งข้อมูล",
-"Cancel" => "ยกเลิก",
 "Import a contacts file" => "นำเข้าไฟล์ข้อมูลการติดต่อ",
 "Please choose the addressbook" => "กรุณาเลือกสมุดบันทึกที่อยู่",
 "create a new addressbook" => "สร้างสมุดบันทึกที่อยู่ใหม่",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "ดาวน์โหลด",
 "Edit" => "แก้ไข",
-"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
+"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
+"Save" => "บันทึก",
+"Cancel" => "ยกเลิก"
 );
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 2cbe15cef9..4b67c7dc76 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -53,9 +53,6 @@
 "Not implemented" => "Tamamlanmadı.",
 "Couldn't get a valid address." => "Geçerli bir adres alınamadı.",
 "Error" => "Hata",
-"Contact" => "Kişi",
-"New" => "Yeni",
-"New Contact" => "Yeni Kişi",
 "This property has to be non-empty." => "Bu özellik boş bırakılmamalı.",
 "Couldn't serialize elements." => "Öğeler seri hale getiremedi",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz.",
@@ -97,6 +94,7 @@
 "Projects" => "Projeler",
 "Questions" => "Sorular",
 "{name}'s Birthday" => "{name}'nin Doğumgünü",
+"Contact" => "Kişi",
 "Add Contact" => "Kişi Ekle",
 "Import" => "İçe aktar",
 "Addressbooks" => "Adres defterleri",
@@ -178,13 +176,6 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Yeni Adres defteri",
-"Edit Addressbook" => "Adres Defterini Düzenle",
-"Displayname" => "Görünen adı",
-"Active" => "Aktif",
-"Save" => "Kaydet",
-"Submit" => "Gönder",
-"Cancel" => "İptal",
 "Import a contacts file" => "Bağlantı dosyasını içeri aktar",
 "Please choose the addressbook" => "Yeni adres defterini seç",
 "create a new addressbook" => "Yeni adres defteri oluştur",
@@ -202,5 +193,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "İndir",
 "Edit" => "Düzenle",
-"New Address Book" => "Yeni Adres Defteri"
+"New Address Book" => "Yeni Adres Defteri",
+"Save" => "Kaydet",
+"Cancel" => "İptal"
 );
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
index 027895690d..cc09651065 100644
--- a/apps/contacts/l10n/uk.php
+++ b/apps/contacts/l10n/uk.php
@@ -20,7 +20,6 @@
 "City" => "Місто",
 "Zipcode" => "Поштовий індекс",
 "Country" => "Країна",
-"Displayname" => "Відображуване ім'я",
 "Download" => "Завантажити",
 "New Address Book" => "Нова адресна книга"
 );
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
index 060ca079fa..187edb69b5 100644
--- a/apps/contacts/l10n/vi.php
+++ b/apps/contacts/l10n/vi.php
@@ -12,7 +12,6 @@
 "Error uploading contacts to storage." => "Lỗi tải lên danh sách địa chỉ để lưu trữ.",
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin tải lên thành công",
 "Contacts" => "Liên lạc",
-"Contact" => "Danh sách",
 "Address" => "Địa chỉ",
 "Telephone" => "Điện thoại bàn",
 "Email" => "Email",
@@ -24,6 +23,7 @@
 "Video" => "Video",
 "Pager" => "số trang",
 "Birthday" => "Ngày sinh nhật",
+"Contact" => "Danh sách",
 "Add Contact" => "Thêm liên lạc",
 "Addressbooks" => "Sổ địa chỉ",
 "Delete" => "Xóa",
@@ -35,13 +35,8 @@
 "Zipcode" => "Mã bưu điện",
 "Country" => "Quốc gia",
 "Addressbook" => "Sổ địa chỉ",
-"New Addressbook" => "Sổ địa chỉ mới",
-"Edit Addressbook" => "Sửa sổ địa chỉ",
-"Displayname" => "Hiển thị tên",
-"Active" => "Kích hoạt",
-"Save" => "Lưu",
-"Submit" => "Submit",
-"Cancel" => "Hủy",
 "Download" => "Tải về",
-"Edit" => "Sửa"
+"Edit" => "Sửa",
+"Save" => "Lưu",
+"Cancel" => "Hủy"
 );
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index b996095d26..8962551427 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -51,7 +51,6 @@
 "Not implemented" => "未实现",
 "Couldn't get a valid address." => "无法获取一个合法的地址。",
 "Error" => "错误",
-"Contact" => "联系人",
 "This property has to be non-empty." => "这个属性必须是非空的",
 "Couldn't serialize elements." => "无法序列化元素",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误",
@@ -80,6 +79,7 @@
 "Internet" => "互联网",
 "Birthday" => "生日",
 "{name}'s Birthday" => "{name} 的生日",
+"Contact" => "联系人",
 "Add Contact" => "添加联系人",
 "Import" => "导入",
 "Addressbooks" => "地址簿",
@@ -142,13 +142,6 @@
 "Esq." => "先生",
 "Jr." => "小",
 "Sn." => "老",
-"New Addressbook" => "新建地址簿",
-"Edit Addressbook" => "编辑地址簿",
-"Displayname" => "显示名称",
-"Active" => "激活",
-"Save" => "保存",
-"Submit" => "提交",
-"Cancel" => "取消",
 "Import a contacts file" => "导入联系人文件",
 "Please choose the addressbook" => "请选择地址簿",
 "create a new addressbook" => "创建新地址簿",
@@ -163,5 +156,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Download" => "下载",
 "Edit" => "编辑",
-"New Address Book" => "新建地址簿"
+"New Address Book" => "新建地址簿",
+"Save" => "保存",
+"Cancel" => "取消"
 );
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index 4751c22f1d..c92ad3abbd 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -12,7 +12,6 @@
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
-"Contact" => "通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
 "Address" => "地址",
@@ -31,6 +30,7 @@
 "Internet" => "網際網路",
 "Birthday" => "生日",
 "{name}'s Birthday" => "{name}的生日",
+"Contact" => "通訊錄",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
 "Edit name details" => "編輯姓名詳細資訊",
@@ -70,14 +70,9 @@
 "Given name" => "給定名（名）",
 "Additional names" => "額外名",
 "Family name" => "家族名（姓）",
-"New Addressbook" => "新電話簿",
-"Edit Addressbook" => "編輯電話簿",
-"Displayname" => "顯示名稱",
-"Active" => "作用中",
-"Save" => "儲存",
-"Submit" => "提出",
-"Cancel" => "取消",
 "Download" => "下載",
 "Edit" => "編輯",
-"New Address Book" => "新電話簿"
+"New Address Book" => "新電話簿",
+"Save" => "儲存",
+"Cancel" => "取消"
 );
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index ce154bacb7..57ba31e92b 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -9,6 +9,13 @@
 "Files" => "Αρχεία",
 "Unshare" => "Ακύρωση Διαμοιρασμού",
 "Delete" => "Διαγραφή",
+"already exists" => "υπάρχει ήδη",
+"replace" => "αντικατέστησε",
+"cancel" => "ακύρωση",
+"replaced" => "αντικαταστάθηκε",
+"with" => "με",
+"undo" => "αναίρεση",
+"deleted" => "διαγράφηκε",
 "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
 "Upload Error" => "Σφάλμα Μεταφόρτωσης",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 1b1cfd394c..9e4be5b38a 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -9,6 +9,13 @@
 "Files" => "Tiedostot",
 "Unshare" => "Lopeta jakaminen",
 "Delete" => "Poista",
+"already exists" => "on jo olemassa",
+"replace" => "korvaa",
+"cancel" => "peru",
+"replaced" => "korvattu",
+"with" => "käyttäen",
+"undo" => "kumoa",
+"deleted" => "poistettu",
 "generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
 "Upload Error" => "Lähetysvirhe.",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 91dc791176..3d4e9fc78c 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 88a96f503f..ec2aef5ca0 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "المعارف"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "معرفه"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "معرفه"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "أضف شخص "
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "كتب العناوين"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "كتاب عناوين جديد"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "عدل كتاب العناوين"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "الاسم المعروض"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "فعال"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "حفظ"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "ارسال"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "الغاء"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "حفظ"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "الغاء"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 4b0078ce6f..bc235e42cb 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 1e67535533..fb6adf9dce 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index b82f58e896..38f9f0b97a 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr "El fitxer no existeix:"
 msgid "Error loading image."
 msgstr "Error en carregar la imatge."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Error en obtenir l'objecte contacte."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Error en obtenir la propietat PHOTO."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Error en trobar la imatge:"
 
@@ -166,15 +166,15 @@ msgstr "Error en trobar la imatge:"
 msgid "checksum is not set."
 msgstr "no s'ha establert la suma de verificació."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
@@ -224,77 +224,65 @@ msgstr "No s'ha carregat cap fitxer. Error desconegut"
 msgid "Contacts"
 msgstr "Contactes"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Aquesta funcionalitat encara no està implementada"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "No implementada"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contacte"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Nou"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Contate nou"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -310,11 +298,11 @@ msgstr " fallada."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "El nom a mostrar no pot ser buit"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "No s'ha trobat la llibreta d'adreces: "
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -442,6 +430,10 @@ msgstr "Preguntes"
 msgid "{name}'s Birthday"
 msgstr "Aniversari de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contacte"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Afegeix un contacte"
@@ -458,51 +450,51 @@ msgstr "Configuració"
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Tanca"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Navegació"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Següent contacte de la llista"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Contacte anterior de la llista"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Següent/anterior llibreta d'adreces"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Carrega de nou la llista de contactes"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Afegeix un contacte nou"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Esborra el contacte"
 
@@ -775,34 +767,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nova llibreta d'adreces"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Edita la llibreta d'adreces"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nom a mostrar"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Actiu"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Desa"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Envia"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Cancel·la"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importa un fitxer de contactes"
@@ -865,11 +829,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Mostra l'enllaç CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Mostra l'enllaç VCF només de lectura"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -885,12 +849,20 @@ msgstr "Nova llibreta d'adreces"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
+
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Desa"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Cancel·la"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Més..."
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index c59ae23b7b..e20e15a0ed 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Soubor neexistuje:"
 msgid "Error loading image."
 msgstr "Chyba při načítání obrázku."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Chyba při převzetí objektu kontakt."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Chyba při získávání fotky."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Chyba při ukládání kontaktu."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Chyba při změně velikosti obrázku."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Chyba při osekávání obrázku."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Chyba při vytváření dočasného obrázku."
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Chyba při hledání obrázku:"
 
@@ -167,15 +167,15 @@ msgstr "Chyba při hledání obrázku:"
 msgid "checksum is not set."
 msgstr "kontrolní součet není nastaven."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
@@ -225,73 +225,61 @@ msgstr "Soubor nebyl odeslán. Neznámá chyba"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužel, tato funkce nebyla ještě implementována."
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Neimplementováno"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Nelze získat platnou adresu."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Tento parametr nemuže zůstat nevyplněn."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Upravit jméno"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vybrat typ"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Narozeniny {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Přidat kontakt"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adresáře"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Zavřít"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr "ml."
 msgid "Sn."
 msgstr "st."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nový adresář"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Editace adresáře"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Zobrazené jméno"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktivní"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Uložit"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Potvrdit"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Storno"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importovat soubor kontaktů"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Uložit"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Storno"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index d95f9fcb44..c693337a4b 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -137,31 +137,31 @@ msgstr "Filen eksisterer ikke:"
 msgid "Error loading image."
 msgstr "Kunne ikke indlæse billede."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Fejl ved indlæsning af kontaktpersonobjektet."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Fejl ved indlæsning af PHOTO feltet."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Kunne ikke gemme kontaktpersonen."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Kunne ikke ændre billedets størrelse"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Kunne ikke beskære billedet"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Kunne ikke oprette midlertidigt billede"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Kunne ikke finde billedet: "
 
@@ -169,15 +169,15 @@ msgstr "Kunne ikke finde billedet: "
 msgid "checksum is not set."
 msgstr "Checksum er ikke medsendt."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
@@ -227,73 +227,61 @@ msgstr "Ingen fil blev uploadet. Ukendt fejl."
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Denne funktion er desværre ikke implementeret endnu"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Ikke implementeret"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Kunne ikke finde en gyldig adresse."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fejl"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontaktperson"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Dette felt må ikke være tomt."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Dr."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vælg type"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -445,6 +433,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}s fødselsdag"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktperson"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tilføj kontaktperson"
@@ -461,51 +453,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adressebøger"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Luk"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -778,34 +770,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Ny adressebog"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Rediger adressebog"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Vist navn"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiv"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Gem"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Gem"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Fortryd"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importer fil med kontaktpersoner"
@@ -894,6 +858,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Gem"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Fortryd"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 8218d777fc..5ae4018302 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -147,31 +147,31 @@ msgstr "Datei existiert nicht: "
 msgid "Error loading image."
 msgstr "Fehler beim Laden des Bildes."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Fehler beim Abruf des Kontakt-Objektes."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Fehler beim Speichern des Kontaktes"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Fehler beim Suchen des Bildes: "
 
@@ -179,15 +179,15 @@ msgstr "Fehler beim Suchen des Bildes: "
 msgid "checksum is not set."
 msgstr "Keine Prüfsumme angegeben."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
@@ -237,77 +237,65 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Nicht Verfügbar"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Neu"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Neuer Kontakt"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht Leer sein."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Wähle Typ"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ..."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -323,11 +311,11 @@ msgstr " fehlgeschlagen."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Der Anzeigename darf nicht leer sein."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adressbuch nicht gefunden:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -455,6 +443,10 @@ msgstr "Fragen"
 msgid "{name}'s Birthday"
 msgstr "Geburtstag von {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
@@ -471,51 +463,51 @@ msgstr "Einstellungen"
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Schließen"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Nächster Kontakt aus der Liste"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Vorheriger Kontakt aus der Liste"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Ausklappen/Einklappen des Adressbuches"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Nächstes/Vorhergehendes Adressbuch"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Kontaktliste neu laden"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Aktuellen Kontakt löschen"
 
@@ -788,34 +780,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Senior"
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Neues Adressbuch"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Adressbuch editieren"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Anzeigename"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiv"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Speichern"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Eintragen"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Kontaktdatei importieren"
@@ -878,11 +842,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "CardDav-Link anzeigen"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Schreibgeschützten VCF-Link anzeigen"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -898,12 +862,20 @@ msgstr "Neues Adressbuch"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Beschreibung"
+
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Speichern"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Abbrechen"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Mehr..."
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 20cd68f115..9c8eec3f3d 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -138,31 +138,31 @@ msgstr "Το αρχείο δεν υπάρχει:"
 msgid "Error loading image."
 msgstr "Σφάλμα φόρτωσης εικόνας"
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Σφάλμα κατά τη λήψη αντικειμένου επαφής"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
@@ -170,15 +170,15 @@ msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 msgid "checksum is not set."
 msgstr "δε ορίστηκε checksum "
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
@@ -228,77 +228,65 @@ msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλ
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Δεν έχει υλοποιηθεί"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Επαφή"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Νέο"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Νέα επαφή"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -446,6 +434,10 @@ msgstr "Ερωτήσεις"
 msgid "{name}'s Birthday"
 msgstr "{name} έχει Γενέθλια"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Επαφή"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Προσθήκη επαφής"
@@ -456,57 +448,57 @@ msgstr "Εισαγωγή"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Ρυθμίσεις"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Βιβλία διευθύνσεων"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Κλείσιμο  "
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Συντομεύσεις πλητρολογίου"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Επόμενη επαφή στη λίστα"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Προηγούμενη επαφή στη λίστα"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Ανανέωσε τη λίστα επαφών"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Προσθήκη νέου βιβλίου επαφών"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Διαγραφή τρέχουσας επαφής"
 
@@ -779,34 +771,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Νέο βιβλίο διευθύνσεων"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Επεξεργασία βιβλίου διευθύνσεων"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Προβαλλόμενο όνομα"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Ενεργό"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Καταχώρηση"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Ακύρωση"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Εισαγωγή αρχείου επαφών"
@@ -889,12 +853,20 @@ msgstr "Νέο βιβλίο διευθύνσεων"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Όνομα"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Περιγραφή"
+
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Ακύρωση"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Περισσότερα..."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index dcbe78cd0a..37e57190cb 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 09:32+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,31 +64,31 @@ msgstr "Διαγραφή"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "υπάρχει ήδη"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "αντικατέστησε"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ακύρωση"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "αντικαταστάθηκε"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "με"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "αναίρεση"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "διαγράφηκε"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index b892bbe22c..25911c57d2 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "Dosiero ne ekzistas:"
 msgid "Error loading image."
 msgstr "Eraro dum ŝargado de bildo."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Eraro dum ekhaviĝis kontakta objekto."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Eraro dum ekhaviĝis la propraĵon PHOTO."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Eraro dum konserviĝis kontakto."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Eraro dum aligrandiĝis bildo"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Eraro dum stuciĝis bildo."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Eraro dum kreiĝis provizora bildo."
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Eraro dum serĉo de bildo: "
 
@@ -165,15 +165,15 @@ msgstr "Eraro dum serĉo de bildo: "
 msgid "checksum is not set."
 msgstr "kontrolsumo ne agordiĝis."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
@@ -223,73 +223,61 @@ msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita."
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Ne disponebla"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Ne eblis ekhavi validan adreson."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Eraro"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Redakti nomon"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Elektu tipon"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Naskiĝtago de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aldoni kontakton"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adresaroj"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermi"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nova adresaro"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Redakti adresaron"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Montronomo"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiva"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Konservi"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Sendi"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Nuligi"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Enporti kontaktodosieron"
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Konservi"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Nuligi"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 14340a646e..34b0fd09ff 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -137,31 +137,31 @@ msgstr "Archivo inexistente:"
 msgid "Error loading image."
 msgstr "Error cargando imagen."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Fallo al coger el contacto."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Fallo al coger las propiedades de la foto ."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Fallo al salvar un contacto"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Fallo al cambiar de tamaño una foto"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Fallo al cortar el tamaño de la foto"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Fallo al crear la foto temporal"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Fallo al encontrar la imagen"
 
@@ -169,15 +169,15 @@ msgstr "Fallo al encontrar la imagen"
 msgid "checksum is not set."
 msgstr "no se ha puesto ninguna suma de comprobación."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
@@ -227,73 +227,61 @@ msgstr "Fallo no se subió el fichero"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Perdón esta función no esta aún implementada"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "No esta implementada"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Fallo : no hay dirección valida"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fallo"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contacto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Este campo no puede estar vacío."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Edita el Nombre"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Selecciona el tipo"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -445,6 +433,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Cumpleaños de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Añadir contacto"
@@ -461,51 +453,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Libretas de direcciones"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Cierra."
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -778,34 +770,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nueva libreta de direcciones"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Editar libreta de direcciones"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nombre a mostrar"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Activo"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Guardar"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Aceptar"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importar archivo de contactos"
@@ -894,6 +858,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Guardar"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 8ca1073883..3709c81ceb 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "Faili pole olemas:"
 msgid "Error loading image."
 msgstr "Viga pildi laadimisel."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Viga kontakti objekti hankimisel."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Viga PHOTO omaduse hankimisel."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Viga kontakti salvestamisel."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Viga pildi suuruse muutmisel"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Viga pildi lõikamisel"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Viga ajutise pildi loomisel"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Viga pildi leidmisel: "
 
@@ -165,15 +165,15 @@ msgstr "Viga pildi leidmisel: "
 msgid "checksum is not set."
 msgstr "kontrollsummat pole määratud."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
@@ -223,73 +223,61 @@ msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Vabandust, aga see funktsioon pole veel valmis"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Pole implementeeritud"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Viga"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Muuda nime"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vali tüüp"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name} sünnipäev"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisa kontakt"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Aadressiraamatud"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Sule"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Senior."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Uus aadressiraamat"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Muuda aadressiraamatut"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Näidatav nimi"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiivne"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Salvesta"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Saada"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Loobu"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Impordi kontaktifail"
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Salvesta"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Loobu"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 1d8001bc54..b4bd501d1d 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Fitxategia ez da existitzen:"
 msgid "Error loading image."
 msgstr "Errore bat izan da irudia kargatzearkoan."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Errore bat izan da kontaktu objetua lortzean."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Errore bat izan da PHOTO propietatea lortzean."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Errore bat izan da kontaktua gordetzean."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Errore bat izan da irudiaren tamaina aldatzean"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Errore bat izan da irudia mozten"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Errore bat izan da aldi bateko irudia sortzen"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Ezin izan da irudia aurkitu:"
 
@@ -167,15 +167,15 @@ msgstr "Ezin izan da irudia aurkitu:"
 msgid "checksum is not set."
 msgstr "Kontrol-batura ezarri gabe dago."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
@@ -225,73 +225,61 @@ msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Barkatu, aukera hau ez da oriandik inplementatu"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Inplementatu gabe"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Ezin izan da eposta baliagarri bat hartu."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errorea"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontaktua"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Berria"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Kontaktu berria"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Propietate hau ezin da hutsik egon."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Editatu izena"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Hautatu mota"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr "Galderak"
 msgid "{name}'s Birthday"
 msgstr "{name}ren jaioteguna"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktua"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Gehitu kontaktua"
@@ -459,51 +451,51 @@ msgstr "Ezarpenak"
 msgid "Addressbooks"
 msgstr "Helbide Liburuak"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Itxi"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Teklatuaren lasterbideak"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Nabigazioa"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Hurrengoa kontaktua zerrendan"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Aurreko kontaktua zerrendan"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Zabaldu/tolestu uneko helbide-liburua"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Hurrengo/aurreko helbide-liburua"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Gaurkotu kontaktuen zerrenda"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Gehitu kontaktu berria"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Gehitu helbide-liburu berria"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Ezabatu uneko kontaktuak"
 
@@ -776,34 +768,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Helbide-liburu berria"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Editatu helbide-liburua"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Bistaratzeko izena"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktibo"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Gorde"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Bidali"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Ezeztatu"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Inporatu kontaktuen fitxategia"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Gorde"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Ezeztatu"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index 7b57737f95..ed04880ea4 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 50dc9b76f2..710318a676 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "پرونده وجود ندارد"
 msgid "Error loading image."
 msgstr "خطا در بارگزاری تصویر"
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "خطا در گرفتن اطلاعات شخص"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "خطا در دربافت تصویر ویژگی شخصی"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "خطا در ذخیره سازی اطلاعات"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "خطا در تغییر دادن اندازه تصویر"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "خطا در برداشت تصویر"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "خطا در ساخت تصویر  temporary"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "خطا در پیدا کردن تصویر:"
 
@@ -165,15 +165,15 @@ msgstr "خطا در پیدا کردن تصویر:"
 msgid "checksum is not set."
 msgstr "checksum تنظیم شده نیست"
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
@@ -223,73 +223,61 @@ msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "با عرض پوزش،این قابلیت هنوز اجرا نشده است"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "انجام نشد"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Couldn't get a valid address."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "خطا"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "اشخاص"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "نام تغییر"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "روز تولد {name} است"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "اشخاص"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "کتابچه ی نشانی ها"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "بستن"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "کتابچه نشانی جدید"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "ویرایش کتابچه نشانی"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "نام برای نمایش"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "فعال"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "ذخیره سازی"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "ارسال"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "انصراف"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "وارد کردن پرونده حاوی اطلاعات"
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "ذخیره سازی"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "انصراف"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 0df7c2a0cd..4888af2ced 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -136,31 +136,31 @@ msgstr "Tiedostoa ei ole olemassa:"
 msgid "Error loading image."
 msgstr "Virhe kuvaa ladatessa."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -168,15 +168,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
@@ -226,73 +226,61 @@ msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Uusi"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Uusi yhteystieto"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -316,7 +304,7 @@ msgstr ""
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Osoitekirjaa ei löytynyt:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -444,6 +432,10 @@ msgstr "Kysymykset"
 msgid "{name}'s Birthday"
 msgstr "Henkilön {name} syntymäpäivä"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Yhteystieto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisää yhteystieto"
@@ -454,57 +446,57 @@ msgstr "Tuo"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Asetukset"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Osoitekirjat"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Sulje"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Pikanäppäimet"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Seuraava yhteystieto luettelossa"
+
+#: templates/index.php:44
+msgid "Previous contact in list"
+msgstr "Edellinen yhteystieto luettelossa"
 
 #: templates/index.php:46
-msgid "Previous contact in list"
-msgstr ""
-
-#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Seuraava/edellinen osoitekirja"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Päivitä yhteystietoluettelo"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Lisää uusi yhteystieto"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Lisää uusi osoitekirja"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Poista nykyinen yhteystieto"
 
@@ -580,7 +572,7 @@ msgstr "Muokkaa ryhmiä"
 
 #: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
-msgstr ""
+msgstr "Ensisijainen"
 
 #: templates/part.contact.php:64
 msgid "Please specify a valid email address."
@@ -777,34 +769,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Uusi osoitekirja"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Muokkaa osoitekirjaa"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiivinen"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Tallenna"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Lähetä"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Peru"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Tuo yhteystiedon sisältävä tiedosto"
@@ -867,11 +831,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Näytä CardDav-linkki"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Näytä vain luku -muodossa oleva VCF-linkki"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -887,12 +851,20 @@ msgstr "Uusi osoitekirja"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
+
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Tallenna"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Peru"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Lisää..."
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index e81152bac7..c441d2eba1 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 18:24+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,31 +65,31 @@ msgstr "Poista"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "on jo olemassa"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "korvaa"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "peru"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "korvattu"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "käyttäen"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "kumoa"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "poistettu"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 4d360e13dd..50d80dd63b 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 15:54+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 18:23+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr "Ohje"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Henkilökohtainen"
 
 #: app.php:299
 msgid "Settings"
@@ -60,7 +60,7 @@ msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Sovellusta ei ole otettu käyttöön"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
@@ -68,7 +68,7 @@ msgstr "Todennusvirhe"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Valtuutus vanheni. Lataa sivu uudelleen."
 
 #: template.php:86
 msgid "seconds ago"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 6fac7c4382..28f6816f2d 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -142,31 +142,31 @@ msgstr "Fichier inexistant:"
 msgid "Error loading image."
 msgstr "Erreur lors du chargement de l'image."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Erreur lors de l'obtention de l'objet contact"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Erreur lors de l'obtention des propriétés de la photo"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
@@ -174,15 +174,15 @@ msgstr "Erreur pour trouver l'image :"
 msgid "checksum is not set."
 msgstr "L'hachage n'est pas défini."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
@@ -232,73 +232,61 @@ msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Pas encore implémenté"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contact"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Nouveau"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Nouveau Contact"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Sélectionner un type"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -450,6 +438,10 @@ msgstr "Questions"
 msgid "{name}'s Birthday"
 msgstr "Anniversaire de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
@@ -466,51 +458,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Contact suivant dans la liste"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Contact précédent dans la liste"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Passer au carnet d'adresses suivant/précédent"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
@@ -783,34 +775,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nouveau carnet d'adresses"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Éditer le carnet d'adresses"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nom"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Carnet actif"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Envoyer"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Annuler"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importer un fichier de contacts"
@@ -899,6 +863,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Annuler"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 24c694cdea..7b04374f17 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr "O ficheiro non existe:"
 msgid "Error loading image."
 msgstr "Erro cargando imaxe."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Erro obtendo o obxeto contacto."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Erro obtendo a propiedade PHOTO."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Erro gardando o contacto."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Erro cambiando o tamaño da imaxe"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Erro recortando a imaxe"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Erro creando a imaxe temporal"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Erro buscando a imaxe: "
 
@@ -166,15 +166,15 @@ msgstr "Erro buscando a imaxe: "
 msgid "checksum is not set."
 msgstr "non se estableceu a suma de verificación."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
@@ -224,73 +224,61 @@ msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Sentímolo, esta función aínda non foi implementada."
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Non implementada."
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Non se puido obter un enderezo de correo válido."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contacto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Esta propiedade non pode quedar baldeira."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccione tipo"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Cumpleanos de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Engadir contacto"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Axendas"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Pechar"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nova axenda"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Editar axenda"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nome a mostrar"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Activo"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Gardar"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Enviar"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importar un ficheiro de contactos"
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Gardar"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index dca49f889e..bee29e5fa1 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "קובץ לא קיים:"
 msgid "Error loading image."
 msgstr "שגיאה בטעינת התמונה."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "שגיאה בקבלת אוביאקט איש הקשר"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "שגיאה בקבלת מידע של תמונה"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "שגיאה בשמירת איש הקשר"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "שגיאה בשינוי גודל התמונה"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -167,15 +167,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr "סיכום ביקורת לא נקבע."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
@@ -225,73 +225,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "איש קשר"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "יום ההולדת של {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "איש קשר"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "הוספת איש קשר"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "פנקסי כתובות"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "פנקס כתובות חדש"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "עריכת פנקס הכתובות"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "שם התצוגה"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "פעיל"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "שמירה"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "ביצוע"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "ביטול"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "יבא קובץ אנשי קשר"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "שמירה"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "ביטול"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index a8d9aea13f..2fda8dd395 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr "Datoteka ne postoji:"
 msgid "Error loading image."
 msgstr "Pogreška pri učitavanju slike."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -166,15 +166,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr "checksum nije postavljen."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
@@ -224,73 +224,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name} Rođendan"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adresari"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Novi adresar"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Prikazani naziv"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktivno"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Spremi"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Pošalji"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Prekini"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Spremi"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Prekini"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 5e5420b34d..5f76c8c65b 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -136,31 +136,31 @@ msgstr "A fájl nem létezik:"
 msgid "Error loading image."
 msgstr "Kép betöltése sikertelen"
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "A kontakt-objektum feldolgozása sikertelen"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "A PHOTO-tulajdonság  feldolgozása sikertelen"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "A kontakt mentése sikertelen"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Képméretezés sikertelen"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Képvágás sikertelen"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "A kép nem található"
 
@@ -168,15 +168,15 @@ msgstr "A kép nem található"
 msgid "checksum is not set."
 msgstr "az ellenőrzőösszeg nincs beállítva"
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
@@ -226,73 +226,61 @@ msgstr "Nem történt feltöltés. Ismeretlen hiba"
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Sajnáljuk, ez a funkció még nem támogatott"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Nem támogatott"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Érvényes cím lekérése sikertelen"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hiba"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Ezt a tulajdonságot muszáj kitölteni"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Típus kiválasztása"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -444,6 +432,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name} születésnapja"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kapcsolat"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kapcsolat hozzáadása"
@@ -460,51 +452,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Címlisták"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Bezár"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -777,34 +769,6 @@ msgstr "Ifj."
 msgid "Sn."
 msgstr "Id."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Új Címlista"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Címlista szerkesztése"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Megjelenített név"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktív"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Mentés"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Elküld"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Mégsem"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Kapcsolat-fájl importálása"
@@ -893,6 +857,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Mentés"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Mégsem"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index b89ca65c8d..c205f836ba 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 30a6e588b4..28d6b86eb5 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr "Il habeva un error durante le cargamento del imagine."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -166,15 +166,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -224,73 +224,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contacto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adder contacto"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adressarios"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nove adressario"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Modificar adressario"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Active"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Salveguardar"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Submitter"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Cancellar"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importar un file de contactos"
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Salveguardar"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Cancellar"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 84104f841c..3fced7c92b 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index b7347b2b7d..189223c774 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 7a2687c796..faecd5c21e 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -136,31 +136,31 @@ msgstr "Il file non esiste:"
 msgid "Error loading image."
 msgstr "Errore di caricamento immagine."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Errore di recupero dell'oggetto contatto."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Errore di recupero della proprietà FOTO."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Errore durante la ricerca dell'immagine: "
 
@@ -168,15 +168,15 @@ msgstr "Errore durante la ricerca dell'immagine: "
 msgid "checksum is not set."
 msgstr "il codice di controllo non è impostato."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
@@ -226,77 +226,65 @@ msgstr "Nessun file è stato inviato. Errore sconosciuto"
 msgid "Contacts"
 msgstr "Contatti"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Non implementata"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contatto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Nuovo"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Nuovo contatto"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -312,11 +300,11 @@ msgstr " non riuscito."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Il nome visualizzato non può essere vuoto."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Rubrica non trovata:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -444,6 +432,10 @@ msgstr "Domande"
 msgid "{name}'s Birthday"
 msgstr "Data di nascita di {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contatto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
@@ -460,51 +452,51 @@ msgstr "Impostazioni"
 msgid "Addressbooks"
 msgstr "Rubriche"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Contatto successivo in elenco"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Contatto precedente in elenco"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Espandi/Contrai la rubrica corrente"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Rubrica successiva/precedente"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Aggiorna l'elenco dei contatti"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Aggiungi una nuova rubrica"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Elimina il contatto corrente"
 
@@ -777,34 +769,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nuova rubrica"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Modifica rubrica"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nome visualizzato"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Attiva"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Salva"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Invia"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Annulla"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importa un file di contatti"
@@ -867,11 +831,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Mostra collegamento CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Mostra collegamento VCF in sola lettura"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -887,12 +851,20 @@ msgstr "Nuova rubrica"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
+
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Salva"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Annulla"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Altro..."
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 687698a3cd..e8545fba54 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "ファイルが存在しません:"
 msgid "Error loading image."
 msgstr "画像の読み込みエラー。"
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "コンタクトオブジェクトの取得エラー。"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "写真属性の取得エラー。"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "コンタクトの保存エラー。"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "画像のリサイズエラー"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "画像の切り抜きエラー"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "一時画像の生成エラー"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "画像検索エラー: "
 
@@ -165,15 +165,15 @@ msgstr "画像検索エラー: "
 msgid "checksum is not set."
 msgstr "チェックサムが設定されていません。"
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
@@ -223,73 +223,61 @@ msgstr "ファイルは何もアップロードされていません。不明な
 msgid "Contacts"
 msgstr "連絡先"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "申し訳ありません。この機能はまだ実装されていません"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "未実装"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "有効なアドレスを取得できませんでした。"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "エラー"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "連絡先"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "新規"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "新しいコンタクト"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "この属性は空にできません。"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "名前を編集"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "タイプを選択"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr "質問"
 msgid "{name}'s Birthday"
 msgstr "{name}の誕生日"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "連絡先"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "連絡先の追加"
@@ -457,51 +449,51 @@ msgstr "設定"
 msgid "Addressbooks"
 msgstr "電話帳"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "閉じる"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "リスト内の次のコンタクト"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "リスト内の前のコンタクト"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "新しいコンタクトを追加"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "新しいアドレスブックを追加"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "現在のコンタクトを削除"
 
@@ -774,34 +766,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "アドレスブックの新規作成"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "アドレスブックを編集"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "表示名"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "アクティブ"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "保存"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "送信"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "取り消し"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "コンタクトファイルをインポート"
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "保存"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "取り消し"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 0bf8fd4604..21e8ce9645 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr "파일이 존재하지 않습니다. "
 msgid "Error loading image."
 msgstr "로딩 이미지 오류입니다."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "연락처 개체를 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "사진 속성을 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "연락처 저장 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "이미지 크기 조정 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "이미지를 자르던 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "임시 이미지를 생성 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 
@@ -166,15 +166,15 @@ msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 msgid "checksum is not set."
 msgstr "체크섬이 설정되지 않았습니다."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
@@ -224,73 +224,61 @@ msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 msgid "Contacts"
 msgstr "연락처"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "죄송합니다. 이 기능은 아직 구현되지 않았습니다. "
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "구현되지 않음"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "유효한 주소를 얻을 수 없습니다."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "오류"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "연락처"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "이름 편집"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "유형 선택"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{이름}의 생일"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "연락처"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "연락처 추가"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "주소록"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "닫기"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "새 주소록"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "주소록 편집"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "표시 이름"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "활성"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "저장"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "보내기"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "취소"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "연락처 파일 입력"
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "저장"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "취소"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index f6717af86f..1775ec0803 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "Fichier existéiert net:"
 msgid "Error loading image."
 msgstr "Fehler beim lueden vum Bild."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name} säi Gebuertsdag"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt bäisetzen"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adressbicher "
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Zoumaachen"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Neit Adressbuch"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Adressbuch editéieren"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Ugewisene Numm"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiv"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Späicheren"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Fortschécken"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Ofbriechen"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Späicheren"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Ofbriechen"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index b63e058e0e..a63777d134 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "Failas neegzistuoja:"
 msgid "Error loading image."
 msgstr "Klaida įkeliant nuotrauką."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontaktas"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktas"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridėti kontaktą"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adresų knygos"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nauja adresų knyga"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Redaguoti adresų knygą"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Rodomas vardas"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktyvus"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Išsaugoti"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Atšaukti"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Išsaugoti"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Atšaukti"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index c47721670c..4d82047e18 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 4b32b8a1e6..e604a15bbe 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr "Не постои датотеката:"
 msgid "Error loading image."
 msgstr "Грешка во вчитување на слика."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Грешка при преземањето на контакт објектот,"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Грешка при утврдувањето на карактеристиките на фотографијата."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Грешка при снимање на контактите."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Грешка при скалирање на фотографијата"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Грешка при сечење на фотографијата"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Грешка при креирањето на привремената фотографија"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Грешка при наоѓањето на фотографијата:"
 
@@ -166,15 +166,15 @@ msgstr "Грешка при наоѓањето на фотографијата:"
 msgid "checksum is not set."
 msgstr "сумата за проверка не е поставена."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
@@ -224,73 +224,61 @@ msgstr "Ниту еден фајл не се вчита. Непозната гр
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Жалам, оваа функционалност уште не е имплементирана"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Не е имплементирано"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Не можев да добијам исправна адреса."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Грешка"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Контакт"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Својството не смее да биде празно."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Уреди го името"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Одбери тип"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Роденден на {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додади контакт"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Адресари"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Затвои"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr "Помлад."
 msgid "Sn."
 msgstr "Постар."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Нов адресар"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Уреди адресар"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Прикажано име"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Активно"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Сними"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Прати"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Откажи"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Внеси датотека со контакти"
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Сними"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Откажи"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 0bb905bda6..4d4bcafb70 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -136,31 +136,31 @@ msgstr "Fail tidak wujud:"
 msgid "Error loading image."
 msgstr "Ralat pada muatan imej."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Ralat mendapatkan objek pada kenalan."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Ralat mendapatkan maklumat gambar."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Ralat menyimpan kenalan."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Ralat mengubah saiz imej"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Ralat memotong imej"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Ralat mencipta imej sementara"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Ralat mencari imej: "
 
@@ -168,15 +168,15 @@ msgstr "Ralat mencari imej: "
 msgid "checksum is not set."
 msgstr "checksum tidak ditetapkan."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Maklumat tentang vCard tidak betul."
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Sesuatu tidak betul."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
@@ -226,73 +226,61 @@ msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Maaf, fungsi ini masih belum boleh diguna lagi"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Tidak digunakan"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Tidak boleh mendapat alamat yang sah."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ralat"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Hubungan"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Nilai ini tidak boleh kosong."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Ubah nama"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "PIlih jenis"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -444,6 +432,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Hari Lahir {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Hubungan"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tambah kenalan"
@@ -460,51 +452,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Senarai Buku Alamat"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Tutup"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -777,34 +769,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Buku Alamat Baru"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Kemaskini Buku Alamat"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Paparan nama"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktif"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Simpan"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Hantar"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Batal"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Import fail kenalan"
@@ -893,6 +857,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Simpan"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Batal"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index c3a53c3380..608296b401 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -136,31 +136,31 @@ msgstr "Filen eksisterer ikke:"
 msgid "Error loading image."
 msgstr "Klarte ikke å laste bilde."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Klarte ikke å lagre kontakt."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Klarte ikke å endre størrelse på bildet"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Klarte ikke å beskjære bildet"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Klarte ikke å lage et midlertidig bilde"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Kunne ikke finne bilde:"
 
@@ -168,15 +168,15 @@ msgstr "Kunne ikke finne bilde:"
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
@@ -226,73 +226,61 @@ msgstr "Ingen filer ble lastet opp. Ukjent feil."
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Feil"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Endre navn"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Velg type"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -444,6 +432,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}s bursdag"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ny kontakt"
@@ -460,51 +452,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Lukk"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -777,34 +769,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sr."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Ny adressebok"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Endre adressebok"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Visningsnavn"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiv"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Lagre"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Lagre"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importer en fil med kontakter."
@@ -893,6 +857,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Lagre"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Avbryt"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 5c574cdc68..bf87573242 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -137,31 +137,31 @@ msgstr "Bestand bestaat niet:"
 msgid "Error loading image."
 msgstr "Fout bij laden plaatje."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -169,15 +169,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr "controlegetal is niet opgegeven."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
@@ -227,73 +227,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contacten"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contact"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -445,6 +433,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}'s verjaardag"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Contact toevoegen"
@@ -461,51 +453,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adresboeken"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -778,34 +770,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nieuw adresboek"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Wijzig adresboek"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Weergavenaam"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Actief"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Opslaan"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Opslaan"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Anuleren"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importeer een contacten bestand"
@@ -894,6 +858,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Opslaan"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Anuleren"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 77dbe1e05a..91cf5d7ea2 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -166,15 +166,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
@@ -224,73 +224,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Legg til kontakt"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Ny adressebok"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Endre adressebok"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Visningsnamn"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiv"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Lagre"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Send"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Kanseller"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Lagre"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Kanseller"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index d46b2f8b6d..de7f6271c7 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -136,31 +136,31 @@ msgstr "Plik nie istnieje:"
 msgid "Error loading image."
 msgstr "Błąd ładowania obrazu."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Błąd pobrania kontaktu."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Błąd uzyskiwania właściwości ZDJĘCIA."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Błąd zapisu kontaktu."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Błąd zmiany rozmiaru obrazu"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Błąd przycinania obrazu"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Błąd utworzenia obrazu tymczasowego"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Błąd znajdowanie obrazu: "
 
@@ -168,15 +168,15 @@ msgstr "Błąd znajdowanie obrazu: "
 msgid "checksum is not set."
 msgstr "checksum-a nie ustawiona"
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
@@ -226,73 +226,61 @@ msgstr "Plik nie został załadowany. Nieznany błąd"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Niestety, ta funkcja nie została jeszcze zaimplementowana"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Nie wdrożono"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Nie można pobrać prawidłowego adresu."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Błąd"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Nowy"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Nowy kontakt"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Ta właściwość nie może być pusta."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Zmień nazwę"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Wybierz typ"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -444,6 +432,10 @@ msgstr "Pytania"
 msgid "{name}'s Birthday"
 msgstr "{name} Urodzony"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
@@ -460,51 +452,51 @@ msgstr "Ustawienia"
 msgid "Addressbooks"
 msgstr "Książki adresowe"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Zamknij"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiatury"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Następny kontakt na liście"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Poprzedni kontakt na liście"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Następna/poprzednia książka adresowa"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Akcje"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Odśwież listę kontaktów"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Dodaj nowy kontakt"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Dodaj nowa książkę adresową"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Usuń obecny kontakt"
 
@@ -777,34 +769,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nowa książka adresowa"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Edytowanie książki adresowej"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Wyświetlana nazwa"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktywna"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Zapisz"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Potwierdź"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Anuluj"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importuj plik z kontaktami"
@@ -893,6 +857,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Zapisz"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Anuluj"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index cce81b3b22..69fcf27009 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Arquivo não existe:"
 msgid "Error loading image."
 msgstr "Erro ao carregar imagem."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Erro ao obter propriedade de contato."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Erro ao obter propriedade da FOTO."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Erro ao salvar contato."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Erro ao modificar tamanho da imagem"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Erro ao recortar imagem"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Erro ao criar imagem temporária"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Erro ao localizar imagem:"
 
@@ -167,15 +167,15 @@ msgstr "Erro ao localizar imagem:"
 msgid "checksum is not set."
 msgstr "checksum não definido."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
@@ -225,73 +225,61 @@ msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 msgid "Contacts"
 msgstr "Contatos"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Desculpe, esta funcionalidade não foi implementada ainda"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "não implementado"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contato"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Selecione o tipo"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Aniversário de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contato"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contato"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Agendas de Endereço"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Fechar."
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nova Agenda de Endereço"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Editar Agenda de Endereço"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nome de exibição"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Ativo"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Salvar"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Enviar"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importar arquivos de contato."
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Salvar"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 079871ab19..fb46920e8b 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "O ficheiro não existe:"
 msgid "Error loading image."
 msgstr "Erro a carregar a imagem."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Erro a obter o objecto dos contactos"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Erro a obter a propriedade Foto"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Erro a guardar o contacto."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Erro a redimensionar a imagem"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Erro a recorar a imagem"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Erro a criar a imagem temporária"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Erro enquanto pesquisava pela imagem: "
 
@@ -167,15 +167,15 @@ msgstr "Erro enquanto pesquisava pela imagem: "
 msgid "checksum is not set."
 msgstr "Checksum não está definido."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
@@ -225,73 +225,61 @@ msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Desculpe, esta funcionalidade ainda não está implementada"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Não implementado"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contacto"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccionar tipo"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Aniversário de {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contacto"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Livros de endereços"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Fechar"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "r."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Novo livro de endereços"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Editar livro de endereços"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nome de exibição"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Ativo"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Guardar"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Submeter"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importar um ficheiro de contactos"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Guardar"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 6b883047de..5e4e80b841 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Fișierul nu există:"
 msgid "Error loading image."
 msgstr "Eroare la încărcarea imaginii."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -167,15 +167,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr "suma de control nu este stabilită."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
@@ -225,73 +225,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contacte"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Contact"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "Ziua de naștere a {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adaugă contact"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Agende"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Agendă nouă"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Modifică agenda"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Nume afișat"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Activ"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Salvează"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Trimite"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Anulează"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Salvează"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Anulează"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index d084087a97..988a58e330 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -139,31 +139,31 @@ msgstr "Файл не существует:"
 msgid "Error loading image."
 msgstr "Ошибка загрузки картинки."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Ошибка при получении контактов"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Ошибка при получении ФОТО."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Ошибка при сохранении контактов."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Ошибка изменения размера изображений"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Ошибка обрезки изображений"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Ошибка создания временных изображений"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Ошибка поиска изображений:"
 
@@ -171,15 +171,15 @@ msgstr "Ошибка поиска изображений:"
 msgid "checksum is not set."
 msgstr "контрольная сумма не установлена."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Что-то пошло FUBAR."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
@@ -229,73 +229,61 @@ msgstr "Файл не был загружен. Неизвестная ошибк
 msgid "Contacts"
 msgstr "Контакты"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "К сожалению, эта функция не была реализована"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Не реализовано"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Не удалось получить адрес."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Контакт"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Это свойство должно быть не пустым."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Изменить имя"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Выберите тип"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -447,6 +435,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "День рождения {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Добавить Контакт"
@@ -463,51 +455,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Адресные книги"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Закрыть"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -780,34 +772,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Новая адресная книга"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Редактировать адресную книгу"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Отображаемое имя"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Активно"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Сохранить"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Отправить"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Отменить"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Загрузить файл контактов"
@@ -896,6 +860,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Сохранить"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Отменить"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index bd509c1c34..2fb512bc40 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Súbor neexistuje:"
 msgid "Error loading image."
 msgstr "Chyba pri nahrávaní obrázka."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Chyba počas prevzatia objektu kontakt."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Chyba počas získavania fotky."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Chyba vyhľadania obrázku: "
 
@@ -167,15 +167,15 @@ msgstr "Chyba vyhľadania obrázku: "
 msgid "checksum is not set."
 msgstr "kontrolný súčet nie je nastavený."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
@@ -225,73 +225,61 @@ msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Neimplementované"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Nový"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Nový kontakt"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vybrať typ"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr "Otázky"
 msgid "{name}'s Birthday"
 msgstr "Narodeniny {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adresáre"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Navigácia"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Ďalší kontakt v zozname"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Predchádzajúci kontakt v zozname"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Ďalší/predošlí adresár"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Obnov zoznam kontaktov"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Pridaj nový kontakt"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Pridaj nový adresár"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Vymaž súčasný kontakt"
 
@@ -776,34 +768,6 @@ msgstr "ml."
 msgid "Sn."
 msgstr "st."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nový Adresár"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Upraviť Adresár"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Zobrazené meno"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktívny"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Uložiť"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Odoslať"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Zrušiť"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importovať súbor kontaktu"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Uložiť"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Zrušiť"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 60528db291..4ff1bfc5e3 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Datoteka ne obstaja:"
 msgid "Error loading image."
 msgstr "Napaka pri nalaganju slike."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Napaka pri pridobivanju kontakta predmeta."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Napaka pri pridobivanju lastnosti fotografije."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Napaka pri shranjevanju stika."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Napaka pri spreminjanju velikosti slike"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Napaka pri obrezovanju slike"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Napaka pri ustvarjanju začasne slike"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Napaka pri iskanju datoteke: "
 
@@ -167,15 +167,15 @@ msgstr "Napaka pri iskanju datoteke: "
 msgid "checksum is not set."
 msgstr "nadzorna vsota ni nastavljena."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
@@ -225,73 +225,61 @@ msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 msgid "Contacts"
 msgstr "Stiki"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Žal ta funkcionalnost še ni podprta"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Ni podprto"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Ne morem dobiti veljavnega naslova."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Napaka"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Stik"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Ta lastnost ne sme biti prazna"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Uredi ime"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Izberite vrsto"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name} - rojstni dan"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Stik"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj stik"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Imeniki"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Zapri"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr "mlajši"
 msgid "Sn."
 msgstr "starejši"
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Nov imenik"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Uredi imenik"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Ime za prikaz"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiven"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Shrani"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Potrdi"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Prekliči"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Uvozi datoteko s stiki"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Shrani"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Prekliči"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 63337ab5cf..40bebde75b 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 2b4ced16c7..155eb759e4 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Контакт"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додај контакт"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Адресар"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Нови адресар"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Уреди адресар"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Приказано име"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Активан"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Сними"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Пошаљи"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Откажи"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Сними"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Откажи"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 116e2d372d..b023da2aed 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 6269e183cf..6f4597c78e 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -137,31 +137,31 @@ msgstr "Filen existerar inte."
 msgid "Error loading image."
 msgstr "Fel uppstod när bild laddades."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Kunde inte hitta bild"
 
@@ -169,15 +169,15 @@ msgstr "Kunde inte hitta bild"
 msgid "checksum is not set."
 msgstr "kontrollsumma är inte satt."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
 
@@ -227,73 +227,61 @@ msgstr "Ingen fil uppladdad. Okänt fel"
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Tyvärr är denna funktion inte införd än"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Inte införd"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kontakt"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Ny"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Välj typ"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -445,6 +433,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}'s födelsedag"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
@@ -461,51 +453,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adressböcker"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Stäng"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -778,34 +770,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Ny adressbok"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Redigera adressbok"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Visningsnamn"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktiv"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Spara"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Skicka in"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Importera en kontaktfil"
@@ -894,6 +858,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Spara"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Avbryt"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index e89c3013f2..c768af8ead 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 7f5c94e340..89ca8ee5be 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index eb813eae16..af9fcc65dd 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -132,31 +132,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -222,73 +222,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -440,6 +428,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -456,51 +448,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -773,34 +765,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -889,6 +853,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d07f4a40df..c9a44b2a6f 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index aba904c9b0..7516a68269 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index a46ccf931a..10c33982a8 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 7d73680418..edcb06e03d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 896a797b89..b95ec54597 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index f72352b36d..48b030a20e 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index eb2c997995..39eb5b86fe 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr "ไม่มีไฟล์ดังกล่าว"
 msgid "Error loading image."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "เกิดข้อผิดพลาดในการครอบตัดภาพ"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "เกิดข้อผิดพลาดในการค้นหารูปภาพ: "
 
@@ -166,15 +166,15 @@ msgstr "เกิดข้อผิดพลาดในการค้นหา
 msgid "checksum is not set."
 msgstr "ยังไม่ได้กำหนดค่า checksum"
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
@@ -224,73 +224,61 @@ msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโ
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "ข้อมูลการติดต่อ"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "เลือกชนิด"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "วันเกิดของ {name}"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "ข้อมูลการติดต่อ"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "เพิ่มรายชื่อผู้ติดต่อใหม่"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "สมุดบันทึกที่อยู่"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "ปิด"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr "จูเนียร์"
 msgid "Sn."
 msgstr "ซีเนียร์"
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "สร้างสมุดบันทึกที่อยู่ใหม่"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "แก้ไขสมุดบันทึกที่อยู่"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "ชื่อที่ต้องการให้แสดง"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "เปิดใช้"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "บันทึก"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "ส่งข้อมูล"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "ยกเลิก"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "นำเข้าไฟล์ข้อมูลการติดต่อ"
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "บันทึก"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "ยกเลิก"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 821e951cc5..86e889b602 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "Dosya mevcut değil:"
 msgid "Error loading image."
 msgstr "İmaj yükleme hatası."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "Bağlantı nesnesini kaydederken hata."
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "Resim özelleğini alırken hata oluştu."
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "Bağlantıyı kaydederken hata"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "Görüntü yeniden boyutlandırılamadı."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "Görüntü kırpılamadı."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "Geçici resim oluştururken hata oluştu"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "Resim ararken hata oluştu:"
 
@@ -167,15 +167,15 @@ msgstr "Resim ararken hata oluştu:"
 msgid "checksum is not set."
 msgstr "checksum atanmamış."
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
@@ -225,73 +225,61 @@ msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Üzgünüz, bu özellik henüz tamamlanmadı."
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "Tamamlanmadı."
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "Geçerli bir adres alınamadı."
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hata"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Kişi"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr "Yeni"
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr "Yeni Kişi"
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Bu özellik boş bırakılmamalı."
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "İsmi düzenle"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Tür seç"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr "Sorular"
 msgid "{name}'s Birthday"
 msgstr "{name}'nin Doğumgünü"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Kişi"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kişi Ekle"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Adres defterleri"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "Kapat"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr "Klavye kısayolları"
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr "Dolaşım"
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr "Listedeki sonraki kişi"
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr "Listedeki önceki kişi"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr "Şuanki adres defterini genişlet/daralt"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr "Sonraki/Önceki adres defteri"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr "Eylemler"
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr "Kişi listesini tazele"
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr "Yeni kişi ekle"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr "Yeni adres defteri ekle"
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr "Şuanki kişiyi sil"
 
@@ -776,34 +768,6 @@ msgstr "Jr."
 msgid "Sn."
 msgstr "Sn."
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Yeni Adres defteri"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Adres Defterini Düzenle"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Görünen adı"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Aktif"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Kaydet"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Gönder"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "İptal"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "Bağlantı dosyasını içeri aktar"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Kaydet"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "İptal"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 7cdc0357d4..3ae9c0a11a 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додати контакт"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr ""
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Відображуване ім'я"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr ""
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr ""
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr ""
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index dab1d3502e..8e78db712a 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -133,31 +133,31 @@ msgstr "Tập tin không tồn tại"
 msgid "Error loading image."
 msgstr "Lỗi khi tải hình ảnh."
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr ""
 
@@ -223,73 +223,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "Danh sách"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -441,6 +429,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "Danh sách"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Thêm liên lạc"
@@ -457,51 +449,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "Sổ địa chỉ"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -774,34 +766,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "Sổ địa chỉ mới"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "Sửa sổ địa chỉ"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "Hiển thị tên"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "Kích hoạt"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "Lưu"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "Submit"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "Hủy"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -890,6 +854,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "Lưu"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "Hủy"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index c66057c0cb..530ce6e307 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -135,31 +135,31 @@ msgstr "文件不存在:"
 msgid "Error loading image."
 msgstr "加载图片错误。"
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr "获取联系人目标时出错。"
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr "获取照片属性时出错。"
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr "保存联系人时出错。"
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr "缩放图像时出错"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr "裁切图像时出错"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr "创建临时图像时出错"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr "查找图像时出错: "
 
@@ -167,15 +167,15 @@ msgstr "查找图像时出错: "
 msgid "checksum is not set."
 msgstr "未设置校验值。"
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard 信息不正确。请刷新页面: "
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr "有一些信息无法被处理。"
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
@@ -225,73 +225,61 @@ msgstr "没有文件被上传。未知错误"
 msgid "Contacts"
 msgstr "联系人"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "抱歉，这个功能暂时还没有被实现"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr "未实现"
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr "无法获取一个合法的地址。"
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "错误"
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "联系人"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "这个属性必须是非空的"
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "无法序列化元素"
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "编辑名称"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "选择类型"
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -443,6 +431,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name} 的生日"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "联系人"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加联系人"
@@ -459,51 +451,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "地址簿"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr "关闭"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -776,34 +768,6 @@ msgstr "小"
 msgid "Sn."
 msgstr "老"
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "新建地址簿"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "编辑地址簿"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "显示名称"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "激活"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "保存"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "提交"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "取消"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr "导入联系人文件"
@@ -892,6 +856,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "保存"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "取消"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index dac86b63c6..7d3d44339c 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -134,31 +134,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:64
+#: ajax/savecrop.php:66
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:73
+#: ajax/savecrop.php:76
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:90
+#: ajax/savecrop.php:95
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:100
+#: ajax/savecrop.php:105
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:108
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:111
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:114
 msgid "Error finding image: "
 msgstr ""
 
@@ -166,15 +166,15 @@ msgstr ""
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:59
+#: ajax/saveproperty.php:60
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:64
+#: ajax/saveproperty.php:67
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:133
+#: ajax/saveproperty.php:142
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
@@ -224,73 +224,61 @@ msgstr ""
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:72
+#: js/contacts.js:71
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:77
+#: js/contacts.js:76
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
-#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
-#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
-#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
 #: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:408 lib/search.php:15
-msgid "Contact"
-msgstr "通訊錄"
-
-#: js/contacts.js:408
-msgid "New"
-msgstr ""
-
-#: js/contacts.js:408
-msgid "New Contact"
-msgstr ""
-
-#: js/contacts.js:723
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:749
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:858 js/contacts.js:876
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:892
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1346 js/contacts.js:1380
+#: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1399
+#: js/contacts.js:1390
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
@@ -442,6 +430,10 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}的生日"
 
+#: lib/search.php:15
+msgid "Contact"
+msgstr "通訊錄"
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加通訊錄"
@@ -458,51 +450,51 @@ msgstr ""
 msgid "Addressbooks"
 msgstr "電話簿"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:39
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:42
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:44
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:55
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:57
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:61
 msgid "Delete current contact"
 msgstr ""
 
@@ -775,34 +767,6 @@ msgstr ""
 msgid "Sn."
 msgstr ""
 
-#: templates/part.editaddressbook.php:9
-msgid "New Addressbook"
-msgstr "新電話簿"
-
-#: templates/part.editaddressbook.php:9
-msgid "Edit Addressbook"
-msgstr "編輯電話簿"
-
-#: templates/part.editaddressbook.php:12
-msgid "Displayname"
-msgstr "顯示名稱"
-
-#: templates/part.editaddressbook.php:23
-msgid "Active"
-msgstr "作用中"
-
-#: templates/part.editaddressbook.php:29 templates/settings.php:45
-msgid "Save"
-msgstr "儲存"
-
-#: templates/part.editaddressbook.php:29
-msgid "Submit"
-msgstr "提出"
-
-#: templates/part.editaddressbook.php:30 templates/settings.php:46
-msgid "Cancel"
-msgstr "取消"
-
 #: templates/part.import.php:1
 msgid "Import a contacts file"
 msgstr ""
@@ -891,6 +855,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: templates/settings.php:45
+msgid "Save"
+msgstr "儲存"
+
+#: templates/settings.php:46
+msgid "Cancel"
+msgstr "取消"
+
 #: templates/settings.php:51
 msgid "More..."
 msgstr ""
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 81f4aa9584..dda2c76037 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Ohje",
+"Personal" => "Henkilökohtainen",
 "Settings" => "Asetukset",
 "Users" => "Käyttäjät",
 "Apps" => "Sovellukset",
@@ -8,7 +9,9 @@
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
 "Back to Files" => "Takaisin tiedostoihin",
 "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
+"Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
 "Authentication error" => "Todennusvirhe",
+"Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
 "%d minutes ago" => "%d minuuttia sitten",

From c5d5ca88a87dcad5df8af77fd4c6c9bc6ba2282e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 3 Aug 2012 13:15:15 +0200
Subject: [PATCH 1239/1537] Show Login-Button when user+pw are autocompleted,
 fixes oc-1068

---
 core/js/js.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 04fe5c2874..7bded8e141 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -455,11 +455,7 @@ $(document).ready(function(){
 	//use infield labels
 	$("label.infield").inFieldLabels();
 
-	// hide log in button etc. when form fields not filled
-	$('#submit').hide();
-	$('#remember_login').hide();
-	$('#remember_login+label').hide();
-	$('input#user, input#password').keyup(function() {
+	checkShowCredentials = function() {
 		var empty = false;
 		$('input#user, input#password').each(function() {
 			if ($(this).val() == '') {
@@ -475,7 +471,10 @@ $(document).ready(function(){
 			$('#remember_login').show();
 			$('#remember_login+label').fadeIn();
 		}
-	});
+	}
+	// hide log in button etc. when form fields not filled
+	checkShowCredentials();
+	$('input#user, input#password').keyup(checkShowCredentials);
 
 	$('#settings #expand').keydown(function(event) {
 		if (event.which == 13 || event.which == 32) {

From 599741bdd6434f8e0fba2aa5f9b40b0965c39bd8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 29 Jun 2012 23:56:06 +0200
Subject: [PATCH 1240/1537] audit: update appinfo to OC4

---
 apps/admin_audit/appinfo/info.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
index 6eb62fbbd1..4fa013162f 100644
--- a/apps/admin_audit/appinfo/info.xml
+++ b/apps/admin_audit/appinfo/info.xml
@@ -5,6 +5,7 @@
 	<version>0.1</version>
 	<licence>AGPL</licence>
 	<author>Bart Visscher</author>
-	<require>2</require>
+	<require>4</require>
 	<description>Audit user actions in Owncloud</description>
+	<shipped>true</shipped>
 </info>

From b12ed88794bfb3c58a32a5fbf34d42cd64b270d7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 3 Aug 2012 16:18:33 +0200
Subject: [PATCH 1241/1537] Calendar: remove double html encoding

---
 apps/calendar/lib/app.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 29e5ab5b0c..8bdb54f486 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -396,8 +396,8 @@ class OC_Calendar_App{
 		$last_modified = @$vevent->__get('LAST-MODIFIED');
 		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
 		$staticoutput = array('id'=>(int)$event['id'],
-						'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')),
-						'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
+						'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
+						'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
 						'lastmodified'=>$lastmodified,
 						'allDay'=>$allday);
 		if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){

From fc4a542dd097adac39a3aa19bf878bfce3747e31 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 3 Aug 2012 17:22:26 +0200
Subject: [PATCH 1242/1537] add iWork mimetypes

---
 lib/mimetypes.list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index f7207493f7..37d50756d5 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -55,6 +55,9 @@ return array(
 	'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
 	'odg'=>'application/vnd.oasis.opendocument.graphics',
 	'odp'=>'application/vnd.oasis.opendocument.presentation',
+	'pages'=>'application/x-iwork-pages-sffpages',
+	'numbers'=>'application/x-iwork-numbers-sffnumbers',
+	'keynote'=>'application/x-iwork-keynote-sffkey',
 	'kra'=>'application/x-krita',
 	'mp3'=>'audio/mpeg',
 	'doc'=>'application/msword',

From 09bb3bfaf8bbc276ff23a2882d5591be542c0139 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 3 Aug 2012 15:05:45 -0400
Subject: [PATCH 1243/1537] Preparing for proper collection implementation

---
 apps/contacts/appinfo/app.php     |   7 +-
 apps/contacts/lib/addressbook.php |   2 +-
 apps/contacts/lib/share.php       |  77 ---------------
 apps/files_sharing/sharetest.php  |   7 --
 lib/public/share.php              | 150 +++++++++++++++---------------
 5 files changed, 79 insertions(+), 164 deletions(-)
 delete mode 100644 apps/contacts/lib/share.php
 delete mode 100755 apps/files_sharing/sharetest.php

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 74660a2e2b..aa0f229dd9 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -3,7 +3,8 @@ OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
 OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
 OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
-OC::$CLASSPATH['OC_Contacts_Share'] = 'apps/contacts/lib/share.php';
+OC::$CLASSPATH['OC_Share_Contact_Backend'] = 'apps/contacts/lib/share/contact.php';
+OC::$CLASSPATH['OC_Share_Addressbook_Backend'] = 'apps/contacts/lib/share/addressbook.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
 OC::$CLASSPATH['Sabre_CardDAV_VCFExportPlugin'] = 'apps/contacts/lib/VCFExportPlugin.php';
 OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
@@ -23,4 +24,6 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('contacts', 'settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
-OCP\Share::registerBackend('addressbook', 'OC_Contacts_Share');
+OCP\Share::registerBackend('contact', 'OC_Share_Contact_Backend');
+OCP\Share::registerBackend('addressbook', 'OC_Share_Addressbook_Backend', 'contact');
+
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 6e082c5e2e..d3cceb5880 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -64,7 +64,7 @@ class OC_Contacts_Addressbook {
 		while( $row = $result->fetchRow()) {
 			$addressbooks[] = $row;
 		}
-		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Contacts_Share::FORMAT_ADDRESSBOOKS));
+		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Addressbook_Backend::FORMAT_ADDRESSBOOKS));
 		if(!$active && !count($addressbooks)) {
 			self::addDefault($uid);
 		}
diff --git a/apps/contacts/lib/share.php b/apps/contacts/lib/share.php
deleted file mode 100644
index 7aec533957..0000000000
--- a/apps/contacts/lib/share.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Contacts_Share extends OCP\Share_Backend {
-	const FORMAT_ADDRESSBOOKS = 1;
-	/**
-	* @brief Get the source of the item to be stored in the database
-	* @param string Item
-	* @param string Owner of the item
-	* @return mixed|array|false Source
-	*
-	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
-	* Return false if the item does not exist for the user
-	*
-	* The formatItems() function will translate the source returned back into the item
-	*/
-	public function getSource($item, $uid) {
-		$addressbook = OC_Contacts_Addressbook::find( $item );
-		if( $addressbook === false || $addressbook['userid'] != $uid) {
-			return false;
-		}
-		return $item;
-	}
-
-	/**
-	* @brief Get a unique name of the item for the specified user
-	* @param string Item
-	* @param string|false User the item is being shared with
-	* @param array|null List of similar item names already existing as shared items
-	* @return string Target name
-	*
-	* This function needs to verify that the user does not already have an item with this name.
-	* If it does generate a new name e.g. name_#
-	*/
-	public function generateTarget($item, $uid, $exclude = null) {
-		$addressbook = OC_Contacts_Addressbook::find( $item );
-		$user_addressbooks = array();
-		foreach(OC_Contacts_Addressbook::all($uid) as $user_addressbook) {
-			$user_addressbooks[] = $user_addressbook['displayname'];
-		}
-		$name = $addressbook['userid']."'s ".$addressbook['displayname'];
-		$suffix = '';
-		while (in_array($name.$suffix, $user_addressbooks)) {
-			$suffix++;
-		}
-		
-		return $name.$suffix;
-	}
-
-	/**
-	* @brief Converts the shared item sources back into the item in the specified format
-	* @param array Shared items
-	* @param int Format
-	* @return ?
-	*
-	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
-	* The key/value pairs included in the share info depend on the function originally called:
-	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
-	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
-	* This function allows the backend to control the output of shared items with custom formats.
-	* It is only called through calls to the public getItem(s)Shared(With) functions.
-	*/
-	public function formatItems($items, $format, $parameters = null) {
-		$addressbooks = array();
-		foreach ($items as $item) {
-			$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
-			$addressbook['displayname'] = $item['item_target'];
-			$addressbooks[] = $addressbook;
-		}
-		return $addressbooks;
-	}
-}
diff --git a/apps/files_sharing/sharetest.php b/apps/files_sharing/sharetest.php
deleted file mode 100755
index bcff10ca0e..0000000000
--- a/apps/files_sharing/sharetest.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-
-OCP\Share::setPermissions('file', '/01 - Genesis.mp3', OCP\Share::SHARE_TYPE_USER, 'Genie2', OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE);
-
-
-?>
\ No newline at end of file
diff --git a/lib/public/share.php b/lib/public/share.php
index 2b36a06abf..813b5558e8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -52,6 +52,7 @@ class Share {
 
 	const FORMAT_NONE = -1;
 	const FORMAT_STATUSES = -2;
+	const FORMAT_SOURCES = -3;
 
 	private static $shareTypeUserAndGroups = -1;
 	private static $shareTypeGroupUserUnique = 2;
@@ -82,8 +83,8 @@ class Share {
 	* @param int Number of items to return (optional) Returns all by default
 	* @return Return depends on format
 	*/
-	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1) {
-		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, $limit);
+	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) {
+		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, $limit, $includeCollections);
 	}
 
 	/**
@@ -93,19 +94,8 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, $parameters = null) {
-		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1);
-	}
-
-	/**
-	* @brief Get the item of item type shared with the current user by source
-	* @param string Item type
-	* @param string Item source
-	* @param int Format (optional) Format type must be defined by the backend
-	* @return Return depends on format
-	*/
-	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE, $parameters = null) {
-		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, true);
+	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections);
 	}
 
 	/**
@@ -115,8 +105,8 @@ class Share {
 	* @param int Number of items to return (optional) Returns all by default
 	* @return Return depends on format
 	*/
-	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1) {
-		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $parameters, $limit);
+	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) {
+		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $parameters, $limit, $includeCollections);
 	}
 
 	/**
@@ -126,19 +116,8 @@ class Share {
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE, $parameters = null) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, $parameters);
-	}
-
-	/**
-	* @brief Get the shared item of item type owned by the current user by source
-	* @param string Item type
-	* @param string Item source
-	* @param int Format (optional) Format type must be defined by the backend
-	* @return Return depends on format
-	*/
-	public static function getItemSharedBySource($itemType, $item, $format = self::FORMAT_NONE, $parameters = null) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, $parameters, -1, true);
+	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, $parameters, -1, $includeCollections);
 	}
 
 	/**
@@ -218,23 +197,11 @@ class Share {
 				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
 				return false;
 		}
-		if (self::getItems($itemType, $item, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1)) {
+		if (self::getItems($itemType, $item, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true)) {
 			$message = 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith;
 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 			throw new \Exception($message);
 		}
-		if ($collectionTypes = self::getCollectionItemTypes($itemType)) {
-			foreach ($collectionTypes as $collectionType) {
-				$collections = self::getItems($collectionType, null, self::$shareTypeUserAndGroups, $shareWith, $uidOwner);
-				if ($backend = self::getBackend($collectionType)) {
-					if ($backend->inCollection($collections, $item)) {
-						$message = 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith.' inside a collection';
-						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-						throw new \Exception($message);
-					}
-				}
-			}
-		}
 		// If the item is a folder, scan through the folder looking for equivalent item types
 		if ($itemType == 'folder') {
 			$parentFolder = self::put('folder', $item, $shareType, $shareWith, $uidOwner, $permissions, true);
@@ -267,7 +234,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function unshare($itemType, $item, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -316,7 +283,8 @@ class Share {
 		if ($backend = self::getBackend($itemType)) {
 			$uidSharedWith = \OC_User::getUser();
 			// TODO Check permissions for setting target?
-			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, 1)) {
+			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, null, 1, false)) {
+				// TODO Fix
 				// Check if this is a group share
 				if ($item['uid_shared_with'] == null) {
 					// A new entry needs to be created exclusively for the user
@@ -354,7 +322,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1)) {
+		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
@@ -464,12 +432,11 @@ class Share {
 	* See public functions getItem(s)... for parameter usage
 	*
 	*/
-	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $isSource = false) {
+	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) {
 		if ($backend = self::getBackend($itemType)) {
-			// Check if there are any parent types that include this type of items, e.g. a music album contains songs
-			if ($collectionTypes = self::getCollectionItemTypes($itemType)) {
-				$collectionTypes = array_merge(array($itemType), $collectionTypes);
-				$where = "WHERE item_type IN ('".implode("','", $collectionTypes)."')";
+			// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
+			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+				$where = "WHERE item_type IN ('".implode("','", array_merge(array($itemType), $collectionTypes))."')";
 			} else {
 				$where = "WHERE item_type = '".$itemType."'";
 			}
@@ -491,7 +458,7 @@ class Share {
 					$where .= " AND share_type != '".self::$shareTypeGroupUserUnique."'";
 				}
 			}
-			if (isset($item)) {
+			if (isset($item) && !$includeCollections) {
 				// If looking for own shared items, check item_source else check item_target
 				if (isset($uidOwner)) {
 					$source = $backend->getSource($item, $uidOwner);
@@ -508,25 +475,17 @@ class Share {
 						$where .= " AND item_source = '".$itemSource."'";
 					}
 				} else {
-					if ($isSource) {
-						if ($itemType == 'file' || $itemType == 'folder') {
-							$where .= " AND file_source = '".$item."'";
-						} else {
-							$where .= " AND item_source = '".$item."'";
-						}
+					if ($itemType == 'file' || $itemType == 'folder') {
+						$where .= " AND file_target = '".$item."'";
 					} else {
-						if ($itemType == 'file' || $itemType == 'folder') {
-							$where .= " AND file_target = '".$item."'";
-						} else {
-							$where .= " AND item_target = '".$item."'";
-						}
+						$where .= " AND item_target = '".$item."'";
 					}
 				}
 			} else if ($itemType == 'file') {
 				// TODO Exclude converted items inside shared folders
 			}
-			if ($limit != -1) {
-				if ($limit == 1 && $shareType == self::$shareTypeUserAndGroups) {
+			if ($limit != -1 && !$includeCollections) {
+				if ($shareType == self::$shareTypeUserAndGroups) {
 					// Make sure the unique user target is returned if it exists, unique targets should follow the group share in the database
 					// If the limit is not 1, the filtering can be done later
 					$where .= ' ORDER BY id DESC';
@@ -534,7 +493,9 @@ class Share {
 				$where .= ' LIMIT '.$limit;
 			}
 			if ($format == self::FORMAT_STATUSES) {
-				$select = 'id, item_type, item, item_source, share_type';
+				$select = 'id, item_type, item, item_source, parent, share_type';
+			} else if ($format == self::FORMAT_SOURCES) {
+				$select = 'id, item_source, parent, share_type';
 			} else {
 				if (isset($uidOwner)) {
 					$select = 'id, item_type, item, item_source, parent, share_type, share_with, permissions, stime, file_source';
@@ -542,26 +503,52 @@ class Share {
 					$select = '*';
 				}
 			}
+			error_log($where);
 			$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
 			$result = $query->execute();
 			$items = array();
-			while ($item = $result->fetchRow()) {
+			while ($row = $result->fetchRow()) {
 				// Return only the item instead of a 2-dimensional array
-				if ($limit == 1 && $format == self::FORMAT_NONE) {
-					return $item;
+				if ($limit == 1 && $format == self::FORMAT_NONE && !$includeCollections) {
+					return $row;
 				}
 				// Filter out duplicate group shares for users with unique targets
-				if ($item['share_type'] == self::$shareTypeGroupUserUnique) {
+				if ($row['share_type'] == self::$shareTypeGroupUserUnique) {
 					// Remove the parent group share
-					unset($items[$item['parent']]);
+					unset($items[$row['parent']]);
 				}
-				$items[$item['id']] = $item;
-				// TODO Add in parent item types children?
-				if ($collectionTypes && in_array($item['item_type'], $collectionTypes)) {
-					$children[] = $item;
+				// Check if this is a collection of the requested item type
+				if ($row['item_type'] != $itemType) {
+					if ($collectionBackend = self::getBackend($row['item_type'])) {
+						$row['collection'] = array('item_type' => $itemType, 'item_source' => $row['item_source']);
+						// Fetch all of the children sources
+						$children = $collectionBackend->getChildren($row['item']);
+						foreach ($children as $child) {
+							$row['item_source'] = $child;
+							$row['item_target'] = ''; // TODO
+							if (isset($item)) {
+								if ((isset($uidOwner) && $row['item'] == $item) || $row['item_target'] == $item) {
+									// Return only the item instead of a 2-dimensional array
+									if ($limit == 1 && $format == self::FORMAT_NONE) {
+										return $row;
+									} else {
+										// Unset the items array and break out of both loops
+										$items = array();
+										$items[] = $row;
+										break 2;
+									}
+								}
+							} else {
+								$items[] = $row;
+							}
+						}
+					}
+				} else {
+					$items[] = $row;
 				}
 			}
 			if (!empty($items)) {
+				error_log(var_export($items, true));
 				if ($format == self::FORMAT_NONE) {
 					return $items;
 				} else if ($format == self::FORMAT_STATUSES) {
@@ -574,6 +561,12 @@ class Share {
 						}
 					}
 					return $statuses;
+				} else if ($format == self::FORMAT_SOURCES) {
+					$sources = array();
+					foreach ($items as $item) {
+						$sources[] = $item['item_source'];
+					}
+					return $sources;
 				} else {
 					return $backend->formatItems($items, $format, $parameters);
 				}
@@ -866,8 +859,11 @@ abstract class Share_Backend {
 
 abstract class Share_Backend_Collection extends Share_Backend {
 
-	public abstract function inCollection($collections, $item);
-
+	/**
+	* @brief Get the sources of the children of the item
+	* @param string Item
+	* @return array Returns an array of sources
+	*/
 	public abstract function getChildren($item);
     
 }

From 98057dba5b71d0a384f401608d5f57f5220a057e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 19:35:38 +0200
Subject: [PATCH 1244/1537] Revert "Removed text/plain header."

This reverts commit fa6d26b53c020940e38f632940f73dbbb56f6847.
---
 apps/contacts/ajax/currentphoto.php | 2 ++
 apps/contacts/ajax/savecrop.php     | 3 +++
 apps/contacts/ajax/uploadphoto.php  | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index c8cccf83a6..96080e661e 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -20,6 +20,8 @@
  *
  */
 
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 require_once 'loghandler.php';
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index e1826b6a3c..f9a32bc3ba 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -24,6 +24,9 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
+
 require_once 'loghandler.php';
 
 $image = null;
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 63abeb1fee..4cd38db8c7 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -25,6 +25,8 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
 require_once 'loghandler.php';
 $l10n = OC_Contacts_App::$l10n;
 // If it is a Drag'n'Drop transfer it's handled here.

From 578e074c009aa9c4c0dc229b1fa3772ac58ca827 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 19:52:51 +0200
Subject: [PATCH 1245/1537] White space.

---
 apps/contacts/ajax/uploadphoto.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 4cd38db8c7..7ec82603b4 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -50,9 +50,9 @@ if ($fn) {
 		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
 			OCP\JSON::success(array(
 				'data' => array(
-					'mime'=>$_SERVER['CONTENT_TYPE'], 
-					'name'=>$fn, 
-					'id'=>$id, 
+					'mime'=>$_SERVER['CONTENT_TYPE'],
+					'name'=>$fn,
+					'id'=>$id,
 					'tmp'=>$tmpkey)));
 			exit();
 		} else {
@@ -100,8 +100,8 @@ if(file_exists($file['tmp_name'])) {
 				'data' => array(
 					'mime'=>$file['type'],
 					'size'=>$file['size'],
-					'name'=>$file['name'], 
-					'id'=>$_POST['id'], 
+					'name'=>$file['name'],
+					'id'=>$_POST['id'],
 					'tmp'=>$tmpkey,
 					)));
 			exit();

From e3de746bb617d81b84678015ee8fe7f41016b2fd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Aug 2012 19:53:22 +0200
Subject: [PATCH 1246/1537] FF complained about missing charset.

---
 apps/contacts/ajax/savecrop.php    | 2 +-
 apps/contacts/ajax/uploadphoto.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index f9a32bc3ba..1df5299c7a 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -25,7 +25,7 @@ OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
+OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
 
 require_once 'loghandler.php';
 
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 7ec82603b4..34830b291d 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -26,7 +26,7 @@ OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
+OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
 require_once 'loghandler.php';
 $l10n = OC_Contacts_App::$l10n;
 // If it is a Drag'n'Drop transfer it's handled here.

From 3610975bc10f93caa5f6fde517e5988756246cf9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 3 Aug 2012 01:02:53 +0200
Subject: [PATCH 1247/1537] Some fixes for keyboard shortcuts.

---
 apps/contacts/js/contacts.js      | 49 +++++++++++++++++++++----------
 apps/contacts/templates/index.php | 16 +++++-----
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 4ccedf87ed..d9fff25bc9 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1522,8 +1522,7 @@ OC.Contacts={
 			return false;
 		},
 		next:function(reverse) {
-			// TODO: Check if we're last-child/first-child and jump to next/prev address book.
-			var curlistitem = $('#contacts li[data-id="'+OC.Contacts.Card.id+'"]');
+			var curlistitem = this.getContact(OC.Contacts.Card.id);
 			var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
 			if(newlistitem) {
 				curlistitem.removeClass('active');
@@ -1536,6 +1535,30 @@ OC.Contacts={
 		previous:function() {
 			this.next(true);
 		},
+		nextAddressbook:function(reverse) {
+			console.log('nextAddressbook', reverse);
+			var curlistitem = this.getContact(OC.Contacts.Card.id);
+			var parent = curlistitem.parent('ul');
+			var newparent = reverse
+				? parent.prevAll('ul').first()
+				: parent.nextAll('ul').first();
+			if(newparent) {
+				newlistitem = newparent.find('li:first-child');
+				if(newlistitem) {
+					parent.slideUp().prev('h3').removeClass('active');
+					newparent.slideDown().prev('h3').addClass('active');
+					curlistitem.removeClass('active');
+					OC.Contacts.Card.update({
+						cid:newlistitem.data('id'),
+						aid:newlistitem.data('bookid')
+					});
+				}
+			}
+		},
+		previousAddressbook:function() {
+			console.log('previousAddressbook');
+			this.nextAddressbook(true);
+		},
 		// Reload the contacts list.
 		update:function(params){
 			if(!params) { params = {}; }
@@ -1677,10 +1700,10 @@ $(document).ready(function(){
 			|| !OC.Contacts.Card.id) {
 			return;
 		}
-		console.log(event.which + ' ' + event.target.nodeName);
+		//console.log(event.which + ' ' + event.target.nodeName);
 		/**
 		 * To add:
-		 * (Shift)n/p: next/prev addressbook
+		 * Shift-a: add addressbook
 		 * u (85): hide/show leftcontent
 		 * f (70): add field
 		 */
@@ -1688,18 +1711,13 @@ $(document).ready(function(){
 			case 27: // Esc
 				ninjahelp.hide();
 				break;
-			case 46:
+			case 46: // Delete
 				if(event.shiftKey) {
 					OC.Contacts.Card.delayedDelete();
 				}
 				break;
-			case 32: // space
-				if(event.shiftKey) {
-					OC.Contacts.Contacts.previous();
-					break;
-				}
 			case 40: // down
-			case 75: // k
+			case 74: // j
 				OC.Contacts.Contacts.next();
 				break;
 			case 65: // a
@@ -1711,23 +1729,24 @@ $(document).ready(function(){
 				OC.Contacts.Card.editNew();
 				break;
 			case 38: // up
-			case 74: // j
+			case 75: // k
 				OC.Contacts.Contacts.previous();
 				break;
+			case 34: // PageDown
 			case 78: // n
 				// next addressbook
-				OC.Contacts.notImplemented();
+				OC.Contacts.Contacts.nextAddressbook();
 				break;
-			case 13: // Enter
 			case 79: // o
 				var aid = $('#contacts h3.active').first().data('id');
 				if(aid) {
 					$('#contacts ul[data-id="'+aid+'"]').slideToggle(300);
 				}
 				break;
+			case 33: // PageUp
 			case 80: // p
 				// prev addressbook
-				OC.Contacts.notImplemented();
+				OC.Contacts.Contacts.previousAddressbook();
 				break;
 			case 82: // r
 				OC.Contacts.Contacts.update({cid:OC.Contacts.Card.id});
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 270d5c203c..024b1d150f 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -38,14 +38,16 @@
 		<div class="help-section">
 			<h3><?php echo $l->t('Navigation'); ?></h3>
 			<dl>
-				<dt>j/Down/Space</dt>
+				<dt>j/Down</dt>
 				<dd><?php echo $l->t('Next contact in list'); ?></dd>
-				<dt>k/Up/Shift-Space</dt>
+				<dt>k/Up</dt>
 				<dd><?php echo $l->t('Previous contact in list'); ?></dd>
-				<dt>o/Enter</dt>
+				<dt>o</dt>
 				<dd><?php echo $l->t('Expand/collapse current addressbook'); ?></dd>
-				<dt>n/p</dt>
-				<dd><?php echo $l->t('Next/previous addressbook'); ?></dd>
+				<dt>n/PageDown</dt>
+				<dd><?php echo $l->t('Next addressbook'); ?></dd>
+				<dt>p/PageUp</dt>
+				<dd><?php echo $l->t('Previous addressbook'); ?></dd>
 			</dl>
 		</div>
 		<div class="help-section">
@@ -55,8 +57,8 @@
 				<dd><?php echo $l->t('Refresh contacts list'); ?></dd>
 				<dt>a</dt>
 				<dd><?php echo $l->t('Add new contact'); ?></dd>
-				<dt>Shift-a</dt>
-				<dd><?php echo $l->t('Add new addressbook'); ?></dd>
+				<!-- dt>Shift-a</dt>
+				<dd><?php echo $l->t('Add new addressbook'); ?></dd -->
 				<dt>Shift-Delete</dt>
 				<dd><?php echo $l->t('Delete current contact'); ?></dd>
 			</dl>

From bef63527cef4c642e141793eea1a1e9eab39cd30 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 3 Aug 2012 04:20:14 +0200
Subject: [PATCH 1248/1537] Reorganize ajax scripts.

---
 .../ajax/{addcontact.php => contact/add.php}     |  0
 apps/contacts/ajax/{ => contact}/addproperty.php |  0
 .../ajax/{deletecard.php => contact/delete.php}  |  0
 .../ajax/{ => contact}/deleteproperty.php        |  0
 .../{contactdetails.php => contact/details.php}  |  0
 .../ajax/{contacts.php => contact/list.php}      |  0
 .../{movetoaddressbook.php => contact/move.php}  |  0
 .../contacts/ajax/{ => contact}/saveproperty.php |  0
 apps/contacts/js/contacts.js                     | 16 ++++++++--------
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename apps/contacts/ajax/{addcontact.php => contact/add.php} (100%)
 rename apps/contacts/ajax/{ => contact}/addproperty.php (100%)
 rename apps/contacts/ajax/{deletecard.php => contact/delete.php} (100%)
 rename apps/contacts/ajax/{ => contact}/deleteproperty.php (100%)
 rename apps/contacts/ajax/{contactdetails.php => contact/details.php} (100%)
 rename apps/contacts/ajax/{contacts.php => contact/list.php} (100%)
 rename apps/contacts/ajax/{movetoaddressbook.php => contact/move.php} (100%)
 rename apps/contacts/ajax/{ => contact}/saveproperty.php (100%)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/contact/add.php
similarity index 100%
rename from apps/contacts/ajax/addcontact.php
rename to apps/contacts/ajax/contact/add.php
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
similarity index 100%
rename from apps/contacts/ajax/addproperty.php
rename to apps/contacts/ajax/contact/addproperty.php
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/contact/delete.php
similarity index 100%
rename from apps/contacts/ajax/deletecard.php
rename to apps/contacts/ajax/contact/delete.php
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php
similarity index 100%
rename from apps/contacts/ajax/deleteproperty.php
rename to apps/contacts/ajax/contact/deleteproperty.php
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contact/details.php
similarity index 100%
rename from apps/contacts/ajax/contactdetails.php
rename to apps/contacts/ajax/contact/details.php
diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contact/list.php
similarity index 100%
rename from apps/contacts/ajax/contacts.php
rename to apps/contacts/ajax/contact/list.php
diff --git a/apps/contacts/ajax/movetoaddressbook.php b/apps/contacts/ajax/contact/move.php
similarity index 100%
rename from apps/contacts/ajax/movetoaddressbook.php
rename to apps/contacts/ajax/contact/move.php
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
similarity index 100%
rename from apps/contacts/ajax/saveproperty.php
rename to apps/contacts/ajax/contact/saveproperty.php
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d9fff25bc9..0b4a3c0a54 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -410,13 +410,13 @@ OC.Contacts={
 			console.log('Adding ' + fn);
 			aid = aid?aid:$('#contacts h3.active').first().data('id');
 			var localAddcontact = function(n, fn, aid, isnew) {
-				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
+				$.post(OC.filePath('contacts', 'ajax', 'contact/add.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
 				function(jsondata) {
 					if (jsondata.status == 'success'){
 						$('#rightcontent').data('id',jsondata.data.id);
 						var id = jsondata.data.id;
 						var aid = jsondata.data.aid;
-						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':id},function(jsondata){
 							if(jsondata.status == 'success'){
 								OC.Contacts.Card.loadContact(jsondata.data, aid);
 								var item = OC.Contacts.Contacts.insertContact({data:jsondata.data});
@@ -512,7 +512,7 @@ OC.Contacts={
 			if(OC.Contacts.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
 				return;
 			}
-			$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
+			$.post(OC.filePath('contacts', 'ajax', 'contact/delete.php'),{'id':id},function(jsondata) {
 				if(jsondata.status == 'error'){
 					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 				}
@@ -747,7 +747,7 @@ OC.Contacts={
 					q = q + '&checksum=' + checksum;
 					console.log('Saving: ' + q);
 					$(obj).attr('disabled', 'disabled');
-					$.post(OC.filePath('contacts', 'ajax', 'saveproperty.php'),q,function(jsondata){
+					$.post(OC.filePath('contacts', 'ajax', 'contact/saveproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
 							OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
@@ -765,7 +765,7 @@ OC.Contacts={
 			} else { // add
 					console.log('Adding: ' + q);
 					$(obj).attr('disabled', 'disabled');
-					$.post(OC.filePath('contacts', 'ajax', 'addproperty.php'),q,function(jsondata){
+					$.post(OC.filePath('contacts', 'ajax', 'contact/addproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
 							// TODO: savePropertyInternal doesn't know about new fields
@@ -823,7 +823,7 @@ OC.Contacts={
 			OC.Contacts.loading(obj, true);
 			var checksum = OC.Contacts.checksumFor(obj);
 			if(checksum) {
-				$.post(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
+				$.post(OC.filePath('contacts', 'ajax', 'contact/deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
 					if(jsondata.status == 'success'){
 						if(type == 'list') {
 							OC.Contacts.propertyContainerFor(obj).remove();
@@ -1438,7 +1438,7 @@ OC.Contacts={
 				return false;
 			}
 			var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
-			$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
+			$.post(OC.filePath('contacts', 'ajax', 'contact/move.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
 				function(jsondata){
 					if(jsondata.status == 'success'){
 						dragitem.attr('data-bookid', droptarget.data('id'))
@@ -1577,7 +1577,7 @@ OC.Contacts={
 			if(params.aid) {
 				opts['aid'] = params.aid;
 			}
-			$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'contact/list.php'),opts,function(jsondata){
 				if(jsondata.status == 'success'){
 					var books = jsondata.data.entries;
 					$.each(books, function(b, book) {

From d7e77f64263cb846ce37a02761b8c3e35c048a00 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 4 Aug 2012 02:04:21 +0200
Subject: [PATCH 1249/1537] [tx-robot] updated from transifex

---
 apps/bookmarks/l10n/eo.php   |  11 ++
 apps/contacts/l10n/ar.php    |   4 +-
 apps/contacts/l10n/ca.php    |  29 ++--
 apps/contacts/l10n/cs_CZ.php |  24 ++--
 apps/contacts/l10n/da.php    |  24 ++--
 apps/contacts/l10n/de.php    |  29 ++--
 apps/contacts/l10n/el.php    |  29 ++--
 apps/contacts/l10n/eo.php    |  59 ++++++--
 apps/contacts/l10n/es.php    |  24 ++--
 apps/contacts/l10n/et_EE.php |  24 ++--
 apps/contacts/l10n/eu.php    |  27 ++--
 apps/contacts/l10n/fa.php    |  24 ++--
 apps/contacts/l10n/fi_FI.php |  13 +-
 apps/contacts/l10n/fr.php    |  29 ++--
 apps/contacts/l10n/gl.php    |  22 +--
 apps/contacts/l10n/he.php    |  24 ++--
 apps/contacts/l10n/hr.php    |  32 ++---
 apps/contacts/l10n/hu_HU.php |  24 ++--
 apps/contacts/l10n/ia.php    |   2 +-
 apps/contacts/l10n/it.php    |  29 ++--
 apps/contacts/l10n/ja_JP.php |  24 ++--
 apps/contacts/l10n/ko.php    |  22 +--
 apps/contacts/l10n/lb.php    |  14 +-
 apps/contacts/l10n/lt_LT.php |   4 +-
 apps/contacts/l10n/mk.php    |  24 ++--
 apps/contacts/l10n/ms_MY.php |  24 ++--
 apps/contacts/l10n/nb_NO.php |  16 +--
 apps/contacts/l10n/nl.php    |  32 ++---
 apps/contacts/l10n/nn_NO.php |   4 +-
 apps/contacts/l10n/pl.php    |  29 ++--
 apps/contacts/l10n/pt_BR.php |  24 ++--
 apps/contacts/l10n/pt_PT.php |  24 ++--
 apps/contacts/l10n/ro.php    |  18 +--
 apps/contacts/l10n/ru.php    |  24 ++--
 apps/contacts/l10n/sk_SK.php |  25 ++--
 apps/contacts/l10n/sl.php    |  24 ++--
 apps/contacts/l10n/sv.php    |  22 +--
 apps/contacts/l10n/th_TH.php |  24 ++--
 apps/contacts/l10n/tr.php    |  29 ++--
 apps/contacts/l10n/vi.php    |   2 +-
 apps/contacts/l10n/zh_CN.php |  24 ++--
 apps/contacts/l10n/zh_TW.php |   8 +-
 l10n/af/contacts.po          | 186 ++++++++++++------------
 l10n/ar/contacts.po          | 194 ++++++++++++-------------
 l10n/ar_SA/contacts.po       | 186 ++++++++++++------------
 l10n/bg_BG/contacts.po       | 186 ++++++++++++------------
 l10n/ca/contacts.po          | 200 +++++++++++++-------------
 l10n/cs_CZ/contacts.po       | 198 +++++++++++++-------------
 l10n/da/contacts.po          | 198 +++++++++++++-------------
 l10n/de/contacts.po          | 200 +++++++++++++-------------
 l10n/el/contacts.po          | 200 +++++++++++++-------------
 l10n/eo/bookmarks.po         |  25 ++--
 l10n/eo/contacts.po          | 265 ++++++++++++++++++-----------------
 l10n/eo/lib.po               |  51 +++----
 l10n/eo/settings.po          |  11 +-
 l10n/es/contacts.po          | 198 +++++++++++++-------------
 l10n/et_EE/contacts.po       | 198 +++++++++++++-------------
 l10n/eu/contacts.po          | 200 +++++++++++++-------------
 l10n/eu_ES/contacts.po       | 186 ++++++++++++------------
 l10n/fa/contacts.po          | 198 +++++++++++++-------------
 l10n/fi_FI/contacts.po       | 196 +++++++++++++-------------
 l10n/fr/contacts.po          | 200 +++++++++++++-------------
 l10n/gl/contacts.po          | 198 +++++++++++++-------------
 l10n/he/contacts.po          | 198 +++++++++++++-------------
 l10n/hr/contacts.po          | 198 +++++++++++++-------------
 l10n/hu_HU/contacts.po       | 198 +++++++++++++-------------
 l10n/hy/contacts.po          | 186 ++++++++++++------------
 l10n/ia/contacts.po          | 190 +++++++++++++------------
 l10n/id/contacts.po          | 186 ++++++++++++------------
 l10n/id_ID/contacts.po       | 186 ++++++++++++------------
 l10n/it/contacts.po          | 200 +++++++++++++-------------
 l10n/ja_JP/contacts.po       | 198 +++++++++++++-------------
 l10n/ko/contacts.po          | 198 +++++++++++++-------------
 l10n/lb/contacts.po          | 196 +++++++++++++-------------
 l10n/lt_LT/contacts.po       | 192 ++++++++++++-------------
 l10n/lv/contacts.po          | 186 ++++++++++++------------
 l10n/mk/contacts.po          | 198 +++++++++++++-------------
 l10n/ms_MY/contacts.po       | 198 +++++++++++++-------------
 l10n/nb_NO/contacts.po       | 194 ++++++++++++-------------
 l10n/nl/contacts.po          | 198 +++++++++++++-------------
 l10n/nn_NO/contacts.po       | 194 ++++++++++++-------------
 l10n/pl/contacts.po          | 200 +++++++++++++-------------
 l10n/pt_BR/contacts.po       | 198 +++++++++++++-------------
 l10n/pt_PT/contacts.po       | 198 +++++++++++++-------------
 l10n/ro/contacts.po          | 198 +++++++++++++-------------
 l10n/ru/contacts.po          | 198 +++++++++++++-------------
 l10n/sk_SK/contacts.po       | 200 +++++++++++++-------------
 l10n/sl/contacts.po          | 198 +++++++++++++-------------
 l10n/so/contacts.po          | 186 ++++++++++++------------
 l10n/sr/contacts.po          | 186 ++++++++++++------------
 l10n/sr@latin/contacts.po    | 186 ++++++++++++------------
 l10n/sv/contacts.po          | 196 +++++++++++++-------------
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  | 184 ++++++++++++------------
 l10n/templates/core.pot      |  26 ++--
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       |   2 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 l10n/th_TH/contacts.po       | 198 +++++++++++++-------------
 l10n/tr/contacts.po          | 200 +++++++++++++-------------
 l10n/uk/contacts.po          | 186 ++++++++++++------------
 l10n/vi/contacts.po          | 196 +++++++++++++-------------
 l10n/zh_CN/contacts.po       | 198 +++++++++++++-------------
 l10n/zh_TW/contacts.po       | 192 ++++++++++++-------------
 lib/l10n/eo.php              |  24 ++++
 settings/l10n/eo.php         |   2 +
 109 files changed, 5968 insertions(+), 5688 deletions(-)
 create mode 100644 apps/bookmarks/l10n/eo.php
 create mode 100644 lib/l10n/eo.php

diff --git a/apps/bookmarks/l10n/eo.php b/apps/bookmarks/l10n/eo.php
new file mode 100644
index 0000000000..808cda8a04
--- /dev/null
+++ b/apps/bookmarks/l10n/eo.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Legosignoj",
+"unnamed" => "nenomita",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:",
+"Read later" => "Legi poste",
+"Address" => "Adreso",
+"Title" => "Titolo",
+"Tags" => "Etikedoj",
+"Save bookmark" => "Konservi legosignon",
+"You have no bookmarks" => "Vi havas neniun legosignon"
+);
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 3075717ce6..cd57b69a89 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
+"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
-"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
-"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
 "Error deleting contact property." => "خطء خلال محي الصفه.",
 "Error updating contact property." => "خطء خلال تعديل الصفه.",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index aba320c09d..925d78b684 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
-"element name is not set." => "no s'ha establert el nom de l'element.",
-"id is not set." => "no s'ha establert la id.",
-"Could not parse contact: " => "No s'ha pogut processar el contacte:",
-"Cannot add empty property." => "No es pot afegir una propietat buida.",
-"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
-"Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
-"Error adding contact property: " => "Error en afegir la propietat del contacte:",
 "Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
+"id is not set." => "no s'ha establert la id.",
 "Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
 "Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
 "No ID provided" => "No heu facilitat cap ID",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "No heu seleccionat les categories a eliminar.",
 "No address books found." => "No s'han trobat llibretes d'adreces.",
 "No contacts found." => "No s'han trobat contactes.",
+"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
+"element name is not set." => "no s'ha establert el nom de l'element.",
+"Could not parse contact: " => "No s'ha pogut processar el contacte:",
+"Cannot add empty property." => "No es pot afegir una propietat buida.",
+"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
+"Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
+"Error adding contact property: " => "Error en afegir la propietat del contacte:",
+"Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
+"Error deleting contact property." => "Error en eliminar la propietat del contacte.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error en analitzar la ID de la VCard: \"",
+"checksum is not set." => "no s'ha establert la suma de verificació.",
+"Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
+"Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
+"Error updating contact property." => "Error en actualitzar la propietat del contacte.",
 "No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
 "Error reading contact photo." => "Error en llegir la foto del contacte.",
 "Error saving temporary file." => "Error en desar el fitxer temporal.",
 "The loading photo is not valid." => "La foto carregada no és vàlida.",
-"Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
-"Error deleting contact property." => "Error en eliminar la propietat del contacte.",
 "Contact ID is missing." => "falta la ID del contacte.",
 "No photo path was submitted." => "No heu tramès el camí de la foto.",
 "File doesn't exist:" => "El fitxer no existeix:",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Error en retallar la imatge",
 "Error creating temporary image" => "Error en crear la imatge temporal",
 "Error finding image: " => "Error en trobar la imatge:",
-"checksum is not set." => "no s'ha establert la suma de verificació.",
-"Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
-"Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
-"Error updating contact property." => "Error en actualitzar la propietat del contacte.",
 "Error uploading contacts to storage." => "Error en carregar contactes a l'emmagatzemament.",
 "There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer carregat supera la directiva upload_max_filesize de php.ini",
@@ -108,7 +108,6 @@
 "Next contact in list" => "Següent contacte de la llista",
 "Previous contact in list" => "Contacte anterior de la llista",
 "Expand/collapse current addressbook" => "Expandeix/col·lapsa la llibreta d'adreces",
-"Next/previous addressbook" => "Següent/anterior llibreta d'adreces",
 "Actions" => "Accions",
 "Refresh contacts list" => "Carrega de nou la llista de contactes",
 "Add new contact" => "Afegeix un contacte nou",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 8c0043cb3b..9b342328ac 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
-"element name is not set." => "jméno elementu není nastaveno.",
-"id is not set." => "id neni nastaveno.",
-"Cannot add empty property." => "Nelze přidat prazdný údaj.",
-"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
-"Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
 "Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
+"id is not set." => "id neni nastaveno.",
 "Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
 "Error updating addressbook." => "Chyba při aktualizaci adresáře.",
 "No ID provided" => "ID nezadáno",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány k smazání.",
 "No address books found." => "Žádný adresář nenalezen.",
 "No contacts found." => "Žádné kontakty nenalezeny.",
+"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
+"element name is not set." => "jméno elementu není nastaveno.",
+"Cannot add empty property." => "Nelze přidat prazdný údaj.",
+"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
+"Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
+"Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
+"Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
 "Missing ID" => "Chybí ID",
 "Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
+"checksum is not set." => "kontrolní součet není nastaven.",
+"Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
+"Something went FUBAR. " => "Něco se pokazilo. ",
+"Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
 "No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
 "Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
 "Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
-"Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
-"Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
 "Contact ID is missing." => "Chybí ID kontaktu.",
 "No photo path was submitted." => "Žádná fotka nebyla nahrána.",
 "File doesn't exist:" => "Soubor neexistuje:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Chyba při osekávání obrázku.",
 "Error creating temporary image" => "Chyba při vytváření dočasného obrázku.",
 "Error finding image: " => "Chyba při hledání obrázku:",
-"checksum is not set." => "kontrolní součet není nastaven.",
-"Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
-"Something went FUBAR. " => "Něco se pokazilo. ",
-"Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
 "Error uploading contacts to storage." => "Chyba při nahrávání kontaktů do úložiště.",
 "There is no error, the file uploaded with success" => "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index ca16603c00..7d98c339f5 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
-"element name is not set." => "Elementnavnet er ikke medsendt.",
-"id is not set." => "Intet ID medsendt.",
-"Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
-"At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
-"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
 "Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
+"id is not set." => "Intet ID medsendt.",
 "Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
 "Error updating addressbook." => "Fejl ved opdatering af adressebog",
 "No ID provided" => "Intet ID medsendt",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
 "No address books found." => "Der blev ikke fundet nogen adressebøger.",
 "No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
+"There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
+"element name is not set." => "Elementnavnet er ikke medsendt.",
+"Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
+"At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
+"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
+"Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
+"Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
 "Missing ID" => "Manglende ID",
 "Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'et: \"",
+"checksum is not set." => "Checksum er ikke medsendt.",
+"Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
+"Something went FUBAR. " => "Noget gik grueligt galt. ",
+"Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
 "No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
 "Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
 "Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
 "The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
-"Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
-"Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
 "Contact ID is missing." => "Kontaktperson ID mangler.",
 "No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Kunne ikke beskære billedet",
 "Error creating temporary image" => "Kunne ikke oprette midlertidigt billede",
 "Error finding image: " => "Kunne ikke finde billedet: ",
-"checksum is not set." => "Checksum er ikke medsendt.",
-"Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
-"Something went FUBAR. " => "Noget gik grueligt galt. ",
-"Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
 "Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
 "There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 5849373e65..08e28f3fd0 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
-"element name is not set." => "Kein Name für das Element angegeben.",
-"id is not set." => "ID ist nicht angegeben.",
-"Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
-"Cannot add empty property." => "Feld darf nicht leer sein.",
-"At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
-"Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
-"Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
 "Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
+"id is not set." => "ID ist nicht angegeben.",
 "Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
 "Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
 "No ID provided" => "Keine ID angegeben",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
 "No address books found." => "Keine Adressbücher gefunden.",
 "No contacts found." => "Keine Kontakte gefunden.",
+"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
+"element name is not set." => "Kein Name für das Element angegeben.",
+"Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
+"Cannot add empty property." => "Feld darf nicht leer sein.",
+"At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
+"Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
+"Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
+"Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
+"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
 "Missing ID" => "Fehlende ID",
 "Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
+"checksum is not set." => "Keine Prüfsumme angegeben.",
+"Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
+"Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
+"Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
 "No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
 "Error reading contact photo." => "Fehler beim Auslesen des Kontaktfotos.",
 "Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
 "The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
-"Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
-"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
 "Contact ID is missing." => "Keine Kontakt-ID angegeben.",
 "No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
 "File doesn't exist:" => "Datei existiert nicht: ",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Fehler beim Zuschneiden des Bildes",
 "Error creating temporary image" => "Fehler beim erstellen des temporären Bildes",
 "Error finding image: " => "Fehler beim Suchen des Bildes: ",
-"checksum is not set." => "Keine Prüfsumme angegeben.",
-"Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
-"Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
-"Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
 "Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen",
 "There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt",
@@ -108,7 +108,6 @@
 "Next contact in list" => "Nächster Kontakt aus der Liste",
 "Previous contact in list" => "Vorheriger Kontakt aus der Liste",
 "Expand/collapse current addressbook" => "Ausklappen/Einklappen des Adressbuches",
-"Next/previous addressbook" => "Nächstes/Vorhergehendes Adressbuch",
 "Actions" => "Aktionen",
 "Refresh contacts list" => "Kontaktliste neu laden",
 "Add new contact" => "Neuen Kontakt hinzufügen",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 8f6bc41a77..2f31bccbf2 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
-"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
-"id is not set." => "δεν ορίστηκε id",
-"Could not parse contact: " => "Δε αναγνώστηκε η επαφή",
-"Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
-"At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
-"Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
-"Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
 "Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
+"id is not set." => "δεν ορίστηκε id",
 "Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
 "Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
 "No ID provided" => "Δε δόθηκε ID",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "Δε επελέγησαν κατηγορίες για διαγραφή",
 "No address books found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "No contacts found." => "Δεν βρέθηκαν επαφές",
+"There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
+"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
+"Could not parse contact: " => "Δε αναγνώστηκε η επαφή",
+"Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
+"At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
+"Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
+"Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
+"Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
+"Error deleting contact property." => "Σφάλμα διαγραφής ιδιότητας επαφής.",
 "Missing ID" => "Λείπει ID",
 "Error parsing VCard for ID: \"" => "Σφάλμα κατά την ανάγνωση του VCard για το ID:\"",
+"checksum is not set." => "δε ορίστηκε checksum ",
+"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
+"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
+"Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
 "No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
 "Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
 "Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
 "The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
-"Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
-"Error deleting contact property." => "Σφάλμα διαγραφής ιδιότητας επαφής.",
 "Contact ID is missing." => "Λείπει ID επαφής",
 "No photo path was submitted." => "Δε δόθηκε διαδρομή εικόνας",
 "File doesn't exist:" => "Το αρχείο δεν υπάρχει:",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Σφάλμα κατά την περικοπή εικόνας",
 "Error creating temporary image" => "Σφάλμα κατά την δημιουργία προσωρινής εικόνας",
 "Error finding image: " => "Σφάλμα κατά την εύρεση της εικόνας: ",
-"checksum is not set." => "δε ορίστηκε checksum ",
-"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
-"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
-"Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
 "Error uploading contacts to storage." => "Σφάλμα κατά την αποθήκευση επαφών",
 "There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία ",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini",
@@ -106,7 +106,6 @@
 "Next contact in list" => "Επόμενη επαφή στη λίστα",
 "Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
 "Expand/collapse current addressbook" => "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων",
-"Next/previous addressbook" => "Επόμενο/προηγούμενο βιβλίο διευθύνσεων",
 "Actions" => "Ενέργειες",
 "Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
 "Add new contact" => "Προσθήκη νέας επαφής",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index cc64633bee..29ac52b1fe 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
-"element name is not set." => "eronomo ne agordiĝis.",
-"id is not set." => "identigilo ne agordiĝis.",
-"Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
-"At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
-"Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
 "Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
+"id is not set." => "identigilo ne agordiĝis.",
 "Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
 "Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
@@ -13,14 +8,24 @@
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
 "No address books found." => "Neniu adresaro troviĝis.",
 "No contacts found." => "Neniu kontakto troviĝis.",
+"There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
+"element name is not set." => "eronomo ne agordiĝis.",
+"Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
+"At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
+"Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
+"Error adding contact property: " => "Eraro aldonante kontakta propraĵo:",
+"Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
+"Error deleting contact property." => "Eraro dum forigo de kontaktopropraĵo.",
 "Missing ID" => "Mankas identigilo",
 "Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
+"checksum is not set." => "kontrolsumo ne agordiĝis.",
+"Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
+"Something went FUBAR. " => "Io FUBAR-is.",
+"Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
 "Error reading contact photo." => "Eraro dum lego de kontakta foto.",
 "Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
 "The loading photo is not valid." => "La alŝutata foto ne validas.",
-"Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
-"Error deleting contact property." => "Eraro dum forigo de kontaktopropraĵo.",
 "Contact ID is missing." => "Kontaktidentigilo mankas.",
 "No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
 "File doesn't exist:" => "Dosiero ne ekzistas:",
@@ -32,10 +37,6 @@
 "Error cropping image" => "Eraro dum stuciĝis bildo.",
 "Error creating temporary image" => "Eraro dum kreiĝis provizora bildo.",
 "Error finding image: " => "Eraro dum serĉo de bildo: ",
-"checksum is not set." => "kontrolsumo ne agordiĝis.",
-"Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
-"Something went FUBAR. " => "Io FUBAR-is.",
-"Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
@@ -56,6 +57,7 @@
 "Result: " => "Rezulto: ",
 " imported, " => " enportoj, ",
 " failed." => "malsukcesoj.",
+"Addressbook not found: " => "Adresaro ne troviĝis:",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
 "Address" => "Adreso",
@@ -73,12 +75,29 @@
 "Pager" => "Televokilo",
 "Internet" => "Interreto",
 "Birthday" => "Naskiĝotago",
+"Business" => "Negoco",
+"Clients" => "Klientoj",
+"Ideas" => "Ideoj",
+"Meeting" => "Kunveno",
+"Other" => "Alia",
+"Personal" => "Persona",
+"Projects" => "Projektoj",
+"Questions" => "Demandoj",
 "{name}'s Birthday" => "Naskiĝtago de {name}",
 "Contact" => "Kontakto",
 "Add Contact" => "Aldoni kontakton",
 "Import" => "Enporti",
+"Settings" => "Agordo",
 "Addressbooks" => "Adresaroj",
 "Close" => "Fermi",
+"Keyboard shortcuts" => "Fulmoklavoj",
+"Navigation" => "Navigado",
+"Next contact in list" => "Sekva kontakto en la listo",
+"Previous contact in list" => "Malsekva kontakto en la listo",
+"Actions" => "Agoj",
+"Add new contact" => "Aldoni novan kontakton",
+"Add new addressbook" => "Aldoni novan adresaron",
+"Delete current contact" => "Forigi la nunan kontakton",
 "Drop photo to upload" => "Demeti foton por alŝuti",
 "Delete current photo" => "Forigi nunan foton",
 "Edit current photo" => "Redakti nunan foton",
@@ -89,6 +108,9 @@
 "Delete" => "Forigi",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
+"Web site" => "TTT-ejo",
+"http://www.somesite.com" => "http://www.iuejo.com",
+"Go to web site" => "Iri al TTT-ejon",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Grupoj",
 "Separate groups with commas" => "Disigi grupojn per komoj",
@@ -112,10 +134,13 @@
 "Edit address" => "Redakti adreson",
 "Type" => "Tipo",
 "PO Box" => "Abonkesto",
+"Street address" => "Stratadreso",
+"Street and number" => "Strato kaj numero",
 "Extended" => "Etendita",
 "City" => "Urbo",
 "Region" => "Regiono",
 "Zipcode" => "Poŝtokodo",
+"Postal code" => "Poŝtkodo",
 "Country" => "Lando",
 "Addressbook" => "Adresaro",
 "Hon. prefixes" => "Honoraj antaŭmetaĵoj",
@@ -137,13 +162,21 @@
 "You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
 "Add contact" => "Aldoni kontakton",
 "Configure addressbooks" => "Agordi adresarojn",
+"Select Address Books" => "Elektu adresarojn",
+"Enter name" => "Enigu nomon",
+"Enter description" => "Enigu priskribon",
 "CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
 "more info" => "pli da informo",
 "Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Montri CardDav-ligilon",
+"Show read-only VCF link" => "Montri nur legeblan VCF-ligilon",
 "Download" => "Elŝuti",
 "Edit" => "Redakti",
 "New Address Book" => "Nova adresaro",
+"Name" => "Nomo",
+"Description" => "Priskribo",
 "Save" => "Konservi",
-"Cancel" => "Nuligi"
+"Cancel" => "Nuligi",
+"More..." => "Pli..."
 );
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 8805d8dc29..e9ee24d529 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
-"element name is not set." => "no se ha puesto ningún nombre de elemento.",
-"id is not set." => "no se ha puesto ninguna ID.",
-"Cannot add empty property." => "No se puede añadir una propiedad vacía.",
-"At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
-"Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
 "Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
+"id is not set." => "no se ha puesto ninguna ID.",
 "Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
 "Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
 "No ID provided" => "No se ha proporcionado una ID",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
 "No address books found." => "No se encontraron libretas de direcciones.",
 "No contacts found." => "No se encontraron contactos.",
+"There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
+"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"Cannot add empty property." => "No se puede añadir una propiedad vacía.",
+"At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
+"Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
+"Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
+"Error deleting contact property." => "Error al borrar una propiedad del contacto.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
+"checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
+"Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
+"Something went FUBAR. " => "Plof. Algo ha fallado.",
+"Error updating contact property." => "Error al actualizar una propiedad del contacto.",
 "No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
 "Error reading contact photo." => "Error leyendo fotografía del contacto.",
 "Error saving temporary file." => "Error al guardar archivo temporal.",
 "The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
-"Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
-"Error deleting contact property." => "Error al borrar una propiedad del contacto.",
 "Contact ID is missing." => "Falta la ID del contacto.",
 "No photo path was submitted." => "No se ha introducido la ruta de la foto.",
 "File doesn't exist:" => "Archivo inexistente:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Fallo al cortar el tamaño de la foto",
 "Error creating temporary image" => "Fallo al crear la foto temporal",
 "Error finding image: " => "Fallo al encontrar la imagen",
-"checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
-"Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
-"Something went FUBAR. " => "Plof. Algo ha fallado.",
-"Error updating contact property." => "Error al actualizar una propiedad del contacto.",
 "Error uploading contacts to storage." => "Error al subir contactos al almacenamiento.",
 "There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 1a7a8bb81f..c11ea6d838 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
-"element name is not set." => "elemendi nime pole määratud.",
-"id is not set." => "ID on määramata.",
-"Cannot add empty property." => "Tühja omadust ei saa lisada.",
-"At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
-"Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
 "Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
+"id is not set." => "ID on määramata.",
 "Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
 "Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
 "No ID provided" => "ID-d pole sisestatud",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
 "No address books found." => "Ei leitud ühtegi aadressiraamatut.",
 "No contacts found." => "Ühtegi kontakti ei leitud.",
+"There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
+"element name is not set." => "elemendi nime pole määratud.",
+"Cannot add empty property." => "Tühja omadust ei saa lisada.",
+"At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
+"Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
+"Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
+"Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
 "Missing ID" => "Puudub ID",
 "Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
+"checksum is not set." => "kontrollsummat pole määratud.",
+"Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
+"Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
+"Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
 "No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
 "Error reading contact photo." => "Viga kontakti foto lugemisel.",
 "Error saving temporary file." => "Viga ajutise faili salvestamisel.",
 "The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
-"Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
-"Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
 "Contact ID is missing." => "Kontakti ID puudub.",
 "No photo path was submitted." => "Foto asukohta pole määratud.",
 "File doesn't exist:" => "Faili pole olemas:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Viga pildi lõikamisel",
 "Error creating temporary image" => "Viga ajutise pildi loomisel",
 "Error finding image: " => "Viga pildi leidmisel: ",
-"checksum is not set." => "kontrollsummat pole määratud.",
-"Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
-"Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
-"Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
 "Error uploading contacts to storage." => "Viga kontaktide üleslaadimisel kettale.",
 "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index a5cdc927b8..7a0b2ce38b 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
-"element name is not set." => "elementuaren izena ez da ezarri.",
-"id is not set." => "IDa ez da ezarri.",
-"Could not parse contact: " => "Ezin izan da kontaktua analizatu:",
-"Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
-"At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
-"Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
-"Error adding contact property: " => "Errore bat egon da kontaktuaren propietatea gehitzean:",
 "Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
+"id is not set." => "IDa ez da ezarri.",
 "Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
 "Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
 "No ID provided" => "Ez da IDrik eman",
@@ -15,14 +8,24 @@
 "No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
 "No address books found." => "Ez da helbide libururik aurkitu.",
 "No contacts found." => "Ez da kontakturik aurkitu.",
+"There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
+"element name is not set." => "elementuaren izena ez da ezarri.",
+"Could not parse contact: " => "Ezin izan da kontaktua analizatu:",
+"Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
+"At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
+"Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
+"Error adding contact property: " => "Errore bat egon da kontaktuaren propietatea gehitzean:",
+"Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
+"Error deleting contact property." => "Errorea kontaktu propietatea ezabatzean.",
 "Missing ID" => "ID falta da",
 "Error parsing VCard for ID: \"" => "Errorea VCard analizatzean hurrengo IDrako: \"",
+"checksum is not set." => "Kontrol-batura ezarri gabe dago.",
+"Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
+"Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "No contact ID was submitted." => "Ez da kontaktuaren IDrik eman.",
 "Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
 "Error saving temporary file." => "Errore bat izan da aldi bateko fitxategia gordetzerakoan.",
 "The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
-"Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
-"Error deleting contact property." => "Errorea kontaktu propietatea ezabatzean.",
 "Contact ID is missing." => "Kontaktuaren IDa falta da.",
 "No photo path was submitted." => "Ez da argazkiaren bide-izenik eman.",
 "File doesn't exist:" => "Fitxategia ez da existitzen:",
@@ -34,9 +37,6 @@
 "Error cropping image" => "Errore bat izan da irudia mozten",
 "Error creating temporary image" => "Errore bat izan da aldi bateko irudia sortzen",
 "Error finding image: " => "Ezin izan da irudia aurkitu:",
-"checksum is not set." => "Kontrol-batura ezarri gabe dago.",
-"Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
-"Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "Error uploading contacts to storage." => "Errore bat egon da kontaktuak biltegira igotzerakoan.",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da",
@@ -101,7 +101,6 @@
 "Next contact in list" => "Hurrengoa kontaktua zerrendan",
 "Previous contact in list" => "Aurreko kontaktua zerrendan",
 "Expand/collapse current addressbook" => "Zabaldu/tolestu uneko helbide-liburua",
-"Next/previous addressbook" => "Hurrengo/aurreko helbide-liburua",
 "Actions" => "Ekintzak",
 "Refresh contacts list" => "Gaurkotu kontaktuen zerrenda",
 "Add new contact" => "Gehitu kontaktu berria",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index a273bbcddb..c959979857 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
-"element name is not set." => "نام اصلی تنظیم نشده است",
-"id is not set." => "شناسه تعیین نشده",
-"Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
-"At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
-"Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
 "Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
+"id is not set." => "شناسه تعیین نشده",
 "Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
 "Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
 "No ID provided" => "هیچ شناسه ای ارائه نشده",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
 "No address books found." => "هیچ کتابچه نشانی پیدا نشد",
 "No contacts found." => "هیچ شخصی پیدا نشد",
+"There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
+"element name is not set." => "نام اصلی تنظیم نشده است",
+"Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
+"At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
+"Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
+"Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
+"Error deleting contact property." => "خطا در هنگام پاک کرد ویژگی",
 "Missing ID" => "نشانی گم شده",
 "Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
+"checksum is not set." => "checksum تنظیم شده نیست",
+"Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
+"Something went FUBAR. " => "چند چیز به FUBAR رفتند",
+"Error updating contact property." => "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر",
 "No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
 "Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
 "Error saving temporary file." => "خطا در ذخیره پرونده موقت",
 "The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
-"Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
-"Error deleting contact property." => "خطا در هنگام پاک کرد ویژگی",
 "Contact ID is missing." => "اطلاعات شناسه گم شده",
 "No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
 "File doesn't exist:" => "پرونده وجود ندارد",
@@ -32,10 +36,6 @@
 "Error cropping image" => "خطا در برداشت تصویر",
 "Error creating temporary image" => "خطا در ساخت تصویر  temporary",
 "Error finding image: " => "خطا در پیدا کردن تصویر:",
-"checksum is not set." => "checksum تنظیم شده نیست",
-"Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
-"Something went FUBAR. " => "چند چیز به FUBAR رفتند",
-"Error updating contact property." => "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر",
 "Error uploading contacts to storage." => "خطا در هنگام بارگذاری و ذخیره سازی",
 "There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "حجم آپلود از طریق Php.ini تعیین می شود",
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index e6136c26ff..6aab4ed347 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
-"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
-"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
 "Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
 "No address books found." => "Osoitekirjoja ei löytynyt.",
 "No contacts found." => "Yhteystietoja ei löytynyt.",
-"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
-"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
+"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
+"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
 "Information about vCard is incorrect. Please reload the page." => "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen.",
 "Error deleting contact property." => "Virhe poistettaessa yhteystiedon ominaisuutta.",
+"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
+"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
+"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
 "File doesn't exist:" => "Tiedostoa ei ole olemassa:",
 "Error loading image." => "Virhe kuvaa ladatessa.",
 "Error saving contact." => "Virhe yhteystietoa tallennettaessa.",
 "Error resizing image" => "Virhe asettaessa kuvaa uuteen kokoon",
 "Error cropping image" => "Virhe rajatessa kuvaa",
 "Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
-"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
 "There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
@@ -61,7 +61,6 @@
 "Keyboard shortcuts" => "Pikanäppäimet",
 "Next contact in list" => "Seuraava yhteystieto luettelossa",
 "Previous contact in list" => "Edellinen yhteystieto luettelossa",
-"Next/previous addressbook" => "Seuraava/edellinen osoitekirja",
 "Actions" => "Toiminnot",
 "Refresh contacts list" => "Päivitä yhteystietoluettelo",
 "Add new contact" => "Lisää uusi yhteystieto",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index a967259e25..88521f84e8 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
-"element name is not set." => "Le champ Nom n'est pas défini.",
-"id is not set." => "L'ID n'est pas défini.",
-"Could not parse contact: " => "Impossible de lire le contact :",
-"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
-"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
-"Trying to add duplicate property: " => "Ajout d'une propriété en double:",
-"Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
 "Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
+"id is not set." => "L'ID n'est pas défini.",
 "Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
 "Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
 "No ID provided" => "Aucun ID fourni",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "Pas de catégories sélectionnées pour la suppression.",
 "No address books found." => "Pas de carnet d'adresses trouvé.",
 "No contacts found." => "Aucun contact trouvé.",
+"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
+"element name is not set." => "Le champ Nom n'est pas défini.",
+"Could not parse contact: " => "Impossible de lire le contact :",
+"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
+"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
+"Trying to add duplicate property: " => "Ajout d'une propriété en double:",
+"Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
+"Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
+"Error deleting contact property." => "Erreur lors de la suppression du champ.",
 "Missing ID" => "ID manquant",
 "Error parsing VCard for ID: \"" => "Erreur lors de l'analyse du VCard pour l'ID: \"",
+"checksum is not set." => "L'hachage n'est pas défini.",
+"Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
+"Something went FUBAR. " => "Quelque chose est FUBAR.",
+"Error updating contact property." => "Erreur lors de la mise à jour du champ.",
 "No contact ID was submitted." => "Aucun ID de contact envoyé",
 "Error reading contact photo." => "Erreur de lecture de la photo du contact.",
 "Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
 "The loading photo is not valid." => "La photo chargée est invalide.",
-"Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
-"Error deleting contact property." => "Erreur lors de la suppression du champ.",
 "Contact ID is missing." => "L'ID du contact est manquant.",
 "No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
 "File doesn't exist:" => "Fichier inexistant:",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Erreur lors du rognage de l'image",
 "Error creating temporary image" => "Erreur de création de l'image temporaire",
 "Error finding image: " => "Erreur pour trouver l'image :",
-"checksum is not set." => "L'hachage n'est pas défini.",
-"Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
-"Something went FUBAR. " => "Quelque chose est FUBAR.",
-"Error updating contact property." => "Erreur lors de la mise à jour du champ.",
 "Error uploading contacts to storage." => "Erreur lors de l'envoi des contacts vers le stockage.",
 "There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini",
@@ -104,7 +104,6 @@
 "Next contact in list" => "Contact suivant dans la liste",
 "Previous contact in list" => "Contact précédent dans la liste",
 "Expand/collapse current addressbook" => "Dé/Replier le carnet d'adresses courant",
-"Next/previous addressbook" => "Passer au carnet d'adresses suivant/précédent",
 "Actions" => "Actions",
 "Refresh contacts list" => "Actualiser la liste des contacts",
 "Add new contact" => "Ajouter un nouveau contact",
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index 57f75e9dfc..1b456fba01 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
-"element name is not set." => "non se nomeou o elemento.",
-"id is not set." => "non se estableceu o id.",
-"Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
-"At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
-"Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
 "Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
+"id is not set." => "non se estableceu o id.",
 "Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
 "Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
 "No ID provided" => "Non se proveeu ID",
@@ -13,14 +8,22 @@
 "No categories selected for deletion." => "Non se seleccionaron categorías para borrado.",
 "No address books found." => "Non se atoparon libretas de enderezos.",
 "No contacts found." => "Non se atoparon contactos.",
+"There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
+"element name is not set." => "non se nomeou o elemento.",
+"Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
+"At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
+"Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
+"Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
+"Error deleting contact property." => "Produciuse un erro borrando a propiedade do contacto.",
 "Missing ID" => "ID perdido",
 "Error parsing VCard for ID: \"" => "Erro procesando a VCard para o ID: \"",
+"checksum is not set." => "non se estableceu a suma de verificación.",
+"Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
+"Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
 "No contact ID was submitted." => "Non se enviou ningún ID de contacto.",
 "Error reading contact photo." => "Erro lendo a fotografía do contacto.",
 "Error saving temporary file." => "Erro gardando o ficheiro temporal.",
 "The loading photo is not valid." => "A fotografía cargada non é válida.",
-"Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
-"Error deleting contact property." => "Produciuse un erro borrando a propiedade do contacto.",
 "Contact ID is missing." => "Falta o ID do contacto.",
 "No photo path was submitted." => "Non se enviou a ruta a unha foto.",
 "File doesn't exist:" => "O ficheiro non existe:",
@@ -32,9 +35,6 @@
 "Error cropping image" => "Erro recortando a imaxe",
 "Error creating temporary image" => "Erro creando a imaxe temporal",
 "Error finding image: " => "Erro buscando a imaxe: ",
-"checksum is not set." => "non se estableceu a suma de verificación.",
-"Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
-"Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
 "Error uploading contacts to storage." => "Erro subindo os contactos ao almacén.",
 "There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro subeuse con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 336a0c10aa..be67fe8ae8 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
-"element name is not set." => "שם האלמנט לא נקבע.",
-"id is not set." => "מספר מזהה לא נקבע.",
-"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
-"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
-"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
 "Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
+"id is not set." => "מספר מזהה לא נקבע.",
 "Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
 "Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
 "No ID provided" => "לא צוין מזהה",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
 "No address books found." => "לא נמצאו פנקסי כתובות.",
 "No contacts found." => "לא נמצאו אנשי קשר.",
+"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
+"element name is not set." => "שם האלמנט לא נקבע.",
+"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
+"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
+"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
+"Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
+"Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
 "Missing ID" => "מזהה חסר",
 "Error parsing VCard for ID: \"" => "שגיאה בפענוח ה VCard עבור מספר המזהה: \"",
+"checksum is not set." => "סיכום ביקורת לא נקבע.",
+"Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
+"Something went FUBAR. " => "משהו לא התנהל כצפוי.",
+"Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
 "No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
 "Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
 "Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
 "The loading photo is not valid." => "התמונה הנטענת אינה תקנית.",
-"Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
-"Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
 "Contact ID is missing." => "מספר מזהה של אישר הקשר חסר.",
 "No photo path was submitted." => "כתובת התמונה לא נשלחה",
 "File doesn't exist:" => "קובץ לא קיים:",
@@ -29,10 +33,6 @@
 "Error getting PHOTO property." => "שגיאה בקבלת מידע של תמונה",
 "Error saving contact." => "שגיאה בשמירת איש הקשר",
 "Error resizing image" => "שגיאה בשינוי גודל התמונה",
-"checksum is not set." => "סיכום ביקורת לא נקבע.",
-"Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
-"Something went FUBAR. " => "משהו לא התנהל כצפוי.",
-"Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
 "Error uploading contacts to storage." => "התרשה שגיאה בהעלאת אנשי הקשר לאכסון.",
 "There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini",
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index 02e0fc481b..d29283f767 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
-"element name is not set." => "naziv elementa nije postavljen.",
-"id is not set." => "id nije postavljen.",
-"Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
-"At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
-"Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
 "Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
+"id is not set." => "id nije postavljen.",
 "Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
 "Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
 "No ID provided" => "Nema dodijeljenog ID identifikatora",
@@ -13,22 +8,27 @@
 "No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
 "No address books found." => "Nema adresara.",
 "No contacts found." => "Nema kontakata.",
-"Missing ID" => "Nedostupan ID identifikator",
-"Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
-"No contact ID was submitted." => "ID kontakta nije podnešen.",
-"Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
-"Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
-"The loading photo is not valid." => "Fotografija nije valjana.",
+"There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
+"element name is not set." => "naziv elementa nije postavljen.",
+"Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
+"At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
+"Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
 "Error deleting contact property." => "Pogreška pri brisanju svojstva kontakta.",
-"Contact ID is missing." => "ID kontakta nije dostupan.",
-"No photo path was submitted." => "Putanja do fotografije nije podnešena.",
-"File doesn't exist:" => "Datoteka ne postoji:",
-"Error loading image." => "Pogreška pri učitavanju slike.",
+"Missing ID" => "Nedostupan ID identifikator",
+"Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
 "checksum is not set." => "checksum nije postavljen.",
 "Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
 "Something went FUBAR. " => "Nešto je otišlo... krivo...",
 "Error updating contact property." => "Pogreška pri ažuriranju svojstva kontakta.",
+"No contact ID was submitted." => "ID kontakta nije podnešen.",
+"Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
+"Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
+"The loading photo is not valid." => "Fotografija nije valjana.",
+"Contact ID is missing." => "ID kontakta nije dostupan.",
+"No photo path was submitted." => "Putanja do fotografije nije podnešena.",
+"File doesn't exist:" => "Datoteka ne postoji:",
+"Error loading image." => "Pogreška pri učitavanju slike.",
 "Error uploading contacts to storage." => "Pogreška pri slanju kontakata.",
 "There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini",
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 19a9e7120c..b3f831ea8a 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
-"element name is not set." => "az elem neve nincs beállítva",
-"id is not set." => "ID nincs beállítva",
-"Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
-"At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
-"Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
 "Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
+"id is not set." => "ID nincs beállítva",
 "Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
 "Error updating addressbook." => "Hiba a címlista frissítésekor",
 "No ID provided" => "Nincs ID megadva",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
 "No address books found." => "Nem található címlista",
 "No contacts found." => "Nem található kontakt",
+"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
+"element name is not set." => "az elem neve nincs beállítva",
+"Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
+"At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
+"Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
+"Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
+"Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
 "Missing ID" => "Hiányzó ID",
 "Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
+"checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
+"Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
+"Something went FUBAR. " => "Valami balul sült el.",
+"Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
 "No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
 "Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
 "Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
 "The loading photo is not valid." => "A kép érvénytelen",
-"Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
-"Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
 "Contact ID is missing." => "Hiányzik a kapcsolat ID",
 "No photo path was submitted." => "Nincs fénykép-útvonal megadva",
 "File doesn't exist:" => "A fájl nem létezik:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Képvágás sikertelen",
 "Error creating temporary image" => "Ideiglenes kép létrehozása sikertelen",
 "Error finding image: " => "A kép nem található",
-"checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
-"Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
-"Something went FUBAR. " => "Valami balul sült el.",
-"Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
 "Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index 0eb600f811..b3f9db539a 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Cannot add empty property." => "Non pote adder proprietate vacue.",
 "No address books found." => "Nulle adressario trovate",
 "No contacts found." => "Nulle contactos trovate.",
+"Cannot add empty property." => "Non pote adder proprietate vacue.",
 "Error saving temporary file." => "Error durante le scriptura in le file temporari",
 "Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "No file was uploaded" => "Nulle file esseva incargate.",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index b5372d7411..31f950ff80 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
-"element name is not set." => "il nome dell'elemento non è impostato.",
-"id is not set." => "ID non impostato.",
-"Could not parse contact: " => "Impossibile elaborare il contatto: ",
-"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
-"At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo.",
-"Trying to add duplicate property: " => "P",
-"Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
 "Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
+"id is not set." => "ID non impostato.",
 "Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
 "Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
 "No ID provided" => "Nessun ID fornito",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
 "No address books found." => "Nessuna rubrica trovata.",
 "No contacts found." => "Nessun contatto trovato.",
+"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
+"element name is not set." => "il nome dell'elemento non è impostato.",
+"Could not parse contact: " => "Impossibile elaborare il contatto: ",
+"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
+"At least one of the address fields has to be filled out." => "Deve essere inserito almeno un indirizzo.",
+"Trying to add duplicate property: " => "P",
+"Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
+"Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard non corrette. Ricarica la pagina.",
+"Error deleting contact property." => "Errore durante l'eliminazione della proprietà del contatto.",
 "Missing ID" => "ID mancante",
 "Error parsing VCard for ID: \"" => "Errore in fase di elaborazione del file VCard per l'ID: \"",
+"checksum is not set." => "il codice di controllo non è impostato.",
+"Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
+"Something went FUBAR. " => "Qualcosa è andato storto. ",
+"Error updating contact property." => "Errore durante l'aggiornamento della proprietà del contatto.",
 "No contact ID was submitted." => "Nessun ID di contatto inviato.",
 "Error reading contact photo." => "Errore di lettura della foto del contatto.",
 "Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
 "The loading photo is not valid." => "La foto caricata non è valida.",
-"Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard non corrette. Ricarica la pagina.",
-"Error deleting contact property." => "Errore durante l'eliminazione della proprietà del contatto.",
 "Contact ID is missing." => "Manca l'ID del contatto.",
 "No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
 "File doesn't exist:" => "Il file non esiste:",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Errore di ritaglio dell'immagine",
 "Error creating temporary image" => "Errore durante la creazione dell'immagine temporanea",
 "Error finding image: " => "Errore durante la ricerca dell'immagine: ",
-"checksum is not set." => "il codice di controllo non è impostato.",
-"Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
-"Something went FUBAR. " => "Qualcosa è andato storto. ",
-"Error updating contact property." => "Errore durante l'aggiornamento della proprietà del contatto.",
 "Error uploading contacts to storage." => "Errore di invio dei contatti in archivio.",
 "There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato inviato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file inviato supera la direttiva upload_max_filesize nel php.ini",
@@ -108,7 +108,6 @@
 "Next contact in list" => "Contatto successivo in elenco",
 "Previous contact in list" => "Contatto precedente in elenco",
 "Expand/collapse current addressbook" => "Espandi/Contrai la rubrica corrente",
-"Next/previous addressbook" => "Rubrica successiva/precedente",
 "Actions" => "Azioni",
 "Refresh contacts list" => "Aggiorna l'elenco dei contatti",
 "Add new contact" => "Aggiungi un nuovo contatto",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 9e4fb0c8bb..074a725b48 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,12 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
-"element name is not set." => "要素名が設定されていません。",
-"id is not set." => "idが設定されていません。",
-"Cannot add empty property." => "項目の新規追加に失敗しました。",
-"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
-"Trying to add duplicate property: " => "重複する属性を追加: ",
-"Error adding contact property: " => "コンタクト属性の追加エラー: ",
 "Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
+"id is not set." => "idが設定されていません。",
 "Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
 "Error updating addressbook." => "アドレスブックの更新に失敗しました。",
 "No ID provided" => "IDが提供されていません",
@@ -14,13 +8,22 @@
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
 "No address books found." => "アドレスブックが見つかりません。",
 "No contacts found." => "連絡先が見つかりません。",
+"There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
+"element name is not set." => "要素名が設定されていません。",
+"Cannot add empty property." => "項目の新規追加に失敗しました。",
+"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
+"Trying to add duplicate property: " => "重複する属性を追加: ",
+"Error adding contact property: " => "コンタクト属性の追加エラー: ",
+"Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
+"Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
+"checksum is not set." => "チェックサムが設定されていません。",
+"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
+"Error updating contact property." => "連絡先の更新に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
 "Error saving temporary file." => "一時ファイルの保存エラー。",
 "The loading photo is not valid." => "写真の読み込みは無効です。",
-"Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
-"Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Contact ID is missing." => "コンタクトIDが見つかりません。",
 "No photo path was submitted." => "写真のパスが登録されていません。",
 "File doesn't exist:" => "ファイルが存在しません:",
@@ -32,9 +35,6 @@
 "Error cropping image" => "画像の切り抜きエラー",
 "Error creating temporary image" => "一時画像の生成エラー",
 "Error finding image: " => "画像検索エラー: ",
-"checksum is not set." => "チェックサムが設定されていません。",
-"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
-"Error updating contact property." => "連絡先の更新に失敗しました。",
 "Error uploading contacts to storage." => "ストレージへの連絡先のアップロードエラー。",
 "There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています",
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index b7d62a4510..f060b419e0 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "연락처를 추가하는 중 오류가 발생하였습니다.",
-"element name is not set." => "element 이름이 설정되지 않았습니다.",
-"id is not set." => "아이디가 설정되어 있지 않습니다. ",
-"Cannot add empty property." => "빈 속성을 추가할 수 없습니다.",
-"At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
-"Trying to add duplicate property: " => "중복 속성 추가 시도: ",
 "Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
+"id is not set." => "아이디가 설정되어 있지 않습니다. ",
 "Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
 "Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
 "No ID provided" => "제공되는 아이디 없음",
@@ -13,14 +8,22 @@
 "No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다. ",
 "No address books found." => "주소록을 찾을 수 없습니다.",
 "No contacts found." => "연락처를 찾을 수 없습니다.",
+"There was an error adding the contact." => "연락처를 추가하는 중 오류가 발생하였습니다.",
+"element name is not set." => "element 이름이 설정되지 않았습니다.",
+"Cannot add empty property." => "빈 속성을 추가할 수 없습니다.",
+"At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
+"Trying to add duplicate property: " => "중복 속성 추가 시도: ",
+"Information about vCard is incorrect. Please reload the page." => "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
+"Error deleting contact property." => "연락처 속성을 삭제할 수 없습니다.",
 "Missing ID" => "아이디 분실",
 "Error parsing VCard for ID: \"" => "아이디에 대한 VCard 분석 오류",
+"checksum is not set." => "체크섬이 설정되지 않았습니다.",
+"Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
+"Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
 "No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
 "Error reading contact photo." => "사진 읽기 오류",
 "Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
 "The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
-"Information about vCard is incorrect. Please reload the page." => "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
-"Error deleting contact property." => "연락처 속성을 삭제할 수 없습니다.",
 "Contact ID is missing." => "접속 아이디가 없습니다. ",
 "No photo path was submitted." => "사진 경로가 제출되지 않았습니다. ",
 "File doesn't exist:" => "파일이 존재하지 않습니다. ",
@@ -32,9 +35,6 @@
 "Error cropping image" => "이미지를 자르던 중 오류가 발생했습니다.",
 "Error creating temporary image" => "임시 이미지를 생성 중 오류가 발생했습니다.",
 "Error finding image: " => "이미지를 찾던 중 오류가 발생했습니다:",
-"checksum is not set." => "체크섬이 설정되지 않았습니다.",
-"Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
-"Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
 "Error uploading contacts to storage." => "스토리지 에러 업로드 연락처.",
 "There is no error, the file uploaded with success" => "오류없이 파일업로드 성공.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 000290b0b4..90ff22f122 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -1,26 +1,26 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Fehler beim bäisetzen vun engem Kontakt.",
-"id is not set." => "ID ass net gesat.",
-"Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
-"Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
 "Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
+"id is not set." => "ID ass net gesat.",
 "Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
 "No ID provided" => "Keng ID uginn",
 "Error setting checksum." => "Fehler beim setzen vun der Checksum.",
 "No categories selected for deletion." => "Keng Kategorien fir ze läschen ausgewielt.",
 "No address books found." => "Keen Adressbuch fonnt.",
 "No contacts found." => "Keng Kontakter fonnt.",
+"There was an error adding the contact." => "Fehler beim bäisetzen vun engem Kontakt.",
+"Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
+"Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
+"Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
+"Error deleting contact property." => "Fehler beim läschen vun der Kontakt Proprietéit.",
 "Missing ID" => "ID fehlt",
+"Error updating contact property." => "Fehler beim updaten vun der Kontakt Proprietéit.",
 "No contact ID was submitted." => "Kontakt ID ass net mat geschéckt ginn.",
 "Error reading contact photo." => "Fehler beim liesen vun der Kontakt Photo.",
 "Error saving temporary file." => "Fehler beim späicheren vum temporäre Fichier.",
 "The loading photo is not valid." => "Déi geluede Photo ass net gülteg.",
-"Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
-"Error deleting contact property." => "Fehler beim läschen vun der Kontakt Proprietéit.",
 "Contact ID is missing." => "Kontakt ID fehlt.",
 "File doesn't exist:" => "Fichier existéiert net:",
 "Error loading image." => "Fehler beim lueden vum Bild.",
-"Error updating contact property." => "Fehler beim updaten vun der Kontakt Proprietéit.",
 "No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
 "Contacts" => "Kontakter",
 "Error" => "Fehler",
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index e61a3c631e..eece7fa67c 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
 "Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
 "No contacts found." => "Kontaktų nerasta.",
+"There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
+"Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
 "Error reading contact photo." => "Klaida skaitant kontakto nuotrauką.",
 "The loading photo is not valid." => "Netinkama įkeliama nuotrauka.",
-"Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
 "File doesn't exist:" => "Failas neegzistuoja:",
 "Error loading image." => "Klaida įkeliant nuotrauką.",
 "There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 15236e73d4..bdc0e6681f 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Имаше грешка при додавање на контактот.",
-"element name is not set." => "име за елементот не е поставена.",
-"id is not set." => "ид не е поставено.",
-"Cannot add empty property." => "Неможе да се додаде празна вредност.",
-"At least one of the address fields has to be filled out." => "Барем една од полињата за адреса треба да биде пополнето.",
-"Trying to add duplicate property: " => "Се обидовте да внесете дупликат вредност:",
 "Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
+"id is not set." => "ид не е поставено.",
 "Cannot update addressbook with an empty name." => "Неможе да се ажурира адресар со празно име.",
 "Error updating addressbook." => "Грешка при ажурирање на адресарот.",
 "No ID provided" => "Нема доставено ИД",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Нема избрано категории за бришење.",
 "No address books found." => "Не се најдени адресари.",
 "No contacts found." => "Не се најдени контакти.",
+"There was an error adding the contact." => "Имаше грешка при додавање на контактот.",
+"element name is not set." => "име за елементот не е поставена.",
+"Cannot add empty property." => "Неможе да се додаде празна вредност.",
+"At least one of the address fields has to be filled out." => "Барем една од полињата за адреса треба да биде пополнето.",
+"Trying to add duplicate property: " => "Се обидовте да внесете дупликат вредност:",
+"Information about vCard is incorrect. Please reload the page." => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава.",
+"Error deleting contact property." => "Греш при бришење на вредноста за контакт.",
 "Missing ID" => "Недостасува ИД",
 "Error parsing VCard for ID: \"" => "Грешка при парсирање VCard за ИД: \"",
+"checksum is not set." => "сумата за проверка не е поставена.",
+"Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
+"Something went FUBAR. " => "Нешто се расипа.",
+"Error updating contact property." => "Грешка при ажурирање на вредноста за контакт.",
 "No contact ID was submitted." => "Не беше доставено ИД за контакт.",
 "Error reading contact photo." => "Грешка во читање на контакт фотографија.",
 "Error saving temporary file." => "Грешка во снимање на привремена датотека.",
 "The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
-"Information about vCard is incorrect. Please reload the page." => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава.",
-"Error deleting contact property." => "Греш при бришење на вредноста за контакт.",
 "Contact ID is missing." => "ИД за контакт недостасува.",
 "No photo path was submitted." => "Не беше поднесена патека за фотографија.",
 "File doesn't exist:" => "Не постои датотеката:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Грешка при сечење на фотографијата",
 "Error creating temporary image" => "Грешка при креирањето на привремената фотографија",
 "Error finding image: " => "Грешка при наоѓањето на фотографијата:",
-"checksum is not set." => "сумата за проверка не е поставена.",
-"Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
-"Something went FUBAR. " => "Нешто се расипа.",
-"Error updating contact property." => "Грешка при ажурирање на вредноста за контакт.",
 "Error uploading contacts to storage." => "Грешка во снимање на контактите на диск.",
 "There is no error, the file uploaded with success" => "Датотеката беше успешно подигната.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini",
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 2489239808..2fd386f5a8 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Terdapat masalah menambah maklumat.",
-"element name is not set." => "nama elemen tidak ditetapkan.",
-"id is not set." => "ID tidak ditetapkan.",
-"Cannot add empty property." => "Tidak boleh menambah ruang kosong.",
-"At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
-"Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
 "Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
+"id is not set." => "ID tidak ditetapkan.",
 "Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
 "Error updating addressbook." => "Masalah mengemaskini buku alamat.",
 "No ID provided" => "tiada ID diberi",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
 "No address books found." => "Tiada buku alamat dijumpai.",
 "No contacts found." => "Tiada kenalan dijumpai.",
+"There was an error adding the contact." => "Terdapat masalah menambah maklumat.",
+"element name is not set." => "nama elemen tidak ditetapkan.",
+"Cannot add empty property." => "Tidak boleh menambah ruang kosong.",
+"At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
+"Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
+"Information about vCard is incorrect. Please reload the page." => "Maklumat vCard tidak tepat. Sila reload semula halaman ini.",
+"Error deleting contact property." => "Masalah memadam maklumat.",
 "Missing ID" => "ID Hilang",
 "Error parsing VCard for ID: \"" => "Ralat VCard untuk ID: \"",
+"checksum is not set." => "checksum tidak ditetapkan.",
+"Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
+"Something went FUBAR. " => "Sesuatu tidak betul.",
+"Error updating contact property." => "Masalah mengemaskini maklumat.",
 "No contact ID was submitted." => "Tiada ID kenalan yang diberi.",
 "Error reading contact photo." => "Ralat pada foto kenalan.",
 "Error saving temporary file." => "Ralat menyimpan fail sementara",
 "The loading photo is not valid." => "Foto muatan tidak sah.",
-"Information about vCard is incorrect. Please reload the page." => "Maklumat vCard tidak tepat. Sila reload semula halaman ini.",
-"Error deleting contact property." => "Masalah memadam maklumat.",
 "Contact ID is missing." => "ID Kenalan telah hilang.",
 "No photo path was submitted." => "Tiada direktori gambar yang diberi.",
 "File doesn't exist:" => "Fail tidak wujud:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Ralat memotong imej",
 "Error creating temporary image" => "Ralat mencipta imej sementara",
 "Error finding image: " => "Ralat mencari imej: ",
-"checksum is not set." => "checksum tidak ditetapkan.",
-"Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
-"Something went FUBAR. " => "Sesuatu tidak betul.",
-"Error updating contact property." => "Masalah mengemaskini maklumat.",
 "Error uploading contacts to storage." => "Ralat memuatnaik senarai kenalan.",
 "There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini",
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index bbbe80e9b1..4066d670e4 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -1,21 +1,23 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Et problem oppsto med å legge til kontakten.",
-"id is not set." => "id er ikke satt.",
-"Cannot add empty property." => "Kan ikke legge til tomt felt.",
-"At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
 "Error (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
+"id is not set." => "id er ikke satt.",
 "Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
 "Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
 "No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
 "No contacts found." => "Ingen kontakter funnet.",
+"There was an error adding the contact." => "Et problem oppsto med å legge til kontakten.",
+"Cannot add empty property." => "Kan ikke legge til tomt felt.",
+"At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
+"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
+"Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
 "Missing ID" => "Manglende ID",
+"Something went FUBAR. " => "Noe gikk fryktelig galt.",
+"Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
 "Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
 "The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
-"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
-"Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
 "Contact ID is missing." => "Kontakt-ID mangler.",
 "No photo path was submitted." => "Ingen filsti ble lagt inn.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
@@ -25,8 +27,6 @@
 "Error cropping image" => "Klarte ikke å beskjære bildet",
 "Error creating temporary image" => "Klarte ikke å lage et midlertidig bilde",
 "Error finding image: " => "Kunne ikke finne bilde:",
-"Something went FUBAR. " => "Noe gikk fryktelig galt.",
-"Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Error uploading contacts to storage." => "Klarte ikke å laste opp kontakter til lagringsplassen",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index 7ea147e879..4a621eec25 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Er was een fout bij het toevoegen van het contact.",
-"element name is not set." => "onderdeel naam is niet opgegeven.",
-"id is not set." => "id is niet ingesteld.",
-"Cannot add empty property." => "Kan geen lege eigenschap toevoegen.",
-"At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
-"Trying to add duplicate property: " => "Eigenschap bestaat al: ",
 "Error (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
+"id is not set." => "id is niet ingesteld.",
 "Cannot update addressbook with an empty name." => "Kan adresboek zonder naam niet wijzigen",
 "Error updating addressbook." => "Fout bij het updaten van het adresboek.",
 "No ID provided" => "Geen ID opgegeven",
@@ -13,22 +8,27 @@
 "No categories selected for deletion." => "Geen categorieën geselecteerd om te verwijderen.",
 "No address books found." => "Geen adresboek gevonden",
 "No contacts found." => "Geen contracten gevonden",
-"Missing ID" => "Ontbrekend ID",
-"Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
-"No contact ID was submitted." => "Geen contact ID opgestuurd.",
-"Error reading contact photo." => "Lezen van contact foto mislukt.",
-"Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
-"The loading photo is not valid." => "De geladen foto is niet goed.",
+"There was an error adding the contact." => "Er was een fout bij het toevoegen van het contact.",
+"element name is not set." => "onderdeel naam is niet opgegeven.",
+"Cannot add empty property." => "Kan geen lege eigenschap toevoegen.",
+"At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
+"Trying to add duplicate property: " => "Eigenschap bestaat al: ",
 "Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
 "Error deleting contact property." => "Fout bij het verwijderen van de contacteigenschap.",
-"Contact ID is missing." => "Contact ID ontbreekt.",
-"No photo path was submitted." => "Geen fotopad opgestuurd.",
-"File doesn't exist:" => "Bestand bestaat niet:",
-"Error loading image." => "Fout bij laden plaatje.",
+"Missing ID" => "Ontbrekend ID",
+"Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
 "checksum is not set." => "controlegetal is niet opgegeven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
 "Something went FUBAR. " => "Er ging iets totaal verkeerd. ",
 "Error updating contact property." => "Fout bij het updaten van de contacteigenschap.",
+"No contact ID was submitted." => "Geen contact ID opgestuurd.",
+"Error reading contact photo." => "Lezen van contact foto mislukt.",
+"Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
+"The loading photo is not valid." => "De geladen foto is niet goed.",
+"Contact ID is missing." => "Contact ID ontbreekt.",
+"No photo path was submitted." => "Geen fotopad opgestuurd.",
+"File doesn't exist:" => "Bestand bestaat niet:",
+"Error loading image." => "Fout bij laden plaatje.",
 "Error uploading contacts to storage." => "Fout bij opslaan van contacten.",
 "There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Het bestand overschrijdt de upload_max_filesize instelling in php.ini",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index b7c75cd652..0a4778283e 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
+"Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
 "There was an error adding the contact." => "Det kom ei feilmelding då kontakta vart lagt til.",
 "Cannot add empty property." => "Kan ikkje leggja til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst eit av adressefelta må fyllast ut.",
-"Error (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
-"Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
 "Error deleting contact property." => "Eit problem oppstod ved å slette kontaktfeltet.",
 "Error updating contact property." => "Eit problem oppstod ved å endre kontaktfeltet.",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index d4095023ef..5b26324007 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
-"element name is not set." => "nazwa elementu nie jest ustawiona.",
-"id is not set." => "id nie ustawione.",
-"Could not parse contact: " => "Nie można parsować kontaktu:",
-"Cannot add empty property." => "Nie można dodać pustego elementu.",
-"At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
-"Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
-"Error adding contact property: " => "Błąd przy dodawaniu właściwości kontaktu:",
 "Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
+"id is not set." => "id nie ustawione.",
 "Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
 "Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
 "No ID provided" => "Brak opatrzonego ID ",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
 "No address books found." => "Nie znaleziono książek adresowych",
 "No contacts found." => "Nie znaleziono kontaktów.",
+"There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
+"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"Could not parse contact: " => "Nie można parsować kontaktu:",
+"Cannot add empty property." => "Nie można dodać pustego elementu.",
+"At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
+"Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
+"Error adding contact property: " => "Błąd przy dodawaniu właściwości kontaktu:",
+"Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
+"Error deleting contact property." => "Błąd usuwania elementu.",
 "Missing ID" => "Brak ID",
 "Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
+"checksum is not set." => "checksum-a nie ustawiona",
+"Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
+"Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
+"Error updating contact property." => "Błąd uaktualniania elementu.",
 "No contact ID was submitted." => "ID kontaktu nie został utworzony.",
 "Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
 "Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
 "The loading photo is not valid." => "Wczytywane zdjęcie nie jest poprawne.",
-"Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
-"Error deleting contact property." => "Błąd usuwania elementu.",
 "Contact ID is missing." => "Brak kontaktu id.",
 "No photo path was submitted." => "Ścieżka do zdjęcia nie została podana.",
 "File doesn't exist:" => "Plik nie istnieje:",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Błąd przycinania obrazu",
 "Error creating temporary image" => "Błąd utworzenia obrazu tymczasowego",
 "Error finding image: " => "Błąd znajdowanie obrazu: ",
-"checksum is not set." => "checksum-a nie ustawiona",
-"Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
-"Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
-"Error updating contact property." => "Błąd uaktualniania elementu.",
 "Error uploading contacts to storage." => "Wystąpił błąd podczas wysyłania kontaktów do magazynu.",
 "There is no error, the file uploaded with success" => "Nie było błędów, plik wyczytano poprawnie.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Załadowany plik przekracza wielkość upload_max_filesize w php.ini ",
@@ -101,7 +101,6 @@
 "Navigation" => "Nawigacja",
 "Next contact in list" => "Następny kontakt na liście",
 "Previous contact in list" => "Poprzedni kontakt na liście",
-"Next/previous addressbook" => "Następna/poprzednia książka adresowa",
 "Actions" => "Akcje",
 "Refresh contacts list" => "Odśwież listę kontaktów",
 "Add new contact" => "Dodaj nowy kontakt",
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index b4077a9ca1..74b8650c6c 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Ocorreu um erro ao adicionar o contato.",
-"element name is not set." => "nome do elemento não definido.",
-"id is not set." => "ID não definido.",
-"Cannot add empty property." => "Não é possível adicionar propriedade vazia.",
-"At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
-"Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
 "Error (de)activating addressbook." => "Erro ao (des)ativar agenda.",
+"id is not set." => "ID não definido.",
 "Cannot update addressbook with an empty name." => "Não é possível atualizar sua agenda com um nome em branco.",
 "Error updating addressbook." => "Erro ao atualizar agenda.",
 "No ID provided" => "Nenhum ID fornecido",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Nenhum categoria selecionada para remoção.",
 "No address books found." => "Nenhuma agenda de endereços encontrada.",
 "No contacts found." => "Nenhum contato encontrado.",
+"There was an error adding the contact." => "Ocorreu um erro ao adicionar o contato.",
+"element name is not set." => "nome do elemento não definido.",
+"Cannot add empty property." => "Não é possível adicionar propriedade vazia.",
+"At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
+"Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
+"Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
+"Error deleting contact property." => "Erro ao excluir propriedade de contato.",
 "Missing ID" => "Faltando ID",
 "Error parsing VCard for ID: \"" => "Erro de identificação VCard para ID:",
+"checksum is not set." => "checksum não definido.",
+"Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
+"Something went FUBAR. " => "Something went FUBAR. ",
+"Error updating contact property." => "Erro ao atualizar propriedades do contato.",
 "No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
 "Error reading contact photo." => "Erro de leitura na foto do contato.",
 "Error saving temporary file." => "Erro ao salvar arquivo temporário.",
 "The loading photo is not valid." => "Foto carregada não é válida.",
-"Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
-"Error deleting contact property." => "Erro ao excluir propriedade de contato.",
 "Contact ID is missing." => "ID do contato está faltando.",
 "No photo path was submitted." => "Nenhum caminho para foto foi submetido.",
 "File doesn't exist:" => "Arquivo não existe:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Erro ao recortar imagem",
 "Error creating temporary image" => "Erro ao criar imagem temporária",
 "Error finding image: " => "Erro ao localizar imagem:",
-"checksum is not set." => "checksum não definido.",
-"Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
-"Something went FUBAR. " => "Something went FUBAR. ",
-"Error updating contact property." => "Erro ao atualizar propriedades do contato.",
 "Error uploading contacts to storage." => "Erro enviando contatos para armazenamento.",
 "There is no error, the file uploaded with success" => "Arquivo enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O arquivo enviado excede a diretiva upload_max_filesize em php.ini",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 3ad2d4ad7d..269e63583f 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Erro ao adicionar contato",
-"element name is not set." => "o nome do elemento não está definido.",
-"id is not set." => "id não está definido",
-"Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
-"At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
-"Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
 "Error (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
+"id is not set." => "id não está definido",
 "Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
 "Error updating addressbook." => "Erro a atualizar o livro de endereços",
 "No ID provided" => "Nenhum ID inserido",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
 "No address books found." => "Nenhum livro de endereços encontrado.",
 "No contacts found." => "Nenhum contacto encontrado.",
+"There was an error adding the contact." => "Erro ao adicionar contato",
+"element name is not set." => "o nome do elemento não está definido.",
+"Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
+"At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
+"Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
+"Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
+"Error deleting contact property." => "Erro ao apagar propriedade do contato",
 "Missing ID" => "Falta ID",
 "Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
+"checksum is not set." => "Checksum não está definido.",
+"Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
+"Something went FUBAR. " => "Algo provocou um FUBAR. ",
+"Error updating contact property." => "Erro ao atualizar propriedade do contato",
 "No contact ID was submitted." => "Nenhum ID de contacto definido.",
 "Error reading contact photo." => "Erro a ler a foto do contacto.",
 "Error saving temporary file." => "Erro a guardar ficheiro temporário.",
 "The loading photo is not valid." => "A foto carregada não é valida.",
-"Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
-"Error deleting contact property." => "Erro ao apagar propriedade do contato",
 "Contact ID is missing." => "Falta o ID do contacto.",
 "No photo path was submitted." => "Nenhum caminho da foto definido.",
 "File doesn't exist:" => "O ficheiro não existe:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Erro a recorar a imagem",
 "Error creating temporary image" => "Erro a criar a imagem temporária",
 "Error finding image: " => "Erro enquanto pesquisava pela imagem: ",
-"checksum is not set." => "Checksum não está definido.",
-"Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
-"Something went FUBAR. " => "Algo provocou um FUBAR. ",
-"Error updating contact property." => "Erro ao atualizar propriedade do contato",
 "Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
 "There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini",
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 6b5f599977..15a34db7d7 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -1,30 +1,30 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "O eroare a împiedicat adăugarea contactului.",
-"element name is not set." => "numele elementului nu este stabilit.",
-"id is not set." => "ID-ul nu este stabilit",
-"Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
-"At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
 "Error (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
+"id is not set." => "ID-ul nu este stabilit",
 "Error updating addressbook." => "Eroare la actualizarea agendei.",
 "No ID provided" => "Nici un ID nu a fost furnizat",
 "Error setting checksum." => "Eroare la stabilirea sumei de control",
 "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
 "No address books found." => "Nici o carte de adrese găsită",
 "No contacts found." => "Nici un contact găsit",
+"There was an error adding the contact." => "O eroare a împiedicat adăugarea contactului.",
+"element name is not set." => "numele elementului nu este stabilit.",
+"Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
+"At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
+"Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
+"Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
 "Missing ID" => "ID lipsă",
 "Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
+"checksum is not set." => "suma de control nu este stabilită.",
+"Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
 "Error reading contact photo." => "Eroare la citerea fotografiei de contact",
 "Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
 "The loading photo is not valid." => "Fotografia care se încarcă nu este validă.",
-"Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
-"Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
 "Contact ID is missing." => "ID-ul de contact lipsește.",
 "No photo path was submitted." => "Nici o adresă către fotografie nu a fost transmisă",
 "File doesn't exist:" => "Fișierul nu există:",
 "Error loading image." => "Eroare la încărcarea imaginii.",
-"checksum is not set." => "suma de control nu este stabilită.",
-"Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "Contacts" => "Contacte",
 "This is not your addressbook." => "Nu se găsește în agendă.",
 "Contact could not be found." => "Contactul nu a putut fi găsit.",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 63b405c9f8..308325cb53 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
-"element name is not set." => "имя элемента не установлено.",
-"id is not set." => "id не установлен.",
-"Cannot add empty property." => "Невозможно добавить пустой параметр.",
-"At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
-"Trying to add duplicate property: " => "При попытке добавить дубликат:",
 "Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
+"id is not set." => "id не установлен.",
 "Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
 "Error updating addressbook." => "Ошибка обновления адресной книги.",
 "No ID provided" => "ID не предоставлен",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Категории для удаления не установлены.",
 "No address books found." => "Адресные книги не найдены.",
 "No contacts found." => "Контакты не найдены.",
+"There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
+"element name is not set." => "имя элемента не установлено.",
+"Cannot add empty property." => "Невозможно добавить пустой параметр.",
+"At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
+"Trying to add duplicate property: " => "При попытке добавить дубликат:",
+"Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
+"Error deleting contact property." => "Ошибка удаления информации из контакта.",
 "Missing ID" => "Отсутствует ID",
 "Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
+"checksum is not set." => "контрольная сумма не установлена.",
+"Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
+"Something went FUBAR. " => "Что-то пошло FUBAR.",
+"Error updating contact property." => "Ошибка обновления информации контакта.",
 "No contact ID was submitted." => "Нет контакта ID",
 "Error reading contact photo." => "Ошибка чтения фотографии контакта.",
 "Error saving temporary file." => "Ошибка сохранения временного файла.",
 "The loading photo is not valid." => "Загружаемая фотография испорчена.",
-"Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
-"Error deleting contact property." => "Ошибка удаления информации из контакта.",
 "Contact ID is missing." => "ID контакта отсутствует.",
 "No photo path was submitted." => "Нет фото по адресу.",
 "File doesn't exist:" => "Файл не существует:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Ошибка обрезки изображений",
 "Error creating temporary image" => "Ошибка создания временных изображений",
 "Error finding image: " => "Ошибка поиска изображений:",
-"checksum is not set." => "контрольная сумма не установлена.",
-"Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
-"Something went FUBAR. " => "Что-то пошло FUBAR.",
-"Error updating contact property." => "Ошибка обновления информации контакта.",
 "Error uploading contacts to storage." => "Ошибка загрузки контактов в хранилище.",
 "There is no error, the file uploaded with success" => "Файл загружен успешно.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini",
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index bc4281c1f3..2afbd62091 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
-"element name is not set." => "meno elementu nie je nastavené.",
-"id is not set." => "ID nie je nastavené.",
-"Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
-"At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
-"Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
 "Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
+"id is not set." => "ID nie je nastavené.",
 "Cannot update addressbook with an empty name." => "Nedá sa upraviť adresár s prázdnym menom.",
 "Error updating addressbook." => "Chyba aktualizácie adresára.",
 "No ID provided" => "ID nezadané",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Žiadne kategórie neboli vybraté na odstránenie.",
 "No address books found." => "Žiadny adresár nenájdený.",
 "No contacts found." => "Žiadne kontakty nenájdené.",
+"There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
+"element name is not set." => "meno elementu nie je nastavené.",
+"Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
+"At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
+"Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
+"Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
+"Error deleting contact property." => "Chyba odstránenia údaju kontaktu.",
 "Missing ID" => "Chýba ID",
 "Error parsing VCard for ID: \"" => "Chyba pri vyňatí ID z VCard:",
+"checksum is not set." => "kontrolný súčet nie je nastavený.",
+"Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
+"Something went FUBAR. " => "Niečo sa pokazilo.",
+"Error updating contact property." => "Chyba aktualizovania údaju kontaktu.",
 "No contact ID was submitted." => "Nebolo nastavené ID kontaktu.",
 "Error reading contact photo." => "Chyba pri čítaní fotky kontaktu.",
 "Error saving temporary file." => "Chyba pri ukladaní dočasného súboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
-"Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
-"Error deleting contact property." => "Chyba odstránenia údaju kontaktu.",
 "Contact ID is missing." => "Chýba ID kontaktu.",
 "No photo path was submitted." => "Žiadna fotka nebola poslaná.",
 "File doesn't exist:" => "Súbor neexistuje:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Chyba počas orezania obrázku.",
 "Error creating temporary image" => "Chyba počas vytvárania dočasného obrázku.",
 "Error finding image: " => "Chyba vyhľadania obrázku: ",
-"checksum is not set." => "kontrolný súčet nie je nastavený.",
-"Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
-"Something went FUBAR. " => "Niečo sa pokazilo.",
-"Error updating contact property." => "Chyba aktualizovania údaju kontaktu.",
 "Error uploading contacts to storage." => "Chyba pri ukladaní kontaktov na úložisko.",
 "There is no error, the file uploaded with success" => "Nevyskytla sa žiadna chyba, súbor úspešne uložené.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini",
@@ -95,7 +95,6 @@
 "Navigation" => "Navigácia",
 "Next contact in list" => "Ďalší kontakt v zozname",
 "Previous contact in list" => "Predchádzajúci kontakt v zozname",
-"Next/previous addressbook" => "Ďalší/predošlí adresár",
 "Actions" => "Akcie",
 "Refresh contacts list" => "Obnov zoznam kontaktov",
 "Add new contact" => "Pridaj nový kontakt",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 4642b48bb6..1dc0cef74b 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
-"element name is not set." => "ime elementa ni nastavljeno.",
-"id is not set." => "id ni nastavljen.",
-"Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
-"At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
-"Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
 "Error (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
+"id is not set." => "id ni nastavljen.",
 "Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
 "Error updating addressbook." => "Napaka pri posodabljanju imenika.",
 "No ID provided" => "ID ni bil podan",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "Nobena kategorija ni bila izbrana za izbris.",
 "No address books found." => "Ni bilo najdenih imenikov.",
 "No contacts found." => "Ni bilo najdenih stikov.",
+"There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
+"element name is not set." => "ime elementa ni nastavljeno.",
+"Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
+"At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
+"Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
+"Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
+"Error deleting contact property." => "Napaka pri brisanju lastnosti stika.",
 "Missing ID" => "Manjkajoč ID",
 "Error parsing VCard for ID: \"" => "Napaka pri razčlenjevanju VCard za ID: \"",
+"checksum is not set." => "nadzorna vsota ni nastavljena.",
+"Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
+"Something went FUBAR. " => "Nekaj je šlo v franže. ",
+"Error updating contact property." => "Napaka pri posodabljanju lastnosti stika.",
 "No contact ID was submitted." => "ID stika ni bil poslan.",
 "Error reading contact photo." => "Napaka pri branju slike stika.",
 "Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
 "The loading photo is not valid." => "Slika, ki se nalaga ni veljavna.",
-"Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
-"Error deleting contact property." => "Napaka pri brisanju lastnosti stika.",
 "Contact ID is missing." => "Manjka ID stika.",
 "No photo path was submitted." => "Pot slike ni bila poslana.",
 "File doesn't exist:" => "Datoteka ne obstaja:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "Napaka pri obrezovanju slike",
 "Error creating temporary image" => "Napaka pri ustvarjanju začasne slike",
 "Error finding image: " => "Napaka pri iskanju datoteke: ",
-"checksum is not set." => "nadzorna vsota ni nastavljena.",
-"Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
-"Something went FUBAR. " => "Nekaj je šlo v franže. ",
-"Error updating contact property." => "Napaka pri posodabljanju lastnosti stika.",
 "Error uploading contacts to storage." => "Napaka pri nalaganju stikov v hrambo.",
 "There is no error, the file uploaded with success" => "Datoteka je bila uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index 22099d6729..dc81513ae2 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Det uppstod ett fel när kontakt skulle läggas till",
-"id is not set." => "ID är inte satt.",
-"Could not parse contact: " => "Kunde inte läsa kontakt:",
-"Cannot add empty property." => "Kan inte lägga till en tom egenskap",
-"At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
-"Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
 "Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
+"id is not set." => "ID är inte satt.",
 "Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
 "Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
 "No ID provided" => "Inget ID angett",
@@ -13,13 +8,21 @@
 "No categories selected for deletion." => "Inga kategorier valda för borttaging",
 "No address books found." => "Ingen adressbok funnen.",
 "No contacts found." => "Inga kontakter funna.",
+"There was an error adding the contact." => "Det uppstod ett fel när kontakt skulle läggas till",
+"Could not parse contact: " => "Kunde inte läsa kontakt:",
+"Cannot add empty property." => "Kan inte lägga till en tom egenskap",
+"At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
+"Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
+"Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
+"Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort",
 "Missing ID" => "ID saknas",
+"checksum is not set." => "kontrollsumma är inte satt.",
+"Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
+"Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
 "No contact ID was submitted." => "Inget kontakt-ID angavs.",
 "Error reading contact photo." => "Fel uppstod när ",
 "Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
 "The loading photo is not valid." => "Det laddade fotot är inte giltigt.",
-"Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
-"Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort",
 "Contact ID is missing." => "Kontakt-ID saknas.",
 "No photo path was submitted." => "Ingen sökväg till foto angavs.",
 "File doesn't exist:" => "Filen existerar inte.",
@@ -29,9 +32,6 @@
 "Error cropping image" => "Fel vid beskärning av bilden",
 "Error creating temporary image" => "Fel vid skapande av tillfällig bild",
 "Error finding image: " => "Kunde inte hitta bild",
-"checksum is not set." => "kontrollsumma är inte satt.",
-"Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
-"Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
 "Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index cff8239e75..553271d88f 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
-"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
-"id is not set." => "ยังไม่ได้กำหนดรหัส",
-"Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
-"At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
-"Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
 "Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
+"id is not set." => "ยังไม่ได้กำหนดรหัส",
 "Cannot update addressbook with an empty name." => "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
 "Error updating addressbook." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
 "No ID provided" => "ยังไม่ได้ใส่รหัส",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
 "No address books found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
+"There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
+"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
+"At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
+"Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
+"Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
+"Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Missing ID" => "รหัสสูญหาย",
 "Error parsing VCard for ID: \"" => "พบข้อผิดพลาดในการแยกรหัส VCard:\"",
+"checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
+"Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
+"Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
+"Error updating contact property." => "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ",
 "No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
 "Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
 "Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
 "The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
-"Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
-"Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Contact ID is missing." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
 "No photo path was submitted." => "ไม่พบตำแหน่งพาธของรูปภาพ",
 "File doesn't exist:" => "ไม่มีไฟล์ดังกล่าว",
@@ -32,10 +36,6 @@
 "Error cropping image" => "เกิดข้อผิดพลาดในการครอบตัดภาพ",
 "Error creating temporary image" => "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว",
 "Error finding image: " => "เกิดข้อผิดพลาดในการค้นหารูปภาพ: ",
-"checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
-"Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
-"Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
-"Error updating contact property." => "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ",
 "Error uploading contacts to storage." => "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล",
 "There is no error, the file uploaded with success" => "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 4b67c7dc76..dc4ec06c93 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -1,13 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Kişi eklenirken hata oluştu.",
-"element name is not set." => "eleman ismi atanmamış.",
-"id is not set." => "id atanmamış.",
-"Could not parse contact: " => "Kişi bilgisi ayrıştırılamadı.",
-"Cannot add empty property." => "Boş özellik eklenemiyor.",
-"At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
-"Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
-"Error adding contact property: " => "Kişi özelliği eklenirken hata oluştu.",
 "Error (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
+"id is not set." => "id atanmamış.",
 "Cannot update addressbook with an empty name." => "Adres defterini boş bir isimle güncelleyemezsiniz.",
 "Error updating addressbook." => "Adres defteri güncellenirken hata oluştu.",
 "No ID provided" => "ID verilmedi",
@@ -15,14 +8,25 @@
 "No categories selected for deletion." => "Silmek için bir kategori seçilmedi.",
 "No address books found." => "Adres defteri bulunamadı.",
 "No contacts found." => "Bağlantı bulunamadı.",
+"There was an error adding the contact." => "Kişi eklenirken hata oluştu.",
+"element name is not set." => "eleman ismi atanmamış.",
+"Could not parse contact: " => "Kişi bilgisi ayrıştırılamadı.",
+"Cannot add empty property." => "Boş özellik eklenemiyor.",
+"At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
+"Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
+"Error adding contact property: " => "Kişi özelliği eklenirken hata oluştu.",
+"Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
+"Error deleting contact property." => "Kişi özelliği silinirken hata oluştu.",
 "Missing ID" => "Eksik ID",
 "Error parsing VCard for ID: \"" => "ID için VCard ayrıştırılamadı:\"",
+"checksum is not set." => "checksum atanmamış.",
+"Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
+"Something went FUBAR. " => "Bir şey FUBAR gitti.",
+"Error updating contact property." => "Kişi özelliği güncellenirken hata oluştu.",
 "No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
 "Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
 "Error saving temporary file." => "Geçici dosya kaydetme hatası.",
 "The loading photo is not valid." => "Yüklenecek fotograf geçerli değil.",
-"Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
-"Error deleting contact property." => "Kişi özelliği silinirken hata oluştu.",
 "Contact ID is missing." => "Bağlantı ID'si eksik.",
 "No photo path was submitted." => "Fotoğraf girilmedi.",
 "File doesn't exist:" => "Dosya mevcut değil:",
@@ -34,10 +38,6 @@
 "Error cropping image" => "Görüntü kırpılamadı.",
 "Error creating temporary image" => "Geçici resim oluştururken hata oluştu",
 "Error finding image: " => "Resim ararken hata oluştu:",
-"checksum is not set." => "checksum atanmamış.",
-"Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
-"Something went FUBAR. " => "Bir şey FUBAR gitti.",
-"Error updating contact property." => "Kişi özelliği güncellenirken hata oluştu.",
 "Error uploading contacts to storage." => "Bağlantıları depoya yükleme hatası",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor",
@@ -104,7 +104,6 @@
 "Next contact in list" => "Listedeki sonraki kişi",
 "Previous contact in list" => "Listedeki önceki kişi",
 "Expand/collapse current addressbook" => "Şuanki adres defterini genişlet/daralt",
-"Next/previous addressbook" => "Sonraki/Önceki adres defteri",
 "Actions" => "Eylemler",
 "Refresh contacts list" => "Kişi listesini tazele",
 "Add new contact" => "Yeni kişi ekle",
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
index 187edb69b5..0c650586a2 100644
--- a/apps/contacts/l10n/vi.php
+++ b/apps/contacts/l10n/vi.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"element name is not set." => "tên phần tử không được thiết lập.",
 "id is not set." => "id không được thiết lập.",
 "No ID provided" => "Không có ID được cung cấp",
 "No address books found." => "Không tìm thấy sổ địa chỉ.",
 "No contacts found." => "Không tìm thấy danh sách",
+"element name is not set." => "tên phần tử không được thiết lập.",
 "Missing ID" => "Missing ID",
 "Error reading contact photo." => "Lỗi đọc liên lạc hình ảnh.",
 "The loading photo is not valid." => "Các hình ảnh tải không hợp lệ.",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index 8962551427..bb4188314d 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "添加联系人时出错。",
-"element name is not set." => "元素名称未设置",
-"id is not set." => "没有设置 id。",
-"Cannot add empty property." => "无法添加空属性。",
-"At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
-"Trying to add duplicate property: " => "试图添加重复属性： ",
 "Error (de)activating addressbook." => "(取消)激活地址簿错误。",
+"id is not set." => "没有设置 id。",
 "Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
 "Error updating addressbook." => "更新地址簿错误",
 "No ID provided" => "未提供 ID",
@@ -13,14 +8,23 @@
 "No categories selected for deletion." => "未选中要删除的分类。",
 "No address books found." => "找不到地址簿。",
 "No contacts found." => "找不到联系人。",
+"There was an error adding the contact." => "添加联系人时出错。",
+"element name is not set." => "元素名称未设置",
+"Cannot add empty property." => "无法添加空属性。",
+"At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
+"Trying to add duplicate property: " => "试图添加重复属性： ",
+"Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
+"Error deleting contact property." => "删除联系人属性错误。",
 "Missing ID" => "缺少 ID",
 "Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
+"checksum is not set." => "未设置校验值。",
+"Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
+"Something went FUBAR. " => "有一些信息无法被处理。",
+"Error updating contact property." => "更新联系人属性错误。",
 "No contact ID was submitted." => "未提交联系人 ID。",
 "Error reading contact photo." => "读取联系人照片错误。",
 "Error saving temporary file." => "保存临时文件错误。",
 "The loading photo is not valid." => "装入的照片不正确。",
-"Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
-"Error deleting contact property." => "删除联系人属性错误。",
 "Contact ID is missing." => "缺少联系人 ID。",
 "No photo path was submitted." => "未提供照片路径。",
 "File doesn't exist:" => "文件不存在:",
@@ -32,10 +36,6 @@
 "Error cropping image" => "裁切图像时出错",
 "Error creating temporary image" => "创建临时图像时出错",
 "Error finding image: " => "查找图像时出错: ",
-"checksum is not set." => "未设置校验值。",
-"Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
-"Something went FUBAR. " => "有一些信息无法被处理。",
-"Error updating contact property." => "更新联系人属性错误。",
 "Error uploading contacts to storage." => "上传联系人到存储空间时出错",
 "There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制",
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index c92ad3abbd..db0a1dbf21 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -1,14 +1,14 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "添加通訊錄發生錯誤",
-"Cannot add empty property." => "不可添加空白內容",
-"At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
 "Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
 "Error updating addressbook." => "電話簿更新中發生錯誤",
 "No ID provided" => "未提供 ID",
 "No contacts found." => "沒有找到聯絡人",
-"Missing ID" => "遺失ID",
+"There was an error adding the contact." => "添加通訊錄發生錯誤",
+"Cannot add empty property." => "不可添加空白內容",
+"At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
 "Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
+"Missing ID" => "遺失ID",
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 3d4e9fc78c..dd7c13d20c 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index ec2aef5ca0..30fcdd04df 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "خطء خلال اضافة معرفه جديده."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "لا يمكنك اضافه صفه خاليه."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "يجب ملء على الاقل خانه واحده من العنوان."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "خطء خلال توقيف كتاب العناوين."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "خطء خلال اضافة معرفه جديده."
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "لا يمكنك اضافه صفه خاليه."
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "يجب ملء على الاقل خانه واحده من العنوان."
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr ""
-
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "خطء خلال محي الصفه."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "خطء خلال تعديل الصفه."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -133,89 +149,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "خطء خلال تعديل الصفه."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index bc235e42cb..5fdd6a7ff9 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index fb6adf9dce..aa2426a6ad 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 38f9f0b97a..4209c7a353 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "S'ha produït un error en afegir el contacte."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "no s'ha establert el nom de l'element."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "no s'ha establert la id."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "No s'ha pogut processar el contacte:"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "No es pot afegir una propietat buida."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Almenys heu d'omplir un dels camps d'adreça."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Esteu intentant afegir una propietat duplicada:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Error en afegir la propietat del contacte:"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Error en (des)activar la llibreta d'adreces."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "no s'ha establert la id."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
@@ -85,39 +57,83 @@ msgstr "No s'han trobat llibretes d'adreces."
 msgid "No contacts found."
 msgstr "No s'han trobat contactes."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Falta la ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "S'ha produït un error en afegir el contacte."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Error en analitzar la ID de la VCard: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "no s'ha establert el nom de l'element."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "No s'ha tramès cap ID de contacte."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "No s'ha pogut processar el contacte:"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Error en llegir la foto del contacte."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "No es pot afegir una propietat buida."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Error en desar el fitxer temporal."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Almenys heu d'omplir un dels camps d'adreça."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "La foto carregada no és vàlida."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Esteu intentant afegir una propietat duplicada:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Error en afegir la propietat del contacte:"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Error en eliminar la propietat del contacte."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Falta la ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Error en analitzar la ID de la VCard: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "no s'ha establert la suma de verificació."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Alguna cosa ha anat FUBAR."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Error en actualitzar la propietat del contacte."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "No s'ha tramès cap ID de contacte."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Error en llegir la foto del contacte."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Error en desar el fitxer temporal."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "La foto carregada no és vàlida."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "falta la ID del contacte."
@@ -134,89 +150,73 @@ msgstr "El fitxer no existeix:"
 msgid "Error loading image."
 msgstr "Error en carregar la imatge."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Error en obtenir l'objecte contacte."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Error en obtenir la propietat PHOTO."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Error en trobar la imatge:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "no s'ha establert la suma de verificació."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Alguna cosa ha anat FUBAR."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Error en actualitzar la propietat del contacte."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer carregat supera la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "No s'ha pogut desar la imatge temporal: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "No s'ha pogut carregar la imatge temporal: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Següent/anterior llibreta d'adreces"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Carrega de nou la llista de contactes"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Afegeix un contacte nou"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Esborra el contacte"
 
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index e20e15a0ed..2c503b0f71 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Během přidávání kontaktu nastala chyba."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "jméno elementu není nastaveno."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id neni nastaveno."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Nelze přidat prazdný údaj."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Musí být uveden nejméně jeden z adresních údajů"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Pokoušíte se přidat duplicitní atribut: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Chyba při (de)aktivaci adresáře."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id neni nastaveno."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nelze aktualizovat adresář s prázdným jménem."
@@ -86,39 +58,83 @@ msgstr "Žádný adresář nenalezen."
 msgid "No contacts found."
 msgstr "Žádné kontakty nenalezeny."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Chybí ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Během přidávání kontaktu nastala chyba."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Chyba při parsování VCard pro ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "jméno elementu není nastaveno."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nebylo nastaveno ID kontaktu."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Chyba při načítání fotky kontaktu."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Nelze přidat prazdný údaj."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Chyba při ukládání dočasného souboru."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Musí být uveden nejméně jeden z adresních údajů"
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Načítaná fotka je vadná."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Pokoušíte se přidat duplicitní atribut: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Chyba při odstraňování údaje kontaktu."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Chybí ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Chyba při parsování VCard pro ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "kontrolní součet není nastaven."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Něco se pokazilo. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Chyba při aktualizaci údaje kontaktu."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nebylo nastaveno ID kontaktu."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Chyba při načítání fotky kontaktu."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Chyba při ukládání dočasného souboru."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Načítaná fotka je vadná."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Chybí ID kontaktu."
@@ -135,89 +151,73 @@ msgstr "Soubor neexistuje:"
 msgid "Error loading image."
 msgstr "Chyba při načítání obrázku."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Chyba při převzetí objektu kontakt."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Chyba při získávání fotky."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Chyba při ukládání kontaktu."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Chyba při změně velikosti obrázku."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Chyba při osekávání obrázku."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Chyba při vytváření dočasného obrázku."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Chyba při hledání obrázku:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "kontrolní součet není nastaven."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Něco se pokazilo. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Chyba při aktualizaci údaje kontaktu."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba při nahrávání kontaktů do úložiště."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný soubor se nahrál pouze z části"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl nahrán"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chybí dočasný adresář"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Nemohu uložit dočasný obrázek: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Nemohu načíst dočasný obrázek: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslán. Neznámá chyba"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Nelze získat platnou adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index c693337a4b..cdb9cc135c 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,44 +22,16 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "Elementnavnet er ikke medsendt."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "Intet ID medsendt."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Kan ikke tilføje en egenskab uden indhold."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Der skal udfyldes mindst et adressefelt."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Kan ikke tilføje overlappende element."
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Fejl ved (de)aktivering af adressebogen"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "Intet ID medsendt."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan ikke opdatére adressebogen med et tomt navn."
@@ -88,39 +60,83 @@ msgstr "Der blev ikke fundet nogen adressebøger."
 msgid "No contacts found."
 msgstr "Der blev ikke fundet nogen kontaktpersoner."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Manglende ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Kunne ikke indlæse VCard med ID'et: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Elementnavnet er ikke medsendt."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Ingen ID for kontakperson medsendt."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Kunne ikke indlæse foto for kontakperson."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Kan ikke tilføje en egenskab uden indhold."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Kunne ikke gemme midlertidig fil."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Der skal udfyldes mindst et adressefelt."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Billedet under indlæsning er ikke gyldigt."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Kan ikke tilføje overlappende element."
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Manglende ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Kunne ikke indlæse VCard med ID'et: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "Checksum er ikke medsendt."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Noget gik grueligt galt. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Fejl ved opdatering af egenskab for kontaktperson."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Ingen ID for kontakperson medsendt."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Kunne ikke indlæse foto for kontakperson."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Kunne ikke gemme midlertidig fil."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Billedet under indlæsning er ikke gyldigt."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktperson ID mangler."
@@ -137,89 +153,73 @@ msgstr "Filen eksisterer ikke:"
 msgid "Error loading image."
 msgstr "Kunne ikke indlæse billede."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Fejl ved indlæsning af kontaktpersonobjektet."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Fejl ved indlæsning af PHOTO feltet."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Kunne ikke gemme kontaktpersonen."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Kunne ikke ændre billedets størrelse"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Kunne ikke beskære billedet"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Kunne ikke oprette midlertidigt billede"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Kunne ikke finde billedet: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "Checksum er ikke medsendt."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Noget gik grueligt galt. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Fejl ved opdatering af egenskab for kontaktperson."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ingen fil uploadet"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manglende midlertidig mappe."
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Kunne ikke gemme midlertidigt billede: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Kunne ikke indlæse midlertidigt billede"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
@@ -240,8 +240,8 @@ msgid "Couldn't get a valid address."
 msgstr "Kunne ikke finde en gyldig adresse."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -478,26 +478,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 5ae4018302..e41c0bc864 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -32,44 +32,16 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Erstellen des Kontakts fehlgeschlagen"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "Kein Name für das Element angegeben."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID ist nicht angegeben."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Konnte folgenden Kontakt nicht verarbeiten:"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Feld darf nicht leer sein."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Mindestens eines der Adressfelder muss ausgefüllt werden."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID ist nicht angegeben."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
@@ -98,39 +70,83 @@ msgstr "Keine Adressbücher gefunden."
 msgid "No contacts found."
 msgstr "Keine Kontakte gefunden."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Fehlende ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Erstellen des Kontakts fehlgeschlagen"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Fehler beim Einlesen der VCard für die ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Kein Name für das Element angegeben."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Es wurde keine Kontakt-ID übermittelt."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Konnte folgenden Kontakt nicht verarbeiten:"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Fehler beim Auslesen des Kontaktfotos."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Feld darf nicht leer sein."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Fehler beim Speichern der temporären Datei."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Mindestens eines der Adressfelder muss ausgefüllt werden."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Das Kontaktfoto ist fehlerhaft."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Kontakteigenschaft löschen fehlgeschlagen"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Fehlende ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Fehler beim Einlesen der VCard für die ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "Keine Prüfsumme angegeben."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Irgendwas ist hier so richtig schief gelaufen. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Es wurde keine Kontakt-ID übermittelt."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Fehler beim Auslesen des Kontaktfotos."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Fehler beim Speichern der temporären Datei."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Das Kontaktfoto ist fehlerhaft."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Keine Kontakt-ID angegeben."
@@ -147,89 +163,73 @@ msgstr "Datei existiert nicht: "
 msgid "Error loading image."
 msgstr "Fehler beim Laden des Bildes."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Fehler beim Abruf des Kontakt-Objektes."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Fehler beim Speichern des Kontaktes"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Fehler beim Suchen des Bildes: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "Keine Prüfsumme angegeben."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Irgendwas ist hier so richtig schief gelaufen. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Alles bestens, Datei erfolgreich übertragen."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datei konnte nur teilweise übertragen werden"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Konnte das temporäre Bild nicht speichern:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Konnte das temporäre Bild nicht laden:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
@@ -250,8 +250,8 @@ msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -488,26 +488,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Ausklappen/Einklappen des Adressbuches"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Nächstes/Vorhergehendes Adressbuch"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Kontaktliste neu laden"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Aktuellen Kontakt löschen"
 
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 9c8eec3f3d..5ed7fe9c39 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -23,44 +23,16 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Σφάλμα κατά την προσθήκη επαφής."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "δεν ορίστηκε όνομα στοιχείου"
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "δεν ορίστηκε id"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Δε αναγνώστηκε η επαφή"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Αδύνατη προσθήκη κενής ιδιότητας."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "δεν ορίστηκε id"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
@@ -89,39 +61,83 @@ msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
 msgid "No contacts found."
 msgstr "Δεν βρέθηκαν επαφές"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Λείπει ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Σφάλμα κατά την προσθήκη επαφής."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "δεν ορίστηκε όνομα στοιχείου"
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Δε υπεβλήθει ID επαφής"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Δε αναγνώστηκε η επαφή"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Αδύνατη προσθήκη κενής ιδιότητας."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Σφάλμα διαγραφής ιδιότητας επαφής."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Λείπει ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "δε ορίστηκε checksum "
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Κάτι χάθηκε στο άγνωστο. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Δε υπεβλήθει ID επαφής"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Λείπει ID επαφής"
@@ -138,89 +154,73 @@ msgstr "Το αρχείο δεν υπάρχει:"
 msgid "Error loading image."
 msgstr "Σφάλμα φόρτωσης εικόνας"
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Σφάλμα κατά τη λήψη αντικειμένου επαφής"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "δε ορίστηκε checksum "
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Κάτι χάθηκε στο άγνωστο. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία "
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο ανέβηκε μερικώς"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Δεν ανέβηκε κάποιο αρχείο"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
@@ -241,8 +241,8 @@ msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -479,26 +479,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Ανανέωσε τη λίστα επαφών"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Προσθήκη νέου βιβλίου επαφών"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Διαγραφή τρέχουσας επαφής"
 
diff --git a/l10n/eo/bookmarks.po b/l10n/eo/bookmarks.po
index 4df36ca031..926278cd28 100644
--- a/l10n/eo/bookmarks.po
+++ b/l10n/eo/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 22:44+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,41 +20,41 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Legosignoj"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "nenomita"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Legi poste"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adreso"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titolo"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Etikedoj"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Konservi legosignon"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Vi havas neniun legosignon"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 25911c57d2..94fd3651af 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +19,16 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Eraro okazis dum aldono de kontakto."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "eronomo ne agordiĝis."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "identigilo ne agordiĝis."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Ne eblas aldoni malplenan propraĵon."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Almenaŭ unu el la adreskampoj necesas pleniĝi."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Provante aldoni duobligitan propraĵon:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Eraro dum (mal)aktivigo de adresaro."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "identigilo ne agordiĝis."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
@@ -84,39 +57,83 @@ msgstr "Neniu adresaro troviĝis."
 msgid "No contacts found."
 msgstr "Neniu kontakto troviĝis."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Mankas identigilo"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Eraro okazis dum aldono de kontakto."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Eraro dum analizo de VCard por identigilo:"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "eronomo ne agordiĝis."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Neniu kontaktidentigilo sendiĝis."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Eraro dum lego de kontakta foto."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Ne eblas aldoni malplenan propraĵon."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Eraro dum konservado de provizora dosiero."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Almenaŭ unu el la adreskampoj necesas pleniĝi."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "La alŝutata foto ne validas."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Provante aldoni duobligitan propraĵon:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Eraro aldonante kontakta propraĵo:"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Eraro dum forigo de kontaktopropraĵo."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Mankas identigilo"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Eraro dum analizo de VCard por identigilo:"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "kontrolsumo ne agordiĝis."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Io FUBAR-is."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Neniu kontaktidentigilo sendiĝis."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Eraro dum lego de kontakta foto."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Eraro dum konservado de provizora dosiero."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "La alŝutata foto ne validas."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktidentigilo mankas."
@@ -133,89 +150,73 @@ msgstr "Dosiero ne ekzistas:"
 msgid "Error loading image."
 msgstr "Eraro dum ŝargado de bildo."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Eraro dum ekhaviĝis kontakta objekto."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Eraro dum ekhaviĝis la propraĵon PHOTO."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Eraro dum konserviĝis kontakto."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Eraro dum aligrandiĝis bildo"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Eraro dum stuciĝis bildo."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Eraro dum kreiĝis provizora bildo."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Eraro dum serĉo de bildo: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "kontrolsumo ne agordiĝis."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Io FUBAR-is."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Eraro dum alŝutiĝis kontaktoj al konservejo."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Ne eblis konservi provizoran bildon: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Ne eblis ŝargi provizoran bildon: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
@@ -236,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr "Ne eblis ekhavi validan adreson."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -301,7 +302,7 @@ msgstr ""
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresaro ne troviĝis:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -375,7 +376,7 @@ msgstr "Naskiĝotago"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Negoco"
 
 #: lib/app.php:185
 msgid "Call"
@@ -383,7 +384,7 @@ msgstr ""
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Klientoj"
 
 #: lib/app.php:187
 msgid "Deliverer"
@@ -395,7 +396,7 @@ msgstr ""
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Ideoj"
 
 #: lib/app.php:190
 msgid "Journey"
@@ -407,23 +408,23 @@ msgstr ""
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Kunveno"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Alia"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Persona"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projektoj"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Demandoj"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -443,7 +444,7 @@ msgstr "Enporti"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Agordo"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -455,47 +456,51 @@ msgstr "Fermi"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Fulmoklavoj"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navigado"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Sekva kontakto en la listo"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Malsekva kontakto en la listo"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Agoj"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
-msgid "Add new contact"
-msgstr ""
-
 #: templates/index.php:59
-msgid "Add new addressbook"
-msgstr ""
+msgid "Add new contact"
+msgstr "Aldoni novan kontakton"
 
 #: templates/index.php:61
+msgid "Add new addressbook"
+msgstr "Aldoni novan adresaron"
+
+#: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Forigi la nunan kontakton"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -541,15 +546,15 @@ msgstr "Enigu kromnomon"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "TTT-ejo"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.iuejo.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Iri al TTT-ejon"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -646,11 +651,11 @@ msgstr "Abonkesto"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Stratadreso"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Strato kaj numero"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -679,7 +684,7 @@ msgstr "Poŝtokodo"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Poŝtkodo"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -800,15 +805,15 @@ msgstr "Agordi adresarojn"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Elektu adresarojn"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Enigu nomon"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Enigu priskribon"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -828,11 +833,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Montri CardDav-ligilon"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Montri nur legeblan VCF-ligilon"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -848,11 +853,11 @@ msgstr "Nova adresaro"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Nomo"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Priskribo"
 
 #: templates/settings.php:45
 msgid "Save"
@@ -864,4 +869,4 @@ msgstr "Nuligi"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Pli..."
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index c4d6f1228b..83d78e5ea5 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 22:37+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +20,23 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Helpo"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Persona"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Agordo"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Uzantoj"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Aplikaĵoj"
 
 #: app.php:313
 msgid "Admin"
@@ -43,70 +44,70 @@ msgstr ""
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-elŝuto estas malkapabligita."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Dosieroj devas elŝutiĝi unuope."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Reen al la dosieroj"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "La aplikaĵo ne estas kapabligita"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Aŭtentiga eraro"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekundojn antaŭe"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "antaŭ 1 minuto"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "antaŭ %d minutoj"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "hodiaŭ"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "hieraŭ"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "antaŭ %d tagoj"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "lasta monato"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "monatojn antaŭe"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "lasta jaro"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "jarojn antaŭe"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 3435e84663..ef49020b23 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-03 22:28+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr "Nevalida peto"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Aŭtentiga eraro"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -60,7 +61,7 @@ msgstr "Esperanto"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Sekureca averto"
 
 #: templates/admin.php:28
 msgid "Log"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 34b0fd09ff..7ea5f0efd0 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -22,44 +22,16 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Se ha producido un error al añadir el contacto."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "no se ha puesto ningún nombre de elemento."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "no se ha puesto ninguna ID."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "No se puede añadir una propiedad vacía."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Al menos uno de los campos de direcciones se tiene que rellenar."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Intentando añadir una propiedad duplicada: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Error al (des)activar libreta de direcciones."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "no se ha puesto ninguna ID."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "No se puede actualizar una libreta de direcciones sin nombre."
@@ -88,39 +60,83 @@ msgstr "No se encontraron libretas de direcciones."
 msgid "No contacts found."
 msgstr "No se encontraron contactos."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Falta la ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Se ha producido un error al añadir el contacto."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Error al analizar el VCard para la ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "no se ha puesto ningún nombre de elemento."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "No se ha mandado ninguna ID de contacto."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Error leyendo fotografía del contacto."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "No se puede añadir una propiedad vacía."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Error al guardar archivo temporal."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Al menos uno de los campos de direcciones se tiene que rellenar."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "La foto que se estaba cargando no es válida."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Intentando añadir una propiedad duplicada: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Error al borrar una propiedad del contacto."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Falta la ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Error al analizar el VCard para la ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "no se ha puesto ninguna suma de comprobación."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Plof. Algo ha fallado."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Error al actualizar una propiedad del contacto."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "No se ha mandado ninguna ID de contacto."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Error leyendo fotografía del contacto."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Error al guardar archivo temporal."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "La foto que se estaba cargando no es válida."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta la ID del contacto."
@@ -137,89 +153,73 @@ msgstr "Archivo inexistente:"
 msgid "Error loading image."
 msgstr "Error cargando imagen."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Fallo al coger el contacto."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Fallo al coger las propiedades de la foto ."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Fallo al salvar un contacto"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Fallo al cambiar de tamaño una foto"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Fallo al cortar el tamaño de la foto"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Fallo al crear la foto temporal"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Fallo al encontrar la imagen"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "no se ha puesto ninguna suma de comprobación."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Plof. Algo ha fallado."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Error al actualizar una propiedad del contacto."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo se ha subido parcialmente"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Fallo no pudo salvar a una imagen temporal"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Fallo no pudo cargara de una imagen temporal"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Fallo no se subió el fichero"
 
@@ -240,8 +240,8 @@ msgid "Couldn't get a valid address."
 msgstr "Fallo : no hay dirección valida"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -478,26 +478,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 3709c81ceb..912ab345d2 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Konktakti lisamisel tekkis viga."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "elemendi nime pole määratud."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID on määramata."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Tühja omadust ei saa lisada."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Vähemalt üks aadressiväljadest peab olema täidetud."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Proovitakse lisada topeltomadust: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID on määramata."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
@@ -84,39 +56,83 @@ msgstr "Ei leitud ühtegi aadressiraamatut."
 msgid "No contacts found."
 msgstr "Ühtegi kontakti ei leitud."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Puudub ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Konktakti lisamisel tekkis viga."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Viga VCard-ist ID parsimisel: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "elemendi nime pole määratud."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Kontakti ID-d pole sisestatud."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Viga kontakti foto lugemisel."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Tühja omadust ei saa lisada."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Viga ajutise faili salvestamisel."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Vähemalt üks aadressiväljadest peab olema täidetud."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Laetav pilt pole korrektne pildifail."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Proovitakse lisada topeltomadust: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Viga konktaki korralikul kustutamisel."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Puudub ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Viga VCard-ist ID parsimisel: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "kontrollsummat pole määratud."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Midagi läks tõsiselt metsa."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Viga konktaki korralikul uuendamisel."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Kontakti ID-d pole sisestatud."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Viga kontakti foto lugemisel."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Viga ajutise faili salvestamisel."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Laetav pilt pole korrektne pildifail."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakti ID puudub."
@@ -133,89 +149,73 @@ msgstr "Faili pole olemas:"
 msgid "Error loading image."
 msgstr "Viga pildi laadimisel."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Viga kontakti objekti hankimisel."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Viga PHOTO omaduse hankimisel."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Viga kontakti salvestamisel."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Viga pildi suuruse muutmisel"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Viga pildi lõikamisel"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Viga ajutise pildi loomisel"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Viga pildi leidmisel: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "kontrollsummat pole määratud."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Midagi läks tõsiselt metsa."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Viga konktaki korralikul uuendamisel."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Ajutise pildi salvestamine ebaõnnestus: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Ajutise pildi laadimine ebaõnnestus: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index b4bd501d1d..64cdef7d1a 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Errore bat egon da kontaktua gehitzerakoan"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "elementuaren izena ez da ezarri."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "IDa ez da ezarri."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Ezin izan da kontaktua analizatu:"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Ezin da propieta hutsa gehitu."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Behintzat helbide eremuetako bat bete behar da."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "IDa ez da ezarri."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
@@ -86,39 +58,83 @@ msgstr "Ez da helbide libururik aurkitu."
 msgid "No contacts found."
 msgstr "Ez da kontakturik aurkitu."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID falta da"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Errore bat egon da kontaktua gehitzerakoan"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Errorea VCard analizatzean hurrengo IDrako: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "elementuaren izena ez da ezarri."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Ez da kontaktuaren IDrik eman."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Ezin izan da kontaktua analizatu:"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Errore bat izan da kontaktuaren argazkia igotzerakoan."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Ezin da propieta hutsa gehitu."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Errore bat izan da aldi bateko fitxategia gordetzerakoan."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Behintzat helbide eremuetako bat bete behar da."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Kargatzen ari den argazkia ez da egokia."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Errorea kontaktu propietatea ezabatzean."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID falta da"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Errorea VCard analizatzean hurrengo IDrako: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "Kontrol-batura ezarri gabe dago."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Errorea kontaktu propietatea eguneratzean."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Ez da kontaktuaren IDrik eman."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Errore bat izan da kontaktuaren argazkia igotzerakoan."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Errore bat izan da aldi bateko fitxategia gordetzerakoan."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Kargatzen ari den argazkia ez da egokia."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktuaren IDa falta da."
@@ -135,89 +151,73 @@ msgstr "Fitxategia ez da existitzen:"
 msgid "Error loading image."
 msgstr "Errore bat izan da irudia kargatzearkoan."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Errore bat izan da kontaktu objetua lortzean."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Errore bat izan da PHOTO propietatea lortzean."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Errore bat izan da kontaktua gordetzean."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Errore bat izan da irudiaren tamaina aldatzean"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Errore bat izan da irudia mozten"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Errore bat izan da aldi bateko irudia sortzen"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Ezin izan da irudia aurkitu:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "Kontrol-batura ezarri gabe dago."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Errorea kontaktu propietatea eguneratzean."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Aldi bateko karpeta falta da"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Ezin izan da aldi bateko irudia gorde:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Ezin izan da aldi bateko irudia kargatu:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Ezin izan da eposta baliagarri bat hartu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Zabaldu/tolestu uneko helbide-liburua"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Hurrengo/aurreko helbide-liburua"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Gaurkotu kontaktuen zerrenda"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Gehitu kontaktu berria"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Gehitu helbide-liburu berria"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Ezabatu uneko kontaktuak"
 
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index ed04880ea4..840b293048 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 710318a676..7b2e343e51 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "نام اصلی تنظیم نشده است"
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "شناسه تعیین نشده"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "نمیتوان یک  خاصیت خالی ایجاد کرد"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "At least one of the address fields has to be filled out. "
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "امتحان کردن برای وارد کردن مشخصات تکراری"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "شناسه تعیین نشده"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
@@ -84,39 +56,83 @@ msgstr "هیچ کتابچه نشانی پیدا نشد"
 msgid "No contacts found."
 msgstr "هیچ شخصی پیدا نشد"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "نشانی گم شده"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "خطا در تجزیه کارت ویزا برای شناسه:"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "نام اصلی تنظیم نشده است"
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "هیچ اطلاعاتی راجع به شناسه ارسال نشده"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "خطا در خواندن اطلاعات تصویر"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "نمیتوان یک  خاصیت خالی ایجاد کرد"
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "خطا در ذخیره پرونده موقت"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "At least one of the address fields has to be filled out. "
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "بارگزاری تصویر امکان پذیر نیست"
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "امتحان کردن برای وارد کردن مشخصات تکراری"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید"
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "خطا در هنگام پاک کرد ویژگی"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "نشانی گم شده"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "خطا در تجزیه کارت ویزا برای شناسه:"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "checksum تنظیم شده نیست"
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "چند چیز به FUBAR رفتند"
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "هیچ اطلاعاتی راجع به شناسه ارسال نشده"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "خطا در خواندن اطلاعات تصویر"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "خطا در ذخیره پرونده موقت"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "بارگزاری تصویر امکان پذیر نیست"
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "اطلاعات شناسه گم شده"
@@ -133,89 +149,73 @@ msgstr "پرونده وجود ندارد"
 msgid "Error loading image."
 msgstr "خطا در بارگزاری تصویر"
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "خطا در گرفتن اطلاعات شخص"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "خطا در دربافت تصویر ویژگی شخصی"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "خطا در ذخیره سازی اطلاعات"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "خطا در تغییر دادن اندازه تصویر"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "خطا در برداشت تصویر"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "خطا در ساخت تصویر  temporary"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "خطا در پیدا کردن تصویر:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "checksum تنظیم شده نیست"
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "چند چیز به FUBAR رفتند"
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حجم آپلود از طریق Php.ini تعیین می شود"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "قابلیت ذخیره تصویر  موقت وجود ندارد:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "قابلیت بارگذاری تصویر  موقت وجود ندارد:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr "Couldn't get a valid address."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 4888af2ced..43e05ac6ee 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -21,44 +21,16 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Virhe yhteystietoa lisättäessä."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Tyhjää ominaisuutta ei voi lisätä."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Vähintään yksi osoitekenttä tulee täyttää."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -87,39 +59,83 @@ msgstr "Osoitekirjoja ei löytynyt."
 msgid "No contacts found."
 msgstr "Yhteystietoja ei löytynyt."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Virhe yhteystietoa lisättäessä."
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
-
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Tyhjää ominaisuutta ei voi lisätä."
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Vähintään yksi osoitekenttä tulee täyttää."
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Virhe tallennettaessa tilapäistiedostoa."
-
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Virhe tallennettaessa tilapäistiedostoa."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -136,89 +152,73 @@ msgstr "Tiedostoa ei ole olemassa:"
 msgid "Error loading image."
 msgstr "Virhe kuvaa ladatessa."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virhettä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lähetetty tiedosto lähetettiin vain osittain"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Tiedostoa ei lähetetty"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
@@ -239,8 +239,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -477,26 +477,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Seuraava/edellinen osoitekirja"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Päivitä yhteystietoluettelo"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Lisää uusi yhteystieto"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Lisää uusi osoitekirja"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Poista nykyinen yhteystieto"
 
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 28f6816f2d..c7086e02ea 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,16 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Une erreur s'est produite lors de l'ajout du contact."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "Le champ Nom n'est pas défini."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "L'ID n'est pas défini."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Impossible de lire le contact :"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Impossible d'ajouter un champ vide."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Au moins un des champs d'adresses doit être complété."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Ajout d'une propriété en double:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Erreur pendant l'ajout de la propriété du contact :"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "L'ID n'est pas défini."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
@@ -93,39 +65,83 @@ msgstr "Pas de carnet d'adresses trouvé."
 msgid "No contacts found."
 msgstr "Aucun contact trouvé."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID manquant"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Une erreur s'est produite lors de l'ajout du contact."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Le champ Nom n'est pas défini."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Aucun ID de contact envoyé"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Impossible de lire le contact :"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Erreur de lecture de la photo du contact."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Impossible d'ajouter un champ vide."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Erreur de sauvegarde du fichier temporaire."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Au moins un des champs d'adresses doit être complété."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "La photo chargée est invalide."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Ajout d'une propriété en double:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Erreur pendant l'ajout de la propriété du contact :"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Erreur lors de la suppression du champ."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID manquant"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "L'hachage n'est pas défini."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Quelque chose est FUBAR."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Erreur lors de la mise à jour du champ."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Aucun ID de contact envoyé"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Erreur de lecture de la photo du contact."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Erreur de sauvegarde du fichier temporaire."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "La photo chargée est invalide."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "L'ID du contact est manquant."
@@ -142,89 +158,73 @@ msgstr "Fichier inexistant:"
 msgid "Error loading image."
 msgstr "Erreur lors du chargement de l'image."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Erreur lors de l'obtention de l'objet contact"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Erreur lors de l'obtention des propriétés de la photo"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "L'hachage n'est pas défini."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Quelque chose est FUBAR."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Erreur lors de la mise à jour du champ."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Impossible de sauvegarder l'image temporaire :"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Impossible de charger l'image temporaire :"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
@@ -245,8 +245,8 @@ msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -483,26 +483,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Passer au carnet d'adresses suivant/précédent"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 7b04374f17..4ff4ac68aa 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Produciuse un erro engadindo o contacto."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "non se nomeou o elemento."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "non se estableceu o id."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Non se pode engadir unha propiedade baleira."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Polo menos un dos campos do enderezo ten que ser cuberto."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Tentando engadir propiedade duplicada: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Produciuse un erro (des)activando a axenda."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "non se estableceu o id."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
@@ -85,39 +57,83 @@ msgstr "Non se atoparon libretas de enderezos."
 msgid "No contacts found."
 msgstr "Non se atoparon contactos."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID perdido"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Produciuse un erro engadindo o contacto."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Erro procesando a VCard para o ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "non se nomeou o elemento."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Non se enviou ningún ID de contacto."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Erro lendo a fotografía do contacto."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Non se pode engadir unha propiedade baleira."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Erro gardando o ficheiro temporal."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Polo menos un dos campos do enderezo ten que ser cuberto."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "A fotografía cargada non é válida."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Tentando engadir propiedade duplicada: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Produciuse un erro borrando a propiedade do contacto."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID perdido"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Erro procesando a VCard para o ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "non se estableceu a suma de verificación."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Produciuse un erro actualizando a propiedade do contacto."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Non se enviou ningún ID de contacto."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Erro lendo a fotografía do contacto."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Erro gardando o ficheiro temporal."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "A fotografía cargada non é válida."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta o ID do contacto."
@@ -134,89 +150,73 @@ msgstr "O ficheiro non existe:"
 msgid "Error loading image."
 msgstr "Erro cargando imaxe."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Erro obtendo o obxeto contacto."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Erro obtendo a propiedade PHOTO."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Erro gardando o contacto."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Erro cambiando o tamaño da imaxe"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Erro recortando a imaxe"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Erro creando a imaxe temporal"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Erro buscando a imaxe: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "non se estableceu a suma de verificación."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Produciuse un erro actualizando a propiedade do contacto."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro subindo os contactos ao almacén."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Non houbo erros, o ficheiro subeuse con éxito"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro so foi parcialmente subido"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Non se subeu ningún ficheiro"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta o cartafol temporal"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Non se puido gardar a imaxe temporal: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Non se puido cargar a imaxe temporal: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr "Non se puido obter un enderezo de correo válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index bee29e5fa1..d3656f0e89 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "אירעה שגיאה בעת הוספת איש הקשר."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "שם האלמנט לא נקבע."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "מספר מזהה לא נקבע."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "לא ניתן להוסיף מאפיין ריק."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "יש למלא לפחות אחד משדות הכתובת."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "ניסיון להוספת מאפיין כפול: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "מספר מזהה לא נקבע."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
@@ -86,39 +58,83 @@ msgstr "לא נמצאו פנקסי כתובות."
 msgid "No contacts found."
 msgstr "לא נמצאו אנשי קשר."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "מזהה חסר"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "שגיאה בפענוח ה VCard עבור מספר המזהה: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "שם האלמנט לא נקבע."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "מספר מזהה של אישר הקשר לא נשלח."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "שגיאה בקריאת תמונת איש הקשר."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "לא ניתן להוסיף מאפיין ריק."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "שגיאה בשמירת קובץ זמני."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "יש למלא לפחות אחד משדות הכתובת."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "התמונה הנטענת אינה תקנית."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "ניסיון להוספת מאפיין כפול: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "מזהה חסר"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "שגיאה בפענוח ה VCard עבור מספר המזהה: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "סיכום ביקורת לא נקבע."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "משהו לא התנהל כצפוי."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "שגיאה בעדכון המאפיין של איש הקשר."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "מספר מזהה של אישר הקשר לא נשלח."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "שגיאה בקריאת תמונת איש הקשר."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "שגיאה בשמירת קובץ זמני."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "התמונה הנטענת אינה תקנית."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "מספר מזהה של אישר הקשר חסר."
@@ -135,89 +151,73 @@ msgstr "קובץ לא קיים:"
 msgid "Error loading image."
 msgstr "שגיאה בטעינת התמונה."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "שגיאה בקבלת אוביאקט איש הקשר"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "שגיאה בקבלת מידע של תמונה"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "שגיאה בשמירת איש הקשר"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "שגיאה בשינוי גודל התמונה"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "סיכום ביקורת לא נקבע."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "משהו לא התנהל כצפוי."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "שגיאה בעדכון המאפיין של איש הקשר."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "התרשה שגיאה בהעלאת אנשי הקשר לאכסון."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ הועלה באופן חלקי בלבד"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "שום קובץ לא הועלה"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "תקיה זמנית חסרה"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 2fda8dd395..d1a4d81e9b 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "naziv elementa nije postavljen."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id nije postavljen."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Prazno svojstvo se ne može dodati."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Morate ispuniti barem jedno od adresnih polja."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Pokušali ste dodati duplo svojstvo:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Pogreška pri (de)aktivaciji adresara."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id nije postavljen."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
@@ -85,39 +57,83 @@ msgstr "Nema adresara."
 msgid "No contacts found."
 msgstr "Nema kontakata."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Nedostupan ID identifikator"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Pogreška pri raščlanjivanju VCard za ID:"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "naziv elementa nije postavljen."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "ID kontakta nije podnešen."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Pogreška pri čitanju kontakt fotografije."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Prazno svojstvo se ne može dodati."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Pogreška pri spremanju privremene datoteke."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Morate ispuniti barem jedno od adresnih polja."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Fotografija nije valjana."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Pokušali ste dodati duplo svojstvo:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Pogreška pri brisanju svojstva kontakta."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Nedostupan ID identifikator"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Pogreška pri raščlanjivanju VCard za ID:"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "checksum nije postavljen."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Nešto je otišlo... krivo..."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Pogreška pri ažuriranju svojstva kontakta."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "ID kontakta nije podnešen."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Pogreška pri čitanju kontakt fotografije."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Pogreška pri spremanju privremene datoteke."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Fotografija nije valjana."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID kontakta nije dostupan."
@@ -134,89 +150,73 @@ msgstr "Datoteka ne postoji:"
 msgid "Error loading image."
 msgstr "Pogreška pri učitavanju slike."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "checksum nije postavljen."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Nešto je otišlo... krivo..."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Pogreška pri ažuriranju svojstva kontakta."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Pogreška pri slanju kontakata."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema pogreške, datoteka je poslana uspješno."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslana datoteka je parcijalno poslana"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Datoteka nije poslana"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremeni direktorij"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 5f76c8c65b..4a51eb1eb9 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,44 +21,16 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Hiba a kapcsolat hozzáadásakor"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "az elem neve nincs beállítva"
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID nincs beállítva"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Nem adható hozzá üres tulajdonság"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Legalább egy címmező kitöltendő"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Kísérlet dupla tulajdonság hozzáadására: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Címlista (de)aktiválása sikertelen"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID nincs beállítva"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Üres névvel nem frissíthető a címlista"
@@ -87,39 +59,83 @@ msgstr "Nem található címlista"
 msgid "No contacts found."
 msgstr "Nem található kontakt"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Hiányzó ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Hiba a kapcsolat hozzáadásakor"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "VCard elemzése sikertelen a következő ID-hoz: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "az elem neve nincs beállítva"
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nincs ID megadva a kontakthoz"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "A kontakt képének beolvasása sikertelen"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Nem adható hozzá üres tulajdonság"
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Ideiglenes fájl mentése sikertelen"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Legalább egy címmező kitöltendő"
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "A kép érvénytelen"
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Hiányzó ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "VCard elemzése sikertelen a következő ID-hoz: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "az ellenőrzőösszeg nincs beállítva"
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Valami balul sült el."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nincs ID megadva a kontakthoz"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "A kontakt képének beolvasása sikertelen"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Ideiglenes fájl mentése sikertelen"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "A kép érvénytelen"
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Hiányzik a kapcsolat ID"
@@ -136,89 +152,73 @@ msgstr "A fájl nem létezik:"
 msgid "Error loading image."
 msgstr "Kép betöltése sikertelen"
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "A kontakt-objektum feldolgozása sikertelen"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "A PHOTO-tulajdonság  feldolgozása sikertelen"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "A kontakt mentése sikertelen"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Képméretezés sikertelen"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Képvágás sikertelen"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "A kép nem található"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "az ellenőrzőösszeg nincs beállítva"
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Valami balul sült el."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Hiba a kapcsolatok feltöltésekor"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nincs hiba, a fájl sikeresen feltöltődött"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "A fájl csak részlegesen lett feltöltve"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nincs feltöltött fájl"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Hiányzik az ideiglenes könyvtár"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Ideiglenes kép betöltése sikertelen"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
@@ -239,8 +239,8 @@ msgid "Couldn't get a valid address."
 msgstr "Érvényes cím lekérése sikertelen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -477,26 +477,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index c205f836ba..7a32937a5d 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 28d6b86eb5..25dc62566f 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Non pote adder proprietate vacue."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -85,39 +57,83 @@ msgstr "Nulle adressario trovate"
 msgid "No contacts found."
 msgstr "Nulle contactos trovate."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Non pote adder proprietate vacue."
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Error durante le scriptura in le file temporari"
-
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Error durante le scriptura in le file temporari"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -134,89 +150,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr "Il habeva un error durante le cargamento del imagine."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 3fced7c92b..eddf5cf0af 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 189223c774..d9335528e5 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index faecd5c21e..000b71a0bf 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,44 +21,16 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Si è verificato un errore nell'aggiunta del contatto."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "il nome dell'elemento non è impostato."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID non impostato."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Impossibile elaborare il contatto: "
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Impossibile aggiungere una proprietà vuota."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Deve essere riempito almeno un indirizzo."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "P"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Errore durante l'aggiunta della proprietà del contatto: "
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Errore nel (dis)attivare la rubrica."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID non impostato."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Impossibile aggiornare una rubrica senza nome."
@@ -87,39 +59,83 @@ msgstr "Nessuna rubrica trovata."
 msgid "No contacts found."
 msgstr "Nessun contatto trovato."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID mancante"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Si è verificato un errore nell'aggiunta del contatto."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "il nome dell'elemento non è impostato."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nessun ID di contatto inviato."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Impossibile elaborare il contatto: "
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Errore di lettura della foto del contatto."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Impossibile aggiungere una proprietà vuota."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Errore di salvataggio del file temporaneo."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Deve essere inserito almeno un indirizzo."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "La foto caricata non è valida."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "P"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Errore durante l'aggiunta della proprietà del contatto: "
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard non corrette. Ricarica la pagina."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Errore durante l'eliminazione della proprietà del contatto."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID mancante"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "il codice di controllo non è impostato."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Qualcosa è andato storto. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Errore durante l'aggiornamento della proprietà del contatto."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nessun ID di contatto inviato."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Errore di lettura della foto del contatto."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Errore di salvataggio del file temporaneo."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "La foto caricata non è valida."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Manca l'ID del contatto."
@@ -136,89 +152,73 @@ msgstr "Il file non esiste:"
 msgid "Error loading image."
 msgstr "Errore di caricamento immagine."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Errore di recupero dell'oggetto contatto."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Errore di recupero della proprietà FOTO."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Errore durante la ricerca dell'immagine: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "il codice di controllo non è impostato."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Qualcosa è andato storto. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Errore durante l'aggiornamento della proprietà del contatto."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato inviato correttamente"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file inviato supera la direttiva upload_max_filesize nel php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato inviato solo parzialmente"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nessun file è stato inviato"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Impossibile salvare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Impossibile caricare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
@@ -239,8 +239,8 @@ msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -477,26 +477,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Espandi/Contrai la rubrica corrente"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Rubrica successiva/precedente"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Aggiorna l'elenco dei contatti"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Aggiungi una nuova rubrica"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Elimina il contatto corrente"
 
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index e8545fba54..d4930ceba7 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "連絡先の追加でエラーが発生しました。"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "要素名が設定されていません。"
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "idが設定されていません。"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "項目の新規追加に失敗しました。"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "住所の項目のうち１つは入力して下さい。"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "重複する属性を追加: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "コンタクト属性の追加エラー: "
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "アドレスブックの有効/無効化に失敗しました。"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "idが設定されていません。"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "空白の名前でアドレスブックを更新することはできません。"
@@ -84,39 +56,83 @@ msgstr "アドレスブックが見つかりません。"
 msgid "No contacts found."
 msgstr "連絡先が見つかりません。"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "連絡先の追加でエラーが発生しました。"
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "要素名が設定されていません。"
+
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "VCardからIDの抽出エラー: \""
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "項目の新規追加に失敗しました。"
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "連絡先IDは登録されませんでした。"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "住所の項目のうち１つは入力して下さい。"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "連絡先写真の読み込みエラー。"
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "重複する属性を追加: "
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "一時ファイルの保存エラー。"
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "コンタクト属性の追加エラー: "
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "写真の読み込みは無効です。"
-
-#: ajax/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardの情報に誤りがあります。ページをリロードして下さい。"
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "連絡先の削除に失敗しました。"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "VCardからIDの抽出エラー: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "チェックサムが設定されていません。"
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "連絡先の更新に失敗しました。"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "連絡先IDは登録されませんでした。"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "連絡先写真の読み込みエラー。"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "一時ファイルの保存エラー。"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "写真の読み込みは無効です。"
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "コンタクトIDが見つかりません。"
@@ -133,89 +149,73 @@ msgstr "ファイルが存在しません:"
 msgid "Error loading image."
 msgstr "画像の読み込みエラー。"
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "コンタクトオブジェクトの取得エラー。"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "写真属性の取得エラー。"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "コンタクトの保存エラー。"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "画像のリサイズエラー"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "画像の切り抜きエラー"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "一時画像の生成エラー"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "画像検索エラー: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "チェックサムが設定されていません。"
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "連絡先の更新に失敗しました。"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "ストレージへの連絡先のアップロードエラー。"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "一時保存フォルダが見つかりません"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "一時的な画像の保存ができませんでした: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "一時的な画像の読み込みができませんでした: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr "有効なアドレスを取得できませんでした。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "新しいコンタクトを追加"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "新しいアドレスブックを追加"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "現在のコンタクトを削除"
 
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 21e8ce9645..ceb4e271d2 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "element 이름이 설정되지 않았습니다."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "아이디가 설정되어 있지 않습니다. "
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "빈 속성을 추가할 수 없습니다."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "최소한 하나의 주소록 항목을 입력해야 합니다."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "중복 속성 추가 시도: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "주소록을 (비)활성화하는 데 실패했습니다."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "아이디가 설정되어 있지 않습니다. "
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
@@ -85,39 +57,83 @@ msgstr "주소록을 찾을 수 없습니다."
 msgid "No contacts found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "아이디 분실"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "아이디에 대한 VCard 분석 오류"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "element 이름이 설정되지 않았습니다."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "접속 아이디가 기입되지 않았습니다."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "사진 읽기 오류"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "빈 속성을 추가할 수 없습니다."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "임시 파일을 저장하는 동안 오류가 발생했습니다. "
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "최소한 하나의 주소록 항목을 입력해야 합니다."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "로딩 사진이 유효하지 않습니다. "
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "중복 속성 추가 시도: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "연락처 속성을 삭제할 수 없습니다."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "아이디 분실"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "아이디에 대한 VCard 분석 오류"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "체크섬이 설정되지 않았습니다."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "연락처 속성을 업데이트할 수 없습니다."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "접속 아이디가 기입되지 않았습니다."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "사진 읽기 오류"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "임시 파일을 저장하는 동안 오류가 발생했습니다. "
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "로딩 사진이 유효하지 않습니다. "
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "접속 아이디가 없습니다. "
@@ -134,89 +150,73 @@ msgstr "파일이 존재하지 않습니다. "
 msgid "Error loading image."
 msgstr "로딩 이미지 오류입니다."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "연락처 개체를 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "사진 속성을 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "연락처 저장 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "이미지 크기 조정 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "이미지를 자르던 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "임시 이미지를 생성 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "체크섬이 설정되지 않았습니다."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "연락처 속성을 업데이트할 수 없습니다."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "스토리지 에러 업로드 연락처."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "오류없이 파일업로드 성공."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "HTML형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "이 업로드된 파일은 부분적으로만 업로드 되었습니다."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "파일이 업로드 되어있지 않습니다"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "임시 폴더 분실"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "임시 이미지를 저장할 수 없습니다:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "임시 이미지를 불러올 수 없습니다. "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr "유효한 주소를 얻을 수 없습니다."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 1775ec0803..196d17c966 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Fehler beim bäisetzen vun engem Kontakt."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID ass net gesat."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Ka keng eidel Proprietéit bäisetzen."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID ass net gesat."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr "Keen Adressbuch fonnt."
 msgid "No contacts found."
 msgstr "Keng Kontakter fonnt."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID fehlt"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Fehler beim bäisetzen vun engem Kontakt."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Kontakt ID ass net mat geschéckt ginn."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Fehler beim liesen vun der Kontakt Photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Ka keng eidel Proprietéit bäisetzen."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Fehler beim späicheren vum temporäre Fichier."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Déi geluede Photo ass net gülteg."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Fehler beim läschen vun der Kontakt Proprietéit."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID fehlt"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Kontakt ID ass net mat geschéckt ginn."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Fehler beim liesen vun der Kontakt Photo."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Fehler beim späicheren vum temporäre Fichier."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Déi geluede Photo ass net gülteg."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakt ID fehlt."
@@ -133,89 +149,73 @@ msgstr "Fichier existéiert net:"
 msgid "Error loading image."
 msgstr "Fehler beim lueden vum Bild."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Et ass kee Fichier ropgeluede ginn"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index a63777d134..d1ce7da059 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Pridedant kontaktą įvyko klaida."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Klaida (de)aktyvuojant adresų knygą."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr "Kontaktų nerasta."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Pridedant kontaktą įvyko klaida."
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Klaida skaitant kontakto nuotrauką."
-
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Netinkama įkeliama nuotrauka."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija apie vCard yra neteisinga. "
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Klaida skaitant kontakto nuotrauką."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Netinkama įkeliama nuotrauka."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -133,89 +149,73 @@ msgstr "Failas neegzistuoja:"
 msgid "Error loading image."
 msgstr "Klaida įkeliant nuotrauką."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Failas įkeltas sėkmingai, be klaidų"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Įkeliamo failo dydis viršija upload_max_filesize nustatymą php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas joks failas"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 4d82047e18..0e9e46f420 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index e604a15bbe..6bb1874661 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Имаше грешка при додавање на контактот."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "име за елементот не е поставена."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ид не е поставено."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Неможе да се додаде празна вредност."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Барем една од полињата за адреса треба да биде пополнето."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Се обидовте да внесете дупликат вредност:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Грешка (де)активирање на адресарот."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ид не е поставено."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Неможе да се ажурира адресар со празно име."
@@ -85,39 +57,83 @@ msgstr "Не се најдени адресари."
 msgid "No contacts found."
 msgstr "Не се најдени контакти."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Недостасува ИД"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Имаше грешка при додавање на контактот."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Грешка при парсирање VCard за ИД: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "име за елементот не е поставена."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Не беше доставено ИД за контакт."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Грешка во читање на контакт фотографија."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Неможе да се додаде празна вредност."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Грешка во снимање на привремена датотека."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Барем една од полињата за адреса треба да биде пополнето."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Фотографијата која се вчитува е невалидна."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Се обидовте да внесете дупликат вредност:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Греш при бришење на вредноста за контакт."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Недостасува ИД"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Грешка при парсирање VCard за ИД: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "сумата за проверка не е поставена."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Нешто се расипа."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Грешка при ажурирање на вредноста за контакт."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Не беше доставено ИД за контакт."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Грешка во читање на контакт фотографија."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Грешка во снимање на привремена датотека."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Фотографијата која се вчитува е невалидна."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ИД за контакт недостасува."
@@ -134,89 +150,73 @@ msgstr "Не постои датотеката:"
 msgid "Error loading image."
 msgstr "Грешка во вчитување на слика."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Грешка при преземањето на контакт објектот,"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Грешка при утврдувањето на карактеристиките на фотографијата."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Грешка при снимање на контактите."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Грешка при скалирање на фотографијата"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Грешка при сечење на фотографијата"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Грешка при креирањето на привремената фотографија"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Грешка при наоѓањето на фотографијата:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "сумата за проверка не е поставена."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Нешто се расипа."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Грешка при ажурирање на вредноста за контакт."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Грешка во снимање на контактите на диск."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Не можеше да се сними привремената фотографија:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Не можеше да се вчита привремената фотографија:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr "Не можев да добијам исправна адреса."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 4d4bcafb70..61909142b6 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -21,44 +21,16 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Terdapat masalah menambah maklumat."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "nama elemen tidak ditetapkan."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID tidak ditetapkan."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Tidak boleh menambah ruang kosong."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Sekurangnya satu ruangan alamat perlu diisikan."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Cuba untuk letak nilai duplikasi:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Ralat nyahaktif buku alamat."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID tidak ditetapkan."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
@@ -87,39 +59,83 @@ msgstr "Tiada buku alamat dijumpai."
 msgid "No contacts found."
 msgstr "Tiada kenalan dijumpai."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID Hilang"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Terdapat masalah menambah maklumat."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Ralat VCard untuk ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nama elemen tidak ditetapkan."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Tiada ID kenalan yang diberi."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Ralat pada foto kenalan."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Tidak boleh menambah ruang kosong."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Ralat menyimpan fail sementara"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Sekurangnya satu ruangan alamat perlu diisikan."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Foto muatan tidak sah."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Cuba untuk letak nilai duplikasi:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Maklumat vCard tidak tepat. Sila reload semula halaman ini."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Masalah memadam maklumat."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID Hilang"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Ralat VCard untuk ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "checksum tidak ditetapkan."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Maklumat tentang vCard tidak betul."
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Sesuatu tidak betul."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Masalah mengemaskini maklumat."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Tiada ID kenalan yang diberi."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Ralat pada foto kenalan."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Ralat menyimpan fail sementara"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Foto muatan tidak sah."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID Kenalan telah hilang."
@@ -136,89 +152,73 @@ msgstr "Fail tidak wujud:"
 msgid "Error loading image."
 msgstr "Ralat pada muatan imej."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Ralat mendapatkan objek pada kenalan."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Ralat mendapatkan maklumat gambar."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Ralat menyimpan kenalan."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Ralat mengubah saiz imej"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Ralat memotong imej"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Ralat mencipta imej sementara"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Ralat mencari imej: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "checksum tidak ditetapkan."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Maklumat tentang vCard tidak betul."
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Sesuatu tidak betul."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Masalah mengemaskini maklumat."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ralat memuatnaik senarai kenalan."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail yang dimuatnaik tidak lengkap"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Tiada fail dimuatnaik"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Direktori sementara hilang"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Tidak boleh menyimpan imej sementara: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Tidak boleh membuka imej sementara: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
@@ -239,8 +239,8 @@ msgid "Couldn't get a valid address."
 msgstr "Tidak boleh mendapat alamat yang sah."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -477,26 +477,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 608296b401..a6d4c86902 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,44 +21,16 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Et problem oppsto med å legge til kontakten."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id er ikke satt."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Kan ikke legge til tomt felt."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Minst en av adressefeltene må oppgis."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Et problem oppsto med å (de)aktivere adresseboken."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id er ikke satt."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan ikke oppdatere adressebøker uten navn."
@@ -87,39 +59,83 @@ msgstr "Ingen adressebok funnet."
 msgid "No contacts found."
 msgstr "Ingen kontakter funnet."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Manglende ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Et problem oppsto med å legge til kontakten."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Klarte ikke å lese kontaktbilde."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Kan ikke legge til tomt felt."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Klarte ikke å lagre midlertidig fil."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Minst en av adressefeltene må oppgis."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Bildet som lastes inn er ikke gyldig."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Et problem oppsto med å fjerne kontaktfeltet."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Manglende ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Noe gikk fryktelig galt."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Et problem oppsto med å legge til kontaktfeltet."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Klarte ikke å lese kontaktbilde."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Klarte ikke å lagre midlertidig fil."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Bildet som lastes inn er ikke gyldig."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakt-ID mangler."
@@ -136,89 +152,73 @@ msgstr "Filen eksisterer ikke:"
 msgid "Error loading image."
 msgstr "Klarte ikke å laste bilde."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Klarte ikke å lagre kontakt."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Klarte ikke å endre størrelse på bildet"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Klarte ikke å beskjære bildet"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Klarte ikke å lage et midlertidig bilde"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Kunne ikke finne bilde:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Noe gikk fryktelig galt."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Et problem oppsto med å legge til kontaktfeltet."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Kunne ikke lagre midlertidig bilde:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Kunne ikke laste midlertidig bilde:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
@@ -239,8 +239,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -477,26 +477,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index bf87573242..16781f12dc 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,44 +22,16 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Er was een fout bij het toevoegen van het contact."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "onderdeel naam is niet opgegeven."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id is niet ingesteld."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Kan geen lege eigenschap toevoegen."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Minstens één van de adresvelden moet ingevuld worden."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Eigenschap bestaat al: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Fout bij het (de)activeren van het adresboek."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id is niet ingesteld."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan adresboek zonder naam niet wijzigen"
@@ -88,39 +60,83 @@ msgstr "Geen adresboek gevonden"
 msgid "No contacts found."
 msgstr "Geen contracten gevonden"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Ontbrekend ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Er was een fout bij het toevoegen van het contact."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Fout bij inlezen VCard voor ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "onderdeel naam is niet opgegeven."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Geen contact ID opgestuurd."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Lezen van contact foto mislukt."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Kan geen lege eigenschap toevoegen."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Tijdelijk bestand opslaan mislukt."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Minstens één van de adresvelden moet ingevuld worden."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "De geladen foto is niet goed."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Eigenschap bestaat al: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Fout bij het verwijderen van de contacteigenschap."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Ontbrekend ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Fout bij inlezen VCard voor ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "controlegetal is niet opgegeven."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informatie over vCard is fout. Herlaad de pagina: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Er ging iets totaal verkeerd. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Fout bij het updaten van de contacteigenschap."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Geen contact ID opgestuurd."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Lezen van contact foto mislukt."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Tijdelijk bestand opslaan mislukt."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "De geladen foto is niet goed."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Contact ID ontbreekt."
@@ -137,89 +153,73 @@ msgstr "Bestand bestaat niet:"
 msgid "Error loading image."
 msgstr "Fout bij laden plaatje."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "controlegetal is niet opgegeven."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informatie over vCard is fout. Herlaad de pagina: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Er ging iets totaal verkeerd. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Fout bij het updaten van de contacteigenschap."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Het bestand overschrijdt de upload_max_filesize instelling in php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -240,8 +240,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -478,26 +478,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 91cf5d7ea2..338507320b 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Det kom ei feilmelding då kontakta vart lagt til."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Kan ikkje leggja til tomt felt."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Minst eit av adressefelta må fyllast ut."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -85,39 +57,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Det kom ei feilmelding då kontakta vart lagt til."
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Kan ikkje leggja til tomt felt."
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Minst eit av adressefelta må fyllast ut."
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr ""
-
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Eit problem oppstod ved å slette kontaktfeltet."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Eit problem oppstod ved å endre kontaktfeltet."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -134,89 +150,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Eit problem oppstod ved å endre kontaktfeltet."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index de7f6271c7..52aca242e7 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,44 +21,16 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Wystąpił błąd podczas dodawania kontaktu."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "nazwa elementu nie jest ustawiona."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id nie ustawione."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Nie można parsować kontaktu:"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Nie można dodać pustego elementu."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Należy wypełnić przynajmniej jedno pole adresu."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Próba dodania z duplikowanej właściwości:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Błąd przy dodawaniu właściwości kontaktu:"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Błąd (de)aktywowania książki adresowej."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id nie ustawione."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
@@ -87,39 +59,83 @@ msgstr "Nie znaleziono książek adresowych"
 msgid "No contacts found."
 msgstr "Nie znaleziono kontaktów."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Brak ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Wystąpił błąd podczas dodawania kontaktu."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nazwa elementu nie jest ustawiona."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "ID kontaktu nie został utworzony."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Nie można parsować kontaktu:"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Błąd odczytu zdjęcia kontaktu."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Nie można dodać pustego elementu."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Wystąpił błąd podczas zapisywania pliku tymczasowego."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Należy wypełnić przynajmniej jedno pole adresu."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Wczytywane zdjęcie nie jest poprawne."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Próba dodania z duplikowanej właściwości:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Błąd przy dodawaniu właściwości kontaktu:"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Błąd usuwania elementu."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Brak ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "checksum-a nie ustawiona"
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Gdyby coś poszło FUBAR."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Błąd uaktualniania elementu."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "ID kontaktu nie został utworzony."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Błąd odczytu zdjęcia kontaktu."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Wystąpił błąd podczas zapisywania pliku tymczasowego."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Wczytywane zdjęcie nie jest poprawne."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Brak kontaktu id."
@@ -136,89 +152,73 @@ msgstr "Plik nie istnieje:"
 msgid "Error loading image."
 msgstr "Błąd ładowania obrazu."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Błąd pobrania kontaktu."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Błąd uzyskiwania właściwości ZDJĘCIA."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Błąd zapisu kontaktu."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Błąd zmiany rozmiaru obrazu"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Błąd przycinania obrazu"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Błąd utworzenia obrazu tymczasowego"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Błąd znajdowanie obrazu: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "checksum-a nie ustawiona"
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Gdyby coś poszło FUBAR."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Błąd uaktualniania elementu."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nie było błędów, plik wyczytano poprawnie."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Załadowany plik przekracza wielkość upload_max_filesize w php.ini "
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Załadowany plik tylko częściowo został wysłany."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Plik nie został załadowany"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Brak folderu tymczasowego"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Nie można zapisać obrazu tymczasowego: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Nie można wczytać obrazu tymczasowego: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Plik nie został załadowany. Nieznany błąd"
 
@@ -239,8 +239,8 @@ msgid "Couldn't get a valid address."
 msgstr "Nie można pobrać prawidłowego adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -477,26 +477,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Następna/poprzednia książka adresowa"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Akcje"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Odśwież listę kontaktów"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Dodaj nowy kontakt"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Dodaj nowa książkę adresową"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Usuń obecny kontakt"
 
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 69fcf27009..a6a3237e21 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Ocorreu um erro ao adicionar o contato."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "nome do elemento não definido."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID não definido."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Não é possível adicionar propriedade vazia."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Pelo menos um dos campos de endereço tem que ser preenchido."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Tentando adiciona propriedade duplicada:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Erro ao (des)ativar agenda."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID não definido."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Não é possível atualizar sua agenda com um nome em branco."
@@ -86,39 +58,83 @@ msgstr "Nenhuma agenda de endereços encontrada."
 msgid "No contacts found."
 msgstr "Nenhum contato encontrado."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Faltando ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Ocorreu um erro ao adicionar o contato."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Erro de identificação VCard para ID:"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nome do elemento não definido."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nenhum ID do contato foi submetido."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Erro de leitura na foto do contato."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Não é possível adicionar propriedade vazia."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Erro ao salvar arquivo temporário."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Pelo menos um dos campos de endereço tem que ser preenchido."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Foto carregada não é válida."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Tentando adiciona propriedade duplicada:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Erro ao excluir propriedade de contato."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Faltando ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Erro de identificação VCard para ID:"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "checksum não definido."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Something went FUBAR. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Erro ao atualizar propriedades do contato."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nenhum ID do contato foi submetido."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Erro de leitura na foto do contato."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Erro ao salvar arquivo temporário."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Foto carregada não é válida."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID do contato está faltando."
@@ -135,89 +151,73 @@ msgstr "Arquivo não existe:"
 msgid "Error loading image."
 msgstr "Erro ao carregar imagem."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Erro ao obter propriedade de contato."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Erro ao obter propriedade da FOTO."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Erro ao salvar contato."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Erro ao modificar tamanho da imagem"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Erro ao recortar imagem"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Erro ao criar imagem temporária"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Erro ao localizar imagem:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "checksum não definido."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Something went FUBAR. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Erro ao atualizar propriedades do contato."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Arquivo enviado com sucesso"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi parcialmente carregado"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo carregado"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Diretório temporário não encontrado"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Não foi possível salvar a imagem temporária:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Não foi possível carregar a imagem temporária:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index fb46920e8b..25458fe13d 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Erro ao adicionar contato"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "o nome do elemento não está definido."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id não está definido"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Não é possivel adicionar uma propriedade vazia"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "A tentar adicionar propriedade duplicada: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Erro a (des)ativar o livro de endereços"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id não está definido"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
@@ -86,39 +58,83 @@ msgstr "Nenhum livro de endereços encontrado."
 msgid "No contacts found."
 msgstr "Nenhum contacto encontrado."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Falta ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Erro ao adicionar contato"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Erro a analisar VCard para o ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "o nome do elemento não está definido."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nenhum ID de contacto definido."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Erro a ler a foto do contacto."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Não é possivel adicionar uma propriedade vazia"
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Erro a guardar ficheiro temporário."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "A foto carregada não é valida."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "A tentar adicionar propriedade duplicada: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A informação sobre o vCard está incorreta. Por favor refresque a página"
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Erro ao apagar propriedade do contato"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Falta ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Erro a analisar VCard para o ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "Checksum não está definido."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Algo provocou um FUBAR. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Erro ao atualizar propriedade do contato"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nenhum ID de contacto definido."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Erro a ler a foto do contacto."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Erro a guardar ficheiro temporário."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "A foto carregada não é valida."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta o ID do contacto."
@@ -135,89 +151,73 @@ msgstr "O ficheiro não existe:"
 msgid "Error loading image."
 msgstr "Erro a carregar a imagem."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Erro a obter o objecto dos contactos"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Erro a obter a propriedade Foto"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Erro a guardar o contacto."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Erro a redimensionar a imagem"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Erro a recorar a imagem"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Erro a criar a imagem temporária"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Erro enquanto pesquisava pela imagem: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "Checksum não está definido."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Algo provocou um FUBAR. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Erro ao atualizar propriedade do contato"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro a carregar os contactos para o armazenamento."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Não ocorreu erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Está a faltar a pasta temporária"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Não foi possível guardar a imagem temporária: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Não é possível carregar a imagem temporária: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 5e4e80b841..f57b3a85c7 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "O eroare a împiedicat adăugarea contactului."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "numele elementului nu este stabilit."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID-ul nu este stabilit"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Nu se poate adăuga un câmp gol."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Cel puțin unul din câmpurile adresei trebuie completat."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "(Dez)activarea agendei a întâmpinat o eroare."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID-ul nu este stabilit"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -86,39 +58,83 @@ msgstr "Nici o carte de adrese găsită"
 msgid "No contacts found."
 msgstr "Nici un contact găsit"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID lipsă"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "O eroare a împiedicat adăugarea contactului."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "numele elementului nu este stabilit."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nici un ID de contact nu a fost transmis"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Eroare la citerea fotografiei de contact"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Nu se poate adăuga un câmp gol."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Eroare la salvarea fișierului temporar."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Cel puțin unul din câmpurile adresei trebuie completat."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Fotografia care se încarcă nu este validă."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Eroare la ștergerea proprietăților contactului."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID lipsă"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "suma de control nu este stabilită."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Eroare la actualizarea proprietăților contactului."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nici un ID de contact nu a fost transmis"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Eroare la citerea fotografiei de contact"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Eroare la salvarea fișierului temporar."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Fotografia care se încarcă nu este validă."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID-ul de contact lipsește."
@@ -135,89 +151,73 @@ msgstr "Fișierul nu există:"
 msgid "Error loading image."
 msgstr "Eroare la încărcarea imaginii."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "suma de control nu este stabilită."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Eroare la actualizarea proprietăților contactului."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 988a58e330..4efdb68140 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -24,44 +24,16 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Произошла ошибка при добавлении контакта."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "имя элемента не установлено."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id не установлен."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Невозможно добавить пустой параметр."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Как минимум одно поле адреса должно быть заполнено."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "При попытке добавить дубликат:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Ошибка (де)активации адресной книги."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id не установлен."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Нельзя обновить адресную книгу с пустым именем."
@@ -90,39 +62,83 @@ msgstr "Адресные книги не найдены."
 msgid "No contacts found."
 msgstr "Контакты не найдены."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Отсутствует ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Произошла ошибка при добавлении контакта."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Ошибка обработки VCard для ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "имя элемента не установлено."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Нет контакта ID"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Ошибка чтения фотографии контакта."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Невозможно добавить пустой параметр."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Ошибка сохранения временного файла."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Как минимум одно поле адреса должно быть заполнено."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Загружаемая фотография испорчена."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "При попытке добавить дубликат:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информация о vCard некорректна. Пожалуйста, обновите страницу."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Ошибка удаления информации из контакта."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Отсутствует ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Ошибка обработки VCard для ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "контрольная сумма не установлена."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Что-то пошло FUBAR."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Ошибка обновления информации контакта."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Нет контакта ID"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Ошибка чтения фотографии контакта."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Ошибка сохранения временного файла."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Загружаемая фотография испорчена."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID контакта отсутствует."
@@ -139,89 +155,73 @@ msgstr "Файл не существует:"
 msgid "Error loading image."
 msgstr "Ошибка загрузки картинки."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Ошибка при получении контактов"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Ошибка при получении ФОТО."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Ошибка при сохранении контактов."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Ошибка изменения размера изображений"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Ошибка обрезки изображений"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Ошибка создания временных изображений"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Ошибка поиска изображений:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "контрольная сумма не установлена."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Что-то пошло FUBAR."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Ошибка обновления информации контакта."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ошибка загрузки контактов в хранилище."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл загружен успешно."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл загружен частично"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временная папка"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Не удалось сохранить временное изображение:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Не удалось загрузить временное изображение:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
@@ -242,8 +242,8 @@ msgid "Couldn't get a valid address."
 msgstr "Не удалось получить адрес."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -480,26 +480,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index 2fb512bc40..1ced7f47fd 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "meno elementu nie je nastavené."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID nie je nastavené."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Nemôžem pridať prázdny údaj."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Musí byť uvedený aspoň jeden adresný údaj."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Pokúšate sa pridať rovnaký atribút:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Chyba (de)aktivácie adresára."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID nie je nastavené."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nedá sa upraviť adresár s prázdnym menom."
@@ -86,39 +58,83 @@ msgstr "Žiadny adresár nenájdený."
 msgid "No contacts found."
 msgstr "Žiadne kontakty nenájdené."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Chýba ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Chyba pri vyňatí ID z VCard:"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "meno elementu nie je nastavené."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Nebolo nastavené ID kontaktu."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Chyba pri čítaní fotky kontaktu."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Nemôžem pridať prázdny údaj."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Chyba pri ukladaní dočasného súboru."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Musí byť uvedený aspoň jeden adresný údaj."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Načítaná fotka je vadná."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Pokúšate sa pridať rovnaký atribút:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Chyba odstránenia údaju kontaktu."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Chýba ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Chyba pri vyňatí ID z VCard:"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "kontrolný súčet nie je nastavený."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Niečo sa pokazilo."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Chyba aktualizovania údaju kontaktu."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Nebolo nastavené ID kontaktu."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Chyba pri čítaní fotky kontaktu."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Chyba pri ukladaní dočasného súboru."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Načítaná fotka je vadná."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Chýba ID kontaktu."
@@ -135,89 +151,73 @@ msgstr "Súbor neexistuje:"
 msgid "Error loading image."
 msgstr "Chyba pri nahrávaní obrázka."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Chyba počas prevzatia objektu kontakt."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Chyba počas získavania fotky."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Chyba vyhľadania obrázku: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "kontrolný súčet nie je nastavený."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Niečo sa pokazilo."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Chyba aktualizovania údaju kontaktu."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla sa žiadna chyba, súbor úspešne uložené."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Nemôžem uložiť dočasný obrázok: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Nemôžem načítať dočasný obrázok: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Ďalší/predošlí adresár"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Obnov zoznam kontaktov"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Pridaj nový kontakt"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Pridaj nový adresár"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Vymaž súčasný kontakt"
 
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 4ff1bfc5e3..5c48279297 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Med dodajanjem stika je prišlo do napake"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "ime elementa ni nastavljeno."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id ni nastavljen."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Ne morem dodati prazne lastnosti."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Vsaj eno izmed polj je še potrebno izpolniti."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Poskušam dodati podvojeno lastnost:"
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Napaka med (de)aktivacijo imenika."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id ni nastavljen."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne morem posodobiti imenika s praznim imenom."
@@ -86,39 +58,83 @@ msgstr "Ni bilo najdenih imenikov."
 msgid "No contacts found."
 msgstr "Ni bilo najdenih stikov."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Manjkajoč ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Med dodajanjem stika je prišlo do napake"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "Napaka pri razčlenjevanju VCard za ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "ime elementa ni nastavljeno."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "ID stika ni bil poslan."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Napaka pri branju slike stika."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Ne morem dodati prazne lastnosti."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Napaka pri shranjevanju začasne datoteke."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Vsaj eno izmed polj je še potrebno izpolniti."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Slika, ki se nalaga ni veljavna."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Poskušam dodati podvojeno lastnost:"
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Napaka pri brisanju lastnosti stika."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Manjkajoč ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "Napaka pri razčlenjevanju VCard za ID: \""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "nadzorna vsota ni nastavljena."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Nekaj je šlo v franže. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Napaka pri posodabljanju lastnosti stika."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "ID stika ni bil poslan."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Napaka pri branju slike stika."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Napaka pri shranjevanju začasne datoteke."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Slika, ki se nalaga ni veljavna."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Manjka ID stika."
@@ -135,89 +151,73 @@ msgstr "Datoteka ne obstaja:"
 msgid "Error loading image."
 msgstr "Napaka pri nalaganju slike."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Napaka pri pridobivanju kontakta predmeta."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Napaka pri pridobivanju lastnosti fotografije."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Napaka pri shranjevanju stika."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Napaka pri spreminjanju velikosti slike"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Napaka pri obrezovanju slike"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Napaka pri ustvarjanju začasne slike"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Napaka pri iskanju datoteke: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "nadzorna vsota ni nastavljena."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Nekaj je šlo v franže. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Napaka pri posodabljanju lastnosti stika."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je bila uspešno naložena."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je bila le delno naložena"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Začasne slike ni bilo mogoče shraniti: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Začasne slike ni bilo mogoče naložiti: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Ne morem dobiti veljavnega naslova."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 40bebde75b..e200e45aba 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 155eb759e4..96f1ec9f35 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти су неисправни. Поново учитајте страницу."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -133,89 +149,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index b023da2aed..535012fa25 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -133,89 +149,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 6f4597c78e..2f9232861b 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,44 +22,16 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Det uppstod ett fel när kontakt skulle läggas till"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ID är inte satt."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Kunde inte läsa kontakt:"
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Kan inte lägga till en tom egenskap"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Minst ett fält måste fyllas i"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Kunde inte lägga till egenskap för kontakt:"
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Fel när (av)aktivera adressbok"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID är inte satt."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan inte uppdatera adressboken med ett tomt namn."
@@ -88,39 +60,83 @@ msgstr "Ingen adressbok funnen."
 msgid "No contacts found."
 msgstr "Inga kontakter funna."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "ID saknas"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Det uppstod ett fel när kontakt skulle läggas till"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Inget kontakt-ID angavs."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Kunde inte läsa kontakt:"
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Fel uppstod när "
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Kan inte lägga till en tom egenskap"
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Fel uppstod när temporär fil skulle sparas."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Minst ett fält måste fyllas i"
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Det laddade fotot är inte giltigt."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Kunde inte lägga till egenskap för kontakt:"
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle tas bort"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "ID saknas"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "kontrollsumma är inte satt."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "Informationen om vCard är fel. Ladda om sidan:"
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Inget kontakt-ID angavs."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Fel uppstod när "
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Fel uppstod när temporär fil skulle sparas."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Det laddade fotot är inte giltigt."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakt-ID saknas."
@@ -137,89 +153,73 @@ msgstr "Filen existerar inte."
 msgid "Error loading image."
 msgstr "Fel uppstod när bild laddades."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Kunde inte hitta bild"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "kontrollsumma är inte satt."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "Informationen om vCard är fel. Ladda om sidan:"
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fel uppstod när kontakt skulle lagras."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var bara delvist uppladdad"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Kunde inte spara tillfällig bild:"
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Kunde inte ladda tillfällig bild:"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
@@ -240,8 +240,8 @@ msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -478,26 +478,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index c768af8ead..7bae263845 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 89ca8ee5be..6636578692 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index af9fcc65dd..48c9e0956e 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,44 +17,16 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -83,39 +55,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -132,89 +148,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -473,26 +473,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c9a44b2a6f..cebb430138 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,51 +37,51 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 7516a68269..fe5a5ce14e 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 10c33982a8..f11330d534 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index edcb06e03d..cbe049c7e0 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index b95ec54597..753b983704 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 48b030a20e..f3c4cc9556 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 39eb5b86fe..b89d76eeec 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "ยังไม่ได้กำหนดชื่อ"
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "ยังไม่ได้กำหนดรหัส"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "ยังไม่ได้กำหนดรหัส"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
@@ -85,39 +57,83 @@ msgstr "ไม่พบสมุดบันทึกที่อยู่ที
 msgid "No contacts found."
 msgstr "ไม่พบข้อมูลการติดต่อที่ต้องการ"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "รหัสสูญหาย"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "พบข้อผิดพลาดในการแยกรหัส VCard:\""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "ยังไม่ได้กำหนดชื่อ"
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้"
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป"
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "โหลดรูปภาพไม่ถูกต้อง"
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง"
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "รหัสสูญหาย"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "พบข้อผิดพลาดในการแยกรหัส VCard:\""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "ยังไม่ได้กำหนดค่า checksum"
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "มีบางอย่างเกิดการ FUBAR. "
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "โหลดรูปภาพไม่ถูกต้อง"
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
@@ -134,89 +150,73 @@ msgstr "ไม่มีไฟล์ดังกล่าว"
 msgid "Error loading image."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "เกิดข้อผิดพลาดในการครอบตัดภาพ"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "เกิดข้อผิดพลาดในการค้นหารูปภาพ: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "ยังไม่ได้กำหนดค่า checksum"
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "มีบางอย่างเกิดการ FUBAR. "
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "ไม่สามารถบันทึกรูปภาพชั่วคราวได้: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "ไม่สามารถโหลดรูปภาพชั่วคราวได้: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 86e889b602..e2f07fe95d 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "Kişi eklenirken hata oluştu."
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "eleman ismi atanmamış."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id atanmamış."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr "Kişi bilgisi ayrıştırılamadı."
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "Boş özellik eklenemiyor."
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "En az bir adres alanı doldurulmalı."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr "Kişi özelliği eklenirken hata oluştu."
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "Adres defteri etkisizleştirilirken hata oluştu."
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id atanmamış."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
@@ -86,39 +58,83 @@ msgstr "Adres defteri bulunamadı."
 msgid "No contacts found."
 msgstr "Bağlantı bulunamadı."
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Eksik ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "Kişi eklenirken hata oluştu."
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "ID için VCard ayrıştırılamadı:\""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "eleman ismi atanmamış."
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "Bağlantı ID'si girilmedi."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Kişi bilgisi ayrıştırılamadı."
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Bağlantı fotoğrafı okunamadı."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Boş özellik eklenemiyor."
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "Geçici dosya kaydetme hatası."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "En az bir adres alanı doldurulmalı."
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Yüklenecek fotograf geçerli değil."
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr "Kişi özelliği eklenirken hata oluştu."
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "Kişi özelliği silinirken hata oluştu."
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Eksik ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "ID için VCard ayrıştırılamadı:\""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "checksum atanmamış."
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "Bir şey FUBAR gitti."
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "Kişi özelliği güncellenirken hata oluştu."
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "Bağlantı ID'si girilmedi."
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Bağlantı fotoğrafı okunamadı."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "Geçici dosya kaydetme hatası."
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Yüklenecek fotograf geçerli değil."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Bağlantı ID'si eksik."
@@ -135,89 +151,73 @@ msgstr "Dosya mevcut değil:"
 msgid "Error loading image."
 msgstr "İmaj yükleme hatası."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "Bağlantı nesnesini kaydederken hata."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "Resim özelleğini alırken hata oluştu."
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "Bağlantıyı kaydederken hata"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "Görüntü yeniden boyutlandırılamadı."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "Görüntü kırpılamadı."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "Geçici resim oluştururken hata oluştu"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "Resim ararken hata oluştu:"
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "checksum atanmamış."
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "Bir şey FUBAR gitti."
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "Kişi özelliği güncellenirken hata oluştu."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "Geçici resmi saklayamadı : "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "Geçici resmi yükleyemedi :"
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "Geçerli bir adres alınamadı."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr "Şuanki adres defterini genişlet/daralt"
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
-msgstr "Sonraki/Önceki adres defteri"
+msgid "Next addressbook"
+msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Eylemler"
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Kişi listesini tazele"
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Yeni kişi ekle"
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Yeni adres defteri ekle"
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Şuanki kişiyi sil"
 
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 3ae9c0a11a..450539dd15 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "Має бути заповнено щонайменше одне поле."
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "Має бути заповнено щонайменше одне поле."
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -133,89 +149,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 8e78db712a..3e5a19915b 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,16 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "tên phần tử không được thiết lập."
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "id không được thiết lập."
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr ""
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "id không được thiết lập."
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -84,39 +56,83 @@ msgstr "Không tìm thấy sổ địa chỉ."
 msgid "No contacts found."
 msgstr "Không tìm thấy danh sách"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "Missing ID"
-
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "tên phần tử không được thiết lập."
+
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "Lỗi đọc liên lạc hình ảnh."
-
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "Các hình ảnh tải không hợp lệ."
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr ""
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "Missing ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "Lỗi đọc liên lạc hình ảnh."
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "Các hình ảnh tải không hợp lệ."
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -133,89 +149,73 @@ msgstr "Tập tin không tồn tại"
 msgid "Error loading image."
 msgstr "Lỗi khi tải hình ảnh."
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Lỗi tải lên danh sách địa chỉ để lưu trữ."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Không có lỗi, các tập tin tải lên thành công"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -236,8 +236,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -474,26 +474,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 530ce6e307..f12fcc02ee 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,44 +20,16 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "添加联系人时出错。"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr "元素名称未设置"
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr "没有设置 id。"
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "无法添加空属性。"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "至少需要填写一项地址。"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr "试图添加重复属性： "
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr "没有设置 id。"
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr "无法使用一个空名称更新地址簿"
@@ -86,39 +58,83 @@ msgstr "找不到地址簿。"
 msgid "No contacts found."
 msgstr "找不到联系人。"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "缺少 ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "添加联系人时出错。"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr "无法解析如下ID的 VCard：“"
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr "元素名称未设置"
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
-msgstr "未提交联系人 ID。"
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
-msgstr "读取联系人照片错误。"
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "无法添加空属性。"
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
-msgstr "保存临时文件错误。"
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "至少需要填写一项地址。"
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr "装入的照片不正确。"
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr "试图添加重复属性： "
 
-#: ajax/deleteproperty.php:36
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信息不正确。请重新加载页面。"
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "删除联系人属性错误。"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "缺少 ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr "无法解析如下ID的 VCard：“"
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr "未设置校验值。"
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr "vCard 信息不正确。请刷新页面: "
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr "有一些信息无法被处理。"
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "更新联系人属性错误。"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr "未提交联系人 ID。"
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr "读取联系人照片错误。"
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr "保存临时文件错误。"
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr "装入的照片不正确。"
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "缺少联系人 ID。"
@@ -135,89 +151,73 @@ msgstr "文件不存在:"
 msgid "Error loading image."
 msgstr "加载图片错误。"
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr "获取联系人目标时出错。"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr "获取照片属性时出错。"
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr "保存联系人时出错。"
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr "缩放图像时出错"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr "裁切图像时出错"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr "创建临时图像时出错"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr "查找图像时出错: "
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr "未设置校验值。"
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr "vCard 信息不正确。请刷新页面: "
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr "有一些信息无法被处理。"
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "更新联系人属性错误。"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "上传联系人到存储空间时出错"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "文件上传成功，没有错误发生"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr "无法保存临时图像: "
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr "无法加载临时图像: "
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
@@ -238,8 +238,8 @@ msgid "Couldn't get a valid address."
 msgstr "无法获取一个合法的地址。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -476,26 +476,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 7d3d44339c..6c64233870 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 00:02+0000\n"
+"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"PO-Revision-Date: 2012-08-04 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,16 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcontact.php:47
-msgid "There was an error adding the contact."
-msgstr "添加通訊錄發生錯誤"
-
-#: ajax/addproperty.php:39 ajax/saveproperty.php:34
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
-#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
-#: ajax/saveproperty.php:37
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr "不可添加空白內容"
-
-#: ajax/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr "至少必須填寫一欄地址"
-
-#: ajax/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/addproperty.php:144
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
 msgstr "在啟用或關閉電話簿時發生錯誤"
 
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
@@ -85,39 +57,83 @@ msgstr ""
 msgid "No contacts found."
 msgstr "沒有找到聯絡人"
 
-#: ajax/contactdetails.php:31
-msgid "Missing ID"
-msgstr "遺失ID"
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr "添加通訊錄發生錯誤"
 
-#: ajax/contactdetails.php:36
-msgid "Error parsing VCard for ID: \""
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
-#: ajax/uploadphoto.php:66
-msgid "No contact ID was submitted."
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/currentphoto.php:34
-msgid "Error reading contact photo."
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "不可添加空白內容"
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr "至少必須填寫一欄地址"
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/currentphoto.php:46
-msgid "Error saving temporary file."
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/currentphoto.php:49
-msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "有關 vCard 的資訊不正確，請重新載入此頁。"
 
-#: ajax/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "刪除通訊錄內容中發生錯誤"
 
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr "遺失ID"
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr "更新通訊錄內容中發生錯誤"
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
@@ -134,89 +150,73 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:66
+#: ajax/savecrop.php:69
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:95
+#: ajax/savecrop.php:98
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:105
+#: ajax/savecrop.php:108
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:111
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:114
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:117
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:40
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:60
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/saveproperty.php:67
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/saveproperty.php:142
-msgid "Error updating contact property."
-msgstr "更新通訊錄內容中發生錯誤"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "沒有已上傳的檔案"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:69
+#: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
@@ -237,8 +237,8 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
 #: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
@@ -475,26 +475,30 @@ msgid "Expand/collapse current addressbook"
 msgstr ""
 
 #: templates/index.php:48
-msgid "Next/previous addressbook"
+msgid "Next addressbook"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
new file mode 100644
index 0000000000..96bcb06a8d
--- /dev/null
+++ b/lib/l10n/eo.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Helpo",
+"Personal" => "Persona",
+"Settings" => "Agordo",
+"Users" => "Uzantoj",
+"Apps" => "Aplikaĵoj",
+"ZIP download is turned off." => "ZIP-elŝuto estas malkapabligita.",
+"Files need to be downloaded one by one." => "Dosieroj devas elŝutiĝi unuope.",
+"Back to Files" => "Reen al la dosieroj",
+"Selected files too large to generate zip file." => "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero.",
+"Application is not enabled" => "La aplikaĵo ne estas kapabligita",
+"Authentication error" => "Aŭtentiga eraro",
+"Token expired. Please reload page." => "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
+"seconds ago" => "sekundojn antaŭe",
+"1 minute ago" => "antaŭ 1 minuto",
+"%d minutes ago" => "antaŭ %d minutoj",
+"today" => "hodiaŭ",
+"yesterday" => "hieraŭ",
+"%d days ago" => "antaŭ %d tagoj",
+"last month" => "lasta monato",
+"months ago" => "monatojn antaŭe",
+"last year" => "lasta jaro",
+"years ago" => "jarojn antaŭe"
+);
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 348bee92c7..dcd777b0a6 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
+"Authentication error" => "Aŭtentiga eraro",
 "Language changed" => "La lingvo estas ŝanĝita",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
+"Security Warning" => "Sekureca averto",
 "Log" => "Registro",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",

From 1bccc80996e270f928c207cdd3090f4284abaea5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 4 Aug 2012 17:38:31 +0200
Subject: [PATCH 1250/1537] hide morelog button if there are no more log
 entries - bugfix for oc-1398

---
 settings/admin.php           | 3 +++
 settings/ajax/getlog.php     | 2 +-
 settings/js/log.js           | 3 +++
 settings/templates/admin.php | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/settings/admin.php b/settings/admin.php
index 8369ee64e0..bf8e03c13c 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -18,6 +18,8 @@ $forms=OC_App::getForms('admin');
 $htaccessworking=OC_Util::ishtaccessworking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
+$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
+
 function compareEntries($a,$b){
 	return $b->time - $a->time;
 }
@@ -25,6 +27,7 @@ usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',$entries);
+$tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
 $tmpl->assign('forms',array());
 foreach($forms as $form){
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index d9e80de37b..d5af22ac33 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -14,4 +14,4 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count,$offset);
-OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries)));
+OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries), "remain"=>(count(OC_Log_Owncloud::getEntries(1,$offset + $offset)) != 0)?true:false));
diff --git a/settings/js/log.js b/settings/js/log.js
index fe2e92f7a8..04a7bf8b28 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -23,6 +23,9 @@ OC.Log={
 			if(result.status=='success'){
 				OC.Log.addEntries(result.data);
 				$('html, body').animate({scrollTop: $(document).height()}, 800);
+				if(!result.remain){
+					$('#moreLog').css('display', 'none');
+				}
 			}
 		});
 	},
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 033cd1a164..60b9732d7f 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -52,7 +52,10 @@ if(!$_['htaccessworking']) {
 		</tr>
 	<?php endforeach;?>
 </table>
+<?php if($_['entriesremain']): ?>
 <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
+<?php endif; ?>
+
 </fieldset>
 
 

From 627ea9efe43f0865d3392f92c6fe805e694ce33e Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sat, 4 Aug 2012 12:39:23 -0400
Subject: [PATCH 1251/1537] fixes bug oc-1433

---
 settings/apps.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/apps.php b/settings/apps.php
index 762395c031..27c71da0da 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -47,6 +47,7 @@ foreach($registeredApps as $app){
 			$info['internallabel']='3rd Party App';
 		}
 		$info['preview']='trans.png';
+		$info['version']=OC_App::getAppVersion($app);
 		$apps[]=$info;
 	}
 }

From da4057ecfd25c2de9267586acb7e5d902b386300 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 4 Aug 2012 18:50:05 +0200
Subject: [PATCH 1252/1537] fix label for versioning in admin settings

---
 apps/files_versions/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index c3a856bc19..8682fc0f49 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,4 +1,4 @@
-<form id="versions">
+<form id="versionssettings">
         <fieldset class="personalblock">
 	        <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable Files Versioning'); ?></label> <br/>
         </fieldset>

From 226af11f33e90305d20e0ac3c5fce223b3f98263 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sat, 4 Aug 2012 13:08:55 -0400
Subject: [PATCH 1253/1537] reset version number when not specified - again bug
 oc-1433

---
 settings/js/apps.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index cfef894c6f..7b608956ed 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -20,7 +20,11 @@ $(document).ready(function(){
 		$('#rightcontent p.license').show();
 		$('#rightcontent span.name').text(app.name);
 		$('#rightcontent small.externalapp').text(app.internallabel);
-		$('#rightcontent span.version').text(app.version);
+		if (app.version) {
+			$('#rightcontent span.version').text(app.version);
+		} else {
+			$('#rightcontent span.version').text('');
+		}
 		$('#rightcontent p.description').text(app.description);
 		$('#rightcontent img.preview').attr('src',app.preview);
 		$('#rightcontent small.externalapp').attr('style','visibility:visible');

From a6ce497dd932fc013301e433c635c6286fffe513 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sat, 4 Aug 2012 13:39:36 -0400
Subject: [PATCH 1254/1537] OC_App::getAppVersion return blank if version is
 not specified

---
 lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index d1018c37aa..2e9ec4d630 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -394,7 +394,7 @@ class OC_App{
 			return trim($version);
 		}else{
 			$appData=self::getAppInfo($appid);
-			return $appData['version'];
+			return isset($appData['version'])? $appData['version'] : '';
 		}
 	}
 

From 24af2e8078147578bd435983c1d9a11f13dae8c1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 4 Aug 2012 20:12:18 +0200
Subject: [PATCH 1255/1537] Load OCS apps in an ajax call to avoid blocking the
 WUI.

---
 settings/apps.php           |  5 +-
 settings/css/settings.css   |  8 ++-
 settings/js/apps.js         | 99 +++++++++++++++++++++++++++----------
 settings/templates/apps.php |  7 +--
 4 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/settings/apps.php b/settings/apps.php
index 27c71da0da..d34b646883 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -60,6 +60,7 @@ function app_sort($a, $b){
 }
 usort($apps, 'app_sort');
 
+/*
 // apps from external repo via OCS
  $catagoryNames=OC_OCSClient::getCategories();
  if(is_array($catagoryNames)){
@@ -70,7 +71,7 @@ usort($apps, 'app_sort');
 		// show only external apps that are not exist yet
 		$local=false;
  		foreach($apps as $a){
-			if($a['name']==$app['name']) $local=true;			
+			if($a['name']==$app['name']) $local=true;
 		}
 
 		if(!$local) {
@@ -89,7 +90,7 @@ usort($apps, 'app_sort');
 		}
  	}
  }
-
+*/
 
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
diff --git a/settings/css/settings.css b/settings/css/settings.css
index d5634eec81..e79029ddbf 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -43,11 +43,17 @@ div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
 
 /* APPS */
-li { color:#888; }
+li { color:#888; white-space: nowrap; }
 li.active { color:#000; }
 small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size:6pt; padding:4px; border-radius: 4px;}
+small.externalapp.list { float: right; }
 span.version { margin-left:3em; color:#ddd; }
 
+.app { position: relative; display: inline-block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; z-index: 100; transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear; }
+.app.externalapp { max-width: 10em; }
+/* Transition to complete width! */
+.app:hover, .app:active { max-width: inherit; }
+
 /* LOG */
 #log { white-space:normal; }
 
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 7b608956ed..3f6ff66c6d 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -1,13 +1,51 @@
 /**
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * Copyright (c) 2012, Thomas Tanghus <thomas@tanghus.net>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
 
+OC.Settings = OC.Settings || {};
+OC.Settings.Apps = OC.Settings.Apps || {
+	loadOCS:function() {
+		$.getJSON(OC.filePath('settings', 'ajax', 'apps/ocs.php'), function(jsondata) {
+			if(jsondata.status == 'success'){
+				var apps = jsondata.data;
+				$.each(apps, function(b, appdata) {
+					OC.Settings.Apps.insertApp(appdata);
+				});
+			} else {
+				OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
+			}
+		});
+	},
+	insertApp:function(appdata) {
+		var applist = $('#leftcontent li');
+		var app =
+				$('<li data-id="'+appdata.id+'" data-type="external" data-installed="0">'
+				+ '<a class="app externalapp" href="'+OC.filePath('settings', 'apps', 'index.php')+'&appid=' + appdata.id+'">'
+				+ appdata.name+'</a><small class="externalapp list">3rd party</small></li>');
+		app.data('app', appdata);
+		var added = false;
+		applist.each(function() {
+			if(!parseInt($(this).data('installed')) && $(this).find('a').text().toLowerCase() > appdata.name.toLowerCase()) {
+				$(this).before(app);
+				added = true;
+				return false; // dang, remember this to get out of loop
+			}
+		});
+		if(!added) {
+			applist.last().after(app);
+		}
+		return app;
+	}
+}
+
 $(document).ready(function(){
 	$('#leftcontent li').each(function(index,li){
-		var app=$.parseJSON($(this).children('span').text());
+		var app = $.parseJSON($(this).children('span').text());
 		$(li).data('app',app);
+		$(this).find('span.hidden').remove();
 	});
 	$('#leftcontent li').keydown(function(event) {
 		if (event.which == 13 || event.which == 32) {
@@ -15,31 +53,36 @@ $(document).ready(function(){
 		}
 		return false;
 	});
-	$('#leftcontent li').click(function(){
-		var app=$(this).data('app');
-		$('#rightcontent p.license').show();
-		$('#rightcontent span.name').text(app.name);
-		$('#rightcontent small.externalapp').text(app.internallabel);
-		if (app.version) {
-			$('#rightcontent span.version').text(app.version);
-		} else {
-			$('#rightcontent span.version').text('');
-		}
-		$('#rightcontent p.description').text(app.description);
-		$('#rightcontent img.preview').attr('src',app.preview);
-		$('#rightcontent small.externalapp').attr('style','visibility:visible');
-		$('#rightcontent span.author').text(app.author);
-		$('#rightcontent span.licence').text(app.licence);
-		
-		$('#rightcontent input.enable').show();
-		$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
-		$('#rightcontent input.enable').data('appid',app.id);
-		$('#rightcontent input.enable').data('active',app.active);
-		if ( app.internal == false ) {
-			$('#rightcontent p.appslink').show();
-			$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
-		} else {
-			$('#rightcontent p.appslink').hide();
+
+	$(document).on('click', '#leftcontent', function(event){
+		var tgt = $(event.target);
+		if (tgt.is('li') || tgt.is('a')) {
+			var item = tgt.is('li') ? $(tgt) : $(tgt).parent();
+			var app = item.data('app');
+			$('#rightcontent p.license').show();
+			$('#rightcontent span.name').text(app.name);
+			$('#rightcontent small.externalapp').text(app.internallabel);
+			if (app.version) {
+				$('#rightcontent span.version').text(app.version);
+			} else {
+				$('#rightcontent span.version').text('');
+			}
+			$('#rightcontent p.description').text(app.description);
+			$('#rightcontent img.preview').attr('src',app.preview);
+			$('#rightcontent small.externalapp').attr('style','visibility:visible');
+			$('#rightcontent span.author').text(app.author);
+			$('#rightcontent span.licence').text(app.licence);
+
+			$('#rightcontent input.enable').show();
+			$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
+			$('#rightcontent input.enable').data('appid',app.id);
+			$('#rightcontent input.enable').data('active',app.active);
+			if ( app.internal == false ) {
+				$('#rightcontent p.appslink').show();
+				$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
+			} else {
+				$('#rightcontent p.appslink').hide();
+			}
 		}
 		return false;
 	});
@@ -77,7 +120,7 @@ $(document).ready(function(){
 			}
 		}
 	});
-	
+
 	if(appid) {
 		var item = $('#leftcontent li[data-id="'+appid+'"]');
 		if(item) {
@@ -86,4 +129,6 @@ $(document).ready(function(){
 			$('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
 		}
 	}
+
+	OC.Settings.Apps.loadOCS();
 });
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 6edaf6c584..66350e5539 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -11,12 +11,13 @@
 </div>
 <ul id="leftcontent">
 	<?php foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>">
-		<a href="?appid=<?php echo $app['id'] ?>"><?php  echo htmlentities($app['name']) ?></a>
+	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
+		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
+		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
 		<span class="hidden">
 			<?php OC_JSON::encodedPrint($app,false) ?>
 		</span>
-		<?php  if(!$app['internal']) echo '<small class="externalapp">3rd party</small>' ?>
+		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
 	<?php endforeach;?>
 </ul>

From d19803654f4b728b17ae5f0f682ba7bd1d9f3953 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 4 Aug 2012 20:25:20 +0200
Subject: [PATCH 1256/1537] And add the file goddammit

---
 settings/ajax/apps/ocs.php | 65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 settings/ajax/apps/ocs.php

diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
new file mode 100644
index 0000000000..c7b6b22748
--- /dev/null
+++ b/settings/ajax/apps/ocs.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+OC_JSON::checkAdminUser();
+OC_JSON::callCheck();
+$l = OC_L10N::get('core');
+
+if(OC_Config::getValue('appstoreenabled', true)==false){
+	OCP\JSON::success(array('type' => 'external', 'data' => array()));
+}
+
+$enabledApps=OC_App::getEnabledApps();
+
+if(is_null($enabledApps)) {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Unable to load list from App Store'))));
+}
+
+$apps=array();
+
+// apps from external repo via OCS
+$catagoryNames=OC_OCSClient::getCategories();
+if(is_array($catagoryNames)){
+	$categories=array_keys($catagoryNames);
+	$page=0;
+	$externalApps=OC_OCSClient::getApplications($categories,$page);
+	foreach($externalApps as $app){
+		// show only external apps that aren't enabled yet
+		$local=false;
+		foreach($enabledApps as $a){
+			if($a['name'] == $app['name']) {
+				$local=true;
+			}
+		}
+
+		if(!$local) {
+			if($app['preview']=='') {
+				$pre='trans.png';
+			} else {
+				$pre=$app['preview'];
+			}
+			$apps[]=array(
+				'name'=>$app['name'],
+				'id'=>$app['id'],
+				'active'=>false,
+				'description'=>$app['description'],
+				'author'=>$app['personid'],
+				'license'=>$app['license'],
+				'preview'=>$pre,
+				'internal'=>false,
+				'internallabel'=>'3rd Party App',
+			);
+		}
+	}
+}
+
+OCP\JSON::success(array('type' => 'external', 'data' => $apps));
+

From e1d4f851022409d554eb5854affa41b319dbf501 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 4 Aug 2012 20:26:28 +0200
Subject: [PATCH 1257/1537] Wait with csrf check for now.

---
 settings/ajax/apps/ocs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index c7b6b22748..5a326c125f 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -10,7 +10,7 @@
 require_once('../../../lib/base.php');
 
 OC_JSON::checkAdminUser();
-OC_JSON::callCheck();
+
 $l = OC_L10N::get('core');
 
 if(OC_Config::getValue('appstoreenabled', true)==false){

From 84aa7c7b548db2a5aa7534ec61fc46cb2ac5dd3a Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sat, 4 Aug 2012 14:34:57 -0400
Subject: [PATCH 1258/1537] link of Add your app was broken

---
 settings/templates/apps.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 66350e5539..4f07875175 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -7,7 +7,7 @@
 	var appid = '<?php echo $_['appid']; ?>';
 </script>
 <div id="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev/writing-apps/"><?php echo $l->t('Add your App');?></a>
+	<a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a>
 </div>
 <ul id="leftcontent">
 	<?php foreach($_['apps'] as $app):?>

From f17876d093832c15f28e117e91e99efedbfb430a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 4 Aug 2012 20:51:26 +0200
Subject: [PATCH 1259/1537] Remove unused code.

---
 settings/apps.php | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/settings/apps.php b/settings/apps.php
index d34b646883..6feede7741 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -60,39 +60,6 @@ function app_sort($a, $b){
 }
 usort($apps, 'app_sort');
 
-/*
-// apps from external repo via OCS
- $catagoryNames=OC_OCSClient::getCategories();
- if(is_array($catagoryNames)){
- 	$categories=array_keys($catagoryNames);
-	$page=0;
- 	$externalApps=OC_OCSClient::getApplications($categories,$page);
- 	foreach($externalApps as $app){
-		// show only external apps that are not exist yet
-		$local=false;
- 		foreach($apps as $a){
-			if($a['name']==$app['name']) $local=true;
-		}
-
-		if(!$local) {
- 			if($app['preview']=='') $pre='trans.png'; else $pre=$app['preview'];
-	 		$apps[]=array(
- 				'name'=>$app['name'],
- 				'id'=>$app['id'],
- 				'active'=>false,
- 				'description'=>$app['description'],
- 				'author'=>$app['personid'],
- 				'license'=>$app['license'],
- 				'preview'=>$pre,
- 				'internal'=>false,
- 				'internallabel'=>'3rd Party App',
- 			);
-		}
- 	}
- }
-*/
-
-
 $tmpl = new OC_Template( "settings", "apps", "user" );
 $tmpl->assign('apps',$apps, false);
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');

From 3b37181550c822b4a06a05680cc184f2c1fb0c5f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 4 Aug 2012 21:25:03 +0200
Subject: [PATCH 1260/1537] Use correct variable name.

---
 lib/installer.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index a8b56cb34f..0c5fc41629 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -60,7 +60,7 @@ class OC_Installer{
 			OC_Log::write('core','No source specified when installing app',OC_Log::ERROR);
 			return false;
 		}
-		
+
 		//download the file if necesary
 		if($data['source']=='http'){
 			$path=OC_Helper::tmpFile();
@@ -76,7 +76,7 @@ class OC_Installer{
 			}
 			$path=$data['path'];
 		}
-		
+
 		//detect the archive type
 		$mime=OC_Helper::getMimeType($path);
 		if($mime=='application/zip'){
@@ -89,7 +89,7 @@ class OC_Installer{
 			OC_Log::write('core','Archives of type '.$mime.' are not supported',OC_Log::ERROR);
 			return false;
 		}
-		
+
 		//extract the archive in a temporary folder
 		$extractDir=OC_Helper::tmpFolder();
 		OC_Helper::rmdirr($extractDir);
@@ -104,7 +104,7 @@ class OC_Installer{
 			}
 			return false;
 		}
-	
+
 		//load the info.xml file of the app
 		if(!is_file($extractDir.'/appinfo/info.xml')){
 			//try to find it in a subdir
@@ -134,7 +134,7 @@ class OC_Installer{
 		}
 
 		// check if the app is compatible with this version of ownCloud
-		$version=OC_Util::getVersion();	
+		$version=OC_Util::getVersion();
 		if(!isset($info['require']) or ($version[0]>$info['require'])){
 			OC_Log::write('core','App can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 			OC_Helper::rmdirr($extractDir);
@@ -161,11 +161,11 @@ class OC_Installer{
 			}
 			return false;
 		}
-		
+
 		if(isset($data['pretent']) and $data['pretent']==true){
 			return false;
 		}
-		
+
 		//copy the app to the correct place
 		if(@!mkdir($basedir)){
 			OC_Log::write('core','Can\'t create app folder. Please fix permissions. ('.$basedir.')',OC_Log::ERROR);
@@ -176,34 +176,34 @@ class OC_Installer{
 			return false;
 		}
 		OC_Helper::copyr($extractDir,$basedir);
-		
+
 		//remove temporary files
 		OC_Helper::rmdirr($extractDir);
-		
+
 		//install the database
 		if(is_file($basedir.'/appinfo/database.xml')){
 			OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
 		}
-		
+
 		//run appinfo/install.php
 		if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')){
 			include($basedir.'/appinfo/install.php');
 		}
-		
+
 		//set the installed version
 		OC_Appconfig::setValue($info['id'],'installed_version',OC_App::getAppVersion($info['id']));
 		OC_Appconfig::setValue($info['id'],'enabled','no');
 
 		//set remote/public handelers
 		foreach($info['remote'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $app.'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
 		foreach($info['public'] as $name=>$path){
-			OCP\CONFIG::setAppValue('core', 'public_'.$name, $app.'/'.$path);
+			OCP\CONFIG::setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);
-		
+
 		return $info['id'];
 	}
 
@@ -324,7 +324,7 @@ class OC_Installer{
 		}
 		$info=OC_App::getAppInfo($app);
 		OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));
-		
+
 		//set remote/public handelers
 		foreach($info['remote'] as $name=>$path){
 			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $app.'/'.$path);
@@ -332,9 +332,9 @@ class OC_Installer{
 		foreach($info['public'] as $name=>$path){
 			OCP\CONFIG::setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
-		
+
 		OC_App::setAppTypes($info['id']);
-		
+
 		return $info;
 	}
 
@@ -355,7 +355,7 @@ class OC_Installer{
 		);
 
 		// is the code checker enabled?
-		if(OC_Config::getValue('appcodechecker', false)){   
+		if(OC_Config::getValue('appcodechecker', false)){
 
 			// check if grep is installed
 			$grep = exec('which grep');
@@ -375,7 +375,7 @@ class OC_Installer{
 				}
 			}
 			return true;
-			
+
 		}else{
 			return true;
 		}

From 207ca3ec06f642477632c3b79ed50820cf3d324a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 4 Aug 2012 15:50:10 -0400
Subject: [PATCH 1261/1537] Dynamically resize breadcrumbs, fix for bug oc-468

---
 apps/files/js/files.js | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a4e2361fee..d003dab3dd 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -533,6 +533,65 @@ $(document).ready(function() {
 			scanFiles();
 		}
 	}, "json");
+	
+	var lastWidth = 0;
+	var breadcrumbs = [];
+	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth + $('#controls .actions').get(0).offsetWidth;
+	var hiddenBreadcrumbs = 0;
+
+	$.each($('.crumb'), function(index, breadcrumb) {
+		breadcrumbs[index] = breadcrumb;
+		breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
+	});
+
+	function resizeBreadcrumbs(firstRun) {
+		var width = $(this).width();
+		if (width != lastWidth) {
+			if (width < lastWidth || firstRun && width < breadcrumbsWidth) {
+				if (hiddenBreadcrumbs == 0) {
+					breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
+					$(breadcrumbs[1]).find('a').hide();
+					$(breadcrumbs[1]).append('<span>...</span>');
+					breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
+					hiddenBreadcrumbs = 2;
+				}
+				var i = hiddenBreadcrumbs;
+				while (width < breadcrumbsWidth && i > 1 && i < breadcrumbs.length - 1) {
+					breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
+					$(breadcrumbs[i]).hide();
+					hiddenBreadcrumbs = i;
+					i++
+				}
+			} else if (width > lastWidth && hiddenBreadcrumbs > 0) {
+				var i = hiddenBreadcrumbs;
+				while (width > breadcrumbsWidth && i > 0) {
+					if (hiddenBreadcrumbs == 1) {
+						breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
+						$(breadcrumbs[1]).find('span').remove();
+						$(breadcrumbs[1]).find('a').show();
+						breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
+					} else {
+						$(breadcrumbs[i]).show();
+						breadcrumbsWidth += $(breadcrumbs[i]).get(0).offsetWidth;
+						if (breadcrumbsWidth > width) {
+							breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
+							$(breadcrumbs[i]).hide();
+							break;
+						}
+					}
+					i--;
+					hiddenBreadcrumbs = i;
+				}
+			}
+			lastWidth = width;
+		}
+	}
+
+	$(window).resize(function() {
+		resizeBreadcrumbs(false);
+	});
+	
+	resizeBreadcrumbs(true);
 });
 
 function scanFiles(force,dir){

From 086397d8a18391823e223eeee23e6ef04350b354 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 4 Aug 2012 15:57:49 -0400
Subject: [PATCH 1262/1537] Fix condition checking for resizing breadcrumbs

---
 apps/files/js/files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index d003dab3dd..1b51b0e5df 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -547,7 +547,7 @@ $(document).ready(function() {
 	function resizeBreadcrumbs(firstRun) {
 		var width = $(this).width();
 		if (width != lastWidth) {
-			if (width < lastWidth || firstRun && width < breadcrumbsWidth) {
+			if ((width < lastWidth || firstRun) && width < breadcrumbsWidth) {
 				if (hiddenBreadcrumbs == 0) {
 					breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
 					$(breadcrumbs[1]).find('a').hide();

From 002ad4ba16eb6cd0b2131f012b1a0a8b6b0b777f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 4 Aug 2012 16:44:26 -0400
Subject: [PATCH 1263/1537] Tweak users delete notification

---
 apps/files/css/files.css | 3 +--
 core/css/styles.css      | 1 +
 settings/js/users.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 317c0b8a1e..7298a7ef6e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -88,5 +88,4 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
 #navigation>ul>li:first-child+li { padding-top:2.9em; }
 
-#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
-#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
\ No newline at end of file
+#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
\ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index d032dcab2e..52d6373d4e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -109,6 +109,7 @@ label.infield { cursor: text !important; }
 .center { text-align: center; }
 
 #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; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 79c95b3729..43b726fbfc 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -27,7 +27,7 @@ UserList={
 		$('tr').filterAttr( 'data-uid', UserList.deleteUid ).hide();
 		
 		// Provide user with option to undo
-		$('#notification').text(t('files','undo delete user'));
+		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
 		$('#notification').data('deleteuser',true);
 		$('#notification').fadeIn();
 			

From 1ec27399a748e01b74aef6b3781e4da52214faba Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 4 Aug 2012 17:00:16 -0400
Subject: [PATCH 1264/1537] Show delete tipsy for users

---
 settings/css/settings.css    | 6 +++---
 settings/js/users.js         | 2 +-
 settings/templates/users.php | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index e79029ddbf..7bd7d5f7f0 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -22,14 +22,14 @@ form { display:inline; }
 table:not(.nostyle) th { height:2em; color:#999; }
 table:not(.nostyle) th, table:not(.nostyle) td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
 td.name, td.password { padding-left:.8em; }
-td.password>img, td.remove>img, td.quota>img { visibility:hidden; }
+td.password>img, td.remove>a, td.quota>img { visibility:hidden; }
 td.password, td.quota { width:12em; cursor:pointer; }
 td.password>span, td.quota>span { margin-right: 1.2em; color: #C7C7C7; }
 
 td.remove { width:1em; padding-right:1em; }
 tr:hover>td.password>span { margin:0; cursor:pointer; }
-tr:hover>td.remove>img, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
-tr:hover>td.remove>img { float:right; }
+tr:hover>td.remove>a, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
+tr:hover>td.remove>a { float:right; }
 li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 43b726fbfc..a6b1b65997 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -170,7 +170,7 @@ $(document).ready(function(){
 		applyMultiplySelect($(element));
 	});
 	
-	$('td.remove>img').live('click',function(event){
+	$('td.remove>a').live('click',function(event){
 		
 		var uid = $(this).parent().parent().data('uid');
 		
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 9b64696547..d8200bf202 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -141,9 +141,12 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 					</select> <input class='quota-other'></input>
 				</div>
 			</td>
-			<td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
-				alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
-				src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
+			<td class="remove">
+				<?php if($user['name']!=OC_User::getUser()):?> 
+					<a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>">
+						<img src="<?php echo image_path('core','actions/delete.svg') ?>" />
+					</a>
+				<?php endif;?>
 			</td>
 		</tr>
 		<?php endforeach; ?>

From f95ca36b499473bb93ad0ce77ae7c56cdf57cacf Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 4 Aug 2012 17:03:36 -0400
Subject: [PATCH 1265/1537] Listen to correct undo click for undoing deleting
 users

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index a6b1b65997..5a3820b74d 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -342,7 +342,7 @@ $(document).ready(function(){
 	});
 	// Handle undo notifications
 	$('#notification').hide();
-	$('#notification').click(function(){
+	$('#notification .undo').live('click', function() {
 		if($('#notification').data('deleteuser'))
 		{
 			$( 'tr' ).filterAttr( 'data-uid', UserList.deleteUid ).show();

From 97853a1ae57a945c5951781af333f7c4139aeec4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 4 Aug 2012 23:48:09 +0200
Subject: [PATCH 1266/1537] Restructure JS code and small fixes.

---
 settings/js/apps.js | 118 +++++++++++++++++++++++---------------------
 1 file changed, 63 insertions(+), 55 deletions(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 3f6ff66c6d..cfddf4a48a 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -19,11 +19,68 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			}
 		});
 	},
+	loadApp:function(app) {
+		var page = $('#rightcontent');
+		page.find('p.license').show();
+		page.find('span.name').text(app.name);
+		page.find('small.externalapp').text(app.internallabel);
+		if (app.version) {
+			page.find('span.version').text(app.version);
+		} else {
+			page.find('span.version').text('');
+		}
+		page.find('p.description').text(app.description);
+		page.find('img.preview').attr('src', app.preview);
+		page.find('small.externalapp').attr('style', 'visibility:visible');
+		page.find('span.author').text(app.author);
+		page.find('span.licence').text(app.licence);
+
+		page.find('input.enable').show();
+		page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable'));
+		page.find('input.enable').data('appid', app.id);
+		page.find('input.enable').data('active', app.active);
+		if (app.internal == false) {
+			page.find('p.appslink').show();
+			page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
+		} else {
+			page.find('p.appslink').hide();
+		}
+	},
+	enableApp:function(appid, active, element) {
+		console.log('enableApp:', appid, active, element);
+		var appitem=$('#leftcontent li[data-id="'+appid+'"]');
+		appData = appitem.data('app');
+		appData.active = !active;
+		appitem.data('app', appData);
+		if(active) {
+			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
+				if(!result || result.status!='success') {
+					OC.dialogs.alert('Error while disabling app','Error');
+				}
+				else {
+					element.data('active',false);
+					element.val(t('settings','Enable'));
+				}
+			},'json');
+			$('#leftcontent li[data-id="'+appid+'"]').removeClass('active');
+		} else {
+			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
+				if(!result || result.status!='success') {
+					OC.dialogs.alert('Error while enabling app','Error');
+				}
+				else {
+					element.data('active',true);
+					element.val(t('settings','Disable'));
+				}
+			},'json');
+			$('#leftcontent li[data-id="'+appid+'"]').addClass('active');
+		}
+	},
 	insertApp:function(appdata) {
 		var applist = $('#leftcontent li');
 		var app =
-				$('<li data-id="'+appdata.id+'" data-type="external" data-installed="0">'
-				+ '<a class="app externalapp" href="'+OC.filePath('settings', 'apps', 'index.php')+'&appid=' + appdata.id+'">'
+				$('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">'
+				+ '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">'
 				+ appdata.name+'</a><small class="externalapp list">3rd party</small></li>');
 		app.data('app', appdata);
 		var added = false;
@@ -59,65 +116,16 @@ $(document).ready(function(){
 		if (tgt.is('li') || tgt.is('a')) {
 			var item = tgt.is('li') ? $(tgt) : $(tgt).parent();
 			var app = item.data('app');
-			$('#rightcontent p.license').show();
-			$('#rightcontent span.name').text(app.name);
-			$('#rightcontent small.externalapp').text(app.internallabel);
-			if (app.version) {
-				$('#rightcontent span.version').text(app.version);
-			} else {
-				$('#rightcontent span.version').text('');
-			}
-			$('#rightcontent p.description').text(app.description);
-			$('#rightcontent img.preview').attr('src',app.preview);
-			$('#rightcontent small.externalapp').attr('style','visibility:visible');
-			$('#rightcontent span.author').text(app.author);
-			$('#rightcontent span.licence').text(app.licence);
-
-			$('#rightcontent input.enable').show();
-			$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
-			$('#rightcontent input.enable').data('appid',app.id);
-			$('#rightcontent input.enable').data('active',app.active);
-			if ( app.internal == false ) {
-				$('#rightcontent p.appslink').show();
-				$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
-			} else {
-				$('#rightcontent p.appslink').hide();
-			}
+			OC.Settings.Apps.loadApp(app);
 		}
 		return false;
 	});
 	$('#rightcontent input.enable').click(function(){
 		var element = $(this);
-		var app=$(this).data('appid');
+		var appid=$(this).data('appid');
 		var active=$(this).data('active');
-		if(app){
-			if(active){
-				$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){
-					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error while disabling app','Error');
-					}
-					else {
-						element.data('active',false);
-						element.val(t('settings','Enable'));
-						var appData=$('#leftcontent li[data-id="'+app+'"]');
-						appData.active=false;
-					}
-				},'json');
-				$('#leftcontent li[data-id="'+app+'"]').removeClass('active');
-			}else{
-				$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){
-					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error while enabling app','Error');
-					}
-					else {
-						element.data('active',true);
-						element.val(t('settings','Disable'));
-						var appData=$('#leftcontent li[data-id="'+app+'"]');
-						appData.active=true;
-					}
-				},'json');
-				$('#leftcontent li[data-id="'+app+'"]').addClass('active');
-			}
+		if(appid) {
+			OC.Settings.Apps.enableApp(appid, active, element);
 		}
 	});
 

From 538e72fe61fe4a9e5b5cc9f3927b749c69f715a1 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 4 Aug 2012 23:30:28 +0000
Subject: [PATCH 1267/1537] Fix scrollbar issue. Fixes oc-1414

---
 core/css/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 52d6373d4e..7e79a66fb4 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; }

From cc445e4e477944a680bb19919cbfd0330d0f7851 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 01:40:19 +0200
Subject: [PATCH 1268/1537] Small changes to allow updating main menu
 dynamically.

---
 core/templates/layout.user.php |  2 +-
 lib/app.php                    | 11 ++++++-----
 lib/installer.php              |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index dc303ffc1a..2abe4da853 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -55,7 +55,7 @@
 		<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/lib/app.php b/lib/app.php
index 2e9ec4d630..1c91818ca7 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -183,7 +183,7 @@ class OC_App{
 		if(!OC_Installer::isInstalled($app)){
 			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
 			if(!is_numeric($app)){
-				OC_Installer::installShippedApp($app);
+				$app = OC_Installer::installShippedApp($app);
 			}else{
 				$download=OC_OCSClient::getApplicationDownload($app,1);
 				if(isset($download['downloadlink']) and $download['downloadlink']!='') {
@@ -205,6 +205,7 @@ class OC_App{
 		}else{
 			return false;
 		}
+		return $app;
 	}
 
 	/**
@@ -292,19 +293,19 @@ class OC_App{
 		if (OC_User::isLoggedIn()) {
 			// personal menu
 			$settings[] = array( "id" => "personal", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ));
-			
+
 			// if there're some settings forms
 			if(!empty(self::$settingsForms))
 				// settings menu
 				$settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "settings.php" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
-			
+
 			//SubAdmins are also allowed to access user management
 			if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
 				// admin users menu
 				$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
 			}
-			
-			
+
+
 			// if the user is an admin
 			if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
 				// admin apps menu
diff --git a/lib/installer.php b/lib/installer.php
index 0c5fc41629..b8a3226aa0 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -335,7 +335,7 @@ class OC_Installer{
 
 		OC_App::setAppTypes($info['id']);
 
-		return $info;
+		return $info['id'];
 	}
 
 

From c6b337c3ddd5c649ba873240242c8678c756c058 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 01:41:24 +0200
Subject: [PATCH 1269/1537] Return possibly changed appid.

---
 settings/ajax/enableapp.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index bd53a50210..fe3922fa02 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -6,8 +6,9 @@ OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
 
-if(OC_App::enable($_POST['appid'])){
-	OC_JSON::success();
-}else{
+$appid = OC_App::enable($_POST['appid']);
+if($appid !== false) {
+	OC_JSON::success(array('data' => array('appid' => $appid)));
+} else {
 	OC_JSON::error();
 }

From ce866a5bdbc7aaee31a3758df2faf6c9c7434189 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 01:41:55 +0200
Subject: [PATCH 1270/1537] CSS tweaks for app settings.

---
 settings/css/settings.css   | 13 ++++++++-----
 settings/templates/apps.php |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 7bd7d5f7f0..2ce79b68ec 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -43,14 +43,17 @@ div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
 
 /* APPS */
-li { color:#888; white-space: nowrap; }
+.appinfo { margin: 1em; }
+h3 { font-size: 1.4em; font-weight: bold; }
+ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; }
+li { color:#888; }
 li.active { color:#000; }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size:6pt; padding:4px; border-radius: 4px;}
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 2px; border-radius: 4px;}
 small.externalapp.list { float: right; }
-span.version { margin-left:3em; color:#ddd; }
+span.version { margin-left:3em; margin-right:3em; color:#555; }
 
-.app { position: relative; display: inline-block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; z-index: 100; transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear; }
-.app.externalapp { max-width: 10em; }
+.app { position: relative; display: inline-block; padding: 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; z-index: 100; transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear; }
+.app.externalapp { max-width: 12em; }
 /* Transition to complete width! */
 .app:hover, .app:active { max-width: inherit; }
 
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 4f07875175..83d63b6b41 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -9,7 +9,7 @@
 <div id="controls">
 	<a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a>
 </div>
-<ul id="leftcontent">
+<ul id="leftcontent" class="applist">
 	<?php foreach($_['apps'] as $app):?>
 	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
 		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
@@ -22,10 +22,12 @@
 	<?php endforeach;?>
 </ul>
 <div id="rightcontent">
+	<div class="appinfo">
 	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<p class="description"></p>
 	<img src="" class="preview" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
 	<p class="license hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
 	<input class="enable hidden" type="submit" />
+	</div>
 </div>

From a138b4d04e74eff3044519b88eb2123934c577cf Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 01:57:13 +0200
Subject: [PATCH 1271/1537] Some more pixel pushing.

---
 settings/css/settings.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2ce79b68ec..f73e3e7734 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -52,8 +52,8 @@ small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-si
 small.externalapp.list { float: right; }
 span.version { margin-left:3em; margin-right:3em; color:#555; }
 
-.app { position: relative; display: inline-block; padding: 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; z-index: 100; transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear; }
-.app.externalapp { max-width: 12em; }
+.app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ }
+.app.externalapp { max-width: 12.5em; z-index: 100; }
 /* Transition to complete width! */
 .app:hover, .app:active { max-width: inherit; }
 

From 07fd517fdacdb250c816f7a75e28df84a40c4a00 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 02:54:18 +0200
Subject: [PATCH 1272/1537] Make 3rd party label a bit smaller.

---
 settings/css/settings.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index f73e3e7734..373b15bff6 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -48,7 +48,7 @@ h3 { font-size: 1.4em; font-weight: bold; }
 ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; }
 li { color:#888; }
 li.active { color:#000; }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 2px; border-radius: 4px;}
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
 small.externalapp.list { float: right; }
 span.version { margin-left:3em; margin-right:3em; color:#555; }
 

From 80ca883d4cdf70e74e3a3317d370221193216700 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 03:36:16 +0200
Subject: [PATCH 1273/1537] Correct path to ajax file.

---
 apps/contacts/ajax/contact/details.php | 6 +++---
 apps/contacts/js/contacts.js           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
index 27d7611ade..0e07f9ec3d 100644
--- a/apps/contacts/ajax/contact/details.php
+++ b/apps/contacts/ajax/contact/details.php
@@ -19,8 +19,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
- 
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
@@ -31,7 +31,7 @@ if(is_null($id)) {
 	bailOut(OC_Contacts_App::$l10n->t('Missing ID'));
 }
 $card = OC_Contacts_VCard::find($id);
-$vcard = OC_Contacts_App::getContactVCard( $id );
+$vcard = OC_VObject::parse($card['carddata']);
 if(is_null($vcard)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
 }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 0b4a3c0a54..9aec02557f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -348,7 +348,7 @@ OC.Contacts={
 			console.log('newid: ' + newid + ' bookid: ' +bookid);
 			var localLoadContact = function(newid, bookid) {
 				if($('.contacts li').length > 0) {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
+					$.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':newid},function(jsondata){
 						if(jsondata.status == 'success'){
 							if(bookid == 'unknown') {
 								bookid = jsondata.data.addressbookid;
@@ -1783,7 +1783,7 @@ $(document).ready(function(){
 					$('#contacts h3[data-id="'+bookid+'"]').addClass('active');
 				}
 			}
-			$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':id},function(jsondata){
 				if(jsondata.status == 'success'){
 					OC.Contacts.Card.loadContact(jsondata.data, bookid);
 				}

From 6fbc4f712a118bba199db8e154722325e1ba414c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 5 Aug 2012 19:02:23 +0200
Subject: [PATCH 1274/1537] [tx-robot] updated from transifex

---
 l10n/af/settings.po          | 28 ++++++++++++++--------
 l10n/ar/settings.po          | 28 ++++++++++++++--------
 l10n/ar_SA/settings.po       | 28 ++++++++++++++--------
 l10n/bg_BG/settings.po       | 28 ++++++++++++++--------
 l10n/ca/settings.po          | 28 ++++++++++++++--------
 l10n/cs_CZ/settings.po       | 28 ++++++++++++++--------
 l10n/da/settings.po          | 28 ++++++++++++++--------
 l10n/de/settings.po          | 28 ++++++++++++++--------
 l10n/el/settings.po          | 28 ++++++++++++++--------
 l10n/eo/settings.po          | 32 +++++++++++++++----------
 l10n/es/settings.po          | 28 ++++++++++++++--------
 l10n/et_EE/settings.po       | 28 ++++++++++++++--------
 l10n/eu/settings.po          | 28 ++++++++++++++--------
 l10n/eu_ES/settings.po       | 28 ++++++++++++++--------
 l10n/fa/settings.po          | 28 ++++++++++++++--------
 l10n/fi_FI/settings.po       | 28 ++++++++++++++--------
 l10n/fr/settings.po          | 28 ++++++++++++++--------
 l10n/gl/settings.po          | 28 ++++++++++++++--------
 l10n/he/settings.po          | 28 ++++++++++++++--------
 l10n/hr/settings.po          | 28 ++++++++++++++--------
 l10n/hu_HU/settings.po       | 28 ++++++++++++++--------
 l10n/hy/settings.po          | 28 ++++++++++++++--------
 l10n/ia/settings.po          | 28 ++++++++++++++--------
 l10n/id/settings.po          | 28 ++++++++++++++--------
 l10n/id_ID/settings.po       | 28 ++++++++++++++--------
 l10n/it/settings.po          | 28 ++++++++++++++--------
 l10n/ja_JP/settings.po       | 28 ++++++++++++++--------
 l10n/ko/settings.po          | 28 ++++++++++++++--------
 l10n/lb/settings.po          | 28 ++++++++++++++--------
 l10n/lt_LT/settings.po       | 28 ++++++++++++++--------
 l10n/lv/settings.po          | 28 ++++++++++++++--------
 l10n/mk/settings.po          | 28 ++++++++++++++--------
 l10n/ms_MY/settings.po       | 46 +++++++++++++++++++++---------------
 l10n/nb_NO/settings.po       | 28 ++++++++++++++--------
 l10n/nl/settings.po          | 28 ++++++++++++++--------
 l10n/nn_NO/settings.po       | 28 ++++++++++++++--------
 l10n/pl/settings.po          | 28 ++++++++++++++--------
 l10n/pt_BR/settings.po       | 28 ++++++++++++++--------
 l10n/pt_PT/settings.po       | 28 ++++++++++++++--------
 l10n/ro/settings.po          | 28 ++++++++++++++--------
 l10n/ru/settings.po          | 28 ++++++++++++++--------
 l10n/sk_SK/settings.po       | 28 ++++++++++++++--------
 l10n/sl/settings.po          | 28 ++++++++++++++--------
 l10n/so/settings.po          | 28 ++++++++++++++--------
 l10n/sr/settings.po          | 28 ++++++++++++++--------
 l10n/sr@latin/settings.po    | 28 ++++++++++++++--------
 l10n/sv/settings.po          | 28 ++++++++++++++--------
 l10n/templates/bookmarks.pot |  2 +-
 l10n/templates/calendar.pot  |  2 +-
 l10n/templates/contacts.pot  |  2 +-
 l10n/templates/core.pot      |  2 +-
 l10n/templates/files.pot     | 14 +++++------
 l10n/templates/gallery.pot   |  2 +-
 l10n/templates/lib.pot       | 14 +++++------
 l10n/templates/media.pot     |  2 +-
 l10n/templates/settings.pot  | 26 +++++++++++++-------
 l10n/th_TH/settings.po       | 28 ++++++++++++++--------
 l10n/tr/settings.po          | 28 ++++++++++++++--------
 l10n/uk/settings.po          | 28 ++++++++++++++--------
 l10n/vi/settings.po          | 28 ++++++++++++++--------
 l10n/zh_CN/settings.po       | 28 ++++++++++++++--------
 l10n/zh_TW/settings.po       | 28 ++++++++++++++--------
 settings/l10n/eo.php         |  1 +
 settings/l10n/ms_MY.php      | 15 +++++++-----
 64 files changed, 1012 insertions(+), 576 deletions(-)

diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 3b7b6ab272..0e2a8d0e2f 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index ec5ea40447..a1a0699c38 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -75,19 +83,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-مسجل"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "من قبل"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "حصه"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "حذف"
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 97403dbc3c..0d745bafa6 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index ef69b440c9..207c9d4e86 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Е-пощата е записана"
@@ -44,11 +48,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Езика е сменен"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Изключване"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Включване"
 
@@ -68,7 +76,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -76,19 +84,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Изберете програма"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-лицензирано"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "от"
 
@@ -212,6 +220,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 63756ed863..0909e05d48 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "S'ha desat el correu electrònic"
@@ -43,11 +47,15 @@ msgstr "Error d'autenticació"
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Activa"
 
@@ -67,7 +75,7 @@ msgstr "Avís de seguretat"
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Més"
 
@@ -75,19 +83,19 @@ msgstr "Més"
 msgid "Add your App"
 msgstr "Afegeiu la vostra aplicació"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "- amb llicència"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "de"
 
@@ -211,6 +219,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 6b10067fe4..016e71bd72 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,10 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail uložen"
@@ -46,11 +50,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Vypnout"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Zapnout"
 
@@ -70,7 +78,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Více"
 
@@ -78,19 +86,19 @@ msgstr "Více"
 msgid "Add your App"
 msgstr "Přidat vaší aplikaci"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencováno"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "podle"
 
@@ -214,6 +222,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Vymazat"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 4f4826be77..fe5deff0c7 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email adresse gemt"
@@ -47,11 +51,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Sprog ændret"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -71,7 +79,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mere"
 
@@ -79,19 +87,19 @@ msgstr "Mere"
 msgid "Add your App"
 msgstr "Tilføj din App"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Vælg en App"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side på apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licenseret"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "af"
 
@@ -215,6 +223,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Slet"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 7fa8d58e35..4525a95c34 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -25,6 +25,10 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-Mail gespeichert"
@@ -49,11 +53,15 @@ msgstr "Anmeldungsfehler"
 msgid "Language changed"
 msgstr "Sprache geändert"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -73,7 +81,7 @@ msgstr "Sicherheitshinweis"
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mehr"
 
@@ -81,19 +89,19 @@ msgstr "Mehr"
 msgid "Add your App"
 msgstr "Füge deine App hinzu"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen auf apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-lizenziert"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "von"
 
@@ -217,6 +225,6 @@ msgstr "Unteradministrator"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index d0a70f2928..f0ece524c3 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Το Email αποθηκεύτηκε "
@@ -47,11 +51,15 @@ msgstr "Σφάλμα πιστοποίησης"
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
@@ -71,7 +79,7 @@ msgstr "Προειδοποίηση Ασφαλείας"
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Περισσότερο"
 
@@ -79,19 +87,19 @@ msgstr "Περισσότερο"
 msgid "Add your App"
 msgstr "Πρόσθεσε τη δικιά σου εφαρμογή "
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Επιλέξτε μια εφαρμογή"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Η σελίδα εφαρμογών στο apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-με άδεια"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "από"
 
@@ -215,6 +223,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Σύνολο χώρου"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index ef49020b23..19ee661a93 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 22:28+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "La retpoŝtadreso konserviĝis"
@@ -43,11 +47,15 @@ msgstr "Aŭtentiga eraro"
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Malkapabligi"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Kapabligi"
 
@@ -67,7 +75,7 @@ msgstr "Sekureca averto"
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Pli"
 
@@ -75,19 +83,19 @@ msgstr "Pli"
 msgid "Add your App"
 msgstr "Aldonu vian aplikaĵon"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-permesila"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "de"
 
@@ -205,12 +213,12 @@ msgstr "Alia"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "Subadministranto"
 
 #: templates/users.php:82
 msgid "Quota"
 msgstr "Kvoto"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 37d1b2e534..8c089dee77 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Correo salvado"
@@ -48,11 +52,15 @@ msgstr "Error de autenticación"
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Activar"
 
@@ -72,7 +80,7 @@ msgstr "Advertencia de seguridad"
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Más"
 
@@ -80,19 +88,19 @@ msgstr "Más"
 msgid "Add your App"
 msgstr "Añade tu aplicación"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Revisa la web de apps apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-autorizado"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "por"
 
@@ -216,6 +224,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Cuota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 56a6b7f20a..0c380a399f 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Kiri on salvestatud"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Lülita välja"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Lülita sisse"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Veel"
 
@@ -75,19 +83,19 @@ msgstr "Veel"
 msgid "Add your App"
 msgstr "Lisa oma rakendus"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-litsenseeritud"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "kelle poolt"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Mahupiir"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index eda83576c6..89f2191352 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Eposta gorde da"
@@ -44,11 +48,15 @@ msgstr "Autentifikazio errorea"
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Ez-gaitu"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Gaitu"
 
@@ -68,7 +76,7 @@ msgstr "Segurtasun abisua"
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Gehiago"
 
@@ -76,19 +84,19 @@ msgstr "Gehiago"
 msgid "Add your App"
 msgstr "Gehitu zure aplikazioa"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "lizentziarekin"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr " Egilea:"
 
@@ -212,6 +220,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 8b8dcb1934..571fd1f6aa 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 6ccc6f4586..a1f86934a1 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "ایمیل ذخیره شد"
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "زبان تغییر کرد"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "غیرفعال"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "فعال"
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "بیشتر"
 
@@ -74,19 +82,19 @@ msgstr "بیشتر"
 msgid "Add your App"
 msgstr "برنامه خود را بیافزایید"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "مجوزنامه"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "به وسیله"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr "سهم"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "پاک کردن"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 012ddb1408..5707523ef2 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Sähköposti tallennettu"
@@ -43,11 +47,15 @@ msgstr "Todennusvirhe"
 msgid "Language changed"
 msgstr "Kieli on vaihdettu"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Käytä"
 
@@ -67,7 +75,7 @@ msgstr "Turvallisuusvaroitus"
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Lisää"
 
@@ -75,19 +83,19 @@ msgstr "Lisää"
 msgid "Add your App"
 msgstr "Lisää ohjelmasi"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Valitse ohjelma"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-lisenssöity"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "henkilölle"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kiintiö"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Poista"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ad7a053a98..83d634ef52 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail sauvegardé"
@@ -48,11 +52,15 @@ msgstr "Erreur d'authentification"
 msgid "Language changed"
 msgstr "Langue changée"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Désactiver"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Activer"
 
@@ -72,7 +80,7 @@ msgstr "Alertes de sécurité"
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Plus"
 
@@ -80,19 +88,19 @@ msgstr "Plus"
 msgid "Add your App"
 msgstr "Ajoutez votre application"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Sélectionner une Application"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "sous licence"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "par"
 
@@ -216,6 +224,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 2248d0b031..450e65227e 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Correo electrónico gardado"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "O idioma mudou"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Máis"
 
@@ -75,19 +83,19 @@ msgstr "Máis"
 msgid "Add your App"
 msgstr "Engade o teu aplicativo"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Escolla un Aplicativo"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Vexa a páxina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "por"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Borrar"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 17af884c07..5f4a6fa767 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "הדוא״ל נשמר"
@@ -44,11 +48,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "בטל"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "הפעל"
 
@@ -68,7 +76,7 @@ msgstr ""
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "עוד"
 
@@ -76,19 +84,19 @@ msgstr "עוד"
 msgid "Add your App"
 msgstr "הוספת היישום שלך"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "בחירת יישום"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "צפה בעמוד הישום ב apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "רשיון"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "מאת"
 
@@ -212,6 +220,6 @@ msgstr ""
 msgid "Quota"
 msgstr "מכסה"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "מחיקה"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 01ae9d7ee9..3f40b533f1 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email spremljen"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Isključi"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Uključi"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "više"
 
@@ -75,19 +83,19 @@ msgstr "više"
 msgid "Add your App"
 msgstr "Dodajte vašu aplikaciju"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencirano"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "od"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "kvota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 47d040cef6..390d35e4ff 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email mentve"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Letiltás"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Engedélyezés"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Tovább"
 
@@ -75,19 +83,19 @@ msgstr "Tovább"
 msgid "Add your App"
 msgstr "App hozzáadása"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Egy App kiválasztása"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencelt"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ":"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 1d18d1b9fd..fb9bab31e2 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 17d5ea3782..b744d1ffd5 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Plus"
 
@@ -75,19 +83,19 @@ msgstr "Plus"
 msgid "Add your App"
 msgstr "Adder tu application"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Selectionar un app"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "per"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index ab9bd79354..50b3899314 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Lebih"
 
@@ -75,19 +83,19 @@ msgstr "Lebih"
 msgid "Add your App"
 msgstr "Tambahkan App anda"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Pilih satu aplikasi"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-terlisensi"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "oleh"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Hapus"
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index c8cf7eb0de..c011c4ea26 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index c31a629ac4..650c932831 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email salvata"
@@ -48,11 +52,15 @@ msgstr "Errore di autenticazione"
 msgid "Language changed"
 msgstr "Lingua modificata"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Disabilita"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Abilita"
 
@@ -72,7 +80,7 @@ msgstr "Avviso di sicurezza"
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Altro"
 
@@ -80,19 +88,19 @@ msgstr "Altro"
 msgid "Add your App"
 msgstr "Aggiungi la tua applicazione"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-rilasciato"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "da"
 
@@ -216,6 +224,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quote"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index d489889001..19a81081e0 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "メールアドレスを保存しました"
@@ -42,11 +46,15 @@ msgstr "認証エラー"
 msgid "Language changed"
 msgstr "言語が変更されました"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "無効"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "有効"
 
@@ -66,7 +74,7 @@ msgstr "セキュリティ警告"
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "もっと"
 
@@ -74,19 +82,19 @@ msgstr "もっと"
 msgid "Add your App"
 msgstr "アプリを追加"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com でアプリケーションのページを見てください"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "ライセンス"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "@"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr "クオータ"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "削除"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 80fd886732..f14b9d6354 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "이메일 저장"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "언어가 변경되었습니다"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "비활성화"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "활성화"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "더"
 
@@ -75,19 +83,19 @@ msgstr "더"
 msgid "Add your App"
 msgstr "앱 추가"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "프로그램 선택"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "application page at apps.owncloud.com을 보시오."
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr " 라이선스 사용"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr " by "
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "할당량"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 0d5bf0ad10..1209e68515 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Méi"
 
@@ -74,19 +82,19 @@ msgstr "Méi"
 msgid "Add your App"
 msgstr "Setz deng App bei"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-Lizenséiert"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "vun"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Läschen"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index d0f1fd4488..d62529df1f 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Išjungti"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Įjungti"
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Daugiau"
 
@@ -74,19 +82,19 @@ msgstr "Daugiau"
 msgid "Add your App"
 msgstr "Pridėti programėlę"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencijuota"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Limitas"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 03f11cf4f6..fffeb8f3be 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Epasts tika saglabāts"
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Valoda tika nomainīta"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Atvienot"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Pievienot"
 
@@ -66,7 +74,7 @@ msgstr "Brīdinājums par drošību"
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Vairāk"
 
@@ -74,19 +82,19 @@ msgstr "Vairāk"
 msgid "Add your App"
 msgstr "Pievieno savu aplikāciju"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Izvēlies aplikāciju"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Apskatie aplikāciju lapu - apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "licenzēts"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "no"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Apjoms"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Izdzēst"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 45521a471d..706ddbc2b4 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Електронската пошта е снимена"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Јазикот е сменет"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Оневозможи"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Овозможи"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Повеќе"
 
@@ -75,19 +83,19 @@ msgstr "Повеќе"
 msgid "Add your App"
 msgstr "Додадете ја Вашата апликација"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Избери аппликација"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Види ја страницата со апликации на apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licensed"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "од"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index ef9fb19e53..1cb2d9244c 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Emel disimpan"
@@ -31,7 +35,7 @@ msgstr "Emel tidak sah"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
-msgstr "OpenID ditukar"
+msgstr "OpenID diubah"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
@@ -39,17 +43,21 @@ msgstr "Permintaan tidak sah"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Ralat pengesahan"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
-msgstr "Bahasa ditukar"
+msgstr "Bahasa diubah"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Nyahaktif"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Aktif"
 
@@ -63,13 +71,13 @@ msgstr "_nama_bahasa_"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Amaran keselamatan"
 
 #: templates/admin.php:28
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Lanjutan"
 
@@ -77,19 +85,19 @@ msgstr "Lanjutan"
 msgid "Add your App"
 msgstr "Tambah apps anda"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Pilih aplikasi"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-dilesen"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "oleh"
 
@@ -135,15 +143,15 @@ msgstr "Muat turun"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr "Kata laluan anda ditukar"
+msgstr "Kata laluan anda diubah"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr "Gagal menukar kata laluan anda "
+msgstr "Gagal mengubah kata laluan anda "
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr "Kata laluan terkini"
+msgstr "Kata laluan semasa"
 
 #: templates/personal.php:22
 msgid "New password"
@@ -155,7 +163,7 @@ msgstr "Papar"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr "Tukar kata laluan"
+msgstr "Ubah kata laluan"
 
 #: templates/personal.php:30
 msgid "Email"
@@ -207,12 +215,12 @@ msgstr "Lain"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index fbf111c4d3..38b676eb43 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,10 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Epost lagret"
@@ -46,11 +50,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Språk endret"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Slå avBehandle "
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Slå på"
 
@@ -70,7 +78,7 @@ msgstr ""
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mer"
 
@@ -78,19 +86,19 @@ msgstr "Mer"
 msgid "Add your App"
 msgstr "Legg til din App"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side på apps.owncloud.org"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "av"
 
@@ -214,6 +222,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 2f18790514..607ec7418f 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail bewaard"
@@ -47,11 +51,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Taal aangepast"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Inschakelen"
 
@@ -71,7 +79,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Meer"
 
@@ -79,19 +87,19 @@ msgstr "Meer"
 msgid "Add your App"
 msgstr "Voeg je App toe"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-gelicentieerd"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "door"
 
@@ -215,6 +223,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Limieten"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "verwijderen"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 72badad24b..35e4b7daac 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Språk endra"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -75,19 +83,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Vel ein applikasjon"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "av"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 5d51eda986..350097274e 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,10 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email zapisany"
@@ -48,11 +52,15 @@ msgstr "Błąd uwierzytelniania"
 msgid "Language changed"
 msgstr "Język zmieniony"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Wyłączone"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Włączone"
 
@@ -72,7 +80,7 @@ msgstr "Ostrzeżenia bezpieczeństwa"
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Więcej"
 
@@ -80,19 +88,19 @@ msgstr "Więcej"
 msgid "Add your App"
 msgstr "Dodaj aplikacje"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Zaznacz aplikacje"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencjonowany"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "przez"
 
@@ -216,6 +224,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Udział"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Usuń"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index d190c95ceb..06f2896b1d 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email gravado"
@@ -46,11 +50,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Desabilitado"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Habilitado"
 
@@ -70,7 +78,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mais"
 
@@ -78,19 +86,19 @@ msgstr "Mais"
 msgid "Add your App"
 msgstr "Adicione seu Aplicativo"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Selecione uma Aplicação"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver página do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licenciados"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "por"
 
@@ -214,6 +222,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index fbd1ad70ba..66854d609d 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email guardado"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Idioma alterado"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Desativar"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Ativar"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mais"
 
@@ -75,19 +83,19 @@ msgstr "Mais"
 msgid "Add your App"
 msgstr "Adicione a sua aplicação"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver a página da aplicação em apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "por"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 64845e98ca..c55341dca2 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,10 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -45,11 +49,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -69,7 +77,7 @@ msgstr ""
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mai mult"
 
@@ -77,19 +85,19 @@ msgstr "Mai mult"
 msgid "Add your App"
 msgstr "Adaugă aplicația ta"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-autorizat"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "de"
 
@@ -213,6 +221,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cotă"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Șterge"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 9b23f80a3e..28d5f3edcc 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,10 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email сохранен"
@@ -48,11 +52,15 @@ msgstr "Ошибка авторизации"
 msgid "Language changed"
 msgstr "Язык изменён"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Отключить"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Включить"
 
@@ -72,7 +80,7 @@ msgstr "Предупреждение безопасности"
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Ещё"
 
@@ -80,19 +88,19 @@ msgstr "Ещё"
 msgid "Add your App"
 msgstr "Добавить приложение"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Выберите приложение"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Смотрите дополнения на apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-лицензия"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "от"
 
@@ -216,6 +224,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Удалить"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 086d0c8683..a01fe0a664 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email uložený"
@@ -44,11 +48,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Zakázať"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Povoliť"
 
@@ -68,7 +76,7 @@ msgstr ""
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Viac"
 
@@ -76,19 +84,19 @@ msgstr "Viac"
 msgid "Add your App"
 msgstr "Pridať vašu aplikáciu"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si stránku aplikácie na apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencované"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "od"
 
@@ -212,6 +220,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Odstrániť"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 0b8d353a0c..7d09d17dd1 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-poštni naslov je bil shranjen"
@@ -44,11 +48,15 @@ msgstr "Napaka overitve"
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Onemogoči"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Omogoči"
 
@@ -68,7 +76,7 @@ msgstr "Varnostno opozorilo"
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Več"
 
@@ -76,19 +84,19 @@ msgstr "Več"
 msgid "Add your App"
 msgstr "Dodajte vašo aplikacijo"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Izberite aplikacijo"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Obiščite spletno stran aplikacije na apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licencirana"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "s strani"
 
@@ -212,6 +220,6 @@ msgstr "PodSkrbnik"
 msgid "Quota"
 msgstr "Količinska omejitev"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 1d7081baad..5c073c4939 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 3976e060af..30c688852a 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Језик је измењен"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -74,19 +82,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Изаберите програм"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-лиценциран"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "од"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index a4a177f7db..997b911c20 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -74,19 +82,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Izaberite program"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licenciran"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "od"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index d912085104..c535262567 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-post sparad"
@@ -47,11 +51,15 @@ msgstr "Autentiseringsfel"
 msgid "Language changed"
 msgstr "Språk ändrades"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Avaktivera"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -71,7 +79,7 @@ msgstr "Säkerhetsvarning"
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Mera"
 
@@ -79,19 +87,19 @@ msgstr "Mera"
 msgid "Add your App"
 msgstr "Lägg till din applikation"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Välj en App"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida på apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-licensierat"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "av"
 
@@ -215,6 +223,6 @@ msgstr "Underadministratör"
 msgid "Quota"
 msgstr "Kvot"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Ta bort"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 7bae263845..966a7943d3 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 6636578692..d1f6215b0f 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 48c9e0956e..45cab99ce7 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index cebb430138..1754aafd5b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index fe5a5ce14e..a2648652a7 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,27 +111,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:690 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:691 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:718
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:720
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:728
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:730
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index f11330d534..a86e2ca075 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index cbe049c7e0..930f1c5acd 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr ""
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr ""
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr ""
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr ""
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr ""
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr ""
 
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 753b983704..fb792270b8 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index f3c4cc9556..e04c98202a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -41,11 +45,15 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -65,7 +73,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -73,19 +81,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr ""
 
@@ -209,6 +217,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index df4bad317a..3adfedcdeb 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "อีเมลถูกบันทึกแล้ว"
@@ -44,11 +48,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "ปิดใช้งาน"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "เปิดใช้งาน"
 
@@ -68,7 +76,7 @@ msgstr ""
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "เพิ่มเติม"
 
@@ -76,19 +84,19 @@ msgstr "เพิ่มเติม"
 msgid "Add your App"
 msgstr "เพิ่มแอปของคุณ"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "เลือก App"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-ได้รับอนุญาติแล้ว"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "โดย"
 
@@ -212,6 +220,6 @@ msgstr ""
 msgid "Quota"
 msgstr "พื้นที่"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 2ac944dd68..11c40ff6af 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Eposta kaydedildi"
@@ -44,11 +48,15 @@ msgstr "Eşleşme hata"
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Etkin değil"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Etkin"
 
@@ -68,7 +76,7 @@ msgstr "Güvenlik Uyarisi"
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "Devamı"
 
@@ -76,19 +84,19 @@ msgstr "Devamı"
 msgid "Add your App"
 msgstr "Uygulamanı Ekle"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Bir uygulama seçin"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-lisanslı"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "yapan"
 
@@ -212,6 +220,6 @@ msgstr "Alt Yönetici"
 msgid "Quota"
 msgstr "Kota"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index e2406d8e54..01069d3c25 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Мова змінена"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr ""
 
@@ -74,19 +82,19 @@ msgstr ""
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Вибрати додаток"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-ліцензовано"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "по"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Видалити"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 55b0485ddf..f23b9f3b38 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Lưu email"
@@ -43,11 +47,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "Ngôn ngữ đã được thay đổi"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "Vô hiệu"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "Cho phép"
 
@@ -67,7 +75,7 @@ msgstr ""
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "nhiều hơn"
 
@@ -75,19 +83,19 @@ msgstr "nhiều hơn"
 msgid "Add your App"
 msgstr "Thêm ứng dụng của bạn"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "Chọn một ứng dụng"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "Xem ứng dụng tại apps.owncloud.com"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "Giấy phép đã được cấp"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "bởi"
 
@@ -211,6 +219,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Hạn ngạch"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "Xóa"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index cb16e2cbf8..783ce4e652 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "电子邮件已保存"
@@ -44,11 +48,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "语言已修改"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr "禁用"
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr "启用"
 
@@ -68,7 +76,7 @@ msgstr ""
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "更多"
 
@@ -76,19 +84,19 @@ msgstr "更多"
 msgid "Add your App"
 msgstr "添加应用"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "选择一个应用"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr "查看在 app.owncloud.com 的应用程序页面"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-许可证"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "由"
 
@@ -212,6 +220,6 @@ msgstr ""
 msgid "Quota"
 msgstr "配额"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 2a5571a381..be9f9d50a8 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"PO-Revision-Date: 2012-08-05 17:01+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -42,11 +46,15 @@ msgstr ""
 msgid "Language changed"
 msgstr "語言已變更"
 
-#: js/apps.js:31 js/apps.js:67
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:31 js/apps.js:54
+#: js/apps.js:39 js/apps.js:62
 msgid "Enable"
 msgstr ""
 
@@ -66,7 +74,7 @@ msgstr ""
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:55
+#: templates/admin.php:56
 msgid "More"
 msgstr "更多"
 
@@ -74,19 +82,19 @@ msgstr "更多"
 msgid "Add your App"
 msgstr "添加你的 App"
 
-#: templates/apps.php:24
+#: templates/apps.php:26
 msgid "Select an App"
 msgstr "選擇一個應用程式"
 
-#: templates/apps.php:27
+#: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "-licensed"
 msgstr "-已許可"
 
-#: templates/apps.php:28
+#: templates/apps.php:30
 msgid "by"
 msgstr "由"
 
@@ -210,6 +218,6 @@ msgstr ""
 msgid "Quota"
 msgstr "容量限制"
 
-#: templates/users.php:145
+#: templates/users.php:146
 msgid "Delete"
 msgstr "刪除"
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index dcd777b0a6..6e70d923b3 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -45,6 +45,7 @@
 "Create" => "Krei",
 "Default Quota" => "Defaŭlta kvoto",
 "Other" => "Alia",
+"SubAdmin" => "Subadministranto",
 "Quota" => "Kvoto",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index b701bf09eb..969468117e 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,13 +1,15 @@
 <?php $TRANSLATIONS = array(
 "Email saved" => "Emel disimpan",
 "Invalid email" => "Emel tidak sah",
-"OpenID Changed" => "OpenID ditukar",
+"OpenID Changed" => "OpenID diubah",
 "Invalid request" => "Permintaan tidak sah",
-"Language changed" => "Bahasa ditukar",
+"Authentication error" => "Ralat pengesahan",
+"Language changed" => "Bahasa diubah",
 "Disable" => "Nyahaktif",
 "Enable" => "Aktif",
 "Saving..." => "Simpan...",
 "__language_name__" => "_nama_bahasa_",
+"Security Warning" => "Amaran keselamatan",
 "Log" => "Log",
 "More" => "Lanjutan",
 "Add your App" => "Tambah apps anda",
@@ -25,12 +27,12 @@
 "of the available" => "yang tersedia",
 "Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
 "Download" => "Muat turun",
-"Your password got changed" => "Kata laluan anda ditukar",
-"Unable to change your password" => "Gagal menukar kata laluan anda ",
-"Current password" => "Kata laluan terkini",
+"Your password got changed" => "Kata laluan anda diubah",
+"Unable to change your password" => "Gagal mengubah kata laluan anda ",
+"Current password" => "Kata laluan semasa",
 "New password" => "Kata laluan baru",
 "show" => "Papar",
-"Change password" => "Tukar kata laluan",
+"Change password" => "Ubah kata laluan",
 "Email" => "Emel",
 "Your email address" => "Alamat emel anda",
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
@@ -43,6 +45,7 @@
 "Create" => "Buat",
 "Default Quota" => "Kuota Lalai",
 "Other" => "Lain",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Kuota",
 "Delete" => "Padam"
 );

From d54671817929651b2533f5e0875828844bcf44f1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sun, 5 Aug 2012 21:28:59 +0200
Subject: [PATCH 1275/1537] LDAP: sanitize user and group base trees for
 strripos comparison. fixes oc-1302

---
 apps/user_ldap/lib/access.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a50afd0d60..986700ff05 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -28,6 +28,8 @@ abstract class Access {
 
 	public function setConnector(Connection &$connection) {
 		$this->connection = $connection;
+
+
 	}
 
 	private function checkConnection() {
@@ -181,7 +183,7 @@ abstract class Access {
 	 * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
 	 */
 	public function dn2groupname($dn, $ldapname = null) {
-		if(mb_strripos($dn, $this->connection->ldapBaseGroups, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseGroups, 'UTF-8'))) {
+		if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseGroups), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseGroups), 'UTF-8'))) {
 			return false;
 		}
 		return $this->dn2ocname($dn, $ldapname, false);
@@ -196,7 +198,7 @@ abstract class Access {
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
 	 */
 	public function dn2username($dn, $ldapname = null) {
-		if(mb_strripos($dn, $this->connection->ldapBaseUsers, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseUsers, 'UTF-8'))) {
+		if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseUsers), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseUsers), 'UTF-8'))) {
 			return false;
 		}
 		return $this->dn2ocname($dn, $ldapname, true);

From c3cbb463e3cdd967e2c9a9bfd1e332e4a9fa8300 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sun, 5 Aug 2012 21:35:37 +0200
Subject: [PATCH 1276/1537] add missing \

---
 apps/user_ldap/lib/access.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 986700ff05..922dc90952 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -255,7 +255,7 @@ abstract class Access {
 		}
 
 		//if everything else did not help..
-		OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
+		\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
 	}
 
 	/**

From c10010e4100dc2dc165e1b7d207fe19b995f4e53 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sun, 5 Aug 2012 22:02:34 +0200
Subject: [PATCH 1277/1537] LDAP: check for always available attribute on
 userExists, fixes oc-1440

---
 apps/user_ldap/user_ldap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 2059d5b0c6..fb3471af91 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -127,9 +127,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			return false;
 		}
 
-		//if user really still exists, we will be able to read his cn
-		$cn = $this->readAttribute($dn, 'cn');
-		if(!$cn || empty($cn)) {
+		//if user really still exists, we will be able to read his objectclass
+		$objcs = $this->readAttribute($dn, 'objectclass');
+		if(!$objcs || empty($objcs)) {
 			$this->connection->writeToCache('userExists'.$uid, false);
 			return false;
 		}

From 6fd48675e6841effaf77830e282e1ea74614c27e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sun, 5 Aug 2012 22:03:47 +0200
Subject: [PATCH 1278/1537] remove accidentally added blank lines

---
 apps/user_ldap/lib/access.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 922dc90952..4e7215525d 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -28,8 +28,6 @@ abstract class Access {
 
 	public function setConnector(Connection &$connection) {
 		$this->connection = $connection;
-
-
 	}
 
 	private function checkConnection() {

From 95c33e466c19364635afaab8874c1848508442e6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sun, 5 Aug 2012 23:00:47 +0200
Subject: [PATCH 1279/1537] LDAP: offer option to disable SSL certificate
 checks. Works around problems with self-signed certificates, for example.
 However, the best and right way to solve it is always to import the LDAP
 server cert to the owncloud server, so you it for testing only.

Like to hear wether it works, instead appending LDAPTLS_REQCERT=never to ldap.conf.
---
 apps/user_ldap/lib/connection.php     | 9 +++++++++
 apps/user_ldap/settings.php           | 5 ++++-
 apps/user_ldap/templates/settings.php | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index a84174d1df..503245a339 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -42,6 +42,7 @@ class Connection {
 		'ldapAgentPassword' => null,
 		'ldapTLS' => null,
 		'ldapNoCase' => null,
+		'turnOffCertCheck' => null,
 		'ldapIgnoreNamingRules' => null,
 		'ldapUserDisplayName' => null,
 		'ldapUserFilter' => null,
@@ -164,6 +165,7 @@ class Connection {
 			$this->config['ldapBaseGroups']        = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']);
 			$this->config['ldapTLS']               = \OCP\Config::getAppValue($this->configID, 'ldap_tls',0);
 			$this->config['ldapNoCase']            = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
+			$this->config['turnOffCertCheck']      = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0);
 			$this->config['ldapUserDisplayName']   = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8');
 			$this->config['ldapUserFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person');
 			$this->config['ldapGroupFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
@@ -292,6 +294,13 @@ class Connection {
 
 				return false;
 			}
+			if($this->config['turnOffCertCheck']) {
+				if(putenv('LDAPTLS_REQCERT=never')) {
+					\OCP\Util::writeLog('user_ldap', 'Turned off SSL certificate validation successfully.', \OCP\Util::WARN);
+				} else {
+					\OCP\Util::writeLog('user_ldap', 'Could not turn off SSL certificate validation.', \OCP\Util::WARN);
+				}
+			}
 			$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
 			if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
 					if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 135c735e70..c3bf4e0d5e 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl');
 
 OCP\Util::addscript('user_ldap', 'settings');
 
@@ -46,6 +46,9 @@ if ($_POST) {
 		elseif('ldap_nocase' == $param) {
 			OCP\Config::setAppValue('user_ldap', $param, 0);
 		}
+		elseif('ldap_turn_off_cert_check' == $param) {
+			OCP\Config::setAppValue('user_ldap', $param, 0);
+		}
 	}
 }
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 893d93c3c4..0d922f1566 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -20,6 +20,7 @@
 		<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
 		<p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p>
 		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
+		<p><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php echo $l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.');?>" value="1"<?php if ($_['ldap_turn_off_cert_check']) echo ' checked'; ?>><label for="ldap_turn_off_cert_check"><?php echo $l->t('Turn off SSL certificate validation.');?></label> <small><?php echo $l->t('Not recommended, use for testing only.');?></small></p>
 		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />
 		<small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p>
 		<p><label for="ldap_group_display_name"><?php echo $l->t('Group Display Name Field');?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" value="<?php echo $_['ldap_group_display_name']; ?>" /></p>

From 9ca8d20a997c7dd1f21990af9eb1ec43b5d1c77f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 6 Aug 2012 02:02:50 +0200
Subject: [PATCH 1280/1537] [tx-robot] updated from transifex

---
 apps/contacts/l10n/sv.php    |  78 ++++++++++++++++-----
 apps/files/l10n/sv.php       |   5 ++
 l10n/it/settings.po          |  10 +--
 l10n/sv/contacts.po          | 129 ++++++++++++++++++-----------------
 l10n/sv/files.po             |  29 ++++----
 l10n/sv/settings.po          |  11 +--
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       |   2 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 settings/l10n/it.php         |   2 +
 settings/l10n/sv.php         |   2 +
 17 files changed, 170 insertions(+), 114 deletions(-)

diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index dc81513ae2..f470a338b6 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -1,37 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
+"Error (de)activating addressbook." => "Fel (av)aktivera adressbok.",
 "id is not set." => "ID är inte satt.",
 "Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
-"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
+"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras.",
 "No ID provided" => "Inget ID angett",
 "Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
 "No categories selected for deletion." => "Inga kategorier valda för borttaging",
 "No address books found." => "Ingen adressbok funnen.",
 "No contacts found." => "Inga kontakter funna.",
-"There was an error adding the contact." => "Det uppstod ett fel när kontakt skulle läggas till",
+"There was an error adding the contact." => "Det uppstod ett fel när kontakten skulle läggas till.",
+"element name is not set." => "elementnamn ej angett.",
 "Could not parse contact: " => "Kunde inte läsa kontakt:",
-"Cannot add empty property." => "Kan inte lägga till en tom egenskap",
-"At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
+"Cannot add empty property." => "Kan inte lägga till en tom egenskap.",
+"At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i.",
 "Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
-"Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort",
+"Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort.",
 "Missing ID" => "ID saknas",
+"Error parsing VCard for ID: \"" => "Fel vid läsning av VCard för ID: \"",
 "checksum is not set." => "kontrollsumma är inte satt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
-"Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
+"Something went FUBAR. " => "Något gick fel.",
+"Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras.",
 "No contact ID was submitted." => "Inget kontakt-ID angavs.",
-"Error reading contact photo." => "Fel uppstod när ",
+"Error reading contact photo." => "Fel uppstod vid läsning av kontaktfoto.",
 "Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
 "The loading photo is not valid." => "Det laddade fotot är inte giltigt.",
 "Contact ID is missing." => "Kontakt-ID saknas.",
 "No photo path was submitted." => "Ingen sökväg till foto angavs.",
 "File doesn't exist:" => "Filen existerar inte.",
 "Error loading image." => "Fel uppstod när bild laddades.",
+"Error getting contact object." => "Fel vid hämtning av kontakt.",
+"Error getting PHOTO property." => "Fel vid hämtning av egenskaper för FOTO.",
 "Error saving contact." => "Fel vid sparande av kontakt.",
 "Error resizing image" => "Fel vid storleksförändring av bilden",
 "Error cropping image" => "Fel vid beskärning av bilden",
 "Error creating temporary image" => "Fel vid skapande av tillfällig bild",
-"Error finding image: " => "Kunde inte hitta bild",
+"Error finding image: " => "Kunde inte hitta bild:",
 "Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
@@ -54,9 +59,12 @@
 "No files selected for upload." => "Inga filer valda för uppladdning",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server.",
 "Select type" => "Välj typ",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade.",
 "Result: " => "Resultat:",
 " imported, " => "importerad,",
 " failed." => "misslyckades.",
+"Displayname cannot be empty." => "Visningsnamn får inte vara tomt.",
+"Addressbook not found: " => "Adressboken hittades inte:",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
 "Address" => "Adress",
@@ -80,12 +88,32 @@
 "Deliverer" => "Leverera",
 "Holidays" => "Helgdagar",
 "Ideas" => "Idéer",
+"Journey" => "Resa",
+"Jubilee" => "Jubileum",
+"Meeting" => "Möte",
+"Other" => "Annat",
+"Personal" => "Privat",
+"Projects" => "Projekt",
+"Questions" => "Frågor",
 "{name}'s Birthday" => "{name}'s födelsedag",
 "Contact" => "Kontakt",
 "Add Contact" => "Lägg till kontakt",
 "Import" => "Importera",
+"Settings" => "Inställningar",
 "Addressbooks" => "Adressböcker",
 "Close" => "Stäng",
+"Keyboard shortcuts" => "Kortkommandon",
+"Navigation" => "Navigering",
+"Next contact in list" => "Nästa kontakt i listan",
+"Previous contact in list" => "Föregående kontakt i listan",
+"Expand/collapse current addressbook" => "Visa/dölj aktuell adressbok",
+"Next addressbook" => "Nästa adressbok",
+"Previous addressbook" => "Föregående adressbok",
+"Actions" => "Åtgärder",
+"Refresh contacts list" => "Uppdatera kontaktlistan",
+"Add new contact" => "Lägg till ny kontakt",
+"Add new addressbook" => "Lägg till ny adressbok",
+"Delete current contact" => "Radera denna kontakt",
 "Drop photo to upload" => "Släpp foto för att ladda upp",
 "Delete current photo" => "Ta bort aktuellt foto",
 "Edit current photo" => "Redigera aktuellt foto",
@@ -96,16 +124,19 @@
 "Delete" => "Radera",
 "Nickname" => "Smeknamn",
 "Enter nickname" => "Ange smeknamn",
+"Web site" => "Webbplats",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Gå till webbplats",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Separera grupperna med kommatecken",
 "Edit groups" => "Editera grupper",
 "Preferred" => "Föredragen",
-"Please specify a valid email address." => "Vänligen ange en giltig e-postadress",
+"Please specify a valid email address." => "Vänligen ange en giltig e-postadress.",
 "Enter email address" => "Ange e-postadress",
 "Mail to address" => "Posta till adress.",
 "Delete email address" => "Ta bort e-postadress",
-"Enter phone number" => "Ange ett telefonnummer",
+"Enter phone number" => "Ange telefonnummer",
 "Delete phone number" => "Ta bort telefonnummer",
 "View on map" => "Visa på karta",
 "Edit address details" => "Redigera detaljer för adress",
@@ -119,15 +150,20 @@
 "Edit address" => "Editera adress",
 "Type" => "Typ",
 "PO Box" => "Postbox",
+"Street address" => "Gatuadress",
+"Street and number" => "Gata och nummer",
 "Extended" => "Utökad",
+"Apartment number etc." => "Lägenhetsnummer",
 "City" => "Stad",
 "Region" => "Län",
+"E.g. state or province" => "T.ex. stat eller provins",
 "Zipcode" => "Postnummer",
+"Postal code" => "Postnummer",
 "Country" => "Land",
 "Addressbook" => "Adressbok",
-"Miss" => "Herr",
-"Ms" => "Ingen adressbok funnen.",
-"Mr" => "Fru",
+"Miss" => "Fröken",
+"Mr" => "Herr",
+"Sir" => "Herr",
 "Mrs" => "Fröken",
 "Dr" => "Dr",
 "Given name" => "Förnamn",
@@ -141,14 +177,22 @@
 "Importing contacts" => "Importerar kontakter",
 "You have no contacts in your addressbook." => "Du har inga kontakter i din adressbok.",
 "Add contact" => "Lägg till en kontakt",
-"Configure addressbooks" => "Konfigurera adressböcker",
+"Configure addressbooks" => "Anpassa adressböcker.",
+"Select Address Books" => "Välj adressböcker",
+"Enter name" => "Ange namn",
+"Enter description" => "Ange beskrivning",
 "CardDAV syncing addresses" => "CardDAV synkningsadresser",
-"more info" => "mera information",
+"more info" => "mer information",
 "Primary address (Kontact et al)" => "Primär adress (Kontakt o.a.)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Visa CardDav-länk",
+"Show read-only VCF link" => "Visa skrivskyddad VCF-länk",
 "Download" => "Nedladdning",
 "Edit" => "Redigera",
 "New Address Book" => "Ny adressbok",
+"Name" => "Namn",
+"Description" => "Beskrivning",
 "Save" => "Spara",
-"Cancel" => "Avbryt"
+"Cancel" => "Avbryt",
+"More..." => "Mer..."
 );
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index bdce67c3d4..24784c2904 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -9,6 +9,11 @@
 "Files" => "Filer",
 "Unshare" => "Sluta dela",
 "Delete" => "Ta bort",
+"already exists" => "finns redan",
+"replace" => "ersätt",
+"cancel" => "avbryt",
+"replaced" => "ersatt",
+"with" => "med",
 "undo" => "ångra",
 "deleted" => "raderad",
 "generating ZIP-file, it may take some time." => "Gererar ZIP-fil. Det kan ta lite tid.",
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 650c932831..778f6a40a5 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"PO-Revision-Date: 2012-08-05 21:58+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Impossibile caricare l'elenco dall'App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,7 +54,7 @@ msgstr "Lingua modificata"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 2f9232861b..2e83ae869b 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -5,6 +5,7 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012.
 #   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-06 02:01+0200\n"
+"PO-Revision-Date: 2012-08-05 17:56+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
-msgstr "Fel när (av)aktivera adressbok"
+msgstr "Fel (av)aktivera adressbok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
 #: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
@@ -38,7 +39,7 @@ msgstr "Kan inte uppdatera adressboken med ett tomt namn."
 
 #: ajax/addressbook/update.php:28
 msgid "Error updating addressbook."
-msgstr "Fel uppstod när adressbok skulle uppdateras"
+msgstr "Fel uppstod när adressbok skulle uppdateras."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -62,11 +63,11 @@ msgstr "Inga kontakter funna."
 
 #: ajax/contact/add.php:47
 msgid "There was an error adding the contact."
-msgstr "Det uppstod ett fel när kontakt skulle läggas till"
+msgstr "Det uppstod ett fel när kontakten skulle läggas till."
 
 #: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
 msgid "element name is not set."
-msgstr ""
+msgstr "elementnamn ej angett."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
@@ -74,11 +75,11 @@ msgstr "Kunde inte läsa kontakt:"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
-msgstr "Kan inte lägga till en tom egenskap"
+msgstr "Kan inte lägga till en tom egenskap."
 
 #: ajax/contact/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
-msgstr "Minst ett fält måste fyllas i"
+msgstr "Minst ett fält måste fyllas i."
 
 #: ajax/contact/addproperty.php:76
 msgid "Trying to add duplicate property: "
@@ -94,7 +95,7 @@ msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
 #: ajax/contact/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr "Fel uppstod när kontaktegenskap skulle tas bort"
+msgstr "Fel uppstod när kontaktegenskap skulle tas bort."
 
 #: ajax/contact/details.php:31
 msgid "Missing ID"
@@ -102,7 +103,7 @@ msgstr "ID saknas"
 
 #: ajax/contact/details.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Fel vid läsning av VCard för ID: \""
 
 #: ajax/contact/saveproperty.php:40
 msgid "checksum is not set."
@@ -114,11 +115,11 @@ msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
 #: ajax/contact/saveproperty.php:67
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Något gick fel."
 
 #: ajax/contact/saveproperty.php:142
 msgid "Error updating contact property."
-msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
+msgstr "Fel uppstod när kontaktegenskap skulle uppdateras."
 
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
@@ -127,7 +128,7 @@ msgstr "Inget kontakt-ID angavs."
 
 #: ajax/currentphoto.php:36
 msgid "Error reading contact photo."
-msgstr "Fel uppstod när "
+msgstr "Fel uppstod vid läsning av kontaktfoto."
 
 #: ajax/currentphoto.php:48
 msgid "Error saving temporary file."
@@ -155,11 +156,11 @@ msgstr "Fel uppstod när bild laddades."
 
 #: ajax/savecrop.php:69
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fel vid hämtning av kontakt."
 
 #: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fel vid hämtning av egenskaper för FOTO."
 
 #: ajax/savecrop.php:98
 msgid "Error saving contact."
@@ -179,7 +180,7 @@ msgstr "Fel vid skapande av tillfällig bild"
 
 #: ajax/savecrop.php:117
 msgid "Error finding image: "
-msgstr "Kunde inte hitta bild"
+msgstr "Kunde inte hitta bild:"
 
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
@@ -285,7 +286,7 @@ msgstr "Välj typ"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -301,11 +302,11 @@ msgstr "misslyckades."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Visningsnamn får inte vara tomt."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adressboken hittades inte:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -403,31 +404,31 @@ msgstr "Idéer"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Resa"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Möte"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Annat"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Privat"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projekt"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Frågor"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -447,7 +448,7 @@ msgstr "Importera"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Inställningar"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -459,51 +460,51 @@ msgstr "Stäng"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Kortkommandon"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navigering"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Nästa kontakt i listan"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Föregående kontakt i listan"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Visa/dölj aktuell adressbok"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Nästa adressbok"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Föregående adressbok"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Åtgärder"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Uppdatera kontaktlistan"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Lägg till ny kontakt"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Lägg till ny adressbok"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Radera denna kontakt"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -549,15 +550,15 @@ msgstr "Ange smeknamn"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Webbplats"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Gå till webbplats"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -581,7 +582,7 @@ msgstr "Föredragen"
 
 #: templates/part.contact.php:64
 msgid "Please specify a valid email address."
-msgstr "Vänligen ange en giltig e-postadress"
+msgstr "Vänligen ange en giltig e-postadress."
 
 #: templates/part.contact.php:64
 msgid "Enter email address"
@@ -597,7 +598,7 @@ msgstr "Ta bort e-postadress"
 
 #: templates/part.contact.php:78
 msgid "Enter phone number"
-msgstr "Ange ett telefonnummer"
+msgstr "Ange telefonnummer"
 
 #: templates/part.contact.php:82
 msgid "Delete phone number"
@@ -654,11 +655,11 @@ msgstr "Postbox"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Gatuadress"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Gata och nummer"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -666,7 +667,7 @@ msgstr "Utökad"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Lägenhetsnummer"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -679,7 +680,7 @@ msgstr "Län"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "T.ex. stat eller provins"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -687,7 +688,7 @@ msgstr "Postnummer"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Postnummer"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -704,19 +705,19 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr "Herr"
+msgstr "Fröken"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr "Ingen adressbok funnen."
+msgstr ""
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr "Fru"
+msgstr "Herr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Herr"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
@@ -804,19 +805,19 @@ msgstr "Lägg till en kontakt"
 
 #: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
-msgstr "Konfigurera adressböcker"
+msgstr "Anpassa adressböcker."
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Välj adressböcker"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Ange namn"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Ange beskrivning"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -824,7 +825,7 @@ msgstr "CardDAV synkningsadresser"
 
 #: templates/settings.php:3
 msgid "more info"
-msgstr "mera information"
+msgstr "mer information"
 
 #: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
@@ -836,11 +837,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Visa CardDav-länk"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Visa skrivskyddad VCF-länk"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -856,11 +857,11 @@ msgstr "Ny adressbok"
 
 #: templates/settings.php:42
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #: templates/settings.php:43
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #: templates/settings.php:45
 msgid "Save"
@@ -872,4 +873,4 @@ msgstr "Avbryt"
 
 #: templates/settings.php:51
 msgid "More..."
-msgstr ""
+msgstr "Mer..."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index ae55ded494..819753d4bf 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012.
 #   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-06 02:01+0200\n"
+"PO-Revision-Date: 2012-08-05 17:06+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,23 +67,23 @@ msgstr "Ta bort"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "finns redan"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "ersätt"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "avbryt"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "ersatt"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "med"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
@@ -116,27 +117,27 @@ msgstr "Uppladdning avbruten."
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:690 templates/index.php:55
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:691 templates/index.php:56
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:659
+#: js/files.js:718
 msgid "folder"
 msgstr "mapp"
 
-#: js/files.js:661
+#: js/files.js:720
 msgid "folders"
 msgstr "mappar"
 
-#: js/files.js:669
+#: js/files.js:728
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:671
+#: js/files.js:730
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index c535262567..f8c317b7d5 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -6,6 +6,7 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
+# Magnus Höglund <magnus@linux.com>, 2012.
 #   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 #   <tscooter@hotmail.com>, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"PO-Revision-Date: 2012-08-05 17:03+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Kan inte ladda listan från App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -53,7 +54,7 @@ msgstr "Språk ändrades"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Fel"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 966a7943d3..d1f1093186 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index d1f6215b0f..cd99214bfa 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 45cab99ce7..27b06ccd62 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 1754aafd5b..8701abad98 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index a2648652a7..6c139feef7 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index a86e2ca075..d36f787991 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 930f1c5acd..8debc49847 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index fb792270b8..801986935a 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e04c98202a..b848a4b9f6 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
+"POT-Creation-Date: 2012-08-06 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 966f2b7f17..62378377e8 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Email saved" => "Email salvata",
 "Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
 "Authentication error" => "Errore di autenticazione",
 "Language changed" => "Lingua modificata",
+"Error" => "Errore",
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
 "Saving..." => "Salvataggio in corso...",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 9df4ef257f..0b4462876e 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
 "Authentication error" => "Autentiseringsfel",
 "Language changed" => "Språk ändrades",
+"Error" => "Fel",
 "Disable" => "Avaktivera",
 "Enable" => "Aktivera",
 "Saving..." => "Sparar...",

From e6759a980b3efe07c4a4c2e2769c2becc92df67d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 6 Aug 2012 17:25:59 +0200
Subject: [PATCH 1281/1537] LDAP: layout settings form. Hope it is now a bit
 clearer and prettier.

---
 apps/user_ldap/css/settings.css       | 10 ++++++++
 apps/user_ldap/settings.php           |  1 +
 apps/user_ldap/templates/settings.php | 33 +++++++++++++--------------
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 apps/user_ldap/css/settings.css

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
new file mode 100644
index 0000000000..30c5c175c9
--- /dev/null
+++ b/apps/user_ldap/css/settings.css
@@ -0,0 +1,10 @@
+#ldap fieldset p label {
+	width: 20%;
+	max-width: 200px;
+	display: inline-block;
+}
+
+#ldap fieldset input {
+	width: 70%;
+	display: inline-block;
+}
\ No newline at end of file
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index c3bf4e0d5e..39aa329626 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -23,6 +23,7 @@
 $params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl');
 
 OCP\Util::addscript('user_ldap', 'settings');
+OCP\Util::addstyle('user_ldap', 'settings');
 
 if ($_POST) {
 	foreach($params as $param){
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 0d922f1566..861c9ba605 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -5,29 +5,28 @@
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
 	<fieldset id="ldapSettings-1">
-		<p><label for="ldap_host"><?php echo $l->t('Host');?><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>"></label> <label for="ldap_base"><?php echo $l->t('Base');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" /></p>
-		<p><label for="ldap_dn"><?php echo $l->t('Name');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" />
-		<label for="ldap_agent_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_agent_password" name="ldap_agent_password" value="<?php echo $_['ldap_agent_password']; ?>" />
-		<small><?php echo $l->t('Leave both empty for anonymous bind for search, then bind with users credentials.');?></small></p>
-		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" value="<?php echo $_['ldap_login_filter']; ?>" /><small><?php echo $l->t('use %%uid placeholder, e.g. uid=%%uid');?></small></p>
-		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" value="<?php echo $_['ldap_userlist_filter']; ?>" /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=person".');?></small></p>
-		<p><label for="ldap_group_filter"><?php echo $l->t('Group Filter');?></label><input type="text" id="ldap_group_filter" name="ldap_group_filter" value="<?php echo $_['ldap_group_filter']; ?>" /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=posixGroup".');?></small></p>
+		<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>" title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
+		<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" /></p>
+		<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" title="<?php echo $l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.');?>" /></p>
+		<p><label for="ldap_agent_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_agent_password" name="ldap_agent_password" value="<?php echo $_['ldap_agent_password']; ?>" title="<?php echo $l->t('For anonymous access, leave DN and Password empty.');?>" /></p>
+		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" value="<?php echo $_['ldap_login_filter']; ?>" title="<?php echo $l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" /><br /><small><?php echo $l->t('use %%uid placeholder, e.g. "uid=%%uid"');?></small></p>
+		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" value="<?php echo $_['ldap_userlist_filter']; ?>" title="<?php echo $l->t('Defines the filter to apply, when retrieving users.');?>" /><br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=person".');?></small></p>
+		<p><label for="ldap_group_filter"><?php echo $l->t('Group Filter');?></label><input type="text" id="ldap_group_filter" name="ldap_group_filter" value="<?php echo $_['ldap_group_filter']; ?>" title="<?php echo $l->t('Defines the filter to apply, when retrieving groups.');?>" /><br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=posixGroup".');?></small></p>
 	</fieldset>
 	<fieldset id="ldapSettings-2">
 		<p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
 		<p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><input type="text" id="ldap_base_users" name="ldap_base_users" value="<?php echo $_['ldap_base_users']; ?>" /></p>
 		<p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><input type="text" id="ldap_base_groups" name="ldap_base_groups" value="<?php echo $_['ldap_base_groups']; ?>" /></p>
 		<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
-		<p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p>
-		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
-		<p><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php echo $l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.');?>" value="1"<?php if ($_['ldap_turn_off_cert_check']) echo ' checked'; ?>><label for="ldap_turn_off_cert_check"><?php echo $l->t('Turn off SSL certificate validation.');?></label> <small><?php echo $l->t('Not recommended, use for testing only.');?></small></p>
-		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />
-		<small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p>
-		<p><label for="ldap_group_display_name"><?php echo $l->t('Group Display Name Field');?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" value="<?php echo $_['ldap_group_display_name']; ?>" /></p>
-		<p><label for="ldap_quota_attr">Quota Attribute</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" />
-		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
-		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
-		<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" /><small><?php echo $l->t('in seconds');?></small></p>
+		<p><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?> title="<?php echo $l->t('Do not use it for SSL connections, it will fail.');?>" /></p>
+		<p><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label> <input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>></p>
+		<p><label for="ldap_turn_off_cert_check"><?php echo $l->t('Turn off SSL certificate validation.');?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php echo $l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.');?>" value="1"<?php if ($_['ldap_turn_off_cert_check']) echo ' checked'; ?>><br/><small><?php echo $l->t('Not recommended, use for testing only.');?></small></p>
+		<p><label for="ldap_display_name"><?php echo $l->t('User Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" title="<?php echo $l->t('The LDAP attribute to use to generate the user`s ownCloud name.');?>" /></p>
+		<p><label for="ldap_group_display_name"><?php echo $l->t('Group Display Name Field');?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" value="<?php echo $_['ldap_group_display_name']; ?>" title="<?php echo $l->t('The LDAP attribute to use to generate the groups`s ownCloud name.');?>" /></p>
+		<p><label for="ldap_quota_attr">Quota Field</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" />
+		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" title="<?php echo $l->t('in bytes');?>" /></p>
+		<p><label for="ldap_email_attr">Email Field</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
+		<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" title="<?php echo $l->t('in seconds. A change empties the cache.');?>" /></p>
 	</fieldset>
 	<input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>

From 3b2c853916fb75968ae759e54bb61a8095debe7e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 11:27:13 -0400
Subject: [PATCH 1282/1537] Lots of refactoring to share API

---
 apps/contacts/appinfo/app.php           |   8 +-
 apps/contacts/lib/addressbook.php       |   2 +-
 apps/files_sharing/lib/share/file.php   |  18 +-
 apps/files_sharing/lib/share/folder.php |   9 +-
 apps/files_sharing/sharedstorage.php    |   2 +-
 apps/gallery/appinfo/app.php            |   2 +-
 apps/gallery/lib/share.php              |   2 +-
 core/js/share.js                        |  25 +-
 lib/public/share.php                    | 328 +++++++++++++++---------
 9 files changed, 239 insertions(+), 157 deletions(-)

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index aa0f229dd9..3c32f7f5c9 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -3,8 +3,8 @@ OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
 OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
 OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
-OC::$CLASSPATH['OC_Share_Contact_Backend'] = 'apps/contacts/lib/share/contact.php';
-OC::$CLASSPATH['OC_Share_Addressbook_Backend'] = 'apps/contacts/lib/share/addressbook.php';
+OC::$CLASSPATH['OC_Share_Backend_Contact'] = 'apps/contacts/lib/share/contact.php';
+OC::$CLASSPATH['OC_Share_Backend_Addressbook'] = 'apps/contacts/lib/share/addressbook.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
 OC::$CLASSPATH['Sabre_CardDAV_VCFExportPlugin'] = 'apps/contacts/lib/VCFExportPlugin.php';
 OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
@@ -24,6 +24,6 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('contacts', 'settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
-OCP\Share::registerBackend('contact', 'OC_Share_Contact_Backend');
-OCP\Share::registerBackend('addressbook', 'OC_Share_Addressbook_Backend', 'contact');
+OCP\Share::registerBackend('contact', 'OC_Share_Backend_Contact');
+OCP\Share::registerBackend('addressbook', 'OC_Share_Backend_Addressbook', 'contact');
 
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index d3cceb5880..a81b1f7798 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -64,7 +64,7 @@ class OC_Contacts_Addressbook {
 		while( $row = $result->fetchRow()) {
 			$addressbooks[] = $row;
 		}
-		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Addressbook_Backend::FORMAT_ADDRESSBOOKS));
+		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS));
 		if(!$active && !count($addressbooks)) {
 			self::addDefault($uid);
 		}
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index dd63539cdf..927e9462f2 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -20,23 +20,27 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class OC_Share_Backend_File extends OCP\Share_Backend {
+class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 
 	const FORMAT_SHARED_STORAGE = 0;
 	const FORMAT_FILE_APP = 1;
 	const FORMAT_FILE_APP_ROOT = 2;
 	const FORMAT_OPENDIR = 3;
 
-	public function getSource($item, $uid) {
-		if (OC_Filesystem::file_exists($item)) {
-			return array('item' => null, 'file' => $item);
-		}
-		return false;
+	public function isValidSource($item, $uid) {
+// 		if (OC_Filesystem::file_exists($item)) {
+			return true;
+// 		}
+// 		return false;
+	}
+
+	public function getFilePath($item, $uid) {
+		return $item;
 	}
 
 	public function generateTarget($item, $uid, $exclude = null) {
 		// TODO Make sure target path doesn't exist already
-		return '/Shared'.$item;
+		return $item;
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index a43ce2b2ca..2f101d33c8 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -25,8 +25,13 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 		// TODO
 	}
 
-	public function getChildrenSources($item) {
-		return OC_FileCache::getFolderContent($item);
+	public function getChildren($itemSource) {
+		$files = OC_FileCache::getFolderContent($itemSource);
+		$sources = array();
+		foreach ($files as $file) {
+			$sources[] = $file['path'];
+		}
+		return $sources;
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 2071942b06..6e37837aac 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -38,7 +38,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	* @return Returns array with the keys path and permissions or false if not found
 	*/
 	private function getFile($target) {
-		$target = $this->sharedFolder.'/'.$target;
+		$target = '/'.$target;
 		$target = rtrim($target, '/');
 		if (isset($this->files[$target])) {
 			return $this->files[$target];
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 9efb4346c3..9103f66441 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -30,7 +30,7 @@ OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php';
 OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php';
 OC::$CLASSPATH['OC_Share_Backend_Photo'] = 'gallery/lib/share.php';
 
-OCP\Share::registerBackend('photo', new OC_Share_Backend_Photo());
+// OCP\Share::registerBackend('photo', new OC_Share_Backend_Photo());
 
 $l = OC_L10N::get('gallery');
 
diff --git a/apps/gallery/lib/share.php b/apps/gallery/lib/share.php
index 6f3db45375..d6c5f40d49 100644
--- a/apps/gallery/lib/share.php
+++ b/apps/gallery/lib/share.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class OC_Share_Backend_Photo extends OCP\Share_Backend {
+abstract class OC_Share_Photo_Backend implements OCP\Share_Backend {
 
 	public $dependsOn = 'file';
 	public $supportedFileExtensions = array('jpg', 'png', 'gif');
diff --git a/core/js/share.js b/core/js/share.js
index e3dfd27e76..dd790d004e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -16,28 +16,29 @@ OC.Share={
 			if (result && result.status === 'success') {
 				$.each(result.data, function(item, hasPrivateLink) {
 					// Private links override shared in terms of icon display
-					if (itemType == 'file') {
-						OC.Share.statuses[item] = hasPrivateLink;
-					} else {
+					if (itemType != 'file' && itemType != 'folder') {
 						if (hasPrivateLink) {
 							$('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/public'));
 						} else {
 							$('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/shared'));
 						}
 					}
+					OC.Share.statuses[item] = hasPrivateLink;
 				});
 			}
 		});
 	},
 	loadItem:function(itemType, item) {
 		var data = '';
-		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, item: item }, async: false, success: function(result) {
-			if (result && result.status === 'success') {
-				data = result.data;
-			} else {
-				data = false;
-			}
-		}});
+// 		if (typeof OC.Share.statuses[item] !== 'undefined') {
+			$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, item: item }, async: false, success: function(result) {
+				if (result && result.status === 'success') {
+					data = result.data;
+				} else {
+					data = false;
+				}
+			}});
+// 		}
 		return data;
 	},
 	share:function(itemType, item, shareType, shareWith, permissions, callback) {
@@ -241,12 +242,12 @@ $(document).ready(function() {
 	});
 	
 	if (typeof FileActions !== 'undefined') {
-		
 		OC.Share.loadIcons('file');
+		OC.Share.loadIcons('folder');
 		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
-			var item =  $('#dir').val() + '/' + filename;
+			var item = $('#dir').val() + '/' + filename;
 			// Check if status is in cache
 			if (OC.Share.statuses[item] === true) {
 				return OC.imagePath('core', 'actions/public');
diff --git a/lib/public/share.php b/lib/public/share.php
index 813b5558e8..1ebbbccc90 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -27,7 +27,7 @@ namespace OCP;
 
 /**
 * This class provides the ability for apps to share their content between users.
-* Apps must create a backend class that extends OCP\Share_Backend and register it with this class.
+* Apps must create a backend class that implements OCP\Share_Backend and register it with this class.
 */
 class Share {
 
@@ -60,7 +60,7 @@ class Share {
 	private static $backendTypes = array();
 
 	/**
-	* @brief Register a sharing backend class that extends OCP\Share_Backend for an item type
+	* @brief Register a sharing backend class that implements OCP\Share_Backend for an item type
 	* @param string Item type
 	* @param string Backend class
 	* @param string (optional) Depends on item type
@@ -112,41 +112,41 @@ class Share {
 	/**
 	* @brief Get the shared item of item type owned by the current user
 	* @param string Item type
-	* @param string Item
+	* @param string Item source
 	* @param int Format (optional) Format type must be defined by the backend
 	* @return Return depends on format
 	*/
-	public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) {
-		return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, $parameters, -1, $includeCollections);
+	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), $format, $parameters, -1, $includeCollections);
 	}
 
 	/**
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
-	* @param string Item
+	* @param string Item source
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @return bool Returns true on success or false on failure
 	*/
-	public static function share($itemType, $item, $shareType, $shareWith, $permissions) {
+	public static function share($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
 		switch ($shareType) {
 			case self::SHARE_TYPE_USER:
 				if ($shareWith == $uidOwner) {
-					$message = 'Sharing '.$item.' failed, because the user '.$shareWith.' is the item owner';
+					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the itemSource owner';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
 				if (!\OC_User::userExists($shareWith)) {
-					$message = 'Sharing '.$item.' failed, because the user '.$shareWith.' does not exist';
+					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' does not exist';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				} else {
 					$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
 					if (empty($inGroup)) {
-						$message = 'Sharing '.$item.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
+						$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
 						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 						throw new \Exception($message);
 					}
@@ -154,11 +154,11 @@ class Share {
 				break;
 			case self::SHARE_TYPE_GROUP:
 				if (!\OC_Group::groupExists($shareWith)) {
-					$message = 'Sharing '.$item.' failed, because the group '.$shareWith.' does not exist';
+					$message = 'Sharing '.$itemSource.' failed, because the group '.$shareWith.' does not exist';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				} else if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
-					$message = 'Sharing '.$item.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith;
+					$message = 'Sharing '.$itemSource.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith;
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
@@ -169,45 +169,46 @@ class Share {
 				$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 				break;
 			case self::SHARE_TYPE_PRIVATE_LINK:
-				$shareWith = md5(uniqid($item, true));
-				return self::put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions);
+				$shareWith = md5(uniqid($itemSource, true));
+				return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
 			case self::SHARE_TYPE_CONTACT:
 				if (!\OC_App::isEnabled('contacts')) {
-					$message = 'Sharing '.$item.' failed, because the contacts app is not enabled';
+					$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					return false;
 				}
 				$vcard = \OC_Contacts_App::getContactVCard($shareWith);
 				if (!isset($vcard)) {
-					$message = 'Sharing '.$item.' failed, because the contact does not exist';
+					$message = 'Sharing '.$itemSource.' failed, because the contact does not exist';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
 				$details = \OC_Contacts_VCard::structureContact($vcard);
 				// TODO Add ownCloud user to contacts vcard
 				if (!isset($details['EMAIL'])) {
-					$message = 'Sharing '.$item.' failed, because no email address is associated with the contact';
+					$message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
-				return self::share($itemType, $item, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
+				return self::share($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
 				break;
 			// Future share types need to include their own conditions
 			default:
-				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$item, \OC_Log::ERROR);
+				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$itemSource, \OC_Log::ERROR);
 				return false;
 		}
-		if (self::getItems($itemType, $item, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true)) {
-			$message = 'Sharing '.$item.' failed, because this item is already shared with '.$shareWith;
+		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
+		if (self::getItems($itemType, $itemSource, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true)) {
+			$message = 'Sharing '.$itemSource.' failed, because this itemSource is already shared with '.$shareWith;
 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 			throw new \Exception($message);
 		}
 		// If the item is a folder, scan through the folder looking for equivalent item types
 		if ($itemType == 'folder') {
-			$parentFolder = self::put('folder', $item, $shareType, $shareWith, $uidOwner, $permissions, true);
-			if ($parentFolder && $files = \OC_Files::getDirectoryContent($item)) {
+			$parentFolder = self::put('folder', $itemSource, $shareType, $shareWith, $uidOwner, $permissions, true);
+			if ($parentFolder && $files = \OC_Files::getDirectoryContent($itemSource)) {
 				for ($i = 0; $i < count($files); $i++) {
-					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $item) - strlen($item));
+					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource));
 					if ($files[$i]['mimetype'] == 'httpd/unix-directory' && $children = \OC_Files::getDirectoryContent($name, '/')) {
 						// Continue scanning into child folders
 						array_push($files, $children);
@@ -221,20 +222,20 @@ class Share {
 			return false;
 		} else {
 			// Put the item into the database
-			return self::put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions);
+			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
 		}
 	}
 
 	/**
 	* @brief Unshare an item from a user, group, or delete a private link
 	* @param string Item type
-	* @param string Item
+	* @param string Item source
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @return Returns true on success or false on failure
 	*/
-	public static function unshare($itemType, $item, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
+	public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
+		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -315,20 +316,20 @@ class Share {
 	/**
 	* @brief Set the permissions of an item for a specific user or group
 	* @param string Item type
-	* @param string Item
+	* @param string Item source
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @return Returns true on success or false on failure
 	*/
-	public static function setPermissions($itemType, $item, $shareType, $shareWith, $permissions) {
-		if ($item = self::getItems($itemType, $item, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
+	public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
+		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
 			// Check if this item is a reshare and verify that the permissions granted don't exceed the parent shared item
 			if (isset($item['parent'])) {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
 				if (~(int)$result['permissions'] & $permissions) {
-					\OC_Log::write('OCP\Share', 'Setting permissions for '.$item.' failed, because the permissions exceed permissions granted to the parent item', \OC_Log::ERROR);
+					\OC_Log::write('OCP\Share', 'Setting permissions for '.$itemSource.' failed, because the permissions exceed permissions granted to the parent item', \OC_Log::ERROR);
 					return false;
 				}
 			}
@@ -367,7 +368,7 @@ class Share {
 			}
 			return true;
 		}
-		\OC_Log::write('OCP\Share', 'Setting permissions for '.$item.' failed, because the item was not found', \OC_Log::ERROR);
+		\OC_Log::write('OCP\Share', 'Setting permissions for '.$itemSource.' failed, because the item was not found', \OC_Log::ERROR);
 		return false;
 	}
 
@@ -383,8 +384,8 @@ class Share {
 			$class = self::$backendTypes[$itemType]['class'];
 			if (class_exists($class)) {
 				self::$backends[$itemType] = new $class;
-				if (!is_subclass_of(self::$backends[$itemType], 'OCP\Share_Backend')) {
-					\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' must extend abstract class OC_Share_Backend', \OC_Log::ERROR);
+				if (!(self::$backends[$itemType] instanceof Share_Backend)) {
+					\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' must implement the interface OCP\Share_Backend', \OC_Log::ERROR);
 					return false;
 				}
 				return self::$backends[$itemType];
@@ -419,14 +420,14 @@ class Share {
 	/**
 	* @brief Get shared items from the database
 	* @param string Item type
-	* @param string Item or item target (optional)
+	* @param string Item source or target (optional)
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_PRIVATE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
 	* @param string User or group the item is being shared with
 	* @param string User that is the owner of shared items (optional)
 	* @param int Format to convert items to with formatItems()
 	* @param mixed Parameters to pass to formatItems()
 	* @param int Number of items to return, -1 to return all matches (optional)
-	* @param bool Is item the source (optional)
+	* @param bool Include collection item types (optional)
 	* @return mixed
 	*
 	* See public functions getItem(s)... for parameter usage
@@ -434,8 +435,10 @@ class Share {
 	*/
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) {
 		if ($backend = self::getBackend($itemType)) {
+			// Get filesystem root to add it to the file target and remove from the file source
+			$root = \OC_Filesystem::getRoot();
 			// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
-			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+			if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
 				$where = "WHERE item_type IN ('".implode("','", array_merge(array($itemType), $collectionTypes))."')";
 			} else {
 				$where = "WHERE item_type = '".$itemType."'";
@@ -457,22 +460,27 @@ class Share {
 					// Prevent unique user targets for group shares from being selected
 					$where .= " AND share_type != '".self::$shareTypeGroupUserUnique."'";
 				}
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$where = "INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ".$where;
+					$column = 'file_source';
+				} else {
+					$column = 'item_source';
+				}
+			} else {
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$column = 'file_target';
+				} else {
+					$column = 'item_target';
+				}
 			}
-			if (isset($item) && !$includeCollections) {
+			if (isset($item)) {
 				// If looking for own shared items, check item_source else check item_target
 				if (isset($uidOwner)) {
-					$source = $backend->getSource($item, $uidOwner);
 					// If item type is a file, file source needs to be checked in case the item was converted
 					if ($itemType == 'file' || $itemType == 'folder') {
-						$where .= " AND file_source = ".\OC_FileCache::getId($source['file']);
+						$where .= " AND path = '".$root.$item."'";
 					} else {
-						// Check if this item depends on a file and getSource() returned an array
-						if (is_array($source)) {
-							$itemSource = $source['item'];
-						} else {
-							$itemSource = $source;
-						}
-						$where .= " AND item_source = '".$itemSource."'";
+						$where .= " AND item_source = '".$item."'";
 					}
 				} else {
 					if ($itemType == 'file' || $itemType == 'folder') {
@@ -481,53 +489,70 @@ class Share {
 						$where .= " AND item_target = '".$item."'";
 					}
 				}
-			} else if ($itemType == 'file') {
-				// TODO Exclude converted items inside shared folders
+				if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+					$where .= " OR item_type IN ('".implode("','", $collectionTypes)."')";
+				}
 			}
 			if ($limit != -1 && !$includeCollections) {
 				if ($shareType == self::$shareTypeUserAndGroups) {
 					// Make sure the unique user target is returned if it exists, unique targets should follow the group share in the database
 					// If the limit is not 1, the filtering can be done later
-					$where .= ' ORDER BY id DESC';
+					$where .= ' ORDER BY *PREFIX*share.id DESC';
 				}
 				$where .= ' LIMIT '.$limit;
 			}
 			if ($format == self::FORMAT_STATUSES) {
-				$select = 'id, item_type, item, item_source, parent, share_type';
-			} else if ($format == self::FORMAT_SOURCES) {
-				$select = 'id, item_source, parent, share_type';
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
+				} else {
+					$select = 'id, item_source, parent, share_type';
+				}
 			} else {
 				if (isset($uidOwner)) {
-					$select = 'id, item_type, item, item_source, parent, share_type, share_with, permissions, stime, file_source';
+					if ($itemType == 'file' || $itemType == 'folder') {
+						$select = '*PREFIX*share.id, item_type, *PREFIX*fscache.path as file_source, *PREFIX*share.parent, share_type, share_with, permissions, stime';
+					} else {
+						$select = 'id, item_type, item_source, parent, share_type, share_with, permissions, stime, file_source';
+					}
 				} else {
 					$select = '*';
 				}
 			}
-			error_log($where);
+			$root = strlen($root);
 			$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
 			$result = $query->execute();
 			$items = array();
 			while ($row = $result->fetchRow()) {
 				// Return only the item instead of a 2-dimensional array
-				if ($limit == 1 && $format == self::FORMAT_NONE && !$includeCollections) {
-					return $row;
+				if ($limit == 1 && $row['item_type'] == $itemType && $row[$column] == $item) {
+					if ($format == self::FORMAT_NONE) {
+						return $row;
+					} else {
+						$items[$row['id']] = $row;
+						break;
+					}
 				}
 				// Filter out duplicate group shares for users with unique targets
 				if ($row['share_type'] == self::$shareTypeGroupUserUnique) {
 					// Remove the parent group share
 					unset($items[$row['parent']]);
 				}
+				// Remove root from file source paths
+				if (isset($uidOwner) && isset($row['file_source'])) {
+					$row['file_source'] = substr($row['file_source'], $root);
+				}
+				// TODO Check this outside of the loop
 				// Check if this is a collection of the requested item type
 				if ($row['item_type'] != $itemType) {
 					if ($collectionBackend = self::getBackend($row['item_type'])) {
-						$row['collection'] = array('item_type' => $itemType, 'item_source' => $row['item_source']);
+						$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
 						// Fetch all of the children sources
-						$children = $collectionBackend->getChildren($row['item']);
+						$children = $collectionBackend->getChildren($row[$column]);
 						foreach ($children as $child) {
 							$row['item_source'] = $child;
-							$row['item_target'] = ''; // TODO
+// 							$row['item_target'] = $child['target']; TODO
 							if (isset($item)) {
-								if ((isset($uidOwner) && $row['item'] == $item) || $row['item_target'] == $item) {
+								if ($row[$column] == $item) {
 									// Return only the item instead of a 2-dimensional array
 									if ($limit == 1 && $format == self::FORMAT_NONE) {
 										return $row;
@@ -544,29 +569,22 @@ class Share {
 						}
 					}
 				} else {
-					$items[] = $row;
+					$items[$row['id']] = $row;
 				}
 			}
 			if (!empty($items)) {
-				error_log(var_export($items, true));
 				if ($format == self::FORMAT_NONE) {
 					return $items;
 				} else if ($format == self::FORMAT_STATUSES) {
 					$statuses = array();
 					foreach ($items as $item) {
 						if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
-							$statuses[$item['item']] = true;
-						} else if (!isset($statuses[$item['item']])) {
-							$statuses[$item['item']] = false;
+							$statuses[$item[$column]] = true;
+						} else if (!isset($statuses[$item[$column]])) {
+							$statuses[$item[$column]] = false;
 						}
 					}
 					return $statuses;
-				} else if ($format == self::FORMAT_SOURCES) {
-					$sources = array();
-					foreach ($items as $item) {
-						$sources[] = $item['item_source'];
-					}
-					return $sources;
 				} else {
 					return $backend->formatItems($items, $format, $parameters);
 				}
@@ -580,17 +598,17 @@ class Share {
 	/**
 	* @brief Put shared item into the database
 	* @param string Item type
-	* @param string Item
+	* @param string Item source
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @param bool|array Parent folder target (optional)
 	* @return bool Returns true on success or false on failure
 	*/
-	private static function put($itemType, $item, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
+	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
-			$extension = strtolower(substr($item, strrpos($item, '.') + 1));
+			$extension = strtolower(substr($itemSource, strrpos($itemSource, '.') + 1));
 			foreach (self::$backends as $type => $backend) {
 				if (isset($backend->dependsOn) && $backend->dependsOn == 'file' && isset($backend->supportedFileExtensions) && in_array($extension, $backend->supportedFileExtensions)) {
 					$itemType = $type;
@@ -604,7 +622,8 @@ class Share {
 		}
 		if ($backend = self::getBackend($itemType)) {
 			// Check if this is a reshare
-			if ($checkReshare = self::getItemSharedWith($itemType, $item)) {
+			// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
+			if ($checkReshare = self::getItemSharedWith($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
 				if ($checkReshare['permissions'] & self::PERMISSION_SHARE) {
 					// TODO Don't check if inside folder
 					$parent = $checkReshare['id'];
@@ -612,77 +631,78 @@ class Share {
 					$fileSource = $checkReshare['file_source'];
 					$fileTarget = $checkReshare['file_target'];
 				} else {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because resharing is not allowed', \OC_Log::ERROR);
+					\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because resharing is not allowed', \OC_Log::ERROR);
 					return false;
 				}
 			} else {
 				$parent = null;
-				$source = $backend->getSource($item, $uidOwner);
-				if (!$source) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the sharing backend for '.$itemType.' could not find its source', \OC_Log::ERROR);
+				if (!$backend->isValidSource($itemSource, $uidOwner)) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the sharing backend for '.$itemType.' could not find its source', \OC_Log::ERROR);
 					return false;
-				} else if (is_array($source)) {
-					$itemSource = $source['item'];
-					$fileSource = \OC_FileCache::getId($source['file']);
+				}
+				$parent = null;
+				if ($backend instanceof Share_Backend_File_Dependent) {
+					// NOTE Apps should start using the file cache ids in their tables
+					$filePath = $backend->getFilePath($itemSource, $uidOwner);
+					$fileSource = \OC_FileCache::getId($filePath);
 					if ($fileSource == -1) {
-						\OC_Log::write('OCP\Share', 'Sharing '.$item.' failed, because the file could not be found in the file cache', \OC_Log::ERROR);
+						\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache', \OC_Log::ERROR);
 						return false;
 					}
 				} else {
-					$itemSource = $source;
 					$fileSource = null;
 				}
 			}
-			$query = \OC_DB::prepare('INSERT INTO *PREFIX*share (item_type, item, item_source, item_target, parent, share_type, share_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+			$query = \OC_DB::prepare('INSERT INTO *PREFIX*share (item_type, item_source, item_target, parent, share_type, share_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
 			// Share with a group
 			if ($shareType == self::SHARE_TYPE_GROUP) {
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
+							$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
 							// Set group default file target for future use
 							$parentFolders[0]['folder'] = $groupFileTarget;
 						} else {
 							// Get group default file target
-							$groupFileTarget = $parentFolder[0]['folder'].$item;
+							$groupFileTarget = $parentFolder[0]['folder'].$itemSource;
 							$parent = $parentFolder[0]['id'];
 							unset($parentFolder[0]);
 							// Only loop through users we know have different file target paths
 							$uidSharedWith = array_keys($parentFolder);
 						}
 					} else {
-						$groupFileTarget = self::getBackend('file')->generateTarget($source['file'], false);
+						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
 					}
 				} else {
 					$groupFileTarget = null;
 				}
-				$groupItemTarget = $backend->generateTarget($item, false);
-				$query->execute(array($itemType, $item, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+				$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
+				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
 				// Save this id, any extra rows for this group share will need to reference it
 				$parent = \OC_DB::insertid('*PREFIX*share');
 				// Loop through all users of this group in case we need to add an extra row
 				foreach ($shareWith['users'] as $uid) {
-					$itemTarget = $backend->generateTarget($item, $uid);
+					$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid);
 					if (isset($fileSource)) {
 						if ($parentFolder) {
 							if ($parentFolder === true) {
-								$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
+								$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
 								if ($fileTarget != $groupFileTarget) {
 									$parentFolders[$uid]['folder'] = $fileTarget;
 								}
 							} else if (isset($parentFolder[$uid])) {
-								$fileTarget = $parentFolder[$uid]['folder'].$item;
+								$fileTarget = $parentFolder[$uid]['folder'].$itemSource;
 								$parent = $parentFolder[$uid]['id'];
 							}
 						} else {
-							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
+							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
 						}
 					} else {
 						$fileTarget = null;
 					}
 					// Insert an extra row for the group share if the item or file target is unique for this user
 					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-						$query->execute(array($itemType, $item, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 						$id = \OC_DB::insertid('*PREFIX*share');
 					}
 					if ($parentFolder === true) {
@@ -694,31 +714,23 @@ class Share {
 					return $parentFolders;
 				}
 			} else {
-				if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
-					$itemTarget = null;
-				} else {
-					$itemTarget = $backend->generateTarget($item, $shareWith);
-				}
+				$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $shareWith);
+							$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
 							$parentFolders['folder'] = $fileTarget;
 						} else {
-							$fileTarget = $parentFolder['folder'].$item;
+							$fileTarget = $parentFolder['folder'].$itemSource;
 							$parent = $parentFolder['id'];
 						}
 					} else {
-						if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
-							$fileTarget = basename($source['file']);
-						} else {
-							$fileTarget = self::getBackend('file')->generateTarget($source['file'], $shareWith);
-						}
+						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
 					}
 				} else {
 					$fileTarget = null;
 				}
-				$query->execute(array($itemType, $item, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+				$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 				$id = \OC_DB::insertid('*PREFIX*share');
 				if ($parentFolder === true) {
 					$parentFolders['id'] = $id;
@@ -731,6 +743,54 @@ class Share {
 		return false;
 	}
 
+	/**
+	* @brief Generate a unique target for the item
+	* @param string Item type
+	* @param string Item source
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param string User or group the item is being shared with
+	* @return string Item target
+	*/
+	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith) {
+		if ($backend = self::getBackend($itemType)) {
+			if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
+				return $backend->generateTarget($itemSource, false);
+			} else {
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$column = 'file_target';
+				} else {
+					$column = 'item_target';
+				}
+				$exclude = null;
+				// Backend has 3 opportunities to generate a unique target
+				for ($i = 0; $i < 2; $i++) {
+					if ($shareType == self::SHARE_TYPE_GROUP) {
+						$target = $backend->generateTarget($itemSource, false, $exclude);
+					} else {
+						$target = $backend->generateTarget($itemSource, $shareWith, $exclude);
+					}
+					if (is_array($exclude) && in_array($target, $exclude)) {
+						break;
+					}
+					// Check if target already exists
+					if ($checkTarget = self::getItems($itemType, $target, $shareType, $shareWith, null, self::FORMAT_NONE, null, 1)) {
+						// Find similar targets to improve backend's chances to generate a unqiue target
+						// TODO query needs to be setup like getItems
+						$checkTargets = \OC_DB::prepare('SELECT item_target FROM *PREFIX*share WHERE item_type = ? AND share_with = ? AND '.$column.' LIKE ?');
+						$result = $checkTargets->execute(array($itemType, $shareWith, '%'.$target.'%'));
+						while ($row = $result->fetchRow()) {
+							$exclude[] = $row[$column];
+						}
+					} else {
+						return $target;
+					}
+				}
+			}
+		}
+		\OC_Log::write('OCP\Share', 'Backend did not generate a unique target', \OC_Log::ERROR);
+		return false;
+	}
+
 	/**
 	* @brief Delete all reshares of an item
 	* @param int Id of item to delete
@@ -803,16 +863,13 @@ class Share {
 }
 
 /**
-* Abstract backend class that apps must extend to share content.
+* Interface that apps must implement to share content.
 */
-abstract class Share_Backend {
-
-	public $dependsOn;
-	public $supportedFileExtensions = array();
+interface Share_Backend {
 
 	/**
 	* @brief Get the source of the item to be stored in the database
-	* @param string Item
+	* @param string Item source
 	* @param string Owner of the item
 	* @return mixed|array|false Source
 	*
@@ -821,13 +878,11 @@ abstract class Share_Backend {
 	*
 	* The formatItems() function will translate the source returned back into the item
 	*/
-	public abstract function getSource($item, $uid);
-
-
+	public function isValidSource($itemSource, $uidOwner);
 
 	/**
 	* @brief Get a unique name of the item for the specified user
-	* @param string Item
+	* @param string Item source
 	* @param string|false User the item is being shared with
 	* @param array|null List of similar item names already existing as shared items
 	* @return string Target name
@@ -835,9 +890,7 @@ abstract class Share_Backend {
 	* This function needs to verify that the user does not already have an item with this name.
 	* If it does generate a new name e.g. name_#
 	*/
-	public abstract function generateTarget($item, $uid, $exclude = null);
-
-
+	public function generateTarget($itemSource, $shareWith, $exclude = null);
 
 	/**
 	* @brief Converts the shared item sources back into the item in the specified format
@@ -852,19 +905,38 @@ abstract class Share_Backend {
 	* This function allows the backend to control the output of shared items with custom formats.
 	* It is only called through calls to the public getItem(s)Shared(With) functions.
 	*/
-	public abstract function formatItems($items, $format, $parameters = null);
-
+	public function formatItems($items, $format, $parameters = null);
 
 }
 
-abstract class Share_Backend_Collection extends Share_Backend {
+/**
+* Interface for share backends that share content that is dependent on files. 
+* Extends the Share_Backend interface.
+*/
+interface Share_Backend_File_Dependent extends Share_Backend {
+
+	/**
+	* @brief Get the file path of the item
+	* @param 
+	* @param
+	* @return
+	*/
+	public function getFilePath($itemSource, $uidOwner);
+
+}
+
+/**
+* Interface for collections of of items implemented by another share backend.
+* Extends the Share_Backend interface.
+*/
+interface Share_Backend_Collection extends Share_Backend {
 
 	/**
 	* @brief Get the sources of the children of the item
-	* @param string Item
+	* @param string Item source
 	* @return array Returns an array of sources
 	*/
-	public abstract function getChildren($item);
+	public function getChildren($itemSource);
     
 }
 

From 2554f674dec321d53f33af85b047da7789a80c29 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 12:22:47 -0400
Subject: [PATCH 1283/1537] Database scheme for share API

---
 db_structure.xml | 115 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/db_structure.xml b/db_structure.xml
index f6dedab0a1..bce71619f2 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -506,6 +506,121 @@
 
  </table>
 
+  <table>
+
+  <name>*dbprefix*share</name>
+
+  <declaration>
+
+   <field>
+    <name>id</name>
+    <autoincrement>1</autoincrement>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <length>4</length>
+   </field>
+
+   <field>
+    <name>share_type</name>
+    <type>integer</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>1</length>
+   </field>
+   
+   <field>
+    <name>share_with</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+   
+   <field>
+    <name>uid_owner</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+   
+   <field>
+    <name>parent</name>
+    <type>integer</type>
+    <default></default>
+    <notnull>false</notnull>
+    <length>4</length>
+   </field>
+   
+   <field>
+    <name>item_type</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>64</length>
+   </field>
+   
+   <field>
+    <name>item_source</name>
+    <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
+    <length>255</length>
+   </field>
+      
+   <field>
+    <name>item_target</name>
+    <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
+    <length>255</length>
+   </field>
+   
+   <field>
+    <name>file_source</name>
+    <type>integer</type>
+    <default></default>
+    <notnull>false</notnull>
+    <length>4</length>
+   </field>
+      
+   <field>
+    <name>file_target</name>
+    <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
+    <length>512</length>
+   </field>
+
+   <field>
+    <name>permissions</name>
+    <type>integer</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>1</length>
+   </field>
+   
+   <field>
+    <name>stime</name>
+    <type>integer</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>8</length>
+   </field>
+   
+   <field>
+    <name>accepted</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <length>1</length>
+   </field>
+
+  </declaration>
+
+ </table>
+ 
  <table>
 
   <name>*dbprefix*users</name>

From fe6450002d6059260c743f48b6f40378454fa1dc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 6 Aug 2012 18:49:06 +0200
Subject: [PATCH 1284/1537] Change hardcoded urls to use linkTo function

---
 apps/calendar/index.php                             | 13 +++++++++++--
 .../templates/part.choosecalendar.rowfields.php     |  2 +-
 apps/calendar/templates/part.editevent.php          |  6 +++---
 apps/calendar/templates/part.newevent.php           |  2 +-
 apps/gallery/js/pictures.js                         |  4 ++--
 lib/util.php                                        | 10 ++++++++--
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 4b87119592..cbfe0027b7 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -24,8 +24,17 @@ foreach($calendars as $calendar){
 	}
 }
 
-$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true');
-$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_r', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable' => 'false');
+$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');
+$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_rw',
+		'backgroundColor' => '#1D2D44',
+		'borderColor' => '#888',
+		'textColor' => 'white',
+		'editable'=>'true');
+$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_r',
+		'backgroundColor' => '#1D2D44',
+		'borderColor' => '#888',
+		'textColor' => 'white',
+		'editable' => 'false');
 
 OCP\Util::emitHook('OC_Calendar', 'getSources', array('sources' => &$eventSources));
 $categories = OC_Calendar_App::getCategoryOptions();
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index 4492ce731c..d29113c9a6 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -11,7 +11,7 @@
   <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo rawurlencode(html_entity_decode($_['calendar']['uri'], ENT_QUOTES, 'UTF-8')) ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>
 </td>
 <td width="20px">
-  <a href="?app=calendar&amp;getfile=export.php?calid=<?php echo $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
+  <a href="<?php echo OCP\Util::linkTo('calendar', 'export.php') . '?calid=' . $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
 </td>
 <td width="20px">
   <a href="#" onclick="Calendar.UI.Calendar.edit(this, <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Edit') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>"></a>
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
index 102366f8f0..ea91192cc6 100644
--- a/apps/calendar/templates/part.editevent.php
+++ b/apps/calendar/templates/part.editevent.php
@@ -5,9 +5,9 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/edit.php');">
-		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('?app=calendar&getfile=ajax/event/delete.php');">
-		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='?app=calendar&getfile=export.php?eventid=<?php echo $_['eventid'] ?>';">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/edit.php') ?>');">
+		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/delete.php') ?>');">
+		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='<?php echo OCP\Util::linkTo('calendar', 'export.php') ?>?eventid=<?php echo $_['eventid'] ?>';">
 	</span>
 	</form>
 </div>
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
index f4bb867b18..a4f48aecbc 100644
--- a/apps/calendar/templates/part.newevent.php
+++ b/apps/calendar/templates/part.newevent.php
@@ -3,7 +3,7 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/new.php');">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/new.php') ?>');">
 	</span>
 	</form>
 </div>
diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js
index 91fbf5be96..47f727e0de 100644
--- a/apps/gallery/js/pictures.js
+++ b/apps/gallery/js/pictures.js
@@ -61,8 +61,8 @@ function deplode(element) {
 
 function openNewGal(album_name) {
 	root = root + decodeURIComponent(album_name) + "/";
-	var url = window.location.toString().replace(window.location.search, '');
-	url = url + "?app=gallery&root="+encodeURIComponent(root);
+	var url = window.location.protocol+"//"+window.location.hostname+OC.linkTo('gallery', 'index.php');
+	url = url + "?root="+encodeURIComponent(root);
 
 	window.location = url;
 }
diff --git a/lib/util.php b/lib/util.php
index 6e62ed9bf5..f26fa63e44 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -343,10 +343,16 @@ class OC_Util {
 			$location = $_REQUEST['redirect_url'];
 		}
 		else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
-			$location = OC::$WEBROOT.'/?app='.OC::$REQUESTEDAPP;
+			$location = OC_Helper::linkToAbsolute( OC::$REQUESTEDAPP, 'index.php' );
 		}
 		else {
-			$location = OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files');
+			$defaultpage = OC_Appconfig::getValue('core', 'defaultpage');
+			if ($defaultpage) {
+				$location = OC_Helper::serverProtocol().'://'.OC_Helper::serverHost().OC::$WEBROOT.'/'.$defaultpage;
+			}
+			else {
+				$location = OC_Helper::linkToAbsolute( 'files', 'index.php' );
+			}
 		}
 		OC_Log::write('core', 'redirectToDefaultPage: '.$location, OC_Log::DEBUG);
 		header( 'Location: '.$location );

From 4f105740653fa6c323551dcd821fb29ca8ecfb7c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 13:30:44 -0400
Subject: [PATCH 1285/1537] Don't load item if it doesn't have it status set

---
 core/js/share.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index dd790d004e..48fbc9c4f4 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -30,7 +30,7 @@ OC.Share={
 	},
 	loadItem:function(itemType, item) {
 		var data = '';
-// 		if (typeof OC.Share.statuses[item] !== 'undefined') {
+		if (typeof OC.Share.statuses[item] !== 'undefined') {
 			$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, item: item }, async: false, success: function(result) {
 				if (result && result.status === 'success') {
 					data = result.data;
@@ -38,7 +38,7 @@ OC.Share={
 					data = false;
 				}
 			}});
-// 		}
+		}
 		return data;
 	},
 	share:function(itemType, item, shareType, shareWith, permissions, callback) {

From ba0cf9817526e1206a25a5fe6d70255ab3c9e3bc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 13:33:53 -0400
Subject: [PATCH 1286/1537] Remove extra line, caused 'headers already sent'
 issues

---
 apps/files_sharing/lib/share/file.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 927e9462f2..66be5f2b15 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
 * ownCloud

From 1db1d40414587c9adef663ef45aaa198c2b2ece0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 13:58:26 -0400
Subject: [PATCH 1287/1537] Add additional check for post_deleteUser so we
 don't delete any non-user shares with the same name

---
 lib/public/share.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 1ebbbccc90..26dd1369a2 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -833,8 +833,8 @@ class Share {
 	
 	public static function post_deleteUser($arguments) {
 		// Delete any items shared with the deleted user
-		$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE share_with = ?');
-		$result = $query->execute(array($arguments['uid']));
+		$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE share_with = ? AND share_type = ? OR share_type = ?');
+		$result = $query->execute(array($arguments['uid'], self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique));
 		// Delete any items the deleted user shared
 		$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE uid_owner = ?');
 		$result = $query->execute(array($arguments['uid']));

From e280e3ecc9e96a996751f5ae8f5303461f928c58 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 14:09:58 -0400
Subject: [PATCH 1288/1537] Throw more exceptions

---
 lib/public/share.php | 588 +++++++++++++++++++++----------------------
 1 file changed, 293 insertions(+), 295 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 26dd1369a2..b819924dae 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -281,36 +281,34 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function setTarget($itemType, $oldTarget, $newTarget) {
-		if ($backend = self::getBackend($itemType)) {
-			$uidSharedWith = \OC_User::getUser();
-			// TODO Check permissions for setting target?
-			if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, null, 1, false)) {
-				// TODO Fix
-				// Check if this is a group share
-				if ($item['uid_shared_with'] == null) {
-					// A new entry needs to be created exclusively for the user
-					$query = \OC_DB::prepare('INSERT INTO *PREFIX*share VALUES(?,?,?,?,?,?,?,?,?,?)');
-					if (isset($item['file_target'])) {
-						$fileTarget = $newTarget;
-					} else {
-						$fileTarget = null;
-					}
-					$query->execute(array($itemType, $item['item_source'], $newTarget, $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], $item['permissions'], $item['stime'], $item['file_source'], $fileTarget));
-					return true;
+		$backend = self::getBackend($itemType);
+		$uidSharedWith = \OC_User::getUser();
+		// TODO Check permissions for setting target?
+		if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, null, 1, false)) {
+			// TODO Fix
+			// Check if this is a group share
+			if ($item['uid_shared_with'] == null) {
+				// A new entry needs to be created exclusively for the user
+				$query = \OC_DB::prepare('INSERT INTO *PREFIX*share VALUES(?,?,?,?,?,?,?,?,?,?)');
+				if (isset($item['file_target'])) {
+					$fileTarget = $newTarget;
 				} else {
-					// Check if this item is a file or folder, update the file_target as well if this is the case
-					if ($itemType == 'file' || $itemType == 'folder') {
-						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ?, file_target = REPLACE(file_target, ?, ?) WHERE uid_shared_with = ?');
-						$query->execute(array($newTarget, $oldTarget, $newTarget, $uidSharedWith));
-					} else {
-						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ? WHERE item_type = ? AND item_target = ? AND uid_shared_with = ?');
-						$query->execute(array($newTarget, $itemType, $oldTarget, $uidSharedWith));
-					}
-					return true;
+					$fileTarget = null;
 				}
+				$query->execute(array($itemType, $item['item_source'], $newTarget, $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], $item['permissions'], $item['stime'], $item['file_source'], $fileTarget));
+				return true;
+			} else {
+				// Check if this item is a file or folder, update the file_target as well if this is the case
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ?, file_target = REPLACE(file_target, ?, ?) WHERE uid_shared_with = ?');
+					$query->execute(array($newTarget, $oldTarget, $newTarget, $uidSharedWith));
+				} else {
+					$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ? WHERE item_type = ? AND item_target = ? AND uid_shared_with = ?');
+					$query->execute(array($newTarget, $itemType, $oldTarget, $uidSharedWith));
+				}
+				return true;
 			}
 		}
-		return false;
 	}
 
 	/**
@@ -385,17 +383,20 @@ class Share {
 			if (class_exists($class)) {
 				self::$backends[$itemType] = new $class;
 				if (!(self::$backends[$itemType] instanceof Share_Backend)) {
-					\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' must implement the interface OCP\Share_Backend', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing backend '.$class.' must implement the interface OCP\Share_Backend';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				}
 				return self::$backends[$itemType];
 			} else {
-				\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not found', \OC_Log::ERROR);
-				return false;
+				$message = 'Sharing backend '.$class.' not found';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
 			}
 		}
-		\OC_Log::write('OCP\Share', 'Sharing backend for '.$itemType.' not found', \OC_Log::ERROR);
-		return false;
+		$message = 'Sharing backend for '.$itemType.' not found';
+		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+		throw new \Exception($message);
 	}
 
 	/**
@@ -434,164 +435,163 @@ class Share {
 	*
 	*/
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) {
-		if ($backend = self::getBackend($itemType)) {
-			// Get filesystem root to add it to the file target and remove from the file source
-			$root = \OC_Filesystem::getRoot();
-			// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
-			if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-				$where = "WHERE item_type IN ('".implode("','", array_merge(array($itemType), $collectionTypes))."')";
+		$backend = self::getBackend($itemType);
+		// Get filesystem root to add it to the file target and remove from the file source
+		$root = \OC_Filesystem::getRoot();
+		// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
+		if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+			$where = "WHERE item_type IN ('".implode("','", array_merge(array($itemType), $collectionTypes))."')";
+		} else {
+			$where = "WHERE item_type = '".$itemType."'";
+		}
+		if (isset($shareType) && isset($shareWith)) {
+			// Include all user and group items
+			if ($shareType == self::$shareTypeUserAndGroups) {
+				$where .= " AND share_type IN (".self::SHARE_TYPE_USER.",".self::SHARE_TYPE_GROUP.",".self::$shareTypeGroupUserUnique.")";
+				$groups = \OC_Group::getUserGroups($shareWith);
+				$userAndGroups = array_merge(array($shareWith), $groups);
+				$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
 			} else {
-				$where = "WHERE item_type = '".$itemType."'";
+				$where .= " AND share_type = ".$shareType." AND share_with = '".$shareWith."'";
 			}
-			if (isset($shareType) && isset($shareWith)) {
-				// Include all user and group items
-				if ($shareType == self::$shareTypeUserAndGroups) {
-					$where .= " AND share_type IN (".self::SHARE_TYPE_USER.",".self::SHARE_TYPE_GROUP.",".self::$shareTypeGroupUserUnique.")";
-					$groups = \OC_Group::getUserGroups($shareWith);
-					$userAndGroups = array_merge(array($shareWith), $groups);
-					$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
-				} else {
-					$where .= " AND share_type = ".$shareType." AND share_with = '".$shareWith."'";
-				}
+		}
+		if (isset($uidOwner)) {
+			$where .= " AND uid_owner = '".$uidOwner."'";
+			if (!isset($shareType)) {
+				// Prevent unique user targets for group shares from being selected
+				$where .= " AND share_type != '".self::$shareTypeGroupUserUnique."'";
 			}
+			if ($itemType == 'file' || $itemType == 'folder') {
+				$where = "INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ".$where;
+				$column = 'file_source';
+			} else {
+				$column = 'item_source';
+			}
+		} else {
+			if ($itemType == 'file' || $itemType == 'folder') {
+				$column = 'file_target';
+			} else {
+				$column = 'item_target';
+			}
+		}
+		if (isset($item)) {
+			// If looking for own shared items, check item_source else check item_target
 			if (isset($uidOwner)) {
-				$where .= " AND uid_owner = '".$uidOwner."'";
-				if (!isset($shareType)) {
-					// Prevent unique user targets for group shares from being selected
-					$where .= " AND share_type != '".self::$shareTypeGroupUserUnique."'";
-				}
+				// If item type is a file, file source needs to be checked in case the item was converted
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where = "INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ".$where;
-					$column = 'file_source';
+					$where .= " AND path = '".$root.$item."'";
 				} else {
-					$column = 'item_source';
+					$where .= " AND item_source = '".$item."'";
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$column = 'file_target';
+					$where .= " AND file_target = '".$item."'";
 				} else {
-					$column = 'item_target';
+					$where .= " AND item_target = '".$item."'";
 				}
 			}
-			if (isset($item)) {
-				// If looking for own shared items, check item_source else check item_target
-				if (isset($uidOwner)) {
-					// If item type is a file, file source needs to be checked in case the item was converted
-					if ($itemType == 'file' || $itemType == 'folder') {
-						$where .= " AND path = '".$root.$item."'";
-					} else {
-						$where .= " AND item_source = '".$item."'";
-					}
-				} else {
-					if ($itemType == 'file' || $itemType == 'folder') {
-						$where .= " AND file_target = '".$item."'";
-					} else {
-						$where .= " AND item_target = '".$item."'";
-					}
-				}
-				if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-					$where .= " OR item_type IN ('".implode("','", $collectionTypes)."')";
-				}
+			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+				$where .= " OR item_type IN ('".implode("','", $collectionTypes)."')";
 			}
-			if ($limit != -1 && !$includeCollections) {
-				if ($shareType == self::$shareTypeUserAndGroups) {
-					// Make sure the unique user target is returned if it exists, unique targets should follow the group share in the database
-					// If the limit is not 1, the filtering can be done later
-					$where .= ' ORDER BY *PREFIX*share.id DESC';
-				}
-				$where .= ' LIMIT '.$limit;
+		}
+		if ($limit != -1 && !$includeCollections) {
+			if ($shareType == self::$shareTypeUserAndGroups) {
+				// Make sure the unique user target is returned if it exists, unique targets should follow the group share in the database
+				// If the limit is not 1, the filtering can be done later
+				$where .= ' ORDER BY *PREFIX*share.id DESC';
 			}
-			if ($format == self::FORMAT_STATUSES) {
+			$where .= ' LIMIT '.$limit;
+		}
+		if ($format == self::FORMAT_STATUSES) {
+			if ($itemType == 'file' || $itemType == 'folder') {
+				$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
+			} else {
+				$select = 'id, item_source, parent, share_type';
+			}
+		} else {
+			if (isset($uidOwner)) {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
+					$select = '*PREFIX*share.id, item_type, *PREFIX*fscache.path as file_source, *PREFIX*share.parent, share_type, share_with, permissions, stime';
 				} else {
-					$select = 'id, item_source, parent, share_type';
+					$select = 'id, item_type, item_source, parent, share_type, share_with, permissions, stime, file_source';
 				}
 			} else {
-				if (isset($uidOwner)) {
-					if ($itemType == 'file' || $itemType == 'folder') {
-						$select = '*PREFIX*share.id, item_type, *PREFIX*fscache.path as file_source, *PREFIX*share.parent, share_type, share_with, permissions, stime';
-					} else {
-						$select = 'id, item_type, item_source, parent, share_type, share_with, permissions, stime, file_source';
-					}
-				} else {
-					$select = '*';
-				}
+				$select = '*';
 			}
-			$root = strlen($root);
-			$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
-			$result = $query->execute();
-			$items = array();
-			while ($row = $result->fetchRow()) {
-				// Return only the item instead of a 2-dimensional array
-				if ($limit == 1 && $row['item_type'] == $itemType && $row[$column] == $item) {
-					if ($format == self::FORMAT_NONE) {
-						return $row;
-					} else {
-						$items[$row['id']] = $row;
-						break;
-					}
-				}
-				// Filter out duplicate group shares for users with unique targets
-				if ($row['share_type'] == self::$shareTypeGroupUserUnique) {
-					// Remove the parent group share
-					unset($items[$row['parent']]);
-				}
-				// Remove root from file source paths
-				if (isset($uidOwner) && isset($row['file_source'])) {
-					$row['file_source'] = substr($row['file_source'], $root);
-				}
-				// TODO Check this outside of the loop
-				// Check if this is a collection of the requested item type
-				if ($row['item_type'] != $itemType) {
-					if ($collectionBackend = self::getBackend($row['item_type'])) {
-						$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
-						// Fetch all of the children sources
-						$children = $collectionBackend->getChildren($row[$column]);
-						foreach ($children as $child) {
-							$row['item_source'] = $child;
-// 							$row['item_target'] = $child['target']; TODO
-							if (isset($item)) {
-								if ($row[$column] == $item) {
-									// Return only the item instead of a 2-dimensional array
-									if ($limit == 1 && $format == self::FORMAT_NONE) {
-										return $row;
-									} else {
-										// Unset the items array and break out of both loops
-										$items = array();
-										$items[] = $row;
-										break 2;
-									}
-								}
-							} else {
-								$items[] = $row;
-							}
-						}
-					}
+		}
+		$root = strlen($root);
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
+		$result = $query->execute();
+		$items = array();
+		while ($row = $result->fetchRow()) {
+			// Return only the item instead of a 2-dimensional array
+			if ($limit == 1 && $row['item_type'] == $itemType && $row[$column] == $item) {
+				if ($format == self::FORMAT_NONE) {
+					return $row;
 				} else {
 					$items[$row['id']] = $row;
+					break;
 				}
 			}
-			if (!empty($items)) {
-				if ($format == self::FORMAT_NONE) {
-					return $items;
-				} else if ($format == self::FORMAT_STATUSES) {
-					$statuses = array();
-					foreach ($items as $item) {
-						if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
-							$statuses[$item[$column]] = true;
-						} else if (!isset($statuses[$item[$column]])) {
-							$statuses[$item[$column]] = false;
+			// Filter out duplicate group shares for users with unique targets
+			if ($row['share_type'] == self::$shareTypeGroupUserUnique) {
+				// Remove the parent group share
+				unset($items[$row['parent']]);
+			}
+			// Remove root from file source paths
+			if (isset($uidOwner) && isset($row['file_source'])) {
+				$row['file_source'] = substr($row['file_source'], $root);
+			}
+			// TODO Check this outside of the loop
+			// Check if this is a collection of the requested item type
+			if ($row['item_type'] != $itemType) {
+				if ($collectionBackend = self::getBackend($row['item_type'])) {
+					$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
+					// Fetch all of the children sources
+					$children = $collectionBackend->getChildren($row[$column]);
+					foreach ($children as $child) {
+						$row['item_source'] = $child;
+// 							$row['item_target'] = $child['target']; TODO
+						if (isset($item)) {
+							if ($row[$column] == $item) {
+								// Return only the item instead of a 2-dimensional array
+								if ($limit == 1 && $format == self::FORMAT_NONE) {
+									return $row;
+								} else {
+									// Unset the items array and break out of both loops
+									$items = array();
+									$items[] = $row;
+									break 2;
+								}
+							}
+						} else {
+							$items[] = $row;
 						}
 					}
-					return $statuses;
-				} else {
-					return $backend->formatItems($items, $format, $parameters);
 				}
-			} else if ($limit == 1 || (isset($uidOwner) && isset($item))) {
-				return false;
+			} else {
+				$items[$row['id']] = $row;
 			}
 		}
+		if (!empty($items)) {
+			if ($format == self::FORMAT_NONE) {
+				return $items;
+			} else if ($format == self::FORMAT_STATUSES) {
+				$statuses = array();
+				foreach ($items as $item) {
+					if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
+						$statuses[$item[$column]] = true;
+					} else if (!isset($statuses[$item[$column]])) {
+						$statuses[$item[$column]] = false;
+					}
+				}
+				return $statuses;
+			} else {
+				return $backend->formatItems($items, $format, $parameters);
+			}
+		} else if ($limit == 1 || (isset($uidOwner) && isset($item))) {
+			return false;
+		}
 		return array();
 	}
 
@@ -620,127 +620,125 @@ class Share {
 				return false;
 			}
 		}
-		if ($backend = self::getBackend($itemType)) {
-			// Check if this is a reshare
-			// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
-			if ($checkReshare = self::getItemSharedWith($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
-				if ($checkReshare['permissions'] & self::PERMISSION_SHARE) {
-					// TODO Don't check if inside folder
-					$parent = $checkReshare['id'];
-					$itemSource = $checkReshare['item_source'];
-					$fileSource = $checkReshare['file_source'];
-					$fileTarget = $checkReshare['file_target'];
-				} else {
-					\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because resharing is not allowed', \OC_Log::ERROR);
-					return false;
-				}
+		$backend = self::getBackend($itemType);
+		// Check if this is a reshare
+		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
+		if ($checkReshare = self::getItemSharedWith($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
+			if ($checkReshare['permissions'] & self::PERMISSION_SHARE) {
+				// TODO Don't check if inside folder
+				$parent = $checkReshare['id'];
+				$itemSource = $checkReshare['item_source'];
+				$fileSource = $checkReshare['file_source'];
+				$fileTarget = $checkReshare['file_target'];
 			} else {
-				$parent = null;
-				if (!$backend->isValidSource($itemSource, $uidOwner)) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the sharing backend for '.$itemType.' could not find its source', \OC_Log::ERROR);
-					return false;
-				}
-				$parent = null;
-				if ($backend instanceof Share_Backend_File_Dependent) {
-					// NOTE Apps should start using the file cache ids in their tables
-					$filePath = $backend->getFilePath($itemSource, $uidOwner);
-					$fileSource = \OC_FileCache::getId($filePath);
-					if ($fileSource == -1) {
-						\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache', \OC_Log::ERROR);
-						return false;
-					}
-				} else {
-					$fileSource = null;
-				}
+				\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because resharing is not allowed', \OC_Log::ERROR);
+				return false;
 			}
-			$query = \OC_DB::prepare('INSERT INTO *PREFIX*share (item_type, item_source, item_target, parent, share_type, share_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
-			// Share with a group
-			if ($shareType == self::SHARE_TYPE_GROUP) {
-				if (isset($fileSource)) {
-					if ($parentFolder) {
-						if ($parentFolder === true) {
-							$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
-							// Set group default file target for future use
-							$parentFolders[0]['folder'] = $groupFileTarget;
-						} else {
-							// Get group default file target
-							$groupFileTarget = $parentFolder[0]['folder'].$itemSource;
-							$parent = $parentFolder[0]['id'];
-							unset($parentFolder[0]);
-							// Only loop through users we know have different file target paths
-							$uidSharedWith = array_keys($parentFolder);
-						}
-					} else {
-						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
-					}
-				} else {
-					$groupFileTarget = null;
-				}
-				$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
-				$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
-				// Save this id, any extra rows for this group share will need to reference it
-				$parent = \OC_DB::insertid('*PREFIX*share');
-				// Loop through all users of this group in case we need to add an extra row
-				foreach ($shareWith['users'] as $uid) {
-					$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid);
-					if (isset($fileSource)) {
-						if ($parentFolder) {
-							if ($parentFolder === true) {
-								$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
-								if ($fileTarget != $groupFileTarget) {
-									$parentFolders[$uid]['folder'] = $fileTarget;
-								}
-							} else if (isset($parentFolder[$uid])) {
-								$fileTarget = $parentFolder[$uid]['folder'].$itemSource;
-								$parent = $parentFolder[$uid]['id'];
-							}
-						} else {
-							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
-						}
-					} else {
-						$fileTarget = null;
-					}
-					// Insert an extra row for the group share if the item or file target is unique for this user
-					if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-						$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-						$id = \OC_DB::insertid('*PREFIX*share');
-					}
-					if ($parentFolder === true) {
-						$parentFolders['id'] = $id;
-					}
-				}
-				if ($parentFolder === true) {
-					// Return parent folders to preserve file target paths for potential children
-					return $parentFolders;
+		} else {
+			$parent = null;
+			if (!$backend->isValidSource($itemSource, $uidOwner)) {
+				\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the sharing backend for '.$itemType.' could not find its source', \OC_Log::ERROR);
+				return false;
+			}
+			$parent = null;
+			if ($backend instanceof Share_Backend_File_Dependent) {
+				// NOTE Apps should start using the file cache ids in their tables
+				$filePath = $backend->getFilePath($itemSource, $uidOwner);
+				$fileSource = \OC_FileCache::getId($filePath);
+				if ($fileSource == -1) {
+					\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache', \OC_Log::ERROR);
+					return false;
 				}
 			} else {
-				$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
+				$fileSource = null;
+			}
+		}
+		$query = \OC_DB::prepare('INSERT INTO *PREFIX*share (item_type, item_source, item_target, parent, share_type, share_with, uid_owner, permissions, stime, file_source, file_target) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+		// Share with a group
+		if ($shareType == self::SHARE_TYPE_GROUP) {
+			if (isset($fileSource)) {
+				if ($parentFolder) {
+					if ($parentFolder === true) {
+						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+						// Set group default file target for future use
+						$parentFolders[0]['folder'] = $groupFileTarget;
+					} else {
+						// Get group default file target
+						$groupFileTarget = $parentFolder[0]['folder'].$itemSource;
+						$parent = $parentFolder[0]['id'];
+						unset($parentFolder[0]);
+						// Only loop through users we know have different file target paths
+						$uidSharedWith = array_keys($parentFolder);
+					}
+				} else {
+					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+				}
+			} else {
+				$groupFileTarget = null;
+			}
+			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
+			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+			// Save this id, any extra rows for this group share will need to reference it
+			$parent = \OC_DB::insertid('*PREFIX*share');
+			// Loop through all users of this group in case we need to add an extra row
+			foreach ($shareWith['users'] as $uid) {
+				$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
-							$parentFolders['folder'] = $fileTarget;
-						} else {
-							$fileTarget = $parentFolder['folder'].$itemSource;
-							$parent = $parentFolder['id'];
+							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
+							if ($fileTarget != $groupFileTarget) {
+								$parentFolders[$uid]['folder'] = $fileTarget;
+							}
+						} else if (isset($parentFolder[$uid])) {
+							$fileTarget = $parentFolder[$uid]['folder'].$itemSource;
+							$parent = $parentFolder[$uid]['id'];
 						}
 					} else {
-						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+						$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
 					}
 				} else {
 					$fileTarget = null;
 				}
-				$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-				$id = \OC_DB::insertid('*PREFIX*share');
+				// Insert an extra row for the group share if the item or file target is unique for this user
+				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
+					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+					$id = \OC_DB::insertid('*PREFIX*share');
+				}
 				if ($parentFolder === true) {
 					$parentFolders['id'] = $id;
-					// Return parent folder to preserve file target paths for potential children
-					return $parentFolders;
 				}
 			}
-			return true;
+			if ($parentFolder === true) {
+				// Return parent folders to preserve file target paths for potential children
+				return $parentFolders;
+			}
+		} else {
+			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
+			if (isset($fileSource)) {
+				if ($parentFolder) {
+					if ($parentFolder === true) {
+						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+						$parentFolders['folder'] = $fileTarget;
+					} else {
+						$fileTarget = $parentFolder['folder'].$itemSource;
+						$parent = $parentFolder['id'];
+					}
+				} else {
+					$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+				}
+			} else {
+				$fileTarget = null;
+			}
+			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+			$id = \OC_DB::insertid('*PREFIX*share');
+			if ($parentFolder === true) {
+				$parentFolders['id'] = $id;
+				// Return parent folder to preserve file target paths for potential children
+				return $parentFolders;
+			}
 		}
-		return false;
+		return true;
 	}
 
 	/**
@@ -752,43 +750,43 @@ class Share {
 	* @return string Item target
 	*/
 	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith) {
-		if ($backend = self::getBackend($itemType)) {
-			if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
-				return $backend->generateTarget($itemSource, false);
+		$backend = self::getBackend($itemType);
+		if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
+			return $backend->generateTarget($itemSource, false);
+		} else {
+			if ($itemType == 'file' || $itemType == 'folder') {
+				$column = 'file_target';
 			} else {
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$column = 'file_target';
+				$column = 'item_target';
+			}
+			$exclude = null;
+			// Backend has 3 opportunities to generate a unique target
+			for ($i = 0; $i < 2; $i++) {
+				if ($shareType == self::SHARE_TYPE_GROUP) {
+					$target = $backend->generateTarget($itemSource, false, $exclude);
 				} else {
-					$column = 'item_target';
+					$target = $backend->generateTarget($itemSource, $shareWith, $exclude);
 				}
-				$exclude = null;
-				// Backend has 3 opportunities to generate a unique target
-				for ($i = 0; $i < 2; $i++) {
-					if ($shareType == self::SHARE_TYPE_GROUP) {
-						$target = $backend->generateTarget($itemSource, false, $exclude);
-					} else {
-						$target = $backend->generateTarget($itemSource, $shareWith, $exclude);
-					}
-					if (is_array($exclude) && in_array($target, $exclude)) {
-						break;
-					}
-					// Check if target already exists
-					if ($checkTarget = self::getItems($itemType, $target, $shareType, $shareWith, null, self::FORMAT_NONE, null, 1)) {
-						// Find similar targets to improve backend's chances to generate a unqiue target
-						// TODO query needs to be setup like getItems
-						$checkTargets = \OC_DB::prepare('SELECT item_target FROM *PREFIX*share WHERE item_type = ? AND share_with = ? AND '.$column.' LIKE ?');
-						$result = $checkTargets->execute(array($itemType, $shareWith, '%'.$target.'%'));
-						while ($row = $result->fetchRow()) {
-							$exclude[] = $row[$column];
-						}
-					} else {
-						return $target;
+				if (is_array($exclude) && in_array($target, $exclude)) {
+					break;
+				}
+				// Check if target already exists
+				if ($checkTarget = self::getItems($itemType, $target, $shareType, $shareWith, null, self::FORMAT_NONE, null, 1)) {
+					// Find similar targets to improve backend's chances to generate a unqiue target
+					// TODO query needs to be setup like getItems
+					$checkTargets = \OC_DB::prepare('SELECT item_target FROM *PREFIX*share WHERE item_type = ? AND share_with = ? AND '.$column.' LIKE ?');
+					$result = $checkTargets->execute(array($itemType, $shareWith, '%'.$target.'%'));
+					while ($row = $result->fetchRow()) {
+						$exclude[] = $row[$column];
 					}
+				} else {
+					return $target;
 				}
 			}
 		}
-		\OC_Log::write('OCP\Share', 'Backend did not generate a unique target', \OC_Log::ERROR);
-		return false;
+		$message = 'Backend did not generate a unique target';
+		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+		throw new \Exception($message);
 	}
 
 	/**

From e954de60309cca9f8e56aa666b31dd3314ff6fff Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 14:15:37 -0400
Subject: [PATCH 1289/1537] Make the file source path relative earlier

---
 lib/public/share.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index b819924dae..c31f316efe 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -235,7 +235,7 @@ class Share {
 	* @return Returns true on success or false on failure
 	*/
 	public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
+		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(), self::FORMAT_NONE, null, 1)) {
 			self::delete($item['id']);
 			return true;
 		}
@@ -524,6 +524,10 @@ class Share {
 		$result = $query->execute();
 		$items = array();
 		while ($row = $result->fetchRow()) {
+			// Remove root from file source paths
+			if (isset($uidOwner) && isset($row['file_source'])) {
+				$row['file_source'] = substr($row['file_source'], $root);
+			}
 			// Return only the item instead of a 2-dimensional array
 			if ($limit == 1 && $row['item_type'] == $itemType && $row[$column] == $item) {
 				if ($format == self::FORMAT_NONE) {
@@ -538,10 +542,6 @@ class Share {
 				// Remove the parent group share
 				unset($items[$row['parent']]);
 			}
-			// Remove root from file source paths
-			if (isset($uidOwner) && isset($row['file_source'])) {
-				$row['file_source'] = substr($row['file_source'], $root);
-			}
 			// TODO Check this outside of the loop
 			// Check if this is a collection of the requested item type
 			if ($row['item_type'] != $itemType) {

From 83117445ace3fbb1562afbad56fc4527b453d4e5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 14:33:47 -0400
Subject: [PATCH 1290/1537] Fix offset for folder detection, no longer
 including '/Shared' in file target path

---
 apps/files_sharing/sharedstorage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 6e37837aac..ca811a16fe 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -43,7 +43,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		if (isset($this->files[$target])) {
 			return $this->files[$target];
 		} else {
-			$pos = strpos($target, '/', 8);
+			$pos = strpos($target, '/', 1);
 			// Get shared folder name
 			if ($pos !== false) {
 				$folder = substr($target, 0, $pos);

From 6f83540dd69904ec3d1cda87024ed13cf9e967b7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 14:45:45 -0400
Subject: [PATCH 1291/1537] Remove person from array after unshare, so name
 appears in autocomplete again

---
 core/js/share.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 48fbc9c4f4..463d08d3e7 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -328,8 +328,12 @@ $(document).ready(function() {
 
 	$('.unshare').live('click', function() {
 		var li = $(this).parent();
-		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item'), $(li).data('share-type'), $(li).data('share-with'), function() {
+		var shareType = $(li).data('share-type');
+		var shareWith = $(li).data('share-with');
+		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item'), shareType, shareWith, function() {
 			$(li).remove();
+			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
+			OC.Share.itemShares[shareType].splice(index, 1);
 		});
 	});
 	

From 03d65af5dc23ffb5a00dd504d925514ecb1d80f3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 15:09:01 -0400
Subject: [PATCH 1292/1537] Add share action back into addressbook settings,
 bump up z-index of dropdown so the autocomplete list is visible

---
 apps/contacts/templates/settings.php | 3 +++
 apps/files_sharing/css/sharing.css   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index 85dbca36fa..c9713451c8 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -22,6 +22,9 @@
 				<td class="action">
 					<a class="svg action cloud" title="<?php echo $l->t('Show read-only VCF link'); ?>"></a>
 				</td>
+				<td class="action">
+					<a class="svg action share" data-item-type="addressbook" data-item="<?php echo $addressbook['id'] ?>" title="<?php echo $l->t("Share"); ?>"></a>
+				</td>
 				<td class="action">
 					<a class="svg action download" title="<?php echo $l->t('Download'); ?>"
 						href="<?php echo OCP\Util::linkToRemote('carddav').'addressbooks/'.OCP\USER::getUser().'/'
diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css
index f1d6faa6b0..a683a24a11 100644
--- a/apps/files_sharing/css/sharing.css
+++ b/apps/files_sharing/css/sharing.css
@@ -2,7 +2,7 @@
  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:100; width:16em; right:0; margin-right:7em; background:#eee; padding:1em;
+#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; }

From 14d13a740fc1eda23f8d1b037e8eed9b4e3266a9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 15:24:08 -0400
Subject: [PATCH 1293/1537] Load icons for addressbooks, fix statuses for types
 other than files

---
 apps/contacts/js/settings.js | 1 +
 lib/public/share.php         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
index 284f972be8..ee8d889d72 100644
--- a/apps/contacts/js/settings.js
+++ b/apps/contacts/js/settings.js
@@ -4,6 +4,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 		this.Addressbook.adrsettings = $('.addressbooks-settings').first();
 		this.Addressbook.adractions = $('#contacts-settings').find('div.actions');
 		console.log('actions: ' + this.Addressbook.adractions.length);
+		OC.Share.loadIcons('addressbook');
 	},
 	Addressbook:{
 		showActions:function(act) {
diff --git a/lib/public/share.php b/lib/public/share.php
index c31f316efe..f71b508978 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -506,7 +506,7 @@ class Share {
 			if ($itemType == 'file' || $itemType == 'folder') {
 				$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
 			} else {
-				$select = 'id, item_source, parent, share_type';
+				$select = 'id, item_type, item_source, parent, share_type';
 			}
 		} else {
 			if (isset($uidOwner)) {

From 51ddc44b625ca06ca1abef464a451c211f20426a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 15:43:20 -0400
Subject: [PATCH 1294/1537] Somewhat fixes dropdown display issues in the
 contacts app

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 463d08d3e7..b24db6bc0d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -163,7 +163,7 @@ OC.Share={
 		if (permissions & OC.Share.PERMISSION_SHARE) {
 			shareChecked = 'checked="checked"';
 		}
-		var html = '<li data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
+		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 == '') {

From 3be4f5f2f18c28720022dcfad76ac9560ad1fa39 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 16:11:03 -0400
Subject: [PATCH 1295/1537] Sharing backends for contacts and addressbooks

---
 apps/contacts/lib/share/addressbook.php | 88 +++++++++++++++++++++++++
 apps/contacts/lib/share/contact.php     | 53 +++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 apps/contacts/lib/share/addressbook.php
 create mode 100644 apps/contacts/lib/share/contact.php

diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
new file mode 100644
index 0000000000..9e353453f3
--- /dev/null
+++ b/apps/contacts/lib/share/addressbook.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
+	const FORMAT_ADDRESSBOOKS = 1;
+	/**
+	* @brief Get the source of the item to be stored in the database
+	* @param string Item
+	* @param string Owner of the item
+	* @return mixed|array|false Source
+	*
+	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
+	* Return false if the item does not exist for the user
+	*
+	* The formatItems() function will translate the source returned back into the item
+	*/
+	public function isValidSource($item, $uid) {
+		$addressbook = OC_Contacts_Addressbook::find( $item );
+		if( $addressbook === false || $addressbook['userid'] != $uid) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	* @brief Get a unique name of the item for the specified user
+	* @param string Item
+	* @param string|false User the item is being shared with
+	* @param array|null List of similar item names already existing as shared items
+	* @return string Target name
+	*
+	* This function needs to verify that the user does not already have an item with this name.
+	* If it does generate a new name e.g. name_#
+	*/
+	public function generateTarget($item, $uid, $exclude = null) {
+		$addressbook = OC_Contacts_Addressbook::find( $item );
+		$user_addressbooks = array();
+		foreach(OC_Contacts_Addressbook::all($uid) as $user_addressbook) {
+			$user_addressbooks[] = $user_addressbook['displayname'];
+		}
+		$name = $addressbook['userid']."'s ".$addressbook['displayname'];
+		$suffix = '';
+		while (in_array($name.$suffix, $user_addressbooks)) {
+			$suffix++;
+		}
+		
+		return $name.$suffix;
+	}
+
+	/**
+	* @brief Converts the shared item sources back into the item in the specified format
+	* @param array Shared items
+	* @param int Format
+	* @return ?
+	*
+	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
+	* The key/value pairs included in the share info depend on the function originally called:
+	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
+	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
+	* This function allows the backend to control the output of shared items with custom formats.
+	* It is only called through calls to the public getItem(s)Shared(With) functions.
+	*/
+	public function formatItems($items, $format, $parameters = null) {
+		$addressbooks = array();
+		foreach ($items as $item) {
+			$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
+			$addressbook['displayname'] = $item['item_target'];
+			$addressbooks[] = $addressbook;
+		}
+		return $addressbooks;
+	}
+
+	public function getChildren($item) {
+		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*contacts_cards WHERE addressbookid = ?');
+		$result = $query->execute(array($item));
+		$sources = array();
+		while ($contact = $result->fetchRow()) {
+			$sources[] = $contact['id'];
+		}
+		return $sources;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/contacts/lib/share/contact.php b/apps/contacts/lib/share/contact.php
new file mode 100644
index 0000000000..718c8f9025
--- /dev/null
+++ b/apps/contacts/lib/share/contact.php
@@ -0,0 +1,53 @@
+<?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/>.
+*/
+
+class OC_Share_Backend_Contact implements OCP\Share_Backend {
+
+	const FORMAT_CONTACT = 0;
+
+	private static $contact;
+
+	public function isValidSource($itemSource, $uidOwner) {
+		self::$contact = OC_Contacts_VCard::find($itemSource);
+		if (self::$contact) {
+			return true;
+		}
+		return false;
+	}
+	
+	public function generateTarget($itemSource, $shareWith, $exclude = null) {
+		// TODO Get default addressbook and check for conflicts
+		return self::$contact['fullname'];
+	}
+	
+	public function formatItems($items, $format, $parameters = null) {
+		$contacts = array();
+		if ($format == self::FORMAT_CONTACT) {
+			foreach ($items as $item) {
+				$contact = OC_Contacts_VCard::find($item['item_source']);
+				$contact['fullname'] = $item['item_target'];
+				$contacts[] = $contact;
+			}
+		}
+		return $contacts;
+	}
+
+}
\ No newline at end of file

From 1b21cde2b3c10b8a4756325039745f1ea9024769 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 16:37:51 -0400
Subject: [PATCH 1296/1537] Throw more exceptions

---
 lib/public/share.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index f71b508978..df5ad82d7f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -631,14 +631,16 @@ class Share {
 				$fileSource = $checkReshare['file_source'];
 				$fileTarget = $checkReshare['file_target'];
 			} else {
-				\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because resharing is not allowed', \OC_Log::ERROR);
-				return false;
+				$message = 'Sharing '.$itemSource.' failed, because resharing is not allowed';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
 			}
 		} else {
 			$parent = null;
 			if (!$backend->isValidSource($itemSource, $uidOwner)) {
-				\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the sharing backend for '.$itemType.' could not find its source', \OC_Log::ERROR);
-				return false;
+				$message = 'Sharing '.$itemSource.' failed, because the sharing backend for '.$itemType.' could not find its source';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
 			}
 			$parent = null;
 			if ($backend instanceof Share_Backend_File_Dependent) {
@@ -646,8 +648,9 @@ class Share {
 				$filePath = $backend->getFilePath($itemSource, $uidOwner);
 				$fileSource = \OC_FileCache::getId($filePath);
 				if ($fileSource == -1) {
-					\OC_Log::write('OCP\Share', 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache', \OC_Log::ERROR);
-					return false;
+					$message = 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
 				}
 			} else {
 				$fileSource = null;

From 5e95e2a13121037aab09ddcddb60c79cf7057c88 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 16:46:44 -0400
Subject: [PATCH 1297/1537] Set filePath variable

---
 lib/public/share.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index df5ad82d7f..6da422402c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -629,7 +629,7 @@ class Share {
 				$parent = $checkReshare['id'];
 				$itemSource = $checkReshare['item_source'];
 				$fileSource = $checkReshare['file_source'];
-				$fileTarget = $checkReshare['file_target'];
+				$filePath = $checkReshare['file_target'];
 			} else {
 				$message = 'Sharing '.$itemSource.' failed, because resharing is not allowed';
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
@@ -653,6 +653,7 @@ class Share {
 					throw new \Exception($message);
 				}
 			} else {
+				$filePath = null;
 				$fileSource = null;
 			}
 		}

From a96a75c263f541064dcde57af4e01db0b40c0c80 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 16:48:20 -0400
Subject: [PATCH 1298/1537] Select the correct column when searching for
 similar targets

---
 lib/public/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 6da422402c..68ac021780 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -778,7 +778,7 @@ class Share {
 				if ($checkTarget = self::getItems($itemType, $target, $shareType, $shareWith, null, self::FORMAT_NONE, null, 1)) {
 					// Find similar targets to improve backend's chances to generate a unqiue target
 					// TODO query needs to be setup like getItems
-					$checkTargets = \OC_DB::prepare('SELECT item_target FROM *PREFIX*share WHERE item_type = ? AND share_with = ? AND '.$column.' LIKE ?');
+					$checkTargets = \OC_DB::prepare('SELECT '.$column.' FROM *PREFIX*share WHERE item_type = ? AND share_with = ? AND '.$column.' LIKE ?');
 					$result = $checkTargets->execute(array($itemType, $shareWith, '%'.$target.'%'));
 					while ($row = $result->fetchRow()) {
 						$exclude[] = $row[$column];

From 7c0a5d4a5933c5c9fa91956452a15d57c505284d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 17:33:50 -0400
Subject: [PATCH 1299/1537] Check if New and Upload buttons exist before adding
 their width to the total breadcrumbs width

---
 apps/files/js/files.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c980ba003d..049afea4f6 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -545,7 +545,7 @@ $(document).ready(function() {
 	
 	var lastWidth = 0;
 	var breadcrumbs = [];
-	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth + $('#controls .actions').get(0).offsetWidth;
+	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
 	var hiddenBreadcrumbs = 0;
 
 	$.each($('.crumb'), function(index, breadcrumb) {
@@ -553,6 +553,10 @@ $(document).ready(function() {
 		breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
 	});
 
+	if ($('#controls .actions').length > 0) {
+		breadcrumbsWidth += $('#controls .actions').get(0).offsetWidth;
+	}
+
 	function resizeBreadcrumbs(firstRun) {
 		var width = $(this).width();
 		if (width != lastWidth) {

From de7f48b0509a60835643c9776bfd9e0626a76440 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 17:33:50 -0400
Subject: [PATCH 1300/1537] Check if New and Upload buttons exist before adding
 their width to the total breadcrumbs width

---
 apps/files/js/files.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 1b51b0e5df..935101e86e 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -536,7 +536,7 @@ $(document).ready(function() {
 	
 	var lastWidth = 0;
 	var breadcrumbs = [];
-	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth + $('#controls .actions').get(0).offsetWidth;
+	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
 	var hiddenBreadcrumbs = 0;
 
 	$.each($('.crumb'), function(index, breadcrumb) {
@@ -544,6 +544,10 @@ $(document).ready(function() {
 		breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
 	});
 
+	if ($('#controls .actions').length > 0) {
+		breadcrumbsWidth += $('#controls .actions').get(0).offsetWidth;
+	}
+
 	function resizeBreadcrumbs(firstRun) {
 		var width = $(this).width();
 		if (width != lastWidth) {

From 2eac79b7820ecb0270c72428277d0528ea4ac724 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 7 Aug 2012 00:05:43 +0200
Subject: [PATCH 1301/1537] Some UI improvements on the addressbooks settings.

---
 apps/contacts/css/contacts.css       |  3 +++
 apps/contacts/js/settings.js         | 21 +++++++++++++++------
 apps/contacts/templates/settings.php |  4 +---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 0961550c7a..c5308c4d25 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -140,4 +140,7 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .addressbooks-settings .actions * { float: left; }
 .addressbooks-settings .actions input.name { width: 5em; }
 .addressbooks-settings .actions input.name { width: 7em; }
+.addressbooks-settings a.action { opacity: 0.2; }
+.addressbooks-settings a.action:hover { opacity: 1; }
+.addressbooks-settings td.active, .addressbooks-settings td.action { width: 20px; }
 
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
index 284f972be8..67aaa5b5f8 100644
--- a/apps/contacts/js/settings.js
+++ b/apps/contacts/js/settings.js
@@ -89,8 +89,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 									+ '<td class="action"><a class="svg action globe" title="'+t('contacts', 'Show CardDav link')+'"></a></td>'
 									+ '<td class="action"><a class="svg action cloud" title="'+t('contacts', 'Show read-only VCF link')+'"></a></td>'
 									+ '<td class="action"><a class="svg action download" title="'+t('contacts', 'Download')+'" '
-									+ 'href="'+totalurl+'/'+encodeURIComponent(oc_current_user)+'/'
-									+ encodeURIComponent(jsondata.data.addressbook.uri)+'?export"></a></td>'
+									+ 'href="'+OC.linkTo('contacts', 'export.php')+'?bookid='+jsondata.data.addressbook.id+'"></a></td>'
 									+ '<td class="action"><a class="svg action edit" title="'+t('contacts', 'Edit')+'"></a></td>'
 									+ '<td class="action"><a class="svg action delete" title="'+t('contacts', 'Delete')+'"></a></td>'
 									+ '</tr>');
@@ -106,17 +105,27 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 					}
 			});
 		},
+		showLink:function(id, row, link) {
+			console.log('row:', row.length);
+			row.next('tr.link').remove();
+			var linkrow = $('<tr class="link"><td colspan="5"><input style="width: 95%;" type="text" value="'+link+'" /></td>'
+				+ '<td colspan="3"><button>'+t('contacts', 'Cancel')+'</button></td></tr>').insertAfter(row);
+			linkrow.find('input').focus().select();
+			linkrow.find('button').click(function() {
+				$(this).parents('tr').first().remove();
+			});
+		},
 		showCardDAV:function(id) {
 			console.log('showCardDAV: ', id);
 			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
-			this.adractions.find('.link').val(totalurl+'/'+encodeURIComponent(oc_current_user)+'/');
-			this.showActions(['link','cancel']);
+			this.showLink(id, row, totalurl+'/'+encodeURIComponent(oc_current_user));
 		},
 		showVCF:function(id) {
 			console.log('showVCF: ', id);
 			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
-			this.adractions.find('.link').val(totalurl+'/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(row.data('uri'))+'?export');
-			this.showActions(['link','cancel']);
+			var link = totalurl+'/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(row.data('uri'))+'?export';
+			console.log(link);
+			this.showLink(id, row, link);
 		}
 	}
 };
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index 85dbca36fa..3fddc59588 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -24,8 +24,7 @@
 				</td>
 				<td class="action">
 					<a class="svg action download" title="<?php echo $l->t('Download'); ?>"
-						href="<?php echo OCP\Util::linkToRemote('carddav').'addressbooks/'.OCP\USER::getUser().'/'
-						.rawurlencode($addressbook['uri']) ?>?export"></a>
+						href="<?php echo OCP\Util::linkToAbsolute('contacts', 'export.php'); ?>?bookid=<?php echo $addressbook['id'] ?>"></a>
 				</td>
 				<td class="action">
 					<a class="svg action edit" title="<?php echo $l->t("Edit"); ?>"></a>
@@ -41,7 +40,6 @@
 				<button class="new"><?php echo $l->t('New Address Book') ?></button>
 				<input class="name hidden" type="text" autofocus="autofocus" placeholder="<?php echo $l->t('Name'); ?>" />
 				<input class="description hidden" type="text" placeholder="<?php echo $l->t('Description'); ?>" />
-				<input class="link hidden" style="width: 80%" type="text" autofocus="autofocus" />
 				<button class="save hidden"><?php echo $l->t('Save') ?></button>
 				<button class="cancel hidden"><?php echo $l->t('Cancel') ?></button>
 			</div>

From a9f894ce11d3075781953420d288cd54b51b0795 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 7 Aug 2012 02:07:50 +0200
Subject: [PATCH 1302/1537] [tx-robot] updated from transifex

---
 apps/contacts/l10n/de.php    |  2 ++
 apps/contacts/l10n/fr.php    | 11 ++++++++-
 apps/files/l10n/de.php       | 11 ++++++---
 apps/files/l10n/fa.php       |  2 ++
 apps/files/l10n/fr.php       |  5 +++++
 core/l10n/de.php             |  6 ++---
 l10n/ca/settings.po          | 10 ++++-----
 l10n/de/contacts.po          | 24 ++++++++++----------
 l10n/de/core.po              | 36 +++++++++++++++---------------
 l10n/de/files.po             | 34 ++++++++++++++--------------
 l10n/de/settings.po          | 12 +++++-----
 l10n/fa/files.po             | 23 ++++++++++---------
 l10n/fa/settings.po          | 11 ++++-----
 l10n/fi_FI/settings.po       |  8 +++----
 l10n/fr/contacts.po          | 43 ++++++++++++++++++------------------
 l10n/fr/files.po             | 29 ++++++++++++------------
 l10n/fr/settings.po          | 11 ++++-----
 l10n/templates/bookmarks.pot |  2 +-
 l10n/templates/calendar.pot  |  2 +-
 l10n/templates/contacts.pot  | 18 +++++++--------
 l10n/templates/core.pot      |  2 +-
 l10n/templates/files.pot     | 14 ++++++------
 l10n/templates/gallery.pot   |  2 +-
 l10n/templates/lib.pot       |  2 +-
 l10n/templates/media.pot     |  2 +-
 l10n/templates/settings.pot  |  2 +-
 settings/l10n/ca.php         |  2 ++
 settings/l10n/de.php         |  4 +++-
 settings/l10n/fa.php         |  2 ++
 settings/l10n/fi_FI.php      |  1 +
 settings/l10n/fr.php         |  2 ++
 31 files changed, 186 insertions(+), 149 deletions(-)

diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 08e28f3fd0..5fa5bb4f9d 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -108,6 +108,8 @@
 "Next contact in list" => "Nächster Kontakt aus der Liste",
 "Previous contact in list" => "Vorheriger Kontakt aus der Liste",
 "Expand/collapse current addressbook" => "Ausklappen/Einklappen des Adressbuches",
+"Next addressbook" => "Nächstes Adressbuch",
+"Previous addressbook" => "Vorheriges Adressbuch",
 "Actions" => "Aktionen",
 "Refresh contacts list" => "Kontaktliste neu laden",
 "Add new contact" => "Neuen Kontakt hinzufügen",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 88521f84e8..9b4822bd97 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -63,6 +63,8 @@
 "Result: " => "Résultat :",
 " imported, " => "importé,",
 " failed." => "échoué.",
+"Displayname cannot be empty." => "Le nom d'affichage ne peut pas être vide.",
+"Addressbook not found: " => "Carnet d'adresse introuvable : ",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
 "Address" => "Adresse",
@@ -97,6 +99,7 @@
 "Contact" => "Contact",
 "Add Contact" => "Ajouter un Contact",
 "Import" => "Importer",
+"Settings" => "Paramètres",
 "Addressbooks" => "Carnets d'adresses",
 "Close" => "Fermer",
 "Keyboard shortcuts" => "Raccourcis clavier",
@@ -104,6 +107,8 @@
 "Next contact in list" => "Contact suivant dans la liste",
 "Previous contact in list" => "Contact précédent dans la liste",
 "Expand/collapse current addressbook" => "Dé/Replier le carnet d'adresses courant",
+"Next addressbook" => "Carnet d'adresses suivant",
+"Previous addressbook" => "Carnet d'adresses précédent",
 "Actions" => "Actions",
 "Refresh contacts list" => "Actualiser la liste des contacts",
 "Add new contact" => "Ajouter un nouveau contact",
@@ -190,9 +195,13 @@
 "more info" => "Plus d'infos",
 "Primary address (Kontact et al)" => "Adresse principale",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Afficher le lien CardDav",
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "New Address Book" => "Nouveau Carnet d'adresses",
+"Name" => "Nom",
+"Description" => "Description",
 "Save" => "Sauvegarder",
-"Cancel" => "Annuler"
+"Cancel" => "Annuler",
+"More..." => "Plus…"
 );
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 1f4b076ee4..9569735d54 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -9,12 +9,17 @@
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr teilen",
 "Delete" => "Löschen",
+"already exists" => "ist bereits vorhanden",
+"replace" => "Ersetzen",
+"cancel" => "Abbrechen",
+"replaced" => "Ersetzt",
+"with" => "mit",
 "undo" => "rückgängig machen",
 "deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Datei kann nicht hochgeladen werden da sie ein Verzeichniss ist oder 0 bytes hat.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Datei kann nicht hochgeladen werden da sie ein Verzeichnis ist oder 0 Bytes hat.",
 "Upload Error" => "Fehler beim Hochladen",
-"Pending" => "Anstehend",
+"Pending" => "Ausstehend",
 "Upload cancelled." => "Hochladen abgebrochen.",
 "Invalid name, '/' is not allowed." => "Ungültiger Name, \"/\" ist nicht erlaubt.",
 "Size" => "Größe",
@@ -36,7 +41,7 @@
 "From url" => "Von der URL",
 "Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
-"Nothing in here. Upload something!" => "Alles leer. Lad’ was hoch!",
+"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Name" => "Name",
 "Share" => "Teilen",
 "Download" => "Herunterladen",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 77173d2836..aa6559022f 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -8,6 +8,8 @@
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
 "Delete" => "پاک کردن",
+"already exists" => "وجود دارد",
+"deleted" => "حذف شده",
 "generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
 "Upload Error" => "خطا در بار گذاری",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index e037c7a2f4..70af377b17 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -9,6 +9,11 @@
 "Files" => "Fichiers",
 "Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
+"already exists" => "existe déjà",
+"replace" => "remplacer",
+"cancel" => "annuler",
+"replaced" => "remplacé",
+"with" => "avec",
 "undo" => "annuler",
 "deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Générer un fichier ZIP, cela peut prendre du temps",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 121d17f6a8..b0959a5412 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -39,8 +39,8 @@
 "Admin" => "Admin",
 "Help" => "Hilfe",
 "Access forbidden" => "Zugang verboten",
-"Cloud not found" => "Cloud nicht verfügbar",
-"Edit categories" => "Kategorien ändern",
+"Cloud not found" => "Cloud nicht gefunden",
+"Edit categories" => "Kategorien editieren",
 "Add" => "Hinzufügen",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Password" => "Passwort",
@@ -53,7 +53,7 @@
 "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",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 0909e05d48..4157d36cb1 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"PO-Revision-Date: 2012-08-06 07:32+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "No s'ha pogut carregar la llista des de l'App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -49,7 +49,7 @@ msgstr "S'ha canviat l'idioma"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index e41c0bc864..05b7ba69ed 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"PO-Revision-Date: 2012-08-06 16:13+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -489,11 +489,11 @@ msgstr "Ausklappen/Einklappen des Adressbuches"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Nächstes Adressbuch"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Vorheriges Adressbuch"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -545,7 +545,7 @@ msgstr "Name ändern"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Löschen"
 
@@ -856,30 +856,30 @@ msgstr "Schreibgeschützten VCF-Link anzeigen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Name"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Beschreibung"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Mehr..."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index bee17cb280..2360a0297a 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"PO-Revision-Date: 2012-08-06 19:45+0000\n"
+"Last-Translator: designpoint <info@designpoint.ch>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,51 +45,51 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "March"
 msgstr "März"
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:573
+#: js/js.js:572
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:573
 msgid "December"
 msgstr "Dezember"
 
@@ -188,11 +188,11 @@ msgstr "Zugang verboten"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Cloud nicht verfügbar"
+msgstr "Cloud nicht gefunden"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Kategorien ändern"
+msgstr "Kategorien editieren"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
@@ -245,7 +245,7 @@ msgstr "Installation abschließen"
 
 #: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr "web services under your control"
+msgstr "Web Services unter ihrer Kontrolle"
 
 #: templates/layout.user.php:49
 msgid "Log out"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index e79d129b34..f495a374d0 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"PO-Revision-Date: 2012-08-06 20:04+0000\n"
+"Last-Translator: designpoint <info@designpoint.ch>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,23 +69,23 @@ msgstr "Löschen"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "ist bereits vorhanden"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "Ersetzen"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "Ersetzt"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "mit"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
@@ -101,7 +101,7 @@ msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Datei kann nicht hochgeladen werden da sie ein Verzeichniss ist oder 0 bytes hat."
+msgstr "Datei kann nicht hochgeladen werden da sie ein Verzeichnis ist oder 0 Bytes hat."
 
 #: js/files.js:199
 msgid "Upload Error"
@@ -109,7 +109,7 @@ msgstr "Fehler beim Hochladen"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr "Anstehend"
+msgstr "Ausstehend"
 
 #: js/files.js:332
 msgid "Upload cancelled."
@@ -119,27 +119,27 @@ msgstr "Hochladen abgebrochen."
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ungültiger Name, \"/\" ist nicht erlaubt."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "Ordner"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "Ordner"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "Datei"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "Dateien"
 
@@ -197,7 +197,7 @@ msgstr "Upload abbrechen"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
-msgstr "Alles leer. Lad’ was hoch!"
+msgstr "Alles leer. Lade etwas hoch!"
 
 #: templates/index.php:47
 msgid "Name"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 4525a95c34..30f4a024dd 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"PO-Revision-Date: 2012-08-06 19:52+0000\n"
+"Last-Translator: designpoint <info@designpoint.ch>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Liste der Apps im Store konnte nicht geladen werden."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,7 +55,7 @@ msgstr "Sprache geändert"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -115,7 +115,7 @@ msgstr "Große Dateien verwalten"
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr "Stell' eine Frage"
+msgstr "Stell eine Frage"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 636f1077ab..d83a2a2427 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Hossein nag <h.sname@yahoo.com>, 2012.
+# vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"PO-Revision-Date: 2012-08-06 01:10+0000\n"
+"Last-Translator: vahid chakoshy <vchakoshy@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +63,7 @@ msgstr "پاک کردن"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "وجود دارد"
 
 #: js/filelist.js:141
 msgid "replace"
@@ -86,7 +87,7 @@ msgstr ""
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "حذف شده"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
@@ -112,27 +113,27 @@ msgstr "بار گذاری لغو شد"
 msgid "Invalid name, '/' is not allowed."
 msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "پوشه"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "پوشه ها"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "پرونده"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "پرونده ها"
 
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index a1f86934a1..1959264ab4 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Hossein nag <h.sname@yahoo.com>, 2012.
+# vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"PO-Revision-Date: 2012-08-06 01:13+0000\n"
+"Last-Translator: vahid chakoshy <vchakoshy@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +49,7 @@ msgstr "زبان تغییر کرد"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "خطا"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -68,7 +69,7 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "اخطار امنیتی"
 
 #: templates/admin.php:28
 msgid "Log"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 5707523ef2..25c546781e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"PO-Revision-Date: 2012-08-06 10:15+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +49,7 @@ msgstr "Kieli on vaihdettu"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index c7086e02ea..6d0c2315d9 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Borjan Tchakaloff <borjan@tchaka.fr>, 2012.
+# Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
 #   <guiguidu31300@gmail.com>, 2012.
@@ -17,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"PO-Revision-Date: 2012-08-06 20:28+0000\n"
+"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -306,11 +307,11 @@ msgstr "échoué."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Le nom d'affichage ne peut pas être vide."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Carnet d'adresse introuvable : "
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -452,7 +453,7 @@ msgstr "Importer"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -484,11 +485,11 @@ msgstr "Dé/Replier le carnet d'adresses courant"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Carnet d'adresses suivant"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Carnet d'adresses précédent"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -540,7 +541,7 @@ msgstr "Editer les noms"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -841,7 +842,7 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Afficher le lien CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
@@ -851,30 +852,30 @@ msgstr ""
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Modifier"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nouveau Carnet d'adresses"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Nom"
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr "Description"
 
 #: templates/settings.php:43
-msgid "Description"
-msgstr ""
-
-#: templates/settings.php:45
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Plus…"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 23e5b17852..1cc50dacf8 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyril Glapa <kyriog@gmail.com>, 2012.
 # Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"PO-Revision-Date: 2012-08-06 20:30+0000\n"
+"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,23 +67,23 @@ msgstr "Supprimer"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "existe déjà"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "remplacer"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "annuler"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "remplacé"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "avec"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
@@ -116,27 +117,27 @@ msgstr "Chargement annulé"
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "dossier"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "dossiers"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "fichier"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "fichiers"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 83d634ef52..5904706ab7 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <fboulogne@april.org>, 2011.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"PO-Revision-Date: 2012-08-06 20:25+0000\n"
+"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Impossible de charger la liste depuis l'App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,7 +55,7 @@ msgstr "Langue changée"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index d1f1093186..9495d6ab1e 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index cd99214bfa..a2638591d6 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 27b06ccd62..e9d6343cb6 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -530,7 +530,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +841,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 8701abad98..3047850cc6 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 6c139feef7..1c70a4f0c7 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,27 +111,27 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:690 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:691 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:718
+#: js/files.js:722
 msgid "folder"
 msgstr ""
 
-#: js/files.js:720
+#: js/files.js:724
 msgid "folders"
 msgstr ""
 
-#: js/files.js:728
+#: js/files.js:732
 msgid "file"
 msgstr ""
 
-#: js/files.js:730
+#: js/files.js:734
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index d36f787991..023313cb79 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 8debc49847..8a6a5ce2f0 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 801986935a..bbbb69226c 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"POT-Creation-Date: 2012-08-07 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index b848a4b9f6..43bc069603 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
+"POT-Creation-Date: 2012-08-07 02:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 2917f8a84c..c868bc278c 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Email saved" => "S'ha desat el correu electrònic",
 "Invalid email" => "El correu electrònic no és vàlid",
 "OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "Authentication error" => "Error d'autenticació",
 "Language changed" => "S'ha canviat l'idioma",
+"Error" => "Error",
 "Disable" => "Desactiva",
 "Enable" => "Activa",
 "Saving..." => "S'està desant...",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 5610a4ec03..e0cb125953 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Liste der Apps im Store konnte nicht geladen werden.",
 "Email saved" => "E-Mail gespeichert",
 "Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
 "Authentication error" => "Anmeldungsfehler",
 "Language changed" => "Sprache geändert",
+"Error" => "Fehler",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Saving..." => "Speichern...",
@@ -19,7 +21,7 @@
 "by" => "von",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stell' eine Frage",
+"Ask a question" => "Stell eine Frage",
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index b5345972ac..5fe6df4d9d 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -4,10 +4,12 @@
 "OpenID Changed" => "OpenID تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
 "Language changed" => "زبان تغییر کرد",
+"Error" => "خطا",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
 "Saving..." => "درحال ذخیره ...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "اخطار امنیتی",
 "Log" => "کارنامه",
 "More" => "بیشتر",
 "Add your App" => "برنامه خود را بیافزایید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 4fbdca8024..81d1b9d0e6 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -5,6 +5,7 @@
 "Invalid request" => "Virheellinen pyyntö",
 "Authentication error" => "Todennusvirhe",
 "Language changed" => "Kieli on vaihdettu",
+"Error" => "Virhe",
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
 "Saving..." => "Tallennetaan...",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 8ddfcc7f97..1c2f94620f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Email saved" => "E-mail sauvegardé",
 "Invalid email" => "E-mail invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
 "Authentication error" => "Erreur d'authentification",
 "Language changed" => "Langue changée",
+"Error" => "Erreur",
 "Disable" => "Désactiver",
 "Enable" => "Activer",
 "Saving..." => "Sauvegarde...",

From b6b713eb765cee05cec434cce2f79749c6c2755f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 6 Aug 2012 20:43:08 -0400
Subject: [PATCH 1303/1537] Only show the user's groups in the share with
 autocomplete

---
 core/ajax/share.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index f7a41aa3a4..2cfbb5f320 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -100,18 +100,15 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 					}
 				}
 				$count = 0;
-				$groups = array();
-				$limit = 0;
-				$offset = 0;
-				while ($count < 4 && count($groups) == $limit) {
-					$limit = 4 - $count;
-					$groups = OC_Group::getGroups($_GET['search'], $limit, $offset);
-					$offset += $limit;
-					foreach ($groups as $group) {
-						if (!isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) {
+				$groups = OC_Group::getUserGroups(OC_User::getUser());
+				foreach ($groups as $group) {
+					if ($count < 4) {
+						if (stripos($group, $_GET['search']) !== false && (!isset($_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));

From 5e2ef1e91870893910ecf798583905aa52a62f2e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 14:11:48 -0400
Subject: [PATCH 1304/1537] Check if itemShares share type is an array instead
 of set, javascript likes to set indexes to 'undefined'

---
 core/ajax/share.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 2cfbb5f320..0af4da63f8 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -78,7 +78,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 						$vcards = OC_Contacts_VCard::all($id);
 						foreach ($vcards as $vcard) {
 							$contact = $vcard['fullname'];
-							if (stripos($contact, $_GET['search']) !== false && (!isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+							if (stripos($contact, $_GET['search']) !== false && (!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']));
 							}
 						}
@@ -93,7 +93,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 					$users = OC_User::getUsers($_GET['search'], $limit, $offset);
 					$offset += $limit;
 					foreach ($users as $user) {
-						if ((!isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($user, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $user != OC_User::getUser()) {
+						if ((!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++;
 						}
@@ -103,7 +103,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 				$groups = OC_Group::getUserGroups(OC_User::getUser());
 				foreach ($groups as $group) {
 					if ($count < 4) {
-						if (stripos($group, $_GET['search']) !== false && (!isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+						if (stripos($group, $_GET['search']) !== false && (!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++;
 						}

From 0ddfc94cf54fbcdd6f9b172bd5abee495af60577 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 14:34:29 -0400
Subject: [PATCH 1305/1537] Try to fix last commit

---
 core/ajax/share.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 0af4da63f8..8a41466a24 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -78,7 +78,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 						$vcards = OC_Contacts_VCard::all($id);
 						foreach ($vcards as $vcard) {
 							$contact = $vcard['fullname'];
-							if (stripos($contact, $_GET['search']) !== false && (!is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+							if (stripos($contact, $_GET['search']) !== false && (!isset($_GET['itemShares']) || !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']));
 							}
 						}
@@ -93,7 +93,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 					$users = OC_User::getUsers($_GET['search'], $limit, $offset);
 					$offset += $limit;
 					foreach ($users as $user) {
-						if ((!is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($user, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $user != OC_User::getUser()) {
+						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++;
 						}
@@ -103,7 +103,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 				$groups = OC_Group::getUserGroups(OC_User::getUser());
 				foreach ($groups as $group) {
 					if ($count < 4) {
-						if (stripos($group, $_GET['search']) !== false && (!is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+						if (stripos($group, $_GET['search']) !== false && (!isset($_GET['itemShares']) || !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++;
 						}

From b6bbbb4c47c146848e3452f6be1d2086bf2239eb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 14:38:02 -0400
Subject: [PATCH 1306/1537] Remove undefined return variable

---
 lib/public/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 68ac021780..4838f9a4d3 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -217,7 +217,7 @@ class Share {
 						self::put('file', $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
 					}
 				}
-				return $return;
+				return true;
 			}
 			return false;
 		} else {

From 8d56c42fde24790b1912fe0c88fa80a472747ccb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 14:42:11 -0400
Subject: [PATCH 1307/1537] Add search and limit to getGroups search in
 groupExists implementation

---
 lib/group/backend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/group/backend.php b/lib/group/backend.php
index 3f2909caa1..73fc402a9a 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -115,7 +115,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 * @return bool
 	 */
 	public function groupExists($gid){
-		return in_array($gid, $this->getGroups());
+		return in_array($gid, $this->getGroups($gid, 1));
 	}
 
 	/**

From 6d0390dccaa02af0c5144733bf9c3e254e77fa9a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 6 Aug 2012 21:45:02 +0200
Subject: [PATCH 1308/1537] Fix rewriting GET parameters with ? in REQUESTEDAPP

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 888dc265d6..8f7544de1f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -373,7 +373,7 @@ class OC{
 		self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){
 			$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
-			$param = substr(self::$REQUESTEDAPP, strpos(self::$REQUESTEDAPP, '?') + 1);
+			$param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
 			parse_str($param, $get);
 			$_GET = array_merge($_GET, $get);
 			self::$REQUESTEDAPP = $app;

From c4f1a1de5b5f9dda969a3b3872eea5628d8ef9e2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 6 Aug 2012 22:15:55 +0200
Subject: [PATCH 1309/1537] Added function to make url absolute

---
 lib/helper.php | 15 +++++++++++++--
 lib/util.php   |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 666bc6badf..c404f6e544 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -120,8 +120,19 @@ class OC_Helper {
 	 */
 	public static function linkToAbsolute( $app, $file ) {
 		$urlLinkTo = self::linkTo( $app, $file );
-		$urlLinkTo = self::serverProtocol(). '://'  . self::serverHost() . $urlLinkTo;
-		return $urlLinkTo;
+		return self::makeURLAbsolute($urlLinkTo);
+	}
+
+	/**
+	 * @brief Makes an $url absolute
+	 * @param $url the url
+	 * @returns the absolute url
+	 *
+	 * Returns a absolute url to the given app and file.
+	 */
+	public static function makeURLAbsolute( $url )
+	{
+		return self::serverProtocol(). '://'  . self::serverHost() . $url;
 	}
 
 	/**
diff --git a/lib/util.php b/lib/util.php
index f26fa63e44..4c5d416f9f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -348,7 +348,7 @@ class OC_Util {
 		else {
 			$defaultpage = OC_Appconfig::getValue('core', 'defaultpage');
 			if ($defaultpage) {
-				$location = OC_Helper::serverProtocol().'://'.OC_Helper::serverHost().OC::$WEBROOT.'/'.$defaultpage;
+				$location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultpage);
 			}
 			else {
 				$location = OC_Helper::linkToAbsolute( 'files', 'index.php' );
@@ -476,7 +476,7 @@ class OC_Util {
 		@fclose($fp);
 
 		// accessing the file via http
-		$url = OC_Helper::serverProtocol(). '://'  . OC_Helper::serverHost() . OC::$WEBROOT.'/data'.$filename;
+		$url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$filename);
 		$fp = @fopen($url, 'r');
 		$content=@fread($fp, 2048);
 		@fclose($fp);

From 99ce7ba1df52334f11c6b97c3f24d0ed31c8f6d0 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 6 Aug 2012 22:16:45 +0200
Subject: [PATCH 1310/1537] Move serverHost and serverProtocol functions to
 OC_Request

---
 lib/base.php        |  4 ++--
 lib/helper.php      | 48 +--------------------------------------------
 lib/public/util.php |  4 ++--
 lib/request.php     | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 8f7544de1f..c3887dec2f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -185,8 +185,8 @@ class OC{
 		// redirect to https site if configured
 		if( OC_Config::getValue( "forcessl", false )){
 			ini_set("session.cookie_secure", "on");
-			if(OC_Helper::serverProtocol()<>'https' and !OC::$CLI) {
-				$url = "https://". OC_Helper::serverHost() . $_SERVER['REQUEST_URI'];
+			if(OC_Request::serverProtocol()<>'https' and !OC::$CLI) {
+				$url = "https://". OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
 				header("Location: $url");
 				exit();
 			}
diff --git a/lib/helper.php b/lib/helper.php
index c404f6e544..8c362747a2 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -64,52 +64,6 @@ class OC_Helper {
 		return $urlLinkTo;
 	}
 
-	/**
-	 * @brief Returns the server host
-	 * @returns the server host
-	 *
-	 * Returns the server host, even if the website uses one or more
-	 * reverse proxies
-	 */
-	public static function serverHost() {
-		if(OC::$CLI){
-			return 'localhost';
-		}
-		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-			if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
-				$host = trim(array_pop(explode(",", $_SERVER['HTTP_X_FORWARDED_HOST'])));
-			}
-			else{
-				$host=$_SERVER['HTTP_X_FORWARDED_HOST'];
-			}
-		}
-		else{
-			$host = $_SERVER['HTTP_HOST'];
-		}
-		return $host;
-	}
-
-
-	/**
-	* @brief Returns the server protocol
-	* @returns the server protocol
-	*
-	* Returns the server protocol. It respects reverse proxy servers and load balancers
-	*/
-	public static function serverProtocol() {
-		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-			$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
-		}else{
-			if(isset($_SERVER['HTTPS']) and !empty($_SERVER['HTTPS']) and ($_SERVER['HTTPS']!='off')) {
-				$proto = 'https';
-			}else{
-				$proto = 'http';
-			}
-		}
-		return($proto);
-	}
-
-
 	/**
 	 * @brief Creates an absolute url
 	 * @param $app app
@@ -132,7 +86,7 @@ class OC_Helper {
 	 */
 	public static function makeURLAbsolute( $url )
 	{
-		return self::serverProtocol(). '://'  . self::serverHost() . $url;
+		return OC_Request::serverProtocol(). '://'  . OC_Request::serverHost() . $url;
 	}
 
 	/**
diff --git a/lib/public/util.php b/lib/public/util.php
index 75ca29f712..9f6f6f32e1 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -165,7 +165,7 @@ class Util {
 	 * reverse proxies
 	 */
 	public static function getServerHost() {
-		return(\OC_Helper::serverHost());
+		return(\OC_Request::serverHost());
 	}
 
 	/**
@@ -175,7 +175,7 @@ class Util {
 	 * Returns the server protocol. It respects reverse proxy servers and load balancers
 	 */
 	public static function getServerProtocol() {
-		return(\OC_Helper::serverProtocol());
+		return(\OC_Request::serverProtocol());
 	}
 
 	/**
diff --git a/lib/request.php b/lib/request.php
index 0b5aaf8ef3..cb93a08817 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -7,6 +7,51 @@
  */
 
 class OC_Request {
+	/**
+	 * @brief Returns the server host
+	 * @returns the server host
+	 *
+	 * Returns the server host, even if the website uses one or more
+	 * reverse proxies
+	 */
+	public static function serverHost() {
+		if(OC::$CLI){
+			return 'localhost';
+		}
+		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+			if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
+				$host = trim(array_pop(explode(",", $_SERVER['HTTP_X_FORWARDED_HOST'])));
+			}
+			else{
+				$host=$_SERVER['HTTP_X_FORWARDED_HOST'];
+			}
+		}
+		else{
+			$host = $_SERVER['HTTP_HOST'];
+		}
+		return $host;
+	}
+
+
+	/**
+	* @brief Returns the server protocol
+	* @returns the server protocol
+	*
+	* Returns the server protocol. It respects reverse proxy servers and load balancers
+	*/
+	public static function serverProtocol() {
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+			$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
+		}else{
+			if(isset($_SERVER['HTTPS']) and !empty($_SERVER['HTTPS']) and ($_SERVER['HTTPS']!='off')) {
+				$proto = 'https';
+			}else{
+				$proto = 'http';
+			}
+		}
+		return($proto);
+	}
+
 	static public function isNoCache() {
 		if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) {
 			return false;

From 34c076e2a88c43b02c4177e77cf1068ab6d9d9f8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 6 Aug 2012 22:17:10 +0200
Subject: [PATCH 1311/1537] Add comments the other functions in OC_Request

---
 lib/request.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/request.php b/lib/request.php
index cb93a08817..d013844f08 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -52,6 +52,10 @@ class OC_Request {
 		return($proto);
 	}
 
+	/**
+	 * @brief Check if this is a no-cache request
+	 * @returns true for no-cache
+	 */
 	static public function isNoCache() {
 		if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) {
 			return false;
@@ -59,6 +63,10 @@ class OC_Request {
 		return $_SERVER['HTTP_CACHE_CONTROL'] == 'no-cache';
 	}
 
+	/**
+	 * @brief Check if the requestor understands gzip
+	 * @returns true for gzip encoding supported
+	 */
 	static public function acceptGZip() {
 		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 			return false;

From 4e6b4b265b5ef29739175189c5c49dffea9457d8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 19:31:19 +0200
Subject: [PATCH 1312/1537] remoteStorage: split auth allow template

---
 apps/remoteStorage/auth.php           | 60 ++++-----------------------
 apps/remoteStorage/templates/auth.php | 28 +++++++++++++
 2 files changed, 37 insertions(+), 51 deletions(-)
 create mode 100644 apps/remoteStorage/templates/auth.php

diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 99e2272d3a..ad6382eac7 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -60,57 +60,15 @@ if($userId && $appUrl && $categories) {
       header('Location: '.$_GET['redirect_uri'].'#access_token='.$existingToken.'&token_type=bearer');
     } else {
       //params ok, logged in ok, but need to click Allow still:
-?>
-<!DOCTYPE html>
-<html>
-	<head>
-	<title>ownCloud</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="shortcut icon" href="../../../core/img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="../../../core/img/favicon-touch.png" />
-			<link rel="stylesheet" href="../../../core/css/styles.css" type="text/css" media="screen" />
-			<link rel="stylesheet" href="../../../core/css/auth.css" type="text/css" media="screen" />
-		</head>
-	<body id="body-login">
-	<div id="login">
-		<header>
-		<div id="header">
-			<img src="../../../core/img/logo.png" alt="ownCloud" />
-		</div>
-		</header>
-		<section id="main">
-		<div id="oauth">
-			<h2><img src="../../../core/img/remoteStorage-big.png" alt="remoteStorage" /></h2>
-			<p><strong><?php $appUrlParts = explode('/', $_GET['redirect_uri']); echo htmlentities($appUrlParts[2]); ?></strong>
-			requests read &amp; write access to your 
-			<?php
-				$categories = explode(',', htmlentities($_GET['scope']));
-				if(!count($categories)) {
-					echo htmlentities($_GET['scope']);
-				} else {
-					echo '<em>'.$categories[0].'</em>';
-					if(count($categories)==2) {
-						echo ' and <em>'.$categories[1].'</em>';
-					} else if(count($categories)>2) {
-						for($i=1; $i<count($categories)-1; $i++) {
-							echo ', <em>'.$categories[$i].'</em>';
-						}
-						echo ', and <em>'.$categories[$i].'</em>';
-					}
-				}
-			?>.
-			</p>
-			<form accept-charset="UTF-8" method="post">
-				<input id="allow-auth" name="allow" type="submit" value="Allow" />
-				<input id="deny-auth" name="deny" type="submit" value="Deny" />
-			</form>
-		</div>
-		</section>
-	</div>
-	<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; web services under your control</p></footer>
-	</body>
-</html>
-<?php
-		}//end 'need to click Allow still'
+	$appUrlParts = explode('/', $_GET['redirect_uri']);
+	$host = $appUrlParts[2];
+	$categories = explode(',', $_GET['scope']);
+	OCP\Util::addStyle('', 'auth');
+	OCP\Template::printGuestPage('remoteStorage', 'auth', array(
+		'host' => $host,
+		'categories' => $categories,
+	));
+	}//end 'need to click Allow still'
 	} else {//login not ok
 		if($currUser) {
 			die('You are logged in as '.$currUser.' instead of '.htmlentities($userId));
diff --git a/apps/remoteStorage/templates/auth.php b/apps/remoteStorage/templates/auth.php
new file mode 100644
index 0000000000..6a7054eabb
--- /dev/null
+++ b/apps/remoteStorage/templates/auth.php
@@ -0,0 +1,28 @@
+		<section id="main">
+		<div id="oauth">
+			<h2><img src="<?php echo image_path('', 'remoteStorage-big.png'); ?>" alt="remoteStorage" /></h2>
+			<p><strong><?php echo $_['host'] ?></strong>
+			requests read &amp; write access to your 
+			<?php
+				$categories = $_['categories'];
+				if(!count($categories)) {
+					echo $categories[0];
+				} else {
+					echo '<em>'.$categories[0].'</em>';
+					if(count($categories)==2) {
+						echo ' and <em>'.$categories[1].'</em>';
+					} else if(count($categories)>2) {
+						for($i=1; $i<count($categories)-1; $i++) {
+							echo ', <em>'.$categories[$i].'</em>';
+						}
+						echo ', and <em>'.$categories[$i].'</em>';
+					}
+				}
+			?>.
+			</p>
+			<form accept-charset="UTF-8" method="post">
+				<input id="allow-auth" name="allow" type="submit" value="Allow" />
+				<input id="deny-auth" name="deny" type="submit" value="Deny" />
+			</form>
+		</div>
+		</section>

From 95031cb139506e6f1426a78f6ac4dd764a2851a4 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 20:31:23 +0200
Subject: [PATCH 1313/1537] remoteStorage: Use OCP\\Util for redirecting for
 login and generating link

---
 apps/remoteStorage/auth.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index ad6382eac7..215dfa0742 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -73,9 +73,10 @@ if($userId && $appUrl && $categories) {
 		if($currUser) {
 			die('You are logged in as '.$currUser.' instead of '.htmlentities($userId));
 		} else {
-			header('Location: /?redirect_url='.urlencode('/apps/remoteStorage/auth.php'.$_SERVER['PATH_INFO'].'?'.$_SERVER['QUERY_STRING']));
+			// this will display the login page for us
+			OCP\Util::checkLoggedIn();
 		}
 	}
 } else {//params not ok
-	die('please use e.g. /?app=remoteStorage&getfile=auth.php&userid=admin&redirect_uri=http://host/path&scope=...');
+	die('please use e.g. '.OCP\Util::linkTo('remoteStorage', 'auth.php').'?userid=admin&redirect_uri=http://host/path&scope=...');
 }

From 7d20e98aec3cbea66134b40747881b0b7b51eb92 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 20:33:25 +0200
Subject: [PATCH 1314/1537] Move getting the path info to OC_Request

---
 lib/request.php | 13 +++++++++++++
 remote.php      |  6 +-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/request.php b/lib/request.php
index d013844f08..9e38e6bbd1 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -52,6 +52,19 @@ class OC_Request {
 		return($proto);
 	}
 
+	/**
+	 * @brief get Path info from request
+	 * @returns string Path info or false when not found
+	 */
+	public static function getPathInfo() {
+		if (array_key_exists('PATH_INFO', $_SERVER)){
+			$path_info = $_SERVER['PATH_INFO'];
+		}else{
+			$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
+		}
+		return $path_info;
+	}
+
 	/**
 	 * @brief Check if this is a no-cache request
 	 * @returns true for no-cache
diff --git a/remote.php b/remote.php
index 8dc4df1bd2..483b19555c 100644
--- a/remote.php
+++ b/remote.php
@@ -2,11 +2,7 @@
 $RUNTIME_NOSETUPFS = true;
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
-if (array_key_exists('PATH_INFO', $_SERVER)){
-	$path_info = $_SERVER['PATH_INFO'];
-}else{
-	$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
-}
+$path_info = OC_Request::getPathInfo();
 if ($path_info === false) {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;

From 31003b475eebe483c9887c7ca46fd0631ffcf5b0 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 20:42:54 +0200
Subject: [PATCH 1315/1537] Decode the alternative path_info

---
 lib/request.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/request.php b/lib/request.php
index 9e38e6bbd1..3fe61fbddc 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -61,6 +61,17 @@ class OC_Request {
 			$path_info = $_SERVER['PATH_INFO'];
 		}else{
 			$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
+			// following is taken from Sabre_DAV_URLUtil::decodePathSegment
+			$path_info = rawurldecode($path_info);
+			$encoding = mb_detect_encoding($path_info, array('UTF-8','ISO-8859-1'));
+
+			switch($encoding) {
+
+			    case 'ISO-8859-1' :
+				$path_info = utf8_encode($path_info);
+
+			}
+			// end copy
 		}
 		return $path_info;
 	}

From 3533f43d12f2a0246dcdde72d2e68002da61e601 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 14:48:55 -0400
Subject: [PATCH 1316/1537] Implement groupExists in group database backend

---
 lib/group/database.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/group/database.php b/lib/group/database.php
index 6314a12743..b989f6ae02 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -174,6 +174,20 @@ class OC_Group_Database extends OC_Group_Backend {
 		return $groups;
 	}
 
+	/**
+	 * check if a group exists
+	 * @param string $gid
+	 * @return bool
+	 */
+	public function groupExists($gid) {
+		$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid = ?');
+		$result = $query->execute(array($gid))->fetchOne();
+		if ($result) {
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids

From 9580d0ef290c5ba2431e6c2c52c7a6d660b031ec Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 14:57:52 -0400
Subject: [PATCH 1317/1537] Initial calendar sharing backend

---
 apps/calendar/appinfo/app.php                 |  2 +
 apps/calendar/lib/share/calendar.php          | 58 +++++++++++++++++++
 .../part.choosecalendar.rowfields.php         |  2 +-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 apps/calendar/lib/share/calendar.php

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 4fdba29126..8a793d1fac 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -10,6 +10,7 @@ OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
 OC::$CLASSPATH['OC_Calendar_Import'] = 'apps/calendar/lib/import.php';
+OC::$CLASSPATH['OC_Share_Backend_Calendar'] = 'apps/calendar/lib/share/calendar.php';
 //General Hooks
 OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
@@ -35,3 +36,4 @@ OCP\App::addNavigationEntry( array(
   'name' => $l->t('Calendar')));
 OCP\App::registerPersonal('calendar', 'settings');
 OC_Search::registerProvider('OC_Search_Provider_Calendar');
+OCP\Share::registerBackend('calendar', 'OC_Share_Backend_Calendar');
diff --git a/apps/calendar/lib/share/calendar.php b/apps/calendar/lib/share/calendar.php
new file mode 100644
index 0000000000..9b68437531
--- /dev/null
+++ b/apps/calendar/lib/share/calendar.php
@@ -0,0 +1,58 @@
+<?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/>.
+*/
+
+class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
+
+	const FORMAT_CALENDAR = 0;
+
+	private static $calendar;
+
+	public function isValidSource($itemSource, $uidOwner) {
+		if (self::$calendar = OC_Calendar_App::getCalendar($itemSource)) {
+			return true;
+		}
+		return false;
+	}
+
+	public function generateTarget($itemSource, $shareWith, $exclude = null) {
+		if (isset(self::$calendar)) {
+			return self::$calendar['displayname'];
+		}
+		return false;
+	}
+
+	public function formatItems($items, $format, $parameters = null) {
+		$calendars = array();
+		if ($format == self::FORMAT_CALENDAR) {
+			foreach ($items as $item) {
+				$calendar = OC_Calendar_App::getCalendar($item['item_source']);
+				$calendar['displaynamename'] = $item['item_target'];
+				$calendars[] = $calendar;
+			}
+		}
+		return $calendars;
+	}
+
+	public function getChildren($itemSource) {
+		// TODO
+	}
+
+}
\ No newline at end of file
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index d29113c9a6..64aaa79719 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -5,7 +5,7 @@
   <label for="active_<?php echo $_['calendar']['id'] ?>"><?php echo $_['calendar']['displayname'] ?></label>
 </td>
 <td width="20px">
-  <a href="#" onclick="Calendar.UI.Share.dropdown('<?php echo OCP\USER::getUser() ?>', <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Share Calendar') ?>" class="action"><img class="svg action" src="<?php echo (!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg') ?>"></a>
+  <a href="#" class="share" data-item-type="calendar" data-item="<?php echo $_['calendar']['id']; ?>" title="<?php echo $l->t('Share Calendar') ?>" class="action"><img class="svg action" src="<?php echo (!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg') ?>"></a>
 </td>
 <td width="20px">
   <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo rawurlencode(html_entity_decode($_['calendar']['uri'], ENT_QUOTES, 'UTF-8')) ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>

From b287b11ff239bdb11672afbb10a5dcd5ab85a86e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 21:49:04 +0200
Subject: [PATCH 1318/1537] adjust the query generation in getItems, to use
 placeholders

---
 lib/public/share.php | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 4838f9a4d3..0a5c4ce779 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -440,26 +440,39 @@ class Share {
 		$root = \OC_Filesystem::getRoot();
 		// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
 		if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-			$where = "WHERE item_type IN ('".implode("','", array_merge(array($itemType), $collectionTypes))."')";
+			$item_types = array_merge(array($itemType), $collectionTypes);
+			$placeholders = join(',', array_fill(0, count($item_types), '?'));
+			$where = "WHERE item_type IN ('".$placeholders."')";
+			$query_args = $item_types;
 		} else {
-			$where = "WHERE item_type = '".$itemType."'";
+			$where = "WHERE item_type = ?";
+			$query_args = array($itemType);
 		}
 		if (isset($shareType) && isset($shareWith)) {
 			// Include all user and group items
 			if ($shareType == self::$shareTypeUserAndGroups) {
-				$where .= " AND share_type IN (".self::SHARE_TYPE_USER.",".self::SHARE_TYPE_GROUP.",".self::$shareTypeGroupUserUnique.")";
+				$where .= " AND share_type IN (?,?,?)";
+				$query_args[] = self::SHARE_TYPE_USER;
+				$query_args[] = self::SHARE_TYPE_GROUP;
+				$query_args[] = self::$shareTypeGroupUserUnique;
 				$groups = \OC_Group::getUserGroups($shareWith);
 				$userAndGroups = array_merge(array($shareWith), $groups);
-				$where .= " AND share_with IN ('".implode("','", $userAndGroups)."')";
+				$placeholders = join(',', array_fill(0, count($userAndGroups), '?'));
+				$where .= " AND share_with IN (".$placeholders.")";
+				$query_args = array_merge($query_args, $userAndGroups);
 			} else {
-				$where .= " AND share_type = ".$shareType." AND share_with = '".$shareWith."'";
+				$where .= " AND share_type = ? AND share_with = ?";
+				$query_args[] = $shareType;
+				$query_args[] = $shareWith;
 			}
 		}
 		if (isset($uidOwner)) {
-			$where .= " AND uid_owner = '".$uidOwner."'";
+			$where .= " AND uid_owner = ?";
+			$query_args[] = $uidOwner;
 			if (!isset($shareType)) {
 				// Prevent unique user targets for group shares from being selected
-				$where .= " AND share_type != '".self::$shareTypeGroupUserUnique."'";
+				$where .= " AND share_type != ?";
+				$query_args[] = self::$shareTypeGroupUserUnique;
 			}
 			if ($itemType == 'file' || $itemType == 'folder') {
 				$where = "INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ".$where;
@@ -479,19 +492,24 @@ class Share {
 			if (isset($uidOwner)) {
 				// If item type is a file, file source needs to be checked in case the item was converted
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= " AND path = '".$root.$item."'";
+					$where .= " AND path = ?";
+					$query_args[] = $root.$item;
 				} else {
-					$where .= " AND item_source = '".$item."'";
+					$where .= " AND item_source = ?";
+					$query_args[] = $item;
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= " AND file_target = '".$item."'";
+					$where .= " AND file_target = ?";
 				} else {
-					$where .= " AND item_target = '".$item."'";
+					$where .= " AND item_target = ?";
 				}
+				$query_args[] = $item;
 			}
 			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-				$where .= " OR item_type IN ('".implode("','", $collectionTypes)."')";
+				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
+				$where .= " OR item_type IN ('".$placeholders."')";
+				$query_args = array_merge($query_args, $collectionTypes);
 			}
 		}
 		if ($limit != -1 && !$includeCollections) {
@@ -521,7 +539,7 @@ class Share {
 		}
 		$root = strlen($root);
 		$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
-		$result = $query->execute();
+		$result = $query->execute($query_args);
 		$items = array();
 		while ($row = $result->fetchRow()) {
 			// Remove root from file source paths

From 1e644b5a53856b2b4e2310e96ce6155fe32982d9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 23:27:06 +0200
Subject: [PATCH 1319/1537] Add Event share backend

---
 apps/calendar/appinfo/app.php     |  2 ++
 apps/calendar/lib/share/event.php | 40 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 apps/calendar/lib/share/event.php

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 8a793d1fac..72ddde6015 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -11,6 +11,7 @@ OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
 OC::$CLASSPATH['OC_Calendar_Import'] = 'apps/calendar/lib/import.php';
 OC::$CLASSPATH['OC_Share_Backend_Calendar'] = 'apps/calendar/lib/share/calendar.php';
+OC::$CLASSPATH['OC_Share_Backend_Event'] = 'apps/calendar/lib/share/event.php';
 //General Hooks
 OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
@@ -37,3 +38,4 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('calendar', 'settings');
 OC_Search::registerProvider('OC_Search_Provider_Calendar');
 OCP\Share::registerBackend('calendar', 'OC_Share_Backend_Calendar');
+OCP\Share::registerBackend('event', 'OC_Share_Backend_Event');
diff --git a/apps/calendar/lib/share/event.php b/apps/calendar/lib/share/event.php
new file mode 100644
index 0000000000..5bb72ee6c9
--- /dev/null
+++ b/apps/calendar/lib/share/event.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Share_Backend_Event implements OCP\Share_Backend {
+
+	const FORMAT_EVENT = 0;
+
+	private static $event;
+
+	public function isValidSource($itemSource, $uidOwner) {
+		self::$event = OC_Calendar_Object::find($itemSource);
+		if (self::$event) {
+			return true;
+		}
+		return false;
+	}
+	
+	public function generateTarget($itemSource, $shareWith, $exclude = null) {
+		// TODO Get default calendar and check for conflicts
+		return self::$event['summary'];
+	}
+	
+	public function formatItems($items, $format, $parameters = null) {
+		$events = array();
+		if ($format == self::FORMAT_EVENT) {
+			foreach ($items as $item) {
+				$event = OC_Calendar_Object::find($item['item_source']);
+				$event['summary'] = $item['item_target'];
+				$events[] = $event;
+			}
+		}
+		return $events;
+	}
+
+}

From 1b5c8ff47175492f3925aea6c6dda3aaf5445cd3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 23:29:01 +0200
Subject: [PATCH 1320/1537] Don't return error when just no sharing found

---
 core/ajax/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 8a41466a24..8ca2c637f2 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -58,7 +58,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 		case 'getItemsSharedStatuses':
 			if (isset($_GET['itemType'])) {
 				$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
-				($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+				is_array($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
 			}
 			break;
 		case 'getItem':

From d4882df8cbb7f7417d098363192824b3a36b53f1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 23:29:56 +0200
Subject: [PATCH 1321/1537] Fix warnings and better styling

---
 core/ajax/share.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 8ca2c637f2..625199aa0b 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -78,7 +78,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 						$vcards = OC_Contacts_VCard::all($id);
 						foreach ($vcards as $vcard) {
 							$contact = $vcard['fullname'];
-							if (stripos($contact, $_GET['search']) !== false && (!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+							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']));
 							}
 						}
@@ -103,7 +107,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 				$groups = OC_Group::getUserGroups(OC_User::getUser());
 				foreach ($groups as $group) {
 					if ($count < 4) {
-						if (stripos($group, $_GET['search']) !== false && (!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+						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++;
 						}

From 35a1738a39fbce50ec22561a0308d9a672eb6c78 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Aug 2012 23:31:06 +0200
Subject: [PATCH 1322/1537] Use new sharing API in
 OC_Calendar_Share::allSharedwithuser

---
 apps/calendar/lib/share.php          | 21 +++++++++------------
 apps/calendar/lib/share/calendar.php |  8 +++++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index 4fe8817140..e5ffc04143 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -18,19 +18,16 @@ class OC_Calendar_Share{
 	 * @return: array $return - information about calendars
 	 */
 	public static function allSharedwithuser($userid, $type, $active=null, $permission=null){
-		$group_where = self::group_sql(OC_Group::getUserGroups($userid));
-		$permission_where = self::permission_sql($permission);
-		if($type == self::CALENDAR){
-			$active_where = self::active_sql($active);
-		}else{
-			$active_where = '';
-		}
-		$stmt = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . $type . " WHERE ((share = ? AND sharetype = 'user') " . $group_where . ") AND owner <> ? " . $permission_where . " " . $active_where);
-		$result = $stmt->execute(array($userid, $userid));
-		$return = array();
-		while( $row = $result->fetchRow()){
-			$return[] = $row;
+		$format = OC_Share_Backend_Calendar::FORMAT_CALENDAR;
+		if ($type == self::EVENT) {
+			$format = OC_Share_Backend_Event::FORMAT_EVENT;
 		}
+		$return = OCP\Share::getItemsSharedWith($type,
+			$format,
+			array(
+				'active' => $active,
+				'permissions' => $permission,
+			));
 		return $return;
 	}
 	/**
diff --git a/apps/calendar/lib/share/calendar.php b/apps/calendar/lib/share/calendar.php
index 9b68437531..0ddca2400a 100644
--- a/apps/calendar/lib/share/calendar.php
+++ b/apps/calendar/lib/share/calendar.php
@@ -43,8 +43,14 @@ class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
 		$calendars = array();
 		if ($format == self::FORMAT_CALENDAR) {
 			foreach ($items as $item) {
-				$calendar = OC_Calendar_App::getCalendar($item['item_source']);
+				$calendar = OC_Calendar_App::getCalendar($item['item_source'], false);
+				// TODO: really check $parameters['permissions'] == 'rw'/'r'
+				if ($parameters['permissions'] == 'rw') {
+					continue; // TODO
+				}
 				$calendar['displaynamename'] = $item['item_target'];
+				$calendar['calendarid'] = $calendar['id'];
+				$calendar['owner'] = $calendar['userid'];
 				$calendars[] = $calendar;
 			}
 		}

From b1a7e308198a67de82baec06a423e86b1062b7b3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 7 Aug 2012 21:23:55 -0400
Subject: [PATCH 1323/1537] Actually change background image of shared items

---
 core/js/share.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index b24db6bc0d..467a0e4d95 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -18,10 +18,11 @@ OC.Share={
 					// Private links override shared in terms of icon display
 					if (itemType != 'file' && itemType != 'folder') {
 						if (hasPrivateLink) {
-							$('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/public'));
+							var image = OC.imagePath('core', 'actions/public');
 						} else {
-							$('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/shared'));
+							var image = OC.imagePath('core', 'actions/shared');
 						}
+						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 					}
 					OC.Share.statuses[item] = hasPrivateLink;
 				});

From dc927bd346924f9247c55b484f7a008fe7252ee9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 8 Aug 2012 10:51:19 +0200
Subject: [PATCH 1324/1537] fix for bug 879 - add parent directory to file
 cache if it does not exist yet. This can happen if the sync client is used
 before user created the root directory (e.g. through web login) for example.

---
 lib/filecache.php | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 22f7427ae4..61470232ca 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -65,19 +65,31 @@ class OC_FileCache{
 		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
-		$path=$root.$path;
-		$parent=self::getParentId($path);
-		$id=self::getId($path,'');
-		if(isset(OC_FileCache_Cached::$savedData[$path])){
-			$data=array_merge(OC_FileCache_Cached::$savedData[$path],$data);
-			unset(OC_FileCache_Cached::$savedData[$path]);
+		$fullpath=$root.$path;
+		$parent=self::getParentId($fullpath);
+		$id=self::getId($fullpath,'');
+		if(isset(OC_FileCache_Cached::$savedData[$fullpath])){
+			$data=array_merge(OC_FileCache_Cached::$savedData[$fullpath],$data);
+			unset(OC_FileCache_Cached::$savedData[$fullpath]);
 		}
 		if($id!=-1){
 			self::update($id,$data);
 			return;
 		}
+		
+		// add parent directories to the file cache if they does not exist yet.
+		if ($parent == -1 && $fullpath != $root) {
+			$dirparts = explode(DIRECTORY_SEPARATOR, dirname($path));
+			$part = '';
+			while ($parent == -1) {
+				self::scanFile( DIRECTORY_SEPARATOR.$part);
+				$parent = self::getParentId($fullpath);
+				$part = array_shift($dirparts);
+			}
+		}
+		
 		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
-			OC_FileCache_Cached::$savedData[$path]=$data;
+			OC_FileCache_Cached::$savedData[$fullpath]=$data;
 			return;
 		}
 		if(!isset($data['encrypted'])){
@@ -94,13 +106,13 @@ class OC_FileCache{
 		$data['versioned']=(int)$data['versioned'];
 		$user=OC_User::getUser();
 		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, path_hash, size, mtime, ctime, mimetype, mimepart,`user`,writable,encrypted,versioned) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)');
-		$result=$query->execute(array($parent,basename($path),$path,md5($path),$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable'],$data['encrypted'],$data['versioned']));
+		$result=$query->execute(array($parent,basename($fullpath),$fullpath,md5($fullpath),$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable'],$data['encrypted'],$data['versioned']));
 		if(OC_DB::isError($result)){
-			OC_Log::write('files','error while writing file('.$path.') to cache',OC_Log::ERROR);
+			OC_Log::write('files','error while writing file('.$fullpath.') to cache',OC_Log::ERROR);
 		}
 
 		if($cache=OC_Cache::getUserCache(true)){
-			$cache->remove('fileid/'.$path);//ensure we don't have -1 cached
+			$cache->remove('fileid/'.$fullpath);//ensure we don't have -1 cached
 		}
 	}
 
@@ -343,7 +355,7 @@ class OC_FileCache{
 	 * @param string $path
 	 * @param OC_EventSource $enventSource (optional)
 	 * @param int count (optional)
-	 * @param string root (optionak)
+	 * @param string root (optional)
 	 */
 	public static function scan($path,$eventSource=false,&$count=0,$root=false){
 		if($eventSource){

From 0bf2a3e6d6a8059c6e3180fad2e9aa55438a9406 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 8 Aug 2012 11:29:44 +0200
Subject: [PATCH 1325/1537] while loop not needed because of recursive call of
 put()

---
 lib/filecache.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 61470232ca..e8b17e254e 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -77,15 +77,11 @@ class OC_FileCache{
 			return;
 		}
 		
-		// add parent directories to the file cache if they does not exist yet.
+		// add parent directory to the file cache if it does not exist yet.
 		if ($parent == -1 && $fullpath != $root) {
-			$dirparts = explode(DIRECTORY_SEPARATOR, dirname($path));
-			$part = '';
-			while ($parent == -1) {
-				self::scanFile( DIRECTORY_SEPARATOR.$part);
-				$parent = self::getParentId($fullpath);
-				$part = array_shift($dirparts);
-			}
+			$parentDir = substr(dirname($path), 0, strrpos(dirname($path), DIRECTORY_SEPARATOR));
+			self::scanFile($parentDir);
+			$parent = self::getParentId($fullpath);
 		}
 		
 		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it

From 05648dac619942dfccc76180d30fcd79364355ec Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 11:25:24 -0400
Subject: [PATCH 1326/1537] Don't return file handle if the mode supports
 writing and the file is not writable

---
 apps/files_sharing/sharedstorage.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index fc0d272b54..05df275ca9 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -367,6 +367,25 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	public function fopen($path, $mode) {
 		$source = $this->getSource($path);
 		if ($source) {
+			switch ($mode) {
+				case 'r+':
+				case 'rb+':
+				case 'w+':
+				case 'wb+':
+				case 'x+':
+				case 'xb+':
+				case 'a+':
+				case 'ab+':
+				case 'w':
+				case 'wb':
+				case 'x':
+				case 'xb':
+				case 'a':
+				case 'ab':
+					if (!$this->is_writable($path)) {
+						return false;
+					}
+			}
 			$info = array(
 				'target' => $this->datadir.$path,
 				'source' => $source,

From a22f30fb780bce17300ce05a370b11d9afb602d1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 11:39:00 -0400
Subject: [PATCH 1327/1537] Reset item shares variable, fixes autocomplete not
 showing people

---
 core/js/share.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 467a0e4d95..991e307e5c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -73,7 +73,6 @@ OC.Share={
 	},
 	showDropDown:function(itemType, item, appendTo, privateLink, possiblePermissions) {
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
-		// TODO replace with autocomplete textbox
 		html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
 		html += '<ul id="shareWithList">';
 		html += '</ul>';
@@ -86,6 +85,8 @@ OC.Share={
 		}
 		html += '</div>';
 		$(html).appendTo(appendTo);
+		// Reset item shares
+		OC.Share.itemShares = [];
 		var data = OC.Share.loadItem(itemType, item);
 		if (data) {
 			$.each(data, function(index, share) {

From 7522a23693b11a4c277a475cdb3204a1d9ac5912 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Aug 2012 17:13:20 +0200
Subject: [PATCH 1328/1537] Remove unused RUNTIME_NOSETUPFS var

---
 apps/bookmarks/ajax/addBookmark.php     | 7 +------
 apps/bookmarks/ajax/delBookmark.php     | 5 -----
 apps/bookmarks/ajax/editBookmark.php    | 5 -----
 apps/bookmarks/ajax/recordClick.php     | 5 -----
 apps/bookmarks/ajax/updateList.php      | 5 -----
 apps/files_sharing/get.php              | 2 --
 apps/media/ajax/autoupdate.php          | 3 +--
 apps/remoteStorage/ajax/revokeToken.php | 4 ----
 apps/remoteStorage/auth.php             | 3 ---
 files/webdav.php                        | 2 --
 lib/base.php                            | 3 ---
 public.php                              | 1 -
 remote.php                              | 1 -
 13 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 483716405a..c8a64d531c 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
@@ -34,4 +29,4 @@ OCP\JSON::checkAppEnabled('bookmarks');
 
 require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
 $id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
-OCP\JSON::success(array('data' => $id));
\ No newline at end of file
+OCP\JSON::success(array('data' => $id));
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index f40f02ebab..ba1dfff3be 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index 0b37d161af..ad43be064f 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
index 1eee1718d1..0283f09f60 100644
--- a/apps/bookmarks/ajax/recordClick.php
+++ b/apps/bookmarks/ajax/recordClick.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php
index 4de2475d06..cf9a2cf918 100644
--- a/apps/bookmarks/ajax/updateList.php
+++ b/apps/bookmarks/ajax/updateList.php
@@ -22,11 +22,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 70a5162d38..1d219719b2 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -1,6 +1,4 @@
 <?php
-$RUNTIME_NOSETUPFS=true; //don't setup the fs yet
-
 // only need authentication apps
 $RUNTIME_APPTYPES=array('authentication');
 OC_App::loadApps($RUNTIME_APPTYPES);
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
index c2dbf27a00..7329e91e21 100644
--- a/apps/media/ajax/autoupdate.php
+++ b/apps/media/ajax/autoupdate.php
@@ -23,9 +23,8 @@
 
 header('Content-type: text/html; charset=UTF-8') ;
 
-//no apps or filesystem
+//no apps
 $RUNTIME_NOAPPS=true;
-$RUNTIME_NOSETUPFS=true;
 
  
 OCP\JSON::checkAppEnabled('media');
diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
index 322d9ed727..e6a6818994 100644
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -25,10 +25,6 @@
 *
 */
 
-
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
- 
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('remoteStorage/lib_remoteStorage.php');
 
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 215dfa0742..91ca43ea07 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -27,9 +27,6 @@
 
 header("X-Frame-Options: Sameorigin");
 
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
diff --git a/files/webdav.php b/files/webdav.php
index 53673dbeca..c19c4c6b72 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -23,8 +23,6 @@
  *
  */
 
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
 // only need filesystem apps
 $RUNTIME_APPTYPES=array('filesystem','authentication');
 require_once('../lib/base.php');
diff --git a/lib/base.php b/lib/base.php
index c3887dec2f..c5827064d7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -401,9 +401,6 @@ class OC{
 }
 
 // define runtime variables - unless this already has been done
-if( !isset( $RUNTIME_NOSETUPFS )){
-	$RUNTIME_NOSETUPFS = false;
-}
 if( !isset( $RUNTIME_NOAPPS )){
 	$RUNTIME_NOAPPS = false;
 }
diff --git a/public.php b/public.php
index 8383f36a24..0581631f41 100644
--- a/public.php
+++ b/public.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOSETUPFS = true;
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
 $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
diff --git a/remote.php b/remote.php
index 483b19555c..41d2a7ab34 100644
--- a/remote.php
+++ b/remote.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOSETUPFS = true;
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
 $path_info = OC_Request::getPathInfo();

From 10cfcd4ff0e7cbe186df80cb9a9aa83a94aac882 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Aug 2012 17:17:37 +0200
Subject: [PATCH 1329/1537] Remove useless setting of RUNTIME_NOAPPS

---
 apps/files/ajax/mimeicon.php   | 6 ------
 apps/media/ajax/autoupdate.php | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/apps/files/ajax/mimeicon.php b/apps/files/ajax/mimeicon.php
index 80d50f8452..dbb8b60112 100644
--- a/apps/files/ajax/mimeicon.php
+++ b/apps/files/ajax/mimeicon.php
@@ -1,9 +1,3 @@
 <?php
 
-// no need for apps
-$RUNTIME_NOAPPS=false;
-
-// Init owncloud
-
-
 print OC_Helper::mimetypeIcon($_GET['mime']);
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
index 7329e91e21..a5801f1a0e 100644
--- a/apps/media/ajax/autoupdate.php
+++ b/apps/media/ajax/autoupdate.php
@@ -23,10 +23,6 @@
 
 header('Content-type: text/html; charset=UTF-8') ;
 
-//no apps
-$RUNTIME_NOAPPS=true;
-
- 
 OCP\JSON::checkAppEnabled('media');
 
 $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true');

From 9156fb73fdd8385f891842a94eb414cb7fc5e35c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Aug 2012 21:08:20 +0200
Subject: [PATCH 1330/1537] Move handling request of index.php to OC class

---
 index.php    | 45 ++-------------------------------------------
 lib/base.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/index.php b/index.php
index e3c94adf66..94893e475a 100755
--- a/index.php
+++ b/index.php
@@ -26,49 +26,8 @@ $RUNTIME_NOAPPS = TRUE; //no apps, yet
 
 require_once('lib/base.php');
 
-// Setup required :
-$not_installed = !OC_Config::getValue('installed', false);
-if($not_installed) {
-	// Check for autosetup:
-	$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
-	if( file_exists( $autosetup_file )){
-		OC_Log::write('core','Autoconfig file found, setting up owncloud...',OC_Log::INFO);
-		include( $autosetup_file );
-		$_POST['install'] = 'true';
-		$_POST = array_merge ($_POST, $AUTOCONFIG);
-	        unlink($autosetup_file);
-	}
-	OC_Util::addScript('setup');
-	require_once('setup.php');
-	exit();
-}
-
-// Handle WebDAV
-if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
-	header('location: '.OC_Helper::linkToRemote('webdav'));
-	exit();
-}
-elseif(!OC_User::isLoggedIn() && substr(OC::$REQUESTEDFILE,-3) == 'css'){
-	OC_App::loadApps();
-	OC::loadfile();
-}
-// Someone is logged in :
-elseif(OC_User::isLoggedIn()) {
-	OC_App::loadApps();
-	if(isset($_GET["logout"]) and ($_GET["logout"])) {
-		OC_User::logout();
-		header("Location: ".OC::$WEBROOT.'/');
-		exit();
-	}else{
-		if(is_null(OC::$REQUESTEDFILE)){
-			OC::loadapp();
-		}else{
-			OC::loadfile();
-		}
-	}
-
-// For all others cases, we display the guest page :
-} else {
+if (!OC::handleRequest()) {
+// Not handled -> we display the login page:
 	OC_App::loadApps(array('prelogin'));
 	$error = false;
 	// remember was checked after last login
diff --git a/lib/base.php b/lib/base.php
index c5827064d7..b91945ab97 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -398,6 +398,54 @@ class OC{
 			}
 		}
 	}
+
+	/**
+	 * @brief Try to handle request
+	 * @return true when the request is handled here
+	 */
+	public static function handleRequest() {
+		if (!OC_Config::getValue('installed', false)) {
+			// Check for autosetup:
+			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
+			if( file_exists( $autosetup_file )){
+				OC_Log::write('core','Autoconfig file found, setting up owncloud...',OC_Log::INFO);
+				include( $autosetup_file );
+				$_POST['install'] = 'true';
+				$_POST = array_merge ($_POST, $AUTOCONFIG);
+				unlink($autosetup_file);
+			}
+			OC_Util::addScript('setup');
+			require_once('setup.php');
+			exit();
+		}
+		// Handle WebDAV
+		if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
+			header('location: '.OC_Helper::linkToRemote('webdav'));
+			return true;
+		}
+		if(!OC_User::isLoggedIn() && substr(OC::$REQUESTEDFILE,-3) == 'css') {
+			OC_App::loadApps();
+			OC::loadfile();
+			return true;
+		}
+		// Someone is logged in :
+		if(OC_User::isLoggedIn()) {
+			OC_App::loadApps();
+			if(isset($_GET["logout"]) and ($_GET["logout"])) {
+				OC_User::logout();
+				header("Location: ".OC::$WEBROOT.'/');
+			}else{
+				if(is_null(OC::$REQUESTEDFILE)) {
+					OC::loadapp();
+				}else{
+					OC::loadfile();
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
 }
 
 // define runtime variables - unless this already has been done

From 3387454094318676aa78d87d098b038219e3dccb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Aug 2012 22:42:45 +0200
Subject: [PATCH 1331/1537] Move login code from index.php to OC class

---
 index.php    | 48 +++++----------------------------------
 lib/base.php | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/index.php b/index.php
index 94893e475a..4ffd013aa8 100755
--- a/index.php
+++ b/index.php
@@ -31,52 +31,16 @@ if (!OC::handleRequest()) {
 	OC_App::loadApps(array('prelogin'));
 	$error = false;
 	// remember was checked after last login
-	if(isset($_COOKIE["oc_remember_login"]) && isset($_COOKIE["oc_token"]) && isset($_COOKIE["oc_username"]) && $_COOKIE["oc_remember_login"]) {
-		OC_App::loadApps(array('authentication'));
-		if(defined("DEBUG") && DEBUG) {
-			OC_Log::write('core','Trying to login from cookie',OC_Log::DEBUG);
-		}
-		// confirm credentials in cookie
-		if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) &&
-		OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) {
-			OC_User::setUserId($_COOKIE['oc_username']);
-			OC_Util::redirectToDefaultPage();
-		}
-		else {
-			OC_User::unsetMagicInCookie();
-		}
+	if (OC::tryRememberLogin()) {
+		// nothing more to do
 
 	// Someone wants to log in :
-	} elseif(isset($_POST["user"]) and isset($_POST['password']) and isset($_SESSION['sectoken']) and isset($_POST['sectoken']) and ($_SESSION['sectoken']==$_POST['sectoken']) ) {
-		OC_App::loadApps();
-		if(OC_User::login($_POST["user"], $_POST["password"])) {
-			if(!empty($_POST["remember_login"])){
-				if(defined("DEBUG") && DEBUG) {
-					OC_Log::write('core','Setting remember login to cookie',OC_Log::DEBUG);
-				}
-				$token = md5($_POST["user"].time().$_POST['password']);
-				OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
-				OC_User::setMagicInCookie($_POST["user"], $token);
-			}
-			else {
-				OC_User::unsetMagicInCookie();
-			}
-			OC_Util::redirectToDefaultPage();
-		} else {
-			$error = true;
-		}
+	} elseif (OC::tryFormLogin()) {
+		$error = true;
 	
 	// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-	} elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){
-		OC_App::loadApps(array('authentication'));
-		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
-			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
-			OC_User::unsetMagicInCookie();
-			$_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
-			OC_Util::redirectToDefaultPage();
-		}else{
-			$error = true;
-		}
+	} elseif(OC::tryBasicAuthLogin()) {
+		$error = true;
 	}
 	if(!array_key_exists('sectoken', $_SESSION) || (array_key_exists('sectoken', $_SESSION) && is_null(OC::$REQUESTEDFILE)) || substr(OC::$REQUESTEDFILE, -3) == 'php'){
 		$sectoken=rand(1000000,9999999);
diff --git a/lib/base.php b/lib/base.php
index b91945ab97..6514a0c0b0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -446,6 +446,70 @@ class OC{
 		return false;
 	}
 
+	public static function tryRememberLogin() {
+		if(!isset($_COOKIE["oc_remember_login"])
+		|| !isset($_COOKIE["oc_token"])
+		|| !isset($_COOKIE["oc_username"])
+		|| !$_COOKIE["oc_remember_login"]) {
+			return false;
+		}
+		OC_App::loadApps(array('authentication'));
+		if(defined("DEBUG") && DEBUG) {
+			OC_Log::write('core','Trying to login from cookie',OC_Log::DEBUG);
+		}
+		// confirm credentials in cookie
+		if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) &&
+		OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) {
+			OC_User::setUserId($_COOKIE['oc_username']);
+			OC_Util::redirectToDefaultPage();
+		}
+		else {
+			OC_User::unsetMagicInCookie();
+		}
+		return true;
+	}
+
+	public static function tryFormLogin() {
+		if(!isset($_POST["user"])
+		|| !isset($_POST['password'])
+		|| !isset($_SESSION['sectoken'])
+		|| !isset($_POST['sectoken'])
+		|| ($_SESSION['sectoken']!=$_POST['sectoken']) ) {
+			return false;
+		}
+		OC_App::loadApps();
+		if(OC_User::login($_POST["user"], $_POST["password"])) {
+			if(!empty($_POST["remember_login"])){
+				if(defined("DEBUG") && DEBUG) {
+					OC_Log::write('core','Setting remember login to cookie', OC_Log::DEBUG);
+				}
+				$token = md5($_POST["user"].time().$_POST['password']);
+				OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
+				OC_User::setMagicInCookie($_POST["user"], $token);
+			}
+			else {
+				OC_User::unsetMagicInCookie();
+			}
+			OC_Util::redirectToDefaultPage();
+		}
+		return true;
+	}
+
+	public static function tryBasicAuthLogin() {
+		if (!isset($_SERVER["PHP_AUTH_USER"])
+		 || !isset($_SERVER["PHP_AUTH_PW"])){
+		 	return false;
+		}
+		OC_App::loadApps(array('authentication'));
+		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
+			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
+			OC_User::unsetMagicInCookie();
+			$_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
+			OC_Util::redirectToDefaultPage();
+		}
+		return true;
+	}
+
 }
 
 // define runtime variables - unless this already has been done

From 4f90860001e1529fa288218933477de563b0bcaf Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Wed, 8 Aug 2012 23:39:30 +0200
Subject: [PATCH 1332/1537] Add initial version of backgroundjobs library

---
 lib/backgroundjobs/regulartask.php   |  52 +++++++++++++
 lib/backgroundjobs/scheduledtask.php | 106 ++++++++++++++++++++++++++
 lib/backgroundjobs/worker.php        | 109 +++++++++++++++++++++++++++
 3 files changed, 267 insertions(+)
 create mode 100644 lib/backgroundjobs/regulartask.php
 create mode 100644 lib/backgroundjobs/scheduledtask.php
 create mode 100644 lib/backgroundjobs/worker.php

diff --git a/lib/backgroundjobs/regulartask.php b/lib/backgroundjobs/regulartask.php
new file mode 100644
index 0000000000..38c1255d76
--- /dev/null
+++ b/lib/backgroundjobs/regulartask.php
@@ -0,0 +1,52 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @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/>.
+*
+*/
+
+/**
+ * This class manages the regular tasks.
+ */
+class OC_Backgroundjobs_RegularTask{
+	static private $registered = array();
+
+	/**
+	 * @brief creates a regular task
+	 * @param $klass class name
+	 * @param $method method name
+	 * @return true
+	 */
+	static public function create( $klass, $method ){
+		// Create the data structure
+		self::$registered["$klass-$method"] = array( $klass, $method );
+
+		// No chance for failure ;-)
+		return true;
+	}
+
+	/**
+	 * @brief gets all regular tasks
+	 * @return associative array
+	 *
+	 * key is string "$klass-$method", value is array( $klass, $method )
+	 */
+	static public function all(){
+		return self::$registered;
+	}
+}
diff --git a/lib/backgroundjobs/scheduledtask.php b/lib/backgroundjobs/scheduledtask.php
new file mode 100644
index 0000000000..48a863c906
--- /dev/null
+++ b/lib/backgroundjobs/scheduledtask.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+* ownCloud - Background Job
+*
+* @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/>.
+*
+*/
+
+/**
+ * This class manages our scheduled tasks.
+ */
+class OC_Backgroundjobs_ScheduledTask{
+	/**
+	 * @brief Gets one scheduled task
+	 * @param $id ID of the task
+	 * @return associative array
+	 */
+	public static function find( $id ){
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+		return $result->fetchRow();
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks
+	 * @return array with associative arrays
+	 */
+	public static function all(){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks' );
+		$result = $stmt->execute(array());
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks of a specific app
+	 * @param $app app name
+	 * @return array with associative arrays
+	 */
+	public static function whereAppIs( $app ){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE app = ?' );
+		$result = $stmt->execute(array($app));
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief schedules a task
+	 * @param $app app name
+	 * @param $klass class name
+	 * @param $method method name
+	 * @param $parameters all useful data as text
+	 * @return id of task
+	 */
+	public static function add( $task, $klass, $method, $parameters ){
+		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*scheduledtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
+		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
+
+		return OC_DB::insertid();
+	}
+
+	/**
+	 * @brief deletes a scheduled task
+	 * @param $id id of task
+	 * @return true/false
+	 *
+	 * Deletes a report
+	 */
+	public static function delete( $id ){
+		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+
+		return true;
+	}
+}
diff --git a/lib/backgroundjobs/worker.php b/lib/backgroundjobs/worker.php
new file mode 100644
index 0000000000..0a99c80ebd
--- /dev/null
+++ b/lib/backgroundjobs/worker.php
@@ -0,0 +1,109 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @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/>.
+*
+*/
+
+/**
+ * This class does the dirty work.
+ * 
+ * TODO: locking in doAllSteps
+ */
+class OC_Backgroundjobs_Worker{
+	/**
+	 * @brief executes all tasks
+	 * @return boolean
+	 *
+	 * This method executes all regular tasks and then all scheduled tasks.
+	 * This method should be called by cli scripts that do not let the user
+	 * wait.
+	 */
+	public static function doAllSteps(){
+		// Do our regular work
+		$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+		foreach( $regular_tasks as $key => $value ){
+			call_user_func( $value );
+		}
+
+		// Do our scheduled tasks
+		$scheduled_tasks = OC_Backgroundjobs_ScheduledTask::all();
+		foreach( $scheduled_tasks as $task ){
+			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
+			OC_Backgroundjobs_ScheduledTask::delete( $task['id'] );
+		}
+		
+		return true;
+	}
+
+	/**
+	 * @brief does a single task
+	 * @return boolean
+	 *
+	 * This method executes one task. It saves the last state and continues
+	 * with the next step. This method should be used by webcron and ajax
+	 * services.
+	 */
+	public static function doWebStep(){
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+		
+		if( $laststep == 'regular_tasks' ){
+			// get last app
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+
+			// What's the next step?
+			$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+			ksort( $regular_tasks );
+			$done = false;
+			
+			// search for next background job
+			foreach( $regular_tasks as $key => $value ){
+				if( strcmp( $lasttask, $key ) > 0 ){
+					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+					$done = true;
+					call_user_func( $value );
+					break;
+				}
+			}
+
+			if( $done == false ){
+				// Next time load scheduled tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+			}
+		}
+		else{
+			$tasks = OC_Backgroundjobs_ScheduledTask::all();
+			if( length( $tasks )){
+				$task = $tasks[0];
+				// delete job before we execute it. This prevents endless loops
+				// of failing jobs.
+				OC_Backgroundjobs_ScheduledTask::delete($task['id']);
+
+				// execute job
+				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
+			}
+			else{
+				// Next time load scheduled tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
+			}
+		}
+		
+		return true;
+	}
+}

From d02b0e39b217ad4c9b27d7d87f7d4cfd4f6f942f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 17:50:09 -0400
Subject: [PATCH 1333/1537] Fix issues with hiding and showing dropdown

---
 core/js/share.js | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 991e307e5c..70d822f881 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,6 +10,7 @@ OC.Share={
 	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) {
@@ -133,12 +134,18 @@ OC.Share={
 			return false;
 		}
 		});
-		$('#dropdown').show('blind');
+		$('#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();
 			}
@@ -233,13 +240,28 @@ OC.Share={
 
 $(document).ready(function() {
 
-	$('.share').live('click', 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 item = $(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;
 			}
-			OC.Share.showDropDown($(this).data('item-type'), $(this).data('item'), $(this).parent().parent(), privateLink, $(this).data('possible-permissions'));
+			if (OC.Share.droppedDown) {
+				if (item != $('#dropdown').data('item')) {
+					OC.Share.hideDropDown(function () {
+						OC.Share.showDropDown(itemType, item, appendTo, privateLink, possiblePermissions);
+					});
+				} else {
+					OC.Share.hideDropDown();
+				}
+			} else {
+				OC.Share.showDropDown(itemType, item, appendTo, privateLink, possiblePermissions);
+			}
 		}
 	});
 	
@@ -281,13 +303,14 @@ $(document).ready(function() {
 			}
 			var appendTo = $('tr').filterAttr('data-file', filename).find('td.filename');
 			// Check if drop down is already visible for a different file
-			if (($('#dropdown').length > 0)) {
+			if (OC.Share.droppedDown) {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
-						$('tr').removeClass('mouseOver');
 						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
 						OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
 					});
+				} else {
+					OC.Share.hideDropDown();
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
@@ -296,15 +319,11 @@ $(document).ready(function() {
 		});
 	}
 
-// 	$(this).click(function(event) {
-// 		if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
-// 			if ($('#dropdown').is(':visible')) {
-// 				OC.Share.hideDropDown(function() {
-// 					$('tr').removeClass('mouseOver');
-// 				});
-// 			}
-// 		}
-// 	});
+	$(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

From 6025d2ebc33da1fe2e3cd97b6ad28989c3a60812 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Wed, 8 Aug 2012 23:59:30 +0200
Subject: [PATCH 1334/1537] Rename Backgroundjobs to BackgroundJob

---
 lib/backgroundjobs/regulartask.php   |  4 ++--
 lib/backgroundjobs/scheduledtask.php |  3 +--
 lib/backgroundjobs/worker.php        | 14 +++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/backgroundjobs/regulartask.php b/lib/backgroundjobs/regulartask.php
index 38c1255d76..5c416fcdb0 100644
--- a/lib/backgroundjobs/regulartask.php
+++ b/lib/backgroundjobs/regulartask.php
@@ -23,7 +23,7 @@
 /**
  * This class manages the regular tasks.
  */
-class OC_Backgroundjobs_RegularTask{
+class OC_BackgroundJob_RegularTask{
 	static private $registered = array();
 
 	/**
@@ -32,7 +32,7 @@ class OC_Backgroundjobs_RegularTask{
 	 * @param $method method name
 	 * @return true
 	 */
-	static public function create( $klass, $method ){
+	static public function register( $klass, $method ){
 		// Create the data structure
 		self::$registered["$klass-$method"] = array( $klass, $method );
 
diff --git a/lib/backgroundjobs/scheduledtask.php b/lib/backgroundjobs/scheduledtask.php
index 48a863c906..5a2166175c 100644
--- a/lib/backgroundjobs/scheduledtask.php
+++ b/lib/backgroundjobs/scheduledtask.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
 * ownCloud - Background Job
 *
@@ -24,7 +23,7 @@
 /**
  * This class manages our scheduled tasks.
  */
-class OC_Backgroundjobs_ScheduledTask{
+class OC_BackgroundJob_ScheduledTask{
 	/**
 	 * @brief Gets one scheduled task
 	 * @param $id ID of the task
diff --git a/lib/backgroundjobs/worker.php b/lib/backgroundjobs/worker.php
index 0a99c80ebd..9709882978 100644
--- a/lib/backgroundjobs/worker.php
+++ b/lib/backgroundjobs/worker.php
@@ -25,7 +25,7 @@
  * 
  * TODO: locking in doAllSteps
  */
-class OC_Backgroundjobs_Worker{
+class OC_BackgroundJob_Worker{
 	/**
 	 * @brief executes all tasks
 	 * @return boolean
@@ -36,16 +36,16 @@ class OC_Backgroundjobs_Worker{
 	 */
 	public static function doAllSteps(){
 		// Do our regular work
-		$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+		$regular_tasks = OC_BackgroundJob_RegularTask::all();
 		foreach( $regular_tasks as $key => $value ){
 			call_user_func( $value );
 		}
 
 		// Do our scheduled tasks
-		$scheduled_tasks = OC_Backgroundjobs_ScheduledTask::all();
+		$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
 		foreach( $scheduled_tasks as $task ){
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			OC_Backgroundjobs_ScheduledTask::delete( $task['id'] );
+			OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
 		}
 		
 		return true;
@@ -67,7 +67,7 @@ class OC_Backgroundjobs_Worker{
 			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
 
 			// What's the next step?
-			$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+			$regular_tasks = OC_BackgroundJob_RegularTask::all();
 			ksort( $regular_tasks );
 			$done = false;
 			
@@ -87,12 +87,12 @@ class OC_Backgroundjobs_Worker{
 			}
 		}
 		else{
-			$tasks = OC_Backgroundjobs_ScheduledTask::all();
+			$tasks = OC_BackgroundJob_ScheduledTask::all();
 			if( length( $tasks )){
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.
-				OC_Backgroundjobs_ScheduledTask::delete($task['id']);
+				OC_BackgroundJob_ScheduledTask::delete($task['id']);
 
 				// execute job
 				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );

From 443e19822460df2c831fc3c52bb181d2a7606e92 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:00:12 +0200
Subject: [PATCH 1335/1537] Renaming backgroundjobs on file system as well

---
 lib/{backgroundjobs => backgroundjob}/regulartask.php   | 0
 lib/{backgroundjobs => backgroundjob}/scheduledtask.php | 0
 lib/{backgroundjobs => backgroundjob}/worker.php        | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename lib/{backgroundjobs => backgroundjob}/regulartask.php (100%)
 rename lib/{backgroundjobs => backgroundjob}/scheduledtask.php (100%)
 rename lib/{backgroundjobs => backgroundjob}/worker.php (100%)

diff --git a/lib/backgroundjobs/regulartask.php b/lib/backgroundjob/regulartask.php
similarity index 100%
rename from lib/backgroundjobs/regulartask.php
rename to lib/backgroundjob/regulartask.php
diff --git a/lib/backgroundjobs/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
similarity index 100%
rename from lib/backgroundjobs/scheduledtask.php
rename to lib/backgroundjob/scheduledtask.php
diff --git a/lib/backgroundjobs/worker.php b/lib/backgroundjob/worker.php
similarity index 100%
rename from lib/backgroundjobs/worker.php
rename to lib/backgroundjob/worker.php

From 088b3ea0bcd60ddc9d6854321e4ca502f874c5f9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:01:06 +0200
Subject: [PATCH 1336/1537] Add public interface to background jobs

---
 lib/public/backgroundjob.php | 116 +++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 lib/public/backgroundjob.php

diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
new file mode 100644
index 0000000000..ac86363454
--- /dev/null
+++ b/lib/public/backgroundjob.php
@@ -0,0 +1,116 @@
+<?php
+/**
+* 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/>.
+*
+*/
+
+/**
+ * Public interface of ownCloud forbackground jobs.
+ */
+
+// use OCP namespace for all classes that are considered public. 
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP;
+
+/**
+ * This class provides functions to manage backgroundjobs in ownCloud
+ *
+ * There are two kind of background jobs in ownCloud: regular tasks and
+ * scheduled tasks.
+ *
+ * Regular tasks have to be registered in appinfo.php and
+ * will run on a regular base. Fetching news could be a task that should run
+ * frequently.
+ *
+ * Scheduled tasks have to be registered each time you want to execute them.
+ * An example of the scheduled task would be the creation of the thumbnail. As
+ * soon as the user uploads a picture the gallery app registers the scheduled
+ * task "create thumbnail" and saves the path in the parameter. As soon as the
+ * task is done it will be deleted from the list.
+ */
+class Backgroundjob {
+	/**
+	 * @brief creates a regular task
+	 * @param $klass class name
+	 * @param $method method name
+	 * @return true
+	 */
+	public static function addRegularTask( $klass, $method ){
+		return \OC_BackgroundJob_RegularTask::register( $klass, $method );
+	}
+
+	/**
+	 * @brief gets all regular tasks
+	 * @return associative array
+	 *
+	 * key is string "$klass-$method", value is array( $klass, $method )
+	 */
+	static public function allRegularTasks(){
+		return \OC_BackgroundJob_RegularTask::all();
+	}
+
+	/**
+	 * @brief Gets one scheduled task
+	 * @param $id ID of the task
+	 * @return associative array
+	 */
+	public static function findScheduledTask( $id ){
+		return \OC_BackgroundJob_ScheduledTask::find( $id );
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks
+	 * @return array with associative arrays
+	 */
+	public static function allScheduledTasks(){
+		return \OC_BackgroundJob_ScheduledTask::all();
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks of a specific app
+	 * @param $app app name
+	 * @return array with associative arrays
+	 */
+	public static function scheduledTaskWhereAppIs( $app ){
+		return \OC_BackgroundJob_ScheduledTask::whereAppIs( $app );
+	}
+
+	/**
+	 * @brief schedules a task
+	 * @param $app app name
+	 * @param $klass class name
+	 * @param $method method name
+	 * @param $parameters all useful data as text
+	 * @return id of task
+	 */
+	public static function addScheduledTask( $task, $klass, $method, $parameters ){
+		return \OC_BackgroundJob_ScheduledTask::add( $task, $klass, $method, $parameters );
+	}
+
+	/**
+	 * @brief deletes a scheduled task
+	 * @param $id id of task
+	 * @return true/false
+	 *
+	 * Deletes a report
+	 */
+	public static function deleteScheduledTask( $id ){
+		return \OC_BackgroundJob_ScheduledTask::delete( $id );
+	}
+}

From 4107273a790ec53880b70b944faa9db5b142c15b Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:46:50 +0200
Subject: [PATCH 1337/1537] fix license text

---
 lib/backgroundjob/regulartask.php   |  2 +-
 lib/backgroundjob/scheduledtask.php |  2 +-
 lib/backgroundjob/worker.php        | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
index 5c416fcdb0..53bd4eb5e9 100644
--- a/lib/backgroundjob/regulartask.php
+++ b/lib/backgroundjob/regulartask.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
index 5a2166175c..47f332a204 100644
--- a/lib/backgroundjob/scheduledtask.php
+++ b/lib/backgroundjob/scheduledtask.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 9709882978..23757529ad 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
@@ -59,12 +59,12 @@ class OC_BackgroundJob_Worker{
 	 * with the next step. This method should be used by webcron and ajax
 	 * services.
 	 */
-	public static function doWebStep(){
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+	public static function doNextStep(){
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjob_step', 'regular_tasks' );
 		
 		if( $laststep == 'regular_tasks' ){
 			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjob_task', '' );
 
 			// What's the next step?
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
@@ -74,7 +74,7 @@ class OC_BackgroundJob_Worker{
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+					OC_Appconfig::getValue( 'core', 'backgroundjob_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;
@@ -83,7 +83,7 @@ class OC_BackgroundJob_Worker{
 
 			if( $done == false ){
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'scheduled_tasks' );
 			}
 		}
 		else{
@@ -99,8 +99,8 @@ class OC_BackgroundJob_Worker{
 			}
 			else{
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_task', '' );
 			}
 		}
 		

From 14cbb8724c65491daaacc4717be020f6340fb829 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:48:36 +0200
Subject: [PATCH 1338/1537] Add "cron.php" for background jobs. It is named
 cron.php because more people will recognize the purpose of the file then.

---
 cron.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 cron.php

diff --git a/cron.php b/cron.php
new file mode 100644
index 0000000000..fd46174f2b
--- /dev/null
+++ b/cron.php
@@ -0,0 +1,51 @@
+<?php
+/**
+* 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/>.
+*
+*/
+
+$RUNTIME_NOSETUPFS = true;
+require_once('lib/base.php');
+
+$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'web' );
+if( OC::$CLI ){
+	if( $appmode == 'web' ){
+		OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
+	}
+
+	// check if backgroundjobs is still running
+	$pid = OC_Appconfig::getValue( 'core', 'backgroundjob_pid', false );
+	if( $pid !== false ){
+		// FIXME: check if $pid is still alive (*nix/mswin). if so then exit
+	}
+	// save pid
+	OC_Appconfig::setValue( 'core', 'backgroundjob_pid', getmypid());
+
+	// Work
+	OC_BackgroundJob_Worker::doAllSteps();
+}
+else{
+	if( $appmode == 'web' ){
+		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
+		exit();
+	}
+	OC_BackgroundJob_Worker::doNextStep();
+	OC_JSON::success();
+}
+exit();

From 7fa896971ffaac5daa5efd7408f58c67ec56f493 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:58:54 +0200
Subject: [PATCH 1339/1537] JavaScript file for activating web cron

---
 core/js/backgroundjobs.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 core/js/backgroundjobs.js

diff --git a/core/js/backgroundjobs.js b/core/js/backgroundjobs.js
new file mode 100644
index 0000000000..4a558a66b4
--- /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' );
+});

From 13a0818fec4ac758fb050764fb33d90c74200cfe Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 01:02:05 +0200
Subject: [PATCH 1340/1537] Be more precise regarding backgroundjobs mode

---
 cron.php     | 6 +++---
 lib/base.php | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cron.php b/cron.php
index fd46174f2b..2bcaaff9fd 100644
--- a/cron.php
+++ b/cron.php
@@ -23,9 +23,9 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
-$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'web' );
+$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' );
 if( OC::$CLI ){
-	if( $appmode == 'web' ){
+	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
 	}
 
@@ -41,7 +41,7 @@ if( OC::$CLI ){
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
-	if( $appmode == 'web' ){
+	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 		exit();
 	}
diff --git a/lib/base.php b/lib/base.php
index c3887dec2f..090d05cdba 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -227,11 +227,17 @@ class OC{
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "oc-dialogs" );
+		OC_Util::addScript( "backgroundjobs" );
 		OC_Util::addScript( "js" );
 		OC_Util::addScript( "eventsource" );
 		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
+
+		if( OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' ) == 'ajax' ){
+			OC_Util::addScript( 'backgroundjobs' );
+		}
+		
 		OC_Util::addStyle( "styles" );
 		OC_Util::addStyle( "multiselect" );
 		OC_Util::addStyle( "jquery-ui-1.8.16.custom" );

From f4285a25ef5e41ab02c8d34f6d69a0c2553e267f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 19:12:59 -0400
Subject: [PATCH 1341/1537] Don't include shared addressbook if source not
 found

---
 apps/contacts/lib/share/addressbook.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
index 9e353453f3..f719bccb78 100644
--- a/apps/contacts/lib/share/addressbook.php
+++ b/apps/contacts/lib/share/addressbook.php
@@ -69,8 +69,10 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 		$addressbooks = array();
 		foreach ($items as $item) {
 			$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
-			$addressbook['displayname'] = $item['item_target'];
-			$addressbooks[] = $addressbook;
+			if ($addressbook) {
+				$addressbook['displayname'] = $item['item_target'];
+				$addressbooks[] = $addressbook;
+			}
 		}
 		return $addressbooks;
 	}

From 37ee88aa6d6470bdb0e500fc94fe75042453fbb7 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 01:29:15 +0200
Subject: [PATCH 1342/1537] Fixed bug in OC_BackgroundJob_Worker

---
 lib/backgroundjob/worker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 23757529ad..7514a16b69 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -88,7 +88,7 @@ class OC_BackgroundJob_Worker{
 		}
 		else{
 			$tasks = OC_BackgroundJob_ScheduledTask::all();
-			if( length( $tasks )){
+			if( count( $tasks )){
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.

From f4ab2ba1150452917168dc57b2221c8d7ad6ff01 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 9 Aug 2012 02:03:19 +0200
Subject: [PATCH 1343/1537] [tx-robot] updated from transifex

---
 l10n/fi/bookmarks.po         |  60 +++
 l10n/fi/calendar.po          | 814 ++++++++++++++++++++++++++++++++
 l10n/fi/contacts.po          | 870 +++++++++++++++++++++++++++++++++++
 l10n/fi/core.po              | 268 +++++++++++
 l10n/fi/files.po             | 222 +++++++++
 l10n/fi/gallery.po           |  58 +++
 l10n/fi/lib.po               | 112 +++++
 l10n/fi/media.po             |  66 +++
 l10n/fi/settings.po          | 222 +++++++++
 l10n/templates/bookmarks.pot |   2 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |   2 +-
 l10n/templates/lib.pot       |   2 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 18 files changed, 2701 insertions(+), 9 deletions(-)
 create mode 100644 l10n/fi/bookmarks.po
 create mode 100644 l10n/fi/calendar.po
 create mode 100644 l10n/fi/contacts.po
 create mode 100644 l10n/fi/core.po
 create mode 100644 l10n/fi/files.po
 create mode 100644 l10n/fi/gallery.po
 create mode 100644 l10n/fi/lib.po
 create mode 100644 l10n/fi/media.po
 create mode 100644 l10n/fi/settings.po

diff --git a/l10n/fi/bookmarks.po b/l10n/fi/bookmarks.po
new file mode 100644
index 0000000000..eb0373eb8a
--- /dev/null
+++ b/l10n/fi/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/fi/calendar.po b/l10n/fi/calendar.po
new file mode 100644
index 0000000000..8bf64c073a
--- /dev/null
+++ b/l10n/fi/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2011-09-03 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
new file mode 100644
index 0000000000..d981913ecc
--- /dev/null
+++ b/l10n/fi/contacts.po
@@ -0,0 +1,870 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2011-09-23 17:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
+#: ajax/contact/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:60
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:67
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:142
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:69
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:79
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:108
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:111
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:114
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:117
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:71
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:71
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:76
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1337 js/contacts.js:1371
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1390
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:68
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:112 templates/part.contact.php:117
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:113
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:114 templates/part.contact.php:116
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:136
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:139
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:140
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:146
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:194
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:195
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:196
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18 templates/settings.php:9
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:36 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:37
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Next addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.contact.php:17
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:22
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:36
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:33
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:42
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:43 templates/part.contact.php:119
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:44
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:44
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:46
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:47 templates/part.contact.php:120
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:50
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:63 templates/part.contact.php:77
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:64
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:64
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:69
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:78
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:82
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:92
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:92
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:103
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:110
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:115
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:118
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:124
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:3
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:6
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings.php:49
+msgid "More..."
+msgstr ""
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
new file mode 100644
index 0000000000..53b71a432f
--- /dev/null
+++ b/l10n/fi/core.po
@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:572
+msgid "January"
+msgstr ""
+
+#: js/js.js:572
+msgid "February"
+msgstr ""
+
+#: js/js.js:572
+msgid "March"
+msgstr ""
+
+#: js/js.js:572
+msgid "April"
+msgstr ""
+
+#: js/js.js:572
+msgid "May"
+msgstr ""
+
+#: js/js.js:572
+msgid "June"
+msgstr ""
+
+#: js/js.js:573
+msgid "July"
+msgstr ""
+
+#: js/js.js:573
+msgid "August"
+msgstr ""
+
+#: js/js.js:573
+msgid "September"
+msgstr ""
+
+#: js/js.js:573
+msgid "October"
+msgstr ""
+
+#: js/js.js:573
+msgid "November"
+msgstr ""
+
+#: js/js.js:573
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
new file mode 100644
index 0000000000..63aaeba9a9
--- /dev/null
+++ b/l10n/fi/files.po
@@ -0,0 +1,222 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:694 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:695 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:722
+msgid "folder"
+msgstr ""
+
+#: js/files.js:724
+msgid "folders"
+msgstr ""
+
+#: js/files.js:732
+msgid "file"
+msgstr ""
+
+#: js/files.js:734
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/fi/gallery.po b/l10n/fi/gallery.po
new file mode 100644
index 0000000000..786216a0af
--- /dev/null
+++ b/l10n/fi/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
new file mode 100644
index 0000000000..eee9ac5f9e
--- /dev/null
+++ b/l10n/fi/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:288
+msgid "Help"
+msgstr ""
+
+#: app.php:295
+msgid "Personal"
+msgstr ""
+
+#: app.php:300
+msgid "Settings"
+msgstr ""
+
+#: app.php:305
+msgid "Users"
+msgstr ""
+
+#: app.php:312
+msgid "Apps"
+msgstr ""
+
+#: app.php:314
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/fi/media.po b/l10n/fi/media.po
new file mode 100644
index 0000000000..d0e3eab9bd
--- /dev/null
+++ b/l10n/fi/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
new file mode 100644
index 0000000000..940a5cbc09
--- /dev/null
+++ b/l10n/fi/settings.po
@@ -0,0 +1,222 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:62
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:56
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:26
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:29
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80 templates/users.php:112
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 9495d6ab1e..0923b3560e 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index a2638591d6..9afce66a0c 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index e9d6343cb6..45d062ecbc 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 3047850cc6..e078d4ab05 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 1c70a4f0c7..43eeb2aba4 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 023313cb79..740cbaedea 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 8a6a5ce2f0..bc1291279c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index bbbb69226c..568fa54578 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 43bc069603..a53e210997 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
+"POT-Creation-Date: 2012-08-09 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From 2c5744f16c82f4f6742ad528c88b0480d007a014 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 20:56:55 -0400
Subject: [PATCH 1344/1537] Add back getItemSharedWithBySource(), some
 situtations require this ability

---
 lib/public/share.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 0a5c4ce779..113f55a348 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -98,6 +98,17 @@ class Share {
 		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections);
 	}
 
+	/**
+	* @brief Get the item of item type shared with the current user by source
+	* @param string Item type
+	* @param string Item source
+	* @param int Format (optional) Format type must be defined by the backend
+	* @return Return depends on format
+	*/
+	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections, true);
+	}
+
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
@@ -434,7 +445,7 @@ class Share {
 	* See public functions getItem(s)... for parameter usage
 	*
 	*/
-	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) {
+	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false, $itemShareWithBySource = false) {
 		$backend = self::getBackend($itemType);
 		// Get filesystem root to add it to the file target and remove from the file source
 		$root = \OC_Filesystem::getRoot();
@@ -489,7 +500,7 @@ class Share {
 		}
 		if (isset($item)) {
 			// If looking for own shared items, check item_source else check item_target
-			if (isset($uidOwner)) {
+			if (isset($uidOwner) || $itemShareWithBySource) {
 				// If item type is a file, file source needs to be checked in case the item was converted
 				if ($itemType == 'file' || $itemType == 'folder') {
 					$where .= " AND path = ?";

From b830b3e24b281204344e9162352c7034f0a67187 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 21:43:02 -0400
Subject: [PATCH 1345/1537] Start adding permission checks for addressbooks

---
 apps/contacts/lib/addressbook.php | 14 +++++++++++++-
 apps/contacts/lib/app.php         | 28 ++++++++++++++++------------
 apps/contacts/lib/vcard.php       | 18 ++++++++++++++++--
 lib/public/share.php              |  1 +
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index a81b1f7798..92c5f4da3a 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -208,7 +208,12 @@ class OC_Contacts_Addressbook {
 	public static function edit($id,$name,$description) {
 		// Need these ones for checking uri
 		$addressbook = self::find($id);
-
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $id);
+			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				return false;
+			}
+		}
 		if(is_null($name)) {
 			$name = $addressbook['name'];
 		}
@@ -270,6 +275,13 @@ class OC_Contacts_Addressbook {
 	 * @return boolean
 	 */
 	public static function delete($id) {
+		$addressbook = self::find($id);
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $id);
+			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+				return false;
+			}
+		}
 		self::setActive($id, false);
 		try {
 			$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 855a9c7416..e8d9abac41 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -37,19 +37,23 @@ class OC_Contacts_App {
 						)
 					)
 				);
-			}
-			else {
-				OCP\Util::writeLog('contacts',
-					'Addressbook('.$id.') is not from '.OCP\USER::getUser(),
-					OCP\Util::ERROR);
-				//throw new Exception('This is not your addressbook.');
-				OCP\JSON::error(
-					array(
-						'data' => array(
-							'message' => self::$l10n->t('This is not your addressbook.')
+			} else {
+				$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $id, OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS);
+				if ($sharedAddressbook) {
+					return $sharedAddressbook;
+				} else {
+					OCP\Util::writeLog('contacts',
+						'Addressbook('.$id.') is not from '.OCP\USER::getUser(),
+						OCP\Util::ERROR);
+					//throw new Exception('This is not your addressbook.');
+					OCP\JSON::error(
+						array(
+							'data' => array(
+								'message' => self::$l10n->t('This is not your addressbook.')
+							)
 						)
-					)
-				);
+					);
+				}
 			}
 		}
 		return $addressbook;
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 990e790c03..a93ca399d3 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -292,12 +292,26 @@ class OC_Contacts_VCard{
 			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::add. No vCard supplied', OCP\Util::ERROR);
 			return null;
 		};
-
+		$addressbook = OC_Contacts_Addressbook::find($aid);
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $aid);
+			if (!$sharedAddressbook) {
+				return false;
+			}
+		} else {
+			$sharedAddressbook = false;
+		}
 		if(!$isnew) {
+			if ($sharedAddressbook && !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				return false;
+			}
 			OC_Contacts_App::loadCategoriesFromVCard($card);
 			self::updateValuesFromAdd($aid, $card);
+		} else {
+			if ($sharedAddressbook && !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_CREATE)) {
+				return false;
+			}
 		}
-
 		$card->setString('VERSION', '3.0');
 		// Add product ID is missing.
 		$prodid = trim($card->getAsString('PRODID'));
diff --git a/lib/public/share.php b/lib/public/share.php
index 113f55a348..bda2441b45 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -507,6 +507,7 @@ class Share {
 					$query_args[] = $root.$item;
 				} else {
 					$where .= " AND item_source = ?";
+					$column = 'item_source';
 					$query_args[] = $item;
 				}
 			} else {

From 889f0a1c6df51c5b6495445809143940ad17c327 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 10:40:39 +0200
Subject: [PATCH 1346/1537] rename appconfig keys for backgroundjobs

---
 cron.php                     |  8 ++++----
 lib/backgroundjob/worker.php | 12 ++++++------
 lib/base.php                 |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cron.php b/cron.php
index 2bcaaff9fd..9d7e396d61 100644
--- a/cron.php
+++ b/cron.php
@@ -23,19 +23,19 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
-$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' );
+$appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 if( OC::$CLI ){
 	if( $appmode != 'cron' ){
-		OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
+		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
 
 	// check if backgroundjobs is still running
-	$pid = OC_Appconfig::getValue( 'core', 'backgroundjob_pid', false );
+	$pid = OC_Appconfig::getValue( 'core', 'backgroundjobs_pid', false );
 	if( $pid !== false ){
 		// FIXME: check if $pid is still alive (*nix/mswin). if so then exit
 	}
 	// save pid
-	OC_Appconfig::setValue( 'core', 'backgroundjob_pid', getmypid());
+	OC_Appconfig::setValue( 'core', 'backgroundjobs_pid', getmypid());
 
 	// Work
 	OC_BackgroundJob_Worker::doAllSteps();
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 7514a16b69..799fa5306c 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -60,11 +60,11 @@ class OC_BackgroundJob_Worker{
 	 * services.
 	 */
 	public static function doNextStep(){
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjob_step', 'regular_tasks' );
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
 		
 		if( $laststep == 'regular_tasks' ){
 			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjob_task', '' );
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
 
 			// What's the next step?
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
@@ -74,7 +74,7 @@ class OC_BackgroundJob_Worker{
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjob_task', $key );
+					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;
@@ -83,7 +83,7 @@ class OC_BackgroundJob_Worker{
 
 			if( $done == false ){
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'scheduled_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
 			}
 		}
 		else{
@@ -99,8 +99,8 @@ class OC_BackgroundJob_Worker{
 			}
 			else{
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjob_task', '' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 			}
 		}
 		
diff --git a/lib/base.php b/lib/base.php
index 090d05cdba..ee80294dd9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -234,7 +234,7 @@ class OC{
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
 
-		if( OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' ) == 'ajax' ){
+		if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
 			OC_Util::addScript( 'backgroundjobs' );
 		}
 		

From 1ce2cd73ffd9c76912f8ba03809a5b347cec38a9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 10:41:10 +0200
Subject: [PATCH 1347/1537] Add first version of backgroundjobs settings

---
 settings/ajax/setbackgroundjobsmode.php | 28 +++++++++++++++++++++++++
 settings/js/admin.js                    |  8 ++++++-
 settings/templates/admin.php            | 13 ++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 settings/ajax/setbackgroundjobsmode.php

diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
new file mode 100644
index 0000000000..454b3caa5b
--- /dev/null
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -0,0 +1,28 @@
+<?php
+/**
+* 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/>.
+*
+*/
+
+OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
+
+OC_Appconfig::setValue( 'core', 'backgroundjob_mode', $_POST['mode'] );
+
+echo 'true';
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 4f295ab6f5..409594a4b9 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,5 +3,11 @@ $(document).ready(function(){
 		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
 			OC.Log.reload();
 		} );
-	})
+	});
+
+	$('#backgroundjobs input').change(function(){
+		if($(this).attr('checked')){
+			$.post(OC.filePath('settings','ajax','setbackgroundjobsmode.php'), { mode: $(this).val() });
+		}
+	});
 });
\ No newline at end of file
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 60b9732d7f..318bfbbe19 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -24,6 +24,19 @@ if(!$_['htaccessworking']) {
 <?php foreach($_['forms'] as $form){
 	echo $form;
 };?>
+
+<fieldset class="personalblock" id="backgroundjobs">
+	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none">
+	<label for="backgroundjobs_none">None</label><br />
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax">
+	<label for="backgroundjobs_ajax">AJAX</label><br />
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron">
+	<label for="backgroundjobs_webcron">Webcron</label><br />
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron">
+	<label for="backgroundjobs_cron">Cron</label><br />
+</fieldset>
+
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
 	Log level: <select name='loglevel' id='loglevel'>

From d24582503a9f4e3b511cf7093748326a396779d0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 11:35:14 +0200
Subject: [PATCH 1348/1537] Fix require statements. Fix for oc-1460.

---
 apps/contacts/ajax/contact/addproperty.php    | 14 +++++++-------
 apps/contacts/ajax/contact/delete.php         |  3 ++-
 apps/contacts/ajax/contact/deleteproperty.php |  3 ++-
 apps/contacts/ajax/contact/saveproperty.php   |  4 +++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
index 58b857547f..ca28140edf 100644
--- a/apps/contacts/ajax/contact/addproperty.php
+++ b/apps/contacts/ajax/contact/addproperty.php
@@ -25,7 +25,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-require_once 'loghandler.php';
+require_once __DIR__.'/../loghandler.php';
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
@@ -48,9 +48,9 @@ if(!$vcard) {
 
 if(!is_array($value)) {
 	$value = trim($value);
-	if(!$value 
+	if(!$value
 		&& in_array(
-		$name, 
+		$name,
 		array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))
 	) {
 		bailOut($l10n->t('Cannot add empty property.'));
@@ -78,9 +78,9 @@ foreach($current as $item) {
 }
 
 if(is_array($value)) {
-	// NOTE: Important, otherwise the compound value will 
+	// NOTE: Important, otherwise the compound value will
 	// be set in the order the fields appear in the form!
-	ksort($value);  
+	ksort($value);
 	$value = array_map('strip_tags', $value);
 } else {
 	$value = strip_tags($value);
@@ -123,10 +123,10 @@ switch($name) {
 
 $line = count($vcard->children) - 1;
 
-// Apparently Sabre_VObject_Parameter doesn't do well with 
+// Apparently Sabre_VObject_Parameter doesn't do well with
 // multiple values or I don't know how to do it. Tanghus.
 foreach ($parameters as $key=>$element) {
-	if(is_array($element) && strtoupper($key) == 'TYPE') { 
+	if(is_array($element) && strtoupper($key) == 'TYPE') {
 		// NOTE: Maybe this doesn't only apply for TYPE?
 		// And it probably shouldn't be done here anyways :-/
 		foreach($element as $e) {
diff --git a/apps/contacts/ajax/contact/delete.php b/apps/contacts/ajax/contact/delete.php
index 9777046fc8..def98b3670 100644
--- a/apps/contacts/ajax/contact/delete.php
+++ b/apps/contacts/ajax/contact/delete.php
@@ -23,7 +23,8 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
diff --git a/apps/contacts/ajax/contact/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php
index 205df8bc18..9c3f09f861 100644
--- a/apps/contacts/ajax/contact/deleteproperty.php
+++ b/apps/contacts/ajax/contact/deleteproperty.php
@@ -24,7 +24,8 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
 
 $id = $_POST['id'];
 $checksum = $_POST['checksum'];
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
index ef4d1b26c5..f9880c7883 100644
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ b/apps/contacts/ajax/contact/saveproperty.php
@@ -19,7 +19,9 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
+
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');

From 10d0861872c031e089766fe8e992d44c1cb7e5c5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 6 Aug 2012 16:47:00 +0200
Subject: [PATCH 1349/1537] remove unstable lib

---
 lib/exception.php | 93 -----------------------------------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 lib/exception.php

diff --git a/lib/exception.php b/lib/exception.php
deleted file mode 100644
index db516fc12d..0000000000
--- a/lib/exception.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Georg Ehrke
- * @copyright 2012 georg@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/>.
- *
- */
-class OC_Exception extends Exception{
-	
-	function __construct($message = null, $code = 0, $file = null, $line = null){
-		parent::__construct($message, $code);
-		if(!is_null($file)){
-			$this->file = $file;
-		}
-		if(!is_null($line)){
-			$this->line = $line;
-		}
-		$this->writelog();
-	}
-	
-	private function writelog(){
-		@OC_Log::write(OC_App::getCurrentApp(), $this->getMessage() . '-' . $this->getFile() . '-' . $this->getLine(), OC_Log::FATAL);
-	}
-	
-	private function generatesysinfo(){
-		return array('phpversion' => PHP_VERSION,
-					 'os' => php_uname('s'),
-					 'osrelease' => php_uname('r'),
-					 'osarchitecture' => php_uname('m'),
-					 'phpserverinterface' => php_sapi_name(),
-					 'serverprotocol' => $_SERVER['SERVER_PROTOCOL'],
-					 'requestmethod' => $_SERVER['REQUEST_METHOD'],
-					 'https' => ($_SERVER['HTTPS']==''?'false':'true'),
-					 'database'=>(@OC_Config::getValue('dbtype')!=''?@OC_Config::getValue('dbtype'):'')
-					);
-	}
-	
-	function __toString(){
-		$tmpl = new OC_Template('core', 'exception', 'guest');
-		$tmpl->assign('showsysinfo', true);
-		$tmpl->assign('message', $this->getMessage());
-		$tmpl->assign('code', $this->getCode());
-		$tmpl->assign('file', $this->getFile());
-		$tmpl->assign('line', $this->getLine());
-		$tmpl->assign('sysinfo', $this->generatesysinfo());
-		$tmpl->printPage();
-	}
-}
-
-function oc_exceptionhandler($exception){
-	switch($exception->getCode()){
-		case E_NOTICE:
-		case E_DEPRECATED:
-		case E_USER_NOTICE:
-		case E_USER_DEPRECATED:
-			break;
-		default:
-			throw new OC_Exception($exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine());
-			break;
-	}
-	return true;
-}
-
-function oc_errorhandler($errno , $errstr , $errfile , $errline){
-	switch($errno){
-		case E_NOTICE:
-		case E_DEPRECATED:
-		case E_USER_NOTICE:
-		case E_USER_DEPRECATED:
-			break;
-		default:
-			throw new OC_Exception($errstr, $errno, $errfile, $errline);
-			break;	
-	}
-	return true;
-}
-set_exception_handler('oc_exceptionhandler');
-set_error_handler('oc_errorhandler');
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
\ No newline at end of file

From 00d7ae8319ad0b48b31df4080fe7da7a848de28d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 9 Aug 2012 12:36:00 +0200
Subject: [PATCH 1350/1537] move calendar settings from personal settings to in
 app settings

---
 apps/calendar/ajax/calendar/overview.php      |   4 +-
 apps/calendar/appinfo/app.php                 |   1 -
 apps/calendar/calendar.php                    |  12 +++
 apps/calendar/css/style.css                   |  11 +-
 apps/calendar/index.php                       |   3 +-
 apps/calendar/js/calendar.js                  |  68 +++++++-----
 apps/calendar/js/settings.js                  |   7 +-
 apps/calendar/settings.php                    |   2 +-
 apps/calendar/templates/calendar.php          |  16 ++-
 .../templates/part.choosecalendar.php         | 101 +++++++++---------
 apps/calendar/templates/settings.php          |  76 +++++++++----
 11 files changed, 178 insertions(+), 123 deletions(-)
 create mode 100644 apps/calendar/calendar.php

diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
index 9d43364ffb..1d8e49ea5f 100644
--- a/apps/calendar/ajax/calendar/overview.php
+++ b/apps/calendar/ajax/calendar/overview.php
@@ -4,9 +4,7 @@
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
- */
-
- 
+ */ 
 $l10n = OC_L10N::get('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 4fdba29126..5c05c57bca 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -33,5 +33,4 @@ OCP\App::addNavigationEntry( array(
   'href' => OCP\Util::linkTo( 'calendar', 'index.php' ),
   'icon' => OCP\Util::imagePath( 'calendar', 'icon.svg' ),
   'name' => $l->t('Calendar')));
-OCP\App::registerPersonal('calendar', 'settings');
 OC_Search::registerProvider('OC_Search_Provider_Calendar');
diff --git a/apps/calendar/calendar.php b/apps/calendar/calendar.php
new file mode 100644
index 0000000000..2c0bee9d23
--- /dev/null
+++ b/apps/calendar/calendar.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownClouddev at georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+$l10n = OC_L10N::get('calendar');
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('calendar');
+$tmpl = new OCP\Template('calendar', 'part.choosecalendar');
+$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 373a456563..5cda4b1bef 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -19,7 +19,7 @@
 
 #loading { display: none;margin: 0;padding:0;margin-top:5px;}
 
-#calendar_holder {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
+#fullcalendar {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
 .fc-content{padding:2px 4px;}
 #listview {margin: 0; padding: 10px; background: #EEEEEE;}
 #listview #more_before, #listview #more_after {border: 1px solid #1a1a1a; width:25em;padding: 3px;text-align: center;}
@@ -133,3 +133,12 @@ padding:0 8px 2px;
 line-height:1.2;
 margin-bottom:4px;
 }
+
+#choosecalendar a.settings{
+	margin-top: 25px;
+	margin-right: 10px;
+}
+
+#fullcalendar{
+	overflow: scroll;
+}
\ No newline at end of file
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index cbfe0027b7..352c295c43 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -5,8 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
-
- 
+DEFINE('DEBUG', TRUE);
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 25311fa0df..23846c89b8 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -18,7 +18,7 @@ Calendar={
 		startEventDialog:function(){
 			Calendar.UI.loading(false);
 			$('.tipsy').remove();
-			$('#calendar_holder').fullCalendar('unselect');
+			$('#fullcalendar').fullCalendar('unselect');
 			Calendar.UI.lockTime();
 			$( "#from" ).datepicker({
 				dateFormat : 'dd-mm-yy'
@@ -88,7 +88,7 @@ Calendar={
 			$.post(url, post, function(data){
 					Calendar.UI.loading(false);
 					if(data.status == 'success'){
-						$('#calendar_holder').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
+						$('#fullcalendar').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
 						$('#event').dialog('destroy').remove();
 					} else {
 						$('#errorbox').html(t('calendar', 'Deletion failed'));
@@ -133,7 +133,7 @@ Calendar={
 					} else
 					if(data.status == 'success'){
 						$('#event').dialog('destroy').remove();
-						$('#calendar_holder').fullCalendar('refetchEvents');
+						$('#fullcalendar').fullCalendar('refetchEvents');
 					}
 				},"json");
 		},
@@ -148,7 +148,7 @@ Calendar={
 					console.log("Event moved successfully");
 				}else{
 					revertFunc();
-					$('#calendar_holder').fullCalendar('refetchEvents');
+					$('#fullcalendar').fullCalendar('refetchEvents');
 				}
 			});
 		},
@@ -163,7 +163,7 @@ Calendar={
 					console.log("Event resized successfully");
 				}else{
 					revertFunc();
-					$('#calendar_holder').fullCalendar('refetchEvents');
+					$('#fullcalendar').fullCalendar('refetchEvents');
 				}
 			});
 		},
@@ -239,11 +239,11 @@ Calendar={
 				doc_height = $(document).height(),
 				win_height = $(window).height();
 			if(direction == 'down' && win_height == (doc_height - scroll)){
-				$('#calendar_holder').fullCalendar('next');
+				$('#fullcalendar').fullCalendar('next');
 				$(document).scrollTop(0);
 				event.preventDefault();
 			}else if (direction == 'top' && scroll == 0) {
-				$('#calendar_holder').fullCalendar('prev');
+				$('#fullcalendar').fullCalendar('prev');
 				$(document).scrollTop(win_height);
 				event.preventDefault();
 			}
@@ -398,9 +398,9 @@ Calendar={
 					if (data.status == 'success'){
 						checkbox.checked = data.active == 1;
 						if (data.active == 1){
-							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
 						}else{
-							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
+							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
 						}
 					}
 				  });
@@ -426,10 +426,10 @@ Calendar={
 					  function(data) {
 						if (data.status == 'success'){
 							var url = 'ajax/events.php?calendar_id='+calid;
-							$('#calendar_holder').fullCalendar('removeEventSource', url);
+							$('#fullcalendar').fullCalendar('removeEventSource', url);
 							$('#choosecalendar_dialog').dialog('destroy').remove();
 							Calendar.UI.Calendar.overview();
-							$('#calendar_holder').fullCalendar('refetchEvents');
+							$('#fullcalendar').fullCalendar('refetchEvents');
 						}
 					  });
 				}
@@ -456,8 +456,8 @@ Calendar={
 					function(data){
 						if(data.status == 'success'){
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
-							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
-							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
+							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
 							if (calendarid == 'new'){
 								$('#choosecalendar_dialog > table:first').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
 							}
@@ -504,7 +504,7 @@ Calendar={
 			idtype: '',
 			activation:function(object,owner,id){
 				$.post(OC.filePath('calendar', 'ajax/share', 'activation.php'),{id:id, idtype:'calendar', activation:object.checked?1:0});
-				$('#calendar_holder').fullCalendar('refetchEvents');
+				$('#fullcalendar').fullCalendar('refetchEvents');
 			},
 			dropdown:function(userid, calid){
 				$('.calendar_share_dropdown').remove();
@@ -612,7 +612,7 @@ Calendar={
 					console.log('The drop-import feature is not supported in your browser :(');
 					return false;
 				}
-				droparea = document.getElementById('calendar_holder');
+				droparea = document.getElementById('fullcalendar');
 				droparea.ondrop = function(e){
 					e.preventDefault();
 					Calendar.UI.Drop.drop(e);
@@ -626,7 +626,7 @@ Calendar={
 					reader = new FileReader();
 					reader.onload = function(event){
 						Calendar.UI.Drop.import(event.target.result);
-						$('#calendar_holder').fullCalendar('refetchEvents');
+						$('#fullcalendar').fullCalendar('refetchEvents');
 					}
 					reader.readAsDataURL(file);
 				}
@@ -634,7 +634,7 @@ Calendar={
 			import:function(data){
 				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
 					if(result.status == 'success'){
-						$('#calendar_holder').fullCalendar('addEventSource', result.eventSource);
+						$('#fullcalendar').fullCalendar('addEventSource', result.eventSource);
 						$('#notification').html(result.message);
 						$('#notification').slideDown();
 						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
@@ -647,7 +647,11 @@ Calendar={
 				});
 			}
 		}
-	}
+	},
+	Settings:{
+		//
+	},
+	
 }
 $.fullCalendar.views.list = ListView;
 function ListView(element, calendar) {
@@ -815,7 +819,7 @@ function ListView(element, calendar) {
 }
 $(document).ready(function(){
 	Calendar.UI.initScroll();
-	$('#calendar_holder').fullCalendar({
+	$('#fullcalendar').fullCalendar({
 		header: false,
 		firstDay: firstDay,
 		editable: true,
@@ -851,10 +855,10 @@ $(document).ready(function(){
 			}
 			Calendar.UI.setViewActive(view.name);
 			if (view.name == 'agendaWeek') {
-				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 0.1);
+				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 0.1);
 			}
 			else {
-				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 1.35);
+				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 1.35);
 			}
 		},
 		columnFormat: {
@@ -888,7 +892,7 @@ $(document).ready(function(){
 		changeYear: true,
 		showButtonPanel: true,
 		beforeShow: function(input, inst) {
-			var calendar_holder = $('#calendar_holder');
+			var calendar_holder = $('#fullcalendar');
 			var date = calendar_holder.fullCalendar('getDate');
 			inst.input.datepicker('setDate', date);
 			inst.input.val(calendar_holder.fullCalendar('getView').title);
@@ -896,30 +900,36 @@ $(document).ready(function(){
 		},
 		onSelect: function(value, inst) {
 			var date = inst.input.datepicker('getDate');
-			$('#calendar_holder').fullCalendar('gotoDate', date);
+			$('#fullcalendar').fullCalendar('gotoDate', date);
 		}
 	});
 	fillWindow($('#content'));
 	OCCategories.changed = Calendar.UI.categoriesChanged;
 	OCCategories.app = 'calendar';
 	$('#oneweekview_radio').click(function(){
-		$('#calendar_holder').fullCalendar('changeView', 'agendaWeek');
+		$('#fullcalendar').fullCalendar('changeView', 'agendaWeek');
 	});
 	$('#onemonthview_radio').click(function(){
-		$('#calendar_holder').fullCalendar('changeView', 'month');
+		$('#fullcalendar').fullCalendar('changeView', 'month');
 	});
 	$('#listview_radio').click(function(){
-		$('#calendar_holder').fullCalendar('changeView', 'list');
+		$('#fullcalendar').fullCalendar('changeView', 'list');
 	});
 	$('#today_input').click(function(){
-		$('#calendar_holder').fullCalendar('today');
+		$('#fullcalendar').fullCalendar('today');
 	});
 	$('#datecontrol_left').click(function(){
-		$('#calendar_holder').fullCalendar('prev');
+		$('#fullcalendar').fullCalendar('prev');
 	});
 	$('#datecontrol_right').click(function(){
-		$('#calendar_holder').fullCalendar('next');
+		$('#fullcalendar').fullCalendar('next');
 	});
 	Calendar.UI.Share.init();
 	Calendar.UI.Drop.init();
+	$('#choosecalendar .generalsettings').on('click keydown', function() {
+		OC.appSettings({appid:'calendar', loadJS:true, cache:false});
+	});
+	$('#choosecalendar .calendarsettings').on('click keydown', function() {
+		OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'calendar.php'});
+	});
 });
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index 60741f2b6f..20753a7b8f 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -1,11 +1,7 @@
 $(document).ready(function(){
 	$('#timezone').change( function(){
-		OC.msg.startSaving('#calendar .msg')
-		// Serialize the data
 		var post = $( '#timezone' ).serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){
-			//OC.msg.finishedSaving('#calendar .msg', data);
-		});
+		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){return;});
 		return false;
 	});
 	$('#timezone').chosen();
@@ -52,6 +48,7 @@ $(document).ready(function(){
 		});
 	});
 	calendarcachecheck();
+	
 });
 function calendarcachecheck(){
 	$.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) {
diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php
index eaa20c6c9b..f563518046 100644
--- a/apps/calendar/settings.php
+++ b/apps/calendar/settings.php
@@ -14,4 +14,4 @@ $tmpl->assign('calendars', OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(
 
 OCP\Util::addscript('calendar','settings');
 
-return $tmpl->fetchPage();
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 29b9bf6bc5..c94cc755ab 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -33,6 +33,7 @@
 				?>
 				});
 				</script>
+				<div id="notification" style="display:none;"></div>
 				<div id="controls">
 					<form id="view">
 						<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
@@ -41,8 +42,9 @@
 						<img id="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
 					</form>
 					<form id="choosecalendar">
-						<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>
-						<input type="button" id="choosecalendar_input" value="<?php echo $l->t("Calendars");?>" onclick="Calendar.UI.Calendar.overview();" />
+						<!--<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>-->
+						<a class="settings calendarsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('calendar', 'icon.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
+						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Settings'); ?>" /></a>
 					</form>
 					<form id="datecontrol">
 						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
@@ -50,12 +52,6 @@
 						<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
 					</form>
 				</div>
-				<div id="notification" style="display:none;"></div>
-				<div id="calendar_holder">
-				</div>
-				<!-- Dialogs -->
+				<div id="fullcalendar"></div>
 				<div id="dialog_holder"></div>
-				<div id="parsingfail_dialog" title="Parsing Fail">
-					<?php echo $l->t("There was a fail, while parsing the file."); ?>
-				</div>
-				<!-- End of Dialogs -->
+				<div id="appsettings" class="popup topright hidden"></div>
\ No newline at end of file
diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php
index 8d621cc363..ad2f9e753f 100644
--- a/apps/calendar/templates/part.choosecalendar.php
+++ b/apps/calendar/templates/part.choosecalendar.php
@@ -1,51 +1,52 @@
-<div id="choosecalendar_dialog" title="<?php echo $l->t("Choose active calendars"); ?>">
-<p><b><?php echo $l->t('Your calendars'); ?>:</b></p>
-<table width="100%" style="border: 0;">
-<?php
-$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-for($i = 0; $i < count($option_calendars); $i++){
-	echo "<tr>";
-	$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-	$tmpl->assign('calendar', $option_calendars[$i]);
-	if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){
-		$shared = false;
-	}else{
-		$shared = true;
+<form id="calendar">
+	<p><b><?php echo $l->t('Your calendars'); ?>:</b></p>
+	<table width="100%" style="border: 0;">
+	<?php
+	$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+	for($i = 0; $i < count($option_calendars); $i++){
+		echo "<tr>";
+		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
+		$tmpl->assign('calendar', $option_calendars[$i]);
+		if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){
+			$shared = false;
+		}else{
+			$shared = true;
+		}
+		$tmpl->assign('shared', $shared);
+		$tmpl->printpage();
+		echo "</tr>";
 	}
-	$tmpl->assign('shared', $shared);
-	$tmpl->printpage();
-	echo "</tr>";
-}
-?>
-<tr>
-	<td colspan="6">
-		<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="<?php echo $l->t('New Calendar') ?>"></a>
-	</td>
-</tr>
-<tr>
-	<td colspan="6">
-		<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
-	</td>
-</tr>
-</table><br>
-<p><b><?php echo $l->t('Shared calendars'); ?>: </b></p>
-<table width="100%" style="border: 0;">
-<?php
-$share = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR);
-$count = count($share);
-for($i = 0; $i < $count; $i++){
-	$share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false);
-	echo '<tr>';
-	$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared');
-	$tmpl->assign('share', $share[$i]);
-	$tmpl->printpage();
-	echo '</tr>';
-}
-?>
-</table>
-<?php
-if($count == 0){
-	echo '<p style="text-align:center;"><b>' . $l->t('No shared calendars') . '</b></p>';
-}
-?>
-</div>
\ No newline at end of file
+	?>
+	<tr>
+		<td colspan="6">
+			<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="<?php echo $l->t('New Calendar') ?>"></a>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="6">
+			<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
+		</td>
+	</tr>
+	</table><br>
+	<p><b><?php echo $l->t('Shared calendars'); ?>: </b></p>
+	<table width="100%" style="border: 0;">
+	<?php
+	$share = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR);
+	$count = count($share);
+	for($i = 0; $i < $count; $i++){
+		$share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false);
+		echo '<tr>';
+		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared');
+		$tmpl->assign('share', $share[$i]);
+		$tmpl->printpage();
+		echo '</tr>';
+	}
+	?>
+	</table>
+	<?php
+	if($count == 0){
+		echo '<p style="text-align:center;"><b>' . $l->t('No shared calendars') . '</b></p>';
+	}
+	?>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 28c357621a..56a6a42ee0 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -7,11 +7,16 @@
  * See the COPYING-README file.
  */
 ?>
-<form id="calendar">
-	<fieldset class="personalblock">
-	<legend><?php echo $l->t('Calendar'); ?></legend>
-		<table class="nostyle">
-			<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
+<h2 id="title_general"><?php echo $l->t('General'); ?></h2>
+<div id="general">
+	<table class="nostyle">
+		<tr>
+			<td>
+				<label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
+				<select style="display: none;" id="timezone" name="timezone">
 				<?php
 				$continent = '';
 				foreach($_['timezones'] as $timezone):
@@ -27,29 +32,58 @@
 					$city=strtr($ex[1], '_', ' ');
 					$continent=$ex[0];
 					echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
+					var_dump($_['timezone']);
 				endforeach;?>
-			</select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
-
-			<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				&nbsp;&nbsp;
+			</td>
+			<td>
+				<input type="checkbox" name="timezonedetection" id="timezonedetection">
+				&nbsp;
+				<label for="timezonedetection"><?php echo $l->t('Update timezone automatically'); ?></label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<label for="timeformat" class="bold"><?php echo $l->t('Time format');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
 				<select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
 					<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
 					<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
 				</select>
-			</td></tr>
-
-			<tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<label for="firstday" class="bold"><?php echo $l->t('Start week on');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
 				<select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
 					<option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
 					<option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
 				</select>
-			</td></tr>
-
-            <tr><td><label for="" class="bold"><?php echo $l->t('Cache');?></label></td><td>
-                <input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
-            </td></tr>
-
-        </table>
-
+			</td>
+		</tr>
+		<tr class="advancedsettings">
+			<td>
+				<label for="" class="bold"><?php echo $l->t('Cache');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
+				<input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
+			</td>
+		</tr>
+	</table>
+</div>
+<h2 id="title_urls"><?php echo $l->t('URLs'); ?></h2>
+<div id="urls">
 		<?php echo $l->t('Calendar CalDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
 		<dl>
 		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
@@ -63,5 +97,5 @@
 			<?php } ?>
 		</dd>
 		</dl>
-        </fieldset>
-</form>
+	</div>
+</div>
\ No newline at end of file

From 39814edf81ede7413d98eaff86b183c42b4d8287 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 16:31:04 +0200
Subject: [PATCH 1351/1537] Another take at profile photo/thumbnail caching.
 oc-839.

---
 apps/contacts/ajax/contact/add.php            |  8 ++++-
 apps/contacts/ajax/contact/addproperty.php    |  7 +++-
 apps/contacts/ajax/contact/deleteproperty.php |  7 +++-
 apps/contacts/ajax/contact/details.php        |  1 +
 apps/contacts/ajax/contact/saveproperty.php   |  5 +--
 apps/contacts/ajax/savecrop.php               | 31 ++++++++--------
 apps/contacts/js/contacts.js                  |  8 ++---
 apps/contacts/lib/app.php                     | 12 +++++++
 apps/contacts/photo.php                       | 28 ++++++++++-----
 apps/contacts/thumbnail.php                   | 36 +++++++++++--------
 10 files changed, 96 insertions(+), 47 deletions(-)

diff --git a/apps/contacts/ajax/contact/add.php b/apps/contacts/ajax/contact/add.php
index 6aaf5a9df3..043e947dc4 100644
--- a/apps/contacts/ajax/contact/add.php
+++ b/apps/contacts/ajax/contact/add.php
@@ -49,4 +49,10 @@ if(!$id) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'id' => $id, 'aid' => $aid )));
+OCP\JSON::success(array(
+	'data' => array(
+		'id' => $id,
+		'aid' => $aid,
+		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
+	)
+));
diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
index ca28140edf..df064367ef 100644
--- a/apps/contacts/ajax/contact/addproperty.php
+++ b/apps/contacts/ajax/contact/addproperty.php
@@ -144,4 +144,9 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	bailOut($l10n->t('Error adding contact property: '.$name));
 }
 
-OCP\JSON::success(array('data' => array( 'checksum' => $checksum )));
+OCP\JSON::success(array(
+	'data' => array(
+		'checksum' => $checksum,
+		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U'))
+	)
+);
diff --git a/apps/contacts/ajax/contact/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php
index 9c3f09f861..d7545ff1fb 100644
--- a/apps/contacts/ajax/contact/deleteproperty.php
+++ b/apps/contacts/ajax/contact/deleteproperty.php
@@ -44,4 +44,9 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	bailOut($l10n->t('Error deleting contact property.'));
 }
 
-OCP\JSON::success(array('data' => array( 'id' => $id )));
+OCP\JSON::success(array(
+	'data' => array(
+		'id' => $id,
+		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U'),
+	)
+));
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
index 0e07f9ec3d..c22f18937d 100644
--- a/apps/contacts/ajax/contact/details.php
+++ b/apps/contacts/ajax/contact/details.php
@@ -53,5 +53,6 @@ if(isset($details['PHOTO'])) {
 $details['id'] = $id;
 $details['displayname'] = $card['fullname'];
 $details['addressbookid'] = $card['addressbookid'];
+$details['lastmodified'] = OC_Contacts_App::lastModified($vcard)->format('U');
 OC_Contacts_App::setLastModifiedHeader($vcard);
 OCP\JSON::success(array('data' => $details));
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
index f9880c7883..799038b6f1 100644
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ b/apps/contacts/ajax/contact/saveproperty.php
@@ -148,5 +148,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 OCP\JSON::success(array('data' => array(
 	'line' => $line,
 	'checksum' => $checksum,
-	'oldchecksum' => $_POST['checksum']))
-);
+	'oldchecksum' => $_POST['checksum']
+	'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
+));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 1df5299c7a..2483d0f712 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -62,17 +62,17 @@ if($data) {
 		if($image->crop($x1, $y1, $w, $h)) {
 			if(($image->width() <= 200 && $image->height() <= 200)
 						|| $image->resize(200)) {
-				$card = OC_Contacts_App::getContactVCard($id);
-				if(!$card) {
+				$vcard = OC_Contacts_App::getContactVCard($id);
+				if(!$vcard) {
 					OC_Cache::remove($tmpkey);
 					bailOut(OC_Contacts_App::$l10n
 						->t('Error getting contact object.'));
 				}
-				if($card->__isset('PHOTO')) {
+				if($vcard->__isset('PHOTO')) {
 					OCP\Util::writeLog('contacts',
 						'savecrop.php: PHOTO property exists.',
 						OCP\Util::DEBUG);
-					$property = $card->__get('PHOTO');
+					$property = $vcard->__get('PHOTO');
 					if(!$property) {
 						OC_Cache::remove($tmpkey);
 						bailOut(OC_Contacts_App::$l10n
@@ -83,27 +83,28 @@ if($data) {
 						= new Sabre_VObject_Parameter('ENCODING', 'b');
 					$property->parameters[]
 						= new Sabre_VObject_Parameter('TYPE', $image->mimeType());
-					$card->__set('PHOTO', $property);
+					$vcard->__set('PHOTO', $property);
 				} else {
 					OCP\Util::writeLog('contacts',
 						'savecrop.php: files: Adding PHOTO property.',
 						OCP\Util::DEBUG);
-					$card->addProperty('PHOTO',
+					$vcard->addProperty('PHOTO',
 						$image->__toString(), array('ENCODING' => 'b',
 						'TYPE' => $image->mimeType()));
 				}
 				$now = new DateTime;
-				$card->setString('REV', $now->format(DateTime::W3C));
-				if(!OC_Contacts_VCard::edit($id, $card)) {
+				$vcard->setString('REV', $now->format(DateTime::W3C));
+				if(!OC_Contacts_VCard::edit($id, $vcard)) {
 					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
 				}
-				$tmpl = new OCP\Template("contacts", "part.contactphoto");
-				$tmpl->assign('id', $id);
-				$tmpl->assign('refresh', true);
-				$tmpl->assign('width', $image->width());
-				$tmpl->assign('height', $image->height());
-				$page = $tmpl->fetchPage();
-				OCP\JSON::success(array('data' => array('page'=>$page)));
+				OCP\JSON::success(array(
+					'data' => array(
+						'id' => $id,
+						'width' => $image->width(),
+						'height' => $image->height(),
+						'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U')
+					)
+				));
 			} else {
 				bailOut(OC_Contacts_App::$l10n->t('Error resizing image'));
 			}
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9aec02557f..67bfa9847e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -835,7 +835,7 @@ OC.Contacts={
 								OC.Contacts.propertyContainerFor(obj).data('checksum', '');
 								if(proptype == 'PHOTO') {
 									OC.Contacts.Contacts.refreshThumbnail(OC.Contacts.Card.id);
-									OC.Contacts.Card.loadPhoto(true);
+									OC.Contacts.Card.loadPhoto();
 								} else if(proptype == 'NOTE') {
 									$('#note').find('textarea').val('');
 									OC.Contacts.propertyContainerFor(obj).hide();
@@ -1218,9 +1218,9 @@ OC.Contacts={
 				}
 			});
 		},
-		loadPhoto:function(refresh){
+		loadPhoto:function(){
 			var self = this;
-			var refreshstr = (refresh?'&refresh=1'+Math.random():'')
+			var refreshstr = ''; //'&refresh='+Math.random();
 			$('#phototools li a').tipsy('hide');
 			var wrapper = $('#contacts_details_photo_wrapper');
 			wrapper.addClass('loading').addClass('wait');
@@ -1278,7 +1278,7 @@ OC.Contacts={
 				var response=jQuery.parseJSON(target.contents().text());
 				if(response != undefined && response.status == 'success'){
 					// load cropped photo.
-					self.loadPhoto(true);
+					self.loadPhoto();
 					OC.Contacts.Card.data.PHOTO = true;
 				}else{
 					OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 3972d0e0a5..b59a8372b7 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -240,6 +240,18 @@ class OC_Contacts_App {
 		self::getVCategories()->loadFromVObject($contact, true);
 	}
 
+	/**
+	 * @brief Get the last modification time.
+	 * @param $vcard OC_VObject
+	 * $return DateTime | null
+	 */
+	public static function lastModified($vcard) {
+		$rev = $vcard->getAsString('REV');
+		if ($rev) {
+			return DateTime::createFromFormat(DateTime::W3C, $rev);
+		}
+	}
+
 	public static function setLastModifiedHeader($contact) {
 		$rev = $contact->getAsString('REV');
 		if ($rev) {
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index efdf157cd9..f5c8e6fe4b 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -20,14 +20,15 @@ function getStandardImage() {
 }
 
 $id = isset($_GET['id']) ? $_GET['id'] : null;
-$caching = isset($_GET['refresh']) ? 0 : null;
+$etag = null;
+$caching = null;
 
 if(is_null($id)) {
 	getStandardImage();
 }
 
 if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	OCP\Util::writeLog('contacts', 
+	OCP\Util::writeLog('contacts',
 		'photo.php. GD module not installed', OCP\Util::DEBUG);
 	getStandardImage();
 }
@@ -39,25 +40,34 @@ if (!$image) {
 }
 // invalid vcard
 if (is_null($contact)) {
-	OCP\Util::writeLog('contacts', 
-		'photo.php. The VCard for ID ' . $id . ' is not RFC compatible', 
+	OCP\Util::writeLog('contacts',
+		'photo.php. The VCard for ID ' . $id . ' is not RFC compatible',
 		OCP\Util::ERROR);
 } else {
-	OCP\Response::enableCaching($caching);
-	OC_Contacts_App::setLastModifiedHeader($contact);
-
 	// Photo :-)
 	if ($image->loadFromBase64($contact->getAsString('PHOTO'))) {
 		// OK
-		OCP\Response::setETagHeader(md5($contact->getAsString('PHOTO')));
+		$etag = md5($contact->getAsString('PHOTO'));
 	}
 	else
 	// Logo :-/
 	if ($image->loadFromBase64($contact->getAsString('LOGO'))) {
 		// OK
-		OCP\Response::setETagHeader(md5($contact->getAsString('LOGO')));
+		$etag = md5($contact->getAsString('LOGO'));
 	}
 	if ($image->valid()) {
+		$modified = OC_Contacts_App::lastModified($contact);
+		// Force refresh if modified within the last minute.
+		if(!is_null($modified)) {
+			$caching = (time() - $modified->format('U') > 60) ? null : 0;
+		}
+		OCP\Response::enableCaching($caching);
+		if(!is_null($modified)) {
+			OCP\Response::setLastModifiedHeader($modified);
+		}
+		if($etag) {
+			OCP\Response::setETagHeader($etag);
+		}
 		$max_size = 200;
 		if ($image->width() > $max_size || $image->height() > $max_size) {
 			$image->resize($max_size);
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 6deb5ca379..1e3714ae6c 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -26,27 +26,26 @@ OCP\App::checkAppEnabled('contacts');
 session_write_close();
 
 function getStandardImage() {
-	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person.png'));
 }
 
 if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	OCP\Util::writeLog('contacts', 
+	OCP\Util::writeLog('contacts',
 		'thumbnail.php. GD module not installed', OCP\Util::DEBUG);
 	getStandardImage();
 	exit();
 }
 
 $id = $_GET['id'];
-$caching = isset($_GET['refresh']) ? 0 : null;
+$caching = null;
 
 $contact = OC_Contacts_App::getContactVCard($id);
 
 // invalid vcard
 if(is_null($contact)) {
-	OCP\Util::writeLog('contacts', 
-		'thumbnail.php. The VCard for ID ' . $id . ' is not RFC compatible', 
+	OCP\Util::writeLog('contacts',
+		'thumbnail.php. The VCard for ID ' . $id . ' is not RFC compatible',
 		OCP\Util::ERROR);
 	getStandardImage();
 	exit();
@@ -60,30 +59,39 @@ $thumbnail_size = 23;
 $image = new OC_Image();
 $photo = $contact->getAsString('PHOTO');
 if($photo) {
-	OCP\Response::setETagHeader(md5($photo));
 	if($image->loadFromBase64($photo)) {
 		if($image->centerCrop()) {
 			if($image->resize($thumbnail_size)) {
+				$modified = OC_Contacts_App::lastModified($contact);
+				// Force refresh if modified within the last minute.
+				if(!is_null($modified)) {
+					$caching = (time() - $modified->format('U') > 60) ? null : 0;
+				}
+				OCP\Response::enableCaching($caching);
+				if(!is_null($modified)) {
+					OCP\Response::setLastModifiedHeader($modified);
+				}
+				OCP\Response::setETagHeader(md5($photo));
 				if($image->show()) {
 					exit();
 				} else {
-					OCP\Util::writeLog('contacts', 
-						'thumbnail.php. Couldn\'t display thumbnail for ID ' . $id, 
+					OCP\Util::writeLog('contacts',
+						'thumbnail.php. Couldn\'t display thumbnail for ID ' . $id,
 						OCP\Util::ERROR);
 				}
 			} else {
-				OCP\Util::writeLog('contacts', 
-					'thumbnail.php. Couldn\'t resize thumbnail for ID ' . $id, 
+				OCP\Util::writeLog('contacts',
+					'thumbnail.php. Couldn\'t resize thumbnail for ID ' . $id,
 					OCP\Util::ERROR);
 			}
 		}else{
-			OCP\Util::writeLog('contacts', 
-				'thumbnail.php. Couldn\'t crop thumbnail for ID ' . $id, 
+			OCP\Util::writeLog('contacts',
+				'thumbnail.php. Couldn\'t crop thumbnail for ID ' . $id,
 				OCP\Util::ERROR);
 		}
 	} else {
-		OCP\Util::writeLog('contacts', 
-			'thumbnail.php. Couldn\'t load image string for ID ' . $id, 
+		OCP\Util::writeLog('contacts',
+			'thumbnail.php. Couldn\'t load image string for ID ' . $id,
 			OCP\Util::ERROR);
 	}
 }

From acd8381094693fe3638466de7dc6c50e2783effb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 9 Aug 2012 16:36:16 +0200
Subject: [PATCH 1352/1537] fix scanning of archives in some cases

---
 lib/filecache/update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 93b632acb4..0b5ff8e244 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -152,8 +152,8 @@ class OC_FileCache_Update{
 		$size=0;
 		$cached=OC_FileCache_Cached::get($path,$root);
 		$cachedSize=isset($cached['size'])?$cached['size']:0;
-		
-		if($mimetype=='httpd/unix-directory'){
+
+		if($view->is_dir($path.'/')){
 			if(OC_FileCache::inCache($path,$root)){
 				$cachedContent=OC_FileCache_Cached::getFolderContent($path,$root);
 				foreach($cachedContent as $file){

From f9cec1426fe639a5683e36b5fbdeb9149feacb19 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 17:03:46 +0200
Subject: [PATCH 1353/1537] Change parameter name and update docs.

---
 apps/contacts/lib/vcard.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 990e790c03..b213bcd762 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -282,18 +282,19 @@ class OC_Contacts_VCard{
 
 	/**
 	 * @brief Adds a card
-	 * @param integer $aid Addressbook id
-	 * @param OC_VObject $card  vCard file
-	 * @param string $uri the uri of the card, default based on the UID
+	 * @param $aid integer Addressbook id
+	 * @param $card OC_VObject  vCard file
+	 * @param $uri string the uri of the card, default based on the UID
+	 * @param $isChecked boolean If the vCard should be checked for validity and version.
 	 * @return insertid on success or false.
 	 */
-	public static function add($aid, OC_VObject $card, $uri=null, $isnew=false){
+	public static function add($aid, OC_VObject $card, $uri=null, $isChecked=false){
 		if(is_null($card)) {
 			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::add. No vCard supplied', OCP\Util::ERROR);
 			return null;
 		};
 
-		if(!$isnew) {
+		if(!$isChecked) {
 			OC_Contacts_App::loadCategoriesFromVCard($card);
 			self::updateValuesFromAdd($aid, $card);
 		}

From 4e85848c927896b4d9084fd9019478baaee4507b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 9 Aug 2012 17:31:10 +0200
Subject: [PATCH 1354/1537] remove SabreDav 1.6.3

---
 3rdparty/Sabre.includes.php                   |   26 -
 3rdparty/Sabre/CalDAV/Backend/Abstract.php    |  168 --
 3rdparty/Sabre/CalDAV/Backend/PDO.php         |  396 ----
 3rdparty/Sabre/CalDAV/Calendar.php            |  343 ---
 3rdparty/Sabre/CalDAV/CalendarObject.php      |  273 ---
 3rdparty/Sabre/CalDAV/CalendarQueryParser.php |  296 ---
 .../Sabre/CalDAV/CalendarQueryValidator.php   |  369 ---
 3rdparty/Sabre/CalDAV/CalendarRootNode.php    |   75 -
 3rdparty/Sabre/CalDAV/ICSExportPlugin.php     |  139 --
 3rdparty/Sabre/CalDAV/ICalendar.php           |   18 -
 3rdparty/Sabre/CalDAV/ICalendarObject.php     |   20 -
 3rdparty/Sabre/CalDAV/Plugin.php              |  865 -------
 .../Sabre/CalDAV/Principal/Collection.php     |   31 -
 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php |  178 --
 .../Sabre/CalDAV/Principal/ProxyWrite.php     |  178 --
 3rdparty/Sabre/CalDAV/Principal/User.php      |  132 --
 .../SupportedCalendarComponentSet.php         |   85 -
 .../CalDAV/Property/SupportedCalendarData.php |   38 -
 .../CalDAV/Property/SupportedCollationSet.php |   44 -
 3rdparty/Sabre/CalDAV/Schedule/IMip.php       |  104 -
 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php    |   16 -
 3rdparty/Sabre/CalDAV/Schedule/Outbox.php     |  152 --
 3rdparty/Sabre/CalDAV/Server.php              |   68 -
 3rdparty/Sabre/CalDAV/UserCalendars.php       |  298 ---
 3rdparty/Sabre/CalDAV/Version.php             |   24 -
 3rdparty/Sabre/CalDAV/includes.php            |   43 -
 3rdparty/Sabre/CardDAV/AddressBook.php        |  312 ---
 .../Sabre/CardDAV/AddressBookQueryParser.php  |  219 --
 3rdparty/Sabre/CardDAV/AddressBookRoot.php    |   78 -
 3rdparty/Sabre/CardDAV/Backend/Abstract.php   |  166 --
 3rdparty/Sabre/CardDAV/Backend/PDO.php        |  330 ---
 3rdparty/Sabre/CardDAV/Card.php               |  250 --
 3rdparty/Sabre/CardDAV/IAddressBook.php       |   18 -
 3rdparty/Sabre/CardDAV/ICard.php              |   18 -
 3rdparty/Sabre/CardDAV/IDirectory.php         |   21 -
 3rdparty/Sabre/CardDAV/Plugin.php             |  666 ------
 .../CardDAV/Property/SupportedAddressData.php |   69 -
 3rdparty/Sabre/CardDAV/UserAddressBooks.php   |  257 ---
 3rdparty/Sabre/CardDAV/Version.php            |   26 -
 3rdparty/Sabre/CardDAV/includes.php           |   32 -
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   83 -
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   98 -
 3rdparty/Sabre/DAV/Auth/Backend/Apache.php    |   62 -
 3rdparty/Sabre/DAV/Auth/Backend/File.php      |   75 -
 3rdparty/Sabre/DAV/Auth/Backend/PDO.php       |   65 -
 3rdparty/Sabre/DAV/Auth/IBackend.php          |   36 -
 3rdparty/Sabre/DAV/Auth/Plugin.php            |  111 -
 .../Sabre/DAV/Browser/GuessContentType.php    |   97 -
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   55 -
 3rdparty/Sabre/DAV/Browser/Plugin.php         |  489 ----
 3rdparty/Sabre/DAV/Browser/assets/favicon.ico |  Bin 4286 -> 0 bytes
 .../DAV/Browser/assets/icons/addressbook.png  |  Bin 7232 -> 0 bytes
 .../DAV/Browser/assets/icons/calendar.png     |  Bin 4388 -> 0 bytes
 .../Sabre/DAV/Browser/assets/icons/card.png   |  Bin 5695 -> 0 bytes
 .../DAV/Browser/assets/icons/collection.png   |  Bin 3474 -> 0 bytes
 .../Sabre/DAV/Browser/assets/icons/file.png   |  Bin 2837 -> 0 bytes
 .../Sabre/DAV/Browser/assets/icons/parent.png |  Bin 3474 -> 0 bytes
 .../DAV/Browser/assets/icons/principal.png    |  Bin 5480 -> 0 bytes
 3rdparty/Sabre/DAV/Client.php                 |  492 ----
 3rdparty/Sabre/DAV/Collection.php             |  106 -
 3rdparty/Sabre/DAV/Directory.php              |   17 -
 3rdparty/Sabre/DAV/Exception.php              |   64 -
 3rdparty/Sabre/DAV/Exception/BadRequest.php   |   28 -
 3rdparty/Sabre/DAV/Exception/Conflict.php     |   28 -
 .../Sabre/DAV/Exception/ConflictingLock.php   |   35 -
 3rdparty/Sabre/DAV/Exception/FileNotFound.php |   19 -
 3rdparty/Sabre/DAV/Exception/Forbidden.php    |   27 -
 .../DAV/Exception/InsufficientStorage.php     |   27 -
 .../DAV/Exception/InvalidResourceType.php     |   33 -
 .../Exception/LockTokenMatchesRequestUri.php  |   39 -
 3rdparty/Sabre/DAV/Exception/Locked.php       |   67 -
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   45 -
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   28 -
 3rdparty/Sabre/DAV/Exception/NotFound.php     |   28 -
 .../Sabre/DAV/Exception/NotImplemented.php    |   27 -
 .../Sabre/DAV/Exception/PaymentRequired.php   |   28 -
 .../DAV/Exception/PreconditionFailed.php      |   69 -
 .../DAV/Exception/ReportNotImplemented.php    |   30 -
 .../RequestedRangeNotSatisfiable.php          |   29 -
 .../DAV/Exception/UnsupportedMediaType.php    |   28 -
 3rdparty/Sabre/DAV/FS/Directory.php           |  136 --
 3rdparty/Sabre/DAV/FS/File.php                |   89 -
 3rdparty/Sabre/DAV/FS/Node.php                |   80 -
 3rdparty/Sabre/DAV/FSExt/Directory.php        |  154 --
 3rdparty/Sabre/DAV/FSExt/File.php             |   93 -
 3rdparty/Sabre/DAV/FSExt/Node.php             |  212 --
 3rdparty/Sabre/DAV/File.php                   |   85 -
 3rdparty/Sabre/DAV/ICollection.php            |   74 -
 3rdparty/Sabre/DAV/IExtendedCollection.php    |   28 -
 3rdparty/Sabre/DAV/IFile.php                  |   77 -
 3rdparty/Sabre/DAV/INode.php                  |   46 -
 3rdparty/Sabre/DAV/IProperties.php            |   67 -
 3rdparty/Sabre/DAV/IQuota.php                 |   27 -
 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php |   50 -
 3rdparty/Sabre/DAV/Locks/Backend/FS.php       |  191 --
 3rdparty/Sabre/DAV/Locks/Backend/File.php     |  181 --
 3rdparty/Sabre/DAV/Locks/Backend/PDO.php      |  165 --
 3rdparty/Sabre/DAV/Locks/LockInfo.php         |   81 -
 3rdparty/Sabre/DAV/Locks/Plugin.php           |  633 ------
 3rdparty/Sabre/DAV/Mount/Plugin.php           |   80 -
 3rdparty/Sabre/DAV/Node.php                   |   55 -
 3rdparty/Sabre/DAV/ObjectTree.php             |  153 --
 3rdparty/Sabre/DAV/Property.php               |   25 -
 .../Sabre/DAV/Property/GetLastModified.php    |   75 -
 3rdparty/Sabre/DAV/Property/Href.php          |   91 -
 3rdparty/Sabre/DAV/Property/HrefList.php      |   96 -
 3rdparty/Sabre/DAV/Property/IHref.php         |   25 -
 3rdparty/Sabre/DAV/Property/LockDiscovery.php |  102 -
 3rdparty/Sabre/DAV/Property/ResourceType.php  |  125 -
 3rdparty/Sabre/DAV/Property/Response.php      |  155 --
 3rdparty/Sabre/DAV/Property/ResponseList.php  |   57 -
 3rdparty/Sabre/DAV/Property/SupportedLock.php |   76 -
 .../Sabre/DAV/Property/SupportedReportSet.php |  109 -
 3rdparty/Sabre/DAV/Server.php                 | 2006 -----------------
 3rdparty/Sabre/DAV/ServerPlugin.php           |   90 -
 3rdparty/Sabre/DAV/SimpleCollection.php       |  105 -
 3rdparty/Sabre/DAV/SimpleDirectory.php        |   21 -
 3rdparty/Sabre/DAV/SimpleFile.php             |  121 -
 3rdparty/Sabre/DAV/StringUtil.php             |   91 -
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |  289 ---
 3rdparty/Sabre/DAV/Tree.php                   |  193 --
 3rdparty/Sabre/DAV/Tree/Filesystem.php        |  123 -
 3rdparty/Sabre/DAV/URLUtil.php                |  121 -
 3rdparty/Sabre/DAV/UUIDUtil.php               |   64 -
 3rdparty/Sabre/DAV/Version.php                |   24 -
 3rdparty/Sabre/DAV/XMLUtil.php                |  186 --
 3rdparty/Sabre/DAV/includes.php               |   97 -
 .../DAVACL/AbstractPrincipalCollection.php    |  154 --
 .../Sabre/DAVACL/Exception/AceConflict.php    |   32 -
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   81 -
 .../Sabre/DAVACL/Exception/NoAbstract.php     |   32 -
 .../Exception/NotRecognizedPrincipal.php      |   32 -
 .../Exception/NotSupportedPrivilege.php       |   32 -
 3rdparty/Sabre/DAVACL/IACL.php                |   73 -
 3rdparty/Sabre/DAVACL/IPrincipal.php          |   75 -
 3rdparty/Sabre/DAVACL/IPrincipalBackend.php   |  153 --
 3rdparty/Sabre/DAVACL/Plugin.php              | 1348 -----------
 3rdparty/Sabre/DAVACL/Principal.php           |  279 ---
 .../Sabre/DAVACL/PrincipalBackend/PDO.php     |  427 ----
 3rdparty/Sabre/DAVACL/PrincipalCollection.php |   35 -
 3rdparty/Sabre/DAVACL/Property/Acl.php        |  209 --
 .../Sabre/DAVACL/Property/AclRestrictions.php |   32 -
 .../Property/CurrentUserPrivilegeSet.php      |   75 -
 3rdparty/Sabre/DAVACL/Property/Principal.php  |  160 --
 .../DAVACL/Property/SupportedPrivilegeSet.php |   92 -
 3rdparty/Sabre/DAVACL/Version.php             |   24 -
 3rdparty/Sabre/DAVACL/includes.php            |   38 -
 3rdparty/Sabre/HTTP/AWSAuth.php               |  227 --
 3rdparty/Sabre/HTTP/AbstractAuth.php          |  111 -
 3rdparty/Sabre/HTTP/BasicAuth.php             |   67 -
 3rdparty/Sabre/HTTP/DigestAuth.php            |  240 --
 3rdparty/Sabre/HTTP/Request.php               |  268 ---
 3rdparty/Sabre/HTTP/Response.php              |  157 --
 3rdparty/Sabre/HTTP/Util.php                  |   82 -
 3rdparty/Sabre/HTTP/Version.php               |   24 -
 3rdparty/Sabre/HTTP/includes.php              |   27 -
 3rdparty/Sabre/VObject/Component.php          |  365 ---
 3rdparty/Sabre/VObject/Component/VAlarm.php   |  102 -
 .../Sabre/VObject/Component/VCalendar.php     |  133 --
 3rdparty/Sabre/VObject/Component/VEvent.php   |   70 -
 3rdparty/Sabre/VObject/Component/VJournal.php |   46 -
 3rdparty/Sabre/VObject/Component/VTodo.php    |   68 -
 3rdparty/Sabre/VObject/DateTimeParser.php     |  181 --
 3rdparty/Sabre/VObject/Element.php            |   16 -
 3rdparty/Sabre/VObject/Element/DateTime.php   |   37 -
 .../Sabre/VObject/Element/MultiDateTime.php   |   17 -
 3rdparty/Sabre/VObject/ElementList.php        |  172 --
 3rdparty/Sabre/VObject/FreeBusyGenerator.php  |  297 ---
 3rdparty/Sabre/VObject/Node.php               |  149 --
 3rdparty/Sabre/VObject/Parameter.php          |   84 -
 3rdparty/Sabre/VObject/ParseException.php     |   12 -
 3rdparty/Sabre/VObject/Property.php           |  348 ---
 3rdparty/Sabre/VObject/Property/DateTime.php  |  260 ---
 .../Sabre/VObject/Property/MultiDateTime.php  |  166 --
 3rdparty/Sabre/VObject/Reader.php             |  183 --
 3rdparty/Sabre/VObject/RecurrenceIterator.php | 1009 ---------
 3rdparty/Sabre/VObject/Version.php            |   24 -
 3rdparty/Sabre/VObject/WindowsTimezoneMap.php |  128 --
 3rdparty/Sabre/VObject/includes.php           |   41 -
 3rdparty/Sabre/autoload.php                   |   31 -
 180 files changed, 25055 deletions(-)
 delete mode 100755 3rdparty/Sabre.includes.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Backend/Abstract.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Backend/PDO.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Calendar.php
 delete mode 100755 3rdparty/Sabre/CalDAV/CalendarObject.php
 delete mode 100755 3rdparty/Sabre/CalDAV/CalendarQueryParser.php
 delete mode 100755 3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
 delete mode 100755 3rdparty/Sabre/CalDAV/CalendarRootNode.php
 delete mode 100755 3rdparty/Sabre/CalDAV/ICSExportPlugin.php
 delete mode 100755 3rdparty/Sabre/CalDAV/ICalendar.php
 delete mode 100755 3rdparty/Sabre/CalDAV/ICalendarObject.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Plugin.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Principal/Collection.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Principal/User.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Schedule/IMip.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Schedule/Outbox.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Server.php
 delete mode 100755 3rdparty/Sabre/CalDAV/UserCalendars.php
 delete mode 100755 3rdparty/Sabre/CalDAV/Version.php
 delete mode 100755 3rdparty/Sabre/CalDAV/includes.php
 delete mode 100755 3rdparty/Sabre/CardDAV/AddressBook.php
 delete mode 100755 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
 delete mode 100755 3rdparty/Sabre/CardDAV/AddressBookRoot.php
 delete mode 100755 3rdparty/Sabre/CardDAV/Backend/Abstract.php
 delete mode 100755 3rdparty/Sabre/CardDAV/Backend/PDO.php
 delete mode 100755 3rdparty/Sabre/CardDAV/Card.php
 delete mode 100755 3rdparty/Sabre/CardDAV/IAddressBook.php
 delete mode 100755 3rdparty/Sabre/CardDAV/ICard.php
 delete mode 100755 3rdparty/Sabre/CardDAV/IDirectory.php
 delete mode 100755 3rdparty/Sabre/CardDAV/Plugin.php
 delete mode 100755 3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
 delete mode 100755 3rdparty/Sabre/CardDAV/UserAddressBooks.php
 delete mode 100755 3rdparty/Sabre/CardDAV/Version.php
 delete mode 100755 3rdparty/Sabre/CardDAV/includes.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/Backend/Apache.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/Backend/File.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/Backend/PDO.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/IBackend.php
 delete mode 100755 3rdparty/Sabre/DAV/Auth/Plugin.php
 delete mode 100755 3rdparty/Sabre/DAV/Browser/GuessContentType.php
 delete mode 100755 3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
 delete mode 100755 3rdparty/Sabre/DAV/Browser/Plugin.php
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/favicon.ico
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/card.png
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/file.png
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
 delete mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
 delete mode 100755 3rdparty/Sabre/DAV/Client.php
 delete mode 100755 3rdparty/Sabre/DAV/Collection.php
 delete mode 100755 3rdparty/Sabre/DAV/Directory.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/BadRequest.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/Conflict.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/ConflictingLock.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/FileNotFound.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/Forbidden.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/Locked.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/NotFound.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/NotImplemented.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/PaymentRequired.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 delete mode 100755 3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
 delete mode 100755 3rdparty/Sabre/DAV/FS/Directory.php
 delete mode 100755 3rdparty/Sabre/DAV/FS/File.php
 delete mode 100755 3rdparty/Sabre/DAV/FS/Node.php
 delete mode 100755 3rdparty/Sabre/DAV/FSExt/Directory.php
 delete mode 100755 3rdparty/Sabre/DAV/FSExt/File.php
 delete mode 100755 3rdparty/Sabre/DAV/FSExt/Node.php
 delete mode 100755 3rdparty/Sabre/DAV/File.php
 delete mode 100755 3rdparty/Sabre/DAV/ICollection.php
 delete mode 100755 3rdparty/Sabre/DAV/IExtendedCollection.php
 delete mode 100755 3rdparty/Sabre/DAV/IFile.php
 delete mode 100755 3rdparty/Sabre/DAV/INode.php
 delete mode 100755 3rdparty/Sabre/DAV/IProperties.php
 delete mode 100755 3rdparty/Sabre/DAV/IQuota.php
 delete mode 100755 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
 delete mode 100755 3rdparty/Sabre/DAV/Locks/Backend/FS.php
 delete mode 100755 3rdparty/Sabre/DAV/Locks/Backend/File.php
 delete mode 100755 3rdparty/Sabre/DAV/Locks/Backend/PDO.php
 delete mode 100755 3rdparty/Sabre/DAV/Locks/LockInfo.php
 delete mode 100755 3rdparty/Sabre/DAV/Locks/Plugin.php
 delete mode 100755 3rdparty/Sabre/DAV/Mount/Plugin.php
 delete mode 100755 3rdparty/Sabre/DAV/Node.php
 delete mode 100755 3rdparty/Sabre/DAV/ObjectTree.php
 delete mode 100755 3rdparty/Sabre/DAV/Property.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/GetLastModified.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/Href.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/HrefList.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/IHref.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/LockDiscovery.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/ResourceType.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/Response.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/ResponseList.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/SupportedLock.php
 delete mode 100755 3rdparty/Sabre/DAV/Property/SupportedReportSet.php
 delete mode 100755 3rdparty/Sabre/DAV/Server.php
 delete mode 100755 3rdparty/Sabre/DAV/ServerPlugin.php
 delete mode 100755 3rdparty/Sabre/DAV/SimpleCollection.php
 delete mode 100755 3rdparty/Sabre/DAV/SimpleDirectory.php
 delete mode 100755 3rdparty/Sabre/DAV/SimpleFile.php
 delete mode 100755 3rdparty/Sabre/DAV/StringUtil.php
 delete mode 100755 3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
 delete mode 100755 3rdparty/Sabre/DAV/Tree.php
 delete mode 100755 3rdparty/Sabre/DAV/Tree/Filesystem.php
 delete mode 100755 3rdparty/Sabre/DAV/URLUtil.php
 delete mode 100755 3rdparty/Sabre/DAV/UUIDUtil.php
 delete mode 100755 3rdparty/Sabre/DAV/Version.php
 delete mode 100755 3rdparty/Sabre/DAV/XMLUtil.php
 delete mode 100755 3rdparty/Sabre/DAV/includes.php
 delete mode 100755 3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Exception/AceConflict.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 delete mode 100755 3rdparty/Sabre/DAVACL/IACL.php
 delete mode 100755 3rdparty/Sabre/DAVACL/IPrincipal.php
 delete mode 100755 3rdparty/Sabre/DAVACL/IPrincipalBackend.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Plugin.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Principal.php
 delete mode 100755 3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
 delete mode 100755 3rdparty/Sabre/DAVACL/PrincipalCollection.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Property/Acl.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Property/Principal.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 delete mode 100755 3rdparty/Sabre/DAVACL/Version.php
 delete mode 100755 3rdparty/Sabre/DAVACL/includes.php
 delete mode 100755 3rdparty/Sabre/HTTP/AWSAuth.php
 delete mode 100755 3rdparty/Sabre/HTTP/AbstractAuth.php
 delete mode 100755 3rdparty/Sabre/HTTP/BasicAuth.php
 delete mode 100755 3rdparty/Sabre/HTTP/DigestAuth.php
 delete mode 100755 3rdparty/Sabre/HTTP/Request.php
 delete mode 100755 3rdparty/Sabre/HTTP/Response.php
 delete mode 100755 3rdparty/Sabre/HTTP/Util.php
 delete mode 100755 3rdparty/Sabre/HTTP/Version.php
 delete mode 100755 3rdparty/Sabre/HTTP/includes.php
 delete mode 100755 3rdparty/Sabre/VObject/Component.php
 delete mode 100755 3rdparty/Sabre/VObject/Component/VAlarm.php
 delete mode 100755 3rdparty/Sabre/VObject/Component/VCalendar.php
 delete mode 100755 3rdparty/Sabre/VObject/Component/VEvent.php
 delete mode 100755 3rdparty/Sabre/VObject/Component/VJournal.php
 delete mode 100755 3rdparty/Sabre/VObject/Component/VTodo.php
 delete mode 100755 3rdparty/Sabre/VObject/DateTimeParser.php
 delete mode 100755 3rdparty/Sabre/VObject/Element.php
 delete mode 100755 3rdparty/Sabre/VObject/Element/DateTime.php
 delete mode 100755 3rdparty/Sabre/VObject/Element/MultiDateTime.php
 delete mode 100755 3rdparty/Sabre/VObject/ElementList.php
 delete mode 100755 3rdparty/Sabre/VObject/FreeBusyGenerator.php
 delete mode 100755 3rdparty/Sabre/VObject/Node.php
 delete mode 100755 3rdparty/Sabre/VObject/Parameter.php
 delete mode 100755 3rdparty/Sabre/VObject/ParseException.php
 delete mode 100755 3rdparty/Sabre/VObject/Property.php
 delete mode 100755 3rdparty/Sabre/VObject/Property/DateTime.php
 delete mode 100755 3rdparty/Sabre/VObject/Property/MultiDateTime.php
 delete mode 100755 3rdparty/Sabre/VObject/Reader.php
 delete mode 100755 3rdparty/Sabre/VObject/RecurrenceIterator.php
 delete mode 100755 3rdparty/Sabre/VObject/Version.php
 delete mode 100755 3rdparty/Sabre/VObject/WindowsTimezoneMap.php
 delete mode 100755 3rdparty/Sabre/VObject/includes.php
 delete mode 100755 3rdparty/Sabre/autoload.php

diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
deleted file mode 100755
index c133437366..0000000000
--- a/3rdparty/Sabre.includes.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Library include file
- *
- * This file is deprecated, don't use it!
- * Instead, use the specific includes files that are in the sub-packages.
- *
- *   Sabre/DAV/includes.php
- *   Sabre/HTTP/includes.php
- *
- *   etc..
- *
- * This file contains all includes to the rest of the SabreDAV library
- * Make sure the lib/ directory is in PHP's include_path.
- *
- * @package Sabre
- * @deprecated Don't use this file, it will be remove in a future version
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-include 'Sabre/HTTP/includes.php';
-include 'Sabre/DAV/includes.php';
-
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
deleted file mode 100755
index 7aba1d69ff..0000000000
--- a/3rdparty/Sabre/CalDAV/Backend/Abstract.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/**
- * Abstract Calendaring backend. Extend this class to create your own backends.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_CalDAV_Backend_Abstract {
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    abstract function getCalendarsForUser($principalUri);
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return void
-     */
-    abstract function createCalendar($principalUri,$calendarUri,array $properties);
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        return false;
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    abstract function deleteCalendar($calendarId);
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *   * size - The size of the calendar objects, in bytes.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    abstract function getCalendarObjects($calendarId);
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array
-     */
-    abstract function getCalendarObject($calendarId,$objectUri);
-
-    /**
-     * Creates a new calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    abstract function deleteCalendarObject($calendarId,$objectUri);
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
deleted file mode 100755
index ddacf940c7..0000000000
--- a/3rdparty/Sabre/CalDAV/Backend/PDO.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-/**
- * PDO CalDAV backend
- *
- * This backend is used to store calendar-data in a PDO database, such as
- * sqlite or MySQL
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
-
-    /**
-     * pdo
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The table name that will be used for calendars
-     *
-     * @var string
-     */
-    protected $calendarTableName;
-
-    /**
-     * The table name that will be used for calendar objects
-     *
-     * @var string
-     */
-    protected $calendarObjectTableName;
-
-    /**
-     * List of CalDAV properties, and how they map to database fieldnames
-     *
-     * Add your own properties by simply adding on to this array
-     *
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}displayname'                          => 'displayname',
-        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-    );
-
-    /**
-     * Creates the backend
-     *
-     * @param PDO $pdo
-     * @param string $calendarTableName
-     * @param string $calendarObjectTableName
-     */
-    public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
-
-        $this->pdo = $pdo;
-        $this->calendarTableName = $calendarTableName;
-        $this->calendarObjectTableName = $calendarObjectTableName;
-
-    }
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri) {
-
-        $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'ctag';
-        $fields[] = 'components';
-        $fields[] = 'principaluri';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
-        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM ".$this->calendarTableName." WHERE principaluri = ? ORDER BY calendarorder ASC");
-        $stmt->execute(array($principalUri));
-
-        $calendars = array();
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-            $components = array();
-            if ($row['components']) {
-                $components = explode(',',$row['components']);
-            }
-
-            $calendar = array(
-                'id' => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
-            );
-
-
-            foreach($this->propertyMap as $xmlName=>$dbName) {
-                $calendar[$xmlName] = $row[$dbName];
-            }
-
-            $calendars[] = $calendar;
-
-        }
-
-        return $calendars;
-
-    }
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return string
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties) {
-
-        $fieldNames = array(
-            'principaluri',
-            'uri',
-            'ctag',
-        );
-        $values = array(
-            ':principaluri' => $principalUri,
-            ':uri'          => $calendarUri,
-            ':ctag'         => 1,
-        );
-
-        // Default value
-        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
-        if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
-        } else {
-            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
-                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
-            }
-            $values[':components'] = implode(',',$properties[$sccs]->getValue());
-        }
-
-        foreach($this->propertyMap as $xmlName=>$dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO ".$this->calendarTableName." (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        $newValues = array();
-        $result = array(
-            200 => array(), // Ok
-            403 => array(), // Forbidden
-            424 => array(), // Failed Dependency
-        );
-
-        $hasError = false;
-
-        foreach($mutations as $propertyName=>$propertyValue) {
-
-            // We don't know about this property.
-            if (!isset($this->propertyMap[$propertyName])) {
-                $hasError = true;
-                $result[403][$propertyName] = null;
-                unset($mutations[$propertyName]);
-                continue;
-            }
-
-            $fieldName = $this->propertyMap[$propertyName];
-            $newValues[$fieldName] = $propertyValue;
-
-        }
-
-        // If there were any errors we need to fail the request
-        if ($hasError) {
-            // Properties has the remaining properties
-            foreach($mutations as $propertyName=>$propertyValue) {
-                $result[424][$propertyName] = null;
-            }
-
-            // Removing unused statuscodes for cleanliness
-            foreach($result as $status=>$properties) {
-                if (is_array($properties) && count($properties)===0) unset($result[$status]);
-            }
-
-            return $result;
-
-        }
-
-        // Success
-
-        // Now we're generating the sql query.
-        $valuesSql = array();
-        foreach($newValues as $fieldName=>$value) {
-            $valuesSql[] = $fieldName . ' = ?';
-        }
-        $valuesSql[] = 'ctag = ctag + 1';
-
-        $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ',$valuesSql) . " WHERE id = ?");
-        $newValues['id'] = $calendarId;
-        $stmt->execute(array_values($newValues));
-
-        return true;
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarTableName.' WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *   * size - The size of the calendar objects, in bytes.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId) {
-
-        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-        return $stmt->fetchAll();
-
-    }
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array
-     */
-    public function getCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId, $objectUri));
-        return $stmt->fetch();
-
-    }
-
-    /**
-     * Creates a new calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO '.$this->calendarObjectTableName.' (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
-        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarObjectTableName.' SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE '. $this->calendarTableName .' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
deleted file mode 100755
index 623df2dd1b..0000000000
--- a/3rdparty/Sabre/CalDAV/Calendar.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-
-/**
- * This object represents a CalDAV calendar.
- *
- * A calendar can contain multiple TODO and or Events. These are represented
- * as Sabre_CalDAV_CalendarObject objects.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * This is an array with calendar information
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param array $calendarInfo
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalBackend = $principalBackend;
-        $this->calendarInfo = $calendarInfo;
-
-
-    }
-
-    /**
-     * Returns the name of the calendar
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->calendarInfo['uri'];
-
-    }
-
-    /**
-     * Updates properties such as the display name and description
-     *
-     * @param array $mutations
-     * @return array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
-
-    }
-
-    /**
-     * Returns the list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $response = array();
-
-        foreach($requestedProperties as $prop) switch($prop) {
-
-            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
-                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData();
-                break;
-            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
-                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet();
-                break;
-            case '{DAV:}owner' :
-                $response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
-                break;
-            default :
-                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
-                break;
-
-        }
-        return $response;
-
-    }
-
-    /**
-     * Returns a calendar object
-     *
-     * The contained calendar objects are for example Events or Todo's.
-     *
-     * @param string $name
-     * @return Sabre_DAV_ICalendarObject
-     */
-    public function getChild($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
-        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of calendar objects
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Checks if a child-node exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj)
-            return false;
-        else
-            return true;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in calendars.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid ICalendar string.
-     *
-     * @param string $name
-     * @param resource $calendarData
-     * @return string|null
-     */
-    public function createFile($name,$calendarData = null) {
-
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
-
-    }
-
-    /**
-     * Deletes the calendar.
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
-
-    }
-
-    /**
-     * Renames the calendar. Note that most calendars use the
-     * {DAV:}displayname to display a name to display a name.
-     *
-     * @param string $newName
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
-
-        // We need to inject 'read-free-busy' in the tree, aggregated under
-        // {DAV:}read.
-        foreach($default['aggregates'] as &$agg) {
-
-            if ($agg['privilege'] !== '{DAV:}read') continue;
-
-            $agg['aggregates'][] = array(
-                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
-            );
-
-        }
-        return $default;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
deleted file mode 100755
index 72f0a578d1..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarObject.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-
-/**
- * The CalendarObject represents a single VEVENT or VTODO within a Calendar.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
-
-    /**
-     * Sabre_CalDAV_Backend_Abstract
-     *
-     * @var array
-     */
-    protected $caldavBackend;
-
-    /**
-     * Array with information about this CalendarObject
-     *
-     * @var array
-     */
-    protected $objectData;
-
-    /**
-     * Array with information about the containing calendar
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param array $calendarInfo
-     * @param array $objectData
-     */
-    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,array $calendarInfo,array $objectData) {
-
-        $this->caldavBackend = $caldavBackend;
-
-        if (!isset($objectData['calendarid'])) {
-            throw new InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
-        }
-        if (!isset($objectData['uri'])) {
-            throw new InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-
-        $this->calendarInfo = $calendarInfo;
-        $this->objectData = $objectData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->objectData['uri'];
-
-    }
-
-    /**
-     * Returns the ICalendar-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
-        }
-        return $this->objectData['calendardata'];
-
-    }
-
-    /**
-     * Updates the ICalendar-formatted object
-     *
-     * @param string $calendarData
-     * @return void
-     */
-    public function put($calendarData) {
-
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
-        $this->objectData['calendardata'] = $calendarData;
-        $this->objectData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the calendar object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/calendar';
-
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->objectData['etag'])) {
-            return $this->objectData['etag'];
-        } else {
-            return '"' . md5($this->get()). '"';
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return time
-     */
-    public function getLastModified() {
-
-        return $this->objectData['lastmodified'];
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size',$this->objectData)) {
-            return $this->objectData['size'];
-        } else {
-            return strlen($this->get());
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
deleted file mode 100755
index bd0d343382..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-
-/**
- * Parses the calendar-query report request body.
- *
- * Whoever designed this format, and the CalDAV equivalent even more so,
- * has no feel for design.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarQueryParser {
-
-    /**
-     * List of requested properties the client wanted
-     *
-     * @var array
-     */
-    public $requestedProperties;
-
-    /**
-     * List of property/component filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * This property will contain null if CALDAV:expand was not specified, 
-     * otherwise it will contain an array with 2 elements (start, end). Each 
-     * contain a DateTime object.
-     *
-     * If expand is specified, recurring calendar objects are to be expanded 
-     * into their individual components, and only the components that fall 
-     * within the specified time-range are to be returned.
-     *
-     * For more details, see rfc4791, section 9.6.5.
-     * 
-     * @var null|array 
-     */
-    public $expand;
-
-    /**
-     * DOM Document
-     *
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     *
-     * @param DOMDocument $dom
-     */
-    public function __construct(DOMDocument $dom) {
-
-        $this->dom = $dom;
-
-        $this->xpath = new DOMXPath($dom);
-        $this->xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
-        $this->xpath->registerNameSpace('dav','urn:DAV');
-
-    }
-
-    /**
-     * Parses the request.
-     *
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-
-        $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
-        if ($filter->length !== 1) {
-            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
-        }
-
-        $compFilters = $this->parseCompFilters($filter->item(0));
-        if (count($compFilters)!==1) {
-            throw new Sabre_DAV_Exception_BadRequest('There must be exactly 1 top-level comp-filter.');
-        }
-
-        $this->filters = $compFilters[0];
-        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
-
-        $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
-        if ($expand->length>0) {
-            $this->expand = $this->parseExpand($expand->item(0));
-        }
-             
-
-    }
-
-    /**
-     * Parses all the 'comp-filter' elements from a node
-     *
-     * @param DOMElement $parentNode
-     * @return array
-     */
-    protected function parseCompFilters(DOMElement $parentNode) {
-
-        $compFilterNodes = $this->xpath->query('cal:comp-filter', $parentNode);
-        $result = array();
-
-        for($ii=0; $ii < $compFilterNodes->length; $ii++) {
-
-            $compFilterNode = $compFilterNodes->item($ii);
-
-            $compFilter = array();
-            $compFilter['name'] = $compFilterNode->getAttribute('name');
-            $compFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $compFilterNode)->length>0;
-            $compFilter['comp-filters'] = $this->parseCompFilters($compFilterNode);
-            $compFilter['prop-filters'] = $this->parsePropFilters($compFilterNode);
-            $compFilter['time-range'] = $this->parseTimeRange($compFilterNode);
-
-            if ($compFilter['time-range'] && !in_array($compFilter['name'],array(
-                'VEVENT',
-                'VTODO',
-                'VJOURNAL',
-                'VFREEBUSY',
-                'VALARM',
-            ))) {
-                throw new Sabre_DAV_Exception_BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
-            };
-
-            $result[] = $compFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses all the prop-filter elements from a node
-     *
-     * @param DOMElement $parentNode
-     * @return array
-     */
-    protected function parsePropFilters(DOMElement $parentNode) {
-
-        $propFilterNodes = $this->xpath->query('cal:prop-filter', $parentNode);
-        $result = array();
-
-        for ($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilterNode = $propFilterNodes->item($ii);
-            $propFilter = array();
-            $propFilter['name'] = $propFilterNode->getAttribute('name');
-            $propFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $propFilterNode)->length>0;
-            $propFilter['param-filters'] = $this->parseParamFilters($propFilterNode);
-            $propFilter['text-match'] = $this->parseTextMatch($propFilterNode);
-            $propFilter['time-range'] = $this->parseTimeRange($propFilterNode);
-
-            $result[] = $propFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses the param-filter element
-     *
-     * @param DOMElement $parentNode
-     * @return array
-     */
-    protected function parseParamFilters(DOMElement $parentNode) {
-
-        $paramFilterNodes = $this->xpath->query('cal:param-filter', $parentNode);
-        $result = array();
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $paramFilterNode = $paramFilterNodes->item($ii);
-            $paramFilter = array();
-            $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-            $paramFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $paramFilterNode)->length>0;
-            $paramFilter['text-match'] = $this->parseTextMatch($paramFilterNode);
-
-            $result[] = $paramFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses the text-match element
-     *
-     * @param DOMElement $parentNode
-     * @return array|null
-     */
-    protected function parseTextMatch(DOMElement $parentNode) {
-
-        $textMatchNodes = $this->xpath->query('cal:text-match', $parentNode);
-
-        if ($textMatchNodes->length === 0)
-            return null;
-
-        $textMatchNode = $textMatchNodes->item(0);
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;ascii-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'value' => $textMatchNode->nodeValue
-        );
-
-    }
-
-    /**
-     * Parses the time-range element
-     *
-     * @param DOMElement $parentNode
-     * @return array|null
-     */
-    protected function parseTimeRange(DOMElement $parentNode) {
-
-        $timeRangeNodes = $this->xpath->query('cal:time-range', $parentNode);
-        if ($timeRangeNodes->length === 0) {
-            return null;
-        }
-
-        $timeRangeNode = $timeRangeNodes->item(0);
-
-        if ($start = $timeRangeNode->getAttribute('start')) {
-            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-        } else {
-            $start = null;
-        }
-        if ($end = $timeRangeNode->getAttribute('end')) {
-            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-        } else {
-            $end = null;
-        }
-
-        if (!is_null($start) && !is_null($end) && $end <= $start) {
-            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
-        }
-
-        return array(
-            'start' => $start,
-            'end' => $end,
-        );
-
-    }
-
-    /**
-     * Parses the CALDAV:expand element
-     * 
-     * @param DOMElement $parentNode 
-     * @return void
-     */
-    protected function parseExpand(DOMElement $parentNode) {
-
-        $start = $parentNode->getAttribute('start');
-        if(!$start) {
-            throw new Sabre_DAV_Exception_BadRequest('The "start" attribute is required for the CALDAV:expand element');
-        } 
-        $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-
-        $end = $parentNode->getAttribute('end');
-        if(!$end) {
-            throw new Sabre_DAV_Exception_BadRequest('The "end" attribute is required for the CALDAV:expand element');
-        } 
-        $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-        
-        if ($end <= $start) {
-            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
-        }
-
-        return array(
-            'start' => $start,
-            'end' => $end,
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
deleted file mode 100755
index 4bcd32cdf8..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-
-/**
- * CalendarQuery Validator
- *
- * This class is responsible for checking if an iCalendar object matches a set
- * of filters. The main function to do this is 'validate'.
- *
- * This is used to determine which icalendar objects should be returned for a
- * calendar-query REPORT request.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarQueryValidator {
-
-    /**
-     * Verify if a list of filters applies to the calendar data object
-     *
-     * The list of filters must be formatted as parsed by Sabre_CalDAV_CalendarQueryParser
-     *
-     * @param Sabre_VObject_Component $vObject
-     * @param array $filters
-     * @return bool
-     */
-    public function validate(Sabre_VObject_Component $vObject,array $filters) {
-
-        // The top level object is always a component filter.
-        // We'll parse it manually, as it's pretty simple.
-        if ($vObject->name !== $filters['name']) {
-            return false;
-        }
-
-        return
-            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
-            $this->validatePropFilters($vObject, $filters['prop-filters']);
-
-
-    }
-
-    /**
-     * This method checks the validity of comp-filters.
-     *
-     * A list of comp-filters needs to be specified. Also the parent of the
-     * component we're checking should be specified, not the component to check
-     * itself.
-     *
-     * @param Sabre_VObject_Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateCompFilters(Sabre_VObject_Component $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent->$filter['name']);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one component
-            // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
-
-                if (
-                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
-                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
-                        // We had a match, so this comp-filter succeeds
-                        continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-comp-filters or
-            // sub-prop-filters and there was no match. This means this filter
-            // needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all comp-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of prop-filters.
-     *
-     * A list of prop-filters needs to be specified. Also the parent of the
-     * property we're checking should be specified, not the property to check
-     * itself.
-     *
-     * @param Sabre_VObject_Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validatePropFilters(Sabre_VObject_Component $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent->$filter['name']);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['param-filters'] && !$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one property
-            // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
-
-                if(
-                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
-                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
-                ) {
-                    // We had a match, so this prop-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-param-filters or
-            // text-match filters and there was no match. This means the
-            // filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all prop-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of param-filters.
-     *
-     * A list of param-filters needs to be specified. Also the parent of the
-     * parameter we're checking should be specified, not the parameter to check
-     * itself.
-     *
-     * @param Sabre_VObject_Property $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateParamFilters(Sabre_VObject_Property $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent[$filter['name']]);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (!$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one parameter
-            // for which the subfilters hold true.
-            foreach($parent[$filter['name']] as $subParam) {
-
-                if($this->validateTextMatch($subParam,$filter['text-match'])) {
-                    // We had a match, so this param-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there was a text-match filter and there
-            // were no matches. This means the filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all param-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of a text-match.
-     *
-     * A single text-match should be specified as well as the specific property
-     * or parameter we need to validate.
-     *
-     * @param Sabre_VObject_Node $parent
-     * @param array $textMatch
-     * @return bool
-     */
-    protected function validateTextMatch(Sabre_VObject_Node $parent, array $textMatch) {
-
-        $value = (string)$parent;
-
-        $isMatching = Sabre_DAV_StringUtil::textMatch($value, $textMatch['value'], $textMatch['collation']);
-
-        return ($textMatch['negate-condition'] xor $isMatching);
-
-    }
-
-    /**
-     * Validates if a component matches the given time range.
-     *
-     * This is all based on the rules specified in rfc4791, which are quite
-     * complex.
-     *
-     * @param Sabre_VObject_Node $component
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    protected function validateTimeRange(Sabre_VObject_Node $component, $start, $end) {
-
-        if (is_null($start)) {
-            $start = new DateTime('1900-01-01');
-        }
-        if (is_null($end)) {
-            $end = new DateTime('3000-01-01');
-        }
-
-        switch($component->name) {
-
-            case 'VEVENT' :
-            case 'VTODO' :
-            case 'VJOURNAL' :
-
-                return $component->isInTimeRange($start, $end);
-
-            case 'VALARM' :
-
-                // If the valarm is wrapped in a recurring event, we need to
-                // expand the recursions, and validate each.
-                //
-                // Our datamodel doesn't easily allow us to do this straight
-                // in the VALARM component code, so this is a hack, and an
-                // expensive one too.
-                if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
-
-                    // Fire up the iterator!
-                    $it = new Sabre_VObject_RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
-                    while($it->valid()) {
-                        $expandedEvent = $it->getEventObject();
-
-                        // We need to check from these expanded alarms, which
-                        // one is the first to trigger. Based on this, we can
-                        // determine if we can 'give up' expanding events.
-                        $firstAlarm = null;
-                        foreach($expandedEvent->VALARM as $expandedAlarm) {
-
-                            $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                            if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                return true;
-                            }
-
-                            if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
-                                // This is an alarm with a non-relative trigger
-                                // time, likely created by a buggy client. The
-                                // implication is that every alarm in this
-                                // recurring event trigger at the exact same
-                                // time. It doesn't make sense to traverse
-                                // further.
-                            } else {
-                                // We store the first alarm as a means to
-                                // figure out when we can stop traversing.
-                                if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
-                                    $firstAlarm = $effectiveTrigger;
-                                }
-                            }
-
-                        }
-                        if (is_null($firstAlarm)) {
-                            // No alarm was found.
-                            //
-                            // Or technically: No alarm that will change for
-                            // every instance of the recurrence was found,
-                            // which means we can assume there was no match.
-                            return false;
-                        }
-                        if ($firstAlarm > $end) {
-                            return false;
-                        }
-                        $it->next();
-                    }
-                    return false;
-                } else {
-                    return $component->isInTimeRange($start, $end);
-                }
-
-            case 'VFREEBUSY' :
-                throw new Sabre_DAV_Exception_NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
-
-            case 'COMPLETED' :
-            case 'CREATED' :
-            case 'DTEND' :
-            case 'DTSTAMP' :
-            case 'DTSTART' :
-            case 'DUE' :
-            case 'LAST-MODIFIED' :
-                return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
-
-
-
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
deleted file mode 100755
index 3907913cc7..0000000000
--- a/3rdparty/Sabre/CalDAV/CalendarRootNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Users collection
- *
- * This object is responsible for generating a collection of users.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Constructor
-     *
-     * This constructor needs both an authentication and a caldav backend.
-     *
-     * By default this class will show a list of calendar collections for
-     * principals in the 'principals' collection. If your main principals are
-     * actually located in a different path, use the $principalPrefix argument
-     * to override this.
-     *
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend, $principalPrefix = 'principals') {
-
-        parent::__construct($principalBackend, $principalPrefix);
-        $this->caldavBackend = $caldavBackend;
-
-    }
-
-    /**
-     * Returns the nodename
-     *
-     * We're overriding this, because the default will be the 'principalPrefix',
-     * and we want it to be Sabre_CalDAV_Plugin::CALENDAR_ROOT
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return Sabre_DAV_INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
deleted file mode 100755
index ec42b406b2..0000000000
--- a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * ICS Exporter
- *
- * This plugin adds the ability to export entire calendars as .ics files.
- * This is useful for clients that don't support CalDAV yet. They often do
- * support ics files.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?export
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='export') return;
-
-        // splitting uri
-        list($uri) = explode('?',$uri,2);
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_CalDAV_Calendar)) return;
-
-        // Checking ACL, if available.
-        if ($aclPlugin = $this->server->getPlugin('acl')) {
-            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
-        $this->server->httpResponse->sendStatus(200);
-
-        $nodes = $this->server->getPropertiesForPath($uri, array(
-            '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data',
-        ),1);
-
-        $this->server->httpResponse->sendBody($this->generateICS($nodes));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big ics export
-     *
-     * @param array $nodes
-     * @return string
-     */
-    public function generateICS(array $nodes) {
-
-        $calendar = new Sabre_VObject_Component('vcalendar');
-        $calendar->version = '2.0';
-        if (Sabre_DAV_Server::$exposeVersion) {
-            $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
-        } else {
-            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
-        }
-        $calendar->calscale = 'GREGORIAN';
-
-        $collectedTimezones = array();
-
-        $timezones = array();
-        $objects = array();
-
-        foreach($nodes as $node) {
-
-            if (!isset($node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'])) {
-                continue;
-            }
-            $nodeData = $node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'];
-
-            $nodeComp = Sabre_VObject_Reader::read($nodeData);
-
-            foreach($nodeComp->children() as $child) {
-
-                switch($child->name) {
-                    case 'VEVENT' :
-                    case 'VTODO' :
-                    case 'VJOURNAL' :
-                        $objects[] = $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE' :
-                        // Naively just checking tzid.
-                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
-
-                        $timezones[] = $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-
-                }
-
-            }
-
-        }
-
-        foreach($timezones as $tz) $calendar->add($tz);
-        foreach($objects as $obj) $calendar->add($obj);
-
-        return $calendar->serialize();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
deleted file mode 100755
index 15d51ebcf7..0000000000
--- a/3rdparty/Sabre/CalDAV/ICalendar.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Calendar interface
- *
- * Implement this interface to allow a node to be recognized as an calendar.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
-
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
deleted file mode 100755
index 280f982a31..0000000000
--- a/3rdparty/Sabre/CalDAV/ICalendarObject.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * CalendarObject interface
-/**
- * Extend the ICalendarObject interface to allow your custom nodes to be picked up as
- * CalendarObjects.
- *
- * Calendar objects are resources such as Events, Todo's or Journals.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile {
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
deleted file mode 100755
index 5903968c00..0000000000
--- a/3rdparty/Sabre/CalDAV/Plugin.php
+++ /dev/null
@@ -1,865 +0,0 @@
-<?php
-
-/**
- * CalDAV plugin
- *
- * This plugin provides functionality added by CalDAV (RFC 4791)
- * It implements new reports, and the MKCALENDAR method.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * This is the official CalDAV namespace
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
-    /**
-     * This is the namespace for the proprietary calendarserver extensions
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * The following constants are used to differentiate
-     * the various filters for the calendar-query report
-     */
-    const FILTER_COMPFILTER   = 1;
-    const FILTER_TIMERANGE    = 3;
-    const FILTER_PROPFILTER   = 4;
-    const FILTER_PARAMFILTER  = 5;
-    const FILTER_TEXTMATCH    = 6;
-
-    /**
-     * The hardcoded root for calendar objects. It is unfortunate
-     * that we're stuck with it, but it will have to do for now
-     */
-    const CALENDAR_ROOT = 'calendars';
-
-    /**
-     * Reference to server object
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * The email handler for invites and other scheduling messages.
-     * 
-     * @var Sabre_CalDAV_Schedule_IMip 
-     */
-    protected $imipHandler;
-
-    /**
-     * Sets the iMIP handler.
-     *
-     * iMIP = The email transport of iCalendar scheduling messages. Setting 
-     * this is optional, but if you want the server to allow invites to be sent 
-     * out, you must set a handler.
-     *
-     * Specifically iCal will plain assume that the server supports this. If 
-     * the server doesn't, iCal will display errors when inviting people to 
-     * events.
-     *
-     * @param Sabre_CalDAV_Schedule_IMip $imipHandler 
-     * @return void
-     */
-    public function setIMipHandler(Sabre_CalDAV_Schedule_IMip $imipHandler) {
-
-        $this->imipHandler = $imipHandler;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        // The MKCALENDAR is only available on unmapped uri's, whose
-        // parents extend IExtendedCollection
-        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        $node = $this->server->tree->getNodeForPath($parent);
-
-        if ($node instanceof Sabre_DAV_IExtendedCollection) {
-            try {
-                $node->getChild($name);
-            } catch (Sabre_DAV_Exception_NotFound $e) {
-                return array('MKCALENDAR');
-            }
-        }
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the DAV: HTTP header.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('calendar-access', 'calendar-proxy');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'caldav';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        $reports = array();
-        if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
-            $reports[] = '{' . self::NS_CALDAV . '}calendar-multiget';
-            $reports[] = '{' . self::NS_CALDAV . '}calendar-query';
-        }
-        if ($node instanceof Sabre_CalDAV_ICalendar) {
-            $reports[] = '{' . self::NS_CALDAV . '}free-busy-query';
-        }
-        return $reports;
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
-        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
-        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
-        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
-
-        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
-        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
-
-        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
-
-        $server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-        $server->resourceTypeMapping['Sabre_CalDAV_Schedule_IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
-        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-
-        array_push($server->protectedProperties,
-
-            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
-            '{' . self::NS_CALDAV . '}supported-calendar-data',
-            '{' . self::NS_CALDAV . '}max-resource-size',
-            '{' . self::NS_CALDAV . '}min-date-time',
-            '{' . self::NS_CALDAV . '}max-date-time',
-            '{' . self::NS_CALDAV . '}max-instances',
-            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
-            '{' . self::NS_CALDAV . '}calendar-home-set',
-            '{' . self::NS_CALDAV . '}supported-collation-set',
-            '{' . self::NS_CALDAV . '}calendar-data',
-
-            // scheduling extension
-            '{' . self::NS_CALDAV . '}schedule-inbox-URL',
-            '{' . self::NS_CALDAV . '}schedule-outbox-URL',
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-            '{' . self::NS_CALDAV . '}calendar-user-type',
-
-            // CalendarServer extensions
-            '{' . self::NS_CALENDARSERVER . '}getctag',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for'
-
-        );
-    }
-
-    /**
-     * This function handles support for the MKCALENDAR method
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch ($method) {
-            case 'MKCALENDAR' :
-                $this->httpMkCalendar($uri);
-                // false is returned to stop the propagation of the
-                // unknownMethod event.
-                return false;
-            case 'POST' :
-                // Checking if we're talking to an outbox
-                try {
-                    $node = $this->server->tree->getNodeForPath($uri);
-                } catch (Sabre_DAV_Exception_NotFound $e) {
-                    return;
-                }
-                if (!$node instanceof Sabre_CalDAV_Schedule_IOutbox)
-                    return;
-
-                $this->outboxRequest($node);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CalDAV
-     *
-     * @param string $reportName
-     * @param DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) {
-            case '{'.self::NS_CALDAV.'}calendar-multiget' :
-                $this->calendarMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}calendar-query' :
-                $this->calendarQueryReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}free-busy-query' :
-                $this->freeBusyQueryReport($dom);
-                return false;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the MKCALENDAR HTTP method, which creates
-     * a new calendar.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpMkCalendar($uri) {
-
-        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
-        // for clients matching iCal in the user agent
-        //$ua = $this->server->httpRequest->getHeader('User-Agent');
-        //if (strpos($ua,'iCal/')!==false) {
-        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
-        //}
-
-        $body = $this->server->httpRequest->getBody(true);
-        $properties = array();
-
-        if ($body) {
-
-            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-            foreach($dom->firstChild->childNodes as $child) {
-
-                if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
-                foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
-                    $properties[$k] = $prop;
-                }
-
-            }
-        }
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-
-        $this->server->createCollection($uri,$resourceType,$properties);
-
-        $this->server->httpResponse->sendStatus(201);
-        $this->server->httpResponse->setHeader('Content-Length',0);
-    }
-
-    /**
-     * beforeGetProperties
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific
-     * properties.
-     *
-     * @param string $path
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
-
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            // calendar-home-set property
-            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
-            if (in_array($calHome,$requestedProperties)) {
-                $principalId = $node->getName();
-                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[$calHome]);
-                $returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
-            }
-
-            // schedule-outbox-URL property
-            $scheduleProp = '{' . self::NS_CALDAV . '}schedule-outbox-URL';
-            if (in_array($scheduleProp,$requestedProperties)) {
-                $principalId = $node->getName();
-                $outboxPath = self::CALENDAR_ROOT . '/' . $principalId . '/outbox';
-                unset($requestedProperties[$scheduleProp]);
-                $returnedProperties[200][$scheduleProp] = new Sabre_DAV_Property_Href($outboxPath);
-            }
-
-            // calendar-user-address-set property
-            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
-            if (in_array($calProp,$requestedProperties)) {
-
-                $addresses = $node->getAlternateUriSet();
-                $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl();
-                unset($requestedProperties[$calProp]);
-                $returnedProperties[200][$calProp] = new Sabre_DAV_Property_HrefList($addresses, false);
-
-            }
-
-            // These two properties are shortcuts for ical to easily find
-            // other principals this principal has access to.
-            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
-            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
-            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
-
-                $membership = $node->getGroupMembership();
-                $readList = array();
-                $writeList = array();
-
-                foreach($membership as $group) {
-
-                    $groupNode = $this->server->tree->getNodeForPath($group);
-
-                    // If the node is either ap proxy-read or proxy-write
-                    // group, we grab the parent principal and add it to the
-                    // list.
-                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
-                        list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
-                    }
-                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyWrite) {
-                        list($writeList[]) = Sabre_DAV_URLUtil::splitPath($group);
-                    }
-
-                }
-                if (in_array($propRead,$requestedProperties)) {
-                    unset($requestedProperties[$propRead]);
-                    $returnedProperties[200][$propRead] = new Sabre_DAV_Property_HrefList($readList);
-                }
-                if (in_array($propWrite,$requestedProperties)) {
-                    unset($requestedProperties[$propWrite]);
-                    $returnedProperties[200][$propWrite] = new Sabre_DAV_Property_HrefList($writeList);
-                }
-
-            }
-
-        } // instanceof IPrincipal
-
-
-        if ($node instanceof Sabre_CalDAV_ICalendarObject) {
-            // The calendar-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
-            if (in_array($calDataProp, $requestedProperties)) {
-                unset($requestedProperties[$calDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-    }
-
-    /**
-     * This function handles the calendar-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function calendarMultiGetReport($dom) {
-
-        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-
-        $xpath = new DOMXPath($dom);
-        $xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
-        $xpath->registerNameSpace('dav','urn:DAV');
-
-        $expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
-        if ($expand->length>0) {
-            $expandElem = $expand->item(0);
-            $start = $expandElem->getAttribute('start');
-            $end = $expandElem->getAttribute('end');
-            if(!$start || !$end) {
-                throw new Sabre_DAV_Exception_BadRequest('The "start" and "end" attributes are required for the CALDAV:expand element');
-            }
-            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-
-            if ($end <= $start) {
-                throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
-            }
-
-            $expand = true;
-
-        } else {
-
-            $expand = false;
-
-        }
-
-        foreach($hrefElems as $elem) {
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
-
-            if ($expand && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
-                $vObject = Sabre_VObject_Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
-                $vObject->expand($start, $end);
-                $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-            }
-
-            $propertyList[]=$objProps;
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
-
-    }
-
-    /**
-     * This function handles the calendar-query REPORT
-     *
-     * This report is used by clients to request calendar objects based on
-     * complex conditions.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function calendarQueryReport($dom) {
-
-        $parser = new Sabre_CalDAV_CalendarQueryParser($dom);
-        $parser->parse();
-
-        $requestedCalendarData = true;
-        $requestedProperties = $parser->requestedProperties;
-
-        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
-
-            // We always retrieve calendar-data, as we need it for filtering.
-            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
-
-            // If calendar-data wasn't explicitly requested, we need to remove
-            // it after processing.
-            $requestedCalendarData = false;
-        }
-
-        // These are the list of nodes that potentially match the requirement
-        $candidateNodes = $this->server->getPropertiesForPath(
-            $this->server->getRequestUri(),
-            $requestedProperties,
-            $this->server->getHTTPDepth(0)
-        );
-
-        $verifiedNodes = array();
-
-        $validator = new Sabre_CalDAV_CalendarQueryValidator();
-
-        foreach($candidateNodes as $node) {
-
-            // If the node didn't have a calendar-data property, it must not be a calendar object
-            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']))
-                continue;
-
-            $vObject = Sabre_VObject_Reader::read($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-            if ($validator->validate($vObject,$parser->filters)) {
-
-                if (!$requestedCalendarData) {
-                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                }
-                if ($parser->expand) {
-                    $vObject->expand($parser->expand['start'], $parser->expand['end']);
-                    $node[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-                }
-                $verifiedNodes[] = $node;
-            }
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
-
-    }
-
-    /**
-     * This method is responsible for parsing the request and generating the
-     * response for the CALDAV:free-busy-query REPORT.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    protected function freeBusyQueryReport(DOMNode $dom) {
-
-        $start = null;
-        $end = null;
-
-        foreach($dom->firstChild->childNodes as $childNode) {
-
-            $clark = Sabre_DAV_XMLUtil::toClarkNotation($childNode);
-            if ($clark == '{' . self::NS_CALDAV . '}time-range') {
-                $start = $childNode->getAttribute('start');
-                $end = $childNode->getAttribute('end');
-                break;
-            }
-
-        }
-        if ($start) {
-            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
-        }
-        if ($end) {
-            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
-        }
-
-        if (!$start && !$end) {
-            throw new Sabre_DAV_Exception_BadRequest('The freebusy report must have a time-range filter');
-        }
-        $acl = $this->server->getPlugin('acl');
-
-        if (!$acl) {
-            throw new Sabre_DAV_Exception('The ACL plugin must be loaded for free-busy queries to work');
-        }
-        $uri = $this->server->getRequestUri();
-        $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy');
-
-        $calendar = $this->server->tree->getNodeForPath($uri);
-        if (!$calendar instanceof Sabre_CalDAV_ICalendar) {
-            throw new Sabre_DAV_Exception_NotImplemented('The free-busy-query REPORT is only implemented on calendars');
-        }
-
-        $objects = array_map(function($child) {
-            $obj = $child->get();
-            if (is_resource($obj)) {
-                $obj = stream_get_contents($obj);
-            }
-            return $obj;
-        }, $calendar->getChildren());
-
-        $generator = new Sabre_VObject_FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($start, $end);
-        $result = $generator->getResult();
-        $result = $result->serialize();
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
-        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
-        $this->server->httpResponse->sendBody($result);
-
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that CalDAV objects receive
-     * valid calendar data.
-     *
-     * @param string $path
-     * @param Sabre_DAV_IFile $node
-     * @param resource $data
-     * @return void
-     */
-    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
-
-        if (!$node instanceof Sabre_CalDAV_ICalendarObject)
-            return;
-
-        $this->validateICalendar($data);
-
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that newly created calendar
-     * objects contain valid calendar data.
-     *
-     * @param string $path
-     * @param resource $data
-     * @param Sabre_DAV_ICollection $parentNode
-     * @return void
-     */
-    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
-
-        if (!$parentNode instanceof Sabre_CalDAV_Calendar)
-            return;
-
-        $this->validateICalendar($data);
-
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string $data
-     * @return void
-     */
-    protected function validateICalendar(&$data) {
-
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        // Converting the data to unicode, if needed.
-        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
-
-        try {
-
-            $vobj = Sabre_VObject_Reader::read($data);
-
-        } catch (Sabre_VObject_ParseException $e) {
-
-            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: ' . $e->getMessage());
-
-        }
-
-        if ($vobj->name !== 'VCALENDAR') {
-            throw new Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support iCalendar objects.');
-        }
-
-        $foundType = null;
-        $foundUID = null;
-        foreach($vobj->getComponents() as $component) {
-            switch($component->name) {
-                case 'VTIMEZONE' :
-                    continue 2;
-                case 'VEVENT' :
-                case 'VTODO' :
-                case 'VJOURNAL' :
-                    if (is_null($foundType)) {
-                        $foundType = $component->name;
-                        if (!isset($component->UID)) {
-                            throw new Sabre_DAV_Exception_BadRequest('Every ' . $component->name . ' component must have an UID');
-                        }
-                        $foundUID = (string)$component->UID;
-                    } else {
-                        if ($foundType !== $component->name) {
-                            throw new Sabre_DAV_Exception_BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
-                        }
-                        if ($foundUID !== (string)$component->UID) {
-                            throw new Sabre_DAV_Exception_BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
-                        }
-                    }
-                    break;
-                default :
-                    throw new Sabre_DAV_Exception_BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
-
-            }
-        }
-        if (!$foundType)
-            throw new Sabre_DAV_Exception_BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
-
-    }
-
-    /**
-     * This method handles POST requests to the schedule-outbox
-     *
-     * @param Sabre_CalDAV_Schedule_IOutbox $outboxNode
-     * @return void
-     */
-    public function outboxRequest(Sabre_CalDAV_Schedule_IOutbox $outboxNode) {
-
-        $originator = $this->server->httpRequest->getHeader('Originator');
-        $recipients = $this->server->httpRequest->getHeader('Recipient');
-
-        if (!$originator) {
-            throw new Sabre_DAV_Exception_BadRequest('The Originator: header must be specified when making POST requests');
-        } 
-        if (!$recipients) {
-            throw new Sabre_DAV_Exception_BadRequest('The Recipient: header must be specified when making POST requests');
-        } 
-
-        if (!preg_match('/^mailto:(.*)@(.*)$/', $originator)) {
-            throw new Sabre_DAV_Exception_BadRequest('Originator must start with mailto: and must be valid email address');
-        }
-        $originator = substr($originator,7);
-
-        $recipients = explode(',',$recipients);
-        foreach($recipients as $k=>$recipient) {
-
-            $recipient = trim($recipient);
-            if (!preg_match('/^mailto:(.*)@(.*)$/', $recipient)) { 
-                throw new Sabre_DAV_Exception_BadRequest('Recipients must start with mailto: and must be valid email address');
-            }
-            $recipient = substr($recipient, 7);
-            $recipients[$k] = $recipient;
-        }
-
-        // We need to make sure that 'originator' matches one of the email 
-        // addresses of the selected principal.
-        $principal = $outboxNode->getOwner();
-        $props = $this->server->getProperties($principal,array(
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-        ));
-
-        $addresses = array();
-        if (isset($props['{' . self::NS_CALDAV . '}calendar-user-address-set'])) {
-            $addresses = $props['{' . self::NS_CALDAV . '}calendar-user-address-set']->getHrefs();
-        }
-
-        if (!in_array('mailto:' . $originator, $addresses)) {
-            throw new Sabre_DAV_Exception_Forbidden('The addresses specified in the Originator header did not match any addresses in the owners calendar-user-address-set header');
-        }
-
-        try { 
-            $vObject = Sabre_VObject_Reader::read($this->server->httpRequest->getBody(true));
-        } catch (Sabre_VObject_ParseException $e) {
-            throw new Sabre_DAV_Exception_BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
-        }
-
-        // Checking for the object type
-        $componentType = null;
-        foreach($vObject->getComponents() as $component) {
-            if ($component->name !== 'VTIMEZONE') {
-                $componentType = $component->name;
-                break;
-            }
-        }
-        if (is_null($componentType)) {
-            throw new Sabre_DAV_Exception_BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
-        }
-
-        // Validating the METHOD
-        $method = strtoupper((string)$vObject->METHOD);
-        if (!$method) {
-            throw new Sabre_DAV_Exception_BadRequest('A METHOD property must be specified in iTIP messages');
-        }
-
-        if (in_array($method, array('REQUEST','REPLY','ADD','CANCEL')) && $componentType==='VEVENT') {
-            $this->iMIPMessage($originator, $recipients, $vObject);
-            $this->server->httpResponse->sendStatus(200);
-            $this->server->httpResponse->sendBody('Messages sent');
-        } else {
-            throw new Sabre_DAV_Exception_NotImplemented('This iTIP method is currently not implemented');
-        }
-
-    }
-
-    /**
-     * Sends an iMIP message by email.
-     * 
-     * @param string $originator 
-     * @param array $recipients 
-     * @param Sabre_VObject_Component $vObject 
-     * @return void
-     */
-    protected function iMIPMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
-
-        if (!$this->imipHandler) {
-            throw new Sabre_DAV_Exception_NotImplemented('No iMIP handler is setup on this server.');
-        }
-        $this->imipHandler->sendMessage($originator, $recipients, $vObject); 
-
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param Sabre_DAV_INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
-
-        if (!$node instanceof Sabre_CalDAV_UserCalendars)
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new calendar</h3>
-            <input type="hidden" name="sabreAction" value="mkcalendar" />
-            <label>Name (uri):</label> <input type="text" name="name" /><br />
-            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
-            <input type="submit" value="create" />
-            </form>
-            </td></tr>';
-
-        return false;
-
-    }
-
-    /**
-     * This method allows us to intercept the 'mkcalendar' sabreAction. This
-     * action enables the user to create new calendars from the browser plugin.
-     *
-     * @param string $uri
-     * @param string $action
-     * @param array $postVars
-     * @return bool
-     */
-    public function browserPostAction($uri, $action, array $postVars) {
-
-        if ($action!=='mkcalendar')
-            return;
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-        $properties = array();
-        if (isset($postVars['{DAV:}displayname'])) {
-            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
-        }
-        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
deleted file mode 100755
index abbefa5567..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/Collection.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Principal collection
- *
- * This is an alternative collection to the standard ACL principal collection.
- * This collection adds support for the calendar-proxy-read and
- * calendar-proxy-write sub-principals, as defined by the caldav-proxy
- * specification.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * Returns a child object based on principal information
-     *
-     * @param array $principalInfo
-     * @return Sabre_CalDAV_Principal_User
-     */
-    public function getChildForPrincipal(array $principalInfo) {
-
-        return new Sabre_CalDAV_Principal_User($this->principalBackend, $principalInfo);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
deleted file mode 100755
index 4b3f035634..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * ProxyRead principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by Sabre_CalDAV_Principal_User.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
-
-    /**
-     * Principal information from the parent principal.
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param array $principalInfo
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'calendar-proxy-read';
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return null
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName();
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
deleted file mode 100755
index dd0c2e86ed..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * ProxyWrite principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by Sabre_CalDAV_Principal_User.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
-
-    /**
-     * Parent principal information
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal Backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object
-     *
-     * Note that you MUST supply the parent principal information.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param array $principalInfo
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'calendar-proxy-write';
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return null
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName();
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
deleted file mode 100755
index 8453b877a7..0000000000
--- a/3rdparty/Sabre/CalDAV/Principal/User.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * CalDAV principal
- *
- * This is a standard user-principal for CalDAV. This principal is also a
- * collection and returns the caldav-proxy-read and caldav-proxy-write child
- * principals.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * @param string $name Name of the file
-     * @param resource $data Initial payload, passed as a readable stream resource.
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/' . $name);
-        if (!$principal) {
-            throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
-        }
-        if ($name === 'calendar-proxy-read')
-            return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
-
-        if ($name === 'calendar-proxy-write')
-            return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
-
-        throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        $r = array();
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-read')) {
-            $r[] = new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
-        }
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-write')) {
-            $r[] = new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * Returns whether or not the child node exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-            $this->getChild($name);
-            return true;
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            return false;
-        }
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        $acl = parent::getACL();
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
-            'protected' => true,
-        );
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
-            'protected' => true,
-        );
-        return $acl;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
deleted file mode 100755
index 2ea078d7da..0000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Supported component set property
- *
- * This property is a representation of the supported-calendar_component-set
- * property in the CalDAV namespace. It simply requires an array of components,
- * such as VEVENT, VTODO
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
-
-    /**
-     * List of supported components, such as "VEVENT, VTODO"
-     *
-     * @var array
-     */
-    private $components;
-
-    /**
-     * Creates the property
-     *
-     * @param array $components
-     */
-    public function __construct(array $components) {
-
-       $this->components = $components;
-
-    }
-
-    /**
-     * Returns the list of supported components
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->components;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-       $doc = $node->ownerDocument;
-       foreach($this->components as $component) {
-
-            $xcomp = $doc->createElement('cal:comp');
-            $xcomp->setAttribute('name',$component);
-            $node->appendChild($xcomp);
-
-       }
-
-    }
-
-    /**
-     * Unserializes the DOMElement back into a Property class.
-     *
-     * @param DOMElement $node
-     * @return Sabre_CalDAV_Property_SupportedCalendarComponentSet
-     */
-    static function unserialize(DOMElement $node) {
-
-        $components = array();
-        foreach($node->childNodes as $childNode) {
-            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
-                $components[] = $childNode->getAttribute('name');
-            }
-        }
-        return new self($components);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
deleted file mode 100755
index 1d848dd5cf..0000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Supported-calendar-data property
- *
- * This property is a representation of the supported-calendar-data property
- * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
- * so the value is currently hardcoded.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
-
-        $caldata = $doc->createElement($prefix . ':calendar-data');
-        $caldata->setAttribute('content-type','text/calendar');
-        $caldata->setAttribute('version','2.0');
-
-        $node->appendChild($caldata);
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
deleted file mode 100755
index 24e84d4c17..0000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * supported-collation-set property
- *
- * This property is a representation of the supported-collation-set property
- * in the CalDAV namespace.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property in a DOM document
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
-        if (!$prefix) $prefix = 'cal';
-
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;octet')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
-        );
-
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IMip.php b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
deleted file mode 100755
index 37e75fcc4a..0000000000
--- a/3rdparty/Sabre/CalDAV/Schedule/IMip.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * iMIP handler.
- *
- * This class is responsible for sending out iMIP messages. iMIP is the
- * email-based transport for iTIP. iTIP deals with scheduling operations for
- * iCalendar objects.
- *
- * If you want to customize the email that gets sent out, you can do so by
- * extending this class and overriding the sendMessage method.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Schedule_IMip {
-
-    /**
-     * Email address used in From: header.
-     *
-     * @var string
-     */
-    protected $senderEmail;
-
-    /**
-     * Creates the email handler.
-     *
-     * @param string $senderEmail. The 'senderEmail' is the email that shows up
-     *                             in the 'From:' address. This should
-     *                             generally be some kind of no-reply email
-     *                             address you own.
-     */
-    public function __construct($senderEmail) {
-
-        $this->senderEmail = $senderEmail;
-
-    }
-
-    /**
-     * Sends one or more iTip messages through email.
-     *
-     * @param string $originator
-     * @param array $recipients
-     * @param Sabre_VObject_Component $vObject
-     * @return void
-     */
-    public function sendMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
-
-        foreach($recipients as $recipient) {
-
-            $to = $recipient;
-            $replyTo = $originator;
-            $subject = 'SabreDAV iTIP message';
-
-            switch(strtoupper($vObject->METHOD)) {
-                case 'REPLY' :
-                    $subject = 'Response for: ' . $vObject->VEVENT->SUMMARY;
-                    break;
-                case 'REQUEST' :
-                    $subject = 'Invitation for: ' .$vObject->VEVENT->SUMMARY;
-                    break;
-                case 'CANCEL' :
-                    $subject = 'Cancelled event: ' . $vObject->VEVENT->SUMMARY;
-                    break;
-            }
-
-            $headers = array();
-            $headers[] = 'Reply-To: ' . $replyTo;
-            $headers[] = 'From: ' . $this->senderEmail;
-            $headers[] = 'Content-Type: text/calendar; method=' . (string)$vObject->method . '; charset=utf-8';
-            if (Sabre_DAV_Server::$exposeVersion) {
-                $headers[] = 'X-Sabre-Version: ' . Sabre_DAV_Version::VERSION . '-' . Sabre_DAV_Version::STABILITY;
-            }
-
-            $vcalBody = $vObject->serialize();
-
-            $this->mail($to, $subject, $vcalBody, $headers);
-
-        }
-
-    }
-
-    /**
-     * This function is reponsible for sending the actual email.
-     *
-     * @param string $to Recipient email address
-     * @param string $subject Subject of the email
-     * @param string $body iCalendar body
-     * @param array $headers List of headers
-     * @return void
-     */
-    protected function mail($to, $subject, $body, array $headers) {
-
-        mail($to, $subject, $body, implode("\r\n", $headers));
-
-    }
-
-
-}
-
-?>
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
deleted file mode 100755
index 46d77514bc..0000000000
--- a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Implement this interface to have a node be recognized as a CalDAV scheduling
- * outbox.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_Schedule_IOutbox extends Sabre_DAV_ICollection, Sabre_DAVACL_IACL {
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/Outbox.php b/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
deleted file mode 100755
index 014c37230d..0000000000
--- a/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * The CalDAV scheduling outbox
- *
- * The outbox is mainly used as an endpoint in the tree for a client to do
- * free-busy requests. This functionality is completely handled by the
- * Scheduling plugin, so this object is actually mostly static.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Schedule_Outbox extends Sabre_DAV_Directory implements Sabre_CalDAV_Schedule_IOutbox {
-
-    /**
-     * The principal Uri
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param string $principalUri
-     */
-    public function __construct($principalUri) {
-
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'outbox';
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = array(
-            'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
-        );
-
-        return $default;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
deleted file mode 100755
index 325e3d80a7..0000000000
--- a/3rdparty/Sabre/CalDAV/Server.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * CalDAV server
- *
- * Deprecated! Warning: This class is now officially deprecated
- *
- * This script is a convenience script. It quickly sets up a WebDAV server
- * with caldav and ACL support, and it creates the root 'principals' and
- * 'calendars' collections.
- *
- * Note that if you plan to do anything moderately complex, you are advised to
- * not subclass this server, but use Sabre_DAV_Server directly instead. This
- * class is nothing more than an 'easy setup'.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @deprecated Don't use this class anymore, it will be removed in version 1.7.
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Server extends Sabre_DAV_Server {
-
-    /**
-     * The authentication realm
-     *
-     * Note that if this changes, the hashes in the auth backend must also
-     * be recalculated.
-     *
-     * @var string
-     */
-    public $authRealm = 'SabreDAV';
-
-    /**
-     * Sets up the object. A PDO object must be passed to setup all the backends.
-     *
-     * @param PDO $pdo
-     */
-    public function __construct(PDO $pdo) {
-
-        /* Backends */
-        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
-        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
-        $principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
-
-        /* Directory structure */
-        $tree = array(
-            new Sabre_CalDAV_Principal_Collection($principalBackend),
-            new Sabre_CalDAV_CalendarRootNode($principalBackend, $calendarBackend),
-        );
-
-        /* Initializing server */
-        parent::__construct($tree);
-
-        /* Server Plugins */
-        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,$this->authRealm);
-        $this->addPlugin($authPlugin);
-
-        $aclPlugin = new Sabre_DAVACL_Plugin();
-        $this->addPlugin($aclPlugin);
-
-        $caldavPlugin = new Sabre_CalDAV_Plugin();
-        $this->addPlugin($caldavPlugin);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
deleted file mode 100755
index b8d3f0573f..0000000000
--- a/3rdparty/Sabre/CalDAV/UserCalendars.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-/**
- * The UserCalenders class contains all calendars associated to one user
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal information
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param mixed $userUri
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
-
-        $this->principalBackend = $principalBackend;
-        $this->caldavBackend = $caldavBackend;
-        $this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return Sabre_CalDAV_Calendar
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new Sabre_DAV_Exception_NotFound('Calendar with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Checks if a calendar exists.
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return bool
-     */
-    public function childExists($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return true;
-
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a list of calendars
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-        $objs = array();
-        foreach($calendars as $calendar) {
-            $objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
-        }
-        $objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new calendar
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalInfo['uri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
deleted file mode 100755
index 289a0c83a3..0000000000
--- a/3rdparty/Sabre/CalDAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the Sabre_CalDAV version constants.
- *
- * @package Sabre
- * @subpackage CalDAV 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/CalDAV/includes.php b/3rdparty/Sabre/CalDAV/includes.php
deleted file mode 100755
index 1ecb870a0e..0000000000
--- a/3rdparty/Sabre/CalDAV/includes.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Sabre_CalDAV includes file
- *
- * Including this file will automatically include all files from the
- * Sabre_CalDAV package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/Backend/Abstract.php';
-include __DIR__ . '/Backend/PDO.php';
-include __DIR__ . '/CalendarQueryParser.php';
-include __DIR__ . '/CalendarQueryValidator.php';
-include __DIR__ . '/CalendarRootNode.php';
-include __DIR__ . '/ICalendar.php';
-include __DIR__ . '/ICalendarObject.php';
-include __DIR__ . '/ICSExportPlugin.php';
-include __DIR__ . '/Plugin.php';
-include __DIR__ . '/Principal/Collection.php';
-include __DIR__ . '/Principal/ProxyRead.php';
-include __DIR__ . '/Principal/ProxyWrite.php';
-include __DIR__ . '/Principal/User.php';
-include __DIR__ . '/Property/SupportedCalendarComponentSet.php';
-include __DIR__ . '/Property/SupportedCalendarData.php';
-include __DIR__ . '/Property/SupportedCollationSet.php';
-include __DIR__ . '/Schedule/IMip.php';
-include __DIR__ . '/Schedule/IOutbox.php';
-include __DIR__ . '/Schedule/Outbox.php';
-include __DIR__ . '/Server.php';
-include __DIR__ . '/UserCalendars.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/Calendar.php';
-include __DIR__ . '/CalendarObject.php';
-// End includes
diff --git a/3rdparty/Sabre/CardDAV/AddressBook.php b/3rdparty/Sabre/CardDAV/AddressBook.php
deleted file mode 100755
index 12297175a8..0000000000
--- a/3rdparty/Sabre/CardDAV/AddressBook.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-
-/**
- * The AddressBook class represents a CardDAV addressbook, owned by a specific user
- *
- * The AddressBook can contain multiple vcards
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * This is an array with addressbook information
-     *
-     * @var array
-     */
-    private $addressBookInfo;
-
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    private $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param array $addressBookInfo
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-
-    }
-
-    /**
-     * Returns the name of the addressbook
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->addressBookInfo['uri'];
-
-    }
-
-    /**
-     * Returns a card
-     *
-     * @param string $name
-     * @return Sabre_DAV_Card
-     */
-    public function getChild($name) {
-
-        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
-        return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of cards
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in addressbooks.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in addressbooks is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid VCARD.
-     *
-     * This method may return an ETag.
-     *
-     * @param string $name
-     * @param resource $vcardData
-     * @return void|null
-     */
-    public function createFile($name,$vcardData = null) {
-
-        if (is_resource($vcardData)) {
-            $vcardData = stream_get_contents($vcardData);
-        }
-        // Converting to UTF-8, if needed
-        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
-
-        return $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
-
-    }
-
-    /**
-     * Deletes the entire addressbook.
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
-
-    }
-
-    /**
-     * Renames the addressbook
-     *
-     * @param string $newName
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming addressbooks is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
-
-    }
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties
-     * @return array
-     */
-    public function getProperties($properties) {
-
-        $response = array();
-        foreach($properties as $propertyName) {
-
-            if (isset($this->addressBookInfo[$propertyName])) {
-
-                $response[$propertyName] = $this->addressBookInfo[$propertyName];
-
-            }
-
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
deleted file mode 100755
index 46bb8ff18d..0000000000
--- a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-/**
- * Parses the addressbook-query report request body.
- *
- * Whoever designed this format, and the CalDAV equivalent even more so,
- * has no feel for design.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBookQueryParser {
-
-    const TEST_ANYOF = 'anyof';
-    const TEST_ALLOF = 'allof';
-
-    /**
-     * List of requested properties the client wanted
-     *
-     * @var array
-     */
-    public $requestedProperties;
-
-    /**
-     * The number of results the client wants
-     *
-     * null means it wasn't specified, which in most cases means 'all results'.
-     *
-     * @var int|null
-     */
-    public $limit;
-
-    /**
-     * List of property filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * Either TEST_ANYOF or TEST_ALLOF
-     *
-     * @var string
-     */
-    public $test;
-
-    /**
-     * DOM Document
-     *
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     *
-     * @param DOMDocument $dom
-     */
-    public function __construct(DOMDocument $dom) {
-
-        $this->dom = $dom;
-
-        $this->xpath = new DOMXPath($dom);
-        $this->xpath->registerNameSpace('card',Sabre_CardDAV_Plugin::NS_CARDDAV);
-
-    }
-
-    /**
-     * Parses the request.
-     *
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-
-        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
-        if (is_nan($limit)) $limit = null;
-
-        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
-
-        // According to the CardDAV spec there needs to be exactly 1 filter
-        // element. However, KDE 4.8.2 contains a bug that will encode 0 filter
-        // elements, so this is a workaround for that.
-        //
-        // See: https://bugs.kde.org/show_bug.cgi?id=300047
-        if ($filter->length === 0) {
-            $test = null;
-            $filter = null;
-        } elseif ($filter->length === 1) {
-            $filter = $filter->item(0);
-            $test = $this->xpath->evaluate('string(@test)', $filter);
-        } else {
-            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
-        }
-
-        if (!$test) $test = self::TEST_ANYOF;
-        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
-            throw new Sabre_DAV_Exception_BadRequest('The test attribute must either hold "anyof" or "allof"');
-        }
-
-        $propFilters = array();
-
-        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
-        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
-
-
-        }
-
-        $this->filters = $propFilters;
-        $this->limit = $limit;
-        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
-        $this->test = $test;
-
-    }
-
-    /**
-     * Parses the prop-filter xml element
-     *
-     * @param DOMElement $propFilterNode
-     * @return array
-     */
-    protected function parsePropFilterNode(DOMElement $propFilterNode) {
-
-        $propFilter = array();
-        $propFilter['name'] = $propFilterNode->getAttribute('name');
-        $propFilter['test'] = $propFilterNode->getAttribute('test');
-        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
-
-        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
-
-        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
-
-        $propFilter['param-filters'] = array();
-
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
-
-        }
-        $propFilter['text-matches'] = array();
-        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
-
-        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
-
-            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
-
-        }
-
-        return $propFilter;
-
-    }
-
-    /**
-     * Parses the param-filter element
-     *
-     * @param DOMElement $paramFilterNode
-     * @return array
-     */
-    public function parseParamFilterNode(DOMElement $paramFilterNode) {
-
-        $paramFilter = array();
-        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
-        $paramFilter['text-match'] = null;
-
-        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
-        if ($textMatch->length>0) {
-            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
-        }
-
-        return $paramFilter;
-
-    }
-
-    /**
-     * Text match
-     *
-     * @param DOMElement $textMatchNode
-     * @return array
-     */
-    public function parseTextMatchNode(DOMElement $textMatchNode) {
-
-        $matchType = $textMatchNode->getAttribute('match-type');
-        if (!$matchType) $matchType = 'contains';
-
-        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
-            throw new Sabre_DAV_Exception_BadRequest('Unknown match-type: ' . $matchType);
-        }
-
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;unicode-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'match-type' => $matchType,
-            'value' => $textMatchNode->nodeValue
-        );
-
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
deleted file mode 100755
index 9d37b15f08..0000000000
--- a/3rdparty/Sabre/CardDAV/AddressBookRoot.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * AddressBook rootnode
- *
- * This object lists a collection of users, which can contain addressbooks.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * Principal Backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * This constructor needs both a principal and a carddav backend.
-     *
-     * By default this class will show a list of addressbook collections for
-     * principals in the 'principals' collection. If your main principals are
-     * actually located in a different path, use the $principalPrefix argument
-     * to override this.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalPrefix = 'principals') {
-
-        $this->carddavBackend = $carddavBackend;
-        parent::__construct($principalBackend, $principalPrefix);
-
-    }
-
-    /**
-     * Returns the name of the node
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return Sabre_CardDAV_Plugin::ADDRESSBOOK_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return Sabre_DAV_INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Backend/Abstract.php b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
deleted file mode 100755
index e4806b7161..0000000000
--- a/3rdparty/Sabre/CardDAV/Backend/Abstract.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-/**
- * Abstract Backend class
- *
- * This class serves as a base-class for addressbook backends
- *
- * Note that there are references to 'addressBookId' scattered throughout the
- * class. The value of the addressBookId is completely up to you, it can be any
- * arbitrary value you can use as an unique identifier.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_CardDAV_Backend_Abstract {
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * Every addressbook should have the following properties:
-     *   id - an arbitrary unique id
-     *   uri - the 'basename' part of the url
-     *   principaluri - Same as the passed parameter
-     *
-     * Any additional clark-notation property may be passed besides this. Some
-     * common ones are :
-     *   {DAV:}displayname
-     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
-     *   {http://calendarserver.org/ns/}getctag
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public abstract function getAddressBooksForUser($principalUri);
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre_DAV_IProperties for a description of the mutations array, as
-     * well as the return value.
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public abstract function updateAddressBook($addressBookId, array $mutations);
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return void
-     */
-    abstract public function createAddressBook($principalUri, $url, array $properties);
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param mixed $addressBookId
-     * @return void
-     */
-    abstract public function deleteAddressBook($addressBookId);
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public abstract function getCards($addressbookId);
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public abstract function getCard($addressBookId, $cardUri);
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    abstract public function createCard($addressBookId, $cardUri, $cardData);
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    abstract public function updateCard($addressBookId, $cardUri, $cardData);
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    abstract public function deleteCard($addressBookId, $cardUri);
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Backend/PDO.php b/3rdparty/Sabre/CardDAV/Backend/PDO.php
deleted file mode 100755
index 413a77f3bc..0000000000
--- a/3rdparty/Sabre/CardDAV/Backend/PDO.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-
-/**
- * PDO CardDAV backend
- *
- * This CardDAV backend uses PDO to store addressbooks
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
-
-    /**
-     * PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The PDO table name used to store addressbooks
-     */
-    protected $addressBooksTableName;
-
-    /**
-     * The PDO table name used to store cards
-     */
-    protected $cardsTableName;
-
-    /**
-     * Sets up the object
-     *
-     * @param PDO $pdo
-     * @param string $addressBooksTableName
-     * @param string $cardsTableName
-     */
-    public function __construct(PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
-
-        $this->pdo = $pdo;
-        $this->addressBooksTableName = $addressBooksTableName;
-        $this->cardsTableName = $cardsTableName;
-
-    }
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getAddressBooksForUser($principalUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM '.$this->addressBooksTableName.' WHERE principaluri = ?');
-        $stmt->execute(array($principalUri));
-
-        $addressBooks = array();
-
-        foreach($stmt->fetchAll() as $row) {
-
-            $addressBooks[] = array(
-                'id'  => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{DAV:}displayname' => $row['displayname'],
-                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
-                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
-                    new Sabre_CardDAV_Property_SupportedAddressData(),
-            );
-
-        }
-
-        return $addressBooks;
-
-    }
-
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre_DAV_IProperties for a description of the mutations array, as
-     * well as the return value.
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateAddressBook($addressBookId, array $mutations) {
-
-        $updates = array();
-
-        foreach($mutations as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $updates['displayname'] = $newValue;
-                    break;
-                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $updates['description'] = $newValue;
-                    break;
-                default :
-                    // If any unsupported values were being updated, we must
-                    // let the entire request fail.
-                    return false;
-            }
-
-        }
-
-        // No values are being updated?
-        if (!$updates) {
-            return false;
-        }
-
-        $query = 'UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 ';
-        foreach($updates as $key=>$value) {
-            $query.=', `' . $key . '` = :' . $key . ' ';
-        }
-        $query.=' WHERE id = :addressbookid';
-
-        $stmt = $this->pdo->prepare($query);
-        $updates['addressbookid'] = $addressBookId;
-
-        $stmt->execute($updates);
-
-        return true;
-
-    }
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return void
-     */
-    public function createAddressBook($principalUri, $url, array $properties) {
-
-        $values = array(
-            'displayname' => null,
-            'description' => null,
-            'principaluri' => $principalUri,
-            'uri' => $url,
-        );
-
-        foreach($properties as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $values['displayname'] = $newValue;
-                    break;
-                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $values['description'] = $newValue;
-                    break;
-                default :
-                    throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
-            }
-
-        }
-
-        $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-    }
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param int $addressBookId
-     * @return void
-     */
-    public function deleteAddressBook($addressBookId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
-        $stmt->execute(array($addressBookId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
-        $stmt->execute(array($addressBookId));
-
-    }
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public function getCards($addressbookId) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
-        $stmt->execute(array($addressbookId));
-
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-
-    }
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public function getCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ? LIMIT 1');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-        return (count($result)>0?$result[0]:false);
-
-    }
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function createCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
-
-        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return '"' . md5($cardData) . '"';
-
-    }
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function updateCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('UPDATE ' . $this->cardsTableName . ' SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
-        $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return '"' . md5($cardData) . '"';
-
-    }
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    public function deleteCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ?');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return $stmt->rowCount()===1;
-
-    }
-}
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
deleted file mode 100755
index d7c6633383..0000000000
--- a/3rdparty/Sabre/CardDAV/Card.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-/**
- * The Card object represents a single Card from an addressbook
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
-
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    private $carddavBackend;
-
-    /**
-     * Array with information about this Card
-     *
-     * @var array
-     */
-    private $cardData;
-
-    /**
-     * Array with information about the containing addressbook
-     *
-     * @var array
-     */
-    private $addressBookInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param array $addressBookInfo
-     * @param array $cardData
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo,array $cardData) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-        $this->cardData = $cardData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->cardData['uri'];
-
-    }
-
-    /**
-     * Returns the VCard-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating 'carddata' is optional. If we don't yet have it
-        // already, we fetch it from the backend.
-        if (!isset($this->cardData['carddata'])) {
-            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
-        }
-        return $this->cardData['carddata'];
-
-    }
-
-    /**
-     * Updates the VCard-formatted object
-     *
-     * @param string $cardData
-     * @return void
-     */
-    public function put($cardData) {
-
-        if (is_resource($cardData))
-            $cardData = stream_get_contents($cardData);
-
-        // Converting to UTF-8, if needed
-        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
-
-        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
-        $this->cardData['carddata'] = $cardData;
-        $this->cardData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the card
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/x-vcard';
-
-    }
-
-    /**
-     * Returns an ETag for this object
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->cardData['etag'])) {
-            return $this->cardData['etag'];
-        } else {
-            return '"' . md5($this->get()) . '"';
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return time
-     */
-    public function getLastModified() {
-
-        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size', $this->cardData)) {
-            return $this->cardData['size'];
-        } else {
-            return strlen($this->get());
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
deleted file mode 100755
index 2bc275bcf7..0000000000
--- a/3rdparty/Sabre/CardDAV/IAddressBook.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * AddressBook interface
- *
- * Implement this interface to allow a node to be recognized as an addressbook.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
-
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
deleted file mode 100755
index a17299316c..0000000000
--- a/3rdparty/Sabre/CardDAV/ICard.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Card interface
- *
- * Extend the ICard interface to allow your custom nodes to be picked up as
- * 'Cards'.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_ICard extends Sabre_DAV_IFile {
-
-}
-
diff --git a/3rdparty/Sabre/CardDAV/IDirectory.php b/3rdparty/Sabre/CardDAV/IDirectory.php
deleted file mode 100755
index 22d4afeb24..0000000000
--- a/3rdparty/Sabre/CardDAV/IDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * IDirectory interface
- *
- * Implement this interface to have an addressbook marked as a 'directory'. A
- * directory is an (often) global addressbook.
- *
- * A full description can be found in the IETF draft:
- *   - draft-daboo-carddav-directory-gateway
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
deleted file mode 100755
index ca20e46849..0000000000
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ /dev/null
@@ -1,666 +0,0 @@
-<?php
-
-/**
- * CardDAV plugin
- *
- * The CardDAV plugin adds CardDAV functionality to the WebDAV server
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Url to the addressbooks
-     */
-    const ADDRESSBOOK_ROOT = 'addressbooks';
-
-    /**
-     * xml namespace for CardDAV elements
-     */
-    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
-
-    /**
-     * Add urls to this property to have them automatically exposed as
-     * 'directories' to the user.
-     *
-     * @var array
-     */
-    public $directories = array();
-
-    /**
-     * Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        /* Events */
-        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
-        $server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
-        $server->subscribeEvent('report', array($this,'report'));
-        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
-        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
-        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
-        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
-
-        /* Namespaces */
-        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
-
-        /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
-        $server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
-
-        /* Adding properties that may never be changed */
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
-
-        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre_DAV_Property_Href';
-
-        $this->server = $server;
-
-    }
-
-    /**
-     * Returns a list of supported features.
-     *
-     * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('addressbook');
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_CardDAV_IAddressBook || $node instanceof Sabre_CardDAV_ICard) {
-            return array(
-                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
-                 '{' . self::NS_CARDDAV . '}addressbook-query',
-            );
-        }
-        return array();
-
-    }
-
-
-    /**
-     * Adds all CardDAV-specific properties
-     *
-     * @param string $path
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) {
-
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            // calendar-home-set property
-            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-            if (in_array($addHome,$requestedProperties)) {
-                $principalId = $node->getName();
-                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
-                $returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
-            }
-
-            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
-            if ($this->directories && in_array($directories, $requestedProperties)) {
-                unset($requestedProperties[array_search($directories, $requestedProperties)]);
-                $returnedProperties[200][$directories] = new Sabre_DAV_Property_HrefList($this->directories);
-            }
-
-        }
-
-        if ($node instanceof Sabre_CardDAV_ICard) {
-
-            // The address-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
-            if (in_array($addressDataProp, $requestedProperties)) {
-                unset($requestedProperties[$addressDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-        if ($node instanceof Sabre_CardDAV_UserAddressBooks) {
-
-            $meCardProp = '{http://calendarserver.org/ns/}me-card';
-            if (in_array($meCardProp, $requestedProperties)) {
-
-                $props = $this->server->getProperties($node->getOwner(), array('{http://sabredav.org/ns}vcard-url'));
-                if (isset($props['{http://sabredav.org/ns}vcard-url'])) {
-
-                    $returnedProperties[200][$meCardProp] = new Sabre_DAV_Property_Href(
-                        $props['{http://sabredav.org/ns}vcard-url']
-                    );
-                    $pos = array_search($meCardProp, $requestedProperties);
-                    unset($requestedProperties[$pos]);
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This event is triggered when a PROPPATCH method is executed
-     *
-     * @param array $mutations
-     * @param array $result
-     * @param Sabre_DAV_INode $node
-     * @return void
-     */
-    public function updateProperties(&$mutations, &$result, $node) {
-
-        if (!$node instanceof Sabre_CardDAV_UserAddressBooks) {
-            return true;
-        }
-
-        $meCard = '{http://calendarserver.org/ns/}me-card';
-
-        // The only property we care about
-        if (!isset($mutations[$meCard]))
-            return true;
-
-        $value = $mutations[$meCard];
-        unset($mutations[$meCard]);
-
-        if ($value instanceof Sabre_DAV_Property_IHref) {
-            $value = $value->getHref();
-            $value = $this->server->calculateUri($value);
-        } elseif (!is_null($value)) {
-            $result[400][$meCard] = null;
-            return false;
-        }
-
-        $innerResult = $this->server->updateProperties(
-            $node->getOwner(),
-            array(
-                '{http://sabredav.org/ns}vcard-url' => $value,
-            )
-        );
-
-        $closureResult = false;
-        foreach($innerResult as $status => $props) {
-            if (is_array($props) && array_key_exists('{http://sabredav.org/ns}vcard-url', $props)) {
-                $result[$status][$meCard] = null;
-                $closureResult = ($status>=200 && $status<300);
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CardDAV
-     *
-     * @param string $reportName
-     * @param DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) {
-            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
-                $this->addressbookMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CARDDAV.'}addressbook-query' :
-                $this->addressBookQueryReport($dom);
-                return false;
-            default :
-                return;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the addressbook-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function addressbookMultiGetReport($dom) {
-
-        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-        $propertyList = array();
-
-        foreach($hrefElems as $elem) {
-
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
-
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that Card nodes receive valid
-     * vcard data.
-     *
-     * @param string $path
-     * @param Sabre_DAV_IFile $node
-     * @param resource $data
-     * @return void
-     */
-    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
-
-        if (!$node instanceof Sabre_CardDAV_ICard)
-            return;
-
-        $this->validateVCard($data);
-
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that Card nodes receive valid
-     * vcard data.
-     *
-     * @param string $path
-     * @param resource $data
-     * @param Sabre_DAV_ICollection $parentNode
-     * @return void
-     */
-    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
-
-        if (!$parentNode instanceof Sabre_CardDAV_IAddressBook)
-            return;
-
-        $this->validateVCard($data);
-
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string $data
-     * @return void
-     */
-    protected function validateVCard(&$data) {
-
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        // Converting the data to unicode, if needed.
-        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
-
-        try {
-
-            $vobj = Sabre_VObject_Reader::read($data);
-
-        } catch (Sabre_VObject_ParseException $e) {
-
-            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
-
-        }
-
-        if ($vobj->name !== 'VCARD') {
-            throw new Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support vcard objects.');
-        }
-
-    }
-
-
-    /**
-     * This function handles the addressbook-query REPORT
-     *
-     * This report is used by the client to filter an addressbook based on a
-     * complex query.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    protected function addressbookQueryReport($dom) {
-
-        $query = new Sabre_CardDAV_AddressBookQueryParser($dom);
-        $query->parse();
-
-        $depth = $this->server->getHTTPDepth(0);
-
-        if ($depth==0) {
-            $candidateNodes = array(
-                $this->server->tree->getNodeForPath($this->server->getRequestUri())
-            );
-        } else {
-            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
-        }
-
-        $validNodes = array();
-        foreach($candidateNodes as $node) {
-
-            if (!$node instanceof Sabre_CardDAV_ICard)
-                continue;
-
-            $blob = $node->get();
-            if (is_resource($blob)) {
-                $blob = stream_get_contents($blob);
-            }
-
-            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
-                continue;
-            }
-
-            $validNodes[] = $node;
-
-            if ($query->limit && $query->limit <= count($validNodes)) {
-                // We hit the maximum number of items, we can stop now.
-                break;
-            }
-
-        }
-
-        $result = array();
-        foreach($validNodes as $validNode) {
-
-            if ($depth==0) {
-                $href = $this->server->getRequestUri();
-            } else {
-                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
-            }
-
-            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
-
-    }
-
-    /**
-     * Validates if a vcard makes it throught a list of filters.
-     *
-     * @param string $vcardData
-     * @param array $filters
-     * @param string $test anyof or allof (which means OR or AND)
-     * @return bool
-     */
-    public function validateFilters($vcardData, array $filters, $test) {
-
-        $vcard = Sabre_VObject_Reader::read($vcardData);
-
-        if (!$filters) return true;
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($vcard->{$filter['name']});
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
-
-                // We only need to check for existence
-                $success = $isDefined;
-
-            } else {
-
-                $vProperties = $vcard->select($filter['name']);
-
-                $results = array();
-                if ($filter['param-filters']) {
-                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
-                }
-                if ($filter['text-matches']) {
-                    $texts = array();
-                    foreach($vProperties as $vProperty)
-                        $texts[] = $vProperty->value;
-
-                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
-                }
-
-                if (count($results)===1) {
-                    $success = $results[0];
-                } else {
-                    if ($filter['test'] === 'anyof') {
-                        $success = $results[0] || $results[1];
-                    } else {
-                        $success = $results[0] && $results[1];
-                    }
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        } // foreach
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a param-filter can be applied to a specific property.
-     *
-     * @todo currently we're only validating the first parameter of the passed
-     *       property. Any subsequence parameters with the same name are
-     *       ignored.
-     * @param array $vProperties
-     * @param array $filters
-     * @param string $test
-     * @return bool
-     */
-    protected function validateParamFilters(array $vProperties, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = false;
-            foreach($vProperties as $vProperty) {
-                $isDefined = isset($vProperty[$filter['name']]);
-                if ($isDefined) break;
-            }
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-
-            // If there's no text-match, we can just check for existence
-            } elseif (!$filter['text-match'] || !$isDefined) {
-
-                $success = $isDefined;
-
-            } else {
-
-                $success = false;
-                foreach($vProperties as $vProperty) {
-                    // If we got all the way here, we'll need to validate the
-                    // text-match filter.
-                    $success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
-                    if ($success) break;
-                }
-                if ($filter['text-match']['negate-condition']) {
-                    $success = !$success;
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a text-filter can be applied to a specific property.
-     *
-     * @param array $texts
-     * @param array $filters
-     * @param string $test
-     * @return bool
-     */
-    protected function validateTextMatches(array $texts, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $success = false;
-            foreach($texts as $haystack) {
-                $success = Sabre_DAV_StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
-
-                // Breaking on the first match
-                if ($success) break;
-            }
-            if ($filter['negate-condition']) {
-                $success = !$success;
-            }
-
-            if ($success && $test==='anyof')
-                return true;
-
-            if (!$success && $test=='allof')
-                return false;
-
-
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param Sabre_DAV_INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
-
-        if (!$node instanceof Sabre_CardDAV_UserAddressBooks)
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new address book</h3>
-            <input type="hidden" name="sabreAction" value="mkaddressbook" />
-            <label>Name (uri):</label> <input type="text" name="name" /><br />
-            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
-            <input type="submit" value="create" />
-            </form>
-            </td></tr>';
-
-        return false;
-
-    }
-
-    /**
-     * This method allows us to intercept the 'mkcalendar' sabreAction. This
-     * action enables the user to create new calendars from the browser plugin.
-     *
-     * @param string $uri
-     * @param string $action
-     * @param array $postVars
-     * @return bool
-     */
-    public function browserPostAction($uri, $action, array $postVars) {
-
-        if ($action!=='mkaddressbook')
-            return;
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:carddav}addressbook');
-        $properties = array();
-        if (isset($postVars['{DAV:}displayname'])) {
-            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
-        }
-        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
deleted file mode 100755
index 36d9306e7a..0000000000
--- a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Supported-address-data property
- *
- * This property is a representation of the supported-address-data property
- * in the CardDAV namespace.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
-
-    /**
-     * supported versions
-     *
-     * @var array
-     */
-    protected $supportedData = array();
-
-    /**
-     * Creates the property
-     *
-     * @param array|null $supportedData
-     */
-    public function __construct(array $supportedData = null) {
-
-        if (is_null($supportedData)) {
-            $supportedData = array(
-                array('contentType' => 'text/vcard', 'version' => '3.0'),
-                array('contentType' => 'text/vcard', 'version' => '4.0'),
-            );
-        }
-
-       $this->supportedData = $supportedData;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix =
-            isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
-            $server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
-            'card';
-
-        foreach($this->supportedData as $supported) {
-
-            $caldata = $doc->createElementNS(Sabre_CardDAV_Plugin::NS_CARDDAV, $prefix . ':address-data-type');
-            $caldata->setAttribute('content-type',$supported['contentType']);
-            $caldata->setAttribute('version',$supported['version']);
-            $node->appendChild($caldata);
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
deleted file mode 100755
index 3f11fb1123..0000000000
--- a/3rdparty/Sabre/CardDAV/UserAddressBooks.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/**
- * UserAddressBooks class
- *
- * The UserAddressBooks collection contains a list of addressbooks associated with a user
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
-    /**
-     * Principal uri
-     *
-     * @var array
-     */
-    protected $principalUri;
-
-    /**
-     * carddavBackend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param string $principalUri
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return Sabre_CardDAV_AddressBook
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new Sabre_DAV_Exception_NotFound('Addressbook with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Returns a list of addressbooks
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
-        $objs = array();
-        foreach($addressbooks as $addressbook) {
-            $objs[] = new Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new addressbook
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{'.Sabre_CardDAV_Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
deleted file mode 100755
index d0623f0d3e..0000000000
--- a/3rdparty/Sabre/CardDAV/Version.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Version Class
- *
- * This class contains the Sabre_CardDAV version information
- *
- * @package Sabre
- * @subpackage CardDAV 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/CardDAV/includes.php b/3rdparty/Sabre/CardDAV/includes.php
deleted file mode 100755
index c3b8c04b07..0000000000
--- a/3rdparty/Sabre/CardDAV/includes.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_CardDAV includes file
- *
- * Including this file will automatically include all files from the
- * Sabre_CardDAV package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/AddressBookQueryParser.php';
-include __DIR__ . '/AddressBookRoot.php';
-include __DIR__ . '/Backend/Abstract.php';
-include __DIR__ . '/Backend/PDO.php';
-include __DIR__ . '/IAddressBook.php';
-include __DIR__ . '/ICard.php';
-include __DIR__ . '/IDirectory.php';
-include __DIR__ . '/Plugin.php';
-include __DIR__ . '/Property/SupportedAddressData.php';
-include __DIR__ . '/UserAddressBooks.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/AddressBook.php';
-include __DIR__ . '/Card.php';
-// End includes
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
deleted file mode 100755
index 1e89b84f9a..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * HTTP Basic authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Basic
- * Most of the digest logic is handled, implementors just need to worry about
- * the validateUserPass method.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author James David Low (http://jameslow.com/)
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var string|null
-     */
-    protected $currentUser;
-
-    /**
-     * Validates a username and password
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     */
-    abstract protected function validateUserPass($username, $password);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-        return $this->currentUser;
-    }
-
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server, $realm) {
-
-        $auth = new Sabre_HTTP_BasicAuth();
-        $auth->setHTTPRequest($server->httpRequest);
-        $auth->setHTTPResponse($server->httpResponse);
-        $auth->setRealm($realm);
-        $userpass = $auth->getUserPass();
-        if (!$userpass) {
-            $auth->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
-        }
-
-        // Authenticates the user
-        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
-            $auth->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
-        }
-        $this->currentUser = $userpass[0];
-        return true;
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
deleted file mode 100755
index 9833928b97..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * HTTP Digest authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Digest
- * Most of the digest logic is handled, implementors just need to worry about
- * the getDigestHash method
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var array|null
-     */
-    protected $currentUser;
-
-    /**
-     * Returns a users digest hash based on the username and realm.
-     *
-     * If the user was not known, null must be returned.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    abstract public function getDigestHash($realm, $username);
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server, $realm) {
-
-        $digest = new Sabre_HTTP_DigestAuth();
-
-        // Hooking up request and response objects
-        $digest->setHTTPRequest($server->httpRequest);
-        $digest->setHTTPResponse($server->httpResponse);
-
-        $digest->setRealm($realm);
-        $digest->init();
-
-        $username = $digest->getUsername();
-
-        // No username was given
-        if (!$username) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
-        }
-
-        $hash = $this->getDigestHash($realm, $username);
-        // If this was false, the user account didn't exist
-        if ($hash===false || is_null($hash)) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
-        }
-        if (!is_string($hash)) {
-            throw new Sabre_DAV_Exception('The returned value from getDigestHash must be a string or null');
-        }
-
-        // If this was false, the password or part of the hash was incorrect.
-        if (!$digest->validateA1($hash)) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
-        }
-
-        $this->currentUser = $username;
-        return true;
-
-    }
-
-    /**
-     * Returns the currently logged in username.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        return $this->currentUser;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
deleted file mode 100755
index d4294ea4d8..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Apache authenticator
- *
- * This authentication backend assumes that authentication has been
- * configured in apache, rather than within SabreDAV.
- *
- * Make sure apache is properly configured for this to work.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * Current apache user
-     *
-     * @var string
-     */
-    protected $remoteUser;
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server, $realm) {
-
-        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
-        if (is_null($remoteUser)) {
-            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
-        }
-
-        $this->remoteUser = $remoteUser;
-        return true;
-
-    }
-
-    /**
-     * Returns information about the currently logged in user.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return array|null
-     */
-    public function getCurrentUser() {
-
-        return $this->remoteUser;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
deleted file mode 100755
index de308d64a6..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/File.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
-
-    /**
-     * List of users
-     *
-     * @var array
-     */
-    protected $users = array();
-
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     *
-     * @param string|null $filename
-     */
-    public function __construct($filename=null) {
-
-        if (!is_null($filename))
-            $this->loadFile($filename);
-
-    }
-
-    /**
-     * Loads an htdigest-formatted file. This method can be called multiple times if
-     * more than 1 file is used.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function loadFile($filename) {
-
-        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
-
-            if (substr_count($line, ":") !== 2)
-                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
-
-            list($username,$realm,$A1) = explode(':',$line);
-
-            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
-                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
-
-            $this->users[$realm . ':' . $username] = $A1;
-
-        }
-
-    }
-
-    /**
-     * Returns a users' information
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string
-     */
-    public function getDigestHash($realm, $username) {
-
-        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
deleted file mode 100755
index eac18a23fb..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
-
-    /**
-     * Reference to PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name we'll be using
-     *
-     * @var string
-     */
-    protected $tableName;
-
-
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     *
-     * @param PDO $pdo
-     * @param string $tableName The PDO table name to use
-     */
-    public function __construct(PDO $pdo, $tableName = 'users') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns the digest hash for a user.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    public function getDigestHash($realm,$username) {
-
-        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?');
-        $stmt->execute(array($username));
-        $result = $stmt->fetchAll();
-
-        if (!count($result)) return;
-
-        return $result[0]['digesta1'];
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
deleted file mode 100755
index 5be5d1bc93..0000000000
--- a/3rdparty/Sabre/DAV/Auth/IBackend.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * This is the base class for any authentication object.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_Auth_IBackend {
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param string $realm
-     * @return bool
-     */
-    function authenticate(Sabre_DAV_Server $server,$realm);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    function getCurrentUser();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
deleted file mode 100755
index 55a4e39167..0000000000
--- a/3rdparty/Sabre/DAV/Auth/Plugin.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * This plugin provides Authentication for a WebDAV server.
- *
- * It relies on a Backend object, which provides user information.
- *
- * Additionally, it provides support for:
- *  * {DAV:}current-user-principal property from RFC5397
- *  * {DAV:}principal-collection-set property from RFC3744
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to main server object
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Authentication backend
-     *
-     * @var Sabre_DAV_Auth_IBackend
-     */
-    private $authBackend;
-
-    /**
-     * The authentication realm.
-     *
-     * @var string
-     */
-    private $realm;
-
-    /**
-     * __construct
-     *
-     * @param Sabre_DAV_Auth_IBackend $authBackend
-     * @param string $realm
-     */
-    public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
-
-        $this->authBackend = $authBackend;
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Initializes the plugin. This function is automatically called by the server
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'auth';
-
-    }
-
-    /**
-     * Returns the current users' principal uri.
-     *
-     * If nobody is logged in, this will return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        $userInfo = $this->authBackend->getCurrentUser();
-        if (!$userInfo) return null;
-
-        return $userInfo;
-
-    }
-
-    /**
-     * This method is called before any HTTP method and forces users to be authenticated
-     *
-     * @param string $method
-     * @param string $uri
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        $this->authBackend->authenticate($this->server,$this->realm);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
deleted file mode 100755
index b6c00d461c..0000000000
--- a/3rdparty/Sabre/DAV/Browser/GuessContentType.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * GuessContentType plugin
- *
- * A lot of the built-in File objects just return application/octet-stream
- * as a content-type by default. This is a problem for some clients, because
- * they expect a correct contenttype.
- *
- * There's really no accurate, fast and portable way to determine the contenttype
- * so this extension does what the rest of the world does, and guesses it based
- * on the file extension.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * List of recognized file extensions
-     *
-     * Feel free to add more
-     *
-     * @var array
-     */
-    public $extensionMap = array(
-
-        // images
-        'jpg' => 'image/jpeg',
-        'gif' => 'image/gif',
-        'png' => 'image/png',
-
-        // groupware
-        'ics' => 'text/calendar',
-        'vcf' => 'text/x-vcard',
-
-        // text
-        'txt' => 'text/plain',
-
-    );
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        // Using a relatively low priority (200) to allow other extensions
-        // to set the content-type first.
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
-
-    }
-
-    /**
-     * Handler for teh afterGetProperties event
-     *
-     * @param string $path
-     * @param array $properties
-     * @return void
-     */
-    public function afterGetProperties($path, &$properties) {
-
-        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
-
-            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
-            $contentType = $this->getContentType($fileName);
-
-            if ($contentType) {
-                $properties[200]['{DAV:}getcontenttype'] = $contentType;
-                unset($properties[404]['{DAV:}getcontenttype']);
-            }
-
-        }
-
-    }
-
-    /**
-     * Simple method to return the contenttype
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function getContentType($fileName) {
-
-        // Just grabbing the extension
-        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
-        if (isset($this->extensionMap[$extension]))
-            return $this->extensionMap[$extension];
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
deleted file mode 100755
index 1588488764..0000000000
--- a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This is a simple plugin that will map any GET request for non-files to
- * PROPFIND allprops-requests.
- *
- * This should allow easy debugging of PROPFIND
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * reference to server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-    }
-
-    /**
-     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method!='GET') return true;
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_DAV_IFile) return;
-
-        $this->server->invokeMethod('PROPFIND',$uri);
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
deleted file mode 100755
index 09bbdd2ae0..0000000000
--- a/3rdparty/Sabre/DAV/Browser/Plugin.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-
-/**
- * Browser Plugin
- *
- * This plugin provides a html representation, so that a WebDAV server may be accessed
- * using a browser.
- *
- * The class intercepts GET requests to collection resources and generates a simple
- * html index.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * List of default icons for nodes.
-     *
-     * This is an array with class / interface names as keys, and asset names
-     * as values.
-     *
-     * The evaluation order is reversed. The last item in the list gets
-     * precendence.
-     *
-     * @var array
-     */
-    public $iconMap = array(
-        'Sabre_DAV_IFile' => 'icons/file',
-        'Sabre_DAV_ICollection' => 'icons/collection',
-        'Sabre_DAVACL_IPrincipal' => 'icons/principal',
-        'Sabre_CalDAV_ICalendar' => 'icons/calendar',
-        'Sabre_CardDAV_IAddressBook' => 'icons/addressbook',
-        'Sabre_CardDAV_ICard' => 'icons/card',
-    );
-
-    /**
-     * The file extension used for all icons
-     *
-     * @var string
-     */
-    public $iconExtension = '.png';
-
-    /**
-     * reference to server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * enablePost turns on the 'actions' panel, which allows people to create
-     * folders and upload files straight from a browser.
-     *
-     * @var bool
-     */
-    protected $enablePost = true;
-
-    /**
-     * By default the browser plugin will generate a favicon and other images.
-     * To turn this off, set this property to false.
-     *
-     * @var bool
-     */
-    protected $enableAssets = true;
-
-    /**
-     * Creates the object.
-     *
-     * By default it will allow file creation and uploads.
-     * Specify the first argument as false to disable this
-     *
-     * @param bool $enablePost
-     * @param bool $enableAssets
-     */
-    public function __construct($enablePost=true, $enableAssets = true) {
-
-        $this->enablePost = $enablePost;
-        $this->enableAssets = $enableAssets;
-
-    }
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-        $this->server->subscribeEvent('onHTMLActionsPanel', array($this, 'htmlActionsPanel'),200);
-        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
-    }
-
-    /**
-     * This method intercepts GET requests to collections and returns the html
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method !== 'GET') return true;
-
-        // We're not using straight-up $_GET, because we want everything to be
-        // unit testable.
-        $getVars = array();
-        parse_str($this->server->httpRequest->getQueryString(), $getVars);
-
-        if (isset($getVars['sabreAction']) && $getVars['sabreAction'] === 'asset' && isset($getVars['assetName'])) {
-            $this->serveAsset($getVars['assetName']);
-            return false;
-        }
-
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            // We're simply stopping when the file isn't found to not interfere
-            // with other plugins.
-            return;
-        }
-        if ($node instanceof Sabre_DAV_IFile)
-            return;
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
-
-        $this->server->httpResponse->sendBody(
-            $this->generateDirectoryIndex($uri)
-        );
-
-        return false;
-
-    }
-
-    /**
-     * Handles POST requests for tree operations.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpPOSTHandler($method, $uri) {
-
-        if ($method!='POST') return;
-        $contentType = $this->server->httpRequest->getHeader('Content-Type');
-        list($contentType) = explode(';', $contentType);
-        if ($contentType !== 'application/x-www-form-urlencoded' &&
-            $contentType !== 'multipart/form-data') {
-                return;
-        }
-        $postVars = $this->server->httpRequest->getPostVars();
-
-        if (!isset($postVars['sabreAction']))
-            return;
-
-        if ($this->server->broadcastEvent('onBrowserPostAction', array($uri, $postVars['sabreAction'], $postVars))) {
-
-            switch($postVars['sabreAction']) {
-
-                case 'mkcol' :
-                    if (isset($postVars['name']) && trim($postVars['name'])) {
-                        // Using basename() because we won't allow slashes
-                        list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($postVars['name']));
-                        $this->server->createDirectory($uri . '/' . $folderName);
-                    }
-                    break;
-                case 'put' :
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
-
-                    list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
-
-                    // Making sure we only have a 'basename' component
-                    list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
-
-                    if (is_uploaded_file($file['tmp_name'])) {
-                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'],'r'));
-                    }
-                    break;
-
-            }
-
-        }
-        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
-        $this->server->httpResponse->sendStatus(302);
-        return false;
-
-    }
-
-    /**
-     * Escapes a string for html.
-     *
-     * @param string $value
-     * @return string
-     */
-    public function escapeHTML($value) {
-
-        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
-
-    }
-
-    /**
-     * Generates the html directory index for a given url
-     *
-     * @param string $path
-     * @return string
-     */
-    public function generateDirectoryIndex($path) {
-
-        $version = '';
-        if (Sabre_DAV_Server::$exposeVersion) {
-            $version = Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY;
-        }
-
-        $html = "<html>
-<head>
-  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . $version . "</title>
-  <style type=\"text/css\">
-  body { Font-family: arial}
-  h1 { font-size: 150% }
-  </style>
-        ";
-
-        if ($this->enableAssets) {
-            $html.='<link rel="shortcut icon" href="'.$this->getAssetUrl('favicon.ico').'" type="image/vnd.microsoft.icon" />';
-        }
-
-        $html .= "</head>
-<body>
-  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
-  <table>
-    <tr><th width=\"24\"></th><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
-    <tr><td colspan=\"5\"><hr /></td></tr>";
-
-        $files = $this->server->getPropertiesForPath($path,array(
-            '{DAV:}displayname',
-            '{DAV:}resourcetype',
-            '{DAV:}getcontenttype',
-            '{DAV:}getcontentlength',
-            '{DAV:}getlastmodified',
-        ),1);
-
-        $parent = $this->server->tree->getNodeForPath($path);
-
-
-        if ($path) {
-
-            list($parentUri) = Sabre_DAV_URLUtil::splitPath($path);
-            $fullPath = Sabre_DAV_URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
-
-            $icon = $this->enableAssets?'<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl('icons/parent' . $this->iconExtension) . '" width="24" alt="Parent" /></a>':'';
-            $html.= "<tr>
-    <td>$icon</td>
-    <td><a href=\"{$fullPath}\">..</a></td>
-    <td>[parent]</td>
-    <td></td>
-    <td></td>
-    </tr>";
-
-        }
-
-        foreach($files as $file) {
-
-            // This is the current directory, we can skip it
-            if (rtrim($file['href'],'/')==$path) continue;
-
-            list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
-
-            $type = null;
-
-
-            if (isset($file[200]['{DAV:}resourcetype'])) {
-                $type = $file[200]['{DAV:}resourcetype']->getValue();
-
-                // resourcetype can have multiple values
-                if (!is_array($type)) $type = array($type);
-
-                foreach($type as $k=>$v) {
-
-                    // Some name mapping is preferred
-                    switch($v) {
-                        case '{DAV:}collection' :
-                            $type[$k] = 'Collection';
-                            break;
-                        case '{DAV:}principal' :
-                            $type[$k] = 'Principal';
-                            break;
-                        case '{urn:ietf:params:xml:ns:carddav}addressbook' :
-                            $type[$k] = 'Addressbook';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}calendar' :
-                            $type[$k] = 'Calendar';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
-                            $type[$k] = 'Schedule Inbox';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
-                            $type[$k] = 'Schedule Outbox';
-                            break;
-                        case '{http://calendarserver.org/ns/}calendar-proxy-read' :
-                            $type[$k] = 'Proxy-Read';
-                            break;
-                        case '{http://calendarserver.org/ns/}calendar-proxy-write' :
-                            $type[$k] = 'Proxy-Write';
-                            break;
-                    }
-
-                }
-                $type = implode(', ', $type);
-            }
-
-            // If no resourcetype was found, we attempt to use
-            // the contenttype property
-            if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
-                $type = $file[200]['{DAV:}getcontenttype'];
-            }
-            if (!$type) $type = 'Unknown';
-
-            $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
-            $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
-
-            $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
-
-            $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
-
-            $displayName = $this->escapeHTML($displayName);
-            $type = $this->escapeHTML($type);
-
-            $icon = '';
-
-            if ($this->enableAssets) {
-                $node = $parent->getChild($name);
-                foreach(array_reverse($this->iconMap) as $class=>$iconName) {
-
-                    if ($node instanceof $class) {
-                        $icon = '<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl($iconName . $this->iconExtension) . '" alt="" width="24" /></a>';
-                        break;
-                    }
-
-
-                }
-
-            }
-
-            $html.= "<tr>
-    <td>$icon</td>
-    <td><a href=\"{$fullPath}\">{$displayName}</a></td>
-    <td>{$type}</td>
-    <td>{$size}</td>
-    <td>{$lastmodified}</td>
-    </tr>";
-
-        }
-
-        $html.= "<tr><td colspan=\"5\"><hr /></td></tr>";
-
-        $output = '';
-
-        if ($this->enablePost) {
-            $this->server->broadcastEvent('onHTMLActionsPanel',array($parent, &$output));
-        }
-
-        $html.=$output;
-
-        $html.= "</table>
-        <address>Generated by SabreDAV " . $version . " (c)2007-2012 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
-        </body>
-        </html>";
-
-        return $html;
-
-    }
-
-    /**
-     * This method is used to generate the 'actions panel' output for
-     * collections.
-     *
-     * This specifically generates the interfaces for creating new files, and
-     * creating new directories.
-     *
-     * @param Sabre_DAV_INode $node
-     * @param mixed $output
-     * @return void
-     */
-    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
-
-        if (!$node instanceof Sabre_DAV_ICollection)
-            return;
-
-        // We also know fairly certain that if an object is a non-extended
-        // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node)==='Sabre_DAV_SimpleCollection')
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new folder</h3>
-            <input type="hidden" name="sabreAction" value="mkcol" />
-            Name: <input type="text" name="name" /><br />
-            <input type="submit" value="create" />
-            </form>
-            <form method="post" action="" enctype="multipart/form-data">
-            <h3>Upload file</h3>
-            <input type="hidden" name="sabreAction" value="put" />
-            Name (optional): <input type="text" name="name" /><br />
-            File: <input type="file" name="file" /><br />
-            <input type="submit" value="upload" />
-            </form>
-            </td></tr>';
-
-    }
-
-    /**
-     * This method takes a path/name of an asset and turns it into url
-     * suiteable for http access.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getAssetUrl($assetName) {
-
-        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
-
-    }
-
-    /**
-     * This method returns a local pathname to an asset.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getLocalAssetPath($assetName) {
-
-        // Making sure people aren't trying to escape from the base path.
-        $assetSplit = explode('/', $assetName);
-        if (in_array('..',$assetSplit)) {
-            throw new Sabre_DAV_Exception('Incorrect asset path');
-        }
-        $path = __DIR__ . '/assets/' . $assetName;
-        return $path;
-
-    }
-
-    /**
-     * This method reads an asset from disk and generates a full http response.
-     *
-     * @param string $assetName
-     * @return void
-     */
-    protected function serveAsset($assetName) {
-
-        $assetPath = $this->getLocalAssetPath($assetName);
-        if (!file_exists($assetPath)) {
-            throw new Sabre_DAV_Exception_NotFound('Could not find an asset with this name');
-        }
-        // Rudimentary mime type detection
-        switch(strtolower(substr($assetPath,strpos($assetPath,'.')+1))) {
-
-        case 'ico' :
-            $mime = 'image/vnd.microsoft.icon';
-            break;
-
-        case 'png' :
-            $mime = 'image/png';
-            break;
-
-        default:
-            $mime = 'application/octet-stream';
-            break;
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type', $mime);
-        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
-        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody(fopen($assetPath,'r'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/assets/favicon.ico b/3rdparty/Sabre/DAV/Browser/assets/favicon.ico
deleted file mode 100755
index 2b2c10a22cc7a57c4dc5d7156f184448f2bee92b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmc&&O-NKx6uz%14NNBzA}E}JHil3^6a|4&P_&6!RGSD}1rgCAC@`9dTC_@vqNoT8
z0%;dQR0K_{iUM;bf#3*%o1h^C2N7@IH_nmc?Va~t5U6~f`_BE&`Of`&_n~tUev3uN
zziw!)bL*XR-2hy!51_yCgT8fb3s`VC=e=KcI5&)PGGQlpSAh?}1mK&Pg8c>z0Y`y$
zAT_6qJ%yV?|0!S$5WO@z3+`QD17OyXL4PyiM}RavtA7Tu7p)pn^p7Ks@m6m7)A}X$
z4Y+@;NrHYq_;V@RoZ|;69MPx!46Ftg*Tc~711C+J`JMuUfYwNBzXPB9sZm3WK9272
z&x|>@f_E<?SJ!n3F_!+bjQL(SbG*pN*ZN$yjf@Y*UxY8qyfdC$j-dkR++q8Z(SMuq
zfqvGxyvf)mCXM`3#|fi<8vgb`|A)bqT(si=-rx;=+NAlS2KT#;*X?6Ue@g;SVmR+T
zfQ)^2O3afcmvu-EZSO1nlLklg`<wYhpZi$%hi%qJ?r(!Ps`Lj8j^tcCGtHdL`!ONr
zi{e@OQ%awEO0+_IL*<gO^ZX>O{b3cubqjOyc~<H3P7OIT@bL~1O>J3I$d_lHIpN}q
z!{kjX{c{12XF=~Z$w$kazXHB!b53>u!rx}_$e&dD`xNgv+MR&p2yN1xb0>&9t@28Z
zV&5u#j_D=P9mI#){2s8@eGGj(?>gooo<%RT14>`VSZ&_l6GlGnan=^bemD56rRN{?
zSAqZD$i;oS9SF6#f5I`#^C<Zl_1nO;w0X9AnJWgj;1j*j9wa}5KIfFRhVgvn8Q25F
zX>&hW@13s_lc3LUl(PWmHcop2{vr^kO`kP(*4!m=3Hn3e#Oc!a2;iDn+FbXzcOHEQ
zbX<Zy_d4fE*T6CF*YPoJ)-?|3IJT*M2v|~cf<AdX%Z~xh*?E9xU`c%NY@HE)qwET}
zjXWv(qQ$)+ZOgLOSAZTj_YS|Q%(cp>Z)u93cj1WA=KS+M>jZ=oYyXq}1?ZdsjsX0A
zkJXCvi~cfO@2ffd7r^;>=SsL-3U%l5HRoEZ#0r<I5G^jMtaMR%O%#<k0ef>%`7%&%
ziLTXJqU*JeXt3H5`AS#h(dpfl+`Ox|)*~QS%h&VO!d#)!>r3U5_YsDi2fY6Sd&vw%

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png b/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
deleted file mode 100755
index c9acc84172dad59708b6b298b310b8d29eeeb671..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7232
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png b/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
deleted file mode 100755
index 3ecd6a800a01b77ec8b53fd2ac2c1ad9be035fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4388
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
VG`ly3;d~;1Y%Cr2-!R7}{u}gUbfEwM

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/card.png b/3rdparty/Sabre/DAV/Browser/assets/icons/card.png
deleted file mode 100755
index 2ce954866d853edb737a7e281de221f7846846f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5695
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png b/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
deleted file mode 100755
index 156fa64fd50f15d9e838326d42d68feba2c23c3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3474
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/file.png b/3rdparty/Sabre/DAV/Browser/assets/icons/file.png
deleted file mode 100755
index 3b98551cec3a863ab120a52cf21debad6cab6748..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2837
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
BY2g3>

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png b/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
deleted file mode 100755
index 156fa64fd50f15d9e838326d42d68feba2c23c3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3474
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

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png b/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
deleted file mode 100755
index f8988f828e61bb1894c3ea5b848f95aac84beaa3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5480
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

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
deleted file mode 100755
index 9a428765e9..0000000000
--- a/3rdparty/Sabre/DAV/Client.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-
-/**
- * SabreDAV DAV client
- *
- * This client wraps around Curl to provide a convenient API to a WebDAV
- * server.
- *
- * NOTE: This class is experimental, it's api will likely change in the future.
- *
- * @package Sabre
- * @subpackage DAVClient
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Client {
-
-    public $propertyMap = array();
-
-    protected $baseUri;
-    protected $userName;
-    protected $password;
-    protected $proxy;
-
-    /**
-     * Basic authentication
-     */
-    const AUTH_BASIC = 1;
-
-    /**
-     * Digest authentication
-     */
-    const AUTH_DIGEST = 2;
-
-    /**
-     * The authentication type we're using.
-     *
-     * This is a bitmask of AUTH_BASIC and AUTH_DIGEST.
-     *
-     * If DIGEST is used, the client makes 1 extra request per request, to get
-     * the authentication tokens.
-     *
-     * @var int
-     */
-    protected $authType;
-
-    /**
-     * Constructor
-     *
-     * Settings are provided through the 'settings' argument. The following
-     * settings are supported:
-     *
-     *   * baseUri
-     *   * userName (optional)
-     *   * password (optional)
-     *   * proxy (optional)
-     *
-     * @param array $settings
-     */
-    public function __construct(array $settings) {
-
-        if (!isset($settings['baseUri'])) {
-            throw new InvalidArgumentException('A baseUri must be provided');
-        }
-
-        $validSettings = array(
-            'baseUri',
-            'userName',
-            'password',
-            'proxy',
-        );
-
-        foreach($validSettings as $validSetting) {
-            if (isset($settings[$validSetting])) {
-                $this->$validSetting = $settings[$validSetting];
-            }
-        }
-
-        if (isset($settings['authType'])) {
-            $this->authType = $settings['authType'];
-        } else {
-            $this->authType = self::AUTH_BASIC | self::AUTH_DIGEST;
-        }
-
-        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
-
-    }
-
-    /**
-     * Does a PROPFIND request
-     *
-     * The list of requested properties must be specified as an array, in clark
-     * notation.
-     *
-     * The returned array will contain a list of filenames as keys, and
-     * properties as values.
-     *
-     * The properties array will contain the list of properties. Only properties
-     * that are actually returned from the server (without error) will be
-     * returned, anything else is discarded.
-     *
-     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
-     * made to the server to also return all child resources.
-     *
-     * @param string $url
-     * @param array $properties
-     * @param int $depth
-     * @return array
-     */
-    public function propFind($url, array $properties, $depth = 0) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
-        $body.= '  <d:prop>' . "\n";
-
-        foreach($properties as $property) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
-
-            if ($namespace === 'DAV:') {
-                $body.='    <d:' . $elementName . ' />' . "\n";
-            } else {
-                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-            }
-
-        }
-
-        $body.= '  </d:prop>' . "\n";
-        $body.= '</d:propfind>';
-
-        $response = $this->request('PROPFIND', $url, $body, array(
-            'Depth' => $depth,
-            'Content-Type' => 'application/xml'
-        ));
-
-        $result = $this->parseMultiStatus($response['body']);
-
-        // If depth was 0, we only return the top item
-        if ($depth===0) {
-            reset($result);
-            $result = current($result);
-            return $result[200];
-        }
-
-        $newResult = array();
-        foreach($result as $href => $statusList) {
-
-            $newResult[$href] = $statusList[200];
-
-        }
-
-        return $newResult;
-
-    }
-
-    /**
-     * Updates a list of properties on the server
-     *
-     * The list of properties must have clark-notation properties for the keys,
-     * and the actual (string) value for the value. If the value is null, an
-     * attempt is made to delete the property.
-     *
-     * @todo Must be building the request using the DOM, and does not yet
-     *       support complex properties.
-     * @param string $url
-     * @param array $properties
-     * @return void
-     */
-    public function propPatch($url, array $properties) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
-
-        foreach($properties as $propName => $propValue) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
-
-            if ($propValue === null) {
-
-                $body.="<d:remove><d:prop>\n";
-
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . ' />' . "\n";
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-                }
-
-                $body.="</d:prop></d:remove>\n";
-
-            } else {
-
-                $body.="<d:set><d:prop>\n";
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . '>';
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
-                }
-                // Shitty.. i know
-                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8');
-                if ($namespace === 'DAV:') {
-                    $body.='</d:' . $elementName . '>' . "\n";
-                } else {
-                    $body.="</x:" . $elementName . ">\n";
-                }
-                $body.="</d:prop></d:set>\n";
-
-            }
-
-        }
-
-        $body.= '</d:propertyupdate>';
-
-        $this->request('PROPPATCH', $url, $body, array(
-            'Content-Type' => 'application/xml'
-        ));
-
-    }
-
-    /**
-     * Performs an HTTP options request
-     *
-     * This method returns all the features from the 'DAV:' header as an array.
-     * If there was no DAV header, or no contents this method will return an
-     * empty array.
-     *
-     * @return array
-     */
-    public function options() {
-
-        $result = $this->request('OPTIONS');
-        if (!isset($result['headers']['dav'])) {
-            return array();
-        }
-
-        $features = explode(',', $result['headers']['dav']);
-        foreach($features as &$v) {
-            $v = trim($v);
-        }
-        return $features;
-
-    }
-
-    /**
-     * Performs an actual HTTP request, and returns the result.
-     *
-     * If the specified url is relative, it will be expanded based on the base
-     * url.
-     *
-     * The returned array contains 3 keys:
-     *   * body - the response body
-     *   * httpCode - a HTTP code (200, 404, etc)
-     *   * headers - a list of response http headers. The header names have
-     *     been lowercased.
-     *
-     * @param string $method
-     * @param string $url
-     * @param string $body
-     * @param array $headers
-     * @return array
-     */
-    public function request($method, $url = '', $body = null, $headers = array()) {
-
-        $url = $this->getAbsoluteUrl($url);
-
-        $curlSettings = array(
-            CURLOPT_RETURNTRANSFER => true,
-            // Return headers as part of the response
-            CURLOPT_HEADER => true,
-            CURLOPT_POSTFIELDS => $body,
-            // Automatically follow redirects
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_MAXREDIRS => 5,
-        );
-
-        switch ($method) {
-            case 'HEAD' :
-
-                // do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD
-                // requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
-                // specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
-                // ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
-                // response body
-                $curlSettings[CURLOPT_NOBODY] = true;
-                $curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
-                break;
-
-            default:
-                $curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
-                break;
-
-        }
-
-        // Adding HTTP headers
-        $nHeaders = array();
-        foreach($headers as $key=>$value) {
-
-            $nHeaders[] = $key . ': ' . $value;
-
-        }
-        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
-
-        if ($this->proxy) {
-            $curlSettings[CURLOPT_PROXY] = $this->proxy;
-        }
-
-        if ($this->userName && $this->authType) {
-            $curlType = 0;
-            if ($this->authType & self::AUTH_BASIC) {
-                $curlType |= CURLAUTH_BASIC;
-            }
-            if ($this->authType & self::AUTH_DIGEST) {
-                $curlType |= CURLAUTH_DIGEST;
-            }
-            $curlSettings[CURLOPT_HTTPAUTH] = $curlType;
-            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
-        }
-
-        list(
-            $response,
-            $curlInfo,
-            $curlErrNo,
-            $curlError
-        ) = $this->curlRequest($url, $curlSettings);
-
-        $headerBlob = substr($response, 0, $curlInfo['header_size']);
-        $response = substr($response, $curlInfo['header_size']);
-
-        // In the case of 100 Continue, or redirects we'll have multiple lists
-        // of headers for each separate HTTP response. We can easily split this
-        // because they are separated by \r\n\r\n
-        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
-
-        // We only care about the last set of headers
-        $headerBlob = $headerBlob[count($headerBlob)-1];
-
-        // Splitting headers
-        $headerBlob = explode("\r\n", $headerBlob);
-
-        $headers = array();
-        foreach($headerBlob as $header) {
-            $parts = explode(':', $header, 2);
-            if (count($parts)==2) {
-                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
-            }
-        }
-
-        $response = array(
-            'body' => $response,
-            'statusCode' => $curlInfo['http_code'],
-            'headers' => $headers
-        );
-
-        if ($curlErrNo) {
-            throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
-        }
-
-        if ($response['statusCode']>=400) {
-            switch ($response['statusCode']) {
-                case 404:
-                    throw new Sabre_DAV_Exception_NotFound('Resource ' . $url . ' not found.');
-                    break;
-
-                default:
-                    throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
-            }
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Wrapper for all curl functions.
-     *
-     * The only reason this was split out in a separate method, is so it
-     * becomes easier to unittest.
-     *
-     * @param string $url
-     * @param array $settings
-     * @return array
-     */
-    protected function curlRequest($url, $settings) {
-
-        $curl = curl_init($url);
-        curl_setopt_array($curl, $settings);
-
-        return array(
-            curl_exec($curl),
-            curl_getinfo($curl),
-            curl_errno($curl),
-            curl_error($curl)
-        );
-
-    }
-
-    /**
-     * Returns the full url based on the given url (which may be relative). All
-     * urls are expanded based on the base url as given by the server.
-     *
-     * @param string $url
-     * @return string
-     */
-    protected function getAbsoluteUrl($url) {
-
-        // If the url starts with http:// or https://, the url is already absolute.
-        if (preg_match('/^http(s?):\/\//', $url)) {
-            return $url;
-        }
-
-        // If the url starts with a slash, we must calculate the url based off
-        // the root of the base url.
-        if (strpos($url,'/') === 0) {
-            $parts = parse_url($this->baseUri);
-            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
-        }
-
-        // Otherwise...
-        return $this->baseUri . $url;
-
-    }
-
-    /**
-     * Parses a WebDAV multistatus response body
-     *
-     * This method returns an array with the following structure
-     *
-     * array(
-     *   'url/to/resource' => array(
-     *     '200' => array(
-     *        '{DAV:}property1' => 'value1',
-     *        '{DAV:}property2' => 'value2',
-     *     ),
-     *     '404' => array(
-     *        '{DAV:}property1' => null,
-     *        '{DAV:}property2' => null,
-     *     ),
-     *   )
-     *   'url/to/resource2' => array(
-     *      .. etc ..
-     *   )
-     * )
-     *
-     *
-     * @param string $body xml body
-     * @return array
-     */
-    public function parseMultiStatus($body) {
-
-        $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
-
-        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
-        if ($responseXML===false) {
-            throw new InvalidArgumentException('The passed data is not valid XML');
-        }
-
-        $responseXML->registerXPathNamespace('d', 'urn:DAV');
-
-        $propResult = array();
-
-        foreach($responseXML->xpath('d:response') as $response) {
-            $response->registerXPathNamespace('d', 'urn:DAV');
-            $href = $response->xpath('d:href');
-            $href = (string)$href[0];
-
-            $properties = array();
-
-            foreach($response->xpath('d:propstat') as $propStat) {
-
-                $propStat->registerXPathNamespace('d', 'urn:DAV');
-                $status = $propStat->xpath('d:status');
-                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
-
-                $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap);
-
-            }
-
-            $propResult[$href] = $properties;
-
-        }
-
-        return $propResult;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Collection.php b/3rdparty/Sabre/DAV/Collection.php
deleted file mode 100755
index 776c22531b..0000000000
--- a/3rdparty/Sabre/DAV/Collection.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Collection class
- *
- * This is a helper class, that should aid in getting collections classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-
-            if ($child->getName()==$name) return $child;
-
-        }
-        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name);
-
-    }
-
-    /**
-     * Checks is a child-node exists.
-     *
-     * It is generally a good idea to try and override this. Usually it can be optimized.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-
-            $this->getChild($name);
-            return true;
-
-        } catch(Sabre_DAV_Exception_NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Directory.php b/3rdparty/Sabre/DAV/Directory.php
deleted file mode 100755
index 6db8febc02..0000000000
--- a/3rdparty/Sabre/DAV/Directory.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * This class is now deprecated in favor of the Sabre_DAV_Collection class.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated Use Sabre_DAV_Collection instead
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Directory extends Sabre_DAV_Collection {
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
deleted file mode 100755
index a2cd6cf582..0000000000
--- a/3rdparty/Sabre/DAV/Exception.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * SabreDAV base exception
- *
- * This is SabreDAV's base exception file, use this to implement your own exception.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-/**
- * Main Exception class.
- *
- * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occurred.
- * The default for this is 500.
- *
- * This class also allows you to generate custom xml data for your exceptions. This will be displayed
- * in the 'error' element in the failing response.
- */
-class Sabre_DAV_Exception extends Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 500;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return array
-     */
-    public function getHTTPHeaders(Sabre_DAV_Server $server) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/BadRequest.php b/3rdparty/Sabre/DAV/Exception/BadRequest.php
deleted file mode 100755
index b198648a75..0000000000
--- a/3rdparty/Sabre/DAV/Exception/BadRequest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * BadRequest
- *
- * The BadRequest is thrown when the user submitted an invalid HTTP request
- * BadRequest
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 400;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/Conflict.php b/3rdparty/Sabre/DAV/Exception/Conflict.php
deleted file mode 100755
index 6b0bd1fad7..0000000000
--- a/3rdparty/Sabre/DAV/Exception/Conflict.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Conflict
- *
- * A 409 Conflict is thrown when a user tried to make a directory over an existing
- * file or in a parent directory that doesn't exist.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 409;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
deleted file mode 100755
index 6121868e69..0000000000
--- a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * ConflictingLock
- *
- * Similar to Exception_Locked, this exception thrown when a LOCK request
- * was made, on a resource which was already locked
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/FileNotFound.php b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
deleted file mode 100755
index d76e400c93..0000000000
--- a/3rdparty/Sabre/DAV/Exception/FileNotFound.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * FileNotFound
- *
- * Deprecated: Warning, this class is deprecated and will be removed in a 
- * future version of SabreDAV. Please use Sabre_DAV_Exception_NotFound instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @deprecated Use Sabre_DAV_Exception_NotFound instead
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception_NotFound {
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/Forbidden.php b/3rdparty/Sabre/DAV/Exception/Forbidden.php
deleted file mode 100755
index 20b1056e31..0000000000
--- a/3rdparty/Sabre/DAV/Exception/Forbidden.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Forbidden
- *
- * This exception is thrown whenever a user tries to do an operation he's not allowed to
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 403;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
deleted file mode 100755
index 1a15089b0a..0000000000
--- a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * InsufficientStorage
- *
- * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 507;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
deleted file mode 100755
index 2230f1d081..0000000000
--- a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * InvalidResourceType
- *
- * This exception is thrown when the user tried to create a new collection, with
- * a special resourcetype value that was not recognized by the server.
- *
- * See RFC5689 section 3.3
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
deleted file mode 100755
index 80ab7aff65..0000000000
--- a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * LockTokenMatchesRequestUri
- *
- * This exception is thrown by UNLOCK if a supplied lock-token is invalid
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
-
-    /**
-     * Creates the exception
-     */
-    public function __construct() {
-
-        $this->message = 'The locktoken supplied does not match any locks on this entity';
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/Locked.php b/3rdparty/Sabre/DAV/Exception/Locked.php
deleted file mode 100755
index 976365ac1f..0000000000
--- a/3rdparty/Sabre/DAV/Exception/Locked.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Locked
- *
- * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
-
-    /**
-     * Lock information
-     *
-     * @var Sabre_DAV_Locks_LockInfo
-     */
-    protected $lock;
-
-    /**
-     * Creates the exception
-     *
-     * A LockInfo object should be passed if the user should be informed
-     * which lock actually has the file locked.
-     *
-     * @param Sabre_DAV_Locks_LockInfo $lock
-     */
-    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
-
-        $this->lock = $lock;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 423;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
deleted file mode 100755
index 3187575150..0000000000
--- a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * MethodNotAllowed
- *
- * The 405 is thrown when a client tried to create a directory on an already existing directory
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 405;
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return array
-     */
-    public function getHTTPHeaders(Sabre_DAV_Server $server) {
-
-        $methods = $server->getAllowedMethods($server->getRequestUri());
-
-        return array(
-            'Allow' => strtoupper(implode(', ',$methods)),
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
deleted file mode 100755
index 87ca624429..0000000000
--- a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * NotAuthenticated
- *
- * This exception is thrown when the client did not provide valid
- * authentication credentials.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 401;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/NotFound.php b/3rdparty/Sabre/DAV/Exception/NotFound.php
deleted file mode 100755
index 2b9da560d2..0000000000
--- a/3rdparty/Sabre/DAV/Exception/NotFound.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * NotFound
- *
- * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotFound extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 404;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/NotImplemented.php b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
deleted file mode 100755
index d017a19f55..0000000000
--- a/3rdparty/Sabre/DAV/Exception/NotImplemented.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * NotImplemented
- *
- * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 501;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/PaymentRequired.php b/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
deleted file mode 100755
index 4982f45a4b..0000000000
--- a/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Payment Required
- *
- * The PaymentRequired exception may be thrown in a case where a user must pay
- * to access a certain resource or operation.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_PaymentRequired extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 402;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
deleted file mode 100755
index 213e9c5231..0000000000
--- a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * PreconditionFailed
- *
- * This exception is normally thrown when a client submitted a conditional request,
- * like for example an If, If-None-Match or If-Match header, which caused the HTTP
- * request to not execute (the condition of the header failed)
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
-
-    /**
-     * When this exception is thrown, the header-name might be set.
-     *
-     * This allows the exception-catching code to determine which HTTP header
-     * caused the exception.
-     *
-     * @var string
-     */
-    public $header = null;
-
-    /**
-     * Create the exception
-     *
-     * @param string $message
-     * @param string $header
-     */
-    public function __construct($message, $header=null) {
-
-        parent::__construct($message);
-        $this->header = $header;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 412;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        if ($this->header) {
-            $prop = $errorNode->ownerDocument->createElement('s:header');
-            $prop->nodeValue = $this->header;
-            $errorNode->appendChild($prop);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
deleted file mode 100755
index e86800f303..0000000000
--- a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * ReportNotImplemented
- *
- * This exception is thrown when the client requested an unknown report through the REPORT method
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
deleted file mode 100755
index 29ee3654a7..0000000000
--- a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * RequestedRangeNotSatisfiable
- *
- * This exception is normally thrown when the user
- * request a range that is out of the entity bounds.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
-
-    /**
-     * returns the http statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 416;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
deleted file mode 100755
index 9a4693b21a..0000000000
--- a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * UnSupportedMediaType
- *
- * The 415 Unsupported Media Type status code is generally sent back when the client
- * tried to call an HTTP method, with a body the server didn't understand
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception {
-
-    /**
-     * returns the http statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 415;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/FS/Directory.php b/3rdparty/Sabre/DAV/FS/Directory.php
deleted file mode 100755
index 3af2d75558..0000000000
--- a/3rdparty/Sabre/DAV/FS/Directory.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
-
-        if (is_dir($path)) {
-
-            return new Sabre_DAV_FS_Directory($path);
-
-        } else {
-
-            return new Sabre_DAV_FS_File($path);
-
-        }
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Checks if a child exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself
-     *
-     * @return void
-     */
-    public function delete() {
-
-        foreach($this->getChildren() as $child) $child->delete();
-        rmdir($this->path);
-
-    }
-
-    /**
-     * Returns available diskspace information
-     *
-     * @return array
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            );
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FS/File.php b/3rdparty/Sabre/DAV/FS/File.php
deleted file mode 100755
index 6a8039fe30..0000000000
--- a/3rdparty/Sabre/DAV/FS/File.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return string
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return void
-     */
-    public function delete() {
-
-        unlink($this->path);
-
-    }
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return mixed
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return mixed
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FS/Node.php b/3rdparty/Sabre/DAV/FS/Node.php
deleted file mode 100755
index 1283e9d0fd..0000000000
--- a/3rdparty/Sabre/DAV/FS/Node.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * Base node-class
- *
- * The node class implements the method used by both the File and the Directory classes
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
-
-    /**
-     * The path to the current node
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Sets up the node, expects a full path name
-     *
-     * @param string $path
-     */
-    public function __construct($path) {
-
-        $this->path = $path;
-
-    }
-
-
-
-    /**
-     * Returns the name of the node
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
-        return $name;
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
-        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
-
-        $newPath = $parentPath . '/' . $newName;
-        rename($this->path,$newPath);
-
-        $this->path = $newPath;
-
-    }
-
-
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return filemtime($this->path);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/Directory.php b/3rdparty/Sabre/DAV/FSExt/Directory.php
deleted file mode 100755
index 540057183b..0000000000
--- a/3rdparty/Sabre/DAV/FSExt/Directory.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-        return '"' . md5_file($newPath) . '"';
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File could not be located');
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-
-        if (is_dir($path)) {
-
-            return new Sabre_DAV_FSExt_Directory($path);
-
-        } else {
-
-            return new Sabre_DAV_FSExt_File($path);
-
-        }
-
-    }
-
-    /**
-     * Checks if a child exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        if ($name=='.' || $name=='..')
-            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself
-     *
-     * @return bool
-     */
-    public function delete() {
-
-        // Deleting all children
-        foreach($this->getChildren() as $child) $child->delete();
-
-        // Removing resource info, if its still around
-        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
-
-        // Removing the directory itself
-        rmdir($this->path);
-
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns available diskspace information
-     *
-     * @return array
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            );
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/File.php b/3rdparty/Sabre/DAV/FSExt/File.php
deleted file mode 100755
index b93ce5aee2..0000000000
--- a/3rdparty/Sabre/DAV/FSExt/File.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-        return '"' . md5_file($this->path) . '"';
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return string
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return bool
-     */
-    public function delete() {
-
-        unlink($this->path);
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag() {
-
-        return '"' . md5_file($this->path). '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/Node.php b/3rdparty/Sabre/DAV/FSExt/Node.php
deleted file mode 100755
index 68ca06beb7..0000000000
--- a/3rdparty/Sabre/DAV/FSExt/Node.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/**
- * Base node-class
- *
- * The node class implements the method used by both the File and the Directory classes
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_IProperties {
-
-    /**
-     * Updates properties on this node,
-     *
-     * @param array $properties
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        foreach($properties as $propertyName=>$propertyValue) {
-
-            // If it was null, we need to delete the property
-            if (is_null($propertyValue)) {
-                if (isset($resourceData['properties'][$propertyName])) {
-                    unset($resourceData['properties'][$propertyName]);
-                }
-            } else {
-                $resourceData['properties'][$propertyName] = $propertyValue;
-            }
-
-        }
-
-        $this->putResourceData($resourceData);
-        return true;
-    }
-
-    /**
-     * Returns a list of properties for this nodes.;
-     *
-     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
-     * If the array is empty, all properties should be returned
-     *
-     * @param array $properties
-     * @return array
-     */
-    function getProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        // if the array was empty, we need to return everything
-        if (!$properties) return $resourceData['properties'];
-
-        $props = array();
-        foreach($properties as $property) {
-            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
-        }
-
-        return $props;
-
-    }
-
-    /**
-     * Returns the path to the resource file
-     *
-     * @return string
-     */
-    protected function getResourceInfoPath() {
-
-        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
-        return $parentDir . '/.sabredav';
-
-    }
-
-    /**
-     * Returns all the stored resource information
-     *
-     * @return array
-     */
-    protected function getResourceData() {
-
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return array('properties' => array());
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!isset($data[$this->getName()])) {
-            return array('properties' => array());
-        }
-
-        $data = $data[$this->getName()];
-        if (!isset($data['properties'])) $data['properties'] = array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the resource information
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putResourceData(array $newData) {
-
-        $path = $this->getResourceInfoPath();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        $data[$this->getName()] = $newData;
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
-        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
-        $newPath = $parentPath . '/' . $newName;
-
-        // We're deleting the existing resourcedata, and recreating it
-        // for the new path.
-        $resourceData = $this->getResourceData();
-        $this->deleteResourceData();
-
-        rename($this->path,$newPath);
-        $this->path = $newPath;
-        $this->putResourceData($resourceData);
-
-
-    }
-
-    /**
-     * @return bool
-     */
-    public function deleteResourceData() {
-
-        // When we're deleting this node, we also need to delete any resource information
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return true;
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
-        ftruncate($handle,0);
-        rewind($handle);
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-        return true;
-    }
-
-    public function delete() {
-
-        return $this->deleteResourceData();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/File.php b/3rdparty/Sabre/DAV/File.php
deleted file mode 100755
index 3126bd8d36..0000000000
--- a/3rdparty/Sabre/DAV/File.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * This is a helper class, that should aid in getting file classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return 0;
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ICollection.php b/3rdparty/Sabre/DAV/ICollection.php
deleted file mode 100755
index 4626038a66..0000000000
--- a/3rdparty/Sabre/DAV/ICollection.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * The ICollection Interface
- *
- * This interface should be implemented by each class that represents a collection
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    function createFile($name, $data = null);
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    function createDirectory($name);
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @return Sabre_DAV_INode
-     */
-    function getChild($name);
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre_DAV_INode[]
-     */
-    function getChildren();
-
-    /**
-     * Checks if a child-node with the specified name exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    function childExists($name);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IExtendedCollection.php b/3rdparty/Sabre/DAV/IExtendedCollection.php
deleted file mode 100755
index 6ec345f9a6..0000000000
--- a/3rdparty/Sabre/DAV/IExtendedCollection.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * The IExtendedCollection interface.
- *
- * This interface can be used to create special-type of collection-resources
- * as defined by RFC 5689.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
-
-    /**
-     * Creates a new collection
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    function createExtendedCollection($name, array $resourceType, array $properties);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IFile.php b/3rdparty/Sabre/DAV/IFile.php
deleted file mode 100755
index 478f822ae7..0000000000
--- a/3rdparty/Sabre/DAV/IFile.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * This interface represents a file in the directory tree
- *
- * A file is a bit of a broad definition. In general it implies that on
- * this specific node a PUT or GET method may be performed, to either update,
- * or retrieve the contents of the file.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IFile extends Sabre_DAV_INode {
-
-    /**
-     * Updates the data
-     *
-     * The data argument is a readable stream resource.
-     *
-     * After a succesful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * If you don't plan to store the file byte-by-byte, and you return a
-     * different object on a subsequent GET you are strongly recommended to not
-     * return an ETag, and just return null.
-     *
-     * @param resource $data
-     * @return string|null
-     */
-    function put($data);
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    function get();
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return void
-     */
-    function getContentType();
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return void
-     */
-    function getETag();
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    function getSize();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/INode.php b/3rdparty/Sabre/DAV/INode.php
deleted file mode 100755
index c57d392310..0000000000
--- a/3rdparty/Sabre/DAV/INode.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * The INode interface is the base interface, and the parent class of both ICollection and IFile
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_INode {
-
-    /**
-     * Deleted the current node
-     *
-     * @return void
-     */
-    function delete();
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    function getName();
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    function setName($name);
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    function getLastModified();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IProperties.php b/3rdparty/Sabre/DAV/IProperties.php
deleted file mode 100755
index 38eaab16da..0000000000
--- a/3rdparty/Sabre/DAV/IProperties.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * IProperties interface
- *
- * Implement this interface to support custom WebDAV properties requested and sent from clients.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations
-     * @return bool|array
-     */
-    function updateProperties($mutations);
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties
-     * @return void
-     */
-    function getProperties($properties);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IQuota.php b/3rdparty/Sabre/DAV/IQuota.php
deleted file mode 100755
index 3fe4c4eced..0000000000
--- a/3rdparty/Sabre/DAV/IQuota.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * IQuota interface
- *
- * Implement this interface to add the ability to return quota information. The ObjectTree
- * will check for quota information on any given node. If the information is not available it will
- * attempt to fetch the information from the root node.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
-
-    /**
-     * Returns the quota information
-     *
-     * This method MUST return an array with 2 values, the first being the total used space,
-     * the second the available space (in bytes)
-     */
-    function getQuotaInfo();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
deleted file mode 100755
index 127e643a2b..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This is an alternative approach to doing this on a per-node basis
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    abstract function getLocks($uri, $returnChildLocks);
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
deleted file mode 100755
index 02cab87fc8..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/FS.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/**
- * This Lock Backend stores all its data in the filesystem in separate file per
- * node.
- *
- * This Lock Manager is now deprecated. It has a bug that allows parent
- * collections to be deletes when children deeper in the tree are locked.
- *
- * This also means that using this backend means you will not pass the Neon
- * Litmus test.
- *
- * You are recommended to use either the PDO or the File backend instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The default data directory
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    public function __construct($dataDir) {
-
-        $this->dataDir = $dataDir;
-
-    }
-
-    protected function getFileNameForUri($uri) {
-
-        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
-
-    }
-
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $lockList = array();
-        $currentPath = '';
-
-        foreach(explode('/',$uri) as $uriPart) {
-
-            // weird algorithm that can probably be improved, but we're traversing the path top down
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$uriPart;
-
-            $uriLocks = $this->getData($currentPath);
-
-            foreach($uriLocks as $uriLock) {
-
-                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
-                if($uri==$currentPath || $uriLock->depth!=0) {
-                    $uriLock->uri = $currentPath;
-                    $lockList[] = $uriLock;
-                }
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($lockList as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]);
-        }
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-            if ($lock->token == $lockInfo->token) unset($locks[$k]);
-        }
-        $locks[] = $lockInfo;
-        $this->putData($uri,$locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($uri,$locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns the stored data for a uri
-     *
-     * @param string $uri
-     * @return array
-     */
-    protected function getData($uri) {
-
-        $path = $this->getFilenameForUri($uri);
-        if (!file_exists($path)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the lock information
-     *
-     * @param string $uri
-     * @param array $newData
-     * @return void
-     */
-    protected function putData($uri,array $newData) {
-
-        $path = $this->getFileNameForUri($uri);
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php
deleted file mode 100755
index c33f963514..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/File.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a single file.
- *
- * Note that this is not nearly as robust as a database, you are encouraged
- * to use the PDO backend instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The storage file
-     *
-     * @var string
-     */
-    private $locksFile;
-
-    /**
-     * Constructor
-     *
-     * @param string $locksFile path to file
-     */
-    public function __construct($locksFile) {
-
-        $this->locksFile = $locksFile;
-
-    }
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $newLocks = array();
-
-        $locks = $this->getData();
-
-        foreach($locks as $lock) {
-
-            if ($lock->uri === $uri ||
-                //deep locks on parents
-                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
-
-                // locks on children
-                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
-
-                $newLocks[] = $lock;
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($newLocks as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
-        }
-        return $newLocks;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getData();
-
-        foreach($locks as $k=>$lock) {
-            if (
-                ($lock->token == $lockInfo->token) ||
-                (time() > $lock->timeout + $lock->created)
-            ) {
-                unset($locks[$k]);
-            }
-        }
-        $locks[] = $lockInfo;
-        $this->putData($locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $locks = $this->getData();
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Loads the lockdata from the filesystem.
-     *
-     * @return array
-     */
-    protected function getData() {
-
-        if (!file_exists($this->locksFile)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($this->locksFile,'r');
-        flock($handle,LOCK_SH);
-
-        // Reading data until the eof
-        $data = stream_get_contents($handle);
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Saves the lockdata
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putData(array $newData) {
-
-        // opening up the file, and creating an exclusive lock
-        $handle = fopen($this->locksFile,'a+');
-        flock($handle,LOCK_EX);
-
-        // We can only truncate and rewind once the lock is acquired.
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
deleted file mode 100755
index acce80638e..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a database. You must pass a PDO
- * connection object in the constructor.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The PDO connection object
-     *
-     * @var pdo
-     */
-    private $pdo;
-
-    /**
-     * The PDO tablename this backend uses.
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * Constructor
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     */
-    public function __construct(PDO $pdo, $tableName = 'locks') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        // NOTE: the following 10 lines or so could be easily replaced by
-        // pure sql. MySQL's non-standard string concatenation prevents us
-        // from doing this though.
-        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM '.$this->tableName.' WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
-        $params = array(time(),$uri);
-
-        // We need to check locks for every part in the uri.
-        $uriParts = explode('/',$uri);
-
-        // We already covered the last part of the uri
-        array_pop($uriParts);
-
-        $currentPath='';
-
-        foreach($uriParts as $part) {
-
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$part;
-
-            $query.=' OR (depth!=0 AND uri = ?)';
-            $params[] = $currentPath;
-
-        }
-
-        if ($returnChildLocks) {
-
-            $query.=' OR (uri LIKE ?)';
-            $params[] = $uri . '/%';
-
-        }
-        $query.=')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($params);
-        $result = $stmt->fetchAll();
-
-        $lockList = array();
-        foreach($result as $row) {
-
-            $lockInfo = new Sabre_DAV_Locks_LockInfo();
-            $lockInfo->owner = $row['owner'];
-            $lockInfo->token = $row['token'];
-            $lockInfo->timeout = $row['timeout'];
-            $lockInfo->created = $row['created'];
-            $lockInfo->scope = $row['scope'];
-            $lockInfo->depth = $row['depth'];
-            $lockInfo->uri   = $row['uri'];
-            $lockList[] = $lockInfo;
-
-        }
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 30*60;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getLocks($uri,false);
-        $exists = false;
-        foreach($locks as $lock) {
-            if ($lock->token == $lockInfo->token) $exists = true;
-        }
-
-        if ($exists) {
-            $stmt = $this->pdo->prepare('UPDATE '.$this->tableName.' SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        } else {
-            $stmt = $this->pdo->prepare('INSERT INTO '.$this->tableName.' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        }
-
-        return true;
-
-    }
-
-
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->tableName.' WHERE uri = ? AND token = ?');
-        $stmt->execute(array($uri,$lockInfo->token));
-
-        return $stmt->rowCount()===1;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php
deleted file mode 100755
index 9df014a428..0000000000
--- a/3rdparty/Sabre/DAV/Locks/LockInfo.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * LockInfo class
- *
- * An object of the LockInfo class holds all the information relevant to a
- * single lock.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_LockInfo {
-
-    /**
-     * A shared lock
-     */
-    const SHARED = 1;
-
-    /**
-     * An exclusive lock
-     */
-    const EXCLUSIVE = 2;
-
-    /**
-     * A never expiring timeout
-     */
-    const TIMEOUT_INFINITE = -1;
-
-    /**
-     * The owner of the lock
-     *
-     * @var string
-     */
-    public $owner;
-
-    /**
-     * The locktoken
-     *
-     * @var string
-     */
-    public $token;
-
-    /**
-     * How long till the lock is expiring
-     *
-     * @var int
-     */
-    public $timeout;
-
-    /**
-     * UNIX Timestamp of when this lock was created
-     *
-     * @var int
-     */
-    public $created;
-
-    /**
-     * Exclusive or shared lock
-     *
-     * @var int
-     */
-    public $scope = self::EXCLUSIVE;
-
-    /**
-     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
-     */
-    public $depth = 0;
-
-    /**
-     * The uri this lock locks
-     *
-     * TODO: This value is not always set
-     * @var mixed
-     */
-    public $uri;
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php
deleted file mode 100755
index fd956950b8..0000000000
--- a/3rdparty/Sabre/DAV/Locks/Plugin.php
+++ /dev/null
@@ -1,633 +0,0 @@
-<?php
-
-/**
- * Locking plugin
- *
- * This plugin provides locking support to a WebDAV server.
- * The easiest way to get started, is by hooking it up as such:
- *
- * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
- * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
- * $server->addPlugin($lockPlugin);
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * locksBackend
-     *
-     * @var Sabre_DAV_Locks_Backend_Abstract
-     */
-    private $locksBackend;
-
-    /**
-     * server
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * __construct
-     *
-     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend
-     */
-    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
-
-        $this->locksBackend = $locksBackend;
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'locks';
-
-    }
-
-    /**
-     * This method is called by the Server if the user used an HTTP method
-     * the server didn't recognize.
-     *
-     * This plugin intercepts the LOCK and UNLOCK methods.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'LOCK'   : $this->httpLock($uri); return false;
-            case 'UNLOCK' : $this->httpUnlock($uri); return false;
-
-        }
-
-    }
-
-    /**
-     * This method is called after most properties have been found
-     * it allows us to add in any Lock-related properties
-     *
-     * @param string $path
-     * @param array $newProperties
-     * @return bool
-     */
-    public function afterGetProperties($path, &$newProperties) {
-
-        foreach($newProperties[404] as $propName=>$discard) {
-
-            switch($propName) {
-
-                case '{DAV:}supportedlock' :
-                    $val = false;
-                    if ($this->locksBackend) $val = true;
-                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
-                    unset($newProperties[404][$propName]);
-                    break;
-
-                case '{DAV:}lockdiscovery' :
-                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
-                    unset($newProperties[404][$propName]);
-                    break;
-
-            }
-
-
-        }
-        return true;
-
-    }
-
-
-    /**
-     * This method is called before the logic for any HTTP method is
-     * handled.
-     *
-     * This plugin uses that feature to intercept access to locked resources.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'DELETE' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock, true))
-                    throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'MKCOL' :
-            case 'PROPPATCH' :
-            case 'PUT' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock))
-                    throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'MOVE' :
-                $lastLock = null;
-                if (!$this->validateLock(array(
-                      $uri,
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                    ),$lastLock, true))
-                        throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'COPY' :
-                $lastLock = null;
-                if (!$this->validateLock(
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                      $lastLock, true))
-                        throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        if ($this->locksBackend)
-            return array('LOCK','UNLOCK');
-
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * In this case this is only the number 2. The 2 in the Dav: header
-     * indicates the server supports locks.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array(2);
-
-    }
-
-    /**
-     * Returns all lock information on a particular uri
-     *
-     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
-     *
-     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
-     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
-     * for any possible locks and return those as well.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks = false) {
-
-        $lockList = array();
-
-        if ($this->locksBackend)
-            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks an uri
-     *
-     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
-     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
-     * of lock (shared or exclusive) and the owner of the lock
-     *
-     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
-     *
-     * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpLock($uri) {
-
-        $lastLock = null;
-        if (!$this->validateLock($uri,$lastLock)) {
-
-            // If the existing lock was an exclusive lock, we need to fail
-            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
-                //var_dump($lastLock);
-                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
-            }
-
-        }
-
-        if ($body = $this->server->httpRequest->getBody(true)) {
-            // This is a new lock request
-            $lockInfo = $this->parseLockRequest($body);
-            $lockInfo->depth = $this->server->getHTTPDepth();
-            $lockInfo->uri = $uri;
-            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
-
-        } elseif ($lastLock) {
-
-            // This must have been a lock refresh
-            $lockInfo = $lastLock;
-
-            // The resource could have been locked through another uri.
-            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
-
-        } else {
-
-            // There was neither a lock refresh nor a new lock request
-            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
-
-        }
-
-        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
-
-        $newFile = false;
-
-        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
-        try {
-            $this->server->tree->getNodeForPath($uri);
-
-            // We need to call the beforeWriteContent event for RFC3744
-            $this->server->broadcastEvent('beforeWriteContent',array($uri));
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            // It didn't, lets create it
-            $this->server->createFile($uri,fopen('php://memory','r'));
-            $newFile = true;
-
-        }
-
-        $this->lockNode($uri,$lockInfo);
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
-        $this->server->httpResponse->sendStatus($newFile?201:200);
-        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
-     * The server should return 204 (No content) on success
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpUnlock($uri) {
-
-        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
-
-        // If the locktoken header is not supplied, we need to throw a bad request exception
-        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
-
-        $locks = $this->getLocks($uri);
-
-        // Windows sometimes forgets to include < and > in the Lock-Token
-        // header
-        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
-
-        foreach($locks as $lock) {
-
-            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
-
-                $this->unlockNode($uri,$lock);
-                $this->server->httpResponse->setHeader('Content-Length','0');
-                $this->server->httpResponse->sendStatus(204);
-                return;
-
-            }
-
-        }
-
-        // If we got here, it means the locktoken was invalid
-        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
-     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
-
-        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
-        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
-
-    }
-
-
-    /**
-     * Returns the contents of the HTTP Timeout header.
-     *
-     * The method formats the header into an integer.
-     *
-     * @return int
-     */
-    public function getTimeoutHeader() {
-
-        $header = $this->server->httpRequest->getHeader('Timeout');
-
-        if ($header) {
-
-            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
-            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
-            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
-
-        } else {
-
-            $header = 0;
-
-        }
-
-        return $header;
-
-    }
-
-    /**
-     * Generates the response for successful LOCK requests
-     *
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo
-     * @return string
-     */
-    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-
-        $prop = $dom->createElementNS('DAV:','d:prop');
-        $dom->appendChild($prop);
-
-        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
-        $prop->appendChild($lockDiscovery);
-
-        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
-        $lockObj->serialize($this->server,$lockDiscovery);
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * validateLock should be called when a write operation is about to happen
-     * It will check if the requested url is locked, and see if the correct lock tokens are passed
-     *
-     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
-     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
-     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
-     * @return bool
-     */
-    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
-
-        if (is_null($urls)) {
-            $urls = array($this->server->getRequestUri());
-        } elseif (is_string($urls)) {
-            $urls = array($urls);
-        } elseif (!is_array($urls)) {
-            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
-        }
-
-        $conditions = $this->getIfConditions();
-
-        // We're going to loop through the urls and make sure all lock conditions are satisfied
-        foreach($urls as $url) {
-
-            $locks = $this->getLocks($url, $checkChildLocks);
-
-            // If there were no conditions, but there were locks, we fail
-            if (!$conditions && $locks) {
-                reset($locks);
-                $lastLock = current($locks);
-                return false;
-            }
-
-            // If there were no locks or conditions, we go to the next url
-            if (!$locks && !$conditions) continue;
-
-            foreach($conditions as $condition) {
-
-                if (!$condition['uri']) {
-                    $conditionUri = $this->server->getRequestUri();
-                } else {
-                    $conditionUri = $this->server->calculateUri($condition['uri']);
-                }
-
-                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
-                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
-
-                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
-                // At least 1 condition has to be satisfied
-                foreach($condition['tokens'] as $conditionToken) {
-
-                    $etagValid = true;
-                    $lockValid  = true;
-
-                    // key 2 can contain an etag
-                    if ($conditionToken[2]) {
-
-                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
-                        $node = $this->server->tree->getNodeForPath($uri);
-                        $etagValid = $node->getETag()==$conditionToken[2];
-
-                    }
-
-                    // key 1 can contain a lock token
-                    if ($conditionToken[1]) {
-
-                        $lockValid = false;
-                        // Match all the locks
-                        foreach($locks as $lockIndex=>$lock) {
-
-                            $lockToken = 'opaquelocktoken:' . $lock->token;
-
-                            // Checking NOT
-                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
-
-                                // Condition valid, onto the next
-                                $lockValid = true;
-                                break;
-                            }
-                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
-
-                                $lastLock = $lock;
-                                // Condition valid and lock matched
-                                unset($locks[$lockIndex]);
-                                $lockValid = true;
-                                break;
-
-                            }
-
-                        }
-
-                    }
-
-                    // If, after checking both etags and locks they are stil valid,
-                    // we can continue with the next condition.
-                    if ($etagValid && $lockValid) continue 2;
-               }
-               // No conditions matched, so we fail
-               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
-            }
-
-            // Conditions were met, we'll also need to check if all the locks are gone
-            if (count($locks)) {
-
-                reset($locks);
-
-                // There's still locks, we fail
-                $lastLock = current($locks);
-                return false;
-
-            }
-
-
-        }
-
-        // We got here, this means every condition was satisfied
-        return true;
-
-    }
-
-    /**
-     * This method is created to extract information from the WebDAV HTTP 'If:' header
-     *
-     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
-     * The function will return an array, containing structs with the following keys
-     *
-     *   * uri   - the uri the condition applies to. If this is returned as an
-     *     empty string, this implies it's referring to the request url.
-     *   * tokens - The lock token. another 2 dimensional array containing 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
-     *   * etag - an etag, if supplied
-     *
-     * @return array
-     */
-    public function getIfConditions() {
-
-        $header = $this->server->httpRequest->getHeader('If');
-        if (!$header) return array();
-
-        $matches = array();
-
-        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
-        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
-
-        $conditions = array();
-
-        foreach($matches as $match) {
-
-            $condition = array(
-                'uri'   => $match['uri'],
-                'tokens' => array(
-                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
-                ),
-            );
-
-            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
-                $match['not']?0:1,
-                $match['token'],
-                isset($match['etag'])?$match['etag']:''
-            );
-            else {
-                $conditions[] = $condition;
-            }
-
-        }
-
-        return $conditions;
-
-    }
-
-    /**
-     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object
-     *
-     * @param string $body
-     * @return Sabre_DAV_Locks_LockInfo
-     */
-    protected function parseLockRequest($body) {
-
-        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
-        $xml->registerXPathNamespace('d','DAV:');
-        $lockInfo = new Sabre_DAV_Locks_LockInfo();
-
-        $children = $xml->children("DAV:");
-        $lockInfo->owner = (string)$children->owner;
-
-        $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
-        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
-
-        return $lockInfo;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Mount/Plugin.php b/3rdparty/Sabre/DAV/Mount/Plugin.php
deleted file mode 100755
index b37a90ae99..0000000000
--- a/3rdparty/Sabre/DAV/Mount/Plugin.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * This plugin provides support for RFC4709: Mounting WebDAV servers
- *
- * Simply append ?mount to any collection to generate the davmount response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- */
-class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handles
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?mount
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='mount') return;
-
-        $currentUri = $this->server->httpRequest->getAbsoluteUri();
-
-        // Stripping off everything after the ?
-        list($currentUri) = explode('?',$currentUri);
-
-        $this->davMount($currentUri);
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Generates the davmount response
-     *
-     * @param string $uri absolute uri
-     * @return void
-     */
-    public function davMount($uri) {
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
-        ob_start();
-        echo '<?xml version="1.0"?>', "\n";
-        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
-        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
-        echo "</dm:mount>";
-        $this->server->httpResponse->sendBody(ob_get_clean());
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Node.php b/3rdparty/Sabre/DAV/Node.php
deleted file mode 100755
index 070b7176af..0000000000
--- a/3rdparty/Sabre/DAV/Node.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Node class
- *
- * This is a helper class, that should aid in getting nodes setup.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
-
-    /**
-     * Returns the last modification time
-     *
-     * In this case, it will simply return the current time
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return time();
-
-    }
-
-    /**
-     * Deleted the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ObjectTree.php b/3rdparty/Sabre/DAV/ObjectTree.php
deleted file mode 100755
index bce5146390..0000000000
--- a/3rdparty/Sabre/DAV/ObjectTree.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * ObjectTree class
- *
- * This implementation of the Tree class makes use of the INode, IFile and ICollection API's
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
-
-    /**
-     * The root node
-     *
-     * @var Sabre_DAV_ICollection
-     */
-    protected $rootNode;
-
-    /**
-     * This is the node cache. Accessed nodes are stored here
-     *
-     * @var array
-     */
-    protected $cache = array();
-
-    /**
-     * Creates the object
-     *
-     * This method expects the rootObject to be passed as a parameter
-     *
-     * @param Sabre_DAV_ICollection $rootNode
-     */
-    public function __construct(Sabre_DAV_ICollection $rootNode) {
-
-        $this->rootNode = $rootNode;
-
-    }
-
-    /**
-     * Returns the INode object for the requested path
-     *
-     * @param string $path
-     * @return Sabre_DAV_INode
-     */
-    public function getNodeForPath($path) {
-
-        $path = trim($path,'/');
-        if (isset($this->cache[$path])) return $this->cache[$path];
-
-        //if (!$path || $path=='.') return $this->rootNode;
-        $currentNode = $this->rootNode;
-
-        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node..
-        foreach(explode('/',$path) as $pathPart) {
-
-            // If this part of the path is just a dot, it actually means we can skip it
-            if ($pathPart=='.' || $pathPart=='') continue;
-
-            if (!($currentNode instanceof Sabre_DAV_ICollection))
-                throw new Sabre_DAV_Exception_NotFound('Could not find node at path: ' . $path);
-
-            $currentNode = $currentNode->getChild($pathPart);
-
-        }
-
-        $this->cache[$path] = $currentNode;
-        return $currentNode;
-
-    }
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            // The root always exists
-            if ($path==='') return true;
-
-            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
-
-            $parentNode = $this->getNodeForPath($parent);
-            if (!$parentNode instanceof Sabre_DAV_ICollection) return false;
-            return $parentNode->childExists($base);
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        $children = $node->getChildren();
-        foreach($children as $child) {
-
-            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes
-     *
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     *
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path
-     * @return void
-     */
-    public function markDirty($path) {
-
-        // We don't care enough about sub-paths
-        // flushing the entire cache
-        $path = trim($path,'/');
-        foreach($this->cache as $nodePath=>$node) {
-            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
-                unset($this->cache[$nodePath]);
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property.php b/3rdparty/Sabre/DAV/Property.php
deleted file mode 100755
index 1cfada3236..0000000000
--- a/3rdparty/Sabre/DAV/Property.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Abstract property class
- *
- * Extend this class to create custom complex properties
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Property {
-
-    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop);
-
-    static function unserialize(DOMElement $prop) {
-
-        throw new Sabre_DAV_Exception('Unserialize has not been implemented for this class');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/GetLastModified.php b/3rdparty/Sabre/DAV/Property/GetLastModified.php
deleted file mode 100755
index bd63f57314..0000000000
--- a/3rdparty/Sabre/DAV/Property/GetLastModified.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This property represents the {DAV:}getlastmodified property.
- *
- * Although this is normally a simple property, windows requires us to add
- * some new attributes.
- *
- * This class uses unix timestamps internally, and converts them to RFC 1123 times for
- * serialization
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
-
-    /**
-     * time
-     *
-     * @var int
-     */
-    public $time;
-
-    /**
-     * __construct
-     *
-     * @param int|DateTime $time
-     */
-    public function __construct($time) {
-
-        if ($time instanceof DateTime) {
-            $this->time = $time;
-        } elseif (is_int($time) || ctype_digit($time)) {
-            $this->time = new DateTime('@' . $time);
-        } else {
-            $this->time = new DateTime($time);
-        }
-
-        // Setting timezone to UTC
-        $this->time->setTimezone(new DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement       $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
-        $prop->setAttribute('b:dt','dateTime.rfc1123');
-        $prop->nodeValue = Sabre_HTTP_Util::toHTTPDate($this->time);
-
-    }
-
-    /**
-     * getTime
-     *
-     * @return DateTime
-     */
-    public function getTime() {
-
-        return $this->time;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/Href.php b/3rdparty/Sabre/DAV/Property/Href.php
deleted file mode 100755
index dac564f24d..0000000000
--- a/3rdparty/Sabre/DAV/Property/Href.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Href property
- *
- * The href property represents a url within a {DAV:}href element.
- * This is used by many WebDAV extensions, but not really within the WebDAV core spec
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * href
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct
-     *
-     * @param string $href
-     * @param bool $autoPrefix
-     */
-    public function __construct($href, $autoPrefix = true) {
-
-        $this->href = $href;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uri
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        $elem = $dom->ownerDocument->createElement($prefix . ':href');
-        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
-        $dom->appendChild($elem);
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_Href
-     */
-    static function unserialize(DOMElement $dom) {
-
-        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
-            return new self($dom->firstChild->textContent,false);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/HrefList.php b/3rdparty/Sabre/DAV/Property/HrefList.php
deleted file mode 100755
index 7a52272e88..0000000000
--- a/3rdparty/Sabre/DAV/Property/HrefList.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * HrefList property
- *
- * This property contains multiple {DAV:}href elements, each containing a url.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
-
-    /**
-     * hrefs
-     *
-     * @var array
-     */
-    private $hrefs;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct
-     *
-     * @param array $hrefs
-     * @param bool $autoPrefix
-     */
-    public function __construct(array $hrefs, $autoPrefix = true) {
-
-        $this->hrefs = $hrefs;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uris
-     *
-     * @return array
-     */
-    public function getHrefs() {
-
-        return $this->hrefs;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        foreach($this->hrefs as $href) {
-            $elem = $dom->ownerDocument->createElement($prefix . ':href');
-            $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $href;
-            $dom->appendChild($elem);
-        }
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_Href
-     */
-    static function unserialize(DOMElement $dom) {
-
-        $hrefs = array();
-        foreach($dom->childNodes as $child) {
-            if (Sabre_DAV_XMLUtil::toClarkNotation($child)==='{DAV:}href') {
-                $hrefs[] = $child->textContent;
-            }
-        }
-        return new self($hrefs, false);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php
deleted file mode 100755
index 5c0409064c..0000000000
--- a/3rdparty/Sabre/DAV/Property/IHref.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * IHref interface
- *
- * Any property implementing this interface can expose a related url.
- * This is used by certain subsystems to aquire more information about for example
- * the owner of a file
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_Property_IHref {
-
-    /**
-     * getHref
-     *
-     * @return string
-     */
-    function getHref();
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/LockDiscovery.php b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
deleted file mode 100755
index 2ded5649a4..0000000000
--- a/3rdparty/Sabre/DAV/Property/LockDiscovery.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Represents {DAV:}lockdiscovery property
- *
- * This property contains all the open locks on a given resource
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
-
-    /**
-     * locks
-     *
-     * @var array
-     */
-    public $locks;
-
-    /**
-     * Should we show the locktoken as well?
-     *
-     * @var bool
-     */
-    public $revealLockToken;
-
-    /**
-     * Hides the {DAV:}lockroot element from the response.
-     *
-     * It was reported that showing the lockroot in the response can break
-     * Office 2000 compatibility.
-     */
-    static public $hideLockRoot = false;
-
-    /**
-     * __construct
-     *
-     * @param array $locks
-     * @param bool $revealLockToken
-     */
-    public function __construct($locks, $revealLockToken = false) {
-
-        $this->locks = $locks;
-        $this->revealLockToken = $revealLockToken;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement       $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        foreach($this->locks as $lock) {
-
-            $activeLock = $doc->createElementNS('DAV:','d:activelock');
-            $prop->appendChild($activeLock);
-
-            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
-            $activeLock->appendChild($lockScope);
-
-            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
-
-            $lockType = $doc->createElementNS('DAV:','d:locktype');
-            $activeLock->appendChild($lockType);
-
-            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
-
-            /* {DAV:}lockroot */
-            if (!self::$hideLockRoot) {
-                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
-                $activeLock->appendChild($lockRoot);
-                $href = $doc->createElementNS('DAV:','d:href');
-                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
-                $lockRoot->appendChild($href);
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
-
-            if ($this->revealLockToken) {
-                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
-                $activeLock->appendChild($lockToken);
-                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/ResourceType.php b/3rdparty/Sabre/DAV/Property/ResourceType.php
deleted file mode 100755
index f6269611e5..0000000000
--- a/3rdparty/Sabre/DAV/Property/ResourceType.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}resourcetype property
- *
- * Normally for files this is empty, and for collection {DAV:}collection.
- * However, other specs define different values for this.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
-
-    /**
-     * resourceType
-     *
-     * @var array
-     */
-    public $resourceType = array();
-
-    /**
-     * __construct
-     *
-     * @param mixed $resourceType
-     */
-    public function __construct($resourceType = array()) {
-
-        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
-            $this->resourceType = array();
-        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
-            $this->resourceType = array('{DAV:}collection');
-        elseif (is_array($resourceType))
-            $this->resourceType = $resourceType;
-        else
-            $this->resourceType = array($resourceType);
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $propName = null;
-        $rt = $this->resourceType;
-
-        foreach($rt as $resourceType) {
-            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) {
-
-                if (isset($server->xmlNamespaces[$propName[1]])) {
-                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
-                } else {
-                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
-                }
-
-            }
-        }
-
-    }
-
-    /**
-     * Returns the values in clark-notation
-     *
-     * For example array('{DAV:}collection')
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->resourceType;
-
-    }
-
-    /**
-     * Checks if the principal contains a certain value
-     *
-     * @param string $type
-     * @return bool
-     */
-    public function is($type) {
-
-        return in_array($type, $this->resourceType);
-
-    }
-
-    /**
-     * Adds a resourcetype value to this property
-     *
-     * @param string $type
-     * @return void
-     */
-    public function add($type) {
-
-        $this->resourceType[] = $type;
-        $this->resourceType = array_unique($this->resourceType);
-
-    }
-
-    /**
-     * Unserializes a DOM element into a ResourceType property.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_ResourceType
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $value = array();
-        foreach($dom->childNodes as $child) {
-
-            $value[] = Sabre_DAV_XMLUtil::toClarkNotation($child);
-
-        }
-
-        return new self($value);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/Response.php b/3rdparty/Sabre/DAV/Property/Response.php
deleted file mode 100755
index 88afbcfb26..0000000000
--- a/3rdparty/Sabre/DAV/Property/Response.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * Response property
- *
- * This class represents the {DAV:}response XML element.
- * This is used by the Server class to encode individual items within a multistatus
- * response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * Url for the response
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Propertylist, ordered by HTTP status code
-     *
-     * @var array
-     */
-    private $responseProperties;
-
-    /**
-     * The responseProperties argument is a list of properties
-     * within an array with keys representing HTTP status codes
-     *
-     * @param string $href
-     * @param array $responseProperties
-     */
-    public function __construct($href, array $responseProperties) {
-
-        $this->href = $href;
-        $this->responseProperties = $responseProperties;
-
-    }
-
-    /**
-     * Returns the url
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Returns the property list
-     *
-     * @return array
-     */
-    public function getResponseProperties() {
-
-        return $this->responseProperties;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
-
-        $document = $dom->ownerDocument;
-        $properties = $this->responseProperties;
-
-        $xresponse = $document->createElement('d:response');
-        $dom->appendChild($xresponse);
-
-        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
-
-        // Adding the baseurl to the beginning of the url
-        $uri = $server->getBaseUri() . $uri;
-
-        $xresponse->appendChild($document->createElement('d:href',$uri));
-
-        // The properties variable is an array containing properties, grouped by
-        // HTTP status
-        foreach($properties as $httpStatus=>$propertyGroup) {
-
-            // The 'href' is also in this array, and it's special cased.
-            // We will ignore it
-            if ($httpStatus=='href') continue;
-
-            // If there are no properties in this group, we can also just carry on
-            if (!count($propertyGroup)) continue;
-
-            $xpropstat = $document->createElement('d:propstat');
-            $xresponse->appendChild($xpropstat);
-
-            $xprop = $document->createElement('d:prop');
-            $xpropstat->appendChild($xprop);
-
-            $nsList = $server->xmlNamespaces;
-
-            foreach($propertyGroup as $propertyName=>$propertyValue) {
-
-                $propName = null;
-                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-                // special case for empty namespaces
-                if ($propName[1]=='') {
-
-                    $currentProperty = $document->createElement($propName[2]);
-                    $xprop->appendChild($currentProperty);
-                    $currentProperty->setAttribute('xmlns','');
-
-                } else {
-
-                    if (!isset($nsList[$propName[1]])) {
-                        $nsList[$propName[1]] = 'x' . count($nsList);
-                    }
-
-                    // If the namespace was defined in the top-level xml namespaces, it means
-                    // there was already a namespace declaration, and we don't have to worry about it.
-                    if (isset($server->xmlNamespaces[$propName[1]])) {
-                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-                    } else {
-                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
-                    }
-                    $xprop->appendChild($currentProperty);
-
-                }
-
-                if (is_scalar($propertyValue)) {
-                    $text = $document->createTextNode($propertyValue);
-                    $currentProperty->appendChild($text);
-                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
-                    $propertyValue->serialize($server,$currentProperty);
-                } elseif (!is_null($propertyValue)) {
-                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
-                }
-
-            }
-
-            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/ResponseList.php b/3rdparty/Sabre/DAV/Property/ResponseList.php
deleted file mode 100755
index cae923afbf..0000000000
--- a/3rdparty/Sabre/DAV/Property/ResponseList.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * ResponseList property
- *
- * This class represents multiple {DAV:}response XML elements.
- * This is used by the Server class to encode items within a multistatus
- * response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
-
-    /**
-     * Response objects.
-     *
-     * @var array
-     */
-    private $responses;
-
-    /**
-     * The only valid argument is a list of Sabre_DAV_Property_Response
-     * objects.
-     *
-     * @param array $responses;
-     */
-    public function __construct($responses) {
-
-        foreach($responses as $response) {
-            if (!($response instanceof Sabre_DAV_Property_Response)) {
-                throw new InvalidArgumentException('You must pass an array of Sabre_DAV_Property_Response objects');
-            }
-        }
-        $this->responses = $responses;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $dom
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        foreach($this->responses as $response) {
-            $response->serialize($server, $dom);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/SupportedLock.php b/3rdparty/Sabre/DAV/Property/SupportedLock.php
deleted file mode 100755
index 4e3aaf23a1..0000000000
--- a/3rdparty/Sabre/DAV/Property/SupportedLock.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}supportedlock property
- *
- * This property contains information about what kind of locks
- * this server supports.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
-
-    /**
-     * supportsLocks
-     *
-     * @var mixed
-     */
-    public $supportsLocks = false;
-
-    /**
-     * __construct
-     *
-     * @param mixed $supportsLocks
-     */
-    public function __construct($supportsLocks) {
-
-        $this->supportsLocks = $supportsLocks;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement       $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        if (!$this->supportsLocks) return null;
-
-        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
-        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
-
-        $prop->appendChild($lockEntry1);
-        $prop->appendChild($lockEntry2);
-
-        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
-        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
-        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
-        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
-
-        $lockEntry1->appendChild($lockScope1);
-        $lockEntry1->appendChild($lockType1);
-        $lockEntry2->appendChild($lockScope2);
-        $lockEntry2->appendChild($lockType2);
-
-        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
-        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
-
-        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
-        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
-
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
deleted file mode 100755
index e62699f3b5..0000000000
--- a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * supported-report-set property.
- *
- * This property is defined in RFC3253, but since it's
- * so common in other webdav-related specs, it is part of the core server.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
-
-    /**
-     * List of reports
-     *
-     * @var array
-     */
-    protected $reports = array();
-
-    /**
-     * Creates the property
-     *
-     * Any reports passed in the constructor
-     * should be valid report-types in clark-notation.
-     *
-     * Either a string or an array of strings must be passed.
-     *
-     * @param mixed $reports
-     */
-    public function __construct($reports = null) {
-
-        if (!is_null($reports))
-            $this->addReport($reports);
-
-    }
-
-    /**
-     * Adds a report to this property
-     *
-     * The report must be a string in clark-notation.
-     * Multiple reports can be specified as an array.
-     *
-     * @param mixed $report
-     * @return void
-     */
-    public function addReport($report) {
-
-        if (!is_array($report)) $report = array($report);
-
-        foreach($report as $r) {
-
-            if (!preg_match('/^{([^}]*)}(.*)$/',$r))
-                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
-
-            $this->reports[] = $r;
-
-        }
-
-    }
-
-    /**
-     * Returns the list of supported reports
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->reports;
-
-    }
-
-    /**
-     * Serializes the node
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $prop
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        foreach($this->reports as $reportName) {
-
-            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
-            $prop->appendChild($supportedReport);
-
-            $report = $prop->ownerDocument->createElement('d:report');
-            $supportedReport->appendChild($report);
-
-            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
-
-            list(, $namespace, $element) = $matches;
-
-            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
-
-            if ($prefix) {
-                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
-            } else {
-                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
-            }
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
deleted file mode 100755
index 67794964b4..0000000000
--- a/3rdparty/Sabre/DAV/Server.php
+++ /dev/null
@@ -1,2006 +0,0 @@
-<?php
-
-/**
- * Main DAV server class
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Server {
-
-    /**
-     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
-     */
-    const DEPTH_INFINITY = -1;
-
-    /**
-     * Nodes that are files, should have this as the type property
-     */
-    const NODE_FILE = 1;
-
-    /**
-     * Nodes that are directories, should use this value as the type property
-     */
-    const NODE_DIRECTORY = 2;
-
-    /**
-     * XML namespace for all SabreDAV related elements
-     */
-    const NS_SABREDAV = 'http://sabredav.org/ns';
-
-    /**
-     * The tree object
-     *
-     * @var Sabre_DAV_Tree
-     */
-    public $tree;
-
-    /**
-     * The base uri
-     *
-     * @var string
-     */
-    protected $baseUri = null;
-
-    /**
-     * httpResponse
-     *
-     * @var Sabre_HTTP_Response
-     */
-    public $httpResponse;
-
-    /**
-     * httpRequest
-     *
-     * @var Sabre_HTTP_Request
-     */
-    public $httpRequest;
-
-    /**
-     * The list of plugins
-     *
-     * @var array
-     */
-    protected $plugins = array();
-
-    /**
-     * This array contains a list of callbacks we should call when certain events are triggered
-     *
-     * @var array
-     */
-    protected $eventSubscriptions = array();
-
-    /**
-     * This is a default list of namespaces.
-     *
-     * If you are defining your own custom namespace, add it here to reduce
-     * bandwidth and improve legibility of xml bodies.
-     *
-     * @var array
-     */
-    public $xmlNamespaces = array(
-        'DAV:' => 'd',
-        'http://sabredav.org/ns' => 's',
-    );
-
-    /**
-     * The propertymap can be used to map properties from
-     * requests to property classes.
-     *
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}resourcetype' => 'Sabre_DAV_Property_ResourceType',
-    );
-
-    public $protectedProperties = array(
-        // RFC4918
-        '{DAV:}getcontentlength',
-        '{DAV:}getetag',
-        '{DAV:}getlastmodified',
-        '{DAV:}lockdiscovery',
-        '{DAV:}resourcetype',
-        '{DAV:}supportedlock',
-
-        // RFC4331
-        '{DAV:}quota-available-bytes',
-        '{DAV:}quota-used-bytes',
-
-        // RFC3744
-        '{DAV:}supported-privilege-set',
-        '{DAV:}current-user-privilege-set',
-        '{DAV:}acl',
-        '{DAV:}acl-restrictions',
-        '{DAV:}inherited-acl-set',
-
-    );
-
-    /**
-     * This is a flag that allow or not showing file, line and code
-     * of the exception in the returned XML
-     *
-     * @var bool
-     */
-    public $debugExceptions = false;
-
-    /**
-     * This property allows you to automatically add the 'resourcetype' value
-     * based on a node's classname or interface.
-     *
-     * The preset ensures that {DAV:}collection is automaticlly added for nodes
-     * implementing Sabre_DAV_ICollection.
-     *
-     * @var array
-     */
-    public $resourceTypeMapping = array(
-        'Sabre_DAV_ICollection' => '{DAV:}collection',
-    );
-
-    /**
-     * If this setting is turned off, SabreDAV's version number will be hidden
-     * from various places.
-     *
-     * Some people feel this is a good security measure.
-     *
-     * @var bool
-     */
-    static public $exposeVersion = true;
-
-    /**
-     * Sets up the server
-     *
-     * If a Sabre_DAV_Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
-     * will create a Sabre_DAV_ObjectTree and use the node as the root.
-     *
-     * If nothing is passed, a Sabre_DAV_SimpleCollection is created in
-     * a Sabre_DAV_ObjectTree.
-     *
-     * If an array is passed, we automatically create a root node, and use
-     * the nodes in the array as top-level children.
-     *
-     * @param Sabre_DAV_Tree|Sabre_DAV_INode|null $treeOrNode The tree object
-     */
-    public function __construct($treeOrNode = null) {
-
-        if ($treeOrNode instanceof Sabre_DAV_Tree) {
-            $this->tree = $treeOrNode;
-        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
-            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
-        } elseif (is_array($treeOrNode)) {
-
-            // If it's an array, a list of nodes was passed, and we need to
-            // create the root node.
-            foreach($treeOrNode as $node) {
-                if (!($node instanceof Sabre_DAV_INode)) {
-                    throw new Sabre_DAV_Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre_DAV_INode');
-                }
-            }
-
-            $root = new Sabre_DAV_SimpleCollection('root', $treeOrNode);
-            $this->tree = new Sabre_DAV_ObjectTree($root);
-
-        } elseif (is_null($treeOrNode)) {
-            $root = new Sabre_DAV_SimpleCollection('root');
-            $this->tree = new Sabre_DAV_ObjectTree($root);
-        } else {
-            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode, an array or null');
-        }
-        $this->httpResponse = new Sabre_HTTP_Response();
-        $this->httpRequest = new Sabre_HTTP_Request();
-
-    }
-
-    /**
-     * Starts the DAV Server
-     *
-     * @return void
-     */
-    public function exec() {
-
-        try {
-
-            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
-
-        } catch (Exception $e) {
-
-            $DOM = new DOMDocument('1.0','utf-8');
-            $DOM->formatOutput = true;
-
-            $error = $DOM->createElementNS('DAV:','d:error');
-            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
-            $DOM->appendChild($error);
-
-            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
-            $error->appendChild($DOM->createElement('s:message',$e->getMessage()));
-            if ($this->debugExceptions) {
-                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
-                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
-                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
-                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
-
-            }
-            if (self::$exposeVersion) {
-                $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
-            }
-
-            if($e instanceof Sabre_DAV_Exception) {
-
-                $httpCode = $e->getHTTPCode();
-                $e->serialize($this,$error);
-                $headers = $e->getHTTPHeaders($this);
-
-            } else {
-
-                $httpCode = 500;
-                $headers = array();
-
-            }
-            $headers['Content-Type'] = 'application/xml; charset=utf-8';
-
-            $this->httpResponse->sendStatus($httpCode);
-            $this->httpResponse->setHeaders($headers);
-            $this->httpResponse->sendBody($DOM->saveXML());
-
-        }
-
-    }
-
-    /**
-     * Sets the base server uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function setBaseUri($uri) {
-
-        // If the baseUri does not end with a slash, we must add it
-        if ($uri[strlen($uri)-1]!=='/')
-            $uri.='/';
-
-        $this->baseUri = $uri;
-
-    }
-
-    /**
-     * Returns the base responding uri
-     *
-     * @return string
-     */
-    public function getBaseUri() {
-
-        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
-        return $this->baseUri;
-
-    }
-
-    /**
-     * This method attempts to detect the base uri.
-     * Only the PATH_INFO variable is considered.
-     *
-     * If this variable is not set, the root (/) is assumed.
-     *
-     * @return string
-     */
-    public function guessBaseUri() {
-
-        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
-        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
-
-        // If PATH_INFO is found, we can assume it's accurate.
-        if (!empty($pathInfo)) {
-
-            // We need to make sure we ignore the QUERY_STRING part
-            if ($pos = strpos($uri,'?'))
-                $uri = substr($uri,0,$pos);
-
-            // PATH_INFO is only set for urls, such as: /example.php/path
-            // in that case PATH_INFO contains '/path'.
-            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
-            // not, Therefore they are only comparable if we first decode
-            // REQUEST_INFO as well.
-            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
-
-            // A simple sanity check:
-            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
-                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
-                return rtrim($baseUri,'/') . '/';
-            }
-
-            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
-
-        }
-
-        // The last fallback is that we're just going to assume the server root.
-        return '/';
-
-    }
-
-    /**
-     * Adds a plugin to the server
-     *
-     * For more information, console the documentation of Sabre_DAV_ServerPlugin
-     *
-     * @param Sabre_DAV_ServerPlugin $plugin
-     * @return void
-     */
-    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
-
-        $this->plugins[$plugin->getPluginName()] = $plugin;
-        $plugin->initialize($this);
-
-    }
-
-    /**
-     * Returns an initialized plugin by it's name.
-     *
-     * This function returns null if the plugin was not found.
-     *
-     * @param string $name
-     * @return Sabre_DAV_ServerPlugin
-     */
-    public function getPlugin($name) {
-
-        if (isset($this->plugins[$name]))
-            return $this->plugins[$name];
-
-        // This is a fallback and deprecated.
-        foreach($this->plugins as $plugin) {
-            if (get_class($plugin)===$name) return $plugin;
-        }
-
-        return null;
-
-    }
-
-    /**
-     * Returns all plugins
-     *
-     * @return array
-     */
-    public function getPlugins() {
-
-        return $this->plugins;
-
-    }
-
-
-    /**
-     * Subscribe to an event.
-     *
-     * When the event is triggered, we'll call all the specified callbacks.
-     * It is possible to control the order of the callbacks through the
-     * priority argument.
-     *
-     * This is for example used to make sure that the authentication plugin
-     * is triggered before anything else. If it's not needed to change this
-     * number, it is recommended to ommit.
-     *
-     * @param string $event
-     * @param callback $callback
-     * @param int $priority
-     * @return void
-     */
-    public function subscribeEvent($event, $callback, $priority = 100) {
-
-        if (!isset($this->eventSubscriptions[$event])) {
-            $this->eventSubscriptions[$event] = array();
-        }
-        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
-        $this->eventSubscriptions[$event][$priority] = $callback;
-        ksort($this->eventSubscriptions[$event]);
-
-    }
-
-    /**
-     * Broadcasts an event
-     *
-     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
-     *
-     * The arguments parameter will be sent to all subscribers
-     *
-     * @param string $eventName
-     * @param array $arguments
-     * @return bool
-     */
-    public function broadcastEvent($eventName,$arguments = array()) {
-
-        if (isset($this->eventSubscriptions[$eventName])) {
-
-            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
-
-                $result = call_user_func_array($subscriber,$arguments);
-                if ($result===false) return false;
-
-            }
-
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Handles a http request, and execute a method based on its name
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function invokeMethod($method, $uri) {
-
-        $method = strtoupper($method);
-
-        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
-
-        // Make sure this is a HTTP method we support
-        $internalMethods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'MKCOL',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        if (in_array($method,$internalMethods)) {
-
-            call_user_func(array($this,'http' . $method), $uri);
-
-        } else {
-
-            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
-                // Unsupported method
-                throw new Sabre_DAV_Exception_NotImplemented('There was no handler found for this "' . $method . '" method');
-            }
-
-        }
-
-    }
-
-    // {{{ HTTP Method implementations
-
-    /**
-     * HTTP OPTIONS
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpOptions($uri) {
-
-        $methods = $this->getAllowedMethods($uri);
-
-        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
-        $features = array('1','3', 'extended-mkcol');
-
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-        $this->httpResponse->setHeader('MS-Author-Via','DAV');
-        $this->httpResponse->setHeader('Accept-Ranges','bytes');
-        if (self::$exposeVersion) {
-            $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
-        }
-        $this->httpResponse->setHeader('Content-Length',0);
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP GET
-     *
-     * This method simply fetches the contents of a uri, like normal
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpGet($uri) {
-
-        $node = $this->tree->getNodeForPath($uri,0);
-
-        if (!$this->checkPreconditions(true)) return false;
-
-        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
-        $body = $node->get();
-
-        // Converting string into stream, if needed.
-        if (is_string($body)) {
-            $stream = fopen('php://temp','r+');
-            fwrite($stream,$body);
-            rewind($stream);
-            $body = $stream;
-        }
-
-        /*
-         * TODO: getetag, getlastmodified, getsize should also be used using
-         * this method
-         */
-        $httpHeaders = $this->getHTTPHeaders($uri);
-
-        /* ContentType needs to get a default, because many webservers will otherwise
-         * default to text/html, and we don't want this for security reasons.
-         */
-        if (!isset($httpHeaders['Content-Type'])) {
-            $httpHeaders['Content-Type'] = 'application/octet-stream';
-        }
-
-
-        if (isset($httpHeaders['Content-Length'])) {
-
-            $nodeSize = $httpHeaders['Content-Length'];
-
-            // Need to unset Content-Length, because we'll handle that during figuring out the range
-            unset($httpHeaders['Content-Length']);
-
-        } else {
-            $nodeSize = null;
-        }
-
-        $this->httpResponse->setHeaders($httpHeaders);
-
-        $range = $this->getHTTPRange();
-        $ifRange = $this->httpRequest->getHeader('If-Range');
-        $ignoreRangeHeader = false;
-
-        // If ifRange is set, and range is specified, we first need to check
-        // the precondition.
-        if ($nodeSize && $range && $ifRange) {
-
-            // if IfRange is parsable as a date we'll treat it as a DateTime
-            // otherwise, we must treat it as an etag.
-            try {
-                $ifRangeDate = new DateTime($ifRange);
-
-                // It's a date. We must check if the entity is modified since
-                // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
-                    $modified = new DateTime($httpHeaders['Last-Modified']);
-                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
-                }
-
-            } catch (Exception $e) {
-
-                // It's an entity. We can do a simple comparison.
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
-            }
-        }
-
-        // We're only going to support HTTP ranges if the backend provided a filesize
-        if (!$ignoreRangeHeader && $nodeSize && $range) {
-
-            // Determining the exact byte offsets
-            if (!is_null($range[0])) {
-
-                $start = $range[0];
-                $end = $range[1]?$range[1]:$nodeSize-1;
-                if($start >= $nodeSize)
-                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
-
-                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if($end >= $nodeSize) $end = $nodeSize-1;
-
-            } else {
-
-                $start = $nodeSize-$range[1];
-                $end  = $nodeSize-1;
-
-                if ($start<0) $start = 0;
-
-            }
-
-            // New read/write stream
-            $newStream = fopen('php://temp','r+');
-
-            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
-            rewind($newStream);
-
-            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
-            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
-            $this->httpResponse->sendStatus(206);
-            $this->httpResponse->sendBody($newStream);
-
-
-        } else {
-
-            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
-            $this->httpResponse->sendStatus(200);
-            $this->httpResponse->sendBody($body);
-
-        }
-
-    }
-
-    /**
-     * HTTP HEAD
-     *
-     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
-     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpHead($uri) {
-
-        $node = $this->tree->getNodeForPath($uri);
-        /* This information is only collection for File objects.
-         * Ideally we want to throw 405 Method Not Allowed for every
-         * non-file, but MS Office does not like this
-         */
-        if ($node instanceof Sabre_DAV_IFile) {
-            $headers = $this->getHTTPHeaders($this->getRequestUri());
-            if (!isset($headers['Content-Type'])) {
-                $headers['Content-Type'] = 'application/octet-stream';
-            }
-            $this->httpResponse->setHeaders($headers);
-        }
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP Delete
-     *
-     * The HTTP delete method, deletes a given uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpDelete($uri) {
-		
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-        $this->tree->delete($uri);
-        $this->broadcastEvent('afterUnbind',array($uri));
-
-        $this->httpResponse->sendStatus(204);
-        $this->httpResponse->setHeader('Content-Length','0');
-
-    }
-
-
-    /**
-     * WebDAV PROPFIND
-     *
-     * This WebDAV method requests information about an uri resource, or a list of resources
-     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
-     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
-     *
-     * The request body contains an XML data structure that has a list of properties the client understands
-     * The response body is also an xml document, containing information about every uri resource and the requested properties
-     *
-     * It has to return a HTTP 207 Multi-status status code
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropfind($uri) {
-
-        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
-        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
-
-        $depth = $this->getHTTPDepth(1);
-        // The only two options for the depth of a propfind is 0 or 1
-        if ($depth!=0) $depth = 1;
-
-        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
-
-        // This is a multi-status response
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        // Normally this header is only needed for OPTIONS responses, however..
-        // iCal seems to also depend on these being set for PROPFIND. Since
-        // this is not harmful, we'll add it.
-        $features = array('1','3', 'extended-mkcol');
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-
-        $data = $this->generateMultiStatus($newProperties);
-        $this->httpResponse->sendBody($data);
-
-    }
-
-    /**
-     * WebDAV PROPPATCH
-     *
-     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
-     * In this XML body it is specified which properties should be set/updated and/or deleted
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropPatch($uri) {
-
-        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
-
-        $result = $this->updateProperties($uri, $newProperties);
-
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->httpResponse->sendBody(
-            $this->generateMultiStatus(array($result))
-        );
-
-    }
-
-    /**
-     * HTTP PUT method
-     *
-     * This HTTP method updates a file, or creates a new one.
-     *
-     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpPut($uri) {
-
-        $body = $this->httpRequest->getBody();
-
-        // Intercepting Content-Range
-        if ($this->httpRequest->getHeader('Content-Range')) {
-            /**
-            Content-Range is dangerous for PUT requests:  PUT per definition
-            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
-            in section 7.6:
-              An origin server SHOULD reject any PUT request that contains a
-              Content-Range header field, since it might be misinterpreted as
-              partial content (or might be partial content that is being mistakenly
-              PUT as a full representation).  Partial content updates are possible
-              by targeting a separately identified resource with state that
-              overlaps a portion of the larger resource, or by using a different
-              method that has been specifically defined for partial updates (for
-              example, the PATCH method defined in [RFC5789]).
-            This clarifies RFC2616 section 9.6:
-              The recipient of the entity MUST NOT ignore any Content-*
-              (e.g. Content-Range) headers that it does not understand or implement
-              and MUST return a 501 (Not Implemented) response in such cases.
-            OTOH is a PUT request with a Content-Range currently the only way to
-            continue an aborted upload request and is supported by curl, mod_dav,
-            Tomcat and others.  Since some clients do use this feature which results
-            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
-            all PUT requests with a Content-Range for now.
-            */
-
-            throw new Sabre_DAV_Exception_NotImplemented('PUT with Content-Range is not allowed.');
-        }
-
-        // Intercepting the Finder problem
-        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
-
-            /**
-            Many webservers will not cooperate well with Finder PUT requests,
-            because it uses 'Chunked' transfer encoding for the request body.
-
-            The symptom of this problem is that Finder sends files to the
-            server, but they arrive as 0-length files in PHP.
-
-            If we don't do anything, the user might think they are uploading
-            files successfully, but they end up empty on the server. Instead,
-            we throw back an error if we detect this.
-
-            The reason Finder uses Chunked, is because it thinks the files
-            might change as it's being uploaded, and therefore the
-            Content-Length can vary.
-
-            Instead it sends the X-Expected-Entity-Length header with the size
-            of the file at the very start of the request. If this header is set,
-            but we don't get a request body we will fail the request to
-            protect the end-user.
-            */
-
-            // Only reading first byte
-            $firstByte = fread($body,1);
-            if (strlen($firstByte)!==1) {
-                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
-            }
-
-            // The body needs to stay intact, so we copy everything to a
-            // temporary stream.
-
-            $newBody = fopen('php://temp','r+');
-            fwrite($newBody,$firstByte);
-            stream_copy_to_stream($body, $newBody);
-            rewind($newBody);
-
-            $body = $newBody;
-
-        }
-
-        if ($this->tree->nodeExists($uri)) {
-
-            $node = $this->tree->getNodeForPath($uri);
-
-            // Checking If-None-Match and related headers.
-            if (!$this->checkPreconditions()) return;
-
-            // If the node is a collection, we'll deny it
-            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
-            if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false;
-
-            $etag = $node->put($body);
-
-            $this->broadcastEvent('afterWriteContent',array($uri, $node));
-
-            $this->httpResponse->setHeader('Content-Length','0');
-            if ($etag) $this->httpResponse->setHeader('ETag',$etag);
-            $this->httpResponse->sendStatus(204);
-
-        } else {
-
-            $etag = null;
-            // If we got here, the resource didn't exist yet.
-            if (!$this->createFile($this->getRequestUri(),$body,$etag)) {
-                // For one reason or another the file was not created.
-                return;
-            }
-
-            $this->httpResponse->setHeader('Content-Length','0');
-            if ($etag) $this->httpResponse->setHeader('ETag', $etag);
-            $this->httpResponse->sendStatus(201);
-
-        }
-
-    }
-
-
-    /**
-     * WebDAV MKCOL
-     *
-     * The MKCOL method is used to create a new collection (directory) on the server
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMkcol($uri) {
-
-        $requestBody = $this->httpRequest->getBody(true);
-
-        if ($requestBody) {
-
-            $contentType = $this->httpRequest->getHeader('Content-Type');
-            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
-
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
-
-            }
-
-            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
-            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
-
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
-
-            }
-
-            $properties = array();
-            foreach($dom->firstChild->childNodes as $childNode) {
-
-                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
-                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
-
-            }
-            if (!isset($properties['{DAV:}resourcetype']))
-                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');
-
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-            unset($properties['{DAV:}resourcetype']);
-
-        } else {
-
-            $properties = array();
-            $resourceType = array('{DAV:}collection');
-
-        }
-
-        $result = $this->createCollection($uri, $resourceType, $properties);
-
-        if (is_array($result)) {
-            $this->httpResponse->sendStatus(207);
-            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-            $this->httpResponse->sendBody(
-                $this->generateMultiStatus(array($result))
-            );
-
-        } else {
-            $this->httpResponse->setHeader('Content-Length','0');
-            $this->httpResponse->sendStatus(201);
-        }
-
-    }
-
-    /**
-     * WebDAV HTTP MOVE method
-     *
-     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMove($uri) {
-
-        $moveInfo = $this->getCopyAndMoveInfo();
-
-        // If the destination is part of the source tree, we must fail
-        if ($moveInfo['destination']==$uri)
-            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
-
-        if ($moveInfo['destinationExists']) {
-
-            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
-            $this->tree->delete($moveInfo['destination']);
-            $this->broadcastEvent('afterUnbind',array($moveInfo['destination']));
-
-        }
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
-        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
-        $this->tree->move($uri,$moveInfo['destination']);
-        $this->broadcastEvent('afterUnbind',array($uri));
-        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
-
-    }
-
-    /**
-     * WebDAV HTTP COPY method
-     *
-     * This method copies one uri to a different uri, and works much like the MOVE request
-     * A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpCopy($uri) {
-
-        $copyInfo = $this->getCopyAndMoveInfo();
-        // If the destination is part of the source tree, we must fail
-        if ($copyInfo['destination']==$uri)
-            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
-
-        if ($copyInfo['destinationExists']) {
-            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
-            $this->tree->delete($copyInfo['destination']);
-
-        }
-        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
-        $this->tree->copy($uri,$copyInfo['destination']);
-        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
-
-    }
-
-
-
-    /**
-     * HTTP REPORT method implementation
-     *
-     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
-     * It's used in a lot of extensions, so it made sense to implement it into the core.
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpReport($uri) {
-
-        $body = $this->httpRequest->getBody(true);
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
-
-        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
-
-            // If broadcastEvent returned true, it means the report was not supported
-            throw new Sabre_DAV_Exception_ReportNotImplemented();
-
-        }
-
-    }
-
-    // }}}
-    // {{{ HTTP/WebDAV protocol helpers
-
-    /**
-     * Returns an array with all the supported HTTP methods for a specific uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getAllowedMethods($uri) {
-
-        $methods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        // The MKCOL is only allowed on an unmapped uri
-        try {
-            $this->tree->getNodeForPath($uri);
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            $methods[] = 'MKCOL';
-        }
-
-        // We're also checking if any of the plugins register any new methods
-        foreach($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($uri));
-        array_unique($methods);
-
-        return $methods;
-
-    }
-
-    /**
-     * Gets the uri for the request, keeping the base uri into consideration
-     *
-     * @return string
-     */
-    public function getRequestUri() {
-
-        return $this->calculateUri($this->httpRequest->getUri());
-
-    }
-
-    /**
-     * Calculates the uri for a request, making sure that the base uri is stripped out
-     *
-     * @param string $uri
-     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
-     * @return string
-     */
-    public function calculateUri($uri) {
-
-        if ($uri[0]!='/' && strpos($uri,'://')) {
-
-            $uri = parse_url($uri,PHP_URL_PATH);
-
-        }
-
-        $uri = str_replace('//','/',$uri);
-
-        if (strpos($uri,$this->getBaseUri())===0) {
-
-            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
-
-        // A special case, if the baseUri was accessed without a trailing
-        // slash, we'll accept it as well.
-        } elseif ($uri.'/' === $this->getBaseUri()) {
-
-            return '';
-
-        } else {
-
-            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
-
-        }
-
-    }
-
-    /**
-     * Returns the HTTP depth header
-     *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
-     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
-     *
-     * @param mixed $default
-     * @return int
-     */
-    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
-
-        // If its not set, we'll grab the default
-        $depth = $this->httpRequest->getHeader('Depth');
-
-        if (is_null($depth)) return $default;
-
-        if ($depth == 'infinity') return self::DEPTH_INFINITY;
-
-
-        // If its an unknown value. we'll grab the default
-        if (!ctype_digit($depth)) return $default;
-
-        return (int)$depth;
-
-    }
-
-    /**
-     * Returns the HTTP range header
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header or array($start, $end).
-     *
-     * The first number is the offset of the first byte in the range.
-     * The second number is the offset of the last byte in the range.
-     *
-     * If the second offset is null, it should be treated as the offset of the last byte of the entity
-     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
-     *
-     * @return array|null
-     */
-    public function getHTTPRange() {
-
-        $range = $this->httpRequest->getHeader('range');
-        if (is_null($range)) return null;
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
-
-        if ($matches[1]==='' && $matches[2]==='') return null;
-
-        return array(
-            $matches[1]!==''?$matches[1]:null,
-            $matches[2]!==''?$matches[2]:null,
-        );
-
-    }
-
-
-    /**
-     * Returns information about Copy and Move requests
-     *
-     * This function is created to help getting information about the source and the destination for the
-     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
-     *
-     * The returned value is an array with the following keys:
-     *   * destination - Destination path
-     *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
-     *
-     * @return array
-     */
-    public function getCopyAndMoveInfo() {
-
-        // Collecting the relevant HTTP headers
-        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
-        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
-        $overwrite = $this->httpRequest->getHeader('Overwrite');
-        if (!$overwrite) $overwrite = 'T';
-        if (strtoupper($overwrite)=='T') $overwrite = true;
-        elseif (strtoupper($overwrite)=='F') $overwrite = false;
-        // We need to throw a bad request exception, if the header was invalid
-        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
-
-        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
-
-        try {
-            $destinationParent = $this->tree->getNodeForPath($destinationDir);
-            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            // If the destination parent node is not found, we throw a 409
-            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
-        }
-
-        try {
-
-            $destinationNode = $this->tree->getNodeForPath($destination);
-
-            // If this succeeded, it means the destination already exists
-            // we'll need to throw precondition failed in case overwrite is false
-            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            // Destination didn't exist, we're all good
-            $destinationNode = false;
-
-
-
-        }
-
-        // These are the three relevant properties we need to return
-        return array(
-            'destination'       => $destination,
-            'destinationExists' => $destinationNode==true,
-            'destinationNode'   => $destinationNode,
-        );
-
-    }
-
-    /**
-     * Returns a list of properties for a path
-     *
-     * This is a simplified version getPropertiesForPath.
-     * if you aren't interested in status codes, but you just
-     * want to have a flat list of properties. Use this method.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     */
-    public function getProperties($path, $propertyNames) {
-
-        $result = $this->getPropertiesForPath($path,$propertyNames,0);
-        return $result[0][200];
-
-    }
-
-    /**
-     * A kid-friendly way to fetch properties for a node's children.
-     *
-     * The returned array will be indexed by the path of the of child node.
-     * Only properties that are actually found will be returned.
-     *
-     * The parent node will not be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @return array
-     */
-    public function getPropertiesForChildren($path, $propertyNames) {
-
-        $result = array();
-        foreach($this->getPropertiesForPath($path,$propertyNames,1) as $k=>$row) {
-
-            // Skipping the parent path
-            if ($k === 0) continue;
-
-            $result[$row['href']] = $row[200];
-
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns a list of HTTP headers for a particular resource
-     *
-     * The generated http headers are based on properties provided by the
-     * resource. The method basically provides a simple mapping between
-     * DAV property and HTTP header.
-     *
-     * The headers are intended to be used for HEAD and GET requests.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getHTTPHeaders($path) {
-
-        $propertyMap = array(
-            '{DAV:}getcontenttype'   => 'Content-Type',
-            '{DAV:}getcontentlength' => 'Content-Length',
-            '{DAV:}getlastmodified'  => 'Last-Modified',
-            '{DAV:}getetag'          => 'ETag',
-        );
-
-        $properties = $this->getProperties($path,array_keys($propertyMap));
-
-        $headers = array();
-        foreach($propertyMap as $property=>$header) {
-            if (!isset($properties[$property])) continue;
-
-            if (is_scalar($properties[$property])) {
-                $headers[$header] = $properties[$property];
-
-            // GetLastModified gets special cased
-            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
-                $headers[$header] = Sabre_HTTP_Util::toHTTPDate($properties[$property]->getTime());
-            }
-
-        }
-
-        return $headers;
-
-    }
-
-    /**
-     * Returns a list of properties for a given path
-     *
-     * The path that should be supplied should have the baseUrl stripped out
-     * The list of properties should be supplied in Clark notation. If the list is empty
-     * 'allprops' is assumed.
-     *
-     * If a depth of 1 is requested child elements will also be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @param int $depth
-     * @return array
-     */
-    public function getPropertiesForPath($path, $propertyNames = array(), $depth = 0) {
-
-        if ($depth!=0) $depth = 1;
-
-        $returnPropertyList = array();
-
-        $parentNode = $this->tree->getNodeForPath($path);
-        $nodes = array(
-            $path => $parentNode
-        );
-        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
-            foreach($this->tree->getChildren($path) as $childNode)
-                $nodes[$path . '/' . $childNode->getName()] = $childNode;
-        }
-
-        // If the propertyNames array is empty, it means all properties are requested.
-        // We shouldn't actually return everything we know though, and only return a
-        // sensible list.
-        $allProperties = count($propertyNames)==0;
-
-        foreach($nodes as $myPath=>$node) {
-
-            $currentPropertyNames = $propertyNames;
-
-            $newProperties = array(
-                '200' => array(),
-                '404' => array(),
-            );
-
-            if ($allProperties) {
-                // Default list of propertyNames, when all properties were requested.
-                $currentPropertyNames = array(
-                    '{DAV:}getlastmodified',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}resourcetype',
-                    '{DAV:}quota-used-bytes',
-                    '{DAV:}quota-available-bytes',
-                    '{DAV:}getetag',
-                    '{DAV:}getcontenttype',
-                );
-            }
-
-            // If the resourceType was not part of the list, we manually add it
-            // and mark it for removal. We need to know the resourcetype in order
-            // to make certain decisions about the entry.
-            // WebDAV dictates we should add a / and the end of href's for collections
-            $removeRT = false;
-            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
-                $currentPropertyNames[] = '{DAV:}resourcetype';
-                $removeRT = true;
-            }
-
-            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
-            // If this method explicitly returned false, we must ignore this
-            // node as it is inaccessible.
-            if ($result===false) continue;
-
-            if (count($currentPropertyNames) > 0) {
-
-                if ($node instanceof Sabre_DAV_IProperties)
-                    $newProperties['200'] = $newProperties[200] + $node->getProperties($currentPropertyNames);
-
-            }
-
-
-            foreach($currentPropertyNames as $prop) {
-
-                if (isset($newProperties[200][$prop])) continue;
-
-                switch($prop) {
-                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
-                    case '{DAV:}getcontentlength'      :
-                        if ($node instanceof Sabre_DAV_IFile) {
-                            $size = $node->getSize();
-                            if (!is_null($size)) {
-                                $newProperties[200][$prop] = (int)$node->getSize();
-                            }
-                        }
-                        break;
-                    case '{DAV:}quota-used-bytes'      :
-                        if ($node instanceof Sabre_DAV_IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[0];
-                        }
-                        break;
-                    case '{DAV:}quota-available-bytes' :
-                        if ($node instanceof Sabre_DAV_IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[1];
-                        }
-                        break;
-                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
-                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
-                    case '{DAV:}supported-report-set'  :
-                        $reports = array();
-                        foreach($this->plugins as $plugin) {
-                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
-                        }
-                        $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports);
-                        break;
-                    case '{DAV:}resourcetype' :
-                        $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
-                        foreach($this->resourceTypeMapping as $className => $resourceType) {
-                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
-                        }
-                        break;
-
-                }
-
-                // If we were unable to find the property, we will list it as 404.
-                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
-
-            }
-
-            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
-
-            $newProperties['href'] = trim($myPath,'/');
-
-            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
-            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
-            // Therefore we add a trailing / for any non-file. This might need adjustments
-            // if we find there are other edge cases.
-            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && count($newProperties[200]['{DAV:}resourcetype']->getValue())>0) $newProperties['href'] .='/';
-
-            // If the resourcetype property was manually added to the requested property list,
-            // we will remove it again.
-            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
-
-            $returnPropertyList[] = $newProperties;
-
-        }
-
-        return $returnPropertyList;
-
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new file.
-     *
-     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
-     * It was important to get this done through a centralized function,
-     * allowing plugins to intercept this using the beforeCreateFile event.
-     *
-     * This method will return true if the file was actually created
-     *
-     * @param string   $uri
-     * @param resource $data
-     * @param string   $etag
-     * @return bool
-     */
-    public function createFile($uri,$data, &$etag = null) {
-
-        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
-
-        $parent = $this->tree->getNodeForPath($dir);
-
-        if (!$this->broadcastEvent('beforeCreateFile',array($uri, &$data, $parent))) return false;
-
-        $etag = $parent->createFile($name,$data);
-        $this->tree->markDirty($dir);
-
-        $this->broadcastEvent('afterBind',array($uri));
-        $this->broadcastEvent('afterCreateFile',array($uri, $parent));
-
-        return true;
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new directory.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function createDirectory($uri) {
-
-        $this->createCollection($uri,array('{DAV:}collection'),array());
-
-    }
-
-    /**
-     * Use this method to create a new collection
-     *
-     * The {DAV:}resourcetype is specified using the resourceType array.
-     * At the very least it must contain {DAV:}collection.
-     *
-     * The properties array can contain a list of additional properties.
-     *
-     * @param string $uri The new uri
-     * @param array $resourceType The resourceType(s)
-     * @param array $properties A list of properties
-     * @return array|null
-     */
-    public function createCollection($uri, array $resourceType, array $properties) {
-
-        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        // Making sure {DAV:}collection was specified as resourceType
-        if (!in_array('{DAV:}collection', $resourceType)) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
-        }
-
-
-        // Making sure the parent exists
-        try {
-
-            $parent = $this->tree->getNodeForPath($parentUri);
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
-
-        }
-
-        // Making sure the parent is a collection
-        if (!$parent instanceof Sabre_DAV_ICollection) {
-            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
-        }
-
-
-
-        // Making sure the child does not already exist
-        try {
-            $parent->getChild($newName);
-
-            // If we got here.. it means there's already a node on that url, and we need to throw a 405
-            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-            // This is correct
-        }
-
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
-
-        // There are 2 modes of operation. The standard collection
-        // creates the directory, and then updates properties
-        // the extended collection can create it directly.
-        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
-
-            $parent->createExtendedCollection($newName, $resourceType, $properties);
-
-        } else {
-
-            // No special resourcetypes are supported
-            if (count($resourceType)>1) {
-                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
-            }
-
-            $parent->createDirectory($newName);
-            $rollBack = false;
-            $exception = null;
-            $errorResult = null;
-
-            if (count($properties)>0) {
-
-                try {
-
-                    $errorResult = $this->updateProperties($uri, $properties);
-                    if (!isset($errorResult[200])) {
-                        $rollBack = true;
-                    }
-
-                } catch (Sabre_DAV_Exception $e) {
-
-                    $rollBack = true;
-                    $exception = $e;
-
-                }
-
-            }
-
-            if ($rollBack) {
-                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-                $this->tree->delete($uri);
-
-                // Re-throwing exception
-                if ($exception) throw $exception;
-
-                return $errorResult;
-            }
-
-        }
-        $this->tree->markDirty($parentUri);
-        $this->broadcastEvent('afterBind',array($uri));
-
-    }
-
-    /**
-     * This method updates a resource's properties
-     *
-     * The properties array must be a list of properties. Array-keys are
-     * property names in clarknotation, array-values are it's values.
-     * If a property must be deleted, the value should be null.
-     *
-     * Note that this request should either completely succeed, or
-     * completely fail.
-     *
-     * The response is an array with statuscodes for keys, which in turn
-     * contain arrays with propertynames. This response can be used
-     * to generate a multistatus body.
-     *
-     * @param string $uri
-     * @param array $properties
-     * @return array
-     */
-    public function updateProperties($uri, array $properties) {
-
-        // we'll start by grabbing the node, this will throw the appropriate
-        // exceptions if it doesn't.
-        $node = $this->tree->getNodeForPath($uri);
-
-        $result = array(
-            200 => array(),
-            403 => array(),
-            424 => array(),
-        );
-        $remainingProperties = $properties;
-        $hasError = false;
-
-        // Running through all properties to make sure none of them are protected
-        if (!$hasError) foreach($properties as $propertyName => $value) {
-            if(in_array($propertyName, $this->protectedProperties)) {
-                $result[403][$propertyName] = null;
-                unset($remainingProperties[$propertyName]);
-                $hasError = true;
-            }
-        }
-
-        if (!$hasError) {
-            // Allowing plugins to take care of property updating
-            $hasError = !$this->broadcastEvent('updateProperties',array(
-                &$remainingProperties,
-                &$result,
-                $node
-            ));
-        }
-
-        // If the node is not an instance of Sabre_DAV_IProperties, every
-        // property is 403 Forbidden
-        if (!$hasError && count($remainingProperties) && !($node instanceof Sabre_DAV_IProperties)) {
-            $hasError = true;
-            foreach($properties as $propertyName=> $value) {
-                $result[403][$propertyName] = null;
-            }
-            $remainingProperties = array();
-        }
-
-        // Only if there were no errors we may attempt to update the resource
-        if (!$hasError) {
-
-            if (count($remainingProperties)>0) {
-
-                $updateResult = $node->updateProperties($remainingProperties);
-
-                if ($updateResult===true) {
-                    // success
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[200][$propertyName] = null;
-                    }
-
-                } elseif ($updateResult===false) {
-                    // The node failed to update the properties for an
-                    // unknown reason
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[403][$propertyName] = null;
-                    }
-
-                } elseif (is_array($updateResult)) {
-
-                    // The node has detailed update information
-                    // We need to merge the results with the earlier results.
-                    foreach($updateResult as $status => $props) {
-                        if (is_array($props)) {
-                            if (!isset($result[$status]))
-                                $result[$status] = array();
-
-                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
-                        }
-                    }
-
-                } else {
-                    throw new Sabre_DAV_Exception('Invalid result from updateProperties');
-                }
-                $remainingProperties = array();
-            }
-
-        }
-
-        foreach($remainingProperties as $propertyName=>$value) {
-            // if there are remaining properties, it must mean
-            // there's a dependency failure
-            $result[424][$propertyName] = null;
-        }
-
-        // Removing empty array values
-        foreach($result as $status=>$props) {
-
-            if (count($props)===0) unset($result[$status]);
-
-        }
-        $result['href'] = $uri;
-        return $result;
-
-    }
-
-    /**
-     * This method checks the main HTTP preconditions.
-     *
-     * Currently these are:
-     *   * If-Match
-     *   * If-None-Match
-     *   * If-Modified-Since
-     *   * If-Unmodified-Since
-     *
-     * The method will return true if all preconditions are met
-     * The method will return false, or throw an exception if preconditions
-     * failed. If false is returned the operation should be aborted, and
-     * the appropriate HTTP response headers are already set.
-     *
-     * Normally this method will throw 412 Precondition Failed for failures
-     * related to If-None-Match, If-Match and If-Unmodified Since. It will
-     * set the status to 304 Not Modified for If-Modified_since.
-     *
-     * If the $handleAsGET argument is set to true, it will also return 304
-     * Not Modified for failure of the If-None-Match precondition. This is the
-     * desired behaviour for HTTP GET and HTTP HEAD requests.
-     *
-     * @param bool $handleAsGET
-     * @return bool
-     */
-    public function checkPreconditions($handleAsGET = false) {
-
-        $uri = $this->getRequestUri();
-        $node = null;
-        $lastMod = null;
-        $etag = null;
-
-        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
-
-            // If-Match contains an entity tag. Only if the entity-tag
-            // matches we are allowed to make the request succeed.
-            // If the entity-tag is '*' we are only allowed to make the
-            // request succeed if a resource exists at that url.
-            try {
-                $node = $this->tree->getNodeForPath($uri);
-            } catch (Sabre_DAV_Exception_NotFound $e) {
-                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
-            }
-
-            // Only need to check entity tags if they are not *
-            if ($ifMatch!=='*') {
-
-                // There can be multiple etags
-                $ifMatch = explode(',',$ifMatch);
-                $haveMatch = false;
-                foreach($ifMatch as $ifMatchItem) {
-
-                    // Stripping any extra spaces
-                    $ifMatchItem = trim($ifMatchItem,' ');
-
-                    $etag = $node->getETag();
-                    if ($etag===$ifMatchItem) {
-                        $haveMatch = true;
-                    } else {
-                        // Evolution has a bug where it sometimes prepends the "
-                        // with a \. This is our workaround.
-                        if (str_replace('\\"','"', $ifMatchItem) === $etag) {
-                            $haveMatch = true;
-                        }
-                    }
-
-                }
-                if (!$haveMatch) {
-                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
-                }
-            }
-        }
-
-        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
-
-            // The If-None-Match header contains an etag.
-            // Only if the ETag does not match the current ETag, the request will succeed
-            // The header can also contain *, in which case the request
-            // will only succeed if the entity does not exist at all.
-            $nodeExists = true;
-            if (!$node) {
-                try {
-                    $node = $this->tree->getNodeForPath($uri);
-                } catch (Sabre_DAV_Exception_NotFound $e) {
-                    $nodeExists = false;
-                }
-            }
-            if ($nodeExists) {
-                $haveMatch = false;
-                if ($ifNoneMatch==='*') $haveMatch = true;
-                else {
-
-                    // There might be multiple etags
-                    $ifNoneMatch = explode(',', $ifNoneMatch);
-                    $etag = $node->getETag();
-
-                    foreach($ifNoneMatch as $ifNoneMatchItem) {
-
-                        // Stripping any extra spaces
-                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
-
-                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
-
-                    }
-
-                }
-
-                if ($haveMatch) {
-                    if ($handleAsGET) {
-                        $this->httpResponse->sendStatus(304);
-                        return false;
-                    } else {
-                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
-                    }
-                }
-            }
-
-        }
-
-        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
-
-            // The If-Modified-Since header contains a date. We
-            // will only return the entity if it has been changed since
-            // that date. If it hasn't been changed, we return a 304
-            // header
-            // Note that this header only has to be checked if there was no If-None-Match header
-            // as per the HTTP spec.
-            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
-
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new DateTime('@' . $lastMod);
-                    if ($lastMod <= $date) {
-                        $this->httpResponse->sendStatus(304);
-                        $this->httpResponse->setHeader('Last-Modified', Sabre_HTTP_Util::toHTTPDate($lastMod));
-                        return false;
-                    }
-                }
-            }
-        }
-
-        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
-
-            // The If-Unmodified-Since will allow allow the request if the
-            // entity has not changed since the specified date.
-            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
-
-            // We must only check the date if it's valid
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new DateTime('@' . $lastMod);
-                    if ($lastMod > $date) {
-                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
-                    }
-                }
-            }
-
-        }
-        return true;
-
-    }
-
-    // }}}
-    // {{{ XML Readers & Writers
-
-
-    /**
-     * Generates a WebDAV propfind response body based on a list of nodes
-     *
-     * @param array $fileProperties The list with nodes
-     * @return string
-     */
-    public function generateMultiStatus(array $fileProperties) {
-
-        $dom = new DOMDocument('1.0','utf-8');
-        //$dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($fileProperties as $entry) {
-
-            $href = $entry['href'];
-            unset($entry['href']);
-
-            $response = new Sabre_DAV_Property_Response($href,$entry);
-            $response->serialize($this,$multiStatus);
-
-        }
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * This method parses a PropPatch request
-     *
-     * PropPatch changes the properties for a resource. This method
-     * returns a list of properties.
-     *
-     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
-     * and the value contains the property value. If a property is to be removed the value
-     * will be null.
-     *
-     * @param string $body xml body
-     * @return array list of properties in need of updating or deletion
-     */
-    public function parsePropPatchRequest($body) {
-
-        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $newProperties = array();
-
-        foreach($dom->firstChild->childNodes as $child) {
-
-            if ($child->nodeType !== XML_ELEMENT_NODE) continue;
-
-            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
-
-            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
-
-            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
-
-            foreach($innerProperties as $propertyName=>$propertyValue) {
-
-                if ($operation==='{DAV:}remove') {
-                    $propertyValue = null;
-                }
-
-                $newProperties[$propertyName] = $propertyValue;
-
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * This method parses the PROPFIND request and returns its information
-     *
-     * This will either be a list of properties, or an empty array; in which case
-     * an {DAV:}allprop was requested.
-     *
-     * @param string $body
-     * @return array
-     */
-    public function parsePropFindRequest($body) {
-
-        // If the propfind body was empty, it means IE is requesting 'all' properties
-        if (!$body) return array();
-
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
-        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem));
-
-    }
-
-    // }}}
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ServerPlugin.php b/3rdparty/Sabre/DAV/ServerPlugin.php
deleted file mode 100755
index 131863d13f..0000000000
--- a/3rdparty/Sabre/DAV/ServerPlugin.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * The baseclass for all server plugins.
- *
- * Plugins can modify or extend the servers behaviour.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_ServerPlugin {
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre_DAV_Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the requires event subscriptions.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    abstract public function initialize(Sabre_DAV_Server $server);
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array();
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        return array();
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return get_class($this);
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleCollection.php b/3rdparty/Sabre/DAV/SimpleCollection.php
deleted file mode 100755
index 4acf971caa..0000000000
--- a/3rdparty/Sabre/DAV/SimpleCollection.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * SimpleCollection
- *
- * The SimpleCollection is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
-
-    /**
-     * List of childnodes
-     *
-     * @var array
-     */
-    protected $children = array();
-
-    /**
-     * Name of this resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, child nodes can also be bassed.
-     * This nodes must be instances of Sabre_DAV_INode
-     *
-     * @param string $name
-     * @param array $children
-     */
-    public function __construct($name,array $children = array()) {
-
-        $this->name = $name;
-        foreach($children as $child) {
-
-            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
-            $this->addChild($child);
-
-        }
-
-    }
-
-    /**
-     * Adds a new childnode to this collection
-     *
-     * @param Sabre_DAV_INode $child
-     * @return void
-     */
-    public function addChild(Sabre_DAV_INode $child) {
-
-        $this->children[$child->getName()] = $child;
-
-    }
-
-    /**
-     * Returns the name of the collection
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    public function getChild($name) {
-
-        if (isset($this->children[$name])) return $this->children[$name];
-        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
-
-    }
-
-    /**
-     * Returns a list of children for this collection
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        return array_values($this->children);
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleDirectory.php b/3rdparty/Sabre/DAV/SimpleDirectory.php
deleted file mode 100755
index 621222ebc5..0000000000
--- a/3rdparty/Sabre/DAV/SimpleDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * SimpleDirectory
- *
- * The SimpleDirectory is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * This class is now deprecated, use Sabre_DAV_SimpleCollection instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated Use Sabre_DAV_SimpleCollection instead.
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleDirectory extends Sabre_DAV_SimpleCollection {
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleFile.php b/3rdparty/Sabre/DAV/SimpleFile.php
deleted file mode 100755
index 58330d6861..0000000000
--- a/3rdparty/Sabre/DAV/SimpleFile.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * SimpleFile
- *
- * The 'SimpleFile' class is used to easily add read-only immutable files to
- * the directory structure. One usecase would be to add a 'readme.txt' to a
- * root of a webserver with some standard content.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleFile extends Sabre_DAV_File {
-
-    /**
-     * File contents
-     *
-     * @var string
-     */
-    protected $contents = array();
-
-    /**
-     * Name of this resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * A mimetype, such as 'text/plain' or 'text/html'
-     *
-     * @var string
-     */
-    protected $mimeType;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, as well as the contents of the
-     * file.
-     *
-     * @param string $name
-     * @param string $contents
-     * @param string|null $mimeType
-     */
-    public function __construct($name, $contents, $mimeType = null) {
-
-        $this->name = $name;
-        $this->contents = $contents;
-        $this->mimeType = $mimeType;
-
-    }
-
-    /**
-     * Returns the node name for this file.
-     *
-     * This name is used to construct the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        return $this->contents;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return strlen($this->contents);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     * @return string
-     */
-    public function getETag() {
-
-        return '"' . md5($this->contents) . '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     * @return string
-     */
-    public function getContentType() {
-
-        return $this->mimeType;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/StringUtil.php b/3rdparty/Sabre/DAV/StringUtil.php
deleted file mode 100755
index b126a94c82..0000000000
--- a/3rdparty/Sabre/DAV/StringUtil.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * String utility
- *
- * This class is mainly used to implement the 'text-match' filter, used by both
- * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
- * Because they both need it, it was decided to put it in Sabre_DAV instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_StringUtil {
-
-    /**
-     * Checks if a needle occurs in a haystack ;)
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param string $collation
-     * @param string $matchType
-     * @return bool
-     */
-    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
-
-        switch($collation) {
-
-            case 'i;ascii-casemap' :
-                // default strtolower takes locale into consideration
-                // we don't want this.
-                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
-                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
-                break;
-
-            case 'i;octet' :
-                // Do nothing
-                break;
-
-            case 'i;unicode-casemap' :
-                $haystack = mb_strtoupper($haystack, 'UTF-8');
-                $needle = mb_strtoupper($needle, 'UTF-8');
-                break;
-
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Collation type: ' . $collation . ' is not supported');
-
-        }
-
-        switch($matchType) {
-
-            case 'contains' :
-                return strpos($haystack, $needle)!==false;
-            case 'equals' :
-                return $haystack === $needle;
-            case 'starts-with' :
-                return strpos($haystack, $needle)===0;
-            case 'ends-with' :
-                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Match-type: ' . $matchType . ' is not supported');
-
-        }
-
-    }
-
-    /**
-     * This method takes an input string, checks if it's not valid UTF-8 and
-     * attempts to convert it to UTF-8 if it's not.
-     *
-     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
-     * anything else will likely fail.
-     *
-     * @param string $input
-     * @return string
-     */
-    static public function ensureUTF8($input) {
-
-        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
-
-        if ($encoding === 'ISO-8859-1') {
-            return utf8_encode($input);
-        } else {
-            return $input;
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
deleted file mode 100755
index 36096e6777..0000000000
--- a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-
-/**
- * Temporary File Filter Plugin
- *
- * The purpose of this filter is to intercept some of the garbage files
- * operation systems and applications tend to generate when mounting
- * a WebDAV share as a disk.
- *
- * It will intercept these files and place them in a separate directory.
- * these files are not deleted automatically, so it is adviceable to
- * delete these after they are not accessed for 24 hours.
- *
- * Currently it supports:
- *   * OS/X style resource forks and .DS_Store
- *   * desktop.ini and Thumbs.db (windows)
- *   * .*.swp (vim temporary files)
- *   * .dat.* (smultron temporary files)
- *
- * Additional patterns can be added, by adding on to the
- * temporaryFilePatterns property.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * This is the list of patterns we intercept.
-     * If new patterns are added, they must be valid patterns for preg_match.
-     *
-     * @var array
-     */
-    public $temporaryFilePatterns = array(
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
-        '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
-        '/^~lock.(.*)#$/', // Windows 7 lockfiles
-    );
-
-    /**
-     * This is the directory where this plugin
-     * will store it's files.
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    /**
-     * A reference to the main Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Creates the plugin.
-     *
-     * Make sure you specify a directory for your files. If you don't, we
-     * will use PHP's directory for session-storage instead, and you might
-     * not want that.
-     *
-     * @param string|null $dataDir
-     */
-    public function __construct($dataDir = null) {
-
-        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
-        if (!is_dir($dataDir)) mkdir($dataDir);
-        $this->dataDir = $dataDir;
-
-    }
-
-    /**
-     * Initialize the plugin
-     *
-     * This is called automatically be the Server class after this plugin is
-     * added with Sabre_DAV_Server::addPlugin()
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
-        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
-
-    }
-
-    /**
-     * This method is called before any HTTP method handler
-     *
-     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
-     * filenames that are known to match the 'temporary file' regex.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if (!$tempLocation = $this->isTempFile($uri))
-            return true;
-
-        switch($method) {
-            case 'GET' :
-                return $this->httpGet($tempLocation);
-            case 'PUT' :
-                return $this->httpPut($tempLocation);
-            case 'PROPFIND' :
-                return $this->httpPropfind($tempLocation, $uri);
-            case 'DELETE' :
-                return $this->httpDelete($tempLocation);
-         }
-         return true;
-
-    }
-
-    /**
-     * This method is invoked if some subsystem creates a new file.
-     *
-     * This is used to deal with HTTP LOCK requests which create a new
-     * file.
-     *
-     * @param string $uri
-     * @param resource $data
-     * @return bool
-     */
-    public function beforeCreateFile($uri,$data) {
-
-        if ($tempPath = $this->isTempFile($uri)) {
-
-            $hR = $this->server->httpResponse;
-            $hR->setHeader('X-Sabre-Temp','true');
-            file_put_contents($tempPath,$data);
-            return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * This method will check if the url matches the temporary file pattern
-     * if it does, it will return an path based on $this->dataDir for the
-     * temporary file storage.
-     *
-     * @param string $path
-     * @return boolean|string
-     */
-    protected function isTempFile($path) {
-
-        // We're only interested in the basename.
-        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
-
-        foreach($this->temporaryFilePatterns as $tempFile) {
-
-            if (preg_match($tempFile,$tempPath)) {
-                return $this->getDataDir() . '/sabredav_' . md5($path) . '.tempfile';
-            }
-
-        }
-
-        return false;
-
-    }
-
-
-    /**
-     * This method handles the GET method for temporary files.
-     * If the file doesn't exist, it will return false which will kick in
-     * the regular system for the GET method.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpGet($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('Content-Type','application/octet-stream');
-        $hR->setHeader('Content-Length',filesize($tempLocation));
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(200);
-        $hR->sendBody(fopen($tempLocation,'r'));
-        return false;
-
-    }
-
-    /**
-     * This method handles the PUT method.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpPut($tempLocation) {
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-
-        $newFile = !file_exists($tempLocation);
-
-        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
-             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
-        }
-
-        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
-        $hR->sendStatus($newFile?201:200);
-        return false;
-
-    }
-
-    /**
-     * This method handles the DELETE method.
-     *
-     * If the file didn't exist, it will return false, which will make the
-     * standard HTTP DELETE handler kick in.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpDelete($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        unlink($tempLocation);
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(204);
-        return false;
-
-    }
-
-    /**
-     * This method handles the PROPFIND method.
-     *
-     * It's a very lazy method, it won't bother checking the request body
-     * for which properties were requested, and just sends back a default
-     * set of properties.
-     *
-     * @param string $tempLocation
-     * @param string $uri
-     * @return bool
-     */
-    public function httpPropfind($tempLocation, $uri) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(207);
-        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true));
-
-        $properties = array(
-            'href' => $uri,
-            200 => array(
-                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
-                '{DAV:}getcontentlength' => filesize($tempLocation),
-                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
-                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true,
-
-            ),
-         );
-
-        $data = $this->server->generateMultiStatus(array($properties));
-        $hR->sendBody($data);
-        return false;
-
-    }
-
-
-    /**
-     * This method returns the directory where the temporary files should be stored.
-     *
-     * @return string
-     */
-    protected function getDataDir()
-    {
-        return $this->dataDir;
-    }
-}
diff --git a/3rdparty/Sabre/DAV/Tree.php b/3rdparty/Sabre/DAV/Tree.php
deleted file mode 100755
index 5021639415..0000000000
--- a/3rdparty/Sabre/DAV/Tree.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/**
- * Abstract tree object
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Tree {
-
-    /**
-     * This function must return an INode object for a path
-     * If a Path doesn't exist, thrown a Exception_NotFound
-     *
-     * @param string $path
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_INode
-     */
-    abstract function getNodeForPath($path);
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * Implementors of this class should override this method to make
-     * it cheaper.
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            $this->getNodeForPath($path);
-            return true;
-
-        } catch (Sabre_DAV_Exception_NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Copies a file from path to another
-     *
-     * @param string $sourcePath The source location
-     * @param string $destinationPath The full destination path
-     * @return void
-     */
-    public function copy($sourcePath, $destinationPath) {
-
-        $sourceNode = $this->getNodeForPath($sourcePath);
-
-        // grab the dirname and basename components
-        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
-
-        $destinationParent = $this->getNodeForPath($destinationDir);
-        $this->copyNode($sourceNode,$destinationParent,$destinationName);
-
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Moves a file from one location to another
-     *
-     * @param string $sourcePath The path to the file which should be moved
-     * @param string $destinationPath The full destination path, so not just the destination parent node
-     * @return int
-     */
-    public function move($sourcePath, $destinationPath) {
-
-        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
-        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
-
-        if ($sourceDir===$destinationDir) {
-            $renameable = $this->getNodeForPath($sourcePath);
-            $renameable->setName($destinationName);
-        } else {
-            $this->copy($sourcePath,$destinationPath);
-            $this->getNodeForPath($sourcePath)->delete();
-        }
-        $this->markDirty($sourceDir);
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Deletes a node from the tree
-     *
-     * @param string $path
-     * @return void
-     */
-    public function delete($path) {
-
-        $node = $this->getNodeForPath($path);
-        $node->delete();
-
-        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
-        $this->markDirty($parent);
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        return $node->getChildren();
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes
-     *
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     *
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path
-     * @return void
-     */
-    public function markDirty($path) {
-
-
-    }
-
-    /**
-     * copyNode
-     *
-     * @param Sabre_DAV_INode $source
-     * @param Sabre_DAV_ICollection $destinationParent
-     * @param string $destinationName
-     * @return void
-     */
-    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
-
-        if (!$destinationName) $destinationName = $source->getName();
-
-        if ($source instanceof Sabre_DAV_IFile) {
-
-            $data = $source->get();
-
-            // If the body was a string, we need to convert it to a stream
-            if (is_string($data)) {
-                $stream = fopen('php://temp','r+');
-                fwrite($stream,$data);
-                rewind($stream);
-                $data = $stream;
-            }
-            $destinationParent->createFile($destinationName,$data);
-            $destination = $destinationParent->getChild($destinationName);
-
-        } elseif ($source instanceof Sabre_DAV_ICollection) {
-
-            $destinationParent->createDirectory($destinationName);
-
-            $destination = $destinationParent->getChild($destinationName);
-            foreach($source->getChildren() as $child) {
-
-                $this->copyNode($child,$destination);
-
-            }
-
-        }
-        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
-
-            $props = $source->getProperties(array());
-            $destination->updateProperties($props);
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Tree/Filesystem.php b/3rdparty/Sabre/DAV/Tree/Filesystem.php
deleted file mode 100755
index 40580ae366..0000000000
--- a/3rdparty/Sabre/DAV/Tree/Filesystem.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Sabre_DAV_Tree_Filesystem
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
-
-    /**
-     * Base url on the filesystem.
-     *
-     * @var string
-     */
-    protected $basePath;
-
-    /**
-     * Creates this tree
-     *
-     * Supply the path you'd like to share.
-     *
-     * @param string $basePath
-     */
-    public function __construct($basePath) {
-
-        $this->basePath = $basePath;
-
-    }
-
-    /**
-     * Returns a new node for the given path
-     *
-     * @param string $path
-     * @return Sabre_DAV_FS_Node
-     */
-    public function getNodeForPath($path) {
-
-        $realPath = $this->getRealPath($path);
-        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_NotFound('File at location ' . $realPath . ' not found');
-        if (is_dir($realPath)) {
-            return new Sabre_DAV_FS_Directory($realPath);
-        } else {
-            return new Sabre_DAV_FS_File($realPath);
-        }
-
-    }
-
-    /**
-     * Returns the real filesystem path for a webdav url.
-     *
-     * @param string $publicPath
-     * @return string
-     */
-    protected function getRealPath($publicPath) {
-
-        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
-
-    }
-
-    /**
-     * Copies a file or directory.
-     *
-     * This method must work recursively and delete the destination
-     * if it exists
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function copy($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        $this->realCopy($source,$destination);
-
-    }
-
-    /**
-     * Used by self::copy
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    protected function realCopy($source,$destination) {
-
-        if (is_file($source)) {
-            copy($source,$destination);
-        } else {
-            mkdir($destination);
-            foreach(scandir($source) as $subnode) {
-
-                if ($subnode=='.' || $subnode=='..') continue;
-                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
-
-            }
-        }
-
-    }
-
-    /**
-     * Moves a file or directory recursively.
-     *
-     * If the destination exists, delete it first.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function move($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        rename($source,$destination);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/URLUtil.php b/3rdparty/Sabre/DAV/URLUtil.php
deleted file mode 100755
index 794665a44f..0000000000
--- a/3rdparty/Sabre/DAV/URLUtil.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * URL utility class
- *
- * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
- *
- * It was not possible to use PHP's built-in methods for this, because some clients don't like
- * encoding of certain characters.
- *
- * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
- * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
- * kept as-is.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_URLUtil {
-
-    /**
-     * Encodes the path of a url.
-     *
-     * slashes (/) are treated as path-separators.
-     *
-     * @param string $path
-     * @return string
-     */
-    static function encodePath($path) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $path);
-
-    }
-
-    /**
-     * Encodes a 1 segment of a path
-     *
-     * Slashes are considered part of the name, and are encoded as %2f
-     *
-     * @param string $pathSegment
-     * @return string
-     */
-    static function encodePathSegment($pathSegment) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $pathSegment);
-    }
-
-    /**
-     * Decodes a url-encoded path
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePath($path) {
-
-        return self::decodePathSegment($path);
-
-    }
-
-    /**
-     * Decodes a url-encoded path segment
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePathSegment($path) {
-
-        $path = rawurldecode($path);
-        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
-
-        switch($encoding) {
-
-            case 'ISO-8859-1' :
-                $path = utf8_encode($path);
-
-        }
-
-        return $path;
-
-    }
-
-    /**
-     * Returns the 'dirname' and 'basename' for a path.
-     *
-     * The reason there is a custom function for this purpose, is because
-     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
-     * and we need a method that just operates on UTF-8 characters.
-     *
-     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
-     * directory separator on windows.
-     *
-     * This method returns the 2 components as an array.
-     *
-     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
-     * string is stripped off.
-     *
-     * @param string $path
-     * @return array
-     */
-    static function splitPath($path) {
-
-        $matches = array();
-        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
-            return array($matches[1],$matches[2]);
-        } else {
-            return array(null,null);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/UUIDUtil.php b/3rdparty/Sabre/DAV/UUIDUtil.php
deleted file mode 100755
index f0eebe598e..0000000000
--- a/3rdparty/Sabre/DAV/UUIDUtil.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * UUID Utility
- *
- * This class has static methods to generate and validate UUID's.
- * UUIDs are used a decent amount within various *DAV standards, so it made
- * sense to include it.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_UUIDUtil {
-
-    /**
-     * Returns a pseudo-random v4 UUID
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     * @return string
-     */
-    static function getUUID() {
-
-        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_mid"
-            mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand( 0, 0x0fff ) | 0x4000,
-
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand( 0, 0x3fff ) | 0x8000,
-
-            // 48 bits for "node"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-        );
-    }
-
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     * @return bool
-     */
-    static function validateUUID($uuid) {
-
-        return preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        ) == true;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Version.php b/3rdparty/Sabre/DAV/Version.php
deleted file mode 100755
index 40cfe81b34..0000000000
--- a/3rdparty/Sabre/DAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the SabreDAV version constants.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/DAV/XMLUtil.php b/3rdparty/Sabre/DAV/XMLUtil.php
deleted file mode 100755
index 60eff3b159..0000000000
--- a/3rdparty/Sabre/DAV/XMLUtil.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * XML utilities for WebDAV
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_XMLUtil {
-
-    /**
-     * Returns the 'clark notation' for an element.
-     *
-     * For example, and element encoded as:
-     * <b:myelem xmlns:b="http://www.example.org/" />
-     * will be returned as:
-     * {http://www.example.org}myelem
-     *
-     * This format is used throughout the SabreDAV sourcecode.
-     * Elements encoded with the urn:DAV namespace will
-     * be returned as if they were in the DAV: namespace. This is to avoid
-     * compatibility problems.
-     *
-     * This function will return null if a nodetype other than an Element is passed.
-     *
-     * @param DOMNode $dom
-     * @return string
-     */
-    static function toClarkNotation(DOMNode $dom) {
-
-        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
-
-        // Mapping back to the real namespace, in case it was dav
-        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
-
-        // Mapping to clark notation
-        return '{' . $ns . '}' . $dom->localName;
-
-    }
-
-    /**
-     * Parses a clark-notation string, and returns the namespace and element
-     * name components.
-     *
-     * If the string was invalid, it will throw an InvalidArgumentException.
-     *
-     * @param string $str
-     * @throws InvalidArgumentException
-     * @return array
-     */
-    static function parseClarkNotation($str) {
-
-        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
-            throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
-        }
-
-        return array(
-            $matches[1],
-            $matches[2]
-        );
-
-    }
-
-    /**
-     * This method takes an XML document (as string) and converts all instances of the
-     * DAV: namespace to urn:DAV
-     *
-     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
-     * spec, and causes the DOM to throw errors
-     *
-     * @param string $xmlDocument
-     * @return array|string|null
-     */
-    static function convertDAVNamespace($xmlDocument) {
-
-        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
-        // namespace is actually a violation of the XML namespaces specification, and will cause errors
-        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
-
-    }
-
-    /**
-     * This method provides a generic way to load a DOMDocument for WebDAV use.
-     *
-     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
-     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
-     *
-     * @param string $xml
-     * @throws Sabre_DAV_Exception_BadRequest
-     * @return DOMDocument
-     */
-    static function loadDOMDocument($xml) {
-
-        if (empty($xml))
-            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
-
-        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
-        // does not support this, so we must intercept this and convert to UTF-8.
-        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
-
-            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
-            $xml = iconv('UTF-16LE','UTF-8',$xml);
-
-            // Because the xml header might specify the encoding, we must also change this.
-            // This regex looks for the string encoding="UTF-16" and replaces it with
-            // encoding="UTF-8".
-            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
-
-        }
-
-        // Retaining old error setting
-        $oldErrorSetting =  libxml_use_internal_errors(true);
-
-        // Clearing any previous errors
-        libxml_clear_errors();
-
-        $dom = new DOMDocument();
-        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
-
-        // We don't generally care about any whitespace
-        $dom->preserveWhiteSpace = false;
-
-        if ($error = libxml_get_last_error()) {
-            libxml_clear_errors();
-            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
-        }
-
-        // Restoring old mechanism for error handling
-        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
-
-        return $dom;
-
-    }
-
-    /**
-     * Parses all WebDAV properties out of a DOM Element
-     *
-     * Generally WebDAV properties are enclosed in {DAV:}prop elements. This
-     * method helps by going through all these and pulling out the actual
-     * propertynames, making them array keys and making the property values,
-     * well.. the array values.
-     *
-     * If no value was given (self-closing element) null will be used as the
-     * value. This is used in for example PROPFIND requests.
-     *
-     * Complex values are supported through the propertyMap argument. The
-     * propertyMap should have the clark-notation properties as it's keys, and
-     * classnames as values.
-     *
-     * When any of these properties are found, the unserialize() method will be
-     * (statically) called. The result of this method is used as the value.
-     *
-     * @param DOMElement $parentNode
-     * @param array $propertyMap
-     * @return array
-     */
-    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
-
-        $propList = array();
-        foreach($parentNode->childNodes as $propNode) {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
-
-            foreach($propNode->childNodes as $propNodeData) {
-
-                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
-                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
-
-                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
-                if (isset($propertyMap[$propertyName])) {
-                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData);
-                } else {
-                    $propList[$propertyName] = $propNodeData->textContent;
-                }
-            }
-
-
-        }
-        return $propList;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/includes.php b/3rdparty/Sabre/DAV/includes.php
deleted file mode 100755
index 6a4890677e..0000000000
--- a/3rdparty/Sabre/DAV/includes.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Sabre_DAV includes file
- *
- * Including this file will automatically include all files from the Sabre_DAV
- * package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/Auth/IBackend.php';
-include __DIR__ . '/Client.php';
-include __DIR__ . '/Exception.php';
-include __DIR__ . '/INode.php';
-include __DIR__ . '/IProperties.php';
-include __DIR__ . '/Locks/Backend/Abstract.php';
-include __DIR__ . '/Locks/Backend/File.php';
-include __DIR__ . '/Locks/Backend/FS.php';
-include __DIR__ . '/Locks/Backend/PDO.php';
-include __DIR__ . '/Locks/LockInfo.php';
-include __DIR__ . '/Node.php';
-include __DIR__ . '/Property/IHref.php';
-include __DIR__ . '/Property.php';
-include __DIR__ . '/Server.php';
-include __DIR__ . '/ServerPlugin.php';
-include __DIR__ . '/StringUtil.php';
-include __DIR__ . '/TemporaryFileFilterPlugin.php';
-include __DIR__ . '/Tree.php';
-include __DIR__ . '/URLUtil.php';
-include __DIR__ . '/UUIDUtil.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/XMLUtil.php';
-include __DIR__ . '/Auth/Backend/AbstractBasic.php';
-include __DIR__ . '/Auth/Backend/AbstractDigest.php';
-include __DIR__ . '/Auth/Backend/Apache.php';
-include __DIR__ . '/Auth/Backend/File.php';
-include __DIR__ . '/Auth/Backend/PDO.php';
-include __DIR__ . '/Auth/Plugin.php';
-include __DIR__ . '/Browser/GuessContentType.php';
-include __DIR__ . '/Browser/MapGetToPropFind.php';
-include __DIR__ . '/Browser/Plugin.php';
-include __DIR__ . '/Exception/BadRequest.php';
-include __DIR__ . '/Exception/Conflict.php';
-include __DIR__ . '/Exception/Forbidden.php';
-include __DIR__ . '/Exception/InsufficientStorage.php';
-include __DIR__ . '/Exception/InvalidResourceType.php';
-include __DIR__ . '/Exception/Locked.php';
-include __DIR__ . '/Exception/LockTokenMatchesRequestUri.php';
-include __DIR__ . '/Exception/MethodNotAllowed.php';
-include __DIR__ . '/Exception/NotAuthenticated.php';
-include __DIR__ . '/Exception/NotFound.php';
-include __DIR__ . '/Exception/NotImplemented.php';
-include __DIR__ . '/Exception/PaymentRequired.php';
-include __DIR__ . '/Exception/PreconditionFailed.php';
-include __DIR__ . '/Exception/ReportNotImplemented.php';
-include __DIR__ . '/Exception/RequestedRangeNotSatisfiable.php';
-include __DIR__ . '/Exception/UnsupportedMediaType.php';
-include __DIR__ . '/FS/Node.php';
-include __DIR__ . '/FSExt/Node.php';
-include __DIR__ . '/ICollection.php';
-include __DIR__ . '/IExtendedCollection.php';
-include __DIR__ . '/IFile.php';
-include __DIR__ . '/IQuota.php';
-include __DIR__ . '/Locks/Plugin.php';
-include __DIR__ . '/Mount/Plugin.php';
-include __DIR__ . '/ObjectTree.php';
-include __DIR__ . '/Property/GetLastModified.php';
-include __DIR__ . '/Property/Href.php';
-include __DIR__ . '/Property/HrefList.php';
-include __DIR__ . '/Property/LockDiscovery.php';
-include __DIR__ . '/Property/ResourceType.php';
-include __DIR__ . '/Property/Response.php';
-include __DIR__ . '/Property/ResponseList.php';
-include __DIR__ . '/Property/SupportedLock.php';
-include __DIR__ . '/Property/SupportedReportSet.php';
-include __DIR__ . '/Tree/Filesystem.php';
-include __DIR__ . '/Collection.php';
-include __DIR__ . '/Directory.php';
-include __DIR__ . '/Exception/ConflictingLock.php';
-include __DIR__ . '/Exception/FileNotFound.php';
-include __DIR__ . '/File.php';
-include __DIR__ . '/FS/Directory.php';
-include __DIR__ . '/FS/File.php';
-include __DIR__ . '/FSExt/Directory.php';
-include __DIR__ . '/FSExt/File.php';
-include __DIR__ . '/SimpleCollection.php';
-include __DIR__ . '/SimpleDirectory.php';
-include __DIR__ . '/SimpleFile.php';
-// End includes
diff --git a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
deleted file mode 100755
index e05b774980..0000000000
--- a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Principals Collection
- *
- * This is a helper class that easily allows you to create a collection that
- * has a childnode for every principal.
- *
- * To use this class, simply implement the getChildForPrincipal method.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection  {
-
-    /**
-     * Node or 'directory' name.
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * If this value is set to true, it effectively disables listing of users
-     * it still allows user to find other users if they have an exact url.
-     *
-     * @var bool
-     */
-    public $disableListing = false;
-
-    /**
-     * Creates the object
-     *
-     * This object must be passed the principal backend. This object will
-     * filter all principals from a specified prefix ($principalPrefix). The
-     * default is 'principals', if your principals are stored in a different
-     * collection, override $principalPrefix
-     *
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, $principalPrefix = 'principals') {
-
-        $this->principalPrefix = $principalPrefix;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return Sabre_DAVACL_IPrincipal
-     */
-    abstract function getChildForPrincipal(array $principalInfo);
-
-    /**
-     * Returns the name of this collection.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalPrefix);
-        return $name;
-
-    }
-
-    /**
-     * Return the list of users
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        if ($this->disableListing)
-            throw new Sabre_DAV_Exception_MethodNotAllowed('Listing members of this collection is disabled');
-
-        $children = array();
-        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
-
-            $children[] = $this->getChildForPrincipal($principalInfo);
-
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * @param string $name
-     * @throws Sabre_DAV_Exception_NotFound
-     * @return Sabre_DAV_IPrincipal
-     */
-    public function getChild($name) {
-
-        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new Sabre_DAV_Exception_NotFound('Principal with name ' . $name . ' not found');
-        return $this->getChildForPrincipal($principalInfo);
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return a list of 'child names', which may be
-     * used to call $this->getChild in the future.
-     *
-     * @param array $searchProperties
-     * @return array
-     */
-    public function searchPrincipals(array $searchProperties) {
-
-        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties);
-        $r = array();
-
-        foreach($result as $row) {
-            list(, $r[]) = Sabre_DAV_URLUtil::splitPath($row);
-        }
-
-        return $r;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
deleted file mode 100755
index 4b9f93b003..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_AceConflict
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
deleted file mode 100755
index 9b055dd970..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * NeedPrivileges
- *
- * The 403-need privileges is thrown when a user didn't have the appropriate
- * permissions to perform an operation
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
-
-    /**
-     * The relevant uri
-     *
-     * @var string
-     */
-    protected $uri;
-
-    /**
-     * The privileges the user didn't have.
-     *
-     * @var array
-     */
-    protected $privileges;
-
-    /**
-     * Constructor
-     *
-     * @param string $uri
-     * @param array $privileges
-     */
-    public function __construct($uri,array $privileges) {
-
-        $this->uri = $uri;
-        $this->privileges = $privileges;
-
-        parent::__construct('User did not have the required privileges (' . implode(',', $privileges) . ') for path "' . $uri . '"');
-
-    }
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}need-privileges element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:need-privileges');
-        $errorNode->appendChild($np);
-
-        foreach($this->privileges as $privilege) {
-
-            $resource = $doc->createElementNS('DAV:','d:resource');
-            $np->appendChild($resource);
-
-            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
-
-            $priv = $doc->createElementNS('DAV:','d:privilege');
-            $resource->appendChild($priv);
-
-            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
-            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
-
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
deleted file mode 100755
index f44e3e3228..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NoAbstract
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-abstract element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:no-abstract');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
deleted file mode 100755
index 8d1e38ca1b..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NotRecognizedPrincipal
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:recognized-principal');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
deleted file mode 100755
index 3b5d012d7f..0000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NotSupportedPrivilege
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IACL.php b/3rdparty/Sabre/DAVACL/IACL.php
deleted file mode 100755
index 003e699348..0000000000
--- a/3rdparty/Sabre/DAVACL/IACL.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * ACL-enabled node
- *
- * If you want to add WebDAV ACL to a node, you must implement this class
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IACL extends Sabre_DAV_INode {
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getOwner();
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup();
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL();
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl);
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet();
-
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipal.php b/3rdparty/Sabre/DAVACL/IPrincipal.php
deleted file mode 100755
index fc7605bf62..0000000000
--- a/3rdparty/Sabre/DAVACL/IPrincipal.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * IPrincipal interface
- *
- * Implement this interface to define your own principals
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    function getAlternateUriSet();
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    function getPrincipalUrl();
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    function getGroupMemberSet();
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    function getGroupMembership();
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    function setGroupMemberSet(array $principals);
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    function getDisplayName();
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
deleted file mode 100755
index e798bf890c..0000000000
--- a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * Implement this interface to create your own principal backends.
- *
- * Creating backends for principals is entirely optional. You can also
- * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by
- * Sabre_DAVACL_AbstractPrincipalCollection.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IPrincipalBackend {
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actually injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    function getPrincipalsByPrefix($prefixPath);
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    function getPrincipalByPath($path);
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is supplied as an array. Each key in the array is
-     * a propertyname, such as {DAV:}displayname.
-     *
-     * Each value is the actual value to be updated. If a value is null, it
-     * must be deleted.
-     *
-     * This method should be atomic. It must either completely succeed, or
-     * completely fail. Success and failure can simply be returned as 'true' or
-     * 'false'.
-     *
-     * It is also possible to return detailed failure information. In that case
-     * an array such as this should be returned:
-     *
-     * array(
-     *   200 => array(
-     *      '{DAV:}prop1' => null,
-     *   ),
-     *   201 => array(
-     *      '{DAV:}prop2' => null,
-     *   ),
-     *   403 => array(
-     *      '{DAV:}prop3' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}prop4' => null,
-     *   ),
-     * );
-     *
-     * In this previous example prop1 was successfully updated or deleted, and
-     * prop2 was succesfully created.
-     *
-     * prop3 failed to update due to '403 Forbidden' and because of this prop4
-     * also could not be updated with '424 Failed dependency'.
-     *
-     * This last example was actually incorrect. While 200 and 201 could appear
-     * in 1 response, if there's any error (403) the other properties should
-     * always fail with 423 (failed dependency).
-     *
-     * But anyway, if you don't want to scratch your head over this, just
-     * return true or false.
-     *
-     * @param string $path
-     * @param array $mutations
-     * @return array|bool
-     */
-    function updatePrincipal($path, $mutations);
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @return array
-     */
-    function searchPrincipals($prefixPath, array $searchProperties);
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    function getGroupMemberSet($principal);
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    function getGroupMembership($principal);
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    function setGroupMemberSet($principal, array $members);
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Plugin.php b/3rdparty/Sabre/DAVACL/Plugin.php
deleted file mode 100755
index 5c828c6d97..0000000000
--- a/3rdparty/Sabre/DAVACL/Plugin.php
+++ /dev/null
@@ -1,1348 +0,0 @@
-<?php
-
-/**
- * SabreDAV ACL Plugin
- *
- * This plugin provides funcitonality to enforce ACL permissions.
- * ACL is defined in RFC3744.
- *
- * In addition it also provides support for the {DAV:}current-user-principal
- * property, defined in RFC5397 and the {DAV:}expand-property report, as
- * defined in RFC3253.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Recursion constants
-     *
-     * This only checks the base node
-     */
-    const R_PARENT = 1;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every node in the tree
-     */
-    const R_RECURSIVE = 2;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every parentnode in the tree, but not leaf-nodes.
-     */
-    const R_RECURSIVEPARENTS = 3;
-
-    /**
-     * Reference to server object.
-     *
-     * @var Sabre_DAV_Server
-     */
-    protected $server;
-
-    /**
-     * List of urls containing principal collections.
-     * Modify this if your principals are located elsewhere.
-     *
-     * @var array
-     */
-    public $principalCollectionSet = array(
-        'principals',
-    );
-
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the
-     * ones that implement Sabre_DAVACL_IACL). For any other node, access is
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
-    /**
-     * By default nodes that are inaccessible by the user, can still be seen
-     * in directory listings (PROPFIND on parent with Depth: 1)
-     *
-     * In certain cases it's desirable to hide inaccessible nodes. Setting this
-     * to true will cause these nodes to be hidden from directory listings.
-     *
-     * @var bool
-     */
-    public $hideNodesFromListings = false;
-
-    /**
-     * This string is prepended to the username of the currently logged in
-     * user. This allows the plugin to determine the principal path based on
-     * the username.
-     *
-     * @var string
-     */
-    public $defaultUsernamePath = 'principals';
-
-    /**
-     * This list of properties are the properties a client can search on using
-     * the {DAV:}principal-property-search report.
-     *
-     * The keys are the property names, values are descriptions.
-     *
-     * @var array
-     */
-    public $principalSearchPropertySet = array(
-        '{DAV:}displayname' => 'Display name',
-        '{http://sabredav.org/ns}email-address' => 'Email address',
-    );
-
-    /**
-     * Any principal uri's added here, will automatically be added to the list 
-     * of ACL's. They will effectively receive {DAV:}all privileges, as a 
-     * protected privilege.
-     * 
-     * @var array 
-     */
-    public $adminPrincipals = array();
-
-    /**
-     * Returns a list of features added by this plugin.
-     *
-     * This list is used in the response of a HTTP OPTIONS request.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('access-control');
-
-    }
-
-    /**
-     * Returns a list of available methods for a given url
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getMethods($uri) {
-
-        return array('ACL');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'acl';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array(
-            '{DAV:}expand-property',
-            '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set',
-        );
-
-    }
-
-
-    /**
-     * Checks if the current user has the specified privilege(s).
-     *
-     * You can specify a single privilege, or a list of privileges.
-     * This method will throw an exception if the privilege is not available
-     * and return true otherwise.
-     *
-     * @param string $uri
-     * @param array|string $privileges
-     * @param int $recursion
-     * @param bool $throwExceptions if set to false, this method won't through exceptions.
-     * @throws Sabre_DAVACL_Exception_NeedPrivileges
-     * @return bool
-     */
-    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-
-        if (!is_array($privileges)) $privileges = array($privileges);
-
-        $acl = $this->getCurrentUserPrivilegeSet($uri);
-
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions)
-                    throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$privileges);
-                else
-                    return false;
-
-            }
-        }
-
-        $failed = array();
-        foreach($privileges as $priv) {
-
-            if (!in_array($priv, $acl)) {
-                $failed[] = $priv;
-            }
-
-        }
-
-        if ($failed) {
-            if ($throwExceptions)
-                throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$failed);
-            else
-                return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * Returns the standard users' principal.
-     *
-     * This is one authorative principal url for the current user.
-     * This method will return null if the user wasn't logged in.
-     *
-     * @return string|null
-     */
-    public function getCurrentUserPrincipal() {
-
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
-
-        $userName = $authPlugin->getCurrentUser();
-        if (!$userName) return null;
-
-        return $this->defaultUsernamePath . '/' . $userName;
-
-    }
-
-    /**
-     * Returns a list of principals that's associated to the current
-     * user, either directly or through group membership.
-     *
-     * @return array
-     */
-    public function getCurrentUserPrincipals() {
-
-        $currentUser = $this->getCurrentUserPrincipal();
-
-        if (is_null($currentUser)) return array();
-
-        $check = array($currentUser);
-        $principals = array($currentUser);
-
-        while(count($check)) {
-
-            $principal = array_shift($check);
-
-            $node = $this->server->tree->getNodeForPath($principal);
-            if ($node instanceof Sabre_DAVACL_IPrincipal) {
-                foreach($node->getGroupMembership() as $groupMember) {
-
-                    if (!in_array($groupMember, $principals)) {
-
-                        $check[] = $groupMember;
-                        $principals[] = $groupMember;
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the supported privilege structure for this ACL plugin.
-     *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure.
-     *
-     * You can either get the list of privileges by a uri (path) or by
-     * specifying a Node.
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getSupportedPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        if ($node instanceof Sabre_DAVACL_IACL) {
-            $result = $node->getSupportedPrivilegeSet();
-
-            if ($result)
-                return $result;
-        }
-
-        return self::getDefaultSupportedPrivilegeSet();
-
-    }
-
-    /**
-     * Returns a fairly standard set of privileges, which may be useful for
-     * other systems to use as a basis.
-     *
-     * @return array
-     */
-    static function getDefaultSupportedPrivilegeSet() {
-
-        return array(
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => array(
-                array(
-                    'privilege'  => '{DAV:}read',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}read
-                array(
-                    'privilege'  => '{DAV:}write',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}write
-            ),
-        ); // {DAV:}all
-
-    }
-
-    /**
-     * Returns the supported privilege set as a flat list
-     *
-     * This is much easier to parse.
-     *
-     * The returned list will be index by privilege name.
-     * The value is a struct containing the following properties:
-     *   - aggregates
-     *   - abstract
-     *   - concrete
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    final public function getFlatPrivilegeSet($node) {
-
-        $privs = $this->getSupportedPrivilegeSet($node);
-
-        $flat = array();
-        $this->getFPSTraverse($privs, null, $flat);
-
-        return $flat;
-
-    }
-
-    /**
-     * Traverses the privilege set tree for reordering
-     *
-     * This function is solely used by getFlatPrivilegeSet, and would have been
-     * a closure if it wasn't for the fact I need to support PHP 5.2.
-     *
-     * @param array $priv
-     * @param $concrete
-     * @param array $flat
-     * @return void
-     */
-    final private function getFPSTraverse($priv, $concrete, &$flat) {
-
-        $myPriv = array(
-            'privilege' => $priv['privilege'],
-            'abstract' => isset($priv['abstract']) && $priv['abstract'],
-            'aggregates' => array(),
-            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
-        );
-
-        if (isset($priv['aggregates']))
-            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
-
-        $flat[$priv['privilege']] = $myPriv;
-
-        if (isset($priv['aggregates'])) {
-
-            foreach($priv['aggregates'] as $subPriv) {
-
-                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the full ACL list.
-     *
-     * Either a uri or a Sabre_DAV_INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getACL($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-        if (!$node instanceof Sabre_DAVACL_IACL) {
-            return null;
-        }
-        $acl = $node->getACL();
-        foreach($this->adminPrincipals as $adminPrincipal) {
-            $acl[] = array(
-                'principal' => $adminPrincipal,
-                'privilege' => '{DAV:}all',
-                'protected' => true,
-            );
-        }
-        return $acl;
-
-    }
-
-    /**
-     * Returns a list of privileges the current user has
-     * on a particular node.
-     *
-     * Either a uri or a Sabre_DAV_INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getCurrentUserPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        $acl = $this->getACL($node);
-
-        if (is_null($acl)) return null;
-
-        $principals = $this->getCurrentUserPrincipals();
-
-        $collected = array();
-
-        foreach($acl as $ace) {
-
-            $principal = $ace['principal'];
-
-            switch($principal) {
-
-                case '{DAV:}owner' :
-                    $owner = $node->getOwner();
-                    if ($owner && in_array($owner, $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-
-                // 'all' matches for every user
-                case '{DAV:}all' :
-
-                // 'authenticated' matched for every user that's logged in.
-                // Since it's not possible to use ACL while not being logged
-                // in, this is also always true.
-                case '{DAV:}authenticated' :
-                    $collected[] = $ace;
-                    break;
-
-                // 'unauthenticated' can never occur either, so we simply
-                // ignore these.
-                case '{DAV:}unauthenticated' :
-                    break;
-
-                default :
-                    if (in_array($ace['principal'], $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-            }
-
-
-
-        }
-
-        // Now we deduct all aggregated privileges.
-        $flat = $this->getFlatPrivilegeSet($node);
-
-        $collected2 = array();
-        while(count($collected)) {
-
-            $current = array_pop($collected);
-            $collected2[] = $current['privilege'];
-
-            foreach($flat[$current['privilege']]['aggregates'] as $subPriv) {
-                $collected2[] = $subPriv;
-                $collected[] = $flat[$subPriv];
-            }
-
-        }
-
-        return array_values(array_unique($collected2));
-
-    }
-
-    /**
-     * Principal property search
-     *
-     * This method can search for principals matching certain values in
-     * properties.
-     *
-     * This method will return a list of properties for the matched properties.
-     *
-     * @param array $searchProperties    The properties to search on. This is a
-     *                                   key-value list. The keys are property
-     *                                   names, and the values the strings to
-     *                                   match them on.
-     * @param array $requestedProperties This is the list of properties to
-     *                                   return for every match.
-     * @param string $collectionUri      The principal collection to search on.
-     *                                   If this is ommitted, the standard
-     *                                   principal collection-set will be used.
-     * @return array     This method returns an array structure similar to
-     *                  Sabre_DAV_Server::getPropertiesForPath. Returned
-     *                  properties are index by a HTTP status code.
-     *
-     */
-    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null) {
-
-        if (!is_null($collectionUri)) {
-            $uris = array($collectionUri);
-        } else {
-            $uris = $this->principalCollectionSet;
-        }
-
-        $lookupResults = array();
-        foreach($uris as $uri) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($uri);
-            if (!$principalCollection instanceof Sabre_DAVACL_AbstractPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $results = $principalCollection->searchPrincipals($searchProperties);
-            foreach($results as $result) {
-                $lookupResults[] = rtrim($uri,'/') . '/' . $result;
-            }
-
-        }
-
-        $matches = array();
-
-        foreach($lookupResults as $lookupResult) {
-
-            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
-
-        }
-
-        return $matches;
-
-    }
-
-    /**
-     * Sets up the plugin
-     *
-     * This method is automatically called by the server class.
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-
-        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
-        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
-        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
-        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
-        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
-
-        array_push($server->protectedProperties,
-            '{DAV:}alternate-URI-set',
-            '{DAV:}principal-URL',
-            '{DAV:}group-membership',
-            '{DAV:}principal-collection-set',
-            '{DAV:}current-user-principal',
-            '{DAV:}supported-privilege-set',
-            '{DAV:}current-user-privilege-set',
-            '{DAV:}acl',
-            '{DAV:}acl-restrictions',
-            '{DAV:}inherited-acl-set',
-            '{DAV:}owner',
-            '{DAV:}group'
-        );
-
-        // Automatically mapping nodes implementing IPrincipal to the
-        // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre_DAVACL_IPrincipal'] = '{DAV:}principal';
-
-        // Mapping the group-member-set property to the HrefList property
-        // class.
-        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre_DAV_Property_HrefList';
-
-    }
-
-
-    /* {{{ Event handlers */
-
-    /**
-     * Triggered before any method is handled
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function beforeMethod($method, $uri) {
-
-        $exists = $this->server->tree->nodeExists($uri);
-
-        // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
-
-        switch($method) {
-
-            case 'GET' :
-            case 'HEAD' :
-            case 'OPTIONS' :
-                // For these 3 we only need to know if the node is readable.
-                $this->checkPrivileges($uri,'{DAV:}read');
-                break;
-
-            case 'PUT' :
-            case 'LOCK' :
-            case 'UNLOCK' :
-                // This method requires the write-content priv if the node
-                // already exists, and bind on the parent if the node is being
-                // created.
-                // The bind privilege is handled in the beforeBind event.
-                $this->checkPrivileges($uri,'{DAV:}write-content');
-                break;
-
-
-            case 'PROPPATCH' :
-                $this->checkPrivileges($uri,'{DAV:}write-properties');
-                break;
-
-            case 'ACL' :
-                $this->checkPrivileges($uri,'{DAV:}write-acl');
-                break;
-
-            case 'COPY' :
-            case 'MOVE' :
-                // Copy requires read privileges on the entire source tree.
-                // If the target exists write-content normally needs to be
-                // checked, however, we're deleting the node beforehand and
-                // creating a new one after, so this is handled by the
-                // beforeUnbind event.
-                //
-                // The creation of the new node is handled by the beforeBind
-                // event.
-                //
-                // If MOVE is used beforeUnbind will also be used to check if
-                // the sourcenode can be deleted.
-                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
-
-                break;
-
-        }
-
-    }
-
-    /**
-     * Triggered before a new node is created.
-     *
-     * This allows us to check permissions for any operation that creates a
-     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeBind($uri) {
-
-        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}bind');
-
-    }
-
-    /**
-     * Triggered before a node is deleted
-     *
-     * This allows us to check permissions for any operation that will delete
-     * an existing node.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeUnbind($uri) {
-
-        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
-
-    }
-
-    /**
-     * Triggered before a node is unlocked.
-     *
-     * @param string $uri
-     * @param Sabre_DAV_Locks_LockInfo $lock
-     * @TODO: not yet implemented
-     * @return void
-     */
-    public function beforeUnlock($uri, Sabre_DAV_Locks_LockInfo $lock) {
-
-
-    }
-
-    /**
-     * Triggered before properties are looked up in specific nodes.
-     *
-     * @param string $uri
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @TODO really should be broken into multiple methods, or even a class.
-     * @return void
-     */
-    public function beforeGetProperties($uri, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
-
-        // Checking the read permission
-        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
-
-            // User is not allowed to read properties
-            if ($this->hideNodesFromListings) {
-                return false;
-            }
-
-            // Marking all requested properties as '403'.
-            foreach($requestedProperties as $key=>$requestedProperty) {
-                unset($requestedProperties[$key]);
-                $returnedProperties[403][$requestedProperty] = null;
-            }
-            return;
-
-        }
-
-        /* Adding principal properties */
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new Sabre_DAV_Property_HrefList($node->getAlternateUriSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}principal-URL'] = new Sabre_DAV_Property_Href($node->getPrincipalUrl() . '/');
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-member-set'] = new Sabre_DAV_Property_HrefList($node->getGroupMemberSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-membership'] = new Sabre_DAV_Property_HrefList($node->getGroupMembership());
-
-            }
-
-            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
-
-                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
-
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $val = $this->principalCollectionSet;
-            // Ensuring all collections end with a slash
-            foreach($val as $k=>$v) $val[$k] = $v . '/';
-            $returnedProperties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_HrefList($val);
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            if ($url = $this->getCurrentUserPrincipal()) {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF, $url . '/');
-            } else {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::UNAUTHENTICATED);
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Sabre_DAVACL_Property_SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
-                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
-                unset($requestedProperties[$index]);
-            } else {
-                $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Sabre_DAVACL_Property_CurrentUserPrivilegeSet($val);
-                }
-            }
-
-        }
-
-        /* The ACL property contains all the permissions */
-        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[403]['{DAV:}acl'] = null;
-
-            } else {
-
-                $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}acl'] = new Sabre_DAVACL_Property_Acl($this->getACL($node));
-                }
-
-            }
-
-        }
-
-        /* The acl-restrictions property contains information on how privileges
-         * must behave.
-         */
-        if (false !== ($index = array_search('{DAV:}acl-restrictions', $requestedProperties))) {
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}acl-restrictions'] = new Sabre_DAVACL_Property_AclRestrictions();
-        }
-
-    }
-
-    /**
-     * This method intercepts PROPPATCH methods and make sure the
-     * group-member-set is updated correctly.
-     *
-     * @param array $propertyDelta
-     * @param array $result
-     * @param Sabre_DAV_INode $node
-     * @return bool
-     */
-    public function updateProperties(&$propertyDelta, &$result, Sabre_DAV_INode $node) {
-
-        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
-            return;
-
-        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
-            $memberSet = array();
-        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof Sabre_DAV_Property_HrefList) {
-            $memberSet = $propertyDelta['{DAV:}group-member-set']->getHrefs();
-        } else {
-            throw new Sabre_DAV_Exception('The group-member-set property MUST be an instance of Sabre_DAV_Property_HrefList or null');
-        }
-
-        if (!($node instanceof Sabre_DAVACL_IPrincipal)) {
-            $result[403]['{DAV:}group-member-set'] = null;
-            unset($propertyDelta['{DAV:}group-member-set']);
-
-            // Returning false will stop the updateProperties process
-            return false;
-        }
-
-        $node->setGroupMemberSet($memberSet);
-
-        $result[200]['{DAV:}group-member-set'] = null;
-        unset($propertyDelta['{DAV:}group-member-set']);
-
-    }
-
-    /**
-     * This method handels HTTP REPORT requests
-     *
-     * @param string $reportName
-     * @param DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName, $dom) {
-
-        switch($reportName) {
-
-            case '{DAV:}principal-property-search' :
-                $this->principalPropertySearchReport($dom);
-                return false;
-            case '{DAV:}principal-search-property-set' :
-                $this->principalSearchPropertySetReport($dom);
-                return false;
-            case '{DAV:}expand-property' :
-                $this->expandPropertyReport($dom);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This event is triggered for any HTTP method that is not known by the
-     * webserver.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        if ($method!=='ACL') return;
-
-        $this->httpACL($uri);
-        return false;
-
-    }
-
-    /**
-     * This method is responsible for handling the 'ACL' event.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpACL($uri) {
-
-        $body = $this->server->httpRequest->getBody(true);
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $newAcl =
-            Sabre_DAVACL_Property_Acl::unserialize($dom->firstChild)
-            ->getPrivileges();
-
-        // Normalizing urls
-        foreach($newAcl as $k=>$newAce) {
-            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
-        }
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_DAVACL_IACL)) {
-            throw new Sabre_DAV_Exception_MethodNotAllowed('This node does not support the ACL method');
-        }
-
-        $oldAcl = $this->getACL($node);
-
-        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
-
-        /* Checking if protected principals from the existing principal set are
-           not overwritten. */
-        foreach($oldAcl as $oldAce) {
-
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
-
-            $found = false;
-            foreach($newAcl as $newAce) {
-                if (
-                    $newAce['privilege'] === $oldAce['privilege'] &&
-                    $newAce['principal'] === $oldAce['principal'] &&
-                    $newAce['protected']
-                )
-                $found = true;
-            }
-
-            if (!$found)
-                throw new Sabre_DAVACL_Exception_AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
-
-        }
-
-        foreach($newAcl as $newAce) {
-
-            // Do we recognize the privilege
-            if (!isset($supportedPrivileges[$newAce['privilege']])) {
-                throw new Sabre_DAVACL_Exception_NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
-            }
-
-            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
-                throw new Sabre_DAVACL_Exception_NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
-            }
-
-            // Looking up the principal
-            try {
-                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (Sabre_DAV_Exception_NotFound $e) {
-                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
-            }
-            if (!($principal instanceof Sabre_DAVACL_IPrincipal)) {
-                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
-            }
-
-        }
-        $node->setACL($newAcl);
-
-    }
-
-    /* }}} */
-
-    /* Reports {{{ */
-
-    /**
-     * The expand-property report is defined in RFC3253 section 3-8.
-     *
-     * This report is very similar to a standard PROPFIND. The difference is
-     * that it has the additional ability to look at properties containing a
-     * {DAV:}href element, follow that property and grab additional elements
-     * there.
-     *
-     * Other rfc's, such as ACL rely on this report, so it made sense to put
-     * it in this plugin.
-     *
-     * @param DOMElement $dom
-     * @return void
-     */
-    protected function expandPropertyReport($dom) {
-
-        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
-        $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
-
-        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($result as $response) {
-            $response->serialize($this->server, $multiStatus);
-        }
-
-        $xml = $dom->saveXML();
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * This method is used by expandPropertyReport to parse
-     * out the entire HTTP request.
-     *
-     * @param DOMElement $node
-     * @return array
-     */
-    protected function parseExpandPropertyReportRequest($node) {
-
-        $requestedProperties = array();
-        do {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
-
-            if ($node->firstChild) {
-
-                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
-
-            } else {
-
-                $children = array();
-
-            }
-
-            $namespace = $node->getAttribute('namespace');
-            if (!$namespace) $namespace = 'DAV:';
-
-            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
-            $requestedProperties[$propName] = $children;
-
-        } while ($node = $node->nextSibling);
-
-        return $requestedProperties;
-
-    }
-
-    /**
-     * This method expands all the properties and returns
-     * a list with property values
-     *
-     * @param array $path
-     * @param array $requestedProperties the list of required properties
-     * @param int $depth
-     * @return array
-     */
-    protected function expandProperties($path, array $requestedProperties, $depth) {
-
-        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
-
-        $result = array();
-
-        foreach($foundProperties as $node) {
-
-            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
-
-                // We're only traversing if sub-properties were requested
-                if(count($childRequestedProperties)===0) continue;
-
-                // We only have to do the expansion if the property was found
-                // and it contains an href element.
-                if (!array_key_exists($propertyName,$node[200])) continue;
-
-                if ($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref) {
-                    $hrefs = array($node[200][$propertyName]->getHref());
-                } elseif ($node[200][$propertyName] instanceof Sabre_DAV_Property_HrefList) {
-                    $hrefs = $node[200][$propertyName]->getHrefs();
-                }
-
-                $childProps = array();
-                foreach($hrefs as $href) {
-                    $childProps = array_merge($childProps, $this->expandProperties($href, $childRequestedProperties, 0));
-                }
-                $node[200][$propertyName] = new Sabre_DAV_Property_ResponseList($childProps);
-
-            }
-            $result[] = new Sabre_DAV_Property_Response($path, $node);
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * principalSearchPropertySetReport
-     *
-     * This method responsible for handing the
-     * {DAV:}principal-search-property-set report. This report returns a list
-     * of properties the client may search on, using the
-     * {DAV:}principal-property-search report.
-     *
-     * @param DOMDocument $dom
-     * @return void
-     */
-    protected function principalSearchPropertySetReport(DOMDocument $dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
-        }
-
-        if ($dom->firstChild->hasChildNodes())
-            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements');
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $root = $dom->createElement('d:principal-search-property-set');
-        $dom->appendChild($root);
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $root->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        $nsList = $this->server->xmlNamespaces;
-
-        foreach($this->principalSearchPropertySet as $propertyName=>$description) {
-
-            $psp = $dom->createElement('d:principal-search-property');
-            $root->appendChild($psp);
-
-            $prop = $dom->createElement('d:prop');
-            $psp->appendChild($prop);
-
-            $propName = null;
-            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-            $prop->appendChild($currentProperty);
-
-            $descriptionElem = $dom->createElement('d:description');
-            $descriptionElem->setAttribute('xml:lang','en');
-            $descriptionElem->appendChild($dom->createTextNode($description));
-            $psp->appendChild($descriptionElem);
-
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody($dom->saveXML());
-
-    }
-
-    /**
-     * principalPropertySearchReport
-     *
-     * This method is responsible for handing the
-     * {DAV:}principal-property-search report. This report can be used for
-     * clients to search for groups of principals, based on the value of one
-     * or more properties.
-     *
-     * @param DOMDocument $dom
-     * @return void
-     */
-    protected function principalPropertySearchReport(DOMDocument $dom) {
-
-        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
-
-        $uri = null;
-        if (!$applyToPrincipalCollectionSet) {
-            $uri = $this->server->getRequestUri();
-        }
-        $result = $this->principalSearch($searchProperties, $requestedProperties, $uri);
-
-        $xml = $this->server->generateMultiStatus($result);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * parsePrincipalPropertySearchReportRequest
-     *
-     * This method parses the request body from a
-     * {DAV:}principal-property-search report.
-     *
-     * This method returns an array with two elements:
-     *  1. an array with properties to search on, and their values
-     *  2. a list of propertyvalues that should be returned for the request.
-     *
-     * @param DOMDocument $dom
-     * @return array
-     */
-    protected function parsePrincipalPropertySearchReportRequest($dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
-        }
-
-        $searchProperties = array();
-
-        $applyToPrincipalCollectionSet = false;
-
-        // Parsing the search request
-        foreach($dom->firstChild->childNodes as $searchNode) {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set') {
-                $applyToPrincipalCollectionSet = true;
-            }
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
-                continue;
-
-            $propertyName = null;
-            $propertyValue = null;
-
-            foreach($searchNode->childNodes as $childNode) {
-
-                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
-
-                    case '{DAV:}prop' :
-                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
-                        reset($property);
-                        $propertyName = key($property);
-                        break;
-
-                    case '{DAV:}match' :
-                        $propertyValue = $childNode->textContent;
-                        break;
-
-                }
-
-
-            }
-
-            if (is_null($propertyName) || is_null($propertyValue))
-                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
-
-            $searchProperties[$propertyName] = $propertyValue;
-
-        }
-
-        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
-
-    }
-
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php
deleted file mode 100755
index 51c6658afd..0000000000
--- a/3rdparty/Sabre/DAVACL/Principal.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * Principal class
- *
- * This class is a representation of a simple principal
- *
- * Many WebDAV specs require a user to show up in the directory
- * structure.
- *
- * This principal also has basic ACL settings, only allowing the principal
- * access it's own principal.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * Struct with principal information.
-     *
-     * @var array
-     */
-    protected $principalProperties;
-
-    /**
-     * Principal backend
-     *
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the principal object
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param array $principalProperties
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalProperties = array()) {
-
-        if (!isset($principalProperties['uri'])) {
-            throw new Sabre_DAV_Exception('The principal properties must at least contain the \'uri\' key');
-        }
-        $this->principalBackend = $principalBackend;
-        $this->principalProperties = $principalProperties;
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalProperties['uri'];
-
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        $uris = array();
-        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-
-            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-
-        }
-
-        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
-        }
-
-        return array_unique($uris);
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-
-    }
-
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $groupMembers
-     * @return void
-     */
-    public function setGroupMemberSet(array $groupMembers) {
-
-        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-
-    }
-
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        $uri = $this->principalProperties['uri'];
-        list(, $name) = Sabre_DAV_URLUtil::splitPath($uri);
-        return $name;
-
-    }
-
-    /**
-     * Returns the name of the user
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        if (isset($this->principalProperties['{DAV:}displayname'])) {
-            return $this->principalProperties['{DAV:}displayname'];
-        } else {
-            return $this->getName();
-        }
-
-    }
-
-    /**
-     * Returns a list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $newProperties = array();
-        foreach($requestedProperties as $propName) {
-
-            if (isset($this->principalProperties[$propName])) {
-                $newProperties[$propName] = $this->principalProperties[$propName];
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * Updates this principals properties.
-     * 
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->principalBackend->updatePrincipal($this->principalProperties['uri'], $mutations);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalProperties['uri'];
-
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getPrincipalUrl(),
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Updating ACLs is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
deleted file mode 100755
index a76b4a9d72..0000000000
--- a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ /dev/null
@@ -1,427 +0,0 @@
-<?php
-
-/**
- * PDO principal backend
- *
- * This is a simple principal backend that maps exactly to the users table, as
- * used by Sabre_DAV_Auth_Backend_PDO.
- *
- * It assumes all principals are in a single collection. The default collection
- * is 'principals/', but this can be overriden.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
-
-    /**
-     * pdo
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name for 'principals'
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * PDO table name for 'group members'
-     *
-     * @var string
-     */
-    protected $groupMembersTableName;
-
-    /**
-     * A list of additional fields to support
-     *
-     * @var array
-     */
-    protected $fieldMap = array(
-
-        /**
-         * This property can be used to display the users' real name.
-         */
-        '{DAV:}displayname' => array(
-            'dbField' => 'displayname',
-        ),
-
-        /**
-         * This property is actually used by the CardDAV plugin, where it gets
-         * mapped to {http://calendarserver.orgi/ns/}me-card.
-         *
-         * The reason we don't straight-up use that property, is because
-         * me-card is defined as a property on the users' addressbook
-         * collection.
-         */
-        '{http://sabredav.org/ns}vcard-url' => array(
-            'dbField' => 'vcardurl',
-        ),
-        /**
-         * This is the users' primary email-address.
-         */
-        '{http://sabredav.org/ns}email-address' => array(
-            'dbField' => 'email',
-        ),
-    );
-
-    /**
-     * Sets up the backend.
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     * @param string $groupMembersTableName
-     */
-    public function __construct(PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-        $this->groupMembersTableName = $groupMembersTableName;
-
-    }
-
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    public function getPrincipalsByPrefix($prefixPath) {
-
-        $fields = array(
-            'uri',
-        );
-
-        foreach($this->fieldMap as $key=>$value) {
-            $fields[] = $value['dbField'];
-        }
-        $result = $this->pdo->query('SELECT '.implode(',', $fields).'  FROM '. $this->tableName);
-
-        $principals = array();
-
-        while($row = $result->fetch(PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principal = array(
-                'uri' => $row['uri'],
-            );
-            foreach($this->fieldMap as $key=>$value) {
-                if ($row[$value['dbField']]) {
-                    $principal[$key] = $row[$value['dbField']];
-                }
-            }
-            $principals[] = $principal;
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getPrincipalByPath($path) {
-
-        $fields = array(
-            'id',
-            'uri',
-        );
-
-        foreach($this->fieldMap as $key=>$value) {
-            $fields[] = $value['dbField'];
-        }
-        $stmt = $this->pdo->prepare('SELECT '.implode(',', $fields).'  FROM '. $this->tableName . ' WHERE uri = ?');
-        $stmt->execute(array($path));
-
-        $row = $stmt->fetch(PDO::FETCH_ASSOC);
-        if (!$row) return;
-
-        $principal = array(
-            'id'  => $row['id'],
-            'uri' => $row['uri'],
-        );
-        foreach($this->fieldMap as $key=>$value) {
-            if ($row[$value['dbField']]) {
-                $principal[$key] = $row[$value['dbField']];
-            }
-        }
-        return $principal;
-
-    }
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is supplied as an array. Each key in the array is
-     * a propertyname, such as {DAV:}displayname.
-     *
-     * Each value is the actual value to be updated. If a value is null, it
-     * must be deleted.
-     *
-     * This method should be atomic. It must either completely succeed, or
-     * completely fail. Success and failure can simply be returned as 'true' or
-     * 'false'.
-     *
-     * It is also possible to return detailed failure information. In that case
-     * an array such as this should be returned:
-     *
-     * array(
-     *   200 => array(
-     *      '{DAV:}prop1' => null,
-     *   ),
-     *   201 => array(
-     *      '{DAV:}prop2' => null,
-     *   ),
-     *   403 => array(
-     *      '{DAV:}prop3' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}prop4' => null,
-     *   ),
-     * );
-     *
-     * In this previous example prop1 was successfully updated or deleted, and
-     * prop2 was succesfully created.
-     *
-     * prop3 failed to update due to '403 Forbidden' and because of this prop4
-     * also could not be updated with '424 Failed dependency'.
-     *
-     * This last example was actually incorrect. While 200 and 201 could appear
-     * in 1 response, if there's any error (403) the other properties should
-     * always fail with 423 (failed dependency).
-     *
-     * But anyway, if you don't want to scratch your head over this, just
-     * return true or false.
-     *
-     * @param string $path
-     * @param array $mutations
-     * @return array|bool
-     */
-    public function updatePrincipal($path, $mutations) {
-
-        $updateAble = array();
-        foreach($mutations as $key=>$value) {
-
-            // We are not aware of this field, we must fail.
-            if (!isset($this->fieldMap[$key])) {
-
-                $response = array(
-                    403 => array(
-                        $key => null,
-                    ),
-                    424 => array(),
-                );
-
-                // Adding the rest to the response as a 424
-                foreach($mutations as $subKey=>$subValue) {
-                    if ($subKey !== $key) {
-                        $response[424][$subKey] = null;
-                    }
-                }
-                return $response;
-            }
-
-            $updateAble[$this->fieldMap[$key]['dbField']] = $value;
-
-        }
-
-        // No fields to update
-        $query = "UPDATE " . $this->tableName . " SET ";
-
-        $first = true;
-        foreach($updateAble as $key => $value) {
-            if (!$first) {
-                $query.= ', ';
-            }
-            $first = false;
-            $query.= "$key = :$key ";
-        }
-        $query.='WHERE uri = :uri';
-        $stmt = $this->pdo->prepare($query);
-        $updateAble['uri'] =  $path;
-        $stmt->execute($updateAble);
-
-        return true;
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @return array
-     */
-    public function searchPrincipals($prefixPath, array $searchProperties) {
-
-        $query = 'SELECT uri FROM ' . $this->tableName . ' WHERE 1=1 ';
-        $values = array();
-        foreach($searchProperties as $property => $value) {
-
-            switch($property) {
-
-                case '{DAV:}displayname' :
-                    $query.=' AND displayname LIKE ?';
-                    $values[] = '%' . $value . '%';
-                    break;
-                case '{http://sabredav.org/ns}email-address' :
-                    $query.=' AND email LIKE ?';
-                    $values[] = '%' . $value . '%';
-                    break;
-                default :
-                    // Unsupported property
-                    return array();
-
-            }
-
-        }
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $principals = array();
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principals[] = $row['uri'];
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMemberSet($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMembership($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    public function setGroupMemberSet($principal, array $members) {
-
-        // Grabbing the list of principal id's.
-        $stmt = $this->pdo->prepare('SELECT id, uri FROM '.$this->tableName.' WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
-        $stmt->execute(array_merge(array($principal), $members));
-
-        $memberIds = array();
-        $principalId = null;
-
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            if ($row['uri'] == $principal) {
-                $principalId = $row['id'];
-            } else {
-                $memberIds[] = $row['id'];
-            }
-        }
-        if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
-
-        // Wiping out old members
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->groupMembersTableName.' WHERE principal_id = ?;');
-        $stmt->execute(array($principalId));
-
-        foreach($memberIds as $memberId) {
-
-            $stmt = $this->pdo->prepare('INSERT INTO '.$this->groupMembersTableName.' (principal_id, member_id) VALUES (?, ?);');
-            $stmt->execute(array($principalId, $memberId));
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalCollection.php b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
deleted file mode 100755
index c3e4cb83f2..0000000000
--- a/3rdparty/Sabre/DAVACL/PrincipalCollection.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Principals Collection
- *
- * This collection represents a list of users. It uses
- * Sabre_DAV_Auth_Backend to determine which users are available on the list.
- *
- * The users are instances of Sabre_DAV_Auth_Principal
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return Sabre_DAV_INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_DAVACL_Principal($this->principalBackend, $principal);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/Acl.php b/3rdparty/Sabre/DAVACL/Property/Acl.php
deleted file mode 100755
index 05e1a690b3..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/Acl.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}acl property
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
-
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Whether or not the server base url is required to be prefixed when
-     * serializing the property.
-     *
-     * @var boolean
-     */
-    private $prefixBaseUrl;
-
-    /**
-     * Constructor
-     *
-     * This object requires a structure similar to the return value from
-     * Sabre_DAVACL_Plugin::getACL().
-     *
-     * Each privilege is a an array with at least a 'privilege' property, and a
-     * 'principal' property. A privilege may have a 'protected' property as
-     * well.
-     *
-     * The prefixBaseUrl should be set to false, if the supplied principal urls
-     * are already full urls. If this is kept to true, the servers base url
-     * will automatically be prefixed.
-     *
-     * @param bool $prefixBaseUrl
-     * @param array $privileges
-     */
-    public function __construct(array $privileges, $prefixBaseUrl = true) {
-
-        $this->privileges = $privileges;
-        $this->prefixBaseUrl = $prefixBaseUrl;
-
-    }
-
-    /**
-     * Returns the list of privileges for this property
-     *
-     * @return array
-     */
-    public function getPrivileges() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $ace) {
-
-            $this->serializeAce($doc, $node, $ace, $server);
-
-        }
-
-    }
-
-    /**
-     * Unserializes the {DAV:}acl xml element.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAVACL_Property_Acl
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $privileges = array();
-        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
-        for($ii=0; $ii < $xaces->length; $ii++) {
-
-            $xace = $xaces->item($ii);
-            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
-            if ($principal->length !== 1) {
-                throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
-            }
-            $principal = Sabre_DAVACL_Property_Principal::unserialize($principal->item(0));
-
-            switch($principal->getType()) {
-                case Sabre_DAVACL_Property_Principal::HREF :
-                    $principal = $principal->getHref();
-                    break;
-                case Sabre_DAVACL_Property_Principal::AUTHENTICATED :
-                    $principal = '{DAV:}authenticated';
-                    break;
-                case Sabre_DAVACL_Property_Principal::UNAUTHENTICATED :
-                    $principal = '{DAV:}unauthenticated';
-                    break;
-                case Sabre_DAVACL_Property_Principal::ALL :
-                    $principal = '{DAV:}all';
-                    break;
-
-            }
-
-            $protected = false;
-
-            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
-                $protected = true;
-            }
-
-            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
-            if ($grants->length < 1) {
-                throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
-            }
-            $grant = $grants->item(0);
-
-            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
-            for($jj=0; $jj<$xprivs->length; $jj++) {
-
-                $xpriv = $xprivs->item($jj);
-
-                $privilegeName = null;
-
-                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
-
-                    $childNode = $xpriv->childNodes->item($kk);
-                    if ($t = Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
-                        $privilegeName = $t;
-                        break;
-                    }
-                }
-                if (is_null($privilegeName)) {
-                    throw new Sabre_DAV_Exception_BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
-                }
-
-                $privileges[] = array(
-                    'principal' => $principal,
-                    'protected' => $protected,
-                    'privilege' => $privilegeName,
-                );
-
-            }
-
-        }
-
-        return new self($privileges);
-
-    }
-
-    /**
-     * Serializes a single access control entry.
-     *
-     * @param DOMDocument $doc
-     * @param DOMElement $node
-     * @param array $ace
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    private function serializeAce($doc,$node,$ace, $server) {
-
-        $xace  = $doc->createElementNS('DAV:','d:ace');
-        $node->appendChild($xace);
-
-        $principal = $doc->createElementNS('DAV:','d:principal');
-        $xace->appendChild($principal);
-        switch($ace['principal']) {
-            case '{DAV:}authenticated' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:authenticated'));
-                break;
-            case '{DAV:}unauthenticated' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:unauthenticated'));
-                break;
-            case '{DAV:}all' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:all'));
-                break;
-            default:
-                $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
-        }
-
-        $grant = $doc->createElementNS('DAV:','d:grant');
-        $xace->appendChild($grant);
-
-        $privParts = null;
-
-        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
-
-        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
-        $grant->appendChild($xprivilege);
-
-        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($ace['protected']) && $ace['protected'])
-            $xace->appendChild($doc->createElement('d:protected'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php b/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
deleted file mode 100755
index a8b054956d..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * AclRestrictions property
- *
- * This property represents {DAV:}acl-restrictions, as defined in RFC3744.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_AclRestrictions extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property into a DOMElement
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $elem
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $elem) {
-
-        $doc = $elem->ownerDocument;
-
-        $elem->appendChild($doc->createElementNS('DAV:','d:grant-only'));
-        $elem->appendChild($doc->createElementNS('DAV:','d:no-invert'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
deleted file mode 100755
index 94a2964061..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * CurrentUserPrivilegeSet
- *
- * This class represents the current-user-privilege-set property. When
- * requested, it contain all the privileges a user has on a specific node.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
-
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Creates the object
-     *
-     * Pass the privileges in clark-notation
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property in the DOM
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $privName) {
-
-            $this->serializePriv($doc,$node,$privName);
-
-        }
-
-    }
-
-    /**
-     * Serializes one privilege
-     *
-     * @param DOMDocument $doc
-     * @param DOMElement $node
-     * @param string $privName
-     * @return void
-     */
-    protected function serializePriv($doc,$node,$privName) {
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $node->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/Principal.php b/3rdparty/Sabre/DAVACL/Property/Principal.php
deleted file mode 100755
index c36328a58e..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/Principal.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * Principal property
- *
- * The principal property represents a principal from RFC3744 (ACL).
- * The property can be used to specify a principal or pseudo principals.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
-     */
-    const UNAUTHENTICATED = 1;
-
-    /**
-     * To specify any principal that is logged in, use AUTHENTICATED
-     */
-    const AUTHENTICATED = 2;
-
-    /**
-     * Specific principals can be specified with the HREF
-     */
-    const HREF = 3;
-
-    /**
-     * Everybody, basically
-     */
-    const ALL = 4;
-
-    /**
-     * Principal-type
-     *
-     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
-     *
-     * @var int
-     */
-    private $type;
-
-    /**
-     * Url to principal
-     *
-     * This value is only used for the HREF principal type.
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Creates the property.
-     *
-     * The 'type' argument must be one of the type constants defined in this class.
-     *
-     * 'href' is only required for the HREF type.
-     *
-     * @param int $type
-     * @param string|null $href
-     */
-    public function __construct($type, $href = null) {
-
-        $this->type = $type;
-
-        if ($type===self::HREF && is_null($href)) {
-            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
-        }
-        $this->href = $href;
-
-    }
-
-    /**
-     * Returns the principal type
-     *
-     * @return int
-     */
-    public function getType() {
-
-        return $this->type;
-
-    }
-
-    /**
-     * Returns the principal uri.
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-        switch($this->type) {
-
-            case self::UNAUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
-                );
-                break;
-            case self::AUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':authenticated')
-                );
-                break;
-            case self::HREF :
-                $href = $node->ownerDocument->createElement($prefix . ':href');
-                $href->nodeValue = $server->getBaseUri() . $this->href;
-                $node->appendChild($href);
-                break;
-
-        }
-
-    }
-
-    /**
-     * Deserializes a DOM element into a property object.
-     *
-     * @param DOMElement $dom
-     * @return Sabre_DAV_Property_Principal
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $parent = $dom->firstChild;
-        while(!Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
-            $parent = $parent->nextSibling;
-        }
-
-        switch(Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
-
-            case '{DAV:}unauthenticated' :
-                return new self(self::UNAUTHENTICATED);
-            case '{DAV:}authenticated' :
-                return new self(self::AUTHENTICATED);
-            case '{DAV:}href':
-                return new self(self::HREF, $parent->textContent);
-            case '{DAV:}all':
-                return new self(self::ALL);
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Unexpected element (' . Sabre_DAV_XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
deleted file mode 100755
index 276d57ae09..0000000000
--- a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * SupportedPrivilegeSet property
- *
- * This property encodes the {DAV:}supported-privilege-set property, as defined
- * in rfc3744. Please consult the rfc for details about it's structure.
- *
- * This class expects a structure like the one given from
- * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its
- * constructor.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
-
-    /**
-     * privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Constructor
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property into a domdocument.
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $node
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        $this->serializePriv($doc, $node, $this->privileges);
-
-    }
-
-    /**
-     * Serializes a property
-     *
-     * This is a recursive function.
-     *
-     * @param DOMDocument $doc
-     * @param DOMElement $node
-     * @param array $privilege
-     * @return void
-     */
-    private function serializePriv($doc,$node,$privilege) {
-
-        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
-        $node->appendChild($xsp);
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $xsp->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($privilege['abstract']) && $privilege['abstract']) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
-        }
-
-        if (isset($privilege['description'])) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
-        }
-
-        if (isset($privilege['aggregates'])) {
-            foreach($privilege['aggregates'] as $subPrivilege) {
-                $this->serializePriv($doc,$xsp,$subPrivilege);
-            }
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php
deleted file mode 100755
index 9950f74874..0000000000
--- a/3rdparty/Sabre/DAVACL/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the SabreDAV version constants.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.0';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/DAVACL/includes.php b/3rdparty/Sabre/DAVACL/includes.php
deleted file mode 100755
index 28fa3eed22..0000000000
--- a/3rdparty/Sabre/DAVACL/includes.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL includes file
- *
- * Including this file will automatically include all files from the
- * Sabre_DAVACL package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/AbstractPrincipalCollection.php';
-include __DIR__ . '/Exception/AceConflict.php';
-include __DIR__ . '/Exception/NeedPrivileges.php';
-include __DIR__ . '/Exception/NoAbstract.php';
-include __DIR__ . '/Exception/NotRecognizedPrincipal.php';
-include __DIR__ . '/Exception/NotSupportedPrivilege.php';
-include __DIR__ . '/IACL.php';
-include __DIR__ . '/IPrincipal.php';
-include __DIR__ . '/IPrincipalBackend.php';
-include __DIR__ . '/Plugin.php';
-include __DIR__ . '/Principal.php';
-include __DIR__ . '/PrincipalBackend/PDO.php';
-include __DIR__ . '/PrincipalCollection.php';
-include __DIR__ . '/Property/Acl.php';
-include __DIR__ . '/Property/AclRestrictions.php';
-include __DIR__ . '/Property/CurrentUserPrivilegeSet.php';
-include __DIR__ . '/Property/Principal.php';
-include __DIR__ . '/Property/SupportedPrivilegeSet.php';
-include __DIR__ . '/Version.php';
-// End includes
diff --git a/3rdparty/Sabre/HTTP/AWSAuth.php b/3rdparty/Sabre/HTTP/AWSAuth.php
deleted file mode 100755
index fb8245c8cb..0000000000
--- a/3rdparty/Sabre/HTTP/AWSAuth.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * HTTP AWS Authentication handler
- *
- * Use this class to leverage amazon's AWS authentication header
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * The signature supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->httpRequest->getHeader('Authorization');
-        $authHeader = explode(' ',$authHeader);
-
-        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-
-            if ($contentMD5!=base64_encode(md5($body,true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date'))
-            $requestDate = $this->httpRequest->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->httpRequest->getMethod() . "\n" .
-                $contentMD5 . "\n" .
-                $this->httpRequest->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders .
-                $this->httpRequest->getURI()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new DateTime('-15 minutes');
-        $max = new DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = array();
-        $headers = $this->httpRequest->getHeaders();
-        foreach($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName),'x-amz-')===0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-
-        $headerStr = '';
-        foreach($amzHeaders as $h=>$v) {
-            $headerStr.=$h.':'.$v;
-        }
-
-        return $headerStr;
-
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature
-     *
-     * @param string $key
-     * @param string $message
-     * @return string
-     */
-    private function hmacsha1($key, $message) {
-
-        $blocksize=64;
-        if (strlen($key)>$blocksize)
-            $key=pack('H*', sha1($key));
-        $key=str_pad($key,$blocksize,chr(0x00));
-        $ipad=str_repeat(chr(0x36),$blocksize);
-        $opad=str_repeat(chr(0x5c),$blocksize);
-        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
-        return $hmac;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/AbstractAuth.php b/3rdparty/Sabre/HTTP/AbstractAuth.php
deleted file mode 100755
index 3bccabcd1c..0000000000
--- a/3rdparty/Sabre/HTTP/AbstractAuth.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * HTTP Authentication baseclass
- *
- * This class has the common functionality for BasicAuth and DigestAuth
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_HTTP_AbstractAuth {
-
-    /**
-     * The realm will be displayed in the dialog boxes
-     *
-     * This identifier can be changed through setRealm()
-     *
-     * @var string
-     */
-    protected $realm = 'SabreDAV';
-
-    /**
-     * HTTP response helper
-     *
-     * @var Sabre_HTTP_Response
-     */
-    protected $httpResponse;
-
-
-    /**
-     * HTTP request helper
-     *
-     * @var Sabre_HTTP_Request
-     */
-    protected $httpRequest;
-
-    /**
-     * __construct
-     *
-     */
-    public function __construct() {
-
-        $this->httpResponse = new Sabre_HTTP_Response();
-        $this->httpRequest = new Sabre_HTTP_Request();
-
-    }
-
-    /**
-     * Sets an alternative HTTP response object
-     *
-     * @param Sabre_HTTP_Response $response
-     * @return void
-     */
-    public function setHTTPResponse(Sabre_HTTP_Response $response) {
-
-        $this->httpResponse = $response;
-
-    }
-
-    /**
-     * Sets an alternative HTTP request object
-     *
-     * @param Sabre_HTTP_Request $request
-     * @return void
-     */
-    public function setHTTPRequest(Sabre_HTTP_Request $request) {
-
-        $this->httpRequest = $request;
-
-    }
-
-
-    /**
-     * Sets the realm
-     *
-     * The realm is often displayed in authentication dialog boxes
-     * Commonly an application name displayed here
-     *
-     * @param string $realm
-     * @return void
-     */
-    public function setRealm($realm) {
-
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Returns the realm
-     *
-     * @return string
-     */
-    public function getRealm() {
-
-        return $this->realm;
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    abstract public function requireLogin();
-
-}
diff --git a/3rdparty/Sabre/HTTP/BasicAuth.php b/3rdparty/Sabre/HTTP/BasicAuth.php
deleted file mode 100755
index a747cc6a31..0000000000
--- a/3rdparty/Sabre/HTTP/BasicAuth.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * HTTP Basic Authentication handler
- *
- * Use this class for easy http authentication setup
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * Returns the supplied username and password.
-     *
-     * The returned array has two values:
-     *   * 0 - username
-     *   * 1 - password
-     *
-     * If nothing was supplied, 'false' will be returned
-     *
-     * @return mixed
-     */
-    public function getUserPass() {
-
-        // Apache and mod_php
-        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
-
-            return array($user,$pass);
-
-        }
-
-        // Most other webservers
-        $auth = $this->httpRequest->getHeader('Authorization');
-
-        // Apache could prefix environment variables with REDIRECT_ when urls
-        // are passed through mod_rewrite
-        if (!$auth) {
-            $auth = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
-        }
-
-        if (!$auth) return false;
-
-        if (strpos(strtolower($auth),'basic')!==0) return false;
-
-        return explode(':', base64_decode(substr($auth, 6)));
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/DigestAuth.php b/3rdparty/Sabre/HTTP/DigestAuth.php
deleted file mode 100755
index ee7f05c08e..0000000000
--- a/3rdparty/Sabre/HTTP/DigestAuth.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-/**
- * HTTP Digest Authentication handler
- *
- * Use this class for easy http digest authentication.
- * Instructions:
- *
- *  1. Create the object
- *  2. Call the setRealm() method with the realm you plan to use
- *  3. Call the init method function.
- *  4. Call the getUserName() function. This function may return false if no
- *     authentication information was supplied. Based on the username you
- *     should check your internal database for either the associated password,
- *     or the so-called A1 hash of the digest.
- *  5. Call either validatePassword() or validateA1(). This will return true
- *     or false.
- *  6. To make sure an authentication prompt is displayed, call the
- *     requireLogin() method.
- *
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct() {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($this->realm);
-        parent::__construct();
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre_HTTP_DigestAuth::QOP_AUTH
-     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop']=='auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response']==$validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch($this->qop) {
-            case self::QOP_AUTH    : $qop = 'auth'; break;
-            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
-            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
-        }
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */
-    public function getDigest() {
-
-        // mod_php
-        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
-        if ($digest) return $digest;
-
-        // most other servers
-        $digest = $this->httpRequest->getHeader('Authorization');
-
-        // Apache could prefix environment variables with REDIRECT_ when urls
-        // are passed through mod_rewrite
-        if (!$digest) {
-            $digest = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
-        }
-
-        if ($digest && strpos(strtolower($digest),'digest')===0) {
-            return substr($digest,7);
-        } else {
-            return null;
-        }
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     *
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest
-     * @return mixed
-     */
-    protected function parseDigest($digest) {
-
-        // protect against missing data
-        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-        $data = array();
-
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
-
-        return $needed_parts ? false : $data;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Request.php b/3rdparty/Sabre/HTTP/Request.php
deleted file mode 100755
index 4746ef7770..0000000000
--- a/3rdparty/Sabre/HTTP/Request.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-/**
- * HTTP Request information
- *
- * This object can be used to easily access information about an HTTP request.
- * It can additionally be used to create 'mock' requests.
- *
- * This class mostly operates independent, but because of the nature of a single
- * request per run it can operate as a singleton. For more information check out
- * the behaviour around 'defaultInputStream'.
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Request {
-
-    /**
-     * PHP's $_SERVER data
-     *
-     * @var array
-     */
-    protected $_SERVER;
-
-    /**
-     * PHP's $_POST data
-     *
-     * @var array
-     */
-    protected $_POST;
-
-    /**
-     * The request body, if any.
-     *
-     * This is stored in the form of a stream resource.
-     *
-     * @var resource
-     */
-    protected $body = null;
-
-    /**
-     * This will be set as the 'default' inputStream for a specific HTTP request
-     * We sometimes need to retain, or rebuild this if we need multiple runs
-     * of parsing the original HTTP request.
-     *
-     * @var resource
-     */
-    static $defaultInputStream=null;
-
-    /**
-     * Sets up the object
-     *
-     * The serverData and postData array can be used to override usage of PHP's
-     * global _SERVER and _POST variable respectively.
-     *
-     * @param array $serverData
-     * @param array $postData
-     */
-    public function __construct(array $serverData = null, array $postData = null) {
-
-       if ($serverData) $this->_SERVER = $serverData;
-       else $this->_SERVER =& $_SERVER;
-
-       if ($postData) $this->_POST = $postData;
-       else $this->_POST =& $_POST;
-
-    }
-
-    /**
-     * Returns the value for a specific http header.
-     *
-     * This method returns null if the header did not exist.
-     *
-     * @param string $name
-     * @return string
-     */
-    public function getHeader($name) {
-
-        $name = strtoupper(str_replace(array('-'),array('_'),$name));
-        if (isset($this->_SERVER['HTTP_' . $name])) {
-            return $this->_SERVER['HTTP_' . $name];
-        }
-
-        // There's a few headers that seem to end up in the top-level
-        // server array.
-        switch($name) {
-            case 'CONTENT_TYPE' :
-            case 'CONTENT_LENGTH' :
-                if (isset($this->_SERVER[$name])) {
-                    return $this->_SERVER[$name];
-                }
-                break;
-
-        }
-        return;
-
-    }
-
-    /**
-     * Returns all (known) HTTP headers.
-     *
-     * All headers are converted to lower-case, and additionally all underscores
-     * are automatically converted to dashes
-     *
-     * @return array
-     */
-    public function getHeaders() {
-
-        $hdrs = array();
-        foreach($this->_SERVER as $key=>$value) {
-
-            switch($key) {
-                case 'CONTENT_LENGTH' :
-                case 'CONTENT_TYPE' :
-                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
-                    break;
-                default :
-                    if (strpos($key,'HTTP_')===0) {
-                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
-                    }
-                    break;
-            }
-
-        }
-
-        return $hdrs;
-
-    }
-
-    /**
-     * Returns the HTTP request method
-     *
-     * This is for example POST or GET
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->_SERVER['REQUEST_METHOD'];
-
-    }
-
-    /**
-     * Returns the requested uri
-     *
-     * @return string
-     */
-    public function getUri() {
-
-        return $this->_SERVER['REQUEST_URI'];
-
-    }
-
-    /**
-     * Will return protocol + the hostname + the uri
-     *
-     * @return string
-     */
-    public function getAbsoluteUri() {
-
-        // Checking if the request was made through HTTPS. The last in line is for IIS
-        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
-        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
-
-    }
-
-    /**
-     * Returns everything after the ? from the current url
-     *
-     * @return string
-     */
-    public function getQueryString() {
-
-        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
-
-    }
-
-    /**
-     * Returns the HTTP request body body
-     *
-     * This method returns a readable stream resource.
-     * If the asString parameter is set to true, a string is sent instead.
-     *
-     * @param bool asString
-     * @return resource
-     */
-    public function getBody($asString = false) {
-
-        if (is_null($this->body)) {
-            if (!is_null(self::$defaultInputStream)) {
-                $this->body = self::$defaultInputStream;
-            } else {
-                $this->body = fopen('php://input','r');
-                self::$defaultInputStream = $this->body;
-            }
-        }
-        if ($asString) {
-            $body = stream_get_contents($this->body);
-            return $body;
-        } else {
-            return $this->body;
-        }
-
-    }
-
-    /**
-     * Sets the contents of the HTTP request body
-     *
-     * This method can either accept a string, or a readable stream resource.
-     *
-     * If the setAsDefaultInputStream is set to true, it means for this run of the
-     * script the supplied body will be used instead of php://input.
-     *
-     * @param mixed $body
-     * @param bool $setAsDefaultInputStream
-     * @return void
-     */
-    public function setBody($body,$setAsDefaultInputStream = false) {
-
-        if(is_resource($body)) {
-            $this->body = $body;
-        } else {
-
-            $stream = fopen('php://temp','r+');
-            fputs($stream,$body);
-            rewind($stream);
-            // String is assumed
-            $this->body = $stream;
-        }
-        if ($setAsDefaultInputStream) {
-            self::$defaultInputStream = $this->body;
-        }
-
-    }
-
-    /**
-     * Returns PHP's _POST variable.
-     *
-     * The reason this is in a method is so it can be subclassed and
-     * overridden.
-     *
-     * @return array
-     */
-    public function getPostVars() {
-
-        return $this->_POST;
-
-    }
-
-    /**
-     * Returns a specific item from the _SERVER array.
-     *
-     * Do not rely on this feature, it is for internal use only.
-     *
-     * @param string $field
-     * @return string
-     */
-    public function getRawServerValue($field) {
-
-        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/HTTP/Response.php b/3rdparty/Sabre/HTTP/Response.php
deleted file mode 100755
index ffe9bda208..0000000000
--- a/3rdparty/Sabre/HTTP/Response.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * Sabre_HTTP_Response
- *
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Response {
-
-    /**
-     * Returns a full HTTP status message for an HTTP status code
-     *
-     * @param int $code
-     * @return string
-     */
-    public function getStatusMessage($code) {
-
-        $msg = array(
-            100 => 'Continue',
-            101 => 'Switching Protocols',
-            102 => 'Processing',
-            200 => 'OK',
-            201 => 'Created',
-            202 => 'Accepted',
-            203 => 'Non-Authorative Information',
-            204 => 'No Content',
-            205 => 'Reset Content',
-            206 => 'Partial Content',
-            207 => 'Multi-Status', // RFC 4918
-            208 => 'Already Reported', // RFC 5842
-            226 => 'IM Used', // RFC 3229
-            300 => 'Multiple Choices',
-            301 => 'Moved Permanently',
-            302 => 'Found',
-            303 => 'See Other',
-            304 => 'Not Modified',
-            305 => 'Use Proxy',
-            306 => 'Reserved',
-            307 => 'Temporary Redirect',
-            400 => 'Bad request',
-            401 => 'Unauthorized',
-            402 => 'Payment Required',
-            403 => 'Forbidden',
-            404 => 'Not Found',
-            405 => 'Method Not Allowed',
-            406 => 'Not Acceptable',
-            407 => 'Proxy Authentication Required',
-            408 => 'Request Timeout',
-            409 => 'Conflict',
-            410 => 'Gone',
-            411 => 'Length Required',
-            412 => 'Precondition failed',
-            413 => 'Request Entity Too Large',
-            414 => 'Request-URI Too Long',
-            415 => 'Unsupported Media Type',
-            416 => 'Requested Range Not Satisfiable',
-            417 => 'Expectation Failed',
-            418 => 'I\'m a teapot', // RFC 2324
-            422 => 'Unprocessable Entity', // RFC 4918
-            423 => 'Locked', // RFC 4918
-            424 => 'Failed Dependency', // RFC 4918
-            426 => 'Upgrade required',
-            428 => 'Precondition required', // draft-nottingham-http-new-status
-            429 => 'Too Many Requests', // draft-nottingham-http-new-status
-            431 => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-            500 => 'Internal Server Error',
-            501 => 'Not Implemented',
-            502 => 'Bad Gateway',
-            503 => 'Service Unavailable',
-            504 => 'Gateway Timeout',
-            505 => 'HTTP Version not supported',
-            506 => 'Variant Also Negotiates',
-            507 => 'Insufficient Storage', // RFC 4918
-            508 => 'Loop Detected', // RFC 5842
-            509 => 'Bandwidth Limit Exceeded', // non-standard
-            510 => 'Not extended',
-            511 => 'Network Authentication Required', // draft-nottingham-http-new-status
-       );
-
-       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
-
-    }
-
-    /**
-     * Sends an HTTP status header to the client
-     *
-     * @param int $code HTTP status code
-     * @return bool
-     */
-    public function sendStatus($code) {
-
-        if (!headers_sent())
-            return header($this->getStatusMessage($code));
-        else return false;
-
-    }
-
-    /**
-     * Sets an HTTP header for the response
-     *
-     * @param string $name
-     * @param string $value
-     * @param bool $replace
-     * @return bool
-     */
-    public function setHeader($name, $value, $replace = true) {
-
-        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
-        if (!headers_sent())
-            return header($name . ': ' . $value, $replace);
-        else return false;
-
-    }
-
-    /**
-     * Sets a bunch of HTTP Headers
-     *
-     * headersnames are specified as keys, value in the array value
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        foreach($headers as $key=>$value)
-            $this->setHeader($key, $value);
-
-    }
-
-    /**
-     * Sends the entire response body
-     *
-     * This method can accept either an open filestream, or a string.
-     *
-     * @param mixed $body
-     * @return void
-     */
-    public function sendBody($body) {
-
-        if (is_resource($body)) {
-
-            fpassthru($body);
-
-        } else {
-
-            // We assume a string
-            echo $body;
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Util.php b/3rdparty/Sabre/HTTP/Util.php
deleted file mode 100755
index 67bdd489e1..0000000000
--- a/3rdparty/Sabre/HTTP/Util.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * HTTP utility methods
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @author Paul Voegler
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Util {
-
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     *
-     * @param string $dateHeader
-     * @return bool|DateTime
-     */
-    static function parseHTTPDate($dateHeader) {
-
-        //RFC 2616 section 3.3.1 Full Date
-        //Only the format is checked, valid ranges are checked by strtotime below
-        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-        $time = '[0-2]\d(\:[0-5]\d){2}';
-        $date3 = $month . ' ([1-3]\d| \d)';
-        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
-
-        //ANSI C's asctime() format
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
-        //RFC 850, obsoleted by RFC 1036
-        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
-        //RFC 822, updated by RFC 1123
-        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
-        //allowed date formats by RFC 2616
-        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-
-        //allow for space around the string and strip it
-        $dateHeader = trim($dateHeader, ' ');
-        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
-            return false;
-
-        //append implicit GMT timezone to ANSI C time format
-        if (strpos($dateHeader, ' GMT') === false)
-            $dateHeader .= ' GMT';
-
-
-        $realDate = strtotime($dateHeader);
-        //strtotime can return -1 or false in case of error
-        if ($realDate !== false && $realDate >= 0)
-            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * Transforms a DateTime object to HTTP's most common date format.
-     *
-     * We're serializing it as the RFC 1123 date, which, for HTTP must be
-     * specified as GMT.
-     *
-     * @param DateTime $dateTime
-     * @return string
-     */
-    static function toHTTPDate(DateTime $dateTime) {
-
-        // We need to clone it, as we don't want to affect the existing
-        // DateTime.
-        $dateTime = clone $dateTime;
-        $dateTime->setTimeZone(new DateTimeZone('GMT'));
-        return $dateTime->format('D, d M Y H:i:s \G\M\T');
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Version.php b/3rdparty/Sabre/HTTP/Version.php
deleted file mode 100755
index 23dc7f8a7a..0000000000
--- a/3rdparty/Sabre/HTTP/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the Sabre_HTTP version constants.
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.6.2';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/HTTP/includes.php b/3rdparty/Sabre/HTTP/includes.php
deleted file mode 100755
index 9d34bf3a8b..0000000000
--- a/3rdparty/Sabre/HTTP/includes.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Sabre_HTTP includes file
- *
- * Including this file will automatically include all files from the Sabre_HTTP
- * package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/AbstractAuth.php';
-include __DIR__ . '/AWSAuth.php';
-include __DIR__ . '/BasicAuth.php';
-include __DIR__ . '/DigestAuth.php';
-include __DIR__ . '/Request.php';
-include __DIR__ . '/Response.php';
-include __DIR__ . '/Util.php';
-include __DIR__ . '/Version.php';
-// End includes
diff --git a/3rdparty/Sabre/VObject/Component.php b/3rdparty/Sabre/VObject/Component.php
deleted file mode 100755
index b78a26133f..0000000000
--- a/3rdparty/Sabre/VObject/Component.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-/**
- * VObject Component
- *
- * This class represents a VCALENDAR/VCARD component. A component is for example
- * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and
- * ends with END:COMPONENTNAME
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component extends Sabre_VObject_Element {
-
-    /**
-     * Name, for example VEVENT
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Children properties and components
-     *
-     * @var array
-     */
-    public $children = array();
-
-    /**
-     * If coponents are added to this map, they will be automatically mapped
-     * to their respective classes, if parsed by the reader or constructed with
-     * the 'create' method.
-     *
-     * @var array
-     */
-    static public $classMap = array(
-        'VCALENDAR'     => 'Sabre_VObject_Component_VCalendar',
-        'VEVENT'        => 'Sabre_VObject_Component_VEvent',
-        'VTODO'         => 'Sabre_VObject_Component_VTodo',
-        'VJOURNAL'      => 'Sabre_VObject_Component_VJournal',
-        'VALARM'        => 'Sabre_VObject_Component_VAlarm',
-    );
-
-    /**
-     * Creates the new component by name, but in addition will also see if
-     * there's a class mapped to the property name.
-     *
-     * @param string $name
-     * @param string $value
-     * @return Sabre_VObject_Component
-     */
-    static public function create($name, $value = null) {
-
-        $name = strtoupper($name);
-
-        if (isset(self::$classMap[$name])) {
-            return new self::$classMap[$name]($name, $value);
-        } else {
-            return new self($name, $value);
-        }
-
-    }
-
-    /**
-     * Creates a new component.
-     *
-     * By default this object will iterate over its own children, but this can
-     * be overridden with the iterator argument
-     *
-     * @param string $name
-     * @param Sabre_VObject_ElementList $iterator
-     */
-    public function __construct($name, Sabre_VObject_ElementList $iterator = null) {
-
-        $this->name = strtoupper($name);
-        if (!is_null($iterator)) $this->iterator = $iterator;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $str = "BEGIN:" . $this->name . "\r\n";
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be higher in the list
-         *
-         * @param Sabre_VObject_Node $n
-         * @return int
-         */
-        $sortScore = function($n) {
-
-            if ($n instanceof Sabre_VObject_Component) {
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ($n->name === 'VTIMEZONE') {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            } else {
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($n->name === 'VERSION') {
-                    return 3;
-                } else {
-                    return 2;
-                }
-            }
-
-        };
-
-        usort($this->children, function($a, $b) use ($sortScore) {
-
-            $sA = $sortScore($a);
-            $sB = $sortScore($b);
-
-            if ($sA === $sB) return 0;
-
-            return ($sA > $sB) ? -1 : 1;
-
-        });
-
-        foreach($this->children as $child) $str.=$child->serialize();
-        $str.= "END:" . $this->name . "\r\n";
-
-        return $str;
-
-    }
-
-    /**
-     * Adds a new component or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Sabre_VObject_Element $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Element
-     * The second adds a property as a string.
-     *
-     * @param mixed $item
-     * @param mixed $itemValue
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Sabre_VObject_Element) {
-            if (!is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->children[] = $item;
-        } elseif(is_string($item)) {
-
-            if (!is_scalar($itemValue)) {
-                throw new InvalidArgumentException('The second argument must be scalar');
-            }
-            $item = Sabre_VObject_Property::create($item,$itemValue);
-            $item->parent = $this;
-            $this->children[] = $item;
-
-        } else {
-
-            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
-
-        }
-
-    }
-
-    /**
-     * Returns an iterable list of children
-     *
-     * @return Sabre_VObject_ElementList
-     */
-    public function children() {
-
-        return new Sabre_VObject_ElementList($this->children);
-
-    }
-
-    /**
-     * Returns an array with elements that match the specified name.
-     *
-     * This function is also aware of MIME-Directory groups (as they appear in
-     * vcards). This means that if a property is grouped as "HOME.EMAIL", it
-     * will also be returned when searching for just "EMAIL". If you want to
-     * search for a property in a specific group, you can select on the entire
-     * string ("HOME.EMAIL"). If you want to search on a specific property that
-     * has not been assigned a group, specify ".EMAIL".
-     *
-     * Keys are retained from the 'children' array, which may be confusing in
-     * certain cases.
-     *
-     * @param string $name
-     * @return array
-     */
-    public function select($name) {
-
-        $group = null;
-        $name = strtoupper($name);
-        if (strpos($name,'.')!==false) {
-            list($group,$name) = explode('.', $name, 2);
-        }
-
-        $result = array();
-        foreach($this->children as $key=>$child) {
-
-            if (
-                strtoupper($child->name) === $name &&
-                (is_null($group) || ( $child instanceof Sabre_VObject_Property && strtoupper($child->group) === $group))
-            ) {
-
-                $result[$key] = $child;
-
-            }
-        }
-
-        reset($result);
-        return $result;
-
-    }
-
-    /**
-     * This method only returns a list of sub-components. Properties are
-     * ignored.
-     *
-     * @return array
-     */
-    public function getComponents() {
-
-        $result = array();
-        foreach($this->children as $child) {
-            if ($child instanceof Sabre_VObject_Component) {
-                $result[] = $child;
-            }
-        }
-
-        return $result;
-
-    }
-
-    /* Magic property accessors {{{ */
-
-    /**
-     * Using 'get' you will either get a property or component,
-     *
-     * If there were no child-elements found with the specified name,
-     * null is returned.
-     *
-     * @param string $name
-     * @return Sabre_VObject_Property
-     */
-    public function __get($name) {
-
-        $matches = $this->select($name);
-        if (count($matches)===0) {
-            return null;
-        } else {
-            $firstMatch = current($matches);
-            /** @var $firstMatch Sabre_VObject_Property */
-            $firstMatch->setIterator(new Sabre_VObject_ElementList(array_values($matches)));
-            return $firstMatch;
-        }
-
-    }
-
-    /**
-     * This method checks if a sub-element with the specified name exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function __isset($name) {
-
-        $matches = $this->select($name);
-        return count($matches)>0;
-
-    }
-
-    /**
-     * Using the setter method you can add properties or subcomponents
-     *
-     * You can either pass a Sabre_VObject_Component, Sabre_VObject_Property
-     * object, or a string to automatically create a Property.
-     *
-     * If the item already exists, it will be removed. If you want to add
-     * a new item with the same name, always use the add() method.
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($name, $value) {
-
-        $matches = $this->select($name);
-        $overWrite = count($matches)?key($matches):null;
-
-        if ($value instanceof Sabre_VObject_Component || $value instanceof Sabre_VObject_Property) {
-            $value->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $value;
-            } else {
-                $this->children[] = $value;
-            }
-        } elseif (is_scalar($value)) {
-            $property = Sabre_VObject_Property::create($name,$value);
-            $property->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $property;
-            } else {
-                $this->children[] = $property;
-            }
-        } else {
-            throw new InvalidArgumentException('You must pass a Sabre_VObject_Component, Sabre_VObject_Property or scalar type');
-        }
-
-    }
-
-    /**
-     * Removes all properties and components within this component.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function __unset($name) {
-
-        $matches = $this->select($name);
-        foreach($matches as $k=>$child) {
-
-            unset($this->children[$k]);
-            $child->parent = null;
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     *
-     * @return void
-     */
-    public function __clone() {
-
-        foreach($this->children as $key=>$child) {
-            $this->children[$key] = clone $child;
-            $this->children[$key]->parent = $this;
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Component/VAlarm.php b/3rdparty/Sabre/VObject/Component/VAlarm.php
deleted file mode 100755
index ebb4a9b18f..0000000000
--- a/3rdparty/Sabre/VObject/Component/VAlarm.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * VAlarm component
- *
- * This component contains some additional functionality specific for VALARMs.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VAlarm extends Sabre_VObject_Component {
-
-    /**
-     * Returns a DateTime object when this alarm is going to trigger.
-     *
-     * This ignores repeated alarm, only the first trigger is returned.
-     *
-     * @return DateTime
-     */
-    public function getEffectiveTriggerTime() {
-
-        $trigger = $this->TRIGGER;
-        if(!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
-            $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
-
-            $parentComponent = $this->parent;
-            if ($related === 'START') {
-                $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                $effectiveTrigger->add($triggerDuration);
-            } else {
-                if ($parentComponent->name === 'VTODO') {
-                    $endProp = 'DUE';
-                } elseif ($parentComponent->name === 'VEVENT') {
-                    $endProp = 'DTEND';
-                } else {
-                    throw new Sabre_DAV_Exception('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
-                }
-
-                if (isset($parentComponent->$endProp)) {
-                    $effectiveTrigger = clone $parentComponent->$endProp->getDateTime();
-                    $effectiveTrigger->add($triggerDuration);
-                } elseif (isset($parentComponent->DURATION)) {
-                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                    $duration = Sabre_VObject_DateTimeParser::parseDuration($parentComponent->DURATION);
-                    $effectiveTrigger->add($duration);
-                    $effectiveTrigger->add($triggerDuration);
-                } else {
-                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                    $effectiveTrigger->add($triggerDuration);
-                }
-            }
-        } else {
-            $effectiveTrigger = $trigger->getDateTime();
-        }
-        return $effectiveTrigger;
-
-    }
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        $effectiveTrigger = $this->getEffectiveTriggerTime();
-
-        if (isset($this->DURATION)) {
-            $duration = Sabre_VObject_DateTimeParser::parseDuration($this->DURATION);
-            $repeat = (string)$this->repeat;
-            if (!$repeat) {
-                $repeat = 1;
-            }
-
-            $period = new DatePeriod($effectiveTrigger, $duration, (int)$repeat);
-
-            foreach($period as $occurrence) {
-
-                if ($start <= $occurrence && $end > $occurrence) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
-        }
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Component/VCalendar.php b/3rdparty/Sabre/VObject/Component/VCalendar.php
deleted file mode 100755
index f3be29afdb..0000000000
--- a/3rdparty/Sabre/VObject/Component/VCalendar.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * The VCalendar component
- *
- * This component adds functionality to a component, specific for a VCALENDAR.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VCalendar extends Sabre_VObject_Component {
-
-    /**
-     * Returns a list of all 'base components'. For instance, if an Event has 
-     * a recurrence rule, and one instance is overridden, the overridden event 
-     * will have the same UID, but will be excluded from this list.
-     *
-     * VTIMEZONE components will always be excluded. 
-     *
-     * @param string $componentName filter by component name 
-     * @return array 
-     */
-    public function getBaseComponents($componentName = null) {
-
-        $components = array();
-        foreach($this->children as $component) {
-
-            if (!$component instanceof Sabre_VObject_Component)
-                continue;
-
-            if (isset($component->{'RECURRENCE-ID'})) 
-                continue;
-
-            if ($componentName && $component->name !== strtoupper($componentName)) 
-                continue;
-
-            if ($component->name === 'VTIMEZONE')
-                continue;
-
-            $components[] = $component;
-
-        }
-
-        return $components;
-
-    }
-
-    /**
-     * If this calendar object, has events with recurrence rules, this method 
-     * can be used to expand the event into multiple sub-events.
-     *
-     * Each event will be stripped from it's recurrence information, and only 
-     * the instances of the event in the specified timerange will be left 
-     * alone.
-     *
-     * In addition, this method will cause timezone information to be stripped, 
-     * and normalized to UTC.
-     *
-     * This method will alter the VCalendar. This cannot be reversed.
-     *
-     * This functionality is specifically used by the CalDAV standard. It is 
-     * possible for clients to request expand events, if they are rather simple 
-     * clients and do not have the possibility to calculate recurrences.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return void
-     */
-    public function expand(DateTime $start, DateTime $end) {
-
-        $newEvents = array();
-
-        foreach($this->select('VEVENT') as $key=>$vevent) {
-
-            if (isset($vevent->{'RECURRENCE-ID'})) {
-                unset($this->children[$key]);
-                continue;
-            } 
-
-
-            if (!$vevent->rrule) {
-                unset($this->children[$key]);
-                if ($vevent->isInTimeRange($start, $end)) {
-                    $newEvents[] = $vevent;
-                }
-                continue;
-            }
-
-            $uid = (string)$vevent->uid;
-            if (!$uid) {
-                throw new LogicException('Event did not have a UID!');
-            }
-
-            $it = new Sabre_VObject_RecurrenceIterator($this, $vevent->uid);
-            $it->fastForward($start);
-
-            while($it->valid() && $it->getDTStart() < $end) {
-
-                if ($it->getDTEnd() > $start) {
-
-                    $newEvents[] = $it->getEventObject();
-
-                }
-                $it->next();
-
-            }
-            unset($this->children[$key]);
-
-        }
-
-        foreach($newEvents as $newEvent) {
-
-            foreach($newEvent->children as $child) {
-                if ($child instanceof Sabre_VObject_Property_DateTime &&
-                    $child->getDateType() == Sabre_VObject_Property_DateTime::LOCALTZ) {
-                        $child->setDateTime($child->getDateTime(),Sabre_VObject_Property_DateTime::UTC);
-                    }
-            }
-
-            $this->add($newEvent);
-
-        }
-
-        // Removing all VTIMEZONE components
-        unset($this->VTIMEZONE);
-
-    } 
-
-}
-
diff --git a/3rdparty/Sabre/VObject/Component/VEvent.php b/3rdparty/Sabre/VObject/Component/VEvent.php
deleted file mode 100755
index 4cc1e36d7d..0000000000
--- a/3rdparty/Sabre/VObject/Component/VEvent.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * VEvent component
- *
- * This component contains some additional functionality specific for VEVENT's.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VEvent extends Sabre_VObject_Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        if ($this->RRULE) {
-            $it = new Sabre_VObject_RecurrenceIterator($this);
-            $it->fastForward($start);
-
-            // We fast-forwarded to a spot where the end-time of the
-            // recurrence instance exceeded the start of the requested
-            // time-range.
-            //
-            // If the starttime of the recurrence did not exceed the
-            // end of the time range as well, we have a match.
-            return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
-
-        }
-
-        $effectiveStart = $this->DTSTART->getDateTime();
-        if (isset($this->DTEND)) {
-            $effectiveEnd = $this->DTEND->getDateTime();
-            // If this was an all-day event, we should just increase the
-            // end-date by 1. Otherwise the event will last until the second
-            // the date changed, by increasing this by 1 day the event lasts
-            // all of the last day as well.
-            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-                $effectiveEnd->modify('+1 day');
-            }
-        } elseif (isset($this->DURATION)) {
-            $effectiveEnd = clone $effectiveStart;
-            $effectiveEnd->add( Sabre_VObject_DateTimeParser::parseDuration($this->DURATION) );
-        } elseif ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-            $effectiveEnd = clone $effectiveStart;
-            $effectiveEnd->modify('+1 day');
-        } else {
-            $effectiveEnd = clone $effectiveStart;
-        }
-        return (
-            ($start <= $effectiveEnd) && ($end > $effectiveStart)
-        );
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Component/VJournal.php b/3rdparty/Sabre/VObject/Component/VJournal.php
deleted file mode 100755
index 22b3ec921e..0000000000
--- a/3rdparty/Sabre/VObject/Component/VJournal.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * VJournal component
- *
- * This component contains some additional functionality specific for VJOURNALs.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VJournal extends Sabre_VObject_Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified 
-     * time-range. This is used for filtering purposes. 
-     *
-     * The rules used to determine if an event falls within the specified 
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return bool 
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
-        if ($dtstart) {
-            $effectiveEnd = clone $dtstart;
-            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-                $effectiveEnd->modify('+1 day');
-            }
-
-            return ($start <= $effectiveEnd && $end > $dtstart);
-
-        }
-        return false;
-
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Component/VTodo.php b/3rdparty/Sabre/VObject/Component/VTodo.php
deleted file mode 100755
index 79d06298d7..0000000000
--- a/3rdparty/Sabre/VObject/Component/VTodo.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * VTodo component
- *
- * This component contains some additional functionality specific for VTODOs.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component_VTodo extends Sabre_VObject_Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified 
-     * time-range. This is used for filtering purposes. 
-     *
-     * The rules used to determine if an event falls within the specified 
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return bool 
-     */
-    public function isInTimeRange(DateTime $start, DateTime $end) {
-
-        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
-        $duration = isset($this->DURATION)?Sabre_VObject_DateTimeParser::parseDuration($this->DURATION):null;
-        $due = isset($this->DUE)?$this->DUE->getDateTime():null;
-        $completed = isset($this->COMPLETED)?$this->COMPLETED->getDateTime():null;
-        $created = isset($this->CREATED)?$this->CREATED->getDateTime():null;
-
-        if ($dtstart) {
-            if ($duration) {
-                $effectiveEnd = clone $dtstart;
-                $effectiveEnd->add($duration);
-                return $start <= $effectiveEnd && $end > $dtstart;
-            } elseif ($due) {
-                return
-                    ($start < $due || $start <= $dtstart) &&
-                    ($end > $dtstart || $end >= $due);
-            } else {
-                return $start <= $dtstart && $end > $dtstart;
-            }
-        }
-        if ($due) {
-            return ($start < $due && $end >= $due);
-        }
-        if ($completed && $created) {
-            return
-                ($start <= $created || $start <= $completed) &&
-                ($end >= $created || $end >= $completed);
-        }
-        if ($completed) {
-            return ($start <= $completed && $end >= $completed);
-        }
-        if ($created) {
-            return ($end > $created);
-        }
-        return true;
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/DateTimeParser.php b/3rdparty/Sabre/VObject/DateTimeParser.php
deleted file mode 100755
index 23a4bb6991..0000000000
--- a/3rdparty/Sabre/VObject/DateTimeParser.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * DateTimeParser
- *
- * This class is responsible for parsing the several different date and time
- * formats iCalendar and vCards have.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_DateTimeParser {
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
-     *
-     * Specifying a reference timezone is optional. It will only be used
-     * if the non-UTC format is used. The argument is used as a reference, the
-     * returned DateTime object will still be in the UTC timezone.
-     *
-     * @param string $dt
-     * @param DateTimeZone $tz
-     * @return DateTime
-     */
-    static public function parseDateTime($dt,DateTimeZone $tz = null) {
-
-        // Format is YYYYMMDD + "T" + hhmmss
-        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
-
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
-        }
-
-        if ($matches[7]==='Z' || is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
-        }
-        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
-
-        // Still resetting the timezone, to normalize everything to UTC
-        $date->setTimeZone(new DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted date and returns a DateTime object
-     *
-     * @param string $date
-     * @return DateTime
-     */
-    static public function parseDate($date) {
-
-        // Format is YYYYMMDD
-        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
-
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
-        }
-
-        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (RFC5545) formatted duration value.
-     *
-     * This method will either return a DateTimeInterval object, or a string
-     * suitable for strtotime or DateTime::modify.
-     *
-     * @param string $duration
-     * @param bool $asString
-     * @return DateInterval|string
-     */
-    static public function parseDuration($duration, $asString = false) {
-
-        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
-        }
-
-        if (!$asString) {
-            $invert = false;
-            if ($matches['plusminus']==='-') {
-                $invert = true;
-            }
-
-
-            $parts = array(
-                'week',
-                'day',
-                'hour',
-                'minute',
-                'second',
-            );
-            foreach($parts as $part) {
-                $matches[$part] = isset($matches[$part])&&$matches[$part]?(int)$matches[$part]:0;
-            }
-
-
-            // We need to re-construct the $duration string, because weeks and
-            // days are not supported by DateInterval in the same string.
-            $duration = 'P';
-            $days = $matches['day'];
-            if ($matches['week']) {
-                $days+=$matches['week']*7;
-            }
-            if ($days)
-                $duration.=$days . 'D';
-
-            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
-                $duration.='T';
-
-                if ($matches['hour'])
-                    $duration.=$matches['hour'].'H';
-
-                if ($matches['minute'])
-                    $duration.=$matches['minute'].'M';
-
-                if ($matches['second'])
-                    $duration.=$matches['second'].'S';
-
-            }
-
-            if ($duration==='P') {
-                $duration = 'PT0S';
-            }
-            $iv = new DateInterval($duration);
-            if ($invert) $iv->invert = true;
-
-            return $iv;
-
-        }
-
-
-
-        $parts = array(
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        );
-
-        $newDur = '';
-        foreach($parts as $part) {
-            if (isset($matches[$part]) && $matches[$part]) {
-                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
-            }
-        }
-
-        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
-        if ($newDur === '+') { $newDur = '+0 seconds'; };
-        return $newDur;
-
-    }
-
-    /**
-     * Parses either a Date or DateTime, or Duration value.
-     *
-     * @param string $date
-     * @param DateTimeZone|string $referenceTZ
-     * @return DateTime|DateInterval
-     */
-    static public function parse($date, $referenceTZ = null) {
-
-        if ($date[0]==='P' || ($date[0]==='-' && $date[1]==='P')) {
-            return self::parseDuration($date);
-        } elseif (strlen($date)===8) {
-            return self::parseDate($date);
-        } else {
-            return self::parseDateTime($date, $referenceTZ);
-        }
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/VObject/Element.php b/3rdparty/Sabre/VObject/Element.php
deleted file mode 100755
index e20ff0b353..0000000000
--- a/3rdparty/Sabre/VObject/Element.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Base class for all elements
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_VObject_Element extends Sabre_VObject_Node {
-
-    public $parent = null;
-
-}
diff --git a/3rdparty/Sabre/VObject/Element/DateTime.php b/3rdparty/Sabre/VObject/Element/DateTime.php
deleted file mode 100755
index 5e5eb7ab6f..0000000000
--- a/3rdparty/Sabre/VObject/Element/DateTime.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * DateTime property
- *
- * this class got renamed to Sabre_VObject_Property_DateTime
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- * @deprecated
- */
-class Sabre_VObject_Element_DateTime extends Sabre_VObject_Property_DateTime {
-
-    /**
-     * Local 'floating' time
-     */
-    const LOCAL = 1;
-
-    /**
-     * UTC-based time
-     */
-    const UTC = 2;
-
-    /**
-     * Local time plus timezone
-     */
-    const LOCALTZ = 3;
-
-    /**
-     * Only a date, time is ignored
-     */
-    const DATE = 4;
-
-}
diff --git a/3rdparty/Sabre/VObject/Element/MultiDateTime.php b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
deleted file mode 100755
index 8a12ced94a..0000000000
--- a/3rdparty/Sabre/VObject/Element/MultiDateTime.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Multi-DateTime property
- *
- * This class got renamed to Sabre_VObject_Property_MultiDateTime
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- * @deprecated
- */
-class Sabre_VObject_Element_MultiDateTime extends Sabre_VObject_Property_MultiDateTime {
-
-}
diff --git a/3rdparty/Sabre/VObject/ElementList.php b/3rdparty/Sabre/VObject/ElementList.php
deleted file mode 100755
index 7e508db20f..0000000000
--- a/3rdparty/Sabre/VObject/ElementList.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * VObject ElementList
- *
- * This class represents a list of elements. Lists are the result of queries,
- * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_ElementList implements Iterator, Countable, ArrayAccess {
-
-    /**
-     * Inner elements
-     *
-     * @var array
-     */
-    protected $elements = array();
-
-    /**
-     * Creates the element list.
-     *
-     * @param array $elements
-     */
-    public function __construct(array $elements) {
-
-        $this->elements = $elements;
-
-    }
-
-    /* {{{ Iterator interface */
-
-    /**
-     * Current position
-     *
-     * @var int
-     */
-    private $key = 0;
-
-    /**
-     * Returns current item in iteration
-     *
-     * @return Sabre_VObject_Element
-     */
-    public function current() {
-
-        return $this->elements[$this->key];
-
-    }
-
-    /**
-     * To the next item in the iterator
-     *
-     * @return void
-     */
-    public function next() {
-
-        $this->key++;
-
-    }
-
-    /**
-     * Returns the current iterator key
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->key;
-
-    }
-
-    /**
-     * Returns true if the current position in the iterator is a valid one
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        return isset($this->elements[$this->key]);
-
-    }
-
-    /**
-     * Rewinds the iterator
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->key = 0;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements
-     *
-     * @return int
-     */
-    public function count() {
-
-        return count($this->elements);
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * @param int $offset
-     * @return bool
-     */
-    public function offsetExists($offset) {
-
-        return isset($this->elements[$offset]);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset) {
-
-        return $this->elements[$offset];
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        throw new LogicException('You can not add new objects to an ElementList');
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        throw new LogicException('You can not remove objects from an ElementList');
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/FreeBusyGenerator.php b/3rdparty/Sabre/VObject/FreeBusyGenerator.php
deleted file mode 100755
index 1c96a64a00..0000000000
--- a/3rdparty/Sabre/VObject/FreeBusyGenerator.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/**
- * This class helps with generating FREEBUSY reports based on existing sets of
- * objects.
- *
- * It only looks at VEVENT and VFREEBUSY objects from the sourcedata, and
- * generates a single VFREEBUSY object.
- *
- * VFREEBUSY components are described in RFC5545, The rules for what should
- * go in a single freebusy report is taken from RFC4791, section 7.10.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_FreeBusyGenerator {
-
-    /**
-     * Input objects
-     *
-     * @var array
-     */
-    protected $objects;
-
-    /**
-     * Start of range
-     *
-     * @var DateTime|null
-     */
-    protected $start;
-
-    /**
-     * End of range
-     *
-     * @var DateTime|null
-     */
-    protected $end;
-
-    /**
-     * VCALENDAR object
-     *
-     * @var Sabre_VObject_Component
-     */
-    protected $baseObject;
-
-    /**
-     * Sets the VCALENDAR object.
-     *
-     * If this is set, it will not be generated for you. You are responsible
-     * for setting things like the METHOD, CALSCALE, VERSION, etc..
-     *
-     * The VFREEBUSY object will be automatically added though.
-     *
-     * @param Sabre_VObject_Component $vcalendar
-     * @return void
-     */
-    public function setBaseObject(Sabre_VObject_Component $vcalendar) {
-
-        $this->baseObject = $vcalendar;
-
-    }
-
-    /**
-     * Sets the input objects
-     *
-     * Every object must either be a string or a Sabre_VObject_Component.
-     *
-     * @param array $objects
-     * @return void
-     */
-    public function setObjects(array $objects) {
-
-        $this->objects = array();
-        foreach($objects as $object) {
-
-            if (is_string($object)) {
-                $this->objects[] = Sabre_VObject_Reader::read($object);
-            } elseif ($object instanceof Sabre_VObject_Component) {
-                $this->objects[] = $object;
-            } else {
-                throw new InvalidArgumentException('You can only pass strings or Sabre_VObject_Component arguments to setObjects');
-            }
-
-        }
-
-    }
-
-    /**
-     * Sets the time range
-     *
-     * Any freebusy object falling outside of this time range will be ignored.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return void
-     */
-    public function setTimeRange(DateTime $start = null, DateTime $end = null) {
-
-        $this->start = $start;
-        $this->end = $end;
-
-    }
-
-    /**
-     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
-     * a VCALENDAR.
-     *
-     * @return Sabre_VObject_Component
-     */
-    public function getResult() {
-
-        $busyTimes = array();
-
-        foreach($this->objects as $object) {
-
-            foreach($object->getBaseComponents() as $component) {
-
-                switch($component->name) {
-
-                    case 'VEVENT' :
-
-                        $FBTYPE = 'BUSY';
-                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
-                            break;
-                        }
-                        if (isset($component->STATUS)) {
-                            $status = strtoupper($component->STATUS);
-                            if ($status==='CANCELLED') {
-                                break;
-                            }
-                            if ($status==='TENTATIVE') {
-                                $FBTYPE = 'BUSY-TENTATIVE';
-                            }
-                        }
-
-                        $times = array();
-
-                        if ($component->RRULE) {
-
-                            $iterator = new Sabre_VObject_RecurrenceIterator($object, (string)$component->uid);
-                            if ($this->start) {
-                                $iterator->fastForward($this->start);
-                            }
-
-                            $maxRecurrences = 200;
-
-                            while($iterator->valid() && --$maxRecurrences) {
-
-                                $startTime = $iterator->getDTStart();
-                                if ($this->end && $startTime > $this->end) {
-                                    break;
-                                }
-                                $times[] = array(
-                                    $iterator->getDTStart(),
-                                    $iterator->getDTEnd(),
-                                );
-
-                                $iterator->next();
-
-                            }
-
-                        } else {
-
-                            $startTime = $component->DTSTART->getDateTime();
-                            if ($this->end && $startTime > $this->end) {
-                                break;
-                            }
-                            $endTime = null;
-                            if (isset($component->DTEND)) {
-                                $endTime = $component->DTEND->getDateTime();
-                            } elseif (isset($component->DURATION)) {
-                                $duration = Sabre_VObject_DateTimeParser::parseDuration((string)$component->DURATION);
-                                $endTime = clone $startTime;
-                                $endTime->add($duration);
-                            } elseif ($component->DTSTART->getDateType() === Sabre_VObject_Property_DateTime::DATE) {
-                                $endTime = clone $startTime;
-                                $endTime->modify('+1 day');
-                            } else {
-                                // The event had no duration (0 seconds)
-                                break;
-                            }
-
-                            $times[] = array($startTime, $endTime);
-
-                        }
-
-                        foreach($times as $time) {
-
-                            if ($this->end && $time[0] > $this->end) break;
-                            if ($this->start && $time[1] < $this->start) break;
-
-                            $busyTimes[] = array(
-                                $time[0],
-                                $time[1],
-                                $FBTYPE,
-                            );
-                        }
-                        break;
-
-                    case 'VFREEBUSY' :
-                        foreach($component->FREEBUSY as $freebusy) {
-
-                            $fbType = isset($freebusy['FBTYPE'])?strtoupper($freebusy['FBTYPE']):'BUSY';
-
-                            // Skipping intervals marked as 'free'
-                            if ($fbType==='FREE')
-                                continue;
-
-                            $values = explode(',', $freebusy);
-                            foreach($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
-                                $startTime = Sabre_VObject_DateTimeParser::parseDateTime($startTime);
-
-                                if (substr($endTime,0,1)==='P' || substr($endTime,0,2)==='-P') {
-                                    $duration = Sabre_VObject_DateTimeParser::parseDuration($endTime);
-                                    $endTime = clone $startTime;
-                                    $endTime->add($duration);
-                                } else {
-                                    $endTime = Sabre_VObject_DateTimeParser::parseDateTime($endTime);
-                                }
-
-                                if($this->start && $this->start > $endTime) continue;
-                                if($this->end && $this->end < $startTime) continue;
-                                $busyTimes[] = array(
-                                    $startTime,
-                                    $endTime,
-                                    $fbType
-                                );
-
-                            }
-
-
-                        }
-                        break;
-
-
-
-                }
-
-
-            }
-
-        }
-
-        if ($this->baseObject) {
-            $calendar = $this->baseObject;
-        } else {
-            $calendar = new Sabre_VObject_Component('VCALENDAR');
-            $calendar->version = '2.0';
-            if (Sabre_DAV_Server::$exposeVersion) {
-                $calendar->prodid = '-//SabreDAV//Sabre VObject ' . Sabre_VObject_Version::VERSION . '//EN';
-            } else {
-                $calendar->prodid = '-//SabreDAV//Sabre VObject//EN';
-            }
-            $calendar->calscale = 'GREGORIAN';
-        }
-
-        $vfreebusy = new Sabre_VObject_Component('VFREEBUSY');
-        $calendar->add($vfreebusy);
-
-        if ($this->start) {
-            $dtstart = new Sabre_VObject_Property_DateTime('DTSTART');
-            $dtstart->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
-            $vfreebusy->add($dtstart);
-        }
-        if ($this->end) {
-            $dtend = new Sabre_VObject_Property_DateTime('DTEND');
-            $dtend->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
-            $vfreebusy->add($dtend);
-        }
-        $dtstamp = new Sabre_VObject_Property_DateTime('DTSTAMP');
-        $dtstamp->setDateTime(new DateTime('now'), Sabre_VObject_Property_DateTime::UTC);
-        $vfreebusy->add($dtstamp);
-
-        foreach($busyTimes as $busyTime) {
-
-            $busyTime[0]->setTimeZone(new DateTimeZone('UTC'));
-            $busyTime[1]->setTimeZone(new DateTimeZone('UTC'));
-
-            $prop = new Sabre_VObject_Property(
-                'FREEBUSY',
-                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
-            );
-            $prop['FBTYPE'] = $busyTime[2];
-            $vfreebusy->add($prop);
-
-        }
-
-        return $calendar;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/VObject/Node.php b/3rdparty/Sabre/VObject/Node.php
deleted file mode 100755
index d89e01b56c..0000000000
--- a/3rdparty/Sabre/VObject/Node.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Base class for all nodes
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_VObject_Node implements IteratorAggregate, ArrayAccess, Countable {
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    abstract function serialize();
-
-    /**
-     * Iterator override
-     *
-     * @var Sabre_VObject_ElementList
-     */
-    protected $iterator = null;
-
-    /**
-     * A link to the parent node
-     *
-     * @var Sabre_VObject_Node
-     */
-    public $parent = null;
-
-    /* {{{ IteratorAggregator interface */
-
-    /**
-     * Returns the iterator for this object
-     *
-     * @return Sabre_VObject_ElementList
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator))
-            return $this->iterator;
-
-        return new Sabre_VObject_ElementList(array($this));
-
-    }
-
-    /**
-     * Sets the overridden iterator
-     *
-     * Note that this is not actually part of the iterator interface
-     *
-     * @param Sabre_VObject_ElementList $iterator
-     * @return void
-     */
-    public function setIterator(Sabre_VObject_ElementList $iterator) {
-
-        $this->iterator = $iterator;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements
-     *
-     * @return int
-     */
-    public function count() {
-
-        $it = $this->getIterator();
-        return $it->count();
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return bool
-     */
-    public function offsetExists($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetExists($offset);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetGet($offset);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetSet($offset,$value);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetUnset($offset);
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/Parameter.php b/3rdparty/Sabre/VObject/Parameter.php
deleted file mode 100755
index 2e39af5f78..0000000000
--- a/3rdparty/Sabre/VObject/Parameter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * VObject Parameter
- *
- * This class represents a parameter. A parameter is always tied to a property.
- * In the case of:
- *   DTSTART;VALUE=DATE:20101108
- * VALUE=DATE would be the parameter name and value.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Parameter extends Sabre_VObject_Node {
-
-    /**
-     * Parameter name
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Parameter value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * Sets up the object
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __construct($name, $value = null) {
-
-        $this->name = strtoupper($name);
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        if (is_null($this->value)) {
-            return $this->name;
-        }
-        $src = array(
-            '\\',
-            "\n",
-            ';',
-            ',',
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-            '\;',
-            '\,',
-        );
-
-        return $this->name . '=' . str_replace($src, $out, $this->value);
-
-    }
-
-    /**
-     * Called when this object is being cast to a string
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return $this->value;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/ParseException.php b/3rdparty/Sabre/VObject/ParseException.php
deleted file mode 100755
index 1b5e95bf16..0000000000
--- a/3rdparty/Sabre/VObject/ParseException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Exception thrown by Sabre_VObject_Reader if an invalid object was attempted to be parsed.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_ParseException extends Exception { }
diff --git a/3rdparty/Sabre/VObject/Property.php b/3rdparty/Sabre/VObject/Property.php
deleted file mode 100755
index ce74fe3865..0000000000
--- a/3rdparty/Sabre/VObject/Property.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-
-/**
- * VObject Property
- *
- * A property in VObject is usually in the form PARAMNAME:paramValue.
- * An example is : SUMMARY:Weekly meeting
- *
- * Properties can also have parameters:
- * SUMMARY;LANG=en:Weekly meeting.
- *
- * Parameters can be accessed using the ArrayAccess interface.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property extends Sabre_VObject_Element {
-
-    /**
-     * Propertyname
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Group name
-     *
-     * This may be something like 'HOME' for vcards.
-     *
-     * @var string
-     */
-    public $group;
-
-    /**
-     * Property parameters
-     *
-     * @var array
-     */
-    public $parameters = array();
-
-    /**
-     * Property value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * If properties are added to this map, they will be automatically mapped
-     * to their respective classes, if parsed by the reader or constructed with
-     * the 'create' method.
-     *
-     * @var array
-     */
-    static public $classMap = array(
-        'COMPLETED'     => 'Sabre_VObject_Property_DateTime',
-        'CREATED'       => 'Sabre_VObject_Property_DateTime',
-        'DTEND'         => 'Sabre_VObject_Property_DateTime',
-        'DTSTAMP'       => 'Sabre_VObject_Property_DateTime',
-        'DTSTART'       => 'Sabre_VObject_Property_DateTime',
-        'DUE'           => 'Sabre_VObject_Property_DateTime',
-        'EXDATE'        => 'Sabre_VObject_Property_MultiDateTime',
-        'LAST-MODIFIED' => 'Sabre_VObject_Property_DateTime',
-        'RECURRENCE-ID' => 'Sabre_VObject_Property_DateTime',
-        'TRIGGER'       => 'Sabre_VObject_Property_DateTime',
-    );
-
-    /**
-     * Creates the new property by name, but in addition will also see if
-     * there's a class mapped to the property name.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    static public function create($name, $value = null) {
-
-        $name = strtoupper($name);
-        $shortName = $name;
-        $group = null;
-        if (strpos($shortName,'.')!==false) {
-            list($group, $shortName) = explode('.', $shortName);
-        }
-
-        if (isset(self::$classMap[$shortName])) {
-            return new self::$classMap[$shortName]($name, $value);
-        } else {
-            return new self($name, $value);
-        }
-
-    }
-
-    /**
-     * Creates a new property object
-     *
-     * By default this object will iterate over its own children, but this can
-     * be overridden with the iterator argument
-     *
-     * @param string $name
-     * @param string $value
-     * @param Sabre_VObject_ElementList $iterator
-     */
-    public function __construct($name, $value = null, $iterator = null) {
-
-        $name = strtoupper($name);
-        $group = null;
-        if (strpos($name,'.')!==false) {
-            list($group, $name) = explode('.', $name);
-        }
-        $this->name = $name;
-        $this->group = $group;
-        if (!is_null($iterator)) $this->iterator = $iterator;
-        $this->setValue($value);
-
-    }
-
-
-
-    /**
-     * Updates the internal value
-     *
-     * @param string $value
-     * @return void
-     */
-    public function setValue($value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
-
-        if (count($this->parameters)) {
-            foreach($this->parameters as $param) {
-
-                $str.=';' . $param->serialize();
-
-            }
-        }
-        $src = array(
-            '\\',
-            "\n",
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-        );
-        $str.=':' . str_replace($src, $out, $this->value);
-
-        $out = '';
-        while(strlen($str)>0) {
-            if (strlen($str)>75) {
-                $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
-                $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
-            } else {
-                $out.=$str . "\r\n";
-                $str='';
-                break;
-            }
-        }
-
-        return $out;
-
-    }
-
-    /**
-     * Adds a new componenten or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Sabre_VObject_Parameter $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Parameter
-     * The second adds a property as a string.
-     *
-     * @param mixed $item
-     * @param mixed $itemValue
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Sabre_VObject_Parameter) {
-            if (!is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->parameters[] = $item;
-        } elseif(is_string($item)) {
-
-            if (!is_scalar($itemValue) && !is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must be scalar');
-            }
-            $parameter = new Sabre_VObject_Parameter($item,$itemValue);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } else {
-
-            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
-
-        }
-
-    }
-
-    /* ArrayAccess interface {{{ */
-
-    /**
-     * Checks if an array element exists
-     *
-     * @param mixed $name
-     * @return bool
-     */
-    public function offsetExists($name) {
-
-        if (is_int($name)) return parent::offsetExists($name);
-
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name) return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a parameter, or parameter list.
-     *
-     * @param string $name
-     * @return Sabre_VObject_Element
-     */
-    public function offsetGet($name) {
-
-        if (is_int($name)) return parent::offsetGet($name);
-        $name = strtoupper($name);
-
-        $result = array();
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name)
-                $result[] = $parameter;
-        }
-
-        if (count($result)===0) {
-            return null;
-        } elseif (count($result)===1) {
-            return $result[0];
-        } else {
-            $result[0]->setIterator(new Sabre_VObject_ElementList($result));
-            return $result[0];
-        }
-
-    }
-
-    /**
-     * Creates a new parameter
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($name, $value) {
-
-        if (is_int($name)) return parent::offsetSet($name, $value);
-
-        if (is_scalar($value)) {
-            if (!is_string($name))
-                throw new InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
-
-            $this->offsetUnset($name);
-            $parameter = new Sabre_VObject_Parameter($name, $value);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } elseif ($value instanceof Sabre_VObject_Parameter) {
-            if (!is_null($name))
-                throw new InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a Sabre_VObject_Parameter. Add using $array[]=$parameterObject.');
-
-            $value->parent = $this;
-            $this->parameters[] = $value;
-        } else {
-            throw new InvalidArgumentException('You can only add parameters to the property object');
-        }
-
-    }
-
-    /**
-     * Removes one or more parameters with the specified name
-     *
-     * @param string $name
-     * @return void
-     */
-    public function offsetUnset($name) {
-
-        if (is_int($name)) return parent::offsetUnset($name);
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $key=>$parameter) {
-            if ($parameter->name == $name) {
-                $parameter->parent = null;
-                unset($this->parameters[$key]);
-            }
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * Called when this object is being cast to a string
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return (string)$this->value;
-
-    }
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     *
-     * @return void
-     */
-    public function __clone() {
-
-        foreach($this->parameters as $key=>$child) {
-            $this->parameters[$key] = clone $child;
-            $this->parameters[$key]->parent = $this;
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Property/DateTime.php b/3rdparty/Sabre/VObject/Property/DateTime.php
deleted file mode 100755
index fe2372caa8..0000000000
--- a/3rdparty/Sabre/VObject/Property/DateTime.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-/**
- * DateTime property
- *
- * This element is used for iCalendar properties such as the DTSTART property.
- * It basically provides a few helper functions that make it easier to deal
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTime and getDateTime to
- * retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep
- * reference and results might appear incorrectly.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property_DateTime extends Sabre_VObject_Property {
-
-    /**
-     * Local 'floating' time
-     */
-    const LOCAL = 1;
-
-    /**
-     * UTC-based time
-     */
-    const UTC = 2;
-
-    /**
-     * Local time plus timezone
-     */
-    const LOCALTZ = 3;
-
-    /**
-     * Only a date, time is ignored
-     */
-    const DATE = 4;
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime
-     */
-    protected $dateTime;
-
-    /**
-     * dateType
-     *
-     * @var int
-     */
-    protected $dateType;
-
-    /**
-     * Updates the Date and Time.
-     *
-     * @param DateTime $dt
-     * @param int $dateType
-     * @return void
-     */
-    public function setDateTime(DateTime $dt, $dateType = self::LOCALTZ) {
-
-        switch($dateType) {
-
-            case self::LOCAL :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::UTC :
-                $dt->setTimeZone(new DateTimeZone('UTC'));
-                $this->setValue($dt->format('Ymd\\THis\\Z'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::LOCALTZ :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
-                break;
-            case self::DATE :
-                $this->setValue($dt->format('Ymd'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTime = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return DateTime|null
-     */
-    public function getDateTime() {
-
-        if ($this->dateTime)
-            return $this->dateTime;
-
-        list(
-            $this->dateType,
-            $this->dateTime
-        ) = self::parseData($this->value, $this);
-        return $this->dateTime;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set,
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        list(
-            $this->dateType,
-            $this->dateTime,
-        ) = self::parseData($this->value, $this);
-        return $this->dateType;
-
-    }
-
-    /**
-     * Parses the internal data structure to figure out what the current date
-     * and time is.
-     *
-     * The returned array contains two elements:
-     *   1. A 'DateType' constant (as defined on this class), or null.
-     *   2. A DateTime object (or null)
-     *
-     * @param string|null $propertyValue The string to parse (yymmdd or
-     *                                   ymmddThhmmss, etc..)
-     * @param Sabre_VObject_Property|null $property The instance of the
-     *                                              property we're parsing.
-     * @return array
-     */
-    static public function parseData($propertyValue, Sabre_VObject_Property $property = null) {
-
-        if (is_null($propertyValue)) {
-            return array(null, null);
-        }
-
-        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
-        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
-        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
-
-        if (!preg_match($regex, $propertyValue, $matches)) {
-            throw new InvalidArgumentException($propertyValue . ' is not a valid DateTime or Date string');
-        }
-
-        if (!isset($matches['hour'])) {
-            // Date-only
-            return array(
-                self::DATE,
-                new DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00'),
-            );
-        }
-
-        $dateStr =
-            $matches['year'] .'-' .
-            $matches['month'] . '-' .
-            $matches['date'] . ' ' .
-            $matches['hour'] . ':' .
-            $matches['minute'] . ':' .
-            $matches['second'];
-
-        if (isset($matches['isutc'])) {
-            $dt = new DateTime($dateStr,new DateTimeZone('UTC'));
-            $dt->setTimeZone(new DateTimeZone('UTC'));
-            return array(
-                self::UTC,
-                $dt
-            );
-        }
-
-        // Finding the timezone.
-        $tzid = $property['TZID'];
-        if (!$tzid) {
-            return array(
-                self::LOCAL,
-                new DateTime($dateStr)
-            );
-        }
-
-        try {
-            // tzid an Olson identifier?
-            $tz = new DateTimeZone($tzid->value);
-        } catch (Exception $e) {
-
-            // Not an Olson id, we're going to try to find the information 
-            // through the time zone name map.
-            $newtzid = Sabre_VObject_WindowsTimezoneMap::lookup($tzid->value);
-            if (is_null($newtzid)) {
-
-                // Not a well known time zone name either, we're going to try 
-                // to find the information through the VTIMEZONE object.
-
-                // First we find the root object
-                $root = $property;
-                while($root->parent) {
-                    $root = $root->parent;
-                }
-
-                if (isset($root->VTIMEZONE)) {
-                    foreach($root->VTIMEZONE as $vtimezone) {
-                        if (((string)$vtimezone->TZID) == $tzid) {
-                            if (isset($vtimezone->{'X-LIC-LOCATION'})) {
-                                $newtzid = (string)$vtimezone->{'X-LIC-LOCATION'};
-                            } else {
-                                // No libical location specified. As a last resort we could 
-                                // try matching $vtimezone's DST rules against all known 
-                                // time zones returned by DateTimeZone::list*
-
-                                // TODO
-                            }
-                        }
-                    }
-                }
-            }
-
-            try {
-                $tz = new DateTimeZone($newtzid);
-            } catch (Exception $e) {
-                // If all else fails, we use the default PHP timezone
-                $tz = new DateTimeZone(date_default_timezone_get()); 
-            }
-        }
-        $dt = new DateTime($dateStr, $tz);
-        $dt->setTimeZone($tz);
-
-        return array(
-            self::LOCALTZ,
-            $dt
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Property/MultiDateTime.php b/3rdparty/Sabre/VObject/Property/MultiDateTime.php
deleted file mode 100755
index ae53ab6a61..0000000000
--- a/3rdparty/Sabre/VObject/Property/MultiDateTime.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-/**
- * Multi-DateTime property
- *
- * This element is used for iCalendar properties such as the EXDATE property.
- * It basically provides a few helper functions that make it easier to deal
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTimes and getDateTimes
- * to retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep
- * reference and results might appear incorrectly.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property_MultiDateTime extends Sabre_VObject_Property {
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime[]
-     */
-    protected $dateTimes;
-
-    /**
-     * dateType
-     *
-     * This is one of the Sabre_VObject_Property_DateTime constants.
-     *
-     * @var int
-     */
-    protected $dateType;
-
-    /**
-     * Updates the value
-     *
-     * @param array $dt Must be an array of DateTime objects.
-     * @param int $dateType
-     * @return void
-     */
-    public function setDateTimes(array $dt, $dateType = Sabre_VObject_Property_DateTime::LOCALTZ) {
-
-        foreach($dt as $i)
-            if (!$i instanceof DateTime)
-                throw new InvalidArgumentException('You must pass an array of DateTime objects');
-
-        $this->offsetUnset('VALUE');
-        $this->offsetUnset('TZID');
-        switch($dateType) {
-
-            case Sabre_VObject_Property_DateTime::LOCAL :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case Sabre_VObject_Property_DateTime::UTC :
-                $val = array();
-                foreach($dt as $i) {
-                    $i->setTimeZone(new DateTimeZone('UTC'));
-                    $val[] = $i->format('Ymd\\THis\\Z');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case Sabre_VObject_Property_DateTime::LOCALTZ :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
-                break;
-            case Sabre_VObject_Property_DateTime::DATE :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTimes = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return array|null
-     */
-    public function getDateTimes() {
-
-        if ($this->dateTimes)
-            return $this->dateTimes;
-
-        $dts = array();
-
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateTimes;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set,
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        $dts = array();
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateType;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/Reader.php b/3rdparty/Sabre/VObject/Reader.php
deleted file mode 100755
index eea73fa3dc..0000000000
--- a/3rdparty/Sabre/VObject/Reader.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * VCALENDAR/VCARD reader
- *
- * This class reads the vobject file, and returns a full element tree.
- *
- * TODO: this class currently completely works 'statically'. This is pointless,
- * and defeats OOP principals. Needs refactoring in a future version.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Reader {
-
-    /**
-     * Parses the file and returns the top component
-     *
-     * @param string $data
-     * @return Sabre_VObject_Element
-     */
-    static function read($data) {
-
-        // Normalizing newlines
-        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
-
-        $lines = explode("\n", $data);
-
-        // Unfolding lines
-        $lines2 = array();
-        foreach($lines as $line) {
-
-            // Skipping empty lines
-            if (!$line) continue;
-
-            if ($line[0]===" " || $line[0]==="\t") {
-                $lines2[count($lines2)-1].=substr($line,1);
-            } else {
-                $lines2[] = $line;
-            }
-
-        }
-
-        unset($lines);
-
-        reset($lines2);
-
-        return self::readLine($lines2);
-
-    }
-
-    /**
-     * Reads and parses a single line.
-     *
-     * This method receives the full array of lines. The array pointer is used
-     * to traverse.
-     *
-     * @param array $lines
-     * @return Sabre_VObject_Element
-     */
-    static private function readLine(&$lines) {
-
-        $line = current($lines);
-        $lineNr = key($lines);
-        next($lines);
-
-        // Components
-        if (stripos($line,"BEGIN:")===0) {
-
-            $componentName = strtoupper(substr($line,6));
-            $obj = Sabre_VObject_Component::create($componentName);
-
-            $nextLine = current($lines);
-
-            while(stripos($nextLine,"END:")!==0) {
-
-                $obj->add(self::readLine($lines));
-
-                $nextLine = current($lines);
-
-                if ($nextLine===false)
-                    throw new Sabre_VObject_ParseException('Invalid VObject. Document ended prematurely.');
-
-            }
-
-            // Checking component name of the 'END:' line.
-            if (substr($nextLine,4)!==$obj->name) {
-                throw new Sabre_VObject_ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
-            }
-            next($lines);
-
-            return $obj;
-
-        }
-
-        // Properties
-        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
-
-
-        $token = '[A-Z0-9-\.]+';
-        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
-        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
-
-        $result = preg_match($regex,$line,$matches);
-
-        if (!$result) {
-            throw new Sabre_VObject_ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
-        }
-
-        $propertyName = strtoupper($matches['name']);
-        $propertyValue = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
-            if ($matches[2]==='n' || $matches[2]==='N') {
-                return "\n";
-            } else {
-                return $matches[2];
-            }
-        }, $matches['value']);
-
-        $obj = Sabre_VObject_Property::create($propertyName, $propertyValue);
-
-        if ($matches['parameters']) {
-
-            foreach(self::readParameters($matches['parameters']) as $param) {
-                $obj->add($param);
-            }
-
-        }
-
-        return $obj;
-
-
-    }
-
-    /**
-     * Reads a parameter list from a property
-     *
-     * This method returns an array of Sabre_VObject_Parameter
-     *
-     * @param string $parameters
-     * @return array
-     */
-    static private function readParameters($parameters) {
-
-        $token = '[A-Z0-9-]+';
-
-        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
-
-        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
-        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
-
-        $params = array();
-        foreach($matches as $match) {
-
-            $value = isset($match['paramValue'])?$match['paramValue']:null;
-
-            if (isset($value[0])) {
-                // Stripping quotes, if needed
-                if ($value[0] === '"') $value = substr($value,1,strlen($value)-2);
-            } else {
-                $value = '';
-            }
-
-            $value = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
-                if ($matches[2]==='n' || $matches[2]==='N') {
-                    return "\n";
-                } else {
-                    return $matches[2];
-                }
-            }, $value);
-
-            $params[] = new Sabre_VObject_Parameter($match['paramName'], $value);
-
-        }
-
-        return $params;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/VObject/RecurrenceIterator.php b/3rdparty/Sabre/VObject/RecurrenceIterator.php
deleted file mode 100755
index 833aa091ab..0000000000
--- a/3rdparty/Sabre/VObject/RecurrenceIterator.php
+++ /dev/null
@@ -1,1009 +0,0 @@
-<?php
-
-/**
- * This class is used to determine new for a recurring event, when the next
- * events occur.
- *
- * This iterator may loop infinitely in the future, therefore it is important
- * that if you use this class, you set hard limits for the amount of iterations
- * you want to handle.
- *
- * Note that currently there is not full support for the entire iCalendar
- * specification, as it's very complex and contains a lot of permutations
- * that's not yet used very often in software.
- *
- * For the focus has been on features as they actually appear in Calendaring
- * software, but this may well get expanded as needed / on demand
- *
- * The following RRULE properties are supported
- *   * UNTIL
- *   * INTERVAL
- *   * COUNT
- *   * FREQ=DAILY
- *     * BYDAY
- *   * FREQ=WEEKLY
- *     * BYDAY
- *     * WKST
- *   * FREQ=MONTHLY
- *     * BYMONTHDAY
- *     * BYDAY
- *     * BYSETPOS
- *   * FREQ=YEARLY
- *     * BYMONTH
- *     * BYMONTHDAY (only if BYMONTH is also set)
- *     * BYDAY (only if BYMONTH is also set)
- *
- * Anything beyond this is 'undefined', which means that it may get ignored, or
- * you may get unexpected results. The effect is that in some applications the
- * specified recurrence may look incorrect, or is missing.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_RecurrenceIterator implements Iterator {
-
-    /**
-     * The initial event date
-     *
-     * @var DateTime
-     */
-    public $startDate;
-
-    /**
-     * The end-date of the initial event
-     *
-     * @var DateTime
-     */
-    public $endDate;
-
-    /**
-     * The 'current' recurrence.
-     *
-     * This will be increased for every iteration.
-     *
-     * @var DateTime
-     */
-    public $currentDate;
-
-
-    /**
-     * List of dates that are excluded from the rules.
-     *
-     * This list contains the items that have been overriden by the EXDATE
-     * property.
-     *
-     * @var array
-     */
-    public $exceptionDates = array();
-
-    /**
-     * Base event
-     *
-     * @var Sabre_VObject_Component_VEvent
-     */
-    public $baseEvent;
-
-    /**
-     * List of dates that are overridden by other events.
-     * Similar to $overriddenEvents, but this just contains the original dates.
-     *
-     * @var array
-     */
-    public $overriddenDates = array();
-
-    /**
-     * list of events that are 'overridden'.
-     *
-     * This is an array of Sabre_VObject_Component_VEvent objects.
-     *
-     * @var array
-     */
-    public $overriddenEvents = array();
-
-
-    /**
-     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
-     * yearly.
-     *
-     * @var string
-     */
-    public $frequency;
-
-    /**
-     * The last instance of this recurrence, inclusively
-     *
-     * @var DateTime|null
-     */
-    public $until;
-
-    /**
-     * The number of recurrences, or 'null' if infinitely recurring.
-     *
-     * @var int
-     */
-    public $count;
-
-    /**
-     * The interval.
-     *
-     * If for example frequency is set to daily, interval = 2 would mean every
-     * 2 days.
-     *
-     * @var int
-     */
-    public $interval = 1;
-
-    /**
-     * Which seconds to recur.
-     *
-     * This is an array of integers (between 0 and 60)
-     *
-     * @var array
-     */
-    public $bySecond;
-
-    /**
-     * Which minutes to recur
-     *
-     * This is an array of integers (between 0 and 59)
-     *
-     * @var array
-     */
-    public $byMinute;
-
-    /**
-     * Which hours to recur
-     *
-     * This is an array of integers (between 0 and 23)
-     *
-     * @var array
-     */
-    public $byHour;
-
-    /**
-     * Which weekdays to recur.
-     *
-     * This is an array of weekdays
-     *
-     * This may also be preceeded by a positive or negative integer. If present,
-     * this indicates the nth occurrence of a specific day within the monthly or
-     * yearly rrule. For instance, -2TU indicates the second-last tuesday of
-     * the month, or year.
-     *
-     * @var array
-     */
-    public $byDay;
-
-    /**
-     * Which days of the month to recur
-     *
-     * This is an array of days of the months (1-31). The value can also be
-     * negative. -5 for instance means the 5th last day of the month.
-     *
-     * @var array
-     */
-    public $byMonthDay;
-
-    /**
-     * Which days of the year to recur.
-     *
-     * This is an array with days of the year (1 to 366). The values can also
-     * be negative. For instance, -1 will always represent the last day of the
-     * year. (December 31st).
-     *
-     * @var array
-     */
-    public $byYearDay;
-
-    /**
-     * Which week numbers to recur.
-     *
-     * This is an array of integers from 1 to 53. The values can also be
-     * negative. -1 will always refer to the last week of the year.
-     *
-     * @var array
-     */
-    public $byWeekNo;
-
-    /**
-     * Which months to recur
-     *
-     * This is an array of integers from 1 to 12.
-     *
-     * @var array
-     */
-    public $byMonth;
-
-    /**
-     * Which items in an existing st to recur.
-     *
-     * These numbers work together with an existing by* rule. It specifies
-     * exactly which items of the existing by-rule to filter.
-     *
-     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
-     * used to recur the last workday of the month.
-     *
-     * This would be done by setting frequency to 'monthly', byDay to
-     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
-     *
-     * @var array
-     */
-    public $bySetPos;
-
-    /**
-     * When a week starts
-     *
-     * @var string
-     */
-    public $weekStart = 'MO';
-
-    /**
-     * The current item in the list
-     *
-     * @var int
-     */
-    public $counter = 0;
-
-    /**
-     * Simple mapping from iCalendar day names to day numbers
-     *
-     * @var array
-     */
-    private $dayMap = array(
-        'SU' => 0,
-        'MO' => 1,
-        'TU' => 2,
-        'WE' => 3,
-        'TH' => 4,
-        'FR' => 5,
-        'SA' => 6,
-    );
-
-    /**
-     * Mappings between the day number and english day name.
-     *
-     * @var array
-     */
-    private $dayNames = array(
-        0 => 'Sunday',
-        1 => 'Monday',
-        2 => 'Tuesday',
-        3 => 'Wednesday',
-        4 => 'Thursday',
-        5 => 'Friday',
-        6 => 'Saturday',
-    );
-
-    /**
-     * If the current iteration of the event is an overriden event, this
-     * property will hold the VObject
-     *
-     * @var Sabre_Component_VObject
-     */
-    private $currentOverriddenEvent;
-
-    /**
-     * This property may contain the date of the next not-overridden event.
-     * This date is calculated sometimes a bit early, before overridden events
-     * are evaluated.
-     *
-     * @var DateTime
-     */
-    private $nextDate;
-
-    /**
-     * Creates the iterator
-     *
-     * You should pass a VCALENDAR component, as well as the UID of the event
-     * we're going to traverse.
-     *
-     * @param Sabre_VObject_Component $vcal
-     * @param string|null $uid
-     */
-    public function __construct(Sabre_VObject_Component $vcal, $uid=null) {
-
-        if (is_null($uid)) {
-            if ($vcal->name === 'VCALENDAR') {
-                throw new InvalidArgumentException('If you pass a VCALENDAR object, you must pass a uid argument as well');
-            }
-            $components = array($vcal);
-            $uid = (string)$vcal->uid;
-        } else {
-            $components = $vcal->select('VEVENT');
-        }
-        foreach($components as $component) {
-            if ((string)$component->uid == $uid) {
-                if (isset($component->{'RECURRENCE-ID'})) {
-                    $this->overriddenEvents[$component->DTSTART->getDateTime()->getTimeStamp()] = $component;
-                    $this->overriddenDates[] = $component->{'RECURRENCE-ID'}->getDateTime();
-                } else {
-                    $this->baseEvent = $component;
-                }
-            }
-        }
-        if (!$this->baseEvent) {
-            throw new InvalidArgumentException('Could not find a base event with uid: ' . $uid);
-        }
-
-        $this->startDate = clone $this->baseEvent->DTSTART->getDateTime();
-
-        $this->endDate = null;
-        if (isset($this->baseEvent->DTEND)) {
-            $this->endDate = clone $this->baseEvent->DTEND->getDateTime();
-        } else {
-            $this->endDate = clone $this->startDate;
-            if (isset($this->baseEvent->DURATION)) {
-                $this->endDate->add(Sabre_VObject_DateTimeParser::parse($this->baseEvent->DURATION->value));
-            }
-        }
-        $this->currentDate = clone $this->startDate;
-
-        $rrule = (string)$this->baseEvent->RRULE;
-
-        $parts = explode(';', $rrule);
-
-        foreach($parts as $part) {
-
-            list($key, $value) = explode('=', $part, 2);
-
-            switch(strtoupper($key)) {
-
-                case 'FREQ' :
-                    if (!in_array(
-                        strtolower($value),
-                        array('secondly','minutely','hourly','daily','weekly','monthly','yearly')
-                    )) {
-                        throw new InvalidArgumentException('Unknown value for FREQ=' . strtoupper($value));
-
-                    }
-                    $this->frequency = strtolower($value);
-                    break;
-
-                case 'UNTIL' :
-                    $this->until = Sabre_VObject_DateTimeParser::parse($value);
-                    break;
-
-                case 'COUNT' :
-                    $this->count = (int)$value;
-                    break;
-
-                case 'INTERVAL' :
-                    $this->interval = (int)$value;
-                    break;
-
-                case 'BYSECOND' :
-                    $this->bySecond = explode(',', $value);
-                    break;
-
-                case 'BYMINUTE' :
-                    $this->byMinute = explode(',', $value);
-                    break;
-
-                case 'BYHOUR' :
-                    $this->byHour = explode(',', $value);
-                    break;
-
-                case 'BYDAY' :
-                    $this->byDay = explode(',', strtoupper($value));
-                    break;
-
-                case 'BYMONTHDAY' :
-                    $this->byMonthDay = explode(',', $value);
-                    break;
-
-                case 'BYYEARDAY' :
-                    $this->byYearDay = explode(',', $value);
-                    break;
-
-                case 'BYWEEKNO' :
-                    $this->byWeekNo = explode(',', $value);
-                    break;
-
-                case 'BYMONTH' :
-                    $this->byMonth = explode(',', $value);
-                    break;
-
-                case 'BYSETPOS' :
-                    $this->bySetPos = explode(',', $value);
-                    break;
-
-                case 'WKST' :
-                    $this->weekStart = strtoupper($value);
-                    break;
-
-            }
-
-        }
-
-        // Parsing exception dates
-        if (isset($this->baseEvent->EXDATE)) {
-            foreach($this->baseEvent->EXDATE as $exDate) {
-
-                foreach(explode(',', (string)$exDate) as $exceptionDate) {
-
-                    $this->exceptionDates[] =
-                        Sabre_VObject_DateTimeParser::parse($exceptionDate, $this->startDate->getTimeZone());
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the current item in the list
-     *
-     * @return DateTime
-     */
-    public function current() {
-
-        if (!$this->valid()) return null;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * This method returns the startdate for the current iteration of the
-     * event.
-     *
-     * @return DateTime
-     */
-    public function getDtStart() {
-
-        if (!$this->valid()) return null;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * This method returns the enddate for the current iteration of the
-     * event.
-     *
-     * @return DateTime
-     */
-    public function getDtEnd() {
-
-        if (!$this->valid()) return null;
-        $dtEnd = clone $this->currentDate;
-        $dtEnd->add( $this->startDate->diff( $this->endDate ) );
-        return clone $dtEnd;
-
-    }
-
-    /**
-     * Returns a VEVENT object with the updated start and end date.
-     *
-     * Any recurrence information is removed, and this function may return an
-     * 'overridden' event instead.
-     *
-     * This method always returns a cloned instance.
-     *
-     * @return void
-     */
-    public function getEventObject() {
-
-        if ($this->currentOverriddenEvent) {
-            return clone $this->currentOverriddenEvent;
-        }
-        $event = clone $this->baseEvent;
-        unset($event->RRULE);
-        unset($event->EXDATE);
-        unset($event->RDATE);
-        unset($event->EXRULE);
-
-        $event->DTSTART->setDateTime($this->getDTStart(), $event->DTSTART->getDateType());
-        if (isset($event->DTEND)) {
-            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTSTART->getDateType());
-        }
-        if ($this->counter > 0) {
-            $event->{'RECURRENCE-ID'} = (string)$event->DTSTART;
-        }
-
-        return $event;
-
-    }
-
-    /**
-     * Returns the current item number
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->counter;
-
-    }
-
-    /**
-     * Whether or not there is a 'next item'
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        if (!is_null($this->count)) {
-            return $this->counter < $this->count;
-        }
-        if (!is_null($this->until)) {
-            return $this->currentDate <= $this->until;
-        }
-        return true;
-
-    }
-
-    /**
-     * Resets the iterator
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     *
-     * Note that this checks the current 'endDate', not the 'stardDate'. This
-     * means that if you forward to January 1st, the iterator will stop at the
-     * first event that ends *after* January 1st.
-     *
-     * @param DateTime $dt
-     * @return void
-     */
-    public function fastForward(DateTime $dt) {
-
-        while($this->valid() && $this->getDTEnd() < $dt) {
-            $this->next();
-        }
-
-    }
-
-    /**
-     * Goes on to the next iteration
-     *
-     * @return void
-     */
-    public function next() {
-
-        /*
-        if (!is_null($this->count) && $this->counter >= $this->count) {
-            $this->currentDate = null;
-        }*/
-
-
-        $previousStamp = $this->currentDate->getTimeStamp();
-
-        while(true) {
-
-            $this->currentOverriddenEvent = null;
-
-            // If we have a next date 'stored', we use that
-            if ($this->nextDate) {
-                $this->currentDate = $this->nextDate;
-                $currentStamp = $this->currentDate->getTimeStamp();
-                $this->nextDate = null;
-            } else {
-
-                // Otherwise, we calculate it
-                switch($this->frequency) {
-
-                    case 'daily' :
-                        $this->nextDaily();
-                        break;
-
-                    case 'weekly' :
-                        $this->nextWeekly();
-                        break;
-
-                    case 'monthly' :
-                        $this->nextMonthly();
-                        break;
-
-                    case 'yearly' :
-                        $this->nextYearly();
-                        break;
-
-                }
-                $currentStamp = $this->currentDate->getTimeStamp();
-
-                // Checking exception dates
-                foreach($this->exceptionDates as $exceptionDate) {
-                    if ($this->currentDate == $exceptionDate) {
-                        $this->counter++;
-                        continue 2;
-                    }
-                }
-                foreach($this->overriddenDates as $overriddenDate) {
-                    if ($this->currentDate == $overriddenDate) {
-                        continue 2;
-                    }
-                }
-
-            }
-
-            // Checking overriden events
-            foreach($this->overriddenEvents as $index=>$event) {
-                if ($index > $previousStamp && $index <= $currentStamp) {
-
-                    // We're moving the 'next date' aside, for later use.
-                    $this->nextDate = clone $this->currentDate;
-
-                    $this->currentDate = $event->DTSTART->getDateTime();
-                    $this->currentOverriddenEvent = $event;
-
-                    break;
-                }
-            }
-
-            break;
-
-        }
-
-        /*
-        if (!is_null($this->until)) {
-            if($this->currentDate > $this->until) {
-                $this->currentDate = null;
-            }
-        }*/
-
-        $this->counter++;
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for daily frequency.
-     *
-     * @return void
-     */
-    protected function nextDaily() {
-
-        if (!$this->byDay) {
-            $this->currentDate->modify('+' . $this->interval . ' days');
-            return;
-        }
-
-        $recurrenceDays = array();
-        foreach($this->byDay as $byDay) {
-
-            // The day may be preceeded with a positive (+n) or
-            // negative (-n) integer. However, this does not make
-            // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
-
-        }
-
-        do {
-
-            $this->currentDate->modify('+' . $this->interval . ' days');
-
-            // Current day of the week
-            $currentDay = $this->currentDate->format('w');
-
-        } while (!in_array($currentDay, $recurrenceDays));
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for weekly frequency.
-     *
-     * @return void
-     */
-    protected function nextWeekly() {
-
-        if (!$this->byDay) {
-            $this->currentDate->modify('+' . $this->interval . ' weeks');
-            return;
-        }
-
-        $recurrenceDays = array();
-        foreach($this->byDay as $byDay) {
-
-            // The day may be preceeded with a positive (+n) or
-            // negative (-n) integer. However, this does not make
-            // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
-
-        }
-
-        // Current day of the week
-        $currentDay = $this->currentDate->format('w');
-
-        // First day of the week:
-        $firstDay = $this->dayMap[$this->weekStart];
-
-        $time = array(
-            $this->currentDate->format('H'),
-            $this->currentDate->format('i'),
-            $this->currentDate->format('s')
-        );
-
-        // Increasing the 'current day' until we find our next
-        // occurrence.
-        while(true) {
-
-            $currentDay++;
-
-            if ($currentDay>6) {
-                $currentDay = 0;
-            }
-
-            // We need to roll over to the next week
-            if ($currentDay === $firstDay) {
-                $this->currentDate->modify('+' . $this->interval . ' weeks');
-
-                // We need to go to the first day of this week, but only if we
-                // are not already on this first day of this week.
-                if($this->currentDate->format('w') != $firstDay) {
-                    $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
-                    $this->currentDate->setTime($time[0],$time[1],$time[2]);
-                }
-            }
-
-            // We have a match
-            if (in_array($currentDay ,$recurrenceDays)) {
-                $this->currentDate->modify($this->dayNames[$currentDay]);
-                $this->currentDate->setTime($time[0],$time[1],$time[2]);
-                break;
-            }
-
-        }
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for monthly frequency.
-     *
-     * @return void
-     */
-    protected function nextMonthly() {
-
-        $currentDayOfMonth = $this->currentDate->format('j');
-        if (!$this->byMonthDay && !$this->byDay) {
-
-            // If the current day is higher than the 28th, rollover can
-            // occur to the next month. We Must skip these invalid
-            // entries.
-            if ($currentDayOfMonth < 29) {
-                $this->currentDate->modify('+' . $this->interval . ' months');
-            } else {
-                $increase = 0;
-                do {
-                    $increase++;
-                    $tempDate = clone $this->currentDate;
-                    $tempDate->modify('+ ' . ($this->interval*$increase) . ' months');
-                } while ($tempDate->format('j') != $currentDayOfMonth);
-                $this->currentDate = $tempDate;
-            }
-            return;
-        }
-
-        while(true) {
-
-            $occurrences = $this->getMonthlyOccurrences();
-
-            foreach($occurrences as $occurrence) {
-
-                // The first occurrence thats higher than the current
-                // day of the month wins.
-                if ($occurrence > $currentDayOfMonth) {
-                    break 2;
-                }
-
-            }
-
-            // If we made it all the way here, it means there were no
-            // valid occurrences, and we need to advance to the next
-            // month.
-            $this->currentDate->modify('first day of this month');
-            $this->currentDate->modify('+ ' . $this->interval . ' months');
-
-            // This goes to 0 because we need to start counting at hte
-            // beginning.
-            $currentDayOfMonth = 0;
-
-        }
-
-        $this->currentDate->setDate($this->currentDate->format('Y'), $this->currentDate->format('n'), $occurrence);
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for yearly frequency.
-     *
-     * @return void
-     */
-    protected function nextYearly() {
-
-        if (!$this->byMonth) {
-            $this->currentDate->modify('+' . $this->interval . ' years');
-            return;
-        }
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        $advancedToNewMonth = false;
-
-        // If we got a byDay or getMonthDay filter, we must first expand
-        // further.
-        if ($this->byDay || $this->byMonthDay) {
-
-            while(true) {
-
-                $occurrences = $this->getMonthlyOccurrences();
-
-                foreach($occurrences as $occurrence) {
-
-                    // The first occurrence that's higher than the current
-                    // day of the month wins.
-                    // If we advanced to the next month or year, the first
-                    // occurence is always correct.
-                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        break 2;
-                    }
-
-                }
-
-                // If we made it here, it means we need to advance to
-                // the next month or year.
-                $currentDayOfMonth = 1;
-                $advancedToNewMonth = true;
-                do {
-
-                    $currentMonth++;
-                    if ($currentMonth>12) {
-                        $currentYear+=$this->interval;
-                        $currentMonth = 1;
-                    }
-                } while (!in_array($currentMonth, $this->byMonth));
-
-                $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
-
-            }
-
-            // If we made it here, it means we got a valid occurrence
-            $this->currentDate->setDate($currentYear, $currentMonth, $occurrence);
-            return;
-
-        } else {
-
-            // no byDay or byMonthDay, so we can just loop through the
-            // months.
-            do {
-
-                $currentMonth++;
-                if ($currentMonth>12) {
-                    $currentYear+=$this->interval;
-                    $currentMonth = 1;
-                }
-            } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
-            return;
-
-        }
-
-    }
-
-    /**
-     * Returns all the occurrences for a monthly frequency with a 'byDay' or
-     * 'byMonthDay' expansion for the current month.
-     *
-     * The returned list is an array of integers with the day of month (1-31).
-     *
-     * @return array
-     */
-    protected function getMonthlyOccurrences() {
-
-        $startDate = clone $this->currentDate;
-
-        $byDayResults = array();
-
-        // Our strategy is to simply go through the byDays, advance the date to
-        // that point and add it to the results.
-        if ($this->byDay) foreach($this->byDay as $day) {
-
-            $dayName = $this->dayNames[$this->dayMap[substr($day,-2)]];
-
-            // Dayname will be something like 'wednesday'. Now we need to find
-            // all wednesdays in this month.
-            $dayHits = array();
-
-            $checkDate = clone $startDate;
-            $checkDate->modify('first day of this month');
-            $checkDate->modify($dayName);
-
-            do {
-                $dayHits[] = $checkDate->format('j');
-                $checkDate->modify('next ' . $dayName);
-            } while ($checkDate->format('n') === $startDate->format('n'));
-
-            // So now we have 'all wednesdays' for month. It is however
-            // possible that the user only really wanted the 1st, 2nd or last
-            // wednesday.
-            if (strlen($day)>2) {
-                $offset = (int)substr($day,0,-2);
-
-                if ($offset>0) {
-                    // It is possible that the day does not exist, such as a
-                    // 5th or 6th wednesday of the month.
-                    if (isset($dayHits[$offset-1])) {
-                        $byDayResults[] = $dayHits[$offset-1];
-                    }
-                } else {
-
-                    // if it was negative we count from the end of the array
-                    $byDayResults[] = $dayHits[count($dayHits) + $offset];
-                }
-            } else {
-                // There was no counter (first, second, last wednesdays), so we
-                // just need to add the all to the list).
-                $byDayResults = array_merge($byDayResults, $dayHits);
-
-            }
-
-        }
-
-        $byMonthDayResults = array();
-        if ($this->byMonthDay) foreach($this->byMonthDay as $monthDay) {
-
-            // Removing values that are out of range for this month
-            if ($monthDay > $startDate->format('t') ||
-                $monthDay < 0-$startDate->format('t')) {
-                    continue;
-            }
-            if ($monthDay>0) {
-                $byMonthDayResults[] = $monthDay;
-            } else {
-                // Negative values
-                $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
-            }
-        }
-
-        // If there was just byDay or just byMonthDay, they just specify our
-        // (almost) final list. If both were provided, then byDay limits the
-        // list.
-        if ($this->byMonthDay && $this->byDay) {
-            $result = array_intersect($byMonthDayResults, $byDayResults);
-        } elseif ($this->byMonthDay) {
-            $result = $byMonthDayResults;
-        } else {
-            $result = $byDayResults;
-        }
-        $result = array_unique($result);
-        sort($result, SORT_NUMERIC);
-
-        // The last thing that needs checking is the BYSETPOS. If it's set, it
-        // means only certain items in the set survive the filter.
-        if (!$this->bySetPos) {
-            return $result;
-        }
-
-        $filteredResult = array();
-        foreach($this->bySetPos as $setPos) {
-
-            if ($setPos<0) {
-                $setPos = count($result)-($setPos+1);
-            }
-            if (isset($result[$setPos-1])) {
-                $filteredResult[] = $result[$setPos-1];
-            }
-        }
-
-        sort($filteredResult, SORT_NUMERIC);
-        return $filteredResult;
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/VObject/Version.php b/3rdparty/Sabre/VObject/Version.php
deleted file mode 100755
index 2617c7b129..0000000000
--- a/3rdparty/Sabre/VObject/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the version number for the VObject package
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.3.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/VObject/WindowsTimezoneMap.php b/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
deleted file mode 100755
index 5e1cc5d479..0000000000
--- a/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * Time zone name translation
- *
- * This file translates well-known time zone names into "Olson database" time zone names.
- *
- * @package Sabre
- * @subpackage VObject 
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Frank Edelhaeuser (fedel@users.sourceforge.net) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_WindowsTimezoneMap {
-
-    protected static $map = array(
-
-        // from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
-        // snapshot taken on 2012/01/16
-
-        // windows
-        'AUS Central Standard Time'=>'Australia/Darwin',
-        'AUS Eastern Standard Time'=>'Australia/Sydney',
-        'Afghanistan Standard Time'=>'Asia/Kabul',
-        'Alaskan Standard Time'=>'America/Anchorage',
-        'Arab Standard Time'=>'Asia/Riyadh',
-        'Arabian Standard Time'=>'Asia/Dubai',
-        'Arabic Standard Time'=>'Asia/Baghdad',
-        'Argentina Standard Time'=>'America/Buenos_Aires',
-        'Armenian Standard Time'=>'Asia/Yerevan',
-        'Atlantic Standard Time'=>'America/Halifax',
-        'Azerbaijan Standard Time'=>'Asia/Baku',
-        'Azores Standard Time'=>'Atlantic/Azores',
-        'Bangladesh Standard Time'=>'Asia/Dhaka',
-        'Canada Central Standard Time'=>'America/Regina',
-        'Cape Verde Standard Time'=>'Atlantic/Cape_Verde',
-        'Caucasus Standard Time'=>'Asia/Yerevan',
-        'Cen. Australia Standard Time'=>'Australia/Adelaide',
-        'Central America Standard Time'=>'America/Guatemala',
-        'Central Asia Standard Time'=>'Asia/Almaty',
-        'Central Brazilian Standard Time'=>'America/Cuiaba',
-        'Central Europe Standard Time'=>'Europe/Budapest',
-        'Central European Standard Time'=>'Europe/Warsaw',
-        'Central Pacific Standard Time'=>'Pacific/Guadalcanal',
-        'Central Standard Time'=>'America/Chicago',
-        'Central Standard Time (Mexico)'=>'America/Mexico_City',
-        'China Standard Time'=>'Asia/Shanghai',
-        'Dateline Standard Time'=>'Etc/GMT+12',
-        'E. Africa Standard Time'=>'Africa/Nairobi',
-        'E. Australia Standard Time'=>'Australia/Brisbane',
-        'E. Europe Standard Time'=>'Europe/Minsk',
-        'E. South America Standard Time'=>'America/Sao_Paulo',
-        'Eastern Standard Time'=>'America/New_York',
-        'Egypt Standard Time'=>'Africa/Cairo',
-        'Ekaterinburg Standard Time'=>'Asia/Yekaterinburg',
-        'FLE Standard Time'=>'Europe/Kiev',
-        'Fiji Standard Time'=>'Pacific/Fiji',
-        'GMT Standard Time'=>'Europe/London',
-        'GTB Standard Time'=>'Europe/Istanbul',
-        'Georgian Standard Time'=>'Asia/Tbilisi',
-        'Greenland Standard Time'=>'America/Godthab',
-        'Greenwich Standard Time'=>'Atlantic/Reykjavik',
-        'Hawaiian Standard Time'=>'Pacific/Honolulu',
-        'India Standard Time'=>'Asia/Calcutta',
-        'Iran Standard Time'=>'Asia/Tehran',
-        'Israel Standard Time'=>'Asia/Jerusalem',
-        'Jordan Standard Time'=>'Asia/Amman',
-        'Kamchatka Standard Time'=>'Asia/Kamchatka',
-        'Korea Standard Time'=>'Asia/Seoul',
-        'Magadan Standard Time'=>'Asia/Magadan',
-        'Mauritius Standard Time'=>'Indian/Mauritius',
-        'Mexico Standard Time'=>'America/Mexico_City',
-        'Mexico Standard Time 2'=>'America/Chihuahua',
-        'Mid-Atlantic Standard Time'=>'Etc/GMT+2',
-        'Middle East Standard Time'=>'Asia/Beirut',
-        'Montevideo Standard Time'=>'America/Montevideo',
-        'Morocco Standard Time'=>'Africa/Casablanca',
-        'Mountain Standard Time'=>'America/Denver',
-        'Mountain Standard Time (Mexico)'=>'America/Chihuahua',
-        'Myanmar Standard Time'=>'Asia/Rangoon',
-        'N. Central Asia Standard Time'=>'Asia/Novosibirsk',
-        'Namibia Standard Time'=>'Africa/Windhoek',
-        'Nepal Standard Time'=>'Asia/Katmandu',
-        'New Zealand Standard Time'=>'Pacific/Auckland',
-        'Newfoundland Standard Time'=>'America/St_Johns',
-        'North Asia East Standard Time'=>'Asia/Irkutsk',
-        'North Asia Standard Time'=>'Asia/Krasnoyarsk',
-        'Pacific SA Standard Time'=>'America/Santiago',
-        'Pacific Standard Time'=>'America/Los_Angeles',
-        'Pacific Standard Time (Mexico)'=>'America/Santa_Isabel',
-        'Pakistan Standard Time'=>'Asia/Karachi',
-        'Paraguay Standard Time'=>'America/Asuncion',
-        'Romance Standard Time'=>'Europe/Paris',
-        'Russian Standard Time'=>'Europe/Moscow',
-        'SA Eastern Standard Time'=>'America/Cayenne',
-        'SA Pacific Standard Time'=>'America/Bogota',
-        'SA Western Standard Time'=>'America/La_Paz',
-        'SE Asia Standard Time'=>'Asia/Bangkok',
-        'Samoa Standard Time'=>'Pacific/Apia',
-        'Singapore Standard Time'=>'Asia/Singapore',
-        'South Africa Standard Time'=>'Africa/Johannesburg',
-        'Sri Lanka Standard Time'=>'Asia/Colombo',
-        'Syria Standard Time'=>'Asia/Damascus',
-        'Taipei Standard Time'=>'Asia/Taipei',
-        'Tasmania Standard Time'=>'Australia/Hobart',
-        'Tokyo Standard Time'=>'Asia/Tokyo',
-        'Tonga Standard Time'=>'Pacific/Tongatapu',
-        'US Eastern Standard Time'=>'America/Indianapolis',
-        'US Mountain Standard Time'=>'America/Phoenix',
-        'UTC'=>'Etc/GMT',
-        'UTC+12'=>'Etc/GMT-12',
-        'UTC-02'=>'Etc/GMT+2',
-        'UTC-11'=>'Etc/GMT+11',
-        'Ulaanbaatar Standard Time'=>'Asia/Ulaanbaatar',
-        'Venezuela Standard Time'=>'America/Caracas',
-        'Vladivostok Standard Time'=>'Asia/Vladivostok',
-        'W. Australia Standard Time'=>'Australia/Perth',
-        'W. Central Africa Standard Time'=>'Africa/Lagos',
-        'W. Europe Standard Time'=>'Europe/Berlin',
-        'West Asia Standard Time'=>'Asia/Tashkent',
-        'West Pacific Standard Time'=>'Pacific/Port_Moresby',
-        'Yakutsk Standard Time'=>'Asia/Yakutsk',
-    );
-
-    static public function lookup($tzid) {
-        return isset(self::$map[$tzid]) ? self::$map[$tzid] : null;
-    }
-}
diff --git a/3rdparty/Sabre/VObject/includes.php b/3rdparty/Sabre/VObject/includes.php
deleted file mode 100755
index 0177a8f1ba..0000000000
--- a/3rdparty/Sabre/VObject/includes.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Sabre_VObject includes file
- *
- * Including this file will automatically include all files from the VObject
- * package.
- *
- * This often allows faster loadtimes, as autoload-speed is often quite slow.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/DateTimeParser.php';
-include __DIR__ . '/ElementList.php';
-include __DIR__ . '/FreeBusyGenerator.php';
-include __DIR__ . '/Node.php';
-include __DIR__ . '/Parameter.php';
-include __DIR__ . '/ParseException.php';
-include __DIR__ . '/Reader.php';
-include __DIR__ . '/RecurrenceIterator.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/WindowsTimezoneMap.php';
-include __DIR__ . '/Element.php';
-include __DIR__ . '/Property.php';
-include __DIR__ . '/Component.php';
-include __DIR__ . '/Property/DateTime.php';
-include __DIR__ . '/Property/MultiDateTime.php';
-include __DIR__ . '/Component/VAlarm.php';
-include __DIR__ . '/Component/VCalendar.php';
-include __DIR__ . '/Component/VEvent.php';
-include __DIR__ . '/Component/VJournal.php';
-include __DIR__ . '/Component/VTodo.php';
-include __DIR__ . '/Element/DateTime.php';
-include __DIR__ . '/Element/MultiDateTime.php';
-// End includes
diff --git a/3rdparty/Sabre/autoload.php b/3rdparty/Sabre/autoload.php
deleted file mode 100755
index c7b537d83d..0000000000
--- a/3rdparty/Sabre/autoload.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * SabreDAV's PHP autoloader
- *
- * If you love the autoloader, and don't care as much about performance, this
- * file register a new autoload function using spl_autoload_register.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-/**
- * @param string $className
- * @return void
- */
-function Sabre_autoload($className) {
-
-    if(strpos($className,'Sabre_')===0) {
-
-        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
-
-    }
-
-}
-
-spl_autoload_register('Sabre_autoload');
-

From 6e922035e1cb7b6f99f32c60dcc5eca8c3d52e7c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 9 Aug 2012 17:32:45 +0200
Subject: [PATCH 1355/1537] add SabreDav 1.6.4

---
 3rdparty/Sabre.includes.php                   |   26 +
 3rdparty/Sabre/CalDAV/Backend/Abstract.php    |  168 ++
 3rdparty/Sabre/CalDAV/Backend/PDO.php         |  396 ++++
 3rdparty/Sabre/CalDAV/Calendar.php            |  343 +++
 3rdparty/Sabre/CalDAV/CalendarObject.php      |  273 +++
 3rdparty/Sabre/CalDAV/CalendarQueryParser.php |  296 +++
 .../Sabre/CalDAV/CalendarQueryValidator.php   |  370 +++
 3rdparty/Sabre/CalDAV/CalendarRootNode.php    |   75 +
 3rdparty/Sabre/CalDAV/ICSExportPlugin.php     |  139 ++
 3rdparty/Sabre/CalDAV/ICalendar.php           |   18 +
 3rdparty/Sabre/CalDAV/ICalendarObject.php     |   20 +
 3rdparty/Sabre/CalDAV/Plugin.php              |  931 ++++++++
 .../Sabre/CalDAV/Principal/Collection.php     |   31 +
 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php |  178 ++
 .../Sabre/CalDAV/Principal/ProxyWrite.php     |  178 ++
 3rdparty/Sabre/CalDAV/Principal/User.php      |  132 ++
 .../SupportedCalendarComponentSet.php         |   85 +
 .../CalDAV/Property/SupportedCalendarData.php |   38 +
 .../CalDAV/Property/SupportedCollationSet.php |   44 +
 3rdparty/Sabre/CalDAV/Schedule/IMip.php       |  104 +
 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php    |   16 +
 3rdparty/Sabre/CalDAV/Schedule/Outbox.php     |  152 ++
 3rdparty/Sabre/CalDAV/Server.php              |   68 +
 3rdparty/Sabre/CalDAV/UserCalendars.php       |  298 +++
 3rdparty/Sabre/CalDAV/Version.php             |   24 +
 3rdparty/Sabre/CalDAV/includes.php            |   43 +
 3rdparty/Sabre/CardDAV/AddressBook.php        |  312 +++
 .../Sabre/CardDAV/AddressBookQueryParser.php  |  219 ++
 3rdparty/Sabre/CardDAV/AddressBookRoot.php    |   78 +
 3rdparty/Sabre/CardDAV/Backend/Abstract.php   |  166 ++
 3rdparty/Sabre/CardDAV/Backend/PDO.php        |  330 +++
 3rdparty/Sabre/CardDAV/Card.php               |  250 ++
 3rdparty/Sabre/CardDAV/IAddressBook.php       |   18 +
 3rdparty/Sabre/CardDAV/ICard.php              |   18 +
 3rdparty/Sabre/CardDAV/IDirectory.php         |   21 +
 3rdparty/Sabre/CardDAV/Plugin.php             |  666 ++++++
 .../CardDAV/Property/SupportedAddressData.php |   69 +
 3rdparty/Sabre/CardDAV/UserAddressBooks.php   |  257 +++
 3rdparty/Sabre/CardDAV/Version.php            |   26 +
 3rdparty/Sabre/CardDAV/includes.php           |   32 +
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   83 +
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   98 +
 3rdparty/Sabre/DAV/Auth/Backend/Apache.php    |   62 +
 3rdparty/Sabre/DAV/Auth/Backend/File.php      |   75 +
 3rdparty/Sabre/DAV/Auth/Backend/PDO.php       |   65 +
 3rdparty/Sabre/DAV/Auth/IBackend.php          |   36 +
 3rdparty/Sabre/DAV/Auth/Plugin.php            |  111 +
 .../Sabre/DAV/Browser/GuessContentType.php    |   97 +
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   55 +
 3rdparty/Sabre/DAV/Browser/Plugin.php         |  489 ++++
 3rdparty/Sabre/DAV/Browser/assets/favicon.ico |  Bin 0 -> 4286 bytes
 .../DAV/Browser/assets/icons/addressbook.png  |  Bin 0 -> 7232 bytes
 .../DAV/Browser/assets/icons/calendar.png     |  Bin 0 -> 4388 bytes
 .../Sabre/DAV/Browser/assets/icons/card.png   |  Bin 0 -> 5695 bytes
 .../DAV/Browser/assets/icons/collection.png   |  Bin 0 -> 3474 bytes
 .../Sabre/DAV/Browser/assets/icons/file.png   |  Bin 0 -> 2837 bytes
 .../Sabre/DAV/Browser/assets/icons/parent.png |  Bin 0 -> 3474 bytes
 .../DAV/Browser/assets/icons/principal.png    |  Bin 0 -> 5480 bytes
 3rdparty/Sabre/DAV/Client.php                 |  492 ++++
 3rdparty/Sabre/DAV/Collection.php             |  106 +
 3rdparty/Sabre/DAV/Directory.php              |   17 +
 3rdparty/Sabre/DAV/Exception.php              |   64 +
 3rdparty/Sabre/DAV/Exception/BadRequest.php   |   28 +
 3rdparty/Sabre/DAV/Exception/Conflict.php     |   28 +
 .../Sabre/DAV/Exception/ConflictingLock.php   |   35 +
 3rdparty/Sabre/DAV/Exception/FileNotFound.php |   19 +
 3rdparty/Sabre/DAV/Exception/Forbidden.php    |   27 +
 .../DAV/Exception/InsufficientStorage.php     |   27 +
 .../DAV/Exception/InvalidResourceType.php     |   33 +
 .../Exception/LockTokenMatchesRequestUri.php  |   39 +
 3rdparty/Sabre/DAV/Exception/Locked.php       |   67 +
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   45 +
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   28 +
 3rdparty/Sabre/DAV/Exception/NotFound.php     |   28 +
 .../Sabre/DAV/Exception/NotImplemented.php    |   27 +
 .../Sabre/DAV/Exception/PaymentRequired.php   |   28 +
 .../DAV/Exception/PreconditionFailed.php      |   69 +
 .../DAV/Exception/ReportNotImplemented.php    |   30 +
 .../RequestedRangeNotSatisfiable.php          |   29 +
 .../DAV/Exception/UnsupportedMediaType.php    |   28 +
 3rdparty/Sabre/DAV/FS/Directory.php           |  136 ++
 3rdparty/Sabre/DAV/FS/File.php                |   89 +
 3rdparty/Sabre/DAV/FS/Node.php                |   80 +
 3rdparty/Sabre/DAV/FSExt/Directory.php        |  154 ++
 3rdparty/Sabre/DAV/FSExt/File.php             |   93 +
 3rdparty/Sabre/DAV/FSExt/Node.php             |  212 ++
 3rdparty/Sabre/DAV/File.php                   |   85 +
 3rdparty/Sabre/DAV/ICollection.php            |   74 +
 3rdparty/Sabre/DAV/IExtendedCollection.php    |   28 +
 3rdparty/Sabre/DAV/IFile.php                  |   77 +
 3rdparty/Sabre/DAV/INode.php                  |   46 +
 3rdparty/Sabre/DAV/IProperties.php            |   67 +
 3rdparty/Sabre/DAV/IQuota.php                 |   27 +
 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php |   50 +
 3rdparty/Sabre/DAV/Locks/Backend/FS.php       |  191 ++
 3rdparty/Sabre/DAV/Locks/Backend/File.php     |  181 ++
 3rdparty/Sabre/DAV/Locks/Backend/PDO.php      |  165 ++
 3rdparty/Sabre/DAV/Locks/LockInfo.php         |   81 +
 3rdparty/Sabre/DAV/Locks/Plugin.php           |  636 ++++++
 3rdparty/Sabre/DAV/Mount/Plugin.php           |   80 +
 3rdparty/Sabre/DAV/Node.php                   |   55 +
 3rdparty/Sabre/DAV/ObjectTree.php             |  153 ++
 3rdparty/Sabre/DAV/Property.php               |   25 +
 .../Sabre/DAV/Property/GetLastModified.php    |   75 +
 3rdparty/Sabre/DAV/Property/Href.php          |   91 +
 3rdparty/Sabre/DAV/Property/HrefList.php      |   96 +
 3rdparty/Sabre/DAV/Property/IHref.php         |   25 +
 3rdparty/Sabre/DAV/Property/LockDiscovery.php |  102 +
 3rdparty/Sabre/DAV/Property/ResourceType.php  |  125 +
 3rdparty/Sabre/DAV/Property/Response.php      |  155 ++
 3rdparty/Sabre/DAV/Property/ResponseList.php  |   57 +
 3rdparty/Sabre/DAV/Property/SupportedLock.php |   76 +
 .../Sabre/DAV/Property/SupportedReportSet.php |  109 +
 3rdparty/Sabre/DAV/Server.php                 | 2006 +++++++++++++++++
 3rdparty/Sabre/DAV/ServerPlugin.php           |   90 +
 3rdparty/Sabre/DAV/SimpleCollection.php       |  105 +
 3rdparty/Sabre/DAV/SimpleDirectory.php        |   21 +
 3rdparty/Sabre/DAV/SimpleFile.php             |  121 +
 3rdparty/Sabre/DAV/StringUtil.php             |   91 +
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |  289 +++
 3rdparty/Sabre/DAV/Tree.php                   |  193 ++
 3rdparty/Sabre/DAV/Tree/Filesystem.php        |  123 +
 3rdparty/Sabre/DAV/URLUtil.php                |  121 +
 3rdparty/Sabre/DAV/UUIDUtil.php               |   64 +
 3rdparty/Sabre/DAV/Version.php                |   24 +
 3rdparty/Sabre/DAV/XMLUtil.php                |  186 ++
 3rdparty/Sabre/DAV/includes.php               |   97 +
 .../DAVACL/AbstractPrincipalCollection.php    |  154 ++
 .../Sabre/DAVACL/Exception/AceConflict.php    |   32 +
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   81 +
 .../Sabre/DAVACL/Exception/NoAbstract.php     |   32 +
 .../Exception/NotRecognizedPrincipal.php      |   32 +
 .../Exception/NotSupportedPrivilege.php       |   32 +
 3rdparty/Sabre/DAVACL/IACL.php                |   73 +
 3rdparty/Sabre/DAVACL/IPrincipal.php          |   75 +
 3rdparty/Sabre/DAVACL/IPrincipalBackend.php   |  153 ++
 3rdparty/Sabre/DAVACL/Plugin.php              | 1348 +++++++++++
 3rdparty/Sabre/DAVACL/Principal.php           |  279 +++
 .../Sabre/DAVACL/PrincipalBackend/PDO.php     |  427 ++++
 3rdparty/Sabre/DAVACL/PrincipalCollection.php |   35 +
 3rdparty/Sabre/DAVACL/Property/Acl.php        |  209 ++
 .../Sabre/DAVACL/Property/AclRestrictions.php |   32 +
 .../Property/CurrentUserPrivilegeSet.php      |   75 +
 3rdparty/Sabre/DAVACL/Property/Principal.php  |  160 ++
 .../DAVACL/Property/SupportedPrivilegeSet.php |   92 +
 3rdparty/Sabre/DAVACL/Version.php             |   24 +
 3rdparty/Sabre/DAVACL/includes.php            |   38 +
 3rdparty/Sabre/HTTP/AWSAuth.php               |  227 ++
 3rdparty/Sabre/HTTP/AbstractAuth.php          |  111 +
 3rdparty/Sabre/HTTP/BasicAuth.php             |   67 +
 3rdparty/Sabre/HTTP/DigestAuth.php            |  240 ++
 3rdparty/Sabre/HTTP/Request.php               |  268 +++
 3rdparty/Sabre/HTTP/Response.php              |  157 ++
 3rdparty/Sabre/HTTP/Util.php                  |   82 +
 3rdparty/Sabre/HTTP/Version.php               |   24 +
 3rdparty/Sabre/HTTP/includes.php              |   27 +
 3rdparty/Sabre/VObject/Component.php          |  365 +++
 3rdparty/Sabre/VObject/Component/VAlarm.php   |  102 +
 .../Sabre/VObject/Component/VCalendar.php     |  133 ++
 3rdparty/Sabre/VObject/Component/VEvent.php   |   71 +
 3rdparty/Sabre/VObject/Component/VJournal.php |   46 +
 3rdparty/Sabre/VObject/Component/VTodo.php    |   68 +
 3rdparty/Sabre/VObject/DateTimeParser.php     |  181 ++
 3rdparty/Sabre/VObject/Element.php            |   16 +
 3rdparty/Sabre/VObject/Element/DateTime.php   |   37 +
 .../Sabre/VObject/Element/MultiDateTime.php   |   17 +
 3rdparty/Sabre/VObject/ElementList.php        |  172 ++
 3rdparty/Sabre/VObject/FreeBusyGenerator.php  |  297 +++
 3rdparty/Sabre/VObject/Node.php               |  149 ++
 3rdparty/Sabre/VObject/Parameter.php          |   84 +
 3rdparty/Sabre/VObject/ParseException.php     |   12 +
 3rdparty/Sabre/VObject/Property.php           |  348 +++
 3rdparty/Sabre/VObject/Property/DateTime.php  |  260 +++
 .../Sabre/VObject/Property/MultiDateTime.php  |  166 ++
 3rdparty/Sabre/VObject/Reader.php             |  183 ++
 3rdparty/Sabre/VObject/RecurrenceIterator.php | 1043 +++++++++
 3rdparty/Sabre/VObject/Version.php            |   24 +
 3rdparty/Sabre/VObject/WindowsTimezoneMap.php |  128 ++
 3rdparty/Sabre/VObject/includes.php           |   41 +
 3rdparty/Sabre/autoload.php                   |   31 +
 180 files changed, 25160 insertions(+)
 create mode 100755 3rdparty/Sabre.includes.php
 create mode 100755 3rdparty/Sabre/CalDAV/Backend/Abstract.php
 create mode 100755 3rdparty/Sabre/CalDAV/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/CalDAV/Calendar.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarObject.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarQueryParser.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
 create mode 100755 3rdparty/Sabre/CalDAV/CalendarRootNode.php
 create mode 100755 3rdparty/Sabre/CalDAV/ICSExportPlugin.php
 create mode 100755 3rdparty/Sabre/CalDAV/ICalendar.php
 create mode 100755 3rdparty/Sabre/CalDAV/ICalendarObject.php
 create mode 100755 3rdparty/Sabre/CalDAV/Plugin.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/Collection.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
 create mode 100755 3rdparty/Sabre/CalDAV/Principal/User.php
 create mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 create mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
 create mode 100755 3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
 create mode 100755 3rdparty/Sabre/CalDAV/Schedule/IMip.php
 create mode 100755 3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
 create mode 100755 3rdparty/Sabre/CalDAV/Schedule/Outbox.php
 create mode 100755 3rdparty/Sabre/CalDAV/Server.php
 create mode 100755 3rdparty/Sabre/CalDAV/UserCalendars.php
 create mode 100755 3rdparty/Sabre/CalDAV/Version.php
 create mode 100755 3rdparty/Sabre/CalDAV/includes.php
 create mode 100755 3rdparty/Sabre/CardDAV/AddressBook.php
 create mode 100755 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
 create mode 100755 3rdparty/Sabre/CardDAV/AddressBookRoot.php
 create mode 100755 3rdparty/Sabre/CardDAV/Backend/Abstract.php
 create mode 100755 3rdparty/Sabre/CardDAV/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/CardDAV/Card.php
 create mode 100755 3rdparty/Sabre/CardDAV/IAddressBook.php
 create mode 100755 3rdparty/Sabre/CardDAV/ICard.php
 create mode 100755 3rdparty/Sabre/CardDAV/IDirectory.php
 create mode 100755 3rdparty/Sabre/CardDAV/Plugin.php
 create mode 100755 3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
 create mode 100755 3rdparty/Sabre/CardDAV/UserAddressBooks.php
 create mode 100755 3rdparty/Sabre/CardDAV/Version.php
 create mode 100755 3rdparty/Sabre/CardDAV/includes.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/Apache.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/File.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/IBackend.php
 create mode 100755 3rdparty/Sabre/DAV/Auth/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/GuessContentType.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/favicon.ico
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/card.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/file.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
 create mode 100755 3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
 create mode 100755 3rdparty/Sabre/DAV/Client.php
 create mode 100755 3rdparty/Sabre/DAV/Collection.php
 create mode 100755 3rdparty/Sabre/DAV/Directory.php
 create mode 100755 3rdparty/Sabre/DAV/Exception.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/BadRequest.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/Conflict.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/ConflictingLock.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/FileNotFound.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/Forbidden.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/Locked.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/NotFound.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/NotImplemented.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/PaymentRequired.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 create mode 100755 3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
 create mode 100755 3rdparty/Sabre/DAV/FS/Directory.php
 create mode 100755 3rdparty/Sabre/DAV/FS/File.php
 create mode 100755 3rdparty/Sabre/DAV/FS/Node.php
 create mode 100755 3rdparty/Sabre/DAV/FSExt/Directory.php
 create mode 100755 3rdparty/Sabre/DAV/FSExt/File.php
 create mode 100755 3rdparty/Sabre/DAV/FSExt/Node.php
 create mode 100755 3rdparty/Sabre/DAV/File.php
 create mode 100755 3rdparty/Sabre/DAV/ICollection.php
 create mode 100755 3rdparty/Sabre/DAV/IExtendedCollection.php
 create mode 100755 3rdparty/Sabre/DAV/IFile.php
 create mode 100755 3rdparty/Sabre/DAV/INode.php
 create mode 100755 3rdparty/Sabre/DAV/IProperties.php
 create mode 100755 3rdparty/Sabre/DAV/IQuota.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/FS.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/File.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Backend/PDO.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/LockInfo.php
 create mode 100755 3rdparty/Sabre/DAV/Locks/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Mount/Plugin.php
 create mode 100755 3rdparty/Sabre/DAV/Node.php
 create mode 100755 3rdparty/Sabre/DAV/ObjectTree.php
 create mode 100755 3rdparty/Sabre/DAV/Property.php
 create mode 100755 3rdparty/Sabre/DAV/Property/GetLastModified.php
 create mode 100755 3rdparty/Sabre/DAV/Property/Href.php
 create mode 100755 3rdparty/Sabre/DAV/Property/HrefList.php
 create mode 100755 3rdparty/Sabre/DAV/Property/IHref.php
 create mode 100755 3rdparty/Sabre/DAV/Property/LockDiscovery.php
 create mode 100755 3rdparty/Sabre/DAV/Property/ResourceType.php
 create mode 100755 3rdparty/Sabre/DAV/Property/Response.php
 create mode 100755 3rdparty/Sabre/DAV/Property/ResponseList.php
 create mode 100755 3rdparty/Sabre/DAV/Property/SupportedLock.php
 create mode 100755 3rdparty/Sabre/DAV/Property/SupportedReportSet.php
 create mode 100755 3rdparty/Sabre/DAV/Server.php
 create mode 100755 3rdparty/Sabre/DAV/ServerPlugin.php
 create mode 100755 3rdparty/Sabre/DAV/SimpleCollection.php
 create mode 100755 3rdparty/Sabre/DAV/SimpleDirectory.php
 create mode 100755 3rdparty/Sabre/DAV/SimpleFile.php
 create mode 100755 3rdparty/Sabre/DAV/StringUtil.php
 create mode 100755 3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
 create mode 100755 3rdparty/Sabre/DAV/Tree.php
 create mode 100755 3rdparty/Sabre/DAV/Tree/Filesystem.php
 create mode 100755 3rdparty/Sabre/DAV/URLUtil.php
 create mode 100755 3rdparty/Sabre/DAV/UUIDUtil.php
 create mode 100755 3rdparty/Sabre/DAV/Version.php
 create mode 100755 3rdparty/Sabre/DAV/XMLUtil.php
 create mode 100755 3rdparty/Sabre/DAV/includes.php
 create mode 100755 3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/AceConflict.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 create mode 100755 3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 create mode 100755 3rdparty/Sabre/DAVACL/IACL.php
 create mode 100755 3rdparty/Sabre/DAVACL/IPrincipal.php
 create mode 100755 3rdparty/Sabre/DAVACL/IPrincipalBackend.php
 create mode 100755 3rdparty/Sabre/DAVACL/Plugin.php
 create mode 100755 3rdparty/Sabre/DAVACL/Principal.php
 create mode 100755 3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
 create mode 100755 3rdparty/Sabre/DAVACL/PrincipalCollection.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/Acl.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/Principal.php
 create mode 100755 3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 create mode 100755 3rdparty/Sabre/DAVACL/Version.php
 create mode 100755 3rdparty/Sabre/DAVACL/includes.php
 create mode 100755 3rdparty/Sabre/HTTP/AWSAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/AbstractAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/BasicAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/DigestAuth.php
 create mode 100755 3rdparty/Sabre/HTTP/Request.php
 create mode 100755 3rdparty/Sabre/HTTP/Response.php
 create mode 100755 3rdparty/Sabre/HTTP/Util.php
 create mode 100755 3rdparty/Sabre/HTTP/Version.php
 create mode 100755 3rdparty/Sabre/HTTP/includes.php
 create mode 100755 3rdparty/Sabre/VObject/Component.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VAlarm.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VCalendar.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VEvent.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VJournal.php
 create mode 100755 3rdparty/Sabre/VObject/Component/VTodo.php
 create mode 100755 3rdparty/Sabre/VObject/DateTimeParser.php
 create mode 100755 3rdparty/Sabre/VObject/Element.php
 create mode 100755 3rdparty/Sabre/VObject/Element/DateTime.php
 create mode 100755 3rdparty/Sabre/VObject/Element/MultiDateTime.php
 create mode 100755 3rdparty/Sabre/VObject/ElementList.php
 create mode 100755 3rdparty/Sabre/VObject/FreeBusyGenerator.php
 create mode 100755 3rdparty/Sabre/VObject/Node.php
 create mode 100755 3rdparty/Sabre/VObject/Parameter.php
 create mode 100755 3rdparty/Sabre/VObject/ParseException.php
 create mode 100755 3rdparty/Sabre/VObject/Property.php
 create mode 100755 3rdparty/Sabre/VObject/Property/DateTime.php
 create mode 100755 3rdparty/Sabre/VObject/Property/MultiDateTime.php
 create mode 100755 3rdparty/Sabre/VObject/Reader.php
 create mode 100755 3rdparty/Sabre/VObject/RecurrenceIterator.php
 create mode 100755 3rdparty/Sabre/VObject/Version.php
 create mode 100755 3rdparty/Sabre/VObject/WindowsTimezoneMap.php
 create mode 100755 3rdparty/Sabre/VObject/includes.php
 create mode 100755 3rdparty/Sabre/autoload.php

diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
new file mode 100755
index 0000000000..c133437366
--- /dev/null
+++ b/3rdparty/Sabre.includes.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Library include file
+ *
+ * This file is deprecated, don't use it!
+ * Instead, use the specific includes files that are in the sub-packages.
+ *
+ *   Sabre/DAV/includes.php
+ *   Sabre/HTTP/includes.php
+ *
+ *   etc..
+ *
+ * This file contains all includes to the rest of the SabreDAV library
+ * Make sure the lib/ directory is in PHP's include_path.
+ *
+ * @package Sabre
+ * @deprecated Don't use this file, it will be remove in a future version
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+include 'Sabre/HTTP/includes.php';
+include 'Sabre/DAV/includes.php';
+
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
new file mode 100755
index 0000000000..7aba1d69ff
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * Abstract Calendaring backend. Extend this class to create your own backends.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    abstract function getCalendarsForUser($principalUri);
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return void
+     */
+    abstract function createCalendar($principalUri,$calendarUri,array $properties);
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The mutations array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $mutations
+     * @return bool|array
+     */
+    public function updateCalendar($calendarId, array $mutations) {
+
+        return false;
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param string $calendarId
+     * @return void
+     */
+    abstract function deleteCalendar($calendarId);
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '  "abcdef"')
+     *   * calendarid - The calendarid as it was passed to this function.
+     *   * size - The size of the calendar objects, in bytes.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param string $calendarId
+     * @return array
+     */
+    abstract function getCalendarObjects($calendarId);
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return array
+     */
+    abstract function getCalendarObject($calendarId,$objectUri);
+
+    /**
+     * Creates a new calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return void
+     */
+    abstract function deleteCalendarObject($calendarId,$objectUri);
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
new file mode 100755
index 0000000000..ddacf940c7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Backend/PDO.php
@@ -0,0 +1,396 @@
+<?php
+
+/**
+ * PDO CalDAV backend
+ *
+ * This backend is used to store calendar-data in a PDO database, such as
+ * sqlite or MySQL
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * pdo
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * The table name that will be used for calendars
+     *
+     * @var string
+     */
+    protected $calendarTableName;
+
+    /**
+     * The table name that will be used for calendar objects
+     *
+     * @var string
+     */
+    protected $calendarObjectTableName;
+
+    /**
+     * List of CalDAV properties, and how they map to database fieldnames
+     *
+     * Add your own properties by simply adding on to this array
+     *
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}displayname'                          => 'displayname',
+        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
+    );
+
+    /**
+     * Creates the backend
+     *
+     * @param PDO $pdo
+     * @param string $calendarTableName
+     * @param string $calendarObjectTableName
+     */
+    public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
+
+        $this->pdo = $pdo;
+        $this->calendarTableName = $calendarTableName;
+        $this->calendarObjectTableName = $calendarObjectTableName;
+
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getCalendarsForUser($principalUri) {
+
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'ctag';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+
+        // Making fields a comma-delimited list
+        $fields = implode(', ', $fields);
+        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM ".$this->calendarTableName." WHERE principaluri = ? ORDER BY calendarorder ASC");
+        $stmt->execute(array($principalUri));
+
+        $calendars = array();
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+            $components = array();
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+
+            $calendar = array(
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
+                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
+            );
+
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $calendars[] = $calendar;
+
+        }
+
+        return $calendars;
+
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return string
+     */
+    public function createCalendar($principalUri, $calendarUri, array $properties) {
+
+        $fieldNames = array(
+            'principaluri',
+            'uri',
+            'ctag',
+        );
+        $values = array(
+            ':principaluri' => $principalUri,
+            ':uri'          => $calendarUri,
+            ':ctag'         => 1,
+        );
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        $fieldNames[] = 'components';
+        if (!isset($properties[$sccs])) {
+            $values[':components'] = 'VEVENT,VTODO';
+        } else {
+            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
+                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
+            }
+            $values[':components'] = implode(',',$properties[$sccs]->getValue());
+        }
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            if (isset($properties[$xmlName])) {
+
+                $values[':' . $dbName] = $properties[$xmlName];
+                $fieldNames[] = $dbName;
+            }
+        }
+
+        $stmt = $this->pdo->prepare("INSERT INTO ".$this->calendarTableName." (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
+        $stmt->execute($values);
+
+        return $this->pdo->lastInsertId();
+
+    }
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The mutations array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $mutations
+     * @return bool|array
+     */
+    public function updateCalendar($calendarId, array $mutations) {
+
+        $newValues = array();
+        $result = array(
+            200 => array(), // Ok
+            403 => array(), // Forbidden
+            424 => array(), // Failed Dependency
+        );
+
+        $hasError = false;
+
+        foreach($mutations as $propertyName=>$propertyValue) {
+
+            // We don't know about this property.
+            if (!isset($this->propertyMap[$propertyName])) {
+                $hasError = true;
+                $result[403][$propertyName] = null;
+                unset($mutations[$propertyName]);
+                continue;
+            }
+
+            $fieldName = $this->propertyMap[$propertyName];
+            $newValues[$fieldName] = $propertyValue;
+
+        }
+
+        // If there were any errors we need to fail the request
+        if ($hasError) {
+            // Properties has the remaining properties
+            foreach($mutations as $propertyName=>$propertyValue) {
+                $result[424][$propertyName] = null;
+            }
+
+            // Removing unused statuscodes for cleanliness
+            foreach($result as $status=>$properties) {
+                if (is_array($properties) && count($properties)===0) unset($result[$status]);
+            }
+
+            return $result;
+
+        }
+
+        // Success
+
+        // Now we're generating the sql query.
+        $valuesSql = array();
+        foreach($newValues as $fieldName=>$value) {
+            $valuesSql[] = $fieldName . ' = ?';
+        }
+        $valuesSql[] = 'ctag = ctag + 1';
+
+        $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ',$valuesSql) . " WHERE id = ?");
+        $newValues['id'] = $calendarId;
+        $stmt->execute(array_values($newValues));
+
+        return true;
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param string $calendarId
+     * @return void
+     */
+    public function deleteCalendar($calendarId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarTableName.' WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '  "abcdef"')
+     *   * calendarid - The calendarid as it was passed to this function.
+     *   * size - The size of the calendar objects, in bytes.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param string $calendarId
+     * @return array
+     */
+    public function getCalendarObjects($calendarId) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+        return $stmt->fetchAll();
+
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return array
+     */
+    public function getCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId, $objectUri));
+        return $stmt->fetch();
+
+    }
+
+    /**
+     * Creates a new calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO '.$this->calendarObjectTableName.' (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
+        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
+        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return void
+     */
+    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarObjectTableName.' SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return void
+     */
+    public function deleteCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE '. $this->calendarTableName .' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
new file mode 100755
index 0000000000..623df2dd1b
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Calendar.php
@@ -0,0 +1,343 @@
+<?php
+
+/**
+ * This object represents a CalDAV calendar.
+ *
+ * A calendar can contain multiple TODO and or Events. These are represented
+ * as Sabre_CalDAV_CalendarObject objects.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * This is an array with calendar information
+     *
+     * @var array
+     */
+    protected $calendarInfo;
+
+    /**
+     * CalDAV backend
+     *
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param array $calendarInfo
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
+
+        $this->caldavBackend = $caldavBackend;
+        $this->principalBackend = $principalBackend;
+        $this->calendarInfo = $calendarInfo;
+
+
+    }
+
+    /**
+     * Returns the name of the calendar
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->calendarInfo['uri'];
+
+    }
+
+    /**
+     * Updates properties such as the display name and description
+     *
+     * @param array $mutations
+     * @return array
+     */
+    public function updateProperties($mutations) {
+
+        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
+
+    }
+
+    /**
+     * Returns the list of properties
+     *
+     * @param array $requestedProperties
+     * @return array
+     */
+    public function getProperties($requestedProperties) {
+
+        $response = array();
+
+        foreach($requestedProperties as $prop) switch($prop) {
+
+            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
+                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData();
+                break;
+            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
+                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet();
+                break;
+            case '{DAV:}owner' :
+                $response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
+                break;
+            default :
+                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
+                break;
+
+        }
+        return $response;
+
+    }
+
+    /**
+     * Returns a calendar object
+     *
+     * The contained calendar objects are for example Events or Todo's.
+     *
+     * @param string $name
+     * @return Sabre_DAV_ICalendarObject
+     */
+    public function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
+        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of calendar objects
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Checks if a child-node exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj)
+            return false;
+        else
+            return true;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in calendars.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid ICalendar string.
+     *
+     * @param string $name
+     * @param resource $calendarData
+     * @return string|null
+     */
+    public function createFile($name,$calendarData = null) {
+
+        if (is_resource($calendarData)) {
+            $calendarData = stream_get_contents($calendarData);
+        }
+        return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
+
+    }
+
+    /**
+     * Deletes the calendar.
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
+
+    }
+
+    /**
+     * Renames the calendar. Note that most calendars use the
+     * {DAV:}displayname to display a name to display a name.
+     *
+     * @param string $newName
+     * @return void
+     */
+    public function setName($newName) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     *
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->calendarInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
+
+        // We need to inject 'read-free-busy' in the tree, aggregated under
+        // {DAV:}read.
+        foreach($default['aggregates'] as &$agg) {
+
+            if ($agg['privilege'] !== '{DAV:}read') continue;
+
+            $agg['aggregates'][] = array(
+                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+            );
+
+        }
+        return $default;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
new file mode 100755
index 0000000000..72f0a578d1
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarObject.php
@@ -0,0 +1,273 @@
+<?php
+
+/**
+ * The CalendarObject represents a single VEVENT or VTODO within a Calendar.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
+
+    /**
+     * Sabre_CalDAV_Backend_Abstract
+     *
+     * @var array
+     */
+    protected $caldavBackend;
+
+    /**
+     * Array with information about this CalendarObject
+     *
+     * @var array
+     */
+    protected $objectData;
+
+    /**
+     * Array with information about the containing calendar
+     *
+     * @var array
+     */
+    protected $calendarInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param array $calendarInfo
+     * @param array $objectData
+     */
+    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,array $calendarInfo,array $objectData) {
+
+        $this->caldavBackend = $caldavBackend;
+
+        if (!isset($objectData['calendarid'])) {
+            throw new InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
+        }
+        if (!isset($objectData['uri'])) {
+            throw new InvalidArgumentException('The objectData argument must contain an \'uri\' property');
+        }
+
+        $this->calendarInfo = $calendarInfo;
+        $this->objectData = $objectData;
+
+    }
+
+    /**
+     * Returns the uri for this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->objectData['uri'];
+
+    }
+
+    /**
+     * Returns the ICalendar-formatted object
+     *
+     * @return string
+     */
+    public function get() {
+
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
+        }
+        return $this->objectData['calendardata'];
+
+    }
+
+    /**
+     * Updates the ICalendar-formatted object
+     *
+     * @param string $calendarData
+     * @return void
+     */
+    public function put($calendarData) {
+
+        if (is_resource($calendarData)) {
+            $calendarData = stream_get_contents($calendarData);
+        }
+        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
+        $this->objectData['calendardata'] = $calendarData;
+        $this->objectData['etag'] = $etag;
+
+        return $etag;
+
+    }
+
+    /**
+     * Deletes the calendar object
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type
+     *
+     * @return string
+     */
+    public function getContentType() {
+
+        return 'text/calendar';
+
+    }
+
+    /**
+     * Returns an ETag for this object.
+     *
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * @return string
+     */
+    public function getETag() {
+
+        if (isset($this->objectData['etag'])) {
+            return $this->objectData['etag'];
+        } else {
+            return '"' . md5($this->get()). '"';
+        }
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     *
+     * @return time
+     */
+    public function getLastModified() {
+
+        return $this->objectData['lastmodified'];
+
+    }
+
+    /**
+     * Returns the size of this object in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        if (array_key_exists('size',$this->objectData)) {
+            return $this->objectData['size'];
+        } else {
+            return strlen($this->get());
+        }
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->calendarInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
new file mode 100755
index 0000000000..bd0d343382
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
@@ -0,0 +1,296 @@
+<?php
+
+/**
+ * Parses the calendar-query report request body.
+ *
+ * Whoever designed this format, and the CalDAV equivalent even more so,
+ * has no feel for design.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarQueryParser {
+
+    /**
+     * List of requested properties the client wanted
+     *
+     * @var array
+     */
+    public $requestedProperties;
+
+    /**
+     * List of property/component filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * This property will contain null if CALDAV:expand was not specified, 
+     * otherwise it will contain an array with 2 elements (start, end). Each 
+     * contain a DateTime object.
+     *
+     * If expand is specified, recurring calendar objects are to be expanded 
+     * into their individual components, and only the components that fall 
+     * within the specified time-range are to be returned.
+     *
+     * For more details, see rfc4791, section 9.6.5.
+     * 
+     * @var null|array 
+     */
+    public $expand;
+
+    /**
+     * DOM Document
+     *
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * DOM XPath object
+     *
+     * @var DOMXPath
+     */
+    protected $xpath;
+
+    /**
+     * Creates the parser
+     *
+     * @param DOMDocument $dom
+     */
+    public function __construct(DOMDocument $dom) {
+
+        $this->dom = $dom;
+
+        $this->xpath = new DOMXPath($dom);
+        $this->xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
+        $this->xpath->registerNameSpace('dav','urn:DAV');
+
+    }
+
+    /**
+     * Parses the request.
+     *
+     * @return void
+     */
+    public function parse() {
+
+        $filterNode = null;
+
+        $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
+        if ($filter->length !== 1) {
+            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
+        }
+
+        $compFilters = $this->parseCompFilters($filter->item(0));
+        if (count($compFilters)!==1) {
+            throw new Sabre_DAV_Exception_BadRequest('There must be exactly 1 top-level comp-filter.');
+        }
+
+        $this->filters = $compFilters[0];
+        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
+
+        $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
+        if ($expand->length>0) {
+            $this->expand = $this->parseExpand($expand->item(0));
+        }
+             
+
+    }
+
+    /**
+     * Parses all the 'comp-filter' elements from a node
+     *
+     * @param DOMElement $parentNode
+     * @return array
+     */
+    protected function parseCompFilters(DOMElement $parentNode) {
+
+        $compFilterNodes = $this->xpath->query('cal:comp-filter', $parentNode);
+        $result = array();
+
+        for($ii=0; $ii < $compFilterNodes->length; $ii++) {
+
+            $compFilterNode = $compFilterNodes->item($ii);
+
+            $compFilter = array();
+            $compFilter['name'] = $compFilterNode->getAttribute('name');
+            $compFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $compFilterNode)->length>0;
+            $compFilter['comp-filters'] = $this->parseCompFilters($compFilterNode);
+            $compFilter['prop-filters'] = $this->parsePropFilters($compFilterNode);
+            $compFilter['time-range'] = $this->parseTimeRange($compFilterNode);
+
+            if ($compFilter['time-range'] && !in_array($compFilter['name'],array(
+                'VEVENT',
+                'VTODO',
+                'VJOURNAL',
+                'VFREEBUSY',
+                'VALARM',
+            ))) {
+                throw new Sabre_DAV_Exception_BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
+            };
+
+            $result[] = $compFilter;
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Parses all the prop-filter elements from a node
+     *
+     * @param DOMElement $parentNode
+     * @return array
+     */
+    protected function parsePropFilters(DOMElement $parentNode) {
+
+        $propFilterNodes = $this->xpath->query('cal:prop-filter', $parentNode);
+        $result = array();
+
+        for ($ii=0; $ii < $propFilterNodes->length; $ii++) {
+
+            $propFilterNode = $propFilterNodes->item($ii);
+            $propFilter = array();
+            $propFilter['name'] = $propFilterNode->getAttribute('name');
+            $propFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $propFilterNode)->length>0;
+            $propFilter['param-filters'] = $this->parseParamFilters($propFilterNode);
+            $propFilter['text-match'] = $this->parseTextMatch($propFilterNode);
+            $propFilter['time-range'] = $this->parseTimeRange($propFilterNode);
+
+            $result[] = $propFilter;
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Parses the param-filter element
+     *
+     * @param DOMElement $parentNode
+     * @return array
+     */
+    protected function parseParamFilters(DOMElement $parentNode) {
+
+        $paramFilterNodes = $this->xpath->query('cal:param-filter', $parentNode);
+        $result = array();
+
+        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
+
+            $paramFilterNode = $paramFilterNodes->item($ii);
+            $paramFilter = array();
+            $paramFilter['name'] = $paramFilterNode->getAttribute('name');
+            $paramFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $paramFilterNode)->length>0;
+            $paramFilter['text-match'] = $this->parseTextMatch($paramFilterNode);
+
+            $result[] = $paramFilter;
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Parses the text-match element
+     *
+     * @param DOMElement $parentNode
+     * @return array|null
+     */
+    protected function parseTextMatch(DOMElement $parentNode) {
+
+        $textMatchNodes = $this->xpath->query('cal:text-match', $parentNode);
+
+        if ($textMatchNodes->length === 0)
+            return null;
+
+        $textMatchNode = $textMatchNodes->item(0);
+        $negateCondition = $textMatchNode->getAttribute('negate-condition');
+        $negateCondition = $negateCondition==='yes';
+        $collation = $textMatchNode->getAttribute('collation');
+        if (!$collation) $collation = 'i;ascii-casemap';
+
+        return array(
+            'negate-condition' => $negateCondition,
+            'collation' => $collation,
+            'value' => $textMatchNode->nodeValue
+        );
+
+    }
+
+    /**
+     * Parses the time-range element
+     *
+     * @param DOMElement $parentNode
+     * @return array|null
+     */
+    protected function parseTimeRange(DOMElement $parentNode) {
+
+        $timeRangeNodes = $this->xpath->query('cal:time-range', $parentNode);
+        if ($timeRangeNodes->length === 0) {
+            return null;
+        }
+
+        $timeRangeNode = $timeRangeNodes->item(0);
+
+        if ($start = $timeRangeNode->getAttribute('start')) {
+            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+        } else {
+            $start = null;
+        }
+        if ($end = $timeRangeNode->getAttribute('end')) {
+            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+        } else {
+            $end = null;
+        }
+
+        if (!is_null($start) && !is_null($end) && $end <= $start) {
+            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
+        }
+
+        return array(
+            'start' => $start,
+            'end' => $end,
+        );
+
+    }
+
+    /**
+     * Parses the CALDAV:expand element
+     * 
+     * @param DOMElement $parentNode 
+     * @return void
+     */
+    protected function parseExpand(DOMElement $parentNode) {
+
+        $start = $parentNode->getAttribute('start');
+        if(!$start) {
+            throw new Sabre_DAV_Exception_BadRequest('The "start" attribute is required for the CALDAV:expand element');
+        } 
+        $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+
+        $end = $parentNode->getAttribute('end');
+        if(!$end) {
+            throw new Sabre_DAV_Exception_BadRequest('The "end" attribute is required for the CALDAV:expand element');
+        } 
+        $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+        
+        if ($end <= $start) {
+            throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
+        }
+
+        return array(
+            'start' => $start,
+            'end' => $end,
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
new file mode 100755
index 0000000000..8f674840e8
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
@@ -0,0 +1,370 @@
+<?php
+
+/**
+ * CalendarQuery Validator
+ *
+ * This class is responsible for checking if an iCalendar object matches a set
+ * of filters. The main function to do this is 'validate'.
+ *
+ * This is used to determine which icalendar objects should be returned for a
+ * calendar-query REPORT request.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarQueryValidator {
+
+    /**
+     * Verify if a list of filters applies to the calendar data object
+     *
+     * The list of filters must be formatted as parsed by Sabre_CalDAV_CalendarQueryParser
+     *
+     * @param Sabre_VObject_Component $vObject
+     * @param array $filters
+     * @return bool
+     */
+    public function validate(Sabre_VObject_Component $vObject,array $filters) {
+
+        // The top level object is always a component filter.
+        // We'll parse it manually, as it's pretty simple.
+        if ($vObject->name !== $filters['name']) {
+            return false;
+        }
+
+        return
+            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
+            $this->validatePropFilters($vObject, $filters['prop-filters']);
+
+
+    }
+
+    /**
+     * This method checks the validity of comp-filters.
+     *
+     * A list of comp-filters needs to be specified. Also the parent of the
+     * component we're checking should be specified, not the component to check
+     * itself.
+     *
+     * @param Sabre_VObject_Component $parent
+     * @param array $filters
+     * @return bool
+     */
+    protected function validateCompFilters(Sabre_VObject_Component $parent, array $filters) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($parent->$filter['name']);
+
+            if ($filter['is-not-defined']) {
+
+                if ($isDefined) {
+                    return false;
+                } else {
+                    continue;
+                }
+
+            }
+            if (!$isDefined) {
+                return false;
+            }
+
+            if ($filter['time-range']) {
+                foreach($parent->$filter['name'] as $subComponent) {
+                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+                        continue 2;
+                    }
+                }
+                return false;
+            }
+
+            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
+                continue;
+            }
+
+            // If there are sub-filters, we need to find at least one component
+            // for which the subfilters hold true.
+            foreach($parent->$filter['name'] as $subComponent) {
+
+                if (
+                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
+                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
+                        // We had a match, so this comp-filter succeeds
+                        continue 2;
+                }
+
+            }
+
+            // If we got here it means there were sub-comp-filters or
+            // sub-prop-filters and there was no match. This means this filter
+            // needs to return false.
+            return false;
+
+        }
+
+        // If we got here it means we got through all comp-filters alive so the
+        // filters were all true.
+        return true;
+
+    }
+
+    /**
+     * This method checks the validity of prop-filters.
+     *
+     * A list of prop-filters needs to be specified. Also the parent of the
+     * property we're checking should be specified, not the property to check
+     * itself.
+     *
+     * @param Sabre_VObject_Component $parent
+     * @param array $filters
+     * @return bool
+     */
+    protected function validatePropFilters(Sabre_VObject_Component $parent, array $filters) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($parent->$filter['name']);
+
+            if ($filter['is-not-defined']) {
+
+                if ($isDefined) {
+                    return false;
+                } else {
+                    continue;
+                }
+
+            }
+            if (!$isDefined) {
+                return false;
+            }
+
+            if ($filter['time-range']) {
+                foreach($parent->$filter['name'] as $subComponent) {
+                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+                        continue 2;
+                    }
+                }
+                return false;
+            }
+
+            if (!$filter['param-filters'] && !$filter['text-match']) {
+                continue;
+            }
+
+            // If there are sub-filters, we need to find at least one property
+            // for which the subfilters hold true.
+            foreach($parent->$filter['name'] as $subComponent) {
+
+                if(
+                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
+                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
+                ) {
+                    // We had a match, so this prop-filter succeeds
+                    continue 2;
+                }
+
+            }
+
+            // If we got here it means there were sub-param-filters or
+            // text-match filters and there was no match. This means the
+            // filter needs to return false.
+            return false;
+
+        }
+
+        // If we got here it means we got through all prop-filters alive so the
+        // filters were all true.
+        return true;
+
+    }
+
+    /**
+     * This method checks the validity of param-filters.
+     *
+     * A list of param-filters needs to be specified. Also the parent of the
+     * parameter we're checking should be specified, not the parameter to check
+     * itself.
+     *
+     * @param Sabre_VObject_Property $parent
+     * @param array $filters
+     * @return bool
+     */
+    protected function validateParamFilters(Sabre_VObject_Property $parent, array $filters) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($parent[$filter['name']]);
+
+            if ($filter['is-not-defined']) {
+
+                if ($isDefined) {
+                    return false;
+                } else {
+                    continue;
+                }
+
+            }
+            if (!$isDefined) {
+                return false;
+            }
+
+            if (!$filter['text-match']) {
+                continue;
+            }
+
+            // If there are sub-filters, we need to find at least one parameter
+            // for which the subfilters hold true.
+            foreach($parent[$filter['name']] as $subParam) {
+
+                if($this->validateTextMatch($subParam,$filter['text-match'])) {
+                    // We had a match, so this param-filter succeeds
+                    continue 2;
+                }
+
+            }
+
+            // If we got here it means there was a text-match filter and there
+            // were no matches. This means the filter needs to return false.
+            return false;
+
+        }
+
+        // If we got here it means we got through all param-filters alive so the
+        // filters were all true.
+        return true;
+
+    }
+
+    /**
+     * This method checks the validity of a text-match.
+     *
+     * A single text-match should be specified as well as the specific property
+     * or parameter we need to validate.
+     *
+     * @param Sabre_VObject_Node $parent
+     * @param array $textMatch
+     * @return bool
+     */
+    protected function validateTextMatch(Sabre_VObject_Node $parent, array $textMatch) {
+
+        $value = (string)$parent;
+
+        $isMatching = Sabre_DAV_StringUtil::textMatch($value, $textMatch['value'], $textMatch['collation']);
+
+        return ($textMatch['negate-condition'] xor $isMatching);
+
+    }
+
+    /**
+     * Validates if a component matches the given time range.
+     *
+     * This is all based on the rules specified in rfc4791, which are quite
+     * complex.
+     *
+     * @param Sabre_VObject_Node $component
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return bool
+     */
+    protected function validateTimeRange(Sabre_VObject_Node $component, $start, $end) {
+
+        if (is_null($start)) {
+            $start = new DateTime('1900-01-01');
+        }
+        if (is_null($end)) {
+            $end = new DateTime('3000-01-01');
+        }
+
+        switch($component->name) {
+
+            case 'VEVENT' :
+            case 'VTODO' :
+            case 'VJOURNAL' :
+
+                return $component->isInTimeRange($start, $end);
+
+            case 'VALARM' :
+
+                // If the valarm is wrapped in a recurring event, we need to
+                // expand the recursions, and validate each.
+                //
+                // Our datamodel doesn't easily allow us to do this straight
+                // in the VALARM component code, so this is a hack, and an
+                // expensive one too.
+                if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
+
+                    // Fire up the iterator!
+                    $it = new Sabre_VObject_RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
+                    while($it->valid()) {
+                        $expandedEvent = $it->getEventObject();
+
+                        // We need to check from these expanded alarms, which
+                        // one is the first to trigger. Based on this, we can
+                        // determine if we can 'give up' expanding events.
+                        $firstAlarm = null;
+                        if ($expandedEvent->VALARM !== null) {
+                            foreach($expandedEvent->VALARM as $expandedAlarm) {
+
+                                $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+                                if ($expandedAlarm->isInTimeRange($start, $end)) {
+                                    return true;
+                                }
+
+                                if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
+                                    // This is an alarm with a non-relative trigger
+                                    // time, likely created by a buggy client. The
+                                    // implication is that every alarm in this
+                                    // recurring event trigger at the exact same
+                                    // time. It doesn't make sense to traverse
+                                    // further.
+                                } else {
+                                    // We store the first alarm as a means to
+                                    // figure out when we can stop traversing.
+                                    if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
+                                        $firstAlarm = $effectiveTrigger;
+                                    }
+                                }
+                            }
+                        }
+                        if (is_null($firstAlarm)) {
+                            // No alarm was found.
+                            //
+                            // Or technically: No alarm that will change for
+                            // every instance of the recurrence was found,
+                            // which means we can assume there was no match.
+                            return false;
+                        }
+                        if ($firstAlarm > $end) {
+                            return false;
+                        }
+                        $it->next();
+                    }
+                    return false;
+                } else {
+                    return $component->isInTimeRange($start, $end);
+                }
+
+            case 'VFREEBUSY' :
+                throw new Sabre_DAV_Exception_NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
+
+            case 'COMPLETED' :
+            case 'CREATED' :
+            case 'DTEND' :
+            case 'DTSTAMP' :
+            case 'DTSTART' :
+            case 'DUE' :
+            case 'LAST-MODIFIED' :
+                return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
+
+
+
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
new file mode 100755
index 0000000000..3907913cc7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Users collection
+ *
+ * This object is responsible for generating a collection of users.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * CalDAV backend
+     *
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Constructor
+     *
+     * This constructor needs both an authentication and a caldav backend.
+     *
+     * By default this class will show a list of calendar collections for
+     * principals in the 'principals' collection. If your main principals are
+     * actually located in a different path, use the $principalPrefix argument
+     * to override this.
+     *
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend, $principalPrefix = 'principals') {
+
+        parent::__construct($principalBackend, $principalPrefix);
+        $this->caldavBackend = $caldavBackend;
+
+    }
+
+    /**
+     * Returns the nodename
+     *
+     * We're overriding this, because the default will be the 'principalPrefix',
+     * and we want it to be Sabre_CalDAV_Plugin::CALENDAR_ROOT
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return Sabre_DAV_INode
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
new file mode 100755
index 0000000000..ec42b406b2
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * ICS Exporter
+ *
+ * This plugin adds the ability to export entire calendars as .ics files.
+ * This is useful for clients that don't support CalDAV yet. They often do
+ * support ics files.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?export
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='export') return;
+
+        // splitting uri
+        list($uri) = explode('?',$uri,2);
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_CalDAV_Calendar)) return;
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
+        $this->server->httpResponse->sendStatus(200);
+
+        $nodes = $this->server->getPropertiesForPath($uri, array(
+            '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data',
+        ),1);
+
+        $this->server->httpResponse->sendBody($this->generateICS($nodes));
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Merges all calendar objects, and builds one big ics export
+     *
+     * @param array $nodes
+     * @return string
+     */
+    public function generateICS(array $nodes) {
+
+        $calendar = new Sabre_VObject_Component('vcalendar');
+        $calendar->version = '2.0';
+        if (Sabre_DAV_Server::$exposeVersion) {
+            $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
+        } else {
+            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
+        }
+        $calendar->calscale = 'GREGORIAN';
+
+        $collectedTimezones = array();
+
+        $timezones = array();
+        $objects = array();
+
+        foreach($nodes as $node) {
+
+            if (!isset($node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'])) {
+                continue;
+            }
+            $nodeData = $node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'];
+
+            $nodeComp = Sabre_VObject_Reader::read($nodeData);
+
+            foreach($nodeComp->children() as $child) {
+
+                switch($child->name) {
+                    case 'VEVENT' :
+                    case 'VTODO' :
+                    case 'VJOURNAL' :
+                        $objects[] = $child;
+                        break;
+
+                    // VTIMEZONE is special, because we need to filter out the duplicates
+                    case 'VTIMEZONE' :
+                        // Naively just checking tzid.
+                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
+
+                        $timezones[] = $child;
+                        $collectedTimezones[] = $child->TZID;
+                        break;
+
+                }
+
+            }
+
+        }
+
+        foreach($timezones as $tz) $calendar->add($tz);
+        foreach($objects as $obj) $calendar->add($obj);
+
+        return $calendar->serialize();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
new file mode 100755
index 0000000000..15d51ebcf7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendar.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Calendar interface
+ *
+ * Implement this interface to allow a node to be recognized as an calendar.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
+
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
new file mode 100755
index 0000000000..280f982a31
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendarObject.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * CalendarObject interface
+/**
+ * Extend the ICalendarObject interface to allow your custom nodes to be picked up as
+ * CalendarObjects.
+ *
+ * Calendar objects are resources such as Events, Todo's or Journals.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile {
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
new file mode 100755
index 0000000000..c56ab38484
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Plugin.php
@@ -0,0 +1,931 @@
+<?php
+
+/**
+ * CalDAV plugin
+ *
+ * This plugin provides functionality added by CalDAV (RFC 4791)
+ * It implements new reports, and the MKCALENDAR method.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the official CalDAV namespace
+     */
+    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+
+    /**
+     * This is the namespace for the proprietary calendarserver extensions
+     */
+    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * The following constants are used to differentiate
+     * the various filters for the calendar-query report
+     */
+    const FILTER_COMPFILTER   = 1;
+    const FILTER_TIMERANGE    = 3;
+    const FILTER_PROPFILTER   = 4;
+    const FILTER_PARAMFILTER  = 5;
+    const FILTER_TEXTMATCH    = 6;
+
+    /**
+     * The hardcoded root for calendar objects. It is unfortunate
+     * that we're stuck with it, but it will have to do for now
+     */
+    const CALENDAR_ROOT = 'calendars';
+
+    /**
+     * Reference to server object
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * The email handler for invites and other scheduling messages.
+     *
+     * @var Sabre_CalDAV_Schedule_IMip
+     */
+    protected $imipHandler;
+
+    /**
+     * Sets the iMIP handler.
+     *
+     * iMIP = The email transport of iCalendar scheduling messages. Setting
+     * this is optional, but if you want the server to allow invites to be sent
+     * out, you must set a handler.
+     *
+     * Specifically iCal will plain assume that the server supports this. If
+     * the server doesn't, iCal will display errors when inviting people to
+     * events.
+     *
+     * @param Sabre_CalDAV_Schedule_IMip $imipHandler
+     * @return void
+     */
+    public function setIMipHandler(Sabre_CalDAV_Schedule_IMip $imipHandler) {
+
+        $this->imipHandler = $imipHandler;
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getHTTPMethods($uri) {
+
+        // The MKCALENDAR is only available on unmapped uri's, whose
+        // parents extend IExtendedCollection
+        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        $node = $this->server->tree->getNodeForPath($parent);
+
+        if ($node instanceof Sabre_DAV_IExtendedCollection) {
+            try {
+                $node->getChild($name);
+            } catch (Sabre_DAV_Exception_NotFound $e) {
+                return array('MKCALENDAR');
+            }
+        }
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the DAV: HTTP header.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('calendar-access', 'calendar-proxy');
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'caldav';
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        $reports = array();
+        if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
+            $reports[] = '{' . self::NS_CALDAV . '}calendar-multiget';
+            $reports[] = '{' . self::NS_CALDAV . '}calendar-query';
+        }
+        if ($node instanceof Sabre_CalDAV_ICalendar) {
+            $reports[] = '{' . self::NS_CALDAV . '}free-busy-query';
+        }
+        return $reports;
+
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
+        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
+        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
+        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
+
+        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
+        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
+
+        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
+
+        $server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+        $server->resourceTypeMapping['Sabre_CalDAV_Schedule_IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
+        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+
+        array_push($server->protectedProperties,
+
+            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
+            '{' . self::NS_CALDAV . '}supported-calendar-data',
+            '{' . self::NS_CALDAV . '}max-resource-size',
+            '{' . self::NS_CALDAV . '}min-date-time',
+            '{' . self::NS_CALDAV . '}max-date-time',
+            '{' . self::NS_CALDAV . '}max-instances',
+            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
+            '{' . self::NS_CALDAV . '}calendar-home-set',
+            '{' . self::NS_CALDAV . '}supported-collation-set',
+            '{' . self::NS_CALDAV . '}calendar-data',
+
+            // scheduling extension
+            '{' . self::NS_CALDAV . '}schedule-inbox-URL',
+            '{' . self::NS_CALDAV . '}schedule-outbox-URL',
+            '{' . self::NS_CALDAV . '}calendar-user-address-set',
+            '{' . self::NS_CALDAV . '}calendar-user-type',
+
+            // CalendarServer extensions
+            '{' . self::NS_CALENDARSERVER . '}getctag',
+            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
+            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for'
+
+        );
+    }
+
+    /**
+     * This function handles support for the MKCALENDAR method
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function unknownMethod($method, $uri) {
+
+        switch ($method) {
+            case 'MKCALENDAR' :
+                $this->httpMkCalendar($uri);
+                // false is returned to stop the propagation of the
+                // unknownMethod event.
+                return false;
+            case 'POST' :
+                // Checking if we're talking to an outbox
+                try {
+                    $node = $this->server->tree->getNodeForPath($uri);
+                } catch (Sabre_DAV_Exception_NotFound $e) {
+                    return;
+                }
+                if (!$node instanceof Sabre_CalDAV_Schedule_IOutbox)
+                    return;
+
+                $this->outboxRequest($node);
+                return false;
+
+        }
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV
+     *
+     * @param string $reportName
+     * @param DOMNode $dom
+     * @return bool
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) {
+            case '{'.self::NS_CALDAV.'}calendar-multiget' :
+                $this->calendarMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CALDAV.'}calendar-query' :
+                $this->calendarQueryReport($dom);
+                return false;
+            case '{'.self::NS_CALDAV.'}free-busy-query' :
+                $this->freeBusyQueryReport($dom);
+                return false;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the MKCALENDAR HTTP method, which creates
+     * a new calendar.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function httpMkCalendar($uri) {
+
+        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
+        // for clients matching iCal in the user agent
+        //$ua = $this->server->httpRequest->getHeader('User-Agent');
+        //if (strpos($ua,'iCal/')!==false) {
+        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
+        //}
+
+        $body = $this->server->httpRequest->getBody(true);
+        $properties = array();
+
+        if ($body) {
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+            foreach($dom->firstChild->childNodes as $child) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
+                foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
+                    $properties[$k] = $prop;
+                }
+
+            }
+        }
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+
+        $this->server->createCollection($uri,$resourceType,$properties);
+
+        $this->server->httpResponse->sendStatus(201);
+        $this->server->httpResponse->setHeader('Content-Length',0);
+    }
+
+    /**
+     * beforeGetProperties
+     *
+     * This method handler is invoked before any after properties for a
+     * resource are fetched. This allows us to add in any CalDAV specific
+     * properties.
+     *
+     * @param string $path
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @return void
+     */
+    public function beforeGetProperties($path, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
+
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            // calendar-home-set property
+            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
+            if (in_array($calHome,$requestedProperties)) {
+                $principalId = $node->getName();
+                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
+                unset($requestedProperties[$calHome]);
+                $returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
+            }
+
+            // schedule-outbox-URL property
+            $scheduleProp = '{' . self::NS_CALDAV . '}schedule-outbox-URL';
+            if (in_array($scheduleProp,$requestedProperties)) {
+                $principalId = $node->getName();
+                $outboxPath = self::CALENDAR_ROOT . '/' . $principalId . '/outbox';
+                unset($requestedProperties[$scheduleProp]);
+                $returnedProperties[200][$scheduleProp] = new Sabre_DAV_Property_Href($outboxPath);
+            }
+
+            // calendar-user-address-set property
+            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
+            if (in_array($calProp,$requestedProperties)) {
+
+                $addresses = $node->getAlternateUriSet();
+                $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl();
+                unset($requestedProperties[$calProp]);
+                $returnedProperties[200][$calProp] = new Sabre_DAV_Property_HrefList($addresses, false);
+
+            }
+
+            // These two properties are shortcuts for ical to easily find
+            // other principals this principal has access to.
+            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
+            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
+            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
+
+                $membership = $node->getGroupMembership();
+                $readList = array();
+                $writeList = array();
+
+                foreach($membership as $group) {
+
+                    $groupNode = $this->server->tree->getNodeForPath($group);
+
+                    // If the node is either ap proxy-read or proxy-write
+                    // group, we grab the parent principal and add it to the
+                    // list.
+                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
+                        list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
+                    }
+                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyWrite) {
+                        list($writeList[]) = Sabre_DAV_URLUtil::splitPath($group);
+                    }
+
+                }
+                if (in_array($propRead,$requestedProperties)) {
+                    unset($requestedProperties[$propRead]);
+                    $returnedProperties[200][$propRead] = new Sabre_DAV_Property_HrefList($readList);
+                }
+                if (in_array($propWrite,$requestedProperties)) {
+                    unset($requestedProperties[$propWrite]);
+                    $returnedProperties[200][$propWrite] = new Sabre_DAV_Property_HrefList($writeList);
+                }
+
+            }
+
+        } // instanceof IPrincipal
+
+
+        if ($node instanceof Sabre_CalDAV_ICalendarObject) {
+            // The calendar-data property is not supposed to be a 'real'
+            // property, but in large chunks of the spec it does act as such.
+            // Therefore we simply expose it as a property.
+            $calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
+            if (in_array($calDataProp, $requestedProperties)) {
+                unset($requestedProperties[$calDataProp]);
+                $val = $node->get();
+                if (is_resource($val))
+                    $val = stream_get_contents($val);
+
+                // Taking out \r to not screw up the xml output
+                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
+
+            }
+        }
+
+    }
+
+    /**
+     * This function handles the calendar-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function calendarMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+
+        $xpath = new DOMXPath($dom);
+        $xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
+        $xpath->registerNameSpace('dav','urn:DAV');
+
+        $expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
+        if ($expand->length>0) {
+            $expandElem = $expand->item(0);
+            $start = $expandElem->getAttribute('start');
+            $end = $expandElem->getAttribute('end');
+            if(!$start || !$end) {
+                throw new Sabre_DAV_Exception_BadRequest('The "start" and "end" attributes are required for the CALDAV:expand element');
+            }
+            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+
+            if ($end <= $start) {
+                throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
+            }
+
+            $expand = true;
+
+        } else {
+
+            $expand = false;
+
+        }
+
+        foreach($hrefElems as $elem) {
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
+
+            if ($expand && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
+                $vObject = Sabre_VObject_Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
+                $vObject->expand($start, $end);
+                $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
+            }
+
+            $propertyList[]=$objProps;
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function calendarQueryReport($dom) {
+
+        $parser = new Sabre_CalDAV_CalendarQueryParser($dom);
+        $parser->parse();
+
+        $requestedCalendarData = true;
+        $requestedProperties = $parser->requestedProperties;
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+
+            // We always retrieve calendar-data, as we need it for filtering.
+            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
+
+            // If calendar-data wasn't explicitly requested, we need to remove
+            // it after processing.
+            $requestedCalendarData = false;
+        }
+
+        // These are the list of nodes that potentially match the requirement
+        $candidateNodes = $this->server->getPropertiesForPath(
+            $this->server->getRequestUri(),
+            $requestedProperties,
+            $this->server->getHTTPDepth(0)
+        );
+
+        $verifiedNodes = array();
+
+        $validator = new Sabre_CalDAV_CalendarQueryValidator();
+
+        foreach($candidateNodes as $node) {
+
+            // If the node didn't have a calendar-data property, it must not be a calendar object
+            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']))
+                continue;
+
+            $vObject = Sabre_VObject_Reader::read($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+            if ($validator->validate($vObject,$parser->filters)) {
+
+                if (!$requestedCalendarData) {
+                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+                }
+                if ($parser->expand) {
+                    $vObject->expand($parser->expand['start'], $parser->expand['end']);
+                    $node[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
+                }
+                $verifiedNodes[] = $node;
+            }
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
+
+    }
+
+    /**
+     * This method is responsible for parsing the request and generating the
+     * response for the CALDAV:free-busy-query REPORT.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    protected function freeBusyQueryReport(DOMNode $dom) {
+
+        $start = null;
+        $end = null;
+
+        foreach($dom->firstChild->childNodes as $childNode) {
+
+            $clark = Sabre_DAV_XMLUtil::toClarkNotation($childNode);
+            if ($clark == '{' . self::NS_CALDAV . '}time-range') {
+                $start = $childNode->getAttribute('start');
+                $end = $childNode->getAttribute('end');
+                break;
+            }
+
+        }
+        if ($start) {
+            $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+        }
+        if ($end) {
+            $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+        }
+
+        if (!$start && !$end) {
+            throw new Sabre_DAV_Exception_BadRequest('The freebusy report must have a time-range filter');
+        }
+        $acl = $this->server->getPlugin('acl');
+
+        if (!$acl) {
+            throw new Sabre_DAV_Exception('The ACL plugin must be loaded for free-busy queries to work');
+        }
+        $uri = $this->server->getRequestUri();
+        $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy');
+
+        $calendar = $this->server->tree->getNodeForPath($uri);
+        if (!$calendar instanceof Sabre_CalDAV_ICalendar) {
+            throw new Sabre_DAV_Exception_NotImplemented('The free-busy-query REPORT is only implemented on calendars');
+        }
+
+        $objects = array_map(function($child) {
+            $obj = $child->get();
+            if (is_resource($obj)) {
+                $obj = stream_get_contents($obj);
+            }
+            return $obj;
+        }, $calendar->getChildren());
+
+        $generator = new Sabre_VObject_FreeBusyGenerator();
+        $generator->setObjects($objects);
+        $generator->setTimeRange($start, $end);
+        $result = $generator->getResult();
+        $result = $result->serialize();
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
+        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
+        $this->server->httpResponse->sendBody($result);
+
+    }
+
+    /**
+     * This method is triggered before a file gets updated with new content.
+     *
+     * This plugin uses this method to ensure that CalDAV objects receive
+     * valid calendar data.
+     *
+     * @param string $path
+     * @param Sabre_DAV_IFile $node
+     * @param resource $data
+     * @return void
+     */
+    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
+
+        if (!$node instanceof Sabre_CalDAV_ICalendarObject)
+            return;
+
+        $this->validateICalendar($data);
+
+    }
+
+    /**
+     * This method is triggered before a new file is created.
+     *
+     * This plugin uses this method to ensure that newly created calendar
+     * objects contain valid calendar data.
+     *
+     * @param string $path
+     * @param resource $data
+     * @param Sabre_DAV_ICollection $parentNode
+     * @return void
+     */
+    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
+
+        if (!$parentNode instanceof Sabre_CalDAV_Calendar)
+            return;
+
+        $this->validateICalendar($data);
+
+    }
+
+    /**
+     * Checks if the submitted iCalendar data is in fact, valid.
+     *
+     * An exception is thrown if it's not.
+     *
+     * @param resource|string $data
+     * @return void
+     */
+    protected function validateICalendar(&$data) {
+
+        // If it's a stream, we convert it to a string first.
+        if (is_resource($data)) {
+            $data = stream_get_contents($data);
+        }
+
+        // Converting the data to unicode, if needed.
+        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
+
+        try {
+
+            $vobj = Sabre_VObject_Reader::read($data);
+
+        } catch (Sabre_VObject_ParseException $e) {
+
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: ' . $e->getMessage());
+
+        }
+
+        if ($vobj->name !== 'VCALENDAR') {
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support iCalendar objects.');
+        }
+
+        $foundType = null;
+        $foundUID = null;
+        foreach($vobj->getComponents() as $component) {
+            switch($component->name) {
+                case 'VTIMEZONE' :
+                    continue 2;
+                case 'VEVENT' :
+                case 'VTODO' :
+                case 'VJOURNAL' :
+                    if (is_null($foundType)) {
+                        $foundType = $component->name;
+                        if (!isset($component->UID)) {
+                            throw new Sabre_DAV_Exception_BadRequest('Every ' . $component->name . ' component must have an UID');
+                        }
+                        $foundUID = (string)$component->UID;
+                    } else {
+                        if ($foundType !== $component->name) {
+                            throw new Sabre_DAV_Exception_BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
+                        }
+                        if ($foundUID !== (string)$component->UID) {
+                            throw new Sabre_DAV_Exception_BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
+                        }
+                    }
+                    break;
+                default :
+                    throw new Sabre_DAV_Exception_BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
+
+            }
+        }
+        if (!$foundType)
+            throw new Sabre_DAV_Exception_BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+
+    }
+
+    /**
+     * This method handles POST requests to the schedule-outbox
+     *
+     * @param Sabre_CalDAV_Schedule_IOutbox $outboxNode
+     * @return void
+     */
+    public function outboxRequest(Sabre_CalDAV_Schedule_IOutbox $outboxNode) {
+
+        $originator = $this->server->httpRequest->getHeader('Originator');
+        $recipients = $this->server->httpRequest->getHeader('Recipient');
+
+        if (!$originator) {
+            throw new Sabre_DAV_Exception_BadRequest('The Originator: header must be specified when making POST requests');
+        }
+        if (!$recipients) {
+            throw new Sabre_DAV_Exception_BadRequest('The Recipient: header must be specified when making POST requests');
+        }
+
+        if (!preg_match('/^mailto:(.*)@(.*)$/i', $originator)) {
+            throw new Sabre_DAV_Exception_BadRequest('Originator must start with mailto: and must be valid email address');
+        }
+        $originator = substr($originator,7);
+
+        $recipients = explode(',',$recipients);
+        foreach($recipients as $k=>$recipient) {
+
+            $recipient = trim($recipient);
+            if (!preg_match('/^mailto:(.*)@(.*)$/i', $recipient)) {
+                throw new Sabre_DAV_Exception_BadRequest('Recipients must start with mailto: and must be valid email address');
+            }
+            $recipient = substr($recipient, 7);
+            $recipients[$k] = $recipient;
+        }
+
+        // We need to make sure that 'originator' matches one of the email
+        // addresses of the selected principal.
+        $principal = $outboxNode->getOwner();
+        $props = $this->server->getProperties($principal,array(
+            '{' . self::NS_CALDAV . '}calendar-user-address-set',
+        ));
+
+        $addresses = array();
+        if (isset($props['{' . self::NS_CALDAV . '}calendar-user-address-set'])) {
+            $addresses = $props['{' . self::NS_CALDAV . '}calendar-user-address-set']->getHrefs();
+        }
+
+        if (!in_array('mailto:' . $originator, $addresses)) {
+            throw new Sabre_DAV_Exception_Forbidden('The addresses specified in the Originator header did not match any addresses in the owners calendar-user-address-set header');
+        }
+
+        try {
+            $vObject = Sabre_VObject_Reader::read($this->server->httpRequest->getBody(true));
+        } catch (Sabre_VObject_ParseException $e) {
+            throw new Sabre_DAV_Exception_BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
+        }
+
+        // Checking for the object type
+        $componentType = null;
+        foreach($vObject->getComponents() as $component) {
+            if ($component->name !== 'VTIMEZONE') {
+                $componentType = $component->name;
+                break;
+            }
+        }
+        if (is_null($componentType)) {
+            throw new Sabre_DAV_Exception_BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
+        }
+
+        // Validating the METHOD
+        $method = strtoupper((string)$vObject->METHOD);
+        if (!$method) {
+            throw new Sabre_DAV_Exception_BadRequest('A METHOD property must be specified in iTIP messages');
+        }
+
+        if (in_array($method, array('REQUEST','REPLY','ADD','CANCEL')) && $componentType==='VEVENT') {
+            $result = $this->iMIPMessage($originator, $recipients, $vObject);
+            $this->server->httpResponse->sendStatus(200);
+            $this->server->httpResponse->setHeader('Content-Type','application/xml');
+            $this->server->httpResponse->sendBody($this->generateScheduleResponse($result));
+        } else {
+            throw new Sabre_DAV_Exception_NotImplemented('This iTIP method is currently not implemented');
+        }
+
+    }
+
+    /**
+     * Sends an iMIP message by email.
+     *
+     * This method must return an array with status codes per recipient.
+     * This should look something like:
+     *
+     * array(
+     *    'user1@example.org' => '2.0;Success'
+     * )
+     *
+     * Formatting for this status code can be found at:
+     * https://tools.ietf.org/html/rfc5545#section-3.8.8.3
+     *
+     * A list of valid status codes can be found at:
+     * https://tools.ietf.org/html/rfc5546#section-3.6
+     *
+     * @param string $originator
+     * @param array $recipients
+     * @param Sabre_VObject_Component $vObject
+     * @return array
+     */
+    protected function iMIPMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
+
+        if (!$this->imipHandler) {
+            $resultStatus = '5.2;This server does not support this operation';
+        } else {
+            $this->imipHandler->sendMessage($originator, $recipients, $vObject);
+            $resultStatus = '2.0;Success';
+        }
+
+        $result = array();
+        foreach($recipients as $recipient) {
+            $result[$recipient] = $resultStatus;
+        }
+
+        return $result;
+
+
+    }
+
+    /**
+     * Generates a schedule-response XML body
+     *
+     * The recipients array is a key->value list, containing email addresses
+     * and iTip status codes. See the iMIPMessage method for a description of
+     * the value.
+     *
+     * @param array $recipients
+     * @return string
+     */
+    public function generateScheduleResponse(array $recipients) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $xscheduleResponse = $dom->createElement('cal:schedule-response');
+        $dom->appendChild($xscheduleResponse);
+
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $xscheduleResponse->setAttribute('xmlns:' . $prefix, $namespace);
+
+        }
+
+        foreach($recipients as $recipient=>$status) {
+            $xresponse = $dom->createElement('cal:response');
+
+            $xrecipient = $dom->createElement('cal:recipient');
+            $xrecipient->appendChild($dom->createTextNode($recipient));
+            $xresponse->appendChild($xrecipient);
+
+            $xrequestStatus = $dom->createElement('cal:request-status');
+            $xrequestStatus->appendChild($dom->createTextNode($status));
+            $xresponse->appendChild($xrequestStatus);
+
+            $xscheduleResponse->appendChild($xresponse);
+
+        }
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * This method is used to generate HTML output for the
+     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
+     * can use to create new calendars.
+     *
+     * @param Sabre_DAV_INode $node
+     * @param string $output
+     * @return bool
+     */
+    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+        if (!$node instanceof Sabre_CalDAV_UserCalendars)
+            return;
+
+        $output.= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Create new calendar</h3>
+            <input type="hidden" name="sabreAction" value="mkcalendar" />
+            <label>Name (uri):</label> <input type="text" name="name" /><br />
+            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
+            <input type="submit" value="create" />
+            </form>
+            </td></tr>';
+
+        return false;
+
+    }
+
+    /**
+     * This method allows us to intercept the 'mkcalendar' sabreAction. This
+     * action enables the user to create new calendars from the browser plugin.
+     *
+     * @param string $uri
+     * @param string $action
+     * @param array $postVars
+     * @return bool
+     */
+    public function browserPostAction($uri, $action, array $postVars) {
+
+        if ($action!=='mkcalendar')
+            return;
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+        $properties = array();
+        if (isset($postVars['{DAV:}displayname'])) {
+            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
+        }
+        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
new file mode 100755
index 0000000000..abbefa5567
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/Collection.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Principal collection
+ *
+ * This is an alternative collection to the standard ACL principal collection.
+ * This collection adds support for the calendar-proxy-read and
+ * calendar-proxy-write sub-principals, as defined by the caldav-proxy
+ * specification.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * Returns a child object based on principal information
+     *
+     * @param array $principalInfo
+     * @return Sabre_CalDAV_Principal_User
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+
+        return new Sabre_CalDAV_Principal_User($this->principalBackend, $principalInfo);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
new file mode 100755
index 0000000000..4b3f035634
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * ProxyRead principal
+ *
+ * This class represents a principal group, hosted under the main principal.
+ * This is needed to implement 'Calendar delegation' support. This class is
+ * instantiated by Sabre_CalDAV_Principal_User.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
+
+    /**
+     * Principal information from the parent principal.
+     *
+     * @var array
+     */
+    protected $principalInfo;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the object.
+     *
+     * Note that you MUST supply the parent principal information.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param array $principalInfo
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
+
+        $this->principalInfo = $principalInfo;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * Returns this principals name.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return 'calendar-proxy-read';
+
+    }
+
+    /**
+     * Returns the last modification time
+     *
+     * @return null
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Deletes the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    public function getAlternateUriSet() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalInfo['uri'] . '/' . $this->getName();
+
+    }
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $principals
+     * @return void
+     */
+    public function setGroupMemberSet(array $principals) {
+
+        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+
+    }
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename.
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+
+        return $this->getName();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
new file mode 100755
index 0000000000..dd0c2e86ed
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * ProxyWrite principal
+ *
+ * This class represents a principal group, hosted under the main principal.
+ * This is needed to implement 'Calendar delegation' support. This class is
+ * instantiated by Sabre_CalDAV_Principal_User.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
+
+    /**
+     * Parent principal information
+     *
+     * @var array
+     */
+    protected $principalInfo;
+
+    /**
+     * Principal Backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the object
+     *
+     * Note that you MUST supply the parent principal information.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param array $principalInfo
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
+
+        $this->principalInfo = $principalInfo;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * Returns this principals name.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return 'calendar-proxy-write';
+
+    }
+
+    /**
+     * Returns the last modification time
+     *
+     * @return null
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Deletes the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    public function getAlternateUriSet() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalInfo['uri'] . '/' . $this->getName();
+
+    }
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+
+    }
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $principals
+     * @return void
+     */
+    public function setGroupMemberSet(array $principals) {
+
+        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+
+    }
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename.
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+
+        return $this->getName();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
new file mode 100755
index 0000000000..8453b877a7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/User.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * CalDAV principal
+ *
+ * This is a standard user-principal for CalDAV. This principal is also a
+ * collection and returns the caldav-proxy-read and caldav-proxy-write child
+ * principals.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * @param string $name Name of the file
+     * @param resource $data Initial payload, passed as a readable stream resource.
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/' . $name);
+        if (!$principal) {
+            throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
+        }
+        if ($name === 'calendar-proxy-read')
+            return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
+
+        if ($name === 'calendar-proxy-write')
+            return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
+
+        throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        $r = array();
+        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-read')) {
+            $r[] = new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
+        }
+        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-write')) {
+            $r[] = new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
+        }
+
+        return $r;
+
+    }
+
+    /**
+     * Returns whether or not the child node exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            return false;
+        }
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        $acl = parent::getACL();
+        $acl[] = array(
+            'privilege' => '{DAV:}read',
+            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
+            'protected' => true,
+        );
+        $acl[] = array(
+            'privilege' => '{DAV:}read',
+            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
+            'protected' => true,
+        );
+        return $acl;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
new file mode 100755
index 0000000000..2ea078d7da
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Supported component set property
+ *
+ * This property is a representation of the supported-calendar_component-set
+ * property in the CalDAV namespace. It simply requires an array of components,
+ * such as VEVENT, VTODO
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
+
+    /**
+     * List of supported components, such as "VEVENT, VTODO"
+     *
+     * @var array
+     */
+    private $components;
+
+    /**
+     * Creates the property
+     *
+     * @param array $components
+     */
+    public function __construct(array $components) {
+
+       $this->components = $components;
+
+    }
+
+    /**
+     * Returns the list of supported components
+     *
+     * @return array
+     */
+    public function getValue() {
+
+        return $this->components;
+
+    }
+
+    /**
+     * Serializes the property in a DOMDocument
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+       $doc = $node->ownerDocument;
+       foreach($this->components as $component) {
+
+            $xcomp = $doc->createElement('cal:comp');
+            $xcomp->setAttribute('name',$component);
+            $node->appendChild($xcomp);
+
+       }
+
+    }
+
+    /**
+     * Unserializes the DOMElement back into a Property class.
+     *
+     * @param DOMElement $node
+     * @return Sabre_CalDAV_Property_SupportedCalendarComponentSet
+     */
+    static function unserialize(DOMElement $node) {
+
+        $components = array();
+        foreach($node->childNodes as $childNode) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
+                $components[] = $childNode->getAttribute('name');
+            }
+        }
+        return new self($components);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
new file mode 100755
index 0000000000..1d848dd5cf
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Supported-calendar-data property
+ *
+ * This property is a representation of the supported-calendar-data property
+ * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
+ * so the value is currently hardcoded.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOMDocument
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
+
+        $caldata = $doc->createElement($prefix . ':calendar-data');
+        $caldata->setAttribute('content-type','text/calendar');
+        $caldata->setAttribute('version','2.0');
+
+        $node->appendChild($caldata);
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
new file mode 100755
index 0000000000..24e84d4c17
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * supported-collation-set property
+ *
+ * This property is a representation of the supported-collation-set property
+ * in the CalDAV namespace.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOM document
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
+        if (!$prefix) $prefix = 'cal';
+
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;octet')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
+        );
+
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IMip.php b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
new file mode 100755
index 0000000000..37e75fcc4a
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * iMIP handler.
+ *
+ * This class is responsible for sending out iMIP messages. iMIP is the
+ * email-based transport for iTIP. iTIP deals with scheduling operations for
+ * iCalendar objects.
+ *
+ * If you want to customize the email that gets sent out, you can do so by
+ * extending this class and overriding the sendMessage method.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Schedule_IMip {
+
+    /**
+     * Email address used in From: header.
+     *
+     * @var string
+     */
+    protected $senderEmail;
+
+    /**
+     * Creates the email handler.
+     *
+     * @param string $senderEmail. The 'senderEmail' is the email that shows up
+     *                             in the 'From:' address. This should
+     *                             generally be some kind of no-reply email
+     *                             address you own.
+     */
+    public function __construct($senderEmail) {
+
+        $this->senderEmail = $senderEmail;
+
+    }
+
+    /**
+     * Sends one or more iTip messages through email.
+     *
+     * @param string $originator
+     * @param array $recipients
+     * @param Sabre_VObject_Component $vObject
+     * @return void
+     */
+    public function sendMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
+
+        foreach($recipients as $recipient) {
+
+            $to = $recipient;
+            $replyTo = $originator;
+            $subject = 'SabreDAV iTIP message';
+
+            switch(strtoupper($vObject->METHOD)) {
+                case 'REPLY' :
+                    $subject = 'Response for: ' . $vObject->VEVENT->SUMMARY;
+                    break;
+                case 'REQUEST' :
+                    $subject = 'Invitation for: ' .$vObject->VEVENT->SUMMARY;
+                    break;
+                case 'CANCEL' :
+                    $subject = 'Cancelled event: ' . $vObject->VEVENT->SUMMARY;
+                    break;
+            }
+
+            $headers = array();
+            $headers[] = 'Reply-To: ' . $replyTo;
+            $headers[] = 'From: ' . $this->senderEmail;
+            $headers[] = 'Content-Type: text/calendar; method=' . (string)$vObject->method . '; charset=utf-8';
+            if (Sabre_DAV_Server::$exposeVersion) {
+                $headers[] = 'X-Sabre-Version: ' . Sabre_DAV_Version::VERSION . '-' . Sabre_DAV_Version::STABILITY;
+            }
+
+            $vcalBody = $vObject->serialize();
+
+            $this->mail($to, $subject, $vcalBody, $headers);
+
+        }
+
+    }
+
+    /**
+     * This function is reponsible for sending the actual email.
+     *
+     * @param string $to Recipient email address
+     * @param string $subject Subject of the email
+     * @param string $body iCalendar body
+     * @param array $headers List of headers
+     * @return void
+     */
+    protected function mail($to, $subject, $body, array $headers) {
+
+        mail($to, $subject, $body, implode("\r\n", $headers));
+
+    }
+
+
+}
+
+?>
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
new file mode 100755
index 0000000000..46d77514bc
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Implement this interface to have a node be recognized as a CalDAV scheduling
+ * outbox.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_Schedule_IOutbox extends Sabre_DAV_ICollection, Sabre_DAVACL_IACL {
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Schedule/Outbox.php b/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
new file mode 100755
index 0000000000..014c37230d
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/Outbox.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * The CalDAV scheduling outbox
+ *
+ * The outbox is mainly used as an endpoint in the tree for a client to do
+ * free-busy requests. This functionality is completely handled by the
+ * Scheduling plugin, so this object is actually mostly static.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Schedule_Outbox extends Sabre_DAV_Directory implements Sabre_CalDAV_Schedule_IOutbox {
+
+    /**
+     * The principal Uri
+     *
+     * @var string
+     */
+    protected $principalUri;
+
+    /**
+     * Constructor
+     *
+     * @param string $principalUri
+     */
+    public function __construct($principalUri) {
+
+        $this->principalUri = $principalUri;
+
+    }
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return 'outbox';
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalUri;
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('You\'re not allowed to update the ACL');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
+        $default['aggregates'][] = array(
+            'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
+        );
+
+        return $default;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
new file mode 100755
index 0000000000..325e3d80a7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Server.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * CalDAV server
+ *
+ * Deprecated! Warning: This class is now officially deprecated
+ *
+ * This script is a convenience script. It quickly sets up a WebDAV server
+ * with caldav and ACL support, and it creates the root 'principals' and
+ * 'calendars' collections.
+ *
+ * Note that if you plan to do anything moderately complex, you are advised to
+ * not subclass this server, but use Sabre_DAV_Server directly instead. This
+ * class is nothing more than an 'easy setup'.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @deprecated Don't use this class anymore, it will be removed in version 1.7.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Server extends Sabre_DAV_Server {
+
+    /**
+     * The authentication realm
+     *
+     * Note that if this changes, the hashes in the auth backend must also
+     * be recalculated.
+     *
+     * @var string
+     */
+    public $authRealm = 'SabreDAV';
+
+    /**
+     * Sets up the object. A PDO object must be passed to setup all the backends.
+     *
+     * @param PDO $pdo
+     */
+    public function __construct(PDO $pdo) {
+
+        /* Backends */
+        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
+        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
+        $principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
+
+        /* Directory structure */
+        $tree = array(
+            new Sabre_CalDAV_Principal_Collection($principalBackend),
+            new Sabre_CalDAV_CalendarRootNode($principalBackend, $calendarBackend),
+        );
+
+        /* Initializing server */
+        parent::__construct($tree);
+
+        /* Server Plugins */
+        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,$this->authRealm);
+        $this->addPlugin($authPlugin);
+
+        $aclPlugin = new Sabre_DAVACL_Plugin();
+        $this->addPlugin($aclPlugin);
+
+        $caldavPlugin = new Sabre_CalDAV_Plugin();
+        $this->addPlugin($caldavPlugin);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
new file mode 100755
index 0000000000..b8d3f0573f
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/UserCalendars.php
@@ -0,0 +1,298 @@
+<?php
+
+/**
+ * The UserCalenders class contains all calendars associated to one user
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * CalDAV backend
+     *
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Principal information
+     *
+     * @var array
+     */
+    protected $principalInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param mixed $userUri
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
+
+        $this->principalBackend = $principalBackend;
+        $this->caldavBackend = $caldavBackend;
+        $this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
+
+    }
+
+    /**
+     * Returns the name of this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
+        return $name;
+
+    }
+
+    /**
+     * Updates the name of this object
+     *
+     * @param string $name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Deletes this object
+     *
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Returns the last modification date
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     *
+     * @param string $filename
+     * @param resource $data
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name
+     *
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CalDAV_Calendar
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_NotFound('Calendar with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Checks if a calendar exists.
+     *
+     * @param string $name
+     * @todo needs optimizing
+     * @return bool
+     */
+    public function childExists($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return true;
+
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a list of calendars
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objs = array();
+        foreach($calendars as $calendar) {
+            $objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
+        }
+        $objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new calendar
+     *
+     * @param string $name
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalInfo['uri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalInfo['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
new file mode 100755
index 0000000000..ace9901c08
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_CalDAV version constants.
+ *
+ * @package Sabre
+ * @subpackage CalDAV 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.4';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/CalDAV/includes.php b/3rdparty/Sabre/CalDAV/includes.php
new file mode 100755
index 0000000000..1ecb870a0e
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/includes.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Sabre_CalDAV includes file
+ *
+ * Including this file will automatically include all files from the
+ * Sabre_CalDAV package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/Backend/Abstract.php';
+include __DIR__ . '/Backend/PDO.php';
+include __DIR__ . '/CalendarQueryParser.php';
+include __DIR__ . '/CalendarQueryValidator.php';
+include __DIR__ . '/CalendarRootNode.php';
+include __DIR__ . '/ICalendar.php';
+include __DIR__ . '/ICalendarObject.php';
+include __DIR__ . '/ICSExportPlugin.php';
+include __DIR__ . '/Plugin.php';
+include __DIR__ . '/Principal/Collection.php';
+include __DIR__ . '/Principal/ProxyRead.php';
+include __DIR__ . '/Principal/ProxyWrite.php';
+include __DIR__ . '/Principal/User.php';
+include __DIR__ . '/Property/SupportedCalendarComponentSet.php';
+include __DIR__ . '/Property/SupportedCalendarData.php';
+include __DIR__ . '/Property/SupportedCollationSet.php';
+include __DIR__ . '/Schedule/IMip.php';
+include __DIR__ . '/Schedule/IOutbox.php';
+include __DIR__ . '/Schedule/Outbox.php';
+include __DIR__ . '/Server.php';
+include __DIR__ . '/UserCalendars.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/Calendar.php';
+include __DIR__ . '/CalendarObject.php';
+// End includes
diff --git a/3rdparty/Sabre/CardDAV/AddressBook.php b/3rdparty/Sabre/CardDAV/AddressBook.php
new file mode 100755
index 0000000000..12297175a8
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBook.php
@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * The AddressBook class represents a CardDAV addressbook, owned by a specific user
+ *
+ * The AddressBook can contain multiple vcards
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * This is an array with addressbook information
+     *
+     * @var array
+     */
+    private $addressBookInfo;
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    private $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param array $addressBookInfo
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+
+    }
+
+    /**
+     * Returns the name of the addressbook
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->addressBookInfo['uri'];
+
+    }
+
+    /**
+     * Returns a card
+     *
+     * @param string $name
+     * @return Sabre_DAV_Card
+     */
+    public function getChild($name) {
+
+        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
+        return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of cards
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in addressbooks.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in addressbooks is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid VCARD.
+     *
+     * This method may return an ETag.
+     *
+     * @param string $name
+     * @param resource $vcardData
+     * @return void|null
+     */
+    public function createFile($name,$vcardData = null) {
+
+        if (is_resource($vcardData)) {
+            $vcardData = stream_get_contents($vcardData);
+        }
+        // Converting to UTF-8, if needed
+        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
+
+        return $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
+
+    }
+
+    /**
+     * Deletes the entire addressbook.
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
+
+    }
+
+    /**
+     * Renames the addressbook
+     *
+     * @param string $newName
+     * @return void
+     */
+    public function setName($newName) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming addressbooks is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     *
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations
+     * @return bool|array
+     */
+    public function updateProperties($mutations) {
+
+        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
+
+    }
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties
+     * @return array
+     */
+    public function getProperties($properties) {
+
+        $response = array();
+        foreach($properties as $propertyName) {
+
+            if (isset($this->addressBookInfo[$propertyName])) {
+
+                $response[$propertyName] = $this->addressBookInfo[$propertyName];
+
+            }
+
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->addressBookInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
new file mode 100755
index 0000000000..46bb8ff18d
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
@@ -0,0 +1,219 @@
+<?php
+
+/**
+ * Parses the addressbook-query report request body.
+ *
+ * Whoever designed this format, and the CalDAV equivalent even more so,
+ * has no feel for design.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBookQueryParser {
+
+    const TEST_ANYOF = 'anyof';
+    const TEST_ALLOF = 'allof';
+
+    /**
+     * List of requested properties the client wanted
+     *
+     * @var array
+     */
+    public $requestedProperties;
+
+    /**
+     * The number of results the client wants
+     *
+     * null means it wasn't specified, which in most cases means 'all results'.
+     *
+     * @var int|null
+     */
+    public $limit;
+
+    /**
+     * List of property filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * Either TEST_ANYOF or TEST_ALLOF
+     *
+     * @var string
+     */
+    public $test;
+
+    /**
+     * DOM Document
+     *
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * DOM XPath object
+     *
+     * @var DOMXPath
+     */
+    protected $xpath;
+
+    /**
+     * Creates the parser
+     *
+     * @param DOMDocument $dom
+     */
+    public function __construct(DOMDocument $dom) {
+
+        $this->dom = $dom;
+
+        $this->xpath = new DOMXPath($dom);
+        $this->xpath->registerNameSpace('card',Sabre_CardDAV_Plugin::NS_CARDDAV);
+
+    }
+
+    /**
+     * Parses the request.
+     *
+     * @return void
+     */
+    public function parse() {
+
+        $filterNode = null;
+
+        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
+        if (is_nan($limit)) $limit = null;
+
+        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
+
+        // According to the CardDAV spec there needs to be exactly 1 filter
+        // element. However, KDE 4.8.2 contains a bug that will encode 0 filter
+        // elements, so this is a workaround for that.
+        //
+        // See: https://bugs.kde.org/show_bug.cgi?id=300047
+        if ($filter->length === 0) {
+            $test = null;
+            $filter = null;
+        } elseif ($filter->length === 1) {
+            $filter = $filter->item(0);
+            $test = $this->xpath->evaluate('string(@test)', $filter);
+        } else {
+            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
+        }
+
+        if (!$test) $test = self::TEST_ANYOF;
+        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
+            throw new Sabre_DAV_Exception_BadRequest('The test attribute must either hold "anyof" or "allof"');
+        }
+
+        $propFilters = array();
+
+        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
+        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
+
+            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
+
+
+        }
+
+        $this->filters = $propFilters;
+        $this->limit = $limit;
+        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
+        $this->test = $test;
+
+    }
+
+    /**
+     * Parses the prop-filter xml element
+     *
+     * @param DOMElement $propFilterNode
+     * @return array
+     */
+    protected function parsePropFilterNode(DOMElement $propFilterNode) {
+
+        $propFilter = array();
+        $propFilter['name'] = $propFilterNode->getAttribute('name');
+        $propFilter['test'] = $propFilterNode->getAttribute('test');
+        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
+
+        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
+
+        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
+
+        $propFilter['param-filters'] = array();
+
+
+        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
+
+            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
+
+        }
+        $propFilter['text-matches'] = array();
+        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
+
+        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
+
+            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
+
+        }
+
+        return $propFilter;
+
+    }
+
+    /**
+     * Parses the param-filter element
+     *
+     * @param DOMElement $paramFilterNode
+     * @return array
+     */
+    public function parseParamFilterNode(DOMElement $paramFilterNode) {
+
+        $paramFilter = array();
+        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
+        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
+        $paramFilter['text-match'] = null;
+
+        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
+        if ($textMatch->length>0) {
+            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
+        }
+
+        return $paramFilter;
+
+    }
+
+    /**
+     * Text match
+     *
+     * @param DOMElement $textMatchNode
+     * @return array
+     */
+    public function parseTextMatchNode(DOMElement $textMatchNode) {
+
+        $matchType = $textMatchNode->getAttribute('match-type');
+        if (!$matchType) $matchType = 'contains';
+
+        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
+            throw new Sabre_DAV_Exception_BadRequest('Unknown match-type: ' . $matchType);
+        }
+
+        $negateCondition = $textMatchNode->getAttribute('negate-condition');
+        $negateCondition = $negateCondition==='yes';
+        $collation = $textMatchNode->getAttribute('collation');
+        if (!$collation) $collation = 'i;unicode-casemap';
+
+        return array(
+            'negate-condition' => $negateCondition,
+            'collation' => $collation,
+            'match-type' => $matchType,
+            'value' => $textMatchNode->nodeValue
+        );
+
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
new file mode 100755
index 0000000000..9d37b15f08
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * AddressBook rootnode
+ *
+ * This object lists a collection of users, which can contain addressbooks.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * Principal Backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    protected $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * This constructor needs both a principal and a carddav backend.
+     *
+     * By default this class will show a list of addressbook collections for
+     * principals in the 'principals' collection. If your main principals are
+     * actually located in a different path, use the $principalPrefix argument
+     * to override this.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalPrefix = 'principals') {
+
+        $this->carddavBackend = $carddavBackend;
+        parent::__construct($principalBackend, $principalPrefix);
+
+    }
+
+    /**
+     * Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return Sabre_CardDAV_Plugin::ADDRESSBOOK_ROOT;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return Sabre_DAV_INode
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Backend/Abstract.php b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
new file mode 100755
index 0000000000..e4806b7161
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Abstract Backend class
+ *
+ * This class serves as a base-class for addressbook backends
+ *
+ * Note that there are references to 'addressBookId' scattered throughout the
+ * class. The value of the addressBookId is completely up to you, it can be any
+ * arbitrary value you can use as an unique identifier.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CardDAV_Backend_Abstract {
+
+    /**
+     * Returns the list of addressbooks for a specific user.
+     *
+     * Every addressbook should have the following properties:
+     *   id - an arbitrary unique id
+     *   uri - the 'basename' part of the url
+     *   principaluri - Same as the passed parameter
+     *
+     * Any additional clark-notation property may be passed besides this. Some
+     * common ones are :
+     *   {DAV:}displayname
+     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
+     *   {http://calendarserver.org/ns/}getctag
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public abstract function getAddressBooksForUser($principalUri);
+
+    /**
+     * Updates an addressbook's properties
+     *
+     * See Sabre_DAV_IProperties for a description of the mutations array, as
+     * well as the return value.
+     *
+     * @param mixed $addressBookId
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public abstract function updateAddressBook($addressBookId, array $mutations);
+
+    /**
+     * Creates a new address book
+     *
+     * @param string $principalUri
+     * @param string $url Just the 'basename' of the url.
+     * @param array $properties
+     * @return void
+     */
+    abstract public function createAddressBook($principalUri, $url, array $properties);
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param mixed $addressBookId
+     * @return void
+     */
+    abstract public function deleteAddressBook($addressBookId);
+
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also ommit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
+    public abstract function getCards($addressbookId);
+
+    /**
+     * Returns a specfic card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
+    public abstract function getCard($addressBookId, $cardUri);
+
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    abstract public function createCard($addressBookId, $cardUri, $cardData);
+
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    abstract public function updateCard($addressBookId, $cardUri, $cardData);
+
+    /**
+     * Deletes a card
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return bool
+     */
+    abstract public function deleteCard($addressBookId, $cardUri);
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Backend/PDO.php b/3rdparty/Sabre/CardDAV/Backend/PDO.php
new file mode 100755
index 0000000000..413a77f3bc
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Backend/PDO.php
@@ -0,0 +1,330 @@
+<?php
+
+/**
+ * PDO CardDAV backend
+ *
+ * This CardDAV backend uses PDO to store addressbooks
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
+
+    /**
+     * PDO connection
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * The PDO table name used to store addressbooks
+     */
+    protected $addressBooksTableName;
+
+    /**
+     * The PDO table name used to store cards
+     */
+    protected $cardsTableName;
+
+    /**
+     * Sets up the object
+     *
+     * @param PDO $pdo
+     * @param string $addressBooksTableName
+     * @param string $cardsTableName
+     */
+    public function __construct(PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
+
+        $this->pdo = $pdo;
+        $this->addressBooksTableName = $addressBooksTableName;
+        $this->cardsTableName = $cardsTableName;
+
+    }
+
+    /**
+     * Returns the list of addressbooks for a specific user.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getAddressBooksForUser($principalUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM '.$this->addressBooksTableName.' WHERE principaluri = ?');
+        $stmt->execute(array($principalUri));
+
+        $addressBooks = array();
+
+        foreach($stmt->fetchAll() as $row) {
+
+            $addressBooks[] = array(
+                'id'  => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{DAV:}displayname' => $row['displayname'],
+                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
+                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
+                    new Sabre_CardDAV_Property_SupportedAddressData(),
+            );
+
+        }
+
+        return $addressBooks;
+
+    }
+
+
+    /**
+     * Updates an addressbook's properties
+     *
+     * See Sabre_DAV_IProperties for a description of the mutations array, as
+     * well as the return value.
+     *
+     * @param mixed $addressBookId
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateAddressBook($addressBookId, array $mutations) {
+
+        $updates = array();
+
+        foreach($mutations as $property=>$newValue) {
+
+            switch($property) {
+                case '{DAV:}displayname' :
+                    $updates['displayname'] = $newValue;
+                    break;
+                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+                    $updates['description'] = $newValue;
+                    break;
+                default :
+                    // If any unsupported values were being updated, we must
+                    // let the entire request fail.
+                    return false;
+            }
+
+        }
+
+        // No values are being updated?
+        if (!$updates) {
+            return false;
+        }
+
+        $query = 'UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 ';
+        foreach($updates as $key=>$value) {
+            $query.=', `' . $key . '` = :' . $key . ' ';
+        }
+        $query.=' WHERE id = :addressbookid';
+
+        $stmt = $this->pdo->prepare($query);
+        $updates['addressbookid'] = $addressBookId;
+
+        $stmt->execute($updates);
+
+        return true;
+
+    }
+
+    /**
+     * Creates a new address book
+     *
+     * @param string $principalUri
+     * @param string $url Just the 'basename' of the url.
+     * @param array $properties
+     * @return void
+     */
+    public function createAddressBook($principalUri, $url, array $properties) {
+
+        $values = array(
+            'displayname' => null,
+            'description' => null,
+            'principaluri' => $principalUri,
+            'uri' => $url,
+        );
+
+        foreach($properties as $property=>$newValue) {
+
+            switch($property) {
+                case '{DAV:}displayname' :
+                    $values['displayname'] = $newValue;
+                    break;
+                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+                    $values['description'] = $newValue;
+                    break;
+                default :
+                    throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
+            }
+
+        }
+
+        $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($values);
+
+    }
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param int $addressBookId
+     * @return void
+     */
+    public function deleteAddressBook($addressBookId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
+        $stmt->execute(array($addressBookId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
+        $stmt->execute(array($addressBookId));
+
+    }
+
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also ommit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
+    public function getCards($addressbookId) {
+
+        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
+        $stmt->execute(array($addressbookId));
+
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+
+    }
+
+    /**
+     * Returns a specfic card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
+    public function getCard($addressBookId, $cardUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ? LIMIT 1');
+        $stmt->execute(array($addressBookId, $cardUri));
+
+        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        return (count($result)>0?$result[0]:false);
+
+    }
+
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    public function createCard($addressBookId, $cardUri, $cardData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
+
+        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
+
+        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return '"' . md5($cardData) . '"';
+
+    }
+
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressbooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
+    public function updateCard($addressBookId, $cardUri, $cardData) {
+
+        $stmt = $this->pdo->prepare('UPDATE ' . $this->cardsTableName . ' SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
+        $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
+
+        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return '"' . md5($cardData) . '"';
+
+    }
+
+    /**
+     * Deletes a card
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return bool
+     */
+    public function deleteCard($addressBookId, $cardUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ?');
+        $stmt->execute(array($addressBookId, $cardUri));
+
+        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return $stmt->rowCount()===1;
+
+    }
+}
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
new file mode 100755
index 0000000000..d7c6633383
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Card.php
@@ -0,0 +1,250 @@
+<?php
+
+/**
+ * The Card object represents a single Card from an addressbook
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    private $carddavBackend;
+
+    /**
+     * Array with information about this Card
+     *
+     * @var array
+     */
+    private $cardData;
+
+    /**
+     * Array with information about the containing addressbook
+     *
+     * @var array
+     */
+    private $addressBookInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param array $addressBookInfo
+     * @param array $cardData
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo,array $cardData) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+        $this->cardData = $cardData;
+
+    }
+
+    /**
+     * Returns the uri for this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->cardData['uri'];
+
+    }
+
+    /**
+     * Returns the VCard-formatted object
+     *
+     * @return string
+     */
+    public function get() {
+
+        // Pre-populating 'carddata' is optional. If we don't yet have it
+        // already, we fetch it from the backend.
+        if (!isset($this->cardData['carddata'])) {
+            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
+        }
+        return $this->cardData['carddata'];
+
+    }
+
+    /**
+     * Updates the VCard-formatted object
+     *
+     * @param string $cardData
+     * @return void
+     */
+    public function put($cardData) {
+
+        if (is_resource($cardData))
+            $cardData = stream_get_contents($cardData);
+
+        // Converting to UTF-8, if needed
+        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
+
+        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
+        $this->cardData['carddata'] = $cardData;
+        $this->cardData['etag'] = $etag;
+
+        return $etag;
+
+    }
+
+    /**
+     * Deletes the card
+     *
+     * @return void
+     */
+    public function delete() {
+
+        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type
+     *
+     * @return string
+     */
+    public function getContentType() {
+
+        return 'text/x-vcard';
+
+    }
+
+    /**
+     * Returns an ETag for this object
+     *
+     * @return string
+     */
+    public function getETag() {
+
+        if (isset($this->cardData['etag'])) {
+            return $this->cardData['etag'];
+        } else {
+            return '"' . md5($this->get()) . '"';
+        }
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     *
+     * @return time
+     */
+    public function getLastModified() {
+
+        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
+
+    }
+
+    /**
+     * Returns the size of this object in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        if (array_key_exists('size', $this->cardData)) {
+            return $this->cardData['size'];
+        } else {
+            return strlen($this->get());
+        }
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->addressBookInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
new file mode 100755
index 0000000000..2bc275bcf7
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/IAddressBook.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * AddressBook interface
+ *
+ * Implement this interface to allow a node to be recognized as an addressbook.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
+
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
new file mode 100755
index 0000000000..a17299316c
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/ICard.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Card interface
+ *
+ * Extend the ICard interface to allow your custom nodes to be picked up as
+ * 'Cards'.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_ICard extends Sabre_DAV_IFile {
+
+}
+
diff --git a/3rdparty/Sabre/CardDAV/IDirectory.php b/3rdparty/Sabre/CardDAV/IDirectory.php
new file mode 100755
index 0000000000..22d4afeb24
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/IDirectory.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * IDirectory interface
+ *
+ * Implement this interface to have an addressbook marked as a 'directory'. A
+ * directory is an (often) global addressbook.
+ *
+ * A full description can be found in the IETF draft:
+ *   - draft-daboo-carddav-directory-gateway
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
new file mode 100755
index 0000000000..ca20e46849
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -0,0 +1,666 @@
+<?php
+
+/**
+ * CardDAV plugin
+ *
+ * The CardDAV plugin adds CardDAV functionality to the WebDAV server
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Url to the addressbooks
+     */
+    const ADDRESSBOOK_ROOT = 'addressbooks';
+
+    /**
+     * xml namespace for CardDAV elements
+     */
+    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
+
+    /**
+     * Add urls to this property to have them automatically exposed as
+     * 'directories' to the user.
+     *
+     * @var array
+     */
+    public $directories = array();
+
+    /**
+     * Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        /* Events */
+        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
+        $server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
+        $server->subscribeEvent('report', array($this,'report'));
+        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
+        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
+        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
+        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
+
+        /* Namespaces */
+        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
+
+        /* Mapping Interfaces to {DAV:}resourcetype values */
+        $server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
+        $server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
+
+        /* Adding properties that may never be changed */
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
+
+        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre_DAV_Property_Href';
+
+        $this->server = $server;
+
+    }
+
+    /**
+     * Returns a list of supported features.
+     *
+     * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('addressbook');
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_CardDAV_IAddressBook || $node instanceof Sabre_CardDAV_ICard) {
+            return array(
+                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
+                 '{' . self::NS_CARDDAV . '}addressbook-query',
+            );
+        }
+        return array();
+
+    }
+
+
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param string $path
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @return void
+     */
+    public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) {
+
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            // calendar-home-set property
+            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
+            if (in_array($addHome,$requestedProperties)) {
+                $principalId = $node->getName();
+                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
+                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
+                $returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
+            }
+
+            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
+            if ($this->directories && in_array($directories, $requestedProperties)) {
+                unset($requestedProperties[array_search($directories, $requestedProperties)]);
+                $returnedProperties[200][$directories] = new Sabre_DAV_Property_HrefList($this->directories);
+            }
+
+        }
+
+        if ($node instanceof Sabre_CardDAV_ICard) {
+
+            // The address-data property is not supposed to be a 'real'
+            // property, but in large chunks of the spec it does act as such.
+            // Therefore we simply expose it as a property.
+            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
+            if (in_array($addressDataProp, $requestedProperties)) {
+                unset($requestedProperties[$addressDataProp]);
+                $val = $node->get();
+                if (is_resource($val))
+                    $val = stream_get_contents($val);
+
+                // Taking out \r to not screw up the xml output
+                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+
+            }
+        }
+
+        if ($node instanceof Sabre_CardDAV_UserAddressBooks) {
+
+            $meCardProp = '{http://calendarserver.org/ns/}me-card';
+            if (in_array($meCardProp, $requestedProperties)) {
+
+                $props = $this->server->getProperties($node->getOwner(), array('{http://sabredav.org/ns}vcard-url'));
+                if (isset($props['{http://sabredav.org/ns}vcard-url'])) {
+
+                    $returnedProperties[200][$meCardProp] = new Sabre_DAV_Property_Href(
+                        $props['{http://sabredav.org/ns}vcard-url']
+                    );
+                    $pos = array_search($meCardProp, $requestedProperties);
+                    unset($requestedProperties[$pos]);
+
+                }
+
+            }
+
+        }
+
+    }
+
+    /**
+     * This event is triggered when a PROPPATCH method is executed
+     *
+     * @param array $mutations
+     * @param array $result
+     * @param Sabre_DAV_INode $node
+     * @return void
+     */
+    public function updateProperties(&$mutations, &$result, $node) {
+
+        if (!$node instanceof Sabre_CardDAV_UserAddressBooks) {
+            return true;
+        }
+
+        $meCard = '{http://calendarserver.org/ns/}me-card';
+
+        // The only property we care about
+        if (!isset($mutations[$meCard]))
+            return true;
+
+        $value = $mutations[$meCard];
+        unset($mutations[$meCard]);
+
+        if ($value instanceof Sabre_DAV_Property_IHref) {
+            $value = $value->getHref();
+            $value = $this->server->calculateUri($value);
+        } elseif (!is_null($value)) {
+            $result[400][$meCard] = null;
+            return false;
+        }
+
+        $innerResult = $this->server->updateProperties(
+            $node->getOwner(),
+            array(
+                '{http://sabredav.org/ns}vcard-url' => $value,
+            )
+        );
+
+        $closureResult = false;
+        foreach($innerResult as $status => $props) {
+            if (is_array($props) && array_key_exists('{http://sabredav.org/ns}vcard-url', $props)) {
+                $result[$status][$meCard] = null;
+                $closureResult = ($status>=200 && $status<300);
+            }
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CardDAV
+     *
+     * @param string $reportName
+     * @param DOMNode $dom
+     * @return bool
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) {
+            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
+                $this->addressbookMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CARDDAV.'}addressbook-query' :
+                $this->addressBookQueryReport($dom);
+                return false;
+            default :
+                return;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the addressbook-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function addressbookMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+        $propertyList = array();
+
+        foreach($hrefElems as $elem) {
+
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This method is triggered before a file gets updated with new content.
+     *
+     * This plugin uses this method to ensure that Card nodes receive valid
+     * vcard data.
+     *
+     * @param string $path
+     * @param Sabre_DAV_IFile $node
+     * @param resource $data
+     * @return void
+     */
+    public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
+
+        if (!$node instanceof Sabre_CardDAV_ICard)
+            return;
+
+        $this->validateVCard($data);
+
+    }
+
+    /**
+     * This method is triggered before a new file is created.
+     *
+     * This plugin uses this method to ensure that Card nodes receive valid
+     * vcard data.
+     *
+     * @param string $path
+     * @param resource $data
+     * @param Sabre_DAV_ICollection $parentNode
+     * @return void
+     */
+    public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
+
+        if (!$parentNode instanceof Sabre_CardDAV_IAddressBook)
+            return;
+
+        $this->validateVCard($data);
+
+    }
+
+    /**
+     * Checks if the submitted iCalendar data is in fact, valid.
+     *
+     * An exception is thrown if it's not.
+     *
+     * @param resource|string $data
+     * @return void
+     */
+    protected function validateVCard(&$data) {
+
+        // If it's a stream, we convert it to a string first.
+        if (is_resource($data)) {
+            $data = stream_get_contents($data);
+        }
+
+        // Converting the data to unicode, if needed.
+        $data = Sabre_DAV_StringUtil::ensureUTF8($data);
+
+        try {
+
+            $vobj = Sabre_VObject_Reader::read($data);
+
+        } catch (Sabre_VObject_ParseException $e) {
+
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
+
+        }
+
+        if ($vobj->name !== 'VCARD') {
+            throw new Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support vcard objects.');
+        }
+
+    }
+
+
+    /**
+     * This function handles the addressbook-query REPORT
+     *
+     * This report is used by the client to filter an addressbook based on a
+     * complex query.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    protected function addressbookQueryReport($dom) {
+
+        $query = new Sabre_CardDAV_AddressBookQueryParser($dom);
+        $query->parse();
+
+        $depth = $this->server->getHTTPDepth(0);
+
+        if ($depth==0) {
+            $candidateNodes = array(
+                $this->server->tree->getNodeForPath($this->server->getRequestUri())
+            );
+        } else {
+            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
+        }
+
+        $validNodes = array();
+        foreach($candidateNodes as $node) {
+
+            if (!$node instanceof Sabre_CardDAV_ICard)
+                continue;
+
+            $blob = $node->get();
+            if (is_resource($blob)) {
+                $blob = stream_get_contents($blob);
+            }
+
+            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
+                continue;
+            }
+
+            $validNodes[] = $node;
+
+            if ($query->limit && $query->limit <= count($validNodes)) {
+                // We hit the maximum number of items, we can stop now.
+                break;
+            }
+
+        }
+
+        $result = array();
+        foreach($validNodes as $validNode) {
+
+            if ($depth==0) {
+                $href = $this->server->getRequestUri();
+            } else {
+                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
+            }
+
+            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
+
+    }
+
+    /**
+     * Validates if a vcard makes it throught a list of filters.
+     *
+     * @param string $vcardData
+     * @param array $filters
+     * @param string $test anyof or allof (which means OR or AND)
+     * @return bool
+     */
+    public function validateFilters($vcardData, array $filters, $test) {
+
+        $vcard = Sabre_VObject_Reader::read($vcardData);
+
+        if (!$filters) return true;
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($vcard->{$filter['name']});
+            if ($filter['is-not-defined']) {
+                if ($isDefined) {
+                    $success = false;
+                } else {
+                    $success = true;
+                }
+            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
+
+                // We only need to check for existence
+                $success = $isDefined;
+
+            } else {
+
+                $vProperties = $vcard->select($filter['name']);
+
+                $results = array();
+                if ($filter['param-filters']) {
+                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
+                }
+                if ($filter['text-matches']) {
+                    $texts = array();
+                    foreach($vProperties as $vProperty)
+                        $texts[] = $vProperty->value;
+
+                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
+                }
+
+                if (count($results)===1) {
+                    $success = $results[0];
+                } else {
+                    if ($filter['test'] === 'anyof') {
+                        $success = $results[0] || $results[1];
+                    } else {
+                        $success = $results[0] && $results[1];
+                    }
+                }
+
+            } // else
+
+            // There are two conditions where we can already determine whether
+            // or not this filter succeeds.
+            if ($test==='anyof' && $success) {
+                return true;
+            }
+            if ($test==='allof' && !$success) {
+                return false;
+            }
+
+        } // foreach
+
+        // If we got all the way here, it means we haven't been able to
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * Validates if a param-filter can be applied to a specific property.
+     *
+     * @todo currently we're only validating the first parameter of the passed
+     *       property. Any subsequence parameters with the same name are
+     *       ignored.
+     * @param array $vProperties
+     * @param array $filters
+     * @param string $test
+     * @return bool
+     */
+    protected function validateParamFilters(array $vProperties, array $filters, $test) {
+
+        foreach($filters as $filter) {
+
+            $isDefined = false;
+            foreach($vProperties as $vProperty) {
+                $isDefined = isset($vProperty[$filter['name']]);
+                if ($isDefined) break;
+            }
+
+            if ($filter['is-not-defined']) {
+                if ($isDefined) {
+                    $success = false;
+                } else {
+                    $success = true;
+                }
+
+            // If there's no text-match, we can just check for existence
+            } elseif (!$filter['text-match'] || !$isDefined) {
+
+                $success = $isDefined;
+
+            } else {
+
+                $success = false;
+                foreach($vProperties as $vProperty) {
+                    // If we got all the way here, we'll need to validate the
+                    // text-match filter.
+                    $success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
+                    if ($success) break;
+                }
+                if ($filter['text-match']['negate-condition']) {
+                    $success = !$success;
+                }
+
+            } // else
+
+            // There are two conditions where we can already determine whether
+            // or not this filter succeeds.
+            if ($test==='anyof' && $success) {
+                return true;
+            }
+            if ($test==='allof' && !$success) {
+                return false;
+            }
+
+        }
+
+        // If we got all the way here, it means we haven't been able to
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * Validates if a text-filter can be applied to a specific property.
+     *
+     * @param array $texts
+     * @param array $filters
+     * @param string $test
+     * @return bool
+     */
+    protected function validateTextMatches(array $texts, array $filters, $test) {
+
+        foreach($filters as $filter) {
+
+            $success = false;
+            foreach($texts as $haystack) {
+                $success = Sabre_DAV_StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
+
+                // Breaking on the first match
+                if ($success) break;
+            }
+            if ($filter['negate-condition']) {
+                $success = !$success;
+            }
+
+            if ($success && $test==='anyof')
+                return true;
+
+            if (!$success && $test=='allof')
+                return false;
+
+
+        }
+
+        // If we got all the way here, it means we haven't been able to
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * This method is used to generate HTML output for the
+     * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
+     * can use to create new calendars.
+     *
+     * @param Sabre_DAV_INode $node
+     * @param string $output
+     * @return bool
+     */
+    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+        if (!$node instanceof Sabre_CardDAV_UserAddressBooks)
+            return;
+
+        $output.= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Create new address book</h3>
+            <input type="hidden" name="sabreAction" value="mkaddressbook" />
+            <label>Name (uri):</label> <input type="text" name="name" /><br />
+            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
+            <input type="submit" value="create" />
+            </form>
+            </td></tr>';
+
+        return false;
+
+    }
+
+    /**
+     * This method allows us to intercept the 'mkcalendar' sabreAction. This
+     * action enables the user to create new calendars from the browser plugin.
+     *
+     * @param string $uri
+     * @param string $action
+     * @param array $postVars
+     * @return bool
+     */
+    public function browserPostAction($uri, $action, array $postVars) {
+
+        if ($action!=='mkaddressbook')
+            return;
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:carddav}addressbook');
+        $properties = array();
+        if (isset($postVars['{DAV:}displayname'])) {
+            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
+        }
+        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
new file mode 100755
index 0000000000..36d9306e7a
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Supported-address-data property
+ *
+ * This property is a representation of the supported-address-data property
+ * in the CardDAV namespace.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
+
+    /**
+     * supported versions
+     *
+     * @var array
+     */
+    protected $supportedData = array();
+
+    /**
+     * Creates the property
+     *
+     * @param array|null $supportedData
+     */
+    public function __construct(array $supportedData = null) {
+
+        if (is_null($supportedData)) {
+            $supportedData = array(
+                array('contentType' => 'text/vcard', 'version' => '3.0'),
+                array('contentType' => 'text/vcard', 'version' => '4.0'),
+            );
+        }
+
+       $this->supportedData = $supportedData;
+
+    }
+
+    /**
+     * Serializes the property in a DOMDocument
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix =
+            isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
+            $server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
+            'card';
+
+        foreach($this->supportedData as $supported) {
+
+            $caldata = $doc->createElementNS(Sabre_CardDAV_Plugin::NS_CARDDAV, $prefix . ':address-data-type');
+            $caldata->setAttribute('content-type',$supported['contentType']);
+            $caldata->setAttribute('version',$supported['version']);
+            $node->appendChild($caldata);
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
new file mode 100755
index 0000000000..3f11fb1123
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * UserAddressBooks class
+ *
+ * The UserAddressBooks collection contains a list of addressbooks associated with a user
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+
+    /**
+     * Principal uri
+     *
+     * @var array
+     */
+    protected $principalUri;
+
+    /**
+     * carddavBackend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    protected $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param string $principalUri
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->principalUri = $principalUri;
+
+    }
+
+    /**
+     * Returns the name of this object
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
+        return $name;
+
+    }
+
+    /**
+     * Updates the name of this object
+     *
+     * @param string $name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed();
+
+    }
+
+    /**
+     * Deletes this object
+     *
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed();
+
+    }
+
+    /**
+     * Returns the last modification date
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     *
+     * @param string $filename
+     * @param resource $data
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name
+     *
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CardDAV_AddressBook
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_NotFound('Addressbook with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Returns a list of addressbooks
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
+        $objs = array();
+        foreach($addressbooks as $addressbook) {
+            $objs[] = new Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
+        }
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new addressbook
+     *
+     * @param string $name
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{'.Sabre_CardDAV_Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalUri;
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalUri,
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalUri,
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
new file mode 100755
index 0000000000..d0623f0d3e
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Version.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Version Class
+ *
+ * This class contains the Sabre_CardDAV version information
+ *
+ * @package Sabre
+ * @subpackage CardDAV 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/CardDAV/includes.php b/3rdparty/Sabre/CardDAV/includes.php
new file mode 100755
index 0000000000..c3b8c04b07
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/includes.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_CardDAV includes file
+ *
+ * Including this file will automatically include all files from the
+ * Sabre_CardDAV package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/AddressBookQueryParser.php';
+include __DIR__ . '/AddressBookRoot.php';
+include __DIR__ . '/Backend/Abstract.php';
+include __DIR__ . '/Backend/PDO.php';
+include __DIR__ . '/IAddressBook.php';
+include __DIR__ . '/ICard.php';
+include __DIR__ . '/IDirectory.php';
+include __DIR__ . '/Plugin.php';
+include __DIR__ . '/Property/SupportedAddressData.php';
+include __DIR__ . '/UserAddressBooks.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/AddressBook.php';
+include __DIR__ . '/Card.php';
+// End includes
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
new file mode 100755
index 0000000000..1e89b84f9a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * HTTP Basic authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Basic
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the validateUserPass method.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author James David Low (http://jameslow.com/)
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * This variable holds the currently logged in username.
+     *
+     * @var string|null
+     */
+    protected $currentUser;
+
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     */
+    abstract protected function validateUserPass($username, $password);
+
+    /**
+     * Returns information about the currently logged in username.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+        return $this->currentUser;
+    }
+
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server, $realm) {
+
+        $auth = new Sabre_HTTP_BasicAuth();
+        $auth->setHTTPRequest($server->httpRequest);
+        $auth->setHTTPResponse($server->httpResponse);
+        $auth->setRealm($realm);
+        $userpass = $auth->getUserPass();
+        if (!$userpass) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
+        }
+
+        // Authenticates the user
+        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
+        }
+        $this->currentUser = $userpass[0];
+        return true;
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
new file mode 100755
index 0000000000..9833928b97
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * HTTP Digest authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Digest
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the getDigestHash method
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * This variable holds the currently logged in username.
+     *
+     * @var array|null
+     */
+    protected $currentUser;
+
+    /**
+     * Returns a users digest hash based on the username and realm.
+     *
+     * If the user was not known, null must be returned.
+     *
+     * @param string $realm
+     * @param string $username
+     * @return string|null
+     */
+    abstract public function getDigestHash($realm, $username);
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server, $realm) {
+
+        $digest = new Sabre_HTTP_DigestAuth();
+
+        // Hooking up request and response objects
+        $digest->setHTTPRequest($server->httpRequest);
+        $digest->setHTTPResponse($server->httpResponse);
+
+        $digest->setRealm($realm);
+        $digest->init();
+
+        $username = $digest->getUsername();
+
+        // No username was given
+        if (!$username) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
+        }
+
+        $hash = $this->getDigestHash($realm, $username);
+        // If this was false, the user account didn't exist
+        if ($hash===false || is_null($hash)) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
+        }
+        if (!is_string($hash)) {
+            throw new Sabre_DAV_Exception('The returned value from getDigestHash must be a string or null');
+        }
+
+        // If this was false, the password or part of the hash was incorrect.
+        if (!$digest->validateA1($hash)) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
+        }
+
+        $this->currentUser = $username;
+        return true;
+
+    }
+
+    /**
+     * Returns the currently logged in username.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+
+        return $this->currentUser;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
new file mode 100755
index 0000000000..d4294ea4d8
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Apache authenticator
+ *
+ * This authentication backend assumes that authentication has been
+ * configured in apache, rather than within SabreDAV.
+ *
+ * Make sure apache is properly configured for this to work.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * Current apache user
+     *
+     * @var string
+     */
+    protected $remoteUser;
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server, $realm) {
+
+        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
+        if (is_null($remoteUser)) {
+            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
+        }
+
+        $this->remoteUser = $remoteUser;
+        return true;
+
+    }
+
+    /**
+     * Returns information about the currently logged in user.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return array|null
+     */
+    public function getCurrentUser() {
+
+        return $this->remoteUser;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
new file mode 100755
index 0000000000..de308d64a6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/File.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * List of users
+     *
+     * @var array
+     */
+    protected $users = array();
+
+    /**
+     * Creates the backend object.
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     *
+     * @param string|null $filename
+     */
+    public function __construct($filename=null) {
+
+        if (!is_null($filename))
+            $this->loadFile($filename);
+
+    }
+
+    /**
+     * Loads an htdigest-formatted file. This method can be called multiple times if
+     * more than 1 file is used.
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function loadFile($filename) {
+
+        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
+
+            if (substr_count($line, ":") !== 2)
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
+
+            list($username,$realm,$A1) = explode(':',$line);
+
+            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
+
+            $this->users[$realm . ':' . $username] = $A1;
+
+        }
+
+    }
+
+    /**
+     * Returns a users' information
+     *
+     * @param string $realm
+     * @param string $username
+     * @return string
+     */
+    public function getDigestHash($realm, $username) {
+
+        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
new file mode 100755
index 0000000000..eac18a23fb
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * Reference to PDO connection
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * PDO table name we'll be using
+     *
+     * @var string
+     */
+    protected $tableName;
+
+
+    /**
+     * Creates the backend object.
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     *
+     * @param PDO $pdo
+     * @param string $tableName The PDO table name to use
+     */
+    public function __construct(PDO $pdo, $tableName = 'users') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+
+    }
+
+    /**
+     * Returns the digest hash for a user.
+     *
+     * @param string $realm
+     * @param string $username
+     * @return string|null
+     */
+    public function getDigestHash($realm,$username) {
+
+        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?');
+        $stmt->execute(array($username));
+        $result = $stmt->fetchAll();
+
+        if (!count($result)) return;
+
+        return $result[0]['digesta1'];
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
new file mode 100755
index 0000000000..5be5d1bc93
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/IBackend.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This is the base class for any authentication object.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Auth_IBackend {
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is successful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param string $realm
+     * @return bool
+     */
+    function authenticate(Sabre_DAV_Server $server,$realm);
+
+    /**
+     * Returns information about the currently logged in username.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return string|null
+     */
+    function getCurrentUser();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
new file mode 100755
index 0000000000..55a4e39167
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Plugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * This plugin provides Authentication for a WebDAV server.
+ *
+ * It relies on a Backend object, which provides user information.
+ *
+ * Additionally, it provides support for:
+ *  * {DAV:}current-user-principal property from RFC5397
+ *  * {DAV:}principal-collection-set property from RFC3744
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to main server object
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Authentication backend
+     *
+     * @var Sabre_DAV_Auth_IBackend
+     */
+    private $authBackend;
+
+    /**
+     * The authentication realm.
+     *
+     * @var string
+     */
+    private $realm;
+
+    /**
+     * __construct
+     *
+     * @param Sabre_DAV_Auth_IBackend $authBackend
+     * @param string $realm
+     */
+    public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
+
+        $this->authBackend = $authBackend;
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Initializes the plugin. This function is automatically called by the server
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'auth';
+
+    }
+
+    /**
+     * Returns the current users' principal uri.
+     *
+     * If nobody is logged in, this will return null.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+
+        $userInfo = $this->authBackend->getCurrentUser();
+        if (!$userInfo) return null;
+
+        return $userInfo;
+
+    }
+
+    /**
+     * This method is called before any HTTP method and forces users to be authenticated
+     *
+     * @param string $method
+     * @param string $uri
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        $this->authBackend->authenticate($this->server,$this->realm);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
new file mode 100755
index 0000000000..b6c00d461c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * GuessContentType plugin
+ *
+ * A lot of the built-in File objects just return application/octet-stream
+ * as a content-type by default. This is a problem for some clients, because
+ * they expect a correct contenttype.
+ *
+ * There's really no accurate, fast and portable way to determine the contenttype
+ * so this extension does what the rest of the world does, and guesses it based
+ * on the file extension.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * List of recognized file extensions
+     *
+     * Feel free to add more
+     *
+     * @var array
+     */
+    public $extensionMap = array(
+
+        // images
+        'jpg' => 'image/jpeg',
+        'gif' => 'image/gif',
+        'png' => 'image/png',
+
+        // groupware
+        'ics' => 'text/calendar',
+        'vcf' => 'text/x-vcard',
+
+        // text
+        'txt' => 'text/plain',
+
+    );
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        // Using a relatively low priority (200) to allow other extensions
+        // to set the content-type first.
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
+
+    }
+
+    /**
+     * Handler for teh afterGetProperties event
+     *
+     * @param string $path
+     * @param array $properties
+     * @return void
+     */
+    public function afterGetProperties($path, &$properties) {
+
+        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
+
+            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
+            $contentType = $this->getContentType($fileName);
+
+            if ($contentType) {
+                $properties[200]['{DAV:}getcontenttype'] = $contentType;
+                unset($properties[404]['{DAV:}getcontenttype']);
+            }
+
+        }
+
+    }
+
+    /**
+     * Simple method to return the contenttype
+     *
+     * @param string $fileName
+     * @return string
+     */
+    protected function getContentType($fileName) {
+
+        // Just grabbing the extension
+        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
+        if (isset($this->extensionMap[$extension]))
+            return $this->extensionMap[$extension];
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
new file mode 100755
index 0000000000..1588488764
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * This is a simple plugin that will map any GET request for non-files to
+ * PROPFIND allprops-requests.
+ *
+ * This should allow easy debugging of PROPFIND
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * reference to server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin and subscribes to events
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+    }
+
+    /**
+     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method!='GET') return true;
+
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_DAV_IFile) return;
+
+        $this->server->invokeMethod('PROPFIND',$uri);
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
new file mode 100755
index 0000000000..09bbdd2ae0
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/Plugin.php
@@ -0,0 +1,489 @@
+<?php
+
+/**
+ * Browser Plugin
+ *
+ * This plugin provides a html representation, so that a WebDAV server may be accessed
+ * using a browser.
+ *
+ * The class intercepts GET requests to collection resources and generates a simple
+ * html index.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * List of default icons for nodes.
+     *
+     * This is an array with class / interface names as keys, and asset names
+     * as values.
+     *
+     * The evaluation order is reversed. The last item in the list gets
+     * precendence.
+     *
+     * @var array
+     */
+    public $iconMap = array(
+        'Sabre_DAV_IFile' => 'icons/file',
+        'Sabre_DAV_ICollection' => 'icons/collection',
+        'Sabre_DAVACL_IPrincipal' => 'icons/principal',
+        'Sabre_CalDAV_ICalendar' => 'icons/calendar',
+        'Sabre_CardDAV_IAddressBook' => 'icons/addressbook',
+        'Sabre_CardDAV_ICard' => 'icons/card',
+    );
+
+    /**
+     * The file extension used for all icons
+     *
+     * @var string
+     */
+    public $iconExtension = '.png';
+
+    /**
+     * reference to server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * enablePost turns on the 'actions' panel, which allows people to create
+     * folders and upload files straight from a browser.
+     *
+     * @var bool
+     */
+    protected $enablePost = true;
+
+    /**
+     * By default the browser plugin will generate a favicon and other images.
+     * To turn this off, set this property to false.
+     *
+     * @var bool
+     */
+    protected $enableAssets = true;
+
+    /**
+     * Creates the object.
+     *
+     * By default it will allow file creation and uploads.
+     * Specify the first argument as false to disable this
+     *
+     * @param bool $enablePost
+     * @param bool $enableAssets
+     */
+    public function __construct($enablePost=true, $enableAssets = true) {
+
+        $this->enablePost = $enablePost;
+        $this->enableAssets = $enableAssets;
+
+    }
+
+    /**
+     * Initializes the plugin and subscribes to events
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+        $this->server->subscribeEvent('onHTMLActionsPanel', array($this, 'htmlActionsPanel'),200);
+        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
+    }
+
+    /**
+     * This method intercepts GET requests to collections and returns the html
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method !== 'GET') return true;
+
+        // We're not using straight-up $_GET, because we want everything to be
+        // unit testable.
+        $getVars = array();
+        parse_str($this->server->httpRequest->getQueryString(), $getVars);
+
+        if (isset($getVars['sabreAction']) && $getVars['sabreAction'] === 'asset' && isset($getVars['assetName'])) {
+            $this->serveAsset($getVars['assetName']);
+            return false;
+        }
+
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            // We're simply stopping when the file isn't found to not interfere
+            // with other plugins.
+            return;
+        }
+        if ($node instanceof Sabre_DAV_IFile)
+            return;
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
+
+        $this->server->httpResponse->sendBody(
+            $this->generateDirectoryIndex($uri)
+        );
+
+        return false;
+
+    }
+
+    /**
+     * Handles POST requests for tree operations.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function httpPOSTHandler($method, $uri) {
+
+        if ($method!='POST') return;
+        $contentType = $this->server->httpRequest->getHeader('Content-Type');
+        list($contentType) = explode(';', $contentType);
+        if ($contentType !== 'application/x-www-form-urlencoded' &&
+            $contentType !== 'multipart/form-data') {
+                return;
+        }
+        $postVars = $this->server->httpRequest->getPostVars();
+
+        if (!isset($postVars['sabreAction']))
+            return;
+
+        if ($this->server->broadcastEvent('onBrowserPostAction', array($uri, $postVars['sabreAction'], $postVars))) {
+
+            switch($postVars['sabreAction']) {
+
+                case 'mkcol' :
+                    if (isset($postVars['name']) && trim($postVars['name'])) {
+                        // Using basename() because we won't allow slashes
+                        list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($postVars['name']));
+                        $this->server->createDirectory($uri . '/' . $folderName);
+                    }
+                    break;
+                case 'put' :
+                    if ($_FILES) $file = current($_FILES);
+                    else break;
+
+                    list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
+                    if (isset($postVars['name']) && trim($postVars['name']))
+                        $newName = trim($postVars['name']);
+
+                    // Making sure we only have a 'basename' component
+                    list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
+
+                    if (is_uploaded_file($file['tmp_name'])) {
+                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'],'r'));
+                    }
+                    break;
+
+            }
+
+        }
+        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
+        $this->server->httpResponse->sendStatus(302);
+        return false;
+
+    }
+
+    /**
+     * Escapes a string for html.
+     *
+     * @param string $value
+     * @return string
+     */
+    public function escapeHTML($value) {
+
+        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
+
+    }
+
+    /**
+     * Generates the html directory index for a given url
+     *
+     * @param string $path
+     * @return string
+     */
+    public function generateDirectoryIndex($path) {
+
+        $version = '';
+        if (Sabre_DAV_Server::$exposeVersion) {
+            $version = Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY;
+        }
+
+        $html = "<html>
+<head>
+  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . $version . "</title>
+  <style type=\"text/css\">
+  body { Font-family: arial}
+  h1 { font-size: 150% }
+  </style>
+        ";
+
+        if ($this->enableAssets) {
+            $html.='<link rel="shortcut icon" href="'.$this->getAssetUrl('favicon.ico').'" type="image/vnd.microsoft.icon" />';
+        }
+
+        $html .= "</head>
+<body>
+  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
+  <table>
+    <tr><th width=\"24\"></th><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
+    <tr><td colspan=\"5\"><hr /></td></tr>";
+
+        $files = $this->server->getPropertiesForPath($path,array(
+            '{DAV:}displayname',
+            '{DAV:}resourcetype',
+            '{DAV:}getcontenttype',
+            '{DAV:}getcontentlength',
+            '{DAV:}getlastmodified',
+        ),1);
+
+        $parent = $this->server->tree->getNodeForPath($path);
+
+
+        if ($path) {
+
+            list($parentUri) = Sabre_DAV_URLUtil::splitPath($path);
+            $fullPath = Sabre_DAV_URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
+
+            $icon = $this->enableAssets?'<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl('icons/parent' . $this->iconExtension) . '" width="24" alt="Parent" /></a>':'';
+            $html.= "<tr>
+    <td>$icon</td>
+    <td><a href=\"{$fullPath}\">..</a></td>
+    <td>[parent]</td>
+    <td></td>
+    <td></td>
+    </tr>";
+
+        }
+
+        foreach($files as $file) {
+
+            // This is the current directory, we can skip it
+            if (rtrim($file['href'],'/')==$path) continue;
+
+            list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
+
+            $type = null;
+
+
+            if (isset($file[200]['{DAV:}resourcetype'])) {
+                $type = $file[200]['{DAV:}resourcetype']->getValue();
+
+                // resourcetype can have multiple values
+                if (!is_array($type)) $type = array($type);
+
+                foreach($type as $k=>$v) {
+
+                    // Some name mapping is preferred
+                    switch($v) {
+                        case '{DAV:}collection' :
+                            $type[$k] = 'Collection';
+                            break;
+                        case '{DAV:}principal' :
+                            $type[$k] = 'Principal';
+                            break;
+                        case '{urn:ietf:params:xml:ns:carddav}addressbook' :
+                            $type[$k] = 'Addressbook';
+                            break;
+                        case '{urn:ietf:params:xml:ns:caldav}calendar' :
+                            $type[$k] = 'Calendar';
+                            break;
+                        case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
+                            $type[$k] = 'Schedule Inbox';
+                            break;
+                        case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
+                            $type[$k] = 'Schedule Outbox';
+                            break;
+                        case '{http://calendarserver.org/ns/}calendar-proxy-read' :
+                            $type[$k] = 'Proxy-Read';
+                            break;
+                        case '{http://calendarserver.org/ns/}calendar-proxy-write' :
+                            $type[$k] = 'Proxy-Write';
+                            break;
+                    }
+
+                }
+                $type = implode(', ', $type);
+            }
+
+            // If no resourcetype was found, we attempt to use
+            // the contenttype property
+            if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
+                $type = $file[200]['{DAV:}getcontenttype'];
+            }
+            if (!$type) $type = 'Unknown';
+
+            $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
+            $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
+
+            $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
+
+            $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
+
+            $displayName = $this->escapeHTML($displayName);
+            $type = $this->escapeHTML($type);
+
+            $icon = '';
+
+            if ($this->enableAssets) {
+                $node = $parent->getChild($name);
+                foreach(array_reverse($this->iconMap) as $class=>$iconName) {
+
+                    if ($node instanceof $class) {
+                        $icon = '<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl($iconName . $this->iconExtension) . '" alt="" width="24" /></a>';
+                        break;
+                    }
+
+
+                }
+
+            }
+
+            $html.= "<tr>
+    <td>$icon</td>
+    <td><a href=\"{$fullPath}\">{$displayName}</a></td>
+    <td>{$type}</td>
+    <td>{$size}</td>
+    <td>{$lastmodified}</td>
+    </tr>";
+
+        }
+
+        $html.= "<tr><td colspan=\"5\"><hr /></td></tr>";
+
+        $output = '';
+
+        if ($this->enablePost) {
+            $this->server->broadcastEvent('onHTMLActionsPanel',array($parent, &$output));
+        }
+
+        $html.=$output;
+
+        $html.= "</table>
+        <address>Generated by SabreDAV " . $version . " (c)2007-2012 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
+        </body>
+        </html>";
+
+        return $html;
+
+    }
+
+    /**
+     * This method is used to generate the 'actions panel' output for
+     * collections.
+     *
+     * This specifically generates the interfaces for creating new files, and
+     * creating new directories.
+     *
+     * @param Sabre_DAV_INode $node
+     * @param mixed $output
+     * @return void
+     */
+    public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+        if (!$node instanceof Sabre_DAV_ICollection)
+            return;
+
+        // We also know fairly certain that if an object is a non-extended
+        // SimpleCollection, we won't need to show the panel either.
+        if (get_class($node)==='Sabre_DAV_SimpleCollection')
+            return;
+
+        $output.= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Create new folder</h3>
+            <input type="hidden" name="sabreAction" value="mkcol" />
+            Name: <input type="text" name="name" /><br />
+            <input type="submit" value="create" />
+            </form>
+            <form method="post" action="" enctype="multipart/form-data">
+            <h3>Upload file</h3>
+            <input type="hidden" name="sabreAction" value="put" />
+            Name (optional): <input type="text" name="name" /><br />
+            File: <input type="file" name="file" /><br />
+            <input type="submit" value="upload" />
+            </form>
+            </td></tr>';
+
+    }
+
+    /**
+     * This method takes a path/name of an asset and turns it into url
+     * suiteable for http access.
+     *
+     * @param string $assetName
+     * @return string
+     */
+    protected function getAssetUrl($assetName) {
+
+        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
+
+    }
+
+    /**
+     * This method returns a local pathname to an asset.
+     *
+     * @param string $assetName
+     * @return string
+     */
+    protected function getLocalAssetPath($assetName) {
+
+        // Making sure people aren't trying to escape from the base path.
+        $assetSplit = explode('/', $assetName);
+        if (in_array('..',$assetSplit)) {
+            throw new Sabre_DAV_Exception('Incorrect asset path');
+        }
+        $path = __DIR__ . '/assets/' . $assetName;
+        return $path;
+
+    }
+
+    /**
+     * This method reads an asset from disk and generates a full http response.
+     *
+     * @param string $assetName
+     * @return void
+     */
+    protected function serveAsset($assetName) {
+
+        $assetPath = $this->getLocalAssetPath($assetName);
+        if (!file_exists($assetPath)) {
+            throw new Sabre_DAV_Exception_NotFound('Could not find an asset with this name');
+        }
+        // Rudimentary mime type detection
+        switch(strtolower(substr($assetPath,strpos($assetPath,'.')+1))) {
+
+        case 'ico' :
+            $mime = 'image/vnd.microsoft.icon';
+            break;
+
+        case 'png' :
+            $mime = 'image/png';
+            break;
+
+        default:
+            $mime = 'application/octet-stream';
+            break;
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type', $mime);
+        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
+        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody(fopen($assetPath,'r'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/assets/favicon.ico b/3rdparty/Sabre/DAV/Browser/assets/favicon.ico
new file mode 100755
index 0000000000000000000000000000000000000000..2b2c10a22cc7a57c4dc5d7156f184448f2bee92b
GIT binary patch
literal 4286
zcmc&&O-NKx6uz%14NNBzA}E}JHil3^6a|4&P_&6!RGSD}1rgCAC@`9dTC_@vqNoT8
z0%;dQR0K_{iUM;bf#3*%o1h^C2N7@IH_nmc?Va~t5U6~f`_BE&`Of`&_n~tUev3uN
zziw!)bL*XR-2hy!51_yCgT8fb3s`VC=e=KcI5&)PGGQlpSAh?}1mK&Pg8c>z0Y`y$
zAT_6qJ%yV?|0!S$5WO@z3+`QD17OyXL4PyiM}RavtA7Tu7p)pn^p7Ks@m6m7)A}X$
z4Y+@;NrHYq_;V@RoZ|;69MPx!46Ftg*Tc~711C+J`JMuUfYwNBzXPB9sZm3WK9272
z&x|>@f_E<?SJ!n3F_!+bjQL(SbG*pN*ZN$yjf@Y*UxY8qyfdC$j-dkR++q8Z(SMuq
zfqvGxyvf)mCXM`3#|fi<8vgb`|A)bqT(si=-rx;=+NAlS2KT#;*X?6Ue@g;SVmR+T
zfQ)^2O3afcmvu-EZSO1nlLklg`<wYhpZi$%hi%qJ?r(!Ps`Lj8j^tcCGtHdL`!ONr
zi{e@OQ%awEO0+_IL*<gO^ZX>O{b3cubqjOyc~<H3P7OIT@bL~1O>J3I$d_lHIpN}q
z!{kjX{c{12XF=~Z$w$kazXHB!b53>u!rx}_$e&dD`xNgv+MR&p2yN1xb0>&9t@28Z
zV&5u#j_D=P9mI#){2s8@eGGj(?>gooo<%RT14>`VSZ&_l6GlGnan=^bemD56rRN{?
zSAqZD$i;oS9SF6#f5I`#^C<Zl_1nO;w0X9AnJWgj;1j*j9wa}5KIfFRhVgvn8Q25F
zX>&hW@13s_lc3LUl(PWmHcop2{vr^kO`kP(*4!m=3Hn3e#Oc!a2;iDn+FbXzcOHEQ
zbX<Zy_d4fE*T6CF*YPoJ)-?|3IJT*M2v|~cf<AdX%Z~xh*?E9xU`c%NY@HE)qwET}
zjXWv(qQ$)+ZOgLOSAZTj_YS|Q%(cp>Z)u93cj1WA=KS+M>jZ=oYyXq}1?ZdsjsX0A
zkJXCvi~cfO@2ffd7r^;>=SsL-3U%l5HRoEZ#0r<I5G^jMtaMR%O%#<k0ef>%`7%&%
ziLTXJqU*JeXt3H5`AS#h(dpfl+`Ox|)*~QS%h&VO!d#)!>r3U5_YsDi2fY6Sd&vw%

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png b/3rdparty/Sabre/DAV/Browser/assets/icons/addressbook.png
new file mode 100755
index 0000000000000000000000000000000000000000..c9acc84172dad59708b6b298b310b8d29eeeb671
GIT binary patch
literal 7232
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png b/3rdparty/Sabre/DAV/Browser/assets/icons/calendar.png
new file mode 100755
index 0000000000000000000000000000000000000000..3ecd6a800a01b77ec8b53fd2ac2c1ad9be035fc0
GIT binary patch
literal 4388
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
VG`ly3;d~;1Y%Cr2-!R7}{u}gUbfEwM

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/card.png b/3rdparty/Sabre/DAV/Browser/assets/icons/card.png
new file mode 100755
index 0000000000000000000000000000000000000000..2ce954866d853edb737a7e281de221f7846846f6
GIT binary patch
literal 5695
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png b/3rdparty/Sabre/DAV/Browser/assets/icons/collection.png
new file mode 100755
index 0000000000000000000000000000000000000000..156fa64fd50f15d9e838326d42d68feba2c23c3b
GIT binary patch
literal 3474
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/file.png b/3rdparty/Sabre/DAV/Browser/assets/icons/file.png
new file mode 100755
index 0000000000000000000000000000000000000000..3b98551cec3a863ab120a52cf21debad6cab6748
GIT binary patch
literal 2837
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
BY2g3>

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png b/3rdparty/Sabre/DAV/Browser/assets/icons/parent.png
new file mode 100755
index 0000000000000000000000000000000000000000..156fa64fd50f15d9e838326d42d68feba2c23c3b
GIT binary patch
literal 3474
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png b/3rdparty/Sabre/DAV/Browser/assets/icons/principal.png
new file mode 100755
index 0000000000000000000000000000000000000000..f8988f828e61bb1894c3ea5b848f95aac84beaa3
GIT binary patch
literal 5480
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

literal 0
HcmV?d00001

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
new file mode 100755
index 0000000000..9a428765e9
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -0,0 +1,492 @@
+<?php
+
+/**
+ * SabreDAV DAV client
+ *
+ * This client wraps around Curl to provide a convenient API to a WebDAV
+ * server.
+ *
+ * NOTE: This class is experimental, it's api will likely change in the future.
+ *
+ * @package Sabre
+ * @subpackage DAVClient
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Client {
+
+    public $propertyMap = array();
+
+    protected $baseUri;
+    protected $userName;
+    protected $password;
+    protected $proxy;
+
+    /**
+     * Basic authentication
+     */
+    const AUTH_BASIC = 1;
+
+    /**
+     * Digest authentication
+     */
+    const AUTH_DIGEST = 2;
+
+    /**
+     * The authentication type we're using.
+     *
+     * This is a bitmask of AUTH_BASIC and AUTH_DIGEST.
+     *
+     * If DIGEST is used, the client makes 1 extra request per request, to get
+     * the authentication tokens.
+     *
+     * @var int
+     */
+    protected $authType;
+
+    /**
+     * Constructor
+     *
+     * Settings are provided through the 'settings' argument. The following
+     * settings are supported:
+     *
+     *   * baseUri
+     *   * userName (optional)
+     *   * password (optional)
+     *   * proxy (optional)
+     *
+     * @param array $settings
+     */
+    public function __construct(array $settings) {
+
+        if (!isset($settings['baseUri'])) {
+            throw new InvalidArgumentException('A baseUri must be provided');
+        }
+
+        $validSettings = array(
+            'baseUri',
+            'userName',
+            'password',
+            'proxy',
+        );
+
+        foreach($validSettings as $validSetting) {
+            if (isset($settings[$validSetting])) {
+                $this->$validSetting = $settings[$validSetting];
+            }
+        }
+
+        if (isset($settings['authType'])) {
+            $this->authType = $settings['authType'];
+        } else {
+            $this->authType = self::AUTH_BASIC | self::AUTH_DIGEST;
+        }
+
+        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
+
+    }
+
+    /**
+     * Does a PROPFIND request
+     *
+     * The list of requested properties must be specified as an array, in clark
+     * notation.
+     *
+     * The returned array will contain a list of filenames as keys, and
+     * properties as values.
+     *
+     * The properties array will contain the list of properties. Only properties
+     * that are actually returned from the server (without error) will be
+     * returned, anything else is discarded.
+     *
+     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+     * made to the server to also return all child resources.
+     *
+     * @param string $url
+     * @param array $properties
+     * @param int $depth
+     * @return array
+     */
+    public function propFind($url, array $properties, $depth = 0) {
+
+        $body = '<?xml version="1.0"?>' . "\n";
+        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
+        $body.= '  <d:prop>' . "\n";
+
+        foreach($properties as $property) {
+
+            list(
+                $namespace,
+                $elementName
+            ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
+
+            if ($namespace === 'DAV:') {
+                $body.='    <d:' . $elementName . ' />' . "\n";
+            } else {
+                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+            }
+
+        }
+
+        $body.= '  </d:prop>' . "\n";
+        $body.= '</d:propfind>';
+
+        $response = $this->request('PROPFIND', $url, $body, array(
+            'Depth' => $depth,
+            'Content-Type' => 'application/xml'
+        ));
+
+        $result = $this->parseMultiStatus($response['body']);
+
+        // If depth was 0, we only return the top item
+        if ($depth===0) {
+            reset($result);
+            $result = current($result);
+            return $result[200];
+        }
+
+        $newResult = array();
+        foreach($result as $href => $statusList) {
+
+            $newResult[$href] = $statusList[200];
+
+        }
+
+        return $newResult;
+
+    }
+
+    /**
+     * Updates a list of properties on the server
+     *
+     * The list of properties must have clark-notation properties for the keys,
+     * and the actual (string) value for the value. If the value is null, an
+     * attempt is made to delete the property.
+     *
+     * @todo Must be building the request using the DOM, and does not yet
+     *       support complex properties.
+     * @param string $url
+     * @param array $properties
+     * @return void
+     */
+    public function propPatch($url, array $properties) {
+
+        $body = '<?xml version="1.0"?>' . "\n";
+        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
+
+        foreach($properties as $propName => $propValue) {
+
+            list(
+                $namespace,
+                $elementName
+            ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
+
+            if ($propValue === null) {
+
+                $body.="<d:remove><d:prop>\n";
+
+                if ($namespace === 'DAV:') {
+                    $body.='    <d:' . $elementName . ' />' . "\n";
+                } else {
+                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+                }
+
+                $body.="</d:prop></d:remove>\n";
+
+            } else {
+
+                $body.="<d:set><d:prop>\n";
+                if ($namespace === 'DAV:') {
+                    $body.='    <d:' . $elementName . '>';
+                } else {
+                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
+                }
+                // Shitty.. i know
+                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8');
+                if ($namespace === 'DAV:') {
+                    $body.='</d:' . $elementName . '>' . "\n";
+                } else {
+                    $body.="</x:" . $elementName . ">\n";
+                }
+                $body.="</d:prop></d:set>\n";
+
+            }
+
+        }
+
+        $body.= '</d:propertyupdate>';
+
+        $this->request('PROPPATCH', $url, $body, array(
+            'Content-Type' => 'application/xml'
+        ));
+
+    }
+
+    /**
+     * Performs an HTTP options request
+     *
+     * This method returns all the features from the 'DAV:' header as an array.
+     * If there was no DAV header, or no contents this method will return an
+     * empty array.
+     *
+     * @return array
+     */
+    public function options() {
+
+        $result = $this->request('OPTIONS');
+        if (!isset($result['headers']['dav'])) {
+            return array();
+        }
+
+        $features = explode(',', $result['headers']['dav']);
+        foreach($features as &$v) {
+            $v = trim($v);
+        }
+        return $features;
+
+    }
+
+    /**
+     * Performs an actual HTTP request, and returns the result.
+     *
+     * If the specified url is relative, it will be expanded based on the base
+     * url.
+     *
+     * The returned array contains 3 keys:
+     *   * body - the response body
+     *   * httpCode - a HTTP code (200, 404, etc)
+     *   * headers - a list of response http headers. The header names have
+     *     been lowercased.
+     *
+     * @param string $method
+     * @param string $url
+     * @param string $body
+     * @param array $headers
+     * @return array
+     */
+    public function request($method, $url = '', $body = null, $headers = array()) {
+
+        $url = $this->getAbsoluteUrl($url);
+
+        $curlSettings = array(
+            CURLOPT_RETURNTRANSFER => true,
+            // Return headers as part of the response
+            CURLOPT_HEADER => true,
+            CURLOPT_POSTFIELDS => $body,
+            // Automatically follow redirects
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_MAXREDIRS => 5,
+        );
+
+        switch ($method) {
+            case 'HEAD' :
+
+                // do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD
+                // requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
+                // specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
+                // ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
+                // response body
+                $curlSettings[CURLOPT_NOBODY] = true;
+                $curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+                break;
+
+            default:
+                $curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
+                break;
+
+        }
+
+        // Adding HTTP headers
+        $nHeaders = array();
+        foreach($headers as $key=>$value) {
+
+            $nHeaders[] = $key . ': ' . $value;
+
+        }
+        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
+
+        if ($this->proxy) {
+            $curlSettings[CURLOPT_PROXY] = $this->proxy;
+        }
+
+        if ($this->userName && $this->authType) {
+            $curlType = 0;
+            if ($this->authType & self::AUTH_BASIC) {
+                $curlType |= CURLAUTH_BASIC;
+            }
+            if ($this->authType & self::AUTH_DIGEST) {
+                $curlType |= CURLAUTH_DIGEST;
+            }
+            $curlSettings[CURLOPT_HTTPAUTH] = $curlType;
+            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
+        }
+
+        list(
+            $response,
+            $curlInfo,
+            $curlErrNo,
+            $curlError
+        ) = $this->curlRequest($url, $curlSettings);
+
+        $headerBlob = substr($response, 0, $curlInfo['header_size']);
+        $response = substr($response, $curlInfo['header_size']);
+
+        // In the case of 100 Continue, or redirects we'll have multiple lists
+        // of headers for each separate HTTP response. We can easily split this
+        // because they are separated by \r\n\r\n
+        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+
+        // We only care about the last set of headers
+        $headerBlob = $headerBlob[count($headerBlob)-1];
+
+        // Splitting headers
+        $headerBlob = explode("\r\n", $headerBlob);
+
+        $headers = array();
+        foreach($headerBlob as $header) {
+            $parts = explode(':', $header, 2);
+            if (count($parts)==2) {
+                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
+            }
+        }
+
+        $response = array(
+            'body' => $response,
+            'statusCode' => $curlInfo['http_code'],
+            'headers' => $headers
+        );
+
+        if ($curlErrNo) {
+            throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
+        }
+
+        if ($response['statusCode']>=400) {
+            switch ($response['statusCode']) {
+                case 404:
+                    throw new Sabre_DAV_Exception_NotFound('Resource ' . $url . ' not found.');
+                    break;
+
+                default:
+                    throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
+            }
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Wrapper for all curl functions.
+     *
+     * The only reason this was split out in a separate method, is so it
+     * becomes easier to unittest.
+     *
+     * @param string $url
+     * @param array $settings
+     * @return array
+     */
+    protected function curlRequest($url, $settings) {
+
+        $curl = curl_init($url);
+        curl_setopt_array($curl, $settings);
+
+        return array(
+            curl_exec($curl),
+            curl_getinfo($curl),
+            curl_errno($curl),
+            curl_error($curl)
+        );
+
+    }
+
+    /**
+     * Returns the full url based on the given url (which may be relative). All
+     * urls are expanded based on the base url as given by the server.
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function getAbsoluteUrl($url) {
+
+        // If the url starts with http:// or https://, the url is already absolute.
+        if (preg_match('/^http(s?):\/\//', $url)) {
+            return $url;
+        }
+
+        // If the url starts with a slash, we must calculate the url based off
+        // the root of the base url.
+        if (strpos($url,'/') === 0) {
+            $parts = parse_url($this->baseUri);
+            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
+        }
+
+        // Otherwise...
+        return $this->baseUri . $url;
+
+    }
+
+    /**
+     * Parses a WebDAV multistatus response body
+     *
+     * This method returns an array with the following structure
+     *
+     * array(
+     *   'url/to/resource' => array(
+     *     '200' => array(
+     *        '{DAV:}property1' => 'value1',
+     *        '{DAV:}property2' => 'value2',
+     *     ),
+     *     '404' => array(
+     *        '{DAV:}property1' => null,
+     *        '{DAV:}property2' => null,
+     *     ),
+     *   )
+     *   'url/to/resource2' => array(
+     *      .. etc ..
+     *   )
+     * )
+     *
+     *
+     * @param string $body xml body
+     * @return array
+     */
+    public function parseMultiStatus($body) {
+
+        $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
+
+        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
+        if ($responseXML===false) {
+            throw new InvalidArgumentException('The passed data is not valid XML');
+        }
+
+        $responseXML->registerXPathNamespace('d', 'urn:DAV');
+
+        $propResult = array();
+
+        foreach($responseXML->xpath('d:response') as $response) {
+            $response->registerXPathNamespace('d', 'urn:DAV');
+            $href = $response->xpath('d:href');
+            $href = (string)$href[0];
+
+            $properties = array();
+
+            foreach($response->xpath('d:propstat') as $propStat) {
+
+                $propStat->registerXPathNamespace('d', 'urn:DAV');
+                $status = $propStat->xpath('d:status');
+                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
+
+                $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap);
+
+            }
+
+            $propResult[$href] = $properties;
+
+        }
+
+        return $propResult;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Collection.php b/3rdparty/Sabre/DAV/Collection.php
new file mode 100755
index 0000000000..776c22531b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Collection.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Collection class
+ *
+ * This is a helper class, that should aid in getting collections classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
+     * Generally its wise to override this, as this can usually be optimized
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+
+            if ($child->getName()==$name) return $child;
+
+        }
+        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name);
+
+    }
+
+    /**
+     * Checks is a child-node exists.
+     *
+     * It is generally a good idea to try and override this. Usually it can be optimized.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        try {
+
+            $this->getChild($name);
+            return true;
+
+        } catch(Sabre_DAV_Exception_NotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Directory.php b/3rdparty/Sabre/DAV/Directory.php
new file mode 100755
index 0000000000..6db8febc02
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Directory.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * This class is now deprecated in favor of the Sabre_DAV_Collection class.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated Use Sabre_DAV_Collection instead
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Directory extends Sabre_DAV_Collection {
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
new file mode 100755
index 0000000000..a2cd6cf582
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * SabreDAV base exception
+ *
+ * This is SabreDAV's base exception file, use this to implement your own exception.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * Main Exception class.
+ *
+ * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occurred.
+ * The default for this is 500.
+ *
+ * This class also allows you to generate custom xml data for your exceptions. This will be displayed
+ * in the 'error' element in the failing response.
+ */
+class Sabre_DAV_Exception extends Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 500;
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return array
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        return array();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/BadRequest.php b/3rdparty/Sabre/DAV/Exception/BadRequest.php
new file mode 100755
index 0000000000..b198648a75
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/BadRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * BadRequest
+ *
+ * The BadRequest is thrown when the user submitted an invalid HTTP request
+ * BadRequest
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 400;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/Conflict.php b/3rdparty/Sabre/DAV/Exception/Conflict.php
new file mode 100755
index 0000000000..6b0bd1fad7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Conflict.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Conflict
+ *
+ * A 409 Conflict is thrown when a user tried to make a directory over an existing
+ * file or in a parent directory that doesn't exist.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 409;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
new file mode 100755
index 0000000000..6121868e69
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ConflictingLock
+ *
+ * Similar to Exception_Locked, this exception thrown when a LOCK request
+ * was made, on a resource which was already locked
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/FileNotFound.php b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
new file mode 100755
index 0000000000..d76e400c93
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * FileNotFound
+ *
+ * Deprecated: Warning, this class is deprecated and will be removed in a 
+ * future version of SabreDAV. Please use Sabre_DAV_Exception_NotFound instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @deprecated Use Sabre_DAV_Exception_NotFound instead
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception_NotFound {
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/Forbidden.php b/3rdparty/Sabre/DAV/Exception/Forbidden.php
new file mode 100755
index 0000000000..20b1056e31
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Forbidden.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Forbidden
+ *
+ * This exception is thrown whenever a user tries to do an operation he's not allowed to
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 403;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
new file mode 100755
index 0000000000..1a15089b0a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * InsufficientStorage
+ *
+ * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 507;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
new file mode 100755
index 0000000000..2230f1d081
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * InvalidResourceType
+ *
+ * This exception is thrown when the user tried to create a new collection, with
+ * a special resourcetype value that was not recognized by the server.
+ *
+ * See RFC5689 section 3.3
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
new file mode 100755
index 0000000000..80ab7aff65
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * LockTokenMatchesRequestUri
+ *
+ * This exception is thrown by UNLOCK if a supplied lock-token is invalid
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Creates the exception
+     */
+    public function __construct() {
+
+        $this->message = 'The locktoken supplied does not match any locks on this entity';
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/Locked.php b/3rdparty/Sabre/DAV/Exception/Locked.php
new file mode 100755
index 0000000000..976365ac1f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Locked.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Locked
+ *
+ * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
+
+    /**
+     * Lock information
+     *
+     * @var Sabre_DAV_Locks_LockInfo
+     */
+    protected $lock;
+
+    /**
+     * Creates the exception
+     *
+     * A LockInfo object should be passed if the user should be informed
+     * which lock actually has the file locked.
+     *
+     * @param Sabre_DAV_Locks_LockInfo $lock
+     */
+    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
+
+        $this->lock = $lock;
+
+    }
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 423;
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
new file mode 100755
index 0000000000..3187575150
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * MethodNotAllowed
+ *
+ * The 405 is thrown when a client tried to create a directory on an already existing directory
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 405;
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return array
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        $methods = $server->getAllowedMethods($server->getRequestUri());
+
+        return array(
+            'Allow' => strtoupper(implode(', ',$methods)),
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
new file mode 100755
index 0000000000..87ca624429
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NotAuthenticated
+ *
+ * This exception is thrown when the client did not provide valid
+ * authentication credentials.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 401;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/NotFound.php b/3rdparty/Sabre/DAV/Exception/NotFound.php
new file mode 100755
index 0000000000..2b9da560d2
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotFound.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NotFound
+ *
+ * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotFound extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 404;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/NotImplemented.php b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
new file mode 100755
index 0000000000..d017a19f55
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * NotImplemented
+ *
+ * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 501;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/PaymentRequired.php b/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
new file mode 100755
index 0000000000..4982f45a4b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/PaymentRequired.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Payment Required
+ *
+ * The PaymentRequired exception may be thrown in a case where a user must pay
+ * to access a certain resource or operation.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_PaymentRequired extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 402;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
new file mode 100755
index 0000000000..213e9c5231
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * PreconditionFailed
+ *
+ * This exception is normally thrown when a client submitted a conditional request,
+ * like for example an If, If-None-Match or If-Match header, which caused the HTTP
+ * request to not execute (the condition of the header failed)
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
+
+    /**
+     * When this exception is thrown, the header-name might be set.
+     *
+     * This allows the exception-catching code to determine which HTTP header
+     * caused the exception.
+     *
+     * @var string
+     */
+    public $header = null;
+
+    /**
+     * Create the exception
+     *
+     * @param string $message
+     * @param string $header
+     */
+    public function __construct($message, $header=null) {
+
+        parent::__construct($message);
+        $this->header = $header;
+
+    }
+
+    /**
+     * Returns the HTTP statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 412;
+
+    }
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        if ($this->header) {
+            $prop = $errorNode->ownerDocument->createElement('s:header');
+            $prop->nodeValue = $this->header;
+            $errorNode->appendChild($prop);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
new file mode 100755
index 0000000000..e86800f303
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * ReportNotImplemented
+ *
+ * This exception is thrown when the client requested an unknown report through the REPORT method
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
new file mode 100755
index 0000000000..29ee3654a7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * RequestedRangeNotSatisfiable
+ *
+ * This exception is normally thrown when the user
+ * request a range that is out of the entity bounds.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
+
+    /**
+     * returns the http statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 416;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
new file mode 100755
index 0000000000..9a4693b21a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * UnSupportedMediaType
+ *
+ * The 415 Unsupported Media Type status code is generally sent back when the client
+ * tried to call an HTTP method, with a body the server didn't understand
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception {
+
+    /**
+     * returns the http statuscode for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 415;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/FS/Directory.php b/3rdparty/Sabre/DAV/FS/Directory.php
new file mode 100755
index 0000000000..3af2d75558
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/Directory.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null) {
+
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FS_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FS_File($path);
+
+        }
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return void
+     */
+    public function delete() {
+
+        foreach($this->getChildren() as $child) $child->delete();
+        rmdir($this->path);
+
+    }
+
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            );
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FS/File.php b/3rdparty/Sabre/DAV/FS/File.php
new file mode 100755
index 0000000000..6a8039fe30
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/File.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * File class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * @param resource $data
+     * @return void
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return string
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return void
+     */
+    public function delete() {
+
+        unlink($this->path);
+
+    }
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return filesize($this->path);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return mixed
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return mixed
+     */
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FS/Node.php b/3rdparty/Sabre/DAV/FS/Node.php
new file mode 100755
index 0000000000..1283e9d0fd
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/Node.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Base node-class
+ *
+ * The node class implements the method used by both the File and the Directory classes
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
+
+    /**
+     * The path to the current node
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param string $path
+     */
+    public function __construct($path) {
+
+        $this->path = $path;
+
+    }
+
+
+
+    /**
+     * Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $name;
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+
+        $newPath = $parentPath . '/' . $newName;
+        rename($this->path,$newPath);
+
+        $this->path = $newPath;
+
+    }
+
+
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return filemtime($this->path);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/Directory.php b/3rdparty/Sabre/DAV/FSExt/Directory.php
new file mode 100755
index 0000000000..540057183b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/Directory.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+        return '"' . md5_file($newPath) . '"';
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_NotFound('File could not be located');
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FSExt_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FSExt_File($path);
+
+        }
+
+    }
+
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+
+        if ($name=='.' || $name=='..')
+            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return bool
+     */
+    public function delete() {
+
+        // Deleting all children
+        foreach($this->getChildren() as $child) $child->delete();
+
+        // Removing resource info, if its still around
+        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
+
+        // Removing the directory itself
+        rmdir($this->path);
+
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            );
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/File.php b/3rdparty/Sabre/DAV/FSExt/File.php
new file mode 100755
index 0000000000..b93ce5aee2
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/File.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * File class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * data is a readable stream resource.
+     *
+     * @param resource $data
+     * @return void
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+        return '"' . md5_file($this->path) . '"';
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return string
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return bool
+     */
+    public function delete() {
+
+        unlink($this->path);
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string|null
+     */
+    public function getETag() {
+
+        return '"' . md5_file($this->path). '"';
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return filesize($this->path);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/Node.php b/3rdparty/Sabre/DAV/FSExt/Node.php
new file mode 100755
index 0000000000..68ca06beb7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/Node.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * Base node-class
+ *
+ * The node class implements the method used by both the File and the Directory classes
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_IProperties {
+
+    /**
+     * Updates properties on this node,
+     *
+     * @param array $properties
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+
+        foreach($properties as $propertyName=>$propertyValue) {
+
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (isset($resourceData['properties'][$propertyName])) {
+                    unset($resourceData['properties'][$propertyName]);
+                }
+            } else {
+                $resourceData['properties'][$propertyName] = $propertyValue;
+            }
+
+        }
+
+        $this->putResourceData($resourceData);
+        return true;
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     *
+     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
+     * If the array is empty, all properties should be returned
+     *
+     * @param array $properties
+     * @return array
+     */
+    function getProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+
+        // if the array was empty, we need to return everything
+        if (!$properties) return $resourceData['properties'];
+
+        $props = array();
+        foreach($properties as $property) {
+            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
+        }
+
+        return $props;
+
+    }
+
+    /**
+     * Returns the path to the resource file
+     *
+     * @return string
+     */
+    protected function getResourceInfoPath() {
+
+        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $parentDir . '/.sabredav';
+
+    }
+
+    /**
+     * Returns all the stored resource information
+     *
+     * @return array
+     */
+    protected function getResourceData() {
+
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return array('properties' => array());
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!isset($data[$this->getName()])) {
+            return array('properties' => array());
+        }
+
+        $data = $data[$this->getName()];
+        if (!isset($data['properties'])) $data['properties'] = array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the resource information
+     *
+     * @param array $newData
+     * @return void
+     */
+    protected function putResourceData(array $newData) {
+
+        $path = $this->getResourceInfoPath();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        $data[$this->getName()] = $newData;
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+        $newPath = $parentPath . '/' . $newName;
+
+        // We're deleting the existing resourcedata, and recreating it
+        // for the new path.
+        $resourceData = $this->getResourceData();
+        $this->deleteResourceData();
+
+        rename($this->path,$newPath);
+        $this->path = $newPath;
+        $this->putResourceData($resourceData);
+
+
+    }
+
+    /**
+     * @return bool
+     */
+    public function deleteResourceData() {
+
+        // When we're deleting this node, we also need to delete any resource information
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return true;
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
+        ftruncate($handle,0);
+        rewind($handle);
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+        return true;
+    }
+
+    public function delete() {
+
+        return $this->deleteResourceData();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/File.php b/3rdparty/Sabre/DAV/File.php
new file mode 100755
index 0000000000..3126bd8d36
--- /dev/null
+++ b/3rdparty/Sabre/DAV/File.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * File class
+ *
+ * This is a helper class, that should aid in getting file classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * data is a readable stream resource.
+     *
+     * @param resource $data
+     * @return void
+     */
+    public function put($data) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    public function get() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes.
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return 0;
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string|null
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ICollection.php b/3rdparty/Sabre/DAV/ICollection.php
new file mode 100755
index 0000000000..4626038a66
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ICollection.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * The ICollection Interface
+ *
+ * This interface should be implemented by each class that represents a collection
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    function createFile($name, $data = null);
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    function createDirectory($name);
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @return Sabre_DAV_INode
+     */
+    function getChild($name);
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre_DAV_INode[]
+     */
+    function getChildren();
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    function childExists($name);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IExtendedCollection.php b/3rdparty/Sabre/DAV/IExtendedCollection.php
new file mode 100755
index 0000000000..6ec345f9a6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IExtendedCollection.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * The IExtendedCollection interface.
+ *
+ * This interface can be used to create special-type of collection-resources
+ * as defined by RFC 5689.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new collection
+     *
+     * @param string $name
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    function createExtendedCollection($name, array $resourceType, array $properties);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IFile.php b/3rdparty/Sabre/DAV/IFile.php
new file mode 100755
index 0000000000..478f822ae7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IFile.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This interface represents a file in the directory tree
+ *
+ * A file is a bit of a broad definition. In general it implies that on
+ * this specific node a PUT or GET method may be performed, to either update,
+ * or retrieve the contents of the file.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IFile extends Sabre_DAV_INode {
+
+    /**
+     * Updates the data
+     *
+     * The data argument is a readable stream resource.
+     *
+     * After a succesful put operation, you may choose to return an ETag. The
+     * etag must always be surrounded by double-quotes. These quotes must
+     * appear in the actual string you're returning.
+     *
+     * Clients may use the ETag from a PUT request to later on make sure that
+     * when they update the file, the contents haven't changed in the mean
+     * time.
+     *
+     * If you don't plan to store the file byte-by-byte, and you return a
+     * different object on a subsequent GET you are strongly recommended to not
+     * return an ETag, and just return null.
+     *
+     * @param resource $data
+     * @return string|null
+     */
+    function put($data);
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    function get();
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return void
+     */
+    function getContentType();
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return void
+     */
+    function getETag();
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return int
+     */
+    function getSize();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/INode.php b/3rdparty/Sabre/DAV/INode.php
new file mode 100755
index 0000000000..c57d392310
--- /dev/null
+++ b/3rdparty/Sabre/DAV/INode.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * The INode interface is the base interface, and the parent class of both ICollection and IFile
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_INode {
+
+    /**
+     * Deleted the current node
+     *
+     * @return void
+     */
+    function delete();
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    function getName();
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    function setName($name);
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IProperties.php b/3rdparty/Sabre/DAV/IProperties.php
new file mode 100755
index 0000000000..38eaab16da
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IProperties.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * IProperties interface
+ *
+ * Implement this interface to support custom WebDAV properties requested and sent from clients.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existent property is always successful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname.
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations
+     * @return bool|array
+     */
+    function updateProperties($mutations);
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties
+     * @return void
+     */
+    function getProperties($properties);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IQuota.php b/3rdparty/Sabre/DAV/IQuota.php
new file mode 100755
index 0000000000..3fe4c4eced
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IQuota.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * IQuota interface
+ *
+ * Implement this interface to add the ability to return quota information. The ObjectTree
+ * will check for quota information on any given node. If the information is not available it will
+ * attempt to fetch the information from the root node.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
+
+    /**
+     * Returns the quota information
+     *
+     * This method MUST return an array with 2 values, the first being the total used space,
+     * the second the available space (in bytes)
+     */
+    function getQuotaInfo();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
new file mode 100755
index 0000000000..127e643a2b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This is an alternative approach to doing this on a per-node basis
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    abstract function getLocks($uri, $returnChildLocks);
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
new file mode 100755
index 0000000000..02cab87fc8
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * This Lock Backend stores all its data in the filesystem in separate file per
+ * node.
+ *
+ * This Lock Manager is now deprecated. It has a bug that allows parent
+ * collections to be deletes when children deeper in the tree are locked.
+ *
+ * This also means that using this backend means you will not pass the Neon
+ * Litmus test.
+ *
+ * You are recommended to use either the PDO or the File backend instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The default data directory
+     *
+     * @var string
+     */
+    private $dataDir;
+
+    public function __construct($dataDir) {
+
+        $this->dataDir = $dataDir;
+
+    }
+
+    protected function getFileNameForUri($uri) {
+
+        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
+
+    }
+
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        $lockList = array();
+        $currentPath = '';
+
+        foreach(explode('/',$uri) as $uriPart) {
+
+            // weird algorithm that can probably be improved, but we're traversing the path top down
+            if ($currentPath) $currentPath.='/';
+            $currentPath.=$uriPart;
+
+            $uriLocks = $this->getData($currentPath);
+
+            foreach($uriLocks as $uriLock) {
+
+                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
+                if($uri==$currentPath || $uriLock->depth!=0) {
+                    $uriLock->uri = $currentPath;
+                    $lockList[] = $uriLock;
+                }
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($lockList as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]);
+        }
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) unset($locks[$k]);
+        }
+        $locks[] = $lockInfo;
+        $this->putData($uri,$locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($uri,$locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns the stored data for a uri
+     *
+     * @param string $uri
+     * @return array
+     */
+    protected function getData($uri) {
+
+        $path = $this->getFilenameForUri($uri);
+        if (!file_exists($path)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the lock information
+     *
+     * @param string $uri
+     * @param array $newData
+     * @return void
+     */
+    protected function putData($uri,array $newData) {
+
+        $path = $this->getFileNameForUri($uri);
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php
new file mode 100755
index 0000000000..c33f963514
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/File.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a single file.
+ *
+ * Note that this is not nearly as robust as a database, you are encouraged
+ * to use the PDO backend instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The storage file
+     *
+     * @var string
+     */
+    private $locksFile;
+
+    /**
+     * Constructor
+     *
+     * @param string $locksFile path to file
+     */
+    public function __construct($locksFile) {
+
+        $this->locksFile = $locksFile;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        $newLocks = array();
+
+        $locks = $this->getData();
+
+        foreach($locks as $lock) {
+
+            if ($lock->uri === $uri ||
+                //deep locks on parents
+                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
+
+                // locks on children
+                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
+
+                $newLocks[] = $lock;
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($newLocks as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
+        }
+        return $newLocks;
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getData();
+
+        foreach($locks as $k=>$lock) {
+            if (
+                ($lock->token == $lockInfo->token) ||
+                (time() > $lock->timeout + $lock->created)
+            ) {
+                unset($locks[$k]);
+            }
+        }
+        $locks[] = $lockInfo;
+        $this->putData($locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getData();
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Loads the lockdata from the filesystem.
+     *
+     * @return array
+     */
+    protected function getData() {
+
+        if (!file_exists($this->locksFile)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($this->locksFile,'r');
+        flock($handle,LOCK_SH);
+
+        // Reading data until the eof
+        $data = stream_get_contents($handle);
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Saves the lockdata
+     *
+     * @param array $newData
+     * @return void
+     */
+    protected function putData(array $newData) {
+
+        // opening up the file, and creating an exclusive lock
+        $handle = fopen($this->locksFile,'a+');
+        flock($handle,LOCK_EX);
+
+        // We can only truncate and rewind once the lock is acquired.
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
new file mode 100755
index 0000000000..acce80638e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a database. You must pass a PDO
+ * connection object in the constructor.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The PDO connection object
+     *
+     * @var pdo
+     */
+    private $pdo;
+
+    /**
+     * The PDO tablename this backend uses.
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * Constructor
+     *
+     * @param PDO $pdo
+     * @param string $tableName
+     */
+    public function __construct(PDO $pdo, $tableName = 'locks') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects
+     *
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        // NOTE: the following 10 lines or so could be easily replaced by
+        // pure sql. MySQL's non-standard string concatenation prevents us
+        // from doing this though.
+        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM '.$this->tableName.' WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
+        $params = array(time(),$uri);
+
+        // We need to check locks for every part in the uri.
+        $uriParts = explode('/',$uri);
+
+        // We already covered the last part of the uri
+        array_pop($uriParts);
+
+        $currentPath='';
+
+        foreach($uriParts as $part) {
+
+            if ($currentPath) $currentPath.='/';
+            $currentPath.=$part;
+
+            $query.=' OR (depth!=0 AND uri = ?)';
+            $params[] = $currentPath;
+
+        }
+
+        if ($returnChildLocks) {
+
+            $query.=' OR (uri LIKE ?)';
+            $params[] = $uri . '/%';
+
+        }
+        $query.=')';
+
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($params);
+        $result = $stmt->fetchAll();
+
+        $lockList = array();
+        foreach($result as $row) {
+
+            $lockInfo = new Sabre_DAV_Locks_LockInfo();
+            $lockInfo->owner = $row['owner'];
+            $lockInfo->token = $row['token'];
+            $lockInfo->timeout = $row['timeout'];
+            $lockInfo->created = $row['created'];
+            $lockInfo->scope = $row['scope'];
+            $lockInfo->depth = $row['depth'];
+            $lockInfo->uri   = $row['uri'];
+            $lockList[] = $lockInfo;
+
+        }
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 30*60;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getLocks($uri,false);
+        $exists = false;
+        foreach($locks as $lock) {
+            if ($lock->token == $lockInfo->token) $exists = true;
+        }
+
+        if ($exists) {
+            $stmt = $this->pdo->prepare('UPDATE '.$this->tableName.' SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        } else {
+            $stmt = $this->pdo->prepare('INSERT INTO '.$this->tableName.' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        }
+
+        return true;
+
+    }
+
+
+
+    /**
+     * Removes a lock from a uri
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->tableName.' WHERE uri = ? AND token = ?');
+        $stmt->execute(array($uri,$lockInfo->token));
+
+        return $stmt->rowCount()===1;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php
new file mode 100755
index 0000000000..9df014a428
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/LockInfo.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * LockInfo class
+ *
+ * An object of the LockInfo class holds all the information relevant to a
+ * single lock.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_LockInfo {
+
+    /**
+     * A shared lock
+     */
+    const SHARED = 1;
+
+    /**
+     * An exclusive lock
+     */
+    const EXCLUSIVE = 2;
+
+    /**
+     * A never expiring timeout
+     */
+    const TIMEOUT_INFINITE = -1;
+
+    /**
+     * The owner of the lock
+     *
+     * @var string
+     */
+    public $owner;
+
+    /**
+     * The locktoken
+     *
+     * @var string
+     */
+    public $token;
+
+    /**
+     * How long till the lock is expiring
+     *
+     * @var int
+     */
+    public $timeout;
+
+    /**
+     * UNIX Timestamp of when this lock was created
+     *
+     * @var int
+     */
+    public $created;
+
+    /**
+     * Exclusive or shared lock
+     *
+     * @var int
+     */
+    public $scope = self::EXCLUSIVE;
+
+    /**
+     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
+     */
+    public $depth = 0;
+
+    /**
+     * The uri this lock locks
+     *
+     * TODO: This value is not always set
+     * @var mixed
+     */
+    public $uri;
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php
new file mode 100755
index 0000000000..035b3a6386
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Plugin.php
@@ -0,0 +1,636 @@
+<?php
+
+/**
+ * Locking plugin
+ *
+ * This plugin provides locking support to a WebDAV server.
+ * The easiest way to get started, is by hooking it up as such:
+ *
+ * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
+ * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
+ * $server->addPlugin($lockPlugin);
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * locksBackend
+     *
+     * @var Sabre_DAV_Locks_Backend_Abstract
+     */
+    private $locksBackend;
+
+    /**
+     * server
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * __construct
+     *
+     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend
+     */
+    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
+
+        $this->locksBackend = $locksBackend;
+
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * This method is automatically called by the Server class after addPlugin.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'locks';
+
+    }
+
+    /**
+     * This method is called by the Server if the user used an HTTP method
+     * the server didn't recognize.
+     *
+     * This plugin intercepts the LOCK and UNLOCK methods.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function unknownMethod($method, $uri) {
+
+        switch($method) {
+
+            case 'LOCK'   : $this->httpLock($uri); return false;
+            case 'UNLOCK' : $this->httpUnlock($uri); return false;
+
+        }
+
+    }
+
+    /**
+     * This method is called after most properties have been found
+     * it allows us to add in any Lock-related properties
+     *
+     * @param string $path
+     * @param array $newProperties
+     * @return bool
+     */
+    public function afterGetProperties($path, &$newProperties) {
+
+        foreach($newProperties[404] as $propName=>$discard) {
+
+            switch($propName) {
+
+                case '{DAV:}supportedlock' :
+                    $val = false;
+                    if ($this->locksBackend) $val = true;
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
+                    unset($newProperties[404][$propName]);
+                    break;
+
+                case '{DAV:}lockdiscovery' :
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
+                    unset($newProperties[404][$propName]);
+                    break;
+
+            }
+
+
+        }
+        return true;
+
+    }
+
+
+    /**
+     * This method is called before the logic for any HTTP method is
+     * handled.
+     *
+     * This plugin uses that feature to intercept access to locked resources.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        switch($method) {
+
+            case 'DELETE' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock, true))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MKCOL' :
+            case 'PROPPATCH' :
+            case 'PUT' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MOVE' :
+                $lastLock = null;
+                if (!$this->validateLock(array(
+                      $uri,
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                    ),$lastLock, true))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'COPY' :
+                $lastLock = null;
+                if (!$this->validateLock(
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                      $lastLock, true))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getHTTPMethods($uri) {
+
+        if ($this->locksBackend)
+            return array('LOCK','UNLOCK');
+
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the HTTP OPTIONS Dav: header.
+     *
+     * In this case this is only the number 2. The 2 in the Dav: header
+     * indicates the server supports locks.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array(2);
+
+    }
+
+    /**
+     * Returns all lock information on a particular uri
+     *
+     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
+     *
+     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
+     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
+     * for any possible locks and return those as well.
+     *
+     * @param string $uri
+     * @param bool $returnChildLocks
+     * @return array
+     */
+    public function getLocks($uri, $returnChildLocks = false) {
+
+        $lockList = array();
+
+        if ($this->locksBackend)
+            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks an uri
+     *
+     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
+     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
+     * of lock (shared or exclusive) and the owner of the lock
+     *
+     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
+     *
+     * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpLock($uri) {
+
+        $lastLock = null;
+        if (!$this->validateLock($uri,$lastLock)) {
+
+            // If the existing lock was an exclusive lock, we need to fail
+            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
+                //var_dump($lastLock);
+                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+            }
+
+        }
+
+        if ($body = $this->server->httpRequest->getBody(true)) {
+            // This is a new lock request
+            $lockInfo = $this->parseLockRequest($body);
+            $lockInfo->depth = $this->server->getHTTPDepth();
+            $lockInfo->uri = $uri;
+            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+
+        } elseif ($lastLock) {
+
+            // This must have been a lock refresh
+            $lockInfo = $lastLock;
+
+            // The resource could have been locked through another uri.
+            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
+
+        } else {
+
+            // There was neither a lock refresh nor a new lock request
+            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
+
+        }
+
+        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
+
+        $newFile = false;
+
+        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
+        try {
+            $this->server->tree->getNodeForPath($uri);
+
+            // We need to call the beforeWriteContent event for RFC3744
+            // Edit: looks like this is not used, and causing problems now.
+            //
+            // See Issue 222
+            // $this->server->broadcastEvent('beforeWriteContent',array($uri));
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            // It didn't, lets create it
+            $this->server->createFile($uri,fopen('php://memory','r'));
+            $newFile = true;
+
+        }
+
+        $this->lockNode($uri,$lockInfo);
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
+        $this->server->httpResponse->sendStatus($newFile?201:200);
+        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
+     * The server should return 204 (No content) on success
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpUnlock($uri) {
+
+        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
+
+        // If the locktoken header is not supplied, we need to throw a bad request exception
+        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
+
+        $locks = $this->getLocks($uri);
+
+        // Windows sometimes forgets to include < and > in the Lock-Token
+        // header
+        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
+
+        foreach($locks as $lock) {
+
+            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
+
+                $this->unlockNode($uri,$lock);
+                $this->server->httpResponse->setHeader('Content-Length','0');
+                $this->server->httpResponse->sendStatus(204);
+                return;
+
+            }
+
+        }
+
+        // If we got here, it means the locktoken was invalid
+        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
+     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
+
+        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return bool
+     */
+    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
+        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
+
+    }
+
+
+    /**
+     * Returns the contents of the HTTP Timeout header.
+     *
+     * The method formats the header into an integer.
+     *
+     * @return int
+     */
+    public function getTimeoutHeader() {
+
+        $header = $this->server->httpRequest->getHeader('Timeout');
+
+        if ($header) {
+
+            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
+            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
+            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
+
+        } else {
+
+            $header = 0;
+
+        }
+
+        return $header;
+
+    }
+
+    /**
+     * Generates the response for successful LOCK requests
+     *
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo
+     * @return string
+     */
+    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+
+        $prop = $dom->createElementNS('DAV:','d:prop');
+        $dom->appendChild($prop);
+
+        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
+        $prop->appendChild($lockDiscovery);
+
+        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
+        $lockObj->serialize($this->server,$lockDiscovery);
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * validateLock should be called when a write operation is about to happen
+     * It will check if the requested url is locked, and see if the correct lock tokens are passed
+     *
+     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
+     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
+     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
+     * @return bool
+     */
+    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
+
+        if (is_null($urls)) {
+            $urls = array($this->server->getRequestUri());
+        } elseif (is_string($urls)) {
+            $urls = array($urls);
+        } elseif (!is_array($urls)) {
+            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
+        }
+
+        $conditions = $this->getIfConditions();
+
+        // We're going to loop through the urls and make sure all lock conditions are satisfied
+        foreach($urls as $url) {
+
+            $locks = $this->getLocks($url, $checkChildLocks);
+
+            // If there were no conditions, but there were locks, we fail
+            if (!$conditions && $locks) {
+                reset($locks);
+                $lastLock = current($locks);
+                return false;
+            }
+
+            // If there were no locks or conditions, we go to the next url
+            if (!$locks && !$conditions) continue;
+
+            foreach($conditions as $condition) {
+
+                if (!$condition['uri']) {
+                    $conditionUri = $this->server->getRequestUri();
+                } else {
+                    $conditionUri = $this->server->calculateUri($condition['uri']);
+                }
+
+                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
+                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
+
+                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
+                // At least 1 condition has to be satisfied
+                foreach($condition['tokens'] as $conditionToken) {
+
+                    $etagValid = true;
+                    $lockValid  = true;
+
+                    // key 2 can contain an etag
+                    if ($conditionToken[2]) {
+
+                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
+                        $node = $this->server->tree->getNodeForPath($uri);
+                        $etagValid = $node->getETag()==$conditionToken[2];
+
+                    }
+
+                    // key 1 can contain a lock token
+                    if ($conditionToken[1]) {
+
+                        $lockValid = false;
+                        // Match all the locks
+                        foreach($locks as $lockIndex=>$lock) {
+
+                            $lockToken = 'opaquelocktoken:' . $lock->token;
+
+                            // Checking NOT
+                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
+
+                                // Condition valid, onto the next
+                                $lockValid = true;
+                                break;
+                            }
+                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
+
+                                $lastLock = $lock;
+                                // Condition valid and lock matched
+                                unset($locks[$lockIndex]);
+                                $lockValid = true;
+                                break;
+
+                            }
+
+                        }
+
+                    }
+
+                    // If, after checking both etags and locks they are stil valid,
+                    // we can continue with the next condition.
+                    if ($etagValid && $lockValid) continue 2;
+               }
+               // No conditions matched, so we fail
+               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
+            }
+
+            // Conditions were met, we'll also need to check if all the locks are gone
+            if (count($locks)) {
+
+                reset($locks);
+
+                // There's still locks, we fail
+                $lastLock = current($locks);
+                return false;
+
+            }
+
+
+        }
+
+        // We got here, this means every condition was satisfied
+        return true;
+
+    }
+
+    /**
+     * This method is created to extract information from the WebDAV HTTP 'If:' header
+     *
+     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
+     * The function will return an array, containing structs with the following keys
+     *
+     *   * uri   - the uri the condition applies to. If this is returned as an
+     *     empty string, this implies it's referring to the request url.
+     *   * tokens - The lock token. another 2 dimensional array containing 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
+     *   * etag - an etag, if supplied
+     *
+     * @return array
+     */
+    public function getIfConditions() {
+
+        $header = $this->server->httpRequest->getHeader('If');
+        if (!$header) return array();
+
+        $matches = array();
+
+        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
+        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
+
+        $conditions = array();
+
+        foreach($matches as $match) {
+
+            $condition = array(
+                'uri'   => $match['uri'],
+                'tokens' => array(
+                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
+                ),
+            );
+
+            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
+                $match['not']?0:1,
+                $match['token'],
+                isset($match['etag'])?$match['etag']:''
+            );
+            else {
+                $conditions[] = $condition;
+            }
+
+        }
+
+        return $conditions;
+
+    }
+
+    /**
+     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object
+     *
+     * @param string $body
+     * @return Sabre_DAV_Locks_LockInfo
+     */
+    protected function parseLockRequest($body) {
+
+        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
+        $xml->registerXPathNamespace('d','DAV:');
+        $lockInfo = new Sabre_DAV_Locks_LockInfo();
+
+        $children = $xml->children("DAV:");
+        $lockInfo->owner = (string)$children->owner;
+
+        $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
+        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
+
+        return $lockInfo;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Mount/Plugin.php b/3rdparty/Sabre/DAV/Mount/Plugin.php
new file mode 100755
index 0000000000..b37a90ae99
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Mount/Plugin.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * This plugin provides support for RFC4709: Mounting WebDAV servers
+ *
+ * Simply append ?mount to any collection to generate the davmount response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ */
+class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handles
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?mount
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='mount') return;
+
+        $currentUri = $this->server->httpRequest->getAbsoluteUri();
+
+        // Stripping off everything after the ?
+        list($currentUri) = explode('?',$currentUri);
+
+        $this->davMount($currentUri);
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Generates the davmount response
+     *
+     * @param string $uri absolute uri
+     * @return void
+     */
+    public function davMount($uri) {
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
+        ob_start();
+        echo '<?xml version="1.0"?>', "\n";
+        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
+        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
+        echo "</dm:mount>";
+        $this->server->httpResponse->sendBody(ob_get_clean());
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Node.php b/3rdparty/Sabre/DAV/Node.php
new file mode 100755
index 0000000000..070b7176af
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Node.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Node class
+ *
+ * This is a helper class, that should aid in getting nodes setup.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
+
+    /**
+     * Returns the last modification time
+     *
+     * In this case, it will simply return the current time
+     *
+     * @return int
+     */
+    public function getLastModified() {
+
+        return time();
+
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ObjectTree.php b/3rdparty/Sabre/DAV/ObjectTree.php
new file mode 100755
index 0000000000..bce5146390
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ObjectTree.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * ObjectTree class
+ *
+ * This implementation of the Tree class makes use of the INode, IFile and ICollection API's
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
+
+    /**
+     * The root node
+     *
+     * @var Sabre_DAV_ICollection
+     */
+    protected $rootNode;
+
+    /**
+     * This is the node cache. Accessed nodes are stored here
+     *
+     * @var array
+     */
+    protected $cache = array();
+
+    /**
+     * Creates the object
+     *
+     * This method expects the rootObject to be passed as a parameter
+     *
+     * @param Sabre_DAV_ICollection $rootNode
+     */
+    public function __construct(Sabre_DAV_ICollection $rootNode) {
+
+        $this->rootNode = $rootNode;
+
+    }
+
+    /**
+     * Returns the INode object for the requested path
+     *
+     * @param string $path
+     * @return Sabre_DAV_INode
+     */
+    public function getNodeForPath($path) {
+
+        $path = trim($path,'/');
+        if (isset($this->cache[$path])) return $this->cache[$path];
+
+        //if (!$path || $path=='.') return $this->rootNode;
+        $currentNode = $this->rootNode;
+
+        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node..
+        foreach(explode('/',$path) as $pathPart) {
+
+            // If this part of the path is just a dot, it actually means we can skip it
+            if ($pathPart=='.' || $pathPart=='') continue;
+
+            if (!($currentNode instanceof Sabre_DAV_ICollection))
+                throw new Sabre_DAV_Exception_NotFound('Could not find node at path: ' . $path);
+
+            $currentNode = $currentNode->getChild($pathPart);
+
+        }
+
+        $this->cache[$path] = $currentNode;
+        return $currentNode;
+
+    }
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            // The root always exists
+            if ($path==='') return true;
+
+            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
+
+            $parentNode = $this->getNodeForPath($parent);
+            if (!$parentNode instanceof Sabre_DAV_ICollection) return false;
+            return $parentNode->childExists($base);
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        $children = $node->getChildren();
+        foreach($children as $child) {
+
+            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
+
+        }
+        return $children;
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes
+     *
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     *
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path
+     * @return void
+     */
+    public function markDirty($path) {
+
+        // We don't care enough about sub-paths
+        // flushing the entire cache
+        $path = trim($path,'/');
+        foreach($this->cache as $nodePath=>$node) {
+            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
+                unset($this->cache[$nodePath]);
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property.php b/3rdparty/Sabre/DAV/Property.php
new file mode 100755
index 0000000000..1cfada3236
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Abstract property class
+ *
+ * Extend this class to create custom complex properties
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Property {
+
+    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop);
+
+    static function unserialize(DOMElement $prop) {
+
+        throw new Sabre_DAV_Exception('Unserialize has not been implemented for this class');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/GetLastModified.php b/3rdparty/Sabre/DAV/Property/GetLastModified.php
new file mode 100755
index 0000000000..bd63f57314
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/GetLastModified.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This property represents the {DAV:}getlastmodified property.
+ *
+ * Although this is normally a simple property, windows requires us to add
+ * some new attributes.
+ *
+ * This class uses unix timestamps internally, and converts them to RFC 1123 times for
+ * serialization
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
+
+    /**
+     * time
+     *
+     * @var int
+     */
+    public $time;
+
+    /**
+     * __construct
+     *
+     * @param int|DateTime $time
+     */
+    public function __construct($time) {
+
+        if ($time instanceof DateTime) {
+            $this->time = $time;
+        } elseif (is_int($time) || ctype_digit($time)) {
+            $this->time = new DateTime('@' . $time);
+        } else {
+            $this->time = new DateTime($time);
+        }
+
+        // Setting timezone to UTC
+        $this->time->setTimezone(new DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement       $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
+        $prop->setAttribute('b:dt','dateTime.rfc1123');
+        $prop->nodeValue = Sabre_HTTP_Util::toHTTPDate($this->time);
+
+    }
+
+    /**
+     * getTime
+     *
+     * @return DateTime
+     */
+    public function getTime() {
+
+        return $this->time;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/Href.php b/3rdparty/Sabre/DAV/Property/Href.php
new file mode 100755
index 0000000000..dac564f24d
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/Href.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Href property
+ *
+ * The href property represents a url within a {DAV:}href element.
+ * This is used by many WebDAV extensions, but not really within the WebDAV core spec
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * href
+     *
+     * @var string
+     */
+    private $href;
+
+    /**
+     * Automatically prefix the url with the server base directory
+     *
+     * @var bool
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct
+     *
+     * @param string $href
+     * @param bool $autoPrefix
+     */
+    public function __construct($href, $autoPrefix = true) {
+
+        $this->href = $href;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uri
+     *
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        $elem = $dom->ownerDocument->createElement($prefix . ':href');
+        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
+        $dom->appendChild($elem);
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_Href
+     */
+    static function unserialize(DOMElement $dom) {
+
+        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
+            return new self($dom->firstChild->textContent,false);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/HrefList.php b/3rdparty/Sabre/DAV/Property/HrefList.php
new file mode 100755
index 0000000000..7a52272e88
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/HrefList.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * HrefList property
+ *
+ * This property contains multiple {DAV:}href elements, each containing a url.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
+
+    /**
+     * hrefs
+     *
+     * @var array
+     */
+    private $hrefs;
+
+    /**
+     * Automatically prefix the url with the server base directory
+     *
+     * @var bool
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct
+     *
+     * @param array $hrefs
+     * @param bool $autoPrefix
+     */
+    public function __construct(array $hrefs, $autoPrefix = true) {
+
+        $this->hrefs = $hrefs;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uris
+     *
+     * @return array
+     */
+    public function getHrefs() {
+
+        return $this->hrefs;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        foreach($this->hrefs as $href) {
+            $elem = $dom->ownerDocument->createElement($prefix . ':href');
+            $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $href;
+            $dom->appendChild($elem);
+        }
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_Href
+     */
+    static function unserialize(DOMElement $dom) {
+
+        $hrefs = array();
+        foreach($dom->childNodes as $child) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($child)==='{DAV:}href') {
+                $hrefs[] = $child->textContent;
+            }
+        }
+        return new self($hrefs, false);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php
new file mode 100755
index 0000000000..5c0409064c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/IHref.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * IHref interface
+ *
+ * Any property implementing this interface can expose a related url.
+ * This is used by certain subsystems to aquire more information about for example
+ * the owner of a file
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Property_IHref {
+
+    /**
+     * getHref
+     *
+     * @return string
+     */
+    function getHref();
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/LockDiscovery.php b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
new file mode 100755
index 0000000000..2ded5649a4
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Represents {DAV:}lockdiscovery property
+ *
+ * This property contains all the open locks on a given resource
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
+
+    /**
+     * locks
+     *
+     * @var array
+     */
+    public $locks;
+
+    /**
+     * Should we show the locktoken as well?
+     *
+     * @var bool
+     */
+    public $revealLockToken;
+
+    /**
+     * Hides the {DAV:}lockroot element from the response.
+     *
+     * It was reported that showing the lockroot in the response can break
+     * Office 2000 compatibility.
+     */
+    static public $hideLockRoot = false;
+
+    /**
+     * __construct
+     *
+     * @param array $locks
+     * @param bool $revealLockToken
+     */
+    public function __construct($locks, $revealLockToken = false) {
+
+        $this->locks = $locks;
+        $this->revealLockToken = $revealLockToken;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement       $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        foreach($this->locks as $lock) {
+
+            $activeLock = $doc->createElementNS('DAV:','d:activelock');
+            $prop->appendChild($activeLock);
+
+            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
+            $activeLock->appendChild($lockScope);
+
+            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
+
+            $lockType = $doc->createElementNS('DAV:','d:locktype');
+            $activeLock->appendChild($lockType);
+
+            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
+
+            /* {DAV:}lockroot */
+            if (!self::$hideLockRoot) {
+                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
+                $activeLock->appendChild($lockRoot);
+                $href = $doc->createElementNS('DAV:','d:href');
+                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
+                $lockRoot->appendChild($href);
+            }
+
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
+
+            if ($this->revealLockToken) {
+                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
+                $activeLock->appendChild($lockToken);
+                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
+            }
+
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/ResourceType.php b/3rdparty/Sabre/DAV/Property/ResourceType.php
new file mode 100755
index 0000000000..f6269611e5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/ResourceType.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * This class represents the {DAV:}resourcetype property
+ *
+ * Normally for files this is empty, and for collection {DAV:}collection.
+ * However, other specs define different values for this.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
+
+    /**
+     * resourceType
+     *
+     * @var array
+     */
+    public $resourceType = array();
+
+    /**
+     * __construct
+     *
+     * @param mixed $resourceType
+     */
+    public function __construct($resourceType = array()) {
+
+        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
+            $this->resourceType = array();
+        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
+            $this->resourceType = array('{DAV:}collection');
+        elseif (is_array($resourceType))
+            $this->resourceType = $resourceType;
+        else
+            $this->resourceType = array($resourceType);
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $propName = null;
+        $rt = $this->resourceType;
+
+        foreach($rt as $resourceType) {
+            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) {
+
+                if (isset($server->xmlNamespaces[$propName[1]])) {
+                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
+                } else {
+                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
+                }
+
+            }
+        }
+
+    }
+
+    /**
+     * Returns the values in clark-notation
+     *
+     * For example array('{DAV:}collection')
+     *
+     * @return array
+     */
+    public function getValue() {
+
+        return $this->resourceType;
+
+    }
+
+    /**
+     * Checks if the principal contains a certain value
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function is($type) {
+
+        return in_array($type, $this->resourceType);
+
+    }
+
+    /**
+     * Adds a resourcetype value to this property
+     *
+     * @param string $type
+     * @return void
+     */
+    public function add($type) {
+
+        $this->resourceType[] = $type;
+        $this->resourceType = array_unique($this->resourceType);
+
+    }
+
+    /**
+     * Unserializes a DOM element into a ResourceType property.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_ResourceType
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $value = array();
+        foreach($dom->childNodes as $child) {
+
+            $value[] = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+        }
+
+        return new self($value);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/Response.php b/3rdparty/Sabre/DAV/Property/Response.php
new file mode 100755
index 0000000000..88afbcfb26
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/Response.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Response property
+ *
+ * This class represents the {DAV:}response XML element.
+ * This is used by the Server class to encode individual items within a multistatus
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * Url for the response
+     *
+     * @var string
+     */
+    private $href;
+
+    /**
+     * Propertylist, ordered by HTTP status code
+     *
+     * @var array
+     */
+    private $responseProperties;
+
+    /**
+     * The responseProperties argument is a list of properties
+     * within an array with keys representing HTTP status codes
+     *
+     * @param string $href
+     * @param array $responseProperties
+     */
+    public function __construct($href, array $responseProperties) {
+
+        $this->href = $href;
+        $this->responseProperties = $responseProperties;
+
+    }
+
+    /**
+     * Returns the url
+     *
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Returns the property list
+     *
+     * @return array
+     */
+    public function getResponseProperties() {
+
+        return $this->responseProperties;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $dom) {
+
+        $document = $dom->ownerDocument;
+        $properties = $this->responseProperties;
+
+        $xresponse = $document->createElement('d:response');
+        $dom->appendChild($xresponse);
+
+        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
+
+        // Adding the baseurl to the beginning of the url
+        $uri = $server->getBaseUri() . $uri;
+
+        $xresponse->appendChild($document->createElement('d:href',$uri));
+
+        // The properties variable is an array containing properties, grouped by
+        // HTTP status
+        foreach($properties as $httpStatus=>$propertyGroup) {
+
+            // The 'href' is also in this array, and it's special cased.
+            // We will ignore it
+            if ($httpStatus=='href') continue;
+
+            // If there are no properties in this group, we can also just carry on
+            if (!count($propertyGroup)) continue;
+
+            $xpropstat = $document->createElement('d:propstat');
+            $xresponse->appendChild($xpropstat);
+
+            $xprop = $document->createElement('d:prop');
+            $xpropstat->appendChild($xprop);
+
+            $nsList = $server->xmlNamespaces;
+
+            foreach($propertyGroup as $propertyName=>$propertyValue) {
+
+                $propName = null;
+                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+
+                // special case for empty namespaces
+                if ($propName[1]=='') {
+
+                    $currentProperty = $document->createElement($propName[2]);
+                    $xprop->appendChild($currentProperty);
+                    $currentProperty->setAttribute('xmlns','');
+
+                } else {
+
+                    if (!isset($nsList[$propName[1]])) {
+                        $nsList[$propName[1]] = 'x' . count($nsList);
+                    }
+
+                    // If the namespace was defined in the top-level xml namespaces, it means
+                    // there was already a namespace declaration, and we don't have to worry about it.
+                    if (isset($server->xmlNamespaces[$propName[1]])) {
+                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+                    } else {
+                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
+                    }
+                    $xprop->appendChild($currentProperty);
+
+                }
+
+                if (is_scalar($propertyValue)) {
+                    $text = $document->createTextNode($propertyValue);
+                    $currentProperty->appendChild($text);
+                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
+                    $propertyValue->serialize($server,$currentProperty);
+                } elseif (!is_null($propertyValue)) {
+                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
+                }
+
+            }
+
+            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/ResponseList.php b/3rdparty/Sabre/DAV/Property/ResponseList.php
new file mode 100755
index 0000000000..cae923afbf
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/ResponseList.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * ResponseList property
+ *
+ * This class represents multiple {DAV:}response XML elements.
+ * This is used by the Server class to encode items within a multistatus
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
+
+    /**
+     * Response objects.
+     *
+     * @var array
+     */
+    private $responses;
+
+    /**
+     * The only valid argument is a list of Sabre_DAV_Property_Response
+     * objects.
+     *
+     * @param array $responses;
+     */
+    public function __construct($responses) {
+
+        foreach($responses as $response) {
+            if (!($response instanceof Sabre_DAV_Property_Response)) {
+                throw new InvalidArgumentException('You must pass an array of Sabre_DAV_Property_Response objects');
+            }
+        }
+        $this->responses = $responses;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $dom
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        foreach($this->responses as $response) {
+            $response->serialize($server, $dom);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/SupportedLock.php b/3rdparty/Sabre/DAV/Property/SupportedLock.php
new file mode 100755
index 0000000000..4e3aaf23a1
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/SupportedLock.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This class represents the {DAV:}supportedlock property
+ *
+ * This property contains information about what kind of locks
+ * this server supports.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
+
+    /**
+     * supportsLocks
+     *
+     * @var mixed
+     */
+    public $supportsLocks = false;
+
+    /**
+     * __construct
+     *
+     * @param mixed $supportsLocks
+     */
+    public function __construct($supportsLocks) {
+
+        $this->supportsLocks = $supportsLocks;
+
+    }
+
+    /**
+     * serialize
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement       $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        if (!$this->supportsLocks) return null;
+
+        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
+        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
+
+        $prop->appendChild($lockEntry1);
+        $prop->appendChild($lockEntry2);
+
+        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
+        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
+
+        $lockEntry1->appendChild($lockScope1);
+        $lockEntry1->appendChild($lockType1);
+        $lockEntry2->appendChild($lockScope2);
+        $lockEntry2->appendChild($lockType2);
+
+        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
+        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
+
+        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
+        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
+
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
new file mode 100755
index 0000000000..e62699f3b5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * supported-report-set property.
+ *
+ * This property is defined in RFC3253, but since it's
+ * so common in other webdav-related specs, it is part of the core server.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
+
+    /**
+     * List of reports
+     *
+     * @var array
+     */
+    protected $reports = array();
+
+    /**
+     * Creates the property
+     *
+     * Any reports passed in the constructor
+     * should be valid report-types in clark-notation.
+     *
+     * Either a string or an array of strings must be passed.
+     *
+     * @param mixed $reports
+     */
+    public function __construct($reports = null) {
+
+        if (!is_null($reports))
+            $this->addReport($reports);
+
+    }
+
+    /**
+     * Adds a report to this property
+     *
+     * The report must be a string in clark-notation.
+     * Multiple reports can be specified as an array.
+     *
+     * @param mixed $report
+     * @return void
+     */
+    public function addReport($report) {
+
+        if (!is_array($report)) $report = array($report);
+
+        foreach($report as $r) {
+
+            if (!preg_match('/^{([^}]*)}(.*)$/',$r))
+                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
+
+            $this->reports[] = $r;
+
+        }
+
+    }
+
+    /**
+     * Returns the list of supported reports
+     *
+     * @return array
+     */
+    public function getValue() {
+
+        return $this->reports;
+
+    }
+
+    /**
+     * Serializes the node
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $prop
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        foreach($this->reports as $reportName) {
+
+            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
+            $prop->appendChild($supportedReport);
+
+            $report = $prop->ownerDocument->createElement('d:report');
+            $supportedReport->appendChild($report);
+
+            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
+
+            list(, $namespace, $element) = $matches;
+
+            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
+
+            if ($prefix) {
+                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
+            } else {
+                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
+            }
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
new file mode 100755
index 0000000000..0dfac8b0c7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Server.php
@@ -0,0 +1,2006 @@
+<?php
+
+/**
+ * Main DAV server class
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Server {
+
+    /**
+     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
+     */
+    const DEPTH_INFINITY = -1;
+
+    /**
+     * Nodes that are files, should have this as the type property
+     */
+    const NODE_FILE = 1;
+
+    /**
+     * Nodes that are directories, should use this value as the type property
+     */
+    const NODE_DIRECTORY = 2;
+
+    /**
+     * XML namespace for all SabreDAV related elements
+     */
+    const NS_SABREDAV = 'http://sabredav.org/ns';
+
+    /**
+     * The tree object
+     *
+     * @var Sabre_DAV_Tree
+     */
+    public $tree;
+
+    /**
+     * The base uri
+     *
+     * @var string
+     */
+    protected $baseUri = null;
+
+    /**
+     * httpResponse
+     *
+     * @var Sabre_HTTP_Response
+     */
+    public $httpResponse;
+
+    /**
+     * httpRequest
+     *
+     * @var Sabre_HTTP_Request
+     */
+    public $httpRequest;
+
+    /**
+     * The list of plugins
+     *
+     * @var array
+     */
+    protected $plugins = array();
+
+    /**
+     * This array contains a list of callbacks we should call when certain events are triggered
+     *
+     * @var array
+     */
+    protected $eventSubscriptions = array();
+
+    /**
+     * This is a default list of namespaces.
+     *
+     * If you are defining your own custom namespace, add it here to reduce
+     * bandwidth and improve legibility of xml bodies.
+     *
+     * @var array
+     */
+    public $xmlNamespaces = array(
+        'DAV:' => 'd',
+        'http://sabredav.org/ns' => 's',
+    );
+
+    /**
+     * The propertymap can be used to map properties from
+     * requests to property classes.
+     *
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}resourcetype' => 'Sabre_DAV_Property_ResourceType',
+    );
+
+    public $protectedProperties = array(
+        // RFC4918
+        '{DAV:}getcontentlength',
+        '{DAV:}getetag',
+        '{DAV:}getlastmodified',
+        '{DAV:}lockdiscovery',
+        '{DAV:}resourcetype',
+        '{DAV:}supportedlock',
+
+        // RFC4331
+        '{DAV:}quota-available-bytes',
+        '{DAV:}quota-used-bytes',
+
+        // RFC3744
+        '{DAV:}supported-privilege-set',
+        '{DAV:}current-user-privilege-set',
+        '{DAV:}acl',
+        '{DAV:}acl-restrictions',
+        '{DAV:}inherited-acl-set',
+
+    );
+
+    /**
+     * This is a flag that allow or not showing file, line and code
+     * of the exception in the returned XML
+     *
+     * @var bool
+     */
+    public $debugExceptions = false;
+
+    /**
+     * This property allows you to automatically add the 'resourcetype' value
+     * based on a node's classname or interface.
+     *
+     * The preset ensures that {DAV:}collection is automaticlly added for nodes
+     * implementing Sabre_DAV_ICollection.
+     *
+     * @var array
+     */
+    public $resourceTypeMapping = array(
+        'Sabre_DAV_ICollection' => '{DAV:}collection',
+    );
+
+    /**
+     * If this setting is turned off, SabreDAV's version number will be hidden
+     * from various places.
+     *
+     * Some people feel this is a good security measure.
+     *
+     * @var bool
+     */
+    static public $exposeVersion = true;
+
+    /**
+     * Sets up the server
+     *
+     * If a Sabre_DAV_Tree object is passed as an argument, it will
+     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
+     * will create a Sabre_DAV_ObjectTree and use the node as the root.
+     *
+     * If nothing is passed, a Sabre_DAV_SimpleCollection is created in
+     * a Sabre_DAV_ObjectTree.
+     *
+     * If an array is passed, we automatically create a root node, and use
+     * the nodes in the array as top-level children.
+     *
+     * @param Sabre_DAV_Tree|Sabre_DAV_INode|null $treeOrNode The tree object
+     */
+    public function __construct($treeOrNode = null) {
+
+        if ($treeOrNode instanceof Sabre_DAV_Tree) {
+            $this->tree = $treeOrNode;
+        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
+            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
+        } elseif (is_array($treeOrNode)) {
+
+            // If it's an array, a list of nodes was passed, and we need to
+            // create the root node.
+            foreach($treeOrNode as $node) {
+                if (!($node instanceof Sabre_DAV_INode)) {
+                    throw new Sabre_DAV_Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre_DAV_INode');
+                }
+            }
+
+            $root = new Sabre_DAV_SimpleCollection('root', $treeOrNode);
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+
+        } elseif (is_null($treeOrNode)) {
+            $root = new Sabre_DAV_SimpleCollection('root');
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+        } else {
+            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode, an array or null');
+        }
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Starts the DAV Server
+     *
+     * @return void
+     */
+    public function exec() {
+
+        try {
+
+            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
+
+        } catch (Exception $e) {
+
+            $DOM = new DOMDocument('1.0','utf-8');
+            $DOM->formatOutput = true;
+
+            $error = $DOM->createElementNS('DAV:','d:error');
+            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
+            $DOM->appendChild($error);
+
+            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
+            $error->appendChild($DOM->createElement('s:message',$e->getMessage()));
+            if ($this->debugExceptions) {
+                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
+                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
+                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
+                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
+
+            }
+            if (self::$exposeVersion) {
+                $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
+            }
+
+            if($e instanceof Sabre_DAV_Exception) {
+
+                $httpCode = $e->getHTTPCode();
+                $e->serialize($this,$error);
+                $headers = $e->getHTTPHeaders($this);
+
+            } else {
+
+                $httpCode = 500;
+                $headers = array();
+
+            }
+            $headers['Content-Type'] = 'application/xml; charset=utf-8';
+
+            $this->httpResponse->sendStatus($httpCode);
+            $this->httpResponse->setHeaders($headers);
+            $this->httpResponse->sendBody($DOM->saveXML());
+
+        }
+
+    }
+
+    /**
+     * Sets the base server uri
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function setBaseUri($uri) {
+
+        // If the baseUri does not end with a slash, we must add it
+        if ($uri[strlen($uri)-1]!=='/')
+            $uri.='/';
+
+        $this->baseUri = $uri;
+
+    }
+
+    /**
+     * Returns the base responding uri
+     *
+     * @return string
+     */
+    public function getBaseUri() {
+
+        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
+        return $this->baseUri;
+
+    }
+
+    /**
+     * This method attempts to detect the base uri.
+     * Only the PATH_INFO variable is considered.
+     *
+     * If this variable is not set, the root (/) is assumed.
+     *
+     * @return string
+     */
+    public function guessBaseUri() {
+
+        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
+        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
+
+        // If PATH_INFO is found, we can assume it's accurate.
+        if (!empty($pathInfo)) {
+
+            // We need to make sure we ignore the QUERY_STRING part
+            if ($pos = strpos($uri,'?'))
+                $uri = substr($uri,0,$pos);
+
+            // PATH_INFO is only set for urls, such as: /example.php/path
+            // in that case PATH_INFO contains '/path'.
+            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
+            // not, Therefore they are only comparable if we first decode
+            // REQUEST_INFO as well.
+            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
+
+            // A simple sanity check:
+            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
+                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
+                return rtrim($baseUri,'/') . '/';
+            }
+
+            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
+
+        }
+
+        // The last fallback is that we're just going to assume the server root.
+        return '/';
+
+    }
+
+    /**
+     * Adds a plugin to the server
+     *
+     * For more information, console the documentation of Sabre_DAV_ServerPlugin
+     *
+     * @param Sabre_DAV_ServerPlugin $plugin
+     * @return void
+     */
+    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
+
+        $this->plugins[$plugin->getPluginName()] = $plugin;
+        $plugin->initialize($this);
+
+    }
+
+    /**
+     * Returns an initialized plugin by it's name.
+     *
+     * This function returns null if the plugin was not found.
+     *
+     * @param string $name
+     * @return Sabre_DAV_ServerPlugin
+     */
+    public function getPlugin($name) {
+
+        if (isset($this->plugins[$name]))
+            return $this->plugins[$name];
+
+        // This is a fallback and deprecated.
+        foreach($this->plugins as $plugin) {
+            if (get_class($plugin)===$name) return $plugin;
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Returns all plugins
+     *
+     * @return array
+     */
+    public function getPlugins() {
+
+        return $this->plugins;
+
+    }
+
+
+    /**
+     * Subscribe to an event.
+     *
+     * When the event is triggered, we'll call all the specified callbacks.
+     * It is possible to control the order of the callbacks through the
+     * priority argument.
+     *
+     * This is for example used to make sure that the authentication plugin
+     * is triggered before anything else. If it's not needed to change this
+     * number, it is recommended to ommit.
+     *
+     * @param string $event
+     * @param callback $callback
+     * @param int $priority
+     * @return void
+     */
+    public function subscribeEvent($event, $callback, $priority = 100) {
+
+        if (!isset($this->eventSubscriptions[$event])) {
+            $this->eventSubscriptions[$event] = array();
+        }
+        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
+        $this->eventSubscriptions[$event][$priority] = $callback;
+        ksort($this->eventSubscriptions[$event]);
+
+    }
+
+    /**
+     * Broadcasts an event
+     *
+     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
+     *
+     * The arguments parameter will be sent to all subscribers
+     *
+     * @param string $eventName
+     * @param array $arguments
+     * @return bool
+     */
+    public function broadcastEvent($eventName,$arguments = array()) {
+
+        if (isset($this->eventSubscriptions[$eventName])) {
+
+            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
+
+                $result = call_user_func_array($subscriber,$arguments);
+                if ($result===false) return false;
+
+            }
+
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Handles a http request, and execute a method based on its name
+     *
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function invokeMethod($method, $uri) {
+
+        $method = strtoupper($method);
+
+        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
+
+        // Make sure this is a HTTP method we support
+        $internalMethods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'MKCOL',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        if (in_array($method,$internalMethods)) {
+
+            call_user_func(array($this,'http' . $method), $uri);
+
+        } else {
+
+            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
+                // Unsupported method
+                throw new Sabre_DAV_Exception_NotImplemented('There was no handler found for this "' . $method . '" method');
+            }
+
+        }
+
+    }
+
+    // {{{ HTTP Method implementations
+
+    /**
+     * HTTP OPTIONS
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpOptions($uri) {
+
+        $methods = $this->getAllowedMethods($uri);
+
+        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
+        $features = array('1','3', 'extended-mkcol');
+
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+        $this->httpResponse->setHeader('MS-Author-Via','DAV');
+        $this->httpResponse->setHeader('Accept-Ranges','bytes');
+        if (self::$exposeVersion) {
+            $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
+        }
+        $this->httpResponse->setHeader('Content-Length',0);
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP GET
+     *
+     * This method simply fetches the contents of a uri, like normal
+     *
+     * @param string $uri
+     * @return bool
+     */
+    protected function httpGet($uri) {
+
+        $node = $this->tree->getNodeForPath($uri,0);
+
+        if (!$this->checkPreconditions(true)) return false;
+
+        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
+        $body = $node->get();
+
+        // Converting string into stream, if needed.
+        if (is_string($body)) {
+            $stream = fopen('php://temp','r+');
+            fwrite($stream,$body);
+            rewind($stream);
+            $body = $stream;
+        }
+
+        /*
+         * TODO: getetag, getlastmodified, getsize should also be used using
+         * this method
+         */
+        $httpHeaders = $this->getHTTPHeaders($uri);
+
+        /* ContentType needs to get a default, because many webservers will otherwise
+         * default to text/html, and we don't want this for security reasons.
+         */
+        if (!isset($httpHeaders['Content-Type'])) {
+            $httpHeaders['Content-Type'] = 'application/octet-stream';
+        }
+
+
+        if (isset($httpHeaders['Content-Length'])) {
+
+            $nodeSize = $httpHeaders['Content-Length'];
+
+            // Need to unset Content-Length, because we'll handle that during figuring out the range
+            unset($httpHeaders['Content-Length']);
+
+        } else {
+            $nodeSize = null;
+        }
+
+        $this->httpResponse->setHeaders($httpHeaders);
+
+        $range = $this->getHTTPRange();
+        $ifRange = $this->httpRequest->getHeader('If-Range');
+        $ignoreRangeHeader = false;
+
+        // If ifRange is set, and range is specified, we first need to check
+        // the precondition.
+        if ($nodeSize && $range && $ifRange) {
+
+            // if IfRange is parsable as a date we'll treat it as a DateTime
+            // otherwise, we must treat it as an etag.
+            try {
+                $ifRangeDate = new DateTime($ifRange);
+
+                // It's a date. We must check if the entity is modified since
+                // the specified date.
+                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
+                else {
+                    $modified = new DateTime($httpHeaders['Last-Modified']);
+                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
+                }
+
+            } catch (Exception $e) {
+
+                // It's an entity. We can do a simple comparison.
+                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
+                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
+            }
+        }
+
+        // We're only going to support HTTP ranges if the backend provided a filesize
+        if (!$ignoreRangeHeader && $nodeSize && $range) {
+
+            // Determining the exact byte offsets
+            if (!is_null($range[0])) {
+
+                $start = $range[0];
+                $end = $range[1]?$range[1]:$nodeSize-1;
+                if($start >= $nodeSize)
+                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+
+                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+                if($end >= $nodeSize) $end = $nodeSize-1;
+
+            } else {
+
+                $start = $nodeSize-$range[1];
+                $end  = $nodeSize-1;
+
+                if ($start<0) $start = 0;
+
+            }
+
+            // New read/write stream
+            $newStream = fopen('php://temp','r+');
+
+            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
+            rewind($newStream);
+
+            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
+            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
+            $this->httpResponse->sendStatus(206);
+            $this->httpResponse->sendBody($newStream);
+
+
+        } else {
+
+            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
+            $this->httpResponse->sendStatus(200);
+            $this->httpResponse->sendBody($body);
+
+        }
+
+    }
+
+    /**
+     * HTTP HEAD
+     *
+     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
+     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpHead($uri) {
+
+        $node = $this->tree->getNodeForPath($uri);
+        /* This information is only collection for File objects.
+         * Ideally we want to throw 405 Method Not Allowed for every
+         * non-file, but MS Office does not like this
+         */
+        if ($node instanceof Sabre_DAV_IFile) {
+            $headers = $this->getHTTPHeaders($this->getRequestUri());
+            if (!isset($headers['Content-Type'])) {
+                $headers['Content-Type'] = 'application/octet-stream';
+            }
+            $this->httpResponse->setHeaders($headers);
+        }
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP Delete
+     *
+     * The HTTP delete method, deletes a given uri
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpDelete($uri) {
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+        $this->tree->delete($uri);
+        $this->broadcastEvent('afterUnbind',array($uri));
+
+        $this->httpResponse->sendStatus(204);
+        $this->httpResponse->setHeader('Content-Length','0');
+
+    }
+
+
+    /**
+     * WebDAV PROPFIND
+     *
+     * This WebDAV method requests information about an uri resource, or a list of resources
+     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
+     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
+     *
+     * The request body contains an XML data structure that has a list of properties the client understands
+     * The response body is also an xml document, containing information about every uri resource and the requested properties
+     *
+     * It has to return a HTTP 207 Multi-status status code
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropfind($uri) {
+
+        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
+        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
+
+        $depth = $this->getHTTPDepth(1);
+        // The only two options for the depth of a propfind is 0 or 1
+        if ($depth!=0) $depth = 1;
+
+        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
+
+        // This is a multi-status response
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        // Normally this header is only needed for OPTIONS responses, however..
+        // iCal seems to also depend on these being set for PROPFIND. Since
+        // this is not harmful, we'll add it.
+        $features = array('1','3', 'extended-mkcol');
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+
+        $data = $this->generateMultiStatus($newProperties);
+        $this->httpResponse->sendBody($data);
+
+    }
+
+    /**
+     * WebDAV PROPPATCH
+     *
+     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
+     * In this XML body it is specified which properties should be set/updated and/or deleted
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropPatch($uri) {
+
+        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
+
+        $result = $this->updateProperties($uri, $newProperties);
+
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $this->httpResponse->sendBody(
+            $this->generateMultiStatus(array($result))
+        );
+
+    }
+
+    /**
+     * HTTP PUT method
+     *
+     * This HTTP method updates a file, or creates a new one.
+     *
+     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
+     *
+     * @param string $uri
+     * @return bool
+     */
+    protected function httpPut($uri) {
+
+        $body = $this->httpRequest->getBody();
+
+        // Intercepting Content-Range
+        if ($this->httpRequest->getHeader('Content-Range')) {
+            /**
+            Content-Range is dangerous for PUT requests:  PUT per definition
+            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
+            in section 7.6:
+              An origin server SHOULD reject any PUT request that contains a
+              Content-Range header field, since it might be misinterpreted as
+              partial content (or might be partial content that is being mistakenly
+              PUT as a full representation).  Partial content updates are possible
+              by targeting a separately identified resource with state that
+              overlaps a portion of the larger resource, or by using a different
+              method that has been specifically defined for partial updates (for
+              example, the PATCH method defined in [RFC5789]).
+            This clarifies RFC2616 section 9.6:
+              The recipient of the entity MUST NOT ignore any Content-*
+              (e.g. Content-Range) headers that it does not understand or implement
+              and MUST return a 501 (Not Implemented) response in such cases.
+            OTOH is a PUT request with a Content-Range currently the only way to
+            continue an aborted upload request and is supported by curl, mod_dav,
+            Tomcat and others.  Since some clients do use this feature which results
+            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
+            all PUT requests with a Content-Range for now.
+            */
+
+            throw new Sabre_DAV_Exception_NotImplemented('PUT with Content-Range is not allowed.');
+        }
+
+        // Intercepting the Finder problem
+        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
+
+            /**
+            Many webservers will not cooperate well with Finder PUT requests,
+            because it uses 'Chunked' transfer encoding for the request body.
+
+            The symptom of this problem is that Finder sends files to the
+            server, but they arrive as 0-length files in PHP.
+
+            If we don't do anything, the user might think they are uploading
+            files successfully, but they end up empty on the server. Instead,
+            we throw back an error if we detect this.
+
+            The reason Finder uses Chunked, is because it thinks the files
+            might change as it's being uploaded, and therefore the
+            Content-Length can vary.
+
+            Instead it sends the X-Expected-Entity-Length header with the size
+            of the file at the very start of the request. If this header is set,
+            but we don't get a request body we will fail the request to
+            protect the end-user.
+            */
+
+            // Only reading first byte
+            $firstByte = fread($body,1);
+            if (strlen($firstByte)!==1) {
+                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
+            }
+
+            // The body needs to stay intact, so we copy everything to a
+            // temporary stream.
+
+            $newBody = fopen('php://temp','r+');
+            fwrite($newBody,$firstByte);
+            stream_copy_to_stream($body, $newBody);
+            rewind($newBody);
+
+            $body = $newBody;
+
+        }
+
+        if ($this->tree->nodeExists($uri)) {
+
+            $node = $this->tree->getNodeForPath($uri);
+
+            // Checking If-None-Match and related headers.
+            if (!$this->checkPreconditions()) return;
+
+            // If the node is a collection, we'll deny it
+            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
+            if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false;
+
+            $etag = $node->put($body);
+
+            $this->broadcastEvent('afterWriteContent',array($uri, $node));
+
+            $this->httpResponse->setHeader('Content-Length','0');
+            if ($etag) $this->httpResponse->setHeader('ETag',$etag);
+            $this->httpResponse->sendStatus(204);
+
+        } else {
+
+            $etag = null;
+            // If we got here, the resource didn't exist yet.
+            if (!$this->createFile($this->getRequestUri(),$body,$etag)) {
+                // For one reason or another the file was not created.
+                return;
+            }
+
+            $this->httpResponse->setHeader('Content-Length','0');
+            if ($etag) $this->httpResponse->setHeader('ETag', $etag);
+            $this->httpResponse->sendStatus(201);
+
+        }
+
+    }
+
+
+    /**
+     * WebDAV MKCOL
+     *
+     * The MKCOL method is used to create a new collection (directory) on the server
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMkcol($uri) {
+
+        $requestBody = $this->httpRequest->getBody(true);
+
+        if ($requestBody) {
+
+            $contentType = $this->httpRequest->getHeader('Content-Type');
+            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
+
+                // We must throw 415 for unsupported mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
+
+            }
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
+            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
+
+                // We must throw 415 for unsupported mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
+
+            }
+
+            $properties = array();
+            foreach($dom->firstChild->childNodes as $childNode) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
+                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
+
+            }
+            if (!isset($properties['{DAV:}resourcetype']))
+                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+
+            $resourceType = $properties['{DAV:}resourcetype']->getValue();
+            unset($properties['{DAV:}resourcetype']);
+
+        } else {
+
+            $properties = array();
+            $resourceType = array('{DAV:}collection');
+
+        }
+
+        $result = $this->createCollection($uri, $resourceType, $properties);
+
+        if (is_array($result)) {
+            $this->httpResponse->sendStatus(207);
+            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+            $this->httpResponse->sendBody(
+                $this->generateMultiStatus(array($result))
+            );
+
+        } else {
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(201);
+        }
+
+    }
+
+    /**
+     * WebDAV HTTP MOVE method
+     *
+     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMove($uri) {
+
+        $moveInfo = $this->getCopyAndMoveInfo();
+
+        // If the destination is part of the source tree, we must fail
+        if ($moveInfo['destination']==$uri)
+            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
+
+        if ($moveInfo['destinationExists']) {
+
+            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
+            $this->tree->delete($moveInfo['destination']);
+            $this->broadcastEvent('afterUnbind',array($moveInfo['destination']));
+
+        }
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
+        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
+        $this->tree->move($uri,$moveInfo['destination']);
+        $this->broadcastEvent('afterUnbind',array($uri));
+        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
+
+    }
+
+    /**
+     * WebDAV HTTP COPY method
+     *
+     * This method copies one uri to a different uri, and works much like the MOVE request
+     * A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return bool
+     */
+    protected function httpCopy($uri) {
+
+        $copyInfo = $this->getCopyAndMoveInfo();
+        // If the destination is part of the source tree, we must fail
+        if ($copyInfo['destination']==$uri)
+            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
+
+        if ($copyInfo['destinationExists']) {
+            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
+            $this->tree->delete($copyInfo['destination']);
+
+        }
+        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
+        $this->tree->copy($uri,$copyInfo['destination']);
+        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
+
+    }
+
+
+
+    /**
+     * HTTP REPORT method implementation
+     *
+     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
+     * It's used in a lot of extensions, so it made sense to implement it into the core.
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpReport($uri) {
+
+        $body = $this->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
+
+        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
+
+            // If broadcastEvent returned true, it means the report was not supported
+            throw new Sabre_DAV_Exception_ReportNotImplemented();
+
+        }
+
+    }
+
+    // }}}
+    // {{{ HTTP/WebDAV protocol helpers
+
+    /**
+     * Returns an array with all the supported HTTP methods for a specific uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getAllowedMethods($uri) {
+
+        $methods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        // The MKCOL is only allowed on an unmapped uri
+        try {
+            $this->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            $methods[] = 'MKCOL';
+        }
+
+        // We're also checking if any of the plugins register any new methods
+        foreach($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($uri));
+        array_unique($methods);
+
+        return $methods;
+
+    }
+
+    /**
+     * Gets the uri for the request, keeping the base uri into consideration
+     *
+     * @return string
+     */
+    public function getRequestUri() {
+
+        return $this->calculateUri($this->httpRequest->getUri());
+
+    }
+
+    /**
+     * Calculates the uri for a request, making sure that the base uri is stripped out
+     *
+     * @param string $uri
+     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
+     * @return string
+     */
+    public function calculateUri($uri) {
+
+        if ($uri[0]!='/' && strpos($uri,'://')) {
+
+            $uri = parse_url($uri,PHP_URL_PATH);
+
+        }
+
+        $uri = str_replace('//','/',$uri);
+
+        if (strpos($uri,$this->getBaseUri())===0) {
+
+            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
+
+        // A special case, if the baseUri was accessed without a trailing
+        // slash, we'll accept it as well.
+        } elseif ($uri.'/' === $this->getBaseUri()) {
+
+            return '';
+
+        } else {
+
+            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
+
+        }
+
+    }
+
+    /**
+     * Returns the HTTP depth header
+     *
+     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
+     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
+     *
+     * @param mixed $default
+     * @return int
+     */
+    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
+
+        // If its not set, we'll grab the default
+        $depth = $this->httpRequest->getHeader('Depth');
+
+        if (is_null($depth)) return $default;
+
+        if ($depth == 'infinity') return self::DEPTH_INFINITY;
+
+
+        // If its an unknown value. we'll grab the default
+        if (!ctype_digit($depth)) return $default;
+
+        return (int)$depth;
+
+    }
+
+    /**
+     * Returns the HTTP range header
+     *
+     * This method returns null if there is no well-formed HTTP range request
+     * header or array($start, $end).
+     *
+     * The first number is the offset of the first byte in the range.
+     * The second number is the offset of the last byte in the range.
+     *
+     * If the second offset is null, it should be treated as the offset of the last byte of the entity
+     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
+     *
+     * @return array|null
+     */
+    public function getHTTPRange() {
+
+        $range = $this->httpRequest->getHeader('range');
+        if (is_null($range)) return null;
+
+        // Matching "Range: bytes=1234-5678: both numbers are optional
+
+        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
+
+        if ($matches[1]==='' && $matches[2]==='') return null;
+
+        return array(
+            $matches[1]!==''?$matches[1]:null,
+            $matches[2]!==''?$matches[2]:null,
+        );
+
+    }
+
+
+    /**
+     * Returns information about Copy and Move requests
+     *
+     * This function is created to help getting information about the source and the destination for the
+     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
+     *
+     * The returned value is an array with the following keys:
+     *   * destination - Destination path
+     *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
+     *
+     * @return array
+     */
+    public function getCopyAndMoveInfo() {
+
+        // Collecting the relevant HTTP headers
+        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
+        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
+        $overwrite = $this->httpRequest->getHeader('Overwrite');
+        if (!$overwrite) $overwrite = 'T';
+        if (strtoupper($overwrite)=='T') $overwrite = true;
+        elseif (strtoupper($overwrite)=='F') $overwrite = false;
+        // We need to throw a bad request exception, if the header was invalid
+        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
+
+        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
+
+        try {
+            $destinationParent = $this->tree->getNodeForPath($destinationDir);
+            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            // If the destination parent node is not found, we throw a 409
+            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
+        }
+
+        try {
+
+            $destinationNode = $this->tree->getNodeForPath($destination);
+
+            // If this succeeded, it means the destination already exists
+            // we'll need to throw precondition failed in case overwrite is false
+            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            // Destination didn't exist, we're all good
+            $destinationNode = false;
+
+
+
+        }
+
+        // These are the three relevant properties we need to return
+        return array(
+            'destination'       => $destination,
+            'destinationExists' => $destinationNode==true,
+            'destinationNode'   => $destinationNode,
+        );
+
+    }
+
+    /**
+     * Returns a list of properties for a path
+     *
+     * This is a simplified version getPropertiesForPath.
+     * if you aren't interested in status codes, but you just
+     * want to have a flat list of properties. Use this method.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     */
+    public function getProperties($path, $propertyNames) {
+
+        $result = $this->getPropertiesForPath($path,$propertyNames,0);
+        return $result[0][200];
+
+    }
+
+    /**
+     * A kid-friendly way to fetch properties for a node's children.
+     *
+     * The returned array will be indexed by the path of the of child node.
+     * Only properties that are actually found will be returned.
+     *
+     * The parent node will not be returned.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     * @return array
+     */
+    public function getPropertiesForChildren($path, $propertyNames) {
+
+        $result = array();
+        foreach($this->getPropertiesForPath($path,$propertyNames,1) as $k=>$row) {
+
+            // Skipping the parent path
+            if ($k === 0) continue;
+
+            $result[$row['href']] = $row[200];
+
+        }
+        return $result;
+
+    }
+
+    /**
+     * Returns a list of HTTP headers for a particular resource
+     *
+     * The generated http headers are based on properties provided by the
+     * resource. The method basically provides a simple mapping between
+     * DAV property and HTTP header.
+     *
+     * The headers are intended to be used for HEAD and GET requests.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getHTTPHeaders($path) {
+
+        $propertyMap = array(
+            '{DAV:}getcontenttype'   => 'Content-Type',
+            '{DAV:}getcontentlength' => 'Content-Length',
+            '{DAV:}getlastmodified'  => 'Last-Modified',
+            '{DAV:}getetag'          => 'ETag',
+        );
+
+        $properties = $this->getProperties($path,array_keys($propertyMap));
+
+        $headers = array();
+        foreach($propertyMap as $property=>$header) {
+            if (!isset($properties[$property])) continue;
+
+            if (is_scalar($properties[$property])) {
+                $headers[$header] = $properties[$property];
+
+            // GetLastModified gets special cased
+            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
+                $headers[$header] = Sabre_HTTP_Util::toHTTPDate($properties[$property]->getTime());
+            }
+
+        }
+
+        return $headers;
+
+    }
+
+    /**
+     * Returns a list of properties for a given path
+     *
+     * The path that should be supplied should have the baseUrl stripped out
+     * The list of properties should be supplied in Clark notation. If the list is empty
+     * 'allprops' is assumed.
+     *
+     * If a depth of 1 is requested child elements will also be returned.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     * @param int $depth
+     * @return array
+     */
+    public function getPropertiesForPath($path, $propertyNames = array(), $depth = 0) {
+
+        if ($depth!=0) $depth = 1;
+
+        $returnPropertyList = array();
+
+        $parentNode = $this->tree->getNodeForPath($path);
+        $nodes = array(
+            $path => $parentNode
+        );
+        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
+            foreach($this->tree->getChildren($path) as $childNode)
+                $nodes[$path . '/' . $childNode->getName()] = $childNode;
+        }
+
+        // If the propertyNames array is empty, it means all properties are requested.
+        // We shouldn't actually return everything we know though, and only return a
+        // sensible list.
+        $allProperties = count($propertyNames)==0;
+
+        foreach($nodes as $myPath=>$node) {
+
+            $currentPropertyNames = $propertyNames;
+
+            $newProperties = array(
+                '200' => array(),
+                '404' => array(),
+            );
+
+            if ($allProperties) {
+                // Default list of propertyNames, when all properties were requested.
+                $currentPropertyNames = array(
+                    '{DAV:}getlastmodified',
+                    '{DAV:}getcontentlength',
+                    '{DAV:}resourcetype',
+                    '{DAV:}quota-used-bytes',
+                    '{DAV:}quota-available-bytes',
+                    '{DAV:}getetag',
+                    '{DAV:}getcontenttype',
+                );
+            }
+
+            // If the resourceType was not part of the list, we manually add it
+            // and mark it for removal. We need to know the resourcetype in order
+            // to make certain decisions about the entry.
+            // WebDAV dictates we should add a / and the end of href's for collections
+            $removeRT = false;
+            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
+                $currentPropertyNames[] = '{DAV:}resourcetype';
+                $removeRT = true;
+            }
+
+            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
+            // If this method explicitly returned false, we must ignore this
+            // node as it is inaccessible.
+            if ($result===false) continue;
+
+            if (count($currentPropertyNames) > 0) {
+
+                if ($node instanceof Sabre_DAV_IProperties)
+                    $newProperties['200'] = $newProperties[200] + $node->getProperties($currentPropertyNames);
+
+            }
+
+
+            foreach($currentPropertyNames as $prop) {
+
+                if (isset($newProperties[200][$prop])) continue;
+
+                switch($prop) {
+                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
+                    case '{DAV:}getcontentlength'      :
+                        if ($node instanceof Sabre_DAV_IFile) {
+                            $size = $node->getSize();
+                            if (!is_null($size)) {
+                                $newProperties[200][$prop] = (int)$node->getSize();
+                            }
+                        }
+                        break;
+                    case '{DAV:}quota-used-bytes'      :
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[0];
+                        }
+                        break;
+                    case '{DAV:}quota-available-bytes' :
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[1];
+                        }
+                        break;
+                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
+                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
+                    case '{DAV:}supported-report-set'  :
+                        $reports = array();
+                        foreach($this->plugins as $plugin) {
+                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
+                        }
+                        $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports);
+                        break;
+                    case '{DAV:}resourcetype' :
+                        $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
+                        foreach($this->resourceTypeMapping as $className => $resourceType) {
+                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
+                        }
+                        break;
+
+                }
+
+                // If we were unable to find the property, we will list it as 404.
+                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
+
+            }
+
+            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
+
+            $newProperties['href'] = trim($myPath,'/');
+
+            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
+            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
+            // Therefore we add a trailing / for any non-file. This might need adjustments
+            // if we find there are other edge cases.
+            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && count($newProperties[200]['{DAV:}resourcetype']->getValue())>0) $newProperties['href'] .='/';
+
+            // If the resourcetype property was manually added to the requested property list,
+            // we will remove it again.
+            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
+
+            $returnPropertyList[] = $newProperties;
+
+        }
+
+        return $returnPropertyList;
+
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new file.
+     *
+     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
+     * It was important to get this done through a centralized function,
+     * allowing plugins to intercept this using the beforeCreateFile event.
+     *
+     * This method will return true if the file was actually created
+     *
+     * @param string   $uri
+     * @param resource $data
+     * @param string   $etag
+     * @return bool
+     */
+    public function createFile($uri,$data, &$etag = null) {
+
+        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
+
+        $parent = $this->tree->getNodeForPath($dir);
+
+        if (!$this->broadcastEvent('beforeCreateFile',array($uri, &$data, $parent))) return false;
+
+        $etag = $parent->createFile($name,$data);
+        $this->tree->markDirty($dir);
+
+        $this->broadcastEvent('afterBind',array($uri));
+        $this->broadcastEvent('afterCreateFile',array($uri, $parent));
+
+        return true;
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new directory.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function createDirectory($uri) {
+
+        $this->createCollection($uri,array('{DAV:}collection'),array());
+
+    }
+
+    /**
+     * Use this method to create a new collection
+     *
+     * The {DAV:}resourcetype is specified using the resourceType array.
+     * At the very least it must contain {DAV:}collection.
+     *
+     * The properties array can contain a list of additional properties.
+     *
+     * @param string $uri The new uri
+     * @param array $resourceType The resourceType(s)
+     * @param array $properties A list of properties
+     * @return array|null
+     */
+    public function createCollection($uri, array $resourceType, array $properties) {
+
+        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        // Making sure {DAV:}collection was specified as resourceType
+        if (!in_array('{DAV:}collection', $resourceType)) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
+        }
+
+
+        // Making sure the parent exists
+        try {
+
+            $parent = $this->tree->getNodeForPath($parentUri);
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
+
+        }
+
+        // Making sure the parent is a collection
+        if (!$parent instanceof Sabre_DAV_ICollection) {
+            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
+        }
+
+
+
+        // Making sure the child does not already exist
+        try {
+            $parent->getChild($newName);
+
+            // If we got here.. it means there's already a node on that url, and we need to throw a 405
+            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+            // This is correct
+        }
+
+
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
+
+        // There are 2 modes of operation. The standard collection
+        // creates the directory, and then updates properties
+        // the extended collection can create it directly.
+        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
+
+            $parent->createExtendedCollection($newName, $resourceType, $properties);
+
+        } else {
+
+            // No special resourcetypes are supported
+            if (count($resourceType)>1) {
+                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
+            }
+
+            $parent->createDirectory($newName);
+            $rollBack = false;
+            $exception = null;
+            $errorResult = null;
+
+            if (count($properties)>0) {
+
+                try {
+
+                    $errorResult = $this->updateProperties($uri, $properties);
+                    if (!isset($errorResult[200])) {
+                        $rollBack = true;
+                    }
+
+                } catch (Sabre_DAV_Exception $e) {
+
+                    $rollBack = true;
+                    $exception = $e;
+
+                }
+
+            }
+
+            if ($rollBack) {
+                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+                $this->tree->delete($uri);
+
+                // Re-throwing exception
+                if ($exception) throw $exception;
+
+                return $errorResult;
+            }
+
+        }
+        $this->tree->markDirty($parentUri);
+        $this->broadcastEvent('afterBind',array($uri));
+
+    }
+
+    /**
+     * This method updates a resource's properties
+     *
+     * The properties array must be a list of properties. Array-keys are
+     * property names in clarknotation, array-values are it's values.
+     * If a property must be deleted, the value should be null.
+     *
+     * Note that this request should either completely succeed, or
+     * completely fail.
+     *
+     * The response is an array with statuscodes for keys, which in turn
+     * contain arrays with propertynames. This response can be used
+     * to generate a multistatus body.
+     *
+     * @param string $uri
+     * @param array $properties
+     * @return array
+     */
+    public function updateProperties($uri, array $properties) {
+
+        // we'll start by grabbing the node, this will throw the appropriate
+        // exceptions if it doesn't.
+        $node = $this->tree->getNodeForPath($uri);
+
+        $result = array(
+            200 => array(),
+            403 => array(),
+            424 => array(),
+        );
+        $remainingProperties = $properties;
+        $hasError = false;
+
+        // Running through all properties to make sure none of them are protected
+        if (!$hasError) foreach($properties as $propertyName => $value) {
+            if(in_array($propertyName, $this->protectedProperties)) {
+                $result[403][$propertyName] = null;
+                unset($remainingProperties[$propertyName]);
+                $hasError = true;
+            }
+        }
+
+        if (!$hasError) {
+            // Allowing plugins to take care of property updating
+            $hasError = !$this->broadcastEvent('updateProperties',array(
+                &$remainingProperties,
+                &$result,
+                $node
+            ));
+        }
+
+        // If the node is not an instance of Sabre_DAV_IProperties, every
+        // property is 403 Forbidden
+        if (!$hasError && count($remainingProperties) && !($node instanceof Sabre_DAV_IProperties)) {
+            $hasError = true;
+            foreach($properties as $propertyName=> $value) {
+                $result[403][$propertyName] = null;
+            }
+            $remainingProperties = array();
+        }
+
+        // Only if there were no errors we may attempt to update the resource
+        if (!$hasError) {
+
+            if (count($remainingProperties)>0) {
+
+                $updateResult = $node->updateProperties($remainingProperties);
+
+                if ($updateResult===true) {
+                    // success
+                    foreach($remainingProperties as $propertyName=>$value) {
+                        $result[200][$propertyName] = null;
+                    }
+
+                } elseif ($updateResult===false) {
+                    // The node failed to update the properties for an
+                    // unknown reason
+                    foreach($remainingProperties as $propertyName=>$value) {
+                        $result[403][$propertyName] = null;
+                    }
+
+                } elseif (is_array($updateResult)) {
+
+                    // The node has detailed update information
+                    // We need to merge the results with the earlier results.
+                    foreach($updateResult as $status => $props) {
+                        if (is_array($props)) {
+                            if (!isset($result[$status]))
+                                $result[$status] = array();
+
+                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
+                        }
+                    }
+
+                } else {
+                    throw new Sabre_DAV_Exception('Invalid result from updateProperties');
+                }
+                $remainingProperties = array();
+            }
+
+        }
+
+        foreach($remainingProperties as $propertyName=>$value) {
+            // if there are remaining properties, it must mean
+            // there's a dependency failure
+            $result[424][$propertyName] = null;
+        }
+
+        // Removing empty array values
+        foreach($result as $status=>$props) {
+
+            if (count($props)===0) unset($result[$status]);
+
+        }
+        $result['href'] = $uri;
+        return $result;
+
+    }
+
+    /**
+     * This method checks the main HTTP preconditions.
+     *
+     * Currently these are:
+     *   * If-Match
+     *   * If-None-Match
+     *   * If-Modified-Since
+     *   * If-Unmodified-Since
+     *
+     * The method will return true if all preconditions are met
+     * The method will return false, or throw an exception if preconditions
+     * failed. If false is returned the operation should be aborted, and
+     * the appropriate HTTP response headers are already set.
+     *
+     * Normally this method will throw 412 Precondition Failed for failures
+     * related to If-None-Match, If-Match and If-Unmodified Since. It will
+     * set the status to 304 Not Modified for If-Modified_since.
+     *
+     * If the $handleAsGET argument is set to true, it will also return 304
+     * Not Modified for failure of the If-None-Match precondition. This is the
+     * desired behaviour for HTTP GET and HTTP HEAD requests.
+     *
+     * @param bool $handleAsGET
+     * @return bool
+     */
+    public function checkPreconditions($handleAsGET = false) {
+
+        $uri = $this->getRequestUri();
+        $node = null;
+        $lastMod = null;
+        $etag = null;
+
+        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
+
+            // If-Match contains an entity tag. Only if the entity-tag
+            // matches we are allowed to make the request succeed.
+            // If the entity-tag is '*' we are only allowed to make the
+            // request succeed if a resource exists at that url.
+            try {
+                $node = $this->tree->getNodeForPath($uri);
+            } catch (Sabre_DAV_Exception_NotFound $e) {
+                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
+            }
+
+            // Only need to check entity tags if they are not *
+            if ($ifMatch!=='*') {
+
+                // There can be multiple etags
+                $ifMatch = explode(',',$ifMatch);
+                $haveMatch = false;
+                foreach($ifMatch as $ifMatchItem) {
+
+                    // Stripping any extra spaces
+                    $ifMatchItem = trim($ifMatchItem,' ');
+
+                    $etag = $node->getETag();
+                    if ($etag===$ifMatchItem) {
+                        $haveMatch = true;
+                    } else {
+                        // Evolution has a bug where it sometimes prepends the "
+                        // with a \. This is our workaround.
+                        if (str_replace('\\"','"', $ifMatchItem) === $etag) {
+                            $haveMatch = true;
+                        }
+                    }
+
+                }
+                if (!$haveMatch) {
+                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
+                }
+            }
+        }
+
+        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
+
+            // The If-None-Match header contains an etag.
+            // Only if the ETag does not match the current ETag, the request will succeed
+            // The header can also contain *, in which case the request
+            // will only succeed if the entity does not exist at all.
+            $nodeExists = true;
+            if (!$node) {
+                try {
+                    $node = $this->tree->getNodeForPath($uri);
+                } catch (Sabre_DAV_Exception_NotFound $e) {
+                    $nodeExists = false;
+                }
+            }
+            if ($nodeExists) {
+                $haveMatch = false;
+                if ($ifNoneMatch==='*') $haveMatch = true;
+                else {
+
+                    // There might be multiple etags
+                    $ifNoneMatch = explode(',', $ifNoneMatch);
+                    $etag = $node->getETag();
+
+                    foreach($ifNoneMatch as $ifNoneMatchItem) {
+
+                        // Stripping any extra spaces
+                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
+
+                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
+
+                    }
+
+                }
+
+                if ($haveMatch) {
+                    if ($handleAsGET) {
+                        $this->httpResponse->sendStatus(304);
+                        return false;
+                    } else {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
+                    }
+                }
+            }
+
+        }
+
+        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
+
+            // The If-Modified-Since header contains a date. We
+            // will only return the entity if it has been changed since
+            // that date. If it hasn't been changed, we return a 304
+            // header
+            // Note that this header only has to be checked if there was no If-None-Match header
+            // as per the HTTP spec.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
+
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod <= $date) {
+                        $this->httpResponse->sendStatus(304);
+                        $this->httpResponse->setHeader('Last-Modified', Sabre_HTTP_Util::toHTTPDate($lastMod));
+                        return false;
+                    }
+                }
+            }
+        }
+
+        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
+
+            // The If-Unmodified-Since will allow allow the request if the
+            // entity has not changed since the specified date.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
+
+            // We must only check the date if it's valid
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod > $date) {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
+                    }
+                }
+            }
+
+        }
+        return true;
+
+    }
+
+    // }}}
+    // {{{ XML Readers & Writers
+
+
+    /**
+     * Generates a WebDAV propfind response body based on a list of nodes
+     *
+     * @param array $fileProperties The list with nodes
+     * @return string
+     */
+    public function generateMultiStatus(array $fileProperties) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        //$dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($fileProperties as $entry) {
+
+            $href = $entry['href'];
+            unset($entry['href']);
+
+            $response = new Sabre_DAV_Property_Response($href,$entry);
+            $response->serialize($this,$multiStatus);
+
+        }
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * This method parses a PropPatch request
+     *
+     * PropPatch changes the properties for a resource. This method
+     * returns a list of properties.
+     *
+     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
+     * and the value contains the property value. If a property is to be removed the value
+     * will be null.
+     *
+     * @param string $body xml body
+     * @return array list of properties in need of updating or deletion
+     */
+    public function parsePropPatchRequest($body) {
+
+        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $newProperties = array();
+
+        foreach($dom->firstChild->childNodes as $child) {
+
+            if ($child->nodeType !== XML_ELEMENT_NODE) continue;
+
+            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
+
+            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
+
+            foreach($innerProperties as $propertyName=>$propertyValue) {
+
+                if ($operation==='{DAV:}remove') {
+                    $propertyValue = null;
+                }
+
+                $newProperties[$propertyName] = $propertyValue;
+
+            }
+
+        }
+
+        return $newProperties;
+
+    }
+
+    /**
+     * This method parses the PROPFIND request and returns its information
+     *
+     * This will either be a list of properties, or an empty array; in which case
+     * an {DAV:}allprop was requested.
+     *
+     * @param string $body
+     * @return array
+     */
+    public function parsePropFindRequest($body) {
+
+        // If the propfind body was empty, it means IE is requesting 'all' properties
+        if (!$body) return array();
+
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
+        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem));
+
+    }
+
+    // }}}
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ServerPlugin.php b/3rdparty/Sabre/DAV/ServerPlugin.php
new file mode 100755
index 0000000000..131863d13f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ServerPlugin.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * The baseclass for all server plugins.
+ *
+ * Plugins can modify or extend the servers behaviour.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_ServerPlugin {
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre_DAV_Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the requires event subscriptions.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    abstract public function initialize(Sabre_DAV_Server $server);
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array();
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getHTTPMethods($uri) {
+
+        return array();
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return get_class($this);
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        return array();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleCollection.php b/3rdparty/Sabre/DAV/SimpleCollection.php
new file mode 100755
index 0000000000..4acf971caa
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleCollection.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * SimpleCollection
+ *
+ * The SimpleCollection is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
+
+    /**
+     * List of childnodes
+     *
+     * @var array
+     */
+    protected $children = array();
+
+    /**
+     * Name of this resource
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, child nodes can also be bassed.
+     * This nodes must be instances of Sabre_DAV_INode
+     *
+     * @param string $name
+     * @param array $children
+     */
+    public function __construct($name,array $children = array()) {
+
+        $this->name = $name;
+        foreach($children as $child) {
+
+            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
+            $this->addChild($child);
+
+        }
+
+    }
+
+    /**
+     * Adds a new childnode to this collection
+     *
+     * @param Sabre_DAV_INode $child
+     * @return void
+     */
+    public function addChild(Sabre_DAV_INode $child) {
+
+        $this->children[$child->getName()] = $child;
+
+    }
+
+    /**
+     * Returns the name of the collection
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
+     * Generally its wise to override this, as this can usually be optimized
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    public function getChild($name) {
+
+        if (isset($this->children[$name])) return $this->children[$name];
+        throw new Sabre_DAV_Exception_NotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
+
+    }
+
+    /**
+     * Returns a list of children for this collection
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        return array_values($this->children);
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleDirectory.php b/3rdparty/Sabre/DAV/SimpleDirectory.php
new file mode 100755
index 0000000000..621222ebc5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleDirectory.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * SimpleDirectory
+ *
+ * The SimpleDirectory is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * This class is now deprecated, use Sabre_DAV_SimpleCollection instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated Use Sabre_DAV_SimpleCollection instead.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleDirectory extends Sabre_DAV_SimpleCollection {
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleFile.php b/3rdparty/Sabre/DAV/SimpleFile.php
new file mode 100755
index 0000000000..58330d6861
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleFile.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * SimpleFile
+ *
+ * The 'SimpleFile' class is used to easily add read-only immutable files to
+ * the directory structure. One usecase would be to add a 'readme.txt' to a
+ * root of a webserver with some standard content.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleFile extends Sabre_DAV_File {
+
+    /**
+     * File contents
+     *
+     * @var string
+     */
+    protected $contents = array();
+
+    /**
+     * Name of this resource
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * A mimetype, such as 'text/plain' or 'text/html'
+     *
+     * @var string
+     */
+    protected $mimeType;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, as well as the contents of the
+     * file.
+     *
+     * @param string $name
+     * @param string $contents
+     * @param string|null $mimeType
+     */
+    public function __construct($name, $contents, $mimeType = null) {
+
+        $this->name = $name;
+        $this->contents = $contents;
+        $this->mimeType = $mimeType;
+
+    }
+
+    /**
+     * Returns the node name for this file.
+     *
+     * This name is used to construct the url.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    public function get() {
+
+        return $this->contents;
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes.
+     *
+     * @return int
+     */
+    public function getSize() {
+
+        return strlen($this->contents);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     * @return string
+     */
+    public function getETag() {
+
+        return '"' . md5($this->contents) . '"';
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     * @return string
+     */
+    public function getContentType() {
+
+        return $this->mimeType;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/StringUtil.php b/3rdparty/Sabre/DAV/StringUtil.php
new file mode 100755
index 0000000000..b126a94c82
--- /dev/null
+++ b/3rdparty/Sabre/DAV/StringUtil.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * String utility
+ *
+ * This class is mainly used to implement the 'text-match' filter, used by both
+ * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
+ * Because they both need it, it was decided to put it in Sabre_DAV instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_StringUtil {
+
+    /**
+     * Checks if a needle occurs in a haystack ;)
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @param string $collation
+     * @param string $matchType
+     * @return bool
+     */
+    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
+
+        switch($collation) {
+
+            case 'i;ascii-casemap' :
+                // default strtolower takes locale into consideration
+                // we don't want this.
+                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
+                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
+                break;
+
+            case 'i;octet' :
+                // Do nothing
+                break;
+
+            case 'i;unicode-casemap' :
+                $haystack = mb_strtoupper($haystack, 'UTF-8');
+                $needle = mb_strtoupper($needle, 'UTF-8');
+                break;
+
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Collation type: ' . $collation . ' is not supported');
+
+        }
+
+        switch($matchType) {
+
+            case 'contains' :
+                return strpos($haystack, $needle)!==false;
+            case 'equals' :
+                return $haystack === $needle;
+            case 'starts-with' :
+                return strpos($haystack, $needle)===0;
+            case 'ends-with' :
+                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Match-type: ' . $matchType . ' is not supported');
+
+        }
+
+    }
+
+    /**
+     * This method takes an input string, checks if it's not valid UTF-8 and
+     * attempts to convert it to UTF-8 if it's not.
+     *
+     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
+     * anything else will likely fail.
+     *
+     * @param string $input
+     * @return string
+     */
+    static public function ensureUTF8($input) {
+
+        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
+
+        if ($encoding === 'ISO-8859-1') {
+            return utf8_encode($input);
+        } else {
+            return $input;
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
new file mode 100755
index 0000000000..36096e6777
--- /dev/null
+++ b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * Temporary File Filter Plugin
+ *
+ * The purpose of this filter is to intercept some of the garbage files
+ * operation systems and applications tend to generate when mounting
+ * a WebDAV share as a disk.
+ *
+ * It will intercept these files and place them in a separate directory.
+ * these files are not deleted automatically, so it is adviceable to
+ * delete these after they are not accessed for 24 hours.
+ *
+ * Currently it supports:
+ *   * OS/X style resource forks and .DS_Store
+ *   * desktop.ini and Thumbs.db (windows)
+ *   * .*.swp (vim temporary files)
+ *   * .dat.* (smultron temporary files)
+ *
+ * Additional patterns can be added, by adding on to the
+ * temporaryFilePatterns property.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the list of patterns we intercept.
+     * If new patterns are added, they must be valid patterns for preg_match.
+     *
+     * @var array
+     */
+    public $temporaryFilePatterns = array(
+        '/^\._(.*)$/',     // OS/X resource forks
+        '/^.DS_Store$/',   // OS/X custom folder settings
+        '/^desktop.ini$/', // Windows custom folder settings
+        '/^Thumbs.db$/',   // Windows thumbnail cache
+        '/^.(.*).swp$/',   // ViM temporary files
+        '/^\.dat(.*)$/',   // Smultron seems to create these
+        '/^~lock.(.*)#$/', // Windows 7 lockfiles
+    );
+
+    /**
+     * This is the directory where this plugin
+     * will store it's files.
+     *
+     * @var string
+     */
+    private $dataDir;
+
+    /**
+     * A reference to the main Server class
+     *
+     * @var Sabre_DAV_Server
+     */
+    private $server;
+
+    /**
+     * Creates the plugin.
+     *
+     * Make sure you specify a directory for your files. If you don't, we
+     * will use PHP's directory for session-storage instead, and you might
+     * not want that.
+     *
+     * @param string|null $dataDir
+     */
+    public function __construct($dataDir = null) {
+
+        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
+        if (!is_dir($dataDir)) mkdir($dataDir);
+        $this->dataDir = $dataDir;
+
+    }
+
+    /**
+     * Initialize the plugin
+     *
+     * This is called automatically be the Server class after this plugin is
+     * added with Sabre_DAV_Server::addPlugin()
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
+        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
+
+    }
+
+    /**
+     * This method is called before any HTTP method handler
+     *
+     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
+     * filenames that are known to match the 'temporary file' regex.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function beforeMethod($method, $uri) {
+
+        if (!$tempLocation = $this->isTempFile($uri))
+            return true;
+
+        switch($method) {
+            case 'GET' :
+                return $this->httpGet($tempLocation);
+            case 'PUT' :
+                return $this->httpPut($tempLocation);
+            case 'PROPFIND' :
+                return $this->httpPropfind($tempLocation, $uri);
+            case 'DELETE' :
+                return $this->httpDelete($tempLocation);
+         }
+         return true;
+
+    }
+
+    /**
+     * This method is invoked if some subsystem creates a new file.
+     *
+     * This is used to deal with HTTP LOCK requests which create a new
+     * file.
+     *
+     * @param string $uri
+     * @param resource $data
+     * @return bool
+     */
+    public function beforeCreateFile($uri,$data) {
+
+        if ($tempPath = $this->isTempFile($uri)) {
+
+            $hR = $this->server->httpResponse;
+            $hR->setHeader('X-Sabre-Temp','true');
+            file_put_contents($tempPath,$data);
+            return false;
+        }
+        return true;
+
+    }
+
+    /**
+     * This method will check if the url matches the temporary file pattern
+     * if it does, it will return an path based on $this->dataDir for the
+     * temporary file storage.
+     *
+     * @param string $path
+     * @return boolean|string
+     */
+    protected function isTempFile($path) {
+
+        // We're only interested in the basename.
+        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
+
+        foreach($this->temporaryFilePatterns as $tempFile) {
+
+            if (preg_match($tempFile,$tempPath)) {
+                return $this->getDataDir() . '/sabredav_' . md5($path) . '.tempfile';
+            }
+
+        }
+
+        return false;
+
+    }
+
+
+    /**
+     * This method handles the GET method for temporary files.
+     * If the file doesn't exist, it will return false which will kick in
+     * the regular system for the GET method.
+     *
+     * @param string $tempLocation
+     * @return bool
+     */
+    public function httpGet($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('Content-Type','application/octet-stream');
+        $hR->setHeader('Content-Length',filesize($tempLocation));
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(200);
+        $hR->sendBody(fopen($tempLocation,'r'));
+        return false;
+
+    }
+
+    /**
+     * This method handles the PUT method.
+     *
+     * @param string $tempLocation
+     * @return bool
+     */
+    public function httpPut($tempLocation) {
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+
+        $newFile = !file_exists($tempLocation);
+
+        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
+             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
+        }
+
+        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
+        $hR->sendStatus($newFile?201:200);
+        return false;
+
+    }
+
+    /**
+     * This method handles the DELETE method.
+     *
+     * If the file didn't exist, it will return false, which will make the
+     * standard HTTP DELETE handler kick in.
+     *
+     * @param string $tempLocation
+     * @return bool
+     */
+    public function httpDelete($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        unlink($tempLocation);
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(204);
+        return false;
+
+    }
+
+    /**
+     * This method handles the PROPFIND method.
+     *
+     * It's a very lazy method, it won't bother checking the request body
+     * for which properties were requested, and just sends back a default
+     * set of properties.
+     *
+     * @param string $tempLocation
+     * @param string $uri
+     * @return bool
+     */
+    public function httpPropfind($tempLocation, $uri) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(207);
+        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true));
+
+        $properties = array(
+            'href' => $uri,
+            200 => array(
+                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
+                '{DAV:}getcontentlength' => filesize($tempLocation),
+                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
+                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true,
+
+            ),
+         );
+
+        $data = $this->server->generateMultiStatus(array($properties));
+        $hR->sendBody($data);
+        return false;
+
+    }
+
+
+    /**
+     * This method returns the directory where the temporary files should be stored.
+     *
+     * @return string
+     */
+    protected function getDataDir()
+    {
+        return $this->dataDir;
+    }
+}
diff --git a/3rdparty/Sabre/DAV/Tree.php b/3rdparty/Sabre/DAV/Tree.php
new file mode 100755
index 0000000000..5021639415
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Tree.php
@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * Abstract tree object
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Tree {
+
+    /**
+     * This function must return an INode object for a path
+     * If a Path doesn't exist, thrown a Exception_NotFound
+     *
+     * @param string $path
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_INode
+     */
+    abstract function getNodeForPath($path);
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * Implementors of this class should override this method to make
+     * it cheaper.
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            $this->getNodeForPath($path);
+            return true;
+
+        } catch (Sabre_DAV_Exception_NotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Copies a file from path to another
+     *
+     * @param string $sourcePath The source location
+     * @param string $destinationPath The full destination path
+     * @return void
+     */
+    public function copy($sourcePath, $destinationPath) {
+
+        $sourceNode = $this->getNodeForPath($sourcePath);
+
+        // grab the dirname and basename components
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        $destinationParent = $this->getNodeForPath($destinationDir);
+        $this->copyNode($sourceNode,$destinationParent,$destinationName);
+
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Moves a file from one location to another
+     *
+     * @param string $sourcePath The path to the file which should be moved
+     * @param string $destinationPath The full destination path, so not just the destination parent node
+     * @return int
+     */
+    public function move($sourcePath, $destinationPath) {
+
+        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        if ($sourceDir===$destinationDir) {
+            $renameable = $this->getNodeForPath($sourcePath);
+            $renameable->setName($destinationName);
+        } else {
+            $this->copy($sourcePath,$destinationPath);
+            $this->getNodeForPath($sourcePath)->delete();
+        }
+        $this->markDirty($sourceDir);
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Deletes a node from the tree
+     *
+     * @param string $path
+     * @return void
+     */
+    public function delete($path) {
+
+        $node = $this->getNodeForPath($path);
+        $node->delete();
+
+        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
+        $this->markDirty($parent);
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        return $node->getChildren();
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes
+     *
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     *
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path
+     * @return void
+     */
+    public function markDirty($path) {
+
+
+    }
+
+    /**
+     * copyNode
+     *
+     * @param Sabre_DAV_INode $source
+     * @param Sabre_DAV_ICollection $destinationParent
+     * @param string $destinationName
+     * @return void
+     */
+    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
+
+        if (!$destinationName) $destinationName = $source->getName();
+
+        if ($source instanceof Sabre_DAV_IFile) {
+
+            $data = $source->get();
+
+            // If the body was a string, we need to convert it to a stream
+            if (is_string($data)) {
+                $stream = fopen('php://temp','r+');
+                fwrite($stream,$data);
+                rewind($stream);
+                $data = $stream;
+            }
+            $destinationParent->createFile($destinationName,$data);
+            $destination = $destinationParent->getChild($destinationName);
+
+        } elseif ($source instanceof Sabre_DAV_ICollection) {
+
+            $destinationParent->createDirectory($destinationName);
+
+            $destination = $destinationParent->getChild($destinationName);
+            foreach($source->getChildren() as $child) {
+
+                $this->copyNode($child,$destination);
+
+            }
+
+        }
+        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
+
+            $props = $source->getProperties(array());
+            $destination->updateProperties($props);
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Tree/Filesystem.php b/3rdparty/Sabre/DAV/Tree/Filesystem.php
new file mode 100755
index 0000000000..40580ae366
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Tree/Filesystem.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * Sabre_DAV_Tree_Filesystem
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
+
+    /**
+     * Base url on the filesystem.
+     *
+     * @var string
+     */
+    protected $basePath;
+
+    /**
+     * Creates this tree
+     *
+     * Supply the path you'd like to share.
+     *
+     * @param string $basePath
+     */
+    public function __construct($basePath) {
+
+        $this->basePath = $basePath;
+
+    }
+
+    /**
+     * Returns a new node for the given path
+     *
+     * @param string $path
+     * @return Sabre_DAV_FS_Node
+     */
+    public function getNodeForPath($path) {
+
+        $realPath = $this->getRealPath($path);
+        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_NotFound('File at location ' . $realPath . ' not found');
+        if (is_dir($realPath)) {
+            return new Sabre_DAV_FS_Directory($realPath);
+        } else {
+            return new Sabre_DAV_FS_File($realPath);
+        }
+
+    }
+
+    /**
+     * Returns the real filesystem path for a webdav url.
+     *
+     * @param string $publicPath
+     * @return string
+     */
+    protected function getRealPath($publicPath) {
+
+        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
+
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    public function copy($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        $this->realCopy($source,$destination);
+
+    }
+
+    /**
+     * Used by self::copy
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    protected function realCopy($source,$destination) {
+
+        if (is_file($source)) {
+            copy($source,$destination);
+        } else {
+            mkdir($destination);
+            foreach(scandir($source) as $subnode) {
+
+                if ($subnode=='.' || $subnode=='..') continue;
+                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
+
+            }
+        }
+
+    }
+
+    /**
+     * Moves a file or directory recursively.
+     *
+     * If the destination exists, delete it first.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    public function move($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        rename($source,$destination);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/URLUtil.php b/3rdparty/Sabre/DAV/URLUtil.php
new file mode 100755
index 0000000000..794665a44f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/URLUtil.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * URL utility class
+ *
+ * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
+ *
+ * It was not possible to use PHP's built-in methods for this, because some clients don't like
+ * encoding of certain characters.
+ *
+ * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
+ * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
+ * kept as-is.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_URLUtil {
+
+    /**
+     * Encodes the path of a url.
+     *
+     * slashes (/) are treated as path-separators.
+     *
+     * @param string $path
+     * @return string
+     */
+    static function encodePath($path) {
+
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/])/',function($match) {
+
+            return '%'.sprintf('%02x',ord($match[0]));
+
+        }, $path);
+
+    }
+
+    /**
+     * Encodes a 1 segment of a path
+     *
+     * Slashes are considered part of the name, and are encoded as %2f
+     *
+     * @param string $pathSegment
+     * @return string
+     */
+    static function encodePathSegment($pathSegment) {
+
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)])/',function($match) {
+
+            return '%'.sprintf('%02x',ord($match[0]));
+
+        }, $pathSegment);
+    }
+
+    /**
+     * Decodes a url-encoded path
+     *
+     * @param string $path
+     * @return string
+     */
+    static function decodePath($path) {
+
+        return self::decodePathSegment($path);
+
+    }
+
+    /**
+     * Decodes a url-encoded path segment
+     *
+     * @param string $path
+     * @return string
+     */
+    static function decodePathSegment($path) {
+
+        $path = rawurldecode($path);
+        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
+
+        switch($encoding) {
+
+            case 'ISO-8859-1' :
+                $path = utf8_encode($path);
+
+        }
+
+        return $path;
+
+    }
+
+    /**
+     * Returns the 'dirname' and 'basename' for a path.
+     *
+     * The reason there is a custom function for this purpose, is because
+     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
+     * and we need a method that just operates on UTF-8 characters.
+     *
+     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
+     * directory separator on windows.
+     *
+     * This method returns the 2 components as an array.
+     *
+     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
+     * string is stripped off.
+     *
+     * @param string $path
+     * @return array
+     */
+    static function splitPath($path) {
+
+        $matches = array();
+        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
+            return array($matches[1],$matches[2]);
+        } else {
+            return array(null,null);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/UUIDUtil.php b/3rdparty/Sabre/DAV/UUIDUtil.php
new file mode 100755
index 0000000000..f0eebe598e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/UUIDUtil.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * UUID Utility
+ *
+ * This class has static methods to generate and validate UUID's.
+ * UUIDs are used a decent amount within various *DAV standards, so it made
+ * sense to include it.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_UUIDUtil {
+
+    /**
+     * Returns a pseudo-random v4 UUID
+     *
+     * This function is based on a comment by Andrew Moore on php.net
+     *
+     * @see http://www.php.net/manual/en/function.uniqid.php#94959
+     * @return string
+     */
+    static function getUUID() {
+
+        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+            // 32 bits for "time_low"
+            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+
+            // 16 bits for "time_mid"
+            mt_rand( 0, 0xffff ),
+
+            // 16 bits for "time_hi_and_version",
+            // four most significant bits holds version number 4
+            mt_rand( 0, 0x0fff ) | 0x4000,
+
+            // 16 bits, 8 bits for "clk_seq_hi_res",
+            // 8 bits for "clk_seq_low",
+            // two most significant bits holds zero and one for variant DCE1.1
+            mt_rand( 0, 0x3fff ) | 0x8000,
+
+            // 48 bits for "node"
+            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+        );
+    }
+
+    /**
+     * Checks if a string is a valid UUID.
+     *
+     * @param string $uuid
+     * @return bool
+     */
+    static function validateUUID($uuid) {
+
+        return preg_match(
+            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+            $uuid
+        ) == true;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Version.php b/3rdparty/Sabre/DAV/Version.php
new file mode 100755
index 0000000000..274646240a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.4';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/DAV/XMLUtil.php b/3rdparty/Sabre/DAV/XMLUtil.php
new file mode 100755
index 0000000000..60eff3b159
--- /dev/null
+++ b/3rdparty/Sabre/DAV/XMLUtil.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * XML utilities for WebDAV
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_XMLUtil {
+
+    /**
+     * Returns the 'clark notation' for an element.
+     *
+     * For example, and element encoded as:
+     * <b:myelem xmlns:b="http://www.example.org/" />
+     * will be returned as:
+     * {http://www.example.org}myelem
+     *
+     * This format is used throughout the SabreDAV sourcecode.
+     * Elements encoded with the urn:DAV namespace will
+     * be returned as if they were in the DAV: namespace. This is to avoid
+     * compatibility problems.
+     *
+     * This function will return null if a nodetype other than an Element is passed.
+     *
+     * @param DOMNode $dom
+     * @return string
+     */
+    static function toClarkNotation(DOMNode $dom) {
+
+        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
+
+        // Mapping back to the real namespace, in case it was dav
+        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
+
+        // Mapping to clark notation
+        return '{' . $ns . '}' . $dom->localName;
+
+    }
+
+    /**
+     * Parses a clark-notation string, and returns the namespace and element
+     * name components.
+     *
+     * If the string was invalid, it will throw an InvalidArgumentException.
+     *
+     * @param string $str
+     * @throws InvalidArgumentException
+     * @return array
+     */
+    static function parseClarkNotation($str) {
+
+        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
+            throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
+        }
+
+        return array(
+            $matches[1],
+            $matches[2]
+        );
+
+    }
+
+    /**
+     * This method takes an XML document (as string) and converts all instances of the
+     * DAV: namespace to urn:DAV
+     *
+     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
+     * spec, and causes the DOM to throw errors
+     *
+     * @param string $xmlDocument
+     * @return array|string|null
+     */
+    static function convertDAVNamespace($xmlDocument) {
+
+        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
+        // namespace is actually a violation of the XML namespaces specification, and will cause errors
+        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
+
+    }
+
+    /**
+     * This method provides a generic way to load a DOMDocument for WebDAV use.
+     *
+     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
+     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
+     *
+     * @param string $xml
+     * @throws Sabre_DAV_Exception_BadRequest
+     * @return DOMDocument
+     */
+    static function loadDOMDocument($xml) {
+
+        if (empty($xml))
+            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
+
+        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
+        // does not support this, so we must intercept this and convert to UTF-8.
+        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
+
+            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
+            $xml = iconv('UTF-16LE','UTF-8',$xml);
+
+            // Because the xml header might specify the encoding, we must also change this.
+            // This regex looks for the string encoding="UTF-16" and replaces it with
+            // encoding="UTF-8".
+            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
+
+        }
+
+        // Retaining old error setting
+        $oldErrorSetting =  libxml_use_internal_errors(true);
+
+        // Clearing any previous errors
+        libxml_clear_errors();
+
+        $dom = new DOMDocument();
+        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
+
+        // We don't generally care about any whitespace
+        $dom->preserveWhiteSpace = false;
+
+        if ($error = libxml_get_last_error()) {
+            libxml_clear_errors();
+            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
+        }
+
+        // Restoring old mechanism for error handling
+        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
+
+        return $dom;
+
+    }
+
+    /**
+     * Parses all WebDAV properties out of a DOM Element
+     *
+     * Generally WebDAV properties are enclosed in {DAV:}prop elements. This
+     * method helps by going through all these and pulling out the actual
+     * propertynames, making them array keys and making the property values,
+     * well.. the array values.
+     *
+     * If no value was given (self-closing element) null will be used as the
+     * value. This is used in for example PROPFIND requests.
+     *
+     * Complex values are supported through the propertyMap argument. The
+     * propertyMap should have the clark-notation properties as it's keys, and
+     * classnames as values.
+     *
+     * When any of these properties are found, the unserialize() method will be
+     * (statically) called. The result of this method is used as the value.
+     *
+     * @param DOMElement $parentNode
+     * @param array $propertyMap
+     * @return array
+     */
+    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
+
+        $propList = array();
+        foreach($parentNode->childNodes as $propNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
+
+            foreach($propNode->childNodes as $propNodeData) {
+
+                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
+                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
+
+                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
+                if (isset($propertyMap[$propertyName])) {
+                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData);
+                } else {
+                    $propList[$propertyName] = $propNodeData->textContent;
+                }
+            }
+
+
+        }
+        return $propList;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/includes.php b/3rdparty/Sabre/DAV/includes.php
new file mode 100755
index 0000000000..6a4890677e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/includes.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Sabre_DAV includes file
+ *
+ * Including this file will automatically include all files from the Sabre_DAV
+ * package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/Auth/IBackend.php';
+include __DIR__ . '/Client.php';
+include __DIR__ . '/Exception.php';
+include __DIR__ . '/INode.php';
+include __DIR__ . '/IProperties.php';
+include __DIR__ . '/Locks/Backend/Abstract.php';
+include __DIR__ . '/Locks/Backend/File.php';
+include __DIR__ . '/Locks/Backend/FS.php';
+include __DIR__ . '/Locks/Backend/PDO.php';
+include __DIR__ . '/Locks/LockInfo.php';
+include __DIR__ . '/Node.php';
+include __DIR__ . '/Property/IHref.php';
+include __DIR__ . '/Property.php';
+include __DIR__ . '/Server.php';
+include __DIR__ . '/ServerPlugin.php';
+include __DIR__ . '/StringUtil.php';
+include __DIR__ . '/TemporaryFileFilterPlugin.php';
+include __DIR__ . '/Tree.php';
+include __DIR__ . '/URLUtil.php';
+include __DIR__ . '/UUIDUtil.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/XMLUtil.php';
+include __DIR__ . '/Auth/Backend/AbstractBasic.php';
+include __DIR__ . '/Auth/Backend/AbstractDigest.php';
+include __DIR__ . '/Auth/Backend/Apache.php';
+include __DIR__ . '/Auth/Backend/File.php';
+include __DIR__ . '/Auth/Backend/PDO.php';
+include __DIR__ . '/Auth/Plugin.php';
+include __DIR__ . '/Browser/GuessContentType.php';
+include __DIR__ . '/Browser/MapGetToPropFind.php';
+include __DIR__ . '/Browser/Plugin.php';
+include __DIR__ . '/Exception/BadRequest.php';
+include __DIR__ . '/Exception/Conflict.php';
+include __DIR__ . '/Exception/Forbidden.php';
+include __DIR__ . '/Exception/InsufficientStorage.php';
+include __DIR__ . '/Exception/InvalidResourceType.php';
+include __DIR__ . '/Exception/Locked.php';
+include __DIR__ . '/Exception/LockTokenMatchesRequestUri.php';
+include __DIR__ . '/Exception/MethodNotAllowed.php';
+include __DIR__ . '/Exception/NotAuthenticated.php';
+include __DIR__ . '/Exception/NotFound.php';
+include __DIR__ . '/Exception/NotImplemented.php';
+include __DIR__ . '/Exception/PaymentRequired.php';
+include __DIR__ . '/Exception/PreconditionFailed.php';
+include __DIR__ . '/Exception/ReportNotImplemented.php';
+include __DIR__ . '/Exception/RequestedRangeNotSatisfiable.php';
+include __DIR__ . '/Exception/UnsupportedMediaType.php';
+include __DIR__ . '/FS/Node.php';
+include __DIR__ . '/FSExt/Node.php';
+include __DIR__ . '/ICollection.php';
+include __DIR__ . '/IExtendedCollection.php';
+include __DIR__ . '/IFile.php';
+include __DIR__ . '/IQuota.php';
+include __DIR__ . '/Locks/Plugin.php';
+include __DIR__ . '/Mount/Plugin.php';
+include __DIR__ . '/ObjectTree.php';
+include __DIR__ . '/Property/GetLastModified.php';
+include __DIR__ . '/Property/Href.php';
+include __DIR__ . '/Property/HrefList.php';
+include __DIR__ . '/Property/LockDiscovery.php';
+include __DIR__ . '/Property/ResourceType.php';
+include __DIR__ . '/Property/Response.php';
+include __DIR__ . '/Property/ResponseList.php';
+include __DIR__ . '/Property/SupportedLock.php';
+include __DIR__ . '/Property/SupportedReportSet.php';
+include __DIR__ . '/Tree/Filesystem.php';
+include __DIR__ . '/Collection.php';
+include __DIR__ . '/Directory.php';
+include __DIR__ . '/Exception/ConflictingLock.php';
+include __DIR__ . '/Exception/FileNotFound.php';
+include __DIR__ . '/File.php';
+include __DIR__ . '/FS/Directory.php';
+include __DIR__ . '/FS/File.php';
+include __DIR__ . '/FSExt/Directory.php';
+include __DIR__ . '/FSExt/File.php';
+include __DIR__ . '/SimpleCollection.php';
+include __DIR__ . '/SimpleDirectory.php';
+include __DIR__ . '/SimpleFile.php';
+// End includes
diff --git a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
new file mode 100755
index 0000000000..e05b774980
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This is a helper class that easily allows you to create a collection that
+ * has a childnode for every principal.
+ *
+ * To use this class, simply implement the getChildForPrincipal method.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection  {
+
+    /**
+     * Node or 'directory' name.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * If this value is set to true, it effectively disables listing of users
+     * it still allows user to find other users if they have an exact url.
+     *
+     * @var bool
+     */
+    public $disableListing = false;
+
+    /**
+     * Creates the object
+     *
+     * This object must be passed the principal backend. This object will
+     * filter all principals from a specified prefix ($principalPrefix). The
+     * default is 'principals', if your principals are stored in a different
+     * collection, override $principalPrefix
+     *
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, $principalPrefix = 'principals') {
+
+        $this->principalPrefix = $principalPrefix;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return Sabre_DAVACL_IPrincipal
+     */
+    abstract function getChildForPrincipal(array $principalInfo);
+
+    /**
+     * Returns the name of this collection.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalPrefix);
+        return $name;
+
+    }
+
+    /**
+     * Return the list of users
+     *
+     * @return array
+     */
+    public function getChildren() {
+
+        if ($this->disableListing)
+            throw new Sabre_DAV_Exception_MethodNotAllowed('Listing members of this collection is disabled');
+
+        $children = array();
+        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
+
+            $children[] = $this->getChildForPrincipal($principalInfo);
+
+
+        }
+        return $children;
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * @param string $name
+     * @throws Sabre_DAV_Exception_NotFound
+     * @return Sabre_DAV_IPrincipal
+     */
+    public function getChild($name) {
+
+        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
+        if (!$principalInfo) throw new Sabre_DAV_Exception_NotFound('Principal with name ' . $name . ' not found');
+        return $this->getChildForPrincipal($principalInfo);
+
+    }
+
+    /**
+     * This method is used to search for principals matching a set of
+     * properties.
+     *
+     * This search is specifically used by RFC3744's principal-property-search
+     * REPORT. You should at least allow searching on
+     * http://sabredav.org/ns}email-address.
+     *
+     * The actual search should be a unicode-non-case-sensitive search. The
+     * keys in searchProperties are the WebDAV property names, while the values
+     * are the property values to search on.
+     *
+     * If multiple properties are being searched on, the search should be
+     * AND'ed.
+     *
+     * This method should simply return a list of 'child names', which may be
+     * used to call $this->getChild in the future.
+     *
+     * @param array $searchProperties
+     * @return array
+     */
+    public function searchPrincipals(array $searchProperties) {
+
+        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties);
+        $r = array();
+
+        foreach($result as $row) {
+            list(, $r[]) = Sabre_DAV_URLUtil::splitPath($row);
+        }
+
+        return $r;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
new file mode 100755
index 0000000000..4b9f93b003
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_AceConflict
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
new file mode 100755
index 0000000000..9b055dd970
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * NeedPrivileges
+ *
+ * The 403-need privileges is thrown when a user didn't have the appropriate
+ * permissions to perform an operation
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
+
+    /**
+     * The relevant uri
+     *
+     * @var string
+     */
+    protected $uri;
+
+    /**
+     * The privileges the user didn't have.
+     *
+     * @var array
+     */
+    protected $privileges;
+
+    /**
+     * Constructor
+     *
+     * @param string $uri
+     * @param array $privileges
+     */
+    public function __construct($uri,array $privileges) {
+
+        $this->uri = $uri;
+        $this->privileges = $privileges;
+
+        parent::__construct('User did not have the required privileges (' . implode(',', $privileges) . ') for path "' . $uri . '"');
+
+    }
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}need-privileges element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:need-privileges');
+        $errorNode->appendChild($np);
+
+        foreach($this->privileges as $privilege) {
+
+            $resource = $doc->createElementNS('DAV:','d:resource');
+            $np->appendChild($resource);
+
+            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
+
+            $priv = $doc->createElementNS('DAV:','d:privilege');
+            $resource->appendChild($priv);
+
+            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
+            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
+
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
new file mode 100755
index 0000000000..f44e3e3228
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NoAbstract
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}no-abstract element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:no-abstract');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
new file mode 100755
index 0000000000..8d1e38ca1b
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NotRecognizedPrincipal
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:recognized-principal');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
new file mode 100755
index 0000000000..3b5d012d7f
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NotSupportedPrivilege
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $doc = $errorNode->ownerDocument;
+
+        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
+        $errorNode->appendChild($np);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IACL.php b/3rdparty/Sabre/DAVACL/IACL.php
new file mode 100755
index 0000000000..003e699348
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IACL.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * ACL-enabled node
+ *
+ * If you want to add WebDAV ACL to a node, you must implement this class
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IACL extends Sabre_DAV_INode {
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    function getOwner();
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    function getGroup();
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    function getACL();
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    function setACL(array $acl);
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    function getSupportedPrivilegeSet();
+
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipal.php b/3rdparty/Sabre/DAVACL/IPrincipal.php
new file mode 100755
index 0000000000..fc7605bf62
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IPrincipal.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * IPrincipal interface
+ *
+ * Implement this interface to define your own principals
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    function getAlternateUriSet();
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    function getPrincipalUrl();
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    function getGroupMemberSet();
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    function getGroupMembership();
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $principals
+     * @return void
+     */
+    function setGroupMemberSet(array $principals);
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename.
+     *
+     * @return string
+     */
+    function getDisplayName();
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
new file mode 100755
index 0000000000..e798bf890c
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * Implement this interface to create your own principal backends.
+ *
+ * Creating backends for principals is entirely optional. You can also
+ * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by
+ * Sabre_DAVACL_AbstractPrincipalCollection.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IPrincipalBackend {
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
+     *     field that's actually injected in a number of other properties. If
+     *     you have an email address, use this property.
+     *
+     * @param string $prefixPath
+     * @return array
+     */
+    function getPrincipalsByPrefix($prefixPath);
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    function getPrincipalByPath($path);
+
+    /**
+     * Updates one ore more webdav properties on a principal.
+     *
+     * The list of mutations is supplied as an array. Each key in the array is
+     * a propertyname, such as {DAV:}displayname.
+     *
+     * Each value is the actual value to be updated. If a value is null, it
+     * must be deleted.
+     *
+     * This method should be atomic. It must either completely succeed, or
+     * completely fail. Success and failure can simply be returned as 'true' or
+     * 'false'.
+     *
+     * It is also possible to return detailed failure information. In that case
+     * an array such as this should be returned:
+     *
+     * array(
+     *   200 => array(
+     *      '{DAV:}prop1' => null,
+     *   ),
+     *   201 => array(
+     *      '{DAV:}prop2' => null,
+     *   ),
+     *   403 => array(
+     *      '{DAV:}prop3' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}prop4' => null,
+     *   ),
+     * );
+     *
+     * In this previous example prop1 was successfully updated or deleted, and
+     * prop2 was succesfully created.
+     *
+     * prop3 failed to update due to '403 Forbidden' and because of this prop4
+     * also could not be updated with '424 Failed dependency'.
+     *
+     * This last example was actually incorrect. While 200 and 201 could appear
+     * in 1 response, if there's any error (403) the other properties should
+     * always fail with 423 (failed dependency).
+     *
+     * But anyway, if you don't want to scratch your head over this, just
+     * return true or false.
+     *
+     * @param string $path
+     * @param array $mutations
+     * @return array|bool
+     */
+    function updatePrincipal($path, $mutations);
+
+    /**
+     * This method is used to search for principals matching a set of
+     * properties.
+     *
+     * This search is specifically used by RFC3744's principal-property-search
+     * REPORT. You should at least allow searching on
+     * http://sabredav.org/ns}email-address.
+     *
+     * The actual search should be a unicode-non-case-sensitive search. The
+     * keys in searchProperties are the WebDAV property names, while the values
+     * are the property values to search on.
+     *
+     * If multiple properties are being searched on, the search should be
+     * AND'ed.
+     *
+     * This method should simply return an array with full principal uri's.
+     *
+     * If somebody attempted to search on a property the backend does not
+     * support, you should simply return 0 results.
+     *
+     * You can also just return 0 results if you choose to not support
+     * searching at all, but keep in mind that this may stop certain features
+     * from working.
+     *
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties);
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return array
+     */
+    function getGroupMemberSet($principal);
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     */
+    function getGroupMembership($principal);
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param array $members
+     * @return void
+     */
+    function setGroupMemberSet($principal, array $members);
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Plugin.php b/3rdparty/Sabre/DAVACL/Plugin.php
new file mode 100755
index 0000000000..5c828c6d97
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Plugin.php
@@ -0,0 +1,1348 @@
+<?php
+
+/**
+ * SabreDAV ACL Plugin
+ *
+ * This plugin provides funcitonality to enforce ACL permissions.
+ * ACL is defined in RFC3744.
+ *
+ * In addition it also provides support for the {DAV:}current-user-principal
+ * property, defined in RFC5397 and the {DAV:}expand-property report, as
+ * defined in RFC3253.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Recursion constants
+     *
+     * This only checks the base node
+     */
+    const R_PARENT = 1;
+
+    /**
+     * Recursion constants
+     *
+     * This checks every node in the tree
+     */
+    const R_RECURSIVE = 2;
+
+    /**
+     * Recursion constants
+     *
+     * This checks every parentnode in the tree, but not leaf-nodes.
+     */
+    const R_RECURSIVEPARENTS = 3;
+
+    /**
+     * Reference to server object.
+     *
+     * @var Sabre_DAV_Server
+     */
+    protected $server;
+
+    /**
+     * List of urls containing principal collections.
+     * Modify this if your principals are located elsewhere.
+     *
+     * @var array
+     */
+    public $principalCollectionSet = array(
+        'principals',
+    );
+
+    /**
+     * By default ACL is only enforced for nodes that have ACL support (the
+     * ones that implement Sabre_DAVACL_IACL). For any other node, access is
+     * always granted.
+     *
+     * To override this behaviour you can turn this setting off. This is useful
+     * if you plan to fully support ACL in the entire tree.
+     *
+     * @var bool
+     */
+    public $allowAccessToNodesWithoutACL = true;
+
+    /**
+     * By default nodes that are inaccessible by the user, can still be seen
+     * in directory listings (PROPFIND on parent with Depth: 1)
+     *
+     * In certain cases it's desirable to hide inaccessible nodes. Setting this
+     * to true will cause these nodes to be hidden from directory listings.
+     *
+     * @var bool
+     */
+    public $hideNodesFromListings = false;
+
+    /**
+     * This string is prepended to the username of the currently logged in
+     * user. This allows the plugin to determine the principal path based on
+     * the username.
+     *
+     * @var string
+     */
+    public $defaultUsernamePath = 'principals';
+
+    /**
+     * This list of properties are the properties a client can search on using
+     * the {DAV:}principal-property-search report.
+     *
+     * The keys are the property names, values are descriptions.
+     *
+     * @var array
+     */
+    public $principalSearchPropertySet = array(
+        '{DAV:}displayname' => 'Display name',
+        '{http://sabredav.org/ns}email-address' => 'Email address',
+    );
+
+    /**
+     * Any principal uri's added here, will automatically be added to the list 
+     * of ACL's. They will effectively receive {DAV:}all privileges, as a 
+     * protected privilege.
+     * 
+     * @var array 
+     */
+    public $adminPrincipals = array();
+
+    /**
+     * Returns a list of features added by this plugin.
+     *
+     * This list is used in the response of a HTTP OPTIONS request.
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('access-control');
+
+    }
+
+    /**
+     * Returns a list of available methods for a given url
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getMethods($uri) {
+
+        return array('ACL');
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+
+        return 'acl';
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+
+        return array(
+            '{DAV:}expand-property',
+            '{DAV:}principal-property-search',
+            '{DAV:}principal-search-property-set',
+        );
+
+    }
+
+
+    /**
+     * Checks if the current user has the specified privilege(s).
+     *
+     * You can specify a single privilege, or a list of privileges.
+     * This method will throw an exception if the privilege is not available
+     * and return true otherwise.
+     *
+     * @param string $uri
+     * @param array|string $privileges
+     * @param int $recursion
+     * @param bool $throwExceptions if set to false, this method won't through exceptions.
+     * @throws Sabre_DAVACL_Exception_NeedPrivileges
+     * @return bool
+     */
+    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+
+        if (!is_array($privileges)) $privileges = array($privileges);
+
+        $acl = $this->getCurrentUserPrivilegeSet($uri);
+
+        if (is_null($acl)) {
+            if ($this->allowAccessToNodesWithoutACL) {
+                return true;
+            } else {
+                if ($throwExceptions)
+                    throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$privileges);
+                else
+                    return false;
+
+            }
+        }
+
+        $failed = array();
+        foreach($privileges as $priv) {
+
+            if (!in_array($priv, $acl)) {
+                $failed[] = $priv;
+            }
+
+        }
+
+        if ($failed) {
+            if ($throwExceptions)
+                throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$failed);
+            else
+                return false;
+        }
+        return true;
+
+    }
+
+    /**
+     * Returns the standard users' principal.
+     *
+     * This is one authorative principal url for the current user.
+     * This method will return null if the user wasn't logged in.
+     *
+     * @return string|null
+     */
+    public function getCurrentUserPrincipal() {
+
+        $authPlugin = $this->server->getPlugin('auth');
+        if (is_null($authPlugin)) return null;
+
+        $userName = $authPlugin->getCurrentUser();
+        if (!$userName) return null;
+
+        return $this->defaultUsernamePath . '/' . $userName;
+
+    }
+
+    /**
+     * Returns a list of principals that's associated to the current
+     * user, either directly or through group membership.
+     *
+     * @return array
+     */
+    public function getCurrentUserPrincipals() {
+
+        $currentUser = $this->getCurrentUserPrincipal();
+
+        if (is_null($currentUser)) return array();
+
+        $check = array($currentUser);
+        $principals = array($currentUser);
+
+        while(count($check)) {
+
+            $principal = array_shift($check);
+
+            $node = $this->server->tree->getNodeForPath($principal);
+            if ($node instanceof Sabre_DAVACL_IPrincipal) {
+                foreach($node->getGroupMembership() as $groupMember) {
+
+                    if (!in_array($groupMember, $principals)) {
+
+                        $check[] = $groupMember;
+                        $principals[] = $groupMember;
+
+                    }
+
+                }
+
+            }
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns the supported privilege structure for this ACL plugin.
+     *
+     * See RFC3744 for more details. Currently we default on a simple,
+     * standard structure.
+     *
+     * You can either get the list of privileges by a uri (path) or by
+     * specifying a Node.
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getSupportedPrivilegeSet($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+
+        if ($node instanceof Sabre_DAVACL_IACL) {
+            $result = $node->getSupportedPrivilegeSet();
+
+            if ($result)
+                return $result;
+        }
+
+        return self::getDefaultSupportedPrivilegeSet();
+
+    }
+
+    /**
+     * Returns a fairly standard set of privileges, which may be useful for
+     * other systems to use as a basis.
+     *
+     * @return array
+     */
+    static function getDefaultSupportedPrivilegeSet() {
+
+        return array(
+            'privilege'  => '{DAV:}all',
+            'abstract'   => true,
+            'aggregates' => array(
+                array(
+                    'privilege'  => '{DAV:}read',
+                    'aggregates' => array(
+                        array(
+                            'privilege' => '{DAV:}read-acl',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}read-current-user-privilege-set',
+                            'abstract'  => true,
+                        ),
+                    ),
+                ), // {DAV:}read
+                array(
+                    'privilege'  => '{DAV:}write',
+                    'aggregates' => array(
+                        array(
+                            'privilege' => '{DAV:}write-acl',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}write-properties',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}write-content',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}bind',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}unbind',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}unlock',
+                            'abstract'  => true,
+                        ),
+                    ),
+                ), // {DAV:}write
+            ),
+        ); // {DAV:}all
+
+    }
+
+    /**
+     * Returns the supported privilege set as a flat list
+     *
+     * This is much easier to parse.
+     *
+     * The returned list will be index by privilege name.
+     * The value is a struct containing the following properties:
+     *   - aggregates
+     *   - abstract
+     *   - concrete
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    final public function getFlatPrivilegeSet($node) {
+
+        $privs = $this->getSupportedPrivilegeSet($node);
+
+        $flat = array();
+        $this->getFPSTraverse($privs, null, $flat);
+
+        return $flat;
+
+    }
+
+    /**
+     * Traverses the privilege set tree for reordering
+     *
+     * This function is solely used by getFlatPrivilegeSet, and would have been
+     * a closure if it wasn't for the fact I need to support PHP 5.2.
+     *
+     * @param array $priv
+     * @param $concrete
+     * @param array $flat
+     * @return void
+     */
+    final private function getFPSTraverse($priv, $concrete, &$flat) {
+
+        $myPriv = array(
+            'privilege' => $priv['privilege'],
+            'abstract' => isset($priv['abstract']) && $priv['abstract'],
+            'aggregates' => array(),
+            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
+        );
+
+        if (isset($priv['aggregates']))
+            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
+
+        $flat[$priv['privilege']] = $myPriv;
+
+        if (isset($priv['aggregates'])) {
+
+            foreach($priv['aggregates'] as $subPriv) {
+
+                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
+
+            }
+
+        }
+
+    }
+
+    /**
+     * Returns the full ACL list.
+     *
+     * Either a uri or a Sabre_DAV_INode may be passed.
+     *
+     * null will be returned if the node doesn't support ACLs.
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getACL($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+        if (!$node instanceof Sabre_DAVACL_IACL) {
+            return null;
+        }
+        $acl = $node->getACL();
+        foreach($this->adminPrincipals as $adminPrincipal) {
+            $acl[] = array(
+                'principal' => $adminPrincipal,
+                'privilege' => '{DAV:}all',
+                'protected' => true,
+            );
+        }
+        return $acl;
+
+    }
+
+    /**
+     * Returns a list of privileges the current user has
+     * on a particular node.
+     *
+     * Either a uri or a Sabre_DAV_INode may be passed.
+     *
+     * null will be returned if the node doesn't support ACLs.
+     *
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getCurrentUserPrivilegeSet($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+
+        $acl = $this->getACL($node);
+
+        if (is_null($acl)) return null;
+
+        $principals = $this->getCurrentUserPrincipals();
+
+        $collected = array();
+
+        foreach($acl as $ace) {
+
+            $principal = $ace['principal'];
+
+            switch($principal) {
+
+                case '{DAV:}owner' :
+                    $owner = $node->getOwner();
+                    if ($owner && in_array($owner, $principals)) {
+                        $collected[] = $ace;
+                    }
+                    break;
+
+
+                // 'all' matches for every user
+                case '{DAV:}all' :
+
+                // 'authenticated' matched for every user that's logged in.
+                // Since it's not possible to use ACL while not being logged
+                // in, this is also always true.
+                case '{DAV:}authenticated' :
+                    $collected[] = $ace;
+                    break;
+
+                // 'unauthenticated' can never occur either, so we simply
+                // ignore these.
+                case '{DAV:}unauthenticated' :
+                    break;
+
+                default :
+                    if (in_array($ace['principal'], $principals)) {
+                        $collected[] = $ace;
+                    }
+                    break;
+
+            }
+
+
+
+        }
+
+        // Now we deduct all aggregated privileges.
+        $flat = $this->getFlatPrivilegeSet($node);
+
+        $collected2 = array();
+        while(count($collected)) {
+
+            $current = array_pop($collected);
+            $collected2[] = $current['privilege'];
+
+            foreach($flat[$current['privilege']]['aggregates'] as $subPriv) {
+                $collected2[] = $subPriv;
+                $collected[] = $flat[$subPriv];
+            }
+
+        }
+
+        return array_values(array_unique($collected2));
+
+    }
+
+    /**
+     * Principal property search
+     *
+     * This method can search for principals matching certain values in
+     * properties.
+     *
+     * This method will return a list of properties for the matched properties.
+     *
+     * @param array $searchProperties    The properties to search on. This is a
+     *                                   key-value list. The keys are property
+     *                                   names, and the values the strings to
+     *                                   match them on.
+     * @param array $requestedProperties This is the list of properties to
+     *                                   return for every match.
+     * @param string $collectionUri      The principal collection to search on.
+     *                                   If this is ommitted, the standard
+     *                                   principal collection-set will be used.
+     * @return array     This method returns an array structure similar to
+     *                  Sabre_DAV_Server::getPropertiesForPath. Returned
+     *                  properties are index by a HTTP status code.
+     *
+     */
+    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null) {
+
+        if (!is_null($collectionUri)) {
+            $uris = array($collectionUri);
+        } else {
+            $uris = $this->principalCollectionSet;
+        }
+
+        $lookupResults = array();
+        foreach($uris as $uri) {
+
+            $principalCollection = $this->server->tree->getNodeForPath($uri);
+            if (!$principalCollection instanceof Sabre_DAVACL_AbstractPrincipalCollection) {
+                // Not a principal collection, we're simply going to ignore
+                // this.
+                continue;
+            }
+
+            $results = $principalCollection->searchPrincipals($searchProperties);
+            foreach($results as $result) {
+                $lookupResults[] = rtrim($uri,'/') . '/' . $result;
+            }
+
+        }
+
+        $matches = array();
+
+        foreach($lookupResults as $lookupResult) {
+
+            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
+
+        }
+
+        return $matches;
+
+    }
+
+    /**
+     * Sets up the plugin
+     *
+     * This method is automatically called by the server class.
+     *
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+
+        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
+        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
+        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
+        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
+        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
+
+        array_push($server->protectedProperties,
+            '{DAV:}alternate-URI-set',
+            '{DAV:}principal-URL',
+            '{DAV:}group-membership',
+            '{DAV:}principal-collection-set',
+            '{DAV:}current-user-principal',
+            '{DAV:}supported-privilege-set',
+            '{DAV:}current-user-privilege-set',
+            '{DAV:}acl',
+            '{DAV:}acl-restrictions',
+            '{DAV:}inherited-acl-set',
+            '{DAV:}owner',
+            '{DAV:}group'
+        );
+
+        // Automatically mapping nodes implementing IPrincipal to the
+        // {DAV:}principal resourcetype.
+        $server->resourceTypeMapping['Sabre_DAVACL_IPrincipal'] = '{DAV:}principal';
+
+        // Mapping the group-member-set property to the HrefList property
+        // class.
+        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre_DAV_Property_HrefList';
+
+    }
+
+
+    /* {{{ Event handlers */
+
+    /**
+     * Triggered before any method is handled
+     *
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function beforeMethod($method, $uri) {
+
+        $exists = $this->server->tree->nodeExists($uri);
+
+        // If the node doesn't exists, none of these checks apply
+        if (!$exists) return;
+
+        switch($method) {
+
+            case 'GET' :
+            case 'HEAD' :
+            case 'OPTIONS' :
+                // For these 3 we only need to know if the node is readable.
+                $this->checkPrivileges($uri,'{DAV:}read');
+                break;
+
+            case 'PUT' :
+            case 'LOCK' :
+            case 'UNLOCK' :
+                // This method requires the write-content priv if the node
+                // already exists, and bind on the parent if the node is being
+                // created.
+                // The bind privilege is handled in the beforeBind event.
+                $this->checkPrivileges($uri,'{DAV:}write-content');
+                break;
+
+
+            case 'PROPPATCH' :
+                $this->checkPrivileges($uri,'{DAV:}write-properties');
+                break;
+
+            case 'ACL' :
+                $this->checkPrivileges($uri,'{DAV:}write-acl');
+                break;
+
+            case 'COPY' :
+            case 'MOVE' :
+                // Copy requires read privileges on the entire source tree.
+                // If the target exists write-content normally needs to be
+                // checked, however, we're deleting the node beforehand and
+                // creating a new one after, so this is handled by the
+                // beforeUnbind event.
+                //
+                // The creation of the new node is handled by the beforeBind
+                // event.
+                //
+                // If MOVE is used beforeUnbind will also be used to check if
+                // the sourcenode can be deleted.
+                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
+
+                break;
+
+        }
+
+    }
+
+    /**
+     * Triggered before a new node is created.
+     *
+     * This allows us to check permissions for any operation that creates a
+     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function beforeBind($uri) {
+
+        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
+        $this->checkPrivileges($parentUri,'{DAV:}bind');
+
+    }
+
+    /**
+     * Triggered before a node is deleted
+     *
+     * This allows us to check permissions for any operation that will delete
+     * an existing node.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function beforeUnbind($uri) {
+
+        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
+        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
+
+    }
+
+    /**
+     * Triggered before a node is unlocked.
+     *
+     * @param string $uri
+     * @param Sabre_DAV_Locks_LockInfo $lock
+     * @TODO: not yet implemented
+     * @return void
+     */
+    public function beforeUnlock($uri, Sabre_DAV_Locks_LockInfo $lock) {
+
+
+    }
+
+    /**
+     * Triggered before properties are looked up in specific nodes.
+     *
+     * @param string $uri
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @TODO really should be broken into multiple methods, or even a class.
+     * @return void
+     */
+    public function beforeGetProperties($uri, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
+
+        // Checking the read permission
+        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
+
+            // User is not allowed to read properties
+            if ($this->hideNodesFromListings) {
+                return false;
+            }
+
+            // Marking all requested properties as '403'.
+            foreach($requestedProperties as $key=>$requestedProperty) {
+                unset($requestedProperties[$key]);
+                $returnedProperties[403][$requestedProperty] = null;
+            }
+            return;
+
+        }
+
+        /* Adding principal properties */
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new Sabre_DAV_Property_HrefList($node->getAlternateUriSet());
+
+            }
+            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}principal-URL'] = new Sabre_DAV_Property_Href($node->getPrincipalUrl() . '/');
+
+            }
+            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}group-member-set'] = new Sabre_DAV_Property_HrefList($node->getGroupMemberSet());
+
+            }
+            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}group-membership'] = new Sabre_DAV_Property_HrefList($node->getGroupMembership());
+
+            }
+
+            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
+
+                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
+
+            }
+
+        }
+        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            $val = $this->principalCollectionSet;
+            // Ensuring all collections end with a slash
+            foreach($val as $k=>$v) $val[$k] = $v . '/';
+            $returnedProperties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_HrefList($val);
+
+        }
+        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            if ($url = $this->getCurrentUserPrincipal()) {
+                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF, $url . '/');
+            } else {
+                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::UNAUTHENTICATED);
+            }
+
+        }
+        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Sabre_DAVACL_Property_SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
+
+        }
+        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
+
+            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
+                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
+                unset($requestedProperties[$index]);
+            } else {
+                $val = $this->getCurrentUserPrivilegeSet($node);
+                if (!is_null($val)) {
+                    unset($requestedProperties[$index]);
+                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Sabre_DAVACL_Property_CurrentUserPrivilegeSet($val);
+                }
+            }
+
+        }
+
+        /* The ACL property contains all the permissions */
+        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
+
+            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[403]['{DAV:}acl'] = null;
+
+            } else {
+
+                $acl = $this->getACL($node);
+                if (!is_null($acl)) {
+                    unset($requestedProperties[$index]);
+                    $returnedProperties[200]['{DAV:}acl'] = new Sabre_DAVACL_Property_Acl($this->getACL($node));
+                }
+
+            }
+
+        }
+
+        /* The acl-restrictions property contains information on how privileges
+         * must behave.
+         */
+        if (false !== ($index = array_search('{DAV:}acl-restrictions', $requestedProperties))) {
+            unset($requestedProperties[$index]);
+            $returnedProperties[200]['{DAV:}acl-restrictions'] = new Sabre_DAVACL_Property_AclRestrictions();
+        }
+
+    }
+
+    /**
+     * This method intercepts PROPPATCH methods and make sure the
+     * group-member-set is updated correctly.
+     *
+     * @param array $propertyDelta
+     * @param array $result
+     * @param Sabre_DAV_INode $node
+     * @return bool
+     */
+    public function updateProperties(&$propertyDelta, &$result, Sabre_DAV_INode $node) {
+
+        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
+            return;
+
+        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
+            $memberSet = array();
+        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof Sabre_DAV_Property_HrefList) {
+            $memberSet = $propertyDelta['{DAV:}group-member-set']->getHrefs();
+        } else {
+            throw new Sabre_DAV_Exception('The group-member-set property MUST be an instance of Sabre_DAV_Property_HrefList or null');
+        }
+
+        if (!($node instanceof Sabre_DAVACL_IPrincipal)) {
+            $result[403]['{DAV:}group-member-set'] = null;
+            unset($propertyDelta['{DAV:}group-member-set']);
+
+            // Returning false will stop the updateProperties process
+            return false;
+        }
+
+        $node->setGroupMemberSet($memberSet);
+
+        $result[200]['{DAV:}group-member-set'] = null;
+        unset($propertyDelta['{DAV:}group-member-set']);
+
+    }
+
+    /**
+     * This method handels HTTP REPORT requests
+     *
+     * @param string $reportName
+     * @param DOMNode $dom
+     * @return bool
+     */
+    public function report($reportName, $dom) {
+
+        switch($reportName) {
+
+            case '{DAV:}principal-property-search' :
+                $this->principalPropertySearchReport($dom);
+                return false;
+            case '{DAV:}principal-search-property-set' :
+                $this->principalSearchPropertySetReport($dom);
+                return false;
+            case '{DAV:}expand-property' :
+                $this->expandPropertyReport($dom);
+                return false;
+
+        }
+
+    }
+
+    /**
+     * This event is triggered for any HTTP method that is not known by the
+     * webserver.
+     *
+     * @param string $method
+     * @param string $uri
+     * @return bool
+     */
+    public function unknownMethod($method, $uri) {
+
+        if ($method!=='ACL') return;
+
+        $this->httpACL($uri);
+        return false;
+
+    }
+
+    /**
+     * This method is responsible for handling the 'ACL' event.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function httpACL($uri) {
+
+        $body = $this->server->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $newAcl =
+            Sabre_DAVACL_Property_Acl::unserialize($dom->firstChild)
+            ->getPrivileges();
+
+        // Normalizing urls
+        foreach($newAcl as $k=>$newAce) {
+            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
+        }
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_DAVACL_IACL)) {
+            throw new Sabre_DAV_Exception_MethodNotAllowed('This node does not support the ACL method');
+        }
+
+        $oldAcl = $this->getACL($node);
+
+        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
+
+        /* Checking if protected principals from the existing principal set are
+           not overwritten. */
+        foreach($oldAcl as $oldAce) {
+
+            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
+
+            $found = false;
+            foreach($newAcl as $newAce) {
+                if (
+                    $newAce['privilege'] === $oldAce['privilege'] &&
+                    $newAce['principal'] === $oldAce['principal'] &&
+                    $newAce['protected']
+                )
+                $found = true;
+            }
+
+            if (!$found)
+                throw new Sabre_DAVACL_Exception_AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+
+        }
+
+        foreach($newAcl as $newAce) {
+
+            // Do we recognize the privilege
+            if (!isset($supportedPrivileges[$newAce['privilege']])) {
+                throw new Sabre_DAVACL_Exception_NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
+            }
+
+            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
+                throw new Sabre_DAVACL_Exception_NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
+            }
+
+            // Looking up the principal
+            try {
+                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
+            } catch (Sabre_DAV_Exception_NotFound $e) {
+                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
+            }
+            if (!($principal instanceof Sabre_DAVACL_IPrincipal)) {
+                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
+            }
+
+        }
+        $node->setACL($newAcl);
+
+    }
+
+    /* }}} */
+
+    /* Reports {{{ */
+
+    /**
+     * The expand-property report is defined in RFC3253 section 3-8.
+     *
+     * This report is very similar to a standard PROPFIND. The difference is
+     * that it has the additional ability to look at properties containing a
+     * {DAV:}href element, follow that property and grab additional elements
+     * there.
+     *
+     * Other rfc's, such as ACL rely on this report, so it made sense to put
+     * it in this plugin.
+     *
+     * @param DOMElement $dom
+     * @return void
+     */
+    protected function expandPropertyReport($dom) {
+
+        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
+        $depth = $this->server->getHTTPDepth(0);
+        $requestUri = $this->server->getRequestUri();
+
+        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($result as $response) {
+            $response->serialize($this->server, $multiStatus);
+        }
+
+        $xml = $dom->saveXML();
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    /**
+     * This method is used by expandPropertyReport to parse
+     * out the entire HTTP request.
+     *
+     * @param DOMElement $node
+     * @return array
+     */
+    protected function parseExpandPropertyReportRequest($node) {
+
+        $requestedProperties = array();
+        do {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
+
+            if ($node->firstChild) {
+
+                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
+
+            } else {
+
+                $children = array();
+
+            }
+
+            $namespace = $node->getAttribute('namespace');
+            if (!$namespace) $namespace = 'DAV:';
+
+            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
+            $requestedProperties[$propName] = $children;
+
+        } while ($node = $node->nextSibling);
+
+        return $requestedProperties;
+
+    }
+
+    /**
+     * This method expands all the properties and returns
+     * a list with property values
+     *
+     * @param array $path
+     * @param array $requestedProperties the list of required properties
+     * @param int $depth
+     * @return array
+     */
+    protected function expandProperties($path, array $requestedProperties, $depth) {
+
+        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
+
+        $result = array();
+
+        foreach($foundProperties as $node) {
+
+            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
+
+                // We're only traversing if sub-properties were requested
+                if(count($childRequestedProperties)===0) continue;
+
+                // We only have to do the expansion if the property was found
+                // and it contains an href element.
+                if (!array_key_exists($propertyName,$node[200])) continue;
+
+                if ($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref) {
+                    $hrefs = array($node[200][$propertyName]->getHref());
+                } elseif ($node[200][$propertyName] instanceof Sabre_DAV_Property_HrefList) {
+                    $hrefs = $node[200][$propertyName]->getHrefs();
+                }
+
+                $childProps = array();
+                foreach($hrefs as $href) {
+                    $childProps = array_merge($childProps, $this->expandProperties($href, $childRequestedProperties, 0));
+                }
+                $node[200][$propertyName] = new Sabre_DAV_Property_ResponseList($childProps);
+
+            }
+            $result[] = new Sabre_DAV_Property_Response($path, $node);
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * principalSearchPropertySetReport
+     *
+     * This method responsible for handing the
+     * {DAV:}principal-search-property-set report. This report returns a list
+     * of properties the client may search on, using the
+     * {DAV:}principal-property-search report.
+     *
+     * @param DOMDocument $dom
+     * @return void
+     */
+    protected function principalSearchPropertySetReport(DOMDocument $dom) {
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+
+        if ($dom->firstChild->hasChildNodes())
+            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements');
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElement('d:principal-search-property-set');
+        $dom->appendChild($root);
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $root->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        $nsList = $this->server->xmlNamespaces;
+
+        foreach($this->principalSearchPropertySet as $propertyName=>$description) {
+
+            $psp = $dom->createElement('d:principal-search-property');
+            $root->appendChild($psp);
+
+            $prop = $dom->createElement('d:prop');
+            $psp->appendChild($prop);
+
+            $propName = null;
+            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+
+            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+            $prop->appendChild($currentProperty);
+
+            $descriptionElem = $dom->createElement('d:description');
+            $descriptionElem->setAttribute('xml:lang','en');
+            $descriptionElem->appendChild($dom->createTextNode($description));
+            $psp->appendChild($descriptionElem);
+
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody($dom->saveXML());
+
+    }
+
+    /**
+     * principalPropertySearchReport
+     *
+     * This method is responsible for handing the
+     * {DAV:}principal-property-search report. This report can be used for
+     * clients to search for groups of principals, based on the value of one
+     * or more properties.
+     *
+     * @param DOMDocument $dom
+     * @return void
+     */
+    protected function principalPropertySearchReport(DOMDocument $dom) {
+
+        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
+
+        $uri = null;
+        if (!$applyToPrincipalCollectionSet) {
+            $uri = $this->server->getRequestUri();
+        }
+        $result = $this->principalSearch($searchProperties, $requestedProperties, $uri);
+
+        $xml = $this->server->generateMultiStatus($result);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    /**
+     * parsePrincipalPropertySearchReportRequest
+     *
+     * This method parses the request body from a
+     * {DAV:}principal-property-search report.
+     *
+     * This method returns an array with two elements:
+     *  1. an array with properties to search on, and their values
+     *  2. a list of propertyvalues that should be returned for the request.
+     *
+     * @param DOMDocument $dom
+     * @return array
+     */
+    protected function parsePrincipalPropertySearchReportRequest($dom) {
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+
+        $searchProperties = array();
+
+        $applyToPrincipalCollectionSet = false;
+
+        // Parsing the search request
+        foreach($dom->firstChild->childNodes as $searchNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set') {
+                $applyToPrincipalCollectionSet = true;
+            }
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
+                continue;
+
+            $propertyName = null;
+            $propertyValue = null;
+
+            foreach($searchNode->childNodes as $childNode) {
+
+                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+
+                    case '{DAV:}prop' :
+                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
+                        reset($property);
+                        $propertyName = key($property);
+                        break;
+
+                    case '{DAV:}match' :
+                        $propertyValue = $childNode->textContent;
+                        break;
+
+                }
+
+
+            }
+
+            if (is_null($propertyName) || is_null($propertyValue))
+                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
+
+            $searchProperties[$propertyName] = $propertyValue;
+
+        }
+
+        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
+
+    }
+
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php
new file mode 100755
index 0000000000..51c6658afd
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Principal.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * Principal class
+ *
+ * This class is a representation of a simple principal
+ *
+ * Many WebDAV specs require a user to show up in the directory
+ * structure.
+ *
+ * This principal also has basic ACL settings, only allowing the principal
+ * access it's own principal.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * Struct with principal information.
+     *
+     * @var array
+     */
+    protected $principalProperties;
+
+    /**
+     * Principal backend
+     *
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the principal object
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param array $principalProperties
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalProperties = array()) {
+
+        if (!isset($principalProperties['uri'])) {
+            throw new Sabre_DAV_Exception('The principal properties must at least contain the \'uri\' key');
+        }
+        $this->principalBackend = $principalBackend;
+        $this->principalProperties = $principalProperties;
+
+    }
+
+    /**
+     * Returns the full principal url
+     *
+     * @return string
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalProperties['uri'];
+
+    }
+
+    /**
+     * Returns a list of alternative urls for a principal
+     *
+     * This can for example be an email address, or ldap url.
+     *
+     * @return array
+     */
+    public function getAlternateUriSet() {
+
+        $uris = array();
+        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
+
+            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
+
+        }
+
+        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
+            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
+        }
+
+        return array_unique($uris);
+
+    }
+
+    /**
+     * Returns the list of group members
+     *
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group.
+     *
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     *
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members.
+     *
+     * @return array
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
+
+    }
+
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     *
+     * This method should throw an exception if the members could not be set.
+     *
+     * @param array $groupMembers
+     * @return void
+     */
+    public function setGroupMemberSet(array $groupMembers) {
+
+        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
+
+    }
+
+
+    /**
+     * Returns this principals name.
+     *
+     * @return string
+     */
+    public function getName() {
+
+        $uri = $this->principalProperties['uri'];
+        list(, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+        return $name;
+
+    }
+
+    /**
+     * Returns the name of the user
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+
+        if (isset($this->principalProperties['{DAV:}displayname'])) {
+            return $this->principalProperties['{DAV:}displayname'];
+        } else {
+            return $this->getName();
+        }
+
+    }
+
+    /**
+     * Returns a list of properties
+     *
+     * @param array $requestedProperties
+     * @return array
+     */
+    public function getProperties($requestedProperties) {
+
+        $newProperties = array();
+        foreach($requestedProperties as $propName) {
+
+            if (isset($this->principalProperties[$propName])) {
+                $newProperties[$propName] = $this->principalProperties[$propName];
+            }
+
+        }
+
+        return $newProperties;
+
+    }
+
+    /**
+     * Updates this principals properties.
+     * 
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateProperties($mutations) {
+
+        return $this->principalBackend->updatePrincipal($this->principalProperties['uri'], $mutations);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalProperties['uri'];
+
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getPrincipalUrl(),
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's.
+     *
+     * @param array $acl
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Updating ACLs is not allowed here');
+
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
new file mode 100755
index 0000000000..a76b4a9d72
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
@@ -0,0 +1,427 @@
+<?php
+
+/**
+ * PDO principal backend
+ *
+ * This is a simple principal backend that maps exactly to the users table, as
+ * used by Sabre_DAV_Auth_Backend_PDO.
+ *
+ * It assumes all principals are in a single collection. The default collection
+ * is 'principals/', but this can be overriden.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
+
+    /**
+     * pdo
+     *
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * PDO table name for 'principals'
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * PDO table name for 'group members'
+     *
+     * @var string
+     */
+    protected $groupMembersTableName;
+
+    /**
+     * A list of additional fields to support
+     *
+     * @var array
+     */
+    protected $fieldMap = array(
+
+        /**
+         * This property can be used to display the users' real name.
+         */
+        '{DAV:}displayname' => array(
+            'dbField' => 'displayname',
+        ),
+
+        /**
+         * This property is actually used by the CardDAV plugin, where it gets
+         * mapped to {http://calendarserver.orgi/ns/}me-card.
+         *
+         * The reason we don't straight-up use that property, is because
+         * me-card is defined as a property on the users' addressbook
+         * collection.
+         */
+        '{http://sabredav.org/ns}vcard-url' => array(
+            'dbField' => 'vcardurl',
+        ),
+        /**
+         * This is the users' primary email-address.
+         */
+        '{http://sabredav.org/ns}email-address' => array(
+            'dbField' => 'email',
+        ),
+    );
+
+    /**
+     * Sets up the backend.
+     *
+     * @param PDO $pdo
+     * @param string $tableName
+     * @param string $groupMembersTableName
+     */
+    public function __construct(PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+        $this->groupMembersTableName = $groupMembersTableName;
+
+    }
+
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
+     *     field that's actualy injected in a number of other properties. If
+     *     you have an email address, use this property.
+     *
+     * @param string $prefixPath
+     * @return array
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+
+        $fields = array(
+            'uri',
+        );
+
+        foreach($this->fieldMap as $key=>$value) {
+            $fields[] = $value['dbField'];
+        }
+        $result = $this->pdo->query('SELECT '.implode(',', $fields).'  FROM '. $this->tableName);
+
+        $principals = array();
+
+        while($row = $result->fetch(PDO::FETCH_ASSOC)) {
+
+            // Checking if the principal is in the prefix
+            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
+            if ($rowPrefix !== $prefixPath) continue;
+
+            $principal = array(
+                'uri' => $row['uri'],
+            );
+            foreach($this->fieldMap as $key=>$value) {
+                if ($row[$value['dbField']]) {
+                    $principal[$key] = $row[$value['dbField']];
+                }
+            }
+            $principals[] = $principal;
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+
+        $fields = array(
+            'id',
+            'uri',
+        );
+
+        foreach($this->fieldMap as $key=>$value) {
+            $fields[] = $value['dbField'];
+        }
+        $stmt = $this->pdo->prepare('SELECT '.implode(',', $fields).'  FROM '. $this->tableName . ' WHERE uri = ?');
+        $stmt->execute(array($path));
+
+        $row = $stmt->fetch(PDO::FETCH_ASSOC);
+        if (!$row) return;
+
+        $principal = array(
+            'id'  => $row['id'],
+            'uri' => $row['uri'],
+        );
+        foreach($this->fieldMap as $key=>$value) {
+            if ($row[$value['dbField']]) {
+                $principal[$key] = $row[$value['dbField']];
+            }
+        }
+        return $principal;
+
+    }
+
+    /**
+     * Updates one ore more webdav properties on a principal.
+     *
+     * The list of mutations is supplied as an array. Each key in the array is
+     * a propertyname, such as {DAV:}displayname.
+     *
+     * Each value is the actual value to be updated. If a value is null, it
+     * must be deleted.
+     *
+     * This method should be atomic. It must either completely succeed, or
+     * completely fail. Success and failure can simply be returned as 'true' or
+     * 'false'.
+     *
+     * It is also possible to return detailed failure information. In that case
+     * an array such as this should be returned:
+     *
+     * array(
+     *   200 => array(
+     *      '{DAV:}prop1' => null,
+     *   ),
+     *   201 => array(
+     *      '{DAV:}prop2' => null,
+     *   ),
+     *   403 => array(
+     *      '{DAV:}prop3' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}prop4' => null,
+     *   ),
+     * );
+     *
+     * In this previous example prop1 was successfully updated or deleted, and
+     * prop2 was succesfully created.
+     *
+     * prop3 failed to update due to '403 Forbidden' and because of this prop4
+     * also could not be updated with '424 Failed dependency'.
+     *
+     * This last example was actually incorrect. While 200 and 201 could appear
+     * in 1 response, if there's any error (403) the other properties should
+     * always fail with 423 (failed dependency).
+     *
+     * But anyway, if you don't want to scratch your head over this, just
+     * return true or false.
+     *
+     * @param string $path
+     * @param array $mutations
+     * @return array|bool
+     */
+    public function updatePrincipal($path, $mutations) {
+
+        $updateAble = array();
+        foreach($mutations as $key=>$value) {
+
+            // We are not aware of this field, we must fail.
+            if (!isset($this->fieldMap[$key])) {
+
+                $response = array(
+                    403 => array(
+                        $key => null,
+                    ),
+                    424 => array(),
+                );
+
+                // Adding the rest to the response as a 424
+                foreach($mutations as $subKey=>$subValue) {
+                    if ($subKey !== $key) {
+                        $response[424][$subKey] = null;
+                    }
+                }
+                return $response;
+            }
+
+            $updateAble[$this->fieldMap[$key]['dbField']] = $value;
+
+        }
+
+        // No fields to update
+        $query = "UPDATE " . $this->tableName . " SET ";
+
+        $first = true;
+        foreach($updateAble as $key => $value) {
+            if (!$first) {
+                $query.= ', ';
+            }
+            $first = false;
+            $query.= "$key = :$key ";
+        }
+        $query.='WHERE uri = :uri';
+        $stmt = $this->pdo->prepare($query);
+        $updateAble['uri'] =  $path;
+        $stmt->execute($updateAble);
+
+        return true;
+
+    }
+
+    /**
+     * This method is used to search for principals matching a set of
+     * properties.
+     *
+     * This search is specifically used by RFC3744's principal-property-search
+     * REPORT. You should at least allow searching on
+     * http://sabredav.org/ns}email-address.
+     *
+     * The actual search should be a unicode-non-case-sensitive search. The
+     * keys in searchProperties are the WebDAV property names, while the values
+     * are the property values to search on.
+     *
+     * If multiple properties are being searched on, the search should be
+     * AND'ed.
+     *
+     * This method should simply return an array with full principal uri's.
+     *
+     * If somebody attempted to search on a property the backend does not
+     * support, you should simply return 0 results.
+     *
+     * You can also just return 0 results if you choose to not support
+     * searching at all, but keep in mind that this may stop certain features
+     * from working.
+     *
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @return array
+     */
+    public function searchPrincipals($prefixPath, array $searchProperties) {
+
+        $query = 'SELECT uri FROM ' . $this->tableName . ' WHERE 1=1 ';
+        $values = array();
+        foreach($searchProperties as $property => $value) {
+
+            switch($property) {
+
+                case '{DAV:}displayname' :
+                    $query.=' AND displayname LIKE ?';
+                    $values[] = '%' . $value . '%';
+                    break;
+                case '{http://sabredav.org/ns}email-address' :
+                    $query.=' AND email LIKE ?';
+                    $values[] = '%' . $value . '%';
+                    break;
+                default :
+                    // Unsupported property
+                    return array();
+
+            }
+
+        }
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($values);
+
+        $principals = array();
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+            // Checking if the principal is in the prefix
+            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
+            if ($rowPrefix !== $prefixPath) continue;
+
+            $principals[] = $row['uri'];
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return array
+     */
+    public function getGroupMemberSet($principal) {
+
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
+        $stmt->execute(array($principal['id']));
+
+        $result = array();
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $row['uri'];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     */
+    public function getGroupMembership($principal) {
+
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
+        $stmt->execute(array($principal['id']));
+
+        $result = array();
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $row['uri'];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param array $members
+     * @return void
+     */
+    public function setGroupMemberSet($principal, array $members) {
+
+        // Grabbing the list of principal id's.
+        $stmt = $this->pdo->prepare('SELECT id, uri FROM '.$this->tableName.' WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
+        $stmt->execute(array_merge(array($principal), $members));
+
+        $memberIds = array();
+        $principalId = null;
+
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            if ($row['uri'] == $principal) {
+                $principalId = $row['id'];
+            } else {
+                $memberIds[] = $row['id'];
+            }
+        }
+        if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
+
+        // Wiping out old members
+        $stmt = $this->pdo->prepare('DELETE FROM '.$this->groupMembersTableName.' WHERE principal_id = ?;');
+        $stmt->execute(array($principalId));
+
+        foreach($memberIds as $memberId) {
+
+            $stmt = $this->pdo->prepare('INSERT INTO '.$this->groupMembersTableName.' (principal_id, member_id) VALUES (?, ?);');
+            $stmt->execute(array($principalId, $memberId));
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalCollection.php b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
new file mode 100755
index 0000000000..c3e4cb83f2
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This collection represents a list of users. It uses
+ * Sabre_DAV_Auth_Backend to determine which users are available on the list.
+ *
+ * The users are instances of Sabre_DAV_Auth_Principal
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return Sabre_DAV_INode
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_DAVACL_Principal($this->principalBackend, $principal);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/Acl.php b/3rdparty/Sabre/DAVACL/Property/Acl.php
new file mode 100755
index 0000000000..05e1a690b3
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/Acl.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * This class represents the {DAV:}acl property
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
+
+    /**
+     * List of privileges
+     *
+     * @var array
+     */
+    private $privileges;
+
+    /**
+     * Whether or not the server base url is required to be prefixed when
+     * serializing the property.
+     *
+     * @var boolean
+     */
+    private $prefixBaseUrl;
+
+    /**
+     * Constructor
+     *
+     * This object requires a structure similar to the return value from
+     * Sabre_DAVACL_Plugin::getACL().
+     *
+     * Each privilege is a an array with at least a 'privilege' property, and a
+     * 'principal' property. A privilege may have a 'protected' property as
+     * well.
+     *
+     * The prefixBaseUrl should be set to false, if the supplied principal urls
+     * are already full urls. If this is kept to true, the servers base url
+     * will automatically be prefixed.
+     *
+     * @param bool $prefixBaseUrl
+     * @param array $privileges
+     */
+    public function __construct(array $privileges, $prefixBaseUrl = true) {
+
+        $this->privileges = $privileges;
+        $this->prefixBaseUrl = $prefixBaseUrl;
+
+    }
+
+    /**
+     * Returns the list of privileges for this property
+     *
+     * @return array
+     */
+    public function getPrivileges() {
+
+        return $this->privileges;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        foreach($this->privileges as $ace) {
+
+            $this->serializeAce($doc, $node, $ace, $server);
+
+        }
+
+    }
+
+    /**
+     * Unserializes the {DAV:}acl xml element.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAVACL_Property_Acl
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $privileges = array();
+        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
+        for($ii=0; $ii < $xaces->length; $ii++) {
+
+            $xace = $xaces->item($ii);
+            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
+            if ($principal->length !== 1) {
+                throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
+            }
+            $principal = Sabre_DAVACL_Property_Principal::unserialize($principal->item(0));
+
+            switch($principal->getType()) {
+                case Sabre_DAVACL_Property_Principal::HREF :
+                    $principal = $principal->getHref();
+                    break;
+                case Sabre_DAVACL_Property_Principal::AUTHENTICATED :
+                    $principal = '{DAV:}authenticated';
+                    break;
+                case Sabre_DAVACL_Property_Principal::UNAUTHENTICATED :
+                    $principal = '{DAV:}unauthenticated';
+                    break;
+                case Sabre_DAVACL_Property_Principal::ALL :
+                    $principal = '{DAV:}all';
+                    break;
+
+            }
+
+            $protected = false;
+
+            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
+                $protected = true;
+            }
+
+            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
+            if ($grants->length < 1) {
+                throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
+            }
+            $grant = $grants->item(0);
+
+            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
+            for($jj=0; $jj<$xprivs->length; $jj++) {
+
+                $xpriv = $xprivs->item($jj);
+
+                $privilegeName = null;
+
+                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
+
+                    $childNode = $xpriv->childNodes->item($kk);
+                    if ($t = Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+                        $privilegeName = $t;
+                        break;
+                    }
+                }
+                if (is_null($privilegeName)) {
+                    throw new Sabre_DAV_Exception_BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
+                }
+
+                $privileges[] = array(
+                    'principal' => $principal,
+                    'protected' => $protected,
+                    'privilege' => $privilegeName,
+                );
+
+            }
+
+        }
+
+        return new self($privileges);
+
+    }
+
+    /**
+     * Serializes a single access control entry.
+     *
+     * @param DOMDocument $doc
+     * @param DOMElement $node
+     * @param array $ace
+     * @param Sabre_DAV_Server $server
+     * @return void
+     */
+    private function serializeAce($doc,$node,$ace, $server) {
+
+        $xace  = $doc->createElementNS('DAV:','d:ace');
+        $node->appendChild($xace);
+
+        $principal = $doc->createElementNS('DAV:','d:principal');
+        $xace->appendChild($principal);
+        switch($ace['principal']) {
+            case '{DAV:}authenticated' :
+                $principal->appendChild($doc->createElementNS('DAV:','d:authenticated'));
+                break;
+            case '{DAV:}unauthenticated' :
+                $principal->appendChild($doc->createElementNS('DAV:','d:unauthenticated'));
+                break;
+            case '{DAV:}all' :
+                $principal->appendChild($doc->createElementNS('DAV:','d:all'));
+                break;
+            default:
+                $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
+        }
+
+        $grant = $doc->createElementNS('DAV:','d:grant');
+        $xace->appendChild($grant);
+
+        $privParts = null;
+
+        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
+
+        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
+        $grant->appendChild($xprivilege);
+
+        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+        if (isset($ace['protected']) && $ace['protected'])
+            $xace->appendChild($doc->createElement('d:protected'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php b/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
new file mode 100755
index 0000000000..a8b054956d
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/AclRestrictions.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * AclRestrictions property
+ *
+ * This property represents {DAV:}acl-restrictions, as defined in RFC3744.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_AclRestrictions extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property into a DOMElement
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $elem
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $elem) {
+
+        $doc = $elem->ownerDocument;
+
+        $elem->appendChild($doc->createElementNS('DAV:','d:grant-only'));
+        $elem->appendChild($doc->createElementNS('DAV:','d:no-invert'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
new file mode 100755
index 0000000000..94a2964061
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * CurrentUserPrivilegeSet
+ *
+ * This class represents the current-user-privilege-set property. When
+ * requested, it contain all the privileges a user has on a specific node.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
+
+    /**
+     * List of privileges
+     *
+     * @var array
+     */
+    private $privileges;
+
+    /**
+     * Creates the object
+     *
+     * Pass the privileges in clark-notation
+     *
+     * @param array $privileges
+     */
+    public function __construct(array $privileges) {
+
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Serializes the property in the DOM
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        foreach($this->privileges as $privName) {
+
+            $this->serializePriv($doc,$node,$privName);
+
+        }
+
+    }
+
+    /**
+     * Serializes one privilege
+     *
+     * @param DOMDocument $doc
+     * @param DOMElement $node
+     * @param string $privName
+     * @return void
+     */
+    protected function serializePriv($doc,$node,$privName) {
+
+        $xp  = $doc->createElementNS('DAV:','d:privilege');
+        $node->appendChild($xp);
+
+        $privParts = null;
+        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
+
+        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/Principal.php b/3rdparty/Sabre/DAVACL/Property/Principal.php
new file mode 100755
index 0000000000..c36328a58e
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/Principal.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * Principal property
+ *
+ * The principal property represents a principal from RFC3744 (ACL).
+ * The property can be used to specify a principal or pseudo principals.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
+     */
+    const UNAUTHENTICATED = 1;
+
+    /**
+     * To specify any principal that is logged in, use AUTHENTICATED
+     */
+    const AUTHENTICATED = 2;
+
+    /**
+     * Specific principals can be specified with the HREF
+     */
+    const HREF = 3;
+
+    /**
+     * Everybody, basically
+     */
+    const ALL = 4;
+
+    /**
+     * Principal-type
+     *
+     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
+     *
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Url to principal
+     *
+     * This value is only used for the HREF principal type.
+     *
+     * @var string
+     */
+    private $href;
+
+    /**
+     * Creates the property.
+     *
+     * The 'type' argument must be one of the type constants defined in this class.
+     *
+     * 'href' is only required for the HREF type.
+     *
+     * @param int $type
+     * @param string|null $href
+     */
+    public function __construct($type, $href = null) {
+
+        $this->type = $type;
+
+        if ($type===self::HREF && is_null($href)) {
+            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
+        }
+        $this->href = $href;
+
+    }
+
+    /**
+     * Returns the principal type
+     *
+     * @return int
+     */
+    public function getType() {
+
+        return $this->type;
+
+    }
+
+    /**
+     * Returns the principal uri.
+     *
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+        switch($this->type) {
+
+            case self::UNAUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
+                );
+                break;
+            case self::AUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':authenticated')
+                );
+                break;
+            case self::HREF :
+                $href = $node->ownerDocument->createElement($prefix . ':href');
+                $href->nodeValue = $server->getBaseUri() . $this->href;
+                $node->appendChild($href);
+                break;
+
+        }
+
+    }
+
+    /**
+     * Deserializes a DOM element into a property object.
+     *
+     * @param DOMElement $dom
+     * @return Sabre_DAV_Property_Principal
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $parent = $dom->firstChild;
+        while(!Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
+            $parent = $parent->nextSibling;
+        }
+
+        switch(Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
+
+            case '{DAV:}unauthenticated' :
+                return new self(self::UNAUTHENTICATED);
+            case '{DAV:}authenticated' :
+                return new self(self::AUTHENTICATED);
+            case '{DAV:}href':
+                return new self(self::HREF, $parent->textContent);
+            case '{DAV:}all':
+                return new self(self::ALL);
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Unexpected element (' . Sabre_DAV_XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
new file mode 100755
index 0000000000..276d57ae09
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * SupportedPrivilegeSet property
+ *
+ * This property encodes the {DAV:}supported-privilege-set property, as defined
+ * in rfc3744. Please consult the rfc for details about it's structure.
+ *
+ * This class expects a structure like the one given from
+ * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its
+ * constructor.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
+
+    /**
+     * privileges
+     *
+     * @var array
+     */
+    private $privileges;
+
+    /**
+     * Constructor
+     *
+     * @param array $privileges
+     */
+    public function __construct(array $privileges) {
+
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Serializes the property into a domdocument.
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $node
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        $this->serializePriv($doc, $node, $this->privileges);
+
+    }
+
+    /**
+     * Serializes a property
+     *
+     * This is a recursive function.
+     *
+     * @param DOMDocument $doc
+     * @param DOMElement $node
+     * @param array $privilege
+     * @return void
+     */
+    private function serializePriv($doc,$node,$privilege) {
+
+        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
+        $node->appendChild($xsp);
+
+        $xp  = $doc->createElementNS('DAV:','d:privilege');
+        $xsp->appendChild($xp);
+
+        $privParts = null;
+        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
+
+        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+        if (isset($privilege['abstract']) && $privilege['abstract']) {
+            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
+        }
+
+        if (isset($privilege['description'])) {
+            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
+        }
+
+        if (isset($privilege['aggregates'])) {
+            foreach($privilege['aggregates'] as $subPrivilege) {
+                $this->serializePriv($doc,$xsp,$subPrivilege);
+            }
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php
new file mode 100755
index 0000000000..9950f74874
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.0';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/DAVACL/includes.php b/3rdparty/Sabre/DAVACL/includes.php
new file mode 100755
index 0000000000..28fa3eed22
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/includes.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Sabre_DAVACL includes file
+ *
+ * Including this file will automatically include all files from the
+ * Sabre_DAVACL package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/AbstractPrincipalCollection.php';
+include __DIR__ . '/Exception/AceConflict.php';
+include __DIR__ . '/Exception/NeedPrivileges.php';
+include __DIR__ . '/Exception/NoAbstract.php';
+include __DIR__ . '/Exception/NotRecognizedPrincipal.php';
+include __DIR__ . '/Exception/NotSupportedPrivilege.php';
+include __DIR__ . '/IACL.php';
+include __DIR__ . '/IPrincipal.php';
+include __DIR__ . '/IPrincipalBackend.php';
+include __DIR__ . '/Plugin.php';
+include __DIR__ . '/Principal.php';
+include __DIR__ . '/PrincipalBackend/PDO.php';
+include __DIR__ . '/PrincipalCollection.php';
+include __DIR__ . '/Property/Acl.php';
+include __DIR__ . '/Property/AclRestrictions.php';
+include __DIR__ . '/Property/CurrentUserPrivilegeSet.php';
+include __DIR__ . '/Property/Principal.php';
+include __DIR__ . '/Property/SupportedPrivilegeSet.php';
+include __DIR__ . '/Version.php';
+// End includes
diff --git a/3rdparty/Sabre/HTTP/AWSAuth.php b/3rdparty/Sabre/HTTP/AWSAuth.php
new file mode 100755
index 0000000000..fb8245c8cb
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/AWSAuth.php
@@ -0,0 +1,227 @@
+<?php
+
+/**
+ * HTTP AWS Authentication handler
+ *
+ * Use this class to leverage amazon's AWS authentication header
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The signature supplied by the HTTP client
+     *
+     * @var string
+     */
+    private $signature = null;
+
+    /**
+     * The accesskey supplied by the HTTP client
+     *
+     * @var string
+     */
+    private $accessKey = null;
+
+    /**
+     * An error code, if any
+     *
+     * This value will be filled with one of the ERR_* constants
+     *
+     * @var int
+     */
+    public $errorCode = 0;
+
+    const ERR_NOAWSHEADER = 1;
+    const ERR_MD5CHECKSUMWRONG = 2;
+    const ERR_INVALIDDATEFORMAT = 3;
+    const ERR_REQUESTTIMESKEWED = 4;
+    const ERR_INVALIDSIGNATURE = 5;
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     *
+     * @return bool
+     */
+    public function init() {
+
+        $authHeader = $this->httpRequest->getHeader('Authorization');
+        $authHeader = explode(' ',$authHeader);
+
+        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
+            $this->errorCode = self::ERR_NOAWSHEADER;
+             return false;
+        }
+
+        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
+
+        return true;
+
+    }
+
+    /**
+     * Returns the username for the request
+     *
+     * @return string
+     */
+    public function getAccessKey() {
+
+        return $this->accessKey;
+
+    }
+
+    /**
+     * Validates the signature based on the secretKey
+     *
+     * @param string $secretKey
+     * @return bool
+     */
+    public function validate($secretKey) {
+
+        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
+
+        if ($contentMD5) {
+            // We need to validate the integrity of the request
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+
+            if ($contentMD5!=base64_encode(md5($body,true))) {
+                // content-md5 header did not match md5 signature of body
+                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+                return false;
+            }
+
+        }
+
+        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date'))
+            $requestDate = $this->httpRequest->getHeader('Date');
+
+        if (!$this->validateRFC2616Date($requestDate))
+            return false;
+
+        $amzHeaders = $this->getAmzHeaders();
+
+        $signature = base64_encode(
+            $this->hmacsha1($secretKey,
+                $this->httpRequest->getMethod() . "\n" .
+                $contentMD5 . "\n" .
+                $this->httpRequest->getHeader('Content-type') . "\n" .
+                $requestDate . "\n" .
+                $amzHeaders .
+                $this->httpRequest->getURI()
+            )
+        );
+
+        if ($this->signature != $signature) {
+
+            $this->errorCode = self::ERR_INVALIDSIGNATURE;
+            return false;
+
+        }
+
+        return true;
+
+    }
+
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+    /**
+     * Makes sure the supplied value is a valid RFC2616 date.
+     *
+     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
+     * user just supplied the word 'now' for the date header.
+     *
+     * This function also makes sure the Date header is within 15 minutes of the operating
+     * system date, to prevent replay attacks.
+     *
+     * @param string $dateHeader
+     * @return bool
+     */
+    protected function validateRFC2616Date($dateHeader) {
+
+        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
+
+        // Unknown format
+        if (!$date) {
+            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
+            return false;
+        }
+
+        $min = new DateTime('-15 minutes');
+        $max = new DateTime('+15 minutes');
+
+        // We allow 15 minutes around the current date/time
+        if ($date > $max || $date < $min) {
+            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
+            return false;
+        }
+
+        return $date;
+
+    }
+
+    /**
+     * Returns a list of AMZ headers
+     *
+     * @return string
+     */
+    protected function getAmzHeaders() {
+
+        $amzHeaders = array();
+        $headers = $this->httpRequest->getHeaders();
+        foreach($headers as $headerName => $headerValue) {
+            if (strpos(strtolower($headerName),'x-amz-')===0) {
+                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
+            }
+        }
+        ksort($amzHeaders);
+
+        $headerStr = '';
+        foreach($amzHeaders as $h=>$v) {
+            $headerStr.=$h.':'.$v;
+        }
+
+        return $headerStr;
+
+    }
+
+    /**
+     * Generates an HMAC-SHA1 signature
+     *
+     * @param string $key
+     * @param string $message
+     * @return string
+     */
+    private function hmacsha1($key, $message) {
+
+        $blocksize=64;
+        if (strlen($key)>$blocksize)
+            $key=pack('H*', sha1($key));
+        $key=str_pad($key,$blocksize,chr(0x00));
+        $ipad=str_repeat(chr(0x36),$blocksize);
+        $opad=str_repeat(chr(0x5c),$blocksize);
+        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
+        return $hmac;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/AbstractAuth.php b/3rdparty/Sabre/HTTP/AbstractAuth.php
new file mode 100755
index 0000000000..3bccabcd1c
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/AbstractAuth.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * HTTP Authentication baseclass
+ *
+ * This class has the common functionality for BasicAuth and DigestAuth
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The realm will be displayed in the dialog boxes
+     *
+     * This identifier can be changed through setRealm()
+     *
+     * @var string
+     */
+    protected $realm = 'SabreDAV';
+
+    /**
+     * HTTP response helper
+     *
+     * @var Sabre_HTTP_Response
+     */
+    protected $httpResponse;
+
+
+    /**
+     * HTTP request helper
+     *
+     * @var Sabre_HTTP_Request
+     */
+    protected $httpRequest;
+
+    /**
+     * __construct
+     *
+     */
+    public function __construct() {
+
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Sets an alternative HTTP response object
+     *
+     * @param Sabre_HTTP_Response $response
+     * @return void
+     */
+    public function setHTTPResponse(Sabre_HTTP_Response $response) {
+
+        $this->httpResponse = $response;
+
+    }
+
+    /**
+     * Sets an alternative HTTP request object
+     *
+     * @param Sabre_HTTP_Request $request
+     * @return void
+     */
+    public function setHTTPRequest(Sabre_HTTP_Request $request) {
+
+        $this->httpRequest = $request;
+
+    }
+
+
+    /**
+     * Sets the realm
+     *
+     * The realm is often displayed in authentication dialog boxes
+     * Commonly an application name displayed here
+     *
+     * @param string $realm
+     * @return void
+     */
+    public function setRealm($realm) {
+
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Returns the realm
+     *
+     * @return string
+     */
+    public function getRealm() {
+
+        return $this->realm;
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    abstract public function requireLogin();
+
+}
diff --git a/3rdparty/Sabre/HTTP/BasicAuth.php b/3rdparty/Sabre/HTTP/BasicAuth.php
new file mode 100755
index 0000000000..f90ed24f5d
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/BasicAuth.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * HTTP Basic Authentication handler
+ *
+ * Use this class for easy http authentication setup
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * Returns the supplied username and password.
+     *
+     * The returned array has two values:
+     *   * 0 - username
+     *   * 1 - password
+     *
+     * If nothing was supplied, 'false' will be returned
+     *
+     * @return mixed
+     */
+    public function getUserPass() {
+
+        // Apache and mod_php
+        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
+
+            return array($user,$pass);
+
+        }
+
+        // Most other webservers
+        $auth = $this->httpRequest->getHeader('Authorization');
+
+        // Apache could prefix environment variables with REDIRECT_ when urls
+        // are passed through mod_rewrite
+        if (!$auth) {
+            $auth = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
+        }
+
+        if (!$auth) return false;
+
+        if (strpos(strtolower($auth),'basic')!==0) return false;
+
+        return explode(':', base64_decode(substr($auth, 6)),2);
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/DigestAuth.php b/3rdparty/Sabre/HTTP/DigestAuth.php
new file mode 100755
index 0000000000..ee7f05c08e
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/DigestAuth.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * HTTP Digest Authentication handler
+ *
+ * Use this class for easy http digest authentication.
+ * Instructions:
+ *
+ *  1. Create the object
+ *  2. Call the setRealm() method with the realm you plan to use
+ *  3. Call the init method function.
+ *  4. Call the getUserName() function. This function may return false if no
+ *     authentication information was supplied. Based on the username you
+ *     should check your internal database for either the associated password,
+ *     or the so-called A1 hash of the digest.
+ *  5. Call either validatePassword() or validateA1(). This will return true
+ *     or false.
+ *  6. To make sure an authentication prompt is displayed, call the
+ *     requireLogin() method.
+ *
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * These constants are used in setQOP();
+     */
+    const QOP_AUTH = 1;
+    const QOP_AUTHINT = 2;
+
+    protected $nonce;
+    protected $opaque;
+    protected $digestParts;
+    protected $A1;
+    protected $qop = self::QOP_AUTH;
+
+    /**
+     * Initializes the object
+     */
+    public function __construct() {
+
+        $this->nonce = uniqid();
+        $this->opaque = md5($this->realm);
+        parent::__construct();
+
+    }
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     *
+     * @return void
+     */
+    public function init() {
+
+        $digest = $this->getDigest();
+        $this->digestParts = $this->parseDigest($digest);
+
+    }
+
+    /**
+     * Sets the quality of protection value.
+     *
+     * Possible values are:
+     *   Sabre_HTTP_DigestAuth::QOP_AUTH
+     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
+     *
+     * Multiple values can be specified using logical OR.
+     *
+     * QOP_AUTHINT ensures integrity of the request body, but this is not
+     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
+     * request body to be md5'ed, which can put strains on CPU and memory.
+     *
+     * @param int $qop
+     * @return void
+     */
+    public function setQOP($qop) {
+
+        $this->qop = $qop;
+
+    }
+
+    /**
+     * Validates the user.
+     *
+     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+     *
+     * @param string $A1
+     * @return bool
+     */
+    public function validateA1($A1) {
+
+        $this->A1 = $A1;
+        return $this->validate();
+
+    }
+
+    /**
+     * Validates authentication through a password. The actual password must be provided here.
+     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+     *
+     * @param string $password
+     * @return bool
+     */
+    public function validatePassword($password) {
+
+        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+        return $this->validate();
+
+    }
+
+    /**
+     * Returns the username for the request
+     *
+     * @return string
+     */
+    public function getUsername() {
+
+        return $this->digestParts['username'];
+
+    }
+
+    /**
+     * Validates the digest challenge
+     *
+     * @return bool
+     */
+    protected function validate() {
+
+        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
+
+        if ($this->digestParts['qop']=='auth-int') {
+            // Making sure we support this qop value
+            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            // We need to add an md5 of the entire request body to the A2 part of the hash
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+            $A2 .= ':' . md5($body);
+        } else {
+
+            // We need to make sure we support this qop value
+            if (!($this->qop & self::QOP_AUTH)) return false;
+        }
+
+        $A2 = md5($A2);
+
+        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
+
+        return $this->digestParts['response']==$validResponse;
+
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $qop = '';
+        switch($this->qop) {
+            case self::QOP_AUTH    : $qop = 'auth'; break;
+            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
+            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
+        }
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+
+    /**
+     * This method returns the full digest string.
+     *
+     * It should be compatibile with mod_php format and other webservers.
+     *
+     * If the header could not be found, null will be returned
+     *
+     * @return mixed
+     */
+    public function getDigest() {
+
+        // mod_php
+        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
+        if ($digest) return $digest;
+
+        // most other servers
+        $digest = $this->httpRequest->getHeader('Authorization');
+
+        // Apache could prefix environment variables with REDIRECT_ when urls
+        // are passed through mod_rewrite
+        if (!$digest) {
+            $digest = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
+        }
+
+        if ($digest && strpos(strtolower($digest),'digest')===0) {
+            return substr($digest,7);
+        } else {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * Parses the different pieces of the digest string into an array.
+     *
+     * This method returns false if an incomplete digest was supplied
+     *
+     * @param string $digest
+     * @return mixed
+     */
+    protected function parseDigest($digest) {
+
+        // protect against missing data
+        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+        $data = array();
+
+        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $m) {
+            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
+            unset($needed_parts[$m[1]]);
+        }
+
+        return $needed_parts ? false : $data;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Request.php b/3rdparty/Sabre/HTTP/Request.php
new file mode 100755
index 0000000000..4746ef7770
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Request.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * HTTP Request information
+ *
+ * This object can be used to easily access information about an HTTP request.
+ * It can additionally be used to create 'mock' requests.
+ *
+ * This class mostly operates independent, but because of the nature of a single
+ * request per run it can operate as a singleton. For more information check out
+ * the behaviour around 'defaultInputStream'.
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Request {
+
+    /**
+     * PHP's $_SERVER data
+     *
+     * @var array
+     */
+    protected $_SERVER;
+
+    /**
+     * PHP's $_POST data
+     *
+     * @var array
+     */
+    protected $_POST;
+
+    /**
+     * The request body, if any.
+     *
+     * This is stored in the form of a stream resource.
+     *
+     * @var resource
+     */
+    protected $body = null;
+
+    /**
+     * This will be set as the 'default' inputStream for a specific HTTP request
+     * We sometimes need to retain, or rebuild this if we need multiple runs
+     * of parsing the original HTTP request.
+     *
+     * @var resource
+     */
+    static $defaultInputStream=null;
+
+    /**
+     * Sets up the object
+     *
+     * The serverData and postData array can be used to override usage of PHP's
+     * global _SERVER and _POST variable respectively.
+     *
+     * @param array $serverData
+     * @param array $postData
+     */
+    public function __construct(array $serverData = null, array $postData = null) {
+
+       if ($serverData) $this->_SERVER = $serverData;
+       else $this->_SERVER =& $_SERVER;
+
+       if ($postData) $this->_POST = $postData;
+       else $this->_POST =& $_POST;
+
+    }
+
+    /**
+     * Returns the value for a specific http header.
+     *
+     * This method returns null if the header did not exist.
+     *
+     * @param string $name
+     * @return string
+     */
+    public function getHeader($name) {
+
+        $name = strtoupper(str_replace(array('-'),array('_'),$name));
+        if (isset($this->_SERVER['HTTP_' . $name])) {
+            return $this->_SERVER['HTTP_' . $name];
+        }
+
+        // There's a few headers that seem to end up in the top-level
+        // server array.
+        switch($name) {
+            case 'CONTENT_TYPE' :
+            case 'CONTENT_LENGTH' :
+                if (isset($this->_SERVER[$name])) {
+                    return $this->_SERVER[$name];
+                }
+                break;
+
+        }
+        return;
+
+    }
+
+    /**
+     * Returns all (known) HTTP headers.
+     *
+     * All headers are converted to lower-case, and additionally all underscores
+     * are automatically converted to dashes
+     *
+     * @return array
+     */
+    public function getHeaders() {
+
+        $hdrs = array();
+        foreach($this->_SERVER as $key=>$value) {
+
+            switch($key) {
+                case 'CONTENT_LENGTH' :
+                case 'CONTENT_TYPE' :
+                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
+                    break;
+                default :
+                    if (strpos($key,'HTTP_')===0) {
+                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
+                    }
+                    break;
+            }
+
+        }
+
+        return $hdrs;
+
+    }
+
+    /**
+     * Returns the HTTP request method
+     *
+     * This is for example POST or GET
+     *
+     * @return string
+     */
+    public function getMethod() {
+
+        return $this->_SERVER['REQUEST_METHOD'];
+
+    }
+
+    /**
+     * Returns the requested uri
+     *
+     * @return string
+     */
+    public function getUri() {
+
+        return $this->_SERVER['REQUEST_URI'];
+
+    }
+
+    /**
+     * Will return protocol + the hostname + the uri
+     *
+     * @return string
+     */
+    public function getAbsoluteUri() {
+
+        // Checking if the request was made through HTTPS. The last in line is for IIS
+        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
+        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
+
+    }
+
+    /**
+     * Returns everything after the ? from the current url
+     *
+     * @return string
+     */
+    public function getQueryString() {
+
+        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
+
+    }
+
+    /**
+     * Returns the HTTP request body body
+     *
+     * This method returns a readable stream resource.
+     * If the asString parameter is set to true, a string is sent instead.
+     *
+     * @param bool asString
+     * @return resource
+     */
+    public function getBody($asString = false) {
+
+        if (is_null($this->body)) {
+            if (!is_null(self::$defaultInputStream)) {
+                $this->body = self::$defaultInputStream;
+            } else {
+                $this->body = fopen('php://input','r');
+                self::$defaultInputStream = $this->body;
+            }
+        }
+        if ($asString) {
+            $body = stream_get_contents($this->body);
+            return $body;
+        } else {
+            return $this->body;
+        }
+
+    }
+
+    /**
+     * Sets the contents of the HTTP request body
+     *
+     * This method can either accept a string, or a readable stream resource.
+     *
+     * If the setAsDefaultInputStream is set to true, it means for this run of the
+     * script the supplied body will be used instead of php://input.
+     *
+     * @param mixed $body
+     * @param bool $setAsDefaultInputStream
+     * @return void
+     */
+    public function setBody($body,$setAsDefaultInputStream = false) {
+
+        if(is_resource($body)) {
+            $this->body = $body;
+        } else {
+
+            $stream = fopen('php://temp','r+');
+            fputs($stream,$body);
+            rewind($stream);
+            // String is assumed
+            $this->body = $stream;
+        }
+        if ($setAsDefaultInputStream) {
+            self::$defaultInputStream = $this->body;
+        }
+
+    }
+
+    /**
+     * Returns PHP's _POST variable.
+     *
+     * The reason this is in a method is so it can be subclassed and
+     * overridden.
+     *
+     * @return array
+     */
+    public function getPostVars() {
+
+        return $this->_POST;
+
+    }
+
+    /**
+     * Returns a specific item from the _SERVER array.
+     *
+     * Do not rely on this feature, it is for internal use only.
+     *
+     * @param string $field
+     * @return string
+     */
+    public function getRawServerValue($field) {
+
+        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/HTTP/Response.php b/3rdparty/Sabre/HTTP/Response.php
new file mode 100755
index 0000000000..ffe9bda208
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Response.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Sabre_HTTP_Response
+ *
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Response {
+
+    /**
+     * Returns a full HTTP status message for an HTTP status code
+     *
+     * @param int $code
+     * @return string
+     */
+    public function getStatusMessage($code) {
+
+        $msg = array(
+            100 => 'Continue',
+            101 => 'Switching Protocols',
+            102 => 'Processing',
+            200 => 'OK',
+            201 => 'Created',
+            202 => 'Accepted',
+            203 => 'Non-Authorative Information',
+            204 => 'No Content',
+            205 => 'Reset Content',
+            206 => 'Partial Content',
+            207 => 'Multi-Status', // RFC 4918
+            208 => 'Already Reported', // RFC 5842
+            226 => 'IM Used', // RFC 3229
+            300 => 'Multiple Choices',
+            301 => 'Moved Permanently',
+            302 => 'Found',
+            303 => 'See Other',
+            304 => 'Not Modified',
+            305 => 'Use Proxy',
+            306 => 'Reserved',
+            307 => 'Temporary Redirect',
+            400 => 'Bad request',
+            401 => 'Unauthorized',
+            402 => 'Payment Required',
+            403 => 'Forbidden',
+            404 => 'Not Found',
+            405 => 'Method Not Allowed',
+            406 => 'Not Acceptable',
+            407 => 'Proxy Authentication Required',
+            408 => 'Request Timeout',
+            409 => 'Conflict',
+            410 => 'Gone',
+            411 => 'Length Required',
+            412 => 'Precondition failed',
+            413 => 'Request Entity Too Large',
+            414 => 'Request-URI Too Long',
+            415 => 'Unsupported Media Type',
+            416 => 'Requested Range Not Satisfiable',
+            417 => 'Expectation Failed',
+            418 => 'I\'m a teapot', // RFC 2324
+            422 => 'Unprocessable Entity', // RFC 4918
+            423 => 'Locked', // RFC 4918
+            424 => 'Failed Dependency', // RFC 4918
+            426 => 'Upgrade required',
+            428 => 'Precondition required', // draft-nottingham-http-new-status
+            429 => 'Too Many Requests', // draft-nottingham-http-new-status
+            431 => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            500 => 'Internal Server Error',
+            501 => 'Not Implemented',
+            502 => 'Bad Gateway',
+            503 => 'Service Unavailable',
+            504 => 'Gateway Timeout',
+            505 => 'HTTP Version not supported',
+            506 => 'Variant Also Negotiates',
+            507 => 'Insufficient Storage', // RFC 4918
+            508 => 'Loop Detected', // RFC 5842
+            509 => 'Bandwidth Limit Exceeded', // non-standard
+            510 => 'Not extended',
+            511 => 'Network Authentication Required', // draft-nottingham-http-new-status
+       );
+
+       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
+
+    }
+
+    /**
+     * Sends an HTTP status header to the client
+     *
+     * @param int $code HTTP status code
+     * @return bool
+     */
+    public function sendStatus($code) {
+
+        if (!headers_sent())
+            return header($this->getStatusMessage($code));
+        else return false;
+
+    }
+
+    /**
+     * Sets an HTTP header for the response
+     *
+     * @param string $name
+     * @param string $value
+     * @param bool $replace
+     * @return bool
+     */
+    public function setHeader($name, $value, $replace = true) {
+
+        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
+        if (!headers_sent())
+            return header($name . ': ' . $value, $replace);
+        else return false;
+
+    }
+
+    /**
+     * Sets a bunch of HTTP Headers
+     *
+     * headersnames are specified as keys, value in the array value
+     *
+     * @param array $headers
+     * @return void
+     */
+    public function setHeaders(array $headers) {
+
+        foreach($headers as $key=>$value)
+            $this->setHeader($key, $value);
+
+    }
+
+    /**
+     * Sends the entire response body
+     *
+     * This method can accept either an open filestream, or a string.
+     *
+     * @param mixed $body
+     * @return void
+     */
+    public function sendBody($body) {
+
+        if (is_resource($body)) {
+
+            fpassthru($body);
+
+        } else {
+
+            // We assume a string
+            echo $body;
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Util.php b/3rdparty/Sabre/HTTP/Util.php
new file mode 100755
index 0000000000..67bdd489e1
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Util.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * HTTP utility methods
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @author Paul Voegler
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Util {
+
+    /**
+     * Parses a RFC2616-compatible date string
+     *
+     * This method returns false if the date is invalid
+     *
+     * @param string $dateHeader
+     * @return bool|DateTime
+     */
+    static function parseHTTPDate($dateHeader) {
+
+        //RFC 2616 section 3.3.1 Full Date
+        //Only the format is checked, valid ranges are checked by strtotime below
+        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+        $time = '[0-2]\d(\:[0-5]\d){2}';
+        $date3 = $month . ' ([1-3]\d| \d)';
+        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
+
+        //ANSI C's asctime() format
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
+        //RFC 850, obsoleted by RFC 1036
+        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
+        //RFC 822, updated by RFC 1123
+        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
+        //allowed date formats by RFC 2616
+        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+
+        //allow for space around the string and strip it
+        $dateHeader = trim($dateHeader, ' ');
+        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
+            return false;
+
+        //append implicit GMT timezone to ANSI C time format
+        if (strpos($dateHeader, ' GMT') === false)
+            $dateHeader .= ' GMT';
+
+
+        $realDate = strtotime($dateHeader);
+        //strtotime can return -1 or false in case of error
+        if ($realDate !== false && $realDate >= 0)
+            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * Transforms a DateTime object to HTTP's most common date format.
+     *
+     * We're serializing it as the RFC 1123 date, which, for HTTP must be
+     * specified as GMT.
+     *
+     * @param DateTime $dateTime
+     * @return string
+     */
+    static function toHTTPDate(DateTime $dateTime) {
+
+        // We need to clone it, as we don't want to affect the existing
+        // DateTime.
+        $dateTime = clone $dateTime;
+        $dateTime->setTimeZone(new DateTimeZone('GMT'));
+        return $dateTime->format('D, d M Y H:i:s \G\M\T');
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Version.php b/3rdparty/Sabre/HTTP/Version.php
new file mode 100755
index 0000000000..e6b4f7e535
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_HTTP version constants.
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.6.4';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/HTTP/includes.php b/3rdparty/Sabre/HTTP/includes.php
new file mode 100755
index 0000000000..9d34bf3a8b
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/includes.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Sabre_HTTP includes file
+ *
+ * Including this file will automatically include all files from the Sabre_HTTP
+ * package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/AbstractAuth.php';
+include __DIR__ . '/AWSAuth.php';
+include __DIR__ . '/BasicAuth.php';
+include __DIR__ . '/DigestAuth.php';
+include __DIR__ . '/Request.php';
+include __DIR__ . '/Response.php';
+include __DIR__ . '/Util.php';
+include __DIR__ . '/Version.php';
+// End includes
diff --git a/3rdparty/Sabre/VObject/Component.php b/3rdparty/Sabre/VObject/Component.php
new file mode 100755
index 0000000000..b78a26133f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component.php
@@ -0,0 +1,365 @@
+<?php
+
+/**
+ * VObject Component
+ *
+ * This class represents a VCALENDAR/VCARD component. A component is for example
+ * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and
+ * ends with END:COMPONENTNAME
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component extends Sabre_VObject_Element {
+
+    /**
+     * Name, for example VEVENT
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Children properties and components
+     *
+     * @var array
+     */
+    public $children = array();
+
+    /**
+     * If coponents are added to this map, they will be automatically mapped
+     * to their respective classes, if parsed by the reader or constructed with
+     * the 'create' method.
+     *
+     * @var array
+     */
+    static public $classMap = array(
+        'VCALENDAR'     => 'Sabre_VObject_Component_VCalendar',
+        'VEVENT'        => 'Sabre_VObject_Component_VEvent',
+        'VTODO'         => 'Sabre_VObject_Component_VTodo',
+        'VJOURNAL'      => 'Sabre_VObject_Component_VJournal',
+        'VALARM'        => 'Sabre_VObject_Component_VAlarm',
+    );
+
+    /**
+     * Creates the new component by name, but in addition will also see if
+     * there's a class mapped to the property name.
+     *
+     * @param string $name
+     * @param string $value
+     * @return Sabre_VObject_Component
+     */
+    static public function create($name, $value = null) {
+
+        $name = strtoupper($name);
+
+        if (isset(self::$classMap[$name])) {
+            return new self::$classMap[$name]($name, $value);
+        } else {
+            return new self($name, $value);
+        }
+
+    }
+
+    /**
+     * Creates a new component.
+     *
+     * By default this object will iterate over its own children, but this can
+     * be overridden with the iterator argument
+     *
+     * @param string $name
+     * @param Sabre_VObject_ElementList $iterator
+     */
+    public function __construct($name, Sabre_VObject_ElementList $iterator = null) {
+
+        $this->name = strtoupper($name);
+        if (!is_null($iterator)) $this->iterator = $iterator;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    public function serialize() {
+
+        $str = "BEGIN:" . $this->name . "\r\n";
+
+        /**
+         * Gives a component a 'score' for sorting purposes.
+         *
+         * This is solely used by the childrenSort method.
+         *
+         * A higher score means the item will be higher in the list
+         *
+         * @param Sabre_VObject_Node $n
+         * @return int
+         */
+        $sortScore = function($n) {
+
+            if ($n instanceof Sabre_VObject_Component) {
+                // We want to encode VTIMEZONE first, this is a personal
+                // preference.
+                if ($n->name === 'VTIMEZONE') {
+                    return 1;
+                } else {
+                    return 0;
+                }
+            } else {
+                // VCARD version 4.0 wants the VERSION property to appear first
+                if ($n->name === 'VERSION') {
+                    return 3;
+                } else {
+                    return 2;
+                }
+            }
+
+        };
+
+        usort($this->children, function($a, $b) use ($sortScore) {
+
+            $sA = $sortScore($a);
+            $sB = $sortScore($b);
+
+            if ($sA === $sB) return 0;
+
+            return ($sA > $sB) ? -1 : 1;
+
+        });
+
+        foreach($this->children as $child) $str.=$child->serialize();
+        $str.= "END:" . $this->name . "\r\n";
+
+        return $str;
+
+    }
+
+    /**
+     * Adds a new component or element
+     *
+     * You can call this method with the following syntaxes:
+     *
+     * add(Sabre_VObject_Element $element)
+     * add(string $name, $value)
+     *
+     * The first version adds an Element
+     * The second adds a property as a string.
+     *
+     * @param mixed $item
+     * @param mixed $itemValue
+     * @return void
+     */
+    public function add($item, $itemValue = null) {
+
+        if ($item instanceof Sabre_VObject_Element) {
+            if (!is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
+            }
+            $item->parent = $this;
+            $this->children[] = $item;
+        } elseif(is_string($item)) {
+
+            if (!is_scalar($itemValue)) {
+                throw new InvalidArgumentException('The second argument must be scalar');
+            }
+            $item = Sabre_VObject_Property::create($item,$itemValue);
+            $item->parent = $this;
+            $this->children[] = $item;
+
+        } else {
+
+            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
+
+        }
+
+    }
+
+    /**
+     * Returns an iterable list of children
+     *
+     * @return Sabre_VObject_ElementList
+     */
+    public function children() {
+
+        return new Sabre_VObject_ElementList($this->children);
+
+    }
+
+    /**
+     * Returns an array with elements that match the specified name.
+     *
+     * This function is also aware of MIME-Directory groups (as they appear in
+     * vcards). This means that if a property is grouped as "HOME.EMAIL", it
+     * will also be returned when searching for just "EMAIL". If you want to
+     * search for a property in a specific group, you can select on the entire
+     * string ("HOME.EMAIL"). If you want to search on a specific property that
+     * has not been assigned a group, specify ".EMAIL".
+     *
+     * Keys are retained from the 'children' array, which may be confusing in
+     * certain cases.
+     *
+     * @param string $name
+     * @return array
+     */
+    public function select($name) {
+
+        $group = null;
+        $name = strtoupper($name);
+        if (strpos($name,'.')!==false) {
+            list($group,$name) = explode('.', $name, 2);
+        }
+
+        $result = array();
+        foreach($this->children as $key=>$child) {
+
+            if (
+                strtoupper($child->name) === $name &&
+                (is_null($group) || ( $child instanceof Sabre_VObject_Property && strtoupper($child->group) === $group))
+            ) {
+
+                $result[$key] = $child;
+
+            }
+        }
+
+        reset($result);
+        return $result;
+
+    }
+
+    /**
+     * This method only returns a list of sub-components. Properties are
+     * ignored.
+     *
+     * @return array
+     */
+    public function getComponents() {
+
+        $result = array();
+        foreach($this->children as $child) {
+            if ($child instanceof Sabre_VObject_Component) {
+                $result[] = $child;
+            }
+        }
+
+        return $result;
+
+    }
+
+    /* Magic property accessors {{{ */
+
+    /**
+     * Using 'get' you will either get a property or component,
+     *
+     * If there were no child-elements found with the specified name,
+     * null is returned.
+     *
+     * @param string $name
+     * @return Sabre_VObject_Property
+     */
+    public function __get($name) {
+
+        $matches = $this->select($name);
+        if (count($matches)===0) {
+            return null;
+        } else {
+            $firstMatch = current($matches);
+            /** @var $firstMatch Sabre_VObject_Property */
+            $firstMatch->setIterator(new Sabre_VObject_ElementList(array_values($matches)));
+            return $firstMatch;
+        }
+
+    }
+
+    /**
+     * This method checks if a sub-element with the specified name exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function __isset($name) {
+
+        $matches = $this->select($name);
+        return count($matches)>0;
+
+    }
+
+    /**
+     * Using the setter method you can add properties or subcomponents
+     *
+     * You can either pass a Sabre_VObject_Component, Sabre_VObject_Property
+     * object, or a string to automatically create a Property.
+     *
+     * If the item already exists, it will be removed. If you want to add
+     * a new item with the same name, always use the add() method.
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    public function __set($name, $value) {
+
+        $matches = $this->select($name);
+        $overWrite = count($matches)?key($matches):null;
+
+        if ($value instanceof Sabre_VObject_Component || $value instanceof Sabre_VObject_Property) {
+            $value->parent = $this;
+            if (!is_null($overWrite)) {
+                $this->children[$overWrite] = $value;
+            } else {
+                $this->children[] = $value;
+            }
+        } elseif (is_scalar($value)) {
+            $property = Sabre_VObject_Property::create($name,$value);
+            $property->parent = $this;
+            if (!is_null($overWrite)) {
+                $this->children[$overWrite] = $property;
+            } else {
+                $this->children[] = $property;
+            }
+        } else {
+            throw new InvalidArgumentException('You must pass a Sabre_VObject_Component, Sabre_VObject_Property or scalar type');
+        }
+
+    }
+
+    /**
+     * Removes all properties and components within this component.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function __unset($name) {
+
+        $matches = $this->select($name);
+        foreach($matches as $k=>$child) {
+
+            unset($this->children[$k]);
+            $child->parent = null;
+
+        }
+
+    }
+
+    /* }}} */
+
+    /**
+     * This method is automatically called when the object is cloned.
+     * Specifically, this will ensure all child elements are also cloned.
+     *
+     * @return void
+     */
+    public function __clone() {
+
+        foreach($this->children as $key=>$child) {
+            $this->children[$key] = clone $child;
+            $this->children[$key]->parent = $this;
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Component/VAlarm.php b/3rdparty/Sabre/VObject/Component/VAlarm.php
new file mode 100755
index 0000000000..ebb4a9b18f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VAlarm.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * VAlarm component
+ *
+ * This component contains some additional functionality specific for VALARMs.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VAlarm extends Sabre_VObject_Component {
+
+    /**
+     * Returns a DateTime object when this alarm is going to trigger.
+     *
+     * This ignores repeated alarm, only the first trigger is returned.
+     *
+     * @return DateTime
+     */
+    public function getEffectiveTriggerTime() {
+
+        $trigger = $this->TRIGGER;
+        if(!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
+            $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($this->TRIGGER);
+            $related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
+
+            $parentComponent = $this->parent;
+            if ($related === 'START') {
+                $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
+                $effectiveTrigger->add($triggerDuration);
+            } else {
+                if ($parentComponent->name === 'VTODO') {
+                    $endProp = 'DUE';
+                } elseif ($parentComponent->name === 'VEVENT') {
+                    $endProp = 'DTEND';
+                } else {
+                    throw new Sabre_DAV_Exception('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
+                }
+
+                if (isset($parentComponent->$endProp)) {
+                    $effectiveTrigger = clone $parentComponent->$endProp->getDateTime();
+                    $effectiveTrigger->add($triggerDuration);
+                } elseif (isset($parentComponent->DURATION)) {
+                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
+                    $duration = Sabre_VObject_DateTimeParser::parseDuration($parentComponent->DURATION);
+                    $effectiveTrigger->add($duration);
+                    $effectiveTrigger->add($triggerDuration);
+                } else {
+                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
+                    $effectiveTrigger->add($triggerDuration);
+                }
+            }
+        } else {
+            $effectiveTrigger = $trigger->getDateTime();
+        }
+        return $effectiveTrigger;
+
+    }
+
+    /**
+     * Returns true or false depending on if the event falls in the specified
+     * time-range. This is used for filtering purposes.
+     *
+     * The rules used to determine if an event falls within the specified
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return bool
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        $effectiveTrigger = $this->getEffectiveTriggerTime();
+
+        if (isset($this->DURATION)) {
+            $duration = Sabre_VObject_DateTimeParser::parseDuration($this->DURATION);
+            $repeat = (string)$this->repeat;
+            if (!$repeat) {
+                $repeat = 1;
+            }
+
+            $period = new DatePeriod($effectiveTrigger, $duration, (int)$repeat);
+
+            foreach($period as $occurrence) {
+
+                if ($start <= $occurrence && $end > $occurrence) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
+        }
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Component/VCalendar.php b/3rdparty/Sabre/VObject/Component/VCalendar.php
new file mode 100755
index 0000000000..f3be29afdb
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VCalendar.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * The VCalendar component
+ *
+ * This component adds functionality to a component, specific for a VCALENDAR.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VCalendar extends Sabre_VObject_Component {
+
+    /**
+     * Returns a list of all 'base components'. For instance, if an Event has 
+     * a recurrence rule, and one instance is overridden, the overridden event 
+     * will have the same UID, but will be excluded from this list.
+     *
+     * VTIMEZONE components will always be excluded. 
+     *
+     * @param string $componentName filter by component name 
+     * @return array 
+     */
+    public function getBaseComponents($componentName = null) {
+
+        $components = array();
+        foreach($this->children as $component) {
+
+            if (!$component instanceof Sabre_VObject_Component)
+                continue;
+
+            if (isset($component->{'RECURRENCE-ID'})) 
+                continue;
+
+            if ($componentName && $component->name !== strtoupper($componentName)) 
+                continue;
+
+            if ($component->name === 'VTIMEZONE')
+                continue;
+
+            $components[] = $component;
+
+        }
+
+        return $components;
+
+    }
+
+    /**
+     * If this calendar object, has events with recurrence rules, this method 
+     * can be used to expand the event into multiple sub-events.
+     *
+     * Each event will be stripped from it's recurrence information, and only 
+     * the instances of the event in the specified timerange will be left 
+     * alone.
+     *
+     * In addition, this method will cause timezone information to be stripped, 
+     * and normalized to UTC.
+     *
+     * This method will alter the VCalendar. This cannot be reversed.
+     *
+     * This functionality is specifically used by the CalDAV standard. It is 
+     * possible for clients to request expand events, if they are rather simple 
+     * clients and do not have the possibility to calculate recurrences.
+     *
+     * @param DateTime $start
+     * @param DateTime $end 
+     * @return void
+     */
+    public function expand(DateTime $start, DateTime $end) {
+
+        $newEvents = array();
+
+        foreach($this->select('VEVENT') as $key=>$vevent) {
+
+            if (isset($vevent->{'RECURRENCE-ID'})) {
+                unset($this->children[$key]);
+                continue;
+            } 
+
+
+            if (!$vevent->rrule) {
+                unset($this->children[$key]);
+                if ($vevent->isInTimeRange($start, $end)) {
+                    $newEvents[] = $vevent;
+                }
+                continue;
+            }
+
+            $uid = (string)$vevent->uid;
+            if (!$uid) {
+                throw new LogicException('Event did not have a UID!');
+            }
+
+            $it = new Sabre_VObject_RecurrenceIterator($this, $vevent->uid);
+            $it->fastForward($start);
+
+            while($it->valid() && $it->getDTStart() < $end) {
+
+                if ($it->getDTEnd() > $start) {
+
+                    $newEvents[] = $it->getEventObject();
+
+                }
+                $it->next();
+
+            }
+            unset($this->children[$key]);
+
+        }
+
+        foreach($newEvents as $newEvent) {
+
+            foreach($newEvent->children as $child) {
+                if ($child instanceof Sabre_VObject_Property_DateTime &&
+                    $child->getDateType() == Sabre_VObject_Property_DateTime::LOCALTZ) {
+                        $child->setDateTime($child->getDateTime(),Sabre_VObject_Property_DateTime::UTC);
+                    }
+            }
+
+            $this->add($newEvent);
+
+        }
+
+        // Removing all VTIMEZONE components
+        unset($this->VTIMEZONE);
+
+    } 
+
+}
+
diff --git a/3rdparty/Sabre/VObject/Component/VEvent.php b/3rdparty/Sabre/VObject/Component/VEvent.php
new file mode 100755
index 0000000000..d6b910874d
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VEvent.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * VEvent component
+ *
+ * This component contains some additional functionality specific for VEVENT's.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VEvent extends Sabre_VObject_Component {
+
+    /**
+     * Returns true or false depending on if the event falls in the specified
+     * time-range. This is used for filtering purposes.
+     *
+     * The rules used to determine if an event falls within the specified
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return bool
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        if ($this->RRULE) {
+            $it = new Sabre_VObject_RecurrenceIterator($this);
+            $it->fastForward($start);
+
+            // We fast-forwarded to a spot where the end-time of the
+            // recurrence instance exceeded the start of the requested
+            // time-range.
+            //
+            // If the starttime of the recurrence did not exceed the
+            // end of the time range as well, we have a match.
+            return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
+
+        }
+
+        $effectiveStart = $this->DTSTART->getDateTime();
+        if (isset($this->DTEND)) {
+
+            // The DTEND property is considered non inclusive. So for a 3 day
+            // event in july, dtstart and dtend would have to be July 1st and
+            // July 4th respectively.
+            //
+            // See:
+            // http://tools.ietf.org/html/rfc5545#page-54
+            $effectiveEnd = $this->DTEND->getDateTime();
+
+        } elseif (isset($this->DURATION)) {
+            $effectiveEnd = clone $effectiveStart;
+            $effectiveEnd->add( Sabre_VObject_DateTimeParser::parseDuration($this->DURATION) );
+        } elseif ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+            $effectiveEnd = clone $effectiveStart;
+            $effectiveEnd->modify('+1 day');
+        } else {
+            $effectiveEnd = clone $effectiveStart;
+        }
+        return (
+            ($start <= $effectiveEnd) && ($end > $effectiveStart)
+        );
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Component/VJournal.php b/3rdparty/Sabre/VObject/Component/VJournal.php
new file mode 100755
index 0000000000..22b3ec921e
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VJournal.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * VJournal component
+ *
+ * This component contains some additional functionality specific for VJOURNALs.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VJournal extends Sabre_VObject_Component {
+
+    /**
+     * Returns true or false depending on if the event falls in the specified 
+     * time-range. This is used for filtering purposes. 
+     *
+     * The rules used to determine if an event falls within the specified 
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end 
+     * @return bool 
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
+        if ($dtstart) {
+            $effectiveEnd = clone $dtstart;
+            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+                $effectiveEnd->modify('+1 day');
+            }
+
+            return ($start <= $effectiveEnd && $end > $dtstart);
+
+        }
+        return false;
+
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Component/VTodo.php b/3rdparty/Sabre/VObject/Component/VTodo.php
new file mode 100755
index 0000000000..79d06298d7
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component/VTodo.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * VTodo component
+ *
+ * This component contains some additional functionality specific for VTODOs.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component_VTodo extends Sabre_VObject_Component {
+
+    /**
+     * Returns true or false depending on if the event falls in the specified 
+     * time-range. This is used for filtering purposes. 
+     *
+     * The rules used to determine if an event falls within the specified 
+     * time-range is based on the CalDAV specification.
+     *
+     * @param DateTime $start
+     * @param DateTime $end 
+     * @return bool 
+     */
+    public function isInTimeRange(DateTime $start, DateTime $end) {
+
+        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
+        $duration = isset($this->DURATION)?Sabre_VObject_DateTimeParser::parseDuration($this->DURATION):null;
+        $due = isset($this->DUE)?$this->DUE->getDateTime():null;
+        $completed = isset($this->COMPLETED)?$this->COMPLETED->getDateTime():null;
+        $created = isset($this->CREATED)?$this->CREATED->getDateTime():null;
+
+        if ($dtstart) {
+            if ($duration) {
+                $effectiveEnd = clone $dtstart;
+                $effectiveEnd->add($duration);
+                return $start <= $effectiveEnd && $end > $dtstart;
+            } elseif ($due) {
+                return
+                    ($start < $due || $start <= $dtstart) &&
+                    ($end > $dtstart || $end >= $due);
+            } else {
+                return $start <= $dtstart && $end > $dtstart;
+            }
+        }
+        if ($due) {
+            return ($start < $due && $end >= $due);
+        }
+        if ($completed && $created) {
+            return
+                ($start <= $created || $start <= $completed) &&
+                ($end >= $created || $end >= $completed);
+        }
+        if ($completed) {
+            return ($start <= $completed && $end >= $completed);
+        }
+        if ($created) {
+            return ($end > $created);
+        }
+        return true;
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/DateTimeParser.php b/3rdparty/Sabre/VObject/DateTimeParser.php
new file mode 100755
index 0000000000..23a4bb6991
--- /dev/null
+++ b/3rdparty/Sabre/VObject/DateTimeParser.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * DateTimeParser
+ *
+ * This class is responsible for parsing the several different date and time
+ * formats iCalendar and vCards have.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_DateTimeParser {
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
+     *
+     * Specifying a reference timezone is optional. It will only be used
+     * if the non-UTC format is used. The argument is used as a reference, the
+     * returned DateTime object will still be in the UTC timezone.
+     *
+     * @param string $dt
+     * @param DateTimeZone $tz
+     * @return DateTime
+     */
+    static public function parseDateTime($dt,DateTimeZone $tz = null) {
+
+        // Format is YYYYMMDD + "T" + hhmmss
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
+        }
+
+        if ($matches[7]==='Z' || is_null($tz)) {
+            $tz = new DateTimeZone('UTC');
+        }
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
+
+        // Still resetting the timezone, to normalize everything to UTC
+        $date->setTimeZone(new DateTimeZone('UTC'));
+        return $date;
+
+    }
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted date and returns a DateTime object
+     *
+     * @param string $date
+     * @return DateTime
+     */
+    static public function parseDate($date) {
+
+        // Format is YYYYMMDD
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
+        }
+
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
+        return $date;
+
+    }
+
+    /**
+     * Parses an iCalendar (RFC5545) formatted duration value.
+     *
+     * This method will either return a DateTimeInterval object, or a string
+     * suitable for strtotime or DateTime::modify.
+     *
+     * @param string $duration
+     * @param bool $asString
+     * @return DateInterval|string
+     */
+    static public function parseDuration($duration, $asString = false) {
+
+        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
+        }
+
+        if (!$asString) {
+            $invert = false;
+            if ($matches['plusminus']==='-') {
+                $invert = true;
+            }
+
+
+            $parts = array(
+                'week',
+                'day',
+                'hour',
+                'minute',
+                'second',
+            );
+            foreach($parts as $part) {
+                $matches[$part] = isset($matches[$part])&&$matches[$part]?(int)$matches[$part]:0;
+            }
+
+
+            // We need to re-construct the $duration string, because weeks and
+            // days are not supported by DateInterval in the same string.
+            $duration = 'P';
+            $days = $matches['day'];
+            if ($matches['week']) {
+                $days+=$matches['week']*7;
+            }
+            if ($days)
+                $duration.=$days . 'D';
+
+            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
+                $duration.='T';
+
+                if ($matches['hour'])
+                    $duration.=$matches['hour'].'H';
+
+                if ($matches['minute'])
+                    $duration.=$matches['minute'].'M';
+
+                if ($matches['second'])
+                    $duration.=$matches['second'].'S';
+
+            }
+
+            if ($duration==='P') {
+                $duration = 'PT0S';
+            }
+            $iv = new DateInterval($duration);
+            if ($invert) $iv->invert = true;
+
+            return $iv;
+
+        }
+
+
+
+        $parts = array(
+            'week',
+            'day',
+            'hour',
+            'minute',
+            'second',
+        );
+
+        $newDur = '';
+        foreach($parts as $part) {
+            if (isset($matches[$part]) && $matches[$part]) {
+                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
+            }
+        }
+
+        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
+        if ($newDur === '+') { $newDur = '+0 seconds'; };
+        return $newDur;
+
+    }
+
+    /**
+     * Parses either a Date or DateTime, or Duration value.
+     *
+     * @param string $date
+     * @param DateTimeZone|string $referenceTZ
+     * @return DateTime|DateInterval
+     */
+    static public function parse($date, $referenceTZ = null) {
+
+        if ($date[0]==='P' || ($date[0]==='-' && $date[1]==='P')) {
+            return self::parseDuration($date);
+        } elseif (strlen($date)===8) {
+            return self::parseDate($date);
+        } else {
+            return self::parseDateTime($date, $referenceTZ);
+        }
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/VObject/Element.php b/3rdparty/Sabre/VObject/Element.php
new file mode 100755
index 0000000000..e20ff0b353
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Base class for all elements
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_VObject_Element extends Sabre_VObject_Node {
+
+    public $parent = null;
+
+}
diff --git a/3rdparty/Sabre/VObject/Element/DateTime.php b/3rdparty/Sabre/VObject/Element/DateTime.php
new file mode 100755
index 0000000000..5e5eb7ab6f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element/DateTime.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * DateTime property
+ *
+ * this class got renamed to Sabre_VObject_Property_DateTime
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @deprecated
+ */
+class Sabre_VObject_Element_DateTime extends Sabre_VObject_Property_DateTime {
+
+    /**
+     * Local 'floating' time
+     */
+    const LOCAL = 1;
+
+    /**
+     * UTC-based time
+     */
+    const UTC = 2;
+
+    /**
+     * Local time plus timezone
+     */
+    const LOCALTZ = 3;
+
+    /**
+     * Only a date, time is ignored
+     */
+    const DATE = 4;
+
+}
diff --git a/3rdparty/Sabre/VObject/Element/MultiDateTime.php b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
new file mode 100755
index 0000000000..8a12ced94a
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Multi-DateTime property
+ *
+ * This class got renamed to Sabre_VObject_Property_MultiDateTime
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @deprecated
+ */
+class Sabre_VObject_Element_MultiDateTime extends Sabre_VObject_Property_MultiDateTime {
+
+}
diff --git a/3rdparty/Sabre/VObject/ElementList.php b/3rdparty/Sabre/VObject/ElementList.php
new file mode 100755
index 0000000000..7e508db20f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/ElementList.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * VObject ElementList
+ *
+ * This class represents a list of elements. Lists are the result of queries,
+ * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_ElementList implements Iterator, Countable, ArrayAccess {
+
+    /**
+     * Inner elements
+     *
+     * @var array
+     */
+    protected $elements = array();
+
+    /**
+     * Creates the element list.
+     *
+     * @param array $elements
+     */
+    public function __construct(array $elements) {
+
+        $this->elements = $elements;
+
+    }
+
+    /* {{{ Iterator interface */
+
+    /**
+     * Current position
+     *
+     * @var int
+     */
+    private $key = 0;
+
+    /**
+     * Returns current item in iteration
+     *
+     * @return Sabre_VObject_Element
+     */
+    public function current() {
+
+        return $this->elements[$this->key];
+
+    }
+
+    /**
+     * To the next item in the iterator
+     *
+     * @return void
+     */
+    public function next() {
+
+        $this->key++;
+
+    }
+
+    /**
+     * Returns the current iterator key
+     *
+     * @return int
+     */
+    public function key() {
+
+        return $this->key;
+
+    }
+
+    /**
+     * Returns true if the current position in the iterator is a valid one
+     *
+     * @return bool
+     */
+    public function valid() {
+
+        return isset($this->elements[$this->key]);
+
+    }
+
+    /**
+     * Rewinds the iterator
+     *
+     * @return void
+     */
+    public function rewind() {
+
+        $this->key = 0;
+
+    }
+
+    /* }}} */
+
+    /* {{{ Countable interface */
+
+    /**
+     * Returns the number of elements
+     *
+     * @return int
+     */
+    public function count() {
+
+        return count($this->elements);
+
+    }
+
+    /* }}} */
+
+    /* {{{ ArrayAccess Interface */
+
+
+    /**
+     * Checks if an item exists through ArrayAccess.
+     *
+     * @param int $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+
+        return isset($this->elements[$offset]);
+
+    }
+
+    /**
+     * Gets an item through ArrayAccess.
+     *
+     * @param int $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+
+        return $this->elements[$offset];
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * @param int $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset,$value) {
+
+        throw new LogicException('You can not add new objects to an ElementList');
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return void
+     */
+    public function offsetUnset($offset) {
+
+        throw new LogicException('You can not remove objects from an ElementList');
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/FreeBusyGenerator.php b/3rdparty/Sabre/VObject/FreeBusyGenerator.php
new file mode 100755
index 0000000000..1c96a64a00
--- /dev/null
+++ b/3rdparty/Sabre/VObject/FreeBusyGenerator.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+ * This class helps with generating FREEBUSY reports based on existing sets of
+ * objects.
+ *
+ * It only looks at VEVENT and VFREEBUSY objects from the sourcedata, and
+ * generates a single VFREEBUSY object.
+ *
+ * VFREEBUSY components are described in RFC5545, The rules for what should
+ * go in a single freebusy report is taken from RFC4791, section 7.10.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_FreeBusyGenerator {
+
+    /**
+     * Input objects
+     *
+     * @var array
+     */
+    protected $objects;
+
+    /**
+     * Start of range
+     *
+     * @var DateTime|null
+     */
+    protected $start;
+
+    /**
+     * End of range
+     *
+     * @var DateTime|null
+     */
+    protected $end;
+
+    /**
+     * VCALENDAR object
+     *
+     * @var Sabre_VObject_Component
+     */
+    protected $baseObject;
+
+    /**
+     * Sets the VCALENDAR object.
+     *
+     * If this is set, it will not be generated for you. You are responsible
+     * for setting things like the METHOD, CALSCALE, VERSION, etc..
+     *
+     * The VFREEBUSY object will be automatically added though.
+     *
+     * @param Sabre_VObject_Component $vcalendar
+     * @return void
+     */
+    public function setBaseObject(Sabre_VObject_Component $vcalendar) {
+
+        $this->baseObject = $vcalendar;
+
+    }
+
+    /**
+     * Sets the input objects
+     *
+     * Every object must either be a string or a Sabre_VObject_Component.
+     *
+     * @param array $objects
+     * @return void
+     */
+    public function setObjects(array $objects) {
+
+        $this->objects = array();
+        foreach($objects as $object) {
+
+            if (is_string($object)) {
+                $this->objects[] = Sabre_VObject_Reader::read($object);
+            } elseif ($object instanceof Sabre_VObject_Component) {
+                $this->objects[] = $object;
+            } else {
+                throw new InvalidArgumentException('You can only pass strings or Sabre_VObject_Component arguments to setObjects');
+            }
+
+        }
+
+    }
+
+    /**
+     * Sets the time range
+     *
+     * Any freebusy object falling outside of this time range will be ignored.
+     *
+     * @param DateTime $start
+     * @param DateTime $end
+     * @return void
+     */
+    public function setTimeRange(DateTime $start = null, DateTime $end = null) {
+
+        $this->start = $start;
+        $this->end = $end;
+
+    }
+
+    /**
+     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
+     * a VCALENDAR.
+     *
+     * @return Sabre_VObject_Component
+     */
+    public function getResult() {
+
+        $busyTimes = array();
+
+        foreach($this->objects as $object) {
+
+            foreach($object->getBaseComponents() as $component) {
+
+                switch($component->name) {
+
+                    case 'VEVENT' :
+
+                        $FBTYPE = 'BUSY';
+                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
+                            break;
+                        }
+                        if (isset($component->STATUS)) {
+                            $status = strtoupper($component->STATUS);
+                            if ($status==='CANCELLED') {
+                                break;
+                            }
+                            if ($status==='TENTATIVE') {
+                                $FBTYPE = 'BUSY-TENTATIVE';
+                            }
+                        }
+
+                        $times = array();
+
+                        if ($component->RRULE) {
+
+                            $iterator = new Sabre_VObject_RecurrenceIterator($object, (string)$component->uid);
+                            if ($this->start) {
+                                $iterator->fastForward($this->start);
+                            }
+
+                            $maxRecurrences = 200;
+
+                            while($iterator->valid() && --$maxRecurrences) {
+
+                                $startTime = $iterator->getDTStart();
+                                if ($this->end && $startTime > $this->end) {
+                                    break;
+                                }
+                                $times[] = array(
+                                    $iterator->getDTStart(),
+                                    $iterator->getDTEnd(),
+                                );
+
+                                $iterator->next();
+
+                            }
+
+                        } else {
+
+                            $startTime = $component->DTSTART->getDateTime();
+                            if ($this->end && $startTime > $this->end) {
+                                break;
+                            }
+                            $endTime = null;
+                            if (isset($component->DTEND)) {
+                                $endTime = $component->DTEND->getDateTime();
+                            } elseif (isset($component->DURATION)) {
+                                $duration = Sabre_VObject_DateTimeParser::parseDuration((string)$component->DURATION);
+                                $endTime = clone $startTime;
+                                $endTime->add($duration);
+                            } elseif ($component->DTSTART->getDateType() === Sabre_VObject_Property_DateTime::DATE) {
+                                $endTime = clone $startTime;
+                                $endTime->modify('+1 day');
+                            } else {
+                                // The event had no duration (0 seconds)
+                                break;
+                            }
+
+                            $times[] = array($startTime, $endTime);
+
+                        }
+
+                        foreach($times as $time) {
+
+                            if ($this->end && $time[0] > $this->end) break;
+                            if ($this->start && $time[1] < $this->start) break;
+
+                            $busyTimes[] = array(
+                                $time[0],
+                                $time[1],
+                                $FBTYPE,
+                            );
+                        }
+                        break;
+
+                    case 'VFREEBUSY' :
+                        foreach($component->FREEBUSY as $freebusy) {
+
+                            $fbType = isset($freebusy['FBTYPE'])?strtoupper($freebusy['FBTYPE']):'BUSY';
+
+                            // Skipping intervals marked as 'free'
+                            if ($fbType==='FREE')
+                                continue;
+
+                            $values = explode(',', $freebusy);
+                            foreach($values as $value) {
+                                list($startTime, $endTime) = explode('/', $value);
+                                $startTime = Sabre_VObject_DateTimeParser::parseDateTime($startTime);
+
+                                if (substr($endTime,0,1)==='P' || substr($endTime,0,2)==='-P') {
+                                    $duration = Sabre_VObject_DateTimeParser::parseDuration($endTime);
+                                    $endTime = clone $startTime;
+                                    $endTime->add($duration);
+                                } else {
+                                    $endTime = Sabre_VObject_DateTimeParser::parseDateTime($endTime);
+                                }
+
+                                if($this->start && $this->start > $endTime) continue;
+                                if($this->end && $this->end < $startTime) continue;
+                                $busyTimes[] = array(
+                                    $startTime,
+                                    $endTime,
+                                    $fbType
+                                );
+
+                            }
+
+
+                        }
+                        break;
+
+
+
+                }
+
+
+            }
+
+        }
+
+        if ($this->baseObject) {
+            $calendar = $this->baseObject;
+        } else {
+            $calendar = new Sabre_VObject_Component('VCALENDAR');
+            $calendar->version = '2.0';
+            if (Sabre_DAV_Server::$exposeVersion) {
+                $calendar->prodid = '-//SabreDAV//Sabre VObject ' . Sabre_VObject_Version::VERSION . '//EN';
+            } else {
+                $calendar->prodid = '-//SabreDAV//Sabre VObject//EN';
+            }
+            $calendar->calscale = 'GREGORIAN';
+        }
+
+        $vfreebusy = new Sabre_VObject_Component('VFREEBUSY');
+        $calendar->add($vfreebusy);
+
+        if ($this->start) {
+            $dtstart = new Sabre_VObject_Property_DateTime('DTSTART');
+            $dtstart->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
+            $vfreebusy->add($dtstart);
+        }
+        if ($this->end) {
+            $dtend = new Sabre_VObject_Property_DateTime('DTEND');
+            $dtend->setDateTime($this->start,Sabre_VObject_Property_DateTime::UTC);
+            $vfreebusy->add($dtend);
+        }
+        $dtstamp = new Sabre_VObject_Property_DateTime('DTSTAMP');
+        $dtstamp->setDateTime(new DateTime('now'), Sabre_VObject_Property_DateTime::UTC);
+        $vfreebusy->add($dtstamp);
+
+        foreach($busyTimes as $busyTime) {
+
+            $busyTime[0]->setTimeZone(new DateTimeZone('UTC'));
+            $busyTime[1]->setTimeZone(new DateTimeZone('UTC'));
+
+            $prop = new Sabre_VObject_Property(
+                'FREEBUSY',
+                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
+            );
+            $prop['FBTYPE'] = $busyTime[2];
+            $vfreebusy->add($prop);
+
+        }
+
+        return $calendar;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/VObject/Node.php b/3rdparty/Sabre/VObject/Node.php
new file mode 100755
index 0000000000..d89e01b56c
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Node.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Base class for all nodes
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_VObject_Node implements IteratorAggregate, ArrayAccess, Countable {
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    abstract function serialize();
+
+    /**
+     * Iterator override
+     *
+     * @var Sabre_VObject_ElementList
+     */
+    protected $iterator = null;
+
+    /**
+     * A link to the parent node
+     *
+     * @var Sabre_VObject_Node
+     */
+    public $parent = null;
+
+    /* {{{ IteratorAggregator interface */
+
+    /**
+     * Returns the iterator for this object
+     *
+     * @return Sabre_VObject_ElementList
+     */
+    public function getIterator() {
+
+        if (!is_null($this->iterator))
+            return $this->iterator;
+
+        return new Sabre_VObject_ElementList(array($this));
+
+    }
+
+    /**
+     * Sets the overridden iterator
+     *
+     * Note that this is not actually part of the iterator interface
+     *
+     * @param Sabre_VObject_ElementList $iterator
+     * @return void
+     */
+    public function setIterator(Sabre_VObject_ElementList $iterator) {
+
+        $this->iterator = $iterator;
+
+    }
+
+    /* }}} */
+
+    /* {{{ Countable interface */
+
+    /**
+     * Returns the number of elements
+     *
+     * @return int
+     */
+    public function count() {
+
+        $it = $this->getIterator();
+        return $it->count();
+
+    }
+
+    /* }}} */
+
+    /* {{{ ArrayAccess Interface */
+
+
+    /**
+     * Checks if an item exists through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetExists($offset);
+
+    }
+
+    /**
+     * Gets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetGet($offset);
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset,$value) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetSet($offset,$value);
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset
+     * @return void
+     */
+    public function offsetUnset($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetUnset($offset);
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/Parameter.php b/3rdparty/Sabre/VObject/Parameter.php
new file mode 100755
index 0000000000..2e39af5f78
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Parameter.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * VObject Parameter
+ *
+ * This class represents a parameter. A parameter is always tied to a property.
+ * In the case of:
+ *   DTSTART;VALUE=DATE:20101108
+ * VALUE=DATE would be the parameter name and value.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Parameter extends Sabre_VObject_Node {
+
+    /**
+     * Parameter name
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Parameter value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * Sets up the object
+     *
+     * @param string $name
+     * @param string $value
+     */
+    public function __construct($name, $value = null) {
+
+        $this->name = strtoupper($name);
+        $this->value = $value;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    public function serialize() {
+
+        if (is_null($this->value)) {
+            return $this->name;
+        }
+        $src = array(
+            '\\',
+            "\n",
+            ';',
+            ',',
+        );
+        $out = array(
+            '\\\\',
+            '\n',
+            '\;',
+            '\,',
+        );
+
+        return $this->name . '=' . str_replace($src, $out, $this->value);
+
+    }
+
+    /**
+     * Called when this object is being cast to a string
+     *
+     * @return string
+     */
+    public function __toString() {
+
+        return $this->value;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/ParseException.php b/3rdparty/Sabre/VObject/ParseException.php
new file mode 100755
index 0000000000..1b5e95bf16
--- /dev/null
+++ b/3rdparty/Sabre/VObject/ParseException.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Exception thrown by Sabre_VObject_Reader if an invalid object was attempted to be parsed.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_ParseException extends Exception { }
diff --git a/3rdparty/Sabre/VObject/Property.php b/3rdparty/Sabre/VObject/Property.php
new file mode 100755
index 0000000000..ce74fe3865
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property.php
@@ -0,0 +1,348 @@
+<?php
+
+/**
+ * VObject Property
+ *
+ * A property in VObject is usually in the form PARAMNAME:paramValue.
+ * An example is : SUMMARY:Weekly meeting
+ *
+ * Properties can also have parameters:
+ * SUMMARY;LANG=en:Weekly meeting.
+ *
+ * Parameters can be accessed using the ArrayAccess interface.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property extends Sabre_VObject_Element {
+
+    /**
+     * Propertyname
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Group name
+     *
+     * This may be something like 'HOME' for vcards.
+     *
+     * @var string
+     */
+    public $group;
+
+    /**
+     * Property parameters
+     *
+     * @var array
+     */
+    public $parameters = array();
+
+    /**
+     * Property value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * If properties are added to this map, they will be automatically mapped
+     * to their respective classes, if parsed by the reader or constructed with
+     * the 'create' method.
+     *
+     * @var array
+     */
+    static public $classMap = array(
+        'COMPLETED'     => 'Sabre_VObject_Property_DateTime',
+        'CREATED'       => 'Sabre_VObject_Property_DateTime',
+        'DTEND'         => 'Sabre_VObject_Property_DateTime',
+        'DTSTAMP'       => 'Sabre_VObject_Property_DateTime',
+        'DTSTART'       => 'Sabre_VObject_Property_DateTime',
+        'DUE'           => 'Sabre_VObject_Property_DateTime',
+        'EXDATE'        => 'Sabre_VObject_Property_MultiDateTime',
+        'LAST-MODIFIED' => 'Sabre_VObject_Property_DateTime',
+        'RECURRENCE-ID' => 'Sabre_VObject_Property_DateTime',
+        'TRIGGER'       => 'Sabre_VObject_Property_DateTime',
+    );
+
+    /**
+     * Creates the new property by name, but in addition will also see if
+     * there's a class mapped to the property name.
+     *
+     * @param string $name
+     * @param string $value
+     * @return void
+     */
+    static public function create($name, $value = null) {
+
+        $name = strtoupper($name);
+        $shortName = $name;
+        $group = null;
+        if (strpos($shortName,'.')!==false) {
+            list($group, $shortName) = explode('.', $shortName);
+        }
+
+        if (isset(self::$classMap[$shortName])) {
+            return new self::$classMap[$shortName]($name, $value);
+        } else {
+            return new self($name, $value);
+        }
+
+    }
+
+    /**
+     * Creates a new property object
+     *
+     * By default this object will iterate over its own children, but this can
+     * be overridden with the iterator argument
+     *
+     * @param string $name
+     * @param string $value
+     * @param Sabre_VObject_ElementList $iterator
+     */
+    public function __construct($name, $value = null, $iterator = null) {
+
+        $name = strtoupper($name);
+        $group = null;
+        if (strpos($name,'.')!==false) {
+            list($group, $name) = explode('.', $name);
+        }
+        $this->name = $name;
+        $this->group = $group;
+        if (!is_null($iterator)) $this->iterator = $iterator;
+        $this->setValue($value);
+
+    }
+
+
+
+    /**
+     * Updates the internal value
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue($value) {
+
+        $this->value = $value;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob.
+     *
+     * @return string
+     */
+    public function serialize() {
+
+        $str = $this->name;
+        if ($this->group) $str = $this->group . '.' . $this->name;
+
+        if (count($this->parameters)) {
+            foreach($this->parameters as $param) {
+
+                $str.=';' . $param->serialize();
+
+            }
+        }
+        $src = array(
+            '\\',
+            "\n",
+        );
+        $out = array(
+            '\\\\',
+            '\n',
+        );
+        $str.=':' . str_replace($src, $out, $this->value);
+
+        $out = '';
+        while(strlen($str)>0) {
+            if (strlen($str)>75) {
+                $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
+                $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
+            } else {
+                $out.=$str . "\r\n";
+                $str='';
+                break;
+            }
+        }
+
+        return $out;
+
+    }
+
+    /**
+     * Adds a new componenten or element
+     *
+     * You can call this method with the following syntaxes:
+     *
+     * add(Sabre_VObject_Parameter $element)
+     * add(string $name, $value)
+     *
+     * The first version adds an Parameter
+     * The second adds a property as a string.
+     *
+     * @param mixed $item
+     * @param mixed $itemValue
+     * @return void
+     */
+    public function add($item, $itemValue = null) {
+
+        if ($item instanceof Sabre_VObject_Parameter) {
+            if (!is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
+            }
+            $item->parent = $this;
+            $this->parameters[] = $item;
+        } elseif(is_string($item)) {
+
+            if (!is_scalar($itemValue) && !is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must be scalar');
+            }
+            $parameter = new Sabre_VObject_Parameter($item,$itemValue);
+            $parameter->parent = $this;
+            $this->parameters[] = $parameter;
+
+        } else {
+
+            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
+
+        }
+
+    }
+
+    /* ArrayAccess interface {{{ */
+
+    /**
+     * Checks if an array element exists
+     *
+     * @param mixed $name
+     * @return bool
+     */
+    public function offsetExists($name) {
+
+        if (is_int($name)) return parent::offsetExists($name);
+
+        $name = strtoupper($name);
+
+        foreach($this->parameters as $parameter) {
+            if ($parameter->name == $name) return true;
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a parameter, or parameter list.
+     *
+     * @param string $name
+     * @return Sabre_VObject_Element
+     */
+    public function offsetGet($name) {
+
+        if (is_int($name)) return parent::offsetGet($name);
+        $name = strtoupper($name);
+
+        $result = array();
+        foreach($this->parameters as $parameter) {
+            if ($parameter->name == $name)
+                $result[] = $parameter;
+        }
+
+        if (count($result)===0) {
+            return null;
+        } elseif (count($result)===1) {
+            return $result[0];
+        } else {
+            $result[0]->setIterator(new Sabre_VObject_ElementList($result));
+            return $result[0];
+        }
+
+    }
+
+    /**
+     * Creates a new parameter
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($name, $value) {
+
+        if (is_int($name)) return parent::offsetSet($name, $value);
+
+        if (is_scalar($value)) {
+            if (!is_string($name))
+                throw new InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
+
+            $this->offsetUnset($name);
+            $parameter = new Sabre_VObject_Parameter($name, $value);
+            $parameter->parent = $this;
+            $this->parameters[] = $parameter;
+
+        } elseif ($value instanceof Sabre_VObject_Parameter) {
+            if (!is_null($name))
+                throw new InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a Sabre_VObject_Parameter. Add using $array[]=$parameterObject.');
+
+            $value->parent = $this;
+            $this->parameters[] = $value;
+        } else {
+            throw new InvalidArgumentException('You can only add parameters to the property object');
+        }
+
+    }
+
+    /**
+     * Removes one or more parameters with the specified name
+     *
+     * @param string $name
+     * @return void
+     */
+    public function offsetUnset($name) {
+
+        if (is_int($name)) return parent::offsetUnset($name);
+        $name = strtoupper($name);
+
+        foreach($this->parameters as $key=>$parameter) {
+            if ($parameter->name == $name) {
+                $parameter->parent = null;
+                unset($this->parameters[$key]);
+            }
+
+        }
+
+    }
+
+    /* }}} */
+
+    /**
+     * Called when this object is being cast to a string
+     *
+     * @return string
+     */
+    public function __toString() {
+
+        return (string)$this->value;
+
+    }
+
+    /**
+     * This method is automatically called when the object is cloned.
+     * Specifically, this will ensure all child elements are also cloned.
+     *
+     * @return void
+     */
+    public function __clone() {
+
+        foreach($this->parameters as $key=>$child) {
+            $this->parameters[$key] = clone $child;
+            $this->parameters[$key]->parent = $this;
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Property/DateTime.php b/3rdparty/Sabre/VObject/Property/DateTime.php
new file mode 100755
index 0000000000..fe2372caa8
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property/DateTime.php
@@ -0,0 +1,260 @@
+<?php
+
+/**
+ * DateTime property
+ *
+ * This element is used for iCalendar properties such as the DTSTART property.
+ * It basically provides a few helper functions that make it easier to deal
+ * with these. It supports both DATE-TIME and DATE values.
+ *
+ * In order to use this correctly, you must call setDateTime and getDateTime to
+ * retrieve and modify dates respectively.
+ *
+ * If you use the 'value' or properties directly, this object does not keep
+ * reference and results might appear incorrectly.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property_DateTime extends Sabre_VObject_Property {
+
+    /**
+     * Local 'floating' time
+     */
+    const LOCAL = 1;
+
+    /**
+     * UTC-based time
+     */
+    const UTC = 2;
+
+    /**
+     * Local time plus timezone
+     */
+    const LOCALTZ = 3;
+
+    /**
+     * Only a date, time is ignored
+     */
+    const DATE = 4;
+
+    /**
+     * DateTime representation
+     *
+     * @var DateTime
+     */
+    protected $dateTime;
+
+    /**
+     * dateType
+     *
+     * @var int
+     */
+    protected $dateType;
+
+    /**
+     * Updates the Date and Time.
+     *
+     * @param DateTime $dt
+     * @param int $dateType
+     * @return void
+     */
+    public function setDateTime(DateTime $dt, $dateType = self::LOCALTZ) {
+
+        switch($dateType) {
+
+            case self::LOCAL :
+                $this->setValue($dt->format('Ymd\\THis'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case self::UTC :
+                $dt->setTimeZone(new DateTimeZone('UTC'));
+                $this->setValue($dt->format('Ymd\\THis\\Z'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case self::LOCALTZ :
+                $this->setValue($dt->format('Ymd\\THis'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
+                break;
+            case self::DATE :
+                $this->setValue($dt->format('Ymd'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE');
+                break;
+            default :
+                throw new InvalidArgumentException('You must pass a valid dateType constant');
+
+        }
+        $this->dateTime = $dt;
+        $this->dateType = $dateType;
+
+    }
+
+    /**
+     * Returns the current DateTime value.
+     *
+     * If no value was set, this method returns null.
+     *
+     * @return DateTime|null
+     */
+    public function getDateTime() {
+
+        if ($this->dateTime)
+            return $this->dateTime;
+
+        list(
+            $this->dateType,
+            $this->dateTime
+        ) = self::parseData($this->value, $this);
+        return $this->dateTime;
+
+    }
+
+    /**
+     * Returns the type of Date format.
+     *
+     * This method returns one of the format constants. If no date was set,
+     * this method will return null.
+     *
+     * @return int|null
+     */
+    public function getDateType() {
+
+        if ($this->dateType)
+            return $this->dateType;
+
+        list(
+            $this->dateType,
+            $this->dateTime,
+        ) = self::parseData($this->value, $this);
+        return $this->dateType;
+
+    }
+
+    /**
+     * Parses the internal data structure to figure out what the current date
+     * and time is.
+     *
+     * The returned array contains two elements:
+     *   1. A 'DateType' constant (as defined on this class), or null.
+     *   2. A DateTime object (or null)
+     *
+     * @param string|null $propertyValue The string to parse (yymmdd or
+     *                                   ymmddThhmmss, etc..)
+     * @param Sabre_VObject_Property|null $property The instance of the
+     *                                              property we're parsing.
+     * @return array
+     */
+    static public function parseData($propertyValue, Sabre_VObject_Property $property = null) {
+
+        if (is_null($propertyValue)) {
+            return array(null, null);
+        }
+
+        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
+        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
+        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
+
+        if (!preg_match($regex, $propertyValue, $matches)) {
+            throw new InvalidArgumentException($propertyValue . ' is not a valid DateTime or Date string');
+        }
+
+        if (!isset($matches['hour'])) {
+            // Date-only
+            return array(
+                self::DATE,
+                new DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00'),
+            );
+        }
+
+        $dateStr =
+            $matches['year'] .'-' .
+            $matches['month'] . '-' .
+            $matches['date'] . ' ' .
+            $matches['hour'] . ':' .
+            $matches['minute'] . ':' .
+            $matches['second'];
+
+        if (isset($matches['isutc'])) {
+            $dt = new DateTime($dateStr,new DateTimeZone('UTC'));
+            $dt->setTimeZone(new DateTimeZone('UTC'));
+            return array(
+                self::UTC,
+                $dt
+            );
+        }
+
+        // Finding the timezone.
+        $tzid = $property['TZID'];
+        if (!$tzid) {
+            return array(
+                self::LOCAL,
+                new DateTime($dateStr)
+            );
+        }
+
+        try {
+            // tzid an Olson identifier?
+            $tz = new DateTimeZone($tzid->value);
+        } catch (Exception $e) {
+
+            // Not an Olson id, we're going to try to find the information 
+            // through the time zone name map.
+            $newtzid = Sabre_VObject_WindowsTimezoneMap::lookup($tzid->value);
+            if (is_null($newtzid)) {
+
+                // Not a well known time zone name either, we're going to try 
+                // to find the information through the VTIMEZONE object.
+
+                // First we find the root object
+                $root = $property;
+                while($root->parent) {
+                    $root = $root->parent;
+                }
+
+                if (isset($root->VTIMEZONE)) {
+                    foreach($root->VTIMEZONE as $vtimezone) {
+                        if (((string)$vtimezone->TZID) == $tzid) {
+                            if (isset($vtimezone->{'X-LIC-LOCATION'})) {
+                                $newtzid = (string)$vtimezone->{'X-LIC-LOCATION'};
+                            } else {
+                                // No libical location specified. As a last resort we could 
+                                // try matching $vtimezone's DST rules against all known 
+                                // time zones returned by DateTimeZone::list*
+
+                                // TODO
+                            }
+                        }
+                    }
+                }
+            }
+
+            try {
+                $tz = new DateTimeZone($newtzid);
+            } catch (Exception $e) {
+                // If all else fails, we use the default PHP timezone
+                $tz = new DateTimeZone(date_default_timezone_get()); 
+            }
+        }
+        $dt = new DateTime($dateStr, $tz);
+        $dt->setTimeZone($tz);
+
+        return array(
+            self::LOCALTZ,
+            $dt
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Property/MultiDateTime.php b/3rdparty/Sabre/VObject/Property/MultiDateTime.php
new file mode 100755
index 0000000000..ae53ab6a61
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property/MultiDateTime.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Multi-DateTime property
+ *
+ * This element is used for iCalendar properties such as the EXDATE property.
+ * It basically provides a few helper functions that make it easier to deal
+ * with these. It supports both DATE-TIME and DATE values.
+ *
+ * In order to use this correctly, you must call setDateTimes and getDateTimes
+ * to retrieve and modify dates respectively.
+ *
+ * If you use the 'value' or properties directly, this object does not keep
+ * reference and results might appear incorrectly.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property_MultiDateTime extends Sabre_VObject_Property {
+
+    /**
+     * DateTime representation
+     *
+     * @var DateTime[]
+     */
+    protected $dateTimes;
+
+    /**
+     * dateType
+     *
+     * This is one of the Sabre_VObject_Property_DateTime constants.
+     *
+     * @var int
+     */
+    protected $dateType;
+
+    /**
+     * Updates the value
+     *
+     * @param array $dt Must be an array of DateTime objects.
+     * @param int $dateType
+     * @return void
+     */
+    public function setDateTimes(array $dt, $dateType = Sabre_VObject_Property_DateTime::LOCALTZ) {
+
+        foreach($dt as $i)
+            if (!$i instanceof DateTime)
+                throw new InvalidArgumentException('You must pass an array of DateTime objects');
+
+        $this->offsetUnset('VALUE');
+        $this->offsetUnset('TZID');
+        switch($dateType) {
+
+            case Sabre_VObject_Property_DateTime::LOCAL :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd\\THis');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case Sabre_VObject_Property_DateTime::UTC :
+                $val = array();
+                foreach($dt as $i) {
+                    $i->setTimeZone(new DateTimeZone('UTC'));
+                    $val[] = $i->format('Ymd\\THis\\Z');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case Sabre_VObject_Property_DateTime::LOCALTZ :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd\\THis');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
+                break;
+            case Sabre_VObject_Property_DateTime::DATE :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE');
+                break;
+            default :
+                throw new InvalidArgumentException('You must pass a valid dateType constant');
+
+        }
+        $this->dateTimes = $dt;
+        $this->dateType = $dateType;
+
+    }
+
+    /**
+     * Returns the current DateTime value.
+     *
+     * If no value was set, this method returns null.
+     *
+     * @return array|null
+     */
+    public function getDateTimes() {
+
+        if ($this->dateTimes)
+            return $this->dateTimes;
+
+        $dts = array();
+
+        if (!$this->value) {
+            $this->dateTimes = null;
+            $this->dateType = null;
+            return null;
+        }
+
+        foreach(explode(',',$this->value) as $val) {
+            list(
+                $type,
+                $dt
+            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
+            $dts[] = $dt;
+            $this->dateType = $type;
+        }
+        $this->dateTimes = $dts;
+        return $this->dateTimes;
+
+    }
+
+    /**
+     * Returns the type of Date format.
+     *
+     * This method returns one of the format constants. If no date was set,
+     * this method will return null.
+     *
+     * @return int|null
+     */
+    public function getDateType() {
+
+        if ($this->dateType)
+            return $this->dateType;
+
+        if (!$this->value) {
+            $this->dateTimes = null;
+            $this->dateType = null;
+            return null;
+        }
+
+        $dts = array();
+        foreach(explode(',',$this->value) as $val) {
+            list(
+                $type,
+                $dt
+            ) = Sabre_VObject_Property_DateTime::parseData($val, $this);
+            $dts[] = $dt;
+            $this->dateType = $type;
+        }
+        $this->dateTimes = $dts;
+        return $this->dateType;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/Reader.php b/3rdparty/Sabre/VObject/Reader.php
new file mode 100755
index 0000000000..eea73fa3dc
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Reader.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * VCALENDAR/VCARD reader
+ *
+ * This class reads the vobject file, and returns a full element tree.
+ *
+ * TODO: this class currently completely works 'statically'. This is pointless,
+ * and defeats OOP principals. Needs refactoring in a future version.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Reader {
+
+    /**
+     * Parses the file and returns the top component
+     *
+     * @param string $data
+     * @return Sabre_VObject_Element
+     */
+    static function read($data) {
+
+        // Normalizing newlines
+        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
+
+        $lines = explode("\n", $data);
+
+        // Unfolding lines
+        $lines2 = array();
+        foreach($lines as $line) {
+
+            // Skipping empty lines
+            if (!$line) continue;
+
+            if ($line[0]===" " || $line[0]==="\t") {
+                $lines2[count($lines2)-1].=substr($line,1);
+            } else {
+                $lines2[] = $line;
+            }
+
+        }
+
+        unset($lines);
+
+        reset($lines2);
+
+        return self::readLine($lines2);
+
+    }
+
+    /**
+     * Reads and parses a single line.
+     *
+     * This method receives the full array of lines. The array pointer is used
+     * to traverse.
+     *
+     * @param array $lines
+     * @return Sabre_VObject_Element
+     */
+    static private function readLine(&$lines) {
+
+        $line = current($lines);
+        $lineNr = key($lines);
+        next($lines);
+
+        // Components
+        if (stripos($line,"BEGIN:")===0) {
+
+            $componentName = strtoupper(substr($line,6));
+            $obj = Sabre_VObject_Component::create($componentName);
+
+            $nextLine = current($lines);
+
+            while(stripos($nextLine,"END:")!==0) {
+
+                $obj->add(self::readLine($lines));
+
+                $nextLine = current($lines);
+
+                if ($nextLine===false)
+                    throw new Sabre_VObject_ParseException('Invalid VObject. Document ended prematurely.');
+
+            }
+
+            // Checking component name of the 'END:' line.
+            if (substr($nextLine,4)!==$obj->name) {
+                throw new Sabre_VObject_ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
+            }
+            next($lines);
+
+            return $obj;
+
+        }
+
+        // Properties
+        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
+
+
+        $token = '[A-Z0-9-\.]+';
+        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
+        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
+
+        $result = preg_match($regex,$line,$matches);
+
+        if (!$result) {
+            throw new Sabre_VObject_ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
+        }
+
+        $propertyName = strtoupper($matches['name']);
+        $propertyValue = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
+            if ($matches[2]==='n' || $matches[2]==='N') {
+                return "\n";
+            } else {
+                return $matches[2];
+            }
+        }, $matches['value']);
+
+        $obj = Sabre_VObject_Property::create($propertyName, $propertyValue);
+
+        if ($matches['parameters']) {
+
+            foreach(self::readParameters($matches['parameters']) as $param) {
+                $obj->add($param);
+            }
+
+        }
+
+        return $obj;
+
+
+    }
+
+    /**
+     * Reads a parameter list from a property
+     *
+     * This method returns an array of Sabre_VObject_Parameter
+     *
+     * @param string $parameters
+     * @return array
+     */
+    static private function readParameters($parameters) {
+
+        $token = '[A-Z0-9-]+';
+
+        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
+
+        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
+        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
+
+        $params = array();
+        foreach($matches as $match) {
+
+            $value = isset($match['paramValue'])?$match['paramValue']:null;
+
+            if (isset($value[0])) {
+                // Stripping quotes, if needed
+                if ($value[0] === '"') $value = substr($value,1,strlen($value)-2);
+            } else {
+                $value = '';
+            }
+
+            $value = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
+                if ($matches[2]==='n' || $matches[2]==='N') {
+                    return "\n";
+                } else {
+                    return $matches[2];
+                }
+            }, $value);
+
+            $params[] = new Sabre_VObject_Parameter($match['paramName'], $value);
+
+        }
+
+        return $params;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/VObject/RecurrenceIterator.php b/3rdparty/Sabre/VObject/RecurrenceIterator.php
new file mode 100755
index 0000000000..740270dd8f
--- /dev/null
+++ b/3rdparty/Sabre/VObject/RecurrenceIterator.php
@@ -0,0 +1,1043 @@
+<?php
+
+/**
+ * This class is used to determine new for a recurring event, when the next
+ * events occur.
+ *
+ * This iterator may loop infinitely in the future, therefore it is important
+ * that if you use this class, you set hard limits for the amount of iterations
+ * you want to handle.
+ *
+ * Note that currently there is not full support for the entire iCalendar
+ * specification, as it's very complex and contains a lot of permutations
+ * that's not yet used very often in software.
+ *
+ * For the focus has been on features as they actually appear in Calendaring
+ * software, but this may well get expanded as needed / on demand
+ *
+ * The following RRULE properties are supported
+ *   * UNTIL
+ *   * INTERVAL
+ *   * COUNT
+ *   * FREQ=DAILY
+ *     * BYDAY
+ *   * FREQ=WEEKLY
+ *     * BYDAY
+ *     * WKST
+ *   * FREQ=MONTHLY
+ *     * BYMONTHDAY
+ *     * BYDAY
+ *     * BYSETPOS
+ *   * FREQ=YEARLY
+ *     * BYMONTH
+ *     * BYMONTHDAY (only if BYMONTH is also set)
+ *     * BYDAY (only if BYMONTH is also set)
+ *
+ * Anything beyond this is 'undefined', which means that it may get ignored, or
+ * you may get unexpected results. The effect is that in some applications the
+ * specified recurrence may look incorrect, or is missing.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_RecurrenceIterator implements Iterator {
+
+    /**
+     * The initial event date
+     *
+     * @var DateTime
+     */
+    public $startDate;
+
+    /**
+     * The end-date of the initial event
+     *
+     * @var DateTime
+     */
+    public $endDate;
+
+    /**
+     * The 'current' recurrence.
+     *
+     * This will be increased for every iteration.
+     *
+     * @var DateTime
+     */
+    public $currentDate;
+
+
+    /**
+     * List of dates that are excluded from the rules.
+     *
+     * This list contains the items that have been overriden by the EXDATE
+     * property.
+     *
+     * @var array
+     */
+    public $exceptionDates = array();
+
+    /**
+     * Base event
+     *
+     * @var Sabre_VObject_Component_VEvent
+     */
+    public $baseEvent;
+
+    /**
+     * List of dates that are overridden by other events.
+     * Similar to $overriddenEvents, but this just contains the original dates.
+     *
+     * @var array
+     */
+    public $overriddenDates = array();
+
+    /**
+     * list of events that are 'overridden'.
+     *
+     * This is an array of Sabre_VObject_Component_VEvent objects.
+     *
+     * @var array
+     */
+    public $overriddenEvents = array();
+
+
+    /**
+     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
+     * yearly.
+     *
+     * @var string
+     */
+    public $frequency;
+
+    /**
+     * The last instance of this recurrence, inclusively
+     *
+     * @var DateTime|null
+     */
+    public $until;
+
+    /**
+     * The number of recurrences, or 'null' if infinitely recurring.
+     *
+     * @var int
+     */
+    public $count;
+
+    /**
+     * The interval.
+     *
+     * If for example frequency is set to daily, interval = 2 would mean every
+     * 2 days.
+     *
+     * @var int
+     */
+    public $interval = 1;
+
+    /**
+     * Which seconds to recur.
+     *
+     * This is an array of integers (between 0 and 60)
+     *
+     * @var array
+     */
+    public $bySecond;
+
+    /**
+     * Which minutes to recur
+     *
+     * This is an array of integers (between 0 and 59)
+     *
+     * @var array
+     */
+    public $byMinute;
+
+    /**
+     * Which hours to recur
+     *
+     * This is an array of integers (between 0 and 23)
+     *
+     * @var array
+     */
+    public $byHour;
+
+    /**
+     * Which weekdays to recur.
+     *
+     * This is an array of weekdays
+     *
+     * This may also be preceeded by a positive or negative integer. If present,
+     * this indicates the nth occurrence of a specific day within the monthly or
+     * yearly rrule. For instance, -2TU indicates the second-last tuesday of
+     * the month, or year.
+     *
+     * @var array
+     */
+    public $byDay;
+
+    /**
+     * Which days of the month to recur
+     *
+     * This is an array of days of the months (1-31). The value can also be
+     * negative. -5 for instance means the 5th last day of the month.
+     *
+     * @var array
+     */
+    public $byMonthDay;
+
+    /**
+     * Which days of the year to recur.
+     *
+     * This is an array with days of the year (1 to 366). The values can also
+     * be negative. For instance, -1 will always represent the last day of the
+     * year. (December 31st).
+     *
+     * @var array
+     */
+    public $byYearDay;
+
+    /**
+     * Which week numbers to recur.
+     *
+     * This is an array of integers from 1 to 53. The values can also be
+     * negative. -1 will always refer to the last week of the year.
+     *
+     * @var array
+     */
+    public $byWeekNo;
+
+    /**
+     * Which months to recur
+     *
+     * This is an array of integers from 1 to 12.
+     *
+     * @var array
+     */
+    public $byMonth;
+
+    /**
+     * Which items in an existing st to recur.
+     *
+     * These numbers work together with an existing by* rule. It specifies
+     * exactly which items of the existing by-rule to filter.
+     *
+     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
+     * used to recur the last workday of the month.
+     *
+     * This would be done by setting frequency to 'monthly', byDay to
+     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
+     *
+     * @var array
+     */
+    public $bySetPos;
+
+    /**
+     * When a week starts
+     *
+     * @var string
+     */
+    public $weekStart = 'MO';
+
+    /**
+     * The current item in the list
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Simple mapping from iCalendar day names to day numbers
+     *
+     * @var array
+     */
+    private $dayMap = array(
+        'SU' => 0,
+        'MO' => 1,
+        'TU' => 2,
+        'WE' => 3,
+        'TH' => 4,
+        'FR' => 5,
+        'SA' => 6,
+    );
+
+    /**
+     * Mappings between the day number and english day name.
+     *
+     * @var array
+     */
+    private $dayNames = array(
+        0 => 'Sunday',
+        1 => 'Monday',
+        2 => 'Tuesday',
+        3 => 'Wednesday',
+        4 => 'Thursday',
+        5 => 'Friday',
+        6 => 'Saturday',
+    );
+
+    /**
+     * If the current iteration of the event is an overriden event, this
+     * property will hold the VObject
+     *
+     * @var Sabre_Component_VObject
+     */
+    private $currentOverriddenEvent;
+
+    /**
+     * This property may contain the date of the next not-overridden event.
+     * This date is calculated sometimes a bit early, before overridden events
+     * are evaluated.
+     *
+     * @var DateTime
+     */
+    private $nextDate;
+
+    /**
+     * Creates the iterator
+     *
+     * You should pass a VCALENDAR component, as well as the UID of the event
+     * we're going to traverse.
+     *
+     * @param Sabre_VObject_Component $vcal
+     * @param string|null $uid
+     */
+    public function __construct(Sabre_VObject_Component $vcal, $uid=null) {
+
+        if (is_null($uid)) {
+            if ($vcal->name === 'VCALENDAR') {
+                throw new InvalidArgumentException('If you pass a VCALENDAR object, you must pass a uid argument as well');
+            }
+            $components = array($vcal);
+            $uid = (string)$vcal->uid;
+        } else {
+            $components = $vcal->select('VEVENT');
+        }
+        foreach($components as $component) {
+            if ((string)$component->uid == $uid) {
+                if (isset($component->{'RECURRENCE-ID'})) {
+                    $this->overriddenEvents[$component->DTSTART->getDateTime()->getTimeStamp()] = $component;
+                    $this->overriddenDates[] = $component->{'RECURRENCE-ID'}->getDateTime();
+                } else {
+                    $this->baseEvent = $component;
+                }
+            }
+        }
+        if (!$this->baseEvent) {
+            throw new InvalidArgumentException('Could not find a base event with uid: ' . $uid);
+        }
+
+        $this->startDate = clone $this->baseEvent->DTSTART->getDateTime();
+
+        $this->endDate = null;
+        if (isset($this->baseEvent->DTEND)) {
+            $this->endDate = clone $this->baseEvent->DTEND->getDateTime();
+        } else {
+            $this->endDate = clone $this->startDate;
+            if (isset($this->baseEvent->DURATION)) {
+                $this->endDate->add(Sabre_VObject_DateTimeParser::parse($this->baseEvent->DURATION->value));
+            } elseif ($this->baseEvent->DTSTART->getDateType()===Sabre_VObject_Property_DateTime::DATE) {
+                $this->endDate->modify('+1 day');
+            }
+        }
+        $this->currentDate = clone $this->startDate;
+
+        $rrule = (string)$this->baseEvent->RRULE;
+
+        $parts = explode(';', $rrule);
+
+        foreach($parts as $part) {
+
+            list($key, $value) = explode('=', $part, 2);
+
+            switch(strtoupper($key)) {
+
+                case 'FREQ' :
+                    if (!in_array(
+                        strtolower($value),
+                        array('secondly','minutely','hourly','daily','weekly','monthly','yearly')
+                    )) {
+                        throw new InvalidArgumentException('Unknown value for FREQ=' . strtoupper($value));
+
+                    }
+                    $this->frequency = strtolower($value);
+                    break;
+
+                case 'UNTIL' :
+                    $this->until = Sabre_VObject_DateTimeParser::parse($value);
+                    break;
+
+                case 'COUNT' :
+                    $this->count = (int)$value;
+                    break;
+
+                case 'INTERVAL' :
+                    $this->interval = (int)$value;
+                    break;
+
+                case 'BYSECOND' :
+                    $this->bySecond = explode(',', $value);
+                    break;
+
+                case 'BYMINUTE' :
+                    $this->byMinute = explode(',', $value);
+                    break;
+
+                case 'BYHOUR' :
+                    $this->byHour = explode(',', $value);
+                    break;
+
+                case 'BYDAY' :
+                    $this->byDay = explode(',', strtoupper($value));
+                    break;
+
+                case 'BYMONTHDAY' :
+                    $this->byMonthDay = explode(',', $value);
+                    break;
+
+                case 'BYYEARDAY' :
+                    $this->byYearDay = explode(',', $value);
+                    break;
+
+                case 'BYWEEKNO' :
+                    $this->byWeekNo = explode(',', $value);
+                    break;
+
+                case 'BYMONTH' :
+                    $this->byMonth = explode(',', $value);
+                    break;
+
+                case 'BYSETPOS' :
+                    $this->bySetPos = explode(',', $value);
+                    break;
+
+                case 'WKST' :
+                    $this->weekStart = strtoupper($value);
+                    break;
+
+            }
+
+        }
+
+        // Parsing exception dates
+        if (isset($this->baseEvent->EXDATE)) {
+            foreach($this->baseEvent->EXDATE as $exDate) {
+
+                foreach(explode(',', (string)$exDate) as $exceptionDate) {
+
+                    $this->exceptionDates[] =
+                        Sabre_VObject_DateTimeParser::parse($exceptionDate, $this->startDate->getTimeZone());
+
+                }
+
+            }
+
+        }
+
+    }
+
+    /**
+     * Returns the current item in the list
+     *
+     * @return DateTime
+     */
+    public function current() {
+
+        if (!$this->valid()) return null;
+        return clone $this->currentDate;
+
+    }
+
+    /**
+     * This method returns the startdate for the current iteration of the
+     * event.
+     *
+     * @return DateTime
+     */
+    public function getDtStart() {
+
+        if (!$this->valid()) return null;
+        return clone $this->currentDate;
+
+    }
+
+    /**
+     * This method returns the enddate for the current iteration of the
+     * event.
+     *
+     * @return DateTime
+     */
+    public function getDtEnd() {
+
+        if (!$this->valid()) return null;
+        $dtEnd = clone $this->currentDate;
+        $dtEnd->add( $this->startDate->diff( $this->endDate ) );
+        return clone $dtEnd;
+
+    }
+
+    /**
+     * Returns a VEVENT object with the updated start and end date.
+     *
+     * Any recurrence information is removed, and this function may return an
+     * 'overridden' event instead.
+     *
+     * This method always returns a cloned instance.
+     *
+     * @return void
+     */
+    public function getEventObject() {
+
+        if ($this->currentOverriddenEvent) {
+            return clone $this->currentOverriddenEvent;
+        }
+        $event = clone $this->baseEvent;
+        unset($event->RRULE);
+        unset($event->EXDATE);
+        unset($event->RDATE);
+        unset($event->EXRULE);
+
+        $event->DTSTART->setDateTime($this->getDTStart(), $event->DTSTART->getDateType());
+        if (isset($event->DTEND)) {
+            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTSTART->getDateType());
+        }
+        if ($this->counter > 0) {
+            $event->{'RECURRENCE-ID'} = (string)$event->DTSTART;
+        }
+
+        return $event;
+
+    }
+
+    /**
+     * Returns the current item number
+     *
+     * @return int
+     */
+    public function key() {
+
+        return $this->counter;
+
+    }
+
+    /**
+     * Whether or not there is a 'next item'
+     *
+     * @return bool
+     */
+    public function valid() {
+
+        if (!is_null($this->count)) {
+            return $this->counter < $this->count;
+        }
+        if (!is_null($this->until)) {
+            return $this->currentDate <= $this->until;
+        }
+        return true;
+
+    }
+
+    /**
+     * Resets the iterator
+     *
+     * @return void
+     */
+    public function rewind() {
+
+        $this->currentDate = clone $this->startDate;
+        $this->counter = 0;
+
+    }
+
+    /**
+     * This method allows you to quickly go to the next occurrence after the
+     * specified date.
+     *
+     * Note that this checks the current 'endDate', not the 'stardDate'. This
+     * means that if you forward to January 1st, the iterator will stop at the
+     * first event that ends *after* January 1st.
+     *
+     * @param DateTime $dt
+     * @return void
+     */
+    public function fastForward(DateTime $dt) {
+
+        while($this->valid() && $this->getDTEnd() <= $dt) {
+            $this->next();
+        }
+
+    }
+
+    /**
+     * Goes on to the next iteration
+     *
+     * @return void
+     */
+    public function next() {
+
+        /*
+        if (!is_null($this->count) && $this->counter >= $this->count) {
+            $this->currentDate = null;
+        }*/
+
+
+        $previousStamp = $this->currentDate->getTimeStamp();
+
+        while(true) {
+
+            $this->currentOverriddenEvent = null;
+
+            // If we have a next date 'stored', we use that
+            if ($this->nextDate) {
+                $this->currentDate = $this->nextDate;
+                $currentStamp = $this->currentDate->getTimeStamp();
+                $this->nextDate = null;
+            } else {
+
+                // Otherwise, we calculate it
+                switch($this->frequency) {
+
+                    case 'daily' :
+                        $this->nextDaily();
+                        break;
+
+                    case 'weekly' :
+                        $this->nextWeekly();
+                        break;
+
+                    case 'monthly' :
+                        $this->nextMonthly();
+                        break;
+
+                    case 'yearly' :
+                        $this->nextYearly();
+                        break;
+
+                }
+                $currentStamp = $this->currentDate->getTimeStamp();
+
+                // Checking exception dates
+                foreach($this->exceptionDates as $exceptionDate) {
+                    if ($this->currentDate == $exceptionDate) {
+                        $this->counter++;
+                        continue 2;
+                    }
+                }
+                foreach($this->overriddenDates as $overriddenDate) {
+                    if ($this->currentDate == $overriddenDate) {
+                        continue 2;
+                    }
+                }
+
+            }
+
+            // Checking overriden events
+            foreach($this->overriddenEvents as $index=>$event) {
+                if ($index > $previousStamp && $index <= $currentStamp) {
+
+                    // We're moving the 'next date' aside, for later use.
+                    $this->nextDate = clone $this->currentDate;
+
+                    $this->currentDate = $event->DTSTART->getDateTime();
+                    $this->currentOverriddenEvent = $event;
+
+                    break;
+                }
+            }
+
+            break;
+
+        }
+
+        /*
+        if (!is_null($this->until)) {
+            if($this->currentDate > $this->until) {
+                $this->currentDate = null;
+            }
+        }*/
+
+        $this->counter++;
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for daily frequency.
+     *
+     * @return void
+     */
+    protected function nextDaily() {
+
+        if (!$this->byDay) {
+            $this->currentDate->modify('+' . $this->interval . ' days');
+            return;
+        }
+
+        $recurrenceDays = array();
+        foreach($this->byDay as $byDay) {
+
+            // The day may be preceeded with a positive (+n) or
+            // negative (-n) integer. However, this does not make
+            // sense in 'weekly' so we ignore it here.
+            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
+
+        }
+
+        do {
+
+            $this->currentDate->modify('+' . $this->interval . ' days');
+
+            // Current day of the week
+            $currentDay = $this->currentDate->format('w');
+
+        } while (!in_array($currentDay, $recurrenceDays));
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for weekly frequency.
+     *
+     * @return void
+     */
+    protected function nextWeekly() {
+
+        if (!$this->byDay) {
+            $this->currentDate->modify('+' . $this->interval . ' weeks');
+            return;
+        }
+
+        $recurrenceDays = array();
+        foreach($this->byDay as $byDay) {
+
+            // The day may be preceeded with a positive (+n) or
+            // negative (-n) integer. However, this does not make
+            // sense in 'weekly' so we ignore it here.
+            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
+
+        }
+
+        // Current day of the week
+        $currentDay = $this->currentDate->format('w');
+
+        // First day of the week:
+        $firstDay = $this->dayMap[$this->weekStart];
+
+        $time = array(
+            $this->currentDate->format('H'),
+            $this->currentDate->format('i'),
+            $this->currentDate->format('s')
+        );
+
+        // Increasing the 'current day' until we find our next
+        // occurrence.
+        while(true) {
+
+            $currentDay++;
+
+            if ($currentDay>6) {
+                $currentDay = 0;
+            }
+
+            // We need to roll over to the next week
+            if ($currentDay === $firstDay) {
+                $this->currentDate->modify('+' . $this->interval . ' weeks');
+
+                // We need to go to the first day of this week, but only if we
+                // are not already on this first day of this week.
+                if($this->currentDate->format('w') != $firstDay) {
+                    $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
+                    $this->currentDate->setTime($time[0],$time[1],$time[2]);
+                }
+            }
+
+            // We have a match
+            if (in_array($currentDay ,$recurrenceDays)) {
+                $this->currentDate->modify($this->dayNames[$currentDay]);
+                $this->currentDate->setTime($time[0],$time[1],$time[2]);
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for monthly frequency.
+     *
+     * @return void
+     */
+    protected function nextMonthly() {
+
+        $currentDayOfMonth = $this->currentDate->format('j');
+        if (!$this->byMonthDay && !$this->byDay) {
+
+            // If the current day is higher than the 28th, rollover can
+            // occur to the next month. We Must skip these invalid
+            // entries.
+            if ($currentDayOfMonth < 29) {
+                $this->currentDate->modify('+' . $this->interval . ' months');
+            } else {
+                $increase = 0;
+                do {
+                    $increase++;
+                    $tempDate = clone $this->currentDate;
+                    $tempDate->modify('+ ' . ($this->interval*$increase) . ' months');
+                } while ($tempDate->format('j') != $currentDayOfMonth);
+                $this->currentDate = $tempDate;
+            }
+            return;
+        }
+
+        while(true) {
+
+            $occurrences = $this->getMonthlyOccurrences();
+
+            foreach($occurrences as $occurrence) {
+
+                // The first occurrence thats higher than the current
+                // day of the month wins.
+                if ($occurrence > $currentDayOfMonth) {
+                    break 2;
+                }
+
+            }
+
+            // If we made it all the way here, it means there were no
+            // valid occurrences, and we need to advance to the next
+            // month.
+            $this->currentDate->modify('first day of this month');
+            $this->currentDate->modify('+ ' . $this->interval . ' months');
+
+            // This goes to 0 because we need to start counting at hte
+            // beginning.
+            $currentDayOfMonth = 0;
+
+        }
+
+        $this->currentDate->setDate($this->currentDate->format('Y'), $this->currentDate->format('n'), $occurrence);
+
+    }
+
+    /**
+     * Does the processing for advancing the iterator for yearly frequency.
+     *
+     * @return void
+     */
+    protected function nextYearly() {
+
+        $currentMonth = $this->currentDate->format('n');
+        $currentYear = $this->currentDate->format('Y');
+        $currentDayOfMonth = $this->currentDate->format('j');
+
+        // No sub-rules, so we just advance by year
+        if (!$this->byMonth) {
+
+            // Unless it was a leap day!
+            if ($currentMonth==2 && $currentDayOfMonth==29) {
+
+                $counter = 0;
+                do {
+                    $counter++;
+                    // Here we increase the year count by the interval, until
+                    // we hit a date that's also in a leap year.
+                    //
+                    // We could just find the next interval that's dividable by
+                    // 4, but that would ignore the rule that there's no leap
+                    // year every year that's dividable by a 100, but not by
+                    // 400. (1800, 1900, 2100). So we just rely on the datetime
+                    // functions instead.
+                    $nextDate = clone $this->currentDate;
+                    $nextDate->modify('+ ' . ($this->interval*$counter) . ' years');
+                } while ($nextDate->format('n')!=2);
+                $this->currentDate = $nextDate;
+
+                return;
+
+            }
+
+            // The easiest form
+            $this->currentDate->modify('+' . $this->interval . ' years');
+            return;
+
+        }
+
+        $currentMonth = $this->currentDate->format('n');
+        $currentYear = $this->currentDate->format('Y');
+        $currentDayOfMonth = $this->currentDate->format('j');
+
+        $advancedToNewMonth = false;
+
+        // If we got a byDay or getMonthDay filter, we must first expand
+        // further.
+        if ($this->byDay || $this->byMonthDay) {
+
+            while(true) {
+
+                $occurrences = $this->getMonthlyOccurrences();
+
+                foreach($occurrences as $occurrence) {
+
+                    // The first occurrence that's higher than the current
+                    // day of the month wins.
+                    // If we advanced to the next month or year, the first
+                    // occurence is always correct.
+                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
+                        break 2;
+                    }
+
+                }
+
+                // If we made it here, it means we need to advance to
+                // the next month or year.
+                $currentDayOfMonth = 1;
+                $advancedToNewMonth = true;
+                do {
+
+                    $currentMonth++;
+                    if ($currentMonth>12) {
+                        $currentYear+=$this->interval;
+                        $currentMonth = 1;
+                    }
+                } while (!in_array($currentMonth, $this->byMonth));
+
+                $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+
+            }
+
+            // If we made it here, it means we got a valid occurrence
+            $this->currentDate->setDate($currentYear, $currentMonth, $occurrence);
+            return;
+
+        } else {
+
+            // These are the 'byMonth' rules, if there are no byDay or
+            // byMonthDay sub-rules.
+            do {
+
+                $currentMonth++;
+                if ($currentMonth>12) {
+                    $currentYear+=$this->interval;
+                    $currentMonth = 1;
+                }
+            } while (!in_array($currentMonth, $this->byMonth));
+            $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+
+            return;
+
+        }
+
+    }
+
+    /**
+     * Returns all the occurrences for a monthly frequency with a 'byDay' or
+     * 'byMonthDay' expansion for the current month.
+     *
+     * The returned list is an array of integers with the day of month (1-31).
+     *
+     * @return array
+     */
+    protected function getMonthlyOccurrences() {
+
+        $startDate = clone $this->currentDate;
+
+        $byDayResults = array();
+
+        // Our strategy is to simply go through the byDays, advance the date to
+        // that point and add it to the results.
+        if ($this->byDay) foreach($this->byDay as $day) {
+
+            $dayName = $this->dayNames[$this->dayMap[substr($day,-2)]];
+
+            // Dayname will be something like 'wednesday'. Now we need to find
+            // all wednesdays in this month.
+            $dayHits = array();
+
+            $checkDate = clone $startDate;
+            $checkDate->modify('first day of this month');
+            $checkDate->modify($dayName);
+
+            do {
+                $dayHits[] = $checkDate->format('j');
+                $checkDate->modify('next ' . $dayName);
+            } while ($checkDate->format('n') === $startDate->format('n'));
+
+            // So now we have 'all wednesdays' for month. It is however
+            // possible that the user only really wanted the 1st, 2nd or last
+            // wednesday.
+            if (strlen($day)>2) {
+                $offset = (int)substr($day,0,-2);
+
+                if ($offset>0) {
+                    // It is possible that the day does not exist, such as a
+                    // 5th or 6th wednesday of the month.
+                    if (isset($dayHits[$offset-1])) {
+                        $byDayResults[] = $dayHits[$offset-1];
+                    }
+                } else {
+
+                    // if it was negative we count from the end of the array
+                    $byDayResults[] = $dayHits[count($dayHits) + $offset];
+                }
+            } else {
+                // There was no counter (first, second, last wednesdays), so we
+                // just need to add the all to the list).
+                $byDayResults = array_merge($byDayResults, $dayHits);
+
+            }
+
+        }
+
+        $byMonthDayResults = array();
+        if ($this->byMonthDay) foreach($this->byMonthDay as $monthDay) {
+
+            // Removing values that are out of range for this month
+            if ($monthDay > $startDate->format('t') ||
+                $monthDay < 0-$startDate->format('t')) {
+                    continue;
+            }
+            if ($monthDay>0) {
+                $byMonthDayResults[] = $monthDay;
+            } else {
+                // Negative values
+                $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
+            }
+        }
+
+        // If there was just byDay or just byMonthDay, they just specify our
+        // (almost) final list. If both were provided, then byDay limits the
+        // list.
+        if ($this->byMonthDay && $this->byDay) {
+            $result = array_intersect($byMonthDayResults, $byDayResults);
+        } elseif ($this->byMonthDay) {
+            $result = $byMonthDayResults;
+        } else {
+            $result = $byDayResults;
+        }
+        $result = array_unique($result);
+        sort($result, SORT_NUMERIC);
+
+        // The last thing that needs checking is the BYSETPOS. If it's set, it
+        // means only certain items in the set survive the filter.
+        if (!$this->bySetPos) {
+            return $result;
+        }
+
+        $filteredResult = array();
+        foreach($this->bySetPos as $setPos) {
+
+            if ($setPos<0) {
+                $setPos = count($result)-($setPos+1);
+            }
+            if (isset($result[$setPos-1])) {
+                $filteredResult[] = $result[$setPos-1];
+            }
+        }
+
+        sort($filteredResult, SORT_NUMERIC);
+        return $filteredResult;
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/VObject/Version.php b/3rdparty/Sabre/VObject/Version.php
new file mode 100755
index 0000000000..9ee03d8711
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the version number for the VObject package
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.3.4';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/VObject/WindowsTimezoneMap.php b/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
new file mode 100755
index 0000000000..5e1cc5d479
--- /dev/null
+++ b/3rdparty/Sabre/VObject/WindowsTimezoneMap.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Time zone name translation
+ *
+ * This file translates well-known time zone names into "Olson database" time zone names.
+ *
+ * @package Sabre
+ * @subpackage VObject 
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Frank Edelhaeuser (fedel@users.sourceforge.net) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_WindowsTimezoneMap {
+
+    protected static $map = array(
+
+        // from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
+        // snapshot taken on 2012/01/16
+
+        // windows
+        'AUS Central Standard Time'=>'Australia/Darwin',
+        'AUS Eastern Standard Time'=>'Australia/Sydney',
+        'Afghanistan Standard Time'=>'Asia/Kabul',
+        'Alaskan Standard Time'=>'America/Anchorage',
+        'Arab Standard Time'=>'Asia/Riyadh',
+        'Arabian Standard Time'=>'Asia/Dubai',
+        'Arabic Standard Time'=>'Asia/Baghdad',
+        'Argentina Standard Time'=>'America/Buenos_Aires',
+        'Armenian Standard Time'=>'Asia/Yerevan',
+        'Atlantic Standard Time'=>'America/Halifax',
+        'Azerbaijan Standard Time'=>'Asia/Baku',
+        'Azores Standard Time'=>'Atlantic/Azores',
+        'Bangladesh Standard Time'=>'Asia/Dhaka',
+        'Canada Central Standard Time'=>'America/Regina',
+        'Cape Verde Standard Time'=>'Atlantic/Cape_Verde',
+        'Caucasus Standard Time'=>'Asia/Yerevan',
+        'Cen. Australia Standard Time'=>'Australia/Adelaide',
+        'Central America Standard Time'=>'America/Guatemala',
+        'Central Asia Standard Time'=>'Asia/Almaty',
+        'Central Brazilian Standard Time'=>'America/Cuiaba',
+        'Central Europe Standard Time'=>'Europe/Budapest',
+        'Central European Standard Time'=>'Europe/Warsaw',
+        'Central Pacific Standard Time'=>'Pacific/Guadalcanal',
+        'Central Standard Time'=>'America/Chicago',
+        'Central Standard Time (Mexico)'=>'America/Mexico_City',
+        'China Standard Time'=>'Asia/Shanghai',
+        'Dateline Standard Time'=>'Etc/GMT+12',
+        'E. Africa Standard Time'=>'Africa/Nairobi',
+        'E. Australia Standard Time'=>'Australia/Brisbane',
+        'E. Europe Standard Time'=>'Europe/Minsk',
+        'E. South America Standard Time'=>'America/Sao_Paulo',
+        'Eastern Standard Time'=>'America/New_York',
+        'Egypt Standard Time'=>'Africa/Cairo',
+        'Ekaterinburg Standard Time'=>'Asia/Yekaterinburg',
+        'FLE Standard Time'=>'Europe/Kiev',
+        'Fiji Standard Time'=>'Pacific/Fiji',
+        'GMT Standard Time'=>'Europe/London',
+        'GTB Standard Time'=>'Europe/Istanbul',
+        'Georgian Standard Time'=>'Asia/Tbilisi',
+        'Greenland Standard Time'=>'America/Godthab',
+        'Greenwich Standard Time'=>'Atlantic/Reykjavik',
+        'Hawaiian Standard Time'=>'Pacific/Honolulu',
+        'India Standard Time'=>'Asia/Calcutta',
+        'Iran Standard Time'=>'Asia/Tehran',
+        'Israel Standard Time'=>'Asia/Jerusalem',
+        'Jordan Standard Time'=>'Asia/Amman',
+        'Kamchatka Standard Time'=>'Asia/Kamchatka',
+        'Korea Standard Time'=>'Asia/Seoul',
+        'Magadan Standard Time'=>'Asia/Magadan',
+        'Mauritius Standard Time'=>'Indian/Mauritius',
+        'Mexico Standard Time'=>'America/Mexico_City',
+        'Mexico Standard Time 2'=>'America/Chihuahua',
+        'Mid-Atlantic Standard Time'=>'Etc/GMT+2',
+        'Middle East Standard Time'=>'Asia/Beirut',
+        'Montevideo Standard Time'=>'America/Montevideo',
+        'Morocco Standard Time'=>'Africa/Casablanca',
+        'Mountain Standard Time'=>'America/Denver',
+        'Mountain Standard Time (Mexico)'=>'America/Chihuahua',
+        'Myanmar Standard Time'=>'Asia/Rangoon',
+        'N. Central Asia Standard Time'=>'Asia/Novosibirsk',
+        'Namibia Standard Time'=>'Africa/Windhoek',
+        'Nepal Standard Time'=>'Asia/Katmandu',
+        'New Zealand Standard Time'=>'Pacific/Auckland',
+        'Newfoundland Standard Time'=>'America/St_Johns',
+        'North Asia East Standard Time'=>'Asia/Irkutsk',
+        'North Asia Standard Time'=>'Asia/Krasnoyarsk',
+        'Pacific SA Standard Time'=>'America/Santiago',
+        'Pacific Standard Time'=>'America/Los_Angeles',
+        'Pacific Standard Time (Mexico)'=>'America/Santa_Isabel',
+        'Pakistan Standard Time'=>'Asia/Karachi',
+        'Paraguay Standard Time'=>'America/Asuncion',
+        'Romance Standard Time'=>'Europe/Paris',
+        'Russian Standard Time'=>'Europe/Moscow',
+        'SA Eastern Standard Time'=>'America/Cayenne',
+        'SA Pacific Standard Time'=>'America/Bogota',
+        'SA Western Standard Time'=>'America/La_Paz',
+        'SE Asia Standard Time'=>'Asia/Bangkok',
+        'Samoa Standard Time'=>'Pacific/Apia',
+        'Singapore Standard Time'=>'Asia/Singapore',
+        'South Africa Standard Time'=>'Africa/Johannesburg',
+        'Sri Lanka Standard Time'=>'Asia/Colombo',
+        'Syria Standard Time'=>'Asia/Damascus',
+        'Taipei Standard Time'=>'Asia/Taipei',
+        'Tasmania Standard Time'=>'Australia/Hobart',
+        'Tokyo Standard Time'=>'Asia/Tokyo',
+        'Tonga Standard Time'=>'Pacific/Tongatapu',
+        'US Eastern Standard Time'=>'America/Indianapolis',
+        'US Mountain Standard Time'=>'America/Phoenix',
+        'UTC'=>'Etc/GMT',
+        'UTC+12'=>'Etc/GMT-12',
+        'UTC-02'=>'Etc/GMT+2',
+        'UTC-11'=>'Etc/GMT+11',
+        'Ulaanbaatar Standard Time'=>'Asia/Ulaanbaatar',
+        'Venezuela Standard Time'=>'America/Caracas',
+        'Vladivostok Standard Time'=>'Asia/Vladivostok',
+        'W. Australia Standard Time'=>'Australia/Perth',
+        'W. Central Africa Standard Time'=>'Africa/Lagos',
+        'W. Europe Standard Time'=>'Europe/Berlin',
+        'West Asia Standard Time'=>'Asia/Tashkent',
+        'West Pacific Standard Time'=>'Pacific/Port_Moresby',
+        'Yakutsk Standard Time'=>'Asia/Yakutsk',
+    );
+
+    static public function lookup($tzid) {
+        return isset(self::$map[$tzid]) ? self::$map[$tzid] : null;
+    }
+}
diff --git a/3rdparty/Sabre/VObject/includes.php b/3rdparty/Sabre/VObject/includes.php
new file mode 100755
index 0000000000..0177a8f1ba
--- /dev/null
+++ b/3rdparty/Sabre/VObject/includes.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Sabre_VObject includes file
+ *
+ * Including this file will automatically include all files from the VObject
+ * package.
+ *
+ * This often allows faster loadtimes, as autoload-speed is often quite slow.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+// Begin includes
+include __DIR__ . '/DateTimeParser.php';
+include __DIR__ . '/ElementList.php';
+include __DIR__ . '/FreeBusyGenerator.php';
+include __DIR__ . '/Node.php';
+include __DIR__ . '/Parameter.php';
+include __DIR__ . '/ParseException.php';
+include __DIR__ . '/Reader.php';
+include __DIR__ . '/RecurrenceIterator.php';
+include __DIR__ . '/Version.php';
+include __DIR__ . '/WindowsTimezoneMap.php';
+include __DIR__ . '/Element.php';
+include __DIR__ . '/Property.php';
+include __DIR__ . '/Component.php';
+include __DIR__ . '/Property/DateTime.php';
+include __DIR__ . '/Property/MultiDateTime.php';
+include __DIR__ . '/Component/VAlarm.php';
+include __DIR__ . '/Component/VCalendar.php';
+include __DIR__ . '/Component/VEvent.php';
+include __DIR__ . '/Component/VJournal.php';
+include __DIR__ . '/Component/VTodo.php';
+include __DIR__ . '/Element/DateTime.php';
+include __DIR__ . '/Element/MultiDateTime.php';
+// End includes
diff --git a/3rdparty/Sabre/autoload.php b/3rdparty/Sabre/autoload.php
new file mode 100755
index 0000000000..c7b537d83d
--- /dev/null
+++ b/3rdparty/Sabre/autoload.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * SabreDAV's PHP autoloader
+ *
+ * If you love the autoloader, and don't care as much about performance, this
+ * file register a new autoload function using spl_autoload_register.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * @param string $className
+ * @return void
+ */
+function Sabre_autoload($className) {
+
+    if(strpos($className,'Sabre_')===0) {
+
+        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
+
+    }
+
+}
+
+spl_autoload_register('Sabre_autoload');
+

From 7955120aed32882dad630d7dee88cc86eda77793 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 9 Aug 2012 17:39:16 +0200
Subject: [PATCH 1356/1537] remove debug code from calendar - thanks michael
 for pointing that out :)

---
 apps/calendar/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 352c295c43..a8ad4ab335 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -5,7 +5,6 @@
  * later.
  * See the COPYING-README file.
  */
-DEFINE('DEBUG', TRUE);
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 

From b2c58bf5a66217ecba51331b34add22a2652d02a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 17:46:50 +0200
Subject: [PATCH 1357/1537] Fix for broken Mail App in OSX Mountain Lion.
 https://mail.kde.org/pipermail/owncloud/2012-August/004649.html

---
 3rdparty/Sabre/CardDAV/Plugin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
index ca20e46849..96def6dd96 100755
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -154,7 +154,10 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
                     $val = stream_get_contents($val);
 
                 // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+                //$returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+                // The stripping of \r breaks the Mail App in OSX Mountain Lion
+                // this is fixed in master, but not backported. /Tanghus
+                $returnedProperties[200][$addressDataProp] = $val;
 
             }
         }

From ceda0ae0525d66417b4cf8e39e8cedbcbd5f6258 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 19:04:04 +0200
Subject: [PATCH 1358/1537] Backgroundjobs: rename ScheduledTask to QueuedTask

---
 lib/backgroundjob/scheduledtask.php | 25 ++++++++--------
 lib/backgroundjob/worker.php        | 20 ++++++-------
 lib/public/backgroundjob.php        | 45 +++++++++++++++--------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
index 47f332a204..da5d4ddc69 100644
--- a/lib/backgroundjob/scheduledtask.php
+++ b/lib/backgroundjob/scheduledtask.php
@@ -21,22 +21,22 @@
 */
 
 /**
- * This class manages our scheduled tasks.
+ * This class manages our queued tasks.
  */
-class OC_BackgroundJob_ScheduledTask{
+class OC_BackgroundJob_QueuedTask{
 	/**
-	 * @brief Gets one scheduled task
+	 * @brief Gets one queued task
 	 * @param $id ID of the task
 	 * @return associative array
 	 */
 	public static function find( $id ){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE id = ?' );
 		$result = $stmt->execute(array($id));
 		return $result->fetchRow();
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks
+	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
 	public static function all(){
@@ -44,18 +44,17 @@ class OC_BackgroundJob_ScheduledTask{
 		$return = array();
 
 		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks' );
 		$result = $stmt->execute(array());
 		while( $row = $result->fetchRow()){
 			$return[] = $row;
 		}
 
-		// Und weg damit
 		return $return;
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks of a specific app
+	 * @brief Gets all queued tasks of a specific app
 	 * @param $app app name
 	 * @return array with associative arrays
 	 */
@@ -64,7 +63,7 @@ class OC_BackgroundJob_ScheduledTask{
 		$return = array();
 
 		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE app = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE app = ?' );
 		$result = $stmt->execute(array($app));
 		while( $row = $result->fetchRow()){
 			$return[] = $row;
@@ -75,7 +74,7 @@ class OC_BackgroundJob_ScheduledTask{
 	}
 
 	/**
-	 * @brief schedules a task
+	 * @brief queues a task
 	 * @param $app app name
 	 * @param $klass class name
 	 * @param $method method name
@@ -83,21 +82,21 @@ class OC_BackgroundJob_ScheduledTask{
 	 * @return id of task
 	 */
 	public static function add( $task, $klass, $method, $parameters ){
-		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*scheduledtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
+		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
 		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
 
 		return OC_DB::insertid();
 	}
 
 	/**
-	 * @brief deletes a scheduled task
+	 * @brief deletes a queued task
 	 * @param $id id of task
 	 * @return true/false
 	 *
 	 * Deletes a report
 	 */
 	public static function delete( $id ){
-		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*queuedtasks WHERE id = ?' );
 		$result = $stmt->execute(array($id));
 
 		return true;
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 799fa5306c..0acbb9d321 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -30,7 +30,7 @@ class OC_BackgroundJob_Worker{
 	 * @brief executes all tasks
 	 * @return boolean
 	 *
-	 * This method executes all regular tasks and then all scheduled tasks.
+	 * This method executes all regular tasks and then all queued tasks.
 	 * This method should be called by cli scripts that do not let the user
 	 * wait.
 	 */
@@ -41,11 +41,11 @@ class OC_BackgroundJob_Worker{
 			call_user_func( $value );
 		}
 
-		// Do our scheduled tasks
-		$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
-		foreach( $scheduled_tasks as $task ){
+		// Do our queued tasks
+		$queued_tasks = OC_BackgroundJob_QueuedTask::all();
+		foreach( $queued_tasks as $task ){
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
+			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
 		}
 		
 		return true;
@@ -82,23 +82,23 @@ class OC_BackgroundJob_Worker{
 			}
 
 			if( $done == false ){
-				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+				// Next time load queued tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'queued_tasks' );
 			}
 		}
 		else{
-			$tasks = OC_BackgroundJob_ScheduledTask::all();
+			$tasks = OC_BackgroundJob_QueuedTask::all();
 			if( count( $tasks )){
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.
-				OC_BackgroundJob_ScheduledTask::delete($task['id']);
+				OC_BackgroundJob_QueuedTask::delete($task['id']);
 
 				// execute job
 				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 			}
 			else{
-				// Next time load scheduled tasks
+				// Next time load queued tasks
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 			}
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index ac86363454..72f4557eb1 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -32,19 +32,20 @@ namespace OCP;
  * This class provides functions to manage backgroundjobs in ownCloud
  *
  * There are two kind of background jobs in ownCloud: regular tasks and
- * scheduled tasks.
+ * queued tasks.
  *
  * Regular tasks have to be registered in appinfo.php and
  * will run on a regular base. Fetching news could be a task that should run
  * frequently.
  *
- * Scheduled tasks have to be registered each time you want to execute them.
- * An example of the scheduled task would be the creation of the thumbnail. As
- * soon as the user uploads a picture the gallery app registers the scheduled
- * task "create thumbnail" and saves the path in the parameter. As soon as the
- * task is done it will be deleted from the list.
+ * Queued tasks have to be registered each time you want to execute them.
+ * An example of the queued task would be the creation of the thumbnail. As
+ * soon as the user uploads a picture the gallery app registers the queued
+ * task "create thumbnail" and saves the path in the parameter instead of doing
+ * the work right away. This makes the app more responsive. As soon as the task 
+ * is done it will be deleted from the list.
  */
-class Backgroundjob {
+class BackgroundJob {
 	/**
 	 * @brief creates a regular task
 	 * @param $klass class name
@@ -66,51 +67,51 @@ class Backgroundjob {
 	}
 
 	/**
-	 * @brief Gets one scheduled task
+	 * @brief Gets one queued task
 	 * @param $id ID of the task
 	 * @return associative array
 	 */
-	public static function findScheduledTask( $id ){
-		return \OC_BackgroundJob_ScheduledTask::find( $id );
+	public static function findQueuedTask( $id ){
+		return \OC_BackgroundJob_QueuedTask::find( $id );
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks
+	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
-	public static function allScheduledTasks(){
-		return \OC_BackgroundJob_ScheduledTask::all();
+	public static function allQueuedTasks(){
+		return \OC_BackgroundJob_QueuedTask::all();
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks of a specific app
+	 * @brief Gets all queued tasks of a specific app
 	 * @param $app app name
 	 * @return array with associative arrays
 	 */
-	public static function scheduledTaskWhereAppIs( $app ){
-		return \OC_BackgroundJob_ScheduledTask::whereAppIs( $app );
+	public static function queuedTaskWhereAppIs( $app ){
+		return \OC_BackgroundJob_QueuedTask::whereAppIs( $app );
 	}
 
 	/**
-	 * @brief schedules a task
+	 * @brief queues a task
 	 * @param $app app name
 	 * @param $klass class name
 	 * @param $method method name
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function addScheduledTask( $task, $klass, $method, $parameters ){
-		return \OC_BackgroundJob_ScheduledTask::add( $task, $klass, $method, $parameters );
+	public static function addQueuedTask( $task, $klass, $method, $parameters ){
+		return \OC_BackgroundJob_QueuedTask::add( $task, $klass, $method, $parameters );
 	}
 
 	/**
-	 * @brief deletes a scheduled task
+	 * @brief deletes a queued task
 	 * @param $id id of task
 	 * @return true/false
 	 *
 	 * Deletes a report
 	 */
-	public static function deleteScheduledTask( $id ){
-		return \OC_BackgroundJob_ScheduledTask::delete( $id );
+	public static function deleteQueuedTask( $id ){
+		return \OC_BackgroundJob_QueuedTask::delete( $id );
 	}
 }

From 28c1ec19eaab548d080407e956c4909fe7bc07ab Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 19:26:49 +0200
Subject: [PATCH 1359/1537] BackgroundJob: forgot to rename file

---
 lib/backgroundjob/{scheduledtask.php => queuedtask.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/backgroundjob/{scheduledtask.php => queuedtask.php} (100%)

diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/queuedtask.php
similarity index 100%
rename from lib/backgroundjob/scheduledtask.php
rename to lib/backgroundjob/queuedtask.php

From 3b13051f7a9fc0ece4bde6aa55d7df4c10140757 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 9 Aug 2012 13:54:59 -0400
Subject: [PATCH 1360/1537] Additional permission checks for editing and
 deleting contacts

---
 apps/contacts/lib/vcard.php | 79 +++++++++++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 4cc18027ac..7ae80cd5cb 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -362,6 +362,17 @@ class OC_Contacts_VCard{
 		foreach($objects as $object) {
 			$vcard = OC_VObject::parse($object[1]);
 			if(!is_null($vcard)) {
+				$oldcard = self::find($object[0]);
+				if (!$oldcard) {
+					return false;
+				}
+				$addressbook = OC_Contacts_Addressbook::find($oldcard['addressbookid']);
+				if ($addressbook['userid'] != OCP\User::getUser()) {
+					$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $object[0], OCP\Share::FORMAT_NONE, null, true);
+					if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+						return false;
+					}
+				}
 				$vcard->setString('REV', $now->format(DateTime::W3C));
 				$data = $vcard->serialize();
 				try {
@@ -383,11 +394,20 @@ class OC_Contacts_VCard{
 	 */
 	public static function edit($id, OC_VObject $card){
 		$oldcard = self::find($id);
-
+		if (!$oldcard) {
+			return false;
+		}
 		if(is_null($card)) {
 			return false;
 		}
-
+		// NOTE: Owner checks are being made in the ajax files, which should be done inside the lib files to prevent any redundancies with sharing checks
+		$addressbook = OC_Contacts_Addressbook::find($oldcard['addressbookid']);
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
+			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				return false;
+			}
+		}
 		OC_Contacts_App::loadCategoriesFromVCard($card);
 
 		$fn = $card->getAsString('FN');
@@ -436,6 +456,17 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function delete($id){
+		$card = self::find($id);
+		if (!$card) {
+			return false;
+		}
+		$addressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
+			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+				return false;
+			}
+		}
 		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => null, 'id' => $id, 'uri' => null));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
 		try {
@@ -456,6 +487,18 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function deleteFromDAVData($aid,$uri){
+		$addressbook = OC_Contacts_Addressbook::find($aid);
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$query = OCP\DB::prepare( 'SELECT id FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
+			$id = $query->execute(array($aid, $uri))->fetchOne();
+			if (!$id) {
+				return false;
+			}
+			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
+			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+				return false;
+			}
+		}
 		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uri));
 		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
 		try {
@@ -595,8 +638,27 @@ class OC_Contacts_VCard{
 	 *
 	 */
 	public static function moveToAddressBook($aid, $id) {
-		OC_Contacts_App::getAddressbook($aid); // check for user ownership.
+		$addressbook = OC_Contacts_Addressbook::find($aid);
+		if ($addressbook['userid'] != OCP\User::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $aid);
+			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_CREATE)) {
+				return false;
+			}
+		}
 		if(is_array($id)) {
+			foreach ($id as $index => $cardId) {
+				$card = self::find($cardId);
+				if (!$card) {
+					unset($id[$index]);
+				}
+				$oldAddressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
+				if ($oldAddressbook['userid'] != OCP\User::getUser()) {
+					$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $cardId, OCP\Share::FORMAT_NONE, null, true);
+					if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+						unset($id[$index]);
+					}
+				}
+			}
 			$id_sql = join(',', array_fill(0, count($id), '?'));
 			$prep = 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id IN ('.$id_sql.')';
 			try {
@@ -611,6 +673,17 @@ class OC_Contacts_VCard{
 				return false;
 			}
 		} else {
+			$card = self::find($id);
+			if (!$card) {
+				return false;
+			}
+			$oldAddressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
+			if ($oldAddressbook['userid'] != OCP\User::getUser()) {
+				$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
+				if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+					return false;
+				}
+			}
 			try {
 				$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
 				$result = $stmt->execute(array($aid, $id));

From be03ee29f0845c6e1146cad7f274951db4188566 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 9 Aug 2012 13:55:36 -0400
Subject: [PATCH 1361/1537] Bump up version number

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 4c5d416f9f..5dd1164049 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,81,2);
+		return array(4,81,3);
 	}
 
 	/**

From 2b5f005547e920c8071782f975ac98d81475f45a Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 21:29:45 +0200
Subject: [PATCH 1362/1537] Backgroundjobs: Forgot to require lib/base.php

---
 settings/ajax/setbackgroundjobsmode.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
index 454b3caa5b..0ff14376e6 100644
--- a/settings/ajax/setbackgroundjobsmode.php
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -20,6 +20,9 @@
 *
 */
 
+// Init owncloud
+require_once('../../lib/base.php');
+
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 

From 7780e37f380277237b31160ae9bbcb41528c6835 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Aug 2012 21:42:35 +0200
Subject: [PATCH 1363/1537] LDAP: don't give Test Connection button red
 background on fail, it is becoming unreadable

---
 apps/user_ldap/js/settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 4e5923406e..7063eead96 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -13,7 +13,6 @@ $(document).ready(function() {
 						'Connection test succeeded'
 					);
 				} else {
-					$('#ldap_action_test_connection').css('background-color', 'red');
 					OC.dialogs.alert(
 						result.message,
 						'Connection test failed'

From a6a1f892f06e23a405d14d5e0b3eb843c0154909 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 22:07:18 +0200
Subject: [PATCH 1364/1537] BackgroundJobs: fix bug

---
 lib/backgroundjob/worker.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 0acbb9d321..8a58a76e3a 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -73,8 +73,8 @@ class OC_BackgroundJob_Worker{
 			
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
-				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+				if( strcmp( $key, $lasttask ) > 0 ){
+					OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;

From 5f5136643562e53460af557efbb6f3c0a2a6fc80 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 9 Aug 2012 22:14:09 +0200
Subject: [PATCH 1365/1537] Sanitzing user input

---
 apps/gallery/sharing.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php
index 44fcd9c864..af3e553e45 100644
--- a/apps/gallery/sharing.php
+++ b/apps/gallery/sharing.php
@@ -37,7 +37,7 @@ OCP\App::checkAppEnabled('gallery');
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
     <script src="js/sharing.js" type="text/javascript"></script>
     <script>
-      var TOKEN = '<?php echo $_GET['token']; ?>';
+      var TOKEN = '<?php echo htmlentities($_GET['token']); ?>';
     </script>
   </head>
   <body>

From 66511469e04fdf17dfc45711ad98518fab94a712 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 22:22:43 +0200
Subject: [PATCH 1366/1537] Backgroundjobs: Improve error handling in cron.php

---
 cron.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cron.php b/cron.php
index 9d7e396d61..646e37e4c1 100644
--- a/cron.php
+++ b/cron.php
@@ -20,11 +20,26 @@
 *
 */
 
+function handleCliShutdown() {
+	$error = error_get_last();
+	if($error !== NULL){
+		echo 'Unexpected error!'.PHP_EOL;
+	}
+}
+
+function handleWebShutdown(){
+	$error = error_get_last();
+	if($error !== NULL){
+		OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+	}
+}
+
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 if( OC::$CLI ){
+	register_shutdown_function('handleCliShutdown');
 	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
@@ -41,6 +56,7 @@ if( OC::$CLI ){
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
+	register_shutdown_function('handleWebShutdown');
 	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 		exit();

From f46fdfd814de7a43af94cad1dcf456e65350f254 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 22:30:11 +0200
Subject: [PATCH 1367/1537] Backgroundjobs: Add reset counter in worker

---
 lib/backgroundjob/worker.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 8a58a76e3a..b4f0429b31 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -36,16 +36,25 @@ class OC_BackgroundJob_Worker{
 	 */
 	public static function doAllSteps(){
 		// Do our regular work
+		$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+
 		$regular_tasks = OC_BackgroundJob_RegularTask::all();
+		ksort( $regular_tasks );
 		foreach( $regular_tasks as $key => $value ){
-			call_user_func( $value );
+			if( strcmp( $key, $lasttask ) > 0 ){
+				// Set "restart here" config value
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
+				call_user_func( $value );
+			}
 		}
+		// Reset "start here" config value
+		OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 
 		// Do our queued tasks
 		$queued_tasks = OC_BackgroundJob_QueuedTask::all();
 		foreach( $queued_tasks as $task ){
-			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
+			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 		}
 		
 		return true;

From 26a9d7ea718b2c5f9080a4be54099b3626f56cff Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 23:16:07 +0200
Subject: [PATCH 1368/1537] Fixed 3 - THREE - errors in one method call :-P

---
 apps/contacts/ajax/contact/saveproperty.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
index 799038b6f1..fd541b7361 100644
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ b/apps/contacts/ajax/contact/saveproperty.php
@@ -148,6 +148,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 OCP\JSON::success(array('data' => array(
 	'line' => $line,
 	'checksum' => $checksum,
-	'oldchecksum' => $_POST['checksum']
-	'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
-));
+	'oldchecksum' => $_POST['checksum'],
+	'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
+)));

From 7b3c35107d95b3b3ea391e0131ae794411a97128 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 23:49:20 +0200
Subject: [PATCH 1369/1537] Error handling works better now

---
 cron.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/cron.php b/cron.php
index 646e37e4c1..cb01152360 100644
--- a/cron.php
+++ b/cron.php
@@ -20,17 +20,19 @@
 *
 */
 
-function handleCliShutdown() {
-	$error = error_get_last();
-	if($error !== NULL){
-		echo 'Unexpected error!'.PHP_EOL;
-	}
+// Unfortunately we need this class for shutdown function
+class my_temporary_cron_class {
+	public static $sent = false;
 }
 
-function handleWebShutdown(){
-	$error = error_get_last();
-	if($error !== NULL){
-		OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+function handleUnexpectedShutdown() {
+	if( !my_temporary_cron_class::$sent ){
+		if( OC::$CLI ){
+			echo 'Unexpected error!'.PHP_EOL;
+		}
+		else{
+			OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+		}
 	}
 }
 
@@ -59,9 +61,11 @@ else{
 	register_shutdown_function('handleWebShutdown');
 	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
-		exit();
 	}
-	OC_BackgroundJob_Worker::doNextStep();
-	OC_JSON::success();
+	else{
+		OC_BackgroundJob_Worker::doNextStep();
+		OC_JSON::success();
+	}
 }
+my_temporary_cron_class::$sent = true;
 exit();

From 831ec985dbdfa4cc401241dd33c59606f9e9b3e9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 23:52:48 +0200
Subject: [PATCH 1370/1537] Backgroundjobs: fix stupid bug

---
 cron.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cron.php b/cron.php
index cb01152360..c52a503509 100644
--- a/cron.php
+++ b/cron.php
@@ -39,9 +39,11 @@ function handleUnexpectedShutdown() {
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
+// Handle unexpected errors
+register_shutdown_function('handleUnexpectedShutdown');
+
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 if( OC::$CLI ){
-	register_shutdown_function('handleCliShutdown');
 	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
@@ -58,7 +60,6 @@ if( OC::$CLI ){
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
-	register_shutdown_function('handleWebShutdown');
 	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 	}

From ab97c04894ebce03b5b19e29ea677be8abca87ef Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 00:07:46 +0200
Subject: [PATCH 1371/1537] Added XSRF check

---
 core/ajax/appconfig.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 84e0710c74..bf749be3e3 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -7,6 +7,7 @@
 
 require_once ("../../lib/base.php");
 OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
 
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;

From 334296b027127651484fe4a1f7dd2a190817599f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 00:08:24 +0200
Subject: [PATCH 1372/1537] Removed unused file

---
 core/ajax/grouplist.php | 47 -----------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 core/ajax/grouplist.php

diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
deleted file mode 100644
index e3e92fcfa1..0000000000
--- a/core/ajax/grouplist.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
-* ownCloud - ajax group list
-*
-* @author Hans Bakker
-* @copyright 2011 hansmbakker+kde@gmail.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/>.
-*
-*/
-
-$RUNTIME_NOAPPS = TRUE; //no apps, yet
-require_once('../../lib/base.php');
-
-if(!OC_User::isLoggedIn()){
-	if(!isset($_SERVER['PHP_AUTH_USER'])){
-		header('WWW-Authenticate: Basic realm="ownCloud Server"');
-		header('HTTP/1.0 401 Unauthorized');
-		echo 'Valid credentials must be supplied';
-		exit();
-	} else {
-		if(!OC_User::checkPassword($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){
-			exit();
-		}
-	}
-}
-
-$groups = array();
-
-foreach( OC_Group::getGroups() as $i ){
-       	// Do some more work here soon
-        $groups[] = array( "groupname" => $i );
-}
-
-OC_JSON::encodedPrint($groups);

From 2dfc4851494a51ac04192030758f2b43da07b521 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 00:44:35 +0200
Subject: [PATCH 1373/1537] XSRF checks

---
 apps/files_external/ajax/removeRootCertificate.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index a00922f421..f78f85b8fe 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -1,6 +1,8 @@
 <?php
 
 OCP\JSON::checkAppEnabled('files_external');
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $view = \OCP\Files::getStorage("files_external");
 $cert = $_POST['cert'];

From 595591a460c9956e0908c89dd90bf79e5c86aee2 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:30:08 +0200
Subject: [PATCH 1374/1537] Backgroundjobs: Add table to db_structure.xml

---
 db_structure.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/db_structure.xml b/db_structure.xml
index f6dedab0a1..5a783d41a9 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -506,6 +506,58 @@
 
  </table>
 
+ <table>
+
+  <name>*dbprefix*queuedtasks</name>
+
+  <declaration>
+
+   <field>
+    <name>id</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <autoincrement>1</autoincrement>
+    <unsigned>true</unsigned>
+    <length>4</length>
+   </field>
+
+   <field>
+    <name>app</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+
+   <field>
+    <name>klass</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+
+   <field>
+    <name>method</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+
+   <field>
+    <name>parameters</name>
+    <type>clob</type>
+    <notnull>true</notnull>
+   </field>
+
+
+
+  </declaration>
+
+ </table>
+
  <table>
 
   <name>*dbprefix*users</name>

From 7055d2aa2be1a9eadc3f0abb31adc5b1e91de119 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:36:33 +0200
Subject: [PATCH 1375/1537] Backgroundjobs: improve admin form

---
 settings/admin.php           | 1 +
 settings/templates/admin.php | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index bf8e03c13c..6909e02d14 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -29,6 +29,7 @@ $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',$entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 318bfbbe19..af724f134b 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,13 +27,13 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none">
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_none">None</label><br />
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax">
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_ajax">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron">
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_webcron">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron">
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_cron">Cron</label><br />
 </fieldset>
 

From 2c5ab91c7d54332c27be6ed44c29d56503c7841e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 10 Aug 2012 01:39:05 +0200
Subject: [PATCH 1376/1537] Used wrong class.

---
 apps/contacts/ajax/contact/addproperty.php    | 2 +-
 apps/contacts/ajax/contact/deleteproperty.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
index df064367ef..1412cad1cb 100644
--- a/apps/contacts/ajax/contact/addproperty.php
+++ b/apps/contacts/ajax/contact/addproperty.php
@@ -147,6 +147,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 OCP\JSON::success(array(
 	'data' => array(
 		'checksum' => $checksum,
-		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U'))
+		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'))
 	)
 );
diff --git a/apps/contacts/ajax/contact/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php
index d7545ff1fb..b76eb19462 100644
--- a/apps/contacts/ajax/contact/deleteproperty.php
+++ b/apps/contacts/ajax/contact/deleteproperty.php
@@ -47,6 +47,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 OCP\JSON::success(array(
 	'data' => array(
 		'id' => $id,
-		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U'),
+		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
 	)
 ));

From 7c766cdfe05d02bd896d73d30defec76d6844570 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:42:30 +0200
Subject: [PATCH 1377/1537] Backgroundjobs: fix bugs in template

---
 settings/templates/admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index af724f134b..31a7a3dcc1 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,13 +27,13 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_none">None</label><br />
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_ajax">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_webcron">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_cron">Cron</label><br />
 </fieldset>
 

From 9ad31e5f81ad5ec899101a67451843dd8f080340 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:44:38 +0200
Subject: [PATCH 1378/1537] Backgroundjobs: use correct var name in template

---
 settings/templates/admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 31a7a3dcc1..9370739427 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,13 +27,13 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjobs_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_none">None</label><br />
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_ajax">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_webcron">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_cron">Cron</label><br />
 </fieldset>
 

From e73292339f018a5938339f0daa45e2eb78e1f879 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 10:01:17 +0200
Subject: [PATCH 1379/1537] Check if webfinger is enabled

---
 apps/user_webfinger/host-meta.php | 3 +++
 apps/user_webfinger/webfinger.php | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index 4ac37b1ea0..6f6ac46eb9 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -1,4 +1,7 @@
 <?php
+if (!OCP\App::isEnabled("user_webfinger")) {
+	return;
+}
 
 if(class_exists('OC')){
 	$WEBROOT=OC::$WEBROOT;
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index e5b7f042d5..f06346672f 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -1,4 +1,8 @@
 <?php
+if (!OCP\App::isEnabled("user_webfinger")) {
+	return;
+}
+
 header("Access-Control-Allow-Origin: *");
 header("Content-Type: application/xrd+json");
 
@@ -15,7 +19,7 @@ header("Content-Type: application/xrd+json");
  * 	href="<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
  * </Link>
  *
- '* but can also use complex database queries to generate the webfinger result
+ * but can also use complex database queries to generate the webfinger result
  **/
 
 $userName = '';

From aa9fbf6639e2ce2fa2e8549d2d82d54a745d5327 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 9 Aug 2012 08:55:51 +0200
Subject: [PATCH 1380/1537] Combine install checks in lib/base.php

---
 lib/base.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 6514a0c0b0..4fc8cfa245 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -172,11 +172,25 @@ class OC{
 
 	public static function checkInstalled() {
 		// Redirect to installer if not installed
-		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
-			if(!OC::$CLI){
-				$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
-				header("Location: $url");
+		if (!OC_Config::getValue('installed', false)) {
+			if (OC::$SUBURI != '/index.php') {
+				if(!OC::$CLI){
+					$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+					header("Location: $url");
+				}
+				exit();
 			}
+			// Check for autosetup:
+			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
+			if( file_exists( $autosetup_file )){
+				OC_Log::write('core','Autoconfig file found, setting up owncloud...', OC_Log::INFO);
+				include( $autosetup_file );
+				$_POST['install'] = 'true';
+				$_POST = array_merge ($_POST, $AUTOCONFIG);
+				unlink($autosetup_file);
+			}
+			OC_Util::addScript('setup');
+			require_once('setup.php');
 			exit();
 		}
 	}
@@ -331,10 +345,10 @@ class OC{
 		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
 		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
 
+		self::initTemplateEngine();
 		self::checkInstalled();
 		self::checkSSL();
 		self::initSession();
-		self::initTemplateEngine();
 		self::checkUpgrade();
 
 		$errors=OC_Util::checkServer();
@@ -404,20 +418,6 @@ class OC{
 	 * @return true when the request is handled here
 	 */
 	public static function handleRequest() {
-		if (!OC_Config::getValue('installed', false)) {
-			// Check for autosetup:
-			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
-			if( file_exists( $autosetup_file )){
-				OC_Log::write('core','Autoconfig file found, setting up owncloud...',OC_Log::INFO);
-				include( $autosetup_file );
-				$_POST['install'] = 'true';
-				$_POST = array_merge ($_POST, $AUTOCONFIG);
-				unlink($autosetup_file);
-			}
-			OC_Util::addScript('setup');
-			require_once('setup.php');
-			exit();
-		}
 		// Handle WebDAV
 		if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
 			header('location: '.OC_Helper::linkToRemote('webdav'));

From 667cd318fe19c11a19883536501d9cd562cd6201 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 9 Aug 2012 18:27:59 +0200
Subject: [PATCH 1381/1537] Use OC_Util::displayLoginPage and cleanup the
 function

---
 core/templates/login.php |  6 +++---
 index.php                |  5 +----
 lib/util.php             | 17 ++++++++++++++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/templates/login.php b/core/templates/login.php
index b35c4a33be..2c9b766aa4 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -2,16 +2,16 @@
 <form action="index.php" method="post">
 	<fieldset>
 		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
-		<?php if($_['error']): ?>
+		<?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'])?OC_Util::sanitizeHTML($_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>
diff --git a/index.php b/index.php
index 4ffd013aa8..86d268bf28 100755
--- a/index.php
+++ b/index.php
@@ -43,9 +43,6 @@ if (!OC::handleRequest()) {
 		$error = true;
 	}
 	if(!array_key_exists('sectoken', $_SESSION) || (array_key_exists('sectoken', $_SESSION) && is_null(OC::$REQUESTEDFILE)) || substr(OC::$REQUESTEDFILE, -3) == 'php'){
-		$sectoken=rand(1000000,9999999);
-		$_SESSION['sectoken']=$sectoken;
-		$redirect_url = (isset($_REQUEST['redirect_url'])) ? OC_Util::sanitizeHTML($_REQUEST['redirect_url']) : $_SERVER['REQUEST_URI'];
-		OC_Template::printGuestPage('', 'login', array('error' => $error, 'sectoken' => $sectoken, 'redirect' => $redirect_url));
+		OC_Util::displayLoginPage($error);
 	}
 }
diff --git a/lib/util.php b/lib/util.php
index 4c5d416f9f..732acbb920 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -271,15 +271,26 @@ class OC_Util {
 		return $errors;
 	}
 
-	public static function displayLoginPage($parameters = array()){
-		if(isset($_COOKIE["username"])){
-			$parameters["username"] = $_COOKIE["username"];
+	public static function displayLoginPage($display_lostpassword) {
+		$parameters = array();
+		$parameters['display_lostpassword'] = $display_lostpassword;
+		if (!empty($_POST['user'])) {
+			$parameters["username"] =
+				OC_Util::sanitizeHTML($_POST['user']).'"';
+			$parameters['user_autofocus'] = false;
 		} else {
 			$parameters["username"] = '';
+			$parameters['user_autofocus'] = true;
 		}
 		$sectoken=rand(1000000,9999999);
 		$_SESSION['sectoken']=$sectoken;
 		$parameters["sectoken"] = $sectoken;
+		if (isset($_REQUEST['redirect_url'])) {
+			$redirect_url = OC_Util::sanitizeHTML($_REQUEST['redirect_url']);
+		} else {
+			$redirect_url = $_SERVER['REQUEST_URI'];
+		}
+		$parameters['redirect_url'] = $redirect_url;
 		OC_Template::printGuestPage("", "login", $parameters);
 	}
 

From 0973969386d70ce9935d0c01860bea82d13d5663 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 00:40:16 +0200
Subject: [PATCH 1382/1537] Cleanup OC::loadfile

---
 lib/base.php | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 4fc8cfa245..62d3918171 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -257,25 +257,35 @@ class OC{
 		session_start();
 	}
 
-	public static function loadapp(){
-		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')){
+	public static function loadapp() {
+		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')) {
 			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
-		}else{
+		}
+		else {
 			trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead?
 		}
 	}
 
-	public static function loadfile(){
-		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . OC::$REQUESTEDFILE)){
-			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
-				$file = OC_App::getAppWebPath(OC::$REQUESTEDAPP). '/' . OC::$REQUESTEDFILE;
+	public static function loadfile() {
+		$app = OC::$REQUESTEDAPP;
+		$file = OC::$REQUESTEDFILE;
+		$app_path = OC_App::getAppPath($app);
+		if(file_exists($app_path . '/' . $file)) {
+			$file_ext = substr($file, -3);
+			if ($file_ext == 'css') {
+				$app_web_path = OC_App::getAppWebPath($app);
+				$filepath = $app_web_path . '/' . $file;
 				$minimizer = new OC_Minimizer_CSS();
-				$minimizer->output(array(array(OC_App::getAppPath(OC::$REQUESTEDAPP), OC_App::getAppWebPath(OC::$REQUESTEDAPP), OC::$REQUESTEDFILE)),$file);
+				$info = array($app_path, $app_web_path, $file);
+				$minimizer->output(array($info), $filepath);
 				exit;
-			}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
-				require_once(OC_App::getAppPath(OC::$REQUESTEDAPP). '/' . OC::$REQUESTEDFILE);
+			} elseif($file_ext == 'php') {
+				$file = $app_path . '/' . $file;
+				unset($app, $app_path, $app_web_path, $file_ext);
+				require_once($file);
 			}
-		}else{
+		}
+		else {
 			die();
 			header('HTTP/1.0 404 Not Found');
 			exit;

From e3c732040b7eeb45efcd563d1c9abddf617ecd32 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 00:42:46 +0200
Subject: [PATCH 1383/1537] Make OC::loadfile and OC::loadapp protected, only
 used in OC::handleRequest

---
 lib/base.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 62d3918171..025046c31d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -257,7 +257,7 @@ class OC{
 		session_start();
 	}
 
-	public static function loadapp() {
+	protected static function loadapp() {
 		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')) {
 			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
 		}
@@ -266,7 +266,7 @@ class OC{
 		}
 	}
 
-	public static function loadfile() {
+	protected static function loadfile() {
 		$app = OC::$REQUESTEDAPP;
 		$file = OC::$REQUESTEDFILE;
 		$app_path = OC_App::getAppPath($app);
@@ -435,7 +435,7 @@ class OC{
 		}
 		if(!OC_User::isLoggedIn() && substr(OC::$REQUESTEDFILE,-3) == 'css') {
 			OC_App::loadApps();
-			OC::loadfile();
+			self::loadfile();
 			return true;
 		}
 		// Someone is logged in :
@@ -446,9 +446,9 @@ class OC{
 				header("Location: ".OC::$WEBROOT.'/');
 			}else{
 				if(is_null(OC::$REQUESTEDFILE)) {
-					OC::loadapp();
+					self::loadapp();
 				}else{
-					OC::loadfile();
+					self::loadfile();
 				}
 			}
 			return true;

From da07245f59cd3a1636392f63ef89e91b40d792eb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 00:58:13 +0200
Subject: [PATCH 1384/1537] Move OC::loadfile and OC::loadapp next to
 OC::handleRequest

---
 lib/base.php | 70 ++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 025046c31d..69de28db4a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -257,41 +257,6 @@ class OC{
 		session_start();
 	}
 
-	protected static function loadapp() {
-		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')) {
-			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
-		}
-		else {
-			trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead?
-		}
-	}
-
-	protected static function loadfile() {
-		$app = OC::$REQUESTEDAPP;
-		$file = OC::$REQUESTEDFILE;
-		$app_path = OC_App::getAppPath($app);
-		if(file_exists($app_path . '/' . $file)) {
-			$file_ext = substr($file, -3);
-			if ($file_ext == 'css') {
-				$app_web_path = OC_App::getAppWebPath($app);
-				$filepath = $app_web_path . '/' . $file;
-				$minimizer = new OC_Minimizer_CSS();
-				$info = array($app_path, $app_web_path, $file);
-				$minimizer->output(array($info), $filepath);
-				exit;
-			} elseif($file_ext == 'php') {
-				$file = $app_path . '/' . $file;
-				unset($app, $app_path, $app_web_path, $file_ext);
-				require_once($file);
-			}
-		}
-		else {
-			die();
-			header('HTTP/1.0 404 Not Found');
-			exit;
-		}
-	}
-
 	public static function init(){
 		// register autoloader
 		spl_autoload_register(array('OC','autoload'));
@@ -456,6 +421,41 @@ class OC{
 		return false;
 	}
 
+	protected static function loadapp() {
+		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')) {
+			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
+		}
+		else {
+			trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead?
+		}
+	}
+
+	protected static function loadfile() {
+		$app = OC::$REQUESTEDAPP;
+		$file = OC::$REQUESTEDFILE;
+		$app_path = OC_App::getAppPath($app);
+		if (file_exists($app_path . '/' . $file)) {
+			$file_ext = substr($file, -3);
+			if ($file_ext == 'css') {
+				$app_web_path = OC_App::getAppWebPath($app);
+				$filepath = $app_web_path . '/' . $file;
+				$minimizer = new OC_Minimizer_CSS();
+				$info = array($app_path, $app_web_path, $file);
+				$minimizer->output(array($info), $filepath);
+				exit;
+			} elseif($file_ext == 'php') {
+				$file = $app_path . '/' . $file;
+				unset($app, $app_path, $app_web_path, $file_ext);
+				require_once($file);
+			}
+		}
+		else {
+			die();
+			header('HTTP/1.0 404 Not Found');
+			exit;
+		}
+	}
+
 	public static function tryRememberLogin() {
 		if(!isset($_COOKIE["oc_remember_login"])
 		|| !isset($_COOKIE["oc_token"])

From 83403784d163411856e8ab6e711c319e36040f56 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 00:58:57 +0200
Subject: [PATCH 1385/1537] Always load when the requested file is css

---
 lib/base.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 69de28db4a..5132a82292 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -398,9 +398,8 @@ class OC{
 			header('location: '.OC_Helper::linkToRemote('webdav'));
 			return true;
 		}
-		if(!OC_User::isLoggedIn() && substr(OC::$REQUESTEDFILE,-3) == 'css') {
-			OC_App::loadApps();
-			self::loadfile();
+		if(substr(OC::$REQUESTEDFILE,-3) == 'css') {
+			self::loadCSSFile();
 			return true;
 		}
 		// Someone is logged in :
@@ -436,14 +435,7 @@ class OC{
 		$app_path = OC_App::getAppPath($app);
 		if (file_exists($app_path . '/' . $file)) {
 			$file_ext = substr($file, -3);
-			if ($file_ext == 'css') {
-				$app_web_path = OC_App::getAppWebPath($app);
-				$filepath = $app_web_path . '/' . $file;
-				$minimizer = new OC_Minimizer_CSS();
-				$info = array($app_path, $app_web_path, $file);
-				$minimizer->output(array($info), $filepath);
-				exit;
-			} elseif($file_ext == 'php') {
+			if ($file_ext == 'php') {
 				$file = $app_path . '/' . $file;
 				unset($app, $app_path, $app_web_path, $file_ext);
 				require_once($file);
@@ -456,6 +448,19 @@ class OC{
 		}
 	}
 
+	protected static function loadCSSFile() {
+		$app = OC::$REQUESTEDAPP;
+		$file = OC::$REQUESTEDFILE;
+		$app_path = OC_App::getAppPath($app);
+		if (file_exists($app_path . '/' . $file)) {
+			$app_web_path = OC_App::getAppWebPath($app);
+			$filepath = $app_web_path . '/' . $file;
+			$minimizer = new OC_Minimizer_CSS();
+			$info = array($app_path, $app_web_path, $file);
+			$minimizer->output(array($info), $filepath);
+		}
+	}
+
 	public static function tryRememberLogin() {
 		if(!isset($_COOKIE["oc_remember_login"])
 		|| !isset($_COOKIE["oc_token"])

From 1823dafe448070137ce0ac06ff2731e87627c598 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 12:09:15 +0200
Subject: [PATCH 1386/1537] Remove checks before displaying login page

At that point the checks are already done before
---
 index.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 86d268bf28..12a4d4918d 100755
--- a/index.php
+++ b/index.php
@@ -42,7 +42,5 @@ if (!OC::handleRequest()) {
 	} elseif(OC::tryBasicAuthLogin()) {
 		$error = true;
 	}
-	if(!array_key_exists('sectoken', $_SESSION) || (array_key_exists('sectoken', $_SESSION) && is_null(OC::$REQUESTEDFILE)) || substr(OC::$REQUESTEDFILE, -3) == 'php'){
-		OC_Util::displayLoginPage($error);
-	}
+	OC_Util::displayLoginPage($error);
 }

From 5e7086adc93c501b6fcef8650d6552e95a1b6b28 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 12:17:13 +0200
Subject: [PATCH 1387/1537] Move login handling to OC class

---
 index.php    | 20 +-------------------
 lib/base.php | 37 ++++++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/index.php b/index.php
index 12a4d4918d..331d7fae8e 100755
--- a/index.php
+++ b/index.php
@@ -21,26 +21,8 @@
 *
 */
 
-
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
 
 require_once('lib/base.php');
 
-if (!OC::handleRequest()) {
-// Not handled -> we display the login page:
-	OC_App::loadApps(array('prelogin'));
-	$error = false;
-	// remember was checked after last login
-	if (OC::tryRememberLogin()) {
-		// nothing more to do
-
-	// Someone wants to log in :
-	} elseif (OC::tryFormLogin()) {
-		$error = true;
-	
-	// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-	} elseif(OC::tryBasicAuthLogin()) {
-		$error = true;
-	}
-	OC_Util::displayLoginPage($error);
-}
+OC::handleRequest();
diff --git a/lib/base.php b/lib/base.php
index 5132a82292..b200da77ba 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -389,18 +389,18 @@ class OC{
 	}
 
 	/**
-	 * @brief Try to handle request
-	 * @return true when the request is handled here
+	 * @brief Handle the request
 	 */
 	public static function handleRequest() {
 		// Handle WebDAV
 		if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
 			header('location: '.OC_Helper::linkToRemote('webdav'));
-			return true;
+			return;
 		}
+		// Handle app css files
 		if(substr(OC::$REQUESTEDFILE,-3) == 'css') {
 			self::loadCSSFile();
-			return true;
+			return;
 		}
 		// Someone is logged in :
 		if(OC_User::isLoggedIn()) {
@@ -415,9 +415,10 @@ class OC{
 					self::loadfile();
 				}
 			}
-			return true;
+			return;
 		}
-		return false;
+		// Not handled and not logged in
+		self::handleLogin();
 	}
 
 	protected static function loadapp() {
@@ -461,7 +462,25 @@ class OC{
 		}
 	}
 
-	public static function tryRememberLogin() {
+	protected static function handleLogin() {
+		OC_App::loadApps(array('prelogin'));
+		$error = false;
+		// remember was checked after last login
+		if (OC::tryRememberLogin()) {
+			// nothing more to do
+
+		// Someone wants to log in :
+		} elseif (OC::tryFormLogin()) {
+			$error = true;
+		
+		// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+		} elseif (OC::tryBasicAuthLogin()) {
+			$error = true;
+		}
+		OC_Util::displayLoginPage($error);
+	}
+
+	protected static function tryRememberLogin() {
 		if(!isset($_COOKIE["oc_remember_login"])
 		|| !isset($_COOKIE["oc_token"])
 		|| !isset($_COOKIE["oc_username"])
@@ -484,7 +503,7 @@ class OC{
 		return true;
 	}
 
-	public static function tryFormLogin() {
+	protected static function tryFormLogin() {
 		if(!isset($_POST["user"])
 		|| !isset($_POST['password'])
 		|| !isset($_SESSION['sectoken'])
@@ -510,7 +529,7 @@ class OC{
 		return true;
 	}
 
-	public static function tryBasicAuthLogin() {
+	protected static function tryBasicAuthLogin() {
 		if (!isset($_SERVER["PHP_AUTH_USER"])
 		 || !isset($_SERVER["PHP_AUTH_PW"])){
 		 	return false;

From 82b10954e714135aac332c4e349124731841aa90 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 12:27:37 +0200
Subject: [PATCH 1388/1537] Simplify loading app php script files

---
 lib/base.php | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index b200da77ba..c4127c73f2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -409,10 +409,15 @@ class OC{
 				OC_User::logout();
 				header("Location: ".OC::$WEBROOT.'/');
 			}else{
-				if(is_null(OC::$REQUESTEDFILE)) {
-					self::loadapp();
-				}else{
-					self::loadfile();
+				$app = OC::$REQUESTEDAPP;
+				$file = OC::$REQUESTEDFILE;
+				if(is_null($file)) {
+					$file = 'index.php';
+				}
+				$file_ext = substr($file, -3);
+				if ($file_ext != 'php'
+					|| !self::loadAppScriptFile($app, $file)) {
+					header('HTTP/1.0 404 Not Found');
 				}
 			}
 			return;
@@ -421,32 +426,15 @@ class OC{
 		self::handleLogin();
 	}
 
-	protected static function loadapp() {
-		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')) {
-			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
-		}
-		else {
-			trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead?
-		}
-	}
-
-	protected static function loadfile() {
-		$app = OC::$REQUESTEDAPP;
-		$file = OC::$REQUESTEDFILE;
+	protected static function loadAppScriptFile($app, $file) {
 		$app_path = OC_App::getAppPath($app);
-		if (file_exists($app_path . '/' . $file)) {
-			$file_ext = substr($file, -3);
-			if ($file_ext == 'php') {
-				$file = $app_path . '/' . $file;
-				unset($app, $app_path, $app_web_path, $file_ext);
-				require_once($file);
-			}
-		}
-		else {
-			die();
-			header('HTTP/1.0 404 Not Found');
-			exit;
+		$file = $app_path . '/' . $file;
+		unset($app, $app_path);
+		if (file_exists($file)) {
+			require_once($file);
+			return true;
 		}
+		return false;
 	}
 
 	protected static function loadCSSFile() {

From 0ea4fa298c20a1cb25223b2bcaa5152c7a0f52dd Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 13:53:40 +0200
Subject: [PATCH 1389/1537] Backgroundjobs: don't try to access OC_Appconfig if
 ownCloud has not been installed

---
 lib/base.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index dae62a029c..3a65b30ae9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -109,7 +109,8 @@ class OC{
 				OC::$SUBURI=OC::$SUBURI.'index.php';
 			}
 		}
-                OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
+
+		OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
 
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
 			OC::$WEBROOT='/'.OC::$WEBROOT;
@@ -241,15 +242,16 @@ class OC{
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "oc-dialogs" );
-		OC_Util::addScript( "backgroundjobs" );
 		OC_Util::addScript( "js" );
 		OC_Util::addScript( "eventsource" );
 		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
 
-		if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
-			OC_Util::addScript( 'backgroundjobs' );
+		if( OC_Config::getValue( 'installed', false )){
+			if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
+				OC_Util::addScript( 'backgroundjobs' );
+			}
 		}
 		
 		OC_Util::addStyle( "styles" );

From 0de81f9dad5bfba01f01d468eb0fd1f452354792 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 14:03:26 +0200
Subject: [PATCH 1390/1537] Backgroundjobs: don't execute cron.php if owncloud
 has not been installed

---
 cron.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cron.php b/cron.php
index c52a503509..1e0bb5f6dc 100644
--- a/cron.php
+++ b/cron.php
@@ -39,6 +39,11 @@ function handleUnexpectedShutdown() {
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
+// Don't do anything if ownCloud has not been installed
+if( !OC_Config::getValue( 'installed', false )){
+	exit( 0 );
+}
+
 // Handle unexpected errors
 register_shutdown_function('handleUnexpectedShutdown');
 

From 6d971d3b1d97e872751c2e5a1cc90c8392de8186 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 14:32:54 +0200
Subject: [PATCH 1391/1537] Contacts: Better parameter names in addressbook
 share backend

---
 apps/contacts/lib/share/addressbook.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
index f719bccb78..d90700d769 100644
--- a/apps/contacts/lib/share/addressbook.php
+++ b/apps/contacts/lib/share/addressbook.php
@@ -8,6 +8,7 @@
 
 class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 	const FORMAT_ADDRESSBOOKS = 1;
+
 	/**
 	* @brief Get the source of the item to be stored in the database
 	* @param string Item
@@ -19,9 +20,9 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 	*
 	* The formatItems() function will translate the source returned back into the item
 	*/
-	public function isValidSource($item, $uid) {
-		$addressbook = OC_Contacts_Addressbook::find( $item );
-		if( $addressbook === false || $addressbook['userid'] != $uid) {
+	public function isValidSource($itemSource, $uidOwner) {
+		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
+		if( $addressbook === false || $addressbook['userid'] != $uidOwner) {
 			return false;
 		}
 		return true;
@@ -37,8 +38,8 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 	* This function needs to verify that the user does not already have an item with this name.
 	* If it does generate a new name e.g. name_#
 	*/
-	public function generateTarget($item, $uid, $exclude = null) {
-		$addressbook = OC_Contacts_Addressbook::find( $item );
+	public function generateTarget($itemSource, $shareWith, $exclude = null) {
+		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
 		$user_addressbooks = array();
 		foreach(OC_Contacts_Addressbook::all($uid) as $user_addressbook) {
 			$user_addressbooks[] = $user_addressbook['displayname'];
@@ -77,9 +78,9 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 		return $addressbooks;
 	}
 
-	public function getChildren($item) {
+	public function getChildren($itemSource) {
 		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*contacts_cards WHERE addressbookid = ?');
-		$result = $query->execute(array($item));
+		$result = $query->execute(array($itemSource));
 		$sources = array();
 		while ($contact = $result->fetchRow()) {
 			$sources[] = $contact['id'];

From 6a95e4288ed4987453719c1bb87056ae822a4b73 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 14:33:20 +0200
Subject: [PATCH 1392/1537] Contacts: Check format parameter

---
 apps/contacts/lib/share/addressbook.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
index d90700d769..62799696d9 100644
--- a/apps/contacts/lib/share/addressbook.php
+++ b/apps/contacts/lib/share/addressbook.php
@@ -68,11 +68,13 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 	*/
 	public function formatItems($items, $format, $parameters = null) {
 		$addressbooks = array();
-		foreach ($items as $item) {
-			$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
-			if ($addressbook) {
-				$addressbook['displayname'] = $item['item_target'];
-				$addressbooks[] = $addressbook;
+		if ($format == self::FORMAT_ADDRESSBOOKS) {
+			foreach ($items as $item) {
+				$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
+				if ($addressbook) {
+					$addressbook['displayname'] = $item['item_target'];
+					$addressbooks[] = $addressbook;
+				}
 			}
 		}
 		return $addressbooks;
@@ -88,4 +90,4 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 		return $sources;
 	}
 
-}
\ No newline at end of file
+}

From fb493c45dd4ecadeaa5b1b112a156054318af0a2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 10 Aug 2012 14:36:41 +0200
Subject: [PATCH 1393/1537] Calendar: update share backend using contacts
 backend as template

---
 apps/calendar/lib/share/calendar.php | 69 +++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 11 deletions(-)

diff --git a/apps/calendar/lib/share/calendar.php b/apps/calendar/lib/share/calendar.php
index 0ddca2400a..7f49829241 100644
--- a/apps/calendar/lib/share/calendar.php
+++ b/apps/calendar/lib/share/calendar.php
@@ -4,6 +4,7 @@
 *
 * @author Michael Gapczynski
 * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -20,25 +21,65 @@
 */
 
 class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
+	const FORMAT_CALENDAR = 1;
 
-	const FORMAT_CALENDAR = 0;
-
-	private static $calendar;
-
+	/**
+	* @brief Get the source of the item to be stored in the database
+	* @param string Item
+	* @param string Owner of the item
+	* @return mixed|array|false Source
+	*
+	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
+	* Return false if the item does not exist for the user
+	*
+	* The formatItems() function will translate the source returned back into the item
+	*/
 	public function isValidSource($itemSource, $uidOwner) {
-		if (self::$calendar = OC_Calendar_App::getCalendar($itemSource)) {
-			return true;
+		$calendar = OC_Calendar_App::getCalendar( $itemSource );
+		if ($calendar || $calendar['userid'] != $uidOwner) {
+			return false;
 		}
-		return false;
+		return true;
 	}
 
+	/**
+	* @brief Get a unique name of the item for the specified user
+	* @param string Item
+	* @param string|false User the item is being shared with
+	* @param array|null List of similar item names already existing as shared items
+	* @return string Target name
+	*
+	* This function needs to verify that the user does not already have an item with this name.
+	* If it does generate a new name e.g. name_#
+	*/
 	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		if (isset(self::$calendar)) {
-			return self::$calendar['displayname'];
+		$calendar = OC_Calendar_App::getCalendar( $itemSource );
+		$user_calendars = array();
+		foreach(OC_Contacts_Addressbook::all($uid) as $user_calendar) {
+			$user_calendars[] = $user_calendar['displayname'];
 		}
-		return false;
+		$name = $calendar['userid']."'s ".$calendar['displayname'];
+		$suffix = '';
+		while (in_array($name.$suffix, $user_calendars)) {
+			$suffix++;
+		}
+		
+		return $name.$suffix;
 	}
 
+	/**
+	* @brief Converts the shared item sources back into the item in the specified format
+	* @param array Shared items
+	* @param int Format
+	* @return ?
+	*
+	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
+	* The key/value pairs included in the share info depend on the function originally called:
+	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
+	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
+	* This function allows the backend to control the output of shared items with custom formats.
+	* It is only called through calls to the public getItem(s)Shared(With) functions.
+	*/
 	public function formatItems($items, $format, $parameters = null) {
 		$calendars = array();
 		if ($format == self::FORMAT_CALENDAR) {
@@ -58,7 +99,13 @@ class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
 	}
 
 	public function getChildren($itemSource) {
-		// TODO
+		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*calendar_objects WHERE calendarid = ?');
+		$result = $query->execute(array($itemSource));
+		$sources = array();
+		while ($object = $result->fetchRow()) {
+			$sources[] = $object['id'];
+		}
+		return $sources;
 	}
 
 }
\ No newline at end of file

From 8ec45870a3f1d9dfb633a39b7b8a7c4911533d9e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 15:27:10 +0200
Subject: [PATCH 1394/1537] Validate cookie properly and prevent auth bypass
 BIG (!) thanks to Julien CAYSSOL

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 3a65b30ae9..0730e5ff3a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -489,7 +489,7 @@ class OC{
 		}
 		// confirm credentials in cookie
 		if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) &&
-		OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) {
+		OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") === $_COOKIE['oc_token']) {
 			OC_User::setUserId($_COOKIE['oc_username']);
 			OC_Util::redirectToDefaultPage();
 		}

From 11895a86b0c68fa7eb7bc0cdaf6b12ad30b71b2a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 22:01:10 +0200
Subject: [PATCH 1395/1537] Activate ACLs

---
 apps/calendar/appinfo/remote.php | 3 +++
 apps/contacts/appinfo/remote.php | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index e8f9e80c7a..71f1f378ae 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -30,6 +30,9 @@ $nodes = array(
 $server = new Sabre_DAV_Server($nodes);
 $server->setBaseUri($baseuri);
 // Add plugins
+$aclPlugin = new Sabre_DAVACL_Plugin();
+$aclPlugin->hideNodesFromListings = true;
+$server->addPlugin($aclPlugin);
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CalDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index fd5604aec6..a095f0f37f 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -42,9 +42,13 @@ $nodes = array(
 );
 
 // Fire up server
+
 $server = new Sabre_DAV_Server($nodes);
 $server->setBaseUri($baseuri);
 // Add plugins
+$aclPlugin = new Sabre_DAVACL_Plugin();
+$aclPlugin->hideNodesFromListings = true;
+$server->addPlugin($aclPlugin);
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());

From 85f2e737a401063be13d15645afd9520f6b421cc Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 22:18:08 +0200
Subject: [PATCH 1396/1537] Disable listening, instead checking the ACL to
 prevent DoS

---
 apps/calendar/appinfo/remote.php | 11 +++++------
 apps/contacts/appinfo/remote.php | 11 ++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 71f1f378ae..39f8f83b16 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,22 +21,21 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
-$nodes = array(
-	new Sabre_CalDAV_Principal_Collection($principalBackend),
+$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); $collection->disableListing = true; // Disable listening
+$nodes = array( 
+	$collection, 
 	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
-);
+	);
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
 $server->setBaseUri($baseuri);
 // Add plugins
-$aclPlugin = new Sabre_DAVACL_Plugin();
-$aclPlugin->hideNodesFromListings = true;
-$server->addPlugin($aclPlugin);
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CalDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
 $server->addPlugin(new Sabre_CalDAV_ICSExportPlugin());
+
 // And off we go!
 $server->exec();
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index a095f0f37f..011938e2cf 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,19 +36,16 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
-$nodes = array(
-	new Sabre_CalDAV_Principal_Collection($principalBackend),
+$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); $collection->disableListing = true; // Disable listening
+$nodes = array( 
+	$collection, 
 	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
-);
+	);
 
 // Fire up server
-
 $server = new Sabre_DAV_Server($nodes);
 $server->setBaseUri($baseuri);
 // Add plugins
-$aclPlugin = new Sabre_DAVACL_Plugin();
-$aclPlugin->hideNodesFromListings = true;
-$server->addPlugin($aclPlugin);
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());

From d3427be5e40b8889fd2b23b9f716e596de29694b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 22:20:32 +0200
Subject: [PATCH 1397/1537] Following the code guidelines makes Michael happy
 :-)

---
 apps/calendar/appinfo/remote.php | 4 +++-
 apps/contacts/appinfo/remote.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 39f8f83b16..6669d7ce2c 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,7 +21,9 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); $collection->disableListing = true; // Disable listening
+$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$collection->disableListing = true; // Disable listening
+
 $nodes = array( 
 	$collection, 
 	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 011938e2cf..9eee55583a 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,7 +36,9 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); $collection->disableListing = true; // Disable listening
+$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$collection->disableListing = true; // Disable listening
+
 $nodes = array( 
 	$collection, 
 	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),

From 39b9052c2f6d1db111202e05da186d2142b364cc Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 11 Aug 2012 02:05:58 +0200
Subject: [PATCH 1398/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/ar.php       |  16 +-
 apps/calendar/l10n/bg_BG.php    |   4 -
 apps/calendar/l10n/ca.php       |   6 -
 apps/calendar/l10n/cs_CZ.php    |  20 +-
 apps/calendar/l10n/da.php       |  43 +-
 apps/calendar/l10n/de.php       |  10 +-
 apps/calendar/l10n/el.php       |   6 -
 apps/calendar/l10n/eo.php       |  56 +-
 apps/calendar/l10n/es.php       |  56 +-
 apps/calendar/l10n/et_EE.php    |  20 +-
 apps/calendar/l10n/eu.php       |  50 +-
 apps/calendar/l10n/fa.php       |  20 +-
 apps/calendar/l10n/fi_FI.php    |   6 -
 apps/calendar/l10n/fr.php       |   6 -
 apps/calendar/l10n/gl.php       |  20 +-
 apps/calendar/l10n/he.php       |  20 +-
 apps/calendar/l10n/hr.php       |  15 +-
 apps/calendar/l10n/hu_HU.php    |  20 +-
 apps/calendar/l10n/ia.php       |   9 +-
 apps/calendar/l10n/id.php       |   3 -
 apps/calendar/l10n/it.php       |   6 -
 apps/calendar/l10n/ja_JP.php    |  97 ++--
 apps/calendar/l10n/ko.php       |  21 +-
 apps/calendar/l10n/lb.php       |  15 +-
 apps/calendar/l10n/lt_LT.php    |  15 +-
 apps/calendar/l10n/mk.php       |  20 +-
 apps/calendar/l10n/ms_MY.php    |  45 +-
 apps/calendar/l10n/nb_NO.php    |  16 +-
 apps/calendar/l10n/nl.php       |  22 +-
 apps/calendar/l10n/nn_NO.php    |  16 +-
 apps/calendar/l10n/pl.php       |  46 +-
 apps/calendar/l10n/pt_BR.php    |  20 +-
 apps/calendar/l10n/pt_PT.php    |  20 +-
 apps/calendar/l10n/ro.php       |  15 +-
 apps/calendar/l10n/ru.php       |   6 -
 apps/calendar/l10n/sk_SK.php    |  20 +-
 apps/calendar/l10n/sl.php       |  20 +-
 apps/calendar/l10n/sr.php       |   6 +-
 apps/calendar/l10n/sr@latin.php |   6 +-
 apps/calendar/l10n/sv.php       |   6 -
 apps/calendar/l10n/th_TH.php    |  20 +-
 apps/calendar/l10n/tr.php       |   6 -
 apps/calendar/l10n/uk.php       |  25 +-
 apps/calendar/l10n/vi.php       |   4 -
 apps/calendar/l10n/zh_CN.php    |  16 +-
 apps/calendar/l10n/zh_TW.php    |  15 +-
 apps/contacts/l10n/ca.php       |   2 +
 apps/contacts/l10n/de.php       |  28 +-
 apps/contacts/l10n/eo.php       |   8 +
 apps/contacts/l10n/es.php       |  29 +-
 apps/contacts/l10n/fi_FI.php    |   7 +
 apps/contacts/l10n/fr.php       |   2 +
 apps/contacts/l10n/it.php       |   2 +
 apps/contacts/l10n/ja_JP.php    |  27 +-
 apps/contacts/l10n/ms_MY.php    |  22 +-
 l10n/af/calendar.po             | 444 ++++++++++------
 l10n/af/contacts.po             |  50 +-
 l10n/af/settings.po             |  12 +-
 l10n/ar/calendar.po             | 448 ++++++++++------
 l10n/ar/contacts.po             |  50 +-
 l10n/ar/settings.po             |  12 +-
 l10n/ar_SA/calendar.po          | 123 +++--
 l10n/ar_SA/contacts.po          |  50 +-
 l10n/ar_SA/settings.po          |  12 +-
 l10n/bg_BG/calendar.po          | 127 +++--
 l10n/bg_BG/contacts.po          |  50 +-
 l10n/bg_BG/settings.po          |  12 +-
 l10n/ca/calendar.po             |  91 ++--
 l10n/ca/contacts.po             |  54 +-
 l10n/ca/settings.po             |  14 +-
 l10n/cs_CZ/calendar.po          | 468 ++++++++++-------
 l10n/cs_CZ/contacts.po          |  50 +-
 l10n/cs_CZ/settings.po          |  12 +-
 l10n/da/calendar.po             | 469 ++++++++++-------
 l10n/da/contacts.po             |  50 +-
 l10n/da/settings.po             |  20 +-
 l10n/de/calendar.po             |  96 ++--
 l10n/de/contacts.po             |  63 +--
 l10n/de/settings.po             |  20 +-
 l10n/el/calendar.po             |  91 ++--
 l10n/el/contacts.po             |  50 +-
 l10n/el/settings.po             |  12 +-
 l10n/eo/calendar.po             | 469 ++++++++++-------
 l10n/eo/contacts.po             |  64 +--
 l10n/eo/settings.po             |  16 +-
 l10n/es/calendar.po             | 470 ++++++++++-------
 l10n/es/contacts.po             | 107 ++--
 l10n/es/settings.po             |  17 +-
 l10n/et_EE/calendar.po          | 468 ++++++++++-------
 l10n/et_EE/contacts.po          |  50 +-
 l10n/et_EE/settings.po          |  12 +-
 l10n/eu/calendar.po             | 452 +++++++++++------
 l10n/eu/contacts.po             |  50 +-
 l10n/eu/settings.po             |  12 +-
 l10n/eu_ES/calendar.po          | 125 +++--
 l10n/eu_ES/contacts.po          |  50 +-
 l10n/eu_ES/settings.po          |  12 +-
 l10n/fa/calendar.po             | 468 ++++++++++-------
 l10n/fa/contacts.po             |  50 +-
 l10n/fa/settings.po             |  14 +-
 l10n/fi/calendar.po             | 125 +++--
 l10n/fi/contacts.po             |  36 +-
 l10n/fi/settings.po             |  14 +-
 l10n/fi_FI/calendar.po          | 127 +++--
 l10n/fi_FI/contacts.po          |  64 +--
 l10n/fi_FI/settings.po          |  14 +-
 l10n/fr/calendar.po             |  91 ++--
 l10n/fr/contacts.po             |  40 +-
 l10n/fr/settings.po             |  14 +-
 l10n/gl/calendar.po             | 468 ++++++++++-------
 l10n/gl/contacts.po             |  50 +-
 l10n/gl/settings.po             |  12 +-
 l10n/he/calendar.po             | 469 ++++++++++-------
 l10n/he/contacts.po             |  50 +-
 l10n/he/settings.po             |  12 +-
 l10n/hr/calendar.po             | 450 ++++++++++------
 l10n/hr/contacts.po             |  50 +-
 l10n/hr/settings.po             |  12 +-
 l10n/hu_HU/calendar.po          | 468 ++++++++++-------
 l10n/hu_HU/contacts.po          |  50 +-
 l10n/hu_HU/settings.po          |  20 +-
 l10n/hy/calendar.po             | 444 ++++++++++------
 l10n/hy/contacts.po             |  50 +-
 l10n/hy/settings.po             |  12 +-
 l10n/ia/calendar.po             | 442 ++++++++++------
 l10n/ia/contacts.po             |  50 +-
 l10n/ia/settings.po             |  12 +-
 l10n/id/calendar.po             | 446 ++++++++++------
 l10n/id/contacts.po             |  50 +-
 l10n/id/settings.po             |  12 +-
 l10n/id_ID/calendar.po          | 123 +++--
 l10n/id_ID/contacts.po          |  50 +-
 l10n/id_ID/settings.po          |  12 +-
 l10n/it/calendar.po             |  91 ++--
 l10n/it/contacts.po             |  54 +-
 l10n/it/settings.po             |  14 +-
 l10n/ja_JP/calendar.po          | 514 ++++++++++++-------
 l10n/ja_JP/contacts.po          | 100 ++--
 l10n/ja_JP/settings.po          |  18 +-
 l10n/ko/calendar.po             | 472 ++++++++++-------
 l10n/ko/contacts.po             |  50 +-
 l10n/ko/settings.po             |  12 +-
 l10n/lb/calendar.po             | 446 ++++++++++------
 l10n/lb/contacts.po             |  50 +-
 l10n/lb/settings.po             |  12 +-
 l10n/lt_LT/calendar.po          | 450 ++++++++++------
 l10n/lt_LT/contacts.po          |  50 +-
 l10n/lt_LT/settings.po          |  12 +-
 l10n/lv/calendar.po             | 125 +++--
 l10n/lv/contacts.po             |  50 +-
 l10n/lv/settings.po             |  12 +-
 l10n/mk/calendar.po             | 469 ++++++++++-------
 l10n/mk/contacts.po             |  50 +-
 l10n/mk/settings.po             |  12 +-
 l10n/ms_MY/calendar.po          | 521 ++++++++++++-------
 l10n/ms_MY/contacts.po          |  93 ++--
 l10n/ms_MY/settings.po          |  12 +-
 l10n/nb_NO/calendar.po          | 452 +++++++++++------
 l10n/nb_NO/contacts.po          |  50 +-
 l10n/nb_NO/settings.po          |  12 +-
 l10n/nl/calendar.po             | 473 ++++++++++-------
 l10n/nl/contacts.po             |  50 +-
 l10n/nl/settings.po             |  12 +-
 l10n/nn_NO/calendar.po          | 448 ++++++++++------
 l10n/nn_NO/contacts.po          |  50 +-
 l10n/nn_NO/settings.po          |  12 +-
 l10n/pl/calendar.po             | 469 ++++++++++-------
 l10n/pl/contacts.po             |  50 +-
 l10n/pl/settings.po             |  12 +-
 l10n/pt_BR/calendar.po          | 469 ++++++++++-------
 l10n/pt_BR/contacts.po          |  50 +-
 l10n/pt_BR/settings.po          |  12 +-
 l10n/pt_PT/calendar.po          | 468 ++++++++++-------
 l10n/pt_PT/contacts.po          |  50 +-
 l10n/pt_PT/settings.po          |  12 +-
 l10n/ro/calendar.po             | 450 ++++++++++------
 l10n/ro/contacts.po             |  50 +-
 l10n/ro/settings.po             |  12 +-
 l10n/ru/calendar.po             | 127 +++--
 l10n/ru/contacts.po             |  50 +-
 l10n/ru/settings.po             |  12 +-
 l10n/sk_SK/calendar.po          | 468 ++++++++++-------
 l10n/sk_SK/contacts.po          |  50 +-
 l10n/sk_SK/settings.po          |  12 +-
 l10n/sl/calendar.po             | 468 ++++++++++-------
 l10n/sl/contacts.po             |  50 +-
 l10n/sl/settings.po             |  12 +-
 l10n/so/calendar.po             | 123 +++--
 l10n/so/contacts.po             |  50 +-
 l10n/so/settings.po             |  12 +-
 l10n/sr/calendar.po             | 446 ++++++++++------
 l10n/sr/contacts.po             |  50 +-
 l10n/sr/settings.po             |  12 +-
 l10n/sr@latin/calendar.po       | 446 ++++++++++------
 l10n/sr@latin/contacts.po       |  50 +-
 l10n/sr@latin/settings.po       |  12 +-
 l10n/sv/calendar.po             |  91 ++--
 l10n/sv/contacts.po             |  52 +-
 l10n/sv/settings.po             |  14 +-
 l10n/templates/bookmarks.pot    |   2 +-
 l10n/templates/calendar.pot     | 121 +++--
 l10n/templates/contacts.pot     |  32 +-
 l10n/templates/core.pot         |   2 +-
 l10n/templates/files.pot        |   2 +-
 l10n/templates/gallery.pot      |   2 +-
 l10n/templates/lib.pot          |   2 +-
 l10n/templates/media.pot        |   2 +-
 l10n/templates/settings.pot     |  10 +-
 l10n/th_TH/calendar.po          | 468 ++++++++++-------
 l10n/th_TH/contacts.po          |  50 +-
 l10n/th_TH/settings.po          |  12 +-
 l10n/tr/calendar.po             |  91 ++--
 l10n/tr/contacts.po             |  50 +-
 l10n/tr/settings.po             |  12 +-
 l10n/uk/calendar.po             | 476 ++++++++++-------
 l10n/uk/contacts.po             |  50 +-
 l10n/uk/settings.po             |  12 +-
 l10n/vi/calendar.po             | 125 +++--
 l10n/vi/contacts.po             |  50 +-
 l10n/vi/settings.po             |  12 +-
 l10n/zh_CN.GB2312/bookmarks.po  |  60 +++
 l10n/zh_CN.GB2312/calendar.po   | 813 +++++++++++++++++++++++++++++
 l10n/zh_CN.GB2312/contacts.po   | 874 ++++++++++++++++++++++++++++++++
 l10n/zh_CN.GB2312/core.po       | 268 ++++++++++
 l10n/zh_CN.GB2312/files.po      | 222 ++++++++
 l10n/zh_CN.GB2312/gallery.po    |  58 +++
 l10n/zh_CN.GB2312/lib.po        | 112 ++++
 l10n/zh_CN.GB2312/media.po      |  66 +++
 l10n/zh_CN.GB2312/settings.po   | 226 +++++++++
 l10n/zh_CN/calendar.po          | 453 +++++++++++------
 l10n/zh_CN/contacts.po          |  50 +-
 l10n/zh_CN/settings.po          |  12 +-
 l10n/zh_TW/calendar.po          | 450 ++++++++++------
 l10n/zh_TW/contacts.po          |  50 +-
 l10n/zh_TW/settings.po          |  12 +-
 settings/l10n/da.php            |   5 +
 settings/l10n/de.php            |   6 +-
 settings/l10n/eo.php            |   2 +
 settings/l10n/es.php            |   2 +
 settings/l10n/hu_HU.php         |   5 +
 settings/l10n/ja_JP.php         |   3 +
 241 files changed, 17154 insertions(+), 9389 deletions(-)
 create mode 100644 l10n/zh_CN.GB2312/bookmarks.po
 create mode 100644 l10n/zh_CN.GB2312/calendar.po
 create mode 100644 l10n/zh_CN.GB2312/contacts.po
 create mode 100644 l10n/zh_CN.GB2312/core.po
 create mode 100644 l10n/zh_CN.GB2312/files.po
 create mode 100644 l10n/zh_CN.GB2312/gallery.po
 create mode 100644 l10n/zh_CN.GB2312/lib.po
 create mode 100644 l10n/zh_CN.GB2312/media.po
 create mode 100644 l10n/zh_CN.GB2312/settings.po

diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
index 679f110285..524def22f7 100644
--- a/apps/calendar/l10n/ar.php
+++ b/apps/calendar/l10n/ar.php
@@ -19,6 +19,7 @@
 "Projects" => "مشاريع",
 "Questions" => "اسئلة",
 "Work" => "العمل",
+"New Calendar" => "جدول زمني جديد",
 "Does not repeat" => "لا يعاد",
 "Daily" => "يومي",
 "Weekly" => "أسبوعي",
@@ -64,7 +65,6 @@
 "Date" => "تاريخ",
 "Cal." => "تقويم",
 "All day" => "كل النهار",
-"New Calendar" => "جدول زمني جديد",
 "Missing fields" => "خانات خالية من المعلومات",
 "Title" => "عنوان",
 "From Date" => "من تاريخ",
@@ -77,9 +77,6 @@
 "Month" => "شهر",
 "List" => "قائمة",
 "Today" => "اليوم",
-"Calendars" => "الجداول الزمنية",
-"There was a fail, while parsing the file." => "لم يتم قراءة الملف بنجاح.",
-"Choose active calendars" => "إختر الجدول الزمني الرئيسي",
 "CalDav Link" => "وصلة CalDav",
 "Download" => "تحميل",
 "Edit" => "تعديل",
@@ -116,20 +113,13 @@
 "Interval" => "المده الفاصله",
 "End" => "نهايه",
 "occurrences" => "الاحداث",
-"Import a calendar file" => "أدخل ملف التقويم",
-"Please choose the calendar" => "الرجاء إختر الجدول الزمني",
 "create a new calendar" => "انشاء جدول زمني جديد",
+"Import a calendar file" => "أدخل ملف التقويم",
 "Name of new calendar" => "أسم الجدول الزمني الجديد",
 "Import" => "إدخال",
-"Importing calendar" => "يتم ادخال الجدول الزمني",
-"Calendar imported successfully" => "تم ادخال الجدول الزمني بنجاح",
 "Close Dialog" => "أغلق الحوار",
 "Create a new event" => "إضافة حدث جديد",
-"Select category" => "اختر الفئة",
 "Timezone" => "المنطقة الزمنية",
-"Check always for changes of the timezone" => "راقب دائما تغير التقويم الزمني",
-"Timeformat" => "شكل الوقت",
 "24h" => "24 ساعة",
-"12h" => "12 ساعة",
-"Calendar CalDAV syncing address:" => "عنوان لتحديث ال CalDAV الجدول الزمني"
+"12h" => "12 ساعة"
 );
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
index 592502b268..fc353ebef9 100644
--- a/apps/calendar/l10n/bg_BG.php
+++ b/apps/calendar/l10n/bg_BG.php
@@ -40,9 +40,6 @@
 "Month" => "Месец",
 "List" => "Списък",
 "Today" => "Днес",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "Възникна проблем с разлистването на файла.",
-"Choose active calendars" => "Изберете активен календар",
 "Your calendars" => "Вашите календари",
 "Shared calendars" => "Споделени календари",
 "No shared calendars" => "Няма споделени календари",
@@ -83,6 +80,5 @@
 "View an event" => "Преглед на събитие",
 "No categories selected" => "Няма избрани категории",
 "Timezone" => "Часова зона",
-"First day of the week" => "Първи ден на седмицата",
 "Groups" => "Групи"
 );
diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index d999eaf473..0474d4a2a9 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -112,9 +112,6 @@
 "Month" => "Mes",
 "List" => "Llista",
 "Today" => "Avui",
-"Calendars" => "Calendaris",
-"There was a fail, while parsing the file." => "S'ha produït un error en analitzar el fitxer.",
-"Choose active calendars" => "Seleccioneu calendaris actius",
 "Your calendars" => "Els vostres calendaris",
 "CalDav Link" => "Enllaç CalDav",
 "Shared calendars" => "Calendaris compartits",
@@ -177,11 +174,8 @@
 "of" => "de",
 "at" => "a",
 "Timezone" => "Zona horària",
-"Check always for changes of the timezone" => "Comprova sempre en els canvis de zona horària",
-"Timeformat" => "Format de temps",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primer dia de la setmana",
 "Cache" => "Memòria de cau",
 "Clear cache for repeating events" => "Neteja la memòria de cau pels esdeveniments amb repetició",
 "Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
index 05d286d82c..fcc31613c7 100644
--- a/apps/calendar/l10n/cs_CZ.php
+++ b/apps/calendar/l10n/cs_CZ.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Časová zóna byla změněna",
 "Invalid request" => "Chybný požadavek",
 "Calendar" => "Kalendář",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM rrrr",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
 "Birthday" => "Narozeniny",
 "Business" => "Obchodní",
 "Call" => "Hovor",
@@ -23,6 +28,7 @@
 "Questions" => "Dotazy",
 "Work" => "Pracovní",
 "unnamed" => "nepojmenováno",
+"New Calendar" => "Nový kalendář",
 "Does not repeat" => "Neopakuje se",
 "Daily" => "Denně",
 "Weekly" => "Týdně",
@@ -68,7 +74,6 @@
 "Date" => "Datum",
 "Cal." => "Kal.",
 "All day" => "Celý den",
-"New Calendar" => "Nový kalendář",
 "Missing fields" => "Chybějící pole",
 "Title" => "Název",
 "From Date" => "Od data",
@@ -81,9 +86,6 @@
 "Month" => "měsíc",
 "List" => "Seznam",
 "Today" => "dnes",
-"Calendars" => "Kalendáře",
-"There was a fail, while parsing the file." => "Chyba při převodu souboru",
-"Choose active calendars" => "Vybrat aktivní kalendář",
 "Your calendars" => "Vaše kalendáře",
 "CalDav Link" => "CalDav odkaz",
 "Shared calendars" => "Sdílené kalendáře",
@@ -132,27 +134,19 @@
 "Interval" => "Interval",
 "End" => "Konec",
 "occurrences" => "výskyty",
-"Import a calendar file" => "Importovat soubor kalendáře",
-"Please choose the calendar" => "Zvolte prosím kalendář",
 "create a new calendar" => "vytvořit nový kalendář",
+"Import a calendar file" => "Importovat soubor kalendáře",
 "Name of new calendar" => "Název nového kalendáře",
 "Import" => "Import",
-"Importing calendar" => "Kalendář se importuje",
-"Calendar imported successfully" => "Kalendář byl úspěšně importován",
 "Close Dialog" => "Zavřít dialog",
 "Create a new event" => "Vytvořit novou událost",
 "View an event" => "Zobrazit událost",
 "No categories selected" => "Žádné kategorie nevybrány",
-"Select category" => "Vyberte kategorii",
 "of" => "z",
 "at" => "v",
 "Timezone" => "Časové pásmo",
-"Check always for changes of the timezone" => "Vždy kontrolavat, zda nedošlo ke změně časového pásma",
-"Timeformat" => "Formát času",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Týden začína v",
-"Calendar CalDAV syncing address:" => "Adresa pro synchronizaci kalendáře pomocí CalDAV:",
 "Users" => "Uživatelé",
 "select users" => "vybrat uživatele",
 "Editable" => "Upravovatelné",
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index 36551a2a93..789765fec4 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Tidszone ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Calendar" => "Kalender",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM åååå",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, åååå",
 "Birthday" => "Fødselsdag",
 "Business" => "Forretning",
 "Call" => "Ring",
@@ -22,7 +27,9 @@
 "Projects" => "Projekter",
 "Questions" => "Spørgsmål",
 "Work" => "Arbejde",
+"by" => "af",
 "unnamed" => "unavngivet",
+"New Calendar" => "Ny Kalender",
 "Does not repeat" => "Gentages ikke",
 "Daily" => "Daglig",
 "Weekly" => "Ugentlig",
@@ -67,8 +74,26 @@
 "by day and month" => "efter dag og måned",
 "Date" => "Dato",
 "Cal." => "Kal.",
+"Sun." => "Søn.",
+"Mon." => "Man.",
+"Tue." => "Tir.",
+"Wed." => "Ons.",
+"Thu." => "Tor.",
+"Fri." => "Fre.",
+"Sat." => "Lør.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Maj",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "Hele dagen",
-"New Calendar" => "Ny Kalender",
 "Missing fields" => "Manglende felter",
 "Title" => "Titel",
 "From Date" => "Fra dato",
@@ -81,9 +106,6 @@
 "Month" => "Måned",
 "List" => "Liste",
 "Today" => "I dag",
-"Calendars" => "Kalendere",
-"There was a fail, while parsing the file." => "Der opstod en fejl under gennemlæsning af filen.",
-"Choose active calendars" => "Vælg aktive kalendere",
 "Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-link",
 "Shared calendars" => "Delte kalendere",
@@ -132,27 +154,22 @@
 "Interval" => "Interval",
 "End" => "Afslutning",
 "occurrences" => "forekomster",
-"Import a calendar file" => "Importer en kalenderfil",
-"Please choose the calendar" => "Vælg venligst kalender",
 "create a new calendar" => "opret en ny kalender",
+"Import a calendar file" => "Importer en kalenderfil",
+"Please choose a calendar" => "Vælg en kalender",
 "Name of new calendar" => "Navn på ny kalender",
 "Import" => "Importer",
-"Importing calendar" => "Importerer kalender",
-"Calendar imported successfully" => "Kalender importeret korrekt",
 "Close Dialog" => "Luk dialog",
 "Create a new event" => "Opret en ny begivenhed",
 "View an event" => "Vis en begivenhed",
 "No categories selected" => "Ingen categorier valgt",
-"Select category" => "Vælg kategori",
 "of" => "fra",
 "at" => "kl.",
 "Timezone" => "Tidszone",
-"Check always for changes of the timezone" => "Check altid efter ændringer i tidszone",
-"Timeformat" => "Tidsformat",
 "24h" => "24T",
 "12h" => "12T",
-"First day of the week" => "Ugens første dag",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:",
+"more info" => "flere oplysninger",
+"iOS/OS X" => "iOS/OS X",
 "Users" => "Brugere",
 "select users" => "Vælg brugere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 8270b6785e..c519fe3140 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -112,9 +112,6 @@
 "Month" => "Monat",
 "List" => "Liste",
 "Today" => "Heute",
-"Calendars" => "Kalender",
-"There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
-"Choose active calendars" => "Aktive Kalender wählen",
 "Your calendars" => "Deine Kalender",
 "CalDav Link" => "CalDAV-Link",
 "Shared calendars" => "geteilte Kalender",
@@ -177,14 +174,11 @@
 "of" => "von",
 "at" => "um",
 "Timezone" => "Zeitzone",
-"Check always for changes of the timezone" => "immer die Zeitzone überprüfen",
-"Timeformat" => "Zeitformat",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "erster Wochentag",
 "Cache" => "Zwischenspeicher",
-"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen.",
-"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab.",
+"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
+"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab",
 "more info" => "weitere Informationen",
 "Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
 "iOS/OS X" => "iOS/OS X",
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
index 4657213848..ad07d7b585 100644
--- a/apps/calendar/l10n/el.php
+++ b/apps/calendar/l10n/el.php
@@ -112,9 +112,6 @@
 "Month" => "Μήνας",
 "List" => "Λίστα",
 "Today" => "Σήμερα",
-"Calendars" => "Ημερολόγια",
-"There was a fail, while parsing the file." => "Υπήρξε μια αποτυχία, κατά την σάρωση του αρχείου.",
-"Choose active calendars" => "Επιλέξτε τα ενεργά ημερολόγια",
 "Your calendars" => "Τα ημερολόγια σου",
 "CalDav Link" => "Σύνδεση CalDAV",
 "Shared calendars" => "Κοινόχρηστα ημερολόγια",
@@ -177,11 +174,8 @@
 "of" => "του",
 "at" => "στο",
 "Timezone" => "Ζώνη ώρας",
-"Check always for changes of the timezone" => "Έλεγχος πάντα για τις αλλαγές της ζώνης ώρας",
-"Timeformat" => "Μορφή ώρας",
 "24h" => "24ω",
 "12h" => "12ω",
-"First day of the week" => "Πρώτη μέρα της εβδομάδας",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων",
 "Calendar CalDAV syncing addresses" => "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV",
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
index b1127d59ca..1a01bb713f 100644
--- a/apps/calendar/l10n/eo.php
+++ b/apps/calendar/l10n/eo.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Ne ĉiuj kalendaroj estas tute kaŝmemorigitaj",
+"Everything seems to be completely cached" => "Ĉio ŝajnas tute kaŝmemorigita",
 "No calendars found." => "Neniu kalendaro troviĝis.",
 "No events found." => "Neniu okazaĵo troviĝis.",
 "Wrong calendar" => "Malĝusta kalendaro",
+"The file contained either no events or all events are already saved in your calendar." => "Aŭ la dosiero enhavas neniun okazaĵon aŭ ĉiuj okazaĵoj jam estas konservitaj en via kalendaro.",
+"events has been saved in the new calendar" => "okazaĵoj estas konservitaj en la nova kalendaro",
+"Import failed" => "Enporto malsukcesis",
+"events has been saved in your calendar" => "okazaĵoj estas konservitaj en via kalendaro",
 "New Timezone:" => "Nova horzono:",
 "Timezone changed" => "La horozono estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Calendar" => "Kalendaro",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d-a de MMM yyyy",
 "Birthday" => "Naskiĝotago",
 "Business" => "Negoco",
 "Call" => "Voko",
@@ -22,7 +33,9 @@
 "Projects" => "Projektoj",
 "Questions" => "Demandoj",
 "Work" => "Laboro",
+"by" => "de",
 "unnamed" => "nenomita",
+"New Calendar" => "Nova kalendaro",
 "Does not repeat" => "Ĉi tio ne ripetiĝas",
 "Daily" => "Tage",
 "Weekly" => "Semajne",
@@ -67,8 +80,26 @@
 "by day and month" => "laŭ tago kaj monato",
 "Date" => "Dato",
 "Cal." => "Kal.",
+"Sun." => "dim.",
+"Mon." => "lun.",
+"Tue." => "mar.",
+"Wed." => "mer.",
+"Thu." => "ĵaŭ.",
+"Fri." => "ven.",
+"Sat." => "sab.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Maj.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aŭg.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "La tuta tago",
-"New Calendar" => "Nova kalendaro",
 "Missing fields" => "Mankas iuj kampoj",
 "Title" => "Titolo",
 "From Date" => "ekde la dato",
@@ -81,9 +112,6 @@
 "Month" => "Monato",
 "List" => "Listo",
 "Today" => "Hodiaŭ",
-"Calendars" => "Kalendaroj",
-"There was a fail, while parsing the file." => "Malsukceso okazis dum analizo de la dosiero.",
-"Choose active calendars" => "Elektu aktivajn kalendarojn",
 "Your calendars" => "Viaj kalendaroj",
 "CalDav Link" => "CalDav-a ligilo",
 "Shared calendars" => "Kunhavigitaj kalendaroj",
@@ -132,27 +160,29 @@
 "Interval" => "Intervalo",
 "End" => "Fino",
 "occurrences" => "aperoj",
-"Import a calendar file" => "Enporti kalendarodosieron",
-"Please choose the calendar" => "Bonvolu elekti kalendaron",
 "create a new calendar" => "Krei novan kalendaron",
+"Import a calendar file" => "Enporti kalendarodosieron",
+"Please choose a calendar" => "Bonvolu elekti kalendaron",
 "Name of new calendar" => "Nomo de la nova kalendaro",
+"Take an available name!" => "Prenu haveblan nomon!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Kalendaro kun ĉi tiu nomo jam ekzastas. Se vi malgraŭe daŭros, ĉi tiuj kalendaroj kunfandiĝos.",
 "Import" => "Enporti",
-"Importing calendar" => "Kalendaro estas enportata",
-"Calendar imported successfully" => "La kalendaro enportiĝis sukcese",
 "Close Dialog" => "Fermi la dialogon",
 "Create a new event" => "Krei okazaĵon",
 "View an event" => "Vidi okazaĵon",
 "No categories selected" => "Neniu kategorio elektita",
-"Select category" => "Elekti kategorion",
 "of" => "de",
 "at" => "ĉe",
 "Timezone" => "Horozono",
-"Check always for changes of the timezone" => "Ĉiam kontroli ĉu la horzono ŝanĝiĝis",
-"Timeformat" => "Tempoformo",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Unua tago de la semajno",
-"Calendar CalDAV syncing address:" => "Adreso de kalendarosinkronigo per CalDAV:",
+"Cache" => "Kaŝmemoro",
+"Clear cache for repeating events" => "Forviŝi kaŝmemoron por ripeto de okazaĵoj",
+"Calendar CalDAV syncing addresses" => "sinkronigaj adresoj por CalDAV-kalendaroj",
+"more info" => "pli da informo",
+"Primary address (Kontact et al)" => "Ĉefa adreso (Kontact kaj aliaj)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Nurlegebla(j) iCalendar-ligilo(j)",
 "Users" => "Uzantoj",
 "select users" => "elekti uzantojn",
 "Editable" => "Redaktebla",
diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php
index 4cd9e3202b..3ebcd2e943 100644
--- a/apps/calendar/l10n/es.php
+++ b/apps/calendar/l10n/es.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Aún no se han guardado en caché todos los calendarios",
+"Everything seems to be completely cached" => "Parece que se ha guardado todo en caché",
 "No calendars found." => "No se encontraron calendarios.",
 "No events found." => "No se encontraron eventos.",
 "Wrong calendar" => "Calendario incorrecto",
+"The file contained either no events or all events are already saved in your calendar." => "El archivo no contiene eventos o ya existen en tu calendario.",
+"events has been saved in the new calendar" => "Los eventos han sido guardados en el nuevo calendario",
+"Import failed" => "Fallo en la importación",
+"events has been saved in your calendar" => "eventos se han guardado en tu calendario",
 "New Timezone:" => "Nueva zona horaria:",
 "Timezone changed" => "Zona horaria cambiada",
 "Invalid request" => "Petición no válida",
 "Calendar" => "Calendario",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Cumpleaños",
 "Business" => "Negocios",
 "Call" => "Llamada",
@@ -22,7 +33,9 @@
 "Projects" => "Proyectos",
 "Questions" => "Preguntas",
 "Work" => "Trabajo",
+"by" => "por",
 "unnamed" => "Sin nombre",
+"New Calendar" => "Nuevo calendario",
 "Does not repeat" => "No se repite",
 "Daily" => "Diariamente",
 "Weekly" => "Semanalmente",
@@ -67,8 +80,26 @@
 "by day and month" => "por día y mes",
 "Date" => "Fecha",
 "Cal." => "Cal.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mier.",
+"Thu." => "Jue.",
+"Fri." => "Vie.",
+"Sat." => "Sab.",
+"Jan." => "Ene.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Abr.",
+"May." => "May.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Ago.",
+"Sep." => "Sep.",
+"Oct." => "Oct.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "All day" => "Todo el día",
-"New Calendar" => "Nuevo calendario",
 "Missing fields" => "Los campos que faltan",
 "Title" => "Título",
 "From Date" => "Desde la fecha",
@@ -81,9 +112,6 @@
 "Month" => "Mes",
 "List" => "Lista",
 "Today" => "Hoy",
-"Calendars" => "Calendarios",
-"There was a fail, while parsing the file." => "Se ha producido un fallo al analizar el archivo.",
-"Choose active calendars" => "Elige los calendarios activos",
 "Your calendars" => "Tus calendarios",
 "CalDav Link" => "Enlace a CalDav",
 "Shared calendars" => "Calendarios compartidos",
@@ -132,27 +160,29 @@
 "Interval" => "Intervalo",
 "End" => "Fin",
 "occurrences" => "ocurrencias",
-"Import a calendar file" => "Importar un archivo de calendario",
-"Please choose the calendar" => "Por favor elige el calendario",
 "create a new calendar" => "Crear un nuevo calendario",
+"Import a calendar file" => "Importar un archivo de calendario",
+"Please choose a calendar" => "Por favor, escoge un calendario",
 "Name of new calendar" => "Nombre del nuevo calendario",
+"Take an available name!" => "¡Elige un nombre disponible!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ya existe un calendario con este nombre. Si continúas, se combinarán los calendarios.",
 "Import" => "Importar",
-"Importing calendar" => "Importando calendario",
-"Calendar imported successfully" => "Calendario importado exitosamente",
 "Close Dialog" => "Cerrar diálogo",
 "Create a new event" => "Crear un nuevo evento",
 "View an event" => "Ver un evento",
 "No categories selected" => "Ninguna categoría seleccionada",
-"Select category" => "Seleccionar categoría",
 "of" => "de",
 "at" => "a las",
 "Timezone" => "Zona horaria",
-"Check always for changes of the timezone" => "Comprobar siempre por cambios en la zona horaria",
-"Timeformat" => "Formato de hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primer día de la semana",
-"Calendar CalDAV syncing address:" => "Dirección de sincronización de calendario CalDAV:",
+"Cache" => "Caché",
+"Clear cache for repeating events" => "Limpiar caché de eventos recurrentes",
+"Calendar CalDAV syncing addresses" => "Direcciones de sincronización de calendario CalDAV:",
+"more info" => "Más información",
+"Primary address (Kontact et al)" => "Dirección principal (Kontact y otros)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Enlace(s) iCalendar de sólo lectura",
 "Users" => "Usuarios",
 "select users" => "seleccionar usuarios",
 "Editable" => "Editable",
diff --git a/apps/calendar/l10n/et_EE.php b/apps/calendar/l10n/et_EE.php
index 931ca56f5f..59f494f8ab 100644
--- a/apps/calendar/l10n/et_EE.php
+++ b/apps/calendar/l10n/et_EE.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Ajavöönd on muudetud",
 "Invalid request" => "Vigane päring",
 "Calendar" => "Kalender",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Sünnipäev",
 "Business" => "Äri",
 "Call" => "Helista",
@@ -23,6 +28,7 @@
 "Questions" => "Küsimused",
 "Work" => "Töö",
 "unnamed" => "nimetu",
+"New Calendar" => "Uus kalender",
 "Does not repeat" => "Ei kordu",
 "Daily" => "Iga päev",
 "Weekly" => "Iga nädal",
@@ -68,7 +74,6 @@
 "Date" => "Kuupäev",
 "Cal." => "Kal.",
 "All day" => "Kogu päev",
-"New Calendar" => "Uus kalender",
 "Missing fields" => "Puuduvad väljad",
 "Title" => "Pealkiri",
 "From Date" => "Alates kuupäevast",
@@ -81,9 +86,6 @@
 "Month" => "Kuu",
 "List" => "Nimekiri",
 "Today" => "Täna",
-"Calendars" => "Kalendrid",
-"There was a fail, while parsing the file." => "Faili parsimisel tekkis viga.",
-"Choose active calendars" => "Vali aktiivsed kalendrid",
 "Your calendars" => "Sinu kalendrid",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Jagatud kalendrid",
@@ -132,27 +134,19 @@
 "Interval" => "Intervall",
 "End" => "Lõpp",
 "occurrences" => "toimumiskordi",
-"Import a calendar file" => "Impordi kalendrifail",
-"Please choose the calendar" => "Palun vali kalender",
 "create a new calendar" => "loo uus kalender",
+"Import a calendar file" => "Impordi kalendrifail",
 "Name of new calendar" => "Uue kalendri nimi",
 "Import" => "Impordi",
-"Importing calendar" => "Kalendri importimine",
-"Calendar imported successfully" => "Kalender on imporditud",
 "Close Dialog" => "Sulge dialoogiaken",
 "Create a new event" => "Loo sündmus",
 "View an event" => "Vaata üritust",
 "No categories selected" => "Ühtegi kategooriat pole valitud",
-"Select category" => "Salvesta kategooria",
 "of" => "/",
 "at" => "kell",
 "Timezone" => "Ajavöönd",
-"Check always for changes of the timezone" => "Kontrolli alati muudatusi ajavööndis",
-"Timeformat" => "Aja vorming",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Nädala esimene päev",
-"Calendar CalDAV syncing address:" => "Kalendri CalDAV sünkroniseerimise aadress:",
 "Users" => "Kasutajad",
 "select users" => "valitud kasutajad",
 "Editable" => "Muudetav",
diff --git a/apps/calendar/l10n/eu.php b/apps/calendar/l10n/eu.php
index 9e1300032f..5ebce09c58 100644
--- a/apps/calendar/l10n/eu.php
+++ b/apps/calendar/l10n/eu.php
@@ -1,11 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Egutegi guztiak ez daude guztiz cacheatuta",
+"Everything seems to be completely cached" => "Dena guztiz cacheatuta dagoela dirudi",
 "No calendars found." => "Ez da egutegirik aurkitu.",
 "No events found." => "Ez da gertaerarik aurkitu.",
 "Wrong calendar" => "Egutegi okerra",
+"The file contained either no events or all events are already saved in your calendar." => "Fitxategiak ez zuen gertaerarik edo gertaera guztiak dagoeneko egutegian gordeta zeuden.",
+"events has been saved in the new calendar" => "gertaerak egutegi berrian gorde dira",
+"Import failed" => "Inportazioak huts egin du",
+"events has been saved in your calendar" => "gertaerak zure egutegian gorde dira",
 "New Timezone:" => "Ordu-zonalde berria",
 "Timezone changed" => "Ordu-zonaldea aldatuta",
 "Invalid request" => "Baliogabeko eskaera",
 "Calendar" => "Egutegia",
+"MMMM yyyy" => "yyyy MMMM",
 "Birthday" => "Jaioteguna",
 "Business" => "Negozioa",
 "Call" => "Deia",
@@ -22,6 +29,7 @@
 "Questions" => "Galderak",
 "Work" => "Lana",
 "unnamed" => "izengabea",
+"New Calendar" => "Egutegi berria",
 "Does not repeat" => "Ez da errepikatzen",
 "Daily" => "Egunero",
 "Weekly" => "Astero",
@@ -66,8 +74,26 @@
 "by day and month" => "eguna eta hilabetearen arabera",
 "Date" => "Data",
 "Cal." => "Eg.",
+"Sun." => "ig.",
+"Mon." => "al.",
+"Tue." => "ar.",
+"Wed." => "az.",
+"Thu." => "og.",
+"Fri." => "ol.",
+"Sat." => "lr.",
+"Jan." => "urt.",
+"Feb." => "ots.",
+"Mar." => "mar.",
+"Apr." => "api.",
+"May." => "mai.",
+"Jun." => "eka.",
+"Jul." => "uzt.",
+"Aug." => "abu.",
+"Sep." => "ira.",
+"Oct." => "urr.",
+"Nov." => "aza.",
+"Dec." => "abe.",
 "All day" => "Egun guztia",
-"New Calendar" => "Egutegi berria",
 "Missing fields" => "Eremuak faltan",
 "Title" => "Izenburua",
 "From Date" => "Hasierako Data",
@@ -80,9 +106,6 @@
 "Month" => "Hilabetea",
 "List" => "Zerrenda",
 "Today" => "Gaur",
-"Calendars" => "Egutegiak",
-"There was a fail, while parsing the file." => "Huts bat egon da, fitxategia aztertzen zen bitartea.",
-"Choose active calendars" => "Aukeratu egutegi aktiboak",
 "Your calendars" => "Zure egutegiak",
 "CalDav Link" => "CalDav lotura",
 "Shared calendars" => "Elkarbanatutako egutegiak",
@@ -131,25 +154,26 @@
 "Interval" => "Tartea",
 "End" => "Amaiera",
 "occurrences" => "errepikapenak",
-"Import a calendar file" => "Inportatu egutegi fitxategi bat",
-"Please choose the calendar" => "Mesedez aukeratu egutegia",
 "create a new calendar" => "sortu egutegi berria",
+"Import a calendar file" => "Inportatu egutegi fitxategi bat",
+"Please choose a calendar" => "Mesedez aukeratu egutegi bat.",
 "Name of new calendar" => "Egutegi berriaren izena",
+"Take an available name!" => "Hartu eskuragarri dagoen izen bat!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Izen hau duen egutegi bat dagoeneko existitzen da. Hala ere jarraitzen baduzu, egutegi hauek elkartuko dira.",
 "Import" => "Importatu",
-"Importing calendar" => "Egutegia inportatzen",
-"Calendar imported successfully" => "Egutegia ongi inportatu da",
 "Close Dialog" => "Itxi lehioa",
 "Create a new event" => "Sortu gertaera berria",
 "View an event" => "Ikusi gertaera bat",
 "No categories selected" => "Ez da kategoriarik hautatu",
-"Select category" => "Aukeratu kategoria",
 "Timezone" => "Ordu-zonaldea",
-"Check always for changes of the timezone" => "Egiaztatu beti ordu-zonalde aldaketen bila",
-"Timeformat" => "Ordu formatua",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Asteko lehenego eguna",
-"Calendar CalDAV syncing address:" => "Egutegiaren CalDAV sinkronizazio helbidea",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Ezabatu gertaera errepikakorren cachea",
+"Calendar CalDAV syncing addresses" => "Egutegiaren CalDAV sinkronizazio helbideak",
+"more info" => "informazio gehiago",
+"Primary address (Kontact et al)" => "Helbide nagusia",
+"iOS/OS X" => "iOS/OS X",
 "Users" => "Erabiltzaileak",
 "select users" => "hautatutako erabiltzaileak",
 "Editable" => "Editagarria",
diff --git a/apps/calendar/l10n/fa.php b/apps/calendar/l10n/fa.php
index cd2bb9c2e5..9235460834 100644
--- a/apps/calendar/l10n/fa.php
+++ b/apps/calendar/l10n/fa.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "زمان محلی تغییر یافت",
 "Invalid request" => "درخواست نامعتبر",
 "Calendar" => "تقویم",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "روزتولد",
 "Business" => "تجارت",
 "Call" => "تماس گرفتن",
@@ -23,6 +28,7 @@
 "Questions" => "سوالات",
 "Work" => "کار",
 "unnamed" => "نام گذاری نشده",
+"New Calendar" => "تقویم جدید",
 "Does not repeat" => "تکرار نکنید",
 "Daily" => "روزانه",
 "Weekly" => "هفتهگی",
@@ -68,7 +74,6 @@
 "Date" => "تاریخ",
 "Cal." => "تقویم.",
 "All day" => "هرروز",
-"New Calendar" => "تقویم جدید",
 "Missing fields" => "فیلد های گم شده",
 "Title" => "عنوان",
 "From Date" => "از تاریخ",
@@ -81,9 +86,6 @@
 "Month" => "ماه",
 "List" => "فهرست",
 "Today" => "امروز",
-"Calendars" => "تقویم ها",
-"There was a fail, while parsing the file." => "ناتوان در تجزیه پرونده",
-"Choose active calendars" => "تقویم فعال را انتخاب کنید",
 "Your calendars" => "تقویم های شما",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "تقویمهای به اشترک گذاری شده",
@@ -132,27 +134,19 @@
 "Interval" => "فاصله",
 "End" => "پایان",
 "occurrences" => "ظهور",
-"Import a calendar file" => "یک پرونده حاوی تقویم وارد کنید",
-"Please choose the calendar" => "لطفا تقویم را انتخاب کنید",
 "create a new calendar" => "یک تقویم جدید ایجاد کنید",
+"Import a calendar file" => "یک پرونده حاوی تقویم وارد کنید",
 "Name of new calendar" => "نام تقویم جدید",
 "Import" => "ورودی دادن",
-"Importing calendar" => "درحال افزودن تقویم",
-"Calendar imported successfully" => "افزودن تقویم موفقیت آمیز بود",
 "Close Dialog" => "بستن دیالوگ",
 "Create a new event" => "یک رویداد ایجاد کنید",
 "View an event" => "دیدن یک رویداد",
 "No categories selected" => "هیچ گروهی انتخاب نشده",
-"Select category" => "انتخاب گروه",
 "of" => "از",
 "at" => "در",
 "Timezone" => "زمان محلی",
-"Check always for changes of the timezone" => "همیشه بررسی کنید برای تغییر زمان محلی",
-"Timeformat" => "نوع زمان",
 "24h" => "24 ساعت",
 "12h" => "12 ساعت",
-"First day of the week" => "یکمین روز هفته",
-"Calendar CalDAV syncing address:" => "Calendar CalDAV syncing address :",
 "Users" => "کاربرها",
 "select users" => "انتخاب شناسه ها",
 "Editable" => "قابل ویرایش",
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
index 23096d7365..1faa161e65 100644
--- a/apps/calendar/l10n/fi_FI.php
+++ b/apps/calendar/l10n/fi_FI.php
@@ -87,9 +87,6 @@
 "Month" => "Kuukausi",
 "List" => "Lista",
 "Today" => "Tänään",
-"Calendars" => "Kalenterit",
-"There was a fail, while parsing the file." => "Tiedostoa jäsennettäessä tapahtui virhe.",
-"Choose active calendars" => "Valitse aktiiviset kalenterit",
 "Your calendars" => "Omat kalenterisi",
 "CalDav Link" => "CalDav-linkki",
 "Shared calendars" => "Jaetut kalenterit",
@@ -143,11 +140,8 @@
 "View an event" => "Avaa tapahtuma",
 "No categories selected" => "Luokkia ei ole valittu",
 "Timezone" => "Aikavyöhyke",
-"Check always for changes of the timezone" => "Tarkista aina aikavyöhykkeen muutokset",
-"Timeformat" => "Ajan esitysmuoto",
 "24h" => "24 tuntia",
 "12h" => "12 tuntia",
-"First day of the week" => "Viikon ensimmäinen päivä",
 "Calendar CalDAV syncing addresses" => "Kalenterin CalDAV-synkronointiosoitteet",
 "iOS/OS X" => "iOS/OS X",
 "Users" => "Käyttäjät",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index c43b16631e..90ba903b87 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -112,9 +112,6 @@
 "Month" => "Mois",
 "List" => "Liste",
 "Today" => "Aujourd'hui",
-"Calendars" => "Calendriers",
-"There was a fail, while parsing the file." => "Une erreur est survenue pendant la lecture du fichier.",
-"Choose active calendars" => "Choix des calendriers actifs",
 "Your calendars" => "Vos calendriers",
 "CalDav Link" => "Lien CalDav",
 "Shared calendars" => "Calendriers partagés",
@@ -177,11 +174,8 @@
 "of" => "de",
 "at" => "à",
 "Timezone" => "Fuseau horaire",
-"Check always for changes of the timezone" => "Toujours vérifier d'éventuels changements de fuseau horaire",
-"Timeformat" => "Format de l'heure",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Premier jour de la semaine",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Nettoyer le cache des événements répétitifs",
 "Calendar CalDAV syncing addresses" => "Adresses de synchronisation des calendriers CalDAV",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
index 3178b1819e..ff7e4833ad 100644
--- a/apps/calendar/l10n/gl.php
+++ b/apps/calendar/l10n/gl.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Fuso horario trocado",
 "Invalid request" => "Petición non válida",
 "Calendar" => "Calendario",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d,yyyy",
 "Birthday" => "Aniversario",
 "Business" => "Traballo",
 "Call" => "Chamada",
@@ -23,6 +28,7 @@
 "Questions" => "Preguntas",
 "Work" => "Traballo",
 "unnamed" => "sen nome",
+"New Calendar" => "Novo calendario",
 "Does not repeat" => "Non se repite",
 "Daily" => "A diario",
 "Weekly" => "Semanalmente",
@@ -68,7 +74,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
-"New Calendar" => "Novo calendario",
 "Missing fields" => "Faltan campos",
 "Title" => "Título",
 "From Date" => "Desde a data",
@@ -81,9 +86,6 @@
 "Month" => "Mes",
 "List" => "Lista",
 "Today" => "Hoxe",
-"Calendars" => "Calendarios",
-"There was a fail, while parsing the file." => "Produciuse un erro ao procesar o ficheiro",
-"Choose active calendars" => "Escolla os calendarios activos",
 "Your calendars" => "Os seus calendarios",
 "CalDav Link" => "Ligazón CalDav",
 "Shared calendars" => "Calendarios compartidos",
@@ -132,27 +134,19 @@
 "Interval" => "Intervalo",
 "End" => "Fin",
 "occurrences" => "acontecementos",
-"Import a calendar file" => "Importar un ficheiro de calendario",
-"Please choose the calendar" => "Por favor, seleccione o calendario",
 "create a new calendar" => "crear un novo calendario",
+"Import a calendar file" => "Importar un ficheiro de calendario",
 "Name of new calendar" => "Nome do novo calendario",
 "Import" => "Importar",
-"Importing calendar" => "Importar calendario",
-"Calendar imported successfully" => "Calendario importado correctamente",
 "Close Dialog" => "Pechar diálogo",
 "Create a new event" => "Crear un novo evento",
 "View an event" => "Ver un evento",
 "No categories selected" => "Non seleccionou as categorías",
-"Select category" => "Seleccionar categoría",
 "of" => "de",
 "at" => "a",
 "Timezone" => "Fuso horario",
-"Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
-"Timeformat" => "Formato de hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primeiro día da semana",
-"Calendar CalDAV syncing address:" => "Enderezo de sincronización do calendario CalDAV:",
 "Users" => "Usuarios",
 "select users" => "escoller usuarios",
 "Editable" => "Editable",
diff --git a/apps/calendar/l10n/he.php b/apps/calendar/l10n/he.php
index c161d3be2e..d5c0b2b2e5 100644
--- a/apps/calendar/l10n/he.php
+++ b/apps/calendar/l10n/he.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "אזור זמן השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Calendar" => "ח שנה",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "יום הולדת",
 "Business" => "עסקים",
 "Call" => "שיחה",
@@ -23,6 +28,7 @@
 "Questions" => "שאלות",
 "Work" => "עבודה",
 "unnamed" => "ללא שם",
+"New Calendar" => "לוח שנה חדש",
 "Does not repeat" => "ללא חזרה",
 "Daily" => "יומי",
 "Weekly" => "שבועי",
@@ -68,7 +74,6 @@
 "Date" => "תאריך",
 "Cal." => "לוח שנה",
 "All day" => "היום",
-"New Calendar" => "לוח שנה חדש",
 "Missing fields" => "שדות חסרים",
 "Title" => "כותרת",
 "From Date" => "מתאריך",
@@ -81,9 +86,6 @@
 "Month" => "חודש",
 "List" => "רשימה",
 "Today" => "היום",
-"Calendars" => "לוחות שנה",
-"There was a fail, while parsing the file." => "אירעה שגיאה בעת פענוח הקובץ.",
-"Choose active calendars" => "בחר לוחות שנה פעילים",
 "Your calendars" => "לוחות השנה שלך",
 "CalDav Link" => "קישור CalDav",
 "Shared calendars" => "לוחות שנה מושתפים",
@@ -132,27 +134,19 @@
 "Interval" => "משך",
 "End" => "סיום",
 "occurrences" => "מופעים",
-"Import a calendar file" => "יבוא קובץ לוח שנה",
-"Please choose the calendar" => "נא לבחור את לוח השנה",
 "create a new calendar" => "יצירת לוח שנה חדש",
+"Import a calendar file" => "יבוא קובץ לוח שנה",
 "Name of new calendar" => "שם לוח השנה החדש",
 "Import" => "יבוא",
-"Importing calendar" => "היומן מייובא",
-"Calendar imported successfully" => "היומן ייובא בהצלחה",
 "Close Dialog" => "סגירת הדו־שיח",
 "Create a new event" => "יצירת אירוע חדש",
 "View an event" => "צפייה באירוע",
 "No categories selected" => "לא נבחרו קטגוריות",
-"Select category" => "בחר קטגוריה",
 "of" => "מתוך",
 "at" => "בשנה",
 "Timezone" => "אזור זמן",
-"Check always for changes of the timezone" => "יש לבדוק תמיד אם יש הבדלים באזורי הזמן",
-"Timeformat" => "מבנה התאריך",
 "24h" => "24 שעות",
 "12h" => "12 שעות",
-"First day of the week" => "היום הראשון בשבוע",
-"Calendar CalDAV syncing address:" => "כתובת הסנכרון ללוח שנה מסוג CalDAV:",
 "Users" => "משתמשים",
 "select users" => "נא לבחור במשתמשים",
 "Editable" => "ניתן לעריכה",
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
index 551bb4abbc..4ab5b95518 100644
--- a/apps/calendar/l10n/hr.php
+++ b/apps/calendar/l10n/hr.php
@@ -23,6 +23,7 @@
 "Questions" => "Pitanja",
 "Work" => "Posao",
 "unnamed" => "bezimeno",
+"New Calendar" => "Novi kalendar",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "Dnevno",
 "Weekly" => "Tjedno",
@@ -67,7 +68,6 @@
 "Date" => "datum",
 "Cal." => "Kal.",
 "All day" => "Cijeli dan",
-"New Calendar" => "Novi kalendar",
 "Missing fields" => "Nedostaju polja",
 "Title" => "Naslov",
 "From Date" => "Datum od",
@@ -80,9 +80,6 @@
 "Month" => "Mjesec",
 "List" => "Lista",
 "Today" => "Danas",
-"Calendars" => "Kalendari",
-"There was a fail, while parsing the file." => "Pogreška pri čitanju datoteke.",
-"Choose active calendars" => "Odabir aktivnih kalendara",
 "Your calendars" => "Vaši kalendari",
 "CalDav Link" => "CalDav poveznica",
 "Shared calendars" => "Podijeljeni kalendari",
@@ -128,27 +125,19 @@
 "Interval" => "Interval",
 "End" => "Kraj",
 "occurrences" => "pojave",
-"Import a calendar file" => "Uvozite datoteku kalendara",
-"Please choose the calendar" => "Odaberi kalendar",
 "create a new calendar" => "stvori novi kalendar",
+"Import a calendar file" => "Uvozite datoteku kalendara",
 "Name of new calendar" => "Ime novog kalendara",
 "Import" => "Uvoz",
-"Importing calendar" => "Uvoz kalendara",
-"Calendar imported successfully" => "Kalendar je uspješno uvezen",
 "Close Dialog" => "Zatvori dijalog",
 "Create a new event" => "Unesi novi događaj",
 "View an event" => "Vidjeti događaj",
 "No categories selected" => "Nema odabranih kategorija",
-"Select category" => "Odabir kategorije",
 "of" => "od",
 "at" => "na",
 "Timezone" => "Vremenska zona",
-"Check always for changes of the timezone" => "Provjerite uvijek za promjene vremenske zone",
-"Timeformat" => "Format vremena",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Prvi dan tjedna",
-"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara:",
 "Users" => "Korisnici",
 "select users" => "odaberi korisnike",
 "Editable" => "Može se uređivati",
diff --git a/apps/calendar/l10n/hu_HU.php b/apps/calendar/l10n/hu_HU.php
index d97887aac7..3ef4b9675b 100644
--- a/apps/calendar/l10n/hu_HU.php
+++ b/apps/calendar/l10n/hu_HU.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Időzóna megváltozott",
 "Invalid request" => "Érvénytelen kérés",
 "Calendar" => "Naptár",
+"ddd" => "nnn",
+"ddd M/d" => "nnn H/n",
+"dddd M/d" => "nnnn H/n",
+"MMMM yyyy" => "HHHH éééé",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "nnnn, HHH n, éééé",
 "Birthday" => "Születésap",
 "Business" => "Üzlet",
 "Call" => "Hívás",
@@ -23,6 +28,7 @@
 "Questions" => "Kérdések",
 "Work" => "Munka",
 "unnamed" => "névtelen",
+"New Calendar" => "Új naptár",
 "Does not repeat" => "Nem ismétlődik",
 "Daily" => "Napi",
 "Weekly" => "Heti",
@@ -68,7 +74,6 @@
 "Date" => "Dátum",
 "Cal." => "Naptár",
 "All day" => "Egész nap",
-"New Calendar" => "Új naptár",
 "Missing fields" => "Hiányzó mezők",
 "Title" => "Cím",
 "From Date" => "Napjától",
@@ -81,9 +86,6 @@
 "Month" => "Hónap",
 "List" => "Lista",
 "Today" => "Ma",
-"Calendars" => "Naptárak",
-"There was a fail, while parsing the file." => "Probléma volt a fájl elemzése közben.",
-"Choose active calendars" => "Aktív naptár kiválasztása",
 "Your calendars" => "Naptárjaid",
 "CalDav Link" => "CalDAV link",
 "Shared calendars" => "Megosztott naptárak",
@@ -132,27 +134,19 @@
 "Interval" => "Időköz",
 "End" => "Vége",
 "occurrences" => "előfordulások",
-"Import a calendar file" => "Naptár-fájl importálása",
-"Please choose the calendar" => "Válassz naptárat",
 "create a new calendar" => "új naptár létrehozása",
+"Import a calendar file" => "Naptár-fájl importálása",
 "Name of new calendar" => "Új naptár neve",
 "Import" => "Importálás",
-"Importing calendar" => "Naptár importálása",
-"Calendar imported successfully" => "Naptár sikeresen importálva",
 "Close Dialog" => "Párbeszédablak bezárása",
 "Create a new event" => "Új esemény létrehozása",
 "View an event" => "Esemény megtekintése",
 "No categories selected" => "Nincs kiválasztott kategória",
-"Select category" => "Kategória kiválasztása",
 "of" => ", tulaj ",
 "at" => ", ",
 "Timezone" => "Időzóna",
-"Check always for changes of the timezone" => "Mindig ellenőrizze az időzóna-változásokat",
-"Timeformat" => "Időformátum",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "A hét első napja",
-"Calendar CalDAV syncing address:" => "Naptár CalDAV szinkronizálási cím:",
 "Users" => "Felhasználók",
 "select users" => "válassz felhasználókat",
 "Editable" => "Szerkeszthető",
diff --git a/apps/calendar/l10n/ia.php b/apps/calendar/l10n/ia.php
index a346e4de5b..84c36536b9 100644
--- a/apps/calendar/l10n/ia.php
+++ b/apps/calendar/l10n/ia.php
@@ -16,6 +16,7 @@
 "Questions" => "Demandas",
 "Work" => "Travalio",
 "unnamed" => "sin nomine",
+"New Calendar" => "Nove calendario",
 "Does not repeat" => "Non repite",
 "Daily" => "Quotidian",
 "Weekly" => "Septimanal",
@@ -51,7 +52,6 @@
 "by day and month" => "per dia e mense",
 "Date" => "Data",
 "All day" => "Omne die",
-"New Calendar" => "Nove calendario",
 "Missing fields" => "Campos incomplete",
 "Title" => "Titulo",
 "From Date" => "Data de initio",
@@ -62,8 +62,6 @@
 "Month" => "Mense",
 "List" => "Lista",
 "Today" => "Hodie",
-"Calendars" => "Calendarios",
-"Choose active calendars" => "Selectionar calendarios active",
 "Your calendars" => "Tu calendarios",
 "Download" => "Discarga",
 "Edit" => "Modificar",
@@ -96,20 +94,17 @@
 "Select weeks" => "Seliger septimanas",
 "Interval" => "Intervallo",
 "End" => "Fin",
-"Import a calendar file" => "Importar un file de calendario",
-"Please choose the calendar" => "Selige el calendario",
 "create a new calendar" => "crear un nove calendario",
+"Import a calendar file" => "Importar un file de calendario",
 "Name of new calendar" => "Nomine del calendario",
 "Import" => "Importar",
 "Close Dialog" => "Clauder dialogo",
 "Create a new event" => "Crear un nove evento",
 "View an event" => "Vide un evento",
 "No categories selected" => "Nulle categorias seligite",
-"Select category" => "Selectionar categoria",
 "of" => "de",
 "at" => "in",
 "Timezone" => "Fuso horari",
-"First day of the week" => "Prime die del septimana",
 "Users" => "Usatores",
 "Groups" => "Gruppos"
 );
diff --git a/apps/calendar/l10n/id.php b/apps/calendar/l10n/id.php
index ac0734abba..865c2118fa 100644
--- a/apps/calendar/l10n/id.php
+++ b/apps/calendar/l10n/id.php
@@ -14,9 +14,6 @@
 "Week" => "Minggu",
 "Month" => "Bulan",
 "Today" => "Hari ini",
-"Calendars" => "Kalender",
-"There was a fail, while parsing the file." => "Terjadi kesalahan, saat mengurai berkas.",
-"Choose active calendars" => "Pilih kalender aktif",
 "Download" => "Unduh",
 "Edit" => "Sunting",
 "Edit calendar" => "Sunting kalender",
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index 68f3e89dae..6a35e28417 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -112,9 +112,6 @@
 "Month" => "Mese",
 "List" => "Elenco",
 "Today" => "Oggi",
-"Calendars" => "Calendari",
-"There was a fail, while parsing the file." => "Si è verificato un errore durante l'analisi del file.",
-"Choose active calendars" => "Scegli i calendari attivi",
 "Your calendars" => "I tuoi calendari",
 "CalDav Link" => "Collegamento CalDav",
 "Shared calendars" => "Calendari condivisi",
@@ -177,11 +174,8 @@
 "of" => "di",
 "at" => "alle",
 "Timezone" => "Fuso orario",
-"Check always for changes of the timezone" => "Controlla sempre i cambiamenti di fuso orario",
-"Timeformat" => "Formato orario",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primo giorno della settimana",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Cancella gli eventi che si ripetono dalla cache",
 "Calendar CalDAV syncing addresses" => "Indirizzi di sincronizzazione calendari CalDAV",
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index c533a9bd1a..f49aef73d5 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "すべてのカレンダーは完全にキャッシュされていません",
+"Everything seems to be completely cached" => "すべて完全にキャッシュされていると思われます",
 "No calendars found." => "カレンダーが見つかりませんでした。",
 "No events found." => "イベントが見つかりませんでした。",
 "Wrong calendar" => "誤ったカレンダーです",
+"The file contained either no events or all events are already saved in your calendar." => "イベントの無いもしくはすべてのイベントを含むファイルは既にあなたのカレンダーに保存されています。",
+"events has been saved in the new calendar" => "イベントは新しいカレンダーに保存されました",
+"Import failed" => "インポートに失敗",
+"events has been saved in your calendar" => "イベントはあなたのカレンダーに保存されました",
 "New Timezone:" => "新しいタイムゾーン:",
 "Timezone changed" => "タイムゾーンが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Calendar" => "カレンダー",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"ddd" => "dddd",
+"ddd M/d" => "M月d日 （dddd）",
+"dddd M/d" => "M月d日 （dddd）",
+"MMMM yyyy" => "yyyy年M月",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "yyyy年M月d日{ '～' [yyyy年][M月]d日}",
+"dddd, MMM d, yyyy" => "yyyy年M月d日 （dddd）",
 "Birthday" => "誕生日",
 "Business" => "ビジネス",
 "Call" => "電話をかける",
@@ -22,6 +33,8 @@
 "Projects" => "プロジェクト",
 "Questions" => "質問事項",
 "Work" => "週の始まり",
+"unnamed" => "無名",
+"New Calendar" => "新しくカレンダーを作成",
 "Does not repeat" => "繰り返さない",
 "Daily" => "毎日",
 "Weekly" => "毎週",
@@ -34,13 +47,13 @@
 "by date" => "日付で指定",
 "by monthday" => "日にちで指定",
 "by weekday" => "曜日で指定",
-"Monday" => "月曜",
-"Tuesday" => "火曜",
-"Wednesday" => "水曜",
-"Thursday" => "木曜",
-"Friday" => "金曜",
-"Saturday" => "土曜",
-"Sunday" => "日曜",
+"Monday" => "月",
+"Tuesday" => "火",
+"Wednesday" => "水",
+"Thursday" => "木",
+"Friday" => "金",
+"Saturday" => "土",
+"Sunday" => "日",
 "events week of month" => "予定のある週を指定",
 "first" => "１週目",
 "second" => "２週目",
@@ -48,26 +61,44 @@
 "fourth" => "４週目",
 "fifth" => "５週目",
 "last" => "最終週",
-"January" => "１月",
-"February" => "２月",
-"March" => "３月",
-"April" => "４月",
-"May" => "５月",
-"June" => "６月",
-"July" => "７月",
-"August" => "８月",
-"September" => "９月",
-"October" => "１０月",
-"November" => "１１月",
-"December" => "１２月",
+"January" => "1月",
+"February" => "2月",
+"March" => "3月",
+"April" => "4月",
+"May" => "5月",
+"June" => "6月",
+"July" => "7月",
+"August" => "8月",
+"September" => "9月",
+"October" => "10月",
+"November" => "11月",
+"December" => "12月",
 "by events date" => "日付で指定",
 "by yearday(s)" => "日番号で指定",
 "by weeknumber(s)" => "週番号で指定",
 "by day and month" => "月と日で指定",
 "Date" => "日付",
 "Cal." => "カレンダー",
+"Sun." => "日",
+"Mon." => "月",
+"Tue." => "火",
+"Wed." => "水",
+"Thu." => "木",
+"Fri." => "金",
+"Sat." => "土",
+"Jan." => "1月",
+"Feb." => "2月",
+"Mar." => "3月",
+"Apr." => "4月",
+"May." => "5月",
+"Jun." => "6月",
+"Jul." => "7月",
+"Aug." => "8月",
+"Sep." => "9月",
+"Oct." => "10月",
+"Nov." => "11月",
+"Dec." => "12月",
 "All day" => "終日",
-"New Calendar" => "新しくカレンダーを作成",
 "Missing fields" => "項目がありません",
 "Title" => "タイトル",
 "From Date" => "開始日",
@@ -80,9 +111,6 @@
 "Month" => "月",
 "List" => "リスト",
 "Today" => "今日",
-"Calendars" => "カレンダー",
-"There was a fail, while parsing the file." => "ファイルの構文解析に失敗しました。",
-"Choose active calendars" => "アクティブなカレンダーを選択",
 "Your calendars" => "あなたのカレンダー",
 "CalDav Link" => "CalDavへのリンク",
 "Shared calendars" => "共有カレンダー",
@@ -91,6 +119,7 @@
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
+"shared with you by" => "共有者",
 "New calendar" => "新しいカレンダー",
 "Edit calendar" => "カレンダーを編集",
 "Displayname" => "表示名",
@@ -130,27 +159,29 @@
 "Interval" => "間隔",
 "End" => "繰り返す期間",
 "occurrences" => "回繰り返す",
-"Import a calendar file" => "カレンダーファイルをインポート",
-"Please choose the calendar" => "カレンダーを選択してください",
 "create a new calendar" => "新規カレンダーの作成",
+"Import a calendar file" => "カレンダーファイルをインポート",
+"Please choose a calendar" => "カレンダーを選択してください",
 "Name of new calendar" => "新規カレンダーの名称",
+"Take an available name!" => "利用可能な名前を指定してください！",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "このカレンダー名はすでに使われています。もし続行する場合は、これらのカレンダーはマージされます。",
 "Import" => "インポート",
-"Importing calendar" => "カレンダーを取り込み中",
-"Calendar imported successfully" => "カレンダーの取り込みに成功しました",
 "Close Dialog" => "ダイアログを閉じる",
 "Create a new event" => "新しいイベントを作成",
 "View an event" => "イベントを閲覧",
 "No categories selected" => "カテゴリが選択されていません",
-"Select category" => "カテゴリーを選択してください",
 "of" => "of",
 "at" => "at",
 "Timezone" => "タイムゾーン",
-"Check always for changes of the timezone" => "タイムゾーンの変更を常に確認",
-"Timeformat" => "時刻のフォーマット",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "週の始まり",
-"Calendar CalDAV syncing address:" => "CalDAVカレンダーの同期アドレス:",
+"Cache" => "キャッシュ",
+"Clear cache for repeating events" => "イベントを繰り返すためにキャッシュをクリアしてください",
+"Calendar CalDAV syncing addresses" => "CalDAVカレンダーの同期用アドレス",
+"more info" => "さらに",
+"Primary address (Kontact et al)" => "プライマリアドレス（コンタクト等）",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "読み取り専用のiCalendarリンク",
 "Users" => "ユーザ",
 "select users" => "ユーザを選択",
 "Editable" => "編集可能",
diff --git a/apps/calendar/l10n/ko.php b/apps/calendar/l10n/ko.php
index 181bfa4378..77e421d4aa 100644
--- a/apps/calendar/l10n/ko.php
+++ b/apps/calendar/l10n/ko.php
@@ -6,6 +6,12 @@
 "Timezone changed" => "시간대 변경됨",
 "Invalid request" => "잘못된 요청",
 "Calendar" => "달력",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "생일",
 "Business" => "사업",
 "Call" => "통화",
@@ -22,6 +28,7 @@
 "Questions" => "질문",
 "Work" => "작업",
 "unnamed" => "익명의",
+"New Calendar" => "새로운 달력",
 "Does not repeat" => "반복 없음",
 "Daily" => "매일",
 "Weekly" => "매주",
@@ -67,7 +74,6 @@
 "Date" => "날짜",
 "Cal." => "달력",
 "All day" => "매일",
-"New Calendar" => "새로운 달력",
 "Missing fields" => "기입란이 비어있습니다",
 "Title" => "제목",
 "From Date" => "시작날짜",
@@ -80,9 +86,6 @@
 "Month" => "달",
 "List" => "목록",
 "Today" => "오늘",
-"Calendars" => "달력",
-"There was a fail, while parsing the file." => "파일을 처리하는 중 오류가 발생하였습니다.",
-"Choose active calendars" => "활성 달력 선택",
 "Your calendars" => "내 달력",
 "CalDav Link" => "CalDav 링크",
 "Shared calendars" => "공유 달력",
@@ -131,27 +134,19 @@
 "Interval" => "간격",
 "End" => "끝",
 "occurrences" => "번 이후",
-"Import a calendar file" => "달력 파일 가져오기",
-"Please choose the calendar" => "달력을 선택해 주세요",
 "create a new calendar" => "새 달력 만들기",
+"Import a calendar file" => "달력 파일 가져오기",
 "Name of new calendar" => "새 달력 이름",
 "Import" => "입력",
-"Importing calendar" => "달력 입력",
-"Calendar imported successfully" => "달력 입력을 성공적으로 마쳤습니다.",
 "Close Dialog" => "대화 마침",
 "Create a new event" => "새 이벤트 만들기",
 "View an event" => "일정 보기",
 "No categories selected" => "선택된 카테고리 없음",
-"Select category" => "선택 카테고리",
 "of" => "의",
 "at" => "에서",
 "Timezone" => "시간대",
-"Check always for changes of the timezone" => "항상 시간대 변경 확인하기",
-"Timeformat" => "시간 형식 설정",
 "24h" => "24시간",
 "12h" => "12시간",
-"First day of the week" => "그 주의 첫째날",
-"Calendar CalDAV syncing address:" => "달력 CalDav 동기화 주소",
 "Users" => "사용자",
 "select users" => "사용자 선택",
 "Editable" => "편집 가능",
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
index b40f652cc5..1ef05b048c 100644
--- a/apps/calendar/l10n/lb.php
+++ b/apps/calendar/l10n/lb.php
@@ -22,6 +22,7 @@
 "Projects" => "Projeten",
 "Questions" => "Froen",
 "Work" => "Aarbecht",
+"New Calendar" => "Neien Kalenner",
 "Does not repeat" => "Widderhëlt sech net",
 "Daily" => "Deeglech",
 "Weekly" => "All Woch",
@@ -62,7 +63,6 @@
 "Date" => "Datum",
 "Cal." => "Cal.",
 "All day" => "All Dag",
-"New Calendar" => "Neien Kalenner",
 "Missing fields" => "Felder déi feelen",
 "Title" => "Titel",
 "From Date" => "Vun Datum",
@@ -75,9 +75,6 @@
 "Month" => "Mount",
 "List" => "Lescht",
 "Today" => "Haut",
-"Calendars" => "Kalenneren",
-"There was a fail, while parsing the file." => "Feeler beim lueden vum Fichier.",
-"Choose active calendars" => "Wiel aktiv Kalenneren aus",
 "Your calendars" => "Deng Kalenneren",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Gedeelte Kalenneren",
@@ -114,19 +111,13 @@
 "Interval" => "Intervall",
 "End" => "Enn",
 "occurrences" => "Virkommes",
-"Import a calendar file" => "E Kalenner Fichier importéieren",
-"Please choose the calendar" => "Wiel den Kalenner aus",
 "create a new calendar" => "E neie Kalenner uleeën",
+"Import a calendar file" => "E Kalenner Fichier importéieren",
 "Name of new calendar" => "Numm vum neie Kalenner",
 "Import" => "Import",
-"Importing calendar" => "Importéiert Kalenner",
-"Calendar imported successfully" => "Kalenner erfollegräich importéiert",
 "Close Dialog" => "Dialog zoumaachen",
 "Create a new event" => "En Evenement maachen",
-"Select category" => "Kategorie auswielen",
 "Timezone" => "Zäitzon",
-"Timeformat" => "Zäit Format",
 "24h" => "24h",
-"12h" => "12h",
-"Calendar CalDAV syncing address:" => "CalDAV Kalenner Synchronisatioun's Adress:"
+"12h" => "12h"
 );
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
index d7e15fb438..feb8618897 100644
--- a/apps/calendar/l10n/lt_LT.php
+++ b/apps/calendar/l10n/lt_LT.php
@@ -23,6 +23,7 @@
 "Questions" => "Klausimai",
 "Work" => "Darbas",
 "unnamed" => "be pavadinimo",
+"New Calendar" => "Naujas kalendorius",
 "Does not repeat" => "Nekartoti",
 "Daily" => "Kasdien",
 "Weekly" => "Kiekvieną savaitę",
@@ -56,7 +57,6 @@
 "Date" => "Data",
 "Cal." => "Kal.",
 "All day" => "Visa diena",
-"New Calendar" => "Naujas kalendorius",
 "Missing fields" => "Trūkstami laukai",
 "Title" => "Pavadinimas",
 "From Date" => "Nuo datos",
@@ -69,9 +69,6 @@
 "Month" => "Mėnuo",
 "List" => "Sąrašas",
 "Today" => "Šiandien",
-"Calendars" => "Kalendoriai",
-"There was a fail, while parsing the file." => "Apdorojant failą įvyko klaida.",
-"Choose active calendars" => "Pasirinkite naudojamus kalendorius",
 "Your calendars" => "Jūsų kalendoriai",
 "CalDav Link" => "CalDav adresas",
 "Shared calendars" => "Bendri kalendoriai",
@@ -92,6 +89,7 @@
 "Export" => "Eksportuoti",
 "Eventinfo" => "Informacija",
 "Repeating" => "Pasikartojantis",
+"Alarm" => "Priminimas",
 "Attendees" => "Dalyviai",
 "Share" => "Dalintis",
 "Title of the Event" => "Įvykio pavadinimas",
@@ -113,24 +111,17 @@
 "Select weeks" => "Pasirinkite savaites",
 "Interval" => "Intervalas",
 "End" => "Pabaiga",
-"Import a calendar file" => "Importuoti kalendoriaus failą",
-"Please choose the calendar" => "Pasirinkite kalendorių",
 "create a new calendar" => "sukurti naują kalendorių",
+"Import a calendar file" => "Importuoti kalendoriaus failą",
 "Name of new calendar" => "Naujo kalendoriaus pavadinimas",
 "Import" => "Importuoti",
-"Importing calendar" => "Importuojamas kalendorius",
-"Calendar imported successfully" => "Kalendorius sėkmingai importuotas",
 "Close Dialog" => "Uždaryti",
 "Create a new event" => "Sukurti naują įvykį",
 "View an event" => "Peržiūrėti įvykį",
 "No categories selected" => "Nepasirinktos jokios katagorijos",
-"Select category" => "Pasirinkite kategoriją",
 "Timezone" => "Laiko juosta",
-"Check always for changes of the timezone" => "Visada tikrinti laiko zonos pasikeitimus",
-"Timeformat" => "Laiko formatas",
 "24h" => "24val",
 "12h" => "12val",
-"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:",
 "Users" => "Vartotojai",
 "select users" => "pasirinkti vartotojus",
 "Editable" => "Redaguojamas",
diff --git a/apps/calendar/l10n/mk.php b/apps/calendar/l10n/mk.php
index 41df376dfa..1a03101fe5 100644
--- a/apps/calendar/l10n/mk.php
+++ b/apps/calendar/l10n/mk.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Временската зона е променета",
 "Invalid request" => "Неправилно барање",
 "Calendar" => "Календар",
+"ddd" => "ддд",
+"ddd M/d" => "ддд М/д",
+"dddd M/d" => "дддд М/д",
+"MMMM yyyy" => "ММММ гггг",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
 "Birthday" => "Роденден",
 "Business" => "Деловно",
 "Call" => "Повикај",
@@ -23,6 +28,7 @@
 "Questions" => "Прашања",
 "Work" => "Работа",
 "unnamed" => "неименувано",
+"New Calendar" => "Нов календар",
 "Does not repeat" => "Не се повторува",
 "Daily" => "Дневно",
 "Weekly" => "Седмично",
@@ -68,7 +74,6 @@
 "Date" => "Датум",
 "Cal." => "Кал.",
 "All day" => "Цел ден",
-"New Calendar" => "Нов календар",
 "Missing fields" => "Полиња кои недостасуваат",
 "Title" => "Наслов",
 "From Date" => "Од датум",
@@ -81,9 +86,6 @@
 "Month" => "Месец",
 "List" => "Листа",
 "Today" => "Денеска",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "Имаше проблем при парсирање на датотеката.",
-"Choose active calendars" => "Избери активни календари",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Врска за CalDav",
 "Shared calendars" => "Споделени календари",
@@ -132,27 +134,19 @@
 "Interval" => "интервал",
 "End" => "Крај",
 "occurrences" => "повторувања",
-"Import a calendar file" => "Внеси календар од датотека ",
-"Please choose the calendar" => "Ве молам изберете го календарот",
 "create a new calendar" => "создади нов календар",
+"Import a calendar file" => "Внеси календар од датотека ",
 "Name of new calendar" => "Име на новиот календар",
 "Import" => "Увези",
-"Importing calendar" => "Увезување на календар",
-"Calendar imported successfully" => "Календарот беше успешно увезен",
 "Close Dialog" => "Затвори дијалог",
 "Create a new event" => "Создади нов настан",
 "View an event" => "Погледај настан",
 "No categories selected" => "Нема избрано категории",
-"Select category" => "Избери категорија",
 "of" => "од",
 "at" => "на",
 "Timezone" => "Временска зона",
-"Check always for changes of the timezone" => "Секогаш провери за промени на временската зона",
-"Timeformat" => "Формат на времето",
 "24h" => "24ч",
 "12h" => "12ч",
-"First day of the week" => "Прв ден од седмицата",
-"Calendar CalDAV syncing address:" => "CalDAV календар адресата за синхронизација:",
 "Users" => "Корисници",
 "select users" => "избери корисници",
 "Editable" => "Изменливо",
diff --git a/apps/calendar/l10n/ms_MY.php b/apps/calendar/l10n/ms_MY.php
index 2cb3ac41c3..4be91a4019 100644
--- a/apps/calendar/l10n/ms_MY.php
+++ b/apps/calendar/l10n/ms_MY.php
@@ -1,9 +1,17 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Tiada kalendar dijumpai.",
+"No events found." => "Tiada agenda dijumpai.",
 "Wrong calendar" => "Silap kalendar",
 "New Timezone:" => "Timezone Baru",
 "Timezone changed" => "Zon waktu diubah",
 "Invalid request" => "Permintaan tidak sah",
 "Calendar" => "Kalendar",
+"ddd" => "ddd",
+"ddd M/d" => "dd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyy",
 "Birthday" => "Hari lahir",
 "Business" => "Perniagaan",
 "Call" => "Panggilan",
@@ -19,6 +27,8 @@
 "Projects" => "Projek",
 "Questions" => "Soalan",
 "Work" => "Kerja",
+"unnamed" => "tiada nama",
+"New Calendar" => "Kalendar baru",
 "Does not repeat" => "Tidak berulang",
 "Daily" => "Harian",
 "Weekly" => "Mingguan",
@@ -64,7 +74,6 @@
 "Date" => "Tarikh",
 "Cal." => "Kalendar",
 "All day" => "Sepanjang hari",
-"New Calendar" => "Kalendar baru",
 "Missing fields" => "Ruangan tertinggal",
 "Title" => "Tajuk",
 "From Date" => "Dari tarikh",
@@ -77,13 +86,15 @@
 "Month" => "Bulan",
 "List" => "Senarai",
 "Today" => "Hari ini",
-"Calendars" => "Kalendar",
-"There was a fail, while parsing the file." => "Berlaku kegagalan ketika penguraian fail. ",
-"Choose active calendars" => "Pilih kalendar yang aktif",
+"Your calendars" => "Kalendar anda",
 "CalDav Link" => "Pautan CalDav",
+"Shared calendars" => "Kalendar Kongsian",
+"No shared calendars" => "Tiada kalendar kongsian",
+"Share Calendar" => "Kongsi Kalendar",
 "Download" => "Muat turun",
 "Edit" => "Edit",
 "Delete" => "Hapus",
+"shared with you by" => "dikongsi dengan kamu oleh",
 "New calendar" => "Kalendar baru",
 "Edit calendar" => "Edit kalendar",
 "Displayname" => "Paparan nama",
@@ -94,8 +105,15 @@
 "Cancel" => "Batal",
 "Edit an event" => "Edit agenda",
 "Export" => "Export",
+"Eventinfo" => "Maklumat agenda",
+"Repeating" => "Pengulangan",
+"Alarm" => "Penggera",
+"Attendees" => "Jemputan",
+"Share" => "Berkongsi",
 "Title of the Event" => "Tajuk agenda",
 "Category" => "kategori",
+"Separate categories with commas" => "Asingkan kategori dengan koma",
+"Edit categories" => "Sunting Kategori",
 "All Day Event" => "Agenda di sepanjang hari ",
 "From" => "Dari",
 "To" => "ke",
@@ -116,20 +134,23 @@
 "Interval" => "Tempoh",
 "End" => "Tamat",
 "occurrences" => "Peristiwa",
-"Import a calendar file" => "Import fail kalendar",
-"Please choose the calendar" => "Sila pilih kalendar",
 "create a new calendar" => "Cipta kalendar baru",
+"Import a calendar file" => "Import fail kalendar",
 "Name of new calendar" => "Nama kalendar baru",
 "Import" => "Import",
-"Importing calendar" => "Import kalendar",
-"Calendar imported successfully" => "Kalendar berjaya diimport",
 "Close Dialog" => "Tutup dialog",
 "Create a new event" => "Buat agenda baru",
-"Select category" => "Pilih kategori",
+"View an event" => "Papar peristiwa",
+"No categories selected" => "Tiada kategori dipilih",
+"of" => "dari",
+"at" => "di",
 "Timezone" => "Zon waktu",
-"Check always for changes of the timezone" => "Sentiasa mengemaskini perubahan zon masa",
-"Timeformat" => "Timeformat",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Kelendar CalDAV mengemaskini alamat:"
+"Users" => "Pengguna",
+"select users" => "Pilih pengguna",
+"Editable" => "Boleh disunting",
+"Groups" => "Kumpulan-kumpulan",
+"select groups" => "pilih kumpulan-kumpulan",
+"make public" => "jadikan tontonan awam"
 );
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
index 95ba5a9dba..e4b859c737 100644
--- a/apps/calendar/l10n/nb_NO.php
+++ b/apps/calendar/l10n/nb_NO.php
@@ -8,6 +8,7 @@
 "Calendar" => "Kalender",
 "Birthday" => "Bursdag",
 "Business" => "Forretninger",
+"Call" => "Ring",
 "Clients" => "Kunder",
 "Holidays" => "Ferie",
 "Ideas" => "Ideér",
@@ -20,6 +21,7 @@
 "Questions" => "Spørsmål",
 "Work" => "Arbeid",
 "unnamed" => "uten navn",
+"New Calendar" => "Ny kalender",
 "Does not repeat" => "Gjentas ikke",
 "Daily" => "Daglig",
 "Weekly" => "Ukentlig",
@@ -65,7 +67,6 @@
 "Date" => "Dato",
 "Cal." => "Kal.",
 "All day" => "Hele dagen ",
-"New Calendar" => "Ny kalender",
 "Missing fields" => "Manglende felt",
 "Title" => "Tittel",
 "From Date" => "Fra dato",
@@ -78,9 +79,6 @@
 "Month" => "ned",
 "List" => "Liste",
 "Today" => "I dag",
-"Calendars" => "Kalendre",
-"There was a fail, while parsing the file." => "Det oppstod en feil under åpningen av filen.",
-"Choose active calendars" => "Velg en aktiv kalender",
 "Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-lenke",
 "Shared calendars" => "Delte kalendere",
@@ -129,25 +127,17 @@
 "Interval" => "Intervall",
 "End" => "Slutt",
 "occurrences" => "forekomster",
-"Import a calendar file" => "Importer en kalenderfil",
-"Please choose the calendar" => "Vennligst velg kalenderen",
 "create a new calendar" => "Lag en ny kalender",
+"Import a calendar file" => "Importer en kalenderfil",
 "Name of new calendar" => "Navn på ny kalender:",
 "Import" => "Importer",
-"Importing calendar" => "Importerer kalender",
-"Calendar imported successfully" => "Kalenderen ble importert uten feil",
 "Close Dialog" => "Lukk dialog",
 "Create a new event" => "Opprett en ny hendelse",
 "View an event" => "Se på hendelse",
 "No categories selected" => "Ingen kategorier valgt",
-"Select category" => "Velg kategori",
 "Timezone" => "Tidssone",
-"Check always for changes of the timezone" => "Se alltid etter endringer i tidssone",
-"Timeformat" => "Tidsformat:",
 "24h" => "24 t",
 "12h" => "12 t",
-"First day of the week" => "Ukens første dag",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadresse fo kalender CalDAV:",
 "Users" => "Brukere",
 "select users" => "valgte brukere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index d141a1cc08..834c0ad905 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Tijdzone is veranderd",
 "Invalid request" => "Ongeldige aanvraag",
 "Calendar" => "Kalender",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;' d[ MMM] yyyy}",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d.M",
+"dddd M/d" => "dddd d.M",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d[ MMM][ yyyy]{ '&#8212;' d MMM yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d. MMM yyyy",
 "Birthday" => "Verjaardag",
 "Business" => "Zakelijk",
 "Call" => "Bellen",
@@ -23,6 +28,7 @@
 "Questions" => "Vragen",
 "Work" => "Werk",
 "unnamed" => "onbekend",
+"New Calendar" => "Nieuwe Kalender",
 "Does not repeat" => "Wordt niet herhaald",
 "Daily" => "Dagelijks",
 "Weekly" => "Wekelijks",
@@ -68,7 +74,6 @@
 "Date" => "Datum",
 "Cal." => "Cal.",
 "All day" => "Hele dag",
-"New Calendar" => "Nieuwe Kalender",
 "Missing fields" => "missende velden",
 "Title" => "Titel",
 "From Date" => "Begindatum",
@@ -81,9 +86,6 @@
 "Month" => "Maand",
 "List" => "Lijst",
 "Today" => "Vandaag",
-"Calendars" => "Kalenders",
-"There was a fail, while parsing the file." => "Er is een fout opgetreden bij het verwerken van het bestand.",
-"Choose active calendars" => "Kies actieve kalenders",
 "Your calendars" => "Je kalenders",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Gedeelde kalenders",
@@ -132,27 +134,19 @@
 "Interval" => "Interval",
 "End" => "Einde",
 "occurrences" => "gebeurtenissen",
-"Import a calendar file" => "Importeer een agenda bestand",
-"Please choose the calendar" => "Kies de kalender",
 "create a new calendar" => "Maak een nieuw agenda",
+"Import a calendar file" => "Importeer een agenda bestand",
 "Name of new calendar" => "Naam van de nieuwe agenda",
 "Import" => "Importeer",
-"Importing calendar" => "Importeer agenda",
-"Calendar imported successfully" => "Agenda succesvol geïmporteerd",
 "Close Dialog" => "Sluit venster",
 "Create a new event" => "Maak een nieuwe afspraak",
 "View an event" => "Bekijk een gebeurtenis",
 "No categories selected" => "Geen categorieën geselecteerd",
-"Select category" => "Kies een categorie",
 "of" => "van",
 "at" => "op",
 "Timezone" => "Tijdzone",
-"Check always for changes of the timezone" => "Controleer altijd op aanpassingen van de tijdszone",
-"Timeformat" => "Tijdformaat",
 "24h" => "24uur",
 "12h" => "12uur",
-"First day of the week" => "Eerste dag van de week",
-"Calendar CalDAV syncing address:" => "CalDAV kalender synchronisatie adres:",
 "Users" => "Gebruikers",
 "select users" => "kies gebruikers",
 "Editable" => "Te wijzigen",
diff --git a/apps/calendar/l10n/nn_NO.php b/apps/calendar/l10n/nn_NO.php
index 79119e8100..3330cc562b 100644
--- a/apps/calendar/l10n/nn_NO.php
+++ b/apps/calendar/l10n/nn_NO.php
@@ -19,6 +19,7 @@
 "Projects" => "Prosjekt",
 "Questions" => "Spørsmål",
 "Work" => "Arbeid",
+"New Calendar" => "Ny kalender",
 "Does not repeat" => "Ikkje gjenta",
 "Daily" => "Kvar dag",
 "Weekly" => "Kvar veke",
@@ -64,7 +65,6 @@
 "Date" => "Dato",
 "Cal." => "Kal.",
 "All day" => "Heile dagen",
-"New Calendar" => "Ny kalender",
 "Missing fields" => "Manglande felt",
 "Title" => "Tittel",
 "From Date" => "Frå dato",
@@ -77,9 +77,6 @@
 "Month" => "Månad",
 "List" => "Liste",
 "Today" => "I dag",
-"Calendars" => "Kalendarar",
-"There was a fail, while parsing the file." => "Feil ved tolking av fila.",
-"Choose active calendars" => "Vel aktive kalendarar",
 "CalDav Link" => "CalDav-lenkje",
 "Download" => "Last ned",
 "Edit" => "Endra",
@@ -116,20 +113,13 @@
 "Interval" => "Intervall",
 "End" => "Ende",
 "occurrences" => "førekomstar",
-"Import a calendar file" => "Importer ei kalenderfil",
-"Please choose the calendar" => "Venlegast vel kalenderen",
 "create a new calendar" => "Lag ny kalender",
+"Import a calendar file" => "Importer ei kalenderfil",
 "Name of new calendar" => "Namn for ny kalender",
 "Import" => "Importer",
-"Importing calendar" => "Importerar kalender",
-"Calendar imported successfully" => "Kalender importert utan feil",
 "Close Dialog" => "Steng dialog",
 "Create a new event" => "Opprett ei ny hending",
-"Select category" => "Vel kategori",
 "Timezone" => "Tidssone",
-"Check always for changes of the timezone" => "Sjekk alltid for endringar i tidssona",
-"Timeformat" => "Tidsformat",
 "24h" => "24t",
-"12h" => "12t",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV synkroniseringsadresse:"
+"12h" => "12t"
 );
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
index e582cdbb9b..8fd1c3c2b4 100644
--- a/apps/calendar/l10n/pl.php
+++ b/apps/calendar/l10n/pl.php
@@ -2,11 +2,18 @@
 "No calendars found." => "Brak kalendarzy",
 "No events found." => "Brak wydzarzeń",
 "Wrong calendar" => "Nieprawidłowy kalendarz",
+"Import failed" => "Import nieudany",
+"events has been saved in your calendar" => "zdarzenie zostało zapisane w twoim kalendarzu",
 "New Timezone:" => "Nowa strefa czasowa:",
 "Timezone changed" => "Zmieniono strefę czasową",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Calendar" => "Kalendarz",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM rrrr",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
 "Birthday" => "Urodziny",
 "Business" => "Interesy",
 "Call" => "Rozmowy",
@@ -22,7 +29,9 @@
 "Projects" => "Projekty",
 "Questions" => "Pytania",
 "Work" => "Zawodowe",
+"by" => "przez",
 "unnamed" => "nienazwany",
+"New Calendar" => "Nowy kalendarz",
 "Does not repeat" => "Brak",
 "Daily" => "Codziennie",
 "Weekly" => "Tygodniowo",
@@ -67,8 +76,26 @@
 "by day and month" => "przez dzień i miesiąc",
 "Date" => "Data",
 "Cal." => "Kal.",
+"Sun." => "N.",
+"Mon." => "Pn.",
+"Tue." => "Wt.",
+"Wed." => "Śr.",
+"Thu." => "Cz.",
+"Fri." => "Pt.",
+"Sat." => "S.",
+"Jan." => "Sty.",
+"Feb." => "Lut.",
+"Mar." => "Mar.",
+"Apr." => "Kwi.",
+"May." => "Maj.",
+"Jun." => "Cze.",
+"Jul." => "Lip.",
+"Aug." => "Sie.",
+"Sep." => "Wrz.",
+"Oct." => "Paź.",
+"Nov." => "Lis.",
+"Dec." => "Gru.",
 "All day" => "Cały dzień",
-"New Calendar" => "Nowy kalendarz",
 "Missing fields" => "Brakujące pola",
 "Title" => "Nazwa",
 "From Date" => "Od daty",
@@ -81,9 +108,6 @@
 "Month" => "Miesiąc",
 "List" => "Lista",
 "Today" => "Dzisiaj",
-"Calendars" => "Kalendarze",
-"There was a fail, while parsing the file." => "Nie udało się przetworzyć pliku.",
-"Choose active calendars" => "Wybór aktywnych kalendarzy",
 "Your calendars" => "Twoje kalendarze",
 "CalDav Link" => "Wyświetla odnośnik CalDAV",
 "Shared calendars" => "Współdzielone kalendarze",
@@ -132,27 +156,23 @@
 "Interval" => "Interwał",
 "End" => "Koniec",
 "occurrences" => "wystąpienia",
-"Import a calendar file" => "Zaimportuj plik kalendarza",
-"Please choose the calendar" => "Proszę wybrać kalendarz",
 "create a new calendar" => "stwórz nowy kalendarz",
+"Import a calendar file" => "Zaimportuj plik kalendarza",
+"Please choose a calendar" => "Proszę wybierz kalendarz",
 "Name of new calendar" => "Nazwa kalendarza",
 "Import" => "Import",
-"Importing calendar" => "Importuje kalendarz",
-"Calendar imported successfully" => "Zaimportowano kalendarz",
 "Close Dialog" => "Zamknij okno",
 "Create a new event" => "Tworzenie nowego wydarzenia",
 "View an event" => "Zobacz wydarzenie",
 "No categories selected" => "nie zaznaczono kategorii",
-"Select category" => "Wybierz kategorię",
 "of" => "z",
 "at" => "w",
 "Timezone" => "Strefa czasowa",
-"Check always for changes of the timezone" => "Zawsze sprawdzaj zmiany strefy czasowej",
-"Timeformat" => "Format czasu",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Pierwszy dzień tygodnia",
-"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:",
+"more info" => "więcej informacji",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Odczytać tylko linki iCalendar",
 "Users" => "Użytkownicy",
 "select users" => "wybierz użytkowników",
 "Editable" => "Edytowalne",
diff --git a/apps/calendar/l10n/pt_BR.php b/apps/calendar/l10n/pt_BR.php
index 95317eea0f..b636c19bfe 100644
--- a/apps/calendar/l10n/pt_BR.php
+++ b/apps/calendar/l10n/pt_BR.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Fuso horário alterado",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Aniversário",
 "Business" => "Negócio",
 "Call" => "Chamada",
@@ -23,6 +28,7 @@
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
 "unnamed" => "sem nome",
+"New Calendar" => "Novo Calendário",
 "Does not repeat" => "Não repetir",
 "Daily" => "Diariamente",
 "Weekly" => "Semanal",
@@ -68,7 +74,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
-"New Calendar" => "Novo Calendário",
 "Missing fields" => "Campos incompletos",
 "Title" => "Título",
 "From Date" => "Desde a Data",
@@ -81,9 +86,6 @@
 "Month" => "Mês",
 "List" => "Lista",
 "Today" => "Hoje",
-"Calendars" => "Calendários",
-"There was a fail, while parsing the file." => "Houve uma falha, ao analisar o arquivo.",
-"Choose active calendars" => "Escolha calendários ativos",
 "Your calendars" => "Meus Calendários",
 "CalDav Link" => "Link para CalDav",
 "Shared calendars" => "Calendários Compartilhados",
@@ -132,27 +134,19 @@
 "Interval" => "Intervalo",
 "End" => "Final",
 "occurrences" => "ocorrências",
-"Import a calendar file" => "Importar um arquivo de calendário",
-"Please choose the calendar" => "Por favor, escolha o calendário",
 "create a new calendar" => "criar um novo calendário",
+"Import a calendar file" => "Importar um arquivo de calendário",
 "Name of new calendar" => "Nome do novo calendário",
 "Import" => "Importar",
-"Importing calendar" => "Importar calendário",
-"Calendar imported successfully" => "Calendário importado com sucesso",
 "Close Dialog" => "Fechar caixa de diálogo",
 "Create a new event" => "Criar um novo evento",
 "View an event" => "Visualizar evento",
 "No categories selected" => "Nenhuma categoria selecionada",
-"Select category" => "Selecionar categoria",
 "of" => "de",
 "at" => "para",
 "Timezone" => "Fuso horário",
-"Check always for changes of the timezone" => "Verificar sempre mudanças no fuso horário",
-"Timeformat" => "Formato da Hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primeiro dia da semana",
-"Calendar CalDAV syncing address:" => "Sincronização de endereço do calendário CalDAV :",
 "Users" => "Usuários",
 "select users" => "Selecione usuários",
 "Editable" => "Editável",
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
index 33f85569cc..cf816d8b34 100644
--- a/apps/calendar/l10n/pt_PT.php
+++ b/apps/calendar/l10n/pt_PT.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Zona horária alterada",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM aaaa",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, aaaa",
 "Birthday" => "Dia de anos",
 "Business" => "Negócio",
 "Call" => "Telefonar",
@@ -23,6 +28,7 @@
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
 "unnamed" => "não definido",
+"New Calendar" => "Novo calendário",
 "Does not repeat" => "Não repete",
 "Daily" => "Diário",
 "Weekly" => "Semanal",
@@ -68,7 +74,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
-"New Calendar" => "Novo calendário",
 "Missing fields" => "Falta campos",
 "Title" => "Título",
 "From Date" => "Da data",
@@ -81,9 +86,6 @@
 "Month" => "Mês",
 "List" => "Lista",
 "Today" => "Hoje",
-"Calendars" => "Calendários",
-"There was a fail, while parsing the file." => "Houve uma falha durante a análise do ficheiro",
-"Choose active calendars" => "Escolhe calendários ativos",
 "Your calendars" => "Os seus calendários",
 "CalDav Link" => "Endereço CalDav",
 "Shared calendars" => "Calendários partilhados",
@@ -132,27 +134,19 @@
 "Interval" => "Intervalo",
 "End" => "Fim",
 "occurrences" => "ocorrências",
-"Import a calendar file" => "Importar um ficheiro de calendário",
-"Please choose the calendar" => "Por favor escolhe o calendário",
 "create a new calendar" => "criar novo calendário",
+"Import a calendar file" => "Importar um ficheiro de calendário",
 "Name of new calendar" => "Nome do novo calendário",
 "Import" => "Importar",
-"Importing calendar" => "A importar calendário",
-"Calendar imported successfully" => "Calendário importado com sucesso",
 "Close Dialog" => "Fechar diálogo",
 "Create a new event" => "Criar novo evento",
 "View an event" => "Ver um evento",
 "No categories selected" => "Nenhuma categoria seleccionada",
-"Select category" => "Selecionar categoria",
 "of" => "de",
 "at" => "em",
 "Timezone" => "Zona horária",
-"Check always for changes of the timezone" => "Verificar sempre por alterações na zona horária",
-"Timeformat" => "Formato da hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primeiro dia da semana",
-"Calendar CalDAV syncing address:" => "Endereço de sincronização CalDav do calendário",
 "Users" => "Utilizadores",
 "select users" => "Selecione utilizadores",
 "Editable" => "Editavel",
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index 550afcd102..528d9ae108 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -23,6 +23,7 @@
 "Questions" => "Întrebări",
 "Work" => "Servici",
 "unnamed" => "fără nume",
+"New Calendar" => "Calendar nou",
 "Does not repeat" => "Nerepetabil",
 "Daily" => "Zilnic",
 "Weekly" => "Săptămânal",
@@ -68,7 +69,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Toată ziua",
-"New Calendar" => "Calendar nou",
 "Missing fields" => "Câmpuri lipsă",
 "Title" => "Titlu",
 "From Date" => "Începând cu",
@@ -81,9 +81,6 @@
 "Month" => "Luna",
 "List" => "Listă",
 "Today" => "Astăzi",
-"Calendars" => "Calendare",
-"There was a fail, while parsing the file." => "A fost întâmpinată o eroare în procesarea fișierului",
-"Choose active calendars" => "Alege calendarele active",
 "Your calendars" => "Calendarele tale",
 "CalDav Link" => "Legătură CalDav",
 "Shared calendars" => "Calendare partajate",
@@ -132,27 +129,19 @@
 "Interval" => "Interval",
 "End" => "Sfârșit",
 "occurrences" => "repetiții",
-"Import a calendar file" => "Importă un calendar",
-"Please choose the calendar" => "Alegeți calendarul",
 "create a new calendar" => "crează un calendar nou",
+"Import a calendar file" => "Importă un calendar",
 "Name of new calendar" => "Numele noului calendar",
 "Import" => "Importă",
-"Importing calendar" => "Importă calendar",
-"Calendar imported successfully" => "Calendarul a fost importat cu succes",
 "Close Dialog" => "Închide",
 "Create a new event" => "Crează un eveniment nou",
 "View an event" => "Vizualizează un eveniment",
 "No categories selected" => "Nici o categorie selectată",
-"Select category" => "Selecteză categoria",
 "of" => "din",
 "at" => "la",
 "Timezone" => "Fus orar",
-"Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
-"Timeformat" => "Forma de afișare a orei",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Prima zi a săptămînii",
-"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV",
 "Users" => "Utilizatori",
 "select users" => "utilizatori selectați",
 "Editable" => "Editabil",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 934e2c4840..9c27d367da 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -111,9 +111,6 @@
 "Month" => "Месяц",
 "List" => "Список",
 "Today" => "Сегодня",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "Не удалось обработать файл.",
-"Choose active calendars" => "Выберите активные календари",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
 "Shared calendars" => "Общие календари",
@@ -174,11 +171,8 @@
 "of" => "из",
 "at" => "на",
 "Timezone" => "Часовой пояс",
-"Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
-"Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
-"First day of the week" => "Первый день недели",
 "more info" => "подробнее",
 "Users" => "Пользователи",
 "select users" => "выбрать пользователей",
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
index e182a9d3ea..65400c496d 100644
--- a/apps/calendar/l10n/sk_SK.php
+++ b/apps/calendar/l10n/sk_SK.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Časové pásmo zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Calendar" => "Kalendár",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM rrrr",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
 "Birthday" => "Narodeniny",
 "Business" => "Podnikanie",
 "Call" => "Hovor",
@@ -23,6 +28,7 @@
 "Questions" => "Otázky",
 "Work" => "Práca",
 "unnamed" => "nepomenovaný",
+"New Calendar" => "Nový kalendár",
 "Does not repeat" => "Neopakovať",
 "Daily" => "Denne",
 "Weekly" => "Týždenne",
@@ -68,7 +74,6 @@
 "Date" => "Dátum",
 "Cal." => "Kal.",
 "All day" => "Celý deň",
-"New Calendar" => "Nový kalendár",
 "Missing fields" => "Nevyplnené položky",
 "Title" => "Nadpis",
 "From Date" => "Od dátumu",
@@ -81,9 +86,6 @@
 "Month" => "Mesiac",
 "List" => "Zoznam",
 "Today" => "Dnes",
-"Calendars" => "Kalendáre",
-"There was a fail, while parsing the file." => "Nastala chyba počas parsovania súboru.",
-"Choose active calendars" => "Zvoľte aktívne kalendáre",
 "Your calendars" => "Vaše kalendáre",
 "CalDav Link" => "CalDav odkaz",
 "Shared calendars" => "Zdielané kalendáre",
@@ -132,27 +134,19 @@
 "Interval" => "Interval",
 "End" => "Koniec",
 "occurrences" => "výskyty",
-"Import a calendar file" => "Importovať súbor kalendára",
-"Please choose the calendar" => "Prosím zvoľte kalendár",
 "create a new calendar" => "vytvoriť nový kalendár",
+"Import a calendar file" => "Importovať súbor kalendára",
 "Name of new calendar" => "Meno nového kalendára",
 "Import" => "Importovať",
-"Importing calendar" => "Importujem kalendár",
-"Calendar imported successfully" => "Kalendár úspešne importovaný",
 "Close Dialog" => "Zatvoriť dialóg",
 "Create a new event" => "Vytvoriť udalosť",
 "View an event" => "Zobraziť udalosť",
 "No categories selected" => "Žiadne vybraté kategórie",
-"Select category" => "Vybrať kategóriu",
 "of" => "z",
 "at" => "v",
 "Timezone" => "Časová zóna",
-"Check always for changes of the timezone" => "Vždy kontroluj zmeny časového pásma",
-"Timeformat" => "Formát času",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Prvý deň v týždni",
-"Calendar CalDAV syncing address:" => "Synchronizačná adresa kalendára CalDAV: ",
 "Users" => "Používatelia",
 "select users" => "vybrať používateľov",
 "Editable" => "Upravovateľné",
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
index 3bf03ede12..7a488751c4 100644
--- a/apps/calendar/l10n/sl.php
+++ b/apps/calendar/l10n/sl.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Časovni pas je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
 "Calendar" => "Koledar",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Rojstni dan",
 "Business" => "Poslovno",
 "Call" => "Pokliči",
@@ -23,6 +28,7 @@
 "Questions" => "Vprašanja",
 "Work" => "Delo",
 "unnamed" => "neimenovan",
+"New Calendar" => "Nov koledar",
 "Does not repeat" => "Se ne ponavlja",
 "Daily" => "Dnevno",
 "Weekly" => "Tedensko",
@@ -68,7 +74,6 @@
 "Date" => "Datum",
 "Cal." => "Kol.",
 "All day" => "Cel dan",
-"New Calendar" => "Nov koledar",
 "Missing fields" => "Mankajoča polja",
 "Title" => "Naslov",
 "From Date" => "od Datum",
@@ -81,9 +86,6 @@
 "Month" => "Mesec",
 "List" => "Seznam",
 "Today" => "Danes",
-"Calendars" => "Koledarji",
-"There was a fail, while parsing the file." => "Pri razčlenjevanju datoteke je prišlo do napake.",
-"Choose active calendars" => "Izberite aktivne koledarje",
 "Your calendars" => "Vaši koledarji",
 "CalDav Link" => "CalDav povezava",
 "Shared calendars" => "Koledarji v souporabi",
@@ -132,27 +134,19 @@
 "Interval" => "Časovni razmik",
 "End" => "Konec",
 "occurrences" => "ponovitev",
-"Import a calendar file" => "Uvozi datoteko koledarja",
-"Please choose the calendar" => "Izberi koledar",
 "create a new calendar" => "Ustvari nov koledar",
+"Import a calendar file" => "Uvozi datoteko koledarja",
 "Name of new calendar" => "Ime novega koledarja",
 "Import" => "Uvozi",
-"Importing calendar" => "Uvažam koledar",
-"Calendar imported successfully" => "Koledar je bil uspešno uvožen",
 "Close Dialog" => "Zapri dialog",
 "Create a new event" => "Ustvari nov dogodek",
 "View an event" => "Poglej dogodek",
 "No categories selected" => "Nobena kategorija ni izbrana",
-"Select category" => "Izberi kategorijo",
 "of" => "od",
 "at" => "pri",
 "Timezone" => "Časovni pas",
-"Check always for changes of the timezone" => "Vedno preveri za spremembe časovnega pasu",
-"Timeformat" => "Zapis časa",
 "24h" => "24ur",
 "12h" => "12ur",
-"First day of the week" => "Prvi dan v tednu",
-"Calendar CalDAV syncing address:" => "CalDAV sinhronizacijski naslov koledarja:",
 "Users" => "Uporabniki",
 "select users" => "izberite uporabnike",
 "Editable" => "Možno urejanje",
diff --git a/apps/calendar/l10n/sr.php b/apps/calendar/l10n/sr.php
index 5798c66e0a..4ec60e20cb 100644
--- a/apps/calendar/l10n/sr.php
+++ b/apps/calendar/l10n/sr.php
@@ -18,6 +18,7 @@
 "Projects" => "Пројекти",
 "Questions" => "Питања",
 "Work" => "Посао",
+"New Calendar" => "Нови календар",
 "Does not repeat" => "Не понавља се",
 "Daily" => "дневно",
 "Weekly" => "недељно",
@@ -26,15 +27,11 @@
 "Monthly" => "месечно",
 "Yearly" => "годишње",
 "All day" => "Цео дан",
-"New Calendar" => "Нови календар",
 "Title" => "Наслов",
 "Week" => "Недеља",
 "Month" => "Месец",
 "List" => "Списак",
 "Today" => "Данас",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "дошло је до грешке при расчлањивању фајла.",
-"Choose active calendars" => "Изаберите активне календаре",
 "CalDav Link" => "КалДав веза",
 "Download" => "Преузми",
 "Edit" => "Уреди",
@@ -59,6 +56,5 @@
 "Description of the Event" => "Опис догађаја",
 "Repeat" => "Понављај",
 "Create a new event" => "Направи нови догађај",
-"Select category" => "Изаберите категорију",
 "Timezone" => "Временска зона"
 );
diff --git a/apps/calendar/l10n/sr@latin.php b/apps/calendar/l10n/sr@latin.php
index c261f903f7..4ceabcbae5 100644
--- a/apps/calendar/l10n/sr@latin.php
+++ b/apps/calendar/l10n/sr@latin.php
@@ -18,6 +18,7 @@
 "Projects" => "Projekti",
 "Questions" => "Pitanja",
 "Work" => "Posao",
+"New Calendar" => "Novi kalendar",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "dnevno",
 "Weekly" => "nedeljno",
@@ -26,15 +27,11 @@
 "Monthly" => "mesečno",
 "Yearly" => "godišnje",
 "All day" => "Ceo dan",
-"New Calendar" => "Novi kalendar",
 "Title" => "Naslov",
 "Week" => "Nedelja",
 "Month" => "Mesec",
 "List" => "Spisak",
 "Today" => "Danas",
-"Calendars" => "Kalendari",
-"There was a fail, while parsing the file." => "došlo je do greške pri rasčlanjivanju fajla.",
-"Choose active calendars" => "Izaberite aktivne kalendare",
 "CalDav Link" => "KalDav veza",
 "Download" => "Preuzmi",
 "Edit" => "Uredi",
@@ -59,6 +56,5 @@
 "Description of the Event" => "Opis događaja",
 "Repeat" => "Ponavljaj",
 "Create a new event" => "Napravi novi događaj",
-"Select category" => "Izaberite kategoriju",
 "Timezone" => "Vremenska zona"
 );
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
index e29e96b463..7baa0309a6 100644
--- a/apps/calendar/l10n/sv.php
+++ b/apps/calendar/l10n/sv.php
@@ -112,9 +112,6 @@
 "Month" => "Månad",
 "List" => "Lista",
 "Today" => "Idag",
-"Calendars" => "Kalendrar",
-"There was a fail, while parsing the file." => "Det blev ett fel medan filen analyserades.",
-"Choose active calendars" => "Välj aktiva kalendrar",
 "Your calendars" => "Dina kalendrar",
 "CalDav Link" => "CalDAV-länk",
 "Shared calendars" => "Delade kalendrar",
@@ -177,11 +174,8 @@
 "of" => "av",
 "at" => "på",
 "Timezone" => "Tidszon",
-"Check always for changes of the timezone" => "Kontrollera alltid ändringar i tidszon.",
-"Timeformat" => "Tidsformat",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Första dagen av veckan",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Töm cache för upprepade händelser",
 "Calendar CalDAV syncing addresses" => "Kalender CalDAV synkroniserar adresser",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
index 8aaa7ae756..8d09fa162d 100644
--- a/apps/calendar/l10n/th_TH.php
+++ b/apps/calendar/l10n/th_TH.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "โซนเวลาถูกเปลี่ยนแล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Calendar" => "ปฏิทิน",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "วันเกิด",
 "Business" => "ธุรกิจ",
 "Call" => "โทรติดต่อ",
@@ -23,6 +28,7 @@
 "Questions" => "คำถาม",
 "Work" => "งาน",
 "unnamed" => "ไม่มีชื่อ",
+"New Calendar" => "สร้างปฏิทินใหม่",
 "Does not repeat" => "ไม่ต้องทำซ้ำ",
 "Daily" => "รายวัน",
 "Weekly" => "รายสัปดาห์",
@@ -68,7 +74,6 @@
 "Date" => "วันที่",
 "Cal." => "คำนวณ",
 "All day" => "ทั้งวัน",
-"New Calendar" => "สร้างปฏิทินใหม่",
 "Missing fields" => "ช่องฟิลด์เกิดการสูญหาย",
 "Title" => "ชื่อกิจกรรม",
 "From Date" => "จากวันที่",
@@ -81,9 +86,6 @@
 "Month" => "เดือน",
 "List" => "รายการ",
 "Today" => "วันนี้",
-"Calendars" => "ปฏิทิน",
-"There was a fail, while parsing the file." => "เกิดความล้มเหลวในการแยกไฟล์",
-"Choose active calendars" => "เลือกปฏิทินที่ต้องการใช้งาน",
 "Your calendars" => "ปฏิทินของคุณ",
 "CalDav Link" => "ลิงค์ CalDav",
 "Shared calendars" => "ปฏิทินที่เปิดแชร์",
@@ -132,27 +134,19 @@
 "Interval" => "ช่วงเวลา",
 "End" => "สิ้นสุด",
 "occurrences" => "จำนวนที่ปรากฏ",
-"Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
-"Please choose the calendar" => "กรณาเลือกปฏิทิน",
 "create a new calendar" => "สร้างปฏิทินใหม่",
+"Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
 "Name of new calendar" => "ชื่อของปฏิทิน",
 "Import" => "นำเข้าข้อมูล",
-"Importing calendar" => "นำเข้าข้อมูลปฏิทิน",
-"Calendar imported successfully" => "ปฏิทินถูกนำเข้าข้อมูลเรียบร้อยแล้ว",
 "Close Dialog" => "ปิดกล่องข้อความโต้ตอบ",
 "Create a new event" => "สร้างกิจกรรมใหม่",
 "View an event" => "ดูกิจกรรม",
 "No categories selected" => "ยังไม่ได้เลือกหมวดหมู่",
-"Select category" => "เลือกหมวดหมู่",
 "of" => "ของ",
 "at" => "ที่",
 "Timezone" => "โซนเวลา",
-"Check always for changes of the timezone" => "ตรวจสอบการเปลี่ยนแปลงโซนเวลาอยู่เสมอ",
-"Timeformat" => "รูปแบบการแสดงเวลา",
 "24h" => "24 ช.ม.",
 "12h" => "12 ช.ม.",
-"First day of the week" => "วันแรกของสัปดาห์",
-"Calendar CalDAV syncing address:" => "ที่อยู่ในการเชื่อมข้อมูลกับปฏิทิน CalDav:",
 "Users" => "ผู้ใช้งาน",
 "select users" => "เลือกผู้ใช้งาน",
 "Editable" => "สามารถแก้ไขได้",
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
index 912228dc72..b9256eb619 100644
--- a/apps/calendar/l10n/tr.php
+++ b/apps/calendar/l10n/tr.php
@@ -112,9 +112,6 @@
 "Month" => "Ay",
 "List" => "Liste",
 "Today" => "Bugün",
-"Calendars" => "Takvimler",
-"There was a fail, while parsing the file." => "Dosya okunurken başarısızlık oldu.",
-"Choose active calendars" => "Aktif takvimleri seçin",
 "Your calendars" => "Takvimleriniz",
 "CalDav Link" => "CalDav Bağlantısı",
 "Shared calendars" => "Paylaşılan",
@@ -177,11 +174,8 @@
 "of" => "nın",
 "at" => "üzerinde",
 "Timezone" => "Zaman dilimi",
-"Check always for changes of the timezone" => "Sürekli zaman dilimi değişikliklerini kontrol et",
-"Timeformat" => "Saat biçimi",
 "24h" => "24s",
 "12h" => "12s",
-"First day of the week" => "Haftanın ilk günü",
 "Cache" => "Önbellek",
 "Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.",
 "Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.",
diff --git a/apps/calendar/l10n/uk.php b/apps/calendar/l10n/uk.php
index 892896742d..2911307e58 100644
--- a/apps/calendar/l10n/uk.php
+++ b/apps/calendar/l10n/uk.php
@@ -16,6 +16,7 @@
 "Projects" => "Проекти",
 "Questions" => "Запитання",
 "Work" => "Робота",
+"New Calendar" => "новий Календар",
 "Does not repeat" => "Не повторювати",
 "Daily" => "Щоденно",
 "Weekly" => "Щотижня",
@@ -52,21 +53,29 @@
 "Date" => "Дата",
 "Cal." => "Кал.",
 "All day" => "Увесь день",
-"New Calendar" => "новий Календар",
+"Missing fields" => "Пропущені поля",
 "Title" => "Назва",
+"From Date" => "Від Дати",
+"From Time" => "З Часу",
+"To Date" => "До Часу",
+"To Time" => "По Дату",
+"The event ends before it starts" => "Подія завершається до її початку",
+"There was a database fail" => "Сталася помилка бази даних",
 "Week" => "Тиждень",
 "Month" => "Місяць",
 "List" => "Список",
 "Today" => "Сьогодні",
-"Calendars" => "Календарі",
-"There was a fail, while parsing the file." => "Сталася помилка при обробці файлу",
-"Choose active calendars" => "Вибрати активні календарі",
+"Your calendars" => "Ваші календарі",
 "Download" => "Завантажити",
 "Edit" => "Редагувати",
+"Delete" => "Видалити",
 "New calendar" => "Новий календар",
 "Edit calendar" => "Редагувати календар",
 "Active" => "Активний",
 "Calendar color" => "Колір календаря",
+"Save" => "Зберегти",
+"Cancel" => "Відмінити",
+"Export" => "Експорт",
 "Title of the Event" => "Назва події",
 "Category" => "Категорія",
 "From" => "З",
@@ -76,14 +85,14 @@
 "Description" => "Опис",
 "Description of the Event" => "Опис події",
 "Repeat" => "Повторювати",
-"Import a calendar file" => "Імпортувати файл календаря",
 "create a new calendar" => "створити новий календар",
+"Import a calendar file" => "Імпортувати файл календаря",
 "Name of new calendar" => "Назва нового календаря",
-"Calendar imported successfully" => "Календар успішно імпортовано",
+"Import" => "Імпорт",
 "Create a new event" => "Створити нову подію",
 "Timezone" => "Часовий пояс",
-"Timeformat" => "Формат часу",
 "24h" => "24г",
 "12h" => "12г",
-"Calendar CalDAV syncing address:" => "Адреса синхронізації календаря CalDAV:"
+"Users" => "Користувачі",
+"Groups" => "Групи"
 );
diff --git a/apps/calendar/l10n/vi.php b/apps/calendar/l10n/vi.php
index 059b89e163..3594a095eb 100644
--- a/apps/calendar/l10n/vi.php
+++ b/apps/calendar/l10n/vi.php
@@ -79,9 +79,6 @@
 "Month" => "Tháng",
 "List" => "Danh sách",
 "Today" => "Hôm nay",
-"Calendars" => "Lịch",
-"There was a fail, while parsing the file." => "Có một thất bại, trong khi phân tích các tập tin.",
-"Choose active calendars" => "Chọn lịch hoạt động",
 "Your calendars" => "Lịch của bạn",
 "CalDav Link" => "Liên kết CalDav ",
 "Shared calendars" => "Chia sẻ lịch",
@@ -129,7 +126,6 @@
 "of" => "của",
 "at" => "tại",
 "Timezone" => "Múi giờ",
-"Check always for changes of the timezone" => "Luôn kiểm tra múi giờ",
 "24h" => "24h",
 "12h" => "12h"
 );
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index bb7e0a2872..48d00d02d5 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -6,6 +6,7 @@
 "Timezone changed" => "时区已修改",
 "Invalid request" => "非法请求",
 "Calendar" => "日历",
+"ddd" => "ddd",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "生日",
 "Business" => "商务",
@@ -23,6 +24,7 @@
 "Questions" => "问题",
 "Work" => "工作",
 "unnamed" => "未命名",
+"New Calendar" => "新日历",
 "Does not repeat" => "不重复",
 "Daily" => "每天",
 "Weekly" => "每周",
@@ -68,7 +70,6 @@
 "Date" => "日期",
 "Cal." => "日历",
 "All day" => "全天",
-"New Calendar" => "新日历",
 "Missing fields" => "缺少字段",
 "Title" => "标题",
 "From Date" => "从",
@@ -81,9 +82,6 @@
 "Month" => "月",
 "List" => "列表",
 "Today" => "今天",
-"Calendars" => "日历",
-"There was a fail, while parsing the file." => "解析文件失败",
-"Choose active calendars" => "选择活动日历",
 "Your calendars" => "您的日历",
 "CalDav Link" => "CalDav 链接",
 "Shared calendars" => "共享的日历",
@@ -132,27 +130,19 @@
 "Interval" => "间隔",
 "End" => "结束",
 "occurrences" => "次",
-"Import a calendar file" => "导入日历文件",
-"Please choose the calendar" => "请选择日历",
 "create a new calendar" => "创建新日历",
+"Import a calendar file" => "导入日历文件",
 "Name of new calendar" => "新日历名称",
 "Import" => "导入",
-"Importing calendar" => "导入日历",
-"Calendar imported successfully" => "导入日历成功",
 "Close Dialog" => "关闭对话框",
 "Create a new event" => "创建新事件",
 "View an event" => "查看事件",
 "No categories selected" => "无选中分类",
-"Select category" => "选择分类",
 "of" => "在",
 "at" => "在",
 "Timezone" => "时区",
-"Check always for changes of the timezone" => "选中则总是按照时区变化",
-"Timeformat" => "时间格式",
 "24h" => "24小时",
 "12h" => "12小时",
-"First day of the week" => "每周的第一天",
-"Calendar CalDAV syncing address:" => "日历CalDAV 同步地址：",
 "Users" => "用户",
 "select users" => "选中用户",
 "Editable" => "可编辑",
diff --git a/apps/calendar/l10n/zh_TW.php b/apps/calendar/l10n/zh_TW.php
index 746594462c..c2c03a4d44 100644
--- a/apps/calendar/l10n/zh_TW.php
+++ b/apps/calendar/l10n/zh_TW.php
@@ -23,6 +23,7 @@
 "Questions" => "問題",
 "Work" => "工作",
 "unnamed" => "無名稱的",
+"New Calendar" => "新日曆",
 "Does not repeat" => "不重覆",
 "Daily" => "每日",
 "Weekly" => "每週",
@@ -68,7 +69,6 @@
 "Date" => "日期",
 "Cal." => "行事曆",
 "All day" => "整天",
-"New Calendar" => "新日曆",
 "Missing fields" => "遺失欄位",
 "Title" => "標題",
 "From Date" => "自日期",
@@ -81,9 +81,6 @@
 "Month" => "月",
 "List" => "清單",
 "Today" => "今日",
-"Calendars" => "日曆",
-"There was a fail, while parsing the file." => "解析檔案時失敗。",
-"Choose active calendars" => "選擇一個作用中的日曆",
 "Your calendars" => "你的行事曆",
 "CalDav Link" => "CalDav 聯結",
 "Shared calendars" => "分享的行事曆",
@@ -132,27 +129,19 @@
 "Interval" => "間隔",
 "End" => "結束",
 "occurrences" => "事件",
-"Import a calendar file" => "匯入日曆檔案",
-"Please choose the calendar" => "請選擇日曆",
 "create a new calendar" => "建立新日曆",
+"Import a calendar file" => "匯入日曆檔案",
 "Name of new calendar" => "新日曆名稱",
 "Import" => "匯入",
-"Importing calendar" => "匯入日曆",
-"Calendar imported successfully" => "已成功匯入日曆",
 "Close Dialog" => "關閉對話",
 "Create a new event" => "建立一個新事件",
 "View an event" => "觀看一個活動",
 "No categories selected" => "沒有選擇分類",
-"Select category" => "選擇分類",
 "of" => "於",
 "at" => "於",
 "Timezone" => "時區",
-"Check always for changes of the timezone" => "總是檢查是否變更了時區",
-"Timeformat" => "日期格式",
 "24h" => "24小時制",
 "12h" => "12小時制",
-"First day of the week" => "每週的第一天",
-"Calendar CalDAV syncing address:" => "CalDAV 的日曆同步地址：",
 "Users" => "使用者",
 "select users" => "選擇使用者",
 "Editable" => "可編輯",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 925d78b684..9916dba997 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -108,6 +108,8 @@
 "Next contact in list" => "Següent contacte de la llista",
 "Previous contact in list" => "Contacte anterior de la llista",
 "Expand/collapse current addressbook" => "Expandeix/col·lapsa la llibreta d'adreces",
+"Next addressbook" => "Llibreta d'adreces següent",
+"Previous addressbook" => "Llibreta d'adreces anterior",
 "Actions" => "Accions",
 "Refresh contacts list" => "Carrega de nou la llista de contactes",
 "Add new contact" => "Afegeix un contacte nou",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 5fa5bb4f9d..be9adae557 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -2,13 +2,13 @@
 "Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
 "id is not set." => "ID ist nicht angegeben.",
 "Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
-"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
+"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen.",
 "No ID provided" => "Keine ID angegeben",
 "Error setting checksum." => "Fehler beim Setzen der Prüfsumme.",
 "No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
 "No address books found." => "Keine Adressbücher gefunden.",
 "No contacts found." => "Keine Kontakte gefunden.",
-"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
+"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen.",
 "element name is not set." => "Kein Name für das Element angegeben.",
 "Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
 "Cannot add empty property." => "Feld darf nicht leer sein.",
@@ -16,7 +16,7 @@
 "Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
 "Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
 "Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
-"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
+"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen.",
 "Missing ID" => "Fehlende ID",
 "Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
@@ -33,15 +33,15 @@
 "Error loading image." => "Fehler beim Laden des Bildes.",
 "Error getting contact object." => "Fehler beim Abruf des Kontakt-Objektes.",
 "Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO Eigenschaft.",
-"Error saving contact." => "Fehler beim Speichern des Kontaktes",
+"Error saving contact." => "Fehler beim Speichern des Kontaktes.",
 "Error resizing image" => "Fehler bei der Größenänderung des Bildes",
 "Error cropping image" => "Fehler beim Zuschneiden des Bildes",
 "Error creating temporary image" => "Fehler beim erstellen des temporären Bildes",
 "Error finding image: " => "Fehler beim Suchen des Bildes: ",
 "Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen",
 "There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer, als durch die upload_max_filesize Direktive in php.ini erlaubt",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist",
 "The uploaded file was only partially uploaded" => "Datei konnte nur teilweise übertragen werden",
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
@@ -50,17 +50,17 @@
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "Contacts" => "Kontakte",
 "Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung",
-"Not implemented" => "Nicht Verfügbar",
+"Not implemented" => "Nicht verfügbar",
 "Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen",
 "Error" => "Fehler",
-"This property has to be non-empty." => "Dieses Feld darf nicht Leer sein.",
+"This property has to be non-empty." => "Dieses Feld darf nicht leer sein.",
 "Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org",
 "Edit name" => "Name ändern",
 "No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
 "Select type" => "Wähle Typ",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ...",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
@@ -119,7 +119,7 @@
 "Delete current photo" => "Derzeitiges Foto löschen",
 "Edit current photo" => "Foto ändern",
 "Upload new photo" => "Neues Foto hochladen",
-"Select photo from ownCloud" => "Foto aus ownCloud auswählen",
+"Select photo from ownCloud" => "Foto aus der ownCloud auswählen",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
 "Edit name details" => "Name ändern",
 "Delete" => "Löschen",
@@ -134,7 +134,7 @@
 "Edit groups" => "Gruppen editieren",
 "Preferred" => "Bevorzugt",
 "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
-"Enter email address" => "E-Mail-Adresse angeben.",
+"Enter email address" => "E-Mail-Adresse angeben",
 "Mail to address" => "E-Mail an diese Adresse schreiben",
 "Delete email address" => "E-Mail-Adresse löschen",
 "Enter phone number" => "Telefonnummer angeben",
@@ -194,7 +194,7 @@
 "Enter description" => "Beschreibung eingeben",
 "CardDAV syncing addresses" => "CardDAV Sync-Adressen",
 "more info" => "mehr Info",
-"Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
+"Primary address (Kontact et al)" => "primäre Adresse (für Kontakt o.ä. Programme)",
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "CardDav-Link anzeigen",
 "Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index 29ac52b1fe..33c0106d5a 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -39,6 +39,8 @@
 "Error finding image: " => "Eraro dum serĉo de bildo: ",
 "Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "La alŝutita dosiero transpasas la preskribon upload_max_filesize en php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La alŝutita dosiero transpasas la preskribon MAX_FILE_SIZE kiu specifiĝis en la HTML-formularo",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
@@ -53,6 +55,7 @@
 "This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
 "Edit name" => "Redakti nomon",
 "No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo.",
 "Select type" => "Elektu tipon",
 "Result: " => "Rezulto: ",
 " imported, " => " enportoj, ",
@@ -76,7 +79,9 @@
 "Internet" => "Interreto",
 "Birthday" => "Naskiĝotago",
 "Business" => "Negoco",
+"Call" => "Voko",
 "Clients" => "Klientoj",
+"Holidays" => "Ferioj",
 "Ideas" => "Ideoj",
 "Meeting" => "Kunveno",
 "Other" => "Alia",
@@ -94,7 +99,10 @@
 "Navigation" => "Navigado",
 "Next contact in list" => "Sekva kontakto en la listo",
 "Previous contact in list" => "Malsekva kontakto en la listo",
+"Next addressbook" => "Sekva adresaro",
+"Previous addressbook" => "Malsekva adresaro",
 "Actions" => "Agoj",
+"Refresh contacts list" => "Refreŝigi la kontaktoliston",
 "Add new contact" => "Aldoni novan kontakton",
 "Add new addressbook" => "Aldoni novan adresaron",
 "Delete current contact" => "Forigi la nunan kontakton",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index e9ee24d529..ebc38dfb3e 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -78,12 +78,32 @@
 "Pager" => "Localizador",
 "Internet" => "Internet",
 "Birthday" => "Cumpleaños",
+"Business" => "Negocio",
+"Call" => "Llamada",
+"Clients" => "Clientes",
+"Holidays" => "Vacaciones",
+"Ideas" => "Ideas",
+"Journey" => "Jornada",
+"Meeting" => "Reunión",
+"Other" => "Otro",
+"Personal" => "Personal",
+"Projects" => "Proyectos",
+"Questions" => "Preguntas",
 "{name}'s Birthday" => "Cumpleaños de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Añadir contacto",
 "Import" => "Importar",
+"Settings" => "Configuración",
 "Addressbooks" => "Libretas de direcciones",
 "Close" => "Cierra.",
+"Keyboard shortcuts" => "Atajos de teclado",
+"Navigation" => "Navegación",
+"Next contact in list" => "Siguiente contacto en la lista",
+"Previous contact in list" => "Anterior contacto en la lista",
+"Actions" => "Acciones",
+"Refresh contacts list" => "Refrescar la lista de contactos",
+"Add new contact" => "Añadir un nuevo contacto",
+"Delete current contact" => "Eliminar contacto actual",
 "Drop photo to upload" => "Suelta una foto para subirla",
 "Delete current photo" => "Eliminar fotografía actual",
 "Edit current photo" => "Editar fotografía actual",
@@ -94,6 +114,7 @@
 "Delete" => "Borrar",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
+"Web site" => "Sitio Web",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separa los grupos con comas",
@@ -121,6 +142,7 @@
 "City" => "Ciudad",
 "Region" => "Región",
 "Zipcode" => "Código postal",
+"Postal code" => "Código postal",
 "Country" => "País",
 "Addressbook" => "Libreta de direcciones",
 "Hon. prefixes" => "Prefijos honoríficos",
@@ -150,6 +172,8 @@
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
 "Configure addressbooks" => "Configurar agenda",
+"Enter name" => "Introducir nombre",
+"Enter description" => "Introducir descripción",
 "CardDAV syncing addresses" => "Sincronizando direcciones",
 "more info" => "más información",
 "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
@@ -157,6 +181,9 @@
 "Download" => "Descargar",
 "Edit" => "Editar",
 "New Address Book" => "Nueva libreta de direcciones",
+"Name" => "Nombre",
+"Description" => "Descripción",
 "Save" => "Guardar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"More..." => "Más..."
 );
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 6aab4ed347..069b08144e 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
+"Error setting checksum." => "Virhe asettaessa tarkistussummaa.",
 "No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
 "No address books found." => "Osoitekirjoja ei löytynyt.",
 "No contacts found." => "Yhteystietoja ei löytynyt.",
@@ -11,6 +12,7 @@
 "Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
 "Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
 "Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"No photo path was submitted." => "Kuvan polkua ei annettu.",
 "File doesn't exist:" => "Tiedostoa ei ole olemassa:",
 "Error loading image." => "Virhe kuvaa ladatessa.",
 "Error saving contact." => "Virhe yhteystietoa tallennettaessa.",
@@ -22,11 +24,14 @@
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
 "No file was uploaded" => "Tiedostoa ei lähetetty",
 "Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"Couldn't save temporary image: " => "Väliaikaiskuvan tallennus epäonnistui:",
+"Couldn't load temporary image: " => "Väliaikaiskuvan lataus epäonnistui:",
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "Contacts" => "Yhteystiedot",
 "Error" => "Virhe",
 "Edit name" => "Muokkaa nimeä",
 "No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan.",
 "Result: " => "Tulos: ",
 " imported, " => " tuotu, ",
 " failed." => " epäonnistui.",
@@ -61,6 +66,8 @@
 "Keyboard shortcuts" => "Pikanäppäimet",
 "Next contact in list" => "Seuraava yhteystieto luettelossa",
 "Previous contact in list" => "Edellinen yhteystieto luettelossa",
+"Next addressbook" => "Seuraava osoitekirja",
+"Previous addressbook" => "Edellinen osoitekirja",
 "Actions" => "Toiminnot",
 "Refresh contacts list" => "Päivitä yhteystietoluettelo",
 "Add new contact" => "Lisää uusi yhteystieto",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 9b4822bd97..93299380d2 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -60,6 +60,7 @@
 "No files selected for upload." => "Aucun fichiers choisis pour être chargés",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
 "Select type" => "Sélectionner un type",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.",
 "Result: " => "Résultat :",
 " imported, " => "importé,",
 " failed." => "échoué.",
@@ -196,6 +197,7 @@
 "Primary address (Kontact et al)" => "Adresse principale",
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Afficher le lien CardDav",
+"Show read-only VCF link" => "Afficher les liens VCF en lecture seule",
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "New Address Book" => "Nouveau Carnet d'adresses",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 31f950ff80..5fc8db5e21 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -108,6 +108,8 @@
 "Next contact in list" => "Contatto successivo in elenco",
 "Previous contact in list" => "Contatto precedente in elenco",
 "Expand/collapse current addressbook" => "Espandi/Contrai la rubrica corrente",
+"Next addressbook" => "Rubrica successiva",
+"Previous addressbook" => "Rubrica precedente",
 "Actions" => "Azioni",
 "Refresh contacts list" => "Aggiorna l'elenco dei contatti",
 "Add new contact" => "Aggiungi un nuovo contatto",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 074a725b48..4f7800e1db 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -10,15 +10,18 @@
 "No contacts found." => "連絡先が見つかりません。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
 "element name is not set." => "要素名が設定されていません。",
+"Could not parse contact: " => "連絡先を解析できませんでした:",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
 "At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
 "Trying to add duplicate property: " => "重複する属性を追加: ",
 "Error adding contact property: " => "コンタクト属性の追加エラー: ",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
 "Error deleting contact property." => "連絡先の削除に失敗しました。",
+"Missing ID" => "IDが見つかりません",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
 "checksum is not set." => "チェックサムが設定されていません。",
 "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
+"Something went FUBAR. " => "何かがFUBARへ移動しました。",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
@@ -60,6 +63,8 @@
 "Result: " => "結果: ",
 " imported, " => " をインポート、 ",
 " failed." => " は失敗しました。",
+"Displayname cannot be empty." => "表示名は空にできません。",
+"Addressbook not found: " => "連絡先が見つかりません:",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -78,6 +83,7 @@
 "Internet" => "インターネット",
 "Birthday" => "誕生日",
 "Business" => "ビジネス",
+"Call" => "電話",
 "Clients" => "顧客",
 "Deliverer" => "運送会社",
 "Holidays" => "休日",
@@ -100,6 +106,11 @@
 "Navigation" => "ナビゲーション",
 "Next contact in list" => "リスト内の次のコンタクト",
 "Previous contact in list" => "リスト内の前のコンタクト",
+"Expand/collapse current addressbook" => "現在の連絡帳を展開する／折りたたむ",
+"Next addressbook" => "次の連絡先",
+"Previous addressbook" => "前の連絡先",
+"Actions" => "アクション",
+"Refresh contacts list" => "連絡先リストを再読込する",
 "Add new contact" => "新しいコンタクトを追加",
 "Add new addressbook" => "新しいアドレスブックを追加",
 "Delete current contact" => "現在のコンタクトを削除",
@@ -114,6 +125,7 @@
 "Enter nickname" => "ニックネームを入力",
 "Web site" => "ウェブサイト",
 "http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Webサイトへ移動",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -137,9 +149,13 @@
 "Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
-"Extended" => "番地2",
+"Street address" => "住所1",
+"Street and number" => "番地",
+"Extended" => "住所2",
+"Apartment number etc." => "アパート名等",
 "City" => "都市",
 "Region" => "都道府県",
+"E.g. state or province" => "例：東京都、大阪府",
 "Zipcode" => "郵便番号",
 "Postal code" => "郵便番号",
 "Country" => "国名",
@@ -170,14 +186,21 @@
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
+"Select Address Books" => "連絡先を洗濯してください",
 "Enter name" => "名前を入力",
+"Enter description" => "説明を入力してください",
 "CardDAV syncing addresses" => "CardDAV同期アドレス",
 "more info" => "詳細情報",
 "Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "CarDavリンクを表示",
+"Show read-only VCF link" => "読み取り専用のVCFリンクを表示",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "New Address Book" => "新規電話帳",
+"Name" => "名前",
+"Description" => "説明",
 "Save" => "保存",
-"Cancel" => "取り消し"
+"Cancel" => "取り消し",
+"More..." => "もっと..."
 );
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 2fd386f5a8..8153c4d936 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -61,6 +61,7 @@
 "Result: " => "Hasil: ",
 " imported, " => " import, ",
 " failed." => " gagal.",
+"Addressbook not found: " => "Buku alamat tidak ditemui:",
 "This is not your addressbook." => "Ini bukan buku alamat anda.",
 "Contact could not be found." => "Hubungan tidak dapat ditemui",
 "Address" => "Alamat",
@@ -78,12 +79,25 @@
 "Pager" => "Alat Kelui",
 "Internet" => "Internet",
 "Birthday" => "Hari lahir",
+"Business" => "Perniagaan",
+"Clients" => "klien",
+"Holidays" => "Hari kelepasan",
+"Ideas" => "Idea",
+"Journey" => "Perjalanan",
+"Jubilee" => "Jubli",
+"Meeting" => "Mesyuarat",
+"Other" => "Lain",
+"Personal" => "Peribadi",
+"Projects" => "Projek",
 "{name}'s Birthday" => "Hari Lahir {name}",
 "Contact" => "Hubungan",
 "Add Contact" => "Tambah kenalan",
 "Import" => "Import",
+"Settings" => "Tetapan",
 "Addressbooks" => "Senarai Buku Alamat",
 "Close" => "Tutup",
+"Next addressbook" => "Buku alamat seterusnya",
+"Previous addressbook" => "Buku alamat sebelumnya",
 "Drop photo to upload" => "Letak foto disini untuk muatnaik",
 "Delete current photo" => "Padam foto semasa",
 "Edit current photo" => "Ubah foto semasa",
@@ -150,6 +164,9 @@
 "You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.",
 "Add contact" => "Letak kenalan",
 "Configure addressbooks" => "Konfigurasi buku alamat",
+"Select Address Books" => "Pilih Buku Alamat",
+"Enter name" => "Masukkan nama",
+"Enter description" => "Masukkan keterangan",
 "CardDAV syncing addresses" => "alamat selarian CardDAV",
 "more info" => "maklumat lanjut",
 "Primary address (Kontact et al)" => "Alamat utama",
@@ -157,6 +174,9 @@
 "Download" => "Muat naik",
 "Edit" => "Sunting",
 "New Address Book" => "Buku Alamat Baru",
+"Name" => "Nama",
+"Description" => "Keterangan",
 "Save" => "Simpan",
-"Cancel" => "Batal"
+"Cancel" => "Batal",
+"More..." => "Lagi..."
 );
diff --git a/l10n/af/calendar.po b/l10n/af/calendar.po
index 80a29a27bf..c4363ac1ae 100644
--- a/l10n/af/calendar.po
+++ b/l10n/af/calendar.po
@@ -7,21 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -29,300 +37,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr ""
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -356,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -389,7 +483,7 @@ msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -401,19 +495,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
@@ -499,23 +593,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr ""
 
@@ -523,7 +617,7 @@ msgstr ""
 msgid "Location of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr ""
 
@@ -531,84 +625,86 @@ msgstr ""
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
 #: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -624,44 +720,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index dd7c13d20c..052edbcaa4 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 0e2a8d0e2f..c940c2522d 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index ac28bf5223..55906a62ff 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "جدول زمني خاطئ"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "التوقيت الجديد"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "تم تغيير المنطقة الزمنية"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "طلب غير مفهوم"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "الجدول الزمني"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "عيد ميلاد"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "عمل"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "إتصال"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "الزبائن"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "المرسل"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "عطلة"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "أفكار"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "رحلة"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "يوبيل"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "إجتماع"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "شيء آخر"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "شخصي"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "مشاريع"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "اسئلة"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "العمل"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "جدول زمني جديد"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "لا يعاد"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "يومي"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "أسبوعي"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "كل نهاية الأسبوع"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "كل اسبوعين"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "شهري"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "سنوي"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "بتاتا"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "حسب تسلسل الحدوث"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "حسب التاريخ"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "حسب يوم الشهر"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "حسب يوم الاسبوع"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "الأثنين"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "الخميس"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "الجمعه"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "السبت"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "الاحد"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "الاحداث باسبوع الشهر"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "أول"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "ثاني"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "ثالث"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "رابع"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "خامس"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "أخير"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "كانون الثاني"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "شباط"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "آذار"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "نيسان"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "أيار"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "حزيران"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "تموز"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "آب"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "أيلول"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "تشرين الاول"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "كانون الاول"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "حسب تاريخ الحدث"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "حسب يوم السنه"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "حسب رقم الاسبوع"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "حسب اليوم و الشهر"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "تاريخ"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "تقويم"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "كل النهار"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "جدول زمني جديد"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "خانات خالية من المعلومات"
@@ -357,40 +459,32 @@ msgstr "هذا الحدث ينتهي قبل أن يبدأ"
 msgid "There was a database fail"
 msgstr "خطأ في قاعدة البيانات"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "إسبوع"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "شهر"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "قائمة"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "اليوم"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "الجداول الزمنية"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "لم يتم قراءة الملف بنجاح."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "إختر الجدول الزمني الرئيسي"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "وصلة CalDav"
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "تعديل"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "حذف"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "حدث في يوم كامل"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "من"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "إلى"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "خيارات متقدمة"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "مكان"
 
@@ -524,7 +618,7 @@ msgstr "مكان"
 msgid "Location of the Event"
 msgstr "مكان الحدث"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "مواصفات"
 
@@ -532,84 +626,86 @@ msgstr "مواصفات"
 msgid "Description of the Event"
 msgstr "وصف الحدث"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "إعادة"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "تعديلات متقدمه"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "اختر ايام الاسبوع"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "اختر الايام"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "و التواريخ حسب يوم السنه."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "و الاحداث حسب يوم الشهر."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "اختر الاشهر"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "اختر الاسابيع"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "و الاحداث حسب اسبوع السنه"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "المده الفاصله"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "نهايه"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "الاحداث"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "أدخل ملف التقويم"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "الرجاء إختر الجدول الزمني"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "انشاء جدول زمني جديد"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "أدخل ملف التقويم"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "أسم الجدول الزمني الجديد"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "إدخال"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "يتم ادخال الجدول الزمني"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "تم ادخال الجدول الزمني بنجاح"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "أغلق الحوار"
 
@@ -625,45 +721,73 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "اختر الفئة"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "المنطقة الزمنية"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "راقب دائما تغير التقويم الزمني"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "شكل الوقت"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 ساعة"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 ساعة"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "عنوان لتحديث ال CalDAV الجدول الزمني"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 30fcdd04df..2b79ab09cc 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "خطء خلال توقيف كتاب العناوين."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr "خطء خلال اضافة معرفه جديده."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "خطء خلال محي الصفه."
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "حذف"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "انزال"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "تعديل"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "كتاب عناوين جديد"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "الغاء"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index a1a0699c38..eacce43254 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar_SA/calendar.po b/l10n/ar_SA/calendar.po
index 32a7e56e62..8229289fd3 100644
--- a/l10n/ar_SA/calendar.po
+++ b/l10n/ar_SA/calendar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 5fdd6a7ff9..b9c9e90a50 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 0d745bafa6..adcc3de81a 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index b07eef2d00..856d98f8e4 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:51+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,31 +71,30 @@ msgstr "Невалидна заявка"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -220,7 +219,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -244,7 +243,7 @@ msgstr "Петък"
 msgid "Saturday"
 msgstr "Събота"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -461,33 +460,25 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Седмица"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Списък"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Днес"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Възникна проблем с разлистването на файла."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Изберете активен календар"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,55 +730,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Часова зона"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Първи ден на седмицата"
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index aa2426a6ad..c76da91d86 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 207c9d4e86..f62e2c0b61 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index e5c6761343..759ee043b6 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:17+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,31 +71,30 @@ msgstr "Sol.licitud no vàlida"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendari"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d [MMM ][yyyy ]{'&#8212;' d MMM yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d MMM, yyyy"
 
@@ -220,7 +219,7 @@ msgstr "per dia del mes"
 msgid "by weekday"
 msgstr "per dia de la setmana"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -244,7 +243,7 @@ msgstr "Divendres"
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -461,33 +460,25 @@ msgstr "L'esdeveniment acaba abans que comenci"
 msgid "There was a database fail"
 msgstr "Hi ha un error de base de dades"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Setmana"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Llista"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Avui"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Calendaris"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "S'ha produït un error en analitzar el fitxer."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Seleccioneu calendaris actius"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,55 +730,63 @@ msgstr "de"
 msgid "at"
 msgstr "a"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zona horària"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Comprova sempre en els canvis de zona horària"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format de temps"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primer dia de la setmana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Memòria de cau"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Neteja la memòria de cau pels esdeveniments amb repetició"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Adreça de sincronització del calendari CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "més informació"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Adreça primària (Kontact et al)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "IOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Enllaç(os) iCalendar només de lectura"
 
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 4209c7a353..9f7b01e6ba 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Error en (des)activar la llibreta d'adreces."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "no s'ha establert la id."
 
@@ -61,7 +61,7 @@ msgstr "No s'han trobat contactes."
 msgid "There was an error adding the contact."
 msgstr "S'ha produït un error en afegir el contacte."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "no s'ha establert el nom de l'element."
 
@@ -85,11 +85,11 @@ msgstr "Esteu intentant afegir una propietat duplicada:"
 msgid "Error adding contact property: "
 msgstr "Error en afegir la propietat del contacte:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Error en eliminar la propietat del contacte."
 
@@ -101,19 +101,19 @@ msgstr "Falta la ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Error en analitzar la ID de la VCard: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "no s'ha establert la suma de verificació."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
@@ -162,19 +162,19 @@ msgstr "Error en obtenir la propietat PHOTO."
 msgid "Error saving contact."
 msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Error en trobar la imatge:"
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
@@ -476,11 +480,11 @@ msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Llibreta d'adreces següent"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Llibreta d'adreces anterior"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -532,7 +536,7 @@ msgstr "Edita detalls del nom"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -843,30 +847,30 @@ msgstr "Mostra l'enllaç VCF només de lectura"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Edita"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova llibreta d'adreces"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nom"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Descripció"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Desa"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Més..."
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4157d36cb1..1225660116 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 07:32+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,11 +71,15 @@ msgstr "Català"
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Més"
 
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 4bc27d16c6..0d3b986928 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Žádné kalendáře nenalezeny."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Žádné události nenalezeny."
 
@@ -32,300 +40,394 @@ msgstr "Žádné události nenalezeny."
 msgid "Wrong calendar"
 msgstr "Nesprávný kalendář"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nová časová zóna:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Časová zóna byla změněna"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Chybný požadavek"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM rrrr"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, rrrr"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Obchodní"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Hovor"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Doručovatel"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Nápady"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Cesta"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Výročí"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Schůzka"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Další"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobní"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Dotazy"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nepojmenováno"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nový kalendář"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Neopakuje se"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Denně"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Týdně"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Každý všední den"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Jednou za dva týdny"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Měsíčně"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Ročně"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikdy"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "podle výskytu"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "podle data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "podle dne v měsíci"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "podle dne v týdnu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pondělí"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Středa"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Pátek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Neděle"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "týdenní události v měsíci"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "první"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "druhý"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "třetí"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "čtvrtý"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "pátý"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "poslední"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Leden"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Únor"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Březen"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Duben"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Květen"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Červen"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Červenec"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Srpen"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Září"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Říjen"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Listopad"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Prosinec"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "podle data události"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po dni (dnech)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "podle čísel týdnů"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "podle dne a měsíce"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Celý den"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nový kalendář"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Chybějící pole"
@@ -359,40 +461,32 @@ msgstr "Akce končí před zahájením"
 msgid "There was a database fail"
 msgstr "Chyba v databázi"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "týden"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "měsíc"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Seznam"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "dnes"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendáře"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Chyba při převodu souboru"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vybrat aktivní kalendář"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaše kalendáře"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav odkaz"
 
@@ -404,19 +498,19 @@ msgstr "Sdílené kalendáře"
 msgid "No shared calendars"
 msgstr "Žádné sdílené kalendáře"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Sdílet kalendář"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editovat"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Odstranit"
@@ -502,23 +596,23 @@ msgstr "Kategorie oddělené čárkami"
 msgid "Edit categories"
 msgstr "Upravit kategorie"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodenní událost"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Pokročilé volby"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Umístění"
 
@@ -526,7 +620,7 @@ msgstr "Umístění"
 msgid "Location of the Event"
 msgstr "Místo konání události"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Popis"
 
@@ -534,84 +628,86 @@ msgstr "Popis"
 msgid "Description of the Event"
 msgstr "Popis události"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Opakování"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vybrat dny v týdnu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vybrat dny"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "a denní události v roce"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "a denní události v měsíci"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vybrat měsíce"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vybrat týdny"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "a týden s událostmi v roce"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Konec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "výskyty"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importovat soubor kalendáře"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Zvolte prosím kalendář"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "vytvořit nový kalendář"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importovat soubor kalendáře"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Název nového kalendáře"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Import"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalendář se importuje"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendář byl úspěšně importován"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zavřít dialog"
 
@@ -627,45 +723,73 @@ msgstr "Zobrazit událost"
 msgid "No categories selected"
 msgstr "Žádné kategorie nevybrány"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vyberte kategorii"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "z"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "v"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Časové pásmo"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Vždy kontrolavat, zda nedošlo ke změně časového pásma"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formát času"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Týden začína v"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa pro synchronizaci kalendáře pomocí CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 2c503b0f71..04e3220195 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Chyba při (de)aktivaci adresáře."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id neni nastaveno."
 
@@ -62,7 +62,7 @@ msgstr "Žádné kontakty nenalezeny."
 msgid "There was an error adding the contact."
 msgstr "Během přidávání kontaktu nastala chyba."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "jméno elementu není nastaveno."
 
@@ -86,11 +86,11 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Chyba při odstraňování údaje kontaktu."
 
@@ -102,19 +102,19 @@ msgstr "Chybí ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba při parsování VCard pro ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrolní součet není nastaven."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
@@ -163,19 +163,19 @@ msgstr "Chyba při získávání fotky."
 msgid "Error saving contact."
 msgstr "Chyba při ukládání kontaktu."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Chyba při změně velikosti obrázku."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Chyba při osekávání obrázku."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Chyba při vytváření dočasného obrázku."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Chyba při hledání obrázku:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vybrat typ"
@@ -533,7 +537,7 @@ msgstr "Upravit podrobnosti jména"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Stažení"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editovat"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nový adresář"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Storno"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 016e71bd72..e284b7be5c 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Česky"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Více"
 
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index 7207ff883e..b336da6b45 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -7,25 +7,34 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Der blev ikke fundet nogen kalendere."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Der blev ikke fundet nogen begivenheder."
 
@@ -33,300 +42,394 @@ msgstr "Der blev ikke fundet nogen begivenheder."
 msgid "Wrong calendar"
 msgstr "Forkert kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidszone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tidszone ændret"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM åååå"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, åååå"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Leverance"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Helligdage"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Rejse"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubilæum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Møde"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Andet"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekter"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Spørgsmål"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "af"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "unavngivet"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny Kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Gentages ikke"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Daglig"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Ugentlig"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Alle hverdage"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Hver anden uge"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Årlig"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldrig"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "efter forekomster"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "efter dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "efter dag i måneden"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "efter ugedag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Mandag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "øndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "begivenhedens uge i måneden"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "første"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "anden"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjerde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "sidste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marts"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "efter begivenheders dato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "efter dag(e) i året"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "efter ugenummer/-numre"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "efter dag og måned"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Søn."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Man."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Tir."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Ons."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Tor."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Fre."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Lør."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Aug."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dec."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hele dagen"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny Kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Manglende felter"
@@ -360,40 +463,32 @@ msgstr "Begivenheden slutter, inden den begynder"
 msgid "There was a database fail"
 msgstr "Der var en fejl i databasen"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Uge"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Måned"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Der opstod en fejl under gennemlæsning af filen."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vælg aktive kalendere"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Dine kalendere"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-link"
 
@@ -405,19 +500,19 @@ msgstr "Delte kalendere"
 msgid "No shared calendars"
 msgstr "Ingen delte kalendere"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Del kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Hent"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Slet"
@@ -503,23 +598,23 @@ msgstr "Opdel kategorier med kommaer"
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Heldagsarrangement"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Fra"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avancerede indstillinger"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Sted"
 
@@ -527,7 +622,7 @@ msgstr "Sted"
 msgid "Location of the Event"
 msgstr "Placering af begivenheden"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -535,84 +630,86 @@ msgstr "Beskrivelse"
 msgid "Description of the Event"
 msgstr "Beskrivelse af begivenheden"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Gentag"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vælg ugedage"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vælg dage"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "og begivenhedens dag i året."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "og begivenhedens sag på måneden"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vælg måneder"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vælg uger"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "og begivenhedens uge i året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Afslutning"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "forekomster"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importer en kalenderfil"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Vælg venligst kalender"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "opret en ny kalender"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importer en kalenderfil"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Vælg en kalender"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Navn på ny kalender"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importer"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerer kalender"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender importeret korrekt"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Luk dialog"
 
@@ -628,45 +725,73 @@ msgstr "Vis en begivenhed"
 msgid "No categories selected"
 msgstr "Ingen categorier valgt"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vælg kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "fra"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "kl."
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidszone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Check altid efter ændringer i tidszone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24T"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12T"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Ugens første dag"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synkroniseringsadresse til CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "flere oplysninger"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index cdb9cc135c..7180b10c28 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fejl ved (de)aktivering af adressebogen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "Intet ID medsendt."
 
@@ -64,7 +64,7 @@ msgstr "Der blev ikke fundet nogen kontaktpersoner."
 msgid "There was an error adding the contact."
 msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "Elementnavnet er ikke medsendt."
 
@@ -88,11 +88,11 @@ msgstr "Kan ikke tilføje overlappende element."
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
@@ -104,19 +104,19 @@ msgstr "Manglende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Kunne ikke indlæse VCard med ID'et: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Checksum er ikke medsendt."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
@@ -165,19 +165,19 @@ msgstr "Fejl ved indlæsning af PHOTO feltet."
 msgid "Error saving contact."
 msgstr "Kunne ikke gemme kontaktpersonen."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Kunne ikke ændre billedets størrelse"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Kunne ikke beskære billedet"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Kunne ikke oprette midlertidigt billede"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Kunne ikke finde billedet: "
 
@@ -277,6 +277,10 @@ msgid ""
 "on this server."
 msgstr "Dr."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vælg type"
@@ -535,7 +539,7 @@ msgstr "Rediger navnedetaljer."
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Slet"
 
@@ -846,30 +850,30 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressebog"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Gem"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index fe5deff0c7..3fa216b335 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Kunne ikke indlæse listen fra App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -45,7 +45,7 @@ msgstr "Ugyldig forespørgsel"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Adgangsfejl"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -53,7 +53,7 @@ msgstr "Sprog ændret"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Fejl"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -73,13 +73,17 @@ msgstr "Dansk"
 
 #: templates/admin.php:14
 msgid "Security Warning"
+msgstr "Sikkerhedsadvarsel"
+
+#: templates/admin.php:29
+msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mere"
 
@@ -217,7 +221,7 @@ msgstr "Andet"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index fb8cc41c66..c9c6e6c14e 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -10,14 +10,15 @@
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 #   <peddn@web.de>, 2012.
+# Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 18:09+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,31 +78,30 @@ msgstr "Fehlerhafte Anfrage"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d.M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d.M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d. MMM yyyy"
 
@@ -226,7 +226,7 @@ msgstr "an einem Monatstag"
 msgid "by weekday"
 msgstr "an einem Wochentag"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Montag"
 
@@ -250,7 +250,7 @@ msgstr "Freitag"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -467,33 +467,25 @@ msgstr "Der Termin hört auf, bevor er angefangen hat."
 msgid "There was a database fail"
 msgstr "Datenbankfehler"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Woche"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Monat"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Heute"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Kalender"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Fehler beim Einlesen der Datei."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aktive Kalender wählen"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -745,55 +737,63 @@ msgstr "von"
 msgid "at"
 msgstr "um"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "immer die Zeitzone überprüfen"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Zeitformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "erster Wochentag"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Zwischenspeicher"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen."
+msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr "CalDAV-Kalender gleicht Adressen ab."
+msgstr "CalDAV-Kalender gleicht Adressen ab"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "weitere Informationen"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Primäre Adresse (Kontakt u.a.)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Nur lesende(r) iCalender-Link(s)"
 
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 05b7ba69ed..caf318552b 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -15,6 +15,7 @@
 #   <mi.sc@gmx.net>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
+# Phi Lieb <>, 2012.
 # Susi  <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
@@ -22,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 16:13+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +38,8 @@ msgid "Error (de)activating addressbook."
 msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID ist nicht angegeben."
 
@@ -48,7 +49,7 @@ msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
 
 #: ajax/addressbook/update.php:28
 msgid "Error updating addressbook."
-msgstr "Adressbuch aktualisieren fehlgeschlagen"
+msgstr "Adressbuch aktualisieren fehlgeschlagen."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -72,9 +73,9 @@ msgstr "Keine Kontakte gefunden."
 
 #: ajax/contact/add.php:47
 msgid "There was an error adding the contact."
-msgstr "Erstellen des Kontakts fehlgeschlagen"
+msgstr "Erstellen des Kontakts fehlgeschlagen."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "Kein Name für das Element angegeben."
 
@@ -98,13 +99,13 @@ msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 msgid "Error adding contact property: "
 msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
-msgstr "Kontakteigenschaft löschen fehlgeschlagen"
+msgstr "Kontakteigenschaft löschen fehlgeschlagen."
 
 #: ajax/contact/details.php:31
 msgid "Missing ID"
@@ -114,19 +115,19 @@ msgstr "Fehlende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fehler beim Einlesen der VCard für die ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Keine Prüfsumme angegeben."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
@@ -173,21 +174,21 @@ msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
 #: ajax/savecrop.php:98
 msgid "Error saving contact."
-msgstr "Fehler beim Speichern des Kontaktes"
+msgstr "Fehler beim Speichern des Kontaktes."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Fehler beim Suchen des Bildes: "
 
@@ -201,13 +202,13 @@ msgstr "Alles bestens, Datei erfolgreich übertragen."
 
 #: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
+msgstr "Datei größer, als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
 #: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
+msgstr "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
 #: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
@@ -243,7 +244,7 @@ msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
 #: js/contacts.js:71
 msgid "Not implemented"
-msgstr "Nicht Verfügbar"
+msgstr "Nicht verfügbar"
 
 #: js/contacts.js:76
 msgid "Couldn't get a valid address."
@@ -261,7 +262,7 @@ msgstr "Fehler"
 
 #: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr "Dieses Feld darf nicht Leer sein."
+msgstr "Dieses Feld darf nicht leer sein."
 
 #: js/contacts.js:741
 msgid "Couldn't serialize elements."
@@ -271,7 +272,7 @@ msgstr "Konnte Elemente nicht serialisieren"
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
+msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org"
 
 #: js/contacts.js:884
 msgid "Edit name"
@@ -285,7 +286,11 @@ msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
+msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
+
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -295,7 +300,7 @@ msgstr "Wähle Typ"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ..."
+msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -533,7 +538,7 @@ msgstr "Neues Foto hochladen"
 
 #: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
-msgstr "Foto aus ownCloud auswählen"
+msgstr "Foto aus der ownCloud auswählen"
 
 #: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -595,7 +600,7 @@ msgstr "Bitte eine gültige E-Mail-Adresse angeben."
 
 #: templates/part.contact.php:64
 msgid "Enter email address"
-msgstr "E-Mail-Adresse angeben."
+msgstr "E-Mail-Adresse angeben"
 
 #: templates/part.contact.php:68
 msgid "Mail to address"
@@ -838,7 +843,7 @@ msgstr "mehr Info"
 
 #: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr "primäre Adresse (für Kontact o.ä. Programme)"
+msgstr "primäre Adresse (für Kontakt o.ä. Programme)"
 
 #: templates/settings.php:7
 msgid "iOS/OS X"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 30f4a024dd..71f7cfb483 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 19:52+0000\n"
-"Last-Translator: designpoint <info@designpoint.ch>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,15 @@ msgstr "Deutsch"
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mehr"
 
@@ -175,11 +179,11 @@ msgstr "E-Mail"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr "Ihre E-Mail Adresse"
+msgstr "Ihre E-Mail-Adresse"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
+msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -187,7 +191,7 @@ msgstr "Sprache"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Hilf bei der Übersetzung!"
+msgstr "Hilf bei der Übersetzung"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index 4f8562971b..b8bca27239 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 11:39+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,31 +74,30 @@ msgstr "Μη έγκυρο αίτημα"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, MMM d, yyyy"
 
@@ -223,7 +222,7 @@ msgstr "κατά ημέρα"
 msgid "by weekday"
 msgstr "κατά εβδομάδα"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -247,7 +246,7 @@ msgstr "Παρασκευή"
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -464,33 +463,25 @@ msgstr "Το συμβάν ολοκληρώνεται πριν από την έν
 msgid "There was a database fail"
 msgstr "Υπήρξε σφάλμα στη βάση δεδομένων"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Λίστα"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Σήμερα"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Ημερολόγια"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Υπήρξε μια αποτυχία, κατά την σάρωση του αρχείου."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Επιλέξτε τα ενεργά ημερολόγια"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -742,55 +733,63 @@ msgstr "του"
 msgid "at"
 msgstr "στο"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Ζώνη ώρας"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Έλεγχος πάντα για τις αλλαγές της ζώνης ώρας"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Μορφή ώρας"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ω"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ω"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Πρώτη μέρα της εβδομάδας"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "περισσότερες πλροφορίες"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Κύρια Διεύθυνση(Επαφή και άλλα)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr " iCalendar link(s) μόνο για ανάγνωση"
 
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 5ed7fe9c39..548db19793 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "δεν ορίστηκε id"
 
@@ -65,7 +65,7 @@ msgstr "Δεν βρέθηκαν επαφές"
 msgid "There was an error adding the contact."
 msgstr "Σφάλμα κατά την προσθήκη επαφής."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "δεν ορίστηκε όνομα στοιχείου"
 
@@ -89,11 +89,11 @@ msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότ
 msgid "Error adding contact property: "
 msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Σφάλμα διαγραφής ιδιότητας επαφής."
 
@@ -105,19 +105,19 @@ msgstr "Λείπει ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "δε ορίστηκε checksum "
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
@@ -166,19 +166,19 @@ msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦ
 msgid "Error saving contact."
 msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
@@ -278,6 +278,10 @@ msgid ""
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Επιλογή τύπου"
@@ -536,7 +540,7 @@ msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -847,30 +851,30 @@ msgstr ""
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Νέο βιβλίο διευθύνσεων"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Περισσότερα..."
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f0ece524c3..016e9fe599 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "__όνομα_γλώσσας__"
 msgid "Security Warning"
 msgstr "Προειδοποίηση Ασφαλείας"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Περισσότερο"
 
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index d01d9bb11b..b0799bee78 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.po
@@ -3,26 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Ne ĉiuj kalendaroj estas tute kaŝmemorigitaj"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Ĉio ŝajnas tute kaŝmemorigita"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Neniu kalendaro troviĝis."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Neniu okazaĵo troviĝis."
 
@@ -30,300 +39,394 @@ msgstr "Neniu okazaĵo troviĝis."
 msgid "Wrong calendar"
 msgstr "Malĝusta kalendaro"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Aŭ la dosiero enhavas neniun okazaĵon aŭ ĉiuj okazaĵoj jam estas konservitaj en via kalendaro."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "okazaĵoj estas konservitaj en la nova kalendaro"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Enporto malsukcesis"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "okazaĵoj estas konservitaj en via kalendaro"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova horzono:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "La horozono estas ŝanĝita"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Nevalida peto"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendaro"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd d/M"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd d/M"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, d-a de MMM yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Naskiĝotago"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negoco"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Voko"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klientoj"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Livero"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Ferioj"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideoj"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Vojaĝo"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileo"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Rendevuo"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Alia"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persona"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektoj"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Demandoj"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "de"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nenomita"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nova kalendaro"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ĉi tio ne ripetiĝas"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Tage"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semajne"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Labortage"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Semajnduope"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Monate"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Jare"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "neniam"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "laŭ aperoj"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "laŭ dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "laŭ monattago"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "laŭ semajntago"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "lundo"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "mardo"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "merkredo"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "ĵaŭdo"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "vendredo"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "sabato"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "dimanĉo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "la monatsemajno de la okazaĵo"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "unua"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "dua"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tria"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "kvara"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "kvina"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "lasta"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januaro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februaro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marto"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprilo"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Majo"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junio"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Aŭgusto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktobro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "laŭ okazaĵdato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "laŭ jartago(j)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "laŭ semajnnumero(j)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "laŭ tago kaj monato"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "dim."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "lun."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "mar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "mer."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "ĵaŭ."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "ven."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "sab."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Aŭg."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dec."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "La tuta tago"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nova kalendaro"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Mankas iuj kampoj"
@@ -357,40 +460,32 @@ msgstr "La okazaĵo finas antaŭ komenci"
 msgid "There was a database fail"
 msgstr "Datumbaza malsukceso okazis"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semajno"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Monato"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Listo"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hodiaŭ"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendaroj"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Malsukceso okazis dum analizo de la dosiero."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Elektu aktivajn kalendarojn"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Viaj kalendaroj"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-a ligilo"
 
@@ -402,19 +497,19 @@ msgstr "Kunhavigitaj kalendaroj"
 msgid "No shared calendars"
 msgstr "Neniu kunhavigita kalendaro"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Kunhavigi kalendaron"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Redakti"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Forigi"
@@ -500,23 +595,23 @@ msgstr "Disigi kategoriojn per komoj"
 msgid "Edit categories"
 msgstr "Redakti kategoriojn"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "La tuta tago"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Ekde"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Ĝis"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Altnivela agordo"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Loko"
 
@@ -524,7 +619,7 @@ msgstr "Loko"
 msgid "Location of the Event"
 msgstr "Loko de okazaĵo"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Priskribo"
 
@@ -532,84 +627,86 @@ msgstr "Priskribo"
 msgid "Description of the Event"
 msgstr "Okazaĵopriskribo"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Altnivelo"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Elekti semajntagojn"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Elekti tagojn"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "kaj la jartago de la okazaĵo."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "kaj la monattago de la okazaĵo."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Elekti monatojn"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Elekti semajnojn"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "kaj la jarsemajno de la okazaĵo."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fino"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "aperoj"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Enporti kalendarodosieron"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Bonvolu elekti kalendaron"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Krei novan kalendaron"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Enporti kalendarodosieron"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Bonvolu elekti kalendaron"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nomo de la nova kalendaro"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Prenu haveblan nomon!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Kalendaro kun ĉi tiu nomo jam ekzastas. Se vi malgraŭe daŭros, ĉi tiuj kalendaroj kunfandiĝos."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Enporti"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalendaro estas enportata"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "La kalendaro enportiĝis sukcese"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fermi la dialogon"
 
@@ -625,45 +722,73 @@ msgstr "Vidi okazaĵon"
 msgid "No categories selected"
 msgstr "Neniu kategorio elektita"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Elekti kategorion"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "ĉe"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Horozono"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Ĉiam kontroli ĉu la horzono ŝanĝiĝis"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tempoformo"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Unua tago de la semajno"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adreso de kalendarosinkronigo per CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "Kaŝmemoro"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "Forviŝi kaŝmemoron por ripeto de okazaĵoj"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "sinkronigaj adresoj por CalDAV-kalendaroj"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "pli da informo"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "Ĉefa adreso (Kontact kaj aliaj)"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "Nurlegebla(j) iCalendar-ligilo(j)"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 94fd3651af..7a635c7d61 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Eraro dum (mal)aktivigo de adresaro."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "identigilo ne agordiĝis."
 
@@ -61,7 +61,7 @@ msgstr "Neniu kontakto troviĝis."
 msgid "There was an error adding the contact."
 msgstr "Eraro okazis dum aldono de kontakto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "eronomo ne agordiĝis."
 
@@ -85,11 +85,11 @@ msgstr "Provante aldoni duobligitan propraĵon:"
 msgid "Error adding contact property: "
 msgstr "Eraro aldonante kontakta propraĵo:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Eraro dum forigo de kontaktopropraĵo."
 
@@ -101,19 +101,19 @@ msgstr "Mankas identigilo"
 msgid "Error parsing VCard for ID: \""
 msgstr "Eraro dum analizo de VCard por identigilo:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrolsumo ne agordiĝis."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
@@ -162,19 +162,19 @@ msgstr "Eraro dum ekhaviĝis la propraĵon PHOTO."
 msgid "Error saving contact."
 msgstr "Eraro dum konserviĝis kontakto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Eraro dum aligrandiĝis bildo"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Eraro dum stuciĝis bildo."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Eraro dum kreiĝis provizora bildo."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Eraro dum serĉo de bildo: "
 
@@ -188,13 +188,13 @@ msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
 #: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "La alŝutita dosiero transpasas la preskribon upload_max_filesize en php.ini"
 
 #: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "La alŝutita dosiero transpasas la preskribon MAX_FILE_SIZE kiu specifiĝis en la HTML-formularo"
 
 #: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
@@ -272,6 +272,10 @@ msgstr "Neniu dosiero elektita por alŝuto."
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
+msgstr "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo."
+
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
 msgstr ""
 
 #: js/contacts.js:1337 js/contacts.js:1371
@@ -380,7 +384,7 @@ msgstr "Negoco"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Voko"
 
 #: lib/app.php:186
 msgid "Clients"
@@ -392,7 +396,7 @@ msgstr ""
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Ferioj"
 
 #: lib/app.php:189
 msgid "Ideas"
@@ -476,11 +480,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Sekva adresaro"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Malsekva adresaro"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -488,7 +492,7 @@ msgstr "Agoj"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Refreŝigi la kontaktoliston"
 
 #: templates/index.php:59
 msgid "Add new contact"
@@ -532,7 +536,7 @@ msgstr "Redakti detalojn de nomo"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Forigi"
 
@@ -843,30 +847,30 @@ msgstr "Montri nur legeblan VCF-ligilon"
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Redakti"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova adresaro"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Priskribo"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Pli..."
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 19ee661a93..562f231186 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -49,7 +49,7 @@ msgstr "La lingvo estas ŝanĝita"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Eraro"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -71,11 +71,15 @@ msgstr "Esperanto"
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Pli"
 
diff --git a/l10n/es/calendar.po b/l10n/es/calendar.po
index 4306d405f6..06a6465879 100644
--- a/l10n/es/calendar.po
+++ b/l10n/es/calendar.po
@@ -3,29 +3,39 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+#   <rafabayona@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Aún no se han guardado en caché todos los calendarios"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Parece que se ha guardado todo en caché"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "No se encontraron calendarios."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "No se encontraron eventos."
 
@@ -33,300 +43,394 @@ msgstr "No se encontraron eventos."
 msgid "Wrong calendar"
 msgstr "Calendario incorrecto"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "El archivo no contiene eventos o ya existen en tu calendario."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "Los eventos han sido guardados en el nuevo calendario"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Fallo en la importación"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "eventos se han guardado en tu calendario"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nueva zona horaria:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zona horaria cambiada"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Petición no válida"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negocios"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Llamada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Entrega"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Festivos"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Viaje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Aniversario"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Otro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proyectos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "por"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "Sin nombre"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nuevo calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "No se repite"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diariamente"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Días de semana laboral"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Cada 2 semanas"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anualmente"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por ocurrencias"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por fecha"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por día del mes"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por día de la semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lunes"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martes"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Jueves"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Viernes"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "eventos de la semana del mes"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primer"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tercer"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "cuarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Enero"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Febrero"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzo"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mayo"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junio"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septiembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octubre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Noviembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Diciembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "por fecha de los eventos"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por día(s) del año"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) de semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por día y mes"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Fecha"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Dom."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Lun."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Mar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Mier."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Jue."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Vie."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Sab."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Ene."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Abr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "May."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Ago."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Oct."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dic."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo el día"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nuevo calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Los campos que faltan"
@@ -360,40 +464,32 @@ msgstr "El evento termina antes de que comience"
 msgid "There was a database fail"
 msgstr "Se ha producido un error en la base de datos"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoy"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Se ha producido un fallo al analizar el archivo."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Elige los calendarios activos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Tus calendarios"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Enlace a CalDav"
 
@@ -405,19 +501,19 @@ msgstr "Calendarios compartidos"
 msgid "No shared calendars"
 msgstr "Calendarios no compartidos"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Compartir calendario"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Eliminar"
@@ -503,23 +599,23 @@ msgstr "Separar categorías con comas"
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Todo el día"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Desde"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Hasta"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lugar"
 
@@ -527,7 +623,7 @@ msgstr "Lugar"
 msgid "Location of the Event"
 msgstr "Lugar del evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descripción"
 
@@ -535,84 +631,86 @@ msgstr "Descripción"
 msgid "Description of the Event"
 msgstr "Descripción del evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleccionar días de la semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleccionar días"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "y el día del año de los eventos."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "y el día del mes de los eventos."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleccionar meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleccionar semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "y la semana del año de los eventos."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importar un archivo de calendario"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor elige el calendario"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Crear un nuevo calendario"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importar un archivo de calendario"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Por favor, escoge un calendario"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nombre del nuevo calendario"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "¡Elige un nombre disponible!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Ya existe un calendario con este nombre. Si continúas, se combinarán los calendarios."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importar"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importando calendario"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendario importado exitosamente"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Cerrar diálogo"
 
@@ -628,45 +726,73 @@ msgstr "Ver un evento"
 msgid "No categories selected"
 msgstr "Ninguna categoría seleccionada"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Seleccionar categoría"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "a las"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Comprobar siempre por cambios en la zona horaria"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato de hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primer día de la semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Dirección de sincronización de calendario CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "Caché"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "Limpiar caché de eventos recurrentes"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Direcciones de sincronización de calendario CalDAV:"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "Más información"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "Dirección principal (Kontact y otros)"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "Enlace(s) iCalendar de sólo lectura"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 7ea5f0efd0..d3ffeee5d3 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +28,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Error al (des)activar libreta de direcciones."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "no se ha puesto ninguna ID."
 
@@ -64,7 +65,7 @@ msgstr "No se encontraron contactos."
 msgid "There was an error adding the contact."
 msgstr "Se ha producido un error al añadir el contacto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "no se ha puesto ningún nombre de elemento."
 
@@ -88,11 +89,11 @@ msgstr "Intentando añadir una propiedad duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Error al borrar una propiedad del contacto."
 
@@ -104,19 +105,19 @@ msgstr "Falta la ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Error al analizar el VCard para la ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "no se ha puesto ninguna suma de comprobación."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
@@ -165,19 +166,19 @@ msgstr "Fallo al coger las propiedades de la foto ."
 msgid "Error saving contact."
 msgstr "Fallo al salvar un contacto"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Fallo al cambiar de tamaño una foto"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Fallo al cortar el tamaño de la foto"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Fallo al crear la foto temporal"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Fallo al encontrar la imagen"
 
@@ -277,6 +278,10 @@ msgid ""
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Selecciona el tipo"
@@ -379,15 +384,15 @@ msgstr "Cumpleaños"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Negocio"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Llamada"
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
 #: lib/app.php:187
 msgid "Deliverer"
@@ -395,15 +400,15 @@ msgstr ""
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Vacaciones"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Ideas"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Jornada"
 
 #: lib/app.php:191
 msgid "Jubilee"
@@ -411,23 +416,23 @@ msgstr ""
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Otro"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Proyectos"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Preguntas"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -447,7 +452,7 @@ msgstr "Importar"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Configuración"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -459,19 +464,19 @@ msgstr "Cierra."
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Atajos de teclado"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navegación"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Siguiente contacto en la lista"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Anterior contacto en la lista"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
@@ -487,15 +492,15 @@ msgstr ""
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Acciones"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Refrescar la lista de contactos"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Añadir un nuevo contacto"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
@@ -503,7 +508,7 @@ msgstr ""
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Eliminar contacto actual"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -535,7 +540,7 @@ msgstr "Editar los detalles del nombre"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Borrar"
 
@@ -549,7 +554,7 @@ msgstr "Introduce un alias"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Sitio Web"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
@@ -687,7 +692,7 @@ msgstr "Código postal"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Código postal"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -812,11 +817,11 @@ msgstr ""
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Introducir nombre"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Introducir descripción"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -846,30 +851,30 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nueva libreta de direcciones"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr "Descripción"
 
 #: templates/settings.php:43
-msgid "Description"
-msgstr ""
-
-#: templates/settings.php:45
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Más..."
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8c089dee77..2bee7a486a 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 #   <monty_2731@hotmail.com>, 2011.
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Imposible cargar la lista desde App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,7 +55,7 @@ msgstr "Idioma cambiado"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -76,11 +77,15 @@ msgstr "Castellano"
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Más"
 
diff --git a/l10n/et_EE/calendar.po b/l10n/et_EE/calendar.po
index 2cca9be319..9a8efeb028 100644
--- a/l10n/et_EE/calendar.po
+++ b/l10n/et_EE/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Kalendreid ei leitud."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Üritusi ei leitud."
 
@@ -30,300 +38,394 @@ msgstr "Üritusi ei leitud."
 msgid "Wrong calendar"
 msgstr "Vale kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Uus ajavöönd:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Ajavöönd on muudetud"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Äri"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Helista"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kliendid"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Kohaletoimetaja"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Pühad"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideed"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reis"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Juubel"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Kohtumine"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Isiklik"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektid"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Küsimused"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nimetu"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Uus kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ei kordu"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Iga päev"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Iga nädal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Igal nädalapäeval"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Üle nädala"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Igal kuul"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Igal aastal"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "mitte kunagi"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "toimumiskordade järgi"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "kuupäeva järgi"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "kuu päeva järgi"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "nädalapäeva järgi"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Reede"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "ürituse kuu nädal"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "esimene"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "teine"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "kolmas"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "neljas"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "viies"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "viimane"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Jaanuar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Veebruar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Märts"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprill"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juuni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juuli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktoober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Detsember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "ürituste kuupäeva järgi"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "aasta päeva(de) järgi"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "nädala numbri(te) järgi"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "kuu ja päeva järgi"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Kuupäev"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Kogu päev"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Uus kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Puuduvad väljad"
@@ -357,40 +459,32 @@ msgstr "Üritus lõpeb enne, kui see algab"
 msgid "There was a database fail"
 msgstr "Tekkis andmebaasi viga"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Nädal"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Kuu"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Nimekiri"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Täna"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendrid"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Faili parsimisel tekkis viga."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vali aktiivsed kalendrid"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Sinu kalendrid"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -402,19 +496,19 @@ msgstr "Jagatud kalendrid"
 msgid "No shared calendars"
 msgstr "Jagatud kalendreid pole"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Jaga kalendrit"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Muuda"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Kustuta"
@@ -500,23 +594,23 @@ msgstr "Eralda kategooriad komadega"
 msgid "Edit categories"
 msgstr "Muuda kategooriaid"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Kogu päeva sündmus"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Alates"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Kuni"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Lisavalikud"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Asukoht"
 
@@ -524,7 +618,7 @@ msgstr "Asukoht"
 msgid "Location of the Event"
 msgstr "Sündmuse toimumiskoht"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -532,84 +626,86 @@ msgstr "Kirjeldus"
 msgid "Description of the Event"
 msgstr "Sündmuse kirjeldus"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Korda"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Täpsem"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vali nädalapäevad"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vali päevad"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "ja ürituse päev aastas."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "ja ürituse päev kuus."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vali kuud"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vali nädalad"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "ja ürituse nädal aastas."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Lõpp"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "toimumiskordi"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Impordi kalendrifail"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Palun vali kalender"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "loo uus kalender"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Impordi kalendrifail"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Uue kalendri nimi"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Impordi"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalendri importimine"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender on imporditud"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Sulge dialoogiaken"
 
@@ -625,45 +721,73 @@ msgstr "Vaata üritust"
 msgid "No categories selected"
 msgstr "Ühtegi kategooriat pole valitud"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Salvesta kategooria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "/"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "kell"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Kontrolli alati muudatusi ajavööndis"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Aja vorming"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Nädala esimene päev"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kalendri CalDAV sünkroniseerimise aadress:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 912ab345d2..74db6a2d97 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID on määramata."
 
@@ -60,7 +60,7 @@ msgstr "Ühtegi kontakti ei leitud."
 msgid "There was an error adding the contact."
 msgstr "Konktakti lisamisel tekkis viga."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "elemendi nime pole määratud."
 
@@ -84,11 +84,11 @@ msgstr "Proovitakse lisada topeltomadust: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Viga konktaki korralikul kustutamisel."
 
@@ -100,19 +100,19 @@ msgstr "Puudub ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Viga VCard-ist ID parsimisel: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrollsummat pole määratud."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
@@ -161,19 +161,19 @@ msgstr "Viga PHOTO omaduse hankimisel."
 msgid "Error saving contact."
 msgstr "Viga kontakti salvestamisel."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Viga pildi suuruse muutmisel"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Viga pildi lõikamisel"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Viga ajutise pildi loomisel"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Viga pildi leidmisel: "
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vali tüüp"
@@ -531,7 +535,7 @@ msgstr "Muuda nime üksikasju"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Muuda"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Loobu"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 0c380a399f..a5c1c05e8e 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "Eesti"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Veel"
 
diff --git a/l10n/eu/calendar.po b/l10n/eu/calendar.po
index 15d3461f55..9617f72ac3 100644
--- a/l10n/eu/calendar.po
+++ b/l10n/eu/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Egutegi guztiak ez daude guztiz cacheatuta"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Dena guztiz cacheatuta dagoela dirudi"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Ez da egutegirik aurkitu."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Ez da gertaerarik aurkitu."
 
@@ -32,300 +40,394 @@ msgstr "Ez da gertaerarik aurkitu."
 msgid "Wrong calendar"
 msgstr "Egutegi okerra"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Fitxategiak ez zuen gertaerarik edo gertaera guztiak dagoeneko egutegian gordeta zeuden."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "gertaerak egutegi berrian gorde dira"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Inportazioak huts egin du"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "gertaerak zure egutegian gorde dira"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ordu-zonalde berria"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Ordu-zonaldea aldatuta"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Baliogabeko eskaera"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "yyyy MMMM"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Jaioteguna"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negozioa"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Deia"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Bezeroak"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Banatzailea"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Oporrak"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideiak"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Bidaia"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Urteurrena"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Bilera"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proiektuak"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Galderak"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "izengabea"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Egutegi berria"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ez da errepikatzen"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Egunero"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Astero"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Asteko egun guztietan"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Bi-Astero"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Hilabetero"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Urtero"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "inoiz"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "errepikapen kopuruagatik"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "dataren arabera"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "hileko egunaren arabera"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "asteko egunaren arabera"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Astelehena"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Ostirala"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Igandea"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "gertaeraren hilabeteko astea"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "lehenengoa"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "bigarrean"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "hirugarrena"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "laugarrena"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "bostgarrena"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "azkena"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Urtarrila"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Otsaila"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Martxoa"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Apirila"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maiatza"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Ekaina"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Uztaila"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Abuztua"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Iraila"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Urria"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Azaroa"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Abendua"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "gertaeren dataren arabera"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "urteko egunaren arabera"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "aste zenbaki(ar)en arabera"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "eguna eta hilabetearen arabera"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Eg."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "ig."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "al."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "ar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "az."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "og."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "ol."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "lr."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "urt."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "ots."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "api."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "mai."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "eka."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "uzt."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "abu."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "ira."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "urr."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "aza."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "abe."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Egun guztia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Egutegi berria"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Eremuak faltan"
@@ -359,40 +461,32 @@ msgstr "Gertaera hasi baino lehen bukatzen da"
 msgid "There was a database fail"
 msgstr "Datu-baseak huts egin du"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Astea"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Hilabetea"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Zerrenda"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Gaur"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Egutegiak"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Huts bat egon da, fitxategia aztertzen zen bitartea."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aukeratu egutegi aktiboak"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Zure egutegiak"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav lotura"
 
@@ -404,19 +498,19 @@ msgstr "Elkarbanatutako egutegiak"
 msgid "No shared calendars"
 msgstr "Ez dago elkarbanatutako egutegirik"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Elkarbanatu egutegia"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editatu"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Ezabatu"
@@ -502,23 +596,23 @@ msgstr "Banatu kategoriak komekin"
 msgid "Edit categories"
 msgstr "Editatu kategoriak"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Egun osoko gertaera"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Hasiera"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Bukaera"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Aukera aurreratuak"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Kokalekua"
 
@@ -526,7 +620,7 @@ msgstr "Kokalekua"
 msgid "Location of the Event"
 msgstr "Gertaeraren kokalekua"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Deskribapena"
 
@@ -534,84 +628,86 @@ msgstr "Deskribapena"
 msgid "Description of the Event"
 msgstr "Gertaeraren deskribapena"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Errepikatu"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Hautatu asteko egunak"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Hautatu egunak"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "eta gertaeraren urteko eguna."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "eta gertaeraren hilabeteko eguna."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Hautatu hilabeteak"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Hautatu asteak"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "eta gertaeraren urteko astea."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Tartea"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Amaiera"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "errepikapenak"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Inportatu egutegi fitxategi bat"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Mesedez aukeratu egutegia"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "sortu egutegi berria"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Inportatu egutegi fitxategi bat"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Mesedez aukeratu egutegi bat."
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Egutegi berriaren izena"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Hartu eskuragarri dagoen izen bat!"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Izen hau duen egutegi bat dagoeneko existitzen da. Hala ere jarraitzen baduzu, egutegi hauek elkartuko dira."
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importatu"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Egutegia inportatzen"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Egutegia ongi inportatu da"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Itxi lehioa"
 
@@ -627,45 +723,73 @@ msgstr "Ikusi gertaera bat"
 msgid "No categories selected"
 msgstr "Ez da kategoriarik hautatu"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Aukeratu kategoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Ordu-zonaldea"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Egiaztatu beti ordu-zonalde aldaketen bila"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Ordu formatua"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Asteko lehenego eguna"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Egutegiaren CalDAV sinkronizazio helbidea"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "Cache"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "Ezabatu gertaera errepikakorren cachea"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Egutegiaren CalDAV sinkronizazio helbideak"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "informazio gehiago"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "Helbide nagusia"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 64cdef7d1a..df6730af06 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "IDa ez da ezarri."
 
@@ -62,7 +62,7 @@ msgstr "Ez da kontakturik aurkitu."
 msgid "There was an error adding the contact."
 msgstr "Errore bat egon da kontaktua gehitzerakoan"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "elementuaren izena ez da ezarri."
 
@@ -86,11 +86,11 @@ msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 msgid "Error adding contact property: "
 msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Errorea kontaktu propietatea ezabatzean."
 
@@ -102,19 +102,19 @@ msgstr "ID falta da"
 msgid "Error parsing VCard for ID: \""
 msgstr "Errorea VCard analizatzean hurrengo IDrako: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Kontrol-batura ezarri gabe dago."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
@@ -163,19 +163,19 @@ msgstr "Errore bat izan da PHOTO propietatea lortzean."
 msgid "Error saving contact."
 msgstr "Errore bat izan da kontaktua gordetzean."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Errore bat izan da irudiaren tamaina aldatzean"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Errore bat izan da irudia mozten"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Errore bat izan da aldi bateko irudia sortzen"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Ezin izan da irudia aurkitu:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Hautatu mota"
@@ -533,7 +537,7 @@ msgstr "Editatu izenaren zehaztasunak"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editatu"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 89f2191352..a70349dd16 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "Euskera"
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Gehiago"
 
diff --git a/l10n/eu_ES/calendar.po b/l10n/eu_ES/calendar.po
index 3a9d6f6d23..24f487f526 100644
--- a/l10n/eu_ES/calendar.po
+++ b/l10n/eu_ES/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index 840b293048..c0c80cfb38 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 571fd1f6aa..ee07271825 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fa/calendar.po b/l10n/fa/calendar.po
index 36e72a9262..1702670824 100644
--- a/l10n/fa/calendar.po
+++ b/l10n/fa/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "هیچ تقویمی پیدا نشد"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "هیچ رویدادی پیدا نشد"
 
@@ -30,300 +38,394 @@ msgstr "هیچ رویدادی پیدا نشد"
 msgid "Wrong calendar"
 msgstr "تقویم اشتباه"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "زمان محلی جدید"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "زمان محلی تغییر یافت"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "درخواست نامعتبر"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "تقویم"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "روزتولد"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "تجارت"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "تماس گرفتن"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "مشتریان"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "نجات"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "روزهای تعطیل"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "ایده ها"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "سفر"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "سالگرد"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "ملاقات"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "دیگر"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "شخصی"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "پروژه ها"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "سوالات"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "نام گذاری نشده"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "تقویم جدید"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "تکرار نکنید"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "روزانه"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "هفتهگی"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "هرروز هفته"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "دوهفته"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "ماهانه"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "سالانه"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "هرگز"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "به وسیله ظهور"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "به وسیله تاریخ"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "به وسیله روزهای ماه"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "به وسیله روز های هفته"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "جمعه"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "شنبه"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "رویداد های  هفته هایی از ماه"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "اولین"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "دومین"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "سومین"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "چهارمین"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "پنجمین"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "آخرین"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "ژانویه"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "فبریه"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "مارس"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "آوریل"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "می"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "ژوءن"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "جولای"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "آگوست"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "سپتامبر"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "اکتبر"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "نوامبر"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "دسامبر"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "به وسیله رویداد های روزانه"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "به وسیله روز های سال(ها)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "به وسیله شماره هفته(ها)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "به وسیله روز و ماه"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "تاریخ"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "تقویم."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "هرروز"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "تقویم جدید"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "فیلد های گم شده"
@@ -357,40 +459,32 @@ msgstr "رویداد قبل از شروع شدن تمام شده!"
 msgid "There was a database fail"
 msgstr "یک پایگاه داده فرو مانده است"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "هفته"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "ماه"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "فهرست"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "امروز"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "تقویم ها"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "ناتوان در تجزیه پرونده"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "تقویم فعال را انتخاب کنید"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "تقویم های شما"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -402,19 +496,19 @@ msgstr "تقویمهای به اشترک گذاری شده"
 msgid "No shared calendars"
 msgstr "هیچ تقویمی به  اشتراک گذارده نشده"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "تقویم را به اشتراک بگذارید"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "ویرایش"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "پاک کردن"
@@ -500,23 +594,23 @@ msgstr "گروه ها را به وسیله درنگ نما از هم جدا کن
 msgid "Edit categories"
 msgstr "ویرایش گروه"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "رویداد های روزانه"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "از"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "به"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "تنظیمات حرفه ای"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "منطقه"
 
@@ -524,7 +618,7 @@ msgstr "منطقه"
 msgid "Location of the Event"
 msgstr "منطقه رویداد"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "توضیحات"
 
@@ -532,84 +626,86 @@ msgstr "توضیحات"
 msgid "Description of the Event"
 msgstr "توضیحات درباره رویداد"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "تکرار"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "انتخاب روز های هفته "
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "انتخاب روز ها"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "و رویداد های روز از سال"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "و رویداد های روز از ماه"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "انتخاب ماه ها"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "انتخاب هفته ها"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "و رویداد هفته ها از سال"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "فاصله"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "پایان"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ظهور"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "یک پرونده حاوی تقویم وارد کنید"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "لطفا تقویم را انتخاب کنید"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "یک تقویم جدید ایجاد کنید"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "یک پرونده حاوی تقویم وارد کنید"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "نام تقویم جدید"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "ورودی دادن"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "درحال افزودن تقویم"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "افزودن تقویم موفقیت آمیز بود"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "بستن دیالوگ"
 
@@ -625,45 +721,73 @@ msgstr "دیدن یک رویداد"
 msgid "No categories selected"
 msgstr "هیچ گروهی انتخاب نشده"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "انتخاب گروه"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "از"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "در"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "زمان محلی"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "همیشه بررسی کنید برای تغییر زمان محلی"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "نوع زمان"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 ساعت"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 ساعت"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "یکمین روز هفته"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Calendar CalDAV syncing address :"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 7b2e343e51..585d7ae6c2 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "شناسه تعیین نشده"
 
@@ -60,7 +60,7 @@ msgstr "هیچ شخصی پیدا نشد"
 msgid "There was an error adding the contact."
 msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "نام اصلی تنظیم نشده است"
 
@@ -84,11 +84,11 @@ msgstr "امتحان کردن برای وارد کردن مشخصات تکرار
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "خطا در هنگام پاک کرد ویژگی"
 
@@ -100,19 +100,19 @@ msgstr "نشانی گم شده"
 msgid "Error parsing VCard for ID: \""
 msgstr "خطا در تجزیه کارت ویزا برای شناسه:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum تنظیم شده نیست"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
@@ -161,19 +161,19 @@ msgstr "خطا در دربافت تصویر ویژگی شخصی"
 msgid "Error saving contact."
 msgstr "خطا در ذخیره سازی اطلاعات"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "خطا در تغییر دادن اندازه تصویر"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "خطا در برداشت تصویر"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "خطا در ساخت تصویر  temporary"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "خطا در پیدا کردن تصویر:"
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
@@ -531,7 +535,7 @@ msgstr "ویرایش نام جزئیات"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "پاک کردن"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "ویرایش"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "کتابچه نشانه های جدید"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "ذخیره سازی"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "انصراف"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 1959264ab4..88c04586e9 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 01:13+0000\n"
-"Last-Translator: vahid chakoshy <vchakoshy@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,11 +71,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "بیشتر"
 
diff --git a/l10n/fi/calendar.po b/l10n/fi/calendar.po
index 8bf64c073a..9b551fc88c 100644
--- a/l10n/fi/calendar.po
+++ b/l10n/fi/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index d981913ecc..537fe182c3 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-09-23 17:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 940a5cbc09..a167d4f555 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index d280acc0f2..f8b5e83e77 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 15:53+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,31 +72,30 @@ msgstr "Virheellinen pyyntö"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -221,7 +220,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -245,7 +244,7 @@ msgstr "Perjantai"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -462,33 +461,25 @@ msgstr "Tapahtuma päättyy ennen alkamistaan"
 msgid "There was a database fail"
 msgstr "Tapahtui tietokantavirhe"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Viikko"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Kuukausi"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Tänään"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Kalenterit"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Tiedostoa jäsennettäessä tapahtui virhe."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Valitse aktiiviset kalenterit"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -740,55 +731,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Tarkista aina aikavyöhykkeen muutokset"
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Ajan esitysmuoto"
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr "24 tuntia"
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr "12 tuntia"
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Viikon ensimmäinen päivä"
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr "Kalenterin CalDAV-synkronointiosoitteet"
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr "24 tuntia"
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr "12 tuntia"
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Kalenterin CalDAV-synkronointiosoitteet"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 43e05ac6ee..35b090e46b 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 
 #: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Virhe asettaessa tarkistussummaa."
 
 #: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
@@ -63,7 +63,7 @@ msgstr "Yhteystietoja ei löytynyt."
 msgid "There was an error adding the contact."
 msgstr "Virhe yhteystietoa lisättäessä."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -87,11 +87,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
 
@@ -103,19 +103,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
@@ -142,7 +142,7 @@ msgstr ""
 
 #: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Kuvan polkua ei annettu."
 
 #: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
@@ -164,19 +164,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -212,11 +212,11 @@ msgstr "Tilapäiskansio puuttuu"
 
 #: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Väliaikaiskuvan tallennus epäonnistui:"
 
 #: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Väliaikaiskuvan lataus epäonnistui:"
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -284,7 +288,7 @@ msgstr ""
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -478,11 +482,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Seuraava osoitekirja"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Edellinen osoitekirja"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -534,7 +538,7 @@ msgstr "Muokkaa nimitietoja"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Poista"
 
@@ -845,30 +849,30 @@ msgstr "Näytä vain luku -muodossa oleva VCF-linkki"
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Kuvaus"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Peru"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Lisää..."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 25c546781e..2df852fc4a 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 10:15+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,11 +71,15 @@ msgstr "_kielen_nimi_"
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Lisää"
 
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 00c24da8a9..c69485641c 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 13:48+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,31 +78,30 @@ msgstr "Requête invalide"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d MMM, yyyy"
 
@@ -227,7 +226,7 @@ msgstr "par jour du mois"
 msgid "by weekday"
 msgstr "par jour de la semaine"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lundi"
 
@@ -251,7 +250,7 @@ msgstr "Vendredi"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -468,33 +467,25 @@ msgstr "L'évènement s'est terminé avant qu'il ne commence"
 msgid "There was a database fail"
 msgstr "Il y a eu un échec dans la base de donnée"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semaine"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mois"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Calendriers"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Une erreur est survenue pendant la lecture du fichier."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Choix des calendriers actifs"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -746,55 +737,63 @@ msgstr "de"
 msgid "at"
 msgstr "à"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Toujours vérifier d'éventuels changements de fuseau horaire"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format de l'heure"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Premier jour de la semaine"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Nettoyer le cache des événements répétitifs"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Adresses de synchronisation des calendriers CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "plus d'infos"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Adresses principales (Kontact et assimilés)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "lien(s) iCalendar en lecture seule"
 
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 6d0c2315d9..6680c0a183 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 20:28+0000\n"
-"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,8 +33,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "L'ID n'est pas défini."
 
@@ -70,7 +70,7 @@ msgstr "Aucun contact trouvé."
 msgid "There was an error adding the contact."
 msgstr "Une erreur s'est produite lors de l'ajout du contact."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "Le champ Nom n'est pas défini."
 
@@ -94,11 +94,11 @@ msgstr "Ajout d'une propriété en double:"
 msgid "Error adding contact property: "
 msgstr "Erreur pendant l'ajout de la propriété du contact :"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Erreur lors de la suppression du champ."
 
@@ -110,19 +110,19 @@ msgstr "ID manquant"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "L'hachage n'est pas défini."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
@@ -171,19 +171,19 @@ msgstr "Erreur lors de l'obtention des propriétés de la photo"
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
@@ -283,6 +283,10 @@ msgid ""
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Sélectionner un type"
@@ -291,7 +295,7 @@ msgstr "Sélectionner un type"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -846,7 +850,7 @@ msgstr "Afficher le lien CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Afficher les liens VCF en lecture seule"
 
 #: templates/settings.php:26
 msgid "Download"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 5904706ab7..3215b1bc94 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 20:25+0000\n"
-"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,15 @@ msgstr "Français"
 msgid "Security Warning"
 msgstr "Alertes de sécurité"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index 64798f954a..d9a060f2dc 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Non se atoparon calendarios."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Non se atoparon eventos."
 
@@ -31,300 +39,394 @@ msgstr "Non se atoparon eventos."
 msgid "Wrong calendar"
 msgstr "Calendario equivocado"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Novo fuso horario:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fuso horario trocado"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Petición non válida"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d,yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Traballo"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Chamada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Remitente"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vacacións"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Viaxe"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Aniversario especial"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persoal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proxectos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sen nome"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novo calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Non se repite"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "A diario"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Todas as semanas"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Cada dúas semanas"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensual"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por acontecementos"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por día do mes"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por día da semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Luns"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martes"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Xoves"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Venres"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "semana dos eventos no mes"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primeiro"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terceiro"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "cuarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Xaneiro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Febreiro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzo"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Xuño"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Xullo"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Outubro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "por data dos eventos"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por dia(s) do ano"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) de semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por día e mes"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novo calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Faltan campos"
@@ -358,40 +460,32 @@ msgstr "O evento remata antes de iniciarse"
 msgid "There was a database fail"
 msgstr "Produciuse un erro na base de datos"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoxe"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Produciuse un erro ao procesar o ficheiro"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Escolla os calendarios activos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Os seus calendarios"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Ligazón CalDav"
 
@@ -403,19 +497,19 @@ msgstr "Calendarios compartidos"
 msgid "No shared calendars"
 msgstr "Sen calendarios compartidos"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Compartir calendario"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Borrar"
@@ -501,23 +595,23 @@ msgstr "Separe as categorías con comas"
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Eventos do día"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Desde"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "a"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opcións avanzadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Localización"
 
@@ -525,7 +619,7 @@ msgstr "Localización"
 msgid "Location of the Event"
 msgstr "Localización do evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrición"
 
@@ -533,84 +627,86 @@ msgstr "Descrición"
 msgid "Description of the Event"
 msgstr "Descrición do evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleccionar días da semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleccionar días"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e día dos eventos no ano."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e día dos eventos no mes."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleccione meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleccionar semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e semana dos eventos no ano."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "acontecementos"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importar un ficheiro de calendario"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor, seleccione o calendario"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "crear un novo calendario"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importar un ficheiro de calendario"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome do novo calendario"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importar"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importar calendario"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendario importado correctamente"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Pechar diálogo"
 
@@ -626,45 +722,73 @@ msgstr "Ver un evento"
 msgid "No categories selected"
 msgstr "Non seleccionou as categorías"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Seleccionar categoría"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "a"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Comprobar sempre cambios de fuso horario"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato de hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primeiro día da semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Enderezo de sincronización do calendario CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 4ff4ac68aa..609d951621 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Produciuse un erro (des)activando a axenda."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "non se estableceu o id."
 
@@ -61,7 +61,7 @@ msgstr "Non se atoparon contactos."
 msgid "There was an error adding the contact."
 msgstr "Produciuse un erro engadindo o contacto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "non se nomeou o elemento."
 
@@ -85,11 +85,11 @@ msgstr "Tentando engadir propiedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Produciuse un erro borrando a propiedade do contacto."
 
@@ -101,19 +101,19 @@ msgstr "ID perdido"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro procesando a VCard para o ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "non se estableceu a suma de verificación."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
@@ -162,19 +162,19 @@ msgstr "Erro obtendo a propiedade PHOTO."
 msgid "Error saving contact."
 msgstr "Erro gardando o contacto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erro cambiando o tamaño da imaxe"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erro recortando a imaxe"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erro creando a imaxe temporal"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erro buscando a imaxe: "
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccione tipo"
@@ -532,7 +536,7 @@ msgstr "Editar detalles do nome"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova axenda"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 450e65227e..eb179af1c1 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "Galego"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Máis"
 
diff --git a/l10n/he/calendar.po b/l10n/he/calendar.po
index a29ec43433..2cbab15c82 100644
--- a/l10n/he/calendar.po
+++ b/l10n/he/calendar.po
@@ -4,27 +4,36 @@
 # 
 # Translators:
 # Elad Alfassa <elad@fedoraproject.org>, 2011.
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "לא נמצאו לוחות שנה."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "לא נמצאו אירועים."
 
@@ -32,300 +41,394 @@ msgstr "לא נמצאו אירועים."
 msgid "Wrong calendar"
 msgstr "לוח שנה לא נכון"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "אזור זמן חדש:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "אזור זמן השתנה"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "בקשה לא חוקית"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "ח שנה"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "עסקים"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "שיחה"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "לקוחות"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "משלוח"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "חגים"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "רעיונות"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "מסע"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "יובל"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "פגישה"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "אחר"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "אישי"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "פרוייקטים"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "שאלות"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "ללא שם"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "לוח שנה חדש"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "ללא חזרה"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "יומי"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "שבועי"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "כל יום עבודה"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "דו שבועי"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "חודשי"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "שנתי"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "לעולם לא"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "לפי מופעים"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "לפי תאריך"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "לפי היום בחודש"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "לפי היום בשבוע"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "יום שני"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "יום רביעי"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "יום שישי"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "שבת"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "שבוע בחודש לציון הפעילות"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "ראשון"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "שני"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "שלישי"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "רביעי"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "חמישי"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "אחרון"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "ינואר"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "פברואר"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "מרץ"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "אפריל"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "מאי"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "יוני"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "יולי"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "אוגוסט"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "ספטמבר"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "אוקטובר"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "נובמבר"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "דצמבר"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "לפי תאריכי האירועים"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "לפי ימים בשנה"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "לפי מספרי השבועות"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "לפי יום וחודש"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "תאריך"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "לוח שנה"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "היום"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "לוח שנה חדש"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "שדות חסרים"
@@ -359,40 +462,32 @@ msgstr "האירוע מסתיים עוד לפני שהתחיל"
 msgid "There was a database fail"
 msgstr "אירע כשל במסד הנתונים"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "שבוע"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "חודש"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "רשימה"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "היום"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "לוחות שנה"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "אירעה שגיאה בעת פענוח הקובץ."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "בחר לוחות שנה פעילים"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "לוחות השנה שלך"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "קישור CalDav"
 
@@ -404,19 +499,19 @@ msgstr "לוחות שנה מושתפים"
 msgid "No shared calendars"
 msgstr "אין לוחות שנה משותפים"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "שיתוף לוח שנה"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "עריכה"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "מחיקה"
@@ -502,23 +597,23 @@ msgstr "הפרדת קטגוריות בפסיק"
 msgid "Edit categories"
 msgstr "עריכת קטגוריות"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "אירוע של כל היום"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "מאת"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "עבור"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "אפשרויות מתקדמות"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "מיקום"
 
@@ -526,7 +621,7 @@ msgstr "מיקום"
 msgid "Location of the Event"
 msgstr "מיקום האירוע"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "תיאור"
 
@@ -534,84 +629,86 @@ msgstr "תיאור"
 msgid "Description of the Event"
 msgstr "תיאור האירוע"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "חזרה"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "יש לבחור ימים בשבוע"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "יש לבחור בימים"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "ויום האירוע בשנה."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "ויום האירוע בחודש."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "יש לבחור בחודשים"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "יש לבחור בשבועות"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "ומספור השבוע הפעיל בשנה."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "משך"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "סיום"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "מופעים"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "יבוא קובץ לוח שנה"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "נא לבחור את לוח השנה"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "יצירת לוח שנה חדש"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "יבוא קובץ לוח שנה"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "שם לוח השנה החדש"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "יבוא"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "היומן מייובא"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "היומן ייובא בהצלחה"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "סגירת הדו־שיח"
 
@@ -627,45 +724,73 @@ msgstr "צפייה באירוע"
 msgid "No categories selected"
 msgstr "לא נבחרו קטגוריות"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "בחר קטגוריה"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "מתוך"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "בשנה"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "אזור זמן"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "יש לבדוק תמיד אם יש הבדלים באזורי הזמן"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "מבנה התאריך"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 שעות"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 שעות"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "היום הראשון בשבוע"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "כתובת הסנכרון ללוח שנה מסוג CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index d3656f0e89..95a5b199da 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "מספר מזהה לא נקבע."
 
@@ -62,7 +62,7 @@ msgstr "לא נמצאו אנשי קשר."
 msgid "There was an error adding the contact."
 msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "שם האלמנט לא נקבע."
 
@@ -86,11 +86,11 @@ msgstr "ניסיון להוספת מאפיין כפול: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
@@ -102,19 +102,19 @@ msgstr "מזהה חסר"
 msgid "Error parsing VCard for ID: \""
 msgstr "שגיאה בפענוח ה VCard עבור מספר המזהה: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "סיכום ביקורת לא נקבע."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
@@ -163,19 +163,19 @@ msgstr "שגיאה בקבלת מידע של תמונה"
 msgid "Error saving contact."
 msgstr "שגיאה בשמירת איש הקשר"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "שגיאה בשינוי גודל התמונה"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -533,7 +537,7 @@ msgstr "ערוך פרטי שם"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "עריכה"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "פנקס כתובות חדש"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "ביטול"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 5f4a6fa767..071d5a1143 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "עברית"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "עוד"
 
diff --git a/l10n/hr/calendar.po b/l10n/hr/calendar.po
index 3623524514..e848e042a0 100644
--- a/l10n/hr/calendar.po
+++ b/l10n/hr/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nisu pronađeni kalendari"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Događaj nije pronađen."
 
@@ -32,300 +40,394 @@ msgstr "Događaj nije pronađen."
 msgid "Wrong calendar"
 msgstr "Pogrešan kalendar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova vremenska zona:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Vremenska zona promijenjena"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neispravan zahtjev"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Praznici"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Putovanje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Obljetnica"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ostalo"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobno"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "bezimeno"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novi kalendar"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ne ponavlja se"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dnevno"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Tjedno"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Svakog radnog dana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dvotjedno"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mjesečno"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Godišnje"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikad"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "po pojavama"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "po datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "po dana mjeseca"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "po tjednu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "utorak"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "četvrtak"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "petak"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "subota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "nedelja"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prvi"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "drugi"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "treći"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "četvrti"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "peti"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "zadnji"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "siječanj"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "veljača"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "ožujak"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "travanj"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "svibanj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "lipanj"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "srpanj"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "kolovoz"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "rujan"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "listopad"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "studeni"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "prosinac"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "po datumu događaja"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po godini(-nama)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "po broju tjedna(-ana)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "po danu i mjeseca"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Cijeli dan"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novi kalendar"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Nedostaju polja"
@@ -359,40 +461,32 @@ msgstr "Događaj završava prije nego počinje"
 msgid "There was a database fail"
 msgstr "Pogreška u bazi podataka"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Tjedan"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mjesec"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Danas"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Pogreška pri čitanju datoteke."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Odabir aktivnih kalendara"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaši kalendari"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav poveznica"
 
@@ -404,19 +498,19 @@ msgstr "Podijeljeni kalendari"
 msgid "No shared calendars"
 msgstr "Nema zajedničkih kalendara"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Podjeli kalendar"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Spremi lokalno"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Briši"
@@ -502,23 +596,23 @@ msgstr "Odvoji kategorije zarezima"
 msgid "Edit categories"
 msgstr "Uredi kategorije"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Cjelodnevni događaj"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Za"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Napredne mogućnosti"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokacija"
 
@@ -526,7 +620,7 @@ msgstr "Lokacija"
 msgid "Location of the Event"
 msgstr "Lokacija događaja"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -534,84 +628,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis događaja"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ponavljanje"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Odaberi dane u tjednu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Odaberi dane"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Odaberi mjesece"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Odaberi tjedne"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Kraj"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "pojave"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Uvozite datoteku kalendara"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Odaberi kalendar"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "stvori novi kalendar"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Uvozite datoteku kalendara"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Ime novog kalendara"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Uvoz"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Uvoz kalendara"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendar je uspješno uvezen"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zatvori dijalog"
 
@@ -627,45 +723,73 @@ msgstr "Vidjeti događaj"
 msgid "No categories selected"
 msgstr "Nema odabranih kategorija"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Odabir kategorije"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "od"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "na"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Provjerite uvijek za promjene vremenske zone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format vremena"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prvi dan tjedna"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa za CalDAV sinkronizaciju kalendara:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index d1a4d81e9b..75ab0abdb2 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Pogreška pri (de)aktivaciji adresara."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id nije postavljen."
 
@@ -61,7 +61,7 @@ msgstr "Nema kontakata."
 msgid "There was an error adding the contact."
 msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "naziv elementa nije postavljen."
 
@@ -85,11 +85,11 @@ msgstr "Pokušali ste dodati duplo svojstvo:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Pogreška pri brisanju svojstva kontakta."
 
@@ -101,19 +101,19 @@ msgstr "Nedostupan ID identifikator"
 msgid "Error parsing VCard for ID: \""
 msgstr "Pogreška pri raščlanjivanju VCard za ID:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum nije postavljen."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr "Uredi detalje imena"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Obriši"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Spremi"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Prekini"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 3f40b533f1..090b47e3d7 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "__ime_jezika__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "više"
 
diff --git a/l10n/hu_HU/calendar.po b/l10n/hu_HU/calendar.po
index 3922bbb27e..4e689ee90e 100644
--- a/l10n/hu_HU/calendar.po
+++ b/l10n/hu_HU/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nem található naptár"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nem található esemény"
 
@@ -31,300 +39,394 @@ msgstr "Nem található esemény"
 msgid "Wrong calendar"
 msgstr "Hibás naptár"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Új időzóna"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Időzóna megváltozott"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Érvénytelen kérés"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Naptár"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "nnn"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "nnn H/n"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "nnnn H/n"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "HHHH éééé"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "nnnn, HHH n, éééé"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Születésap"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Üzlet"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Hívás"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kliensek"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Szállító"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Ünnepek"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ötletek"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Utazás"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Évforduló"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Találkozó"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Egyéb"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Személyes"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektek"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Kérdések"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Munka"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "névtelen"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Új naptár"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Nem ismétlődik"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Napi"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Heti"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Minden hétköznap"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Kéthetente"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Havi"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Évi"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "soha"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "előfordulás szerint"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "dátum szerint"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "hónap napja szerint"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "hét napja szerint"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Hétfő"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Péntek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Szombat"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "hónap heteinek sorszáma"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "első"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "második"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "harmadik"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "negyedik"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "ötödik"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "utolsó"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Január"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Február"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Március"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Április"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Május"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Június"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Július"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augusztus"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Szeptember"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Október"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "az esemény napja szerint"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "az év napja(i) szerint"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "a hét sorszáma szerint"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "nap és hónap szerint"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dátum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Naptár"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Egész nap"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Új naptár"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Hiányzó mezők"
@@ -358,40 +460,32 @@ msgstr "Az esemény véget ér a kezdés előtt."
 msgid "There was a database fail"
 msgstr "Adatbázis hiba történt"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Hét"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Hónap"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Ma"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Naptárak"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Probléma volt a fájl elemzése közben."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aktív naptár kiválasztása"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Naptárjaid"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDAV link"
 
@@ -403,19 +497,19 @@ msgstr "Megosztott naptárak"
 msgid "No shared calendars"
 msgstr "Nincs megosztott naptár"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Naptármegosztás"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Törlés"
@@ -501,23 +595,23 @@ msgstr "Vesszővel válaszd el a kategóriákat"
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Egész napos esemény"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Ettől"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Eddig"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Haladó beállítások"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Hely"
 
@@ -525,7 +619,7 @@ msgstr "Hely"
 msgid "Location of the Event"
 msgstr "Az esemény helyszíne"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Leírás"
 
@@ -533,84 +627,86 @@ msgstr "Leírás"
 msgid "Description of the Event"
 msgstr "Az esemény leírása"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ismétlés"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Hétköznapok kiválasztása"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Napok kiválasztása"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "és az éves esemény napja."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "és a havi esemény napja."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Hónapok kiválasztása"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Hetek kiválasztása"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "és az heti esemény napja."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Időköz"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Vége"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "előfordulások"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Naptár-fájl importálása"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Válassz naptárat"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "új naptár létrehozása"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Naptár-fájl importálása"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Új naptár neve"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importálás"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Naptár importálása"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Naptár sikeresen importálva"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Párbeszédablak bezárása"
 
@@ -626,45 +722,73 @@ msgstr "Esemény megtekintése"
 msgid "No categories selected"
 msgstr "Nincs kiválasztott kategória"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategória kiválasztása"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ", tulaj "
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ", "
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Időzóna"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Mindig ellenőrizze az időzóna-változásokat"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Időformátum"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "A hét első napja"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Naptár CalDAV szinkronizálási cím:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 4a51eb1eb9..5c441e68be 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Címlista (de)aktiválása sikertelen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID nincs beállítva"
 
@@ -63,7 +63,7 @@ msgstr "Nem található kontakt"
 msgid "There was an error adding the contact."
 msgstr "Hiba a kapcsolat hozzáadásakor"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "az elem neve nincs beállítva"
 
@@ -87,11 +87,11 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
@@ -103,19 +103,19 @@ msgstr "Hiányzó ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "VCard elemzése sikertelen a következő ID-hoz: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "az ellenőrzőösszeg nincs beállítva"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
@@ -164,19 +164,19 @@ msgstr "A PHOTO-tulajdonság  feldolgozása sikertelen"
 msgid "Error saving contact."
 msgstr "A kontakt mentése sikertelen"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Képméretezés sikertelen"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Képvágás sikertelen"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "A kép nem található"
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Típus kiválasztása"
@@ -534,7 +538,7 @@ msgstr "Név részleteinek szerkesztése"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Törlés"
 
@@ -845,30 +849,30 @@ msgstr ""
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Új címlista"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 390d35e4ff..511a2d7945 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nem tölthető le a lista az App Store-ból"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +41,7 @@ msgstr "Érvénytelen kérés"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Hitelesítési hiba"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +49,7 @@ msgstr "A nyelv megváltozott"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Hiba"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,13 +69,17 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
+msgstr "Biztonsági figyelmeztetés"
+
+#: templates/admin.php:29
+msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Tovább"
 
@@ -213,7 +217,7 @@ msgstr "Egyéb"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "al-Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/hy/calendar.po b/l10n/hy/calendar.po
index fa2e38c97a..2187e75586 100644
--- a/l10n/hy/calendar.po
+++ b/l10n/hy/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Օրացույց"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Այլ"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr ""
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,32 +459,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Ամիս"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Այսօր"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -390,7 +484,7 @@ msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Ջնջել"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr ""
 
@@ -524,7 +618,7 @@ msgstr ""
 msgid "Location of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Նկարագրություն"
 
@@ -532,84 +626,86 @@ msgstr "Նկարագրություն"
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
 #: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 7a32937a5d..582ad7d76f 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index fb9bab31e2..db514cfc14 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ia/calendar.po b/l10n/ia/calendar.po
index 125085ee3a..1f98149963 100644
--- a/l10n/ia/calendar.po
+++ b/l10n/ia/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Necun calendarios trovate."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nulle eventos trovate."
 
@@ -30,300 +38,394 @@ msgstr "Nulle eventos trovate."
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nove fuso horari"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Requesta invalide."
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Anniversario de nativitate"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Affaires"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Appello"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Dies feriate"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Incontro"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Altere"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projectos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Demandas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sin nomine"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nove calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Non repite"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Quotidian"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Septimanal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Cata die"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensual"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Cata anno"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunquam"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "per data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lunedi"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Venerdi"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Dominica"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prime"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "secunde"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tertie"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ultime"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "januario"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februario"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Martio"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junio"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augusto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octobre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "per data de eventos"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "per dia e mense"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Omne die"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nove calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Campos incomplete"
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Septimana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mense"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hodie"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Selectionar calendarios active"
-
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Tu calendarios"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Discarga"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Deler"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr "Modificar categorias"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Ab"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "A"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Optiones avantiate"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Loco"
 
@@ -524,7 +618,7 @@ msgstr "Loco"
 msgid "Location of the Event"
 msgstr "Loco del evento."
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Description"
 
@@ -532,84 +626,86 @@ msgstr "Description"
 msgid "Description of the Event"
 msgstr "Description del evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repeter"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seliger dies del septimana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seliger dies"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seliger menses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seliger septimanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervallo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importar un file de calendario"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Selige el calendario"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "crear un nove calendario"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importar un file de calendario"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nomine del calendario"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importar"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr ""
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Clauder dialogo"
 
@@ -625,44 +721,72 @@ msgstr "Vide un evento"
 msgid "No categories selected"
 msgstr "Nulle categorias seligite"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selectionar categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "in"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso horari"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prime die del septimana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 25dc62566f..5a436a7a25 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr "Nulle contactos trovate."
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -101,19 +101,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Deler"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nove adressario"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index b744d1ffd5..0b922c4e6f 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "Interlingua"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/id/calendar.po b/l10n/id/calendar.po
index 021c23176e..9b2e6aaf97 100644
--- a/l10n/id/calendar.po
+++ b/l10n/id/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zona waktu telah diubah"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Tidak akan mengulangi"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Harian"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Setiap Hari Minggu"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dwi-mingguan"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Semua Hari"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Minggu"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hari ini"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalender"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Terjadi kesalahan, saat mengurai berkas."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Pilih kalender aktif"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Sunting"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Agenda di Semua Hari"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Dari"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Ke"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokasi"
 
@@ -524,7 +618,7 @@ msgstr "Lokasi"
 msgid "Location of the Event"
 msgstr "Lokasi Agenda"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Deskripsi"
 
@@ -532,84 +626,86 @@ msgstr "Deskripsi"
 msgid "Description of the Event"
 msgstr "Deskripsi dari Agenda"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ulangi"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
 #: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zonawaktu"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index eddf5cf0af..3e58eff041 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 50b3899314..bf5ef298db 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Lebih"
 
diff --git a/l10n/id_ID/calendar.po b/l10n/id_ID/calendar.po
index ac6c2362a0..ebef9b9ade 100644
--- a/l10n/id_ID/calendar.po
+++ b/l10n/id_ID/calendar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index d9335528e5..2fec0e3728 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index c011c4ea26..5289b9b21b 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index 52db292ae4..57f6bc8348 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 12:15+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,31 +77,30 @@ msgstr "Richiesta non valida"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d MMM yyyy"
 
@@ -226,7 +225,7 @@ msgstr "per giorno del mese"
 msgid "by weekday"
 msgstr "per giorno della settimana"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lunedì"
 
@@ -250,7 +249,7 @@ msgstr "Venerdì"
 msgid "Saturday"
 msgstr "Sabato"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -467,33 +466,25 @@ msgstr "L'evento finisce prima d'iniziare"
 msgid "There was a database fail"
 msgstr "Si è verificato un errore del database"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Settimana"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mese"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Elenco"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Oggi"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Calendari"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Si è verificato un errore durante l'analisi del file."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Scegli i calendari attivi"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -745,55 +736,63 @@ msgstr "di"
 msgid "at"
 msgstr "alle"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Controlla sempre i cambiamenti di fuso orario"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato orario"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primo giorno della settimana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Cancella gli eventi che si ripetono dalla cache"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Indirizzi di sincronizzazione calendari CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "ulteriori informazioni"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Indirizzo principale (Kontact e altri)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Collegamento(i) iCalendar sola lettura"
 
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 000b71a0bf..3f147a97f1 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Errore nel (dis)attivare la rubrica."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID non impostato."
 
@@ -63,7 +63,7 @@ msgstr "Nessun contatto trovato."
 msgid "There was an error adding the contact."
 msgstr "Si è verificato un errore nell'aggiunta del contatto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "il nome dell'elemento non è impostato."
 
@@ -87,11 +87,11 @@ msgstr "P"
 msgid "Error adding contact property: "
 msgstr "Errore durante l'aggiunta della proprietà del contatto: "
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard non corrette. Ricarica la pagina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Errore durante l'eliminazione della proprietà del contatto."
 
@@ -103,19 +103,19 @@ msgstr "ID mancante"
 msgid "Error parsing VCard for ID: \""
 msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "il codice di controllo non è impostato."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
@@ -164,19 +164,19 @@ msgstr "Errore di recupero della proprietà FOTO."
 msgid "Error saving contact."
 msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Errore durante la ricerca dell'immagine: "
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleziona il tipo"
@@ -478,11 +482,11 @@ msgstr "Espandi/Contrai la rubrica corrente"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Rubrica successiva"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Rubrica precedente"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -534,7 +538,7 @@ msgstr "Modifica dettagli del nome"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Elimina"
 
@@ -845,30 +849,30 @@ msgstr "Mostra collegamento VCF in sola lettura"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Modifica"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nome"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Descrizione"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salva"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Annulla"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Altro..."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 778f6a40a5..8b7ac10eef 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
-"PO-Revision-Date: 2012-08-05 21:58+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,11 +76,15 @@ msgstr "Italiano"
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Altro"
 
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 6062061a4f..90254140d2 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "すべてのカレンダーは完全にキャッシュされていません"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "すべて完全にキャッシュされていると思われます"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "カレンダーが見つかりませんでした。"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "イベントが見つかりませんでした。"
 
@@ -30,300 +38,394 @@ msgstr "イベントが見つかりませんでした。"
 msgid "Wrong calendar"
 msgstr "誤ったカレンダーです"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "イベントの無いもしくはすべてのイベントを含むファイルは既にあなたのカレンダーに保存されています。"
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "イベントは新しいカレンダーに保存されました"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "インポートに失敗"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "イベントはあなたのカレンダーに保存されました"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新しいタイムゾーン:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "タイムゾーンが変更されました"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "dddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "M月d日 （dddd）"
 
-#: js/calendar.js:835
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "M月d日 （dddd）"
 
 #: js/calendar.js:837
-msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgid "MMMM yyyy"
+msgstr "yyyy年M月"
 
-#: lib/app.php:125
+#: js/calendar.js:839
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "yyyy年M月d日{ '～' [yyyy年][M月]d日}"
+
+#: js/calendar.js:841
+msgid "dddd, MMM d, yyyy"
+msgstr "yyyy年M月d日 （dddd）"
+
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "電話をかける"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "ミーティング"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "その他"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "質問事項"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "週の始まり"
 
-#: lib/app.php:380
-msgid "unnamed"
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr "無名"
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新しくカレンダーを作成"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "繰り返さない"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "毎日"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "毎週"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "毎平日"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "2週間ごと"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "毎月"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "毎年"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "無し"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "回数で指定"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "日付で指定"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "日にちで指定"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "曜日で指定"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
-msgstr "月曜"
+msgstr "月"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
-msgstr "火曜"
+msgstr "火"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
-msgstr "水曜"
+msgstr "水"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
-msgstr "木曜"
+msgstr "木"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
-msgstr "金曜"
+msgstr "金"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
-msgstr "土曜"
+msgstr "土"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
-msgstr "日曜"
+msgstr "日"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "予定のある週を指定"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "１週目"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "２週目"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "３週目"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "４週目"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "５週目"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "最終週"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
-msgstr "１月"
+msgstr "1月"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
-msgstr "２月"
+msgstr "2月"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
-msgstr "３月"
+msgstr "3月"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
-msgstr "４月"
+msgstr "4月"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
-msgstr "５月"
+msgstr "5月"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
-msgstr "６月"
+msgstr "6月"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
-msgstr "７月"
+msgstr "7月"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
-msgstr "８月"
+msgstr "8月"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
-msgstr "９月"
+msgstr "9月"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
-msgstr "１０月"
+msgstr "10月"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
-msgstr "１１月"
+msgstr "11月"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
-msgstr "１２月"
+msgstr "12月"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "日付で指定"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "日番号で指定"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "週番号で指定"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "月と日で指定"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "日付"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "カレンダー"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "日"
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "月"
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "火"
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "水"
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "木"
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "金"
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "土"
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "1月"
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "2月"
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "3月"
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "4月"
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "5月"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "6月"
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "7月"
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "8月"
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "9月"
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "10月"
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "11月"
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "12月"
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "終日"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "新しくカレンダーを作成"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "項目がありません"
@@ -357,40 +459,32 @@ msgstr "イベント終了時間が開始時間より先です"
 msgid "There was a database fail"
 msgstr "データベースのエラーがありました"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "週"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "リスト"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "今日"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "カレンダー"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "ファイルの構文解析に失敗しました。"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "アクティブなカレンダーを選択"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "あなたのカレンダー"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDavへのリンク"
 
@@ -402,26 +496,26 @@ msgstr "共有カレンダー"
 msgid "No shared calendars"
 msgstr "共有カレンダーはありません"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "カレンダーを共有する"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "編集"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "削除"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "共有者"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -500,23 +594,23 @@ msgstr "カテゴリをコンマで区切る"
 msgid "Edit categories"
 msgstr "カテゴリを編集"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "終日イベント"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "開始"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "終了"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "詳細設定"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "場所"
 
@@ -524,7 +618,7 @@ msgstr "場所"
 msgid "Location of the Event"
 msgstr "イベントの場所"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "メモ"
 
@@ -532,84 +626,86 @@ msgstr "メモ"
 msgid "Description of the Event"
 msgstr "イベントの説明"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "繰り返し"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "曜日を指定"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "日付を指定"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "対象の年を選択する。"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "対象の月を選択する。"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "月を指定する"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "週を指定する"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "対象の週を選択する。"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "間隔"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "繰り返す期間"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "回繰り返す"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "カレンダーファイルをインポート"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "カレンダーを選択してください"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "新規カレンダーの作成"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "カレンダーファイルをインポート"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "カレンダーを選択してください"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "新規カレンダーの名称"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "利用可能な名前を指定してください！"
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "このカレンダー名はすでに使われています。もし続行する場合は、これらのカレンダーはマージされます。"
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "インポート"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "カレンダーを取り込み中"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "カレンダーの取り込みに成功しました"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "ダイアログを閉じる"
 
@@ -625,45 +721,73 @@ msgstr "イベントを閲覧"
 msgid "No categories selected"
 msgstr "カテゴリが選択されていません"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "カテゴリーを選択してください"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "of"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "at"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "タイムゾーンの変更を常に確認"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "時刻のフォーマット"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "週の始まり"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAVカレンダーの同期アドレス:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "キャッシュ"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "イベントを繰り返すためにキャッシュをクリアしてください"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "CalDAVカレンダーの同期用アドレス"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "さらに"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "プライマリアドレス（コンタクト等）"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "読み取り専用のiCalendarリンク"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index d4930ceba7..1643d768f3 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "アドレスブックの有効/無効化に失敗しました。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "idが設定されていません。"
 
@@ -60,13 +60,13 @@ msgstr "連絡先が見つかりません。"
 msgid "There was an error adding the contact."
 msgstr "連絡先の追加でエラーが発生しました。"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "要素名が設定されていません。"
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "連絡先を解析できませんでした:"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -84,35 +84,35 @@ msgstr "重複する属性を追加: "
 msgid "Error adding contact property: "
 msgstr "コンタクト属性の追加エラー: "
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardの情報に誤りがあります。ページをリロードして下さい。"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "連絡先の削除に失敗しました。"
 
 #: ajax/contact/details.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "IDが見つかりません"
 
 #: ajax/contact/details.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "VCardからIDの抽出エラー: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "チェックサムが設定されていません。"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "何かがFUBARへ移動しました。"
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
@@ -161,19 +161,19 @@ msgstr "写真属性の取得エラー。"
 msgid "Error saving contact."
 msgstr "コンタクトの保存エラー。"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "画像のリサイズエラー"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "画像の切り抜きエラー"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "一時画像の生成エラー"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "画像検索エラー: "
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "タイプを選択"
@@ -297,11 +301,11 @@ msgstr " は失敗しました。"
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "表示名は空にできません。"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "連絡先が見つかりません:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -379,7 +383,7 @@ msgstr "ビジネス"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "電話"
 
 #: lib/app.php:186
 msgid "Clients"
@@ -471,23 +475,23 @@ msgstr "リスト内の前のコンタクト"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "現在の連絡帳を展開する／折りたたむ"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "次の連絡先"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "前の連絡先"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "アクション"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "連絡先リストを再読込する"
 
 #: templates/index.php:59
 msgid "Add new contact"
@@ -531,7 +535,7 @@ msgstr "名前の詳細を編集"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "削除"
 
@@ -553,7 +557,7 @@ msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Webサイトへ移動"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -650,19 +654,19 @@ msgstr "私書箱"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "住所1"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "番地"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
-msgstr "番地2"
+msgstr "住所2"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "アパート名等"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -675,7 +679,7 @@ msgstr "都道府県"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "例：東京都、大阪府"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -804,7 +808,7 @@ msgstr "アドレス帳を設定"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "連絡先を洗濯してください"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
@@ -812,7 +816,7 @@ msgstr "名前を入力"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "説明を入力してください"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -832,40 +836,40 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "CarDavリンクを表示"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "読み取り専用のVCFリンクを表示"
 
 #: templates/settings.php:26
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "編集"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "新規電話帳"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "名前"
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr "説明"
 
 #: templates/settings.php:43
-msgid "Description"
-msgstr ""
-
-#: templates/settings.php:45
 msgid "Save"
 msgstr "保存"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "取り消し"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "もっと..."
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 19a81081e0..dc2489cfdd 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "アプリストアからリストをロードできません"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -48,7 +48,7 @@ msgstr "言語が変更されました"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -70,11 +70,15 @@ msgstr "Japanese (日本語)"
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "もっと"
 
@@ -212,7 +216,7 @@ msgstr "その他"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "サブ管理者"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ko/calendar.po b/l10n/ko/calendar.po
index f433b04414..89b070aa85 100644
--- a/l10n/ko/calendar.po
+++ b/l10n/ko/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "달력이 없습니다"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "일정이 없습니다"
 
@@ -31,300 +39,394 @@ msgstr "일정이 없습니다"
 msgid "Wrong calendar"
 msgstr "잘못된 달력"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "새로운 시간대 설정"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "시간대 변경됨"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "잘못된 요청"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "달력"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
 
 #: js/calendar.js:837
-msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
 
-#: lib/app.php:125
+#: js/calendar.js:839
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:841
+msgid "dddd, MMM d, yyyy"
+msgstr "dddd, MMM d, yyyy"
+
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "생일"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "사업"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "통화"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "클라이언트"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "배송"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "공휴일"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "생각"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "여행"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "기념일"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "미팅"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "기타"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "개인"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "프로젝트"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "질문"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "작업"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "익명의"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "새로운 달력"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "반복 없음"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "매일"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "매주"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "매주 특정 요일"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "2주마다"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "매월"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "매년"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "전혀"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "번 이후"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "날짜"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "월"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "주"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "월요일"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "화요일"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "수요일"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "목요일"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "금요일"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "토요일"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "일요일"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "이달의 한 주 일정"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "첫번째"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "두번째"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "세번째"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "네번째"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "다섯번째"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "마지막"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "1월"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "2월"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "3월"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "4월"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "5월"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "6월"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "7월"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "8월"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "9월"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "10월"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "11월"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "12월"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "이벤트 날짜 순"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "날짜 번호 순"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "주 번호 순"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "날짜 순"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "날짜"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "달력"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "매일"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "새로운 달력"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "기입란이 비어있습니다"
@@ -358,40 +460,32 @@ msgstr "마침일정이 시작일정 보다 빠릅니다. "
 msgid "There was a database fail"
 msgstr "데이터베이스 에러입니다."
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "주"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "달"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "목록"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "오늘"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "달력"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "파일을 처리하는 중 오류가 발생하였습니다."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "활성 달력 선택"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "내 달력"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav 링크"
 
@@ -403,19 +497,19 @@ msgstr "공유 달력"
 msgid "No shared calendars"
 msgstr "달력 공유하지 않음"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "달력 공유"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "편집"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "삭제"
@@ -501,23 +595,23 @@ msgstr "쉼표로 카테고리 구분"
 msgid "Edit categories"
 msgstr "카테고리 수정"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "종일 이벤트"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "시작"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "끝"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "고급 설정"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "위치"
 
@@ -525,7 +619,7 @@ msgstr "위치"
 msgid "Location of the Event"
 msgstr "이벤트 위치"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "설명"
 
@@ -533,84 +627,86 @@ msgstr "설명"
 msgid "Description of the Event"
 msgstr "이벤트 설명"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "반복"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "고급"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "요일 선택"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "날짜 선택"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "그리고 이 해의 일정"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "그리고 이 달의 일정"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "달 선택"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "주 선택"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "그리고 이 해의 주간 일정"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "간격"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "끝"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "번 이후"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "달력 파일 가져오기"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "달력을 선택해 주세요"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "새 달력 만들기"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "달력 파일 가져오기"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "새 달력 이름"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "입력"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "달력 입력"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "달력 입력을 성공적으로 마쳤습니다."
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "대화 마침"
 
@@ -626,45 +722,73 @@ msgstr "일정 보기"
 msgid "No categories selected"
 msgstr "선택된 카테고리 없음"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "선택 카테고리"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "의"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "에서"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "시간대"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "항상 시간대 변경 확인하기"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "시간 형식 설정"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24시간"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12시간"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "그 주의 첫째날"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "달력 CalDav 동기화 주소"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index ceb4e271d2..5ade5e1187 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "주소록을 (비)활성화하는 데 실패했습니다."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "아이디가 설정되어 있지 않습니다. "
 
@@ -61,7 +61,7 @@ msgstr "연락처를 찾을 수 없습니다."
 msgid "There was an error adding the contact."
 msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "element 이름이 설정되지 않았습니다."
 
@@ -85,11 +85,11 @@ msgstr "중복 속성 추가 시도: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "연락처 속성을 삭제할 수 없습니다."
 
@@ -101,19 +101,19 @@ msgstr "아이디 분실"
 msgid "Error parsing VCard for ID: \""
 msgstr "아이디에 대한 VCard 분석 오류"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "체크섬이 설정되지 않았습니다."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
@@ -162,19 +162,19 @@ msgstr "사진 속성을 가져오는 중 오류가 발생했습니다. "
 msgid "Error saving contact."
 msgstr "연락처 저장 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "이미지 크기 조정 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "이미지를 자르던 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "임시 이미지를 생성 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "유형 선택"
@@ -532,7 +536,7 @@ msgstr "이름 세부사항을 편집합니다. "
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "삭제"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "편집"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "저장"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "취소"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index f14b9d6354..180df14ec0 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "한국어"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "더"
 
diff --git a/l10n/lb/calendar.po b/l10n/lb/calendar.po
index 8436a2126d..3897111759 100644
--- a/l10n/lb/calendar.po
+++ b/l10n/lb/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Keng Kalenner fonnt."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Keng Evenementer fonnt."
 
@@ -30,300 +38,394 @@ msgstr "Keng Evenementer fonnt."
 msgid "Wrong calendar"
 msgstr "Falschen Kalenner"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nei Zäitzone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zäitzon geännert"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalenner"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Geschäftlech"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Uruff"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clienten"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Liwwerant"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vakanzen"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideeën"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Dag"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Meeting"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Aner"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projeten"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Froen"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Neien Kalenner"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Widderhëlt sech net"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Deeglech"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "All Woch"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "All Wochendag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "All zweet Woch"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "All Mount"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "All Joer"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ni"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "no Virkommes"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "no Datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "no Mount-Dag"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "no Wochendag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Méindes"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Dënschdes"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mëttwoch"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Donneschdes"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Freides"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Samschdes"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sonndes"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "éischt"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "Sekonn"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "Drëtt"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "Féiert"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "Fënneft"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "Läscht"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mäerz"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abrëll"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mee"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "All Dag"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Neien Kalenner"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Felder déi feelen"
@@ -357,40 +459,32 @@ msgstr "D'Evenement hält op ier et ufänkt"
 msgid "There was a database fail"
 msgstr "En Datebank Feeler ass opgetrueden"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Woch"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mount"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lescht"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Haut"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalenneren"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Feeler beim lueden vum Fichier."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Wiel aktiv Kalenneren aus"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Deng Kalenneren"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -402,19 +496,19 @@ msgstr "Gedeelte Kalenneren"
 msgid "No shared calendars"
 msgstr "Keng gedeelten Kalenneren"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editéieren"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Läschen"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Ganz-Dag Evenement"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Vun"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Fir"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avancéiert Optiounen"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Uert"
 
@@ -524,7 +618,7 @@ msgstr "Uert"
 msgid "Location of the Event"
 msgstr "Uert vum Evenement"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beschreiwung"
 
@@ -532,84 +626,86 @@ msgstr "Beschreiwung"
 msgid "Description of the Event"
 msgstr "Beschreiwung vum Evenement"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Widderhuelen"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Erweidert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Wochendeeg auswielen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Deeg auswielen"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Méint auswielen"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Wochen auswielen"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Enn"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "Virkommes"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "E Kalenner Fichier importéieren"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Wiel den Kalenner aus"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "E neie Kalenner uleeën"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "E Kalenner Fichier importéieren"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Numm vum neie Kalenner"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Import"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importéiert Kalenner"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalenner erfollegräich importéiert"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Dialog zoumaachen"
 
@@ -625,45 +721,73 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategorie auswielen"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zäitzon"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Zäit Format"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV Kalenner Synchronisatioun's Adress:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 196d17c966..e2d248e453 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID ass net gesat."
 
@@ -60,7 +60,7 @@ msgstr "Keng Kontakter fonnt."
 msgid "There was an error adding the contact."
 msgstr "Fehler beim bäisetzen vun engem Kontakt."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fehler beim läschen vun der Kontakt Proprietéit."
 
@@ -100,19 +100,19 @@ msgstr "ID fehlt"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Läschen"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editéieren"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Neit Adressbuch"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 1209e68515..4ecade7af6 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Méi"
 
diff --git a/l10n/lt_LT/calendar.po b/l10n/lt_LT/calendar.po
index 33742c956e..9d116aac12 100644
--- a/l10n/lt_LT/calendar.po
+++ b/l10n/lt_LT/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Kalendorių nerasta."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Įvykių nerasta."
 
@@ -30,300 +38,394 @@ msgstr "Įvykių nerasta."
 msgid "Wrong calendar"
 msgstr "Ne tas kalendorius"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nauja laiko juosta:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Laiko zona pakeista"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Klaidinga užklausa"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Verslas"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Skambučiai"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klientai"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Vykdytojas"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Išeiginės"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idėjos"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Kelionė"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubiliejus"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Kiti"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektai"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Klausimai"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Darbas"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "be pavadinimo"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Naujas kalendorius"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Nekartoti"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Kasdien"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Kiekvieną savaitę"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Kiekvieną savaitės dieną"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Kas dvi savaites"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Kiekvieną mėnesį"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Kiekvienais metais"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "niekada"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "pagal datą"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "pagal mėnesio dieną"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "pagal savaitės dieną"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Sausis"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Vasaris"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Kovas"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Balandis"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Gegužė"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Birželis"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Liepa"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Rugsėjis"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Spalis"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Lapkritis"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Gruodis"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Visa diena"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Naujas kalendorius"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Trūkstami laukai"
@@ -357,40 +459,32 @@ msgstr "Įvykis baigiasi anksčiau nei jis prasideda"
 msgid "There was a database fail"
 msgstr "Įvyko duomenų bazės klaida"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Savaitė"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mėnuo"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Sąrašas"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Šiandien"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendoriai"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Apdorojant failą įvyko klaida."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Pasirinkite naudojamus kalendorius"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Jūsų kalendoriai"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav adresas"
 
@@ -402,19 +496,19 @@ msgstr "Bendri kalendoriai"
 msgid "No shared calendars"
 msgstr "Bendrų kalendorių nėra"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Dalintis kalendoriumi"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Keisti"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Trinti"
@@ -474,7 +568,7 @@ msgstr "Pasikartojantis"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Priminimas"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
@@ -500,23 +594,23 @@ msgstr "Atskirkite kategorijas kableliais"
 msgid "Edit categories"
 msgstr "Redaguoti kategorijas"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Visos dienos įvykis"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Nuo"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Iki"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Papildomi nustatymai"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Vieta"
 
@@ -524,7 +618,7 @@ msgstr "Vieta"
 msgid "Location of the Event"
 msgstr "Įvykio vieta"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Aprašymas"
 
@@ -532,84 +626,86 @@ msgstr "Aprašymas"
 msgid "Description of the Event"
 msgstr "Įvykio aprašymas"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Kartoti"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Pasirinkite savaitės dienas"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Pasirinkite dienas"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Pasirinkite mėnesius"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Pasirinkite savaites"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalas"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Pabaiga"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importuoti kalendoriaus failą"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Pasirinkite kalendorių"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "sukurti naują kalendorių"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importuoti kalendoriaus failą"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Naujo kalendoriaus pavadinimas"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importuoti"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importuojamas kalendorius"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendorius sėkmingai importuotas"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Uždaryti"
 
@@ -625,45 +721,73 @@ msgstr "Peržiūrėti įvykį"
 msgid "No categories selected"
 msgstr "Nepasirinktos jokios katagorijos"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Pasirinkite kategoriją"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Laiko juosta"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Visada tikrinti laiko zonos pasikeitimus"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Laiko formatas"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24val"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12val"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV kalendoriaus synchronizavimo adresas:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index d1ce7da059..04921869c8 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Klaida (de)aktyvuojant adresų knygą."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr "Kontaktų nerasta."
 msgid "There was an error adding the contact."
 msgstr "Pridedant kontaktą įvyko klaida."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija apie vCard yra neteisinga. "
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Trinti"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Keisti"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index d62529df1f..cab185280a 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr "Kalba"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Daugiau"
 
diff --git a/l10n/lv/calendar.po b/l10n/lv/calendar.po
index 48780d51cd..f3a17a29c4 100644
--- a/l10n/lv/calendar.po
+++ b/l10n/lv/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 0e9e46f420..18a053d129 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index fffeb8f3be..3f8ede3695 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr "__valodas_nosaukums__"
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Vairāk"
 
diff --git a/l10n/mk/calendar.po b/l10n/mk/calendar.po
index 547898941b..6dfc90153f 100644
--- a/l10n/mk/calendar.po
+++ b/l10n/mk/calendar.po
@@ -3,26 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Не се најдени календари."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Не се најдени настани."
 
@@ -30,300 +39,394 @@ msgstr "Не се најдени настани."
 msgid "Wrong calendar"
 msgstr "Погрешен календар"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Нова временска зона:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Временската зона е променета"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Неправилно барање"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ддд"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ддд М/д"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "дддд М/д"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "ММММ гггг"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "дддд, МММ д, гггг"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Роденден"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Деловно"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Повикај"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клиенти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Доставувач"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Празници"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Патување"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Јубилеј"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Состанок"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Останато"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Лично"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Проекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Прашања"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "неименувано"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Нов календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не се повторува"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Дневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Седмично"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Секој работен ден"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Дво-седмично"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Месечно"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Годишно"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "никогаш"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "по настан"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "по датум"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "по ден во месецот"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "по работен ден"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понеделник"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Среда"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Четврток"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Петок"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Сабота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Недела"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "седмични настани од месец"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "прв"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "втор"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "трет"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "четврт"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "пет"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "последен"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Јануари"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Февруари"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Март"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Април"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Мај"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Јуни"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Јули"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Август"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Септември"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Октомври"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Ноември"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Декември"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "по датумот на настанот"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "по вчерашните"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "по број на седмицата"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "по ден и месец"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Датум"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Кал."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Цел ден"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Нов календар"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Полиња кои недостасуваат"
@@ -357,40 +460,32 @@ msgstr "Овој настан завршува пред за почне"
 msgid "There was a database fail"
 msgstr "Имаше проблем со базата"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Седмица"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Листа"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Денеска"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Имаше проблем при парсирање на датотеката."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Избери активни календари"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Ваши календари"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Врска за CalDav"
 
@@ -402,19 +497,19 @@ msgstr "Споделени календари"
 msgid "No shared calendars"
 msgstr "Нема споделени календари"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Сподели календар"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Избриши"
@@ -500,23 +595,23 @@ msgstr "Одвоете ги категориите со запирка"
 msgid "Edit categories"
 msgstr "Уреди категории"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Целодневен настан"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Од"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Напредни опции"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Локација"
 
@@ -524,7 +619,7 @@ msgstr "Локација"
 msgid "Location of the Event"
 msgstr "Локација на настанот"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Опис"
 
@@ -532,84 +627,86 @@ msgstr "Опис"
 msgid "Description of the Event"
 msgstr "Опис на настанот"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повтори"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Избери работни денови"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Избери денови"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "и настаните ден од година."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "и настаните ден од месец."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Избери месеци"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Избери седмици"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "и настаните седмица од година."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "интервал"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Крај"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "повторувања"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Внеси календар од датотека "
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Ве молам изберете го календарот"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "создади нов календар"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Внеси календар од датотека "
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Име на новиот календар"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Увези"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Увезување на календар"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Календарот беше успешно увезен"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Затвори дијалог"
 
@@ -625,45 +722,73 @@ msgstr "Погледај настан"
 msgid "No categories selected"
 msgstr "Нема избрано категории"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Избери категорија"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "од"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "на"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Секогаш провери за промени на временската зона"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Формат на времето"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ч"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ч"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Прв ден од седмицата"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV календар адресата за синхронизација:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 6bb1874661..421574eb07 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Грешка (де)активирање на адресарот."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ид не е поставено."
 
@@ -61,7 +61,7 @@ msgstr "Не се најдени контакти."
 msgid "There was an error adding the contact."
 msgstr "Имаше грешка при додавање на контактот."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "име за елементот не е поставена."
 
@@ -85,11 +85,11 @@ msgstr "Се обидовте да внесете дупликат вредно
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Греш при бришење на вредноста за контакт."
 
@@ -101,19 +101,19 @@ msgstr "Недостасува ИД"
 msgid "Error parsing VCard for ID: \""
 msgstr "Грешка при парсирање VCard за ИД: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "сумата за проверка не е поставена."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
@@ -162,19 +162,19 @@ msgstr "Грешка при утврдувањето на карактерист
 msgid "Error saving contact."
 msgstr "Грешка при снимање на контактите."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Грешка при скалирање на фотографијата"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Грешка при сечење на фотографијата"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Грешка при креирањето на привремената фотографија"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Грешка при наоѓањето на фотографијата:"
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Одбери тип"
@@ -532,7 +536,7 @@ msgstr "Уреди детали за име"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Избриши"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Нов адресар"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Сними"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 706ddbc2b4..36c84162d7 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Повеќе"
 
diff --git a/l10n/ms_MY/calendar.po b/l10n/ms_MY/calendar.po
index 76a0bb2ba1..b7b4117632 100644
--- a/l10n/ms_MY/calendar.po
+++ b/l10n/ms_MY/calendar.po
@@ -3,328 +3,433 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
 # Hafiz Ismail <mhbinet@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
-msgid "No calendars found."
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
 msgstr ""
 
-#: ajax/categories/rescan.php:36
-msgid "No events found."
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
 msgstr ""
 
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr "Tiada kalendar dijumpai."
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr "Tiada agenda dijumpai."
+
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
 msgstr "Silap kalendar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Timezone Baru"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zon waktu diubah"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "dd M/d"
 
-#: js/calendar.js:835
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
 
 #: js/calendar.js:837
-msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
 
-#: lib/app.php:125
+#: js/calendar.js:839
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:841
+msgid "dddd, MMM d, yyyy"
+msgstr "dddd, MMM d, yyy"
+
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Perniagaan"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Panggilan"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klien"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Penghantar"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Cuti"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idea"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Perjalanan"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubli"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Perjumpaan"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Lain"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Peribadi"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projek"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Soalan"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:380
-msgid "unnamed"
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr "tiada nama"
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Kalendar baru"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Tidak berulang"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Harian"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Setiap hari minggu"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dua kali seminggu"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "jangan"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "dari kekerapan"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "dari tarikh"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "dari haribulan"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "dari hari minggu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Isnin"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Khamis"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Jumaat"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Ahad"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "event minggu dari bulan"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "pertama"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "kedua"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "ketiga"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "keempat"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "kelima"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "akhir"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januari"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februari"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mac"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mei"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Jun"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julai"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Ogos"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Disember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "dari tarikh event"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "dari tahun"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "dari nombor minggu"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "dari hari dan bulan"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Tarikh"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kalendar"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Sepanjang hari"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Kalendar baru"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Ruangan tertinggal"
@@ -358,71 +463,63 @@ msgstr "Peristiwa berakhir sebelum bermula"
 msgid "There was a database fail"
 msgstr "Terdapat kegagalan pada pengkalan data"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Minggu"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Senarai"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hari ini"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendar"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Berlaku kegagalan ketika penguraian fail. "
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Pilih kalendar yang aktif"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Kalendar anda"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Pautan CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Kalendar Kongsian"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Tiada kalendar kongsian"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
-msgstr ""
+msgstr "Kongsi Kalendar"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Edit"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Hapus"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "dikongsi dengan kamu oleh"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -467,23 +564,23 @@ msgstr "Export"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Maklumat agenda"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Pengulangan"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Penggera"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Jemputan"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Berkongsi"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -495,29 +592,29 @@ msgstr "kategori"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Asingkan kategori dengan koma"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Sunting Kategori"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Agenda di sepanjang hari "
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Dari"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "ke"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Pilihan maju"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokasi"
 
@@ -525,7 +622,7 @@ msgstr "Lokasi"
 msgid "Location of the Event"
 msgstr "Lokasi agenda"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Huraian"
 
@@ -533,84 +630,86 @@ msgstr "Huraian"
 msgid "Description of the Event"
 msgstr "Huraian agenda"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ulang"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Pilih hari minggu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Pilih hari"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "dan hari event dalam tahun."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "dan hari event dalam bulan."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Pilih bulan"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Pilih minggu"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "dan event mingguan dalam setahun."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Tempoh"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Tamat"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "Peristiwa"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Import fail kalendar"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Sila pilih kalendar"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Cipta kalendar baru"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Import fail kalendar"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nama kalendar baru"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Import"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Import kalendar"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendar berjaya diimport"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Tutup dialog"
 
@@ -620,72 +719,100 @@ msgstr "Buat agenda baru"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Papar peristiwa"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
-
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Pilih kategori"
+msgstr "Tiada kategori dipilih"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "dari"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
+msgstr "di"
+
+#: templates/settings.php:10
+msgid "General"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zon waktu"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Sentiasa mengemaskini perubahan zon masa"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kelendar CalDAV mengemaskini alamat:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "Pilih pengguna"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Boleh disunting"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Kumpulan-kumpulan"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "pilih kumpulan-kumpulan"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "jadikan tontonan awam"
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 61909142b6..a5435b96a5 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -5,14 +5,15 @@
 # Translators:
 # Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
 # Hafiz Ismail <mhbinet@gmail.com>, 2012.
 # Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +27,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Ralat nyahaktif buku alamat."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID tidak ditetapkan."
 
@@ -63,7 +64,7 @@ msgstr "Tiada kenalan dijumpai."
 msgid "There was an error adding the contact."
 msgstr "Terdapat masalah menambah maklumat."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "nama elemen tidak ditetapkan."
 
@@ -87,11 +88,11 @@ msgstr "Cuba untuk letak nilai duplikasi:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Maklumat vCard tidak tepat. Sila reload semula halaman ini."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Masalah memadam maklumat."
 
@@ -103,19 +104,19 @@ msgstr "ID Hilang"
 msgid "Error parsing VCard for ID: \""
 msgstr "Ralat VCard untuk ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum tidak ditetapkan."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Maklumat tentang vCard tidak betul."
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Sesuatu tidak betul."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
@@ -164,19 +165,19 @@ msgstr "Ralat mendapatkan maklumat gambar."
 msgid "Error saving contact."
 msgstr "Ralat menyimpan kenalan."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Ralat mengubah saiz imej"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Ralat memotong imej"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Ralat mencipta imej sementara"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Ralat mencari imej: "
 
@@ -276,6 +277,10 @@ msgid ""
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "PIlih jenis"
@@ -304,7 +309,7 @@ msgstr ""
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Buku alamat tidak ditemui:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -378,7 +383,7 @@ msgstr "Hari lahir"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Perniagaan"
 
 #: lib/app.php:185
 msgid "Call"
@@ -386,7 +391,7 @@ msgstr ""
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "klien"
 
 #: lib/app.php:187
 msgid "Deliverer"
@@ -394,35 +399,35 @@ msgstr ""
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Hari kelepasan"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Idea"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Perjalanan"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubli"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Mesyuarat"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Lain"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Peribadi"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projek"
 
 #: lib/app.php:196
 msgid "Questions"
@@ -446,7 +451,7 @@ msgstr "Import"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Tetapan"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -478,11 +483,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Buku alamat seterusnya"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Buku alamat sebelumnya"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -534,7 +539,7 @@ msgstr "Ubah butiran nama"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Padam"
 
@@ -807,15 +812,15 @@ msgstr "Konfigurasi buku alamat"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Pilih Buku Alamat"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Masukkan nama"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Masukkan keterangan"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -845,30 +850,30 @@ msgstr ""
 msgid "Download"
 msgstr "Muat naik"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Sunting"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Nama"
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr "Keterangan"
 
 #: templates/settings.php:43
-msgid "Description"
-msgstr ""
-
-#: templates/settings.php:45
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Batal"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Lagi..."
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 1cb2d9244c..30ec99321d 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,15 @@ msgstr "_nama_bahasa_"
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Lanjutan"
 
diff --git a/l10n/nb_NO/calendar.po b/l10n/nb_NO/calendar.po
index 09f790c740..b001de5a26 100644
--- a/l10n/nb_NO/calendar.po
+++ b/l10n/nb_NO/calendar.po
@@ -12,21 +12,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Ingen kalendere funnet"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Ingen hendelser funnet"
 
@@ -34,300 +42,394 @@ msgstr "Ingen hendelser funnet"
 msgid "Wrong calendar"
 msgstr "Feil kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidssone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tidssone endret"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Forretninger"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
-msgstr ""
+msgstr "Ring"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Ferie"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Møte"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Annet"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "ersonlig"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Prosjekter"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Spørsmål"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "uten navn"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Gjentas ikke"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Daglig"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Hver ukedag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Annenhver uke"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Årlig"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldri"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "etter hyppighet"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "etter dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "etter dag i måned"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "etter ukedag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Mandag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Søndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "begivenhetens uke denne måneden"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "første"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "andre"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjerde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "siste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mars"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Desember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "etter hendelsenes dato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "etter dag i året"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "etter ukenummer/-numre"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "etter dag og måned"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hele dagen "
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Manglende felt"
@@ -361,40 +463,32 @@ msgstr "En hendelse kan ikke slutte før den har begynt."
 msgid "There was a database fail"
 msgstr "Det oppstod en databasefeil."
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Uke"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "ned"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendre"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Det oppstod en feil under åpningen av filen."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Velg en aktiv kalender"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Dine kalendere"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-lenke"
 
@@ -406,19 +500,19 @@ msgstr "Delte kalendere"
 msgid "No shared calendars"
 msgstr "Ingen delte kalendere"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Del Kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Endre"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Slett"
@@ -504,23 +598,23 @@ msgstr "Separer kategorier med komma"
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Hele dagen-hendelse"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Fra"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avanserte innstillinger"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Sted"
 
@@ -528,7 +622,7 @@ msgstr "Sted"
 msgid "Location of the Event"
 msgstr "Hendelsessted"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -536,84 +630,86 @@ msgstr "Beskrivelse"
 msgid "Description of the Event"
 msgstr "Hendelesebeskrivelse"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Gjenta"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Velg ukedager"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Velg dager"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "og hendelsenes dag i året."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "og hendelsenes dag i måneden."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Velg måneder"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Velg uker"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "og hendelsenes uke i året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Slutt"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "forekomster"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importer en kalenderfil"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Vennligst velg kalenderen"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Lag en ny kalender"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importer en kalenderfil"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Navn på ny kalender:"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importer"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerer kalender"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalenderen ble importert uten feil"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Lukk dialog"
 
@@ -629,45 +725,73 @@ msgstr "Se på hendelse"
 msgid "No categories selected"
 msgstr "Ingen kategorier valgt"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Velg kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Se alltid etter endringer i tidssone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat:"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 t"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 t"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Ukens første dag"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synkroniseringsadresse fo kalender CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index a6d4c86902..ea159661fe 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Et problem oppsto med å (de)aktivere adresseboken."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id er ikke satt."
 
@@ -63,7 +63,7 @@ msgstr "Ingen kontakter funnet."
 msgid "There was an error adding the contact."
 msgstr "Et problem oppsto med å legge til kontakten."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -87,11 +87,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Et problem oppsto med å fjerne kontaktfeltet."
 
@@ -103,19 +103,19 @@ msgstr "Manglende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
@@ -164,19 +164,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr "Klarte ikke å lagre kontakt."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Klarte ikke å endre størrelse på bildet"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Klarte ikke å beskjære bildet"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Klarte ikke å lage et midlertidig bilde"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Kunne ikke finne bilde:"
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Velg type"
@@ -534,7 +538,7 @@ msgstr "Endre detaljer rundt navn"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Slett"
 
@@ -845,30 +849,30 @@ msgstr ""
 msgid "Download"
 msgstr "Hent ned"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 38b676eb43..d6873a0c8e 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mer"
 
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index 1d7f622b14..8ef2a74f32 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -6,27 +6,36 @@
 #   <bart.formosus@gmail.com>, 2011.
 #   <bartv@thisnet.nl>, 2011.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
+#   <georg.stefan.germany@googlemail.com>, 2012.
 #   <jos@gelauff.net>, 2012.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Geen kalenders gevonden."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Geen gebeurtenissen gevonden."
 
@@ -34,300 +43,394 @@ msgstr "Geen gebeurtenissen gevonden."
 msgid "Wrong calendar"
 msgstr "Verkeerde kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nieuwe tijdszone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tijdzone is veranderd"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ongeldige aanvraag"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd d.M"
 
-#: js/calendar.js:835
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr "d MMM[ yyyy]{ '&#8212;' d[ MMM] yyyy}"
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd d.M"
 
 #: js/calendar.js:837
-msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
 
-#: lib/app.php:125
+#: js/calendar.js:839
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "d[ MMM][ yyyy]{ '&#8212;' d MMM yyyy}"
+
+#: js/calendar.js:841
+msgid "dddd, MMM d, yyyy"
+msgstr "dddd, d. MMM yyyy"
+
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Zakelijk"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Bellen"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klanten"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Leverancier"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vakantie"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideeën"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reis"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ander"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projecten"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Vragen"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "onbekend"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nieuwe Kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Wordt niet herhaald"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dagelijks"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Wekelijks"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Elke weekdag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Tweewekelijks"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Jaarlijks"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nooit meer"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "volgens gebeurtenissen"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "op datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "per dag van de maand"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "op weekdag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Maandag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Zondag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "gebeurtenissen week van maand"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "eerste"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "tweede"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "derde"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "vierde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "vijfde"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "laatste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januari"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februari"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Maart"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mei"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augustus"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "volgens evenementsdatum"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "volgens jaardag(en)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "volgens weeknummer(s)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "per dag en maand"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hele dag"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nieuwe Kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "missende velden"
@@ -361,40 +464,32 @@ msgstr "Het evenement eindigt voordat het begint"
 msgid "There was a database fail"
 msgstr "Er was een databasefout"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Week"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Maand"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lijst"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Vandaag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalenders"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Er is een fout opgetreden bij het verwerken van het bestand."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Kies actieve kalenders"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Je kalenders"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -406,19 +501,19 @@ msgstr "Gedeelde kalenders"
 msgid "No shared calendars"
 msgstr "Geen gedeelde kalenders"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Deel kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Download"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Verwijderen"
@@ -504,23 +599,23 @@ msgstr "Gescheiden door komma's"
 msgid "Edit categories"
 msgstr "Wijzig categorieën"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Hele dag"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Van"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Aan"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Geavanceerde opties"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Locatie"
 
@@ -528,7 +623,7 @@ msgstr "Locatie"
 msgid "Location of the Event"
 msgstr "Locatie van de afspraak"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -536,84 +631,86 @@ msgstr "Beschrijving"
 msgid "Description of the Event"
 msgstr "Beschrijving van het evenement"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Herhalen"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Selecteer weekdagen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Selecteer dagen"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "en de gebeurtenissen dag van het jaar"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "en de gebeurtenissen dag van de maand"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Selecteer maanden"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Selecteer weken"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "en de gebeurtenissen week van het jaar"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Einde"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importeer een agenda bestand"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Kies de kalender"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Maak een nieuw agenda"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importeer een agenda bestand"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Naam van de nieuwe agenda"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importeer"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importeer agenda"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Agenda succesvol geïmporteerd"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Sluit venster"
 
@@ -629,45 +726,73 @@ msgstr "Bekijk een gebeurtenis"
 msgid "No categories selected"
 msgstr "Geen categorieën geselecteerd"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kies een categorie"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "van"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "op"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Controleer altijd op aanpassingen van de tijdszone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tijdformaat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24uur"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12uur"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Eerste dag van de week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV kalender synchronisatie adres:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 16781f12dc..695acef5f6 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fout bij het (de)activeren van het adresboek."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id is niet ingesteld."
 
@@ -64,7 +64,7 @@ msgstr "Geen contracten gevonden"
 msgid "There was an error adding the contact."
 msgstr "Er was een fout bij het toevoegen van het contact."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "onderdeel naam is niet opgegeven."
 
@@ -88,11 +88,11 @@ msgstr "Eigenschap bestaat al: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fout bij het verwijderen van de contacteigenschap."
 
@@ -104,19 +104,19 @@ msgstr "Ontbrekend ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fout bij inlezen VCard voor ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "controlegetal is niet opgegeven."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
@@ -165,19 +165,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -277,6 +277,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -535,7 +539,7 @@ msgstr "Wijzig naam gegevens"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -846,30 +850,30 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nieuw Adresboek"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Opslaan"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Anuleren"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 607ec7418f..7c72c6946e 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "Nederlands"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Meer"
 
diff --git a/l10n/nn_NO/calendar.po b/l10n/nn_NO/calendar.po
index 420f41350e..97f56855ae 100644
--- a/l10n/nn_NO/calendar.po
+++ b/l10n/nn_NO/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -31,300 +39,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "Feil kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidssone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Endra tidssone"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ugyldig førespurnad"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Telefonsamtale"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klientar"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Forsending"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Høgtid"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idear"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Møte"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Anna"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personleg"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Prosjekt"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Spørsmål"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ikkje gjenta"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Kvar dag"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Kvar veke"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Kvar vekedag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Annakvar veke"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Kvar månad"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Kvart år"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldri"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "av førekomstar"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "av dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "av månadsdag"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "av vekedag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Måndag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Søndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "hendingas veke av månad"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "første"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "andre"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjerde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "siste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mars"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Desember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "av hendingsdato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "av årsdag(ar)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "av vekenummer"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "av dag og månad"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Heile dagen"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Manglande felt"
@@ -358,40 +460,32 @@ msgstr "Hendinga endar før den startar"
 msgid "There was a database fail"
 msgstr "Det oppstod ein databasefeil"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Veke"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Månad"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendarar"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Feil ved tolking av fila."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vel aktive kalendarar"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-lenkje"
 
@@ -403,19 +497,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Endra"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Slett"
@@ -501,23 +595,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Heildagshending"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Frå"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avanserte alternativ"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Stad"
 
@@ -525,7 +619,7 @@ msgstr "Stad"
 msgid "Location of the Event"
 msgstr "Stad for hendinga"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Skildring"
 
@@ -533,84 +627,86 @@ msgstr "Skildring"
 msgid "Description of the Event"
 msgstr "Skildring av hendinga"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Gjenta"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vel vekedagar"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vel dagar"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "og hendingane dag for år."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "og hendingane dag for månad."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vel månedar"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vel veker"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "og hendingane veke av året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Ende"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "førekomstar"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importer ei kalenderfil"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Venlegast vel kalenderen"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Lag ny kalender"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importer ei kalenderfil"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Namn for ny kalender"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importer"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerar kalender"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender importert utan feil"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Steng dialog"
 
@@ -626,45 +722,73 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vel kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Sjekk alltid for endringar i tidssona"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24t"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12t"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kalender CalDAV synkroniseringsadresse:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 338507320b..e9742c79bc 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr "Det kom ei feilmelding då kontakta vart lagt til."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Eit problem oppstod ved å slette kontaktfeltet."
 
@@ -101,19 +101,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Slett"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Endra"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Kanseller"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 35e4b7daac..151dd9a866 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "Nynorsk"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/pl/calendar.po b/l10n/pl/calendar.po
index 1a335acb35..8039d555b5 100644
--- a/l10n/pl/calendar.po
+++ b/l10n/pl/calendar.po
@@ -3,27 +3,36 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Brak kalendarzy"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Brak wydzarzeń"
 
@@ -31,300 +40,394 @@ msgstr "Brak wydzarzeń"
 msgid "Wrong calendar"
 msgstr "Nieprawidłowy kalendarz"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Import nieudany"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "zdarzenie zostało zapisane w twoim kalendarzu"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nowa strefa czasowa:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zmieniono strefę czasową"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM rrrr"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, rrrr"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Interesy"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Rozmowy"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienci"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dostawcy"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Święta"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Pomysły"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Podróże"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileusze"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Spotkania"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Inne"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobiste"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Pytania"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Zawodowe"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "przez"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nowy kalendarz"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Brak"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Codziennie"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Każdego dnia tygodnia"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dwa razy w tygodniu"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Rocznie"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nigdy"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "przez wydarzenia"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "po dacie"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "miesięcznie"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "tygodniowo"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Środa"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Piątek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "wydarzenia miesiąca"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "pierwszy"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "drugi"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "trzeci"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "czwarty"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "piąty"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ostatni"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Styczeń"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Luty"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzec"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Kwiecień"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Czerwiec"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Lipiec"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Sierpień"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Wrzesień"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Październik"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Listopad"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Grudzień"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "po datach wydarzeń"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po dniach roku"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "po tygodniach"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "przez dzień i miesiąc"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "N."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Pn."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Wt."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Śr."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Cz."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Pt."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "S."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Sty."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Lut."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Kwi."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Cze."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Lip."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Sie."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Wrz."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Paź."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Lis."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Gru."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Cały dzień"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nowy kalendarz"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Brakujące pola"
@@ -358,40 +461,32 @@ msgstr "Wydarzenie kończy się przed rozpoczęciem"
 msgid "There was a database fail"
 msgstr "Awaria bazy danych"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Tydzień"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Miesiąc"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Nie udało się przetworzyć pliku."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Wybór aktywnych kalendarzy"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Twoje kalendarze"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Wyświetla odnośnik CalDAV"
 
@@ -403,19 +498,19 @@ msgstr "Współdzielone kalendarze"
 msgid "No shared calendars"
 msgstr "Brak współdzielonych kalendarzy"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Współdziel kalendarz"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Pobiera kalendarz"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Edytuje kalendarz"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Usuwa kalendarz"
@@ -501,23 +596,23 @@ msgstr "Oddziel kategorie przecinkami"
 msgid "Edit categories"
 msgstr "Edytuj kategorie"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Wydarzenie całodniowe"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opcje zaawansowane"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokalizacja"
 
@@ -525,7 +620,7 @@ msgstr "Lokalizacja"
 msgid "Location of the Event"
 msgstr "Lokalizacja wydarzenia"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -533,84 +628,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis wydarzenia"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Powtarzanie"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Wybierz dni powszechne"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Wybierz dni"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "oraz wydarzenia roku"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "oraz wydarzenia miesiąca"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Wybierz miesiące"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Wybierz tygodnie"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "oraz wydarzenia roku."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interwał"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Koniec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "wystąpienia"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Zaimportuj plik kalendarza"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Proszę wybrać kalendarz"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "stwórz nowy kalendarz"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Zaimportuj plik kalendarza"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Proszę wybierz kalendarz"
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nazwa kalendarza"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Import"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importuje kalendarz"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Zaimportowano kalendarz"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zamknij okno"
 
@@ -626,45 +723,73 @@ msgstr "Zobacz wydarzenie"
 msgid "No categories selected"
 msgstr "nie zaznaczono kategorii"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Wybierz kategorię"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "z"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "w"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Zawsze sprawdzaj zmiany strefy czasowej"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format czasu"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Pierwszy dzień tygodnia"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adres synchronizacji kalendarza CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "więcej informacji"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "Odczytać tylko linki iCalendar"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 52aca242e7..04c9ce97a2 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Błąd (de)aktywowania książki adresowej."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id nie ustawione."
 
@@ -63,7 +63,7 @@ msgstr "Nie znaleziono kontaktów."
 msgid "There was an error adding the contact."
 msgstr "Wystąpił błąd podczas dodawania kontaktu."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "nazwa elementu nie jest ustawiona."
 
@@ -87,11 +87,11 @@ msgstr "Próba dodania z duplikowanej właściwości:"
 msgid "Error adding contact property: "
 msgstr "Błąd przy dodawaniu właściwości kontaktu:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Błąd usuwania elementu."
 
@@ -103,19 +103,19 @@ msgstr "Brak ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum-a nie ustawiona"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
@@ -164,19 +164,19 @@ msgstr "Błąd uzyskiwania właściwości ZDJĘCIA."
 msgid "Error saving contact."
 msgstr "Błąd zapisu kontaktu."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Błąd zmiany rozmiaru obrazu"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Błąd przycinania obrazu"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Błąd utworzenia obrazu tymczasowego"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Błąd znajdowanie obrazu: "
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Wybierz typ"
@@ -534,7 +538,7 @@ msgstr "Edytuj szczegóły nazwy"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Usuwa książkę adresową"
 
@@ -845,30 +849,30 @@ msgstr ""
 msgid "Download"
 msgstr "Pobiera książkę adresową"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Edytuje książkę adresową"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 350097274e..75773c19f5 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,15 @@ msgstr "Polski"
 msgid "Security Warning"
 msgstr "Ostrzeżenia bezpieczeństwa"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Więcej"
 
diff --git a/l10n/pt_BR/calendar.po b/l10n/pt_BR/calendar.po
index 9d5c771269..5ffc4e305f 100644
--- a/l10n/pt_BR/calendar.po
+++ b/l10n/pt_BR/calendar.po
@@ -4,27 +4,36 @@
 # 
 # Translators:
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+# Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nenhum calendário encontrado."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nenhum evento encontrado."
 
@@ -32,300 +41,394 @@ msgstr "Nenhum evento encontrado."
 msgid "Wrong calendar"
 msgstr "Calendário incorreto"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Novo fuso horário"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fuso horário alterado"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negócio"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Chamada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Entrega"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Feriados"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idéias"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileu"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunião"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Outros"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Pessoal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projetos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Perguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sem nome"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novo Calendário"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Não repetir"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diariamente"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Cada dia da semana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "De duas em duas semanas"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensal"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por ocorrências"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por dia do mês"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por dia da semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "semana do evento no mês"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primeiro"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terceiro"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Janeiro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Fevereiro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Março"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junho"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julho"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Outubro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "eventos por data"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por dia(s) do ano"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) da semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por dia e mês"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novo Calendário"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Campos incompletos"
@@ -359,40 +462,32 @@ msgstr "O evento termina antes de começar"
 msgid "There was a database fail"
 msgstr "Houve uma falha de banco de dados"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mês"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoje"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendários"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Houve uma falha, ao analisar o arquivo."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Escolha calendários ativos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Meus Calendários"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Link para CalDav"
 
@@ -404,19 +499,19 @@ msgstr "Calendários Compartilhados"
 msgid "No shared calendars"
 msgstr "Nenhum Calendário Compartilhado"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Compartilhar Calendário"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Excluir"
@@ -502,23 +597,23 @@ msgstr "Separe as categorias por vírgulas"
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Evento de dia inteiro"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Para"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Local"
 
@@ -526,7 +621,7 @@ msgstr "Local"
 msgid "Location of the Event"
 msgstr "Local do evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrição"
 
@@ -534,84 +629,86 @@ msgstr "Descrição"
 msgid "Description of the Event"
 msgstr "Descrição do Evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Selecionar dias da semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Selecionar dias"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e o dia do evento no ano."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e o dia do evento no mês."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Selecionar meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Selecionar semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e a semana do evento no ano."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Final"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importar um arquivo de calendário"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor, escolha o calendário"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "criar um novo calendário"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importar um arquivo de calendário"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome do novo calendário"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importar"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importar calendário"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendário importado com sucesso"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fechar caixa de diálogo"
 
@@ -627,45 +724,73 @@ msgstr "Visualizar evento"
 msgid "No categories selected"
 msgstr "Nenhuma categoria selecionada"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selecionar categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "para"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Verificar sempre mudanças no fuso horário"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato da Hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primeiro dia da semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Sincronização de endereço do calendário CalDAV :"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index a6a3237e21..e0aa5a97bd 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Erro ao (des)ativar agenda."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID não definido."
 
@@ -62,7 +62,7 @@ msgstr "Nenhum contato encontrado."
 msgid "There was an error adding the contact."
 msgstr "Ocorreu um erro ao adicionar o contato."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "nome do elemento não definido."
 
@@ -86,11 +86,11 @@ msgstr "Tentando adiciona propriedade duplicada:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Erro ao excluir propriedade de contato."
 
@@ -102,19 +102,19 @@ msgstr "Faltando ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro de identificação VCard para ID:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum não definido."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
@@ -163,19 +163,19 @@ msgstr "Erro ao obter propriedade da FOTO."
 msgid "Error saving contact."
 msgstr "Erro ao salvar contato."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erro ao modificar tamanho da imagem"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erro ao recortar imagem"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erro ao criar imagem temporária"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erro ao localizar imagem:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Selecione o tipo"
@@ -533,7 +537,7 @@ msgstr "Editar detalhes do nome"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Excluir"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova agenda"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salvar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 06f2896b1d..bf55dde3ec 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Português"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_PT/calendar.po b/l10n/pt_PT/calendar.po
index 02385945ce..190c42bb94 100644
--- a/l10n/pt_PT/calendar.po
+++ b/l10n/pt_PT/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nenhum calendário encontrado."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nenhum evento encontrado."
 
@@ -32,300 +40,394 @@ msgstr "Nenhum evento encontrado."
 msgid "Wrong calendar"
 msgstr "Calendário errado"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova zona horária"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zona horária alterada"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM aaaa"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, aaaa"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Dia de anos"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negócio"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Telefonar"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Entregar"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Férias"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideias"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jublieu"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Encontro"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Pessoal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projetos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Perguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "não definido"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novo calendário"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Não repete"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diário"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Todos os dias da semana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Bi-semanal"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensal"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por ocorrências"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por dia do mês"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por dia da semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Segunda"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Terça"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Quinta"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Sexta"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "Eventos da semana do mês"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primeiro"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terçeiro"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Janeiro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Fevereiro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Março"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junho"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julho"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Outubro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "por data de evento"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por dia(s) do ano"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) da semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por dia e mês"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novo calendário"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Falta campos"
@@ -359,40 +461,32 @@ msgstr "O evento acaba antes de começar"
 msgid "There was a database fail"
 msgstr "Houve uma falha de base de dados"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mês"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoje"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendários"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Houve uma falha durante a análise do ficheiro"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Escolhe calendários ativos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Os seus calendários"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Endereço CalDav"
 
@@ -404,19 +498,19 @@ msgstr "Calendários partilhados"
 msgid "No shared calendars"
 msgstr "Nenhum calendário partilhado"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Partilhar calendário"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Apagar"
@@ -502,23 +596,23 @@ msgstr "Separe categorias por virgulas"
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Evento de dia inteiro"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Para"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Localização"
 
@@ -526,7 +620,7 @@ msgstr "Localização"
 msgid "Location of the Event"
 msgstr "Localização do evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrição"
 
@@ -534,84 +628,86 @@ msgstr "Descrição"
 msgid "Description of the Event"
 msgstr "Descrição do evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleciona os dias da semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleciona os dias"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e o dia de eventos do ano."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e o dia de eventos do mês."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleciona os meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleciona as semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e a semana de eventos do ano."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fim"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importar um ficheiro de calendário"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor escolhe o calendário"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "criar novo calendário"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importar um ficheiro de calendário"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome do novo calendário"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importar"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "A importar calendário"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendário importado com sucesso"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fechar diálogo"
 
@@ -627,45 +723,73 @@ msgstr "Ver um evento"
 msgid "No categories selected"
 msgstr "Nenhuma categoria seleccionada"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selecionar categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "em"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zona horária"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Verificar sempre por alterações na zona horária"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato da hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primeiro dia da semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Endereço de sincronização CalDav do calendário"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 25458fe13d..964dae2196 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Erro a (des)ativar o livro de endereços"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id não está definido"
 
@@ -62,7 +62,7 @@ msgstr "Nenhum contacto encontrado."
 msgid "There was an error adding the contact."
 msgstr "Erro ao adicionar contato"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "o nome do elemento não está definido."
 
@@ -86,11 +86,11 @@ msgstr "A tentar adicionar propriedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A informação sobre o vCard está incorreta. Por favor refresque a página"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Erro ao apagar propriedade do contato"
 
@@ -102,19 +102,19 @@ msgstr "Falta ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro a analisar VCard para o ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Checksum não está definido."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
@@ -163,19 +163,19 @@ msgstr "Erro a obter a propriedade Foto"
 msgid "Error saving contact."
 msgstr "Erro a guardar o contacto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erro a redimensionar a imagem"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erro a recorar a imagem"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erro a criar a imagem temporária"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erro enquanto pesquisava pela imagem: "
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccionar tipo"
@@ -533,7 +537,7 @@ msgstr "Editar detalhes do nome"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Apagar"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Novo livro de endereços"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 66854d609d..405d29be5f 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/ro/calendar.po b/l10n/ro/calendar.po
index 0521a803f4..bb0d41a50a 100644
--- a/l10n/ro/calendar.po
+++ b/l10n/ro/calendar.po
@@ -11,21 +11,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nici un calendar găsit."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nici un eveniment găsit."
 
@@ -33,300 +41,394 @@ msgstr "Nici un eveniment găsit."
 msgid "Wrong calendar"
 msgstr "Calendar greșit"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Fus orar nou:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fus orar schimbat"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Afaceri"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Sună"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clienți"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Curier"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Sărbători"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idei"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Călătorie"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Aniversare"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Altele"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proiecte"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Întrebări"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Servici"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "fără nume"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Calendar nou"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Nerepetabil"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Zilnic"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Săptămânal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "În fiecare zii a săptămânii"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "La fiecare două săptămâni"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Lunar"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "niciodată"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "după repetiție"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "după dată"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "după ziua lunii"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "după ziua săptămânii"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Luni"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Marți"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Joi"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Vineri"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Duminică"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "evenimentele săptămânii din luna"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primul"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "al doilea"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "al treilea"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "al patrulea"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "al cincilea"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ultimul"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Ianuarie"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februarie"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Martie"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprilie"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Iunie"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Iulie"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembrie"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octombrie"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Noiembrie"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembrie"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "după data evenimentului"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "după ziua(zilele) anului"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "după numărul săptămânii"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "după zi și lună"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Toată ziua"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Calendar nou"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Câmpuri lipsă"
@@ -360,40 +462,32 @@ msgstr "Evenimentul se termină înainte să înceapă"
 msgid "There was a database fail"
 msgstr "A avut loc o eroare a bazei de date"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Săptămâna"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Luna"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Listă"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Astăzi"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendare"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "A fost întâmpinată o eroare în procesarea fișierului"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Alege calendarele active"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Calendarele tale"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Legătură CalDav"
 
@@ -405,19 +499,19 @@ msgstr "Calendare partajate"
 msgid "No shared calendars"
 msgstr "Nici un calendar partajat"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Partajați calendarul"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Modifică"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Șterge"
@@ -503,23 +597,23 @@ msgstr "Separă categoriile prin virgule"
 msgid "Edit categories"
 msgstr "Editează categorii"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Toată ziua"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De la"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Către"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opțiuni avansate"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Locație"
 
@@ -527,7 +621,7 @@ msgstr "Locație"
 msgid "Location of the Event"
 msgstr "Locația evenimentului"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descriere"
 
@@ -535,84 +629,86 @@ msgstr "Descriere"
 msgid "Description of the Event"
 msgstr "Descrierea evenimentului"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetă"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Selectează zilele săptămânii"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Selectează zilele"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "și evenimentele de zi cu zi ale anului."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "și evenimentele de zi cu zi ale lunii."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Selectează lunile"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Selectează săptămânile"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "și evenimentele săptămânale ale anului."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Sfârșit"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "repetiții"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importă un calendar"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Alegeți calendarul"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "crează un calendar nou"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importă un calendar"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Numele noului calendar"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importă"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importă calendar"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendarul a fost importat cu succes"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Închide"
 
@@ -628,45 +724,73 @@ msgstr "Vizualizează un eveniment"
 msgid "No categories selected"
 msgstr "Nici o categorie selectată"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selecteză categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "din"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "la"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fus orar"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Verifică mereu pentru schimbări ale fusului orar"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Forma de afișare a orei"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prima zi a săptămînii"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa pentru sincronizarea calendarului CalDAV"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index f57b3a85c7..0881e6a3b5 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "(Dez)activarea agendei a întâmpinat o eroare."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID-ul nu este stabilit"
 
@@ -62,7 +62,7 @@ msgstr "Nici un contact găsit"
 msgid "There was an error adding the contact."
 msgstr "O eroare a împiedicat adăugarea contactului."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "numele elementului nu este stabilit."
 
@@ -86,11 +86,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Eroare la ștergerea proprietăților contactului."
 
@@ -102,19 +102,19 @@ msgstr "ID lipsă"
 msgid "Error parsing VCard for ID: \""
 msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "suma de control nu este stabilită."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
@@ -163,19 +163,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -533,7 +537,7 @@ msgstr "Introdu detalii despre nume"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Șterge"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editează"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Agendă nouă"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Anulează"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index c55341dca2..b3622accd5 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,15 @@ msgstr "_language_name_"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mai mult"
 
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index 1d841d6166..33e20b02e3 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:20+0000\n"
-"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,31 +74,30 @@ msgstr "Неверный запрос"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календарь"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ддд"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ддд М/д"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "дддд М/д"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "ММММ гггг"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "дддд, МММ д, гггг"
 
@@ -223,7 +222,7 @@ msgstr "по дню месяца"
 msgid "by weekday"
 msgstr "по дню недели"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -247,7 +246,7 @@ msgstr "Пятница"
 msgid "Saturday"
 msgstr "Суббота"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -464,33 +463,25 @@ msgstr "Окончание события раньше, чем его начал
 msgid "There was a database fail"
 msgstr "Ошибка базы данных"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Неделя"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Список"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Сегодня"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Не удалось обработать файл."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Выберите активные календари"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -742,55 +733,63 @@ msgstr "из"
 msgid "at"
 msgstr "на"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Всегда проверяйте изменение часового пояса"
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Формат времени"
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr "24ч"
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr "12ч"
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Первый день недели"
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr "подробнее"
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr "24ч"
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr "12ч"
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "подробнее"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 4efdb68140..4c7214c485 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -29,8 +29,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Ошибка (де)активации адресной книги."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id не установлен."
 
@@ -66,7 +66,7 @@ msgstr "Контакты не найдены."
 msgid "There was an error adding the contact."
 msgstr "Произошла ошибка при добавлении контакта."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "имя элемента не установлено."
 
@@ -90,11 +90,11 @@ msgstr "При попытке добавить дубликат:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информация о vCard некорректна. Пожалуйста, обновите страницу."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Ошибка удаления информации из контакта."
 
@@ -106,19 +106,19 @@ msgstr "Отсутствует ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Ошибка обработки VCard для ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "контрольная сумма не установлена."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Что-то пошло FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
@@ -167,19 +167,19 @@ msgstr "Ошибка при получении ФОТО."
 msgid "Error saving contact."
 msgstr "Ошибка при сохранении контактов."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Ошибка изменения размера изображений"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Ошибка обрезки изображений"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Ошибка создания временных изображений"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Ошибка поиска изображений:"
 
@@ -279,6 +279,10 @@ msgid ""
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Выберите тип"
@@ -537,7 +541,7 @@ msgstr "Изменить детали имени"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Удалить"
 
@@ -848,30 +852,30 @@ msgstr ""
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Редактировать"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Отменить"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 28d5f3edcc..9f1a0a6d9b 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,15 @@ msgstr "Русский "
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Ещё"
 
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
index 3092e784c2..9b56074202 100644
--- a/l10n/sk_SK/calendar.po
+++ b/l10n/sk_SK/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nenašiel sa žiadny kalendár."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nenašla sa žiadna udalosť."
 
@@ -31,300 +39,394 @@ msgstr "Nenašla sa žiadna udalosť."
 msgid "Wrong calendar"
 msgstr "Zlý kalendár"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nová časová zóna:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Časové pásmo zmenené"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM rrrr"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, rrrr"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Podnikanie"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Hovor"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Doručovateľ"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Nápady"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Cesta"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileá"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Stretnutia"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ostatné"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobné"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Otázky"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nepomenovaný"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nový kalendár"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Neopakovať"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Denne"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Týždenne"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Každý deň v týždni"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Každý druhý týždeň"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mesačne"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Ročne"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikdy"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "podľa výskytu"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "podľa dátumu"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "podľa dňa v mesiaci"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "podľa dňa v týždni"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pondelok"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Streda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Piatok"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "týždenné udalosti v mesiaci"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prvý"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "druhý"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tretí"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "štvrtý"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "piaty"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "posledný"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Január"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Február"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marec"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Apríl"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Máj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Jún"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Júl"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Október"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "podľa dátumu udalosti"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po dňoch"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "podľa čísel týždňov"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "podľa dňa a mesiaca"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dátum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Celý deň"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nový kalendár"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Nevyplnené položky"
@@ -358,40 +460,32 @@ msgstr "Udalosť končí ešte pred tým než začne"
 msgid "There was a database fail"
 msgstr "Nastala chyba databázy"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Týždeň"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mesiac"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Zoznam"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Dnes"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendáre"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Nastala chyba počas parsovania súboru."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Zvoľte aktívne kalendáre"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaše kalendáre"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav odkaz"
 
@@ -403,19 +497,19 @@ msgstr "Zdielané kalendáre"
 msgid "No shared calendars"
 msgstr "Žiadne zdielané kalendáre"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Zdielať kalendár"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Upraviť"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Odstrániť"
@@ -501,23 +595,23 @@ msgstr "Kategórie oddelené čiarkami"
 msgid "Edit categories"
 msgstr "Úprava kategórií"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodenná udalosť"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Pokročilé možnosti"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Poloha"
 
@@ -525,7 +619,7 @@ msgstr "Poloha"
 msgid "Location of the Event"
 msgstr "Poloha udalosti"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Popis"
 
@@ -533,84 +627,86 @@ msgstr "Popis"
 msgid "Description of the Event"
 msgstr "Popis udalosti"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Opakovať"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Do času"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vybrať dni"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "a denné udalosti v roku."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "a denné udalosti v mesiaci."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vybrať mesiace"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vybrať týždne"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "a týždenné udalosti v roku."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Koniec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "výskyty"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Importovať súbor kalendára"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Prosím zvoľte kalendár"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "vytvoriť nový kalendár"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Importovať súbor kalendára"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Meno nového kalendára"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Importovať"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importujem kalendár"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendár úspešne importovaný"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zatvoriť dialóg"
 
@@ -626,45 +722,73 @@ msgstr "Zobraziť udalosť"
 msgid "No categories selected"
 msgstr "Žiadne vybraté kategórie"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vybrať kategóriu"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "z"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "v"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Časová zóna"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Vždy kontroluj zmeny časového pásma"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formát času"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prvý deň v týždni"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synchronizačná adresa kalendára CalDAV: "
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index 1ced7f47fd..ef45c76a92 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Chyba (de)aktivácie adresára."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID nie je nastavené."
 
@@ -62,7 +62,7 @@ msgstr "Žiadne kontakty nenájdené."
 msgid "There was an error adding the contact."
 msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "meno elementu nie je nastavené."
 
@@ -86,11 +86,11 @@ msgstr "Pokúšate sa pridať rovnaký atribút:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Chyba odstránenia údaju kontaktu."
 
@@ -102,19 +102,19 @@ msgstr "Chýba ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba pri vyňatí ID z VCard:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrolný súčet nie je nastavený."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
@@ -163,19 +163,19 @@ msgstr "Chyba počas získavania fotky."
 msgid "Error saving contact."
 msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Chyba vyhľadania obrázku: "
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vybrať typ"
@@ -533,7 +537,7 @@ msgstr "Upraviť podrobnosti mena"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Upraviť"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nový adresár"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index a01fe0a664..3260101687 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "Slovensky"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Viac"
 
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index d4f7e0cf0d..b1792961b6 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.po
@@ -11,21 +11,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Ni bilo najdenih koledarjev."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Ni bilo najdenih dogodkov."
 
@@ -33,300 +41,394 @@ msgstr "Ni bilo najdenih dogodkov."
 msgid "Wrong calendar"
 msgstr "Napačen koledar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nov časovni pas:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Časovni pas je bil spremenjen"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neveljaven zahtevek"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Koledar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Pokliči"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Stranke"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dobavitelj"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Dopust"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Potovanje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Obletnica"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ostalo"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osebno"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Vprašanja"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "neimenovan"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nov koledar"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Se ne ponavlja"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dnevno"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Tedensko"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Vsak dan v tednu"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dvakrat tedensko"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mesečno"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Letno"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikoli"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "po številu dogodkov"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "po datumu"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "po dnevu v mesecu"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "po dnevu v tednu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "torek"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "sreda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "četrtek"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "petek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "nedelja"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "dogodki tedna v mesecu"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prvi"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "drugi"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tretji"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "četrti"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "peti"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "zadnji"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "marec"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "april"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "junij"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "julij"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "avgust"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "september"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "november"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "december"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "po datumu dogodka"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po številu let"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "po tednu v letu"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "po dnevu in mesecu"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kol."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Cel dan"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nov koledar"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Mankajoča polja"
@@ -360,40 +462,32 @@ msgstr "Dogodek se konča preden se začne"
 msgid "There was a database fail"
 msgstr "Napaka v podatkovni zbirki"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Teden"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Seznam"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Danes"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Koledarji"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Pri razčlenjevanju datoteke je prišlo do napake."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Izberite aktivne koledarje"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaši koledarji"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav povezava"
 
@@ -405,19 +499,19 @@ msgstr "Koledarji v souporabi"
 msgid "No shared calendars"
 msgstr "Ni koledarjev v souporabi"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Daj koledar v souporabo"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Izbriši"
@@ -503,23 +597,23 @@ msgstr "Kategorije ločite z vejico"
 msgid "Edit categories"
 msgstr "Uredi kategorije"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodnevni dogodek"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Napredne možnosti"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Kraj"
 
@@ -527,7 +621,7 @@ msgstr "Kraj"
 msgid "Location of the Event"
 msgstr "Kraj dogodka"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -535,84 +629,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis dogodka"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ponovi"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Izberite dneve v tednu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Izberite dneve"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "in dnevu dogodka v letu."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "in dnevu dogodka v mesecu."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Izberite mesece"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Izberite tedne"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "in tednu dogodka v letu."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Časovni razmik"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Konec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ponovitev"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Uvozi datoteko koledarja"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Izberi koledar"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Uvozi datoteko koledarja"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Ime novega koledarja"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "Uvozi"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Uvažam koledar"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Koledar je bil uspešno uvožen"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zapri dialog"
 
@@ -628,45 +724,73 @@ msgstr "Poglej dogodek"
 msgid "No categories selected"
 msgstr "Nobena kategorija ni izbrana"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Izberi kategorijo"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "od"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "pri"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Časovni pas"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Vedno preveri za spremembe časovnega pasu"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Zapis časa"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ur"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ur"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prvi dan v tednu"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV sinhronizacijski naslov koledarja:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 5c48279297..765e127a41 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Napaka med (de)aktivacijo imenika."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id ni nastavljen."
 
@@ -62,7 +62,7 @@ msgstr "Ni bilo najdenih stikov."
 msgid "There was an error adding the contact."
 msgstr "Med dodajanjem stika je prišlo do napake"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "ime elementa ni nastavljeno."
 
@@ -86,11 +86,11 @@ msgstr "Poskušam dodati podvojeno lastnost:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Napaka pri brisanju lastnosti stika."
 
@@ -102,19 +102,19 @@ msgstr "Manjkajoč ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Napaka pri razčlenjevanju VCard za ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "nadzorna vsota ni nastavljena."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
@@ -163,19 +163,19 @@ msgstr "Napaka pri pridobivanju lastnosti fotografije."
 msgid "Error saving contact."
 msgstr "Napaka pri shranjevanju stika."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Napaka pri spreminjanju velikosti slike"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Napaka pri obrezovanju slike"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Napaka pri ustvarjanju začasne slike"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Napaka pri iskanju datoteke: "
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Izberite vrsto"
@@ -533,7 +537,7 @@ msgstr "Uredite podrobnosti imena"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nov imenik"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 7d09d17dd1..d43e82d75a 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "__ime_jezika__"
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Več"
 
diff --git a/l10n/so/calendar.po b/l10n/so/calendar.po
index 139a523a52..eb308550f9 100644
--- a/l10n/so/calendar.po
+++ b/l10n/so/calendar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index e200e45aba..48bc4a90b1 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 5c073c4939..12d7e09dd0 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr/calendar.po b/l10n/sr/calendar.po
index 4245b5f8f0..4e95b27e79 100644
--- a/l10n/sr/calendar.po
+++ b/l10n/sr/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "Погрешан календар"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Временска зона је промењена"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Неисправан захтев"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Посао"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Позив"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клијенти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Достављач"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Празници"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Идеје"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "путовање"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "јубилеј"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Састанак"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Друго"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Лично"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Пројекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Питања"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Нови календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не понавља се"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "дневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "недељно"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "сваког дана у недељи"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "двонедељно"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "месечно"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "годишње"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Цео дан"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Нови календар"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Недеља"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Списак"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Данас"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "дошло је до грешке при расчлањивању фајла."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Изаберите активне календаре"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "КалДав веза"
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Обриши"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Целодневни догађај"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Од"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Локација"
 
@@ -524,7 +618,7 @@ msgstr "Локација"
 msgid "Location of the Event"
 msgstr "Локација догађаја"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Опис"
 
@@ -532,84 +626,86 @@ msgstr "Опис"
 msgid "Description of the Event"
 msgstr "Опис догађаја"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Понављај"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
 #: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Изаберите категорију"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 96f1ec9f35..87d87ab2e5 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти су неисправни. Поново учитајте страницу."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Обриши"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Преузимање"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Сними"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 30c688852a..bb0202bd13 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr@latin/calendar.po b/l10n/sr@latin/calendar.po
index cfea90215c..fd13b07471 100644
--- a/l10n/sr@latin/calendar.po
+++ b/l10n/sr@latin/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "Pogrešan kalendar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Vremenska zona je promenjena"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Posao"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Praznici"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "putovanje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "jubilej"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Drugo"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Lično"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novi kalendar"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ne ponavlja se"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "dnevno"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "nedeljno"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "svakog dana u nedelji"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "dvonedeljno"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "mesečno"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "godišnje"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Ceo dan"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novi kalendar"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Nedelja"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Spisak"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Danas"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "došlo je do greške pri rasčlanjivanju fajla."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Izaberite aktivne kalendare"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "KalDav veza"
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Obriši"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodnevni događaj"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokacija"
 
@@ -524,7 +618,7 @@ msgstr "Lokacija"
 msgid "Location of the Event"
 msgstr "Lokacija događaja"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -532,84 +626,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis događaja"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ponavljaj"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:15
-msgid "Name of new calendar"
-msgstr ""
-
 #: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Izaberite kategoriju"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 535012fa25..25c7058c75 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Obriši"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 997b911c20..77b3b35367 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sv/calendar.po b/l10n/sv/calendar.po
index b2bce445e1..1d0bf44090 100644
--- a/l10n/sv/calendar.po
+++ b/l10n/sv/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 20:35+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,31 +73,30 @@ msgstr "Ogiltig begäran"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM åååå"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "ddd, MMM d, åååå"
 
@@ -222,7 +221,7 @@ msgstr "efter dag i månaden"
 msgid "by weekday"
 msgstr "efter veckodag"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Måndag"
 
@@ -246,7 +245,7 @@ msgstr "Fredag"
 msgid "Saturday"
 msgstr "Lördag"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Söndag"
 
@@ -463,33 +462,25 @@ msgstr "Händelsen slutar innan den börjar"
 msgid "There was a database fail"
 msgstr "Det blev ett databasfel"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Vecka"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Månad"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Idag"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Kalendrar"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Det blev ett fel medan filen analyserades."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Välj aktiva kalendrar"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -741,55 +732,63 @@ msgstr "av"
 msgid "at"
 msgstr "på"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Kontrollera alltid ändringar i tidszon."
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Första dagen av veckan"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Töm cache för upprepade händelser"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Kalender CalDAV synkroniserar adresser"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "mer info"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Primary address (Kontact et al)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Read only iCalendar link(s)"
 
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 2e83ae869b..ec6bc7bdca 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
-"PO-Revision-Date: 2012-08-05 17:56+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +28,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fel (av)aktivera adressbok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID är inte satt."
 
@@ -65,7 +65,7 @@ msgstr "Inga kontakter funna."
 msgid "There was an error adding the contact."
 msgstr "Det uppstod ett fel när kontakten skulle läggas till."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "elementnamn ej angett."
 
@@ -89,11 +89,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr "Kunde inte lägga till egenskap för kontakt:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle tas bort."
 
@@ -105,19 +105,19 @@ msgstr "ID saknas"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fel vid läsning av VCard för ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrollsumma är inte satt."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Något gick fel."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras."
 
@@ -166,19 +166,19 @@ msgstr "Fel vid hämtning av egenskaper för FOTO."
 msgid "Error saving contact."
 msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Kunde inte hitta bild:"
 
@@ -278,6 +278,10 @@ msgid ""
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Välj typ"
@@ -536,7 +540,7 @@ msgstr "Redigera detaljer för namn"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Radera"
 
@@ -847,30 +851,30 @@ msgstr "Visa skrivskyddad VCF-länk"
 msgid "Download"
 msgstr "Nedladdning"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Redigera"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Namn"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Beskrivning"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Spara"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Mer..."
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index f8c317b7d5..5358eb4715 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
-"PO-Revision-Date: 2012-08-05 17:03+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,11 +76,15 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Mera"
 
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 0923b3560e..c2877fdb0a 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 9afce66a0c..aa4057ffab 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 45d062ecbc..7db6db817b 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e078d4ab05..51a556b88e 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 43eeb2aba4..b501697f0d 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 740cbaedea..40704ea886 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index bc1291279c..d0102a1f62 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 568fa54578..34f55dabd4 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a53e210997..d5175cb926 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,11 +69,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index 85bdc87fc0..9803e71602 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "ไม่พบปฏิทินที่ต้องการ"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "ไม่พบกิจกรรมที่ต้องการ"
 
@@ -31,300 +39,394 @@ msgstr "ไม่พบกิจกรรมที่ต้องการ"
 msgid "Wrong calendar"
 msgstr "ปฏิทินไม่ถูกต้อง"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "สร้างโซนเวลาใหม่:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "โซนเวลาถูกเปลี่ยนแล้ว"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถูกต้อง"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "ปฏิทิน"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:829
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:830
-msgid "dddd M/d"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
-msgid "MMMM yyyy"
-msgstr ""
+msgid "ddd M/d"
+msgstr "ddd M/d"
 
-#: js/calendar.js:835
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr "dddd M/d"
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr "MMMM yyyy"
+
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "วันเกิด"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "ธุรกิจ"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "โทรติดต่อ"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "ลูกค้า"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "จัดส่ง"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "วันหยุด"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "ไอเดีย"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "การเดินทาง"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "งานเลี้ยง"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "นัดประชุม"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "โครงการ"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "คำถาม"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "งาน"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "ไม่มีชื่อ"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "สร้างปฏิทินใหม่"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "ไม่ต้องทำซ้ำ"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "รายวัน"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "รายสัปดาห์"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "ทุกวันหยุด"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "รายปักษ์"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "รายเดือน"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "รายปี"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ไม่ต้องเลย"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "ตามจำนวนที่ปรากฏ"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "ตามวันที่"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "จากเดือน"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "จากสัปดาห์"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "วันจันทร์"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "วันอังคาร"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "วันพุธ"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "วันพฤหัสบดี"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "วันศุกร์"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "วันเสาร์"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "วันอาทิตย์"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "สัปดาห์ที่มีกิจกรรมของเดือน"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "ลำดับแรก"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "ลำดับที่สอง"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "ลำดับที่สาม"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "ลำดับที่สี่"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "ลำดับที่ห้า"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ลำดับสุดท้าย"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "มกราคม"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "มีนาคม"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "เมษายน"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "มิถุนายน"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "สิงหาคม"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "กันยายน"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "ตุลาคม"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "ธันวาคม"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "ตามวันที่จัดกิจกรรม"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "ของเมื่อวานนี้"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "จากหมายเลขของสัปดาห์"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "ตามวันและเดือน"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "วันที่"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "คำนวณ"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "ทั้งวัน"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "สร้างปฏิทินใหม่"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "ช่องฟิลด์เกิดการสูญหาย"
@@ -358,40 +460,32 @@ msgstr "วันที่สิ้นสุดกิจกรรมดังก
 msgid "There was a database fail"
 msgstr "เกิดความล้มเหลวกับฐานข้อมูล"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "สัปดาห์"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "เดือน"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "รายการ"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "วันนี้"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "ปฏิทิน"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "เกิดความล้มเหลวในการแยกไฟล์"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "เลือกปฏิทินที่ต้องการใช้งาน"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "ปฏิทินของคุณ"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "ลิงค์ CalDav"
 
@@ -403,19 +497,19 @@ msgstr "ปฏิทินที่เปิดแชร์"
 msgid "No shared calendars"
 msgstr "ไม่มีปฏิทินที่เปิดแชร์ไว้"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "เปิดแชร์ปฏิทิน"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "ลบ"
@@ -501,23 +595,23 @@ msgstr "คั่นระหว่างรายการหมวดหมู
 msgid "Edit categories"
 msgstr "แก้ไขหมวดหมู่"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "เป็นกิจกรรมตลอดทั้งวัน"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "จาก"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "ถึง"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "ตัวเลือกขั้นสูง"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "สถานที่"
 
@@ -525,7 +619,7 @@ msgstr "สถานที่"
 msgid "Location of the Event"
 msgstr "สถานที่จัดกิจกรรม"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "คำอธิบาย"
 
@@ -533,84 +627,86 @@ msgstr "คำอธิบาย"
 msgid "Description of the Event"
 msgstr "คำอธิบายเกี่ยวกับกิจกรรม"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "ทำซ้ำ"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "เลือกสัปดาห์"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "เลือกวัน"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "และวันที่มีเหตุการณ์เกิดขึ้นในปี"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "และวันที่มีเหตุการณ์เกิดขึ้นในเดือน"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "เลือกเดือน"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "เลือกสัปดาห์"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "และสัปดาห์ที่มีเหตุการณ์เกิดขึ้นในปี"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "ช่วงเวลา"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "สิ้นสุด"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "จำนวนที่ปรากฏ"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "นำเข้าไฟล์ปฏิทิน"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "กรณาเลือกปฏิทิน"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "สร้างปฏิทินใหม่"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "นำเข้าไฟล์ปฏิทิน"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "ชื่อของปฏิทิน"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "นำเข้าข้อมูล"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "นำเข้าข้อมูลปฏิทิน"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "ปฏิทินถูกนำเข้าข้อมูลเรียบร้อยแล้ว"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "ปิดกล่องข้อความโต้ตอบ"
 
@@ -626,45 +722,73 @@ msgstr "ดูกิจกรรม"
 msgid "No categories selected"
 msgstr "ยังไม่ได้เลือกหมวดหมู่"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "เลือกหมวดหมู่"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "ของ"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "ที่"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "โซนเวลา"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "ตรวจสอบการเปลี่ยนแปลงโซนเวลาอยู่เสมอ"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "รูปแบบการแสดงเวลา"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 ช.ม."
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 ช.ม."
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "วันแรกของสัปดาห์"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "ที่อยู่ในการเชื่อมข้อมูลกับปฏิทิน CalDav:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index b89d76eeec..33ab6b3567 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ยังไม่ได้กำหนดรหัส"
 
@@ -61,7 +61,7 @@ msgstr "ไม่พบข้อมูลการติดต่อที่ต
 msgid "There was an error adding the contact."
 msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "ยังไม่ได้กำหนดชื่อ"
 
@@ -85,11 +85,11 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ"
 
@@ -101,19 +101,19 @@ msgstr "รหัสสูญหาย"
 msgid "Error parsing VCard for ID: \""
 msgstr "พบข้อผิดพลาดในการแยกรหัส VCard:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "ยังไม่ได้กำหนดค่า checksum"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
@@ -162,19 +162,19 @@ msgstr "เกิดข้อผิดพลาดในการดึงคุ
 msgid "Error saving contact."
 msgstr "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "เกิดข้อผิดพลาดในการครอบตัดภาพ"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "เกิดข้อผิดพลาดในการค้นหารูปภาพ: "
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "เลือกชนิด"
@@ -532,7 +536,7 @@ msgstr "แก้ไขรายละเอียดของชื่อ"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "ลบ"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 3adfedcdeb..0a267797bd 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "ภาษาไทย"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "เพิ่มเติม"
 
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 90156adadf..0e49a20184 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 06:05+0000\n"
-"Last-Translator: mesutgungor <mesutgungor@iyte.edu.tr>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,31 +74,30 @@ msgstr "Geçersiz istek"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Takvim"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, MMM d, yyyy"
 
@@ -223,7 +222,7 @@ msgstr "ay günlerine göre"
 msgid "by weekday"
 msgstr "hafta günlerine göre"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -247,7 +246,7 @@ msgstr "Cuma"
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -464,33 +463,25 @@ msgstr "Olay başlamadan önce bitiyor"
 msgid "There was a database fail"
 msgstr "Bir veritabanı başarısızlığı oluştu"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Hafta"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Ay"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Bugün"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Takvimler"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Dosya okunurken başarısızlık oldu."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aktif takvimleri seçin"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -742,55 +733,63 @@ msgstr "nın"
 msgid "at"
 msgstr "üzerinde"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zaman dilimi"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Sürekli zaman dilimi değişikliklerini kontrol et"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Saat biçimi"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24s"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12s"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Haftanın ilk günü"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Önbellek"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Tekrar eden etkinlikler için ön belleği temizle."
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "CalDAV takvimi adresleri senkronize ediyor."
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "daha fazla bilgi"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Öncelikli adres"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Sadece okunabilir iCalendar link(ler)i"
 
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index e2f07fe95d..79c0485edd 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Adres defteri etkisizleştirilirken hata oluştu."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id atanmamış."
 
@@ -62,7 +62,7 @@ msgstr "Bağlantı bulunamadı."
 msgid "There was an error adding the contact."
 msgstr "Kişi eklenirken hata oluştu."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "eleman ismi atanmamış."
 
@@ -86,11 +86,11 @@ msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Kişi özelliği silinirken hata oluştu."
 
@@ -102,19 +102,19 @@ msgstr "Eksik ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "ID için VCard ayrıştırılamadı:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum atanmamış."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
@@ -163,19 +163,19 @@ msgstr "Resim özelleğini alırken hata oluştu."
 msgid "Error saving contact."
 msgstr "Bağlantıyı kaydederken hata"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Görüntü yeniden boyutlandırılamadı."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Görüntü kırpılamadı."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Geçici resim oluştururken hata oluştu"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Resim ararken hata oluştu:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Tür seç"
@@ -533,7 +537,7 @@ msgstr "İsim detaylarını düzenle"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Sil"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "İndir"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "İptal"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 11c40ff6af..3918a8c55f 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "__dil_adı__"
 msgid "Security Warning"
 msgstr "Güvenlik Uyarisi"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "Devamı"
 
diff --git a/l10n/uk/calendar.po b/l10n/uk/calendar.po
index f2eab41a95..a80f3c9db3 100644
--- a/l10n/uk/calendar.po
+++ b/l10n/uk/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,303 +38,397 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Новий часовий пояс"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Часовий пояс змінено"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Справи"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Подзвонити"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клієнти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Свята"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ідеї"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Поїздка"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Ювілей"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Зустріч"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Інше"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Особисте"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Проекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Запитання"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Робота"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "новий Календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не повторювати"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Щоденно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Щотижня"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "По будням"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Кожні дві неділі"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Щомісяця"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Щорічно"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ніколи"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понеділок"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Середа"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Четвер"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Субота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Неділя"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "перший"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "другий"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "третій"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "четвертий"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "п'ятий"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "останній"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Січень"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Лютий"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Березень"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Квітень"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Травень"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Червень"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Липень"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Серпень"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Вересень"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Жовтень"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Листопад"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Грудень"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Дата"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Кал."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Увесь день"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "новий Календар"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "Пропущені поля"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
@@ -335,62 +437,54 @@ msgstr "Назва"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr ""
+msgstr "Від Дати"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr ""
+msgstr "З Часу"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr ""
+msgstr "До Часу"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr ""
+msgstr "По Дату"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "Подія завершається до її початку"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "Сталася помилка бази даних"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Тиждень"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Місяць"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Список"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Сьогодні"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Календарі"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Сталася помилка при обробці файлу"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Вибрати активні календарі"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Ваші календарі"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,22 +496,22 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Редагувати"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Видалити"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
@@ -445,7 +539,7 @@ msgstr "Колір календаря"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Зберегти"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
@@ -454,7 +548,7 @@ msgstr ""
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Відмінити"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
@@ -462,7 +556,7 @@ msgstr ""
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Експорт"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "З"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "По"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Місце"
 
@@ -524,7 +618,7 @@ msgstr "Місце"
 msgid "Location of the Event"
 msgstr "Місце події"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Опис"
 
@@ -532,84 +626,86 @@ msgstr "Опис"
 msgid "Description of the Event"
 msgstr "Опис події"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повторювати"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "Імпортувати файл календаря"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr ""
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "створити новий календар"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "Імпортувати файл календаря"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Назва нового календаря"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
-msgstr ""
+msgstr "Імпорт"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Календар успішно імпортовано"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,49 +721,77 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Часовий пояс"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Формат часу"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24г"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12г"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Адреса синхронізації календаря CalDAV:"
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Користувачі"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
@@ -679,7 +803,7 @@ msgstr ""
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 450539dd15..3cb6c2aa24 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Видалити"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Нова адресна книга"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 01069d3c25..e4682933d3 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr ""
 
diff --git a/l10n/vi/calendar.po b/l10n/vi/calendar.po
index f0f4660844..b08b6e2ae8 100644
--- a/l10n/vi/calendar.po
+++ b/l10n/vi/calendar.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -71,31 +71,30 @@ msgstr "Yêu cầu không hợp lệ"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Lịch"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, MMM d, yyyy"
 
@@ -220,7 +219,7 @@ msgstr "bởi ngày trong tháng"
 msgid "by weekday"
 msgstr "bởi ngày trong tuần"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Thứ 2"
 
@@ -244,7 +243,7 @@ msgstr "Thứ "
 msgid "Saturday"
 msgstr "Thứ 7"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -461,33 +460,25 @@ msgstr "Sự kiện này kết thúc trước khi nó bắt đầu"
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Tuần"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Tháng"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Danh sách"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hôm nay"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Lịch"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Có một thất bại, trong khi phân tích các tập tin."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Chọn lịch hoạt động"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,55 +730,63 @@ msgstr "của"
 msgid "at"
 msgstr "tại"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Luôn kiểm tra múi giờ"
-
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "24h"
-msgstr "24h"
-
-#: templates/settings.php:36
-msgid "12h"
-msgstr "12h"
-
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr ""
-
 #: templates/settings.php:47
-msgid "Cache"
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:53
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Primary address (Kontact et al)"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
 #: templates/settings.php:57
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 3e5a19915b..3568844e5b 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id không được thiết lập."
 
@@ -60,7 +60,7 @@ msgstr "Không tìm thấy danh sách"
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "tên phần tử không được thiết lập."
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr "Missing ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Xóa"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Sửa"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Hủy"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index f23b9f3b38..beef7bf246 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,15 @@ msgstr "__Ngôn ngữ___"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "nhiều hơn"
 
diff --git a/l10n/zh_CN.GB2312/bookmarks.po b/l10n/zh_CN.GB2312/bookmarks.po
new file mode 100644
index 0000000000..7bf81fd460
--- /dev/null
+++ b/l10n/zh_CN.GB2312/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/calendar.po b/l10n/zh_CN.GB2312/calendar.po
new file mode 100644
index 0000000000..dcd1b515ca
--- /dev/null
+++ b/l10n/zh_CN.GB2312/calendar.po
@@ -0,0 +1,813 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:832
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:839
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:841
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:41
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
+
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
new file mode 100644
index 0000000000..8a348956c1
--- /dev/null
+++ b/l10n/zh_CN.GB2312/contacts.po
@@ -0,0 +1,874 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:37
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:44
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:42
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:62
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:69
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:144
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:69
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:79
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:115
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:118
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:71
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:71
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:76
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
+#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
+#: js/contacts.js:1337 js/contacts.js:1371
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1390
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:68
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:112 templates/part.contact.php:117
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:113
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:114 templates/part.contact.php:116
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:136
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:139
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:140
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:146
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:194
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:195
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:196
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18 templates/settings.php:9
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:36 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:37
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Next addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.contact.php:17
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:22
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:36
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:33
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:42
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:43 templates/part.contact.php:119
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:44
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:44
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:46
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:47 templates/part.contact.php:120
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:50
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:63 templates/part.contact.php:77
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:64
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:64
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:69
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:78
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:82
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:92
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:92
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:103
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:110
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:115
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:118
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:124
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:3
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:6
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings.php:49
+msgid "More..."
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
new file mode 100644
index 0000000000..8748ed587d
--- /dev/null
+++ b/l10n/zh_CN.GB2312/core.po
@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:572
+msgid "January"
+msgstr ""
+
+#: js/js.js:572
+msgid "February"
+msgstr ""
+
+#: js/js.js:572
+msgid "March"
+msgstr ""
+
+#: js/js.js:572
+msgid "April"
+msgstr ""
+
+#: js/js.js:572
+msgid "May"
+msgstr ""
+
+#: js/js.js:572
+msgid "June"
+msgstr ""
+
+#: js/js.js:573
+msgid "July"
+msgstr ""
+
+#: js/js.js:573
+msgid "August"
+msgstr ""
+
+#: js/js.js:573
+msgid "September"
+msgstr ""
+
+#: js/js.js:573
+msgid "October"
+msgstr ""
+
+#: js/js.js:573
+msgid "November"
+msgstr ""
+
+#: js/js.js:573
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
new file mode 100644
index 0000000000..c940c64066
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files.po
@@ -0,0 +1,222 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:694 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:695 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:722
+msgid "folder"
+msgstr ""
+
+#: js/files.js:724
+msgid "folders"
+msgstr ""
+
+#: js/files.js:732
+msgid "file"
+msgstr ""
+
+#: js/files.js:734
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/gallery.po b/l10n/zh_CN.GB2312/gallery.po
new file mode 100644
index 0000000000..32b2ed7179
--- /dev/null
+++ b/l10n/zh_CN.GB2312/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
new file mode 100644
index 0000000000..49d72542b8
--- /dev/null
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:288
+msgid "Help"
+msgstr ""
+
+#: app.php:295
+msgid "Personal"
+msgstr ""
+
+#: app.php:300
+msgid "Settings"
+msgstr ""
+
+#: app.php:305
+msgid "Users"
+msgstr ""
+
+#: app.php:312
+msgid "Apps"
+msgstr ""
+
+#: app.php:314
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/media.po b/l10n/zh_CN.GB2312/media.po
new file mode 100644
index 0000000000..dc0ea7dd0b
--- /dev/null
+++ b/l10n/zh_CN.GB2312/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
new file mode 100644
index 0000000000..db57684f5f
--- /dev/null
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -0,0 +1,226 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:62
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:69
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:26
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:29
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80 templates/users.php:112
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index 5353f15cdb..b66ae0afc1 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 # 冰 蓝 <lanbing89@gmail.com>, 2012.
@@ -10,21 +11,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "无法找到日历。"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "无法找到事件。"
 
@@ -32,300 +41,394 @@ msgstr "无法找到事件。"
 msgid "Wrong calendar"
 msgstr "错误的日历"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新时区："
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "时区已修改"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "日历"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "商务"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "呼叫"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "客户"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "派送"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "节日"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "想法"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "周年纪念"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "会议"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "其他"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "个人"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "项目"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "问题"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "未命名"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新日历"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "不重复"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "每天"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "每周"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "每个工作日"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "每两周"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "每月"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "每年"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "从不"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "按发生次数"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "按日期"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "按月的某天"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "按星期的某天"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "星期一"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "星期二"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "星期三"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "星期四"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "星期五"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "星期六"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "星期日"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "事件在每月的第几个星期"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "第一"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "第二"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "第三"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "第四"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "第五"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "最后"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "一月"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "二月"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "三月"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "四月"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "五月"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "六月"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "七月"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "八月"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "九月"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "十月"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "十一月"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "十二月"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "按事件日期"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "按每年的某天"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "按星期数"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "按天和月份"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "日期"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "日历"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "全天"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "新日历"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "缺少字段"
@@ -359,40 +462,32 @@ msgstr "事件在开始前已结束"
 msgid "There was a database fail"
 msgstr "数据库访问失败"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "星期"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "列表"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "今天"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "日历"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "解析文件失败"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "选择活动日历"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "您的日历"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav 链接"
 
@@ -404,19 +499,19 @@ msgstr "共享的日历"
 msgid "No shared calendars"
 msgstr "无共享的日历"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "共享日历"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "下载"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "编辑"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "删除"
@@ -502,23 +597,23 @@ msgstr "用逗号分隔分类"
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "全天事件"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "自"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "至"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "地点"
 
@@ -526,7 +621,7 @@ msgstr "地点"
 msgid "Location of the Event"
 msgstr "事件地点"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "描述"
 
@@ -534,84 +629,86 @@ msgstr "描述"
 msgid "Description of the Event"
 msgstr "事件描述"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "重复"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "选择星期中的某天"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "选择某天"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "选择每年事件发生的日子"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "选择每月事件发生的日子"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "选择月份"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "选择星期"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "选择每年的事件发生的星期"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "间隔"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "结束"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "次"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "导入日历文件"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "请选择日历"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "创建新日历"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "导入日历文件"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "新日历名称"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "导入"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "导入日历"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "导入日历成功"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "关闭对话框"
 
@@ -627,45 +724,73 @@ msgstr "查看事件"
 msgid "No categories selected"
 msgstr "无选中分类"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "选择分类"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "在"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "在"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "时区"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "选中则总是按照时区变化"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "时间格式"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24小时"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12小时"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "每周的第一天"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "日历CalDAV 同步地址："
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index f12fcc02ee..0c73f885ca 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "没有设置 id。"
 
@@ -62,7 +62,7 @@ msgstr "找不到联系人。"
 msgid "There was an error adding the contact."
 msgstr "添加联系人时出错。"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "元素名称未设置"
 
@@ -86,11 +86,11 @@ msgstr "试图添加重复属性： "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信息不正确。请重新加载页面。"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "删除联系人属性错误。"
 
@@ -102,19 +102,19 @@ msgstr "缺少 ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "无法解析如下ID的 VCard：“"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "未设置校验值。"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard 信息不正确。请刷新页面: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "有一些信息无法被处理。"
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
@@ -163,19 +163,19 @@ msgstr "获取照片属性时出错。"
 msgid "Error saving contact."
 msgstr "保存联系人时出错。"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "缩放图像时出错"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "裁切图像时出错"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "创建临时图像时出错"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "查找图像时出错: "
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "选择类型"
@@ -533,7 +537,7 @@ msgstr "编辑名称详情"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "删除"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "下载"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "编辑"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "新建地址簿"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "保存"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 783ce4e652..9a78b0ea32 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,15 @@ msgstr "简体中文"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_TW/calendar.po b/l10n/zh_TW/calendar.po
index 60f1e1c802..4af2f93588 100644
--- a/l10n/zh_TW/calendar.po
+++ b/l10n/zh_TW/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "沒有找到行事曆"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "沒有找到活動"
 
@@ -31,300 +39,394 @@ msgstr "沒有找到活動"
 msgid "Wrong calendar"
 msgstr "錯誤日曆"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新時區："
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "時區已變更"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "無效請求"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "日曆"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "商業"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "呼叫"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "客戶"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "遞送者"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "節日"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "主意"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "周年慶"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "會議"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "其他"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "計畫"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "問題"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "無名稱的"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新日曆"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "不重覆"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "每日"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "每週"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "每週末"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "每雙週"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "每月"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "每年"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "絕不"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "由事件"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "由日期"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "依月份日期"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "由平日"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "週一"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "週二"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "週三"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "週四"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "週五"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "週六"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "週日"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "月份中活動週"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "第一"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "第二"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "第三"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "第四"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "第五"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "最後"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "一月"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "二月"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "三月"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "四月"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "五月"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "六月"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "七月"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "八月"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "九月"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "十月"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "十一月"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "十二月"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "由事件日期"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "依年份日期"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "由週數"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "由日與月"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "日期"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "行事曆"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "整天"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "新日曆"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "遺失欄位"
@@ -358,40 +460,32 @@ msgstr "事件的結束在開始之前"
 msgid "There was a database fail"
 msgstr "資料庫錯誤"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "週"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "清單"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "今日"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "日曆"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "解析檔案時失敗。"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "選擇一個作用中的日曆"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "你的行事曆"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav 聯結"
 
@@ -403,19 +497,19 @@ msgstr "分享的行事曆"
 msgid "No shared calendars"
 msgstr "不分享的行事曆"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "分享行事曆"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "下載"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "編輯"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "刪除"
@@ -501,23 +595,23 @@ msgstr "用逗點分隔分類"
 msgid "Edit categories"
 msgstr "編輯分類"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "全天事件"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "自"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "至"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "進階選項"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "位置"
 
@@ -525,7 +619,7 @@ msgstr "位置"
 msgid "Location of the Event"
 msgstr "事件位置"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "描述"
 
@@ -533,84 +627,86 @@ msgstr "描述"
 msgid "Description of the Event"
 msgstr "事件描述"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "重覆"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "選擇平日"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "選擇日"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "以及年中的活動日"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "以及月中的活動日"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "選擇月"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "選擇週"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "以及年中的活動週"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "間隔"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "結束"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "事件"
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr "匯入日曆檔案"
-
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "請選擇日曆"
-
-#: templates/part.import.php:10
+#: templates/part.import.php:14
 msgid "create a new calendar"
 msgstr "建立新日曆"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr "匯入日曆檔案"
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "新日曆名稱"
 
-#: templates/part.import.php:17
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
 msgid "Import"
 msgstr "匯入"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "匯入日曆"
-
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "已成功匯入日曆"
-
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "關閉對話"
 
@@ -626,45 +722,73 @@ msgstr "觀看一個活動"
 msgid "No categories selected"
 msgstr "沒有選擇分類"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "選擇分類"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "於"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "於"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "時區"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "總是檢查是否變更了時區"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "日期格式"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24小時制"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12小時制"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "每週的第一天"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV 的日曆同步地址："
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 6c64233870..d3df1f2810 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "在啟用或關閉電話簿時發生錯誤"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr "沒有找到聯絡人"
 msgid "There was an error adding the contact."
 msgstr "添加通訊錄發生錯誤"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "有關 vCard 的資訊不正確，請重新載入此頁。"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "刪除通訊錄內容中發生錯誤"
 
@@ -101,19 +101,19 @@ msgstr "遺失ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr "編輯姓名詳細資訊"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "刪除"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "下載"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "編輯"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "新電話簿"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "儲存"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index be9f9d50a8..06c3abe8ec 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr "__語言_名稱__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:41
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:56
+#: templates/admin.php:69
 msgid "More"
 msgstr "更多"
 
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 148a8becc9..569abd58cb 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,13 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Email saved" => "Email adresse gemt",
 "Invalid email" => "Ugyldig email adresse",
 "OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
+"Authentication error" => "Adgangsfejl",
 "Language changed" => "Sprog ændret",
+"Error" => "Fejl",
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
 "Saving..." => "Gemmer...",
 "__language_name__" => "Dansk",
+"Security Warning" => "Sikkerhedsadvarsel",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
@@ -43,6 +47,7 @@
 "Create" => "Ny",
 "Default Quota" => "Standard kvote",
 "Other" => "Andet",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index e0cb125953..8c6296d3fb 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -36,10 +36,10 @@
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung!",
+"Help translate" => "Hilf bei der Übersetzung",
 "use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 6e70d923b3..55a7482d24 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
 "Email saved" => "La retpoŝtadreso konserviĝis",
 "Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Authentication error" => "Aŭtentiga eraro",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Error" => "Eraro",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Saving..." => "Konservante...",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 687c21259f..8da36b421a 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposible cargar la lista desde App Store",
 "Email saved" => "Correo salvado",
 "Invalid email" => "Correo Incorrecto",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
 "Authentication error" => "Error de autenticación",
 "Language changed" => "Idioma cambiado",
+"Error" => "Error",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Saving..." => "Salvando..",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 819fc0a2c3..48a6e14ebb 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,13 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Email saved" => "Email mentve",
 "Invalid email" => "Hibás email",
 "OpenID Changed" => "OpenID megváltozott",
 "Invalid request" => "Érvénytelen kérés",
+"Authentication error" => "Hitelesítési hiba",
 "Language changed" => "A nyelv megváltozott",
+"Error" => "Hiba",
 "Disable" => "Letiltás",
 "Enable" => "Engedélyezés",
 "Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Biztonsági figyelmeztetés",
 "Log" => "Napló",
 "More" => "Tovább",
 "Add your App" => "App hozzáadása",
@@ -43,6 +47,7 @@
 "Create" => "Létrehozás",
 "Default Quota" => "Alapértelmezett kvóta",
 "Other" => "Egyéb",
+"SubAdmin" => "al-Admin",
 "Quota" => "Kvóta",
 "Delete" => "Törlés"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index f215e5b910..ae1ebaf991 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Authentication error" => "認証エラー",
 "Language changed" => "言語が変更されました",
+"Error" => "エラー",
 "Disable" => "無効",
 "Enable" => "有効",
 "Saving..." => "保存中...",
@@ -45,6 +47,7 @@
 "Create" => "作成",
 "Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
+"SubAdmin" => "サブ管理者",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );

From 465767670bef61572bb38cabce901935d9e23e7b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 11:04:04 -0400
Subject: [PATCH 1399/1537] Check blacklist when renaming files

---
 lib/base.php       |  1 +
 lib/filesystem.php | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 0730e5ff3a..2cbce82677 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -362,6 +362,7 @@ class OC{
 
 		// Check for blacklisted files
 		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
+		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 47626c05ae..e9d2ae9337 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -363,13 +363,21 @@ class OC_Filesystem{
 	
 	/**
 	 * checks if a file is blacklsited for storage in the filesystem
+	 * Listens to write and rename hooks
 	 * @param array $data from hook
 	 */
 	static public function isBlacklisted($data){
 		$blacklist = array('.htaccess');
-		$filename = strtolower(basename($data['path']));
-		if(in_array($filename,$blacklist)){
-			$data['run'] = false;	
+		if (isset($data['path'])) {
+			$path = $data['path'];
+		} else if (isset($data['newpath'])) {
+			$path = $data['newpath'];
+		}
+		if (isset($path)) {
+			$filename = strtolower(basename($path));
+			if (in_array($filename, $blacklist)) {
+				$data['run'] = false;
+			}
 		}
 	}
 	

From 0d8df3f55cfeda735e561409405060934240e4fe Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 11 Aug 2012 17:07:35 +0200
Subject: [PATCH 1400/1537] Revert "Combine install checks in lib/base.php"

This reverts commit aa9fbf6639e2ce2fa2e8549d2d82d54a745d5327.
---
 lib/base.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 2cbce82677..b4f3e66713 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -173,25 +173,11 @@ class OC{
 
 	public static function checkInstalled() {
 		// Redirect to installer if not installed
-		if (!OC_Config::getValue('installed', false)) {
-			if (OC::$SUBURI != '/index.php') {
-				if(!OC::$CLI){
-					$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
-					header("Location: $url");
-				}
-				exit();
+		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+			if(!OC::$CLI){
+				$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+				header("Location: $url");
 			}
-			// Check for autosetup:
-			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
-			if( file_exists( $autosetup_file )){
-				OC_Log::write('core','Autoconfig file found, setting up owncloud...', OC_Log::INFO);
-				include( $autosetup_file );
-				$_POST['install'] = 'true';
-				$_POST = array_merge ($_POST, $AUTOCONFIG);
-				unlink($autosetup_file);
-			}
-			OC_Util::addScript('setup');
-			require_once('setup.php');
 			exit();
 		}
 	}
@@ -328,10 +314,10 @@ class OC{
 		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
 		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
 
-		self::initTemplateEngine();
 		self::checkInstalled();
 		self::checkSSL();
 		self::initSession();
+		self::initTemplateEngine();
 		self::checkUpgrade();
 
 		$errors=OC_Util::checkServer();
@@ -401,6 +387,20 @@ class OC{
 	 * @brief Handle the request
 	 */
 	public static function handleRequest() {
+		if (!OC_Config::getValue('installed', false)) {
+			// Check for autosetup:
+			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
+			if( file_exists( $autosetup_file )){
+				OC_Log::write('core','Autoconfig file found, setting up owncloud...',OC_Log::INFO);
+				include( $autosetup_file );
+				$_POST['install'] = 'true';
+				$_POST = array_merge ($_POST, $AUTOCONFIG);
+				unlink($autosetup_file);
+			}
+			OC_Util::addScript('setup');
+			require_once('setup.php');
+			exit();
+		}
 		// Handle WebDAV
 		if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
 			header('location: '.OC_Helper::linkToRemote('webdav'));

From bf7afa28d5f8321552352e7b07563251852645f5 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sat, 11 Aug 2012 17:18:49 +0200
Subject: [PATCH 1401/1537] Backgroundjobs: cron.php now checks for
 mode=="none"

---
 cron.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cron.php b/cron.php
index 1e0bb5f6dc..83285e8a47 100644
--- a/cron.php
+++ b/cron.php
@@ -47,7 +47,19 @@ if( !OC_Config::getValue( 'installed', false )){
 // Handle unexpected errors
 register_shutdown_function('handleUnexpectedShutdown');
 
+// Exit if background jobs are disabled!
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
+if( $appmode == 'none' ){
+	my_temporary_cron_class::$sent = true;
+	if( OC::$CLI ){
+		echo 'Background Jobs are disabled!'.PHP_EOL;
+	}
+	else{
+		OC_JSON::error( array( 'data' => array( 'message' => 'Background jobs disabled!')));
+	}
+	exit( 1 );
+}
+
 if( OC::$CLI ){
 	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );

From 1d7e3071e02b27219ead8938e95bf121d319c3b0 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sat, 11 Aug 2012 17:32:17 +0200
Subject: [PATCH 1402/1537] bump version to reate new tables

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 732acbb920..0ef030e440 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,81,2);
+		return array(4,81,3);
 	}
 
 	/**

From bd90b7eacae3317b0af4283254b21bba98a9624d Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sat, 11 Aug 2012 17:37:53 +0200
Subject: [PATCH 1403/1537] Backgroundjobs: Fix bug in admin interface

---
 settings/ajax/setbackgroundjobsmode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
index 0ff14376e6..905b90e645 100644
--- a/settings/ajax/setbackgroundjobsmode.php
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -26,6 +26,6 @@ require_once('../../lib/base.php');
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-OC_Appconfig::setValue( 'core', 'backgroundjob_mode', $_POST['mode'] );
+OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $_POST['mode'] );
 
 echo 'true';

From 5b16c7a25d5031d727de56cb11f86f0656e2e2c0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 11 Aug 2012 20:53:56 +0200
Subject: [PATCH 1404/1537] This is unnessecary because we already run
 htmlentities() over the template engine

---
 apps/files_versions/history.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index a34c92ee42..27dc8bfc38 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -28,7 +28,7 @@ $tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
 if ( isset( $_GET['path'] ) ) {
 
 	$path = $_GET['path'];
-	$path = strip_tags( $path );
+	$path = $path;
 	$tmpl->assign( 'path', $path );
 	$versions = new OCA_Versions\Storage();
 

From baa0b4d530db8a585692c222d5f5cf185438c68a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 11:42:38 -0400
Subject: [PATCH 1405/1537] Cast subadmin groups as strings

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 5a3820b74d..91d24adafc 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -133,7 +133,7 @@ $(document).ready(function(){
 		}
 		if($(element).attr('class') == 'subadminsselect'){	
 			if(element.data('subadmin')){
-				checked=element.data('subadmin').split(', ');
+				checked=String(element.data('subadmin')).split(', ');
 			}
 			var checkHandeler=function(group){
 				if(group=='admin'){

From 8d1eb674ec37651aa8b67eec51de6a9f08523fd9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 30 Jul 2012 20:20:46 -0400
Subject: [PATCH 1406/1537] Add search, limit, and offset parameters to
 getUsers() and getGroups()

---
 lib/group.php           |  8 ++++----
 lib/group/backend.php   |  2 +-
 lib/group/database.php  | 12 +++++-------
 lib/group/interface.php |  2 +-
 lib/public/user.php     |  2 +-
 lib/user.php            | 12 ++++++------
 lib/user/backend.php    |  2 +-
 lib/user/database.php   | 13 ++++++-------
 lib/user/interface.php  |  2 +-
 9 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/lib/group.php b/lib/group.php
index 7b137f0f8f..a3bdbf9e00 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -237,10 +237,10 @@ class OC_Group {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){
-		$groups=array();
-		foreach(self::$_usedBackends as $backend){
-			$groups=array_merge($backend->getGroups(),$groups);
+	public static function getGroups($search = '', $limit = 10, $offset = 0) {
+		$groups = array();
+		foreach (self::$_usedBackends as $backend) {
+			$groups = array_merge($backend->getGroups($search, $limit, $offset), $groups);
 		}
 		asort($groups);
 		return $groups;
diff --git a/lib/group/backend.php b/lib/group/backend.php
index ebc078f152..3f2909caa1 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -105,7 +105,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
+	public function getGroups($search = '', $limit = 10, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index 2770ec185c..6314a12743 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -164,15 +164,13 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
-		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups`" );
-		$result = $query->execute();
-
+	public function getGroups($search = '', $limit = 10, $offset = 0) {
+		$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		$result = $query->execute(array($search.'%'));
 		$groups = array();
-		while( $row = $result->fetchRow()){
-			$groups[] = $row["gid"];
+		while ($row = $result->fetchRow()) {
+			$groups[] = $row['gid'];
 		}
-
 		return $groups;
 	}
 
diff --git a/lib/group/interface.php b/lib/group/interface.php
index 7cca6061e1..6e492e7274 100644
--- a/lib/group/interface.php
+++ b/lib/group/interface.php
@@ -58,7 +58,7 @@ interface OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups();
+	public function getGroups($search = '', $limit = 10, $offset = 0);
 
 	/**
 	 * check if a group exists
diff --git a/lib/public/user.php b/lib/public/user.php
index 713e366b96..178d1dddd3 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -51,7 +51,7 @@ class User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers(){
+	public static function getUsers($search = '', $limit = 10, $offset = 0) {
 		return \OC_USER::getUsers();
 	}
 
diff --git a/lib/user.php b/lib/user.php
index 49a0a2a10c..95177bc77d 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -338,12 +338,12 @@ class OC_User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers(){
-		$users=array();
-		foreach(self::$_usedBackends as $backend){
-			$backendUsers=$backend->getUsers();
-			if(is_array($backendUsers)){
-				$users=array_merge($users,$backendUsers);
+	public static function getUsers($search = '', $limit = 10, $offset = 0) {
+		$users = array();
+		foreach (self::$_usedBackends as $backend) {
+			$backendUsers = $backend->getUsers($search, $limit, $offset);
+			if (is_array($backendUsers)) {
+				$users = array_merge($users, $backendUsers);
 			}
 		}
 		asort($users);
diff --git a/lib/user/backend.php b/lib/user/backend.php
index daa942d261..ff00ef08f6 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -97,7 +97,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers(){
+	public function getUsers($search = '', $limit = 10, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/user/database.php b/lib/user/database.php
index cc27b3ddbf..968814d9d5 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -154,13 +154,12 @@ class OC_User_Database extends OC_User_Backend {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers(){
-		$query = OC_DB::prepare( "SELECT uid FROM *PREFIX*users" );
-		$result = $query->execute();
-
-		$users=array();
-		while( $row = $result->fetchRow()){
-			$users[] = $row["uid"];
+	public function getUsers($search = '', $limit = 10, $offset = 0) {
+		$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		$result = $query->execute(array($search.'%'));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['uid'];
 		}
 		return $users;
 	}
diff --git a/lib/user/interface.php b/lib/user/interface.php
index dc3685dc20..b3286cd2f9 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -48,7 +48,7 @@ interface OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers();
+	public function getUsers($search = '', $limit = 10, $offset = 0);
 
 	/**
 	* @brief check if a user exists

From 9d2ae5fa1f2feed1c3907747b3bccd1193cb2981 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:01:43 -0400
Subject: [PATCH 1407/1537] Add infinite scrolling to Settings -> Users, still
 a little buggy

---
 settings/ajax/userlist.php |  45 +++++++++
 settings/js/users.js       | 186 +++++++++++++++++++++++--------------
 settings/users.php         |   2 +
 3 files changed, 164 insertions(+), 69 deletions(-)
 create mode 100644 settings/ajax/userlist.php

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
new file mode 100644
index 0000000000..a73b699624
--- /dev/null
+++ b/settings/ajax/userlist.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once '../../lib/base.php';
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+if (isset($_GET['offset'])) {
+	$offset = $_GET['offset'];
+} else {
+	$offset = 0;
+}
+$users = array();
+if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+	$batch = OC_User::getUsers('', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => implode(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+} else {
+	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$batch = OC_Group::usersInGroups($groups);
+	foreach ($batch as $user) {
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+}
+OC_JSON::success(array('data' => $users));
\ No newline at end of file
diff --git a/settings/js/users.js b/settings/js/users.js
index 91d24adafc..29f70f24df 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -22,10 +22,6 @@ UserList={
 		// Set undo flag
 		UserList.deleteCanceled = false;
 		
-		// Hide user in table to reflect deletion
-		$(this).parent().parent().hide();
-		$('tr').filterAttr( 'data-uid', UserList.deleteUid ).hide();
-		
 		// Provide user with option to undo
 		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
 		$('#notification').data('deleteuser',true);
@@ -66,26 +62,92 @@ UserList={
 				}
 			});
  		}
-	}
-}
+	},
 
-$(document).ready(function(){
-	function setQuota(uid,quota,ready){
-		$.post(
-			OC.filePath('settings','ajax','setquota.php'),
-			{username:uid,quota:quota},
-			function(result){
-				if(ready){
-					ready(result.data.quota);
-				}
+	add:function(username, groups, subadmin, quota, sort) {
+		var tr = $('tbody tr').first().clone();
+		tr.data('uid', username);
+		tr.find('td.name').text(username);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+		groupsSelect.data('username', username);
+		groupsSelect.data('userGroups', groups);
+		tr.find('td.groups').empty();
+		if (tr.find('td.subadmins').length > 0) {
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'SubAdmin') + '">');
+			subadminSelect.data('username', username);
+			subadminSelect.data('userGroups', groups);
+			subadminSelect.data('subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		var allGroups = String($('#content table').data('groups')).split(', ');
+		$.each(allGroups, function(i, group) {
+			groupsSelect.append($('<option value="'+group+'">'+group+'</option>'));
+			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+				subadminSelect.append($('<option value="'+group+'">'+group+'</option>'));
 			}
-		);
-	}
-	
-	function applyMultiplySelect(element){
+		});
+		tr.find('td.groups').append(groupsSelect);
+		UserList.applyMultiplySelect(groupsSelect);
+		tr.find('td.subadmins').append(subadminSelect);
+		UserList.applyMultiplySelect(subadminSelect);
+		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+			tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+		} else if (OC.currentUser == username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota == 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="'+quota+'"]').length > 0) {
+				quotaSelect.find('option[value="'+quota+'"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="'+quota+'" selected="selected">'+quota+'</option>');
+			}
+		}
+		var added = false;
+		if (sort) {
+			username = username.toLowerCase();
+			$('tbody tr').each(function() {
+				if (username < $(this).data('uid').toLowerCase()) {
+					$(tr).insertBefore($(this));
+					added = true;
+					return false;
+				}
+			});
+		} 
+		if (!added) {
+			$(tr).appendTo('tbody');
+		}
+		return tr;
+	},
+
+	update:function() {
+		if (typeof UserList.offset === 'undefined') {
+			UserList.offset = $('tbody tr').length;
+		}
+		$.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) {
+			if (result.status === 'success') {
+				$.each(result.data, function(index, user) {
+					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+					UserList.offset++;
+					if (index == 9) {
+						$(tr).bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+							$(this).unbind(event);
+							UserList.update();
+						});
+					}
+				});
+			}
+		});
+	},
+
+	applyMultiplySelect:function(element) {
 		var checked=[];
 		var user=element.data('username');
-		if($(element).attr('class') == 'groupsselect'){		
+		if($(element).attr('class') == 'groupsselect'){
 			if(element.data('userGroups')){
 				checked=String(element.data('userGroups')).split(', ');
 			}
@@ -131,7 +193,7 @@ $(document).ready(function(){
 				minWidth: 100,
 			});
 		}
-		if($(element).attr('class') == 'subadminsselect'){	
+		if($(element).attr('class') == 'subadminsselect'){
 			if(element.data('subadmin')){
 				checked=String(element.data('subadmin')).split(', ');
 			}
@@ -166,17 +228,37 @@ $(document).ready(function(){
 			});
 		}
 	}
+}
+
+$(document).ready(function(){
+
+	$('tbody tr:last').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		UserList.update();
+	});
+
+	function setQuota(uid,quota,ready){
+		$.post(
+			OC.filePath('settings','ajax','setquota.php'),
+			{username:uid,quota:quota},
+			function(result){
+				if(ready){
+					ready(result.data.quota);
+				}
+			}
+		);
+	}
+	
+	
 	$('select[multiple]').each(function(index,element){
-		applyMultiplySelect($(element));
+		UserList.applyMultiplySelect($(element));
 	});
 	
 	$('td.remove>a').live('click',function(event){
-		
-		var uid = $(this).parent().parent().data('uid');
-		
+		var row = $(this).parent().parent();
+		var uid = $(row).data('uid');
+		$(row).hide();
 		// Call function for handling delete/undo
-		UserList.do_delete( uid );
-		
+		UserList.do_delete(uid);
 	});
 	
 	$('td.password>img').live('click',function(event){
@@ -297,45 +379,8 @@ $(document).ready(function(){
 			function(result){
 				if(result.status!='success'){
 					OC.dialogs.alert(result.data.message, 'Error creating user');
-				}
-				else {
-					groups = result.data.groups;
-					var tr=$('#content table tbody tr').first().clone();
-					tr.attr('data-uid',username);
-					tr.find('td.name').text(username);
-					var select=$('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-					var subadminselect=$('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'SubAdmin') + '">');
-					select.data('username',username);
-					select.data('userGroups',groups);
-					subadminselect.data('username',username);
-					subadminselect.data('userGroups',groups);
-					tr.find('td.groups').empty();
-					tr.find('td.subadmins').empty();
-					var allGroups=$('#content table').data('groups').split(', ');
-					for(var i=0;i<groups.length;i++){
-						if(allGroups.indexOf(groups[i])==-1){
-							allGroups.push(groups[i]);
-						}
-					}
-					$.each(allGroups,function(i,group){
-						select.append($('<option value="'+group+'">'+group+'</option>'));
-						if(group != 'admin'){
-							subadminselect.append($('<option value="'+group+'">'+group+'</option>'));
-						}
-					});
-					tr.find('td.groups').append(select);
-					tr.find('td.subadmins').append(subadminselect);
-					if(tr.find('td.remove img').length==0){
-						tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
-					}
-					applyMultiplySelect(select);
-					applyMultiplySelect(subadminselect);
-					
-					$('#content table tbody').last().append(tr);
-
-					tr.find('select.quota-user option').attr('selected',null);
-					tr.find('select.quota-user option').first().attr('selected','selected');
-					tr.find('select.quota-user').data('previous','default');
+				} else {
+					UserList.add(username, result.data.groups, null, 'default', true);
 				}
 			}
 		);
@@ -343,9 +388,12 @@ $(document).ready(function(){
 	// Handle undo notifications
 	$('#notification').hide();
 	$('#notification .undo').live('click', function() {
-		if($('#notification').data('deleteuser'))
-		{
-			$( 'tr' ).filterAttr( 'data-uid', UserList.deleteUid ).show();
+		if($('#notification').data('deleteuser')) {
+			$('tbody tr').each(function(index, row) {
+				if ($(row).data('uid') == UserList.deleteUid) {
+					$(row).show();
+				}
+			});
 			UserList.deleteCanceled=true;
 			UserList.deleteFiles=null;
 		}
diff --git a/settings/users.php b/settings/users.php
index e88c4d1d9c..e5f01bbbfb 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,6 +11,8 @@ OC_Util::checkSubAdminUser();
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
+// TODO Move script to core
+OC_Util::addScript('contacts', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 

From 874f31b8d773cc0df3572c275d1ac42642a7f719 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:06:31 -0400
Subject: [PATCH 1408/1537] Make getting all users and groups the default

---
 lib/group.php           | 2 +-
 lib/group/backend.php   | 2 +-
 lib/group/database.php  | 8 ++++++--
 lib/group/dummy.php     | 2 +-
 lib/group/example.php   | 2 +-
 lib/group/interface.php | 2 +-
 lib/public/user.php     | 2 +-
 lib/user/backend.php    | 2 +-
 lib/user/database.php   | 8 ++++++--
 lib/user/dummy.php      | 2 +-
 lib/user/interface.php  | 2 +-
 11 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/group.php b/lib/group.php
index a3bdbf9e00..e47b770f59 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -237,7 +237,7 @@ class OC_Group {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups($search = '', $limit = 10, $offset = 0) {
+	public static function getGroups($search = '', $limit = -1, $offset = 0) {
 		$groups = array();
 		foreach (self::$_usedBackends as $backend) {
 			$groups = array_merge($backend->getGroups($search, $limit, $offset), $groups);
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 3f2909caa1..7a7cebc726 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -105,7 +105,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups($search = '', $limit = 10, $offset = 0) {
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index 6314a12743..669edc662c 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -164,8 +164,12 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups($search = '', $limit = 10, $offset = 0) {
-		$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
+		if ($limit == -1) {
+			$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ?');
+		} else {
+			$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		}
 		$result = $query->execute(array($search.'%'));
 		$groups = array();
 		while ($row = $result->fetchRow()) {
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 1243891023..092aa9beda 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -141,7 +141,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		return array_keys($this->groups);
 	}
 
diff --git a/lib/group/example.php b/lib/group/example.php
index 9c9ece5ac7..c33b435ca0 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -91,7 +91,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Returns a list with all groups
 	 */
-	abstract public static function getGroups();
+	abstract public static function getGroups($search = '', $limit = -1, $offset = 0);
 
 	/**
 	 * check if a group exists
diff --git a/lib/group/interface.php b/lib/group/interface.php
index 6e492e7274..f496d502df 100644
--- a/lib/group/interface.php
+++ b/lib/group/interface.php
@@ -58,7 +58,7 @@ interface OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups($search = '', $limit = 10, $offset = 0);
+	public function getGroups($search = '', $limit = -1, $offset = 0);
 
 	/**
 	 * check if a group exists
diff --git a/lib/public/user.php b/lib/public/user.php
index 178d1dddd3..2fa599488a 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -51,7 +51,7 @@ class User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers($search = '', $limit = 10, $offset = 0) {
+	public static function getUsers($search = '', $limit = -1, $offset = 0) {
 		return \OC_USER::getUsers();
 	}
 
diff --git a/lib/user/backend.php b/lib/user/backend.php
index ff00ef08f6..f67908cdac 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -97,7 +97,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers($search = '', $limit = 10, $offset = 0) {
+	public function getUsers($search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/user/database.php b/lib/user/database.php
index 968814d9d5..1deed51761 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -154,8 +154,12 @@ class OC_User_Database extends OC_User_Backend {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers($search = '', $limit = 10, $offset = 0) {
-		$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+	public function getUsers($search = '', $limit = -1, $offset = 0) {
+		if ($limit == -1) {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ?');
+		} else {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		}
 		$result = $query->execute(array($search.'%'));
 		$users = array();
 		while ($row = $result->fetchRow()) {
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index a946d4e621..da3edfb2df 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -100,7 +100,7 @@ class OC_User_Dummy extends OC_User_Backend {
 		*
 		* Get a list of all users.
 		*/
-	public function getUsers(){
+	public function getUsers($search = '', $limit = -1, $offset = 0) {
 		return array_keys($this->users);
 	}
 
diff --git a/lib/user/interface.php b/lib/user/interface.php
index b3286cd2f9..a4903898fb 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -48,7 +48,7 @@ interface OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers($search = '', $limit = 10, $offset = 0);
+	public function getUsers($search = '', $limit = -1, $offset = 0);
 
 	/**
 	* @brief check if a user exists

From 400533af2cd1e85a8089b113efff30d24c276625 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:07:52 -0400
Subject: [PATCH 1409/1537] Start with 30 users, this fills my screen

---
 settings/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/users.php b/settings/users.php
index e5f01bbbfb..5651826a6d 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -22,7 +22,7 @@ $groups = array();
 $isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
 if($isadmin){
 	$accessiblegroups = OC_Group::getGroups();
-	$accessibleusers = OC_User::getUsers();
+	$accessibleusers = OC_User::getUsers('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
 	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());

From 4f1b3631ba3356fb3890180b65281b9653a0e714 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:09:25 -0400
Subject: [PATCH 1410/1537] Change limit parameter in OC_User as well

---
 lib/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index 95177bc77d..cbd1400844 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -338,7 +338,7 @@ class OC_User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers($search = '', $limit = 10, $offset = 0) {
+	public static function getUsers($search = '', $limit = -1, $offset = 0) {
 		$users = array();
 		foreach (self::$_usedBackends as $backend) {
 			$backendUsers = $backend->getUsers($search, $limit, $offset);

From a1c88a3e39695a463ff7d0dda74dbdbb59d86f5c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:21:09 -0400
Subject: [PATCH 1411/1537] Add search, limit, offset parameters to
 usersInGroups()

---
 lib/group.php           | 11 ++++++-----
 lib/group/backend.php   |  2 +-
 lib/group/database.php  | 16 ++++++++++------
 lib/group/dummy.php     |  2 +-
 lib/group/example.php   |  2 +-
 lib/group/interface.php |  2 +-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/lib/group.php b/lib/group.php
index e47b770f59..72cf5dc89a 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -264,10 +264,10 @@ class OC_Group {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){
+	public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			$users=array_merge($backend->usersInGroup($gid),$users);
+			$users = array_merge($backend->usersInGroup($gid, $search, $limit, $offset), $users);
 		}
 		return $users;
 	}
@@ -277,10 +277,11 @@ class OC_Group {
 	 * @param array $gids
 	 * @returns array with user ids
 	 */
-	public static function usersInGroups($gids){
+	public static function usersInGroups($gids, $search = '', $limit = -1, $offset = 0) {
 		$users = array();
-		foreach($gids as $gid){
-			$users = array_merge(array_diff(self::usersInGroup($gid), $users), $users);
+		foreach ($gids as $gid) {
+			// TODO Need to apply limits to groups as total
+			$users = array_merge(array_diff(self::usersInGroup($gid, $search, $limit, $offset), $users), $users);
 		}
 		return $users;
 	}
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 7a7cebc726..4c7d09bcb1 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -122,7 +122,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid){
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index 669edc662c..1cb4171f49 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -182,12 +182,16 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid){
-		$query=OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid=?');
-		$users=array();
-		$result=$query->execute(array($gid));
-		while($row=$result->fetchRow()){
-			$users[]=$row['uid'];
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+		if ($limit == -1) {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid = ? AND uid LIKE ?');
+		} else {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid = ? AND uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		}
+		$result = $query->execute(array($gid, $search.'%'));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['uid'];
 		}
 		return $users;
 	}
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 092aa9beda..51eca28f3f 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -149,7 +149,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid){
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(isset($this->groups[$gid])){
 			return $this->groups[$gid];
 		}else{
diff --git a/lib/group/example.php b/lib/group/example.php
index c33b435ca0..76d1262976 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -104,6 +104,6 @@ abstract class OC_Group_Example {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	abstract public static function usersInGroup($gid);
+	abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
 }
diff --git a/lib/group/interface.php b/lib/group/interface.php
index f496d502df..12cc07a537 100644
--- a/lib/group/interface.php
+++ b/lib/group/interface.php
@@ -71,6 +71,6 @@ interface OC_Group_Interface {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid);
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
 }
\ No newline at end of file

From 651245effac83f8f3859e94a4c70bba96ffd40eb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:24:50 -0400
Subject: [PATCH 1412/1537] Use limit and offset for subadmin users

---
 settings/ajax/userlist.php | 4 ++--
 settings/users.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index a73b699624..b89b8c55ef 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -33,11 +33,11 @@ $users = array();
 if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 	$batch = OC_User::getUsers('', 10, $offset);
 	foreach ($batch as $user) {
-		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => implode(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$batch = OC_Group::usersInGroups($groups);
+	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
 	foreach ($batch as $user) {
 		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
diff --git a/settings/users.php b/settings/users.php
index 5651826a6d..6f39059757 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -26,7 +26,7 @@ if($isadmin){
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
 	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessibleusers = OC_Group::usersInGroups($accessiblegroups);
+	$accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30);
 	$subadmins = false;
 }
 

From a5a5ab2318758d68ec8cc5c707a9df43822d8fe4 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 16:29:41 -0400
Subject: [PATCH 1413/1537] Add type text to new user, fixes display issue

---
 settings/templates/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/templates/users.php b/settings/templates/users.php
index d8200bf202..3e9faddadf 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -18,7 +18,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 </script>
 <div id="controls">
 	<form id="newuser">
-		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
 			class="groupsselect"

From 2bc8d3e5d65cd3b34ab535362c064fcfe6e89de0 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sun, 12 Aug 2012 00:37:14 +0200
Subject: [PATCH 1414/1537] Backgroundjobs: interface improvements

---
 settings/ajax/setbackgroundjobsmode.php | 5 ++++-
 settings/templates/admin.php            | 8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
index 905b90e645..b0292f3b10 100644
--- a/settings/ajax/setbackgroundjobsmode.php
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -26,6 +26,9 @@ require_once('../../lib/base.php');
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $_POST['mode'] );
+$mode = isset( $_POST['mode'] ) ? $_POST['mode'] : '';
+if( $mode == "none" || $mode == "ajax" || $mode == "webcron" || $mode == "cron" ){
+	OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $_POST['mode'] );
+}
 
 echo 'true';
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9370739427..8a573a556e 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,14 +27,12 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjobs_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_none">None</label><br />
 	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_ajax">AJAX</label><br />
+	<label for="backgroundjobs_ajax" title="<?php echo t("execute one task with each page loaded"); ?>">AJAX</label><br />
 	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_webcron">Webcron</label><br />
+	<label for="backgroundjobs_webcron" title="<?php echo t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
 	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_cron">Cron</label><br />
+	<label for="backgroundjobs_cron"title="<?php echo t("use systems cron service"); ?>">Cron</label><br />
 </fieldset>
 
 <fieldset class="personalblock">

From 0c69e64b868def20d62a40851c87a2f20856a025 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sun, 12 Aug 2012 00:44:25 +0200
Subject: [PATCH 1415/1537] Backgroundjobs: Fix template

---
 settings/templates/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 8a573a556e..9ccab25516 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -28,11 +28,11 @@ if(!$_['htaccessworking']) {
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
 	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_ajax" title="<?php echo t("execute one task with each page loaded"); ?>">AJAX</label><br />
+	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
 	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_webcron" title="<?php echo t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
+	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
 	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_cron"title="<?php echo t("use systems cron service"); ?>">Cron</label><br />
+	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
 </fieldset>
 
 <fieldset class="personalblock">

From 355a1adb3a0f5197468fdb66e85aed2c44a903c4 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 12 Aug 2012 02:04:58 +0200
Subject: [PATCH 1416/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/ca.php           |   6 +
 apps/calendar/l10n/it.php           |   6 +
 apps/calendar/l10n/zh_CN.GB2312.php | 121 ++++++++++++++
 apps/contacts/l10n/ca.php           |   1 +
 apps/contacts/l10n/it.php           |   1 +
 apps/files/l10n/zh_CN.GB2312.php    |  52 ++++++
 apps/media/l10n/zh_CN.GB2312.php    |  14 ++
 core/l10n/zh_CN.GB2312.php          |  64 ++++++++
 l10n/af/settings.po                 |  20 ++-
 l10n/ar/settings.po                 |  20 ++-
 l10n/ar_SA/settings.po              |  20 ++-
 l10n/bg_BG/settings.po              |  20 ++-
 l10n/ca/calendar.po                 |  18 +-
 l10n/ca/contacts.po                 |   8 +-
 l10n/ca/settings.po                 |  20 ++-
 l10n/cs_CZ/settings.po              |  20 ++-
 l10n/da/settings.po                 |  20 ++-
 l10n/de/settings.po                 |  20 ++-
 l10n/el/settings.po                 |  20 ++-
 l10n/eo/settings.po                 |  20 ++-
 l10n/es/settings.po                 |  20 ++-
 l10n/et_EE/settings.po              |  20 ++-
 l10n/eu/settings.po                 |  20 ++-
 l10n/eu_ES/settings.po              |  20 ++-
 l10n/fa/settings.po                 |  20 ++-
 l10n/fi/settings.po                 |  20 ++-
 l10n/fi_FI/settings.po              |  20 ++-
 l10n/fr/settings.po                 |  20 ++-
 l10n/gl/settings.po                 |  20 ++-
 l10n/he/settings.po                 |  20 ++-
 l10n/hr/settings.po                 |  20 ++-
 l10n/hu_HU/settings.po              |  20 ++-
 l10n/hy/settings.po                 |  20 ++-
 l10n/ia/settings.po                 |  20 ++-
 l10n/id/settings.po                 |  20 ++-
 l10n/id_ID/settings.po              |  20 ++-
 l10n/it/calendar.po                 |  18 +-
 l10n/it/contacts.po                 |   8 +-
 l10n/it/settings.po                 |  20 ++-
 l10n/ja_JP/settings.po              |  20 ++-
 l10n/ko/settings.po                 |  20 ++-
 l10n/lb/settings.po                 |  20 ++-
 l10n/lt_LT/settings.po              |  20 ++-
 l10n/lv/settings.po                 |  20 ++-
 l10n/mk/settings.po                 |  20 ++-
 l10n/ms_MY/settings.po              |  20 ++-
 l10n/nb_NO/settings.po              |  20 ++-
 l10n/nl/settings.po                 |  20 ++-
 l10n/nn_NO/settings.po              |  20 ++-
 l10n/pl/settings.po                 |  20 ++-
 l10n/pt_BR/settings.po              |  20 ++-
 l10n/pt_PT/settings.po              |  20 ++-
 l10n/ro/settings.po                 |  20 ++-
 l10n/ru/settings.po                 |  20 ++-
 l10n/sk_SK/settings.po              |  20 ++-
 l10n/sl/settings.po                 |  20 ++-
 l10n/so/settings.po                 |  20 ++-
 l10n/sr/settings.po                 |  20 ++-
 l10n/sr@latin/settings.po           |  20 ++-
 l10n/sv/settings.po                 |  20 ++-
 l10n/templates/bookmarks.pot        |   2 +-
 l10n/templates/calendar.pot         |   2 +-
 l10n/templates/contacts.pot         |   2 +-
 l10n/templates/core.pot             |   2 +-
 l10n/templates/files.pot            |   2 +-
 l10n/templates/gallery.pot          |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/media.pot            |   2 +-
 l10n/templates/settings.pot         |  18 +-
 l10n/th_TH/settings.po              |  20 ++-
 l10n/tr/settings.po                 |  20 ++-
 l10n/uk/settings.po                 |  20 ++-
 l10n/vi/settings.po                 |  20 ++-
 l10n/zh_CN.GB2312/calendar.po       | 245 ++++++++++++++--------------
 l10n/zh_CN.GB2312/core.po           | 131 +++++++--------
 l10n/zh_CN.GB2312/files.po          | 107 ++++++------
 l10n/zh_CN.GB2312/media.po          |  31 ++--
 l10n/zh_CN.GB2312/settings.po       | 123 +++++++-------
 l10n/zh_CN/settings.po              |  20 ++-
 l10n/zh_TW/settings.po              |  20 ++-
 settings/l10n/ca.php                |   1 +
 settings/l10n/it.php                |   1 +
 settings/l10n/zh_CN.GB2312.php      |  54 ++++++
 83 files changed, 1561 insertions(+), 563 deletions(-)
 create mode 100644 apps/calendar/l10n/zh_CN.GB2312.php
 create mode 100644 apps/files/l10n/zh_CN.GB2312.php
 create mode 100644 apps/media/l10n/zh_CN.GB2312.php
 create mode 100644 core/l10n/zh_CN.GB2312.php
 create mode 100644 settings/l10n/zh_CN.GB2312.php

diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index 0474d4a2a9..9e267604e6 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -112,6 +112,7 @@
 "Month" => "Mes",
 "List" => "Llista",
 "Today" => "Avui",
+"Settings" => "Configuració",
 "Your calendars" => "Els vostres calendaris",
 "CalDav Link" => "Enllaç CalDav",
 "Shared calendars" => "Calendaris compartits",
@@ -173,11 +174,16 @@
 "No categories selected" => "No hi ha categories seleccionades",
 "of" => "de",
 "at" => "a",
+"General" => "General",
 "Timezone" => "Zona horària",
+"Update timezone automatically" => "Actualitza la zona horària automàticament",
+"Time format" => "Format horari",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "Comença la setmana en ",
 "Cache" => "Memòria de cau",
 "Clear cache for repeating events" => "Neteja la memòria de cau pels esdeveniments amb repetició",
+"URLs" => "URLs",
 "Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact et al)",
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index 6a35e28417..04e10b582b 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -112,6 +112,7 @@
 "Month" => "Mese",
 "List" => "Elenco",
 "Today" => "Oggi",
+"Settings" => "Impostazioni",
 "Your calendars" => "I tuoi calendari",
 "CalDav Link" => "Collegamento CalDav",
 "Shared calendars" => "Calendari condivisi",
@@ -173,11 +174,16 @@
 "No categories selected" => "Nessuna categoria selezionata",
 "of" => "di",
 "at" => "alle",
+"General" => "Generale",
 "Timezone" => "Fuso orario",
+"Update timezone automatically" => "Aggiorna automaticamente il fuso orario",
+"Time format" => "Formato orario",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "La settimana inizia il",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Cancella gli eventi che si ripetono dalla cache",
+"URLs" => "URL",
 "Calendar CalDAV syncing addresses" => "Indirizzi di sincronizzazione calendari CalDAV",
 "more info" => "ulteriori informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
diff --git a/apps/calendar/l10n/zh_CN.GB2312.php b/apps/calendar/l10n/zh_CN.GB2312.php
new file mode 100644
index 0000000000..38f039e661
--- /dev/null
+++ b/apps/calendar/l10n/zh_CN.GB2312.php
@@ -0,0 +1,121 @@
+<?php $TRANSLATIONS = array(
+"Wrong calendar" => "错误的日历",
+"New Timezone:" => "新时区",
+"Timezone changed" => "时区改变了",
+"Invalid request" => "非法请求",
+"Calendar" => "日历",
+"Birthday" => "生日",
+"Business" => "商务",
+"Call" => "呼叫",
+"Clients" => "客户端",
+"Deliverer" => "交付者",
+"Holidays" => "假期",
+"Ideas" => "灵感",
+"Journey" => "旅行",
+"Jubilee" => "五十年纪念",
+"Meeting" => "会面",
+"Other" => "其它",
+"Personal" => "个人的",
+"Projects" => "项目",
+"Questions" => "问题",
+"Work" => "工作",
+"New Calendar" => "新的日历",
+"Does not repeat" => "不要重复",
+"Daily" => "每天",
+"Weekly" => "每星期",
+"Every Weekday" => "每个周末",
+"Bi-Weekly" => "每两周",
+"Monthly" => "每个月",
+"Yearly" => "每年",
+"never" => "从不",
+"by occurrences" => "根据发生时",
+"by date" => "根据日期",
+"by monthday" => "根据月天",
+"by weekday" => "根据星期",
+"Monday" => "星期一",
+"Tuesday" => "星期二",
+"Wednesday" => "星期三",
+"Thursday" => "星期四",
+"Friday" => "星期五",
+"Saturday" => "星期六",
+"Sunday" => "星期天",
+"events week of month" => "时间每月发生的周数",
+"first" => "首先",
+"second" => "其次",
+"third" => "第三",
+"fourth" => "第四",
+"fifth" => "第五",
+"last" => "最后",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"by events date" => "根据时间日期",
+"by yearday(s)" => "根据年数",
+"by weeknumber(s)" => "根据周数",
+"by day and month" => "根据天和月",
+"Date" => "日期",
+"Cal." => "Cal.",
+"All day" => "整天",
+"Missing fields" => "丢失的输入框",
+"Title" => "标题",
+"From Date" => "从日期",
+"From Time" => "从时间",
+"To Date" => "到日期",
+"To Time" => "到时间",
+"The event ends before it starts" => "在它开始前需要结束的事件",
+"There was a database fail" => "发生了一个数据库失败",
+"Week" => "星期",
+"Month" => "月",
+"List" => "列表",
+"Today" => "今天",
+"CalDav Link" => "CalDav 链接",
+"Download" => "下载",
+"Edit" => "编辑",
+"Delete" => "删除",
+"New calendar" => "新的日历",
+"Edit calendar" => "编辑日历",
+"Displayname" => "显示名称",
+"Active" => "活动",
+"Calendar color" => "日历颜色",
+"Save" => "保存",
+"Submit" => "提交",
+"Cancel" => " 取消",
+"Edit an event" => "编辑一个事件",
+"Export" => "导出",
+"Title of the Event" => "事件的标题",
+"Category" => "分类",
+"All Day Event" => "每天的事件",
+"From" => "从",
+"To" => "到",
+"Advanced options" => "进阶选项",
+"Location" => "地点",
+"Location of the Event" => "事件的地点",
+"Description" => "解释",
+"Description of the Event" => "事件描述",
+"Repeat" => "重复",
+"Advanced" => "进阶",
+"Select weekdays" => "选择星期",
+"Select days" => "选择日",
+"and the events day of year." => "选择每年时间发生天数",
+"and the events day of month." => "选择每个月事件发生的天",
+"Select months" => "选择月份",
+"Select weeks" => "选择星期",
+"and the events week of year." => "每年时间发生的星期",
+"Interval" => "间隔",
+"End" => "结束",
+"occurrences" => "发生",
+"Import" => "导入",
+"Create a new event" => "新建一个时间",
+"Timezone" => "时区",
+"24h" => "24小时",
+"12h" => "12小时"
+);
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 9916dba997..72550522d5 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -59,6 +59,7 @@
 "Edit name" => "Edita el nom",
 "No files selected for upload." => "No s'han seleccionat fitxers per a la pujada.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor.",
+"Error loading profile picture." => "Error en carregar la imatge de perfil.",
 "Select type" => "Seleccioneu un tipus",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
 "Result: " => "Resultat: ",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 5fc8db5e21..e1af39fe91 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -59,6 +59,7 @@
 "Edit name" => "Modifica il nome",
 "No files selected for upload." => "Nessun file selezionato per l'invio",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server.",
+"Error loading profile picture." => "Errore durante il caricamento dell'immagine di profilo.",
 "Select type" => "Seleziona il tipo",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
 "Result: " => "Risultato: ",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
new file mode 100644
index 0000000000..2026becc4d
--- /dev/null
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -0,0 +1,52 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "没有任何错误,文件上传成功了",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件超过了php.ini指定的upload_max_filesize",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
+"The uploaded file was only partially uploaded" => "文件只有部分被上传",
+"No file was uploaded" => "没有上传完成的文件",
+"Missing a temporary folder" => "丢失了一个临时文件夹",
+"Failed to write to disk" => "写磁盘失败",
+"Files" => "文件",
+"Unshare" => "未分享的",
+"Delete" => "删除",
+"already exists" => "已经存在了",
+"replace" => "替换",
+"cancel" => "取消",
+"replaced" => "替换过了",
+"with" => "随着",
+"undo" => "撤销",
+"deleted" => "删除",
+"generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
+"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
+"Upload Error" => "上传错误",
+"Pending" => "Pending",
+"Upload cancelled." => "上传取消了",
+"Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
+"Size" => "大小",
+"Modified" => "修改日期",
+"folder" => "文件夹",
+"folders" => "文件夹",
+"file" => "文件",
+"files" => "文件",
+"File handling" => "文件处理中",
+"Maximum upload size" => "最大上传大小",
+"max. possible: " => "最大可能",
+"Needed for multi-file and folder downloads." => "需要多文件和文件夹下载.",
+"Enable ZIP-download" => "支持ZIP下载",
+"0 is unlimited" => "0是无限的",
+"Maximum input size for ZIP files" => "最大的ZIP文件输入大小",
+"New" => "新建",
+"Text file" => "文本文档",
+"Folder" => "文件夹",
+"From url" => "从URL:",
+"Upload" => "上传",
+"Cancel upload" => "取消上传",
+"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
+"Name" => "名字",
+"Share" => "分享",
+"Download" => "下载",
+"Upload too large" => "上传的文件太大了",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
+"Files are being scanned, please wait." => "正在扫描文件,请稍候.",
+"Current scanning" => "正在扫描"
+);
diff --git a/apps/media/l10n/zh_CN.GB2312.php b/apps/media/l10n/zh_CN.GB2312.php
new file mode 100644
index 0000000000..de7e98acd9
--- /dev/null
+++ b/apps/media/l10n/zh_CN.GB2312.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Music" => "音乐",
+"Add album to playlist" => "添加专辑到播放列表",
+"Play" => "播放",
+"Pause" => "暂停",
+"Previous" => "前面的",
+"Next" => "下一个",
+"Mute" => "静音",
+"Unmute" => "取消静音",
+"Rescan Collection" => "重新扫描收藏",
+"Artist" => "艺术家",
+"Album" => "专辑",
+"Title" => "标题"
+);
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
new file mode 100644
index 0000000000..770d2b6772
--- /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/l10n/af/settings.po b/l10n/af/settings.po
index c940c2522d..6074b2d670 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index eacce43254..abf56cce11 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index adcc3de81a..a6637ba21a 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index f62e2c0b61..cfa402cb99 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index 759ee043b6..3976c559bb 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 11:20+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -478,7 +478,7 @@ msgstr "Avui"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Configuració"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -732,7 +732,7 @@ msgstr "a"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -740,11 +740,11 @@ msgstr "Zona horària"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Actualitza la zona horària automàticament"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Format horari"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -756,7 +756,7 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Comença la setmana en "
 
 #: templates/settings.php:76
 msgid "Cache"
@@ -768,7 +768,7 @@ msgstr "Neteja la memòria de cau pels esdeveniments amb repetició"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLs"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 9f7b01e6ba..4db2c47811 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 11:14+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -276,7 +276,7 @@ msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aques
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Error en carregar la imatge de perfil."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 1225660116..5fce708ceb 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -73,13 +73,25 @@ msgstr "Avís de seguretat"
 
 #: templates/admin.php:29
 msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Més"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index e284b7be5c..90e81ef9c8 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -78,11 +78,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Více"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 3fa216b335..f647b2f179 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -79,11 +79,23 @@ msgstr "Sikkerhedsadvarsel"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mere"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 71f7cfb483..1f8eb50a34 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -81,11 +81,23 @@ msgstr "Sicherheitshinweis"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mehr"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 016e9fe599..60e4a324fd 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -79,11 +79,23 @@ msgstr "Προειδοποίηση Ασφαλείας"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Περισσότερο"
 
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 562f231186..44965561de 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr "Sekureca averto"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Pli"
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 2bee7a486a..6f0dea3abe 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -81,11 +81,23 @@ msgstr "Advertencia de seguridad"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Más"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index a5c1c05e8e..e5e997d139 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Veel"
 
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index a70349dd16..fc694e5559 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr "Segurtasun abisua"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Gehiago"
 
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index ee07271825..d750261466 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 88c04586e9..0c86f80460 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr "اخطار امنیتی"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "بیشتر"
 
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index a167d4f555..c7d75c2d6a 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 2df852fc4a..0649c23395 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr "Turvallisuusvaroitus"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Lisää"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 3215b1bc94..6682f4c9e0 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -81,11 +81,23 @@ msgstr "Alertes de sécurité"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index eb179af1c1..f48a73f502 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Máis"
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 071d5a1143..194fa463ab 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "עוד"
 
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 090b47e3d7..77abd3cbb3 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "više"
 
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 511a2d7945..4040e9e564 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr "Biztonsági figyelmeztetés"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Tovább"
 
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index db514cfc14..dcc8a87679 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 0b922c4e6f..62fb9fe13f 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index bf5ef298db..d8c65bc9f6 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Lebih"
 
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index 5289b9b21b..d03aaed81d 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index 57f6bc8348..efdc82532d 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 07:01+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -484,7 +484,7 @@ msgstr "Oggi"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Impostazioni"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -738,7 +738,7 @@ msgstr "alle"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Generale"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -746,11 +746,11 @@ msgstr "Fuso orario"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Aggiorna automaticamente il fuso orario"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Formato orario"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -762,7 +762,7 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "La settimana inizia il"
 
 #: templates/settings.php:76
 msgid "Cache"
@@ -774,7 +774,7 @@ msgstr "Cancella gli eventi che si ripetono dalla cache"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URL"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 3f147a97f1..b702f2eab3 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 06:59+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -278,7 +278,7 @@ msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Errore durante il caricamento dell'immagine di profilo."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 8b7ac10eef..b09274cf35 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -78,13 +78,25 @@ msgstr "Avviso di sicurezza"
 
 #: templates/admin.php:29
 msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Altro"
 
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index dc2489cfdd..79aec21152 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr "セキュリティ警告"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "もっと"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 180df14ec0..ad845081a5 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "더"
 
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 4ecade7af6..55306588cc 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Méi"
 
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index cab185280a..b4e462f1d0 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Daugiau"
 
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 3f8ede3695..64a7220d64 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr "Brīdinājums par drošību"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Vairāk"
 
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 36c84162d7..384ec05fd8 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Повеќе"
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 30ec99321d..4caf358d9b 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -77,11 +77,23 @@ msgstr "Amaran keselamatan"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Lanjutan"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index d6873a0c8e..51ea270fd4 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -78,11 +78,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mer"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 7c72c6946e..b056a1747b 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -79,11 +79,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Meer"
 
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 151dd9a866..e9d4c7ed3e 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 75773c19f5..a3c4bafc1d 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -80,11 +80,23 @@ msgstr "Ostrzeżenia bezpieczeństwa"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Więcej"
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index bf55dde3ec..9900cd1902 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -78,11 +78,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 405d29be5f..db32bde84e 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index b3622accd5..5b75657102 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -77,11 +77,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mai mult"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 9f1a0a6d9b..8097464189 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -80,11 +80,23 @@ msgstr "Предупреждение безопасности"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Ещё"
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 3260101687..ed5268ef8b 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Viac"
 
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index d43e82d75a..2e94a971ba 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr "Varnostno opozorilo"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Več"
 
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 12d7e09dd0..d9257419c7 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index bb0202bd13..8a1ec02ddb 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 77b3b35367..b0d7bcaa1a 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 5358eb4715..759aac3b94 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -80,11 +80,23 @@ msgstr "Säkerhetsvarning"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mera"
 
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index c2877fdb0a..26bdf5ff1e 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index aa4057ffab..399cc1a0f6 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 7db6db817b..7229e0cfaf 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 51a556b88e..e487a4c23c 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index b501697f0d..ca0aaf32f8 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 40704ea886..ce6eeb8117 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d0102a1f62..d1a93945f6 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 34f55dabd4..0946439eae 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d5175cb926..eed6321de6 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,11 +73,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 0a267797bd..37193911fc 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "เพิ่มเติม"
 
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 3918a8c55f..1ea3973f52 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr "Güvenlik Uyarisi"
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "Devamı"
 
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index e4682933d3..e779674bc4 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index beef7bf246..3cf80bee1c 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "nhiều hơn"
 
diff --git a/l10n/zh_CN.GB2312/calendar.po b/l10n/zh_CN.GB2312/calendar.po
index dcd1b515ca..5e807e319f 100644
--- a/l10n/zh_CN.GB2312/calendar.po
+++ b/l10n/zh_CN.GB2312/calendar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bluehattree@126.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 14:53+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgstr ""
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
-msgstr ""
+msgstr "错误的日历"
 
 #: ajax/import/dropimport.php:29 ajax/import/import.php:64
 msgid ""
@@ -57,20 +58,20 @@ msgstr ""
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "新时区"
 
 #: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
-msgstr ""
+msgstr "时区改变了"
 
 #: ajax/settings/settimezone.php:25
 msgid "Invalid request"
-msgstr ""
+msgstr "非法请求"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
-msgstr ""
+msgstr "日历"
 
 #: js/calendar.js:832
 msgid "ddd"
@@ -98,63 +99,63 @@ msgstr ""
 
 #: lib/app.php:121
 msgid "Birthday"
-msgstr ""
+msgstr "生日"
 
 #: lib/app.php:122
 msgid "Business"
-msgstr ""
+msgstr "商务"
 
 #: lib/app.php:123
 msgid "Call"
-msgstr ""
+msgstr "呼叫"
 
 #: lib/app.php:124
 msgid "Clients"
-msgstr ""
+msgstr "客户端"
 
 #: lib/app.php:125
 msgid "Deliverer"
-msgstr ""
+msgstr "交付者"
 
 #: lib/app.php:126
 msgid "Holidays"
-msgstr ""
+msgstr "假期"
 
 #: lib/app.php:127
 msgid "Ideas"
-msgstr ""
+msgstr "灵感"
 
 #: lib/app.php:128
 msgid "Journey"
-msgstr ""
+msgstr "旅行"
 
 #: lib/app.php:129
 msgid "Jubilee"
-msgstr ""
+msgstr "五十年纪念"
 
 #: lib/app.php:130
 msgid "Meeting"
-msgstr ""
+msgstr "会面"
 
 #: lib/app.php:131
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #: lib/app.php:132
 msgid "Personal"
-msgstr ""
+msgstr "个人的"
 
 #: lib/app.php:133
 msgid "Projects"
-msgstr ""
+msgstr "项目"
 
 #: lib/app.php:134
 msgid "Questions"
-msgstr ""
+msgstr "问题"
 
 #: lib/app.php:135
 msgid "Work"
-msgstr ""
+msgstr "工作"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
@@ -167,183 +168,183 @@ msgstr ""
 #: lib/import.php:184 templates/calendar.php:12
 #: templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr ""
+msgstr "新的日历"
 
 #: lib/object.php:372
 msgid "Does not repeat"
-msgstr ""
+msgstr "不要重复"
 
 #: lib/object.php:373
 msgid "Daily"
-msgstr ""
+msgstr "每天"
 
 #: lib/object.php:374
 msgid "Weekly"
-msgstr ""
+msgstr "每星期"
 
 #: lib/object.php:375
 msgid "Every Weekday"
-msgstr ""
+msgstr "每个周末"
 
 #: lib/object.php:376
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "每两周"
 
 #: lib/object.php:377
 msgid "Monthly"
-msgstr ""
+msgstr "每个月"
 
 #: lib/object.php:378
 msgid "Yearly"
-msgstr ""
+msgstr "每年"
 
 #: lib/object.php:388
 msgid "never"
-msgstr ""
+msgstr "从不"
 
 #: lib/object.php:389
 msgid "by occurrences"
-msgstr ""
+msgstr "根据发生时"
 
 #: lib/object.php:390
 msgid "by date"
-msgstr ""
+msgstr "根据日期"
 
 #: lib/object.php:400
 msgid "by monthday"
-msgstr ""
+msgstr "根据月天"
 
 #: lib/object.php:401
 msgid "by weekday"
-msgstr ""
+msgstr "根据星期"
 
 #: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
-msgstr ""
+msgstr "星期一"
 
 #: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
-msgstr ""
+msgstr "星期二"
 
 #: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "星期三"
 
 #: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
-msgstr ""
+msgstr "星期四"
 
 #: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
-msgstr ""
+msgstr "星期五"
 
 #: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
-msgstr ""
+msgstr "星期六"
 
 #: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
-msgstr ""
+msgstr "星期天"
 
 #: lib/object.php:427
 msgid "events week of month"
-msgstr ""
+msgstr "时间每月发生的周数"
 
 #: lib/object.php:428
 msgid "first"
-msgstr ""
+msgstr "首先"
 
 #: lib/object.php:429
 msgid "second"
-msgstr ""
+msgstr "其次"
 
 #: lib/object.php:430
 msgid "third"
-msgstr ""
+msgstr "第三"
 
 #: lib/object.php:431
 msgid "fourth"
-msgstr ""
+msgstr "第四"
 
 #: lib/object.php:432
 msgid "fifth"
-msgstr ""
+msgstr "第五"
 
 #: lib/object.php:433
 msgid "last"
-msgstr ""
+msgstr "最后"
 
 #: lib/object.php:467 templates/calendar.php:7
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #: lib/object.php:468 templates/calendar.php:7
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #: lib/object.php:469 templates/calendar.php:7
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #: lib/object.php:470 templates/calendar.php:7
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #: lib/object.php:471 templates/calendar.php:7
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #: lib/object.php:472 templates/calendar.php:7
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #: lib/object.php:473 templates/calendar.php:7
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #: lib/object.php:474 templates/calendar.php:7
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #: lib/object.php:475 templates/calendar.php:7
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #: lib/object.php:476 templates/calendar.php:7
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #: lib/object.php:477 templates/calendar.php:7
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #: lib/object.php:478 templates/calendar.php:7
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #: lib/object.php:488
 msgid "by events date"
-msgstr ""
+msgstr "根据时间日期"
 
 #: lib/object.php:489
 msgid "by yearday(s)"
-msgstr ""
+msgstr "根据年数"
 
 #: lib/object.php:490
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "根据周数"
 
 #: lib/object.php:491
 msgid "by day and month"
-msgstr ""
+msgstr "根据天和月"
 
 #: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #: lib/search.php:43
 msgid "Cal."
-msgstr ""
+msgstr "Cal."
 
 #: templates/calendar.php:6
 msgid "Sun."
@@ -423,56 +424,56 @@ msgstr ""
 
 #: templates/calendar.php:11
 msgid "All day"
-msgstr ""
+msgstr "整天"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "丢失的输入框"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr ""
+msgstr "从日期"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr ""
+msgstr "从时间"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr ""
+msgstr "到日期"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr ""
+msgstr "到时间"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "在它开始前需要结束的事件"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "发生了一个数据库失败"
 
 #: templates/calendar.php:39
 msgid "Week"
-msgstr ""
+msgstr "星期"
 
 #: templates/calendar.php:40
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #: templates/calendar.php:41
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #: templates/calendar.php:45
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
@@ -485,7 +486,7 @@ msgstr ""
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav 链接"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
@@ -501,16 +502,16 @@ msgstr ""
 
 #: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
-msgstr ""
+msgstr "编辑"
 
 #: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
@@ -518,44 +519,44 @@ msgstr ""
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "新的日历"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "编辑日历"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "显示名称"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
+msgstr "活动"
 
 #: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "日历颜色"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "保存"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "提交"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr " 取消"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "编辑一个事件"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "导出"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
@@ -579,11 +580,11 @@ msgstr ""
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
-msgstr ""
+msgstr "事件的标题"
 
 #: templates/part.eventform.php:27 templates/part.showevent.php:19
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
@@ -595,84 +596,84 @@ msgstr ""
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
-msgstr ""
+msgstr "每天的事件"
 
 #: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
-msgstr ""
+msgstr "从"
 
 #: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
-msgstr ""
+msgstr "进阶选项"
 
 #: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
-msgstr ""
+msgstr "地点"
 
 #: templates/part.eventform.php:83
 msgid "Location of the Event"
-msgstr ""
+msgstr "事件的地点"
 
 #: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
-msgstr ""
+msgstr "解释"
 
 #: templates/part.eventform.php:91
 msgid "Description of the Event"
-msgstr ""
+msgstr "事件描述"
 
 #: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
-msgstr ""
+msgstr "重复"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
-msgstr ""
+msgstr "进阶"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
-msgstr ""
+msgstr "选择星期"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
-msgstr ""
+msgstr "选择日"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
-msgstr ""
+msgstr "选择每年时间发生天数"
 
 #: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
-msgstr ""
+msgstr "选择每个月事件发生的天"
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
-msgstr ""
+msgstr "选择月份"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
-msgstr ""
+msgstr "选择星期"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
-msgstr ""
+msgstr "每年时间发生的星期"
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
-msgstr ""
+msgstr "间隔"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
-msgstr ""
+msgstr "结束"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
-msgstr ""
+msgstr "发生"
 
 #: templates/part.import.php:14
 msgid "create a new calendar"
@@ -702,7 +703,7 @@ msgstr ""
 
 #: templates/part.import.php:47
 msgid "Import"
-msgstr ""
+msgstr "导入"
 
 #: templates/part.import.php:56
 msgid "Close Dialog"
@@ -710,7 +711,7 @@ msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "新建一个时间"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
@@ -734,7 +735,7 @@ msgstr ""
 
 #: templates/settings.php:15
 msgid "Timezone"
-msgstr ""
+msgstr "时区"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
@@ -746,11 +747,11 @@ msgstr ""
 
 #: templates/settings.php:57
 msgid "24h"
-msgstr ""
+msgstr "24小时"
 
 #: templates/settings.php:58
 msgid "12h"
-msgstr ""
+msgstr "12小时"
 
 #: templates/settings.php:64
 msgid "Start week on"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 8748ed587d..ea582cd1c1 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bluehattree@126.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 13:54+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,250 +20,250 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "应用程序并没有被提供."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "没有分类添加了?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "这个分类已经存在了:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-msgstr ""
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
 #: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
-msgstr ""
+msgstr "设置"
 
 #: js/js.js:572
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #: js/js.js:572
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #: js/js.js:572
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #: js/js.js:572
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #: js/js.js:572
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #: js/js.js:572
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #: js/js.js:573
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #: js/js.js:573
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #: js/js.js:573
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #: js/js.js:573
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #: js/js.js:573
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #: js/js.js:573
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "否"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "好的"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "没有选者要删除的分类."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "私有云密码重置"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "使用下面的链接来重置你的密码:{link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "你将会收到一个重置密码的链接"
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "请求"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "登陆失败!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
 msgid "Username"
-msgstr ""
+msgstr "用户名"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr ""
+msgstr "要求重置"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "你的密码已经被重置了"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "转至登陆页面"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "新密码"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "重置密码"
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "个人的"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "应用程序"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "管理"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "禁止访问"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "云 没有被找到"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "编辑分类"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "建立一个 <strong>管理帐户</strong>"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #: templates/installation.php:35
 msgid "Advanced"
-msgstr ""
+msgstr "进阶"
 
 #: templates/installation.php:37
 msgid "Data folder"
-msgstr ""
+msgstr "数据存放文件夹"
 
 #: templates/installation.php:44
 msgid "Configure the database"
-msgstr ""
+msgstr "配置数据库"
 
 #: templates/installation.php:49 templates/installation.php:60
 #: templates/installation.php:70
 msgid "will be used"
-msgstr ""
+msgstr "将会使用"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr ""
+msgstr "数据库用户"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr ""
+msgstr "数据库密码"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr ""
+msgstr "数据库用户名"
 
 #: templates/installation.php:96
 msgid "Database host"
-msgstr ""
+msgstr "数据库主机"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr ""
+msgstr "完成安装"
 
 #: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "你控制下的网络服务"
 
 #: templates/layout.user.php:49
 msgid "Log out"
-msgstr ""
+msgstr "注销"
 
 #: templates/login.php:6
 msgid "Lost your password?"
-msgstr ""
+msgstr "忘记密码?"
 
 #: templates/login.php:17
 msgid "remember"
-msgstr ""
+msgstr "备忘"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "登陆"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "你已经注销了"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "后退"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "前进"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index c940c64066..b1da62d32e 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bluehattree@126.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 14:04+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,204 +20,204 @@ msgstr ""
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "没有任何错误,文件上传成功了"
 
 #: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "上传的文件超过了php.ini指定的upload_max_filesize"
 
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "文件只有部分被上传"
 
 #: ajax/upload.php:24
 msgid "No file was uploaded"
-msgstr ""
+msgstr "没有上传完成的文件"
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "丢失了一个临时文件夹"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "写磁盘失败"
 
 #: appinfo/app.php:6
 msgid "Files"
-msgstr ""
+msgstr "文件"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "未分享的"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "已经存在了"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "替换"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "取消"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "替换过了"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "随着"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "撤销"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "删除"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "正在生成ZIP文件,这可能需要点时间"
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "上传错误"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Pending"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "上传取消了"
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "非法文件名,\"/\"是不被许可的"
 
 #: js/files.js:694 templates/index.php:55
 msgid "Size"
-msgstr ""
+msgstr "大小"
 
 #: js/files.js:695 templates/index.php:56
 msgid "Modified"
-msgstr ""
+msgstr "修改日期"
 
 #: js/files.js:722
 msgid "folder"
-msgstr ""
+msgstr "文件夹"
 
 #: js/files.js:724
 msgid "folders"
-msgstr ""
+msgstr "文件夹"
 
 #: js/files.js:732
 msgid "file"
-msgstr ""
+msgstr "文件"
 
 #: js/files.js:734
 msgid "files"
-msgstr ""
+msgstr "文件"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "文件处理中"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr ""
+msgstr "最大上传大小"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "最大可能"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "需要多文件和文件夹下载."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "支持ZIP下载"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0是无限的"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "最大的ZIP文件输入大小"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "文本文档"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "文件夹"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "从URL:"
 
 #: templates/index.php:21
 msgid "Upload"
-msgstr ""
+msgstr "上传"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "取消上传"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "这里没有东西.上传点什么!"
 
 #: templates/index.php:47
 msgid "Name"
-msgstr ""
+msgstr "名字"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "分享"
 
 #: templates/index.php:51
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/index.php:64
 msgid "Upload too large"
-msgstr ""
+msgstr "上传的文件太大了"
 
 #: templates/index.php:66
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "正在扫描文件,请稍候."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "正在扫描"
diff --git a/l10n/zh_CN.GB2312/media.po b/l10n/zh_CN.GB2312/media.po
index dc0ea7dd0b..844e38b16f 100644
--- a/l10n/zh_CN.GB2312/media.po
+++ b/l10n/zh_CN.GB2312/media.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bluehattree@126.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 14:06+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,48 +20,48 @@ msgstr ""
 
 #: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
-msgstr ""
+msgstr "音乐"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "添加专辑到播放列表"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
-msgstr ""
+msgstr "播放"
 
 #: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
-msgstr ""
+msgstr "暂停"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "前面的"
 
 #: templates/music.php:6 templates/player.php:14
 msgid "Next"
-msgstr ""
+msgstr "下一个"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "静音"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "取消静音"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "重新扫描收藏"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "艺术家"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "专辑"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "标题"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index db57684f5f..b451fb6d41 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bluehattree@126.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -19,208 +20,220 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "不能从App Store 中加载列表"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email 保存了"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "非法Email"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID 改变了"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr ""
+msgstr "非法请求"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "认证错误"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
-msgstr ""
+msgstr "语言改变了"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr ""
+msgstr "禁用"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr ""
+msgstr "启用"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "保存中..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
-msgstr ""
+msgstr "Chinese"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "安全警告"
 
 #: templates/admin.php:29
 msgid "Cron"
+msgstr "定时"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
-msgstr ""
+msgstr "日志"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
-msgstr ""
+msgstr "更多"
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr ""
+msgstr "添加你的应用程序"
 
 #: templates/apps.php:26
 msgid "Select an App"
-msgstr ""
+msgstr "选择一个程序"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "在owncloud.com上查看应用程序"
 
 #: templates/apps.php:30
 msgid "-licensed"
-msgstr ""
+msgstr "-许可了"
 
 #: templates/apps.php:30
 msgid "by"
-msgstr ""
+msgstr "由"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "文档"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "管理大文件"
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr ""
+msgstr "提一个问题"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "连接到帮助数据库时的问题"
 
 #: templates/help.php:23
 msgid "Go there manually."
-msgstr ""
+msgstr "收到转到."
 
 #: templates/help.php:31
 msgid "Answer"
-msgstr ""
+msgstr "回答"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "你使用"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "可用的"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "桌面和移动同步客户端"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr ""
+msgstr "你的密码已经改变"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr ""
+msgstr "不能改变你的密码"
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr ""
+msgstr "现在的密码"
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "新密码"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr ""
+msgstr "展示"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr ""
+msgstr "改变密码"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "你的email地址"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "输入一个邮箱地址以激活密码恢复功能"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
-msgstr ""
+msgstr "语言"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "帮助翻译"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "使用这个地址和你的文件管理器连接到你的ownCloud"
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
-msgstr ""
+msgstr "名字"
 
 #: templates/users.php:23 templates/users.php:77
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
-msgstr ""
+msgstr "组"
 
 #: templates/users.php:32
 msgid "Create"
-msgstr ""
+msgstr "新建"
 
 #: templates/users.php:35
 msgid "Default Quota"
-msgstr ""
+msgstr "默认限额"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
-msgstr ""
+msgstr "其他的"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "子专辑"
 
 #: templates/users.php:82
 msgid "Quota"
-msgstr ""
+msgstr "限额"
 
 #: templates/users.php:146
 msgid "Delete"
-msgstr ""
+msgstr "删除"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9a78b0ea32..14d709456d 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 06c3abe8ec..890940b397 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,23 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:41
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:69
+#: templates/admin.php:67
 msgid "More"
 msgstr "更多"
 
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index c868bc278c..aa9d73df42 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -12,6 +12,7 @@
 "Saving..." => "S'està desant...",
 "__language_name__" => "Català",
 "Security Warning" => "Avís de seguretat",
+"Cron" => "Cron",
 "Log" => "Registre",
 "More" => "Més",
 "Add your App" => "Afegeiu la vostra aplicació",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 62378377e8..388f3f5c77 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -12,6 +12,7 @@
 "Saving..." => "Salvataggio in corso...",
 "__language_name__" => "Italiano",
 "Security Warning" => "Avviso di sicurezza",
+"Cron" => "Cron",
 "Log" => "Registro",
 "More" => "Altro",
 "Add your App" => "Aggiungi la tua applicazione",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
new file mode 100644
index 0000000000..cb662c1b64
--- /dev/null
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -0,0 +1,54 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "不能从App Store 中加载列表",
+"Email saved" => "Email 保存了",
+"Invalid email" => "非法Email",
+"OpenID Changed" => "OpenID 改变了",
+"Invalid request" => "非法请求",
+"Authentication error" => "认证错误",
+"Language changed" => "语言改变了",
+"Error" => "错误",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "保存中...",
+"__language_name__" => "Chinese",
+"Security Warning" => "安全警告",
+"Cron" => "定时",
+"Log" => "日志",
+"More" => "更多",
+"Add your App" => "添加你的应用程序",
+"Select an App" => "选择一个程序",
+"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
+"-licensed" => "-许可了",
+"by" => "由",
+"Documentation" => "文档",
+"Managing Big Files" => "管理大文件",
+"Ask a question" => "提一个问题",
+"Problems connecting to help database." => "连接到帮助数据库时的问题",
+"Go there manually." => "收到转到.",
+"Answer" => "回答",
+"You use" => "你使用",
+"of the available" => "可用的",
+"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
+"Download" => "下载",
+"Your password got changed" => "你的密码已经改变",
+"Unable to change your password" => "不能改变你的密码",
+"Current password" => "现在的密码",
+"New password" => "新密码",
+"show" => "展示",
+"Change password" => "改变密码",
+"Email" => "Email",
+"Your email address" => "你的email地址",
+"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
+"Language" => "语言",
+"Help translate" => "帮助翻译",
+"use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的ownCloud",
+"Name" => "名字",
+"Password" => "密码",
+"Groups" => "组",
+"Create" => "新建",
+"Default Quota" => "默认限额",
+"Other" => "其他的",
+"SubAdmin" => "子专辑",
+"Quota" => "限额",
+"Delete" => "删除"
+);

From deef1f73db14fb988b35439ea185a34b31260af9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sun, 12 Aug 2012 09:02:20 +0200
Subject: [PATCH 1417/1537] Backgroundjobs: fix bug in QueuedTask

---
 lib/backgroundjob/queuedtask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
index da5d4ddc69..941af1c647 100644
--- a/lib/backgroundjob/queuedtask.php
+++ b/lib/backgroundjob/queuedtask.php
@@ -83,7 +83,7 @@ class OC_BackgroundJob_QueuedTask{
 	 */
 	public static function add( $task, $klass, $method, $parameters ){
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
-		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
+		$result = $stmt->execute(array($app, $klass, $method, $parameters ));
 
 		return OC_DB::insertid();
 	}

From 4d3d4522f94edf912b469540d533963901f61676 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sun, 12 Aug 2012 12:14:27 +0200
Subject: [PATCH 1418/1537] Backgroundjobs: Fix wrong var names

---
 lib/backgroundjob/queuedtask.php | 2 +-
 lib/public/backgroundjob.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
index 941af1c647..68ba97c1e3 100644
--- a/lib/backgroundjob/queuedtask.php
+++ b/lib/backgroundjob/queuedtask.php
@@ -81,7 +81,7 @@ class OC_BackgroundJob_QueuedTask{
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function add( $task, $klass, $method, $parameters ){
+	public static function add( $app, $klass, $method, $parameters ){
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
 		$result = $stmt->execute(array($app, $klass, $method, $parameters ));
 
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 72f4557eb1..834bebb5c3 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -100,8 +100,8 @@ class BackgroundJob {
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function addQueuedTask( $task, $klass, $method, $parameters ){
-		return \OC_BackgroundJob_QueuedTask::add( $task, $klass, $method, $parameters );
+	public static function addQueuedTask( $app, $klass, $method, $parameters ){
+		return \OC_BackgroundJob_QueuedTask::add( $app, $klass, $method, $parameters );
 	}
 
 	/**

From 7113e801846143dbb70394e7c7e11403847ee81f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 12 Aug 2012 17:30:09 +0200
Subject: [PATCH 1419/1537] Readded refresh param. 304 and ETag is still sent
 so shouldn't matter.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 67bfa9847e..35637de050 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1220,7 +1220,7 @@ OC.Contacts={
 		},
 		loadPhoto:function(){
 			var self = this;
-			var refreshstr = ''; //'&refresh='+Math.random();
+			var refreshstr = '&refresh='+Math.random();
 			$('#phototools li a').tipsy('hide');
 			var wrapper = $('#contacts_details_photo_wrapper');
 			wrapper.addClass('loading').addClass('wait');

From eb516b79b6c9ab52a45998e5ebe7c0d3158f4f99 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 12 Aug 2012 18:42:54 +0200
Subject: [PATCH 1420/1537] Position appsettings fixed and load it in
 dynamically added element.

---
 core/css/styles.css |  6 ++---
 core/js/js.js       | 64 +++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 7e79a66fb4..dd6f9d4675 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -160,9 +160,9 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 #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: absolute; z-index: 200; }
-.popup.topright { top: -8px; right: 1em; }
-.popup.bottomleft { bottom: 1em; left: 8px; }
+.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; }
diff --git a/core/js/js.js b/core/js/js.js
index 7bded8e141..92a2660fd9 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -175,39 +175,41 @@ OC={
 		if(settings.length == 0) {
 			throw { name: 'MissingDOMElement', message: 'There has be be an element with id "appsettings" for the popup to show.' };
 		}
-		if(settings.is(':visible')) {
-			settings.hide().find('.arrow').hide();
+		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 {
-			if($('#journal.settings').length == 0) {
-				var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
-				var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) {
-					$('#appsettings').html(data).ready(function() {
-						settings.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
-						settings.find('.close').bind('click', function() {
-							settings.hide();
-						})
-						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;
-							});
+			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.' };
 						}
-					});
-				}, 'html');
-			} else {
-				settings.show().find('.arrow').show();
-			}
+						if(props.cache) {
+							$.ajaxSetup({cache: true});
+						}
+						$.getScript(OC.filePath(props.appid, 'js', scriptname))
+						.fail(function(jqxhr, settings, e) {
+							throw e;
+						});
+					}
+				}).show();
+			}, 'html');
 		}
 	}
 };

From 329bc28d065381e060be32b63960ea35600ca41e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 12 Aug 2012 18:44:18 +0200
Subject: [PATCH 1421/1537] Commented out unused(?) class that interfered with
 appsettings.

---
 apps/calendar/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 5cda4b1bef..363a24aea1 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -40,7 +40,7 @@
 .thisday{background: #FFFABC;}
 .event {position:relative;}
 .event.colored {border-bottom: 1px solid white;}
-.popup {display: none; position: absolute; z-index: 1000; background: #eeeeee; color: #000000; border: 1px solid #1a1a1a; font-size: 90%;}
+/*.popup {display: none; position: absolute; z-index: 1000; background: #eeeeee; color: #000000; border: 1px solid #1a1a1a; font-size: 90%;}*/
 .event_popup {width: 280px; height: 40px; padding: 10px;}
 
 input[type="button"].active {color: #6193CF}

From 64ef1e21819979d7fdc406d2628bc175b16fe554 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 12 Aug 2012 14:48:56 -0400
Subject: [PATCH 1422/1537] Change name of share function to shareItem, silly
 PHP 5.3.1 thinking it is a constructor...

---
 core/ajax/share.php  | 2 +-
 lib/public/share.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 625199aa0b..3eadff431c 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -26,7 +26,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+					OCP\Share::shareItem($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 					// TODO May need to return private link
 					OC_JSON::success();
 				} catch (Exception $exception) {
diff --git a/lib/public/share.php b/lib/public/share.php
index bda2441b45..cead8396a4 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -140,7 +140,7 @@ class Share {
 	* @param int CRUDS permissions
 	* @return bool Returns true on success or false on failure
 	*/
-	public static function share($itemType, $itemSource, $shareType, $shareWith, $permissions) {
+	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
 		switch ($shareType) {
@@ -201,7 +201,7 @@ class Share {
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
-				return self::share($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
+				return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
 				break;
 			// Future share types need to include their own conditions
 			default:

From cb719960089b199281315b91a30023686df489ec Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Aug 2012 17:21:09 +0200
Subject: [PATCH 1423/1537] Change image links to use imagePath function

---
 apps/calendar/templates/calendar.php                |   2 +-
 apps/calendar/templates/share.dropdown.php          |   4 ++--
 apps/contacts/templates/index.php                   |   8 ++++----
 apps/files_versions/templates/settings-personal.php |   4 ++--
 apps/remoteStorage/{ => img}/remoteStorage.png      | Bin
 apps/remoteStorage/templates/settings.php           |   4 ++--
 apps/user_migrate/templates/settings.php            |   2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename apps/remoteStorage/{ => img}/remoteStorage.png (100%)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index c94cc755ab..15891aafd9 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -44,7 +44,7 @@
 					<form id="choosecalendar">
 						<!--<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>-->
 						<a class="settings calendarsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('calendar', 'icon.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
-						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Settings'); ?>" /></a>
+						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
 					</form>
 					<form id="datecontrol">
 						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index 07b4c4bced..391ae83765 100644
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -33,7 +33,7 @@ echo OCP\html_select_options($allusers, array());
 </select><br>
 <ul id="sharewithuser_list">
 <?php foreach($users as $user): ?>
-	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo  OC::$WEBROOT; ?>/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>
+	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
 	<script>
 		$('#sharewithuser_<?php echo $user['share']; ?> > img').click(function(){
 			$('#share_user option[value="<?php echo $user['share']; ?>"]').removeAttr('disabled');
@@ -59,7 +59,7 @@ echo OCP\html_select_options($allgroups, array());
 </select><br>
 <ul id="sharewithgroup_list">
 <?php foreach($groups as $group): ?>
-	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo  OC::$WEBROOT; ?>/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>
+	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
 	<script>
 		$('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
 			$('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 024b1d150f..744381026a 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -13,9 +13,9 @@
 	<div id="bottomcontrols">
 			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
 			<button class="svg import tip" title="<?php echo $l->t('Import'); ?>">
-				<img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" />
+				<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/upload.svg') ?>" alt="<?php echo $l->t('Import'); ?>" />
 			</button>
-			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
+			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg') ?>" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
 		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
 			<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
@@ -69,6 +69,6 @@
 <div id="dialog_holder"></div>
 <!-- End of Dialogs -->
 <menu type="context" id="addressbookmenu">
-	<menuitem label="Delete" icon="core/img/actions/delete.svg" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
-	<menuitem label="Rename" icon="core/img/actions/rename.svg" onclick="alert('Can\'t do that')"></menuitem>
+	<menuitem label="Delete" icon="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
+	<menuitem label="Rename" icon="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>" onclick="alert('Can\'t do that')"></menuitem>
 </menu>
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index 7ff016b585..fe9ba381e5 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -4,6 +4,6 @@
 			<strong>Versions</strong><!-- translate using echo $l->t('foo'); -->
 		</legend>
 		<p>This will delete all existing backup versions of your files</p><!-- translate using echo $l->t('foo'); -->
-		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/apps/remoteStorage/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
similarity index 100%
rename from apps/remoteStorage/remoteStorage.png
rename to apps/remoteStorage/img/remoteStorage.png
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
index 147378dda3..88e1be94da 100644
--- a/apps/remoteStorage/templates/settings.php
+++ b/apps/remoteStorage/templates/settings.php
@@ -1,6 +1,6 @@
 	<fieldset class="personalblock">
 		<?php
-			echo '<img src="../apps/remoteStorage/remoteStorage.png" style="width:16px"> '
+			echo '<img src="'.image_path('remoteStorage', 'remoteStorage.png').'" style="width:16px"> '
 				.'<strong>'.$l->t('remoteStorage').'</strong> user address: '
 				.OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME']
 				.' (<a href="http://unhosted.org/">more info</a>)';
@@ -22,7 +22,7 @@
 					.'> <strong>'.$details['appUrl'].'</strong>: '.$details['categories']
 					.' <a href="#" title="Revoke" class="action" style="display:none" id="revoke_'.$token.'" onclick="'
 					.'revokeToken(\''.$token.'\');this.parentNode.style.display=\'none\';"'
-					.'><img src="/core/img/actions/delete.svg"></a></li>'."\n";
+					.'><img src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></li>'."\n";
 			}
 		?></ul>
 	</fieldset>
diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
index bce5fb2d7c..d6f3e2f8f6 100644
--- a/apps/user_migrate/templates/settings.php
+++ b/apps/user_migrate/templates/settings.php
@@ -2,7 +2,7 @@
 	<legend><strong><?php echo $l->t('Export your user account');?></strong></legend>
 	<p><?php echo $l->t('This will create a compressed file that contains your ownCloud account.');?>
 	</p>
-	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
 </fieldset>
 <form id="import" action="#" method="post" enctype="multipart/form-data">
     <fieldset class="personalblock">

From ab8e7f1da3201a606c5bae1d0b66a49432d20125 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Aug 2012 22:03:29 +0200
Subject: [PATCH 1424/1537] Remove unused gallery template

---
 apps/gallery/templates/view_album.php | 47 ---------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 apps/gallery/templates/view_album.php

diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
deleted file mode 100644
index 00e891103f..0000000000
--- a/apps/gallery/templates/view_album.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-OCP\Util::addStyle('gallery', 'styles');
-OCP\Util::addScript('gallery', 'albums');
-OCP\Util::addScript('gallery', 'album_cover');
-OCP\Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
-OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
-$l = OC_L10N::get('gallery');
-?>
-<script type="text/javascript">
-  $(document).ready(function() {
-    $("a[rel=images]").fancybox({
-    'titlePosition': 'inside'
-    });
-  });
-</script>
-
-<div id="controls">
-  <a href="?"><input type="button" value="<?php echo $l->t('Back');?>" /></a>
-<br/>
-</div>
-
-<div id="gallery_list" class="leftcontent">
-</div>
-
-<div id="gallery_images" class="rightcontent">
-<?php
-foreach ($_['photos'] as $a) {
-?>
-<a rel="images" href="../../files/download.php?file=<?php echo urlencode($a); ?>"><img src="ajax/thumbnail.php?img=<?php echo urlencode($a) ?>"></a>
-<?php
-  }
-?>
-</div>
-
-<div id="dialog-confirm" title="<?php echo $l->t('Remove confirmation');?>" style="display: none">
-  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php echo $l->t('Do you want to remove album');?> <span id="albumName"></span>?</p>
-</div>
-
-<div id="dialog-form" title="<?php echo $l->t('Change album name');?>" style="display:none">
-	<form>
-	<fieldset>
-    <label for="name"><?php echo $l->t('New album name');?></label>
-		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
-	</fieldset>
-	</form>
-</div>

From 73b1b68fffecba258714984e13e12183d9932dfd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Aug 2012 22:28:57 +0200
Subject: [PATCH 1425/1537] Rewrite remoteStorage settings, remove block echo

---
 apps/remoteStorage/templates/settings.php | 28 +++++++++--------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
index 88e1be94da..1d2a188f52 100644
--- a/apps/remoteStorage/templates/settings.php
+++ b/apps/remoteStorage/templates/settings.php
@@ -1,10 +1,6 @@
 	<fieldset class="personalblock">
-		<?php
-			echo '<img src="'.image_path('remoteStorage', 'remoteStorage.png').'" style="width:16px"> '
-				.'<strong>'.$l->t('remoteStorage').'</strong> user address: '
-				.OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME']
-				.' (<a href="http://unhosted.org/">more info</a>)';
-		?>
+		<img src="<?php echo image_path('remoteStorage', 'remoteStorage.png') ?>" style="width:16px">
+		<strong><?php echo $l->t('remoteStorage') ?></strong> user address: <?php echo OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME'] ?> (<a href="http://unhosted.org/">more info</a>)
 		<p><em>Apps that currently have access to your ownCloud:</em></p>
 		<script>
 			function revokeToken(token) {
@@ -14,15 +10,13 @@
 			}
 		</script>
 		<ul>
-		<?php
-			foreach(OC_remoteStorage::getAllTokens() as $token => $details) {
-				echo '<li onmouseover="'
-					.'document.getElementById(\'revoke_'.$token.'\').style.display=\'inline\';"'
-					.'onmouseout="document.getElementById(\'revoke_'.$token.'\').style.display=\'none\';"'
-					.'> <strong>'.$details['appUrl'].'</strong>: '.$details['categories']
-					.' <a href="#" title="Revoke" class="action" style="display:none" id="revoke_'.$token.'" onclick="'
-					.'revokeToken(\''.$token.'\');this.parentNode.style.display=\'none\';"'
-					.'><img src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></li>'."\n";
-			}
-		?></ul>
+		<?php foreach(OC_remoteStorage::getAllTokens() as $token => $details) { ?>
+			<li onmouseover="$('#revoke_<?php echo $token ?>').show();" onmouseout="$('#revoke_<?php echo $token ?>').hide();">
+				<strong><?php echo $details['appUrl'] ?></strong>: <?php echo $details['categories'] ?>
+				<a href="#" title="Revoke" class="action" style="display:none" id="revoke_<?php echo $token ?>" onclick="revokeToken('<?php echo $token ?>');$(this).hide();">
+					<img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>">
+				</a>
+			</li>
+		<?php } ?>
+		</ul>
 	</fieldset>

From 758f476fe30a1e153acfe76aacac80f5149a8bc9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Aug 2012 22:40:36 +0200
Subject: [PATCH 1426/1537] Calendar: remove not used style rules

---
 apps/calendar/css/style.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 363a24aea1..64a779b9a9 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -40,8 +40,6 @@
 .thisday{background: #FFFABC;}
 .event {position:relative;}
 .event.colored {border-bottom: 1px solid white;}
-/*.popup {display: none; position: absolute; z-index: 1000; background: #eeeeee; color: #000000; border: 1px solid #1a1a1a; font-size: 90%;}*/
-.event_popup {width: 280px; height: 40px; padding: 10px;}
 
 input[type="button"].active {color: #6193CF}
 #fromtime, #totime {

From 7ffd95e56d038d73954203565574df18647df9fe Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 13 Aug 2012 00:30:45 +0200
Subject: [PATCH 1427/1537] translation resources added and updated

---
 l10n/.tx/config                           | 30 ++++++++++
 l10n/templates/admin_dependencies_chk.pot | 71 +++++++++++++++++++++++
 l10n/templates/admin_migrate.pot          | 33 +++++++++++
 l10n/templates/bookmarks.pot              |  2 +-
 l10n/templates/calendar.pot               |  2 +-
 l10n/templates/contacts.pot               |  2 +-
 l10n/templates/core.pot                   | 28 ++++-----
 l10n/templates/files.pot                  |  2 +-
 l10n/templates/files_encryption.pot       | 34 +++++++++++
 l10n/templates/files_sharing.pot          | 54 +++++++++++++++++
 l10n/templates/files_versions.pot         | 26 +++++++++
 l10n/templates/gallery.pot                | 22 +------
 l10n/templates/lib.pot                    |  2 +-
 l10n/templates/media.pot                  |  2 +-
 l10n/templates/settings.pot               |  2 +-
 15 files changed, 270 insertions(+), 42 deletions(-)
 create mode 100644 l10n/templates/admin_dependencies_chk.pot
 create mode 100644 l10n/templates/admin_migrate.pot
 create mode 100644 l10n/templates/files_encryption.pot
 create mode 100644 l10n/templates/files_sharing.pot
 create mode 100644 l10n/templates/files_versions.pot

diff --git a/l10n/.tx/config b/l10n/.tx/config
index 814fb9a37d..0d143fc604 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -48,3 +48,33 @@ source_file = templates/lib.pot
 source_lang = en
 type = PO
 
+[owncloud.admin_dependencies_chk]
+file_filter = <lang>/admin_dependencies_chk.po
+source_file = templates/admin_dependencies_chk.pot
+source_lang = en
+
+[owncloud.admin_migrate]
+file_filter = <lang>/admin_migrate.po
+source_file = templates/admin_migrate.pot
+source_lang = en
+
+[owncloud.files_encryption]
+file_filter = <lang>/files_encryption.po
+source_file = templates/files_encryption.pot
+source_lang = en
+
+[owncloud.files_external]
+file_filter = <lang>/files_external.po
+source_file = templates/files_external.pot
+source_lang = en
+
+[owncloud.files_sharing]
+file_filter = <lang>/files_sharing.po
+source_file = templates/files_sharing.pot
+source_lang = en
+
+[owncloud.files_versions]
+file_filter = <lang>/files_versions.po
+source_file = templates/files_versions.pot
+source_lang = en
+
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
new file mode 100644
index 0000000000..23f6c58037
--- /dev/null
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid "The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve "
+"knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
new file mode 100644
index 0000000000..f4c2c6c866
--- /dev/null
+++ b/l10n/templates/admin_migrate.pot
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud "
+"instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 26bdf5ff1e..4c87291431 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 399cc1a0f6..9ddd552dd9 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 7229e0cfaf..9a3b885c86 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e487a4c23c..7a5f6a69e1 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "January"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "February"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "March"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "April"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "May"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "June"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "July"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "August"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "September"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "October"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "November"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ca0aaf32f8..15af48c5c5 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
new file mode 100644
index 0000000000..87251b10ca
--- /dev/null
+++ b/l10n/templates/files_encryption.pot
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
new file mode 100644
index 0000000000..666a18115b
--- /dev/null
+++ b/l10n/templates/files_sharing.pot
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
new file mode 100644
index 0000000000..167df057cd
--- /dev/null
+++ b/l10n/templates/files_versions.pot
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index ce6eeb8117..4c76eaf6e8 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,23 +36,3 @@ msgstr ""
 #: templates/index.php:27
 msgid "Slideshow"
 msgstr ""
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr ""
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr ""
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr ""
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr ""
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d1a93945f6..6e35e45cbc 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 0946439eae..dfce3149c1 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index eed6321de6..9655e9aba5 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"POT-Creation-Date: 2012-08-13 00:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From 3e504cf8947cafd7c3fcb9eb5b157484258cafd7 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 13 Aug 2012 00:47:40 +0200
Subject: [PATCH 1428/1537] translation resources added and updated

---
 l10n/.tx/config                           |  30 ++++
 l10n/templates/admin_dependencies_chk.pot |   2 +-
 l10n/templates/admin_migrate.pot          |   2 +-
 l10n/templates/bookmarks.pot              |   2 +-
 l10n/templates/calendar.pot               |   2 +-
 l10n/templates/contacts.pot               |   2 +-
 l10n/templates/core.pot                   |   2 +-
 l10n/templates/files.pot                  |   2 +-
 l10n/templates/files_encryption.pot       |   2 +-
 l10n/templates/files_external.pot         |  82 +++++++++++
 l10n/templates/files_sharing.pot          |   2 +-
 l10n/templates/files_versions.pot         |   2 +-
 l10n/templates/gallery.pot                |   2 +-
 l10n/templates/lib.pot                    |   2 +-
 l10n/templates/media.pot                  |   2 +-
 l10n/templates/settings.pot               |   2 +-
 l10n/templates/tasks.pot                  | 106 ++++++++++++++
 l10n/templates/user_ldap.pot              | 163 ++++++++++++++++++++++
 l10n/templates/user_migrate.pot           |  50 +++++++
 l10n/templates/user_openid.pot            |  54 +++++++
 20 files changed, 499 insertions(+), 14 deletions(-)
 create mode 100644 l10n/templates/files_external.pot
 create mode 100644 l10n/templates/tasks.pot
 create mode 100644 l10n/templates/user_ldap.pot
 create mode 100644 l10n/templates/user_migrate.pot
 create mode 100644 l10n/templates/user_openid.pot

diff --git a/l10n/.tx/config b/l10n/.tx/config
index 0d143fc604..db4df85793 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -52,29 +52,59 @@ type = PO
 file_filter = <lang>/admin_dependencies_chk.po
 source_file = templates/admin_dependencies_chk.pot
 source_lang = en
+type = PO
 
 [owncloud.admin_migrate]
 file_filter = <lang>/admin_migrate.po
 source_file = templates/admin_migrate.pot
 source_lang = en
+type = PO
 
 [owncloud.files_encryption]
 file_filter = <lang>/files_encryption.po
 source_file = templates/files_encryption.pot
 source_lang = en
+type = PO
 
 [owncloud.files_external]
 file_filter = <lang>/files_external.po
 source_file = templates/files_external.pot
 source_lang = en
+type = PO
 
 [owncloud.files_sharing]
 file_filter = <lang>/files_sharing.po
 source_file = templates/files_sharing.pot
 source_lang = en
+type = PO
 
 [owncloud.files_versions]
 file_filter = <lang>/files_versions.po
 source_file = templates/files_versions.pot
 source_lang = en
+type = PO
+
+[owncloud.tasks]
+file_filter = <lang>/tasks.po
+source_file = templates/tasks.pot
+source_lang = en
+type = PO
+
+[owncloud.user_ldap]
+file_filter = <lang>/user_ldap.po
+source_file = templates/user_ldap.pot
+source_lang = en
+type = PO
+
+[owncloud.user_migrate]
+file_filter = <lang>/user_migrate.po
+source_file = templates/user_migrate.pot
+source_lang = en
+type = PO
+
+[owncloud.user_openid]
+file_filter = <lang>/user_openid.po
+source_file = templates/user_openid.pot
+source_lang = en
+type = PO
 
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 23f6c58037..dbff000af9 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index f4c2c6c866..94cd898b3c 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 4c87291431..88dfa5e1d3 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 9ddd552dd9..f2e4699b96 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 9a3b885c86..f6f4474f22 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 7a5f6a69e1..a4f89a3fe7 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 15af48c5c5..edd5d06c47 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 87251b10ca..d526217771 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
new file mode 100644
index 0000000000..b874a78f92
--- /dev/null
+++ b/l10n/templates/files_external.pot
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 666a18115b..4ace52be48 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 167df057cd..1c1534ff9b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 4c76eaf6e8..c2d65a06c4 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 6e35e45cbc..4547bf98cc 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index dfce3149c1..217fab5711 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 9655e9aba5..96e06e2e0a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:25+0200\n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
new file mode 100644
index 0000000000..49a9e615cc
--- /dev/null
+++ b/l10n/templates/tasks.pot
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
new file mode 100644
index 0000000000..9d0e40a967
--- /dev/null
+++ b/l10n/templates/user_ldap.pot
@@ -0,0 +1,163 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,"
+"dc=example,dc=com. For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
new file mode 100644
index 0000000000..60f36b326e
--- /dev/null
+++ b/l10n/templates/user_migrate.pot
@@ -0,0 +1,50 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
new file mode 100644
index 0000000000..c5ff20b40f
--- /dev/null
+++ b/l10n/templates/user_openid.pot
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""

From e72a57f5950c7feb01cfa5544a1da8852ca9aa43 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 13 Aug 2012 00:56:15 +0200
Subject: [PATCH 1429/1537] Also check for some other files

---
 lib/migrate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/migrate.php b/lib/migrate.php
index 1b6367ed6e..917d77eaca 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -322,7 +322,7 @@ class OC_Migrate{
 			$objects = scandir( $path );
 			if( sizeof( $objects ) > 0 ){
 				foreach( $objects as $file ){
-					if( $file == "." || $file == ".." )
+					if( $file == "." || $file == ".." || $file == ".htaccess")
 					continue;
 					// go on
 					if( is_dir( $path . '/' . $file ) ){

From d303763d1f7b532a69f2865c16a71e90bbf2fe5c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 13 Aug 2012 15:07:15 +0200
Subject: [PATCH 1430/1537] Automatically check radio when new addressbook
 fields get focus.

---
 apps/contacts/templates/part.selectaddressbook.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
index c54ddaf2e6..812a3b891f 100644
--- a/apps/contacts/templates/part.selectaddressbook.php
+++ b/apps/contacts/templates/part.selectaddressbook.php
@@ -1,4 +1,11 @@
 <div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>">
+<script type="text/javascript">
+$(document).ready(function() {
+	$('input.name,input.desc').on('focus', function(e) {
+		$('#book_new').prop('checked', true);
+	});
+});
+</script>
 <form>
 <table style="width: 100%">
 	<?php foreach($_['addressbooks'] as $idx => $addressbook) { ?>

From 53f117c01aea9aa96a6bf4d53fe371b5b6f120c6 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 13 Aug 2012 23:10:10 +0200
Subject: [PATCH 1431/1537] l10n directories have been missing

---
 apps/admin_dependencies_chk/l10n/.gitkeep | 0
 apps/admin_migrate/l10n/.gitkeep          | 0
 apps/files_encryption/l10n/.gitkeep       | 0
 apps/files_external/l10n/.gitkeep         | 0
 apps/files_sharing/l10n/.gitkeep          | 0
 apps/files_versions/l10n/.gitkeep         | 0
 apps/tasks/l10n/.gitkeep                  | 0
 apps/user_ldap/l10n/.gitkeep              | 0
 apps/user_migrate/l10n/.gitkeep           | 0
 apps/user_openid/l10n/.gitkeep            | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/.gitkeep
 create mode 100644 apps/admin_migrate/l10n/.gitkeep
 create mode 100644 apps/files_encryption/l10n/.gitkeep
 create mode 100644 apps/files_external/l10n/.gitkeep
 create mode 100644 apps/files_sharing/l10n/.gitkeep
 create mode 100644 apps/files_versions/l10n/.gitkeep
 create mode 100644 apps/tasks/l10n/.gitkeep
 create mode 100644 apps/user_ldap/l10n/.gitkeep
 create mode 100644 apps/user_migrate/l10n/.gitkeep
 create mode 100644 apps/user_openid/l10n/.gitkeep

diff --git a/apps/admin_dependencies_chk/l10n/.gitkeep b/apps/admin_dependencies_chk/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/admin_migrate/l10n/.gitkeep b/apps/admin_migrate/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/files_encryption/l10n/.gitkeep b/apps/files_encryption/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/files_external/l10n/.gitkeep b/apps/files_external/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/files_sharing/l10n/.gitkeep b/apps/files_sharing/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/files_versions/l10n/.gitkeep b/apps/files_versions/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/tasks/l10n/.gitkeep b/apps/tasks/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/user_ldap/l10n/.gitkeep b/apps/user_ldap/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/user_migrate/l10n/.gitkeep b/apps/user_migrate/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/user_openid/l10n/.gitkeep b/apps/user_openid/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2

From be32625fcc04d18aac5b0d68a8880e8dc2593e37 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 12 Aug 2012 15:20:31 -0400
Subject: [PATCH 1432/1537] Fix remove button display for external storage

---
 apps/files_external/css/settings.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index d8575c49e3..ca4b1c3ba8 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,5 +1,7 @@
 .error { color: #FF3B3B; }
 td.mountPoint, td.backend { width:10em; }
+td.remove>img { visibility:hidden; padding-top:0.8em; }
+tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
 #addMountPoint>td { border:none; }
 #addMountPoint>td.applicable { visibility:hidden; }
 #selectBackend { margin-left:-10px; }
\ No newline at end of file

From b6b2f8826bf4591142644e571571df0f226c3cc1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 12 Aug 2012 15:50:39 -0400
Subject: [PATCH 1433/1537] Show access granted label next to Google Drive and
 Dropbox storage in configuration

---
 apps/files_external/js/dropbox.js | 2 ++
 apps/files_external/js/google.js  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 08796cbbdc..770a9a1fa6 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -21,6 +21,8 @@ $(document).ready(function() {
 							OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
 						}
 					});
+				} else if ($(this).find('.configuration #granted').length == 0) {
+					$(this).find('.configuration').append('<span id="granted">Access granted</span>');
 				}
 			}
 		}
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 55042194c7..8e2cdd3222 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -22,6 +22,8 @@ $(document).ready(function() {
 							OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
 						}
 					});
+				} else if ($(this).find('.configuration #granted').length == 0) {
+					$(this).find('.configuration').append('<span id="granted" style="padding-left:0.5em;">Access granted</span>');
 				}
 			}
 		}

From 0e6d22e25f19f6b6b7d717d65066ad33ae5cb4f3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 Aug 2012 10:44:53 -0400
Subject: [PATCH 1434/1537] Prevent editing Dropbox configuration input after
 access granted

---
 apps/files_external/js/dropbox.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 770a9a1fa6..6fc362fb08 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -22,6 +22,7 @@ $(document).ready(function() {
 						}
 					});
 				} else if ($(this).find('.configuration #granted').length == 0) {
+					$(this).find('.configuration input').attr('disabled', 'disabled');
 					$(this).find('.configuration').append('<span id="granted">Access granted</span>');
 				}
 			}

From 7f12a65c2437033fd890a7995efcc0ec3be37414 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 Aug 2012 11:01:38 -0400
Subject: [PATCH 1435/1537] Show access granted label immediately after
 granting access

---
 apps/files_external/js/dropbox.js |  5 ++++-
 apps/files_external/js/google.js  | 11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 6fc362fb08..08ce88b102 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -9,6 +9,7 @@ $(document).ready(function() {
 			} else  {
 				var pos = window.location.search.indexOf('oauth_token') + 12
 				var token = $(this).find('.configuration [data-parameter="token"]');
+				var access = true;
 				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
 					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
 					var tr = $(this);
@@ -18,10 +19,12 @@ $(document).ready(function() {
 							$(token_secret).val(result.access_token_secret);
 							OC.MountConfig.saveStorage(tr);
 						} else {
+							access = false;
 							OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
 						}
 					});
-				} else if ($(this).find('.configuration #granted').length == 0) {
+				}
+				if (access && $(this).find('.configuration #granted').length == 0) {
 					$(this).find('.configuration input').attr('disabled', 'disabled');
 					$(this).find('.configuration').append('<span id="granted">Access granted</span>');
 				}
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 8e2cdd3222..ede5fb2e77 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,5 +1,5 @@
 $(document).ready(function() {
-	
+
 	$('#externalStorage tbody tr').each(function() {
 		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Google') {
 			var token = $(this).find('[data-parameter="token"]');
@@ -11,6 +11,7 @@ $(document).ready(function() {
 				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
 					params[key] = value;
 				});
+				var access = true;
 				if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
 					var tr = $(this);
 					$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
@@ -19,16 +20,18 @@ $(document).ready(function() {
 							$(token_secret).val(result.access_token_secret);
 							OC.MountConfig.saveStorage(tr);
 						} else {
+							access = false;
 							OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
 						}
 					});
-				} else if ($(this).find('.configuration #granted').length == 0) {
+				}
+				if (access && $(this).find('.configuration #granted').length == 0) {
 					$(this).find('.configuration').append('<span id="granted" style="padding-left:0.5em;">Access granted</span>');
 				}
 			}
 		}
 	});
-	
+
 	$('.google').live('click', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
@@ -45,5 +48,5 @@ $(document).ready(function() {
 			}
 		});
 	});
-	
+
 });

From 863d3a43b28df0bfec6aa02bde65073ca4beb926 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 Aug 2012 17:06:10 -0400
Subject: [PATCH 1436/1537] Catch exceptions and write to log when creating
 storage object fails

---
 lib/filesystem.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index e9d2ae9337..5af6e0aa54 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -273,7 +273,12 @@ class OC_Filesystem{
 	*/
 	static private function createStorage($class,$arguments){
 		if(class_exists($class)){
-			return new $class($arguments);
+			try {
+				return new $class($arguments);
+			} catch (Exception $exception) {
+				OC_Log::write('core', $exception->getMessage(), OC_Log::ERROR);
+				return false;
+			}
 		}else{
 			OC_Log::write('core','storage backend '.$class.' not found',OC_Log::ERROR);
 			return false;

From 98c7d40fcdebeffe3fa335c93df4c97c7fabf5d9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 Aug 2012 17:07:56 -0400
Subject: [PATCH 1437/1537] Throw exception in Dropbox and Google Drive storage
 constructors if parameters are not correct

---
 apps/files_external/lib/dropbox.php | 20 ++++++++++++++++----
 apps/files_external/lib/google.php  | 18 +++++++++++-------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index c849db3843..a27d9d7c36 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -30,9 +30,13 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	private static $tempFiles = array();
 
 	public function __construct($params) {
-		$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
-		$oauth->setToken($params['token'], $params['token_secret']);
-		$this->dropbox = new Dropbox_API($oauth, 'dropbox');
+		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['app_key']) && isset($params['app_secret']) && isset($params['token']) && isset($params['token_secret'])) {
+			$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+			$oauth->setToken($params['token'], $params['token_secret']);
+			$this->dropbox = new Dropbox_API($oauth, 'dropbox');
+		} else {
+			throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
+		}
 	}
 
 	private function getMetaData($path, $list = false) {
@@ -43,6 +47,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 				try {
 					$response = $this->dropbox->getMetaData($path);
 				} catch (Exception $exception) {
+					OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 					return false;
 				}
 				if ($response && isset($response['contents'])) {
@@ -63,6 +68,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 					$this->metaData[$path] = $response;
 					return $response;
 				} catch (Exception $exception) {
+					OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 					return false;
 				}
 			}
@@ -74,6 +80,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->createFolder($path);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -141,6 +148,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->delete($path);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -150,6 +158,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->move($path1, $path2);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -159,6 +168,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->copy($path1, $path2);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -173,6 +183,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 					file_put_contents($tmpFile, $data);
 					return fopen($tmpFile, 'r');
 				} catch (Exception $exception) {
+					OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 					return false;
 				}
 			case 'w':
@@ -211,7 +222,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 				$this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
 				unlink($tmpFile);
 			} catch (Exception $exception) {
-				
+				OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			}
 		}
 	}
@@ -230,6 +241,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$info = $this->dropbox->getAccountInfo();
 			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 2ad85d09d5..2b387f0c83 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -31,13 +31,17 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 
 	private static $tempFiles = array();
 
-	public function __construct($arguments) {
-		$consumer_key = isset($arguments['consumer_key']) ? $arguments['consumer_key'] : 'anonymous';
-		$consumer_secret = isset($arguments['consumer_secret']) ? $arguments['consumer_secret'] : 'anonymous';
-		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
-		$this->oauth_token = new OAuthToken($arguments['token'], $arguments['token_secret']);
-		$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
-		$this->entries = array();
+	public function __construct($params) {
+		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['token']) && isset($params['token_secret'])) {
+			$consumer_key = isset($params['consumer_key']) ? $params['consumer_key'] : 'anonymous';
+			$consumer_secret = isset($params['consumer_secret']) ? $params['consumer_secret'] : 'anonymous';
+			$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+			$this->oauth_token = new OAuthToken($params['token'], $params['token_secret']);
+			$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
+			$this->entries = array();
+		} else {
+			throw new Exception('Creating OC_Filestorage_Google storage failed');
+		}
 	}
 
 	private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true, $returnHTTPCode = false) {

From d3bdab286b77c58bf8c1accfdb3946402ed9535a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 Aug 2012 17:09:37 -0400
Subject: [PATCH 1438/1537] Suggest mount point name, don't reload custom
 javascript file

---
 apps/files_external/js/settings.js | 31 ++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 0d942e7845..23f02bbefc 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1,4 +1,4 @@
-OC.MountConfig={	
+OC.MountConfig={
 	saveStorage:function(tr) {
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if (mountPoint == '') {
@@ -63,6 +63,7 @@ OC.MountConfig={
 				var applicable = OC.currentUser;
 				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 			}
+			return true;
 		}
 	}
 }
@@ -77,6 +78,10 @@ $(document).ready(function() {
 		var selected = $(this).find('option:selected').text();
 		var backendClass = $(this).val();
 		$(this).parent().text(selected);
+		if ($(tr).find('.mountPoint input').val() == '') {
+			$(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, '')));
+		}
+		$(tr).addClass(backendClass);
 		$(tr).find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
@@ -95,7 +100,7 @@ $(document).ready(function() {
 						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
 					}
 				});
-				if (parameters['custom']) {
+				if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass).length == 1) {
 					OC.addScript('files_external', parameters['custom']);
 				}
 				return false;
@@ -108,6 +113,28 @@ $(document).ready(function() {
 		$(this).remove();
 	});
 
+	function suggestMountPoint(defaultMountPoint) {
+		var i = 1;
+		var append = '';
+		var match = true;
+		while (match && i < 20) {
+			match = false;
+			$('#externalStorage tbody td.mountPoint input').each(function(index, mountPoint) {
+				if ($(mountPoint).val() == defaultMountPoint+append) {
+					match = true;
+					return false;
+				}
+			});
+			if (match) {
+				append = i;
+				i++;
+			} else {
+				break;
+			}
+		}
+		return defaultMountPoint+append;
+	} 
+
 	$('#externalStorage td').live('change', function() {
 		OC.MountConfig.saveStorage($(this).parent());
 	});

From 830676b475ad072aa7d6e69a5facae319befa52c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 Aug 2012 17:10:36 -0400
Subject: [PATCH 1439/1537] Improve usability for configuring Dropbox and
 Google Drive external storage

---
 apps/files_external/js/dropbox.js          |  46 +-
 apps/files_external/js/google.js           |  76 ++-
 apps/files_external/lib/config.php         | 530 ++++++++++-----------
 apps/files_external/templates/settings.php |   2 +-
 4 files changed, 350 insertions(+), 304 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 08ce88b102..92194792f4 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -1,15 +1,17 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr').each(function() {
-		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Dropbox') {
+	$('#externalStorage tbody tr.OC_Filestorage_Dropbox').each(function() {
+		var configured = $(this).find('[data-parameter="configured"]');
+		if ($(configured).val() == 'true') {
+			$(this).find('.configuration input').attr('disabled', 'disabled');
+			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
+		} else {
 			var app_key = $(this).find('.configuration [data-parameter="app_key"]').val();
 			var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
-			if (app_key == '' && app_secret == '') {
-				$(this).find('.configuration').append('<a class="button dropbox">Grant access</a>');
-			} else  {
+			var config = $(this).find('.configuration');
+			if (app_key != '' && app_secret != '') {
 				var pos = window.location.search.indexOf('oauth_token') + 12
 				var token = $(this).find('.configuration [data-parameter="token"]');
-				var access = true;
 				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
 					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
 					var tr = $(this);
@@ -18,16 +20,31 @@ $(document).ready(function() {
 							$(token).val(result.access_token);
 							$(token_secret).val(result.access_token_secret);
 							OC.MountConfig.saveStorage(tr);
+							$(tr).find('.configuration input').attr('disabled', 'disabled');
+							$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
 						} else {
-							access = false;
 							OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
 						}
 					});
 				}
-				if (access && $(this).find('.configuration #granted').length == 0) {
-					$(this).find('.configuration input').attr('disabled', 'disabled');
-					$(this).find('.configuration').append('<span id="granted">Access granted</span>');
+			} else if ($(this).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '' && $(this).find('.dropbox').length == 0) {
+				$(this).find('.configuration').append('<a class="button dropbox">Grant access</a>');
+			}
+		}
+	});
+
+	$('#externalStorage tbody tr input').live('keyup', function() {
+		var tr = $(this).parent().parent();
+		if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') {
+			var config = $(tr).find('.configuration');
+			if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') {
+				if ($(tr).find('.dropbox').length == 0) {
+					$(config).append('<a class="button dropbox">Grant access</a>');
+				} else {
+					$(tr).find('.dropbox').show();
 				}
+			} else if ($(tr).find('.dropbox').length > 0) {
+				$(tr).find('.dropbox').hide();
 			}
 		}
 	});
@@ -38,14 +55,19 @@ $(document).ready(function() {
 		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
 		if (app_key != '' && app_secret != '') {
 			var tr = $(this).parent().parent();
+			var configured = $(this).parent().find('[data-parameter="configured"]');
 			var token = $(this).parent().find('[data-parameter="token"]');
 			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
 			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: window.location.href }, function(result) {
 				if (result && result.status == 'success') {
+					$(configured).val('false');
 					$(token).val(result.data.request_token);
 					$(token_secret).val(result.data.request_token_secret);
-					OC.MountConfig.saveStorage(tr);
-					window.location = result.data.url;
+					if (OC.MountConfig.saveStorage(tr)) {
+						window.location = result.data.url;
+					} else {
+						OC.dialogs.alert('Fill out all required fields', 'Error configuring Dropbox storage');
+					}
 				} else {
 					OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
 				}
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index ede5fb2e77..7c62297df4 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,48 +1,72 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr').each(function() {
-		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Google') {
+	$('#externalStorage tbody tr.OC_Filestorage_Google').each(function() {
+		var configured = $(this).find('[data-parameter="configured"]');
+		if ($(configured).val() == 'true') {
+			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
+		} else {
 			var token = $(this).find('[data-parameter="token"]');
 			var token_secret = $(this).find('[data-parameter="token_secret"]');
-			if ($(token).val() == '' && $(token).val() == '') {
-				$(this).find('.configuration').append('<a class="button google">Grant access</a>');
-			} else  {
-				var params = {};
-				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
-					params[key] = value;
+			var params = {};
+			window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
+				params[key] = value;
+			});
+			if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
+				var tr = $(this);
+				$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
+					if (result && result.status == 'success') {
+						$(token).val(result.access_token);
+						$(token_secret).val(result.access_token_secret);
+						$(configured).val('true');
+						OC.MountConfig.saveStorage(tr);
+						$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
+					} else {
+						OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
+					}
 				});
-				var access = true;
-				if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
-					var tr = $(this);
-					$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
-						if (result && result.status == 'success') {
-							$(token).val(result.access_token);
-							$(token_secret).val(result.access_token_secret);
-							OC.MountConfig.saveStorage(tr);
-						} else {
-							access = false;
-							OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
-						}
-					});
-				}
-				if (access && $(this).find('.configuration #granted').length == 0) {
-					$(this).find('.configuration').append('<span id="granted" style="padding-left:0.5em;">Access granted</span>');
+			} else if ($(this).find('.google').length == 0) {
+				$(this).find('.configuration').append('<a class="button google">Grant access</a>');
+			}
+		}
+	});
+
+	$('#externalStorage tbody tr').live('change', function() {
+		if ($(this).hasClass('OC_Filestorage_Google') && $(this).find('[data-parameter="configured"]').val() != 'true') {
+			if ($(this).find('.mountPoint input').val() != '') {
+				if ($(this).find('.google').length == 0) {
+					$(this).find('.configuration').append('<a class="button google">Grant access</a>');
 				}
 			}
 		}
 	});
 
+	$('#externalStorage tbody tr .mountPoint input').live('keyup', function() {
+		var tr = $(this).parent().parent();
+		if ($(tr).hasClass('OC_Filestorage_Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) {
+			if ($(this).val() != '') {
+				$(tr).find('.google').show();
+			} else {
+				$(tr).find('.google').hide();
+			}
+		}
+	});
+
 	$('.google').live('click', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
+		var configured = $(this).parent().find('[data-parameter="configured"]');
 		var token = $(this).parent().find('[data-parameter="token"]');
 		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
 		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: window.location.href }, function(result) {
 			if (result && result.status == 'success') {
+				$(configured).val('false');
 				$(token).val(result.data.request_token);
 				$(token_secret).val(result.data.request_token_secret);
-				OC.MountConfig.saveStorage(tr);
-				window.location = result.data.url;
+				if (OC.MountConfig.saveStorage(tr)) {
+					window.location = result.data.url;
+				} else {
+					OC.dialogs.alert('Fill out all required fields', 'Error configuring Google Drive storage');
+				}
 			} else {
 				OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
 			}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 5630df77a9..f1bc16e253 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -1,263 +1,263 @@
-<?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/>.
-*/
-
-/**
-* Class to configure the config/mount.php and data/$user/mount.php files
-*/
-class OC_Mount_Config {
-
-	const MOUNT_TYPE_GLOBAL = 'global';
-	const MOUNT_TYPE_GROUP = 'group';
-	const MOUNT_TYPE_USER = 'user';
-
-	/**
-	* Get details on each of the external storage backends, used for the mount config UI
-	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded
-	* If the configuration parameter should be secret, add a '*' to the beginning of the value
-	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
-	* If the configuration parameter is optional, add a '&' to the beginning of the value
-	* If the configuration parameter is hidden, add a '#' to the begining of the value
-	* @return array
-	*/
-	public static function getBackends() {
-		return array(
-			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
-			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
-			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret'), 'custom' => 'dropbox'),
-			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'OC_Filestorage_Google' => array('backend' => 'Google Drive', 'configuration' => array('token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),
-			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'share' => 'Share', 'root' => '&Root')),
-			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
-		);
-	}
-
-	/**
-	* Get the system mount points
-	* The returned array is not in the same format as getUserMountPoints()
-	* @return array
-	*/
-	public static function getSystemMountPoints() {
-		$mountPoints = self::readData(false);
-		$backends = self::getBackends();
-		$system = array();
-		if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {
-			foreach ($mountPoints[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
-				foreach ($mounts as $mountPoint => $mount) {
-					// Remove '/$user/files/' from mount point
-					$mountPoint = substr($mountPoint, 13);
-					// Merge the mount point into the current mount points
-					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['groups'] = array_merge($system[$mountPoint]['applicable']['groups'], array($group));
-					} else {
-						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array($group), 'users' => array()));
-					}
-				}
-			}
-		}
-		if (isset($mountPoints[self::MOUNT_TYPE_USER])) {
-			foreach ($mountPoints[self::MOUNT_TYPE_USER] as $user => $mounts) {
-				foreach ($mounts as $mountPoint => $mount) {
-					// Remove '/$user/files/' from mount point
-					$mountPoint = substr($mountPoint, 13);
-					// Merge the mount point into the current mount points
-					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user));
-					} else {
-						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array(), 'users' => array($user)));
-					}
-				}
-			}
-		}
-		return $system;
-	}
-
-	/**
-	* Get the personal mount points of the current user
-	* The returned array is not in the same format as getUserMountPoints()
-	* @return array
-	*/
-	public static function getPersonalMountPoints() {
-		$mountPoints = self::readData(true);
-		$backends = self::getBackends();
-		$uid = OCP\User::getUser();
-		$personal = array();
-		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
-			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
-				// Remove '/uid/files/' from mount point
-				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
-			}
-		}
-		return $personal;
-	}
-
-	
-	/**
-	* Add a mount point to the filesystem
-	* @param string Mount point
-	* @param string Backend class
-	* @param array Backend parameters for the class
-	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
-	* @param string User or group to apply mount to
-	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page
-	* @return bool
-	*/
-	public static function addMountPoint($mountPoint, $class, $classOptions, $mountType, $applicable, $isPersonal = false) {
-		if ($isPersonal) {
-			// Verify that the mount point applies for the current user
-			// Prevent non-admin users from mounting local storage
-			if ($applicable != OCP\User::getUser() || $class == 'OC_Filestorage_Local') {
-				return false;
-			}
-			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
-		} else {
-			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
-		}
-		$mount = array($applicable => array($mountPoint => array('class' => $class, 'options' => $classOptions)));
-		$mountPoints = self::readData($isPersonal);
-		// Merge the new mount point into the current mount points
-		if (isset($mountPoints[$mountType])) {
-			if (isset($mountPoints[$mountType][$applicable])) {
-				$mountPoints[$mountType][$applicable] = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
-			} else {
-				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
-			}
-		} else {
-			$mountPoints[$mountType] = $mount;
-		}
-		self::writeData($isPersonal, $mountPoints);
-		return true;
-	}
-
-	/**
-	*
-	* @param string Mount point
-	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
-	* @param string User or group to remove mount from
-	* @param bool Personal or system mount point
-	* @return bool
-	*/
-	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
-		// Verify that the mount point applies for the current user
-		if ($isPersonal) {
-			if ($applicable != OCP\User::getUser()) {
-				return false;
-			}
-			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
-		} else {
-			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
-		}
-		$mountPoints = self::readData($isPersonal);
-		// Remove mount point
-		unset($mountPoints[$mountType][$applicable][$mountPoint]);
-		// Unset parent arrays if empty
-		if (empty($mountPoints[$mountType][$applicable])) {
-			unset($mountPoints[$mountType][$applicable]);
-			if (empty($mountPoints[$mountType])) {
-				unset($mountPoints[$mountType]);
-			}
-		}
-		self::writeData($isPersonal, $mountPoints);
-		return true;
-	}
-
-	/**
-	* Read the mount points in the config file into an array
-	* @param bool Personal or system config file
-	* @return array
-	*/
-	private static function readData($isPersonal) {
-		if ($isPersonal) {
-			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
-		} else {
-			$file = OC::$SERVERROOT.'/config/mount.php';
-		}
-		if (is_file($file)) {
-			$mountPoints = include($file);
-			if (is_array($mountPoints)) {
-				return $mountPoints;
-			}
-		}
-		return array();
-	}
-
-	/**
-	* Write the mount points to the config file
-	* @param bool Personal or system config file
-	* @param array Mount points
-	*/
-	private static function writeData($isPersonal, $data) {
-		if ($isPersonal) {
-			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
-		} else {
-			$file = OC::$SERVERROOT.'/config/mount.php';
-		}
-		$content = "<?php return array (\n";
-		if (isset($data[self::MOUNT_TYPE_GROUP])) {
-			$content .= "\t'group' => array (\n";
-			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
-				$content .= "\t\t'".$group."' => array (\n";
-				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
-					
-				}
-				$content .= "\t\t),\n";
-			}
-			$content .= "\t),\n";
-		}
-		if (isset($data[self::MOUNT_TYPE_USER])) {
-			$content .= "\t'user' => array (\n";
-			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
-				$content .= "\t\t'".$user."' => array (\n";
-				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
-				}
-				$content .= "\t\t),\n";
-			}
-			$content .= "\t),\n";
-		}
-		$content .= ");\n?>";
-		@file_put_contents($file, $content);
-	}
-	
+<?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/>.
+*/
+
+/**
+* Class to configure the config/mount.php and data/$user/mount.php files
+*/
+class OC_Mount_Config {
+
+	const MOUNT_TYPE_GLOBAL = 'global';
+	const MOUNT_TYPE_GROUP = 'group';
+	const MOUNT_TYPE_USER = 'user';
+
+	/**
+	* Get details on each of the external storage backends, used for the mount config UI
+	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded
+	* If the configuration parameter should be secret, add a '*' to the beginning of the value
+	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
+	* If the configuration parameter is optional, add a '&' to the beginning of the value
+	* If the configuration parameter is hidden, add a '#' to the begining of the value
+	* @return array
+	*/
+	public static function getBackends() {
+		return array(
+			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
+			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
+			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('configured' => '#configured','app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret'), 'custom' => 'dropbox'),
+			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
+			'OC_Filestorage_Google' => array('backend' => 'Google Drive', 'configuration' => array('configured' => '#configured', 'token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),
+			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
+			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'share' => 'Share', 'root' => '&Root')),
+			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
+		);
+	}
+
+	/**
+	* Get the system mount points
+	* The returned array is not in the same format as getUserMountPoints()
+	* @return array
+	*/
+	public static function getSystemMountPoints() {
+		$mountPoints = self::readData(false);
+		$backends = self::getBackends();
+		$system = array();
+		if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {
+			foreach ($mountPoints[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
+				foreach ($mounts as $mountPoint => $mount) {
+					// Remove '/$user/files/' from mount point
+					$mountPoint = substr($mountPoint, 13);
+					// Merge the mount point into the current mount points
+					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
+						$system[$mountPoint]['applicable']['groups'] = array_merge($system[$mountPoint]['applicable']['groups'], array($group));
+					} else {
+						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array($group), 'users' => array()));
+					}
+				}
+			}
+		}
+		if (isset($mountPoints[self::MOUNT_TYPE_USER])) {
+			foreach ($mountPoints[self::MOUNT_TYPE_USER] as $user => $mounts) {
+				foreach ($mounts as $mountPoint => $mount) {
+					// Remove '/$user/files/' from mount point
+					$mountPoint = substr($mountPoint, 13);
+					// Merge the mount point into the current mount points
+					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
+						$system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user));
+					} else {
+						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array(), 'users' => array($user)));
+					}
+				}
+			}
+		}
+		return $system;
+	}
+
+	/**
+	* Get the personal mount points of the current user
+	* The returned array is not in the same format as getUserMountPoints()
+	* @return array
+	*/
+	public static function getPersonalMountPoints() {
+		$mountPoints = self::readData(true);
+		$backends = self::getBackends();
+		$uid = OCP\User::getUser();
+		$personal = array();
+		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
+			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
+				// Remove '/uid/files/' from mount point
+				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
+			}
+		}
+		return $personal;
+	}
+
+	
+	/**
+	* Add a mount point to the filesystem
+	* @param string Mount point
+	* @param string Backend class
+	* @param array Backend parameters for the class
+	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
+	* @param string User or group to apply mount to
+	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page
+	* @return bool
+	*/
+	public static function addMountPoint($mountPoint, $class, $classOptions, $mountType, $applicable, $isPersonal = false) {
+		if ($isPersonal) {
+			// Verify that the mount point applies for the current user
+			// Prevent non-admin users from mounting local storage
+			if ($applicable != OCP\User::getUser() || $class == 'OC_Filestorage_Local') {
+				return false;
+			}
+			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
+		} else {
+			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
+		}
+		$mount = array($applicable => array($mountPoint => array('class' => $class, 'options' => $classOptions)));
+		$mountPoints = self::readData($isPersonal);
+		// Merge the new mount point into the current mount points
+		if (isset($mountPoints[$mountType])) {
+			if (isset($mountPoints[$mountType][$applicable])) {
+				$mountPoints[$mountType][$applicable] = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
+			} else {
+				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
+			}
+		} else {
+			$mountPoints[$mountType] = $mount;
+		}
+		self::writeData($isPersonal, $mountPoints);
+		return true;
+	}
+
+	/**
+	*
+	* @param string Mount point
+	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
+	* @param string User or group to remove mount from
+	* @param bool Personal or system mount point
+	* @return bool
+	*/
+	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
+		// Verify that the mount point applies for the current user
+		if ($isPersonal) {
+			if ($applicable != OCP\User::getUser()) {
+				return false;
+			}
+			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
+		} else {
+			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
+		}
+		$mountPoints = self::readData($isPersonal);
+		// Remove mount point
+		unset($mountPoints[$mountType][$applicable][$mountPoint]);
+		// Unset parent arrays if empty
+		if (empty($mountPoints[$mountType][$applicable])) {
+			unset($mountPoints[$mountType][$applicable]);
+			if (empty($mountPoints[$mountType])) {
+				unset($mountPoints[$mountType]);
+			}
+		}
+		self::writeData($isPersonal, $mountPoints);
+		return true;
+	}
+
+	/**
+	* Read the mount points in the config file into an array
+	* @param bool Personal or system config file
+	* @return array
+	*/
+	private static function readData($isPersonal) {
+		if ($isPersonal) {
+			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
+		} else {
+			$file = OC::$SERVERROOT.'/config/mount.php';
+		}
+		if (is_file($file)) {
+			$mountPoints = include($file);
+			if (is_array($mountPoints)) {
+				return $mountPoints;
+			}
+		}
+		return array();
+	}
+
+	/**
+	* Write the mount points to the config file
+	* @param bool Personal or system config file
+	* @param array Mount points
+	*/
+	private static function writeData($isPersonal, $data) {
+		if ($isPersonal) {
+			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
+		} else {
+			$file = OC::$SERVERROOT.'/config/mount.php';
+		}
+		$content = "<?php return array (\n";
+		if (isset($data[self::MOUNT_TYPE_GROUP])) {
+			$content .= "\t'group' => array (\n";
+			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
+				$content .= "\t\t'".$group."' => array (\n";
+				foreach ($mounts as $mountPoint => $mount) {
+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+					
+				}
+				$content .= "\t\t),\n";
+			}
+			$content .= "\t),\n";
+		}
+		if (isset($data[self::MOUNT_TYPE_USER])) {
+			$content .= "\t'user' => array (\n";
+			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
+				$content .= "\t\t'".$user."' => array (\n";
+				foreach ($mounts as $mountPoint => $mount) {
+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+				}
+				$content .= "\t\t),\n";
+			}
+			$content .= "\t),\n";
+		}
+		$content .= ");\n?>";
+		@file_put_contents($file, $content);
+	}
+	
 	/**
 	 * Returns all user uploaded ssl root certificates
 	 * @return array
 	 */
-	public static function getCertificates() {
-		$view = \OCP\Files::getStorage('files_external');
-		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
-		if (!is_dir($path)) mkdir($path);
-		$result = array();
-		$handle = opendir($path);
-		while (false !== ($file = readdir($handle))) {
-			if($file != '.' && $file != '..') $result[] = $file;
-		}
-		return $result;
-	}
-	
-	/**
-	 * creates certificate bundle
-	 */
-	public static function createCertificateBundle() {
+	public static function getCertificates() {
+		$view = \OCP\Files::getStorage('files_external');
+		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
+		if (!is_dir($path)) mkdir($path);
+		$result = array();
+		$handle = opendir($path);
+		while (false !== ($file = readdir($handle))) {
+			if($file != '.' && $file != '..') $result[] = $file;
+		}
+		return $result;
+	}
+	
+	/**
+	 * creates certificate bundle
+	 */
+	public static function createCertificateBundle() {
 		$view = \OCP\Files::getStorage("files_external");
 		$path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("");
 		
@@ -267,17 +267,17 @@ class OC_Mount_Config {
 			$file=$path.'/uploads/'.$cert;
 			$fh = fopen($file, "r");
 			$data = fread($fh, filesize($file));
-			fclose($fh);
+			fclose($fh);
 			if (strpos($data, 'BEGIN CERTIFICATE')) {
-				fwrite($fh_certs, $data);
+				fwrite($fh_certs, $data);
 			}
 		}
 		
-		fclose($fh_certs);
-		
-		return true;
-	} 
-
-}
-
+		fclose($fh_certs);
+		
+		return true;
+	} 
+
+}
+
 ?>
\ No newline at end of file
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index e8bc94790d..397f0d951b 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -15,7 +15,7 @@
 			<tbody width="100%">
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
-				<tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>>
+				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
 					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">

From 19446fb22fed1b92a32b1713c6027ed38bd1178c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 13 Aug 2012 23:19:31 +0200
Subject: [PATCH 1440/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/ca.php     |  14 ++
 apps/admin_dependencies_chk/l10n/sv.php     |  14 ++
 apps/admin_migrate/l10n/ca.php              |   5 +
 apps/admin_migrate/l10n/es.php              |   5 +
 apps/admin_migrate/l10n/gl.php              |   5 +
 apps/admin_migrate/l10n/pl.php              |   5 +
 apps/admin_migrate/l10n/sv.php              |   5 +
 apps/calendar/l10n/de.php                   |   5 +
 apps/contacts/l10n/de.php                   |   1 +
 apps/files_encryption/l10n/ca.php           |   6 +
 apps/files_encryption/l10n/de.php           |   6 +
 apps/files_encryption/l10n/pl.php           |   6 +
 apps/files_encryption/l10n/sv.php           |   6 +
 apps/files_external/l10n/ca.php             |  18 +++
 apps/files_external/l10n/sv.php             |  18 +++
 apps/files_sharing/l10n/ca.php              |  11 ++
 apps/files_sharing/l10n/pl.php              |  11 ++
 apps/files_sharing/l10n/sv.php              |  11 ++
 apps/files_versions/l10n/ca.php             |   4 +
 apps/files_versions/l10n/pl.php             |   4 +
 apps/files_versions/l10n/sv.php             |   4 +
 apps/tasks/l10n/ca.php                      |  24 +++
 apps/tasks/l10n/sv.php                      |  24 +++
 apps/user_ldap/l10n/ca.php                  |  36 +++++
 apps/user_ldap/l10n/sv.php                  |  36 +++++
 apps/user_migrate/l10n/ca.php               |  10 ++
 apps/user_migrate/l10n/sv.php               |  10 ++
 apps/user_openid/l10n/ca.php                |  11 ++
 apps/user_openid/l10n/sv.php                |  11 ++
 l10n/af/admin_dependencies_chk.po           |  73 +++++++++
 l10n/af/admin_migrate.po                    |  32 ++++
 l10n/af/files_encryption.po                 |  34 ++++
 l10n/af/files_external.po                   |  82 ++++++++++
 l10n/af/files_sharing.po                    |  54 +++++++
 l10n/af/files_versions.po                   |  26 +++
 l10n/af/tasks.po                            | 106 +++++++++++++
 l10n/af/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/af/user_migrate.po                     |  51 ++++++
 l10n/af/user_openid.po                      |  54 +++++++
 l10n/ar/admin_dependencies_chk.po           |  73 +++++++++
 l10n/ar/admin_migrate.po                    |  32 ++++
 l10n/ar/files_encryption.po                 |  34 ++++
 l10n/ar/files_external.po                   |  82 ++++++++++
 l10n/ar/files_sharing.po                    |  54 +++++++
 l10n/ar/files_versions.po                   |  26 +++
 l10n/ar/tasks.po                            | 106 +++++++++++++
 l10n/ar/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/ar/user_migrate.po                     |  51 ++++++
 l10n/ar/user_openid.po                      |  54 +++++++
 l10n/ar_SA/admin_dependencies_chk.po        |  73 +++++++++
 l10n/ar_SA/admin_migrate.po                 |  32 ++++
 l10n/ar_SA/files_encryption.po              |  34 ++++
 l10n/ar_SA/files_external.po                |  82 ++++++++++
 l10n/ar_SA/files_sharing.po                 |  54 +++++++
 l10n/ar_SA/files_versions.po                |  26 +++
 l10n/ar_SA/tasks.po                         | 106 +++++++++++++
 l10n/ar_SA/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/ar_SA/user_migrate.po                  |  51 ++++++
 l10n/ar_SA/user_openid.po                   |  54 +++++++
 l10n/bg_BG/admin_dependencies_chk.po        |  73 +++++++++
 l10n/bg_BG/admin_migrate.po                 |  32 ++++
 l10n/bg_BG/files_encryption.po              |  34 ++++
 l10n/bg_BG/files_external.po                |  82 ++++++++++
 l10n/bg_BG/files_sharing.po                 |  54 +++++++
 l10n/bg_BG/files_versions.po                |  26 +++
 l10n/bg_BG/tasks.po                         | 106 +++++++++++++
 l10n/bg_BG/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/bg_BG/user_migrate.po                  |  51 ++++++
 l10n/bg_BG/user_openid.po                   |  54 +++++++
 l10n/ca/admin_dependencies_chk.po           |  74 +++++++++
 l10n/ca/admin_migrate.po                    |  33 ++++
 l10n/ca/files_encryption.po                 |  35 +++++
 l10n/ca/files_external.po                   |  83 ++++++++++
 l10n/ca/files_sharing.po                    |  55 +++++++
 l10n/ca/files_versions.po                   |  27 ++++
 l10n/ca/tasks.po                            | 107 +++++++++++++
 l10n/ca/user_ldap.po                        | 165 ++++++++++++++++++++
 l10n/ca/user_migrate.po                     |  52 ++++++
 l10n/ca/user_openid.po                      |  55 +++++++
 l10n/cs_CZ/admin_dependencies_chk.po        |  73 +++++++++
 l10n/cs_CZ/admin_migrate.po                 |  32 ++++
 l10n/cs_CZ/files_encryption.po              |  34 ++++
 l10n/cs_CZ/files_external.po                |  82 ++++++++++
 l10n/cs_CZ/files_sharing.po                 |  54 +++++++
 l10n/cs_CZ/files_versions.po                |  26 +++
 l10n/cs_CZ/tasks.po                         | 106 +++++++++++++
 l10n/cs_CZ/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/cs_CZ/user_migrate.po                  |  51 ++++++
 l10n/cs_CZ/user_openid.po                   |  54 +++++++
 l10n/da/admin_dependencies_chk.po           |  73 +++++++++
 l10n/da/admin_migrate.po                    |  32 ++++
 l10n/da/files_encryption.po                 |  34 ++++
 l10n/da/files_external.po                   |  82 ++++++++++
 l10n/da/files_sharing.po                    |  54 +++++++
 l10n/da/files_versions.po                   |  26 +++
 l10n/da/tasks.po                            | 106 +++++++++++++
 l10n/da/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/da/user_migrate.po                     |  51 ++++++
 l10n/da/user_openid.po                      |  54 +++++++
 l10n/de/admin_dependencies_chk.po           |  73 +++++++++
 l10n/de/admin_migrate.po                    |  32 ++++
 l10n/de/calendar.po                         |  17 +-
 l10n/de/contacts.po                         |  13 +-
 l10n/de/files_encryption.po                 |  35 +++++
 l10n/de/files_external.po                   |  82 ++++++++++
 l10n/de/files_sharing.po                    |  54 +++++++
 l10n/de/files_versions.po                   |  26 +++
 l10n/de/tasks.po                            | 106 +++++++++++++
 l10n/de/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/de/user_migrate.po                     |  51 ++++++
 l10n/de/user_openid.po                      |  54 +++++++
 l10n/el/admin_dependencies_chk.po           |  73 +++++++++
 l10n/el/admin_migrate.po                    |  32 ++++
 l10n/el/files_encryption.po                 |  34 ++++
 l10n/el/files_external.po                   |  82 ++++++++++
 l10n/el/files_sharing.po                    |  54 +++++++
 l10n/el/files_versions.po                   |  26 +++
 l10n/el/tasks.po                            | 106 +++++++++++++
 l10n/el/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/el/user_migrate.po                     |  51 ++++++
 l10n/el/user_openid.po                      |  54 +++++++
 l10n/eo/admin_dependencies_chk.po           |  73 +++++++++
 l10n/eo/admin_migrate.po                    |  32 ++++
 l10n/eo/files_encryption.po                 |  34 ++++
 l10n/eo/files_external.po                   |  82 ++++++++++
 l10n/eo/files_sharing.po                    |  54 +++++++
 l10n/eo/files_versions.po                   |  26 +++
 l10n/eo/tasks.po                            | 106 +++++++++++++
 l10n/eo/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/eo/user_migrate.po                     |  51 ++++++
 l10n/eo/user_openid.po                      |  54 +++++++
 l10n/es/admin_dependencies_chk.po           |  73 +++++++++
 l10n/es/admin_migrate.po                    |  33 ++++
 l10n/es/files_encryption.po                 |  34 ++++
 l10n/es/files_external.po                   |  82 ++++++++++
 l10n/es/files_sharing.po                    |  54 +++++++
 l10n/es/files_versions.po                   |  26 +++
 l10n/es/tasks.po                            | 106 +++++++++++++
 l10n/es/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/es/user_migrate.po                     |  51 ++++++
 l10n/es/user_openid.po                      |  54 +++++++
 l10n/et_EE/admin_dependencies_chk.po        |  73 +++++++++
 l10n/et_EE/admin_migrate.po                 |  32 ++++
 l10n/et_EE/files_encryption.po              |  34 ++++
 l10n/et_EE/files_external.po                |  82 ++++++++++
 l10n/et_EE/files_sharing.po                 |  54 +++++++
 l10n/et_EE/files_versions.po                |  26 +++
 l10n/et_EE/tasks.po                         | 106 +++++++++++++
 l10n/et_EE/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/et_EE/user_migrate.po                  |  51 ++++++
 l10n/et_EE/user_openid.po                   |  54 +++++++
 l10n/eu/admin_dependencies_chk.po           |  73 +++++++++
 l10n/eu/admin_migrate.po                    |  32 ++++
 l10n/eu/files_encryption.po                 |  34 ++++
 l10n/eu/files_external.po                   |  82 ++++++++++
 l10n/eu/files_sharing.po                    |  54 +++++++
 l10n/eu/files_versions.po                   |  26 +++
 l10n/eu/tasks.po                            | 106 +++++++++++++
 l10n/eu/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/eu/user_migrate.po                     |  51 ++++++
 l10n/eu/user_openid.po                      |  54 +++++++
 l10n/eu_ES/admin_dependencies_chk.po        |  73 +++++++++
 l10n/eu_ES/admin_migrate.po                 |  32 ++++
 l10n/eu_ES/files_encryption.po              |  34 ++++
 l10n/eu_ES/files_external.po                |  82 ++++++++++
 l10n/eu_ES/files_sharing.po                 |  54 +++++++
 l10n/eu_ES/files_versions.po                |  26 +++
 l10n/eu_ES/tasks.po                         | 106 +++++++++++++
 l10n/eu_ES/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/eu_ES/user_migrate.po                  |  51 ++++++
 l10n/eu_ES/user_openid.po                   |  54 +++++++
 l10n/fa/admin_dependencies_chk.po           |  73 +++++++++
 l10n/fa/admin_migrate.po                    |  32 ++++
 l10n/fa/files_encryption.po                 |  34 ++++
 l10n/fa/files_external.po                   |  82 ++++++++++
 l10n/fa/files_sharing.po                    |  54 +++++++
 l10n/fa/files_versions.po                   |  26 +++
 l10n/fa/tasks.po                            | 106 +++++++++++++
 l10n/fa/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/fa/user_migrate.po                     |  51 ++++++
 l10n/fa/user_openid.po                      |  54 +++++++
 l10n/fi/admin_dependencies_chk.po           |  73 +++++++++
 l10n/fi/admin_migrate.po                    |  32 ++++
 l10n/fi/files_encryption.po                 |  34 ++++
 l10n/fi/files_external.po                   |  82 ++++++++++
 l10n/fi/files_sharing.po                    |  54 +++++++
 l10n/fi/files_versions.po                   |  26 +++
 l10n/fi/tasks.po                            | 106 +++++++++++++
 l10n/fi/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/fi/user_migrate.po                     |  51 ++++++
 l10n/fi/user_openid.po                      |  54 +++++++
 l10n/fi_FI/admin_dependencies_chk.po        |  73 +++++++++
 l10n/fi_FI/admin_migrate.po                 |  32 ++++
 l10n/fi_FI/files_encryption.po              |  34 ++++
 l10n/fi_FI/files_external.po                |  82 ++++++++++
 l10n/fi_FI/files_sharing.po                 |  54 +++++++
 l10n/fi_FI/files_versions.po                |  26 +++
 l10n/fi_FI/tasks.po                         | 106 +++++++++++++
 l10n/fi_FI/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/fi_FI/user_migrate.po                  |  51 ++++++
 l10n/fi_FI/user_openid.po                   |  54 +++++++
 l10n/fr/admin_dependencies_chk.po           |  73 +++++++++
 l10n/fr/admin_migrate.po                    |  32 ++++
 l10n/fr/files_encryption.po                 |  34 ++++
 l10n/fr/files_external.po                   |  82 ++++++++++
 l10n/fr/files_sharing.po                    |  54 +++++++
 l10n/fr/files_versions.po                   |  26 +++
 l10n/fr/tasks.po                            | 106 +++++++++++++
 l10n/fr/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/fr/user_migrate.po                     |  51 ++++++
 l10n/fr/user_openid.po                      |  54 +++++++
 l10n/gl/admin_dependencies_chk.po           |  73 +++++++++
 l10n/gl/admin_migrate.po                    |  33 ++++
 l10n/gl/files_encryption.po                 |  34 ++++
 l10n/gl/files_external.po                   |  82 ++++++++++
 l10n/gl/files_sharing.po                    |  54 +++++++
 l10n/gl/files_versions.po                   |  26 +++
 l10n/gl/tasks.po                            | 106 +++++++++++++
 l10n/gl/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/gl/user_migrate.po                     |  51 ++++++
 l10n/gl/user_openid.po                      |  54 +++++++
 l10n/he/admin_dependencies_chk.po           |  73 +++++++++
 l10n/he/admin_migrate.po                    |  32 ++++
 l10n/he/files_encryption.po                 |  34 ++++
 l10n/he/files_external.po                   |  82 ++++++++++
 l10n/he/files_sharing.po                    |  54 +++++++
 l10n/he/files_versions.po                   |  26 +++
 l10n/he/tasks.po                            | 106 +++++++++++++
 l10n/he/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/he/user_migrate.po                     |  51 ++++++
 l10n/he/user_openid.po                      |  54 +++++++
 l10n/hr/admin_dependencies_chk.po           |  73 +++++++++
 l10n/hr/admin_migrate.po                    |  32 ++++
 l10n/hr/files_encryption.po                 |  34 ++++
 l10n/hr/files_external.po                   |  82 ++++++++++
 l10n/hr/files_sharing.po                    |  54 +++++++
 l10n/hr/files_versions.po                   |  26 +++
 l10n/hr/tasks.po                            | 106 +++++++++++++
 l10n/hr/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/hr/user_migrate.po                     |  51 ++++++
 l10n/hr/user_openid.po                      |  54 +++++++
 l10n/hu_HU/admin_dependencies_chk.po        |  73 +++++++++
 l10n/hu_HU/admin_migrate.po                 |  32 ++++
 l10n/hu_HU/files_encryption.po              |  34 ++++
 l10n/hu_HU/files_external.po                |  82 ++++++++++
 l10n/hu_HU/files_sharing.po                 |  54 +++++++
 l10n/hu_HU/files_versions.po                |  26 +++
 l10n/hu_HU/tasks.po                         | 106 +++++++++++++
 l10n/hu_HU/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/hu_HU/user_migrate.po                  |  51 ++++++
 l10n/hu_HU/user_openid.po                   |  54 +++++++
 l10n/hy/admin_dependencies_chk.po           |  73 +++++++++
 l10n/hy/admin_migrate.po                    |  32 ++++
 l10n/hy/files_encryption.po                 |  34 ++++
 l10n/hy/files_external.po                   |  82 ++++++++++
 l10n/hy/files_sharing.po                    |  54 +++++++
 l10n/hy/files_versions.po                   |  26 +++
 l10n/hy/tasks.po                            | 106 +++++++++++++
 l10n/hy/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/hy/user_migrate.po                     |  51 ++++++
 l10n/hy/user_openid.po                      |  54 +++++++
 l10n/ia/admin_dependencies_chk.po           |  73 +++++++++
 l10n/ia/admin_migrate.po                    |  32 ++++
 l10n/ia/files_encryption.po                 |  34 ++++
 l10n/ia/files_external.po                   |  82 ++++++++++
 l10n/ia/files_sharing.po                    |  54 +++++++
 l10n/ia/files_versions.po                   |  26 +++
 l10n/ia/tasks.po                            | 106 +++++++++++++
 l10n/ia/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/ia/user_migrate.po                     |  51 ++++++
 l10n/ia/user_openid.po                      |  54 +++++++
 l10n/id/admin_dependencies_chk.po           |  73 +++++++++
 l10n/id/admin_migrate.po                    |  32 ++++
 l10n/id/files_encryption.po                 |  34 ++++
 l10n/id/files_external.po                   |  82 ++++++++++
 l10n/id/files_sharing.po                    |  54 +++++++
 l10n/id/files_versions.po                   |  26 +++
 l10n/id/tasks.po                            | 106 +++++++++++++
 l10n/id/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/id/user_migrate.po                     |  51 ++++++
 l10n/id/user_openid.po                      |  54 +++++++
 l10n/id_ID/admin_dependencies_chk.po        |  73 +++++++++
 l10n/id_ID/admin_migrate.po                 |  32 ++++
 l10n/id_ID/files_encryption.po              |  34 ++++
 l10n/id_ID/files_external.po                |  82 ++++++++++
 l10n/id_ID/files_sharing.po                 |  54 +++++++
 l10n/id_ID/files_versions.po                |  26 +++
 l10n/id_ID/tasks.po                         | 106 +++++++++++++
 l10n/id_ID/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/id_ID/user_migrate.po                  |  51 ++++++
 l10n/id_ID/user_openid.po                   |  54 +++++++
 l10n/it/admin_dependencies_chk.po           |  73 +++++++++
 l10n/it/admin_migrate.po                    |  32 ++++
 l10n/it/files_encryption.po                 |  34 ++++
 l10n/it/files_external.po                   |  82 ++++++++++
 l10n/it/files_sharing.po                    |  54 +++++++
 l10n/it/files_versions.po                   |  26 +++
 l10n/it/tasks.po                            | 106 +++++++++++++
 l10n/it/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/it/user_migrate.po                     |  51 ++++++
 l10n/it/user_openid.po                      |  54 +++++++
 l10n/ja_JP/admin_dependencies_chk.po        |  73 +++++++++
 l10n/ja_JP/admin_migrate.po                 |  32 ++++
 l10n/ja_JP/files_encryption.po              |  34 ++++
 l10n/ja_JP/files_external.po                |  82 ++++++++++
 l10n/ja_JP/files_sharing.po                 |  54 +++++++
 l10n/ja_JP/files_versions.po                |  26 +++
 l10n/ja_JP/tasks.po                         | 106 +++++++++++++
 l10n/ja_JP/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/ja_JP/user_migrate.po                  |  51 ++++++
 l10n/ja_JP/user_openid.po                   |  54 +++++++
 l10n/ko/admin_dependencies_chk.po           |  73 +++++++++
 l10n/ko/admin_migrate.po                    |  32 ++++
 l10n/ko/files_encryption.po                 |  34 ++++
 l10n/ko/files_external.po                   |  82 ++++++++++
 l10n/ko/files_sharing.po                    |  54 +++++++
 l10n/ko/files_versions.po                   |  26 +++
 l10n/ko/tasks.po                            | 106 +++++++++++++
 l10n/ko/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/ko/user_migrate.po                     |  51 ++++++
 l10n/ko/user_openid.po                      |  54 +++++++
 l10n/lb/admin_dependencies_chk.po           |  73 +++++++++
 l10n/lb/admin_migrate.po                    |  32 ++++
 l10n/lb/files_encryption.po                 |  34 ++++
 l10n/lb/files_external.po                   |  82 ++++++++++
 l10n/lb/files_sharing.po                    |  54 +++++++
 l10n/lb/files_versions.po                   |  26 +++
 l10n/lb/tasks.po                            | 106 +++++++++++++
 l10n/lb/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/lb/user_migrate.po                     |  51 ++++++
 l10n/lb/user_openid.po                      |  54 +++++++
 l10n/lt_LT/admin_dependencies_chk.po        |  73 +++++++++
 l10n/lt_LT/admin_migrate.po                 |  32 ++++
 l10n/lt_LT/files_encryption.po              |  34 ++++
 l10n/lt_LT/files_external.po                |  82 ++++++++++
 l10n/lt_LT/files_sharing.po                 |  54 +++++++
 l10n/lt_LT/files_versions.po                |  26 +++
 l10n/lt_LT/tasks.po                         | 106 +++++++++++++
 l10n/lt_LT/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/lt_LT/user_migrate.po                  |  51 ++++++
 l10n/lt_LT/user_openid.po                   |  54 +++++++
 l10n/lv/admin_dependencies_chk.po           |  73 +++++++++
 l10n/lv/admin_migrate.po                    |  32 ++++
 l10n/lv/files_encryption.po                 |  34 ++++
 l10n/lv/files_external.po                   |  82 ++++++++++
 l10n/lv/files_sharing.po                    |  54 +++++++
 l10n/lv/files_versions.po                   |  26 +++
 l10n/lv/tasks.po                            | 106 +++++++++++++
 l10n/lv/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/lv/user_migrate.po                     |  51 ++++++
 l10n/lv/user_openid.po                      |  54 +++++++
 l10n/mk/admin_dependencies_chk.po           |  73 +++++++++
 l10n/mk/admin_migrate.po                    |  32 ++++
 l10n/mk/files_encryption.po                 |  34 ++++
 l10n/mk/files_external.po                   |  82 ++++++++++
 l10n/mk/files_sharing.po                    |  54 +++++++
 l10n/mk/files_versions.po                   |  26 +++
 l10n/mk/tasks.po                            | 106 +++++++++++++
 l10n/mk/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/mk/user_migrate.po                     |  51 ++++++
 l10n/mk/user_openid.po                      |  54 +++++++
 l10n/ms_MY/admin_dependencies_chk.po        |  73 +++++++++
 l10n/ms_MY/admin_migrate.po                 |  32 ++++
 l10n/ms_MY/files_encryption.po              |  34 ++++
 l10n/ms_MY/files_external.po                |  82 ++++++++++
 l10n/ms_MY/files_sharing.po                 |  54 +++++++
 l10n/ms_MY/files_versions.po                |  26 +++
 l10n/ms_MY/tasks.po                         | 106 +++++++++++++
 l10n/ms_MY/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/ms_MY/user_migrate.po                  |  51 ++++++
 l10n/ms_MY/user_openid.po                   |  54 +++++++
 l10n/nb_NO/admin_dependencies_chk.po        |  73 +++++++++
 l10n/nb_NO/admin_migrate.po                 |  32 ++++
 l10n/nb_NO/files_encryption.po              |  34 ++++
 l10n/nb_NO/files_external.po                |  82 ++++++++++
 l10n/nb_NO/files_sharing.po                 |  54 +++++++
 l10n/nb_NO/files_versions.po                |  26 +++
 l10n/nb_NO/tasks.po                         | 106 +++++++++++++
 l10n/nb_NO/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/nb_NO/user_migrate.po                  |  51 ++++++
 l10n/nb_NO/user_openid.po                   |  54 +++++++
 l10n/nl/admin_dependencies_chk.po           |  73 +++++++++
 l10n/nl/admin_migrate.po                    |  32 ++++
 l10n/nl/files_encryption.po                 |  34 ++++
 l10n/nl/files_external.po                   |  82 ++++++++++
 l10n/nl/files_sharing.po                    |  54 +++++++
 l10n/nl/files_versions.po                   |  26 +++
 l10n/nl/tasks.po                            | 106 +++++++++++++
 l10n/nl/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/nl/user_migrate.po                     |  51 ++++++
 l10n/nl/user_openid.po                      |  54 +++++++
 l10n/nn_NO/admin_dependencies_chk.po        |  73 +++++++++
 l10n/nn_NO/admin_migrate.po                 |  32 ++++
 l10n/nn_NO/files_encryption.po              |  34 ++++
 l10n/nn_NO/files_external.po                |  82 ++++++++++
 l10n/nn_NO/files_sharing.po                 |  54 +++++++
 l10n/nn_NO/files_versions.po                |  26 +++
 l10n/nn_NO/tasks.po                         | 106 +++++++++++++
 l10n/nn_NO/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/nn_NO/user_migrate.po                  |  51 ++++++
 l10n/nn_NO/user_openid.po                   |  54 +++++++
 l10n/pl/admin_dependencies_chk.po           |  73 +++++++++
 l10n/pl/admin_migrate.po                    |  33 ++++
 l10n/pl/files_encryption.po                 |  35 +++++
 l10n/pl/files_external.po                   |  82 ++++++++++
 l10n/pl/files_sharing.po                    |  55 +++++++
 l10n/pl/files_versions.po                   |  27 ++++
 l10n/pl/tasks.po                            | 106 +++++++++++++
 l10n/pl/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/pl/user_migrate.po                     |  51 ++++++
 l10n/pl/user_openid.po                      |  54 +++++++
 l10n/pt_BR/admin_dependencies_chk.po        |  73 +++++++++
 l10n/pt_BR/admin_migrate.po                 |  32 ++++
 l10n/pt_BR/files_encryption.po              |  34 ++++
 l10n/pt_BR/files_external.po                |  82 ++++++++++
 l10n/pt_BR/files_sharing.po                 |  54 +++++++
 l10n/pt_BR/files_versions.po                |  26 +++
 l10n/pt_BR/tasks.po                         | 106 +++++++++++++
 l10n/pt_BR/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/pt_BR/user_migrate.po                  |  51 ++++++
 l10n/pt_BR/user_openid.po                   |  54 +++++++
 l10n/pt_PT/admin_dependencies_chk.po        |  73 +++++++++
 l10n/pt_PT/admin_migrate.po                 |  32 ++++
 l10n/pt_PT/files_encryption.po              |  34 ++++
 l10n/pt_PT/files_external.po                |  82 ++++++++++
 l10n/pt_PT/files_sharing.po                 |  54 +++++++
 l10n/pt_PT/files_versions.po                |  26 +++
 l10n/pt_PT/tasks.po                         | 106 +++++++++++++
 l10n/pt_PT/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/pt_PT/user_migrate.po                  |  51 ++++++
 l10n/pt_PT/user_openid.po                   |  54 +++++++
 l10n/ro/admin_dependencies_chk.po           |  73 +++++++++
 l10n/ro/admin_migrate.po                    |  32 ++++
 l10n/ro/files_encryption.po                 |  34 ++++
 l10n/ro/files_external.po                   |  82 ++++++++++
 l10n/ro/files_sharing.po                    |  54 +++++++
 l10n/ro/files_versions.po                   |  26 +++
 l10n/ro/tasks.po                            | 106 +++++++++++++
 l10n/ro/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/ro/user_migrate.po                     |  51 ++++++
 l10n/ro/user_openid.po                      |  54 +++++++
 l10n/ru/admin_dependencies_chk.po           |  73 +++++++++
 l10n/ru/admin_migrate.po                    |  32 ++++
 l10n/ru/files_encryption.po                 |  34 ++++
 l10n/ru/files_external.po                   |  82 ++++++++++
 l10n/ru/files_sharing.po                    |  54 +++++++
 l10n/ru/files_versions.po                   |  26 +++
 l10n/ru/tasks.po                            | 106 +++++++++++++
 l10n/ru/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/ru/user_migrate.po                     |  51 ++++++
 l10n/ru/user_openid.po                      |  54 +++++++
 l10n/sk_SK/admin_dependencies_chk.po        |  73 +++++++++
 l10n/sk_SK/admin_migrate.po                 |  32 ++++
 l10n/sk_SK/files_encryption.po              |  34 ++++
 l10n/sk_SK/files_external.po                |  82 ++++++++++
 l10n/sk_SK/files_sharing.po                 |  54 +++++++
 l10n/sk_SK/files_versions.po                |  26 +++
 l10n/sk_SK/tasks.po                         | 106 +++++++++++++
 l10n/sk_SK/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/sk_SK/user_migrate.po                  |  51 ++++++
 l10n/sk_SK/user_openid.po                   |  54 +++++++
 l10n/sl/admin_dependencies_chk.po           |  73 +++++++++
 l10n/sl/admin_migrate.po                    |  32 ++++
 l10n/sl/files_encryption.po                 |  34 ++++
 l10n/sl/files_external.po                   |  82 ++++++++++
 l10n/sl/files_sharing.po                    |  54 +++++++
 l10n/sl/files_versions.po                   |  26 +++
 l10n/sl/tasks.po                            | 106 +++++++++++++
 l10n/sl/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/sl/user_migrate.po                     |  51 ++++++
 l10n/sl/user_openid.po                      |  54 +++++++
 l10n/so/admin_dependencies_chk.po           |  73 +++++++++
 l10n/so/admin_migrate.po                    |  32 ++++
 l10n/so/files_encryption.po                 |  34 ++++
 l10n/so/files_external.po                   |  82 ++++++++++
 l10n/so/files_sharing.po                    |  54 +++++++
 l10n/so/files_versions.po                   |  26 +++
 l10n/so/tasks.po                            | 106 +++++++++++++
 l10n/so/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/so/user_migrate.po                     |  51 ++++++
 l10n/so/user_openid.po                      |  54 +++++++
 l10n/sr/admin_dependencies_chk.po           |  73 +++++++++
 l10n/sr/admin_migrate.po                    |  32 ++++
 l10n/sr/files_encryption.po                 |  34 ++++
 l10n/sr/files_external.po                   |  82 ++++++++++
 l10n/sr/files_sharing.po                    |  54 +++++++
 l10n/sr/files_versions.po                   |  26 +++
 l10n/sr/tasks.po                            | 106 +++++++++++++
 l10n/sr/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/sr/user_migrate.po                     |  51 ++++++
 l10n/sr/user_openid.po                      |  54 +++++++
 l10n/sr@latin/admin_dependencies_chk.po     |  73 +++++++++
 l10n/sr@latin/admin_migrate.po              |  32 ++++
 l10n/sr@latin/files_encryption.po           |  34 ++++
 l10n/sr@latin/files_external.po             |  82 ++++++++++
 l10n/sr@latin/files_sharing.po              |  54 +++++++
 l10n/sr@latin/files_versions.po             |  26 +++
 l10n/sr@latin/tasks.po                      | 106 +++++++++++++
 l10n/sr@latin/user_ldap.po                  | 164 +++++++++++++++++++
 l10n/sr@latin/user_migrate.po               |  51 ++++++
 l10n/sr@latin/user_openid.po                |  54 +++++++
 l10n/sv/admin_dependencies_chk.po           |  74 +++++++++
 l10n/sv/admin_migrate.po                    |  33 ++++
 l10n/sv/files_encryption.po                 |  35 +++++
 l10n/sv/files_external.po                   |  83 ++++++++++
 l10n/sv/files_sharing.po                    |  55 +++++++
 l10n/sv/files_versions.po                   |  27 ++++
 l10n/sv/tasks.po                            | 107 +++++++++++++
 l10n/sv/user_ldap.po                        | 165 ++++++++++++++++++++
 l10n/sv/user_migrate.po                     |  52 ++++++
 l10n/sv/user_openid.po                      |  55 +++++++
 l10n/templates/admin_dependencies_chk.pot   |   2 +-
 l10n/templates/admin_migrate.pot            |   2 +-
 l10n/templates/bookmarks.pot                |   2 +-
 l10n/templates/calendar.pot                 |   2 +-
 l10n/templates/contacts.pot                 |   6 +-
 l10n/templates/core.pot                     |   2 +-
 l10n/templates/files.pot                    |   2 +-
 l10n/templates/files_encryption.pot         |   2 +-
 l10n/templates/files_external.pot           |   2 +-
 l10n/templates/files_sharing.pot            |   2 +-
 l10n/templates/files_versions.pot           |   2 +-
 l10n/templates/gallery.pot                  |   2 +-
 l10n/templates/lib.pot                      |   2 +-
 l10n/templates/media.pot                    |   2 +-
 l10n/templates/settings.pot                 |   2 +-
 l10n/templates/tasks.pot                    |   2 +-
 l10n/templates/user_ldap.pot                |   2 +-
 l10n/templates/user_migrate.pot             |   2 +-
 l10n/templates/user_openid.pot              |   2 +-
 l10n/th_TH/admin_dependencies_chk.po        |  73 +++++++++
 l10n/th_TH/admin_migrate.po                 |  32 ++++
 l10n/th_TH/files_encryption.po              |  34 ++++
 l10n/th_TH/files_external.po                |  82 ++++++++++
 l10n/th_TH/files_sharing.po                 |  54 +++++++
 l10n/th_TH/files_versions.po                |  26 +++
 l10n/th_TH/tasks.po                         | 106 +++++++++++++
 l10n/th_TH/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/th_TH/user_migrate.po                  |  51 ++++++
 l10n/th_TH/user_openid.po                   |  54 +++++++
 l10n/tr/admin_dependencies_chk.po           |  73 +++++++++
 l10n/tr/admin_migrate.po                    |  32 ++++
 l10n/tr/files_encryption.po                 |  34 ++++
 l10n/tr/files_external.po                   |  82 ++++++++++
 l10n/tr/files_sharing.po                    |  54 +++++++
 l10n/tr/files_versions.po                   |  26 +++
 l10n/tr/tasks.po                            | 106 +++++++++++++
 l10n/tr/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/tr/user_migrate.po                     |  51 ++++++
 l10n/tr/user_openid.po                      |  54 +++++++
 l10n/uk/admin_dependencies_chk.po           |  73 +++++++++
 l10n/uk/admin_migrate.po                    |  32 ++++
 l10n/uk/files_encryption.po                 |  34 ++++
 l10n/uk/files_external.po                   |  82 ++++++++++
 l10n/uk/files_sharing.po                    |  54 +++++++
 l10n/uk/files_versions.po                   |  26 +++
 l10n/uk/tasks.po                            | 106 +++++++++++++
 l10n/uk/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/uk/user_migrate.po                     |  51 ++++++
 l10n/uk/user_openid.po                      |  54 +++++++
 l10n/vi/admin_dependencies_chk.po           |  73 +++++++++
 l10n/vi/admin_migrate.po                    |  32 ++++
 l10n/vi/files_encryption.po                 |  34 ++++
 l10n/vi/files_external.po                   |  82 ++++++++++
 l10n/vi/files_sharing.po                    |  54 +++++++
 l10n/vi/files_versions.po                   |  26 +++
 l10n/vi/tasks.po                            | 106 +++++++++++++
 l10n/vi/user_ldap.po                        | 164 +++++++++++++++++++
 l10n/vi/user_migrate.po                     |  51 ++++++
 l10n/vi/user_openid.po                      |  54 +++++++
 l10n/zh_CN.GB2312/admin_dependencies_chk.po |  73 +++++++++
 l10n/zh_CN.GB2312/admin_migrate.po          |  32 ++++
 l10n/zh_CN.GB2312/files_encryption.po       |  34 ++++
 l10n/zh_CN.GB2312/files_external.po         |  82 ++++++++++
 l10n/zh_CN.GB2312/files_sharing.po          |  54 +++++++
 l10n/zh_CN.GB2312/files_versions.po         |  26 +++
 l10n/zh_CN.GB2312/tasks.po                  | 106 +++++++++++++
 l10n/zh_CN.GB2312/user_ldap.po              | 164 +++++++++++++++++++
 l10n/zh_CN.GB2312/user_migrate.po           |  51 ++++++
 l10n/zh_CN.GB2312/user_openid.po            |  54 +++++++
 l10n/zh_CN/admin_dependencies_chk.po        |  73 +++++++++
 l10n/zh_CN/admin_migrate.po                 |  32 ++++
 l10n/zh_CN/files_encryption.po              |  34 ++++
 l10n/zh_CN/files_external.po                |  82 ++++++++++
 l10n/zh_CN/files_sharing.po                 |  54 +++++++
 l10n/zh_CN/files_versions.po                |  26 +++
 l10n/zh_CN/tasks.po                         | 106 +++++++++++++
 l10n/zh_CN/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/zh_CN/user_migrate.po                  |  51 ++++++
 l10n/zh_CN/user_openid.po                   |  54 +++++++
 l10n/zh_TW/admin_dependencies_chk.po        |  73 +++++++++
 l10n/zh_TW/admin_migrate.po                 |  32 ++++
 l10n/zh_TW/files_encryption.po              |  34 ++++
 l10n/zh_TW/files_external.po                |  82 ++++++++++
 l10n/zh_TW/files_sharing.po                 |  54 +++++++
 l10n/zh_TW/files_versions.po                |  26 +++
 l10n/zh_TW/tasks.po                         | 106 +++++++++++++
 l10n/zh_TW/user_ldap.po                     | 164 +++++++++++++++++++
 l10n/zh_TW/user_migrate.po                  |  51 ++++++
 l10n/zh_TW/user_openid.po                   |  54 +++++++
 600 files changed, 37570 insertions(+), 35 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/ca.php
 create mode 100644 apps/admin_dependencies_chk/l10n/sv.php
 create mode 100644 apps/admin_migrate/l10n/ca.php
 create mode 100644 apps/admin_migrate/l10n/es.php
 create mode 100644 apps/admin_migrate/l10n/gl.php
 create mode 100644 apps/admin_migrate/l10n/pl.php
 create mode 100644 apps/admin_migrate/l10n/sv.php
 create mode 100644 apps/files_encryption/l10n/ca.php
 create mode 100644 apps/files_encryption/l10n/de.php
 create mode 100644 apps/files_encryption/l10n/pl.php
 create mode 100644 apps/files_encryption/l10n/sv.php
 create mode 100644 apps/files_external/l10n/ca.php
 create mode 100644 apps/files_external/l10n/sv.php
 create mode 100644 apps/files_sharing/l10n/ca.php
 create mode 100644 apps/files_sharing/l10n/pl.php
 create mode 100644 apps/files_sharing/l10n/sv.php
 create mode 100644 apps/files_versions/l10n/ca.php
 create mode 100644 apps/files_versions/l10n/pl.php
 create mode 100644 apps/files_versions/l10n/sv.php
 create mode 100644 apps/tasks/l10n/ca.php
 create mode 100644 apps/tasks/l10n/sv.php
 create mode 100644 apps/user_ldap/l10n/ca.php
 create mode 100644 apps/user_ldap/l10n/sv.php
 create mode 100644 apps/user_migrate/l10n/ca.php
 create mode 100644 apps/user_migrate/l10n/sv.php
 create mode 100644 apps/user_openid/l10n/ca.php
 create mode 100644 apps/user_openid/l10n/sv.php
 create mode 100644 l10n/af/admin_dependencies_chk.po
 create mode 100644 l10n/af/admin_migrate.po
 create mode 100644 l10n/af/files_encryption.po
 create mode 100644 l10n/af/files_external.po
 create mode 100644 l10n/af/files_sharing.po
 create mode 100644 l10n/af/files_versions.po
 create mode 100644 l10n/af/tasks.po
 create mode 100644 l10n/af/user_ldap.po
 create mode 100644 l10n/af/user_migrate.po
 create mode 100644 l10n/af/user_openid.po
 create mode 100644 l10n/ar/admin_dependencies_chk.po
 create mode 100644 l10n/ar/admin_migrate.po
 create mode 100644 l10n/ar/files_encryption.po
 create mode 100644 l10n/ar/files_external.po
 create mode 100644 l10n/ar/files_sharing.po
 create mode 100644 l10n/ar/files_versions.po
 create mode 100644 l10n/ar/tasks.po
 create mode 100644 l10n/ar/user_ldap.po
 create mode 100644 l10n/ar/user_migrate.po
 create mode 100644 l10n/ar/user_openid.po
 create mode 100644 l10n/ar_SA/admin_dependencies_chk.po
 create mode 100644 l10n/ar_SA/admin_migrate.po
 create mode 100644 l10n/ar_SA/files_encryption.po
 create mode 100644 l10n/ar_SA/files_external.po
 create mode 100644 l10n/ar_SA/files_sharing.po
 create mode 100644 l10n/ar_SA/files_versions.po
 create mode 100644 l10n/ar_SA/tasks.po
 create mode 100644 l10n/ar_SA/user_ldap.po
 create mode 100644 l10n/ar_SA/user_migrate.po
 create mode 100644 l10n/ar_SA/user_openid.po
 create mode 100644 l10n/bg_BG/admin_dependencies_chk.po
 create mode 100644 l10n/bg_BG/admin_migrate.po
 create mode 100644 l10n/bg_BG/files_encryption.po
 create mode 100644 l10n/bg_BG/files_external.po
 create mode 100644 l10n/bg_BG/files_sharing.po
 create mode 100644 l10n/bg_BG/files_versions.po
 create mode 100644 l10n/bg_BG/tasks.po
 create mode 100644 l10n/bg_BG/user_ldap.po
 create mode 100644 l10n/bg_BG/user_migrate.po
 create mode 100644 l10n/bg_BG/user_openid.po
 create mode 100644 l10n/ca/admin_dependencies_chk.po
 create mode 100644 l10n/ca/admin_migrate.po
 create mode 100644 l10n/ca/files_encryption.po
 create mode 100644 l10n/ca/files_external.po
 create mode 100644 l10n/ca/files_sharing.po
 create mode 100644 l10n/ca/files_versions.po
 create mode 100644 l10n/ca/tasks.po
 create mode 100644 l10n/ca/user_ldap.po
 create mode 100644 l10n/ca/user_migrate.po
 create mode 100644 l10n/ca/user_openid.po
 create mode 100644 l10n/cs_CZ/admin_dependencies_chk.po
 create mode 100644 l10n/cs_CZ/admin_migrate.po
 create mode 100644 l10n/cs_CZ/files_encryption.po
 create mode 100644 l10n/cs_CZ/files_external.po
 create mode 100644 l10n/cs_CZ/files_sharing.po
 create mode 100644 l10n/cs_CZ/files_versions.po
 create mode 100644 l10n/cs_CZ/tasks.po
 create mode 100644 l10n/cs_CZ/user_ldap.po
 create mode 100644 l10n/cs_CZ/user_migrate.po
 create mode 100644 l10n/cs_CZ/user_openid.po
 create mode 100644 l10n/da/admin_dependencies_chk.po
 create mode 100644 l10n/da/admin_migrate.po
 create mode 100644 l10n/da/files_encryption.po
 create mode 100644 l10n/da/files_external.po
 create mode 100644 l10n/da/files_sharing.po
 create mode 100644 l10n/da/files_versions.po
 create mode 100644 l10n/da/tasks.po
 create mode 100644 l10n/da/user_ldap.po
 create mode 100644 l10n/da/user_migrate.po
 create mode 100644 l10n/da/user_openid.po
 create mode 100644 l10n/de/admin_dependencies_chk.po
 create mode 100644 l10n/de/admin_migrate.po
 create mode 100644 l10n/de/files_encryption.po
 create mode 100644 l10n/de/files_external.po
 create mode 100644 l10n/de/files_sharing.po
 create mode 100644 l10n/de/files_versions.po
 create mode 100644 l10n/de/tasks.po
 create mode 100644 l10n/de/user_ldap.po
 create mode 100644 l10n/de/user_migrate.po
 create mode 100644 l10n/de/user_openid.po
 create mode 100644 l10n/el/admin_dependencies_chk.po
 create mode 100644 l10n/el/admin_migrate.po
 create mode 100644 l10n/el/files_encryption.po
 create mode 100644 l10n/el/files_external.po
 create mode 100644 l10n/el/files_sharing.po
 create mode 100644 l10n/el/files_versions.po
 create mode 100644 l10n/el/tasks.po
 create mode 100644 l10n/el/user_ldap.po
 create mode 100644 l10n/el/user_migrate.po
 create mode 100644 l10n/el/user_openid.po
 create mode 100644 l10n/eo/admin_dependencies_chk.po
 create mode 100644 l10n/eo/admin_migrate.po
 create mode 100644 l10n/eo/files_encryption.po
 create mode 100644 l10n/eo/files_external.po
 create mode 100644 l10n/eo/files_sharing.po
 create mode 100644 l10n/eo/files_versions.po
 create mode 100644 l10n/eo/tasks.po
 create mode 100644 l10n/eo/user_ldap.po
 create mode 100644 l10n/eo/user_migrate.po
 create mode 100644 l10n/eo/user_openid.po
 create mode 100644 l10n/es/admin_dependencies_chk.po
 create mode 100644 l10n/es/admin_migrate.po
 create mode 100644 l10n/es/files_encryption.po
 create mode 100644 l10n/es/files_external.po
 create mode 100644 l10n/es/files_sharing.po
 create mode 100644 l10n/es/files_versions.po
 create mode 100644 l10n/es/tasks.po
 create mode 100644 l10n/es/user_ldap.po
 create mode 100644 l10n/es/user_migrate.po
 create mode 100644 l10n/es/user_openid.po
 create mode 100644 l10n/et_EE/admin_dependencies_chk.po
 create mode 100644 l10n/et_EE/admin_migrate.po
 create mode 100644 l10n/et_EE/files_encryption.po
 create mode 100644 l10n/et_EE/files_external.po
 create mode 100644 l10n/et_EE/files_sharing.po
 create mode 100644 l10n/et_EE/files_versions.po
 create mode 100644 l10n/et_EE/tasks.po
 create mode 100644 l10n/et_EE/user_ldap.po
 create mode 100644 l10n/et_EE/user_migrate.po
 create mode 100644 l10n/et_EE/user_openid.po
 create mode 100644 l10n/eu/admin_dependencies_chk.po
 create mode 100644 l10n/eu/admin_migrate.po
 create mode 100644 l10n/eu/files_encryption.po
 create mode 100644 l10n/eu/files_external.po
 create mode 100644 l10n/eu/files_sharing.po
 create mode 100644 l10n/eu/files_versions.po
 create mode 100644 l10n/eu/tasks.po
 create mode 100644 l10n/eu/user_ldap.po
 create mode 100644 l10n/eu/user_migrate.po
 create mode 100644 l10n/eu/user_openid.po
 create mode 100644 l10n/eu_ES/admin_dependencies_chk.po
 create mode 100644 l10n/eu_ES/admin_migrate.po
 create mode 100644 l10n/eu_ES/files_encryption.po
 create mode 100644 l10n/eu_ES/files_external.po
 create mode 100644 l10n/eu_ES/files_sharing.po
 create mode 100644 l10n/eu_ES/files_versions.po
 create mode 100644 l10n/eu_ES/tasks.po
 create mode 100644 l10n/eu_ES/user_ldap.po
 create mode 100644 l10n/eu_ES/user_migrate.po
 create mode 100644 l10n/eu_ES/user_openid.po
 create mode 100644 l10n/fa/admin_dependencies_chk.po
 create mode 100644 l10n/fa/admin_migrate.po
 create mode 100644 l10n/fa/files_encryption.po
 create mode 100644 l10n/fa/files_external.po
 create mode 100644 l10n/fa/files_sharing.po
 create mode 100644 l10n/fa/files_versions.po
 create mode 100644 l10n/fa/tasks.po
 create mode 100644 l10n/fa/user_ldap.po
 create mode 100644 l10n/fa/user_migrate.po
 create mode 100644 l10n/fa/user_openid.po
 create mode 100644 l10n/fi/admin_dependencies_chk.po
 create mode 100644 l10n/fi/admin_migrate.po
 create mode 100644 l10n/fi/files_encryption.po
 create mode 100644 l10n/fi/files_external.po
 create mode 100644 l10n/fi/files_sharing.po
 create mode 100644 l10n/fi/files_versions.po
 create mode 100644 l10n/fi/tasks.po
 create mode 100644 l10n/fi/user_ldap.po
 create mode 100644 l10n/fi/user_migrate.po
 create mode 100644 l10n/fi/user_openid.po
 create mode 100644 l10n/fi_FI/admin_dependencies_chk.po
 create mode 100644 l10n/fi_FI/admin_migrate.po
 create mode 100644 l10n/fi_FI/files_encryption.po
 create mode 100644 l10n/fi_FI/files_external.po
 create mode 100644 l10n/fi_FI/files_sharing.po
 create mode 100644 l10n/fi_FI/files_versions.po
 create mode 100644 l10n/fi_FI/tasks.po
 create mode 100644 l10n/fi_FI/user_ldap.po
 create mode 100644 l10n/fi_FI/user_migrate.po
 create mode 100644 l10n/fi_FI/user_openid.po
 create mode 100644 l10n/fr/admin_dependencies_chk.po
 create mode 100644 l10n/fr/admin_migrate.po
 create mode 100644 l10n/fr/files_encryption.po
 create mode 100644 l10n/fr/files_external.po
 create mode 100644 l10n/fr/files_sharing.po
 create mode 100644 l10n/fr/files_versions.po
 create mode 100644 l10n/fr/tasks.po
 create mode 100644 l10n/fr/user_ldap.po
 create mode 100644 l10n/fr/user_migrate.po
 create mode 100644 l10n/fr/user_openid.po
 create mode 100644 l10n/gl/admin_dependencies_chk.po
 create mode 100644 l10n/gl/admin_migrate.po
 create mode 100644 l10n/gl/files_encryption.po
 create mode 100644 l10n/gl/files_external.po
 create mode 100644 l10n/gl/files_sharing.po
 create mode 100644 l10n/gl/files_versions.po
 create mode 100644 l10n/gl/tasks.po
 create mode 100644 l10n/gl/user_ldap.po
 create mode 100644 l10n/gl/user_migrate.po
 create mode 100644 l10n/gl/user_openid.po
 create mode 100644 l10n/he/admin_dependencies_chk.po
 create mode 100644 l10n/he/admin_migrate.po
 create mode 100644 l10n/he/files_encryption.po
 create mode 100644 l10n/he/files_external.po
 create mode 100644 l10n/he/files_sharing.po
 create mode 100644 l10n/he/files_versions.po
 create mode 100644 l10n/he/tasks.po
 create mode 100644 l10n/he/user_ldap.po
 create mode 100644 l10n/he/user_migrate.po
 create mode 100644 l10n/he/user_openid.po
 create mode 100644 l10n/hr/admin_dependencies_chk.po
 create mode 100644 l10n/hr/admin_migrate.po
 create mode 100644 l10n/hr/files_encryption.po
 create mode 100644 l10n/hr/files_external.po
 create mode 100644 l10n/hr/files_sharing.po
 create mode 100644 l10n/hr/files_versions.po
 create mode 100644 l10n/hr/tasks.po
 create mode 100644 l10n/hr/user_ldap.po
 create mode 100644 l10n/hr/user_migrate.po
 create mode 100644 l10n/hr/user_openid.po
 create mode 100644 l10n/hu_HU/admin_dependencies_chk.po
 create mode 100644 l10n/hu_HU/admin_migrate.po
 create mode 100644 l10n/hu_HU/files_encryption.po
 create mode 100644 l10n/hu_HU/files_external.po
 create mode 100644 l10n/hu_HU/files_sharing.po
 create mode 100644 l10n/hu_HU/files_versions.po
 create mode 100644 l10n/hu_HU/tasks.po
 create mode 100644 l10n/hu_HU/user_ldap.po
 create mode 100644 l10n/hu_HU/user_migrate.po
 create mode 100644 l10n/hu_HU/user_openid.po
 create mode 100644 l10n/hy/admin_dependencies_chk.po
 create mode 100644 l10n/hy/admin_migrate.po
 create mode 100644 l10n/hy/files_encryption.po
 create mode 100644 l10n/hy/files_external.po
 create mode 100644 l10n/hy/files_sharing.po
 create mode 100644 l10n/hy/files_versions.po
 create mode 100644 l10n/hy/tasks.po
 create mode 100644 l10n/hy/user_ldap.po
 create mode 100644 l10n/hy/user_migrate.po
 create mode 100644 l10n/hy/user_openid.po
 create mode 100644 l10n/ia/admin_dependencies_chk.po
 create mode 100644 l10n/ia/admin_migrate.po
 create mode 100644 l10n/ia/files_encryption.po
 create mode 100644 l10n/ia/files_external.po
 create mode 100644 l10n/ia/files_sharing.po
 create mode 100644 l10n/ia/files_versions.po
 create mode 100644 l10n/ia/tasks.po
 create mode 100644 l10n/ia/user_ldap.po
 create mode 100644 l10n/ia/user_migrate.po
 create mode 100644 l10n/ia/user_openid.po
 create mode 100644 l10n/id/admin_dependencies_chk.po
 create mode 100644 l10n/id/admin_migrate.po
 create mode 100644 l10n/id/files_encryption.po
 create mode 100644 l10n/id/files_external.po
 create mode 100644 l10n/id/files_sharing.po
 create mode 100644 l10n/id/files_versions.po
 create mode 100644 l10n/id/tasks.po
 create mode 100644 l10n/id/user_ldap.po
 create mode 100644 l10n/id/user_migrate.po
 create mode 100644 l10n/id/user_openid.po
 create mode 100644 l10n/id_ID/admin_dependencies_chk.po
 create mode 100644 l10n/id_ID/admin_migrate.po
 create mode 100644 l10n/id_ID/files_encryption.po
 create mode 100644 l10n/id_ID/files_external.po
 create mode 100644 l10n/id_ID/files_sharing.po
 create mode 100644 l10n/id_ID/files_versions.po
 create mode 100644 l10n/id_ID/tasks.po
 create mode 100644 l10n/id_ID/user_ldap.po
 create mode 100644 l10n/id_ID/user_migrate.po
 create mode 100644 l10n/id_ID/user_openid.po
 create mode 100644 l10n/it/admin_dependencies_chk.po
 create mode 100644 l10n/it/admin_migrate.po
 create mode 100644 l10n/it/files_encryption.po
 create mode 100644 l10n/it/files_external.po
 create mode 100644 l10n/it/files_sharing.po
 create mode 100644 l10n/it/files_versions.po
 create mode 100644 l10n/it/tasks.po
 create mode 100644 l10n/it/user_ldap.po
 create mode 100644 l10n/it/user_migrate.po
 create mode 100644 l10n/it/user_openid.po
 create mode 100644 l10n/ja_JP/admin_dependencies_chk.po
 create mode 100644 l10n/ja_JP/admin_migrate.po
 create mode 100644 l10n/ja_JP/files_encryption.po
 create mode 100644 l10n/ja_JP/files_external.po
 create mode 100644 l10n/ja_JP/files_sharing.po
 create mode 100644 l10n/ja_JP/files_versions.po
 create mode 100644 l10n/ja_JP/tasks.po
 create mode 100644 l10n/ja_JP/user_ldap.po
 create mode 100644 l10n/ja_JP/user_migrate.po
 create mode 100644 l10n/ja_JP/user_openid.po
 create mode 100644 l10n/ko/admin_dependencies_chk.po
 create mode 100644 l10n/ko/admin_migrate.po
 create mode 100644 l10n/ko/files_encryption.po
 create mode 100644 l10n/ko/files_external.po
 create mode 100644 l10n/ko/files_sharing.po
 create mode 100644 l10n/ko/files_versions.po
 create mode 100644 l10n/ko/tasks.po
 create mode 100644 l10n/ko/user_ldap.po
 create mode 100644 l10n/ko/user_migrate.po
 create mode 100644 l10n/ko/user_openid.po
 create mode 100644 l10n/lb/admin_dependencies_chk.po
 create mode 100644 l10n/lb/admin_migrate.po
 create mode 100644 l10n/lb/files_encryption.po
 create mode 100644 l10n/lb/files_external.po
 create mode 100644 l10n/lb/files_sharing.po
 create mode 100644 l10n/lb/files_versions.po
 create mode 100644 l10n/lb/tasks.po
 create mode 100644 l10n/lb/user_ldap.po
 create mode 100644 l10n/lb/user_migrate.po
 create mode 100644 l10n/lb/user_openid.po
 create mode 100644 l10n/lt_LT/admin_dependencies_chk.po
 create mode 100644 l10n/lt_LT/admin_migrate.po
 create mode 100644 l10n/lt_LT/files_encryption.po
 create mode 100644 l10n/lt_LT/files_external.po
 create mode 100644 l10n/lt_LT/files_sharing.po
 create mode 100644 l10n/lt_LT/files_versions.po
 create mode 100644 l10n/lt_LT/tasks.po
 create mode 100644 l10n/lt_LT/user_ldap.po
 create mode 100644 l10n/lt_LT/user_migrate.po
 create mode 100644 l10n/lt_LT/user_openid.po
 create mode 100644 l10n/lv/admin_dependencies_chk.po
 create mode 100644 l10n/lv/admin_migrate.po
 create mode 100644 l10n/lv/files_encryption.po
 create mode 100644 l10n/lv/files_external.po
 create mode 100644 l10n/lv/files_sharing.po
 create mode 100644 l10n/lv/files_versions.po
 create mode 100644 l10n/lv/tasks.po
 create mode 100644 l10n/lv/user_ldap.po
 create mode 100644 l10n/lv/user_migrate.po
 create mode 100644 l10n/lv/user_openid.po
 create mode 100644 l10n/mk/admin_dependencies_chk.po
 create mode 100644 l10n/mk/admin_migrate.po
 create mode 100644 l10n/mk/files_encryption.po
 create mode 100644 l10n/mk/files_external.po
 create mode 100644 l10n/mk/files_sharing.po
 create mode 100644 l10n/mk/files_versions.po
 create mode 100644 l10n/mk/tasks.po
 create mode 100644 l10n/mk/user_ldap.po
 create mode 100644 l10n/mk/user_migrate.po
 create mode 100644 l10n/mk/user_openid.po
 create mode 100644 l10n/ms_MY/admin_dependencies_chk.po
 create mode 100644 l10n/ms_MY/admin_migrate.po
 create mode 100644 l10n/ms_MY/files_encryption.po
 create mode 100644 l10n/ms_MY/files_external.po
 create mode 100644 l10n/ms_MY/files_sharing.po
 create mode 100644 l10n/ms_MY/files_versions.po
 create mode 100644 l10n/ms_MY/tasks.po
 create mode 100644 l10n/ms_MY/user_ldap.po
 create mode 100644 l10n/ms_MY/user_migrate.po
 create mode 100644 l10n/ms_MY/user_openid.po
 create mode 100644 l10n/nb_NO/admin_dependencies_chk.po
 create mode 100644 l10n/nb_NO/admin_migrate.po
 create mode 100644 l10n/nb_NO/files_encryption.po
 create mode 100644 l10n/nb_NO/files_external.po
 create mode 100644 l10n/nb_NO/files_sharing.po
 create mode 100644 l10n/nb_NO/files_versions.po
 create mode 100644 l10n/nb_NO/tasks.po
 create mode 100644 l10n/nb_NO/user_ldap.po
 create mode 100644 l10n/nb_NO/user_migrate.po
 create mode 100644 l10n/nb_NO/user_openid.po
 create mode 100644 l10n/nl/admin_dependencies_chk.po
 create mode 100644 l10n/nl/admin_migrate.po
 create mode 100644 l10n/nl/files_encryption.po
 create mode 100644 l10n/nl/files_external.po
 create mode 100644 l10n/nl/files_sharing.po
 create mode 100644 l10n/nl/files_versions.po
 create mode 100644 l10n/nl/tasks.po
 create mode 100644 l10n/nl/user_ldap.po
 create mode 100644 l10n/nl/user_migrate.po
 create mode 100644 l10n/nl/user_openid.po
 create mode 100644 l10n/nn_NO/admin_dependencies_chk.po
 create mode 100644 l10n/nn_NO/admin_migrate.po
 create mode 100644 l10n/nn_NO/files_encryption.po
 create mode 100644 l10n/nn_NO/files_external.po
 create mode 100644 l10n/nn_NO/files_sharing.po
 create mode 100644 l10n/nn_NO/files_versions.po
 create mode 100644 l10n/nn_NO/tasks.po
 create mode 100644 l10n/nn_NO/user_ldap.po
 create mode 100644 l10n/nn_NO/user_migrate.po
 create mode 100644 l10n/nn_NO/user_openid.po
 create mode 100644 l10n/pl/admin_dependencies_chk.po
 create mode 100644 l10n/pl/admin_migrate.po
 create mode 100644 l10n/pl/files_encryption.po
 create mode 100644 l10n/pl/files_external.po
 create mode 100644 l10n/pl/files_sharing.po
 create mode 100644 l10n/pl/files_versions.po
 create mode 100644 l10n/pl/tasks.po
 create mode 100644 l10n/pl/user_ldap.po
 create mode 100644 l10n/pl/user_migrate.po
 create mode 100644 l10n/pl/user_openid.po
 create mode 100644 l10n/pt_BR/admin_dependencies_chk.po
 create mode 100644 l10n/pt_BR/admin_migrate.po
 create mode 100644 l10n/pt_BR/files_encryption.po
 create mode 100644 l10n/pt_BR/files_external.po
 create mode 100644 l10n/pt_BR/files_sharing.po
 create mode 100644 l10n/pt_BR/files_versions.po
 create mode 100644 l10n/pt_BR/tasks.po
 create mode 100644 l10n/pt_BR/user_ldap.po
 create mode 100644 l10n/pt_BR/user_migrate.po
 create mode 100644 l10n/pt_BR/user_openid.po
 create mode 100644 l10n/pt_PT/admin_dependencies_chk.po
 create mode 100644 l10n/pt_PT/admin_migrate.po
 create mode 100644 l10n/pt_PT/files_encryption.po
 create mode 100644 l10n/pt_PT/files_external.po
 create mode 100644 l10n/pt_PT/files_sharing.po
 create mode 100644 l10n/pt_PT/files_versions.po
 create mode 100644 l10n/pt_PT/tasks.po
 create mode 100644 l10n/pt_PT/user_ldap.po
 create mode 100644 l10n/pt_PT/user_migrate.po
 create mode 100644 l10n/pt_PT/user_openid.po
 create mode 100644 l10n/ro/admin_dependencies_chk.po
 create mode 100644 l10n/ro/admin_migrate.po
 create mode 100644 l10n/ro/files_encryption.po
 create mode 100644 l10n/ro/files_external.po
 create mode 100644 l10n/ro/files_sharing.po
 create mode 100644 l10n/ro/files_versions.po
 create mode 100644 l10n/ro/tasks.po
 create mode 100644 l10n/ro/user_ldap.po
 create mode 100644 l10n/ro/user_migrate.po
 create mode 100644 l10n/ro/user_openid.po
 create mode 100644 l10n/ru/admin_dependencies_chk.po
 create mode 100644 l10n/ru/admin_migrate.po
 create mode 100644 l10n/ru/files_encryption.po
 create mode 100644 l10n/ru/files_external.po
 create mode 100644 l10n/ru/files_sharing.po
 create mode 100644 l10n/ru/files_versions.po
 create mode 100644 l10n/ru/tasks.po
 create mode 100644 l10n/ru/user_ldap.po
 create mode 100644 l10n/ru/user_migrate.po
 create mode 100644 l10n/ru/user_openid.po
 create mode 100644 l10n/sk_SK/admin_dependencies_chk.po
 create mode 100644 l10n/sk_SK/admin_migrate.po
 create mode 100644 l10n/sk_SK/files_encryption.po
 create mode 100644 l10n/sk_SK/files_external.po
 create mode 100644 l10n/sk_SK/files_sharing.po
 create mode 100644 l10n/sk_SK/files_versions.po
 create mode 100644 l10n/sk_SK/tasks.po
 create mode 100644 l10n/sk_SK/user_ldap.po
 create mode 100644 l10n/sk_SK/user_migrate.po
 create mode 100644 l10n/sk_SK/user_openid.po
 create mode 100644 l10n/sl/admin_dependencies_chk.po
 create mode 100644 l10n/sl/admin_migrate.po
 create mode 100644 l10n/sl/files_encryption.po
 create mode 100644 l10n/sl/files_external.po
 create mode 100644 l10n/sl/files_sharing.po
 create mode 100644 l10n/sl/files_versions.po
 create mode 100644 l10n/sl/tasks.po
 create mode 100644 l10n/sl/user_ldap.po
 create mode 100644 l10n/sl/user_migrate.po
 create mode 100644 l10n/sl/user_openid.po
 create mode 100644 l10n/so/admin_dependencies_chk.po
 create mode 100644 l10n/so/admin_migrate.po
 create mode 100644 l10n/so/files_encryption.po
 create mode 100644 l10n/so/files_external.po
 create mode 100644 l10n/so/files_sharing.po
 create mode 100644 l10n/so/files_versions.po
 create mode 100644 l10n/so/tasks.po
 create mode 100644 l10n/so/user_ldap.po
 create mode 100644 l10n/so/user_migrate.po
 create mode 100644 l10n/so/user_openid.po
 create mode 100644 l10n/sr/admin_dependencies_chk.po
 create mode 100644 l10n/sr/admin_migrate.po
 create mode 100644 l10n/sr/files_encryption.po
 create mode 100644 l10n/sr/files_external.po
 create mode 100644 l10n/sr/files_sharing.po
 create mode 100644 l10n/sr/files_versions.po
 create mode 100644 l10n/sr/tasks.po
 create mode 100644 l10n/sr/user_ldap.po
 create mode 100644 l10n/sr/user_migrate.po
 create mode 100644 l10n/sr/user_openid.po
 create mode 100644 l10n/sr@latin/admin_dependencies_chk.po
 create mode 100644 l10n/sr@latin/admin_migrate.po
 create mode 100644 l10n/sr@latin/files_encryption.po
 create mode 100644 l10n/sr@latin/files_external.po
 create mode 100644 l10n/sr@latin/files_sharing.po
 create mode 100644 l10n/sr@latin/files_versions.po
 create mode 100644 l10n/sr@latin/tasks.po
 create mode 100644 l10n/sr@latin/user_ldap.po
 create mode 100644 l10n/sr@latin/user_migrate.po
 create mode 100644 l10n/sr@latin/user_openid.po
 create mode 100644 l10n/sv/admin_dependencies_chk.po
 create mode 100644 l10n/sv/admin_migrate.po
 create mode 100644 l10n/sv/files_encryption.po
 create mode 100644 l10n/sv/files_external.po
 create mode 100644 l10n/sv/files_sharing.po
 create mode 100644 l10n/sv/files_versions.po
 create mode 100644 l10n/sv/tasks.po
 create mode 100644 l10n/sv/user_ldap.po
 create mode 100644 l10n/sv/user_migrate.po
 create mode 100644 l10n/sv/user_openid.po
 create mode 100644 l10n/th_TH/admin_dependencies_chk.po
 create mode 100644 l10n/th_TH/admin_migrate.po
 create mode 100644 l10n/th_TH/files_encryption.po
 create mode 100644 l10n/th_TH/files_external.po
 create mode 100644 l10n/th_TH/files_sharing.po
 create mode 100644 l10n/th_TH/files_versions.po
 create mode 100644 l10n/th_TH/tasks.po
 create mode 100644 l10n/th_TH/user_ldap.po
 create mode 100644 l10n/th_TH/user_migrate.po
 create mode 100644 l10n/th_TH/user_openid.po
 create mode 100644 l10n/tr/admin_dependencies_chk.po
 create mode 100644 l10n/tr/admin_migrate.po
 create mode 100644 l10n/tr/files_encryption.po
 create mode 100644 l10n/tr/files_external.po
 create mode 100644 l10n/tr/files_sharing.po
 create mode 100644 l10n/tr/files_versions.po
 create mode 100644 l10n/tr/tasks.po
 create mode 100644 l10n/tr/user_ldap.po
 create mode 100644 l10n/tr/user_migrate.po
 create mode 100644 l10n/tr/user_openid.po
 create mode 100644 l10n/uk/admin_dependencies_chk.po
 create mode 100644 l10n/uk/admin_migrate.po
 create mode 100644 l10n/uk/files_encryption.po
 create mode 100644 l10n/uk/files_external.po
 create mode 100644 l10n/uk/files_sharing.po
 create mode 100644 l10n/uk/files_versions.po
 create mode 100644 l10n/uk/tasks.po
 create mode 100644 l10n/uk/user_ldap.po
 create mode 100644 l10n/uk/user_migrate.po
 create mode 100644 l10n/uk/user_openid.po
 create mode 100644 l10n/vi/admin_dependencies_chk.po
 create mode 100644 l10n/vi/admin_migrate.po
 create mode 100644 l10n/vi/files_encryption.po
 create mode 100644 l10n/vi/files_external.po
 create mode 100644 l10n/vi/files_sharing.po
 create mode 100644 l10n/vi/files_versions.po
 create mode 100644 l10n/vi/tasks.po
 create mode 100644 l10n/vi/user_ldap.po
 create mode 100644 l10n/vi/user_migrate.po
 create mode 100644 l10n/vi/user_openid.po
 create mode 100644 l10n/zh_CN.GB2312/admin_dependencies_chk.po
 create mode 100644 l10n/zh_CN.GB2312/admin_migrate.po
 create mode 100644 l10n/zh_CN.GB2312/files_encryption.po
 create mode 100644 l10n/zh_CN.GB2312/files_external.po
 create mode 100644 l10n/zh_CN.GB2312/files_sharing.po
 create mode 100644 l10n/zh_CN.GB2312/files_versions.po
 create mode 100644 l10n/zh_CN.GB2312/tasks.po
 create mode 100644 l10n/zh_CN.GB2312/user_ldap.po
 create mode 100644 l10n/zh_CN.GB2312/user_migrate.po
 create mode 100644 l10n/zh_CN.GB2312/user_openid.po
 create mode 100644 l10n/zh_CN/admin_dependencies_chk.po
 create mode 100644 l10n/zh_CN/admin_migrate.po
 create mode 100644 l10n/zh_CN/files_encryption.po
 create mode 100644 l10n/zh_CN/files_external.po
 create mode 100644 l10n/zh_CN/files_sharing.po
 create mode 100644 l10n/zh_CN/files_versions.po
 create mode 100644 l10n/zh_CN/tasks.po
 create mode 100644 l10n/zh_CN/user_ldap.po
 create mode 100644 l10n/zh_CN/user_migrate.po
 create mode 100644 l10n/zh_CN/user_openid.po
 create mode 100644 l10n/zh_TW/admin_dependencies_chk.po
 create mode 100644 l10n/zh_TW/admin_migrate.po
 create mode 100644 l10n/zh_TW/files_encryption.po
 create mode 100644 l10n/zh_TW/files_external.po
 create mode 100644 l10n/zh_TW/files_sharing.po
 create mode 100644 l10n/zh_TW/files_versions.po
 create mode 100644 l10n/zh_TW/tasks.po
 create mode 100644 l10n/zh_TW/user_ldap.po
 create mode 100644 l10n/zh_TW/user_migrate.po
 create mode 100644 l10n/zh_TW/user_openid.po

diff --git a/apps/admin_dependencies_chk/l10n/ca.php b/apps/admin_dependencies_chk/l10n/ca.php
new file mode 100644
index 0000000000..08f4ec8078
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/ca.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "El mòdul php-json és necessari per moltes aplicacions per comunicacions internes",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "El mòdul php-curl és necessari per mostrar el títol de la pàgina quan s'afegeixen adreces d'interès",
+"The php-gd module is needed to create thumbnails of your images" => "El mòdul php-gd és necessari per generar miniatures d'imatges",
+"The php-ldap module is needed connect to your ldap server" => "El mòdul php-ldap és necessari per connectar amb el servidor ldap",
+"The php-zip module is needed download multiple files at once" => "El mòdul php-zip és necessari per baixar múltiples fitxers de cop",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "El mòdul php-mb_multibyte és necessari per gestionar correctament la codificació.",
+"The php-ctype module is needed validate data." => "El mòdul php-ctype és necessari per validar dades.",
+"The php-xml module is needed to share files with webdav." => "El mòdul php-xml és necessari per compatir els fitxers amb webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directiva allow_url_fopen de php.ini hauria d'establir-se en 1 per accedir a la base de coneixements dels servidors OCS",
+"The php-pdo module is needed to store owncloud data into a database." => "El mòdul php-pdo és necessari per desar les dades d'ownCloud en una base de dades.",
+"Dependencies status" => "Estat de dependències",
+"Used by :" => "Usat per:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/sv.php b/apps/admin_dependencies_chk/l10n/sv.php
new file mode 100644
index 0000000000..07868f3c03
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/sv.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modulen php-json behövs av många applikationer som interagerar.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modulen php-curl behövs för att hämta sidans titel när du lägger till bokmärken.",
+"The php-gd module is needed to create thumbnails of your images" => "Modulen php-gd behövs för att skapa miniatyrer av dina bilder.",
+"The php-ldap module is needed connect to your ldap server" => "Modulen php-ldap behövs för att ansluta mot din ldapserver.",
+"The php-zip module is needed download multiple files at once" => "Modulen php-zip behövs för att kunna ladda ner flera filer på en gång.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modulen php-mb_multibyte behövs för att hantera korrekt teckenkodning.",
+"The php-ctype module is needed validate data." => "Modulen php-ctype behövs för att validera data.",
+"The php-xml module is needed to share files with webdav." => "Modulen php-xml behövs för att kunna dela filer med webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Direktivet allow_url_fopen i php.ini bör sättas till 1 för att kunna hämta kunskapsbasen från OCS-servrar.",
+"The php-pdo module is needed to store owncloud data into a database." => "Modulen php-pdo behövs för att kunna lagra ownCloud data i en databas.",
+"Dependencies status" => "Beroenden status",
+"Used by :" => "Används av:"
+);
diff --git a/apps/admin_migrate/l10n/ca.php b/apps/admin_migrate/l10n/ca.php
new file mode 100644
index 0000000000..8743b39760
--- /dev/null
+++ b/apps/admin_migrate/l10n/ca.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporta aquesta instància de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Això crearà un fitxer comprimit amb les dades d'aquesta instància ownCloud.\n            Escolliu el tipus d'exportació:",
+"Export" => "Exporta"
+);
diff --git a/apps/admin_migrate/l10n/es.php b/apps/admin_migrate/l10n/es.php
new file mode 100644
index 0000000000..cb6699b1d9
--- /dev/null
+++ b/apps/admin_migrate/l10n/es.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exportar esta instancia de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Se creará un archivo comprimido que contendrá los datos de esta instancia de owncloud.\n            Por favor elegir el tipo de exportación:",
+"Export" => "Exportar"
+);
diff --git a/apps/admin_migrate/l10n/gl.php b/apps/admin_migrate/l10n/gl.php
new file mode 100644
index 0000000000..9d18e13493
--- /dev/null
+++ b/apps/admin_migrate/l10n/gl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporta esta instancia de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Esto creará un ficheiro comprimido que contén os datos de esta instancia de ownCloud.\nPor favor escolla o modo de exportación:",
+"Export" => "Exportar"
+);
diff --git a/apps/admin_migrate/l10n/pl.php b/apps/admin_migrate/l10n/pl.php
new file mode 100644
index 0000000000..292601daa2
--- /dev/null
+++ b/apps/admin_migrate/l10n/pl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Eksportuj instancję ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Spowoduje to utworzenie pliku skompresowanego, który zawiera dane tej instancji ownCloud.⏎ proszę wybrać typ eksportu:",
+"Export" => "Eksport"
+);
diff --git a/apps/admin_migrate/l10n/sv.php b/apps/admin_migrate/l10n/sv.php
new file mode 100644
index 0000000000..57866e897e
--- /dev/null
+++ b/apps/admin_migrate/l10n/sv.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exportera denna instans av ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Detta kommer att skapa en komprimerad fil som innehåller all data från denna instans av ownCloud.\n            Välj exporttyp:",
+"Export" => "Exportera"
+);
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index c519fe3140..4ff0d72204 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -112,6 +112,7 @@
 "Month" => "Monat",
 "List" => "Liste",
 "Today" => "Heute",
+"Settings" => "Einstellungen",
 "Your calendars" => "Deine Kalender",
 "CalDav Link" => "CalDAV-Link",
 "Shared calendars" => "geteilte Kalender",
@@ -173,9 +174,13 @@
 "No categories selected" => "Keine Kategorie ausgewählt",
 "of" => "von",
 "at" => "um",
+"General" => "Allgemein",
 "Timezone" => "Zeitzone",
+"Update timezone automatically" => "Zeitzone automatisch aktualisieren",
+"Time format" => "Zeitformat",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "Erster Wochentag",
 "Cache" => "Zwischenspeicher",
 "Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
 "Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index be9adae557..a47b61d507 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -59,6 +59,7 @@
 "Edit name" => "Name ändern",
 "No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"Error loading profile picture." => "Fehler beim Laden des Profilbildes.",
 "Select type" => "Wähle Typ",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
 "Result: " => "Ergebnis: ",
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
new file mode 100644
index 0000000000..8e087b3462
--- /dev/null
+++ b/apps/files_encryption/l10n/ca.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Encriptatge",
+"Exclude the following file types from encryption" => "Exclou els tipus de fitxers següents de l'encriptatge",
+"None" => "Cap",
+"Enable Encryption" => "Activa l'encriptatge"
+);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
new file mode 100644
index 0000000000..d486a82322
--- /dev/null
+++ b/apps/files_encryption/l10n/de.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Verschlüsselung",
+"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
+"None" => "Keine",
+"Enable Encryption" => "Verschlüsselung aktivieren"
+);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
new file mode 100644
index 0000000000..5cfc707450
--- /dev/null
+++ b/apps/files_encryption/l10n/pl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Szyfrowanie",
+"Exclude the following file types from encryption" => "Wyłącz następujące typy plików z szyfrowania",
+"None" => "Brak",
+"Enable Encryption" => "Włącz szyfrowanie"
+);
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
new file mode 100644
index 0000000000..0a477f8346
--- /dev/null
+++ b/apps/files_encryption/l10n/sv.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptering",
+"Exclude the following file types from encryption" => "Exkludera följande filtyper från kryptering",
+"None" => "Ingen",
+"Enable Encryption" => "Aktivera kryptering"
+);
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
new file mode 100644
index 0000000000..aa93379c35
--- /dev/null
+++ b/apps/files_external/l10n/ca.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Emmagatzemament extern",
+"Mount point" => "Punt de muntatge",
+"Backend" => "Dorsal",
+"Configuration" => "Configuració",
+"Options" => "Options",
+"Applicable" => "Aplicable",
+"Add mount point" => "Afegeix punt de muntatge",
+"None set" => "Cap d'establert",
+"All Users" => "Tots els usuaris",
+"Groups" => "Grups",
+"Users" => "Usuaris",
+"Delete" => "Elimina",
+"SSL root certificates" => "Certificats SSL root",
+"Import Root Certificate" => "Importa certificat root",
+"Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
+"Allow users to mount their own external storage" => "Permet als usuaris muntar el seu emmagatzemament extern propi"
+);
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
new file mode 100644
index 0000000000..0838df6a32
--- /dev/null
+++ b/apps/files_external/l10n/sv.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Extern lagring",
+"Mount point" => "Monteringspunkt",
+"Backend" => "Källa",
+"Configuration" => "Konfiguration",
+"Options" => "Alternativ",
+"Applicable" => "Tillämplig",
+"Add mount point" => "Lägg till monteringspunkt",
+"None set" => "Ingen angiven",
+"All Users" => "Alla användare",
+"Groups" => "Grupper",
+"Users" => "Användare",
+"Delete" => "Radera",
+"SSL root certificates" => "SSL rotcertifikat",
+"Import Root Certificate" => "Importera rotcertifikat",
+"Enable User External Storage" => "Aktivera extern lagring för användare",
+"Allow users to mount their own external storage" => "Tillåt användare att montera egen extern lagring"
+);
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
new file mode 100644
index 0000000000..02d554c7f5
--- /dev/null
+++ b/apps/files_sharing/l10n/ca.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Els vostres fitxers compartits",
+"Item" => "Element",
+"Shared With" => "Compartit amb",
+"Permissions" => "Permisos",
+"Read" => "Llegeix",
+"Edit" => "Edita",
+"Delete" => "Elimina",
+"Enable Resharing" => "Permet compartir amb tercers",
+"Allow users to reshare files they don't own" => "Permet als usuaris compartir fitxers que no són seus"
+);
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
new file mode 100644
index 0000000000..e087d4a293
--- /dev/null
+++ b/apps/files_sharing/l10n/pl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Twoje udostępnione pliki",
+"Item" => "Element",
+"Shared With" => "Udostępnione dla",
+"Permissions" => "Uprawnienia",
+"Read" => "Odczyt",
+"Edit" => "Edycja",
+"Delete" => "Usuń",
+"Enable Resharing" => "Włącz ponowne udostępnianie",
+"Allow users to reshare files they don't own" => "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
+);
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
new file mode 100644
index 0000000000..8eb48c3b6d
--- /dev/null
+++ b/apps/files_sharing/l10n/sv.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Dina delade filer",
+"Item" => "Objekt",
+"Shared With" => "Delad med",
+"Permissions" => "Rättigheter",
+"Read" => "Läsa",
+"Edit" => "Ändra",
+"Delete" => "Radera",
+"Enable Resharing" => "Aktivera dela vidare",
+"Allow users to reshare files they don't own" => "Tillåter användare att dela filer som dom inte äger"
+);
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
new file mode 100644
index 0000000000..8388556bec
--- /dev/null
+++ b/apps/files_versions/l10n/ca.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Expira totes les versions",
+"Enable Files Versioning" => "Habilita les versions de fitxers"
+);
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
new file mode 100644
index 0000000000..faf2d39e70
--- /dev/null
+++ b/apps/files_versions/l10n/pl.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Wygasają wszystkie wersje",
+"Enable Files Versioning" => "Włącz wersjonowanie plików"
+);
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
new file mode 100644
index 0000000000..03d4d54d0b
--- /dev/null
+++ b/apps/files_versions/l10n/sv.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Upphör alla versioner",
+"Enable Files Versioning" => "Aktivera versionshantering"
+);
diff --git a/apps/tasks/l10n/ca.php b/apps/tasks/l10n/ca.php
new file mode 100644
index 0000000000..2608d8b9b1
--- /dev/null
+++ b/apps/tasks/l10n/ca.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "data/hora incorrecta",
+"Tasks" => "Tasques",
+"No category" => "Cap categoria",
+"Unspecified" => "Sense especificar",
+"1=highest" => "1=major",
+"5=medium" => "5=mitjana",
+"9=lowest" => "9=inferior",
+"Empty Summary" => "Elimina el resum",
+"Invalid percent complete" => "Percentatge completat no vàlid",
+"Invalid priority" => "Prioritat no vàlida",
+"Add Task" => "Afegeix una tasca",
+"Order Due" => "Ordena per",
+"Order List" => "Ordena per llista",
+"Order Complete" => "Ordena els complets",
+"Order Location" => "Ordena per ubicació",
+"Order Priority" => "Ordena per prioritat",
+"Order Label" => "Ordena per etiqueta",
+"Loading tasks..." => "Carregant les tasques...",
+"Important" => "Important",
+"More" => "Més",
+"Less" => "Menys",
+"Delete" => "Elimina"
+);
diff --git a/apps/tasks/l10n/sv.php b/apps/tasks/l10n/sv.php
new file mode 100644
index 0000000000..33bab14448
--- /dev/null
+++ b/apps/tasks/l10n/sv.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Felaktigt datum/tid",
+"Tasks" => "Uppgifter",
+"No category" => "Ingen kategori",
+"Unspecified" => "Ospecificerad ",
+"1=highest" => "1=högsta",
+"5=medium" => "5=mellan",
+"9=lowest" => "9=lägsta",
+"Empty Summary" => "Tom sammanfattning",
+"Invalid percent complete" => "Ogiltig andel procent klar",
+"Invalid priority" => "Felaktig prioritet",
+"Add Task" => "Lägg till uppgift",
+"Order Due" => "Förfaller",
+"Order List" => "Kategori",
+"Order Complete" => "Slutförd",
+"Order Location" => "Plats",
+"Order Priority" => "Prioritet",
+"Order Label" => "Etikett",
+"Loading tasks..." => "Laddar uppgifter...",
+"Important" => "Viktigt",
+"More" => "Mer",
+"Less" => "Mindre",
+"Delete" => "Radera"
+);
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
new file mode 100644
index 0000000000..04b0f8997d
--- /dev/null
+++ b/apps/user_ldap/l10n/ca.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Màquina",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
+"Base DN" => "DN Base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
+"User DN" => "DN Usuari",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+"Password" => "Contrasenya",
+"For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+"User Login Filter" => "Filtre d'inici de sessió d'usuari",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\"",
+"User List Filter" => "Llista de filtres d'usuari",
+"Defines the filter to apply, when retrieving users." => "Defineix el filtre a aplicar quan es mostren usuaris",
+"without any placeholder, e.g. \"objectClass=person\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=persona\"",
+"Group Filter" => "Filtre de grup",
+"Defines the filter to apply, when retrieving groups." => "Defineix el filtre a aplicar quan es mostren grups.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\".",
+"Port" => "Port",
+"Base User Tree" => "Arbre base d'usuaris",
+"Base Group Tree" => "Arbre base de grups",
+"Group-Member association" => "Associació membres-grup",
+"Use TLS" => "Usa TLS",
+"Do not use it for SSL connections, it will fail." => "No ho useu en connexions SSL, fallarà.",
+"Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
+"Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud.",
+"Not recommended, use for testing only." => "No recomanat, ús només per proves.",
+"User Display Name Field" => "Camp per mostrar el nom d'usuari",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP a usar per generar el nom d'usuari ownCloud.",
+"Group Display Name Field" => "Camp per mostrar el nom del grup",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP a usar per generar el nom de grup ownCloud.",
+"in bytes" => "en bytes",
+"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
+"Help" => "Ajuda"
+);
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
new file mode 100644
index 0000000000..a23cc094b4
--- /dev/null
+++ b/apps/user_ldap/l10n/sv.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Server",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
+"Base DN" => "Start DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kan ange start DN för användare och grupper under fliken Avancerat",
+"User DN" => "Användare DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt.",
+"Password" => "Lösenord",
+"For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
+"User Login Filter" => "Filter logga in användare",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "använd platshållare %%uid, t ex \"uid=%%uid\"",
+"User List Filter" => "Filter lista användare",
+"Defines the filter to apply, when retrieving users." => "Definierar filter att tillämpa vid listning av användare.",
+"without any placeholder, e.g. \"objectClass=person\"." => "utan platshållare, t.ex. \"objectClass=person\".",
+"Group Filter" => "Gruppfilter",
+"Defines the filter to apply, when retrieving groups." => "Definierar filter att tillämpa vid listning av grupper.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshållare, t.ex. \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Base User Tree" => "Bas för användare i katalogtjänst",
+"Base Group Tree" => "Bas för grupper i katalogtjänst",
+"Group-Member association" => "Attribut för gruppmedlemmar",
+"Use TLS" => "Använd TLS",
+"Do not use it for SSL connections, it will fail." => "Använd inte för SSL-anslutningar, det kommer inte att fungera.",
+"Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
+"Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server.",
+"Not recommended, use for testing only." => "Rekommenderas inte, använd bara för test. ",
+"User Display Name Field" => "Attribut för användarnamn",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Attribut som används för att generera användarnamn i ownCloud.",
+"Group Display Name Field" => "Attribut för gruppnamn",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Attribut som används för att generera gruppnamn i ownCloud.",
+"in bytes" => "i bytes",
+"in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
+"Help" => "Hjälp"
+);
diff --git a/apps/user_migrate/l10n/ca.php b/apps/user_migrate/l10n/ca.php
new file mode 100644
index 0000000000..6f1c77e417
--- /dev/null
+++ b/apps/user_migrate/l10n/ca.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exporta",
+"Something went wrong while the export file was being generated" => "Alguna cosa ha anat malament en generar el fitxer d'exportació",
+"An error has occurred" => "S'ha produït un error",
+"Export your user account" => "Exporta el vostre compte d'usuari",
+"This will create a compressed file that contains your ownCloud account." => "Això crearà un fitxer comprimit que conté el vostre compte ownCloud.",
+"Import user account" => "Importa el compte d'usuari",
+"ownCloud User Zip" => "zip d'usuari ownCloud",
+"Import" => "Importa"
+);
diff --git a/apps/user_migrate/l10n/sv.php b/apps/user_migrate/l10n/sv.php
new file mode 100644
index 0000000000..98e649632b
--- /dev/null
+++ b/apps/user_migrate/l10n/sv.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exportera",
+"Something went wrong while the export file was being generated" => "Något gick fel när exportfilen skulle genereras",
+"An error has occurred" => "Ett fel har uppstått",
+"Export your user account" => "Exportera ditt användarkonto",
+"This will create a compressed file that contains your ownCloud account." => "Detta vill skapa en komprimerad fil som innehåller ditt ownCloud-konto.",
+"Import user account" => "Importera ett användarkonto",
+"ownCloud User Zip" => "ownCloud  Zip-fil",
+"Import" => "Importera"
+);
diff --git a/apps/user_openid/l10n/ca.php b/apps/user_openid/l10n/ca.php
new file mode 100644
index 0000000000..d203bfb4d9
--- /dev/null
+++ b/apps/user_openid/l10n/ca.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Això és un punt final de servidor OpenID. Per més informació consulteu",
+"Identity: <b>" => "Identitat:<b>",
+"Realm: <b>" => "Domini:<b>",
+"User: <b>" => "Usuari:<b>",
+"Login" => "Inici de sessió",
+"Error: <b>No user Selected" => "Error:<b>No heu seleccionat cap usuari",
+"you can authenticate to other sites with this address" => "podeu autenticar altres llocs web amb aquesta adreça",
+"Authorized OpenID provider" => "Servidor OpenID autoritzat",
+"Your address at Wordpress, Identi.ca, &hellip;" => "La vostra adreça a Wordpress, Identi.ca &hellip;"
+);
diff --git a/apps/user_openid/l10n/sv.php b/apps/user_openid/l10n/sv.php
new file mode 100644
index 0000000000..fb2c4e2ff7
--- /dev/null
+++ b/apps/user_openid/l10n/sv.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Detta är en OpenID-server slutpunkt. För mer information, se",
+"Identity: <b>" => "Identitet: <b>",
+"Realm: <b>" => "Realm: <b>",
+"User: <b>" => "Användare: <b>",
+"Login" => "Logga in",
+"Error: <b>No user Selected" => "Fel: <b>Ingen användare vald",
+"you can authenticate to other sites with this address" => "du kan autentisera till andra webbplatser med denna adress",
+"Authorized OpenID provider" => "Godkänd openID leverantör",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Din adress på Wordpress, Identi.ca, &hellip;"
+);
diff --git a/l10n/af/admin_dependencies_chk.po b/l10n/af/admin_dependencies_chk.po
new file mode 100644
index 0000000000..cc514c3f09
--- /dev/null
+++ b/l10n/af/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/af/admin_migrate.po b/l10n/af/admin_migrate.po
new file mode 100644
index 0000000000..6801bee56d
--- /dev/null
+++ b/l10n/af/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/af/files_encryption.po b/l10n/af/files_encryption.po
new file mode 100644
index 0000000000..ba20608786
--- /dev/null
+++ b/l10n/af/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/af/files_external.po b/l10n/af/files_external.po
new file mode 100644
index 0000000000..3818f8ed56
--- /dev/null
+++ b/l10n/af/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
new file mode 100644
index 0000000000..c30e3dcd42
--- /dev/null
+++ b/l10n/af/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/af/files_versions.po b/l10n/af/files_versions.po
new file mode 100644
index 0000000000..d7b621cc6f
--- /dev/null
+++ b/l10n/af/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/af/tasks.po b/l10n/af/tasks.po
new file mode 100644
index 0000000000..ced9b6ce12
--- /dev/null
+++ b/l10n/af/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
new file mode 100644
index 0000000000..7abe79a5a8
--- /dev/null
+++ b/l10n/af/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/af/user_migrate.po b/l10n/af/user_migrate.po
new file mode 100644
index 0000000000..f1829f1329
--- /dev/null
+++ b/l10n/af/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/af/user_openid.po b/l10n/af/user_openid.po
new file mode 100644
index 0000000000..7d05e13987
--- /dev/null
+++ b/l10n/af/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ar/admin_dependencies_chk.po b/l10n/ar/admin_dependencies_chk.po
new file mode 100644
index 0000000000..cd7fa85a2b
--- /dev/null
+++ b/l10n/ar/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ar/admin_migrate.po b/l10n/ar/admin_migrate.po
new file mode 100644
index 0000000000..9dcf129cad
--- /dev/null
+++ b/l10n/ar/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
new file mode 100644
index 0000000000..18f508df5b
--- /dev/null
+++ b/l10n/ar/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
new file mode 100644
index 0000000000..c0dcac27be
--- /dev/null
+++ b/l10n/ar/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
new file mode 100644
index 0000000000..e96e0f5ef9
--- /dev/null
+++ b/l10n/ar/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
new file mode 100644
index 0000000000..de2471bc46
--- /dev/null
+++ b/l10n/ar/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ar/tasks.po b/l10n/ar/tasks.po
new file mode 100644
index 0000000000..baa311388f
--- /dev/null
+++ b/l10n/ar/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
new file mode 100644
index 0000000000..fc34568956
--- /dev/null
+++ b/l10n/ar/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ar/user_migrate.po b/l10n/ar/user_migrate.po
new file mode 100644
index 0000000000..6a29ae80a3
--- /dev/null
+++ b/l10n/ar/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ar/user_openid.po b/l10n/ar/user_openid.po
new file mode 100644
index 0000000000..7063958b17
--- /dev/null
+++ b/l10n/ar/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ar_SA/admin_dependencies_chk.po b/l10n/ar_SA/admin_dependencies_chk.po
new file mode 100644
index 0000000000..defa48d8f6
--- /dev/null
+++ b/l10n/ar_SA/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ar_SA/admin_migrate.po b/l10n/ar_SA/admin_migrate.po
new file mode 100644
index 0000000000..04ac5b2dfb
--- /dev/null
+++ b/l10n/ar_SA/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ar_SA/files_encryption.po b/l10n/ar_SA/files_encryption.po
new file mode 100644
index 0000000000..92f87d5bae
--- /dev/null
+++ b/l10n/ar_SA/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ar_SA/files_external.po b/l10n/ar_SA/files_external.po
new file mode 100644
index 0000000000..faa597d0f4
--- /dev/null
+++ b/l10n/ar_SA/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
new file mode 100644
index 0000000000..426f4c0423
--- /dev/null
+++ b/l10n/ar_SA/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ar_SA/files_versions.po b/l10n/ar_SA/files_versions.po
new file mode 100644
index 0000000000..0b3630c504
--- /dev/null
+++ b/l10n/ar_SA/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ar_SA/tasks.po b/l10n/ar_SA/tasks.po
new file mode 100644
index 0000000000..69ac800c5e
--- /dev/null
+++ b/l10n/ar_SA/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ar_SA/user_ldap.po b/l10n/ar_SA/user_ldap.po
new file mode 100644
index 0000000000..92a90a4f3b
--- /dev/null
+++ b/l10n/ar_SA/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ar_SA/user_migrate.po b/l10n/ar_SA/user_migrate.po
new file mode 100644
index 0000000000..c49cdec6c6
--- /dev/null
+++ b/l10n/ar_SA/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ar_SA/user_openid.po b/l10n/ar_SA/user_openid.po
new file mode 100644
index 0000000000..bf485303a2
--- /dev/null
+++ b/l10n/ar_SA/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/bg_BG/admin_dependencies_chk.po b/l10n/bg_BG/admin_dependencies_chk.po
new file mode 100644
index 0000000000..a90db6fe74
--- /dev/null
+++ b/l10n/bg_BG/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/bg_BG/admin_migrate.po b/l10n/bg_BG/admin_migrate.po
new file mode 100644
index 0000000000..7581234045
--- /dev/null
+++ b/l10n/bg_BG/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
new file mode 100644
index 0000000000..0db200dba5
--- /dev/null
+++ b/l10n/bg_BG/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
new file mode 100644
index 0000000000..fcc676908d
--- /dev/null
+++ b/l10n/bg_BG/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
new file mode 100644
index 0000000000..0682eb7965
--- /dev/null
+++ b/l10n/bg_BG/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
new file mode 100644
index 0000000000..40a5fc5e9b
--- /dev/null
+++ b/l10n/bg_BG/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/bg_BG/tasks.po b/l10n/bg_BG/tasks.po
new file mode 100644
index 0000000000..3f26e086ec
--- /dev/null
+++ b/l10n/bg_BG/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
new file mode 100644
index 0000000000..8b8f5723ce
--- /dev/null
+++ b/l10n/bg_BG/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/bg_BG/user_migrate.po b/l10n/bg_BG/user_migrate.po
new file mode 100644
index 0000000000..37fb22aebf
--- /dev/null
+++ b/l10n/bg_BG/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/bg_BG/user_openid.po b/l10n/bg_BG/user_openid.po
new file mode 100644
index 0000000000..be71873b64
--- /dev/null
+++ b/l10n/bg_BG/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ca/admin_dependencies_chk.po b/l10n/ca/admin_dependencies_chk.po
new file mode 100644
index 0000000000..1c5aef0e66
--- /dev/null
+++ b/l10n/ca/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:28+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "El mòdul php-json és necessari per moltes aplicacions per comunicacions internes"
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "El mòdul php-curl és necessari per mostrar el títol de la pàgina quan s'afegeixen adreces d'interès"
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "El mòdul php-gd és necessari per generar miniatures d'imatges"
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "El mòdul php-ldap és necessari per connectar amb el servidor ldap"
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "El mòdul php-zip és necessari per baixar múltiples fitxers de cop"
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "El mòdul php-mb_multibyte és necessari per gestionar correctament la codificació."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "El mòdul php-ctype és necessari per validar dades."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "El mòdul php-xml és necessari per compatir els fitxers amb webdav."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr "La directiva allow_url_fopen de php.ini hauria d'establir-se en 1 per accedir a la base de coneixements dels servidors OCS"
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "El mòdul php-pdo és necessari per desar les dades d'ownCloud en una base de dades."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Estat de dependències"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Usat per:"
diff --git a/l10n/ca/admin_migrate.po b/l10n/ca/admin_migrate.po
new file mode 100644
index 0000000000..285f752c6a
--- /dev/null
+++ b/l10n/ca/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:22+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exporta aquesta instància de ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Això crearà un fitxer comprimit amb les dades d'aquesta instància ownCloud.\n            Escolliu el tipus d'exportació:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exporta"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
new file mode 100644
index 0000000000..98571697a6
--- /dev/null
+++ b/l10n/ca/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:30+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Encriptatge"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Exclou els tipus de fitxers següents de l'encriptatge"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Cap"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Activa l'encriptatge"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
new file mode 100644
index 0000000000..8bc7ba3b00
--- /dev/null
+++ b/l10n/ca/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:33+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Emmagatzemament extern"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Punt de muntatge"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Dorsal"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Configuració"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Options"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Aplicable"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Afegeix punt de muntatge"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Cap d'establert"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Tots els usuaris"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Grups"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Usuaris"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "Certificats SSL root"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Importa certificat root"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Habilita l'emmagatzemament extern d'usuari"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Permet als usuaris muntar el seu emmagatzemament extern propi"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
new file mode 100644
index 0000000000..e4bd92a499
--- /dev/null
+++ b/l10n/ca/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:21+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Els vostres fitxers compartits"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Element"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Compartit amb"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Permisos"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Llegeix"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Edita"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Permet compartir amb tercers"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Permet als usuaris compartir fitxers que no són seus"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
new file mode 100644
index 0000000000..d0555a50f1
--- /dev/null
+++ b/l10n/ca/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:18+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Expira totes les versions"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Habilita les versions de fitxers"
diff --git a/l10n/ca/tasks.po b/l10n/ca/tasks.po
new file mode 100644
index 0000000000..b96519e57f
--- /dev/null
+++ b/l10n/ca/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:37+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "data/hora incorrecta"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Tasques"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Cap categoria"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Sense especificar"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=major"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=mitjana"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=inferior"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Elimina el resum"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Percentatge completat no vàlid"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Prioritat no vàlida"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Afegeix una tasca"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "Ordena per"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "Ordena per llista"
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "Ordena els complets"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "Ordena per ubicació"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "Ordena per prioritat"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "Ordena per etiqueta"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Carregant les tasques..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Important"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Més"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Menys"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Elimina"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
new file mode 100644
index 0000000000..9261cd06e5
--- /dev/null
+++ b/l10n/ca/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:54+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Màquina"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "DN Base"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "DN Usuari"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Contrasenya"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filtre d'inici de sessió d'usuari"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Llista de filtres d'usuari"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Filtre de grup"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Defineix el filtre a aplicar quan es mostren grups."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr "Arbre base d'usuaris"
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr "Arbre base de grups"
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Associació membres-grup"
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Usa TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "No ho useu en connexions SSL, fallarà."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Desactiva la validació de certificat SSL."
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "No recomanat, ús només per proves."
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr "Camp per mostrar el nom d'usuari"
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr "Camp per mostrar el nom del grup"
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "en bytes"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "en segons. Un canvi buidarà la memòria de cau."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Ajuda"
diff --git a/l10n/ca/user_migrate.po b/l10n/ca/user_migrate.po
new file mode 100644
index 0000000000..3732c55e9f
--- /dev/null
+++ b/l10n/ca/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:39+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Exporta"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Alguna cosa ha anat malament en generar el fitxer d'exportació"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "S'ha produït un error"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Exporta el vostre compte d'usuari"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Això crearà un fitxer comprimit que conté el vostre compte ownCloud."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Importa el compte d'usuari"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "zip d'usuari ownCloud"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importa"
diff --git a/l10n/ca/user_openid.po b/l10n/ca/user_openid.po
new file mode 100644
index 0000000000..35c53f5627
--- /dev/null
+++ b/l10n/ca/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:41+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Això és un punt final de servidor OpenID. Per més informació consulteu"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identitat:<b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Domini:<b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Usuari:<b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Inici de sessió"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Error:<b>No heu seleccionat cap usuari"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "podeu autenticar altres llocs web amb aquesta adreça"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Servidor OpenID autoritzat"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "La vostra adreça a Wordpress, Identi.ca &hellip;"
diff --git a/l10n/cs_CZ/admin_dependencies_chk.po b/l10n/cs_CZ/admin_dependencies_chk.po
new file mode 100644
index 0000000000..33a79435b5
--- /dev/null
+++ b/l10n/cs_CZ/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/cs_CZ/admin_migrate.po b/l10n/cs_CZ/admin_migrate.po
new file mode 100644
index 0000000000..c24913e070
--- /dev/null
+++ b/l10n/cs_CZ/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
new file mode 100644
index 0000000000..31ccf1b3f9
--- /dev/null
+++ b/l10n/cs_CZ/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
new file mode 100644
index 0000000000..1e85c96d4a
--- /dev/null
+++ b/l10n/cs_CZ/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
new file mode 100644
index 0000000000..67d9a7179e
--- /dev/null
+++ b/l10n/cs_CZ/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
new file mode 100644
index 0000000000..15207fae02
--- /dev/null
+++ b/l10n/cs_CZ/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/cs_CZ/tasks.po b/l10n/cs_CZ/tasks.po
new file mode 100644
index 0000000000..1d439040c6
--- /dev/null
+++ b/l10n/cs_CZ/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
new file mode 100644
index 0000000000..88b8270c80
--- /dev/null
+++ b/l10n/cs_CZ/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/cs_CZ/user_migrate.po b/l10n/cs_CZ/user_migrate.po
new file mode 100644
index 0000000000..f3602dccae
--- /dev/null
+++ b/l10n/cs_CZ/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/cs_CZ/user_openid.po b/l10n/cs_CZ/user_openid.po
new file mode 100644
index 0000000000..14f4ed1354
--- /dev/null
+++ b/l10n/cs_CZ/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/da/admin_dependencies_chk.po b/l10n/da/admin_dependencies_chk.po
new file mode 100644
index 0000000000..a0e629c133
--- /dev/null
+++ b/l10n/da/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/da/admin_migrate.po b/l10n/da/admin_migrate.po
new file mode 100644
index 0000000000..e597d849d4
--- /dev/null
+++ b/l10n/da/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
new file mode 100644
index 0000000000..94a4333bd1
--- /dev/null
+++ b/l10n/da/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
new file mode 100644
index 0000000000..d602714dba
--- /dev/null
+++ b/l10n/da/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
new file mode 100644
index 0000000000..c312be9fba
--- /dev/null
+++ b/l10n/da/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
new file mode 100644
index 0000000000..2aae166d77
--- /dev/null
+++ b/l10n/da/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/da/tasks.po b/l10n/da/tasks.po
new file mode 100644
index 0000000000..f2ddaaa160
--- /dev/null
+++ b/l10n/da/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
new file mode 100644
index 0000000000..186aad26c3
--- /dev/null
+++ b/l10n/da/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/da/user_migrate.po b/l10n/da/user_migrate.po
new file mode 100644
index 0000000000..3c03fa7396
--- /dev/null
+++ b/l10n/da/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/da/user_openid.po b/l10n/da/user_openid.po
new file mode 100644
index 0000000000..a9fdd710c8
--- /dev/null
+++ b/l10n/da/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/de/admin_dependencies_chk.po b/l10n/de/admin_dependencies_chk.po
new file mode 100644
index 0000000000..ea25facb3a
--- /dev/null
+++ b/l10n/de/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/de/admin_migrate.po b/l10n/de/admin_migrate.po
new file mode 100644
index 0000000000..e2c34ce2ce
--- /dev/null
+++ b/l10n/de/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index c9c6e6c14e..0aada56b32 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2011, 2012.
+#   <driz@i2pmail.org>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 20:28+0000\n"
+"Last-Translator: driz <driz@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -485,7 +486,7 @@ msgstr "Heute"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,7 +740,7 @@ msgstr "um"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Allgemein"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -747,11 +748,11 @@ msgstr "Zeitzone"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Zeitzone automatisch aktualisieren"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Zeitformat"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -763,7 +764,7 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Erster Wochentag"
 
 #: templates/settings.php:76
 msgid "Cache"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index caf318552b..2550ffd903 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2012.
+#   <driz@i2pmail.org>, 2012.
 #   <fh@cbix.de>, 2012.
 #   <florian.ruechel+owncloud@gmail.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
@@ -23,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 20:22+0000\n"
+"Last-Translator: driz <driz@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -290,7 +291,7 @@ msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Fehler beim Laden des Profilbildes."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -825,11 +826,11 @@ msgstr "Adressbücher konfigurieren"
 msgid "Select Address Books"
 msgstr "Wähle Adressbuch"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Name eingeben"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Beschreibung eingeben"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
new file mode 100644
index 0000000000..38b9a4bc05
--- /dev/null
+++ b/l10n/de/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <driz@i2pmail.org>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 20:21+0000\n"
+"Last-Translator: driz <driz@i2pmail.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Keine"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Verschlüsselung aktivieren"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
new file mode 100644
index 0000000000..4d9de10e67
--- /dev/null
+++ b/l10n/de/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
new file mode 100644
index 0000000000..120bbc8dd6
--- /dev/null
+++ b/l10n/de/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
new file mode 100644
index 0000000000..f8037f6cbe
--- /dev/null
+++ b/l10n/de/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/de/tasks.po b/l10n/de/tasks.po
new file mode 100644
index 0000000000..ab28b639e7
--- /dev/null
+++ b/l10n/de/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
new file mode 100644
index 0000000000..090e019351
--- /dev/null
+++ b/l10n/de/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/de/user_migrate.po b/l10n/de/user_migrate.po
new file mode 100644
index 0000000000..b46b8e12f4
--- /dev/null
+++ b/l10n/de/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/de/user_openid.po b/l10n/de/user_openid.po
new file mode 100644
index 0000000000..345d5452d8
--- /dev/null
+++ b/l10n/de/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/el/admin_dependencies_chk.po b/l10n/el/admin_dependencies_chk.po
new file mode 100644
index 0000000000..d1a97dc8f2
--- /dev/null
+++ b/l10n/el/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/el/admin_migrate.po b/l10n/el/admin_migrate.po
new file mode 100644
index 0000000000..9c9cb6234e
--- /dev/null
+++ b/l10n/el/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
new file mode 100644
index 0000000000..18179301de
--- /dev/null
+++ b/l10n/el/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
new file mode 100644
index 0000000000..aec86d2f48
--- /dev/null
+++ b/l10n/el/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
new file mode 100644
index 0000000000..ffff3a6e15
--- /dev/null
+++ b/l10n/el/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
new file mode 100644
index 0000000000..0c3ae5537c
--- /dev/null
+++ b/l10n/el/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/el/tasks.po b/l10n/el/tasks.po
new file mode 100644
index 0000000000..67d03159fd
--- /dev/null
+++ b/l10n/el/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
new file mode 100644
index 0000000000..d41d5a4ced
--- /dev/null
+++ b/l10n/el/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/el/user_migrate.po b/l10n/el/user_migrate.po
new file mode 100644
index 0000000000..81504510c5
--- /dev/null
+++ b/l10n/el/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/el/user_openid.po b/l10n/el/user_openid.po
new file mode 100644
index 0000000000..5ea17f45a3
--- /dev/null
+++ b/l10n/el/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/eo/admin_dependencies_chk.po b/l10n/eo/admin_dependencies_chk.po
new file mode 100644
index 0000000000..be22a0e5e8
--- /dev/null
+++ b/l10n/eo/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/eo/admin_migrate.po b/l10n/eo/admin_migrate.po
new file mode 100644
index 0000000000..ca3e132bd3
--- /dev/null
+++ b/l10n/eo/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
new file mode 100644
index 0000000000..3e173e196c
--- /dev/null
+++ b/l10n/eo/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
new file mode 100644
index 0000000000..089953a728
--- /dev/null
+++ b/l10n/eo/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
new file mode 100644
index 0000000000..ba8f508b66
--- /dev/null
+++ b/l10n/eo/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
new file mode 100644
index 0000000000..0d6b7356f9
--- /dev/null
+++ b/l10n/eo/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/eo/tasks.po b/l10n/eo/tasks.po
new file mode 100644
index 0000000000..a829a6ae23
--- /dev/null
+++ b/l10n/eo/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
new file mode 100644
index 0000000000..0a6274edd4
--- /dev/null
+++ b/l10n/eo/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/eo/user_migrate.po b/l10n/eo/user_migrate.po
new file mode 100644
index 0000000000..079fff49c7
--- /dev/null
+++ b/l10n/eo/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/eo/user_openid.po b/l10n/eo/user_openid.po
new file mode 100644
index 0000000000..b982103d35
--- /dev/null
+++ b/l10n/eo/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/es/admin_dependencies_chk.po b/l10n/es/admin_dependencies_chk.po
new file mode 100644
index 0000000000..4f43ec3c30
--- /dev/null
+++ b/l10n/es/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/es/admin_migrate.po b/l10n/es/admin_migrate.po
new file mode 100644
index 0000000000..fd2230f4c7
--- /dev/null
+++ b/l10n/es/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <juanma@kde.org.ar>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 04:59+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exportar esta instancia de ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Se creará un archivo comprimido que contendrá los datos de esta instancia de owncloud.\n            Por favor elegir el tipo de exportación:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportar"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
new file mode 100644
index 0000000000..32c5cd8587
--- /dev/null
+++ b/l10n/es/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
new file mode 100644
index 0000000000..17fbc463fd
--- /dev/null
+++ b/l10n/es/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
new file mode 100644
index 0000000000..6e4610baa0
--- /dev/null
+++ b/l10n/es/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
new file mode 100644
index 0000000000..48608fd407
--- /dev/null
+++ b/l10n/es/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/es/tasks.po b/l10n/es/tasks.po
new file mode 100644
index 0000000000..79d624ab38
--- /dev/null
+++ b/l10n/es/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
new file mode 100644
index 0000000000..4b0620e455
--- /dev/null
+++ b/l10n/es/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/es/user_migrate.po b/l10n/es/user_migrate.po
new file mode 100644
index 0000000000..aba673bd3f
--- /dev/null
+++ b/l10n/es/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/es/user_openid.po b/l10n/es/user_openid.po
new file mode 100644
index 0000000000..8d6e1cc908
--- /dev/null
+++ b/l10n/es/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/et_EE/admin_dependencies_chk.po b/l10n/et_EE/admin_dependencies_chk.po
new file mode 100644
index 0000000000..589ff81c36
--- /dev/null
+++ b/l10n/et_EE/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/et_EE/admin_migrate.po b/l10n/et_EE/admin_migrate.po
new file mode 100644
index 0000000000..c6f5f7eb0d
--- /dev/null
+++ b/l10n/et_EE/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
new file mode 100644
index 0000000000..de81587c37
--- /dev/null
+++ b/l10n/et_EE/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
new file mode 100644
index 0000000000..3321a99e08
--- /dev/null
+++ b/l10n/et_EE/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
new file mode 100644
index 0000000000..6a3fc45f75
--- /dev/null
+++ b/l10n/et_EE/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
new file mode 100644
index 0000000000..dccf6069c5
--- /dev/null
+++ b/l10n/et_EE/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/et_EE/tasks.po b/l10n/et_EE/tasks.po
new file mode 100644
index 0000000000..310756cc69
--- /dev/null
+++ b/l10n/et_EE/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
new file mode 100644
index 0000000000..38de7d5c10
--- /dev/null
+++ b/l10n/et_EE/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/et_EE/user_migrate.po b/l10n/et_EE/user_migrate.po
new file mode 100644
index 0000000000..88aea14138
--- /dev/null
+++ b/l10n/et_EE/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/et_EE/user_openid.po b/l10n/et_EE/user_openid.po
new file mode 100644
index 0000000000..7944fd1d36
--- /dev/null
+++ b/l10n/et_EE/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/eu/admin_dependencies_chk.po b/l10n/eu/admin_dependencies_chk.po
new file mode 100644
index 0000000000..92e7dfc1a3
--- /dev/null
+++ b/l10n/eu/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/eu/admin_migrate.po b/l10n/eu/admin_migrate.po
new file mode 100644
index 0000000000..c810a7d452
--- /dev/null
+++ b/l10n/eu/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
new file mode 100644
index 0000000000..7b883fb9a8
--- /dev/null
+++ b/l10n/eu/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
new file mode 100644
index 0000000000..488f582918
--- /dev/null
+++ b/l10n/eu/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
new file mode 100644
index 0000000000..1851e89cc8
--- /dev/null
+++ b/l10n/eu/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
new file mode 100644
index 0000000000..d2da93b8df
--- /dev/null
+++ b/l10n/eu/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/eu/tasks.po b/l10n/eu/tasks.po
new file mode 100644
index 0000000000..4ed8bae41d
--- /dev/null
+++ b/l10n/eu/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
new file mode 100644
index 0000000000..a948e44d5c
--- /dev/null
+++ b/l10n/eu/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/eu/user_migrate.po b/l10n/eu/user_migrate.po
new file mode 100644
index 0000000000..395533a480
--- /dev/null
+++ b/l10n/eu/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/eu/user_openid.po b/l10n/eu/user_openid.po
new file mode 100644
index 0000000000..917f83859a
--- /dev/null
+++ b/l10n/eu/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/eu_ES/admin_dependencies_chk.po b/l10n/eu_ES/admin_dependencies_chk.po
new file mode 100644
index 0000000000..931550cd28
--- /dev/null
+++ b/l10n/eu_ES/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/eu_ES/admin_migrate.po b/l10n/eu_ES/admin_migrate.po
new file mode 100644
index 0000000000..9bc05a4241
--- /dev/null
+++ b/l10n/eu_ES/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/eu_ES/files_encryption.po b/l10n/eu_ES/files_encryption.po
new file mode 100644
index 0000000000..04e045a38e
--- /dev/null
+++ b/l10n/eu_ES/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/eu_ES/files_external.po b/l10n/eu_ES/files_external.po
new file mode 100644
index 0000000000..37af2e3b7f
--- /dev/null
+++ b/l10n/eu_ES/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
new file mode 100644
index 0000000000..a9203e1818
--- /dev/null
+++ b/l10n/eu_ES/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/eu_ES/files_versions.po b/l10n/eu_ES/files_versions.po
new file mode 100644
index 0000000000..e27dd7812a
--- /dev/null
+++ b/l10n/eu_ES/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/eu_ES/tasks.po b/l10n/eu_ES/tasks.po
new file mode 100644
index 0000000000..aad5eb88c3
--- /dev/null
+++ b/l10n/eu_ES/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
new file mode 100644
index 0000000000..34f25c3435
--- /dev/null
+++ b/l10n/eu_ES/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/eu_ES/user_migrate.po b/l10n/eu_ES/user_migrate.po
new file mode 100644
index 0000000000..7a3cda2309
--- /dev/null
+++ b/l10n/eu_ES/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/eu_ES/user_openid.po b/l10n/eu_ES/user_openid.po
new file mode 100644
index 0000000000..7016da797d
--- /dev/null
+++ b/l10n/eu_ES/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fa/admin_dependencies_chk.po b/l10n/fa/admin_dependencies_chk.po
new file mode 100644
index 0000000000..265e0c6cd7
--- /dev/null
+++ b/l10n/fa/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fa/admin_migrate.po b/l10n/fa/admin_migrate.po
new file mode 100644
index 0000000000..6b80ec8eca
--- /dev/null
+++ b/l10n/fa/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
new file mode 100644
index 0000000000..ff23cb72c9
--- /dev/null
+++ b/l10n/fa/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
new file mode 100644
index 0000000000..7e4183a71b
--- /dev/null
+++ b/l10n/fa/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
new file mode 100644
index 0000000000..8afa64d981
--- /dev/null
+++ b/l10n/fa/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
new file mode 100644
index 0000000000..8fe77cc79f
--- /dev/null
+++ b/l10n/fa/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fa/tasks.po b/l10n/fa/tasks.po
new file mode 100644
index 0000000000..a8a28b716d
--- /dev/null
+++ b/l10n/fa/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
new file mode 100644
index 0000000000..eb2a0fd767
--- /dev/null
+++ b/l10n/fa/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fa/user_migrate.po b/l10n/fa/user_migrate.po
new file mode 100644
index 0000000000..dbd3fc6600
--- /dev/null
+++ b/l10n/fa/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fa/user_openid.po b/l10n/fa/user_openid.po
new file mode 100644
index 0000000000..abfc372d3c
--- /dev/null
+++ b/l10n/fa/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fi/admin_dependencies_chk.po b/l10n/fi/admin_dependencies_chk.po
new file mode 100644
index 0000000000..c3fe2f9822
--- /dev/null
+++ b/l10n/fi/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fi/admin_migrate.po b/l10n/fi/admin_migrate.po
new file mode 100644
index 0000000000..3aea7a7ce5
--- /dev/null
+++ b/l10n/fi/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fi/files_encryption.po b/l10n/fi/files_encryption.po
new file mode 100644
index 0000000000..8aa6088c38
--- /dev/null
+++ b/l10n/fi/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fi/files_external.po b/l10n/fi/files_external.po
new file mode 100644
index 0000000000..6b036592f0
--- /dev/null
+++ b/l10n/fi/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
new file mode 100644
index 0000000000..375cb6c6e3
--- /dev/null
+++ b/l10n/fi/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fi/files_versions.po b/l10n/fi/files_versions.po
new file mode 100644
index 0000000000..89bfb8144e
--- /dev/null
+++ b/l10n/fi/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fi/tasks.po b/l10n/fi/tasks.po
new file mode 100644
index 0000000000..91f222dac3
--- /dev/null
+++ b/l10n/fi/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
new file mode 100644
index 0000000000..70707a1d17
--- /dev/null
+++ b/l10n/fi/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fi/user_migrate.po b/l10n/fi/user_migrate.po
new file mode 100644
index 0000000000..cd3ef8ef5a
--- /dev/null
+++ b/l10n/fi/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fi/user_openid.po b/l10n/fi/user_openid.po
new file mode 100644
index 0000000000..a6f5b6048d
--- /dev/null
+++ b/l10n/fi/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fi_FI/admin_dependencies_chk.po b/l10n/fi_FI/admin_dependencies_chk.po
new file mode 100644
index 0000000000..46b0ad55d7
--- /dev/null
+++ b/l10n/fi_FI/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fi_FI/admin_migrate.po b/l10n/fi_FI/admin_migrate.po
new file mode 100644
index 0000000000..ba949be087
--- /dev/null
+++ b/l10n/fi_FI/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
new file mode 100644
index 0000000000..62b43dfc31
--- /dev/null
+++ b/l10n/fi_FI/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
new file mode 100644
index 0000000000..101691c078
--- /dev/null
+++ b/l10n/fi_FI/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
new file mode 100644
index 0000000000..defc8793ba
--- /dev/null
+++ b/l10n/fi_FI/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
new file mode 100644
index 0000000000..678c8cda62
--- /dev/null
+++ b/l10n/fi_FI/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fi_FI/tasks.po b/l10n/fi_FI/tasks.po
new file mode 100644
index 0000000000..0e179f0b47
--- /dev/null
+++ b/l10n/fi_FI/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
new file mode 100644
index 0000000000..601e9c1d35
--- /dev/null
+++ b/l10n/fi_FI/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fi_FI/user_migrate.po b/l10n/fi_FI/user_migrate.po
new file mode 100644
index 0000000000..17bff479f0
--- /dev/null
+++ b/l10n/fi_FI/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fi_FI/user_openid.po b/l10n/fi_FI/user_openid.po
new file mode 100644
index 0000000000..7b5195bbcc
--- /dev/null
+++ b/l10n/fi_FI/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fr/admin_dependencies_chk.po b/l10n/fr/admin_dependencies_chk.po
new file mode 100644
index 0000000000..9ac75de6c9
--- /dev/null
+++ b/l10n/fr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fr/admin_migrate.po b/l10n/fr/admin_migrate.po
new file mode 100644
index 0000000000..b2e53d208f
--- /dev/null
+++ b/l10n/fr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
new file mode 100644
index 0000000000..76024f3a78
--- /dev/null
+++ b/l10n/fr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
new file mode 100644
index 0000000000..75d8c06498
--- /dev/null
+++ b/l10n/fr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
new file mode 100644
index 0000000000..6e72c0e324
--- /dev/null
+++ b/l10n/fr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
new file mode 100644
index 0000000000..c6176a9414
--- /dev/null
+++ b/l10n/fr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fr/tasks.po b/l10n/fr/tasks.po
new file mode 100644
index 0000000000..39d5b8c564
--- /dev/null
+++ b/l10n/fr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
new file mode 100644
index 0000000000..a48dcb6094
--- /dev/null
+++ b/l10n/fr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fr/user_migrate.po b/l10n/fr/user_migrate.po
new file mode 100644
index 0000000000..3d50d1f56a
--- /dev/null
+++ b/l10n/fr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fr/user_openid.po b/l10n/fr/user_openid.po
new file mode 100644
index 0000000000..5dafa24dd9
--- /dev/null
+++ b/l10n/fr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/gl/admin_dependencies_chk.po b/l10n/gl/admin_dependencies_chk.po
new file mode 100644
index 0000000000..09e5576eba
--- /dev/null
+++ b/l10n/gl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/gl/admin_migrate.po b/l10n/gl/admin_migrate.po
new file mode 100644
index 0000000000..7684dc62ca
--- /dev/null
+++ b/l10n/gl/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 06:27+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exporta esta instancia de ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Esto creará un ficheiro comprimido que contén os datos de esta instancia de ownCloud.\nPor favor escolla o modo de exportación:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportar"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
new file mode 100644
index 0000000000..c401e95b84
--- /dev/null
+++ b/l10n/gl/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
new file mode 100644
index 0000000000..056cc10b6a
--- /dev/null
+++ b/l10n/gl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
new file mode 100644
index 0000000000..ddde4141dc
--- /dev/null
+++ b/l10n/gl/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
new file mode 100644
index 0000000000..7c68c81752
--- /dev/null
+++ b/l10n/gl/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/gl/tasks.po b/l10n/gl/tasks.po
new file mode 100644
index 0000000000..39ebfcde7c
--- /dev/null
+++ b/l10n/gl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
new file mode 100644
index 0000000000..08efd8bd99
--- /dev/null
+++ b/l10n/gl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/gl/user_migrate.po b/l10n/gl/user_migrate.po
new file mode 100644
index 0000000000..b36741c479
--- /dev/null
+++ b/l10n/gl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/gl/user_openid.po b/l10n/gl/user_openid.po
new file mode 100644
index 0000000000..6566b274df
--- /dev/null
+++ b/l10n/gl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/he/admin_dependencies_chk.po b/l10n/he/admin_dependencies_chk.po
new file mode 100644
index 0000000000..01c45eae4c
--- /dev/null
+++ b/l10n/he/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/he/admin_migrate.po b/l10n/he/admin_migrate.po
new file mode 100644
index 0000000000..6968c6351e
--- /dev/null
+++ b/l10n/he/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
new file mode 100644
index 0000000000..ab535b9271
--- /dev/null
+++ b/l10n/he/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
new file mode 100644
index 0000000000..ba3aa0596e
--- /dev/null
+++ b/l10n/he/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
new file mode 100644
index 0000000000..30342046df
--- /dev/null
+++ b/l10n/he/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
new file mode 100644
index 0000000000..824d188bfd
--- /dev/null
+++ b/l10n/he/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/he/tasks.po b/l10n/he/tasks.po
new file mode 100644
index 0000000000..7f26426e1c
--- /dev/null
+++ b/l10n/he/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
new file mode 100644
index 0000000000..4dfdbd692b
--- /dev/null
+++ b/l10n/he/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/he/user_migrate.po b/l10n/he/user_migrate.po
new file mode 100644
index 0000000000..0a4f2c6739
--- /dev/null
+++ b/l10n/he/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/he/user_openid.po b/l10n/he/user_openid.po
new file mode 100644
index 0000000000..58c09141c7
--- /dev/null
+++ b/l10n/he/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/hr/admin_dependencies_chk.po b/l10n/hr/admin_dependencies_chk.po
new file mode 100644
index 0000000000..5278ae63b0
--- /dev/null
+++ b/l10n/hr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/hr/admin_migrate.po b/l10n/hr/admin_migrate.po
new file mode 100644
index 0000000000..6b445e7e51
--- /dev/null
+++ b/l10n/hr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
new file mode 100644
index 0000000000..d2734fd9fd
--- /dev/null
+++ b/l10n/hr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
new file mode 100644
index 0000000000..3406e426af
--- /dev/null
+++ b/l10n/hr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
new file mode 100644
index 0000000000..218ed39d84
--- /dev/null
+++ b/l10n/hr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
new file mode 100644
index 0000000000..f49ed48608
--- /dev/null
+++ b/l10n/hr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hr/tasks.po b/l10n/hr/tasks.po
new file mode 100644
index 0000000000..210a819f64
--- /dev/null
+++ b/l10n/hr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
new file mode 100644
index 0000000000..14dcd91c01
--- /dev/null
+++ b/l10n/hr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/hr/user_migrate.po b/l10n/hr/user_migrate.po
new file mode 100644
index 0000000000..edbfa8b176
--- /dev/null
+++ b/l10n/hr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/hr/user_openid.po b/l10n/hr/user_openid.po
new file mode 100644
index 0000000000..1f9e7c5ad5
--- /dev/null
+++ b/l10n/hr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/hu_HU/admin_dependencies_chk.po b/l10n/hu_HU/admin_dependencies_chk.po
new file mode 100644
index 0000000000..1dad50f27a
--- /dev/null
+++ b/l10n/hu_HU/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/hu_HU/admin_migrate.po b/l10n/hu_HU/admin_migrate.po
new file mode 100644
index 0000000000..f23b87abaa
--- /dev/null
+++ b/l10n/hu_HU/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
new file mode 100644
index 0000000000..6b70a6b368
--- /dev/null
+++ b/l10n/hu_HU/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
new file mode 100644
index 0000000000..b08622b2d9
--- /dev/null
+++ b/l10n/hu_HU/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
new file mode 100644
index 0000000000..582e43e332
--- /dev/null
+++ b/l10n/hu_HU/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
new file mode 100644
index 0000000000..c7ef6a41ba
--- /dev/null
+++ b/l10n/hu_HU/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hu_HU/tasks.po b/l10n/hu_HU/tasks.po
new file mode 100644
index 0000000000..73f8d61103
--- /dev/null
+++ b/l10n/hu_HU/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
new file mode 100644
index 0000000000..87c015d08c
--- /dev/null
+++ b/l10n/hu_HU/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/hu_HU/user_migrate.po b/l10n/hu_HU/user_migrate.po
new file mode 100644
index 0000000000..ba51abb24d
--- /dev/null
+++ b/l10n/hu_HU/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/hu_HU/user_openid.po b/l10n/hu_HU/user_openid.po
new file mode 100644
index 0000000000..bc86ad5896
--- /dev/null
+++ b/l10n/hu_HU/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/hy/admin_dependencies_chk.po b/l10n/hy/admin_dependencies_chk.po
new file mode 100644
index 0000000000..c649d0fc44
--- /dev/null
+++ b/l10n/hy/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/hy/admin_migrate.po b/l10n/hy/admin_migrate.po
new file mode 100644
index 0000000000..2affc03615
--- /dev/null
+++ b/l10n/hy/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
new file mode 100644
index 0000000000..00b039ad39
--- /dev/null
+++ b/l10n/hy/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
new file mode 100644
index 0000000000..964bc85d34
--- /dev/null
+++ b/l10n/hy/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
new file mode 100644
index 0000000000..082dcd23fc
--- /dev/null
+++ b/l10n/hy/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
new file mode 100644
index 0000000000..756f8887dd
--- /dev/null
+++ b/l10n/hy/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hy/tasks.po b/l10n/hy/tasks.po
new file mode 100644
index 0000000000..d459a98917
--- /dev/null
+++ b/l10n/hy/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
new file mode 100644
index 0000000000..78202c352c
--- /dev/null
+++ b/l10n/hy/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/hy/user_migrate.po b/l10n/hy/user_migrate.po
new file mode 100644
index 0000000000..b834f8ceee
--- /dev/null
+++ b/l10n/hy/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/hy/user_openid.po b/l10n/hy/user_openid.po
new file mode 100644
index 0000000000..ccf243a3aa
--- /dev/null
+++ b/l10n/hy/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ia/admin_dependencies_chk.po b/l10n/ia/admin_dependencies_chk.po
new file mode 100644
index 0000000000..1ac2e89083
--- /dev/null
+++ b/l10n/ia/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ia/admin_migrate.po b/l10n/ia/admin_migrate.po
new file mode 100644
index 0000000000..c767ecf34f
--- /dev/null
+++ b/l10n/ia/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
new file mode 100644
index 0000000000..8b85b14f5c
--- /dev/null
+++ b/l10n/ia/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
new file mode 100644
index 0000000000..4cb49f32d3
--- /dev/null
+++ b/l10n/ia/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
new file mode 100644
index 0000000000..1fe706ecf4
--- /dev/null
+++ b/l10n/ia/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
new file mode 100644
index 0000000000..d98c59df09
--- /dev/null
+++ b/l10n/ia/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ia/tasks.po b/l10n/ia/tasks.po
new file mode 100644
index 0000000000..be00099555
--- /dev/null
+++ b/l10n/ia/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
new file mode 100644
index 0000000000..f5bb1888f4
--- /dev/null
+++ b/l10n/ia/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ia/user_migrate.po b/l10n/ia/user_migrate.po
new file mode 100644
index 0000000000..b581cb2029
--- /dev/null
+++ b/l10n/ia/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ia/user_openid.po b/l10n/ia/user_openid.po
new file mode 100644
index 0000000000..a3e999d437
--- /dev/null
+++ b/l10n/ia/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/id/admin_dependencies_chk.po b/l10n/id/admin_dependencies_chk.po
new file mode 100644
index 0000000000..ae358d17af
--- /dev/null
+++ b/l10n/id/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/id/admin_migrate.po b/l10n/id/admin_migrate.po
new file mode 100644
index 0000000000..52a6b1908b
--- /dev/null
+++ b/l10n/id/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
new file mode 100644
index 0000000000..82e011fada
--- /dev/null
+++ b/l10n/id/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
new file mode 100644
index 0000000000..812c0c97ee
--- /dev/null
+++ b/l10n/id/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
new file mode 100644
index 0000000000..d960b8fa4f
--- /dev/null
+++ b/l10n/id/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
new file mode 100644
index 0000000000..2014a3f2f1
--- /dev/null
+++ b/l10n/id/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/id/tasks.po b/l10n/id/tasks.po
new file mode 100644
index 0000000000..bea6e2596f
--- /dev/null
+++ b/l10n/id/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
new file mode 100644
index 0000000000..528094a8b2
--- /dev/null
+++ b/l10n/id/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/id/user_migrate.po b/l10n/id/user_migrate.po
new file mode 100644
index 0000000000..8ff8940b53
--- /dev/null
+++ b/l10n/id/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/id/user_openid.po b/l10n/id/user_openid.po
new file mode 100644
index 0000000000..426a639668
--- /dev/null
+++ b/l10n/id/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/id_ID/admin_dependencies_chk.po b/l10n/id_ID/admin_dependencies_chk.po
new file mode 100644
index 0000000000..359c14556b
--- /dev/null
+++ b/l10n/id_ID/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/id_ID/admin_migrate.po b/l10n/id_ID/admin_migrate.po
new file mode 100644
index 0000000000..129c39c8d7
--- /dev/null
+++ b/l10n/id_ID/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/id_ID/files_encryption.po b/l10n/id_ID/files_encryption.po
new file mode 100644
index 0000000000..56ba9cd601
--- /dev/null
+++ b/l10n/id_ID/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/id_ID/files_external.po b/l10n/id_ID/files_external.po
new file mode 100644
index 0000000000..1cdaed8b98
--- /dev/null
+++ b/l10n/id_ID/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
new file mode 100644
index 0000000000..e98ec0d21f
--- /dev/null
+++ b/l10n/id_ID/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/id_ID/files_versions.po b/l10n/id_ID/files_versions.po
new file mode 100644
index 0000000000..f8b53c2af4
--- /dev/null
+++ b/l10n/id_ID/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/id_ID/tasks.po b/l10n/id_ID/tasks.po
new file mode 100644
index 0000000000..cf74571c75
--- /dev/null
+++ b/l10n/id_ID/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/id_ID/user_ldap.po b/l10n/id_ID/user_ldap.po
new file mode 100644
index 0000000000..eb078008f5
--- /dev/null
+++ b/l10n/id_ID/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/id_ID/user_migrate.po b/l10n/id_ID/user_migrate.po
new file mode 100644
index 0000000000..fd3779f871
--- /dev/null
+++ b/l10n/id_ID/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/id_ID/user_openid.po b/l10n/id_ID/user_openid.po
new file mode 100644
index 0000000000..42b92de9fa
--- /dev/null
+++ b/l10n/id_ID/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/it/admin_dependencies_chk.po b/l10n/it/admin_dependencies_chk.po
new file mode 100644
index 0000000000..c2abc92923
--- /dev/null
+++ b/l10n/it/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/it/admin_migrate.po b/l10n/it/admin_migrate.po
new file mode 100644
index 0000000000..e94f4f4bb9
--- /dev/null
+++ b/l10n/it/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
new file mode 100644
index 0000000000..cc162fd77e
--- /dev/null
+++ b/l10n/it/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
new file mode 100644
index 0000000000..23b431e716
--- /dev/null
+++ b/l10n/it/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
new file mode 100644
index 0000000000..c2b3f0f95a
--- /dev/null
+++ b/l10n/it/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
new file mode 100644
index 0000000000..3f6bd1465a
--- /dev/null
+++ b/l10n/it/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
new file mode 100644
index 0000000000..130a092b66
--- /dev/null
+++ b/l10n/it/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
new file mode 100644
index 0000000000..a148025886
--- /dev/null
+++ b/l10n/it/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/it/user_migrate.po b/l10n/it/user_migrate.po
new file mode 100644
index 0000000000..2600696b79
--- /dev/null
+++ b/l10n/it/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/it/user_openid.po b/l10n/it/user_openid.po
new file mode 100644
index 0000000000..37d859ae35
--- /dev/null
+++ b/l10n/it/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ja_JP/admin_dependencies_chk.po b/l10n/ja_JP/admin_dependencies_chk.po
new file mode 100644
index 0000000000..1d928c91bd
--- /dev/null
+++ b/l10n/ja_JP/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ja_JP/admin_migrate.po b/l10n/ja_JP/admin_migrate.po
new file mode 100644
index 0000000000..b0603a4f42
--- /dev/null
+++ b/l10n/ja_JP/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
new file mode 100644
index 0000000000..5cf8f5a4c0
--- /dev/null
+++ b/l10n/ja_JP/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
new file mode 100644
index 0000000000..6096d9408f
--- /dev/null
+++ b/l10n/ja_JP/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
new file mode 100644
index 0000000000..fcadb4bdc9
--- /dev/null
+++ b/l10n/ja_JP/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
new file mode 100644
index 0000000000..e61c39bff4
--- /dev/null
+++ b/l10n/ja_JP/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ja_JP/tasks.po b/l10n/ja_JP/tasks.po
new file mode 100644
index 0000000000..fdd063c3ca
--- /dev/null
+++ b/l10n/ja_JP/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
new file mode 100644
index 0000000000..d19e9c5dd8
--- /dev/null
+++ b/l10n/ja_JP/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ja_JP/user_migrate.po b/l10n/ja_JP/user_migrate.po
new file mode 100644
index 0000000000..04d95df0be
--- /dev/null
+++ b/l10n/ja_JP/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ja_JP/user_openid.po b/l10n/ja_JP/user_openid.po
new file mode 100644
index 0000000000..877dc59cdf
--- /dev/null
+++ b/l10n/ja_JP/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ko/admin_dependencies_chk.po b/l10n/ko/admin_dependencies_chk.po
new file mode 100644
index 0000000000..a6510ce3a8
--- /dev/null
+++ b/l10n/ko/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ko/admin_migrate.po b/l10n/ko/admin_migrate.po
new file mode 100644
index 0000000000..65b1d84b61
--- /dev/null
+++ b/l10n/ko/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
new file mode 100644
index 0000000000..4f31caefbd
--- /dev/null
+++ b/l10n/ko/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
new file mode 100644
index 0000000000..a2ca063a69
--- /dev/null
+++ b/l10n/ko/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
new file mode 100644
index 0000000000..ab00c1b050
--- /dev/null
+++ b/l10n/ko/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
new file mode 100644
index 0000000000..7646c3ad8e
--- /dev/null
+++ b/l10n/ko/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ko/tasks.po b/l10n/ko/tasks.po
new file mode 100644
index 0000000000..58c447717b
--- /dev/null
+++ b/l10n/ko/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
new file mode 100644
index 0000000000..0cc01bfddf
--- /dev/null
+++ b/l10n/ko/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ko/user_migrate.po b/l10n/ko/user_migrate.po
new file mode 100644
index 0000000000..5d9886e705
--- /dev/null
+++ b/l10n/ko/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ko/user_openid.po b/l10n/ko/user_openid.po
new file mode 100644
index 0000000000..aaa8bf4837
--- /dev/null
+++ b/l10n/ko/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/lb/admin_dependencies_chk.po b/l10n/lb/admin_dependencies_chk.po
new file mode 100644
index 0000000000..f49abb2814
--- /dev/null
+++ b/l10n/lb/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/lb/admin_migrate.po b/l10n/lb/admin_migrate.po
new file mode 100644
index 0000000000..a4912b42c8
--- /dev/null
+++ b/l10n/lb/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
new file mode 100644
index 0000000000..5446d2366b
--- /dev/null
+++ b/l10n/lb/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
new file mode 100644
index 0000000000..0ea90478bd
--- /dev/null
+++ b/l10n/lb/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
new file mode 100644
index 0000000000..c2f614a934
--- /dev/null
+++ b/l10n/lb/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
new file mode 100644
index 0000000000..1ecdf054fe
--- /dev/null
+++ b/l10n/lb/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/lb/tasks.po b/l10n/lb/tasks.po
new file mode 100644
index 0000000000..62a9a4b722
--- /dev/null
+++ b/l10n/lb/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
new file mode 100644
index 0000000000..75252b76c9
--- /dev/null
+++ b/l10n/lb/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/lb/user_migrate.po b/l10n/lb/user_migrate.po
new file mode 100644
index 0000000000..7ecbf9a92b
--- /dev/null
+++ b/l10n/lb/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/lb/user_openid.po b/l10n/lb/user_openid.po
new file mode 100644
index 0000000000..785483e735
--- /dev/null
+++ b/l10n/lb/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/lt_LT/admin_dependencies_chk.po b/l10n/lt_LT/admin_dependencies_chk.po
new file mode 100644
index 0000000000..52d674cbee
--- /dev/null
+++ b/l10n/lt_LT/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/lt_LT/admin_migrate.po b/l10n/lt_LT/admin_migrate.po
new file mode 100644
index 0000000000..d35d28001f
--- /dev/null
+++ b/l10n/lt_LT/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
new file mode 100644
index 0000000000..098eec3378
--- /dev/null
+++ b/l10n/lt_LT/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
new file mode 100644
index 0000000000..c24158d494
--- /dev/null
+++ b/l10n/lt_LT/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
new file mode 100644
index 0000000000..f834a4d60d
--- /dev/null
+++ b/l10n/lt_LT/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
new file mode 100644
index 0000000000..32374a3c35
--- /dev/null
+++ b/l10n/lt_LT/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/lt_LT/tasks.po b/l10n/lt_LT/tasks.po
new file mode 100644
index 0000000000..5bbe766c2b
--- /dev/null
+++ b/l10n/lt_LT/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
new file mode 100644
index 0000000000..4002c36aa5
--- /dev/null
+++ b/l10n/lt_LT/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/lt_LT/user_migrate.po b/l10n/lt_LT/user_migrate.po
new file mode 100644
index 0000000000..391a7cbec4
--- /dev/null
+++ b/l10n/lt_LT/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/lt_LT/user_openid.po b/l10n/lt_LT/user_openid.po
new file mode 100644
index 0000000000..9567cf6ec3
--- /dev/null
+++ b/l10n/lt_LT/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/lv/admin_dependencies_chk.po b/l10n/lv/admin_dependencies_chk.po
new file mode 100644
index 0000000000..0ad70f3449
--- /dev/null
+++ b/l10n/lv/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/lv/admin_migrate.po b/l10n/lv/admin_migrate.po
new file mode 100644
index 0000000000..2be34daece
--- /dev/null
+++ b/l10n/lv/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
new file mode 100644
index 0000000000..6b2dc7673d
--- /dev/null
+++ b/l10n/lv/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
new file mode 100644
index 0000000000..5004aadaab
--- /dev/null
+++ b/l10n/lv/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
new file mode 100644
index 0000000000..940df7205e
--- /dev/null
+++ b/l10n/lv/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
new file mode 100644
index 0000000000..5802b0782b
--- /dev/null
+++ b/l10n/lv/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/lv/tasks.po b/l10n/lv/tasks.po
new file mode 100644
index 0000000000..20b56238ac
--- /dev/null
+++ b/l10n/lv/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
new file mode 100644
index 0000000000..3596376f70
--- /dev/null
+++ b/l10n/lv/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/lv/user_migrate.po b/l10n/lv/user_migrate.po
new file mode 100644
index 0000000000..d54da6a081
--- /dev/null
+++ b/l10n/lv/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/lv/user_openid.po b/l10n/lv/user_openid.po
new file mode 100644
index 0000000000..2dbaa488ad
--- /dev/null
+++ b/l10n/lv/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/mk/admin_dependencies_chk.po b/l10n/mk/admin_dependencies_chk.po
new file mode 100644
index 0000000000..18aee717b6
--- /dev/null
+++ b/l10n/mk/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/mk/admin_migrate.po b/l10n/mk/admin_migrate.po
new file mode 100644
index 0000000000..f692f21985
--- /dev/null
+++ b/l10n/mk/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
new file mode 100644
index 0000000000..7a40ba3a3b
--- /dev/null
+++ b/l10n/mk/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
new file mode 100644
index 0000000000..25166e22cc
--- /dev/null
+++ b/l10n/mk/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
new file mode 100644
index 0000000000..161d976c65
--- /dev/null
+++ b/l10n/mk/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
new file mode 100644
index 0000000000..cafc33279c
--- /dev/null
+++ b/l10n/mk/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/mk/tasks.po b/l10n/mk/tasks.po
new file mode 100644
index 0000000000..f06174892d
--- /dev/null
+++ b/l10n/mk/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
new file mode 100644
index 0000000000..bcde61dcc6
--- /dev/null
+++ b/l10n/mk/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/mk/user_migrate.po b/l10n/mk/user_migrate.po
new file mode 100644
index 0000000000..06c88c2599
--- /dev/null
+++ b/l10n/mk/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/mk/user_openid.po b/l10n/mk/user_openid.po
new file mode 100644
index 0000000000..3636c401f6
--- /dev/null
+++ b/l10n/mk/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ms_MY/admin_dependencies_chk.po b/l10n/ms_MY/admin_dependencies_chk.po
new file mode 100644
index 0000000000..00564b0cf2
--- /dev/null
+++ b/l10n/ms_MY/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ms_MY/admin_migrate.po b/l10n/ms_MY/admin_migrate.po
new file mode 100644
index 0000000000..30cd1e1be6
--- /dev/null
+++ b/l10n/ms_MY/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
new file mode 100644
index 0000000000..33de1d365d
--- /dev/null
+++ b/l10n/ms_MY/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
new file mode 100644
index 0000000000..98ff53cf44
--- /dev/null
+++ b/l10n/ms_MY/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
new file mode 100644
index 0000000000..6de1cf4ae5
--- /dev/null
+++ b/l10n/ms_MY/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
new file mode 100644
index 0000000000..3e40393f2a
--- /dev/null
+++ b/l10n/ms_MY/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ms_MY/tasks.po b/l10n/ms_MY/tasks.po
new file mode 100644
index 0000000000..6a67235eee
--- /dev/null
+++ b/l10n/ms_MY/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
new file mode 100644
index 0000000000..744d804e9c
--- /dev/null
+++ b/l10n/ms_MY/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ms_MY/user_migrate.po b/l10n/ms_MY/user_migrate.po
new file mode 100644
index 0000000000..f4e730b7c8
--- /dev/null
+++ b/l10n/ms_MY/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ms_MY/user_openid.po b/l10n/ms_MY/user_openid.po
new file mode 100644
index 0000000000..867a3bb737
--- /dev/null
+++ b/l10n/ms_MY/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/nb_NO/admin_dependencies_chk.po b/l10n/nb_NO/admin_dependencies_chk.po
new file mode 100644
index 0000000000..0a6cff69a0
--- /dev/null
+++ b/l10n/nb_NO/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/nb_NO/admin_migrate.po b/l10n/nb_NO/admin_migrate.po
new file mode 100644
index 0000000000..9d35d80bc3
--- /dev/null
+++ b/l10n/nb_NO/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
new file mode 100644
index 0000000000..2a9b9beeb9
--- /dev/null
+++ b/l10n/nb_NO/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
new file mode 100644
index 0000000000..757e0be549
--- /dev/null
+++ b/l10n/nb_NO/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
new file mode 100644
index 0000000000..fc3364ed34
--- /dev/null
+++ b/l10n/nb_NO/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
new file mode 100644
index 0000000000..2b2437b579
--- /dev/null
+++ b/l10n/nb_NO/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/nb_NO/tasks.po b/l10n/nb_NO/tasks.po
new file mode 100644
index 0000000000..bcfe213161
--- /dev/null
+++ b/l10n/nb_NO/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
new file mode 100644
index 0000000000..3a14ed0b28
--- /dev/null
+++ b/l10n/nb_NO/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/nb_NO/user_migrate.po b/l10n/nb_NO/user_migrate.po
new file mode 100644
index 0000000000..2e2605cb75
--- /dev/null
+++ b/l10n/nb_NO/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/nb_NO/user_openid.po b/l10n/nb_NO/user_openid.po
new file mode 100644
index 0000000000..cf98d889a4
--- /dev/null
+++ b/l10n/nb_NO/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/nl/admin_dependencies_chk.po b/l10n/nl/admin_dependencies_chk.po
new file mode 100644
index 0000000000..436ece1cde
--- /dev/null
+++ b/l10n/nl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/nl/admin_migrate.po b/l10n/nl/admin_migrate.po
new file mode 100644
index 0000000000..ad085a1d15
--- /dev/null
+++ b/l10n/nl/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
new file mode 100644
index 0000000000..bae30cdd15
--- /dev/null
+++ b/l10n/nl/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
new file mode 100644
index 0000000000..c9d3312541
--- /dev/null
+++ b/l10n/nl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
new file mode 100644
index 0000000000..9a3b58a554
--- /dev/null
+++ b/l10n/nl/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
new file mode 100644
index 0000000000..94bdd0d707
--- /dev/null
+++ b/l10n/nl/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/nl/tasks.po b/l10n/nl/tasks.po
new file mode 100644
index 0000000000..f413e75158
--- /dev/null
+++ b/l10n/nl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
new file mode 100644
index 0000000000..89b469b7ed
--- /dev/null
+++ b/l10n/nl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/nl/user_migrate.po b/l10n/nl/user_migrate.po
new file mode 100644
index 0000000000..cf6e2f0cd3
--- /dev/null
+++ b/l10n/nl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/nl/user_openid.po b/l10n/nl/user_openid.po
new file mode 100644
index 0000000000..c046633481
--- /dev/null
+++ b/l10n/nl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/nn_NO/admin_dependencies_chk.po b/l10n/nn_NO/admin_dependencies_chk.po
new file mode 100644
index 0000000000..e15c7820ec
--- /dev/null
+++ b/l10n/nn_NO/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/nn_NO/admin_migrate.po b/l10n/nn_NO/admin_migrate.po
new file mode 100644
index 0000000000..5509000343
--- /dev/null
+++ b/l10n/nn_NO/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
new file mode 100644
index 0000000000..8ad39e5cbf
--- /dev/null
+++ b/l10n/nn_NO/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
new file mode 100644
index 0000000000..c89d2fd630
--- /dev/null
+++ b/l10n/nn_NO/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
new file mode 100644
index 0000000000..a2531fd678
--- /dev/null
+++ b/l10n/nn_NO/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
new file mode 100644
index 0000000000..3ae26d5f13
--- /dev/null
+++ b/l10n/nn_NO/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/nn_NO/tasks.po b/l10n/nn_NO/tasks.po
new file mode 100644
index 0000000000..9ebb58b030
--- /dev/null
+++ b/l10n/nn_NO/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
new file mode 100644
index 0000000000..86099dc606
--- /dev/null
+++ b/l10n/nn_NO/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/nn_NO/user_migrate.po b/l10n/nn_NO/user_migrate.po
new file mode 100644
index 0000000000..40d6c0dac7
--- /dev/null
+++ b/l10n/nn_NO/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/nn_NO/user_openid.po b/l10n/nn_NO/user_openid.po
new file mode 100644
index 0000000000..eb58b25dcb
--- /dev/null
+++ b/l10n/nn_NO/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/pl/admin_dependencies_chk.po b/l10n/pl/admin_dependencies_chk.po
new file mode 100644
index 0000000000..bdec632155
--- /dev/null
+++ b/l10n/pl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/pl/admin_migrate.po b/l10n/pl/admin_migrate.po
new file mode 100644
index 0000000000..096d746c63
--- /dev/null
+++ b/l10n/pl/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:31+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Eksportuj instancję ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Spowoduje to utworzenie pliku skompresowanego, który zawiera dane tej instancji ownCloud.⏎ proszę wybrać typ eksportu:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Eksport"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
new file mode 100644
index 0000000000..fbb12dbe1f
--- /dev/null
+++ b/l10n/pl/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:15+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Wyłącz następujące typy plików z szyfrowania"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Brak"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Włącz szyfrowanie"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
new file mode 100644
index 0000000000..f86f0148ff
--- /dev/null
+++ b/l10n/pl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
new file mode 100644
index 0000000000..6816ef762e
--- /dev/null
+++ b/l10n/pl/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:29+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Twoje udostępnione pliki"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Element"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Udostępnione dla"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Uprawnienia"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Odczyt"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Edycja"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Usuń"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Włącz ponowne udostępnianie"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
new file mode 100644
index 0000000000..bdacd74f04
--- /dev/null
+++ b/l10n/pl/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:35+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Wygasają wszystkie wersje"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Włącz wersjonowanie plików"
diff --git a/l10n/pl/tasks.po b/l10n/pl/tasks.po
new file mode 100644
index 0000000000..563964d39b
--- /dev/null
+++ b/l10n/pl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
new file mode 100644
index 0000000000..89148af24b
--- /dev/null
+++ b/l10n/pl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/pl/user_migrate.po b/l10n/pl/user_migrate.po
new file mode 100644
index 0000000000..656770d554
--- /dev/null
+++ b/l10n/pl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/pl/user_openid.po b/l10n/pl/user_openid.po
new file mode 100644
index 0000000000..48f7a0f6dc
--- /dev/null
+++ b/l10n/pl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/pt_BR/admin_dependencies_chk.po b/l10n/pt_BR/admin_dependencies_chk.po
new file mode 100644
index 0000000000..571f626c30
--- /dev/null
+++ b/l10n/pt_BR/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/pt_BR/admin_migrate.po b/l10n/pt_BR/admin_migrate.po
new file mode 100644
index 0000000000..57e754066c
--- /dev/null
+++ b/l10n/pt_BR/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
new file mode 100644
index 0000000000..aba18662d4
--- /dev/null
+++ b/l10n/pt_BR/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
new file mode 100644
index 0000000000..8af2e8806b
--- /dev/null
+++ b/l10n/pt_BR/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
new file mode 100644
index 0000000000..88d7f7093c
--- /dev/null
+++ b/l10n/pt_BR/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
new file mode 100644
index 0000000000..86c54e7105
--- /dev/null
+++ b/l10n/pt_BR/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/pt_BR/tasks.po b/l10n/pt_BR/tasks.po
new file mode 100644
index 0000000000..5e8358f8c6
--- /dev/null
+++ b/l10n/pt_BR/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
new file mode 100644
index 0000000000..206781082f
--- /dev/null
+++ b/l10n/pt_BR/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/pt_BR/user_migrate.po b/l10n/pt_BR/user_migrate.po
new file mode 100644
index 0000000000..bb939a947a
--- /dev/null
+++ b/l10n/pt_BR/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/pt_BR/user_openid.po b/l10n/pt_BR/user_openid.po
new file mode 100644
index 0000000000..5abf549de3
--- /dev/null
+++ b/l10n/pt_BR/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/pt_PT/admin_dependencies_chk.po b/l10n/pt_PT/admin_dependencies_chk.po
new file mode 100644
index 0000000000..33d13a5a56
--- /dev/null
+++ b/l10n/pt_PT/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/pt_PT/admin_migrate.po b/l10n/pt_PT/admin_migrate.po
new file mode 100644
index 0000000000..0daf518350
--- /dev/null
+++ b/l10n/pt_PT/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
new file mode 100644
index 0000000000..ea24c46071
--- /dev/null
+++ b/l10n/pt_PT/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
new file mode 100644
index 0000000000..b0c55a3de6
--- /dev/null
+++ b/l10n/pt_PT/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
new file mode 100644
index 0000000000..50e951397c
--- /dev/null
+++ b/l10n/pt_PT/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
new file mode 100644
index 0000000000..5d6fb5fe06
--- /dev/null
+++ b/l10n/pt_PT/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/pt_PT/tasks.po b/l10n/pt_PT/tasks.po
new file mode 100644
index 0000000000..405b6d903f
--- /dev/null
+++ b/l10n/pt_PT/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
new file mode 100644
index 0000000000..a4088cac2b
--- /dev/null
+++ b/l10n/pt_PT/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/pt_PT/user_migrate.po b/l10n/pt_PT/user_migrate.po
new file mode 100644
index 0000000000..dc1013582b
--- /dev/null
+++ b/l10n/pt_PT/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/pt_PT/user_openid.po b/l10n/pt_PT/user_openid.po
new file mode 100644
index 0000000000..617e967bdd
--- /dev/null
+++ b/l10n/pt_PT/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ro/admin_dependencies_chk.po b/l10n/ro/admin_dependencies_chk.po
new file mode 100644
index 0000000000..76d2d0539d
--- /dev/null
+++ b/l10n/ro/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ro/admin_migrate.po b/l10n/ro/admin_migrate.po
new file mode 100644
index 0000000000..44132a5cdd
--- /dev/null
+++ b/l10n/ro/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
new file mode 100644
index 0000000000..f042cb49fc
--- /dev/null
+++ b/l10n/ro/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
new file mode 100644
index 0000000000..6b9e6f0955
--- /dev/null
+++ b/l10n/ro/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
new file mode 100644
index 0000000000..55de7e186d
--- /dev/null
+++ b/l10n/ro/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
new file mode 100644
index 0000000000..bb1b9526f0
--- /dev/null
+++ b/l10n/ro/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ro/tasks.po b/l10n/ro/tasks.po
new file mode 100644
index 0000000000..a49bdb61fa
--- /dev/null
+++ b/l10n/ro/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
new file mode 100644
index 0000000000..f9aaaa9fb0
--- /dev/null
+++ b/l10n/ro/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ro/user_migrate.po b/l10n/ro/user_migrate.po
new file mode 100644
index 0000000000..de0b6551e9
--- /dev/null
+++ b/l10n/ro/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ro/user_openid.po b/l10n/ro/user_openid.po
new file mode 100644
index 0000000000..e5598de2c9
--- /dev/null
+++ b/l10n/ro/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ru/admin_dependencies_chk.po b/l10n/ru/admin_dependencies_chk.po
new file mode 100644
index 0000000000..1d16b4f757
--- /dev/null
+++ b/l10n/ru/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ru/admin_migrate.po b/l10n/ru/admin_migrate.po
new file mode 100644
index 0000000000..9f8eb42ef7
--- /dev/null
+++ b/l10n/ru/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
new file mode 100644
index 0000000000..51c8bc94cc
--- /dev/null
+++ b/l10n/ru/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
new file mode 100644
index 0000000000..72084a423c
--- /dev/null
+++ b/l10n/ru/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
new file mode 100644
index 0000000000..1c0dc27e38
--- /dev/null
+++ b/l10n/ru/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
new file mode 100644
index 0000000000..f9d067172c
--- /dev/null
+++ b/l10n/ru/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ru/tasks.po b/l10n/ru/tasks.po
new file mode 100644
index 0000000000..202e76b9a5
--- /dev/null
+++ b/l10n/ru/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
new file mode 100644
index 0000000000..01320218dc
--- /dev/null
+++ b/l10n/ru/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ru/user_migrate.po b/l10n/ru/user_migrate.po
new file mode 100644
index 0000000000..bf0f6d4c8b
--- /dev/null
+++ b/l10n/ru/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ru/user_openid.po b/l10n/ru/user_openid.po
new file mode 100644
index 0000000000..354e17e01d
--- /dev/null
+++ b/l10n/ru/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sk_SK/admin_dependencies_chk.po b/l10n/sk_SK/admin_dependencies_chk.po
new file mode 100644
index 0000000000..1381cc2a7f
--- /dev/null
+++ b/l10n/sk_SK/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sk_SK/admin_migrate.po b/l10n/sk_SK/admin_migrate.po
new file mode 100644
index 0000000000..00e8e196c0
--- /dev/null
+++ b/l10n/sk_SK/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
new file mode 100644
index 0000000000..c7ae40ae63
--- /dev/null
+++ b/l10n/sk_SK/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
new file mode 100644
index 0000000000..99cbb6e3c4
--- /dev/null
+++ b/l10n/sk_SK/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
new file mode 100644
index 0000000000..30cc68b231
--- /dev/null
+++ b/l10n/sk_SK/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
new file mode 100644
index 0000000000..0b50ad267a
--- /dev/null
+++ b/l10n/sk_SK/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sk_SK/tasks.po b/l10n/sk_SK/tasks.po
new file mode 100644
index 0000000000..2ea079cbf6
--- /dev/null
+++ b/l10n/sk_SK/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
new file mode 100644
index 0000000000..1fdd9af1e5
--- /dev/null
+++ b/l10n/sk_SK/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sk_SK/user_migrate.po b/l10n/sk_SK/user_migrate.po
new file mode 100644
index 0000000000..49ca2414b0
--- /dev/null
+++ b/l10n/sk_SK/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sk_SK/user_openid.po b/l10n/sk_SK/user_openid.po
new file mode 100644
index 0000000000..56440f66cc
--- /dev/null
+++ b/l10n/sk_SK/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sl/admin_dependencies_chk.po b/l10n/sl/admin_dependencies_chk.po
new file mode 100644
index 0000000000..0dc3432799
--- /dev/null
+++ b/l10n/sl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sl/admin_migrate.po b/l10n/sl/admin_migrate.po
new file mode 100644
index 0000000000..e4aec295fb
--- /dev/null
+++ b/l10n/sl/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
new file mode 100644
index 0000000000..ee97cf3b74
--- /dev/null
+++ b/l10n/sl/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
new file mode 100644
index 0000000000..1435977b9a
--- /dev/null
+++ b/l10n/sl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
new file mode 100644
index 0000000000..d50a6214c9
--- /dev/null
+++ b/l10n/sl/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
new file mode 100644
index 0000000000..29a2310e26
--- /dev/null
+++ b/l10n/sl/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
new file mode 100644
index 0000000000..38b1873389
--- /dev/null
+++ b/l10n/sl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
new file mode 100644
index 0000000000..b46b9b6797
--- /dev/null
+++ b/l10n/sl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sl/user_migrate.po b/l10n/sl/user_migrate.po
new file mode 100644
index 0000000000..e3a229549d
--- /dev/null
+++ b/l10n/sl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sl/user_openid.po b/l10n/sl/user_openid.po
new file mode 100644
index 0000000000..1269ed895e
--- /dev/null
+++ b/l10n/sl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/so/admin_dependencies_chk.po b/l10n/so/admin_dependencies_chk.po
new file mode 100644
index 0000000000..2d1d442a09
--- /dev/null
+++ b/l10n/so/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/so/admin_migrate.po b/l10n/so/admin_migrate.po
new file mode 100644
index 0000000000..2f3aebc46e
--- /dev/null
+++ b/l10n/so/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/so/files_encryption.po b/l10n/so/files_encryption.po
new file mode 100644
index 0000000000..eb887dea6c
--- /dev/null
+++ b/l10n/so/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/so/files_external.po b/l10n/so/files_external.po
new file mode 100644
index 0000000000..668e783388
--- /dev/null
+++ b/l10n/so/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
new file mode 100644
index 0000000000..c0534448ee
--- /dev/null
+++ b/l10n/so/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/so/files_versions.po b/l10n/so/files_versions.po
new file mode 100644
index 0000000000..0c1f4e95a6
--- /dev/null
+++ b/l10n/so/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/so/tasks.po b/l10n/so/tasks.po
new file mode 100644
index 0000000000..3b036ed9b2
--- /dev/null
+++ b/l10n/so/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/so/user_ldap.po b/l10n/so/user_ldap.po
new file mode 100644
index 0000000000..bf35a13096
--- /dev/null
+++ b/l10n/so/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/so/user_migrate.po b/l10n/so/user_migrate.po
new file mode 100644
index 0000000000..40d3c1c073
--- /dev/null
+++ b/l10n/so/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/so/user_openid.po b/l10n/so/user_openid.po
new file mode 100644
index 0000000000..2001365d2d
--- /dev/null
+++ b/l10n/so/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sr/admin_dependencies_chk.po b/l10n/sr/admin_dependencies_chk.po
new file mode 100644
index 0000000000..bc9e8912ee
--- /dev/null
+++ b/l10n/sr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sr/admin_migrate.po b/l10n/sr/admin_migrate.po
new file mode 100644
index 0000000000..13be5b1a58
--- /dev/null
+++ b/l10n/sr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
new file mode 100644
index 0000000000..b1c6edcc0c
--- /dev/null
+++ b/l10n/sr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
new file mode 100644
index 0000000000..4dd0719191
--- /dev/null
+++ b/l10n/sr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
new file mode 100644
index 0000000000..b3e8247b76
--- /dev/null
+++ b/l10n/sr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
new file mode 100644
index 0000000000..e25e3766f3
--- /dev/null
+++ b/l10n/sr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sr/tasks.po b/l10n/sr/tasks.po
new file mode 100644
index 0000000000..d20e414436
--- /dev/null
+++ b/l10n/sr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
new file mode 100644
index 0000000000..4e3f01a3b6
--- /dev/null
+++ b/l10n/sr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sr/user_migrate.po b/l10n/sr/user_migrate.po
new file mode 100644
index 0000000000..9c6020b5fc
--- /dev/null
+++ b/l10n/sr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sr/user_openid.po b/l10n/sr/user_openid.po
new file mode 100644
index 0000000000..a5de6c42c8
--- /dev/null
+++ b/l10n/sr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sr@latin/admin_dependencies_chk.po b/l10n/sr@latin/admin_dependencies_chk.po
new file mode 100644
index 0000000000..826e736f5e
--- /dev/null
+++ b/l10n/sr@latin/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sr@latin/admin_migrate.po b/l10n/sr@latin/admin_migrate.po
new file mode 100644
index 0000000000..b76fec786a
--- /dev/null
+++ b/l10n/sr@latin/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
new file mode 100644
index 0000000000..c6f3f5b636
--- /dev/null
+++ b/l10n/sr@latin/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
new file mode 100644
index 0000000000..639f9f143b
--- /dev/null
+++ b/l10n/sr@latin/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
new file mode 100644
index 0000000000..43f1f498e7
--- /dev/null
+++ b/l10n/sr@latin/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
new file mode 100644
index 0000000000..5fae2a88e1
--- /dev/null
+++ b/l10n/sr@latin/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sr@latin/tasks.po b/l10n/sr@latin/tasks.po
new file mode 100644
index 0000000000..c4dff86e0a
--- /dev/null
+++ b/l10n/sr@latin/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
new file mode 100644
index 0000000000..c37681c121
--- /dev/null
+++ b/l10n/sr@latin/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sr@latin/user_migrate.po b/l10n/sr@latin/user_migrate.po
new file mode 100644
index 0000000000..198d0844fd
--- /dev/null
+++ b/l10n/sr@latin/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sr@latin/user_openid.po b/l10n/sr@latin/user_openid.po
new file mode 100644
index 0000000000..0c9792f1bb
--- /dev/null
+++ b/l10n/sr@latin/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sv/admin_dependencies_chk.po b/l10n/sv/admin_dependencies_chk.po
new file mode 100644
index 0000000000..daf145daa7
--- /dev/null
+++ b/l10n/sv/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:16+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "Modulen php-json behövs av många applikationer som interagerar."
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "Modulen php-curl behövs för att hämta sidans titel när du lägger till bokmärken."
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "Modulen php-gd behövs för att skapa miniatyrer av dina bilder."
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "Modulen php-ldap behövs för att ansluta mot din ldapserver."
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "Modulen php-zip behövs för att kunna ladda ner flera filer på en gång."
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "Modulen php-mb_multibyte behövs för att hantera korrekt teckenkodning."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "Modulen php-ctype behövs för att validera data."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "Modulen php-xml behövs för att kunna dela filer med webdav."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr "Direktivet allow_url_fopen i php.ini bör sättas till 1 för att kunna hämta kunskapsbasen från OCS-servrar."
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "Modulen php-pdo behövs för att kunna lagra ownCloud data i en databas."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Beroenden status"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Används av:"
diff --git a/l10n/sv/admin_migrate.po b/l10n/sv/admin_migrate.po
new file mode 100644
index 0000000000..68573f4221
--- /dev/null
+++ b/l10n/sv/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 09:53+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exportera denna instans av ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Detta kommer att skapa en komprimerad fil som innehåller all data från denna instans av ownCloud.\n            Välj exporttyp:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportera"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
new file mode 100644
index 0000000000..4216506948
--- /dev/null
+++ b/l10n/sv/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:20+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Exkludera följande filtyper från kryptering"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Ingen"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Aktivera kryptering"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
new file mode 100644
index 0000000000..a010550da6
--- /dev/null
+++ b/l10n/sv/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:31+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Extern lagring"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Monteringspunkt"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Källa"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Alternativ"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Tillämplig"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Lägg till monteringspunkt"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Ingen angiven"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Alla användare"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Grupper"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Användare"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "SSL rotcertifikat"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Importera rotcertifikat"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Aktivera extern lagring för användare"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Tillåt användare att montera egen extern lagring"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
new file mode 100644
index 0000000000..d48e54c277
--- /dev/null
+++ b/l10n/sv/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:19+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Dina delade filer"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Objekt"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Delad med"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Rättigheter"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Läsa"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Ändra"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Aktivera dela vidare"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Tillåter användare att dela filer som dom inte äger"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
new file mode 100644
index 0000000000..f33072ac6d
--- /dev/null
+++ b/l10n/sv/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:33+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Upphör alla versioner"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Aktivera versionshantering"
diff --git a/l10n/sv/tasks.po b/l10n/sv/tasks.po
new file mode 100644
index 0000000000..b397a7d18d
--- /dev/null
+++ b/l10n/sv/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 13:36+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "Felaktigt datum/tid"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Ingen kategori"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Ospecificerad "
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=högsta"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=mellan"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=lägsta"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Tom sammanfattning"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Ogiltig andel procent klar"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Felaktig prioritet"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Lägg till uppgift"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "Förfaller"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "Kategori"
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "Slutförd"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "Plats"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "Prioritet"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "Etikett"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Laddar uppgifter..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Viktigt"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Mer"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Mindre"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Radera"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
new file mode 100644
index 0000000000..55f7bbecf9
--- /dev/null
+++ b/l10n/sv/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:33+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Server"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "Start DN"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "Användare DN"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Lösenord"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filter logga in användare"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Filter lista användare"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Definierar filter att tillämpa vid listning av användare."
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "utan platshållare, t.ex. \"objectClass=person\"."
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Gruppfilter"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Definierar filter att tillämpa vid listning av grupper."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr "Bas för användare i katalogtjänst"
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr "Bas för grupper i katalogtjänst"
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Attribut för gruppmedlemmar"
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Använd TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "Använd inte för SSL-anslutningar, det kommer inte att fungera."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Stäng av verifiering av SSL-certifikat."
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "Rekommenderas inte, använd bara för test. "
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr "Attribut för användarnamn"
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "Attribut som används för att generera användarnamn i ownCloud."
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr "Attribut för gruppnamn"
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "Attribut som används för att generera gruppnamn i ownCloud."
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "i bytes"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "i sekunder. En förändring tömmer cache."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Hjälp"
diff --git a/l10n/sv/user_migrate.po b/l10n/sv/user_migrate.po
new file mode 100644
index 0000000000..3c9b00b3f6
--- /dev/null
+++ b/l10n/sv/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:39+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Exportera"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Något gick fel när exportfilen skulle genereras"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "Ett fel har uppstått"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Exportera ditt användarkonto"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Detta vill skapa en komprimerad fil som innehåller ditt ownCloud-konto."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Importera ett användarkonto"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "ownCloud  Zip-fil"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importera"
diff --git a/l10n/sv/user_openid.po b/l10n/sv/user_openid.po
new file mode 100644
index 0000000000..f05dbf48fd
--- /dev/null
+++ b/l10n/sv/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 13:42+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Detta är en OpenID-server slutpunkt. För mer information, se"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identitet: <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Realm: <b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Användare: <b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Logga in"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Fel: <b>Ingen användare vald"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "du kan autentisera till andra webbplatser med denna adress"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Godkänd openID leverantör"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "Din adress på Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index dbff000af9..3d2ae56900 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 94cd898b3c..6f25265cc2 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 88dfa5e1d3..2c04082b1a 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index f2e4699b96..f7d8c099eb 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index f6f4474f22..5f80ddd094 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -809,11 +809,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a4f89a3fe7..d3b3ee237a 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index edd5d06c47..66e34bcf59 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index d526217771..0f56fc4202 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index b874a78f92..b7b362cbd2 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 4ace52be48..a9c26beda7 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 1c1534ff9b..faf3ac6422 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index c2d65a06c4..fa541b92b5 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 4547bf98cc..d6efe506ba 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 217fab5711..40898e21b0 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 96e06e2e0a..ea7209eb60 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 49a9e615cc..098d1d7b55 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 9d0e40a967..8dabc00571 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 60f36b326e..4d29c7a416 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index c5ff20b40f..75a19c8fe0 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 00:41+0200\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/admin_dependencies_chk.po b/l10n/th_TH/admin_dependencies_chk.po
new file mode 100644
index 0000000000..758b5772cd
--- /dev/null
+++ b/l10n/th_TH/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/th_TH/admin_migrate.po b/l10n/th_TH/admin_migrate.po
new file mode 100644
index 0000000000..24c02530e3
--- /dev/null
+++ b/l10n/th_TH/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
new file mode 100644
index 0000000000..6852b6b1c3
--- /dev/null
+++ b/l10n/th_TH/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
new file mode 100644
index 0000000000..77ddd37e99
--- /dev/null
+++ b/l10n/th_TH/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
new file mode 100644
index 0000000000..9165a75b35
--- /dev/null
+++ b/l10n/th_TH/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
new file mode 100644
index 0000000000..797e78acb5
--- /dev/null
+++ b/l10n/th_TH/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/th_TH/tasks.po b/l10n/th_TH/tasks.po
new file mode 100644
index 0000000000..5cde08bac2
--- /dev/null
+++ b/l10n/th_TH/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
new file mode 100644
index 0000000000..6303056f2a
--- /dev/null
+++ b/l10n/th_TH/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/th_TH/user_migrate.po b/l10n/th_TH/user_migrate.po
new file mode 100644
index 0000000000..676ffdfbb5
--- /dev/null
+++ b/l10n/th_TH/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/th_TH/user_openid.po b/l10n/th_TH/user_openid.po
new file mode 100644
index 0000000000..9b4a609ba1
--- /dev/null
+++ b/l10n/th_TH/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/tr/admin_dependencies_chk.po b/l10n/tr/admin_dependencies_chk.po
new file mode 100644
index 0000000000..7a089c19af
--- /dev/null
+++ b/l10n/tr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/tr/admin_migrate.po b/l10n/tr/admin_migrate.po
new file mode 100644
index 0000000000..ab3ee34d97
--- /dev/null
+++ b/l10n/tr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
new file mode 100644
index 0000000000..af47564a45
--- /dev/null
+++ b/l10n/tr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
new file mode 100644
index 0000000000..f72e8d229b
--- /dev/null
+++ b/l10n/tr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
new file mode 100644
index 0000000000..47f149e2b3
--- /dev/null
+++ b/l10n/tr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
new file mode 100644
index 0000000000..5b16302845
--- /dev/null
+++ b/l10n/tr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/tr/tasks.po b/l10n/tr/tasks.po
new file mode 100644
index 0000000000..68549f8375
--- /dev/null
+++ b/l10n/tr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
new file mode 100644
index 0000000000..de0cb374c3
--- /dev/null
+++ b/l10n/tr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/tr/user_migrate.po b/l10n/tr/user_migrate.po
new file mode 100644
index 0000000000..5b31904b2f
--- /dev/null
+++ b/l10n/tr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/tr/user_openid.po b/l10n/tr/user_openid.po
new file mode 100644
index 0000000000..6c6f6b5ed5
--- /dev/null
+++ b/l10n/tr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/uk/admin_dependencies_chk.po b/l10n/uk/admin_dependencies_chk.po
new file mode 100644
index 0000000000..5fae31131d
--- /dev/null
+++ b/l10n/uk/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/uk/admin_migrate.po b/l10n/uk/admin_migrate.po
new file mode 100644
index 0000000000..b0ba19c7eb
--- /dev/null
+++ b/l10n/uk/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
new file mode 100644
index 0000000000..be6f1edb74
--- /dev/null
+++ b/l10n/uk/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
new file mode 100644
index 0000000000..4d2de48c58
--- /dev/null
+++ b/l10n/uk/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
new file mode 100644
index 0000000000..bb60168265
--- /dev/null
+++ b/l10n/uk/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
new file mode 100644
index 0000000000..fdbf46f9cb
--- /dev/null
+++ b/l10n/uk/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/uk/tasks.po b/l10n/uk/tasks.po
new file mode 100644
index 0000000000..37254722c7
--- /dev/null
+++ b/l10n/uk/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
new file mode 100644
index 0000000000..236f6c2034
--- /dev/null
+++ b/l10n/uk/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/uk/user_migrate.po b/l10n/uk/user_migrate.po
new file mode 100644
index 0000000000..816951cef3
--- /dev/null
+++ b/l10n/uk/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/uk/user_openid.po b/l10n/uk/user_openid.po
new file mode 100644
index 0000000000..699f470569
--- /dev/null
+++ b/l10n/uk/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/vi/admin_dependencies_chk.po b/l10n/vi/admin_dependencies_chk.po
new file mode 100644
index 0000000000..9f7f77f611
--- /dev/null
+++ b/l10n/vi/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/vi/admin_migrate.po b/l10n/vi/admin_migrate.po
new file mode 100644
index 0000000000..58d15a553c
--- /dev/null
+++ b/l10n/vi/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
new file mode 100644
index 0000000000..d76c619333
--- /dev/null
+++ b/l10n/vi/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
new file mode 100644
index 0000000000..8633bedfa5
--- /dev/null
+++ b/l10n/vi/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
new file mode 100644
index 0000000000..4aa6347091
--- /dev/null
+++ b/l10n/vi/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
new file mode 100644
index 0000000000..2f97cd4aa3
--- /dev/null
+++ b/l10n/vi/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/vi/tasks.po b/l10n/vi/tasks.po
new file mode 100644
index 0000000000..d22fa25d8c
--- /dev/null
+++ b/l10n/vi/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
new file mode 100644
index 0000000000..52c6146db3
--- /dev/null
+++ b/l10n/vi/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/vi/user_migrate.po b/l10n/vi/user_migrate.po
new file mode 100644
index 0000000000..1e5615249f
--- /dev/null
+++ b/l10n/vi/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/vi/user_openid.po b/l10n/vi/user_openid.po
new file mode 100644
index 0000000000..848cdb3cf4
--- /dev/null
+++ b/l10n/vi/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/admin_dependencies_chk.po b/l10n/zh_CN.GB2312/admin_dependencies_chk.po
new file mode 100644
index 0000000000..b226f02b4c
--- /dev/null
+++ b/l10n/zh_CN.GB2312/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/admin_migrate.po b/l10n/zh_CN.GB2312/admin_migrate.po
new file mode 100644
index 0000000000..f33396b69e
--- /dev/null
+++ b/l10n/zh_CN.GB2312/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
new file mode 100644
index 0000000000..2073826c24
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
new file mode 100644
index 0000000000..27dfa58801
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
new file mode 100644
index 0000000000..a3a249084f
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
new file mode 100644
index 0000000000..4eaa105db8
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/tasks.po b/l10n/zh_CN.GB2312/tasks.po
new file mode 100644
index 0000000000..5d43b9b7ec
--- /dev/null
+++ b/l10n/zh_CN.GB2312/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
new file mode 100644
index 0000000000..725d441e3c
--- /dev/null
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/user_migrate.po b/l10n/zh_CN.GB2312/user_migrate.po
new file mode 100644
index 0000000000..06769367e7
--- /dev/null
+++ b/l10n/zh_CN.GB2312/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/user_openid.po b/l10n/zh_CN.GB2312/user_openid.po
new file mode 100644
index 0000000000..1937fffe2a
--- /dev/null
+++ b/l10n/zh_CN.GB2312/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/zh_CN/admin_dependencies_chk.po b/l10n/zh_CN/admin_dependencies_chk.po
new file mode 100644
index 0000000000..6200d7451b
--- /dev/null
+++ b/l10n/zh_CN/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/zh_CN/admin_migrate.po b/l10n/zh_CN/admin_migrate.po
new file mode 100644
index 0000000000..a25182363f
--- /dev/null
+++ b/l10n/zh_CN/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
new file mode 100644
index 0000000000..19d9d60f7d
--- /dev/null
+++ b/l10n/zh_CN/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
new file mode 100644
index 0000000000..aacc93cf5c
--- /dev/null
+++ b/l10n/zh_CN/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
new file mode 100644
index 0000000000..60a76214fe
--- /dev/null
+++ b/l10n/zh_CN/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
new file mode 100644
index 0000000000..4e84f1f4d8
--- /dev/null
+++ b/l10n/zh_CN/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/zh_CN/tasks.po b/l10n/zh_CN/tasks.po
new file mode 100644
index 0000000000..7f27dae57f
--- /dev/null
+++ b/l10n/zh_CN/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
new file mode 100644
index 0000000000..5e871541a0
--- /dev/null
+++ b/l10n/zh_CN/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/zh_CN/user_migrate.po b/l10n/zh_CN/user_migrate.po
new file mode 100644
index 0000000000..f422c21ddf
--- /dev/null
+++ b/l10n/zh_CN/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/zh_CN/user_openid.po b/l10n/zh_CN/user_openid.po
new file mode 100644
index 0000000000..a7e4f24cc2
--- /dev/null
+++ b/l10n/zh_CN/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/zh_TW/admin_dependencies_chk.po b/l10n/zh_TW/admin_dependencies_chk.po
new file mode 100644
index 0000000000..9519ecc8d9
--- /dev/null
+++ b/l10n/zh_TW/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/zh_TW/admin_migrate.po b/l10n/zh_TW/admin_migrate.po
new file mode 100644
index 0000000000..ad633109b3
--- /dev/null
+++ b/l10n/zh_TW/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
new file mode 100644
index 0000000000..86ca709cfa
--- /dev/null
+++ b/l10n/zh_TW/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
new file mode 100644
index 0000000000..9a6a0d7c43
--- /dev/null
+++ b/l10n/zh_TW/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
new file mode 100644
index 0000000000..29566a0bae
--- /dev/null
+++ b/l10n/zh_TW/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
new file mode 100644
index 0000000000..2214a0ec19
--- /dev/null
+++ b/l10n/zh_TW/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/zh_TW/tasks.po b/l10n/zh_TW/tasks.po
new file mode 100644
index 0000000000..10432eca2d
--- /dev/null
+++ b/l10n/zh_TW/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
new file mode 100644
index 0000000000..d84e081d11
--- /dev/null
+++ b/l10n/zh_TW/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/zh_TW/user_migrate.po b/l10n/zh_TW/user_migrate.po
new file mode 100644
index 0000000000..005fbe5e71
--- /dev/null
+++ b/l10n/zh_TW/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/zh_TW/user_openid.po b/l10n/zh_TW/user_openid.po
new file mode 100644
index 0000000000..ca26a19dbf
--- /dev/null
+++ b/l10n/zh_TW/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""

From c31217125293c405941c1b515cb94bdf0a14a35b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 14 Aug 2012 02:03:22 +0200
Subject: [PATCH 1441/1537] [tx-robot] updated from transifex

---
 l10n/templates/admin_dependencies_chk.pot | 2 +-
 l10n/templates/admin_migrate.pot          | 2 +-
 l10n/templates/bookmarks.pot              | 2 +-
 l10n/templates/calendar.pot               | 2 +-
 l10n/templates/contacts.pot               | 2 +-
 l10n/templates/core.pot                   | 2 +-
 l10n/templates/files.pot                  | 2 +-
 l10n/templates/files_encryption.pot       | 2 +-
 l10n/templates/files_external.pot         | 2 +-
 l10n/templates/files_sharing.pot          | 2 +-
 l10n/templates/files_versions.pot         | 2 +-
 l10n/templates/gallery.pot                | 2 +-
 l10n/templates/lib.pot                    | 2 +-
 l10n/templates/media.pot                  | 2 +-
 l10n/templates/settings.pot               | 2 +-
 l10n/templates/tasks.pot                  | 2 +-
 l10n/templates/user_ldap.pot              | 2 +-
 l10n/templates/user_migrate.pot           | 2 +-
 l10n/templates/user_openid.pot            | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 3d2ae56900..a13ed61b4f 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 6f25265cc2..302ee091d1 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 2c04082b1a..92ee8440f3 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index f7d8c099eb..2d55307b1f 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 5f80ddd094..be8c432c00 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d3b3ee237a..c10170659b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 66e34bcf59..a9c93a4741 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 0f56fc4202..34a0bbb5be 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index b7b362cbd2..6a82898883 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index a9c26beda7..d288470e5c 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index faf3ac6422..00654d249b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index fa541b92b5..d17762fbbd 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d6efe506ba..f6ce8f0969 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 40898e21b0..51fdfab817 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index ea7209eb60..d74ce84806 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 098d1d7b55..b38b306f79 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8dabc00571..f9a5686e39 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 4d29c7a416..e0a064d961 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 75a19c8fe0..352a3ccbc0 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"POT-Creation-Date: 2012-08-14 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From 0c8ce0bb32c4a79c248e71533f9fa00b844049fb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 14 Aug 2012 02:44:45 +0200
Subject: [PATCH 1442/1537] some basic path normalization

---
 lib/filesystem.php       | 22 ++++++++++++++++++++++
 lib/filesystemview.php   |  5 ++---
 tests/lib/filesystem.php | 11 +++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 5af6e0aa54..221345332b 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -494,6 +494,28 @@ class OC_Filesystem{
 		}
 		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
 	}
+
+	public static function normalizePath($path){
+		//no windows style slashes
+		$path=str_replace('\\','/',$path);
+		//add leading slash
+		if($path[0]!=='/'){
+			$path='/'.$path;
+		}
+		//remove trainling slash
+		if(substr($path,-1,1)==='/'){
+			$path=substr($path,0,-1);
+		}
+		//remove duplicate slashes
+		while(strpos($path,'//')!==false){
+			$path=str_replace('//','/',$path);
+		}
+		//normalize unicode if possible
+		if(class_exists('Normalizer')){
+			$path=Normalizer::normalize($path);
+		}
+		return $path;
+	}
 }
 OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');
 OC_Hook::connect('OC_Filesystem','post_delete','OC_Filesystem','removeETagHook');
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index faf3f0bd4c..17d09a0700 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -54,10 +54,9 @@ class OC_FilesystemView {
 		if($path[0]!=='/'){
 			$path='/'.$path;
 		}
-		return $this->fakeRoot.$path;
+		return OC_Filesystem::normalizePath($this->fakeRoot.$path);
 	}
-
-
+	
 	/**
 	* change the root to a fake toor
 	* @param  string  fakeRoot
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 3e28d8c06e..e041255ec9 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -59,6 +59,17 @@ class Test_Filesystem extends UnitTestCase{
 		$this->assertEqual('/',OC_Filesystem::getMountPoint('/some'));
 		$this->assertEqual('folder',OC_Filesystem::getInternalPath('/some/folder'));
 	}
+
+	public function testNormalize(){
+		$this->assertEqual('/path',OC_Filesystem::normalizePath('/path/'));
+		$this->assertEqual('/path',OC_Filesystem::normalizePath('path'));
+		$this->assertEqual('/path',OC_Filesystem::normalizePath('\path'));
+		$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo//bar/'));
+		$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo////bar'));
+		if(class_exists('Normalizer')){
+			$this->assertEqual("/foo/bar\xC3\xBC",OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
+		}
+	}
 }
 
 ?>
\ No newline at end of file

From 1522f7f21185d2f3d3b5edebaa09f3e2f3a454aa Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 14 Aug 2012 03:07:14 +0200
Subject: [PATCH 1443/1537] fix some minor problems with path noramlization

---
 lib/filesystem.php     | 2 +-
 lib/filesystemview.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 221345332b..6cba6b1b54 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -503,7 +503,7 @@ class OC_Filesystem{
 			$path='/'.$path;
 		}
 		//remove trainling slash
-		if(substr($path,-1,1)==='/'){
+		if(strlen($path)>1 and substr($path,-1,1)==='/'){
 			$path=substr($path,0,-1);
 		}
 		//remove duplicate slashes
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 17d09a0700..9d85befdc8 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -103,7 +103,12 @@ class OC_FilesystemView {
 		if(strpos($path, $this->fakeRoot)!==0) {
 			return null;
 		}else{
-			return substr($path, strlen($this->fakeRoot));
+			$path=substr($path, strlen($this->fakeRoot));
+			if(strlen($path)===0){
+				return '/';
+			}else{
+				return $path;
+			}
 		}
 	}
 

From 452f55e163444e573a8ddbf762fedf6d32b48e8d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 14 Aug 2012 14:14:20 +0200
Subject: [PATCH 1444/1537] adjust LDAP to updated interface

---
 apps/user_ldap/user_ldap.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index fb3471af91..31b6dccbf6 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -100,14 +100,22 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers(){
+	public function getUsers($search = '', $limit = 10, $offset = 0){
 		$ldap_users = $this->connection->getFromCache('getUsers');
 		if(is_null($ldap_users)) {
 			$ldap_users = $this->fetchListOfUsers($this->connection->ldapUserFilter, array($this->connection->ldapUserDisplayName, 'dn'));
 			$ldap_users = $this->ownCloudUserNames($ldap_users);
 			$this->connection->writeToCache('getUsers', $ldap_users);
 		}
-		return $ldap_users;
+		$this->userSearch = $search;
+		if(!empty($this->userSearch)) {
+			$ldap_users = array_filter($ldap_users, array($this, 'userMatchesFilter'));
+		}
+		return array_slice($ldap_users, $offset, $limit);
+	}
+
+	public function userMatchesFilter($user) {
+		return (strripos($user, $this->userSearch) !== false);
 	}
 
 	/**

From 3c1380b093fcfe5d94927529ccc726b4ed56e99f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 14 Aug 2012 14:22:05 +0200
Subject: [PATCH 1445/1537] LDAP: adjust getGroups to updated interface

---
 apps/user_ldap/group_ldap.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index aff25593ef..d0d1ae3035 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -185,18 +185,27 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups() {
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		if(!$this->enabled) {
 			return array();
 		}
-		if($this->connection->isCached('getGroups')) {
-			return $this->connection->getFromCache('getGroups');
-		}
-		$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
-		$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
-		$this->connection->writeToCache('getGroups', $ldap_groups);
 
-		return $ldap_groups;
+		if($this->connection->isCached('getGroups')) {
+			$ldap_groups = $this->connection->getFromCache('getGroups');
+		} else {
+			$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
+			$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
+			$this->connection->writeToCache('getGroups', $ldap_groups);
+		}
+		$this->groupSearch = $search;
+		if(!empty($this->groupSearch)) {
+			$ldap_groups = array_filter($ldap_groups, array($this, 'groupMatchesFilter'));
+		}
+		return array_slice($ldap_groups, $offset, $limit);
+	}
+
+	public function groupMatchesFilter($group) {
+		return (strripos($group, $this->groupSearch) !== false);
 	}
 
 	/**

From 62e4f55f721971dacd06649cecefe0487626aa75 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 14 Aug 2012 14:30:03 +0200
Subject: [PATCH 1446/1537] LDAP: adjust usersInGroup to updated interface

---
 apps/user_ldap/group_ldap.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index d0d1ae3035..709144539e 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -133,12 +133,17 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid) {
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(!$this->enabled) {
 			return array();
 		}
+		$this->groupSearch = $search;
 		if($this->connection->isCached('usersInGroup'.$gid)) {
-			return $this->connection->getFromCache('usersInGroup'.$gid);
+			$groupUsers = $this->connection->getFromCache('usersInGroup'.$gid);
+			if(!empty($this->groupSearch)) {
+				$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
+			}
+			return array_slice($groupUsers, $offset, $limit);
 		}
 
 		$groupDN = $this->groupname2dn($gid);
@@ -176,7 +181,11 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		$groupUsers = array_unique($result, SORT_LOCALE_STRING);
 		$this->connection->writeToCache('usersInGroup'.$gid, $groupUsers);
 
-		return $groupUsers;
+		if(!empty($this->groupSearch)) {
+			$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
+		}
+		return array_slice($groupUsers, $offset, $limit);
+
 	}
 
 	/**

From 937d1b29d8fedff9de3bfe07bcddbd4bc556a5cc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 14 Aug 2012 11:02:29 -0400
Subject: [PATCH 1447/1537] Retrieve all file dependent items when looking for
 file item type

---
 lib/public/share.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index cead8396a4..a97ecff60e 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -448,9 +448,16 @@ class Share {
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false, $itemShareWithBySource = false) {
 		$backend = self::getBackend($itemType);
 		// Get filesystem root to add it to the file target and remove from the file source
-		$root = \OC_Filesystem::getRoot();
-		// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
-		if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+		if ($backend instanceof Share_Backend_File_Dependent) {
+			$root = \OC_Filesystem::getRoot();
+		} else {
+			$root = '';
+		}
+		if ($itemType == 'file' && !isset($item)) {
+			$where = 'WHERE file_target IS NOT NULL';
+			$query_args = array();
+		} else if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+			// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
 			$item_types = array_merge(array($itemType), $collectionTypes);
 			$placeholders = join(',', array_fill(0, count($item_types), '?'));
 			$where = "WHERE item_type IN ('".$placeholders."')";
@@ -574,7 +581,7 @@ class Share {
 			}
 			// TODO Check this outside of the loop
 			// Check if this is a collection of the requested item type
-			if ($row['item_type'] != $itemType) {
+			if ($row['item_type'] != $itemType && $itemType != 'file' && !isset($item)) {
 				if ($collectionBackend = self::getBackend($row['item_type'])) {
 					$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
 					// Fetch all of the children sources

From db5b995a6befeb79035087518573c003fad5c30c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 14 Aug 2012 17:19:20 +0200
Subject: [PATCH 1448/1537] Disable user enumeration

---
 apps/calendar/appinfo/remote.php | 11 +++++++----
 apps/contacts/appinfo/remote.php | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 6669d7ce2c..dd605072ce 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,12 +21,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CalDAV_CalendarRootNode = new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend); 
+$Sabre_CalDAV_CalendarRootNode->disableListing = true; // Disable listening
 
 $nodes = array( 
-	$collection, 
-	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
+	$Sabre_CalDAV_Principal_Collection, 
+	$Sabre_CalDAV_CalendarRootNode,
 	);
 
 // Fire up server
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 9eee55583a..6cb5b59525 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,12 +36,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CardDAV_AddressBookRoot = new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
+$Sabre_CardDAV_AddressBookRoot->disableListing = true; // Disable listening
 
 $nodes = array( 
-	$collection, 
-	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
+	$Sabre_CalDAV_Principal_Collection, 
+	$Sabre_CardDAV_AddressBookRoot,
 	);
 
 // Fire up server

From a75870489c87211f2619fd21c2b4ea9aae168877 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Aug 2012 20:06:22 +0200
Subject: [PATCH 1449/1537] Use correct class.

---
 apps/contacts/ajax/contact/add.php     | 6 +++++-
 apps/contacts/ajax/contact/details.php | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/contact/add.php b/apps/contacts/ajax/contact/add.php
index 043e947dc4..c7cec7d946 100644
--- a/apps/contacts/ajax/contact/add.php
+++ b/apps/contacts/ajax/contact/add.php
@@ -49,10 +49,14 @@ if(!$id) {
 	exit();
 }
 
+$lastmodified = OC_Contacts_App::lastModified($vcard);
+if(!$lastmodified) {
+	$lastmodified = new DateTime();
+}
 OCP\JSON::success(array(
 	'data' => array(
 		'id' => $id,
 		'aid' => $aid,
-		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
+		'lastmodified' => $lastmodified->format('U')
 	)
 ));
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
index c22f18937d..5bf337e645 100644
--- a/apps/contacts/ajax/contact/details.php
+++ b/apps/contacts/ajax/contact/details.php
@@ -50,9 +50,13 @@ if(isset($details['PHOTO'])) {
 } else {
 	$details['PHOTO'] = false;
 }
+$lastmodified = OC_Contacts_App::lastModified($vcard);
+if(!$lastmodified) {
+	$lastmodified = new DateTime();
+}
 $details['id'] = $id;
 $details['displayname'] = $card['fullname'];
 $details['addressbookid'] = $card['addressbookid'];
-$details['lastmodified'] = OC_Contacts_App::lastModified($vcard)->format('U');
+$details['lastmodified'] = $lastmodified->format('U');
 OC_Contacts_App::setLastModifiedHeader($vcard);
 OCP\JSON::success(array('data' => $details));

From 028c79fc9da42f7a39f1c7b834a593591bcf5cc4 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 14 Aug 2012 16:30:13 -0400
Subject: [PATCH 1450/1537] Use if instead of switch for detecting share type
 and throw exceptions when setting permissions

---
 lib/public/share.php | 128 ++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index a97ecff60e..4e43687a13 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -143,77 +143,76 @@ class Share {
 	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
-		switch ($shareType) {
-			case self::SHARE_TYPE_USER:
-				if ($shareWith == $uidOwner) {
-					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the itemSource owner';
+		if ($shareType === self::SHARE_TYPE_USER) {
+			if ($shareWith == $uidOwner) {
+				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the item owner';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			if (!\OC_User::userExists($shareWith)) {
+				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' does not exist';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			} else {
+				$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
+				if (empty($inGroup)) {
+					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
-				if (!\OC_User::userExists($shareWith)) {
-					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' does not exist';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				} else {
-					$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
-					if (empty($inGroup)) {
-						$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
-						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-						throw new \Exception($message);
-					}
-				}
-				break;
-			case self::SHARE_TYPE_GROUP:
-				if (!\OC_Group::groupExists($shareWith)) {
-					$message = 'Sharing '.$itemSource.' failed, because the group '.$shareWith.' does not exist';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				} else if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
-					$message = 'Sharing '.$itemSource.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith;
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-				// Convert share with into an array with the keys group and users
-				$group = $shareWith;
-				$shareWith = array();
-				$shareWith['group'] = $group;
-				$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
-				break;
-			case self::SHARE_TYPE_PRIVATE_LINK:
+			}
+		} else if ($shareType === self::SHARE_TYPE_GROUP) {
+			if (!\OC_Group::groupExists($shareWith)) {
+				$message = 'Sharing '.$itemSource.' failed, because the group '.$shareWith.' does not exist';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			} else if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
+				$message = 'Sharing '.$itemSource.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith;
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+		} else if ($shareType === self::SHARE_TYPE_PRIVATE_LINK) {
 				$shareWith = md5(uniqid($itemSource, true));
 				return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
-			case self::SHARE_TYPE_CONTACT:
-				if (!\OC_App::isEnabled('contacts')) {
-					$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					return false;
-				}
-				$vcard = \OC_Contacts_App::getContactVCard($shareWith);
-				if (!isset($vcard)) {
-					$message = 'Sharing '.$itemSource.' failed, because the contact does not exist';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-				$details = \OC_Contacts_VCard::structureContact($vcard);
-				// TODO Add ownCloud user to contacts vcard
-				if (!isset($details['EMAIL'])) {
-					$message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-				return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
-				break;
-			// Future share types need to include their own conditions
-			default:
-				\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for '.$itemSource, \OC_Log::ERROR);
+		} else if ($shareType === self::SHARE_TYPE_CONTACT) {
+			if (!\OC_App::isEnabled('contacts')) {
+				$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				return false;
+			}
+			$vcard = \OC_Contacts_App::getContactVCard($shareWith);
+			if (!isset($vcard)) {
+				$message = 'Sharing '.$itemSource.' failed, because the contact does not exist';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			$details = \OC_Contacts_VCard::structureContact($vcard);
+			// TODO Add ownCloud user to contacts vcard
+			if (!isset($details['EMAIL'])) {
+				$message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
+		} else {
+			// Future share types need to include their own conditions
+			$message = 'Share type '.$shareType.' is not valid for '.$itemSource;
+			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+			throw new \Exception($message);
 		}
 		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
 		if (self::getItems($itemType, $itemSource, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true)) {
-			$message = 'Sharing '.$itemSource.' failed, because this itemSource is already shared with '.$shareWith;
+			$message = 'Sharing '.$itemSource.' failed, because this item is already shared with '.$shareWith;
 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 			throw new \Exception($message);
 		}
+		if ($shareType == self::SHARE_TYPE_GROUP) {
+			// Convert share with into an array with the keys group and users
+			$group = $shareWith;
+			$shareWith = array();
+			$shareWith['group'] = $group;
+			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
+		}
 		// If the item is a folder, scan through the folder looking for equivalent item types
 		if ($itemType == 'folder') {
 			$parentFolder = self::put('folder', $itemSource, $shareType, $shareWith, $uidOwner, $permissions, true);
@@ -338,8 +337,9 @@ class Share {
 				$query = \OC_DB::prepare('SELECT permissions FROM *PREFIX*share WHERE id = ? LIMIT 1');
 				$result = $query->execute(array($item['parent']))->fetchRow();
 				if (~(int)$result['permissions'] & $permissions) {
-					\OC_Log::write('OCP\Share', 'Setting permissions for '.$itemSource.' failed, because the permissions exceed permissions granted to the parent item', \OC_Log::ERROR);
-					return false;
+					$message = 'Setting permissions for '.$itemSource.' failed, because the permissions exceed permissions granted to '.\OC_User::getUser();
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new Exception($message);
 				}
 			}
 			$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = ? WHERE id = ?');
@@ -377,8 +377,9 @@ class Share {
 			}
 			return true;
 		}
-		\OC_Log::write('OCP\Share', 'Setting permissions for '.$itemSource.' failed, because the item was not found', \OC_Log::ERROR);
-		return false;
+		$message = 'Setting permissions for '.$itemSource.' failed, because the item was not found';
+		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+		throw new Exception($message);
 	}
 
 	/**
@@ -662,6 +663,7 @@ class Share {
 		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
 		if ($checkReshare = self::getItemSharedWith($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
 			if ($checkReshare['permissions'] & self::PERMISSION_SHARE) {
+				// TODO Check that other permissions aren't escalated
 				// TODO Don't check if inside folder
 				$parent = $checkReshare['id'];
 				$itemSource = $checkReshare['item_source'];

From 9661a63a7200987843aba91d0aecd214482c1db1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 14 Aug 2012 16:54:38 -0400
Subject: [PATCH 1451/1537] Ensure permissions can't be escalated during a
 reshare

---
 lib/public/share.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 4e43687a13..766b0a3164 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -662,13 +662,18 @@ class Share {
 		// Check if this is a reshare
 		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
 		if ($checkReshare = self::getItemSharedWith($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
-			if ($checkReshare['permissions'] & self::PERMISSION_SHARE) {
-				// TODO Check that other permissions aren't escalated
-				// TODO Don't check if inside folder
-				$parent = $checkReshare['id'];
-				$itemSource = $checkReshare['item_source'];
-				$fileSource = $checkReshare['file_source'];
-				$filePath = $checkReshare['file_target'];
+			if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
+				if (~(int)$checkReshare['permissions'] & $permissions) {
+					$message = 'Sharing '.$itemSource.' failed, because the permissions exceed permissions granted to '.$uidOwner;
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				} else {
+					// TODO Don't check if inside folder
+					$parent = $checkReshare['id'];
+					$itemSource = $checkReshare['item_source'];
+					$fileSource = $checkReshare['file_source'];
+					$filePath = $checkReshare['file_target'];
+				}
 			} else {
 				$message = 'Sharing '.$itemSource.' failed, because resharing is not allowed';
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);

From b440dfc67eb8fb90d28b7de8628f32646be3d2c0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 14 Aug 2012 17:05:38 -0400
Subject: [PATCH 1452/1537] Remove setTarget() function, changing target names
 only leads to confusion

---
 lib/public/share.php | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 766b0a3164..49532220a2 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -283,44 +283,6 @@ class Share {
 		return false;
 	}
 
-	/**
-	* @brief Set the target name of the item for the current user
-	* @param string Item type
-	* @param string Old item name
-	* @param string New item name
-	* @return Returns true on success or false on failure
-	*/
-	public static function setTarget($itemType, $oldTarget, $newTarget) {
-		$backend = self::getBackend($itemType);
-		$uidSharedWith = \OC_User::getUser();
-		// TODO Check permissions for setting target?
-		if ($item = self::getItems($itemType, $oldTarget, self::SHARE_TYPE_USER, $uidSharedWith, null, self::FORMAT_NONE, null, 1, false)) {
-			// TODO Fix
-			// Check if this is a group share
-			if ($item['uid_shared_with'] == null) {
-				// A new entry needs to be created exclusively for the user
-				$query = \OC_DB::prepare('INSERT INTO *PREFIX*share VALUES(?,?,?,?,?,?,?,?,?,?)');
-				if (isset($item['file_target'])) {
-					$fileTarget = $newTarget;
-				} else {
-					$fileTarget = null;
-				}
-				$query->execute(array($itemType, $item['item_source'], $newTarget, $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], $item['permissions'], $item['stime'], $item['file_source'], $fileTarget));
-				return true;
-			} else {
-				// Check if this item is a file or folder, update the file_target as well if this is the case
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ?, file_target = REPLACE(file_target, ?, ?) WHERE uid_shared_with = ?');
-					$query->execute(array($newTarget, $oldTarget, $newTarget, $uidSharedWith));
-				} else {
-					$query = \OC_DB::prepare('UPDATE *PREFIX*share SET item_target = ? WHERE item_type = ? AND item_target = ? AND uid_shared_with = ?');
-					$query->execute(array($newTarget, $itemType, $oldTarget, $uidSharedWith));
-				}
-				return true;
-			}
-		}
-	}
-
 	/**
 	* @brief Set the permissions of an item for a specific user or group
 	* @param string Item type

From ddfa760a5eb87f2cb66f82279c8ec14d3373084b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 14 Aug 2012 17:06:41 -0400
Subject: [PATCH 1453/1537] Change to correct function call
 getItemSharedWithBySource()

---
 lib/public/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 49532220a2..34da8e89a4 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -623,7 +623,7 @@ class Share {
 		$backend = self::getBackend($itemType);
 		// Check if this is a reshare
 		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
-		if ($checkReshare = self::getItemSharedWith($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
+		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
 			if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
 				if (~(int)$checkReshare['permissions'] & $permissions) {
 					$message = 'Sharing '.$itemSource.' failed, because the permissions exceed permissions granted to '.$uidOwner;

From da3896808a84ae10b460af32c38effae776cd39e Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 15 Aug 2012 02:07:20 +0200
Subject: [PATCH 1454/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/de.php    |  14 +++
 apps/admin_dependencies_chk/l10n/fr.php    |  14 +++
 apps/admin_dependencies_chk/l10n/it.php    |  13 +++
 apps/admin_dependencies_chk/l10n/th_TH.php |   3 +
 apps/admin_migrate/l10n/de.php             |   5 +
 apps/admin_migrate/l10n/fr.php             |   5 +
 apps/admin_migrate/l10n/it.php             |   5 +
 apps/admin_migrate/l10n/th_TH.php          |   5 +
 apps/bookmarks/l10n/th_TH.php              |  12 +++
 apps/calendar/l10n/de.php                  |   1 +
 apps/calendar/l10n/th_TH.php               |  42 ++++++++
 apps/contacts/l10n/th_TH.php               |  50 +++++++++-
 apps/files/l10n/sl.php                     |   5 +
 apps/files/l10n/th_TH.php                  |   8 ++
 apps/files_encryption/l10n/fr.php          |   6 ++
 apps/files_encryption/l10n/it.php          |   6 ++
 apps/files_encryption/l10n/th_TH.php       |   6 ++
 apps/files_external/l10n/de.php            |  18 ++++
 apps/files_external/l10n/fr.php            |  18 ++++
 apps/files_external/l10n/it.php            |  18 ++++
 apps/files_external/l10n/sl.php            |   9 ++
 apps/files_external/l10n/th_TH.php         |  18 ++++
 apps/files_sharing/l10n/de.php             |  11 +++
 apps/files_sharing/l10n/fr.php             |  11 +++
 apps/files_sharing/l10n/it.php             |   9 ++
 apps/files_sharing/l10n/sl.php             |  11 +++
 apps/files_sharing/l10n/th_TH.php          |  11 +++
 apps/files_versions/l10n/de.php            |   4 +
 apps/files_versions/l10n/fr.php            |   4 +
 apps/files_versions/l10n/it.php            |   4 +
 apps/files_versions/l10n/th_TH.php         |   4 +
 apps/gallery/l10n/th_TH.php                |  13 +--
 apps/tasks/l10n/de.php                     |  24 +++++
 apps/tasks/l10n/fr.php                     |  18 ++++
 apps/tasks/l10n/it.php                     |  15 +++
 apps/tasks/l10n/ro.php                     |  24 +++++
 apps/tasks/l10n/sl.php                     |  14 +++
 apps/tasks/l10n/th_TH.php                  |  24 +++++
 apps/user_ldap/l10n/de.php                 |  14 +++
 apps/user_ldap/l10n/fr.php                 |  30 ++++++
 apps/user_ldap/l10n/it.php                 |  36 +++++++
 apps/user_ldap/l10n/ro.php                 |  36 +++++++
 apps/user_ldap/l10n/th_TH.php              |  10 ++
 apps/user_migrate/l10n/ca.php              |   4 +-
 apps/user_migrate/l10n/de.php              |  10 ++
 apps/user_migrate/l10n/fr.php              |  10 ++
 apps/user_migrate/l10n/it.php              |  10 ++
 apps/user_migrate/l10n/sl.php              |  10 ++
 apps/user_migrate/l10n/th_TH.php           |  10 ++
 apps/user_openid/l10n/de.php               |  11 +++
 apps/user_openid/l10n/fr.php               |  11 +++
 apps/user_openid/l10n/it.php               |  11 +++
 apps/user_openid/l10n/sl.php               |  10 ++
 apps/user_openid/l10n/th_TH.php            |  11 +++
 l10n/ca/settings.po                        |  14 +--
 l10n/ca/user_migrate.po                    |   8 +-
 l10n/de/admin_dependencies_chk.po          |  33 ++++---
 l10n/de/admin_migrate.po                   |  14 +--
 l10n/de/calendar.po                        |   8 +-
 l10n/de/files_external.po                  |  39 ++++----
 l10n/de/files_sharing.po                   |  26 ++---
 l10n/de/files_versions.po                  |  11 ++-
 l10n/de/settings.po                        |  14 +--
 l10n/de/tasks.po                           |  52 +++++-----
 l10n/de/user_ldap.po                       |  31 +++---
 l10n/de/user_migrate.po                    |  24 ++---
 l10n/de/user_openid.po                     |  26 ++---
 l10n/fr/admin_dependencies_chk.po          |  31 +++---
 l10n/fr/admin_migrate.po                   |  13 +--
 l10n/fr/files_encryption.po                |  15 +--
 l10n/fr/files_external.po                  |  39 ++++----
 l10n/fr/files_sharing.po                   |  25 ++---
 l10n/fr/files_versions.po                  |  11 ++-
 l10n/fr/tasks.po                           |  39 ++++----
 l10n/fr/user_ldap.po                       |  63 ++++++------
 l10n/fr/user_migrate.po                    |  23 ++---
 l10n/fr/user_openid.po                     |  25 ++---
 l10n/it/admin_dependencies_chk.po          |  29 +++---
 l10n/it/admin_migrate.po                   |  13 +--
 l10n/it/files_encryption.po                |  15 +--
 l10n/it/files_external.po                  |  40 ++++----
 l10n/it/files_sharing.po                   |  21 ++--
 l10n/it/files_versions.po                  |  11 ++-
 l10n/it/settings.po                        |  14 +--
 l10n/it/tasks.po                           |  33 +++----
 l10n/it/user_ldap.po                       |  76 ++++++++-------
 l10n/it/user_migrate.po                    |  23 ++---
 l10n/it/user_openid.po                     |  25 ++---
 l10n/ro/tasks.po                           |  51 +++++-----
 l10n/ro/user_ldap.po                       |  75 ++++++++-------
 l10n/sl/files.po                           |  28 +++---
 l10n/sl/files_external.po                  |  21 ++--
 l10n/sl/files_sharing.po                   |  25 ++---
 l10n/sl/settings.po                        |  18 ++--
 l10n/sl/tasks.po                           |  31 +++---
 l10n/sl/user_migrate.po                    |  23 ++---
 l10n/sl/user_openid.po                     |  23 ++---
 l10n/templates/admin_dependencies_chk.pot  |   2 +-
 l10n/templates/admin_migrate.pot           |   2 +-
 l10n/templates/bookmarks.pot               |   2 +-
 l10n/templates/calendar.pot                |   2 +-
 l10n/templates/contacts.pot                |   2 +-
 l10n/templates/core.pot                    |   2 +-
 l10n/templates/files.pot                   |   2 +-
 l10n/templates/files_encryption.pot        |   2 +-
 l10n/templates/files_external.pot          |   2 +-
 l10n/templates/files_sharing.pot           |   2 +-
 l10n/templates/files_versions.pot          |   2 +-
 l10n/templates/gallery.pot                 |   2 +-
 l10n/templates/lib.pot                     |   2 +-
 l10n/templates/media.pot                   |   2 +-
 l10n/templates/settings.pot                |   2 +-
 l10n/templates/tasks.pot                   |   2 +-
 l10n/templates/user_ldap.pot               |   2 +-
 l10n/templates/user_migrate.pot            |   2 +-
 l10n/templates/user_openid.pot             |   2 +-
 l10n/th_TH/admin_dependencies_chk.po       |   9 +-
 l10n/th_TH/admin_migrate.po                |  13 +--
 l10n/th_TH/bookmarks.po                    |  27 +++---
 l10n/th_TH/calendar.po                     |  90 ++++++++---------
 l10n/th_TH/contacts.po                     | 106 ++++++++++-----------
 l10n/th_TH/files.po                        |  34 +++----
 l10n/th_TH/files_encryption.po             |  15 +--
 l10n/th_TH/files_external.po               |  39 ++++----
 l10n/th_TH/files_sharing.po                |  25 ++---
 l10n/th_TH/files_versions.po               |  11 ++-
 l10n/th_TH/gallery.po                      |  84 +++-------------
 l10n/th_TH/lib.po                          |  65 ++++++-------
 l10n/th_TH/settings.po                     |  24 ++---
 l10n/th_TH/tasks.po                        |  51 +++++-----
 l10n/th_TH/user_ldap.po                    |  23 ++---
 l10n/th_TH/user_migrate.po                 |  23 ++---
 l10n/th_TH/user_openid.po                  |  25 ++---
 lib/l10n/th_TH.php                         |  25 +++++
 settings/l10n/ca.php                       |   5 +-
 settings/l10n/de.php                       |   4 +
 settings/l10n/it.php                       |   5 +-
 settings/l10n/sl.php                       |   6 ++
 settings/l10n/th_TH.php                    |   9 ++
 139 files changed, 1697 insertions(+), 954 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/de.php
 create mode 100644 apps/admin_dependencies_chk/l10n/fr.php
 create mode 100644 apps/admin_dependencies_chk/l10n/it.php
 create mode 100644 apps/admin_dependencies_chk/l10n/th_TH.php
 create mode 100644 apps/admin_migrate/l10n/de.php
 create mode 100644 apps/admin_migrate/l10n/fr.php
 create mode 100644 apps/admin_migrate/l10n/it.php
 create mode 100644 apps/admin_migrate/l10n/th_TH.php
 create mode 100644 apps/bookmarks/l10n/th_TH.php
 create mode 100644 apps/files_encryption/l10n/fr.php
 create mode 100644 apps/files_encryption/l10n/it.php
 create mode 100644 apps/files_encryption/l10n/th_TH.php
 create mode 100644 apps/files_external/l10n/de.php
 create mode 100644 apps/files_external/l10n/fr.php
 create mode 100644 apps/files_external/l10n/it.php
 create mode 100644 apps/files_external/l10n/sl.php
 create mode 100644 apps/files_external/l10n/th_TH.php
 create mode 100644 apps/files_sharing/l10n/de.php
 create mode 100644 apps/files_sharing/l10n/fr.php
 create mode 100644 apps/files_sharing/l10n/it.php
 create mode 100644 apps/files_sharing/l10n/sl.php
 create mode 100644 apps/files_sharing/l10n/th_TH.php
 create mode 100644 apps/files_versions/l10n/de.php
 create mode 100644 apps/files_versions/l10n/fr.php
 create mode 100644 apps/files_versions/l10n/it.php
 create mode 100644 apps/files_versions/l10n/th_TH.php
 create mode 100644 apps/tasks/l10n/de.php
 create mode 100644 apps/tasks/l10n/fr.php
 create mode 100644 apps/tasks/l10n/it.php
 create mode 100644 apps/tasks/l10n/ro.php
 create mode 100644 apps/tasks/l10n/sl.php
 create mode 100644 apps/tasks/l10n/th_TH.php
 create mode 100644 apps/user_ldap/l10n/de.php
 create mode 100644 apps/user_ldap/l10n/fr.php
 create mode 100644 apps/user_ldap/l10n/it.php
 create mode 100644 apps/user_ldap/l10n/ro.php
 create mode 100644 apps/user_ldap/l10n/th_TH.php
 create mode 100644 apps/user_migrate/l10n/de.php
 create mode 100644 apps/user_migrate/l10n/fr.php
 create mode 100644 apps/user_migrate/l10n/it.php
 create mode 100644 apps/user_migrate/l10n/sl.php
 create mode 100644 apps/user_migrate/l10n/th_TH.php
 create mode 100644 apps/user_openid/l10n/de.php
 create mode 100644 apps/user_openid/l10n/fr.php
 create mode 100644 apps/user_openid/l10n/it.php
 create mode 100644 apps/user_openid/l10n/sl.php
 create mode 100644 apps/user_openid/l10n/th_TH.php
 create mode 100644 lib/l10n/th_TH.php

diff --git a/apps/admin_dependencies_chk/l10n/de.php b/apps/admin_dependencies_chk/l10n/de.php
new file mode 100644
index 0000000000..0160916809
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/de.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Das Modul  php-json wird von vielen Anwendungen zur internen Kommunikation benötigt.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen.",
+"The php-gd module is needed to create thumbnails of your images" => "Das Modul  php-gd wird für die Erzeugung der Vorschaubilder benötigt.",
+"The php-ldap module is needed connect to your ldap server" => "Das Modul  php-ldap wird für die Verbindung mit dem LDAP-Server benötigt.",
+"The php-zip module is needed download multiple files at once" => "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Das Modul  php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben.",
+"The php-ctype module is needed validate data." => "Das Modul php-ctype wird benötigt, um Daten zu prüfen.",
+"The php-xml module is needed to share files with webdav." => "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen.",
+"The php-pdo module is needed to store owncloud data into a database." => "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern.",
+"Dependencies status" => "Status der Abhängigkeiten",
+"Used by :" => "Benutzt von:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/fr.php b/apps/admin_dependencies_chk/l10n/fr.php
new file mode 100644
index 0000000000..1b195b78bb
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/fr.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Le module php-json est requis pour l'inter-communication de nombreux modules.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages.",
+"The php-gd module is needed to create thumbnails of your images" => "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images.",
+"The php-ldap module is needed connect to your ldap server" => "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap.",
+"The php-zip module is needed download multiple files at once" => "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Le module php-mb_multibyte est requis pour une gestion correcte des encodages.",
+"The php-ctype module is needed validate data." => "Le module php-ctype est requis pour la validation des données.",
+"The php-xml module is needed to share files with webdav." => "Le module php-xml est requis pour le partage de fichiers via webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS.",
+"The php-pdo module is needed to store owncloud data into a database." => "le module php-pdo est requis pour le stockage des données ownCloud en base de données.",
+"Dependencies status" => "Statut des dépendances",
+"Used by :" => "Utilisé par :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/it.php b/apps/admin_dependencies_chk/l10n/it.php
new file mode 100644
index 0000000000..00aeae205b
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/it.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro",
+"The php-gd module is needed to create thumbnails of your images" => "Il modulo php-gd è richiesto per creare miniature delle tue immagini",
+"The php-ldap module is needed connect to your ldap server" => "Il modulo php-ldap è richiesto per collegarsi a un server ldap",
+"The php-zip module is needed download multiple files at once" => "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica.",
+"The php-ctype module is needed validate data." => "Il modulo php-ctype è richiesto per la validazione dei dati.",
+"The php-xml module is needed to share files with webdav." => "Il modulo php-xml è richiesto per condividere i file con webdav.",
+"The php-pdo module is needed to store owncloud data into a database." => "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database.",
+"Dependencies status" => "Stato delle dipendenze",
+"Used by :" => "Usato da:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
new file mode 100644
index 0000000000..338397cb57
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/th_TH.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Used by :" => "ใช้งานโดย:"
+);
diff --git a/apps/admin_migrate/l10n/de.php b/apps/admin_migrate/l10n/de.php
new file mode 100644
index 0000000000..d42179b75a
--- /dev/null
+++ b/apps/admin_migrate/l10n/de.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Diese ownCloud-Instanz exportieren.",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n            Bitte wählen Sie den Exporttyp:",
+"Export" => "Exportieren"
+);
diff --git a/apps/admin_migrate/l10n/fr.php b/apps/admin_migrate/l10n/fr.php
new file mode 100644
index 0000000000..0cf0a444b0
--- /dev/null
+++ b/apps/admin_migrate/l10n/fr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporter cette instance ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n            Veuillez choisir le type d'export :",
+"Export" => "Exporter"
+);
diff --git a/apps/admin_migrate/l10n/it.php b/apps/admin_migrate/l10n/it.php
new file mode 100644
index 0000000000..78d2074bca
--- /dev/null
+++ b/apps/admin_migrate/l10n/it.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Esporta questa istanza di ownClou",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:",
+"Export" => "Esporta"
+);
diff --git a/apps/admin_migrate/l10n/th_TH.php b/apps/admin_migrate/l10n/th_TH.php
new file mode 100644
index 0000000000..9dfaca15b5
--- /dev/null
+++ b/apps/admin_migrate/l10n/th_TH.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n            กรุณาเลือกชนิดของการส่งออกข้อมูล:",
+"Export" => "ส่งออก"
+);
diff --git a/apps/bookmarks/l10n/th_TH.php b/apps/bookmarks/l10n/th_TH.php
new file mode 100644
index 0000000000..64a148efab
--- /dev/null
+++ b/apps/bookmarks/l10n/th_TH.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "รายการโปรด",
+"unnamed" => "ยังไม่มีชื่อ",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
+"Read later" => "อ่านภายหลัง",
+"Address" => "ที่อยู่",
+"Title" => "ชื่อ",
+"Tags" => "ป้ายกำกับ",
+"Save bookmark" => "บันทึกรายการโปรด",
+"You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 4ff0d72204..cd148d757f 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -183,6 +183,7 @@
 "Start week on" => "Erster Wochentag",
 "Cache" => "Zwischenspeicher",
 "Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
+"URLs" => "URLs",
 "Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab",
 "more info" => "weitere Informationen",
 "Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
index 8d09fa162d..0b92a623d4 100644
--- a/apps/calendar/l10n/th_TH.php
+++ b/apps/calendar/l10n/th_TH.php
@@ -1,7 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์",
+"Everything seems to be completely cached" => "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว",
 "No calendars found." => "ไม่พบปฏิทินที่ต้องการ",
 "No events found." => "ไม่พบกิจกรรมที่ต้องการ",
 "Wrong calendar" => "ปฏิทินไม่ถูกต้อง",
+"The file contained either no events or all events are already saved in your calendar." => "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ",
+"events has been saved in the new calendar" => "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว",
+"Import failed" => "การนำเข้าข้อมูลล้มเหลว",
+"events has been saved in your calendar" => "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว",
 "New Timezone:" => "สร้างโซนเวลาใหม่:",
 "Timezone changed" => "โซนเวลาถูกเปลี่ยนแล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
@@ -27,6 +33,7 @@
 "Projects" => "โครงการ",
 "Questions" => "คำถาม",
 "Work" => "งาน",
+"by" => "โดย",
 "unnamed" => "ไม่มีชื่อ",
 "New Calendar" => "สร้างปฏิทินใหม่",
 "Does not repeat" => "ไม่ต้องทำซ้ำ",
@@ -73,6 +80,25 @@
 "by day and month" => "ตามวันและเดือน",
 "Date" => "วันที่",
 "Cal." => "คำนวณ",
+"Sun." => "อา.",
+"Mon." => "จ.",
+"Tue." => "อ.",
+"Wed." => "พ.",
+"Thu." => "พฤ.",
+"Fri." => "ศ.",
+"Sat." => "ส.",
+"Jan." => "ม.ค.",
+"Feb." => "ก.พ.",
+"Mar." => "มี.ค.",
+"Apr." => "เม.ย.",
+"May." => "พ.ค.",
+"Jun." => "มิ.ย.",
+"Jul." => "ก.ค.",
+"Aug." => "ส.ค.",
+"Sep." => "ก.ย.",
+"Oct." => "ต.ค.",
+"Nov." => "พ.ย.",
+"Dec." => "ธ.ค.",
 "All day" => "ทั้งวัน",
 "Missing fields" => "ช่องฟิลด์เกิดการสูญหาย",
 "Title" => "ชื่อกิจกรรม",
@@ -86,6 +112,7 @@
 "Month" => "เดือน",
 "List" => "รายการ",
 "Today" => "วันนี้",
+"Settings" => "ตั้งค่า",
 "Your calendars" => "ปฏิทินของคุณ",
 "CalDav Link" => "ลิงค์ CalDav",
 "Shared calendars" => "ปฏิทินที่เปิดแชร์",
@@ -136,7 +163,10 @@
 "occurrences" => "จำนวนที่ปรากฏ",
 "create a new calendar" => "สร้างปฏิทินใหม่",
 "Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
+"Please choose a calendar" => "กรุณาเลือกปฏิทิน",
 "Name of new calendar" => "ชื่อของปฏิทิน",
+"Take an available name!" => "เลือกชื่อที่ต้องการ",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน",
 "Import" => "นำเข้าข้อมูล",
 "Close Dialog" => "ปิดกล่องข้อความโต้ตอบ",
 "Create a new event" => "สร้างกิจกรรมใหม่",
@@ -144,9 +174,21 @@
 "No categories selected" => "ยังไม่ได้เลือกหมวดหมู่",
 "of" => "ของ",
 "at" => "ที่",
+"General" => "ทั่วไป",
 "Timezone" => "โซนเวลา",
+"Update timezone automatically" => "อัพเดทโซนเวลาอัตโนมัติ",
+"Time format" => "รูปแบบเวลา",
 "24h" => "24 ช.ม.",
 "12h" => "12 ช.ม.",
+"Start week on" => "เริ่มต้นสัปดาห์ด้วย",
+"Cache" => "หน่วยความจำแคช",
+"Clear cache for repeating events" => "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV",
+"more info" => "ข้อมูลเพิ่มเติม",
+"Primary address (Kontact et al)" => "ที่อยู่หลัก (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "อ่านเฉพาะลิงก์ iCalendar เท่านั้น",
 "Users" => "ผู้ใช้งาน",
 "select users" => "เลือกผู้ใช้งาน",
 "Editable" => "สามารถแก้ไขได้",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 553271d88f..7a4989986f 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -10,9 +10,11 @@
 "No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
 "There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
 "element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"Could not parse contact: " => "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้",
 "Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
 "At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
 "Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
+"Error adding contact property: " => "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ",
 "Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
 "Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Missing ID" => "รหัสสูญหาย",
@@ -57,10 +59,14 @@
 "Edit name" => "แก้ไขชื่อ",
 "No files selected for upload." => "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
+"Error loading profile picture." => "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว",
 "Select type" => "เลือกชนิด",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน",
 "Result: " => "ผลลัพธ์: ",
 " imported, " => " นำเข้าข้อมูลแล้ว, ",
 " failed." => " ล้มเหลว.",
+"Displayname cannot be empty." => "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้",
+"Addressbook not found: " => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
 "Address" => "ที่อยู่",
@@ -78,12 +84,38 @@
 "Pager" => "เพจเจอร์",
 "Internet" => "อินเทอร์เน็ต",
 "Birthday" => "วันเกิด",
+"Business" => "ธุรกิจ",
+"Call" => "โทร",
+"Clients" => "ลูกค้า",
+"Deliverer" => "ผู้จัดส่ง",
+"Holidays" => "วันหยุด",
+"Ideas" => "ไอเดีย",
+"Journey" => "การเดินทาง",
+"Jubilee" => "งานเฉลิมฉลอง",
+"Meeting" => "ประชุม",
+"Other" => "อื่นๆ",
+"Personal" => "ส่วนตัว",
+"Projects" => "โปรเจค",
+"Questions" => "คำถาม",
 "{name}'s Birthday" => "วันเกิดของ {name}",
 "Contact" => "ข้อมูลการติดต่อ",
 "Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
 "Import" => "นำเข้า",
+"Settings" => "ตั้งค่า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
 "Close" => "ปิด",
+"Keyboard shortcuts" => "ปุ่มลัด",
+"Navigation" => "ระบบเมนู",
+"Next contact in list" => "ข้อมูลผู้ติดต่อถัดไปในรายการ",
+"Previous contact in list" => "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ",
+"Expand/collapse current addressbook" => "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน",
+"Next addressbook" => "สมุดบันทึกที่อยู่ถัดไป",
+"Previous addressbook" => "สมุดบันทึกที่อยู่ก่อนหน้า",
+"Actions" => "การกระทำ",
+"Refresh contacts list" => "รีเฟรชรายชื่อผู้ติดต่อใหม่",
+"Add new contact" => "เพิ่มข้อมูลผู้ติดต่อใหม่",
+"Add new addressbook" => "เพิ่มสมุดบันทึกที่อยู่ใหม่",
+"Delete current contact" => "ลบข้อมูลผู้ติดต่อปัจจุบัน",
 "Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
 "Delete current photo" => "ลบรูปภาพปัจจุบัน",
 "Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
@@ -94,6 +126,9 @@
 "Delete" => "ลบ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
+"Web site" => "เว็บไซต์",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "ไปที่เว็บไซต์",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "กลุ่ม",
 "Separate groups with commas" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
@@ -117,10 +152,15 @@
 "Edit address" => "แก้ไขที่อยู่",
 "Type" => "ประเภท",
 "PO Box" => "ตู้ ปณ.",
+"Street address" => "ที่อยู่",
+"Street and number" => "ถนนและหมายเลข",
 "Extended" => "เพิ่ม",
+"Apartment number etc." => "หมายเลขอพาร์ทเมนต์ ฯลฯ",
 "City" => "เมือง",
 "Region" => "ภูมิภาค",
+"E.g. state or province" => "เช่น รัฐ หรือ จังหวัด",
 "Zipcode" => "รหัสไปรษณีย์",
+"Postal code" => "รหัสไปรษณีย์",
 "Country" => "ประเทศ",
 "Addressbook" => "สมุดบันทึกที่อยู่",
 "Hon. prefixes" => "คำนำหน้าชื่อคนรัก",
@@ -150,13 +190,21 @@
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
 "Configure addressbooks" => "กำหนดค่าสมุดบันทึกที่อยู่",
+"Select Address Books" => "เลือกสมุดบันทึกที่อยู่",
+"Enter name" => "กรอกชื่อ",
+"Enter description" => "กรอกคำอธิบาย",
 "CardDAV syncing addresses" => "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV",
 "more info" => "ข้อมูลเพิ่มเติม",
 "Primary address (Kontact et al)" => "ที่อยู่หลัก (สำหรับติดต่อ)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "แสดงลิงก์ CardDav",
+"Show read-only VCF link" => "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น",
 "Download" => "ดาวน์โหลด",
 "Edit" => "แก้ไข",
 "New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
+"Name" => "ชื่อ",
+"Description" => "คำอธิบาย",
 "Save" => "บันทึก",
-"Cancel" => "ยกเลิก"
+"Cancel" => "ยกเลิก",
+"More..." => "เพิ่มเติม..."
 );
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 0fd9e9a06c..99ab3c124b 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -9,6 +9,11 @@
 "Files" => "Datoteke",
 "Unshare" => "Vzemi iz souporabe",
 "Delete" => "Izbriši",
+"already exists" => "že obstaja",
+"replace" => "nadomesti",
+"cancel" => "ekliči",
+"replaced" => "nadomeščen",
+"with" => "z",
 "undo" => "razveljavi",
 "deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 4299c31a45..03a50fd711 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,7 +7,15 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
+"already exists" => "มีอยู่แล้ว",
+"replace" => "แทนที่",
+"cancel" => "ยกเลิก",
+"replaced" => "แทนที่แล้ว",
+"with" => "กับ",
+"undo" => "เลิกทำ",
+"deleted" => "ลบแล้ว",
 "generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
 "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
new file mode 100644
index 0000000000..c9367d1a31
--- /dev/null
+++ b/apps/files_encryption/l10n/fr.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Chiffrement",
+"Exclude the following file types from encryption" => "Ne pas chiffrer les fichiers dont les types sont les suivants",
+"None" => "Aucun",
+"Enable Encryption" => "Activer le chiffrement"
+);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
new file mode 100644
index 0000000000..5136b06179
--- /dev/null
+++ b/apps/files_encryption/l10n/it.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Cifratura",
+"Exclude the following file types from encryption" => "Escludi i seguenti tipi di file dalla cifratura",
+"None" => "Nessuna",
+"Enable Encryption" => "Abilita cifratura"
+);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
new file mode 100644
index 0000000000..c2685de6e3
--- /dev/null
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "การเข้ารหัส",
+"Exclude the following file types from encryption" => "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส",
+"None" => "ไม่ต้อง",
+"Enable Encryption" => "เปิดใช้งานการเข้ารหัส"
+);
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
new file mode 100644
index 0000000000..45e5d32dfc
--- /dev/null
+++ b/apps/files_external/l10n/de.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externer Speicher",
+"Mount point" => "Mount-Point",
+"Backend" => "Backend",
+"Configuration" => "Konfiguration",
+"Options" => "Optionen",
+"Applicable" => "Zutreffend",
+"Add mount point" => "Mount-Point hinzufügen",
+"None set" => "Nicht definiert",
+"All Users" => "Alle Benutzer",
+"Groups" => "Gruppen",
+"Users" => "Benutzer",
+"Delete" => "Löschen",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren",
+"Enable User External Storage" => "Externer Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
+);
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
new file mode 100644
index 0000000000..b3e76c6350
--- /dev/null
+++ b/apps/files_external/l10n/fr.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Stockage externe",
+"Mount point" => "Point de montage",
+"Backend" => "Infrastructure",
+"Configuration" => "Configuration",
+"Options" => "Options",
+"Applicable" => "Disponible",
+"Add mount point" => "Ajouter un point de montage",
+"None set" => "Aucun spécifié",
+"All Users" => "Tous les utilisateurs",
+"Groups" => "Groupes",
+"Users" => "Utilisateurs",
+"Delete" => "Supprimer",
+"SSL root certificates" => "Certificats racine SSL",
+"Import Root Certificate" => "Importer un certificat racine",
+"Enable User External Storage" => "Activer le stockage externe pour les utilisateurs",
+"Allow users to mount their own external storage" => "Autoriser les utilisateurs à monter leur propre stockage externe"
+);
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
new file mode 100644
index 0000000000..927499b017
--- /dev/null
+++ b/apps/files_external/l10n/it.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Archiviazione esterna",
+"Mount point" => "Punto di mount",
+"Backend" => "Motore",
+"Configuration" => "Configurazione",
+"Options" => "Opzioni",
+"Applicable" => "Applicabile",
+"Add mount point" => "Aggiungi punto di mount",
+"None set" => "Nessuna impostazione",
+"All Users" => "Tutti gli utenti",
+"Groups" => "Gruppi",
+"Users" => "Utenti",
+"Delete" => "Elimina",
+"SSL root certificates" => "Certificato principale per SSL",
+"Import Root Certificate" => "Importa certificato principale",
+"Enable User External Storage" => "Abilita la memoria esterna dell'utente",
+"Allow users to mount their own external storage" => "Consente agli utenti di montare la propria memoria esterna"
+);
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
new file mode 100644
index 0000000000..6a96e2cd69
--- /dev/null
+++ b/apps/files_external/l10n/sl.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"All Users" => "Vsi uporabniki",
+"Groups" => "Skupine",
+"Users" => "Uporabniki",
+"Delete" => "Izbriši",
+"SSL root certificates" => "SSL korenski certifikati",
+"Import Root Certificate" => "Uvozi korenski certifikat",
+"Enable User External Storage" => "Omogoči"
+);
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
new file mode 100644
index 0000000000..84a233046e
--- /dev/null
+++ b/apps/files_external/l10n/th_TH.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+"Mount point" => "จุดชี้ตำแหน่ง",
+"Backend" => "ด้านหลังระบบ",
+"Configuration" => "การกำหนดค่า",
+"Options" => "ตัวเลือก",
+"Applicable" => "สามารถใช้งานได้",
+"Add mount point" => "เพิ่มจุดชี้ตำแหน่ง",
+"None set" => "ยังไม่มีการกำหนด",
+"All Users" => "ผู้ใช้งานทั้งหมด",
+"Groups" => "กลุ่ม",
+"Users" => "ผู้ใช้งาน",
+"Delete" => "ลบ",
+"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+"Enable User External Storage" => "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
+"Allow users to mount their own external storage" => "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
+);
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
new file mode 100644
index 0000000000..d0526c0f3c
--- /dev/null
+++ b/apps/files_sharing/l10n/de.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Ihre geteilten Dateien",
+"Item" => "Objekt",
+"Shared With" => "Teilen mit",
+"Permissions" => "Berechtigungen",
+"Read" => "Lesen",
+"Edit" => "Bearbeiten",
+"Delete" => "Löschen",
+"Enable Resharing" => "Austausch ermöglichen",
+"Allow users to reshare files they don't own" => "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
+);
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
new file mode 100644
index 0000000000..47219c0080
--- /dev/null
+++ b/apps/files_sharing/l10n/fr.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vos documents partagés",
+"Item" => "Item",
+"Shared With" => "Partagé avec",
+"Permissions" => "Permissions",
+"Read" => "Lecture",
+"Edit" => "Édition",
+"Delete" => "Effacement",
+"Enable Resharing" => "Permettre le repartage",
+"Allow users to reshare files they don't own" => "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
+);
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
new file mode 100644
index 0000000000..5534dfca03
--- /dev/null
+++ b/apps/files_sharing/l10n/it.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "I tuoi file condivisi",
+"Item" => "Elemento",
+"Shared With" => "Condiviso con",
+"Permissions" => "Permessi",
+"Read" => "Lettura",
+"Edit" => "Modifica",
+"Delete" => "Eliminazione"
+);
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
new file mode 100644
index 0000000000..a2a1a2b1a9
--- /dev/null
+++ b/apps/files_sharing/l10n/sl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vaše datoteke v souporabi",
+"Item" => "Predmet",
+"Shared With" => "V souporabi z",
+"Permissions" => "Dovoljenja",
+"Read" => "Branje",
+"Edit" => "Pisanje",
+"Delete" => "Izbris",
+"Enable Resharing" => "Omogoči nadaljnjo izmenjavo",
+"Allow users to reshare files they don't own" => "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
+);
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
new file mode 100644
index 0000000000..2ff9111234
--- /dev/null
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "ไฟล์ของคุณที่แชร์ไว้",
+"Item" => "ไอเท็ม",
+"Shared With" => "แชร์พร้อมกับ",
+"Permissions" => "สิทธิ์การเข้าใช้งาน",
+"Read" => "อ่าน",
+"Edit" => "แก้ไข",
+"Delete" => "ลบ",
+"Enable Resharing" => "เปิดให้มีการแชร์ใหม่อีกครั้งได้",
+"Allow users to reshare files they don't own" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
+);
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
new file mode 100644
index 0000000000..3d1a0a43f5
--- /dev/null
+++ b/apps/files_versions/l10n/de.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Alle Versionen löschen",
+"Enable Files Versioning" => "Datei-Versionierung aktivieren"
+);
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
new file mode 100644
index 0000000000..02209f543b
--- /dev/null
+++ b/apps/files_versions/l10n/fr.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Supprimer les versions intermédiaires",
+"Enable Files Versioning" => "Activer le versionnage"
+);
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
new file mode 100644
index 0000000000..9711ce18aa
--- /dev/null
+++ b/apps/files_versions/l10n/it.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Scadenza di tutte le versioni",
+"Enable Files Versioning" => "Abilita controllo di versione"
+);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
new file mode 100644
index 0000000000..e880840f4b
--- /dev/null
+++ b/apps/files_versions/l10n/th_TH.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "หมดอายุทุกรุ่น",
+"Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
+);
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
index 34da8dc57f..9bb699e264 100644
--- a/apps/gallery/l10n/th_TH.php
+++ b/apps/gallery/l10n/th_TH.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "รูปภาพ",
-"Settings" => "ตั้งค่า",
-"Rescan" => "ตรวจสอบอีกครั้ง",
-"Stop" => "หยุด",
-"Share" => "แชร์",
-"Back" => "ย้อนกลับ",
-"Remove confirmation" => "การยืนยันการลบ",
-"Do you want to remove album" => "คุณต้องการลบอัลบั้มออกหรือไม่",
-"Change album name" => "เปลี่ยนชื่ออัลบั้ม",
-"New album name" => "ชื่อใหม่ของอัลบั้ม"
+"Share gallery" => "แชร์ข้อมูลแกลอรี่",
+"Error: " => "พบข้อผิดพลาด: ",
+"Internal error" => "เกิดข้อผิดพลาดภายในระบบ",
+"Slideshow" => "ภาพสไลด์โชว์"
 );
diff --git a/apps/tasks/l10n/de.php b/apps/tasks/l10n/de.php
new file mode 100644
index 0000000000..50d0041d20
--- /dev/null
+++ b/apps/tasks/l10n/de.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Datum/Uhrzeit ungültig",
+"Tasks" => "Aufgaben",
+"No category" => "Keine Kategorie",
+"Unspecified" => "Nicht angegeben",
+"1=highest" => "1=am höchsten",
+"5=medium" => "5=Durchschnitt",
+"9=lowest" => "9=am niedrigsten",
+"Empty Summary" => "Leere Zusammenfassung",
+"Invalid percent complete" => "Ungültige Prozent abgeschlossen",
+"Invalid priority" => "Falsche Priorität",
+"Add Task" => "Aufgabe hinzufügen",
+"Order Due" => "Nach Fälligkeit sortieren",
+"Order List" => "Nach Kategorie sortieren ",
+"Order Complete" => "Nach Fertigstellung sortieren",
+"Order Location" => "Nach Ort sortieren",
+"Order Priority" => "Nach Priorität sortieren",
+"Order Label" => "Nach Label sortieren",
+"Loading tasks..." => "Lade Aufgaben...",
+"Important" => "Wichtig",
+"More" => "Mehr",
+"Less" => "Weniger",
+"Delete" => "Löschen"
+);
diff --git a/apps/tasks/l10n/fr.php b/apps/tasks/l10n/fr.php
new file mode 100644
index 0000000000..0bac4a6577
--- /dev/null
+++ b/apps/tasks/l10n/fr.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "date/heure invalide",
+"Tasks" => "Tâches",
+"No category" => "Sans catégorie",
+"Unspecified" => "Non spécifié",
+"1=highest" => "1=le plus important",
+"5=medium" => "5=importance moyenne",
+"9=lowest" => "9=le moins important",
+"Empty Summary" => "Résumé vide",
+"Invalid percent complete" => "Pourcentage d'achèvement invalide",
+"Invalid priority" => "Priorité invalide",
+"Add Task" => "Ajouter une tâche",
+"Loading tasks..." => "Chargement des tâches…",
+"Important" => "Important",
+"More" => "Plus",
+"Less" => "Moins",
+"Delete" => "Supprimer"
+);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
new file mode 100644
index 0000000000..8467ff54eb
--- /dev/null
+++ b/apps/tasks/l10n/it.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Ora/Data non valida",
+"Tasks" => "Attività",
+"No category" => "Nessuna categoria",
+"Unspecified" => "Non specificata",
+"1=highest" => "1=massima",
+"5=medium" => "5=media",
+"9=lowest" => "9=minima",
+"Invalid percent complete" => "Percentuale di completamento non valida",
+"Invalid priority" => "Priorità non valida",
+"Add Task" => "Aggiungi attività",
+"Loading tasks..." => "Caricamento attività in corso...",
+"Important" => "Importante",
+"Delete" => "Elimina"
+);
diff --git a/apps/tasks/l10n/ro.php b/apps/tasks/l10n/ro.php
new file mode 100644
index 0000000000..54958582f5
--- /dev/null
+++ b/apps/tasks/l10n/ro.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Data/timpul invalid",
+"Tasks" => "Sarcini",
+"No category" => "Fără categorie",
+"Unspecified" => "Nespecificat",
+"1=highest" => "1=cel mai înalt",
+"5=medium" => "5=mediu",
+"9=lowest" => "9=cel mai jos",
+"Empty Summary" => "Rezumat gol",
+"Invalid percent complete" => "Completare procentuală greșită",
+"Invalid priority" => "Prioritare greșită",
+"Add Task" => "Adaugă sarcină",
+"Order Due" => "Comandă până la",
+"Order List" => "Lista de comenzi",
+"Order Complete" => "Comandă executată",
+"Order Location" => "Locația comenzii",
+"Order Priority" => "Prioritarea comenzii",
+"Order Label" => "Eticheta comenzii",
+"Loading tasks..." => "Încărcare sarcini",
+"Important" => "Important",
+"More" => "Mai mult",
+"Less" => "Mai puțin",
+"Delete" => "Șterge"
+);
diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php
new file mode 100644
index 0000000000..7bef1894d1
--- /dev/null
+++ b/apps/tasks/l10n/sl.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Neveljaven datum/čas",
+"Tasks" => "Opravila",
+"No category" => "Ni kategorije",
+"Unspecified" => "Nedoločen",
+"1=highest" => "1=najvišje",
+"5=medium" => "5=srednje",
+"9=lowest" => "9=najnižje",
+"Empty Summary" => "Prazen povzetek",
+"Invalid priority" => "Neveljavna prednost",
+"Add Task" => "Dodaj opravilo",
+"More" => "Več",
+"Less" => "Manj"
+);
diff --git a/apps/tasks/l10n/th_TH.php b/apps/tasks/l10n/th_TH.php
new file mode 100644
index 0000000000..e4212bf291
--- /dev/null
+++ b/apps/tasks/l10n/th_TH.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "วันที่ / เวลา ไม่ถูกต้อง",
+"Tasks" => "งาน",
+"No category" => "ไม่มีหมวดหมู่",
+"Unspecified" => "ยังไม่ได้ระบุ",
+"1=highest" => "1=สูงสุด",
+"5=medium" => "5=ปานกลาง",
+"9=lowest" => "9=ต่ำสุด",
+"Empty Summary" => "ข้อมูลสรุปยังว่างอยู่",
+"Invalid percent complete" => "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง",
+"Invalid priority" => "ความสำคัญไม่ถูกต้อง",
+"Add Task" => "เพิ่มงานใหม่",
+"Order Due" => "จัดเรียงตามกำหนดเวลา",
+"Order List" => "จัดเรียงตามรายชื่อ",
+"Order Complete" => "จัดเรียงตามความสมบูรณ์",
+"Order Location" => "จัดเรียงตามตำแหน่งที่อยู่",
+"Order Priority" => "จัดเรียงตามระดับความสำคัญ",
+"Order Label" => "จัดเรียงตามป้ายชื่อ",
+"Loading tasks..." => "กำลังโหลดข้อมูลงาน...",
+"Important" => "สำคัญ",
+"More" => "มาก",
+"Less" => "น้อย",
+"Delete" => "ลบ"
+);
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
new file mode 100644
index 0000000000..f52bfe8e7e
--- /dev/null
+++ b/apps/user_ldap/l10n/de.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"Password" => "Passwort",
+"User Login Filter" => "Benutzer Login Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"User List Filter" => "Benutzer Filter Liste",
+"Group Filter" => "Gruppen Filter",
+"Port" => "Port",
+"Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern.",
+"Turn off SSL certificate validation." => "Schalte die SSL Zertifikatsprüfung aus.",
+"in bytes" => "in bytes",
+"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
+"Help" => "Hilfe"
+);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
new file mode 100644
index 0000000000..c2222f104e
--- /dev/null
+++ b/apps/user_ldap/l10n/fr.php
@@ -0,0 +1,30 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Hôte",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
+"Base DN" => "DN de base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé",
+"User DN" => "DN Utilisateur",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
+"Password" => "Mot de passe",
+"For anonymous access, leave DN and Password empty." => "Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
+"User Login Filter" => "Filtre d'identifiants utilisateur",
+"User List Filter" => "Filtre d'utilisateurs",
+"Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
+"without any placeholder, e.g. \"objectClass=person\"." => "sans élément de substitution, par exemple \"objectClass=person\".",
+"Group Filter" => "Filtre de groupes",
+"Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Group-Member association" => "Association groupe-membre",
+"Use TLS" => "Utiliser TLS",
+"Do not use it for SSL connections, it will fail." => "Ne pas utiliser pour les connexions SSL, car cela échouera.",
+"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
+"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
+"Not recommended, use for testing only." => "Non recommendé, utilisation pour tests uniquement.",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud",
+"in bytes" => "en octets",
+"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
+"Help" => "Aide"
+);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
new file mode 100644
index 0000000000..70c4bf4d08
--- /dev/null
+++ b/apps/user_ldap/l10n/it.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
+"Base DN" => "DN base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+"User DN" => "DN utente",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+"Password" => "Password",
+"For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+"User Login Filter" => "Filtro per il login utente",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\"",
+"User List Filter" => "Filtro per la lista utente",
+"Defines the filter to apply, when retrieving users." => "Specifica quale filtro utilizzare durante il recupero degli utenti.",
+"without any placeholder, e.g. \"objectClass=person\"." => "senza nessun segnaposto, per esempio \"objectClass=person\".",
+"Group Filter" => "Filtro per il gruppo",
+"Defines the filter to apply, when retrieving groups." => "Specifica quale filtro utilizzare durante il recupero dei gruppi.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
+"Port" => "Porta",
+"Base User Tree" => "Struttura base dell'utente",
+"Base Group Tree" => "Struttura base del gruppo",
+"Group-Member association" => "Associazione gruppo-utente ",
+"Use TLS" => "Usa TLS",
+"Do not use it for SSL connections, it will fail." => "Non utilizzare per le connessioni SSL, fallirà.",
+"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
+"Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
+"Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
+"User Display Name Field" => "Campo per la visualizzazione del nome utente",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attributo LDAP da usare per generare il nome dell'utente ownCloud.",
+"Group Display Name Field" => "Campo per la visualizzazione del nome del gruppo",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attributo LDAP da usare per generare il nome del gruppo ownCloud.",
+"in bytes" => "in byte",
+"in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
+"Help" => "Aiuto"
+);
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
new file mode 100644
index 0000000000..326e47f96f
--- /dev/null
+++ b/apps/user_ldap/l10n/ro.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Gazdă",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
+"Base DN" => "DN de bază",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
+"User DN" => "DN al utilizatorului",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere.",
+"Password" => "Parolă",
+"For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
+"User Login Filter" => "Filtrare după Nume Utilizator",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "folosiți substituentul %%uid , d.e. \"uid=%%uid\"",
+"User List Filter" => "Filtrarea după lista utilizatorilor",
+"Defines the filter to apply, when retrieving users." => "Definește filtrele care trebui aplicate, când se peiau utilzatorii.",
+"without any placeholder, e.g. \"objectClass=person\"." => "fără substituenți, d.e. \"objectClass=person\".",
+"Group Filter" => "Fitrare Grup",
+"Defines the filter to apply, when retrieving groups." => "Definește filtrele care se aplică, când se preiau grupurile.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "fără substituenți, d.e. \"objectClass=posixGroup\"",
+"Port" => "Portul",
+"Base User Tree" => "Arborele de bază al Utilizatorilor",
+"Base Group Tree" => "Arborele de bază al Grupurilor",
+"Group-Member association" => "Asocierea Grup-Membru",
+"Use TLS" => "Utilizează TLS",
+"Do not use it for SSL connections, it will fail." => "A nu se utiliza pentru conexiuni SSL, va eșua.",
+"Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
+"Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud.",
+"Not recommended, use for testing only." => "Nu este recomandat, a se utiliza doar pentru testare.",
+"User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud.",
+"Group Display Name Field" => "Câmpul cu numele grupului",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud",
+"in bytes" => "în octeți",
+"in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
+"Help" => "Ajutor"
+);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
new file mode 100644
index 0000000000..8b2e6423ac
--- /dev/null
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Host" => "โฮสต์",
+"Password" => "รหัสผ่าน",
+"Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
+"Port" => "พอร์ต",
+"Use TLS" => "ใช้ TLS",
+"Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
+"in bytes" => "ในหน่วยไบต์",
+"Help" => "ช่วยเหลือ"
+);
diff --git a/apps/user_migrate/l10n/ca.php b/apps/user_migrate/l10n/ca.php
index 6f1c77e417..6e423c01b0 100644
--- a/apps/user_migrate/l10n/ca.php
+++ b/apps/user_migrate/l10n/ca.php
@@ -2,9 +2,9 @@
 "Export" => "Exporta",
 "Something went wrong while the export file was being generated" => "Alguna cosa ha anat malament en generar el fitxer d'exportació",
 "An error has occurred" => "S'ha produït un error",
-"Export your user account" => "Exporta el vostre compte d'usuari",
+"Export your user account" => "Exportar el compte d'usuari",
 "This will create a compressed file that contains your ownCloud account." => "Això crearà un fitxer comprimit que conté el vostre compte ownCloud.",
-"Import user account" => "Importa el compte d'usuari",
+"Import user account" => "Importar el compte d'usuari",
 "ownCloud User Zip" => "zip d'usuari ownCloud",
 "Import" => "Importa"
 );
diff --git a/apps/user_migrate/l10n/de.php b/apps/user_migrate/l10n/de.php
new file mode 100644
index 0000000000..110b0bba6e
--- /dev/null
+++ b/apps/user_migrate/l10n/de.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Export",
+"Something went wrong while the export file was being generated" => "Beim Export der Datei ist etwas schief gegangen.",
+"An error has occurred" => "Es ist ein Fehler aufgetreten.",
+"Export your user account" => "Ihr Konto exportieren",
+"This will create a compressed file that contains your ownCloud account." => "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält.",
+"Import user account" => "Konto importieren",
+"ownCloud User Zip" => "Zip-Archiv mit Benutzerdaten",
+"Import" => "Importieren"
+);
diff --git a/apps/user_migrate/l10n/fr.php b/apps/user_migrate/l10n/fr.php
new file mode 100644
index 0000000000..f1fe46bcac
--- /dev/null
+++ b/apps/user_migrate/l10n/fr.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exporter",
+"Something went wrong while the export file was being generated" => "Une erreur s'est produit pendant la génération du fichier d'export",
+"An error has occurred" => "Une erreur s'est produite",
+"Export your user account" => "Exportez votre compte utilisateur",
+"This will create a compressed file that contains your ownCloud account." => "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud.",
+"Import user account" => "Importer un compte utilisateur",
+"ownCloud User Zip" => "Archive Zip de l'utilisateur",
+"Import" => "Importer"
+);
diff --git a/apps/user_migrate/l10n/it.php b/apps/user_migrate/l10n/it.php
new file mode 100644
index 0000000000..f3eeb15dab
--- /dev/null
+++ b/apps/user_migrate/l10n/it.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Esporta",
+"Something went wrong while the export file was being generated" => "Si è verificato un errore durante la creazione del file di esportazione",
+"An error has occurred" => "Si è verificato un errore",
+"Export your user account" => "Esporta il tuo account utente",
+"This will create a compressed file that contains your ownCloud account." => "Questa operazione creerà un file compresso che contiene il tuo account ownCloud.",
+"Import user account" => "Importa account utente",
+"ownCloud User Zip" => "Zip account utente",
+"Import" => "Importa"
+);
diff --git a/apps/user_migrate/l10n/sl.php b/apps/user_migrate/l10n/sl.php
new file mode 100644
index 0000000000..c14bca0f70
--- /dev/null
+++ b/apps/user_migrate/l10n/sl.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Izvozi",
+"Something went wrong while the export file was being generated" => "Med ustvarjanjem datoteke za izvoz je prišlo do napake",
+"An error has occurred" => "Prišlo je do napake",
+"Export your user account" => "Izvozi vaš uporabniški račun",
+"This will create a compressed file that contains your ownCloud account." => "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom.",
+"Import user account" => "Uvozi uporabniški račun",
+"ownCloud User Zip" => "Zip datoteka ownCloud uporabnika",
+"Import" => "Uvozi"
+);
diff --git a/apps/user_migrate/l10n/th_TH.php b/apps/user_migrate/l10n/th_TH.php
new file mode 100644
index 0000000000..d2c36bb4ed
--- /dev/null
+++ b/apps/user_migrate/l10n/th_TH.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "ส่งออก",
+"Something went wrong while the export file was being generated" => "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์",
+"An error has occurred" => "เกิดข้อผิดพลาดบางประการ",
+"Export your user account" => "ส่งออกบัญชีผู้ใช้งานของคุณ",
+"This will create a compressed file that contains your ownCloud account." => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ",
+"Import user account" => "นำเข้าบัญชีผู้ใช้งาน",
+"ownCloud User Zip" => "ไฟล์ Zip ผู้ใช้งาน ownCloud",
+"Import" => "นำเข้า"
+);
diff --git a/apps/user_openid/l10n/de.php b/apps/user_openid/l10n/de.php
new file mode 100644
index 0000000000..97abccba9e
--- /dev/null
+++ b/apps/user_openid/l10n/de.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:",
+"Identity: <b>" => "Identität: <b>",
+"Realm: <b>" => "Bereich: <b>",
+"User: <b>" => "Benutzer: <b>",
+"Login" => "Anmelden",
+"Error: <b>No user Selected" => "Fehler: <b> Kein Benutzer gewählt",
+"you can authenticate to other sites with this address" => "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren.",
+"Authorized OpenID provider" => "Authorisierter OpenID-Anbieter",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/fr.php b/apps/user_openid/l10n/fr.php
new file mode 100644
index 0000000000..ec3d00853d
--- /dev/null
+++ b/apps/user_openid/l10n/fr.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter",
+"Identity: <b>" => "Identité : <b>",
+"Realm: <b>" => "Domaine : <b>",
+"User: <b>" => "Utilisateur : <b>",
+"Login" => "Connexion",
+"Error: <b>No user Selected" => "Erreur : <b>Aucun nom d'utilisateur n'a été saisi",
+"you can authenticate to other sites with this address" => "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse",
+"Authorized OpenID provider" => "Fournisseur d'identité OpenID autorisé",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Votre adresse Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/it.php b/apps/user_openid/l10n/it.php
new file mode 100644
index 0000000000..bda06ce18a
--- /dev/null
+++ b/apps/user_openid/l10n/it.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Questo è un server OpenID. Per ulteriori informazioni, vedi",
+"Identity: <b>" => "Identità: <b>",
+"Realm: <b>" => "Dominio: <b>",
+"User: <b>" => "Utente: <b>",
+"Login" => "Accesso",
+"Error: <b>No user Selected" => "Errore: <b>nessun utente selezionato",
+"you can authenticate to other sites with this address" => "puoi autenticarti ad altri siti con questo indirizzo",
+"Authorized OpenID provider" => "Fornitore OpenID autorizzato",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/sl.php b/apps/user_openid/l10n/sl.php
new file mode 100644
index 0000000000..72132cd637
--- /dev/null
+++ b/apps/user_openid/l10n/sl.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "To je OpenID strežniška končna točka. Za več informacij si oglejte",
+"Identity: <b>" => "Istovetnost: <b>",
+"User: <b>" => "Uporabnik:",
+"Login" => "Prijava",
+"Error: <b>No user Selected" => "Napaka: <b>Uporabnik ni bil izbran",
+"you can authenticate to other sites with this address" => "s tem naslovom se lahko overite tudi na drugih straneh",
+"Authorized OpenID provider" => "Odobren OpenID ponudnik",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov na Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/th_TH.php b/apps/user_openid/l10n/th_TH.php
new file mode 100644
index 0000000000..fbf0bbc60a
--- /dev/null
+++ b/apps/user_openid/l10n/th_TH.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่",
+"Identity: <b>" => "ข้อมูลประจำตัว <b>",
+"Realm: <b>" => "ขอบเขตพื้นที่ <b>",
+"User: <b>" => "ผู้ใช้งาน: <b>",
+"Login" => "เข้าสู่ระบบ",
+"Error: <b>No user Selected" => "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน",
+"you can authenticate to other sites with this address" => "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้",
+"Authorized OpenID provider" => "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต",
+"Your address at Wordpress, Identi.ca, &hellip;" => "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
+);
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 5fce708ceb..703474cad9 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:06+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,15 +77,15 @@ msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "executa una tasca en carregar cada pàgina"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php està registrat en un servei web cron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "usa el servei cron del sistema"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -97,7 +97,7 @@ msgstr "Més"
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr "Afegeiu la vostra aplicació"
+msgstr "Afegiu la vostra aplicació"
 
 #: templates/apps.php:26
 msgid "Select an App"
diff --git a/l10n/ca/user_migrate.po b/l10n/ca/user_migrate.po
index 3732c55e9f..c603e775e4 100644
--- a/l10n/ca/user_migrate.po
+++ b/l10n/ca/user_migrate.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 18:39+0000\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:04+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "S'ha produït un error"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr "Exporta el vostre compte d'usuari"
+msgstr "Exportar el compte d'usuari"
 
 #: templates/settings.php:3
 msgid ""
@@ -41,7 +41,7 @@ msgstr "Això crearà un fitxer comprimit que conté el vostre compte ownCloud."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr "Importa el compte d'usuari"
+msgstr "Importar el compte d'usuari"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
diff --git a/l10n/de/admin_dependencies_chk.po b/l10n/de/admin_dependencies_chk.po
index ea25facb3a..cbd173e470 100644
--- a/l10n/de/admin_dependencies_chk.po
+++ b/l10n/de/admin_dependencies_chk.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Maurice Preuß <>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 20:46+0000\n"
+"Last-Translator: Maurice Preuß <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +24,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Das Modul  php-json wird von vielen Anwendungen zur internen Kommunikation benötigt."
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen."
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Das Modul  php-gd wird für die Erzeugung der Vorschaubilder benötigt."
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Das Modul  php-ldap wird für die Verbindung mit dem LDAP-Server benötigt."
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Das Modul  php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Das Modul php-ctype wird benötigt, um Daten zu prüfen."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen."
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Status der Abhängigkeiten"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Benutzt von:"
diff --git a/l10n/de/admin_migrate.po b/l10n/de/admin_migrate.po
index e2c34ce2ce..d4a6b315a1 100644
--- a/l10n/de/admin_migrate.po
+++ b/l10n/de/admin_migrate.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:34+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +21,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Diese ownCloud-Instanz exportieren."
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n            Bitte wählen Sie den Exporttyp:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Exportieren"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 0aada56b32..449a503419 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 20:28+0000\n"
-"Last-Translator: driz <driz@i2pmail.org>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 11:28+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -776,7 +776,7 @@ msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLs"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 4d9de10e67..84c825dfd9 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 08:18+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Externer Speicher"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Mount-Point"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Backend"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Optionen"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Zutreffend"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Mount-Point hinzufügen"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nicht definiert"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Alle Benutzer"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Gruppen"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Benutzer"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL-Root-Zertifikate"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Root-Zertifikate importieren"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Externer Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 120bbc8dd6..85e27c2e09 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:38+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Ihre geteilten Dateien"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Objekt"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "Teilen mit"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Berechtigungen"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Lesen"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Austausch ermöglichen"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index f8037f6cbe..789af981fb 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Alle Versionen löschen"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Datei-Versionierung aktivieren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 1f8eb50a34..96f616570a 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:29+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,19 +79,19 @@ msgstr "Sicherheitshinweis"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Führe eine Aufgabe pro geladener Seite aus."
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php ist beim Webcron-Service registriert"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "Nutze System-Cron-Service"
 
 #: templates/admin.php:39
 msgid "Log"
diff --git a/l10n/de/tasks.po b/l10n/de/tasks.po
index ab28b639e7..ad1bfcf952 100644
--- a/l10n/de/tasks.po
+++ b/l10n/de/tasks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:49+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +21,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Datum/Uhrzeit ungültig"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Aufgaben"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Keine Kategorie"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Nicht angegeben"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=am höchsten"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=Durchschnitt"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=am niedrigsten"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Leere Zusammenfassung"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Ungültige Prozent abgeschlossen"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Falsche Priorität"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Aufgabe hinzufügen"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Nach Fälligkeit sortieren"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Nach Kategorie sortieren "
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Nach Fertigstellung sortieren"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Nach Ort sortieren"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Nach Priorität sortieren"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Nach Label sortieren"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Lade Aufgaben..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Wichtig"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Mehr"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Weniger"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 090e019351..f84a3add4d 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Maurice Preuß <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:45+0000\n"
+"Last-Translator: Maurice Preuß <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/settings.php:8
 msgid ""
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -55,14 +56,14 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Benutzer Login Filter"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
 
 #: templates/settings.php:12
 #, php-format
@@ -71,7 +72,7 @@ msgstr ""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Benutzer Filter Liste"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Gruppen Filter"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -115,7 +116,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Schalte die SSL Zertifikatsprüfung aus."
 
 #: templates/settings.php:23
 msgid ""
@@ -153,12 +154,12 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "in bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "in Sekunden. Eine Änderung leert den Cache."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Hilfe"
diff --git a/l10n/de/user_migrate.po b/l10n/de/user_migrate.po
index b46b8e12f4..4423a018e2 100644
--- a/l10n/de/user_migrate.po
+++ b/l10n/de/user_migrate.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:51+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +21,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Export"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Beim Export der Datei ist etwas schief gegangen."
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Es ist ein Fehler aufgetreten."
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Ihr Konto exportieren"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Konto importieren"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip-Archiv mit Benutzerdaten"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importieren"
diff --git a/l10n/de/user_openid.po b/l10n/de/user_openid.po
index 345d5452d8..5786558544 100644
--- a/l10n/de/user_openid.po
+++ b/l10n/de/user_openid.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:54+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identität: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Bereich: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Benutzer: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Anmelden"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Fehler: <b> Kein Benutzer gewählt"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren."
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Authorisierter OpenID-Anbieter"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/fr/admin_dependencies_chk.po b/l10n/fr/admin_dependencies_chk.po
index 9ac75de6c9..36480849be 100644
--- a/l10n/fr/admin_dependencies_chk.po
+++ b/l10n/fr/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 15:59+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Le module php-json est requis pour l'inter-communication de nombreux modules."
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages."
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images."
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap."
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Le module php-mb_multibyte est requis pour une gestion correcte des encodages."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Le module php-ctype est requis pour la validation des données."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Le module php-xml est requis pour le partage de fichiers via webdav."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS."
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "le module php-pdo est requis pour le stockage des données ownCloud en base de données."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Statut des dépendances"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Utilisé par :"
diff --git a/l10n/fr/admin_migrate.po b/l10n/fr/admin_migrate.po
index b2e53d208f..a3f34310cc 100644
--- a/l10n/fr/admin_migrate.po
+++ b/l10n/fr/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 15:51+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Exporter cette instance ownCloud"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n            Veuillez choisir le type d'export :"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Exporter"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 76024f3a78..cbad09601f 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 16:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Chiffrement"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Activer le chiffrement"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 75d8c06498..488a6924a4 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 16:35+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Stockage externe"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Point de montage"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Infrastructure"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Disponible"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Ajouter un point de montage"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Aucun spécifié"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Tous les utilisateurs"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Groupes"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificats racine SSL"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importer un certificat racine"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Activer le stockage externe pour les utilisateurs"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 6e72c0e324..60c8ad25a5 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:40+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Vos documents partagés"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Item"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "Partagé avec"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Permissions"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Lecture"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Édition"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Effacement"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Permettre le repartage"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index c6176a9414..74b1426e8c 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:49+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Supprimer les versions intermédiaires"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Activer le versionnage"
diff --git a/l10n/fr/tasks.po b/l10n/fr/tasks.po
index 39d5b8c564..5fd6929892 100644
--- a/l10n/fr/tasks.po
+++ b/l10n/fr/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:49+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,47 +20,47 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "date/heure invalide"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Tâches"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Sans catégorie"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Non spécifié"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=le plus important"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=importance moyenne"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=le moins important"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Résumé vide"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Pourcentage d'achèvement invalide"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Priorité invalide"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Ajouter une tâche"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Chargement des tâches…"
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Plus"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Moins"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index a48dcb6094..afaa4b5d41 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <zrk951@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 17:06+0000\n"
+"Last-Translator: Zertrin <zrk951@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +20,43 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Hôte"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "DN de base"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN Utilisateur"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pour l'accès anonyme, laisser le DN et le mot de passe vides."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtre d'identifiants utilisateur"
 
 #: templates/settings.php:12
 #, php-format
@@ -71,31 +72,31 @@ msgstr ""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Filtre d'utilisateurs"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtre de groupes"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -107,33 +108,33 @@ msgstr ""
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Association groupe-membre"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Utiliser TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Serveur LDAP insensible à la casse (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Désactiver la validation du certificat SSL"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Non recommendé, utilisation pour tests uniquement."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -141,7 +142,7 @@ msgstr ""
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
@@ -149,16 +150,16 @@ msgstr ""
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "en octets"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "en secondes. Tout changement vide le cache."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Aide"
diff --git a/l10n/fr/user_migrate.po b/l10n/fr/user_migrate.po
index 3d50d1f56a..6528dc9e74 100644
--- a/l10n/fr/user_migrate.po
+++ b/l10n/fr/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:23+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Exporter"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Une erreur s'est produit pendant la génération du fichier d'export"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Une erreur s'est produite"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Exportez votre compte utilisateur"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Importer un compte utilisateur"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Archive Zip de l'utilisateur"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importer"
diff --git a/l10n/fr/user_openid.po b/l10n/fr/user_openid.po
index 5dafa24dd9..df7952aa7c 100644
--- a/l10n/fr/user_openid.po
+++ b/l10n/fr/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:05+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identité : <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Domaine : <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Utilisateur : <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Connexion"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Erreur : <b>Aucun nom d'utilisateur n'a été saisi"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Fournisseur d'identité OpenID autorisé"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Votre adresse Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/it/admin_dependencies_chk.po b/l10n/it/admin_dependencies_chk.po
index c2abc92923..a999a2c2bd 100644
--- a/l10n/it/admin_dependencies_chk.po
+++ b/l10n/it/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:54+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +22,38 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Il modulo php-gd è richiesto per creare miniature delle tue immagini"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Il modulo php-ldap è richiesto per collegarsi a un server ldap"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente"
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Il modulo php-ctype è richiesto per la validazione dei dati."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Il modulo php-xml è richiesto per condividere i file con webdav."
 
 #: settings.php:81
 msgid ""
@@ -62,12 +63,12 @@ msgstr ""
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Stato delle dipendenze"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Usato da:"
diff --git a/l10n/it/admin_migrate.po b/l10n/it/admin_migrate.po
index e94f4f4bb9..df7e4841cc 100644
--- a/l10n/it/admin_migrate.po
+++ b/l10n/it/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:55+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Esporta questa istanza di ownClou"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Esporta"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index cc162fd77e..573a32a14a 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 11:49+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Cifratura"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Escludi i seguenti tipi di file dalla cifratura"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Nessuna"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Abilita cifratura"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 23b431e716..801511ce3b 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:42+0000\n"
+"Last-Translator: Innocenzo Ventre <el.diabl09@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +21,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Archiviazione esterna"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Punto di mount"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Motore"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Configurazione"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Opzioni"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Applicabile"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Aggiungi punto di mount"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nessuna impostazione"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Tutti gli utenti"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Gruppi"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Elimina"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificato principale per SSL"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importa certificato principale"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Abilita la memoria esterna dell'utente"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Consente agli utenti di montare la propria memoria esterna"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index c2b3f0f95a..ffb62b14fe 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:10+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,31 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "I tuoi file condivisi"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Elemento"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "Condiviso con"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Permessi"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Lettura"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Modifica"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Eliminazione"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 3f6bd1465a..54f176fb2e 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:12+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Scadenza di tutte le versioni"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Abilita controllo di versione"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b09274cf35..4867951b19 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 14:56+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,15 +82,15 @@ msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "esegui un'attività con ogni pagina caricata"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php è registrato a un servizio webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "usa il servizio cron di sistema"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -162,7 +162,7 @@ msgstr "Scaricamento"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr "La tua password è stata cambiata"
+msgstr "La tua password è stata cambiat"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
index 130a092b66..829120fa8a 100644
--- a/l10n/it/tasks.po
+++ b/l10n/it/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:07+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,31 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Ora/Data non valida"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Attività"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Nessuna categoria"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Non specificata"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=massima"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=media"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=minima"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -51,15 +52,15 @@ msgstr ""
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Percentuale di completamento non valida"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Priorità non valida"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Aggiungi attività"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,11 +88,11 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Caricamento attività in corso..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #: templates/tasks.php:23
 msgid "More"
@@ -103,4 +104,4 @@ msgstr ""
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Elimina"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index a148025886..cfd6cf566e 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 14:56+0000\n"
+"Last-Translator: Innocenzo Ventre <el.diabl09@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +21,146 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "DN base"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN utente"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtro per il login utente"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Filtro per la lista utente"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtro per il gruppo"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Porta"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Struttura base dell'utente"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Struttura base del gruppo"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Associazione gruppo-utente "
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Usa TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Non utilizzare per le connessioni SSL, fallirà."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Case insensitve LDAP server (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Disattiva il controllo del certificato SSL."
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Non consigliato, utilizzare solo per test."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Campo per la visualizzazione del nome utente"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Campo per la visualizzazione del nome del gruppo"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "in byte"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "in secondi. Il cambio svuota la cache."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Aiuto"
diff --git a/l10n/it/user_migrate.po b/l10n/it/user_migrate.po
index 2600696b79..9c918e027c 100644
--- a/l10n/it/user_migrate.po
+++ b/l10n/it/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:55+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Esporta"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Si è verificato un errore durante la creazione del file di esportazione"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Si è verificato un errore"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Esporta il tuo account utente"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Questa operazione creerà un file compresso che contiene il tuo account ownCloud."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Importa account utente"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip account utente"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importa"
diff --git a/l10n/it/user_openid.po b/l10n/it/user_openid.po
index 37d859ae35..b769535161 100644
--- a/l10n/it/user_openid.po
+++ b/l10n/it/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:46+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Questo è un server OpenID. Per ulteriori informazioni, vedi"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identità: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Dominio: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Utente: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Accesso"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Errore: <b>nessun utente selezionato"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "puoi autenticarti ad altri siti con questo indirizzo"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Fornitore OpenID autorizzato"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/ro/tasks.po b/l10n/ro/tasks.po
index a49bdb61fa..c7869fb6c6 100644
--- a/l10n/ro/tasks.po
+++ b/l10n/ro/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dumitru Ursu <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:30+0000\n"
+"Last-Translator: Dumitru Ursu <>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Data/timpul invalid"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Sarcini"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Fără categorie"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Nespecificat"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=cel mai înalt"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=mediu"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=cel mai jos"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Rezumat gol"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Completare procentuală greșită"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Prioritare greșită"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Adaugă sarcină"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Comandă până la"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Lista de comenzi"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Comandă executată"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Locația comenzii"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Prioritarea comenzii"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Eticheta comenzii"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Încărcare sarcini"
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Mai mult"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Mai puțin"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Șterge"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index f9aaaa9fb0..644c43d43d 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dumitru Ursu <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:24+0000\n"
+"Last-Translator: Dumitru Ursu <>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +20,146 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Gazdă"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "DN de bază"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN al utilizatorului"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Parolă"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtrare după Nume Utilizator"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Filtrarea după lista utilizatorilor"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "fără substituenți, d.e. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Fitrare Grup"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definește filtrele care se aplică, când se preiau grupurile."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Portul"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Arborele de bază al Utilizatorilor"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Arborele de bază al Grupurilor"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Asocierea Grup-Membru"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Utilizează TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Server LDAP insensibil la majuscule (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Oprește validarea certificatelor SSL "
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Nu este recomandat, a se utiliza doar pentru testare."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Câmpul cu numele vizibil al utilizatorului"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Câmpul cu numele grupului"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "în octeți"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "în secunde. O schimbare curăță memoria tampon."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Ajutor"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 27019afd79..4fa6cd3746 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:04+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,23 +64,23 @@ msgstr "Izbriši"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "že obstaja"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "nadomesti"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ekliči"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "nadomeščen"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "z"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
@@ -114,27 +114,27 @@ msgstr "Nalaganje je bilo preklicano."
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 1435977b9a..b43660a42e 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-15 00:03+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,31 +52,31 @@ msgstr ""
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Vsi uporabniki"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Skupine"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Uporabniki"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Izbriši"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL korenski certifikati"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Uvozi korenski certifikat"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Omogoči"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index d50a6214c9..e6928f35fa 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:59+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Vaše datoteke v souporabi"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Predmet"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "V souporabi z"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Dovoljenja"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Branje"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Pisanje"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Izbris"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Omogoči nadaljnjo izmenjavo"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2e94a971ba..31f679ac7f 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:09+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ne morem naložiti seznama iz App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -50,7 +50,7 @@ msgstr "Jezik je bil spremenjen"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -74,19 +74,19 @@ msgstr "Varnostno opozorilo"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Periodično opravilo"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "izvedi eno nalogo z vsako naloženo stranjo"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je vpisan na storitev webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "uporabi sistemski servis za periodična opravila"
 
 #: templates/admin.php:39
 msgid "Log"
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
index 38b1873389..484d5c1f72 100644
--- a/l10n/sl/tasks.po
+++ b/l10n/sl/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:45+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,35 +20,35 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Neveljaven datum/čas"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Opravila"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Ni kategorije"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Nedoločen"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=najvišje"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=srednje"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=najnižje"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Prazen povzetek"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
@@ -55,11 +56,11 @@ msgstr ""
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Neveljavna prednost"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Dodaj opravilo"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -95,11 +96,11 @@ msgstr ""
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Več"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Manj"
 
 #: templates/tasks.php:29
 msgid "Delete"
diff --git a/l10n/sl/user_migrate.po b/l10n/sl/user_migrate.po
index e3a229549d..ec8deacf77 100644
--- a/l10n/sl/user_migrate.po
+++ b/l10n/sl/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:17+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Izvozi"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Med ustvarjanjem datoteke za izvoz je prišlo do napake"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Prišlo je do napake"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Izvozi vaš uporabniški račun"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Uvozi uporabniški račun"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip datoteka ownCloud uporabnika"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Uvozi"
diff --git a/l10n/sl/user_openid.po b/l10n/sl/user_openid.po
index 1269ed895e..62302b6911 100644
--- a/l10n/sl/user_openid.po
+++ b/l10n/sl/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:13+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "To je OpenID strežniška končna točka. Za več informacij si oglejte"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Istovetnost: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
@@ -31,24 +32,24 @@ msgstr ""
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Uporabnik:"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Napaka: <b>Uporabnik ni bil izbran"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "s tem naslovom se lahko overite tudi na drugih straneh"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Odobren OpenID ponudnik"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Vaš naslov na Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index a13ed61b4f..7ebf04e55c 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 302ee091d1..e905c22f86 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 92ee8440f3..b96ce9f1e7 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 2d55307b1f..751969a0bf 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index be8c432c00..92d0ca5fc1 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c10170659b..99b041e1c8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index a9c93a4741..26f5eacee8 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 34a0bbb5be..a463731bf9 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6a82898883..0674e0b95d 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d288470e5c..c74bc72d36 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 00654d249b..7a68a39a41 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index d17762fbbd..e77e777229 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index f6ce8f0969..97bbaa8645 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 51fdfab817..fb5d0a755d 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d74ce84806..b0ea4703cc 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index b38b306f79..b23ae36239 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f9a5686e39..f554a64978 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index e0a064d961..0367e1a634 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 352a3ccbc0..211f8054b1 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/admin_dependencies_chk.po b/l10n/th_TH/admin_dependencies_chk.po
index 758b5772cd..6ba6dff16a 100644
--- a/l10n/th_TH/admin_dependencies_chk.po
+++ b/l10n/th_TH/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:17+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,4 +71,4 @@ msgstr ""
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "ใช้งานโดย:"
diff --git a/l10n/th_TH/admin_migrate.po b/l10n/th_TH/admin_migrate.po
index 24c02530e3..c3f5786401 100644
--- a/l10n/th_TH/admin_migrate.po
+++ b/l10n/th_TH/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:09+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n            กรุณาเลือกชนิดของการส่งออกข้อมูล:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "ส่งออก"
diff --git a/l10n/th_TH/bookmarks.po b/l10n/th_TH/bookmarks.po
index e5a515c7dc..0c6e7c61e3 100644
--- a/l10n/th_TH/bookmarks.po
+++ b/l10n/th_TH/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:16+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "รายการโปรด"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "ยังไม่มีชื่อ"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "อ่านภายหลัง"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "ที่อยู่"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "ชื่อ"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "ป้ายกำกับ"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "บันทึกรายการโปรด"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "คุณยังไม่มีรายการโปรด"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index 9803e71602..db695db5dc 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:30+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว"
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
@@ -43,19 +43,19 @@ msgstr "ปฏิทินไม่ถูกต้อง"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ"
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว"
 
 #: ajax/import/import.php:56
 msgid "Import failed"
-msgstr ""
+msgstr "การนำเข้าข้อมูลล้มเหลว"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -160,7 +160,7 @@ msgstr "งาน"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "โดย"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -349,79 +349,79 @@ msgstr "คำนวณ"
 
 #: templates/calendar.php:6
 msgid "Sun."
-msgstr ""
+msgstr "อา."
 
 #: templates/calendar.php:6
 msgid "Mon."
-msgstr ""
+msgstr "จ."
 
 #: templates/calendar.php:6
 msgid "Tue."
-msgstr ""
+msgstr "อ."
 
 #: templates/calendar.php:6
 msgid "Wed."
-msgstr ""
+msgstr "พ."
 
 #: templates/calendar.php:6
 msgid "Thu."
-msgstr ""
+msgstr "พฤ."
 
 #: templates/calendar.php:6
 msgid "Fri."
-msgstr ""
+msgstr "ศ."
 
 #: templates/calendar.php:6
 msgid "Sat."
-msgstr ""
+msgstr "ส."
 
 #: templates/calendar.php:8
 msgid "Jan."
-msgstr ""
+msgstr "ม.ค."
 
 #: templates/calendar.php:8
 msgid "Feb."
-msgstr ""
+msgstr "ก.พ."
 
 #: templates/calendar.php:8
 msgid "Mar."
-msgstr ""
+msgstr "มี.ค."
 
 #: templates/calendar.php:8
 msgid "Apr."
-msgstr ""
+msgstr "เม.ย."
 
 #: templates/calendar.php:8
 msgid "May."
-msgstr ""
+msgstr "พ.ค."
 
 #: templates/calendar.php:8
 msgid "Jun."
-msgstr ""
+msgstr "มิ.ย."
 
 #: templates/calendar.php:8
 msgid "Jul."
-msgstr ""
+msgstr "ก.ค."
 
 #: templates/calendar.php:8
 msgid "Aug."
-msgstr ""
+msgstr "ส.ค."
 
 #: templates/calendar.php:8
 msgid "Sep."
-msgstr ""
+msgstr "ก.ย."
 
 #: templates/calendar.php:8
 msgid "Oct."
-msgstr ""
+msgstr "ต.ค."
 
 #: templates/calendar.php:8
 msgid "Nov."
-msgstr ""
+msgstr "พ.ย."
 
 #: templates/calendar.php:8
 msgid "Dec."
-msgstr ""
+msgstr "ธ.ค."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -478,7 +478,7 @@ msgstr "วันนี้"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -686,7 +686,7 @@ msgstr "นำเข้าไฟล์ปฏิทิน"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
-msgstr ""
+msgstr "กรุณาเลือกปฏิทิน"
 
 #: templates/part.import.php:36
 msgid "Name of new calendar"
@@ -694,13 +694,13 @@ msgstr "ชื่อของปฏิทิน"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "เลือกชื่อที่ต้องการ"
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน"
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -732,7 +732,7 @@ msgstr "ที่"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "ทั่วไป"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -740,11 +740,11 @@ msgstr "โซนเวลา"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "อัพเดทโซนเวลาอัตโนมัติ"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "รูปแบบเวลา"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -756,39 +756,39 @@ msgstr "12 ช.ม."
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "เริ่มต้นสัปดาห์ด้วย"
 
 #: templates/settings.php:76
 msgid "Cache"
-msgstr ""
+msgstr "หน่วยความจำแคช"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLs"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV"
 
 #: templates/settings.php:87
 msgid "more info"
-msgstr ""
+msgstr "ข้อมูลเพิ่มเติม"
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "ที่อยู่หลัก (Kontact et al)"
 
 #: templates/settings.php:91
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
 
 #: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "อ่านเฉพาะลิงก์ iCalendar เท่านั้น"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 33ab6b3567..88f3f467d4 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:39+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr "ยังไม่ได้กำหนดชื่อ"
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -83,7 +83,7 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
 
 #: ajax/contact/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -276,7 +276,7 @@ msgstr "ไฟล์ที่คุณกำลังพยายามที่
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว"
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -286,7 +286,7 @@ msgstr "เลือกชนิด"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -302,11 +302,11 @@ msgstr " ล้มเหลว."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -380,55 +380,55 @@ msgstr "วันเกิด"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "ธุรกิจ"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "โทร"
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "ลูกค้า"
 
 #: lib/app.php:187
 msgid "Deliverer"
-msgstr ""
+msgstr "ผู้จัดส่ง"
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "วันหยุด"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "ไอเดีย"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "การเดินทาง"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "งานเฉลิมฉลอง"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "ประชุม"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "อื่นๆ"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "ส่วนตัว"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "โปรเจค"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "คำถาม"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -448,7 +448,7 @@ msgstr "นำเข้า"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -460,51 +460,51 @@ msgstr "ปิด"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "ปุ่มลัด"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "ระบบเมนู"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อถัดไปในรายการ"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "สมุดบันทึกที่อยู่ถัดไป"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "สมุดบันทึกที่อยู่ก่อนหน้า"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "การกระทำ"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "รีเฟรชรายชื่อผู้ติดต่อใหม่"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "เพิ่มข้อมูลผู้ติดต่อใหม่"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "เพิ่มสมุดบันทึกที่อยู่ใหม่"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "ลบข้อมูลผู้ติดต่อปัจจุบัน"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -550,15 +550,15 @@ msgstr "กรอกชื่อเล่น"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "เว็บไซต์"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "ไปที่เว็บไซต์"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -655,11 +655,11 @@ msgstr "ตู้ ปณ."
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "ที่อยู่"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "ถนนและหมายเลข"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -667,7 +667,7 @@ msgstr "เพิ่ม"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "หมายเลขอพาร์ทเมนต์ ฯลฯ"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -680,7 +680,7 @@ msgstr "ภูมิภาค"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "เช่น รัฐ หรือ จังหวัด"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -688,7 +688,7 @@ msgstr "รหัสไปรษณีย์"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "รหัสไปรษณีย์"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -809,15 +809,15 @@ msgstr "กำหนดค่าสมุดบันทึกที่อยู
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "เลือกสมุดบันทึกที่อยู่"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "กรอกชื่อ"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "กรอกคำอธิบาย"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -837,11 +837,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "แสดงลิงก์ CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -857,11 +857,11 @@ msgstr "สร้างสมุดบันทึกข้อมูลการ
 
 #: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
 
 #: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "คำอธิบาย"
 
 #: templates/settings.php:43
 msgid "Save"
@@ -873,4 +873,4 @@ msgstr "ยกเลิก"
 
 #: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "เพิ่มเติม..."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index f1966051f3..c5a8f013b6 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 12:47+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr "ไฟล์"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "ยกเลิกการแชร์ข้อมูล"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "ลบ"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "มีอยู่แล้ว"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "แทนที่"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "แทนที่แล้ว"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "กับ"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "เลิกทำ"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "ลบแล้ว"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
@@ -113,27 +113,27 @@ msgstr "การอัพโหลดถูกยกเลิก"
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "ไฟล์"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "ไฟล์"
 
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 6852b6b1c3..f396eed4da 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:12+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "การเข้ารหัส"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "ไม่ต้อง"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "เปิดใช้งานการเข้ารหัส"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 77ddd37e99..2ba0dcb265 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:35+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "พื้นทีจัดเก็บข้อมูลจากภายนอก"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "จุดชี้ตำแหน่ง"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "ด้านหลังระบบ"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "การกำหนดค่า"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "ตัวเลือก"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "สามารถใช้งานได้"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "เพิ่มจุดชี้ตำแหน่ง"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "ยังไม่มีการกำหนด"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "ผู้ใช้งานทั้งหมด"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "กลุ่ม"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "ผู้ใช้งาน"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "ลบ"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 9165a75b35..250856835f 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:14+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "ไฟล์ของคุณที่แชร์ไว้"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "ไอเท็ม"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "แชร์พร้อมกับ"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "สิทธิ์การเข้าใช้งาน"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "อ่าน"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "แก้ไข"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "ลบ"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "เปิดให้มีการแชร์ใหม่อีกครั้งได้"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 797e78acb5..4bab33ad9f 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:11+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "หมดอายุทุกรุ่น"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 1a8ef7a619..d442789187 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -9,88 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:50+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "รูปภาพ"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "แชร์ข้อมูลแกลอรี่"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "พบข้อผิดพลาด: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดภายในระบบ"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "ตั้งค่า"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "ตรวจสอบอีกครั้ง"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "หยุด"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "แชร์"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "ย้อนกลับ"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "การยืนยันการลบ"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "คุณต้องการลบอัลบั้มออกหรือไม่"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "เปลี่ยนชื่ออัลบั้ม"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "ชื่อใหม่ของอัลบั้ม"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "ภาพสไลด์โชว์"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 2a9f5b46d5..57847a06f6 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:40+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,96 +18,96 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "ช่วยเหลือ"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "ส่วนตัว"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "ผู้ใช้งาน"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "แอปฯ"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "ผู้ดูแล"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "กลับไปที่ไฟล์"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง"
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "วินาทีที่ผ่านมา"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 นาทีมาแล้ว"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d นาทีที่ผ่านมา"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "วันนี้"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "เมื่อวานนี้"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d วันที่ผ่านมา"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "เดือนที่แล้ว"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "เดือนมาแล้ว"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "ปีที่แล้ว"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "ปีที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 37193911fc..0dc69f7f22 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:49+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -42,7 +42,7 @@ msgstr "คำร้องขอไม่ถูกต้อง"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -50,7 +50,7 @@ msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "ข้อผิดพลาด"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -70,23 +70,23 @@ msgstr "ภาษาไทย"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php ได้ถูกลงทะเบียนที่บริการ webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "ใช้บริการ cron จากระบบ"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -230,7 +230,7 @@ msgstr "อื่นๆ"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "ผู้ดูแลย่อย"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/th_TH/tasks.po b/l10n/th_TH/tasks.po
index 5cde08bac2..7d45023764 100644
--- a/l10n/th_TH/tasks.po
+++ b/l10n/th_TH/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:26+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "วันที่ / เวลา ไม่ถูกต้อง"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "งาน"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "ไม่มีหมวดหมู่"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "ยังไม่ได้ระบุ"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=สูงสุด"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=ปานกลาง"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=ต่ำสุด"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "ข้อมูลสรุปยังว่างอยู่"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "ความสำคัญไม่ถูกต้อง"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "เพิ่มงานใหม่"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "จัดเรียงตามกำหนดเวลา"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "จัดเรียงตามรายชื่อ"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "จัดเรียงตามความสมบูรณ์"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "จัดเรียงตามตำแหน่งที่อยู่"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "จัดเรียงตามระดับความสำคัญ"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "จัดเรียงตามป้ายชื่อ"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "กำลังโหลดข้อมูลงาน..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "สำคัญ"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "มาก"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "น้อย"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "ลบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 6303056f2a..1f8d946d7a 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:30+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "โฮสต์"
 
 #: templates/settings.php:8
 msgid ""
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "รหัสผ่าน"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "ตัวกรองข้อมูลกลุ่ม"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "พอร์ต"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "ใช้ TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -133,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -153,7 +154,7 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "ในหน่วยไบต์"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
@@ -161,4 +162,4 @@ msgstr ""
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "ช่วยเหลือ"
diff --git a/l10n/th_TH/user_migrate.po b/l10n/th_TH/user_migrate.po
index 676ffdfbb5..74a5aec484 100644
--- a/l10n/th_TH/user_migrate.po
+++ b/l10n/th_TH/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:37+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "ส่งออก"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดบางประการ"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "ส่งออกบัญชีผู้ใช้งานของคุณ"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ"
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "นำเข้าบัญชีผู้ใช้งาน"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ไฟล์ Zip ผู้ใช้งาน ownCloud"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "นำเข้า"
diff --git a/l10n/th_TH/user_openid.po b/l10n/th_TH/user_openid.po
index 9b4a609ba1..7ed74e306b 100644
--- a/l10n/th_TH/user_openid.po
+++ b/l10n/th_TH/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:32+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "ข้อมูลประจำตัว <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "ขอบเขตพื้นที่ <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "ผู้ใช้งาน: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "เข้าสู่ระบบ"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
new file mode 100644
index 0000000000..cb2610fa20
--- /dev/null
+++ b/lib/l10n/th_TH.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ช่วยเหลือ",
+"Personal" => "ส่วนตัว",
+"Settings" => "ตั้งค่า",
+"Users" => "ผู้ใช้งาน",
+"Apps" => "แอปฯ",
+"Admin" => "ผู้ดูแล",
+"ZIP download is turned off." => "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้",
+"Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
+"Back to Files" => "กลับไปที่ไฟล์",
+"Selected files too large to generate zip file." => "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip",
+"Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
+"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+"Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
+"seconds ago" => "วินาทีที่ผ่านมา",
+"1 minute ago" => "1 นาทีมาแล้ว",
+"%d minutes ago" => "%d นาทีที่ผ่านมา",
+"today" => "วันนี้",
+"yesterday" => "เมื่อวานนี้",
+"%d days ago" => "%d วันที่ผ่านมา",
+"last month" => "เดือนที่แล้ว",
+"months ago" => "เดือนมาแล้ว",
+"last year" => "ปีที่แล้ว",
+"years ago" => "ปีที่ผ่านมา"
+);
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index aa9d73df42..0bb70e0438 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -13,9 +13,12 @@
 "__language_name__" => "Català",
 "Security Warning" => "Avís de seguretat",
 "Cron" => "Cron",
+"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
+"cron.php is registered at a webcron service" => "cron.php està registrat en un servei web cron",
+"use systems cron service" => "usa el servei cron del sistema",
 "Log" => "Registre",
 "More" => "Més",
-"Add your App" => "Afegeiu la vostra aplicació",
+"Add your App" => "Afegiu la vostra aplicació",
 "Select an App" => "Seleccioneu una aplicació",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "-licensed" => "- amb llicència",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 8c6296d3fb..05e227cbc2 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -12,6 +12,10 @@
 "Saving..." => "Speichern...",
 "__language_name__" => "Deutsch",
 "Security Warning" => "Sicherheitshinweis",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
+"cron.php is registered at a webcron service" => "cron.php ist beim Webcron-Service registriert",
+"use systems cron service" => "Nutze System-Cron-Service",
 "Log" => "Log",
 "More" => "Mehr",
 "Add your App" => "Füge deine App hinzu",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 388f3f5c77..bc02a7a833 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -13,6 +13,9 @@
 "__language_name__" => "Italiano",
 "Security Warning" => "Avviso di sicurezza",
 "Cron" => "Cron",
+"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
+"cron.php is registered at a webcron service" => "cron.php è registrato a un servizio webcron",
+"use systems cron service" => "usa il servizio cron di sistema",
 "Log" => "Registro",
 "More" => "Altro",
 "Add your App" => "Aggiungi la tua applicazione",
@@ -30,7 +33,7 @@
 "of the available" => "su un totale di",
 "Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
 "Download" => "Scaricamento",
-"Your password got changed" => "La tua password è stata cambiata",
+"Your password got changed" => "La tua password è stata cambiat",
 "Unable to change your password" => "Modifica password non riuscita",
 "Current password" => "Password attuale",
 "New password" => "Nuova password",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 99c6d9d484..574aa75bbf 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,15 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
 "Email saved" => "E-poštni naslov je bil shranjen",
 "Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
 "Authentication error" => "Napaka overitve",
 "Language changed" => "Jezik je bil spremenjen",
+"Error" => "Napaka",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
 "Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
 "Security Warning" => "Varnostno opozorilo",
+"Cron" => "Periodično opravilo",
+"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
+"cron.php is registered at a webcron service" => "cron.php je vpisan na storitev webcron",
+"use systems cron service" => "uporabi sistemski servis za periodična opravila",
 "Log" => "Dnevnik",
 "More" => "Več",
 "Add your App" => "Dodajte vašo aplikacijo",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 2d6798ff29..6c9386d3ae 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Error" => "ข้อผิดพลาด",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
 "Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
+"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
+"cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
+"use systems cron service" => "ใช้บริการ cron จากระบบ",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
 "Add your App" => "เพิ่มแอปของคุณ",
@@ -43,6 +51,7 @@
 "Create" => "สร้าง",
 "Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
+"SubAdmin" => "ผู้ดูแลย่อย",
 "Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );

From dd3208fe6fadff3ad831df2fa5220e2184738b21 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Aug 2012 23:58:55 +0200
Subject: [PATCH 1455/1537] Fix webfinger documentation

---
 apps/user_webfinger/webfinger.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index f06346672f..b725937948 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -7,17 +7,17 @@ header("Access-Control-Allow-Origin: *");
 header("Content-Type: application/xrd+json");
 
 /**
- * To include your app in the webfinger XML, add a new script with file name
+ * To include your app in the webfinger JSON, add a new script with file name
  * 'webfinger.php' to /apps/yourapp/appinfo/, which prints out the XML parts
  * to be included. That script can make use of the constants WF_USER (e. g.
  * "user"), WF_ID (user@host) and WF_BASEURL (e. g. https://host/owncloud).
  * An example could look like this:
  * 
- * <Link
- * 	rel="myProfile"
- * 	type="text/html"
- * 	href="<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
- * </Link>
+ * {
+ * 	"rel":"myProfile",
+ * 	"type":"text/html",
+ * 	"href":"<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>"
+ * }
  *
  * but can also use complex database queries to generate the webfinger result
  **/

From 137e4cb342c896dd843f418cdc6cd9daf27b3754 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 15 Aug 2012 11:55:54 -0400
Subject: [PATCH 1456/1537] Add tests for Share API, all tests passing :)

---
 lib/filestorage/commontest.php |   8 +-
 tests/lib/filestorage.php      |  10 +-
 tests/lib/share/backend.php    |  73 ++++----
 tests/lib/share/share.php      | 326 +++++++++++++++++++++++----------
 4 files changed, 271 insertions(+), 146 deletions(-)

diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index 1b01ff856a..b5126a407b 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -51,11 +51,11 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	public function filetype($path){
 		return $this->storage->filetype($path);
 	}
-	public function is_readable($path){
-		return $this->storage->is_readable($path);
+	public function isReadable($path){
+		return $this->storage->isReadable($path);
 	}
-	public function is_writable($path){
-		return $this->storage->is_writable($path);
+	public function isUpdatable($path){
+		return $this->storage->isUpdatable($path);
 	}
 	public function file_exists($path){
 		return $this->storage->file_exists($path);
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 00f37b9f1a..4120df18de 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -31,13 +31,13 @@ abstract class Test_FileStorage extends UnitTestCase {
 	 */
 	public function testRoot(){
 		$this->assertTrue($this->instance->file_exists('/'),'Root folder does not exist');
-		$this->assertTrue($this->instance->is_readable('/'),'Root folder is not readable');
+		$this->assertTrue($this->instance->isReadable('/'),'Root folder is not readable');
 		$this->assertTrue($this->instance->is_dir('/'),'Root folder is not a directory');
 		$this->assertFalse($this->instance->is_file('/'),'Root folder is a file');
 		$this->assertEqual('dir',$this->instance->filetype('/'));
 		
 		//without this, any further testing would be useless, not an acutal requirement for filestorage though
-		$this->assertTrue($this->instance->is_writable('/'),'Root folder is not writable');
+		$this->assertTrue($this->instance->isUpdatable('/'),'Root folder is not writable');
 	}
 	
 	public function testDirectories(){
@@ -50,8 +50,8 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertFalse($this->instance->is_file('/folder'));
 		$this->assertEqual('dir',$this->instance->filetype('/folder'));
 		$this->assertEqual(0,$this->instance->filesize('/folder'));
-		$this->assertTrue($this->instance->is_readable('/folder'));
-		$this->assertTrue($this->instance->is_writable('/folder'));
+		$this->assertTrue($this->instance->isReadable('/folder'));
+		$this->assertTrue($this->instance->isUpdatable('/folder'));
 		
 		$dh=$this->instance->opendir('/');
 		$content=array();
@@ -141,7 +141,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$ctimeStart=time();
 		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
-		$this->assertTrue($this->instance->is_readable('/lorem.txt'));
+		$this->assertTrue($this->instance->isReadable('/lorem.txt'));
 		$ctimeEnd=time();
 		$cTime=$this->instance->filectime('/lorem.txt');
 		$mTime=$this->instance->filemtime('/lorem.txt');
diff --git a/tests/lib/share/backend.php b/tests/lib/share/backend.php
index 4f2fcce235..9fe625a1fa 100644
--- a/tests/lib/share/backend.php
+++ b/tests/lib/share/backend.php
@@ -19,48 +19,49 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-abstract class Test_Share_Backend extends UnitTestCase {
+class Test_Share_Backend implements OCP\Share_Backend {
 
-	protected $userBackend;
-	protected $user1;
-	protected $user2;
-	protected $groupBackend;
-	protected $group;
-	protected $itemType;
-	protected $item;
+	const FORMAT_SOURCE = 0;
+	const FORMAT_TARGET = 1;
+	const FORMAT_PERMISSIONS = 2;
+	
+	private $testItem = 'test.txt';
 
-	public function setUp() {
-		OC_User::clearBackends();
-		OC_User::useBackend('dummy');
-		$this->user1 = uniqid('user_');
-		$this->user2 = uniqid('user_');
-		OC_User::createUser($this->user1, 'pass1');
-		OC_User::createUser($this->user2, 'pass2');
-		OC_Group::clearBackends();
-		OC_Group::useBackend(new OC_Group_Dummy);
-		$this->group = uniqid('group_');
-		OC_Group::createGroup($this->group);
+	public function isValidSource($itemSource, $uidOwner) {
+		if ($itemSource == $this->testItem) {
+			return true;
+		}
 	}
 
-	public function testShareWithUserNonExistentItem() {
-		$this->assertFalse(OCP\Share::share($this->itemType, uniqid('foobar_'), OCP\Share::SHARETYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+	public function generateTarget($itemSource, $shareWith, $exclude = null) {
+		$target = $itemSource;
+		if (isset($exclude)) {
+			$pos = strrpos($target, '.');
+			$name = substr($target, 0, $pos);
+			$ext = substr($target, $pos);
+			$append = '';
+			$i = 1;
+			while (in_array($name.$append.$ext, $exclude)) {
+				$append = $i;
+				$i++;
+			}
+			$target = $name.$append.$ext;
+		}
+		return $target;
 	}
 
-	public function testShareWithUserItem() {
-		$this->assertTrue(OCP\Share::share($this->itemType, $this->item, OCP\Share::SHARETYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
-	}
-
-	public function testShareWithGroupNonExistentItem() {
-		$this->assertFalse(OCP\Share::share($this->itemType, uniqid('foobar_'), OCP\Share::SHARETYPE_GROUP, $this->group, OCP\Share::PERMISSION_READ));
-	}
-
-	public function testShareWithGroupItem() {
-		$this->assertTrue(OCP\Share::share($this->itemType, $this->item, OCP\Share::SHARETYPE_GROUP, $this->group, OCP\Share::PERMISSION_READ));
-	}
-
-	public function testShareWithUserAlreadySharedWith() {
-		$this->assertTrue(OCP\Share::share($this->itemType, $this->item, OCP\Share::SHARETYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
-		$this->assertFalse(OCP\Share::share($this->itemType, $this->item, OCP\Share::SHARETYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+	public function formatItems($items, $format, $parameters = null) {
+		$testItems = array();
+		foreach ($items as $item) {
+			if ($format == self::FORMAT_SOURCE) {
+				$testItems[] = $item['item_source'];
+			} else if ($format == self::FORMAT_TARGET) {
+				$testItems[] = $item['item_target'];
+			} else if ($format == self::FORMAT_PERMISSIONS) {
+				$testItems[] = $item['permissions'];
+			}
+		}
+		return $testItems;
 	}
 
 }
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index eca2c9bc58..4b73cc183a 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Share_Base extends UnitTestCase {
+class Test_Share extends UnitTestCase {
 
 	protected $itemType;
 	protected $userBackend;
@@ -35,127 +35,251 @@ class Test_Share_Base extends UnitTestCase {
 		OC_User::useBackend('dummy');
 		$this->user1 = uniqid('user_');
 		$this->user2 = uniqid('user_');
-		OC_User::createUser($this->user1, 'pass1');
-		OC_User::createUser($this->user2, 'pass2');
+		$this->user3 = uniqid('user_');
+		OC_User::createUser($this->user1, 'pass');
+		OC_User::createUser($this->user2, 'pass');
+		OC_User::createUser($this->user3, 'pass');
+		OC_User::setUserId($this->user1);
 		OC_Group::clearBackends();
 		OC_Group::useBackend(new OC_Group_Dummy);
 		$this->group1 = uniqid('group_');
 		$this->group2 = uniqid('group_');
 		OC_Group::createGroup($this->group1);
 		OC_Group::createGroup($this->group2);
+		OC_Group::addToGroup($this->user1, $this->group1);
+		OC_Group::addToGroup($this->user2, $this->group1);
+		OC_Group::addToGroup($this->user3, $this->group1);
+		OCP\Share::registerBackend('test', 'Test_Share_Backend');
+	}
+
+	public function tearDown() {
+		$query = OC_DB::prepare('DELETE FROM *PREFIX*share WHERE item_type = ?');
+		$query->execute(array('test'));
 	}
 
 	public function testShareInvalidShareType() {
-		$this->assertFalse(OCP\Share::share('file', 'test.txt', 'foobar', $this->user1, OCP\Share::PERMISSION_READ));
+		$this->expectException(new Exception('Share type foobar is not valid for test.txt'));
+		OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
+		
 	}
 
-	public function testShareInvalidItemType() {
-		$this->assertFalse(OCP\Share::share('foobar', 'test.txt', OCP\Share::SHARETYPE_USER, $this->user1, OCP\Share::PERMISSION_READ));
+	public function testInvalidItemType() {
+		$message = 'Sharing backend for foobar not found';
+		try {
+			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::getItemsSharedWith('foobar');
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::getItemSharedWith('foobar', 'test.txt');
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::getItemSharedWithBySource('foobar', 'test.txt');
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::getItemShared('foobar', 'test.txt');
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::unshare('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		try {
+			OCP\Share::setPermissions('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_UPDATE);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
 	}
 
-	public function testShareWithSelf() {
+	public function testShareWithUser() {
+		// Invalid shares
+		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		$message = 'Sharing test.txt failed, because the user foobar does not exist';
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Valid share
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		
+		// Attempt to share again
 		OC_User::setUserId($this->user1);
-		$this->assertFalse(OCP\Share::share('file', 'test.txt', OCP\Share::SHARETYPE_USER, $this->user1, OCP\Share::PERMISSION_READ));
-	}
-
-	public function testShareWithNonExistentUser() {
-		$this->assertFalse(OCP\Share::share('file', 'test.txt', OCP\Share::SHARETYPE_USER, 'foobar', OCP\Share::PERMISSION_READ));
-	}
-
-	public function testShareWithUserOwnerNotPartOfGroup() {
+		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->user2;
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
 		
+		// Invalid item
+		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
+		try {
+			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Attempt reshare without share permission
+		OC_User::setUserId($this->user2);
+		$message = 'Sharing test.txt failed, because resharing is not allowed';
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Owner grants share and update permission 
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
+		
+		// Attempt reshare with escalated permissions
+		OC_User::setUserId($this->user2);
+		$message = 'Sharing test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Valid reshare
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		OC_User::setUserId($this->user3);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		
+		// Attempt to escalate permissions
+		OC_User::setUserId($this->user2);
+		$message = 'Setting permissions for test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
+		try {
+			OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Remove update permission
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		OC_User::setUserId($this->user3);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ));
+		
+		// Remove share permission
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user3);
+		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
+		
+		// Reshare again, and then have owner unshare
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		OC_User::setUserId($this->user2);
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
+		OC_User::setUserId($this->user2);
+		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
+		OC_User::setUserId($this->user3);
+		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
+		
+		// Attempt target conflict
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user3);
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 	}
 
-	public function testShareWithUserAlreadySharedWith() {
+	public function testShareWithGroup() {
+		// Invalid shares
+		$message = 'Sharing test.txt failed, because the group foobar does not exist';
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		$message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2;
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
 		
-	}
-
-	public function testShareWithNonExistentGroup() {
-		$this->assertFalse(OCP\Share::share('file', 'test.txt', OCP\Share::SHARETYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ));
-	}
-
-	public function testShareWithGroupOwnerNotPartOfGroup() {
-
-	}
-
-
-	public function testShareWithGroupItem() {
-
-	}
-
-	public function testUnshareInvalidShareType() {
-
-	}
-
-	public function testUnshareNonExistentItem() {
-
-	}
-
-	public function testUnshareFromUserItem() {
-
-	}
-
-	public function testUnshareFromGroupItem() {
-
-	}
-
-	
-
-
-	
-		// Test owner not in same group (false)
-
+		// Valid share
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
+		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		OC_User::setUserId($this->user3);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		
-
-		// Test non-existant item type
-
-		// Test valid item
-
-		// Test existing shared item (false)
+		// Attempt to share again
+		OC_User::setUserId($this->user1);
+		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
 		
-		// Test unsharing item
-
-		// Test setting permissions
-
-		// Test setting permissions not as owner (false)
-
-		// Test setting target
-
-		// Test setting target as owner (false)
-		
-		// Spam reshares
-
-		
-
-		// Test non-existant group
-		
-
-		// Test owner not part of group
-
-		// Test existing shared item with group
-
-		// Test valid item, valid name for all users
-
-		// Test unsharing item
-
-		// Test item with name conflicts
-
-		// Test unsharing item
-
-		// Test setting permissions
-
-		// Test setting target no name conflicts
-
-		// Test setting target with conflicts
-
-		// Spam reshares
-
-		
-
-		
-
-	public function testPrivateLink() {
+		// Unshare
+		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		
+		// Attempt user specific target conflict
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
+		OC_User::setUserId($this->user3);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 	}
 
 }

From 9cb3113f421fd57529aa5e9d10a5e9ca9beece70 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 15 Aug 2012 11:59:08 -0400
Subject: [PATCH 1457/1537] Fix problems exposed by tests

---
 lib/public/share.php | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 34da8e89a4..c420943da2 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -253,31 +253,20 @@ class Share {
 	}
 
 	/**
-	* @brief
-	* @param
-	* @param
-	* @return
+	* @brief Unshare an item shared with the current user
+	* @param string Item type
+	* @param string Item target
+	* @return Returns true on success or false on failure
+	*
+	* Unsharing from self is not allowed for items inside collections
+	*
 	*/
 	public static function unshareFromSelf($itemType, $itemTarget) {
-		$uidSharedWith = \OC_User::getUser();
-		if ($item = self::getItems($itemType, $itemTarget, $uidSharedWith, true, null, false, 1)) {
-			// Check if item is inside a shared folder and was converted
-			if ($item['parent']) {
-				$query = \OC_DB::prepare('SELECT item_type FROM *PREFIX*share WHERE id = ? LIMIT 1');
-				$result = $query->execute(array($item['parent']))->fetchRow();
-				if (isset($result['item_type']) && $result['item_type'] == 'folder') {
-					return false;
-				}
-			}
-			// Check if this is a group share, if it is a group share a new entry needs to be created marked as unshared from self
-			if ($item['uid_shared_with'] == null) {
-				$query = \OC_DB::prepare('INSERT INTO *PREFIX*share VALUES(?,?,?,?,?,?,?,?,?,?)');
-				$result = $query->execute(array($item['item_type'], $item['item_source'], $item['item_target'], $uidSharedWith, $item['gid_shared_with'], $item['uid_owner'], self::UNSHARED_FROM_SELF, $item['stime'], $item['file_source'], $item['file_target']));
-				if (\OC_DB::isError($result)) {
-// 					\OC_Log::write('OCP\Share', 'Share type '.$shareType.' is not valid for item '.$item, \OC_Log::ERROR);
-					return false;
-				}
+		if ($item = self::getItemSharedWith($itemType, $itemTarget)) {
+			if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
+				// TODO
 			}
+			// Delete 
 			return self::delete($item['id'], true);
 		}
 		return false;
@@ -301,7 +290,7 @@ class Share {
 				if (~(int)$result['permissions'] & $permissions) {
 					$message = 'Setting permissions for '.$itemSource.' failed, because the permissions exceed permissions granted to '.\OC_User::getUser();
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new Exception($message);
+					throw new \Exception($message);
 				}
 			}
 			$query = \OC_DB::prepare('UPDATE *PREFIX*share SET permissions = ? WHERE id = ?');
@@ -341,7 +330,7 @@ class Share {
 		}
 		$message = 'Setting permissions for '.$itemSource.' failed, because the item was not found';
 		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-		throw new Exception($message);
+		throw new \Exception($message);
 	}
 
 	/**
@@ -669,7 +658,7 @@ class Share {
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
-						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group']);
 						// Set group default file target for future use
 						$parentFolders[0]['folder'] = $groupFileTarget;
 					} else {
@@ -681,12 +670,12 @@ class Share {
 						$uidSharedWith = array_keys($parentFolder);
 					}
 				} else {
-					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group']);
 				}
 			} else {
 				$groupFileTarget = null;
 			}
-			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
+			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group']);
 			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
 			// Save this id, any extra rows for this group share will need to reference it
 			$parent = \OC_DB::insertid('*PREFIX*share');

From 4c638f101e09cbe43a2114c64ebb30774bafce4b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 Aug 2012 00:24:38 +0200
Subject: [PATCH 1458/1537] Merge addressbooks.

---
 apps/contacts/ajax/contact/move.php | 30 +++++++++--------------------
 apps/contacts/js/contacts.js        | 30 ++++++++++++++++++++++++++---
 apps/contacts/lib/vcard.php         |  9 +++++++--
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/apps/contacts/ajax/contact/move.php b/apps/contacts/ajax/contact/move.php
index a3336c3cb6..053343c47e 100644
--- a/apps/contacts/ajax/contact/move.php
+++ b/apps/contacts/ajax/contact/move.php
@@ -7,35 +7,23 @@
 * later.
 * See the COPYING-README file.
 */
-	
+
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-$ids = $_POST['ids'];
+$id = intval($_POST['id']);
 $aid = intval($_POST['aid']);
+$isaddressbook = isset($_POST['isaddressbook']) ? true: false;
+
+// Ownership checking
 OC_Contacts_App::getAddressbook($aid);
-	
-if(!is_array($ids)) {
-	$ids = array($ids,);
-}
-$goodids = array();
-foreach ($ids as $id){
-	try {
-		$card = OC_Contacts_App::getContactObject( intval($id) );
-		if($card) {
-			$goodids[] = $id;
-		}
-	} catch (Exception $e) {
-		OCP\Util::writeLog('contacts', 'Error moving contact "'.$id.'" to addressbook "'.$aid.'"'.$e->getMessage(), OCP\Util::ERROR);
-	}
-}
 try {
-	OC_Contacts_VCard::moveToAddressBook($aid, $ids);
+	OC_Contacts_VCard::moveToAddressBook($aid, $id, $isaddressbook);
 }  catch (Exception $e) {
 	$msg = $e->getMessage();
-	OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $ids).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
+	OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $id).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
 	OC_JSON::error(array('data' => array('message' => $msg,)));
 }
-	
-OC_JSON::success(array('data' => array('ids' => $goodids,)));
\ No newline at end of file
+
+OC_JSON::success(array('data' => array('ids' => $id,)));
\ No newline at end of file
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 35637de050..f535dc03f3 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1437,8 +1437,12 @@ OC.Contacts={
 			if(dragitem.data('bookid') == droptarget.data('id')) {
 				return false;
 			}
-			var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
-			$.post(OC.filePath('contacts', 'ajax', 'contact/move.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
+			var droplist = (droptarget.is('ul')) ? droptarget : droptarget.next();
+			$.post(OC.filePath('contacts', 'ajax', 'contact/move.php'),
+				{
+					id: dragitem.data('id'),
+					aid: droptarget.data('id')
+				},
 				function(jsondata){
 					if(jsondata.status == 'success'){
 						dragitem.attr('data-bookid', droptarget.data('id'))
@@ -1454,7 +1458,27 @@ OC.Contacts={
 			});
 		},
 		dropAddressbook:function(event, dragitem, droptarget) {
-			alert('Dropping address books not implemented yet');
+			if(confirm(t('contacts', 'Do you want to merge these address books?'))) {
+				if(dragitem.data('bookid') == droptarget.data('id')) {
+					return false;
+				}
+				var droplist = (droptarget.is('ul')) ? droptarget : droptarget.next();
+				$.post(OC.filePath('contacts', 'ajax', 'contact/move.php'),
+					{
+						id: dragitem.data('id'),
+						aid: droptarget.data('id'),
+						isaddressbook: 1
+				},
+				function(jsondata){
+					if(jsondata.status == 'success'){
+						OC.Contacts.Contacts.update(); // Easier to refresh the whole bunch.
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			} else {
+				return false;
+			}
 		},
 		/**
 		 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index b213bcd762..91ac89f553 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -589,7 +589,7 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 *
 	 */
-	public static function moveToAddressBook($aid, $id) {
+	public static function moveToAddressBook($aid, $id, $isAddressbook = false) {
 		OC_Contacts_App::getAddressbook($aid); // check for user ownership.
 		if(is_array($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
@@ -606,8 +606,13 @@ class OC_Contacts_VCard{
 				return false;
 			}
 		} else {
-			try {
+			$stmt = null;
+			if($isAddressbook) {
+				$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE addressbookid = ?' );
+			} else {
 				$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
+			}
+			try {
 				$result = $stmt->execute(array($aid, $id));
 			} catch(Exception $e) {
 				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);

From 1e6dc6751700a91faff463f8f2840cf24e742f37 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 16 Aug 2012 02:09:15 +0200
Subject: [PATCH 1459/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/eo.php    |  14 +++
 apps/admin_dependencies_chk/l10n/ja_JP.php |  14 +++
 apps/admin_dependencies_chk/l10n/sl.php    |   5 +
 apps/admin_migrate/l10n/cs_CZ.php          |   5 +
 apps/admin_migrate/l10n/eo.php             |   5 +
 apps/admin_migrate/l10n/ja_JP.php          |   5 +
 apps/admin_migrate/l10n/sl.php             |   5 +
 apps/bookmarks/l10n/cs_CZ.php              |  12 +++
 apps/calendar/l10n/cs_CZ.php               |  42 ++++++++
 apps/calendar/l10n/ja_JP.php               |   7 ++
 apps/calendar/l10n/sl.php                  |  42 ++++++++
 apps/contacts/l10n/cs_CZ.php               |  50 ++++++++-
 apps/contacts/l10n/el.php                  |   7 ++
 apps/contacts/l10n/fr.php                  |   1 +
 apps/contacts/l10n/ja_JP.php               |   6 +-
 apps/contacts/l10n/sl.php                  |  50 ++++++++-
 apps/contacts/l10n/sv.php                  |   2 +
 apps/files/l10n/cs_CZ.php                  |   8 ++
 apps/files_encryption/l10n/cs_CZ.php       |   6 ++
 apps/files_encryption/l10n/eo.php          |   6 ++
 apps/files_encryption/l10n/ja_JP.php       |   6 ++
 apps/files_encryption/l10n/sl.php          |   6 ++
 apps/files_external/l10n/eo.php            |  18 ++++
 apps/files_external/l10n/ja_JP.php         |  18 ++++
 apps/files_external/l10n/sl.php            |  11 +-
 apps/files_sharing/l10n/cs_CZ.php          |  11 ++
 apps/files_sharing/l10n/eo.php             |  11 ++
 apps/files_sharing/l10n/it.php             |   4 +-
 apps/files_sharing/l10n/ja_JP.php          |  11 ++
 apps/files_versions/l10n/cs_CZ.php         |   4 +
 apps/files_versions/l10n/eo.php            |   4 +
 apps/files_versions/l10n/ja_JP.php         |   4 +
 apps/files_versions/l10n/sl.php            |   4 +
 apps/gallery/l10n/cs_CZ.php                |  13 +--
 apps/tasks/l10n/eo.php                     |  20 ++++
 apps/tasks/l10n/it.php                     |   3 +
 apps/tasks/l10n/ja_JP.php                  |  24 +++++
 apps/tasks/l10n/sl.php                     |   6 +-
 apps/user_ldap/l10n/eo.php                 |  28 ++++++
 apps/user_ldap/l10n/ja_JP.php              |  36 +++++++
 apps/user_ldap/l10n/sl.php                 |  14 +++
 apps/user_migrate/l10n/cs_CZ.php           |  10 ++
 apps/user_migrate/l10n/eo.php              |  10 ++
 apps/user_migrate/l10n/ja_JP.php           |  10 ++
 apps/user_openid/l10n/cs_CZ.php            |  11 ++
 apps/user_openid/l10n/eo.php               |  11 ++
 apps/user_openid/l10n/ja_JP.php            |  11 ++
 apps/user_openid/l10n/sl.php               |   7 +-
 l10n/af/contacts.po                        |  18 ++--
 l10n/ar/contacts.po                        |  18 ++--
 l10n/ar_SA/contacts.po                     |  18 ++--
 l10n/bg_BG/contacts.po                     |  18 ++--
 l10n/ca/contacts.po                        |  18 ++--
 l10n/cs_CZ/admin_migrate.po                |  13 +--
 l10n/cs_CZ/bookmarks.po                    |  27 ++---
 l10n/cs_CZ/calendar.po                     |  90 ++++++++---------
 l10n/cs_CZ/contacts.po                     | 112 +++++++++++----------
 l10n/cs_CZ/files.po                        |  34 +++----
 l10n/cs_CZ/files_encryption.po             |  15 +--
 l10n/cs_CZ/files_sharing.po                |  25 ++---
 l10n/cs_CZ/files_versions.po               |  11 +-
 l10n/cs_CZ/gallery.po                      |  84 +++-------------
 l10n/cs_CZ/lib.po                          |  65 ++++++------
 l10n/cs_CZ/settings.po                     |  24 ++---
 l10n/cs_CZ/user_migrate.po                 |  23 +++--
 l10n/cs_CZ/user_openid.po                  |  25 ++---
 l10n/da/contacts.po                        |  18 ++--
 l10n/de/contacts.po                        |  14 ++-
 l10n/el/contacts.po                        |  33 +++---
 l10n/eo/admin_dependencies_chk.po          |  31 +++---
 l10n/eo/admin_migrate.po                   |  13 +--
 l10n/eo/contacts.po                        |  18 ++--
 l10n/eo/files_encryption.po                |  15 +--
 l10n/eo/files_external.po                  |  39 +++----
 l10n/eo/files_sharing.po                   |  25 ++---
 l10n/eo/files_versions.po                  |  11 +-
 l10n/eo/tasks.po                           |  43 ++++----
 l10n/eo/user_ldap.po                       |  59 +++++------
 l10n/eo/user_migrate.po                    |  23 +++--
 l10n/eo/user_openid.po                     |  25 ++---
 l10n/es/contacts.po                        |  18 ++--
 l10n/et_EE/contacts.po                     |  18 ++--
 l10n/eu/contacts.po                        |  18 ++--
 l10n/eu_ES/contacts.po                     |  18 ++--
 l10n/fa/contacts.po                        |  18 ++--
 l10n/fi/contacts.po                        |  18 ++--
 l10n/fi_FI/contacts.po                     |  18 ++--
 l10n/fr/contacts.po                        |  20 ++--
 l10n/gl/contacts.po                        |  18 ++--
 l10n/he/contacts.po                        |  18 ++--
 l10n/hr/contacts.po                        |  18 ++--
 l10n/hu_HU/contacts.po                     |  18 ++--
 l10n/hy/contacts.po                        |  18 ++--
 l10n/ia/contacts.po                        |  18 ++--
 l10n/id/contacts.po                        |  18 ++--
 l10n/id_ID/contacts.po                     |  18 ++--
 l10n/it/contacts.po                        |  18 ++--
 l10n/it/files_sharing.po                   |   8 +-
 l10n/it/tasks.po                           |  10 +-
 l10n/ja_JP/admin_dependencies_chk.po       |  31 +++---
 l10n/ja_JP/admin_migrate.po                |  13 +--
 l10n/ja_JP/calendar.po                     |  21 ++--
 l10n/ja_JP/contacts.po                     |  27 +++--
 l10n/ja_JP/files_encryption.po             |  15 +--
 l10n/ja_JP/files_external.po               |  39 +++----
 l10n/ja_JP/files_sharing.po                |  26 ++---
 l10n/ja_JP/files_versions.po               |  11 +-
 l10n/ja_JP/settings.po                     |  15 +--
 l10n/ja_JP/tasks.po                        |  52 +++++-----
 l10n/ja_JP/user_ldap.po                    |  76 +++++++-------
 l10n/ja_JP/user_migrate.po                 |  23 +++--
 l10n/ja_JP/user_openid.po                  |  25 ++---
 l10n/ko/contacts.po                        |  18 ++--
 l10n/lb/contacts.po                        |  18 ++--
 l10n/lt_LT/contacts.po                     |  18 ++--
 l10n/lv/contacts.po                        |  18 ++--
 l10n/mk/contacts.po                        |  18 ++--
 l10n/ms_MY/contacts.po                     |  18 ++--
 l10n/nb_NO/contacts.po                     |  18 ++--
 l10n/nl/contacts.po                        |  18 ++--
 l10n/nn_NO/contacts.po                     |  18 ++--
 l10n/pl/contacts.po                        |  18 ++--
 l10n/pt_BR/contacts.po                     |  18 ++--
 l10n/pt_PT/contacts.po                     |  18 ++--
 l10n/ro/contacts.po                        |  18 ++--
 l10n/ru/contacts.po                        |  18 ++--
 l10n/sk_SK/contacts.po                     |  18 ++--
 l10n/sl/admin_dependencies_chk.po          |  13 +--
 l10n/sl/admin_migrate.po                   |  13 +--
 l10n/sl/calendar.po                        |  90 ++++++++---------
 l10n/sl/contacts.po                        | 112 +++++++++++----------
 l10n/sl/files_encryption.po                |  15 +--
 l10n/sl/files_external.po                  |  24 ++---
 l10n/sl/files_versions.po                  |  11 +-
 l10n/sl/lib.po                             |  22 ++--
 l10n/sl/tasks.po                           |  12 +--
 l10n/sl/user_ldap.po                       |  31 +++---
 l10n/sl/user_openid.po                     |  12 +--
 l10n/so/contacts.po                        |  18 ++--
 l10n/sr/contacts.po                        |  18 ++--
 l10n/sr@latin/contacts.po                  |  18 ++--
 l10n/sv/contacts.po                        |  22 ++--
 l10n/templates/admin_dependencies_chk.pot  |   2 +-
 l10n/templates/admin_migrate.pot           |   2 +-
 l10n/templates/bookmarks.pot               |   2 +-
 l10n/templates/calendar.pot                |   2 +-
 l10n/templates/contacts.pot                |  10 +-
 l10n/templates/core.pot                    |   2 +-
 l10n/templates/files.pot                   |   2 +-
 l10n/templates/files_encryption.pot        |   2 +-
 l10n/templates/files_external.pot          |   2 +-
 l10n/templates/files_sharing.pot           |   2 +-
 l10n/templates/files_versions.pot          |   2 +-
 l10n/templates/gallery.pot                 |   2 +-
 l10n/templates/lib.pot                     |   2 +-
 l10n/templates/media.pot                   |   2 +-
 l10n/templates/settings.pot                |   2 +-
 l10n/templates/tasks.pot                   |   2 +-
 l10n/templates/user_ldap.pot               |   2 +-
 l10n/templates/user_migrate.pot            |   2 +-
 l10n/templates/user_openid.pot             |   2 +-
 l10n/th_TH/contacts.po                     |  14 ++-
 l10n/tr/contacts.po                        |  18 ++--
 l10n/uk/contacts.po                        |  18 ++--
 l10n/vi/contacts.po                        |  18 ++--
 l10n/zh_CN.GB2312/contacts.po              |  18 ++--
 l10n/zh_CN/contacts.po                     |  18 ++--
 l10n/zh_TW/contacts.po                     |  18 ++--
 lib/l10n/cs_CZ.php                         |  25 +++++
 lib/l10n/sl.php                            |   5 +-
 settings/l10n/cs_CZ.php                    |   9 ++
 settings/l10n/ja_JP.php                    |   4 +
 172 files changed, 2033 insertions(+), 1202 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/eo.php
 create mode 100644 apps/admin_dependencies_chk/l10n/ja_JP.php
 create mode 100644 apps/admin_dependencies_chk/l10n/sl.php
 create mode 100644 apps/admin_migrate/l10n/cs_CZ.php
 create mode 100644 apps/admin_migrate/l10n/eo.php
 create mode 100644 apps/admin_migrate/l10n/ja_JP.php
 create mode 100644 apps/admin_migrate/l10n/sl.php
 create mode 100644 apps/bookmarks/l10n/cs_CZ.php
 create mode 100644 apps/files_encryption/l10n/cs_CZ.php
 create mode 100644 apps/files_encryption/l10n/eo.php
 create mode 100644 apps/files_encryption/l10n/ja_JP.php
 create mode 100644 apps/files_encryption/l10n/sl.php
 create mode 100644 apps/files_external/l10n/eo.php
 create mode 100644 apps/files_external/l10n/ja_JP.php
 create mode 100644 apps/files_sharing/l10n/cs_CZ.php
 create mode 100644 apps/files_sharing/l10n/eo.php
 create mode 100644 apps/files_sharing/l10n/ja_JP.php
 create mode 100644 apps/files_versions/l10n/cs_CZ.php
 create mode 100644 apps/files_versions/l10n/eo.php
 create mode 100644 apps/files_versions/l10n/ja_JP.php
 create mode 100644 apps/files_versions/l10n/sl.php
 create mode 100644 apps/tasks/l10n/eo.php
 create mode 100644 apps/tasks/l10n/ja_JP.php
 create mode 100644 apps/user_ldap/l10n/eo.php
 create mode 100644 apps/user_ldap/l10n/ja_JP.php
 create mode 100644 apps/user_ldap/l10n/sl.php
 create mode 100644 apps/user_migrate/l10n/cs_CZ.php
 create mode 100644 apps/user_migrate/l10n/eo.php
 create mode 100644 apps/user_migrate/l10n/ja_JP.php
 create mode 100644 apps/user_openid/l10n/cs_CZ.php
 create mode 100644 apps/user_openid/l10n/eo.php
 create mode 100644 apps/user_openid/l10n/ja_JP.php
 create mode 100644 lib/l10n/cs_CZ.php

diff --git a/apps/admin_dependencies_chk/l10n/eo.php b/apps/admin_dependencies_chk/l10n/eo.php
new file mode 100644
index 0000000000..65896831f7
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/eo.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "La modulo php-json necesas por komuniko inter la multaj aplikaĵoj",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "La modulo php-curl necesas por venigi la paĝotitolon dum aldono de legosigno",
+"The php-gd module is needed to create thumbnails of your images" => "La modulo php-gd necesas por krei bildetojn.",
+"The php-ldap module is needed connect to your ldap server" => "La modulo php-ldap necesas por konekti al via LDAP-servilo.",
+"The php-zip module is needed download multiple files at once" => "La modulo php-zip necesas por elŝuti plurajn dosierojn per unu fojo.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "La modulo php-mb_multibyte necesas por ĝuste administri la kodprezenton.",
+"The php-ctype module is needed validate data." => "La modulo php-ctype necesas por validkontroli datumojn.",
+"The php-xml module is needed to share files with webdav." => "La modulo php-xml necesas por kunhavigi dosierojn per WebDAV.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La ordono allow_url_fopen de via php.ini devus valori 1 por ricevi scibazon el OCS-serviloj",
+"The php-pdo module is needed to store owncloud data into a database." => "La modulo php-pdo necesas por konservi datumojn de ownCloud en datumbazo.",
+"Dependencies status" => "Stato de dependoj",
+"Used by :" => "Uzata de:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/ja_JP.php b/apps/admin_dependencies_chk/l10n/ja_JP.php
new file mode 100644
index 0000000000..0770b92db1
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/ja_JP.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "php-jsonモジュールはアプリケーション間の内部通信に必要です",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "php-curlモジュールはブックマーク追加時のページタイトル取得に必要です",
+"The php-gd module is needed to create thumbnails of your images" => "php-gdモジュールはサムネイル画像の生成に必要です",
+"The php-ldap module is needed connect to your ldap server" => "php-ldapモジュールはLDAPサーバへの接続に必要です",
+"The php-zip module is needed download multiple files at once" => "php-zipモジュールは複数ファイルの同時ダウンロードに必要です",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "php-mb_multibyteモジュールはエンコードを正しく扱うために必要です",
+"The php-ctype module is needed validate data." => "php-ctypeモジュールはデータのバリデーションに必要です",
+"The php-xml module is needed to share files with webdav." => "php-xmlモジュールはWebDAVでのファイル共有に必要です",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "php.iniのallow_url_fopenはOCSサーバから知識ベースを取得するために1に設定しなくてはなりません",
+"The php-pdo module is needed to store owncloud data into a database." => "php-pdoモジュールはデータベースにownCloudのデータを格納するために必要です",
+"Dependencies status" => "依存関係の状況",
+"Used by :" => "利用先 :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/sl.php b/apps/admin_dependencies_chk/l10n/sl.php
new file mode 100644
index 0000000000..1621937eac
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/sl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modul php-json je potrebem",
+"Dependencies status" => "Stanje odvisnosti",
+"Used by :" => "Uporablja:"
+);
diff --git a/apps/admin_migrate/l10n/cs_CZ.php b/apps/admin_migrate/l10n/cs_CZ.php
new file mode 100644
index 0000000000..0dc1a61d5d
--- /dev/null
+++ b/apps/admin_migrate/l10n/cs_CZ.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Export této instance ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Bude vytvořen komprimovaný soubor obsahující data této instance ownCloud.⏎ Zvolte typ exportu:",
+"Export" => "Export"
+);
diff --git a/apps/admin_migrate/l10n/eo.php b/apps/admin_migrate/l10n/eo.php
new file mode 100644
index 0000000000..a37be76425
--- /dev/null
+++ b/apps/admin_migrate/l10n/eo.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Malenporti ĉi tiun aperon de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ĉi tio kreos densigitan dosieron, kiu enhavos la datumojn de ĉi tiu apero de ownCloud.\nBonvolu elekti la tipon de malenportado:",
+"Export" => "Malenporti"
+);
diff --git a/apps/admin_migrate/l10n/ja_JP.php b/apps/admin_migrate/l10n/ja_JP.php
new file mode 100644
index 0000000000..a4d3349a18
--- /dev/null
+++ b/apps/admin_migrate/l10n/ja_JP.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "このownCloudをエクスポート",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "このownCloudのデータを含む圧縮形式のファイルを生成します。\nエクスポートのタイプを選択してください:",
+"Export" => "エクスポート"
+);
diff --git a/apps/admin_migrate/l10n/sl.php b/apps/admin_migrate/l10n/sl.php
new file mode 100644
index 0000000000..b8d1118bfe
--- /dev/null
+++ b/apps/admin_migrate/l10n/sl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Izvozi to ownCloud namestitev",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ustvarjena bo stisnjena datoteka s podatki te ownCloud namestitve.\n            Prosimo, če izberete vrsto izvoza:",
+"Export" => "Izvozi"
+);
diff --git a/apps/bookmarks/l10n/cs_CZ.php b/apps/bookmarks/l10n/cs_CZ.php
new file mode 100644
index 0000000000..2251969a26
--- /dev/null
+++ b/apps/bookmarks/l10n/cs_CZ.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Záložky",
+"unnamed" => "nepojmenovaný",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:",
+"Read later" => "Přečíst později",
+"Address" => "Adresa",
+"Title" => "Název",
+"Tags" => "Tagy",
+"Save bookmark" => "Uložit záložku",
+"You have no bookmarks" => "Nemáte žádné záložky",
+"Bookmarklet <br />" => "Záložky <br />"
+);
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
index fcc31613c7..ab76cc49d1 100644
--- a/apps/calendar/l10n/cs_CZ.php
+++ b/apps/calendar/l10n/cs_CZ.php
@@ -1,7 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "V paměti nejsou uloženy kompletně všechny kalendáře",
+"Everything seems to be completely cached" => "Zdá se, že vše je kompletně uloženo v paměti",
 "No calendars found." => "Žádné kalendáře nenalezeny.",
 "No events found." => "Žádné události nenalezeny.",
 "Wrong calendar" => "Nesprávný kalendář",
+"The file contained either no events or all events are already saved in your calendar." => "Soubor, obsahující všechny záznamy nebo je prázdný, je již uložen ve Vašem kalendáři.",
+"events has been saved in the new calendar" => "Záznam byl uložen v novém kalendáři",
+"Import failed" => "Import selhal",
+"events has been saved in your calendar" => "záznamů bylo uloženo ve Vašem kalendáři",
 "New Timezone:" => "Nová časová zóna:",
 "Timezone changed" => "Časová zóna byla změněna",
 "Invalid request" => "Chybný požadavek",
@@ -27,6 +33,7 @@
 "Projects" => "Projekty",
 "Questions" => "Dotazy",
 "Work" => "Pracovní",
+"by" => "od",
 "unnamed" => "nepojmenováno",
 "New Calendar" => "Nový kalendář",
 "Does not repeat" => "Neopakuje se",
@@ -73,6 +80,25 @@
 "by day and month" => "podle dne a měsíce",
 "Date" => "Datum",
 "Cal." => "Kal.",
+"Sun." => "Ne",
+"Mon." => "Po",
+"Tue." => "Út",
+"Wed." => "St",
+"Thu." => "Čt",
+"Fri." => "Pá",
+"Sat." => "So",
+"Jan." => "Ne",
+"Feb." => "únor",
+"Mar." => "březen",
+"Apr." => "duben",
+"May." => "květen",
+"Jun." => "červen",
+"Jul." => "červenec",
+"Aug." => "srpen",
+"Sep." => "září",
+"Oct." => "říjen",
+"Nov." => "listopad",
+"Dec." => "prosinec",
 "All day" => "Celý den",
 "Missing fields" => "Chybějící pole",
 "Title" => "Název",
@@ -86,6 +112,7 @@
 "Month" => "měsíc",
 "List" => "Seznam",
 "Today" => "dnes",
+"Settings" => "Nastavení",
 "Your calendars" => "Vaše kalendáře",
 "CalDav Link" => "CalDav odkaz",
 "Shared calendars" => "Sdílené kalendáře",
@@ -136,7 +163,10 @@
 "occurrences" => "výskyty",
 "create a new calendar" => "vytvořit nový kalendář",
 "Import a calendar file" => "Importovat soubor kalendáře",
+"Please choose a calendar" => "Vyberte prosím kalendář",
 "Name of new calendar" => "Název nového kalendáře",
+"Take an available name!" => "Použijte volné jméno!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Kalendář s trímto názvem již existuje. Pokud název použijete, stejnojmenné kalendáře budou sloučeny.",
 "Import" => "Import",
 "Close Dialog" => "Zavřít dialog",
 "Create a new event" => "Vytvořit novou událost",
@@ -144,9 +174,21 @@
 "No categories selected" => "Žádné kategorie nevybrány",
 "of" => "z",
 "at" => "v",
+"General" => "Hlavní",
 "Timezone" => "Časové pásmo",
+"Update timezone automatically" => "Obnovit auronaricky časovou zónu.",
+"Time format" => "Formát času",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "Týden začína v",
+"Cache" => "Paměť",
+"Clear cache for repeating events" => "Vymazat paměť pro opakuijísí se záznamy",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "Kalendář CalDAV synchronizuje adresy",
+"more info" => "podrobnosti",
+"Primary address (Kontact et al)" => "Primární adresa (veřejná)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Odkaz(y) kalendáře pouze pro čtení",
 "Users" => "Uživatelé",
 "select users" => "vybrat uživatele",
 "Editable" => "Upravovatelné",
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index f49aef73d5..a4323d8ae5 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -33,6 +33,7 @@
 "Projects" => "プロジェクト",
 "Questions" => "質問事項",
 "Work" => "週の始まり",
+"by" => "による",
 "unnamed" => "無名",
 "New Calendar" => "新しくカレンダーを作成",
 "Does not repeat" => "繰り返さない",
@@ -111,6 +112,7 @@
 "Month" => "月",
 "List" => "リスト",
 "Today" => "今日",
+"Settings" => "設定",
 "Your calendars" => "あなたのカレンダー",
 "CalDav Link" => "CalDavへのリンク",
 "Shared calendars" => "共有カレンダー",
@@ -172,11 +174,16 @@
 "No categories selected" => "カテゴリが選択されていません",
 "of" => "of",
 "at" => "at",
+"General" => "一般",
 "Timezone" => "タイムゾーン",
+"Update timezone automatically" => "自動的にタイムゾーンを更新",
+"Time format" => "時刻の表示形式",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "1週間の初めの曜日",
 "Cache" => "キャッシュ",
 "Clear cache for repeating events" => "イベントを繰り返すためにキャッシュをクリアしてください",
+"URLs" => "URL",
 "Calendar CalDAV syncing addresses" => "CalDAVカレンダーの同期用アドレス",
 "more info" => "さらに",
 "Primary address (Kontact et al)" => "プライマリアドレス（コンタクト等）",
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
index 7a488751c4..585132314b 100644
--- a/apps/calendar/l10n/sl.php
+++ b/apps/calendar/l10n/sl.php
@@ -1,7 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Vsi koledarji niso povsem predpomnjeni",
+"Everything seems to be completely cached" => "Izgleda, da je vse v predpomnilniku",
 "No calendars found." => "Ni bilo najdenih koledarjev.",
 "No events found." => "Ni bilo najdenih dogodkov.",
 "Wrong calendar" => "Napačen koledar",
+"The file contained either no events or all events are already saved in your calendar." => "Datoteka ni vsebovala dogodkov ali pa so vsi dogodki že shranjeni v koledarju.",
+"events has been saved in the new calendar" => "dogodki so bili shranjeni v nov koledar",
+"Import failed" => "Uvoz je spodletel",
+"events has been saved in your calendar" => "dogodki so bili shranjeni v vaš koledar",
 "New Timezone:" => "Nov časovni pas:",
 "Timezone changed" => "Časovni pas je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
@@ -27,6 +33,7 @@
 "Projects" => "Projekt",
 "Questions" => "Vprašanja",
 "Work" => "Delo",
+"by" => "od",
 "unnamed" => "neimenovan",
 "New Calendar" => "Nov koledar",
 "Does not repeat" => "Se ne ponavlja",
@@ -73,6 +80,25 @@
 "by day and month" => "po dnevu in mesecu",
 "Date" => "Datum",
 "Cal." => "Kol.",
+"Sun." => "ned.",
+"Mon." => "pon.",
+"Tue." => "tor.",
+"Wed." => "sre.",
+"Thu." => "čet.",
+"Fri." => "pet.",
+"Sat." => "sob.",
+"Jan." => "jan.",
+"Feb." => "feb.",
+"Mar." => "mar.",
+"Apr." => "apr.",
+"May." => "maj",
+"Jun." => "jun.",
+"Jul." => "jul.",
+"Aug." => "avg.",
+"Sep." => "sep.",
+"Oct." => "okt.",
+"Nov." => "nov.",
+"Dec." => "dec.",
 "All day" => "Cel dan",
 "Missing fields" => "Mankajoča polja",
 "Title" => "Naslov",
@@ -86,6 +112,7 @@
 "Month" => "Mesec",
 "List" => "Seznam",
 "Today" => "Danes",
+"Settings" => "Nastavitve",
 "Your calendars" => "Vaši koledarji",
 "CalDav Link" => "CalDav povezava",
 "Shared calendars" => "Koledarji v souporabi",
@@ -136,7 +163,10 @@
 "occurrences" => "ponovitev",
 "create a new calendar" => "Ustvari nov koledar",
 "Import a calendar file" => "Uvozi datoteko koledarja",
+"Please choose a calendar" => "Prosimo, če izberete koledar",
 "Name of new calendar" => "Ime novega koledarja",
+"Take an available name!" => "Izberite prosto ime!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Koledar s tem imenom že obstaja. Če nadaljujete, bosta koledarja združena.",
 "Import" => "Uvozi",
 "Close Dialog" => "Zapri dialog",
 "Create a new event" => "Ustvari nov dogodek",
@@ -144,9 +174,21 @@
 "No categories selected" => "Nobena kategorija ni izbrana",
 "of" => "od",
 "at" => "pri",
+"General" => "Splošno",
 "Timezone" => "Časovni pas",
+"Update timezone automatically" => "Samodejno posodobi časovni pas",
+"Time format" => "Oblika zapisa časa",
 "24h" => "24ur",
 "12h" => "12ur",
+"Start week on" => "Začni teden z",
+"Cache" => "Predpomnilnik",
+"Clear cache for repeating events" => "Počisti predpomnilnik za ponavljajoče dogodke",
+"URLs" => "URLji",
+"Calendar CalDAV syncing addresses" => "CalDAV naslov za usklajevanje koledarjev",
+"more info" => "dodatne informacije",
+"Primary address (Kontact et al)" => "Glavni naslov (Kontakt et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "iCalendar povezava/e samo za branje",
 "Users" => "Uporabniki",
 "select users" => "izberite uporabnike",
 "Editable" => "Možno urejanje",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 9b342328ac..89f242d5c8 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -10,9 +10,11 @@
 "No contacts found." => "Žádné kontakty nenalezeny.",
 "There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
 "element name is not set." => "jméno elementu není nastaveno.",
+"Could not parse contact: " => "Nelze analyzovat kontakty",
 "Cannot add empty property." => "Nelze přidat prazdný údaj.",
 "At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
 "Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
+"Error adding contact property: " => "Chyba během přidávání vlastností kontaktu:",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
 "Missing ID" => "Chybí ID",
@@ -57,10 +59,14 @@
 "Edit name" => "Upravit jméno",
 "No files selected for upload." => "Žádné soubory nebyly vybrány k nahrání.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost.",
+"Error loading profile picture." => "Chyba při otevírání obrázku profilu",
 "Select type" => "Vybrat typ",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace.",
 "Result: " => "Výsledek: ",
 " imported, " => "importováno v pořádku,",
 " failed." => "neimportováno.",
+"Displayname cannot be empty." => "Zobrazované jméno nemůže zůstat prázdné.",
+"Addressbook not found: " => "Adresář nenalezen:",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
 "Address" => "Adresa",
@@ -78,12 +84,38 @@
 "Pager" => "Pager",
 "Internet" => "Internet",
 "Birthday" => "Narozeniny",
+"Business" => "Pracovní",
+"Call" => "Volat",
+"Clients" => "Klienti",
+"Deliverer" => "Dodavatel",
+"Holidays" => "Prázdniny",
+"Ideas" => "Nápady",
+"Journey" => "Cestování",
+"Jubilee" => "Jubileum",
+"Meeting" => "Schůzka",
+"Other" => "Ostatní",
+"Personal" => "Osobní",
+"Projects" => "Projekty",
+"Questions" => "Dotazy",
 "{name}'s Birthday" => "Narozeniny {name}",
 "Contact" => "Kontakt",
 "Add Contact" => "Přidat kontakt",
 "Import" => "Import",
+"Settings" => "Nastavení",
 "Addressbooks" => "Adresáře",
 "Close" => "Zavřít",
+"Keyboard shortcuts" => "Klávesoví zkratky",
+"Navigation" => "Navigace",
+"Next contact in list" => "Následující kontakt v seznamu",
+"Previous contact in list" => "Předchozí kontakt v seznamu",
+"Expand/collapse current addressbook" => "Rozbalit/sbalit aktuální Adresář",
+"Next addressbook" => "Následující Adresář",
+"Previous addressbook" => "Předchozí Adresář",
+"Actions" => "Akce",
+"Refresh contacts list" => "Občerstvit seznam kontaktů",
+"Add new contact" => "Přidat kontakt",
+"Add new addressbook" => "Předat nový Adresář",
+"Delete current contact" => "Odstranit aktuální kontakt",
 "Drop photo to upload" => "Přetáhněte sem fotku pro její nahrání",
 "Delete current photo" => "Smazat současnou fotku",
 "Edit current photo" => "Upravit současnou fotku",
@@ -94,6 +126,9 @@
 "Delete" => "Odstranit",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
+"Web site" => "Web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Přejít na web",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupiny",
 "Separate groups with commas" => "Oddělte skupiny čárkami",
@@ -117,10 +152,15 @@
 "Edit address" => "Upravit adresu",
 "Type" => "Typ",
 "PO Box" => "PO box",
+"Street address" => "Ulice",
+"Street and number" => "Ulice a číslo",
 "Extended" => "Rozšířené",
+"Apartment number etc." => "Byt číslo atd.",
 "City" => "Město",
 "Region" => "Kraj",
+"E.g. state or province" => "Např. stát nebo okres",
 "Zipcode" => "PSČ",
+"Postal code" => "PSČ",
 "Country" => "Země",
 "Addressbook" => "Adresář",
 "Hon. prefixes" => "Tituly před",
@@ -150,13 +190,21 @@
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
 "Configure addressbooks" => "Nastavit adresář",
+"Select Address Books" => "Vybrat Adresář",
+"Enter name" => "Vložte jméno",
+"Enter description" => "Vložte popis",
 "CardDAV syncing addresses" => "Adresa pro synchronizaci pomocí CardDAV:",
 "more info" => "víc informací",
 "Primary address (Kontact et al)" => "Hlavní adresa (Kontakt etc)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Zobrazit odklaz CardDAV:",
+"Show read-only VCF link" => "Zobrazit odkaz VCF pouze pro čtení",
 "Download" => "Stažení",
 "Edit" => "Editovat",
 "New Address Book" => "Nový adresář",
+"Name" => "Název",
+"Description" => "Popis",
 "Save" => "Uložit",
-"Cancel" => "Storno"
+"Cancel" => "Storno",
+"More..." => "Více..."
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 2f31bccbf2..8e1b0e61e6 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -59,11 +59,14 @@
 "Edit name" => "Αλλαγή ονόματος",
 "No files selected for upload." => "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server.",
+"Error loading profile picture." => "Σφάλμα στην φόρτωση εικόνας προφίλ.",
 "Select type" => "Επιλογή τύπου",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν.",
 "Result: " => "Αποτέλεσμα: ",
 " imported, " => " εισάγεται,",
 " failed." => " απέτυχε.",
+"Displayname cannot be empty." => "Το όνομα προβολής δεν μπορεί να είναι κενό. ",
+"Addressbook not found: " => "Το βιβλίο διευθύνσεων δεν βρέθηκε:",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
 "Address" => "Διεύθυνση",
@@ -106,6 +109,8 @@
 "Next contact in list" => "Επόμενη επαφή στη λίστα",
 "Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
 "Expand/collapse current addressbook" => "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων",
+"Next addressbook" => "Επόμενο βιβλίο διευθύνσεων",
+"Previous addressbook" => "Προηγούμενο βιβλίο διευθύνσεων",
 "Actions" => "Ενέργειες",
 "Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
 "Add new contact" => "Προσθήκη νέας επαφής",
@@ -192,6 +197,8 @@
 "more info" => "περισσότερες πληροφορίες",
 "Primary address (Kontact et al)" => "Κύρια διεύθυνση",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Εμφάνιση συνδέσμου CardDav",
+"Show read-only VCF link" => "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση",
 "Download" => "Λήψη",
 "Edit" => "Επεξεργασία",
 "New Address Book" => "Νέο βιβλίο διευθύνσεων",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 93299380d2..eba0fff150 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -59,6 +59,7 @@
 "Edit name" => "Éditer le nom",
 "No files selected for upload." => "Aucun fichiers choisis pour être chargés",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
+"Error loading profile picture." => "Erreur pendant le chargement de la photo de profil.",
 "Select type" => "Sélectionner un type",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.",
 "Result: " => "Résultat :",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 4f7800e1db..f3e3a3fd53 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -59,7 +59,9 @@
 "Edit name" => "名前を編集",
 "No files selected for upload." => "アップロードするファイルが選択されていません。",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
+"Error loading profile picture." => "プロファイルの画像の読み込みエラー",
 "Select type" => "タイプを選択",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。",
 "Result: " => "結果: ",
 " imported, " => " をインポート、 ",
 " failed." => " は失敗しました。",
@@ -119,6 +121,7 @@
 "Edit current photo" => "現在の写真を編集",
 "Upload new photo" => "新しい写真をアップロード",
 "Select photo from ownCloud" => "ownCloudから写真を選択",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順",
 "Edit name details" => "名前の詳細を編集",
 "Delete" => "削除",
 "Nickname" => "ニックネーム",
@@ -160,6 +163,7 @@
 "Postal code" => "郵便番号",
 "Country" => "国名",
 "Addressbook" => "アドレスブック",
+"Hon. prefixes" => "敬称",
 "Miss" => "Miss",
 "Ms" => "Ms",
 "Mr" => "Mr",
@@ -169,7 +173,7 @@
 "Given name" => "名",
 "Additional names" => "ミドルネーム",
 "Family name" => "姓",
-"Hon. suffixes" => "ストレージへの連絡先のアップロードエラー。",
+"Hon. suffixes" => "称号",
 "J.D." => "J.D.",
 "M.D." => "M.D.",
 "D.O." => "D.O.",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 1dc0cef74b..f08a300bcb 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -10,9 +10,11 @@
 "No contacts found." => "Ni bilo najdenih stikov.",
 "There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
 "element name is not set." => "ime elementa ni nastavljeno.",
+"Could not parse contact: " => "Ne morem razčleniti stika:",
 "Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
 "At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
 "Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
+"Error adding contact property: " => "Napaka pri dodajanju lastnosti stiku:",
 "Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
 "Error deleting contact property." => "Napaka pri brisanju lastnosti stika.",
 "Missing ID" => "Manjkajoč ID",
@@ -57,10 +59,14 @@
 "Edit name" => "Uredi ime",
 "No files selected for upload." => "Nobena datoteka ni bila izbrana za nalaganje.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku.",
+"Error loading profile picture." => "Napaka pri nalaganju slike profila.",
 "Select type" => "Izberite vrsto",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris.",
 "Result: " => "Rezultati: ",
 " imported, " => " uvoženih, ",
 " failed." => " je spodletelo.",
+"Displayname cannot be empty." => "Ime za prikaz ne more biti prazno.",
+"Addressbook not found: " => "Adresar ni bil najden:",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
 "Address" => "Naslov",
@@ -78,12 +84,38 @@
 "Pager" => "Pozivnik",
 "Internet" => "Internet",
 "Birthday" => "Rojstni dan",
+"Business" => "Poslovno",
+"Call" => "Klic",
+"Clients" => "Stranka",
+"Deliverer" => "Dostavljalec",
+"Holidays" => "Prazniki",
+"Ideas" => "Ideje",
+"Journey" => "Potovanje",
+"Jubilee" => "Jubilej",
+"Meeting" => "Sestanek",
+"Other" => "Drugo",
+"Personal" => "Osebno",
+"Projects" => "Projekti",
+"Questions" => "Vprašanja",
 "{name}'s Birthday" => "{name} - rojstni dan",
 "Contact" => "Stik",
 "Add Contact" => "Dodaj stik",
 "Import" => "Uvozi",
+"Settings" => "Nastavitve",
 "Addressbooks" => "Imeniki",
 "Close" => "Zapri",
+"Keyboard shortcuts" => "Bližnjice na tipkovnici",
+"Navigation" => "Krmarjenje",
+"Next contact in list" => "Naslednji stik na seznamu",
+"Previous contact in list" => "Predhodni stik na seznamu",
+"Expand/collapse current addressbook" => "Razširi/skrči trenutni adresar",
+"Next addressbook" => "Naslednji adresar",
+"Previous addressbook" => "Predhodni adresar",
+"Actions" => "Dejanja",
+"Refresh contacts list" => "Osveži seznam stikov",
+"Add new contact" => "Dodaj nov stik",
+"Add new addressbook" => "Dodaj nov adresar",
+"Delete current contact" => "Izbriši trenutni stik",
 "Drop photo to upload" => "Spustite sliko tukaj, da bi jo naložili",
 "Delete current photo" => "Izbriši trenutno sliko",
 "Edit current photo" => "Uredi trenutno sliko",
@@ -94,6 +126,9 @@
 "Delete" => "Izbriši",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
+"Web site" => "Spletna stran",
+"http://www.somesite.com" => "http://www.nekastran.si",
+"Go to web site" => "Pojdi na spletno stran",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupine",
 "Separate groups with commas" => "Skupine ločite z vejicami",
@@ -117,10 +152,15 @@
 "Edit address" => "Uredi naslov",
 "Type" => "Vrsta",
 "PO Box" => "Poštni predal",
+"Street address" => "Ulični naslov",
+"Street and number" => "Ulica in štelika",
 "Extended" => "Razširjeno",
+"Apartment number etc." => "Številka stanovanja itd.",
 "City" => "Mesto",
 "Region" => "Regija",
+"E.g. state or province" => "Npr. dežela ali pokrajina",
 "Zipcode" => "Poštna št.",
+"Postal code" => "Poštna številka",
 "Country" => "Dežela",
 "Addressbook" => "Imenik",
 "Hon. prefixes" => "Predpone",
@@ -150,13 +190,21 @@
 "You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
 "Add contact" => "Dodaj stik",
 "Configure addressbooks" => "Nastavi imenike",
+"Select Address Books" => "Izberite adresarje",
+"Enter name" => "Vnesite ime",
+"Enter description" => "Vnesite opis",
 "CardDAV syncing addresses" => "CardDAV naslovi za sinhronizacijo",
 "more info" => "več informacij",
 "Primary address (Kontact et al)" => "Primarni naslov (za kontakt et al)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Pokaži CardDav povezavo",
+"Show read-only VCF link" => "Pokaži VCF povezavo samo za branje",
 "Download" => "Prenesi",
 "Edit" => "Uredi",
 "New Address Book" => "Nov imenik",
+"Name" => "Ime",
+"Description" => "Opis",
 "Save" => "Shrani",
-"Cancel" => "Prekliči"
+"Cancel" => "Prekliči",
+"More..." => "Več..."
 );
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index f470a338b6..b4b6a53945 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -13,6 +13,7 @@
 "Could not parse contact: " => "Kunde inte läsa kontakt:",
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap.",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i.",
+"Trying to add duplicate property: " => "Försöker lägga till dubblett:",
 "Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
 "Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort.",
@@ -58,6 +59,7 @@
 "Edit name" => "Ändra namn",
 "No files selected for upload." => "Inga filer valda för uppladdning",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server.",
+"Error loading profile picture." => "Fel vid hämtning av profilbild.",
 "Select type" => "Välj typ",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade.",
 "Result: " => "Resultat:",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index ddaf923d1b..adf8dc3170 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,7 +7,15 @@
 "Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
 "Failed to write to disk" => "Zápis na disk se nezdařil",
 "Files" => "Soubory",
+"Unshare" => "Odsdílet",
 "Delete" => "Vymazat",
+"already exists" => "již existuje",
+"replace" => "zaměnit",
+"cancel" => "storno",
+"replaced" => "zaměněno",
+"with" => "s",
+"undo" => "zpět",
+"deleted" => "smazáno",
 "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to chvíli trvat",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemohu nahrát váš soubor neboť to je adresář a nebo má nulovou délku.",
 "Upload Error" => "Chyba při nahrávání",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
new file mode 100644
index 0000000000..15cf770570
--- /dev/null
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptování",
+"Exclude the following file types from encryption" => "Při kryptování vynechat následující typy souborů",
+"None" => "Žádný",
+"Enable Encryption" => "Povolit kryptování"
+);
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
new file mode 100644
index 0000000000..af3c9ae98e
--- /dev/null
+++ b/apps/files_encryption/l10n/eo.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Ĉifrado",
+"Exclude the following file types from encryption" => "Malinkluzivigi la jenajn dosiertipojn el ĉifrado",
+"None" => "Nenio",
+"Enable Encryption" => "Kapabligi ĉifradon"
+);
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
new file mode 100644
index 0000000000..2c3e5410de
--- /dev/null
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "暗号化",
+"Exclude the following file types from encryption" => "暗号化から除外するファイルタイプ",
+"None" => "なし",
+"Enable Encryption" => "暗号化を有効にする"
+);
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
new file mode 100644
index 0000000000..65807910e1
--- /dev/null
+++ b/apps/files_encryption/l10n/sl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Šifriranje",
+"Exclude the following file types from encryption" => "Naslednje vrste datotek naj se ne šifrirajo",
+"None" => "Brez",
+"Enable Encryption" => "Omogoči šifriranje"
+);
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
new file mode 100644
index 0000000000..3cb8255c52
--- /dev/null
+++ b/apps/files_external/l10n/eo.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Malena memorilo",
+"Mount point" => "Surmetingo",
+"Backend" => "Motoro",
+"Configuration" => "Agordo",
+"Options" => "Malneproj",
+"Applicable" => "Aplikebla",
+"Add mount point" => "Aldoni surmetingon",
+"None set" => "Nenio agordita",
+"All Users" => "Ĉiuj uzantoj",
+"Groups" => "Grupoj",
+"Users" => "Uzantoj",
+"Delete" => "Forigi",
+"SSL root certificates" => "Radikaj SSL-atestoj",
+"Import Root Certificate" => "Enporti radikan ateston",
+"Enable User External Storage" => "Kapabligi malenan memorilon de uzanto",
+"Allow users to mount their own external storage" => "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
+);
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
new file mode 100644
index 0000000000..c7d38d8832
--- /dev/null
+++ b/apps/files_external/l10n/ja_JP.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "外部ストレージ",
+"Mount point" => "マウントポイント",
+"Backend" => "バックエンド",
+"Configuration" => "設定",
+"Options" => "オプション",
+"Applicable" => "適用範囲",
+"Add mount point" => "マウントポイントを追加",
+"None set" => "未設定",
+"All Users" => "すべてのユーザ",
+"Groups" => "グループ",
+"Users" => "ユーザ",
+"Delete" => "削除",
+"SSL root certificates" => "SSLルート証明書",
+"Import Root Certificate" => "ルート証明書をインポート",
+"Enable User External Storage" => "ユーザの外部ストレージを有効にする",
+"Allow users to mount their own external storage" => "ユーザに外部ストレージのマウントを許可する"
+);
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 6a96e2cd69..d588844467 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -1,9 +1,18 @@
 <?php $TRANSLATIONS = array(
+"External Storage" => "Zunanja podatkovna shramba",
+"Mount point" => "Priklopna točka",
+"Backend" => "Zaledje",
+"Configuration" => "Nastavitve",
+"Options" => "Možnosti",
+"Applicable" => "Se uporablja",
+"Add mount point" => "Dodaj priklopno točko",
+"None set" => "Ni nastavljeno",
 "All Users" => "Vsi uporabniki",
 "Groups" => "Skupine",
 "Users" => "Uporabniki",
 "Delete" => "Izbriši",
 "SSL root certificates" => "SSL korenski certifikati",
 "Import Root Certificate" => "Uvozi korenski certifikat",
-"Enable User External Storage" => "Omogoči"
+"Enable User External Storage" => "Omogoči uporabo zunanje podatkovne shrambe za uporabnike",
+"Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
new file mode 100644
index 0000000000..6817d07a47
--- /dev/null
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vaše sdílené soubory",
+"Item" => "Položka",
+"Shared With" => "Sdíleno s:",
+"Permissions" => "Práva",
+"Read" => "Číst",
+"Edit" => "Editovat",
+"Delete" => "Smazat",
+"Enable Resharing" => "Povolit další sdílení",
+"Allow users to reshare files they don't own" => "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
+);
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
new file mode 100644
index 0000000000..6af1ef53d0
--- /dev/null
+++ b/apps/files_sharing/l10n/eo.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Viaj kunhavigitaj dosieroj",
+"Item" => "Ero",
+"Shared With" => "Kunhavigita kun",
+"Permissions" => "Permesoj",
+"Read" => "Legi",
+"Edit" => "Redakti",
+"Delete" => "Forigi",
+"Enable Resharing" => "Kapabligi rekunhavigon",
+"Allow users to reshare files they don't own" => "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
+);
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 5534dfca03..8dc20efdf7 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -5,5 +5,7 @@
 "Permissions" => "Permessi",
 "Read" => "Lettura",
 "Edit" => "Modifica",
-"Delete" => "Eliminazione"
+"Delete" => "Eliminazione",
+"Enable Resharing" => "Abilita ri-condivisione",
+"Allow users to reshare files they don't own" => "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
new file mode 100644
index 0000000000..bc58aa9863
--- /dev/null
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "共有ファイル",
+"Item" => "項目",
+"Shared With" => "で共有 ",
+"Permissions" => "許可",
+"Read" => "読込",
+"Edit" => "編集",
+"Delete" => "削除",
+"Enable Resharing" => "再共有を有効にする",
+"Allow users to reshare files they don't own" => "所有者でないファイルの共有を許可する"
+);
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
new file mode 100644
index 0000000000..3297648fa3
--- /dev/null
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Vypršení všech verzí",
+"Enable Files Versioning" => "Povolit verzování souborů"
+);
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
new file mode 100644
index 0000000000..8ec0895638
--- /dev/null
+++ b/apps/files_versions/l10n/eo.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Eksvalidigi ĉiujn eldonojn",
+"Enable Files Versioning" => "Kapabligi dosiereldonkontrolon"
+);
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
new file mode 100644
index 0000000000..ec5e32f3e2
--- /dev/null
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "すべてのバージョンを削除する",
+"Enable Files Versioning" => "ファイルのバージョン管理を有効にする"
+);
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
new file mode 100644
index 0000000000..e7db55930c
--- /dev/null
+++ b/apps/files_versions/l10n/sl.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Zastaraj vse različice",
+"Enable Files Versioning" => "Omogoči sledenje različicam datotek"
+);
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
index d008e9d28b..02d1c02d6e 100644
--- a/apps/gallery/l10n/cs_CZ.php
+++ b/apps/gallery/l10n/cs_CZ.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Obrázky",
-"Settings" => "Nastavení",
-"Rescan" => "Znovu prohledat",
-"Stop" => "Zastavit",
-"Share" => "Sdílet",
-"Back" => "Zpět",
-"Remove confirmation" => "Potvrzení odebrání",
-"Do you want to remove album" => "Chcete odstranit album?",
-"Change album name" => "Změnit název alba",
-"New album name" => "Název nového alba"
+"Share gallery" => "Sdílet galerii",
+"Error: " => "Chyba: ",
+"Internal error" => "Vnitřní chyba",
+"Slideshow" => "Přehrávání"
 );
diff --git a/apps/tasks/l10n/eo.php b/apps/tasks/l10n/eo.php
new file mode 100644
index 0000000000..f55b8b7529
--- /dev/null
+++ b/apps/tasks/l10n/eo.php
@@ -0,0 +1,20 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Nevalida dato/horo",
+"Tasks" => "Taskoj",
+"No category" => "Neniu kategorio",
+"Unspecified" => "Nespecifita",
+"1=highest" => "1=plej alta",
+"5=medium" => "5=meza",
+"9=lowest" => "9=plej malalta",
+"Invalid percent complete" => "Nevalida plenuma elcento",
+"Invalid priority" => "Nevalida pligravo",
+"Add Task" => "Aldoni taskon",
+"Order Complete" => "Ordigi laŭ plenumo",
+"Order Location" => "Ordigi laŭ loko",
+"Order Priority" => "Ordigi laŭ pligravo",
+"Loading tasks..." => "Ŝargante taskojn...",
+"Important" => "Grava",
+"More" => "Pli",
+"Less" => "Malpli",
+"Delete" => "Forigi"
+);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
index 8467ff54eb..27f7b0279d 100644
--- a/apps/tasks/l10n/it.php
+++ b/apps/tasks/l10n/it.php
@@ -6,10 +6,13 @@
 "1=highest" => "1=massima",
 "5=medium" => "5=media",
 "9=lowest" => "9=minima",
+"Empty Summary" => "Riepilogo vuoto",
 "Invalid percent complete" => "Percentuale di completamento non valida",
 "Invalid priority" => "Priorità non valida",
 "Add Task" => "Aggiungi attività",
 "Loading tasks..." => "Caricamento attività in corso...",
 "Important" => "Importante",
+"More" => "Più",
+"Less" => "Meno",
 "Delete" => "Elimina"
 );
diff --git a/apps/tasks/l10n/ja_JP.php b/apps/tasks/l10n/ja_JP.php
new file mode 100644
index 0000000000..b5b526c595
--- /dev/null
+++ b/apps/tasks/l10n/ja_JP.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "無効な日付／時刻",
+"Tasks" => "タスク",
+"No category" => "カテゴリ無し",
+"Unspecified" => "未指定",
+"1=highest" => "1=高",
+"5=medium" => "5=中",
+"9=lowest" => "9=低",
+"Empty Summary" => "要旨が未記入",
+"Invalid percent complete" => "進捗％が不正",
+"Invalid priority" => "無効な優先度",
+"Add Task" => "タスクを追加",
+"Order Due" => "期日で並べ替え",
+"Order List" => "リストで並び替え",
+"Order Complete" => "完了で並べ替え",
+"Order Location" => "場所で並べ替え",
+"Order Priority" => "優先度で並べ替え",
+"Order Label" => "ラベルで並べ替え",
+"Loading tasks..." => "タスクをロード中...",
+"Important" => "重要",
+"More" => "詳細",
+"Less" => "閉じる",
+"Delete" => "削除"
+);
diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php
index 7bef1894d1..3dff6b22a0 100644
--- a/apps/tasks/l10n/sl.php
+++ b/apps/tasks/l10n/sl.php
@@ -7,8 +7,12 @@
 "5=medium" => "5=srednje",
 "9=lowest" => "9=najnižje",
 "Empty Summary" => "Prazen povzetek",
+"Invalid percent complete" => "Neveljaven odstotek dokončanja",
 "Invalid priority" => "Neveljavna prednost",
 "Add Task" => "Dodaj opravilo",
+"Loading tasks..." => "Nalagam opravila...",
+"Important" => "Pomembno",
 "More" => "Več",
-"Less" => "Manj"
+"Less" => "Manj",
+"Delete" => "Izbriši"
 );
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
new file mode 100644
index 0000000000..a560aedd91
--- /dev/null
+++ b/apps/user_ldap/l10n/eo.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Gastigo",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
+"Base DN" => "Baz-DN",
+"User DN" => "Uzanto-DN",
+"Password" => "Pasvorto",
+"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
+"User Login Filter" => "Filtrilo de uzantensaluto",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uzu la referencilon %%uid, ekz.: \"uid=%%uid\"",
+"User List Filter" => "Filtrilo de uzantolisto",
+"without any placeholder, e.g. \"objectClass=person\"." => "sen ajna referencilo, ekz.: \"objectClass=person\".",
+"Group Filter" => "Filtrilo de grupo",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ajna referencilo, ekz.: \"objectClass=posixGroup\".",
+"Port" => "Pordo",
+"Base User Tree" => "Baza uzantarbo",
+"Base Group Tree" => "Baza gruparbo",
+"Use TLS" => "Uzi TLS-on",
+"Do not use it for SSL connections, it will fail." => "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos.",
+"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
+"Not recommended, use for testing only." => "Ne rekomendata, uzu ĝin nur por testoj.",
+"User Display Name Field" => "Kampo de vidignomo de uzanto",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto.",
+"Group Display Name Field" => "Kampo de vidignomo de grupo",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo.",
+"in bytes" => "duumoke",
+"in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
+"Help" => "Helpo"
+);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
new file mode 100644
index 0000000000..f2a7790755
--- /dev/null
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "ホスト",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
+"Base DN" => "ベースDN",
+"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザとグループのベースDNを指定することができます。",
+"User DN" => "ユーザDN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
+"Password" => "パスワード",
+"For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
+"User Login Filter" => "ユーザログインフィルタ",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\"",
+"User List Filter" => "ユーザリストフィルタ",
+"Defines the filter to apply, when retrieving users." => "ユーザーを取得するときに適用するフィルターを定義する。",
+"without any placeholder, e.g. \"objectClass=person\"." => "プレースホルダーを利用しないでください。例 \"objectClass=person\"",
+"Group Filter" => "グループフィルタ",
+"Defines the filter to apply, when retrieving groups." => "グループを取得するときに適用するフィルターを定義する。",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\"",
+"Port" => "ポート",
+"Base User Tree" => "ベースユーザツリー",
+"Base Group Tree" => "ベースグループツリー",
+"Group-Member association" => "グループとメンバーの関連付け",
+"Use TLS" => "TLSを利用",
+"Do not use it for SSL connections, it will fail." => "SSL接続に利用しないでください、失敗します。",
+"Case insensitve LDAP server (Windows)" => "大文字／小文字を区別しないLDAPサーバ（Windows）",
+"Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。",
+"Not recommended, use for testing only." => "推奨しません、テスト目的でのみ利用してください。",
+"User Display Name Field" => "ユーザ名の表示に利用するフィールド",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "ユーザのownCloud名の生成に利用するLDAP属性。",
+"Group Display Name Field" => "グループ名の表示に利用するフィールド",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "グループのownCloud名の生成に利用するLDAP属性。",
+"in bytes" => "バイト",
+"in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
+"Help" => "ヘルプ"
+);
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
new file mode 100644
index 0000000000..cbfe6304e7
--- /dev/null
+++ b/apps/user_ldap/l10n/sl.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Gostitelj",
+"Base DN" => "Osnovni DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno",
+"User DN" => "Uporabnik DN",
+"Password" => "Geslo",
+"For anonymous access, leave DN and Password empty." => "Za anonimni dostop pustite polji za DN in geslo prazni.",
+"Port" => "Vrata",
+"Use TLS" => "Uporabi TLS",
+"Do not use it for SSL connections, it will fail." => "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo.",
+"Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti SSL certifikata.",
+"in bytes" => "v bajtih",
+"Help" => "Pomoč"
+);
diff --git a/apps/user_migrate/l10n/cs_CZ.php b/apps/user_migrate/l10n/cs_CZ.php
new file mode 100644
index 0000000000..81a5a45d97
--- /dev/null
+++ b/apps/user_migrate/l10n/cs_CZ.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Export",
+"Something went wrong while the export file was being generated" => "Během vytváření souboru exportu došlo k chybě",
+"An error has occurred" => "Nastala chyba",
+"Export your user account" => "Export Vašeho uživatelského účtu",
+"This will create a compressed file that contains your ownCloud account." => "Bude vytvořen komprimovaný soubor, obsahující Váš ownCloud účet.",
+"Import user account" => "Import uživatelského účtu",
+"ownCloud User Zip" => "Zip soubor uživatele ownCloud",
+"Import" => "Import"
+);
diff --git a/apps/user_migrate/l10n/eo.php b/apps/user_migrate/l10n/eo.php
new file mode 100644
index 0000000000..ca91806169
--- /dev/null
+++ b/apps/user_migrate/l10n/eo.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Malenporti",
+"Something went wrong while the export file was being generated" => "Io malsukcesis dum la enportota dosiero generiĝis",
+"An error has occurred" => "Eraro okazis",
+"Export your user account" => "Malenporti vian uzantokonton",
+"This will create a compressed file that contains your ownCloud account." => "Ĉi tio kreos densigitan dosieron, kiu enhavas vian konton de ownCloud.",
+"Import user account" => "Enporti uzantokonton",
+"ownCloud User Zip" => "ZIP-dosiero de uzanto de ownCloud",
+"Import" => "Enporti"
+);
diff --git a/apps/user_migrate/l10n/ja_JP.php b/apps/user_migrate/l10n/ja_JP.php
new file mode 100644
index 0000000000..1733a3f4ed
--- /dev/null
+++ b/apps/user_migrate/l10n/ja_JP.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "エクスポート",
+"Something went wrong while the export file was being generated" => "エクスポートファイルの生成時に何か不具合が発生しました。",
+"An error has occurred" => "エラーが発生しました",
+"Export your user account" => "あなたのユーザアカウントをエクスポート",
+"This will create a compressed file that contains your ownCloud account." => "あなたのownCloudアカウントを含む圧縮形式のファイルを生成します。",
+"Import user account" => "ユーザアカウントをインポート",
+"ownCloud User Zip" => "ownCloudユーザZip",
+"Import" => "インポート"
+);
diff --git a/apps/user_openid/l10n/cs_CZ.php b/apps/user_openid/l10n/cs_CZ.php
new file mode 100644
index 0000000000..9c041a89a6
--- /dev/null
+++ b/apps/user_openid/l10n/cs_CZ.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Toto je OpenID server endpoint. Více informací na",
+"Identity: <b>" => "Identita: <b>",
+"Realm: <b>" => "Oblast: <b>",
+"User: <b>" => "Uživatel: <b>",
+"Login" => "Login",
+"Error: <b>No user Selected" => "Chyba: <b>Uživatel není zvolen",
+"you can authenticate to other sites with this address" => "s touto adresou se můžete autrorizovat na další strany",
+"Authorized OpenID provider" => "Autorizovaný OpenID poskytovatel",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Vaše adresa na Wordpressu, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/eo.php b/apps/user_openid/l10n/eo.php
new file mode 100644
index 0000000000..665d199094
--- /dev/null
+++ b/apps/user_openid/l10n/eo.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Ĉi tio estas finpunkto de OpenID-servilo. Por pli da informo, vidu",
+"Identity: <b>" => "Idento: <b>",
+"Realm: <b>" => "Regno: <b>",
+"User: <b>" => "Uzanto: <b>",
+"Login" => "Ensaluti",
+"Error: <b>No user Selected" => "Eraro: <b>neniu uzanto estas elektita",
+"you can authenticate to other sites with this address" => "Vi povas ensaluti en aliaj ejoj per tiu ĉi adreso",
+"Authorized OpenID provider" => "Rajtigita OpenID-provizanto",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Via adreso ĉe Wordpress, Identi.ca&hellip;"
+);
diff --git a/apps/user_openid/l10n/ja_JP.php b/apps/user_openid/l10n/ja_JP.php
new file mode 100644
index 0000000000..12a2692cb6
--- /dev/null
+++ b/apps/user_openid/l10n/ja_JP.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "これはOpenIDサーバのエンドポイントです。詳細は下記をチェックしてください。",
+"Identity: <b>" => "識別子: <b>",
+"Realm: <b>" => "レルム: <b>",
+"User: <b>" => "ユーザ: <b>",
+"Login" => "ログイン",
+"Error: <b>No user Selected" => "エラー: <b>ユーザが選択されていません",
+"you can authenticate to other sites with this address" => "他のサイトにこのアドレスで認証することができます",
+"Authorized OpenID provider" => "認証されたOpenIDプロバイダ",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Wordpressのアドレス、Identi.ca、&hellip;"
+);
diff --git a/apps/user_openid/l10n/sl.php b/apps/user_openid/l10n/sl.php
index 72132cd637..0464214a42 100644
--- a/apps/user_openid/l10n/sl.php
+++ b/apps/user_openid/l10n/sl.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "This is an OpenID server endpoint. For more information, see " => "To je OpenID strežniška končna točka. Za več informacij si oglejte",
-"Identity: <b>" => "Istovetnost: <b>",
+"Identity: <b>" => "Identiteta: <b>",
+"Realm: <b>" => "Področje: <b>",
 "User: <b>" => "Uporabnik:",
 "Login" => "Prijava",
 "Error: <b>No user Selected" => "Napaka: <b>Uporabnik ni bil izbran",
 "you can authenticate to other sites with this address" => "s tem naslovom se lahko overite tudi na drugih straneh",
-"Authorized OpenID provider" => "Odobren OpenID ponudnik",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov na Wordpress, Identi.ca, &hellip;"
+"Authorized OpenID provider" => "Odobren ponudnik OpenID",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
 );
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 052edbcaa4..25b3d8aadc 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 2b79ab09cc..b026dc0230 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index b9c9e90a50..93e9885284 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index c76da91d86..5cfc246c8a 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 4db2c47811..e7a004a081 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 11:14+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "No s'ha pogut obtenir una adreça vàlida."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Error"
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat: "
@@ -811,11 +815,11 @@ msgstr "Configura les llibretes d'adreces"
 msgid "Select Address Books"
 msgstr "Selecccioneu llibretes d'adreces"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Escriviu un nom"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Escriviu una descripció"
 
diff --git a/l10n/cs_CZ/admin_migrate.po b/l10n/cs_CZ/admin_migrate.po
index c24913e070..a43f6e5be0 100644
--- a/l10n/cs_CZ/admin_migrate.po
+++ b/l10n/cs_CZ/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:35+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Export této instance ownCloud"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Bude vytvořen komprimovaný soubor obsahující data této instance ownCloud.⏎ Zvolte typ exportu:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Export"
diff --git a/l10n/cs_CZ/bookmarks.po b/l10n/cs_CZ/bookmarks.po
index 74239f80fa..a6d7d19a24 100644
--- a/l10n/cs_CZ/bookmarks.po
+++ b/l10n/cs_CZ/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:44+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Záložky"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "nepojmenovaný"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Přečíst později"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Název"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Tagy"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Uložit záložku"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Nemáte žádné záložky"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Záložky <br />"
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 0d3b986928..f06317221c 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:41+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "V paměti nejsou uloženy kompletně všechny kalendáře"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Zdá se, že vše je kompletně uloženo v paměti"
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
@@ -44,19 +44,19 @@ msgstr "Nesprávný kalendář"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Soubor, obsahující všechny záznamy nebo je prázdný, je již uložen ve Vašem kalendáři."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "Záznam byl uložen v novém kalendáři"
 
 #: ajax/import/import.php:56
 msgid "Import failed"
-msgstr ""
+msgstr "Import selhal"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "záznamů bylo uloženo ve Vašem kalendáři"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -161,7 +161,7 @@ msgstr "Pracovní"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "od"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -350,79 +350,79 @@ msgstr "Kal."
 
 #: templates/calendar.php:6
 msgid "Sun."
-msgstr ""
+msgstr "Ne"
 
 #: templates/calendar.php:6
 msgid "Mon."
-msgstr ""
+msgstr "Po"
 
 #: templates/calendar.php:6
 msgid "Tue."
-msgstr ""
+msgstr "Út"
 
 #: templates/calendar.php:6
 msgid "Wed."
-msgstr ""
+msgstr "St"
 
 #: templates/calendar.php:6
 msgid "Thu."
-msgstr ""
+msgstr "Čt"
 
 #: templates/calendar.php:6
 msgid "Fri."
-msgstr ""
+msgstr "Pá"
 
 #: templates/calendar.php:6
 msgid "Sat."
-msgstr ""
+msgstr "So"
 
 #: templates/calendar.php:8
 msgid "Jan."
-msgstr ""
+msgstr "Ne"
 
 #: templates/calendar.php:8
 msgid "Feb."
-msgstr ""
+msgstr "únor"
 
 #: templates/calendar.php:8
 msgid "Mar."
-msgstr ""
+msgstr "březen"
 
 #: templates/calendar.php:8
 msgid "Apr."
-msgstr ""
+msgstr "duben"
 
 #: templates/calendar.php:8
 msgid "May."
-msgstr ""
+msgstr "květen"
 
 #: templates/calendar.php:8
 msgid "Jun."
-msgstr ""
+msgstr "červen"
 
 #: templates/calendar.php:8
 msgid "Jul."
-msgstr ""
+msgstr "červenec"
 
 #: templates/calendar.php:8
 msgid "Aug."
-msgstr ""
+msgstr "srpen"
 
 #: templates/calendar.php:8
 msgid "Sep."
-msgstr ""
+msgstr "září"
 
 #: templates/calendar.php:8
 msgid "Oct."
-msgstr ""
+msgstr "říjen"
 
 #: templates/calendar.php:8
 msgid "Nov."
-msgstr ""
+msgstr "listopad"
 
 #: templates/calendar.php:8
 msgid "Dec."
-msgstr ""
+msgstr "prosinec"
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -479,7 +479,7 @@ msgstr "dnes"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -687,7 +687,7 @@ msgstr "Importovat soubor kalendáře"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
-msgstr ""
+msgstr "Vyberte prosím kalendář"
 
 #: templates/part.import.php:36
 msgid "Name of new calendar"
@@ -695,13 +695,13 @@ msgstr "Název nového kalendáře"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "Použijte volné jméno!"
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Kalendář s trímto názvem již existuje. Pokud název použijete, stejnojmenné kalendáře budou sloučeny."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -733,7 +733,7 @@ msgstr "v"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Hlavní"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -741,11 +741,11 @@ msgstr "Časové pásmo"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Obnovit auronaricky časovou zónu."
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Formát času"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -757,39 +757,39 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Týden začína v"
 
 #: templates/settings.php:76
 msgid "Cache"
-msgstr ""
+msgstr "Paměť"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Vymazat paměť pro opakuijísí se záznamy"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLs"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Kalendář CalDAV synchronizuje adresy"
 
 #: templates/settings.php:87
 msgid "more info"
-msgstr ""
+msgstr "podrobnosti"
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primární adresa (veřejná)"
 
 #: templates/settings.php:91
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
 
 #: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Odkaz(y) kalendáře pouze pro čtení"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 04e3220195..fefba5eec4 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "jméno elementu není nastaveno."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Nelze analyzovat kontakty"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -84,7 +84,7 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
 
 #: ajax/contact/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "Chyba během přidávání vlastností kontaktu:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -242,8 +242,8 @@ msgstr "Nelze získat platnou adresu."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
@@ -277,7 +277,7 @@ msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Chyba při otevírání obrázku profilu"
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -287,6 +287,10 @@ msgstr "Vybrat typ"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
+msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace."
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
 msgstr ""
 
 #: js/loader.js:49
@@ -303,11 +307,11 @@ msgstr "neimportováno."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Zobrazované jméno nemůže zůstat prázdné."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresář nenalezen:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -381,55 +385,55 @@ msgstr "Narozeniny"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Pracovní"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Volat"
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Klienti"
 
 #: lib/app.php:187
 msgid "Deliverer"
-msgstr ""
+msgstr "Dodavatel"
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Prázdniny"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Nápady"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Cestování"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Schůzka"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Ostatní"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Osobní"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projekty"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Dotazy"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -449,7 +453,7 @@ msgstr "Import"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -461,51 +465,51 @@ msgstr "Zavřít"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Klávesoví zkratky"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navigace"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Následující kontakt v seznamu"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Předchozí kontakt v seznamu"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Rozbalit/sbalit aktuální Adresář"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Následující Adresář"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Předchozí Adresář"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Akce"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Občerstvit seznam kontaktů"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Přidat kontakt"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Předat nový Adresář"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Odstranit aktuální kontakt"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -551,15 +555,15 @@ msgstr "Zadejte přezdívku"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Web"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Přejít na web"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -656,11 +660,11 @@ msgstr "PO box"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Ulice"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Ulice a číslo"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -668,7 +672,7 @@ msgstr "Rozšířené"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Byt číslo atd."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -681,7 +685,7 @@ msgstr "Kraj"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Např. stát nebo okres"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -689,7 +693,7 @@ msgstr "PSČ"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "PSČ"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -810,15 +814,15 @@ msgstr "Nastavit adresář"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Vybrat Adresář"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "Vložte jméno"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "Vložte popis"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -838,11 +842,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Zobrazit odklaz CardDAV:"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Zobrazit odkaz VCF pouze pro čtení"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -858,11 +862,11 @@ msgstr "Nový adresář"
 
 #: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Název"
 
 #: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #: templates/settings.php:43
 msgid "Save"
@@ -874,4 +878,4 @@ msgstr "Storno"
 
 #: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Více..."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index b168a2b7e1..ce5a00fe06 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:26+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr "Soubory"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Odsdílet"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "Vymazat"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "již existuje"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "zaměnit"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "storno"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "zaměněno"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "s"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "zpět"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "smazáno"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
@@ -113,27 +113,27 @@ msgstr "Nahrávání zrušeno"
 msgid "Invalid name, '/' is not allowed."
 msgstr "Špatné jméno, znak '/' není povolen"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "adresář"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "adresáře"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "soubor"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "soubory"
 
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 31ccf1b3f9..4055cc18fc 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:33+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Kryptování"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Při kryptování vynechat následující typy souborů"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Žádný"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Povolit kryptování"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 67d9a7179e..26ba61410b 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:38+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Vaše sdílené soubory"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Položka"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "Sdíleno s:"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Práva"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Číst"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Editovat"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Smazat"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Povolit další sdílení"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 15207fae02..cac58a2122 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:32+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Vypršení všech verzí"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Povolit verzování souborů"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index 08c9c2054b..f24db5838a 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -10,88 +10,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:30+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Obrázky"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Sdílet galerii"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Chyba: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Vnitřní chyba"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Nastavení"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Znovu prohledat"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Zastavit"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Sdílet"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Zpět"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Potvrzení odebrání"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Chcete odstranit album?"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Změnit název alba"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Název nového alba"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Přehrávání"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 2d67565ff5..f6c62f8803 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:24+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,96 +18,96 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Nápověda"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Osobní"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Aplikace"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Stahování ZIPu je vypnuto."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Soubory je nutno stahovat samostatně."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Zpět k souborům"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Vybarné soubory jsou pro vytvoření zipu příliš velké."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikace není povolena"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autorizace"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Realce expirovala. Obnovte prosím stranu."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "před vteřinami"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "před 1 minutou"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "před %d minutami"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "dnes"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "včera"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "před %d dny"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "minulý měsíc"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "před měsíci"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "loni"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 90e81ef9c8..39bf639f58 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:29+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nepodařílo se stáhnout seznam z App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -44,7 +44,7 @@ msgstr "Chybný dotaz"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autorizace"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -52,7 +52,7 @@ msgstr "Jazyk byl změněn"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,23 +72,23 @@ msgstr "Česky"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Bezpečnostní upozornění"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "spustit jednu úlohu s každou nataženou stranou"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je registrován jako služba webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "použijte systémovou službu cron"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -232,7 +232,7 @@ msgstr "Jiné"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/cs_CZ/user_migrate.po b/l10n/cs_CZ/user_migrate.po
index f3602dccae..74cee0cec4 100644
--- a/l10n/cs_CZ/user_migrate.po
+++ b/l10n/cs_CZ/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:51+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Export"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Během vytváření souboru exportu došlo k chybě"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Nastala chyba"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Export Vašeho uživatelského účtu"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Bude vytvořen komprimovaný soubor, obsahující Váš ownCloud účet."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Import uživatelského účtu"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip soubor uživatele ownCloud"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Import"
diff --git a/l10n/cs_CZ/user_openid.po b/l10n/cs_CZ/user_openid.po
index 14f4ed1354..f2fe13f334 100644
--- a/l10n/cs_CZ/user_openid.po
+++ b/l10n/cs_CZ/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:48+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Toto je OpenID server endpoint. Více informací na"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identita: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Oblast: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Uživatel: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Chyba: <b>Uživatel není zvolen"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "s touto adresou se můžete autrorizovat na další strany"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Autorizovaný OpenID poskytovatel"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Vaše adresa na Wordpressu, Identi.ca, &hellip;"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 7180b10c28..03723a7847 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr "Kunne ikke finde en gyldig adresse."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fejl"
 
@@ -291,6 +291,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -814,11 +818,11 @@ msgstr "Konfigurer adressebøger"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 2550ffd903..3948b8ecfb 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 20:22+0000\n"
-"Last-Translator: driz <driz@i2pmail.org>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -256,8 +256,8 @@ msgstr "Konnte keine gültige Adresse abrufen"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
@@ -303,6 +303,10 @@ msgid ""
 "them to be deleted."
 msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Ergebnis: "
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 548db19793..bb90299941 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -7,15 +7,16 @@
 # Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 #   <vagelis@cyberdest.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -245,8 +246,8 @@ msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -280,7 +281,7 @@ msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Σφάλμα στην φόρτωση εικόνας προφίλ."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -292,6 +293,10 @@ msgid ""
 "them to be deleted."
 msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Αποτέλεσμα: "
@@ -306,11 +311,11 @@ msgstr " απέτυχε."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Το όνομα προβολής δεν μπορεί να είναι κενό. "
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Το βιβλίο διευθύνσεων δεν βρέθηκε:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -484,11 +489,11 @@ msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου δι
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Επόμενο βιβλίο διευθύνσεων"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Προηγούμενο βιβλίο διευθύνσεων"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -815,11 +820,11 @@ msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
 msgid "Select Address Books"
 msgstr "Επέλεξε βιβλίο διευθύνσεων"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Εισαγωγή ονόματος"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Εισαγωγή περιγραφής"
 
@@ -841,11 +846,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Εμφάνιση συνδέσμου CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση"
 
 #: templates/settings.php:26
 msgid "Download"
diff --git a/l10n/eo/admin_dependencies_chk.po b/l10n/eo/admin_dependencies_chk.po
index be22a0e5e8..5fb88e68ae 100644
--- a/l10n/eo/admin_dependencies_chk.po
+++ b/l10n/eo/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:59+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "La modulo php-json necesas por komuniko inter la multaj aplikaĵoj"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "La modulo php-curl necesas por venigi la paĝotitolon dum aldono de legosigno"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "La modulo php-gd necesas por krei bildetojn."
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "La modulo php-ldap necesas por konekti al via LDAP-servilo."
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "La modulo php-zip necesas por elŝuti plurajn dosierojn per unu fojo."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "La modulo php-mb_multibyte necesas por ĝuste administri la kodprezenton."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "La modulo php-ctype necesas por validkontroli datumojn."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "La modulo php-xml necesas por kunhavigi dosierojn per WebDAV."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "La ordono allow_url_fopen de via php.ini devus valori 1 por ricevi scibazon el OCS-serviloj"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "La modulo php-pdo necesas por konservi datumojn de ownCloud en datumbazo."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Stato de dependoj"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Uzata de:"
diff --git a/l10n/eo/admin_migrate.po b/l10n/eo/admin_migrate.po
index ca3e132bd3..61384915c2 100644
--- a/l10n/eo/admin_migrate.po
+++ b/l10n/eo/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:32+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Malenporti ĉi tiun aperon de ownCloud"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Ĉi tio kreos densigitan dosieron, kiu enhavos la datumojn de ĉi tiu apero de ownCloud.\nBonvolu elekti la tipon de malenportado:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Malenporti"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7a635c7d61..5dd32cabbb 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Ne eblis ekhavi validan adreson."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Eraro"
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Rezulto: "
@@ -811,11 +815,11 @@ msgstr "Agordi adresarojn"
 msgid "Select Address Books"
 msgstr "Elektu adresarojn"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Enigu nomon"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Enigu priskribon"
 
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 3e173e196c..dbcedb1a56 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:41+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Ĉifrado"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Malinkluzivigi la jenajn dosiertipojn el ĉifrado"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Nenio"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Kapabligi ĉifradon"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 089953a728..11e4211e70 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Malena memorilo"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Surmetingo"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Motoro"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Agordo"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Malneproj"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Aplikebla"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Aldoni surmetingon"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nenio agordita"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Ĉiuj uzantoj"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupoj"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Uzantoj"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Forigi"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Radikaj SSL-atestoj"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Enporti radikan ateston"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Kapabligi malenan memorilon de uzanto"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index ba8f508b66..bab4de8df6 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:32+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Viaj kunhavigitaj dosieroj"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Ero"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "Kunhavigita kun"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Permesoj"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Legi"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Redakti"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Forigi"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Kapabligi rekunhavigon"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 0d6b7356f9..23851036ea 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:20+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Eksvalidigi ĉiujn eldonojn"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Kapabligi dosiereldonkontrolon"
diff --git a/l10n/eo/tasks.po b/l10n/eo/tasks.po
index a829a6ae23..9720107279 100644
--- a/l10n/eo/tasks.po
+++ b/l10n/eo/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:27+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,31 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Nevalida dato/horo"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Taskoj"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Neniu kategorio"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Nespecifita"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=plej alta"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=meza"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=plej malalta"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -51,15 +52,15 @@ msgstr ""
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Nevalida plenuma elcento"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Nevalida pligravo"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Aldoni taskon"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -71,15 +72,15 @@ msgstr ""
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Ordigi laŭ plenumo"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Ordigi laŭ loko"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Ordigi laŭ pligravo"
 
 #: templates/tasks.php:9
 msgid "Order Label"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Ŝargante taskojn..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Grava"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Pli"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Malpli"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Forigi"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 0a6274edd4..4167860d0e 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:54+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Gastigo"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Baz-DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -36,7 +37,7 @@ msgstr ""
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Uzanto-DN"
 
 #: templates/settings.php:10
 msgid ""
@@ -47,15 +48,15 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Pasvorto"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtrilo de uzantensaluto"
 
 #: templates/settings.php:12
 #, php-format
@@ -67,11 +68,11 @@ msgstr ""
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Filtrilo de uzantolisto"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
@@ -79,11 +80,11 @@ msgstr ""
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtrilo de grupo"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -91,19 +92,19 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Pordo"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Baza uzantarbo"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Baza gruparbo"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
@@ -111,11 +112,11 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Uzi TLS-on"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
 #: templates/settings.php:23
 msgid ""
@@ -133,32 +134,32 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ne rekomendata, uzu ĝin nur por testoj."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Kampo de vidignomo de uzanto"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Kampo de vidignomo de grupo"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "duumoke"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Helpo"
diff --git a/l10n/eo/user_migrate.po b/l10n/eo/user_migrate.po
index 079fff49c7..27ea6386b0 100644
--- a/l10n/eo/user_migrate.po
+++ b/l10n/eo/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:36+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Malenporti"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Io malsukcesis dum la enportota dosiero generiĝis"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Eraro okazis"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Malenporti vian uzantokonton"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Ĉi tio kreos densigitan dosieron, kiu enhavas vian konton de ownCloud."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Enporti uzantokonton"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ZIP-dosiero de uzanto de ownCloud"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Enporti"
diff --git a/l10n/eo/user_openid.po b/l10n/eo/user_openid.po
index b982103d35..237164674b 100644
--- a/l10n/eo/user_openid.po
+++ b/l10n/eo/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 21:05+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Ĉi tio estas finpunkto de OpenID-servilo. Por pli da informo, vidu"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Idento: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Regno: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Uzanto: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Ensaluti"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Eraro: <b>neniu uzanto estas elektita"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "Vi povas ensaluti en aliaj ejoj per tiu ĉi adreso"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Rajtigita OpenID-provizanto"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Via adreso ĉe Wordpress, Identi.ca&hellip;"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index d3ffeee5d3..ad0191c21f 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -245,8 +245,8 @@ msgstr "Fallo : no hay dirección valida"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fallo"
 
@@ -292,6 +292,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado :"
@@ -815,11 +819,11 @@ msgstr "Configurar agenda"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Introducir nombre"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Introducir descripción"
 
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 74db6a2d97..32a4a0173a 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Viga"
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Tulemus: "
@@ -810,11 +814,11 @@ msgstr "Seadista aadressiraamatuid"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index df6730af06..e5bd8a9638 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Ezin izan da eposta baliagarri bat hartu."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errorea"
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Emaitza:"
@@ -812,11 +816,11 @@ msgstr "Konfiguratu helbide liburuak"
 msgid "Select Address Books"
 msgstr "Hautatu helbide-liburuak"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Sartu izena"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Sartu deskribapena"
 
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index c0c80cfb38..96b07fd275 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 585d7ae6c2..9744c2460b 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr "Couldn't get a valid address."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "خطا"
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "نتیجه:"
@@ -810,11 +814,11 @@ msgstr "پیکربندی کتابچه ی نشانی ها"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index 537fe182c3..2030f4fc3c 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 35b090e46b..87156b512e 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Virhe"
 
@@ -290,6 +290,10 @@ msgid ""
 "them to be deleted."
 msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Tulos: "
@@ -813,11 +817,11 @@ msgstr "Muokkaa osoitekirjoja"
 msgid "Select Address Books"
 msgstr "Valitse osoitekirjat"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Anna nimi"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Anna kuvaus"
 
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 6680c0a183..87353de68a 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -250,8 +250,8 @@ msgstr "Impossible de trouver une adresse valide."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erreur"
 
@@ -285,7 +285,7 @@ msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fich
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Erreur pendant le chargement de la photo de profil."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -297,6 +297,10 @@ msgid ""
 "them to be deleted."
 msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Résultat :"
@@ -820,11 +824,11 @@ msgstr "Paramétrer carnet d'adresses"
 msgid "Select Address Books"
 msgstr "Choix du carnet d'adresses"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Saisissez le nom"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Saisissez une description"
 
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 609d951621..972682b6eb 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Non se puido obter un enderezo de correo válido."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado: "
@@ -811,11 +815,11 @@ msgstr "Configurar libretas de enderezos"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 95a5b199da..9660e8a9af 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -812,11 +816,11 @@ msgstr "הגדר ספרי כתובות"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 75ab0abdb2..8e1653696d 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 5c441e68be..dcbf9514b9 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr "Érvényes cím lekérése sikertelen"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hiba"
 
@@ -290,6 +290,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Eredmény: "
@@ -813,11 +817,11 @@ msgstr "Címlisták beállítása"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 582ad7d76f..1395ba92c2 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 5a436a7a25..fd0e67d2cd 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 3e58eff041..abc2bc17b1 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 2fec0e3728..f17c7177a9 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index b702f2eab3..21acc033d9 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 06:59+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr "Impossibile ottenere un indirizzo valido."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errore"
 
@@ -290,6 +290,10 @@ msgid ""
 "them to be deleted."
 msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Risultato: "
@@ -813,11 +817,11 @@ msgstr "Configura rubriche"
 msgid "Select Address Books"
 msgstr "Seleziona rubriche"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Inserisci il nome"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Inserisci una descrizione"
 
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index ffb62b14fe..c2e3c68a49 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 12:10+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 07:12+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -48,8 +48,8 @@ msgstr "Eliminazione"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Abilita ri-condivisione"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
index 829120fa8a..2ff1d63033 100644
--- a/l10n/it/tasks.po
+++ b/l10n/it/tasks.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 12:07+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 07:08+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "9=minima"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Riepilogo vuoto"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
@@ -96,11 +96,11 @@ msgstr "Importante"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Più"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Meno"
 
 #: templates/tasks.php:29
 msgid "Delete"
diff --git a/l10n/ja_JP/admin_dependencies_chk.po b/l10n/ja_JP/admin_dependencies_chk.po
index 1d928c91bd..be8f217eba 100644
--- a/l10n/ja_JP/admin_dependencies_chk.po
+++ b/l10n/ja_JP/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:08+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "php-jsonモジュールはアプリケーション間の内部通信に必要です"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "php-curlモジュールはブックマーク追加時のページタイトル取得に必要です"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "php-gdモジュールはサムネイル画像の生成に必要です"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "php-ldapモジュールはLDAPサーバへの接続に必要です"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "php-zipモジュールは複数ファイルの同時ダウンロードに必要です"
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "php-mb_multibyteモジュールはエンコードを正しく扱うために必要です"
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "php-ctypeモジュールはデータのバリデーションに必要です"
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "php-xmlモジュールはWebDAVでのファイル共有に必要です"
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "php.iniのallow_url_fopenはOCSサーバから知識ベースを取得するために1に設定しなくてはなりません"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "php-pdoモジュールはデータベースにownCloudのデータを格納するために必要です"
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "依存関係の状況"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "利用先 :"
diff --git a/l10n/ja_JP/admin_migrate.po b/l10n/ja_JP/admin_migrate.po
index b0603a4f42..bfc0b807e0 100644
--- a/l10n/ja_JP/admin_migrate.po
+++ b/l10n/ja_JP/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:48+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "このownCloudをエクスポート"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "このownCloudのデータを含む圧縮形式のファイルを生成します。\nエクスポートのタイプを選択してください:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "エクスポート"
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 90254140d2..c62d4af454 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 01:51+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,7 +160,7 @@ msgstr "週の始まり"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "による"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -477,7 +478,7 @@ msgstr "今日"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -731,7 +732,7 @@ msgstr "at"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -739,11 +740,11 @@ msgstr "タイムゾーン"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "自動的にタイムゾーンを更新"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "時刻の表示形式"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -755,7 +756,7 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "1週間の初めの曜日"
 
 #: templates/settings.php:76
 msgid "Cache"
@@ -767,7 +768,7 @@ msgstr "イベントを繰り返すためにキャッシュをクリアしてく
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URL"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1643d768f3..a672019929 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +241,8 @@ msgstr "有効なアドレスを取得できませんでした。"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "エラー"
 
@@ -275,7 +276,7 @@ msgstr "アップロードしようとしているファイルは、このサー
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "プロファイルの画像の読み込みエラー"
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -285,6 +286,10 @@ msgstr "タイプを選択"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
+msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
 msgstr ""
 
 #: js/loader.js:49
@@ -527,7 +532,7 @@ msgstr "ownCloudから写真を選択"
 
 #: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順"
 
 #: templates/part.contact.php:36
 msgid "Edit name details"
@@ -700,7 +705,7 @@ msgstr "アドレスブック"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "敬称"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
@@ -740,7 +745,7 @@ msgstr "姓"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr "ストレージへの連絡先のアップロードエラー。"
+msgstr "称号"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
@@ -810,11 +815,11 @@ msgstr "アドレス帳を設定"
 msgid "Select Address Books"
 msgstr "連絡先を洗濯してください"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "名前を入力"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "説明を入力してください"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 5cf8f5a4c0..c9941a81c9 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:43+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "暗号化"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "暗号化から除外するファイルタイプ"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "なし"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "暗号化を有効にする"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 6096d9408f..1de6cdac43 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:46+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "外部ストレージ"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "マウントポイント"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "バックエンド"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "設定"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "オプション"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "適用範囲"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "マウントポイントを追加"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "未設定"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "すべてのユーザ"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "削除"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSLルート証明書"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "ルート証明書をインポート"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "ユーザの外部ストレージを有効にする"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "ユーザに外部ストレージのマウントを許可する"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index fcadb4bdc9..fb178df41c 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:58+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "共有ファイル"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "項目"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "で共有 "
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "許可"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "読込"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "編集"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "削除"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "再共有を有効にする"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "所有者でないファイルの共有を許可する"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index e61c39bff4..893e07db20 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:41+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "すべてのバージョンを削除する"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "ファイルのバージョン管理を有効にする"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 79aec21152..9964db29fa 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 01:55+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,19 +73,19 @@ msgstr "セキュリティ警告"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "cron(自動定期実行)"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ページを開く毎にタスクを1つ実行"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.phpをwebcronサービスに登録しました"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "システムのcronサービスを使用"
 
 #: templates/admin.php:39
 msgid "Log"
diff --git a/l10n/ja_JP/tasks.po b/l10n/ja_JP/tasks.po
index fdd063c3ca..13b0423ca1 100644
--- a/l10n/ja_JP/tasks.po
+++ b/l10n/ja_JP/tasks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:40+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +21,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "無効な日付／時刻"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "タスク"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "カテゴリ無し"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "未指定"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=高"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=中"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=低"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "要旨が未記入"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "進捗％が不正"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "無効な優先度"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "タスクを追加"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "期日で並べ替え"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "リストで並び替え"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "完了で並べ替え"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "場所で並べ替え"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "優先度で並べ替え"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "ラベルで並べ替え"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "タスクをロード中..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "重要"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "詳細"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "閉じる"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "削除"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index d19e9c5dd8..109dcef89f 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:21+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +21,146 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "ホスト"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "ベースDN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "ユーザDN"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "パスワード"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "ユーザログインフィルタ"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "ユーザリストフィルタ"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "グループフィルタ"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "グループを取得するときに適用するフィルターを定義する。"
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "ポート"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "ベースユーザツリー"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "ベースグループツリー"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "グループとメンバーの関連付け"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "TLSを利用"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "SSL接続に利用しないでください、失敗します。"
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "SSL証明書の確認を無効にする。"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "推奨しません、テスト目的でのみ利用してください。"
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "ユーザ名の表示に利用するフィールド"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "グループ名の表示に利用するフィールド"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "グループのownCloud名の生成に利用するLDAP属性。"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "バイト"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "秒。変更後にキャッシュがクリアされます。"
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "ヘルプ"
diff --git a/l10n/ja_JP/user_migrate.po b/l10n/ja_JP/user_migrate.po
index 04d95df0be..a9ccee0222 100644
--- a/l10n/ja_JP/user_migrate.po
+++ b/l10n/ja_JP/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:59+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "エクスポート"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "エクスポートファイルの生成時に何か不具合が発生しました。"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "エラーが発生しました"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "あなたのユーザアカウントをエクスポート"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "あなたのownCloudアカウントを含む圧縮形式のファイルを生成します。"
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "ユーザアカウントをインポート"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ownCloudユーザZip"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "インポート"
diff --git a/l10n/ja_JP/user_openid.po b/l10n/ja_JP/user_openid.po
index 877dc59cdf..5fe4094e68 100644
--- a/l10n/ja_JP/user_openid.po
+++ b/l10n/ja_JP/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 06:36+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "これはOpenIDサーバのエンドポイントです。詳細は下記をチェックしてください。"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "識別子: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "レルム: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "ユーザ: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "ログイン"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "エラー: <b>ユーザが選択されていません"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "他のサイトにこのアドレスで認証することができます"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "認証されたOpenIDプロバイダ"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Wordpressのアドレス、Identi.ca、&hellip;"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 5ade5e1187..2854ac2065 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "유효한 주소를 얻을 수 없습니다."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "오류"
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "결과:"
@@ -811,11 +815,11 @@ msgstr "주소록 구성"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index e2d248e453..472a09280c 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat: "
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 04921869c8..8f89a72756 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 18a053d129..f9b6c5143e 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 421574eb07..50c48cac5c 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Не можев да добијам исправна адреса."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Грешка"
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Резултат: "
@@ -811,11 +815,11 @@ msgstr "Уреди адресари"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index a5435b96a5..625f969556 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr "Tidak boleh mendapat alamat yang sah."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ralat"
 
@@ -291,6 +291,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Hasil: "
@@ -814,11 +818,11 @@ msgstr "Konfigurasi buku alamat"
 msgid "Select Address Books"
 msgstr "Pilih Buku Alamat"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Masukkan nama"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Masukkan keterangan"
 
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index ea159661fe..9472cf35d1 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Feil"
 
@@ -290,6 +290,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -813,11 +817,11 @@ msgstr "Konfigurer adressebøker"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 695acef5f6..b2c16170f6 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -291,6 +291,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -814,11 +818,11 @@ msgstr "Bewerken adresboeken"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index e9742c79bc..a3933bcc26 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 04c9ce97a2..598cdb30af 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr "Nie można pobrać prawidłowego adresu."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Błąd"
 
@@ -290,6 +290,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Wynik: "
@@ -813,11 +817,11 @@ msgstr "Konfiguruj książkę adresową"
 msgid "Select Address Books"
 msgstr "Wybierz książki adresowe"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Wpisz nazwę"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Wprowadź opis"
 
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index e0aa5a97bd..650f1c397f 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Não foi possível obter um endereço válido."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado:"
@@ -812,11 +816,11 @@ msgstr "Configurar agenda de endereços"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 964dae2196..6523b65a6c 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Não foi possível obter um endereço válido."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado: "
@@ -812,11 +816,11 @@ msgstr "Configurar livros de endereços"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 0881e6a3b5..e3d9e31c1e 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -812,11 +816,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 4c7214c485..a38d426bf5 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -246,8 +246,8 @@ msgstr "Не удалось получить адрес."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ошибка"
 
@@ -293,6 +293,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Результат:"
@@ -816,11 +820,11 @@ msgstr "Настроить адресную книгу"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index ef45c76a92..c80dd48769 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Nemôžem získať platnú adresu."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Výsledok: "
@@ -812,11 +816,11 @@ msgstr "Nastaviť adresáre"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Zadaj meno"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/sl/admin_dependencies_chk.po b/l10n/sl/admin_dependencies_chk.po
index 0dc3432799..f08053b289 100644
--- a/l10n/sl/admin_dependencies_chk.po
+++ b/l10n/sl/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:23+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Modul php-json je potrebem"
 
 #: settings.php:39
 msgid ""
@@ -66,8 +67,8 @@ msgstr ""
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Stanje odvisnosti"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Uporablja:"
diff --git a/l10n/sl/admin_migrate.po b/l10n/sl/admin_migrate.po
index e4aec295fb..5a600890b7 100644
--- a/l10n/sl/admin_migrate.po
+++ b/l10n/sl/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:17+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Izvozi to ownCloud namestitev"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Ustvarjena bo stisnjena datoteka s podatki te ownCloud namestitve.\n            Prosimo, če izberete vrsto izvoza:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Izvozi"
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index b1792961b6..8d2ba48009 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 13:25+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Vsi koledarji niso povsem predpomnjeni"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Izgleda, da je vse v predpomnilniku"
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
@@ -45,19 +45,19 @@ msgstr "Napačen koledar"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Datoteka ni vsebovala dogodkov ali pa so vsi dogodki že shranjeni v koledarju."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "dogodki so bili shranjeni v nov koledar"
 
 #: ajax/import/import.php:56
 msgid "Import failed"
-msgstr ""
+msgstr "Uvoz je spodletel"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "dogodki so bili shranjeni v vaš koledar"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -162,7 +162,7 @@ msgstr "Delo"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "od"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -351,79 +351,79 @@ msgstr "Kol."
 
 #: templates/calendar.php:6
 msgid "Sun."
-msgstr ""
+msgstr "ned."
 
 #: templates/calendar.php:6
 msgid "Mon."
-msgstr ""
+msgstr "pon."
 
 #: templates/calendar.php:6
 msgid "Tue."
-msgstr ""
+msgstr "tor."
 
 #: templates/calendar.php:6
 msgid "Wed."
-msgstr ""
+msgstr "sre."
 
 #: templates/calendar.php:6
 msgid "Thu."
-msgstr ""
+msgstr "čet."
 
 #: templates/calendar.php:6
 msgid "Fri."
-msgstr ""
+msgstr "pet."
 
 #: templates/calendar.php:6
 msgid "Sat."
-msgstr ""
+msgstr "sob."
 
 #: templates/calendar.php:8
 msgid "Jan."
-msgstr ""
+msgstr "jan."
 
 #: templates/calendar.php:8
 msgid "Feb."
-msgstr ""
+msgstr "feb."
 
 #: templates/calendar.php:8
 msgid "Mar."
-msgstr ""
+msgstr "mar."
 
 #: templates/calendar.php:8
 msgid "Apr."
-msgstr ""
+msgstr "apr."
 
 #: templates/calendar.php:8
 msgid "May."
-msgstr ""
+msgstr "maj"
 
 #: templates/calendar.php:8
 msgid "Jun."
-msgstr ""
+msgstr "jun."
 
 #: templates/calendar.php:8
 msgid "Jul."
-msgstr ""
+msgstr "jul."
 
 #: templates/calendar.php:8
 msgid "Aug."
-msgstr ""
+msgstr "avg."
 
 #: templates/calendar.php:8
 msgid "Sep."
-msgstr ""
+msgstr "sep."
 
 #: templates/calendar.php:8
 msgid "Oct."
-msgstr ""
+msgstr "okt."
 
 #: templates/calendar.php:8
 msgid "Nov."
-msgstr ""
+msgstr "nov."
 
 #: templates/calendar.php:8
 msgid "Dec."
-msgstr ""
+msgstr "dec."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -480,7 +480,7 @@ msgstr "Danes"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -688,7 +688,7 @@ msgstr "Uvozi datoteko koledarja"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
-msgstr ""
+msgstr "Prosimo, če izberete koledar"
 
 #: templates/part.import.php:36
 msgid "Name of new calendar"
@@ -696,13 +696,13 @@ msgstr "Ime novega koledarja"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "Izberite prosto ime!"
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Koledar s tem imenom že obstaja. Če nadaljujete, bosta koledarja združena."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -734,7 +734,7 @@ msgstr "pri"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Splošno"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -742,11 +742,11 @@ msgstr "Časovni pas"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Samodejno posodobi časovni pas"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Oblika zapisa časa"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -758,39 +758,39 @@ msgstr "12ur"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Začni teden z"
 
 #: templates/settings.php:76
 msgid "Cache"
-msgstr ""
+msgstr "Predpomnilnik"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Počisti predpomnilnik za ponavljajoče dogodke"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLji"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "CalDAV naslov za usklajevanje koledarjev"
 
 #: templates/settings.php:87
 msgid "more info"
-msgstr ""
+msgstr "dodatne informacije"
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Glavni naslov (Kontakt et al)"
 
 #: templates/settings.php:91
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
 
 #: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "iCalendar povezava/e samo za branje"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 765e127a41..52c49881a1 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "ime elementa ni nastavljeno."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ne morem razčleniti stika:"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -84,7 +84,7 @@ msgstr "Poskušam dodati podvojeno lastnost:"
 
 #: ajax/contact/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "Napaka pri dodajanju lastnosti stiku:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -242,8 +242,8 @@ msgstr "Ne morem dobiti veljavnega naslova."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Napaka"
 
@@ -277,7 +277,7 @@ msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno veliko
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Napaka pri nalaganju slike profila."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -287,6 +287,10 @@ msgstr "Izberite vrsto"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
+msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
 msgstr ""
 
 #: js/loader.js:49
@@ -303,11 +307,11 @@ msgstr " je spodletelo."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Ime za prikaz ne more biti prazno."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresar ni bil najden:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -381,55 +385,55 @@ msgstr "Rojstni dan"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Poslovno"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Klic"
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Stranka"
 
 #: lib/app.php:187
 msgid "Deliverer"
-msgstr ""
+msgstr "Dostavljalec"
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Prazniki"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Ideje"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Potovanje"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubilej"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Sestanek"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Drugo"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Osebno"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projekti"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Vprašanja"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -449,7 +453,7 @@ msgstr "Uvozi"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -461,51 +465,51 @@ msgstr "Zapri"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Bližnjice na tipkovnici"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Krmarjenje"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Naslednji stik na seznamu"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Predhodni stik na seznamu"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Razširi/skrči trenutni adresar"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Naslednji adresar"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Predhodni adresar"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Dejanja"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Osveži seznam stikov"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Dodaj nov stik"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Dodaj nov adresar"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Izbriši trenutni stik"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -551,15 +555,15 @@ msgstr "Vnesite vzdevek"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Spletna stran"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.nekastran.si"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Pojdi na spletno stran"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -656,11 +660,11 @@ msgstr "Poštni predal"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Ulični naslov"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Ulica in štelika"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -668,7 +672,7 @@ msgstr "Razširjeno"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Številka stanovanja itd."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -681,7 +685,7 @@ msgstr "Regija"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Npr. dežela ali pokrajina"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -689,7 +693,7 @@ msgstr "Poštna št."
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Poštna številka"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -810,15 +814,15 @@ msgstr "Nastavi imenike"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Izberite adresarje"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "Vnesite ime"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "Vnesite opis"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -838,11 +842,11 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Pokaži CardDav povezavo"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Pokaži VCF povezavo samo za branje"
 
 #: templates/settings.php:26
 msgid "Download"
@@ -858,11 +862,11 @@ msgstr "Nov imenik"
 
 #: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #: templates/settings.php:43
 msgid "Save"
@@ -874,4 +878,4 @@ msgstr "Prekliči"
 
 #: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Več..."
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index ee97cf3b74..294eea91d1 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:19+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Šifriranje"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Naslednje vrste datotek naj se ne šifrirajo"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Brez"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Omogoči šifriranje"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index b43660a42e..19d395b99d 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-15 00:03+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:14+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,35 +20,35 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Zunanja podatkovna shramba"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Priklopna točka"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Zaledje"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Nastavitve"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Možnosti"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Se uporablja"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Dodaj priklopno točko"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Ni nastavljeno"
 
 #: templates/settings.php:63
 msgid "All Users"
@@ -76,8 +76,8 @@ msgstr "Uvozi korenski certifikat"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr "Omogoči"
+msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 29a2310e26..5e6bbbb485 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:25+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Zastaraj vse različice"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Omogoči sledenje različicam datotek"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index fb1e393186..305737e78c 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 02:09+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:37+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Pomoč"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Osebno"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Uporabniki"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Aplikacije"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Skrbnik"
 
@@ -72,7 +72,7 @@ msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekundami"
 
 #: template.php:87
 msgid "1 minute ago"
@@ -102,7 +102,7 @@ msgstr "prejšnji mesec"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "meseci"
 
 #: template.php:96
 msgid "last year"
@@ -110,4 +110,4 @@ msgstr "lani"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "leti"
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
index 484d5c1f72..6f77b49256 100644
--- a/l10n/sl/tasks.po
+++ b/l10n/sl/tasks.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:45+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 15:38+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr "Prazen povzetek"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Neveljaven odstotek dokončanja"
 
 #: lib/app.php:107
 msgid "Invalid priority"
@@ -88,11 +88,11 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Nalagam opravila..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Pomembno"
 
 #: templates/tasks.php:23
 msgid "More"
@@ -104,4 +104,4 @@ msgstr "Manj"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Izbriši"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index b46b9b6797..e2b81635c5 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 15:42+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Gostitelj"
 
 #: templates/settings.php:8
 msgid ""
@@ -28,15 +29,15 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Osnovni DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Uporabnik DN"
 
 #: templates/settings.php:10
 msgid ""
@@ -47,11 +48,11 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Geslo"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Za anonimni dostop pustite polji za DN in geslo prazni."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Vrata"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,11 +112,11 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Uporabi TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Onemogoči potrditev veljavnosti SSL certifikata."
 
 #: templates/settings.php:23
 msgid ""
@@ -153,7 +154,7 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "v bajtih"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
@@ -161,4 +162,4 @@ msgstr ""
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Pomoč"
diff --git a/l10n/sl/user_openid.po b/l10n/sl/user_openid.po
index 62302b6911..38b1064849 100644
--- a/l10n/sl/user_openid.po
+++ b/l10n/sl/user_openid.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:13+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:29+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr "To je OpenID strežniška končna točka. Za več informacij si oglejte"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr "Istovetnost: <b>"
+msgstr "Identiteta: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Področje: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
@@ -48,8 +48,8 @@ msgstr "s tem naslovom se lahko overite tudi na drugih straneh"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr "Odobren OpenID ponudnik"
+msgstr "Odobren ponudnik OpenID"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr "Vaš naslov na Wordpress, Identi.ca, &hellip;"
+msgstr "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 48bc4a90b1..eb28790891 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 87d87ab2e5..db92cfe5b3 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 25c7058c75..e729393237 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index ec6bc7bdca..bf01e365f7 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,7 +83,7 @@ msgstr "Minst ett fält måste fyllas i."
 
 #: ajax/contact/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Försöker lägga till dubblett:"
 
 #: ajax/contact/addproperty.php:144
 msgid "Error adding contact property: "
@@ -245,8 +245,8 @@ msgstr "Kunde inte hitta en giltig adress."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fel"
 
@@ -280,7 +280,7 @@ msgstr "Filen du försöker ladda upp är större än den maximala storleken fö
 
 #: js/contacts.js:1236
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Fel vid hämtning av profilbild."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -292,6 +292,10 @@ msgid ""
 "them to be deleted."
 msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -815,11 +819,11 @@ msgstr "Anpassa adressböcker."
 msgid "Select Address Books"
 msgstr "Välj adressböcker"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Ange namn"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Ange beskrivning"
 
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 7ebf04e55c..8472f3c85e 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index e905c22f86..ac6f293833 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index b96ce9f1e7..dea5e32df8 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 751969a0bf..28e860b0a0 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 92d0ca5fc1..d96ef4d6ec 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 99b041e1c8..d0746ae188 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 26f5eacee8..e7daa79da3 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index a463731bf9..dca7c8a90e 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 0674e0b95d..7faee54532 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c74bc72d36..1c0459cba9 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 7a68a39a41..774fdabb75 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index e77e777229..abc1a902c5 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 97bbaa8645..98a71ea9fa 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index fb5d0a755d..f74f546c3a 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index b0ea4703cc..5cff99d6d6 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index b23ae36239..7a11e25c67 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f554a64978..8c5e5376a1 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 0367e1a634..82982f7d3a 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 211f8054b1..03e646ee42 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 88f3f467d4..ac7e298b07 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 14:39+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "ไม่สามารถดึงที่อยู่ที่ถู
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "ผลลัพธ์: "
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 79c0485edd..bcf5ad88c3 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Geçerli bir adres alınamadı."
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hata"
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Sonuç: "
@@ -812,11 +816,11 @@ msgstr "Adres defterini yapılandır"
 msgid "Select Address Books"
 msgstr "Adres deftelerini seçiniz"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "İsim giriniz"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Tanım giriniz"
 
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 3cb6c2aa24..a9c12c6def 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 3568844e5b..5533bf5bc5 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -287,6 +287,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
index 8a348956c1..fc13248c05 100644
--- a/l10n/zh_CN.GB2312/contacts.po
+++ b/l10n/zh_CN.GB2312/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -286,6 +286,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 0c73f885ca..f863dd7a04 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "无法获取一个合法的地址。"
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "错误"
 
@@ -289,6 +289,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "结果: "
@@ -812,11 +816,11 @@ msgstr "配置地址簿"
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index d3df1f2810..98be89a161 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
 #: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
 #: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
 #: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
@@ -288,6 +288,10 @@ msgid ""
 "them to be deleted."
 msgstr ""
 
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
new file mode 100644
index 0000000000..933dbe541f
--- /dev/null
+++ b/lib/l10n/cs_CZ.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Nápověda",
+"Personal" => "Osobní",
+"Settings" => "Nastavení",
+"Users" => "Uživatelé",
+"Apps" => "Aplikace",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Stahování ZIPu je vypnuto.",
+"Files need to be downloaded one by one." => "Soubory je nutno stahovat samostatně.",
+"Back to Files" => "Zpět k souborům",
+"Selected files too large to generate zip file." => "Vybarné soubory jsou pro vytvoření zipu příliš velké.",
+"Application is not enabled" => "Aplikace není povolena",
+"Authentication error" => "Chyba autorizace",
+"Token expired. Please reload page." => "Realce expirovala. Obnovte prosím stranu.",
+"seconds ago" => "před vteřinami",
+"1 minute ago" => "před 1 minutou",
+"%d minutes ago" => "před %d minutami",
+"today" => "dnes",
+"yesterday" => "včera",
+"%d days ago" => "před %d dny",
+"last month" => "minulý měsíc",
+"months ago" => "před měsíci",
+"last year" => "loni",
+"years ago" => "před lety"
+);
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 7889335d97..cec9945b1b 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -12,11 +12,14 @@
 "Application is not enabled" => "Aplikacija ni omogočena",
 "Authentication error" => "Napaka overitve",
 "Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
+"seconds ago" => "sekundami",
 "1 minute ago" => "pred minuto",
 "%d minutes ago" => "pred %d minutami",
 "today" => "danes",
 "yesterday" => "včeraj",
 "%d days ago" => "pred %d dnevi",
 "last month" => "prejšnji mesec",
-"last year" => "lani"
+"months ago" => "meseci",
+"last year" => "lani",
+"years ago" => "leti"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index d71ae497d3..d344b49ced 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nepodařílo se stáhnout seznam z App Store",
 "Email saved" => "E-mail uložen",
 "Invalid email" => "Neplatný e-mail",
 "OpenID Changed" => "OpenID změněn",
 "Invalid request" => "Chybný dotaz",
+"Authentication error" => "Chyba autorizace",
 "Language changed" => "Jazyk byl změněn",
+"Error" => "Chyba",
 "Disable" => "Vypnout",
 "Enable" => "Zapnout",
 "Saving..." => "Ukládám...",
 "__language_name__" => "Česky",
+"Security Warning" => "Bezpečnostní upozornění",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "spustit jednu úlohu s každou nataženou stranou",
+"cron.php is registered at a webcron service" => "cron.php je registrován jako služba webcron",
+"use systems cron service" => "použijte systémovou službu cron",
 "Log" => "Log",
 "More" => "Více",
 "Add your App" => "Přidat vaší aplikaci",
@@ -43,6 +51,7 @@
 "Create" => "Vytvořit",
 "Default Quota" => "Výchozí kvóta",
 "Other" => "Jiné",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Kvóta",
 "Delete" => "Vymazat"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index ae1ebaf991..2e157ea4c5 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -12,6 +12,10 @@
 "Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
 "Security Warning" => "セキュリティ警告",
+"Cron" => "cron(自動定期実行)",
+"execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
+"cron.php is registered at a webcron service" => "cron.phpをwebcronサービスに登録しました",
+"use systems cron service" => "システムのcronサービスを使用",
 "Log" => "ログ",
 "More" => "もっと",
 "Add your App" => "アプリを追加",

From df8a2e5361714838637457373f9957c76fbf449f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 16 Aug 2012 12:20:14 -0400
Subject: [PATCH 1460/1537] File sharing cleanup, works perfectly I think :)

---
 apps/files_sharing/lib/share/file.php   | 91 +++++++++++--------------
 apps/files_sharing/lib/share/folder.php | 73 ++++++++------------
 apps/files_sharing/sharedstorage.php    | 26 +++----
 core/js/share.js                        |  1 -
 lib/files.php                           |  4 +-
 lib/public/share.php                    | 29 +++++---
 tests/lib/share/share.php               |  8 +++
 7 files changed, 111 insertions(+), 121 deletions(-)

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 66be5f2b15..ae6315600f 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -27,10 +27,10 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_OPENDIR = 3;
 
 	public function isValidSource($item, $uid) {
-// 		if (OC_Filesystem::file_exists($item)) {
+		if (OC_Filesystem::file_exists($item)) {
 			return true;
-// 		}
-// 		return false;
+		}
+		return false;
 	}
 
 	public function getFilePath($item, $uid) {
@@ -43,61 +43,48 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
-		if ($format == self::FORMAT_OPENDIR) {
+		if ($format == self::FORMAT_SHARED_STORAGE) {
+			// Only 1 item should come through for this format call
+			return array('path' => $items[key($items)]['file_source'], 'permissions' => $items[key($items)]['permissions']);
+		} else if ($format == self::FORMAT_FILE_APP) {
 			$files = array();
-			foreach ($items as $file) {
-				$files[] = basename($file['file_target']);
+			foreach ($items as $item) {
+				$file = array();
+				$file['path'] = $item['file_target'];
+				$file['name'] = basename($item['file_target']);
+				$file['ctime'] = $item['ctime'];
+				$file['mtime'] = $item['mtime'];
+				$file['mimetype'] = $item['mimetype'];
+				$file['size'] = $item['size'];
+				$file['encrypted'] = $item['encrypted'];
+				$file['versioned'] = $item['versioned'];
+				$file['directory'] = $parameters['folder'];
+				$file['type'] = ($item['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
+				$file['permissions'] = $item['permissions'];
+				if ($file['type'] == 'file') {
+					// Remove Create permission if type is file
+					$file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
+				}
+				$files[] = $file;
 			}
 			return $files;
-		} else if ($format == self::FORMAT_SHARED_STORAGE) {
-			$id = $items[key($items)]['file_source'];
-			$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id = ?');
-			$result = $query->execute(array($id))->fetchAll();
-			if (isset($result[0]['path'])) {
-				return array('path' => $result[0]['path'], 'permissions' => $items[key($items)]['permissions']);
-			}
-			return false;
-		} else {
-			$shares = array();
-			$ids = array();
+		} else if ($format == self::FORMAT_FILE_APP_ROOT) {
+			$mtime = 0;
+			$size = 0;
 			foreach ($items as $item) {
-				$shares[$item['file_source']] = $item;
-				$ids[] = $item['file_source'];
-			}
-			$ids = "'".implode("','", $ids)."'";
-			if ($format == self::FORMAT_FILE_APP) {
-				$query = OCP\DB::prepare('SELECT id, path, name, ctime, mtime, mimetype, size, encrypted, versioned, writable FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
-				$result = $query->execute();
-				$files = array();
-				while ($file = $result->fetchRow()) {
-					// Set target path
-					$file['path'] = $shares[$file['id']]['file_target'];
-					$file['name'] = basename($file['path']);
-					$file['directory'] = $parameters['folder'];
-					$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
-					$permissions = $shares[$file['id']]['permissions'];
-					if ($file['type'] == 'file') {
-						// Remove Create permission if type is file
-						$permissions &= ~OCP\Share::PERMISSION_CREATE;
-					}
-					$file['permissions'] = $permissions;
-					$files[] = $file;
+				if ($item['mtime'] > $mtime) {
+					$mtime = $item['mtime'];
 				}
-				return $files;
-			} else if ($format == self::FORMAT_FILE_APP_ROOT) {
-				$query = OCP\DB::prepare('SELECT id, path, name, ctime, mtime, mimetype, size, encrypted, versioned, writable FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
-				$result = $query->execute();
-				$mtime = 0;
-				$size = 0;
-				while ($file = $result->fetchRow()) {
-					if ($file['mtime'] > $mtime) {
-						$mtime = $file['mtime'];
-					}
-					$size += $file['size'];
-				}
-				return array(0 => array('name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\Share::PERMISSION_READ));
+				$size += $item['size'];
 			}
-		}
+			return array(0 => array('name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\Share::PERMISSION_READ));
+		} else if ($format == self::FORMAT_OPENDIR) {
+			$files = array();
+			foreach ($items as $item) {
+				$files[] = basename($item['file_target']);
+			}
+			return $files;
+		} 
 		return array();
 	}
 
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 2f101d33c8..b6db96614f 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -21,8 +21,32 @@
 
 class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 
-	public function inCollection($collections, $item) {
-		// TODO
+	public function formatItems($items, $format, $parameters = null) {
+		if ($format == self::FORMAT_SHARED_STORAGE) {
+			// Only 1 item should come through for this format call
+			return array('path' => $items[key($items)]['file_source'], 'permissions' => $items[key($items)]['permissions']);
+		} else if ($format == self::FORMAT_FILE_APP && isset($parameters['folder'])) {
+			// Only 1 item should come through for this format call
+			$folder = $items[key($items)];
+			if (isset($parameters['mimetype_filter'])) {
+				$mimetype_filter = $parameters['mimetype_filter'];
+			} else {
+				$mimetype_filter = '';
+			}
+			$path = $folder['file_source'].substr($parameters['folder'], 7 + strlen($folder['file_target']));
+			$files = OC_FileCache::getFolderContent($path, '', $mimetype_filter);
+			foreach ($files as &$file) {
+				$file['directory'] = $parameters['folder'];
+				$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
+				$file['permissions'] = $folder['permissions'];
+				if ($file['type'] == 'file') {
+					// Remove Create permission if type is file
+					$file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
+				}
+			}
+			return $files;
+		}
+		return array();
 	}
 
 	public function getChildren($itemSource) {
@@ -34,47 +58,4 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 		return $sources;
 	}
 
-	public function formatItems($items, $format, $parameters = null) {
-		if ($format == self::FORMAT_FILE_APP && isset($parameters['folder'])) {
-			$folder = $items[key($items)];
-			$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id = ?');
-			$result = $query->execute(array($folder['file_source']))->fetchRow();
-			if (isset($result['path'])) {
-				if (isset($parameters['mimetype_filter'])) {
-					$mimetype_filter = $parameters['mimetype_filter'];
-				} else {
-					$mimetype_filter = '';
-				}
-				$pos = strpos($result['path'], $folder['item']);
-				$path = substr($result['path'], $pos).substr($parameters['folder'], strlen($folder['file_target']));
-				$root = substr($result['path'], 0, $pos);
-				$files = OC_FileCache::getFolderContent($path, $root, $mimetype_filter);
-				foreach ($files as &$file) {
-					$file['directory'] = $parameters['folder'];
-					$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
-					$permissions = $folder['permissions'];
-					if ($file['type'] == 'file') {
-						// Remove Create permission if type is file
-						$permissions &= ~OCP\Share::PERMISSION_CREATE;
-					}
-					$file['permissions'] = $permissions;
-				}
-				return $files;
-			}
-		}/* else if ($format == self::FORMAT_OPENDIR_ROOT) {
-			$query = OCP\DB::prepare('SELECT name FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
-			$result = $query->execute();
-			$files = array();
-			while ($file = $result->fetchRow()) {
-				// Set target path
-				$files[] = basename($shares[$file['id']]['item_target']);
-			}
-			return $files;
-		}*/
-		return array();
-	}
-
-}
-
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index fc2e6e32c7..582c9c6617 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -50,7 +50,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 				if (isset($this->files[$folder])) {
 					$file = $this->files[$folder];
 				} else {
-					$file = OCP\Share::getItemSharedWith('file', $folder, OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+					$file = OCP\Share::getItemSharedWith('folder', $folder, OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
 				}
 				if ($file) {
 					$this->files[$target]['path'] = $file['path'].substr($target, strlen($folder));
@@ -285,19 +285,21 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function file_put_contents($path, $data) {
-		if ($this->is_writable($path)) {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				$info = array(
-						'target' => $this->sharedFolder.$path,
-						'source' => $source,
-					     );
-				OCP\Util::emitHook('OC_Filestorage_Shared', 'file_put_contents', $info);
-				$storage = OC_Filesystem::getStorage($source);
-				$result = $storage->file_put_contents($this->getInternalPath($source), $data);
-				return $result;
+		if ($source = $this->getSourcePath($path)) {
+			// Check if permission is granted
+			if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) {
+				return false;
 			}
+			$info = array(
+					'target' => $this->sharedFolder.$path,
+					'source' => $source,
+				);
+			OCP\Util::emitHook('OC_Filestorage_Shared', 'file_put_contents', $info);
+			$storage = OC_Filesystem::getStorage($source);
+			$result = $storage->file_put_contents($this->getInternalPath($source), $data);
+			return $result;
 		}
+		return false;
 	}
 	
 	public function unlink($path) {
diff --git a/core/js/share.js b/core/js/share.js
index 70d822f881..38c20a7570 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -267,7 +267,6 @@ $(document).ready(function() {
 	
 	if (typeof FileActions !== 'undefined') {
 		OC.Share.loadIcons('file');
-		OC.Share.loadIcons('folder');
 		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
diff --git a/lib/files.php b/lib/files.php
index fee71b777b..07d432f806 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -41,9 +41,9 @@ class OC_Files {
 				$pos = strpos($directory, '/', 8);
 				// Get shared folder name
 				if ($pos !== false) {
-					$itemTarget = substr($directory, 0, $pos);
+					$itemTarget = substr($directory, 7, $pos - 7);
 				} else {
-					$itemTarget = $directory;
+					$itemTarget = substr($directory, 7);
 				}
 				$files = OCP\Share::getItemSharedWith('folder', $itemTarget, OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter));
 			}
diff --git a/lib/public/share.php b/lib/public/share.php
index c420943da2..940bf2d48a 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -399,23 +399,28 @@ class Share {
 	*/
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false, $itemShareWithBySource = false) {
 		$backend = self::getBackend($itemType);
-		// Get filesystem root to add it to the file target and remove from the file source
+		// Get filesystem root to add it to the file target and remove from the file source, match file_source with the file cache
 		if ($backend instanceof Share_Backend_File_Dependent) {
+			$fileDependent = true;
 			$root = \OC_Filesystem::getRoot();
+			// TODO No need to do this for FORMAT_STATUSES and loading the item in the dropdown, it's a performance waste
+			$where = 'INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ';
 		} else {
+			$fileDependent = false;
+			$where = '';
 			$root = '';
 		}
 		if ($itemType == 'file' && !isset($item)) {
-			$where = 'WHERE file_target IS NOT NULL';
+			$where .= 'WHERE file_target IS NOT NULL';
 			$query_args = array();
 		} else if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
 			// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
 			$item_types = array_merge(array($itemType), $collectionTypes);
 			$placeholders = join(',', array_fill(0, count($item_types), '?'));
-			$where = "WHERE item_type IN ('".$placeholders."')";
+			$where .= "WHERE item_type IN ('".$placeholders."')";
 			$query_args = $item_types;
-		} else {
-			$where = "WHERE item_type = ?";
+		} else if ($itemType != 'file' && $itemType != 'folder') {
+			$where .= "WHERE item_type = ?";
 			$query_args = array($itemType);
 		}
 		if (isset($shareType) && isset($shareWith)) {
@@ -445,7 +450,6 @@ class Share {
 				$query_args[] = self::$shareTypeGroupUserUnique;
 			}
 			if ($itemType == 'file' || $itemType == 'folder') {
-				$where = "INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ".$where;
 				$column = 'file_source';
 			} else {
 				$column = 'item_source';
@@ -491,6 +495,7 @@ class Share {
 			}
 			$where .= ' LIMIT '.$limit;
 		}
+		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
 			if ($itemType == 'file' || $itemType == 'folder') {
 				$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
@@ -505,7 +510,15 @@ class Share {
 					$select = 'id, item_type, item_source, parent, share_type, share_with, permissions, stime, file_source';
 				}
 			} else {
-				$select = '*';
+				if ($fileDependent) {
+					if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {
+						$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, share_with, permissions, file_target, *PREFIX*fscache.id, path as file_source, name, ctime, mtime, mimetype, size, encrypted, versioned, writable';
+					} else {
+						$select = '*PREFIX*share.id, item_type, item_source, item_target, *PREFIX*share.parent, share_type, share_with, permissions, stime, path as file_source, file_target';
+					}
+				} else {
+					$select = '*';
+				}
 			}
 		}
 		$root = strlen($root);
@@ -534,7 +547,7 @@ class Share {
 			// TODO Check this outside of the loop
 			// Check if this is a collection of the requested item type
 			if ($row['item_type'] != $itemType && $itemType != 'file' && !isset($item)) {
-				if ($collectionBackend = self::getBackend($row['item_type'])) {
+				if ($collectionBackend = self::getBackend($row['item_type'] && $collectionBackend instanceof Share_Backend_Collection)) {
 					$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
 					// Fetch all of the children sources
 					$children = $collectionBackend->getChildren($row[$column]);
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 4b73cc183a..efff2c5522 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -233,6 +233,8 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
+		
+		// Remove user
 	}
 
 	public function testShareWithGroup() {
@@ -280,6 +282,12 @@ class Test_Share extends UnitTestCase {
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		OC_User::setUserId($this->user3);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		
+		// Remove user from group
+		
+		// Add user to group
+		
+		// Remove group
 	}
 
 }

From b6a3bf154d5b16a84636a60c9db2979118427170 Mon Sep 17 00:00:00 2001
From: Anders Nor Berle <anders@berle.cc>
Date: Thu, 16 Aug 2012 20:42:51 +0000
Subject: [PATCH 1461/1537] Comment out javascript that hides login button

It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.
---
 core/js/js.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 92a2660fd9..499e6b7525 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -475,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) {

From 70e8a7e25c40834830b0237f279d15f82dcd2a9e Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 17 Aug 2012 00:45:46 +0200
Subject: [PATCH 1462/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/sl.php    | 11 +++++-
 apps/admin_dependencies_chk/l10n/th_TH.php |  9 +++++
 apps/admin_migrate/l10n/fi_FI.php          |  4 +++
 apps/admin_migrate/l10n/ja_JP.php          |  4 +--
 apps/contacts/l10n/ca.php                  |  1 +
 apps/contacts/l10n/it.php                  |  1 +
 apps/contacts/l10n/ja_JP.php               | 35 +++++++++---------
 apps/contacts/l10n/sl.php                  |  1 +
 apps/files_encryption/l10n/fi_FI.php       |  6 ++++
 apps/files_external/l10n/fi_FI.php         | 16 +++++++++
 apps/files_sharing/l10n/fi_FI.php          |  9 +++++
 apps/files_versions/l10n/fi_FI.php         |  4 +++
 apps/tasks/l10n/fi_FI.php                  | 14 ++++++++
 apps/user_ldap/l10n/ja_JP.php              |  4 +--
 apps/user_ldap/l10n/th_TH.php              |  6 ++++
 apps/user_migrate/l10n/fi_FI.php           |  9 +++++
 apps/user_migrate/l10n/ja_JP.php           |  4 +--
 l10n/ca/contacts.po                        |  8 ++---
 l10n/fi_FI/admin_migrate.po                | 11 +++---
 l10n/fi_FI/files_encryption.po             | 15 ++++----
 l10n/fi_FI/files_external.po               | 35 +++++++++---------
 l10n/fi_FI/files_sharing.po                | 21 +++++------
 l10n/fi_FI/files_versions.po               | 11 +++---
 l10n/fi_FI/tasks.po                        | 31 ++++++++--------
 l10n/fi_FI/user_migrate.po                 | 21 +++++------
 l10n/it/contacts.po                        |  8 ++---
 l10n/ja_JP/admin_migrate.po                |  8 ++---
 l10n/ja_JP/contacts.po                     | 42 +++++++++++-----------
 l10n/ja_JP/user_ldap.po                    | 10 +++---
 l10n/ja_JP/user_migrate.po                 |  8 ++---
 l10n/sl/admin_dependencies_chk.po          | 24 ++++++-------
 l10n/sl/contacts.po                        |  8 ++---
 l10n/templates/admin_dependencies_chk.pot  |  2 +-
 l10n/templates/admin_migrate.pot           |  2 +-
 l10n/templates/bookmarks.pot               |  2 +-
 l10n/templates/calendar.pot                |  2 +-
 l10n/templates/contacts.pot                |  2 +-
 l10n/templates/core.pot                    |  2 +-
 l10n/templates/files.pot                   |  2 +-
 l10n/templates/files_encryption.pot        |  2 +-
 l10n/templates/files_external.pot          |  2 +-
 l10n/templates/files_sharing.pot           |  2 +-
 l10n/templates/files_versions.pot          |  2 +-
 l10n/templates/gallery.pot                 |  2 +-
 l10n/templates/lib.pot                     |  2 +-
 l10n/templates/media.pot                   |  2 +-
 l10n/templates/settings.pot                |  2 +-
 l10n/templates/tasks.pot                   |  2 +-
 l10n/templates/user_ldap.pot               |  2 +-
 l10n/templates/user_migrate.pot            |  2 +-
 l10n/templates/user_openid.pot             |  2 +-
 l10n/th_TH/admin_dependencies_chk.po       | 22 ++++++------
 l10n/th_TH/user_ldap.po                    | 16 ++++-----
 53 files changed, 286 insertions(+), 189 deletions(-)
 create mode 100644 apps/admin_migrate/l10n/fi_FI.php
 create mode 100644 apps/files_encryption/l10n/fi_FI.php
 create mode 100644 apps/files_external/l10n/fi_FI.php
 create mode 100644 apps/files_sharing/l10n/fi_FI.php
 create mode 100644 apps/files_versions/l10n/fi_FI.php
 create mode 100644 apps/tasks/l10n/fi_FI.php
 create mode 100644 apps/user_migrate/l10n/fi_FI.php

diff --git a/apps/admin_dependencies_chk/l10n/sl.php b/apps/admin_dependencies_chk/l10n/sl.php
index 1621937eac..0d36aa379c 100644
--- a/apps/admin_dependencies_chk/l10n/sl.php
+++ b/apps/admin_dependencies_chk/l10n/sl.php
@@ -1,5 +1,14 @@
 <?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Modul php-json je potrebem",
+"The php-json module is needed by the many applications for inter communications" => "Modul php-json je potreben za medsebojno komunikacijo veliko aplikacij.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modul php-curl je potreben za pridobivanje naslova strani pri dodajanju zaznamkov.",
+"The php-gd module is needed to create thumbnails of your images" => "Modul php-gd je potreben za ustvarjanje sličic za predogled.",
+"The php-ldap module is needed connect to your ldap server" => "Modul php-ldap je potreben za povezavo z vašim ldap strežnikom.",
+"The php-zip module is needed download multiple files at once" => "Modul php-zip je potreben za prenašanje večih datotek hkrati.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modul php-mb_multibyte je potreben za pravilno upravljanje kodiranja.",
+"The php-ctype module is needed validate data." => "Modul php-ctype je potreben za preverjanje veljavnosti podatkov.",
+"The php-xml module is needed to share files with webdav." => "Modul php-xml je potreben za izmenjavo datotek preko protokola WebDAV.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Direktiva allow_url_fopen v vaši php.ini datoteki mora biti nastavljena na 1, če želite omogočiti dostop do zbirke znanja na strežnikih OCS.",
+"The php-pdo module is needed to store owncloud data into a database." => "Modul php-pdo je potreben za shranjevanje ownCloud podatkov v podatkovno zbirko.",
 "Dependencies status" => "Stanje odvisnosti",
 "Used by :" => "Uporablja:"
 );
diff --git a/apps/admin_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
index 338397cb57..ce0f48b288 100644
--- a/apps/admin_dependencies_chk/l10n/th_TH.php
+++ b/apps/admin_dependencies_chk/l10n/th_TH.php
@@ -1,3 +1,12 @@
 <?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "โมดูล php-json จำเป็นต้องใช้สำหรับแอพพลิเคชั่นหลายๆตัวเพื่อการเชื่อมต่อสากล",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "โมดูล php-curl จำเป็นต้องใช้สำหรับดึงข้อมูลชื่อหัวเว็บเมื่อเพิ่มเข้าไปยังรายการโปรด",
+"The php-gd module is needed to create thumbnails of your images" => "โมดูล php-gd จำเป็นต้องใช้สำหรับสร้างรูปภาพขนาดย่อของรูปภาพของคุณ",
+"The php-ldap module is needed connect to your ldap server" => "โมดูล php-ldap จำเป็นต้องใช้สำหรับการเชื่อมต่อกับเซิร์ฟเวอร์ ldap ของคุณ",
+"The php-zip module is needed download multiple files at once" => "โมดูล php-zip จำเป็นต้องใช้สำหรับดาวน์โหลดไฟล์พร้อมกันหลายๆไฟล์ในครั้งเดียว",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "โมดูล php-mb_multibyte จำเป็นต้องใช้สำหรับการจัดการการแปลงรหัสไฟล์อย่างถูกต้อง",
+"The php-ctype module is needed validate data." => "โมดูล php-ctype จำเป็นต้องใช้สำหรับตรวจสอบความถูกต้องของข้อมูล",
+"The php-xml module is needed to share files with webdav." => "โมดูล php-xml จำเป็นต้องใช้สำหรับแชร์ไฟล์ด้วย webdav",
+"The php-pdo module is needed to store owncloud data into a database." => "โมดูล php-pdo จำเป็นต้องใช้สำหรับจัดเก็บข้อมูลใน owncloud เข้าไปไว้ยังฐานข้อมูล",
 "Used by :" => "ใช้งานโดย:"
 );
diff --git a/apps/admin_migrate/l10n/fi_FI.php b/apps/admin_migrate/l10n/fi_FI.php
new file mode 100644
index 0000000000..2484eab7d3
--- /dev/null
+++ b/apps/admin_migrate/l10n/fi_FI.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Vie tämä ownCloud-istanssi",
+"Export" => "Vie"
+);
diff --git a/apps/admin_migrate/l10n/ja_JP.php b/apps/admin_migrate/l10n/ja_JP.php
index a4d3349a18..f8e5944a6a 100644
--- a/apps/admin_migrate/l10n/ja_JP.php
+++ b/apps/admin_migrate/l10n/ja_JP.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "このownCloudをエクスポート",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "このownCloudのデータを含む圧縮形式のファイルを生成します。\nエクスポートのタイプを選択してください:",
+"Export this ownCloud instance" => "ownCloudをエクスポート",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "このownCloudのデータを含む圧縮ファイルを生成します。\nエクスポートの種類を選択してください:",
 "Export" => "エクスポート"
 );
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 72550522d5..7abdc4114f 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "Error en carregar la imatge de perfil.",
 "Select type" => "Seleccioneu un tipus",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
+"Do you want to merge these address books?" => "Voleu fusionar aquestes llibretes d'adreces?",
 "Result: " => "Resultat: ",
 " imported, " => " importat, ",
 " failed." => " fallada.",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index e1af39fe91..eb98780d47 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "Errore durante il caricamento dell'immagine di profilo.",
 "Select type" => "Seleziona il tipo",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
+"Do you want to merge these address books?" => "Vuoi unire queste rubriche?",
 "Result: " => "Risultato: ",
 " imported, " => " importato, ",
 " failed." => " non riuscito.",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index f3e3a3fd53..c3be215ce6 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
+"Error (de)activating addressbook." => "アドレス帳の有効／無効化に失敗しました。",
 "id is not set." => "idが設定されていません。",
-"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
-"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレス帳を更新することはできません。",
+"Error updating addressbook." => "アドレス帳の更新に失敗しました。",
 "No ID provided" => "IDが提供されていません",
 "Error setting checksum." => "チェックサムの設定エラー。",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
-"No address books found." => "アドレスブックが見つかりません。",
+"No address books found." => "アドレス帳が見つかりません。",
 "No contacts found." => "連絡先が見つかりません。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
 "element name is not set." => "要素名が設定されていません。",
@@ -62,11 +62,12 @@
 "Error loading profile picture." => "プロファイルの画像の読み込みエラー",
 "Select type" => "タイプを選択",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。",
+"Do you want to merge these address books?" => "これらのアドレス帳をマージしてもよろしいですか？",
 "Result: " => "結果: ",
 " imported, " => " をインポート、 ",
 " failed." => " は失敗しました。",
 "Displayname cannot be empty." => "表示名は空にできません。",
-"Addressbook not found: " => "連絡先が見つかりません:",
+"Addressbook not found: " => "アドレス帳が見つかりません:",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -102,19 +103,19 @@
 "Add Contact" => "連絡先の追加",
 "Import" => "インポート",
 "Settings" => "設定",
-"Addressbooks" => "電話帳",
+"Addressbooks" => "アドレス帳",
 "Close" => "閉じる",
 "Keyboard shortcuts" => "キーボードショートカット",
 "Navigation" => "ナビゲーション",
 "Next contact in list" => "リスト内の次のコンタクト",
 "Previous contact in list" => "リスト内の前のコンタクト",
-"Expand/collapse current addressbook" => "現在の連絡帳を展開する／折りたたむ",
-"Next addressbook" => "次の連絡先",
-"Previous addressbook" => "前の連絡先",
+"Expand/collapse current addressbook" => "現在のアドレス帳を展開する／折りたたむ",
+"Next addressbook" => "次のアドレス帳",
+"Previous addressbook" => "前のアドレス帳",
 "Actions" => "アクション",
 "Refresh contacts list" => "連絡先リストを再読込する",
 "Add new contact" => "新しいコンタクトを追加",
-"Add new addressbook" => "新しいアドレスブックを追加",
+"Add new addressbook" => "新しいアドレス帳を追加",
 "Delete current contact" => "現在のコンタクトを削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
 "Delete current photo" => "現在の写真を削除",
@@ -134,7 +135,7 @@
 "Separate groups with commas" => "コンマでグループを分割",
 "Edit groups" => "グループを編集",
 "Preferred" => "推奨",
-"Please specify a valid email address." => "連絡先を追加",
+"Please specify a valid email address." => "有効なメールアドレスを指定してください。",
 "Enter email address" => "メールアドレスを入力",
 "Mail to address" => "アドレスへメールを送る",
 "Delete email address" => "メールアドレスを削除",
@@ -162,7 +163,7 @@
 "Zipcode" => "郵便番号",
 "Postal code" => "郵便番号",
 "Country" => "国名",
-"Addressbook" => "アドレスブック",
+"Addressbook" => "アドレス帳",
 "Hon. prefixes" => "敬称",
 "Miss" => "Miss",
 "Ms" => "Ms",
@@ -183,14 +184,14 @@
 "Jr." => "Jr.",
 "Sn." => "Sn.",
 "Import a contacts file" => "コンタクトファイルをインポート",
-"Please choose the addressbook" => "アドレスブックを選択してください",
-"create a new addressbook" => "新しいアドレスブックを作成",
+"Please choose the addressbook" => "アドレス帳を選択してください",
+"create a new addressbook" => "新しいアドレス帳を作成",
 "Name of new addressbook" => "新しいアドレスブックの名前",
 "Importing contacts" => "コンタクトをインポート",
-"You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
+"You have no contacts in your addressbook." => "アドレス帳に連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
-"Select Address Books" => "連絡先を洗濯してください",
+"Select Address Books" => "アドレス帳を選択してください",
 "Enter name" => "名前を入力",
 "Enter description" => "説明を入力してください",
 "CardDAV syncing addresses" => "CardDAV同期アドレス",
@@ -201,7 +202,7 @@
 "Show read-only VCF link" => "読み取り専用のVCFリンクを表示",
 "Download" => "ダウンロード",
 "Edit" => "編集",
-"New Address Book" => "新規電話帳",
+"New Address Book" => "新規のアドレス帳",
 "Name" => "名前",
 "Description" => "説明",
 "Save" => "保存",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index f08a300bcb..8746a83919 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "Napaka pri nalaganju slike profila.",
 "Select type" => "Izberite vrsto",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris.",
+"Do you want to merge these address books?" => "Ali želite združiti adresarje?",
 "Result: " => "Rezultati: ",
 " imported, " => " uvoženih, ",
 " failed." => " je spodletelo.",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
new file mode 100644
index 0000000000..5796499a26
--- /dev/null
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Salaus",
+"Exclude the following file types from encryption" => "Jätä seuraavat tiedostotyypit salaamatta",
+"None" => "Ei mitään",
+"Enable Encryption" => "Käytä salausta"
+);
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
new file mode 100644
index 0000000000..7dca49791e
--- /dev/null
+++ b/apps/files_external/l10n/fi_FI.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Erillinen tallennusväline",
+"Mount point" => "Liitospiste",
+"Backend" => "Taustaosa",
+"Configuration" => "Asetukset",
+"Options" => "Valinnat",
+"Add mount point" => "Lisää liitospiste",
+"None set" => "Ei asetettu",
+"All Users" => "Kaikki käyttäjät",
+"Groups" => "Ryhmät",
+"Users" => "Käyttäjät",
+"Delete" => "Poista",
+"SSL root certificates" => "SSL-juurivarmenteet",
+"Import Root Certificate" => "Tuo juurivarmenne",
+"Allow users to mount their own external storage" => "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
+);
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
new file mode 100644
index 0000000000..de25ecf108
--- /dev/null
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Jakamasi tiedostot",
+"Permissions" => "Oikeudet",
+"Read" => "Luku",
+"Edit" => "Muokkaus",
+"Delete" => "Poisto",
+"Enable Resharing" => "Käytä uudelleenjakoa",
+"Allow users to reshare files they don't own" => "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
+);
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
new file mode 100644
index 0000000000..c5092daf99
--- /dev/null
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Vanhenna kaikki versiot",
+"Enable Files Versioning" => "Käytä tiedostojen versiointia"
+);
diff --git a/apps/tasks/l10n/fi_FI.php b/apps/tasks/l10n/fi_FI.php
new file mode 100644
index 0000000000..c270951c11
--- /dev/null
+++ b/apps/tasks/l10n/fi_FI.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Virheellinen päivä tai aika",
+"Tasks" => "Tehtävät",
+"Unspecified" => "Määrittelemätön",
+"1=highest" => "1=korkein",
+"5=medium" => "5=keskitaso",
+"9=lowest" => "9=matalin",
+"Invalid priority" => "Virheellinen prioriteetti",
+"Add Task" => "Lisää tehtävä",
+"Loading tasks..." => "Ladataan tehtäviä...",
+"More" => "Enemmän",
+"Less" => "Vähemmän",
+"Delete" => "Poista"
+);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index f2a7790755..8d4473b4e2 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -26,9 +26,9 @@
 "Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。",
 "Not recommended, use for testing only." => "推奨しません、テスト目的でのみ利用してください。",
-"User Display Name Field" => "ユーザ名の表示に利用するフィールド",
+"User Display Name Field" => "ユーザ表示名のフィールド",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "ユーザのownCloud名の生成に利用するLDAP属性。",
-"Group Display Name Field" => "グループ名の表示に利用するフィールド",
+"Group Display Name Field" => "グループ表示名のフィールド",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "グループのownCloud名の生成に利用するLDAP属性。",
 "in bytes" => "バイト",
 "in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 8b2e6423ac..424da7de4b 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -1,10 +1,16 @@
 <?php $TRANSLATIONS = array(
 "Host" => "โฮสต์",
+"Base DN" => "DN ฐาน",
+"User DN" => "DN ของผู้ใช้งาน",
 "Password" => "รหัสผ่าน",
+"For anonymous access, leave DN and Password empty." => "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
 "Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
 "Port" => "พอร์ต",
 "Use TLS" => "ใช้ TLS",
+"Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
 "Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
+"User Display Name Field" => "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
+"Group Display Name Field" => "ช่องแสดงชื่อกลุ่มที่ต้องการ",
 "in bytes" => "ในหน่วยไบต์",
 "Help" => "ช่วยเหลือ"
 );
diff --git a/apps/user_migrate/l10n/fi_FI.php b/apps/user_migrate/l10n/fi_FI.php
new file mode 100644
index 0000000000..2616bee6f2
--- /dev/null
+++ b/apps/user_migrate/l10n/fi_FI.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Vie",
+"Something went wrong while the export file was being generated" => "Jokin meni pieleen vientiä suorittaessa",
+"An error has occurred" => "Tapahtui virhe",
+"Export your user account" => "Vie käyttäjätilisi",
+"This will create a compressed file that contains your ownCloud account." => "Tämä luo ownCloud-käyttäjätilisi sisältävän pakatun tiedoston.",
+"Import user account" => "Tuo käyttäjätili",
+"Import" => "Tuo"
+);
diff --git a/apps/user_migrate/l10n/ja_JP.php b/apps/user_migrate/l10n/ja_JP.php
index 1733a3f4ed..86c66e6319 100644
--- a/apps/user_migrate/l10n/ja_JP.php
+++ b/apps/user_migrate/l10n/ja_JP.php
@@ -2,8 +2,8 @@
 "Export" => "エクスポート",
 "Something went wrong while the export file was being generated" => "エクスポートファイルの生成時に何か不具合が発生しました。",
 "An error has occurred" => "エラーが発生しました",
-"Export your user account" => "あなたのユーザアカウントをエクスポート",
-"This will create a compressed file that contains your ownCloud account." => "あなたのownCloudアカウントを含む圧縮形式のファイルを生成します。",
+"Export your user account" => "ユーザアカウントのエクスポート",
+"This will create a compressed file that contains your ownCloud account." => "あなたのownCloudアカウントを含む圧縮ファイルを生成します。",
 "Import user account" => "ユーザアカウントをインポート",
 "ownCloud User Zip" => "ownCloudユーザZip",
 "Import" => "インポート"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index e7a004a081..1eeeca3602 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 07:15+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -290,7 +290,7 @@ msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Es
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Voleu fusionar aquestes llibretes d'adreces?"
 
 #: js/loader.js:49
 msgid "Result: "
diff --git a/l10n/fi_FI/admin_migrate.po b/l10n/fi_FI/admin_migrate.po
index ba949be087..ce68f4275d 100644
--- a/l10n/fi_FI/admin_migrate.po
+++ b/l10n/fi_FI/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:55+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Vie tämä ownCloud-istanssi"
 
 #: templates/settings.php:4
 msgid ""
@@ -29,4 +30,4 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Vie"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 62b43dfc31..89ad916e38 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:56+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Salaus"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Jätä seuraavat tiedostotyypit salaamatta"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Käytä salausta"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 101691c078..2cee464ea2 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 11:04+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +20,23 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Erillinen tallennusväline"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Liitospiste"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Taustaosa"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Asetukset"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Valinnat"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -43,35 +44,35 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Lisää liitospiste"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Ei asetettu"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Kaikki käyttäjät"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL-juurivarmenteet"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Tuo juurivarmenne"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
@@ -79,4 +80,4 @@ msgstr ""
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index defc8793ba..aa9872ecb1 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:59+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Jakamasi tiedostot"
 
 #: templates/list.php:6
 msgid "Item"
@@ -31,24 +32,24 @@ msgstr ""
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Oikeudet"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Luku"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaus"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Poisto"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Käytä uudelleenjakoa"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 678c8cda62..c4bdbdc582 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:59+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Vanhenna kaikki versiot"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Käytä tiedostojen versiointia"
diff --git a/l10n/fi_FI/tasks.po b/l10n/fi_FI/tasks.po
index 0e179f0b47..cfbcb891b6 100644
--- a/l10n/fi_FI/tasks.po
+++ b/l10n/fi_FI/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 11:01+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Virheellinen päivä tai aika"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Tehtävät"
 
 #: js/tasks.js:415
 msgid "No category"
@@ -31,19 +32,19 @@ msgstr ""
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Määrittelemätön"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=korkein"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=keskitaso"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=matalin"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -55,11 +56,11 @@ msgstr ""
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Virheellinen prioriteetti"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Lisää tehtävä"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,7 +88,7 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Ladataan tehtäviä..."
 
 #: templates/tasks.php:20
 msgid "Important"
@@ -95,12 +96,12 @@ msgstr ""
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Enemmän"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Vähemmän"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
diff --git a/l10n/fi_FI/user_migrate.po b/l10n/fi_FI/user_migrate.po
index 17bff479f0..b0ab682451 100644
--- a/l10n/fi_FI/user_migrate.po
+++ b/l10n/fi_FI/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 11:06+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,28 +20,28 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Vie"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Jokin meni pieleen vientiä suorittaessa"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Tapahtui virhe"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Vie käyttäjätilisi"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Tämä luo ownCloud-käyttäjätilisi sisältävän pakatun tiedoston."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Tuo käyttäjätili"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
@@ -48,4 +49,4 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Tuo"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 21acc033d9..ca6e21df7c 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:27+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -292,7 +292,7 @@ msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancor
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Vuoi unire queste rubriche?"
 
 #: js/loader.js:49
 msgid "Result: "
diff --git a/l10n/ja_JP/admin_migrate.po b/l10n/ja_JP/admin_migrate.po
index bfc0b807e0..4411d9e77c 100644
--- a/l10n/ja_JP/admin_migrate.po
+++ b/l10n/ja_JP/admin_migrate.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 02:48+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:29+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr "このownCloudをエクスポート"
+msgstr "ownCloudをエクスポート"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr "このownCloudのデータを含む圧縮形式のファイルを生成します。\nエクスポートのタイプを選択してください:"
+msgstr "このownCloudのデータを含む圧縮ファイルを生成します。\nエクスポートの種類を選択してください:"
 
 #: templates/settings.php:12
 msgid "Export"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index a672019929..8e753c62e4 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 04:45+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
 msgid "Error (de)activating addressbook."
-msgstr "アドレスブックの有効/無効化に失敗しました。"
+msgstr "アドレス帳の有効／無効化に失敗しました。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
 #: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
@@ -31,11 +31,11 @@ msgstr "idが設定されていません。"
 
 #: ajax/addressbook/update.php:24
 msgid "Cannot update addressbook with an empty name."
-msgstr "空白の名前でアドレスブックを更新することはできません。"
+msgstr "空白の名前でアドレス帳を更新することはできません。"
 
 #: ajax/addressbook/update.php:28
 msgid "Error updating addressbook."
-msgstr "アドレスブックの更新に失敗しました。"
+msgstr "アドレス帳の更新に失敗しました。"
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -51,7 +51,7 @@ msgstr "削除するカテゴリが選択されていません。"
 
 #: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr "アドレスブックが見つかりません。"
+msgstr "アドレス帳が見つかりません。"
 
 #: ajax/categories/delete.php:34
 msgid "No contacts found."
@@ -290,7 +290,7 @@ msgstr "いくつかのコンタクトが削除とマークされていますが
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "これらのアドレス帳をマージしてもよろしいですか？"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -310,7 +310,7 @@ msgstr "表示名は空にできません。"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr "連絡先が見つかりません:"
+msgstr "アドレス帳が見つかりません:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -456,7 +456,7 @@ msgstr "設定"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
-msgstr "電話帳"
+msgstr "アドレス帳"
 
 #: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
@@ -480,15 +480,15 @@ msgstr "リスト内の前のコンタクト"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr "現在の連絡帳を展開する／折りたたむ"
+msgstr "現在のアドレス帳を展開する／折りたたむ"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr "次の連絡先"
+msgstr "次のアドレス帳"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr "前の連絡先"
+msgstr "前のアドレス帳"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -504,7 +504,7 @@ msgstr "新しいコンタクトを追加"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr "新しいアドレスブックを追加"
+msgstr "新しいアドレス帳を追加"
 
 #: templates/index.php:63
 msgid "Delete current contact"
@@ -586,7 +586,7 @@ msgstr "推奨"
 
 #: templates/part.contact.php:64
 msgid "Please specify a valid email address."
-msgstr "連絡先を追加"
+msgstr "有効なメールアドレスを指定してください。"
 
 #: templates/part.contact.php:64
 msgid "Enter email address"
@@ -701,7 +701,7 @@ msgstr "国名"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr "アドレスブック"
+msgstr "アドレス帳"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -785,11 +785,11 @@ msgstr "コンタクトファイルをインポート"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr "アドレスブックを選択してください"
+msgstr "アドレス帳を選択してください"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr "新しいアドレスブックを作成"
+msgstr "新しいアドレス帳を作成"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
@@ -801,7 +801,7 @@ msgstr "コンタクトをインポート"
 
 #: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
-msgstr "アドレスブックに連絡先が登録されていません。"
+msgstr "アドレス帳に連絡先が登録されていません。"
 
 #: templates/part.no_contacts.php:5
 msgid "Add contact"
@@ -813,7 +813,7 @@ msgstr "アドレス帳を設定"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr "連絡先を洗濯してください"
+msgstr "アドレス帳を選択してください"
 
 #: templates/part.selectaddressbook.php:27
 msgid "Enter name"
@@ -857,7 +857,7 @@ msgstr "編集"
 
 #: templates/settings.php:40
 msgid "New Address Book"
-msgstr "新規電話帳"
+msgstr "新規のアドレス帳"
 
 #: templates/settings.php:41
 msgid "Name"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 109dcef89f..5c22b913b4 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 03:21+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:33+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -139,7 +139,7 @@ msgstr "推奨しません、テスト目的でのみ利用してください。
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr "ユーザ名の表示に利用するフィールド"
+msgstr "ユーザ表示名のフィールド"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -147,7 +147,7 @@ msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr "グループ名の表示に利用するフィールド"
+msgstr "グループ表示名のフィールド"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
diff --git a/l10n/ja_JP/user_migrate.po b/l10n/ja_JP/user_migrate.po
index a9ccee0222..71b2c612ed 100644
--- a/l10n/ja_JP/user_migrate.po
+++ b/l10n/ja_JP/user_migrate.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 02:59+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:28+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -32,12 +32,12 @@ msgstr "エラーが発生しました"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr "あなたのユーザアカウントをエクスポート"
+msgstr "ユーザアカウントのエクスポート"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr "あなたのownCloudアカウントを含む圧縮形式のファイルを生成します。"
+msgstr "あなたのownCloudアカウントを含む圧縮ファイルを生成します。"
 
 #: templates/settings.php:13
 msgid "Import user account"
diff --git a/l10n/sl/admin_dependencies_chk.po b/l10n/sl/admin_dependencies_chk.po
index f08053b289..f60a8e1d14 100644
--- a/l10n/sl/admin_dependencies_chk.po
+++ b/l10n/sl/admin_dependencies_chk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 00:23+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 20:55+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,48 +22,48 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr "Modul php-json je potrebem"
+msgstr "Modul php-json je potreben za medsebojno komunikacijo veliko aplikacij."
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Modul php-curl je potreben za pridobivanje naslova strani pri dodajanju zaznamkov."
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Modul php-gd je potreben za ustvarjanje sličic za predogled."
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Modul php-ldap je potreben za povezavo z vašim ldap strežnikom."
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Modul php-zip je potreben za prenašanje večih datotek hkrati."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Modul php-mb_multibyte je potreben za pravilno upravljanje kodiranja."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Modul php-ctype je potreben za preverjanje veljavnosti podatkov."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Modul php-xml je potreben za izmenjavo datotek preko protokola WebDAV."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "Direktiva allow_url_fopen v vaši php.ini datoteki mora biti nastavljena na 1, če želite omogočiti dostop do zbirke znanja na strežnikih OCS."
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Modul php-pdo je potreben za shranjevanje ownCloud podatkov v podatkovno zbirko."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 52c49881a1..3bfd97ff7c 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 20:56+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -291,7 +291,7 @@ msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosim
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Ali želite združiti adresarje?"
 
 #: js/loader.js:49
 msgid "Result: "
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 8472f3c85e..d22a6eeb09 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index ac6f293833..69d2310ef6 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index dea5e32df8..163528a1f6 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 28e860b0a0..1a2c13fe37 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index d96ef4d6ec..c2aea07d8b 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d0746ae188..9e0c2f9c88 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e7daa79da3..f6130fe428 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index dca7c8a90e..2f590476ee 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 7faee54532..ed0d73acb6 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 1c0459cba9..faf0bc9e32 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 774fdabb75..88676071c1 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index abc1a902c5..6d052c2264 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 98a71ea9fa..aac17dcd57 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index f74f546c3a..5014f92eb2 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 5cff99d6d6..fe8361f787 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 7a11e25c67..8067746ba7 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8c5e5376a1..7b23da1705 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 82982f7d3a..6bf0070010 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 03e646ee42..3d76942e4b 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/admin_dependencies_chk.po b/l10n/th_TH/admin_dependencies_chk.po
index 6ba6dff16a..cfa13b5075 100644
--- a/l10n/th_TH/admin_dependencies_chk.po
+++ b/l10n/th_TH/admin_dependencies_chk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 13:17+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 12:24+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -22,38 +22,38 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "โมดูล php-json จำเป็นต้องใช้สำหรับแอพพลิเคชั่นหลายๆตัวเพื่อการเชื่อมต่อสากล"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "โมดูล php-curl จำเป็นต้องใช้สำหรับดึงข้อมูลชื่อหัวเว็บเมื่อเพิ่มเข้าไปยังรายการโปรด"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "โมดูล php-gd จำเป็นต้องใช้สำหรับสร้างรูปภาพขนาดย่อของรูปภาพของคุณ"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "โมดูล php-ldap จำเป็นต้องใช้สำหรับการเชื่อมต่อกับเซิร์ฟเวอร์ ldap ของคุณ"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "โมดูล php-zip จำเป็นต้องใช้สำหรับดาวน์โหลดไฟล์พร้อมกันหลายๆไฟล์ในครั้งเดียว"
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "โมดูล php-mb_multibyte จำเป็นต้องใช้สำหรับการจัดการการแปลงรหัสไฟล์อย่างถูกต้อง"
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "โมดูล php-ctype จำเป็นต้องใช้สำหรับตรวจสอบความถูกต้องของข้อมูล"
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "โมดูล php-xml จำเป็นต้องใช้สำหรับแชร์ไฟล์ด้วย webdav"
 
 #: settings.php:81
 msgid ""
@@ -63,7 +63,7 @@ msgstr ""
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "โมดูล php-pdo จำเป็นต้องใช้สำหรับจัดเก็บข้อมูลใน owncloud เข้าไปไว้ยังฐานข้อมูล"
 
 #: templates/settings.php:2
 msgid "Dependencies status"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 1f8d946d7a..e2047dcd20 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 15:30+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 12:20+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "DN ฐาน"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN ของผู้ใช้งาน"
 
 #: templates/settings.php:10
 msgid ""
@@ -52,7 +52,7 @@ msgstr "รหัสผ่าน"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
 
 #: templates/settings.php:12
 msgid "User Login Filter"
@@ -124,7 +124,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
 
 #: templates/settings.php:23
 msgid ""
@@ -138,7 +138,7 @@ msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำห
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -146,7 +146,7 @@ msgstr ""
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."

From 53a888cc8130a81961dece245b35a226be4d67ab Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Aug 2012 01:22:26 +0200
Subject: [PATCH 1463/1537] more path normalization

---
 apps/files/index.php     |   2 +-
 lib/files.php            |   4 ++
 lib/filesystem.php       |  13 ++++-
 lib/filesystemview.php   | 118 +++++++++++++++++++++------------------
 tests/lib/filesystem.php |   1 +
 5 files changed, 80 insertions(+), 58 deletions(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index 79bed8e357..e1c4ad7f19 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -92,7 +92,7 @@ $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
 $tmpl->assign( 'fileList', $list->fetchPage(), false );
 $tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
-$tmpl->assign( 'dir', $dir);
+$tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir));
 $tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
 $tmpl->assign( 'files', $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
diff --git a/lib/files.php b/lib/files.php
index d5bebb7e54..b9c2ead944 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -33,6 +33,10 @@ class OC_Files {
 	* @param dir $directory path under datadirectory
 	*/
 	public static function getDirectoryContent($directory, $mimetype_filter = ''){
+		$directory=OC_Filesystem::normalizePath($directory);
+		if($directory=='/'){
+			$directory='';
+		}
 		$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
 		foreach($files as &$file){
 			$file['directory']=$directory;
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 6cba6b1b54..ffb8643d49 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -495,7 +495,16 @@ class OC_Filesystem{
 		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
 	}
 
-	public static function normalizePath($path){
+	/**
+	 * normalize a path
+	 * @param string path
+	 * @param bool $stripTrailingSlash
+	 * @return string
+	 */
+	public static function normalizePath($path,$stripTrailingSlash=true){
+		if($path==''){
+			return '/';
+		}
 		//no windows style slashes
 		$path=str_replace('\\','/',$path);
 		//add leading slash
@@ -503,7 +512,7 @@ class OC_Filesystem{
 			$path='/'.$path;
 		}
 		//remove trainling slash
-		if(strlen($path)>1 and substr($path,-1,1)==='/'){
+		if($stripTrailingSlash and strlen($path)>1 and substr($path,-1,1)==='/'){
 			$path=substr($path,0,-1);
 		}
 		//remove duplicate slashes
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 9d85befdc8..571c75f8f3 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -54,7 +54,7 @@ class OC_FilesystemView {
 		if($path[0]!=='/'){
 			$path='/'.$path;
 		}
-		return OC_Filesystem::normalizePath($this->fakeRoot.$path);
+		return $this->fakeRoot.$path;
 	}
 	
 	/**
@@ -227,7 +227,7 @@ class OC_FilesystemView {
 	}
 	public function file_put_contents($path, $data) {
 		if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier
-			$absolutePath = $this->getAbsolutePath($path);
+			$absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path));
 			if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) && OC_Filesystem::isValidPath($path)) {
 				$path = $this->getRelativePath($absolutePath);
 				$exists = $this->file_exists($path);
@@ -287,11 +287,14 @@ class OC_FilesystemView {
 		return $this->basicOperation( 'deleteAll', $directory, array('delete'), $empty );
 	}
 	public function rename($path1, $path2) {
-		$absolutePath1 = $this->getAbsolutePath($path1);
-		$absolutePath2 = $this->getAbsolutePath($path2);
+		$postFix1=(substr($path1,-1,1)==='/')?'/':'';
+		$postFix2=(substr($path2,-1,1)==='/')?'/':'';
+		$absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1));
+		$absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2));
 		if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
+			
 			if($path1 == null or $path2 == null) {
 				return false;
 			}
@@ -305,20 +308,20 @@ class OC_FilesystemView {
 					)
 			);
 			if($run) {
-				$mp1 = $this->getMountPoint($path1);
-				$mp2 = $this->getMountPoint($path2);
+				$mp1 = $this->getMountPoint($path1.$postFix1);
+				$mp2 = $this->getMountPoint($path2.$postFix2);
 				if($mp1 == $mp2) {
 					if($storage = $this->getStorage($path1)) {
-						$result = $storage->rename($this->getInternalPath($path1), $this->getInternalPath($path2));
+						$result = $storage->rename($this->getInternalPath($path1.$postFix1), $this->getInternalPath($path2.$postFix2));
 					}
 				} else {
-					$source = $this->fopen($path1, 'r');
-					$target = $this->fopen($path2, 'w');
+					$source = $this->fopen($path1.$postFix1, 'r');
+					$target = $this->fopen($path2.$postFix2, 'w');
 					$count = OC_Helper::streamCopy($source, $target);
 					$storage1 = $this->getStorage($path1);
-					$storage1->unlink($this->getInternalPath($path1));
+					$storage1->unlink($this->getInternalPath($path1.$postFix1));
 					$result = $count>0;
-				}
+				} 
 				OC_Hook::emit(
 					OC_Filesystem::CLASSNAME,
 					OC_Filesystem::signal_post_rename,
@@ -332,11 +335,14 @@ class OC_FilesystemView {
 		}
 	}
 	public function copy($path1, $path2) {
-		$absolutePath1 = $this->getAbsolutePath($path1);
-		$absolutePath2 = $this->getAbsolutePath($path2);
+		$postFix1=(substr($path1,-1,1)==='/')?'/':'';
+		$postFix2=(substr($path2,-1,1)==='/')?'/':'';
+		$absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1));
+		$absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2));
 		if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
+			
 			if($path1 == null or $path2 == null) {
 				return false;
 			}
@@ -372,15 +378,15 @@ class OC_FilesystemView {
 				);
 			}
 			if($run) {
-				$mp1=$this->getMountPoint($path1);
-				$mp2=$this->getMountPoint($path2);
+				$mp1=$this->getMountPoint($path1.$postFix1);
+				$mp2=$this->getMountPoint($path2.$postFix2);
 				if($mp1 == $mp2){
-					if($storage = $this->getStorage($path1)) {
-						$result=$storage->copy($this->getInternalPath($path1), $this->getInternalPath($path2));
+					if($storage = $this->getStorage($path1.$postFix1)) {
+						$result=$storage->copy($this->getInternalPath($path1.$postFix1), $this->getInternalPath($path2.$postFix2));
 					}
 				} else {
-					$source = $this->fopen($path1, 'r');
-					$target = $this->fopen($path2, 'w');
+					$source = $this->fopen($path1.$postFix1, 'r');
+					$target = $this->fopen($path2.$postFix2, 'w');
 					$result = OC_Helper::streamCopy($source, $target);
 				}
 				OC_Hook::emit(
@@ -475,7 +481,8 @@ class OC_FilesystemView {
 		return $this->basicOperation('getMimeType', $path);
 	}
 	public function hash($type, $path, $raw = false) {
-		$absolutePath = $this->getAbsolutePath($path);
+		$postFix=(substr($path,-1,1)==='/')?'/':'';
+		$absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path));
 		if (OC_FileProxy::runPreProxies('hash', $absolutePath) && OC_Filesystem::isValidPath($path)) {
 			$path = $this->getRelativePath($absolutePath);
 			if ($path == null) {
@@ -488,8 +495,8 @@ class OC_FilesystemView {
 					array( OC_Filesystem::signal_param_path => $path)
 				);
 			}
-			if ($storage = $this->getStorage($path)) {
-				$result = $storage->hash($type, $this->getInternalPath($path), $raw);
+			if ($storage = $this->getStorage($path.$postFix)) {
+				$result = $storage->hash($type, $this->getInternalPath($path.$postFix), $raw);
 				$result = OC_FileProxy::runPostProxies('hash', $absolutePath, $result);
 				return $result;
 			}
@@ -514,35 +521,16 @@ class OC_FilesystemView {
 	 * OC_Filestorage for delegation to a storage backend for execution
 	 */
 	private function basicOperation($operation, $path, $hooks=array(), $extraParam=null) {
-		$absolutePath = $this->getAbsolutePath($path);
+		$postFix=(substr($path,-1,1)==='/')?'/':'';
+		$absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path));
 		if(OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and OC_Filesystem::isValidPath($path)) {
 			$path = $this->getRelativePath($absolutePath);
 			if($path == null) {
 				return false;
 			}
-			$internalPath = $this->getInternalPath($path);
-			$run = true;
-			if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
-				foreach($hooks as $hook) {
-					if($hook!='read') {
-						OC_Hook::emit(
-							OC_Filesystem::CLASSNAME,
-							$hook,
-							array(
-								OC_Filesystem::signal_param_path => $path,
-								OC_Filesystem::signal_param_run => &$run
-							)
-						);
-					} else {
-						OC_Hook::emit(
-							OC_Filesystem::CLASSNAME,
-							$hook,
-							array( OC_Filesystem::signal_param_path => $path)
-						);
-					}
-				}
-			}
-			if($run and $storage = $this->getStorage($path)) {
+			$internalPath = $this->getInternalPath($path.$postFix);
+			$run=$this->runHooks($hooks,$path);
+			if($run and $storage = $this->getStorage($path.$postFix)) {
 				if(!is_null($extraParam)) {
 					$result = $storage->$operation($internalPath, $extraParam);
 				} else {
@@ -551,15 +539,7 @@ class OC_FilesystemView {
 				$result = OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
 				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
 					if($operation!='fopen') {//no post hooks for fopen, the file stream is still open
-						foreach($hooks as $hook) {
-							if($hook!='read'){
-								OC_Hook::emit(
-									OC_Filesystem::CLASSNAME,
-									'post_'.$hook,
-									array( OC_Filesystem::signal_param_path => $path)
-								);
-							}
-						}
+						$this->runHooks($hooks,$path,true);
 					}
 				}
 				return $result;
@@ -568,6 +548,34 @@ class OC_FilesystemView {
 		return null;
 	}
 
+	private function runHooks($hooks,$path,$post=false){
+		$prefix=($post)?'post_':'';
+		$run=true;
+		if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
+			foreach($hooks as $hook) {
+				if($hook!='read') {
+					OC_Hook::emit(
+						OC_Filesystem::CLASSNAME,
+						$prefix.$hook,
+						array(
+							OC_Filesystem::signal_param_run => &$run,
+							OC_Filesystem::signal_param_path => $path
+						)
+					);
+				} elseif(!$post) {
+					OC_Hook::emit(
+						OC_Filesystem::CLASSNAME,
+						$prefix.$hook,
+						array(
+							OC_Filesystem::signal_param_path => $path
+						)
+					);
+				}
+			}
+		}
+		return $run;
+	}
+
 	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index e041255ec9..72af083578 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -62,6 +62,7 @@ class Test_Filesystem extends UnitTestCase{
 
 	public function testNormalize(){
 		$this->assertEqual('/path',OC_Filesystem::normalizePath('/path/'));
+		$this->assertEqual('/path/',OC_Filesystem::normalizePath('/path/',false));
 		$this->assertEqual('/path',OC_Filesystem::normalizePath('path'));
 		$this->assertEqual('/path',OC_Filesystem::normalizePath('\path'));
 		$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo//bar/'));

From 017d8b410a8cb98041f860ab7569506a18dff7e9 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 17 Aug 2012 02:02:51 +0200
Subject: [PATCH 1464/1537] [tx-robot] updated from transifex

---
 l10n/templates/admin_dependencies_chk.pot |  2 +-
 l10n/templates/admin_migrate.pot          |  2 +-
 l10n/templates/bookmarks.pot              |  2 +-
 l10n/templates/calendar.pot               |  2 +-
 l10n/templates/contacts.pot               |  2 +-
 l10n/templates/core.pot                   |  2 +-
 l10n/templates/files.pot                  |  2 +-
 l10n/templates/files_encryption.pot       |  2 +-
 l10n/templates/files_external.pot         |  2 +-
 l10n/templates/files_sharing.pot          |  2 +-
 l10n/templates/files_versions.pot         |  2 +-
 l10n/templates/gallery.pot                |  2 +-
 l10n/templates/lib.pot                    | 10 +++++-----
 l10n/templates/media.pot                  |  2 +-
 l10n/templates/settings.pot               |  2 +-
 l10n/templates/tasks.pot                  |  2 +-
 l10n/templates/user_ldap.pot              |  2 +-
 l10n/templates/user_migrate.pot           |  2 +-
 l10n/templates/user_openid.pot            |  2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index d22a6eeb09..8577e194b7 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 69d2310ef6..d4094c8024 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 163528a1f6..76aa17dd75 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 1a2c13fe37..b6f0f493de 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index c2aea07d8b..6addd6df20 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 9e0c2f9c88..13cb0c0962 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index f6130fe428..7d5363ed9b 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 2f590476ee..788b9d9c5c 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index ed0d73acb6..c47fd095b2 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index faf0bc9e32..578dadd19f 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 88676071c1..2495608db7 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 6d052c2264..1407a2d290 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index aac17dcd57..04f632d49f 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:245
+#: files.php:249
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:250
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:250 files.php:275
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:274
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 5014f92eb2..dae8ada902 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index fe8361f787..eac091d383 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 8067746ba7..1fd1b6cdae 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7b23da1705..513cc5ade0 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 6bf0070010..2890c2f626 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 3d76942e4b..6c5c2b75cf 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"POT-Creation-Date: 2012-08-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From 850ee93711334831fb14ff3d017eaafb3de8e93a Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 17 Aug 2012 12:39:05 +0200
Subject: [PATCH 1465/1537] add impress mimetype

---
 lib/mimetypes.list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 37d50756d5..8386bcb93f 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -93,4 +93,5 @@ return array(
 	'pptx'=>'application/mspowerpoint',
 	'sgf' => 'application/sgf',
 	'cdr' => 'application/coreldraw',
+	'impress' => 'text/impress',
 );

From ced234a81a89158cb21bb47833482f5a51690a86 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 17 Aug 2012 16:00:01 +0200
Subject: [PATCH 1466/1537] rename subadmin to group admin

---
 settings/js/users.js         | 2 +-
 settings/templates/users.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 29f70f24df..bf0bd10864 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -73,7 +73,7 @@ UserList={
 		groupsSelect.data('userGroups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
-			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'SubAdmin') + '">');
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
 			subadminSelect.data('username', username);
 			subadminSelect.data('userGroups', groups);
 			subadminSelect.data('subadmin', subadmin);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 3e9faddadf..5298237f67 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -77,7 +77,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
 			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php echo $l->t('SubAdmin'); ?></th>
+			<th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
 			<?php endif;?>
 			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
 			<th id="headerRemove">&nbsp;</th>
@@ -109,7 +109,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 				class="subadminsselect"
 				data-username="<?php echo $user['name'] ;?>"
 				data-subadmin="<?php echo $user['subadmin'] ;?>"
-				data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin')?>"
+				data-placeholder="subadmins" title="<?php echo $l->t('Group Admin')?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
 					<option value="<?php echo $group;?>">

From 44272b9889149e251da41c6fe7c61a7720d57b71 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 17 Aug 2012 20:48:47 +0200
Subject: [PATCH 1467/1537] increase margin top of calendar import's color
 picker

---
 apps/calendar/css/import.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/css/import.css b/apps/calendar/css/import.css
index 8abdc3aecd..fd82006072 100644
--- a/apps/calendar/css/import.css
+++ b/apps/calendar/css/import.css
@@ -11,4 +11,4 @@
 #calendar_import_mergewarning{clear: both;}
 #calendar_import_defaultcolors{clear:both;margin: 0 auto;text-align: center;}
 .calendar_import_warning{border-color: #fc3333;}
-.calendar-colorpicker-color{display:inline-block;width:20px;height:5px;margin: 0 auto;cursor:pointer;border:2px solid transparent;}
\ No newline at end of file
+.calendar-colorpicker-color{display:inline-block;width:20px;height:5px;margin: 0 auto;cursor:pointer;border:2px solid transparent;margin-top: 5px;}
\ No newline at end of file

From 41639f05174ecbf1042ae1ab53ab6374861badce Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 17 Aug 2012 21:29:26 +0200
Subject: [PATCH 1468/1537] fix fail in sql query of isDuplicate method of
 OC_Calendar_Import

---
 apps/calendar/lib/import.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index d36891cb2b..368f8406e7 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -273,8 +273,10 @@ class OC_Calendar_Import{
 	 */
 	private function isDuplicate($insertid){
 		$newobject = OC_Calendar_Object::find($insertid);
-		$stmt = OCP\DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*calendar_objects WHERE objecttype=? AND startdate=? AND enddate=? AND repeating=? AND summary=? AND calendardata=?');
-		$result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata']));
+		$stmt = OCP\DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*calendar_objects
+								 INNER JOIN *PREFIX*calendar_calendars ON calendarid=*PREFIX*calendar_calendars.id
+								 WHERE objecttype=? AND startdate=? AND enddate=? AND repeating=? AND summary=? AND calendardata=? AND userid = ?');
+		$result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata'], $this->userid));
 		$result = $result->fetchRow();
 		if($result['count'] >= 2){
 			return true;

From f1cabdd8e0b8746131879a4c264f7fd9c6e51e22 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 18 Aug 2012 02:04:07 +0200
Subject: [PATCH 1469/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/cs_CZ.php | 14 ++++
 apps/contacts/l10n/sv.php                  |  1 +
 apps/tasks/l10n/es.php                     | 24 +++++++
 apps/tasks/l10n/fr.php                     |  6 ++
 apps/user_ldap/l10n/cs_CZ.php              | 36 +++++++++++
 apps/user_ldap/l10n/sl.php                 |  5 ++
 l10n/af/settings.po                        |  8 +--
 l10n/ar/settings.po                        |  8 +--
 l10n/ar_SA/settings.po                     |  8 +--
 l10n/bg_BG/settings.po                     |  8 +--
 l10n/ca/settings.po                        | 10 +--
 l10n/cs_CZ/admin_dependencies_chk.po       | 31 ++++-----
 l10n/cs_CZ/settings.po                     | 10 +--
 l10n/cs_CZ/user_ldap.po                    | 75 +++++++++++-----------
 l10n/da/settings.po                        | 10 +--
 l10n/de/settings.po                        | 10 +--
 l10n/el/settings.po                        | 23 +++----
 l10n/eo/settings.po                        | 10 +--
 l10n/es/settings.po                        | 18 +++---
 l10n/es/tasks.po                           | 51 +++++++--------
 l10n/et_EE/settings.po                     |  8 +--
 l10n/eu/settings.po                        | 10 +--
 l10n/eu_ES/settings.po                     |  8 +--
 l10n/fa/settings.po                        |  8 +--
 l10n/fi/settings.po                        |  8 +--
 l10n/fi_FI/settings.po                     |  8 +--
 l10n/fr/settings.po                        | 18 +++---
 l10n/fr/tasks.po                           | 19 +++---
 l10n/gl/settings.po                        | 24 +++----
 l10n/he/settings.po                        |  8 +--
 l10n/hr/settings.po                        |  8 +--
 l10n/hu_HU/settings.po                     | 10 +--
 l10n/hy/settings.po                        |  8 +--
 l10n/ia/settings.po                        |  8 +--
 l10n/id/settings.po                        |  8 +--
 l10n/id_ID/settings.po                     |  8 +--
 l10n/it/settings.po                        | 10 +--
 l10n/ja_JP/settings.po                     | 10 +--
 l10n/ko/settings.po                        |  8 +--
 l10n/lb/settings.po                        |  8 +--
 l10n/lt_LT/settings.po                     |  8 +--
 l10n/lv/settings.po                        |  8 +--
 l10n/mk/settings.po                        |  8 +--
 l10n/ms_MY/settings.po                     | 10 +--
 l10n/nb_NO/settings.po                     |  8 +--
 l10n/nl/settings.po                        |  8 +--
 l10n/nn_NO/settings.po                     |  8 +--
 l10n/pl/settings.po                        | 16 ++---
 l10n/pt_BR/settings.po                     |  8 +--
 l10n/pt_PT/settings.po                     |  8 +--
 l10n/ro/settings.po                        |  8 +--
 l10n/ru/settings.po                        |  8 +--
 l10n/sk_SK/settings.po                     |  8 +--
 l10n/sl/settings.po                        | 10 +--
 l10n/sl/user_ldap.po                       | 14 ++--
 l10n/so/settings.po                        |  8 +--
 l10n/sr/settings.po                        |  8 +--
 l10n/sr@latin/settings.po                  |  8 +--
 l10n/sv/contacts.po                        |  8 +--
 l10n/sv/settings.po                        | 18 +++---
 l10n/templates/admin_dependencies_chk.pot  |  2 +-
 l10n/templates/admin_migrate.pot           |  2 +-
 l10n/templates/bookmarks.pot               |  2 +-
 l10n/templates/calendar.pot                |  2 +-
 l10n/templates/contacts.pot                |  2 +-
 l10n/templates/core.pot                    | 26 ++++----
 l10n/templates/files.pot                   |  2 +-
 l10n/templates/files_encryption.pot        |  2 +-
 l10n/templates/files_external.pot          |  2 +-
 l10n/templates/files_sharing.pot           |  2 +-
 l10n/templates/files_versions.pot          |  2 +-
 l10n/templates/gallery.pot                 |  2 +-
 l10n/templates/lib.pot                     |  2 +-
 l10n/templates/media.pot                   |  2 +-
 l10n/templates/settings.pot                |  4 +-
 l10n/templates/tasks.pot                   |  2 +-
 l10n/templates/user_ldap.pot               |  2 +-
 l10n/templates/user_migrate.pot            |  2 +-
 l10n/templates/user_openid.pot             |  2 +-
 l10n/th_TH/settings.po                     | 10 +--
 l10n/tr/settings.po                        | 10 +--
 l10n/uk/settings.po                        |  8 +--
 l10n/vi/settings.po                        |  8 +--
 l10n/zh_CN.GB2312/settings.po              | 10 +--
 l10n/zh_CN/settings.po                     |  8 +--
 l10n/zh_TW/settings.po                     |  8 +--
 settings/l10n/ca.php                       |  1 -
 settings/l10n/cs_CZ.php                    |  1 -
 settings/l10n/da.php                       |  1 -
 settings/l10n/de.php                       |  1 -
 settings/l10n/el.php                       |  7 +-
 settings/l10n/eo.php                       |  1 -
 settings/l10n/es.php                       |  5 +-
 settings/l10n/eu.php                       |  1 -
 settings/l10n/fr.php                       |  5 +-
 settings/l10n/gl.php                       |  8 +++
 settings/l10n/hu_HU.php                    |  1 -
 settings/l10n/it.php                       |  1 -
 settings/l10n/ja_JP.php                    |  1 -
 settings/l10n/ms_MY.php                    |  1 -
 settings/l10n/pl.php                       |  4 +-
 settings/l10n/sl.php                       |  1 -
 settings/l10n/sv.php                       |  5 +-
 settings/l10n/th_TH.php                    |  1 -
 settings/l10n/tr.php                       |  1 -
 settings/l10n/zh_CN.GB2312.php             |  1 -
 106 files changed, 517 insertions(+), 416 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/cs_CZ.php
 create mode 100644 apps/tasks/l10n/es.php
 create mode 100644 apps/user_ldap/l10n/cs_CZ.php

diff --git a/apps/admin_dependencies_chk/l10n/cs_CZ.php b/apps/admin_dependencies_chk/l10n/cs_CZ.php
new file mode 100644
index 0000000000..f750f13aef
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/cs_CZ.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modul php-json je třeba pro vzájemnou komunikaci mnoha aplikací",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modul php-curl je třeba pro zobrazení titulu strany v okamžiku přidání záložky",
+"The php-gd module is needed to create thumbnails of your images" => "Modul php-gd je třeba pro tvorbu náhledů Vašich obrázků",
+"The php-ldap module is needed connect to your ldap server" => "Modul php-ldap je třeba pro připojení na Váš ldap server",
+"The php-zip module is needed download multiple files at once" => "Modul php-zip je třeba pro souběžné stahování souborů",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modul php-mb_multibyte je třeba pro správnou funkci kódování.",
+"The php-ctype module is needed validate data." => "Modul php-ctype je třeba k ověřování dat.",
+"The php-xml module is needed to share files with webdav." => "Modul php-xml je třeba ke sdílení souborů prostřednictvím WebDAV.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Příkaz allow_url_fopen ve Vašem php.ini souboru by měl být nastaven na 1 kvůli získávání informací z OCS serverů",
+"The php-pdo module is needed to store owncloud data into a database." => "Modul php-pdo je třeba pro ukládání dat ownCloud do databáze",
+"Dependencies status" => "Status závislostí",
+"Used by :" => "Používáno:"
+);
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index b4b6a53945..1fee645594 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "Fel vid hämtning av profilbild.",
 "Select type" => "Välj typ",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade.",
+"Do you want to merge these address books?" => "Vill du slå samman dessa adressböcker?",
 "Result: " => "Resultat:",
 " imported, " => "importerad,",
 " failed." => "misslyckades.",
diff --git a/apps/tasks/l10n/es.php b/apps/tasks/l10n/es.php
new file mode 100644
index 0000000000..e5f0981de5
--- /dev/null
+++ b/apps/tasks/l10n/es.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Fecha/hora inválida",
+"Tasks" => "Tareas",
+"No category" => "Sin categoría",
+"Unspecified" => "Sin especificar",
+"1=highest" => "1=mayor",
+"5=medium" => "5=media",
+"9=lowest" => "9=menor",
+"Empty Summary" => "Resumen vacío",
+"Invalid percent complete" => "Porcentaje completado inválido",
+"Invalid priority" => "Prioridad inválida",
+"Add Task" => "Agregar tarea",
+"Order Due" => "Ordenar por",
+"Order List" => "Ordenar por lista",
+"Order Complete" => "Ordenar por completadas",
+"Order Location" => "Ordenar por ubicación",
+"Order Priority" => "Ordenar por prioridad",
+"Order Label" => "Ordenar por etiqueta",
+"Loading tasks..." => "Cargando tareas...",
+"Important" => "Importante",
+"More" => "Más",
+"Less" => "Menos",
+"Delete" => "Borrar"
+);
diff --git a/apps/tasks/l10n/fr.php b/apps/tasks/l10n/fr.php
index 0bac4a6577..5b0a0321a8 100644
--- a/apps/tasks/l10n/fr.php
+++ b/apps/tasks/l10n/fr.php
@@ -10,6 +10,12 @@
 "Invalid percent complete" => "Pourcentage d'achèvement invalide",
 "Invalid priority" => "Priorité invalide",
 "Add Task" => "Ajouter une tâche",
+"Order Due" => "Echéance tâche",
+"Order List" => "Liste tâche",
+"Order Complete" => "Tâche réalisée",
+"Order Location" => "Lieu",
+"Order Priority" => "Priorité",
+"Order Label" => "Etiquette tâche",
 "Loading tasks..." => "Chargement des tâches…",
 "Important" => "Important",
 "More" => "Plus",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
new file mode 100644
index 0000000000..6c0f227fa7
--- /dev/null
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Hostitel",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Nelze vynechat protokol vyžadující SSL. Začněte s ldaps://",
+"Base DN" => "Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "V Rozšířeném nastavení můžete specifikovat pro své uživatele a skupiny element Base DN",
+"User DN" => "DN uživatele",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné.",
+"Password" => "Heslo",
+"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and Heslo prázdné.",
+"User Login Filter" => "Filtr uživatelských loginů",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definuje filtr, který je aplikován v průběhu logování. %%uid nahrazuje uživatelské jméno během logování.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použijte %%uid pro rezervované místo, např. \"uid=%%uid\"",
+"User List Filter" => "Filtr uživateslkých seznamů",
+"Defines the filter to apply, when retrieving users." => "Defunije filtr, který je plaikován při návratu uživatelů.",
+"without any placeholder, e.g. \"objectClass=person\"." => "bez rezervace místa, např. \"objectClass=person\".",
+"Group Filter" => "Filtr skupiny",
+"Defines the filter to apply, when retrieving groups." => "Definuje filtr, který je aplikován při návratu skupin",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez rezervace místa, např. \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Base User Tree" => "Základní uživatelský strom",
+"Base Group Tree" => "Základní skupinový strom",
+"Group-Member association" => "Asociace člena skupiny",
+"Use TLS" => "Použijte TLS",
+"Do not use it for SSL connections, it will fail." => "Nepoužívejte pro SSL připojení, připojení selže.",
+"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)",
+"Turn off SSL certificate validation." => "Vypněte ověřování SSL certifikátu",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "pokud pracuje připojení pouze pokud je teto volba aktivní, importujte SSL certifikát LDAP serveru do Vašeho serveru ownCloud.",
+"Not recommended, use for testing only." => "Není doporučeno, pouze pro účely testování.",
+"User Display Name Field" => "Pole pro zobrazované jméno uživatele",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP použitý k vytvoření jména uživatele ownCloud",
+"Group Display Name Field" => "Pole pro zobrazení jména skupiny",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP použitý k vytvoření jména skupiny ownCloud",
+"in bytes" => "v bytech",
+"in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní dočasnou paměť.",
+"Help" => "Nápověda"
+);
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index cbfe6304e7..d4e63c7e8e 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -5,10 +5,15 @@
 "User DN" => "Uporabnik DN",
 "Password" => "Geslo",
 "For anonymous access, leave DN and Password empty." => "Za anonimni dostop pustite polji za DN in geslo prazni.",
+"User Login Filter" => "Filter prijav uporabnikov",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uporabite ogrado %%uid, npr. \"uid=%%uid\"",
+"User List Filter" => "Filter seznama uporabnikov",
+"Group Filter" => "Filter skupin",
 "Port" => "Vrata",
 "Use TLS" => "Uporabi TLS",
 "Do not use it for SSL connections, it will fail." => "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo.",
 "Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti SSL certifikata.",
+"Not recommended, use for testing only." => "Odsvetovano, uporabite le v namene preizkušanja.",
 "in bytes" => "v bajtih",
 "Help" => "Pomoč"
 );
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 6074b2d670..1d213427bc 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index abf56cce11..0f13d4ebb2 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index a6637ba21a..803e9d5953 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index cfa402cb99..e7697bb27e 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 703474cad9..a2e064f801 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 08:06+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,8 +228,8 @@ msgid "Other"
 msgstr "Altre"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/cs_CZ/admin_dependencies_chk.po b/l10n/cs_CZ/admin_dependencies_chk.po
index 33a79435b5..82774f6a24 100644
--- a/l10n/cs_CZ/admin_dependencies_chk.po
+++ b/l10n/cs_CZ/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 15:37+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Modul php-json je třeba pro vzájemnou komunikaci mnoha aplikací"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Modul php-curl je třeba pro zobrazení titulu strany v okamžiku přidání záložky"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Modul php-gd je třeba pro tvorbu náhledů Vašich obrázků"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Modul php-ldap je třeba pro připojení na Váš ldap server"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Modul php-zip je třeba pro souběžné stahování souborů"
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Modul php-mb_multibyte je třeba pro správnou funkci kódování."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Modul php-ctype je třeba k ověřování dat."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Modul php-xml je třeba ke sdílení souborů prostřednictvím WebDAV."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "Příkaz allow_url_fopen ve Vašem php.ini souboru by měl být nastaven na 1 kvůli získávání informací z OCS serverů"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Modul php-pdo je třeba pro ukládání dat ownCloud do databáze"
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Status závislostí"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Používáno:"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 39bf639f58..64ed6cf955 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 09:29+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -231,8 +231,8 @@ msgid "Other"
 msgstr "Jiné"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 88b8270c80..25f623c83b 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 16:01+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +20,146 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Hostitel"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Nelze vynechat protokol vyžadující SSL. Začněte s ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "V Rozšířeném nastavení můžete specifikovat pro své uživatele a skupiny element Base DN"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN uživatele"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Heslo"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtr uživatelských loginů"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Definuje filtr, který je aplikován v průběhu logování. %%uid nahrazuje uživatelské jméno během logování."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "použijte %%uid pro rezervované místo, např. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Filtr uživateslkých seznamů"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Defunije filtr, který je plaikován při návratu uživatelů."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "bez rezervace místa, např. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtr skupiny"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definuje filtr, který je aplikován při návratu skupin"
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "bez rezervace místa, např. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Základní uživatelský strom"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Základní skupinový strom"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Asociace člena skupiny"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Použijte TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Nepoužívejte pro SSL připojení, připojení selže."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Vypněte ověřování SSL certifikátu"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "pokud pracuje připojení pouze pokud je teto volba aktivní, importujte SSL certifikát LDAP serveru do Vašeho serveru ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Není doporučeno, pouze pro účely testování."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Pole pro zobrazované jméno uživatele"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Pole pro zobrazení jména skupiny"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "v bytech"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "ve vteřinách. Změna vyprázdní dočasnou paměť."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Nápověda"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f647b2f179..0a872f803a 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -232,8 +232,8 @@ msgid "Other"
 msgstr "Andet"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 96f616570a..314477b925 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 11:29+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -234,8 +234,8 @@ msgid "Other"
 msgstr "Andere"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Unteradministrator"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 60e4a324fd..2352c5f795 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -7,15 +7,16 @@
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -53,7 +54,7 @@ msgstr "Η γλώσσα άλλαξε"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Σφάλμα"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -77,19 +78,19 @@ msgstr "Προειδοποίηση Ασφαλείας"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "Χρήση της υπηρεσίας cron του συστήματος"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -232,8 +233,8 @@ msgid "Other"
 msgstr "Άλλα"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 44965561de..43631f9134 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,8 +228,8 @@ msgid "Other"
 msgstr "Alia"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Subadministranto"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 6f0dea3abe..fecace83b7 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,19 +79,19 @@ msgstr "Advertencia de seguridad"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ejecutar una tarea con cada página cargada"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php se registra en un servicio webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "usar servicio cron del sistema"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -234,8 +234,8 @@ msgid "Other"
 msgstr "Otro"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/es/tasks.po b/l10n/es/tasks.po
index 79d624ab38..c7be467fb0 100644
--- a/l10n/es/tasks.po
+++ b/l10n/es/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 17:39+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Fecha/hora inválida"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Tareas"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Sin categoría"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Sin especificar"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=mayor"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=media"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=menor"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Resumen vacío"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Porcentaje completado inválido"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Prioridad inválida"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Agregar tarea"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Ordenar por"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Ordenar por lista"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Ordenar por completadas"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Ordenar por ubicación"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Ordenar por prioridad"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Ordenar por etiqueta"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Cargando tareas..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Más"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Menos"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e5e997d139..c41361db04 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Muu"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index fc694e5559..d7ebcc2b28 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,8 +229,8 @@ msgid "Other"
 msgstr "Besteak"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index d750261466..82cc89a620 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 0c86f80460..38f01f759c 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "سایر"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index c7d75c2d6a..823276532f 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 0649c23395..da6c2cafaa 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Muu"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 6682f4c9e0..8fdbf74145 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,19 +79,19 @@ msgstr "Alertes de sécurité"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "exécuter une tâche pour chaque page chargée"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php est enregistré comme un service webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "utiliser le service cron du système "
 
 #: templates/admin.php:39
 msgid "Log"
@@ -234,8 +234,8 @@ msgid "Other"
 msgstr "Autre"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/fr/tasks.po b/l10n/fr/tasks.po
index 5fd6929892..69664e2e2f 100644
--- a/l10n/fr/tasks.po
+++ b/l10n/fr/tasks.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Romain DEP. <rom1dep@gmail.com>, 2012.
+# Xavier BOUTEVILLAIN <xavier.boutevillain@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 15:49+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 12:26+0000\n"
+"Last-Translator: Xavier BOUTEVILLAIN <xavier.boutevillain@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,27 +65,27 @@ msgstr "Ajouter une tâche"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Echéance tâche"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Liste tâche"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Tâche réalisée"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Lieu"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Priorité"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Etiquette tâche"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index f48a73f502..8c45f0bd13 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Non se puido cargar a lista desde a App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +41,7 @@ msgstr "Petición incorrecta"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Erro na autenticación"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +49,7 @@ msgstr "O idioma mudou"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,23 +69,23 @@ msgstr "Galego"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Aviso de seguridade"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "executar unha tarefa con cada páxina cargada"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php está rexistrada como un servizo webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "utilice o servizo cron do sistema"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Outro"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 194fa463ab..cd199ce76a 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
 msgstr "אחר"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 77abd3cbb3..1d03b6f4e4 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "ostali"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 4040e9e564..0b5b94d6c6 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,8 +228,8 @@ msgid "Other"
 msgstr "Egyéb"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "al-Admin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index dcc8a87679..13b4e16635 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 62fb9fe13f..fe56aae5b9 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Altere"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d8c65bc9f6..8b4f28abc2 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Lain-lain"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index d03aaed81d..e6873fc49b 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 4867951b19..cbe55089ae 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 14:56+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -233,8 +233,8 @@ msgid "Other"
 msgstr "Altro"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 9964db29fa..8912c42577 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 01:55+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,8 +228,8 @@ msgid "Other"
 msgstr "その他"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "サブ管理者"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index ad845081a5..a4bfa5daca 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "다른"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 55306588cc..6b1e939e53 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr "Aner"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index b4e462f1d0..203e186cc5 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr "Kita"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 64a7220d64..725d953126 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr "Cits"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 384ec05fd8..6fd5df90dc 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Останато"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 4caf358d9b..07857601be 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,8 +230,8 @@ msgid "Other"
 msgstr "Lain"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 51ea270fd4..551c484ea5 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -231,7 +231,7 @@ msgid "Other"
 msgstr "Annet"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index b056a1747b..15427dff1b 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -232,7 +232,7 @@ msgid "Other"
 msgstr "Andere"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index e9d4c7ed3e..3b138e17dd 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index a3c4bafc1d..d46730dafd 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nie mogę załadować listy aplikacji"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,7 +54,7 @@ msgstr "Język zmieniony"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -78,7 +78,7 @@ msgstr "Ostrzeżenia bezpieczeństwa"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -233,8 +233,8 @@ msgid "Other"
 msgstr "Inne"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9900cd1902..333a52a86e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -231,7 +231,7 @@ msgid "Other"
 msgstr "Outro"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index db32bde84e..a7fab8357c 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Outro"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 5b75657102..736ab30fa1 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +230,7 @@ msgid "Other"
 msgstr "Altele"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 8097464189..9351ed11ca 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -233,7 +233,7 @@ msgid "Other"
 msgstr "Другое"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index ed5268ef8b..8184b87355 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
 msgstr "Iné"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 31f679ac7f..53df424a01 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:09+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,8 +229,8 @@ msgid "Other"
 msgstr "Drugo"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "PodSkrbnik"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e2b81635c5..297e94ca2b 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 15:42+0000\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 19:31+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Za anonimni dostop pustite polji za DN in geslo prazni."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filter prijav uporabnikov"
 
 #: templates/settings.php:12
 #, php-format
@@ -68,11 +68,11 @@ msgstr ""
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "uporabite ogrado %%uid, npr. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Filter seznama uporabnikov"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
@@ -84,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filter skupin"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -134,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Odsvetovano, uporabite le v namene preizkušanja."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index d9257419c7..bc0ef8b76c 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 8a1ec02ddb..58e3af2ba4 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index b0d7bcaa1a..75b8006fa2 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index bf01e365f7..d20a227acb 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 07:25+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -294,7 +294,7 @@ msgstr "Vissa kontakter är markerade för radering, men är inte raderade än.
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Vill du slå samman dessa adressböcker?"
 
 #: js/loader.js:49
 msgid "Result: "
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 759aac3b94..ce1d122541 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,19 +78,19 @@ msgstr "Säkerhetsvarning"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "utför en uppgift vid varje sidladdning"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php är registrerad på en webcron-tjänst"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "använd systemets cron-tjänst"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -233,8 +233,8 @@ msgid "Other"
 msgstr "Annat"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Underadministratör"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 8577e194b7..e077e21a98 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index d4094c8024..f3b6dbd492 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 76aa17dd75..5a5c878723 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index b6f0f493de..0d42464f1b 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 6addd6df20..cbde93f567 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 13cb0c0962..4636bc0ca4 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,51 +37,51 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 7d5363ed9b..ad52e44469 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 788b9d9c5c..14b49275e3 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index c47fd095b2..055c902dea 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 578dadd19f..cfbac1de31 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 2495608db7..b79f34aa11 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 1407a2d290..f698972d3a 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 04f632d49f..e5de1cebb2 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index dae8ada902..9ab4be2cf1 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index eac091d383..961314eb0e 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -226,7 +226,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 1fd1b6cdae..1240a5ed5e 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 513cc5ade0..7db7161729 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 2890c2f626..41bda3992f 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 6c5c2b75cf..85309999a1 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 02:01+0200\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 0dc69f7f22..8a27bc9bdf 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 12:49+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,8 +229,8 @@ msgid "Other"
 msgstr "อื่นๆ"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "ผู้ดูแลย่อย"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 1ea3973f52..f2a34211a7 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,8 +229,8 @@ msgid "Other"
 msgstr "Diğer"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Alt Yönetici"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index e779674bc4..f32d1abccf 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr ""
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 3cf80bee1c..41c0adc6ef 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
 msgstr "Khác"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index b451fb6d41..70f3d9d228 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,8 +227,8 @@ msgid "Other"
 msgstr "其他的"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "子专辑"
+msgid "Group Admin"
+msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 14d709456d..f5e044527f 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
 msgstr "其它"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 890940b397..49d33a6153 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
 msgstr "其他"
 
 #: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
 msgstr ""
 
 #: templates/users.php:82
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 0bb70e0438..dcc592f513 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -51,7 +51,6 @@
 "Create" => "Crea",
 "Default Quota" => "Quota per defecte",
 "Other" => "Altre",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index d344b49ced..ed7378b80c 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -51,7 +51,6 @@
 "Create" => "Vytvořit",
 "Default Quota" => "Výchozí kvóta",
 "Other" => "Jiné",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Kvóta",
 "Delete" => "Vymazat"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 569abd58cb..c2c0d7a826 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -47,7 +47,6 @@
 "Create" => "Ny",
 "Default Quota" => "Standard kvote",
 "Other" => "Andet",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 05e227cbc2..cd61fe0ace 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -51,7 +51,6 @@
 "Create" => "Anlegen",
 "Default Quota" => "Standard Quota",
 "Other" => "Andere",
-"SubAdmin" => "Unteradministrator",
 "Quota" => "Quota",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index c0ab65a81a..051783701c 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,15 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
 "Email saved" => "Το Email αποθηκεύτηκε ",
 "Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Error" => "Σφάλμα",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
 "Saving..." => "Αποθήκευση...",
 "__language_name__" => "__όνομα_γλώσσας__",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται",
+"cron.php is registered at a webcron service" => "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία",
+"use systems cron service" => "Χρήση της υπηρεσίας cron του συστήματος",
 "Log" => "Αρχείο καταγραφής",
 "More" => "Περισσότερο",
 "Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
@@ -45,7 +51,6 @@
 "Create" => "Δημιουργία",
 "Default Quota" => "Προεπιλεγμένο όριο",
 "Other" => "Άλλα",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Σύνολο χώρου",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 55a7482d24..dc6d10903e 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -47,7 +47,6 @@
 "Create" => "Krei",
 "Default Quota" => "Defaŭlta kvoto",
 "Other" => "Alia",
-"SubAdmin" => "Subadministranto",
 "Quota" => "Kvoto",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 8da36b421a..5f2eaf2e25 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -12,6 +12,10 @@
 "Saving..." => "Salvando..",
 "__language_name__" => "Castellano",
 "Security Warning" => "Advertencia de seguridad",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ejecutar una tarea con cada página cargada",
+"cron.php is registered at a webcron service" => "cron.php se registra en un servicio webcron",
+"use systems cron service" => "usar servicio cron del sistema",
 "Log" => "Registro",
 "More" => "Más",
 "Add your App" => "Añade tu aplicación",
@@ -47,7 +51,6 @@
 "Create" => "Crear",
 "Default Quota" => "Cuota predeterminada",
 "Other" => "Otro",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Cuota",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 009cd1a8a8..1ead8b14b6 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -45,7 +45,6 @@
 "Create" => "Sortu",
 "Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 1c2f94620f..846fb769f2 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -12,6 +12,10 @@
 "Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
 "Security Warning" => "Alertes de sécurité",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exécuter une tâche pour chaque page chargée",
+"cron.php is registered at a webcron service" => "cron.php est enregistré comme un service webcron",
+"use systems cron service" => "utiliser le service cron du système ",
 "Log" => "Journaux",
 "More" => "Plus",
 "Add your App" => "Ajoutez votre application",
@@ -47,7 +51,6 @@
 "Create" => "Créer",
 "Default Quota" => "Quota par défaut",
 "Other" => "Autre",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 5ab1f91e6d..67937e4921 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Non se puido cargar a lista desde a App Store",
 "Email saved" => "Correo electrónico gardado",
 "Invalid email" => "correo electrónico non válido",
 "OpenID Changed" => "Mudou o OpenID",
 "Invalid request" => "Petición incorrecta",
+"Authentication error" => "Erro na autenticación",
 "Language changed" => "O idioma mudou",
+"Error" => "Erro",
 "Disable" => "Deshabilitar",
 "Enable" => "Habilitar",
 "Saving..." => "Gardando...",
 "__language_name__" => "Galego",
+"Security Warning" => "Aviso de seguridade",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executar unha tarefa con cada páxina cargada",
+"cron.php is registered at a webcron service" => "cron.php está rexistrada como un servizo webcron",
+"use systems cron service" => "utilice o servizo cron do sistema",
 "Log" => "Conectar",
 "More" => "Máis",
 "Add your App" => "Engade o teu aplicativo",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 48a6e14ebb..4981f44654 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -47,7 +47,6 @@
 "Create" => "Létrehozás",
 "Default Quota" => "Alapértelmezett kvóta",
 "Other" => "Egyéb",
-"SubAdmin" => "al-Admin",
 "Quota" => "Kvóta",
 "Delete" => "Törlés"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index bc02a7a833..96df0e066b 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -51,7 +51,6 @@
 "Create" => "Crea",
 "Default Quota" => "Quota predefinita",
 "Other" => "Altro",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Quote",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 2e157ea4c5..17efda2d22 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -51,7 +51,6 @@
 "Create" => "作成",
 "Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
-"SubAdmin" => "サブ管理者",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 969468117e..de2384a4ae 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -45,7 +45,6 @@
 "Create" => "Buat",
 "Default Quota" => "Kuota Lalai",
 "Other" => "Lain",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Kuota",
 "Delete" => "Padam"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index c000bc4150..eef450fa68 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,15 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
 "Email saved" => "Email zapisany",
 "Invalid email" => "Niepoprawny email",
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Authentication error" => "Błąd uwierzytelniania",
 "Language changed" => "Język zmieniony",
+"Error" => "Błąd",
 "Disable" => "Wyłączone",
 "Enable" => "Włączone",
 "Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
 "Security Warning" => "Ostrzeżenia bezpieczeństwa",
+"Cron" => "Cron",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",
@@ -45,7 +48,6 @@
 "Create" => "Utwórz",
 "Default Quota" => "Domyślny udział",
 "Other" => "Inne",
-"SubAdmin" => "SubAdmin",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 574aa75bbf..781aa3eb08 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -51,7 +51,6 @@
 "Create" => "Ustvari",
 "Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
-"SubAdmin" => "PodSkrbnik",
 "Quota" => "Količinska omejitev",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 0b4462876e..4138fa914d 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -12,6 +12,10 @@
 "Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Säkerhetsvarning",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utför en uppgift vid varje sidladdning",
+"cron.php is registered at a webcron service" => "cron.php är registrerad på en webcron-tjänst",
+"use systems cron service" => "använd systemets cron-tjänst",
 "Log" => "Logg",
 "More" => "Mera",
 "Add your App" => "Lägg till din applikation",
@@ -47,7 +51,6 @@
 "Create" => "Skapa",
 "Default Quota" => "Förvald datakvot",
 "Other" => "Annat",
-"SubAdmin" => "Underadministratör",
 "Quota" => "Kvot",
 "Delete" => "Ta bort"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 6c9386d3ae..6bd17e121e 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -51,7 +51,6 @@
 "Create" => "สร้าง",
 "Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
-"SubAdmin" => "ผู้ดูแลย่อย",
 "Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e3ba426f5f..8182236a2d 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -45,7 +45,6 @@
 "Create" => "Oluştur",
 "Default Quota" => "Varsayılan Kota",
 "Other" => "Diğer",
-"SubAdmin" => "Alt Yönetici",
 "Quota" => "Kota",
 "Delete" => "Sil"
 );
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index cb662c1b64..faf125225b 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -48,7 +48,6 @@
 "Create" => "新建",
 "Default Quota" => "默认限额",
 "Other" => "其他的",
-"SubAdmin" => "子专辑",
 "Quota" => "限额",
 "Delete" => "删除"
 );

From 6ef5edf5eac149e140f58019ceb7a35495195aef Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 18 Aug 2012 09:30:01 +0200
Subject: [PATCH 1470/1537] Use SCRIPT_NAME instead of PHP_SELF which won't
 send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.

---
 apps/files/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index e1c4ad7f19..d65aa6cabb 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -39,7 +39,7 @@ OCP\App::setActiveNavigationEntry( 'files_index' );
 $dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir.'/')) {
-	header('Location: '.$_SERVER['PHP_SELF'].'');
+	header('Location: '.$_SERVER['SCRIPT_NAME'].'');
 	exit();
 }
 

From d54390b1a0e7b36ef9b806e7b61f5ff9f85d190d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 18 Aug 2012 13:56:04 +0200
Subject: [PATCH 1471/1537] Optimized image size

---
 apps/bookmarks/img/bookmarks.png              | Bin 496 -> 398 bytes
 apps/calendar/img/icon.png                    | Bin 423 -> 360 bytes
 apps/contacts/img/contact-new.png             | Bin 658 -> 525 bytes
 apps/contacts/img/person.png                  | Bin 978 -> 852 bytes
 apps/contacts/img/person_large.png            | Bin 7929 -> 6993 bytes
 apps/external/img/external.png                | Bin 459 -> 412 bytes
 apps/files_imageviewer/img/fancybox-y.png     | Bin 176 -> 166 bytes
 apps/gallery/img/breadcrumb.png               | Bin 220 -> 201 bytes
 apps/gallery/img/delete.png                   | Bin 275 -> 240 bytes
 apps/gallery/img/rename.png                   | Bin 310 -> 267 bytes
 apps/gallery/img/share.png                    | Bin 377 -> 338 bytes
 apps/gallery/img/supersized/back.png          | Bin 2629 -> 2319 bytes
 apps/gallery/img/supersized/bg-black.png      | Bin 1074 -> 1065 bytes
 .../img/supersized/button-tray-down.png       | Bin 1506 -> 1464 bytes
 .../gallery/img/supersized/button-tray-up.png | Bin 1466 -> 1451 bytes
 apps/gallery/img/supersized/forward.png       | Bin 2614 -> 2316 bytes
 apps/gallery/img/supersized/nav-bg.png        | Bin 995 -> 993 bytes
 apps/gallery/img/supersized/nav-dot.png       | Bin 1901 -> 1640 bytes
 apps/gallery/img/supersized/pause.png         | Bin 1131 -> 1124 bytes
 apps/gallery/img/supersized/play.png          | Bin 1562 -> 1549 bytes
 apps/gallery/img/supersized/progress-back.png | Bin 929 -> 924 bytes
 apps/gallery/img/supersized/progress-bar.png  | Bin 929 -> 924 bytes
 .../img/supersized/supersized-logo.png        | Bin 3982 -> 3488 bytes
 apps/gallery/img/supersized/thumb-back.png    | Bin 2122 -> 2010 bytes
 apps/gallery/img/supersized/thumb-forward.png | Bin 2118 -> 2007 bytes
 apps/remoteStorage/img/remoteStorage.png      | Bin 1273 -> 1024 bytes
 apps/tasks/img/icon.png                       | Bin 457 -> 372 bytes
 core/img/actions/add.png                      | Bin 488 -> 441 bytes
 core/img/actions/delete.png                   | Bin 275 -> 240 bytes
 core/img/actions/download.png                 | Bin 246 -> 236 bytes
 core/img/actions/history.png                  | Bin 370 -> 363 bytes
 core/img/actions/info.png                     | Bin 474 -> 423 bytes
 core/img/actions/logout.png                   | Bin 657 -> 592 bytes
 core/img/actions/mail.png                     | Bin 463 -> 405 bytes
 core/img/actions/pause-big.png                | Bin 183 -> 166 bytes
 core/img/actions/pause.png                    | Bin 182 -> 170 bytes
 core/img/actions/play-add.png                 | Bin 275 -> 237 bytes
 core/img/actions/play-big.png                 | Bin 212 -> 210 bytes
 core/img/actions/play-next.png                | Bin 253 -> 224 bytes
 core/img/actions/play-previous.png            | Bin 260 -> 237 bytes
 core/img/actions/play.png                     | Bin 220 -> 201 bytes
 core/img/actions/public.png                   | Bin 459 -> 412 bytes
 core/img/actions/rename.png                   | Bin 310 -> 267 bytes
 core/img/actions/search.png                   | Bin 701 -> 554 bytes
 core/img/actions/settings.png                 | Bin 883 -> 683 bytes
 core/img/actions/share.png                    | Bin 377 -> 338 bytes
 core/img/actions/shared.png                   | Bin 437 -> 364 bytes
 core/img/actions/sound-off.png                | Bin 217 -> 192 bytes
 core/img/actions/sound.png                    | Bin 292 -> 254 bytes
 core/img/actions/triangle-s.png               | Bin 526 -> 515 bytes
 core/img/actions/upload-white.png             | Bin 228 -> 226 bytes
 core/img/actions/upload.png                   | Bin 236 -> 235 bytes
 core/img/breadcrumb-start.png                 | Bin 452 -> 311 bytes
 core/img/breadcrumb.png                       | Bin 452 -> 320 bytes
 core/img/favicon-touch.png                    | Bin 5703 -> 3705 bytes
 core/img/favicon.png                          | Bin 1231 -> 912 bytes
 core/img/filetypes/application-msword.png     | Bin 28346 -> 789 bytes
 core/img/filetypes/application-sgf.png        | Bin 725 -> 702 bytes
 ...ication-vnd.oasis.opendocument.formula.png | Bin 580 -> 479 bytes
 ...cation-vnd.oasis.opendocument.graphics.png | Bin 572 -> 475 bytes
 ...on-vnd.oasis.opendocument.presentation.png | Bin 441 -> 333 bytes
 ...ion-vnd.oasis.opendocument.spreadsheet.png | Bin 436 -> 344 bytes
 ...pplication-vnd.oasis.opendocument.text.png | Bin 420 -> 347 bytes
 .../filetypes/application-x-7z-compressed.png | Bin 652 -> 650 bytes
 .../application-x-bzip-compressed-tar.png     | Bin 652 -> 650 bytes
 core/img/filetypes/application-x-bzip.png     | Bin 652 -> 650 bytes
 .../application-x-compressed-tar.png          | Bin 652 -> 650 bytes
 core/img/filetypes/application-x-deb.png      | Bin 652 -> 650 bytes
 .../application-x-debian-package.png          | Bin 570 -> 548 bytes
 core/img/filetypes/application-x-gzip.png     | Bin 652 -> 650 bytes
 .../application-x-lzma-compressed-tar.png     | Bin 652 -> 650 bytes
 core/img/filetypes/application-x-rar.png      | Bin 652 -> 650 bytes
 core/img/filetypes/application-x-rpm.png      | Bin 652 -> 650 bytes
 core/img/filetypes/application-x-tar.png      | Bin 652 -> 650 bytes
 core/img/filetypes/application-x-tarz.png     | Bin 652 -> 650 bytes
 core/img/filetypes/application-zip.png        | Bin 652 -> 650 bytes
 core/img/filetypes/flash.png                  | Bin 582 -> 580 bytes
 core/img/icon-error.png                       | Bin 1573 -> 1344 bytes
 core/img/icon-sync.png                        | Bin 1577 -> 1271 bytes
 core/img/icon.png                             | Bin 1344 -> 1109 bytes
 core/img/logo-inverted.png                    | Bin 8116 -> 5938 bytes
 core/img/logo-square.png                      | Bin 22792 -> 16048 bytes
 core/img/logo-wide.png                        | Bin 2293 -> 1908 bytes
 core/img/logo.png                             | Bin 7356 -> 5860 bytes
 core/img/places/file.png                      | Bin 391 -> 364 bytes
 core/img/places/folder.png                    | Bin 386 -> 339 bytes
 core/img/places/home.png                      | Bin 416 -> 372 bytes
 core/img/places/music.png                     | Bin 561 -> 532 bytes
 core/img/places/picture.png                   | Bin 307 -> 300 bytes
 core/img/remoteStorage-big.png                | Bin 9742 -> 8997 bytes
 settings/img/admin.png                        | Bin 302 -> 224 bytes
 settings/img/apps.png                         | Bin 255 -> 229 bytes
 settings/img/help.png                         | Bin 474 -> 423 bytes
 settings/img/log.png                          | Bin 441 -> 342 bytes
 settings/img/personal.png                     | Bin 589 -> 504 bytes
 settings/img/users.png                        | Bin 743 -> 639 bytes
 settings/trans.png                            | Bin 187 -> 185 bytes
 tests/data/logo-wide.png                      | Bin 3559 -> 2882 bytes
 98 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/apps/bookmarks/img/bookmarks.png b/apps/bookmarks/img/bookmarks.png
index b92e4f50a42c68293d256e21cb44d31debbbb840..3e8eed2380f0fca5157ef091fed59508e30ef93b 100644
GIT binary patch
delta 371
zcmV-(0gV3e1C9fbB!5*&L_t(I%VS`m1~4--OR=}NzinY*5$ELO6yodaTcV<(!iKI+
zTU(nAs3yh6#^%1Msc9Ho0;qXvdwcu;qN1YD&d$ysYin!&2LuEhhRN&c>2U!yRoL0t
zJ<rO@`dn32_20_Msu9J2Y15|t-@kwV|K{fA|Mm6t|HH$>e}4mA1Jcy!;NbAGxVZTH
z!i5X}FI%?ke@jaXZUfrd+Q0??UGqORHT7#mM8x+cOO}8&!Z6VWw6?bXkB^T>(L8DZ
ztqcIhcjwfpQ{m~LuC5NR0U$Nj*48D+Nm;?w)%7V*!_O^SwtzKeW@cg-07^(DB_-b-
z9UUJV8yicYq-=9@b8|jhTia%!<n!w4>aRO??0_3EZ{EEB+1c4&K}i{yq^p2=f(K{D
z0w!AyprSk={n*>v`zMh83Do!y=;RDgW+FO=hK7bR0i79QVq)S4<TBw>2LR^+mdkEz
R_?`d&002ovPDHLkV1oP5zdQf{

delta 470
zcmV;{0V)2D1MmZoB!9O_L_t(IjqQ^$h#El{h2PGs89imy!l-Dmps{gT6hUkPVj&WQ
zK)^N-2;r)`>L5+(E3OV{LaJ-72w0@B5-VXrge~l3EsPqF6@wZ@XLr-+aol+%kTzd6
z4DWsO^TPoD2nB$AKL0kEOx{GJ(VwYQ>Y1V_FKpZH%w{v|ZhttPPCrQ`5^rQ#{u&O4
zC*$$BCjx-S<H=SkmE?3f{iy4@oylY*O6kjfzyBNnR8>8ZB<YM0a;_+fFAxa$TCG+Z
z0K|jc@AsonDENZGAUNk>j1@|y(tFOihY)g_%jG0hRoyO^3x;9bP9@?Vlu~fc5sSq{
zNs>M+77J3XR)5`ukfS>|e!EAO<rBu(qvbye{)Yd8y?|1>bQ}i&U|ALp=f`jy2ZA6h
zZUxKb@>9KDAGh1>Z8n<)V+`x{`ayBG+o9X-Zko;J_swQ=4ebBIXf&FKLZQ!t!2p`3
zr6Q3CDVNKx$z%f4G!c)-p=sK$Mx$X4hr=t=G+*nwK2HMx;r=VdV$sbxe<zCKh1ctS
zx>~JZ+x8F3vM%TI`Ila=x4oNxAUIH~)resjuLMEZb~>GJ0PJJA-<IN`DOZb+*#H0l
M07*qoM6N<$f<cht+5i9m

diff --git a/apps/calendar/img/icon.png b/apps/calendar/img/icon.png
index eb9e07cbb10df41ae8439c4475ca585a6f36445f..267efd997f362de92545b177071eeaac0cb5bdf5 100644
GIT binary patch
delta 262
zcmV+h0r~!?1Ly*fYJULeNkl<ZD9@$RJxW7C7=__y3t50o+=1z|O)vIhp&^xEBcxC;
zWw6plNE_Tiw8}0NbQfyK4+%=NImH+QLNf5e`QAAL!`#d7b&Fkp*B)+Gcw4CA0gdF6
zM)s=df=7Jg6EAqqT=Ilhd}Z##BEvgQak=8)MfN^2FQ8R$jDNEw*NQt?a^BX&7?se$
zPV!->#C3|^7)HhGwy~Xj5X7~M-Uw!BhJGHRiM!B@>leKlOi>R#93@|cdR(vQO*gvg
z1hvq`e)4&!#dV9`1m?xJ8Q?m(7g}+HqBq~@s>3x74&i>qzxf}%A9;^%4fHQl7XSbN
M07*qoM6N<$g3x7twg3PC

delta 326
zcmV-M0lEI@0;dCzYJUMINkl<ZD9@eJy-HkR5XSMJ>shc7{D_61%_>NYMbJ(yy@B-B
zR`wQJSX$~Wh<6}%w%$MlQ@PDT5JXLIg@C%+JO^GsAn3qw&iv<j&&-*3cxiiB^wyTJ
zTY@UjNi;EqSzNq2_!ZM=;T|10!c)K*P7{~@6Tk3~_z-#tZhx?jt#=M?Cif?CuMZnV
zOP3hLz^hjOp^Gmy=)<*7S{K9d9n9x_H9j1+Q|P)?@qcwoe-qz@-C!iSTK81t8rA|9
zGTlpj4;zaw6uM@WskV!+ckmnIVeM3#DRjLGk2nrk#tF_dUCB-5@@w5=g+|(tDsvc$
zxNd(Uxmwq#vOjh!0j=!i6~2Y_V>G#ya#e4OtJy9p{fG<OE_Anz4CkZPgM)W=^MAho
Y45A)c7GVV1GXMYp07*qoM6N<$g0z8~-v9sr

diff --git a/apps/contacts/img/contact-new.png b/apps/contacts/img/contact-new.png
index 087ad9ab2d3f7626d55f34910c57138470f54f99..a91f2e620faf75e9aeec40bdd19e1d18f402bd86 100644
GIT binary patch
delta 426
zcmV;b0agBz1&sudZGQoZNkl<ZILoz^y=%fy5Wq7S$RPMZ2i+XAC0nv}ap<Vv=Hd_}
zh(ibx9lM2CoOE|9j#BsH;>RLVx&)yRGi4B={Rgh^0trcDTGOTve!Sd0?nmAw90dSW
znoy|=$x;Yb3fy|a`);=jrfK?2CKKp%I<VbtV^I_ZtApJ6LVvO#xaRXY6bc2XR4TC)
zi^XI@K@dQeWtV2N=@!-Nbw5|FR+9;_0P~1<JxP-MT%*xQCM=iB!1Me?zKEj2Uatp^
z<M>RcQ)su_uv{)L@}rPp7|7@ISCPqNAeYNQtJU(sI3(=%`(RntRfwVpEX%@dHiKHN
z=I$7WgxPEsN`IwN1e&HVUJnJ>cYMY@B2-m1^kaK)92XLe$7A=67K;T81_L*TJI3qv
z+O%!^(G|utIRbwD@6LC--3tnD2<$cN_xm@m9oQz61lvW<UlUCda;1mE;qY`k9-j@v
zIHOS4^>>UhkLSM~Q|xFoa!@!N4o?{Wbsn;t&E}+O+9StmwK}IEWC&sa=HDjvCy5ev
UV|f|)%>V!Z07*qoM6N<$f^&<=1ONa4

delta 560
zcmV-00?+-81d;`iZGQp}Nkl<ZIE}58v1=Mp9LGQEL9W~hEtjB+5jv>jWlffh>5$>3
zh=bjPlmoleOrhBvT!b`#K!(6=xuuf9p&bGaT69Rbg4<1kqNg{UI9!L=BO$rgkbL0>
z?|r{~zr5djKVHQ5eO?pMS4{&Vz~^PX6d!%x|0w`(bzM*Ex_=%h&1RF^+gpmoVyN3N
z4C?jzed-N>0I<HkPBxnj6w9(WK0c<=XoLn%r_(2SA<U4;WZ2r;0$?_qadB~hrfDP+
z2>|;2KFwxx^}u*MPBNJUKoms)6h#TR;c)o86W-k1JTR%MO1s^r-EPzEcEfCUfv)Q^
z7z_e(JRY;Zzkg4mP<Ya`ySp127y(X1QT+P1t^dJwT_j0D)3kuQyu8G5oDaV5UkL!^
za+$-!!<7Q_`8<=!guT5z48tIw&(mtPa2y9%wtRMW#`*dABlBo9VzF2};&ZtimStg@
zCaS7F&;)=|sYIz%dSpB}IH1?-1^d&}Q#Lj>kR*xg>wjwiJkO(6tDz`L-L~yt04IRI
zN|~nlPrcLW^aS7=V61R`q|@o|$z<|9+&zx#y2!GOEXx2yqtR&OIp3FU+cnSgvTJK=
zvSAqN(b3VnYPC8o6bhaBeC~>(_&ap4pF%2?`m$W+1VQ)#5R1hYo12@T01IC5A8v1N
y3zbS`wkfl-^C06{E#HF(+@F^&;JqX;6n_8?>C5mn{&NEW0000<MNUMnLSTaU(H2Ai

diff --git a/apps/contacts/img/person.png b/apps/contacts/img/person.png
index 17e791965402a1b9335d662b8909a8d392870416..e88bb5653af5088fec4a8564cba752c91aa87b85 100644
GIT binary patch
delta 755
zcmV<P0u24q2h;|TZGQsMNkl<ZILoD!OHW!+5XbGNk5yMq+E39YU3AsNq~E2hrr)3&
z(}ZA9EOEoi1rosrU?3`*U?ONj06{=Nd59t}!<+E9x0LDpPfFA1Eop8Sley=dnctav
z&iu~|5zS1qot>R0dwY9d_xJa+Zns;8#~Aa|@}@%9*VmshB!3l+Mu+Won?|D%wOTDY
zJ3AZh?(U|rt_tjOx%A<1SOT!$?^C1E5MW7?C=dupSXTvhI-Ny;hQlGD;##dnrBX@w
zySqEWx+<{UZkKz#o`9lSz>38p-QM1c%565AtQK4VtX{8EwOXZexlDyZK^Wi+E~o-;
zZEblnnT)6upnsd28@jr>5<Znm(dOo+M-_N&ZS7ky7#!nV0nFucluoB9pU;!u?;m4b
z71(4ly|-GeGOEsIvvhHBL6?`8!ZtQGq}A2c530a0i^XDO2qlxr-{x>Qi0AF91p;Fs
z%x-UQ%Y0FEa&khfI6!}JtIhrwm}UIV=ks-V0|3zp<bUyadMxcXs=x;a2hX{>FKlhT
zFuB=migSifBoa_vgRB0;vVQzeU=Do2zpi8Jot~bGH{#d(Ku1SM6p2Ix9DRL!d_3Uu
zuJK=dURhar`d2Xb?JE{VlP^f_bUHK`48$AJ?REuxA{4YAdK(+yn>XxpPnWr<mx^HS
z%ehb}^nV@ltyC%k0sw5HJV+YKLoefK;4#mAEt}2eIYlt{r6V4X)AjYWNP-|BjEOif
zhn_|sLwS7Ggm`@8sF1G+=5tEMVlg^DKPRr7@cpOpyZpcqhj?s&d_}O)XzZd2KyXn?
zp!<e6#3K*+O5jJ!%gcqs!$actf%qas6-w1k=4`NzIDYie+k|{@9#p)ru<+VoFvORZ
zmb!YqzR#CA=6)ux*DE#y6dq&DvtY)Hi;I24BM<pg1)|Yt-m-n1pP$!ou!EDMI-Rbr
l)oMrZ7-Jsmh(r8+#!nR=<5Mj$0B-;Q002ovPDHLkV1nMlcMbpm

delta 882
zcmV-&1C9LD2GR$RZGQt#Nkl<ZIE|guzfU7a6bJC{&U$zKBQg>gtiU11LFRlEC!OxE
zKuYVAA}DAtMXE@l$rXuoqD^~Es^|(w6e&W(RjE%DNKl-C*inoD0bbkdot+==rHK*b
zz$ba6*Npak_N&=>>o7CMt(~2nKnU@J5aMfQUUVGiZz6h2M1Mc6uC68z^*Q6<dcB^>
z=kt5>^YdSnN~Iu|%V97WpxJCD?RNXGe!u^$R;$JL^@?$6v)SzHVzF3WSy>4@&qJ@*
z0{~R3)u2!)l(X6F>xX*B!p!`lTrT^@7-+3QL>LZ-==b|5l}bJ{znBO%#>{%2ha^d0
ztpyQ*nIWZw?|=KyTF*`d12~JK2&2Te@xfpK0A~}yMD(H8>%m$Jtu?gPFvi@#MD$@I
zSShvN?RI&T*cbz242TF}7_!!Se<Iiz^V`wUkr@t$AR=h3!OT!fq19?>Ywhn7!Rzbm
ze=_qgdwY9ON`Z)At;NB?0j#xutgWrRn+OJgsi~>AzJKrQ!^1;dUti<o<OEVm%H?uD
zkL&v+EQE+>W@cn2lR>N1f|L?-b8|8Xg6_D!2S<8$cXvu_{Vjm+DwRs6P$+m;S67&x
zp2q3vsX9JBj+psX9LH~JwVL`QT(8$>gCO`Gz{|zOMR#dwDPU$an@xmah<rYeQmF)`
z6dH|&ynnd3h=}ONFbv;pY;4GT;qC41&xH^N)oL}ju(05Ho(E=zwf3frF|gJml}f?$
zJj8K~Mxzm*pPz?B^sH8^bpRlBJFQac<?{0KXT@SMH5?A%I1U`g0RS*Fi0G!2Qn1#-
zbzM{{l}r!>sYavm4S-i4!PeTRK@g<+{XUE_AAiB4y8Qwof|L^JblPL)rz7hQthIhT
z8rRW}=JvYpLu;+!I1XIbh1UA<X#dW2Q%XH@T^B@zD2nc+eCYN>Q3N7_5CTf6NB6;w
z*1CIkc7`NL(CKs_gt&7YHxK@|Cxk$!(}9!{olXZ@>n;H2|3|?|l6<wlzyB){m6+MJ
z)@!B<g@Th#r;*8I;QKz5Qi$UiQc7H2UUIwLmhE=i3L%<W>ooujJTM?zTU*ZoJa=8U
z?7Hp~$8o+Sq6KU1l<T^o5aJ(ZKDO2#T5C@Lyx-j1e1F^c7g6goY&SB|-T(jq07*qo
IM6N<$f*y~%tpET3

diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
index 4edba0c5489d1e92b35f9f813189bd8b7c391f17..8293df61829471e682d7d2292972253ff1791cde 100644
GIT binary patch
delta 6982
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
Y15x-R9F6yJ0ssI207*qoM6N<$f+RIT;Q#;t

literal 7929
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

diff --git a/apps/external/img/external.png b/apps/external/img/external.png
index 75d1366326b1bb1ef22ffba0a0982ed5112096c4..9e56f2919fdfe4b42fc74894cbb4364e9a9c2b28 100644
GIT binary patch
delta 311
zcmV-70m%N#1DpepZhsj`L_t(I%cavzD}+%L!114AF^xT&`3CkDnzECng=C{7<r7Rc
zQa*$z-(bS*l#~^*uwbd4*gPBAQySOiOkK}BUSe_T-gEBxpVup;<Uca3potESP@=$b
z=$hXG(8dimafXCf>|z~<Xx9S5xsS!T&tnxU0h+`J_Hsy`c7K8WxVNx@b8O)m2VrZV
zHz;QS=tPu8meDvKLZ5J**=Etn0X?MbK`VNZGP%QO*k{nq0cAXzj)px|oD<$Lkp;P^
z1MJ|o#yO#^Ozdi?giP*h056!rT$I?YYhuD_=$7&LMK&kZCJx4!aG9k!hV2?a@o9{e
zMM_x8^lKI8{xHxYRUk#oe<8N+trEHY+t1XC>6CH)`7`}RJ^=9Dn^AEa3j_cF002ov
JPDHLkV1k+>nQ#CA

delta 358
zcmV-s0h#`s1Iq)DZhuHgL_t(Ijiu8uOPoOv2H<CtSR5yIAz~2n1Ja6OI7k=7%0hxo
zK+*{Ic9LJAC|KF1xh{|<B%mSKSqg_~<VX;##DH8Th5KEW^=m=~wwT$OcV^z1NfF_H
z<WX%%DRr@l1<d0YPVp5x5piAmKd6Fx_>%2Yn88yFafQR|^M6+&LT;mn5mvLlgmt_@
zU>XT~=#AsDa~A{bXMGkM_=Ig-;voNZ&_}lf*veTtMMaZ1&-TE#;_oH4B4W(JVs7Uq
zb1{q0cvf`VNhvj?-(qge0WNZudF<k6k-2%l@uaBYsH~uoWxT*+_hlFnKMMU}SwX+b
zcGgnC4W8pwCSUn|8;OCB*|vu7EkJ<}4T<#_1II<56L{AGFi?)MTBN}1!v3}j9;p|p
z0vWiQ|BAb<yR9<!%9vDNV{uH2npty#V=c#Y58z+r55tz^M<0<)NdN!<07*qoM6N<$
Ef;@Yw&Hw-a

diff --git a/apps/files_imageviewer/img/fancybox-y.png b/apps/files_imageviewer/img/fancybox-y.png
index 7ef399b9908976fc36f760fad7876a4d9c38e006..62f317619985442079767e6914d07bb0b7949766 100644
GIT binary patch
delta 100
zcmdnMxQuavXRL>(i(?3fEbGB`-Ub6627__~J%>N_vaeV@bUDjT`V_>6J32eEmV}s?
z$Yi{*2n^h~Fu^@Z(ct65!$*#|JaSc-z@ek^NmBU%yP=1~|84Va3K@XF)78&qol`;+
E0JyCqL;wH)

delta 110
zcmV-!0FnQu0k8p(NoP_?L_t(|+DwdH4uBvGgNJ~60>b@IM>v5Ay4l7)*yKz1(=A1W
zQN6VU%YeSwr=mKGL(ciB9jUt80UzGL!2*w1KbX0carLe{)-mQ}Z?6CY05M1y|3Ec4
QnE(I)07*qoM6N<$g5Sz8qyPW_

diff --git a/apps/gallery/img/breadcrumb.png b/apps/gallery/img/breadcrumb.png
index a252a751554e142eb9dda6daecf529b41ffb0bed..adbef1e576d75dae458de9e24e5aba3822d2c358 100644
GIT binary patch
delta 98
zcmV-o0G<Eb0m%W7Zd*o4L_t(I%VYTe|33pIn1N~r0KowucA&(7|4>YlLD&o+$sl|N
z5M>ZC2H-V_6a%mtL{|gI_5#^~NOm-moscL?$^(`g0bNE(-+2#M3IG5A07*qoM6N<$
Ef_h>k3IG5A

delta 117
zcmV-*0E+*~0o(zQZf;pgL_t(Ijm6VJ3IHJt1Hi<W`E-94FA94o-PVE%xd<7kMM^^D
zv{L&EkQ^j?T9AY_hE@iEzVH8H0V&7>LQn*7p$uR`<uzUz;rJ2Vq6dVE7LY3L@cD0?
XdXP`r+S~qZ00000NkvXXu0mjf8~HJj

diff --git a/apps/gallery/img/delete.png b/apps/gallery/img/delete.png
index bc0c782882deaa4f9ecf1676592ddba0cc9aacbc..fa8e18183ed3d126ab5706d093f7e64d944c835a 100644
GIT binary patch
delta 138
zcmV;50CoS90`LKlZhvh_L_t(I%VYTe|33pIm|<`k00a#{ya0%~FcbpCfOtMg4L$=v
znn8@KK&*u%t_2kXaTee+fD1|CS0IiD;shugW-u4tFo4<y(}0Y>BD)H2AVO_LHz0xN
sSfI!Nio8H^AW|b5DN9I0Gcy4I+7e6GgT+Z{00000NkvXXt^-0~g4cC0-v9sr

delta 173
zcmV;e08;<(0h0odZhw$TL_t(Ijn$Jo4udcdMBk+JQRq2Od=zdH=TM>M64XOuqQ!zH
zrirDMto6>@pDf$-oJW`Xc7UWwQjwI}KuJl`OVV_Bu>Ccl00ut55d1^+87K!$14too
z1)e~z_Z^%r0U_Hih_=S6E&&yiPXPHWwtEZrw$MGqU)I>pU?u_Hz-W68ZO*`06D(1n
b|Nl%IZARTucrYZ}00000NkvXXu0mjff{sp5

diff --git a/apps/gallery/img/rename.png b/apps/gallery/img/rename.png
index 9993a092df101d4b2796379ac6f1cbe62f131a3c..3af6840071b4597458475c9098a79d533b66c2c4 100644
GIT binary patch
delta 165
zcmV;W09yaH0*eBWZhweLL_t(I%VYTe|33pIm^8%<3?@L_3&ft}8qfg5AjUr+_9of@
zsKy2~LnaYr0Fs9PXoffwGyqLAiXjBU0EcGc3?NoBRs%@Uj9~z&no$e@0%IUPLyBf}
z1ImGz16#BaGyn*AfY<@b=774Sf#|#d1Zhy49iT2TCMh!k!5&PgAv`qAjo2^%i-t)E
THLi#m00000NkvXXu0mjfmP0(9

delta 208
zcmV;>05AWG0=5E>Zhx~$L_t(Ijir;l4Z<)Gg};X=QZNB)1c{awu>lJ(0wrF6hKZ19
zla+WhCUO!;Y~`erPS(92pU<+*l30~AOWH}gOFDLkwzCrmfPpt~vYkf|fnh-Mu+2Kd
zb^va%#&(bd@S43sqLyYzd;ShFRi2Cj<&pZ&A(ntg1f}2}0ZC8;O$m5Na0RM?i%D=t
z0BnFmtgGl`7Mw298Q8`J*#j5b?d%gmM^FPT(Aa+F0KcK7-}wV70!%R>tR%+(0000<
KMNUMnLSTX(O;`N@

diff --git a/apps/gallery/img/share.png b/apps/gallery/img/share.png
index 62c4627f317dc007a1186852c9df294bf1ed34a7..099e4d6ab350b775ecf46669a7c47950fd0810aa 100644
GIT binary patch
delta 236
zcmV<I02BZD0@4DIZhy~7L_t(I%VYTe|33pIn0SQ@45mQ58Hn!!aU~Elk!rw2ApVbp
zy@)md2wc!KgYZ;>1^|I35U&8@e^?A~L@@veWPvyhh~<G;6^IuD@n5Lo$3R>T#LI#B
zC=e&21R@Z`0P!EF;(ti&XF!|_#O!!u0SL~aIqxSB7XdLRQDxBx1jo?~_zJ{fK+H(2
z0e(RI8LIg&l0lb&I2fNn$brZQ!~sAo3dFWRybsBs3qYI-#EY;7BA#e;0OEsKq7XA0
m2^bVcRzjj$Ql?5~!i53q77bmDB=FM!0000<MNUMnLSTXsWL}g2

delta 276
zcmV+v0qg$K0{H@vZh!VkL_t(Ijiu6|N<?801>kSCh{a|Ulfh!!C@7c|L=a3CgEosr
z_CfXqG-%&07_6e0Hz~e=#f5dpuy^HhUH4wufq|dl%$YN1{>V)8M5`$<BH9tri->+i
zbRuHho0*Lg&&X2lW@a-55wU}fN_nqV0oHMgQDu5!J2RERD}Ok{D%Nm~uLAsvOWfcA
zCqI2f^D%}6cvO17;~Wcrsw@Z|EAj@oz+#=b6B7p&gNAs+XRX79f_;1x(<gf;UT}z*
zxk5p*gaa&N6L%$|C!FGHs);ksxP|*EC;WZJ8ls~q1l`62v%d0w2-@hOj}BUyId*rR
a_y!McRK>UQK@FGy0000<MNUMnLSTXz|9yb~

diff --git a/apps/gallery/img/supersized/back.png b/apps/gallery/img/supersized/back.png
index 44cd0ae703cb0810dc707f0da621708e14018fdd..f0e809ece0934f4ba55bcbb3b289bade51d6ce08 100644
GIT binary patch
delta 1452
zcmV;d1ylOP6ps?Hb_0I}gGod|R9M5+nO#g<Wf;c`l<%)nzO2A3UuC6@NPv>{W(gS=
z8wu(a4ap!7dodG@Q4=*zZw*Yw%}BO{i|LHW1sdHngbQH;nUY2cp3^egLdPHzHpUop
zW_t1Zf11;i)3XjvKPVZ=KjpmVeV*s{KIc8}*HJOXR8dF`<v@Qr=q0EMs)5YHZ<SE4
z6Y8m>i5ID%1~Nb|M<9b>f8el`o!ST?<*F6@#T+&ZIw}w7^?DoZc6+zgYW>V?Hear&
zsJL2MS~^u!RK(FQT~j&Tr+QRB1oTnCe@tMD<pG9=hg%yO8ZPK`x;X+<DymO*WFG>$
zI9gb})Zz5>w6%Y!sp))iaq)a%VIdc($e#R=KN+w-QrJqVBb&{320<LrK!$*JkY5>a
zWw@|qQU?}`<?~oV%0>Q_WH=OPk<<`>7YhmsxPunO*{=_W8k$6dmX?;Y@c<1dM22(r
zf;9#z_V)Jn;0<1gCoHL>qeI$<jn9JB1}cq>jU5N5BR_vXpNqFBF2$DsYeT`B0u@Xq
z)1|`z4T$1PU`=vZP2lFhz`#j7js>k&%N>>|K5<BZHBwk{QBqe|cOjO6b8>RLsi~=3
z`1RnLS87Kbvc-=ou*?(ZdW?H>d3kwUv;v$vB_(AGLD}HoAjALL8jZ$<d%O~R;*hN+
z)Iq})Mu30rSb(ObrEO$oWwHKq=h(yDT{bg2%Mue4pP&It0Cp<%Lp;)9OeHLg{RNGU
zjs0-OMXJoqOrKh<-Z^!ujX9kzfIjl;#;?DzgoK3u&;W04ZmvtIKjM+V>Ik+xP@vcA
zN8pT$Ks+AvU7hYlcKM4h+4h5nqVD{)!A_s<V$^>KG-esubt&~rJQCP)m9YKr7hsH=
z3KujzJ$*eXDe3VWb~{`4-D3CdZ;P6`{tK(Bs%E(V59+NUvu?mTmHH+g32aT!tcAC5
z4$e3w%FfPSOioVTG8${y`1l0d*t{2{kI#O>l2cL$^bz{-I<o2|8`$znV-SyYHd6_k
zJAZ$HQYR!l_RV+Sd!MbX-@&8a6t&`8Wyg+LsgM3kjX_3l1JnahS2&;nNnp)EnZ+A8
z2dA780br@@$PxDS$T#dZfTjBOyYE@G!Qjs-U~l2^FT#db>N_C3WDa>|#XgIfV=4@1
zJRa{FhNQ=@zV<r%{f`CaTU{6B_WIZdAAWzt&?trs-vzKMTwvmn_gQf?C@U))fm2SY
z0OHKZ$XLRg{s7J~t`0Eo%4(3NXK%0*Ct7Jz*hGC7?0BXA!80l!4a9M_zP`Rc99Rl0
z0N=!vN?HEfVrga*6F)Pz$0zFAkK_J6jCyXWuhc*B$j4c62J7nT>V`8e0`UNGp?`l;
zmbdWO*;{YF!~WzK+2WFy{c!Ck|D=F!vrP4r`XwIu3?{A(JRVO29;X8ixd`P1@FKFj
zf-LWrmzT3EUyb-hnML_B?z@!uA`aq_uML7$T?T_;C<<5-4<IM9NLk(l<deoG3(a8n
zQRYz!OB|tAT|w*FzP`SbaLC0#G+KX9mfh$U>-hEH`X)6*i9K;VYdssZQ>d)0yc8>7
zA<Hh30Lt%YNAdUCDFp4oMn^}Fqk}sTfQz>%F2&z(4;D0=b#`|490qJ#TicsTcDGNR
z8#FgJe~P}w#Y;w`@q9Sv22Y*Hp#NNq2PnmnfxZy-S=Y|a&MVa7gU%?$kxqZD;hrK^
zOIzCB-hKvessnR87b}rJ@+-?|btFfg>2l!7$w_NXP0b))g!yP7$)5a>zYw75F+KSn
z8X9Uv9~%lc(^Q}A$o?QszW4m5Fh4(UvDs`rCX=bZq@?5uwjozBPR?M)qVaNuuBn{v
zQ$4DG(BBlEyRS9R<#({XzAz-}g)fRmVH0W;uJy6{!uUT-;LKXf@u5)w0000<MNUMn
GLSTa7j>cX9

delta 1764
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
GLSTYRZdEM+

diff --git a/apps/gallery/img/supersized/bg-black.png b/apps/gallery/img/supersized/bg-black.png
index 8c2f00140d611be9ab73598bd1ca5f313416b8ec..e7ce54412b8087d78c3c32663af3bf23431cb868 100644
GIT binary patch
delta 187
zcmdnQv65p$IdlD7PZ!6Kid%0lGV(Goa4;{}UvKIhdDwD=!(<<e#ZD~>E*wyTL$FCe
z5l*ylICcm?2!s*^7DXokB`5(`s)$g^;RrJgqzR<d7^(r;Y(<#0Pj<7qs|Sc)dj9<h
P0}yz+`njxgN@xNA-W@Rx

delta 196
zcmZ3<v58|tIdlCoPZ!6Kid%0kGV(Goa2(#yT%Xx-h)r>B%hpLgCCj!kbTlvs3Meo!
sxi~a%(12}&(@+ipMySR6wlncCESF-OQY*QzngIwrUHx3vIVCg!0028M>Hq)$

diff --git a/apps/gallery/img/supersized/button-tray-down.png b/apps/gallery/img/supersized/button-tray-down.png
index 99b92aef122f08800dd80bd79b92fd7d2293a692..15645ae34efd3a83ec0bb915b43946061d8f8152 100644
GIT binary patch
delta 589
zcmV-T0<!($3%CogcLRScNkl<ZXx{DENoW&M9LMqROh`}@N2x2u>cQpc3e}W}CqV>h
z5k$dCtpf(3Dvl<i2z5IsktnDq3&n+Eal-`>Q4n0fLyH={ik^~~OB6I<urpp>rNoL+
zP+#Q#PBSq72cMbWoA;kF0N?k0ga2$80uz|P1ST+n2~1!D`{#c!!}xRe#P@xH3G6pu
z1`q(o0PX6$mf-<D@DzBaj<tdXf$^bGsMyxF;g{zb80aUP%`Q?ntze^oNx-Re`dDkn
zCa2~(N~IEUyP0CK7zJ{=!A1j7pd}m*XYSp9z_e(zra6+kT&`TcbR0;jXlexu0aJhl
zz-~Lf%s$iI^V5I&$B!P8*z7z3RstV&Tw^9+0keTP;O;+gxN%iW>kn(o<udEmtfo-N
zJ3uc`(e-s71SSIWfc2JTwV%Ckk%oo|Bi5eCq`7hZS`V-tC=Y*Hy1@*!)}{kZz|L56
zeBr*XL*LcCdijDqsU6RO<-mJjQ1=bm1jYe#R3wvbYVUv4r7`>41(iyLl-o%mpW6y_
zS4U9i&Lap+R*~!&YgucLq)!r#L;&dPJ;&WUx6T8dz^Cd6>I@r-<P2a5;5NnV`5T=r
zynXYU%+Z5*p4SNEM~a~Cy<$K`axSnKaGk`qS+{Rq<y|3{1Wp5=>$M3EscvK@u);LW
zF3<B4Kwm}mo>gzKp-4tlbL;^h)Vlgo@1HHEie*5-28VU@@;xRnfywVTfeB1t0uz|P
b{`&X|DOGE{*|1^l00000NkvXXu0mjfyrLQd

delta 631
zcmV--0*L*%3*rl~cLRS`Nkl<Zc-rikPiqrV6vc1S600Z_H!bNW$WB~|B)WFh4^R;s
zXgA_YaA8o)uC@~0bfLyVO2xK|U>6Enf{^$p3rjU%79w;JG~=W&b=sNKR41NSUZ84A
z#?DL`>%H)U7m_=?!#(f5I|&d`6A_?&7D3vl!NOP=3u9p{jD>%(Fc!9V(dqO7fq-{o
zCT3W!7+Y~St^^(65I844+X+j!4iv$nT>DCxcvg2P6jBEU&i-}s!onLWl}g8@I9~}9
z)#_?A8gr3Ir2qV2+;*a-X%vf|6w5Duwc-JgPbRPTM`Ncc+}CF-F_E}Js;Z{2RNUN*
zqrV2WwEGa~0mpy9<!J0w^zOZhw)rm#c^V#yzr^wkSlfEW{L=2fgH=!kS!}p6GyRYZ
z)7+8T@-kh!nh?47!8f-WhugwLcQe2zPzKL$rN*dIsgPlq+mgCDN{UhyWt{~Ze!j;<
z)xLryFt6+S;@FK5S~Kc@P%IW{?osxwuq{}3vszvVYs!C3*1!kw;PtD5lFL2&#e&+(
z3f)ePir=TDeSiE5lZPdnK+BT(^qq04sWmdq`X*DE2~w(`C-GgzZ3}umQVC0H(vnYB
zb^YCBCQW92oyz6+H2?JRW|s$bw=MYF5Z$ER(&oZG3Qm9v;A4FFVzZ|=ERrtCJFo3@
z?_^(I32SfNZQ_;|V?{C;42pyyaKz3m>11DSUeG%Y00+TgIUHNEYZ}t7p1qHGEv$8p
zJ0zCufR>%J<wRH~c^{T!gZ41^4f?-(gLZNbxMD1fg|RRe#==<G_VH7I0RRcQw$xSk
R<Z%E1002ovPDHLkV1oJjG6nzu

diff --git a/apps/gallery/img/supersized/button-tray-up.png b/apps/gallery/img/supersized/button-tray-up.png
index 7cc57785f0a7a309cc2959273f5eaaaa1a69ed40..0ee91d25ba0f984cd2c08cb381d8a45ed9af3a7f 100644
GIT binary patch
delta 576
zcmV-G0>Ayb3#$vTcLRSPNkl<ZXx{CZL2DC16vuzN*`#R_V!&Fdo=hxw5T$BB(AESz
zRH_C^iaiLXYN@2qLIstU26O5c@#I19d#H%ei+B)0@#M*!Y_Q4mGL>4vM6(OqI1m2J
zTz1&s%>O;+jRlB^SPWR$3}_fI17^Ssm;p0j1}uc(^t*s%1$TcN6A^P_2F&NMw8jSs
z%mL!SdN!MV2Rzo0frp3)|EeA~E)5iu$)vn|^;*j1iU6Cv7LR`ZD=07v7zT2{i~5s>
zeE9fD-n`wCOeP~hF-Wi=tr!6g0IO%tp1VFfJBLzDVzD7M>J5Neke0LqTsHwsM5EE#
z+Ik(Y)xuQ@S1Es{3Pq+a6)M2Segd<A7%&1X&)->K<j^RttA5e)$^+8rbOXrm7qEyf
z7)#mQ@#(9jGT+?hZ;B^URPQbZW=T7M^@f2Hj^nH@)>deG-cJke)rH9dr%q2)fk$Bm
zvw*0!;KM63B}NaAp;Ysax>a3ZC?4MgPKFh1$Ab69jvRlTxjcOh)%3b5nMzZ-aT8$4
zPfPj@ma%Pntul9;?d>+6*Xl|6^A|am8@~@shNf-V1D1$HB0PWg^shfwN&$TKGcWpj
z;@;Jd#eswRqMHX&T{cbt5BLgv0p0^!K--Ug%ug^!SHzSaqdnwITf@0p-+@lpz;;>_
zd)K_{bx=5u9WC*zgZ4AWM5|*u=rBL#^kWxuVg}5B888E8zzo=b2KEEs)~+m6^n=y_
O0000<MNUMnLSTYS%MITE

delta 591
zcmV-V0<it73%U!icLRSeNkl<Zc-rik%}X0W6u{qp#WV?PplVT1O%yyxMXMnAl|T=Q
z)gX!JK`^!rN(2RkRuqGt{6{?XQ1Jg~MG9WTg9w(MJh__<nyhbR6hFX3vjb~<4}NT5
zGsFIN-aO{51OPUM1QixCRA`VGiIEtIkr;`Qm<vNKcLGTgcN%}gqaLjoi8&k+r@4~E
z*gp0mYoSo+0Iw@tQh2a_44z8~FHT3Ie!t)T{b$#X#}jPOR;k6KoaYiH##ZGG5=M41
z8=Lmg@rk|nci#>MgKS__q?pK5RFG<9spDhk==k^~m}V9{o+?<+Y_j`lktrz)oY#l6
zYnql`UCV%#%YlDknpgBkqR>AON#OnUmn6nk!GqKw3o~C*P*Yn6hGE`eVR0FBU1v+z
z^-{zXUNGiE;ikdQu{fL=*#~%i0Z4wG6_%2+fcaR#Xi-&lX*RtGS<AXf!Ta>|Mc_kQ
zdlLWu!_8vst!q35zYh(^pzdA$Rl#_SsbmVOyk1uRTit&ucAbLX>Kht|KMjt6nYD`I
z59kmZn_%PTolHrm#e%XduO=p^;o>3>mX#}suI^rVA8ww*@qMmoTkeVZ6h(nwKewMe
z*u*`D@z2S9QPwB!Tm2Y255DCGT~@*aMP3{`eOSmT@*g=w_L003{g{(tDzAtEe$`6Y
zGkGp&aLz}Og4@KdTNC-#@1n;+el2ipr#fgS_n6HoPzUYik2&R}3#}N5kr;`Q7>SYC
dD-*jEU;yCOt}NT+*rxyh002ovPDHLkV1isG80-K5

diff --git a/apps/gallery/img/supersized/forward.png b/apps/gallery/img/supersized/forward.png
index e2084ab3fafe805cc4fa302bc4d2723932fba46f..a6408f751188738daf0603744901c906ef3264f9 100644
GIT binary patch
delta 1449
zcmV;a1y=gD6pRwEb_0I}fJsC_R9M5+nO#g<Wf;f#DBoY@vk<~ybd*AikpPB|i-jy)
zESckCH6dJpz!hGq7Y^MbR|X=O=!nd4VdBMtiixr*S3tsylT}^DX$zF{H9iKxft|1=
zn!NrWa!zy3p@Y6{sTs*XrEj12d4A_P&--;w7-K9f0BN9PC<lKkfX+cBkXigZC${H^
zcA7xq`P)$o8K77EkU{K!>adiZQa>TpDi!?&9X1g%ssql<%)Hjo(a}~@Q`1{oTKZLC
zVc}?QZtmTztSo^(={vR4?_@{zUZ9Pl|DeF?)B%Quh8oJt%LlTvv#kW?tH_@EQGYMc
zx<Fv#pdz`$si}Xd+RDnxPjoungUrlK!Cz5-@<aYqz(rzQZde6qQ&UqXf>;BA^a5=q
zzg~d3V9!dO-EQ}*RaI5}!Gu(c{8JnmaGtNQ+43vJ-(W^YhH%=VII0Y1odlaK?|{1M
z4+W^C`uh6oD&XYfU`r%Ji^cL*C_yE)x3{;+U`t*En<jr5jf{+($5dlYPfr&@Es9I=
zWx#3PU`>*N$z;0ue}GD&_%c|N8dfX)*w@#0F)b}k;89Xi(jsr4lSCXcV67b1vneSn
zD;wZ(nvjsNR##WYG#br5{hykeYDc>*P*~znZGOU}ZQfy{%jK#-ky{Z^@KuqKk^AH0
z<7{kfj2V9n1{NJ1y_=kz?9^(tHXc7}5eM<efHjKg3L~+V*J(sV#PjL<_u2lz0o&c%
zV^_Pn2$;ph#B2lD4jaFriAO$-g^3$uX<qF`0D(sY`^&vwnfvMA9{u+F9}GJ!DviHT
z8p|muDRy4JB;t|5<|vldf`Wo!I2L#m8ymZM>C%7eY(}snvu=ex{p<!qNwBD>s6X-P
zfW3{!H+XKzV9ye4vDAP$Zju)k5O&=59b}Mw*xk)G9&fRoC%Yca%{$o@i-n=K4{%}Y
zWbZ39@yK9{6{{BN#0qBur)-$I9C2}RE4b}$Lvb<tVe~fJ+TKy<>u<hgXU^oa`1trG
z*xP@7@r_wwTE3cviHEzx20uU*zyMi92HiC^wQOm5m2E!W_GoQ=lfC`UyHpZSU^`2F
zeDN)VHLEi_4M&1M!suTI2z&2p7kdOSxkm5&$c)AkhQUasu!@qIMIYNqK8Z)2Sx?Pk
zZkzN66p%ZGdOe_iV#}-R9@!l8to6+{79M{d{x35A6rgL!{z776qQe(h;!)SEXEw;o
z%ew_f0*{c<jVqQn4#8YYs~&wm_yyBtXHzzxV*qXebcH}EtLSI*#W(S&X9LeXi^E(m
zFD${_zB9(03(JSP`|~|^;X(st^B)YjJzUHh2Hzq;=KyN=6_i9g>Uq|)g0-}?w8DR(
zz$3su8~N^gHaqWPUGHC`(SBH)$mS+MmjUWTn*+8sUf;x{Uco$jgN22K3XH&MI2U{s
zYH|14^=@V|nF;b4vbh7$N4V`SfX>3k4%v8ol8A$N)O!QPuFGgN-r#YH?70BEhe5W1
z|5u<TfX)Nd;SZ!F;_$ZXQtW4YdU}5@;ubtaFu_OJ0Ox?_M9oqgNB<+D_{8y|{jB1o
zpx5hfat5%eBm^Rgf80qyaRwV69zKt&vm#4Es6}xp{z+#r#cI~r*w`6rP}J(f=H_Of
zPPa#%8{pvfF$RnfDpglkf57wH;K)-$)X!ijKq(II6B$Vbq0BJ(SApj7K1F}j%N<<4
ze7O@N)rtvU2$skn`Bj1H{e76M$neC(L@g%kehh{Ofk0A!@<aYqpansH@;xvx&`?xV
zL@V7i4<y-BKk6UsC*LQ&Q*b(+6_{#T&1UmQ*v@^4W5_6WOOsf7Y1cGK->IE`Cp)q~
z?RN?<-P@X%@;%sbZy58%H;N&};vuwH{GK1IH;n%Qcf-v_%WDtS00000NkvXXu0mjf
Dj^fhW

delta 1749
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

diff --git a/apps/gallery/img/supersized/nav-bg.png b/apps/gallery/img/supersized/nav-bg.png
index 800f904ddc7d1f2bbd2b82d7eb20d23fdfdf406f..c1a9fc170f4df909b5e0080598d7b00c3daacfff 100644
GIT binary patch
delta 114
zcmV-&0FD3S2jK^>cLQowNkl<Z2-kIu!41GL2m_7PRWe7q{{|U?5x{+fC{?O{tb?-v
zFdMvkzv%9uBrr3@%)|@;MazPc#EAHaRo0}4c-viGQCE&1l4`f<7=J};4S?Br0LN2Z
Uc<FI15&!@I07*qoM6N<$f-loB?*IS*

delta 116
zcmV-)0E_?O2jd5@cLQu!Nkl<Zc-nN2(G7qw2t=>MRhXmhzkx$A0$>FRNsaxu9=r<#
zV2q2-IS&#Mkh_D-%pXAt)=O73oRg}4K!rVBM4EQE<ejqZ2#H?1t^5VdyuNkTEx-WB
WQ(buS-pj540000<MNUMnLSTZD8Z)N=

diff --git a/apps/gallery/img/supersized/nav-dot.png b/apps/gallery/img/supersized/nav-dot.png
index a28a50789f37f6afc9abc8b1495c76cacf7a1889..4319ed04213c053dd53b9eaa2fca911fbc0dcbb8 100644
GIT binary patch
delta 767
zcmV<b0s#H(4(JT9b_0I`+(|@1R5;6Zl}k@kQ51zccJ9=nWzaNX2(^vr#EBJx)cyp9
zBqSJ0#B^eCLQ=z62%v((ZS6zBV4)>Ej7IT=1<FGj0=3WxLW`|~>som3&8Zwt@+CWK
z@11kc-V18cb=_is(+Wnxu7GiCRgEaT1mZTEE!Wf2Gm}oIHNt<G8gs0X8xk!oEsNz!
zMcdxVec#y3771f&%%LVJYAtPcyM4D*I*FuL*UL-G8C`~2v2+rxt*zZbZ95yrgTY{G
zb!}to!>6yhij}pEY;SLGlC^9&%H?t+3vU-Ib8p`3Dv<kAC=`ZSYc@>J%vWAd&+00s
zQu9>}<GgNm;az_=`f^fN!JPa_?R?PQej%zwCdyB>xGqDDIr-5%NsjK|@Rv3|nc5m2
zi<SsuYQ|VC(m7om$IFRjGMO>Ln3}OTi{i9_5XcKcLOb`|03BdZ&>^%l=OVZZ-weS&
z_u(TyVN8uVQDdHac-VuV2Z#O_ucjUjjfBPsV`|KyrrUogZp6a|^LvFmkDo=t15dP=
z47DHm{Vt4k0JTkQ2w)oB*k&K*9#fG>&h=w)ydl7bQCQ<Pt`B3YF%|KN#B*4qUHn1)
zYk-%+@J&nwZm((x@Vd`SEB$b0Oa*iDCpGawN5{pkk6*rp;s2NnHRj|;^K^4`zsqI+
z=GJ!K^6G!OMi^83f2`)>I9^T+KJpXB)KrTzcLF-WBSELo&OMhwJ!lZr3+>Fg0G#km
z1N`HLj~s+CHReQ(d9LDN*Weom7I+;#Y9@@SF^3wrQEbJ-8sMcX@QoM#@ySqwmz)?Y
zZC=9$7pCFHHa+l-PX)Z>!Qyy>iw!qnjXGTKg>QF!D&VDCutptg%?5bM3*Y!u;P$Ep
z7q5d~Jn)TA1#|Kz)$l>^ixa-_!aqJ4YRs9B7XQNC936b)fPXyjQ8Qso%^0iv`*6BA
xj+YaIj~s+CHDhsRgY=VS1rFh#MiE=(n!mCdGS=J#SOow8002ovPDHLkV1mZLbm{;A

delta 1030
zcmV+h1o`{u4DAlEb_0I{;Ymb6RCwB)mG4heR~X0dxxMAm_ChTPN}+V9P#ugc(YZL(
z_(C%RGcoRsiSq>*CF6x`Y)i(rxW9nN)MW4A-L}LZ(OMwJIo&diKT??$VTe+7&~^fq
zAEoVu+uMB~c5hP}nk+lXH$C?`-*cXG&hyDBmrN!(U1)94IVgXqiTZ6TJesi_^3>GS
zggQGre;XbizCfZr#b}H?=@YKEw6qM!i;EY=1EJ?*{+A0R>Qjuy;JHa&hE98JZS5C#
z?%ciiVmwf<s%j3G)_9&@EHATP-C6hEwt<0xQwGFNc64;itt%<r9F4{b5{U$tE=5rc
zaalI!=Sffd`}=<#lwm#;3ibM51`lF&BezOJ7Nu%q`T4@a!Vd&J7>~!WqRM5Nkm}Qx
zb~~L;TdBiooSTnWmlTD|lq6Xuu3ha{u%$7Y`b&3rca^Jh!yijaiN#n<=F&wm8Y2&R
zDZ_1?VgKChZ1M49NAFHfg)OmoJO^b`tk(SC?z-(azv_SZ@(qv26M*-)zP07T;d+Bz
zU0uJ9j*gxuQJ-RZ;Z{3eJ9H6xrRky;OEn>5!c&L}7ty|lv{<S!?Y9W}7~E7gH8o8%
zG&Iaou&=Mr+SAihIyg8uiqG$%NrN`wYw)t>haZ3P$Ci?gXV1qg0)J209nK2Fw<o_D
znR)%X*z14wZX@O>!vP%Z;Lq1@Jh^t`_pLx-#Wn>&Q1<Srdr<%WzD;21GG#afmZD6^
zb;RRx9t>Q%P-Q-{uppL|t`DMcYbnDy)ZxDO;m{7iCS*Y)vE!Y$Z-J%lDTCRR`=42=
z220YG>bC?{O`45HBbO<gZB5wYzLdb0f;80!PV9db&ayF!#iW=_B9|_T(HMEiOBsf7
zhIhl$)7B#&9Uf5>HJ4`$3mX%XB!yvq)c)xw#b7B6?^(SLKHPJ)+wFFlO=8ehRq5wh
zGH}IxS!r!;-GBm4z;gzQvW)W`fZo)kqd~fqjin(Cy2sl0Bs8_+#`If-c7dfWc#CrJ
zCQW~ls82B((>$DhhB~lh0!uSsDIYA^z)~JqVqhr@mMl0U-IAZq-~vmV!O}EXDgjG;
z21_bf3V|gXSbDNtIIyIErF^iIvkFTLEE&Mk0t#oM3?HHn0kBjCmiR1aB*D^OV9EZ!
zSSkWbB3R<Vk}(TQF|d@xmLfFu6*!TAzzlx4QCDF}r7`l5SHKhgCu7Y1`Dg9s?@pf%
z1VfVrvMh^~UKB;SWPMS%?ZgQQHxya+F2DJVQBk(ydJCGHo97!F8)cf%+uJK*<vgFy
zN8owkjWX>I<=-cSF&BQ;YOhEN4R}U$&p!eT03h@q`hgySs{jB107*qoM6N<$g4&4m
ABLDyZ

diff --git a/apps/gallery/img/supersized/pause.png b/apps/gallery/img/supersized/pause.png
index a2c21a51ceeb781cb1a7ada35e9d3fe01ddb0083..1e81d1856b6f55f64070acd6207deb6a9bf7fd66 100644
GIT binary patch
delta 246
zcmV<S015x=2;>N`cLRUeNkl<ZXx{Ca(G9{d3`Ea}Z8`$5W)=cQ$S_SJ9Se}g9~Mf=
zS@Kuz!%ugztky{4Y-MJ=;G`umfeB1t0uz|P&JJc~$;{a4<kf`C5_v0b+s5bX{q^l}
zzai&r9!<opc#U+7Bx-HlH?Jn5g28Ywv|lqJ7*T2+IyTY>?3Zp}wT!_=nmHYFfR&;s
z&g58eI9ApJ+Z|Ed*NY+!V&>Oqd1&2hD|WzeFf{1a%o#;p_ls@C*2a#FG-1O;HGl+w
wolag&z#KIFM*8QkR00#2zyu~Rfe9?8K3fmQ25EianE(I)07*qoM6N<$f>JSYmjD0&

delta 253
zcmV<Z00RHy2<r&2cLRUlNkl<Zc-ril!41P83`Om#+b}}gHCd?b2n-X0<R(1_@WHBp
zeoH>_4}N^dvI46rtrpCz7g{s`1~7mD3}65Q*y>>WDie=&rjpUBajC^~R}3NO^YuPG
zd)#l7Qeun7V^_R-I(A%A&ZT;0)p&$67&VHvYX$^UlAODa^)z(=`z2VGK3GpPreg*$
z5wzk+j)}oBnGb9;wBj~jD^jD)>>3OYjC)MQ3K%ttCN*ouY(;GMlTF1^`i}K9ZpC=z
z9`XCBoM*IZ9O_WUGtxi*r2-hh00uCC0SsV1@eyDETMxztNoX*`00000NkvXXu0mjf
DXB=(*

diff --git a/apps/gallery/img/supersized/play.png b/apps/gallery/img/supersized/play.png
index 16e53f8674546f9d1530ef1b29a8559eaa948386..df94a03498677505890c1c7dbb2449ec15323265 100644
GIT binary patch
delta 675
zcmV;U0$lx?42=x1cLRTcNkl<ZXx{DFO-~a+7{KxW7!pEidh&!J@v0{1$xq=o@Zdqb
zzy&>eG$tk<IG6|oOIo9XytWnsNQ_8GRKzq0D5Y#EFBQa=f)JqXmW~HE#%K)Kosxyj
zlT5PNotZqpndh*xE2NYhw-7?e6CBgfFb&f%4bw0U)3D<V6GDHK2q9{O5H2AEDw?g3
zQYvYH?^;!rEGsLMz#YJCcd=~bB2~iVT54U+L}q1mb&YhnToSkooI3Kbud9h)Ej$yE
zwY4{-+wGRXJ)q(+VM5ihMF=66;wyjM-`d*5=k?Om)X2uh#(m%c5IHEU&|H+lqOrw)
zKHu5drnRMo#)f}-QmM5DpaGaX60qq=bl-mIbegWtcA7m8Sy^6w4AcYf91WY83Lm(C
zKEFp#Fi5kfiTU|hyH%nifOH(}Luj&~u><{m_`DtrV>W2*;NVY}Ltt-4L$>A^em%q^
zuZM7W`Vuf^2Ueo;H71+Q+8TfM+<7W5TqGJb-kYXb3KV}lp;A~TYZf#vnM}~u`ji*_
zy<{?(I^eb)lyX?s{6E;2_!5Ec4qgrpkjv$s0ChkN*tVOC;!->qY+)gWzq5^z;h_Z3
z2Q&k5U>(>2@{WR;`@rVr4E$YfjE%ls0eS%sunK&)KsgntLo3Db^e2M;4yGnQ#)0R6
z5BT;6Na=qk>7v4>CdTOrbP_cp2H*#tS)ff|w-}(}l%kmfU_3NNe{X=rh1h4H3+M(C
z7ARdzP%#dgp(|If%kt9|5*P<=0hK^GaMD^taTvL&KDOKhE&~DJ6_5nBfDEu#$PPK>
zmFkRjx%(R^Z>Qv(0xPu;dv-yNf;lPlk3S95Fbx~iFbzBE@dKx9*Uz}zL=*r3002ov
JPDHLkV1mO=H@*M>

delta 688
zcmV;h0#E&o44MqEcLRTpNkl<Zc-rikO-~a+7=YhRNJvxDlP3&`S2aOT{tEwr2M^)}
zF6hytF){Jr!9*an1dIw6T3Sm(kr<JXs94ifTJ5szvJ@(ag;F6vySwf94sML`Bh>D+
zZpm!&WOv@(natDqu0RNZqjm{`Km;zv#kd$3<6>Nli*d2Ki2;8VV*y@GNGIZCRY41N
zVJbFoxxJk@91fbeiMWo67}?Bik$Gu>baZqQr_)J;w~*rvFZOvo`vY-aB3)fqiOc1p
zFK;8Q^%P?^dC&p7l3DvLzO%Cp1O5HrcK1R)pTCQtdx%u2*ngiDX<>@G{MYw;d%G|+
zI0(Hx-H^*|_F#XAl4uCAl%yQ`U7=6_zi$}&JojO3b@d^Jx{)`w7Mn|o6@OnYmtZUu
zLP0kyEvdt17o9m6_;wR}7fV!?cOo*5<In@Lybv;5aPqsCO~hW!#w?XF{c;K(pr9zG
z&SNraMXZVCRz}k_OZiWoJ_BuM&w--IZ*^U7rbSj;7E^z*qNZ1sZ(}11-l50vEE0xd
zv3LhVH>^l87t{2A6Z@1|f#B!}JfEBZ!!RCUh)Su*uGP9Q?uwO(rPC?|d|sHDp2}i!
z9O*+c$QE7l=%i^YG5rv+#YGtcelJ94U(+p081W$M$X8RyU?Ekvt|+EHKqxQ*$;5lw
zDo^Q20QrCNixAU;VNJ!7b8#38`aqE-8Iu9zi7B*=?AJo5HeFFS4({<-6e8guET`3v
znDir~NY)f8)KbXu(clk9h1kVQS4hi=R+@+-*O4})1vzH^h(aSCTdv{l0un@C(B+Aq
zTIlkIl&WbVyKJdWnveTG36-sMIlG88n-V3fLbfOp<NqsiF)qf%xEL4XV(i4e2`~V&
WmVg-h8>=h;0000<MNUMnLSTZ;6F|lQ

diff --git a/apps/gallery/img/supersized/progress-back.png b/apps/gallery/img/supersized/progress-back.png
index 68cd45b6706bc9b1870d83842c89fc3423429a67..95992f1410cf67fc83d8688fcd66d1c84fdfc23e 100644
GIT binary patch
delta 45
zcmZ3;K8JlnIkT#Or;B3<$Ms|Z5s{Jv1s?_m*DK63wdBJa8Gyjk)z4*}Q$iB}9yJV4

delta 50
zcmbQkzL0%GIkT3ir;B4q#jPX(5s{LFBnGBGEDjBf41$*!nr=APOke;4Pgg&ebxsLQ
E0EM&<IsgCw

diff --git a/apps/gallery/img/supersized/progress-bar.png b/apps/gallery/img/supersized/progress-bar.png
index 49ebb0513b78c054a2b5a48d8688f56f8b839241..9758d1788316a8d8c472781e7cc9df893f35bf4b 100644
GIT binary patch
delta 45
zcmZ3;K8JlnIkT#Or;B3<$MxhN|Nrl2W=>>c;E$4gnH#3*$N&VMu6{1-oD!M<WEBp#

delta 50
zcmbQkzL0%GIkT3ir;B4q#jT_t|Nrl27G@TBpw7U=!%%&W*=KUtwuKBp;OXk;vd$@?
F2>{IA5l8?4

diff --git a/apps/gallery/img/supersized/supersized-logo.png b/apps/gallery/img/supersized/supersized-logo.png
index b1243a297840e79bc777d46e1a15b5b235d09983..cc106293292110dfb41f47fbbd06b3ab25a3d22b 100644
GIT binary patch
delta 2630
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

delta 3128
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
SGWQAq0000<MNUMnLSTZ~Ga)(v

diff --git a/apps/gallery/img/supersized/thumb-back.png b/apps/gallery/img/supersized/thumb-back.png
index 3c969ebd5276c73df8c1e8f4fb205731f00a0793..b86a9110ee47652d6f41ce95a9bed1cd538012ef 100644
GIT binary patch
delta 1139
zcmV-(1dRL25ZVv0cLRS;Nkl<ZNXM;~OGu+v6vsapJByh?I<p8u%XAnh9k7Mgf+MsG
zQKnQ{7p2=_ECowf?j%APP(&AT(BPv6U!^-iVrtCm%lkEnd28P9#2Af63$y8}i_>$%
zcf*%VV$|t@A0OX+oc}%daqeZ98(1cjA)hw#y)IX^HslfVCDMO~403#fe1&|1-2XoW
z?;)S@1X|ILblg<%A@V(SCKL*PV_8<~_xn?cMB*Rp48dTq=x{iE>+9>1uCA`<JmKDE
z5jV4HR0|6WVz1Ym$mjELd~yP(XJsg#U%>gr-*8qgL#cEMg`*=N1CYsN(w?547hGR5
zSV20SX82qxwzGe;BhO~DaDq<H$`_Y%dUlS&MM$O7Fh4&p=0*D;l}a&`dV540DijJ;
z4x=iamaj$exCE(G8gQCdc<b7hOePru-|kSc?d@%O1|ut;lx{?!cnrACfb0H}^Z9W+
z9%l%A>m-#Tk?2(-nS{fm<98yPI|PHl;NVT|-B>JE6?=b=R@iK|NIH{)Y`*Z$#N!E=
znVFg8e195=L~4$};OOY+%V;zP$#kwInd~7H3P(V8Zz|KcO(K~A3?N36L^vF-3VuNf
zrBbOX5{*MFk#0&Hon&))z|q3S#s=)}?xJ|EY5Pzp1iihzKXan@s9--go%vuS1|bw}
zL;`moo+W?4O$C#alQ1zcQ4u8N&H5Y!L!_;U6MRSozas@Mm+MU+7=}PFQbQz`sGKjo
zUJtXgvoJk9T}7!>LKN4kz7NH}e*hAR<PT1e<Xq+!-7s#q`(KYg2z-3|A(FyiWo3nI
zfVUump>P!H`%%2U01^C?(|AH7{FW40t=6*B?T3GQ{QE($SS%G$u~=M#N~MCpK?oZ4
zBe>jNn46oE(DO(Izvi+_!0vQ|&Ea_qk8dAvmw{TXhUMjDSX^AJK>oe{{f2!A&OH|l
z4-X4DK>-ycp$_5{{cd~h0F%wx5VL&`++H8}d_Iz>$y8MY_dLF)eegB`fk5yhCwQ9*
zzE6J&@QQh1v)e&$x*Rh)B2(pb;vmdsu)f}F*v@3JlcOW2SC-vwuSspsNX6>vs?=bz
zf<|v?iNTCct&WCuEMm3VU|?Y2S5ELlJa#pL9i*bWyZa}yK{PrOC|To;F&NEclSw(T
zXXuk5)El{}2gk?9#U_&(6lw#=Rr+hA)f<1wRH}H1y91}5A=KM_`mDfPW8GjdqNo=B
zQm|KIN67-K)5F@@nyS6M{Rev3jYcCwX=DOAvXPOIiOtPT53ALIT&aO=xw;{;T{S3i
zV0yg)mX?;bc#(aMR}{minLXg1fb;<++S=L*>2UNajTThsT&ZR&Uk$4RjYjhZ&!%gv
zudnYHp4byig-kt{*=;WORiA;Kot@9e#>QS@(q5dJnv#(3(9n>u?x{%LtsOd@j%mbI
z><;%D=x^~ReTsb0Oz1j-e7lQ$ggoZ*;$v>jZ?zJl{0BK%SEd`m3hn>^002ovPDHLk
FV1jHXDER;Y

delta 1252
zcmV<A1RML>56Td*cLRUENkl<Zc-pL1TT5eC6kg|QE*3L2v8|V3tT0*=M++h<maz(g
z5B>@nu`hxT;%`u&2JuM>^~ncIKos-fB|5cKEZA17iAIf*k(t_=ddofM(zQ;`DP9ss
zoo@I}E@$ukt+n=A-`Wg3VC?PfL0MTDkDt<g*D`mU$0Ldn`G|i!gjN4Pfrud9A&$|2
zlaD3LMU*0*+|jToViSqqK7{Zw;+Zk0zrX)kOH0dhhr>~7wOR{#p0`9Ik)v=p{Fl$?
z`*mbwWO;3E?Mz>Lf%qen$Jq$046lZVhg%yO8rto4`%^&_f#Y~!Sr!<E0Y#BPkrhZu
zDM%%gu)e<T9vFWZm|R&|AtDvAy1To3{2{{s$R;NzUsP39b(qW+jp(+aswyOt2}mU3
z;F+0u+0)ZAufO^^5D5H}jqr(12-DNk-#J~bc9Y3+uPl^h8Dh~0yn3}X+S%DTrJw84
z&d!dO(d?zU7K6;~cE9+lva($eb3n$h-3R1Cj@b-NO-+9<@Z4+keM=QZ0m5ZM%0?I*
z9DI(Rb?^d`;rToS7+nxV6STFpwd;FV;ILBI4MG9&C4Hd;;W$AH&Bp+<3W|z~8-|94
zzBL>o4~<Otf*yT+eKq;{_DTgUR3!P<v*IvQ1)kM1H6^Q>S2s$4<)Oa5p1kxT3em$q
z4G&2{=w*L{iidEU<(ico1MyfG=H_N$V`BqY1~Sh@D{MAfMRRkr1Gmp{xm>x1ho91;
zprD{q#z~5tSt3P&2aZwU_utlFb8}N8M<D<SH<z-kp=h<XwpJ`IF8)nC2BAsYP!w%i
z{I69D5s3l^hX)5#+z^k)u`W3cBm%TX%5ns1+9-dA{?kl^oKYUA9#%<Gt}I|NUUDh{
z-k(<B>@2NZf*@S2Jt;dOqbirnk0C;unWBBr@)N<tJ8mozc_=S0hwbfch(@DV-(fat
zA(b+R6w?Y~I1Jm2kcJVD&d<+}Y=X(5s#ilw)?0G(ps}$LLZJ{GU})2!PZQo2Ql3>{
zYioZisQ)}OT%~>nsQSOCilimLb%diacy}6xd`AJ))zx8*6#;gPv_X2(WP*xigPOdn
z^PC!lTK^g!A78;4+L>g6l#<~5A_f=HBor2vKy`IBm{G=($yCPqnC{^B`=^eNkCW80
zmY0{42H`0pj{WS!@AJ8_@#t1(Mm&*(lk<NFL=!TotO(Iq;>H{bGnLT9#Kerwv3ptC
zXl&49baZrzXI0QV{eXNCaWods_>T7Q`+aVY$8$u^EG;d)zAoMr){E8E)%RYn_hk;x
zAgB5u@y3$Hn%(zwb#?t<I78kMxNAv8g;s*95Og{#V~<OUzD~Ct1&jr^fttKYWFdca
z81(e^_KqeJ2`a*!g@uK~Y=m+BJd0;%XZ<!?Uf{C=yY-V?YaxY0R<aX`DCB0W*TBy9
zkKNtf-|J+d`T6<HyWD9=TWd*h^$XNDwY9bFHrpdt3PVP>6{Nz&jHX1O%4fk~(2EJ;
zL2usZdj#g@=KS}$wTXIDero*TbUIw~IyyRPuoO&KgFLE>w7<U}8XFtiy0nh&saqJK
zw-3DtTXf>j_3zmR-OgSk(b4~L^EL+Exb3>&bGi<bEWSq~`7Rs$E5HD2mZNXJJ7~`U
O0000<MNUMnLSTa66=!+?

diff --git a/apps/gallery/img/supersized/thumb-forward.png b/apps/gallery/img/supersized/thumb-forward.png
index afe451c75d0d6072a77a67f5ebbbf862dda8e3c4..bff5ec1108a9bb815174bdf7ab9aac49b17bfbd7 100644
GIT binary patch
delta 1136
zcmV-$1dsd15Z4c|cLRS*Nkl<ZNXM;~OGu+v6vsapJByh?I<p8u%XAnh9k7Mgf+MsG
zQKnQ{7p2=_ECowf?nI#sD563fH2A2&Cq);6#?&;4`SLc&Bqq_s$@`rcqtR$#HeGdb
zdT#ixe46j`H9hd-!hQYkIrrXkFT>ox(&;oQsz`ZVu4+}tBjkTeqzP%|_y+k3`2@ND
ze+b?~KH~{oMl(`#Q^AMG_jIzZuCCu$meu=wzGOTe{|5&{AP^`xozCsq*;#pAUEOn@
zaHE*VVs`4)*w~nCYilc>%jIDI-~bMfN>DmJf#Z|E;iy!CV(}32dwW0@pj0Xq4Gj%1
zxUpohl2j_i@VS3bY;A2#mC0n_04F^vom|M_(J=}aAel<R=;)}7=k0@JGRaWR+auah
ztyXKZ=vDEsbS(<|MMx%7fMK5E?Q2yckzfdXyF<lRS65YO^sI1Dyb<}rKHxqB?)yt_
z&W~fU7(?J&EoqcWrLW?N1nlnZzZ044E|^RvCoi;jqtSopsn~n8!EU#QQ|T;Za`|^A
z7K_8s(9ke9_ov}-_{<e(?d<G)8Hq$8k;)2^#YxC%C8by&KJi2v(19pT5}{D&RPYN@
zsZc1i;YbXk@suFD`8-)M7>!2Q-OU4ugjionFc^f!#>SsH(R);|nG0tw5RO6+MTN*_
zb1*nK2)%#3y@2-<+-^6DrXdnfh>m#^2tr?9pOh1PNCm$m6*$3Le;@?@Kv)oRxrv7Z
z0|TclEGz(q3cX3dPOx%}Z|4oj<??w>kmOwE7CkT?kLO>nF92fTJp!3bRu<(mJUk3q
ztrh~INX3|~Z9ftGgVT6IJ^Yqb*lf0v%i{wv@K}Gt`1p8Pl+Vh_N_np~z5a?ZZqF8s
zjEu<XeWZe4bJ@l3aCyM)^a_H<nyj`gN?2T61dIy!cLLyYZwrobZMvboy}gSQlu$w9
zYAc54cl&E6SnMuA@O6Oc>1mjsp9ibe3O@f1I5)kb{R#M*fJ7qskrTX41>YwX_{6-h
zI~;#tv<TyJdjX#)@caGX#7KzsqgXZ^FgG`+qED8?;W(4po{<LhKw+}jKxf>jfJJPt
zH-R+?w^#JF*`cMS<yTJdL%eop1Zzk`eSQ5;8yh&tU;zzlzA+}V6{e=96r9*IoRcA(
zH}X=q_Vo0~EEX%M*G-_(8n2DsXeOc5@)Cb{4emKZIB)mqw*p^{S(C|(qI&pK&0dK$
z4GXNn2s1M?+Un}+ALwN_o6QVG$Ru=S9UUFLOG`^$R&M~6MhB~^bwQMWt%C*^W;B{$
zVq#*M=h^4@L@|8C>;d-$q#r2h^73-ffUDQ)^q|GbHS27-)UgK8>2z-=CnuFnO-*RO
z@Wh^Al4s6yk=^EU-|087wzl?pcX#(IOy1-D{rz%Mwzai&o%<@1e`}4wU|@u}irwLU
z1I?HGNuMGghzVUskZ*U9kC4Y)UVO~$`K`-@DE|TVP*=g-*0h!Y0000<MNUMnLSTZ0
CA~V+j

delta 1248
zcmV<61Rwj?55^F%cLRUANkl<Zc-pL1TT3Hn7=9;nNMdY_Yhrgb2CX1sk|k0vv{2S6
z2vYnNva&@GybynbdbNmGQm9v6SOTtMz_W`|u^`lTO`1flxKbO|V-DspGwJ(IXG%Pb
zt8PDdCX<<O-sgMX)Aw=kh_SP?1J%{l9R7+A{g%1sJPzSNlpueK5Ek`$8j(PJKtyo?
zr=Ln#h^RtT-g99|#5*KDdJLfx@m!nJ-{1edrKRPC-EOb4SS)26#}y<JiNkn2{&ye{
z_+?~dWOZ|M^IZKlhWPb1#d?GuP1W%5aBEXjQ@hP(tKkI!Se65W!2k@yfGkTOOEP4|
zEMzko*xK6i4Gez_Os=o56HyMa5s5^iA0zyaY;tn)rN`sxFqsP!qPs>emxD|u4e4|W
z{4+DJdwO~n)K_caaQH-zuu>(2>FMe3U2b=~$yD&5ER-Y(E|Up(`*vltv$Jzbjq6G%
z6jCyp&6`V>8|lX9^SyL?Jl_dMld|%MfF!US2W8KmeuaOr4y>)M9n(6xySq>5y&;c~
zvJnOc2VbDF4vshCYUM|PczMADZEbDss_j}FmV81U@g?0*g0L*FxaL!USq0_gj;5iZ
zp>H)ovMhs^3D4-#*VpGQDY4bbxI$T!Zp4S@So9bwz;$MCd4Hn>3>-8zHj>IEL>Vgl
zT~kOMgkFC(<<O+ws<9eiVqyYzA|WvHEEpKLQ>Bb9v|6pT&CShrG;egf-Gv(A6S|a^
zmexr)NtDD}K{Y3eB48rGn>Uki{2_{}8B{Fme}mp?ZEda9cr=%q=pqP$Rq?-0KcGU#
z4x?maEEa=>g$1ansDS$Vdf<2g(wVH1Fjwjm<A#6T$*%r2b82ZQO0j!bL{Yx8#(18;
z^6cp72xezzDGkBltb}y->ITB(6nmN{86qS}S;~o2Ds{@6IQw0Mr11K1I2?-7#AW*5
zTFe^;boV6=&4l)K98r96adBwnP4-+)&!zGeLQDv#si{$FE}qO_%x-#zGsv*Ly}hUY
zJ=cG}rv0oKyZ+COUqA7RGNY@IWmzy9jZjrp1)mpLA(hTTB9_n%1B)qzJvpNOJ=1)v
z>|f*K<Lek@kg&#X1G&uUbb{CG1;JPVCuea;;xoPZnAQ*s2B)IYXoj||)z#IEMtFuu
z;eK`+3<P|PlIGG4T*Q)KE-ZrRNenI$m$!e;(V%#P$x+?Ts2q{&z4SM_jE;^@afTcy
zO0N|%8H&Y|N-ch@wULcrFyQn1{f8uGWo6|(<v>0mxiz-2v2nb#wDj6Y1&vkvnC6X5
z2=@Qn^>=l3{iuo2b`$nmjOmC_vAn#z=W^9uIxEWSC5(e4%lF%wFhNX$0S@-}{Jnp@
zy`$-Ln$kA3xVX5lN0?IM>6n|F3tFv3;V(*Umd^?;W#kS?)+Z7;1DFL4!l6HYdiCnn
z4=ULKcB6OqInz*YZJ>s$9-zKyXlQ7+T8rITsx=BRP@8A4p`(eMbiTK@w}c7eM>T(`
zHp27s^TCIl+5~k|uF)R2T&|*yjt*F_*=#mp1K==u#NFN9gR!x(?Y!@(D7Vo=M~^)S
z7pTNf)qA}`r?dA+bohUqytP3mZkyWhS+x&STRcW0={^Sj5nup-aE`=rrwp+G0000<
KMNUMnLSTX~u53U6

diff --git a/apps/remoteStorage/img/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
index 6b751c09997e82ee88ef5a78fc7ef1bee3df5b0f..10c2be243c2e30899ae54ae9d44b6f1141c0ec2e 100644
GIT binary patch
delta 929
zcmV;S177_334jQYZGQuONkl<ZSi`+nOKVe65Wbij6%oW=Ah^*V;MSdsCZQXlprWAY
zPTUk+TQ@FrSy0?q1#u-J;zFokC>E(g#YFmum8yw-nly=h82h+>GxOc_LUY@^>f$3O
zb7sEz&TH;Dj^}w!Q|Q=t%!|7(6w+>zr}3au&LJ=6-a+Cepnps(sZIKJO+b&c$BRd=
zAXyGr0hWPzVwtv_`iO5^1ti>)ARl6)Mg0HGk!OiAZHx37(wLS7#GNA;(UWRoOIidL
zfC7*q3bYmJLm?6ij)nzvItM_|1C*4=Mpt5zJl6Xcr#?l@)0U@Ci80HJ>ru|S1jHlf
zp!_?6DuLuhj(<{;&H^*QH1L6#rfrr!1&!GhQ87+%hYE;CPrz{y*Z}@=Q!O&NjBJic
zrnnJh?cWkv+NS6;$Cx5HR>-+wIgo3s0CyN2-|)Kz{NXVxaWs}Z=Ki!~I+{t0@U=qP
zHfve>_#z7ASR&^da}3uKFve-`2L?EO3!G9WkN&V^k$<ni1ne&j(pKA~`fQ4rR}SME
zAa_M`g$P)u!zTpY1koF=>r^251b6-z`kyH*HbWsM!j@xJIfP3%jeC7N0XF^q=o67%
z5MDq#X;Y`k$AMA!e70i-Xd5=|6Ca)Cq{b>obr!e`;R05<Ys-PPPl4n#&}F2WD6J!k
zMIS0`bbo2~CDm7A?1=h%p-k@8Fae|7ss7o`bNX`}{R1zt|0syhb7_XXSmeG!+cMSY
z6Cd%lS;&ziU#%&YV>C=arMmmAu*?{V?D)tRv_FFQqSxgd^b*m__<u_wZLvw8_^7Y!
z1r;zuF8?%C!UT*21QY`TvLwsUC#CD&x%aq!bbkcWwvwHqPlhqsfPi8^z(|V%-1ivu
zH80^DHlQuG76sI^1n`OU0cVl)vDXnfqmZ`Pv`<b*b4#$pCUoBc-5|clT`!gMl0n*H
z)4p!=ZG01k9Yd7Y$Xz|p2^G0{4CB$OhQKjQ=nV8~j4eUk$8c*QvSQL_1*TRZa<40D
z7k{F0#wHsnM1CpGv2KrTTZ-fE4I;c0TVFpp>nX+ju+;Z4x^1ZEV^oa^oq;ruO8uW>
zS!Z4AMn1=yBi*J8N%WDS9T$@3u4GS%HeAV?xs)c{SBkb?N*lYD4-##@me>C<@vr5(
z^f1}+X{JYVa`&HR;g3`QZTKG^r?sEw&l(jiJkS3Dh~b6C@n0~A00000NkvXXu0mjf
DLoUJ2

delta 1180
zcmV;N1Y`Sv2>A(+ZGQxINkl<ZScSFMU#MkO9S88wZ|{AbymMusKd4Nhi4<3gh+=e#
znWPxOritEy-cou=m@uYN5Sk(wN*U>4dQhr2--HOKK*b)Uf^tAe6MZQ$us>=FPTZNZ
z&;IqW*FNXmeeQL}JGx-8*V+5Ge&6r<uHRX|--^t%qju|iK7Xp3-V3_=JAS+I{7&4&
z+a_=*_E>4|5x$9Od0R_AGiiV1v3%p*A@GB!{AuMj@;Kgy#M$z7Hv+E`$L*W^!uPX#
z=Lmdh<$!b_K8{XEDKV^ej}TIz!e4}A9+^COX#@_(HLRQ<zk+U|XX&pL%lGRQ7zmUe
zzhZK?)A{1tBY*JaST$|Fi#xF*OyvTBltSX=GUI9~!~%g(Ni`<8U)}!1uk(KwCUCg<
z8r2E%DohLbw15xKL4kjiSsxrJP!|$)AyE_mq`TYc_Mxo_9KP(+<WI35Z2_B(#^Y@m
zq`k(H`~$FNH2x#;EvL^vr5Ki$4-k7tAe&d71Cf}Lt$(l~Y>;jLZcDXB#A9!d)wgCr
zjaBk${0_T>PnLb3gGWs1rev=`+9-3UbX_ldRm<%4=;wyeNoR15JjiU`q5?BQ2eAhy
zrKe}iXW)YZ(Mso~^Tb>MT_HLP*r#!__&hjT^b&zSxWaYPQB^)e9>WWBISWu|MQrqa
zh?7{1m46q=W2$^cIx1Xe9=w}YJSNbULndW>6`vD%oUCQsfh*BUUBCL7)Y<!smqm99
zQyIsltIBqzdGKyYV3A!e^!Li@B;6CDxsAzZbaA_|hwfZ&9#iQxRsNinKgh{FRG%lC
zk*_h%Hd~-@o*8y29FXn9vTCfgM?{<w@oMR(tbesfWYx&_Vc`JX95A;A-%5e)#~F!T
z<hPw&xkVj6^r^`&!I{fG;_S);<j2tTws~QnmSf-|TVAho$e;bI{60ipzY|Z31mZ2n
zks%|<GkBCZY+C;Z)NUm2$1TK7z3oN#v>XF5`xpyjRmgY+4`PG3OXdx#>T*?exy&1g
zyMOv`9_($anE4E`<bN9l#)g5E-EUN;#5ZKn=Lc9V&p!Exn}wUn$8}kYI5P6JL}DBR
zeL|TR7k?%HCgKY+cF_$dUejmETrIPPtXIjbsg8&|M?Ow`7@sIUtG7~M&Mv)y=kOt7
z-8?JSeE`QmuqTk3UV)saVy+;*i2vd#X@4CbxDbIPUqXnuNoosl%B)4D9A+i;#_lq$
znW?9$d)rxBzEapL^WS)hxOO`N6TDdr+LBg>74_@QBqE58u9LYo+X7XuKxSWvEEXoI
zDyhEdF-!)~g?~YO9nV@WDmGU*{WjD@BdXn^+D$b5JM|Ly{5kYz3s#SMi6z<Z%YUrT
z+F?mHJ_k76KBS(k;{+yhwyL3|YD&;G!kVzQ>D^F*&A}%)p`NUd!M9dmlNuK+%bzQj
z>mvm&u`D0A?Jp*OFBaGC^kTBS1zWX8CQsVe?kA4o^|{=6Mc-#z@H%nSzIOk`fOF}W
u)8V4A`tDy&$F0Af{}^=j_jY<c{}n%m`7x``I1eiT0000<MNUMnLSTZ0cv8Fo

diff --git a/apps/tasks/img/icon.png b/apps/tasks/img/icon.png
index df281f3ba8605658e9769156c4a4fdb9918e1220..e2802ae938786cfde949700069ecebf7bde4777c 100644
GIT binary patch
delta 272
zcmV+r0q_3F1M~urZGQmqNkl<ZILl-B|NlP&C76M#2DG%aNH;Vzh!N7XYSk)ctOfuz
zKLO&8O-)U@*fdU>G>IK3-v`9M8yg$rF$@R{4Ezt2{9jmD_@9@T7bwdB#{vQZ|1&c)
z!SX=-3y7UC3}9hl0ZAT%DmnxcZ*6Ur1oH2I#Iv)rL2^b|y?+3*2^0oE{0wS{3lNI{
z@l`1Q1RERMf1H8H0Oo?jq6n&CKM?PQvM;o^w+q75;5DG5qk|u);V)Dp2tNUOLmXKR
zUIU=6xB}Ju6BsMz*whd*pbcaIFuGE4sUc(l3lPg-q&#8`z?pOj89)rCU1lN&0{}S`
WlB$_|XyyO_00{s|MNUMnLSTX$p=>q)

delta 357
zcmV-r0h<2w0?7lAZGQnqNkl<ZIE|%~u}Z^G6o$VW4e1o<P^A<nH^Iq4TtoyBXCJ^9
zaB*s>ZEn-jOybf}d;sa@8%PJ~BF3Q^I*NmK2ySg!JT5`Bi4p9D3-`eHe_YPFSBVIV
zEMuYcyrA7~mt5Cf`76}zc9&8Gv)QZ<3|p<%W?Hb*=~%AoUVjb-gK@LjJV^+A-!B1n
z7=}-_ZHrRsYv=QM34&k@oB<*t&j9Ls6HU{UTCH{u>;OHj^)7(tdBy2;+5^@{qY;Hd
zVM}ZMkPs-Pq|s=s0*^ouIEc@8zy{FwJa2n4nW)qr0BEh>fQz_12X5l9Z&}t+6h%My
z)G_9AxohA9*j@wnffv&>4=a^QIM1dE%H{Gq5X5C<7{+n6T76ApvmVkdfKuwTUa$9m
zgR%q;u;w_<RR)usf{3ULKEW)f0a=2~8~kT2{2M<3l@NGLp1~of00000NkvXXu0mjf
DGs2^_

diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index db1b1970f17f7b6a35fb22693af492df7c2391df..25d472b2dc41bd4412507d422b579ff36abad887 100644
GIT binary patch
delta 340
zcmV-a0jvJ#1Gxi`ZhtmOL_t(I%VYTe|33pI7?%XsvuDqOZr{Eg0>Y0UKMn?p36o*~
z&(ft!qZt?&(m=SZtSlZVCP9h;+%sp+jDi`EpPwHG6cZ!K3;q55kuU?&)6+o)h~P7T
z_uad9axnby<42X2mKL}H@$vC-pFe-rL{lRKH{i^fGa8|xp?_&sR#tGVtgM^{GeAa0
z21U-((=%<)o;{Xu1ArVgAb@KighfO|(l&42Yz8-A+qP}W$TkwfLPA1mt5&Tth8wVd
z|9+Xu%1XbYq9Pv<E-WncwYIj7hiTB#(n<n}!Q@LyN_>GX(7+c9tiHa!!7u|%O-*A!
zF+)l;vN$?A22H^X(9zKW8Nfk`0nBD*W`QsRR8&-=fnw~W7{Fv=V&V@B?GzB!(9nnk
md5aVS7@!)EF(au45QPDtx=du=nI6{w0000<MNUMnLSTZdJ(Ozz

delta 387
zcmV-}0et?s1Ly;gZhvJ-L_t(Ijir+@Yr;?zg}=nKHPR}TbPH~Q;_lkT!7fe(r_TKY
z{t9P*kX@u8I7m0aEn=m#I^>x|&AS~+gV?0B^uin7editSJ)C2R2>&T7r(aqu7Pm?%
z6QEcuitD<Mz}qp<%poubgMsaNUe)uwYQNt<2Tn49IRp{}L4Uei9LECaKM`y;o0K4m
zBJv2nG`Lu;R+nGRLZNV~luAKS6cGf$)o!;d9bkfTx%_U32;=eiy4UO7%;)p;({j0F
zHk$$9x-PX^Eq$w0Ds;Qu=Vr6{WC5(#Ydx7vm`<me`}n?(@B8W9aU8-hOi~TD+ij90
zNsb)fOKY7HSbPAsZO5HX=OvC~4Im=MXf&!0hr=^~dcD4HwOX%+VF-X}nucxLpCXA!
z);Vdn+jqbN@X%;9?nR`Oh5eNe!Z3ut`amgl=mP;VLz9;U(OPTAaWsHsSvqe5<A*dJ
hdw-ub#ZLskst<S$#vM-{i&y{v002ovPDHLkV1f_9w|W2o

diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index bc0c782882deaa4f9ecf1676592ddba0cc9aacbc..fa8e18183ed3d126ab5706d093f7e64d944c835a 100644
GIT binary patch
delta 138
zcmV;50CoS90`LKlZhvh_L_t(I%VYTe|33pIm|<`k00a#{ya0%~FcbpCfOtMg4L$=v
znn8@KK&*u%t_2kXaTee+fD1|CS0IiD;shugW-u4tFo4<y(}0Y>BD)H2AVO_LHz0xN
sSfI!Nio8H^AW|b5DN9I0Gcy4I+7e6GgT+Z{00000NkvXXt^-0~g4cC0-v9sr

delta 173
zcmV;e08;<(0h0odZhw$TL_t(Ijn$Jo4udcdMBk+JQRq2Od=zdH=TM>M64XOuqQ!zH
zrirDMto6>@pDf$-oJW`Xc7UWwQjwI}KuJl`OVV_Bu>Ccl00ut55d1^+87K!$14too
z1)e~z_Z^%r0U_Hih_=S6E&&yiPXPHWwtEZrw$MGqU)I>pU?u_Hz-W68ZO*`06D(1n
b|Nl%IZARTucrYZ}00000NkvXXu0mjff{sp5

diff --git a/core/img/actions/download.png b/core/img/actions/download.png
index 14e88e14c0f1dd68a8f155cc99ccf958507a555c..65954f941bbf9741180e0f6998adc87fc4c2db92 100644
GIT binary patch
delta 133
zcmV;00DAxS0qg;gZhmP=L_t(I%e~XF4Zt7_L{ZPcFf79|Hw?>U7-n$N1|1<^ky8AI
z;t3-hnHgX5hY{r}rwRe80V)BS0U7~h01==YpcCLQz(IgvfUyJ?Gw;&v1`v@Q;U%KS
nH`pNh=N}kEXqhHNcpFJ4FM2Ea`t^I}00000NkvXXu0mjf(jGJ>

delta 144
zcmV;B0B`^70rmlqZhv!0L_t(IjlGjm4uBvGLtBr)8T6jJFlVSg#6%c4BudhsW_@8>
zMoCzCn`e?tBvmPe0RZ-(*99Cw?>oSMEkIHu02zQPWw*8j%n3ZnF2D<j-F`3$v8IIy
yh`BQeLYi<F;6U84Bye<%B(1F4x;3lkd;$_-<F^bjd>H@$00{s|MNUMnLSTY|dN}+5

diff --git a/core/img/actions/history.png b/core/img/actions/history.png
index b1e743651f827e9fa0b34dfdc0c7537f612b36d1..1d138b8cd5a9e77806a4395bcc78e68eb2b68d7d 100644
GIT binary patch
delta 261
zcmV+g0s8*(0_y^hZhz=WL_t(2&yCVQE5&gX$MKh>Y!-{jLMh74Vze2Jw+zUGkd6J;
zO-3wt5D&sAMan>V29j)dxOCCa^1F5J@x5g@!}okX@6-4EQB{>3SV9{&=;8rqSQ+va
zz#a5Z72*qr82<xfcLbE<U<k$(-U`Mi{G?nT%MspBhAT8`ZGILPNk573c@RD@om!fy
zdmec1VG#{H2H^z@m`eq&gQp8kd>4A{qZz;nyaxSlAZ(@rpV$cCBu-QD<M^emda6CF
z*SRCy;=Qo%)x76ztc7=H#Gdzx7nX{33Ug><>_2b|&-HCzVm|7>5J4R-h4|mG00000
LNkvXXu0mjf<yL!6

delta 269
zcmV+o0rLLq0`dZoZh!AdL_t(2k$uuJE5%_H$MKI)HjBk%F(}H-Vze2Jw+zUOkd0R$
z8L=4TO&Fy}85kt9gzXNO{^&8>|G%DlJl9iac+T(lJw4|+M@mTy%wZ3g=-?K|Sm^T=
zzzuYf3h{+q4F7?#IRJ{W(+6W5uLa{henPIod=761!#P^DHh+b)pdaS&X(oJNBD6GF
z_uP1HU=}UhWx_LNFdYh9WS$PR@m=V(LOTOT@sjD+jj$RDd}1X7$8Z#iALLJ3tADkN
z<vO>IE4&xxy%^`bj-~8=GGNYI#SII^B3$XM?NCa|i2u(U9_l}M)Z475M*Iai=L9~k
TxB}Dw0000<MFvhpu0mjfFB5(m

diff --git a/core/img/actions/info.png b/core/img/actions/info.png
index 2257d144d11ad33a429bead6bc1fde7222e66aae..37ccb3568309a284ff95ee6bb2433ca6dbf4d302 100644
GIT binary patch
delta 322
zcmV-I0log(1E&L!Zhs_6L_t(I%VRim<_rTq%)-Lr&cwvDh?SMq9Gg4?Ap>-Ebyu63
zn%)Tv49p|TfVp$$&gtmr*mv>bMPITE`2YXEDG>VuF)vvLh>D8x@bU2p;gTn$*+x=Q
za<#IuauZ1gC@3g!h>MHoX=!O4ba8RH7aktIjU)q9RaG+%9e+Ahn3a`v&dbZ|VRd!&
zGLj4c23RN%OZoWtoB`s8lP6EECOHf=G&F?0y}j@F`T0HEyLYb>$p!#zb`A;(dKecM
zcMIqmL6QvsYAg>433*snR(1qmOyQJ>kB?sx78drfv$J!awzjqw5Id1%Kw@IzfvBjc
zhd{3!j*N^f`#bdMlQl^Obai!YEG{m-eCpJx#lSEK0%8`D3;=2f2jW^FR>2nr0HQHO
U0K7Vyp8x;=07*qoM6N<$f{k2^7XSbN

delta 373
zcmV-*0gC>o1KI<SZhu!vL_t(Ijg^xzOT$nUg->3RHXuT1NGTz1QFsB15(6D9lq?c(
zv*6$m2XW4yads5Rf5_4y2zfY(5GqQxT12Zu35C?fNt4LC>$&H<=fb^0nx<%~!C-Jy
zmgSi!idRXJ-2K+2MmGRT>4l;w`=)880Qdo67%t}XdG7oE^M7i!`lAc~t>8G03%~#n
zGseES6Lh=X$D$~n;yC_e1_07z_I>|QlB8>0*TcG=$^_%_SXnNYm%6T>7>2Q>Y1&2|
zpfZ6h%jZ!PiKEeIv(;*emSuf#0kSN68xDuJd7hVq5cGPz2QC0(ETWVa>-AbCguu4#
zgbM%wmSyd=+iq=HRn@}tynAjyr_(w3iT}zNd*=oSg0M>nfu?C$5CnD*1RfWF5MoM_
zgvn&G-S790lO!ps`f4wcQo5MUW}jggzPPSCMa3fl4Zq+x&MAN$05^=WY2Bc2N%Csk
Td3qMA00000NkvXXu0mjfkh!r-

diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index 74dcd33bee7b1bd0d502068f570e300fa0f4d9ce..eb2ea766c31df85207e0092d3fb3e92d4e210729 100644
GIT binary patch
delta 509
zcmV<Z0RsM!1<(YLU4H@HNkl<ZILn=pJ!l$X7{_f%iV%l%5i%7TVum2n!J(Vdp`(;U
z0#3m#vE3cw2TrAQ%2=qIPztsVmke1C637rFIH-dNe!%&4)l<*=@ZS6%xE!ZoEq&n!
z_x_*%^SsaVoWt>#V;DvO{C52BQB{=@|D3=W+W;rPM|WA48Gm8M-hv2twkml?*Y&&k
ze9lIrQGvAac+3d;o=he;6vIeY@NO+9Z_Z}3dri|=tyXJ=LZKMx!{Lw-^c{^xQ=Lvn
zBoDmYLMM_WeNq&KRjbve+wDGs^pf;`zt0HMw&V4B&jmpc$vd4+53K?aA86KCEcO}K
z%_ki%GQ!rZD}R+reJ3w+cuPf_iYSVT)9HL=AC2evDyY~skH_P~j`YD`AX#Fs*OO5|
zO{de(mv$QlM+-tY`~qGL1!k65E|*)htZuivzwTFKq&@OhDwUQc=JWYWRAr4u<J-Cd
z<RLG|ao3g@3<eLe6b+-y!G~4JXgh+qLEb<haBPpc;&$=)542|h9ix1K>9y@I?IQ7l
zV&q9A5<e+t`GJE>CR1p)+bR;6$saI$x;L9mHJMEQg4esM%Qt?%|7$LnyDgPU-Fm$)
z6UAat$Y!%V#o+O++tW694?cpp$tiee#um;ajD2v7SDV_z00000NkvXXu0mjfSZVgJ

delta 575
zcmV-F0>J&y1d#=hU4H@|Nkl<ZILn<=ziSjh6#m>8IrIYB9HbJI#6pggVwd~{L1GY6
z$(0^fM!3S{LMpLLZym9SDa7_*7g7lRAaIbogRAZiW_ETrbGOO<oOw3xvN>V`KA7Tt
z?|t8U^X3h3g=wu1wbozozZS<a#c@nm<rqbWh;9<mOCnkV0Dq+vlu}vjDG_ZD(Tz)$
zh-f}d)9*?t8jr_^0O0#R`Mys8aCUZfq?979^*18AGfkci!|-R4B-HQshpVfrbpVi3
zl9ZAFpjN9jIp<!IBov0>*9)CYCX?4u6j8U^9aJinR{-t-fa5siI8HW$`D(TLjxpv%
zQAFqG=WDqDV}I;82m-3t>+b=~W;o}ZIOoM7mYdDy#~=uZF=pkclrr)>FDjKv_lsAv
zEURl-R;P$9E-o&O$K%v>-AN7#Ap+0y;+>rxV`{eR0G?j}*4J-&o|m|;8|L82$;nVk
zNw#f2x^6c(=L=Fw>U288d=J{~_HV5<!Z3Vuoj?>tZ-2Gc==FN-99&shS!0YPLI@><
zc=j){>$)342+bHvmY0`b6l3K^qw$Gzt~uwaZQCChV-E_i^iT+~$2m_q=Xz^v>ob7z
zbb-gaySs;@(I{q&(cg2*7?YVl7!2a=?d<~q)r>S#5U^XVR>w5Wpi-$Ab8~Yg!!T~A
zX*wf>a5zoV{I$8cd9c5~zX#wrBVG0}?gDrMV4={a1keTW1Hfr9`41%paOx5%(E0!X
N002ovPDHLkV1f(Q5##^>

diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
index 4d3192ef3293f1eb4170304714b2e28d3834bad4..8e884fbc0ea87ee8549053f603bbf9bf55c29817 100644
GIT binary patch
delta 304
zcmV-00nh%=1C;}iZhsO<L_t(I%f*u+ZiG-2MIRCYK@k)dJ3-(G)$9O)L9qljLD&Kk
zwt&TuATdY;fi~%cNt4RvmHR{6nKn&n5fzvG|K2$_`2u2QIubfuP*v5FrfFv)di+h`
zlx2CLEX$tzzGus_);ii1uyEk6ce)RPfaiH;-}ir%!GMJWmw&bo+qTWaFmRG2-^$p5
z0lUpU3J_h_xvpz2ih^ZXeiw1Z3_CDarMCsDs&bm9yetcMUB{+rir|bHc3{2~NRq@+
z6p6RxdCrDma2&@xj-v?9m|+J7EF4kby6(AcTW*?$9mlzOv*&pt*E29+;lQP7nqI;%
zd~4hluyEj#qA4g3d&SS$T)G?#oz~p_F(>->zws5#1JLPkY9oLE0000<MNUMnLSTZ0
C?T(fJ

delta 362
zcmV-w0hRuh1J47HZhuTkL_t(Ijm49_YJ^Y}gy(EXVIjy0mbPLSEbPQ`!8fq5@hN-}
z-@$!_Z3Ve#y@j3Cbr&Kmsce=>kzYf8HrXNvzEcd$z+vtclDKA8SGfUTx7$5fmNfym
z{|%O9P227EwA%0YH%h6s=Xo}Oi|{<pR!Xh4*0%s~NYj+#IDaxp5(4;^BuO}qBhxe`
zfCHWvgCO8A3@nP`OLI{a9EO2G5WHw_0RZSY4(qyRRaG<$<JD*w2CJ%KUDtFR=Y8m5
z(ZW2>XxkQ>%?54T!gXD^uDj6Yd0v#T0ss*~p6BTM9=2`6_kEOQiKc1LG!4qKgzx*X
zZ5w^xBhPb)$YWDN6h%|lbyP|*48z6EaU3&_<AoN6A(c|>x{gs4P0(7Ovn->C{Mf(?
zBEl@osI@-BG|l6s#*dh$c@zMrPaf#SBLMCISby}N<lleeBjX6!>vQq@`2YX_07*qo
IM6N<$f_km4ZU6uP

diff --git a/core/img/actions/pause-big.png b/core/img/actions/pause-big.png
index 9bcfd0406d8165e2adc4d3cc0909d038e94faa93..1c4cf503b8d643f816d303212d46836a273bc5eb 100644
GIT binary patch
delta 63
zcmdnaxQuZ^o`tffi(`nz>Es{(|JyUGN;olSmh>zXXrC3x?8Yl$+AxbPpoy{S<TH(%
S+W!tR0D-5gpUXO@geCyyMHb)y

delta 80
zcmZ3+xSerAo~MbYi(`mIZ}Ol2|LvJo8(JHIVB$o<!&CnM|8K1Hxo~CTq7zkYY;A$e
iZoCqv3``Q5XU{RD`tV7ge`=@700f?{elF{r5}E*9>K_CE

diff --git a/core/img/actions/pause.png b/core/img/actions/pause.png
index ced8c43ab3441af94470f9a97440759f175b9764..f74ed3a8619c2d4f9f93f532405dfc604e48a040 100644
GIT binary patch
delta 67
zcmdnSxQcN?o{hSvi(`nz>Eu8E|JyUGHWU^}9yoELBS|WtPjLQ^6^x77E*xuEICCb$
XO3(U-HpiaUFaUw4tDnm{r-UW|=13gl

delta 79
zcmZ3*xQ%f_o`<ogi(`mIZ}Ol2|LvJo8#<NlUNLB3oq71giH=9}|NsAQ{786t7q=U)
iglR(~5EQ;hS7Ug<%qQJ()WDYk2s~Z=T-G@yGywpQ;UPc(

diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png
index 0c330d4ac441aa9c7eec3c811ddcf558872e3f05..0097f671aef92a4337938837f7b84f82c2618cc7 100644
GIT binary patch
delta 134
zcmV;10D1qD0__2iZhvY?L_t(I%VYTe|33pI7{Op**agG}lo$Xa{sHkKAeJZB02uxO
z#N9wFNUi}e{0@jqfS8?J17P?85XS;BBe@2^@OdD19S{S^_5w;E!o<mrMq&)WnvigL
ojp(FIlmSE~TYO%iivid$05rfM`v~?L5dZ)H07*qoM6N<$f_{-T82|tP

delta 173
zcmV;e08;<$0h0odZhw$TL_t(IjkS}@4TC@oMBi}XoC;`xCQ=4nq>FSx88kr)RKPhW
z%mqgYT0U!prIA*1c(OfSnHg8A@Q0*MQk_jOGnOt4n1B|j+&|J9;Q9b>;1LD5M&JdM
zQGjaz8bDEis|TLHfNu)nx_gAbCAuGu@eCk&NL!<=0Ub~$vnJjFDCaXtvSsmd?{bV;
b9i(aond&sy7*(=`00000NkvXXu0mjf_{&C%

diff --git a/core/img/actions/play-big.png b/core/img/actions/play-big.png
index 3ccd36129ecb340989191d6dfa4410c821b3230a..2da2426dcfcbad59b924f21c3c175b15a7911828 100644
GIT binary patch
delta 107
zcmV-x0F?jK0n!1GZe&kML_t(I%e~Xf2>>7r1ku6DEZxrH#e;%~j$&Z15Ap*jK#mAZ
z0HQ@fJ)oc&a0IP@EocW=LMOl!GQa>O9@MuM^bqwL^&#m~*3WeH&J{H%zhL0XF?0X`
N002ovPDHLkV1kGWEI<GN

delta 109
zcmV-z0FwXG0n`DIZe~$QL_t(IjlI%A3IHGoMA1(t>*(FgHU$PDIaI<d=Yc3d1FD&!
z1i(fl$O96z15!`~96={Q2xWjRqyP(4xG>*VSc+fH7#5$ra;oS7sW{UCH7LJegPhq&
P00000NkvXXu0mjf#dIi0

diff --git a/core/img/actions/play-next.png b/core/img/actions/play-next.png
index 0c0ccc87cdc433492e972be8bd14b6b6bcd6ee32..08568b3dc0b117a9ee569c7e42e0144af094d603 100644
GIT binary patch
delta 121
zcmV-<0EYkl0pJ0UZgO2oL_t(I%VYTe|33pIn1N~r0Kp_6W=4_3B8JZZ5V0AEdGLu5
zG600n1F<wNF=7k=;U_?BfK7~813>sQ4ly5M4Zwx}0C6r|44}vh6a^wh(MVB3qAV#7
bSZ)LWS!W!Rtxe@E00000NkvXXu0mjf578?B

delta 151
zcmV;I0BHZ<0sR4xZhv}7L_t(Ijm4A834lNhL|@#i9oU40*ow{AiiOyO9e5SSi^96@
z%0dtWb9o^H`I#g<(YUH(12db<EX2tidxRv;HU!K-`^HkG1_BnKE3p~_0V~kwSgnD8
zt-yv_gOYY&yz1O*{Hz7n5M66@9nu7ZTQb8^+3(+Y08E`IB@o-bH$nga002ovPDHLk
FV1o0aL*xJe

diff --git a/core/img/actions/play-previous.png b/core/img/actions/play-previous.png
index d98cedaa1e8904d7ec6c393810746ba24c263e40..811cde46c159c5860aac03eca7665e96a5fc6822 100644
GIT binary patch
delta 134
zcmZo+ddoN=uRhDu#WBR<bn=h?|LvJoXEZKjV_-BE@IR#9=5Nd|ke|k&eNeg0d9#VY
ze0I$i&0}h9R~Zxx7#^t`v<CDjf;b--ADz#b^*>qoumJ-{QR5GOv9l3|UwIeY;11z*
lS>>V}DkKy-$>?s8GQ%Q4naNAPReoUr0#8>zmvv4FO#nP1F{c0k

delta 158
zcmV;P0Ac^_0fYjOZhwJEL_t(Ijm6W!2?8+?h2d}9s~y;ch1iPCY%3OG6L#QLm_2Af
z+;Kf5VBlST-g}UlBr;Ra*>$CV6-2}o5%VU?%u?9n^0aKQFX02O$Y!osS%4#M&G^!a
zl?6EA{t?cKtqO3)qX?I3x$ZTNyTXtm4q4-nhx8VhFmJK=`xkFq0KU8^CF(KC1poj5
M07*qoM6N<$f?||PUH||9

diff --git a/core/img/actions/play.png b/core/img/actions/play.png
index a252a751554e142eb9dda6daecf529b41ffb0bed..adbef1e576d75dae458de9e24e5aba3822d2c358 100644
GIT binary patch
delta 98
zcmV-o0G<Eb0m%W7Zd*o4L_t(I%VYTe|33pIn1N~r0KowucA&(7|4>YlLD&o+$sl|N
z5M>ZC2H-V_6a%mtL{|gI_5#^~NOm-moscL?$^(`g0bNE(-+2#M3IG5A07*qoM6N<$
Ef_h>k3IG5A

delta 117
zcmV-*0E+*~0o(zQZf;pgL_t(Ijm6VJ3IHJt1Hi<W`E-94FA94o-PVE%xd<7kMM^^D
zv{L&EkQ^j?T9AY_hE@iEzVH8H0V&7>LQn*7p$uR`<uzUz;rJ2Vq6dVE7LY3L@cD0?
XdXP`r+S~qZ00000NkvXXu0mjf8~HJj

diff --git a/core/img/actions/public.png b/core/img/actions/public.png
index 75d1366326b1bb1ef22ffba0a0982ed5112096c4..9e56f2919fdfe4b42fc74894cbb4364e9a9c2b28 100644
GIT binary patch
delta 311
zcmV-70m%N#1DpepZhsj`L_t(I%cavzD}+%L!114AF^xT&`3CkDnzECng=C{7<r7Rc
zQa*$z-(bS*l#~^*uwbd4*gPBAQySOiOkK}BUSe_T-gEBxpVup;<Uca3potESP@=$b
z=$hXG(8dimafXCf>|z~<Xx9S5xsS!T&tnxU0h+`J_Hsy`c7K8WxVNx@b8O)m2VrZV
zHz;QS=tPu8meDvKLZ5J**=Etn0X?MbK`VNZGP%QO*k{nq0cAXzj)px|oD<$Lkp;P^
z1MJ|o#yO#^Ozdi?giP*h056!rT$I?YYhuD_=$7&LMK&kZCJx4!aG9k!hV2?a@o9{e
zMM_x8^lKI8{xHxYRUk#oe<8N+trEHY+t1XC>6CH)`7`}RJ^=9Dn^AEa3j_cF002ov
JPDHLkV1k+>nQ#CA

delta 358
zcmV-s0h#`s1Iq)DZhuHgL_t(Ijiu8uOPoOv2H<CtSR5yIAz~2n1Ja6OI7k=7%0hxo
zK+*{Ic9LJAC|KF1xh{|<B%mSKSqg_~<VX;##DH8Th5KEW^=m=~wwT$OcV^z1NfF_H
z<WX%%DRr@l1<d0YPVp5x5piAmKd6Fx_>%2Yn88yFafQR|^M6+&LT;mn5mvLlgmt_@
zU>XT~=#AsDa~A{bXMGkM_=Ig-;voNZ&_}lf*veTtMMaZ1&-TE#;_oH4B4W(JVs7Uq
zb1{q0cvf`VNhvj?-(qge0WNZudF<k6k-2%l@uaBYsH~uoWxT*+_hlFnKMMU}SwX+b
zcGgnC4W8pwCSUn|8;OCB*|vu7EkJ<}4T<#_1II<56L{AGFi?)MTBN}1!v3}j9;p|p
z0vWiQ|BAb<yR9<!%9vDNV{uH2npty#V=c#Y58z+r55tz^M<0<)NdN!<07*qoM6N<$
Ef;@Yw&Hw-a

diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png
index 9993a092df101d4b2796379ac6f1cbe62f131a3c..3af6840071b4597458475c9098a79d533b66c2c4 100644
GIT binary patch
delta 165
zcmV;W09yaH0*eBWZhweLL_t(I%VYTe|33pIm^8%<3?@L_3&ft}8qfg5AjUr+_9of@
zsKy2~LnaYr0Fs9PXoffwGyqLAiXjBU0EcGc3?NoBRs%@Uj9~z&no$e@0%IUPLyBf}
z1ImGz16#BaGyn*AfY<@b=774Sf#|#d1Zhy49iT2TCMh!k!5&PgAv`qAjo2^%i-t)E
THLi#m00000NkvXXu0mjfmP0(9

delta 208
zcmV;>05AWG0=5E>Zhx~$L_t(Ijir;l4Z<)Gg};X=QZNB)1c{awu>lJ(0wrF6hKZ19
zla+WhCUO!;Y~`erPS(92pU<+*l30~AOWH}gOFDLkwzCrmfPpt~vYkf|fnh-Mu+2Kd
zb^va%#&(bd@S43sqLyYzd;ShFRi2Cj<&pZ&A(ntg1f}2}0ZC8;O$m5Na0RM?i%D=t
z0BnFmtgGl`7Mw298Q8`J*#j5b?d%gmM^FPT(Aa+F0KcK7-}wV70!%R>tR%+(0000<
KMNUMnLSTX(O;`N@

diff --git a/core/img/actions/search.png b/core/img/actions/search.png
index bfedb80bb578838260c22fc96b2f80ab3d318dbf..98e1d73ee3418b05bd79b285495c35784294d8ea 100644
GIT binary patch
delta 455
zcmV;&0XY7>1*!y)ZGQo$Nkl<ZILoDy&r8B!7{|qfe}T6|Ww9`H9&F$a>Oce&e}Tk6
z5cS|CL^`>HdMF|yA*5?U;34W7*s$28D3-%mlthI!{Y&h5V3(vflnx*Eyx-^9XYbz4
zG#Cs_|KaDtWLh<w&2^w-P{(X8fyH9kuv)FM$K!csS$2eAjei;T{uIE#DoxW$C=}8~
zQM^}G^&G((Gwk6EQNS?FA<y$;xZ!R(ofZIxK>;)D;S5m#Pk9K3!xKr8#MuGNu!l25
zK{A<qi9{lkYPHJG4q%48OeXV06jUme+h{a8;W%!4b^tT%H5!deqM+C7?IaS3aWEKs
zwA<}lHk*w`uz$uZ9*<9&&E_6a0Ee~QZnv+~>9h_9rn%j28NnJ}Z=6b{aCfrP>2wkQ
z1CXrar>oU!YCfNTFO^EKtyb%%+wETDa=8zXfBAeqiJ~Zm_$T5{fKA{4*aZZD9S(=b
zAQ{0y>VCif%H?vc{VE^<k|j;kPGDyvK@jvnARv3aUO;Ycfgy3gwNoq>KeO4a9*f1!
x77`c|s^9OQmdoWgMNy6x78sHhU>{|;{s!G7D8<W^w%z~$002ovPDHLkV1ksU*Kq&<

delta 603
zcmV-h0;K(_1ib~2ZGQqfNkl<ZIE|&zO=#L+7zglw-lP&7MB-%AIZ-B7Y%fA86$>NX
zVT?&H;(Z@<W3tj6b`Zu8$}aZgaf242;GvW-$|$>LAQPnt2t`&p)*^ld=V-JbZm_V6
zgHn|h_T1k0dEOt-pO;b;1^-jb`NQ1YT!0V~128?jIx-C7y?>%8UnT+6-wh&>NSx!i
zXLh^&8q2a~02mAgeNEHay<YEKp-_+}0+C20;C8#S4u``Y4u_lZc)SJxk|eo`#o~=t
ztEE+|)yIWGVPq2q0Q`RcvejyJ%+Jr)*VorK0DJ;~P$(oOlgTHgQt2kkvdaKojs<w0
zU!ZB45=HTYs(-3m=lWZsC|*|-<vGvu3*#aX0I*mrR|p}HWw~^5K$hhaAp|y?jhzU1
zJf2gUrjgI*7cUOv^Z7-ZrZF=!(-;RZ01%Bv<&%?>2UAm1OR-q&)G&;X06+-2?{>SF
z7={7IapiFUr6>vnLGW&FZob{y+w<wVu6H_}9{^yp*?+Eb9LG}>MYY@QubQT<NRo6o
z0sw#@2>15)_aE-=?%t}`>lTyA^m}%8_PfvL)3>*`17~MvOs!Ts)O9_%v$JzB0t^u^
zfV%)Z0Db{D0B~HXRGy~O={x;?pKdf7N8N7sRW6rPM}SEs2!gX*F2BiSGPehV0o`mi
zzx8^(*HqbTwn+Z@8i1;*jbJdiwz|6d*=#l&E|<&ebUI%E!*9GKQWXSYEs;nRtyb&L
pR4UcJbc73WrU5(xu%W8z@gHxz;ZctQUUL8d002ovPDHLkV1j-186*Gz

diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
index 5b1607e59fcdcc465ad42b8cd5ef4b15d66570a6..8b3acb00a4fa9a7d8f92a05926927ae242c0f07c 100644
GIT binary patch
delta 584
zcmV-O0=ND12CD^-Zht6AL_t(I%XN}Zi&9|}#;+x2x)-HQh?yd71o1D5j_D{OVv2#N
zi$V|=^#PI=c`b<CxER91g^*?<F)o5xOxDQIK*H!EVw%Dizr`rndBSTd<KhPo=XuV#
z?|a_M&F6FOGQ?u>u1F;60_bhI|AOO05{V=xl}gpnZnyiD)qiSb!0-20P=kjI^x6Ov
z<Z}5VwOaj6sZ{REWU{w<y?$V~+Ziwz45z3m6pD`;jpl^1kA)$^0Ey9PJa#&r%;9kS
zu~;l;(5ui%e$lYs&?b}Vga%z(y~34tyZw%i&49<_85fJiFTGyx1As<N@H?H(d+L#{
z?SKs4>-93wXn!=iRJ%{yCT<b;n$70E;0FSMm&+ZfRH|LNcbASe@cDc!nN0p5!+FWZ
z&G3++E1seUy<9q-ei{r0nLs|DKic+Wxm>Qdn$2djJXa_bo`ganCJ>EAkGBnoL?TD4
zS=!Ar7*^tSsZ{ER!(mK5r{~<+Y(|Z|Gh~oO53#chRDY}00(~7Pz*F|MTJ1xfPIm`D
z+ibS4f?uoE__ZI2eiR8ceTv89Y{8h8H87japNT`-{P$QaHWqxB%XNUB<$zYJb(QD&
z!$cy%GMUUdE$1inDyYGOrYrO&lgah9|6n$oCF}M2!Duw9O{Y`7TrT(N+3>6knrbhG
z!{HlbE<r9X9#D^HZNQ>%m$(UCsZ^e)QYi-Z_V&v7TZtP)V4=Cq0h?GCoBp@$ZMnbP
W2Pf&E(^~}q0000<MNUMnLSTXi^(jaI

delta 786
zcmV+t1MU2)1@i`wZh!DeL_t(IjdfE&NE~Mr{@y?T%#ON_JCoh$7*`PwYAds4J*c1w
zZV`p{B0XrEH4zLXQ0%RTZ79-1<2i`rBFV*86g-50kV7ObLQKIH7AuxTx<%WOb;Gg?
z(Q$Wn{vN8Lu>Ih{JAB`J@8i7(Ap|M~=X`{SUJ%g>&iTmy@_%p!A|gdmK4Xmi>Nw7y
zgM))Zj^kJWplRACMD$Ws)mG2*qQzoyRR|#f{8xa8sHUdotNQx-&ySCfGlfFo=<x9H
zBf~HN00##L1J%{l3x2=<nx<){ZQD&m^jHWXNC*KUQlio5Yro%r!}Gkd>$<L@C_Y?5
zsZ=U5#+W2Y{D0)+<S>`Z-AtuYryKx;5bo;gYI=Tt{)Qw;lA<Uq7K^3(`};Ehu(7dm
zeSLksMF>FvkVqubqobn)0CZ*ru~_VTNs{6KFf}!m93LP50l;qnJOI}6^77q<g@p(J
z$g;e$wzl>)0FY^#BSMHT!{KnFuIs^2DD-}Daq$6wpMP-`J@I(_+0oHaO`%Z8rPJws
zBAVwzLqk2;Y}Ptw1p<M06~qAWR@1ahE|+UH3_~{zLvLzo8elCgEoH_S&cn8Cse%{)
zVB5BIncLjl?2!<n55VN??Cgh|o10<RbxXUuyZ86@_Fi2Ux3#r>+|kkTgmdoe?d{!9
zBoe;^SbyOF-T-(L3WdJqoZsV|%Z-hV-?g{5w=%}w0)XdvJq-;FcT`pN0f1?mKLL1n
zv4yU#E=AY%=cZ|XaMn=d^Z9rAe7*oc)YjH&fj}TgL<9htOy-YlHv8%J_I8m2z|71{
zIh9KJlF1}gRW12^K9?~T)O9_0ZlSKO?&S3Jlz%&pBM%P`D-#nF(v>?Xm&>=8mX_{D
zB9Xs4J3IfGo143}wY3!nfbQ<@{psoHjh&sHU^1C(9vd55mSy=V0CDk5k|g~YkH<3r
zQULyvW%&_f><a*>s;c^hbN-EGS*B%K7J!!k#FYsupbx<0S-t|`RVC8DNOd|18uF0`
Q01E&B07*qoM6N<$g7$cYg8%>k

diff --git a/core/img/actions/share.png b/core/img/actions/share.png
index 62c4627f317dc007a1186852c9df294bf1ed34a7..099e4d6ab350b775ecf46669a7c47950fd0810aa 100644
GIT binary patch
delta 236
zcmV<I02BZD0@4DIZhy~7L_t(I%VYTe|33pIn0SQ@45mQ58Hn!!aU~Elk!rw2ApVbp
zy@)md2wc!KgYZ;>1^|I35U&8@e^?A~L@@veWPvyhh~<G;6^IuD@n5Lo$3R>T#LI#B
zC=e&21R@Z`0P!EF;(ti&XF!|_#O!!u0SL~aIqxSB7XdLRQDxBx1jo?~_zJ{fK+H(2
z0e(RI8LIg&l0lb&I2fNn$brZQ!~sAo3dFWRybsBs3qYI-#EY;7BA#e;0OEsKq7XA0
m2^bVcRzjj$Ql?5~!i53q77bmDB=FM!0000<MNUMnLSTXsWL}g2

delta 276
zcmV+v0qg$K0{H@vZh!VkL_t(Ijiu6|N<?801>kSCh{a|Ulfh!!C@7c|L=a3CgEosr
z_CfXqG-%&07_6e0Hz~e=#f5dpuy^HhUH4wufq|dl%$YN1{>V)8M5`$<BH9tri->+i
zbRuHho0*Lg&&X2lW@a-55wU}fN_nqV0oHMgQDu5!J2RERD}Ok{D%Nm~uLAsvOWfcA
zCqI2f^D%}6cvO17;~Wcrsw@Z|EAj@oz+#=b6B7p&gNAs+XRX79f_;1x(<gf;UT}z*
zxk5p*gaa&N6L%$|C!FGHs);ksxP|*EC;WZJ8ls~q1l`62v%d0w2-@hOj}BUyId*rR
a_y!McRK>UQK@FGy0000<MNUMnLSTXz|9yb~

diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png
index 073ff741685cad87e4505cc0a7aef199d99d0140..6e112e75b44a5376d8444c4efa08a12e210eedaa 100644
GIT binary patch
delta 264
zcmV+j0r&p31MC8jZGQmiNkl<ZILoEetx7~u6vgo$_>EDEIK^Z!E55?KfJu{Gvvrb|
ziFQGo_yC$jOcxDe5fniN92g8HQRG^7xE$`8xiVpez0Nv+&d1)0qA-qzFS39xdbq&m
zPykl2hqb7WP*(JUiCO?=(U0I4mhhSY%JdXfz-kg~<GKd0oPPsMVi2Kkw9rX5KaYBY
zod|ZKp21ysKiH@RU<%u~jqoFO!#@tMhv^*PyymVYK9jnSLoB9%w+tYs0oql-J%0ZQ
zIZJ<G4(m8+2)L?kWgIjF+~ffB*up6u@E(2ffhSyIAFYwYH1;$$(H}B@en9OnfGq$3
O002ovPDHLkU;%<LBX>Oj

delta 337
zcmV-X0j~b+0<{B>ZGQnWNkl<ZIE|&#u}Yjl6o%nv&5B#3a-)S!*ggb=gWf}mAQmA=
zE+Ab(nlveG)-IPIVyC4SU=@`EfmAjIj7ee8Mgk!yYO%xmyZ*Zo{9s_tnK|!#XP9YZ
zriZ9GYB3_(_=H#3!%Aj;sqPsYDCk7QyNGyJQXlaiGg!cSM1MT0br2CP>|h%IBBE1H
zuBwAM^j%aPJT1jAfm!^h>Fidn3OK-NnV;huwg-y8XXdY3KxSUxLkYW?`4h|dT5=ay
z8nn}dh#1Ffye;{~h&aS5c1t_IE3g}tcd&`8nsGJ|AES#Wnc1r?fTJORVdDfZGP8dN
zC%C+0Z@AicLrS^C%$&tz%wz4Ikm)|4K>lXt9`^4EXi@(cKI^@Smw1jTOyZATtB2Ua
j1~eY}8^`{?WwfpVj2UO)27~g900000NkvXXu0mjfFms(Z

diff --git a/core/img/actions/sound-off.png b/core/img/actions/sound-off.png
index 7900e500c90f1650c2299aad837114e88c9ee71d..2eddb00af0f39c175d0ea8d4971e37eb77a52231 100644
GIT binary patch
delta 89
zcmV-f0H*)h0l)!}Zc;r-L_t(I%VYfi|33pIfN}5|z{tqh0Ho@H@{A-K0MiU&lWYL8
vW}*!MYQh;1BgFuU1CgrHNR@;%v@#O_pRiZqW>>!k00000NkvXXu0mjf+?OP0

delta 114
zcmV-&0FD2^0oehNZfjOaL_t(Ijn$LE3cw%?Ltlm;u3w%VbcapQsT*vCoYFp8LS>tk
z+LoqY1xSjL`uEwc1Vq5uuKiPQYxoWzly#@0_;3nC0NXkQq#?rNF<v1(fd2nXI|I(Q
UahlFJF#rGn07*qoM6N<$f|KbohX4Qo

diff --git a/core/img/actions/sound.png b/core/img/actions/sound.png
index 838c9cee1719b158efdc40d2688f33ac0f28da19..9349c94e7a411cd860499c927ac447086becbab7 100644
GIT binary patch
delta 152
zcmV;J0B8TC0{#JzZhw18L_t(I%VYTe|33pIm|^f500a#TU}+3-SCAZD17Mnw4FCdW
zAg%ynDIk6c#IjfoK-LU100<<Z8czUm3J^B}aW~umWDV#TD&Gvml|bwV#QTBR5s3Ga
zVt@`1Uj||cAbthJq9AY3)d2inpg0hz8jVy*NJA?#0RSet9uc{X%@}w90000<MNUMn
GLSTX|#WfKC

delta 190
zcmV;v073u$0i*(uZhxUkL_t(Ijn&gV4na{6#qr;;1_=^7Q0o<1tqoWN-4msK*oA2I
zSOl9Gh37>)jrd4RGR2(9`RCqyaw9XnQ;oOWUj;-&5fQcfMZ_o~ib}}LTBAT-*Ok`9
z3|*Yi%gj39-h2a~QyO=eVu4i!xHmj@xnE+AF}4_D^9rDkJvZ7oqlHsu{w~G|))?Se
sp6GxNJ>o}We1tsFM<{M{{QqaV08IVA7a)+tZvX%Q07*qoM6N<$f`{K$ZU6uP

diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index d77d5db2caa3a3810e42d69b81a262d17b59d117..53590a2197bd73dd8987a77f59a2a87f9111b14f 100644
GIT binary patch
delta 415
zcmV;Q0bu@)1cL;SZhwGDL_t(I%VYTe|33pI7))4LSST198%OEt>PBg6Ye%W7szxa(
zDMiW4%STB`Nkxf^i$@6x3Py2rb4PJ<az-&TGe<EnFetzcaBy(oFfuY)tf!~9SyNMU
zGthv|ii(PxWn^SF0}a?LDk{1eXuxKm0h@saY-VL;T?{mU1AlG+5G$`<y?T2@M8w0;
z(9nlLK|v4w{QMqzdwV~0cXxm2;^Okq$;s)Vt*z}tD=VvqGiT1+4$^~c0K<<TKeDs3
zvaS&_z~A5h8c=NxN*F+~<c=LX))O*d&6+jqL29uX0Kzc^1qByz84wc_a}lHlBNmXb
zz_DY;mf<pB?|<IC%Rp-I834io<>lpP&<y~F&l!*$)^vb|IWAwmJUbvD-~r44S69~u
z=g*&?4U!|q01$R=Y-~IRGoY%f>KI52XG+9^S?=Gz-w%wkdp<rs_wL@k+Yb^W#Q+dC
z>+S75(B0jA0K~?d7jR(4*RNkUfiQ?ojsYO73B?TL8W=zj0|4Gvd;l(ylK21s002ov
JPDHLkV1jSfvv&Xh

delta 426
zcmV;b0agBk1dardZhwnOL_t(Ijir+@Ya&q)$A52GS<4_=Sttg<1Pd)J_6iFdNuiBk
zr7j{`<vSer9qv0M1UHojY115}N|g&Kgj7i&7B+$KcHetxTuGKSImk2vGynO`49o~)
z4Bs&uz;)eX5ClJ@lxVGyQlgYXDMb(jD5a2663hQJ#@yQg>3?+kNlJMngxJ$s17M6n
zDFr|ji_EgDwNmOFKx|gnpU>yNecwNfI)`ES!E3Fz(|DfuZ#J79150ZIU3NO1MJAJZ
z`D*7}F8AVj-XCBI5CL!;=e*nP-hBla4u^M+<M`Wk-sK+K?Y5uK=hwT63x&eE*X#Mf
zV-f&h(eL+fc7FlJ<M9o!cpr-c)~@TGmCNPlcyXmtd2Y2@XTXOE;{bq*!C-K0S=RQ#
zgb-#ron8YMad8shwOXy7*6a0$D9~s$9%{APDe(F~0D#NUXmn-Uwo0W^YBHHz0hdWa
zdj}va7K<m%X0xufrc^4O0AZ3)eDX|UwOaiG$Y!%Yfg?oWX8?eMjlbR5<-70v1|0FY
U!Z1t=Qvd(}07*qoM6N<$f^nM0?f?J)

diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png
index 09dba9e9108d0c97facf4c12a8351159b11a1b46..fd9bdccc240ad5b6c6f658778097ad6eb0f4ac54 100644
GIT binary patch
delta 76
zcmaFD_=s^r9(%l}i(`nz>4~MrRvpT+dr}h;1e}Dcj~_Uo;FDvu!+D8>A9J3trdda<
fgT1~%(5$(Pap|cNGELUp3_#%N>gTe~DWM4f4}%!=

delta 78
zcmaFF_=Isn9($svi(`mI@5EALn;-JkRu!iY98hRc`_|Xk=s4p>NkO}Z;T*O*YC$;y
iyBq4_4v6-;Ff+uZr%FsbblaW*2s~Z=T-G@yGywnuOdiqz

diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png
index 5744aad75a8c64eb1494deaadfd6db17c529c479..1d90165a552a812e67f8e62b46a9b1c01b6788b2 100644
GIT binary patch
delta 132
zcmV-~0DJ%J0qX&fZhdG;L_t(I%e~XV4L}hPgyF40F`ChgVl<-|HLOVXf+2>)VNNgq
zcX$w0m6z>5io~`nz+$yU3K-%oavCoYCWZ(bPsmN&A*-KQKv0-d$N<O;kN}YW+yesw
m00IMe0C)y)0C4ncJXr-_tt<IeqCE2e0000<MNUMnLSTZ1|1?nm

delta 133
zcmV;00DAxH0qg;gZhmP=L_t(Ijm?w64Zt7_1MQB$#M!f5ff?LSKNT?w<x`}5g71U~
zP!e|5G20{=Bx7ojloo&hpr^v-3h-1?g{@=-P9>}GAo&8nB<>P>0`x5F-oaJuS;1NC
n{rCiBfty0ZIE9vFx%-`ObSDDBpUp&900000NkvXXu0mjf*qb~;

diff --git a/core/img/breadcrumb-start.png b/core/img/breadcrumb-start.png
index a79d675454e19925309f65c583f13fe78ea54c57..b0df5f44037637c322fb4eb867f90c18c6e8f613 100644
GIT binary patch
delta 210
zcmV;@04@K-1GfT@ZGQl?Nkl<ZILl+WckiCx|Ns9Ph`|hZ@7{gz?AbFeVio@f;&xIL
z|9bG?fhMtv{{!8=pJ>HU4KYM32I3d@@81_7Rxt=qB}MUHAT}XZF$kXqN-`0v7=*J(
zQT!elI^x7C2I0k|DE@!@_H75E72mmY=h~SwXIP0+48;|sC`<kd^sGFwib2lVNE5{*
zIirI5K}SlYET&09%A$JWCn;M^rG8OBbRk1Z@kLU>*iQYzoRn$;0G}!hVv4?zAOHXW
M07*qoM6N<$f@ywVv;Y7A

delta 352
zcmV-m0iXW20>lH5ZGQnlNkl<ZIE{_Yp^m~p5C-6XCWj~r6hW13Fr0-4;0f*tcmNK8
z0Y^>|92f-01Mna`0B8)|Qbll8RFLePDG5gkok=#Eo&9F_hqd-gM4(wLBFppnT!x|;
zfS;!6j}`;KD30Tn7MGlJD=mhIbfYNhsc<$hKb=k$6$Vgq&VS9c7y$a#+Kv`8fZx2k
zJPZIGYi(bP0bmwIQB8|0A~M%v0O%c$$F3HGh*takzNE#iYPC8701CrUiUt5&iRiQN
z<*drixuq5ZP-MQxVCJC~PmMA0N0AbdLy{y5RSXdswA<~Q25*|p=JtMghZ7<iKQ`Xs
zi81D)!Mh*`)>+TZJnR5`XL})D2SKpQ`|cTEn0fLd+J8($<3^*A6k;OU8e=xE;3K{<
y^WYtP#0%f|4;mbMo;NLm0Kh~vtk>&T4gLfD(u9>`jy13V0000<MNUMnLSTa2=b7&S

diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png
index b124f349f56e7da0e9975c0e888cf8e39295783f..84992be0d9350d7a94455cfe46dcea2fcc669e64 100644
GIT binary patch
delta 219
zcmV<103`p!1Hb~1ZGQm0Nkl<ZILocoyAi@L5Jgc1j$HyxxDV*V6ha}U0V;qhAUXjw
zA`&^_r`;I>XLmLB-lyk+6SlS1(t8RfTrqUvT5G|AISOxZ$JmA2zyXISJhsy}UAPU*
zSfcRIHZyhMHn7Dx1h;|9CsE(vkD|V=3CCAazu-4fKlQ$f>Quoa9;>KsEU{ljMc@H9
zOeGR}>~Q`soO+G$2c}jRmXgvP4pJ(j;qZsARqDcqs~}Y};rdDyW4LltWuEy>JOQ|K
VqEY81Q^WuO002ovPDHLkV1k!kVs!uj

delta 352
zcmV-m0iXWB0>lH5ZGQnlNkl<ZIE|H)Jx;?w5JsOP*BpUj`ZTzOD}+9P1Wjm>D2N*h
zq>w~{3(%7uu0V@vs67QophjAnF>;puaX!hCwfg*a<fox++n2U&C(b!?&j`2!R;pT(
z$w)*RpaEvNa^ajqRri56U@RivQ8Ivtd;uGvPL9!gUjkFRC4XJE>({_y2pQlBs8qGe
zmPO<Tm;(<($cV@*P^ju8Tee&i5EU$&s1H0*g>x>54vC755fl|ITb95{Cn{O?MMY=s
z&0YeZz-hK@9~=W$xtX`J(-=d@m%zJ-G|9bF)ji+_IE4Ivu7PJ0M3ihIrogy6OOfw^
zb$@|_WZRSj;90zX9wR>jbK9JF**3)4#%!hZiY2fD&O+Du<QdS|ru@qvxhLQ#RP@O;
yu;~Ou$sqwL@&ZplkZb}f;38G*$hQOpgz^iyWShPjd<fY90000<MNUMnLSTY)T%Icc

diff --git a/core/img/favicon-touch.png b/core/img/favicon-touch.png
index cfaaa4399acd8eba0ef6cc417d77779667adb5cf..24770fb634f028fbff8c0625e987ead5bb0471c9 100644
GIT binary patch
delta 3631
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
BnnM5p

delta 5645
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
IrD@>*0K*ItAOHXW

diff --git a/core/img/favicon.png b/core/img/favicon.png
index c1b1cb65460c7e61dac7eed23697bf558db2868b..79b6795f6f6c3b0c9c6b703460f294a3832d0e4e 100644
GIT binary patch
delta 816
zcmV-01JC@=36KYnZGQs|Nkl<ZSi|j?=}!|u7{>dLczyARqI?0BU?fVw3!;RmphD1a
z8WZpU1Pxlm2nqr*l|v9IVv(bA1r-dMkf4ABIRv>uK&V_wfI?{>I}^HecdKoLvN7>V
z-ln^=nfJHz9<w6?AR@MI+di8$7WQ(j4QdT$GBUTE_|o~MKYwd2>_fE!YBM_Knwt2e
z0E=(Fn$8&r;#;)1>=4N0A~VO_XikU(bWZKx1K8!@j{6U#D0%e`l5`myU42#$z|A`t
zQ&ZE>mrA8Va73(m0JiLQrf*wa`w5-_VHj47!jR_X=3(dLwekSb32BUzlqb3PlWxbQ
z!tat8cFtZa2Y*oUwwk^jS%JuVNi2u6N+oLQoABXdBW7lmkmeLK;VCMs#3t(_%Lh1d
z?lSU=%F*<>9YNtSP%SK=tM@D7lcdNidX47R4r)2_mk79W3q5^<44|x_Y<U14{$ZG&
znPn!dYiPlZXbB2RDh!4|qtT#TyJ7=FBlKFW*1*E{*ni&vY_&NG#rH9mgYLcoBqV3S
zn4adApt7n4k~A6IeL{>vumF57ijncG5TW9D-o&IDNC=E+eqM!ZQHeA!bb4Rc2-`y*
zzX#Z0=}4DPrw6IoyoqBH(_yL}N%ML4M#m>%x!2V&0C)1_40g$lPy9gE^J0?$NEk?!
z@b2f88h-}((%Hj$@QJLDIwk5K_=dEs0-E`zDm62YCM8#$-TkoIf0C{^3xL~RN$ry+
zMCzF|pb^Cw9%sKW8G!5&hBP#+pk+-u>KVVQO8~X?&Af-lCMIcZ>(tiK!&@msYH90&
zy!4I1v9gLPw6=HC{|!xTO8}nd!+8%Ym2<pgB!8u)-y66hV|Vo0H+R#DicMjzSpdYs
zA`@7XlN>mE;W`r@(pXOUhR|{%Eto6Pu5AvS#=+zM=<Oe5jZIAcgm2JI#7Qz~nesxQ
z-+;)L>*5iJ^*bEsz0EtFXehXwjJ3TR1tdliOMh&m)nN)NzMBN^zzA&L<HC%QQsgD!
u|0z#0p#cQ{EEo1*BKXlv@WZLl$MauJX5vC-I=HR?0000<MNUMnLSTZ)IgMoi

delta 1137
zcmV-%1djWV2hRzRZGQwzNkl<ZScT1(eN0tl9LGQBa4+0@y}ZQxizp&OAXiH#lBvX-
zPHU09Ol@tN%}S@Mxo}Qqw$$cE)J8R%Ew^0dYArM0FuMkZC@2tIyMUyi1c*w2IJj?~
zr$1bGT@C`egueeh-{0??-{*OL&w0){k`Mxb7*pmPMUr!Y6n`L+2ctHiLKaGXv&CEn
zAPFIuI4ygVfE|GRfC>+kB0=8e+T%N=iOCsr6iNPd6pOndWTDLS@(Y_>2qcbjaR5n3
zQjpA@o{yDMWFFjx8;K%EyYDJ#?)8GGh)|X;S;Ums30!Gy=fIH@SQ{?gH-Hpv$`T_@
zo|`&@-5+elXn!=gJ(tTx-u6QFeSh@60ETRV(P&`9+7*1er+|!kDSWtNqepQ7jYh+^
z&Fh&Q6MbI*L$+Y$vK-!g{Urb_)(eD%1Pz+!?X6`&`W&vbwo~8O#KoqT{{~>@^duY(
zCsnm|bX@QBh}rCREY?PZ5SWtUiH-_q{puGn8VwvQDt{(-YXN=zwqXIh{KI13xm)mh
zXBS$HhKTTB$|`EeOiQJ?rH#Gc{7A>OP9nlW@YZT6JyT6-c{Puk5()74B_S?`kl;X$
z7oQ#$;I5l6eQpZ73btU->j0>%v2y5G3Dc&=v*gK4RlX1c^T~1&<70`62t`o@kEA_E
zcTexVuYZ7_uaU2J?<BzA*X`LI4zB#!&dTLEgU>{gh>aP~p<~5#cJ)wXF2(L}a<lgq
zHoN1l03Lf_arS&3n>C&K#wJ3713eNC9QlQHtCtTs8-N#b7V>WXE;es?l{KrD0#IIQ
z;jOpd=W<J%DqjZBczLnsqiuXzu!R-No@RVRsDCQa>2#v;@){OEtJM%QAqu_D$L-CY
zY2t@33keDg7#v{Ds-<M5rT*(CT92fz?wdr0hYVZ%AL(^I*z9%>FX$nEa@W5+I6%(g
zbPrRf^QNo&CIBt1SJ{8q%#FXgM-0%{Z^OsiTjkH5VIn*<*kdJSfXFb<C118=5ufe-
zj(>wi#T1!Kd1^r#{(ioUR8E%*Ns?5)!JuQ)8?SKsr>}V8@mY7wXj7IrTXkLxRA*PW
zSev`uJ+5zT5)FSesqzNu_xg)s|6%i>v7<kiin<Gzgb+gfW~mp^rYs=?eEj)7740~^
zo}~C#_c$Rg26IXIkf&Q;zm0>(ig{*nhJPyNa=ECgvGVYgNglooaN=Y+dD{y;Zr;~#
zqpG%!TetcEP!z$bifR@<{~Bkj&#MZYIaf>ev#TjNbx!rTb@%kLZsU9C^*WqR7ai9-
zDfr|IV8BV}=WArz)OhT62URszZYv7o40<x=&&Jwt(c>i(5f(ynVjKV#Ya>^$-D+^h
z^g17A%}6F8ZW1l6?UYwq+?zTmFo2$(UR<|ts{zJBWBy6@zW`7l(4(g|8K@XTfC^a_
zN<N^BL2*SEO1|7|F_%e@H_8x-1bNLCbD1>Ozvq7gGw190W%D&-00000NkvXXu0mjf
Dw8AJ}

diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
index 6f7bb520f257aa9762e94e5310cab4ab70025099..e8b230c59cb66c6ce473c43cf2b7253e22129d75 100644
GIT binary patch
delta 645
zcmV;00($+r-2s&bkeq*HNkl<ZILnoj&r8%n7{))dyBHO8=+Ge$qOu~0BuHC|phKx`
zBGjcHr;zF&h#;_I5p^l5Ls5sIs4z5INc18o5rK!GAFzf-rRJuqySeVV^PPF$4zr1n
z5IyiR!_50W@AJO%j!{*miu7OxRYg@15mW{7T3rP}P*F}C-i?1TAtrJA`40d}Hcq*+
z23PsT)SOT#dTgaazHFH+&hhq66V@x;J%c1$&+;aH7h??E>YUJjVP)#27R#cuMXz@r
z^=jYi589YIqavb-l8w{Z|BK9MmXYx}E}W|6+T-tZoZiaC>n~_%Oa`q+!GMTx>B>z2
zlC9@Rlq;THo8y0EMnPSPnwnLNWv79yEciIn6aBzC?!U?aaH8!HYuDGIYPfadDzWn1
zESqXqQ=E?&&y{#TJjKYjuXGP&$>j?iZ9arAXK6pYEhtfCU;PHWf~peBSHgKdHwr*k
z?+{}@CwbD7VP@<j4LfQ>oCH5FAfh-4&k&m_1csT}0;PZa7fv2)0pR`TAue~c2Pd1u
zOL%S3U`}G;u2>1w>46`}ighHn*8s4$eiug%?hIM2<zZjwf%l5{;CvuR6y~P^D8D=Z
zXP&TcFR>KPl{kK23)X{miW9|FOGxA^%BmyjMQ2~mF79JChqo4hr~ShKG&R=YJVd@q
z@bN+OV!(a9XZ^G_r!as*b)><G5_yQc;;I%^dyrTv)r-eE0SsLO!z_pW^&4>>Tx9+x
zP!Sevn7WodbwPm|ynq)8nY}?&iTpAOM1%#W41F3W5`&Xis8?b*F~OW65`))xb;6f?
f=f>0-{ujRibdQtZ#<4k000000NkvXXu0mjfl_@hy

literal 28346
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%0D^>ZE&)5p}V+MR5`_N7dZj%;ZJvNrJ+6
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

diff --git a/core/img/filetypes/application-sgf.png b/core/img/filetypes/application-sgf.png
index f171f5579e735fe5cc729144e059263a0bc20741..48996c54394314e0f78157c6b06e472d90ce6038 100644
GIT binary patch
delta 606
zcmV-k0-^oY1-=E4YkxjTL_t(2&tv#cB49w~teF~JmE#%iZ)0PjXKSGo>}6b;>9~1j
zBo+;q_q23X2Kss0Sz4HxnwaS8>uYLiDk&+-%SqdttM*m7qiFc?<#l7RpPRES5ZK$>
z+uGV$SXdYu8mg<S%gM=!iil{dN_CVtBQ(tK3iomYDRp&q^?&g2aC375vdzuSb#-->
zl$6B8#QFL7Omw9;Obdf*NQri~wzhJ1cJ}u2Ds^<Ov$3nPuqrk*&e76wRaTLdl;q>%
z<K|+|jy45p*f=BF-O0kz(h{h_&&%tirtTYg)z>i8C9ee0z{0{}Z7h3vcO%2Rj$jjG
zeKRvNdwT~jSAVyY>N;=aRN$yfPElN3oR^0es6j@8Z|}kwhSp+tO-&600|SsHc6KM!
zw2(D)$jFO`h;VUnF*7ss^KvZi@(0=wq@$$@3`CF~6O*GV8ps;jq-6Q|`Ptdo85tQB
zqy-KviDg(nHNxCTT~Sd{O-)T-OKYE^+B12TXL3+fFMlotF&?PF!A$=4@oAt?3imOT
zmXef_kx`JBw~<$Hk&}0nma!F=v=kPR=jLH$WdW+@=42~Nv4jTe%qAZlbs1qHA)s@`
z#Kc5JMTLZffFZ-l$qDo;P&ErPlck}|w%HMgq*0Y&t0*hN&CSIP#9Uk)9GtAItjx?z
zK-EA}S65wZT7xHQTH4*%kZZ52CJu}spc{aSn3xz@SeW>D*zL{aXEb?XPpuoLhn1&V
s`8uiTYlxfcNr!oAwG}x6Lk3w50DkN_x`QMu@&Et;07*qoM6N<$f}(3GGynhq

delta 629
zcmV-*0*d{<1=R(RYkyTqL_t(2&y`Y3NK|1M{r<;&%|*p1(?-!0dSaM?nHfsC5sVfs
zOl)03ZCV9E(8fiyx1e2%+GJ1=Cgn~ggT$~@vMH)@Y@8Wq#&O1b@BjE(jH$Kj>^?Y$
z^Ks50hzS1!zVjF!x;#C<8u^)9imwsS6}zkhwWV!Ml|5G;Z+~$}(c$CR;K<nf@tIU2
z?MbNvA%Y<AeNV}tt}1llT>Xu~SKAJLKKX3q-Na0KBLLHKxPgoZlv1s=lxi-LPOi=d
zLD$WDZvcP-z>}ftQ?qGbQros2$8j9nvMkdyP1EF@6Uw6T^{1l?&+qqc3MM`zvw6ii
zHw~lF7p(>Fw0|$!1KFXlfl$UM0?bE}uP43%0Bf%LGBy?W1Q>>4aXt`T?oMS|*9+|%
zey31tTEA6N2;q4F=cJ`R$5R<EmEEAsl2S=3K_eiN?c`8vjT!;q`%-o#w#b(g>-mCj
zS%fjhQ6uV|L2Ip*Qc5dC%;kevJjbi{xQr;@_W=NeP=ESgfe=C|rL`_EwQKg3^70bX
zwdqRQQ%WJ{zS02!_|v|xln_En2>^BBvT(yGf{2&SH;+&MB9w8)s)5*uN+~Iolp^MN
zvA~m3g>2(m|B1T~CpiF|Z3%x`Oe`k~gwoHH;-)|fA&UPnN{$_>=sZ~q0Dy>ycx&Ly
z{+ivc8*Xx4HxvrlwqqCuW0VlW7;QXQF?6T9$lM%X-^DJ|pu?jJU!xfzl-3#%DJ3PY
zdHhIaU(eC2w_pA>z9L>c=$)L7&P9?xVp-edwc)a+!+YDBt2_E1ZE=1B;p|h!+58Bn
P00000NkvXXu0mjf7>6;X

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
index 4cefbb690d106f7858203f619cc7766aca4b7c19..e0cf49542d44e8a72f53a170b524bf73b6c94fef 100644
GIT binary patch
delta 454
zcmV;%0XhD}1m6RYBYy#=Nkl<ZILnoiOG^S#7=~xtCKs(*v~$&}y{Uho{~+z$MlM=(
zV+hTdu*gdj5ne{5C@h0+REusBLg6MjVNpa`K}#hCeLLTz2gfq(g@-wu^UlNYosm>k
zl?b!hEF}^N)(TD2=$W+J?I!BhkpOgYx`|{md52$;%jJ;GW`Ff{JRWB@o6W?R--6Dm
z4BDlhSS-e@R;x(}Eb9;G)$UtD=hQ2g%Q}>BILs^-i%IGkJHvo>i~i-Cme4u%ip3%d
zg@O(x7!0PQj=>b#h0h3lm;zarKWK<%P9MPwkN6|iYE`FFsp#<AV<ZrSLLpW!Z|xpq
zXw-uV?*f*hYk!ziBN!f^#@^AX5K>=i{15zozYu(u%24@>Bl0X>^6&cI$wdb7jg$~j
z-yrb$e5~=4pYv}R^UOmDte{kzeq*R_5GabmnoCC~X}Bh5@bdcpLqL6l!0YuI1W(U-
z$Vvd`msh_ImHGyO+wB&D5}(0RbQSx@XQ<Zp(wS@c7C$3GKz)ON->VR8Y#->i(9Gt}
wp%75tAaJ={4F3rA4Fadr$s7*HeY;Tq3mCuI(TSZlmH+?%07*qoM6N<$f_$Xi7XSbN

delta 556
zcmV+{0@MB91H=T7BYy%5Nkl<ZIE|H(-%FEG7{@=lch#U;5@xIJ+J-lkMJ-I5Vhsyc
zk(Wc-y6Lt*Lb}>bm%j6^(8~rQBta#GP$H2;*<>xERs(;_oO}1~oTsbJO<mCU>N)3p
zpU?T8htp)5CIInxoS~ti6b+=5!r^dy86F;vWwY7!>Vb$H6@L+rh<K98<Tu$v>2zA=
z=H^61WOQ^i6$}R5B7)cJ#c)5GUE03q6nvg-6oU1$5Q#+mTI-o$Fc<*V4S+N4t*jPx
z!^V~a&3yX0h;7>d3=R(Zl~OY!BO?LBZCSJwOEeYB4FN|ma9bATav2f9wr!%(sJ~Ds
zJZ*B_AD4!mJAX8GTd}#hSzTu`nH5CDD<T~t(veIif9y5HinP|EwHBq6D5b<S&6EM8
zE5uwbSFF_IldqYYe$U}U2RZ3!qp-Eb&+H#UJzezobpxQara6&FkVqu(`Ftp)s`2{!
zx@q^H#<EI;L%lqFaF07TuCctfTJ<QUXs&%@Wy%2i_kTGFhk9^24aS~LP_k{Vc3vbh
zaI4N=2dGT|aN_tedb<MT7MECFS=%+#T?uvqe*MldJ@bLPH?QMqYyCe!sbur~<r^+v
zI7esTJOJ-zKl0doQs*~n0p;@cXPS61#r#5s`GpLVuijSod#+rn^Vb13Ha4pDKsdxe
uIJ7JFP9=XGAfL|@i^abGv#Ulfmy5r~p)%z;t0@xz0000<MNUMnLSTYWc@GHy

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
index 3d66cc97eb5ecb9bdaeecc6cc5ea072af5dad8e2..b326a0543a5e4505ecea5aba7bbb0ebe07bfc902 100644
GIT binary patch
delta 450
zcmV;z0X_b_1lt3UBYy#+Nkl<ZILnoiO-lkn7{~Y8B@dlCblX#>?xuc$zJqiVqDu%;
zVB`zp#>RqdirB%}70HTC5qdckM9`rwUV;fTGekN>bx_i@r+FrJXvqzG;K$A~|M|_%
zGb^OiX#o*MQOM`>#1388@o9KG9tUPk1OS+zOd^J1+`*8lR)4EdsZ`iFm&*~i+wGvk
zZ^3x<3P!~&P1A_W<#KR=bFU85dd(J`$6T-1V_;>oS>kj$9l})b0_OBvnBBUu1?Mr>
z>2#poZZoiw$z(|wn=iqr&>jJ8CMO&YKVuU`$_zpS5Aa6~1_KN9_6Q0%sZ@$!@ci-`
z0wEa|0%2H<Cx4*cXbu%(UNHXy6sW4o1pDO^XtthMsC;||YwPMz0p=|NMN!Dlz(>Ci
zh2kMB1>^LSKYs}@ZxP6{%mvl^2885IhTRb`ZxKk6M9iIWSFKQFW3ygf-=K7K%HJ_>
z5yWCKE?9{wu)TA@7GXU$TM*euK}Or<0?b<k^j`T9a63UFqru{Ggdrs|tfBASE*D_l
sBJlhD1pZN&w+MVbAMtv<wNb(R7v72Sm2mo!T>t<807*qoM6N<$g2&R(wEzGB

delta 548
zcmV+<0^9xD1H1%~BYy$|Nkl<ZIE{spKWI}?7{z~idC+D`OA*?VT98mWSZS9G4i5*N
z1P5Itq%;-(;9zkUbP0metrSUKPy|VEkp~t9MNn{&QimXlfwU@GiNsbDUmuBi_k9i_
zu}Kp>aN*wXo^!rG_xe()6ab5hizE_>JUyV4!teLLOD2=?&410!a_d4whD2mUL`E#j
zT9+;;6bh2d<wQgzlgZ=_!w8B9;cyr|czx~r-#j6ByVk1+%7-8tjZS!;w`v$h1SsnO
zQ<MAnQT2KX2m3YNyf0C&*8zydViQWK)pR-?(Sx-bgVo>os%}q%0d#`38m{XiBGl`3
z=H})m9LKrm3xCW%l%C2CWKSq|c6M6ljg5_ML?kRC(;_l$S=Og+Lu^7R)wWWpR9*)P
zO~+!fSOs|b>NSs^zQA@Ih6V>X6FtTF*eIH&wN>PK9-3*In5GFd-Ws5^wavo$S(a~H
zB{DO`-TPM8mXuQHy93QBpFDmH09PrTYL&__8_yFo&3{KHzs;ao0l@ml&tx8~0I+aw
zc8|Ep*E$2u%(w1jIj}#(mCF|x9~%YWXSu@4ljr|80O;@Q!xO=_8_)LTYmw#KS-zFF
zde6Xh8=pz{`?)xO8td^huH9S$AT%<}%)v>H9y#2`Z!@S=Dy@BJbeKzLV|)7U<hL2v
mwoN=9{~hp8)h+}A0sa8WtTu2wzqMlk0000<MNUMnLSTYg7XNer

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
index 46942cba2852738b284ee60ef95fde0d633a16f0..7c6fd24684095b2e90d6706e80dfae9d4ad394a7 100644
GIT binary patch
delta 306
zcmV-20nPro1I+@EB!3i1L_t(I%VYTe|33pI7(@sIu_O@~q>c@wY2LhfaLmBha{529
z7-|Tn0oH3C{MTA?4<`o6Lk*C`FhI8U$bX+DxBlDAxrP&i<U#6o?%a8A-MV!*kud{j
z;->$^Vsx--)vBAIKvdbid-uctWPlYbR)7s)Shj50O<aneK7W7tKQX5qjzN4F0O<o8
zuwcOgumSzk=YtiYYeojhhJf^e4VW`$4ptYS+lX!`NFUgM88c>JbpbMa^`>3_^Ga*~
z=M-1L#X<VO227qjnV<_`24ojj!VLiF0~^rS*GDi6)^FeYzo??&e`0nS+)$7{umK$%
z9c0A<NFUgMnk$-`o8+VekUp>hIXO8u<KyG+k%~e30P5)sJEf&<U;qFB07*qoM6N<$
Ef?^nr%K!iX

delta 415
zcmV;Q0bu^k0=WZ_B!7TOL_t(Ijir)3OT$nUhM(FfI+RxYpmcU{ar1BZA6h2|1*wBV
z9V<Ag;GjdW84GpNtsRS-lOi-Ch=ZS1te8rB6LTC&W2y-heYe9o_c<@`xe*cJKhl6P
zV5pB-1-t{QP$+x@;v1*W{cd~9&5i>vKOHbLJ;7_s4ShH|Jb%D>txk|rE#7W3+EPSX
zPADLOM!emoTrQt9n@u~BNO---Nam>T6h98;dg@ZCbcu*eRVtMm`GbnZqNxE_^?JP(
zw)O7eiS>;wug>SPq>_^WxULH#f?*h@h{*O{K{AW0-iF)z$DUe5B(u0GxA%`CB4QYZ
ziHM-<x*25AKYttq)pgy}034@tft`JWvx^!ByPKZnuHD1q3e{>A*ZuT*j^lLxfo<CW
zEH9)3Gw4D9#Qi>+ZQBg^0XzE!^Gj<zfpr7a2BT=vC?D#Rd@kz&GytVkpo3I$l6)@P
z3teCF94Vzb0L!v|S@%QynfPT{RtL~%G)Sk@*P)aU#Ta5Sz5pl0Dmc`IfMx&y002ov
JPDHLkV1mO2z)JuC

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
index abc38d4310c9e73abb1f664a97dacb3708fcb2cc..8b0e85b067039c2bd583db7fd94d746a6848547b 100644
GIT binary patch
delta 317
zcmV-D0mA;Y1K0wPB!3@CL_t(I%axKbOT$1IhHrIoadL3W<m9eD!T%85vI-eQs6wh}
zXq1Y<>yh@fq-Puo0e^#=yAYwpHG{L`XJ5r~AK2InJj2I5Jozp}D5V7OJWmuwQQ4ez
zx^>eG1QD&xSO;ZUPRM%FEVoDM-1OOOjH$%x=?g8(b#KT5d4Hb&1h&WTv^knC1n2Ou
z(M4CyiOw%;vC(>_-O(HE^j{Z(b9ho4wt?2V5-a;pv@CM)zyev8eSbu6#un%eh97rk
zOn;&7AL;5=vnw38;~IfEQp(DH1Ei)IzOes;G)<iX@LAxn)voOo{{ub?BuV150elvS
z<Jc(xp9R9B6E>$Sz-NIdikvop&o>A|rvQ8w2!f#UeSiAPUU2Z)G{gS_XjIq=m5zU!
P00000NkvXXu0mjfCcBu0

delta 410
zcmV;L0cHN!0<;5=B!7EJL_t(Ijg^u=OT$nU#ZUf-4T_CbD+LD;3tjv+E>320b#N%S
z2Eh^vib6;f3rgpHf_?)x5zL@21+lFfV~kBSxlYFSijnrh8-54wdG}ndU|ALbz%UHx
zy6%9fyUwG!vb5-CF#v#w=7^|7M5R`%bxTYgpIop=#?dLq&3|Uok@I_({a?E!;QErW
zuV8oYm-YDx?(-x`AOpZ!WdSdP1X(qk6LEFZgCvQl9onfLefX-J4@1ljA_#-8Oam1%
z@?i)`5>egWO7%vg;mZBaGuoZ!%x12Z1rFmlhCoEC0Hy)JIy-Mq=B5gN^+umxcn<<Z
z(Pyd!Z*CVvlz%?cG#z%!`v(^N$EImIqHWu-Z5!os8F3ts7KM$#9@6^8=A$}SERJg6
zK6Se?E6nE=cV~MmHK-lh+}4M=Ua!02@JQoE;3nw31}b|fKfh*i|20rKgPEM<R>z2-
z>pCC7^SrSlc%H{c@O>YerrrOrpcG1)rafe_qA2(V)e`^$Omh1Ws{jB107*qoM6N<$
Ef+r)t<NyEw

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.text.png b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
index 06c1f30c8fa21367055cd769769b341d96592bc8..48452eb3e864edda22f57c862e72945879f58321 100644
GIT binary patch
delta 320
zcmV-G0l)sF1KR?SB!41FL_t(I%axL`N`_DvhR@oPLsLVWQ&YRCH_$yun-}2PA|VNa
z4f2c7AgH(m!ha2IO)kL+`>6|P)IpH1^BPJAenVe)@W6R^`S^}3NfHKBRb^#a@+I;-
z$G0*~Q-M3di0Djk4yvm9pd)FThU&T=&qYyi!!Q(a{4F@We}AR5Ov$p0>$<MY1={l`
zUFL^Ha1XEV`w=8fQ?6;6!Y=M!=q7)s>!-Ixa1XERI%?Z?1ljF&dv<cWr?rS3kyz%8
z>$=}qqAIuoLinP8G7N)+cs-7SnK+I)Z3uk!_dkfDXfAkoOct2}Un&U0aMJ|vrGg*`
zHcbFuD)4=O(>Vn2r2^0Mj!v)?_)>v**G&_^mkJ!m*;D{uDzI&vTb6ZL3;Z8B{^f@N
SG(5im0000<MNUMnLSTZ->y+&P

delta 394
zcmV;50d@Y{0;B_wB!6p3L_t(Ijir*oN&-<7hJVLdG^<IXMbJ{DP2tMrJVFm3g0^X!
zyB<JVgsXOrF2lA1J%+fEC=w>4g&-7#qB7IHcm5Wl&X{9DKitLPob#QZb5FvyZ2&;E
zT1BN&=^{o-DI}B0r&_I6>i7G@MS|oW$pexHj^n&=ja=7dr+?ESNj96!u4P#!Nu<+h
z=;l@XV>#y#cx=a+!0-gf=ku8$2wIk9<p2zI060F{$CnqxHl}toJUqWc2mt^n6bc!o
zRIAZw<aE>bk@CKg@MJ7t7dlMehm;Z|A%sA&Sj<eP)7yk`cF)+(72TaGOeT{>-0Sr|
zK{8D;OET*?&VSpwCC;Ukiagu4yE*`OP8<vd-X;f{rbXf)2%y*NbpW$FD3{BN<n>KG
z7Ib-W4q$d0dN?uPa=2)dgb-1HQtE#W!hmfYYy^ZI#KC?6q+A};HV&kei2TcFH2Sk?
owLaotJRYM|D!pzCFbo4f#=HFPB!F;t00000NkvXXt^-0~g8r4YMgRZ+

diff --git a/core/img/filetypes/application-x-7z-compressed.png b/core/img/filetypes/application-x-7z-compressed.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-bzip-compressed-tar.png b/core/img/filetypes/application-x-bzip-compressed-tar.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-bzip.png b/core/img/filetypes/application-x-bzip.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-compressed-tar.png b/core/img/filetypes/application-x-compressed-tar.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-deb.png b/core/img/filetypes/application-x-deb.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
index eff1b7fc8c2ed87add4f196457a2a0c15906c35a..b3f6b7e5cf91efbb0d6ccf4062620c970f327ee3 100644
GIT binary patch
delta 524
zcmV+n0`vX41f&FzBYy$wNkl<ZI8V)uUr*9u9K~4|t;=3Tw_Vf=sH<9YSqxdMQql@k
z?4O})qu-*M*)nW^WTvE>$WWn%lukzqp_!Xe&6~QZo9YGh0#1CM;<r^dUiNHf`|h02
zIgi8fU%ly@hj-5py1k3Blip&Y*}FQ~ZN!a72J?5%yj19*V}B`rI<qzr&}Js64^Kn-
zTuB;n<B`F@{__e0uGaFHPaEm(TEWuCg?@dn=8U-U$Y5aqC{KqE?Rg$)`cX`@sFL(+
zBXvpDnO=QaPZ@FJk-@;yu?OY`Pg#o(+q9Al==D^O-exUr75en;eZhzuj|>Kujy;fP
zAknH)vQz6*L4Q@V*R?fwTVLPhjkxj1U|{Lk1J4FL){AJfiX%Q%CNAntx>uXCA$=;1
z8FAy0!NAh72WI-4to(hC7UF00^080l@h+`RUNJu+Zagv=SUUDV`c|Vgd&jAK#H0CG
zi<XAZ)?mMuM>~wT@yK9c>DU9gu*)h&+O+)Oyvk9(UVp_qR2d3rHStT_cw{iJbnJo5
zHD`F`o?oQ_)UI+(<3W!ST~3W$cI!#-gz?B=VCmHRJEG?f+|BkJ7s~xsqWy@5I~(*U
za8#og8g0MM(V=Swt{&UlaKpVnX1VqaZAY+l>H}t^rkyqI+NNMl`6tLrxNQAt0Ez$r
O002ovP6b4+LSTYEQxIhU

delta 546
zcmV+-0^R+j1iA!}BYy$`Nkl<ZIE}@Uy>1gh6otR}*_~a-&KgAl3M!ED9#o;EGLh)=
z90(~9FOY|zz!fDOMP7miiU=eUhZx(jy}NT~hQcv1LDU@SO7o-p%^BST|66KvGdzCQ
z@AbBy8=GN_q1fI9pq`EhArQnfn@!&jUVr%c7vSxyr`&(|=zrZ-uNt_bB+DJW-NyjT
zMqlu4LsKuA&nCl*?_XcMeDe_iy#`eMokLf41~zwOd5J5#6kC0Ytv;^olI0~fcet`M
zsQNpH>pl%IJlfw=TAlc&rd`gd7gH9qF-^0iX_hQzW9r3}b~(p4HA<_K;nDscfCVVG
zcMr0{b&V@AMSlnD3NlxamlXh6S&?*2P&o!mrfj!V?f^Kp00|%^6t_i+q!d>^Q@nGR
zRy}J6F$6>eBZBcQN@-$B%qJrNnx;m)M|_KjAR@#NZUJ5dtw3voQV>%lgbe@f696#=
zL{<Rbwutw5kz0WH7L@`hNGTFRK#WJJ)sR+avTF1#ZGYP!vf;qRjLKDLZ7@lrM5BU6
z-J~QXeN&d89np1|w3Cf5)X|tuhKi6-K;rZH4;FQUwU*3ko;<imLZQ*9r15n$Yk)q#
zyee!+e?)U}-JrE5c_9SF<we8qi2>*1aRF!xa5fsBUQMn$F{a<iysNW~wbm+LxBhhV
kLA`eKFB`xeML>Y~3yvxS99~^dWB>pF07*qoM6N<$f-;)+S^xk5

diff --git a/core/img/filetypes/application-x-gzip.png b/core/img/filetypes/application-x-gzip.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-lzma-compressed-tar.png b/core/img/filetypes/application-x-lzma-compressed-tar.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-rar.png b/core/img/filetypes/application-x-rar.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-rpm.png b/core/img/filetypes/application-x-rpm.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-tar.png b/core/img/filetypes/application-x-tar.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-x-tarz.png b/core/img/filetypes/application-x-tarz.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/application-zip.png b/core/img/filetypes/application-zip.png
index 55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07..2cd08aebf954b1fbd87e53856815e091d7b29d16 100644
GIT binary patch
delta 551
zcmV+?0@(eG1&RfbZhr?!L_t(I%cYaKic~=qhQF%1xBGUtvjz5yny9FOZ(!!~9vbQ!
zxC9gG69}5A&!ISAU?7O0xCDdX=zt8&ICJ|}oyFj`3uqvEpx~UKKK}ndRl(i)pQ^q$
zk8WMK=k8bk=28gUzkGY+8bEM&9^O2EE`;!8?Z}Z)(~PJGLw~BOVsZ5}j<fseEu~~i
z&dl1D?d{L4yI;C;XXAM~(QVWrgr`f(%ZC>h78y1pnr6g!GGS@;B!l4?ZFdNSpAy{b
zob$z3k00EP!1a{Uv}qd53{yo_DWzZ}2o)-Vna+<f91ck_PJtU$2&{`p{b_6KH?L>n
z6o5A`U;HVGNq-2eS3rI2_$fw{6~>bVhNDFW<1vHbgr%cr0XTMajoj^%4-V+sT@Lp5
zX!m#cxcRQGR2?&;%=VZesLYVAA=d*2hk6BHzkEPSCg&NYYbmo9Gegy>)Erkq2*gwo
zLIl7}QON-0u0^CExucYVl!B|EHV23Z?htb%0OpR0@PG03vpLLA6|`g|cZigJ{sG8>
z#R53)Mp7lEM2Ni_H$$~oR7$3FGt9y-0L>tVyJM=vs`P-6=4<a)Ya&SLA%r*wsDnEt
z&oC8KgjiL?l!&2!JT?cL2qGC(p&pEWhDZq1&7==71e}Bsaqj_+;{XX#Ohh+u|8Bvy
p-*0YB{~+-*ZU<liSouf5&Nnw8Rk^U%2(JJD002ovPDHLkV1i&S1(E;&

delta 553
zcmV+^0@nSC1&jrdZhr|$L_t(Ijir;hic~=qhQF%1xBGUtvjw)xBr0m)8<@GghlctF
zE`gywfuNcC9Et-527(xhOE3tI4#>dh%<Wrs7K7V5f)fmSprB4rAOHWKQ^DQ&pQ?Uc
zp4`6pz}>GM<WUGbymEK#IzVuD9^blfK7{b>=&@s?rWsKWhJRF5#p01OIL`K$_mq+;
zIWucpHaEYv?tb~|y|tI=WVcp_5S}kBFCSi5SY+6YXqpk@$%LgNrx*;!XuCxq>`8F1
zbIzCEJbiRO0yk1h)23-KGfWj#rIdn^AXKObW;#E{a5yBzI0bH2A#g`T>Mt7`e|bF{
zrvSWr{c67`CVwGtrvmEL6Q>zXRv1qf7>*VhjK>Uy6PAvj17P*|QF6CK-rc2Zx7pqK
zPP?<k=k*VDrRta&W%ivJg31i(8ge~gaHv=C<J%{sWOANSx|T9)F*8)1O3iT<gg{Ic
zAw&So6qO7>?pj0&k~>N%NGZ4qYIA^y;0`fI0$}c_2!Eg7zL>)dRY6Nea)(Ii``>^p
zSS*0!ZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS
z@(fc!MTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX
r{J6d`JtD{_+NU-HumG(5BVg+%Hy~BHflAbj00000NkvXXu0mjfd^-8O

diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png
index 5769120b1b6d38019b505c9167498ea199212cc1..9f5db634a4fb42ad33c7a78f5488f03308d3317c 100644
GIT binary patch
delta 501
zcmV<R0Sf-c1jGc8S%20^L_t(IPmPmHOB+!bhNHj2MFm&VjjL3_Dm5vFYN&K6UKUp9
zq6<O1)KH|T3DPc#2+1NpMi3D!lx`|j3vCyoiMchI%bDAm<n??<GfXZL2cFHG^FH5&
znE-$QA)Y6KpkSy2eS&T;=Mw}i%c^kBtFG&!9pW6xWOCmx@qY`3D6H!`7-JraqM%$Z
zBbUobNj95BDwXmi^>7yn=z?jQux%UW$v2pvzkux|P^naq&*!DUFbq(UbUJ+}X%<k}
zJ~)86@D^@j6KwJ|R8>WxP-q#6GA#n<??0H+GvMpXFs5h0);7FRip8SrB$LTJAmAL<
zb{u^31B}>5aDP#i(>t*|l29kKk5Z}BUcfJY!<?Uk9-V@Hcm)2xEHBn2G{2^4Qq)#p
zecc0(t-}2jgE|@l+e&!zI*udvLlUAzu+{%`o+|U$iU^0H439Mks0+DZ0d><L$VVo6
zGA~~KbXJz2h9a=P|A2FL4(IAx1_|nbpm2jge-%B}!fug2%4nEd?-s%0yA4(SVLzTg
z3ytgQNT_Bny@wKg1AcS&#WhQs@dWDgF(`v0xEu(cI={|p{%{AX-VW{;`AjT`(LtNb
r%~Zu*EkJ*-PtZ#eX?+~@>-XLQcBa1kmc_U}00000NkvXXu0mjf10U&N

delta 503
zcmV<T0SNxY1jYoAS%26`L_t(I%Z-!EOB+!X#<hP%7Ybb!H?E?B4>XYmZLqkMS{Jq8
z!i6AF+aN)F1kpt)g=CRGMkrEfp>)%tt)MPM6Z2{^k2|kB$=7?XW|)Z)9r!kL@Ao_B
ze3#P!po1j7E}@Xnzyo?F^u+V|03pk=YMk@B>$+$sagKC4{eRgH@dF0Ptm`@$W1bX6
zLA6>%p-_;Jd_Ip%CgVYx=1v081=BQP+cwN^-(l|UgKei!tJP2}7A3$i3{a75HhTkU
z1(4Z3IDq+f9&RcL_HqiUs-jdX-5E({(h6|S&SB2H247o-F*6Ic`oSBeTrSH_a=F|+
z0M21;?SLoW!+%JugNv%1{)zAiLY+_^l}e>Ofd4&#Irj#7>=o=Uhv5IJ@?sN0^J|(W
zL2Uun$4}si6}TG-s3T#p&6GE<<2W)Of{^Y2HlO#*QDvTp3v&d@;8*}aUC4lisG9(w
z7@d5Y8y)}U#FwCkqp*Mcgme4{&gGRflBfd`nF9cQB5?Lqi$qVAkqEaI-hu7x2CDka
zet7^b{6bfU!wq|B5lU<t{JIc$>n5aC9zY!$gVH~Yi{8+0=jga`-yXD4-OJ!M$UYGe
tql3qo#a&HquMf~okVmX@Q?&Zs{{eQUzWmnhFO&cP002ovPDHLkV1j~=?_&S}

diff --git a/core/img/icon-error.png b/core/img/icon-error.png
index ed438a32fd8844543f76e1f10180aaef6f257bbf..1ce0be0fb2ebbb2778f59be6a57f111d55e36999 100644
GIT binary patch
delta 1251
zcmV<91RVRN48RJIZGQy4Nkl<ZSi|j>ZA?>F7{{+KB)sE5khi{2T7>e}Qrc1~719bw
z7{+4II@nB{acpsDM#S*q2Z*p3=bVOx=@Q*^QTBn*d+#~DEl?;hu<LkfX|GvK%s%Yv
zvafz)=V861k}XTr%`D-=FZVgm|2fb3-_x5XrPkNisW%C=ZGT|f!2i;~7)7Pg6s3jd
ze`;WyqD0KDUAO7oyO)@#s1<nHckcYkPEncvngJ9YE#YEgGZ>1BWul`oyJt@jCnxg)
zY+_=NiHV`7DJuH48=zxiKBeR0mYKLXFPoIqj#5%Wc<)|*E08BO@4i+8_JoA}Y)Z-+
zPEY4u3I*#BiGRL^`0pV4FcTmD@pxk51(cAG_sRyG8jYTl$!4eZ`Vp_ydUm3)a2RK1
z@&G55KAuvk?$22)L%^h3{SDD?aboc!HZ3hcCnx*pq@<QtG7#$M5W97{5jHz}flW{M
z{a~@QBe9tGm`q=|tE#SJsno@0WUK-ZPiQm)p4!?@5`PDfNW_ypOK^)XWx%;_UmBB|
z>L!P;VTmM!q*9(MEbLpbTKiB=j)UX_h~&v(JODA9l@(wm66CenE@GK1i2l?rzLWu4
zB>EiZ=7tEoz@$#s&F1FXy=`qD%r!I&A-Q~0gBWt45rgB4EiK)iy1HxAX7gElMn?Jf
zsj2b*Xn%klsvXbDx<EFVkW99U^YZvj3JQFadVL?3%Y#mps*}`bhPt~?aZ05ZfEaS1
zL5)kR{RAl#v#eCQ%811)bau9n(8XkC#{Q)NyF}8<<m9Zda(Te1R-Z#kC66PRG#c-7
z#l_!2%qkSCj6`A}`x1Y(+iL)bAqN`NIEsoMIDfTTI<g0wmlvRAvJrCRju#BrWil(u
z&kx|DA|7xVjhAsriC<U)?n8(A$<rsS8HHkIEH@X%a1;PB<RbR?+-CD<kv#xbsSJ{r
ztb4%#E-ihCRVrS<q0x*^R98RRTx+$9o})+KbCj1a2suupc|70Lv^jnuhTP^JQafQZ
zUVo458_{nt@)jsuR^}t{0<20EbT>8iaeDp2d~0j}?6G54IC3kKH8l@FM})PWo;Kml
zg`0pJ3ip6oPOD`i`wBP>hI{t>{M+_|f~#b9h$-j6gBa^{d?ZMvT3)(z>6D|QVic*>
zepans^|Z8ff;MNf4Q>49#l;4~RG5u#0)I59Ave~A%F6>=`vTLAjRRP#{gEvzTVqtJ
ztCYuP>%kQjd?bj#Rabw+>U6=)waIj2s<H9g`Qyjmp-W0Wq|3^dv0fhnAch=hP~$Kf
z@1iX|H!v6iGgj+4q}L1UY3jG9PqSTz50Bx>N<I>&#WFyc5Y}u(MZiBWP>)TfYkx?m
z^KY%+$Po={P-W#$TXlTkKxqEVnaixfzzMn8lP9mhhp=P)`SbmY9UWbhM~*ynH8imE
zr%w<12M4R33=hBUZf?HktgCZ*&!2~>7DveO_xHa)bK=C8&iZ->05Rl1gPLDPM;oS^
zo9}Y9wX+Vh*$aK2+`MTcTKdm-?p!o@T3c@{_x85`{_L3~awwz{<b-?}DufsU3=SDV
z8P<i`B!Yxc5JnQt33_yRUooLH+*g=}&{srw3toQvPwBRSZ3A!Iz#mTnE7O4T(h2|o
N002ovPDHLkV1o3pY?%N6

delta 1482
zcmV;*1vUD>3Z)E?ZGQ!#Nkl<ZScUDDTWnQT8pr?Zve#aFpPt=wdO0mU_Ld%K(^HEF
zWSZ2*TMQP3DqeU{Vq#)qeD=W@@j+8BGxLU$$z&dMCKE<Y721MEG*KfGNH7(F3Mj1<
z@iZ;<T-wuf*?X_$gDoBh!C{Qyg_V3e``h`}w|;y5*Y{-+t$#JH=Ac(~^=kmv008j+
zXVNZ0A{=P;fHRx5p7}ih<VwnLn2<)s*t43DwS*9=wN_fG!%*tE0j<CPLjc~jtY$`O
z$z5E`K*}K^WfP_Jf^^FBly=>TihO>{ty&kZ6yUNFjN10gU~IhtTvA#2I^n#T5JJjh
zs1Q^eM%x0VTYmuj>q-GGxdS7P)6Rq#qK3hEFgW2C3e(zkdoP*DFh259sgpjX%+Px8
zUD@oZ{{`TZJ0MrB3h7iTW!Bb?+tKJ)_T<TKH<bbaP$9BLDD<_csre27igR-fx>Qnx
zkX}+Kbo!q6&}b<1*G=j4TfYTx$uhjIuP-TTYQ}Tt&VO~!9ysury<){N%{c<G*axDq
z@jx-1uFD)hz9Dn`_=Zv{wE|M6t&Wbv)V9F_fdI9vr$!v7{kH&qRf2u>^^uZNZxGY0
zrHoNc2w{Q1f1LJqq{ha2wd+O+V{G|6XsxyOJRh8&t?ljoWbV+RN3>Fu0IzSDoczn>
z0De`1qJI!ib0O*g5G*}-AmIOS<Va6#U*B+PZmv0d>eM}0h9`tn#^ZZMb@iF^`}g-(
zty{OVl*v>n&&!N7G~8J9yb}-3%q(0MV6>@eol>fgDD^qFtlPlY&!?TS90*~Qkhb*E
zqZRAN#$FkJ=9!acckg}z02=ST_ivpqys&RyB7gA^VJtR3Ir*uZPX9@}?j6)Hv}DX1
zZEPGOO1-l2+_}Yz07hC`wo%US=ZrBU81%eiQIrRXaQK9m&2~Tt>gIA=_q4Qpw(;9<
z->K~BIRgOEfq~EWw6w&D5L>Ab)X(P=JQPa%xm?Xs3R8LB!^-noLC6y*)18jAwcW=p
zYkvz11WYO=C$=3XoV%bD%SLT`Qfa*kl!BV3fDkY3ip6AfU|@fAU||2QSWH5Qm#Aq9
zPznvS8;<k!FLDUMsg!+tW3lz+KSzyV@IfLa2j>9i@C${wQC0QTvQI24!zwCH6Di&0
zZ-(Q@NIcE~xB%QpJkAZrkr(Dj>H38NS%3DIjS4|oID8Arni&UUv2r5c_v5DHyy@rj
zO%*Fwey9oswwO#d8^Pd2DU(^F0Yv-zcXSO7&hCoEA^@=Yn{Q^1ZQHhE>b>`#CIF0J
zaKc+ySP6P@l~c|eMmjqFj?T`sP3fzg1%tDGJ|DOc0MPu@)aLsB{_Qg#f4o5zi+>#&
z&{j11?@}(e#%XIC?iw5%-qYQEqhZ^F0I;XKd)vk@zZ_0aOmxnlK7Ef73LP!Z&p%A~
z#YHBntIztLcc=1wtDqF9Y-sqbTq{rtNGWFz9t`+O#ffPe#56^Idipvu5;;tiIySm`
z^;T^dJD6?PGuy7$hOuLG_3EuesefZ;ByxChW~Kw2^NaE_<`E%gG^G_(2*xaH9qoGl
z`G4|o_(XXip%jGkdc$#&%f44C-Convvoo7aCYY3ub15YlBVdehDJ7Hg@oX}gsOjn1
zskFYH{P*IVYp1JgXd#)rn=l4Yii+0O1MJV+x6ijd@W2;y<Kso;x`YU^Sbx#l`bqWL
zweMHmaKn+p`SX>U5M7-}>|XQYi$g0PeRMoOJw5A}N=2nLp{AL!>gv9zyXmIkzSmxR
zv+m}bzY@XVWOiz*QUel<`63)X(X?sPKh_Kmz74IXO4%%`6Nz`*pM3I-@>X06pmM1<
zWC5h`QxmKQAOXxS8J6Ng07L90e-S_$KxWC802%-UemYjj0hk7`0KfuJv-F<6q8rg4
kF|PWh^cui5fU6GhBYeatmB}b8kN^Mx07*qoM6N<$f<wjX8vp<R

diff --git a/core/img/icon-sync.png b/core/img/icon-sync.png
index 99a43d4c69ab2a93bd94655c0b74494e0abe537c..a3d09704246107252ca46d79d4791f66b23055e3 100644
GIT binary patch
delta 1178
zcmV;L1ZDfF4EG6;ZGQxGNkl<ZSi|jB=}*&V9IqTnDMuMcIoopEa$luf<&e8F2=@_?
zB@75L4&00|Exu@@TijM1qz#iMcGIDKBUABM4O`L|Y}!K0kM{S5gujD#?DI|fOKRh?
zMBU7i{*q6g=lPzW@AvukNqNV|$Gi^-UVuP=!2gl}J`tdx^?yGlfKMD89DFMzBxENv
zG}K9JP*BhhkSG6Z1o(WuR3H!}A&CI{r_s^T?wFVumP1rjlshae>=E?*_f7zTzYY%%
z-vwR@g~Hj`*jP_oTpa5UlEdcAdnFJV8F><c_Y)Hn+3f7>O|e*PqW#|idP77+#AoQp
zdHCkMGl8<QGJj=8MuttPRIc{+_Ri$x<r$KblUYJqTH2q*#l?4;o14EPl$4bG2>psg
zBDpUTi5Ogs9UU8dCjxVGbCQaRiq+KA)NNE~N1|CIVC(AYzE`PKdXTUtB_+8Cv<G2b
zYisKT>=|@}y0SxEd@BM82??V3`1s$Dd|xV+dJvRFg?~%v#8P^C`ZLHGPEMeGN=gdJ
zo{Wr)Ttw&GUfspFB7h2RWM*c10G0!~aS7`~1o!0T=GvyGr_Wlg)+V#re0peT=(0kg
zu#gS}e;FJcywuj#_H9#B(+oOPj$$JIkpPk^P{nyT)FF^7CntyHAeYPSn1!XRtSomy
zL4nQTaDOOGCX*C|&OrA0%F2q&Xf&$GmTW-g3k<Fe9dO~=oamSxSit-U-betg(}1}X
z&I|_X94cgeQBzZM2Z?{CJu07RXlRH=a2p8hkq>-dQRTQMhHUcl^Y4PhBi|Sx$DpuP
zycZ{4BLHEqOeSOCM2?i~N?~E)9(N|Rw6tik+J9-U)9JDiY}{8*zz{y4n3(v|d$yzf
z-}&2sh#Q34UL#OcRCEtNDV75QSy179?u<(Q=;`U1C@(MHrZWPKV}0oBL!jZKtDrsE
zq7c2mjW^yk-!AY<OH1tl%K=92uCA^n-1+v{*qFAzzyB(ArLnQ`F6nU<j>^i)7a;29
ze18yhcVlBC6N%MyCR@lJ`^M!^RaIq1$8TY-uH(uiy!!h3r<ico7a*~_xVZQU5?L@4
zdw>g*eZi~utgo-1+S=MW1=%-~lam^!(^)exFd#&NU&#g?TL2lxKQ5uOvr`9huVA~6
zJlA<>-DM<V{ef#Z3kNrM#shQ{&Ogx}gnx`kFs|3@E7sQ5<k)xMDmT$J580q&x8D>K
z)iZcY&cTj5|IRx&I7sd2=y*_FUCsIeFP{#0!JXm2U;x_@zy!yAkaOW0c2LO<Dsn;Q
zAsyMk-r*mwwzk$YH8phwcF#H4=;-KG8iW%^M@J{|^e%LFci&U1)thMRHGC?A!GG{^
zUtgaYkBW7Eex6>na3Ec))qXlWJZx-lZ+}LhJ;_K%HWrIT4ZquXnr-+syrj6x%gZCs
zC8A?$%+^hfMl*YOcqsLK6ykv_KnBnsj4*&6jtn5ztLJQmfE18>A@#~QJ>TnB02F!S
sa<3u96$2kp@qs_30RjO6ADqBnKoc!pRbkL5T>t<807*qoM6N<$g7I%W`v3p{

delta 1486
zcmV;<1u^>f38@T_ZGQ!(Nkl<ZScUDDU1%It6vxlG_h#nKOlGp1WYe;1)5NApNMdQs
z24z_)MXaq-#2Qnq;9DPr(moUwK_7%R6$?_M6@p+@{Ag@TM9?BiO&>HV{S1ZJCb-)s
zW}B{A_aoWtBr|ib56zavk3#)GgdR9Bm;2}5-<)&q;h>Zf{(nm&|LN^_0PX<%RRBb+
zLBvi(togeDcstJ!5m!)3Uq-|ZL?lv5A%r+1gm^_tnfO-#G)-Gc2w9w;pU-m6k8;jy
z2_ZKl=en+N94A&N6uPC9_U!_&TW#vP{wk$(0{}P`6&3F>##SOCmTDA5A!TJ{s|X?8
z0Pw*-24GoMlYg%3kCv5{QPVUNwrzJfj)Q+9M_t$NGfmS+2%%ESFLJru*xv$ZY;5$U
z)9G{|5Eu=GLgz1EzPu)#P6Ggdq9{3^&o^FOUHuaPKq{3AE-o$#M2y(B-Qv3LHlNS8
zKa<IP`j-Ks(df0Ip`p>Ksi`$ruU_qFYioOVc6N4sU4LEO*HTJva&ofm`t|Gg005|}
znyjj-nh1qLSI5T2T0GA)9LIUVvaFF@E_eA>0DoA7%a<>&5keeRRW(2<C5VWIVSLim
z)CA|xpN}|>6QY#TVm(MHrR%yLV{9@KiJUxj>eMqr2m%1_#pChUZaV^sqP(am$}#}B
znRCN1ynm6Ak^2y_*0QWrG#c&i>gu|bNF@02<Hy&=VzD);RH|)wc-ZOe?EE;J%~rau
zn+*noVb^spC6mdyTSlO^wzg9U5fwt5)ikY_F{Ttnl+wIqS)Zp;sjZr({c`Bgq314K
zxG=qM-@XSBv3l38U0+g40|yQq=o3N+zu$i-lYhxP<~WWegpfiA7XXe5A>N#tnwtL|
zKwVwkON5XoD5cai&36_S7M?8?`ThR0xm=ETp4T3YM&B448|%Mv<;v%j(h5XG&+}{m
zNa(tLx0I3*Le6QLX65twhT<9S4f{S8i#;n#@=jK*TD3*fv~I&NRL(imb=}Vxa|j_&
zbbnpf<5J2-LI|u_vEoD`k=R^bUS6$fS{dh@8HQ0_Sy{=$;qWI*J*vsFtntz_6h&d2
z^Jqgu!-mqIBc^FS$vJ0?F<^{=ZQHGtm6bmf*P5nf%gf7u<eWQ<G3f8_zhBq&uHt^t
z8yg!>gu~$h#u#wU9ox3?w;DxJh~MvjpntTPF-mDeDUs)St(Il=7Yc>i)vH&3W7{^p
zcJ10q(==n*Z1!G6+{HOhJB}lylw_$!?C$RFV|(}RZ6bt#X_~RQxw+LP9s8y+#)8ew
z&3!E`Eg3?{Tg)`gp9_V8Q5uzriHXNIZrs>AI5@azVPT;e0Awf>`Y@l*-^&=&c7N{N
z`TVkF%b>5XZ<A@7*&RD}eB0C0Gb4m}n=uAHpYP)A?CjHw{r-_vRaH&8uKTd(d72Oc
zSTGp;E*_89m5Mm$e0X@+5JI%7s!9L=rl+Uxs;Q|tGcz+2-oJl;7o~J)+qP{-Ow*j*
zzI}V0<2WC2&hH8Y0%wxRWHbAN+kX+!RTL#j2q~wO0wQ+Ofq{Ye;NW2A;^Ja8B0|ws
zRh?8-)#tjdg^1v~?#lJ+*T0_6=S|zTBLHy!$jHber%#{WLI`<CRn@9sFgO$rhx^CJ
z$DcyPveNS?rLwiP^++rhdyo)PfrwCFU;j1j?d_fI>gu{MIy$=GI1Va`GJjuRUw^Wr
zqvNZ!YuAp<%*<3EqHJ$(|E#B{=jhh0ThApDiKOegE~Qj43?m;51}{b;k%5B;55B){
z-MSx4(~M6{OjG~>r<8hrzyH$a&70rZvuDpSDdj{imxK29_Ahtu-hH^V6$b#I0&aB2
z8~~)@Mkibj02}~*UUFE{`9}aiUs}%tKn4J^#Vi6q5C9CgF?HnuU>X4C06+tP>ZR|@
oZB0b~hW$T>(mMcm0RBn)6|#O$$TjhAivR!s07*qoM6N<$f_;?T(f|Me

diff --git a/core/img/icon.png b/core/img/icon.png
index 24a4b1c3e83ba7e9b247f3ff9fec33f4b26c4630..745b82584c6547aa4293f7b3cf97956eed3cc22d 100644
GIT binary patch
delta 1014
zcmV<S0}1@V3e^aZZGQvONkl<ZSi|j>`%9Bi7{{k5thuT4GToe;_q+2tFVita@iH~<
zqGm`am;~w%rq#4?rG-?AwZfEAtaQJGl$B@@2wC2mZu9*`@bB<9`ySXEuWKr(CBa_!
z@SgKL&w0-GJm<WJm$kpY&pJ<7b^&$)|D^yt0w4$8|5N}Tk$<D3<EWF9(}uINvw^(P
z*AYQ~O#qwCmU1{8Att$i=Yy-OtJ%ZDgQ9VBb2Gs{3qSkJ1t9SQ7Z;bGU<D#tJUu<P
zy}Z0AYls~&SI$%bkH-r~Vw110FBKXZI_K~2KTg_*0snI@m)nMM*YS=ywSc6gq|~6G
zprzE*)Y0<t@_(z*(a}1QNJJ3=0s?--$H!0Q=H}ifBqStE!v91fk<17L0wbT#-*9(#
zzkDhI?d|Onh#2?t^IO3R*Dz5lCZJR*)ksE0#$$+B5DJBx1ky(AUBq;vZ6t9%K0XEr
zk)22Y1`EI!l+`4aO38{TtgyGFq(qDUqF5|8;=N7m1b@<oP$S~!tE;PTpmJtn4-5>{
zoJasB7zqvz-Ubv+T3VV0i9dn^b|%D!NoQ+nYHsG|=ReHJ$!S6L<lf%i++zh`Zxx^u
z15`-16&4mo(L_Z>t>7&5hJ=J{GwrrOj2U9vaB!DUg-vXS0Sj6O-Qa>v0VrWF)Ekh%
zh`nsXgntwhrBXQ+8yow^+I|>_osi4r@0m7|8}mH<LjX#4F(M+u7!wmi5pckIWir_o
z-6x=wTD;eowqsbum`B!j2r;2Tc?Sf<#l=nIlcH!66BB2$va)9AK34J_pJ8Kia`G}W
z?kEuZ4GS5v<wL#!+?o!*1z^H8K+zz`Tv}Rs3x9jQ+|baVt*WZ(N3z@5+1am|aYupG
zPeR0;Enj+i`Xnm;A~G^^5MP#rh41=PN=gdF1Q*MOMx$xOVbY_$1vVk1%R25b5Zj5f
zWVGcgDk{2%Dy%|`35y+M)z#H$FcD=9w&5BEm>K<HwOakwRxFd^;^IkEY{Hfgt2dRE
zm4CIPx^(|5YiDOiTv%B6PN7gxOmM4_n{AQqV}P-*udfK_;iYvfO+`h;IAZc4VBOl6
znVCs7H#gtGr1P|`zP`Sn90Z5Gy}fW;z1`URX{>Utsi|oIk5Z@8l~h(%PT*2m=;-L^
zLaYl2)M~ZOwY9a+3JMB76G)rbh>yhR^>2DL#=XkR%Ui;ESRr|bhK4S|=Q}nwrpDPC
z?&;}i-QC@lGQUakcM}34fC!LFg9Cy<l*LcSx&bMOv>>(EXg}LBE*8XD^71S`lGh*b
k$>QxlrFH>!0p~8@7vZ#8yT%n%iU0rr07*qoM6N<$g0aZ%!~g&Q

delta 1251
zcmV<91RVR-2*3)EZGQy4Nkl<ZScUDD-)kII6vxl~F*7?enc3e-c0+7->Bf+3C23vT
zghKp9p)2^Hm9{AU1wPql5ev3HO0W+;SSivdR>UVoY(=3dl@e{EX-bl&WRqsuZPJ~|
zb~Cd(Gxz$CAEap-oBp5(IdC5Cz2CX#!#U^PxrlQPPt)*Ijeoucum$k200^Oagir<{
z6n#_xw3%aw5Q<}rKg1Y6j}XF~bH*6E$Qb*Gb6$KR0J1D^!x+~V78VRymcJDQAwel!
z$(-kTUaeNUZdukL&bhr=0J_nlq9~sbLiPcGqbSNrS(cLsA+%b9F(#DK6vp^40DSq_
z0CZh{R#BAK1b;ywnx@Uzww-Yt2i-@G6h(PK(=-hsByrAvDwoUuJQ6@_YipoXDwU$q
z=tw*s|7&z~bVsRF0ssI}6z2nhz*r;_nFauuo12T*YBd)j)MMLryW=>Ag2CXYrBdmu
zhX&ZYcW?gu`SYXG)6<=klao8s>Ga8Rx%^ThkvQwRu77*;=FN1WP}l(gAW2d&91iDV
zvDoDJ_;@>GOs-a|?}tL6E4Odo9@+?C-6m{oY^(=>eo+(~FvbKS1gffjolGW$p`oE}
z&+{4xA!NB9IOp7TT@PbCvuDqq-v$Q<-(ielgwW}UiHVOl4ba@&+$TxWD*&)k^Jp}B
zx>zjs0DnNs+D2S9zG!2aOy&>MG{dgzjtvhF|LJ+&NU>PFv)(r=C1`4D>H&Zr#@HoQ
zReK2`D?uowWzIRq7`I@I@7IU`0EjWRJ(tV<IyX1B-*KE*MN#C8F|WC~`3wN`O-)T%
z_W-oCw0z+6`QD(E5>3-;mSqX6Md5IG)G&-TQGXOS3chT(QmO0=1Oi5-Qi&{2x~}_n
zwOVZkfcNeaCzHw7Wm$epQ4~oOMe6hU{FG7$V+_kKisB8<dF$%Ajhu7duIu{Pnmwqh
zs=cXHYTsQM&~^PVLTIHFmSuH>LZK1EFrEVd5Cp;0b^W?&nvUzb50C%=N~vSpHm3BR
zLw`n8Recd5^b22VK1vALzFNT;OZ)x)e#^3+Nu^R}ZQCaKe14mzX%nVt?tBmczu!M@
znq~^)d;fKm(x$eyw$Iz!+YOBIXH?U)Tb5<1t28*5%e|S+X8X>aJD06it8D<lW3gC&
zrBZnyfM78Aw_zCXu9E=>g+f!V>+bVBPk&~N0glJx18Zw2Ns>G;Fi^)B>yRW#kR(Z*
zot=$GB9Y7gRsZ_>`b+tIJ}n3WUAsmI@dQD*g)y!ZMUlv|oWVzr9z7Kd2CuCZQ%W0k
zUC%F%ZQFi%_wL=NW3kx9`vs53;}<fSOg{jm*Vzv`Iy$~96bkzZA%HQ4L?Us4^ndmB
zl@A;^aQW)ht5wHwkSK}^iA3V}UAuPu+}YWAWp;Mfj}YQrU0pvMKYsko!Gi|}XJ%#!
zwOXypIY*KtnGFpMm%F>Wzdv!}#Hrri-jTYxx*NG%&JO@SLWma(2Crqa*)NVAJ9dV1
zo|~Vahpw)!ACDY4^3Cd-FbV*ESX{gt<^iAti#K5-0Qdml){?`LE&u?^(s%&?3;-~f
z#y$Xu1Aq#PudWIJ6ab(M05SkX0N@S)7@K+#Jqi1NK1#O$wg4Wd{R=E&+@Uz=NKF6$
N002ovPDHLkV1fZFP2vCm

diff --git a/core/img/logo-inverted.png b/core/img/logo-inverted.png
index d9fd119dc1883d2c7d384ede0fed4ceb58f1898d..265a8871b45b14b046fd3cf20531d9a3694fb445 100644
GIT binary patch
delta 5881
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
P00000NkvXXu0mjfaU_n4

delta 8077
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
I!0F}x0Z29KZ2$lO

diff --git a/core/img/logo-square.png b/core/img/logo-square.png
index 086d415db6dc9555b237d08f13431ebaab2b472d..b836de8f3be81ab3cb2673e3db1c94d4a3966e5e 100644
GIT binary patch
literal 16048
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
G#Qy+)V14xf

literal 22792
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

diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png
index ea10828db5e9ce5e002f0e5f0bd07f96456960ea..702f1d97e5b7bdf6da6a10eea3ebfda32e594be0 100644
GIT binary patch
delta 1820
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
KMNUMnLSTZ)Wn41=

delta 2208
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

diff --git a/core/img/logo.png b/core/img/logo.png
index 8177c4cdba196fe6fc2521dd46f8bd06a257beb3..a84fe145bbdc5aab34b353dc8bb3163fd54badbe 100644
GIT binary patch
delta 5803
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

delta 7311
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

diff --git a/core/img/places/file.png b/core/img/places/file.png
index 4979044889708bf736aefaee7ade0b1f4462600e..63837a1af90c0dab2191f0e20dab9f04ce2759d9 100644
GIT binary patch
delta 264
zcmV+j0r&og1MC8jZGQmiNkl<ZILoEdJ&J=s9Eai2LL0kiu+Sz=nzRanA0UE-U?E~5
z*n5|pAZ=jx04qz_J9vUcXZfGRbqb5XFUdfPm-&9GVdFTmce-1ss`{xY%79wWJ{V(%
zr-1MKa}WfC@;q-gP4i3F_2WYz3`0Uq({vT%3US-Ezco!eL4P2QV?r&<vfJiS6mi#e
zZxBe+lu(9Y>{sN%Ilqc^k|ci+$g+%3j^q4TmNkfR+k-%!=Oh~hilQLdAW)Vi$p(R{
zsz^2n)OAg=L7-_Gk_`fF+mdV$===V+>pFUsxCeptx1Gh0ljyv?`3IMP1{?X&P89$E
O002ovPDHLkU;%=e=zL`W

delta 291
zcmV+;0o?xV0*3>TZGQm-Nkl<ZIE}rKv1)`s5QfK@)g_3cjrPid!7Igp7I_(8AjOq=
zg1~W|4<MvZmo|mn`T%LN?{H#qK{QpsBzuV<<cBGC_n&X(Uqea>Tf~-!JkKBJd3JP0
z!!S<MG~G)n-!1~OEW05h1{#gyI4Y%%Wm)dqwtfA)$EC@#EPqBs@V%O*dEuNhA;ix2
z{X<a{J1qbawH3$l9U_8hnk0m{4#V(48-X$H_TV@U^?m=Wl)9>_>Nbj^L<>N~pWOi9
zd0rC)!8_;NN|FR{Vf+FhA}t_I(?t8QHo|XOwZUq@<_#`=;{O3QM{r&DJPZT>tI4+Q
pvldX-^%DTND;x%&x~>BNfDZ{2Iiwt(FvS1>002ovPDHLkV1fvzg|`3z

diff --git a/core/img/places/folder.png b/core/img/places/folder.png
index 3edbe257a34cf50b5015f427138a67ea4debb5cf..46079e03e9ef2f7f6ff391990907e34ec9fda358 100644
GIT binary patch
delta 237
zcmV<J022R#1JeSKZhz28L_t(I%casW3WG2dfMInNI_fF9If>w)WC#cj!9nl>p2RB@
z3ib}}J%JaHy1d0}*t|j>K`A~__~eC<AHg`|I67DSUY_UmuImm4u1^J`D4OFq1_Rfp
z0!fm<mhbz+AJ1JNO;g~~U-;PtvMd9%EX!+M*T<1vKnMXyZ)V=YFdR67Am}L|r37Tp
zNAf(MDNqyzAbaMZKv|Z6?3sfCN-040%t3*wssP>fV`dHt)O8I=U!b>{IVjM!?bI|4
noPlR3p#Oizxj-8o1+Mr4kAM}iUEHX900000NkvXXu0mjfRRd{M

delta 285
zcmV+&0pkAC0)hjOZh!wtL_t(Ijir+@YlJWuhTp^}aS%P|U`FZO4k~WN-xBED|I)$v
z2D$l$1J~jz=7$sx3U#^akWM-3X*tCg0v|8=-tWl=A#K}Yix>c8S+>_&KNyn`a&DSN
zE)Iy}_{DJ?+n9ad532|`=k{Ndb8hE(e)^~9v##scQGjJxlYd)jnm*5U55v$;2pD4k
zfU+z<gb+XXu$5Bd07D>zcnibua4!JBNo#$ss!EOslv3YGlFXvt$}D=agSmao$#q?O
zQ-IOv3AgnUQ2?Nnf>H`8<&&wGoC$&N`|oQB7ytx8aOt{^M^W^+w9)gt%Qc`ViX(vC
js?orgQVL}2cNYEy#KJ*gS%UZu00000NkvXXu0mjfA*hKX

diff --git a/core/img/places/home.png b/core/img/places/home.png
index b3fb9bbaf6fba02fa618187ba4ba03f0eeb21fc5..c3dbd3e35386f938b7e8928a0f90ec4660eb88a5 100644
GIT binary patch
delta 272
zcmV+r0q_2x1M~urZGQmqNkl<ZILoEcL286B6o6qt5Cm5ux=~aRTnK`oZbTO%E~G(<
zZJJV<d(Am|hccP*5c5uAV?l7BaWd`VgM=ji;zgRKN&1i7Ls^zznCCwQ*uz)P^G>eo
zp4b{Git@R-8&Fjh2SGrKqJV|(`(NvNu^Z4d4ToV!tEz%kS$~$-?VcOZb^R@hB3joq
z?D;id7zT;sm^MuV_n4-6xCvO6MUo_;ZQFu~G)*roGX4Y{$9d1P?A&!7JR;BYi*4H<
z(mc;k%yEGb0uk$d2Hgy??|Trz{e@u|Km<2{F$NLb03ifKa0BBwf(UM4Gu>U=H{UY)
W2^le~%^?5)00{s|MNUMnLSTYPxOnpb

delta 316
zcmV-C0mJ_E0-ytsZGQnBNkl<ZIE|%~ziNa)5XL`8UqM`rtN0XK305LXgg|n+gOD<*
zQrumYx5zvA26Dwcft5?1Ar=<FDrp0zxjPijKi~%o12eymnb}>XEK4jAjU|N;_d<xf
zu^Mdze&C$%+qQ)e;!jo8mvgQtirY~G-}hIZ=j{!{U;scw?|+tM-OTDB2!fU4I2RZI
zY}>XJMVTHU48up)b$4C(r0X;~ON^puZQJ(FG)+cC7&~zsKlcohBw2ILw~Vn#n26vw
z&RZPEPXM5B&Nqy)t*-0FP@C7(G|hKi*B@F{Rlfi}0U%A&Xbzm``SBF~Xi~}pfCB&!
z(bpUUDdp=q?ls+lrVYNULG=h#RhJnMjed=3gT*6cS#}&M>`F>`iT?rS(mg<QK;PZ~
O0000<MNUMnLSTYYC5_?$

diff --git a/core/img/places/music.png b/core/img/places/music.png
index 4c844425d644f2c6e83e2962ec6c4dd201e3100e..85ee2474cd1bd5cbc9e26e7144d6deef06a9e684 100644
GIT binary patch
delta 432
zcmV;h0Z;z11e64jZhw(UL_t(I%Z<}POTu6n2k_FllgAxng6Ux>#zY7cMQI2w^B{_Z
zHyJy5(47WB_yM|>1mV#kL=+TQ2kWF!4vCC{4*7louO97rp;xBP;ox_9{?GHjY}@Gf
z`x|E9*#wNk;n=a;?IMtEHd_r`g45Za*)c^?3Qf~jPN%cYFn`Pw%d%aM$D{jvzF{yJ
z{0RgCUzP=azkd)8hkqlH2wKImAR3L1VzC$^;_>(>pU;0*tJN1Wvn)s?5(sNHn|Hdd
zYm>?3Vmh7HfJ8FO0znWE1_yh91=M0@S&&R75w=cdS|Exd!q&-53)1N{!q&-53o@Au
z!i+PQ%f-9h?ti1jZ0-;~mMw6Y&1Mls=3cLNHxvpz!|Qup%x1?N$B8`8Kf+Qsm&+lH
zWH7rSGptl9eJ>THQmOkwp@0ZkmS;<nBn^yNy<WdvDkzuBZ^dE}5sgOUnq<9R?_5!o
zk4mL7)HLk@zKesUf=;J%21`R#Ro`2!R(m`iizI`CZ7FaJPJl4?*BX|%{{<E71A5i3
aZuAFD*dP0qk%Pqm0000<MNUMnLSTXj6UF%e

delta 461
zcmV;;0W$uS1hE8=Zhx*xL_t(Ijg3<=Ya&4yeeUdx%aU0mL1A6t41yXFVOjN-GzWrB
zDnSBnVI_ia%@NY1NE=8SNR!_oS6vrKz&KSP+%;C=Y{TwBAZ#>EM#yE2c`)#O-}~mx
zd&R^ilL?|wtJPuvwkW06d_K1TWEYD?20#|T!+1PC1OPSavVZHk2aK^@#@L3YX>ncG
z<BYMmL>Pu4fYkz}QmMx|-&7PuiL?hWSwt=*lgT8dR3U_b5CTf+B9qDdYcv`&Ig^NV
zpsH#N00x7>ZLwGk%H^`JY1$0HeY4p-ezO}TAYbr2?*za-fWJbB@ReIHAfpQ*u2ymD
zB1DZNxepzDhJX9CK&R8O2_dCQrLtO}+wEon*wt$F&64MNUsI{nsjln#$_Tw)Z;x~S
zgLA&|zXQ`WkJ9P%w(JeVczh?2%jLcshEbG#B9T}w6$*tfK@cnj>-GAdWn5Y0^ZB%@
zs*uNZ-8;$k`~7RnvV7AtgLb?9dpI0kNG>LSqwo9Yqeju_8)NL*w(VJ~)jFF_r#}I}
zahyDWE&u}HN(k}moq*#wI{@|pJOQ`?a4Cd%!Wz5)q<dw_!Nn#O00000NkvXXu0mjf
DAUoM*

diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index 980a7c6981311787a5c33102fb23d0157103b65f..9abcd09722c0c63af656c6297a3ada01a1ee3ee9 100644
GIT binary patch
delta 198
zcmV;%06G7&0;~d%ZhxssL_t(I%cYXR3B(`}0HY-d3IXvUf)Bw*5Fb{MUao>Pa1Epl
zD+t_UEAisvAi{zR_n3$5IN;(^YhC_fIB?G2jIndZ?Hy=9DfL;`6=nz_E;OLE1}bR4
z7z0$$fVCE=paJI`P(cIUd!T{_LI^+w4a69M3L4n94XB`jls^)*){Yt7LjyTyp#1-*
zHw;QCq`=b~2K&BWQp$5i_t3!oz87T&-TU470@70!35jf$KmY&$07*qoM6N<$f}8PF
A-2eap

delta 205
zcmV;;05boq0<!{;Zhx>zL_t(Ijm3|#4Z|Q1ML!235>i+r0~k3gcmdB~F_AY&<0?v%
z87%12rpXReq)Uu~1rkNB0_on<JLa52%ZTl#@B2%P@mPWwW3P2xryqea=FB-4dF(qO
zgj2RaN?C*fKq+;|3W%tNPbLuvQ5CQ+XfEKKw+Wh0_<sQrVMbY&dkGrHao81j@28T0
zh@PK!l2duYb}u2c*1=kPD+#);3t7QD&sPAtBI4n_2LQYQrV1fWKX6Ae00000NkvXX
Hu0mjfAVE|i

diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
index 7c429a6a738ddb19638a8f7ee540866e0d501e04..f225423303130d4524e184c622efc42c8d8a3b7c 100644
GIT binary patch
delta 8964
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

delta 9715
zcmV<PB@Ei7MvhF7ZGRvDNkl<Zc%1E>ci84c)&D=kZdi74Vd+f}5EYjy$WLHbLC~dy
zrM#{PFM^<m;tMZT5JbfnDN2(rVq=A+iPV4~O<@5+dhZ}rIxKC8JoEeGBs_WMnVC#-
z=YHDedtJHiWO6c@<ermr=FB-~l-8ONhd7!W*aO%RI0pDVNq^cisBLO7M?;M`MvJ4V
zz|p`8z?;B)!0o`EB<T%<*|ZjOE=CTc#nD9ISl~;A(iecm3&-aI`;(;q8px)#Xfga5
zEshodegb?K7;T(=99Z5cdlxtoIEo~Fr~3_T(PB6=S{#i6c0rhIAqUlcz)FsDPXh;%
zq-S@bbuC)-!GG{%v^d%TF>*{Sq5LQC*%F$YfW1i4+nZ=wixxHvFGh=_<$+%Sn-@xb
z5Ab*33!d|;P{(xOM<nSB9ksDV3k!w^qs7s9;0M6&z!>AK?*Xm=Hu9WT#_=rR2;g{<
z^!=*MY|+AnxdyudUc`|ij&?xCTKghQrYmgkc+O!d8-EWR3fz@V6SQd22!<}B#nC#z
zOyD$NQK~Ua2&4J7<$ymCN0(>Q1}$22grUc1akLb1bUJV?um<%QrBg=Bw=V*>5=X}o
zM+<iO$y<zI44pAr9E}C`LR7?Y^c{P-_I+glCjtLsDL2PvwlZbxzY6>e_%%uTAIJS#
zw6J1mNPo0Ang-kj{1_OEUnR7ayJ$O=XvMl0K&BLKC5|?1@abF30Wdu&1{QI&I^vf&
ziT<6Nz<poYJC<_gpbe#25lD!mOA&Xj$4csI(PEG!S{yAx9Gwi@NH3FN{MMB`#qHe=
zu65DmzncMf5J!g-NAq>~Mp}$;3@oF?QA8Z=34h!Re3M?u(F9X<Lv<{>PlSvs?<J0Q
zB94ZJD&AtqVc<GO9Bl&JflLU`PxX#YMS2^f)u|(7TNF42xRE%TRR1Nl7^&#K)iI7%
z1dal}j9U#e%gpm;nYoXnd`I99g=3qw(JZ&^SNT=IdB6cA>C=w;wV1=uJw}V83BZq#
z@PCz2S*ee?%6`p#+p$@`EpS%0AHrnjaa9H@?!Su|dX8?xaauI5I>yl`;^;fT{lISY
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
B3i1E|

diff --git a/settings/img/admin.png b/settings/img/admin.png
index c1e6d6b8a7fe53c1f217667ec32498bb6f3e3da0..13d653f92a80ed3820332f3b514ec37f4a771720 100644
GIT binary patch
delta 121
zcmV-<0EYjr0^k9VZgO2oL_t(I%VRim<_rTRm|^f300f(1m@ET~jEpYBFo@60%)A*N
z#xTI%-u^NSgZTgd|IfyUF$};aIj~_MAtA9DA0Dn@0J0qx26}pWoAF_+VIU(Tvw7gc
bfLsg!5}`%ePSEoW00000NkvXXu0mjfXe~06

delta 200
zcmaFBxQ=N;Uj1rM7sn8b-ejBNXFSZR4V_ANuNXA29y2gByvdV1-?I4F^c3cvo*t12
zs%OrgHBVmQ#-#2)?~AKp!}RImt_SDa*Oxsoe(>hzW*!je*$`o1W_HeP(wwgQ4>=h4
zUEJK<_$AcBjG39|8GQKo@t`zY^tPOX@@(hl+sk()7JPf-cvJG&v15`T&7Pi~6^9e<
z?WvrRsGzO=df}QiXAS^C!N*6gzgifTm)?|QXnW`MgG<f$6ax@=y85}Sb4q9e0P@LH
A<NyEw

diff --git a/settings/img/apps.png b/settings/img/apps.png
index 17f47d632b9fa9726f393fc6a4504b69a493d70f..e9845d012be91e4341da4ed105a5502ed60386f0 100644
GIT binary patch
delta 126
zcmV-^0D=Gi0p$UZZg*lyL_t(I%VRim<_rTRm|^f300f(nF@{1M@^A$@Iy#q;F}eY`
z<lzb|EG#Y~V{`*>$-@=6xVT(K#^?s%l7}n!|NnnBGDbH5m;6YJMwtJ}jz(;3lA=*X
gMP)Mx53Xng0Ctr!lT-vW-2eap07*qoM6N<$g4BL8cmMzZ

delta 153
zcmV;K0A~N?0sjGzZhw49L_t(Ijbl7><_rTRfQcgA)G&Yr#xOB4*^Df4=FAyiWIir=
zxB)skItut~!X*zkfQN?%uTyc!Q_q0iyLZn(mN<L%EQ&&0@{9wX4(J<=moHzQ!N9=4
zpsTB!f#CvTV&UxBvs0mL@(hTGh}g`)z`&rOfN<=<M<W2NlM*>`t|q6<00000NkvXX
Hu0mjfmmNl4

diff --git a/settings/img/help.png b/settings/img/help.png
index 2257d144d11ad33a429bead6bc1fde7222e66aae..37ccb3568309a284ff95ee6bb2433ca6dbf4d302 100644
GIT binary patch
delta 322
zcmV-I0log(1E&L!Zhs_6L_t(I%VRim<_rTq%)-Lr&cwvDh?SMq9Gg4?Ap>-Ebyu63
zn%)Tv49p|TfVp$$&gtmr*mv>bMPITE`2YXEDG>VuF)vvLh>D8x@bU2p;gTn$*+x=Q
za<#IuauZ1gC@3g!h>MHoX=!O4ba8RH7aktIjU)q9RaG+%9e+Ahn3a`v&dbZ|VRd!&
zGLj4c23RN%OZoWtoB`s8lP6EECOHf=G&F?0y}j@F`T0HEyLYb>$p!#zb`A;(dKecM
zcMIqmL6QvsYAg>433*snR(1qmOyQJ>kB?sx78drfv$J!awzjqw5Id1%Kw@IzfvBjc
zhd{3!j*N^f`#bdMlQl^Obai!YEG{m-eCpJx#lSEK0%8`D3;=2f2jW^FR>2nr0HQHO
U0K7Vyp8x;=07*qoM6N<$f{k2^7XSbN

delta 373
zcmV-*0gC>o1KI<SZhu!vL_t(Ijg^xzOT$nUg->3RHXuT1NGTz1QFsB15(6D9lq?c(
zv*6$m2XW4yads5Rf5_4y2zfY(5GqQxT12Zu35C?fNt4LC>$&H<=fb^0nx<%~!C-Jy
zmgSi!idRXJ-2K+2MmGRT>4l;w`=)880Qdo67%t}XdG7oE^M7i!`lAc~t>8G03%~#n
zGseES6Lh=X$D$~n;yC_e1_07z_I>|QlB8>0*TcG=$^_%_SXnNYm%6T>7>2Q>Y1&2|
zpfZ6h%jZ!PiKEeIv(;*emSuf#0kSN68xDuJd7hVq5cGPz2QC0(ETWVa>-AbCguu4#
zgbM%wmSyd=+iq=HRn@}tynAjyr_(w3iT}zNd*=oSg0M>nfu?C$5CnD*1RfWF5MoM_
zgvn&G-S790lO!ps`f4wcQo5MUW}jggzPPSCMa3fl4Zq+x&MAN$05^=WY2Bc2N%Csk
Td3qMA00000NkvXXu0mjfkh!r-

diff --git a/settings/img/log.png b/settings/img/log.png
index c84b3b29f19419f271756505087250057f1bb9dd..b34a58f844cdcb1005b58cd488da2701802ca0b2 100644
GIT binary patch
delta 244
zcmV<Q01N-Q1J(kNYJULMNkl<ZILl*TKmvY#eoKhK47dPZNn+HHWdNG<mJ#6vuo_=q
z-}yk?#{eY$1Mwdq{zf8x3&aP&1^`W*#Xuqe=>h4bt^puFIXF150O@LM7$gT&djg*U
zi=i|ZHVl=!hhYE^UjpKOAYKY}K_NB_b-{h8+Dpg=fU%E{&u#LCh6W~}A`fgBBnMQt
z1z8Web3tBU^!D~P#)d(1AT{XTf&-wy0-!5)!?35PCp&uR!@>zy)QAHWTtRXo7fA+S
uF@$sjK)~PMUlyqF4iK*e;#FuE#Q*@wSmBIDT)El+0000<MNUMnLSTaTU19eC

delta 344
zcmV-e0jK`f0=WZ_YJUMaNkl<ZILoDzu}T9$5Qe`wuampZG~yFTddq{f?&Segth5tS
znf6*6E$l2r&<BuBkxESA3rGkSK7m-I*g~SY8=DJUjukKDhbd-f{(pD>ofRrb)AWG`
zu+|=W3rz&-JppS%YKj3+{KE-=LREi&X{f3PKn{GbxcL__4u1he<knhyx(Yi@(;HPi
zS=)oKniyj)opa|=6!m@0&bf;?j$f>`dtL!xYcv|ojWJg~fwI<GdIe*Q0%PC_XgTMO
zqbNH2;{?}n9KWmTBhUfb3lG{rPgR2?NeU5p^F@**g{n?~UdbT<HWwix^DN6W&+|`T
zWLc)bbcs_l@lj4yw-<Sy=ljFqa8~QN9}EUZUK2&6UwW|%5QgCf4aTzi%RWS;156tK
q1>a(~+ubRO;u&}?$GnPJ^$Nd8LXlrzvMg!<0000<MNUMnLSTYROqL=5

diff --git a/settings/img/personal.png b/settings/img/personal.png
index 8204028f70e6fbc1e21d3b5bf593eac2b6b0839d..8edc5a16cd6f22bed3f4ce643160755682e3e278 100644
GIT binary patch
delta 404
zcmV;F0c-xv1o#7xZhv)2L_t(I%VRim<_rTm1_Cx_W@djTCZ<Us3}goY#n`c`#U{wb
z#pN#|BC=mmQSl@Qi;9Zw=i%WACfWdbdHFS3T3Y9jF;HwR(FT~Bn(o!p(>sTZjg5`>
z5^aFHyZagg1A}wO7$iot0TmS$r9d0cA>*>LvT~vg`2YXEQh!21!V)txvvVLE6BDxx
zD5gTR0U(^2nOSOSX?YHWv$C=(aH&I&e<omPTgl1E)d2%;kFBlkIS|&-(b)$SYmk+d
zHN|OwrlzK(va<3_U0vNh=H}+d?CtH(A!Cpj(4gHwHO<=E+7cKB00XK9sPMG2v-3H8
z*v7`@I51XPFn<j2_4Qrm>gsxq7z|Xq3c~<zZ|_~6o}TB3!G3;zJ1`6g2naaf<KuIV
z7#tcJifO>>*RLZNFJ9bKR8+JyF)?vRWMt&QprD{rAPi!I#6WUD(D45K`ydPhfC+^K
yh~<FT8i>7sI1q><pg0gJW(CBuK+Fu&2LL9F_pC%9YYj&L0000<MNUMnLSTa4D!EPo

delta 489
zcmV<F0T%xF1I+}GZhy*2L_t(Ijg6AQiqlXOhX3TIlbh4DX-gWgRJss^3Z-<Kg)27>
zg?R-bE1_%Y+J(E)2k-&<07F;m&V?ICCRymhaUm`g#9hXckfd#L-AsqfG(ryiaL?sG
zALnq6<hm~IhHcwNjImQ8#8Uu}B<X#crte(WP40S?gK7Xobbm@jFKV?K0YDH0gD8p^
zfU{D7cDwCVt5sv4Yno<+Vfd^xz_P4nlHBgrG|fhlS1$T&wOYO`%gD<#O}{i?G#Y(k
zj3KY#aClJ~FrUxQ27|%ZeR03v|F&2x4(9(a!1KHxnx=i;1M2nq7tiy)7kQ=p9oV)l
z_j<j@LWq+_qkr+lFpL%e_`ZL&Uavn0A>OQ3tBXQ_<2d&=o6RdCdO$?PIp=v}9LI4O
zhG7&%=bZD`%jNP9kXs`WJ-00DSWy&K)T*xQT-SA;B*{q-1QLLkw*Z|^=TRKTg~j>M
zG)-+bn-BN-4Is-hQ&9@<>L4UZsviI<mCDg>w<`ruRbut#&8E{S0Kjpagmdn1x7$>f
zWx*KB05HZ_Mns`u7=OFn?$60&@^Lnsz4d+n63A^~JRU0mIsoniFaW660)XUNR{(wi
f`0aUK3IP8A>+X{L{{%`)00000NkvXXu0mjfz%lK6

diff --git a/settings/img/users.png b/settings/img/users.png
index f56e2442c9e7bc923031e2c846d6dd712760307f..79ad3d667e1fb01394ff36bba75a0c2245be1582 100644
GIT binary patch
delta 541
zcmV+&0^<GW1^)z)ZGQp$Nkl<ZILnQb&5KfD6vjoPP}D^!6n^0cg5QFu_=Tc^DCl&r
zASEs|SGtH6j=3DBpiQ_4g!WcM89^<&G}tsaG|eFIKjOl*D|=4NjhcG{U--d!pYz`5
zJ@=e@70cyP@jtMxt5m8zrBeBV!2T|{@z0qn59l-+%^h)%cz@4eFdW<M_H)8$G#+cU
z+PbU(4wrR0-6y?X|3$4<KP1g&v(3C-FZ&y4A7l-jPUqV|Ai#pbAaghz3z*%CMx%4u
zi%>oiiOgjUvf1qCa5&6}P$<O4<MGW>sWcNc5z=H0`u+YhxYG@c=lPG@?e^MeG};$6
zk>POoSk_>(*?$Cbx!fWai!nhE8l=I*(Qdb2kw&yytvAqI5(BH%>NA;4j}nQ*&tx*m
zTrSshv)LS@T(8&Lht3F8Ig*STU47toyT78m(^M+OGMNnBcINSTj$r%}&6|@(ApQpJ
zz+$mP{}>?g9;Gumkh>6LH2F92c>IUo??1xSp7?ye+kc9DK7U#)7MVz)P}qrdI(>$z
zJXK64lf!PeJL5R+q*AGzV@zyUs@3W{>a-o?01xhAgbNt4tCY)S3AI{Hko-WX<U5?%
zE;JeqsljTsx<8#x4+n$6>rSU5G@H$ndcA%@P)r)-unyMiH7_xsFA!Kk3RD0`uXYJ{
fsU?90s1|+!PoB=3h`WkH00000NkvXXu0mjfP2~zc

delta 645
zcmV;00($-b1m^{iZGQq}Nkl<ZIE{5v!D<sx6g@NdO=jkGUX#uwg-C3aAT)+hLW{c;
zO5L=}7C{9OTol0~7WxBSm9DyS>#n+x(r(1ATx6v-vq%vURH_IHLTGAdn0e4-+;qaw
zrUwo@F87>!xR<9in@wDXsi~<H5zR$WGz$Q|Uhf@%x6Ni##(zERoIr5Stwy8q2LL$d
zbDZ;MLI@53p66AAARqwSu||y_)6>&)LWnKK*o%6-{uBUmx!i-%(b2SNnwn{vS}vDM
zJC1WdIkcZ3pU*$!oEH>Df#-R5W@cu##>dA;r0l0f6h+8pvzeqpKS7~T7$PF5stO^*
z(AwHsWZU+Us(-48NkqtIvqu9BDwWD7A_5ViR4V;kSy}m4tJOZlwU`qV6Z-=VHa9n4
z3L$(V!qU>xE7x^T*Vos#tJUh~SX?fbzie!5Y$pvE04yvlRJz^n?AX|t#u&r$^75@P
z41etI?tU~)vqeNV0bqD|_`r4DZ%G5CSS&u$b^Wdof`1!^!Btg-lv19YoOr(Pf6rtx
zH`3|!2ml-(A9p&PP9ut<H#<8!`v9QS>-E<}RKfssyWLYFV(|q4APmFM_kBMIg7=1D
zJZGAw<yE!6ihd&i#Ns3@%Q7s>GNhEZJ<n5Ub#?Vx5Cp8(>oEYTq9~L+-DOOrQp~n(
zMTw&5I(~p602@GRadGiU7=}aVCnuA|&@}BYb6xikz+s~CF%b<~$psjO0p<K}EEbFR
z_V)J5tyZhlZnqsNr75K}0YKOFK-cxaah!IoR{J_XKYwt+U~+Pj0k{I-Du6Tq{fq!0
f&)5O*3&8LH;=0epE^Qu300000NkvXXu0mjfNUAS4

diff --git a/settings/trans.png b/settings/trans.png
index e6920168bf2dbb9405040360e42095922b9e124a..ef57510d530920a91a9e0d9212faf7159c6d4d87 100644
GIT binary patch
delta 39
tcmdnZxRY_hOa*RF7sn8e>&XcWObiUH42+M|SZ6Z;fv2mV%Q~loCIHnC3NZix

delta 41
ucmdnVxSMgpOeJ1V7sn8e>&Xc~z`(%3%D@=+S<4E@V(@hJb6Mw<&;$VdWD8&b

diff --git a/tests/data/logo-wide.png b/tests/data/logo-wide.png
index b2c16a0f60a6991eb6a98109d017b48e3b3a3a3b..648cb7e61563c8543fae69b561f626da202f9103 100644
GIT binary patch
delta 2801
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
Dnpt6L

delta 3484
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
KMNUMnLSTYF2jpS^


From 596246989217143d78e8987fa7b2c4154806a644 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 18 Aug 2012 01:17:28 +0200
Subject: [PATCH 1472/1537] add OC_Archive::addRecursive

---
 lib/archive.php       | 21 +++++++++++++++++++++
 tests/lib/archive.php |  8 ++++++++
 2 files changed, 29 insertions(+)

diff --git a/lib/archive.php b/lib/archive.php
index 113f92e960..fabd7cc7a5 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -112,4 +112,25 @@ abstract class OC_Archive{
 	 * @return resource
 	 */
 	abstract function getStream($path,$mode);
+	/**
+	 * add a folder and all it's content
+	 * @param string $path
+	 * @param string source
+	 * @return bool
+	 */
+	function addRecursive($path,$source){
+		if($dh=opendir($source)){
+			$this->addFolder($path);
+			while($file=readdir($dh)){
+				if($file=='.' or $file=='..'){
+					continue;
+				}
+				if(is_dir($source.'/'.$file)){
+					$this->addRecursive($path.'/'.$file,$source.'/'.$file);
+				}else{
+					$this->addFile($path.'/'.$file,$source.'/'.$file);
+				}
+			}
+		}
+	}
 }
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
index 1779127c93..1711be58e0 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -130,4 +130,12 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance->remove('target.txt');
 		$this->assertFalse($this->instance->fileExists('target.txt'));
 	}
+	public function testRecursive(){
+		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$this->instance=$this->getNew();
+		$this->instance->addRecursive('/dir',$dir);
+		$this->assertTrue($this->instance->fileExists('/dir/lorem.txt'));
+		$this->assertTrue($this->instance->fileExists('/dir/data.zip'));
+		$this->assertTrue($this->instance->fileExists('/dir/data.tar.gz'));
+	}
 }

From eb4214821088529bc397af85ba2c5a2df5ba3c25 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 18 Aug 2012 23:15:38 +0200
Subject: [PATCH 1473/1537] fix error in check if app is installed

---
 settings/ajax/apps/ocs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 5a326c125f..082f1cfb92 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -35,7 +35,7 @@ if(is_array($catagoryNames)){
 		// show only external apps that aren't enabled yet
 		$local=false;
 		foreach($enabledApps as $a){
-			if($a['name'] == $app['name']) {
+			if($a == $app['name']) {
 				$local=true;
 			}
 		}

From 9b44d0cb32795c5ec645922b204de88c8f33c196 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 02:30:33 +0200
Subject: [PATCH 1474/1537] add OC_FileStorage::getLocalFolder

---
 lib/filestorage.php        |  1 +
 lib/filestorage/common.php | 20 ++++++++++++++++++++
 lib/filestorage/local.php  |  5 ++++-
 tests/lib/filestorage.php  | 15 ++++++++++++++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/lib/filestorage.php b/lib/filestorage.php
index fd4ad36530..672b9cb0d7 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -50,6 +50,7 @@ abstract class OC_Filestorage{
 	abstract public function search($query);
 	abstract public function touch($path, $mtime=null);
 	abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
+	abstract public function getLocalFolder($path);// get a path to a local version of the folder, whether the original file is local or remote
 	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index c77df38e6b..4f506a3149 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -223,6 +223,26 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
 	}
+	public function getLocalFolder($path){
+		$baseDir=OC_Helper::tmpFolder();
+		$this->addLocalFolder($path,$baseDir);
+		return $baseDir;
+	}
+	private function addLocalFolder($path,$target){
+		if($dh=$this->opendir($path)){
+			while($file=readdir($dh)){
+				if($file!=='.' and $file!=='..'){
+					if($this->is_dir($path.'/'.$file)){
+						mkdir($target.'/'.$file);
+						$this->addLocalFolder($path.'/'.$file,$target.'/'.$file);
+					}else{
+						$tmp=$this->toTmpFile($path.'/'.$file);
+						rename($tmp,$target.'/'.$file);
+					}
+				}
+			}
+		}
+	}
 // 	abstract public function touch($path, $mtime=null);
 
 	protected function searchInDir($query,$dir=''){
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index d60f32b15b..2087663809 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -168,7 +168,10 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $this->searchInDir($query);
 	}
 	public function getLocalFile($path){
-			return $this->datadir.$path;
+		return $this->datadir.$path;
+	}
+	public function getLocalFolder($path){
+		return $this->datadir.$path;
 	}
 
 	protected function searchInDir($query,$dir=''){
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 00f37b9f1a..e554a75e44 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -129,12 +129,25 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertEqual(file_get_contents($textFile),$this->instance->file_get_contents('/target.txt'));
 	}
 	
-	public function testLocalFile(){
+	public function testLocal(){
 		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
 		$localFile=$this->instance->getLocalFile('/lorem.txt');
 		$this->assertTrue(file_exists($localFile));
 		$this->assertEqual(file_get_contents($localFile),file_get_contents($textFile));
+		
+		$this->instance->mkdir('/folder');
+		$this->instance->file_put_contents('/folder/lorem.txt',file_get_contents($textFile));
+		$this->instance->file_put_contents('/folder/bar.txt','asd');
+		$this->instance->mkdir('/folder/recursive');
+		$this->instance->file_put_contents('/folder/recursive/file.txt','foo');
+		$localFolder=$this->instance->getLocalFolder('/folder');
+
+		$this->assertTrue(is_dir($localFolder));
+		$this->assertTrue(file_exists($localFolder.'/lorem.txt'));
+		$this->assertEqual(file_get_contents($localFolder.'/lorem.txt'),file_get_contents($textFile));
+		$this->assertEqual(file_get_contents($localFolder.'/bar.txt'),'asd');
+		$this->assertEqual(file_get_contents($localFolder.'/recursive/file.txt'),'foo');
 	}
 
 	public function testStat(){

From 154ce0f68ddd7b1d2a173515cf3c3ceab3611a48 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 02:42:15 +0200
Subject: [PATCH 1475/1537] also add getLocalFolder to OC_Filsystem and
 OC_FilesystemView

---
 lib/filesystem.php     |  7 +++++++
 lib/filesystemview.php | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index ffb8643d49..6f11cda4fd 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -336,6 +336,13 @@ class OC_Filesystem{
 	static public function getLocalFile($path){
 		return self::$defaultInstance->getLocalFile($path);
 	}
+	/**
+	 * @param string path
+	 * @return string
+	 */
+	static public function getLocalFolder($path){
+		return self::$defaultInstance->getLocalFolder($path);
+	}
 	
 	/**
 	* return path to file which reflects one visible in browser
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 571c75f8f3..6e76e1b6da 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -147,6 +147,16 @@ class OC_FilesystemView {
 			return $storage->getLocalFile($this->getInternalPath($path));
 		}
 	}
+	/**
+	 * @param string path
+	 * @return string
+	 */
+	public function getLocalFolder($path) {
+		$parent=substr($path, 0, strrpos($path,'/'));
+		if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)) {
+			return $storage->getLocalFolder($this->getInternalPath($path));
+		}
+	}
 
 	/**
 	 * the following functions operate with arguments and return values identical

From 3da1339cd84a386064a74f0d1c8c22a7b207bf6c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 05:04:58 +0200
Subject: [PATCH 1476/1537] fix error when adding string data to an archive

---
 lib/archive/tar.php | 2 +-
 lib/archive/zip.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 944a0ac4ba..c8b3d5e626 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -79,7 +79,7 @@ class OC_Archive_TAR extends OC_Archive{
 		if($this->fileExists($path)){
 			$this->remove($path);
 		}
-		if(file_exists($source)){
+		if($source and $source[0]=='/' and file_exists($source)){
 			$header=array();
 			$dummy='';
 			$this->tar->_openAppend();
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index b2d6674d63..c1a5c35738 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -36,7 +36,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @return bool
 	 */
 	function addFile($path,$source=''){
-		if(file_exists($source)){
+		if($source and $source[0]=='/' and file_exists($source)){
 			$result=$this->zip->addFile($source,$path);
 		}else{
 			$result=$this->zip->addFromString($path,$source);

From 2ea46ee1ca6f95d05f8e05808729fe23d97d55ba Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 05:05:55 +0200
Subject: [PATCH 1477/1537] better file_get_contents, file_put_contents and
 toTmpFile for archive storage backend

---
 apps/files_archive/lib/storage.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index 8676166361..add00ed8d8 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -111,6 +111,19 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 			return false;//not supported
 		}
 	}
+	private function toTmpFile($path){
+		$tmpFile=OC_Helper::tmpFile($extension);
+		$this->archive->extractFile($path,$tmpFile);
+		return $tmpFile;
+	}
+	public function file_put_contents($path,$data) {
+		$path=$this->stripPath($path);
+		return $this->archive->addFile($path,$data);
+	}
+	public function file_get_contents($path) {
+		$path=$this->stripPath($path);
+		return $this->archive->getFile($path);
+	}
 
 	/**
 	 * automount paths from file hooks

From 808d6c58fe3e7ff1d33af3cc84fc67834b4916e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 05:45:55 +0200
Subject: [PATCH 1478/1537] ensure proper result format when using opendir on
 the archive storage backend

---
 apps/files_archive/lib/storage.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index add00ed8d8..a3271dc390 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -39,11 +39,18 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 	}
 	public function opendir($path){
 		$path=$this->stripPath($path);
-		$content=$this->archive->getFolder($path);
-		foreach($content as &$file){
+		if(substr($path,-1)!=='/'){
+			$path.='/';
+		}
+		$files=$this->archive->getFolder($path);
+		$content=array();
+		foreach($files as $file){
 			if(substr($file,-1)=='/'){
 				$file=substr($file,0,-1);
 			}
+			if($file and strpos($file,'/')===false){
+				$content[]=$file;
+			}
 		}
 		$id=md5($this->path.$path);
 		OC_FakeDirStream::$dirs[$id]=$content;

From 50cc5d5921f254086cf0e6a62d881419754bcf57 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 05:54:16 +0200
Subject: [PATCH 1479/1537] fix creating nested folders inside tar files

---
 lib/archive/tar.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index c8b3d5e626..f6efd6d0ec 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -56,14 +56,21 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @return bool
 	 */
 	function addFolder($path){
-		$tmpBase=get_temp_dir().'/';
+		$tmpBase=OC_Helper::tmpFolder();
 		if(substr($path,-1,1)!='/'){
 			$path.='/';
 		}
 		if($this->fileExists($path)){
 			return false;
 		}
-		mkdir($tmpBase.$path);
+		$parts=explode('/',$path);
+		$folder=$tmpBase;
+		foreach($parts as $part){
+			$folder.='/'.$part;
+			if(!is_dir($folder)){
+				mkdir($folder);
+			}
+		}
 		$result=$this->tar->addModify(array($tmpBase.$path),'',$tmpBase);
 		rmdir($tmpBase.$path);
 		$this->fileList=false;

From 7f6a037b8c9a0934fe20dde8260e9c4613472c50 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 06:15:33 +0200
Subject: [PATCH 1480/1537] small fix for normalizing paths in archives

---
 apps/files_archive/lib/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index a3271dc390..855e0a705c 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -38,10 +38,10 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 		return $this->archive->remove($path.'/');
 	}
 	public function opendir($path){
-		$path=$this->stripPath($path);
 		if(substr($path,-1)!=='/'){
 			$path.='/';
 		}
+		$path=$this->stripPath($path);
 		$files=$this->archive->getFolder($path);
 		$content=array();
 		foreach($files as $file){

From 758ebe04465e533ceade096f5ebd1fdc08314b1f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 06:18:40 +0200
Subject: [PATCH 1481/1537] don't report ctime in the archive storage backend
 since it isn't reliable

---
 apps/files_archive/lib/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index 855e0a705c..cd750427af 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -57,7 +57,7 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 		return opendir('fakedir://'.$id);
 	}
 	public function stat($path){
-		$ctime=filectime($this->path);
+		$ctime=-1;
 		$path=$this->stripPath($path);
 		if($path==''){
 			$stat=stat($this->path);

From a4e840f4f1017a469239dfaed95abbfc63fa31dd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 19 Aug 2012 06:29:57 +0200
Subject: [PATCH 1482/1537] improve hasUpdated for archive storage backend

---
 apps/files_archive/lib/storage.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index cd750427af..ca36e76b48 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -61,6 +61,7 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 		$path=$this->stripPath($path);
 		if($path==''){
 			$stat=stat($this->path);
+			$stat['size']=0;
 		}else{
 			if($this->is_dir($path)){
 				$stat=array('size'=>0);
@@ -69,6 +70,9 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 				$stat=array();
 				$stat['mtime']=$this->archive->mtime($path);
 				$stat['size']=$this->archive->filesize($path);
+				if(!$stat['mtime']){
+					$stat['mtime']=time();
+				}
 			}
 		}
 		$stat['ctime']=$ctime;
@@ -163,4 +167,8 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
 	public function rename($path1,$path2){
 		return $this->archive->rename($path1,$path2);
 	}
+
+	public function hasUpdated($path,$time){
+		return $this->filemtime($this->path)>$time;
+	}
 }

From 4946e23bdc8e784568a707ad37d66957f5d88867 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 19 Aug 2012 16:32:32 +0200
Subject: [PATCH 1483/1537] Strip slashes from commas and semi-colons.

---
 apps/contacts/lib/vcard.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 91ac89f553..81ae689d9a 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -552,6 +552,9 @@ class OC_Contacts_VCard{
 				}
 			}
 		}
+		if(is_string($value)) {
+			$value = strtr($value, array('\,' => ',', '\;' => ';'));
+		}
 		$temp = array(
 			'name' => $property->name,
 			'value' => $value,

From 2d3ec5cb4b43a9fd995fd521ffec9af2bc7f78fe Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 19 Aug 2012 17:05:45 +0200
Subject: [PATCH 1484/1537] Removed stray img element.

---
 apps/contacts/templates/part.contact.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 3670ce0389..4d465e418c 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -22,7 +22,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<li><a class="svg cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
 	</ul>
 	</div>
-	<img />
 	</div> <!-- contact_photo -->
 
 	<div id="contact_identity" class="contactsection">

From f987e22d85ebcf1761323855a6717a8f482beac5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 19 Aug 2012 16:30:38 -0400
Subject: [PATCH 1485/1537] Large refactoring to allow for the same item to be
 shared to a group and again with a user in the group with different
 permissions

---
 lib/public/share.php      | 249 +++++++++++++++++++++++++-------------
 tests/lib/share/share.php | 111 +++++++++++++++--
 2 files changed, 267 insertions(+), 93 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 940bf2d48a..d91529d759 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -18,7 +18,6 @@
 * 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/>.
 */
-
 namespace OCP;
 
 \OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
@@ -400,54 +399,54 @@ class Share {
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false, $itemShareWithBySource = false) {
 		$backend = self::getBackend($itemType);
 		// Get filesystem root to add it to the file target and remove from the file source, match file_source with the file cache
-		if ($backend instanceof Share_Backend_File_Dependent) {
-			$fileDependent = true;
+		if ($itemType == 'file' || $itemType == 'folder') {
 			$root = \OC_Filesystem::getRoot();
-			// TODO No need to do this for FORMAT_STATUSES and loading the item in the dropdown, it's a performance waste
 			$where = 'INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ';
+			if (!isset($item)) {
+				$where .= 'WHERE file_target IS NOT NULL';
+			}
+			$fileDependent = true;
 		} else {
 			$fileDependent = false;
-			$where = '';
 			$root = '';
-		}
-		if ($itemType == 'file' && !isset($item)) {
-			$where .= 'WHERE file_target IS NOT NULL';
-			$query_args = array();
-		} else if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-			// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
-			$item_types = array_merge(array($itemType), $collectionTypes);
-			$placeholders = join(',', array_fill(0, count($item_types), '?'));
-			$where .= "WHERE item_type IN ('".$placeholders."')";
-			$query_args = $item_types;
-		} else if ($itemType != 'file' && $itemType != 'folder') {
-			$where .= "WHERE item_type = ?";
-			$query_args = array($itemType);
+			if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+				// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
+				$itemTypes = array_merge(array($itemType), $collectionTypes);
+				$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
+				$where = "WHERE item_type IN ('".$placeholders."')";
+				$queryArgs = $itemTypes;
+			} else {
+				$where = 'WHERE item_type = ?';
+				$queryArgs = array($itemType);
+			}
 		}
 		if (isset($shareType) && isset($shareWith)) {
 			// Include all user and group items
 			if ($shareType == self::$shareTypeUserAndGroups) {
-				$where .= " AND share_type IN (?,?,?)";
-				$query_args[] = self::SHARE_TYPE_USER;
-				$query_args[] = self::SHARE_TYPE_GROUP;
-				$query_args[] = self::$shareTypeGroupUserUnique;
-				$groups = \OC_Group::getUserGroups($shareWith);
-				$userAndGroups = array_merge(array($shareWith), $groups);
+				$where .= ' AND share_type IN (?,?,?)';
+				$queryArgs[] = self::SHARE_TYPE_USER;
+				$queryArgs[] = self::SHARE_TYPE_GROUP;
+				$queryArgs[] = self::$shareTypeGroupUserUnique;
+				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
 				$placeholders = join(',', array_fill(0, count($userAndGroups), '?'));
 				$where .= " AND share_with IN (".$placeholders.")";
-				$query_args = array_merge($query_args, $userAndGroups);
+				$queryArgs = array_merge($queryArgs, $userAndGroups);
+				// Don't include own group shares
+				$where .= ' AND uid_owner != ?';
+				$queryArgs[] = $shareWith;
 			} else {
-				$where .= " AND share_type = ? AND share_with = ?";
-				$query_args[] = $shareType;
-				$query_args[] = $shareWith;
+				$where .= ' AND share_type = ? AND share_with = ?';
+				$queryArgs[] = $shareType;
+				$queryArgs[] = $shareWith;
 			}
 		}
 		if (isset($uidOwner)) {
 			$where .= " AND uid_owner = ?";
-			$query_args[] = $uidOwner;
+			$queryArgs[] = $uidOwner;
 			if (!isset($shareType)) {
 				// Prevent unique user targets for group shares from being selected
 				$where .= " AND share_type != ?";
-				$query_args[] = self::$shareTypeGroupUserUnique;
+				$queryArgs[] = self::$shareTypeGroupUserUnique;
 			}
 			if ($itemType == 'file' || $itemType == 'folder') {
 				$column = 'file_source';
@@ -467,11 +466,11 @@ class Share {
 				// If item type is a file, file source needs to be checked in case the item was converted
 				if ($itemType == 'file' || $itemType == 'folder') {
 					$where .= " AND path = ?";
-					$query_args[] = $root.$item;
+					$queryArgs[] = $root.$item;
 				} else {
 					$where .= " AND item_source = ?";
 					$column = 'item_source';
-					$query_args[] = $item;
+					$queryArgs[] = $item;
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
@@ -479,12 +478,12 @@ class Share {
 				} else {
 					$where .= " AND item_target = ?";
 				}
-				$query_args[] = $item;
+				$queryArgs[] = $item;
 			}
 			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
 				$where .= " OR item_type IN ('".$placeholders."')";
-				$query_args = array_merge($query_args, $collectionTypes);
+				$queryArgs = array_merge($query_args, $collectionTypes);
 			}
 		}
 		if ($limit != -1 && !$includeCollections) {
@@ -493,7 +492,12 @@ class Share {
 				// If the limit is not 1, the filtering can be done later
 				$where .= ' ORDER BY *PREFIX*share.id DESC';
 			}
-			$where .= ' LIMIT '.$limit;
+			// The limit must be at least 3, because filtering needs to be done
+			if ($limit < 3) {
+				$where .= ' LIMIT 3';
+			} else {
+				$where .= ' LIMIT '.$limit;
+			}
 		}
 		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
@@ -523,59 +527,79 @@ class Share {
 		}
 		$root = strlen($root);
 		$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
-		$result = $query->execute($query_args);
+		$result = $query->execute($queryArgs);
 		$items = array();
+		$itemsSources = array();
 		while ($row = $result->fetchRow()) {
-			// Remove root from file source paths
-			if (isset($uidOwner) && isset($row['file_source'])) {
-				$row['file_source'] = substr($row['file_source'], $root);
-			}
-			// Return only the item instead of a 2-dimensional array
-			if ($limit == 1 && $row['item_type'] == $itemType && $row[$column] == $item) {
-				if ($format == self::FORMAT_NONE) {
-					return $row;
-				} else {
-					$items[$row['id']] = $row;
-					break;
-				}
-			}
 			// Filter out duplicate group shares for users with unique targets
 			if ($row['share_type'] == self::$shareTypeGroupUserUnique) {
 				// Remove the parent group share
-				unset($items[$row['parent']]);
+				if (isset($items[$row['parent']])) {
+					unset($items[$row['parent']]);
+				}
+			} else if (!isset($uidOwner)) {
+				// Check if the same item source already exists
+				if (isset($itemsSources[$row[$column]])) {
+					// Check if the same owner shared with the user twice through a group and user share - this is allowed
+					$id = $itemsSources[$row[$column]];
+					if ($items[$id]['uid_owner'] == $row['uid_owner']) {
+						// Combine the permissions for the item
+						$items[$id]['permissions'] |= (int)$row['permissions'];
+						continue;
+					}
+				} else {
+					$itemsSources[$row[$column]] = $row['id'];
+				}
 			}
-			// TODO Check this outside of the loop
-			// Check if this is a collection of the requested item type
-			if ($row['item_type'] != $itemType && $itemType != 'file' && !isset($item)) {
-				if ($collectionBackend = self::getBackend($row['item_type'] && $collectionBackend instanceof Share_Backend_Collection)) {
+			// Remove root from file source paths if retrieving own shared items
+			if (isset($uidOwner) && isset($row['file_source'])) {
+				$row['file_source'] = substr($row['file_source'], $root);
+			}
+			$items[$row['id']] = $row;
+		}
+		if (!empty($items)) {
+			$collectionItems = array();
+			foreach ($items as &$row) {
+				// Return only the item instead of a 2-dimensional array
+				if ($limit == 1 && $row['item_type'] == $itemType && $row[$column] == $item) {
+					if ($format == self::FORMAT_NONE) {
+						return $row;
+					} else {
+						break;
+					}
+				}
+				// Check if this is a collection of the requested item type
+				if ($includeCollections && $row['item_type'] != $itemType && $collectionBackend = self::getBackend($row['item_type']) && $collectionBackend instanceof Share_Backend_Collection) {
 					$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
 					// Fetch all of the children sources
 					$children = $collectionBackend->getChildren($row[$column]);
 					foreach ($children as $child) {
-						$row['item_source'] = $child;
-// 							$row['item_target'] = $child['target']; TODO
+						$childItem = $row;
+						$childItem['item_source'] = $child;
+// 						$childItem['item_target'] = $child['target']; TODO
 						if (isset($item)) {
-							if ($row[$column] == $item) {
+							if ($childItem[$column] == $item) {
 								// Return only the item instead of a 2-dimensional array
 								if ($limit == 1 && $format == self::FORMAT_NONE) {
-									return $row;
+									return $childItem;
 								} else {
 									// Unset the items array and break out of both loops
 									$items = array();
-									$items[] = $row;
+									$items[] = $childItem;
 									break 2;
 								}
 							}
 						} else {
-							$items[] = $row;
+							$collectionItems[] = $childItem;
 						}
 					}
+					// Remove collection item
+					unset($items[$row['id']]);
 				}
-			} else {
-				$items[$row['id']] = $row;
 			}
-		}
-		if (!empty($items)) {
+			if (!empty($collectionItems)) {
+				$items = array_merge($items, $collectionItems);
+			}
 			if ($format == self::FORMAT_NONE) {
 				return $items;
 			} else if ($format == self::FORMAT_STATUSES) {
@@ -626,7 +650,27 @@ class Share {
 		// Check if this is a reshare
 		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
 		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
-			if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
+			if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
+				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the original sharer';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			} else if ($shareType == self::SHARE_TYPE_GROUP && $checkReshare['share_with'] == $shareWith['group']) {
+				$message = 'Sharing '.$itemSource.' failed, because the item was orignally shared with the group '.$shareWith['group'];
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			} else if (($checkReshare['share_type'] == self::SHARE_TYPE_GROUP || $checkReshare['share_type'] == self::$shareTypeGroupUserUnique) && $shareType == self::SHARE_TYPE_USER) {
+				if ($checkReshare['share_type'] == self::$shareTypeGroupUserUnique) {
+					$query = \OC_DB::prepare('SELECT share_with FROM *PREFIX*share WHERE id = ?');
+					$group = $query->execute(array($checkReshare['parent']))->fetchOne();
+				} else {
+					$group = $checkReshare['share_with'];
+				}
+				if (\OC_Group::inGroup($shareWith, $group)) {
+					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is a member of the original group share';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			} else if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
 				if (~(int)$checkReshare['permissions'] & $permissions) {
 					$message = 'Sharing '.$itemSource.' failed, because the permissions exceed permissions granted to '.$uidOwner;
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
@@ -671,7 +715,7 @@ class Share {
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
-						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group']);
+						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'], $uidOwner);
 						// Set group default file target for future use
 						$parentFolders[0]['folder'] = $groupFileTarget;
 					} else {
@@ -683,22 +727,20 @@ class Share {
 						$uidSharedWith = array_keys($parentFolder);
 					}
 				} else {
-					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group']);
+					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'], $uidOwner);
 				}
 			} else {
 				$groupFileTarget = null;
 			}
-			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group']);
-			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
-			// Save this id, any extra rows for this group share will need to reference it
-			$parent = \OC_DB::insertid('*PREFIX*share');
+			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'], $uidOwner);
+			$uniqueTargets = array();
 			// Loop through all users of this group in case we need to add an extra row
 			foreach ($shareWith['users'] as $uid) {
-				$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid);
+				$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid, $uidOwner);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
+							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid, $uidOwner);
 							if ($fileTarget != $groupFileTarget) {
 								$parentFolders[$uid]['folder'] = $fileTarget;
 							}
@@ -707,16 +749,22 @@ class Share {
 							$parent = $parentFolder[$uid]['id'];
 						}
 					} else {
-						$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid);
+						$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid, $uidOwner);
 					}
 				} else {
 					$fileTarget = null;
 				}
 				// Insert an extra row for the group share if the item or file target is unique for this user
 				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
-					$id = \OC_DB::insertid('*PREFIX*share');
+					$uniqueTargets[] = array('uid' => $uid, 'item_target' => $itemTarget, 'file_target' => $fileTarget);
 				}
+			}
+			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+			// Save this id, any extra rows for this group share will need to reference it
+			$parent = \OC_DB::insertid('*PREFIX*share');
+			foreach ($uniqueTargets as $unique) {
+				$query->execute(array($itemType, $itemSource, $unique['item_target'], $parent, self::$shareTypeGroupUserUnique, $unique['uid'], $uidOwner, $permissions, time(), $fileSource, $unique['file_target']));
+				$id = \OC_DB::insertid('*PREFIX*share');
 				if ($parentFolder === true) {
 					$parentFolders['id'] = $id;
 				}
@@ -726,18 +774,18 @@ class Share {
 				return $parentFolders;
 			}
 		} else {
-			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith);
+			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner);
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
-						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner);
 						$parentFolders['folder'] = $fileTarget;
 					} else {
 						$fileTarget = $parentFolder['folder'].$itemSource;
 						$parent = $parentFolder['id'];
 					}
 				} else {
-					$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith);
+					$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner);
 				}
 			} else {
 				$fileTarget = null;
@@ -761,7 +809,7 @@ class Share {
 	* @param string User or group the item is being shared with
 	* @return string Item target
 	*/
-	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith) {
+	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner) {
 		$backend = self::getBackend($itemType);
 		if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
 			return $backend->generateTarget($itemSource, false);
@@ -771,6 +819,13 @@ class Share {
 			} else {
 				$column = 'item_target';
 			}
+			if ($shareType == self::SHARE_TYPE_USER) {
+				// Share with is a user, so set share type to user and groups
+				$shareType = self::$shareTypeUserAndGroups;
+				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
+			} else {
+				$userAndGroups = false;
+			}
 			$exclude = null;
 			// Backend has 3 opportunities to generate a unique target
 			for ($i = 0; $i < 2; $i++) {
@@ -784,10 +839,21 @@ class Share {
 				}
 				// Check if target already exists
 				if ($checkTarget = self::getItems($itemType, $target, $shareType, $shareWith, null, self::FORMAT_NONE, null, 1)) {
+					// If matching target is from the same owner, use the same target. The share type will be different so this isn't the same share.
+					if ($checkTarget['uid_owner'] == $uidOwner) {
+						return $target;
+					}
+					if (!isset($exclude)) {
+						$exclude = array();
+					}
 					// Find similar targets to improve backend's chances to generate a unqiue target
-					// TODO query needs to be setup like getItems
-					$checkTargets = \OC_DB::prepare('SELECT '.$column.' FROM *PREFIX*share WHERE item_type = ? AND share_with = ? AND '.$column.' LIKE ?');
-					$result = $checkTargets->execute(array($itemType, $shareWith, '%'.$target.'%'));
+					if ($userAndGroups) {
+						$checkTargets = \OC_DB::prepare("SELECT ".$column." FROM *PREFIX*share WHERE item_type = ? AND share_type IN (?,?,?) AND share_with IN ('".implode("','", $userAndGroups)."') AND ".$column." LIKE ?");
+						$result = $checkTargets->execute(array($itemType, self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique, '%'.$target.'%'));
+					} else {
+						$checkTargets = \OC_DB::prepare("SELECT ".$column." FROM *PREFIX*share WHERE item_type = ? AND share_type = ? AND share_with = ? AND ".$column." LIKE ?");
+						$result = $checkTargets->execute(array($itemType, self::SHARE_TYPE_GROUP, $shareWith, '%'.$target.'%'));
+					}
 					while ($row = $result->fetchRow()) {
 						$exclude[] = $row[$column];
 					}
@@ -796,7 +862,7 @@ class Share {
 				}
 			}
 		}
-		$message = 'Backend did not generate a unique target';
+		$message = 'Sharing backend registered for '.$itemType.' did not generate a unique target for '.$itemSource;
 		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 		throw new \Exception($message);
 	}
@@ -817,12 +883,24 @@ class Share {
 				$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.') AND uid_owner = ?');
 				$result = $query->execute(array($uidOwner));
 			} else {
-				$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.')');
+				$query = \OC_DB::prepare('SELECT id, item_type, item_source, parent, uid_owner FROM *PREFIX*share WHERE parent IN ('.$parents.')');
 				$result = $query->execute();
 			}
 			// Reset parents array, only go through loop again if items are found
 			$parents = array();
 			while ($item = $result->fetchRow()) {
+				// Search for a duplicate parent share, this occurs when an item is shared to the same user through a group and user or the same item is shared by different users
+				$userAndGroups = array_merge(array($item['uid_owner']), \OC_Group::getUserGroups($item['uid_owner']));
+				$query = \OC_DB::prepare("SELECT id, permissions FROM *PREFIX*share WHERE item_type = ? AND item_source = ? AND share_type IN (?,?,?) AND share_with IN ('".implode("','", $userAndGroups)."') AND uid_owner != ? AND id != ?");
+				$duplicateParent = $query->execute(array($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique, $item['uid_owner'], $item['parent']))->fetchRow();
+				if ($duplicateParent) {
+					// Change the parent to the other item id if share permission is granted
+					if ($duplicateParent['permissions'] & self::PERMISSION_SHARE) {
+						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET parent = ? WHERE id = ?');
+						$query->execute(array($duplicateParent['id'], $item['id']));
+						continue;
+					}
+				}
 				$ids[] = $item['id'];
 				$parents[] = $item['id'];
 			}
@@ -858,6 +936,7 @@ class Share {
 	}
 
 	public static function post_removeFromGroup($arguments) {
+		// TODO Don't call if user deleted?
 		$query = \OC_DB::prepare('SELECT id, share_type FROM *PREFIX*share WHERE (share_type = ? AND share_with = ?) OR (share_type = ? AND share_with = ?)');
 		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid'], self::$shareTypeGroupUserUnique, $arguments['uid']));
 		while ($item = $result->fetchRow()) {
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index efff2c5522..4e48ab09c6 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -36,9 +36,11 @@ class Test_Share extends UnitTestCase {
 		$this->user1 = uniqid('user_');
 		$this->user2 = uniqid('user_');
 		$this->user3 = uniqid('user_');
+		$this->user4 = uniqid('user_');
 		OC_User::createUser($this->user1, 'pass');
 		OC_User::createUser($this->user2, 'pass');
 		OC_User::createUser($this->user3, 'pass');
+		OC_User::createUser($this->user4, 'pass');
 		OC_User::setUserId($this->user1);
 		OC_Group::clearBackends();
 		OC_Group::useBackend(new OC_Group_Dummy);
@@ -49,6 +51,8 @@ class Test_Share extends UnitTestCase {
 		OC_Group::addToGroup($this->user1, $this->group1);
 		OC_Group::addToGroup($this->user2, $this->group1);
 		OC_Group::addToGroup($this->user3, $this->group1);
+		OC_Group::addToGroup($this->user2, $this->group2);
+		OC_Group::addToGroup($this->user4, $this->group2);
 		OCP\Share::registerBackend('test', 'Test_Share_Backend');
 	}
 
@@ -60,7 +64,6 @@ class Test_Share extends UnitTestCase {
 	public function testShareInvalidShareType() {
 		$this->expectException(new Exception('Share type foobar is not valid for test.txt'));
 		OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
-		
 	}
 
 	public function testInvalidItemType() {
@@ -131,6 +134,13 @@ class Test_Share extends UnitTestCase {
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
+		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
+		try {
+			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
 		
 		// Valid share
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
@@ -148,16 +158,22 @@ class Test_Share extends UnitTestCase {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
-		// Invalid item
-		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
+		// Attempt to share back
+		OC_User::setUserId($this->user2);
+		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
+		// Unshare
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
+		
 		// Attempt reshare without share permission
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because resharing is not allowed';
 		try {
@@ -235,6 +251,9 @@ class Test_Share extends UnitTestCase {
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		
 		// Remove user
+		OC_User::deleteUser($this->user1);
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
 	}
 
 	public function testShareWithGroup() {
@@ -272,18 +291,94 @@ class Test_Share extends UnitTestCase {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
+		// Attempt to share back to owner of group share
+		OC_User::setUserId($this->user2);
+		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Attempt to share back to group
+		$message = 'Sharing test.txt failed, because the item was orignally shared with the group '.$this->group1;
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
+		// Attempt to share back to member of group
+		$message = 'Sharing test.txt failed, because the user '.$this->user3.' is a member of the original group share';
+		try {
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+			$this->fail('Exception was expected: '.$message);
+		} catch (Exception $exception) {
+			$this->assertEqual($exception->getMessage(), $message);
+		}
+		
 		// Unshare
+		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		
-		// Attempt user specific target conflict
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
+		// Valid share with same person - user then group
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user3);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
+		
+		// Valid reshare
+		OC_User::setUserId($this->user2);
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
+		OC_User::setUserId($this->user4);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		
+		// Unshare from user only
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
+		OC_User::setUserId($this->user4);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		
+		// Valid share with same person - group then user
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
+		
+		// Unshare from group only
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
+		OC_User::setUserId($this->user4);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		
+		// Attempt user specific target conflict
+		OC_User::setUserId($this->user3);
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
+		
+		// Valid reshare
+		$this->assertTrue(OCP\Share::shareItem('test', 'test1.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		OC_User::setUserId($this->user4);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
 		
 		// Remove user from group
+		OC_Group::removeFromGroup($this->user2, $this->group1);
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		OC_User::setUserId($this->user4);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
 		
 		// Add user to group
 		

From 36474e56816308f060ef1ed8ce575370037a8082 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 19 Aug 2012 02:05:44 +0200
Subject: [PATCH 1486/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/et_EE.php | 14 ++++
 apps/admin_dependencies_chk/l10n/it.php    |  1 +
 apps/admin_migrate/l10n/et_EE.php          |  5 ++
 apps/admin_migrate/l10n/it.php             |  2 +-
 apps/calendar/l10n/eo.php                  |  8 +-
 apps/contacts/l10n/eo.php                  | 13 +++-
 apps/files/l10n/zh_CN.php                  |  7 ++
 apps/files_encryption/l10n/et_EE.php       |  6 ++
 apps/files_external/l10n/et_EE.php         | 12 +++
 apps/files_sharing/l10n/et_EE.php          | 11 +++
 apps/files_versions/l10n/et_EE.php         |  4 +
 apps/gallery/l10n/zh_CN.php                | 13 +---
 apps/media/l10n/eo.php                     |  5 +-
 apps/tasks/l10n/eo.php                     |  4 +
 apps/tasks/l10n/et_EE.php                  | 24 ++++++
 apps/tasks/l10n/it.php                     |  6 ++
 apps/user_ldap/l10n/eo.php                 |  4 +
 apps/user_ldap/l10n/sl.php                 |  4 +
 apps/user_openid/l10n/et_EE.php            |  5 ++
 l10n/eo/calendar.po                        | 20 ++---
 l10n/eo/contacts.po                        | 24 +++---
 l10n/eo/core.po                            | 33 +++++----
 l10n/eo/media.po                           | 19 ++---
 l10n/eo/settings.po                        | 18 ++---
 l10n/eo/tasks.po                           | 12 +--
 l10n/eo/user_ldap.po                       | 12 +--
 l10n/et_EE/admin_dependencies_chk.po       | 31 ++++----
 l10n/et_EE/admin_migrate.po                | 13 ++--
 l10n/et_EE/files_encryption.po             | 15 ++--
 l10n/et_EE/files_external.po               | 27 +++----
 l10n/et_EE/files_sharing.po                | 25 ++++---
 l10n/et_EE/files_versions.po               | 11 +--
 l10n/et_EE/tasks.po                        | 51 ++++++-------
 l10n/et_EE/user_openid.po                  | 13 ++--
 l10n/it/admin_dependencies_chk.po          |  6 +-
 l10n/it/admin_migrate.po                   |  6 +-
 l10n/it/settings.po                        | 10 +--
 l10n/it/tasks.po                           | 16 ++--
 l10n/ru/settings.po                        | 21 +++---
 l10n/sl/settings.po                        |  8 +-
 l10n/sl/user_ldap.po                       | 12 +--
 l10n/templates/admin_dependencies_chk.pot  |  2 +-
 l10n/templates/admin_migrate.pot           |  2 +-
 l10n/templates/bookmarks.pot               |  2 +-
 l10n/templates/calendar.pot                |  2 +-
 l10n/templates/contacts.pot                |  2 +-
 l10n/templates/core.pot                    |  2 +-
 l10n/templates/files.pot                   |  2 +-
 l10n/templates/files_encryption.pot        |  2 +-
 l10n/templates/files_external.pot          |  2 +-
 l10n/templates/files_sharing.pot           |  2 +-
 l10n/templates/files_versions.pot          |  2 +-
 l10n/templates/gallery.pot                 |  2 +-
 l10n/templates/lib.pot                     |  2 +-
 l10n/templates/media.pot                   |  2 +-
 l10n/templates/settings.pot                |  2 +-
 l10n/templates/tasks.pot                   |  2 +-
 l10n/templates/user_ldap.pot               |  2 +-
 l10n/templates/user_migrate.pot            |  2 +-
 l10n/templates/user_openid.pot             |  2 +-
 l10n/zh_CN/files.po                        | 33 +++++----
 l10n/zh_CN/gallery.po                      | 85 ++++------------------
 l10n/zh_CN/settings.po                     | 22 +++---
 settings/l10n/eo.php                       |  7 +-
 settings/l10n/it.php                       |  3 +-
 settings/l10n/ru.php                       |  7 ++
 settings/l10n/sl.php                       |  1 +
 settings/l10n/zh_CN.php                    |  8 ++
 68 files changed, 424 insertions(+), 331 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/et_EE.php
 create mode 100644 apps/admin_migrate/l10n/et_EE.php
 create mode 100644 apps/files_encryption/l10n/et_EE.php
 create mode 100644 apps/files_external/l10n/et_EE.php
 create mode 100644 apps/files_sharing/l10n/et_EE.php
 create mode 100644 apps/files_versions/l10n/et_EE.php
 create mode 100644 apps/tasks/l10n/et_EE.php
 create mode 100644 apps/user_openid/l10n/et_EE.php

diff --git a/apps/admin_dependencies_chk/l10n/et_EE.php b/apps/admin_dependencies_chk/l10n/et_EE.php
new file mode 100644
index 0000000000..529c8e78d1
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/et_EE.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "php-json moodul on vajalik paljude rakenduse poolt omvahelise suhtlemise jaoks",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "php-curl moodul on vajalik lehe pealkirja tõmbamiseks järjehoidja lisamisel",
+"The php-gd module is needed to create thumbnails of your images" => "php-gd moodul on vajalik sinu piltidest pisipiltide loomiseks",
+"The php-ldap module is needed connect to your ldap server" => "php-ldap moodul on vajalik sinu ldap serveriga ühendumiseks",
+"The php-zip module is needed download multiple files at once" => "php-zip moodul on vajalik mitme faili korraga alla laadimiseks",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "php-mb_multibyte moodul on vajalik kodeerimise korrektseks haldamiseks.",
+"The php-ctype module is needed validate data." => "php-ctype moodul on vajalik andmete kontrollimiseks.",
+"The php-xml module is needed to share files with webdav." => "php-xml moodul on vajalik failide jagamiseks webdav-iga.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Sinu php.ini failis oleva direktiivi allow_url_fopen väärtuseks peaks määrama 1, et saaks tõmmata teadmistebaasi OCS-i serveritest",
+"The php-pdo module is needed to store owncloud data into a database." => "php-pdo moodul on vajalik owncloudi andmete salvestamiseks andmebaasi.",
+"Dependencies status" => "Sõltuvuse staatus",
+"Used by :" => "Kasutab :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/it.php b/apps/admin_dependencies_chk/l10n/it.php
index 00aeae205b..f51286966e 100644
--- a/apps/admin_dependencies_chk/l10n/it.php
+++ b/apps/admin_dependencies_chk/l10n/it.php
@@ -7,6 +7,7 @@
 "The php-mb_multibyte module is needed to manage correctly the encoding." => "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica.",
 "The php-ctype module is needed validate data." => "Il modulo php-ctype è richiesto per la validazione dei dati.",
 "The php-xml module is needed to share files with webdav." => "Il modulo php-xml è richiesto per condividere i file con webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La direttiva allow_url_fopen del tuo php.ini deve essere impostata a 1 per recuperare la base di conoscenza dai server di OCS",
 "The php-pdo module is needed to store owncloud data into a database." => "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database.",
 "Dependencies status" => "Stato delle dipendenze",
 "Used by :" => "Usato da:"
diff --git a/apps/admin_migrate/l10n/et_EE.php b/apps/admin_migrate/l10n/et_EE.php
new file mode 100644
index 0000000000..ee92f9fe21
--- /dev/null
+++ b/apps/admin_migrate/l10n/et_EE.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Ekspordi see ownCloudi paigaldus",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "See loob pakitud faili, milles on sinu owncloudi paigalduse andmed.\n            Palun vali eksporditava faili tüüp:",
+"Export" => "Ekspordi"
+);
diff --git a/apps/admin_migrate/l10n/it.php b/apps/admin_migrate/l10n/it.php
index 78d2074bca..94ba191ba6 100644
--- a/apps/admin_migrate/l10n/it.php
+++ b/apps/admin_migrate/l10n/it.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Esporta questa istanza di ownClou",
+"Export this ownCloud instance" => "Esporta questa istanza di ownCloud",
 "This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:",
 "Export" => "Esporta"
 );
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
index 1a01bb713f..be3db9bfae 100644
--- a/apps/calendar/l10n/eo.php
+++ b/apps/calendar/l10n/eo.php
@@ -8,7 +8,7 @@
 "events has been saved in the new calendar" => "okazaĵoj estas konservitaj en la nova kalendaro",
 "Import failed" => "Enporto malsukcesis",
 "events has been saved in your calendar" => "okazaĵoj estas konservitaj en via kalendaro",
-"New Timezone:" => "Nova horzono:",
+"New Timezone:" => "Nova horozono:",
 "Timezone changed" => "La horozono estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Calendar" => "Kalendaro",
@@ -112,6 +112,7 @@
 "Month" => "Monato",
 "List" => "Listo",
 "Today" => "Hodiaŭ",
+"Settings" => "Agordo",
 "Your calendars" => "Viaj kalendaroj",
 "CalDav Link" => "CalDav-a ligilo",
 "Shared calendars" => "Kunhavigitaj kalendaroj",
@@ -173,11 +174,16 @@
 "No categories selected" => "Neniu kategorio elektita",
 "of" => "de",
 "at" => "ĉe",
+"General" => "Ĝenerala",
 "Timezone" => "Horozono",
+"Update timezone automatically" => "Aŭtomate ĝisdatigi la horozonon",
+"Time format" => "Horoformo",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "Komenci semajnon je",
 "Cache" => "Kaŝmemoro",
 "Clear cache for repeating events" => "Forviŝi kaŝmemoron por ripeto de okazaĵoj",
+"URLs" => "URL-oj",
 "Calendar CalDAV syncing addresses" => "sinkronigaj adresoj por CalDAV-kalendaroj",
 "more info" => "pli da informo",
 "Primary address (Kontact et al)" => "Ĉefa adreso (Kontact kaj aliaj)",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index 33c0106d5a..9787b6e010 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -10,6 +10,7 @@
 "No contacts found." => "Neniu kontakto troviĝis.",
 "There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
 "element name is not set." => "eronomo ne agordiĝis.",
+"Could not parse contact: " => "Ne eblis analizi kontakton:",
 "Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
 "At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
 "Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
@@ -53,6 +54,7 @@
 "Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
 "Error" => "Eraro",
 "This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
+"Couldn't serialize elements." => "Ne eblis seriigi erojn.",
 "Edit name" => "Redakti nomon",
 "No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo.",
@@ -81,8 +83,11 @@
 "Business" => "Negoco",
 "Call" => "Voko",
 "Clients" => "Klientoj",
+"Deliverer" => "Liveranto",
 "Holidays" => "Ferioj",
 "Ideas" => "Ideoj",
+"Journey" => "Vojaĝo",
+"Jubilee" => "Jubileo",
 "Meeting" => "Kunveno",
 "Other" => "Alia",
 "Personal" => "Persona",
@@ -97,10 +102,10 @@
 "Close" => "Fermi",
 "Keyboard shortcuts" => "Fulmoklavoj",
 "Navigation" => "Navigado",
-"Next contact in list" => "Sekva kontakto en la listo",
-"Previous contact in list" => "Malsekva kontakto en la listo",
-"Next addressbook" => "Sekva adresaro",
-"Previous addressbook" => "Malsekva adresaro",
+"Next contact in list" => "Jena kontakto en la listo",
+"Previous contact in list" => "Maljena kontakto en la listo",
+"Next addressbook" => "Jena adresaro",
+"Previous addressbook" => "Maljena adresaro",
 "Actions" => "Agoj",
 "Refresh contacts list" => "Refreŝigi la kontaktoliston",
 "Add new contact" => "Aldoni novan kontakton",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 80693ba1d4..e4f015d40b 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,7 +7,14 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Files" => "文件",
+"Unshare" => "取消共享",
 "Delete" => "删除",
+"already exists" => "已经存在",
+"replace" => "替换",
+"cancel" => "取消",
+"replaced" => "已经替换",
+"undo" => "撤销",
+"deleted" => "已经删除",
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
 "Upload Error" => "上传错误",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
new file mode 100644
index 0000000000..a7cd9395bf
--- /dev/null
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Krüpteerimine",
+"Exclude the following file types from encryption" => "Järgnevaid failitüüpe ära krüpteeri",
+"None" => "Pole",
+"Enable Encryption" => "Luba krüpteerimine"
+);
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
new file mode 100644
index 0000000000..a6907e775b
--- /dev/null
+++ b/apps/files_external/l10n/et_EE.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Väline salvestuskoht",
+"Mount point" => "Ühenduspunkt",
+"Configuration" => "Seadistamine",
+"Options" => "Valikud",
+"Add mount point" => "Lisa ühenduspunkt",
+"None set" => "Pole määratud",
+"All Users" => "Kõik kasutajad",
+"Groups" => "Grupid",
+"Users" => "Kasutajad",
+"Delete" => "Kustuta"
+);
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
new file mode 100644
index 0000000000..bdfa215e1d
--- /dev/null
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Sinu jagatud failid",
+"Item" => "Kirje",
+"Shared With" => "Kellega jagatud",
+"Permissions" => "Õigused",
+"Read" => "Lugemine",
+"Edit" => "Muutmine",
+"Delete" => "Kustutamine",
+"Enable Resharing" => "Luba edasijagamine",
+"Allow users to reshare files they don't own" => "Luba kasutajatel jagada faile, mis pole nende omad"
+);
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
new file mode 100644
index 0000000000..d136ae241c
--- /dev/null
+++ b/apps/files_versions/l10n/et_EE.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Kõikide versioonide aegumine",
+"Enable Files Versioning" => "Luba failide versioonihaldus"
+);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
index ffa321f7de..6aa4fc7f35 100644
--- a/apps/gallery/l10n/zh_CN.php
+++ b/apps/gallery/l10n/zh_CN.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "图片",
-"Settings" => "设置",
-"Rescan" => "重新扫描",
-"Stop" => "停止",
-"Share" => "分享",
-"Back" => "返回",
-"Remove confirmation" => "移除确认",
-"Do you want to remove album" => "您是否想要移除相册",
-"Change album name" => "修改相册名称",
-"New album name" => "新相册名称"
+"Share gallery" => "分享图库",
+"Error: " => "错误：",
+"Internal error" => "内部错误",
+"Slideshow" => "幻灯片"
 );
diff --git a/apps/media/l10n/eo.php b/apps/media/l10n/eo.php
index 429247bbc3..084dbaa480 100644
--- a/apps/media/l10n/eo.php
+++ b/apps/media/l10n/eo.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Muziko",
+"Add album to playlist" => "Aldoni albumon al ludlisto",
 "Play" => "Ludi",
 "Pause" => "Paŭzigi",
-"Previous" => "Antaŭa",
-"Next" => "Sekva",
+"Previous" => "Maljena",
+"Next" => "Jena",
 "Mute" => "Silentigi",
 "Unmute" => "Malsilentigi",
 "Rescan Collection" => "Reskani la aron",
diff --git a/apps/tasks/l10n/eo.php b/apps/tasks/l10n/eo.php
index f55b8b7529..9919a6ea63 100644
--- a/apps/tasks/l10n/eo.php
+++ b/apps/tasks/l10n/eo.php
@@ -6,12 +6,16 @@
 "1=highest" => "1=plej alta",
 "5=medium" => "5=meza",
 "9=lowest" => "9=plej malalta",
+"Empty Summary" => "Malplena resumo",
 "Invalid percent complete" => "Nevalida plenuma elcento",
 "Invalid priority" => "Nevalida pligravo",
 "Add Task" => "Aldoni taskon",
+"Order Due" => "Ordigi laŭ limdato",
+"Order List" => "Ordigi laŭ listo",
 "Order Complete" => "Ordigi laŭ plenumo",
 "Order Location" => "Ordigi laŭ loko",
 "Order Priority" => "Ordigi laŭ pligravo",
+"Order Label" => "Ordigi laŭ etikedo",
 "Loading tasks..." => "Ŝargante taskojn...",
 "Important" => "Grava",
 "More" => "Pli",
diff --git a/apps/tasks/l10n/et_EE.php b/apps/tasks/l10n/et_EE.php
new file mode 100644
index 0000000000..56db6ee032
--- /dev/null
+++ b/apps/tasks/l10n/et_EE.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Vigane kuupäev/kellaaeg",
+"Tasks" => "Ülesanded",
+"No category" => "Kategooriat pole",
+"Unspecified" => "Määramata",
+"1=highest" => "1=kõrgeim",
+"5=medium" => "5=keskmine",
+"9=lowest" => "9=madalaim",
+"Empty Summary" => "Tühi kokkuvõte",
+"Invalid percent complete" => "Vigane edenemise protsent",
+"Invalid priority" => "Vigane tähtsus",
+"Add Task" => "Lisa ülesanne",
+"Order Due" => "Tähtaja järgi",
+"Order List" => "Nimekirja järgi",
+"Order Complete" => "Edenemise järgi",
+"Order Location" => "Asukoha järgi",
+"Order Priority" => "Tähtsuse järjekorras",
+"Order Label" => "Sildi järgi",
+"Loading tasks..." => "Ülesannete laadimine...",
+"Important" => "Tähtis",
+"More" => "Rohkem",
+"Less" => "Vähem",
+"Delete" => "Kustuta"
+);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
index 27f7b0279d..1aac8aac88 100644
--- a/apps/tasks/l10n/it.php
+++ b/apps/tasks/l10n/it.php
@@ -10,6 +10,12 @@
 "Invalid percent complete" => "Percentuale di completamento non valida",
 "Invalid priority" => "Priorità non valida",
 "Add Task" => "Aggiungi attività",
+"Order Due" => "Ordina per scadenza",
+"Order List" => "Ordina per elenco",
+"Order Complete" => "Ordina per completamento",
+"Order Location" => "Ordina per posizione",
+"Order Priority" => "Ordina per priorità",
+"Order Label" => "Ordina per etichetta",
 "Loading tasks..." => "Caricamento attività in corso...",
 "Important" => "Importante",
 "More" => "Più",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index a560aedd91..6f18506b09 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -6,16 +6,20 @@
 "Password" => "Pasvorto",
 "For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
 "User Login Filter" => "Filtrilo de uzantensaluto",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "uzu la referencilon %%uid, ekz.: \"uid=%%uid\"",
 "User List Filter" => "Filtrilo de uzantolisto",
+"Defines the filter to apply, when retrieving users." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj.",
 "without any placeholder, e.g. \"objectClass=person\"." => "sen ajna referencilo, ekz.: \"objectClass=person\".",
 "Group Filter" => "Filtrilo de grupo",
+"Defines the filter to apply, when retrieving groups." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ajna referencilo, ekz.: \"objectClass=posixGroup\".",
 "Port" => "Pordo",
 "Base User Tree" => "Baza uzantarbo",
 "Base Group Tree" => "Baza gruparbo",
 "Use TLS" => "Uzi TLS-on",
 "Do not use it for SSL connections, it will fail." => "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos.",
+"Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
 "Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
 "Not recommended, use for testing only." => "Ne rekomendata, uzu ĝin nur por testoj.",
 "User Display Name Field" => "Kampo de vidignomo de uzanto",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index d4e63c7e8e..8126124f1f 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Gostitelj",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol lahko izpustite, razen če zahtevate SSL. V tem primeru začnite z ldaps://",
 "Base DN" => "Osnovni DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno",
 "User DN" => "Uporabnik DN",
@@ -8,7 +9,10 @@
 "User Login Filter" => "Filter prijav uporabnikov",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "uporabite ogrado %%uid, npr. \"uid=%%uid\"",
 "User List Filter" => "Filter seznama uporabnikov",
+"Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.",
+"without any placeholder, e.g. \"objectClass=person\"." => "Brez katerekoli ograde, npr. \"objectClass=person\".",
 "Group Filter" => "Filter skupin",
+"Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.",
 "Port" => "Vrata",
 "Use TLS" => "Uporabi TLS",
 "Do not use it for SSL connections, it will fail." => "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo.",
diff --git a/apps/user_openid/l10n/et_EE.php b/apps/user_openid/l10n/et_EE.php
new file mode 100644
index 0000000000..f04bcafb24
--- /dev/null
+++ b/apps/user_openid/l10n/et_EE.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "See on OpenID serveri lõpp-punkt. Lisainfot vaata",
+"Identity: <b>" => "Identiteet: <b>",
+"Realm: <b>" => "Tsoon: <b>"
+);
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index b0799bee78..4fc02e02b0 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:17+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "okazaĵoj estas konservitaj en via kalendaro"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr "Nova horzono:"
+msgstr "Nova horozono:"
 
 #: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
@@ -478,7 +478,7 @@ msgstr "Hodiaŭ"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Agordo"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -732,7 +732,7 @@ msgstr "ĉe"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Ĝenerala"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -740,11 +740,11 @@ msgstr "Horozono"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Aŭtomate ĝisdatigi la horozonon"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Horoformo"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -756,7 +756,7 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Komenci semajnon je"
 
 #: templates/settings.php:76
 msgid "Cache"
@@ -768,7 +768,7 @@ msgstr "Forviŝi kaŝmemoron por ripeto de okazaĵoj"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URL-oj"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 5dd32cabbb..7c50fee01b 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 17:14+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr "eronomo ne agordiĝis."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ne eblis analizi kontakton:"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -252,7 +252,7 @@ msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
 #: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Ne eblis seriigi erojn."
 
 #: js/contacts.js:850 js/contacts.js:868
 msgid ""
@@ -396,7 +396,7 @@ msgstr "Klientoj"
 
 #: lib/app.php:187
 msgid "Deliverer"
-msgstr ""
+msgstr "Liveranto"
 
 #: lib/app.php:188
 msgid "Holidays"
@@ -408,11 +408,11 @@ msgstr "Ideoj"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Vojaĝo"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileo"
 
 #: lib/app.php:192
 msgid "Meeting"
@@ -472,11 +472,11 @@ msgstr "Navigado"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr "Sekva kontakto en la listo"
+msgstr "Jena kontakto en la listo"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr "Malsekva kontakto en la listo"
+msgstr "Maljena kontakto en la listo"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
@@ -484,11 +484,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr "Sekva adresaro"
+msgstr "Jena adresaro"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr "Malsekva adresaro"
+msgstr "Maljena adresaro"
 
 #: templates/index.php:54
 msgid "Actions"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 8d72ea6ef5..fbea58f5dd 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 # Michael Moroni <haikara90@gmail.com>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 16:36+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +36,55 @@ msgstr "Ĉi tiu kategorio jam ekzistas: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Januaro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Februaro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Marto"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Aprilo"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Majo"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Septembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Oktobro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Decembro"
 
diff --git a/l10n/eo/media.po b/l10n/eo/media.po
index cc7a61cea5..135087b52c 100644
--- a/l10n/eo/media.po
+++ b/l10n/eo/media.po
@@ -3,29 +3,30 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 # Michael Moroni <haikara90@gmail.com>, 2012.
-#   <mstreet@kde.org.ar>, 2011.
+#   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 16:47+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr "Muziko"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Aldoni albumon al ludlisto"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
@@ -37,11 +38,11 @@ msgstr "Paŭzigi"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr "Antaŭa"
+msgstr "Maljena"
 
 #: templates/music.php:6 templates/player.php:14
 msgid "Next"
-msgstr "Sekva"
+msgstr "Jena"
 
 #: templates/music.php:7
 msgid "Mute"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 43631f9134..15e0d6d85a 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 17:13+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,23 +73,23 @@ msgstr "Sekureca averto"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "lanĉi unu taskon po ĉiu paĝo ŝargita"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php estas registrita kiel webcron-servilo"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "uzi la cron-servon de la sistemo"
 
 #: templates/admin.php:39
 msgid "Log"
-msgstr "Registro"
+msgstr "Protokolo"
 
 #: templates/admin.php:67
 msgid "More"
@@ -229,7 +229,7 @@ msgstr "Alia"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupadministranto"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/eo/tasks.po b/l10n/eo/tasks.po
index 9720107279..c53752bc4c 100644
--- a/l10n/eo/tasks.po
+++ b/l10n/eo/tasks.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 19:27+0000\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:52+0000\n"
 "Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "9=plej malalta"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Malplena resumo"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
@@ -64,11 +64,11 @@ msgstr "Aldoni taskon"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Ordigi laŭ limdato"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Ordigi laŭ listo"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
@@ -84,7 +84,7 @@ msgstr "Ordigi laŭ pligravo"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Ordigi laŭ etikedo"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 4167860d0e..d83f307fe2 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 20:54+0000\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:28+0000\n"
 "Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "Filtrilo de uzantensaluto"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
 
 #: templates/settings.php:12
 #, php-format
@@ -76,7 +76,7 @@ msgstr "Filtrilo de uzantolisto"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
@@ -88,7 +88,7 @@ msgstr "Filtrilo de grupo"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
@@ -120,7 +120,7 @@ msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
diff --git a/l10n/et_EE/admin_dependencies_chk.po b/l10n/et_EE/admin_dependencies_chk.po
index 589ff81c36..4e1dc1ab0c 100644
--- a/l10n/et_EE/admin_dependencies_chk.po
+++ b/l10n/et_EE/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:47+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "php-json moodul on vajalik paljude rakenduse poolt omvahelise suhtlemise jaoks"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "php-curl moodul on vajalik lehe pealkirja tõmbamiseks järjehoidja lisamisel"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "php-gd moodul on vajalik sinu piltidest pisipiltide loomiseks"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "php-ldap moodul on vajalik sinu ldap serveriga ühendumiseks"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "php-zip moodul on vajalik mitme faili korraga alla laadimiseks"
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "php-mb_multibyte moodul on vajalik kodeerimise korrektseks haldamiseks."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "php-ctype moodul on vajalik andmete kontrollimiseks."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "php-xml moodul on vajalik failide jagamiseks webdav-iga."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "Sinu php.ini failis oleva direktiivi allow_url_fopen väärtuseks peaks määrama 1, et saaks tõmmata teadmistebaasi OCS-i serveritest"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "php-pdo moodul on vajalik owncloudi andmete salvestamiseks andmebaasi."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Sõltuvuse staatus"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Kasutab :"
diff --git a/l10n/et_EE/admin_migrate.po b/l10n/et_EE/admin_migrate.po
index c6f5f7eb0d..1e02b72409 100644
--- a/l10n/et_EE/admin_migrate.po
+++ b/l10n/et_EE/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:41+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Ekspordi see ownCloudi paigaldus"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "See loob pakitud faili, milles on sinu owncloudi paigalduse andmed.\n            Palun vali eksporditava faili tüüp:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Ekspordi"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index de81587c37..8a0593fa33 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:39+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Krüpteerimine"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Järgnevaid failitüüpe ära krüpteeri"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Pole"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Luba krüpteerimine"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 3321a99e08..3daaecb163 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:32+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Väline salvestuskoht"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Ühenduspunkt"
 
 #: templates/settings.php:8
 msgid "Backend"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Seadistamine"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Valikud"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -43,27 +44,27 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Lisa ühenduspunkt"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Pole määratud"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Kõik kasutajad"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupid"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Kasutajad"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Kustuta"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 6a3fc45f75..96393b4b8f 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:33+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/list.php:2
 msgid "Your Shared Files"
-msgstr ""
+msgstr "Sinu jagatud failid"
 
 #: templates/list.php:6
 msgid "Item"
-msgstr ""
+msgstr "Kirje"
 
 #: templates/list.php:7
 msgid "Shared With"
-msgstr ""
+msgstr "Kellega jagatud"
 
 #: templates/list.php:8
 msgid "Permissions"
-msgstr ""
+msgstr "Õigused"
 
 #: templates/list.php:16
 msgid "Read"
-msgstr ""
+msgstr "Lugemine"
 
 #: templates/list.php:16
 msgid "Edit"
-msgstr ""
+msgstr "Muutmine"
 
 #: templates/list.php:16 templates/list.php:17
 msgid "Delete"
-msgstr ""
+msgstr "Kustutamine"
 
 #: templates/settings.php:3
 msgid "Enable Resharing"
-msgstr ""
+msgstr "Luba edasijagamine"
 
 #: templates/settings.php:4
 msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Luba kasutajatel jagada faile, mis pole nende omad"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index dccf6069c5..fd569f5b70 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:33+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Kõikide versioonide aegumine"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Luba failide versioonihaldus"
diff --git a/l10n/et_EE/tasks.po b/l10n/et_EE/tasks.po
index 310756cc69..042e2c4864 100644
--- a/l10n/et_EE/tasks.po
+++ b/l10n/et_EE/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:36+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Vigane kuupäev/kellaaeg"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Ülesanded"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Kategooriat pole"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Määramata"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=kõrgeim"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=keskmine"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=madalaim"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Tühi kokkuvõte"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Vigane edenemise protsent"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Vigane tähtsus"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Lisa ülesanne"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Tähtaja järgi"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Nimekirja järgi"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Edenemise järgi"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Asukoha järgi"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Tähtsuse järjekorras"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Sildi järgi"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Ülesannete laadimine..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Tähtis"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Rohkem"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Vähem"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Kustuta"
diff --git a/l10n/et_EE/user_openid.po b/l10n/et_EE/user_openid.po
index 7944fd1d36..8be57b5de2 100644
--- a/l10n/et_EE/user_openid.po
+++ b/l10n/et_EE/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:48+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "See on OpenID serveri lõpp-punkt. Lisainfot vaata"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identiteet: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Tsoon: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
diff --git a/l10n/it/admin_dependencies_chk.po b/l10n/it/admin_dependencies_chk.po
index a999a2c2bd..46d1082e63 100644
--- a/l10n/it/admin_dependencies_chk.po
+++ b/l10n/it/admin_dependencies_chk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 14:54+0000\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:51+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Il modulo php-xml è richiesto per condividere i file con webdav."
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "La direttiva allow_url_fopen del tuo php.ini deve essere impostata a 1 per recuperare la base di conoscenza dai server di OCS"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
diff --git a/l10n/it/admin_migrate.po b/l10n/it/admin_migrate.po
index df7e4841cc..2da23d877f 100644
--- a/l10n/it/admin_migrate.po
+++ b/l10n/it/admin_migrate.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 14:55+0000\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:47+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr "Esporta questa istanza di ownClou"
+msgstr "Esporta questa istanza di ownCloud"
 
 #: templates/settings.php:4
 msgid ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index cbe55089ae..b2d4c88847 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:44+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -162,7 +162,7 @@ msgstr "Scaricamento"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr "La tua password è stata cambiat"
+msgstr "La tua password è stata cambiata"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -234,7 +234,7 @@ msgstr "Altro"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppo di amministrazione"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
index 2ff1d63033..6e5f07a087 100644
--- a/l10n/it/tasks.po
+++ b/l10n/it/tasks.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 07:08+0000\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:00+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -64,27 +64,27 @@ msgstr "Aggiungi attività"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Ordina per scadenza"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Ordina per elenco"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Ordina per completamento"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Ordina per posizione"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Ordina per priorità"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Ordina per etichetta"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 9351ed11ca..8dfb19bb77 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,15 +8,16 @@
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
+#   <rasperepodvipodvert@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 11:59+0000\n"
+"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Загрузка из App Store запрещена"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,7 +55,7 @@ msgstr "Язык изменён"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -78,19 +79,19 @@ msgstr "Предупреждение безопасности"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Задание"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Запускать задание при загрузке каждой страницы"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php зарегистрирован в webcron сервисе"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "использовать системные задания"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -234,7 +235,7 @@ msgstr "Другое"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Группа Администраторы"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 53df424a01..32ff133a37 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 13:08+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +230,7 @@ msgstr "Drugo"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Administrator skupine"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 297e94ca2b..55c993f1bf 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-17 19:31+0000\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:56+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "Gostitelj"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokol lahko izpustite, razen če zahtevate SSL. V tem primeru začnite z ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -76,11 +76,11 @@ msgstr "Filter seznama uporabnikov"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "Brez katerekoli ograde, npr. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
@@ -88,7 +88,7 @@ msgstr "Filter skupin"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index e077e21a98..87c1af0489 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index f3b6dbd492..dc8f3f0b08 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 5a5c878723..e745e17295 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 0d42464f1b..1c60fbf5d6 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index cbde93f567..4b05c9d283 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4636bc0ca4..af4912e5a0 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ad52e44469..601a10e76c 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 14b49275e3..e0257f90d5 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 055c902dea..3976c1aca5 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index cfbac1de31..8f204f7dd3 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index b79f34aa11..3a41559cae 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index f698972d3a..e5799469eb 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e5de1cebb2..0fee6b1d1f 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 9ab4be2cf1..c696e2fbf2 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 961314eb0e..f6ae3a2399 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 1240a5ed5e..d071abbcc2 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7db7161729..bf5921bdf4 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 41bda3992f..858eb64bd5 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 85309999a1..f405f5ebdb 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 2c67531722..981e62bfb4 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:47+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +55,7 @@ msgstr "文件"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "取消共享"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
@@ -62,19 +63,19 @@ msgstr "删除"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "已经存在"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "替换"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "取消"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "已经替换"
 
 #: js/filelist.js:195
 msgid "with"
@@ -82,11 +83,11 @@ msgstr ""
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "撤销"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "已经删除"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
@@ -112,27 +113,27 @@ msgstr "上传已取消"
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index 23d106c760..e268331a6e 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -4,93 +4,38 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:50+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "图片"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "分享图库"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "错误："
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "内部错误"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "设置"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "重新扫描"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "停止"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "分享"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "返回"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "移除确认"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "您是否想要移除相册"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "修改相册名称"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "新相册名称"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "幻灯片"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index f5e044527f..7dffc01ef6 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:49+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "无法从应用商店载入列表"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -42,7 +42,7 @@ msgstr "非法请求"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "认证错误"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -50,7 +50,7 @@ msgstr "语言已修改"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -70,15 +70,15 @@ msgstr "简体中文"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "安全警告"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "计划任务"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "为每个装入的页面执行任务"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
@@ -86,7 +86,7 @@ msgstr ""
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "实现系统 cron 服务"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -230,7 +230,7 @@ msgstr "其它"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "组管理"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index dc6d10903e..c0ad6ef105 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -12,7 +12,11 @@
 "Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
-"Log" => "Registro",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
+"cron.php is registered at a webcron service" => "cron.php estas registrita kiel webcron-servilo",
+"use systems cron service" => "uzi la cron-servon de la sistemo",
+"Log" => "Protokolo",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
 "Select an App" => "Elekti aplikaĵon",
@@ -47,6 +51,7 @@
 "Create" => "Krei",
 "Default Quota" => "Defaŭlta kvoto",
 "Other" => "Alia",
+"Group Admin" => "Grupadministranto",
 "Quota" => "Kvoto",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 96df0e066b..e02e107ab4 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -33,7 +33,7 @@
 "of the available" => "su un totale di",
 "Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
 "Download" => "Scaricamento",
-"Your password got changed" => "La tua password è stata cambiat",
+"Your password got changed" => "La tua password è stata cambiata",
 "Unable to change your password" => "Modifica password non riuscita",
 "Current password" => "Password attuale",
 "New password" => "Nuova password",
@@ -51,6 +51,7 @@
 "Create" => "Crea",
 "Default Quota" => "Quota predefinita",
 "Other" => "Altro",
+"Group Admin" => "Gruppo di amministrazione",
 "Quota" => "Quote",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index ac169fa398..949e9572c1 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,15 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Загрузка из App Store запрещена",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
 "Authentication error" => "Ошибка авторизации",
 "Language changed" => "Язык изменён",
+"Error" => "Ошибка",
 "Disable" => "Отключить",
 "Enable" => "Включить",
 "Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
 "Security Warning" => "Предупреждение безопасности",
+"Cron" => "Задание",
+"execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
+"cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе",
+"use systems cron service" => "использовать системные задания",
 "Log" => "Журнал",
 "More" => "Ещё",
 "Add your App" => "Добавить приложение",
@@ -45,6 +51,7 @@
 "Create" => "Создать",
 "Default Quota" => "Квота по умолчанию",
 "Other" => "Другое",
+"Group Admin" => "Группа Администраторы",
 "Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 781aa3eb08..a2404d212b 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -51,6 +51,7 @@
 "Create" => "Ustvari",
 "Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
+"Group Admin" => "Administrator skupine",
 "Quota" => "Količinska omejitev",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 2e043f0266..410772e080 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,13 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "无法从应用商店载入列表",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
+"Authentication error" => "认证错误",
 "Language changed" => "语言已修改",
+"Error" => "错误",
 "Disable" => "禁用",
 "Enable" => "启用",
 "Saving..." => "正在保存",
 "__language_name__" => "简体中文",
+"Security Warning" => "安全警告",
+"Cron" => "计划任务",
+"execute one task with each page loaded" => "为每个装入的页面执行任务",
+"use systems cron service" => "实现系统 cron 服务",
 "Log" => "日志",
 "More" => "更多",
 "Add your App" => "添加应用",
@@ -43,6 +50,7 @@
 "Create" => "创建",
 "Default Quota" => "默认配额",
 "Other" => "其它",
+"Group Admin" => "组管理",
 "Quota" => "配额",
 "Delete" => "删除"
 );

From f893d21660695d1d1cd594c102e2bcba6919dee3 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 20 Aug 2012 02:03:51 +0200
Subject: [PATCH 1487/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/th_TH.php |  2 +
 apps/calendar/l10n/ru.php                  | 15 +++++
 apps/contacts/l10n/de.php                  |  1 +
 apps/contacts/l10n/th_TH.php               |  1 +
 apps/user_ldap/l10n/de.php                 |  6 ++
 apps/user_ldap/l10n/th_TH.php              | 19 ++++++
 l10n/de/contacts.po                        | 78 +++++++++++-----------
 l10n/de/settings.po                        |  8 +--
 l10n/de/user_ldap.po                       | 19 +++---
 l10n/fi_FI/settings.po                     | 10 +--
 l10n/ru/calendar.po                        | 37 +++++-----
 l10n/sv/settings.po                        |  8 +--
 l10n/templates/admin_dependencies_chk.pot  |  2 +-
 l10n/templates/admin_migrate.pot           |  2 +-
 l10n/templates/bookmarks.pot               |  2 +-
 l10n/templates/calendar.pot                |  2 +-
 l10n/templates/contacts.pot                | 72 ++++++++++----------
 l10n/templates/core.pot                    |  2 +-
 l10n/templates/files.pot                   |  2 +-
 l10n/templates/files_encryption.pot        |  2 +-
 l10n/templates/files_external.pot          |  2 +-
 l10n/templates/files_sharing.pot           |  2 +-
 l10n/templates/files_versions.pot          |  2 +-
 l10n/templates/gallery.pot                 |  2 +-
 l10n/templates/lib.pot                     |  2 +-
 l10n/templates/media.pot                   |  2 +-
 l10n/templates/settings.pot                |  2 +-
 l10n/templates/tasks.pot                   |  2 +-
 l10n/templates/user_ldap.pot               |  2 +-
 l10n/templates/user_migrate.pot            |  2 +-
 l10n/templates/user_openid.pot             |  2 +-
 l10n/th_TH/admin_dependencies_chk.po       |  8 +--
 l10n/th_TH/contacts.po                     | 78 +++++++++++-----------
 l10n/th_TH/settings.po                     |  8 +--
 l10n/th_TH/user_ldap.po                    | 42 ++++++------
 settings/l10n/de.php                       |  1 +
 settings/l10n/fi_FI.php                    |  2 +
 settings/l10n/sv.php                       |  1 +
 settings/l10n/th_TH.php                    |  1 +
 39 files changed, 252 insertions(+), 201 deletions(-)

diff --git a/apps/admin_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
index ce0f48b288..01d5c36366 100644
--- a/apps/admin_dependencies_chk/l10n/th_TH.php
+++ b/apps/admin_dependencies_chk/l10n/th_TH.php
@@ -7,6 +7,8 @@
 "The php-mb_multibyte module is needed to manage correctly the encoding." => "โมดูล php-mb_multibyte จำเป็นต้องใช้สำหรับการจัดการการแปลงรหัสไฟล์อย่างถูกต้อง",
 "The php-ctype module is needed validate data." => "โมดูล php-ctype จำเป็นต้องใช้สำหรับตรวจสอบความถูกต้องของข้อมูล",
 "The php-xml module is needed to share files with webdav." => "โมดูล php-xml จำเป็นต้องใช้สำหรับแชร์ไฟล์ด้วย webdav",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "คำสั่ง allow_url_fopen ที่อยู่ในไฟล์ php.ini ของคุณ ควรกำหนดเป็น 1 เพื่อดึงข้อมูลของฐานความรู้ต่างๆจากเซิร์ฟเวอร์ของ OCS",
 "The php-pdo module is needed to store owncloud data into a database." => "โมดูล php-pdo จำเป็นต้องใช้สำหรับจัดเก็บข้อมูลใน owncloud เข้าไปไว้ยังฐานข้อมูล",
+"Dependencies status" => "สถานะการอ้างอิง",
 "Used by :" => "ใช้งานโดย:"
 );
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 9c27d367da..612a1e2ae2 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -33,6 +33,7 @@
 "Projects" => "Проекты",
 "Questions" => "Вопросы",
 "Work" => "Работа",
+"by" => "до свидания",
 "unnamed" => "без имени",
 "New Calendar" => "Новый Календарь",
 "Does not repeat" => "Не повторяется",
@@ -111,6 +112,7 @@
 "Month" => "Месяц",
 "List" => "Список",
 "Today" => "Сегодня",
+"Settings" => "Параметры",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
 "Shared calendars" => "Общие календари",
@@ -163,6 +165,8 @@
 "Import a calendar file" => "Импортировать календарь из файла",
 "Please choose a calendar" => "Пожалуйста, выберите календарь",
 "Name of new calendar" => "Название нового календаря",
+"Take an available name!" => "Возьмите разрешенное имя!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Календарь с таким именем уже существует. Если вы продолжите, одноименный календарь будет удален.",
 "Import" => "Импортировать",
 "Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое событие",
@@ -170,10 +174,21 @@
 "No categories selected" => "Категории не выбраны",
 "of" => "из",
 "at" => "на",
+"General" => "Основные",
 "Timezone" => "Часовой пояс",
+"Update timezone automatically" => "Автоматическое обновление временной зоны",
+"Time format" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
+"Start week on" => "Начало недели",
+"Cache" => "Кэш",
+"Clear cache for repeating events" => "Очистить кэш повторяющихся событий",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "Адрес синхронизации CalDAV",
 "more info" => "подробнее",
+"Primary address (Kontact et al)" => "Основной адрес (Контакта)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Читать только ссылки iCalendar",
 "Users" => "Пользователи",
 "select users" => "выбрать пользователей",
 "Editable" => "Редактируемо",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index a47b61d507..2aeb106c48 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "Fehler beim Laden des Profilbildes.",
 "Select type" => "Wähle Typ",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
+"Do you want to merge these address books?" => "Möchtest du diese Adressbücher zusammenführen?",
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 7a4989986f..887d13bc38 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว",
 "Select type" => "เลือกชนิด",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน",
+"Do you want to merge these address books?" => "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?",
 "Result: " => "ผลลัพธ์: ",
 " imported, " => " นำเข้าข้อมูลแล้ว, ",
 " failed." => " ล้มเหลว.",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index f52bfe8e7e..1436117184 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,8 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn du SSL benötiogst. Beginne dann __mit__ ldaps://",
+"Base DN" => "Basis-DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+"User DN" => "Benutzer-DN",
 "Password" => "Passwort",
+"For anonymous access, leave DN and Password empty." => "Lass die Felder von DN und Passwort für anonymen Zugang leer.",
 "User Login Filter" => "Benutzer Login Filter",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer Filter Liste",
 "Group Filter" => "Gruppen Filter",
 "Port" => "Port",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 424da7de4b..aa2d35ed85 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -1,16 +1,35 @@
 <?php $TRANSLATIONS = array(
 "Host" => "โฮสต์",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
 "Base DN" => "DN ฐาน",
+"You can specify Base DN for users and groups in the Advanced tab" => "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้",
 "User DN" => "DN ของผู้ใช้งาน",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้",
 "Password" => "รหัสผ่าน",
 "For anonymous access, leave DN and Password empty." => "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
+"User Login Filter" => "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\"",
+"User List Filter" => "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน",
+"Defines the filter to apply, when retrieving users." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน",
+"without any placeholder, e.g. \"objectClass=person\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\",",
 "Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
+"Defines the filter to apply, when retrieving groups." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\",",
 "Port" => "พอร์ต",
+"Base User Tree" => "รายการผู้ใช้งานหลักแบบ Tree",
+"Base Group Tree" => "รายการกลุ่มหลักแบบ Tree",
+"Group-Member association" => "ความสัมพันธ์ของสมาชิกในกลุ่ม",
 "Use TLS" => "ใช้ TLS",
+"Do not use it for SSL connections, it will fail." => "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว",
 "Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud",
 "Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
 "User Display Name Field" => "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud",
 "Group Display Name Field" => "ช่องแสดงชื่อกลุ่มที่ต้องการ",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud",
 "in bytes" => "ในหน่วยไบต์",
+"in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
 "Help" => "ช่วยเหลือ"
 );
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 3948b8ecfb..03f68de3e7 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 09:39+0000\n"
+"Last-Translator: Phi Lieb <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -305,7 +305,7 @@ msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Möchtest du diese Adressbücher zusammenführen?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -335,7 +335,7 @@ msgstr "Dies ist nicht dein Adressbuch."
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:112 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
@@ -343,12 +343,12 @@ msgstr "Adresse"
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:114 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
@@ -392,8 +392,8 @@ msgstr "Pager"
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:183 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -545,113 +545,113 @@ msgstr "Neues Foto hochladen"
 msgid "Select photo from ownCloud"
 msgstr "Foto aus der ownCloud auswählen"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Name ändern"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:33
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Spitzname angeben"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Webseite"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Webseite aufrufen"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Gruppen mit Komma getrennt"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Gruppen editieren"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Bevorzugt"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Bitte eine gültige E-Mail-Adresse angeben."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "E-Mail-Adresse angeben"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "E-Mail an diese Adresse schreiben"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "E-Mail-Adresse löschen"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Telefonnummer angeben"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Telefonnummer löschen"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Auf Karte anzeigen"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Adressinformationen ändern"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Füge hier Notizen ein."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Feld hinzufügen"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Notiz"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Kontakt herunterladen"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Kontakt löschen"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 314477b925..694e39fb62 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 10:12+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -235,7 +235,7 @@ msgstr "Andere"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppenadministrator"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index f84a3add4d..6e4c7880b7 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Maurice Preuß <>, 2012.
+# Phi Lieb <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 20:45+0000\n"
-"Last-Translator: Maurice Preuß <>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 09:48+0000\n"
+"Last-Translator: Phi Lieb <>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,19 +26,19 @@ msgstr "Host"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Du kannst das Protokoll auslassen, außer wenn du SSL benötiogst. Beginne dann __mit__ ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Basis-DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Benutzer-DN"
 
 #: templates/settings.php:10
 msgid ""
@@ -52,7 +53,7 @@ msgstr "Passwort"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Lass die Felder von DN und Passwort für anonymen Zugang leer."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
@@ -68,7 +69,7 @@ msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%u
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index da6c2cafaa..b45f1ed63e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 12:53+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr "Turvallisuusvaroitus"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -85,7 +85,7 @@ msgstr ""
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "käytä järjestelmän cron-palvelua"
 
 #: templates/admin.php:39
 msgid "Log"
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index 33e20b02e3..3b4d2ffe82 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -6,15 +6,16 @@
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
+#   <rasperepodvipodvert@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 17:21+0000\n"
+"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -163,7 +164,7 @@ msgstr "Работа"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "до свидания"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -481,7 +482,7 @@ msgstr "Сегодня"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Параметры"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -697,13 +698,13 @@ msgstr "Название нового календаря"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "Возьмите разрешенное имя!"
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Календарь с таким именем уже существует. Если вы продолжите, одноименный календарь будет удален."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -735,7 +736,7 @@ msgstr "на"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Основные"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -743,11 +744,11 @@ msgstr "Часовой пояс"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Автоматическое обновление временной зоны"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Формат времени"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -759,23 +760,23 @@ msgstr "12ч"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Начало недели"
 
 #: templates/settings.php:76
 msgid "Cache"
-msgstr ""
+msgstr "Кэш"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Очистить кэш повторяющихся событий"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLs"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Адрес синхронизации CalDAV"
 
 #: templates/settings.php:87
 msgid "more info"
@@ -783,15 +784,15 @@ msgstr "подробнее"
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Основной адрес (Контакта)"
 
 #: templates/settings.php:91
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
 
 #: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Читать только ссылки iCalendar"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index ce1d122541..b4b73aa87c 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 09:45+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -234,7 +234,7 @@ msgstr "Annat"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppadministratör"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 87c1af0489..937a61857a 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index dc8f3f0b08..d98a9734fa 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index e745e17295..6de5ed60ac 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 1c60fbf5d6..f68a48cb23 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 4b05c9d283..c51a96c39a 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -318,7 +318,7 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:112 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
@@ -326,12 +326,12 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:114 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
@@ -375,8 +375,8 @@ msgstr ""
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:183 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index af4912e5a0..64a7558f57 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 601a10e76c..c7fdd2ab4b 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index e0257f90d5..1b662cfe22 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 3976c1aca5..0e2addeae4 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 8f204f7dd3..b22fd5200b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 3a41559cae..b603771b68 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index e5799469eb..3da7373d74 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0fee6b1d1f..0347424549 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index c696e2fbf2..92ef602a4f 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index f6ae3a2399..d280cf6544 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index d071abbcc2..140661bf31 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index bf5921bdf4..d4cb01eef0 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 858eb64bd5..94814afec2 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index f405f5ebdb..06813aae87 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/admin_dependencies_chk.po b/l10n/th_TH/admin_dependencies_chk.po
index cfa13b5075..95abe0c652 100644
--- a/l10n/th_TH/admin_dependencies_chk.po
+++ b/l10n/th_TH/admin_dependencies_chk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 12:24+0000\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 14:18+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "โมดูล php-xml จำเป็นต้องใช้สำห
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "คำสั่ง allow_url_fopen ที่อยู่ในไฟล์ php.ini ของคุณ ควรกำหนดเป็น 1 เพื่อดึงข้อมูลของฐานความรู้ต่างๆจากเซิร์ฟเวอร์ของ OCS"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
@@ -67,7 +67,7 @@ msgstr "โมดูล php-pdo จำเป็นต้องใช้สำห
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "สถานะการอ้างอิง"
 
 #: templates/settings.php:7
 msgid "Used by :"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index ac7e298b07..a4507907d0 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 15:10+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -290,7 +290,7 @@ msgstr "ข้อมูลผู้ติดต่อบางรายการ
 
 #: js/contacts.js:1461
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -320,7 +320,7 @@ msgstr "นี่ไม่ใช่สมุดบันทึกที่อย
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:112 templates/part.contact.php:116
 msgid "Address"
 msgstr "ที่อยู่"
 
@@ -328,12 +328,12 @@ msgstr "ที่อยู่"
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:114 templates/part.contact.php:115
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "หน่วยงาน"
 
@@ -377,8 +377,8 @@ msgstr "เพจเจอร์"
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:183 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "วันเกิด"
 
@@ -530,113 +530,113 @@ msgstr "อัพโหลดรูปภาพใหม่"
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "แก้ไขรายละเอียดของชื่อ"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:33
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "กรอกชื่อเล่น"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "เว็บไซต์"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "ไปที่เว็บไซต์"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "แก้ไขกลุ่ม"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "พิเศษ"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "กรอกที่อยู่อีเมล"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "ส่งอีเมลไปที่"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "ลบที่อยู่อีเมล"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "กรอกหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "ลบหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "ดูบนแผนที่"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "แก้ไขรายละเอียดที่อยู่"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "เพิ่มช่องรับข้อมูล"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "โทรศัพท์"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "หมายเหตุ"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "ลบข้อมูลการติดต่อ"
 
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 8a27bc9bdf..f2de2ffdc5 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 15:11+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +230,7 @@ msgstr "อื่นๆ"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "ผู้ดูแลกลุ่ม"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index e2047dcd20..d4e8110d11 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 12:20+0000\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 16:00+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "โฮสต์"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -33,7 +33,7 @@ msgstr "DN ฐาน"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
 
 #: templates/settings.php:10
 msgid "User DN"
@@ -44,7 +44,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
 
 #: templates/settings.php:11
 msgid "Password"
@@ -56,31 +56,31 @@ msgstr "สำหรับการเข้าถึงโดยบุคคล
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
 
 #: templates/settings.php:14
 msgid "Group Filter"
@@ -88,11 +88,11 @@ msgstr "ตัวกรองข้อมูลกลุ่ม"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
 
 #: templates/settings.php:17
 msgid "Port"
@@ -100,15 +100,15 @@ msgstr "พอร์ต"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "รายการผู้ใช้งานหลักแบบ Tree"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "รายการกลุ่มหลักแบบ Tree"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -116,7 +116,7 @@ msgstr "ใช้ TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว"
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -130,7 +130,7 @@ msgstr "ปิดใช้งานการตรวจสอบความถ
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
@@ -142,7 +142,7 @@ msgstr "ช่องแสดงชื่อผู้ใช้งานที่
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
@@ -150,7 +150,7 @@ msgstr "ช่องแสดงชื่อกลุ่มที่ต้อง
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -158,7 +158,7 @@ msgstr "ในหน่วยไบต์"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
 #: templates/settings.php:31
 msgid "Help"
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index cd61fe0ace..be9704336f 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -51,6 +51,7 @@
 "Create" => "Anlegen",
 "Default Quota" => "Standard Quota",
 "Other" => "Andere",
+"Group Admin" => "Gruppenadministrator",
 "Quota" => "Quota",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 81d1b9d0e6..9cc36f4955 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -11,6 +11,8 @@
 "Saving..." => "Tallennetaan...",
 "__language_name__" => "_kielen_nimi_",
 "Security Warning" => "Turvallisuusvaroitus",
+"Cron" => "Cron",
+"use systems cron service" => "käytä järjestelmän cron-palvelua",
 "Log" => "Loki",
 "More" => "Lisää",
 "Add your App" => "Lisää ohjelmasi",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 4138fa914d..886148d8ef 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -51,6 +51,7 @@
 "Create" => "Skapa",
 "Default Quota" => "Förvald datakvot",
 "Other" => "Annat",
+"Group Admin" => "Gruppadministratör",
 "Quota" => "Kvot",
 "Delete" => "Ta bort"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 6bd17e121e..a062c374c6 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -51,6 +51,7 @@
 "Create" => "สร้าง",
 "Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
+"Group Admin" => "ผู้ดูแลกลุ่ม",
 "Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );

From 5eca531f99f9615d1a09bbb0b03dda2063901aa7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 19 Aug 2012 22:14:38 -0400
Subject: [PATCH 1488/1537] Refactor again so we can tell what item is being
 reshared in case the same source shows up. This is the end of the share_api
 branch, moving to master.

---
 core/ajax/share.php       |  2 +-
 lib/public/share.php      | 68 +++++++++++++++++++++++------------
 tests/lib/share/share.php | 74 +++++++++++++++++----------------------
 3 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3eadff431c..ee9700295e 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -26,7 +26,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					OCP\Share::shareItem($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+					OCP\Share::shareItem($_POST['itemType'], $_POST['item'], $_POST['item'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 					// TODO May need to return private link
 					OC_JSON::success();
 				} catch (Exception $exception) {
diff --git a/lib/public/share.php b/lib/public/share.php
index d91529d759..c57016fb98 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -139,7 +139,7 @@ class Share {
 	* @param int CRUDS permissions
 	* @return bool Returns true on success or false on failure
 	*/
-	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {
+	public static function shareItem($itemType, $itemName, $itemSource, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
 		if ($shareType === self::SHARE_TYPE_USER) {
@@ -192,7 +192,7 @@ class Share {
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
 			}
-			return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
+			return self::shareItem($itemType, $itemName, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
 		} else {
 			// Future share types need to include their own conditions
 			$message = 'Share type '.$shareType.' is not valid for '.$itemSource;
@@ -223,7 +223,7 @@ class Share {
 						array_push($files, $children);
 					} else {
 						// Pass on to put() to check if this item should be converted, the item won't be inserted into the database unless it can be converted
-						self::put('file', $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
+						self::put('file', $name, $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
 					}
 				}
 				return true;
@@ -231,7 +231,7 @@ class Share {
 			return false;
 		} else {
 			// Put the item into the database
-			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
+			return self::put($itemType, $itemName, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
 		}
 	}
 
@@ -406,6 +406,7 @@ class Share {
 				$where .= 'WHERE file_target IS NOT NULL';
 			}
 			$fileDependent = true;
+			$queryArgs = array();
 		} else {
 			$fileDependent = false;
 			$root = '';
@@ -481,9 +482,10 @@ class Share {
 				$queryArgs[] = $item;
 			}
 			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
-				$where .= " OR item_type IN ('".$placeholders."')";
-				$queryArgs = array_merge($query_args, $collectionTypes);
+				// TODO Bart - this doesn't work with only one argument
+// 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
+// 				$where .= " OR item_type IN ('".$placeholders."')";
+// 				$queryArgs = array_merge($queryArgs, $collectionTypes);
 			}
 		}
 		if ($limit != -1 && !$includeCollections) {
@@ -529,26 +531,37 @@ class Share {
 		$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
 		$result = $query->execute($queryArgs);
 		$items = array();
-		$itemsSources = array();
+		$targets = array();
 		while ($row = $result->fetchRow()) {
 			// Filter out duplicate group shares for users with unique targets
-			if ($row['share_type'] == self::$shareTypeGroupUserUnique) {
+			if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) {
+				$row['share_type'] = self::SHARE_TYPE_GROUP;
+				$row['share_with'] = $items[$row['parent']]['share_with'];
 				// Remove the parent group share
-				if (isset($items[$row['parent']])) {
-					unset($items[$row['parent']]);
-				}
+				unset($items[$row['parent']]);
 			} else if (!isset($uidOwner)) {
-				// Check if the same item source already exists
-				if (isset($itemsSources[$row[$column]])) {
+				// Check if the same target already exists
+				if (isset($targets[$row[$column]])) {
 					// Check if the same owner shared with the user twice through a group and user share - this is allowed
-					$id = $itemsSources[$row[$column]];
+					$id = $targets[$row[$column]];
 					if ($items[$id]['uid_owner'] == $row['uid_owner']) {
+						// Switch to group share type to ensure resharing conditions aren't bypassed
+						if ($items[$id]['share_type'] != self::SHARE_TYPE_GROUP) {
+							$items[$id]['share_type'] = self::SHARE_TYPE_GROUP;
+							$items[$id]['share_with'] = $row['share_with'];
+						}
+						// Switch ids if sharing permission is granted on only one share to ensure correct parent is used if resharing
+						if (~(int)$items[$id]['permissions'] & self::PERMISSION_SHARE && (int)$row['permissions'] & self::PERMISSION_SHARE) {
+							$items[$row['id']] = $items[$id];
+							unset($items[$id]);
+							$id = $row['id'];
+						}
 						// Combine the permissions for the item
 						$items[$id]['permissions'] |= (int)$row['permissions'];
 						continue;
 					}
 				} else {
-					$itemsSources[$row[$column]] = $row['id'];
+					$targets[$row[$column]] = $row['id'];
 				}
 			}
 			// Remove root from file source paths if retrieving own shared items
@@ -631,7 +644,7 @@ class Share {
 	* @param bool|array Parent folder target (optional)
 	* @return bool Returns true on success or false on failure
 	*/
-	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
+	private static function put($itemType, $itemName, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($itemSource, strrpos($itemSource, '.') + 1));
@@ -648,16 +661,18 @@ class Share {
 		}
 		$backend = self::getBackend($itemType);
 		// Check if this is a reshare
-		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
-		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
+		if ($checkReshare = self::getItemSharedWith($itemType, $itemName, self::FORMAT_NONE, null, true)) {
+			// Check if attempting to share back to owner
 			if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
 				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the original sharer';
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
+			// Check if attempting to share back to group TODO Check unique user target
 			} else if ($shareType == self::SHARE_TYPE_GROUP && $checkReshare['share_with'] == $shareWith['group']) {
 				$message = 'Sharing '.$itemSource.' failed, because the item was orignally shared with the group '.$shareWith['group'];
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
+			// Check if attempting to share back a group share to a member of the same group
 			} else if (($checkReshare['share_type'] == self::SHARE_TYPE_GROUP || $checkReshare['share_type'] == self::$shareTypeGroupUserUnique) && $shareType == self::SHARE_TYPE_USER) {
 				if ($checkReshare['share_type'] == self::$shareTypeGroupUserUnique) {
 					$query = \OC_DB::prepare('SELECT share_with FROM *PREFIX*share WHERE id = ?');
@@ -670,7 +685,9 @@ class Share {
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
-			} else if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
+			}
+			// Check if share permissions is granted
+			if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
 				if (~(int)$checkReshare['permissions'] & $permissions) {
 					$message = 'Sharing '.$itemSource.' failed, because the permissions exceed permissions granted to '.$uidOwner;
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
@@ -679,6 +696,8 @@ class Share {
 					// TODO Don't check if inside folder
 					$parent = $checkReshare['id'];
 					$itemSource = $checkReshare['item_source'];
+					// TODO Suggest item/file target
+					$suggestedItemTarget = $checkReshare['item_target'];
 					$fileSource = $checkReshare['file_source'];
 					$filePath = $checkReshare['file_target'];
 				}
@@ -808,6 +827,9 @@ class Share {
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @return string Item target
+	* 
+	* TODO Use a suggested item target by default
+	*
 	*/
 	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner) {
 		$backend = self::getBackend($itemType);
@@ -883,7 +905,7 @@ class Share {
 				$query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE parent IN ('.$parents.') AND uid_owner = ?');
 				$result = $query->execute(array($uidOwner));
 			} else {
-				$query = \OC_DB::prepare('SELECT id, item_type, item_source, parent, uid_owner FROM *PREFIX*share WHERE parent IN ('.$parents.')');
+				$query = \OC_DB::prepare('SELECT id, item_type, item_target, parent, uid_owner FROM *PREFIX*share WHERE parent IN ('.$parents.')');
 				$result = $query->execute();
 			}
 			// Reset parents array, only go through loop again if items are found
@@ -891,8 +913,8 @@ class Share {
 			while ($item = $result->fetchRow()) {
 				// Search for a duplicate parent share, this occurs when an item is shared to the same user through a group and user or the same item is shared by different users
 				$userAndGroups = array_merge(array($item['uid_owner']), \OC_Group::getUserGroups($item['uid_owner']));
-				$query = \OC_DB::prepare("SELECT id, permissions FROM *PREFIX*share WHERE item_type = ? AND item_source = ? AND share_type IN (?,?,?) AND share_with IN ('".implode("','", $userAndGroups)."') AND uid_owner != ? AND id != ?");
-				$duplicateParent = $query->execute(array($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique, $item['uid_owner'], $item['parent']))->fetchRow();
+				$query = \OC_DB::prepare("SELECT id, permissions FROM *PREFIX*share WHERE item_type = ? AND item_target = ? AND share_type IN (?,?,?) AND share_with IN ('".implode("','", $userAndGroups)."') AND uid_owner != ? AND id != ?");
+				$duplicateParent = $query->execute(array($item['item_type'], $item['item_target'], self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique, $item['uid_owner'], $item['parent']))->fetchRow();
 				if ($duplicateParent) {
 					// Change the parent to the other item id if share permission is granted
 					if ($duplicateParent['permissions'] & self::PERMISSION_SHARE) {
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 4e48ab09c6..89f0fbc976 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -63,19 +63,13 @@ class Test_Share extends UnitTestCase {
 
 	public function testShareInvalidShareType() {
 		$this->expectException(new Exception('Share type foobar is not valid for test.txt'));
-		OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
+		OCP\Share::shareItem('test', 'test.txt', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
 	}
 
 	public function testInvalidItemType() {
 		$message = 'Sharing backend for foobar not found';
 		try {
-			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
-			$this->fail('Exception was expected: '.$message);
-		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
-		}
-		try {
-			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('foobar', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -122,28 +116,28 @@ class Test_Share extends UnitTestCase {
 		// Invalid shares
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		$message = 'Sharing test.txt failed, because the user foobar does not exist';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
 		try {
-			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'foobar', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Valid share
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
@@ -152,7 +146,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->user2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -162,7 +156,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -173,11 +167,11 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		
 		// Attempt reshare without share permission
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because resharing is not allowed';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -191,14 +185,14 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Valid reshare
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		OC_User::setUserId($this->user3);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
@@ -234,7 +228,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
@@ -244,9 +238,9 @@ class Test_Share extends UnitTestCase {
 		
 		// Attempt target conflict
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		
@@ -260,21 +254,21 @@ class Test_Share extends UnitTestCase {
 		// Invalid shares
 		$message = 'Sharing test.txt failed, because the group foobar does not exist';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		$message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Valid share
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
 		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
@@ -285,7 +279,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -295,7 +289,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -304,7 +298,7 @@ class Test_Share extends UnitTestCase {
 		// Attempt to share back to group
 		$message = 'Sharing test.txt failed, because the item was orignally shared with the group '.$this->group1;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -313,7 +307,7 @@ class Test_Share extends UnitTestCase {
 		// Attempt to share back to member of group
 		$message = 'Sharing test.txt failed, because the user '.$this->user3.' is a member of the original group share';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -324,18 +318,18 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		
 		// Valid share with same person - user then group
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user3);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		
 		// Valid reshare
 		OC_User::setUserId($this->user2);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user4);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		
@@ -343,33 +337,31 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
 		
 		// Valid share with same person - group then user
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
+		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE));
 		
 		// Unshare from group only
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
-		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
 		
 		// Attempt user specific target conflict
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		
-		// Valid reshare
-		$this->assertTrue(OCP\Share::shareItem('test', 'test1.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		// Valid reshare TODO Broken
+		$this->assertTrue(OCP\Share::shareItem('test', 'test1.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user4);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
 		

From cb0464ca4e13a6bf206e94972eba12c3cedd4e2a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 19 Aug 2012 22:36:19 -0400
Subject: [PATCH 1489/1537] Bump version number for Share API

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 0ef030e440..41bd375dbf 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,81,3);
+		return array(4,81,4);
 	}
 
 	/**

From ef3eebfd3e46276aa58d722e4e8986946872439c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 20 Aug 2012 17:24:10 +0200
Subject: [PATCH 1490/1537] Fix deletion for browser that do not support
 onBeforeUnload, fixes oc-1534.

---
 apps/files/js/filelist.js | 41 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a414c5f830..6ba3f3555e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -151,7 +151,7 @@ FileList={
 						}
 					});
 				}
-				
+
 			}
 			tr.attr('data-file', newname);
 			var path = td.children('a.name').attr('href');
@@ -189,7 +189,7 @@ FileList={
 		FileList.replaceCanceled = false;
 		FileList.replaceOldName = oldName;
 		FileList.replaceNewName = newName;
-		FileList.lastAction = function() { 
+		FileList.lastAction = function() {
 			FileList.finishReplace();
 		};
 		$('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>');
@@ -236,23 +236,13 @@ FileList={
 	do_delete:function(files){
 		// Finish any existing actions
 		if (FileList.lastAction || !FileList.useUndo) {
+			if(!FileList.deleteFiles) {
+				FileList.prepareDeletion(files);
+			}
 			FileList.lastAction();
+			return;
 		}
-		if(files.substr){
-			files=[files];
-		}
-		$.each(files,function(index,file){
-			var files = $('tr').filterAttr('data-file',file);
-			files.hide();
-			files.find('input[type="checkbox"]').removeAttr('checked');
-			files.removeClass('selected');
-		});
-		procesSelection();
-		FileList.deleteCanceled=false;
-		FileList.deleteFiles=files;
-		FileList.lastAction = function() {
-			FileList.finishDelete(null, true);
-		};
+		FileList.prepareDeletion(files);
 		$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
 		$('#notification').fadeIn();
 	},
@@ -279,6 +269,23 @@ FileList={
 				}
 			});
 		}
+	},
+	prepareDeletion:function(files){
+		if(files.substr){
+			files=[files];
+		}
+		$.each(files,function(index,file){
+			var files = $('tr').filterAttr('data-file',file);
+			files.hide();
+			files.find('input[type="checkbox"]').removeAttr('checked');
+			files.removeClass('selected');
+		});
+		procesSelection();
+		FileList.deleteCanceled=false;
+		FileList.deleteFiles=files;
+		FileList.lastAction = function() {
+			FileList.finishDelete(null, true);
+		};
 	}
 }
 

From 719ae155db3c0d4a97250fdf00a34ae2d83aaf3e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 Aug 2012 22:48:48 +0200
Subject: [PATCH 1491/1537] Try to align and float contact parts better.

---
 apps/contacts/css/contacts.css           | 6 +++---
 apps/contacts/js/contacts.js             | 6 ++++--
 apps/contacts/templates/part.contact.php | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index ad8762167b..54edf16397 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -26,7 +26,7 @@
 #contacts_propertymenu li a { padding: 3px; display: block }
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
 #contacts_propertymenu li a:hover { color: #fff }
-#card { width: auto;/*max-width: 70em; border: thin solid lightgray; display: block;*/ }
+#card { width: auto; font-size: 10px; /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
 #firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
 #firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; }
 
@@ -71,9 +71,9 @@ label:hover, dt:hover { color: #333; }
 #fn { float: left !important; width: 18em !important; }
 #name { /*position: absolute; top: 0px; left: 0px;*/ min-width: 25em; height: 2em; clear: right; display: block; }
 #identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
-/*#contact_photo { max-width: 250px; }*/
+#contact_photo { float: left; margin: 1em; }
 #contact_identity { min-width: 30em; }
-.contactsection { position: relative; float: left; padding: 0.5em; height: auto; }
+.contactsection { position: relative; float: left; width: 35em; padding: 0.5em; height: auto; }
 
 #cropbox { margin: auto; }
 #contacts_details_photo_wrapper { width: 200px; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index f535dc03f3..fda47665c9 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -545,13 +545,13 @@ OC.Contacts={
 				textarea.css('min-height', nheight+'em');
 				textarea.attr('rows', nheight);
 				textarea.val(txt);
-				note.show();
+				$('#contact_note').show();
 				textarea.expandingTextarea();
 				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
 			} else {
 				note.removeData('checksum');
 				note.find('textarea').val('');
-				note.hide();
+				$('#contact_note').hide();
 				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
 			}
 		},
@@ -788,6 +788,7 @@ OC.Contacts={
 				case 'NOTE':
 					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
 					$('#note').find('textarea').expandingTextarea().show().focus();
+					$('#contact_note').show();
 					break;
 				case 'EMAIL':
 					if($('#emaillist>li').length == 1) {
@@ -838,6 +839,7 @@ OC.Contacts={
 									OC.Contacts.Card.loadPhoto();
 								} else if(proptype == 'NOTE') {
 									$('#note').find('textarea').val('');
+									$('#contact_note').hide();
 									OC.Contacts.propertyContainerFor(obj).hide();
 								}
 							} else {
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 4d465e418c..1f85f65687 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -11,7 +11,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
 	</form>
 
-	<div id="contact_photo" class="contactsection">
+	<div id="contact_photo">
 
 	<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
 	<div class="tip propertycontainer" id="contacts_details_photo_wrapper" title="<?php echo $l->t('Drop photo to upload'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)" data-element="PHOTO">

From 1e42cd162e70b6c9498c806a05c5c52402035c65 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Aug 2012 00:10:31 +0200
Subject: [PATCH 1492/1537] Added types to emails. Support for custom types.
 Partial fix for oc-1508.

---
 apps/contacts/css/contacts.css           |  3 +--
 apps/contacts/js/contacts.js             | 28 +++++++++++++++++++-----
 apps/contacts/templates/part.contact.php |  2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 54edf16397..d7c9a6bf34 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -119,8 +119,7 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .propertycontainer dd { float: left; width: 25em; }
 .propertylist { clear: none; max-width: 28em; }
 .propertylist li.propertycontainer { white-space: nowrap; min-width: 35em; /*max-width: 30em;*/ display: block; clear: right; }
-.propertycontainer[data-element="EMAIL"] > input[type="email"] { min-width: 19em !important; float: left; }
-.propertycontainer[data-element="TEL"] > input[type="text"] { width: 10em !important; float: left; }
+.propertycontainer[data-element="EMAIL"] > input[type="email"],.propertycontainer[data-element="TEL"] > input[type="text"] { min-width: 12em !important; float: left; }
 .propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
 .propertylist li > select { float: left; max-width: 8em; }
 .typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb} /* for multiselect */
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index fda47665c9..8f52ec8873 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1301,26 +1301,39 @@ OC.Contacts={
 		loadMails:function() {
 			$('#emails').hide();
 			$('#emaillist li.propertycontainer').remove();
+			var emaillist = $('#emaillist');
 			for(var mail in this.data.EMAIL) {
 				this.addMail();
 				//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
-				$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
-				$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
+				var curemail = emaillist.find('li:last-child');
+				curemail.data('checksum', this.data.EMAIL[mail]['checksum'])
+				curemail.find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
 				for(var param in this.data.EMAIL[mail]['parameters']) {
 					if(param.toUpperCase() == 'PREF') {
-						$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
+						curemail.find('input[type="checkbox"]').attr('checked', 'checked')
 					}
 					else if(param.toUpperCase() == 'TYPE') {
 						for(etype in this.data.EMAIL[mail]['parameters'][param]) {
+							var found = false;
 							var et = this.data.EMAIL[mail]['parameters'][param][etype];
-							$('#emaillist li:last-child').find('select option').each(function(){
+							curemail.find('select option').each(function(){
 								if($.inArray($(this).val().toUpperCase(), et.toUpperCase().split(',')) > -1) {
 									$(this).attr('selected', 'selected');
+									found = true;
 								}
 							});
+							if(!found) {
+								curemail.find('select option:last-child').after('<option value="'+et+'" selected="selected">'+et+'</option>');
+							}
 						}
 					}
 				}
+				curemail.find('select').multiselect({
+								noneSelectedText: t('contacts', 'Select type'),
+								header: false,
+								selectedList: 4,
+								classes: 'typelist'
+							});
 			}
 			if($('#emaillist li').length > 1) {
 				$('#emails').show();
@@ -1359,13 +1372,18 @@ OC.Contacts={
 					}
 					else if(param.toUpperCase() == 'TYPE') {
 						for(ptype in this.data.TEL[phone]['parameters'][param]) {
+							var found = false;
 							var pt = this.data.TEL[phone]['parameters'][param][ptype];
-							phonelist.find('li:last-child').find('select option').each(function(){
+							phonelist.find('li:last-child').find('select option').each(function() {
 								//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
 								if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
 									$(this).attr('selected', 'selected');
+									found = true;
 								}
 							});
+							if(!found) {
+								phonelist.find('li:last-child').find('select option:last-child').after('<option class="custom" value="'+pt+'" selected="selected">'+pt+'</option>');
+							}
 						}
 					}
 				}
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 1f85f65687..41c9122137 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -61,7 +61,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 			<li class="template hidden" data-element="EMAIL">
 				<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
 				<input type="email" required="required" class="nonempty contacts_property" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" />
-				<select class="hidden" multiple="multiple" name="parameters[TYPE][]">
+				<select multiple="multiple" name="parameters[TYPE][]">
 					<?php echo OCP\html_select_options($_['email_types'], array()) ?>
 				</select>
 				<span class="listactions"><a class="action mail" title="<?php echo $l->t('Mail to address'); ?>"></a>

From b819aa33f7d0053155cc382ab03c9cf8124c8a47 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 21 Aug 2012 02:09:12 +0200
Subject: [PATCH 1493/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/pl.php   |  14 ++
 apps/admin_migrate/l10n/da.php            |   4 +
 apps/calendar/l10n/da.php                 |   9 +
 apps/contacts/l10n/fr.php                 |   1 +
 apps/contacts/l10n/pl.php                 |  21 ++-
 apps/files/l10n/ca.php                    |   6 +-
 apps/files/l10n/cs_CZ.php                 |   1 -
 apps/files/l10n/da.php                    |   7 +
 apps/files/l10n/de.php                    |   7 +-
 apps/files/l10n/el.php                    |   1 -
 apps/files/l10n/eo.php                    |   7 +
 apps/files/l10n/es.php                    |   6 +-
 apps/files/l10n/eu.php                    |   7 +
 apps/files/l10n/fi_FI.php                 |   1 -
 apps/files/l10n/fr.php                    |   1 -
 apps/files/l10n/gl.php                    |   7 +
 apps/files/l10n/hu_HU.php                 |   7 +
 apps/files/l10n/it.php                    |   1 -
 apps/files/l10n/ja_JP.php                 |   7 +
 apps/files/l10n/lv.php                    |   1 -
 apps/files/l10n/ms_MY.php                 |   6 +
 apps/files/l10n/pl.php                    |   5 +
 apps/files/l10n/ru.php                    |   1 -
 apps/files/l10n/sl.php                    |   1 -
 apps/files/l10n/sv.php                    |   1 -
 apps/files/l10n/th_TH.php                 |   1 -
 apps/files/l10n/tr.php                    |   1 -
 apps/files/l10n/uk.php                    |   1 -
 apps/files/l10n/zh_CN.GB2312.php          |   1 -
 apps/files/l10n/zh_CN.php                 |   1 -
 apps/files_external/l10n/pl.php           |  18 ++
 apps/files_sharing/l10n/ca.php            |   2 +-
 apps/files_sharing/l10n/cs_CZ.php         |   2 +-
 apps/files_sharing/l10n/de.php            |   2 +-
 apps/files_sharing/l10n/eo.php            |   2 +-
 apps/files_sharing/l10n/et_EE.php         |   2 +-
 apps/files_sharing/l10n/fi_FI.php         |   2 +-
 apps/files_sharing/l10n/fr.php            |   2 +-
 apps/files_sharing/l10n/it.php            |   2 +-
 apps/files_sharing/l10n/ja_JP.php         |   2 +-
 apps/files_sharing/l10n/pl.php            |   2 +-
 apps/files_sharing/l10n/sl.php            |   2 +-
 apps/files_sharing/l10n/sv.php            |   2 +-
 apps/files_sharing/l10n/th_TH.php         |   2 +-
 apps/tasks/l10n/da.php                    |  16 ++
 apps/tasks/l10n/pl.php                    |  24 +++
 apps/user_ldap/l10n/da.php                |   9 +
 apps/user_ldap/l10n/pl.php                |  36 ++++
 apps/user_migrate/l10n/pl.php             |  10 +
 apps/user_openid/l10n/pl.php              |  11 ++
 l10n/af/contacts.po                       | 176 +++++++++---------
 l10n/af/files.po                          |  40 ++--
 l10n/af/files_sharing.po                  |  26 ++-
 l10n/ar/contacts.po                       | 176 +++++++++---------
 l10n/ar/files.po                          |  40 ++--
 l10n/ar/files_sharing.po                  |  26 ++-
 l10n/ar_SA/contacts.po                    | 176 +++++++++---------
 l10n/ar_SA/files.po                       |  40 ++--
 l10n/ar_SA/files_sharing.po               |  26 ++-
 l10n/bg_BG/contacts.po                    | 176 +++++++++---------
 l10n/bg_BG/files.po                       |  40 ++--
 l10n/bg_BG/files_sharing.po               |  26 ++-
 l10n/ca/contacts.po                       | 178 +++++++++---------
 l10n/ca/files.po                          |  50 +++--
 l10n/ca/files_sharing.po                  |  26 ++-
 l10n/ca/settings.po                       |   8 +-
 l10n/cs_CZ/contacts.po                    | 176 +++++++++---------
 l10n/cs_CZ/files.po                       |  40 ++--
 l10n/cs_CZ/files_sharing.po               |  26 ++-
 l10n/da/admin_migrate.po                  |  11 +-
 l10n/da/calendar.po                       |  27 +--
 l10n/da/contacts.po                       | 176 +++++++++---------
 l10n/da/files.po                          |  54 +++---
 l10n/da/files_sharing.po                  |  26 ++-
 l10n/da/settings.po                       |  11 +-
 l10n/da/tasks.po                          |  35 ++--
 l10n/da/user_ldap.po                      |  21 ++-
 l10n/de/contacts.po                       | 118 ++++++------
 l10n/de/files.po                          |  47 +++--
 l10n/de/files_sharing.po                  |  24 ++-
 l10n/el/contacts.po                       | 176 +++++++++---------
 l10n/el/files.po                          |  40 ++--
 l10n/el/files_sharing.po                  |  26 ++-
 l10n/eo/contacts.po                       | 178 +++++++++---------
 l10n/eo/files.po                          |  55 +++---
 l10n/eo/files_sharing.po                  |  26 ++-
 l10n/es/contacts.po                       | 176 +++++++++---------
 l10n/es/files.po                          |  50 +++--
 l10n/es/files_sharing.po                  |  26 ++-
 l10n/et_EE/contacts.po                    | 176 +++++++++---------
 l10n/et_EE/files.po                       |  40 ++--
 l10n/et_EE/files_sharing.po               |  26 ++-
 l10n/eu/contacts.po                       | 176 +++++++++---------
 l10n/eu/files.po                          |  54 +++---
 l10n/eu/files_sharing.po                  |  26 ++-
 l10n/eu_ES/contacts.po                    | 176 +++++++++---------
 l10n/eu_ES/files.po                       |  40 ++--
 l10n/eu_ES/files_sharing.po               |  26 ++-
 l10n/fa/contacts.po                       | 176 +++++++++---------
 l10n/fa/files.po                          |  40 ++--
 l10n/fa/files_sharing.po                  |  26 ++-
 l10n/fi/contacts.po                       | 176 +++++++++---------
 l10n/fi/files.po                          |  40 ++--
 l10n/fi/files_sharing.po                  |  26 ++-
 l10n/fi_FI/contacts.po                    | 176 +++++++++---------
 l10n/fi_FI/files.po                       |  40 ++--
 l10n/fi_FI/files_sharing.po               |  26 ++-
 l10n/fr/contacts.po                       | 180 +++++++++---------
 l10n/fr/files.po                          |  40 ++--
 l10n/fr/files_sharing.po                  |  26 ++-
 l10n/fr/settings.po                       |   9 +-
 l10n/gl/contacts.po                       | 176 +++++++++---------
 l10n/gl/files.po                          |  54 +++---
 l10n/gl/files_sharing.po                  |  26 ++-
 l10n/he/contacts.po                       | 176 +++++++++---------
 l10n/he/files.po                          |  40 ++--
 l10n/he/files_sharing.po                  |  26 ++-
 l10n/hr/contacts.po                       | 176 +++++++++---------
 l10n/hr/files.po                          |  40 ++--
 l10n/hr/files_sharing.po                  |  26 ++-
 l10n/hu_HU/contacts.po                    | 176 +++++++++---------
 l10n/hu_HU/files.po                       |  54 +++---
 l10n/hu_HU/files_sharing.po               |  26 ++-
 l10n/hy/contacts.po                       | 176 +++++++++---------
 l10n/hy/files.po                          |  40 ++--
 l10n/hy/files_sharing.po                  |  26 ++-
 l10n/ia/contacts.po                       | 176 +++++++++---------
 l10n/ia/files.po                          |  40 ++--
 l10n/ia/files_sharing.po                  |  26 ++-
 l10n/id/contacts.po                       | 176 +++++++++---------
 l10n/id/files.po                          |  40 ++--
 l10n/id/files_sharing.po                  |  26 ++-
 l10n/id_ID/contacts.po                    | 176 +++++++++---------
 l10n/id_ID/files.po                       |  40 ++--
 l10n/id_ID/files_sharing.po               |  26 ++-
 l10n/it/contacts.po                       | 178 +++++++++---------
 l10n/it/files.po                          |  40 ++--
 l10n/it/files_sharing.po                  |  26 ++-
 l10n/ja_JP/contacts.po                    | 178 +++++++++---------
 l10n/ja_JP/files.po                       |  54 +++---
 l10n/ja_JP/files_sharing.po               |  26 ++-
 l10n/ja_JP/settings.po                    |   8 +-
 l10n/ko/contacts.po                       | 176 +++++++++---------
 l10n/ko/files.po                          |  40 ++--
 l10n/ko/files_sharing.po                  |  26 ++-
 l10n/lb/contacts.po                       | 176 +++++++++---------
 l10n/lb/files.po                          |  40 ++--
 l10n/lb/files_sharing.po                  |  26 ++-
 l10n/lt_LT/contacts.po                    | 176 +++++++++---------
 l10n/lt_LT/files.po                       |  40 ++--
 l10n/lt_LT/files_sharing.po               |  26 ++-
 l10n/lv/contacts.po                       | 176 +++++++++---------
 l10n/lv/files.po                          |  40 ++--
 l10n/lv/files_sharing.po                  |  26 ++-
 l10n/mk/contacts.po                       | 176 +++++++++---------
 l10n/mk/files.po                          |  40 ++--
 l10n/mk/files_sharing.po                  |  26 ++-
 l10n/ms_MY/contacts.po                    | 176 +++++++++---------
 l10n/ms_MY/files.po                       |  52 +++---
 l10n/ms_MY/files_sharing.po               |  26 ++-
 l10n/nb_NO/contacts.po                    | 176 +++++++++---------
 l10n/nb_NO/files.po                       |  40 ++--
 l10n/nb_NO/files_sharing.po               |  26 ++-
 l10n/nl/contacts.po                       | 176 +++++++++---------
 l10n/nl/files.po                          |  40 ++--
 l10n/nl/files_sharing.po                  |  26 ++-
 l10n/nn_NO/contacts.po                    | 176 +++++++++---------
 l10n/nn_NO/files.po                       |  40 ++--
 l10n/nn_NO/files_sharing.po               |  26 ++-
 l10n/nn_NO/settings.po                    |  20 +-
 l10n/pl/admin_dependencies_chk.po         |  31 ++--
 l10n/pl/contacts.po                       | 214 +++++++++++-----------
 l10n/pl/files.po                          |  50 +++--
 l10n/pl/files_external.po                 |  39 ++--
 l10n/pl/files_sharing.po                  |  26 ++-
 l10n/pl/settings.po                       |  14 +-
 l10n/pl/tasks.po                          |  51 +++---
 l10n/pl/user_ldap.po                      |  75 ++++----
 l10n/pl/user_migrate.po                   |  23 +--
 l10n/pl/user_openid.po                    |  25 +--
 l10n/pt_BR/contacts.po                    | 176 +++++++++---------
 l10n/pt_BR/files.po                       |  40 ++--
 l10n/pt_BR/files_sharing.po               |  26 ++-
 l10n/pt_PT/contacts.po                    | 176 +++++++++---------
 l10n/pt_PT/files.po                       |  40 ++--
 l10n/pt_PT/files_sharing.po               |  26 ++-
 l10n/ro/contacts.po                       | 176 +++++++++---------
 l10n/ro/files.po                          |  40 ++--
 l10n/ro/files_sharing.po                  |  26 ++-
 l10n/ru/contacts.po                       | 176 +++++++++---------
 l10n/ru/files.po                          |  40 ++--
 l10n/ru/files_sharing.po                  |  26 ++-
 l10n/sk_SK/contacts.po                    | 176 +++++++++---------
 l10n/sk_SK/files.po                       |  40 ++--
 l10n/sk_SK/files_sharing.po               |  26 ++-
 l10n/sl/contacts.po                       | 178 +++++++++---------
 l10n/sl/files.po                          |  40 ++--
 l10n/sl/files_sharing.po                  |  26 ++-
 l10n/so/contacts.po                       | 176 +++++++++---------
 l10n/so/files.po                          |  40 ++--
 l10n/so/files_sharing.po                  |  26 ++-
 l10n/sr/contacts.po                       | 176 +++++++++---------
 l10n/sr/files.po                          |  40 ++--
 l10n/sr/files_sharing.po                  |  26 ++-
 l10n/sr@latin/contacts.po                 | 176 +++++++++---------
 l10n/sr@latin/files.po                    |  40 ++--
 l10n/sr@latin/files_sharing.po            |  26 ++-
 l10n/sv/contacts.po                       | 178 +++++++++---------
 l10n/sv/files.po                          |  40 ++--
 l10n/sv/files_sharing.po                  |  26 ++-
 l10n/templates/admin_dependencies_chk.pot |   2 +-
 l10n/templates/admin_migrate.pot          |   2 +-
 l10n/templates/bookmarks.pot              |   2 +-
 l10n/templates/calendar.pot               |   4 +-
 l10n/templates/contacts.pot               | 114 ++++++------
 l10n/templates/core.pot                   |   2 +-
 l10n/templates/files.pot                  |  36 ++--
 l10n/templates/files_encryption.pot       |   2 +-
 l10n/templates/files_external.pot         |   2 +-
 l10n/templates/files_sharing.pot          |  22 ++-
 l10n/templates/files_versions.pot         |   2 +-
 l10n/templates/gallery.pot                |   4 +-
 l10n/templates/lib.pot                    |  10 +-
 l10n/templates/media.pot                  |   2 +-
 l10n/templates/settings.pot               |   2 +-
 l10n/templates/tasks.pot                  |   2 +-
 l10n/templates/user_ldap.pot              |   2 +-
 l10n/templates/user_migrate.pot           |   2 +-
 l10n/templates/user_openid.pot            |   2 +-
 l10n/th_TH/contacts.po                    | 118 ++++++------
 l10n/th_TH/files.po                       |  40 ++--
 l10n/th_TH/files_sharing.po               |  26 ++-
 l10n/tr/contacts.po                       | 176 +++++++++---------
 l10n/tr/files.po                          |  40 ++--
 l10n/tr/files_sharing.po                  |  26 ++-
 l10n/uk/contacts.po                       | 176 +++++++++---------
 l10n/uk/files.po                          |  40 ++--
 l10n/uk/files_sharing.po                  |  26 ++-
 l10n/vi/contacts.po                       | 176 +++++++++---------
 l10n/vi/files.po                          |  40 ++--
 l10n/vi/files_sharing.po                  |  26 ++-
 l10n/zh_CN.GB2312/contacts.po             | 176 +++++++++---------
 l10n/zh_CN.GB2312/files.po                |  40 ++--
 l10n/zh_CN.GB2312/files_sharing.po        |  26 ++-
 l10n/zh_CN/contacts.po                    | 176 +++++++++---------
 l10n/zh_CN/files.po                       |  40 ++--
 l10n/zh_CN/files_sharing.po               |  26 ++-
 l10n/zh_TW/contacts.po                    | 176 +++++++++---------
 l10n/zh_TW/files.po                       |  40 ++--
 l10n/zh_TW/files_sharing.po               |  26 ++-
 settings/l10n/ca.php                      |   1 +
 settings/l10n/da.php                      |   2 +
 settings/l10n/fr.php                      |   1 +
 settings/l10n/ja_JP.php                   |   1 +
 settings/l10n/nn_NO.php                   |   7 +
 settings/l10n/pl.php                      |   4 +
 256 files changed, 7612 insertions(+), 6693 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/pl.php
 create mode 100644 apps/admin_migrate/l10n/da.php
 create mode 100644 apps/files_external/l10n/pl.php
 create mode 100644 apps/tasks/l10n/da.php
 create mode 100644 apps/tasks/l10n/pl.php
 create mode 100644 apps/user_ldap/l10n/da.php
 create mode 100644 apps/user_ldap/l10n/pl.php
 create mode 100644 apps/user_migrate/l10n/pl.php
 create mode 100644 apps/user_openid/l10n/pl.php

diff --git a/apps/admin_dependencies_chk/l10n/pl.php b/apps/admin_dependencies_chk/l10n/pl.php
new file mode 100644
index 0000000000..e40d23cb7e
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/pl.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Moduł php-json jest wymagane przez wiele aplikacji do wewnętrznej łączności",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modude php-curl jest wymagany do pobrania tytułu strony podczas dodawania zakładki",
+"The php-gd module is needed to create thumbnails of your images" => "Moduł php-gd jest wymagany do tworzenia miniatury obrazów",
+"The php-ldap module is needed connect to your ldap server" => "Moduł php-ldap jest wymagany aby połączyć się z serwerem ldap",
+"The php-zip module is needed download multiple files at once" => "Moduł php-zip jest wymagany aby pobrać wiele plików na raz",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Moduł php-mb_multibyte jest wymagany do poprawnego zarządzania kodowaniem.",
+"The php-ctype module is needed validate data." => "Moduł php-ctype jest wymagany do sprawdzania poprawności danych.",
+"The php-xml module is needed to share files with webdav." => "Moduł php-xml jest wymagany do udostępniania plików przy użyciu protokołu webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Dyrektywy allow_url_fopen użytkownika php.ini powinna być ustawiona na 1 do pobierania bazy wiedzy  z serwerów OCS",
+"The php-pdo module is needed to store owncloud data into a database." => "Moduł php-pdo jest wymagany do przechowywania danych owncloud w bazie danych.",
+"Dependencies status" => "Stan zależności",
+"Used by :" => "Używane przez:"
+);
diff --git a/apps/admin_migrate/l10n/da.php b/apps/admin_migrate/l10n/da.php
new file mode 100644
index 0000000000..a33635cdc1
--- /dev/null
+++ b/apps/admin_migrate/l10n/da.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Eksporter ownCloud instans",
+"Export" => "Eksporter"
+);
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index 789765fec4..ea07fadb73 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -1,7 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Ikke alle kalendere er fuldstændig cached",
 "No calendars found." => "Der blev ikke fundet nogen kalendere.",
 "No events found." => "Der blev ikke fundet nogen begivenheder.",
 "Wrong calendar" => "Forkert kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Filen indeholdt enten ingen begivenheder eller alle begivenheder er allerede gemt i din kalender.",
+"events has been saved in the new calendar" => "begivenheder er gemt i den nye kalender",
+"Import failed" => "import mislykkedes",
+"events has been saved in your calendar" => "begivenheder er gemt i din kalender",
 "New Timezone:" => "Ny tidszone:",
 "Timezone changed" => "Tidszone ændret",
 "Invalid request" => "Ugyldig forespørgsel",
@@ -106,6 +111,7 @@
 "Month" => "Måned",
 "List" => "Liste",
 "Today" => "I dag",
+"Settings" => "Indstillinger",
 "Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-link",
 "Shared calendars" => "Delte kalendere",
@@ -158,6 +164,7 @@
 "Import a calendar file" => "Importer en kalenderfil",
 "Please choose a calendar" => "Vælg en kalender",
 "Name of new calendar" => "Navn på ny kalender",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "En kalender med dette navn findes allerede. Hvis du fortsætter alligevel, vil disse kalendere blive sammenlagt.",
 "Import" => "Importer",
 "Close Dialog" => "Luk dialog",
 "Create a new event" => "Opret en ny begivenhed",
@@ -165,7 +172,9 @@
 "No categories selected" => "Ingen categorier valgt",
 "of" => "fra",
 "at" => "kl.",
+"General" => "Generel",
 "Timezone" => "Tidszone",
+"Update timezone automatically" => "Opdater tidszone automatisk",
 "24h" => "24T",
 "12h" => "12T",
 "more info" => "flere oplysninger",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index eba0fff150..9b30a9fcff 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -62,6 +62,7 @@
 "Error loading profile picture." => "Erreur pendant le chargement de la photo de profil.",
 "Select type" => "Sélectionner un type",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.",
+"Do you want to merge these address books?" => "Voulez-vous fusionner ces carnets d'adresses ?",
 "Result: " => "Résultat :",
 " imported, " => "importé,",
 " failed." => "échoué.",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 5b26324007..404687b4fa 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -59,10 +59,15 @@
 "Edit name" => "Zmień nazwę",
 "No files selected for upload." => "Żadne pliki nie zostały zaznaczone do wysłania.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze.",
+"Error loading profile picture." => "Błąd wczytywania zdjęcia profilu.",
 "Select type" => "Wybierz typ",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Niektóre kontakty są zaznaczone do usunięcia, ale nie są usunięte jeszcze. Proszę czekać na ich usunięcie.",
+"Do you want to merge these address books?" => "Czy chcesz scalić te książki adresowe?",
 "Result: " => "Wynik: ",
 " imported, " => " importowane, ",
 " failed." => "  nie powiodło się.",
+"Displayname cannot be empty." => "Nazwa nie może być pusta.",
+"Addressbook not found: " => "Nie znaleziono książki adresowej:",
 "This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
 "Address" => "Adres",
@@ -81,10 +86,13 @@
 "Internet" => "Internet",
 "Birthday" => "Urodziny",
 "Business" => "Biznesowe",
+"Call" => "Wywołanie",
 "Clients" => "Klienci",
+"Deliverer" => "Doręczanie",
 "Holidays" => "Święta",
 "Ideas" => "Pomysły",
 "Journey" => "Podróż",
+"Jubilee" => "Jubileusz",
 "Meeting" => "Spotkanie",
 "Other" => "Inne",
 "Personal" => "Osobiste",
@@ -101,6 +109,9 @@
 "Navigation" => "Nawigacja",
 "Next contact in list" => "Następny kontakt na liście",
 "Previous contact in list" => "Poprzedni kontakt na liście",
+"Expand/collapse current addressbook" => "Rozwiń/Zwiń bieżącą książkę adresową",
+"Next addressbook" => "Następna książka adresowa",
+"Previous addressbook" => "Poprzednia książka adresowa",
 "Actions" => "Akcje",
 "Refresh contacts list" => "Odśwież listę kontaktów",
 "Add new contact" => "Dodaj nowy kontakt",
@@ -142,10 +153,13 @@
 "Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
+"Street address" => "Ulica",
 "Street and number" => "Ulica i numer",
 "Extended" => "Rozszerzony",
+"Apartment number etc." => "Numer lokalu",
 "City" => "Miasto",
 "Region" => "Region",
+"E.g. state or province" => "Np. stanu lub prowincji",
 "Zipcode" => "Kod pocztowy",
 "Postal code" => "Kod pocztowy",
 "Country" => "Kraj",
@@ -184,9 +198,14 @@
 "more info" => "więcej informacji",
 "Primary address (Kontact et al)" => "Pierwszy adres",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Pokaż link CardDAV",
+"Show read-only VCF link" => "Pokaż tylko do odczytu łącze VCF",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
 "New Address Book" => "Nowa książka adresowa",
+"Name" => "Nazwa",
+"Description" => "Opis",
 "Save" => "Zapisz",
-"Cancel" => "Anuluj"
+"Cancel" => "Anuluj",
+"More..." => "Więcej..."
 );
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 35be269269..81bbfe03a0 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,8 +7,12 @@
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Files" => "Fitxers",
-"Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
+"already exists" => "ja existeix",
+"replace" => "substitueix",
+"cancel" => "cancel·la",
+"replaced" => "substituït",
+"with" => "per",
 "undo" => "desfés",
 "deleted" => "esborrat",
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index adf8dc3170..4dc4b8b0cb 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
 "Failed to write to disk" => "Zápis na disk se nezdařil",
 "Files" => "Soubory",
-"Unshare" => "Odsdílet",
 "Delete" => "Vymazat",
 "already exists" => "již existuje",
 "replace" => "zaměnit",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index d24e2a8dcb..56af0fa61d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Files" => "Filer",
 "Delete" => "Slet",
+"already exists" => "findes allerede",
+"replace" => "erstat",
+"cancel" => "fortryd",
+"replaced" => "erstattet",
+"with" => "med",
+"undo" => "fortryd",
+"deleted" => "Slettet",
 "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
 "Upload Error" => "Fejl ved upload",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 9569735d54..7eafab2f0c 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -7,12 +7,11 @@
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf Festplatte",
 "Files" => "Dateien",
-"Unshare" => "Nicht mehr teilen",
 "Delete" => "Löschen",
 "already exists" => "ist bereits vorhanden",
-"replace" => "Ersetzen",
-"cancel" => "Abbrechen",
-"replaced" => "Ersetzt",
+"replace" => "ersetzen",
+"cancel" => "abbrechen",
+"replaced" => "ersetzt",
 "with" => "mit",
 "undo" => "rückgängig machen",
 "deleted" => "gelöscht",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 57ba31e92b..3ab4b12094 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος",
 "Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε",
 "Files" => "Αρχεία",
-"Unshare" => "Ακύρωση Διαμοιρασμού",
 "Delete" => "Διαγραφή",
 "already exists" => "υπάρχει ήδη",
 "replace" => "αντικατέστησε",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index fa9e5eca42..acaf06e830 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Files" => "Dosieroj",
 "Delete" => "Forigi",
+"already exists" => "jam ekzistas",
+"replace" => "anstataŭigi",
+"cancel" => "nuligi",
+"replaced" => "anstataŭigita",
+"with" => "kun",
+"undo" => "malfari",
+"deleted" => "forigita",
 "generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Upload Error" => "Alŝuta eraro",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 6b6414f925..6cd51d60e2 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,8 +7,12 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
-"Unshare" => "No compartir",
 "Delete" => "Eliminado",
+"already exists" => "ya existe",
+"replace" => "reemplazar",
+"cancel" => "cancelar",
+"replaced" => "reemplazado",
+"with" => "con",
 "undo" => "deshacer",
 "deleted" => "borrado",
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 588df210a1..d9c2689d1c 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
 "Delete" => "Ezabatu",
+"already exists" => "dagoeneko existitzen da",
+"replace" => "ordeztu",
+"cancel" => "ezeztatu",
+"replaced" => "ordeztua",
+"with" => "honekin",
+"undo" => "desegin",
+"deleted" => "ezabatuta",
 "generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
 "Upload Error" => "Igotzean errore bat suertatu da",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 9e4be5b38a..625496dad9 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Files" => "Tiedostot",
-"Unshare" => "Lopeta jakaminen",
 "Delete" => "Poista",
 "already exists" => "on jo olemassa",
 "replace" => "korvaa",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 70af377b17..6eb4341bd6 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Files" => "Fichiers",
-"Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
 "already exists" => "existe déjà",
 "replace" => "remplacer",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index cbbd65217b..3a36a23f0c 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Erro ao escribir no disco",
 "Files" => "Ficheiros",
 "Delete" => "Eliminar",
+"already exists" => "xa existe",
+"replace" => "substituír",
+"cancel" => "cancelar",
+"replaced" => "substituído",
+"with" => "con",
+"undo" => "desfacer",
+"deleted" => "eliminado",
 "generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
 "Upload Error" => "Erro na subida",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 22d3958516..8d52765e93 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
 "Delete" => "Törlés",
+"already exists" => "már létezik",
+"replace" => "cserél",
+"cancel" => "mégse",
+"replaced" => "kicserélve",
+"with" => "-val/-vel",
+"undo" => "visszavon",
+"deleted" => "törölve",
 "generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
 "Upload Error" => "Feltöltési hiba",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 8764ff4550..6fda30a8f3 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Files" => "File",
-"Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
 "already exists" => "esiste già",
 "replace" => "sostituisci",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 231bbe3dcb..8c19e45501 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Files" => "ファイル",
 "Delete" => "削除",
+"already exists" => "既に存在します",
+"replace" => "置き換え",
+"cancel" => "キャンセル",
+"replaced" => "置換：",
+"with" => "←",
+"undo" => "元に戻す",
+"deleted" => "削除",
 "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
 "Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
 "Upload Error" => "アップロードエラー",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 3fa3246d7c..54bd79f552 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Files" => "Faili",
-"Unshare" => "Pārtraukt līdzdalīšanu",
 "Delete" => "Izdzēst",
 "Upload Error" => "Augšuplādēšanas laikā radās kļūda",
 "Pending" => "Gaida savu kārtu",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index f0870c79ed..de472a7c65 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -8,6 +8,12 @@
 "Failed to write to disk" => "Gagal untuk disimpan",
 "Files" => "fail",
 "Delete" => "Padam",
+"already exists" => "Sudah wujud",
+"replace" => "ganti",
+"cancel" => "Batal",
+"replaced" => "diganti",
+"with" => "dengan",
+"deleted" => "dihapus",
 "generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
 "Upload Error" => "Muat naik ralat",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 811e983bb9..eb791330bf 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -8,6 +8,11 @@
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
 "Delete" => "Usuwa element",
+"already exists" => "Już istnieje",
+"replace" => "zastap",
+"cancel" => "anuluj",
+"replaced" => "zastąpione",
+"with" => "z",
 "undo" => "wróć",
 "deleted" => "skasuj",
 "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 145dc6ce0b..02bd74249d 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
-"Unshare" => "Снять общий доступ",
 "Delete" => "Удалить",
 "undo" => "отмена",
 "deleted" => "удален",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 99ab3c124b..f6322b2507 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Files" => "Datoteke",
-"Unshare" => "Vzemi iz souporabe",
 "Delete" => "Izbriši",
 "already exists" => "že obstaja",
 "replace" => "nadomesti",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 24784c2904..2a7763bc9b 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
-"Unshare" => "Sluta dela",
 "Delete" => "Ta bort",
 "already exists" => "finns redan",
 "replace" => "ersätt",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 03a50fd711..eed9c36e13 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
-"Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
 "already exists" => "มีอยู่แล้ว",
 "replace" => "แทนที่",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index faa5cc10b7..224322b24e 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
-"Unshare" => "Paylaşılmayan",
 "Delete" => "Sil",
 "undo" => "geri al",
 "deleted" => "silindi",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 0b535bf384..dc7e9d18b7 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,7 +6,6 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
-"Unshare" => "Заборонити доступ",
 "Delete" => "Видалити",
 "undo" => "відмінити",
 "deleted" => "видалені",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 2026becc4d..6703e6f908 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "丢失了一个临时文件夹",
 "Failed to write to disk" => "写磁盘失败",
 "Files" => "文件",
-"Unshare" => "未分享的",
 "Delete" => "删除",
 "already exists" => "已经存在了",
 "replace" => "替换",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index e4f015d40b..8ef7ff39c8 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,7 +7,6 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Files" => "文件",
-"Unshare" => "取消共享",
 "Delete" => "删除",
 "already exists" => "已经存在",
 "replace" => "替换",
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
new file mode 100644
index 0000000000..df0ed54e80
--- /dev/null
+++ b/apps/files_external/l10n/pl.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Zewnętrzna zasoby dyskowe",
+"Mount point" => "Punkt montowania",
+"Backend" => "Zaplecze",
+"Configuration" => "Konfiguracja",
+"Options" => "Opcje",
+"Applicable" => "Zastosowanie",
+"Add mount point" => "Dodaj punkt montowania",
+"None set" => "Nie ustawione",
+"All Users" => "Wszyscy uzytkownicy",
+"Groups" => "Grupy",
+"Users" => "Użytkownicy",
+"Delete" => "Usuń",
+"SSL root certificates" => "Główny certyfikat SSL",
+"Import Root Certificate" => "Importuj główny certyfikat",
+"Enable User External Storage" => "Włącz zewnętrzne zasoby dyskowe użytkownika",
+"Allow users to mount their own external storage" => "Zezwalaj użytkownikom na montowanie  ich własnych zewnętrznych zasobów dyskowych"
+);
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 02d554c7f5..4501f4ae3d 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Elimina",
 "Your Shared Files" => "Els vostres fitxers compartits",
 "Item" => "Element",
 "Shared With" => "Compartit amb",
 "Permissions" => "Permisos",
 "Read" => "Llegeix",
 "Edit" => "Edita",
-"Delete" => "Elimina",
 "Enable Resharing" => "Permet compartir amb tercers",
 "Allow users to reshare files they don't own" => "Permet als usuaris compartir fitxers que no són seus"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 6817d07a47..691f362430 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Smazat",
 "Your Shared Files" => "Vaše sdílené soubory",
 "Item" => "Položka",
 "Shared With" => "Sdíleno s:",
 "Permissions" => "Práva",
 "Read" => "Číst",
 "Edit" => "Editovat",
-"Delete" => "Smazat",
 "Enable Resharing" => "Povolit další sdílení",
 "Allow users to reshare files they don't own" => "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index d0526c0f3c..26da53e833 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Löschen",
 "Your Shared Files" => "Ihre geteilten Dateien",
 "Item" => "Objekt",
 "Shared With" => "Teilen mit",
 "Permissions" => "Berechtigungen",
 "Read" => "Lesen",
 "Edit" => "Bearbeiten",
-"Delete" => "Löschen",
 "Enable Resharing" => "Austausch ermöglichen",
 "Allow users to reshare files they don't own" => "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
 );
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 6af1ef53d0..e441f03881 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Forigi",
 "Your Shared Files" => "Viaj kunhavigitaj dosieroj",
 "Item" => "Ero",
 "Shared With" => "Kunhavigita kun",
 "Permissions" => "Permesoj",
 "Read" => "Legi",
 "Edit" => "Redakti",
-"Delete" => "Forigi",
 "Enable Resharing" => "Kapabligi rekunhavigon",
 "Allow users to reshare files they don't own" => "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
 );
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index bdfa215e1d..effa5cbfed 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Kustutamine",
 "Your Shared Files" => "Sinu jagatud failid",
 "Item" => "Kirje",
 "Shared With" => "Kellega jagatud",
 "Permissions" => "Õigused",
 "Read" => "Lugemine",
 "Edit" => "Muutmine",
-"Delete" => "Kustutamine",
 "Enable Resharing" => "Luba edasijagamine",
 "Allow users to reshare files they don't own" => "Luba kasutajatel jagada faile, mis pole nende omad"
 );
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index de25ecf108..bd5ccfbf6a 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Poisto",
 "Your Shared Files" => "Jakamasi tiedostot",
 "Permissions" => "Oikeudet",
 "Read" => "Luku",
 "Edit" => "Muokkaus",
-"Delete" => "Poisto",
 "Enable Resharing" => "Käytä uudelleenjakoa",
 "Allow users to reshare files they don't own" => "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 47219c0080..347c59a088 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Effacement",
 "Your Shared Files" => "Vos documents partagés",
 "Item" => "Item",
 "Shared With" => "Partagé avec",
 "Permissions" => "Permissions",
 "Read" => "Lecture",
 "Edit" => "Édition",
-"Delete" => "Effacement",
 "Enable Resharing" => "Permettre le repartage",
 "Allow users to reshare files they don't own" => "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 8dc20efdf7..1afcdc5199 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Eliminazione",
 "Your Shared Files" => "I tuoi file condivisi",
 "Item" => "Elemento",
 "Shared With" => "Condiviso con",
 "Permissions" => "Permessi",
 "Read" => "Lettura",
 "Edit" => "Modifica",
-"Delete" => "Eliminazione",
 "Enable Resharing" => "Abilita ri-condivisione",
 "Allow users to reshare files they don't own" => "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index bc58aa9863..a38b457aae 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "削除",
 "Your Shared Files" => "共有ファイル",
 "Item" => "項目",
 "Shared With" => "で共有 ",
 "Permissions" => "許可",
 "Read" => "読込",
 "Edit" => "編集",
-"Delete" => "削除",
 "Enable Resharing" => "再共有を有効にする",
 "Allow users to reshare files they don't own" => "所有者でないファイルの共有を許可する"
 );
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index e087d4a293..508a58b3ee 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Usuń",
 "Your Shared Files" => "Twoje udostępnione pliki",
 "Item" => "Element",
 "Shared With" => "Udostępnione dla",
 "Permissions" => "Uprawnienia",
 "Read" => "Odczyt",
 "Edit" => "Edycja",
-"Delete" => "Usuń",
 "Enable Resharing" => "Włącz ponowne udostępnianie",
 "Allow users to reshare files they don't own" => "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index a2a1a2b1a9..607ec91a26 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Izbris",
 "Your Shared Files" => "Vaše datoteke v souporabi",
 "Item" => "Predmet",
 "Shared With" => "V souporabi z",
 "Permissions" => "Dovoljenja",
 "Read" => "Branje",
 "Edit" => "Pisanje",
-"Delete" => "Izbris",
 "Enable Resharing" => "Omogoči nadaljnjo izmenjavo",
 "Allow users to reshare files they don't own" => "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 8eb48c3b6d..d053d9b4df 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "Radera",
 "Your Shared Files" => "Dina delade filer",
 "Item" => "Objekt",
 "Shared With" => "Delad med",
 "Permissions" => "Rättigheter",
 "Read" => "Läsa",
 "Edit" => "Ändra",
-"Delete" => "Radera",
 "Enable Resharing" => "Aktivera dela vidare",
 "Allow users to reshare files they don't own" => "Tillåter användare att dela filer som dom inte äger"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 2ff9111234..834852f70d 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Delete" => "ลบ",
 "Your Shared Files" => "ไฟล์ของคุณที่แชร์ไว้",
 "Item" => "ไอเท็ม",
 "Shared With" => "แชร์พร้อมกับ",
 "Permissions" => "สิทธิ์การเข้าใช้งาน",
 "Read" => "อ่าน",
 "Edit" => "แก้ไข",
-"Delete" => "ลบ",
 "Enable Resharing" => "เปิดให้มีการแชร์ใหม่อีกครั้งได้",
 "Allow users to reshare files they don't own" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
 );
diff --git a/apps/tasks/l10n/da.php b/apps/tasks/l10n/da.php
new file mode 100644
index 0000000000..a413f22d17
--- /dev/null
+++ b/apps/tasks/l10n/da.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Ugyldig dato/tid",
+"Tasks" => "Opgaver",
+"No category" => "Ingen kategori",
+"Unspecified" => "Uspecificeret",
+"1=highest" => "1=højeste",
+"5=medium" => "5=mellem",
+"9=lowest" => "9=laveste",
+"Empty Summary" => "Tom beskrivelse",
+"Add Task" => "Tilføj opgave",
+"Loading tasks..." => "Indlæser opgaver...",
+"Important" => "vigtigt",
+"More" => "Mere",
+"Less" => "Mindre",
+"Delete" => "Slet"
+);
diff --git a/apps/tasks/l10n/pl.php b/apps/tasks/l10n/pl.php
new file mode 100644
index 0000000000..4879628486
--- /dev/null
+++ b/apps/tasks/l10n/pl.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Zła data/czas",
+"Tasks" => "Zadania",
+"No category" => "Brak kategorii",
+"Unspecified" => "Nieokreślona",
+"1=highest" => "1=najwyższy",
+"5=medium" => "5=średni",
+"9=lowest" => "9=mało ważny ",
+"Empty Summary" => "Podsumowanie puste",
+"Invalid percent complete" => "Nieprawidłowy procent wykonania",
+"Invalid priority" => "Nieprawidłowy priorytet",
+"Add Task" => "Dodaj zadanie",
+"Order Due" => "Kolejność - domyślna",
+"Order List" => "Kolejność - wg lista",
+"Order Complete" => "Kolejność - wg kompletności",
+"Order Location" => "Kolejność - wg lokalizacja",
+"Order Priority" => "Kolejność - wg priorytetu",
+"Order Label" => "Kolejność - wg nazywy",
+"Loading tasks..." => "Ładuję zadania",
+"Important" => "Ważne",
+"More" => "Więcej",
+"Less" => "Mniej",
+"Delete" => "Usuń"
+);
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
new file mode 100644
index 0000000000..f01c7b7110
--- /dev/null
+++ b/apps/user_ldap/l10n/da.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"Base DN" => "Base DN",
+"Password" => "Kodeord",
+"Port" => "Port",
+"Use TLS" => "Brug TLS",
+"Not recommended, use for testing only." => "Anbefales ikke, brug kun for at teste.",
+"Help" => "Hjælp"
+);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
new file mode 100644
index 0000000000..fa7618d68d
--- /dev/null
+++ b/apps/user_ldap/l10n/pl.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
+"Base DN" => "Baza DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane",
+"User DN" => "Użytkownik DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste",
+"Password" => "Hasło",
+"For anonymous access, leave DN and Password empty." => "Dla dostępu anonimowego pozostawić DN i hasło puste.",
+"User Login Filter" => "Filtr logowania użytkownika",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Użyj %%uid zastępczy, np. \"uid=%%uid\"",
+"User List Filter" => "Lista filtrów użytkownika",
+"Defines the filter to apply, when retrieving users." => "Definiuje filtry do zastosowania, podczas pobierania użytkowników.",
+"without any placeholder, e.g. \"objectClass=person\"." => "bez żadnych symboli zastępczych np. \"objectClass=person\".",
+"Group Filter" => "Grupa filtrów",
+"Defines the filter to apply, when retrieving groups." => "Definiuje filtry do zastosowania, podczas pobierania grup.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Base User Tree" => "Drzewo bazy użytkowników",
+"Base Group Tree" => "Drzewo bazy grup",
+"Group-Member association" => "Członek grupy stowarzyszenia",
+"Use TLS" => "Użyj TLS",
+"Do not use it for SSL connections, it will fail." => "Nie używaj SSL dla połączeń, jeśli się nie powiedzie.",
+"Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)",
+"Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud.",
+"Not recommended, use for testing only." => "Niezalecane, użyj tylko testowo.",
+"User Display Name Field" => "Pole wyświetlanej nazwy użytkownika",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud.",
+"Group Display Name Field" => "Pole wyświetlanej nazwy grupy",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atrybut LDAP służy do generowania nazwy grup ownCloud.",
+"in bytes" => "w bajtach",
+"in seconds. A change empties the cache." => "w sekundach. Zmiana opróżnia pamięć podręczną.",
+"Help" => "Pomoc"
+);
diff --git a/apps/user_migrate/l10n/pl.php b/apps/user_migrate/l10n/pl.php
new file mode 100644
index 0000000000..c3a6332578
--- /dev/null
+++ b/apps/user_migrate/l10n/pl.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Eksport",
+"Something went wrong while the export file was being generated" => "Coś poszło źle, podczas generowania pliku eksportu",
+"An error has occurred" => "Wystąpił błąd",
+"Export your user account" => "Eksportuj konto użytkownika",
+"This will create a compressed file that contains your ownCloud account." => "Spowoduje to utworzenie pliku skompresowanego, który zawiera konto ownCloud.",
+"Import user account" => "Importuj konto użytkownika",
+"ownCloud User Zip" => "paczka Zip użytkownika ownCloud",
+"Import" => "Importuj"
+);
diff --git a/apps/user_openid/l10n/pl.php b/apps/user_openid/l10n/pl.php
new file mode 100644
index 0000000000..c9572851e3
--- /dev/null
+++ b/apps/user_openid/l10n/pl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "To jest punkt końcowy serwera OpenID. Aby uzyskać więcej informacji zobacz",
+"Identity: <b>" => "Tożsamość: <b>",
+"Realm: <b>" => "Obszar: <b>",
+"User: <b>" => "Użytkownik: <b>",
+"Login" => "Login",
+"Error: <b>No user Selected" => "Błąd:<b>Nie wybrano użytkownika",
+"you can authenticate to other sites with this address" => "można uwierzytelniać do innych witryn z tego adresu",
+"Authorized OpenID provider" => "Autoryzowani dostawcy OpenID",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Twój adres na Wordpress, Identi.ca, &hellip;"
+);
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 25b3d8aadc..760bab094e 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/af/files.po b/l10n/af/files.po
index 0c8cce8a4a..b683bb7b55 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index c30e3dcd42..8f88820c4b 100644
--- a/l10n/af/files_sharing.po
+++ b/l10n/af/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index b026dc0230..3b99e83b16 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "المعارف"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "تاريخ الميلاد"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "مفضل"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "الهاتف"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "انزال المعرفه"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "امحي المعرفه"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "انزال"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "تعديل"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "كتاب عناوين جديد"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "الغاء"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 1e85ee962b..36056ab59e 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "الملفات"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "محذوف"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index e96e0f5ef9..a2933e5cac 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 93e9885284..6c1c631f18 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index 84a992f187..1e89550f0e 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index 426f4c0423..fb8a5415dc 100644
--- a/l10n/ar_SA/files_sharing.po
+++ b/l10n/ar_SA/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 5cfc246c8a..e5eb5903fe 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 3e542a9008..d016c1a31f 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Грешка при запис на диска"
 msgid "Files"
 msgstr "Файлове"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Грешка при качване"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Качването е отменено."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неправилно име – \"/\" не е позволено."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "папка"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "папки"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 0682eb7965..2d86e00c23 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 1eeeca3602..191a5a532a 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 07:15+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -220,7 +220,7 @@ msgstr "No s'ha pogut carregar la imatge temporal: "
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contactes"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Error"
 
@@ -254,41 +254,41 @@ msgstr "Aquesta propietat no pot ser buida."
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Error en carregar la imatge de perfil."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "Voleu fusionar aquestes llibretes d'adreces?"
 
@@ -304,7 +304,7 @@ msgstr " importat, "
 msgid " failed."
 msgstr " fallada."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "El nom a mostrar no pot ser buit"
 
@@ -312,125 +312,125 @@ msgstr "El nom a mostrar no pot ser buit"
 msgid "Addressbook not found: "
 msgstr "No s'ha trobat la llibreta d'adreces: "
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Negocis"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Trucada"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Emissari"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Idees"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Viatge"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Aniversari"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Reunió"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Preguntes"
 
@@ -530,113 +530,113 @@ msgstr "Carrega una foto nova"
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Edita detalls del nom"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Escriviu el sobrenom"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Adreça web"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Vés a la web"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separeu els grups amb comes"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Edita els grups"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferit"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Especifiqueu una adreça de correu electrònic correcta"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Escriviu una adreça de correu electrònic"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Envia per correu electrònic a l'adreça"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Elimina l'adreça de correu electrònic"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Escriviu el número de telèfon"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Elimina el número de telèfon"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Visualitza al mapa"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Edita els detalls de l'adreça"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Afegiu notes aquí."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Afegeix un camp"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telèfon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Baixa el contacte"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Suprimeix el contacte"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr "Mostra l'enllaç VCF només de lectura"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Edita"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nova llibreta d'adreces"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nom"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Descripció"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Desa"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Més..."
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index a453eb9803..aa8f41dca0 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,87 +53,83 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Deixa de compartir"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Suprimeix"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "ja existeix"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "substitueix"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "cancel·la"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "substituït"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "per"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "esborrat"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Error en la pujada"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Pendents"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "El nom no és vàlid, no es permet '/'."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "carpeta"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "carpetes"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fitxer"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "fitxers"
 
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index e4bd92a499..e1b74ca789 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 18:21+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Elimina"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Els vostres fitxers compartits"
@@ -42,10 +58,6 @@ msgstr "Llegeix"
 msgid "Edit"
 msgstr "Edita"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Elimina"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Permet compartir amb tercers"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index a2e064f801..dfacbada2c 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 07:27+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgstr "Altre"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grup Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index fefba5eec4..34b971778a 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "Nemohu načíst dočasný obrázek: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslán. Neznámá chyba"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Nelze získat platnou adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Chyba"
 
@@ -255,41 +255,41 @@ msgstr "Tento parametr nemuže zůstat nevyplněn."
 msgid "Couldn't serialize elements."
 msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Upravit jméno"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Chyba při otevírání obrázku profilu"
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Vybrat typ"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr "importováno v pořádku,"
 msgid " failed."
 msgstr "neimportováno."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Zobrazované jméno nemůže zůstat prázdné."
 
@@ -313,125 +313,125 @@ msgstr "Zobrazované jméno nemůže zůstat prázdné."
 msgid "Addressbook not found: "
 msgstr "Adresář nenalezen:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Pracovní"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Volat"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Dodavatel"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Nápady"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Cestování"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Schůzka"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Ostatní"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Osobní"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Dotazy"
 
@@ -531,113 +531,113 @@ msgstr "Nahrát novou fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Upravit podrobnosti jména"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Odstranit"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Zadejte přezdívku"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Web"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Přejít na web"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Oddělte skupiny čárkami"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Upravit skupiny"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferovaný"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Prosím zadejte platnou e-mailovou adresu"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Zadat e-mailovou adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Odeslat na adresu"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Smazat e-mail"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Zadat telefoní číslo"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Smazat telefoní číslo"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Upravit podrobnosti adresy"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Zde můžete připsat poznámky."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Přidat políčko"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Stáhnout kontakt"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr "Zobrazit odkaz VCF pouze pro čtení"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Stažení"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editovat"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nový adresář"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Název"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Popis"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Storno"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Více..."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index ce5a00fe06..77f16b10d6 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 09:26+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Zápis na disk se nezdařil"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Odsdílet"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Vymazat"
 
@@ -81,59 +77,59 @@ msgstr "zaměněno"
 msgid "with"
 msgstr "s"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "smazáno"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "generuji ZIP soubor, může to chvíli trvat"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemohu nahrát váš soubor neboť to je adresář a nebo má nulovou délku."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Chyba při nahrávání"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Očekává se"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Nahrávání zrušeno"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Špatné jméno, znak '/' není povolen"
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "adresář"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "adresáře"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "soubor"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "soubory"
 
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 26ba61410b..d03c9e0a9c 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 10:38+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Smazat"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Vaše sdílené soubory"
@@ -42,10 +58,6 @@ msgstr "Číst"
 msgid "Edit"
 msgstr "Editovat"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Smazat"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Povolit další sdílení"
diff --git a/l10n/da/admin_migrate.po b/l10n/da/admin_migrate.po
index e597d849d4..33fa6f7920 100644
--- a/l10n/da/admin_migrate.po
+++ b/l10n/da/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sr@ybnet.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 14:56+0000\n"
+"Last-Translator: ressel <sr@ybnet.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Eksporter ownCloud instans"
 
 #: templates/settings.php:4
 msgid ""
@@ -29,4 +30,4 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Eksporter"
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index b336da6b45..5933d87709 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -6,15 +6,16 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+#   <sr@ybnet.dk>, 2012.
 # Thomas Tanghus <>, 2012.
 # Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 14:34+0000\n"
+"Last-Translator: ressel <sr@ybnet.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Ikke alle kalendere er fuldstændig cached"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
@@ -46,19 +47,19 @@ msgstr "Forkert kalender"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Filen indeholdt enten ingen begivenheder eller alle begivenheder er allerede gemt i din kalender."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "begivenheder er gemt i den nye kalender"
 
 #: ajax/import/import.php:56
 msgid "Import failed"
-msgstr ""
+msgstr "import mislykkedes"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "begivenheder er gemt i din kalender"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -72,7 +73,7 @@ msgstr "Tidszone ændret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
@@ -481,7 +482,7 @@ msgstr "I dag"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Indstillinger"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -703,7 +704,7 @@ msgstr ""
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "En kalender med dette navn findes allerede. Hvis du fortsætter alligevel, vil disse kalendere blive sammenlagt."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -735,7 +736,7 @@ msgstr "kl."
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Generel"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -743,7 +744,7 @@ msgstr "Tidszone"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Opdater tidszone automatisk"
 
 #: templates/settings.php:52
 msgid "Time format"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 03723a7847..554194ada5 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -223,7 +223,7 @@ msgstr "Kunne ikke indlæse midlertidigt billede"
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
@@ -240,12 +240,12 @@ msgid "Couldn't get a valid address."
 msgstr "Kunne ikke finde en gyldig adresse."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fejl"
 
@@ -257,41 +257,41 @@ msgstr "Dette felt må ikke være tomt."
 msgid "Couldn't serialize elements."
 msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Dr."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Vælg type"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr " importeret "
 msgid " failed."
 msgstr " fejl."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -315,125 +315,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Besked"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Personsøger"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -533,113 +533,113 @@ msgstr "Upload nyt foto"
 msgid "Select photo from ownCloud"
 msgstr "Vælg foto fra ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Rediger navnedetaljer."
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Indtast kaldenavn"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Opdel gruppenavne med kommaer"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Rediger grupper"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Foretrukken"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Indtast venligst en gyldig email-adresse."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Indtast email-adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Send mail til adresse"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Slet email-adresse"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Indtast telefonnummer"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Slet telefonnummer"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Rediger adresse detaljer"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Tilføj noter her."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Tilføj element"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Download kontaktperson"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Slet kontaktperson"
 
@@ -851,33 +851,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Ny adressebog"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Gem"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/da/files.po b/l10n/da/files.po
index aef6a95763..3524d6c05a 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,87 +55,83 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Slet"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "findes allerede"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "erstat"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "fortryd"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "erstattet"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "med"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "fortryd"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "Slettet"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "genererer ZIP-fil, det kan tage lidt tid."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Fejl ved upload"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldigt navn, '/' er ikke tilladt."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "mappe"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "mapper"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index c312be9fba..e0327dcd14 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 0a872f803a..5254803303 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -7,15 +7,16 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+#   <sr@ybnet.dk>, 2012.
 # Thomas Tanghus <>, 2012.
 # Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 14:35+0000\n"
+"Last-Translator: ressel <sr@ybnet.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +78,7 @@ msgstr "Sikkerhedsadvarsel"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -85,7 +86,7 @@ msgstr ""
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php er tilmeldt en webcron tjeneste"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
diff --git a/l10n/da/tasks.po b/l10n/da/tasks.po
index f2ddaaa160..5c9900db1e 100644
--- a/l10n/da/tasks.po
+++ b/l10n/da/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sr@ybnet.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 14:43+0000\n"
+"Last-Translator: ressel <sr@ybnet.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,35 +20,35 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Ugyldig dato/tid"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Opgaver"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Ingen kategori"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Uspecificeret"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=højeste"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=mellem"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=laveste"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Tom beskrivelse"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
@@ -59,7 +60,7 @@ msgstr ""
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Tilføj opgave"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Indlæser opgaver..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "vigtigt"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Mere"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Mindre"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Slet"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 186aad26c3..5103ecf98c 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sr@ybnet.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 14:58+0000\n"
+"Last-Translator: ressel <sr@ybnet.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/settings.php:8
 msgid ""
@@ -28,7 +29,7 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Kodeord"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Brug TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -133,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Anbefales ikke, brug kun for at teste."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -161,4 +162,4 @@ msgstr ""
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Hjælp"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 03f68de3e7..dfc2525069 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 09:39+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -235,7 +235,7 @@ msgstr "Konnte das temporäre Bild nicht laden:"
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -252,12 +252,12 @@ msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
@@ -269,41 +269,41 @@ msgstr "Dieses Feld darf nicht leer sein."
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Fehler beim Laden des Profilbildes."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Wähle Typ"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "Möchtest du diese Adressbücher zusammenführen?"
 
@@ -319,7 +319,7 @@ msgstr " importiert, "
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Der Anzeigename darf nicht leer sein."
 
@@ -327,125 +327,125 @@ msgstr "Der Anzeigename darf nicht leer sein."
 msgid "Addressbook not found: "
 msgstr "Adressbuch nicht gefunden:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:112 templates/part.contact.php:116
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:115
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:44
+#: lib/app.php:186 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Andere"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Fragen"
 
@@ -555,7 +555,7 @@ msgstr "Name ändern"
 
 #: templates/part.contact.php:39 templates/part.contact.php:41
 #: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:33
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Löschen"
 
@@ -863,33 +863,37 @@ msgid "Show read-only VCF link"
 msgstr "Schreibgeschützten VCF-Link anzeigen"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Name"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Beschreibung"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Mehr..."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index f495a374d0..2c0d801573 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -9,15 +9,16 @@
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+# Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 20:04+0000\n"
-"Last-Translator: designpoint <info@designpoint.ch>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,11 +60,7 @@ msgstr "Fehler beim Schreiben auf Festplatte"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Nicht mehr teilen"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Löschen"
 
@@ -73,73 +70,73 @@ msgstr "ist bereits vorhanden"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr "Ersetzen"
+msgstr "ersetzen"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr "Abbrechen"
+msgstr "abbrechen"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr "Ersetzt"
+msgstr "ersetzt"
 
 #: js/filelist.js:195
 msgid "with"
 msgstr "mit"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "gelöscht"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Datei kann nicht hochgeladen werden da sie ein Verzeichnis ist oder 0 Bytes hat."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Fehler beim Hochladen"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Hochladen abgebrochen."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ungültiger Name, \"/\" ist nicht erlaubt."
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "Ordner"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "Ordner"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "Datei"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 85e27c2e09..562a8ccf21 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:38+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,22 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Löschen"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Ihre geteilten Dateien"
@@ -43,10 +59,6 @@ msgstr "Lesen"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Löschen"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Austausch ermöglichen"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index bb90299941..23245e15a6 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -225,7 +225,7 @@ msgstr "Δεν ήταν δυνατή η φόρτωση της προσωρινή
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Επαφές"
 
@@ -242,12 +242,12 @@ msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -259,41 +259,41 @@ msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Σφάλμα στην φόρτωση εικόνας προφίλ."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -309,7 +309,7 @@ msgstr " εισάγεται,"
 msgid " failed."
 msgstr " απέτυχε."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Το όνομα προβολής δεν μπορεί να είναι κενό. "
 
@@ -317,125 +317,125 @@ msgstr "Το όνομα προβολής δεν μπορεί να είναι κ
 msgid "Addressbook not found: "
 msgstr "Το βιβλίο διευθύνσεων δεν βρέθηκε:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Επιχείρηση"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Κάλεσε"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Προμηθευτής"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Ιωβηλαίο"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
@@ -535,113 +535,113 @@ msgstr "Ανέβασε νέα φωτογραφία"
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Παρατσούκλι"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Εισάγετε παρατσούκλι"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Ιστότοπος"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Πήγαινε στον ιστότοπο"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Διαχώρισε τις ομάδες με κόμμα "
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Επεξεργασία ομάδων"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Προτιμώμενο"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Αποστολή σε διεύθυνση"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Διαγραφή διεύθυνση email"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Εισήγαγε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Διέγραψε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Προβολή στο χάρτη"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Πρόσθεσε τις σημειώσεις εδώ"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Προσθήκη πεδίου"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Σημείωση"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Λήψη επαφής"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Διαγραφή επαφής"
 
@@ -853,33 +853,37 @@ msgid "Show read-only VCF link"
 msgstr "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Νέο βιβλίο διευθύνσεων"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Περισσότερα..."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 37e57190cb..de2b3f80a1 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 09:32+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,7 @@ msgstr "Η εγγραφή στο δίσκο απέτυχε"
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Ακύρωση Διαμοιρασμού"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -82,59 +78,59 @@ msgstr "αντικαταστάθηκε"
 msgid "with"
 msgstr "με"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "διαγράφηκε"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Σφάλμα Μεταφόρτωσης"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Εν αναμονή"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Η μεταφόρτωση ακυρώθηκε."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "φάκελος"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "φάκελοι"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "αρχείο"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "αρχεία"
 
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index ffff3a6e15..39fa2d067b 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7c50fee01b..8b2056e127 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 17:14+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -220,7 +220,7 @@ msgstr "Ne eblis ŝargi provizoran bildon: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontaktoj"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "Ne eblis ekhavi validan adreson."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Eraro"
 
@@ -254,41 +254,41 @@ msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 msgid "Couldn't serialize elements."
 msgstr "Ne eblis seriigi erojn."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Redakti nomon"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Elektu tipon"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr " enportoj, "
 msgid " failed."
 msgstr "malsukcesoj."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr "Adresaro ne troviĝis:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Interreto"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Naskiĝotago"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Negoco"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Voko"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Klientoj"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Liveranto"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Ferioj"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Ideoj"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Vojaĝo"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubileo"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Kunveno"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Alia"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Persona"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projektoj"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Demandoj"
 
@@ -530,113 +530,113 @@ msgstr "Alŝuti novan foton"
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Redakti detalojn de nomo"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Enigu kromnomon"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "TTT-ejo"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.iuejo.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Iri al TTT-ejon"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Disigi grupojn per komoj"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Redakti grupojn"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferata"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Bonvolu specifi validan retpoŝtadreson."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Enigi retpoŝtadreson"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Retpoŝtmesaĝo al adreso"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Forigi retpoŝþadreson"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Enigi telefonnumeron"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Forigi telefonnumeron"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vidi en mapo"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Redakti detalojn de adreso"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Aldoni notojn ĉi tie."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Aldoni kampon"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Noto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Elŝuti kontakton"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Forigi kontakton"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr "Montri nur legeblan VCF-ligilon"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Redakti"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nova adresaro"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Priskribo"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Pli..."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 365883ce5a..cc7ffcd01a 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,87 +53,83 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Forigi"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "jam ekzistas"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "anstataŭigi"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "nuligi"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "anstataŭigita"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "kun"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "malfari"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "forigita"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Alŝuta eraro"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nevalida nomo, “/” ne estas permesata."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "dosierujo"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "dosierujoj"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "dosiero"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "dosieroj"
 
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index bab4de8df6..9e5792768f 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 19:32+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Forigi"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Viaj kunhavigitaj dosieroj"
@@ -42,10 +58,6 @@ msgstr "Legi"
 msgid "Edit"
 msgstr "Redakti"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Forigi"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Kapabligi rekunhavigon"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index ad0191c21f..9a3aa9ff2d 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -224,7 +224,7 @@ msgstr "Fallo no pudo cargara de una imagen temporal"
 msgid "No file was uploaded. Unknown error"
 msgstr "Fallo no se subió el fichero"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -241,12 +241,12 @@ msgid "Couldn't get a valid address."
 msgstr "Fallo : no hay dirección valida"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fallo"
 
@@ -258,41 +258,41 @@ msgstr "Este campo no puede estar vacío."
 msgid "Couldn't serialize elements."
 msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Edita el Nombre"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Selecciona el tipo"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgstr "Importado."
 msgid " failed."
 msgstr "Fallo."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -316,125 +316,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Localizador"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Negocio"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Llamada"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Vacaciones"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Otro"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Proyectos"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Preguntas"
 
@@ -534,113 +534,113 @@ msgstr "Subir nueva fotografía"
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar los detalles del nombre"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Alias"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introduce un alias"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Sitio Web"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separa los grupos con comas"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor especifica una dirección de correo electrónico válida."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introduce una dirección de correo electrónico"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Enviar por correo a la dirección"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Eliminar dirección de correo electrónico"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Introduce un número de teléfono"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Eliminar número de teléfono"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar detalles de la dirección"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Añade notas aquí."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Añadir campo"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Eliminar contacto"
 
@@ -852,33 +852,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nueva libreta de direcciones"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Descripción"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Más..."
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 642d976601..d7855d52e0 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,87 +54,83 @@ msgstr "La escritura en disco ha fallado"
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "No compartir"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Eliminado"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "ya existe"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "reemplazar"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "cancelar"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "reemplazado"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "con"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "borrado"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "generando un fichero ZIP, puede llevar un tiempo."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "carpeta"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "carpetas"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "archivo"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "archivos"
 
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 6e4610baa0..5b8a954918 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 32a4a0173a..a3886778c6 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr "Ajutise pildi laadimine ebaõnnestus: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Viga"
 
@@ -253,41 +253,41 @@ msgstr "See omadus ei tohi olla tühi."
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Muuda nime"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Vali tüüp"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr " imporditud, "
 msgid " failed."
 msgstr " ebaõnnestus."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr "Lae üles uus foto"
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Muuda nime üksikasju"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Sisesta hüüdnimi"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Eralda grupid komadega"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Muuda gruppe"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Eelistatud"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Palun sisesta korrektne e-posti aadress."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Sisesta e-posti aadress"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Kiri aadressile"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Kustuta e-posti aadress"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Sisesta telefoninumber"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Kustuta telefoninumber"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vaata kaardil"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Muuda aaressi infot"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Lisa märkmed siia."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Lisa väli"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Märkus"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Lae kontakt alla"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Kustuta kontakt"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Muuda"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Loobu"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 3c6cb58d64..5585c7eb69 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-faili loomine, see võib veidi aega võtta."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Üleslaadimise viga"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Vigane nimi, '/' pole lubatud."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "kaust"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "kausta"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fail"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 96393b4b8f..13912b29a8 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 06:33+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Kustutamine"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Sinu jagatud failid"
@@ -42,10 +58,6 @@ msgstr "Lugemine"
 msgid "Edit"
 msgstr "Muutmine"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Kustutamine"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Luba edasijagamine"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index e5bd8a9638..a99dcfe4f9 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "Ezin izan da aldi bateko irudia kargatu:"
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Ezin izan da eposta baliagarri bat hartu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errorea"
 
@@ -255,41 +255,41 @@ msgstr "Propietate hau ezin da hutsik egon."
 msgid "Couldn't serialize elements."
 msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Editatu izena"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Hautatu mota"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr " inportatua, "
 msgid " failed."
 msgstr "huts egin du."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mezua"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Jaioteguna"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Deia"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Bezeroak"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Oporrak"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Ideiak"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Bidaia"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Bilera"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Proiektuak"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Galderak"
 
@@ -531,113 +531,113 @@ msgstr "Igo argazki berria"
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editatu izenaren zehaztasunak"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Ezizena"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Sartu ezizena"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Web orria"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.webgunea.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Web orrira joan"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Banatu taldeak komekin"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editatu taldeak"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Hobetsia"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Mesedez sartu eposta helbide egoki bat"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Sartu eposta helbidea"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Bidali helbidera"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Ezabatu eposta helbidea"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Sartu telefono zenbakia"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Ezabatu telefono zenbakia"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ikusi mapan"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editatu helbidearen zehaztasunak"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Gehitu oharrak hemen."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Gehitu eremua"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Oharra"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Deskargatu kontaktua"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Ezabatu kontaktua"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editatu"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index e62061a695..d450fd0522 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,87 +53,83 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Ezabatu"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "dagoeneko existitzen da"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "ordeztu"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ezeztatu"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "ordeztua"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "honekin"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "desegin"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "ezabatuta"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Zain"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Baliogabeko izena, '/' ezin da erabili. "
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "karpeta"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "Karpetak"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fitxategia"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "fitxategiak"
 
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 1851e89cc8..2f90f743ee 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index 96b07fd275..d97960a11b 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 9b84201583..cf36b73d5b 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index a9203e1818..3032b02ab6 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 9744c2460b..7b955b8ee8 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr "قابلیت بارگذاری تصویر  موقت وجود ندارد:"
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "اشخاص"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr "Couldn't get a valid address."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "خطا"
 
@@ -253,41 +253,41 @@ msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 msgid "Couldn't serialize elements."
 msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "نام تغییر"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr "وارد شد،"
 msgid " failed."
 msgstr "ناموفق"
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "این کتابچه ی نشانه های شما نیست"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "نشانی"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "تلفن"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "نشانی پست الکترنیک"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "نهاد(ارگان)"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "موبایل"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "متن"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "صدا"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "پیغام"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "دورنگار:"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "رسانه تصویری"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "صفحه"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "اینترنت"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "روزتولد"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr "بار گذاری یک تصویر جدید"
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "ویرایش نام جزئیات"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "نام مستعار"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "یک نام مستعار وارد کنید"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "جدا کردن گروه ها به وسیله درنگ نما"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "ویرایش گروه ها"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "مقدم"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "یک  پست الکترونیکی وارد کنید"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "به نشانی  ارسال شد"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "پاک کردن نشانی پست الکترونیکی"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "شماره تلفن راوارد کنید"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "پاک کردن شماره تلفن"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "دیدن روی نقشه"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "ویرایش جزئیات نشانی ها"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "اینجا یادداشت ها را بیافزایید"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "اضافه کردن فیلد"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "شماره تلفن"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "یادداشت"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "دانلود مشخصات اشخاص"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "پاک کردن  اطلاعات شخص مورد نظر"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "ویرایش"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "کتابچه نشانه های جدید"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "ذخیره سازی"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "انصراف"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index d83a2a2427..4a7a4190e0 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 01:10+0000\n"
-"Last-Translator: vahid chakoshy <vchakoshy@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 msgid "Files"
 msgstr "فایل ها"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "پاک کردن"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "حذف شده"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "خطا در بار گذاری"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "پوشه"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "پوشه ها"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "پرونده"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "پرونده ها"
 
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 8afa64d981..9d11697a56 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index 2030f4fc3c..50ac3b42ac 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 63aaeba9a9..edf5daa8da 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index 375cb6c6e3..52ec668a86 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 87156b512e..e24b398705 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -222,7 +222,7 @@ msgstr "Väliaikaiskuvan lataus epäonnistui:"
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
@@ -239,12 +239,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Virhe"
 
@@ -256,41 +256,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr " tuotu, "
 msgid " failed."
 msgstr " epäonnistui."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -314,125 +314,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr "Osoitekirjaa ei löytynyt:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -532,113 +532,113 @@ msgstr "Lähetä uusi valokuva"
 msgid "Select photo from ownCloud"
 msgstr "Valitse valokuva ownCloudista"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Muokkaa nimitietoja"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Anna kutsumanimi"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Verkkosivu"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Siirry verkkosivulle"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Erota ryhmät pilkuilla"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Muokkaa ryhmiä"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Ensisijainen"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Anna kelvollinen sähköpostiosoite."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Anna sähköpostiosoite"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Poista sähköpostiosoite"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Anna puhelinnumero"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Poista puhelinnumero"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Näytä kartalla"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Muokkaa osoitetietoja"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Lisää huomiot tähän."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Lisää kenttä"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Puhelin"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Huomio"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Lataa yhteystieto"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Poista yhteystieto"
 
@@ -850,33 +850,37 @@ msgid "Show read-only VCF link"
 msgstr "Näytä vain luku -muodossa oleva VCF-linkki"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Kuvaus"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Peru"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Lisää..."
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index c441d2eba1..bce2d66576 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-03 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 18:24+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +55,7 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Lopeta jakaminen"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Poista"
 
@@ -83,59 +79,59 @@ msgstr "korvattu"
 msgid "with"
 msgstr "käyttäen"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "poistettu"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Lähetysvirhe."
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "kansio"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "kansiota"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "tiedosto"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "tiedostoa"
 
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index aa9872ecb1..06d1266178 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 10:59+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Poisto"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Jakamasi tiedostot"
@@ -42,10 +58,6 @@ msgstr "Luku"
 msgid "Edit"
 msgstr "Muokkaus"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Poisto"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Käytä uudelleenjakoa"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 87353de68a..60c3f089ac 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -6,7 +6,7 @@
 # Borjan Tchakaloff <borjan@tchaka.fr>, 2012.
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <fboulogne@april.org>, 2011.
-#   <gp4004@arghh.org>, 2011.
+#   <gp4004@arghh.org>, 2011, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -229,7 +229,7 @@ msgstr "Impossible de charger l'image temporaire :"
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -246,12 +246,12 @@ msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erreur"
 
@@ -263,43 +263,43 @@ msgstr "Cette valeur ne doit pas être vide"
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Erreur pendant le chargement de la photo de profil."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Sélectionner un type"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Voulez-vous fusionner ces carnets d'adresses ?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -313,7 +313,7 @@ msgstr "importé,"
 msgid " failed."
 msgstr "échoué."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Le nom d'affichage ne peut pas être vide."
 
@@ -321,125 +321,125 @@ msgstr "Le nom d'affichage ne peut pas être vide."
 msgid "Addressbook not found: "
 msgstr "Carnet d'adresse introuvable : "
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Business"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Livreur"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Trajet"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Rendez-vous"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Questions"
 
@@ -539,113 +539,113 @@ msgstr "Envoyer une nouvelle photo"
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editer les noms"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Surnom"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Entrer un surnom"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Page web"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Allez à la page web"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "jj-mm-aaaa"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Séparer les groupes avec des virgules"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editer les groupes"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Préféré"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Merci d'entrer une adresse e-mail valide."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Entrer une adresse e-mail"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Envoyer à l'adresse"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Supprimer l'adresse e-mail"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Entrer un numéro de téléphone"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Supprimer le numéro de téléphone"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Voir sur une carte"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editer les adresses"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Ajouter des notes ici."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Ajouter un champ."
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Téléphone"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Télécharger le contact"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Supprimer le contact"
 
@@ -857,33 +857,37 @@ msgid "Show read-only VCF link"
 msgstr "Afficher les liens VCF en lecture seule"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Modifier"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nouveau Carnet d'adresses"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nom"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Description"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Plus…"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 1cc50dacf8..19cb780d18 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 20:30+0000\n"
-"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,11 +57,7 @@ msgstr "Erreur d'écriture sur le disque"
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Ne plus partager"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -85,59 +81,59 @@ msgstr "remplacé"
 msgid "with"
 msgstr "avec"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "supprimé"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Générer un fichier ZIP, cela peut prendre du temps"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Erreur de chargement"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "En cours"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Chargement annulé"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "dossier"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "dossiers"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "fichier"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "fichiers"
 
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 60c8ad25a5..63841db729 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 16:40+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Effacement"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Vos documents partagés"
@@ -42,10 +58,6 @@ msgstr "Lecture"
 msgid "Edit"
 msgstr "Édition"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Effacement"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Permettre le repartage"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 8fdbf74145..c1d17de2c4 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -5,6 +5,7 @@
 # Translators:
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <fboulogne@april.org>, 2011.
+#   <gp4004@arghh.org>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 15:19+0000\n"
+"Last-Translator: gp4004 <gp4004@arghh.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -235,7 +236,7 @@ msgstr "Autre"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Groupe Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 972682b6eb..327a0288f7 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr "Non se puido cargar a imaxe temporal: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "Non se puido obter un enderezo de correo válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
@@ -254,41 +254,41 @@ msgstr "Esta propiedade non pode quedar baldeira."
 msgid "Couldn't serialize elements."
 msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Seleccione tipo"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr " importado, "
 msgid " failed."
 msgstr " fallou."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Esta non é a súa axenda."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Enderezo"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mensaxe"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Paxinador"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr "Subir unha nova foto"
 msgid "Select photo from ownCloud"
 msgstr "Escoller foto desde ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar detalles do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Apodo"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introuza apodo"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separe grupos con comas"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor indique un enderezo de correo electrónico válido."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introduza enderezo de correo electrónico"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Correo ao enderezo"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Borrar enderezo de correo electrónico"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Introducir número de teléfono"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Borrar número de teléfono"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar detalles do enderezo"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Engadir aquí as notas."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Engadir campo"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Borrar contacto"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nova axenda"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 884f224b3b..6725283e33 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,87 +53,83 @@ msgstr "Erro ao escribir no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Eliminar"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "xa existe"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "substituír"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "cancelar"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "substituído"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "con"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "desfacer"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "eliminado"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "xerando ficheiro ZIP, pode levar un anaco."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Erro na subida"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non válido, '/' non está permitido."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "cartafol"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "cartafoles"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "ficheiro"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index ddde4141dc..7a4702daab 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 9660e8a9af..f3b6c214c2 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "אנשי קשר"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -255,41 +255,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "הודעה"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "אינטרנט"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +531,113 @@ msgstr "העלה תמונה חדשה"
 msgid "Select photo from ownCloud"
 msgstr "בחר תמונה מ ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "ערוך פרטי שם"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "כינוי"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "הכנס כינוי"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "הפרד קבוצות עם פסיקים"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "ערוך קבוצות"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "מועדף"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "אנא הזן כתובת דוא\"ל חוקית"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "הזן כתובת דוא\"ל"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "כתובת"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "מחק כתובת דוא\"ל"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "הכנס מספר טלפון"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "מחק מספר טלפון"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "ראה במפה"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "ערוך פרטי כתובת"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "הוסף הערות כאן."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "הוסף שדה"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "טלפון"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "הערה"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "הורדת איש קשר"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "מחיקת איש קשר"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "עריכה"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "פנקס כתובות חדש"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "ביטול"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 760821f2eb..ae9614b348 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,7 @@ msgstr "הכתיבה לכונן נכשלה"
 msgid "Files"
 msgstr "קבצים"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -82,59 +78,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "יוצר קובץ ZIP, אנא המתן."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "שגיאת העלאה"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "שם לא חוקי, '/' אסור לשימוש."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "תקיה"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "תקיות"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "קובץ"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "קבצים"
 
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 30342046df..ce23b329bc 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 8e1653696d..11ff584568 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -254,41 +254,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Poruka"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Uredi detalje imena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Unesi nadimank"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Uredi grupe"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferirano"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Unesi email adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Unesi broj telefona"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Prikaži na karti"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Uredi detalje adrese"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Dodaj bilješke ovdje."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Bilješka"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Preuzmi kontakt"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Izbriši kontakt"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Spremi"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Prekini"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 2cd29927c8..b14a71388e 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Briši"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "generiranje ZIP datoteke, ovo može potrajati."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Pogreška pri slanju"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neispravan naziv, znak '/' nije dozvoljen."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 218ed39d84..e9e1ac6f19 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index dcbf9514b9..ed546686ca 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -222,7 +222,7 @@ msgstr "Ideiglenes kép betöltése sikertelen"
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
@@ -239,12 +239,12 @@ msgid "Couldn't get a valid address."
 msgstr "Érvényes cím lekérése sikertelen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Hiba"
 
@@ -256,41 +256,41 @@ msgstr "Ezt a tulajdonságot muszáj kitölteni"
 msgid "Couldn't serialize elements."
 msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Típus kiválasztása"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr "  beimportálva,  "
 msgid " failed."
 msgstr "  sikertelen"
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -314,125 +314,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Szervezet"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Születésnap"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -532,113 +532,113 @@ msgstr "Új kép feltöltése"
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Név részleteinek szerkesztése"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Becenév"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Becenév megadása"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Vesszővel válassza el a csoportokat"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Csoportok szerkesztése"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Előnyben részesített"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Adjon meg érvényes email címet"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Adja meg az email címet"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Postai cím"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Email cím törlése"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Adja meg a telefonszámot"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Telefonszám törlése"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Megtekintés a térképen"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Cím részleteinek szerkesztése"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Megjegyzések"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Mező hozzáadása"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonszám"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Jegyzet"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Kapcsolat letöltése"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Kapcsolat törlése"
 
@@ -850,33 +850,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Új címlista"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index afa43a5036..7ad223a345 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,87 +54,83 @@ msgstr "Nem írható lemezre"
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Törlés"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "már létezik"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "cserél"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "mégse"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "kicserélve"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "-val/-vel"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "visszavon"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "törölve"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Feltöltési hiba"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Feltöltés megszakítva"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Érvénytelen név, a '/' nem megengedett"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "mappa"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "mappák"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fájl"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "fájlok"
 
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 582e43e332..ea682416e1 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 1395ba92c2..04107b7b21 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 596ee32660..7d158306ff 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 082dcd23fc..eec7cde9f4 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index fd0e67d2cd..cd74ca7875 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -254,41 +254,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Anniversario"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr "Incargar nove photo"
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Pseudonymo"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Inserer pseudonymo"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Modificar gruppos"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferite"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Entrar un adresse de e-posta"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Deler adresse de E-posta"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Entrar un numero de telephono"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Deler numero de telephono"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vider in un carta"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Adder notas hic"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Adder campo"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Phono"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Discargar contacto"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Deler contacto"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nove adressario"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 5e995f4fbf..64f2fc617a 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Deler"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 1fe706ecf4..47ee4da229 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index abc2bc17b1..d5650aa318 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 8b632afd50..3a96e71072 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Gagal menulis ke disk"
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Hapus"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index d960b8fa4f..b4652fdd40 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index f17c7177a9..4d770ebd9b 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index cc6601b9fa..4e35fb7c4e 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_ID/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index e98ec0d21f..c6da7a9d02 100644
--- a/l10n/id_ID/files_sharing.po
+++ b/l10n/id_ID/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index ca6e21df7c..d0727e1f0d 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 05:27+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -222,7 +222,7 @@ msgstr "Impossibile caricare l'immagine temporanea: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contatti"
 
@@ -239,12 +239,12 @@ msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errore"
 
@@ -256,41 +256,41 @@ msgstr "Questa proprietà non può essere vuota."
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Errore durante il caricamento dell'immagine di profilo."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "Vuoi unire queste rubriche?"
 
@@ -306,7 +306,7 @@ msgstr " importato, "
 msgid " failed."
 msgstr " non riuscito."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Il nome visualizzato non può essere vuoto."
 
@@ -314,125 +314,125 @@ msgstr "Il nome visualizzato non può essere vuoto."
 msgid "Addressbook not found: "
 msgstr "Rubrica non trovata:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Domande"
 
@@ -532,113 +532,113 @@ msgstr "Invia una nuova foto"
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Modifica dettagli del nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Pseudonimo"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Inserisci pseudonimo"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Sito web"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Vai al sito web"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "gg-mm-aaaa"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separa i gruppi con virgole"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Modifica gruppi"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferito"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Specifica un indirizzo email valido"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Inserisci indirizzo email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Invia per email"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Elimina l'indirizzo email"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Inserisci il numero di telefono"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Elimina il numero di telefono"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Modifica dettagli dell'indirizzo"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Aggiungi qui le note."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Aggiungi campo"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Scarica contatto"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Elimina contatto"
 
@@ -850,33 +850,37 @@ msgid "Show read-only VCF link"
 msgstr "Mostra collegamento VCF in sola lettura"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Modifica"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nome"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Descrizione"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Salva"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Annulla"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Altro..."
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 8e9ebacf2e..664d569fd4 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:18+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +55,7 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Files"
 msgstr "File"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Rimuovi condivisione"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Elimina"
 
@@ -83,59 +79,59 @@ msgstr "sostituito"
 msgid "with"
 msgstr "con"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "eliminati"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "creazione file ZIP, potrebbe richiedere del tempo."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Errore di invio"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "In corso"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non valido"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "cartella"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "cartelle"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "file"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "file"
 
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index c2e3c68a49..9dac30c173 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 07:12+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Eliminazione"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "I tuoi file condivisi"
@@ -42,10 +58,6 @@ msgstr "Lettura"
 msgid "Edit"
 msgstr "Modifica"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Eliminazione"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Abilita ri-condivisione"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 8e753c62e4..2f62507e3e 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 04:45+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -220,7 +220,7 @@ msgstr "一時的な画像の読み込みができませんでした: "
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "連絡先"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "有効なアドレスを取得できませんでした。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "エラー"
 
@@ -254,41 +254,41 @@ msgstr "この属性は空にできません。"
 msgid "Couldn't serialize elements."
 msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "名前を編集"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "プロファイルの画像の読み込みエラー"
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "タイプを選択"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "これらのアドレス帳をマージしてもよろしいですか？"
 
@@ -304,7 +304,7 @@ msgstr " をインポート、 "
 msgid " failed."
 msgstr " は失敗しました。"
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "表示名は空にできません。"
 
@@ -312,125 +312,125 @@ msgstr "表示名は空にできません。"
 msgid "Addressbook not found: "
 msgstr "アドレス帳が見つかりません:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "これはあなたの電話帳ではありません。"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "住所"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "電話番号"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "インターネット"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "電話"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "打ち合わせ"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "その他"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "質問"
 
@@ -530,113 +530,113 @@ msgstr "新しい写真をアップロード"
 msgid "Select photo from ownCloud"
 msgstr "ownCloudから写真を選択"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "名前の詳細を編集"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "削除"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "ニックネームを入力"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "ウェブサイト"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Webサイトへ移動"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "コンマでグループを分割"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "グループを編集"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "推奨"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "有効なメールアドレスを指定してください。"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "メールアドレスを入力"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "アドレスへメールを送る"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "メールアドレスを削除"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "電話番号を入力"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "電話番号を削除"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "地図で表示"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "住所の詳細を編集"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "ここにメモを追加。"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "項目を追加"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "電話番号"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "メモ"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "連絡先のダウンロード"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "連絡先の削除"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr "読み取り専用のVCFリンクを表示"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "編集"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "新規のアドレス帳"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "名前"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "説明"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "保存"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "取り消し"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "もっと..."
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index e014bfa99f..97c519439b 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,87 +52,83 @@ msgstr "ディスクへの書き込みに失敗しました"
 msgid "Files"
 msgstr "ファイル"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "削除"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "既に存在します"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "置き換え"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "置換："
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "←"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "元に戻す"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "削除"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "アップロードエラー"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "保留"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "フォルダ"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "フォルダ"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "ファイル"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "ファイル"
 
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index fb178df41c..99f9cb0ce7 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 02:58+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,22 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "削除"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "共有ファイル"
@@ -43,10 +59,6 @@ msgstr "読込"
 msgid "Edit"
 msgstr "編集"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "削除"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "再共有を有効にする"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 8912c42577..d269151c24 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 01:31+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgstr "その他"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "グループ管理者"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 2854ac2065..2794bd93cc 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr "임시 이미지를 불러올 수 없습니다. "
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "연락처"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "유효한 주소를 얻을 수 없습니다."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "오류"
 
@@ -254,41 +254,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "이름 편집"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "유형 선택"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr "불러오기,"
 msgid " failed."
 msgstr "실패."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "내 주소록이 아닙니다."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "주소"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "전화 번호"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "전자 우편"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "조직"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "휴대폰"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "문자 번호"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "음성 번호"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "메세지"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "팩스 번호"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "영상 번호"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "호출기"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "인터넷"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "생일"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr "새로운 사진 업로드"
 msgid "Select photo from ownCloud"
 msgstr "ownCloud에서 사진 선택"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "이름 세부사항을 편집합니다. "
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "별명"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "별명 입력"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "일-월-년"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "쉼표로 그룹 구분"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "그룹 편집"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "선호함"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "올바른 이메일 주소를 입력하세요."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "이메일 주소 입력"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "이메일 주소 삭제"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "전화번호 입력"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "전화번호 삭제"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "지도에서 보기"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "상세 주소 수정"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "여기에 노트 추가."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "파일 추가"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "전화 번호"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "노트"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "연락처 다운로드"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "연락처 삭제"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "편집"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "저장"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "취소"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 76eb1bf66d..375947a292 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Files"
 msgstr "파일"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "삭제"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "업로드 에러"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "보류 중"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "업로드 취소."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "폴더"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "폴더"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "파일"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "파일"
 
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index ab00c1b050..21cbdc33f6 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 472a09280c..3f566f989b 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr " importéiert, "
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Spëtznumm"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Gëff e Spëtznumm an"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Gruppen editéieren"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Telefonsnummer aginn"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Telefonsnummer läschen"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Op da Kaart uweisen"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Adress Detailer editéieren"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Kontakt eroflueden"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Kontakt läschen"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editéieren"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Neit Adressbuch"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 23fcc19514..c84f38bdc0 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Läschen"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index c2f614a934..c2a771a693 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 8f89a72756..9e43e59aa8 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontaktai"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Žinutė"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internetas"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Trinti"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Slapyvardis"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonas"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Atsisųsti kontaktą"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Ištrinti kontaktą"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Keisti"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 2eb293733c..27e1110102 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Nepavyko įrašyti į diską"
 msgid "Files"
 msgstr "Failai"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Įkėlimo klaida"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "katalogas"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "katalogai"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "failas"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "failai"
 
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index f834a4d60d..e0bf0afb6e 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index f9b6c5143e..9fcc9e8371 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 621deceffc..3f19f36b91 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Faili"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Pārtraukt līdzdalīšanu"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Izdzēst"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Augšuplādēšanas laikā radās kļūda"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Augšuplāde ir atcelta"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Šis simbols '/', nav atļauts."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Izmainīts"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "mape"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "mapes"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fails"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 940df7205e..23294d9264 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 50c48cac5c..7d9b11971e 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr "Не можеше да се вчита привремената фото
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "Не можев да добијам исправна адреса."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Грешка"
 
@@ -254,41 +254,41 @@ msgstr "Својството не смее да биде празно."
 msgid "Couldn't serialize elements."
 msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Уреди го името"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Одбери тип"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr "увезено,"
 msgid " failed."
 msgstr "неуспешно."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ова не е во Вашиот адресар."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Е-пошта"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Порака"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Роденден"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr "Подигни нова фотографија"
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Уреди детали за име"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Прекар"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Внеси прекар"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Одвоете ги групите со запирка"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Уреди групи"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Претпочитано"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Ве молам внесете правилна адреса за е-пошта."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Внесете е-пошта"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Прати порака до адреса"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Избриши адреса за е-пошта"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Внесете телефонски број"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Избриши телефонски број"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Погледајте на мапа"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Уреди детали за адреса"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Внесете забелешки тука."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Додади поле"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Забелешка"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Преземи го контактот"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Избриши го контактот"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Нов адресар"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Сними"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 41b9f39120..374cb87139 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,7 @@ msgstr "Неуспеав да запишам на диск"
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Избриши"
 
@@ -82,59 +78,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Грешка при преземање"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Чека"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "неисправно име, '/' не е дозволено."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "фолдер"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "фолдери"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "датотека"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "датотеки"
 
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 161d976c65..3b1f31bd8f 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 625f969556..fac7073e72 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -223,7 +223,7 @@ msgstr "Tidak boleh membuka imej sementara: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
@@ -240,12 +240,12 @@ msgid "Couldn't get a valid address."
 msgstr "Tidak boleh mendapat alamat yang sah."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Ralat"
 
@@ -257,41 +257,41 @@ msgstr "Nilai ini tidak boleh kosong."
 msgid "Couldn't serialize elements."
 msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Ubah nama"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "PIlih jenis"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr " import, "
 msgid " failed."
 msgstr " gagal."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -315,125 +315,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr "Buku alamat tidak ditemui:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ini bukan buku alamat anda."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Alamat"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Emel"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasi"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mudah alih"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Teks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Suara"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mesej"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Alat Kelui"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Perniagaan"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "klien"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Hari kelepasan"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Idea"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Perjalanan"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubli"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Mesyuarat"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Lain"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Peribadi"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projek"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -533,113 +533,113 @@ msgstr "Muatnaik foto baru"
 msgid "Select photo from ownCloud"
 msgstr "Pilih foto dari ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Ubah butiran nama"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Nama Samaran"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Masukkan nama samaran"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Asingkan kumpulan dengan koma"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Ubah kumpulan"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Pilihan"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Berikan alamat emel yang sah."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Masukkan alamat emel"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Hantar ke alamat"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Padam alamat emel"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Masukkan nombor telefon"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Padam nombor telefon"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Lihat pada peta"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Ubah butiran alamat"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Letak nota disini."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Letak ruangan"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Muat turun hubungan"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Padam hubungan"
 
@@ -851,33 +851,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Muat naik"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Sunting"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Nama"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Keterangan"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Batal"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Lagi..."
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index d008381d5d..d25d888cfc 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,87 +55,83 @@ msgstr "Gagal untuk disimpan"
 msgid "Files"
 msgstr "fail"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Padam"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "Sudah wujud"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "ganti"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "Batal"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "diganti"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "dengan"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "dihapus"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Muat naik ralat"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "direktori"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "direktori"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fail"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "fail"
 
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 6de1cf4ae5..fcfd01e9c5 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 9472cf35d1..f1a0fe0237 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -222,7 +222,7 @@ msgstr "Kunne ikke laste midlertidig bilde:"
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -239,12 +239,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Feil"
 
@@ -256,41 +256,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Endre navn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Velg type"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr "importert,"
 msgid " failed."
 msgstr "feilet."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -314,125 +314,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internett"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -532,113 +532,113 @@ msgstr "Last opp nytt bilde"
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Endre detaljer rundt navn"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Skriv inn kallenavn"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Skill gruppene med komma"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Endre grupper"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Vennligst angi en gyldig e-postadresse."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Skriv inn e-postadresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Send e-post til adresse"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Fjern e-postadresse"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Skriv inn telefonnummer"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Fjern telefonnummer"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Se på kart"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Endre detaljer rundt adresse"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Legg inn notater her."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Legg til felt"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Notat"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Hend ned kontakten"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -850,33 +850,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Hent ned"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 60ac64821f..b242837904 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +55,7 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
 
@@ -83,59 +79,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "opprettet ZIP-fil, dette kan ta litt tid"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "mappe"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "mapper"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index fc3364ed34..8e9e4e2bac 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index b2c16170f6..ed1f0dac86 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -223,7 +223,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contacten"
 
@@ -240,12 +240,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -257,41 +257,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -315,125 +315,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -533,113 +533,113 @@ msgstr "Upload nieuwe foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Wijzig naam gegevens"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Roepnaam"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Voer roepnaam in"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Gebruik komma bij meerder groepen"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Wijzig groepen"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Voorkeur"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Geef een geldig email adres op."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Voer email adres in"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Mail naar adres"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Verwijder email adres"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Voer telefoonnummer in"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Verwijdere telefoonnummer"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Bekijk op een kaart"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Wijzig adres gegevens"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Voeg notitie toe"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Voeg veld toe"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefoon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Notitie"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Download contact"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Verwijder contact"
 
@@ -851,33 +851,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nieuw Adresboek"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Opslaan"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Anuleren"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index fd294e92b5..247cc814a9 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,11 +58,7 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -86,59 +82,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Upload Fout"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Wachten"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongeldige naam, '/' is niet toegestaan."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "map"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "mappen"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "bestand"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "bestanden"
 
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 9a3b58a554..0886b57395 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index a3933bcc26..789bd42444 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kotaktar"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -254,41 +254,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Føretrekt"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonnummer"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Last ned kontakt"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Endra"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Kanseller"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 5d14be6b12..f0ce0b444a 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr ""
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index a2531fd678..2df026f4c3 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 3b138e17dd..465d4e3f60 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 06:17+0000\n"
+"Last-Translator: Alexander Stevenson <assteve@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,15 +21,15 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Klarer ikkje å laste inn liste fra App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-postadresse lagra"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ugyldig e-postadresse"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -41,7 +41,7 @@ msgstr "Ugyldig førespurnad"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Feil i autentisering"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,15 +49,15 @@ msgstr "Språk endra"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr ""
+msgstr "Slå av"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr ""
+msgstr "Slå på"
 
 #: js/personal.js:69
 msgid "Saving..."
diff --git a/l10n/pl/admin_dependencies_chk.po b/l10n/pl/admin_dependencies_chk.po
index bdec632155..952d2fda7b 100644
--- a/l10n/pl/admin_dependencies_chk.po
+++ b/l10n/pl/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 09:01+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Moduł php-json jest wymagane przez wiele aplikacji do wewnętrznej łączności"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Modude php-curl jest wymagany do pobrania tytułu strony podczas dodawania zakładki"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Moduł php-gd jest wymagany do tworzenia miniatury obrazów"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Moduł php-ldap jest wymagany aby połączyć się z serwerem ldap"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Moduł php-zip jest wymagany aby pobrać wiele plików na raz"
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Moduł php-mb_multibyte jest wymagany do poprawnego zarządzania kodowaniem."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Moduł php-ctype jest wymagany do sprawdzania poprawności danych."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Moduł php-xml jest wymagany do udostępniania plików przy użyciu protokołu webdav."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "Dyrektywy allow_url_fopen użytkownika php.ini powinna być ustawiona na 1 do pobierania bazy wiedzy  z serwerów OCS"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Moduł php-pdo jest wymagany do przechowywania danych owncloud w bazie danych."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Stan zależności"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Używane przez:"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 598cdb30af..0f9dba1bdb 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -222,7 +222,7 @@ msgstr "Nie można wczytać obrazu tymczasowego: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Plik nie został załadowany. Nieznany błąd"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -239,12 +239,12 @@ msgid "Couldn't get a valid address."
 msgstr "Nie można pobrać prawidłowego adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Błąd"
 
@@ -256,43 +256,43 @@ msgstr "Ta właściwość nie może być pusta."
 msgid "Couldn't serialize elements."
 msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Zmień nazwę"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Błąd wczytywania zdjęcia profilu."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Wybierz typ"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Niektóre kontakty są zaznaczone do usunięcia, ale nie są usunięte jeszcze. Proszę czekać na ich usunięcie."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Czy chcesz scalić te książki adresowe?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -306,133 +306,133 @@ msgstr " importowane, "
 msgid " failed."
 msgstr "  nie powiodło się."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Nazwa nie może być pusta."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Nie znaleziono książki adresowej:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "To nie jest Twoja książka adresowa."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Połączenie tekstowe"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Wiadomość"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Biznesowe"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
-msgstr ""
+msgstr "Wywołanie"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Klienci"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
-msgstr ""
+msgstr "Doręczanie"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Święta"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Pomysły"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Podróż"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileusz"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Spotkanie"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Inne"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Osobiste"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Pytania"
 
@@ -482,15 +482,15 @@ msgstr "Poprzedni kontakt na liście"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Rozwiń/Zwiń bieżącą książkę adresową"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Następna książka adresowa"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Poprzednia książka adresowa"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -532,113 +532,113 @@ msgstr "Wczytaj nowe zdjęcie"
 msgid "Select photo from ownCloud"
 msgstr "Wybierz zdjęcie z ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Edytuj szczegóły nazwy"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Usuwa książkę adresową"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Nazwa"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Wpisz nazwę"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Strona www"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.jakasstrona.pl"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Idż do strony www"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-rrrr"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Oddziel grupy przecinkami"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Edytuj grupy"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferowane"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Określ prawidłowy adres e-mail."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Wpisz adres email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Mail na adres"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Usuń adres mailowy"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Wpisz numer telefonu"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Usuń numer telefonu"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Edytuj szczegóły adresu"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Dodaj notatkę tutaj."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Dodaj pole"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Uwaga"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Pobiera kontakt"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Usuwa kontakt"
 
@@ -661,7 +661,7 @@ msgstr "Skrzynka pocztowa"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Ulica"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
@@ -673,7 +673,7 @@ msgstr "Rozszerzony"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Numer lokalu"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -686,7 +686,7 @@ msgstr "Region"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Np. stanu lub prowincji"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -843,40 +843,44 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Pokaż link CardDAV"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Pokaż tylko do odczytu łącze VCF"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Pobiera książkę adresową"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Edytuje książkę adresową"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
-msgstr ""
+msgstr "Więcej..."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 8f4aad1f4e..706d14931b 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,87 +55,83 @@ msgstr "Błąd zapisu na dysk"
 msgid "Files"
 msgstr "Pliki"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Usuwa element"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "Już istnieje"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "zastap"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "anuluj"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "zastąpione"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "z"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "wróć"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "skasuj"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Błąd wczytywania"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "foldery"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "plik"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "pliki"
 
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index f86f0148ff..6257d72599 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 09:06+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Zewnętrzna zasoby dyskowe"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Punkt montowania"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Zaplecze"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracja"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Opcje"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Zastosowanie"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Dodaj punkt montowania"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nie ustawione"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Wszyscy uzytkownicy"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupy"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Usuń"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Główny certyfikat SSL"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importuj główny certyfikat"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Włącz zewnętrzne zasoby dyskowe użytkownika"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na montowanie  ich własnych zewnętrznych zasobów dyskowych"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 6816ef762e..f37135ec95 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 12:29+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Usuń"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Twoje udostępnione pliki"
@@ -42,10 +58,6 @@ msgstr "Odczyt"
 msgid "Edit"
 msgstr "Edycja"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Usuń"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Włącz ponowne udostępnianie"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index d46730dafd..b9273c4c45 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 07:48+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,15 +82,15 @@ msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "wykonanie jednego zadania z każdej  załadowanej strony"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php jest zarejestrowany w usłudze webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "korzystaj z usługi systemowej cron"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -234,7 +234,7 @@ msgstr "Inne"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupa Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/pl/tasks.po b/l10n/pl/tasks.po
index 563964d39b..39026f9020 100644
--- a/l10n/pl/tasks.po
+++ b/l10n/pl/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 09:20+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Zła data/czas"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Zadania"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Brak kategorii"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Nieokreślona"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=najwyższy"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=średni"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=mało ważny "
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Podsumowanie puste"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Nieprawidłowy procent wykonania"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Nieprawidłowy priorytet"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Dodaj zadanie"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Kolejność - domyślna"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Kolejność - wg lista"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Kolejność - wg kompletności"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Kolejność - wg lokalizacja"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Kolejność - wg priorytetu"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Kolejność - wg nazywy"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Ładuję zadania"
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Ważne"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Więcej"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Mniej"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Usuń"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 89148af24b..8dce1f22d4 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 08:52+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +20,146 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Baza DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Użytkownik DN"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste"
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Hasło"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtr logowania użytkownika"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Lista filtrów użytkownika"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Grupa filtrów"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Drzewo bazy użytkowników"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Drzewo bazy grup"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Członek grupy stowarzyszenia"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Użyj TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Nie używaj SSL dla połączeń, jeśli się nie powiedzie."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Wielkość liter serwera LDAP (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Niezalecane, użyj tylko testowo."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Pole wyświetlanej nazwy użytkownika"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Pole wyświetlanej nazwy grupy"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "w bajtach"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Pomoc"
diff --git a/l10n/pl/user_migrate.po b/l10n/pl/user_migrate.po
index 656770d554..4b85ca025a 100644
--- a/l10n/pl/user_migrate.po
+++ b/l10n/pl/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 09:09+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Eksport"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Coś poszło źle, podczas generowania pliku eksportu"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Wystąpił błąd"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Eksportuj konto użytkownika"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Spowoduje to utworzenie pliku skompresowanego, który zawiera konto ownCloud."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Importuj konto użytkownika"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "paczka Zip użytkownika ownCloud"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importuj"
diff --git a/l10n/pl/user_openid.po b/l10n/pl/user_openid.po
index 48f7a0f6dc..c199a51dcb 100644
--- a/l10n/pl/user_openid.po
+++ b/l10n/pl/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-20 09:12+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "To jest punkt końcowy serwera OpenID. Aby uzyskać więcej informacji zobacz"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Tożsamość: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Obszar: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Użytkownik: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Błąd:<b>Nie wybrano użytkownika"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "można uwierzytelniać do innych witryn z tego adresu"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Autoryzowani dostawcy OpenID"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Twój adres na Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 650f1c397f..d5041bbe00 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "Não foi possível carregar a imagem temporária:"
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contatos"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
@@ -255,41 +255,41 @@ msgstr "Esta propriedade não pode estar vazia."
 msgid "Couldn't serialize elements."
 msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Selecione o tipo"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr "importado,"
 msgid " failed."
 msgstr "falhou."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua agenda de endereços."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +531,113 @@ msgstr "Carregar nova foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecionar foto do OwnCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Apelido"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Digite o apelido"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separe grupos por virgula"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor, especifique um email válido."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Digite um endereço de email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Correio para endereço"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Remover endereço de email"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Digite um número de telefone"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Remover número de telefone"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Visualizar no mapa"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar detalhes de endereço"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Adicionar notas"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Baixar contato"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Apagar contato"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nova agenda"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Salvar"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 66f9894b6a..2fedc1a4e0 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +55,7 @@ msgstr "Falha ao escrever no disco"
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Excluir"
 
@@ -83,59 +79,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "gerando arquivo ZIP, isso pode levar um tempo."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Erro de envio"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome inválido, '/' não é permitido."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "pasta"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "pastas"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "arquivo"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "arquivos"
 
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 88d7f7093c..9b31f0776f 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 6523b65a6c..bac0428b76 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "Não é possível carregar a imagem temporária: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
@@ -255,41 +255,41 @@ msgstr "Esta propriedade não pode estar vazia."
 msgid "Couldn't serialize elements."
 msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Seleccionar tipo"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr " importado, "
 msgid " failed."
 msgstr " falhou."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +531,113 @@ msgstr "Carregar nova foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecionar uma foto da ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Apagar"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introduza alcunha"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separe os grupos usando virgulas"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor indique um endereço de correio válido"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introduza endereço de email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Enviar correio para o endereço"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Eliminar o endereço de correio"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Insira o número de telefone"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Eliminar o número de telefone"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar os detalhes do endereço"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Insira notas aqui."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Transferir contacto"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Apagar contato"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Novo livro de endereços"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 346dbc3139..8219a46b3c 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Falhou a escrita no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Apagar"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Não é possivel fazer o upload do ficheiro devido a ser uma pasta ou ter 0 bytes"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Erro no upload"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "O upload foi cancelado."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "nome inválido, '/' não permitido."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "pasta"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "pastas"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "ficheiro"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 50e951397c..6428ee48f2 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index e3d9e31c1e..3c62b58926 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Contacte"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -255,41 +255,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Mesaj"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +531,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Introdu detalii despre nume"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introdu pseudonim"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "zz-ll-aaaa"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separă grupurile cu virgule"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editează grupuri"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferat"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Te rog să specifici un e-mail corect"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introdu adresa de e-mail"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Trimite mesaj la e-mail"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Șterge e-mail"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Descarcă acest contact"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Șterge contact"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Editează"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Agendă nouă"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Anulează"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index d936c43c2c..e7d65b7a03 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,7 @@ msgstr "Eroare la scriere pe disc"
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Șterge"
 
@@ -82,59 +78,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 55de7e186d..e5d92d2c9d 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index a38d426bf5..40eef069ce 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -225,7 +225,7 @@ msgstr "Не удалось загрузить временное изображ
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Контакты"
 
@@ -242,12 +242,12 @@ msgid "Couldn't get a valid address."
 msgstr "Не удалось получить адрес."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Ошибка"
 
@@ -259,41 +259,41 @@ msgstr "Это свойство должно быть не пустым."
 msgid "Couldn't serialize elements."
 msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Изменить имя"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Выберите тип"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -309,7 +309,7 @@ msgstr "импортировано, "
 msgid " failed."
 msgstr "не удалось."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -317,125 +317,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Это не ваша адресная книга."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адрес"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Ящик эл. почты"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организация"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Сообщение"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -535,113 +535,113 @@ msgstr "Загрузить новую фотографию"
 msgid "Select photo from ownCloud"
 msgstr "Выбрать фотографию из ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Формат Краткое имя, Полное имя"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Изменить детали имени"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Введите псевдоним"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Разделить группы запятыми"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Редактировать группы"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Предпочитаемый"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Укажите действительный адрес электронной почты."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Укажите адрес электронной почты"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Написать по адресу"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Удалить адрес электронной почты"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Ввести номер телефона"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Удалить номер телефона"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Показать на карте"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Ввести детали адреса"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Добавьте заметки здесь."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Добавить поле"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Заметка"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Скачать контакт"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Удалить контакт"
 
@@ -853,33 +853,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Редактировать"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Отменить"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 96d5af69cd..9c1cd54cab 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,11 +57,7 @@ msgstr "Ошибка записи на диск"
 msgid "Files"
 msgstr "Файлы"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Снять общий доступ"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
 
@@ -85,59 +81,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "удален"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "создание ZIP-файла, это может занять некоторое время."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не удается загрузить файл размером 0 байт в каталог"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Ошибка загрузки"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неверное имя, '/' не допускается."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Изменен"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "папка"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "папки"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "файлы"
 
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 1c0dc27e38..8a9650f532 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index c80dd48769..8986c83e14 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "Nemôžem načítať dočasný obrázok: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Chyba"
 
@@ -255,41 +255,41 @@ msgstr "Tento parameter nemôže byť prázdny."
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Vybrať typ"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr " importovaných, "
 msgid " failed."
 msgstr " zlyhaných."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Biznis"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Iné"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Otázky"
 
@@ -531,113 +531,113 @@ msgstr "Nahrať novú fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Upraviť podrobnosti mena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Zadajte prezývku"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Oddelte skupiny čiarkami"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Úprava skupín"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Uprednostňované"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Prosím zadajte platnú e-mailovú adresu."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Zadajte e-mailové adresy"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Odoslať na adresu"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Odstrániť e-mailové adresy"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Zadajte telefónne číslo"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Odstrániť telefónne číslo"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Upraviť podrobnosti adresy"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Tu môžete pridať poznámky."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Pridať pole"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefón"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Stiahnuť kontakt"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Odstrániť kontakt"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Upraviť"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nový adresár"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index dbbe973d3f..cadb54078e 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "Zápis na disk sa nepodaril"
 msgid "Files"
 msgstr "Súbory"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Chyba nahrávania"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Čaká sa"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Nahrávanie zrušené"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Chybný názov, \"/\" nie je povolené"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "priečinok"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "priečinky"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "súbor"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "súbory"
 
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 30cc68b231..0a0ea8cd90 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 3bfd97ff7c..e2305fea68 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 20:56+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -221,7 +221,7 @@ msgstr "Začasne slike ni bilo mogoče naložiti: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Ne morem dobiti veljavnega naslova."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Napaka"
 
@@ -255,41 +255,41 @@ msgstr "Ta lastnost ne sme biti prazna"
 msgid "Couldn't serialize elements."
 msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Uredi ime"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Napaka pri nalaganju slike profila."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Izberite vrsto"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "Ali želite združiti adresarje?"
 
@@ -305,7 +305,7 @@ msgstr " uvoženih, "
 msgid " failed."
 msgstr " je spodletelo."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Ime za prikaz ne more biti prazno."
 
@@ -313,125 +313,125 @@ msgstr "Ime za prikaz ne more biti prazno."
 msgid "Addressbook not found: "
 msgstr "Adresar ni bil najden:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "To ni vaš imenik."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-pošta"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Klic"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Stranka"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Dostavljalec"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Prazniki"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Potovanje"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubilej"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Drugo"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Osebno"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Vprašanja"
 
@@ -531,113 +531,113 @@ msgstr "Naloži novo sliko"
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Uredite podrobnosti imena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Vnesite vzdevek"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Spletna stran"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.nekastran.si"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Pojdi na spletno stran"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Skupine ločite z vejicami"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Uredi skupine"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Prednosten"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Prosimo, če navedete veljaven e-poštni naslov."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Vnesite e-poštni naslov"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "E-pošta naslovnika"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Izbriši e-poštni naslov"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Vpiši telefonsko številko"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Izbriši telefonsko številko"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Uredi podrobnosti"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Opombe dodajte tukaj."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Opomba"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Prenesi stik"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Izbriši stik"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr "Pokaži VCF povezavo samo za branje"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Nov imenik"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Ime"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Opis"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Več..."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 4fa6cd3746..11c8ef1804 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 13:04+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,7 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Vzemi iz souporabe"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -82,59 +78,59 @@ msgstr "nadomeščen"
 msgid "with"
 msgstr "z"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Ustvarjam ZIP datoteko. To lahko traja nekaj časa."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Napaka pri nalaganju"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Na čakanju"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Nalaganje je bilo preklicano."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index e6928f35fa..4f1cca8ec7 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 12:59+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Izbris"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Vaše datoteke v souporabi"
@@ -42,10 +58,6 @@ msgstr "Branje"
 msgid "Edit"
 msgstr "Pisanje"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Izbris"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Omogoči nadaljnjo izmenjavo"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index eb28790891..2a30832696 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/so/files.po b/l10n/so/files.po
index f8fd36a22b..576444ca8e 100644
--- a/l10n/so/files.po
+++ b/l10n/so/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index c0534448ee..2915fa0f8a 100644
--- a/l10n/so/files_sharing.po
+++ b/l10n/so/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index db92cfe5b3..4c6537047c 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Пожељан"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Преузми контакт"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Обриши контакт"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Преузимање"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Сними"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index a6c92cc1ce..f8aaefdd55 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Фајлови"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Обриши"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Задња измена"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index b3e8247b76..0b3da46c84 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index e729393237..64e506d3e2 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index f0c1194be7..b72a13bcbb 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Obriši"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 43f1f498e7..608e5538cc 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index d20a227acb..55b65ae245 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-17 07:25+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -224,7 +224,7 @@ msgstr "Kunde inte ladda tillfällig bild:"
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -241,12 +241,12 @@ msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fel"
 
@@ -258,41 +258,41 @@ msgstr "Denna egenskap får inte vara tom."
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "Fel vid hämtning av profilbild."
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Välj typ"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "Vill du slå samman dessa adressböcker?"
 
@@ -308,7 +308,7 @@ msgstr "importerad,"
 msgid " failed."
 msgstr "misslyckades."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "Visningsnamn får inte vara tomt."
 
@@ -316,125 +316,125 @@ msgstr "Visningsnamn får inte vara tomt."
 msgid "Addressbook not found: "
 msgstr "Adressboken hittades inte:"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Resa"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Möte"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Annat"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Frågor"
 
@@ -534,113 +534,113 @@ msgstr "Ladda upp ett nytt foto"
 msgid "Select photo from ownCloud"
 msgstr "Välj foto från ownCloud"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Redigera detaljer för namn"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Ange smeknamn"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Webbplats"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Gå till webbplats"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separera grupperna med kommatecken"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editera grupper"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Föredragen"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Vänligen ange en giltig e-postadress."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Ange e-postadress"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Posta till adress."
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Ta bort e-postadress"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Ange telefonnummer"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Ta bort telefonnummer"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Visa på karta"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Redigera detaljer för adress"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Lägg till noteringar här."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Lägg till fält"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Notering"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Ladda ner kontakt"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Radera kontakt"
 
@@ -852,33 +852,37 @@ msgid "Show read-only VCF link"
 msgstr "Visa skrivskyddad VCF-länk"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Nedladdning"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Redigera"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "Namn"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "Beskrivning"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Spara"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "Mer..."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 819753d4bf..6eddb63409 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
-"PO-Revision-Date: 2012-08-05 17:06+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,11 +57,7 @@ msgstr "Misslyckades spara till disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Sluta dela"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -85,59 +81,59 @@ msgstr "ersatt"
 msgid "with"
 msgstr "med"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "ångra"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "raderad"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Gererar ZIP-fil. Det kan ta lite tid."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Uppladdningsfel"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:690 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:691 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:718
+#: js/files.js:731
 msgid "folder"
 msgstr "mapp"
 
-#: js/files.js:720
+#: js/files.js:733
 msgid "folders"
 msgstr "mappar"
 
-#: js/files.js:728
+#: js/files.js:741
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:730
+#: js/files.js:743
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index d48e54c277..9336f07bfe 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 10:19+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Radera"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "Dina delade filer"
@@ -42,10 +58,6 @@ msgstr "Läsa"
 msgid "Edit"
 msgstr "Ändra"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "Radera"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "Aktivera dela vidare"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 937a61857a..415967f994 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index d98a9734fa..74cfc023d9 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 6de5ed60ac..38abd57c75 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index f68a48cb23..4d8be8b1dd 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr ""
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index c51a96c39a..6e10c69fb3 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:116
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:115
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:44
+#: lib/app.php:186 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -538,7 +538,7 @@ msgstr ""
 
 #: templates/part.contact.php:39 templates/part.contact.php:41
 #: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:33
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 64a7558f57..83294c8a64 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index c7fdd2ab4b..ac25f5a5b7 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,11 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -79,59 +75,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 1b662cfe22..70ad92afa3 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 0e2addeae4..68e42f4c2d 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b22fd5200b..bccd741827 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index b603771b68..08a0923d5b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 3da7373d74..5de7c45c4c 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:42
 msgid "Pictures"
 msgstr ""
 
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0347424549..c94ee8911f 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:249
+#: files.php:276
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:250
+#: files.php:277
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:250 files.php:275
+#: files.php:277 files.php:302
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:274
+#: files.php:301
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 92ef602a4f..e85bfeb2f9 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d280cf6544..0163e822fd 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 140661bf31..5711ab0f4f 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index d4cb01eef0..b03173f6d1 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 94814afec2..98f17c57cd 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 06813aae87..abacde3d73 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index a4507907d0..8877a0fd64 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 15:10+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -220,7 +220,7 @@ msgstr "ไม่สามารถโหลดรูปภาพชั่วค
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
@@ -254,41 +254,41 @@ msgstr "คุณสมบัตินี้ต้องไม่มีข้อ
 msgid "Couldn't serialize elements."
 msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว"
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "เลือกชนิด"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?"
 
@@ -304,7 +304,7 @@ msgstr " นำเข้าข้อมูลแล้ว, "
 msgid " failed."
 msgstr " ล้มเหลว."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้"
 
@@ -312,125 +312,125 @@ msgstr "ชื่อที่ใช้แสดงไม่สามารถเ
 msgid "Addressbook not found: "
 msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:112 templates/part.contact.php:116
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:114 templates/part.contact.php:115
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "หน่วยงาน"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "มือถือ"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "ข้อความ"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "เสียงพูด"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "ข้อความ"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "วีดีโอ"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "เพจเจอร์"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
-#: lib/app.php:183 templates/part.contact.php:44
+#: lib/app.php:186 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "วันเกิด"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "ธุรกิจ"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "โทร"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "ลูกค้า"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "ผู้จัดส่ง"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "วันหยุด"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "ไอเดีย"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "การเดินทาง"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "งานเฉลิมฉลอง"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "ประชุม"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "โปรเจค"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "คำถาม"
 
@@ -540,7 +540,7 @@ msgstr "แก้ไขรายละเอียดของชื่อ"
 
 #: templates/part.contact.php:39 templates/part.contact.php:41
 #: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:33
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "ลบ"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น"
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr "ชื่อ"
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr "คำอธิบาย"
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr "เพิ่มเติม..."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index c5a8f013b6..773e125153 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 12:47+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "ยกเลิกการแชร์ข้อมูล"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "ลบ"
 
@@ -81,59 +77,59 @@ msgstr "แทนที่แล้ว"
 msgid "with"
 msgstr "กับ"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "ลบแล้ว"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "ไฟล์"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "ไฟล์"
 
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 250856835f..8b9059df3f 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:14+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "ลบ"
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr "ไฟล์ของคุณที่แชร์ไว้"
@@ -42,10 +58,6 @@ msgstr "อ่าน"
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr "ลบ"
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr "เปิดให้มีการแชร์ใหม่อีกครั้งได้"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index bcf5ad88c3..2a4251ad02 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "Geçici resmi yükleyemedi :"
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Kişiler"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "Geçerli bir adres alınamadı."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Hata"
 
@@ -255,41 +255,41 @@ msgstr "Bu özellik boş bırakılmamalı."
 msgid "Couldn't serialize elements."
 msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "İsmi düzenle"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "Tür seç"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr " içe aktarıldı, "
 msgid " failed."
 msgstr " hatalı."
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz değil."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "mesaj"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "İnternet"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Doğum günü"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr "İş"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr "Çağrı"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr "Müşteriler"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr "Dağıtıcı"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr "Tatiller"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr "Fikirler"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr "Seyahat"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr "Yıl Dönümü"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr "Diğer"
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr "Kişisel"
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr "Projeler"
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr "Sorular"
 
@@ -531,113 +531,113 @@ msgstr "Yeni fotoğraf yükle"
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "İsim detaylarını düzenle"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Takma adı girin"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr "Web sitesi"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr "Web sitesine git"
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "gg-aa-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Grupları birbirinden virgülle ayırın"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Grupları düzenle"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Tercih edilen"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Lütfen geçerli bir eposta adresi belirtin."
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Eposta adresini girin"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Eposta adresi"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Eposta adresini sil"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Telefon numarasını gir"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Telefon numarasını sil"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Haritada gör"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Adres detaylarını düzenle"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Notları buraya ekleyin."
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Alan ekle"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Not"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "Kişiyi indir"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Kişiyi sil"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "İndir"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "İptal"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index d63bb38a57..3498950112 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,7 @@ msgstr "Diske yazılamadı"
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Paylaşılmayan"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Sil"
 
@@ -82,59 +78,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "silindi"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Yükleme hatası"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "dizin"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "dizinler"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "dosya"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "dosyalar"
 
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 47f149e2b3..9c3811ac32 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index a9c12c6def..11f555f3db 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Видалити контакт"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "Нова адресна книга"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index ef13ab4cc1..8fb3ea8778 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr ""
 msgid "Files"
 msgstr "Файли"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "Заборонити доступ"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Видалити"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "видалені"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "Створення ZIP-файлу, це може зайняти певний час."
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Помилка завантаження"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Некоректне ім'я, '/' не дозволено."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "тека"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "теки"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "файли"
 
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index bb60168265..736b17eebc 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 5533bf5bc5..c0310d9554 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "Liên lạc"
 
@@ -236,12 +236,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -253,41 +253,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -311,125 +311,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "Điện thoại bàn"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "Công việc"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "Nhà"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "Di động"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "số trang"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Ngày sinh nhật"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +529,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "Xóa liên lạc"
 
@@ -847,33 +847,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "Sửa"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "Hủy"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index fa964a6646..8ce76018a8 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Tập tin"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "Xóa"
 
@@ -80,59 +76,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "Tải lên lỗi"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Chờ"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "Tên không hợp lệ ,không được phép dùng '/'"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr "folders"
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr "file"
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr "files"
 
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 4aa6347091..7f9dea863b 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
index fc13248c05..ea3990d546 100644
--- a/l10n/zh_CN.GB2312/contacts.po
+++ b/l10n/zh_CN.GB2312/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -252,41 +252,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -310,125 +310,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +528,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr ""
 
@@ -846,33 +846,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index b1da62d32e..80307c381e 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 14:04+0000\n"
-"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,7 @@ msgstr "写磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "未分享的"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "删除"
 
@@ -80,59 +76,59 @@ msgstr "替换过了"
 msgid "with"
 msgstr "随着"
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "删除"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成ZIP文件,这可能需要点时间"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "Pending"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index a3a249084f..b567f3ded2 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index f863dd7a04..c4f13a9333 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "无法加载临时图像: "
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "联系人"
 
@@ -238,12 +238,12 @@ msgid "Couldn't get a valid address."
 msgstr "无法获取一个合法的地址。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "错误"
 
@@ -255,41 +255,41 @@ msgstr "这个属性必须是非空的"
 msgid "Couldn't serialize elements."
 msgstr "无法序列化元素"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr "编辑名称"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr "选择类型"
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr " 已导入， "
 msgid " failed."
 msgstr " 失败。"
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -313,125 +313,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "消息"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "传呼机"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "互联网"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +531,113 @@ msgstr "上传新照片"
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "自定义格式，简称，全名，姓在前，姓在前并用逗号分割"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "编辑名称详情"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "删除"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "昵称"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "输入昵称"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "分组"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "用逗号隔开分组"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "编辑分组"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "偏好"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "请指定合法的电子邮件地址"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "输入电子邮件地址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "发送邮件到地址"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "删除电子邮件地址"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "输入电话号码"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "删除电话号码"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "在地图上显示"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "编辑地址细节。"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "添加注释。"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "添加字段"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "电话"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "注释"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "下载联系人"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "删除联系人"
 
@@ -849,33 +849,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "下载"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "编辑"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "新建地址簿"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "保存"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 981e62bfb4..84d5ee092d 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 05:47+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "写入磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr "取消共享"
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "删除"
 
@@ -81,59 +77,59 @@ msgstr "已经替换"
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr "已经删除"
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成 ZIP 文件，可能需要一些时间"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr "操作等待中"
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:694 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:695 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:722
+#: js/files.js:731
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:724
+#: js/files.js:733
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:732
+#: js/files.js:741
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:734
+#: js/files.js:743
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 60a76214fe..cfd1d21785 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 98be89a161..bf7bf3b0d6 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19
+#: appinfo/app.php:21
 msgid "Contacts"
 msgstr "通訊錄"
 
@@ -237,12 +237,12 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:850
-#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
-#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
+#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
+#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
+#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
+#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
+#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -254,41 +254,41 @@ msgstr ""
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:852 js/contacts.js:870
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:886
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1167
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1175
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1236
+#: js/contacts.js:1238
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1337 js/contacts.js:1371
+#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1390
+#: js/contacts.js:1410
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1461
+#: js/contacts.js:1481
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: js/settings.js:67
+#: js/settings.js:68
 msgid "Displayname cannot be empty."
 msgstr ""
 
@@ -312,125 +312,125 @@ msgstr ""
 msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:49
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:68
+#: lib/app.php:71
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:115 templates/part.contact.php:116
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:113
+#: lib/app.php:116
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:117 templates/part.contact.php:115
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+#: lib/app.php:131 lib/app.php:135 lib/app.php:148
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:138
+#: lib/app.php:141
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:139
+#: lib/app.php:142
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:140
+#: lib/app.php:143
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:146
+#: lib/app.php:149
 msgid "Internet"
 msgstr "網際網路"
 
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:186 templates/part.contact.php:44
+#: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:197
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:198
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:199
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +530,113 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "編輯姓名詳細資訊"
 
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:36
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "綽號"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "輸入綽號"
 
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "群組"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "用逗號分隔群組"
 
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "編輯群組"
 
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "首選"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "註填入合法的電子郵件住址"
 
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "輸入電子郵件地址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "寄送住址"
 
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "刪除電子郵件住址"
 
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "輸入電話號碼"
 
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "刪除電話號碼"
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "電子郵件住址詳細資訊"
 
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "在這裡新增註解"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "新增欄位"
 
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "電話"
 
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "註解"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
 msgid "Download contact"
 msgstr "下載通訊錄"
 
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
 msgid "Delete contact"
 msgstr "刪除通訊錄"
 
@@ -848,33 +848,37 @@ msgid "Show read-only VCF link"
 msgstr ""
 
 #: templates/settings.php:26
+msgid "Share"
+msgstr ""
+
+#: templates/settings.php:29
 msgid "Download"
 msgstr "下載"
 
-#: templates/settings.php:30
+#: templates/settings.php:33
 msgid "Edit"
 msgstr "編輯"
 
-#: templates/settings.php:40
+#: templates/settings.php:43
 msgid "New Address Book"
 msgstr "新電話簿"
 
-#: templates/settings.php:41
+#: templates/settings.php:44
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:45
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:46
 msgid "Save"
 msgstr "儲存"
 
-#: templates/settings.php:44
+#: templates/settings.php:47
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/settings.php:49
+#: templates/settings.php:52
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 8c8f682614..627c3aa115 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +53,7 @@ msgstr "寫入硬碟失敗"
 msgid "Files"
 msgstr "檔案"
 
-#: js/fileactions.js:95
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:97 templates/index.php:56
+#: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
 msgstr "刪除"
 
@@ -81,59 +77,59 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:256
+#: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:246
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:170
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:199
+#: js/files.js:200
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:227 js/files.js:318 js/files.js:347
+#: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:332
+#: js/files.js:333
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:456
+#: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:703 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:704 templates/index.php:56
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:659
+#: js/files.js:731
 msgid "folder"
 msgstr ""
 
-#: js/files.js:661
+#: js/files.js:733
 msgid "folders"
 msgstr ""
 
-#: js/files.js:669
+#: js/files.js:741
 msgid "file"
 msgstr ""
 
-#: js/files.js:671
+#: js/files.js:743
 msgid "files"
 msgstr ""
 
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 29566a0bae..73959cb5b4 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: templates/get.php:4
+msgid "Size"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Modified"
+msgstr ""
+
+#: templates/get.php:5
+msgid "Delete all"
+msgstr ""
+
+#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
 #: templates/list.php:2
 msgid "Your Shared Files"
 msgstr ""
@@ -41,10 +57,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/list.php:16 templates/list.php:17
-msgid "Delete"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Enable Resharing"
 msgstr ""
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index dcc592f513..7b95d6f9af 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -51,6 +51,7 @@
 "Create" => "Crea",
 "Default Quota" => "Quota per defecte",
 "Other" => "Altre",
+"Group Admin" => "Grup Admin",
 "Quota" => "Quota",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index c2c0d7a826..f17fb11fa7 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -12,6 +12,8 @@
 "Saving..." => "Gemmer...",
 "__language_name__" => "Dansk",
 "Security Warning" => "Sikkerhedsadvarsel",
+"Cron" => "Cron",
+"cron.php is registered at a webcron service" => "cron.php er tilmeldt en webcron tjeneste",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 846fb769f2..89516b1c7f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -51,6 +51,7 @@
 "Create" => "Créer",
 "Default Quota" => "Quota par défaut",
 "Other" => "Autre",
+"Group Admin" => "Groupe Admin",
 "Quota" => "Quota",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 17efda2d22..93201a9dfe 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -51,6 +51,7 @@
 "Create" => "作成",
 "Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
+"Group Admin" => "グループ管理者",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 87c9cecb24..e5968bcd4a 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,7 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
+"Email saved" => "E-postadresse lagra",
+"Invalid email" => "Ugyldig e-postadresse",
 "OpenID Changed" => "OpenID endra",
 "Invalid request" => "Ugyldig førespurnad",
+"Authentication error" => "Feil i autentisering",
 "Language changed" => "Språk endra",
+"Error" => "Feil",
+"Disable" => "Slå av",
+"Enable" => "Slå på",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
 "-licensed" => "-lisensiert",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index eef450fa68..de9384a244 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -13,6 +13,9 @@
 "__language_name__" => "Polski",
 "Security Warning" => "Ostrzeżenia bezpieczeństwa",
 "Cron" => "Cron",
+"execute one task with each page loaded" => "wykonanie jednego zadania z każdej  załadowanej strony",
+"cron.php is registered at a webcron service" => "cron.php jest zarejestrowany w usłudze webcron",
+"use systems cron service" => "korzystaj z usługi systemowej cron",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",
@@ -48,6 +51,7 @@
 "Create" => "Utwórz",
 "Default Quota" => "Domyślny udział",
 "Other" => "Inne",
+"Group Admin" => "Grupa Admin",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );

From 49229da0e12ed950288ca5c44bbaf4e7b85e3542 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 20 Aug 2012 17:25:55 -0400
Subject: [PATCH 1494/1537] Remove setTarget from ajax

---
 core/ajax/share.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index ee9700295e..4ff12af9eb 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -40,12 +40,6 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
-		case 'setTarget':
-			if (isset($_POST['newTarget'])) {
-				$return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']);
-				($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['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);

From 09e851a9c4751db6225130bdb6290e65308f8c76 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 20 Aug 2012 20:00:29 -0400
Subject: [PATCH 1495/1537] Fix share ajax calls to use itemName/itemSource,
 show who shared a file with you

---
 core/ajax/share.php  | 22 ++++++++------
 core/js/share.js     | 68 +++++++++++++++++++++++++-------------------
 lib/public/share.php |  2 +-
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 4ff12af9eb..9376f18e8a 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,12 +21,12 @@
 require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
-if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item'])) {
+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'])) {
+			if (isset($_POST['itemName']) && isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					OCP\Share::shareItem($_POST['itemType'], $_POST['item'], $_POST['item'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+					OCP\Share::shareItem($_POST['itemType'], $_POST['itemName'], $_POST['itemSource'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 					// TODO May need to return private link
 					OC_JSON::success();
 				} catch (Exception $exception) {
@@ -36,13 +36,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 			break;
 		case 'unshare':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith'])) {
-				$return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_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['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+				$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
@@ -56,10 +56,14 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item']
 			}
 			break;
 		case 'getItem':
-			// TODO Check if the item was shared to the current user
-			if (isset($_GET['itemType']) && isset($_GET['item'])) {
-				$return = OCP\Share::getItemShared($_GET['itemType'], $_GET['item']);
-				($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+			if (isset($_GET['itemType']) && isset($_GET['itemName']) && isset($_GET['itemSource'])) {
+				$reshare = OCP\Share::getItemSharedWith($_GET['itemType'], $_GET['itemName'], OCP\Share::FORMAT_NONE, null, true);
+				if ($_GET['itemSource'] !== false) {
+					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']);
+				} else {
+					$shares = false;
+				}
+				OC_JSON::success(array('data' => array('reshare' => $reshare, 'shares' => $shares)));
 			}
 			break;
 		case 'getShareWith':
diff --git a/core/js/share.js b/core/js/share.js
index bd145eab41..418d18f86b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -30,21 +30,22 @@ OC.Share={
 			}
 		});
 	},
-	loadItem:function(itemType, item) {
+	loadItem:function(itemType, itemName, itemSource) {
 		var data = '';
-		if (typeof OC.Share.statuses[item] !== 'undefined') {
-			$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, item: item }, async: false, success: function(result) {
-				if (result && result.status === 'success') {
-					data = result.data;
-				} else {
-					data = false;
-				}
-			}});
+		if (typeof OC.Share.statuses[itemName] === 'undefined') {
+			itemSource = false;
 		}
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemName: itemName, itemSource: itemSource }, async: false, success: function(result) {
+			if (result && result.status === 'success') {
+				data = result.data;
+			} else {
+				data = false;
+			}
+		}});
 		return data;
 	},
-	share:function(itemType, item, shareType, shareWith, permissions, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+	share:function(itemType, itemName, itemSource, shareType, shareWith, permissions, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, itemName: itemName, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
 			if (result && result.status === 'success') {
 				if (callback) {
 					callback(result.data);
@@ -54,8 +55,8 @@ OC.Share={
 			}
 		});
 	},
-	unshare:function(itemType, item, shareType, shareWith, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith }, function(result) {
+	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();
@@ -65,15 +66,24 @@ OC.Share={
 			}
 		});
 	},
-	setPermissions:function(itemType, item, shareType, shareWith, permissions) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+	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, item, appendTo, privateLink, possiblePermissions) {
-		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item="'+item+'">';
+	showDropDown:function(itemType, itemName, itemSource, appendTo, privateLink, possiblePermissions) {
+		var data = OC.Share.loadItem(itemType, itemName, itemSource);
+		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-name="'+itemName+'" 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>';
@@ -88,9 +98,8 @@ OC.Share={
 		$(html).appendTo(appendTo);
 		// Reset item shares
 		OC.Share.itemShares = [];
-		var data = OC.Share.loadItem(itemType, item);
-		if (data) {
-			$.each(data, function(index, share) {
+		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 {
@@ -127,7 +136,7 @@ OC.Share={
 			$(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'), shareType, shareWith, permissions, function() {
+			OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item-name'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
 				OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
 				$('#shareWith').val('');
 			});
@@ -242,9 +251,10 @@ $(document).ready(function() {
 
 	$('a.share').live('click', function(event) {
 		event.stopPropagation();
-		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
+		if ($(this).data('item-type') !== undefined && $(this).data('item-name') !== undefined  && $(this).data('item-source') !== undefined) {
 			var itemType = $(this).data('item-type');
-			var item = $(this).data('item');
+			var itemName = $(this).data('item-name');
+			var itemSource = $(this).data('item-source');
 			var appendTo = $(this).parent().parent();
 			var privateLink = false;
 			var possiblePermissions = $(this).data('possible-permissions');
@@ -254,13 +264,13 @@ $(document).ready(function() {
 			if (OC.Share.droppedDown) {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
-						OC.Share.showDropDown(itemType, item, appendTo, privateLink, possiblePermissions);
+						OC.Share.showDropDown(itemType, itemName, itemSource, appendTo, privateLink, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
-				OC.Share.showDropDown(itemType, item, appendTo, privateLink, possiblePermissions);
+				OC.Share.showDropDown(itemType, itemName, itemSource, appendTo, privateLink, possiblePermissions);
 			}
 		}
 	});
@@ -306,14 +316,14 @@ $(document).ready(function() {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
 						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
-						OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
+						OC.Share.showDropDown(itemType, '/'+filename, item, appendTo, true, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
+				OC.Share.showDropDown(itemType, '/'+filename, item, appendTo, true, possiblePermissions);
 			}
 		});
 	}
@@ -350,7 +360,7 @@ $(document).ready(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'), shareType, shareWith, function() {
+		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);
@@ -381,7 +391,7 @@ $(document).ready(function() {
 		$(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'), $(li).data('share-type'), $(li).data('share-with'), 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() {
diff --git a/lib/public/share.php b/lib/public/share.php
index c57016fb98..6d4749b1ac 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -520,7 +520,7 @@ class Share {
 					if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {
 						$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, share_with, permissions, file_target, *PREFIX*fscache.id, path as file_source, name, ctime, mtime, mimetype, size, encrypted, versioned, writable';
 					} else {
-						$select = '*PREFIX*share.id, item_type, item_source, item_target, *PREFIX*share.parent, share_type, share_with, permissions, stime, path as file_source, file_target';
+						$select = '*PREFIX*share.id, item_type, item_source, item_target, *PREFIX*share.parent, share_type, share_with, uid_owner, permissions, stime, path as file_source, file_target';
 					}
 				} else {
 					$select = '*';

From 68f5dc2a44987945edb13754c9da8133a8f468f3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 20 Aug 2012 21:21:37 -0400
Subject: [PATCH 1496/1537] Remove unnecessary files

---
 apps/files_external/lib/dropboxtest.php | 71 -------------------------
 apps/files_external/lib/googletest.php  |  8 ---
 2 files changed, 79 deletions(-)
 delete mode 100644 apps/files_external/lib/dropboxtest.php
 delete mode 100644 apps/files_external/lib/googletest.php

diff --git a/apps/files_external/lib/dropboxtest.php b/apps/files_external/lib/dropboxtest.php
deleted file mode 100644
index 686549e16b..0000000000
--- a/apps/files_external/lib/dropboxtest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-require_once 'dropbox.php';
-// $oauth = new Dropbox_OAuth_Curl('526ar3qlrtzmv65', '3bbn0wo5lzgpjty');
-$dropbox = new OC_Filestorage_Dropbox(array('app_key' => '526ar3qlrtzmv65', 'app_secret' => '3bbn0wo5lzgpjty', 'token' => 'a3ben02jb1y538a',    'token_secret' => 'x60h3fsky21r1b0'));
-$dropbox->rename('/652072main_2012-2897_full (1).jpg', '/test.jpg');
-// $dropbox->test();
-// print_r($dropbox->mkdir('Again'));
-
-// GET&https%3A%2F%2Fapi.dropbox.com%2F1%2Fmetadata%2Fdropbox%2FownCloud&list%3D0%26
-
-// uzpi8oo2rbax1po
-// th9uoso3xxny3ca
-//Step 3: Acquiring access tokens Array ( [token] => 37my637p88ng967 [token_secret] => t49fmgp3omucnnr )
-//The user is authenticated You should really save the oauth tokens somewhere, so the first steps will no longer be needed Array ( [token] => 37my637p88ng967 [token_secret] => t49fmgp3omucnnr )
-
-// For convenience, definitely not required
-// header('Content-Type: text/plain');
-
-// // We need to start a session
-// session_start();
-
-// There are multiple steps in this workflow, we keep a 'state number' here
-// if (isset($_SESSION['state'])) {
-//     $state = 2;
-// } else {
-//     $state = 1;
-// }
-// 
-// switch($state) {
-// 
-//     /* In this phase we grab the initial request tokens
-//        and redirect the user to the 'authorize' page hosted
-//        on dropbox */
-//     case 1 :
-//         echo "Step 1: Acquire request tokens\n";
-//         $tokens = $oauth->getRequestToken();
-//         print_r($tokens);
-// 
-//         // Note that if you want the user to automatically redirect back, you can
-//         // add the 'callback' argument to getAuthorizeUrl.
-//         echo "Step 2: You must now redirect the user to:\n";
-//         echo $oauth->getAuthorizeUrl() . "\n";
-//         $_SESSION['state'] = 2;
-//         $_SESSION['oauth_tokens'] = $tokens;
-//         die();
-// 
-//     /* In this phase, the user just came back from authorizing
-//        and we're going to fetch the real access tokens */
-//     case 2 :
-//         echo "Step 3: Acquiring access tokens\n";
-//         $oauth->setToken($_SESSION['oauth_tokens']);
-//         $tokens = $oauth->getAccessToken();
-//         print_r($tokens);
-//         $_SESSION['state'] = 3;
-//         $_SESSION['oauth_tokens'] = $tokens;
-//         // There is no break here, intentional
-// 
-//     /* This part gets called if the authentication process
-//        already succeeded. We can use our stored tokens and the api
-//        should work. Store these tokens somewhere, like a database */
-//     case 3 :
-//         echo "The user is authenticated\n";
-//         echo "You should really save the oauth tokens somewhere, so the first steps will no longer be needed\n";
-//         print_r($_SESSION['oauth_tokens']);
-//         $oauth->setToken($_SESSION['oauth_tokens']);
-//         break;
-// 
-// }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/googletest.php b/apps/files_external/lib/googletest.php
deleted file mode 100644
index a80af6a097..0000000000
--- a/apps/files_external/lib/googletest.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-require_once 'google.php';
-
-// $drive = new OC_Filestorage_Google(array('token' => '4/7nZMlRLlAEeXdY0AeH-eHNCL0YaK', 'token_secret' => 'NqO5VMGUVkwFtOYqHsex4257'));
-// $drive = new OC_Filestorage_Google(array('token' => '1/4Xo84YtTxL2MkQst-Ti3nqF1Isy70NUHDRk-BwsLMf4', 'token_secret' => 'jYnyJ_4-ITNxlX9f9RDNoRW-'));
-// var_export($drive->getFeed('https://docs.google.com/feeds/metadata/default', 'GET'));
-

From 8d38dc04a0d5565a6fa003af10a36f4ec70354dc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Aug 2012 03:55:01 +0200
Subject: [PATCH 1497/1537] Remove class contactsection

---
 apps/contacts/templates/part.contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 41c9122137..e74eef7d7e 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -24,7 +24,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 	</div>
 	</div> <!-- contact_photo -->
 
-	<div id="contact_identity" class="contactsection">
+	<div id="contact_identity">
 	<form method="post">
 	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
 	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">

From 25dd0e940fca6a5f48cb224e0dcd7f13dbcf2728 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Aug 2012 03:56:12 +0200
Subject: [PATCH 1498/1537] Preliminary support for Apple X-ABLabel. Also for
 oc-1508.

---
 apps/contacts/css/contacts.css | 11 ++++++-----
 apps/contacts/js/contacts.js   | 26 +++++++++++++++++---------
 apps/contacts/lib/app.php      |  2 ++
 apps/contacts/lib/vcard.php    |  8 +++++++-
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index d7c9a6bf34..483df2196a 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -32,7 +32,7 @@
 
 #card input[type="text"].contacts_property,input[type="email"].contacts_property,input[type="url"].contacts_property { width: 14em; float: left; font-weight: bold; }
 .categories { float: left; width: 16em; }
-#card input[type="text"],input[type="email"],input[type="url"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
+#card input[type="checkbox"].contacts_property,input[type="text"],input[type="email"],input[type="url"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
 #card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="url"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="url"]:active,input[type="tel"]:active, select:hover, select:focus, select:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
 textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
 dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
@@ -72,11 +72,11 @@ label:hover, dt:hover { color: #333; }
 #name { /*position: absolute; top: 0px; left: 0px;*/ min-width: 25em; height: 2em; clear: right; display: block; }
 #identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
 #contact_photo { float: left; margin: 1em; }
-#contact_identity { min-width: 30em; }
+#contact_identity { min-width: 30em; padding: 0.5em;}
 .contactsection { position: relative; float: left; width: 35em; padding: 0.5em; height: auto; }
 
 #cropbox { margin: auto; }
-#contacts_details_photo_wrapper { width: 200px; }
+#contacts_details_photo_wrapper { width: 150px; }
 #contacts_details_photo_wrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background: url('%webroot%/core/img/loading.gif') no-repeat center center; cursor: wait; }
 .contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; opacity: 1; }
 .contacts_details_photo:hover { background: #fff; cursor: default; }
@@ -120,9 +120,10 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .propertylist { clear: none; max-width: 28em; }
 .propertylist li.propertycontainer { white-space: nowrap; min-width: 35em; /*max-width: 30em;*/ display: block; clear: right; }
 .propertycontainer[data-element="EMAIL"] > input[type="email"],.propertycontainer[data-element="TEL"] > input[type="text"] { min-width: 12em !important; float: left; }
-.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
+.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 16px; height: 16px; vertical-align: middle; padding: 0; }
 .propertylist li > select { float: left; max-width: 8em; }
-.typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb} /* for multiselect */
+.propertylist li > label.xab { display: block; color: #bbb; float:left; clear: both; padding: 0.5em 0 0 2.5em; }
+.typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb; box-shadow: none; } /* for multiselect */
 .typelist[type="button"]:hover { color: #777; } /* for multiselect */
 .addresslist { clear: both; font-weight: bold; }
 #ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; opacity: 0.9; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 8f52ec8873..38f81213c0 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1231,6 +1231,7 @@ OC.Contacts={
 			$(this.photo).load(function () {
 				$('img.contacts_details_photo').remove()
 				$(this).addClass('contacts_details_photo');
+				wrapper.css('width', $(this).get(0).width + 10);
 				wrapper.removeClass('loading').removeClass('wait');
 				$(this).insertAfter($('#phototools')).fadeIn();
 			}).error(function () {
@@ -1304,8 +1305,11 @@ OC.Contacts={
 			var emaillist = $('#emaillist');
 			for(var mail in this.data.EMAIL) {
 				this.addMail();
-				//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
-				var curemail = emaillist.find('li:last-child');
+				emaillist.find('li:last-child').find('select').multiselect('destroy');
+				var curemail = emaillist.find('li.propertycontainer:last-child');
+				if(typeof this.data.EMAIL[mail].label != 'undefined') {
+					curemail.prepend('<label class="xab">'+this.data.EMAIL[mail].label+'</label>');
+				}
 				curemail.data('checksum', this.data.EMAIL[mail]['checksum'])
 				curemail.find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
 				for(var param in this.data.EMAIL[mail]['parameters']) {
@@ -1363,18 +1367,22 @@ OC.Contacts={
 			var phonelist = $('#phonelist');
 			for(var phone in this.data.TEL) {
 				this.addPhone();
-				phonelist.find('li:last-child').find('select').multiselect('destroy');
-				phonelist.find('li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
-				phonelist.find('li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+				var curphone = phonelist.find('li.propertycontainer:last-child');
+				if(typeof this.data.TEL[phone].label != 'undefined') {
+					curphone.prepend('<label class="xab">'+this.data.TEL[phone].label+'</label>');
+				}
+				curphone.find('select').multiselect('destroy');
+				curphone.data('checksum', this.data.TEL[phone]['checksum'])
+				curphone.find('input[type="text"]').val(this.data.TEL[phone]['value']);
 				for(var param in this.data.TEL[phone]['parameters']) {
 					if(param.toUpperCase() == 'PREF') {
-						phonelist.find('li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+						curphone.find('input[type="checkbox"]').attr('checked', 'checked');
 					}
 					else if(param.toUpperCase() == 'TYPE') {
 						for(ptype in this.data.TEL[phone]['parameters'][param]) {
 							var found = false;
 							var pt = this.data.TEL[phone]['parameters'][param][ptype];
-							phonelist.find('li:last-child').find('select option').each(function() {
+							curphone.find('select option').each(function() {
 								//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
 								if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
 									$(this).attr('selected', 'selected');
@@ -1382,12 +1390,12 @@ OC.Contacts={
 								}
 							});
 							if(!found) {
-								phonelist.find('li:last-child').find('select option:last-child').after('<option class="custom" value="'+pt+'" selected="selected">'+pt+'</option>');
+								curphone.find('select option:last-child').after('<option class="custom" value="'+pt+'" selected="selected">'+pt+'</option>');
 							}
 						}
 					}
 				}
-				phonelist.find('li:last-child').find('select').multiselect({
+				curphone.find('select').multiselect({
 										noneSelectedText: t('contacts', 'Select type'),
 										header: false,
 										selectedList: 4,
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index f6ce213c49..e222c608de 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -129,6 +129,7 @@ class OC_Contacts_App {
 				return array(
 					'WORK' => $l->t('Work'),
 					'HOME' => $l->t('Home'),
+					'OTHER' =>  $l->t('Other'),
 				);
 			case 'TEL':
 				return array(
@@ -141,6 +142,7 @@ class OC_Contacts_App {
 					'FAX'   =>  $l->t('Fax'),
 					'VIDEO' =>  $l->t('Video'),
 					'PAGER' =>  $l->t('Pager'),
+					'OTHER' =>  $l->t('Other'),
 				);
 			case 'EMAIL':
 				return array(
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 8c38f1ba15..5bc3d04b46 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -562,6 +562,12 @@ class OC_Contacts_VCard{
 		foreach($object->children as $property){
 			$temp = self::structureProperty($property);
 			if(!is_null($temp)) {
+				if(isset($object->{$property->group . '.X-ABLABEL'})) {
+					$temp['label'] = $object->{$property->group . '.X-ABLABEL'}->value;
+					if($temp['label'] == '_$!<Other>!$_') {
+						$temp['label'] = OC_Contacts_App::$l10n->t('Other');
+					}
+				}
 				if(array_key_exists($property->name, $details)) {
 					$details[$property->name][] = $temp;
 				}
@@ -612,7 +618,7 @@ class OC_Contacts_VCard{
 			// Faulty entries by kaddressbook
 			// Actually TYPE=PREF is correct according to RFC 2426
 			// but this way is more handy in the UI. Tanghus.
-			if($parameter->name == 'TYPE' && $parameter->value == 'PREF') {
+			if($parameter->name == 'TYPE' && strtoupper($parameter->value) == 'PREF') {
 				$parameter->name = 'PREF';
 				$parameter->value = '1';
 			}

From 1cfa8312397fcb99582f097e5114510ffa11e68c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 21 Aug 2012 14:44:23 +0200
Subject: [PATCH 1499/1537] A first basic presentation app based on the amazing
 impress.js. You have to put a presentation file that contains the
 presentation defined in html into your ownCloud with the file extension
 .impress Then you can use this app to play it. It also contains a demo
 presentation that you can use to learn. Help is welcome to improve this app.
 :-)

---
 apps/impress/appinfo/app.php             |   38 +
 apps/impress/appinfo/info.xml            |   10 +
 apps/impress/appinfo/version             |    1 +
 apps/impress/css/player.css              |  703 +++++++++
 apps/impress/css/style.css               |   14 +
 apps/impress/documentation.php           |   34 +
 apps/impress/img/impress.png             |  Bin 0 -> 387 bytes
 apps/impress/img/impress.svg             | 1718 +++++++++++++++++++++
 apps/impress/img/impressbig.png          |  Bin 0 -> 503 bytes
 apps/impress/img/impressbig.svg          | 1730 ++++++++++++++++++++++
 apps/impress/index.php                   |   37 +
 apps/impress/js/impress.js               |  800 ++++++++++
 apps/impress/lib/impress.php             |  118 ++
 apps/impress/player.php                  |   49 +
 apps/impress/templates/documentation.php |  223 +++
 apps/impress/templates/presentations.php |   30 +
 16 files changed, 5505 insertions(+)
 create mode 100644 apps/impress/appinfo/app.php
 create mode 100644 apps/impress/appinfo/info.xml
 create mode 100644 apps/impress/appinfo/version
 create mode 100644 apps/impress/css/player.css
 create mode 100755 apps/impress/css/style.css
 create mode 100755 apps/impress/documentation.php
 create mode 100644 apps/impress/img/impress.png
 create mode 100755 apps/impress/img/impress.svg
 create mode 100644 apps/impress/img/impressbig.png
 create mode 100755 apps/impress/img/impressbig.svg
 create mode 100755 apps/impress/index.php
 create mode 100644 apps/impress/js/impress.js
 create mode 100755 apps/impress/lib/impress.php
 create mode 100755 apps/impress/player.php
 create mode 100755 apps/impress/templates/documentation.php
 create mode 100755 apps/impress/templates/presentations.php

diff --git a/apps/impress/appinfo/app.php b/apps/impress/appinfo/app.php
new file mode 100644
index 0000000000..82f098a030
--- /dev/null
+++ b/apps/impress/appinfo/app.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * ownCloud - Impress App
+ *
+ * @author Frank Karlitschek
+ * @copyright 2011 Frank Karlitschek karlitschek@kde.org
+ * 
+ * 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 Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+OCP\Util::addStyle( 'impress', 'style');
+
+OCP\App::register(array('order' => 70, 'id' => 'impress', 'name' => 'Impress'));
+
+OCP\App::addNavigationEntry(array(
+	'id' => 'impress_index', 
+	'order' => 80, 
+	'href' => OCP\Util::linkTo('impress', 'index.php'), 
+	'icon' => OCP\Util::imagePath('impress', 'impress.png'), 
+	'name' => 'Impress')
+);
+
+
+
+?>
diff --git a/apps/impress/appinfo/info.xml b/apps/impress/appinfo/info.xml
new file mode 100644
index 0000000000..0be9c170f6
--- /dev/null
+++ b/apps/impress/appinfo/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<info>
+	<id>impress</id>
+	<name>Impress</name>
+	<description>A Player for impress presentations. Many thanks to Bartek Szopka for creating the wonderful impress.js library who made this app possible.</description>
+	<licence>AGPL</licence>
+	<author>Frank Karlitschek</author>
+	<require>4</require>
+	<shipped>true</shipped>
+</info>
diff --git a/apps/impress/appinfo/version b/apps/impress/appinfo/version
new file mode 100644
index 0000000000..9f8e9b69a3
--- /dev/null
+++ b/apps/impress/appinfo/version
@@ -0,0 +1 @@
+1.0
\ No newline at end of file
diff --git a/apps/impress/css/player.css b/apps/impress/css/player.css
new file mode 100644
index 0000000000..0ed7130fd0
--- /dev/null
+++ b/apps/impress/css/player.css
@@ -0,0 +1,703 @@
+/*
+    So you like the style of impress.js demo?
+    Or maybe you are just curious how it was done?
+    
+    You couldn't find a better place to find out!
+    
+    Welcome to the stylesheet impress.js demo presentation.
+    
+    Please remember that it is not meant to be a part of impress.js and is
+    not required by impress.js.
+    I expect that anyone creating a presentation for impress.js would create
+    their own set of styles.
+    
+    But feel free to read through it and learn how to get the most of what
+    impress.js provides.
+    
+    And let me be your guide.
+    
+    Shall we begin?
+*/
+
+
+/* 
+    We start with a good ol' reset.
+    That's the one by Eric Meyer http://meyerweb.com/eric/tools/css/reset/ 
+    
+    You can probably argue if it is needed here, or not, but for sure it
+    doesn't do any harm and gives us a fresh start.
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section {
+    display: block;
+}
+body {
+    line-height: 1;
+}
+ol, ul {
+    list-style: none;
+}
+blockquote, q {
+    quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+    content: '';
+    content: none;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+/*
+    Now here is when interesting things start to appear.
+    
+    We set up <body> styles with default font and nice gradient in the background.
+    And yes, there is a lot of repetition there because of -prefixes but we don't
+    want to leave anybody behind.
+*/
+body {
+    font-family: 'PT Sans', sans-serif;
+    min-height: 740px;
+    
+    background: rgb(215, 215, 215);
+    background: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 500, from(rgb(240, 240, 240)), to(rgb(190, 190, 190)));
+    background: -webkit-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
+    background:    -moz-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
+    background:     -ms-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
+    background:      -o-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
+    background:         radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));    
+}
+
+/*
+    Now let's bring some text styles back ...
+*/
+b, strong { font-weight: bold }
+i, em { font-style: italic }
+
+/*
+    ... and give links a nice look.
+*/
+a {
+    color: inherit;
+    text-decoration: none;
+    padding: 0 0.1em;
+    background: rgba(255,255,255,0.5);
+    text-shadow: -1px -1px 2px rgba(100,100,100,0.9);
+    border-radius: 0.2em;
+    
+    -webkit-transition: 0.5s;
+    -moz-transition:    0.5s;
+    -ms-transition:     0.5s;
+    -o-transition:      0.5s;
+    transition:         0.5s;
+}
+
+a:hover,
+a:focus {
+    background: rgba(255,255,255,1);
+    text-shadow: -1px -1px 2px rgba(100,100,100,0.5);
+}
+
+/*
+    Because the main point behind the impress.js demo is to demo impress.js
+    we display a fallback message for users with browsers that don't support
+    all the features required by it.
+    
+    All of the content will be still fully accessible for them, but I want
+    them to know that they are missing something - that's what the demo is
+    about, isn't it?
+    
+    And then we hide the message, when support is detected in the browser.
+*/
+
+.fallback-message {
+    font-family: sans-serif;
+    line-height: 1.3;
+    
+    width: 780px;
+    padding: 10px 10px 0;
+    margin: 20px auto;
+
+    border: 1px solid #E4C652;
+    border-radius: 10px;
+    background: #EEDC94;
+}
+
+.fallback-message p {
+    margin-bottom: 10px;
+}
+
+.impress-supported .fallback-message {
+    display: none;
+}
+
+/*
+    Now let's style the presentation steps.
+    
+    We start with basics to make sure it displays correctly in everywhere ...
+*/
+
+.step {
+    position: relative;
+    width: 900px;
+    padding: 40px;
+    margin: 20px auto;
+
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing:    border-box;
+    -ms-box-sizing:     border-box;
+    -o-box-sizing:      border-box;
+    box-sizing:         border-box;
+
+    font-family: 'PT Serif', georgia, serif;
+    font-size: 48px;
+    line-height: 1.5;
+}
+
+/*
+    ... and we enhance the styles for impress.js.
+    
+    Basically we remove the margin and make inactive steps a little bit transparent.
+*/
+.impress-enabled .step {
+    margin: 0;
+    opacity: 0.3;
+
+    -webkit-transition: opacity 1s;
+    -moz-transition:    opacity 1s;
+    -ms-transition:     opacity 1s;
+    -o-transition:      opacity 1s;
+    transition:         opacity 1s;
+}
+
+.impress-enabled .step.active { opacity: 1 }
+
+/*
+    These 'slide' step styles were heavily inspired by HTML5 Slides:
+    http://html5slides.googlecode.com/svn/trunk/styles.css
+    
+    ;)
+    
+    They cover everything what you see on first three steps of the demo.
+*/
+.slide {
+    display: block;
+
+    width: 900px;
+    height: 700px;
+    padding: 40px 60px;
+
+    background-color: white;
+    border: 1px solid rgba(0, 0, 0, .3);
+    border-radius: 10px;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, .1);
+
+    color: rgb(102, 102, 102);
+    text-shadow: 0 2px 2px rgba(0, 0, 0, .1);
+
+    font-family: 'Open Sans', Arial, sans-serif;
+    font-size: 30px;
+    line-height: 36px;
+    letter-spacing: -1px;
+}
+
+.slide q {
+    display: block;
+    font-size: 50px;
+    line-height: 72px;
+
+    margin-top: 100px;
+}
+
+.slide q strong {
+    white-space: nowrap;
+}
+
+/*
+    And now we start to style each step separately.
+    
+    I agree that this may be not the most efficient, object-oriented and
+    scalable way of styling, but most of steps have quite a custom look
+    and typography tricks here and there, so they had to be styles separately.
+
+    First is the title step with a big <h1> (no room for padding) and some
+    3D positioning along Z axis.
+*/
+
+#title {
+    padding: 0;
+}
+
+#title .try {
+    font-size: 64px;
+    position: absolute;
+    top: -0.5em;
+    left: 1.5em;
+    
+    -webkit-transform: translateZ(20px);
+    -moz-transform:    translateZ(20px);
+    -ms-transform:     translateZ(20px);
+    -o-transform:      translateZ(20px);
+    transform:         translateZ(20px);
+}
+
+#title h1 {
+    font-size: 190px;
+    
+    -webkit-transform: translateZ(50px);
+    -moz-transform:    translateZ(50px);
+    -ms-transform:     translateZ(50px);
+    -o-transform:      translateZ(50px);
+    transform:         translateZ(50px);
+}
+
+#title .footnote {
+    font-size: 32px;
+}
+
+/*
+    Second step is nothing special, just a text with a link, so it doesn't need
+    any special styling.
+    
+    Let's move to 'big thoughts' with centered text and custom font sizes.
+*/
+#big {
+    width: 600px;
+    text-align: center;
+    font-size: 60px;
+    line-height: 1;
+}
+
+#big b {
+    display: block;
+    font-size: 250px;
+    line-height: 250px;
+}
+
+#big .thoughts {
+    font-size: 90px;
+    line-height: 150px;
+}
+
+/*
+    'Tiny ideas' just need some tiny styling.
+*/
+#tiny {
+    width: 500px;
+    text-align: center;
+}
+
+/*
+    This step has some animated text ...
+*/
+#ing { width: 500px }
+
+/*
+    ... so we define display to `inline-block` to enable transforms and
+    transition duration to 0.5s ...
+*/
+#ing b {
+    display: inline-block;
+    -webkit-transition: 0.5s;
+    -moz-transition:    0.5s;
+    -ms-transition:     0.5s;
+    -o-transition:      0.5s;
+    transition:         0.5s;
+}
+
+/*
+    ... and we want 'positioning` word to move up a bit when the step gets
+    `present` class ...
+*/
+#ing.present .positioning {
+    -webkit-transform: translateY(-10px);
+    -moz-transform:    translateY(-10px);
+    -ms-transform:     translateY(-10px);
+    -o-transform:      translateY(-10px);
+    transform:         translateY(-10px);
+}
+
+/*
+    ... 'rotating' to rotate quater of a second later ...
+*/
+#ing.present .rotating {
+    -webkit-transform: rotate(-10deg);
+    -moz-transform:    rotate(-10deg);
+    -ms-transform:     rotate(-10deg);
+    -o-transform:      rotate(-10deg);
+    transform:         rotate(-10deg);
+
+    -webkit-transition-delay: 0.25s;
+    -moz-transition-delay:    0.25s;
+    -ms-transition-delay:     0.25s;
+    -o-transition-delay:      0.25s;
+    transition-delay:         0.25s;
+}
+
+/*
+    ... and 'scaling' to scale down after another quater of a second.
+*/
+#ing.present .scaling {
+    -webkit-transform: scale(0.7);
+    -moz-transform:    scale(0.7);
+    -ms-transform:     scale(0.7);
+    -o-transform:      scale(0.7);
+    transform:         scale(0.7);
+
+    -webkit-transition-delay: 0.5s;
+    -moz-transition-delay:    0.5s;
+    -ms-transition-delay:     0.5s;
+    -o-transition-delay:      0.5s;
+    transition-delay:         0.5s;
+}
+
+/*
+    The 'imagination' step is again some boring font-sizing.
+*/
+
+#imagination {
+    width: 600px;
+}
+
+#imagination .imagination {
+    font-size: 78px;
+}
+
+/*
+    There is nothing really special about 'use the source, Luke' step, too,
+    except maybe of the Yoda background.
+    
+    As you can see below I've 'hard-coded' it in data URL.
+    That's not the best way to serve images, but because that's just this one
+    I decided it will be OK to have it this way.
+    
+    Just make sure you don't blindly copy this approach.
+*/
+#source {
+    width: 700px;
+    padding-bottom: 300px;
+    
+    /* Yoda Icon :: Pixel Art from Star Wars http://www.pixeljoint.com/pixelart/1423.htm */
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARgAAAEYCAMAAACwUBm+AAAAAXNSR0IArs4c6QAAAKtQTFRFsAAAvbWSLUUrLEQqY1s8UYJMqJ1vNTEgOiIdIzYhjIFVLhsXZ6lgSEIsP2U8JhcCVzMsSXZEgXdOO145XJdWOl03LzAYMk4vSXNExr+hwcuxRTs1Qmk+RW9Am49eFRANQz4pUoNMQWc+OSMDTz0wLBsCNVMxa2NBOyUDUoNNSnlEWo9VRGxAVzYFl6tXCggHbLNmMUIcHhwTXkk5f3VNRT8wUT8xAAAACQocRBWFFwAAAAF0Uk5TAEDm2GYAAAPCSURBVHja7d3JctNAFIZRMwRCCGEmzPM8z/D+T8bu/ptbXXJFdij5fMt2Wuo+2UgqxVmtttq5WVotLzBgwIABAwYMGDCn0qVqbo69psPqVpWx+1XG5iaavF8wYMCAAQMGDBgwi4DJ6Y6qkxB1HNlcN3a92gbR5P2CAQMGDBgwYMCAWSxMlrU+UY5yu2l9okfV4bAxUVbf7TJnAwMGDBgwYMCAAbMLMHeqbGR82Zy+VR1Ht81nVca6R+UdTLaU24Ruzd3qM/e4yjnAgAEDBgwYMGDA7AJMd1l/3NRdVGcj3eX/2WEhCmDGxnM7yqygu8XIPjJj8iN/MGDAgAEDBgwYMAuDGb8q0RGlLCHLv1t9qDKWn3vdNHVuEI6HPaxO9Jo3GDBgwIABAwYMmIXBdC9ShGgMk+XnkXUeuGcsP/e1+lhNnZsL/G5Vs3OAAQMGDBgwYMCAWSxMR3SzOmraG5atdy9wZKzb+vg16qyqe2FltbnAgAEDBgwYMGDALAxmTJSuN3WA76rnVca6GTnemGN1WoEBAwYMGDBgwIBZGMxUomy4+xO899V4LAg5Xnc2MGDAgAEDBgwYMGA218Wq+2K1LDqvY9xZu8zN8fICdM6btYABAwYMGDBgwIABMzfH0+pGU5afze2tXebmeAfVz+p8BQYMGDBgwIABAwbMPBzZ+oWmfJrln1273FhkbHzee9WWbw7AgAEDBgwYMGDALAKm43hcdctKgblcPamOhuXnXlY5Xs6bsW4FGyQCAwYMGDBgwIABswiYMceZKgvMo+h8mrHLTdn676rj+FEFoTtHd8MwOxEYMGDAgAEDBgyYRcBM5UhXqiymW3R3c9ARhWO/OmjqfjVZy+xEYMCAAQMGDBgwYBYG073OnCV0RFNhMhaOa9WfKmOB6XjHMN1tQmaAAQMGDBgwYMCA2VWY7vXjz1U4croAzgPztwIDBgwYMGDAgAEDZhswh035NBw59Dww3RgYMGDAgAEDBgwYMJuD6f4tXT7NUqfCdBvZLkxXdgQGDBgwYMCAAQNmt2DGj8WzwAfV/w7T/aq7mxwwYMCAAQMGDBgwuwqTOo7uTwTngflSzQ3TdaJvAwEDBgwYMGDAgAED5gSvgbyo5oHZ4Pc+gwEDBgwYMGDAgAEzhOm+5G0qTGaAAQMGDBgwYMCAAXNaMOcnls3tNwWm+zRzp54NDBgwYMCAAQMGDJh5YNL36k1TLuGvVq+qnKMbS5n7tulT9asCAwYMGDBgwIABA2ZumKuztLnjgQEDBgwYMGDAgNl5mH/4/ltKA6vBNAAAAABJRU5ErkJggg==);
+    background-position: bottom right;
+    background-repeat: no-repeat;
+}
+
+#source q {
+    font-size: 60px;
+}
+
+/*
+    And the "it's in 3D" step again brings some 3D typography - just for fun.
+    
+    Because we want to position <span> elements in 3D we set transform-style to
+    `preserve-3d` on the paragraph.
+    It is not needed by webkit browsers, but it is in Firefox. It's hard to say
+    which behaviour is correct as 3D transforms spec is not very clear about it.
+*/
+#its-in-3d p {
+    -webkit-transform-style: preserve-3d;
+    -moz-transform-style:    preserve-3d; /* Y U need this Firefox?! */
+    -ms-transform-style:     preserve-3d;
+    -o-transform-style:      preserve-3d;
+    transform-style:         preserve-3d;
+}
+
+/*
+    Below we position each word separately along Z axis and we want it to transition
+    to default position in 0.5s when the step gets `present` class.
+    
+    Quite a simple idea, but lot's of styles and prefixes.
+*/
+#its-in-3d span,
+#its-in-3d b {
+    display: inline-block;
+    -webkit-transform: translateZ(40px);
+    -moz-transform:    translateZ(40px);
+    -ms-transform:     translateZ(40px);
+    -o-transform:      translateZ(40px);
+     transform:        translateZ(40px);
+            
+    -webkit-transition: 0.5s;
+    -moz-transition:    0.5s;
+    -ms-transition:     0.5s;
+    -o-transition:      0.5s;
+    transition:         0.5s;
+}
+
+#its-in-3d .have {
+    -webkit-transform: translateZ(-40px);
+    -moz-transform:    translateZ(-40px);
+    -ms-transform:     translateZ(-40px);
+    -o-transform:      translateZ(-40px);
+    transform:         translateZ(-40px);
+}
+
+#its-in-3d .you {
+    -webkit-transform: translateZ(20px);
+    -moz-transform:    translateZ(20px);
+    -ms-transform:     translateZ(20px);
+    -o-transform:      translateZ(20px);
+    transform:         translateZ(20px);
+}
+
+#its-in-3d .noticed {
+    -webkit-transform: translateZ(-40px);
+    -moz-transform:    translateZ(-40px);
+    -ms-transform:     translateZ(-40px);
+    -o-transform:      translateZ(-40px);
+    transform:         translateZ(-40px);
+}
+
+#its-in-3d .its {
+    -webkit-transform: translateZ(60px);
+    -moz-transform:    translateZ(60px);
+    -ms-transform:     translateZ(60px);
+    -o-transform:      translateZ(60px);
+    transform:         translateZ(60px);
+}
+
+#its-in-3d .in {
+    -webkit-transform: translateZ(-10px);
+    -moz-transform:    translateZ(-10px);
+    -ms-transform:     translateZ(-10px);
+    -o-transform:      translateZ(-10px);
+    transform:         translateZ(-10px);
+}
+
+#its-in-3d .footnote {
+    font-size: 32px;
+
+    -webkit-transform: translateZ(-10px);
+    -moz-transform:    translateZ(-10px);
+    -ms-transform:     translateZ(-10px);
+    -o-transform:      translateZ(-10px);
+    transform:         translateZ(-10px);
+}
+
+#its-in-3d.present span,
+#its-in-3d.present b {
+    -webkit-transform: translateZ(0px);
+    -moz-transform:    translateZ(0px);
+    -ms-transform:     translateZ(0px);
+    -o-transform:      translateZ(0px);
+    transform:         translateZ(0px);
+}
+
+/*
+    The last step is an overview.
+    There is no content in it, so we make sure it's not visible because we want
+    to be able to click on other steps.
+
+*/
+#overview { display: none }
+
+/*
+    We also make other steps visible and give them a pointer cursor using the
+    `impress-on-` class.
+*/
+.impress-on-overview .step {
+    opacity: 1;
+    cursor: pointer;
+}
+
+
+/*
+    Now, when we have all the steps styled let's give users a hint how to navigate
+    around the presentation.
+    
+    The best way to do this would be to use JavaScript, show a delayed hint for a
+    first time users, then hide it and store a status in cookie or localStorage...
+    
+    But I wanted to have some CSS fun and avoid additional scripting...
+    
+    Let me explain it first, so maybe the transition magic will be more readable
+    when you read the code.
+    
+    First of all I wanted the hint to appear only when user is idle for a while.
+    You can't detect the 'idle' state in CSS, but I delayed a appearing of the
+    hint by 5s using transition-delay.
+    
+    You also can't detect in CSS if the user is a first-time visitor, so I had to
+    make an assumption that I'll only show the hint on the first step. And when
+    the step is changed hide the hint, because I can assume that user already
+    knows how to navigate.
+    
+    To summarize it - hint is shown when the user is on the first step for longer
+    than 5 seconds.
+    
+    The other problem I had was caused by the fact that I wanted the hint to fade
+    in and out. It can be easily achieved by transitioning the opacity property.
+    But that also meant that the hint was always on the screen, even if totally 
+    transparent. It covered part of the screen and you couldn't correctly clicked
+    through it.
+    Unfortunately you cannot transition between display `block` and `none` in pure
+    CSS, so I needed a way to not only fade out the hint but also move it out of
+    the screen.
+    
+    I solved this problem by positioning the hint below the bottom of the screen
+    with CSS transform and moving it up to show it. But I also didn't want this move
+    to be visible. I wanted the hint only to fade in and out visually, so I delayed
+    the fade in transition, so it starts when the hint is already in its correct
+    position on the screen.
+    
+    I know, it sounds complicated ... maybe it would be easier with the code?
+*/
+
+.hint {
+    /*
+        We hide the hint until presentation is started and from browsers not supporting
+        impress.js, as they will have a linear scrollable view ...
+    */
+    display: none;
+    
+    /*
+        ... and give it some fixed position and nice styles.
+    */
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 200px;
+    
+    background: rgba(0,0,0,0.5);
+    color: #EEE;
+    text-align: center;
+    
+    font-size: 50px;
+    padding: 20px;
+    
+    z-index: 100;
+    
+    /*
+        By default we don't want the hint to be visible, so we make it transparent ...
+    */
+    opacity: 0;
+    
+    /*
+        ... and position it below the bottom of the screen (relative to it's fixed position)
+    */
+    -webkit-transform: translateY(400px);
+    -moz-transform:    translateY(400px);
+    -ms-transform:     translateY(400px);
+    -o-transform:      translateY(400px);
+    transform:         translateY(400px);
+
+    /*
+        Now let's imagine that the hint is visible and we want to fade it out and move out
+        of the screen.
+        
+        So we define the transition on the opacity property with 1s duration and another
+        transition on transform property delayed by 1s so it will happen after the fade out
+        on opacity finished.
+        
+        This way user will not see the hint moving down.
+    */
+    -webkit-transition: opacity 1s, -webkit-transform 0.5s 1s;
+    -moz-transition:    opacity 1s,    -moz-transform 0.5s 1s;
+    -ms-transition:     opacity 1s,     -ms-transform 0.5s 1s;
+    -o-transition:      opacity 1s,      -o-transform 0.5s 1s;
+    transition:         opacity 1s,         transform 0.5s 1s;
+}
+
+/*
+    Now we 'enable' the hint when presentation is initialized ...
+*/
+.impress-enabled .hint { display: block }
+
+/*
+    ... and we will show it when the first step (with id 'bored') is active.
+*/
+.impress-on-bored .hint {
+    /*
+        We remove the transparency and position the hint in its default fixed
+        position.
+    */
+    opacity: 1;
+    
+    -webkit-transform: translateY(0px);
+    -moz-transform:    translateY(0px);
+    -ms-transform:     translateY(0px);
+    -o-transform:      translateY(0px);
+    transform:         translateY(0px);
+    
+    /*
+        Now for fade in transition we have the oposite situation from the one
+        above.
+        
+        First after 4.5s delay we animate the transform property to move the hint
+        into its correct position and after that we fade it in with opacity 
+        transition.
+    */
+    -webkit-transition: opacity 1s 5s, -webkit-transform 0.5s 4.5s;
+    -moz-transition:    opacity 1s 5s,    -moz-transform 0.5s 4.5s;
+    -ms-transition:     opacity 1s 5s,     -ms-transform 0.5s 4.5s;
+    -o-transition:      opacity 1s 5s,      -o-transform 0.5s 4.5s;
+    transition:         opacity 1s 5s,         transform 0.5s 4.5s;
+}
+
+/*
+    And as the last thing there is a workaround for quite strange bug.
+    It happens a lot in Chrome. I don't remember if I've seen it in Firefox.
+    
+    Sometimes the element positioned in 3D (especially when it's moved back
+    along Z axis) is not clickable, because it falls 'behind' the <body>
+    element.
+    
+    To prevent this, I decided to make <body> non clickable by setting 
+    pointer-events property to `none` value.
+    Value if this property is inherited, so to make everything else clickable
+    I bring it back on the #impress element.
+    
+    If you want to know more about `pointer-events` here are some docs:
+    https://developer.mozilla.org/en/CSS/pointer-events
+    
+    There is one very important thing to notice about this workaround - it makes
+    everything 'unclickable' except what's in #impress element.
+    
+    So use it wisely ... or don't use at all.
+*/
+.impress-enabled          { pointer-events: none }
+.impress-enabled #impress { pointer-events: auto }
+
+/*
+    There is one funny thing I just realized.
+    
+    Thanks to this workaround above everything except #impress element is invisible
+    for click events. That means that the hint element is also not clickable.
+    So basically all of this transforms and delayed transitions trickery was probably
+    not needed at all...
+    
+    But it was fun to learn about it, wasn't it?
+*/
+
+/*
+    That's all I have for you in this file.
+    Thanks for reading. I hope you enjoyed it at least as much as I enjoyed writing it
+    for you.
+*/
diff --git a/apps/impress/css/style.css b/apps/impress/css/style.css
new file mode 100755
index 0000000000..4c7f60ef84
--- /dev/null
+++ b/apps/impress/css/style.css
@@ -0,0 +1,14 @@
+#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
+
+.impresslist {  margin-top:40px; padding:5px; width:100%;}
+.impresslist tr:hover {  backgound-color:#ccc; }
+.impresslist tr td {  padding:5px; }
+
+.docu { position: absolute; right: 13.5em; top: 0em; }
+
+#documentation { margin: 20px; }
+#documentation h1 { font-size:1.8em; font-weight:bold; color:#888; }
+#documentation h2 { font-size:1.5em; font-weight:bold; color:#888; }
+#documentation h2 { font-size:1.2em; font-weight:bold; color:#888; }
+
+.examplecode { font-size:0.9em; font-family:"Courier New","Courier";  background-color:#eee; color:#333; width:90%; height:300px; padding:10px;}
\ No newline at end of file
diff --git a/apps/impress/documentation.php b/apps/impress/documentation.php
new file mode 100755
index 0000000000..17a97432a4
--- /dev/null
+++ b/apps/impress/documentation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * ownCloud - Impress App
+ *
+ * @author Frank Karlitschek
+ * @copyright 2011 Frank Karlitschek karlitschek@kde.org
+ * 
+ * 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 Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+require_once('lib/impress.php');
+
+OCP\User::checkLoggedIn();
+OCP\App::setActiveNavigationEntry( 'impress_index' );
+
+
+
+$tmpl = new OCP\Template('impress', 'documentation', 'user');
+$tmpl->printPage();
+
+
diff --git a/apps/impress/img/impress.png b/apps/impress/img/impress.png
new file mode 100644
index 0000000000000000000000000000000000000000..23e14fc623ddd0f8d30cd8d07e980faab6eb84f0
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$m7#J8CJY5_^
zEP9ttHq2^q5NZ1#?<Qo>^mLk8W)9mkDaCe<Cw!SgIb!|^v#pohI4j$7Q7@b$BC=O$
z)9*_z6M7BV{=eE=|HJ;?W5X@ilDe;KIr;fd)tbi^Yz#{>Z%t3t+|Rftb4TuNJ_m6Y
z$LDiiGn7P5d%2Wz&(h<Tk=do8p~r8EP74t^dhYvQ+mq~qmTTE2?Adh9PJ8J*mnY9|
z+pTAF3H;(#RGwIE-^Ci+_MbQ6%6taF%x8ZNKYXy3$>RAt&v%Slg6%zp)-mxMe$Zp6
z@3k^|(s~9zh6^TVcX7I9uC?zq>{l^8`F-De+k~QHyVj}l9IjKVo@aJ!20uf2^7*y<
e3qMQlXGqx=oF3f!?k+IE7(8A5T-G@yGywn*Ihw}+

literal 0
HcmV?d00001

diff --git a/apps/impress/img/impress.svg b/apps/impress/img/impress.svg
new file mode 100755
index 0000000000..af1cf89d42
--- /dev/null
+++ b/apps/impress/img/impress.svg
@@ -0,0 +1,1718 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg11300"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="impress.svg"
+   inkscape:export-filename="/Users/karlitschek/Desktop/impress.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#cccccc"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1646"
+     inkscape:window-height="1184"
+     id="namedview24"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="32.000001"
+     inkscape:cx="4.7817607"
+     inkscape:cy="8.2037781"
+     inkscape:window-x="1667"
+     inkscape:window-y="42"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4146">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4330"
+       empspacing="5"
+       dotted="true"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4136">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;"
+         id="stop4138" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop4140" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4303">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop4305" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop4307" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4297">
+      <stop
+         id="stop4299"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4301"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4115">
+      <stop
+         id="stop4117"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4119"
+         style="stop-color:#363636;stop-opacity:0.698"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3789"
+         style="stop-color:#878787;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6954">
+      <stop
+         id="stop6960"
+         style="stop-color:#f5f5f5;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6962"
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3341">
+      <stop
+         id="stop3343"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3345"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="24.999998"
+       cy="28.659998"
+       r="16"
+       fx="24.999998"
+       fy="28.659998"
+       id="radialGradient2856"
+       xlink:href="#linearGradient6954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
+    <linearGradient
+       x1="30"
+       y1="25.084745"
+       x2="30"
+       y2="45"
+       id="linearGradient2858"
+       xlink:href="#linearGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
+    <radialGradient
+       cx="26.375898"
+       cy="12.31301"
+       r="8"
+       fx="26.375898"
+       fy="12.31301"
+       id="radialGradient2860"
+       xlink:href="#linearGradient6954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
+    <linearGradient
+       x1="30"
+       y1="5"
+       x2="30"
+       y2="44.678879"
+       id="linearGradient2862"
+       xlink:href="#linearGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
+    <linearGradient
+       x1="30"
+       y1="0.91818392"
+       x2="30"
+       y2="25.792814"
+       id="linearGradient2864"
+       xlink:href="#linearGradient3341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
+    <linearGradient
+       x1="29.955881"
+       y1="21.86607"
+       x2="29.955881"
+       y2="43.144382"
+       id="linearGradient2866"
+       xlink:href="#linearGradient3341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient7308"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
+       x1="34.992828"
+       y1="0.94087797"
+       x2="34.992828"
+       y2="33.955856" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3796"
+       x1="8.3635759"
+       y1="15.028702"
+       x2="15.937561"
+       y2="11.00073"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3798"
+       x1="6.9951797"
+       y1="4.7478018"
+       x2="13.00482"
+       y2="4.7478018"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3815"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
+       id="linearGradient3815-3"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-9" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
+       id="linearGradient3831"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3835" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3874"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
+       id="linearGradient3892-2"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3984"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3909-3"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4115-9"
+       id="linearGradient4113-3"
+       x1="0.86849999"
+       y1="13.895414"
+       x2="0.44923753"
+       y2="28.776533"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4115-9">
+      <stop
+         id="stop4117-5"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4119-6"
+         style="stop-color:#363636;stop-opacity:0.698"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="linearGradient3815-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
+       x1="-51.786404"
+       y1="50.786446"
+       x2="-51.786404"
+       y2="2.9062471" />
+    <linearGradient
+       id="linearGradient3104">
+      <stop
+         id="stop3106"
+         style="stop-color:#aaaaaa;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3108"
+         style="stop-color:#c8c8c8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="13.138569"
+       cy="25.625349"
+       r="13.931416"
+       fx="13.138569"
+       fy="25.625349"
+       id="radialGradient2965"
+       xlink:href="#linearGradient3690-451"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
+    <linearGradient
+       id="linearGradient3690-451">
+      <stop
+         id="stop2857"
+         style="stop-color:#e8e8e8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2859"
+         style="stop-color:#d8d8d8;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop2861"
+         style="stop-color:#c2c2c2;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop2863"
+         style="stop-color:#a5a5a5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="21.483376"
+       y1="36.255058"
+       x2="21.483376"
+       y2="9.5799999"
+       id="linearGradient2967"
+       xlink:href="#linearGradient3603-84"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
+    <linearGradient
+       id="linearGradient3603-84">
+      <stop
+         id="stop2867"
+         style="stop-color:#707070;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2869"
+         style="stop-color:#9e9e9e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11.566265"
+       y1="22.292103"
+       x2="15.214532"
+       y2="33.95525"
+       id="linearGradient3674-262"
+       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
+    <linearGradient
+       id="linearGradient8265-821-176-38-919-66-249-529">
+      <stop
+         id="stop2873"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="0" />
+      <stop
+         id="stop2875"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.046366"
+       y1="11.673002"
+       x2="24.046366"
+       y2="34.713669"
+       id="linearGradient3677-116"
+       xlink:href="#linearGradient3642-81"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
+    <linearGradient
+       id="linearGradient3642-81">
+      <stop
+         id="stop2879"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2881"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="34.713669"
+       x2="24.046366"
+       y1="11.673002"
+       x1="24.046366"
+       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3037"
+       xlink:href="#linearGradient3642-81"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3155-40"
+       id="linearGradient8639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
+       spreadMethod="pad"
+       x1="23.575972"
+       y1="25.356892"
+       x2="23.575972"
+       y2="31.210939" />
+    <linearGradient
+       id="linearGradient3155-40">
+      <stop
+         id="stop2541"
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1;" />
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1;"
+         offset="0.13482948"
+         id="stop2543" />
+      <stop
+         id="stop2545"
+         offset="0.20224422"
+         style="stop-color:#a4a4a4;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.26965895"
+         id="stop2547" />
+      <stop
+         id="stop2549"
+         offset="0.44650277"
+         style="stop-color:#8d8d8d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#959595;stop-opacity:1;"
+         offset="0.57114136"
+         id="stop2551" />
+      <stop
+         id="stop2553"
+         offset="0.72038066"
+         style="stop-color:#cecece;stop-opacity:1;" />
+      <stop
+         id="stop2555"
+         offset="1"
+         style="stop-color:#181818;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3240-279"
+       id="linearGradient8641"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3240-279">
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="0"
+         id="stop2559" />
+      <stop
+         id="stop2561"
+         offset="0.5"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:1;"
+         offset="1"
+         id="stop2563" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3223-789"
+       id="linearGradient8643"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3223-789">
+      <stop
+         id="stop2567"
+         offset="0"
+         style="stop-color:#b1b1b1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop2569" />
+      <stop
+         id="stop2571"
+         offset="1"
+         style="stop-color:#8f8f8f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3240-686"
+       id="linearGradient8645"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3240-686">
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="0"
+         id="stop2575" />
+      <stop
+         id="stop2577"
+         offset="0.5"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:1;"
+         offset="1"
+         id="stop2579" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3223-768"
+       id="linearGradient8647"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3223-768">
+      <stop
+         id="stop2583"
+         offset="0"
+         style="stop-color:#b1b1b1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop2585" />
+      <stop
+         id="stop2587"
+         offset="1"
+         style="stop-color:#8f8f8f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3240-907"
+       id="linearGradient8649"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3240-907">
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="0"
+         id="stop2591" />
+      <stop
+         id="stop2593"
+         offset="0.5"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:1;"
+         offset="1"
+         id="stop2595" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3223-699"
+       id="linearGradient8651"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3223-699">
+      <stop
+         id="stop2599"
+         offset="0"
+         style="stop-color:#b1b1b1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop2601" />
+      <stop
+         id="stop2603"
+         offset="1"
+         style="stop-color:#8f8f8f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3290-678"
+       id="linearGradient8653"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
+       x1="9"
+       y1="29.056757"
+       x2="9"
+       y2="26.02973" />
+    <linearGradient
+       id="linearGradient3290-678">
+      <stop
+         id="stop2607"
+         offset="0"
+         style="stop-color:#ece5a5;stop-opacity:1;" />
+      <stop
+         id="stop2609"
+         offset="1"
+         style="stop-color:#fcfbf2;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3191-577"
+       id="linearGradient8655"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
+       x1="5.5178981"
+       y1="37.371799"
+       x2="9.5220556"
+       y2="41.391716" />
+    <linearGradient
+       id="linearGradient3191-577">
+      <stop
+         id="stop2613"
+         offset="0"
+         style="stop-color:#dbce48;stop-opacity:1;" />
+      <stop
+         id="stop2615"
+         offset="1"
+         style="stop-color:#c5b625;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
+       id="linearGradient3934-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4154-8"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4326"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
+       x1="14.501121"
+       y1="-1.4095211"
+       x2="14.152531"
+       y2="20.074369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4328"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       x1="-2.4040222"
+       y1="4.4573336"
+       x2="-2.4040222"
+       y2="18.967093"
+       id="linearGradient3878"
+       xlink:href="#linearGradient3587-6-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(13.927091,-3.4266134)" />
+    <linearGradient
+       id="linearGradient3587-6-5">
+      <stop
+         id="stop3589-9-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
+       x1="0.86849999"
+       y1="13.895414"
+       x2="0.44923753"
+       y2="28.776533" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient4405"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+       id="linearGradient4413-7"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-95" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2"
+       id="linearGradient4411-3"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       id="linearGradient3587-6-5-2">
+      <stop
+         id="stop3589-9-2-8"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4"
+       id="linearGradient4466-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4">
+      <stop
+         id="stop3589-9-2-8-7"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="54.703121"
+       x2="-41.553459"
+       y1="2.2401412"
+       x1="-41.553459"
+       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4483-3"
+       xlink:href="#linearGradient3587-6-5-2-4-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-9">
+      <stop
+         id="stop3589-9-2-8-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+       id="linearGradient4564"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4566"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(13.927091,16.573387)"
+       x1="-2.4040222"
+       y1="4.4573336"
+       x2="-2.4040222"
+       y2="18.967093" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2"
+       id="linearGradient4578"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+       id="linearGradient4580"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3"
+       id="linearGradient4359-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       id="linearGradient3587-6-5-3">
+      <stop
+         id="stop3589-9-2-6"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3"
+       id="linearGradient4361-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       id="linearGradient4597">
+      <stop
+         id="stop4599"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4601"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4610"
+       xlink:href="#linearGradient3587-6-5-3"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="1.3333321"
+       y1="6.6666665"
+       x2="1.3333321"
+       y2="33.333332"
+       id="linearGradient2422"
+       xlink:href="#linearGradient3587-6-5-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
+    <linearGradient
+       id="linearGradient3587-6-5-5">
+      <stop
+         id="stop3589-9-2-4"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
+    <linearGradient
+       id="linearGradient3587-6-5-8">
+      <stop
+         id="stop3589-9-2-67"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-2"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
+    <linearGradient
+       id="linearGradient3120">
+      <stop
+         id="stop3122"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3124"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3207"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
+    <linearGradient
+       id="linearGradient3127">
+      <stop
+         id="stop3129"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3131"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3211"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
+    <linearGradient
+       id="linearGradient3134">
+      <stop
+         id="stop3136"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3138"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2409"
+       xlink:href="#linearGradient3587-6-5-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
+    <linearGradient
+       id="linearGradient3587-6-5-1">
+      <stop
+         id="stop3589-9-2-0"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-21"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="40.805084"
+       y1="5.6271191"
+       x2="40.805084"
+       y2="17.627119"
+       id="linearGradient3206"
+       xlink:href="#linearGradient3587-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-32.805085,-3.6271193)" />
+    <linearGradient
+       id="linearGradient3587-8-5">
+      <stop
+         id="stop3589-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-3-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="17.627119"
+       x2="40.805084"
+       y1="5.6271191"
+       x1="40.805084"
+       gradientTransform="translate(-32.805085,-3.6271193)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3180"
+       xlink:href="#linearGradient3587-8-5"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="1.3333321"
+       y1="6.6666665"
+       x2="1.3333321"
+       y2="33.333332"
+       id="linearGradient2422-1"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
+    <linearGradient
+       id="linearGradient3587-6-5-86">
+      <stop
+         id="stop3589-9-2-65"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2427"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
+    <linearGradient
+       id="linearGradient3207-3">
+      <stop
+         id="stop3209"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3211"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2436"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
+    <linearGradient
+       id="linearGradient3214">
+      <stop
+         id="stop3216"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3218"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2442"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
+    <linearGradient
+       id="linearGradient3221">
+      <stop
+         id="stop3223"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3225"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="1.3333321"
+       y1="4.9755898"
+       x2="1.3333321"
+       y2="37.373981"
+       id="linearGradient2422-1-0"
+       xlink:href="#linearGradient3587-6-5-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
+    <linearGradient
+       id="linearGradient3587-6-5-0">
+      <stop
+         id="stop3589-9-2-5"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-1"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="46.395508"
+       y1="12.707516"
+       x2="46.395508"
+       y2="38.409042"
+       id="linearGradient3795-2"
+       xlink:href="#linearGradient3587-6-5-3-5-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-5-7">
+      <stop
+         id="stop3589-9-2-2-6-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-5-1"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-6" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-5"
+       id="linearGradient4872"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
+       x1="100.77747"
+       y1="17.859186"
+       x2="100.77747"
+       y2="38.055252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4894"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4900"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4906"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4912"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       id="linearGradient3587-6-5-8-6">
+      <stop
+         id="stop3589-9-2-67-3"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-2-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4935">
+      <stop
+         id="stop4937"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4939"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4942">
+      <stop
+         id="stop4944"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4946"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-6"
+       id="linearGradient4912-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       id="linearGradient4949">
+      <stop
+         id="stop4951"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4953"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5012"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5015"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5018"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4"
+       id="linearGradient3335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136"
+       id="linearGradient4134"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136"
+       id="linearGradient4150"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6"
+       id="linearGradient3335-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.755585"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6">
+      <stop
+         id="stop3589-9-2-8-7-8"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-0"
+       id="linearGradient3335-7-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-0">
+      <stop
+         id="stop3589-9-2-8-7-8-7"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-7"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-4"
+       id="linearGradient3335-7-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-4">
+      <stop
+         id="stop3589-9-2-8-7-8-2"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-2"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-7"
+       id="linearGradient3335-7-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.755585"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-7">
+      <stop
+         id="stop3589-9-2-8-7-8-4"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-2"
+       id="linearGradient3335-7-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+       x1="-39.421574"
+       y1="-5.2547116"
+       x2="-39.421574"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-2">
+      <stop
+         id="stop3589-9-2-8-7-8-77"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136-9"
+       id="linearGradient4150-0"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15" />
+    <linearGradient
+       id="linearGradient4136-9">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;"
+         id="stop4138-6" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop4140-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136-9"
+       id="linearGradient3457"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
+       id="linearGradient3335-7-1-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+       x1="-39.421574"
+       y1="-5.2547116"
+       x2="-39.421574"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-2-6">
+      <stop
+         id="stop3589-9-2-8-7-8-77-4"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-9-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter4061">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.09528843"
+         id="feGaussianBlur4063" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4079"
+       x1="2.9539645"
+       y1="7.9553804"
+       x2="8.1727142"
+       y2="7.9553804"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
+     id="g3743-3"
+     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+  <rect
+     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3136"
+     width="163.31035"
+     height="97.986206"
+     x="-62.896553"
+     y="-32.993103" />
+  <g
+     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
+     id="g3743-9-4"
+     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+  <g
+     id="g4146">
+    <path
+       sodipodi:type="star"
+       style="fill:#999999;fill-opacity:1;filter:url(#filter4061)"
+       id="path3296"
+       sodipodi:sides="3"
+       sodipodi:cx="9"
+       sodipodi:cy="8"
+       sodipodi:r1="4.6360717"
+       sodipodi:r2="2.3180358"
+       sodipodi:arg1="1.0407812"
+       sodipodi:arg2="2.0879787"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 11.343749,12 7.8538866,10.014873 4.3640238,8.0297465 7.8281252,6.0000001 11.292227,3.9702536 l 0.02576,4.0148731 z"
+       inkscape:transform-center-x="1.4833295"
+       inkscape:transform-center-y="-0.018522961"
+       transform="matrix(1.2942258,0,0,1.2453693,-0.64803223,-1.9444316)"
+       inkscape:export-filename="/Volumes/www/owncloud/owncloud/apps/impress/img/rect3288.png"
+       inkscape:export-xdpi="120.00002"
+       inkscape:export-ydpi="120.00002" />
+    <rect
+       style="fill:url(#linearGradient4079);fill-opacity:1.0"
+       id="rect3288"
+       width="5.21875"
+       height="11.999999"
+       x="2.9539645"
+       y="1.955381"
+       inkscape:export-xdpi="120.00002"
+       inkscape:export-ydpi="120.00002" />
+  </g>
+</svg>
diff --git a/apps/impress/img/impressbig.png b/apps/impress/img/impressbig.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c8d1632b351eb7bb43d6260cf569b1b324e1066
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10dz@3K~zYIwU#lCf<PFBzX248aSLOsBsO-K7%>)mk4<d%1bc|B
zx7pS^SSq!pHXeY40~o_LU?H=OM5D;gBEE8f_vQU>GJ{yJ*E~}OKoA7BX`1gsh}VjI
zw@H$G^?JS70I)3ULrVE6rL4%GH`6qKfN$-z;8x|FDVv6I=V2++yb0U@gb<|xc@XW+
zdzGmW5XUjT?-K+;X+UlVnW88n3`4>&WV6{Y9*=Pxr#e8^g_M#gitv4(R;z{Qd33wo
z#{rslo?x1$0POdBmdhpWcAL>?M5og!1Qd3Vx0}*5MM}wTw_~wbFrUvk9*^Y!mkI7k
z*Y(`}pGm2M>op++&1RFyWb$X}${l3J^?Du8^XT{cN(q$`Xqtwu>kI}1T-U`g3O`c^
z*tSih(ZF#WhQlGYZ7Ulq0cy1x)9Lizrk8s9S#*=&kxNJExPBCJE$w8us?71MEu0b@
t4u_d#Sua#{bxJ8$Ns`O}#It`}egS!~bhAsC3W@*#002ovPDHLkV1mZk)QJE9

literal 0
HcmV?d00001

diff --git a/apps/impress/img/impressbig.svg b/apps/impress/img/impressbig.svg
new file mode 100755
index 0000000000..a4140e4ae1
--- /dev/null
+++ b/apps/impress/img/impressbig.svg
@@ -0,0 +1,1730 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg11300"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="impressbig.svg"
+   inkscape:export-filename="/Users/karlitschek/Desktop/impress.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#cccccc"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1646"
+     inkscape:window-height="1184"
+     id="namedview24"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="45.254835"
+     inkscape:cx="8.0044836"
+     inkscape:cy="9.2830031"
+     inkscape:window-x="1497"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4146">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4330"
+       empspacing="5"
+       dotted="true"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective4600" />
+    <linearGradient
+       id="linearGradient4136">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;"
+         id="stop4138" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop4140" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4303">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop4305" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop4307" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4297">
+      <stop
+         id="stop4299"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4301"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4115">
+      <stop
+         id="stop4117"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4119"
+         style="stop-color:#363636;stop-opacity:0.698"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3789"
+         style="stop-color:#878787;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6954">
+      <stop
+         id="stop6960"
+         style="stop-color:#f5f5f5;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6962"
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3341">
+      <stop
+         id="stop3343"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3345"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="24.999998"
+       cy="28.659998"
+       r="16"
+       fx="24.999998"
+       fy="28.659998"
+       id="radialGradient2856"
+       xlink:href="#linearGradient6954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
+    <linearGradient
+       x1="30"
+       y1="25.084745"
+       x2="30"
+       y2="45"
+       id="linearGradient2858"
+       xlink:href="#linearGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
+    <radialGradient
+       cx="26.375898"
+       cy="12.31301"
+       r="8"
+       fx="26.375898"
+       fy="12.31301"
+       id="radialGradient2860"
+       xlink:href="#linearGradient6954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
+    <linearGradient
+       x1="30"
+       y1="5"
+       x2="30"
+       y2="44.678879"
+       id="linearGradient2862"
+       xlink:href="#linearGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
+    <linearGradient
+       x1="30"
+       y1="0.91818392"
+       x2="30"
+       y2="25.792814"
+       id="linearGradient2864"
+       xlink:href="#linearGradient3341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
+    <linearGradient
+       x1="29.955881"
+       y1="21.86607"
+       x2="29.955881"
+       y2="43.144382"
+       id="linearGradient2866"
+       xlink:href="#linearGradient3341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient7308"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
+       x1="34.992828"
+       y1="0.94087797"
+       x2="34.992828"
+       y2="33.955856" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3796"
+       x1="8.3635759"
+       y1="15.028702"
+       x2="15.937561"
+       y2="11.00073"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3798"
+       x1="6.9951797"
+       y1="4.7478018"
+       x2="13.00482"
+       y2="4.7478018"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3815"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
+       id="linearGradient3815-3"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-9" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
+       id="linearGradient3831"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3835" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3874"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
+       id="linearGradient3892-2"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient3984"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3909-3"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4115-9"
+       id="linearGradient4113-3"
+       x1="0.86849999"
+       y1="13.895414"
+       x2="0.44923753"
+       y2="28.776533"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4115-9">
+      <stop
+         id="stop4117-5"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4119-6"
+         style="stop-color:#363636;stop-opacity:0.698"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="linearGradient3815-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
+       x1="-51.786404"
+       y1="50.786446"
+       x2="-51.786404"
+       y2="2.9062471" />
+    <linearGradient
+       id="linearGradient3104">
+      <stop
+         id="stop3106"
+         style="stop-color:#aaaaaa;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3108"
+         style="stop-color:#c8c8c8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="13.138569"
+       cy="25.625349"
+       r="13.931416"
+       fx="13.138569"
+       fy="25.625349"
+       id="radialGradient2965"
+       xlink:href="#linearGradient3690-451"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
+    <linearGradient
+       id="linearGradient3690-451">
+      <stop
+         id="stop2857"
+         style="stop-color:#e8e8e8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2859"
+         style="stop-color:#d8d8d8;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop2861"
+         style="stop-color:#c2c2c2;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop2863"
+         style="stop-color:#a5a5a5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="21.483376"
+       y1="36.255058"
+       x2="21.483376"
+       y2="9.5799999"
+       id="linearGradient2967"
+       xlink:href="#linearGradient3603-84"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
+    <linearGradient
+       id="linearGradient3603-84">
+      <stop
+         id="stop2867"
+         style="stop-color:#707070;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2869"
+         style="stop-color:#9e9e9e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11.566265"
+       y1="22.292103"
+       x2="15.214532"
+       y2="33.95525"
+       id="linearGradient3674-262"
+       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
+    <linearGradient
+       id="linearGradient8265-821-176-38-919-66-249-529">
+      <stop
+         id="stop2873"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="0" />
+      <stop
+         id="stop2875"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.046366"
+       y1="11.673002"
+       x2="24.046366"
+       y2="34.713669"
+       id="linearGradient3677-116"
+       xlink:href="#linearGradient3642-81"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
+    <linearGradient
+       id="linearGradient3642-81">
+      <stop
+         id="stop2879"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2881"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="34.713669"
+       x2="24.046366"
+       y1="11.673002"
+       x1="24.046366"
+       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3037"
+       xlink:href="#linearGradient3642-81"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3155-40"
+       id="linearGradient8639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
+       spreadMethod="pad"
+       x1="23.575972"
+       y1="25.356892"
+       x2="23.575972"
+       y2="31.210939" />
+    <linearGradient
+       id="linearGradient3155-40">
+      <stop
+         id="stop2541"
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1;" />
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1;"
+         offset="0.13482948"
+         id="stop2543" />
+      <stop
+         id="stop2545"
+         offset="0.20224422"
+         style="stop-color:#a4a4a4;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.26965895"
+         id="stop2547" />
+      <stop
+         id="stop2549"
+         offset="0.44650277"
+         style="stop-color:#8d8d8d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#959595;stop-opacity:1;"
+         offset="0.57114136"
+         id="stop2551" />
+      <stop
+         id="stop2553"
+         offset="0.72038066"
+         style="stop-color:#cecece;stop-opacity:1;" />
+      <stop
+         id="stop2555"
+         offset="1"
+         style="stop-color:#181818;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3240-279"
+       id="linearGradient8641"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3240-279">
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="0"
+         id="stop2559" />
+      <stop
+         id="stop2561"
+         offset="0.5"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:1;"
+         offset="1"
+         id="stop2563" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3223-789"
+       id="linearGradient8643"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3223-789">
+      <stop
+         id="stop2567"
+         offset="0"
+         style="stop-color:#b1b1b1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop2569" />
+      <stop
+         id="stop2571"
+         offset="1"
+         style="stop-color:#8f8f8f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3240-686"
+       id="linearGradient8645"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3240-686">
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="0"
+         id="stop2575" />
+      <stop
+         id="stop2577"
+         offset="0.5"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:1;"
+         offset="1"
+         id="stop2579" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3223-768"
+       id="linearGradient8647"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3223-768">
+      <stop
+         id="stop2583"
+         offset="0"
+         style="stop-color:#b1b1b1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop2585" />
+      <stop
+         id="stop2587"
+         offset="1"
+         style="stop-color:#8f8f8f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3240-907"
+       id="linearGradient8649"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3240-907">
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="0"
+         id="stop2591" />
+      <stop
+         id="stop2593"
+         offset="0.5"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:1;"
+         offset="1"
+         id="stop2595" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3223-699"
+       id="linearGradient8651"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
+       x1="30.037716"
+       y1="24.989594"
+       x2="30.037716"
+       y2="30.000141" />
+    <linearGradient
+       id="linearGradient3223-699">
+      <stop
+         id="stop2599"
+         offset="0"
+         style="stop-color:#b1b1b1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop2601" />
+      <stop
+         id="stop2603"
+         offset="1"
+         style="stop-color:#8f8f8f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3290-678"
+       id="linearGradient8653"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
+       x1="9"
+       y1="29.056757"
+       x2="9"
+       y2="26.02973" />
+    <linearGradient
+       id="linearGradient3290-678">
+      <stop
+         id="stop2607"
+         offset="0"
+         style="stop-color:#ece5a5;stop-opacity:1;" />
+      <stop
+         id="stop2609"
+         offset="1"
+         style="stop-color:#fcfbf2;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3191-577"
+       id="linearGradient8655"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
+       x1="5.5178981"
+       y1="37.371799"
+       x2="9.5220556"
+       y2="41.391716" />
+    <linearGradient
+       id="linearGradient3191-577">
+      <stop
+         id="stop2613"
+         offset="0"
+         style="stop-color:#dbce48;stop-opacity:1;" />
+      <stop
+         id="stop2615"
+         offset="1"
+         style="stop-color:#c5b625;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
+       id="linearGradient3934-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4154-8"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4326"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
+       x1="14.501121"
+       y1="-1.4095211"
+       x2="14.152531"
+       y2="20.074369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4328"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       x1="-2.4040222"
+       y1="4.4573336"
+       x2="-2.4040222"
+       y2="18.967093"
+       id="linearGradient3878"
+       xlink:href="#linearGradient3587-6-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(13.927091,-3.4266134)" />
+    <linearGradient
+       id="linearGradient3587-6-5">
+      <stop
+         id="stop3589-9-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
+       x1="0.86849999"
+       y1="13.895414"
+       x2="0.44923753"
+       y2="28.776533" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient4405"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+       id="linearGradient4413-7"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-95" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2"
+       id="linearGradient4411-3"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       id="linearGradient3587-6-5-2">
+      <stop
+         id="stop3589-9-2-8"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4"
+       id="linearGradient4466-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4">
+      <stop
+         id="stop3589-9-2-8-7"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="54.703121"
+       x2="-41.553459"
+       y1="2.2401412"
+       x1="-41.553459"
+       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4483-3"
+       xlink:href="#linearGradient3587-6-5-2-4-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-9">
+      <stop
+         id="stop3589-9-2-8-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+       id="linearGradient4564"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient4566"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(13.927091,16.573387)"
+       x1="-2.4040222"
+       y1="4.4573336"
+       x2="-2.4040222"
+       y2="18.967093" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2"
+       id="linearGradient4578"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+       id="linearGradient4580"
+       gradientUnits="userSpaceOnUse"
+       x1="209.34245"
+       y1="998.45801"
+       x2="209.34245"
+       y2="1013.451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3"
+       id="linearGradient4359-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       id="linearGradient3587-6-5-3">
+      <stop
+         id="stop3589-9-2-6"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3"
+       id="linearGradient4361-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
+       x1="8.7094374"
+       y1="1.0035814"
+       x2="8.6826077"
+       y2="16.052532" />
+    <linearGradient
+       id="linearGradient4597">
+      <stop
+         id="stop4599"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4601"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="16.052532"
+       x2="8.6826077"
+       y1="1.0035814"
+       x1="8.7094374"
+       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4610"
+       xlink:href="#linearGradient3587-6-5-3"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="1.3333321"
+       y1="6.6666665"
+       x2="1.3333321"
+       y2="33.333332"
+       id="linearGradient2422"
+       xlink:href="#linearGradient3587-6-5-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
+    <linearGradient
+       id="linearGradient3587-6-5-5">
+      <stop
+         id="stop3589-9-2-4"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
+    <linearGradient
+       id="linearGradient3587-6-5-8">
+      <stop
+         id="stop3589-9-2-67"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-2"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
+    <linearGradient
+       id="linearGradient3120">
+      <stop
+         id="stop3122"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3124"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3207"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
+    <linearGradient
+       id="linearGradient3127">
+      <stop
+         id="stop3129"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3131"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837"
+       id="linearGradient3211"
+       xlink:href="#linearGradient3587-6-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
+    <linearGradient
+       id="linearGradient3134">
+      <stop
+         id="stop3136"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3138"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2409"
+       xlink:href="#linearGradient3587-6-5-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
+    <linearGradient
+       id="linearGradient3587-6-5-1">
+      <stop
+         id="stop3589-9-2-0"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-21"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="40.805084"
+       y1="5.6271191"
+       x2="40.805084"
+       y2="17.627119"
+       id="linearGradient3206"
+       xlink:href="#linearGradient3587-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-32.805085,-3.6271193)" />
+    <linearGradient
+       id="linearGradient3587-8-5">
+      <stop
+         id="stop3589-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-3-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="17.627119"
+       x2="40.805084"
+       y1="5.6271191"
+       x1="40.805084"
+       gradientTransform="translate(-32.805085,-3.6271193)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3180"
+       xlink:href="#linearGradient3587-8-5"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="1.3333321"
+       y1="6.6666665"
+       x2="1.3333321"
+       y2="33.333332"
+       id="linearGradient2422-1"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
+    <linearGradient
+       id="linearGradient3587-6-5-86">
+      <stop
+         id="stop3589-9-2-65"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2427"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
+    <linearGradient
+       id="linearGradient3207-3">
+      <stop
+         id="stop3209"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3211"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2436"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
+    <linearGradient
+       id="linearGradient3214">
+      <stop
+         id="stop3216"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3218"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11"
+       y1="6"
+       x2="11"
+       y2="17"
+       id="linearGradient2442"
+       xlink:href="#linearGradient3587-6-5-86"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
+    <linearGradient
+       id="linearGradient3221">
+      <stop
+         id="stop3223"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3225"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="1.3333321"
+       y1="4.9755898"
+       x2="1.3333321"
+       y2="37.373981"
+       id="linearGradient2422-1-0"
+       xlink:href="#linearGradient3587-6-5-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
+    <linearGradient
+       id="linearGradient3587-6-5-0">
+      <stop
+         id="stop3589-9-2-5"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-1"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="46.395508"
+       y1="12.707516"
+       x2="46.395508"
+       y2="38.409042"
+       id="linearGradient3795-2"
+       xlink:href="#linearGradient3587-6-5-3-5-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-5-7">
+      <stop
+         id="stop3589-9-2-2-6-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-5-1"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-6" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-5"
+       id="linearGradient4872"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
+       x1="100.77747"
+       y1="17.859186"
+       x2="100.77747"
+       y2="38.055252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4894"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4900"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4906"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient4912"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       id="linearGradient3587-6-5-8-6">
+      <stop
+         id="stop3589-9-2-67-3"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-2-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4935">
+      <stop
+         id="stop4937"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4939"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4942">
+      <stop
+         id="stop4944"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4946"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-6"
+       id="linearGradient4912-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       id="linearGradient4949">
+      <stop
+         id="stop4951"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4953"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5012"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5015"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5018"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8"
+       id="linearGradient5021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4"
+       id="linearGradient3335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136"
+       id="linearGradient4134"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136"
+       id="linearGradient4150"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6"
+       id="linearGradient3335-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.755585"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6">
+      <stop
+         id="stop3589-9-2-8-7-8"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-0"
+       id="linearGradient3335-7-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-0">
+      <stop
+         id="stop3589-9-2-8-7-8-7"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-7"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-4"
+       id="linearGradient3335-7-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.553459"
+       y2="54.703121" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-4">
+      <stop
+         id="stop3589-9-2-8-7-8-2"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-2"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-7"
+       id="linearGradient3335-7-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
+       x1="-41.553459"
+       y1="2.2401412"
+       x2="-41.755585"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-7">
+      <stop
+         id="stop3589-9-2-8-7-8-4"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-2"
+       id="linearGradient3335-7-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+       x1="-39.421574"
+       y1="-5.2547116"
+       x2="-39.421574"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-2">
+      <stop
+         id="stop3589-9-2-8-7-8-77"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136-9"
+       id="linearGradient4150-0"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15" />
+    <linearGradient
+       id="linearGradient4136-9">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;"
+         id="stop4138-6" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop4140-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4136-9"
+       id="linearGradient3457"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="9"
+       y1="0"
+       x2="9"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
+       id="linearGradient3335-7-1-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+       x1="-39.421574"
+       y1="-5.2547116"
+       x2="-39.421574"
+       y2="47.208389" />
+    <linearGradient
+       id="linearGradient3587-6-5-2-4-6-2-6">
+      <stop
+         id="stop3589-9-2-8-7-8-77-4"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-4-9-3"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter4061">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.09528843"
+         id="feGaussianBlur4063" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4079"
+       x1="2.9539645"
+       y1="7.9553804"
+       x2="8.1727142"
+       y2="7.9553804"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3191-577"
+       id="linearGradient4626"
+       x1="-1.7639756"
+       y1="2.3130295"
+       x2="2.824636"
+       y2="2.3130295"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70147562,-1.6260591)" />
+  </defs>
+  <g
+     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
+     id="g3743-3"
+     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+  <rect
+     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3136"
+     width="163.31035"
+     height="97.986206"
+     x="-62.896553"
+     y="-32.993103" />
+  <g
+     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
+     id="g3743-9-4"
+     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+  <g
+     id="g4146">
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:#b1b1b1;stroke-width:2.22857141;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4632"
+       width="12"
+       height="12"
+       x="2"
+       y="2" />
+    <path
+       sodipodi:type="star"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#4e4e4e;stroke-width:0.84385167;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4634"
+       sodipodi:sides="3"
+       sodipodi:cx="6.3639607"
+       sodipodi:cy="-1.3683099"
+       sodipodi:r1="3.1380975"
+       sodipodi:r2="1.5690486"
+       sodipodi:arg1="-0.014083576"
+       sodipodi:arg2="1.033114"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 9.5017471,-1.412504 7.1675439,-0.02065715 4.8333409,1.3711899 4.7950677,-1.3462128 4.7567943,-4.0636154 7.1292707,-2.7380596 z"
+       inkscape:transform-center-x="-0.86652303"
+       inkscape:transform-center-y="0.022845587"
+       transform="matrix(1.1322508,0,0,1.0338718,0.24163929,9.4603481)" />
+  </g>
+</svg>
diff --git a/apps/impress/index.php b/apps/impress/index.php
new file mode 100755
index 0000000000..c7213d8661
--- /dev/null
+++ b/apps/impress/index.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * ownCloud - Impress App
+ *
+ * @author Frank Karlitschek
+ * @copyright 2011 Frank Karlitschek karlitschek@kde.org
+ * 
+ * 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 Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+require_once('lib/impress.php');
+
+OCP\User::checkLoggedIn();
+OCP\App::setActiveNavigationEntry( 'impress_index' );
+
+
+
+$list=\OCA_Impress\Storage::getPresentations();
+
+$tmpl = new OCP\Template('impress', 'presentations', 'user');
+$tmpl->assign('list', $list);
+$tmpl->printPage();
+
+
diff --git a/apps/impress/js/impress.js b/apps/impress/js/impress.js
new file mode 100644
index 0000000000..224a5e2e7e
--- /dev/null
+++ b/apps/impress/js/impress.js
@@ -0,0 +1,800 @@
+/**
+ * impress.js
+ *
+ * impress.js is a presentation tool based on the power of CSS3 transforms and transitions
+ * in modern browsers and inspired by the idea behind prezi.com.
+ *
+ *
+ * Copyright 2011-2012 Bartek Szopka (@bartaz)
+ *
+ * Released under the MIT and GPL Licenses.
+ *
+ * ------------------------------------------------
+ *  author:  Bartek Szopka
+ *  version: 0.5.3
+ *  url:     http://bartaz.github.com/impress.js/
+ *  source:  http://github.com/bartaz/impress.js/
+ */
+
+/*jshint bitwise:true, curly:true, eqeqeq:true, forin:true, latedef:true, newcap:true,
+         noarg:true, noempty:true, undef:true, strict:true, browser:true */
+
+// You are one of those who like to know how thing work inside?
+// Let me show you the cogs that make impress.js run...
+(function ( document, window ) {
+    'use strict';
+    
+    // HELPER FUNCTIONS
+    
+    // `pfx` is a function that takes a standard CSS property name as a parameter
+    // and returns it's prefixed version valid for current browser it runs in.
+    // The code is heavily inspired by Modernizr http://www.modernizr.com/
+    var pfx = (function () {
+        
+        var style = document.createElement('dummy').style,
+            prefixes = 'Webkit Moz O ms Khtml'.split(' '),
+            memory = {};
+        
+        return function ( prop ) {
+            if ( typeof memory[ prop ] === "undefined" ) {
+                
+                var ucProp  = prop.charAt(0).toUpperCase() + prop.substr(1),
+                    props   = (prop + ' ' + prefixes.join(ucProp + ' ') + ucProp).split(' ');
+                
+                memory[ prop ] = null;
+                for ( var i in props ) {
+                    if ( style[ props[i] ] !== undefined ) {
+                        memory[ prop ] = props[i];
+                        break;
+                    }
+                }
+            
+            }
+            
+            return memory[ prop ];
+        };
+    
+    })();
+    
+    // `arraify` takes an array-like object and turns it into real Array
+    // to make all the Array.prototype goodness available.
+    var arrayify = function ( a ) {
+        return [].slice.call( a );
+    };
+    
+    // `css` function applies the styles given in `props` object to the element
+    // given as `el`. It runs all property names through `pfx` function to make
+    // sure proper prefixed version of the property is used.
+    var css = function ( el, props ) {
+        var key, pkey;
+        for ( key in props ) {
+            if ( props.hasOwnProperty(key) ) {
+                pkey = pfx(key);
+                if ( pkey !== null ) {
+                    el.style[pkey] = props[key];
+                }
+            }
+        }
+        return el;
+    };
+    
+    // `toNumber` takes a value given as `numeric` parameter and tries to turn
+    // it into a number. If it is not possible it returns 0 (or other value
+    // given as `fallback`).
+    var toNumber = function (numeric, fallback) {
+        return isNaN(numeric) ? (fallback || 0) : Number(numeric);
+    };
+    
+    // `byId` returns element with given `id` - you probably have guessed that ;)
+    var byId = function ( id ) {
+        return document.getElementById(id);
+    };
+    
+    // `$` returns first element for given CSS `selector` in the `context` of
+    // the given element or whole document.
+    var $ = function ( selector, context ) {
+        context = context || document;
+        return context.querySelector(selector);
+    };
+    
+    // `$$` return an array of elements for given CSS `selector` in the `context` of
+    // the given element or whole document.
+    var $$ = function ( selector, context ) {
+        context = context || document;
+        return arrayify( context.querySelectorAll(selector) );
+    };
+    
+    // `triggerEvent` builds a custom DOM event with given `eventName` and `detail` data
+    // and triggers it on element given as `el`.
+    var triggerEvent = function (el, eventName, detail) {
+        var event = document.createEvent("CustomEvent");
+        event.initCustomEvent(eventName, true, true, detail);
+        el.dispatchEvent(event);
+    };
+    
+    // `translate` builds a translate transform string for given data.
+    var translate = function ( t ) {
+        return " translate3d(" + t.x + "px," + t.y + "px," + t.z + "px) ";
+    };
+    
+    // `rotate` builds a rotate transform string for given data.
+    // By default the rotations are in X Y Z order that can be reverted by passing `true`
+    // as second parameter.
+    var rotate = function ( r, revert ) {
+        var rX = " rotateX(" + r.x + "deg) ",
+            rY = " rotateY(" + r.y + "deg) ",
+            rZ = " rotateZ(" + r.z + "deg) ";
+        
+        return revert ? rZ+rY+rX : rX+rY+rZ;
+    };
+    
+    // `scale` builds a scale transform string for given data.
+    var scale = function ( s ) {
+        return " scale(" + s + ") ";
+    };
+    
+    // `perspective` builds a perspective transform string for given data.
+    var perspective = function ( p ) {
+        return " perspective(" + p + "px) ";
+    };
+    
+    // `getElementFromHash` returns an element located by id from hash part of
+    // window location.
+    var getElementFromHash = function () {
+        // get id from url # by removing `#` or `#/` from the beginning,
+        // so both "fallback" `#slide-id` and "enhanced" `#/slide-id` will work
+        return byId( window.location.hash.replace(/^#\/?/,"") );
+    };
+    
+    // `computeWindowScale` counts the scale factor between window size and size
+    // defined for the presentation in the config.
+    var computeWindowScale = function ( config ) {
+        var hScale = window.innerHeight / config.height,
+            wScale = window.innerWidth / config.width,
+            scale = hScale > wScale ? wScale : hScale;
+        
+        if (config.maxScale && scale > config.maxScale) {
+            scale = config.maxScale;
+        }
+        
+        if (config.minScale && scale < config.minScale) {
+            scale = config.minScale;
+        }
+        
+        return scale;
+    };
+    
+    // CHECK SUPPORT
+    var body = document.body;
+    
+    var ua = navigator.userAgent.toLowerCase();
+    var impressSupported = 
+                          // browser should support CSS 3D transtorms 
+                           ( pfx("perspective") !== null ) &&
+                           
+                          // and `classList` and `dataset` APIs
+                           ( body.classList ) &&
+                           ( body.dataset ) &&
+                           
+                          // but some mobile devices need to be blacklisted,
+                          // because their CSS 3D support or hardware is not
+                          // good enough to run impress.js properly, sorry...
+                           ( ua.search(/(iphone)|(ipod)|(android)/) === -1 );
+    
+    if (!impressSupported) {
+        // we can't be sure that `classList` is supported
+        body.className += " impress-not-supported ";
+    } else {
+        body.classList.remove("impress-not-supported");
+        body.classList.add("impress-supported");
+    }
+    
+    // GLOBALS AND DEFAULTS
+    
+    // This is were the root elements of all impress.js instances will be kept.
+    // Yes, this means you can have more than one instance on a page, but I'm not
+    // sure if it makes any sense in practice ;)
+    var roots = {};
+    
+    // some default config values.
+    var defaults = {
+        width: 1024,
+        height: 768,
+        maxScale: 1,
+        minScale: 0,
+        
+        perspective: 1000,
+        
+        transitionDuration: 1000
+    };
+    
+    // it's just an empty function ... and a useless comment.
+    var empty = function () { return false; };
+    
+    // IMPRESS.JS API
+    
+    // And that's where interesting things will start to happen.
+    // It's the core `impress` function that returns the impress.js API
+    // for a presentation based on the element with given id ('impress'
+    // by default).
+    var impress = window.impress = function ( rootId ) {
+        
+        // If impress.js is not supported by the browser return a dummy API
+        // it may not be a perfect solution but we return early and avoid
+        // running code that may use features not implemented in the browser.
+        if (!impressSupported) {
+            return {
+                init: empty,
+                goto: empty,
+                prev: empty,
+                next: empty
+            };
+        }
+        
+        rootId = rootId || "impress";
+        
+        // if given root is already initialized just return the API
+        if (roots["impress-root-" + rootId]) {
+            return roots["impress-root-" + rootId];
+        }
+        
+        // data of all presentation steps
+        var stepsData = {};
+        
+        // element of currently active step
+        var activeStep = null;
+        
+        // current state (position, rotation and scale) of the presentation
+        var currentState = null;
+        
+        // array of step elements
+        var steps = null;
+        
+        // configuration options
+        var config = null;
+        
+        // scale factor of the browser window
+        var windowScale = null;        
+        
+        // root presentation elements
+        var root = byId( rootId );
+        var canvas = document.createElement("div");
+        
+        var initialized = false;
+        
+        // STEP EVENTS
+        //
+        // There are currently two step events triggered by impress.js
+        // `impress:stepenter` is triggered when the step is shown on the 
+        // screen (the transition from the previous one is finished) and
+        // `impress:stepleave` is triggered when the step is left (the
+        // transition to next step just starts).
+        
+        // reference to last entered step
+        var lastEntered = null;
+        
+        // `onStepEnter` is called whenever the step element is entered
+        // but the event is triggered only if the step is different than
+        // last entered step.
+        var onStepEnter = function (step) {
+            if (lastEntered !== step) {
+                triggerEvent(step, "impress:stepenter");
+                lastEntered = step;
+            }
+        };
+        
+        // `onStepLeave` is called whenever the step element is left
+        // but the event is triggered only if the step is the same as
+        // last entered step.
+        var onStepLeave = function (step) {
+            if (lastEntered === step) {
+                triggerEvent(step, "impress:stepleave");
+                lastEntered = null;
+            }
+        };
+        
+        // `initStep` initializes given step element by reading data from its
+        // data attributes and setting correct styles.
+        var initStep = function ( el, idx ) {
+            var data = el.dataset,
+                step = {
+                    translate: {
+                        x: toNumber(data.x),
+                        y: toNumber(data.y),
+                        z: toNumber(data.z)
+                    },
+                    rotate: {
+                        x: toNumber(data.rotateX),
+                        y: toNumber(data.rotateY),
+                        z: toNumber(data.rotateZ || data.rotate)
+                    },
+                    scale: toNumber(data.scale, 1),
+                    el: el
+                };
+            
+            if ( !el.id ) {
+                el.id = "step-" + (idx + 1);
+            }
+            
+            stepsData["impress-" + el.id] = step;
+            
+            css(el, {
+                position: "absolute",
+                transform: "translate(-50%,-50%)" +
+                           translate(step.translate) +
+                           rotate(step.rotate) +
+                           scale(step.scale),
+                transformStyle: "preserve-3d"
+            });
+        };
+        
+        // `init` API function that initializes (and runs) the presentation.
+        var init = function () {
+            if (initialized) { return; }
+            
+            // First we set up the viewport for mobile devices.
+            // For some reason iPad goes nuts when it is not done properly.
+            var meta = $("meta[name='viewport']") || document.createElement("meta");
+            meta.content = "width=device-width, minimum-scale=1, maximum-scale=1, user-scalable=no";
+            if (meta.parentNode !== document.head) {
+                meta.name = 'viewport';
+                document.head.appendChild(meta);
+            }
+            
+            // initialize configuration object
+            var rootData = root.dataset;
+            config = {
+                width: toNumber( rootData.width, defaults.width ),
+                height: toNumber( rootData.height, defaults.height ),
+                maxScale: toNumber( rootData.maxScale, defaults.maxScale ),
+                minScale: toNumber( rootData.minScale, defaults.minScale ),                
+                perspective: toNumber( rootData.perspective, defaults.perspective ),
+                transitionDuration: toNumber( rootData.transitionDuration, defaults.transitionDuration )
+            };
+            
+            windowScale = computeWindowScale( config );
+            
+            // wrap steps with "canvas" element
+            arrayify( root.childNodes ).forEach(function ( el ) {
+                canvas.appendChild( el );
+            });
+            root.appendChild(canvas);
+            
+            // set initial styles
+            document.documentElement.style.height = "100%";
+            
+            css(body, {
+                height: "100%",
+                overflow: "hidden"
+            });
+            
+            var rootStyles = {
+                position: "absolute",
+                transformOrigin: "top left",
+                transition: "all 0s ease-in-out",
+                transformStyle: "preserve-3d"
+            };
+            
+            css(root, rootStyles);
+            css(root, {
+                top: "50%",
+                left: "50%",
+                transform: perspective( config.perspective/windowScale ) + scale( windowScale )
+            });
+            css(canvas, rootStyles);
+            
+            body.classList.remove("impress-disabled");
+            body.classList.add("impress-enabled");
+            
+            // get and init steps
+            steps = $$(".step", root);
+            steps.forEach( initStep );
+            
+            // set a default initial state of the canvas
+            currentState = {
+                translate: { x: 0, y: 0, z: 0 },
+                rotate:    { x: 0, y: 0, z: 0 },
+                scale:     1
+            };
+            
+            initialized = true;
+            
+            triggerEvent(root, "impress:init", { api: roots[ "impress-root-" + rootId ] });
+        };
+        
+        // `getStep` is a helper function that returns a step element defined by parameter.
+        // If a number is given, step with index given by the number is returned, if a string
+        // is given step element with such id is returned, if DOM element is given it is returned
+        // if it is a correct step element.
+        var getStep = function ( step ) {
+            if (typeof step === "number") {
+                step = step < 0 ? steps[ steps.length + step] : steps[ step ];
+            } else if (typeof step === "string") {
+                step = byId(step);
+            }
+            return (step && step.id && stepsData["impress-" + step.id]) ? step : null;
+        };
+        
+        // used to reset timeout for `impress:stepenter` event
+        var stepEnterTimeout = null;
+        
+        // `goto` API function that moves to step given with `el` parameter (by index, id or element),
+        // with a transition `duration` optionally given as second parameter.
+        var goto = function ( el, duration ) {
+            
+            if ( !initialized || !(el = getStep(el)) ) {
+                // presentation not initialized or given element is not a step
+                return false;
+            }
+            
+            // Sometimes it's possible to trigger focus on first link with some keyboard action.
+            // Browser in such a case tries to scroll the page to make this element visible
+            // (even that body overflow is set to hidden) and it breaks our careful positioning.
+            //
+            // So, as a lousy (and lazy) workaround we will make the page scroll back to the top
+            // whenever slide is selected
+            //
+            // If you are reading this and know any better way to handle it, I'll be glad to hear about it!
+            window.scrollTo(0, 0);
+            
+            var step = stepsData["impress-" + el.id];
+            
+            if ( activeStep ) {
+                activeStep.classList.remove("active");
+                body.classList.remove("impress-on-" + activeStep.id);
+            }
+            el.classList.add("active");
+            
+            body.classList.add("impress-on-" + el.id);
+            
+            // compute target state of the canvas based on given step
+            var target = {
+                rotate: {
+                    x: -step.rotate.x,
+                    y: -step.rotate.y,
+                    z: -step.rotate.z
+                },
+                translate: {
+                    x: -step.translate.x,
+                    y: -step.translate.y,
+                    z: -step.translate.z
+                },
+                scale: 1 / step.scale
+            };
+            
+            // Check if the transition is zooming in or not.
+            //
+            // This information is used to alter the transition style:
+            // when we are zooming in - we start with move and rotate transition
+            // and the scaling is delayed, but when we are zooming out we start
+            // with scaling down and move and rotation are delayed.
+            var zoomin = target.scale >= currentState.scale;
+            
+            duration = toNumber(duration, config.transitionDuration);
+            var delay = (duration / 2);
+            
+            // if the same step is re-selected, force computing window scaling,
+            // because it is likely to be caused by window resize
+            if (el === activeStep) {
+                windowScale = computeWindowScale(config);
+            }
+            
+            var targetScale = target.scale * windowScale;
+            
+            // trigger leave of currently active element (if it's not the same step again)
+            if (activeStep && activeStep !== el) {
+                onStepLeave(activeStep);
+            }
+            
+            // Now we alter transforms of `root` and `canvas` to trigger transitions.
+            //
+            // And here is why there are two elements: `root` and `canvas` - they are
+            // being animated separately:
+            // `root` is used for scaling and `canvas` for translate and rotations.
+            // Transitions on them are triggered with different delays (to make
+            // visually nice and 'natural' looking transitions), so we need to know
+            // that both of them are finished.
+            css(root, {
+                // to keep the perspective look similar for different scales
+                // we need to 'scale' the perspective, too
+                transform: perspective( config.perspective / targetScale ) + scale( targetScale ),
+                transitionDuration: duration + "ms",
+                transitionDelay: (zoomin ? delay : 0) + "ms"
+            });
+            
+            css(canvas, {
+                transform: rotate(target.rotate, true) + translate(target.translate),
+                transitionDuration: duration + "ms",
+                transitionDelay: (zoomin ? 0 : delay) + "ms"
+            });
+            
+            // Here is a tricky part...
+            //
+            // If there is no change in scale or no change in rotation and translation, it means there was actually
+            // no delay - because there was no transition on `root` or `canvas` elements.
+            // We want to trigger `impress:stepenter` event in the correct moment, so here we compare the current
+            // and target values to check if delay should be taken into account.
+            //
+            // I know that this `if` statement looks scary, but it's pretty simple when you know what is going on
+            // - it's simply comparing all the values.
+            if ( currentState.scale === target.scale ||
+                (currentState.rotate.x === target.rotate.x && currentState.rotate.y === target.rotate.y &&
+                 currentState.rotate.z === target.rotate.z && currentState.translate.x === target.translate.x &&
+                 currentState.translate.y === target.translate.y && currentState.translate.z === target.translate.z) ) {
+                delay = 0;
+            }
+            
+            // store current state
+            currentState = target;
+            activeStep = el;
+            
+            // And here is where we trigger `impress:stepenter` event.
+            // We simply set up a timeout to fire it taking transition duration (and possible delay) into account.
+            //
+            // I really wanted to make it in more elegant way. The `transitionend` event seemed to be the best way
+            // to do it, but the fact that I'm using transitions on two separate elements and that the `transitionend`
+            // event is only triggered when there was a transition (change in the values) caused some bugs and 
+            // made the code really complicated, cause I had to handle all the conditions separately. And it still
+            // needed a `setTimeout` fallback for the situations when there is no transition at all.
+            // So I decided that I'd rather make the code simpler than use shiny new `transitionend`.
+            //
+            // If you want learn something interesting and see how it was done with `transitionend` go back to
+            // version 0.5.2 of impress.js: http://github.com/bartaz/impress.js/blob/0.5.2/js/impress.js
+            window.clearTimeout(stepEnterTimeout);
+            stepEnterTimeout = window.setTimeout(function() {
+                onStepEnter(activeStep);
+            }, duration + delay);
+            
+            return el;
+        };
+        
+        // `prev` API function goes to previous step (in document order)
+        var prev = function () {
+            var prev = steps.indexOf( activeStep ) - 1;
+            prev = prev >= 0 ? steps[ prev ] : steps[ steps.length-1 ];
+            
+            return goto(prev);
+        };
+        
+        // `next` API function goes to next step (in document order)
+        var next = function () {
+            var next = steps.indexOf( activeStep ) + 1;
+            next = next < steps.length ? steps[ next ] : steps[ 0 ];
+            
+            return goto(next);
+        };
+        
+        // Adding some useful classes to step elements.
+        //
+        // All the steps that have not been shown yet are given `future` class.
+        // When the step is entered the `future` class is removed and the `present`
+        // class is given. When the step is left `present` class is replaced with
+        // `past` class.
+        //
+        // So every step element is always in one of three possible states:
+        // `future`, `present` and `past`.
+        //
+        // There classes can be used in CSS to style different types of steps.
+        // For example the `present` class can be used to trigger some custom
+        // animations when step is shown.
+        root.addEventListener("impress:init", function(){
+            // STEP CLASSES
+            steps.forEach(function (step) {
+                step.classList.add("future");
+            });
+            
+            root.addEventListener("impress:stepenter", function (event) {
+                event.target.classList.remove("past");
+                event.target.classList.remove("future");
+                event.target.classList.add("present");
+            }, false);
+            
+            root.addEventListener("impress:stepleave", function (event) {
+                event.target.classList.remove("present");
+                event.target.classList.add("past");
+            }, false);
+            
+        }, false);
+        
+        // Adding hash change support.
+        root.addEventListener("impress:init", function(){
+            
+            // last hash detected
+            var lastHash = "";
+            
+            // `#/step-id` is used instead of `#step-id` to prevent default browser
+            // scrolling to element in hash.
+            //
+            // And it has to be set after animation finishes, because in Chrome it
+            // makes transtion laggy.
+            // BUG: http://code.google.com/p/chromium/issues/detail?id=62820
+            root.addEventListener("impress:stepenter", function (event) {
+                window.location.hash = lastHash = "#/" + event.target.id;
+            }, false);
+            
+            window.addEventListener("hashchange", function () {
+                // When the step is entered hash in the location is updated
+                // (just few lines above from here), so the hash change is 
+                // triggered and we would call `goto` again on the same element.
+                //
+                // To avoid this we store last entered hash and compare.
+                if (window.location.hash !== lastHash) {
+                    goto( getElementFromHash() );
+                }
+            }, false);
+            
+            // START 
+            // by selecting step defined in url or first step of the presentation
+            goto(getElementFromHash() || steps[0], 0);
+        }, false);
+        
+        body.classList.add("impress-disabled");
+        
+        // store and return API for given impress.js root element
+        return (roots[ "impress-root-" + rootId ] = {
+            init: init,
+            goto: goto,
+            next: next,
+            prev: prev
+        });
+
+    };
+    
+    // flag that can be used in JS to check if browser have passed the support test
+    impress.supported = impressSupported;
+    
+})(document, window);
+
+// NAVIGATION EVENTS
+
+// As you can see this part is separate from the impress.js core code.
+// It's because these navigation actions only need what impress.js provides with
+// its simple API.
+//
+// In future I think about moving it to make them optional, move to separate files
+// and treat more like a 'plugins'.
+(function ( document, window ) {
+    'use strict';
+    
+    // throttling function calls, by Remy Sharp
+    // http://remysharp.com/2010/07/21/throttling-function-calls/
+    var throttle = function (fn, delay) {
+        var timer = null;
+        return function () {
+            var context = this, args = arguments;
+            clearTimeout(timer);
+            timer = setTimeout(function () {
+                fn.apply(context, args);
+            }, delay);
+        };
+    };
+    
+    // wait for impress.js to be initialized
+    document.addEventListener("impress:init", function (event) {
+        // Getting API from event data.
+        // So you don't event need to know what is the id of the root element
+        // or anything. `impress:init` event data gives you everything you 
+        // need to control the presentation that was just initialized.
+        var api = event.detail.api;
+        
+        // KEYBOARD NAVIGATION HANDLERS
+        
+        // Prevent default keydown action when one of supported key is pressed.
+        document.addEventListener("keydown", function ( event ) {
+            if ( event.keyCode === 9 || ( event.keyCode >= 32 && event.keyCode <= 34 ) || (event.keyCode >= 37 && event.keyCode <= 40) ) {
+                event.preventDefault();
+            }
+        }, false);
+        
+        // Trigger impress action (next or prev) on keyup.
+        
+        // Supported keys are:
+        // [space] - quite common in presentation software to move forward
+        // [up] [right] / [down] [left] - again common and natural addition,
+        // [pgdown] / [pgup] - often triggered by remote controllers,
+        // [tab] - this one is quite controversial, but the reason it ended up on
+        //   this list is quite an interesting story... Remember that strange part
+        //   in the impress.js code where window is scrolled to 0,0 on every presentation
+        //   step, because sometimes browser scrolls viewport because of the focused element?
+        //   Well, the [tab] key by default navigates around focusable elements, so clicking
+        //   it very often caused scrolling to focused element and breaking impress.js
+        //   positioning. I didn't want to just prevent this default action, so I used [tab]
+        //   as another way to moving to next step... And yes, I know that for the sake of
+        //   consistency I should add [shift+tab] as opposite action...
+        document.addEventListener("keyup", function ( event ) {
+            if ( event.keyCode === 9 || ( event.keyCode >= 32 && event.keyCode <= 34 ) || (event.keyCode >= 37 && event.keyCode <= 40) ) {
+                switch( event.keyCode ) {
+                    case 33: // pg up
+                    case 37: // left
+                    case 38: // up
+                             api.prev();
+                             break;
+                    case 9:  // tab
+                    case 32: // space
+                    case 34: // pg down
+                    case 39: // right
+                    case 40: // down
+                             api.next();
+                             break;
+                }
+                
+                event.preventDefault();
+            }
+        }, false);
+        
+        // delegated handler for clicking on the links to presentation steps
+        document.addEventListener("click", function ( event ) {
+            // event delegation with "bubbling"
+            // check if event target (or any of its parents is a link)
+            var target = event.target;
+            while ( (target.tagName !== "A") &&
+                    (target !== document.documentElement) ) {
+                target = target.parentNode;
+            }
+            
+            if ( target.tagName === "A" ) {
+                var href = target.getAttribute("href");
+                
+                // if it's a link to presentation step, target this step
+                if ( href && href[0] === '#' ) {
+                    target = document.getElementById( href.slice(1) );
+                }
+            }
+            
+            if ( api.goto(target) ) {
+                event.stopImmediatePropagation();
+                event.preventDefault();
+            }
+        }, false);
+        
+        // delegated handler for clicking on step elements
+        document.addEventListener("click", function ( event ) {
+            var target = event.target;
+            // find closest step element that is not active
+            while ( !(target.classList.contains("step") && !target.classList.contains("active")) &&
+                    (target !== document.documentElement) ) {
+                target = target.parentNode;
+            }
+            
+            if ( api.goto(target) ) {
+                event.preventDefault();
+            }
+        }, false);
+        
+        // touch handler to detect taps on the left and right side of the screen
+        // based on awesome work of @hakimel: https://github.com/hakimel/reveal.js
+        document.addEventListener("touchstart", function ( event ) {
+            if (event.touches.length === 1) {
+                var x = event.touches[0].clientX,
+                    width = window.innerWidth * 0.3,
+                    result = null;
+                    
+                if ( x < width ) {
+                    result = api.prev();
+                } else if ( x > window.innerWidth - width ) {
+                    result = api.next();
+                }
+                
+                if (result) {
+                    event.preventDefault();
+                }
+            }
+        }, false);
+        
+        // rescale presentation when window is resized
+        window.addEventListener("resize", throttle(function () {
+            // force going to active step again, to trigger rescaling
+            api.goto( document.querySelector(".active"), 500 );
+        }, 250), false);
+        
+    }, false);
+        
+})(document, window);
+
+// THAT'S ALL FOLKS!
+//
+// Thanks for reading it all.
+// Or thanks for scrolling down and reading the last part.
+//
+// I've learnt a lot when building impress.js and I hope this code and comments
+// will help somebody learn at least some part of it.
diff --git a/apps/impress/lib/impress.php b/apps/impress/lib/impress.php
new file mode 100755
index 0000000000..ca33dbb232
--- /dev/null
+++ b/apps/impress/lib/impress.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * ownCloud - Impress App
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * 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 Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+
+
+/*
+
+Todo:
+	enable fullscreen presentation
+
+*/
+
+namespace OCA_Impress;
+
+class Storage {
+
+	public static function getPresentations() {
+		$presentations=array();
+		$list=\OC_FileCache::searchByMime('text','impress' );
+		foreach($list as $l) {
+			$info=pathinfo($l);
+			$size=\OC_Filesystem::filesize($l);
+			$mtime=\OC_Filesystem::filemtime($l);
+
+			$entry=array('url'=>$l,'name'=>$info['filename'],'size'=>$size,'mtime'=>$mtime);
+			$presentations[]=$entry;
+		}
+
+	
+		return $presentations;
+	}
+	
+
+	public static function showHeader($title){
+		
+		echo('
+		
+		<!doctype html>
+		<html lang="en">
+		<head>	
+		<meta charset="utf-8" />
+	<meta name="viewport" content="width=1024" />
+	<title>'.$title.'</title>
+
+
+	<link href="http://fonts.googleapis.com/css?family=Open+Sans:regular,semibold,italic,italicsemibold|PT+Sans:400,700,400italic,700italic|PT+Serif:400,700,400italic,700italic" rel="stylesheet" />
+
+	<link href="'.\OCP\Util::linkToAbsolute('impress','css/player.css').'" rel="stylesheet" />
+    </head>
+
+<body class="impress-not-supported">
+	
+	
+	<div class="fallback-message">
+		<p>Your browser <b>does not support the features required</b> by impress.js, so you are presented with a simplified version of this presentation.</p>
+		<p>For the best experience please use the latest <b>Chrome</b>, <b>Safari</b> or <b>Firefox</b> browser.</p>
+	</div>
+	
+	
+	<div id="impress">
+		
+		
+
+		');
+			
+	}
+
+	public static function showFooter(){
+			
+		echo('
+		
+		<div class="hint">
+			<p>Make fullscreen and use a spacebar or arrow keys to navigate</p>
+		</div>
+		<script>
+		if ("ontouchstart" in document.documentElement) { 
+			document.querySelector(".hint").innerHTML = "<p>Tap on the left or right to navigate</p>";
+		}
+		</script>
+
+		<script src="'.\OCP\Util::linkToAbsolute('impress','js/impress.js').'"></script>
+		<script>impress().init();</script>
+		
+		<script>
+		
+
+			
+		</script>
+		
+		</body></html>
+		');
+				
+	}
+		
+
+}
+
+?>
diff --git a/apps/impress/player.php b/apps/impress/player.php
new file mode 100755
index 0000000000..12497de54c
--- /dev/null
+++ b/apps/impress/player.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+* ownCloud - impress player
+*
+* @author Frank Karlitschek
+* @copyright 2012 Frank Karlitschek ink@owncloud.org
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* 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/impress.php');
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+$filename = strip_tags($_GET['file']);
+$title = strip_tags($_GET['name']);
+
+if(!OC_Filesystem::file_exists($filename)){
+	header("HTTP/1.0 404 Not Found");
+	$tmpl = new OCP\Template( '', '404', 'guest' );
+	$tmpl->assign('file',$filename);
+	$tmpl->printPage();
+	exit;
+}
+
+header('Content-Type: text/html',true);
+OCP\Response::disableCaching();
+header('Content-Length: '.OC_Filesystem::filesize($filename));
+
+@ob_end_clean();
+
+\OCA_Impress\Storage::showHeader($title);
+OC_Filesystem::readfile( $filename );
+\OCA_Impress\Storage::showFooter();
+
diff --git a/apps/impress/templates/documentation.php b/apps/impress/templates/documentation.php
new file mode 100755
index 0000000000..1995bece25
--- /dev/null
+++ b/apps/impress/templates/documentation.php
@@ -0,0 +1,223 @@
+
+
+<div id="documentation">
+
+<h1>Impress Documentation</h1>
+<br />
+
+
+<h2>What is Impress?</h2>
+Impress is an ownCloud application that can play presentation based on the amazing <a href="http://bartaz.github.com/impress.js">impress.js</a> library.
+<br /><br />
+
+<h2>How do I use it?</h2>
+You have to define your presentation by writing a HTML file manually. But there are great examples and it isn´t that difficult.
+Just put a HTML file with the file extension .impress into your ownCloud and it will show up here in the Impress app automatically.
+If you click on it it opens up in a new windows.
+<br /><br />
+
+<h2>How do I define the presentation?</h2>
+The best way to learn it is to look at the example presenation. We suggest that you copy it and place it into your ownCloud with the name demo.impress and play around with it. You can edit in ownCloud directly with the internal text editor and play it here in the Impress app.
+<br />
+
+<textarea class="examplecode">
+   <!--
+   		Each step of the presentation should be an element inside the `#impress` with a class name
+   		of `step`. These step elements are positioned, rotated and scaled by impress.js, and
+   		the 'camera' shows them on each step of the presentation.
+   
+   		Positioning information is passed through data attributes.
+   
+   		In the example below we only specify x and y position of the step element with `data-x="-1000"`
+   		and `data-y="-1500` attributes. This means that **the center** of the element (yes, the center)
+   		will be positioned in point x = -1000px and y = -1500px of the presentation 'canvas'.
+   
+   		It will not be rotated or scaled.
+   
+   	-->
+   	<div id="bored" class="step slide active present" data-x="-1000" data-y="-1500" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(-1000px, -1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(1); -webkit-transform-style: preserve-3d; ">
+   		<q>Aren't you just <b>bored</b> with all those slides-based presentations?</q>
+   	</div>
+   
+   	<!--
+   
+   		The `id` attribute of the step element is used to identify it in the URL, but it's optional.
+   		If it is not defined, it will get a default value of `step-N` where N is a number of slide.
+   
+   		So in the example below it'll be `step-2`.
+   
+   		The hash part of the url when this step is active will be `#/step-2`.
+   
+   		You can also use `#step-2` in a link, to point directly to this particular step.
+   
+   		Please note, that while `#/step-2` (with slash) would also work in a link it's not recommended.
+   		Using classic `id`-based links like `#step-2` makes these links usable also in fallback mode.
+   
+   	-->
+   	<div class="step slide future" data-x="0" data-y="-1500" id="step-2" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(0px, -1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(1); -webkit-transform-style: preserve-3d; ">
+   		<q>Don't you think that presentations given <strong>in modern browsers</strong> shouldn't <strong>copy the limits</strong> of 'classic' slide decks?</q>
+   	</div>
+   
+   	<div class="step slide future" data-x="1000" data-y="-1500" id="step-3" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(1000px, -1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(1); -webkit-transform-style: preserve-3d; ">
+   		<q>Would you like to <strong>impress your audience</strong> with <strong>stunning visualization</strong> of your talk?</q>
+   	</div>
+   
+   	<!--
+   
+   		This is an example of step element being scaled.
+   
+   		Again, we use a `data-` attribute, this time it's `data-scale="4"`, so it means that this
+   		element will be 4 times larger than the others.
+   		From presentation and transitions point of view it means, that it will have to be scaled
+   		down (4 times) to make it back to it's correct size.
+   
+   	-->
+   	<div id="title" class="step future" data-x="0" data-y="0" data-scale="4" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(0px, 0px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(4); -webkit-transform-style: preserve-3d; ">
+   		<span class="try">then you should try</span>
+   		<h1>impress.js<sup>*</sup></h1>
+   		<span class="footnote"><sup>*</sup> no rhyme intended</span>
+   	</div>
+   
+   	<!--
+   
+   		This element introduces rotation.
+   
+   		Notation shouldn't be a surprise. We use `data-rotate="90"` attribute, meaning that this
+   		element should be rotated by 90 degrees clockwise.
+   
+   	-->
+   	<div id="its" class="step future" data-x="850" data-y="3000" data-rotate="90" data-scale="5" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(850px, 3000px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(90deg) scale(5); -webkit-transform-style: preserve-3d; ">
+   		<p>It's a <strong>presentation tool</strong> <br>
+   		inspired by the idea behind <a href="http://prezi.com/">prezi.com</a> <br>
+   		and based on the <strong>power of CSS3 transforms and transitions</strong> in modern browsers.</p>
+   	</div>
+   
+   	<div id="big" class="step future" data-x="3500" data-y="2100" data-rotate="180" data-scale="6" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(3500px, 2100px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(180deg) scale(6); -webkit-transform-style: preserve-3d; ">
+   		<p>visualize your <b>big</b> <span class="thoughts">thoughts</span></p>
+   	</div>
+   
+   	<!--
+   
+   		And now it gets really exiting! We move into third dimension!
+   
+   		Along with `data-x` and `data-y`, you can define the position on third (Z) axis, with
+   		`data-z`. In the example below we use `data-z="-3000"` meaning that element should be
+   		positioned far away from us (by 3000px).
+   
+   	-->
+   	<div id="tiny" class="step future" data-x="2825" data-y="2325" data-z="-3000" data-rotate="300" data-scale="1" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(2825px, 2325px, -3000px) rotateX(0deg) rotateY(0deg) rotateZ(300deg) scale(1); -webkit-transform-style: preserve-3d; ">
+   		<p>and <b>tiny</b> ideas</p>
+   	</div>
+   
+   	<!--
+   
+   		This step here doesn't introduce anything new when it comes to data attributes, but you
+   		should notice in the demo that some words of this text are being animated.
+   		It's a very basic CSS transition that is applied to the elements when this step element is
+   		reached.
+   
+   		At the very beginning of the presentation all step elements are given the class of `future`.
+   		It means that they haven't been visited yet.
+   
+   		When the presentation moves to given step `future` is changed to `present` class name.
+   		That's how animation on this step works - text moves when the step has `present` class.
+   
+   		Finally when the step is left the `present` class is removed from the element and `past`
+   		class is added.
+   
+   		So basically every step element has one of three classes: `future`, `present` and `past`.
+   		Only one current step has the `present` class.
+   
+   	-->
+   	<div id="ing" class="step future" data-x="3500" data-y="-850" data-rotate="270" data-scale="6" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(3500px, -850px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(270deg) scale(6); -webkit-transform-style: preserve-3d; ">
+   		<p>by <b class="positioning">positioning</b>, <b class="rotating">rotating</b> and <b class="scaling">scaling</b> them on an infinite canvas</p>
+   	</div>
+   
+   	<div id="imagination" class="step future" data-x="6700" data-y="-300" data-scale="6" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6700px, -300px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(6); -webkit-transform-style: preserve-3d; ">
+   		<p>the only <b>limit</b> is your <b class="imagination">imagination</b></p>
+   	</div>
+   
+   	<div id="source" class="step future" data-x="6300" data-y="2000" data-rotate="20" data-scale="4" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6300px, 2000px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(20deg) scale(4); -webkit-transform-style: preserve-3d; ">
+   		<p>want to know more?</p>
+   		<q><a href="http://github.com/bartaz/impress.js">use the source</a>, Luke!</q>
+   	</div>
+   
+   	<div id="one-more-thing" class="step future" data-x="6000" data-y="4000" data-scale="2" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6000px, 4000px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(2); -webkit-transform-style: preserve-3d; ">
+   		<p>one more thing...</p>
+   	</div>
+   
+   	<!--
+   
+   		And the last one shows full power and flexibility of impress.js.
+   
+   		You can not only position element in 3D, but also rotate it around any axis.
+   		So this one here will get rotated by -40 degrees (40 degrees anticlockwise) around X axis and
+   		10 degrees (clockwise) around Y axis.
+   
+   		You can of course rotate it around Z axis with `data-rotate-z` - it has exactly the same effect
+   		as `data-rotate` (these two are basically aliases).
+   
+   	-->
+   	<div id="its-in-3d" class="step future" data-x="6200" data-y="4300" data-z="-100" data-rotate-x="-40" data-rotate-y="10" data-scale="2" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6200px, 4300px, -100px) rotateX(-40deg) rotateY(10deg) rotateZ(0deg) scale(2); -webkit-transform-style: preserve-3d; ">
+   		<p><span class="have">have</span> <span class="you">you</span> <span class="noticed">noticed</span> <span class="its">it's</span> <span class="in">in</span> <b>3D<sup>*</sup></b>?</p>
+   		<span class="footnote">* beat that, prezi ;)</span>
+   	</div>
+   
+   	<!--
+   
+   		So to make a summary of all the possible attributes used to position presentation steps, we have:
+   
+   		* `data-x`, `data-y`, `data-z` - they define the position of **the center** of step element on
+   			the canvas in pixels; their default value is 0;
+   		* `data-rotate-x`, `data-rotate-y`, 'data-rotate-z`, `data-rotate` - they define the rotation of
+   			the element around given axis in degrees; their default value is 0; `data-rotate` and `data-rotate-z`
+   			are exactly the same;
+   		* `data-scale` - defines the scale of step element; default value is 1
+   
+   		These values are used by impress.js in CSS transformation functions, so for more information consult
+   		CSS transfrom docs: https://developer.mozilla.org/en/CSS/transform
+   
+   	-->
+   	<div id="overview" class="step future" data-x="3000" data-y="1500" data-scale="10" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(3000px, 1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(10); -webkit-transform-style: preserve-3d; ">
+   	</div>
+   
+   </div></div>
+   
+   <!--
+   
+   	Hint is not related to impress.js in any way.
+   
+   	But it can show you how to use impress.js features in creative way.
+   
+   	When the presentation step is shown (selected) its element gets the class of "active" and the body element
+   	gets the class based on active step id `impress-on-ID` (where ID is the step's id)... It may not be
+   	so clear because of all these "ids" in previous sentence, so for example when the first step (the one with
+   	the id of `bored`) is active, body element gets a class of `impress-on-bored`.
+   
+   	This class is used by this hint below. Check CSS file to see how it's shown with delayed CSS animation when
+   	the first step of presentation is visible for a couple of seconds.
+   
+   	...
+   
+   	And when it comes to this piece of JavaScript below ... kids, don't do this at home ;)
+   	It's just a quick and dirty workaround to get different hint text for touch devices.
+   	In a real world it should be at least placed in separate JS file ... and the touch content should be
+   	probably just hidden somewhere in HTML - not hard-coded in the script.
+   
+   	Just sayin' ;)
+   
+   -->	
+</textarea>	
+
+
+<br /><br />
+
+
+
+<h2>Credits</h2>
+Many thanks to Bartek Szopka for creating the wonderful impress.js library and also the demo presentation who made this app possible.
+<br /><br />
+
+
+
+</div>
\ No newline at end of file
diff --git a/apps/impress/templates/presentations.php b/apps/impress/templates/presentations.php
new file mode 100755
index 0000000000..ab75802b35
--- /dev/null
+++ b/apps/impress/templates/presentations.php
@@ -0,0 +1,30 @@
+<?php
+
+
+
+// show toolbar
+echo('<div id="controls">	
+	<a href="'.\OCP\Util::linkToAbsolute('impress','documentation.php').'" class="button docu">'.$l->t('Documentation').'</a>
+	</div>
+');
+
+
+if(empty($_['list'])) {
+	
+    echo('<div id="emptyfolder">No Impress files are found in your ownCloud. Please upload a .impress file.</div>');
+			
+}else{
+
+	echo('<table class="impresslist" >');
+	foreach($_['list'] as $entry) {
+
+		echo('<tr><td width="1"><a target="_blank" href="'.\OCP\Util::linkToAbsolute('impress','player.php').'&file='.urlencode($entry['url']).'&name='.urlencode($entry['name']).'"><img align="left" src="'.\OCP\Util::linkToAbsolute('impress','img/impressbig.png').'"></a></td><td><a target="_blank" href="'.\OCP\Util::linkToAbsolute('impress','player.php').'&file='.urlencode($entry['url']).'&name='.urlencode($entry['name']).'">'.$entry['name'].'</a></td><td>'.\OCP\Util::formatDate($entry['mtime']).'</td><td>'.\OCP\Util::humanFileSize($entry['size']).'</td></tr>');
+
+	}
+	echo('</table>');
+	
+	
+	
+}
+
+

From 53350b2f194ca79eaa4cc5e229cd339440f7af85 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 21 Aug 2012 10:33:20 -0400
Subject: [PATCH 1500/1537] Remove unnecessary file

---
 apps/files/share.php | 38 --------------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100755 apps/files/share.php

diff --git a/apps/files/share.php b/apps/files/share.php
deleted file mode 100755
index 4f7c1f55fc..0000000000
--- a/apps/files/share.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/>.
-*/
-
-class OC_Share_Backend_Files extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		return $item;
-	}
-}
-
-class OC_Share_Backend_Folders extends OC_Share_Backend_Files {
-
-	public function share($
-	public function getDirectoryContent($folder) {
-		
-	}
-}
-
-?>
\ No newline at end of file

From 1d7018158e154d644ca5aae0050f2c294d626bcb Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 21 Aug 2012 18:47:26 +0200
Subject: [PATCH 1501/1537] 4.5 alpha 1

---
 lib/util.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 41bd375dbf..e63eb5b24c 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,81,4);
+		return array(4,82,4);
 	}
 
 	/**
@@ -74,7 +74,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '5 pre alpha';
+		return '5 pre alpha 1';
 	}
 
 	/**

From e6d87b2c4b643761becbd14d8b7a08ba30aa4269 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 22 Aug 2012 02:08:16 +0200
Subject: [PATCH 1502/1537] [tx-robot] updated from transifex

---
 apps/calendar/l10n/ja_JP.php              |  4 +-
 apps/contacts/l10n/de.php                 |  3 +-
 apps/contacts/l10n/fi_FI.php              |  6 +-
 apps/contacts/l10n/it.php                 |  3 +-
 apps/contacts/l10n/ja_JP.php              |  3 +-
 apps/contacts/l10n/sl.php                 |  3 +-
 apps/contacts/l10n/sv.php                 |  3 +-
 apps/files/l10n/sv.php                    | 18 ++---
 apps/files_sharing/l10n/de.php            |  3 +
 apps/files_sharing/l10n/fr.php            |  3 +
 apps/files_sharing/l10n/it.php            |  3 +
 apps/files_sharing/l10n/ja_JP.php         |  3 +
 apps/files_sharing/l10n/sl.php            |  3 +
 apps/files_sharing/l10n/sv.php            |  3 +
 apps/media/l10n/sv.php                    |  1 +
 apps/tasks/l10n/sl.php                    |  6 ++
 apps/user_ldap/l10n/de.php                |  2 +
 apps/user_ldap/l10n/sl.php                | 17 ++++-
 core/l10n/sv.php                          | 16 ++---
 l10n/de/contacts.po                       | 76 ++++++++++-----------
 l10n/de/files_sharing.po                  | 11 +--
 l10n/de/user_ldap.po                      | 11 +--
 l10n/fi_FI/contacts.po                    | 82 +++++++++++------------
 l10n/fr/files_sharing.po                  | 13 ++--
 l10n/it/contacts.po                       | 76 ++++++++++-----------
 l10n/it/files_sharing.po                  | 12 ++--
 l10n/ja_JP/calendar.po                    | 12 ++--
 l10n/ja_JP/contacts.po                    | 76 ++++++++++-----------
 l10n/ja_JP/files_sharing.po               | 12 ++--
 l10n/sl/contacts.po                       | 76 ++++++++++-----------
 l10n/sl/files_sharing.po                  | 12 ++--
 l10n/sl/lib.po                            | 18 ++---
 l10n/sl/tasks.po                          | 16 ++---
 l10n/sl/user_ldap.po                      | 34 +++++-----
 l10n/sv/contacts.po                       | 76 ++++++++++-----------
 l10n/sv/core.po                           | 49 +++++++-------
 l10n/sv/files.po                          | 24 +++----
 l10n/sv/files_sharing.po                  | 12 ++--
 l10n/sv/lib.po                            | 29 ++++----
 l10n/sv/media.po                          | 14 ++--
 l10n/sv/settings.po                       | 16 ++---
 l10n/templates/admin_dependencies_chk.pot |  2 +-
 l10n/templates/admin_migrate.pot          |  2 +-
 l10n/templates/bookmarks.pot              |  2 +-
 l10n/templates/calendar.pot               |  2 +-
 l10n/templates/contacts.pot               | 70 +++++++++----------
 l10n/templates/core.pot                   |  2 +-
 l10n/templates/files.pot                  |  2 +-
 l10n/templates/files_encryption.pot       |  2 +-
 l10n/templates/files_external.pot         |  2 +-
 l10n/templates/files_sharing.pot          |  2 +-
 l10n/templates/files_versions.pot         |  2 +-
 l10n/templates/gallery.pot                |  2 +-
 l10n/templates/lib.pot                    |  2 +-
 l10n/templates/media.pot                  |  2 +-
 l10n/templates/settings.pot               |  2 +-
 l10n/templates/tasks.pot                  |  2 +-
 l10n/templates/user_ldap.pot              |  2 +-
 l10n/templates/user_migrate.pot           |  2 +-
 l10n/templates/user_openid.pot            |  2 +-
 lib/l10n/sl.php                           |  6 +-
 lib/l10n/sv.php                           |  2 +-
 settings/l10n/sv.php                      | 12 ++--
 63 files changed, 521 insertions(+), 465 deletions(-)

diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index a4323d8ae5..3c7793a850 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -110,7 +110,7 @@
 "There was a database fail" => "データベースのエラーがありました",
 "Week" => "週",
 "Month" => "月",
-"List" => "リスト",
+"List" => "予定リスト",
 "Today" => "今日",
 "Settings" => "設定",
 "Your calendars" => "あなたのカレンダー",
@@ -182,7 +182,7 @@
 "12h" => "12h",
 "Start week on" => "1週間の初めの曜日",
 "Cache" => "キャッシュ",
-"Clear cache for repeating events" => "イベントを繰り返すためにキャッシュをクリアしてください",
+"Clear cache for repeating events" => "繰り返しイベントのキャッシュをクリア",
 "URLs" => "URL",
 "Calendar CalDAV syncing addresses" => "CalDAVカレンダーの同期用アドレス",
 "more info" => "さらに",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 2aeb106c48..efc2fff7d2 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -76,6 +76,7 @@
 "Organization" => "Organisation",
 "Work" => "Arbeit",
 "Home" => "Zuhause",
+"Other" => "Andere",
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Anruf",
@@ -94,7 +95,6 @@
 "Journey" => "Reise",
 "Jubilee" => "Jubiläum",
 "Meeting" => "Besprechung",
-"Other" => "Andere",
 "Personal" => "Persönlich",
 "Projects" => "Projekte",
 "Questions" => "Fragen",
@@ -200,6 +200,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "CardDav-Link anzeigen",
 "Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
+"Share" => "Teilen",
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
 "New Address Book" => "Neues Adressbuch",
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 069b08144e..dcc6876195 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -31,10 +31,13 @@
 "Error" => "Virhe",
 "Edit name" => "Muokkaa nimeä",
 "No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
+"Error loading profile picture." => "Virhe profiilikuvaa ladatessa.",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan.",
+"Do you want to merge these address books?" => "Haluatko yhdistää nämä osoitekirjat?",
 "Result: " => "Tulos: ",
 " imported, " => " tuotu, ",
 " failed." => " epäonnistui.",
+"Displayname cannot be empty." => "Näyttönimi ei voi olla tyhjä.",
 "Addressbook not found: " => "Osoitekirjaa ei löytynyt:",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
@@ -44,6 +47,7 @@
 "Organization" => "Organisaatio",
 "Work" => "Työ",
 "Home" => "Koti",
+"Other" => "Muu",
 "Mobile" => "Mobiili",
 "Text" => "Teksti",
 "Voice" => "Ääni",
@@ -54,7 +58,6 @@
 "Internet" => "Internet",
 "Birthday" => "Syntymäpäivä",
 "Business" => "Työ",
-"Other" => "Muu",
 "Questions" => "Kysymykset",
 "{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
 "Contact" => "Yhteystieto",
@@ -133,6 +136,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Näytä CardDav-linkki",
 "Show read-only VCF link" => "Näytä vain luku -muodossa oleva VCF-linkki",
+"Share" => "Jaa",
 "Download" => "Lataa",
 "Edit" => "Muokkaa",
 "New Address Book" => "Uusi osoitekirja",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index eb98780d47..32120e4c14 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -76,6 +76,7 @@
 "Organization" => "Organizzazione",
 "Work" => "Lavoro",
 "Home" => "Casa",
+"Other" => "Altro",
 "Mobile" => "Cellulare",
 "Text" => "Testo",
 "Voice" => "Voce",
@@ -94,7 +95,6 @@
 "Journey" => "Viaggio",
 "Jubilee" => "Anniversario",
 "Meeting" => "Riunione",
-"Other" => "Altro",
 "Personal" => "Personale",
 "Projects" => "Progetti",
 "Questions" => "Domande",
@@ -200,6 +200,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Mostra collegamento CardDav",
 "Show read-only VCF link" => "Mostra collegamento VCF in sola lettura",
+"Share" => "Condividi",
 "Download" => "Scarica",
 "Edit" => "Modifica",
 "New Address Book" => "Nuova rubrica",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index c3be215ce6..55756ef785 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -76,6 +76,7 @@
 "Organization" => "所属",
 "Work" => "勤務先",
 "Home" => "住居",
+"Other" => "その他",
 "Mobile" => "携帯電話",
 "Text" => "TTY TDD",
 "Voice" => "音声番号",
@@ -94,7 +95,6 @@
 "Journey" => "旅行",
 "Jubilee" => "記念祭",
 "Meeting" => "打ち合わせ",
-"Other" => "その他",
 "Personal" => "個人",
 "Projects" => "プロジェクト",
 "Questions" => "質問",
@@ -200,6 +200,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "CarDavリンクを表示",
 "Show read-only VCF link" => "読み取り専用のVCFリンクを表示",
+"Share" => "共有",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "New Address Book" => "新規のアドレス帳",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 8746a83919..3640675383 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -76,6 +76,7 @@
 "Organization" => "Organizacija",
 "Work" => "Delo",
 "Home" => "Doma",
+"Other" => "Drugo",
 "Mobile" => "Mobilni telefon",
 "Text" => "Besedilo",
 "Voice" => "Glas",
@@ -94,7 +95,6 @@
 "Journey" => "Potovanje",
 "Jubilee" => "Jubilej",
 "Meeting" => "Sestanek",
-"Other" => "Drugo",
 "Personal" => "Osebno",
 "Projects" => "Projekti",
 "Questions" => "Vprašanja",
@@ -200,6 +200,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Pokaži CardDav povezavo",
 "Show read-only VCF link" => "Pokaži VCF povezavo samo za branje",
+"Share" => "Souporaba",
 "Download" => "Prenesi",
 "Edit" => "Uredi",
 "New Address Book" => "Nov imenik",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index 1fee645594..113657f888 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -76,6 +76,7 @@
 "Organization" => "Organisation",
 "Work" => "Arbete",
 "Home" => "Hem",
+"Other" => "Annat",
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Röst",
@@ -94,7 +95,6 @@
 "Journey" => "Resa",
 "Jubilee" => "Jubileum",
 "Meeting" => "Möte",
-"Other" => "Annat",
 "Personal" => "Privat",
 "Projects" => "Projekt",
 "Questions" => "Frågor",
@@ -190,6 +190,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Visa CardDav-länk",
 "Show read-only VCF link" => "Visa skrivskyddad VCF-länk",
+"Share" => "Dela",
 "Download" => "Nedladdning",
 "Edit" => "Redigera",
 "New Address Book" => "Ny adressbok",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 2a7763bc9b..a62b752251 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -2,12 +2,12 @@
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär",
-"The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvist uppladdad",
+"The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvis uppladdad",
 "No file was uploaded" => "Ingen fil blev uppladdad",
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
-"Delete" => "Ta bort",
+"Delete" => "Radera",
 "already exists" => "finns redan",
 "replace" => "ersätt",
 "cancel" => "avbryt",
@@ -15,7 +15,7 @@
 "with" => "med",
 "undo" => "ångra",
 "deleted" => "raderad",
-"generating ZIP-file, it may take some time." => "Gererar ZIP-fil. Det kan ta lite tid.",
+"generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
 "Upload Error" => "Uppladdningsfel",
 "Pending" => "Väntar",
@@ -30,10 +30,10 @@
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
 "max. possible: " => "max. möjligt:",
-"Needed for multi-file and folder downloads." => "Krävs för nerladdning av flera mappar och filer",
+"Needed for multi-file and folder downloads." => "Krävs för nerladdning av flera mappar och filer.",
 "Enable ZIP-download" => "Aktivera ZIP-nerladdning",
-"0 is unlimited" => "0 är lika med oändligt",
-"Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP filer",
+"0 is unlimited" => "0 är oändligt",
+"Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP-filer",
 "New" => "Ny",
 "Text file" => "Textfil",
 "Folder" => "Mapp",
@@ -43,9 +43,9 @@
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Name" => "Namn",
 "Share" => "Dela",
-"Download" => "Ladda ned",
+"Download" => "Ladda ner",
 "Upload too large" => "För stor uppladdning",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
-"Files are being scanned, please wait." => "Filerna skannas, var god vänta",
-"Current scanning" => "Aktuell avsökning"
+"Files are being scanned, please wait." => "Filer skannas, var god vänta",
+"Current scanning" => "Aktuell skanning"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 26da53e833..c6f12e88ec 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Size" => "Größe",
+"Modified" => "Geändert",
+"Delete all" => "Alle löschen",
 "Delete" => "Löschen",
 "Your Shared Files" => "Ihre geteilten Dateien",
 "Item" => "Objekt",
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 347c59a088..bd38c9b9ce 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Size" => "Taille",
+"Modified" => "Modifié",
+"Delete all" => "Tout effacer",
 "Delete" => "Effacement",
 "Your Shared Files" => "Vos documents partagés",
 "Item" => "Item",
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 1afcdc5199..c4b26f7b61 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Size" => "Dimensione",
+"Modified" => "Modificato",
+"Delete all" => "Elimina tutto",
 "Delete" => "Eliminazione",
 "Your Shared Files" => "I tuoi file condivisi",
 "Item" => "Elemento",
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index a38b457aae..d334908ae7 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Size" => "サイズ",
+"Modified" => "変更",
+"Delete all" => "すべて削除",
 "Delete" => "削除",
 "Your Shared Files" => "共有ファイル",
 "Item" => "項目",
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 607ec91a26..231de48467 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Size" => "Velikost",
+"Modified" => "Spremenjeno",
+"Delete all" => "Izbriši vse",
 "Delete" => "Izbris",
 "Your Shared Files" => "Vaše datoteke v souporabi",
 "Item" => "Predmet",
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index d053d9b4df..812d0bced8 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Size" => "Storlek",
+"Modified" => "Ändrad",
+"Delete all" => "Radera alla",
 "Delete" => "Radera",
 "Your Shared Files" => "Dina delade filer",
 "Item" => "Objekt",
diff --git a/apps/media/l10n/sv.php b/apps/media/l10n/sv.php
index 75670a4851..1cf5497e7e 100644
--- a/apps/media/l10n/sv.php
+++ b/apps/media/l10n/sv.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Add album to playlist" => "Lägg till album till spellistan",
 "Play" => "Spela",
 "Pause" => "Paus",
 "Previous" => "Föregående",
diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php
index 3dff6b22a0..c235ff0bc4 100644
--- a/apps/tasks/l10n/sl.php
+++ b/apps/tasks/l10n/sl.php
@@ -10,6 +10,12 @@
 "Invalid percent complete" => "Neveljaven odstotek dokončanja",
 "Invalid priority" => "Neveljavna prednost",
 "Add Task" => "Dodaj opravilo",
+"Order Due" => "Razvrsti po roku",
+"Order List" => "Razvrsti v seznam",
+"Order Complete" => "Razvrsti po zaključenosti",
+"Order Location" => "Razvrsti po lokacijah",
+"Order Priority" => "Razvrsti po prednosti",
+"Order Label" => "Razvrsti po oznakah",
 "Loading tasks..." => "Nalagam opravila...",
 "Important" => "Pomembno",
 "More" => "Več",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 1436117184..309c4fdbdd 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,8 +12,10 @@
 "User List Filter" => "Benutzer Filter Liste",
 "Group Filter" => "Gruppen Filter",
 "Port" => "Port",
+"Use TLS" => "Nutze TLS",
 "Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern.",
 "Turn off SSL certificate validation." => "Schalte die SSL Zertifikatsprüfung aus.",
+"Not recommended, use for testing only." => "Nicht empfohlen, nur zum Testen.",
 "in bytes" => "in bytes",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
 "Help" => "Hilfe"
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 8126124f1f..312346958b 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -4,20 +4,33 @@
 "Base DN" => "Osnovni DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno",
 "User DN" => "Uporabnik DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop pustite polji DN in geslo prazni.",
 "Password" => "Geslo",
-"For anonymous access, leave DN and Password empty." => "Za anonimni dostop pustite polji za DN in geslo prazni.",
+"For anonymous access, leave DN and Password empty." => "Za anonimni dostop pustite polji DN in geslo prazni.",
 "User Login Filter" => "Filter prijav uporabnikov",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uporabite ogrado %%uid, npr. \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter uporabljen pri prijavi. %%uid nadomesti uporaniško ime pri prijavi.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite ogrado %%uid, npr. \"uid=%%uid\".",
 "User List Filter" => "Filter seznama uporabnikov",
 "Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.",
 "without any placeholder, e.g. \"objectClass=person\"." => "Brez katerekoli ograde, npr. \"objectClass=person\".",
 "Group Filter" => "Filter skupin",
 "Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli ograde, npr. \"objectClass=posixGroup\".",
 "Port" => "Vrata",
+"Base User Tree" => "Osnovno uporabniško drevo",
+"Base Group Tree" => "Osnovno drevo skupine",
+"Group-Member association" => "Povezava člana skupine",
 "Use TLS" => "Uporabi TLS",
 "Do not use it for SSL connections, it will fail." => "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo.",
+"Case insensitve LDAP server (Windows)" => "LDAP strežnik je neobčutljiv na velikost črk (Windows)",
 "Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti SSL certifikata.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Če povezava deluje samo s to možnostjo, uvozite SSL potrdilo iz LDAP strežnika v vaš ownCloud strežnik.",
 "Not recommended, use for testing only." => "Odsvetovano, uporabite le v namene preizkušanja.",
+"User Display Name Field" => "Polje za uporabnikovo prikazano ime",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP atribut uporabljen pri ustvarjanju ownCloud uporabniških imen.",
+"Group Display Name Field" => "Polje za prikazano ime skupine",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP atribut uporabljen pri ustvarjanju ownCloud imen skupin.",
 "in bytes" => "v bajtih",
+"in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
 "Help" => "Pomoč"
 );
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 6be057768d..25ba95558e 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,5 +1,5 @@
 <?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:",
 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
@@ -26,14 +26,14 @@
 "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",
@@ -48,9 +48,9 @@
 "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",
@@ -58,7 +58,7 @@
 "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/l10n/de/contacts.po b/l10n/de/contacts.po
index dfc2525069..bb512f9a2c 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 11:02+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -255,9 +255,9 @@ msgstr "Konnte keine gültige Adresse abrufen"
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
@@ -289,21 +289,21 @@ msgid ""
 "on this server."
 msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
 msgstr "Fehler beim Laden des Profilbildes."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr "Wähle Typ"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
 msgstr "Möchtest du diese Adressbücher zusammenführen?"
 
@@ -352,100 +352,100 @@ msgstr "E-Mail"
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr "Andere"
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:196
-msgid "Other"
-msgstr "Andere"
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr "Fragen"
 
@@ -864,7 +864,7 @@ msgstr "Schreibgeschützten VCF-Link anzeigen"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Teilen"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 562a8ccf21..4f9072a984 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot <thomas.mueller@tmit.eu>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 09:52+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -21,15 +22,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Größe"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Geändert"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Alle löschen"
 
 #: templates/get.php:5 templates/list.php:16 templates/list.php:17
 msgid "Delete"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 6e4c7880b7..abdda322f0 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Maurice Preuß <>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 09:48+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 11:03+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +114,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Nutze TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -135,7 +136,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Nicht empfohlen, nur zum Testen."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index e24b398705..ecaaf1a119 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 17:04+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,9 +242,9 @@ msgstr ""
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Virhe"
 
@@ -276,23 +276,23 @@ msgid ""
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Virhe profiilikuvaa ladatessa."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Haluatko yhdistää nämä osoitekirjat?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -308,7 +308,7 @@ msgstr " epäonnistui."
 
 #: js/settings.js:68
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Näyttönimi ei voi olla tyhjä."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
@@ -339,100 +339,100 @@ msgstr "Sähköposti"
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr "Muu"
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:196
-msgid "Other"
-msgstr "Muu"
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -851,7 +851,7 @@ msgstr "Näytä vain luku -muodossa oleva VCF-linkki"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 63841db729..66f78d21de 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <gp4004@arghh.org>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 07:11+0000\n"
+"Last-Translator: gp4004 <gp4004@arghh.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +21,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Taille"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Modifié"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Tout effacer"
 
 #: templates/get.php:5 templates/list.php:16 templates/list.php:17
 msgid "Delete"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index d0727e1f0d..6d9dc3be5d 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 06:00+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,9 +242,9 @@ msgstr "Impossibile ottenere un indirizzo valido."
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errore"
 
@@ -276,21 +276,21 @@ msgid ""
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
 msgstr "Errore durante il caricamento dell'immagine di profilo."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
 msgstr "Vuoi unire queste rubriche?"
 
@@ -339,100 +339,100 @@ msgstr "Email"
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr "Altro"
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:196
-msgid "Other"
-msgstr "Altro"
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr "Domande"
 
@@ -851,7 +851,7 @@ msgstr "Mostra collegamento VCF in sola lettura"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Condividi"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 9dac30c173..1bddc18b6e 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 06:02+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Dimensione"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Modificato"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Elimina tutto"
 
 #: templates/get.php:5 templates/list.php:16 templates/list.php:17
 msgid "Delete"
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index c62d4af454..605bf02d2e 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 01:51+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-08-22 02:03+0200\n"
+"PO-Revision-Date: 2012-08-21 02:29+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgstr "タイムゾーンが変更されました"
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "カレンダー"
@@ -470,7 +470,7 @@ msgstr "月"
 
 #: templates/calendar.php:41
 msgid "List"
-msgstr "リスト"
+msgstr "予定リスト"
 
 #: templates/calendar.php:45
 msgid "Today"
@@ -764,7 +764,7 @@ msgstr "キャッシュ"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr "イベントを繰り返すためにキャッシュをクリアしてください"
+msgstr "繰り返しイベントのキャッシュをクリア"
 
 #: templates/settings.php:85
 msgid "URLs"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 2f62507e3e..e6f22a5ca7 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 01:50+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,9 +240,9 @@ msgstr "有効なアドレスを取得できませんでした。"
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "エラー"
 
@@ -274,21 +274,21 @@ msgid ""
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
 msgstr "プロファイルの画像の読み込みエラー"
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr "タイプを選択"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
 msgstr "これらのアドレス帳をマージしてもよろしいですか？"
 
@@ -337,100 +337,100 @@ msgstr "メールアドレス"
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr "その他"
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr "インターネット"
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr "電話"
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr "打ち合わせ"
 
-#: lib/app.php:196
-msgid "Other"
-msgstr "その他"
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr "質問"
 
@@ -849,7 +849,7 @@ msgstr "読み取り専用のVCFリンクを表示"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "共有"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 99f9cb0ce7..edc409fb90 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 01:51+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,15 +21,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "サイズ"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "変更"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "すべて削除"
 
 #: templates/get.php:5 templates/list.php:16 templates/list.php:17
 msgid "Delete"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index e2305fea68..6878e60f69 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 10:47+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,9 +241,9 @@ msgstr "Ne morem dobiti veljavnega naslova."
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Napaka"
 
@@ -275,21 +275,21 @@ msgid ""
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
 msgstr "Napaka pri nalaganju slike profila."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr "Izberite vrsto"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
 msgstr "Ali želite združiti adresarje?"
 
@@ -338,100 +338,100 @@ msgstr "E-pošta"
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr "Drugo"
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr "Klic"
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr "Stranka"
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr "Dostavljalec"
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr "Prazniki"
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr "Potovanje"
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr "Jubilej"
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: lib/app.php:196
-msgid "Other"
-msgstr "Drugo"
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr "Osebno"
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr "Vprašanja"
 
@@ -850,7 +850,7 @@ msgstr "Pokaži VCF povezavo samo za branje"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Souporaba"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 4f1cca8ec7..cefc893aab 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 10:53+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Velikost"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Spremenjeno"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Izbriši vse"
 
 #: templates/get.php:5 templates/list.php:16 templates/list.php:17
 msgid "Delete"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 305737e78c..58fda36869 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 00:37+0000\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 13:10+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +42,19 @@ msgstr "Aplikacije"
 msgid "Admin"
 msgstr "Skrbnik"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
 msgstr "ZIP prenos je onemogočen."
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke morajo biti prenešene posamezno."
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike, da bi lahko ustvarili zip datoteko."
 
@@ -72,7 +72,7 @@ msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr "sekundami"
+msgstr "sekund nazaj"
 
 #: template.php:87
 msgid "1 minute ago"
@@ -102,7 +102,7 @@ msgstr "prejšnji mesec"
 
 #: template.php:95
 msgid "months ago"
-msgstr "meseci"
+msgstr "mesecev nazaj"
 
 #: template.php:96
 msgid "last year"
@@ -110,4 +110,4 @@ msgstr "lani"
 
 #: template.php:97
 msgid "years ago"
-msgstr "leti"
+msgstr "let nazaj"
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
index 6f77b49256..ac56c8067f 100644
--- a/l10n/sl/tasks.po
+++ b/l10n/sl/tasks.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 15:38+0000\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 11:22+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -64,27 +64,27 @@ msgstr "Dodaj opravilo"
 
 #: templates/tasks.php:4
 msgid "Order Due"
-msgstr ""
+msgstr "Razvrsti po roku"
 
 #: templates/tasks.php:5
 msgid "Order List"
-msgstr ""
+msgstr "Razvrsti v seznam"
 
 #: templates/tasks.php:6
 msgid "Order Complete"
-msgstr ""
+msgstr "Razvrsti po zaključenosti"
 
 #: templates/tasks.php:7
 msgid "Order Location"
-msgstr ""
+msgstr "Razvrsti po lokacijah"
 
 #: templates/tasks.php:8
 msgid "Order Priority"
-msgstr ""
+msgstr "Razvrsti po prednosti"
 
 #: templates/tasks.php:9
 msgid "Order Label"
-msgstr ""
+msgstr "Razvrsti po oznakah"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 55c993f1bf..c405fb64d9 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 14:56+0000\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 11:45+0000\n"
 "Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop pustite polji DN in geslo prazni."
 
 #: templates/settings.php:11
 msgid "Password"
@@ -52,7 +52,7 @@ msgstr "Geslo"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Za anonimni dostop pustite polji za DN in geslo prazni."
+msgstr "Za anonimni dostop pustite polji DN in geslo prazni."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
@@ -63,12 +63,12 @@ msgstr "Filter prijav uporabnikov"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Določi filter uporabljen pri prijavi. %%uid nadomesti uporaniško ime pri prijavi."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "uporabite ogrado %%uid, npr. \"uid=%%uid\""
+msgstr "Uporabite ogrado %%uid, npr. \"uid=%%uid\"."
 
 #: templates/settings.php:13
 msgid "User List Filter"
@@ -92,7 +92,7 @@ msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "Brez katerekoli ograde, npr. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
@@ -100,15 +100,15 @@ msgstr "Vrata"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Osnovno uporabniško drevo"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Osnovno drevo skupine"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Povezava člana skupine"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -120,7 +120,7 @@ msgstr "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP strežnik je neobčutljiv na velikost črk (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
@@ -130,7 +130,7 @@ msgstr "Onemogoči potrditev veljavnosti SSL certifikata."
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Če povezava deluje samo s to možnostjo, uvozite SSL potrdilo iz LDAP strežnika v vaš ownCloud strežnik."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
@@ -138,19 +138,19 @@ msgstr "Odsvetovano, uporabite le v namene preizkušanja."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Polje za uporabnikovo prikazano ime"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP atribut uporabljen pri ustvarjanju ownCloud uporabniških imen."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Polje za prikazano ime skupine"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP atribut uporabljen pri ustvarjanju ownCloud imen skupin."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -158,7 +158,7 @@ msgstr "v bajtih"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
 #: templates/settings.php:31
 msgid "Help"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 55b65ae245..b80611b20f 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:16+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,9 +244,9 @@ msgstr "Kunde inte hitta en giltig adress."
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fel"
 
@@ -278,21 +278,21 @@ msgid ""
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
 msgstr "Fel vid hämtning av profilbild."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr "Välj typ"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
 msgstr "Vill du slå samman dessa adressböcker?"
 
@@ -341,100 +341,100 @@ msgstr "E-post"
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr "Annat"
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr "Resa"
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr "Möte"
 
-#: lib/app.php:196
-msgid "Other"
-msgstr "Annat"
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr "Frågor"
 
@@ -853,7 +853,7 @@ msgstr "Visa skrivskyddad VCF-länk"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Dela"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 3017915cbb..92631fa760 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -6,15 +6,16 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
+# Magnus Höglund <magnus@linux.com>, 2012.
 #   <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:33+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr "Programnamn har inte angetts"
+msgstr "Programnamn har inte angetts."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
@@ -38,55 +39,55 @@ msgstr "Denna kategori finns redan:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "December"
 
@@ -132,7 +133,7 @@ msgstr "Begärd"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr "Inloggning misslyckades!"
+msgstr "Misslyckad inloggning!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -149,7 +150,7 @@ msgstr "Ditt lösenord har återställts"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Till logga in sidan"
+msgstr "Till logginsidan"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -161,7 +162,7 @@ msgstr "Återställ lösenordet"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
 #: strings.php:6
 msgid "Users"
@@ -222,15 +223,15 @@ msgstr "kommer att användas"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Databas-användare"
+msgstr "Databasanvändare"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr "Lösenord för databasen"
+msgstr "Lösenord till databasen"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr "Databasens namn"
+msgstr "Databasnamn"
 
 #: templates/installation.php:96
 msgid "Database host"
@@ -262,7 +263,7 @@ msgstr "Logga in"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Du är utloggad"
+msgstr "Du är utloggad."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 6eddb63409..14004c7fae 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:24+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HT
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
-msgstr "Den uppladdade filen var endast delvist uppladdad"
+msgstr "Den uppladdade filen var endast delvis uppladdad"
 
 #: ajax/upload.php:24
 msgid "No file was uploaded"
@@ -59,7 +59,7 @@ msgstr "Filer"
 
 #: js/fileactions.js:107 templates/index.php:56
 msgid "Delete"
-msgstr "Ta bort"
+msgstr "Radera"
 
 #: js/filelist.js:141
 msgid "already exists"
@@ -91,7 +91,7 @@ msgstr "raderad"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
-msgstr "Gererar ZIP-fil. Det kan ta lite tid."
+msgstr "genererar ZIP-fil, det kan ta lite tid."
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -151,7 +151,7 @@ msgstr "max. möjligt:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr "Krävs för nerladdning av flera mappar och filer"
+msgstr "Krävs för nerladdning av flera mappar och filer."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -159,11 +159,11 @@ msgstr "Aktivera ZIP-nerladdning"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr "0 är lika med oändligt"
+msgstr "0 är oändligt"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr "Största tillåtna storlek för ZIP filer"
+msgstr "Största tillåtna storlek för ZIP-filer"
 
 #: templates/index.php:7
 msgid "New"
@@ -203,7 +203,7 @@ msgstr "Dela"
 
 #: templates/index.php:51
 msgid "Download"
-msgstr "Ladda ned"
+msgstr "Ladda ner"
 
 #: templates/index.php:64
 msgid "Upload too large"
@@ -217,8 +217,8 @@ msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr "Filerna skannas, var god vänta"
+msgstr "Filer skannas, var god vänta"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr "Aktuell avsökning"
+msgstr "Aktuell skanning"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 9336f07bfe..63a3832a8a 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:18+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Storlek"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Ändrad"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Radera alla"
 
 #: templates/get.php:5 templates/list.php:16 templates/list.php:17
 msgid "Delete"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index eda07bdbe0..b4e0a3e865 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
 #   <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 07:56+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:40+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +19,43 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Hjälp"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Inställningar"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Användare"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
-msgstr "Nedladdning av ZIP är avstängd."
+msgstr "Nerladdning av ZIP är avstängd."
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer är för stora för att skapa zip-fil."
 
diff --git a/l10n/sv/media.po b/l10n/sv/media.po
index b5dc072040..f6f24a1626 100644
--- a/l10n/sv/media.po
+++ b/l10n/sv/media.po
@@ -3,28 +3,30 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012.
 #   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:29+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Lägg till album till spellistan"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index b4b73aa87c..8d10b24232 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 09:45+0000\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"PO-Revision-Date: 2012-08-21 08:38+0000\n"
 "Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Fel"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr "Avaktivera"
+msgstr "Deaktivera"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
@@ -134,11 +134,11 @@ msgstr "Ställ en fråga"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr "Problem med att ansluta till hjälp-databasen."
+msgstr "Problem med att ansluta till hjälpdatabasen."
 
 #: templates/help.php:23
 msgid "Go there manually."
-msgstr "Gå dit manuellt"
+msgstr "Gå dit manuellt."
 
 #: templates/help.php:31
 msgid "Answer"
@@ -162,7 +162,7 @@ msgstr "Ladda ner"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr "Ditt lösenord ändrades"
+msgstr "Ditt lösenord har ändrats"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -202,7 +202,7 @@ msgstr "Språk"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Hjälp att översätta"
+msgstr "Hjälp med att översätta"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -242,4 +242,4 @@ msgstr "Kvot"
 
 #: templates/users.php:146
 msgid "Delete"
-msgstr "Ta bort"
+msgstr "Radera"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 415967f994..946b15d6e0 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 74cfc023d9..71015c4e7d 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 38abd57c75..9e177dd19c 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 4d8be8b1dd..250f185f06 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 6e10c69fb3..739ad269aa 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -238,9 +238,9 @@ msgstr ""
 #: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
 #: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
 #: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
+#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
+#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
@@ -272,21 +272,21 @@ msgid ""
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1239
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1418
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1489
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -335,100 +335,100 @@ msgstr ""
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:131 lib/app.php:136 lib/app.php:150
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:137
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:139
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:140
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:140
+#: lib/app.php:141
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:141
+#: lib/app.php:142
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:142
+#: lib/app.php:143
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:144
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:149
+#: lib/app.php:151
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
+#: lib/app.php:188 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:189
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:190
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:191
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:192
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:193
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:194
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:195
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:196
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:197
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:196
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:197
+#: lib/app.php:199
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:200
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:201
 msgid "Questions"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 83294c8a64..a4d67b8590 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ac25f5a5b7..6a03df0a3f 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 70ad92afa3..ec59f140aa 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 68e42f4c2d..261ebbe47d 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index bccd741827..10f198d116 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 08a0923d5b..972b1a9cc0 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 5de7c45c4c..dcedc2ed72 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index c94ee8911f..4a98ab4510 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index e85bfeb2f9..17de59f15b 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 0163e822fd..b692d0455d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 5711ab0f4f..0cbcb4d192 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b03173f6d1..046a557866 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 98f17c57cd..dad3a74848 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index abacde3d73..ee88b70960 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
+"POT-Creation-Date: 2012-08-22 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index cec9945b1b..fad1641725 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -12,14 +12,14 @@
 "Application is not enabled" => "Aplikacija ni omogočena",
 "Authentication error" => "Napaka overitve",
 "Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
-"seconds ago" => "sekundami",
+"seconds ago" => "sekund nazaj",
 "1 minute ago" => "pred minuto",
 "%d minutes ago" => "pred %d minutami",
 "today" => "danes",
 "yesterday" => "včeraj",
 "%d days ago" => "pred %d dnevi",
 "last month" => "prejšnji mesec",
-"months ago" => "meseci",
+"months ago" => "mesecev nazaj",
 "last year" => "lani",
-"years ago" => "leti"
+"years ago" => "let nazaj"
 );
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 4d9a63c34b..cff3a63c44 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -5,7 +5,7 @@
 "Users" => "Användare",
 "Apps" => "Program",
 "Admin" => "Admin",
-"ZIP download is turned off." => "Nedladdning av ZIP är avstängd.",
+"ZIP download is turned off." => "Nerladdning av ZIP är avstängd.",
 "Files need to be downloaded one by one." => "Filer laddas ner en åt gången.",
 "Back to Files" => "Tillbaka till Filer",
 "Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 886148d8ef..b7249d72da 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -7,7 +7,7 @@
 "Authentication error" => "Autentiseringsfel",
 "Language changed" => "Språk ändrades",
 "Error" => "Fel",
-"Disable" => "Avaktivera",
+"Disable" => "Deaktivera",
 "Enable" => "Aktivera",
 "Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
@@ -26,14 +26,14 @@
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
-"Problems connecting to help database." => "Problem med att ansluta till hjälp-databasen.",
-"Go there manually." => "Gå dit manuellt",
+"Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
+"Go there manually." => "Gå dit manuellt.",
 "Answer" => "Svar",
 "You use" => "Du använder",
 "of the available" => "av tillgängliga",
 "Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
 "Download" => "Ladda ner",
-"Your password got changed" => "Ditt lösenord ändrades",
+"Your password got changed" => "Ditt lösenord har ändrats",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
 "New password" => "Nytt lösenord",
@@ -43,7 +43,7 @@
 "Your email address" => "Din e-postadress",
 "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
 "Language" => "Språk",
-"Help translate" => "Hjälp att översätta",
+"Help translate" => "Hjälp med att översätta",
 "use this address to connect to your ownCloud in your file manager" => "använd denna adress för att ansluta ownCloud till din filhanterare",
 "Name" => "Namn",
 "Password" => "Lösenord",
@@ -53,5 +53,5 @@
 "Other" => "Annat",
 "Group Admin" => "Gruppadministratör",
 "Quota" => "Kvot",
-"Delete" => "Ta bort"
+"Delete" => "Radera"
 );

From 5c1dd82998bff610d819550d5fd86b05248ebff2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Aug 2012 06:02:20 +0200
Subject: [PATCH 1503/1537] Minor layout change.

---
 apps/contacts/js/contacts.js             | 19 +++---
 apps/contacts/templates/part.contact.php | 84 +++++++++++-------------
 2 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 38f81213c0..f270cee421 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -803,7 +803,7 @@ OC.Contacts={
 					OC.Contacts.Card.addPhone();
 					break;
 				case 'ADR':
-					if($('#addressdisplay>dl').length == 1) {
+					if($('addresses>dl').length == 1) {
 						$('#addresses').show();
 					}
 					OC.Contacts.Card.editAddress('new', true);
@@ -949,10 +949,10 @@ OC.Contacts={
 		},
 		loadAddresses:function() {
 			$('#addresses').hide();
-			$('#addressdisplay dl.propertycontainer').remove();
-			var addresscontainer = $('#addressdisplay');
+			$('#addresses dl.propertycontainer').remove();
+			var addresscontainer = $('#addresses');
 			for(var adr in this.data.ADR) {
-				addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+				addresscontainer.find('dl').first().clone().insertAfter($('#addresses dl').last()).show();
 				addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
 				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
 				var adrarray = this.data.ADR[adr]['value'];
@@ -991,7 +991,6 @@ OC.Contacts={
 			}
 			if(addresscontainer.find('dl').length > 1) {
 				$('#addresses').show();
-				$('#contact_communication').show();
 			}
 			return false;
 		},
@@ -1000,8 +999,8 @@ OC.Contacts={
 			var params = {id: this.id};
 			if(obj === 'new') {
 				isnew = true;
-				$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show();
-				container = $('#addressdisplay dl').last();
+				$('#addresses dl').first().clone(true).insertAfter($('#addresses dl').last()).show();
+				container = $('#addresses dl').last();
 				container.removeClass('template').addClass('propertycontainer');
 			} else {
 				params['checksum'] = OC.Contacts.checksumFor(obj);
@@ -1018,7 +1017,7 @@ OC.Contacts={
 							buttons: {
 								'Ok':function() {
 									if(isnew) {
-										OC.Contacts.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
+										OC.Contacts.Card.saveAddress(this, $('#addresses dl:last-child').find('input').first(), isnew);
 									} else {
 										OC.Contacts.Card.saveAddress(this, obj, isnew);
 									}
@@ -1122,7 +1121,7 @@ OC.Contacts={
 		},
 		saveAddress:function(dlg, obj, isnew){
 			if(isnew) {
-				container = $('#addressdisplay dl').last();
+				container = $('#addresses dl').last();
 				obj = container.find('input').first();
 			} else {
 				checksum = OC.Contacts.checksumFor(obj);
@@ -1341,7 +1340,6 @@ OC.Contacts={
 			}
 			if($('#emaillist li').length > 1) {
 				$('#emails').show();
-				$('#contact_communication').show();
 			}
 			$('#emaillist li:last-child').find('input[type="text"]').focus();
 			return false;
@@ -1404,7 +1402,6 @@ OC.Contacts={
 			}
 			if(phonelist.find('li').length > 1) {
 				$('#phones').show();
-				$('#contact_communication').show();
 			}
 			return false;
 		},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index e74eef7d7e..491b4400ff 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -24,8 +24,9 @@ $id = isset($_['id']) ? $_['id'] : '';
 	</div>
 	</div> <!-- contact_photo -->
 
-	<div id="contact_identity">
 	<form method="post">
+
+	<div id="contact_identity">
 	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
 	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
 	<fieldset id="ident" class="contactpart">
@@ -49,61 +50,52 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a><a role="button" class="action edit" title="<?php echo $l->t('Edit groups'); ?>"></a></dd>
 	</dl>
 	</fieldset>
-	</form>
 	</div> <!-- contact_identity -->
 
-	<!-- div class="delimiter"></div -->
-	<div id="contact_communication" class="contactsection">
-	<form method="post">
-		<!-- email addresses -->
-		<div id="emails">
-			<ul id="emaillist" class="propertylist">
-			<li class="template hidden" data-element="EMAIL">
-				<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
-				<input type="email" required="required" class="nonempty contacts_property" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" />
-				<select multiple="multiple" name="parameters[TYPE][]">
-					<?php echo OCP\html_select_options($_['email_types'], array()) ?>
-				</select>
-				<span class="listactions"><a class="action mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
-				<a role="button" class="action delete" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
-			</ul>
-		</div> <!-- email addresses-->
+	<!-- email addresses -->
+	<div id="emails" class="hidden contactsection">
+		<ul id="emaillist" class="propertylist">
+		<li class="template hidden" data-element="EMAIL">
+			<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+			<input type="email" required="required" class="nonempty contacts_property" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" />
+			<select multiple="multiple" name="parameters[TYPE][]">
+				<?php echo OCP\html_select_options($_['email_types'], array()) ?>
+			</select>
+			<span class="listactions"><a class="action mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+			<a role="button" class="action delete" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+		</ul>
+	</div> <!-- email addresses-->
 
-		<!-- Phone numbers -->
-		<div id="phones">
-			<ul id="phonelist" class="propertylist">
-				<li class="template hidden" data-element="TEL">
-				<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
-				<input type="text" required="required" class="nonempty contacts_property" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
-				<select multiple="multiple" name="parameters[TYPE][]">
-					<?php echo OCP\html_select_options($_['phone_types'], array()) ?>
-				</select>
-				<a role="button" class="action delete" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
-			</ul>
-		</div> <!-- Phone numbers -->
+	<!-- Phone numbers -->
+	<div id="phones" class="hidden contactsection">
+		<ul id="phonelist" class="propertylist">
+			<li class="template hidden" data-element="TEL">
+			<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+			<input type="text" required="required" class="nonempty contacts_property" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+			<select multiple="multiple" name="parameters[TYPE][]">
+				<?php echo OCP\html_select_options($_['phone_types'], array()) ?>
+			</select>
+			<a role="button" class="action delete" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+		</ul>
+	</div> <!-- Phone numbers -->
 
-		<!-- Addresses -->
-		<div id="addresses" class="hidden">
-		<div id="addressdisplay">
-			<dl class="addresscard template hidden" data-element="ADR"><dt>
-			<input class="adr contacts_property" name="value" type="hidden" value="" />
-			<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
-			<span class="adr_type_label"></span><a class="action globe" title="<?php echo $l->t('View on map'); ?>"></a><a class="action edit" title="<?php echo $l->t('Edit address details'); ?>"></a><a role="button" class="action delete" title="Delete address"></a>
-			</dt><dd><ul class="addresslist"></ul></dd></dl>
+	<!-- Addresses -->
+	<div id="addresses" class="hidden contactsection">
+		<dl class="addresscard template hidden" data-element="ADR"><dt>
+		<input class="adr contacts_property" name="value" type="hidden" value="" />
+		<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
+		<span class="adr_type_label"></span><a class="action globe" title="<?php echo $l->t('View on map'); ?>"></a><a class="action edit" title="<?php echo $l->t('Edit address details'); ?>"></a><a role="button" class="action delete" title="Delete address"></a>
+		</dt><dd><ul class="addresslist"></ul></dd></dl>
+	</div> <!-- Addresses -->
 
-		</div> <!-- addressdisplay -->
-		</div> <!-- Addresses -->
-	</form>
-	</div> <!-- contact_communication -->
-
-	<div id="contact_note" class="contactsection">
-	<form class="float" method="post">
+	<div id="contact_note" class="hidden contactsection">
 		<div id="note" class="propertycontainer" data-element="NOTE">
 			<textarea class="contacts_property" name="value" required="required" placeholder="<?php echo $l->t('Add notes here.'); ?>" cols="60" wrap="hard"></textarea>
 		</div>
-	</form>
 	</div> <!-- contact_note -->
 
+	</form>
+
 	<div id="actionbar">
 		<div id="contacts_propertymenu">
 		<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>

From 78b7e28ce064524564c221f6920d2724e49478fb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Aug 2012 06:22:33 +0200
Subject: [PATCH 1504/1537] Removed unused variable.

---
 apps/contacts/index.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index c35e1b85d4..5cd58c5c43 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -14,12 +14,12 @@ OCP\App::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 
-	? true 
+$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0
+	? true
 	: false); // just to check if there are any contacts.
 if($has_contacts === false) {
-	OCP\Util::writeLog('contacts', 
-		'index.html: No contacts found.', 
+	OCP\Util::writeLog('contacts',
+		'index.html: No contacts found.',
 		OCP\Util::DEBUG);
 }
 
@@ -28,7 +28,6 @@ OCP\App::setActiveNavigationEntry('contacts_index');
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-$property_types = OC_Contacts_App::getAddPropertyOptions();
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
 $categories = OC_Contacts_App::getCategories();
@@ -57,9 +56,8 @@ OCP\Util::addStyle('contacts', 'contacts');
 
 $tmpl = new OCP\Template( "contacts", "index", "user" );
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize, false);
-$tmpl->assign('uploadMaxHumanFilesize', 
+$tmpl->assign('uploadMaxHumanFilesize',
 	OCP\Util::humanFileSize($maxUploadFilesize), false);
-$tmpl->assign('property_types', $property_types, false);
 $tmpl->assign('phone_types', $phone_types, false);
 $tmpl->assign('email_types', $email_types, false);
 $tmpl->assign('categories', $categories, false);

From ac9fd79329ac695fdeba0f102647edb1320f3ea5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 22 Aug 2012 12:40:07 +0200
Subject: [PATCH 1505/1537] Email type list wasn't initialized.

---
 apps/contacts/js/contacts.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index f270cee421..033c62b136 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1290,12 +1290,18 @@ OC.Contacts={
 			OC.Contacts.Contacts.refreshThumbnail(this.id);
 		},
 		addMail:function() {
-			//alert('addMail');
+			console.log('addMail');
 			var emaillist = $('#emaillist');
 			emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
 			emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
 			emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
 			emaillist.find('li:last-child').find('input[type="email"]').focus();
+			emaillist.find('li:last-child').find('select').multiselect({
+												noneSelectedText: t('contacts', 'Select type'),
+													header: false,
+													selectedList: 4,
+													classes: 'typelist'
+												});
 			return false;
 		},
 		loadMails:function() {

From 2b8a2e16eddcd04bd47e2bc93ac691deee5ee762 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Aug 2012 10:29:15 +0200
Subject: [PATCH 1506/1537] LDAP: don't pass -1 as length to array slice, when
 no limit is given. It cuts off the last item.

---
 apps/user_ldap/group_ldap.php | 9 +++++++++
 apps/user_ldap/user_ldap.php  | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 709144539e..b29ebe30c5 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -143,6 +143,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			if(!empty($this->groupSearch)) {
 				$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
 			}
+			if($limit = -1) {
+				$limit = null;
+			}
 			return array_slice($groupUsers, $offset, $limit);
 		}
 
@@ -184,6 +187,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!empty($this->groupSearch)) {
 			$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
 		}
+		if($limit = -1) {
+			$limit = null;
+		}
 		return array_slice($groupUsers, $offset, $limit);
 
 	}
@@ -210,6 +216,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!empty($this->groupSearch)) {
 			$ldap_groups = array_filter($ldap_groups, array($this, 'groupMatchesFilter'));
 		}
+		if($limit = -1) {
+			$limit = null;
+		}
 		return array_slice($ldap_groups, $offset, $limit);
 	}
 
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 31b6dccbf6..a97df7b4fd 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -111,6 +111,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 		if(!empty($this->userSearch)) {
 			$ldap_users = array_filter($ldap_users, array($this, 'userMatchesFilter'));
 		}
+		if($limit = -1) {
+			$limit = null;
+		}
 		return array_slice($ldap_users, $offset, $limit);
 	}
 

From c48732987e39518cacddd568180afa410f08cafe Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Aug 2012 10:31:58 +0200
Subject: [PATCH 1507/1537] LDAP: permanantly watch group members. Emit
 post_addToGroup resp. post_removeFromGroup on membership changes, so that
 Sharing App can take care of files shared within the groups. Requires and
 relies on background jobs.

---
 apps/user_ldap/appinfo/app.php      |   2 +
 apps/user_ldap/appinfo/database.xml |  33 ++++++
 apps/user_ldap/appinfo/version      |   2 +-
 apps/user_ldap/lib/jobs.php         | 156 ++++++++++++++++++++++++++++
 4 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 apps/user_ldap/lib/jobs.php

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 3c6da47d71..0eec7829a4 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -40,3 +40,5 @@ $entry = array(
 	'href' => OCP\Util::linkTo( 'user_ldap', 'settings.php' ),
 	'name' => 'LDAP'
 );
+
+OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
diff --git a/apps/user_ldap/appinfo/database.xml b/apps/user_ldap/appinfo/database.xml
index b228fa2796..3bbd2b09a4 100644
--- a/apps/user_ldap/appinfo/database.xml
+++ b/apps/user_ldap/appinfo/database.xml
@@ -92,4 +92,37 @@
 
  </table>
 
+
+ <table>
+
+  <name>*dbprefix*ldap_group_members</name>
+
+  <declaration>
+
+   <field>
+    <name>owncloudname</name>
+    <type>text</type>
+    <notnull>true</notnull>
+    <length>255</length>
+    <default></default>
+   </field>
+
+   <field>
+    <name>owncloudusers</name>
+    <type>clob</type>
+    <notnull>true</notnull>
+   </field>
+
+   <index>
+    <name>ldap_group_members</name>
+    <unique>true</unique>
+    <field>
+     <name>owncloudname</name>
+    </field>
+   </index>
+
+  </declaration>
+
+ </table>
+
 </database>
\ No newline at end of file
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 5f021e960e..1683a26615 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.2.0.5
\ No newline at end of file
+0.2.0.8
\ No newline at end of file
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
new file mode 100644
index 0000000000..76a8e3cbb2
--- /dev/null
+++ b/apps/user_ldap/lib/jobs.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * ownCloud – LDAP Background Jobs
+ *
+ * @author Arthur Schiwon
+ * @copyright 2012 Arthur Schiwon blizzz@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/>.
+ *
+ */
+
+namespace OCA\user_ldap\lib;
+
+class Jobs {
+
+	//refresh groups every hour
+	static private $refreshInterval = 36;//00;
+
+	static private $groupsFromDB;
+
+	static private $groupBE;
+	static private $connector;
+
+	static public function updateGroups() {
+		\OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', \OCP\Util::DEBUG);
+		$lastUpdate = \OCP\Config::getAppValue('user_ldap', 'bgjUpdateGroupsLastRun', 0);
+		if((time() - $lastUpdate) < self::$refreshInterval) {
+			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – last run too fresh, aborting.', \OCP\Util::DEBUG);
+			//komm runter Werner die Maurer geben ein aus
+			return;
+		}
+
+		$knownGroups = array_keys(self::getKnownGroups());
+		$actualGroups = self::getGroupBE()->getGroups();
+
+		if(empty($actualGroups) && empty($knownGroups)) {
+			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', \OCP\Util::INFO);
+			\OCP\setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
+			return;
+		}
+
+		self::handleKnownGroups(array_intersect($actualGroups, $knownGroups));
+		self::handleCreatedGroups(array_diff($actualGroups, $knownGroups));
+		self::handleRemovedGroups(array_diff($knownGroups, $actualGroups));
+
+		\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
+
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
+	}
+
+	static private function handleKnownGroups($groups) {
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG);
+		$query = \OCP\DB::prepare('
+			UPDATE *PREFIX*ldap_group_members
+			SET owncloudusers = ?
+			WHERE owncloudname = ?
+		');
+		foreach($groups as $group) {
+			//we assume, that self::$groupsFromDB has been retrieved already
+		    $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
+		    $actualUsers = self::getGroupBE()->usersInGroup($group);
+		    $hasChanged = false;
+		    foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
+		        \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
+		        \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".', \OCP\Util::INFO);
+		        $hasChanged = true;
+		    }
+		    foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
+		        \OCP\Util::emitHook('OC_User', 'post_addFromGroup', array('uid' => $addedUser, 'gid' => $group));
+		        \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".', \OCP\Util::INFO);
+		        $hasChanged = true;
+		    }
+		    if($hasChanged) {
+				$query->execute(array(serialize($actualUsers), $group));
+		    }
+		}
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with known Groups.', \OCP\Util::DEBUG);
+	}
+
+	static private function handleCreatedGroups($createdGroups) {
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', \OCP\Util::DEBUG);
+		$query = \OCP\DB::prepare('
+			INSERT
+			INTO *PREFIX*ldap_group_members (owncloudname, owncloudusers)
+			VALUES (?, ?)
+		');
+		foreach($createdGroups as $createdGroup) {
+			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – new group "'.$createdGroup.'" found.', \OCP\Util::INFO);
+			$users = serialize(self::getGroupBE()->usersInGroup($createdGroup));
+		    $query->execute(array($createdGroup, $users));
+		}
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with created Groups.', \OCP\Util::DEBUG);
+	}
+
+	static private function handleRemovedGroups($removedGroups) {
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', \OCP\Util::DEBUG);
+		$query = \OCP\DB::prepare('
+			DELETE
+			FROM *PREFIX*ldap_group_members
+			WHERE owncloudname = ?
+		');
+		foreach($removedGroups as $removedGroup) {
+			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$createdGroup.'" was removed.', \OCP\Util::INFO);
+		    $query->execute(array($removedGroup));
+		}
+		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with removed groups.', \OCP\Util::DEBUG);
+	}
+
+	static private function getConnector() {
+		if(!is_null(self::$connector)) {
+			return self::$connector;
+		}
+		self::$connector = new \OCA\user_ldap\lib\Connection('user_ldap');
+		return self::$connector;
+	}
+
+	static private function getGroupBE() {
+		if(!is_null(self::$groupBE)) {
+			return self::$groupBE;
+		}
+		self::getConnector();
+		self::$groupBE = new \OCA\user_ldap\GROUP_LDAP();
+		self::$groupBE->setConnector(self::$connector);
+
+		return self::$groupBE;
+	}
+
+	static private function getKnownGroups() {
+		if(is_array(self::$groupsFromDB)) {
+			return self::$groupsFromDB;
+		}
+		$query = \OCP\DB::prepare('
+			SELECT owncloudname, owncloudusers
+			FROM *PREFIX*ldap_group_members
+		');
+		$result = $query->execute()->fetchAll();
+		self::$groupsFromDB = array();
+		foreach($result as $dataset) {
+		    self::$groupsFromDB[$dataset['owncloudname']] = $dataset;
+		}
+
+		return self::$groupsFromDB;
+	}
+}
\ No newline at end of file

From 056d9adb238ee4619bd44ca6db54f6010463858c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Aug 2012 10:51:29 +0200
Subject: [PATCH 1508/1537] LDAP: bg jobs: sane default refresh interval

---
 apps/user_ldap/lib/jobs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 76a8e3cbb2..ff28d86cfe 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -26,7 +26,7 @@ namespace OCA\user_ldap\lib;
 class Jobs {
 
 	//refresh groups every hour
-	static private $refreshInterval = 36;//00;
+	static private $refreshInterval = 3600;
 
 	static private $groupsFromDB;
 

From 63c454c7b26b36060a170ef74f19b2fd65310879 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Aug 2012 12:04:32 +0200
Subject: [PATCH 1509/1537] LDAP: make refreshInterval for background jobs
 configurable in the DB

---
 apps/user_ldap/lib/jobs.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index ff28d86cfe..d478731b84 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -24,10 +24,6 @@
 namespace OCA\user_ldap\lib;
 
 class Jobs {
-
-	//refresh groups every hour
-	static private $refreshInterval = 3600;
-
 	static private $groupsFromDB;
 
 	static private $groupBE;
@@ -36,7 +32,7 @@ class Jobs {
 	static public function updateGroups() {
 		\OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', \OCP\Util::DEBUG);
 		$lastUpdate = \OCP\Config::getAppValue('user_ldap', 'bgjUpdateGroupsLastRun', 0);
-		if((time() - $lastUpdate) < self::$refreshInterval) {
+		if((time() - $lastUpdate) < self::getRefreshInterval()) {
 			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – last run too fresh, aborting.', \OCP\Util::DEBUG);
 			//komm runter Werner die Maurer geben ein aus
 			return;
@@ -60,6 +56,11 @@ class Jobs {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
 	}
 
+	static private function getRefreshInterval() {
+		//defaults to every hour
+		return \OCP\Config::getAppValue('user_ldap', 'bgjRefreshInterval', 3600);
+	}
+
 	static private function handleKnownGroups($groups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('

From 536fbb918919b3eb4c8d58b1d4e540c772353b07 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Aug 2012 15:22:52 +0200
Subject: [PATCH 1510/1537] LDAP: fix potentially unavailable LDAP resource,
 which can prevent successful login

---
 apps/user_ldap/lib/connection.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 503245a339..9bb012e910 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -91,6 +91,9 @@ class Connection {
 	public function getConnectionResource() {
 		if(!$this->ldapConnectionRes) {
 			$this->init();
+		} else if(!is_resource($this->ldapConnectionRes)) {
+			$this->ldapConnectionRes = null;
+			$this->establishConnection();
 		}
 		if(is_null($this->ldapConnectionRes)) {
 			\OCP\Util::writeLog('user_ldap', 'Connection could not be established', \OCP\Util::ERROR);

From 9699ff03bd1a200fc7f73bb29173169d84009e5d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 Aug 2012 11:35:30 -0400
Subject: [PATCH 1511/1537] Revert using item name, no longer allowing the same
 item source exist for a user

---
 core/ajax/share.php         | 10 ++---
 core/js/share.js            | 45 ++++++++++++--------
 lib/public/share.php        | 65 ++++++++++++++++++-----------
 tests/lib/share/backend.php |  8 ++--
 tests/lib/share/share.php   | 82 ++++++++++++++++++-------------------
 5 files changed, 118 insertions(+), 92 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 9376f18e8a..04294a36ac 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -24,9 +24,9 @@ OC_JSON::checkLoggedIn();
 if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) {
 	switch ($_POST['action']) {
 		case 'share':
-			if (isset($_POST['itemName']) && isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
+			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					OCP\Share::shareItem($_POST['itemType'], $_POST['itemName'], $_POST['itemSource'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+					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) {
@@ -56,9 +56,9 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			}
 			break;
 		case 'getItem':
-			if (isset($_GET['itemType']) && isset($_GET['itemName']) && isset($_GET['itemSource'])) {
-				$reshare = OCP\Share::getItemSharedWith($_GET['itemType'], $_GET['itemName'], OCP\Share::FORMAT_NONE, null, true);
-				if ($_GET['itemSource'] !== false) {
+			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;
diff --git a/core/js/share.js b/core/js/share.js
index 418d18f86b..c1d66ee921 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -30,12 +30,14 @@ OC.Share={
 			}
 		});
 	},
-	loadItem:function(itemType, itemName, itemSource) {
+	loadItem:function(itemType, itemSource) {
 		var data = '';
-		if (typeof OC.Share.statuses[itemName] === 'undefined') {
-			itemSource = false;
+		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, itemName: itemName, itemSource: itemSource }, async: false, success: function(result) {
+		$.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 {
@@ -44,8 +46,8 @@ OC.Share={
 		}});
 		return data;
 	},
-	share:function(itemType, itemName, itemSource, shareType, shareWith, permissions, callback) {
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, itemName: itemName, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+	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);
@@ -73,9 +75,9 @@ OC.Share={
 			}
 		});
 	},
-	showDropDown:function(itemType, itemName, itemSource, appendTo, privateLink, possiblePermissions) {
-		var data = OC.Share.loadItem(itemType, itemName, itemSource);
-		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-name="'+itemName+'" data-item-source="'+itemSource+'">';
+	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;
@@ -136,7 +138,7 @@ OC.Share={
 			$(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-name'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
+			OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
 				OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
 				$('#shareWith').val('');
 			});
@@ -251,9 +253,8 @@ $(document).ready(function() {
 
 	$('a.share').live('click', function(event) {
 		event.stopPropagation();
-		if ($(this).data('item-type') !== undefined && $(this).data('item-name') !== undefined  && $(this).data('item-source') !== undefined) {
+		if ($(this).data('item-type') !== undefined && $(this).data('item-source') !== undefined) {
 			var itemType = $(this).data('item-type');
-			var itemName = $(this).data('item-name');
 			var itemSource = $(this).data('item-source');
 			var appendTo = $(this).parent().parent();
 			var privateLink = false;
@@ -264,13 +265,13 @@ $(document).ready(function() {
 			if (OC.Share.droppedDown) {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
-						OC.Share.showDropDown(itemType, itemName, itemSource, appendTo, privateLink, possiblePermissions);
+						OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
-				OC.Share.showDropDown(itemType, itemName, itemSource, appendTo, privateLink, possiblePermissions);
+				OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
 			}
 		}
 	});
@@ -280,7 +281,11 @@ $(document).ready(function() {
 		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
-			var item = $('#dir').val() + filename;
+			if ($('#dir').val() == '/') {
+				var item = $('#dir').val() + filename;
+			} else {
+				var item = $('#dir').val() + '/' + filename;
+			}
 			// Check if status is in cache
 			if (OC.Share.statuses[item] === true) {
 				return OC.imagePath('core', 'actions/public');
@@ -302,7 +307,11 @@ $(document).ready(function() {
 				return OC.imagePath('core', 'actions/share');
 			}
 		}, function(filename) {
-			var item = $('#dir').val() + filename;
+			if ($('#dir').val() == '/') {
+				var item = $('#dir').val() + filename;
+			} else {
+				var item = $('#dir').val() + '/' + filename;
+			}
 			if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
 				var itemType = 'folder';
 				var possiblePermissions = OC.Share.PERMISSION_CREATE | OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
@@ -316,14 +325,14 @@ $(document).ready(function() {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
 						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
-						OC.Share.showDropDown(itemType, '/'+filename, item, appendTo, true, possiblePermissions);
+						OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
 				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, '/'+filename, item, appendTo, true, possiblePermissions);
+				OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
 			}
 		});
 	}
diff --git a/lib/public/share.php b/lib/public/share.php
index 6d4749b1ac..b4ff205a70 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -139,7 +139,7 @@ class Share {
 	* @param int CRUDS permissions
 	* @return bool Returns true on success or false on failure
 	*/
-	public static function shareItem($itemType, $itemName, $itemSource, $shareType, $shareWith, $permissions) {
+	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
 		// Verify share type and sharing conditions are met
 		if ($shareType === self::SHARE_TYPE_USER) {
@@ -152,10 +152,18 @@ class Share {
 				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' does not exist';
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
-			} else {
-				$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
-				if (empty($inGroup)) {
-					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
+			}
+			$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
+			if (empty($inGroup)) {
+				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			// Check if the item source is already shared with the user, either from the same owner or a different user
+			if ($checkExists = self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, $shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
+				// Only allow the same share to occur again if it is the same owner and is not a user share, this use case is for increasing permissions for a specific user
+				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
+					$message = 'Sharing '.$itemSource.' failed, because this item is already shared with '.$shareWith;
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 					throw new \Exception($message);
 				}
@@ -165,11 +173,27 @@ class Share {
 				$message = 'Sharing '.$itemSource.' failed, because the group '.$shareWith.' does not exist';
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
-			} else if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
+			}
+			if (!\OC_Group::inGroup($uidOwner, $shareWith)) {
 				$message = 'Sharing '.$itemSource.' failed, because '.$uidOwner.' is not a member of the group '.$shareWith;
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
 			}
+			// Check if the item source is already shared with the group, either from the same owner or a different user
+			// The check for each user in the group is done inside the put() function
+			if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_GROUP, $shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
+				// Only allow the same share to occur again if it is the same owner and is not a group share, this use case is for increasing permissions for a specific user
+				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
+					$message = 'Sharing '.$itemSource.' failed, because this item is already shared with '.$shareWith;
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			}
+			// Convert share with into an array with the keys group and users
+			$group = $shareWith;
+			$shareWith = array();
+			$shareWith['group'] = $group;
+			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 		} else if ($shareType === self::SHARE_TYPE_PRIVATE_LINK) {
 				$shareWith = md5(uniqid($itemSource, true));
 				return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
@@ -192,26 +216,13 @@ class Share {
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
 			}
-			return self::shareItem($itemType, $itemName, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
+			return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
 		} else {
 			// Future share types need to include their own conditions
 			$message = 'Share type '.$shareType.' is not valid for '.$itemSource;
 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 			throw new \Exception($message);
 		}
-		// TODO This query has pretty bad performance if there are large collections, figure out a way to make the collection searching more efficient
-		if (self::getItems($itemType, $itemSource, $shareType, $shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true)) {
-			$message = 'Sharing '.$itemSource.' failed, because this item is already shared with '.$shareWith;
-			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-			throw new \Exception($message);
-		}
-		if ($shareType == self::SHARE_TYPE_GROUP) {
-			// Convert share with into an array with the keys group and users
-			$group = $shareWith;
-			$shareWith = array();
-			$shareWith['group'] = $group;
-			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
-		}
 		// If the item is a folder, scan through the folder looking for equivalent item types
 		if ($itemType == 'folder') {
 			$parentFolder = self::put('folder', $itemSource, $shareType, $shareWith, $uidOwner, $permissions, true);
@@ -223,7 +234,7 @@ class Share {
 						array_push($files, $children);
 					} else {
 						// Pass on to put() to check if this item should be converted, the item won't be inserted into the database unless it can be converted
-						self::put('file', $name, $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
+						self::put('file', $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
 					}
 				}
 				return true;
@@ -231,7 +242,7 @@ class Share {
 			return false;
 		} else {
 			// Put the item into the database
-			return self::put($itemType, $itemName, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
+			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
 		}
 	}
 
@@ -566,7 +577,11 @@ class Share {
 			}
 			// Remove root from file source paths if retrieving own shared items
 			if (isset($uidOwner) && isset($row['file_source'])) {
-				$row['file_source'] = substr($row['file_source'], $root);
+				if (isset($row['parent'])) {
+					$row['file_source'] = '/Shared/'.basename($row['file_source']);
+				} else {
+					$row['file_source'] = substr($row['file_source'], $root);
+				}
 			}
 			$items[$row['id']] = $row;
 		}
@@ -644,7 +659,7 @@ class Share {
 	* @param bool|array Parent folder target (optional)
 	* @return bool Returns true on success or false on failure
 	*/
-	private static function put($itemType, $itemName, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
+	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
 		// Check file extension for an equivalent item type to convert to
 		if ($itemType == 'file') {
 			$extension = strtolower(substr($itemSource, strrpos($itemSource, '.') + 1));
@@ -661,7 +676,7 @@ class Share {
 		}
 		$backend = self::getBackend($itemType);
 		// Check if this is a reshare
-		if ($checkReshare = self::getItemSharedWith($itemType, $itemName, self::FORMAT_NONE, null, true)) {
+		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
 			// Check if attempting to share back to owner
 			if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
 				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the original sharer';
diff --git a/tests/lib/share/backend.php b/tests/lib/share/backend.php
index 9fe625a1fa..4ee59963d5 100644
--- a/tests/lib/share/backend.php
+++ b/tests/lib/share/backend.php
@@ -25,16 +25,18 @@ class Test_Share_Backend implements OCP\Share_Backend {
 	const FORMAT_TARGET = 1;
 	const FORMAT_PERMISSIONS = 2;
 	
-	private $testItem = 'test.txt';
+	private $testItem1 = 'test.txt';
+	private $testItem2 = 'share.txt';
 
 	public function isValidSource($itemSource, $uidOwner) {
-		if ($itemSource == $this->testItem) {
+		if ($itemSource == $this->testItem1 || $itemSource == $this->testItem2) {
 			return true;
 		}
 	}
 
 	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		$target = $itemSource;
+		// Always make target be test.txt to cause conflicts
+		$target = 'test.txt';
 		if (isset($exclude)) {
 			$pos = strrpos($target, '.');
 			$name = substr($target, 0, $pos);
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 89f0fbc976..785591829d 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -63,13 +63,13 @@ class Test_Share extends UnitTestCase {
 
 	public function testShareInvalidShareType() {
 		$this->expectException(new Exception('Share type foobar is not valid for test.txt'));
-		OCP\Share::shareItem('test', 'test.txt', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
+		OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
 	}
 
 	public function testInvalidItemType() {
 		$message = 'Sharing backend for foobar not found';
 		try {
-			OCP\Share::shareItem('foobar', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -116,28 +116,28 @@ class Test_Share extends UnitTestCase {
 		// Invalid shares
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		$message = 'Sharing test.txt failed, because the user foobar does not exist';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
 		try {
-			OCP\Share::shareItem('test', 'foobar', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Valid share
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
@@ -146,7 +146,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->user2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -156,7 +156,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -167,11 +167,11 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		
 		// Attempt reshare without share permission
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because resharing is not allowed';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -185,14 +185,14 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Valid reshare
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		OC_User::setUserId($this->user3);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
@@ -228,7 +228,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
@@ -238,12 +238,12 @@ class Test_Share extends UnitTestCase {
 		
 		// Attempt target conflict
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
-		
+
 		// Remove user
 		OC_User::deleteUser($this->user1);
 		OC_User::setUserId($this->user2);
@@ -254,21 +254,21 @@ class Test_Share extends UnitTestCase {
 		// Invalid shares
 		$message = 'Sharing test.txt failed, because the group foobar does not exist';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		$message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Valid share
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
 		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
@@ -279,7 +279,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -289,25 +289,25 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Attempt to share back to group
-		$message = 'Sharing test.txt failed, because the item was orignally shared with the group '.$this->group1;
+		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
 		}
 		
 		// Attempt to share back to member of group
-		$message = 'Sharing test.txt failed, because the user '.$this->user3.' is a member of the original group share';
+		$message ='Sharing test.txt failed, because this item is already shared with '.$this->user3;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEqual($exception->getMessage(), $message);
@@ -318,8 +318,8 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		
 		// Valid share with same person - user then group
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
@@ -329,7 +329,7 @@ class Test_Share extends UnitTestCase {
 		
 		// Valid reshare
 		OC_User::setUserId($this->user2);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user4);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		
@@ -343,7 +343,7 @@ class Test_Share extends UnitTestCase {
 		
 		// Valid share with same person - group then user
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE));
@@ -356,21 +356,21 @@ class Test_Share extends UnitTestCase {
 		
 		// Attempt user specific target conflict
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		
-		// Valid reshare TODO Broken
-		$this->assertTrue(OCP\Share::shareItem('test', 'test1.txt', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
-		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
-		
-		// Remove user from group
-		OC_Group::removeFromGroup($this->user2, $this->group1);
-		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
-		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+// 		// Valid reshare TODO Broken
+// 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+// 		OC_User::setUserId($this->user4);
+// 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
+// 		
+// 		// Remove user from group
+// 		OC_Group::removeFromGroup($this->user2, $this->group1);
+// 		OC_User::setUserId($this->user2);
+// 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+// 		OC_User::setUserId($this->user4);
+// 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
 		
 		// Add user to group
 		

From 25d474579acd4ead174a83b22f1a3d712e6b682a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 Aug 2012 11:45:36 -0400
Subject: [PATCH 1512/1537] Removing most of files_sharing, the Share API
 implemented the majority of it

---
 apps/files_sharing/ajax/email.php             |  18 -
 apps/files_sharing/ajax/getitem.php           |  71 ---
 apps/files_sharing/ajax/getstatuses.php       |  22 -
 apps/files_sharing/ajax/setpermissions.php    |  12 -
 apps/files_sharing/ajax/share.php             |  37 --
 apps/files_sharing/ajax/toggleresharing.php   |   9 -
 apps/files_sharing/ajax/unshare.php           |  11 -
 apps/files_sharing/ajax/userautocomplete.php  |  30 -
 apps/files_sharing/appinfo/app.php            |  22 +-
 apps/files_sharing/js/list.js                 |  54 --
 apps/files_sharing/js/settings.js             |   9 -
 apps/files_sharing/js/share.js                | 375 -------------
 .../files_sharing/{ => lib}/sharedstorage.php |   0
 apps/files_sharing/lib_share.php              | 518 ------------------
 apps/files_sharing/list.php                   |  35 --
 apps/files_sharing/settings.php               |   9 -
 apps/files_sharing/templates/list.php         |  30 -
 apps/files_sharing/templates/settings.php     |   6 -
 18 files changed, 1 insertion(+), 1267 deletions(-)
 delete mode 100644 apps/files_sharing/ajax/email.php
 delete mode 100644 apps/files_sharing/ajax/getitem.php
 delete mode 100644 apps/files_sharing/ajax/getstatuses.php
 delete mode 100644 apps/files_sharing/ajax/setpermissions.php
 delete mode 100644 apps/files_sharing/ajax/share.php
 delete mode 100644 apps/files_sharing/ajax/toggleresharing.php
 delete mode 100644 apps/files_sharing/ajax/unshare.php
 delete mode 100644 apps/files_sharing/ajax/userautocomplete.php
 delete mode 100644 apps/files_sharing/js/list.js
 delete mode 100644 apps/files_sharing/js/settings.js
 delete mode 100644 apps/files_sharing/js/share.js
 rename apps/files_sharing/{ => lib}/sharedstorage.php (100%)
 delete mode 100644 apps/files_sharing/lib_share.php
 delete mode 100644 apps/files_sharing/list.php
 delete mode 100644 apps/files_sharing/settings.php
 delete mode 100644 apps/files_sharing/templates/list.php
 delete mode 100644 apps/files_sharing/templates/settings.php

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
deleted file mode 100644
index aba4f699fa..0000000000
--- a/apps/files_sharing/ajax/email.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::callCheck();
-
-$user = OCP\USER::getUser();
-// TODO translations
-$type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
-$subject = $user.' shared a '.$type.' with you';
-$link = $_POST['link'];
-$text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
-$fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
-try {
-	OCP\Util::sendMail($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
-	OCP\JSON::success();
-} catch (Exception $exception) {
-	OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
-}
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
deleted file mode 100644
index 06a80102de..0000000000
--- a/apps/files_sharing/ajax/getitem.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
- 
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-
-$item = array();
-$userDirectory = '/'.OCP\USER::getUser().'/files';
-$source = $userDirectory.$_GET['item'];
-$path = $source;
-// Search for item and shared parent folders
-while ($path != $userDirectory) {
-	if ($rows = OC_Share::getMySharedItem($path)) {
-		for ($i = 0; $i < count($rows); $i++) {
-			$uid_shared_with = $rows[$i]['uid_shared_with'];
-			if ($uid_shared_with == OC_Share::PUBLICLINK && !isset($item['privateLink'])) {
-				$token = OC_Share::getTokenFromSource($path);
-				if ($path == $source) {
-					$item['privateLink'] = $token;
-				} else {
-					// If in parent folder, include a path parameter to get direct access to file
-					$item['privateLink'] = $token.'&path='.str_replace('%2F', '/', str_replace('+', '%20', urlencode(substr($source, strlen($path)))));;
-				}
-			} else {
-				// Check if uid_shared_with is a group
-				$pos = strrpos($uid_shared_with, '@');
-				if ($pos !== false) {
-					$gid = substr($uid_shared_with, $pos + 1);
-				} else {
-					$gid = false;
-				}
-				if ($gid && OC_Group::groupExists($gid)) {
-					// Include users in the group so the users can be removed from the list of people to share with
-					if ($path == $source) {
-						$group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => false));
-					} else {
-						$group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => basename($path)));
-					}
-					if (!isset($item['groups'])) {
-						$item['groups'] = $group;
-					} else if (is_array($item['groups'])) {
-						$gidExists = false;
-						$currentGroups = $item['groups'];
-						// Check if the group is already included
-						foreach ($currentGroups as $g) {
-							if ($g['gid'] == $gid) {
-								$gidExists = true;
-							}
-						}
-						if (!$gidExists) {
-							$item['groups'] = array_merge($item['groups'], $group);
-						}
-					}
-				} else {
-					if ($path == $source) {
-						$user = array(array('uid' => $uid_shared_with, 'permissions' => $rows[$i]['permissions'], 'parentFolder' => false));
-					} else {
-						$user = array(array('uid' => $uid_shared_with, 'permissions' => $rows[$i]['permissions'], 'parentFolder' => basename($path)));
-					}
-					if (!isset($item['users'])) {
-						$item['users'] = $user;
-					} else if (is_array($item['users'])) {
-						$item['users'] = array_merge($item['users'], $user);
-					}
-				}
-			}
-		}
-	}
-	$path = dirname($path);
-}
-
-OCP\JSON::success(array('data' => $item));
diff --git a/apps/files_sharing/ajax/getstatuses.php b/apps/files_sharing/ajax/getstatuses.php
deleted file mode 100644
index 1be4d9a0d9..0000000000
--- a/apps/files_sharing/ajax/getstatuses.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-
-$items = array();
-$userDirectory = '/'.OCP\USER::getUser().'/files';
-$dirLength = strlen($userDirectory);
-if ($rows = OC_Share::getMySharedItems()) {
-	for ($i = 0; $i < count($rows); $i++) {
-		$source = $rows[$i]['source'];
-		// Strip out user directory
-		$item = substr($source, $dirLength);
-		if ($rows[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-			$items[$item] = true;
-		} else if (!isset($items[$item])) {
-			$items[$item] = false;
-		}
-	}
-}
-
-OCP\JSON::success(array('data' => $items));
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
deleted file mode 100644
index 0a2cf78f76..0000000000
--- a/apps/files_sharing/ajax/setpermissions.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
-$uid_shared_with = $_POST['uid_shared_with'];
-$permissions = $_POST['permissions'];
-OC_Share::setPermissions($source, $uid_shared_with, $permissions);
-
-OCP\JSON::success();
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
deleted file mode 100644
index 3f224d1b67..0000000000
--- a/apps/files_sharing/ajax/share.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$userDirectory = '/'.OCP\USER::getUser().'/files';
-$sources = explode(';', $_POST['sources']);
-$uid_shared_with = $_POST['uid_shared_with'];
-$permissions = $_POST['permissions'];
-foreach ($sources as $source) {
-	$file = OC_FileCache::get($source);
-	$path = ltrim($source, '/'); 
-	$source = $userDirectory.$source;
-	// Check if the file exists or if the file is being reshared
-	if ($source && $file['encrypted'] == false && (OC_FILESYSTEM::file_exists($path) && OC_FILESYSTEM::is_readable($path) || OC_Share::getSource($source))) {
-		try {
-			$shared = new OC_Share($source, $uid_shared_with, $permissions);
-			// If this is a private link, return the token
-			if ($uid_shared_with == OC_Share::PUBLICLINK) {
-				OCP\JSON::success(array('data' => $shared->getToken()));
-			} else {
-				OCP\JSON::success();
-			}
-		} catch (Exception $exception) {
-			OCP\Util::writeLog('files_sharing', 'Unexpected Error : '.$exception->getMessage(), OCP\Util::ERROR);
-			OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
-		}
-	} else {
-		if ($file['encrypted'] == true) {
-			OCP\JSON::error(array('data' => array('message' => 'Encrypted files cannot be shared')));
-		} else {
-			OCP\Util::writeLog('files_sharing', 'File does not exist or is not readable :'.$source, OCP\Util::ERROR);
-			OCP\JSON::error(array('data' => array('message' => 'File does not exist or is not readable')));
-		}
-	}
-}
diff --git a/apps/files_sharing/ajax/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php
deleted file mode 100644
index 7da4fdfeea..0000000000
--- a/apps/files_sharing/ajax/toggleresharing.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkAdminUser();
-if ($_POST['resharing'] == true) {
-	OCP\Config::setAppValue('files_sharing', 'resharing', 'yes');
-} else {
-	OCP\Config::setAppValue('files_sharing', 'resharing', 'no');
-}
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
deleted file mode 100644
index 02a59c4016..0000000000
--- a/apps/files_sharing/ajax/unshare.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
-$uid_shared_with = $_POST['uid_shared_with'];
-OC_Share::unshare($source, $uid_shared_with);
-
-OCP\JSON::success();
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
deleted file mode 100644
index 388a4844b9..0000000000
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('files_sharing');
-
-$users = array();
-$groups = array();
-$self = OCP\USER::getUser();
-$userGroups = OC_Group::getUserGroups($self);
-$users[] = "<optgroup label='Users'>";
-$groups[] = "<optgroup label='Groups'>";
-foreach ($userGroups as $group) {
-	$groupUsers = OC_Group::usersInGroup($group);
-	$userCount = 0;
-	foreach ($groupUsers as $user) {
-		if ($user != $self) {
-			$users[] = "<option value='".$user."'>".$user."</option>";
-			$userCount++;
-		}
-	}
-	// Don't include the group if only the current user is a member of it
-	if ($userCount > 0) {
-		$groups[] = "<option value='".$group."(group)'>".$group." (group) </option>";
-	}
-}
-$users = array_unique($users);
-$users[] = "</optgroup>";
-$groups[] = "</optgroup>";
-$users = array_merge($users, $groups);
-OCP\JSON::encodedPrint($users);
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 7495a5bbe6..fcebacc19d 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,28 +1,8 @@
 <?php
 
-OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
 OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
 OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
-OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/sharedstorage.php";
-
-OCP\App::registerAdmin('files_sharing', 'settings');
-
+OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/lib/sharedstorage.php";
 OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC_Filestorage_Shared', 'setup');
-
-OCP\Util::connectHook("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
-OCP\Util::connectHook("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
-OCP\Util::connectHook("OC_Filesystem", "post_write", "OC_Share", "updateItem");
-
-OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Share', 'removeUser');
-OCP\Util::connectHook('OC_User', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
-OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
-
-$dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
-if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') {
-	OCP\Util::addScript('core', 'share');
-}
-OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
-OCP\Util::addStyle( 'files_sharing', 'sharing' );
-OCP\Util::addStyle("3rdparty", "chosen/chosen");
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
diff --git a/apps/files_sharing/js/list.js b/apps/files_sharing/js/list.js
deleted file mode 100644
index 41eabd1f4a..0000000000
--- a/apps/files_sharing/js/list.js
+++ /dev/null
@@ -1,54 +0,0 @@
-$(document).ready(function() {
-	$( "#source" ).autocomplete({
-		source: "../../files/ajax/autocomplete.php",
-		minLength: 1
-	});
-	$( "#uid_shared_with" ).autocomplete({
-		source: "ajax/userautocomplete.php",
-		minLength: 1
-	});
-	$("button.delete").live('click', function( event ) {
-		event.preventDefault();
-// 		var row=$(this);
-		var source=$(this).attr('data-source');
-		var uid_shared_with=$(this).attr('data-uid_shared_with');
-		var data='source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
-		$.ajax({
-			type: 'GET',
-			url: 'ajax/unshare.php',
-			cache: false,
-			data: data
-// 			success: function(){
-// 				row.remove();
-// 			}
-		});
-	});
-	$('#share_item').submit(function( event ){
-		event.preventDefault();
-		var source=$('#source').val();
-		var uid_shared_with=$('#uid_shared_with').val();
-		var permissions=$('#permissions').val()||0;
-		var data='source='+source+'&uid_shared_with='+uid_shared_with+'&permissions='+permissions;
-		$.ajax({
-			type: 'GET',
-			url: 'ajax/share.php',
-			cache: false,
-			data: data,
-// 			success: function(token){
-// 				if(token){
-// 					var html="<tr class='link' id='"+token+"'>";
-// 					html+="<td class='path'>"+path+"</td>";
-// 					var expire=($('#expire').val())?$('#expire').val():'Never'
-// 					html+="<td class='expire'>"+expire+"</td>"
-// 					html+="<td class='link'><a href='get.php?token="+token+"'>"+$('#baseUrl').val()+"?token="+token+"</a></td>"
-// 					html+="<td><button class='delete fancybutton' data-token='"+token+"'>Delete</button></td>"
-// 					html+="</tr>"
-// 					$(html).insertBefore($('#newlink_row'));
-// 					$('#expire').val('');
-// 					$('#expire_time').val('');
-// 					$('#path').val('');
-// 				}
-// 			}
-		});
-	});
-});
\ No newline at end of file
diff --git a/apps/files_sharing/js/settings.js b/apps/files_sharing/js/settings.js
deleted file mode 100644
index bb7d79fecb..0000000000
--- a/apps/files_sharing/js/settings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-$(document).ready(function() {
-	$('#allowResharing').bind('change', function() {
-		var checked = 1;
-		if (!this.checked) {
-			checked = 0;
-		}
-		$.post(OC.filePath('files_sharing','ajax','toggleresharing.php'), 'resharing='+checked);
-	});
-});
\ No newline at end of file
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
deleted file mode 100644
index 3cfa3583b1..0000000000
--- a/apps/files_sharing/js/share.js
+++ /dev/null
@@ -1,375 +0,0 @@
-OC.Share={
-	icons:[],
-	itemUsers:[],
-	itemGroups:[],
-	itemPrivateLink:false,
-	usersAndGroups:[],
-	loadIcons:function() {
-		// Cache all icons for shared files
-		$.getJSON(OC.filePath('files_sharing', 'ajax', 'getstatuses.php'), function(result) {
-			if (result && result.status === 'success') {
-				$.each(result.data, function(item, hasPrivateLink) {
-					if (hasPrivateLink) {
-						OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
-					} else {
-						OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-					}
-				});
-			}
-		});
-	},
-	loadItem:function(item) {
-		$.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'getitem.php'), data: { item: item }, async: false, success: function(result) {
-			if (result && result.status === 'success') {
-				var item = result.data;
-				OC.Share.itemUsers = item.users;
-				OC.Share.itemGroups = item.groups;
-				OC.Share.itemPrivateLink = item.privateLink;
-			}
-		}});
-	},
-	share:function(source, uid_shared_with, permissions, callback) {
-		$.post(OC.filePath('files_sharing', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, 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(source, uid_shared_with, callback) {
-		$.post(OC.filePath('files_sharing', 'ajax', 'unshare.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) {
-			if (result && result.status === 'success') {
-				if (callback) {
-					callback();
-				}
-			} else {
-				OC.dialogs.alert('Error', 'Error while unsharing');
-			}
-		});
-	},
-	changePermissions:function(source, uid_shared_with, permissions) {
-		$.post(OC.filePath('files_sharing','ajax','setpermissions.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
-			if (!result || result.status !== 'success') {
-				OC.dialogs.alert('Error', 'Error while changing permissions');
-			}
-		});
-	},
-	showDropDown:function(item, appendTo) {
-		OC.Share.loadItem(item);
-		var html = '<div id="dropdown" class="drop" data-item="'+item+'">';
-		html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
-		html += '<option value="" selected="selected" disabled="disabled">Your groups & members</option>';
-		html += '</select>';
-		html += '<div id="sharedWithList">';
-		html += '<ul id="userList"></ul>';
-		html += '<div id="groups" style="display:none;">';
-		html += '<br />';
-		html += 'Groups: ';
-		html += '<ul id="groupList"></ul>';
-		html += '</div>';
-		html += '</div>';
-		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 += '<form id="emailPrivateLink">';
-		html += '<input id="privateLinkText" style="display:none; width:90%;" />';
-		html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
-		html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
-		html += '</form>';
-		html += '</div>';
-		$(html).appendTo(appendTo);
-		if (OC.Share.usersAndGroups.length < 1) {
-			$.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'userautocomplete.php'), async: false, success: function(users) {
-				if (users) {
-					OC.Share.usersAndGroups = users;
-					$.each(users, function(index, user) {
-						$(user).appendTo('#share_with');
-					});
-					$('#share_with').trigger('liszt:updated');
-				}
-			}});
-		} else {
-			$.each(OC.Share.usersAndGroups, function(index, user) {
-				$(user).appendTo('#share_with');
-			});
-			$('#share_with').trigger('liszt:updated');
-		}
-		if (OC.Share.itemUsers) {
-			$.each(OC.Share.itemUsers, function(index, user) {
-				if (user.parentFolder) {
-					OC.Share.addSharedWith(user.uid, user.permissions, false, user.parentFolder);
-				} else {
-					OC.Share.addSharedWith(user.uid, user.permissions, false, false);
-				}
-			});
-		}
-		if (OC.Share.itemGroups) {
-			$.each(OC.Share.itemGroups, function(index, group) {
-				if (group.parentFolder) {
-					OC.Share.addSharedWith(group.gid, group.permissions, group.users, group.parentFolder);
-				} else {
-					OC.Share.addSharedWith(group.gid, group.permissions, group.users, false);
-				}
-			});
-		}
-		if (OC.Share.itemPrivateLink) {
-			OC.Share.showPrivateLink(item, OC.Share.itemPrivateLink);
-		}
-		$('#dropdown').show('blind');
-		$('#share_with').chosen();
-	},
-	hideDropDown:function(callback) {
-		$('#dropdown').hide('blind', function() {
-			$('#dropdown').remove();
-			if (callback) {
-				callback.call();
-			}
-		});
-	},
-	addSharedWith:function(uid_shared_with, permissions, isGroup, parentFolder) {
-		if (parentFolder) {
-			var sharedWith = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
-		} else {
-			var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
-			var style = ((permissions == 0) ? 'style="display:none;"' : '');
-			var sharedWith = '<li data-uid_shared_with="'+uid_shared_with+'">';
-			sharedWith += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
-			sharedWith += uid_shared_with;
-			sharedWith += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
-			sharedWith += '<label class="edit" for="'+uid_shared_with+'" '+style+'>can edit</label>';
-			sharedWith += '</li>';
-		}
-		if (isGroup) {
-			// Groups are added to a different list
-			$('#groups').show();
-			$(sharedWith).appendTo('#groupList');
-			// Remove group from select form
-			$('#share_with option[value="'+uid_shared_with+'(group)"]').remove();
-			$('#share_with').trigger('liszt:updated');
-			// Remove users in group from select form
-			$.each(isGroup, function(index, user) {
-				$('#share_with option[value="'+user+'"]').remove();
-				$('#share_with').trigger('liszt:updated');
-			});
-		} else {
-			$(sharedWith).appendTo('#userList');
-			// Remove user from select form
-			$('#share_with option[value="'+uid_shared_with+'"]').remove();
-			$('#share_with').trigger('liszt:updated');
-		}
-		
-	},
-	removeSharedWith:function(uid_shared_with) {
-		var option;
-		if ($('#userList li[data-uid_shared_with="'+uid_shared_with+'"]').length > 0) {
-			$('#userList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
-			option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
-		} else if ($('#groupList li[data-uid_shared_with="'+uid_shared_with+'"]').length > 0) {
-			$('#groupList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
-			if ($('#groupList li').length < 1) {
-				$('#groups').hide();
-			}
-			option = '<option value="'+uid_shared_with+'(group)">'+uid_shared_with+' (group)</option>';
-		}
-		$(option).appendTo('#share_with');
-		$('#share_with').trigger('liszt:updated');
-	},
-	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, ' ');
-		var email = $('#email').val();
-		if (email != '') {
-			$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, file: file }, function(result) {
-				if (result && result.status == 'success') {
-					$('#email').css('font-weight', 'bold');
-					$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-						$(this).val('');
-					}).val('Email sent');
-				} else {
-					OC.dialogs.alert(result.data.message, 'Error while sharing');
-				}
-			});
-		}
-	},
-	dirname:function(path) {
-		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
-	}
-}
-
-$(document).ready(function() {
-
-	if (typeof FileActions !== 'undefined') {
-		OC.Share.loadIcons();
-		FileActions.register('all', 'Share', function(filename) {
-			// Return the correct sharing icon
-			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
-			var item =  $('#dir').val() + '/' + filename;
-			// Check if icon is in cache
-			if (OC.Share.icons[item]) {
-				return OC.Share.icons[item];
-			} else {
-				var last = '';
-				var path = OC.Share.dirname(item);
-				// Search for possible parent folders that are shared
-				while (path != last) {
-					if (OC.Share.icons[path]) {
-						OC.Share.icons[item] = OC.Share.icons[path];
-						return OC.Share.icons[item];
-					}
-					last = path;
-					path = OC.Share.dirname(path);
-				}
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-				return OC.Share.icons[item];
-			}
-		}, function(filename) {
-			var file = $('#dir').val() + '/' + filename;
-			var appendTo = $('tr').filterAttr('data-file',filename).find('td.filename');
-			// Check if drop down is already visible for a different file
-			if (($('#dropdown').length > 0)) {
-				if (file != $('#dropdown').data('item')) {
-					OC.Share.hideDropDown(function () {
-						$('tr').removeClass('mouseOver');
-						$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-						OC.Share.showDropDown(file, appendTo);
-					});
-				}
-			} else {
-				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(file, appendTo);
-			}
-		});
-	};
-	
-	$(this).click(function(event) {
-		if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
-			if ($('#dropdown').is(':visible')) {
-				OC.Share.hideDropDown(function() {
-					$('tr').removeClass('mouseOver');
-				});
-			}
-		}
-	});
-
-	$('#sharedWithList li').live('mouseenter', function(event) {
-		// Show permissions and unshare button
-		$(':hidden', this).show();
-	});
-	
-	$('#sharedWithList li').live('mouseleave', function(event) {
-		// Hide permissions and unshare button
-		$('a', this).hide();
-		if (!$('input:[type=checkbox]', this).is(':checked')) {
-			$('input:[type=checkbox]', this).hide();
-			$('label', this).hide();
-		}
-	});
-	
-	$('#share_with').live('change', function() {
-		var item = $('#dropdown').data('item');
-		var uid_shared_with = $(this).val();
-		var pos = uid_shared_with.indexOf('(group)');
-		var isGroup = false;
-		if (pos != -1) {
-			// Remove '(group)' from uid_shared_with
-			uid_shared_with = uid_shared_with.substr(0, pos);
-			isGroup = true;
-		}
-		OC.Share.share(item, uid_shared_with, 0, function() {
-			if (isGroup) {
-				// Reload item because we don't know which users are in the group
-				OC.Share.loadItem(item);
-				var users;
-				$.each(OC.Share.itemGroups, function(index, group) {
-					if (group.gid == uid_shared_with) {
-						users = group.users;
-					}
-				});
-				OC.Share.addSharedWith(uid_shared_with, 0, users, false);
-			} else {
-				OC.Share.addSharedWith(uid_shared_with, 0, false, false);
-			}
-			// Change icon
-			if (!OC.Share.itemPrivateLink) {
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-			}
-		});
-	});
-	
-	$('.unshare').live('click', function() {
-		var item = $('#dropdown').data('item');
-		var uid_shared_with = $(this).parent().data('uid_shared_with');
-		OC.Share.unshare(item, uid_shared_with, function() {
-			OC.Share.removeSharedWith(uid_shared_with);
-			// Reload item to update cached users and groups for the icon check
-			OC.Share.loadItem(item);
-			// Change icon
-			if (!OC.Share.itemPrivateLink && !OC.Share.itemUsers && !OC.Share.itemGroups) {
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-			}
-		});
-	});
-	
-	$('.permissions').live('change', function() {
-		var permissions = (this.checked) ? 1 : 0;
-		OC.Share.changePermissions($('#dropdown').data('item'), $(this).parent().data('uid_shared_with'), permissions);
-	});
-	
-	$('#privateLinkCheckbox').live('change', function() {
-		var item = $('#dropdown').data('item');
-		if (this.checked) {
-			// Create a private link
-			OC.Share.share(item, 'public', 0, function(token) {
-				OC.Share.showPrivateLink(item, token);
-				// 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(event) {
-		event.preventDefault();
-		OC.Share.emailPrivateLink();
-	});
-});
\ No newline at end of file
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
similarity index 100%
rename from apps/files_sharing/sharedstorage.php
rename to apps/files_sharing/lib/sharedstorage.php
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
deleted file mode 100644
index 1c061cde07..0000000000
--- a/apps/files_sharing/lib_share.php
+++ /dev/null
@@ -1,518 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Michael Gapczynski
- * @copyright 2011 Michael Gapczynski GapczynskiM@gmail.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/>.
- *
- */
-
-/**
- * This class manages shared items within the database. 
- */
-class OC_Share {
-
-	const WRITE = 1;
-	const DELETE = 2;
-	const UNSHARED = -1;
-	const PUBLICLINK = "public";
-
-	private $token;
-      
-	/**
-	 * Share an item, adds an entry into the database
-	 * @param $source The source location of the item
-	 * @param $uid_shared_with The user or group to share the item with
-	 * @param $permissions The permissions, use the constants WRITE and DELETE
-	 */
-	public function __construct($source, $uid_shared_with, $permissions) {
-		$uid_owner = OCP\USER::getUser();
-		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
-		// Check if this is a reshare and use the original source
-		if ($result = OC_Share::getSource($source)) {
-			$source = $result;
-		}
-		if ($uid_shared_with == self::PUBLICLINK) {
-			$token = sha1("$uid_shared_with-$source");
-			OCP\Util::emitHook('OC_Share', 'public', array('source'=>$source, 'token'=>$token, 'permissions'=>$permissions));
-			$query->execute(array($uid_owner, self::PUBLICLINK, $source, $token, $permissions));
-			$this->token = $token;
-		} else {
-			if (OC_Group::groupExists($uid_shared_with)) {
-				$gid = $uid_shared_with;
-				$uid_shared_with = OC_Group::usersInGroup($gid);
-				// Remove the owner from the list of users in the group
-				$uid_shared_with = array_diff($uid_shared_with, array($uid_owner));
-			} else if (OCP\User::userExists($uid_shared_with)) {
-				$userGroups = OC_Group::getUserGroups($uid_owner);
-				// Check if the user is in one of the owner's groups
-				foreach ($userGroups as $group) {
-					if ($inGroup = OC_Group::inGroup($uid_shared_with, $group)) {
-						$gid = null;
-						$uid_shared_with = array($uid_shared_with);
-						break;
-					}
-				}
-				if (!$inGroup) {
-					throw new Exception("You can't share with ".$uid_shared_with);
-				}
-			} else {
-				throw new Exception($uid_shared_with." is not a user");
-			}
-			foreach ($uid_shared_with as $uid) {
-				// Check if this item is already shared with the user
-				$checkSource = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with ".self::getUsersAndGroups($uid, false));
-				$resultCheckSource = $checkSource->execute(array($source))->fetchAll();
-				// TODO Check if the source is inside a folder
-				if (count($resultCheckSource) > 0) {
-					if (!isset($gid)) {
-						throw new Exception("This item is already shared with ".$uid);
-					} else {
-						// Skip this user if sharing with a group
-						continue;
-					}
-				}
-				// Check if the target already exists for the user, if it does append a number to the name
-				$sharedFolder = '/'.$uid.'/files/Shared';
-				$target = $sharedFolder."/".basename($source);
-				$checkTarget = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUsersAndGroups($uid, false)." LIMIT 1");
-				$result = $checkTarget->execute(array($target))->fetchAll();
-				if (count($result) > 0) {
-					if ($pos = strrpos($target, ".")) {
-						$name = substr($target, 0, $pos);
-						$ext = substr($target, $pos);
-					} else {
-						$name = $target;
-						$ext = "";
-					}
-					$counter = 1;
-					while (count($result) > 0) {
-						$target = $name."_".$counter.$ext;
-						$result = $checkTarget->execute(array($target))->fetchAll();
-						$counter++;
-					}
-				}
-				// Update mtime of shared folder to invoke a file cache rescan
-				$rootView=new OC_FilesystemView('/');
-				if (!$rootView->is_dir($sharedFolder)) {
-					if (!$rootView->is_dir('/'.$uid.'/files')) {
-						OC_Util::tearDownFS();
-						OC_Util::setupFS($uid);
-						OC_Util::tearDownFS();
-					}
-					$rootView->mkdir($sharedFolder);
-				}
-				$rootView->touch($sharedFolder);
-				if (isset($gid)) {
-					$uid = $uid."@".$gid;
-				}
-				OCP\Util::emitHook('OC_Share', 'user', array('source'=>$source, 'target'=>$target, 'with'=>$uid, 'permissions'=>$permissions));
-				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
-			}
-		}
-	}
-
-	/**
-	* Remove any duplicate or trailing '/' from the path
-	* @return A clean path
-	*/
-	private static function cleanPath($path) {
-		$path = rtrim($path, "/");
-		return preg_replace('{(/)\1+}', "/", $path);
-	}
-
-	/**
-	* Generate a string to be used for searching for uid_shared_with that handles both users and groups
-	* @param $uid (Optional) The uid to get the user groups for, a gid to get the users in a group, or if not set the current user
-	* @return An IN operator as a string
-	*/
-	private static function getUsersAndGroups($uid = null, $includePrivateLinks = true) {
-		$in = " IN(";
-		if (isset($uid) && OC_Group::groupExists($uid)) {
-			$users = OC_Group::usersInGroup($uid);
-			foreach ($users as $user) {
-				// Add a comma only if the the current element isn't the last
-				if ($user !== end($users)) {
-					$in .= "'".$user."@".$uid."', ";
-				} else {
-					$in .= "'".$user."@".$uid."'";
-				}
-			}
-		} else if (isset($uid)) {
-			// TODO Check if this is necessary, only constructor needs it as IN. It would be better for other queries to just return =$uid
-			$in .= "'".$uid."'";
-			$groups = OC_Group::getUserGroups($uid);
-			foreach ($groups as $group) {
-				$in .= ", '".$uid."@".$group."'";
-			}
-		} else {
-			$uid = OCP\USER::getUser();
-			$in .= "'".$uid."'";
-			$groups = OC_Group::getUserGroups($uid);
-			foreach ($groups as $group) {
-				$in .= ", '".$uid."@".$group."'";
-			}
-		}
-		if ($includePrivateLinks) {
-			$in .= ", '".self::PUBLICLINK."'";
-		}
-		$in .= ")";
-		return $in;
-	}
-
-	private static function updateFolder($uid_shared_with) {
-		if ($uid_shared_with != self::PUBLICLINK) {
-			if (OC_Group::groupExists($uid_shared_with)) {
-				$uid_shared_with = OC_Group::usersInGroup($uid_shared_with);
-				// Remove the owner from the list of users in the group
-				$uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser()));
-			} else {
-				$pos = strrpos($uid_shared_with, '@');
-				if ($pos !== false && OC_Group::groupExists(substr($uid_shared_with, $pos + 1))) {
-					$uid_shared_with = array(substr($uid_shared_with, 0, $pos));
-				} else {
-					$uid_shared_with = array($uid_shared_with);
-				}
-			}
-			foreach ($uid_shared_with as $uid) {
-				$sharedFolder = $uid.'/files/Shared';
-				// Update mtime of shared folder to invoke a file cache rescan
-				$rootView = new OC_FilesystemView('/');
-				$rootView->touch($sharedFolder);
-			}
-		}
-	}
-
-	/**
-	 * Create a new entry in the database for a file inside a shared folder
-	 *
-	 * $oldTarget and $newTarget may be the same value. $oldTarget exists in case the file is being moved outside of the folder
-	 *
-	 * @param $oldTarget The current target location
-	 * @param $newTarget The new target location
-	 */
-	public static function pullOutOfFolder($oldTarget, $newTarget) {
-		$folders = self::getParentFolders($oldTarget);
-		$source = $folders['source'].substr($oldTarget, strlen($folders['target']));
-		$item = self::getItem($folders['target']);
-		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
-		$query->execute(array($item[0]['uid_owner'], OCP\USER::getUser(), $source, $newTarget, $item[0]['permissions']));
-	}
-
-	/**
-	 * Get the item with the specified target location
-	 * @param $target The target location of the item
-	 * @return An array with the item
-	 */
-	public static function getItem($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT uid_owner, source, permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ? LIMIT 1");
-		return $query->execute(array($target, OCP\USER::getUser()))->fetchAll();
-	}
-
-	 /**
-	 * Get the item with the specified source location
-	 * @param $source The source location of the item
-	 * @return An array with the users and permissions the item is shared with
-	 */
-	public static function getMySharedItem($source) {
-		$source = self::cleanPath($source);
-		$query = OCP\DB::prepare("SELECT uid_shared_with, permissions FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ?");
-		$result = $query->execute(array($source, OCP\USER::getUser()))->fetchAll();
-		if (count($result) > 0) {
-			return $result;
-		} else if ($originalSource = self::getSource($source)) {
-			return $query->execute(array($originalSource, OCP\USER::getUser()))->fetchAll();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get all items the current user is sharing
-	 * @return An array with all items the user is sharing
-	 */
-	public static function getMySharedItems() {
-		$query = OCP\DB::prepare("SELECT uid_shared_with, source, permissions FROM *PREFIX*sharing WHERE uid_owner = ?");
-		return $query->execute(array(OCP\USER::getUser()))->fetchAll();
-	}
-
-	/**
-	 * Get the items within a shared folder that have their own entry for the purpose of name, location, or permissions that differ from the folder itself
-	 *
-	 * Works for both target and source folders. Can be used for getting all items shared with you e.g. pass '/MTGap/files'
-	 *
-	 * @param $folder The folder of the items to look for
-	 * @return An array with all items in the database that are in the folder
-	 */
-	public static function getItemsInFolder($folder) {
-		$folder = self::cleanPath($folder);
-		// Append '/' in order to filter out the folder itself if not already there
-		if (substr($folder, -1) !== "/") {
-			$folder .= "/";
-		}
-		$length = strlen($folder);
-		$query = OCP\DB::prepare("SELECT uid_owner, source, target, permissions FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
-		return $query->execute(array($length, $folder, $length, $folder))->fetchAll();
-	}
-
-	/**
-	 * Get the source and target parent folders of the specified target location
-	 * @param $target The target location of the item
-	 * @return An array with the keys 'source' and 'target' with the values of the source and target parent folders
-	 */
-	public static function getParentFolders($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with".self::getUsersAndGroups()." LIMIT 1");
-		// Prevent searching for user directory e.g. '/MTGap/files'
-		$userDirectory = substr($target, 0, strpos($target, "files") + 5);
-		$target = dirname($target);
-		$result = array();
-		while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory && $target != "\\") {
-			// Check if the parent directory of this target location is shared
-			$result = $query->execute(array($target))->fetchAll();
-			if (count($result) > 0) {
-				break;
-			}
-			$target = dirname($target);
-		}
-		if (count($result) > 0) {
-			// Return both the source folder and the target folder
-			return array("source" => $result[0]['source'], "target" => $target);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get the source location of the item at the specified target location
-	 * @param $target The target location of the item
-	 * @return Source location or false if target location is not valid
-	 */
-	public static function getSource($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUsersAndGroups()." LIMIT 1");
-		$result = $query->execute(array($target))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['source'];
-		} else {
-			$folders = self::getParentFolders($target);
-			if ($folders == true) {
-				return $folders['source'].substr($target, strlen($folders['target']));
-			} else {
-				return false;
-			}
-		}
-	}
-
-	public static function getTarget($source) {
-		$source = self::cleanPath($source);
-		$query = OCP\DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ? LIMIT 1");
-		$result = $query->execute(array($source, OCP\USER::getUser()))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['target'];
-		} else {
-			// TODO Check in folders
-			return false;
-		}
-	}
-
-	/**
-	 * Get the user's permissions for the item at the specified target location
-	 * @param $target The target location of the item
-	 * @return The permissions, use bitwise operators to check against the constants WRITE and DELETE
-	 */
-	public static function getPermissions($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUsersAndGroups()." LIMIT 1");
-		$result = $query->execute(array($target))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['permissions'];
-		} else {
-			$folders = self::getParentFolders($target);
-			if ($folders == true) {
-				$result = $query->execute(array($folders['target']))->fetchAll();
-				if (count($result) > 0) {
-					return $result[0]['permissions'];
-				}
-			} else {
-				OCP\Util::writeLog('files_sharing',"Not existing parent folder : ".$target,OCP\Util::ERROR);
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * Get the token for a public link
-	 * @return The token of the public link, a sha1 hash
-	 */
-	public function getToken() {
-		return $this->token;
-	}
-
-	/**
-	 * Get the token for a public link
-	 * @param $source The source location of the item
-	 * @return The token of the public link, a sha1 hash
-	 */
-	public static function getTokenFromSource($source) {
-		$query = OCP\DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with = ? AND uid_owner = ? LIMIT 1");
-		$result = $query->execute(array($source, self::PUBLICLINK, OCP\USER::getUser()))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['target'];
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Set the target location to a new value
-	 *
-	 * You must use the pullOutOfFolder() function to change the target location of a file inside a shared folder if the target location differs from the folder
-	 *
-	 * @param $oldTarget The current target location
-	 * @param $newTarget The new target location 
-	 */
-	public static function setTarget($oldTarget, $newTarget) {
-		$oldTarget = self::cleanPath($oldTarget);
-		$newTarget = self::cleanPath($newTarget);
-		$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET target = REPLACE(target, ?, ?) WHERE uid_shared_with ".self::getUsersAndGroups());
-		$query->execute(array($oldTarget, $newTarget));
-	}
-
-	/**
-	* Change the permissions for the specified item and user
-	*
-	* You must construct a new shared item to change the permissions of a file inside a shared folder if the permissions differ from the folder
-	*
-	* @param $source The source location of the item
-	* @param $uid_shared_with The user to change the permissions for
-	* @param $permissions The permissions, use the constants WRITE and DELETE
-	*/
-	public static function setPermissions($source, $uid_shared_with, $permissions) {
-		$source = self::cleanPath($source);
-		$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ? AND uid_shared_with ".self::getUsersAndGroups($uid_shared_with));
-		$query->execute(array($permissions, strlen($source), $source, OCP\USER::getUser()));
-	}
-
-	/**
-	* Unshare the item, removes it from all specified users
-	*
-	* You must use the pullOutOfFolder() function to unshare a file inside a shared folder and set $newTarget to nothing
-	*
-	* @param $source The source location of the item
-	* @param $uid_shared_with Array of users to unshare the item from
-	*/
-	public static function unshare($source, $uid_shared_with) {
-		$source = self::cleanPath($source);
-		$uid_owner = OCP\USER::getUser();
-		$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ? AND uid_shared_with ".self::getUsersAndGroups($uid_shared_with, false));
-		$query->execute(array(strlen($source), $source, $uid_owner));
-		self::updateFolder($uid_shared_with);
-	}
-
-	/**
-	* Unshare the item from the current user, removes it only from the database and doesn't touch the source file
-	*
-	* You must use the pullOutOfFolder() function before you call unshareFromMySelf() and set the delete parameter to false to unshare from self a file inside a shared folder
-	*
-	* @param $target The target location of the item
-	* @param $delete (Optional) If true delete the entry from the database, if false the permission is set to UNSHARED
-	*/
-	public static function unshareFromMySelf($target, $delete = true) {
-		$target = self::cleanPath($target);
-		if ($delete) {
-			$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
-			$query->execute(array(strlen($target), $target));
-		} else {
-			$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
-			$query->execute(array(self::UNSHARED, strlen($target), $target));
-		}
-	}
-
-	/**
-	* Remove the item from the database, the owner deleted the file
-	* @param $arguments Array of arguments passed from OC_Hook
-	*/
-	public static function deleteItem($arguments) {
-		$source = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['path']);
-		$result = self::getMySharedItem($source);
-		if (is_array($result)) {
-			foreach ($result as $item) {
-				self::updateFolder($item['uid_shared_with']);
-			}
-		}
-		$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, OCP\USER::getUser()));
-	}
-
-	/**
-	* Rename the item in the database, the owner renamed the file
-	* @param $arguments Array of arguments passed from OC_Hook
-	*/
-	public static function renameItem($arguments) {
-		$oldSource = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['oldpath']);
-		$newSource = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['newpath']);
-		$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET source = REPLACE(source, ?, ?) WHERE uid_owner = ?");
-		$query->execute(array($oldSource, $newSource, OCP\USER::getUser()));
-	}
-
-	public static function updateItem($arguments) {
-		$source = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['path']);
-		$result = self::getMySharedItem($source);
-		if (is_array($result)) {
-			foreach ($result as $item) {
-				self::updateFolder($item['uid_shared_with']);
-			}
-		}
-	}
-
-	public static function removeUser($arguments) {
-		$query = OCP\DB::prepare("SELECT uid_shared_with FROM *PREFIX*sharing WHERE uid_owner = ?");
-		$result = $query->execute(array($arguments['uid']))->fetchAll();
-		if (is_array($result)) {
-			$result = array_unique($result);
-			foreach ($result as $item) {
-				self::updateFolder($item['uid_shared_with']);
-			}
-			$query = OCP\DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_owner = ? OR uid_shared_with '.self::getUsersAndGroups($arguments['uid']));
-			$query->execute(array($arguments['uid']));
-		}
-	}
-
-	public static function addToGroupShare($arguments) {
-		$length = -strlen($arguments['gid']) - 1;
-		$query = OCP\DB::prepare('SELECT uid_owner, source, permissions FROM *PREFIX*sharing WHERE SUBSTR(uid_shared_with, '.$length.') = ?');
-		$gid = '@'.$arguments['gid'];
-		$result = $query->execute(array($gid))->fetchAll();
-		if (count($result) > 0) {
-			$lastSource = '';
-			for ($i = 0; $i < count($result); $i++) {
-				if ($result[$i]['source'] != $lastSource) {
-					new OC_Share($result[$i]['source'], $arguments['gid'], $result[$i]['permissions']);
-					$lastSource = $result[$i]['source'];
-				}
-			}
-		}
-	}
-
-	public static function removeFromGroupShare($arguments) {
-		$query = OCP\DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_shared_with = ?');
-		$query->execute(array($arguments['uid'].'@'.$arguments['gid']));
-		self::updateFolder($arguments['uid']);
-	}
-
-}
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
deleted file mode 100644
index 54704c942f..0000000000
--- a/apps/files_sharing/list.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Michael Gapczynski
- * @copyright 2011 Michael Gapczynski GapczynskiM@gmail.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_share.php');
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('files_sharing');
-
-OCP\App::setActiveNavigationEntry("files_sharing_list");
-
-OCP\Util::addscript("files_sharing", "list");
-
-$tmpl = new OCP\Template("files_sharing", "list", "user");
-$tmpl->assign("shared_items", OC_Share::getMySharedItems());
-$tmpl->printPage();
diff --git a/apps/files_sharing/settings.php b/apps/files_sharing/settings.php
deleted file mode 100644
index 7b63a26515..0000000000
--- a/apps/files_sharing/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-OCP\User::checkAdminUser();
-OCP\Util::addscript('files_sharing', 'settings');
-$tmpl = new OCP\Template('files_sharing', 'settings');
-$tmpl->assign('allowResharing', OCP\Config::getAppValue('files_sharing', 'resharing', 'yes'));
-return $tmpl->fetchPage();
-
-?>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
deleted file mode 100644
index d46ff818ac..0000000000
--- a/apps/files_sharing/templates/list.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<fieldset>
-	<legend><?php echo $l->t('Your Shared Files');?></legend>
-	<table id="itemlist">
-		<thead>
-			<tr>
-				<th><?php echo $l->t('Item');?></th>
-				<th><?php echo $l->t('Shared With');?></th>
-				<th><?php echo $l->t('Permissions');?></th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach($_['shared_items'] as $item):?>
-				<tr class="item">
-					<td class="source"><?php echo substr($item['source'], strlen("/".$_SESSION['user_id']."/files/"));?></td>
-					<td class="uid_shared_with"><?php echo $item['uid_shared_with'];?></td>
-					<td class="permissions"><?php echo $l->t('Read'); echo($item['permissions'] & OC_SHARE::WRITE ? ", ".$l->t('Edit') : ""); echo($item['permissions'] & OC_SHARE::DELETE ? ", ".$l->t('Delete') : "");?></td>
-					<td><button class="delete" data-source="<?php echo $item['source'];?>" data-uid_shared_with="<?php echo $item['uid_shared_with'];?>"><?php echo $l->t('Delete');?></button></td>
-				</tr>
-			<?php endforeach;?>
-			<tr id="share_item_row">
-				<form action="#" id="share_item">
-					<td class="source"><input placeholder="Item" id="source" /></td>
-					<td class="uid_shared_with"><input placeholder="Share With" id="uid_shared_with" /></td>
-					<td class="permissions"><input placeholder="Permissions" id="permissions" /></td>
-					<td><input type="submit" value="Share" /></td>
-				</form>
-			</tr>
-		</tbody>
-	</table>
-</fieldset>
diff --git a/apps/files_sharing/templates/settings.php b/apps/files_sharing/templates/settings.php
deleted file mode 100644
index 5b6ba5f33e..0000000000
--- a/apps/files_sharing/templates/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<form id="resharing">
-	<fieldset class="personalblock">
-	<input type="checkbox" name="allowResharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo ' checked="checked"'; ?> /> <label for="allowResharing"><?php echo $l->t('Enable Resharing'); ?></label> <br/>
-	<em><?php echo $l->t('Allow users to reshare files they don\'t own');?></em>
-	</fieldset>
-</form>
\ No newline at end of file

From 3debb6745815bb854c477d63090b7df03620ab20 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 Aug 2012 11:52:50 -0400
Subject: [PATCH 1513/1537] Move share CSS to core, add script and style from
 inside Share API

---
 apps/files_sharing/css/sharing.css => core/css/share.css | 0
 lib/public/share.php                                     | 2 ++
 2 files changed, 2 insertions(+)
 rename apps/files_sharing/css/sharing.css => core/css/share.css (100%)

diff --git a/apps/files_sharing/css/sharing.css b/core/css/share.css
similarity index 100%
rename from apps/files_sharing/css/sharing.css
rename to core/css/share.css
diff --git a/lib/public/share.php b/lib/public/share.php
index b4ff205a70..e24149364f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -69,6 +69,8 @@ class Share {
 	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
 		if (!isset(self::$backendTypes[$itemType])) {
 			self::$backendTypes[$itemType] = array('class' => $class, 'collectionOf' => $collectionOf, 'supportedFileExtensions' => $supportedFileExtensions);
+			\OC_Util::addScript('core', 'share');
+			\OC_Util::addStyle('core', 'share');
 			return true;
 		}
 		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);

From 885b8c481bed58a41b5f458decafa8bbfe1635c1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 Aug 2012 12:31:54 -0400
Subject: [PATCH 1514/1537] Check if files_sharing app is enabled, move file
 specific javascript to files_sharing app

---
 apps/files_sharing/appinfo/app.php |  1 +
 apps/files_sharing/js/share.js     | 64 ++++++++++++++++++++++++++++++
 core/js/share.js                   | 61 ----------------------------
 lib/files.php                      |  4 +-
 4 files changed, 67 insertions(+), 63 deletions(-)
 create mode 100644 apps/files_sharing/js/share.js

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index fcebacc19d..109f86b2e8 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -6,3 +6,4 @@ OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/lib/sharedstorage.
 OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC_Filestorage_Shared', 'setup');
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
+OCP\Util::addScript('files_sharing', 'share');
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
new file mode 100644
index 0000000000..bcfd42ce21
--- /dev/null
+++ b/apps/files_sharing/js/share.js
@@ -0,0 +1,64 @@
+$(document).ready(function() {
+
+	if (typeof FileActions !== 'undefined') {
+		OC.Share.loadIcons('file');
+		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
+			// Return the correct sharing icon
+			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
+			if ($('#dir').val() == '/') {
+				var item = $('#dir').val() + filename;
+			} else {
+				var item = $('#dir').val() + '/' + filename;
+			}
+			// Check if status is in cache
+			if (OC.Share.statuses[item] === true) {
+				return OC.imagePath('core', 'actions/public');
+			} else if (OC.Share.statuses[item] === false) {
+				return OC.imagePath('core', 'actions/shared');
+			} else {
+				var last = '';
+				var path = OC.Share.dirname(item);
+				// Search for possible parent folders that are shared
+				while (path != last) {
+					if (OC.Share.statuses[path] === true) {
+						return OC.imagePath('core', 'actions/public');
+					} else if (OC.Share.statuses[path] === false) {
+						return OC.imagePath('core', 'actions/shared');
+					}
+					last = path;
+					path = OC.Share.dirname(path);
+				}
+				return OC.imagePath('core', 'actions/share');
+			}
+		}, function(filename) {
+			if ($('#dir').val() == '/') {
+				var item = $('#dir').val() + filename;
+			} else {
+				var item = $('#dir').val() + '/' + filename;
+			}
+			if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
+				var itemType = 'folder';
+				var possiblePermissions = OC.Share.PERMISSION_CREATE | OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
+			} else {
+				var itemType = 'file';
+				var possiblePermissions = OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
+			}
+			var appendTo = $('tr').filterAttr('data-file', filename).find('td.filename');
+			// Check if drop down is already visible for a different file
+			if (OC.Share.droppedDown) {
+				if (item != $('#dropdown').data('item')) {
+					OC.Share.hideDropDown(function () {
+						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
+						OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
+					});
+				} else {
+					OC.Share.hideDropDown();
+				}
+			} else {
+				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
+				OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
+			}
+		});
+	}
+
+});
\ No newline at end of file
diff --git a/core/js/share.js b/core/js/share.js
index c1d66ee921..a552aa8083 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -275,67 +275,6 @@ $(document).ready(function() {
 			}
 		}
 	});
-	
-	if (typeof FileActions !== 'undefined') {
-		OC.Share.loadIcons('file');
-		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
-			// Return the correct sharing icon
-			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
-			if ($('#dir').val() == '/') {
-				var item = $('#dir').val() + filename;
-			} else {
-				var item = $('#dir').val() + '/' + filename;
-			}
-			// Check if status is in cache
-			if (OC.Share.statuses[item] === true) {
-				return OC.imagePath('core', 'actions/public');
-			} else if (OC.Share.statuses[item] === false) {
-				return OC.imagePath('core', 'actions/shared');
-			} else {
-				var last = '';
-				var path = OC.Share.dirname(item);
-				// Search for possible parent folders that are shared
-				while (path != last) {
-					if (OC.Share.statuses[path] === true) {
-						return OC.imagePath('core', 'actions/public');
-					} else if (OC.Share.statuses[path] === false) {
-						return OC.imagePath('core', 'actions/shared');
-					}
-					last = path;
-					path = OC.Share.dirname(path);
-				}
-				return OC.imagePath('core', 'actions/share');
-			}
-		}, function(filename) {
-			if ($('#dir').val() == '/') {
-				var item = $('#dir').val() + filename;
-			} else {
-				var item = $('#dir').val() + '/' + filename;
-			}
-			if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
-				var itemType = 'folder';
-				var possiblePermissions = OC.Share.PERMISSION_CREATE | OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
-			} else {
-				var itemType = 'file';
-				var possiblePermissions = OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
-			}
-			var appendTo = $('tr').filterAttr('data-file', filename).find('td.filename');
-			// Check if drop down is already visible for a different file
-			if (OC.Share.droppedDown) {
-				if (item != $('#dropdown').data('item')) {
-					OC.Share.hideDropDown(function () {
-						$('tr').filterAttr('data-file', filename).addClass('mouseOver');
-						OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
-					});
-				} else {
-					OC.Share.hideDropDown();
-				}
-			} else {
-				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
-			}
-		});
-	}
 
 	$(this).click(function(event) {
 		if (OC.Share.droppedDown && !($(event.target).hasClass('drop')) && $('#dropdown').has(event.target).length === 0) {
diff --git a/lib/files.php b/lib/files.php
index ce7cf2c446..1a1fffa0a5 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -38,7 +38,7 @@ class OC_Files {
 			$directory='';
 		}
 		$files = array();
-		if (substr($directory, 0, 7) == '/Shared') {
+		if (($directory == '/Shared' || substr($directory, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) {
 			if ($directory == '/Shared') {
 				$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter));
 			} else {
@@ -65,7 +65,7 @@ class OC_Files {
 				}
 				$file['permissions'] = $permissions;
 			}
-			if ($directory == '') {
+			if ($directory == '' && OC_App::isEnabled('files_sharing')) {
 				// Add 'Shared' folder
 				$files = array_merge($files, OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT));
 			}

From 61c7700ce61772bce30791705625022e162b7cd7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 22 Aug 2012 18:50:50 +0200
Subject: [PATCH 1515/1537] Add support for IMPP properties.

---
 apps/contacts/ajax/contact/addproperty.php  | 14 +++-
 apps/contacts/ajax/contact/saveproperty.php | 26 +++++--
 apps/contacts/css/contacts.css              | 16 +++--
 apps/contacts/index.php                     |  8 +++
 apps/contacts/js/contacts.js                | 73 ++++++++++++++++++-
 apps/contacts/lib/app.php                   | 78 +++++++++++++++++++--
 apps/contacts/lib/vcard.php                 | 24 +++++--
 apps/contacts/templates/part.contact.php    | 26 ++++++-
 8 files changed, 242 insertions(+), 23 deletions(-)

diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
index 1412cad1cb..0447950fbd 100644
--- a/apps/contacts/ajax/contact/addproperty.php
+++ b/apps/contacts/ajax/contact/addproperty.php
@@ -108,7 +108,17 @@ switch($name) {
 		$value = strtolower($value);
 		break;
 	case 'TEL':
-	case 'ADR': // should I delete the property if empty or throw an error?
+	case 'ADR':
+		break;
+	case 'IMPP':
+		if(is_null($parameters) || !isset($parameters['X-SERVICE-TYPE'])) {
+			bailOut(OC_Contacts_App::$l10n->t('Missing IM parameter.'));
+		}
+		$impp = OC_Contacts_App::getIMOptions($parameters['X-SERVICE-TYPE']);
+		if(is_null($impp)) {
+			bailOut(OC_Contacts_App::$l10n->t('Unknown IM: '.$parameters['X-SERVICE-TYPE']));
+		}
+		$value = $impp['protocol'] . ':' . $value;
 		break;
 }
 
@@ -126,7 +136,7 @@ $line = count($vcard->children) - 1;
 // Apparently Sabre_VObject_Parameter doesn't do well with
 // multiple values or I don't know how to do it. Tanghus.
 foreach ($parameters as $key=>$element) {
-	if(is_array($element) && strtoupper($key) == 'TYPE') {
+	if(is_array($element) /*&& strtoupper($key) == 'TYPE'*/) {
 		// NOTE: Maybe this doesn't only apply for TYPE?
 		// And it probably shouldn't be done here anyways :-/
 		foreach($element as $e) {
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
index fd541b7361..9556c4a44c 100644
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ b/apps/contacts/ajax/contact/saveproperty.php
@@ -88,6 +88,16 @@ switch($element) {
 	case 'EMAIL':
 		$value = strtolower($value);
 		break;
+	case 'IMPP':
+		if(is_null($parameters) || !isset($parameters['X-SERVICE-TYPE'])) {
+			bailOut(OC_Contacts_App::$l10n->t('Missing IM parameter.'));
+		}
+		$impp = OC_Contacts_App::getIMOptions($parameters['X-SERVICE-TYPE']);
+		if(is_null($impp)) {
+			bailOut(OC_Contacts_App::$l10n->t('Unknown IM: '.$parameters['X-SERVICE-TYPE']));
+		}
+		$value = $impp['protocol'] . ':' . $value;
+		break;
 }
 
 if(!$value) {
@@ -112,7 +122,8 @@ if(!$value) {
 			break;
 		case 'EMAIL':
 		case 'TEL':
-		case 'ADR': // should I delete the property if empty or throw an error?
+		case 'ADR':
+		case 'IMPP':
 			debug('Setting element: (EMAIL/TEL/ADR)'.$element);
 			$vcard->children[$line]->setValue($value);
 			$vcard->children[$line]->parameters = array();
@@ -120,11 +131,18 @@ if(!$value) {
 				debug('Setting parameters: '.$parameters);
 				foreach($parameters as $key => $parameter) {
 					debug('Adding parameter: '.$key);
-					foreach($parameter as $val) {
-						debug('Adding parameter: '.$key.'=>'.$val);
+					if(is_array($parameter)) {
+						foreach($parameter as $val) {
+							debug('Adding parameter: '.$key.'=>'.$val);
+							$vcard->children[$line]->add(new Sabre_VObject_Parameter(
+								$key,
+								strtoupper(strip_tags($val)))
+							);
+						}
+					} else {
 						$vcard->children[$line]->add(new Sabre_VObject_Parameter(
 							$key,
-							strtoupper(strip_tags($val)))
+							strtoupper(strip_tags($parameter)))
 						);
 					}
 				}
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 483df2196a..ef48d020d0 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -33,7 +33,7 @@
 #card input[type="text"].contacts_property,input[type="email"].contacts_property,input[type="url"].contacts_property { width: 14em; float: left; font-weight: bold; }
 .categories { float: left; width: 16em; }
 #card input[type="checkbox"].contacts_property,input[type="text"],input[type="email"],input[type="url"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
-#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="url"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="url"]:active,input[type="tel"]:active, select:hover, select:focus, select:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
+#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="url"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="url"]:active,input[type="tel"]:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
 textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
 dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
 .form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }
@@ -117,13 +117,21 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .big { font-weight:bold; font-size:1.2em; }
 .huge { font-weight:bold; font-size:1.5em; }
 .propertycontainer dd { float: left; width: 25em; }
-.propertylist { clear: none; max-width: 28em; }
-.propertylist li.propertycontainer { white-space: nowrap; min-width: 35em; /*max-width: 30em;*/ display: block; clear: right; }
+/*.propertylist { clear: none; max-width: 33em; }*/
+.propertylist li.propertycontainer { white-space: nowrap; min-width: 35em; display: block; clear: both; }
 .propertycontainer[data-element="EMAIL"] > input[type="email"],.propertycontainer[data-element="TEL"] > input[type="text"] { min-width: 12em !important; float: left; }
 .propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 16px; height: 16px; vertical-align: middle; padding: 0; }
 .propertylist li > select { float: left; max-width: 8em; }
+.propertylist li > .select_wrapper { float: left; overflow: hidden; color: #bbb; font-size: 0.8em; }
+.propertylist li > .select_wrapper select { float: left; overflow: hidden; color: #bbb; }
+.propertylist li > .select_wrapper select option { color: #777; }
+.propertylist li > .select_wrapper select:hover,.propertylist li > select:focus,.propertylist li > select:active { color: #777; }
+.propertylist li > .select_wrapper select.impp { margin-left: -2.3em; direction: rtl; }
+.propertylist li > .select_wrapper select.types { margin-right: -2em; }
+.propertylist li > input[type="checkbox"].impp { clear: none; }
 .propertylist li > label.xab { display: block; color: #bbb; float:left; clear: both; padding: 0.5em 0 0 2.5em; }
-.typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb; box-shadow: none; } /* for multiselect */
+.propertylist li > label.xab:hover { color: #777; }
+.typelist[type="button"] { float: left; max-width: 8em; border: 0; background-color: #fff; color: #bbb; box-shadow: none; } /* for multiselect */
 .typelist[type="button"]:hover { color: #777; } /* for multiselect */
 .addresslist { clear: both; font-weight: bold; }
 #ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; opacity: 0.9; }
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 5cd58c5c43..f16d6f5641 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -28,8 +28,14 @@ OCP\App::setActiveNavigationEntry('contacts_index');
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
+$impp_types = OC_Contacts_App::getTypesOfProperty('IMPP');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
+$ims = OC_Contacts_App::getIMOptions();
+$im_protocols = array();
+foreach($ims as $name => $values) {
+	$im_protocols[$name] = $values['displayname'];
+}
 $categories = OC_Contacts_App::getCategories();
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
@@ -60,7 +66,9 @@ $tmpl->assign('uploadMaxHumanFilesize',
 	OCP\Util::humanFileSize($maxUploadFilesize), false);
 $tmpl->assign('phone_types', $phone_types, false);
 $tmpl->assign('email_types', $email_types, false);
+$tmpl->assign('impp_types', $impp_types, false);
 $tmpl->assign('categories', $categories, false);
+$tmpl->assign('im_protocols', $im_protocols, false);
 $tmpl->assign('has_contacts', $has_contacts, false);
 $tmpl->assign('id', $id, false);
 $tmpl->printPage();
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 033c62b136..e5daadb6d1 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -533,6 +533,7 @@ OC.Contacts={
 			this.loadPhoto();
 			this.loadMails();
 			this.loadPhones();
+			this.loadIMs();
 			this.loadAddresses();
 			this.loadSingleProperties();
 			OC.Contacts.loadListHandlers();
@@ -802,6 +803,12 @@ OC.Contacts={
 					}
 					OC.Contacts.Card.addPhone();
 					break;
+				case 'IMPP':
+					if($('#imlist>li').length == 1) {
+						$('#ims').show();
+					}
+					OC.Contacts.Card.addIM();
+					break;
 				case 'ADR':
 					if($('addresses>dl').length == 1) {
 						$('#addresses').show();
@@ -1289,8 +1296,72 @@ OC.Contacts={
 			});
 			OC.Contacts.Contacts.refreshThumbnail(this.id);
 		},
+		addIM:function() {
+			//alert('addMail');
+			var imlist = $('#imlist');
+			imlist.find('li.template:first-child').clone(true).appendTo(imlist).show().find('a .tip').tipsy();
+			imlist.find('li.template:last-child').find('select').addClass('contacts_property');
+			imlist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+			imlist.find('li:last-child').find('input[type="text"]').focus();
+			return false;
+		},
+		loadIMs:function() {
+			//console.log('loadIMs');
+			$('#ims').hide();
+			$('#imlist li.propertycontainer').remove();
+			var imlist = $('#imlist');
+			for(var im in this.data.IMPP) {
+				this.addIM();
+				var curim = imlist.find('li.propertycontainer:last-child');
+				if(typeof this.data.IMPP[im].label != 'undefined') {
+					curim.prepend('<label class="xab">'+this.data.IMPP[im].label+'</label>');
+				}
+				curim.data('checksum', this.data.IMPP[im]['checksum'])
+				curim.find('input[type="text"]').val(this.data.IMPP[im]['value'].split(':').pop());
+				for(var param in this.data.IMPP[im]['parameters']) {
+					if(param.toUpperCase() == 'PREF') {
+						curim.find('input[type="checkbox"]').attr('checked', 'checked')
+					}
+					else if(param.toUpperCase() == 'TYPE') {
+						if(typeof this.data.IMPP[im]['parameters'][param] == 'string') {
+							var found = false;
+							var imt = this.data.IMPP[im]['parameters'][param];
+							curim.find('select.types option').each(function(){
+								if($(this).val().toUpperCase() == imt.toUpperCase()) {
+									$(this).attr('selected', 'selected');
+									found = true;
+								}
+							});
+							if(!found) {
+								curim.find('select.type option:last-child').after('<option value="'+imt+'" selected="selected">'+imt+'</option>');
+							}
+						} else if(typeof this.data.IMPP[im]['parameters'][param] == 'object') {
+							for(imtype in this.data.IMPP[im]['parameters'][param]) {
+								var found = false;
+								var imt = this.data.IMPP[im]['parameters'][param][imtype];
+								curim.find('select.types option').each(function(){
+									if($(this).val().toUpperCase() == imt.toUpperCase().split(',')) {
+										$(this).attr('selected', 'selected');
+										found = true;
+									}
+								});
+								if(!found) {
+									curim.find('select.type option:last-child').after('<option value="'+imt+'" selected="selected">'+imt+'</option>');
+								}
+							}
+						}
+					}
+					else if(param.toUpperCase() == 'X-SERVICE-TYPE') {
+						curim.find('select.impp').val(this.data.IMPP[im]['parameters'][param].toLowerCase());
+					}
+				}
+			}
+			if($('#imlist li').length > 1) {
+				$('#ims').show();
+			}
+			return false;
+		},
 		addMail:function() {
-			console.log('addMail');
 			var emaillist = $('#emaillist');
 			emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
 			emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index e222c608de..e8e1937404 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -109,14 +109,77 @@ class OC_Contacts_App {
 	/**
 	 * @return array of vcard prop => label
 	 */
-	public static function getAddPropertyOptions() {
+	public static function getIMOptions($im = null) {
 		$l10n = self::$l10n;
-		return array(
-				'ADR'   => $l10n->t('Address'),
-				'TEL'   => $l10n->t('Telephone'),
-				'EMAIL' => $l10n->t('Email'),
-				'ORG'   => $l10n->t('Organization'),
-		     );
+		$ims = array(
+				'jabber' => array(
+					'displayname' => (string)$l10n->t('Jabber'),
+					'xname' => 'X-JABBER',
+					'protocol' => 'xmpp',
+				),
+				'aim' => array(
+					'displayname' => (string)$l10n->t('AIM'),
+					'xname' => 'X-AIM',
+					'protocol' => 'aim',
+				),
+				'msn' => array(
+					'displayname' => (string)$l10n->t('MSN'),
+					'xname' => 'X-MSN',
+					'protocol' => 'msn',
+				),
+				'twitter' => array(
+					'displayname' => (string)$l10n->t('Twitter'),
+					'xname' => 'X-TWITTER',
+					'protocol' => null,
+				),
+				'googletalk' => array(
+					'displayname' => (string)$l10n->t('GoogleTalk'),
+					'xname' => null,
+					'protocol' => 'xmpp',
+				),
+				'facebook' => array(
+					'displayname' => (string)$l10n->t('Facebook'),
+					'xname' => null,
+					'protocol' => 'xmpp',
+				),
+				'xmpp' => array(
+					'displayname' => (string)$l10n->t('XMPP'),
+					'xname' => null,
+					'protocol' => 'xmpp',
+				),
+				'icq' => array(
+					'displayname' => (string)$l10n->t('ICQ'),
+					'xname' => 'X-ICQ',
+					'protocol' => 'icq',
+				),
+				'yahoo' => array(
+					'displayname' => (string)$l10n->t('Yahoo'),
+					'xname' => 'X-YAHOO',
+					'protocol' => 'ymsgr',
+				),
+				'skype' => array(
+					'displayname' => (string)$l10n->t('Skype'),
+					'xname' => 'X-SKYPE',
+					'protocol' => 'skype',
+				),
+				'qq' => array(
+					'displayname' => (string)$l10n->t('QQ'),
+					'xname' => 'X-SKYPE',
+					'protocol' => 'x-apple',
+				),
+				'gadugadu' => array(
+					'displayname' => (string)$l10n->t('GaduGadu'),
+					'xname' => 'X-SKYPE',
+					'protocol' => 'x-apple',
+				),
+		);
+		if(is_null($im)) {
+			return $ims;
+		} else {
+			$ims['ymsgr'] = $ims['yahoo'];
+			$ims['gtalk'] = $ims['googletalk'];
+			return isset($ims[$im]) ? $ims[$im] : null;
+		}
 	}
 
 	/**
@@ -126,6 +189,7 @@ class OC_Contacts_App {
 		$l = self::$l10n;
 		switch($prop) {
 			case 'ADR':
+			case 'IMPP':
 				return array(
 					'WORK' => $l->t('Work'),
 					'HOME' => $l->t('Home'),
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 5bc3d04b46..a349449a99 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -559,20 +559,36 @@ class OC_Contacts_VCard{
 	 */
 	public static function structureContact($object) {
 		$details = array();
-		foreach($object->children as $property){
+
+		$addIM = function($name, $temp, &$details) {
+			if(!array_key_exists('IMPP', $details)) {
+				$details['IMPP'] = array();
+			}
+
+			foreach($details['IMPP'] as $im) {
+				if(strtolower($im['value']) == strtolower($temp['value']) && $im['name'] == $name) {
+					return;
+				}
+			}
+			$details['IMPP'][] = $temp;
+		};
+
+		foreach($object->children as $property) {
+			$pname = $property->name;
 			$temp = self::structureProperty($property);
 			if(!is_null($temp)) {
+				// Get Apple X-ABLabels
 				if(isset($object->{$property->group . '.X-ABLABEL'})) {
 					$temp['label'] = $object->{$property->group . '.X-ABLABEL'}->value;
 					if($temp['label'] == '_$!<Other>!$_') {
 						$temp['label'] = OC_Contacts_App::$l10n->t('Other');
 					}
 				}
-				if(array_key_exists($property->name, $details)) {
-					$details[$property->name][] = $temp;
+				if(array_key_exists($pname, $details)) {
+					$details[$pname][] = $temp;
 				}
 				else{
-					$details[$property->name] = array($temp);
+					$details[$pname] = array($temp);
 				}
 			}
 		}
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 491b4400ff..87ed07c0ec 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -71,7 +71,8 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<ul id="phonelist" class="propertylist">
 			<li class="template hidden" data-element="TEL">
 			<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
-			<input type="text" required="required" class="nonempty contacts_property" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+			<input type="text" required="required" class="nonempty contacts_property" name="value" value=""
+					placeholder="<?php echo $l->t('Enter phone number'); ?>" />
 			<select multiple="multiple" name="parameters[TYPE][]">
 				<?php echo OCP\html_select_options($_['phone_types'], array()) ?>
 			</select>
@@ -79,6 +80,28 @@ $id = isset($_['id']) ? $_['id'] : '';
 		</ul>
 	</div> <!-- Phone numbers -->
 
+	<!-- IMPP -->
+	<div id="ims" class="hidden contactsection">
+		<ul id="imlist" class="propertylist">
+			<li class="template hidden" data-element="IMPP">
+			<div class="select_wrapper">
+			<select class="impp" name="parameters[X-SERVICE-TYPE]">
+				<?php echo OCP\html_select_options($_['im_protocols'], array()) ?>
+			</select>
+			</div>
+			<div class="select_wrapper">
+			<select class="types" name="parameters[TYPE][]">
+				<option></option>
+				<?php echo OCP\html_select_options($_['impp_types'], array()) ?>
+			</select>
+			</div>
+			<input type="checkbox" class="contacts_property impp tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+			<input type="text" required="required" class="nonempty contacts_property" name="value" value=""
+					placeholder="<?php echo $l->t('Instant Messenger'); ?>" />
+			<a role="button" class="action delete" title="<?php echo $l->t('Delete IM'); ?>"></a></li>
+		</ul>
+	</div> <!-- IMPP -->
+
 	<!-- Addresses -->
 	<div id="addresses" class="hidden contactsection">
 		<dl class="addresscard template hidden" data-element="ADR"><dt>
@@ -105,6 +128,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 			<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
 			<li><a role="menuitem" data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
 			<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
+			<li><a role="menuitem" data-type="IMPP"><?php echo $l->t('Instant Messaging'); ?></a></li>
 			<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
 			<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
 			<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>

From 24a207a8facea698ec445beaf9271419145e152b Mon Sep 17 00:00:00 2001
From: Juan Carlos Cornejo <jc2@paintblack.com>
Date: Wed, 22 Aug 2012 16:56:00 -0400
Subject: [PATCH 1516/1537] Fixes a bug where if one tries to delete a file,
 then clicks undo, and then tries to delete the file again, no questions or
 undo options were presented.

Essentially, just set FileLists.lastAction = null when one clicks undo.
---
 apps/files/js/filelist.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 6ba3f3555e..d93781c47f 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -298,6 +298,7 @@ $(document).ready(function(){
 			});
 			FileList.deleteCanceled=true;
 			FileList.deleteFiles=null;
+			FileList.lastAction = null;
 		} else if (FileList.replaceOldName && FileList.replaceNewName) {
 			$('tr').filterAttr('data-file', FileList.replaceOldName).show();
 			FileList.replaceCanceled = true;

From 0944b4455bd779d432cd0d61f8f55e00f6d34b7a Mon Sep 17 00:00:00 2001
From: Juan Carlos Cornejo <jc2@paintblack.com>
Date: Wed, 22 Aug 2012 17:08:10 -0400
Subject: [PATCH 1517/1537] Moves the lastAction=null outside the if so it can
 include the undo requests from replace

---
 apps/files/js/filelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index d93781c47f..e0cf516411 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -298,13 +298,13 @@ $(document).ready(function(){
 			});
 			FileList.deleteCanceled=true;
 			FileList.deleteFiles=null;
-			FileList.lastAction = null;
 		} else if (FileList.replaceOldName && FileList.replaceNewName) {
 			$('tr').filterAttr('data-file', FileList.replaceOldName).show();
 			FileList.replaceCanceled = true;
 			FileList.replaceOldName = null;
 			FileList.replaceNewName = null;
 		}
+		FileList.lastAction = null;
 		$('#notification').fadeOut();
 	});
 	$('#notification .replace').live('click', function() {

From 1df596e758dcb6c17474ce2b0856def05763d510 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 00:39:20 +0200
Subject: [PATCH 1518/1537] CSS fix for Windows.

---
 apps/contacts/css/contacts.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index ef48d020d0..248a6d0163 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -126,8 +126,8 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .propertylist li > .select_wrapper select { float: left; overflow: hidden; color: #bbb; }
 .propertylist li > .select_wrapper select option { color: #777; }
 .propertylist li > .select_wrapper select:hover,.propertylist li > select:focus,.propertylist li > select:active { color: #777; }
-.propertylist li > .select_wrapper select.impp { margin-left: -2.3em; direction: rtl; }
-.propertylist li > .select_wrapper select.types { margin-right: -2em; }
+.propertylist li > .select_wrapper select.impp { margin-left: -23px; direction: rtl; }
+.propertylist li > .select_wrapper select.types { margin-right: -23px; }
 .propertylist li > input[type="checkbox"].impp { clear: none; }
 .propertylist li > label.xab { display: block; color: #bbb; float:left; clear: both; padding: 0.5em 0 0 2.5em; }
 .propertylist li > label.xab:hover { color: #777; }

From 99d17c5190435b2d60ce4316a1a8a7cfdebc212e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 01:18:59 +0200
Subject: [PATCH 1519/1537] Don't add empty property parameters.

---
 apps/contacts/ajax/contact/addproperty.php  |  6 +++++-
 apps/contacts/ajax/contact/saveproperty.php | 22 ++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
index 0447950fbd..89f7a2bd9a 100644
--- a/apps/contacts/ajax/contact/addproperty.php
+++ b/apps/contacts/ajax/contact/addproperty.php
@@ -141,11 +141,15 @@ foreach ($parameters as $key=>$element) {
 		// And it probably shouldn't be done here anyways :-/
 		foreach($element as $e) {
 			if($e != '' && !is_null($e)) {
-				$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
+				if(trim($e)) {
+					$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
+				}
 			}
 		}
 	} else {
+		if(trim($element)) {
 			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $element);
+		}
 	}
 }
 $checksum = md5($vcard->children[$line]->serialize());
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
index 9556c4a44c..296b9ad3b7 100644
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ b/apps/contacts/ajax/contact/saveproperty.php
@@ -133,17 +133,21 @@ if(!$value) {
 					debug('Adding parameter: '.$key);
 					if(is_array($parameter)) {
 						foreach($parameter as $val) {
-							debug('Adding parameter: '.$key.'=>'.$val);
-							$vcard->children[$line]->add(new Sabre_VObject_Parameter(
-								$key,
-								strtoupper(strip_tags($val)))
-							);
+							if(trim($val)) {
+								debug('Adding parameter: '.$key.'=>'.$val);
+								$vcard->children[$line]->add(new Sabre_VObject_Parameter(
+									$key,
+									strtoupper(strip_tags($val)))
+								);
+							}
 						}
 					} else {
-						$vcard->children[$line]->add(new Sabre_VObject_Parameter(
-							$key,
-							strtoupper(strip_tags($parameter)))
-						);
+						if(trim($parameter)) {
+							$vcard->children[$line]->add(new Sabre_VObject_Parameter(
+								$key,
+								strtoupper(strip_tags($parameter)))
+							);
+						}
 					}
 				}
 			}

From 082ed4ab71bb0e97ed7a0b062d9fc124d040df6b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 23 Aug 2012 02:07:35 +0200
Subject: [PATCH 1520/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/lt_LT.php |  14 +
 apps/admin_migrate/l10n/lt_LT.php          |   5 +
 apps/bookmarks/l10n/lt_LT.php              |   3 +
 apps/contacts/l10n/ar.php                  |   7 +-
 apps/contacts/l10n/ca.php                  |  10 +-
 apps/contacts/l10n/cs_CZ.php               |   9 +-
 apps/contacts/l10n/da.php                  |   7 +-
 apps/contacts/l10n/de.php                  |   7 +-
 apps/contacts/l10n/el.php                  |   9 +-
 apps/contacts/l10n/eo.php                  |   9 +-
 apps/contacts/l10n/es.php                  |   9 +-
 apps/contacts/l10n/et_EE.php               |   7 +-
 apps/contacts/l10n/eu.php                  |   9 +-
 apps/contacts/l10n/fa.php                  |   7 +-
 apps/contacts/l10n/fi_FI.php               |   7 +-
 apps/contacts/l10n/fr.php                  |   9 +-
 apps/contacts/l10n/gl.php                  |   7 +-
 apps/contacts/l10n/he.php                  |   7 +-
 apps/contacts/l10n/hr.php                  |   7 +-
 apps/contacts/l10n/hu_HU.php               |   7 +-
 apps/contacts/l10n/ia.php                  |   7 +-
 apps/contacts/l10n/it.php                  |   7 +-
 apps/contacts/l10n/ja_JP.php               |   7 +-
 apps/contacts/l10n/ko.php                  |   7 +-
 apps/contacts/l10n/lb.php                  |   7 +-
 apps/contacts/l10n/lt_LT.php               |   7 +-
 apps/contacts/l10n/mk.php                  |   7 +-
 apps/contacts/l10n/ms_MY.php               |   9 +-
 apps/contacts/l10n/nb_NO.php               |   7 +-
 apps/contacts/l10n/nl.php                  |   7 +-
 apps/contacts/l10n/nn_NO.php               |   7 +-
 apps/contacts/l10n/pl.php                  |  10 +-
 apps/contacts/l10n/pt_BR.php               |   7 +-
 apps/contacts/l10n/pt_PT.php               |   7 +-
 apps/contacts/l10n/ro.php                  |   7 +-
 apps/contacts/l10n/ru.php                  |   7 +-
 apps/contacts/l10n/sk_SK.php               |   9 +-
 apps/contacts/l10n/sl.php                  |   7 +-
 apps/contacts/l10n/sr.php                  |   7 +-
 apps/contacts/l10n/sr@latin.php            |   7 +-
 apps/contacts/l10n/sv.php                  |  21 +-
 apps/contacts/l10n/th_TH.php               |  10 +-
 apps/contacts/l10n/tr.php                  |   9 +-
 apps/contacts/l10n/uk.php                  |   7 +-
 apps/contacts/l10n/vi.php                  |   7 +-
 apps/contacts/l10n/zh_CN.php               |   7 +-
 apps/contacts/l10n/zh_TW.php               |   7 +-
 apps/files_encryption/l10n/es.php          |   3 +
 apps/files_encryption/l10n/lt_LT.php       |   6 +
 apps/files_external/l10n/lt_LT.php         |   9 +
 apps/files_sharing/l10n/ca.php             |  13 +-
 apps/files_sharing/l10n/cs_CZ.php          |  10 +-
 apps/files_sharing/l10n/de.php             |  10 +-
 apps/files_sharing/l10n/eo.php             |  10 +-
 apps/files_sharing/l10n/et_EE.php          |  10 +-
 apps/files_sharing/l10n/fi_FI.php          |   8 +-
 apps/files_sharing/l10n/fr.php             |  10 +-
 apps/files_sharing/l10n/it.php             |  10 +-
 apps/files_sharing/l10n/ja_JP.php          |  10 +-
 apps/files_sharing/l10n/lt_LT.php          |   6 +
 apps/files_sharing/l10n/pl.php             |  13 +-
 apps/files_sharing/l10n/sl.php             |  10 +-
 apps/files_sharing/l10n/sv.php             |  10 +-
 apps/files_sharing/l10n/th_TH.php          |  13 +-
 apps/files_versions/l10n/lt_LT.php         |   4 +
 apps/tasks/l10n/lt_LT.php                  |  10 +
 apps/user_ldap/l10n/de.php                 |   9 +
 apps/user_ldap/l10n/it.php                 |   8 +-
 apps/user_ldap/l10n/lt_LT.php              |   9 +
 apps/user_ldap/l10n/th_TH.php              |   1 +
 apps/user_migrate/l10n/lt_LT.php           |  10 +
 apps/user_openid/l10n/it.php               |   2 +-
 l10n/af/contacts.po                        | 306 +++++++++++-------
 l10n/af/files_sharing.po                   |  38 +--
 l10n/ar/contacts.po                        | 318 +++++++++++--------
 l10n/ar/files_sharing.po                   |  38 +--
 l10n/ar_SA/contacts.po                     | 306 +++++++++++-------
 l10n/ar_SA/files_sharing.po                |  38 +--
 l10n/bg_BG/contacts.po                     | 306 +++++++++++-------
 l10n/bg_BG/files_sharing.po                |  38 +--
 l10n/ca/contacts.po                        | 350 ++++++++++++---------
 l10n/ca/files_sharing.po                   |  44 +--
 l10n/cs_CZ/contacts.po                     | 348 +++++++++++---------
 l10n/cs_CZ/files_sharing.po                |  38 +--
 l10n/da/contacts.po                        | 348 +++++++++++---------
 l10n/da/files_sharing.po                   |  38 +--
 l10n/de/contacts.po                        | 242 ++++++++------
 l10n/de/files_sharing.po                   |  38 +--
 l10n/de/user_ldap.po                       |  25 +-
 l10n/el/contacts.po                        | 348 +++++++++++---------
 l10n/el/files_sharing.po                   |  38 +--
 l10n/eo/contacts.po                        | 348 +++++++++++---------
 l10n/eo/files_sharing.po                   |  38 +--
 l10n/es/contacts.po                        | 348 +++++++++++---------
 l10n/es/files_encryption.po                |   9 +-
 l10n/es/files_sharing.po                   |  38 +--
 l10n/es/settings.po                        |   8 +-
 l10n/et_EE/contacts.po                     | 348 +++++++++++---------
 l10n/et_EE/files_sharing.po                |  38 +--
 l10n/eu/contacts.po                        | 348 +++++++++++---------
 l10n/eu/files_sharing.po                   |  38 +--
 l10n/eu_ES/contacts.po                     | 306 +++++++++++-------
 l10n/eu_ES/files_sharing.po                |  38 +--
 l10n/fa/contacts.po                        | 348 +++++++++++---------
 l10n/fa/files_sharing.po                   |  38 +--
 l10n/fi/contacts.po                        | 306 +++++++++++-------
 l10n/fi/files_sharing.po                   |  38 +--
 l10n/fi_FI/contacts.po                     | 242 ++++++++------
 l10n/fi_FI/files_sharing.po                |  38 +--
 l10n/fr/contacts.po                        | 348 +++++++++++---------
 l10n/fr/files_sharing.po                   |  40 +--
 l10n/gl/contacts.po                        | 348 +++++++++++---------
 l10n/gl/files_sharing.po                   |  38 +--
 l10n/he/contacts.po                        | 348 +++++++++++---------
 l10n/he/files_sharing.po                   |  38 +--
 l10n/hr/contacts.po                        | 348 +++++++++++---------
 l10n/hr/files_sharing.po                   |  38 +--
 l10n/hu_HU/contacts.po                     | 348 +++++++++++---------
 l10n/hu_HU/files_sharing.po                |  38 +--
 l10n/hy/contacts.po                        | 306 +++++++++++-------
 l10n/hy/files_sharing.po                   |  38 +--
 l10n/ia/contacts.po                        | 348 +++++++++++---------
 l10n/ia/files_sharing.po                   |  38 +--
 l10n/id/contacts.po                        | 306 +++++++++++-------
 l10n/id/files_sharing.po                   |  38 +--
 l10n/id_ID/contacts.po                     | 306 +++++++++++-------
 l10n/id_ID/files_sharing.po                |  38 +--
 l10n/it/contacts.po                        | 242 ++++++++------
 l10n/it/files_sharing.po                   |  40 +--
 l10n/it/settings.po                        |   6 +-
 l10n/it/user_ldap.po                       |  14 +-
 l10n/it/user_openid.po                     |   6 +-
 l10n/ja_JP/contacts.po                     | 242 ++++++++------
 l10n/ja_JP/files_sharing.po                |  40 +--
 l10n/ko/contacts.po                        | 348 +++++++++++---------
 l10n/ko/files_sharing.po                   |  38 +--
 l10n/lb/contacts.po                        | 348 +++++++++++---------
 l10n/lb/files_sharing.po                   |  38 +--
 l10n/lt_LT/admin_dependencies_chk.po       |  31 +-
 l10n/lt_LT/admin_migrate.po                |  13 +-
 l10n/lt_LT/bookmarks.po                    |   9 +-
 l10n/lt_LT/contacts.po                     | 348 +++++++++++---------
 l10n/lt_LT/files_encryption.po             |  15 +-
 l10n/lt_LT/files_external.po               |  21 +-
 l10n/lt_LT/files_sharing.po                |  47 +--
 l10n/lt_LT/files_versions.po               |  11 +-
 l10n/lt_LT/lib.po                          |  65 ++--
 l10n/lt_LT/tasks.po                        |  23 +-
 l10n/lt_LT/user_ldap.po                    |  21 +-
 l10n/lt_LT/user_migrate.po                 |  23 +-
 l10n/lv/contacts.po                        | 306 +++++++++++-------
 l10n/lv/files_sharing.po                   |  38 +--
 l10n/mk/contacts.po                        | 348 +++++++++++---------
 l10n/mk/files_sharing.po                   |  38 +--
 l10n/ms_MY/contacts.po                     | 348 +++++++++++---------
 l10n/ms_MY/files_sharing.po                |  38 +--
 l10n/nb_NO/contacts.po                     | 348 +++++++++++---------
 l10n/nb_NO/files_sharing.po                |  38 +--
 l10n/nl/contacts.po                        | 348 +++++++++++---------
 l10n/nl/files_sharing.po                   |  38 +--
 l10n/nn_NO/contacts.po                     | 318 +++++++++++--------
 l10n/nn_NO/files_sharing.po                |  38 +--
 l10n/pl/contacts.po                        | 350 ++++++++++++---------
 l10n/pl/files_sharing.po                   |  44 +--
 l10n/pt_BR/contacts.po                     | 348 +++++++++++---------
 l10n/pt_BR/files_sharing.po                |  38 +--
 l10n/pt_PT/contacts.po                     | 348 +++++++++++---------
 l10n/pt_PT/files_sharing.po                |  38 +--
 l10n/ro/contacts.po                        | 348 +++++++++++---------
 l10n/ro/files_sharing.po                   |  38 +--
 l10n/ru/contacts.po                        | 348 +++++++++++---------
 l10n/ru/files_sharing.po                   |  38 +--
 l10n/sk_SK/contacts.po                     | 348 +++++++++++---------
 l10n/sk_SK/files_sharing.po                |  38 +--
 l10n/sl/contacts.po                        | 242 ++++++++------
 l10n/sl/files_sharing.po                   |  40 +--
 l10n/so/contacts.po                        | 306 +++++++++++-------
 l10n/so/files_sharing.po                   |  38 +--
 l10n/sr/contacts.po                        | 318 +++++++++++--------
 l10n/sr/files_sharing.po                   |  38 +--
 l10n/sr@latin/contacts.po                  | 318 +++++++++++--------
 l10n/sr@latin/files_sharing.po             |  38 +--
 l10n/sv/contacts.po                        | 266 ++++++++++------
 l10n/sv/files_sharing.po                   |  40 +--
 l10n/sv/settings.po                        |   6 +-
 l10n/templates/admin_dependencies_chk.pot  |   2 +-
 l10n/templates/admin_migrate.pot           |   2 +-
 l10n/templates/bookmarks.pot               |   2 +-
 l10n/templates/calendar.pot                |   2 +-
 l10n/templates/contacts.pot                | 316 +++++++++++--------
 l10n/templates/core.pot                    |   2 +-
 l10n/templates/files.pot                   |   2 +-
 l10n/templates/files_encryption.pot        |   2 +-
 l10n/templates/files_external.pot          |   2 +-
 l10n/templates/files_sharing.pot           |  36 +--
 l10n/templates/files_versions.pot          |   2 +-
 l10n/templates/gallery.pot                 |   2 +-
 l10n/templates/lib.pot                     |   2 +-
 l10n/templates/media.pot                   |   2 +-
 l10n/templates/settings.pot                |   2 +-
 l10n/templates/tasks.pot                   |   2 +-
 l10n/templates/user_ldap.pot               |   2 +-
 l10n/templates/user_migrate.pot            |   2 +-
 l10n/templates/user_openid.pot             |   2 +-
 l10n/th_TH/contacts.po                     | 350 ++++++++++++---------
 l10n/th_TH/files_sharing.po                |  44 +--
 l10n/th_TH/user_ldap.po                    |   6 +-
 l10n/tr/contacts.po                        | 348 +++++++++++---------
 l10n/tr/files_sharing.po                   |  38 +--
 l10n/uk/contacts.po                        | 314 ++++++++++--------
 l10n/uk/files_sharing.po                   |  38 +--
 l10n/vi/contacts.po                        | 318 +++++++++++--------
 l10n/vi/files_sharing.po                   |  38 +--
 l10n/zh_CN.GB2312/contacts.po              | 306 +++++++++++-------
 l10n/zh_CN.GB2312/files_sharing.po         |  38 +--
 l10n/zh_CN/contacts.po                     | 348 +++++++++++---------
 l10n/zh_CN/files_sharing.po                |  38 +--
 l10n/zh_TW/contacts.po                     | 348 +++++++++++---------
 l10n/zh_TW/files_sharing.po                |  38 +--
 lib/l10n/lt_LT.php                         |  21 ++
 settings/l10n/es.php                       |   1 +
 settings/l10n/it.php                       |   2 +-
 settings/l10n/sv.php                       |   2 +-
 223 files changed, 11614 insertions(+), 9710 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/lt_LT.php
 create mode 100644 apps/admin_migrate/l10n/lt_LT.php
 create mode 100644 apps/bookmarks/l10n/lt_LT.php
 create mode 100644 apps/files_encryption/l10n/es.php
 create mode 100644 apps/files_encryption/l10n/lt_LT.php
 create mode 100644 apps/files_external/l10n/lt_LT.php
 create mode 100644 apps/files_sharing/l10n/lt_LT.php
 create mode 100644 apps/files_versions/l10n/lt_LT.php
 create mode 100644 apps/tasks/l10n/lt_LT.php
 create mode 100644 apps/user_ldap/l10n/lt_LT.php
 create mode 100644 apps/user_migrate/l10n/lt_LT.php
 create mode 100644 lib/l10n/lt_LT.php

diff --git a/apps/admin_dependencies_chk/l10n/lt_LT.php b/apps/admin_dependencies_chk/l10n/lt_LT.php
new file mode 100644
index 0000000000..4fed2ab93d
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/lt_LT.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Php-json modulis yra reikalingas duomenų keitimuisi tarp programų",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Php-curl modulis automatiškai nuskaito tinklapio pavadinimą kuomet išsaugoma žymelė.",
+"The php-gd module is needed to create thumbnails of your images" => "Php-gd modulis yra naudojamas paveikslėlių miniatiūroms kurti.",
+"The php-ldap module is needed connect to your ldap server" => "Php-ldap modulis yra reikalingas prisijungimui prie jūsų ldap serverio",
+"The php-zip module is needed download multiple files at once" => "Php-zip modulis yra reikalingas kelių failų atsiuntimui iš karto.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Php-mb_multibyte modulis yra naudojamas apdoroti įvairius teksto kodavimo formatus.",
+"The php-ctype module is needed validate data." => "Php-ctype modulis yra reikalingas duomenų tikrinimui.",
+"The php-xml module is needed to share files with webdav." => "Php-xml modulis yra reikalingas failų dalinimuisi naudojant webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "allow_url_fopen direktyva turėtų būti nustatyta į \"1\" jei norite automatiškai gauti žinių bazės informaciją iš OCS serverių.",
+"The php-pdo module is needed to store owncloud data into a database." => "Php-pdo modulis yra reikalingas duomenų saugojimui į owncloud duomenų bazę.",
+"Dependencies status" => "Priklausomybės",
+"Used by :" => "Naudojama:"
+);
diff --git a/apps/admin_migrate/l10n/lt_LT.php b/apps/admin_migrate/l10n/lt_LT.php
new file mode 100644
index 0000000000..f78263da75
--- /dev/null
+++ b/apps/admin_migrate/l10n/lt_LT.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Eksportuoti šią ownCloud instaliaciją",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Bus sukurtas archyvas su visais owncloud duomenimis ir failais.\n            Pasirinkite eksportavimo tipą:",
+"Export" => "Eksportuoti"
+);
diff --git a/apps/bookmarks/l10n/lt_LT.php b/apps/bookmarks/l10n/lt_LT.php
new file mode 100644
index 0000000000..58faddc233
--- /dev/null
+++ b/apps/bookmarks/l10n/lt_LT.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"unnamed" => "be pavadinimo"
+);
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index cd57b69a89..ace20d444c 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -10,10 +10,6 @@
 "Contacts" => "المعارف",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
-"Address" => "عنوان",
-"Telephone" => "الهاتف",
-"Email" => "البريد الالكتروني",
-"Organization" => "المؤسسة",
 "Work" => "الوظيفة",
 "Home" => "البيت",
 "Mobile" => "الهاتف المحمول",
@@ -26,9 +22,12 @@
 "Contact" => "معرفه",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
+"Organization" => "المؤسسة",
 "Delete" => "حذف",
 "Preferred" => "مفضل",
 "Phone" => "الهاتف",
+"Email" => "البريد الالكتروني",
+"Address" => "عنوان",
 "Download contact" => "انزال المعرفه",
 "Delete contact" => "امحي المعرفه",
 "Type" => "نوع",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 7abdc4114f..de10ec84e0 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -70,12 +70,9 @@
 "Addressbook not found: " => "No s'ha trobat la llibreta d'adreces: ",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
-"Address" => "Adreça",
-"Telephone" => "Telèfon",
-"Email" => "Correu electrònic",
-"Organization" => "Organització",
 "Work" => "Feina",
 "Home" => "Casa",
+"Other" => "Altres",
 "Mobile" => "Mòbil",
 "Text" => "Text",
 "Voice" => "Veu",
@@ -94,7 +91,6 @@
 "Journey" => "Viatge",
 "Jubilee" => "Aniversari",
 "Meeting" => "Reunió",
-"Other" => "Altres",
 "Personal" => "Personal",
 "Projects" => "Projectes",
 "Questions" => "Preguntes",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Selecciona una foto de ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma",
 "Edit name details" => "Edita detalls del nom",
+"Organization" => "Organització",
 "Delete" => "Suprimeix",
 "Nickname" => "Sobrenom",
 "Enter nickname" => "Escriviu el sobrenom",
@@ -146,6 +143,8 @@
 "Add notes here." => "Afegiu notes aquí.",
 "Add field" => "Afegeix un camp",
 "Phone" => "Telèfon",
+"Email" => "Correu electrònic",
+"Address" => "Adreça",
 "Note" => "Nota",
 "Download contact" => "Baixa el contacte",
 "Delete contact" => "Suprimeix el contacte",
@@ -200,6 +199,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Mostra l'enllaç CardDav",
 "Show read-only VCF link" => "Mostra l'enllaç VCF només de lectura",
+"Share" => "Comparteix",
 "Download" => "Baixa",
 "Edit" => "Edita",
 "New Address Book" => "Nova llibreta d'adreces",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 89f242d5c8..16c8a91b97 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -69,12 +69,9 @@
 "Addressbook not found: " => "Adresář nenalezen:",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
-"Address" => "Adresa",
-"Telephone" => "Telefon",
-"Email" => "Email",
-"Organization" => "Organizace",
 "Work" => "Pracovní",
 "Home" => "Domácí",
+"Other" => "Ostatní",
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Hlas",
@@ -93,7 +90,6 @@
 "Journey" => "Cestování",
 "Jubilee" => "Jubileum",
 "Meeting" => "Schůzka",
-"Other" => "Ostatní",
 "Personal" => "Osobní",
 "Projects" => "Projekty",
 "Questions" => "Dotazy",
@@ -123,6 +119,7 @@
 "Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami",
 "Edit name details" => "Upravit podrobnosti jména",
+"Organization" => "Organizace",
 "Delete" => "Odstranit",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
@@ -145,6 +142,8 @@
 "Add notes here." => "Zde můžete připsat poznámky.",
 "Add field" => "Přidat políčko",
 "Phone" => "Telefon",
+"Email" => "Email",
+"Address" => "Adresa",
 "Note" => "Poznámka",
 "Download contact" => "Stáhnout kontakt",
 "Delete contact" => "Odstranit kontakt",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 7d98c339f5..9c733b7db7 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -63,10 +63,6 @@
 " failed." => " fejl.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
-"Address" => "Adresse",
-"Telephone" => "Telefon",
-"Email" => "Email",
-"Organization" => "Organisation",
 "Work" => "Arbejde",
 "Home" => "Hjemme",
 "Mobile" => "Mobil",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "Vælg foto fra ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
 "Edit name details" => "Rediger navnedetaljer.",
+"Organization" => "Organisation",
 "Delete" => "Slet",
 "Nickname" => "Kaldenavn",
 "Enter nickname" => "Indtast kaldenavn",
@@ -110,6 +107,8 @@
 "Add notes here." => "Tilføj noter her.",
 "Add field" => "Tilføj element",
 "Phone" => "Telefon",
+"Email" => "Email",
+"Address" => "Adresse",
 "Note" => "Note",
 "Download contact" => "Download kontaktperson",
 "Delete contact" => "Slet kontaktperson",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index efc2fff7d2..347febeaf2 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -70,10 +70,6 @@
 "Addressbook not found: " => "Adressbuch nicht gefunden:",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
-"Address" => "Adresse",
-"Telephone" => "Telefon",
-"Email" => "E-Mail",
-"Organization" => "Organisation",
 "Work" => "Arbeit",
 "Home" => "Zuhause",
 "Other" => "Andere",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Foto aus der ownCloud auswählen",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
 "Edit name details" => "Name ändern",
+"Organization" => "Organisation",
 "Delete" => "Löschen",
 "Nickname" => "Spitzname",
 "Enter nickname" => "Spitzname angeben",
@@ -146,6 +143,8 @@
 "Add notes here." => "Füge hier Notizen ein.",
 "Add field" => "Feld hinzufügen",
 "Phone" => "Telefon",
+"Email" => "E-Mail",
+"Address" => "Adresse",
 "Note" => "Notiz",
 "Download contact" => "Kontakt herunterladen",
 "Delete contact" => "Kontakt löschen",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 8e1b0e61e6..f8ae330213 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -69,12 +69,9 @@
 "Addressbook not found: " => "Το βιβλίο διευθύνσεων δεν βρέθηκε:",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
-"Address" => "Διεύθυνση",
-"Telephone" => "Τηλέφωνο",
-"Email" => "Email",
-"Organization" => "Οργανισμός",
 "Work" => "Εργασία",
 "Home" => "Σπίτι",
+"Other" => "Άλλο",
 "Mobile" => "Κινητό",
 "Text" => "Κείμενο",
 "Voice" => "Ομιλία",
@@ -93,7 +90,6 @@
 "Journey" => "Ταξίδι",
 "Jubilee" => "Ιωβηλαίο",
 "Meeting" => "Συνάντηση",
-"Other" => "Άλλο",
 "Personal" => "Προσωπικό",
 "Projects" => "Έργα",
 "Questions" => "Ερωτήσεις",
@@ -123,6 +119,7 @@
 "Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα",
 "Edit name details" => "Αλλάξτε τις λεπτομέρειες ονόματος",
+"Organization" => "Οργανισμός",
 "Delete" => "Διαγραφή",
 "Nickname" => "Παρατσούκλι",
 "Enter nickname" => "Εισάγετε παρατσούκλι",
@@ -145,6 +142,8 @@
 "Add notes here." => "Πρόσθεσε τις σημειώσεις εδώ",
 "Add field" => "Προσθήκη πεδίου",
 "Phone" => "Τηλέφωνο",
+"Email" => "Email",
+"Address" => "Διεύθυνση",
 "Note" => "Σημείωση",
 "Download contact" => "Λήψη επαφής",
 "Delete contact" => "Διαγραφή επαφής",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index 9787b6e010..bcdd63be9e 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -65,12 +65,9 @@
 "Addressbook not found: " => "Adresaro ne troviĝis:",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
-"Address" => "Adreso",
-"Telephone" => "Telefono",
-"Email" => "Retpoŝtadreso",
-"Organization" => "Organizaĵo",
 "Work" => "Laboro",
 "Home" => "Hejmo",
+"Other" => "Alia",
 "Mobile" => "Poŝtelefono",
 "Text" => "Teksto",
 "Voice" => "Voĉo",
@@ -89,7 +86,6 @@
 "Journey" => "Vojaĝo",
 "Jubilee" => "Jubileo",
 "Meeting" => "Kunveno",
-"Other" => "Alia",
 "Personal" => "Persona",
 "Projects" => "Projektoj",
 "Questions" => "Demandoj",
@@ -118,6 +114,7 @@
 "Select photo from ownCloud" => "Elekti foton el ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo",
 "Edit name details" => "Redakti detalojn de nomo",
+"Organization" => "Organizaĵo",
 "Delete" => "Forigi",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
@@ -140,6 +137,8 @@
 "Add notes here." => "Aldoni notojn ĉi tie.",
 "Add field" => "Aldoni kampon",
 "Phone" => "Telefono",
+"Email" => "Retpoŝtadreso",
+"Address" => "Adreso",
 "Note" => "Noto",
 "Download contact" => "Elŝuti kontakton",
 "Delete contact" => "Forigi kontakton",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index ebc38dfb3e..a465f5c114 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -63,12 +63,9 @@
 " failed." => "Fallo.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
-"Address" => "Dirección",
-"Telephone" => "Teléfono",
-"Email" => "Correo electrónico",
-"Organization" => "Organización",
 "Work" => "Trabajo",
 "Home" => "Particular",
+"Other" => "Otro",
 "Mobile" => "Móvil",
 "Text" => "Texto",
 "Voice" => "Voz",
@@ -85,7 +82,6 @@
 "Ideas" => "Ideas",
 "Journey" => "Jornada",
 "Meeting" => "Reunión",
-"Other" => "Otro",
 "Personal" => "Personal",
 "Projects" => "Proyectos",
 "Questions" => "Preguntas",
@@ -111,6 +107,7 @@
 "Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma",
 "Edit name details" => "Editar los detalles del nombre",
+"Organization" => "Organización",
 "Delete" => "Borrar",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
@@ -131,6 +128,8 @@
 "Add notes here." => "Añade notas aquí.",
 "Add field" => "Añadir campo",
 "Phone" => "Teléfono",
+"Email" => "Correo electrónico",
+"Address" => "Dirección",
 "Note" => "Nota",
 "Download contact" => "Descargar contacto",
 "Delete contact" => "Eliminar contacto",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index c11ea6d838..a73d9b743f 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -60,10 +60,6 @@
 " failed." => " ebaõnnestus.",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
-"Address" => "Aadress",
-"Telephone" => "Telefon",
-"Email" => "E-post",
-"Organization" => "Organisatsioon",
 "Work" => "Töö",
 "Home" => "Kodu",
 "Mobile" => "Mobiil",
@@ -88,6 +84,7 @@
 "Select photo from ownCloud" => "Vali foto ownCloudist",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
 "Edit name details" => "Muuda nime üksikasju",
+"Organization" => "Organisatsioon",
 "Delete" => "Kustuta",
 "Nickname" => "Hüüdnimi",
 "Enter nickname" => "Sisesta hüüdnimi",
@@ -107,6 +104,8 @@
 "Add notes here." => "Lisa märkmed siia.",
 "Add field" => "Lisa väli",
 "Phone" => "Telefon",
+"Email" => "E-post",
+"Address" => "Aadress",
 "Note" => "Märkus",
 "Download contact" => "Lae kontakt alla",
 "Delete contact" => "Kustuta kontakt",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 7a0b2ce38b..2bce47c409 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -64,12 +64,9 @@
 " failed." => "huts egin du.",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
-"Address" => "Helbidea",
-"Telephone" => "Telefonoa",
-"Email" => "Eposta",
-"Organization" => "Erakundea",
 "Work" => "Lana",
 "Home" => "Etxea",
+"Other" => "Bestelakoa",
 "Mobile" => "Mugikorra",
 "Text" => "Testua",
 "Voice" => "Ahotsa",
@@ -85,7 +82,6 @@
 "Ideas" => "Ideiak",
 "Journey" => "Bidaia",
 "Meeting" => "Bilera",
-"Other" => "Bestelakoa",
 "Personal" => "Pertsonala",
 "Projects" => "Proiektuak",
 "Questions" => "Galderak",
@@ -112,6 +108,7 @@
 "Upload new photo" => "Igo argazki berria",
 "Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
 "Edit name details" => "Editatu izenaren zehaztasunak",
+"Organization" => "Erakundea",
 "Delete" => "Ezabatu",
 "Nickname" => "Ezizena",
 "Enter nickname" => "Sartu ezizena",
@@ -134,6 +131,8 @@
 "Add notes here." => "Gehitu oharrak hemen.",
 "Add field" => "Gehitu eremua",
 "Phone" => "Telefonoa",
+"Email" => "Eposta",
+"Address" => "Helbidea",
 "Note" => "Oharra",
 "Download contact" => "Deskargatu kontaktua",
 "Delete contact" => "Ezabatu kontaktua",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index c959979857..498bb3a2ea 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -63,10 +63,6 @@
 " failed." => "ناموفق",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
-"Address" => "نشانی",
-"Telephone" => "تلفن",
-"Email" => "نشانی پست الکترنیک",
-"Organization" => "نهاد(ارگان)",
 "Work" => "کار",
 "Home" => "خانه",
 "Mobile" => "موبایل",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "ویرایش نام جزئیات",
+"Organization" => "نهاد(ارگان)",
 "Delete" => "پاک کردن",
 "Nickname" => "نام مستعار",
 "Enter nickname" => "یک نام مستعار وارد کنید",
@@ -110,6 +107,8 @@
 "Add notes here." => "اینجا یادداشت ها را بیافزایید",
 "Add field" => "اضافه کردن فیلد",
 "Phone" => "شماره تلفن",
+"Email" => "نشانی پست الکترنیک",
+"Address" => "نشانی",
 "Note" => "یادداشت",
 "Download contact" => "دانلود مشخصات اشخاص",
 "Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index dcc6876195..ac6b103ea4 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -41,10 +41,6 @@
 "Addressbook not found: " => "Osoitekirjaa ei löytynyt:",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
-"Address" => "Osoite",
-"Telephone" => "Puhelin",
-"Email" => "Sähköposti",
-"Organization" => "Organisaatio",
 "Work" => "Työ",
 "Home" => "Koti",
 "Other" => "Muu",
@@ -81,6 +77,7 @@
 "Upload new photo" => "Lähetä uusi valokuva",
 "Select photo from ownCloud" => "Valitse valokuva ownCloudista",
 "Edit name details" => "Muokkaa nimitietoja",
+"Organization" => "Organisaatio",
 "Delete" => "Poista",
 "Nickname" => "Kutsumanimi",
 "Enter nickname" => "Anna kutsumanimi",
@@ -101,6 +98,8 @@
 "Add notes here." => "Lisää huomiot tähän.",
 "Add field" => "Lisää kenttä",
 "Phone" => "Puhelin",
+"Email" => "Sähköposti",
+"Address" => "Osoite",
 "Note" => "Huomio",
 "Download contact" => "Lataa yhteystieto",
 "Delete contact" => "Poista yhteystieto",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 9b30a9fcff..86647a5073 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -70,12 +70,9 @@
 "Addressbook not found: " => "Carnet d'adresse introuvable : ",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
-"Address" => "Adresse",
-"Telephone" => "Téléphone",
-"Email" => "E-mail",
-"Organization" => "Société",
 "Work" => "Travail",
 "Home" => "Maison",
+"Other" => "Autre",
 "Mobile" => "Mobile",
 "Text" => "Texte",
 "Voice" => "Voix",
@@ -94,7 +91,6 @@
 "Journey" => "Trajet",
 "Jubilee" => "Jubilé",
 "Meeting" => "Rendez-vous",
-"Other" => "Autre",
 "Personal" => "Personnel",
 "Projects" => "Projets",
 "Questions" => "Questions",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule",
 "Edit name details" => "Editer les noms",
+"Organization" => "Société",
 "Delete" => "Supprimer",
 "Nickname" => "Surnom",
 "Enter nickname" => "Entrer un surnom",
@@ -146,6 +143,8 @@
 "Add notes here." => "Ajouter des notes ici.",
 "Add field" => "Ajouter un champ.",
 "Phone" => "Téléphone",
+"Email" => "E-mail",
+"Address" => "Adresse",
 "Note" => "Note",
 "Download contact" => "Télécharger le contact",
 "Delete contact" => "Supprimer le contact",
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index 1b456fba01..aeebd81334 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -62,10 +62,6 @@
 " failed." => " fallou.",
 "This is not your addressbook." => "Esta non é a súa axenda.",
 "Contact could not be found." => "Non se atopou o contacto.",
-"Address" => "Enderezo",
-"Telephone" => "Teléfono",
-"Email" => "Correo electrónico",
-"Organization" => "Organización",
 "Work" => "Traballo",
 "Home" => "Casa",
 "Mobile" => "Móbil",
@@ -90,6 +86,7 @@
 "Select photo from ownCloud" => "Escoller foto desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma",
 "Edit name details" => "Editar detalles do nome",
+"Organization" => "Organización",
 "Delete" => "Eliminar",
 "Nickname" => "Apodo",
 "Enter nickname" => "Introuza apodo",
@@ -109,6 +106,8 @@
 "Add notes here." => "Engadir aquí as notas.",
 "Add field" => "Engadir campo",
 "Phone" => "Teléfono",
+"Email" => "Correo electrónico",
+"Address" => "Enderezo",
 "Note" => "Nota",
 "Download contact" => "Descargar contacto",
 "Delete contact" => "Borrar contacto",
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index be67fe8ae8..a296fa1306 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -43,10 +43,6 @@
 "Contacts" => "אנשי קשר",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
-"Address" => "כתובת",
-"Telephone" => "טלפון",
-"Email" => "דואר אלקטרוני",
-"Organization" => "ארגון",
 "Work" => "עבודה",
 "Home" => "בית",
 "Mobile" => "נייד",
@@ -69,6 +65,7 @@
 "Upload new photo" => "העלה תמונה חדשה",
 "Select photo from ownCloud" => "בחר תמונה מ ownCloud",
 "Edit name details" => "ערוך פרטי שם",
+"Organization" => "ארגון",
 "Delete" => "מחיקה",
 "Nickname" => "כינוי",
 "Enter nickname" => "הכנס כינוי",
@@ -88,6 +85,8 @@
 "Add notes here." => "הוסף הערות כאן.",
 "Add field" => "הוסף שדה",
 "Phone" => "טלפון",
+"Email" => "דואר אלקטרוני",
+"Address" => "כתובת",
 "Note" => "הערה",
 "Download contact" => "הורדת איש קשר",
 "Delete contact" => "מחיקת איש קשר",
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index d29283f767..4bb77ccb21 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -39,10 +39,6 @@
 "Contacts" => "Kontakti",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
-"Address" => "Adresa",
-"Telephone" => "Telefon",
-"Email" => "E-mail",
-"Organization" => "Organizacija",
 "Work" => "Posao",
 "Home" => "Kuća",
 "Mobile" => "Mobitel",
@@ -62,6 +58,7 @@
 "Drop photo to upload" => "Dovucite fotografiju za slanje",
 "Edit current photo" => "Uredi trenutnu sliku",
 "Edit name details" => "Uredi detalje imena",
+"Organization" => "Organizacija",
 "Delete" => "Obriši",
 "Nickname" => "Nadimak",
 "Enter nickname" => "Unesi nadimank",
@@ -76,6 +73,8 @@
 "Add notes here." => "Dodaj bilješke ovdje.",
 "Add field" => "Dodaj polje",
 "Phone" => "Telefon",
+"Email" => "E-mail",
+"Address" => "Adresa",
 "Note" => "Bilješka",
 "Download contact" => "Preuzmi kontakt",
 "Delete contact" => "Izbriši kontakt",
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index b3f831ea8a..ab9a28133d 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -63,10 +63,6 @@
 " failed." => "  sikertelen",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
-"Address" => "Cím",
-"Telephone" => "Telefonszám",
-"Email" => "E-mail",
-"Organization" => "Szervezet",
 "Work" => "Munkahelyi",
 "Home" => "Otthoni",
 "Mobile" => "Mobiltelefonszám",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
+"Organization" => "Szervezet",
 "Delete" => "Törlés",
 "Nickname" => "Becenév",
 "Enter nickname" => "Becenév megadása",
@@ -110,6 +107,8 @@
 "Add notes here." => "Megjegyzések",
 "Add field" => "Mező hozzáadása",
 "Phone" => "Telefonszám",
+"Email" => "E-mail",
+"Address" => "Cím",
 "Note" => "Jegyzet",
 "Download contact" => "Kapcsolat letöltése",
 "Delete contact" => "Kapcsolat törlése",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index b3f9db539a..338ceb7154 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -9,10 +9,6 @@
 "Contacts" => "Contactos",
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
-"Address" => "Adresse",
-"Telephone" => "Telephono",
-"Email" => "E-posta",
-"Organization" => "Organisation",
 "Work" => "Travalio",
 "Home" => "Domo",
 "Mobile" => "Mobile",
@@ -32,6 +28,7 @@
 "Edit current photo" => "Modificar photo currente",
 "Upload new photo" => "Incargar nove photo",
 "Select photo from ownCloud" => "Seliger photo ex ownCloud",
+"Organization" => "Organisation",
 "Delete" => "Deler",
 "Nickname" => "Pseudonymo",
 "Enter nickname" => "Inserer pseudonymo",
@@ -46,6 +43,8 @@
 "Add notes here." => "Adder notas hic",
 "Add field" => "Adder campo",
 "Phone" => "Phono",
+"Email" => "E-posta",
+"Address" => "Adresse",
 "Note" => "Nota",
 "Download contact" => "Discargar contacto",
 "Delete contact" => "Deler contacto",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 32120e4c14..ef856a1c5b 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -70,10 +70,6 @@
 "Addressbook not found: " => "Rubrica non trovata:",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
-"Address" => "Indirizzo",
-"Telephone" => "Telefono",
-"Email" => "Email",
-"Organization" => "Organizzazione",
 "Work" => "Lavoro",
 "Home" => "Casa",
 "Other" => "Altro",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Seleziona la foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola",
 "Edit name details" => "Modifica dettagli del nome",
+"Organization" => "Organizzazione",
 "Delete" => "Elimina",
 "Nickname" => "Pseudonimo",
 "Enter nickname" => "Inserisci pseudonimo",
@@ -146,6 +143,8 @@
 "Add notes here." => "Aggiungi qui le note.",
 "Add field" => "Aggiungi campo",
 "Phone" => "Telefono",
+"Email" => "Email",
+"Address" => "Indirizzo",
 "Note" => "Nota",
 "Download contact" => "Scarica contatto",
 "Delete contact" => "Elimina contatto",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 55756ef785..4569548bdc 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -70,10 +70,6 @@
 "Addressbook not found: " => "アドレス帳が見つかりません:",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
-"Address" => "住所",
-"Telephone" => "電話番号",
-"Email" => "メールアドレス",
-"Organization" => "所属",
 "Work" => "勤務先",
 "Home" => "住居",
 "Other" => "その他",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "ownCloudから写真を選択",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順",
 "Edit name details" => "名前の詳細を編集",
+"Organization" => "所属",
 "Delete" => "削除",
 "Nickname" => "ニックネーム",
 "Enter nickname" => "ニックネームを入力",
@@ -146,6 +143,8 @@
 "Add notes here." => "ここにメモを追加。",
 "Add field" => "項目を追加",
 "Phone" => "電話番号",
+"Email" => "メールアドレス",
+"Address" => "住所",
 "Note" => "メモ",
 "Download contact" => "連絡先のダウンロード",
 "Delete contact" => "連絡先の削除",
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index f060b419e0..6d6a642768 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -61,10 +61,6 @@
 " failed." => "실패.",
 "This is not your addressbook." => "내 주소록이 아닙니다.",
 "Contact could not be found." => "연락처를 찾을 수 없습니다.",
-"Address" => "주소",
-"Telephone" => "전화 번호",
-"Email" => "전자 우편",
-"Organization" => "조직",
 "Work" => "직장",
 "Home" => "자택",
 "Mobile" => "휴대폰",
@@ -89,6 +85,7 @@
 "Select photo from ownCloud" => "ownCloud에서 사진 선택",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "이름 세부사항을 편집합니다. ",
+"Organization" => "조직",
 "Delete" => "삭제",
 "Nickname" => "별명",
 "Enter nickname" => "별명 입력",
@@ -107,6 +104,8 @@
 "Add notes here." => "여기에 노트 추가.",
 "Add field" => "파일 추가",
 "Phone" => "전화 번호",
+"Email" => "전자 우편",
+"Address" => "주소",
 "Note" => "노트",
 "Download contact" => "연락처 다운로드",
 "Delete contact" => "연락처 삭제",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 90ff22f122..0589f226bc 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -28,10 +28,6 @@
 " imported, " => " importéiert, ",
 "This is not your addressbook." => "Dat do ass net däin Adressbuch.",
 "Contact could not be found." => "Konnt den Kontakt net fannen.",
-"Address" => "Adress",
-"Telephone" => "Telefon's Nummer",
-"Email" => "Email",
-"Organization" => "Firma",
 "Work" => "Aarbecht",
 "Home" => "Doheem",
 "Mobile" => "GSM",
@@ -48,6 +44,7 @@
 "Add Contact" => "Kontakt bäisetzen",
 "Addressbooks" => "Adressbicher ",
 "Close" => "Zoumaachen",
+"Organization" => "Firma",
 "Delete" => "Läschen",
 "Nickname" => "Spëtznumm",
 "Enter nickname" => "Gëff e Spëtznumm an",
@@ -59,6 +56,8 @@
 "View on map" => "Op da Kaart uweisen",
 "Edit address details" => "Adress Detailer editéieren",
 "Phone" => "Telefon",
+"Email" => "Email",
+"Address" => "Adress",
 "Note" => "Note",
 "Download contact" => "Kontakt eroflueden",
 "Delete contact" => "Kontakt läschen",
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index eece7fa67c..fd6ae2d246 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -15,10 +15,6 @@
 "Contacts" => "Kontaktai",
 "This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
 "Contact could not be found." => "Kontaktas nerastas",
-"Address" => "Adresas",
-"Telephone" => "Telefonas",
-"Email" => "El. paštas",
-"Organization" => "Organizacija",
 "Work" => "Darbo",
 "Home" => "Namų",
 "Mobile" => "Mobilusis",
@@ -33,9 +29,12 @@
 "Contact" => "Kontaktas",
 "Add Contact" => "Pridėti kontaktą",
 "Addressbooks" => "Adresų knygos",
+"Organization" => "Organizacija",
 "Delete" => "Trinti",
 "Nickname" => "Slapyvardis",
 "Phone" => "Telefonas",
+"Email" => "El. paštas",
+"Address" => "Adresas",
 "Download contact" => "Atsisųsti kontaktą",
 "Delete contact" => "Ištrinti kontaktą",
 "Type" => "Tipas",
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index bdc0e6681f..2a3be84c12 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -63,10 +63,6 @@
 " failed." => "неуспешно.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
-"Address" => "Адреса",
-"Telephone" => "Телефон",
-"Email" => "Е-пошта",
-"Organization" => "Организација",
 "Work" => "Работа",
 "Home" => "Дома",
 "Mobile" => "Мобилен",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "Изберете фотографија од ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка",
 "Edit name details" => "Уреди детали за име",
+"Organization" => "Организација",
 "Delete" => "Избриши",
 "Nickname" => "Прекар",
 "Enter nickname" => "Внеси прекар",
@@ -110,6 +107,8 @@
 "Add notes here." => "Внесете забелешки тука.",
 "Add field" => "Додади поле",
 "Phone" => "Телефон",
+"Email" => "Е-пошта",
+"Address" => "Адреса",
 "Note" => "Забелешка",
 "Download contact" => "Преземи го контактот",
 "Delete contact" => "Избриши го контактот",
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 8153c4d936..8bd7a39ce0 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -64,12 +64,9 @@
 "Addressbook not found: " => "Buku alamat tidak ditemui:",
 "This is not your addressbook." => "Ini bukan buku alamat anda.",
 "Contact could not be found." => "Hubungan tidak dapat ditemui",
-"Address" => "Alamat",
-"Telephone" => "Telefon",
-"Email" => "Emel",
-"Organization" => "Organisasi",
 "Work" => "Kerja",
 "Home" => "Rumah",
+"Other" => "Lain",
 "Mobile" => "Mudah alih",
 "Text" => "Teks",
 "Voice" => "Suara",
@@ -86,7 +83,6 @@
 "Journey" => "Perjalanan",
 "Jubilee" => "Jubli",
 "Meeting" => "Mesyuarat",
-"Other" => "Lain",
 "Personal" => "Peribadi",
 "Projects" => "Projek",
 "{name}'s Birthday" => "Hari Lahir {name}",
@@ -105,6 +101,7 @@
 "Select photo from ownCloud" => "Pilih foto dari ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma",
 "Edit name details" => "Ubah butiran nama",
+"Organization" => "Organisasi",
 "Delete" => "Padam",
 "Nickname" => "Nama Samaran",
 "Enter nickname" => "Masukkan nama samaran",
@@ -124,6 +121,8 @@
 "Add notes here." => "Letak nota disini.",
 "Add field" => "Letak ruangan",
 "Phone" => "Telefon",
+"Email" => "Emel",
+"Address" => "Alamat",
 "Note" => "Nota",
 "Download contact" => "Muat turun hubungan",
 "Delete contact" => "Padam hubungan",
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 4066d670e4..b7d8b05fbc 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -48,10 +48,6 @@
 " failed." => "feilet.",
 "This is not your addressbook." => "Dette er ikke dine adressebok.",
 "Contact could not be found." => "Kontakten ble ikke funnet.",
-"Address" => "Adresse",
-"Telephone" => "Telefon",
-"Email" => "E-post",
-"Organization" => "Organisasjon",
 "Work" => "Arbeid",
 "Home" => "Hjem",
 "Mobile" => "Mobil",
@@ -75,6 +71,7 @@
 "Upload new photo" => "Last opp nytt bilde",
 "Select photo from ownCloud" => "Velg bilde fra ownCloud",
 "Edit name details" => "Endre detaljer rundt navn",
+"Organization" => "Organisasjon",
 "Delete" => "Slett",
 "Nickname" => "Kallenavn",
 "Enter nickname" => "Skriv inn kallenavn",
@@ -94,6 +91,8 @@
 "Add notes here." => "Legg inn notater her.",
 "Add field" => "Legg til felt",
 "Phone" => "Telefon",
+"Email" => "E-post",
+"Address" => "Adresse",
 "Note" => "Notat",
 "Download contact" => "Hend ned kontakten",
 "Delete contact" => "Slett kontakt",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index 4a621eec25..b25a7f5b81 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -39,10 +39,6 @@
 "Contacts" => "Contacten",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
-"Address" => "Adres",
-"Telephone" => "Telefoon",
-"Email" => "E-mail",
-"Organization" => "Organisatie",
 "Work" => "Werk",
 "Home" => "Thuis",
 "Mobile" => "Mobiel",
@@ -66,6 +62,7 @@
 "Select photo from ownCloud" => "Selecteer foto uit ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma",
 "Edit name details" => "Wijzig naam gegevens",
+"Organization" => "Organisatie",
 "Delete" => "Verwijderen",
 "Nickname" => "Roepnaam",
 "Enter nickname" => "Voer roepnaam in",
@@ -85,6 +82,8 @@
 "Add notes here." => "Voeg notitie toe",
 "Add field" => "Voeg veld toe",
 "Phone" => "Telefoon",
+"Email" => "E-mail",
+"Address" => "Adres",
 "Note" => "Notitie",
 "Download contact" => "Download contact",
 "Delete contact" => "Verwijder contact",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 0a4778283e..c8a85c2c4c 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -10,10 +10,6 @@
 "Contacts" => "Kotaktar",
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
 "Contact could not be found." => "Fann ikkje kontakten.",
-"Address" => "Adresse",
-"Telephone" => "Telefonnummer",
-"Email" => "Epost",
-"Organization" => "Organisasjon",
 "Work" => "Arbeid",
 "Home" => "Heime",
 "Mobile" => "Mobil",
@@ -26,9 +22,12 @@
 "Contact" => "Kontakt",
 "Add Contact" => "Legg til kontakt",
 "Addressbooks" => "Adressebøker",
+"Organization" => "Organisasjon",
 "Delete" => "Slett",
 "Preferred" => "Føretrekt",
 "Phone" => "Telefonnummer",
+"Email" => "Epost",
+"Address" => "Adresse",
 "Download contact" => "Last ned kontakt",
 "Delete contact" => "Slett kontakt",
 "Type" => "Skriv",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 404687b4fa..0016b313cb 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -70,12 +70,9 @@
 "Addressbook not found: " => "Nie znaleziono książki adresowej:",
 "This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
-"Address" => "Adres",
-"Telephone" => "Telefon",
-"Email" => "E-mail",
-"Organization" => "Organizacja",
 "Work" => "Praca",
 "Home" => "Dom",
+"Other" => "Inne",
 "Mobile" => "Komórka",
 "Text" => "Połączenie tekstowe",
 "Voice" => "Połączenie głosowe",
@@ -94,7 +91,6 @@
 "Journey" => "Podróż",
 "Jubilee" => "Jubileusz",
 "Meeting" => "Spotkanie",
-"Other" => "Inne",
 "Personal" => "Osobiste",
 "Projects" => "Projekty",
 "Questions" => "Pytania",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
 "Edit name details" => "Edytuj szczegóły nazwy",
+"Organization" => "Organizacja",
 "Delete" => "Usuwa książkę adresową",
 "Nickname" => "Nazwa",
 "Enter nickname" => "Wpisz nazwę",
@@ -146,6 +143,8 @@
 "Add notes here." => "Dodaj notatkę tutaj.",
 "Add field" => "Dodaj pole",
 "Phone" => "Telefon",
+"Email" => "E-mail",
+"Address" => "Adres",
 "Note" => "Uwaga",
 "Download contact" => "Pobiera kontakt",
 "Delete contact" => "Usuwa kontakt",
@@ -200,6 +199,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Pokaż link CardDAV",
 "Show read-only VCF link" => "Pokaż tylko do odczytu łącze VCF",
+"Share" => "Udostępnij",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
 "New Address Book" => "Nowa książka adresowa",
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 74b8650c6c..1349b43c02 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -63,10 +63,6 @@
 " failed." => "falhou.",
 "This is not your addressbook." => "Esta não é a sua agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
-"Address" => "Endereço",
-"Telephone" => "Telefone",
-"Email" => "E-mail",
-"Organization" => "Organização",
 "Work" => "Trabalho",
 "Home" => "Home",
 "Mobile" => "Móvel",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "Selecionar foto do OwnCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
 "Edit name details" => "Editar detalhes do nome",
+"Organization" => "Organização",
 "Delete" => "Excluir",
 "Nickname" => "Apelido",
 "Enter nickname" => "Digite o apelido",
@@ -110,6 +107,8 @@
 "Add notes here." => "Adicionar notas",
 "Add field" => "Adicionar campo",
 "Phone" => "Telefone",
+"Email" => "E-mail",
+"Address" => "Endereço",
 "Note" => "Nota",
 "Download contact" => "Baixar contato",
 "Delete contact" => "Apagar contato",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 269e63583f..eccddd8202 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -63,10 +63,6 @@
 " failed." => " falhou.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
-"Address" => "Morada",
-"Telephone" => "Telefone",
-"Email" => "Email",
-"Organization" => "Organização",
 "Work" => "Emprego",
 "Home" => "Casa",
 "Mobile" => "Telemovel",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula",
 "Edit name details" => "Editar detalhes do nome",
+"Organization" => "Organização",
 "Delete" => "Apagar",
 "Nickname" => "Alcunha",
 "Enter nickname" => "Introduza alcunha",
@@ -110,6 +107,8 @@
 "Add notes here." => "Insira notas aqui.",
 "Add field" => "Adicionar campo",
 "Phone" => "Telefone",
+"Email" => "Email",
+"Address" => "Morada",
 "Note" => "Nota",
 "Download contact" => "Transferir contacto",
 "Delete contact" => "Apagar contato",
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 15a34db7d7..b2d422e045 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -28,10 +28,6 @@
 "Contacts" => "Contacte",
 "This is not your addressbook." => "Nu se găsește în agendă.",
 "Contact could not be found." => "Contactul nu a putut fi găsit.",
-"Address" => "Adresă",
-"Telephone" => "Telefon",
-"Email" => "Email",
-"Organization" => "Organizație",
 "Work" => "Servicu",
 "Home" => "Acasă",
 "Mobile" => "Mobil",
@@ -48,6 +44,7 @@
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
 "Edit name details" => "Introdu detalii despre nume",
+"Organization" => "Organizație",
 "Delete" => "Șterge",
 "Nickname" => "Pseudonim",
 "Enter nickname" => "Introdu pseudonim",
@@ -61,6 +58,8 @@
 "Mail to address" => "Trimite mesaj la e-mail",
 "Delete email address" => "Șterge e-mail",
 "Phone" => "Telefon",
+"Email" => "Email",
+"Address" => "Adresă",
 "Download contact" => "Descarcă acest contact",
 "Delete contact" => "Șterge contact",
 "Type" => "Tip",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 308325cb53..951fe5f4c9 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -63,10 +63,6 @@
 " failed." => "не удалось.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
-"Address" => "Адрес",
-"Telephone" => "Телефон",
-"Email" => "Ящик эл. почты",
-"Organization" => "Организация",
 "Work" => "Рабочий",
 "Home" => "Домашний",
 "Mobile" => "Мобильный",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Формат Краткое имя, Полное имя",
 "Edit name details" => "Изменить детали имени",
+"Organization" => "Организация",
 "Delete" => "Удалить",
 "Nickname" => "Псевдоним",
 "Enter nickname" => "Введите псевдоним",
@@ -110,6 +107,8 @@
 "Add notes here." => "Добавьте заметки здесь.",
 "Add field" => "Добавить поле",
 "Phone" => "Телефон",
+"Email" => "Ящик эл. почты",
+"Address" => "Адрес",
 "Note" => "Заметка",
 "Download contact" => "Скачать контакт",
 "Delete contact" => "Удалить контакт",
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 2afbd62091..06dc5dfe7f 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -63,12 +63,9 @@
 " failed." => " zlyhaných.",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
-"Address" => "Adresa",
-"Telephone" => "Telefón",
-"Email" => "E-mail",
-"Organization" => "Organizácia",
 "Work" => "Práca",
 "Home" => "Domov",
+"Other" => "Iné",
 "Mobile" => "Mobil",
 "Text" => "SMS",
 "Voice" => "Odkazová schránka",
@@ -82,7 +79,6 @@
 "Clients" => "Klienti",
 "Holidays" => "Prázdniny",
 "Meeting" => "Stretnutie",
-"Other" => "Iné",
 "Projects" => "Projekty",
 "Questions" => "Otázky",
 "{name}'s Birthday" => "Narodeniny {name}",
@@ -107,6 +103,7 @@
 "Select photo from ownCloud" => "Vybrať fotku z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami",
 "Edit name details" => "Upraviť podrobnosti mena",
+"Organization" => "Organizácia",
 "Delete" => "Odstrániť",
 "Nickname" => "Prezývka",
 "Enter nickname" => "Zadajte prezývku",
@@ -126,6 +123,8 @@
 "Add notes here." => "Tu môžete pridať poznámky.",
 "Add field" => "Pridať pole",
 "Phone" => "Telefón",
+"Email" => "E-mail",
+"Address" => "Adresa",
 "Note" => "Poznámka",
 "Download contact" => "Stiahnuť kontakt",
 "Delete contact" => "Odstrániť kontakt",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 3640675383..5ab317ff32 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -70,10 +70,6 @@
 "Addressbook not found: " => "Adresar ni bil najden:",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
-"Address" => "Naslov",
-"Telephone" => "Telefon",
-"Email" => "E-pošta",
-"Organization" => "Organizacija",
 "Work" => "Delo",
 "Home" => "Doma",
 "Other" => "Drugo",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Izberi sliko iz ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico",
 "Edit name details" => "Uredite podrobnosti imena",
+"Organization" => "Organizacija",
 "Delete" => "Izbriši",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
@@ -146,6 +143,8 @@
 "Add notes here." => "Opombe dodajte tukaj.",
 "Add field" => "Dodaj polje",
 "Phone" => "Telefon",
+"Email" => "E-pošta",
+"Address" => "Naslov",
 "Note" => "Opomba",
 "Download contact" => "Prenesi stik",
 "Delete contact" => "Izbriši stik",
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index ad8e1c28fb..f54741c182 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -3,10 +3,6 @@
 "Contacts" => "Контакти",
 "This is not your addressbook." => "Ово није ваш адресар.",
 "Contact could not be found." => "Контакт се не може наћи.",
-"Address" => "Адреса",
-"Telephone" => "Телефон",
-"Email" => "Е-маил",
-"Organization" => "Организација",
 "Work" => "Посао",
 "Home" => "Кућа",
 "Mobile" => "Мобилни",
@@ -19,9 +15,12 @@
 "Contact" => "Контакт",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "Адресар",
+"Organization" => "Организација",
 "Delete" => "Обриши",
 "Preferred" => "Пожељан",
 "Phone" => "Телефон",
+"Email" => "Е-маил",
+"Address" => "Адреса",
 "Download contact" => "Преузми контакт",
 "Delete contact" => "Обриши контакт",
 "Type" => "Тип",
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index 3d0c0d2b8f..f06539ab43 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -2,10 +2,6 @@
 "Information about vCard is incorrect. Please reload the page." => "Podaci o vKarti su neispravni. Ponovo učitajte stranicu.",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt se ne može naći.",
-"Address" => "Adresa",
-"Telephone" => "Telefon",
-"Email" => "E-mail",
-"Organization" => "Organizacija",
 "Work" => "Posao",
 "Home" => "Kuća",
 "Mobile" => "Mobilni",
@@ -16,8 +12,11 @@
 "Pager" => "Pejdžer",
 "Birthday" => "Rođendan",
 "Add Contact" => "Dodaj kontakt",
+"Organization" => "Organizacija",
 "Delete" => "Obriši",
 "Phone" => "Telefon",
+"Email" => "E-mail",
+"Address" => "Adresa",
 "PO Box" => "Poštanski broj",
 "Extended" => "Proširi",
 "City" => "Grad",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index 113657f888..60a01ae5cc 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -70,10 +70,6 @@
 "Addressbook not found: " => "Adressboken hittades inte:",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
-"Address" => "Adress",
-"Telephone" => "Telefon",
-"Email" => "E-post",
-"Organization" => "Organisation",
 "Work" => "Arbete",
 "Home" => "Hem",
 "Other" => "Annat",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "Välj foto från ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
 "Edit name details" => "Redigera detaljer för namn",
+"Organization" => "Organisation",
 "Delete" => "Radera",
 "Nickname" => "Smeknamn",
 "Enter nickname" => "Ange smeknamn",
@@ -146,6 +143,8 @@
 "Add notes here." => "Lägg till noteringar här.",
 "Add field" => "Lägg till fält",
 "Phone" => "Telefon",
+"Email" => "E-post",
+"Address" => "Adress",
 "Note" => "Notering",
 "Download contact" => "Ladda ner kontakt",
 "Delete contact" => "Radera kontakt",
@@ -164,15 +163,25 @@
 "Postal code" => "Postnummer",
 "Country" => "Land",
 "Addressbook" => "Adressbok",
+"Hon. prefixes" => "Ledande titlar",
 "Miss" => "Fröken",
+"Ms" => "Fru",
 "Mr" => "Herr",
 "Sir" => "Herr",
-"Mrs" => "Fröken",
-"Dr" => "Dr",
+"Mrs" => "Fru",
+"Dr" => "Dr.",
 "Given name" => "Förnamn",
 "Additional names" => "Mellannamn",
 "Family name" => "Efternamn",
+"Hon. suffixes" => "Efterställda titlar",
+"J.D." => "Kand. Jur.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
 "Ph.D." => "Fil.dr.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "Import a contacts file" => "Importera en kontaktfil",
 "Please choose the addressbook" => "Vänligen välj adressboken",
 "create a new addressbook" => "skapa en ny adressbok",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 887d13bc38..4d1461cbc6 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -70,12 +70,9 @@
 "Addressbook not found: " => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
-"Address" => "ที่อยู่",
-"Telephone" => "โทรศัพท์",
-"Email" => "อีเมล์",
-"Organization" => "หน่วยงาน",
 "Work" => "ที่ทำงาน",
 "Home" => "บ้าน",
+"Other" => "อื่นๆ",
 "Mobile" => "มือถือ",
 "Text" => "ข้อความ",
 "Voice" => "เสียงพูด",
@@ -94,7 +91,6 @@
 "Journey" => "การเดินทาง",
 "Jubilee" => "งานเฉลิมฉลอง",
 "Meeting" => "ประชุม",
-"Other" => "อื่นๆ",
 "Personal" => "ส่วนตัว",
 "Projects" => "โปรเจค",
 "Questions" => "คำถาม",
@@ -124,6 +120,7 @@
 "Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง",
 "Edit name details" => "แก้ไขรายละเอียดของชื่อ",
+"Organization" => "หน่วยงาน",
 "Delete" => "ลบ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
@@ -146,6 +143,8 @@
 "Add notes here." => "เพิ่มหมายเหตุกำกับไว้ที่นี่",
 "Add field" => "เพิ่มช่องรับข้อมูล",
 "Phone" => "โทรศัพท์",
+"Email" => "อีเมล์",
+"Address" => "ที่อยู่",
 "Note" => "หมายเหตุ",
 "Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
 "Delete contact" => "ลบข้อมูลการติดต่อ",
@@ -200,6 +199,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "แสดงลิงก์ CardDav",
 "Show read-only VCF link" => "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น",
+"Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
 "Edit" => "แก้ไข",
 "New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index dc4ec06c93..10cabea1d9 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -65,12 +65,9 @@
 " failed." => " hatalı.",
 "This is not your addressbook." => "Bu sizin adres defteriniz değil.",
 "Contact could not be found." => "Kişi bulunamadı.",
-"Address" => "Adres",
-"Telephone" => "Telefon",
-"Email" => "Eposta",
-"Organization" => "Organizasyon",
 "Work" => "İş",
 "Home" => "Ev",
+"Other" => "Diğer",
 "Mobile" => "Mobil",
 "Text" => "Metin",
 "Voice" => "Ses",
@@ -89,7 +86,6 @@
 "Journey" => "Seyahat",
 "Jubilee" => "Yıl Dönümü",
 "Meeting" => "Toplantı",
-"Other" => "Diğer",
 "Personal" => "Kişisel",
 "Projects" => "Projeler",
 "Questions" => "Sorular",
@@ -116,6 +112,7 @@
 "Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters",
 "Edit name details" => "İsim detaylarını düzenle",
+"Organization" => "Organizasyon",
 "Delete" => "Sil",
 "Nickname" => "Takma ad",
 "Enter nickname" => "Takma adı girin",
@@ -138,6 +135,8 @@
 "Add notes here." => "Notları buraya ekleyin.",
 "Add field" => "Alan ekle",
 "Phone" => "Telefon",
+"Email" => "Eposta",
+"Address" => "Adres",
 "Note" => "Not",
 "Download contact" => "Kişiyi indir",
 "Delete contact" => "Kişiyi sil",
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
index cc09651065..dcd9efff34 100644
--- a/apps/contacts/l10n/uk.php
+++ b/apps/contacts/l10n/uk.php
@@ -1,10 +1,6 @@
 <?php $TRANSLATIONS = array(
 "At least one of the address fields has to be filled out." => "Має бути заповнено щонайменше одне поле.",
 "This is not your addressbook." => "Це не ваша адресна книга.",
-"Address" => "Адреса",
-"Telephone" => "Телефон",
-"Email" => "Ел.пошта",
-"Organization" => "Організація",
 "Mobile" => "Мобільний",
 "Text" => "Текст",
 "Voice" => "Голос",
@@ -13,8 +9,11 @@
 "Pager" => "Пейджер",
 "Birthday" => "День народження",
 "Add Contact" => "Додати контакт",
+"Organization" => "Організація",
 "Delete" => "Видалити",
 "Phone" => "Телефон",
+"Email" => "Ел.пошта",
+"Address" => "Адреса",
 "Delete contact" => "Видалити контакт",
 "Extended" => "Розширено",
 "City" => "Місто",
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
index 0c650586a2..d484fb405c 100644
--- a/apps/contacts/l10n/vi.php
+++ b/apps/contacts/l10n/vi.php
@@ -12,10 +12,6 @@
 "Error uploading contacts to storage." => "Lỗi tải lên danh sách địa chỉ để lưu trữ.",
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin tải lên thành công",
 "Contacts" => "Liên lạc",
-"Address" => "Địa chỉ",
-"Telephone" => "Điện thoại bàn",
-"Email" => "Email",
-"Organization" => "Tổ chức",
 "Work" => "Công việc",
 "Home" => "Nhà",
 "Mobile" => "Di động",
@@ -26,8 +22,11 @@
 "Contact" => "Danh sách",
 "Add Contact" => "Thêm liên lạc",
 "Addressbooks" => "Sổ địa chỉ",
+"Organization" => "Tổ chức",
 "Delete" => "Xóa",
 "Phone" => "Điện thoại",
+"Email" => "Email",
+"Address" => "Địa chỉ",
 "Delete contact" => "Xóa liên lạc",
 "PO Box" => "Hòm thư bưu điện",
 "City" => "Thành phố",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index bb4188314d..860d5727e8 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -63,10 +63,6 @@
 " failed." => " 失败。",
 "This is not your addressbook." => "这不是您的地址簿。",
 "Contact could not be found." => "无法找到联系人。",
-"Address" => "地址",
-"Telephone" => "电话",
-"Email" => "电子邮件",
-"Organization" => "组织",
 "Work" => "工作",
 "Home" => "家庭",
 "Mobile" => "移动电话",
@@ -91,6 +87,7 @@
 "Select photo from ownCloud" => "从 ownCloud 选择照片",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "自定义格式，简称，全名，姓在前，姓在前并用逗号分割",
 "Edit name details" => "编辑名称详情",
+"Organization" => "组织",
 "Delete" => "删除",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
@@ -110,6 +107,8 @@
 "Add notes here." => "添加注释。",
 "Add field" => "添加字段",
 "Phone" => "电话",
+"Email" => "电子邮件",
+"Address" => "地址",
 "Note" => "注释",
 "Download contact" => "下载联系人",
 "Delete contact" => "删除联系人",
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index db0a1dbf21..d23e44cc06 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -14,10 +14,6 @@
 "Contacts" => "通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
-"Address" => "地址",
-"Telephone" => "電話",
-"Email" => "電子郵件",
-"Organization" => "組織",
 "Work" => "公司",
 "Home" => "住宅",
 "Mobile" => "行動電話",
@@ -34,6 +30,7 @@
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
 "Edit name details" => "編輯姓名詳細資訊",
+"Organization" => "組織",
 "Delete" => "刪除",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
@@ -52,6 +49,8 @@
 "Add notes here." => "在這裡新增註解",
 "Add field" => "新增欄位",
 "Phone" => "電話",
+"Email" => "電子郵件",
+"Address" => "地址",
 "Note" => "註解",
 "Download contact" => "下載通訊錄",
 "Delete contact" => "刪除通訊錄",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
new file mode 100644
index 0000000000..26ace24e33
--- /dev/null
+++ b/apps/files_encryption/l10n/es.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Cifrado"
+);
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
new file mode 100644
index 0000000000..b939df164c
--- /dev/null
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Šifravimas",
+"Exclude the following file types from encryption" => "Nešifruoti pasirinkto tipo failų",
+"None" => "Nieko",
+"Enable Encryption" => "Įjungti šifravimą"
+);
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
new file mode 100644
index 0000000000..00022aa3d3
--- /dev/null
+++ b/apps/files_external/l10n/lt_LT.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Configuration" => "Konfigūracija",
+"Options" => "Nustatymai",
+"None set" => "Nieko nepasirinkta",
+"All Users" => "Visi vartotojai",
+"Groups" => "Grupės",
+"Users" => "Vartotojai",
+"Delete" => "Ištrinti"
+);
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 4501f4ae3d..6931389b9c 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Elimina",
-"Your Shared Files" => "Els vostres fitxers compartits",
-"Item" => "Element",
-"Shared With" => "Compartit amb",
-"Permissions" => "Permisos",
-"Read" => "Llegeix",
-"Edit" => "Edita",
-"Enable Resharing" => "Permet compartir amb tercers",
-"Allow users to reshare files they don't own" => "Permet als usuaris compartir fitxers que no són seus"
+"Size" => "Mida",
+"Modified" => "Modificat",
+"Delete all" => "Esborra-ho tot",
+"Delete" => "Elimina"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 691f362430..52d27ed781 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,11 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Smazat",
-"Your Shared Files" => "Vaše sdílené soubory",
-"Item" => "Položka",
-"Shared With" => "Sdíleno s:",
-"Permissions" => "Práva",
-"Read" => "Číst",
-"Edit" => "Editovat",
-"Enable Resharing" => "Povolit další sdílení",
-"Allow users to reshare files they don't own" => "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
+"Delete" => "Smazat"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index c6f12e88ec..d42383b43b 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -2,13 +2,5 @@
 "Size" => "Größe",
 "Modified" => "Geändert",
 "Delete all" => "Alle löschen",
-"Delete" => "Löschen",
-"Your Shared Files" => "Ihre geteilten Dateien",
-"Item" => "Objekt",
-"Shared With" => "Teilen mit",
-"Permissions" => "Berechtigungen",
-"Read" => "Lesen",
-"Edit" => "Bearbeiten",
-"Enable Resharing" => "Austausch ermöglichen",
-"Allow users to reshare files they don't own" => "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
+"Delete" => "Löschen"
 );
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index e441f03881..81a8dcb152 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,11 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Forigi",
-"Your Shared Files" => "Viaj kunhavigitaj dosieroj",
-"Item" => "Ero",
-"Shared With" => "Kunhavigita kun",
-"Permissions" => "Permesoj",
-"Read" => "Legi",
-"Edit" => "Redakti",
-"Enable Resharing" => "Kapabligi rekunhavigon",
-"Allow users to reshare files they don't own" => "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
+"Delete" => "Forigi"
 );
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index effa5cbfed..da299f4ff7 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,11 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Kustutamine",
-"Your Shared Files" => "Sinu jagatud failid",
-"Item" => "Kirje",
-"Shared With" => "Kellega jagatud",
-"Permissions" => "Õigused",
-"Read" => "Lugemine",
-"Edit" => "Muutmine",
-"Enable Resharing" => "Luba edasijagamine",
-"Allow users to reshare files they don't own" => "Luba kasutajatel jagada faile, mis pole nende omad"
+"Delete" => "Kustutamine"
 );
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index bd5ccfbf6a..8a5fc004a1 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,9 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Poisto",
-"Your Shared Files" => "Jakamasi tiedostot",
-"Permissions" => "Oikeudet",
-"Read" => "Luku",
-"Edit" => "Muokkaus",
-"Enable Resharing" => "Käytä uudelleenjakoa",
-"Allow users to reshare files they don't own" => "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
+"Delete" => "Poisto"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index bd38c9b9ce..5a90331e42 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -2,13 +2,5 @@
 "Size" => "Taille",
 "Modified" => "Modifié",
 "Delete all" => "Tout effacer",
-"Delete" => "Effacement",
-"Your Shared Files" => "Vos documents partagés",
-"Item" => "Item",
-"Shared With" => "Partagé avec",
-"Permissions" => "Permissions",
-"Read" => "Lecture",
-"Edit" => "Édition",
-"Enable Resharing" => "Permettre le repartage",
-"Allow users to reshare files they don't own" => "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
+"Delete" => "Effacement"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index c4b26f7b61..7f91b85678 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -2,13 +2,5 @@
 "Size" => "Dimensione",
 "Modified" => "Modificato",
 "Delete all" => "Elimina tutto",
-"Delete" => "Eliminazione",
-"Your Shared Files" => "I tuoi file condivisi",
-"Item" => "Elemento",
-"Shared With" => "Condiviso con",
-"Permissions" => "Permessi",
-"Read" => "Lettura",
-"Edit" => "Modifica",
-"Enable Resharing" => "Abilita ri-condivisione",
-"Allow users to reshare files they don't own" => "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
+"Delete" => "Eliminazione"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index d334908ae7..9fca88d0a3 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -2,13 +2,5 @@
 "Size" => "サイズ",
 "Modified" => "変更",
 "Delete all" => "すべて削除",
-"Delete" => "削除",
-"Your Shared Files" => "共有ファイル",
-"Item" => "項目",
-"Shared With" => "で共有 ",
-"Permissions" => "許可",
-"Read" => "読込",
-"Edit" => "編集",
-"Enable Resharing" => "再共有を有効にする",
-"Allow users to reshare files they don't own" => "所有者でないファイルの共有を許可する"
+"Delete" => "削除"
 );
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
new file mode 100644
index 0000000000..d21a3c14f4
--- /dev/null
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Dydis",
+"Modified" => "Pakeista",
+"Delete all" => "Ištrinti viską",
+"Delete" => "Ištrinti"
+);
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 508a58b3ee..7f612126b9 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Usuń",
-"Your Shared Files" => "Twoje udostępnione pliki",
-"Item" => "Element",
-"Shared With" => "Udostępnione dla",
-"Permissions" => "Uprawnienia",
-"Read" => "Odczyt",
-"Edit" => "Edycja",
-"Enable Resharing" => "Włącz ponowne udostępnianie",
-"Allow users to reshare files they don't own" => "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
+"Size" => "Rozmiar",
+"Modified" => "Zmodyfikowane",
+"Delete all" => "Usuń wszystko",
+"Delete" => "Usuń"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 231de48467..485ab7a85a 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -2,13 +2,5 @@
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
 "Delete all" => "Izbriši vse",
-"Delete" => "Izbris",
-"Your Shared Files" => "Vaše datoteke v souporabi",
-"Item" => "Predmet",
-"Shared With" => "V souporabi z",
-"Permissions" => "Dovoljenja",
-"Read" => "Branje",
-"Edit" => "Pisanje",
-"Enable Resharing" => "Omogoči nadaljnjo izmenjavo",
-"Allow users to reshare files they don't own" => "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
+"Delete" => "Izbris"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 812d0bced8..5a2cda4368 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -2,13 +2,5 @@
 "Size" => "Storlek",
 "Modified" => "Ändrad",
 "Delete all" => "Radera alla",
-"Delete" => "Radera",
-"Your Shared Files" => "Dina delade filer",
-"Item" => "Objekt",
-"Shared With" => "Delad med",
-"Permissions" => "Rättigheter",
-"Read" => "Läsa",
-"Edit" => "Ändra",
-"Enable Resharing" => "Aktivera dela vidare",
-"Allow users to reshare files they don't own" => "Tillåter användare att dela filer som dom inte äger"
+"Delete" => "Radera"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 834852f70d..3f8908a91a 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,11 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "ลบ",
-"Your Shared Files" => "ไฟล์ของคุณที่แชร์ไว้",
-"Item" => "ไอเท็ม",
-"Shared With" => "แชร์พร้อมกับ",
-"Permissions" => "สิทธิ์การเข้าใช้งาน",
-"Read" => "อ่าน",
-"Edit" => "แก้ไข",
-"Enable Resharing" => "เปิดให้มีการแชร์ใหม่อีกครั้งได้",
-"Allow users to reshare files they don't own" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
+"Size" => "ขนาด",
+"Modified" => "แก้ไขแล้ว",
+"Delete all" => "ลบทั้งหมด",
+"Delete" => "ลบ"
 );
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
new file mode 100644
index 0000000000..5da209f31b
--- /dev/null
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Panaikinti visų versijų galiojimą",
+"Enable Files Versioning" => "Įjungti failų versijų vedimą"
+);
diff --git a/apps/tasks/l10n/lt_LT.php b/apps/tasks/l10n/lt_LT.php
new file mode 100644
index 0000000000..7c17fc2224
--- /dev/null
+++ b/apps/tasks/l10n/lt_LT.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Netinkama data/laikas",
+"No category" => "Be kategorijos",
+"Empty Summary" => "Tuščias aprašymas",
+"Invalid percent complete" => "Netinkamas baigimo procentas",
+"Important" => "Svarbūs",
+"More" => "Daugiau",
+"Less" => "Mažiau",
+"Delete" => "Ištrinti"
+);
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 309c4fdbdd..d0e46e5b90 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -10,12 +10,21 @@
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer Filter Liste",
+"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
 "Group Filter" => "Gruppen Filter",
+"Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
 "Port" => "Port",
+"Base User Tree" => "Basis Benutzerbaum",
+"Base Group Tree" => "Basis Gruppenbaum",
+"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Use TLS" => "Nutze TLS",
 "Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern.",
 "Turn off SSL certificate validation." => "Schalte die SSL Zertifikatsprüfung aus.",
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zum Testen.",
+"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
+"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
 "in bytes" => "in bytes",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
 "Help" => "Hilfe"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 70c4bf4d08..c86b4ea2a5 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -7,10 +7,10 @@
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
 "Password" => "Password",
 "For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
-"User Login Filter" => "Filtro per il login utente",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\"",
-"User List Filter" => "Filtro per la lista utente",
+"User Login Filter" => "Filtro per l'accesso utente",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\"",
+"User List Filter" => "Filtro per l'elenco utenti",
 "Defines the filter to apply, when retrieving users." => "Specifica quale filtro utilizzare durante il recupero degli utenti.",
 "without any placeholder, e.g. \"objectClass=person\"." => "senza nessun segnaposto, per esempio \"objectClass=person\".",
 "Group Filter" => "Filtro per il gruppo",
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
new file mode 100644
index 0000000000..809ed571bd
--- /dev/null
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Slaptažodis",
+"Group Filter" => "Grupės filtras",
+"Port" => "Prievadas",
+"Use TLS" => "Naudoti TLS",
+"Turn off SSL certificate validation." => "Išjungti SSL sertifikato tikrinimą.",
+"Not recommended, use for testing only." => "Nerekomenduojama, naudokite tik testavimui.",
+"Help" => "Pagalba"
+);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index aa2d35ed85..a1baa64813 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -22,6 +22,7 @@
 "Group-Member association" => "ความสัมพันธ์ของสมาชิกในกลุ่ม",
 "Use TLS" => "ใช้ TLS",
 "Do not use it for SSL connections, it will fail." => "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว",
+"Case insensitve LDAP server (Windows)" => "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)",
 "Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud",
 "Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
diff --git a/apps/user_migrate/l10n/lt_LT.php b/apps/user_migrate/l10n/lt_LT.php
new file mode 100644
index 0000000000..20add8037b
--- /dev/null
+++ b/apps/user_migrate/l10n/lt_LT.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Eksportuoti",
+"Something went wrong while the export file was being generated" => "Įvyko klaida kuriant eksportuojamą failą",
+"An error has occurred" => "Įvyko klaida",
+"Export your user account" => "Eksportuoti jūsų vartotojo paskyrą",
+"This will create a compressed file that contains your ownCloud account." => "Bus sukurtas suglaudintas failas su jūsų ownCloud vartotojo paskyra.",
+"Import user account" => "Importuoti vartotojo paskyrą",
+"ownCloud User Zip" => "ownCloud vartotojo paskyros Zip archyvas",
+"Import" => "Importuoti"
+);
diff --git a/apps/user_openid/l10n/it.php b/apps/user_openid/l10n/it.php
index bda06ce18a..0a9dd951b5 100644
--- a/apps/user_openid/l10n/it.php
+++ b/apps/user_openid/l10n/it.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Questo è un server OpenID. Per ulteriori informazioni, vedi",
+"This is an OpenID server endpoint. For more information, see " => "Questo è un server OpenID. Per ulteriori informazioni, vedi ",
 "Identity: <b>" => "Identità: <b>",
 "Realm: <b>" => "Dominio: <b>",
 "User: <b>" => "Utente: <b>",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 760bab094e..2ada0405c9 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index 8f88820c4b..7ca711a252 100644
--- a/l10n/af/files_sharing.po
+++ b/l10n/af/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 3b99e83b16..79d381d888 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr "يجب ملء على الاقل خانه واحده من العنوان.
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "هذا ليس دفتر عناوينك."
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "عنوان"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "الهاتف"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "البريد الالكتروني"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "المؤسسة"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr "الوظيفة"
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
-msgstr "البيت"
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr "الهاتف المحمول"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "معلومات إضافية"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "صوت"
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
-msgstr "الفاكس"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "الفيديو"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "الرنان"
-
-#: lib/app.php:149
-msgid "Internet"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "تاريخ الميلاد"
-
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Ideas"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
+msgstr "الوظيفة"
 
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
+msgstr "البيت"
 
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "الهاتف المحمول"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "معلومات إضافية"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "صوت"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "الفاكس"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "الفيديو"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "الرنان"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "تاريخ الميلاد"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "المؤسسة"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "مفضل"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "الهاتف"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "البريد الالكتروني"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "عنوان"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "انزال المعرفه"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "امحي المعرفه"
 
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index a2933e5cac..f3922ed92a 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 6c1c631f18..8b72938428 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index fb8a5415dc..c240873407 100644
--- a/l10n/ar_SA/files_sharing.po
+++ b/l10n/ar_SA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index e5eb5903fe..944b488953 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 2d86e00c23..f03989ba48 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 191a5a532a..568851bd41 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "Almenys heu d'omplir un dels camps d'adreça."
 msgid "Trying to add duplicate property: "
 msgstr "Esteu intentant afegir una propietat duplicada:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Error en afegir la propietat del contacte:"
 
@@ -113,7 +121,7 @@ msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Error en carregar la imatge de perfil."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Voleu fusionar aquestes llibretes d'adreces?"
 
@@ -320,117 +329,148 @@ msgstr "Aquesta no és la vostra llibreta d'adreces"
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adreça"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telèfon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Correu electrònic"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organització"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mòbil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Veu"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Missatge"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Paginador"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Aniversari"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Negocis"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Trucada"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Clients"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Emissari"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Vacances"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Idees"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Viatge"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Aniversari"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Reunió"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mòbil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Veu"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Missatge"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Paginador"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Aniversari"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Negocis"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Trucada"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Clients"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Emissari"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Vacances"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Idees"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Viatge"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Aniversari"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Reunió"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Preguntes"
 
@@ -530,113 +570,139 @@ msgstr "Carrega una foto nova"
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Edita detalls del nom"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organització"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Escriviu el sobrenom"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Adreça web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Vés a la web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separeu els grups amb comes"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Edita els grups"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferit"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Especifiqueu una adreça de correu electrònic correcta"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Escriviu una adreça de correu electrònic"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Envia per correu electrònic a l'adreça"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Elimina l'adreça de correu electrònic"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Escriviu el número de telèfon"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Elimina el número de telèfon"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Visualitza al mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Edita els detalls de l'adreça"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Afegiu notes aquí."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Afegeix un camp"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telèfon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Correu electrònic"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adreça"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Baixa el contacte"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Suprimeix el contacte"
 
@@ -849,7 +915,7 @@ msgstr "Mostra l'enllaç VCF només de lectura"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Comparteix"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index e1b74ca789..bc5fa18cf2 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -20,48 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Mida"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Modificat"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Esborra-ho tot"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Elimina"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Els vostres fitxers compartits"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Element"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Compartit amb"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Permisos"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Llegeix"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Edita"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Permet compartir amb tercers"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Permet als usuaris compartir fitxers que no són seus"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 34b971778a..8567aca558 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "Musí být uveden nejméně jeden z adresních údajů"
 msgid "Trying to add duplicate property: "
 msgstr "Pokoušíte se přidat duplicitní atribut: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Chyba během přidávání vlastností kontaktu:"
 
@@ -114,7 +122,7 @@ msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Nelze získat platnou adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Tento parametr nemuže zůstat nevyplněn."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Upravit jméno"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Chyba při otevírání obrázku profilu"
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Vybrat typ"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Toto není Váš adresář."
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresa"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizace"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Hlas"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Zpráva"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Narozeniny"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Pracovní"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Volat"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Klienti"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Dodavatel"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Prázdniny"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Nápady"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Cestování"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Jubileum"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Schůzka"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Ostatní"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Hlas"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Zpráva"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Narozeniny"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Pracovní"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Volat"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Klienti"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Dodavatel"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Prázdniny"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Nápady"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Cestování"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Jubileum"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Schůzka"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Osobní"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Dotazy"
 
@@ -531,113 +571,139 @@ msgstr "Nahrát novou fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Upravit podrobnosti jména"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizace"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Odstranit"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Zadejte přezdívku"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Přejít na web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddělte skupiny čárkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Upravit skupiny"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferovaný"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Prosím zadejte platnou e-mailovou adresu"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Zadat e-mailovou adresu"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Odeslat na adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Smazat e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Zadat telefoní číslo"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Smazat telefoní číslo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Upravit podrobnosti adresy"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Zde můžete připsat poznámky."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Přidat políčko"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresa"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Stáhnout kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index d03c9e0a9c..56849cf199 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -30,38 +30,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Smazat"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Vaše sdílené soubory"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Položka"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Sdíleno s:"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Práva"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Číst"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Editovat"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Povolit další sdílení"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 554194ada5..4cb3567e9c 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,15 @@ msgstr "Der skal udfyldes mindst et adressefelt."
 msgid "Trying to add duplicate property: "
 msgstr "Kan ikke tilføje overlappende element."
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -116,7 +124,7 @@ msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
@@ -240,58 +248,59 @@ msgid "Couldn't get a valid address."
 msgstr "Kunne ikke finde en gyldig adresse."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fejl"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Dette felt må ikke være tomt."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Dr."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Vælg type"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -323,117 +332,148 @@ msgstr "Dette er ikke din adressebog."
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresse"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisation"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "SMS"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Telefonsvarer"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Besked"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Personsøger"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Fødselsdag"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Telefonsvarer"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Besked"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Personsøger"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Fødselsdag"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -533,113 +573,139 @@ msgstr "Upload nyt foto"
 msgid "Select photo from ownCloud"
 msgstr "Vælg foto fra ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Rediger navnedetaljer."
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisation"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Indtast kaldenavn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Opdel gruppenavne med kommaer"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Rediger grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Foretrukken"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Indtast venligst en gyldig email-adresse."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Indtast email-adresse"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Send mail til adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Slet email-adresse"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Indtast telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Slet telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Rediger adresse detaljer"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Tilføj noter her."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Tilføj element"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresse"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Download kontaktperson"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Slet kontaktperson"
 
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index e0327dcd14..7ed986fd02 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index bb512f9a2c..b4ff7dca2b 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 11:02+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +96,15 @@ msgstr "Mindestens eines der Adressfelder muss ausgefüllt werden."
 msgid "Trying to add duplicate property: "
 msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
 
@@ -128,7 +136,7 @@ msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
@@ -252,58 +260,59 @@ msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Fehler beim Laden des Profilbildes."
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Wähle Typ"
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Möchtest du diese Adressbücher zusammenführen?"
 
@@ -335,117 +344,148 @@ msgstr "Dies ist nicht dein Adressbuch."
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresse"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-Mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisation"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Andere"
 
-#: lib/app.php:137
+#: lib/app.php:201
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:139
+#: lib/app.php:203
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:140
+#: lib/app.php:204
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:141
+#: lib/app.php:205
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:142
+#: lib/app.php:206
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:143
+#: lib/app.php:207
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:144
+#: lib/app.php:208
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:151
+#: lib/app.php:215
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:189
+#: lib/app.php:253
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:190
+#: lib/app.php:254
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:191
+#: lib/app.php:255
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:192
+#: lib/app.php:256
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:193
+#: lib/app.php:257
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:194
+#: lib/app.php:258
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:195
+#: lib/app.php:259
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:196
+#: lib/app.php:260
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:197
+#: lib/app.php:261
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:199
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:200
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:201
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Fragen"
 
@@ -545,113 +585,139 @@ msgstr "Neues Foto hochladen"
 msgid "Select photo from ownCloud"
 msgstr "Foto aus der ownCloud auswählen"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Name ändern"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisation"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Spitzname angeben"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Webseite"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Webseite aufrufen"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Gruppen mit Komma getrennt"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Gruppen editieren"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Bevorzugt"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Bitte eine gültige E-Mail-Adresse angeben."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "E-Mail-Adresse angeben"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "E-Mail an diese Adresse schreiben"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "E-Mail-Adresse löschen"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Telefonnummer angeben"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Telefonnummer löschen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Auf Karte anzeigen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Adressinformationen ändern"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Füge hier Notizen ein."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Feld hinzufügen"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-Mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresse"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Notiz"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Kontakt herunterladen"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Kontakt löschen"
 
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 4f9072a984..8f7dfd3059 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 09:52+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -32,38 +32,6 @@ msgstr "Geändert"
 msgid "Delete all"
 msgstr "Alle löschen"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Löschen"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Ihre geteilten Dateien"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Objekt"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Teilen mit"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Lesen"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Austausch ermöglichen"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index abdda322f0..d7385b38ca 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot <thomas.mueller@tmit.eu>, 2012.
 # Maurice Preuß <>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 11:03+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 09:13+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +79,7 @@ msgstr "Benutzer Filter Liste"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
@@ -90,7 +91,7 @@ msgstr "Gruppen Filter"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
@@ -102,15 +103,15 @@ msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Basis Benutzerbaum"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Basis Gruppenbaum"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Assoziation zwischen Gruppe und Benutzer"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -140,19 +141,19 @@ msgstr "Nicht empfohlen, nur zum Testen."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Feld für den Anzeigenamen des Benutzers"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Feld für den Anzeigenamen der Gruppe"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
 #: templates/settings.php:27
 msgid "in bytes"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 23245e15a6..a2db38bcc6 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,15 @@ msgstr "Πρέπει να συμπληρωθεί τουλάχιστον ένα 
 msgid "Trying to add duplicate property: "
 msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
 
@@ -118,7 +126,7 @@ msgstr "Οι πληροφορίες για τη vCard είναι λανθασμ
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
@@ -242,58 +250,59 @@ msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Σφάλμα στην φόρτωση εικόνας προφίλ."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -325,117 +334,148 @@ msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σα
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Διεύθυνση"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Τηλέφωνο"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Οργανισμός"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Κινητό"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Κείμενο"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Ομιλία"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Μήνυμα"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Φαξ"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Βίντεο"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Βομβητής"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Διαδίκτυο"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Γενέθλια"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Επιχείρηση"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Κάλεσε"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Πελάτες"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Προμηθευτής"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Διακοπές"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Ιδέες"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Ταξίδι"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Ιωβηλαίο"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Συνάντηση"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Κινητό"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Κείμενο"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Ομιλία"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Μήνυμα"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Φαξ"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Βίντεο"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Βομβητής"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Διαδίκτυο"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Γενέθλια"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Επιχείρηση"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Κάλεσε"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Πελάτες"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Προμηθευτής"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Διακοπές"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Ιδέες"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Ταξίδι"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Ιωβηλαίο"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Συνάντηση"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
@@ -535,113 +575,139 @@ msgstr "Ανέβασε νέα φωτογραφία"
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Οργανισμός"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Παρατσούκλι"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Εισάγετε παρατσούκλι"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Ιστότοπος"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Πήγαινε στον ιστότοπο"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Διαχώρισε τις ομάδες με κόμμα "
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Επεξεργασία ομάδων"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Προτιμώμενο"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Αποστολή σε διεύθυνση"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Διαγραφή διεύθυνση email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Εισήγαγε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Διέγραψε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Προβολή στο χάρτη"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Πρόσθεσε τις σημειώσεις εδώ"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Προσθήκη πεδίου"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Διεύθυνση"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Σημείωση"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Λήψη επαφής"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Διαγραφή επαφής"
 
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 39fa2d067b..b2f51bd304 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 8b2056e127..507f93c2ca 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "Almenaŭ unu el la adreskampoj necesas pleniĝi."
 msgid "Trying to add duplicate property: "
 msgstr "Provante aldoni duobligitan propraĵon:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Eraro aldonante kontakta propraĵo:"
 
@@ -113,7 +121,7 @@ msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "Ne eblis ekhavi validan adreson."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Eraro"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Ne eblis seriigi erojn."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Redakti nomon"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Elektu tipon"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "Ĉi tiu ne estas via adresaro."
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adreso"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefono"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Retpoŝtadreso"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizaĵo"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Poŝtelefono"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Teksto"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voĉo"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mesaĝo"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fakso"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Videaĵo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Televokilo"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Interreto"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Naskiĝotago"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Negoco"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Voko"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Klientoj"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Liveranto"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Ferioj"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Ideoj"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Vojaĝo"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Jubileo"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Kunveno"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Alia"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Poŝtelefono"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Teksto"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voĉo"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mesaĝo"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fakso"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Videaĵo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Televokilo"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Interreto"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Naskiĝotago"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Negoco"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Voko"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Klientoj"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Liveranto"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Ferioj"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Ideoj"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Vojaĝo"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Jubileo"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Kunveno"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Persona"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projektoj"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Demandoj"
 
@@ -530,113 +570,139 @@ msgstr "Alŝuti novan foton"
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Redakti detalojn de nomo"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizaĵo"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Enigu kromnomon"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "TTT-ejo"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.iuejo.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Iri al TTT-ejon"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Disigi grupojn per komoj"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Redakti grupojn"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferata"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Bonvolu specifi validan retpoŝtadreson."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Enigi retpoŝtadreson"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Retpoŝtmesaĝo al adreso"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Forigi retpoŝþadreson"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Enigi telefonnumeron"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Forigi telefonnumeron"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Vidi en mapo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Redakti detalojn de adreso"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Aldoni notojn ĉi tie."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Aldoni kampon"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Retpoŝtadreso"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adreso"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Noto"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Elŝuti kontakton"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Forigi kontakton"
 
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 9e5792768f..f1afe86872 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -30,38 +30,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Forigi"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Viaj kunhavigitaj dosieroj"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Ero"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Kunhavigita kun"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Permesoj"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Legi"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Redakti"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Kapabligi rekunhavigon"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 9a3aa9ff2d..1f2fd357ff 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,15 @@ msgstr "Al menos uno de los campos de direcciones se tiene que rellenar."
 msgid "Trying to add duplicate property: "
 msgstr "Intentando añadir una propiedad duplicada: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -117,7 +125,7 @@ msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la pág
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
@@ -241,58 +249,59 @@ msgid "Couldn't get a valid address."
 msgstr "Fallo : no hay dirección valida"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fallo"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Este campo no puede estar vacío."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Edita el Nombre"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Selecciona el tipo"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -324,117 +333,148 @@ msgstr "Esta no es tu agenda de contactos."
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Dirección"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Teléfono"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Correo electrónico"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organización"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Móvil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mensaje"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Localizador"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Negocio"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Llamada"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Clientes"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Vacaciones"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Ideas"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Jornada"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Reunión"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Otro"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Móvil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mensaje"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Localizador"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Negocio"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Llamada"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Clientes"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Vacaciones"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Ideas"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Jornada"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Reunión"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Proyectos"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Preguntas"
 
@@ -534,113 +574,139 @@ msgstr "Subir nueva fotografía"
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar los detalles del nombre"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organización"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Alias"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introduce un alias"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Sitio Web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separa los grupos con comas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Por favor especifica una dirección de correo electrónico válida."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Introduce una dirección de correo electrónico"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Enviar por correo a la dirección"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Eliminar dirección de correo electrónico"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Introduce un número de teléfono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Eliminar número de teléfono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Editar detalles de la dirección"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Añade notas aquí."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Añadir campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Dirección"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Eliminar contacto"
 
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 32c5cd8587..4c88d29c38 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 21:47+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Cifrado"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 5b8a954918..848632a707 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index fecace83b7..8211a51621 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 20:25+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -235,7 +235,7 @@ msgstr "Otro"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupo admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index a3886778c6..b1da75ccb8 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr "Vähemalt üks aadressiväljadest peab olema täidetud."
 msgid "Trying to add duplicate property: "
 msgstr "Proovitakse lisada topeltomadust: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Viga"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Muuda nime"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Vali tüüp"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "See pole sinu aadressiraamat."
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Aadress"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-post"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisatsioon"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobiil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Hääl"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Sõnum"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Piipar"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Sünnipäev"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobiil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Hääl"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Sõnum"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Piipar"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Sünnipäev"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr "Lae üles uus foto"
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Muuda nime üksikasju"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisatsioon"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Sisesta hüüdnimi"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Eralda grupid komadega"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Muuda gruppe"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Eelistatud"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Palun sisesta korrektne e-posti aadress."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Sisesta e-posti aadress"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Kiri aadressile"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Kustuta e-posti aadress"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Sisesta telefoninumber"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Kustuta telefoninumber"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Vaata kaardil"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Muuda aaressi infot"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Lisa märkmed siia."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Lisa väli"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-post"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Aadress"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Märkus"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Lae kontakt alla"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Kustuta kontakt"
 
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 13912b29a8..ebe1c5cb9b 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -30,38 +30,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Kustutamine"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Sinu jagatud failid"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Kirje"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Kellega jagatud"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Õigused"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Lugemine"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Muutmine"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Luba edasijagamine"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Luba kasutajatel jagada faile, mis pole nende omad"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index a99dcfe4f9..4ab1671069 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "Behintzat helbide eremuetako bat bete behar da."
 msgid "Trying to add duplicate property: "
 msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
 
@@ -114,7 +122,7 @@ msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Ezin izan da eposta baliagarri bat hartu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errorea"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Propietate hau ezin da hutsik egon."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Editatu izena"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Hautatu mota"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Hau ez da zure helbide liburua."
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Helbidea"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefonoa"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Eposta"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Erakundea"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mugikorra"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Testua"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Ahotsa"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mezua"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax-a"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Bideoa"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Bilagailua"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Jaioteguna"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Deia"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Bezeroak"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Oporrak"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Ideiak"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Bidaia"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Bilera"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mugikorra"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Testua"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Ahotsa"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mezua"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax-a"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Bideoa"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Bilagailua"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Jaioteguna"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Deia"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Bezeroak"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Oporrak"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Ideiak"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Bidaia"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Bilera"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Proiektuak"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Galderak"
 
@@ -531,113 +571,139 @@ msgstr "Igo argazki berria"
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editatu izenaren zehaztasunak"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Erakundea"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Ezizena"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Sartu ezizena"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Web orria"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.webgunea.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Web orrira joan"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Banatu taldeak komekin"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editatu taldeak"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Hobetsia"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Mesedez sartu eposta helbide egoki bat"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Sartu eposta helbidea"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Bidali helbidera"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Ezabatu eposta helbidea"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Sartu telefono zenbakia"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Ezabatu telefono zenbakia"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Ikusi mapan"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Editatu helbidearen zehaztasunak"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Gehitu oharrak hemen."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Gehitu eremua"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Eposta"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Helbidea"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Oharra"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Deskargatu kontaktua"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Ezabatu kontaktua"
 
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 2f90f743ee..d316bfa649 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index d97960a11b..fa04f4c815 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 3032b02ab6..0ba46e6c77 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 7b955b8ee8..1e332977fa 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr "At least one of the address fields has to be filled out. "
 msgid "Trying to add duplicate property: "
 msgstr "امتحان کردن برای وارد کردن مشخصات تکراری"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr "Couldn't get a valid address."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "خطا"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "نام تغییر"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "این کتابچه ی نشانه های شما نیست"
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "نشانی"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "تلفن"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "نشانی پست الکترنیک"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "نهاد(ارگان)"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "موبایل"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "متن"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "صدا"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "پیغام"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "دورنگار:"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "رسانه تصویری"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "صفحه"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "اینترنت"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "روزتولد"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "موبایل"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "متن"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "صدا"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "پیغام"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "دورنگار:"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "رسانه تصویری"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "صفحه"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "اینترنت"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "روزتولد"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr "بار گذاری یک تصویر جدید"
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "ویرایش نام جزئیات"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "نهاد(ارگان)"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "نام مستعار"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "یک نام مستعار وارد کنید"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "جدا کردن گروه ها به وسیله درنگ نما"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "ویرایش گروه ها"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "مقدم"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "یک  پست الکترونیکی وارد کنید"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "به نشانی  ارسال شد"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "پاک کردن نشانی پست الکترونیکی"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "شماره تلفن راوارد کنید"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "پاک کردن شماره تلفن"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "دیدن روی نقشه"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "ویرایش جزئیات نشانی ها"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "اینجا یادداشت ها را بیافزایید"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "اضافه کردن فیلد"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "شماره تلفن"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "نشانی پست الکترنیک"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "نشانی"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "یادداشت"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "دانلود مشخصات اشخاص"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "پاک کردن  اطلاعات شخص مورد نظر"
 
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9d11697a56..a80b97b532 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index 50ac3b42ac..9c21093bb1 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index 52ec668a86..b8c06567b5 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index ecaaf1a119..b67260431f 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 17:04+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,7 +83,15 @@ msgstr "Vähintään yksi osoitekenttä tulee täyttää."
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -115,7 +123,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
@@ -239,58 +247,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Virhe profiilikuvaa ladatessa."
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Haluatko yhdistää nämä osoitekirjat?"
 
@@ -322,117 +331,148 @@ msgstr "Tämä ei ole osoitekirjasi."
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Osoite"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Puhelin"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Sähköposti"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisaatio"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:137
+#: lib/app.php:201
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:139
+#: lib/app.php:203
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:140
+#: lib/app.php:204
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:141
+#: lib/app.php:205
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:142
+#: lib/app.php:206
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:143
+#: lib/app.php:207
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:144
+#: lib/app.php:208
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:151
+#: lib/app.php:215
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:189
+#: lib/app.php:253
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:190
+#: lib/app.php:254
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:255
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:256
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:257
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:194
+#: lib/app.php:258
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:195
+#: lib/app.php:259
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:196
+#: lib/app.php:260
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:261
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:200
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:201
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -532,113 +572,139 @@ msgstr "Lähetä uusi valokuva"
 msgid "Select photo from ownCloud"
 msgstr "Valitse valokuva ownCloudista"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Muokkaa nimitietoja"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisaatio"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Anna kutsumanimi"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Verkkosivu"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Siirry verkkosivulle"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Erota ryhmät pilkuilla"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Muokkaa ryhmiä"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Ensisijainen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Anna kelvollinen sähköpostiosoite."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Anna sähköpostiosoite"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Poista sähköpostiosoite"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Anna puhelinnumero"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Poista puhelinnumero"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Näytä kartalla"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Muokkaa osoitetietoja"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Lisää huomiot tähän."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Lisää kenttä"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Puhelin"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Sähköposti"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Osoite"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Huomio"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Lataa yhteystieto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Poista yhteystieto"
 
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 06d1266178..9877489d0a 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -30,38 +30,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Poisto"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Jakamasi tiedostot"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Oikeudet"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Luku"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Muokkaus"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Käytä uudelleenjakoa"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 60c3f089ac..b22cad3727 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,15 @@ msgstr "Au moins un des champs d'adresses doit être complété."
 msgid "Trying to add duplicate property: "
 msgstr "Ajout d'une propriété en double:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Erreur pendant l'ajout de la propriété du contact :"
 
@@ -122,7 +130,7 @@ msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
@@ -246,58 +254,59 @@ msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Erreur pendant le chargement de la photo de profil."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Sélectionner un type"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Voulez-vous fusionner ces carnets d'adresses ?"
 
@@ -329,117 +338,148 @@ msgstr "Ce n'est pas votre carnet d'adresses."
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresse"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Téléphone"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Société"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobile"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Texte"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voix"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Message"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vidéo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Bipeur"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Anniversaire"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Business"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Appel"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Clients"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Livreur"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Vacances"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Idées"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Trajet"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Jubilé"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Rendez-vous"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobile"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Texte"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voix"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Message"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vidéo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Bipeur"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Anniversaire"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Business"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Appel"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Clients"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Livreur"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Vacances"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Idées"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Trajet"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Jubilé"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Rendez-vous"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Questions"
 
@@ -539,113 +579,139 @@ msgstr "Envoyer une nouvelle photo"
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editer les noms"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Société"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Surnom"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Entrer un surnom"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Page web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Allez à la page web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "jj-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Séparer les groupes avec des virgules"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editer les groupes"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Préféré"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Merci d'entrer une adresse e-mail valide."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Entrer une adresse e-mail"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Envoyer à l'adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Supprimer l'adresse e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Entrer un numéro de téléphone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Supprimer le numéro de téléphone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Voir sur une carte"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Editer les adresses"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Ajouter des notes ici."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Ajouter un champ."
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Téléphone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresse"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Télécharger le contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Supprimer le contact"
 
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 66f78d21de..254df78bd1 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 07:11+0000\n"
-"Last-Translator: gp4004 <gp4004@arghh.org>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,38 +31,6 @@ msgstr "Modifié"
 msgid "Delete all"
 msgstr "Tout effacer"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Effacement"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Vos documents partagés"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Item"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Partagé avec"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Permissions"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Lecture"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Édition"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Permettre le repartage"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 327a0288f7..4993c8b7de 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "Polo menos un dos campos do enderezo ten que ser cuberto."
 msgid "Trying to add duplicate property: "
 msgstr "Tentando engadir propiedade duplicada: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxin
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "Non se puido obter un enderezo de correo válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Esta propiedade non pode quedar baldeira."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Seleccione tipo"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "Esta non é a súa axenda."
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Enderezo"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Teléfono"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Correo electrónico"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organización"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Móbil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mensaxe"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Paxinador"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Aniversario"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Móbil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mensaxe"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Paxinador"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Aniversario"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr "Subir unha nova foto"
 msgid "Select photo from ownCloud"
 msgstr "Escoller foto desde ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalles do nome"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organización"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Apodo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introuza apodo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe grupos con comas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Por favor indique un enderezo de correo electrónico válido."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Introduza enderezo de correo electrónico"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Correo ao enderezo"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Borrar enderezo de correo electrónico"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Introducir número de teléfono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Borrar número de teléfono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Editar detalles do enderezo"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Engadir aquí as notas."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Engadir campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Enderezo"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Borrar contacto"
 
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 7a4702daab..ef1d19e933 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index f3b6c214c2..be12ff5887 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "יש למלא לפחות אחד משדות הכתובת."
 msgid "Trying to add duplicate property: "
 msgstr "ניסיון להוספת מאפיין כפול: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -114,7 +122,7 @@ msgstr "המידע עבור ה vCard אינו נכון. אנא טען את הע
 msgid "Something went FUBAR. "
 msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "זהו אינו ספר הכתובות שלך"
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "כתובת"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "טלפון"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "דואר אלקטרוני"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "ארגון"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "נייד"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "טקסט"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "קולי"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "הודעה"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "פקס"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "וידאו"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "זימונית"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "אינטרנט"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "יום הולדת"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "נייד"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "טקסט"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "קולי"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "הודעה"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "פקס"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "וידאו"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "זימונית"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "אינטרנט"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "יום הולדת"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +571,139 @@ msgstr "העלה תמונה חדשה"
 msgid "Select photo from ownCloud"
 msgstr "בחר תמונה מ ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "ערוך פרטי שם"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "ארגון"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "כינוי"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "הכנס כינוי"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "הפרד קבוצות עם פסיקים"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "ערוך קבוצות"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "מועדף"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "אנא הזן כתובת דוא\"ל חוקית"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "הזן כתובת דוא\"ל"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "כתובת"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "מחק כתובת דוא\"ל"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "הכנס מספר טלפון"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "מחק מספר טלפון"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "ראה במפה"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "ערוך פרטי כתובת"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "הוסף הערות כאן."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "הוסף שדה"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "טלפון"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "דואר אלקטרוני"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "כתובת"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "הערה"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "הורדת איש קשר"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "מחיקת איש קשר"
 
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index ce23b329bc..75c35f1462 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 11ff584568..dfc545f383 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "Morate ispuniti barem jedno od adresnih polja."
 msgid "Trying to add duplicate property: "
 msgstr "Pokušali ste dodati duplo svojstvo:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 msgid "Something went FUBAR. "
 msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "Ovo nije vaš adresar."
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresa"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizacija"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobitel"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Glasovno"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Poruka"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Rođendan"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobitel"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Glasovno"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Poruka"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Uredi detalje imena"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizacija"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Unesi nadimank"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Uredi grupe"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferirano"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Unesi email adresu"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Unesi broj telefona"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Prikaži na karti"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Uredi detalje adrese"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Dodaj bilješke ovdje."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresa"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Bilješka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Preuzmi kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Izbriši kontakt"
 
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index e9e1ac6f19..902174e80e 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index ed546686ca..91365e521a 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,15 @@ msgstr "Legalább egy címmező kitöltendő"
 msgid "Trying to add duplicate property: "
 msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -115,7 +123,7 @@ msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
@@ -239,58 +247,59 @@ msgid "Couldn't get a valid address."
 msgstr "Érvényes cím lekérése sikertelen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Hiba"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Ezt a tulajdonságot muszáj kitölteni"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Típus kiválasztása"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -322,117 +331,148 @@ msgstr "Ez nem a te címjegyzéked."
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Cím"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefonszám"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Szervezet"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobiltelefonszám"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Szöveg"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Hang"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Üzenet"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Személyhívó"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Születésnap"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobiltelefonszám"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Szöveg"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Hang"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Üzenet"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Személyhívó"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Születésnap"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -532,113 +572,139 @@ msgstr "Új kép feltöltése"
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Név részleteinek szerkesztése"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Szervezet"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Becenév"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Becenév megadása"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Vesszővel válassza el a csoportokat"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Csoportok szerkesztése"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Előnyben részesített"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Adjon meg érvényes email címet"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Adja meg az email címet"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Postai cím"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Email cím törlése"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Adja meg a telefonszámot"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Telefonszám törlése"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Megtekintés a térképen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Cím részleteinek szerkesztése"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Megjegyzések"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Mező hozzáadása"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefonszám"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Cím"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Jegyzet"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Kapcsolat letöltése"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Kapcsolat törlése"
 
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index ea682416e1..3b03c6a943 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 04107b7b21..6e6aaf74a6 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index eec7cde9f4..d7ecd0cfa1 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index cd74ca7875..d41d801f58 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "Iste non es tu libro de adresses"
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresse"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telephono"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-posta"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisation"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobile"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voce"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Message"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Anniversario"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobile"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voce"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Message"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Anniversario"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr "Incargar nove photo"
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisation"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Pseudonymo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Inserer pseudonymo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Modificar gruppos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferite"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Entrar un adresse de e-posta"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Deler adresse de E-posta"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Entrar un numero de telephono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Deler numero de telephono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Vider in un carta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Adder notas hic"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Adder campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Phono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-posta"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresse"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Discargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Deler contacto"
 
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 47ee4da229..55cfbbcf2e 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index d5650aa318..262d2eba49 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index b4652fdd40..0a4a395144 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 4d770ebd9b..b0555c5c1c 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index c6da7a9d02..fdba039609 100644
--- a/l10n/id_ID/files_sharing.po
+++ b/l10n/id_ID/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 6d9dc3be5d..37a5ca6156 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 06:00+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,7 +83,15 @@ msgstr "Deve essere inserito almeno un indirizzo."
 msgid "Trying to add duplicate property: "
 msgstr "P"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Errore durante l'aggiunta della proprietà del contatto: "
 
@@ -115,7 +123,7 @@ msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
@@ -239,58 +247,59 @@ msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Errore durante il caricamento dell'immagine di profilo."
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Vuoi unire queste rubriche?"
 
@@ -322,117 +331,148 @@ msgstr "Questa non è la tua rubrica."
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Indirizzo"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefono"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizzazione"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:137
+#: lib/app.php:201
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:139
+#: lib/app.php:203
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:140
+#: lib/app.php:204
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:141
+#: lib/app.php:205
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:142
+#: lib/app.php:206
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:143
+#: lib/app.php:207
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:144
+#: lib/app.php:208
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:151
+#: lib/app.php:215
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:189
+#: lib/app.php:253
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:190
+#: lib/app.php:254
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:191
+#: lib/app.php:255
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:192
+#: lib/app.php:256
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:193
+#: lib/app.php:257
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:194
+#: lib/app.php:258
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:195
+#: lib/app.php:259
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:196
+#: lib/app.php:260
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:197
+#: lib/app.php:261
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:199
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:200
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:201
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Domande"
 
@@ -532,113 +572,139 @@ msgstr "Invia una nuova foto"
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Modifica dettagli del nome"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizzazione"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Pseudonimo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Inserisci pseudonimo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Sito web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Vai al sito web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "gg-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separa i gruppi con virgole"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Modifica gruppi"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferito"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Specifica un indirizzo email valido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Inserisci indirizzo email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Invia per email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Elimina l'indirizzo email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Inserisci il numero di telefono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Elimina il numero di telefono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Modifica dettagli dell'indirizzo"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Aggiungi qui le note."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Aggiungi campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Indirizzo"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Scarica contatto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Elimina contatto"
 
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 1bddc18b6e..94313868ad 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 06:02+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,38 +30,6 @@ msgstr "Modificato"
 msgid "Delete all"
 msgstr "Elimina tutto"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Eliminazione"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "I tuoi file condivisi"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Elemento"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Condiviso con"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Permessi"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Lettura"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Modifica"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Abilita ri-condivisione"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b2d4c88847..b14c9fcd47 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 05:44+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 20:01+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -194,7 +194,7 @@ msgstr "Il tuo indirizzo email"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Inserici il tuo indirizzo email per abilitare il recupero della password"
+msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index cfd6cf566e..e99e56fc15 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 14:56+0000\n"
-"Last-Translator: Innocenzo Ventre <el.diabl09@gmail.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 20:31+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,23 +57,23 @@ msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr "Filtro per il login utente"
+msgstr "Filtro per l'accesso utente"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login."
+msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\""
+msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr "Filtro per la lista utente"
+msgstr "Filtro per l'elenco utenti"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
diff --git a/l10n/it/user_openid.po b/l10n/it/user_openid.po
index b769535161..b8036426bc 100644
--- a/l10n/it/user_openid.po
+++ b/l10n/it/user_openid.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 11:46+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 20:39+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr "Questo è un server OpenID. Per ulteriori informazioni, vedi"
+msgstr "Questo è un server OpenID. Per ulteriori informazioni, vedi "
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index e6f22a5ca7..f096712264 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 01:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +81,15 @@ msgstr "住所の項目のうち１つは入力して下さい。"
 msgid "Trying to add duplicate property: "
 msgstr "重複する属性を追加: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "コンタクト属性の追加エラー: "
 
@@ -113,7 +121,7 @@ msgstr "vCardの情報が正しくありません。ページを再読み込み
 msgid "Something went FUBAR. "
 msgstr "何かがFUBARへ移動しました。"
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "有効なアドレスを取得できませんでした。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "エラー"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "この属性は空にできません。"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "名前を編集"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "プロファイルの画像の読み込みエラー"
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "タイプを選択"
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "これらのアドレス帳をマージしてもよろしいですか？"
 
@@ -320,117 +329,148 @@ msgstr "これはあなたの電話帳ではありません。"
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "住所"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "電話番号"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "メールアドレス"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "所属"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "その他"
 
-#: lib/app.php:137
+#: lib/app.php:201
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:139
+#: lib/app.php:203
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:140
+#: lib/app.php:204
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:141
+#: lib/app.php:205
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/app.php:142
+#: lib/app.php:206
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:143
+#: lib/app.php:207
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:144
+#: lib/app.php:208
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:151
+#: lib/app.php:215
 msgid "Internet"
 msgstr "インターネット"
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:189
+#: lib/app.php:253
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:190
+#: lib/app.php:254
 msgid "Call"
 msgstr "電話"
 
-#: lib/app.php:191
+#: lib/app.php:255
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:192
+#: lib/app.php:256
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:193
+#: lib/app.php:257
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:194
+#: lib/app.php:258
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:195
+#: lib/app.php:259
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:196
+#: lib/app.php:260
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:197
+#: lib/app.php:261
 msgid "Meeting"
 msgstr "打ち合わせ"
 
-#: lib/app.php:199
+#: lib/app.php:263
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:200
+#: lib/app.php:264
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:201
+#: lib/app.php:265
 msgid "Questions"
 msgstr "質問"
 
@@ -530,113 +570,139 @@ msgstr "新しい写真をアップロード"
 msgid "Select photo from ownCloud"
 msgstr "ownCloudから写真を選択"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "名前の詳細を編集"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "所属"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "削除"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "ニックネームを入力"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "ウェブサイト"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Webサイトへ移動"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "コンマでグループを分割"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "グループを編集"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "推奨"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "有効なメールアドレスを指定してください。"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "メールアドレスを入力"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "アドレスへメールを送る"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "メールアドレスを削除"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "電話番号を入力"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "電話番号を削除"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "地図で表示"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "住所の詳細を編集"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "ここにメモを追加。"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "項目を追加"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "電話番号"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "メールアドレス"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "住所"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "メモ"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "連絡先のダウンロード"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "連絡先の削除"
 
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index edc409fb90..b76508218b 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 01:51+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,38 +31,6 @@ msgstr "変更"
 msgid "Delete all"
 msgstr "すべて削除"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "削除"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "共有ファイル"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "項目"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "で共有 "
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "許可"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "読込"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "編集"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "再共有を有効にする"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "所有者でないファイルの共有を許可する"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 2794bd93cc..9751b56552 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "최소한 하나의 주소록 항목을 입력해야 합니다."
 msgid "Trying to add duplicate property: "
 msgstr "중복 속성 추가 시도: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "유효한 주소를 얻을 수 없습니다."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "오류"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "이름 편집"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "유형 선택"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "내 주소록이 아닙니다."
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "주소"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "전화 번호"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "전자 우편"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "조직"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "휴대폰"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "문자 번호"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "음성 번호"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "메세지"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "팩스 번호"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "영상 번호"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "호출기"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "인터넷"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "생일"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "휴대폰"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "문자 번호"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "음성 번호"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "메세지"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "팩스 번호"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "영상 번호"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "호출기"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "인터넷"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "생일"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr "새로운 사진 업로드"
 msgid "Select photo from ownCloud"
 msgstr "ownCloud에서 사진 선택"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "이름 세부사항을 편집합니다. "
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "조직"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "별명"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "별명 입력"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "일-월-년"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "쉼표로 그룹 구분"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "그룹 편집"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "선호함"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "올바른 이메일 주소를 입력하세요."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "이메일 주소 입력"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "이메일 주소 삭제"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "전화번호 입력"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "전화번호 삭제"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "지도에서 보기"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "상세 주소 수정"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "여기에 노트 추가."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "파일 추가"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "전화 번호"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "전자 우편"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "주소"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "노트"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "연락처 다운로드"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "연락처 삭제"
 
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 21cbdc33f6..970803e48a 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 3f566f989b..095a0e469e 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "Dat do ass net däin Adressbuch."
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adress"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon's Nummer"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Firma"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "GSM"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "SMS"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voice"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Message"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Gebuertsdag"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "GSM"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voice"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Message"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Gebuertsdag"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Firma"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Spëtznumm"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Gëff e Spëtznumm an"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Gruppen editéieren"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Telefonsnummer aginn"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Telefonsnummer läschen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Op da Kaart uweisen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Adress Detailer editéieren"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adress"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Kontakt eroflueden"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Kontakt läschen"
 
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index c2a771a693..ca81053d9a 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/lt_LT/admin_dependencies_chk.po b/l10n/lt_LT/admin_dependencies_chk.po
index 52d674cbee..3cf43f2491 100644
--- a/l10n/lt_LT/admin_dependencies_chk.po
+++ b/l10n/lt_LT/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"PO-Revision-Date: 2012-08-22 13:30+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Php-json modulis yra reikalingas duomenų keitimuisi tarp programų"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Php-curl modulis automatiškai nuskaito tinklapio pavadinimą kuomet išsaugoma žymelė."
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Php-gd modulis yra naudojamas paveikslėlių miniatiūroms kurti."
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Php-ldap modulis yra reikalingas prisijungimui prie jūsų ldap serverio"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Php-zip modulis yra reikalingas kelių failų atsiuntimui iš karto."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Php-mb_multibyte modulis yra naudojamas apdoroti įvairius teksto kodavimo formatus."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Php-ctype modulis yra reikalingas duomenų tikrinimui."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Php-xml modulis yra reikalingas failų dalinimuisi naudojant webdav."
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "allow_url_fopen direktyva turėtų būti nustatyta į \"1\" jei norite automatiškai gauti žinių bazės informaciją iš OCS serverių."
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Php-pdo modulis yra reikalingas duomenų saugojimui į owncloud duomenų bazę."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Priklausomybės"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Naudojama:"
diff --git a/l10n/lt_LT/admin_migrate.po b/l10n/lt_LT/admin_migrate.po
index d35d28001f..8f3d5927ff 100644
--- a/l10n/lt_LT/admin_migrate.po
+++ b/l10n/lt_LT/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"PO-Revision-Date: 2012-08-22 14:12+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Eksportuoti šią ownCloud instaliaciją"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Bus sukurtas archyvas su visais owncloud duomenimis ir failais.\n            Pasirinkite eksportavimo tipą:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Eksportuoti"
diff --git a/l10n/lt_LT/bookmarks.po b/l10n/lt_LT/bookmarks.po
index fbda0e4853..4593ae1ec6 100644
--- a/l10n/lt_LT/bookmarks.po
+++ b/l10n/lt_LT/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"PO-Revision-Date: 2012-08-22 12:36+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "be pavadinimo"
 
 #: templates/bookmarklet.php:5
 msgid ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 9e43e59aa8..48be013efd 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "Tai ne jūsų adresų knygelė."
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresas"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefonas"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "El. paštas"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizacija"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobilusis"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Žinučių"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Balso"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Žinutė"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Faksas"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vaizdo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pranešimų gaviklis"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internetas"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Gimtadienis"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobilusis"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Žinučių"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Balso"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Žinutė"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faksas"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vaizdo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pranešimų gaviklis"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internetas"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Gimtadienis"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizacija"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Trinti"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Slapyvardis"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefonas"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "El. paštas"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresas"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Atsisųsti kontaktą"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Ištrinti kontaktą"
 
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 098eec3378..41529366d3 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 12:29+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Šifravimas"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Nešifruoti pasirinkto tipo failų"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Nieko"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Įjungti šifravimą"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index c24158d494..d4208432fa 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 12:31+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigūracija"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Nustatymai"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -47,23 +48,23 @@ msgstr ""
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nieko nepasirinkta"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Visi vartotojai"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupės"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Vartotojai"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Ištrinti"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index e0bf0afb6e..d1693bb806 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,48 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Dydis"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Pakeista"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Ištrinti viską"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
-msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Ištrinti"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 32374a3c35..78d03bc051 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 12:34+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Panaikinti visų versijų galiojimą"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Įjungti failų versijų vedimą"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 11f020d545..cf1cc1edba 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 12:43+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,53 +18,53 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Pagalba"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Asmeniniai"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Nustatymai"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Vartotojai"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Programos"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Administravimas"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
-msgstr ""
+msgstr "Atgal į Failus"
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Programa neįjungta"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentikacijos klaida"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -75,29 +76,29 @@ msgstr ""
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "prieš 1 minutę"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "prieš %d minučių"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "šiandien"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "vakar"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "prieš %d dienų"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "praėjusį mėnesį"
 
 #: template.php:95
 msgid "months ago"
@@ -105,7 +106,7 @@ msgstr ""
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "pereitais metais"
 
 #: template.php:97
 msgid "years ago"
diff --git a/l10n/lt_LT/tasks.po b/l10n/lt_LT/tasks.po
index 5bbe766c2b..4d53aef5a7 100644
--- a/l10n/lt_LT/tasks.po
+++ b/l10n/lt_LT/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 14:05+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Netinkama data/laikas"
 
 #: appinfo/app.php:11
 msgid "Tasks"
@@ -27,7 +28,7 @@ msgstr ""
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Be kategorijos"
 
 #: lib/app.php:33
 msgid "Unspecified"
@@ -47,11 +48,11 @@ msgstr ""
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Tuščias aprašymas"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Netinkamas baigimo procentas"
 
 #: lib/app.php:107
 msgid "Invalid priority"
@@ -91,16 +92,16 @@ msgstr ""
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Svarbūs"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Daugiau"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Mažiau"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Ištrinti"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 4002c36aa5..d648d9ba0c 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 13:55+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Slaptažodis"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Grupės filtras"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Prievadas"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Naudoti TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -123,7 +124,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Išjungti SSL sertifikato tikrinimą."
 
 #: templates/settings.php:23
 msgid ""
@@ -133,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Nerekomenduojama, naudokite tik testavimui."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -161,4 +162,4 @@ msgstr ""
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Pagalba"
diff --git a/l10n/lt_LT/user_migrate.po b/l10n/lt_LT/user_migrate.po
index 391a7cbec4..a0c8819f79 100644
--- a/l10n/lt_LT/user_migrate.po
+++ b/l10n/lt_LT/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 13:34+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Eksportuoti"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Įvyko klaida kuriant eksportuojamą failą"
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Įvyko klaida"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Eksportuoti jūsų vartotojo paskyrą"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Bus sukurtas suglaudintas failas su jūsų ownCloud vartotojo paskyra."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Importuoti vartotojo paskyrą"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ownCloud vartotojo paskyros Zip archyvas"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importuoti"
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 9fcc9e8371..00752ef4f3 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 23294d9264..4d7325ca83 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 7d9b11971e..2ad7a9d568 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "Барем една од полињата за адреса треба 
 msgid "Trying to add duplicate property: "
 msgstr "Се обидовте да внесете дупликат вредност:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr "Информацијата за vCard не е точна. Ве мола
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "Не можев да добијам исправна адреса."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Грешка"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Својството не смее да биде празно."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Уреди го името"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Одбери тип"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "Ова не е во Вашиот адресар."
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Адреса"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Телефон"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Е-пошта"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Организација"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Мобилен"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Текст"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Глас"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Порака"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Факс"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Видео"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Пејџер"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Интернет"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Роденден"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Мобилен"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Текст"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Глас"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Порака"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Факс"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Пејџер"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Интернет"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Роденден"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr "Подигни нова фотографија"
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Уреди детали за име"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Организација"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Прекар"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Внеси прекар"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Одвоете ги групите со запирка"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Уреди групи"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Претпочитано"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Ве молам внесете правилна адреса за е-пошта."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Внесете е-пошта"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Прати порака до адреса"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Избриши адреса за е-пошта"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Внесете телефонски број"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Избриши телефонски број"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Погледајте на мапа"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Уреди детали за адреса"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Внесете забелешки тука."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Додади поле"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Е-пошта"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Адреса"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Забелешка"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Преземи го контактот"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Избриши го контактот"
 
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 3b1f31bd8f..eedc221287 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index fac7073e72..81ce53cf5e 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,15 @@ msgstr "Sekurangnya satu ruangan alamat perlu diisikan."
 msgid "Trying to add duplicate property: "
 msgstr "Cuba untuk letak nilai duplikasi:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -116,7 +124,7 @@ msgstr "Maklumat tentang vCard tidak betul."
 msgid "Something went FUBAR. "
 msgstr "Sesuatu tidak betul."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
@@ -240,58 +248,59 @@ msgid "Couldn't get a valid address."
 msgstr "Tidak boleh mendapat alamat yang sah."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Ralat"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Nilai ini tidak boleh kosong."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Ubah nama"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "PIlih jenis"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -323,117 +332,148 @@ msgstr "Ini bukan buku alamat anda."
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Alamat"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Emel"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisasi"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mudah alih"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Teks"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Suara"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mesej"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Alat Kelui"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Hari lahir"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Perniagaan"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "klien"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Hari kelepasan"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Idea"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Perjalanan"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Jubli"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Mesyuarat"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Lain"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mudah alih"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Teks"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Suara"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mesej"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Alat Kelui"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Hari lahir"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Perniagaan"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "klien"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Hari kelepasan"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Idea"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Perjalanan"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Jubli"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Mesyuarat"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Peribadi"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projek"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -533,113 +573,139 @@ msgstr "Muatnaik foto baru"
 msgid "Select photo from ownCloud"
 msgstr "Pilih foto dari ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Ubah butiran nama"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisasi"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Nama Samaran"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Masukkan nama samaran"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Asingkan kumpulan dengan koma"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Ubah kumpulan"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Pilihan"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Berikan alamat emel yang sah."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Masukkan alamat emel"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Hantar ke alamat"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Padam alamat emel"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Masukkan nombor telefon"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Padam nombor telefon"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Lihat pada peta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Ubah butiran alamat"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Letak nota disini."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Letak ruangan"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Emel"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Alamat"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Muat turun hubungan"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Padam hubungan"
 
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index fcfd01e9c5..ced7a00ab3 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index f1a0fe0237..c9fd76eadc 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,15 @@ msgstr "Minst en av adressefeltene må oppgis."
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -115,7 +123,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
@@ -239,58 +247,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Feil"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Endre navn"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Velg type"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -322,117 +331,148 @@ msgstr "Dette er ikke dine adressebok."
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresse"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-post"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisasjon"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Svarer"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Melding"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internett"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Bursdag"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Svarer"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Melding"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internett"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -532,113 +572,139 @@ msgstr "Last opp nytt bilde"
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Endre detaljer rundt navn"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Skriv inn kallenavn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Skill gruppene med komma"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Endre grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Vennligst angi en gyldig e-postadresse."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Skriv inn e-postadresse"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Send e-post til adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Fjern e-postadresse"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Skriv inn telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Fjern telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Se på kart"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Endre detaljer rundt adresse"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Legg inn notater her."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Legg til felt"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-post"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresse"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Notat"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Hend ned kontakten"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 8e9e4e2bac..4d6f006b63 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index ed1f0dac86..02f89400d3 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,15 @@ msgstr "Minstens één van de adresvelden moet ingevuld worden."
 msgid "Trying to add duplicate property: "
 msgstr "Eigenschap bestaat al: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -116,7 +124,7 @@ msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
@@ -240,58 +248,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -323,117 +332,148 @@ msgstr "Dit is niet uw adresboek."
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adres"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefoon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisatie"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobiel"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Stem"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Bericht"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pieper"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Verjaardag"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobiel"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Stem"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Bericht"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pieper"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Verjaardag"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -533,113 +573,139 @@ msgstr "Upload nieuwe foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Wijzig naam gegevens"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisatie"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Roepnaam"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Voer roepnaam in"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Gebruik komma bij meerder groepen"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Wijzig groepen"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Voorkeur"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Geef een geldig email adres op."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Voer email adres in"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Mail naar adres"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Verwijder email adres"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Voer telefoonnummer in"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Verwijdere telefoonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Bekijk op een kaart"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Wijzig adres gegevens"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Voeg notitie toe"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Voeg veld toe"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefoon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adres"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Notitie"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Download contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Verwijder contact"
 
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 0886b57395..ebeb97ffe9 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 789bd42444..3fead9d32b 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "Minst eit av adressefelta må fyllast ut."
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "Dette er ikkje di adressebok."
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresse"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefonnummer"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Epost"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisasjon"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr "Arbeid"
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
-msgstr "Heime"
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Tale"
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Personsøkjar"
-
-#: lib/app.php:149
-msgid "Internet"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Bursdag"
-
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Ideas"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
+msgstr "Arbeid"
 
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
+msgstr "Heime"
 
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Tale"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Personsøkjar"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Føretrekt"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefonnummer"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Epost"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresse"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Last ned kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 2df026f4c3..1ae9969855 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 0f9dba1bdb..90a4ecec17 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,15 @@ msgstr "Należy wypełnić przynajmniej jedno pole adresu."
 msgid "Trying to add duplicate property: "
 msgstr "Próba dodania z duplikowanej właściwości:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Błąd przy dodawaniu właściwości kontaktu:"
 
@@ -115,7 +123,7 @@ msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
@@ -239,58 +247,59 @@ msgid "Couldn't get a valid address."
 msgstr "Nie można pobrać prawidłowego adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Błąd"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Ta właściwość nie może być pusta."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Zmień nazwę"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Błąd wczytywania zdjęcia profilu."
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Wybierz typ"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Niektóre kontakty są zaznaczone do usunięcia, ale nie są usunięte jeszcze. Proszę czekać na ich usunięcie."
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Czy chcesz scalić te książki adresowe?"
 
@@ -322,117 +331,148 @@ msgstr "To nie jest Twoja książka adresowa."
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adres"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizacja"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Komórka"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Połączenie tekstowe"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Połączenie głosowe"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Wiadomość"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Połączenie wideo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Urodziny"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Biznesowe"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Wywołanie"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Klienci"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Doręczanie"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Święta"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Pomysły"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Podróż"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Jubileusz"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Spotkanie"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Inne"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Komórka"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Połączenie tekstowe"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Połączenie głosowe"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Wiadomość"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Połączenie wideo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Urodziny"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Biznesowe"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Wywołanie"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Klienci"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Doręczanie"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Święta"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Pomysły"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Podróż"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Jubileusz"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Spotkanie"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Osobiste"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Pytania"
 
@@ -532,113 +572,139 @@ msgstr "Wczytaj nowe zdjęcie"
 msgid "Select photo from ownCloud"
 msgstr "Wybierz zdjęcie z ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Edytuj szczegóły nazwy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizacja"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Usuwa książkę adresową"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Nazwa"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Wpisz nazwę"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Strona www"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.jakasstrona.pl"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Idż do strony www"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-rrrr"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddziel grupy przecinkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Edytuj grupy"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferowane"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Określ prawidłowy adres e-mail."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Wpisz adres email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Mail na adres"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Usuń adres mailowy"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Wpisz numer telefonu"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Usuń numer telefonu"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Edytuj szczegóły adresu"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Dodaj notatkę tutaj."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Dodaj pole"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adres"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Uwaga"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Pobiera kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Usuwa kontakt"
 
@@ -851,7 +917,7 @@ msgstr "Pokaż tylko do odczytu łącze VCF"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Udostępnij"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index f37135ec95..576158713d 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,48 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Rozmiar"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Zmodyfikowane"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Usuń wszystko"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Usuń"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Twoje udostępnione pliki"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Element"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Udostępnione dla"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Uprawnienia"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Odczyt"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Edycja"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Włącz ponowne udostępnianie"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index d5041bbe00..4bc13b9d36 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "Pelo menos um dos campos de endereço tem que ser preenchido."
 msgid "Trying to add duplicate property: "
 msgstr "Tentando adiciona propriedade duplicada:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -114,7 +122,7 @@ msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Selecione o tipo"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Esta não é a sua agenda de endereços."
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Endereço"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefone"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organização"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Móvel"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mensagem"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Aniversário"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Móvel"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mensagem"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +571,139 @@ msgstr "Carregar nova foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecionar foto do OwnCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organização"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Apelido"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Digite o apelido"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe grupos por virgula"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Por favor, especifique um email válido."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Digite um endereço de email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Correio para endereço"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Remover endereço de email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Digite um número de telefone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Remover número de telefone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Visualizar no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Editar detalhes de endereço"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Adicionar notas"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Endereço"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Baixar contato"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Apagar contato"
 
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 9b31f0776f..3e73c6ab3c 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index bac0428b76..636cbc1a13 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
 msgid "Trying to add duplicate property: "
 msgstr "A tentar adicionar propriedade duplicada: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -114,7 +122,7 @@ msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a pá
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Seleccionar tipo"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Esta não é a sua lista de contactos"
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Morada"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefone"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organização"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Telemovel"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Texto"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voz"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mensagem"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Vídeo"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Aniversário"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Telemovel"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mensagem"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +571,139 @@ msgstr "Carregar nova foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecionar uma foto da ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organização"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Apagar"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introduza alcunha"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe os grupos usando virgulas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Por favor indique um endereço de correio válido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Introduza endereço de email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Enviar correio para o endereço"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Eliminar o endereço de correio"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Insira o número de telefone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Eliminar o número de telefone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Editar os detalhes do endereço"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Insira notas aqui."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Morada"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Transferir contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Apagar contato"
 
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 6428ee48f2..3a92189327 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 3c62b58926..b1331df7f9 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "Cel puțin unul din câmpurile adresei trebuie completat."
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -114,7 +122,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Nu se găsește în agendă."
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresă"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizație"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Text"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Voce"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Mesaj"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Zi de naștere"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Voce"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Mesaj"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Zi de naștere"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +571,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Introdu detalii despre nume"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizație"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introdu pseudonim"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "zz-ll-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separă grupurile cu virgule"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editează grupuri"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Preferat"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Te rog să specifici un e-mail corect"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Introdu adresa de e-mail"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Trimite mesaj la e-mail"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Șterge e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresă"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Descarcă acest contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Șterge contact"
 
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index e5d92d2c9d..ab93603538 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 40eef069ce..89fbeeba7c 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,15 @@ msgstr "Как минимум одно поле адреса должно быт
 msgid "Trying to add duplicate property: "
 msgstr "При попытке добавить дубликат:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -118,7 +126,7 @@ msgstr "Информация о vCard не корректна. Перезагр
 msgid "Something went FUBAR. "
 msgstr "Что-то пошло FUBAR."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
@@ -242,58 +250,59 @@ msgid "Couldn't get a valid address."
 msgstr "Не удалось получить адрес."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Это свойство должно быть не пустым."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Изменить имя"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Выберите тип"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -325,117 +334,148 @@ msgstr "Это не ваша адресная книга."
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Адрес"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Телефон"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Ящик эл. почты"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Организация"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Мобильный"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Текст"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Голос"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Сообщение"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Факс"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Видео"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Пейджер"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Интернет"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "День рождения"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Текст"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Голос"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Сообщение"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Факс"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Пейджер"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Интернет"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "День рождения"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -535,113 +575,139 @@ msgstr "Загрузить новую фотографию"
 msgid "Select photo from ownCloud"
 msgstr "Выбрать фотографию из ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Формат Краткое имя, Полное имя"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Изменить детали имени"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Организация"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Введите псевдоним"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Разделить группы запятыми"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Редактировать группы"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Предпочитаемый"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Укажите действительный адрес электронной почты."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Укажите адрес электронной почты"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Написать по адресу"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Удалить адрес электронной почты"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Ввести номер телефона"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Удалить номер телефона"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Показать на карте"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Ввести детали адреса"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Добавьте заметки здесь."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Добавить поле"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Ящик эл. почты"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Адрес"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Заметка"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Скачать контакт"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Удалить контакт"
 
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 8a9650f532..915d33bafb 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index 8986c83e14..c04d76ec84 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "Musí byť uvedený aspoň jeden adresný údaj."
 msgid "Trying to add duplicate property: "
 msgstr "Pokúšate sa pridať rovnaký atribút:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -114,7 +122,7 @@ msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Vybrať typ"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Toto nie je váš adresár."
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresa"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefón"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizácia"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "SMS"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Odkazová schránka"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "Správa"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pager"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "Internet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Narodeniny"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "Biznis"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Klienti"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Prázdniny"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Stretnutie"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Iné"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Odkazová schránka"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "Správa"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pager"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Narodeniny"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "Biznis"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Klienti"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Prázdniny"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Stretnutie"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Otázky"
 
@@ -531,113 +571,139 @@ msgstr "Nahrať novú fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Upraviť podrobnosti mena"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizácia"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Zadajte prezývku"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddelte skupiny čiarkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Úprava skupín"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Uprednostňované"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Prosím zadajte platnú e-mailovú adresu."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Zadajte e-mailové adresy"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Odoslať na adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Odstrániť e-mailové adresy"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Zadajte telefónne číslo"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Odstrániť telefónne číslo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Upraviť podrobnosti adresy"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Tu môžete pridať poznámky."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Pridať pole"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefón"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresa"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Stiahnuť kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Odstrániť kontakt"
 
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 0a0ea8cd90..3a4f00533b 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 6878e60f69..d8f9686ed1 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 10:47+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,15 @@ msgstr "Vsaj eno izmed polj je še potrebno izpolniti."
 msgid "Trying to add duplicate property: "
 msgstr "Poskušam dodati podvojeno lastnost:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Napaka pri dodajanju lastnosti stiku:"
 
@@ -114,7 +122,7 @@ msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Ne morem dobiti veljavnega naslova."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Napaka"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Ta lastnost ne sme biti prazna"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Uredi ime"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Napaka pri nalaganju slike profila."
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Izberite vrsto"
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Ali želite združiti adresarje?"
 
@@ -321,117 +330,148 @@ msgstr "To ni vaš imenik."
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Naslov"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-pošta"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizacija"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Drugo"
 
-#: lib/app.php:137
+#: lib/app.php:201
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:139
+#: lib/app.php:203
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:140
+#: lib/app.php:204
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:141
+#: lib/app.php:205
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:142
+#: lib/app.php:206
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:143
+#: lib/app.php:207
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:144
+#: lib/app.php:208
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:151
+#: lib/app.php:215
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:189
+#: lib/app.php:253
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:190
+#: lib/app.php:254
 msgid "Call"
 msgstr "Klic"
 
-#: lib/app.php:191
+#: lib/app.php:255
 msgid "Clients"
 msgstr "Stranka"
 
-#: lib/app.php:192
+#: lib/app.php:256
 msgid "Deliverer"
 msgstr "Dostavljalec"
 
-#: lib/app.php:193
+#: lib/app.php:257
 msgid "Holidays"
 msgstr "Prazniki"
 
-#: lib/app.php:194
+#: lib/app.php:258
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:195
+#: lib/app.php:259
 msgid "Journey"
 msgstr "Potovanje"
 
-#: lib/app.php:196
+#: lib/app.php:260
 msgid "Jubilee"
 msgstr "Jubilej"
 
-#: lib/app.php:197
+#: lib/app.php:261
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: lib/app.php:199
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Osebno"
 
-#: lib/app.php:200
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:201
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Vprašanja"
 
@@ -531,113 +571,139 @@ msgstr "Naloži novo sliko"
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Uredite podrobnosti imena"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizacija"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Vnesite vzdevek"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Spletna stran"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.nekastran.si"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Pojdi na spletno stran"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Skupine ločite z vejicami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Uredi skupine"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Prednosten"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Prosimo, če navedete veljaven e-poštni naslov."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Vnesite e-poštni naslov"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "E-pošta naslovnika"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Izbriši e-poštni naslov"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Vpiši telefonsko številko"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Izbriši telefonsko številko"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Uredi podrobnosti"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Opombe dodajte tukaj."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-pošta"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Naslov"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Opomba"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Prenesi stik"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Izbriši stik"
 
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index cefc893aab..56ed4e9046 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 10:53+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,38 +30,6 @@ msgstr "Spremenjeno"
 msgid "Delete all"
 msgstr "Izbriši vse"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Izbris"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Vaše datoteke v souporabi"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Predmet"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "V souporabi z"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Dovoljenja"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Branje"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Pisanje"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Omogoči nadaljnjo izmenjavo"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 2a30832696..477d3c9a5b 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index 2915fa0f8a..c05e0f049b 100644
--- a/l10n/so/files_sharing.po
+++ b/l10n/so/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 4c6537047c..d3d0b16a25 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "Ово није ваш адресар."
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Адреса"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Телефон"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Е-маил"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Организација"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr "Посао"
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
-msgstr "Кућа"
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr "Мобилни"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Текст"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Глас"
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
-msgstr "Факс"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Видео"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Пејџер"
-
-#: lib/app.php:149
-msgid "Internet"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Рођендан"
-
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Ideas"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
+msgstr "Посао"
 
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
+msgstr "Кућа"
 
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Мобилни"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Текст"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Глас"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Факс"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Пејџер"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Рођендан"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Организација"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Пожељан"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Е-маил"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Адреса"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Преузми контакт"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Обриши контакт"
 
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 0b3da46c84..b7dbb671d2 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 64e506d3e2..86167ff2b7 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "Ovo nije vaš adresar."
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adresa"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-mail"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizacija"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr "Posao"
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
-msgstr "Kuća"
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobilni"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Glas"
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Pejdžer"
-
-#: lib/app.php:149
-msgid "Internet"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Rođendan"
-
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Ideas"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
+msgstr "Posao"
 
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
+msgstr "Kuća"
 
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobilni"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Glas"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Pejdžer"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizacija"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adresa"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 608e5538cc..4f3a03c203 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index b80611b20f..76f7749109 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:16+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,7 +85,15 @@ msgstr "Minst ett fält måste fyllas i."
 msgid "Trying to add duplicate property: "
 msgstr "Försöker lägga till dubblett:"
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Kunde inte lägga till egenskap för kontakt:"
 
@@ -117,7 +125,7 @@ msgstr "Informationen om vCard är fel. Ladda om sidan:"
 msgid "Something went FUBAR. "
 msgstr "Något gick fel."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras."
 
@@ -241,58 +249,59 @@ msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "Fel vid hämtning av profilbild."
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Välj typ"
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "Vill du slå samman dessa adressböcker?"
 
@@ -324,117 +333,148 @@ msgstr "Det här är inte din adressbok."
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adress"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "E-post"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organisation"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Annat"
 
-#: lib/app.php:137
+#: lib/app.php:201
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:139
+#: lib/app.php:203
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:140
+#: lib/app.php:204
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:141
+#: lib/app.php:205
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:142
+#: lib/app.php:206
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:143
+#: lib/app.php:207
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:144
+#: lib/app.php:208
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:151
+#: lib/app.php:215
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:189
+#: lib/app.php:253
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:190
+#: lib/app.php:254
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:191
+#: lib/app.php:255
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:192
+#: lib/app.php:256
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:193
+#: lib/app.php:257
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:194
+#: lib/app.php:258
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:195
+#: lib/app.php:259
 msgid "Journey"
 msgstr "Resa"
 
-#: lib/app.php:196
+#: lib/app.php:260
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:197
+#: lib/app.php:261
 msgid "Meeting"
 msgstr "Möte"
 
-#: lib/app.php:199
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:200
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:201
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Frågor"
 
@@ -534,113 +574,139 @@ msgstr "Ladda upp ett nytt foto"
 msgid "Select photo from ownCloud"
 msgstr "Välj foto från ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Redigera detaljer för namn"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organisation"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Ange smeknamn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Webbplats"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Gå till webbplats"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separera grupperna med kommatecken"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editera grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Föredragen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Vänligen ange en giltig e-postadress."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Ange e-postadress"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Posta till adress."
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Ta bort e-postadress"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Ange telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Ta bort telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Visa på karta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Redigera detaljer för adress"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Lägg till noteringar här."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Lägg till fält"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "E-post"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adress"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Notering"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Ladda ner kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Radera kontakt"
 
@@ -709,7 +775,7 @@ msgstr "Adressbok"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Ledande titlar"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
@@ -717,7 +783,7 @@ msgstr "Fröken"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
@@ -729,11 +795,11 @@ msgstr "Herr"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr "Fröken"
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr "Dr"
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -749,23 +815,23 @@ msgstr "Efternamn"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Efterställda titlar"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Kand. Jur."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
@@ -773,15 +839,15 @@ msgstr "Fil.dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 63a3832a8a..dada4f4e79 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:18+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,38 +30,6 @@ msgstr "Ändrad"
 msgid "Delete all"
 msgstr "Radera alla"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "Radera"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "Dina delade filer"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "Objekt"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "Delad med"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "Rättigheter"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "Läsa"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "Ändra"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "Aktivera dela vidare"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "Tillåter användare att dela filer som dom inte äger"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 8d10b24232..f764a35f03 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:38+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 06:21+0000\n"
 "Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Språk"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Hjälp med att översätta"
+msgstr "Hjälp att översätta"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 946b15d6e0..2dba8fbd98 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:03+0200\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 71015c4e7d..4181234bd7 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:03+0200\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 9e177dd19c..1b7986d9ec 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:03+0200\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 250f185f06..64c1bfbc7a 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:03+0200\n"
+"POT-Creation-Date: 2012-08-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 739ad269aa..0f2d236e84 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1252 js/contacts.js:1264
-#: js/contacts.js:1287 js/contacts.js:1449 js/contacts.js:1484
-#: js/contacts.js:1504 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1239
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1336 js/contacts.js:1356 js/contacts.js:1399
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1418
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1489
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:138 lib/app.php:149 lib/app.php:202
-msgid "Work"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
-#: lib/app.php:131 lib/app.php:136 lib/app.php:150
-msgid "Home"
-msgstr ""
-
-#: lib/app.php:132 lib/app.php:145 lib/app.php:198 lib/vcard.php:568
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:137
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Voice"
+#: lib/app.php:136
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Message"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Fax"
-msgstr ""
-
-#: lib/app.php:143
-msgid "Video"
-msgstr ""
-
-#: lib/app.php:144
-msgid "Pager"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
 #: lib/app.php:151
-msgid "Internet"
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:188 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Business"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Call"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Clients"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Deliverer"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Holidays"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:194
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:196
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:197
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:199
-msgid "Personal"
-msgstr ""
-
-#: lib/app.php:200
-msgid "Projects"
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+msgid "Other"
 msgstr ""
 
 #: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:264
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a4d67b8590..8725bc18e0 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 6a03df0a3f..492f799bc4 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ec59f140aa..38ba359a36 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 261ebbe47d..a1a5bbbc70 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 10f198d116..b28da22f16 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 972b1a9cc0..6b8ba22c84 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index dcedc2ed72..cefacba35d 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 4a98ab4510..65698be223 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 17de59f15b..8e90e6ba95 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index b692d0455d..478e38ceeb 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 0cbcb4d192..6244d641a8 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 046a557866..8a8e151d2d 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index dad3a74848..608bfdc3aa 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index ee88b70960..6f9b19d8c6 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 8877a0fd64..2ab911cc3a 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "อย่างน้อยที่สุดช่องข้อมู
 msgid "Trying to add duplicate property: "
 msgstr "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ"
 
@@ -113,7 +121,7 @@ msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณา
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว"
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "เลือกชนิด"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?"
 
@@ -320,117 +329,148 @@ msgstr "นี่ไม่ใช่สมุดบันทึกที่อย
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "ที่อยู่"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "โทรศัพท์"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "อีเมล์"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "หน่วยงาน"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "มือถือ"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "ข้อความ"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "เสียงพูด"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "ข้อความ"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "โทรสาร"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "วีดีโอ"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "เพจเจอร์"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "อินเทอร์เน็ต"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "วันเกิด"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "ธุรกิจ"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "โทร"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "ลูกค้า"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "ผู้จัดส่ง"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "วันหยุด"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "ไอเดีย"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "การเดินทาง"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "งานเฉลิมฉลอง"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "ประชุม"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "มือถือ"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "ข้อความ"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "เสียงพูด"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "ข้อความ"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "โทรสาร"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "วีดีโอ"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "เพจเจอร์"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "อินเทอร์เน็ต"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "วันเกิด"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "ธุรกิจ"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "โทร"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "ลูกค้า"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "ผู้จัดส่ง"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "วันหยุด"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "ไอเดีย"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "การเดินทาง"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "งานเฉลิมฉลอง"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "ประชุม"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "โปรเจค"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "คำถาม"
 
@@ -530,113 +570,139 @@ msgstr "อัพโหลดรูปภาพใหม่"
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "แก้ไขรายละเอียดของชื่อ"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "หน่วยงาน"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "กรอกชื่อเล่น"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "เว็บไซต์"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "ไปที่เว็บไซต์"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "แก้ไขกลุ่ม"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "พิเศษ"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "กรอกที่อยู่อีเมล"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "ส่งอีเมลไปที่"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "ลบที่อยู่อีเมล"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "กรอกหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "ลบหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "ดูบนแผนที่"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "แก้ไขรายละเอียดที่อยู่"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "เพิ่มช่องรับข้อมูล"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "โทรศัพท์"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "อีเมล์"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "ที่อยู่"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "หมายเหตุ"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "ลบข้อมูลการติดต่อ"
 
@@ -849,7 +915,7 @@ msgstr "แสดงลิงก์ VCF สำหรับอ่านเท่
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "แชร์"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 8b9059df3f..6e5fafa72c 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -20,48 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "ขนาด"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "แก้ไขแล้ว"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "ลบทั้งหมด"
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr "ลบ"
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr "ไฟล์ของคุณที่แชร์ไว้"
-
-#: templates/list.php:6
-msgid "Item"
-msgstr "ไอเท็ม"
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr "แชร์พร้อมกับ"
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr "สิทธิ์การเข้าใช้งาน"
-
-#: templates/list.php:16
-msgid "Read"
-msgstr "อ่าน"
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr "แก้ไข"
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr "เปิดให้มีการแชร์ใหม่อีกครั้งได้"
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index d4e8110d11..b87bd07fa5 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 16:00+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-22 18:47+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "กรุณาอย่าใช้การเชื่อมต่อ
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 2a4251ad02..4a13c3fd84 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "En az bir adres alanı doldurulmalı."
 msgid "Trying to add duplicate property: "
 msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
@@ -114,7 +122,7 @@ msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "Geçerli bir adres alınamadı."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Hata"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "Bu özellik boş bırakılmamalı."
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "İsmi düzenle"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "Tür seç"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "Bu sizin adres defteriniz değil."
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Adres"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Eposta"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Organizasyon"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "Mobil"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Metin"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Ses"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "mesaj"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "Faks"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Sayfalayıcı"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "İnternet"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Doğum günü"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr "İş"
-
-#: lib/app.php:188
-msgid "Call"
-msgstr "Çağrı"
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr "Müşteriler"
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr "Dağıtıcı"
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr "Tatiller"
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr "Fikirler"
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr "Seyahat"
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr "Yıl Dönümü"
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr "Toplantı"
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr "Diğer"
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Metin"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Ses"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "mesaj"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Sayfalayıcı"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "İnternet"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Doğum günü"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr "İş"
+
+#: lib/app.php:254
+msgid "Call"
+msgstr "Çağrı"
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr "Müşteriler"
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr "Dağıtıcı"
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr "Tatiller"
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr "Fikirler"
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr "Seyahat"
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr "Yıl Dönümü"
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr "Toplantı"
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr "Kişisel"
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr "Projeler"
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr "Sorular"
 
@@ -531,113 +571,139 @@ msgstr "Yeni fotoğraf yükle"
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "İsim detaylarını düzenle"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Organizasyon"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Takma adı girin"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr "Web sitesi"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Web sitesine git"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "gg-aa-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Grupları birbirinden virgülle ayırın"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Grupları düzenle"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "Tercih edilen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "Lütfen geçerli bir eposta adresi belirtin."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "Eposta adresini girin"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "Eposta adresi"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "Eposta adresini sil"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "Telefon numarasını gir"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "Telefon numarasını sil"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "Haritada gör"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "Adres detaylarını düzenle"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "Notları buraya ekleyin."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "Alan ekle"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Eposta"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Adres"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "Not"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "Kişiyi indir"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Kişiyi sil"
 
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 9c3811ac32..3f6c26efdc 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 11f555f3db..44cbbb1329 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr "Має бути заповнено щонайменше одне пол
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr "Це не ваша адресна книга."
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Адреса"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Телефон"
-
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Ел.пошта"
-
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Організація"
-
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
+
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr "Мобільний"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "Текст"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "Голос"
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
-msgstr "Факс"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Відео"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "Пейджер"
-
-#: lib/app.php:149
-msgid "Internet"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "День народження"
-
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Ideas"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Journey"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:194
-msgid "Jubilee"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Мобільний"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "Текст"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "Голос"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Факс"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Відео"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "Пейджер"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "День народження"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Організація"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Ел.пошта"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Адреса"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Видалити контакт"
 
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 736b17eebc..4786918c70 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index c0310d9554..2191817259 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -112,7 +120,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -236,58 +244,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -319,117 +328,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "Địa chỉ"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "Điện thoại bàn"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "Email"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "Tổ chức"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr "Công việc"
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
-msgstr "Nhà"
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr "Di động"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
-msgstr "Fax"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "Video"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "số trang"
-
-#: lib/app.php:149
-msgid "Internet"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "Ngày sinh nhật"
-
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:192
-msgid "Ideas"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
+msgstr "Công việc"
 
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
+msgstr "Nhà"
 
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "Di động"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "số trang"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "Ngày sinh nhật"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -529,113 +569,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "Tổ chức"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "Email"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "Địa chỉ"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "Xóa liên lạc"
 
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 7f9dea863b..87e7cce9bd 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
index ea3990d546..fe6cef016c 100644
--- a/l10n/zh_CN.GB2312/contacts.po
+++ b/l10n/zh_CN.GB2312/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,15 @@ msgstr ""
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -111,7 +119,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr ""
 
@@ -235,58 +243,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -318,117 +327,148 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr ""
-
 #: lib/app.php:116
-msgid "Telephone"
+msgid "Jabber"
 msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
+#: lib/app.php:121
+msgid "AIM"
 msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
+#: lib/app.php:126
+msgid "MSN"
 msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
-msgid "Home"
+#: lib/app.php:131
+msgid "Twitter"
 msgstr ""
 
 #: lib/app.php:136
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:138
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:140
-msgid "Message"
+msgid "GoogleTalk"
 msgstr ""
 
 #: lib/app.php:141
-msgid "Fax"
+msgid "Facebook"
 msgstr ""
 
-#: lib/app.php:142
-msgid "Video"
+#: lib/app.php:146
+msgid "XMPP"
 msgstr ""
 
-#: lib/app.php:143
-msgid "Pager"
+#: lib/app.php:151
+msgid "ICQ"
 msgstr ""
 
-#: lib/app.php:149
-msgid "Internet"
+#: lib/app.php:156
+msgid "Yahoo"
 msgstr ""
 
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
+#: lib/app.php:161
+msgid "Skype"
 msgstr ""
 
-#: lib/app.php:187
-msgid "Business"
+#: lib/app.php:166
+msgid "QQ"
 msgstr ""
 
-#: lib/app.php:188
-msgid "Call"
+#: lib/app.php:171
+msgid "GaduGadu"
 msgstr ""
 
-#: lib/app.php:189
-msgid "Clients"
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
+msgid "Work"
 msgstr ""
 
-#: lib/app.php:190
-msgid "Deliverer"
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
+msgid "Home"
 msgstr ""
 
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:203
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:205
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:207
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -528,113 +568,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr ""
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr ""
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr ""
 
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index b567f3ded2..0243a9ebaa 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index c4f13a9333..a0c859909c 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,15 @@ msgstr "至少需要填写一项地址。"
 msgid "Trying to add duplicate property: "
 msgstr "试图添加重复属性： "
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -114,7 +122,7 @@ msgstr "vCard 信息不正确。请刷新页面: "
 msgid "Something went FUBAR. "
 msgstr "有一些信息无法被处理。"
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
@@ -238,58 +246,59 @@ msgid "Couldn't get a valid address."
 msgstr "无法获取一个合法的地址。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "错误"
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr "这个属性必须是非空的"
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr "无法序列化元素"
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr "编辑名称"
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr "选择类型"
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -321,117 +330,148 @@ msgstr "这不是您的地址簿。"
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "地址"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "电话"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "电子邮件"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "组织"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "移动电话"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "文本"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "语音"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "消息"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "传真"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "视频"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "传呼机"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "互联网"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "生日"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "移动电话"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "文本"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "语音"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "消息"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "传真"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "视频"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "传呼机"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "互联网"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -531,113 +571,139 @@ msgstr "上传新照片"
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "自定义格式，简称，全名，姓在前，姓在前并用逗号分割"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "编辑名称详情"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "组织"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "删除"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "昵称"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "输入昵称"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "分组"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "用逗号隔开分组"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "编辑分组"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "偏好"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "请指定合法的电子邮件地址"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "输入电子邮件地址"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "发送邮件到地址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "删除电子邮件地址"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "输入电话号码"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "删除电话号码"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr "在地图上显示"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "编辑地址细节。"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "添加注释。"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "添加字段"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "电话"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "电子邮件"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "地址"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "注释"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "下载联系人"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "删除联系人"
 
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index cfd1d21785..6c3271e513 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index bf7bf3b0d6..401a338532 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,15 @@ msgstr "至少必須填寫一欄地址"
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:144
+#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
+msgid "Missing IM parameter."
+msgstr ""
+
+#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
+msgid "Unknown IM: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:158
 msgid "Error adding contact property: "
 msgstr ""
 
@@ -113,7 +121,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:144
+#: ajax/contact/saveproperty.php:166
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
@@ -237,58 +245,59 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:852
-#: js/contacts.js:858 js/contacts.js:870 js/contacts.js:904
-#: js/contacts.js:1167 js/contacts.js:1175 js/contacts.js:1184
-#: js/contacts.js:1219 js/contacts.js:1251 js/contacts.js:1263
-#: js/contacts.js:1286 js/contacts.js:1441 js/contacts.js:1476
-#: js/contacts.js:1496 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
+#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
+#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
+#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:716
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:742
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:852 js/contacts.js:870
+#: js/contacts.js:859 js/contacts.js:877
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:886
+#: js/contacts.js:893
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1167
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1175
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1238
+#: js/contacts.js:1245
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1332 js/contacts.js:1352 js/contacts.js:1391
+#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
+#: js/contacts.js:1474
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1410
+#: js/contacts.js:1492
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1481
+#: js/contacts.js:1563
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -320,117 +329,148 @@ msgstr "這不是你的電話簿"
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:115 templates/part.contact.php:116
-msgid "Address"
-msgstr "地址"
-
 #: lib/app.php:116
-msgid "Telephone"
-msgstr "電話"
+msgid "Jabber"
+msgstr ""
 
-#: lib/app.php:117 templates/part.contact.php:115
-msgid "Email"
-msgstr "電子郵件"
+#: lib/app.php:121
+msgid "AIM"
+msgstr ""
 
-#: lib/app.php:118 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
-msgid "Organization"
-msgstr "組織"
+#: lib/app.php:126
+msgid "MSN"
+msgstr ""
 
-#: lib/app.php:130 lib/app.php:137 lib/app.php:147 lib/app.php:200
+#: lib/app.php:131
+msgid "Twitter"
+msgstr ""
+
+#: lib/app.php:136
+msgid "GoogleTalk"
+msgstr ""
+
+#: lib/app.php:141
+msgid "Facebook"
+msgstr ""
+
+#: lib/app.php:146
+msgid "XMPP"
+msgstr ""
+
+#: lib/app.php:151
+msgid "ICQ"
+msgstr ""
+
+#: lib/app.php:156
+msgid "Yahoo"
+msgstr ""
+
+#: lib/app.php:161
+msgid "Skype"
+msgstr ""
+
+#: lib/app.php:166
+msgid "QQ"
+msgstr ""
+
+#: lib/app.php:171
+msgid "GaduGadu"
+msgstr ""
+
+#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:131 lib/app.php:135 lib/app.php:148
+#: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:136
-msgid "Mobile"
-msgstr "行動電話"
-
-#: lib/app.php:138
-msgid "Text"
-msgstr "文字"
-
-#: lib/app.php:139
-msgid "Voice"
-msgstr "語音"
-
-#: lib/app.php:140
-msgid "Message"
-msgstr "訊息"
-
-#: lib/app.php:141
-msgid "Fax"
-msgstr "傳真"
-
-#: lib/app.php:142
-msgid "Video"
-msgstr "影片"
-
-#: lib/app.php:143
-msgid "Pager"
-msgstr "呼叫器"
-
-#: lib/app.php:149
-msgid "Internet"
-msgstr "網際網路"
-
-#: lib/app.php:186 templates/part.contact.php:44
-#: templates/part.contact.php:113
-msgid "Birthday"
-msgstr "生日"
-
-#: lib/app.php:187
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:188
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:189
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:190
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:191
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:192
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:193
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:194
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:195
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:196
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:197
+#: lib/app.php:201
+msgid "Mobile"
+msgstr "行動電話"
+
+#: lib/app.php:203
+msgid "Text"
+msgstr "文字"
+
+#: lib/app.php:204
+msgid "Voice"
+msgstr "語音"
+
+#: lib/app.php:205
+msgid "Message"
+msgstr "訊息"
+
+#: lib/app.php:206
+msgid "Fax"
+msgstr "傳真"
+
+#: lib/app.php:207
+msgid "Video"
+msgstr "影片"
+
+#: lib/app.php:208
+msgid "Pager"
+msgstr "呼叫器"
+
+#: lib/app.php:215
+msgid "Internet"
+msgstr "網際網路"
+
+#: lib/app.php:252 templates/part.contact.php:45
+#: templates/part.contact.php:128
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:253
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:254
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:255
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:256
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:257
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:258
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:259
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:260
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:261
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:263
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:198
+#: lib/app.php:264
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:199
+#: lib/app.php:265
 msgid "Questions"
 msgstr ""
 
@@ -530,113 +570,139 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "編輯姓名詳細資訊"
 
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49 templates/settings.php:36
+#: templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:126
+msgid "Organization"
+msgstr "組織"
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:36
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:41 templates/part.contact.php:127
 msgid "Nickname"
 msgstr "綽號"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "輸入綽號"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:135
 msgid "Groups"
 msgstr "群組"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "用逗號分隔群組"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "編輯群組"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:59 templates/part.contact.php:73
+#: templates/part.contact.php:98
 msgid "Preferred"
 msgstr "首選"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Please specify a valid email address."
 msgstr "註填入合法的電子郵件住址"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:60
 msgid "Enter email address"
 msgstr "輸入電子郵件地址"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:64
 msgid "Mail to address"
 msgstr "寄送住址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:65
 msgid "Delete email address"
 msgstr "刪除電子郵件住址"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:75
 msgid "Enter phone number"
 msgstr "輸入電話號碼"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:79
 msgid "Delete phone number"
 msgstr "刪除電話號碼"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:100
+msgid "Instant Messenger"
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Delete IM"
+msgstr ""
+
+#: templates/part.contact.php:110
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:110
 msgid "Edit address details"
 msgstr "電子郵件住址詳細資訊"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:116
 msgid "Add notes here."
 msgstr "在這裡新增註解"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:124
 msgid "Add field"
 msgstr "新增欄位"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:129
 msgid "Phone"
 msgstr "電話"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:130
+msgid "Email"
+msgstr "電子郵件"
+
+#: templates/part.contact.php:131
+msgid "Instant Messaging"
+msgstr ""
+
+#: templates/part.contact.php:132
+msgid "Address"
+msgstr "地址"
+
+#: templates/part.contact.php:133
 msgid "Note"
 msgstr "註解"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:138
 msgid "Download contact"
 msgstr "下載通訊錄"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:139
 msgid "Delete contact"
 msgstr "刪除通訊錄"
 
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 73959cb5b4..4a2aa509e9 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:05+0000\n"
+"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"PO-Revision-Date: 2012-08-23 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: templates/get.php:5 templates/list.php:16 templates/list.php:17
+#: templates/get.php:5
 msgid "Delete"
 msgstr ""
-
-#: templates/list.php:2
-msgid "Your Shared Files"
-msgstr ""
-
-#: templates/list.php:6
-msgid "Item"
-msgstr ""
-
-#: templates/list.php:7
-msgid "Shared With"
-msgstr ""
-
-#: templates/list.php:8
-msgid "Permissions"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Read"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Enable Resharing"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Allow users to reshare files they don't own"
-msgstr ""
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
new file mode 100644
index 0000000000..c6702a6228
--- /dev/null
+++ b/lib/l10n/lt_LT.php
@@ -0,0 +1,21 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pagalba",
+"Personal" => "Asmeniniai",
+"Settings" => "Nustatymai",
+"Users" => "Vartotojai",
+"Apps" => "Programos",
+"Admin" => "Administravimas",
+"ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
+"Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.",
+"Back to Files" => "Atgal į Failus",
+"Selected files too large to generate zip file." => "Pasirinkti failai per dideli archyvavimui į ZIP.",
+"Application is not enabled" => "Programa neįjungta",
+"Authentication error" => "Autentikacijos klaida",
+"1 minute ago" => "prieš 1 minutę",
+"%d minutes ago" => "prieš %d minučių",
+"today" => "šiandien",
+"yesterday" => "vakar",
+"%d days ago" => "prieš %d dienų",
+"last month" => "praėjusį mėnesį",
+"last year" => "pereitais metais"
+);
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 5f2eaf2e25..1f0a7965ec 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -51,6 +51,7 @@
 "Create" => "Crear",
 "Default Quota" => "Cuota predeterminada",
 "Other" => "Otro",
+"Group Admin" => "Grupo admin",
 "Quota" => "Cuota",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e02e107ab4..e33eddacb5 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -41,7 +41,7 @@
 "Change password" => "Modifica password",
 "Email" => "Email",
 "Your email address" => "Il tuo indirizzo email",
-"Fill in an email address to enable password recovery" => "Inserici il tuo indirizzo email per abilitare il recupero della password",
+"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index b7249d72da..7603b6b09f 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -43,7 +43,7 @@
 "Your email address" => "Din e-postadress",
 "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
 "Language" => "Språk",
-"Help translate" => "Hjälp med att översätta",
+"Help translate" => "Hjälp att översätta",
 "use this address to connect to your ownCloud in your file manager" => "använd denna adress för att ansluta ownCloud till din filhanterare",
 "Name" => "Namn",
 "Password" => "Lösenord",

From 6941266e7b01350daa35f7633ff5ab66d4e6b9e9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 02:28:11 +0200
Subject: [PATCH 1521/1537] Remove obsolete closure.

---
 apps/contacts/lib/vcard.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index a349449a99..5aa3dd85ed 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -560,19 +560,6 @@ class OC_Contacts_VCard{
 	public static function structureContact($object) {
 		$details = array();
 
-		$addIM = function($name, $temp, &$details) {
-			if(!array_key_exists('IMPP', $details)) {
-				$details['IMPP'] = array();
-			}
-
-			foreach($details['IMPP'] as $im) {
-				if(strtolower($im['value']) == strtolower($temp['value']) && $im['name'] == $name) {
-					return;
-				}
-			}
-			$details['IMPP'][] = $temp;
-		};
-
 		foreach($object->children as $property) {
 			$pname = $property->name;
 			$temp = self::structureProperty($property);

From aefa52018d040863b8348036a0a4048f6e8e10fe Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 05:00:47 +0200
Subject: [PATCH 1522/1537] Use right variable name.

---
 core/js/share.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index a552aa8083..e765303a26 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -106,7 +106,7 @@ OC.Share={
 					OC.Share.showPrivateLink(item, share.share_with);
 				} else {
 					OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
-					
+
 				}
 			});
 		}
@@ -211,7 +211,7 @@ OC.Share={
 		html += '</div>';
 		html += '</li>';
 		$(html).appendTo('#shareWithList');
-		
+
 	},
 	showPrivateLink:function(item, token) {
 		$('#privateLinkCheckbox').attr('checked', true);
@@ -253,9 +253,9 @@ $(document).ready(function() {
 
 	$('a.share').live('click', function(event) {
 		event.stopPropagation();
-		if ($(this).data('item-type') !== undefined && $(this).data('item-source') !== undefined) {
+		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
 			var itemType = $(this).data('item-type');
-			var itemSource = $(this).data('item-source');
+			var itemSource = $(this).data('item');
 			var appendTo = $(this).parent().parent();
 			var privateLink = false;
 			var possiblePermissions = $(this).data('possible-permissions');
@@ -263,7 +263,7 @@ $(document).ready(function() {
 				privateLink = true;
 			}
 			if (OC.Share.droppedDown) {
-				if (item != $('#dropdown').data('item')) {
+				if (itemSource != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
 						OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
 					});
@@ -286,7 +286,7 @@ $(document).ready(function() {
 		// 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')) {
@@ -314,10 +314,10 @@ $(document).ready(function() {
 			OC.Share.itemShares[shareType].splice(index, 1);
 		});
 	});
-	
+
 	$('.permissions').live('change', function() {
 		if ($(this).attr('name') == 'edit') {
-			var li = $(this).parent().parent() 
+			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
@@ -341,7 +341,7 @@ $(document).ready(function() {
 		});
 		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');
@@ -365,7 +365,7 @@ $(document).ready(function() {
 			});
 		}
 	});
-	
+
 	$('#privateLinkText').live('click', function() {
 		$(this).focus();
 		$(this).select();

From 2d97164f807abe0ffad7d655d3c7e019b5a86c73 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 05:01:18 +0200
Subject: [PATCH 1523/1537] Limit styles so they don't interfere with sharing
 dropdown.

---
 apps/contacts/css/contacts.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 248a6d0163..bc1a57756a 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -32,9 +32,9 @@
 
 #card input[type="text"].contacts_property,input[type="email"].contacts_property,input[type="url"].contacts_property { width: 14em; float: left; font-weight: bold; }
 .categories { float: left; width: 16em; }
-#card input[type="checkbox"].contacts_property,input[type="text"],input[type="email"],input[type="url"],input[type="tel"],input[type="date"], select, textarea { background-color: #fefefe; border: 0 !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
-#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="url"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="url"]:active,input[type="tel"]:active, textarea:focus, textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
-textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
+#card input[type="checkbox"].contacts_property, #card input[type="text"], #card input[type="email"], #card input[type="url"], #card input[type="tel"], #card input[type="date"], #card select, #card textarea { background-color: #fefefe; border: 0 !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
+#card input[type="text"]:hover, #card input[type="text"]:focus, #card input[type="text"]:active, input[type="email"]:hover, #card input[type="url"]:hover, #card input[type="tel"]:hover, #card input[type="date"]:hover, #card input[type="date"], #card input[type="date"]:hover, #card input[type="date"]:active, #card input[type="date"]:active, #card input[type="date"]:active, #card input[type="email"]:active, #card input[type="url"]:active, #card input[type="tel"]:active, #card textarea:focus, #card textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
+#card textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
 dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
 .form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }
 .form dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0px; white-space: nowrap; vertical-align: text-bottom; }

From c90c358f0d315c8cf755ec670b7d7738ab15148a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 05:02:09 +0200
Subject: [PATCH 1524/1537] Only load js and css once.

---
 lib/public/share.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index e24149364f..6221c75763 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -69,8 +69,10 @@ class Share {
 	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
 		if (!isset(self::$backendTypes[$itemType])) {
 			self::$backendTypes[$itemType] = array('class' => $class, 'collectionOf' => $collectionOf, 'supportedFileExtensions' => $supportedFileExtensions);
-			\OC_Util::addScript('core', 'share');
-			\OC_Util::addStyle('core', 'share');
+			if(count(self::$backendTypes) === 1) {
+				\OC_Util::addScript('core', 'share');
+				\OC_Util::addStyle('core', 'share');
+			}
 			return true;
 		}
 		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
@@ -278,7 +280,7 @@ class Share {
 			if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
 				// TODO
 			}
-			// Delete 
+			// Delete
 			return self::delete($item['id'], true);
 		}
 		return false;
@@ -844,7 +846,7 @@ class Share {
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
 	* @param string User or group the item is being shared with
 	* @return string Item target
-	* 
+	*
 	* TODO Use a suggested item target by default
 	*
 	*/
@@ -957,7 +959,7 @@ class Share {
 	/**
 	* Hook Listeners
 	*/
-	
+
 	public static function post_deleteUser($arguments) {
 		// Delete any items shared with the deleted user
 		$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE share_with = ? AND share_type = ? OR share_type = ?');
@@ -1023,11 +1025,11 @@ interface Share_Backend {
 	/**
 	* @brief Converts the shared item sources back into the item in the specified format
 	* @param array Shared items
-	* @param int Format 
+	* @param int Format
 	* @return ?
-	* 
+	*
 	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
-	* The key/value pairs included in the share info depend on the function originally called: 
+	* The key/value pairs included in the share info depend on the function originally called:
 	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
 	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
 	* This function allows the backend to control the output of shared items with custom formats.
@@ -1038,14 +1040,14 @@ interface Share_Backend {
 }
 
 /**
-* Interface for share backends that share content that is dependent on files. 
+* Interface for share backends that share content that is dependent on files.
 * Extends the Share_Backend interface.
 */
 interface Share_Backend_File_Dependent extends Share_Backend {
 
 	/**
 	* @brief Get the file path of the item
-	* @param 
+	* @param
 	* @param
 	* @return
 	*/
@@ -1065,7 +1067,7 @@ interface Share_Backend_Collection extends Share_Backend {
 	* @return array Returns an array of sources
 	*/
 	public function getChildren($itemSource);
-    
+
 }
 
 ?>

From d5c111a984278a097025d267f3461c01983ca0c2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 23 Aug 2012 18:29:43 +0200
Subject: [PATCH 1525/1537] LDAP: identify (map) users with their directory
 UUID. Fixes the issue, that usernames for owncloud will change, when the DN
 changes (which happens rarely, but it happens).

---
 apps/user_ldap/appinfo/database.xml | 16 ++++++
 apps/user_ldap/appinfo/update.php   | 42 ++++++++-------
 apps/user_ldap/appinfo/version      |  2 +-
 apps/user_ldap/lib/access.php       | 81 +++++++++++++++++++++++++++--
 apps/user_ldap/lib/connection.php   | 25 +++++++++
 5 files changed, 140 insertions(+), 26 deletions(-)

diff --git a/apps/user_ldap/appinfo/database.xml b/apps/user_ldap/appinfo/database.xml
index 3bbd2b09a4..a785bbf422 100644
--- a/apps/user_ldap/appinfo/database.xml
+++ b/apps/user_ldap/appinfo/database.xml
@@ -28,6 +28,14 @@
 	<default></default>
    </field>
 
+   <field>
+    <name>directory_uuid</name>
+    <type>text</type>
+    <notnull>true</notnull>
+    <length>255</length>
+	<default></default>
+   </field>
+
    <index>
     <name>ldap_dn_users</name>
     <unique>true</unique>
@@ -71,6 +79,14 @@
     <default></default>
    </field>
 
+   <field>
+    <name>directory_uuid</name>
+    <type>text</type>
+    <notnull>true</notnull>
+    <length>255</length>
+	<default></default>
+   </field>
+
    <index>
     <name>ldap_dn_groups</name>
     <unique>true</unique>
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index badceb378d..9cf1814cf6 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -2,6 +2,11 @@
 
 //from version 0.1 to 0.2
 
+//ATTENTION
+//Upgrade from ownCloud 3 (LDAP backend 0.1) to ownCloud 4.5 (LDAP backend 0.3) is not supported!!
+//You must do upgrade to ownCloud 4.0 first!
+//The upgrade stuff in the section from 0.1 to 0.2 is just to minimize the bad efffects.
+
 //settings
 $pw = OCP\Config::getAppValue('user_ldap', 'ldap_password');
 if(!is_null($pw)) {
@@ -12,33 +17,25 @@ if(!is_null($pw)) {
 
 //detect if we can switch on naming guidelines. We won't do it on conflicts.
 //it's a bit spaghetti, but hey.
-$state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doCheck');
-if($state == 'doCheck'){
-	$sqlCleanMap = 'DELETE FROM *PREFIX*ldap_user_mapping';
-
-	OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
-	$LDAP_USER = new OC_USER_LDAP();
-	$users_old = $LDAP_USER->getUsers();
-	$query = OCP\DB::prepare($sqlCleanMap);
-	$query->execute();
+$state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'unset');
+if($state == 'unset'){
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
-	OC_LDAP::init(true);
-	$users_new = $LDAP_USER->getUsers();
-	$query = OCP\DB::prepare($sqlCleanMap);
-	$query->execute();
-	if($users_old !== $users_new) {
-		//we don't need to check Groups, because they were not supported in 3'
-		OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
-	}
 }
 
+// ### SUPPORTED upgrade path starts here ###
 
-//from version 0.2 to 0.2.1
+//from version 0.2 to 0.3 (0.2.0.x dev version)
 $objects = array('user', 'group');
 
+$connector = new \OCA\user_ldap\lib\Connection('user_ldap');
+$userBE = new \OCA\user_ldap\USER_LDAP();
+$userBE->setConnector($connector);
+$groupBE = new \OCA\user_ldap\GROUP_LDAP();
+$groupBE->setConnector($connector);
+
 foreach($objects as $object) {
 	$fetchDNSql = 'SELECT ldap_dn from *PREFIX*ldap_'.$object.'_mapping';
-	$updateSql = 'UPDATE *PREFIX*ldap_'.$object.'_mapping SET ldap_DN = ? WHERE ldap_dn = ?';
+	$updateSql = 'UPDATE *PREFIX*ldap_'.$object.'_mapping SET ldap_DN = ?, directory_uuid = ? WHERE ldap_dn = ?';
 
 	$query = OCP\DB::prepare($fetchDNSql);
 	$res = $query->execute();
@@ -46,6 +43,11 @@ foreach($objects as $object) {
 	$updateQuery = OCP\DB::prepare($updateSql);
 	foreach($DNs as $dn) {
 		$newDN = mb_strtolower($dn['ldap_dn'], 'UTF-8');
-		$updateQuery->execute(array($newDN, $dn['ldap_dn']));
+		if($object == 'user') {
+			$uuid = $userBE->getUUID($newDN);
+		} else {
+			$uuid = $groupBE->getUUID($newDN);
+		}
+		$updateQuery->execute(array($newDN, $uuid, $dn['ldap_dn']));
 	}
 }
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 1683a26615..e689e4949e 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.2.0.8
\ No newline at end of file
+0.2.0.26
\ No newline at end of file
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 4e7215525d..be9aa21c3d 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -50,11 +50,12 @@ abstract class Access {
 		$cr = $this->connection->getConnectionResource();
 		if(!is_resource($cr)) {
 			//LDAP not available
+			\OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG);
 			return false;
 		}
 		$rr = @ldap_read($cr, $dn, 'objectClass=*', array($attr));
 		if(!is_resource($rr)) {
-			\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'readAttribute '.$attr.' failed for DN '.$dn, \OCP\Util::DEBUG);
 			//in case an error occurs , e.g. object does not exist
 			return false;
 		}
@@ -70,6 +71,7 @@ abstract class Access {
 			}
 			return $values;
 		}
+		\OCP\Util::writeLog('user_ldap', 'Requested attribute '.$attr.' not found for '.$dn, \OCP\Util::DEBUG);
 		return false;
 	}
 
@@ -226,11 +228,32 @@ abstract class Access {
 			WHERE ldap_dn = ?
 		');
 
+		//let's try to retrieve the ownCloud name from the mappings table
 		$component = $query->execute(array($dn))->fetchOne();
 		if($component) {
 			return $component;
 		}
 
+		//second try: get the UUID and check if it is known. Then, update the DN and return the name.
+		$uuid = $this->getUUID($dn);
+		if($uuid) {
+			$query = \OCP\DB::prepare('
+				SELECT owncloud_name
+				FROM '.$table.'
+				WHERE directory_uuid = ?
+			');
+			$component = $query->execute(array($uuid))->fetchOne();
+			if($component) {
+				$query = \OCP\DB::prepare('
+					UPDATE '.$table.'
+					SET ldap_dn = ?
+					WHERE directory_uuid = ?
+				');
+				$query->execute(array($dn, $uuid));
+				return $component;
+			}
+		}
+
 		if(is_null($ldapname)) {
 			$ldapname = $this->readAttribute($dn, $nameAttribute);
 			if(!isset($ldapname[0]) && empty($ldapname[0])) {
@@ -389,17 +412,18 @@ abstract class Access {
 		}
 
 		$insert = \OCP\DB::prepare('
-			INSERT INTO '.$table.' (ldap_dn, owncloud_name)
-				SELECT ?,?
+			INSERT INTO '.$table.' (ldap_dn, owncloud_name, directory_uuid)
+				SELECT ?,?,?
 				'.$sqlAdjustment.'
 				WHERE NOT EXISTS (
 					SELECT 1
 					FROM '.$table.'
 					WHERE ldap_dn = ?
-						OR owncloud_name = ? )
+						OR owncloud_name = ?)
 		');
 
-		$res = $insert->execute(array($dn, $ocname, $dn, $ocname));
+		//feed the DB
+		$res = $insert->execute(array($dn, $ocname, $this->getUUID($dn), $dn, $ocname));
 
 		if(\OCP\DB::isError($res)) {
 			return false;
@@ -602,4 +626,51 @@ abstract class Access {
 		}
 		return $testConnection->bind();
 	}
+
+	/**
+	 * @brief auto-detects the directory's UUID attribute
+	 * @param $dn a known DN used to check against
+	 * @param $force the detection should be run, even if it is not set to auto
+	 * @returns true on success, false otherwise
+	 */
+	private function detectUuidAttribute($dn, $force = false) {
+		if(($this->connection->ldapUuidAttribute != 'auto') && !$force) {
+			return true;
+		}
+
+		//for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID
+		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid');
+
+		foreach($testAttributes as $attribute) {
+			\OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
+
+		    $value = $this->readAttribute($dn, $attribute);
+		    if(is_array($value) && isset($value[0]) && !empty($value[0])) {
+				\OCP\Util::writeLog('user_ldap', 'Setting '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
+				$this->connection->ldapUuidAttribute = $attribute;
+				return true;
+		    }
+		    \OCP\Util::writeLog('user_ldap', 'The looked for uuid attr is not '.$attribute.', result was '.print_r($value,true), \OCP\Util::DEBUG);
+		}
+
+		return false;
+	}
+
+	public function getUUID($dn) {
+		if($this->detectUuidAttribute($dn)) {
+			$uuid = $this->readAttribute($dn, $this->connection->ldapUuidAttribute);
+			if(!is_array($uuid) && $this->connection->ldapOverrideUuidAttribute) {
+				$this->detectUuidAttribute($dn, true);
+				$uuid = $this->readAttribute($dn, $this->connection->ldapUuidAttribute);
+			}
+			if(is_array($uuid) && isset($uuid[0]) && !empty($uuid[0])) {
+				$uuid = $uuid[0];
+			} else {
+				$uuid = false;
+			}
+		} else {
+			$uuid = false;
+		}
+		return $uuid;
+	}
 }
\ No newline at end of file
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 9bb012e910..dc160a1642 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -53,6 +53,8 @@ class Connection {
 		'ldapQuotaDefault' => null,
 		'ldapEmailAttribute' => null,
 		'ldapCacheTTL' => null,
+		'ldapUuidAttribute' => null,
+		'ldapOverrideUuidAttribute' => null,
 	);
 
 	public function __construct($configID = 'user_ldap') {
@@ -74,6 +76,22 @@ class Connection {
 		}
 	}
 
+	public function __set($name, $value) {
+		$changed = false;
+		//omly few options are writable
+		if($name == 'ldapUuidAttribute') {
+			\OCP\Util::writeLog('user_ldap', 'Set config ldapUuidAttribute to  '.$value, \OCP\Util::DEBUG);
+			$this->config[$name] = $value;
+			if(!empty($this->configID)) {
+				\OCP\Config::getAppValue($this->configID, 'ldap_uuid_attribute', $value);
+			}
+			$changed = true;
+		}
+		if($changed) {
+			$this->validateConfiguration();
+		}
+	}
+
 	/**
 	 * @brief initializes the LDAP backend
 	 * @param $force read the config settings no matter what
@@ -180,6 +198,8 @@ class Connection {
 			$this->config['ldapGroupMemberAssocAttr'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_member_assoc_attribute', 'uniqueMember');
 			$this->config['ldapIgnoreNamingRules'] = \OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
 			$this->config['ldapCacheTTL']          = \OCP\Config::getAppValue($this->configID, 'ldap_cache_ttl', 10*60);
+			$this->config['ldapUuidAttribute']     = \OCP\Config::getAppValue($this->configID, 'ldap_uuid_attribute', 'auto');
+			$this->config['ldapOverrideUuidAttribute'] = \OCP\Config::getAppValue($this->configID, 'ldap_override_uuid_attribute', 0);
 
 			$this->configured = $this->validateConfiguration();
 		}
@@ -236,6 +256,11 @@ class Connection {
 		if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
 			\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
 		}
+		if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid'))) {
+			\OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto');
+			\OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO);
+		}
+
 
 		//second step: critical checks. If left empty or filled wrong, set as unconfigured and give a warning.
 		$configurationOK = true;

From d5127b14bef08edeeec60da991723dc48b260dbb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 14:44:28 +0200
Subject: [PATCH 1526/1537] Return newly created addressbook.

---
 apps/contacts/lib/addressbook.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 92c5f4da3a..810c681fe5 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -66,7 +66,8 @@ class OC_Contacts_Addressbook {
 		}
 		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS));
 		if(!$active && !count($addressbooks)) {
-			self::addDefault($uid);
+			$id = self::addDefault($uid);
+			return array(self::find($id),);
 		}
 		return $addressbooks;
 	}
@@ -139,7 +140,7 @@ class OC_Contacts_Addressbook {
 		}
 		return $id;
 	}
-	
+
 	/**
 	 * @brief Creates a new address book
 	 * @param string $userid
@@ -290,7 +291,7 @@ class OC_Contacts_Addressbook {
 			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
-		
+
 		$cards = OC_Contacts_VCard::all($id);
 		foreach($cards as $card){
 			OC_Contacts_VCard::delete($card['id']);

From a3af9f4773ec498ca9049f8995bdfad912e0d3c8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 14:45:19 +0200
Subject: [PATCH 1527/1537] Used non-existing variable.

---
 apps/contacts/lib/share/addressbook.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
index 62799696d9..0c90470d37 100644
--- a/apps/contacts/lib/share/addressbook.php
+++ b/apps/contacts/lib/share/addressbook.php
@@ -41,7 +41,7 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 	public function generateTarget($itemSource, $shareWith, $exclude = null) {
 		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
 		$user_addressbooks = array();
-		foreach(OC_Contacts_Addressbook::all($uid) as $user_addressbook) {
+		foreach(OC_Contacts_Addressbook::all($shareWith) as $user_addressbook) {
 			$user_addressbooks[] = $user_addressbook['displayname'];
 		}
 		$name = $addressbook['userid']."'s ".$addressbook['displayname'];
@@ -49,7 +49,7 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 		while (in_array($name.$suffix, $user_addressbooks)) {
 			$suffix++;
 		}
-		
+
 		return $name.$suffix;
 	}
 

From 069d16fdd441bcc4b1ba1ccd8f18f65cc4515ea4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 14:48:48 +0200
Subject: [PATCH 1528/1537] Use correct js class in first-run template.

---
 apps/contacts/templates/part.no_contacts.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
index be12092d45..1802939483 100644
--- a/apps/contacts/templates/part.no_contacts.php
+++ b/apps/contacts/templates/part.no_contacts.php
@@ -2,7 +2,6 @@
 <div id="firstrun">
 	<?php echo $l->t('You have no contacts in your addressbook.') ?>
 	<div id="selections">
-		<input type="button" value="<?php echo $l->t('Add contact') ?>" onclick="Contacts.UI.Card.editNew()" />
-		<input type="button" value="<?php echo $l->t('Configure addressbooks') ?>" onclick="Contacts.UI.Addressbooks.overview()" />
+		<input type="button" value="<?php echo $l->t('Add contact') ?>" onclick="OC.Contacts.Card.editNew()" />
 	</div>
 </div>

From 394617e0b6911d889f361f0747cd8f4f7ebe7a39 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 14:58:45 +0200
Subject: [PATCH 1529/1537] Missing IM variable assignments.

---
 apps/contacts/ajax/loadcard.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index 75fe33ada6..7d73641818 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -35,6 +35,12 @@ $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
+$impp_types = OC_Contacts_App::getTypesOfProperty('IMPP');
+$ims = OC_Contacts_App::getIMOptions();
+$im_protocols = array();
+foreach($ims as $name => $values) {
+	$im_protocols[$name] = $values['displayname'];
+}
 
 $tmpl = new OCP\Template('contacts', 'part.contact');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
@@ -42,6 +48,8 @@ $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesi
 $tmpl->assign('adr_types', $adr_types);
 $tmpl->assign('phone_types', $phone_types);
 $tmpl->assign('email_types', $email_types);
+$tmpl->assign('impp_types', $impp_types, false);
+$tmpl->assign('im_protocols', $im_protocols, false);
 $tmpl->assign('requesttoken', $requesttoken);
 $tmpl->assign('id', '');
 $page = $tmpl->fetchPage();

From fdb4c820d3eef655e893a21dbd1d0b18ee30dc60 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 16:39:25 +0200
Subject: [PATCH 1530/1537] Fix for deleting queued contacts.

---
 apps/contacts/js/contacts.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index e5daadb6d1..a6262349df 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -471,7 +471,7 @@ OC.Contacts={
 			}
 			$('#rightcontent').data('id', newid);
 
-			OC.Contacts.Contacts.deletionQueue.push(this.id);
+			OC.Contacts.Contacts.deletionQueue.push(parseInt(this.id));
 			if(!window.onbeforeunload) {
 				window.onbeforeunload = OC.Contacts.Contacts.warnNotDeleted;
 			}
@@ -497,7 +497,9 @@ OC.Contacts={
 			OC.Contacts.notify({
 				data:curlistitem,
 				message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
+				timeout:5,
 				timeouthandler:function(contact) {
+					console.log('timeout');
 					OC.Contacts.Card.doDelete(contact.data('id'), true);
 					delete contact;
 				},
@@ -509,19 +511,25 @@ OC.Contacts={
 			});
 		},
 		doDelete:function(id, removeFromQueue) {
-			if(OC.Contacts.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
+			var updateQueue = function(id, remove) {
+				if(removeFromQueue) {
+					OC.Contacts.Contacts.deletionQueue.splice(OC.Contacts.Contacts.deletionQueue.indexOf(parseInt(id)), 1);
+				}
+				if(OC.Contacts.Contacts.deletionQueue.length == 0) {
+					window.onbeforeunload = null;
+				}
+			}
+
+			if(OC.Contacts.Contacts.deletionQueue.indexOf(parseInt(id)) == -1 && removeFromQueue) {
+				console.log('returning');
+				updateQueue(id, removeFromQueue);
 				return;
 			}
 			$.post(OC.filePath('contacts', 'ajax', 'contact/delete.php'),{'id':id},function(jsondata) {
 				if(jsondata.status == 'error'){
 					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 				}
-				if(removeFromQueue) {
-					OC.Contacts.Contacts.deletionQueue.splice(OC.Contacts.Contacts.deletionQueue.indexOf(id), 1);
-				}
-				if(OC.Contacts.Contacts.deletionQueue.length == 0) {
-					window.onbeforeunload = null;
-				}
+				updateQueue(id, removeFromQueue);
 			});
 		},
 		loadContact:function(jsondata, bookid){

From f568ba9c8cf076a734dda1d6f6c7d2b06f728c20 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 16:59:45 +0200
Subject: [PATCH 1531/1537] Removed redundant __CLASS__ in logging.

---
 apps/contacts/lib/vcard.php | 56 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 5aa3dd85ed..58d78875af 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -63,9 +63,9 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( $prep );
 				$result = $stmt->execute($id);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', ids: '.join(',', $id), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.'SQL:'.$prep, OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', __METHOD__.', ids: '.join(',', $id), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.'SQL:'.$prep, OCP\Util::DEBUG);
 				return false;
 			}
 		} elseif(is_int($id) || is_string($id)) {
@@ -74,12 +74,12 @@ class OC_Contacts_VCard{
 				$stmt = OCP\DB::prepare( $sql );
 				$result = $stmt->execute(array($id));
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', ids: '. $id, OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', __METHOD__.', ids: '. $id, OCP\Util::DEBUG);
 				return false;
 			}
 		} else {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.'. Addressbook id(s) argument is empty: '. print_r($id, true), OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.'. Addressbook id(s) argument is empty: '. print_r($id, true), OCP\Util::DEBUG);
 			return false;
 		}
 		$cards = array();
@@ -102,8 +102,8 @@ class OC_Contacts_VCard{
 			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE id = ?' );
 			$result = $stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '. $id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', id: '. $id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -121,8 +121,8 @@ class OC_Contacts_VCard{
 			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
 			$result = $stmt->execute(array($aid,$uri));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -177,8 +177,8 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($aid,$uri));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uid'.$uid, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uid'.$uid, OCP\Util::DEBUG);
 			return false;
 		}
 		if($result->numRows() > 0) {
@@ -329,8 +329,8 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 		$newid = OCP\DB::insertid('*PREFIX*contacts_cards');
@@ -379,8 +379,8 @@ class OC_Contacts_VCard{
 					$result = $stmt->execute(array($data,time(),$object[0]));
 					//OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0].': '.$object[1],OCP\Util::DEBUG);
 				} catch(Exception $e) {
-					OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-					OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$object[0], OCP\Util::DEBUG);
+					OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+					OCP\Util::writeLog('contacts', __METHOD__.', id: '.$object[0], OCP\Util::DEBUG);
 				}
 			}
 		}
@@ -423,8 +423,8 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($fn,$data,time(),$id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id'.$id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', id'.$id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -444,7 +444,7 @@ class OC_Contacts_VCard{
 		$oldcard = self::findWhereDAVDataIs($aid, $uri);
 		$card = OC_VObject::parse($data);
 		if(!$card) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', Unable to parse VCARD, uri: '.$uri, OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', Unable to parse VCARD, uri: '.$uri, OCP\Util::ERROR);
 			return false;
 		}
 		return self::edit($oldcard['id'], $card);
@@ -472,8 +472,8 @@ class OC_Contacts_VCard{
 		try {
 			$stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', id: '.$id, OCP\Util::DEBUG);
 			return false;
 		}
 
@@ -504,8 +504,8 @@ class OC_Contacts_VCard{
 		try {
 			$stmt->execute(array($aid,$uri));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', aid: '.$aid.' uri: '.$uri, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri: '.$uri, OCP\Util::DEBUG);
 			return false;
 		}
 		OC_Contacts_Addressbook::touch($aid);
@@ -680,9 +680,9 @@ class OC_Contacts_VCard{
 				$vals = array_merge((array)$aid, $id);
 				$result = $stmt->execute($vals);
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', ids: '.join(',', $vals), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', SQL:'.$prep, OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts', __METHOD__.', ids: '.join(',', $vals), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.', SQL:'.$prep, OCP\Util::DEBUG);
 				return false;
 			}
 		} else {
@@ -706,8 +706,8 @@ class OC_Contacts_VCard{
 			try {
 				$result = $stmt->execute(array($aid, $id));
 			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' id: '.$id, OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);
+				OCP\Util::writeLog('contacts', __METHOD__.' id: '.$id, OCP\Util::DEBUG);
 				return false;
 			}
 		}

From 2cffcfbc03dfa4463bdfd72de0341000509bcec3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 23 Aug 2012 22:02:38 +0200
Subject: [PATCH 1532/1537] Permission checking for shared
 addressbooks/contacts.

---
 apps/contacts/ajax/contact/addproperty.php    |   6 +-
 apps/contacts/ajax/contact/delete.php         |  12 +-
 apps/contacts/ajax/contact/deleteproperty.php |   6 +-
 apps/contacts/ajax/contact/list.php           |  16 ++-
 apps/contacts/ajax/contact/saveproperty.php   |   7 +-
 apps/contacts/js/contacts.js                  | 108 +++++++++++++++---
 apps/contacts/lib/share/addressbook.php       |   1 +
 apps/contacts/lib/vcard.php                   |  44 +++++--
 8 files changed, 163 insertions(+), 37 deletions(-)

diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
index 89f7a2bd9a..2b80ebd58b 100644
--- a/apps/contacts/ajax/contact/addproperty.php
+++ b/apps/contacts/ajax/contact/addproperty.php
@@ -154,8 +154,10 @@ foreach ($parameters as $key=>$element) {
 }
 $checksum = md5($vcard->children[$line]->serialize());
 
-if(!OC_Contacts_VCard::edit($id, $vcard)) {
-	bailOut($l10n->t('Error adding contact property: '.$name));
+try {
+	OC_Contacts_VCard::edit($id, $vcard);
+} catch(Exception $e) {
+	bailOut($e->getMessage());
 }
 
 OCP\JSON::success(array(
diff --git a/apps/contacts/ajax/contact/delete.php b/apps/contacts/ajax/contact/delete.php
index def98b3670..e73f34f898 100644
--- a/apps/contacts/ajax/contact/delete.php
+++ b/apps/contacts/ajax/contact/delete.php
@@ -4,6 +4,7 @@
  *
  * @author Jakob Sack
  * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -30,7 +31,14 @@ $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
 	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
 }
-$card = OC_Contacts_App::getContactObject( $id );
 
-OC_Contacts_VCard::delete($id);
+try {
+	OC_Contacts_VCard::delete($id);
+} catch(Exception $e) {
+	$msg = $e->getMessage();
+	OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$msg,
+		OCP\Util::DEBUG);
+	OCP\Util::writeLog('contacts', __METHOD__.', id'.$id, OCP\Util::DEBUG);
+	bailOut($msg);
+}
 OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/contact/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php
index b76eb19462..b76b6e55ed 100644
--- a/apps/contacts/ajax/contact/deleteproperty.php
+++ b/apps/contacts/ajax/contact/deleteproperty.php
@@ -40,8 +40,10 @@ if(is_null($line)) {
 
 unset($vcard->children[$line]);
 
-if(!OC_Contacts_VCard::edit($id, $vcard)) {
-	bailOut($l10n->t('Error deleting contact property.'));
+try {
+	OC_Contacts_VCard::edit($id, $vcard);
+} catch(Exception $e) {
+	bailOut($e->getMessage());
 }
 
 OCP\JSON::success(array(
diff --git a/apps/contacts/ajax/contact/list.php b/apps/contacts/ajax/contact/list.php
index c5eca292f1..4e2509d8d5 100644
--- a/apps/contacts/ajax/contact/list.php
+++ b/apps/contacts/ajax/contact/list.php
@@ -41,6 +41,10 @@ foreach($active_addressbooks as $addressbook) {
 				= array('contacts' => array('type' => 'book',));
 		$contacts_addressbook[$addressbook['id']]['displayname']
 				= $addressbook['displayname'];
+		$contacts_addressbook[$addressbook['id']]['permissions']
+				= isset($addressbook['permissions'])
+				? $addressbook['permissions']
+				: '0';
 	}
 }
 
@@ -75,10 +79,14 @@ if($contacts_alphabet) {
 			}
 		}
 		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array(
-					'type' => 'contact',
-					'id' => $contact['id'],
-					'addressbookid' => $contact['addressbookid'],
-					'displayname' => htmlspecialchars($display)
+			'type' => 'contact',
+			'id' => $contact['id'],
+			'addressbookid' => $contact['addressbookid'],
+			'displayname' => htmlspecialchars($display),
+			'permissions' =>
+				isset($contacts_addressbook[$contact['addressbookid']]['permissions'])
+					? $contacts_addressbook[$contact['addressbookid']]['permissions']
+					: '0',
 		);
 	}
 }
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
index 296b9ad3b7..7ae183538b 100644
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ b/apps/contacts/ajax/contact/saveproperty.php
@@ -162,9 +162,10 @@ if(!$value) {
 }
 //debug('New checksum: '.$checksum);
 
-if(!OC_Contacts_VCard::edit($id, $vcard)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error updating contact property.'));
-	exit();
+try {
+	OC_Contacts_VCard::edit($id, $vcard);
+} catch(Exception $e) {
+	bailOut($e->getMessage());
 }
 
 OCP\JSON::success(array('data' => array(
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index a6262349df..09cf26bf7f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -398,12 +398,32 @@ OC.Contacts={
 				localLoadContact(newid, bookid);
 			}
 		},
+		setEnabled:function(enabled) {
+			console.log('setEnabled', enabled);
+			$('.contacts_property,.action').each(function () {
+				$(this).prop('disabled', !enabled);
+				OC.Contacts.Card.enabled = enabled;
+			});
+		},
 		doExport:function() {
 			document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
 		},
 		editNew:function(){ // add a new contact
-			this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
-			OC.Contacts.Card.add(';;;;;', '', '', true);
+			var book = $('#contacts h3.active');
+			var permissions = parseInt(book.data('permissions'));
+			if(permissions == 0
+					|| permissions & OC.Share.PERMISSION_UPDATE
+					|| permissions & OC.Share.PERMISSION_DELETE) {
+				with(this) {
+					delete id; delete fn; delete fullname; delete givname; delete famname;
+					delete addname; delete honpre; delete honsuf;
+				}
+				this.bookid = book.data('id');
+				OC.Contacts.Card.add(';;;;;', '', '', true);
+			} else {
+				OC.dialogs.alert(t('contacts', 'You do not have permission to add contacts to ')
+					+ book.text() + '. ' + t('contacts', 'Please select one of your own address books.'), t('contacts', 'Permission error'));
+			}
 			return false;
 		},
 		add:function(n, fn, aid, isnew){ // add a new contact
@@ -497,11 +517,16 @@ OC.Contacts={
 			OC.Contacts.notify({
 				data:curlistitem,
 				message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
-				timeout:5,
+				//timeout:5,
 				timeouthandler:function(contact) {
 					console.log('timeout');
-					OC.Contacts.Card.doDelete(contact.data('id'), true);
-					delete contact;
+					OC.Contacts.Card.doDelete(contact.data('id'), true, function(res) {
+						if(!res) {
+							OC.Contacts.Contacts.insertContact({contact:contact});
+						} else {
+							delete contact;
+						}
+					});
 				},
 				clickhandler:function(contact) {
 					OC.Contacts.Contacts.insertContact({contact:contact});
@@ -510,7 +535,7 @@ OC.Contacts={
 				}
 			});
 		},
-		doDelete:function(id, removeFromQueue) {
+		doDelete:function(id, removeFromQueue, cb) {
 			var updateQueue = function(id, remove) {
 				if(removeFromQueue) {
 					OC.Contacts.Contacts.deletionQueue.splice(OC.Contacts.Contacts.deletionQueue.indexOf(parseInt(id)), 1);
@@ -523,14 +548,23 @@ OC.Contacts={
 			if(OC.Contacts.Contacts.deletionQueue.indexOf(parseInt(id)) == -1 && removeFromQueue) {
 				console.log('returning');
 				updateQueue(id, removeFromQueue);
+				if(typeof cb == 'function') {
+					cb(true);
+				}
 				return;
 			}
-			$.post(OC.filePath('contacts', 'ajax', 'contact/delete.php'),{'id':id},function(jsondata) {
+			$.post(OC.filePath('contacts', 'ajax', 'contact/delete.php'), {'id':id},function(jsondata) {
 				if(jsondata.status == 'error'){
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					OC.Contacts.notify({message:jsondata.data.message});
+					if(typeof cb == 'function') {
+						cb(false);
+					}
 				}
 				updateQueue(id, removeFromQueue);
 			});
+			if(typeof cb == 'function') {
+				cb(true);
+			}
 		},
 		loadContact:function(jsondata, bookid){
 			this.data = jsondata;
@@ -563,6 +597,11 @@ OC.Contacts={
 				$('#contact_note').hide();
 				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
 			}
+			var permissions = OC.Contacts.Card.permissions = parseInt($('#contacts ul[data-id="' + bookid + '"]').data('permissions'));
+			console.log('permissions', permissions);
+			this.setEnabled(permissions == 0
+				|| permissions & OC.Share.PERMISSION_UPDATE
+				|| permissions & OC.Share.PERMISSION_DELETE);
 		},
 		loadSingleProperties:function() {
 			var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
@@ -757,6 +796,13 @@ OC.Contacts={
 					console.log('Saving: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'contact/saveproperty.php'),q,function(jsondata){
+						if(!jsondata) {
+							OC.dialogs.alert(t('contacts', 'Unknown error. Please check logs.'), t('contacts', 'Error'));
+							OC.Contacts.loading(obj, false);
+							$(obj).removeAttr('disabled');
+							OC.Contacts.Card.update({cid:OC.Contacts.Card.id});
+							return false;
+						}
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
 							OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
@@ -768,6 +814,7 @@ OC.Contacts={
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
+							OC.Contacts.Card.update({cid:OC.Contacts.Card.id});
 							return false;
 						}
 					},'json');
@@ -787,12 +834,16 @@ OC.Contacts={
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
+							OC.Contacts.Card.update({cid:OC.Contacts.Card.id});
 							return false;
 						}
 					},'json');
 			}
 		},
 		addProperty:function(type) {
+			if(!this.enabled) {
+				return;
+			}
 			switch (type) {
 				case 'NOTE':
 					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
@@ -836,6 +887,9 @@ OC.Contacts={
 		},
 		deleteProperty:function(obj, type) {
 			console.log('deleteProperty');
+			if(!this.enabled) {
+				return;
+			}
 			OC.Contacts.loading(obj, true);
 			var checksum = OC.Contacts.checksumFor(obj);
 			if(checksum) {
@@ -887,6 +941,9 @@ OC.Contacts={
 			}
 		},
 		editName:function() {
+			if(!this.enabled) {
+				return;
+			}
 			var params = {id: this.id};
 			/* Initialize the name edit dialog */
 			if($('#edit_name_dialog').dialog('isOpen') == true) {
@@ -922,6 +979,9 @@ OC.Contacts={
 			}
 		},
 		saveName:function(dlg) {
+			if(!this.enabled) {
+				return;
+			}
 			//console.log('saveName, id: ' + this.id);
 			var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
 			this.famname = n[0];
@@ -1010,6 +1070,9 @@ OC.Contacts={
 			return false;
 		},
 		editAddress:function(obj, isnew){
+			if(!this.enabled) {
+				return;
+			}
 			var container = undefined;
 			var params = {id: this.id};
 			if(obj === 'new') {
@@ -1135,6 +1198,9 @@ OC.Contacts={
 			}
 		},
 		saveAddress:function(dlg, obj, isnew){
+			if(!this.enabled) {
+				return;
+			}
 			if(isnew) {
 				container = $('#addresses dl').last();
 				obj = container.find('input').first();
@@ -1177,6 +1243,9 @@ OC.Contacts={
 			container.find('.addresslist').html(adrtxt);
 		},
 		uploadPhoto:function(filelist) {
+			if(!this.enabled) {
+				return;
+			}
 			if(!filelist) {
 				OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
 				return;
@@ -1255,6 +1324,9 @@ OC.Contacts={
 			this.loadPhotoHandlers()
 		},
 		editCurrentPhoto:function(){
+			if(!this.enabled) {
+				return;
+			}
 			$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
 				if(jsondata.status == 'success'){
 					//alert(jsondata.data.page);
@@ -1268,6 +1340,9 @@ OC.Contacts={
 			});
 		},
 		editPhoto:function(id, tmpkey){
+			if(!this.enabled) {
+				return;
+			}
 			//alert('editPhoto: ' + tmpkey);
 			$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
 				if(jsondata.status == 'success'){
@@ -1284,7 +1359,10 @@ OC.Contacts={
 				$('#edit_photo_dialog').dialog('open');
 			}
 		},
-		savePhoto:function(){
+		savePhoto:function() {
+			if(!this.enabled) {
+				return;
+			}
 			var target = $('#crop_target');
 			var form = $('#cropform');
 			var wrapper = $('#contacts_details_photo_wrapper');
@@ -1719,11 +1797,15 @@ OC.Contacts={
 							firstrun = true;
 							if($('#contacts h3').length == 0) {
 								$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'
-									+ b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
+									+ b + '" data-permissions="' + book.permissions + '">' + book.displayname
+									+ '</h3><ul class="contacts hidden" data-id="'+b+'" data-permissions="'
+									+ book.permissions + '"></ul>');
 							} else {
-								if(!$('#contacts h3[data-id="'+b+'"]').length) {
-									var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'
-										+ book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
+								if(!$('#contacts h3[data-id="' + b + '"]').length) {
+									var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'
+										+ b + '" data-permissions="' + book.permissions + '">'
+										+ book.displayname+'</h3><ul class="contacts hidden" data-id="' + b
+										+ '" data-permissions="' + book.permissions + '"></ul>');
 									var added = false;
 									$('#contacts h3').each(function(){
 										if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
index 0c90470d37..d35f0ce9ae 100644
--- a/apps/contacts/lib/share/addressbook.php
+++ b/apps/contacts/lib/share/addressbook.php
@@ -73,6 +73,7 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 				$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
 				if ($addressbook) {
 					$addressbook['displayname'] = $item['item_target'];
+					$addressbook['permissions'] = $item['permissions'];
 					$addressbooks[] = $addressbook;
 				}
 			}
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 58d78875af..cee9c640cf 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -405,7 +405,7 @@ class OC_Contacts_VCard{
 		if ($addressbook['userid'] != OCP\User::getUser()) {
 			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
 			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				return false;
+				throw new Exception(OC_Contacts_App::$l10n->t('You do not have the permissions to edit this contact.'));
 			}
 		}
 		OC_Contacts_App::loadCategoriesFromVCard($card);
@@ -423,7 +423,8 @@ class OC_Contacts_VCard{
 		try {
 			$result = $stmt->execute(array($fn,$data,time(),$id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '
+				. $e->getMessage(), OCP\Util::ERROR);
 			OCP\Util::writeLog('contacts', __METHOD__.', id'.$id, OCP\Util::DEBUG);
 			return false;
 		}
@@ -444,10 +445,21 @@ class OC_Contacts_VCard{
 		$oldcard = self::findWhereDAVDataIs($aid, $uri);
 		$card = OC_VObject::parse($data);
 		if(!$card) {
-			OCP\Util::writeLog('contacts', __METHOD__.', Unable to parse VCARD, uri: '.$uri, OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.
+				', Unable to parse VCARD, uri: '.$uri, OCP\Util::ERROR);
+			return false;
+		}
+		try {
+			self::edit($oldcard['id'], $card);
+			return true;
+		} catch(Exception $e) {
+			OCP\Util::writeLog('contacts', __METHOD__.', exception: '
+				. $e->getMessage() . ', '
+				. OCP\USER::getUser(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', uri'
+				. $uri, OCP\Util::DEBUG);
 			return false;
 		}
-		return self::edit($oldcard['id'], $card);
 	}
 
 	/**
@@ -462,18 +474,28 @@ class OC_Contacts_VCard{
 		}
 		$addressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
 		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
-			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
-				return false;
+			$sharedContact = OCP\Share::getItemSharedWithBySource('contact',
+				$id, OCP\Share::FORMAT_NONE, null, true);
+			if (!$sharedContact
+				|| !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+				throw new Exception(
+					OC_Contacts_App::$l10n->t(
+						'You do not have the permissions to delete this contact.'
+					)
+				);
 			}
 		}
-		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => null, 'id' => $id, 'uri' => null));
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
+		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard',
+			array('aid' => null, 'id' => $id, 'uri' => null)
+		);
+		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*contacts_cards WHERE id = ?');
 		try {
 			$stmt->execute(array($id));
 		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', id: '.$id, OCP\Util::DEBUG);
+			OCP\Util::writeLog('contacts', __METHOD__.
+				', exception: ' . $e->getMessage(), OCP\Util::ERROR);
+			OCP\Util::writeLog('contacts', __METHOD__.', id: '
+				. $id, OCP\Util::DEBUG);
 			return false;
 		}
 

From 07a889631eeecfbf6a4c0e94220c4179748eb1ff Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 24 Aug 2012 02:07:18 +0200
Subject: [PATCH 1533/1537] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/de.php    |   8 +-
 apps/admin_dependencies_chk/l10n/el.php    |   4 +
 apps/admin_dependencies_chk/l10n/es.php    |   4 +
 apps/admin_dependencies_chk/l10n/fi_FI.php |   9 +
 apps/admin_migrate/l10n/el.php             |   4 +
 apps/admin_migrate/l10n/nb_NO.php          |   5 +
 apps/bookmarks/l10n/de.php                 |   6 +-
 apps/bookmarks/l10n/fa.php                 |   8 +
 apps/bookmarks/l10n/nb_NO.php              |  11 ++
 apps/calendar/l10n/ar.php                  |  48 ++++-
 apps/calendar/l10n/de.php                  |  16 +-
 apps/calendar/l10n/fi_FI.php               |   6 +
 apps/calendar/l10n/pt_PT.php               |  42 ++++
 apps/contacts/l10n/ar.php                  |   2 -
 apps/contacts/l10n/ca.php                  |  21 +-
 apps/contacts/l10n/cs_CZ.php               |   4 -
 apps/contacts/l10n/da.php                  |   3 -
 apps/contacts/l10n/de.php                  |  55 ++++--
 apps/contacts/l10n/el.php                  |  23 ++-
 apps/contacts/l10n/eo.php                  |   4 -
 apps/contacts/l10n/es.php                  |  26 ++-
 apps/contacts/l10n/et_EE.php               |   3 -
 apps/contacts/l10n/eu.php                  |   4 -
 apps/contacts/l10n/fa.php                  |   3 -
 apps/contacts/l10n/fi_FI.php               |  18 +-
 apps/contacts/l10n/fr.php                  |  30 ++-
 apps/contacts/l10n/gl.php                  |   3 -
 apps/contacts/l10n/he.php                  |   3 -
 apps/contacts/l10n/hr.php                  |   2 -
 apps/contacts/l10n/hu_HU.php               |   3 -
 apps/contacts/l10n/it.php                  |  21 +-
 apps/contacts/l10n/ja_JP.php               |  21 +-
 apps/contacts/l10n/ko.php                  |   3 -
 apps/contacts/l10n/lb.php                  |   2 -
 apps/contacts/l10n/lt_LT.php               |   1 +
 apps/contacts/l10n/mk.php                  |   3 -
 apps/contacts/l10n/ms_MY.php               |   3 -
 apps/contacts/l10n/nb_NO.php               |   3 -
 apps/contacts/l10n/nl.php                  |   3 -
 apps/contacts/l10n/nn_NO.php               |   2 -
 apps/contacts/l10n/pl.php                  |  16 +-
 apps/contacts/l10n/pt_BR.php               |   3 -
 apps/contacts/l10n/pt_PT.php               |  71 ++++++-
 apps/contacts/l10n/ro.php                  |   2 -
 apps/contacts/l10n/ru.php                  |  64 ++++++-
 apps/contacts/l10n/sk_SK.php               |   3 -
 apps/contacts/l10n/sl.php                  |  21 +-
 apps/contacts/l10n/sv.php                  |  21 +-
 apps/contacts/l10n/th_TH.php               |   4 -
 apps/contacts/l10n/tr.php                  |   4 -
 apps/contacts/l10n/zh_CN.php               |   3 -
 apps/contacts/l10n/zh_TW.php               |   2 -
 apps/files/l10n/de.php                     |   6 +-
 apps/files/l10n/fa.php                     |   5 +
 apps/files/l10n/fi_FI.php                  |   1 +
 apps/files/l10n/lt_LT.php                  |   5 +-
 apps/files/l10n/pt_PT.php                  |   7 +
 apps/files/l10n/ru.php                     |   5 +
 apps/files_encryption/l10n/el.php          |   6 +
 apps/files_encryption/l10n/fa.php          |   5 +
 apps/files_encryption/l10n/nb_NO.php       |   6 +
 apps/files_external/l10n/cs_CZ.php         |  13 ++
 apps/files_external/l10n/de.php            |   4 +-
 apps/files_external/l10n/el.php            |   9 +
 apps/files_external/l10n/es.php            |  13 ++
 apps/files_sharing/l10n/cs_CZ.php          |   3 +
 apps/files_sharing/l10n/el.php             |   6 +
 apps/files_sharing/l10n/es.php             |   6 +
 apps/files_sharing/l10n/fa.php             |   6 +
 apps/files_sharing/l10n/fi_FI.php          |   5 +-
 apps/files_sharing/l10n/nb_NO.php          |   6 +
 apps/files_versions/l10n/el.php            |   4 +
 apps/files_versions/l10n/es.php            |   3 +
 apps/files_versions/l10n/fa.php            |   4 +
 apps/files_versions/l10n/nb_NO.php         |   3 +
 apps/gallery/l10n/pt_PT.php                |  13 +-
 apps/gallery/l10n/ru.php                   |  13 +-
 apps/media/l10n/ar.php                     |   1 +
 apps/media/l10n/fr.php                     |   3 +-
 apps/tasks/l10n/cs_CZ.php                  |  15 ++
 apps/tasks/l10n/de.php                     |   8 +-
 apps/tasks/l10n/el.php                     |  18 ++
 apps/tasks/l10n/fa.php                     |  11 ++
 apps/tasks/l10n/fi_FI.php                  |   3 +
 apps/tasks/l10n/nb_NO.php                  |  17 ++
 apps/user_ldap/l10n/de.php                 |  27 +--
 apps/user_ldap/l10n/el.php                 |   6 +
 apps/user_ldap/l10n/es.php                 |   7 +
 apps/user_ldap/l10n/fi_FI.php              |  31 +++
 apps/user_ldap/l10n/fr.php                 |   2 +
 apps/user_migrate/l10n/de.php              |   4 +-
 apps/user_migrate/l10n/el.php              |   8 +
 apps/user_migrate/l10n/es.php              |   5 +
 apps/user_migrate/l10n/fr.php              |   2 +-
 apps/user_openid/l10n/de.php               |   4 +-
 apps/user_openid/l10n/el.php               |   8 +
 apps/user_openid/l10n/es.php               |   5 +
 apps/user_openid/l10n/fi_FI.php            |   7 +
 core/l10n/de.php                           |  14 +-
 core/l10n/es.php                           |   6 +-
 l10n/af/contacts.po                        |  78 ++++----
 l10n/ar/calendar.po                        | 100 +++++-----
 l10n/ar/contacts.po                        |  78 ++++----
 l10n/ar/media.po                           |  14 +-
 l10n/ar_SA/contacts.po                     |  78 ++++----
 l10n/bg_BG/contacts.po                     |  78 ++++----
 l10n/ca/contacts.po                        | 112 +++++------
 l10n/cs_CZ/contacts.po                     |  78 ++++----
 l10n/cs_CZ/files_external.po               |  30 +--
 l10n/cs_CZ/files_sharing.po                |  13 +-
 l10n/cs_CZ/tasks.po                        |  33 ++--
 l10n/da/contacts.po                        |  78 ++++----
 l10n/de/admin_dependencies_chk.po          |  15 +-
 l10n/de/bookmarks.po                       |  13 +-
 l10n/de/calendar.po                        |  25 +--
 l10n/de/contacts.po                        | 147 +++++++-------
 l10n/de/core.po                            |  48 ++---
 l10n/de/files.po                           |  13 +-
 l10n/de/files_external.po                  |  11 +-
 l10n/de/lib.po                             |  37 ++--
 l10n/de/settings.po                        |  21 +-
 l10n/de/tasks.po                           |  15 +-
 l10n/de/user_ldap.po                       |  39 ++--
 l10n/de/user_migrate.po                    |  11 +-
 l10n/de/user_openid.po                     |  11 +-
 l10n/el/admin_dependencies_chk.po          |  11 +-
 l10n/el/admin_migrate.po                   |  11 +-
 l10n/el/contacts.po                        | 116 +++++------
 l10n/el/files_encryption.po                |  15 +-
 l10n/el/files_external.po                  |  21 +-
 l10n/el/files_sharing.po                   |  15 +-
 l10n/el/files_versions.po                  |  11 +-
 l10n/el/settings.po                        |   8 +-
 l10n/el/tasks.po                           |  39 ++--
 l10n/el/user_ldap.po                       |  15 +-
 l10n/el/user_migrate.po                    |  19 +-
 l10n/el/user_openid.po                     |  19 +-
 l10n/eo/contacts.po                        |  78 ++++----
 l10n/es/admin_dependencies_chk.po          |  11 +-
 l10n/es/contacts.po                        | 124 ++++++------
 l10n/es/core.po                            |  38 ++--
 l10n/es/files_external.po                  |  29 +--
 l10n/es/files_sharing.po                   |  15 +-
 l10n/es/files_versions.po                  |   9 +-
 l10n/es/settings.po                        |  16 +-
 l10n/es/user_ldap.po                       |  17 +-
 l10n/es/user_migrate.po                    |  13 +-
 l10n/es/user_openid.po                     |  13 +-
 l10n/et_EE/contacts.po                     |  78 ++++----
 l10n/eu/contacts.po                        |  78 ++++----
 l10n/eu_ES/contacts.po                     |  78 ++++----
 l10n/fa/bookmarks.po                       |  19 +-
 l10n/fa/contacts.po                        |  78 ++++----
 l10n/fa/files.po                           |  17 +-
 l10n/fa/files_encryption.po                |  13 +-
 l10n/fa/files_sharing.po                   |  15 +-
 l10n/fa/files_versions.po                  |  11 +-
 l10n/fa/lib.po                             |  55 +++---
 l10n/fa/tasks.po                           |  25 +--
 l10n/fi/contacts.po                        |  78 ++++----
 l10n/fi_FI/admin_dependencies_chk.po       |  21 +-
 l10n/fi_FI/calendar.po                     |  20 +-
 l10n/fi_FI/contacts.po                     | 108 ++++++-----
 l10n/fi_FI/files.po                        |   8 +-
 l10n/fi_FI/files_sharing.po                |  14 +-
 l10n/fi_FI/settings.po                     |   8 +-
 l10n/fi_FI/tasks.po                        |  10 +-
 l10n/fi_FI/user_ldap.po                    |  66 +++----
 l10n/fi_FI/user_openid.po                  |  17 +-
 l10n/fr/contacts.po                        | 123 ++++++------
 l10n/fr/media.po                           |  16 +-
 l10n/fr/tasks.po                           |   7 +-
 l10n/fr/user_ldap.po                       |  11 +-
 l10n/fr/user_migrate.po                    |   9 +-
 l10n/gl/contacts.po                        |  78 ++++----
 l10n/he/contacts.po                        |  78 ++++----
 l10n/hr/contacts.po                        |  78 ++++----
 l10n/hu_HU/contacts.po                     |  78 ++++----
 l10n/hy/contacts.po                        |  78 ++++----
 l10n/ia/contacts.po                        |  78 ++++----
 l10n/id/contacts.po                        |  78 ++++----
 l10n/id_ID/contacts.po                     |  78 ++++----
 l10n/it/contacts.po                        | 112 +++++------
 l10n/ja_JP/contacts.po                     | 112 +++++------
 l10n/ko/contacts.po                        |  78 ++++----
 l10n/lb/contacts.po                        |  78 ++++----
 l10n/lt_LT/contacts.po                     |  80 ++++----
 l10n/lt_LT/files.po                        |  14 +-
 l10n/lt_LT/settings.po                     |  18 +-
 l10n/lv/contacts.po                        |  78 ++++----
 l10n/mk/contacts.po                        |  78 ++++----
 l10n/ms_MY/contacts.po                     |  78 ++++----
 l10n/nb_NO/admin_migrate.po                |  13 +-
 l10n/nb_NO/bookmarks.po                    |  25 +--
 l10n/nb_NO/contacts.po                     |  78 ++++----
 l10n/nb_NO/files_encryption.po             |  15 +-
 l10n/nb_NO/files_sharing.po                |  15 +-
 l10n/nb_NO/files_versions.po               |   9 +-
 l10n/nb_NO/lib.po                          |  71 +++----
 l10n/nb_NO/tasks.po                        |  37 ++--
 l10n/nl/contacts.po                        |  78 ++++----
 l10n/nn_NO/contacts.po                     |  78 ++++----
 l10n/pl/contacts.po                        | 103 +++++-----
 l10n/pt_BR/contacts.po                     |  78 ++++----
 l10n/pt_PT/calendar.po                     |  93 ++++-----
 l10n/pt_PT/contacts.po                     | 211 +++++++++++----------
 l10n/pt_PT/files.po                        |  21 +-
 l10n/pt_PT/gallery.po                      |  85 ++-------
 l10n/pt_PT/settings.po                     |  25 +--
 l10n/ro/contacts.po                        |  78 ++++----
 l10n/ru/contacts.po                        | 196 +++++++++----------
 l10n/ru/files.po                           |  16 +-
 l10n/ru/gallery.po                         |  85 ++-------
 l10n/sk_SK/contacts.po                     |  78 ++++----
 l10n/sl/contacts.po                        | 112 +++++------
 l10n/so/contacts.po                        |  78 ++++----
 l10n/sr/contacts.po                        |  78 ++++----
 l10n/sr@latin/contacts.po                  |  78 ++++----
 l10n/sv/contacts.po                        | 112 +++++------
 l10n/templates/admin_dependencies_chk.pot  |   2 +-
 l10n/templates/admin_migrate.pot           |   2 +-
 l10n/templates/bookmarks.pot               |   2 +-
 l10n/templates/calendar.pot                |   2 +-
 l10n/templates/contacts.pot                |  76 ++++----
 l10n/templates/core.pot                    |   2 +-
 l10n/templates/files.pot                   |   2 +-
 l10n/templates/files_encryption.pot        |   2 +-
 l10n/templates/files_external.pot          |   2 +-
 l10n/templates/files_sharing.pot           |   2 +-
 l10n/templates/files_versions.pot          |   2 +-
 l10n/templates/gallery.pot                 |   2 +-
 l10n/templates/lib.pot                     |   2 +-
 l10n/templates/media.pot                   |   2 +-
 l10n/templates/settings.pot                |   2 +-
 l10n/templates/tasks.pot                   |   2 +-
 l10n/templates/user_ldap.pot               |   2 +-
 l10n/templates/user_migrate.pot            |   2 +-
 l10n/templates/user_openid.pot             |   2 +-
 l10n/th_TH/contacts.po                     |  78 ++++----
 l10n/tr/contacts.po                        |  78 ++++----
 l10n/uk/contacts.po                        |  78 ++++----
 l10n/vi/contacts.po                        |  78 ++++----
 l10n/zh_CN.GB2312/contacts.po              |  78 ++++----
 l10n/zh_CN/contacts.po                     |  78 ++++----
 l10n/zh_CN/lib.po                          |  73 +++----
 l10n/zh_TW/contacts.po                     |  78 ++++----
 lib/l10n/de.php                            |  10 +-
 lib/l10n/fa.php                            |  16 ++
 lib/l10n/nb_NO.php                         |  24 +++
 lib/l10n/zh_CN.php                         |  25 +++
 settings/l10n/de.php                       |  14 +-
 settings/l10n/el.php                       |   1 +
 settings/l10n/es.php                       |  10 +-
 settings/l10n/fi_FI.php                    |   4 +-
 settings/l10n/lt_LT.php                    |   6 +
 settings/l10n/pt_PT.php                    |   9 +
 256 files changed, 4420 insertions(+), 3571 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/el.php
 create mode 100644 apps/admin_dependencies_chk/l10n/es.php
 create mode 100644 apps/admin_dependencies_chk/l10n/fi_FI.php
 create mode 100644 apps/admin_migrate/l10n/el.php
 create mode 100644 apps/admin_migrate/l10n/nb_NO.php
 create mode 100644 apps/bookmarks/l10n/fa.php
 create mode 100644 apps/bookmarks/l10n/nb_NO.php
 create mode 100644 apps/files_encryption/l10n/el.php
 create mode 100644 apps/files_encryption/l10n/fa.php
 create mode 100644 apps/files_encryption/l10n/nb_NO.php
 create mode 100644 apps/files_external/l10n/cs_CZ.php
 create mode 100644 apps/files_external/l10n/el.php
 create mode 100644 apps/files_external/l10n/es.php
 create mode 100644 apps/files_sharing/l10n/el.php
 create mode 100644 apps/files_sharing/l10n/es.php
 create mode 100644 apps/files_sharing/l10n/fa.php
 create mode 100644 apps/files_sharing/l10n/nb_NO.php
 create mode 100644 apps/files_versions/l10n/el.php
 create mode 100644 apps/files_versions/l10n/es.php
 create mode 100644 apps/files_versions/l10n/fa.php
 create mode 100644 apps/files_versions/l10n/nb_NO.php
 create mode 100644 apps/tasks/l10n/cs_CZ.php
 create mode 100644 apps/tasks/l10n/el.php
 create mode 100644 apps/tasks/l10n/fa.php
 create mode 100644 apps/tasks/l10n/nb_NO.php
 create mode 100644 apps/user_ldap/l10n/el.php
 create mode 100644 apps/user_ldap/l10n/es.php
 create mode 100644 apps/user_ldap/l10n/fi_FI.php
 create mode 100644 apps/user_migrate/l10n/el.php
 create mode 100644 apps/user_migrate/l10n/es.php
 create mode 100644 apps/user_openid/l10n/el.php
 create mode 100644 apps/user_openid/l10n/es.php
 create mode 100644 apps/user_openid/l10n/fi_FI.php
 create mode 100644 lib/l10n/fa.php
 create mode 100644 lib/l10n/nb_NO.php
 create mode 100644 lib/l10n/zh_CN.php

diff --git a/apps/admin_dependencies_chk/l10n/de.php b/apps/admin_dependencies_chk/l10n/de.php
index 0160916809..7877e7d679 100644
--- a/apps/admin_dependencies_chk/l10n/de.php
+++ b/apps/admin_dependencies_chk/l10n/de.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Das Modul  php-json wird von vielen Anwendungen zur internen Kommunikation benötigt.",
+"The php-json module is needed by the many applications for inter communications" => "Das Modul php-json wird von vielen Anwendungen zur internen Kommunikation benötigt.",
 "The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen.",
-"The php-gd module is needed to create thumbnails of your images" => "Das Modul  php-gd wird für die Erzeugung der Vorschaubilder benötigt.",
-"The php-ldap module is needed connect to your ldap server" => "Das Modul  php-ldap wird für die Verbindung mit dem LDAP-Server benötigt.",
+"The php-gd module is needed to create thumbnails of your images" => "Das Modul php-gd wird für die Erzeugung der Vorschaubilder benötigt.",
+"The php-ldap module is needed connect to your ldap server" => "Das Modul php-ldap wird für die Verbindung mit dem LDAP-Server benötigt.",
 "The php-zip module is needed download multiple files at once" => "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Das Modul  php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Das Modul php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben.",
 "The php-ctype module is needed validate data." => "Das Modul php-ctype wird benötigt, um Daten zu prüfen.",
 "The php-xml module is needed to share files with webdav." => "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen.",
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen.",
diff --git a/apps/admin_dependencies_chk/l10n/el.php b/apps/admin_dependencies_chk/l10n/el.php
new file mode 100644
index 0000000000..9dd455b670
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/el.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Dependencies status" => "Κατάσταση εξαρτήσεων",
+"Used by :" => "Χρησιμοποιήθηκε από:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/es.php b/apps/admin_dependencies_chk/l10n/es.php
new file mode 100644
index 0000000000..cbf13951ac
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/es.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Dependencies status" => "Estado de las dependencias",
+"Used by :" => "Usado por:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/fi_FI.php b/apps/admin_dependencies_chk/l10n/fi_FI.php
new file mode 100644
index 0000000000..85e33cfe8c
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/fi_FI.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"The php-gd module is needed to create thumbnails of your images" => "php-gd-moduuli vaaditaan, jotta kuvista on mahdollista luoda esikatselukuvia",
+"The php-ldap module is needed connect to your ldap server" => "php-ldap-moduuli vaaditaan, jotta yhteys ldap-palvelimeen on mahdollista",
+"The php-zip module is needed download multiple files at once" => "php-zip-moduuli vaaditaan, jotta useiden tiedostojen samanaikainen lataus on mahdollista",
+"The php-xml module is needed to share files with webdav." => "php-xml-moduuli vaaditaan, jotta tiedostojen jako webdavia käyttäen on mahdollista",
+"The php-pdo module is needed to store owncloud data into a database." => "php-pdo-moduuli tarvitaan, jotta ownCloud-tietojen tallennus tietokantaan on mahdollista",
+"Dependencies status" => "Riippuvuuksien tila",
+"Used by :" => "Käyttökohde:"
+);
diff --git a/apps/admin_migrate/l10n/el.php b/apps/admin_migrate/l10n/el.php
new file mode 100644
index 0000000000..95034c46a4
--- /dev/null
+++ b/apps/admin_migrate/l10n/el.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Αυτό θα δημιουργήσει ένα συμπιεσμένο αρχείο που θα περιέχει τα δεδομένα από αυτό το ownCloud.\n            Παρακαλώ επιλέξτε τον τύπο εξαγωγής:",
+"Export" => "Εξαγωγή"
+);
diff --git a/apps/admin_migrate/l10n/nb_NO.php b/apps/admin_migrate/l10n/nb_NO.php
new file mode 100644
index 0000000000..31f4c030bd
--- /dev/null
+++ b/apps/admin_migrate/l10n/nb_NO.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Eksporter denne ownCloud forekomsten",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dette vil opprette en komprimert fil som inneholder dataene fra denne ownCloud forekomsten.⏎ Vennligst velg eksporttype:",
+"Export" => "Eksport"
+);
diff --git a/apps/bookmarks/l10n/de.php b/apps/bookmarks/l10n/de.php
index 9e0f137382..14a54f1cce 100644
--- a/apps/bookmarks/l10n/de.php
+++ b/apps/bookmarks/l10n/de.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Bookmarks" => "Lesezeichen",
 "unnamed" => "unbenannt",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst.",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.",
 "Read later" => "Später lesen",
 "Address" => "Adresse",
-"Title" => "Title",
+"Title" => "Titel",
 "Tags" => "Tags",
 "Save bookmark" => "Lesezeichen speichern",
-"You have no bookmarks" => "Du hast keine Lesezeichen",
+"You have no bookmarks" => "Sie haben keine Lesezeichen",
 "Bookmarklet <br />" => "Bookmarklet <br />"
 );
diff --git a/apps/bookmarks/l10n/fa.php b/apps/bookmarks/l10n/fa.php
new file mode 100644
index 0000000000..b46ce911d4
--- /dev/null
+++ b/apps/bookmarks/l10n/fa.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "نشانک‌ها",
+"unnamed" => "بدون‌نام",
+"Address" => "آدرس",
+"Title" => "عنوان",
+"Save bookmark" => "ذخیره نشانک",
+"You have no bookmarks" => "شما هیچ نشانکی ندارید"
+);
diff --git a/apps/bookmarks/l10n/nb_NO.php b/apps/bookmarks/l10n/nb_NO.php
new file mode 100644
index 0000000000..12e63887d2
--- /dev/null
+++ b/apps/bookmarks/l10n/nb_NO.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Bokmerker",
+"unnamed" => "uten navn",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra denne over din nettlesers bokmerker og klikk den, hvis du ønsker å hurtig legge til bokmerke for en nettside",
+"Read later" => "Les senere",
+"Address" => "Adresse",
+"Title" => "Tittel",
+"Tags" => "Etikett",
+"Save bookmark" => "Lagre bokmerke",
+"You have no bookmarks" => "Du har ingen bokmerker"
+);
diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
index 524def22f7..1ca5e0ead5 100644
--- a/apps/calendar/l10n/ar.php
+++ b/apps/calendar/l10n/ar.php
@@ -1,9 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "ليس جميع الجداول الزمنيه محفوضه مؤقة",
+"Everything seems to be completely cached" => "كل شيء محفوض مؤقة",
+"No calendars found." => "لم يتم العثور على جدول الزمني",
+"No events found." => "لم يتم العثور على احداث",
 "Wrong calendar" => "جدول زمني خاطئ",
 "New Timezone:" => "التوقيت الجديد",
 "Timezone changed" => "تم تغيير المنطقة الزمنية",
 "Invalid request" => "طلب غير مفهوم",
 "Calendar" => "الجدول الزمني",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "ddd M/d",
+"MMMM yyyy" => "ddd M/d",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "عيد ميلاد",
 "Business" => "عمل",
 "Call" => "إتصال",
@@ -19,6 +29,8 @@
 "Projects" => "مشاريع",
 "Questions" => "اسئلة",
 "Work" => "العمل",
+"by" => "من قبل",
+"unnamed" => "غير مسمى",
 "New Calendar" => "جدول زمني جديد",
 "Does not repeat" => "لا يعاد",
 "Daily" => "يومي",
@@ -64,6 +76,18 @@
 "by day and month" => "حسب اليوم و الشهر",
 "Date" => "تاريخ",
 "Cal." => "تقويم",
+"Sun." => "أحد",
+"Mon." => "أثن.",
+"Tue." => "ثلا.",
+"Wed." => "أرب.",
+"Thu." => "خمي.",
+"Fri." => "جمع.",
+"Sat." => "سبت",
+"Jan." => "ك2",
+"Feb." => "شبا.",
+"Mar." => "آذا.",
+"Apr." => "نيس.",
+"May." => "أيا.",
 "All day" => "كل النهار",
 "Missing fields" => "خانات خالية من المعلومات",
 "Title" => "عنوان",
@@ -77,10 +101,15 @@
 "Month" => "شهر",
 "List" => "قائمة",
 "Today" => "اليوم",
+"Your calendars" => "جداولك الزمنيه",
 "CalDav Link" => "وصلة CalDav",
+"Shared calendars" => "جداول زمنيه مشتركه",
+"No shared calendars" => "لا يوجد جداول زمنيه مشتركه",
+"Share Calendar" => "شارك الجدول الزمني",
 "Download" => "تحميل",
 "Edit" => "تعديل",
 "Delete" => "حذف",
+"shared with you by" => "مشاركه من قبل",
 "New calendar" => "جدول زمني جديد",
 "Edit calendar" => "عادل الجدول الزمني",
 "Displayname" => "الاسم المرئي",
@@ -91,8 +120,15 @@
 "Cancel" => "إلغاء",
 "Edit an event" => "عادل حدث",
 "Export" => "تصدير المعلومات",
+"Eventinfo" => "تفاصيل الحدث",
+"Repeating" => "يعاد",
+"Alarm" => "تنبيه",
+"Attendees" => "الحضور",
+"Share" => "شارك",
 "Title of the Event" => "عنوان الحدث",
 "Category" => "فئة",
+"Separate categories with commas" => "افصل الفئات بالفواصل",
+"Edit categories" => "عدل الفئات",
 "All Day Event" => "حدث في يوم كامل",
 "From" => "من",
 "To" => "إلى",
@@ -119,7 +155,17 @@
 "Import" => "إدخال",
 "Close Dialog" => "أغلق الحوار",
 "Create a new event" => "إضافة حدث جديد",
+"View an event" => "شاهد الحدث",
+"No categories selected" => "لم يتم اختيار الفئات",
+"of" => "من",
+"at" => "في",
 "Timezone" => "المنطقة الزمنية",
 "24h" => "24 ساعة",
-"12h" => "12 ساعة"
+"12h" => "12 ساعة",
+"Users" => "المستخدمين",
+"select users" => "اختر المستخدمين",
+"Editable" => "يمكن تعديله",
+"Groups" => "مجموعات",
+"select groups" => "اختر المجموعات",
+"make public" => "حدث عام"
 );
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index cd148d757f..223e80effb 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Not all calendars are completely cached" => "Noch sind nicht alle Kalender zwischengespeichert.",
 "Everything seems to be completely cached" => "Es sieht so aus, als wäre alles vollständig zwischengespeichert.",
-"No calendars found." => "Keine Kalender gefunden",
-"No events found." => "Keine Termine gefunden",
+"No calendars found." => "Keine Kalender gefunden.",
+"No events found." => "Keine Termine gefunden.",
 "Wrong calendar" => "Falscher Kalender",
-"The file contained either no events or all events are already saved in your calendar." => "Entweder enthielt die Datei keine Termine oder alle Termine waren schon im Kalender gespeichert.",
+"The file contained either no events or all events are already saved in your calendar." => "Entweder enthielt die Datei keine Termine oder alle Termine waren bereits im Kalender gespeichert.",
 "events has been saved in the new calendar" => "Der Termin wurde im neuen Kalender gespeichert.",
 "Import failed" => "Import fehlgeschlagen",
 "events has been saved in your calendar" => "Der Termin wurde im Kalender gespeichert.",
@@ -115,7 +115,7 @@
 "Settings" => "Einstellungen",
 "Your calendars" => "Deine Kalender",
 "CalDav Link" => "CalDAV-Link",
-"Shared calendars" => "geteilte Kalender",
+"Shared calendars" => "Geteilte Kalender",
 "No shared calendars" => "Keine geteilten Kalender",
 "Share Calendar" => "Kalender teilen",
 "Download" => "Herunterladen",
@@ -162,11 +162,11 @@
 "End" => "Ende",
 "occurrences" => "Termine",
 "create a new calendar" => "Neuen Kalender anlegen",
-"Import a calendar file" => "Kalenderdatei Importieren",
+"Import a calendar file" => "Kalenderdatei importieren",
 "Please choose a calendar" => "Wählen Sie bitte einen Kalender.",
 "Name of new calendar" => "Kalendername",
 "Take an available name!" => "Wählen Sie einen verfügbaren Namen.",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ein Kalender mit diesem Namen existiert schon. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ein Kalender mit diesem Namen existiert bereits. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
 "Import" => "Importieren",
 "Close Dialog" => "Dialog schließen",
 "Create a new event" => "Neues Ereignis",
@@ -178,8 +178,8 @@
 "Timezone" => "Zeitzone",
 "Update timezone automatically" => "Zeitzone automatisch aktualisieren",
 "Time format" => "Zeitformat",
-"24h" => "24h",
-"12h" => "12h",
+"24h" => "24 Stunden",
+"12h" => "12 Stunden",
 "Start week on" => "Erster Wochentag",
 "Cache" => "Zwischenspeicher",
 "Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
index 1faa161e65..c4c9df3588 100644
--- a/apps/calendar/l10n/fi_FI.php
+++ b/apps/calendar/l10n/fi_FI.php
@@ -87,6 +87,7 @@
 "Month" => "Kuukausi",
 "List" => "Lista",
 "Today" => "Tänään",
+"Settings" => "Asetukset",
 "Your calendars" => "Omat kalenterisi",
 "CalDav Link" => "CalDav-linkki",
 "Shared calendars" => "Jaetut kalenterit",
@@ -139,10 +140,15 @@
 "Create a new event" => "Luo uusi tapahtuma",
 "View an event" => "Avaa tapahtuma",
 "No categories selected" => "Luokkia ei ole valittu",
+"General" => "Yleiset",
 "Timezone" => "Aikavyöhyke",
+"Update timezone automatically" => "Päivitä aikavyöhykkeet automaattisesti",
+"Time format" => "Ajan näyttömuoto",
 "24h" => "24 tuntia",
 "12h" => "12 tuntia",
+"Start week on" => "Viikon alkamispäivä",
 "Calendar CalDAV syncing addresses" => "Kalenterin CalDAV-synkronointiosoitteet",
+"Primary address (Kontact et al)" => "Ensisijainen osoite (Kontact ja muut vastaavat)",
 "iOS/OS X" => "iOS/OS X",
 "Users" => "Käyttäjät",
 "select users" => "valitse käyttäjät",
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
index cf816d8b34..d5ead9fd43 100644
--- a/apps/calendar/l10n/pt_PT.php
+++ b/apps/calendar/l10n/pt_PT.php
@@ -1,7 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Nem todos os calendários estão completamente pré-carregados",
+"Everything seems to be completely cached" => "Parece que tudo está completamente pré-carregado",
 "No calendars found." => "Nenhum calendário encontrado.",
 "No events found." => "Nenhum evento encontrado.",
 "Wrong calendar" => "Calendário errado",
+"The file contained either no events or all events are already saved in your calendar." => "O ficheiro não continha nenhuns eventos ou então todos os eventos já estavam carregados no seu calendário",
+"events has been saved in the new calendar" => "Os eventos foram guardados no novo calendário",
+"Import failed" => "Falha na importação",
+"events has been saved in your calendar" => "Os eventos foram guardados no seu calendário",
 "New Timezone:" => "Nova zona horária",
 "Timezone changed" => "Zona horária alterada",
 "Invalid request" => "Pedido inválido",
@@ -27,6 +33,7 @@
 "Projects" => "Projetos",
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
+"by" => "por",
 "unnamed" => "não definido",
 "New Calendar" => "Novo calendário",
 "Does not repeat" => "Não repete",
@@ -73,6 +80,25 @@
 "by day and month" => "por dia e mês",
 "Date" => "Data",
 "Cal." => "Cal.",
+"Sun." => "Dom.",
+"Mon." => "Seg.",
+"Tue." => "ter.",
+"Wed." => "Qua.",
+"Thu." => "Qui.",
+"Fri." => "Sex.",
+"Sat." => "Sáb.",
+"Jan." => "Jan.",
+"Feb." => "Fev,",
+"Mar." => "Mar.",
+"Apr." => "Abr.",
+"May." => "Mai.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Out.",
+"Nov." => "Nov.",
+"Dec." => "Dez.",
 "All day" => "Todo o dia",
 "Missing fields" => "Falta campos",
 "Title" => "Título",
@@ -86,6 +112,7 @@
 "Month" => "Mês",
 "List" => "Lista",
 "Today" => "Hoje",
+"Settings" => "Configurações",
 "Your calendars" => "Os seus calendários",
 "CalDav Link" => "Endereço CalDav",
 "Shared calendars" => "Calendários partilhados",
@@ -136,7 +163,10 @@
 "occurrences" => "ocorrências",
 "create a new calendar" => "criar novo calendário",
 "Import a calendar file" => "Importar um ficheiro de calendário",
+"Please choose a calendar" => "Escolha um calendário por favor",
 "Name of new calendar" => "Nome do novo calendário",
+"Take an available name!" => "Escolha um nome disponível!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Já existe um Calendário com esse nome. Se mesmo assim continuar, esses calendários serão fundidos.",
 "Import" => "Importar",
 "Close Dialog" => "Fechar diálogo",
 "Create a new event" => "Criar novo evento",
@@ -144,9 +174,21 @@
 "No categories selected" => "Nenhuma categoria seleccionada",
 "of" => "de",
 "at" => "em",
+"General" => "Geral",
 "Timezone" => "Zona horária",
+"Update timezone automatically" => "Actualizar automaticamente o fuso horário",
+"Time format" => "Formato da hora",
 "24h" => "24h",
 "12h" => "12h",
+"Start week on" => "Começar semana em",
+"Cache" => "Memória de pré-carregamento",
+"Clear cache for repeating events" => "Limpar a memória de pré carregamento para eventos recorrentes",
+"URLs" => "Endereço(s) web",
+"Calendar CalDAV syncing addresses" => "Endereços de sincronização de calendários CalDAV",
+"more info" => "mais informação",
+"Primary address (Kontact et al)" => "Endereço principal (contactos et al.)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Ligaç(ão/ões) só de leitura do iCalendar",
 "Users" => "Utilizadores",
 "select users" => "Selecione utilizadores",
 "Editable" => "Editavel",
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index ace20d444c..2b28d6ca6d 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -5,8 +5,6 @@
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
-"Error deleting contact property." => "خطء خلال محي الصفه.",
-"Error updating contact property." => "خطء خلال تعديل الصفه.",
 "Contacts" => "المعارف",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index de10ec84e0..2004d416b3 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "No es pot afegir una propietat buida.",
 "At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
 "Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
-"Error adding contact property: " => "Error en afegir la propietat del contacte:",
+"Missing IM parameter." => "Falta el paràmetre IM.",
+"Unknown IM: " => "IM desconegut:",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
-"Error deleting contact property." => "Error en eliminar la propietat del contacte.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error en analitzar la ID de la VCard: \"",
 "checksum is not set." => "no s'ha establert la suma de verificació.",
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
 "Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
-"Error updating contact property." => "Error en actualitzar la propietat del contacte.",
 "No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
 "Error reading contact photo." => "Error en llegir la foto del contacte.",
 "Error saving temporary file." => "Error en desar el fitxer temporal.",
@@ -70,6 +69,18 @@
 "Addressbook not found: " => "No s'ha trobat la llibreta d'adreces: ",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Feina",
 "Home" => "Casa",
 "Other" => "Altres",
@@ -138,12 +149,15 @@
 "Delete email address" => "Elimina l'adreça de correu electrònic",
 "Enter phone number" => "Escriviu el número de telèfon",
 "Delete phone number" => "Elimina el número de telèfon",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "Elimina IM",
 "View on map" => "Visualitza al mapa",
 "Edit address details" => "Edita els detalls de l'adreça",
 "Add notes here." => "Afegiu notes aquí.",
 "Add field" => "Afegeix un camp",
 "Phone" => "Telèfon",
 "Email" => "Correu electrònic",
+"Instant Messaging" => "Missatgeria instantània",
 "Address" => "Adreça",
 "Note" => "Nota",
 "Download contact" => "Baixa el contacte",
@@ -189,7 +203,6 @@
 "Importing contacts" => "S'estan important contactes",
 "You have no contacts in your addressbook." => "No teniu contactes a la llibreta d'adreces.",
 "Add contact" => "Afegeix un contacte",
-"Configure addressbooks" => "Configura les llibretes d'adreces",
 "Select Address Books" => "Selecccioneu llibretes d'adreces",
 "Enter name" => "Escriviu un nom",
 "Enter description" => "Escriviu una descripció",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 16c8a91b97..966743a13f 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -14,15 +14,12 @@
 "Cannot add empty property." => "Nelze přidat prazdný údaj.",
 "At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
 "Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
-"Error adding contact property: " => "Chyba během přidávání vlastností kontaktu:",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
-"Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
 "Missing ID" => "Chybí ID",
 "Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
 "checksum is not set." => "kontrolní součet není nastaven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Něco se pokazilo. ",
-"Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
 "No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
 "Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
 "Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
@@ -188,7 +185,6 @@
 "Importing contacts" => "Importování kontaktů",
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
-"Configure addressbooks" => "Nastavit adresář",
 "Select Address Books" => "Vybrat Adresář",
 "Enter name" => "Vložte jméno",
 "Enter description" => "Vložte popis",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 9c733b7db7..97c5f1307c 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
 "Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
-"Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
 "Missing ID" => "Manglende ID",
 "Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'et: \"",
 "checksum is not set." => "Checksum er ikke medsendt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
 "Something went FUBAR. " => "Noget gik grueligt galt. ",
-"Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
 "No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
 "Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
 "Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
@@ -148,7 +146,6 @@
 "Importing contacts" => "Importerer kontaktpersoner",
 "You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
 "Add contact" => "Tilføj kontaktpeson.",
-"Configure addressbooks" => "Konfigurer adressebøger",
 "CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
 "more info" => "mere info",
 "Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 347febeaf2..ca65d26cec 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -13,16 +13,15 @@
 "Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
 "Cannot add empty property." => "Feld darf nicht leer sein.",
 "At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
-"Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
-"Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
-"Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
-"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen.",
+"Trying to add duplicate property: " => "Versuche doppelte Eigenschaft hinzuzufügen: ",
+"Missing IM parameter." => "IM-Parameter fehlt.",
+"Unknown IM: " => "IM unbekannt:",
+"Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisieren Sie die Seite.",
 "Missing ID" => "Fehlende ID",
 "Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
 "Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
-"Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
 "No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
 "Error reading contact photo." => "Fehler beim Auslesen des Kontaktfotos.",
 "Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
@@ -32,13 +31,13 @@
 "File doesn't exist:" => "Datei existiert nicht: ",
 "Error loading image." => "Fehler beim Laden des Bildes.",
 "Error getting contact object." => "Fehler beim Abruf des Kontakt-Objektes.",
-"Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO Eigenschaft.",
+"Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO-Eigenschaft.",
 "Error saving contact." => "Fehler beim Speichern des Kontaktes.",
 "Error resizing image" => "Fehler bei der Größenänderung des Bildes",
 "Error cropping image" => "Fehler beim Zuschneiden des Bildes",
-"Error creating temporary image" => "Fehler beim erstellen des temporären Bildes",
+"Error creating temporary image" => "Fehler beim Erstellen des temporären Bildes",
 "Error finding image: " => "Fehler beim Suchen des Bildes: ",
-"Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen",
+"Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen.",
 "There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer, als durch die upload_max_filesize Direktive in php.ini erlaubt",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist",
@@ -51,25 +50,37 @@
 "Contacts" => "Kontakte",
 "Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung",
 "Not implemented" => "Nicht verfügbar",
-"Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen",
+"Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen.",
 "Error" => "Fehler",
 "This property has to be non-empty." => "Dieses Feld darf nicht leer sein.",
 "Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen. Bitte melden Sie dies auf bugs.owncloud.org",
 "Edit name" => "Name ändern",
-"No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie hochladen möchten, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
 "Error loading profile picture." => "Fehler beim Laden des Profilbildes.",
 "Select type" => "Wähle Typ",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
-"Do you want to merge these address books?" => "Möchtest du diese Adressbücher zusammenführen?",
+"Do you want to merge these address books?" => "Möchten Sie diese Adressbücher zusammenführen?",
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
 "Displayname cannot be empty." => "Der Anzeigename darf nicht leer sein.",
 "Addressbook not found: " => "Adressbuch nicht gefunden:",
-"This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
+"This is not your addressbook." => "Dies ist nicht Ihr Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Arbeit",
 "Home" => "Zuhause",
 "Other" => "Andere",
@@ -113,7 +124,7 @@
 "Add new contact" => "Neuen Kontakt hinzufügen",
 "Add new addressbook" => "Neues Adressbuch hinzufügen",
 "Delete current contact" => "Aktuellen Kontakt löschen",
-"Drop photo to upload" => "Zieh' ein Foto hierher zum Hochladen",
+"Drop photo to upload" => "Ziehen Sie ein Foto zum Hochladen hierher",
 "Delete current photo" => "Derzeitiges Foto löschen",
 "Edit current photo" => "Foto ändern",
 "Upload new photo" => "Neues Foto hochladen",
@@ -138,12 +149,15 @@
 "Delete email address" => "E-Mail-Adresse löschen",
 "Enter phone number" => "Telefonnummer angeben",
 "Delete phone number" => "Telefonnummer löschen",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "IM löschen",
 "View on map" => "Auf Karte anzeigen",
 "Edit address details" => "Adressinformationen ändern",
 "Add notes here." => "Füge hier Notizen ein.",
 "Add field" => "Feld hinzufügen",
 "Phone" => "Telefon",
 "Email" => "E-Mail",
+"Instant Messaging" => "Instant Messaging",
 "Address" => "Adresse",
 "Note" => "Notiz",
 "Download contact" => "Kontakt herunterladen",
@@ -169,12 +183,12 @@
 "Mr" => "Herr",
 "Sir" => "Herr",
 "Mrs" => "Frau",
-"Dr" => "Dr",
+"Dr" => "Dr.",
 "Given name" => "Vorname",
 "Additional names" => "Zusätzliche Namen",
 "Family name" => "Familienname",
 "Hon. suffixes" => "Höflichkeitssuffixe",
-"J.D." => "Dr. Jur",
+"J.D." => "Dr. Jur.",
 "M.D." => "Dr. med.",
 "D.O." => "DGOM",
 "D.C." => "MChiro",
@@ -187,15 +201,14 @@
 "create a new addressbook" => "Neues Adressbuch erstellen",
 "Name of new addressbook" => "Name des neuen Adressbuchs",
 "Importing contacts" => "Kontakte werden importiert",
-"You have no contacts in your addressbook." => "Du hast keine Kontakte im Adressbuch.",
+"You have no contacts in your addressbook." => "Sie haben keine Kontakte im Adressbuch.",
 "Add contact" => "Kontakt hinzufügen",
-"Configure addressbooks" => "Adressbücher konfigurieren",
 "Select Address Books" => "Wähle Adressbuch",
 "Enter name" => "Name eingeben",
 "Enter description" => "Beschreibung eingeben",
 "CardDAV syncing addresses" => "CardDAV Sync-Adressen",
-"more info" => "mehr Info",
-"Primary address (Kontact et al)" => "primäre Adresse (für Kontakt o.ä. Programme)",
+"more info" => "mehr Informationen",
+"Primary address (Kontact et al)" => "Primäre Adresse (für Kontakt o.ä.)",
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "CardDav-Link anzeigen",
 "Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index f8ae330213..638085f515 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
 "At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
 "Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
-"Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
+"Missing IM parameter." => "Λείπει IM παράμετρος.",
+"Unknown IM: " => "Άγνωστο IM:",
 "Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
-"Error deleting contact property." => "Σφάλμα διαγραφής ιδιότητας επαφής.",
 "Missing ID" => "Λείπει ID",
 "Error parsing VCard for ID: \"" => "Σφάλμα κατά την ανάγνωση του VCard για το ID:\"",
 "checksum is not set." => "δε ορίστηκε checksum ",
 "Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
 "Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
-"Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
 "No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
 "Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
 "Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
@@ -62,6 +61,7 @@
 "Error loading profile picture." => "Σφάλμα στην φόρτωση εικόνας προφίλ.",
 "Select type" => "Επιλογή τύπου",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν.",
+"Do you want to merge these address books?" => "Επιθυμείτε να συγχωνεύσετε αυτά τα δύο βιβλία διευθύνσεων?",
 "Result: " => "Αποτέλεσμα: ",
 " imported, " => " εισάγεται,",
 " failed." => " απέτυχε.",
@@ -69,6 +69,18 @@
 "Addressbook not found: " => "Το βιβλίο διευθύνσεων δεν βρέθηκε:",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Εργασία",
 "Home" => "Σπίτι",
 "Other" => "Άλλο",
@@ -137,12 +149,15 @@
 "Delete email address" => "Διαγραφή διεύθυνση email",
 "Enter phone number" => "Εισήγαγε αριθμό τηλεφώνου",
 "Delete phone number" => "Διέγραψε αριθμό τηλεφώνου",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "Διαγραφή IM",
 "View on map" => "Προβολή στο χάρτη",
 "Edit address details" => "Επεξεργασία λεπτομερειών διεύθυνσης",
 "Add notes here." => "Πρόσθεσε τις σημειώσεις εδώ",
 "Add field" => "Προσθήκη πεδίου",
 "Phone" => "Τηλέφωνο",
 "Email" => "Email",
+"Instant Messaging" => "Άμεσα μυνήματα",
 "Address" => "Διεύθυνση",
 "Note" => "Σημείωση",
 "Download contact" => "Λήψη επαφής",
@@ -188,7 +203,6 @@
 "Importing contacts" => "Εισαγωγή επαφών",
 "You have no contacts in your addressbook." => "Δεν έχεις επαφές στο βιβλίο διευθύνσεων",
 "Add contact" => "Προσθήκη επαφής",
-"Configure addressbooks" => "Ρύθμισε το βιβλίο διευθύνσεων",
 "Select Address Books" => "Επέλεξε βιβλίο διευθύνσεων",
 "Enter name" => "Εισαγωγή ονόματος",
 "Enter description" => "Εισαγωγή περιγραφής",
@@ -198,6 +212,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Εμφάνιση συνδέσμου CardDav",
 "Show read-only VCF link" => "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση",
+"Share" => "Μοιράσου",
 "Download" => "Λήψη",
 "Edit" => "Επεξεργασία",
 "New Address Book" => "Νέο βιβλίο διευθύνσεων",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index bcdd63be9e..e4eb06db2a 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -14,15 +14,12 @@
 "Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
 "At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
 "Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
-"Error adding contact property: " => "Eraro aldonante kontakta propraĵo:",
 "Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
-"Error deleting contact property." => "Eraro dum forigo de kontaktopropraĵo.",
 "Missing ID" => "Mankas identigilo",
 "Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
 "checksum is not set." => "kontrolsumo ne agordiĝis.",
 "Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
-"Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
 "Error reading contact photo." => "Eraro dum lego de kontakta foto.",
 "Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
@@ -173,7 +170,6 @@
 "Importing contacts" => "Enportante kontaktojn",
 "You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
 "Add contact" => "Aldoni kontakton",
-"Configure addressbooks" => "Agordi adresarojn",
 "Select Address Books" => "Elektu adresarojn",
 "Enter name" => "Enigu nomon",
 "Enter description" => "Enigu priskribon",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index a465f5c114..543bda3036 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -13,14 +13,14 @@
 "Cannot add empty property." => "No se puede añadir una propiedad vacía.",
 "At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
 "Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
+"Missing IM parameter." => "Falta un parámetro del MI.",
+"Unknown IM: " => "MI desconocido:",
 "Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
-"Error deleting contact property." => "Error al borrar una propiedad del contacto.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
 "checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
 "Something went FUBAR. " => "Plof. Algo ha fallado.",
-"Error updating contact property." => "Error al actualizar una propiedad del contacto.",
 "No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
 "Error reading contact photo." => "Error leyendo fotografía del contacto.",
 "Error saving temporary file." => "Error al guardar archivo temporal.",
@@ -63,6 +63,18 @@
 " failed." => "Fallo.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "Google Talk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Trabajo",
 "Home" => "Particular",
 "Other" => "Otro",
@@ -99,6 +111,7 @@
 "Actions" => "Acciones",
 "Refresh contacts list" => "Refrescar la lista de contactos",
 "Add new contact" => "Añadir un nuevo contacto",
+"Add new addressbook" => "Añadir nueva libreta de direcciones",
 "Delete current contact" => "Eliminar contacto actual",
 "Drop photo to upload" => "Suelta una foto para subirla",
 "Delete current photo" => "Eliminar fotografía actual",
@@ -112,6 +125,8 @@
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
 "Web site" => "Sitio Web",
+"http://www.somesite.com" => "http://www.unsitio.com",
+"Go to web site" => "Ir al sitio Web",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separa los grupos con comas",
@@ -123,12 +138,14 @@
 "Delete email address" => "Eliminar dirección de correo electrónico",
 "Enter phone number" => "Introduce un número de teléfono",
 "Delete phone number" => "Eliminar número de teléfono",
+"Instant Messenger" => "Mensajero instantáneo",
 "View on map" => "Ver en el mapa",
 "Edit address details" => "Editar detalles de la dirección",
 "Add notes here." => "Añade notas aquí.",
 "Add field" => "Añadir campo",
 "Phone" => "Teléfono",
 "Email" => "Correo electrónico",
+"Instant Messaging" => "Mensajería instantánea",
 "Address" => "Dirección",
 "Note" => "Nota",
 "Download contact" => "Descargar contacto",
@@ -137,9 +154,12 @@
 "Edit address" => "Editar dirección",
 "Type" => "Tipo",
 "PO Box" => "Código postal",
+"Street and number" => "Calle y número",
 "Extended" => "Extendido",
+"Apartment number etc." => "Número del apartamento, etc.",
 "City" => "Ciudad",
 "Region" => "Región",
+"E.g. state or province" => "Ej: región o provincia",
 "Zipcode" => "Código postal",
 "Postal code" => "Código postal",
 "Country" => "País",
@@ -170,13 +190,13 @@
 "Importing contacts" => "Importando contactos",
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
-"Configure addressbooks" => "Configurar agenda",
 "Enter name" => "Introducir nombre",
 "Enter description" => "Introducir descripción",
 "CardDAV syncing addresses" => "Sincronizando direcciones",
 "more info" => "más información",
 "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
 "iOS/OS X" => "iOS/OS X",
+"Share" => "Compartir",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "New Address Book" => "Nueva libreta de direcciones",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index a73d9b743f..ea0f80ec51 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
 "Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
 "Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
-"Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
 "Missing ID" => "Puudub ID",
 "Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
 "checksum is not set." => "kontrollsummat pole määratud.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
 "Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
-"Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
 "No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
 "Error reading contact photo." => "Viga kontakti foto lugemisel.",
 "Error saving temporary file." => "Viga ajutise faili salvestamisel.",
@@ -145,7 +143,6 @@
 "Importing contacts" => "Kontaktide importimine",
 "You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
 "Add contact" => "Lisa kontakt",
-"Configure addressbooks" => "Seadista aadressiraamatuid",
 "CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
 "more info" => "lisainfo",
 "Primary address (Kontact et al)" => "Peamine aadress",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 2bce47c409..56a4812670 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -14,14 +14,11 @@
 "Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
 "At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
 "Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
-"Error adding contact property: " => "Errore bat egon da kontaktuaren propietatea gehitzean:",
 "Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
-"Error deleting contact property." => "Errorea kontaktu propietatea ezabatzean.",
 "Missing ID" => "ID falta da",
 "Error parsing VCard for ID: \"" => "Errorea VCard analizatzean hurrengo IDrako: \"",
 "checksum is not set." => "Kontrol-batura ezarri gabe dago.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
-"Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "No contact ID was submitted." => "Ez da kontaktuaren IDrik eman.",
 "Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
 "Error saving temporary file." => "Errore bat izan da aldi bateko fitxategia gordetzerakoan.",
@@ -157,7 +154,6 @@
 "Importing contacts" => "Kontaktuak inportatzen",
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
-"Configure addressbooks" => "Konfiguratu helbide liburuak",
 "Select Address Books" => "Hautatu helbide-liburuak",
 "Enter name" => "Sartu izena",
 "Enter description" => "Sartu deskribapena",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 498bb3a2ea..8029cd201e 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
 "Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
 "Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
-"Error deleting contact property." => "خطا در هنگام پاک کرد ویژگی",
 "Missing ID" => "نشانی گم شده",
 "Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
 "checksum is not set." => "checksum تنظیم شده نیست",
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
 "Something went FUBAR. " => "چند چیز به FUBAR رفتند",
-"Error updating contact property." => "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر",
 "No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
 "Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
 "Error saving temporary file." => "خطا در ذخیره پرونده موقت",
@@ -148,7 +146,6 @@
 "Importing contacts" => "وارد کردن اشخاص",
 "You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
 "Add contact" => "افزودن اطلاعات شخص مورد نظر",
-"Configure addressbooks" => "پیکربندی کتابچه ی نشانی ها",
 "CardDAV syncing addresses" => "CardDAV syncing addresses ",
 "more info" => "اطلاعات بیشتر",
 "Primary address (Kontact et al)" => "نشانی اولیه",
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index ac6b103ea4..23cafe44dc 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -8,9 +8,7 @@
 "Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
 "At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
 "Information about vCard is incorrect. Please reload the page." => "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen.",
-"Error deleting contact property." => "Virhe poistettaessa yhteystiedon ominaisuutta.",
 "Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
-"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
 "Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
 "No photo path was submitted." => "Kuvan polkua ei annettu.",
 "File doesn't exist:" => "Tiedostoa ei ole olemassa:",
@@ -32,6 +30,7 @@
 "Edit name" => "Muokkaa nimeä",
 "No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
 "Error loading profile picture." => "Virhe profiilikuvaa ladatessa.",
+"Select type" => "Valitse tyyppi",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan.",
 "Do you want to merge these address books?" => "Haluatko yhdistää nämä osoitekirjat?",
 "Result: " => "Tulos: ",
@@ -41,6 +40,18 @@
 "Addressbook not found: " => "Osoitekirjaa ei löytynyt:",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "Google Talk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Työ",
 "Home" => "Koti",
 "Other" => "Muu",
@@ -90,9 +101,11 @@
 "Preferred" => "Ensisijainen",
 "Please specify a valid email address." => "Anna kelvollinen sähköpostiosoite.",
 "Enter email address" => "Anna sähköpostiosoite",
+"Mail to address" => "Lähetä sähköpostia",
 "Delete email address" => "Poista sähköpostiosoite",
 "Enter phone number" => "Anna puhelinnumero",
 "Delete phone number" => "Poista puhelinnumero",
+"Instant Messenger" => "Pikaviestin",
 "View on map" => "Näytä kartalla",
 "Edit address details" => "Muokkaa osoitetietoja",
 "Add notes here." => "Lisää huomiot tähän.",
@@ -127,7 +140,6 @@
 "Importing contacts" => "Tuodaan yhteystietoja",
 "You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
 "Add contact" => "Lisää yhteystieto",
-"Configure addressbooks" => "Muokkaa osoitekirjoja",
 "Select Address Books" => "Valitse osoitekirjat",
 "Enter name" => "Anna nimi",
 "Enter description" => "Anna kuvaus",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 86647a5073..613871706d 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "Impossible d'ajouter un champ vide.",
 "At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
 "Trying to add duplicate property: " => "Ajout d'une propriété en double:",
-"Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
+"Missing IM parameter." => "Paramètre de Messagerie Instantanée manquants.",
+"Unknown IM: " => "Messagerie Instantanée inconnue",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
-"Error deleting contact property." => "Erreur lors de la suppression du champ.",
 "Missing ID" => "ID manquant",
 "Error parsing VCard for ID: \"" => "Erreur lors de l'analyse du VCard pour l'ID: \"",
 "checksum is not set." => "L'hachage n'est pas défini.",
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
 "Something went FUBAR. " => "Quelque chose est FUBAR.",
-"Error updating contact property." => "Erreur lors de la mise à jour du champ.",
 "No contact ID was submitted." => "Aucun ID de contact envoyé",
 "Error reading contact photo." => "Erreur de lecture de la photo du contact.",
 "Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
@@ -49,19 +48,19 @@
 "Couldn't load temporary image: " => "Impossible de charger l'image temporaire :",
 "No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
 "Contacts" => "Contacts",
-"Sorry, this functionality has not been implemented yet" => "Désolé cette fonctionnalité n'a pas encore été implementée",
+"Sorry, this functionality has not been implemented yet" => "Désolé cette fonctionnalité n'a pas encore été implémentée",
 "Not implemented" => "Pas encore implémenté",
 "Couldn't get a valid address." => "Impossible de trouver une adresse valide.",
 "Error" => "Erreur",
 "This property has to be non-empty." => "Cette valeur ne doit pas être vide",
-"Couldn't serialize elements." => "Impossible de sérialiser les éléments",
+"Couldn't serialize elements." => "Impossible de sérialiser les éléments.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org",
 "Edit name" => "Éditer le nom",
 "No files selected for upload." => "Aucun fichiers choisis pour être chargés",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tentez de charger dépasse la taille maximum de fichier autorisée sur ce serveur.",
 "Error loading profile picture." => "Erreur pendant le chargement de la photo de profil.",
 "Select type" => "Sélectionner un type",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés, mais ne le sont pas encore. Veuillez attendre que l'opération se termine.",
 "Do you want to merge these address books?" => "Voulez-vous fusionner ces carnets d'adresses ?",
 "Result: " => "Résultat :",
 " imported, " => "importé,",
@@ -70,6 +69,18 @@
 "Addressbook not found: " => "Carnet d'adresse introuvable : ",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
+"Jabber" => "Jabber",
+"AIM" => "Messagerie Instantanée",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Travail",
 "Home" => "Maison",
 "Other" => "Autre",
@@ -138,12 +149,15 @@
 "Delete email address" => "Supprimer l'adresse e-mail",
 "Enter phone number" => "Entrer un numéro de téléphone",
 "Delete phone number" => "Supprimer le numéro de téléphone",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "Supprimer la Messagerie Instantanée",
 "View on map" => "Voir sur une carte",
 "Edit address details" => "Editer les adresses",
 "Add notes here." => "Ajouter des notes ici.",
 "Add field" => "Ajouter un champ.",
 "Phone" => "Téléphone",
 "Email" => "E-mail",
+"Instant Messaging" => "Messagerie instantanée",
 "Address" => "Adresse",
 "Note" => "Note",
 "Download contact" => "Télécharger le contact",
@@ -189,7 +203,6 @@
 "Importing contacts" => "Importation des contacts",
 "You have no contacts in your addressbook." => "Il n'y a pas de contact dans votre carnet d'adresses.",
 "Add contact" => "Ajouter un contact",
-"Configure addressbooks" => "Paramétrer carnet d'adresses",
 "Select Address Books" => "Choix du carnet d'adresses",
 "Enter name" => "Saisissez le nom",
 "Enter description" => "Saisissez une description",
@@ -199,6 +212,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Afficher le lien CardDav",
 "Show read-only VCF link" => "Afficher les liens VCF en lecture seule",
+"Share" => "Partager",
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "New Address Book" => "Nouveau Carnet d'adresses",
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index aeebd81334..f25219b22c 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -14,12 +14,10 @@
 "At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
 "Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
 "Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
-"Error deleting contact property." => "Produciuse un erro borrando a propiedade do contacto.",
 "Missing ID" => "ID perdido",
 "Error parsing VCard for ID: \"" => "Erro procesando a VCard para o ID: \"",
 "checksum is not set." => "non se estableceu a suma de verificación.",
 "Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
-"Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
 "No contact ID was submitted." => "Non se enviou ningún ID de contacto.",
 "Error reading contact photo." => "Erro lendo a fotografía do contacto.",
 "Error saving temporary file." => "Erro gardando o ficheiro temporal.",
@@ -147,7 +145,6 @@
 "Importing contacts" => "Importando contactos",
 "You have no contacts in your addressbook." => "Non ten contactos na súa libreta de enderezos.",
 "Add contact" => "Engadir contacto",
-"Configure addressbooks" => "Configurar libretas de enderezos",
 "CardDAV syncing addresses" => "Enderezos CardDAV a sincronizar",
 "more info" => "máis información",
 "Primary address (Kontact et al)" => "Enderezo primario (Kontact et al)",
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index a296fa1306..b224403ad2 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
 "Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
 "Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
-"Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
 "Missing ID" => "מזהה חסר",
 "Error parsing VCard for ID: \"" => "שגיאה בפענוח ה VCard עבור מספר המזהה: \"",
 "checksum is not set." => "סיכום ביקורת לא נקבע.",
 "Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
 "Something went FUBAR. " => "משהו לא התנהל כצפוי.",
-"Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
 "No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
 "Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
 "Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
@@ -125,7 +123,6 @@
 "Importing contacts" => "מיבא אנשי קשר",
 "You have no contacts in your addressbook." => "איך לך אנשי קשר בספר הכתובות",
 "Add contact" => "הוסף איש קשר",
-"Configure addressbooks" => "הגדר ספרי כתובות",
 "CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
 "more info" => "מידע נוסף",
 "Primary address (Kontact et al)" => "כתובת ראשית",
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index 4bb77ccb21..769a6ced0f 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
 "Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
-"Error deleting contact property." => "Pogreška pri brisanju svojstva kontakta.",
 "Missing ID" => "Nedostupan ID identifikator",
 "Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
 "checksum is not set." => "checksum nije postavljen.",
 "Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
 "Something went FUBAR. " => "Nešto je otišlo... krivo...",
-"Error updating contact property." => "Pogreška pri ažuriranju svojstva kontakta.",
 "No contact ID was submitted." => "ID kontakta nije podnešen.",
 "Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
 "Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index ab9a28133d..4febe9c29f 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
 "Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
-"Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
 "Missing ID" => "Hiányzó ID",
 "Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
 "checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
-"Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
 "No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
 "Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
 "Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
@@ -148,7 +146,6 @@
 "Importing contacts" => "Kapcsolatok importálása",
 "You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
 "Add contact" => "Kapcsolat hozzáadása",
-"Configure addressbooks" => "Címlisták beállítása",
 "CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
 "more info" => "további információ",
 "Primary address (Kontact et al)" => "Elsődleges cím",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index ef856a1c5b..99a793d74e 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
 "At least one of the address fields has to be filled out." => "Deve essere inserito almeno un indirizzo.",
 "Trying to add duplicate property: " => "P",
-"Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
+"Missing IM parameter." => "Parametro IM mancante.",
+"Unknown IM: " => "IM sconosciuto:",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard non corrette. Ricarica la pagina.",
-"Error deleting contact property." => "Errore durante l'eliminazione della proprietà del contatto.",
 "Missing ID" => "ID mancante",
 "Error parsing VCard for ID: \"" => "Errore in fase di elaborazione del file VCard per l'ID: \"",
 "checksum is not set." => "il codice di controllo non è impostato.",
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
 "Something went FUBAR. " => "Qualcosa è andato storto. ",
-"Error updating contact property." => "Errore durante l'aggiornamento della proprietà del contatto.",
 "No contact ID was submitted." => "Nessun ID di contatto inviato.",
 "Error reading contact photo." => "Errore di lettura della foto del contatto.",
 "Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
@@ -70,6 +69,18 @@
 "Addressbook not found: " => "Rubrica non trovata:",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Lavoro",
 "Home" => "Casa",
 "Other" => "Altro",
@@ -138,12 +149,15 @@
 "Delete email address" => "Elimina l'indirizzo email",
 "Enter phone number" => "Inserisci il numero di telefono",
 "Delete phone number" => "Elimina il numero di telefono",
+"Instant Messenger" => "Client di messaggistica istantanea",
+"Delete IM" => "Elimina IM",
 "View on map" => "Visualizza sulla mappa",
 "Edit address details" => "Modifica dettagli dell'indirizzo",
 "Add notes here." => "Aggiungi qui le note.",
 "Add field" => "Aggiungi campo",
 "Phone" => "Telefono",
 "Email" => "Email",
+"Instant Messaging" => "Messaggistica istantanea",
 "Address" => "Indirizzo",
 "Note" => "Nota",
 "Download contact" => "Scarica contatto",
@@ -189,7 +203,6 @@
 "Importing contacts" => "Importazione contatti",
 "You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
 "Add contact" => "Aggiungi contatto",
-"Configure addressbooks" => "Configura rubriche",
 "Select Address Books" => "Seleziona rubriche",
 "Enter name" => "Inserisci il nome",
 "Enter description" => "Inserisci una descrizione",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 4569548bdc..8a6cce37cc 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
 "At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
 "Trying to add duplicate property: " => "重複する属性を追加: ",
-"Error adding contact property: " => "コンタクト属性の追加エラー: ",
+"Missing IM parameter." => "IMのパラメータが不足しています。",
+"Unknown IM: " => "不明なIM:",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
-"Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Missing ID" => "IDが見つかりません",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
 "checksum is not set." => "チェックサムが設定されていません。",
 "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
 "Something went FUBAR. " => "何かがFUBARへ移動しました。",
-"Error updating contact property." => "連絡先の更新に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
 "Error saving temporary file." => "一時ファイルの保存エラー。",
@@ -70,6 +69,18 @@
 "Addressbook not found: " => "アドレス帳が見つかりません:",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "Googleトーク",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "勤務先",
 "Home" => "住居",
 "Other" => "その他",
@@ -138,12 +149,15 @@
 "Delete email address" => "メールアドレスを削除",
 "Enter phone number" => "電話番号を入力",
 "Delete phone number" => "電話番号を削除",
+"Instant Messenger" => "インスタントメッセンジャー",
+"Delete IM" => "IMを削除",
 "View on map" => "地図で表示",
 "Edit address details" => "住所の詳細を編集",
 "Add notes here." => "ここにメモを追加。",
 "Add field" => "項目を追加",
 "Phone" => "電話番号",
 "Email" => "メールアドレス",
+"Instant Messaging" => "インスタントメッセージ",
 "Address" => "住所",
 "Note" => "メモ",
 "Download contact" => "連絡先のダウンロード",
@@ -189,7 +203,6 @@
 "Importing contacts" => "コンタクトをインポート",
 "You have no contacts in your addressbook." => "アドレス帳に連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
-"Configure addressbooks" => "アドレス帳を設定",
 "Select Address Books" => "アドレス帳を選択してください",
 "Enter name" => "名前を入力",
 "Enter description" => "説明を入力してください",
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index 6d6a642768..4349224f53 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -14,12 +14,10 @@
 "At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
 "Trying to add duplicate property: " => "중복 속성 추가 시도: ",
 "Information about vCard is incorrect. Please reload the page." => "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
-"Error deleting contact property." => "연락처 속성을 삭제할 수 없습니다.",
 "Missing ID" => "아이디 분실",
 "Error parsing VCard for ID: \"" => "아이디에 대한 VCard 분석 오류",
 "checksum is not set." => "체크섬이 설정되지 않았습니다.",
 "Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
-"Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
 "No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
 "Error reading contact photo." => "사진 읽기 오류",
 "Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
@@ -145,7 +143,6 @@
 "Importing contacts" => "연락처 입력",
 "You have no contacts in your addressbook." => "당신의 주소록에는 연락처가 없습니다. ",
 "Add contact" => "연락처 추가",
-"Configure addressbooks" => "주소록 구성",
 "CardDAV syncing addresses" => "CardDAV 주소 동기화",
 "more info" => "더 많은 정보",
 "Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 0589f226bc..22ca20e751 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -11,9 +11,7 @@
 "Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
 "Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
 "Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
-"Error deleting contact property." => "Fehler beim läschen vun der Kontakt Proprietéit.",
 "Missing ID" => "ID fehlt",
-"Error updating contact property." => "Fehler beim updaten vun der Kontakt Proprietéit.",
 "No contact ID was submitted." => "Kontakt ID ass net mat geschéckt ginn.",
 "Error reading contact photo." => "Fehler beim liesen vun der Kontakt Photo.",
 "Error saving temporary file." => "Fehler beim späicheren vum temporäre Fichier.",
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index fd6ae2d246..3b31aa7931 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -32,6 +32,7 @@
 "Organization" => "Organizacija",
 "Delete" => "Trinti",
 "Nickname" => "Slapyvardis",
+"Enter nickname" => "Įveskite slapyvardį",
 "Phone" => "Telefonas",
 "Email" => "El. paštas",
 "Address" => "Adresas",
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 2a3be84c12..093b105777 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Барем една од полињата за адреса треба да биде пополнето.",
 "Trying to add duplicate property: " => "Се обидовте да внесете дупликат вредност:",
 "Information about vCard is incorrect. Please reload the page." => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава.",
-"Error deleting contact property." => "Греш при бришење на вредноста за контакт.",
 "Missing ID" => "Недостасува ИД",
 "Error parsing VCard for ID: \"" => "Грешка при парсирање VCard за ИД: \"",
 "checksum is not set." => "сумата за проверка не е поставена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
 "Something went FUBAR. " => "Нешто се расипа.",
-"Error updating contact property." => "Грешка при ажурирање на вредноста за контакт.",
 "No contact ID was submitted." => "Не беше доставено ИД за контакт.",
 "Error reading contact photo." => "Грешка во читање на контакт фотографија.",
 "Error saving temporary file." => "Грешка во снимање на привремена датотека.",
@@ -148,7 +146,6 @@
 "Importing contacts" => "Внесување контакти",
 "You have no contacts in your addressbook." => "Немате контакти во Вашиот адресар.",
 "Add contact" => "Додади контакт",
-"Configure addressbooks" => "Уреди адресари",
 "CardDAV syncing addresses" => "Адреса за синхронизација со CardDAV",
 "more info" => "повеќе информации",
 "Primary address (Kontact et al)" => "Примарна адреса",
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 8bd7a39ce0..3fce9eae5a 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
 "Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
 "Information about vCard is incorrect. Please reload the page." => "Maklumat vCard tidak tepat. Sila reload semula halaman ini.",
-"Error deleting contact property." => "Masalah memadam maklumat.",
 "Missing ID" => "ID Hilang",
 "Error parsing VCard for ID: \"" => "Ralat VCard untuk ID: \"",
 "checksum is not set." => "checksum tidak ditetapkan.",
 "Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
 "Something went FUBAR. " => "Sesuatu tidak betul.",
-"Error updating contact property." => "Masalah mengemaskini maklumat.",
 "No contact ID was submitted." => "Tiada ID kenalan yang diberi.",
 "Error reading contact photo." => "Ralat pada foto kenalan.",
 "Error saving temporary file." => "Ralat menyimpan fail sementara",
@@ -162,7 +160,6 @@
 "Importing contacts" => "Import senarai kenalan",
 "You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.",
 "Add contact" => "Letak kenalan",
-"Configure addressbooks" => "Konfigurasi buku alamat",
 "Select Address Books" => "Pilih Buku Alamat",
 "Enter name" => "Masukkan nama",
 "Enter description" => "Masukkan keterangan",
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index b7d8b05fbc..905f6fc6a0 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -11,10 +11,8 @@
 "Cannot add empty property." => "Kan ikke legge til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
-"Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
 "Missing ID" => "Manglende ID",
 "Something went FUBAR. " => "Noe gikk fryktelig galt.",
-"Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
 "Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
 "The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
@@ -125,7 +123,6 @@
 "Importing contacts" => "Importerer kontakter",
 "You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
 "Add contact" => "Ny kontakt",
-"Configure addressbooks" => "Konfigurer adressebøker",
 "CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
 "more info" => "mer info",
 "iOS/OS X" => "iOS/OS X",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index b25a7f5b81..ff499e9249 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
 "Trying to add duplicate property: " => "Eigenschap bestaat al: ",
 "Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
-"Error deleting contact property." => "Fout bij het verwijderen van de contacteigenschap.",
 "Missing ID" => "Ontbrekend ID",
 "Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
 "checksum is not set." => "controlegetal is niet opgegeven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
 "Something went FUBAR. " => "Er ging iets totaal verkeerd. ",
-"Error updating contact property." => "Fout bij het updaten van de contacteigenschap.",
 "No contact ID was submitted." => "Geen contact ID opgestuurd.",
 "Error reading contact photo." => "Lezen van contact foto mislukt.",
 "Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
@@ -107,7 +105,6 @@
 "Importing contacts" => "Importeren van contacten",
 "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
 "Add contact" => "Contactpersoon toevoegen",
-"Configure addressbooks" => "Bewerken adresboeken",
 "CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
 "more info" => "meer informatie",
 "Primary address (Kontact et al)" => "Standaardadres",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index c8a85c2c4c..2e3ab16da3 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -5,8 +5,6 @@
 "Cannot add empty property." => "Kan ikkje leggja til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst eit av adressefelta må fyllast ut.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
-"Error deleting contact property." => "Eit problem oppstod ved å slette kontaktfeltet.",
-"Error updating contact property." => "Eit problem oppstod ved å endre kontaktfeltet.",
 "Contacts" => "Kotaktar",
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
 "Contact could not be found." => "Fann ikkje kontakten.",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 0016b313cb..924622ebb0 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -14,15 +14,12 @@
 "Cannot add empty property." => "Nie można dodać pustego elementu.",
 "At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
 "Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
-"Error adding contact property: " => "Błąd przy dodawaniu właściwości kontaktu:",
 "Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
-"Error deleting contact property." => "Błąd usuwania elementu.",
 "Missing ID" => "Brak ID",
 "Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
 "checksum is not set." => "checksum-a nie ustawiona",
 "Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
 "Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
-"Error updating contact property." => "Błąd uaktualniania elementu.",
 "No contact ID was submitted." => "ID kontaktu nie został utworzony.",
 "Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
 "Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
@@ -70,6 +67,18 @@
 "Addressbook not found: " => "Nie znaleziono książki adresowej:",
 "This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GG",
 "Work" => "Praca",
 "Home" => "Dom",
 "Other" => "Inne",
@@ -189,7 +198,6 @@
 "Importing contacts" => "importuj kontakty",
 "You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
 "Add contact" => "Dodaj kontakt",
-"Configure addressbooks" => "Konfiguruj książkę adresową",
 "Select Address Books" => "Wybierz książki adresowe",
 "Enter name" => "Wpisz nazwę",
 "Enter description" => "Wprowadź opis",
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 1349b43c02..de43e6cbb0 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
 "Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
 "Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
-"Error deleting contact property." => "Erro ao excluir propriedade de contato.",
 "Missing ID" => "Faltando ID",
 "Error parsing VCard for ID: \"" => "Erro de identificação VCard para ID:",
 "checksum is not set." => "checksum não definido.",
 "Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
 "Something went FUBAR. " => "Something went FUBAR. ",
-"Error updating contact property." => "Erro ao atualizar propriedades do contato.",
 "No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
 "Error reading contact photo." => "Erro de leitura na foto do contato.",
 "Error saving temporary file." => "Erro ao salvar arquivo temporário.",
@@ -148,7 +146,6 @@
 "Importing contacts" => "Importar contatos",
 "You have no contacts in your addressbook." => "Voce não tem contatos em sua agenda de endereços.",
 "Add contact" => "Adicionar contatos",
-"Configure addressbooks" => "Configurar agenda de endereços",
 "CardDAV syncing addresses" => "Sincronizando endereços CardDAV",
 "more info" => "leia mais",
 "Primary address (Kontact et al)" => "Endereço primário(Kontact et al)",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index eccddd8202..38708c8620 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -10,17 +10,18 @@
 "No contacts found." => "Nenhum contacto encontrado.",
 "There was an error adding the contact." => "Erro ao adicionar contato",
 "element name is not set." => "o nome do elemento não está definido.",
+"Could not parse contact: " => "Incapaz de processar contacto",
 "Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
 "Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
+"Missing IM parameter." => "Falta o parâmetro de mensagens instantâneas (IM)",
+"Unknown IM: " => "Mensagens instantâneas desconhecida (IM)",
 "Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
-"Error deleting contact property." => "Erro ao apagar propriedade do contato",
 "Missing ID" => "Falta ID",
 "Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
 "checksum is not set." => "Checksum não está definido.",
 "Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
 "Something went FUBAR. " => "Algo provocou um FUBAR. ",
-"Error updating contact property." => "Erro ao atualizar propriedade do contato",
 "No contact ID was submitted." => "Nenhum ID de contacto definido.",
 "Error reading contact photo." => "Erro a ler a foto do contacto.",
 "Error saving temporary file." => "Erro a guardar ficheiro temporário.",
@@ -57,14 +58,32 @@
 "Edit name" => "Editar nome",
 "No files selected for upload." => "Nenhum ficheiro seleccionado para enviar.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor.",
+"Error loading profile picture." => "Erro ao carregar imagem de perfil.",
 "Select type" => "Seleccionar tipo",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alguns contactos forma marcados para apagar, mas ainda não foram apagados. Por favor espere que ele sejam apagados.",
+"Do you want to merge these address books?" => "Quer fundir estes Livros de endereços?",
 "Result: " => "Resultado: ",
 " imported, " => " importado, ",
 " failed." => " falhou.",
+"Displayname cannot be empty." => "Displayname não pode ser vazio",
+"Addressbook not found: " => "Livro de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Emprego",
 "Home" => "Casa",
+"Other" => "Outro",
 "Mobile" => "Telemovel",
 "Text" => "Texto",
 "Voice" => "Voz",
@@ -74,12 +93,37 @@
 "Pager" => "Pager",
 "Internet" => "Internet",
 "Birthday" => "Aniversário",
+"Business" => "Empresa",
+"Call" => "Telefonar",
+"Clients" => "Clientes",
+"Deliverer" => "Fornecedor",
+"Holidays" => "Férias",
+"Ideas" => "Ideias",
+"Journey" => "Viagem",
+"Jubilee" => "Jubileu",
+"Meeting" => "Encontro",
+"Personal" => "Pessoal",
+"Projects" => "Projectos",
+"Questions" => "Questões",
 "{name}'s Birthday" => "Aniversário de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Adicionar Contacto",
 "Import" => "Importar",
+"Settings" => "Configurações",
 "Addressbooks" => "Livros de endereços",
 "Close" => "Fechar",
+"Keyboard shortcuts" => "Atalhos de teclado",
+"Navigation" => "Navegação",
+"Next contact in list" => "Próximo contacto na lista",
+"Previous contact in list" => "Contacto anterior na lista",
+"Expand/collapse current addressbook" => "Expandir/encolher o livro de endereços atual",
+"Next addressbook" => "Próximo livro de endereços",
+"Previous addressbook" => "Livro de endereços anterior",
+"Actions" => "Ações",
+"Refresh contacts list" => "Recarregar lista de contactos",
+"Add new contact" => "Adicionar novo contacto",
+"Add new addressbook" => "Adicionar novo Livro de endereços",
+"Delete current contact" => "Apagar o contacto atual",
 "Drop photo to upload" => "Arraste e solte fotos para carregar",
 "Delete current photo" => "Eliminar a foto actual",
 "Edit current photo" => "Editar a foto actual",
@@ -91,6 +135,9 @@
 "Delete" => "Apagar",
 "Nickname" => "Alcunha",
 "Enter nickname" => "Introduza alcunha",
+"Web site" => "Página web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Ir para página web",
 "dd-mm-yyyy" => "dd-mm-aaaa",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separe os grupos usando virgulas",
@@ -102,12 +149,15 @@
 "Delete email address" => "Eliminar o endereço de correio",
 "Enter phone number" => "Insira o número de telefone",
 "Delete phone number" => "Eliminar o número de telefone",
+"Instant Messenger" => "Mensageiro instantâneo",
+"Delete IM" => "Apagar mensageiro instantâneo (IM)",
 "View on map" => "Ver no mapa",
 "Edit address details" => "Editar os detalhes do endereço",
 "Add notes here." => "Insira notas aqui.",
 "Add field" => "Adicionar campo",
 "Phone" => "Telefone",
 "Email" => "Email",
+"Instant Messaging" => "Mensagens Instantâneas",
 "Address" => "Morada",
 "Note" => "Nota",
 "Download contact" => "Transferir contacto",
@@ -116,10 +166,15 @@
 "Edit address" => "Editar endereço",
 "Type" => "Tipo",
 "PO Box" => "Apartado",
+"Street address" => "Endereço da Rua",
+"Street and number" => "Rua e número",
 "Extended" => "Extendido",
+"Apartment number etc." => "Número de Apartamento, etc.",
 "City" => "Cidade",
 "Region" => "Região",
+"E.g. state or province" => "Por Ex. Estado ou província",
 "Zipcode" => "Código Postal",
+"Postal code" => "Código Postal",
 "Country" => "País",
 "Addressbook" => "Livro de endereços",
 "Hon. prefixes" => "Prefixos honoráveis",
@@ -148,14 +203,22 @@
 "Importing contacts" => "A importar os contactos",
 "You have no contacts in your addressbook." => "Não tem contactos no seu livro de endereços.",
 "Add contact" => "Adicionar contacto",
-"Configure addressbooks" => "Configurar livros de endereços",
+"Select Address Books" => "Selecionar Livros de contactos",
+"Enter name" => "Introduzir nome",
+"Enter description" => "Introduzir descrição",
 "CardDAV syncing addresses" => "CardDAV a sincronizar endereços",
 "more info" => "mais informação",
 "Primary address (Kontact et al)" => "Endereço primario (Kontact et al)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Mostrar ligação CardDAV",
+"Show read-only VCF link" => "Mostrar ligações VCF só de leitura",
+"Share" => "Partilhar",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "New Address Book" => "Novo livro de endereços",
+"Name" => "Nome",
+"Description" => "Descrição",
 "Save" => "Guardar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"More..." => "Mais..."
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index b2d422e045..291e8d54f7 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -12,11 +12,9 @@
 "Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
 "At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
 "Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
-"Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
 "Missing ID" => "ID lipsă",
 "Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
 "checksum is not set." => "suma de control nu este stabilită.",
-"Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
 "Error reading contact photo." => "Eroare la citerea fotografiei de contact",
 "Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 951fe5f4c9..010c4507f4 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -10,17 +10,17 @@
 "No contacts found." => "Контакты не найдены.",
 "There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
 "element name is not set." => "имя элемента не установлено.",
+"Could not parse contact: " => "Невозможно распознать контакт:",
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
 "Trying to add duplicate property: " => "При попытке добавить дубликат:",
+"Unknown IM: " => "Неизвестный IM:",
 "Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
-"Error deleting contact property." => "Ошибка удаления информации из контакта.",
 "Missing ID" => "Отсутствует ID",
 "Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
 "checksum is not set." => "контрольная сумма не установлена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
 "Something went FUBAR. " => "Что-то пошло FUBAR.",
-"Error updating contact property." => "Ошибка обновления информации контакта.",
 "No contact ID was submitted." => "Нет контакта ID",
 "Error reading contact photo." => "Ошибка чтения фотографии контакта.",
 "Error saving temporary file." => "Ошибка сохранения временного файла.",
@@ -57,14 +57,32 @@
 "Edit name" => "Изменить имя",
 "No files selected for upload." => "Нет выбранных файлов для загрузки.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере.",
+"Error loading profile picture." => "Ошибка загрузки изображения профиля.",
 "Select type" => "Выберите тип",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Некоторые контакты помечены на удаление, но ещё не удалены. Подождите, пока они удаляются.",
+"Do you want to merge these address books?" => "Вы хотите соединить эти адресные книги?",
 "Result: " => "Результат:",
 " imported, " => "импортировано, ",
 " failed." => "не удалось.",
+"Displayname cannot be empty." => "Отображаемое имя не может быть пустым.",
+"Addressbook not found: " => "Адресная книга не найдена:",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Рабочий",
 "Home" => "Домашний",
+"Other" => "Другое",
 "Mobile" => "Мобильный",
 "Text" => "Текст",
 "Voice" => "Голос",
@@ -74,12 +92,36 @@
 "Pager" => "Пейджер",
 "Internet" => "Интернет",
 "Birthday" => "День рождения",
+"Business" => "Бизнес",
+"Call" => "Вызов",
+"Clients" => "Клиенты",
+"Holidays" => "Праздники",
+"Ideas" => "Идеи",
+"Journey" => "Поездка",
+"Jubilee" => "Юбилей",
+"Meeting" => "Встреча",
+"Personal" => "Личный",
+"Projects" => "Проекты",
+"Questions" => "Вопросы",
 "{name}'s Birthday" => "День рождения {name}",
 "Contact" => "Контакт",
 "Add Contact" => "Добавить Контакт",
 "Import" => "Импорт",
+"Settings" => "Настройки",
 "Addressbooks" => "Адресные книги",
 "Close" => "Закрыть",
+"Keyboard shortcuts" => "Горячие клавиши",
+"Navigation" => "Навигация",
+"Next contact in list" => "Следующий контакт в списке",
+"Previous contact in list" => "Предыдущий контакт в списке",
+"Expand/collapse current addressbook" => "Развернуть/свернуть текущую адресную книгу",
+"Next addressbook" => "Следующая адресная книга",
+"Previous addressbook" => "Предыдущая адресная книга",
+"Actions" => "Действия",
+"Refresh contacts list" => "Обновить список контактов",
+"Add new contact" => "Добавить новый контакт",
+"Add new addressbook" => "Добавить новую адресную книгу",
+"Delete current contact" => "Удалить текущий контакт",
 "Drop photo to upload" => "Перетяните фотографии для загрузки",
 "Delete current photo" => "Удалить текущую фотографию",
 "Edit current photo" => "Редактировать текущую фотографию",
@@ -91,6 +133,9 @@
 "Delete" => "Удалить",
 "Nickname" => "Псевдоним",
 "Enter nickname" => "Введите псевдоним",
+"Web site" => "Веб-сайт",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Перейти на веб-сайт",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Группы",
 "Separate groups with commas" => "Разделить группы запятыми",
@@ -102,6 +147,7 @@
 "Delete email address" => "Удалить адрес электронной почты",
 "Enter phone number" => "Ввести номер телефона",
 "Delete phone number" => "Удалить номер телефона",
+"Delete IM" => "Удалить IM",
 "View on map" => "Показать на карте",
 "Edit address details" => "Ввести детали адреса",
 "Add notes here." => "Добавьте заметки здесь.",
@@ -116,10 +162,15 @@
 "Edit address" => "Редактировать адрес",
 "Type" => "Тип",
 "PO Box" => "АО",
+"Street address" => "Улица",
+"Street and number" => "Улица и дом",
 "Extended" => "Расширенный",
+"Apartment number etc." => "Номер квартиры и т.д.",
 "City" => "Город",
 "Region" => "Область",
+"E.g. state or province" => "Например, область или район",
 "Zipcode" => "Почтовый индекс",
+"Postal code" => "Почтовый индекс",
 "Country" => "Страна",
 "Addressbook" => "Адресная книга",
 "Hon. prefixes" => "Уважительные префиксы",
@@ -148,7 +199,9 @@
 "Importing contacts" => "Импорт контактов",
 "You have no contacts in your addressbook." => "В адресной книге нет контактов.",
 "Add contact" => "Добавить контакт",
-"Configure addressbooks" => "Настроить адресную книгу",
+"Select Address Books" => "Выбрать адресную книгу",
+"Enter name" => "Введите имя",
+"Enter description" => "Ввдите описание",
 "CardDAV syncing addresses" => "CardDAV синхронизации адресов",
 "more info" => "дополнительная информация",
 "Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
@@ -156,6 +209,9 @@
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "New Address Book" => "Новая адресная книга",
+"Name" => "Имя",
+"Description" => "Описание",
 "Save" => "Сохранить",
-"Cancel" => "Отменить"
+"Cancel" => "Отменить",
+"More..." => "Ещё..."
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 06dc5dfe7f..8295b32a6f 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
 "Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
 "Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
-"Error deleting contact property." => "Chyba odstránenia údaju kontaktu.",
 "Missing ID" => "Chýba ID",
 "Error parsing VCard for ID: \"" => "Chyba pri vyňatí ID z VCard:",
 "checksum is not set." => "kontrolný súčet nie je nastavený.",
 "Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Niečo sa pokazilo.",
-"Error updating contact property." => "Chyba aktualizovania údaju kontaktu.",
 "No contact ID was submitted." => "Nebolo nastavené ID kontaktu.",
 "Error reading contact photo." => "Chyba pri čítaní fotky kontaktu.",
 "Error saving temporary file." => "Chyba pri ukladaní dočasného súboru.",
@@ -167,7 +165,6 @@
 "Importing contacts" => "Importovanie kontaktov",
 "You have no contacts in your addressbook." => "Nemáte žiadne kontakty v adresári.",
 "Add contact" => "Pridať kontakt",
-"Configure addressbooks" => "Nastaviť adresáre",
 "Enter name" => "Zadaj meno",
 "CardDAV syncing addresses" => "Adresy pre synchronizáciu s CardDAV",
 "more info" => "viac informácií",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 5ab317ff32..0ed9766aa3 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
 "At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
 "Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
-"Error adding contact property: " => "Napaka pri dodajanju lastnosti stiku:",
+"Missing IM parameter." => "Manjkajoč IM parameter.",
+"Unknown IM: " => "Neznan IM:",
 "Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
-"Error deleting contact property." => "Napaka pri brisanju lastnosti stika.",
 "Missing ID" => "Manjkajoč ID",
 "Error parsing VCard for ID: \"" => "Napaka pri razčlenjevanju VCard za ID: \"",
 "checksum is not set." => "nadzorna vsota ni nastavljena.",
 "Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
 "Something went FUBAR. " => "Nekaj je šlo v franže. ",
-"Error updating contact property." => "Napaka pri posodabljanju lastnosti stika.",
 "No contact ID was submitted." => "ID stika ni bil poslan.",
 "Error reading contact photo." => "Napaka pri branju slike stika.",
 "Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
@@ -70,6 +69,18 @@
 "Addressbook not found: " => "Adresar ni bil najden:",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Delo",
 "Home" => "Doma",
 "Other" => "Drugo",
@@ -138,12 +149,15 @@
 "Delete email address" => "Izbriši e-poštni naslov",
 "Enter phone number" => "Vpiši telefonsko številko",
 "Delete phone number" => "Izbriši telefonsko številko",
+"Instant Messenger" => "Takojšni sporočilnik",
+"Delete IM" => "Izbriši IM",
 "View on map" => "Prikaz na zemljevidu",
 "Edit address details" => "Uredi podrobnosti",
 "Add notes here." => "Opombe dodajte tukaj.",
 "Add field" => "Dodaj polje",
 "Phone" => "Telefon",
 "Email" => "E-pošta",
+"Instant Messaging" => "Neposredno sporočanje",
 "Address" => "Naslov",
 "Note" => "Opomba",
 "Download contact" => "Prenesi stik",
@@ -189,7 +203,6 @@
 "Importing contacts" => "Uvažam stike",
 "You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
 "Add contact" => "Dodaj stik",
-"Configure addressbooks" => "Nastavi imenike",
 "Select Address Books" => "Izberite adresarje",
 "Enter name" => "Vnesite ime",
 "Enter description" => "Vnesite opis",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index 60a01ae5cc..a7721753b4 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -14,15 +14,14 @@
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap.",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i.",
 "Trying to add duplicate property: " => "Försöker lägga till dubblett:",
-"Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
+"Missing IM parameter." => "IM parameter saknas.",
+"Unknown IM: " => "Okänt IM:",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
-"Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort.",
 "Missing ID" => "ID saknas",
 "Error parsing VCard for ID: \"" => "Fel vid läsning av VCard för ID: \"",
 "checksum is not set." => "kontrollsumma är inte satt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
 "Something went FUBAR. " => "Något gick fel.",
-"Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras.",
 "No contact ID was submitted." => "Inget kontakt-ID angavs.",
 "Error reading contact photo." => "Fel uppstod vid läsning av kontaktfoto.",
 "Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
@@ -70,6 +69,18 @@
 "Addressbook not found: " => "Adressboken hittades inte:",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Arbete",
 "Home" => "Hem",
 "Other" => "Annat",
@@ -138,12 +149,15 @@
 "Delete email address" => "Ta bort e-postadress",
 "Enter phone number" => "Ange telefonnummer",
 "Delete phone number" => "Ta bort telefonnummer",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "Radera IM",
 "View on map" => "Visa på karta",
 "Edit address details" => "Redigera detaljer för adress",
 "Add notes here." => "Lägg till noteringar här.",
 "Add field" => "Lägg till fält",
 "Phone" => "Telefon",
 "Email" => "E-post",
+"Instant Messaging" => "Instant Messaging",
 "Address" => "Adress",
 "Note" => "Notering",
 "Download contact" => "Ladda ner kontakt",
@@ -189,7 +203,6 @@
 "Importing contacts" => "Importerar kontakter",
 "You have no contacts in your addressbook." => "Du har inga kontakter i din adressbok.",
 "Add contact" => "Lägg till en kontakt",
-"Configure addressbooks" => "Anpassa adressböcker.",
 "Select Address Books" => "Välj adressböcker",
 "Enter name" => "Ange namn",
 "Enter description" => "Ange beskrivning",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 4d1461cbc6..facdd62b7b 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -14,15 +14,12 @@
 "Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
 "At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
 "Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
-"Error adding contact property: " => "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ",
 "Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
-"Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Missing ID" => "รหัสสูญหาย",
 "Error parsing VCard for ID: \"" => "พบข้อผิดพลาดในการแยกรหัส VCard:\"",
 "checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
 "Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
 "Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
-"Error updating contact property." => "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ",
 "No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
 "Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
 "Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
@@ -189,7 +186,6 @@
 "Importing contacts" => "นำเข้าข้อมูลการติดต่อ",
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
-"Configure addressbooks" => "กำหนดค่าสมุดบันทึกที่อยู่",
 "Select Address Books" => "เลือกสมุดบันทึกที่อยู่",
 "Enter name" => "กรอกชื่อ",
 "Enter description" => "กรอกคำอธิบาย",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 10cabea1d9..3abe96998e 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -14,15 +14,12 @@
 "Cannot add empty property." => "Boş özellik eklenemiyor.",
 "At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
 "Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
-"Error adding contact property: " => "Kişi özelliği eklenirken hata oluştu.",
 "Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
-"Error deleting contact property." => "Kişi özelliği silinirken hata oluştu.",
 "Missing ID" => "Eksik ID",
 "Error parsing VCard for ID: \"" => "ID için VCard ayrıştırılamadı:\"",
 "checksum is not set." => "checksum atanmamış.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
 "Something went FUBAR. " => "Bir şey FUBAR gitti.",
-"Error updating contact property." => "Kişi özelliği güncellenirken hata oluştu.",
 "No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
 "Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
 "Error saving temporary file." => "Geçici dosya kaydetme hatası.",
@@ -181,7 +178,6 @@
 "Importing contacts" => "Bağlantıları içe aktar",
 "You have no contacts in your addressbook." => "Adres defterinizde hiç bağlantı yok.",
 "Add contact" => "Bağlatı ekle",
-"Configure addressbooks" => "Adres defterini yapılandır",
 "Select Address Books" => "Adres deftelerini seçiniz",
 "Enter name" => "İsim giriniz",
 "Enter description" => "Tanım giriniz",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index 860d5727e8..b3bac7aedf 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -14,13 +14,11 @@
 "At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
 "Trying to add duplicate property: " => "试图添加重复属性： ",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
-"Error deleting contact property." => "删除联系人属性错误。",
 "Missing ID" => "缺少 ID",
 "Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
 "checksum is not set." => "未设置校验值。",
 "Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
 "Something went FUBAR. " => "有一些信息无法被处理。",
-"Error updating contact property." => "更新联系人属性错误。",
 "No contact ID was submitted." => "未提交联系人 ID。",
 "Error reading contact photo." => "读取联系人照片错误。",
 "Error saving temporary file." => "保存临时文件错误。",
@@ -148,7 +146,6 @@
 "Importing contacts" => "导入联系人",
 "You have no contacts in your addressbook." => "您的地址簿中没有联系人。",
 "Add contact" => "添加联系人",
-"Configure addressbooks" => "配置地址簿",
 "CardDAV syncing addresses" => "CardDAV 同步地址",
 "more info" => "更多信息",
 "Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index d23e44cc06..c8edacec9e 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -7,9 +7,7 @@
 "Cannot add empty property." => "不可添加空白內容",
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
-"Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
 "Missing ID" => "遺失ID",
-"Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 7eafab2f0c..5da3a99721 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -5,7 +5,7 @@
 "The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
-"Failed to write to disk" => "Fehler beim Schreiben auf Festplatte",
+"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Files" => "Dateien",
 "Delete" => "Löschen",
 "already exists" => "ist bereits vorhanden",
@@ -16,7 +16,7 @@
 "undo" => "rückgängig machen",
 "deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Datei kann nicht hochgeladen werden da sie ein Verzeichnis ist oder 0 Bytes hat.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat.",
 "Upload Error" => "Fehler beim Hochladen",
 "Pending" => "Ausstehend",
 "Upload cancelled." => "Hochladen abgebrochen.",
@@ -46,6 +46,6 @@
 "Download" => "Herunterladen",
 "Upload too large" => "Upload zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
-"Files are being scanned, please wait." => "Daten werden gescannt, bitte warten.",
+"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scannen"
 );
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index aa6559022f..4dac88fc54 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -9,6 +9,11 @@
 "Files" => "فایل ها",
 "Delete" => "پاک کردن",
 "already exists" => "وجود دارد",
+"replace" => "جایگزین",
+"cancel" => "لغو",
+"replaced" => "جایگزین‌شده",
+"with" => "همراه",
+"undo" => "بازگشت",
 "deleted" => "حذف شده",
 "generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 625496dad9..902ea859a3 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -29,6 +29,7 @@
 "files" => "tiedostoa",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
+"max. possible: " => "suurin mahdollinen:",
 "Needed for multi-file and folder downloads." => "Tarvitaan useampien tiedostojen ja kansioiden latausta varten.",
 "Enable ZIP-download" => "Ota ZIP-paketin lataaminen käytöön",
 "0 is unlimited" => "0 on rajoittamaton",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 14c7a1a6ff..90b0314307 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -8,9 +8,11 @@
 "Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Files" => "Failai",
 "Delete" => "Ištrinti",
+"cancel" => "atšaukti",
 "generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
 "Upload Error" => "Įkėlimo klaida",
+"Pending" => "Laukiantis",
 "Upload cancelled." => "Įkėlimas atšauktas.",
 "Invalid name, '/' is not allowed." => "Pavadinime negali būti naudojamas ženklas \"/\".",
 "Size" => "Dydis",
@@ -19,7 +21,8 @@
 "folders" => "katalogai",
 "file" => "failas",
 "files" => "failai",
-"Maximum upload size" => "Maksimalus failo dydis",
+"File handling" => "Failų tvarkymas",
+"Maximum upload size" => "Maksimalus įkeliamo failo dydis",
 "Enable ZIP-download" => "Įjungti atsisiuntimą ZIP archyvu",
 "0 is unlimited" => "0 yra neribotas",
 "Maximum input size for ZIP files" => "Maksimalus ZIP archyvo failo dydis",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 6e5ffce797..e413d7cbe7 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Files" => "Ficheiros",
 "Delete" => "Apagar",
+"already exists" => "Já existe",
+"replace" => "substituir",
+"cancel" => "cancelar",
+"replaced" => "substituido",
+"with" => "com",
+"undo" => "desfazer",
+"deleted" => "apagado",
 "generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Não é possivel fazer o upload do ficheiro devido a ser uma pasta ou ter 0 bytes",
 "Upload Error" => "Erro no upload",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 02bd74249d..203a4f81ed 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -8,6 +8,11 @@
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
 "Delete" => "Удалить",
+"already exists" => "уже существует",
+"replace" => "заменить",
+"cancel" => "отмена",
+"replaced" => "заменён",
+"with" => "с",
 "undo" => "отмена",
 "deleted" => "удален",
 "generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
new file mode 100644
index 0000000000..40a7c6a367
--- /dev/null
+++ b/apps/files_encryption/l10n/el.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Κρυπτογράφηση",
+"Exclude the following file types from encryption" => "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση",
+"None" => "Καμία",
+"Enable Encryption" => "Ενεργοποίηση Κρυπτογράφησης"
+);
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
new file mode 100644
index 0000000000..0faa3f3aae
--- /dev/null
+++ b/apps/files_encryption/l10n/fa.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "رمزگذاری",
+"None" => "هیچ‌کدام",
+"Enable Encryption" => "فعال کردن رمزگذاری"
+);
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
new file mode 100644
index 0000000000..e65df7b6ce
--- /dev/null
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptering",
+"Exclude the following file types from encryption" => "Ekskluder følgende filer fra kryptering",
+"None" => "Ingen",
+"Enable Encryption" => "Slå på kryptering"
+);
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
new file mode 100644
index 0000000000..8f11d7da11
--- /dev/null
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externí úložiště",
+"Mount point" => "Přípojný bod",
+"Configuration" => "Konfigurace",
+"Options" => "Nastavení",
+"Add mount point" => "Přidat přípojný bod",
+"All Users" => "Všichni uživatelé",
+"Groups" => "Skupiny",
+"Users" => "Uživatelé",
+"Delete" => "Smazat",
+"Enable User External Storage" => "Zapnout uživatelské externí úložiště",
+"Allow users to mount their own external storage" => "Povolit uživatelů připojit jejich vlastní externí úložiště"
+);
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 45e5d32dfc..4306ad33dc 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -13,6 +13,6 @@
 "Delete" => "Löschen",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren",
-"Enable User External Storage" => "Externer Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
+"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
 );
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
new file mode 100644
index 0000000000..a4a910ce63
--- /dev/null
+++ b/apps/files_external/l10n/el.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Εξωτερική αποθήκευση",
+"Configuration" => "Ρυθμίσεις",
+"Options" => "Επιλογές",
+"All Users" => "Όλοι οι χρήστες",
+"Groups" => "Ομάδες",
+"Users" => "Χρήστες",
+"Delete" => "Διαγραφή"
+);
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
new file mode 100644
index 0000000000..c1c605735f
--- /dev/null
+++ b/apps/files_external/l10n/es.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Almacenamiento externo",
+"Backend" => "Motor",
+"Configuration" => "Configuración",
+"Options" => "Opciones",
+"Applicable" => "Aplicable",
+"Add mount point" => "Añadir punto de montaje",
+"None set" => "No se ha configurado",
+"All Users" => "Todos los usuarios",
+"Groups" => "Grupos",
+"Users" => "Usuarios",
+"Delete" => "Eliiminar"
+);
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 52d27ed781..7c5828a613 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Size" => "Velikost",
+"Modified" => "Upraveno",
+"Delete all" => "Smazat vše",
 "Delete" => "Smazat"
 );
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
new file mode 100644
index 0000000000..63f4c61204
--- /dev/null
+++ b/apps/files_sharing/l10n/el.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Μέγεθος",
+"Modified" => "Τροποποιήθηκε",
+"Delete all" => "Διαγραφή όλων",
+"Delete" => "Διαγραφή"
+);
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
new file mode 100644
index 0000000000..85f880927d
--- /dev/null
+++ b/apps/files_sharing/l10n/es.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Tamaño",
+"Modified" => "Modificado",
+"Delete all" => "Eliminar todo",
+"Delete" => "Eliminar"
+);
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
new file mode 100644
index 0000000000..06e1862e8b
--- /dev/null
+++ b/apps/files_sharing/l10n/fa.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "اندازه",
+"Modified" => "تاریخ",
+"Delete all" => "حذف همه",
+"Delete" => "حذف"
+);
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 8a5fc004a1..ca7928aeec 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Poisto"
+"Size" => "Koko",
+"Modified" => "Muokattu",
+"Delete all" => "Poista kaikki",
+"Delete" => "Poista"
 );
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
new file mode 100644
index 0000000000..6102b03db7
--- /dev/null
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Størrelse",
+"Modified" => "Endret",
+"Delete all" => "Slett alle",
+"Delete" => "Slett"
+);
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
new file mode 100644
index 0000000000..8953c96bd1
--- /dev/null
+++ b/apps/files_versions/l10n/el.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Λήξη όλων των εκδόσεων",
+"Enable Files Versioning" => "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων"
+);
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
new file mode 100644
index 0000000000..d5be72b174
--- /dev/null
+++ b/apps/files_versions/l10n/es.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Enable Files Versioning" => "Habilitar versionamiento de archivos"
+);
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
new file mode 100644
index 0000000000..e2dc6cba63
--- /dev/null
+++ b/apps/files_versions/l10n/fa.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "انقضای تمامی نسخه‌ها",
+"Enable Files Versioning" => "فعال‌کردن پرونده‌های نسخه‌بندی"
+);
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
new file mode 100644
index 0000000000..55cc12113d
--- /dev/null
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Enable Files Versioning" => "Slå på versjonering"
+);
diff --git a/apps/gallery/l10n/pt_PT.php b/apps/gallery/l10n/pt_PT.php
index 54e99cf245..8b7aa2a23b 100644
--- a/apps/gallery/l10n/pt_PT.php
+++ b/apps/gallery/l10n/pt_PT.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Imagens",
-"Settings" => "Definições",
-"Rescan" => "Atualizar",
-"Stop" => "Parar",
-"Share" => "Partilhar",
-"Back" => "Voltar",
-"Remove confirmation" => "Remove confirmação",
-"Do you want to remove album" => "Deseja remover o album",
-"Change album name" => "Mudar o nome do album",
-"New album name" => "Novo nome do album"
+"Share gallery" => "Partilhar a galeria",
+"Error: " => "Erro: ",
+"Internal error" => "Erro interno",
+"Slideshow" => "Slideshow"
 );
diff --git a/apps/gallery/l10n/ru.php b/apps/gallery/l10n/ru.php
index f1c530ed28..d6e33e4b01 100644
--- a/apps/gallery/l10n/ru.php
+++ b/apps/gallery/l10n/ru.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Рисунки",
-"Settings" => "Настройки",
-"Rescan" => "Обновить",
-"Stop" => "Остановить",
-"Share" => "Поделиться",
-"Back" => "Назад",
-"Remove confirmation" => "Подтверждение удаления",
-"Do you want to remove album" => "Вы хотите удалить альбом?",
-"Change album name" => "Изменить имя альбома",
-"New album name" => "Новое имя альбома"
+"Share gallery" => "Опубликовать",
+"Error: " => "Ошибка",
+"Internal error" => "Внутренняя ошибка",
+"Slideshow" => "Слайдшоу"
 );
diff --git a/apps/media/l10n/ar.php b/apps/media/l10n/ar.php
index a335f36a1f..655589df8a 100644
--- a/apps/media/l10n/ar.php
+++ b/apps/media/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Music" => "الموسيقى",
+"Add album to playlist" => "أضف الالبوم الى القائمه",
 "Play" => "إلعب",
 "Pause" => "تجميد",
 "Previous" => "السابق",
diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php
index c96e84d73f..313a918d02 100644
--- a/apps/media/l10n/fr.php
+++ b/apps/media/l10n/fr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musique",
-"Play" => "Play",
+"Add album to playlist" => "Ajouter l'album à la playlist",
+"Play" => "Lire",
 "Pause" => "Pause",
 "Previous" => "Précédent",
 "Next" => "Suivant",
diff --git a/apps/tasks/l10n/cs_CZ.php b/apps/tasks/l10n/cs_CZ.php
new file mode 100644
index 0000000000..9da5f7ab60
--- /dev/null
+++ b/apps/tasks/l10n/cs_CZ.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Neplatné datum/čas",
+"Tasks" => "Úkoly",
+"No category" => "Bez kategorie",
+"1=highest" => "1=nejvyšší",
+"5=medium" => "5=střední",
+"9=lowest" => "9=nejnižší",
+"Invalid priority" => "Neplatná priorita",
+"Add Task" => "Přidat úkol",
+"Loading tasks..." => "Načítám úkoly...",
+"Important" => "Důležité",
+"More" => "Více",
+"Less" => "Méně",
+"Delete" => "Smazat"
+);
diff --git a/apps/tasks/l10n/de.php b/apps/tasks/l10n/de.php
index 50d0041d20..29b9bf41ec 100644
--- a/apps/tasks/l10n/de.php
+++ b/apps/tasks/l10n/de.php
@@ -3,9 +3,9 @@
 "Tasks" => "Aufgaben",
 "No category" => "Keine Kategorie",
 "Unspecified" => "Nicht angegeben",
-"1=highest" => "1=am höchsten",
-"5=medium" => "5=Durchschnitt",
-"9=lowest" => "9=am niedrigsten",
+"1=highest" => "1 = am höchsten",
+"5=medium" => "5 = Durchschnitt",
+"9=lowest" => "9 = am niedrigsten",
 "Empty Summary" => "Leere Zusammenfassung",
 "Invalid percent complete" => "Ungültige Prozent abgeschlossen",
 "Invalid priority" => "Falsche Priorität",
@@ -16,7 +16,7 @@
 "Order Location" => "Nach Ort sortieren",
 "Order Priority" => "Nach Priorität sortieren",
 "Order Label" => "Nach Label sortieren",
-"Loading tasks..." => "Lade Aufgaben...",
+"Loading tasks..." => "Lade Aufgaben ...",
 "Important" => "Wichtig",
 "More" => "Mehr",
 "Less" => "Weniger",
diff --git a/apps/tasks/l10n/el.php b/apps/tasks/l10n/el.php
new file mode 100644
index 0000000000..cdf2f609e5
--- /dev/null
+++ b/apps/tasks/l10n/el.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Μην έγκυρη ημερομηνία / ώρα",
+"Tasks" => "Εργασίες",
+"No category" => "Χωρίς κατηγορία",
+"Unspecified" => "Μη ορισμένο",
+"1=highest" => "1=υψηλότερο",
+"5=medium" => "5=μέτριο",
+"9=lowest" => "9=χαμηλότερο",
+"Empty Summary" => "Άδεια περίληψη",
+"Invalid percent complete" => "Μη έγκυρο ποσοστό ολοκλήρωσης",
+"Invalid priority" => "Μη έγκυρη προτεραιότητα ",
+"Add Task" => "Προσθήκη εργασίας",
+"Loading tasks..." => "Φόρτωση εργασιών...",
+"Important" => "Σημαντικό ",
+"More" => "Περισσότερα",
+"Less" => "Λιγότερα",
+"Delete" => "Διαγραφή"
+);
diff --git a/apps/tasks/l10n/fa.php b/apps/tasks/l10n/fa.php
new file mode 100644
index 0000000000..40b5b610f4
--- /dev/null
+++ b/apps/tasks/l10n/fa.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Tasks" => "وظایف",
+"1=highest" => "1=بیش‌ترین",
+"5=medium" => "5=متوسط",
+"9=lowest" => "9=کم‌ترین",
+"Loading tasks..." => "درحال بارگزاری وظایف",
+"Important" => "مهم",
+"More" => "بیش‌تر",
+"Less" => "کم‌تر",
+"Delete" => "حذف"
+);
diff --git a/apps/tasks/l10n/fi_FI.php b/apps/tasks/l10n/fi_FI.php
index c270951c11..7948e712e9 100644
--- a/apps/tasks/l10n/fi_FI.php
+++ b/apps/tasks/l10n/fi_FI.php
@@ -1,13 +1,16 @@
 <?php $TRANSLATIONS = array(
 "Invalid date/time" => "Virheellinen päivä tai aika",
 "Tasks" => "Tehtävät",
+"No category" => "Ei luokkaa",
 "Unspecified" => "Määrittelemätön",
 "1=highest" => "1=korkein",
 "5=medium" => "5=keskitaso",
 "9=lowest" => "9=matalin",
+"Empty Summary" => "Tyhjä yhteenveto",
 "Invalid priority" => "Virheellinen prioriteetti",
 "Add Task" => "Lisää tehtävä",
 "Loading tasks..." => "Ladataan tehtäviä...",
+"Important" => "Tärkeä",
 "More" => "Enemmän",
 "Less" => "Vähemmän",
 "Delete" => "Poista"
diff --git a/apps/tasks/l10n/nb_NO.php b/apps/tasks/l10n/nb_NO.php
new file mode 100644
index 0000000000..a6b398857b
--- /dev/null
+++ b/apps/tasks/l10n/nb_NO.php
@@ -0,0 +1,17 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "feil i dato/klokkeslett",
+"Tasks" => "Oppgaver",
+"No category" => "Ingen kategori",
+"Unspecified" => "Uspesifisert",
+"1=highest" => "1=høyest",
+"5=medium" => "5=middels",
+"9=lowest" => "9=lavest",
+"Invalid percent complete" => "Feil i prosent fullført",
+"Invalid priority" => "Ulovlig prioritet",
+"Add Task" => "Legg til oppgave",
+"Loading tasks..." => "Henter oppgaver...",
+"Important" => "Viktig",
+"More" => "Mer",
+"Less" => "Mindre",
+"Delete" => "Slett"
+);
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index d0e46e5b90..9f917f277c 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,31 +1,36 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn du SSL benötiogst. Beginne dann __mit__ ldaps://",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
 "Base DN" => "Basis-DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+"You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer.",
 "Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lass die Felder von DN und Passwort für anonymen Zugang leer.",
-"User Login Filter" => "Benutzer Login Filter",
+"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer.",
+"User Login Filter" => "Benutzer-Login-Filter",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
-"User List Filter" => "Benutzer Filter Liste",
+"User List Filter" => "Benutzer-Filter-Liste",
 "Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
-"Group Filter" => "Gruppen Filter",
+"without any placeholder, e.g. \"objectClass=person\"." => "ohne Platzhalter, z.B.: \"objectClass=person\"",
+"Group Filter" => "Gruppen-Filter",
 "Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
 "Port" => "Port",
-"Base User Tree" => "Basis Benutzerbaum",
-"Base Group Tree" => "Basis Gruppenbaum",
+"Base User Tree" => "Basis-Benutzerbaum",
+"Base Group Tree" => "Basis-Gruppenbaum",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Use TLS" => "Nutze TLS",
-"Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern.",
+"Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, es wird fehlschlagen.",
+"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalte die SSL Zertifikatsprüfung aus.",
-"Not recommended, use for testing only." => "Nicht empfohlen, nur zum Testen.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, wird das SSL-Zertifikat des LDAP-Server importiert werden.",
+"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
 "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
-"in bytes" => "in bytes",
+"in bytes" => "in Bytes",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
new file mode 100644
index 0000000000..2f3c747a67
--- /dev/null
+++ b/apps/user_ldap/l10n/el.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Συνθηματικό",
+"Port" => "Θύρα",
+"in bytes" => "σε bytes",
+"Help" => "Βοήθεια"
+);
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
new file mode 100644
index 0000000000..55abf7b88e
--- /dev/null
+++ b/apps/user_ldap/l10n/es.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Contraseña",
+"Port" => "Puerto",
+"Use TLS" => "Usar TLS",
+"in bytes" => "en bytes",
+"Help" => "Ayuda"
+);
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
new file mode 100644
index 0000000000..f6d16f3acc
--- /dev/null
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -0,0 +1,31 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Isäntä",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Voit jättää protokollan määrittämättä, paitsi kun käytät SSL:ää. Aloita silloin ldaps://",
+"Base DN" => "Oletus DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset' välilehdeltä  ",
+"User DN" => "Käyttäjän DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
+"Password" => "Salasana",
+"For anonymous access, leave DN and Password empty." => "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
+"User Login Filter" => "Login suodatus",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\"",
+"User List Filter" => "Käyttäjien suodatus",
+"Defines the filter to apply, when retrieving users." => "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  ",
+"without any placeholder, e.g. \"objectClass=person\"." => "ilman paikanvaraustermiä, ts. \"objectClass=person\".",
+"Group Filter" => "Ryhmien suodatus",
+"Defines the filter to apply, when retrieving groups." => "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  ",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\".",
+"Port" => "Portti",
+"Base User Tree" => "Oletus käyttäjäpuu",
+"Base Group Tree" => "Ryhmien juuri",
+"Group-Member association" => "Ryhmä-jäsen assosiaatio (yhteys)",
+"Use TLS" => "Käytä TLS:ää",
+"Do not use it for SSL connections, it will fail." => "Älä käytä SSL yhteyttä varten, se epäonnistuu. ",
+"Case insensitve LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
+"Turn off SSL certificate validation." => "Sulje SSL sertifikaatin käyttö",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jos yhteys toimii vain tällä optiolla, siirrä LDAP palvelimen SSL sertifikaatti onwCloud palvelimellesi. ",
+"Not recommended, use for testing only." => "Ei suositella, käytä vain testausta varten.",
+"in bytes" => "tavuissa",
+"in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
+"Help" => "Ohje"
+);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index c2222f104e..64edf3b468 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -8,6 +8,8 @@
 "Password" => "Mot de passe",
 "For anonymous access, leave DN and Password empty." => "Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
 "User Login Filter" => "Filtre d'identifiants utilisateur",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
 "User List Filter" => "Filtre d'utilisateurs",
 "Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
 "without any placeholder, e.g. \"objectClass=person\"." => "sans élément de substitution, par exemple \"objectClass=person\".",
diff --git a/apps/user_migrate/l10n/de.php b/apps/user_migrate/l10n/de.php
index 110b0bba6e..928a211dd4 100644
--- a/apps/user_migrate/l10n/de.php
+++ b/apps/user_migrate/l10n/de.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Export" => "Export",
-"Something went wrong while the export file was being generated" => "Beim Export der Datei ist etwas schief gegangen.",
+"Something went wrong while the export file was being generated" => "Beim Export der Datei ist etwas schiefgegangen.",
 "An error has occurred" => "Es ist ein Fehler aufgetreten.",
 "Export your user account" => "Ihr Konto exportieren",
-"This will create a compressed file that contains your ownCloud account." => "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält.",
+"This will create a compressed file that contains your ownCloud account." => "Eine komprimierte Datei wird erzeugt, die Ihr ownCloud-Konto enthält.",
 "Import user account" => "Konto importieren",
 "ownCloud User Zip" => "Zip-Archiv mit Benutzerdaten",
 "Import" => "Importieren"
diff --git a/apps/user_migrate/l10n/el.php b/apps/user_migrate/l10n/el.php
new file mode 100644
index 0000000000..5b57e69a63
--- /dev/null
+++ b/apps/user_migrate/l10n/el.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Εξαγωγή",
+"An error has occurred" => "Παρουσιάστηκε σφάλμα",
+"Export your user account" => "Εξαγωγή του λογαριασμού χρήστη σας",
+"This will create a compressed file that contains your ownCloud account." => "Αυτό θα δημιουργήσει ένα συμπιεσμένο αρχείο που θα περιέχει τον λογαριασμό σας ownCloud.",
+"Import user account" => "Εισαγωγή λογαριασμού χρήστη",
+"Import" => "Εισαγωγή"
+);
diff --git a/apps/user_migrate/l10n/es.php b/apps/user_migrate/l10n/es.php
new file mode 100644
index 0000000000..6a0551fe23
--- /dev/null
+++ b/apps/user_migrate/l10n/es.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exportar",
+"ownCloud User Zip" => "Zip de usuario de ownCloud",
+"Import" => "Importar"
+);
diff --git a/apps/user_migrate/l10n/fr.php b/apps/user_migrate/l10n/fr.php
index f1fe46bcac..70ab2f8f22 100644
--- a/apps/user_migrate/l10n/fr.php
+++ b/apps/user_migrate/l10n/fr.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Export" => "Exporter",
-"Something went wrong while the export file was being generated" => "Une erreur s'est produit pendant la génération du fichier d'export",
+"Something went wrong while the export file was being generated" => "Une erreur s'est produite pendant la génération du fichier d'export",
 "An error has occurred" => "Une erreur s'est produite",
 "Export your user account" => "Exportez votre compte utilisateur",
 "This will create a compressed file that contains your ownCloud account." => "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud.",
diff --git a/apps/user_openid/l10n/de.php b/apps/user_openid/l10n/de.php
index 97abccba9e..7bfe678574 100644
--- a/apps/user_openid/l10n/de.php
+++ b/apps/user_openid/l10n/de.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:",
+"This is an OpenID server endpoint. For more information, see " => "Dies ist ein OpenID-Server-Endpunkt. Weitere Informationen finden Sie unter:",
 "Identity: <b>" => "Identität: <b>",
 "Realm: <b>" => "Bereich: <b>",
 "User: <b>" => "Benutzer: <b>",
 "Login" => "Anmelden",
-"Error: <b>No user Selected" => "Fehler: <b> Kein Benutzer gewählt",
+"Error: <b>No user Selected" => "Fehler: <b> Kein Benutzer ausgewählt",
 "you can authenticate to other sites with this address" => "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren.",
 "Authorized OpenID provider" => "Authorisierter OpenID-Anbieter",
 "Your address at Wordpress, Identi.ca, &hellip;" => "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
diff --git a/apps/user_openid/l10n/el.php b/apps/user_openid/l10n/el.php
new file mode 100644
index 0000000000..a80f5bdb24
--- /dev/null
+++ b/apps/user_openid/l10n/el.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Identity: <b>" => "Ταυτότητα: <b>",
+"User: <b>" => "Χρήστης: <b>",
+"Login" => "Σύνδεση",
+"Error: <b>No user Selected" => "Σφάλμα: <b> Δεν έχει επιλεχθεί κάποιος χρήστης",
+"Authorized OpenID provider" => "Εξουσιοδοτημένος παροχέας OpenID",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Η διευθυνσή σας σε Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/es.php b/apps/user_openid/l10n/es.php
new file mode 100644
index 0000000000..048336d3db
--- /dev/null
+++ b/apps/user_openid/l10n/es.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Identity: <b>" => "Identidad: <b>",
+"User: <b>" => "Usuario: <b>",
+"Login" => "Iniciar sesión"
+);
diff --git a/apps/user_openid/l10n/fi_FI.php b/apps/user_openid/l10n/fi_FI.php
new file mode 100644
index 0000000000..1cde4ae660
--- /dev/null
+++ b/apps/user_openid/l10n/fi_FI.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Identity: <b>" => "Identiteetti: <b>",
+"Realm: <b>" => "Alue: <b>",
+"User: <b>" => "Käyttäjä: <b>",
+"Login" => "Kirjaudu",
+"Error: <b>No user Selected" => "Virhe: <b>Käyttäjää ei valittu"
+);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index b0959a5412..9ed2d61782 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -23,13 +23,13 @@
 "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}" => "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du erhälst einen Link, um dein Passwort per E-Mail zurückzusetzen.",
+"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" => "Benutzername",
 "Request reset" => "Anfrage zurückgesetzt",
-"Your password was reset" => "Dein Passwort wurde 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",
@@ -38,9 +38,9 @@
 "Apps" => "Anwendungen",
 "Admin" => "Admin",
 "Help" => "Hilfe",
-"Access forbidden" => "Zugang verboten",
+"Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud nicht gefunden",
-"Edit categories" => "Kategorien editieren",
+"Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Password" => "Passwort",
@@ -53,12 +53,12 @@
 "Database name" => "Datenbank-Name",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "Web Services unter ihrer Kontrolle",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
 "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/es.php b/core/l10n/es.php
index 31d8d792a4..8766228ba8 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,6 +1,6 @@
 <?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: ",
 "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",
@@ -19,8 +19,8 @@
 "Cancel" => "Cancelar",
 "No" => "No",
 "Yes" => "Sí",
-"Ok" => "Vale",
-"No categories selected for deletion." => "No hay categorias seleccionadas para borrar.",
+"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}",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 2ada0405c9..f8979aa768 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index 55906a62ff..947cca6fda 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:47+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,19 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "ليس جميع الجداول الزمنيه محفوضه مؤقة"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "كل شيء محفوض مؤقة"
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
-msgstr ""
+msgstr "لم يتم العثور على جدول الزمني"
 
 #: ajax/categories/rescan.php:37
 msgid "No events found."
-msgstr ""
+msgstr "لم يتم العثور على احداث"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -68,34 +68,34 @@ msgstr "تم تغيير المنطقة الزمنية"
 msgid "Invalid request"
 msgstr "طلب غير مفهوم"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "الجدول الزمني"
 
 #: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
 #: lib/app.php:121
 msgid "Birthday"
@@ -159,11 +159,11 @@ msgstr "العمل"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "من قبل"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
-msgstr ""
+msgstr "غير مسمى"
 
 #: lib/import.php:184 templates/calendar.php:12
 #: templates/part.choosecalendar.php:22
@@ -348,51 +348,51 @@ msgstr "تقويم"
 
 #: templates/calendar.php:6
 msgid "Sun."
-msgstr ""
+msgstr "أحد"
 
 #: templates/calendar.php:6
 msgid "Mon."
-msgstr ""
+msgstr "أثن."
 
 #: templates/calendar.php:6
 msgid "Tue."
-msgstr ""
+msgstr "ثلا."
 
 #: templates/calendar.php:6
 msgid "Wed."
-msgstr ""
+msgstr "أرب."
 
 #: templates/calendar.php:6
 msgid "Thu."
-msgstr ""
+msgstr "خمي."
 
 #: templates/calendar.php:6
 msgid "Fri."
-msgstr ""
+msgstr "جمع."
 
 #: templates/calendar.php:6
 msgid "Sat."
-msgstr ""
+msgstr "سبت"
 
 #: templates/calendar.php:8
 msgid "Jan."
-msgstr ""
+msgstr "ك2"
 
 #: templates/calendar.php:8
 msgid "Feb."
-msgstr ""
+msgstr "شبا."
 
 #: templates/calendar.php:8
 msgid "Mar."
-msgstr ""
+msgstr "آذا."
 
 #: templates/calendar.php:8
 msgid "Apr."
-msgstr ""
+msgstr "نيس."
 
 #: templates/calendar.php:8
 msgid "May."
-msgstr ""
+msgstr "أيا."
 
 #: templates/calendar.php:8
 msgid "Jun."
@@ -481,7 +481,7 @@ msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "جداولك الزمنيه"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:11
@@ -490,15 +490,15 @@ msgstr "وصلة CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "جداول زمنيه مشتركه"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "لا يوجد جداول زمنيه مشتركه"
 
 #: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
-msgstr ""
+msgstr "شارك الجدول الزمني"
 
 #: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
@@ -515,7 +515,7 @@ msgstr "حذف"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "مشاركه من قبل"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -560,23 +560,23 @@ msgstr "تصدير المعلومات"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "تفاصيل الحدث"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "يعاد"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "تنبيه"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "الحضور"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "شارك"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -588,11 +588,11 @@ msgstr "فئة"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "افصل الفئات بالفواصل"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "عدل الفئات"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
@@ -715,19 +715,19 @@ msgstr "إضافة حدث جديد"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "شاهد الحدث"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "لم يتم اختيار الفئات"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "من"
 
 #: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
-msgstr ""
+msgstr "في"
 
 #: templates/settings.php:10
 msgid "General"
@@ -791,24 +791,24 @@ msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "المستخدمين"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "اختر المستخدمين"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "يمكن تعديله"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "مجموعات"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "اختر المجموعات"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "حدث عام"
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 79d381d888..9740f17457 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr "خطء خلال توقيف كتاب العناوين."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "خطء خلال محي الصفه."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "خطء خلال تعديل الصفه."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "الوظيفة"
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr ""
 msgid "Contact"
 msgstr "معرفه"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "أضف شخص "
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/ar/media.po b/l10n/ar/media.po
index 60e237f0d3..b72ad0a3ec 100644
--- a/l10n/ar/media.po
+++ b/l10n/ar/media.po
@@ -3,28 +3,28 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <tarek.taha@gmail.com>, 2011.
+#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:27+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr "الموسيقى"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "أضف الالبوم الى القائمه"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 8b72938428..26cc5d2266 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 944b488953..28690adf4d 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 568851bd41..c965efa0c2 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Error en (des)activar la llibreta d'adreces."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "no s'ha establert la id."
@@ -83,24 +83,16 @@ msgstr "Esteu intentant afegir una propietat duplicada:"
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Falta el paràmetre IM."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Error en afegir la propietat del contacte:"
+msgstr "IM desconegut:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Error en eliminar la propietat del contacte."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Falta la ID"
@@ -121,10 +113,6 @@ msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Error en actualitzar la propietat del contacte."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Error en carregar la imatge de perfil."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Voleu fusionar aquestes llibretes d'adreces?"
 
@@ -331,51 +331,51 @@ msgstr "No s'ha trobat el contacte."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -385,7 +385,7 @@ msgstr "Feina"
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Altres"
 
@@ -482,6 +482,14 @@ msgstr "Aniversari de {name}"
 msgid "Contact"
 msgstr "Contacte"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Afegeix un contacte"
@@ -656,11 +664,11 @@ msgstr "Elimina el número de telèfon"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Elimina IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -688,7 +696,7 @@ msgstr "Correu electrònic"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Missatgeria instantània"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -873,10 +881,6 @@ msgstr "No teniu contactes a la llibreta d'adreces."
 msgid "Add contact"
 msgstr "Afegeix un contacte"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Configura les llibretes d'adreces"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Selecccioneu llibretes d'adreces"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 8567aca558..dabfe51b56 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Chyba při (de)aktivaci adresáře."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id neni nastaveno."
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Chyba během přidávání vlastností kontaktu:"
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Chyba při odstraňování údaje kontaktu."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Chybí ID"
@@ -122,10 +114,6 @@ msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Chyba při aktualizaci údaje kontaktu."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "Nelze získat platnou adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Tento parametr nemuže zůstat nevyplněn."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Upravit jméno"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Chyba při otevírání obrázku profilu"
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Vybrat typ"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Pracovní"
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Ostatní"
 
@@ -483,6 +483,14 @@ msgstr "Narozeniny {name}"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Přidat kontakt"
@@ -874,10 +882,6 @@ msgstr "Nemáte žádné kontakty v adresáři."
 msgid "Add contact"
 msgstr "Přidat kontakt"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Nastavit adresář"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Vybrat Adresář"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 1e85c96d4a..1c175fb4db 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jan Krejci <krejca85@gmail.com>, 2012.
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 23:53+0000\n"
+"Last-Translator: Jan Krejci <krejca85@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +21,11 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Externí úložiště"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Přípojný bod"
 
 #: templates/settings.php:8
 msgid "Backend"
@@ -31,11 +33,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurace"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Nastavení"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -43,7 +45,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Přidat přípojný bod"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
@@ -51,19 +53,19 @@ msgstr ""
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Všichni uživatelé"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Skupiny"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Smazat"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
@@ -75,8 +77,8 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Zapnout uživatelské externí úložiště"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Povolit uživatelů připojit jejich vlastní externí úložiště"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 56849cf199..232114a8e6 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 19:58+0000\n"
+"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +21,15 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Velikost"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Upraveno"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Smazat vše"
 
 #: templates/get.php:5
 msgid "Delete"
diff --git a/l10n/cs_CZ/tasks.po b/l10n/cs_CZ/tasks.po
index 1d439040c6..2660581916 100644
--- a/l10n/cs_CZ/tasks.po
+++ b/l10n/cs_CZ/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 19:57+0000\n"
+"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Neplatné datum/čas"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Úkoly"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Bez kategorie"
 
 #: lib/app.php:33
 msgid "Unspecified"
@@ -35,15 +36,15 @@ msgstr ""
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=nejvyšší"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=střední"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=nejnižší"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -55,11 +56,11 @@ msgstr ""
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Neplatná priorita"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Přidat úkol"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Načítám úkoly..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Důležité"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Více"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Méně"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Smazat"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 4cb3567e9c..8a658ef136 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Fejl ved (de)aktivering af adressebogen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "Intet ID medsendt."
@@ -92,18 +92,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Fejl ved sletning af egenskab for kontaktperson."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Manglende ID"
@@ -124,10 +116,6 @@ msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Fejl ved opdatering af egenskab for kontaktperson."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -248,59 +236,71 @@ msgid "Couldn't get a valid address."
 msgstr "Kunne ikke finde en gyldig adresse."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fejl"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Dette felt må ikke være tomt."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Dr."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Vælg type"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr "Arbejde"
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -485,6 +485,14 @@ msgstr "{name}s fødselsdag"
 msgid "Contact"
 msgstr "Kontaktperson"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tilføj kontaktperson"
@@ -876,10 +884,6 @@ msgstr "Du har ingen kontaktpersoner i din adressebog."
 msgid "Add contact"
 msgstr "Tilføj kontaktpeson."
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Konfigurer adressebøger"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/de/admin_dependencies_chk.po b/l10n/de/admin_dependencies_chk.po
index cbd173e470..f36baa4f39 100644
--- a/l10n/de/admin_dependencies_chk.po
+++ b/l10n/de/admin_dependencies_chk.po
@@ -6,13 +6,14 @@
 # Maurice Preuß <>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 20:46+0000\n"
-"Last-Translator: Maurice Preuß <>\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
+"PO-Revision-Date: 2012-08-23 10:05+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr "Das Modul  php-json wird von vielen Anwendungen zur internen Kommunikation benötigt."
+msgstr "Das Modul php-json wird von vielen Anwendungen zur internen Kommunikation benötigt."
 
 #: settings.php:39
 msgid ""
@@ -34,11 +35,11 @@ msgstr "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesez
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr "Das Modul  php-gd wird für die Erzeugung der Vorschaubilder benötigt."
+msgstr "Das Modul php-gd wird für die Erzeugung der Vorschaubilder benötigt."
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr "Das Modul  php-ldap wird für die Verbindung mit dem LDAP-Server benötigt."
+msgstr "Das Modul php-ldap wird für die Verbindung mit dem LDAP-Server benötigt."
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
@@ -47,7 +48,7 @@ msgstr "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr "Das Modul  php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben."
+msgstr "Das Modul php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
diff --git a/l10n/de/bookmarks.po b/l10n/de/bookmarks.po
index 449e392591..8383c62a13 100644
--- a/l10n/de/bookmarks.po
+++ b/l10n/de/bookmarks.po
@@ -5,13 +5,14 @@
 # Translators:
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 20:46+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:38+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgstr "unbenannt"
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst."
+msgstr "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen."
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
@@ -43,7 +44,7 @@ msgstr "Adresse"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr "Title"
+msgstr "Titel"
 
 #: templates/list.php:15
 msgid "Tags"
@@ -55,7 +56,7 @@ msgstr "Lesezeichen speichern"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr "Du hast keine Lesezeichen"
+msgstr "Sie haben keine Lesezeichen"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 449a503419..5ef155057e 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -13,13 +13,14 @@
 #   <peddn@web.de>, 2012.
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 11:28+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:20+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,11 +38,11 @@ msgstr "Es sieht so aus, als wäre alles vollständig zwischengespeichert."
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
-msgstr "Keine Kalender gefunden"
+msgstr "Keine Kalender gefunden."
 
 #: ajax/categories/rescan.php:37
 msgid "No events found."
-msgstr "Keine Termine gefunden"
+msgstr "Keine Termine gefunden."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -51,7 +52,7 @@ msgstr "Falscher Kalender"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr "Entweder enthielt die Datei keine Termine oder alle Termine waren schon im Kalender gespeichert."
+msgstr "Entweder enthielt die Datei keine Termine oder alle Termine waren bereits im Kalender gespeichert."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
@@ -77,7 +78,7 @@ msgstr "Zeitzone geändert"
 msgid "Invalid request"
 msgstr "Fehlerhafte Anfrage"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
@@ -499,7 +500,7 @@ msgstr "CalDAV-Link"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr "geteilte Kalender"
+msgstr "Geteilte Kalender"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
@@ -690,7 +691,7 @@ msgstr "Neuen Kalender anlegen"
 
 #: templates/part.import.php:17
 msgid "Import a calendar file"
-msgstr "Kalenderdatei Importieren"
+msgstr "Kalenderdatei importieren"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
@@ -708,7 +709,7 @@ msgstr "Wählen Sie einen verfügbaren Namen."
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr "Ein Kalender mit diesem Namen existiert schon. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt."
+msgstr "Ein Kalender mit diesem Namen existiert bereits. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -756,11 +757,11 @@ msgstr "Zeitformat"
 
 #: templates/settings.php:57
 msgid "24h"
-msgstr "24h"
+msgstr "24 Stunden"
 
 #: templates/settings.php:58
 msgid "12h"
-msgstr "12h"
+msgstr "12 Stunden"
 
 #: templates/settings.php:64
 msgid "Start week on"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index b4ff7dca2b..e326e613c3 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -20,12 +20,13 @@
 # Susi  <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +40,7 @@ msgid "Error (de)activating addressbook."
 msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID ist nicht angegeben."
@@ -94,27 +95,19 @@ msgstr "Mindestens eines der Adressfelder muss ausgefüllt werden."
 
 #: ajax/contact/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
+msgstr "Versuche doppelte Eigenschaft hinzuzufügen: "
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "IM-Parameter fehlt."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
+msgstr "IM unbekannt:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
-
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Kontakteigenschaft löschen fehlgeschlagen."
+msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisieren Sie die Seite."
 
 #: ajax/contact/details.php:31
 msgid "Missing ID"
@@ -136,10 +129,6 @@ msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -179,7 +168,7 @@ msgstr "Fehler beim Abruf des Kontakt-Objektes."
 
 #: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
-msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
+msgstr "Fehler beim Abrufen der PHOTO-Eigenschaft."
 
 #: ajax/savecrop.php:98
 msgid "Error saving contact."
@@ -195,7 +184,7 @@ msgstr "Fehler beim Zuschneiden des Bildes"
 
 #: ajax/savecrop.php:115
 msgid "Error creating temporary image"
-msgstr "Fehler beim erstellen des temporären Bildes"
+msgstr "Fehler beim Erstellen des temporären Bildes"
 
 #: ajax/savecrop.php:118
 msgid "Error finding image: "
@@ -203,7 +192,7 @@ msgstr "Fehler beim Suchen des Bildes: "
 
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr "Übertragen der Kontakte fehlgeschlagen"
+msgstr "Übertragen der Kontakte fehlgeschlagen."
 
 #: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
@@ -257,64 +246,76 @@ msgstr "Nicht verfügbar"
 
 #: js/contacts.js:76
 msgid "Couldn't get a valid address."
-msgstr "Konnte keine gültige Adresse abrufen"
+msgstr "Konnte keine gültige Adresse abrufen."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org"
+msgstr "'deleteProperty' wurde ohne Argumente aufgerufen. Bitte melden Sie dies auf bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
-msgstr "Keine Datei(en) zum Hochladen ausgewählt"
+msgstr "Keine Datei(en) zum Hochladen ausgewählt."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
+msgstr "Die Datei, die Sie hochladen möchten, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Fehler beim Laden des Profilbildes."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Wähle Typ"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
-msgstr "Möchtest du diese Adressbücher zusammenführen?"
+msgstr "Möchten Sie diese Adressbücher zusammenführen?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -338,7 +339,7 @@ msgstr "Adressbuch nicht gefunden:"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
-msgstr "Dies ist nicht dein Adressbuch."
+msgstr "Dies ist nicht Ihr Adressbuch."
 
 #: lib/app.php:71
 msgid "Contact could not be found."
@@ -346,51 +347,51 @@ msgstr "Kontakt konnte nicht gefunden werden."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -400,7 +401,7 @@ msgstr "Arbeit"
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Andere"
 
@@ -497,6 +498,14 @@ msgstr "Geburtstag von {name}"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
@@ -567,7 +576,7 @@ msgstr "Aktuellen Kontakt löschen"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
-msgstr "Zieh' ein Foto hierher zum Hochladen"
+msgstr "Ziehen Sie ein Foto zum Hochladen hierher"
 
 #: templates/part.contact.php:19
 msgid "Delete current photo"
@@ -671,11 +680,11 @@ msgstr "Telefonnummer löschen"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "IM löschen"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -703,7 +712,7 @@ msgstr "E-Mail"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -810,7 +819,7 @@ msgstr "Frau"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr "Dr"
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -830,7 +839,7 @@ msgstr "Höflichkeitssuffixe"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr "Dr. Jur"
+msgstr "Dr. Jur."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
@@ -882,16 +891,12 @@ msgstr "Kontakte werden importiert"
 
 #: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
-msgstr "Du hast keine Kontakte im Adressbuch."
+msgstr "Sie haben keine Kontakte im Adressbuch."
 
 #: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Adressbücher konfigurieren"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Wähle Adressbuch"
@@ -910,11 +915,11 @@ msgstr "CardDAV Sync-Adressen"
 
 #: templates/settings.php:3
 msgid "more info"
-msgstr "mehr Info"
+msgstr "mehr Informationen"
 
 #: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr "primäre Adresse (für Kontakt o.ä. Programme)"
+msgstr "Primäre Adresse (für Kontakt o.ä.)"
 
 #: templates/settings.php:7
 msgid "iOS/OS X"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 2360a0297a..fc4db2d98b 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -8,16 +8,18 @@
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+#   <m.fresel@sysangels.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 19:45+0000\n"
-"Last-Translator: designpoint <info@designpoint.ch>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:44+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,55 +43,55 @@ msgstr "Kategorie existiert bereits:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "March"
 msgstr "März"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "April"
 msgstr "April"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "August"
 msgstr "August"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "September"
 msgstr "September"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "November"
 msgstr "November"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "December"
 msgstr "Dezember"
 
@@ -123,11 +125,11 @@ msgstr "ownCloud-Passwort zurücksetzen"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}"
+msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "Du erhälst einen Link, um dein Passwort per E-Mail zurückzusetzen."
+msgstr "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -148,7 +150,7 @@ msgstr "Anfrage zurückgesetzt"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Dein Passwort wurde zurückgesetzt."
+msgstr "Ihr Passwort wurde zurückgesetzt."
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -184,7 +186,7 @@ msgstr "Hilfe"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Zugang verboten"
+msgstr "Zugriff verboten"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -192,7 +194,7 @@ msgstr "Cloud nicht gefunden"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Kategorien editieren"
+msgstr "Kategorien bearbeiten"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
@@ -245,7 +247,7 @@ msgstr "Installation abschließen"
 
 #: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr "Web Services unter ihrer Kontrolle"
+msgstr "Web-Services unter Ihrer Kontrolle"
 
 #: templates/layout.user.php:49
 msgid "Log out"
@@ -265,7 +267,7 @@ msgstr "Einloggen"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Abgemeldet"
+msgstr "Sie wurden abgemeldet."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 2c0d801573..b7f13aa702 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -12,13 +12,14 @@
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:11+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +55,7 @@ msgstr "Temporärer Ordner fehlt."
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr "Fehler beim Schreiben auf Festplatte"
+msgstr "Fehler beim Schreiben auf die Festplatte"
 
 #: appinfo/app.php:6
 msgid "Files"
@@ -98,7 +99,7 @@ msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Datei kann nicht hochgeladen werden da sie ein Verzeichnis ist oder 0 Bytes hat."
+msgstr "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat."
 
 #: js/files.js:200
 msgid "Upload Error"
@@ -220,7 +221,7 @@ msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Serv
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr "Daten werden gescannt, bitte warten."
+msgstr "Dateien werden gescannt, bitte warten."
 
 #: templates/index.php:74
 msgid "Current scanning"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 84c825dfd9..49a5cc39b0 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 08:18+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 10:07+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,8 +77,8 @@ msgstr "Root-Zertifikate importieren"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr "Externer Speicher für Benutzer aktivieren"
+msgstr "Externen Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
+msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index b487d24a1d..0e1b5201dc 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -5,13 +5,14 @@
 # Translators:
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 16:32+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:41+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,49 +20,49 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
-msgstr "ZIP-Download ist deaktiviert."
+msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
-msgstr "Die gewählten Dateien sind zu groß, um eine zip-Datei zu generieren."
+msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr "Anwendung ist nicht aktiviert"
+msgstr "Die Anwendung ist nicht aktiviert"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
@@ -69,11 +70,11 @@ msgstr "Authentifizierungs-Fehler"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Token abgelaufen. Bitte Seite neuladen."
+msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr "vor wenigen Sekunden"
+msgstr "Vor wenigen Sekunden"
 
 #: template.php:87
 msgid "1 minute ago"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 694e39fb62..29ec31c8a5 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -11,13 +11,14 @@
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 10:12+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:08+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,7 +104,7 @@ msgstr "Mehr"
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr "Füge deine App hinzu"
+msgstr "Fügen Sie Ihre App hinzu"
 
 #: templates/apps.php:26
 msgid "Select an App"
@@ -147,7 +148,7 @@ msgstr "Antwort"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr "Du nutzt"
+msgstr "Sie nutzen"
 
 #: templates/personal.php:8
 msgid "of the available"
@@ -163,7 +164,7 @@ msgstr "Download"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr "Dein Passwort wurde geändert."
+msgstr "Ihr Passwort wurde geändert."
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -195,7 +196,7 @@ msgstr "Ihre E-Mail-Adresse"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
+msgstr "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -203,11 +204,11 @@ msgstr "Sprache"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Hilf bei der Übersetzung"
+msgstr "Helfen Sie bei der Übersetzung"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden."
+msgstr "Benutzen Sie diese Adresse, um Ihr ownCloud mit deinem Dateimanager zu verbinden."
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
@@ -227,7 +228,7 @@ msgstr "Anlegen"
 
 #: templates/users.php:35
 msgid "Default Quota"
-msgstr "Standard Quota"
+msgstr "Standard-Quota"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
diff --git a/l10n/de/tasks.po b/l10n/de/tasks.po
index ad1bfcf952..2ad6b64b48 100644
--- a/l10n/de/tasks.po
+++ b/l10n/de/tasks.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:49+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 10:09+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,15 +38,15 @@ msgstr "Nicht angegeben"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr "1=am höchsten"
+msgstr "1 = am höchsten"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr "5=Durchschnitt"
+msgstr "5 = Durchschnitt"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr "9=am niedrigsten"
+msgstr "9 = am niedrigsten"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -89,7 +90,7 @@ msgstr "Nach Label sortieren"
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr "Lade Aufgaben..."
+msgstr "Lade Aufgaben ..."
 
 #: templates/tasks.php:20
 msgid "Important"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index d7385b38ca..5cd6c4762f 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -7,13 +7,14 @@
 # Maurice Preuß <>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 09:13+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 10:14+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Host"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Du kannst das Protokoll auslassen, außer wenn du SSL benötiogst. Beginne dann __mit__ ldaps://"
+msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -36,7 +37,7 @@ msgstr "Basis-DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
+msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
 #: templates/settings.php:10
 msgid "User DN"
@@ -47,7 +48,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer."
 
 #: templates/settings.php:11
 msgid "Password"
@@ -55,11 +56,11 @@ msgstr "Passwort"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Lass die Felder von DN und Passwort für anonymen Zugang leer."
+msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr "Benutzer Login Filter"
+msgstr "Benutzer-Login-Filter"
 
 #: templates/settings.php:12
 #, php-format
@@ -75,7 +76,7 @@ msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr "Benutzer Filter Liste"
+msgstr "Benutzer-Filter-Liste"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
@@ -83,11 +84,11 @@ msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr "Gruppen Filter"
+msgstr "Gruppen-Filter"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +96,7 @@ msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
 #: templates/settings.php:17
 msgid "Port"
@@ -103,11 +104,11 @@ msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr "Basis Benutzerbaum"
+msgstr "Basis-Benutzerbaum"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr "Basis Gruppenbaum"
+msgstr "Basis-Gruppenbaum"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
@@ -119,11 +120,11 @@ msgstr "Nutze TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern."
+msgstr "Verwenden Sie es nicht für SSL-Verbindungen, es wird fehlschlagen."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
@@ -133,11 +134,11 @@ msgstr "Schalte die SSL Zertifikatsprüfung aus."
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Falls die Verbindung es erfordert, wird das SSL-Zertifikat des LDAP-Server importiert werden."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr "Nicht empfohlen, nur zum Testen."
+msgstr "Nicht empfohlen, nur zu Testzwecken."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -157,7 +158,7 @@ msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr "in bytes"
+msgstr "in Bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
diff --git a/l10n/de/user_migrate.po b/l10n/de/user_migrate.po
index 4423a018e2..aada5dbfb2 100644
--- a/l10n/de/user_migrate.po
+++ b/l10n/de/user_migrate.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:51+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 10:16+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr "Export"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr "Beim Export der Datei ist etwas schief gegangen."
+msgstr "Beim Export der Datei ist etwas schiefgegangen."
 
 #: js/export.js:19
 msgid "An error has occurred"
@@ -38,7 +39,7 @@ msgstr "Ihr Konto exportieren"
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält."
+msgstr "Eine komprimierte Datei wird erzeugt, die Ihr ownCloud-Konto enthält."
 
 #: templates/settings.php:13
 msgid "Import user account"
diff --git a/l10n/de/user_openid.po b/l10n/de/user_openid.po
index 5786558544..9f5a660af8 100644
--- a/l10n/de/user_openid.po
+++ b/l10n/de/user_openid.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
+#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:54+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 10:17+0000\n"
+"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:"
+msgstr "Dies ist ein OpenID-Server-Endpunkt. Weitere Informationen finden Sie unter:"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
@@ -41,7 +42,7 @@ msgstr "Anmelden"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr "Fehler: <b> Kein Benutzer gewählt"
+msgstr "Fehler: <b> Kein Benutzer ausgewählt"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
diff --git a/l10n/el/admin_dependencies_chk.po b/l10n/el/admin_dependencies_chk.po
index d1a97dc8f2..6823009596 100644
--- a/l10n/el/admin_dependencies_chk.po
+++ b/l10n/el/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
+"PO-Revision-Date: 2012-08-23 13:39+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,8 +67,8 @@ msgstr ""
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Κατάσταση εξαρτήσεων"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Χρησιμοποιήθηκε από:"
diff --git a/l10n/el/admin_migrate.po b/l10n/el/admin_migrate.po
index 9c9cb6234e..2d17139f4a 100644
--- a/l10n/el/admin_migrate.po
+++ b/l10n/el/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
+"PO-Revision-Date: 2012-08-23 13:41+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Αυτό θα δημιουργήσει ένα συμπιεσμένο αρχείο που θα περιέχει τα δεδομένα από αυτό το ownCloud.\n            Παρακαλώ επιλέξτε τον τύπο εξαγωγής:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Εξαγωγή"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index a2db38bcc6..c7086a17c9 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "δεν ορίστηκε id"
@@ -88,24 +88,16 @@ msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότ
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Λείπει IM παράμετρος."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
+msgstr "Άγνωστο IM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Σφάλμα διαγραφής ιδιότητας επαφής."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Λείπει ID"
@@ -126,10 +118,6 @@ msgstr "Οι πληροφορίες για τη vCard είναι λανθασμ
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -250,61 +238,73 @@ msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Σφάλμα στην φόρτωση εικόνας προφίλ."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Επιθυμείτε να συγχωνεύσετε αυτά τα δύο βιβλία διευθύνσεων?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -336,51 +336,51 @@ msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -390,7 +390,7 @@ msgstr "Εργασία"
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Άλλο"
 
@@ -487,6 +487,14 @@ msgstr "{name} έχει Γενέθλια"
 msgid "Contact"
 msgstr "Επαφή"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Προσθήκη επαφής"
@@ -661,11 +669,11 @@ msgstr "Διέγραψε αριθμό τηλεφώνου"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Διαγραφή IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -693,7 +701,7 @@ msgstr "Email"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Άμεσα μυνήματα"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -878,10 +886,6 @@ msgstr "Δεν έχεις επαφές στο βιβλίο διευθύνσεω
 msgid "Add contact"
 msgstr "Προσθήκη επαφής"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Επέλεξε βιβλίο διευθύνσεων"
@@ -920,7 +924,7 @@ msgstr "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Μοιράσου"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 18179301de..6d54cf8abc 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 13:34+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Κρυπτογράφηση"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Καμία"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Ενεργοποίηση Κρυπτογράφησης"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index aec86d2f48..d33fba1ab4 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 08:59+0000\n"
+"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Εξωτερική αποθήκευση"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Ρυθμίσεις"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Επιλογές"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -51,19 +52,19 @@ msgstr ""
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Όλοι οι χρήστες"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Ομάδες"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Χρήστες"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Διαγραφή"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index b2f51bd304..32f11e9f2c 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 08:57+0000\n"
+"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Μέγεθος"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Τροποποιήθηκε"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Διαγραφή όλων"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Διαγραφή"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 0c3ae5537c..134edc89db 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 18:26+0000\n"
+"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Λήξη όλων των εκδόσεων"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 2352c5f795..6d7243e05b 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 08:43+0000\n"
+"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -234,7 +234,7 @@ msgstr "Άλλα"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Διαχειρηστής ομάδας"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/el/tasks.po b/l10n/el/tasks.po
index 67d03159fd..3e9b760032 100644
--- a/l10n/el/tasks.po
+++ b/l10n/el/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 08:53+0000\n"
+"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,47 +20,47 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "Μην έγκυρη ημερομηνία / ώρα"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Εργασίες"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Χωρίς κατηγορία"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Μη ορισμένο"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=υψηλότερο"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=μέτριο"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=χαμηλότερο"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Άδεια περίληψη"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Μη έγκυρο ποσοστό ολοκλήρωσης"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Μη έγκυρη προτεραιότητα "
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Προσθήκη εργασίας"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Φόρτωση εργασιών..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Σημαντικό "
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Περισσότερα"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Λιγότερα"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Διαγραφή"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index d41d5a4ced..cfea140f22 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 13:38+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Συνθηματικό"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Θύρα"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -153,7 +154,7 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "σε bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
@@ -161,4 +162,4 @@ msgstr ""
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Βοήθεια"
diff --git a/l10n/el/user_migrate.po b/l10n/el/user_migrate.po
index 81504510c5..51b56b84a2 100644
--- a/l10n/el/user_migrate.po
+++ b/l10n/el/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 13:37+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Εξαγωγή"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
@@ -27,20 +28,20 @@ msgstr ""
 
 #: js/export.js:19
 msgid "An error has occurred"
-msgstr ""
+msgstr "Παρουσιάστηκε σφάλμα"
 
 #: templates/settings.php:2
 msgid "Export your user account"
-msgstr ""
+msgstr "Εξαγωγή του λογαριασμού χρήστη σας"
 
 #: templates/settings.php:3
 msgid ""
 "This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Αυτό θα δημιουργήσει ένα συμπιεσμένο αρχείο που θα περιέχει τον λογαριασμό σας ownCloud."
 
 #: templates/settings.php:13
 msgid "Import user account"
-msgstr ""
+msgstr "Εισαγωγή λογαριασμού χρήστη"
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
@@ -48,4 +49,4 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Εισαγωγή"
diff --git a/l10n/el/user_openid.po b/l10n/el/user_openid.po
index 5ea17f45a3..8d833ab11d 100644
--- a/l10n/el/user_openid.po
+++ b/l10n/el/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 08:57+0000\n"
+"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Ταυτότητα: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
@@ -31,15 +32,15 @@ msgstr ""
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Χρήστης: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Σύνδεση"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Σφάλμα: <b> Δεν έχει επιλεχθεί κάποιος χρήστης"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
@@ -47,8 +48,8 @@ msgstr ""
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Εξουσιοδοτημένος παροχέας OpenID"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Η διευθυνσή σας σε Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 507f93c2ca..3d95d0c448 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Eraro dum (mal)aktivigo de adresaro."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "identigilo ne agordiĝis."
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Eraro aldonante kontakta propraĵo:"
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Eraro dum forigo de kontaktopropraĵo."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Mankas identigilo"
@@ -121,10 +113,6 @@ msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "Ne eblis ekhavi validan adreson."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Eraro"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Ne eblis seriigi erojn."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Redakti nomon"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Elektu tipon"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "Laboro"
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Alia"
 
@@ -482,6 +482,14 @@ msgstr "Naskiĝtago de {name}"
 msgid "Contact"
 msgstr "Kontakto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aldoni kontakton"
@@ -873,10 +881,6 @@ msgstr "Vi ne havas kontaktojn en via adresaro"
 msgid "Add contact"
 msgstr "Aldoni kontakton"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Agordi adresarojn"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Elektu adresarojn"
diff --git a/l10n/es/admin_dependencies_chk.po b/l10n/es/admin_dependencies_chk.po
index 4f43ec3c30..acbf8db12a 100644
--- a/l10n/es/admin_dependencies_chk.po
+++ b/l10n/es/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
+"PO-Revision-Date: 2012-08-23 09:25+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,8 +67,8 @@ msgstr ""
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Estado de las dependencias"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Usado por:"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 1f2fd357ff..b437840d41 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Error al (des)activar libreta de direcciones."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "no se ha puesto ninguna ID."
@@ -87,24 +87,16 @@ msgstr "Intentando añadir una propiedad duplicada: "
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Falta un parámetro del MI."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
+msgstr "MI desconocido:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Error al borrar una propiedad del contacto."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Falta la ID"
@@ -125,10 +117,6 @@ msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la pág
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Error al actualizar una propiedad del contacto."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -249,59 +237,71 @@ msgid "Couldn't get a valid address."
 msgstr "Fallo : no hay dirección valida"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fallo"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Este campo no puede estar vacío."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Edita el Nombre"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Selecciona el tipo"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -335,51 +335,51 @@ msgstr "No se ha podido encontrar el contacto."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "Google Talk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -389,7 +389,7 @@ msgstr "Trabajo"
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Otro"
 
@@ -486,6 +486,14 @@ msgstr "Cumpleaños de {name}"
 msgid "Contact"
 msgstr "Contacto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Añadir contacto"
@@ -548,7 +556,7 @@ msgstr "Añadir un nuevo contacto"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Añadir nueva libreta de direcciones"
 
 #: templates/index.php:63
 msgid "Delete current contact"
@@ -607,11 +615,11 @@ msgstr "Sitio Web"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.unsitio.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Ir al sitio Web"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -660,7 +668,7 @@ msgstr "Eliminar número de teléfono"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Mensajero instantáneo"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
@@ -692,7 +700,7 @@ msgstr "Correo electrónico"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Mensajería instantánea"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -733,7 +741,7 @@ msgstr ""
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Calle y número"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -741,7 +749,7 @@ msgstr "Extendido"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Número del apartamento, etc."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -754,7 +762,7 @@ msgstr "Región"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Ej: región o provincia"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -877,10 +885,6 @@ msgstr "No hay contactos en tu agenda."
 msgid "Add contact"
 msgstr "Añadir contacto"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Configurar agenda"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
@@ -919,7 +923,7 @@ msgstr ""
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 0dfd58a77a..5139dfe014 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:17+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr "Nombre de la aplicación no provisto."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr "¿Ninguna categoría para agregar?"
+msgstr "¿Ninguna categoría para añadir?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
@@ -39,55 +39,55 @@ msgstr "Esta categoría ya existe: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Enero"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Febrero"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Mayo"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Septiembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Noviembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Diciembre"
 
@@ -105,11 +105,11 @@ msgstr "Sí"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr "Vale"
+msgstr "Aceptar"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr "No hay categorias seleccionadas para borrar."
+msgstr "No hay categorías seleccionadas para borrar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 17fbc463fd..2a26b728a9 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:26+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Almacenamiento externo"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
@@ -27,43 +28,43 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Motor"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Opciones"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Aplicable"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Añadir punto de montaje"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "No se ha configurado"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Todos los usuarios"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Eliiminar"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 848632a707..e53147b10f 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:11+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Tamaño"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Modificado"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Eliminar todo"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 48608fd407..0b5cfbe22c 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:28+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,4 +24,4 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Habilitar versionamiento de archivos"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8211a51621..4fadce58dc 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 20:25+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:14+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,15 +27,15 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr "Imposible cargar la lista desde App Store"
+msgstr "Imposible cargar la lista desde el App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr "Correo salvado"
+msgstr "Correo guardado"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr "Correo Incorrecto"
+msgstr "Correo no válido"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -67,7 +67,7 @@ msgstr "Activar"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr "Salvando.."
+msgstr "Guardando..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -111,7 +111,7 @@ msgstr "Seleccionar una aplicación"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr "Revisa la web de apps apps.owncloud.com"
+msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "-licensed"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 4b0620e455..11d0ce6c53 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:28+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Puerto"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Usar TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -153,7 +154,7 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "en bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
@@ -161,4 +162,4 @@ msgstr ""
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
diff --git a/l10n/es/user_migrate.po b/l10n/es/user_migrate.po
index aba673bd3f..fbd0617741 100644
--- a/l10n/es/user_migrate.po
+++ b/l10n/es/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:30+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: js/export.js:14 js/export.js:20
 msgid "Export"
-msgstr ""
+msgstr "Exportar"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
@@ -44,8 +45,8 @@ msgstr ""
 
 #: templates/settings.php:15
 msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip de usuario de ownCloud"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
diff --git a/l10n/es/user_openid.po b/l10n/es/user_openid.po
index 8d6e1cc908..efed4f72da 100644
--- a/l10n/es/user_openid.po
+++ b/l10n/es/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 09:24+0000\n"
+"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identidad: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Usuario: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Iniciar sesión"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index b1da75ccb8..076195c05e 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID on määramata."
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Viga konktaki korralikul kustutamisel."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Puudub ID"
@@ -120,10 +112,6 @@ msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Viga konktaki korralikul uuendamisel."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr "Kehtiva aadressi hankimine ebaõnnestus"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Viga"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Muuda nime"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Vali tüüp"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Töö"
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr "{name} sünnipäev"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisa kontakt"
@@ -872,10 +880,6 @@ msgstr "Sinu aadressiraamatus pole ühtegi kontakti."
 msgid "Add contact"
 msgstr "Lisa kontakt"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Seadista aadressiraamatuid"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 4ab1671069..3cb1eea28f 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "IDa ez da ezarri."
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Errorea kontaktu propietatea ezabatzean."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID falta da"
@@ -122,10 +114,6 @@ msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Errorea kontaktu propietatea eguneratzean."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "Ezin izan da eposta baliagarri bat hartu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errorea"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Propietate hau ezin da hutsik egon."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Editatu izena"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Hautatu mota"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Lana"
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Bestelakoa"
 
@@ -483,6 +483,14 @@ msgstr "{name}ren jaioteguna"
 msgid "Contact"
 msgstr "Kontaktua"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Gehitu kontaktua"
@@ -874,10 +882,6 @@ msgstr "Ez duzu kontakturik zure helbide liburuan."
 msgid "Add contact"
 msgstr "Gehitu kontaktua"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Konfiguratu helbide liburuak"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Hautatu helbide-liburuak"
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index fa04f4c815..0ef5f51a80 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/fa/bookmarks.po b/l10n/fa/bookmarks.po
index 1a79cdbe0a..c4649e206b 100644
--- a/l10n/fa/bookmarks.po
+++ b/l10n/fa/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:19+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "نشانک‌ها"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "بدون‌نام"
 
 #: templates/bookmarklet.php:5
 msgid ""
@@ -37,11 +38,11 @@ msgstr ""
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "آدرس"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "عنوان"
 
 #: templates/list.php:15
 msgid "Tags"
@@ -49,11 +50,11 @@ msgstr ""
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "ذخیره نشانک"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "شما هیچ نشانکی ندارید"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 1e332977fa..92daf2d9db 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "شناسه تعیین نشده"
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید"
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "خطا در هنگام پاک کرد ویژگی"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "نشانی گم شده"
@@ -120,10 +112,6 @@ msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr "Couldn't get a valid address."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "خطا"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "نام تغییر"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "کار"
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr "روز تولد {name} است"
 msgid "Contact"
 msgstr "اشخاص"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
@@ -872,10 +880,6 @@ msgstr "شماهیچ شخصی در  کتابچه نشانی خود ندارید"
 msgid "Add contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "پیکربندی کتابچه ی نشانی ها"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 4a7a4190e0..5dc2cb2c38 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Hossein nag <h.sname@yahoo.com>, 2012.
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 # vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:17+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,23 +64,23 @@ msgstr "وجود دارد"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "جایگزین"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "لغو"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "جایگزین‌شده"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "همراه"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "بازگشت"
 
 #: js/filelist.js:246
 msgid "deleted"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index ff23cb72c9..d1409ea24b 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:18+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "رمزگذاری"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
@@ -27,8 +28,8 @@ msgstr ""
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "هیچ‌کدام"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "فعال کردن رمزگذاری"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index a80b97b532..9b11f7a5ec 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:07+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "اندازه"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "تاریخ"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "حذف همه"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "حذف"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 8fe77cc79f..10bdb92792 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:14+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "انقضای تمامی نسخه‌ها"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "فعال‌کردن پرونده‌های نسخه‌بندی"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index f0abd9d4d8..7e1c82ad5e 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:01+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,43 +18,43 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "راه‌نما"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "شخصی"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "تنظیمات"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "کاربران"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr ""
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "مدیر"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -71,24 +72,24 @@ msgstr ""
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "ثانیه‌ها پیش"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 دقیقه پیش"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d دقیقه پیش"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "امروز"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "دیروز"
 
 #: template.php:93
 #, php-format
@@ -97,16 +98,16 @@ msgstr ""
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "ماه قبل"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "ماه‌های قبل"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "سال قبل"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "سال‌های قبل"
diff --git a/l10n/fa/tasks.po b/l10n/fa/tasks.po
index a8a28b716d..90c396946b 100644
--- a/l10n/fa/tasks.po
+++ b/l10n/fa/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 19:59+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "وظایف"
 
 #: js/tasks.js:415
 msgid "No category"
@@ -35,15 +36,15 @@ msgstr ""
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=بیش‌ترین"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=متوسط"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=کم‌ترین"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "درحال بارگزاری وظایف"
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "مهم"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "بیش‌تر"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "کم‌تر"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "حذف"
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index 9c21093bb1..da37fef417 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/fi_FI/admin_dependencies_chk.po b/l10n/fi_FI/admin_dependencies_chk.po
index 46b0ad55d7..a9a1eac7b0 100644
--- a/l10n/fi_FI/admin_dependencies_chk.po
+++ b/l10n/fi_FI/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
+"PO-Revision-Date: 2012-08-23 13:01+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,15 +32,15 @@ msgstr ""
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "php-gd-moduuli vaaditaan, jotta kuvista on mahdollista luoda esikatselukuvia"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "php-ldap-moduuli vaaditaan, jotta yhteys ldap-palvelimeen on mahdollista"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "php-zip-moduuli vaaditaan, jotta useiden tiedostojen samanaikainen lataus on mahdollista"
 
 #: settings.php:63
 msgid ""
@@ -52,7 +53,7 @@ msgstr ""
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "php-xml-moduuli vaaditaan, jotta tiedostojen jako webdavia käyttäen on mahdollista"
 
 #: settings.php:81
 msgid ""
@@ -62,12 +63,12 @@ msgstr ""
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "php-pdo-moduuli tarvitaan, jotta ownCloud-tietojen tallennus tietokantaan on mahdollista"
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Riippuvuuksien tila"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Käyttökohde:"
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index f8b5e83e77..6b129f3ee9 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 12:14+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +70,7 @@ msgstr "Aikavyöhyke vaihdettu"
 msgid "Invalid request"
 msgstr "Virheellinen pyyntö"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalenteri"
@@ -479,7 +479,7 @@ msgstr "Tänään"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Asetukset"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -733,7 +733,7 @@ msgstr ""
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Yleiset"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -741,11 +741,11 @@ msgstr "Aikavyöhyke"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Päivitä aikavyöhykkeet automaattisesti"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Ajan näyttömuoto"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -757,7 +757,7 @@ msgstr "12 tuntia"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Viikon alkamispäivä"
 
 #: templates/settings.php:76
 msgid "Cache"
@@ -781,7 +781,7 @@ msgstr ""
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Ensisijainen osoite (Kontact ja muut vastaavat)"
 
 #: templates/settings.php:91
 msgid "iOS/OS X"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index b67260431f..a80843bf7e 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -91,18 +91,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -123,10 +115,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -247,59 +235,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Virhe profiilikuvaa ladatessa."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
-msgstr ""
+msgstr "Valitse tyyppi"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Haluatko yhdistää nämä osoitekirjat?"
 
@@ -333,51 +333,51 @@ msgstr "Yhteystietoa ei löytynyt."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "Google Talk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -387,7 +387,7 @@ msgstr "Työ"
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Muu"
 
@@ -484,6 +484,14 @@ msgstr "Henkilön {name} syntymäpäivä"
 msgid "Contact"
 msgstr "Yhteystieto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisää yhteystieto"
@@ -642,7 +650,7 @@ msgstr "Anna sähköpostiosoite"
 
 #: templates/part.contact.php:64
 msgid "Mail to address"
-msgstr ""
+msgstr "Lähetä sähköpostia"
 
 #: templates/part.contact.php:65
 msgid "Delete email address"
@@ -658,7 +666,7 @@ msgstr "Poista puhelinnumero"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Pikaviestin"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
@@ -875,10 +883,6 @@ msgstr "Osoitekirjassasi ei ole yhteystietoja."
 msgid "Add contact"
 msgstr "Lisää yhteystieto"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Muokkaa osoitekirjoja"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Valitse osoitekirjat"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index bce2d66576..e4ee45867c 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 12:10+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -145,7 +145,7 @@ msgstr "Lähetettävän tiedoston suurin sallittu koko"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "suurin mahdollinen:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 9877489d0a..dba2e1225d 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 11:35+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Koko"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Muokattu"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Poista kaikki"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr "Poisto"
+msgstr "Poista"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index b45f1ed63e..f3610fa859 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 12:53+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr "Olet käyttänyt"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "käytettävissäsi on yhteensä"
+msgstr ", käytettävissäsi on yhteensä"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -189,7 +189,7 @@ msgstr "Sähköpostiosoitteesi"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa"
+msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
diff --git a/l10n/fi_FI/tasks.po b/l10n/fi_FI/tasks.po
index cfbcb891b6..b8857baee6 100644
--- a/l10n/fi_FI/tasks.po
+++ b/l10n/fi_FI/tasks.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 11:01+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 13:23+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Tehtävät"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Ei luokkaa"
 
 #: lib/app.php:33
 msgid "Unspecified"
@@ -48,7 +48,7 @@ msgstr "9=matalin"
 
 #: lib/app.php:81
 msgid "Empty Summary"
-msgstr ""
+msgstr "Tyhjä yhteenveto"
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
@@ -92,7 +92,7 @@ msgstr "Ladataan tehtäviä..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Tärkeä"
 
 #: templates/tasks.php:23
 msgid "More"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 601e9c1d35..a8c8f4e5c8 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <jarkko.moilanen@want3d.fi>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 18:00+0000\n"
+"Last-Translator: kyyberi <jarkko.moilanen@want3d.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +21,43 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Isäntä"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Voit jättää protokollan määrittämättä, paitsi kun käytät SSL:ää. Aloita silloin ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Oletus DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset' välilehdeltä  "
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Käyttäjän DN"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Login suodatus"
 
 #: templates/settings.php:12
 #, php-format
@@ -67,73 +69,73 @@ msgstr ""
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Käyttäjien suodatus"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  "
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Ryhmien suodatus"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  "
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Portti"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Oletus käyttäjäpuu"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Ryhmien juuri"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Ryhmä-jäsen assosiaatio (yhteys)"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Käytä TLS:ää"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Älä käytä SSL yhteyttä varten, se epäonnistuu. "
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Sulje SSL sertifikaatin käyttö"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Jos yhteys toimii vain tällä optiolla, siirrä LDAP palvelimen SSL sertifikaatti onwCloud palvelimellesi. "
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ei suositella, käytä vain testausta varten."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -153,12 +155,12 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "tavuissa"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Ohje"
diff --git a/l10n/fi_FI/user_openid.po b/l10n/fi_FI/user_openid.po
index 7b5195bbcc..36900815c7 100644
--- a/l10n/fi_FI/user_openid.po
+++ b/l10n/fi_FI/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 11:37+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +24,23 @@ msgstr ""
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identiteetti: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Alue: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Käyttäjä: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Kirjaudu"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Virhe: <b>Käyttäjää ei valittu"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index b22cad3727..b1aca8af7a 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -9,6 +9,7 @@
 #   <gp4004@arghh.org>, 2011, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+#   <mathieu.payrol@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 # Nicolas  <boolet.is@free.fr>, 2012.
 # Robert Di Rosa <>, 2012.
@@ -18,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +34,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "L'ID n'est pas défini."
@@ -92,24 +93,16 @@ msgstr "Ajout d'une propriété en double:"
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Paramètre de Messagerie Instantanée manquants."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Erreur pendant l'ajout de la propriété du contact :"
+msgstr "Messagerie Instantanée inconnue"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Erreur lors de la suppression du champ."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID manquant"
@@ -130,10 +123,6 @@ msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Erreur lors de la mise à jour du champ."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,7 +232,7 @@ msgstr "Contacts"
 
 #: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
+msgstr "Désolé cette fonctionnalité n'a pas encore été implémentée"
 
 #: js/contacts.js:71
 msgid "Not implemented"
@@ -254,59 +243,71 @@ msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
-msgstr "Impossible de sérialiser les éléments"
+msgstr "Impossible de sérialiser les éléments."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
+msgstr "Le fichier que vous tentez de charger dépasse la taille maximum de fichier autorisée sur ce serveur."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Erreur pendant le chargement de la photo de profil."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Sélectionner un type"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
+msgstr "Certains contacts sont marqués pour être supprimés, mais ne le sont pas encore. Veuillez attendre que l'opération se termine."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Voulez-vous fusionner ces carnets d'adresses ?"
 
@@ -340,51 +341,51 @@ msgstr "Ce contact n'a pu être trouvé."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "Messagerie Instantanée"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -394,7 +395,7 @@ msgstr "Travail"
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Autre"
 
@@ -491,6 +492,14 @@ msgstr "Anniversaire de {name}"
 msgid "Contact"
 msgstr "Contact"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
@@ -665,11 +674,11 @@ msgstr "Supprimer le numéro de téléphone"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Supprimer la Messagerie Instantanée"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -697,7 +706,7 @@ msgstr "E-mail"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Messagerie instantanée"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -882,10 +891,6 @@ msgstr "Il n'y a pas de contact dans votre carnet d'adresses."
 msgid "Add contact"
 msgstr "Ajouter un contact"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Paramétrer carnet d'adresses"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Choix du carnet d'adresses"
@@ -924,7 +929,7 @@ msgstr "Afficher les liens VCF en lecture seule"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Partager"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/fr/media.po b/l10n/fr/media.po
index e8dc770632..9f757f487c 100644
--- a/l10n/fr/media.po
+++ b/l10n/fr/media.po
@@ -3,32 +3,34 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mathieu.payrol@gmail.com>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 11:57+0000\n"
+"Last-Translator: MathieuP <mathieu.payrol@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr "Musique"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Ajouter l'album à la playlist"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
-msgstr "Play"
+msgstr "Lire"
 
 #: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
diff --git a/l10n/fr/tasks.po b/l10n/fr/tasks.po
index 69664e2e2f..8bb451354c 100644
--- a/l10n/fr/tasks.po
+++ b/l10n/fr/tasks.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mathieu.payrol@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
 # Xavier BOUTEVILLAIN <xavier.boutevillain@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-17 12:26+0000\n"
-"Last-Translator: Xavier BOUTEVILLAIN <xavier.boutevillain@gmail.com>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 12:01+0000\n"
+"Last-Translator: MathieuP <mathieu.payrol@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index afaa4b5d41..1ca6075cb6 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 #   <zrk951@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 17:06+0000\n"
-"Last-Translator: Zertrin <zrk951@gmail.com>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:01+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,12 +64,12 @@ msgstr "Filtre d'identifiants utilisateur"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
diff --git a/l10n/fr/user_migrate.po b/l10n/fr/user_migrate.po
index 6528dc9e74..2b2802bbc8 100644
--- a/l10n/fr/user_migrate.po
+++ b/l10n/fr/user_migrate.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mathieu.payrol@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 16:23+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 12:00+0000\n"
+"Last-Translator: MathieuP <mathieu.payrol@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr "Exporter"
 
 #: js/export.js:19
 msgid "Something went wrong while the export file was being generated"
-msgstr "Une erreur s'est produit pendant la génération du fichier d'export"
+msgstr "Une erreur s'est produite pendant la génération du fichier d'export"
 
 #: js/export.js:19
 msgid "An error has occurred"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 4993c8b7de..5ee98a039d 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Produciuse un erro (des)activando a axenda."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "non se estableceu o id."
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Produciuse un erro borrando a propiedade do contacto."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID perdido"
@@ -121,10 +113,6 @@ msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxin
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Produciuse un erro actualizando a propiedade do contacto."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "Non se puido obter un enderezo de correo válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Esta propiedade non pode quedar baldeira."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Seleccione tipo"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "Traballo"
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr "Cumpleanos de {name}"
 msgid "Contact"
 msgstr "Contacto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Engadir contacto"
@@ -873,10 +881,6 @@ msgstr "Non ten contactos na súa libreta de enderezos."
 msgid "Add contact"
 msgstr "Engadir contacto"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Configurar libretas de enderezos"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index be12ff5887..df2a4bdc4e 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "מספר מזהה לא נקבע."
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "שגיאה במחיקת מאפיין של איש הקשר."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "מזהה חסר"
@@ -122,10 +114,6 @@ msgstr "המידע עבור ה vCard אינו נכון. אנא טען את הע
 msgid "Something went FUBAR. "
 msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "שגיאה בעדכון המאפיין של איש הקשר."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "עבודה"
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -483,6 +483,14 @@ msgstr "יום ההולדת של {name}"
 msgid "Contact"
 msgstr "איש קשר"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "הוספת איש קשר"
@@ -874,10 +882,6 @@ msgstr "איך לך אנשי קשר בספר הכתובות"
 msgid "Add contact"
 msgstr "הוסף איש קשר"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "הגדר ספרי כתובות"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index dfc545f383..1e98b00807 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Pogreška pri (de)aktivaciji adresara."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id nije postavljen."
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Pogreška pri brisanju svojstva kontakta."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Nedostupan ID identifikator"
@@ -121,10 +113,6 @@ msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 msgid "Something went FUBAR. "
 msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Pogreška pri ažuriranju svojstva kontakta."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "Posao"
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr "{name} Rođendan"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
@@ -873,10 +881,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 91365e521a..e1ab92a5a4 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Címlista (de)aktiválása sikertelen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID nincs beállítva"
@@ -91,18 +91,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Hiányzó ID"
@@ -123,10 +115,6 @@ msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -247,59 +235,71 @@ msgid "Couldn't get a valid address."
 msgstr "Érvényes cím lekérése sikertelen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Hiba"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Ezt a tulajdonságot muszáj kitölteni"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Típus kiválasztása"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr "Munkahelyi"
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -484,6 +484,14 @@ msgstr "{name} születésnapja"
 msgid "Contact"
 msgstr "Kapcsolat"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kapcsolat hozzáadása"
@@ -875,10 +883,6 @@ msgstr "Nincsenek kapcsolatok a címlistában"
 msgid "Add contact"
 msgstr "Kapcsolat hozzáadása"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Címlisták beállítása"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 6e6aaf74a6..4cffb4779e 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index d41d801f58..8b6bbeb675 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -121,10 +113,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "Travalio"
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr ""
 msgid "Contact"
 msgstr "Contacto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adder contacto"
@@ -873,10 +881,6 @@ msgstr ""
 msgid "Add contact"
 msgstr "Adder adressario"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 262d2eba49..0b3df912c2 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index b0555c5c1c..a7964324da 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 37a5ca6156..d6611b80d0 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Errore nel (dis)attivare la rubrica."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID non impostato."
@@ -85,24 +85,16 @@ msgstr "P"
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Parametro IM mancante."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Errore durante l'aggiunta della proprietà del contatto: "
+msgstr "IM sconosciuto:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard non corrette. Ricarica la pagina."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Errore durante l'eliminazione della proprietà del contatto."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID mancante"
@@ -123,10 +115,6 @@ msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Errore durante l'aggiornamento della proprietà del contatto."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -247,59 +235,71 @@ msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Errore durante il caricamento dell'immagine di profilo."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Vuoi unire queste rubriche?"
 
@@ -333,51 +333,51 @@ msgstr "Il contatto non può essere trovato."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -387,7 +387,7 @@ msgstr "Lavoro"
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Altro"
 
@@ -484,6 +484,14 @@ msgstr "Data di nascita di {name}"
 msgid "Contact"
 msgstr "Contatto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
@@ -658,11 +666,11 @@ msgstr "Elimina il numero di telefono"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Client di messaggistica istantanea"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Elimina IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -690,7 +698,7 @@ msgstr "Email"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Messaggistica istantanea"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -875,10 +883,6 @@ msgstr "Non hai contatti nella rubrica."
 msgid "Add contact"
 msgstr "Aggiungi contatto"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Configura rubriche"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Seleziona rubriche"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index f096712264..bda5ee92f2 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "アドレス帳の有効／無効化に失敗しました。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "idが設定されていません。"
@@ -83,24 +83,16 @@ msgstr "重複する属性を追加: "
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "IMのパラメータが不足しています。"
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "コンタクト属性の追加エラー: "
+msgstr "不明なIM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardの情報に誤りがあります。ページをリロードして下さい。"
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "連絡先の削除に失敗しました。"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "IDが見つかりません"
@@ -121,10 +113,6 @@ msgstr "vCardの情報が正しくありません。ページを再読み込み
 msgid "Something went FUBAR. "
 msgstr "何かがFUBARへ移動しました。"
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "連絡先の更新に失敗しました。"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "有効なアドレスを取得できませんでした。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "エラー"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "この属性は空にできません。"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "名前を編集"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "プロファイルの画像の読み込みエラー"
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "タイプを選択"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "これらのアドレス帳をマージしてもよろしいですか？"
 
@@ -331,51 +331,51 @@ msgstr "連絡先を見つける事ができません。"
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "Googleトーク"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -385,7 +385,7 @@ msgstr "勤務先"
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "その他"
 
@@ -482,6 +482,14 @@ msgstr "{name}の誕生日"
 msgid "Contact"
 msgstr "連絡先"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "連絡先の追加"
@@ -656,11 +664,11 @@ msgstr "電話番号を削除"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "インスタントメッセンジャー"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "IMを削除"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -688,7 +696,7 @@ msgstr "メールアドレス"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "インスタントメッセージ"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -873,10 +881,6 @@ msgstr "アドレス帳に連絡先が登録されていません。"
 msgid "Add contact"
 msgstr "連絡先を追加"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "アドレス帳を設定"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "アドレス帳を選択してください"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 9751b56552..410011e082 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "주소록을 (비)활성화하는 데 실패했습니다."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "아이디가 설정되어 있지 않습니다. "
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "연락처 속성을 삭제할 수 없습니다."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "아이디 분실"
@@ -121,10 +113,6 @@ msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "연락처 속성을 업데이트할 수 없습니다."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "유효한 주소를 얻을 수 없습니다."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "오류"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "이름 편집"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "유형 선택"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "직장"
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr "{이름}의 생일"
 msgid "Contact"
 msgstr "연락처"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "연락처 추가"
@@ -873,10 +881,6 @@ msgstr "당신의 주소록에는 연락처가 없습니다. "
 msgid "Add contact"
 msgstr "연락처 추가"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "주소록 구성"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 095a0e469e..2d22dc6b1e 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID ass net gesat."
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Fehler beim läschen vun der Kontakt Proprietéit."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID fehlt"
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Aarbecht"
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr "{name} säi Gebuertsdag"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt bäisetzen"
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 48be013efd..963907b297 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Klaida (de)aktyvuojant adresų knygą."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija apie vCard yra neteisinga. "
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Darbo"
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontaktas"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridėti kontaktą"
@@ -594,7 +602,7 @@ msgstr "Slapyvardis"
 
 #: templates/part.contact.php:42
 msgid "Enter nickname"
-msgstr ""
+msgstr "Įveskite slapyvardį"
 
 #: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 27e1110102..bae53dc5d6 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 07:58+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "atšaukti"
 
 #: js/filelist.js:195
 msgid "replaced"
@@ -99,7 +99,7 @@ msgstr "Įkėlimo klaida"
 
 #: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
-msgstr ""
+msgstr "Laukiantis"
 
 #: js/files.js:333
 msgid "Upload cancelled."
@@ -135,11 +135,11 @@ msgstr "failai"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Failų tvarkymas"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maksimalus failo dydis"
+msgstr "Maksimalus įkeliamo failo dydis"
 
 #: templates/admin.php:7
 msgid "max. possible: "
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 203e186cc5..8b8a184019 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 07:15+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "El. paštas išsaugotas"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
@@ -48,7 +48,7 @@ msgstr "Kalba pakeista"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Klaida"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -68,11 +68,11 @@ msgstr "Kalba"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Saugumo įspėjimas"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -84,7 +84,7 @@ msgstr ""
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "naudoti sistemos cron servisą"
 
 #: templates/admin.php:39
 msgid "Log"
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 00752ef4f3..206e0cb05d 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 2ad7a9d568..5ad0cf2831 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Грешка (де)активирање на адресарот."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ид не е поставено."
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Греш при бришење на вредноста за контакт."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Недостасува ИД"
@@ -121,10 +113,6 @@ msgstr "Информацијата за vCard не е точна. Ве мола
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Грешка при ажурирање на вредноста за контакт."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "Не можев да добијам исправна адреса."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Грешка"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Својството не смее да биде празно."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Уреди го името"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Одбери тип"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "Работа"
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr "Роденден на {name}"
 msgid "Contact"
 msgstr "Контакт"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додади контакт"
@@ -873,10 +881,6 @@ msgstr "Немате контакти во Вашиот адресар."
 msgid "Add contact"
 msgstr "Додади контакт"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Уреди адресари"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 81ce53cf5e..f3b425c71f 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Ralat nyahaktif buku alamat."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID tidak ditetapkan."
@@ -92,18 +92,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Maklumat vCard tidak tepat. Sila reload semula halaman ini."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Masalah memadam maklumat."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID Hilang"
@@ -124,10 +116,6 @@ msgstr "Maklumat tentang vCard tidak betul."
 msgid "Something went FUBAR. "
 msgstr "Sesuatu tidak betul."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Masalah mengemaskini maklumat."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -248,59 +236,71 @@ msgid "Couldn't get a valid address."
 msgstr "Tidak boleh mendapat alamat yang sah."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Ralat"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Nilai ini tidak boleh kosong."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Ubah nama"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "PIlih jenis"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr "Kerja"
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Lain"
 
@@ -485,6 +485,14 @@ msgstr "Hari Lahir {name}"
 msgid "Contact"
 msgstr "Hubungan"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tambah kenalan"
@@ -876,10 +884,6 @@ msgstr "Anda tidak mempunyai sebarang kenalan didalam buku alamat."
 msgid "Add contact"
 msgstr "Letak kenalan"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Konfigurasi buku alamat"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Pilih Buku Alamat"
diff --git a/l10n/nb_NO/admin_migrate.po b/l10n/nb_NO/admin_migrate.po
index 9d35d80bc3..12728fa65e 100644
--- a/l10n/nb_NO/admin_migrate.po
+++ b/l10n/nb_NO/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
+"PO-Revision-Date: 2012-08-23 17:37+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Eksporter denne ownCloud forekomsten"
 
 #: templates/settings.php:4
 msgid ""
 "This will create a compressed file that contains the data of this owncloud instance.\n"
 "            Please choose the export type:"
-msgstr ""
+msgstr "Dette vil opprette en komprimert fil som inneholder dataene fra denne ownCloud forekomsten.⏎ Vennligst velg eksporttype:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Eksport"
diff --git a/l10n/nb_NO/bookmarks.po b/l10n/nb_NO/bookmarks.po
index 65673a48ac..ff93307a65 100644
--- a/l10n/nb_NO/bookmarks.po
+++ b/l10n/nb_NO/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:23+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,41 +20,41 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Bokmerker"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "uten navn"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Dra denne over din nettlesers bokmerker og klikk den, hvis du ønsker å hurtig legge til bokmerke for en nettside"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Les senere"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Tittel"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Etikett"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Lagre bokmerke"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Du har ingen bokmerker"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index c9fd76eadc..524dec3bd0 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Et problem oppsto med å (de)aktivere adresseboken."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id er ikke satt."
@@ -91,18 +91,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Et problem oppsto med å fjerne kontaktfeltet."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Manglende ID"
@@ -123,10 +115,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Et problem oppsto med å legge til kontaktfeltet."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -247,59 +235,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Feil"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Endre navn"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Velg type"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr "Arbeid"
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -484,6 +484,14 @@ msgstr "{name}s bursdag"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ny kontakt"
@@ -875,10 +883,6 @@ msgstr "Du har ingen kontakter i din adressebok"
 msgid "Add contact"
 msgstr "Ny kontakt"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Konfigurer adressebøker"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 2a9b9beeb9..a74d1bacc7 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:13+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Kryptering"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Ekskluder følgende filer fra kryptering"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Slå på kryptering"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 4d6f006b63..f869bfc1fb 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:27+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Størrelse"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Endret"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Slett alle"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 2b2437b579..9b44f48273 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:25+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,4 +24,4 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Slå på versjonering"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index dada31bd02..0d9ea115ad 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:31+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,53 +18,53 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Personlig"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Innstillinger"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Brukere"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Apper"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-nedlasting av avslått"
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
-msgstr ""
+msgstr "Tilbake til filer"
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Applikasjon er ikke påslått"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentiseringsfeil"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -71,42 +72,42 @@ msgstr ""
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekunder siden"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minuitt siden"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minutter siden"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "i dag"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "i går"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dager siden"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "forrige måned"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "måneder siden"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "i fjor"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "år siden"
diff --git a/l10n/nb_NO/tasks.po b/l10n/nb_NO/tasks.po
index bcfe213161..bf07aa76d0 100644
--- a/l10n/nb_NO/tasks.po
+++ b/l10n/nb_NO/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:17+0000\n"
+"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,31 @@ msgstr ""
 
 #: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
 msgid "Invalid date/time"
-msgstr ""
+msgstr "feil i dato/klokkeslett"
 
 #: appinfo/app.php:11
 msgid "Tasks"
-msgstr ""
+msgstr "Oppgaver"
 
 #: js/tasks.js:415
 msgid "No category"
-msgstr ""
+msgstr "Ingen kategori"
 
 #: lib/app.php:33
 msgid "Unspecified"
-msgstr ""
+msgstr "Uspesifisert"
 
 #: lib/app.php:34
 msgid "1=highest"
-msgstr ""
+msgstr "1=høyest"
 
 #: lib/app.php:38
 msgid "5=medium"
-msgstr ""
+msgstr "5=middels"
 
 #: lib/app.php:42
 msgid "9=lowest"
-msgstr ""
+msgstr "9=lavest"
 
 #: lib/app.php:81
 msgid "Empty Summary"
@@ -51,15 +52,15 @@ msgstr ""
 
 #: lib/app.php:93
 msgid "Invalid percent complete"
-msgstr ""
+msgstr "Feil i prosent fullført"
 
 #: lib/app.php:107
 msgid "Invalid priority"
-msgstr ""
+msgstr "Ulovlig prioritet"
 
 #: templates/tasks.php:3
 msgid "Add Task"
-msgstr ""
+msgstr "Legg til oppgave"
 
 #: templates/tasks.php:4
 msgid "Order Due"
@@ -87,20 +88,20 @@ msgstr ""
 
 #: templates/tasks.php:16
 msgid "Loading tasks..."
-msgstr ""
+msgstr "Henter oppgaver..."
 
 #: templates/tasks.php:20
 msgid "Important"
-msgstr ""
+msgstr "Viktig"
 
 #: templates/tasks.php:23
 msgid "More"
-msgstr ""
+msgstr "Mer"
 
 #: templates/tasks.php:26
 msgid "Less"
-msgstr ""
+msgstr "Mindre"
 
 #: templates/tasks.php:29
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 02f89400d3..facb131ffa 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Fout bij het (de)activeren van het adresboek."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id is niet ingesteld."
@@ -92,18 +92,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Fout bij het verwijderen van de contacteigenschap."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Ontbrekend ID"
@@ -124,10 +116,6 @@ msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Fout bij het updaten van de contacteigenschap."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -248,59 +236,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr "Werk"
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -485,6 +485,14 @@ msgstr "{name}'s verjaardag"
 msgid "Contact"
 msgstr "Contact"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Contact toevoegen"
@@ -876,10 +884,6 @@ msgstr "Je hebt geen contacten in je adresboek"
 msgid "Add contact"
 msgstr "Contactpersoon toevoegen"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Bewerken adresboeken"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 3fead9d32b..aee7e87256 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Eit problem oppstod ved å slette kontaktfeltet."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -121,10 +113,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Eit problem oppstod ved å endre kontaktfeltet."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "Arbeid"
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Legg til kontakt"
@@ -873,10 +881,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 90a4ecec17..c0d1d34b69 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -5,14 +5,15 @@
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
 # Cyryl Sochacki <>, 2012.
+#   <czarnystokrotek@mailoo.org>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Błąd (de)aktywowania książki adresowej."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id nie ustawione."
@@ -91,18 +92,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Błąd przy dodawaniu właściwości kontaktu:"
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Błąd usuwania elementu."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Brak ID"
@@ -123,10 +116,6 @@ msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Błąd uaktualniania elementu."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -247,59 +236,71 @@ msgid "Couldn't get a valid address."
 msgstr "Nie można pobrać prawidłowego adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Błąd"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Ta właściwość nie może być pusta."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Zmień nazwę"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Błąd wczytywania zdjęcia profilu."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Wybierz typ"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Niektóre kontakty są zaznaczone do usunięcia, ale nie są usunięte jeszcze. Proszę czekać na ich usunięcie."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Czy chcesz scalić te książki adresowe?"
 
@@ -333,51 +334,51 @@ msgstr "Nie można odnaleźć kontaktu."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GG"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -387,7 +388,7 @@ msgstr "Praca"
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Inne"
 
@@ -484,6 +485,14 @@ msgstr "{name} Urodzony"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
@@ -875,10 +884,6 @@ msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
 msgid "Add contact"
 msgstr "Dodaj kontakt"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Konfiguruj książkę adresową"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Wybierz książki adresowe"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 4bc13b9d36..e4a7f97946 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Erro ao (des)ativar agenda."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID não definido."
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Erro ao excluir propriedade de contato."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Faltando ID"
@@ -122,10 +114,6 @@ msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Erro ao atualizar propriedades do contato."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Selecione o tipo"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Trabalho"
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -483,6 +483,14 @@ msgstr "Aniversário de {name}"
 msgid "Contact"
 msgstr "Contato"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contato"
@@ -874,10 +882,6 @@ msgstr "Voce não tem contatos em sua agenda de endereços."
 msgid "Add contact"
 msgstr "Adicionar contatos"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Configurar agenda de endereços"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/pt_PT/calendar.po b/l10n/pt_PT/calendar.po
index 190c42bb94..b82792c41e 100644
--- a/l10n/pt_PT/calendar.po
+++ b/l10n/pt_PT/calendar.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <geral@ricardolameiro.pt>, 2012.
 #   <helder.meneses@gmail.com>, 2011.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 20:06+0000\n"
+"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Nem todos os calendários estão completamente pré-carregados"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Parece que tudo está completamente pré-carregado"
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
@@ -44,19 +45,19 @@ msgstr "Calendário errado"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "O ficheiro não continha nenhuns eventos ou então todos os eventos já estavam carregados no seu calendário"
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "Os eventos foram guardados no novo calendário"
 
 #: ajax/import/import.php:56
 msgid "Import failed"
-msgstr ""
+msgstr "Falha na importação"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "Os eventos foram guardados no seu calendário"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -70,7 +71,7 @@ msgstr "Zona horária alterada"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:37 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendário"
@@ -161,7 +162,7 @@ msgstr "Trabalho"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "por"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -350,79 +351,79 @@ msgstr "Cal."
 
 #: templates/calendar.php:6
 msgid "Sun."
-msgstr ""
+msgstr "Dom."
 
 #: templates/calendar.php:6
 msgid "Mon."
-msgstr ""
+msgstr "Seg."
 
 #: templates/calendar.php:6
 msgid "Tue."
-msgstr ""
+msgstr "ter."
 
 #: templates/calendar.php:6
 msgid "Wed."
-msgstr ""
+msgstr "Qua."
 
 #: templates/calendar.php:6
 msgid "Thu."
-msgstr ""
+msgstr "Qui."
 
 #: templates/calendar.php:6
 msgid "Fri."
-msgstr ""
+msgstr "Sex."
 
 #: templates/calendar.php:6
 msgid "Sat."
-msgstr ""
+msgstr "Sáb."
 
 #: templates/calendar.php:8
 msgid "Jan."
-msgstr ""
+msgstr "Jan."
 
 #: templates/calendar.php:8
 msgid "Feb."
-msgstr ""
+msgstr "Fev,"
 
 #: templates/calendar.php:8
 msgid "Mar."
-msgstr ""
+msgstr "Mar."
 
 #: templates/calendar.php:8
 msgid "Apr."
-msgstr ""
+msgstr "Abr."
 
 #: templates/calendar.php:8
 msgid "May."
-msgstr ""
+msgstr "Mai."
 
 #: templates/calendar.php:8
 msgid "Jun."
-msgstr ""
+msgstr "Jun."
 
 #: templates/calendar.php:8
 msgid "Jul."
-msgstr ""
+msgstr "Jul."
 
 #: templates/calendar.php:8
 msgid "Aug."
-msgstr ""
+msgstr "Ago."
 
 #: templates/calendar.php:8
 msgid "Sep."
-msgstr ""
+msgstr "Set."
 
 #: templates/calendar.php:8
 msgid "Oct."
-msgstr ""
+msgstr "Out."
 
 #: templates/calendar.php:8
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/calendar.php:8
 msgid "Dec."
-msgstr ""
+msgstr "Dez."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -479,7 +480,7 @@ msgstr "Hoje"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Configurações"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -687,7 +688,7 @@ msgstr "Importar um ficheiro de calendário"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
-msgstr ""
+msgstr "Escolha um calendário por favor"
 
 #: templates/part.import.php:36
 msgid "Name of new calendar"
@@ -695,13 +696,13 @@ msgstr "Nome do novo calendário"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "Escolha um nome disponível!"
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Já existe um Calendário com esse nome. Se mesmo assim continuar, esses calendários serão fundidos."
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -733,7 +734,7 @@ msgstr "em"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -741,11 +742,11 @@ msgstr "Zona horária"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Actualizar automaticamente o fuso horário"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Formato da hora"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -757,39 +758,39 @@ msgstr "12h"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Começar semana em"
 
 #: templates/settings.php:76
 msgid "Cache"
-msgstr ""
+msgstr "Memória de pré-carregamento"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Limpar a memória de pré carregamento para eventos recorrentes"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "Endereço(s) web"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Endereços de sincronização de calendários CalDAV"
 
 #: templates/settings.php:87
 msgid "more info"
-msgstr ""
+msgstr "mais informação"
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Endereço principal (contactos et al.)"
 
 #: templates/settings.php:91
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
 
 #: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Ligaç(ão/ões) só de leitura do iCalendar"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 636cbc1a13..ee8c370515 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <geral@ricardolameiro.pt>, 2012.
 #   <helder.meneses@gmail.com>, 2011.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +26,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Erro a (des)ativar o livro de endereços"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id não está definido"
@@ -68,7 +69,7 @@ msgstr "o nome do elemento não está definido."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Incapaz de processar contacto"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -84,24 +85,16 @@ msgstr "A tentar adicionar propriedade duplicada: "
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Falta o parâmetro de mensagens instantâneas (IM)"
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
+msgstr "Mensagens instantâneas desconhecida (IM)"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A informação sobre o vCard está incorreta. Por favor refresque a página"
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Erro ao apagar propriedade do contato"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Falta ID"
@@ -122,10 +115,6 @@ msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a pá
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Erro ao atualizar propriedade do contato"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,61 +235,73 @@ msgid "Couldn't get a valid address."
 msgstr "Não foi possível obter um endereço válido."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Erro ao carregar imagem de perfil."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Seleccionar tipo"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Alguns contactos forma marcados para apagar, mas ainda não foram apagados. Por favor espere que ele sejam apagados."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Quer fundir estes Livros de endereços?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -316,11 +317,11 @@ msgstr " falhou."
 
 #: js/settings.js:68
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Displayname não pode ser vazio"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Livro de endereços não encontrado."
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -332,51 +333,51 @@ msgstr "O contacto não foi encontrado"
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -386,9 +387,9 @@ msgstr "Emprego"
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: lib/app.php:201
 msgid "Mobile"
@@ -429,51 +430,51 @@ msgstr "Aniversário"
 
 #: lib/app.php:253
 msgid "Business"
-msgstr ""
+msgstr "Empresa"
 
 #: lib/app.php:254
 msgid "Call"
-msgstr ""
+msgstr "Telefonar"
 
 #: lib/app.php:255
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
 #: lib/app.php:256
 msgid "Deliverer"
-msgstr ""
+msgstr "Fornecedor"
 
 #: lib/app.php:257
 msgid "Holidays"
-msgstr ""
+msgstr "Férias"
 
 #: lib/app.php:258
 msgid "Ideas"
-msgstr ""
+msgstr "Ideias"
 
 #: lib/app.php:259
 msgid "Journey"
-msgstr ""
+msgstr "Viagem"
 
 #: lib/app.php:260
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileu"
 
 #: lib/app.php:261
 msgid "Meeting"
-msgstr ""
+msgstr "Encontro"
 
 #: lib/app.php:263
 msgid "Personal"
-msgstr ""
+msgstr "Pessoal"
 
 #: lib/app.php:264
 msgid "Projects"
-msgstr ""
+msgstr "Projectos"
 
 #: lib/app.php:265
 msgid "Questions"
-msgstr ""
+msgstr "Questões"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -483,6 +484,14 @@ msgstr "Aniversário de {name}"
 msgid "Contact"
 msgstr "Contacto"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contacto"
@@ -493,7 +502,7 @@ msgstr "Importar"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Configurações"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -505,51 +514,51 @@ msgstr "Fechar"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Atalhos de teclado"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navegação"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Próximo contacto na lista"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Contacto anterior na lista"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Expandir/encolher o livro de endereços atual"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Próximo livro de endereços"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Livro de endereços anterior"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Recarregar lista de contactos"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Adicionar novo contacto"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Adicionar novo Livro de endereços"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Apagar o contacto atual"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -600,15 +609,15 @@ msgstr "Introduza alcunha"
 
 #: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
-msgstr ""
+msgstr "Página web"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Ir para página web"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -657,11 +666,11 @@ msgstr "Eliminar o número de telefone"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Mensageiro instantâneo"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Apagar mensageiro instantâneo (IM)"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -689,7 +698,7 @@ msgstr "Email"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Mensagens Instantâneas"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -726,11 +735,11 @@ msgstr "Apartado"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Endereço da Rua"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Rua e número"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -738,7 +747,7 @@ msgstr "Extendido"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Número de Apartamento, etc."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -751,7 +760,7 @@ msgstr "Região"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Por Ex. Estado ou província"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -759,7 +768,7 @@ msgstr "Código Postal"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Código Postal"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -874,21 +883,17 @@ msgstr "Não tem contactos no seu livro de endereços."
 msgid "Add contact"
 msgstr "Adicionar contacto"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Configurar livros de endereços"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Selecionar Livros de contactos"
 
 #: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "Introduzir nome"
 
 #: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "Introduzir descrição"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -908,15 +913,15 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Mostrar ligação CardDAV"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Mostrar ligações VCF só de leitura"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/settings.php:29
 msgid "Download"
@@ -932,11 +937,11 @@ msgstr "Novo livro de endereços"
 
 #: templates/settings.php:44
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/settings.php:45
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #: templates/settings.php:46
 msgid "Save"
@@ -948,4 +953,4 @@ msgstr "Cancelar"
 
 #: templates/settings.php:52
 msgid "More..."
-msgstr ""
+msgstr "Mais..."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 8219a46b3c..d816aedc33 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <geral@ricardolameiro.pt>, 2012.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 19:39+0000\n"
+"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,31 +60,31 @@ msgstr "Apagar"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "Já existe"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "substituir"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "cancelar"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "substituido"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "com"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "desfazer"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "apagado"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/pt_PT/gallery.po b/l10n/pt_PT/gallery.po
index 5a8f443a91..91c5cb1853 100644
--- a/l10n/pt_PT/gallery.po
+++ b/l10n/pt_PT/gallery.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <geral@ricardolameiro.pt>, 2012.
 #   <helder.meneses@gmail.com>, 2012.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
@@ -10,88 +11,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 19:50+0000\n"
+"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:42
 msgid "Pictures"
 msgstr "Imagens"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Partilhar a galeria"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Erro: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Erro interno"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Definições"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Atualizar"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Parar"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Partilhar"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Voltar"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Remove confirmação"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Deseja remover o album"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Mudar o nome do album"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Novo nome do album"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Slideshow"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index a7fab8357c..1cc82a6ea4 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <geral@ricardolameiro.pt>, 2012.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 19:46+0000\n"
+"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Incapaz de carregar a lista da App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +42,7 @@ msgstr "Pedido inválido"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Erro de autenticação"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +50,7 @@ msgstr "Idioma alterado"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,23 +70,23 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Aviso de Segurança"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Executar uma tarefa com cada página carregada"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php está registado num serviço webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "usar o serviço cron do sistema"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -229,7 +230,7 @@ msgstr "Outro"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupo Administrador"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index b1331df7f9..ab7e082bbe 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "(Dez)activarea agendei a întâmpinat o eroare."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID-ul nu este stabilit"
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Eroare la ștergerea proprietăților contactului."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID lipsă"
@@ -122,10 +114,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Eroare la actualizarea proprietăților contactului."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Servicu"
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -483,6 +483,14 @@ msgstr "Ziua de naștere a {name}"
 msgid "Contact"
 msgstr "Contact"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adaugă contact"
@@ -874,10 +882,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 89fbeeba7c..e4c51a539b 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Ошибка (де)активации адресной книги."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id не установлен."
@@ -72,7 +72,7 @@ msgstr "имя элемента не установлено."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Невозможно распознать контакт:"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -92,20 +92,12 @@ msgstr ""
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
+msgstr "Неизвестный IM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информация о vCard некорректна. Пожалуйста, обновите страницу."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Ошибка удаления информации из контакта."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Отсутствует ID"
@@ -126,10 +118,6 @@ msgstr "Информация о vCard не корректна. Перезагр
 msgid "Something went FUBAR. "
 msgstr "Что-то пошло FUBAR."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Ошибка обновления информации контакта."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -250,61 +238,73 @@ msgid "Couldn't get a valid address."
 msgstr "Не удалось получить адрес."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Это свойство должно быть не пустым."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Изменить имя"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Ошибка загрузки изображения профиля."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Выберите тип"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Некоторые контакты помечены на удаление, но ещё не удалены. Подождите, пока они удаляются."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Вы хотите соединить эти адресные книги?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -320,11 +320,11 @@ msgstr "не удалось."
 
 #: js/settings.js:68
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Отображаемое имя не может быть пустым."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Адресная книга не найдена:"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -336,51 +336,51 @@ msgstr "Контакт не найден."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -390,9 +390,9 @@ msgstr "Рабочий"
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
-msgstr ""
+msgstr "Другое"
 
 #: lib/app.php:201
 msgid "Mobile"
@@ -433,15 +433,15 @@ msgstr "День рождения"
 
 #: lib/app.php:253
 msgid "Business"
-msgstr ""
+msgstr "Бизнес"
 
 #: lib/app.php:254
 msgid "Call"
-msgstr ""
+msgstr "Вызов"
 
 #: lib/app.php:255
 msgid "Clients"
-msgstr ""
+msgstr "Клиенты"
 
 #: lib/app.php:256
 msgid "Deliverer"
@@ -449,35 +449,35 @@ msgstr ""
 
 #: lib/app.php:257
 msgid "Holidays"
-msgstr ""
+msgstr "Праздники"
 
 #: lib/app.php:258
 msgid "Ideas"
-msgstr ""
+msgstr "Идеи"
 
 #: lib/app.php:259
 msgid "Journey"
-msgstr ""
+msgstr "Поездка"
 
 #: lib/app.php:260
 msgid "Jubilee"
-msgstr ""
+msgstr "Юбилей"
 
 #: lib/app.php:261
 msgid "Meeting"
-msgstr ""
+msgstr "Встреча"
 
 #: lib/app.php:263
 msgid "Personal"
-msgstr ""
+msgstr "Личный"
 
 #: lib/app.php:264
 msgid "Projects"
-msgstr ""
+msgstr "Проекты"
 
 #: lib/app.php:265
 msgid "Questions"
-msgstr ""
+msgstr "Вопросы"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -487,6 +487,14 @@ msgstr "День рождения {name}"
 msgid "Contact"
 msgstr "Контакт"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Добавить Контакт"
@@ -497,7 +505,7 @@ msgstr "Импорт"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Настройки"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -509,51 +517,51 @@ msgstr "Закрыть"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Горячие клавиши"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Навигация"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Следующий контакт в списке"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Предыдущий контакт в списке"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Развернуть/свернуть текущую адресную книгу"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Следующая адресная книга"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Предыдущая адресная книга"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Действия"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Обновить список контактов"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Добавить новый контакт"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Добавить новую адресную книгу"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Удалить текущий контакт"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -604,15 +612,15 @@ msgstr "Введите псевдоним"
 
 #: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
-msgstr ""
+msgstr "Веб-сайт"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Перейти на веб-сайт"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -665,7 +673,7 @@ msgstr ""
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Удалить IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -730,11 +738,11 @@ msgstr "АО"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Улица"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Улица и дом"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -742,7 +750,7 @@ msgstr "Расширенный"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Номер квартиры и т.д."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -755,7 +763,7 @@ msgstr "Область"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Например, область или район"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -763,7 +771,7 @@ msgstr "Почтовый индекс"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Почтовый индекс"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -878,21 +886,17 @@ msgstr "В адресной книге нет контактов."
 msgid "Add contact"
 msgstr "Добавить контакт"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Настроить адресную книгу"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Выбрать адресную книгу"
 
 #: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "Введите имя"
 
 #: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "Ввдите описание"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -936,11 +940,11 @@ msgstr "Новая адресная книга"
 
 #: templates/settings.php:44
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #: templates/settings.php:45
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #: templates/settings.php:46
 msgid "Save"
@@ -952,4 +956,4 @@ msgstr "Отменить"
 
 #: templates/settings.php:52
 msgid "More..."
-msgstr ""
+msgstr "Ещё..."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 9c1cd54cab..dcab1d3890 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:08+0000\n"
+"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,23 +63,23 @@ msgstr "Удалить"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "уже существует"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "заменить"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "отмена"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "заменён"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "с"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
diff --git a/l10n/ru/gallery.po b/l10n/ru/gallery.po
index 34a7474dd4..c80be67674 100644
--- a/l10n/ru/gallery.po
+++ b/l10n/ru/gallery.po
@@ -7,92 +7,37 @@
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
+# Victor Bravo <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 17:08+0000\n"
+"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:42
 msgid "Pictures"
 msgstr "Рисунки"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Опубликовать"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Ошибка"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Внутренняя ошибка"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Настройки"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Обновить"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Остановить"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Поделиться"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Назад"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Подтверждение удаления"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Вы хотите удалить альбом?"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Изменить имя альбома"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Новое имя альбома"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Слайдшоу"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index c04d76ec84..d66125ae02 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Chyba (de)aktivácie adresára."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID nie je nastavené."
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Chyba odstránenia údaju kontaktu."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Chýba ID"
@@ -122,10 +114,6 @@ msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Chyba aktualizovania údaju kontaktu."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Vybrať typ"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Práca"
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Iné"
 
@@ -483,6 +483,14 @@ msgstr "Narodeniny {name}"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
@@ -874,10 +882,6 @@ msgstr "Nemáte žiadne kontakty v adresári."
 msgid "Add contact"
 msgstr "Pridať kontakt"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Nastaviť adresáre"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index d8f9686ed1..c721143614 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Napaka med (de)aktivacijo imenika."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id ni nastavljen."
@@ -84,24 +84,16 @@ msgstr "Poskušam dodati podvojeno lastnost:"
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Manjkajoč IM parameter."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Napaka pri dodajanju lastnosti stiku:"
+msgstr "Neznan IM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Napaka pri brisanju lastnosti stika."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Manjkajoč ID"
@@ -122,10 +114,6 @@ msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Napaka pri posodabljanju lastnosti stika."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "Ne morem dobiti veljavnega naslova."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Napaka"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Ta lastnost ne sme biti prazna"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Uredi ime"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Napaka pri nalaganju slike profila."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Izberite vrsto"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Ali želite združiti adresarje?"
 
@@ -332,51 +332,51 @@ msgstr "Stika ni bilo mogoče najti."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -386,7 +386,7 @@ msgstr "Delo"
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Drugo"
 
@@ -483,6 +483,14 @@ msgstr "{name} - rojstni dan"
 msgid "Contact"
 msgstr "Stik"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj stik"
@@ -657,11 +665,11 @@ msgstr "Izbriši telefonsko številko"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Takojšni sporočilnik"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Izbriši IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -689,7 +697,7 @@ msgstr "E-pošta"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Neposredno sporočanje"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -874,10 +882,6 @@ msgstr "V vašem imeniku ni stikov."
 msgid "Add contact"
 msgstr "Dodaj stik"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Nastavi imenike"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Izberite adresarje"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 477d3c9a5b..2e9f2b1c0d 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index d3d0b16a25..9b88aad65b 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти су неисправни. Поново учитајте страницу."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Посао"
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr ""
 msgid "Contact"
 msgstr "Контакт"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додај контакт"
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 86167ff2b7..826a00d5e6 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Posao"
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 76f7749109..4e4a64bd2c 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Fel (av)aktivera adressbok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID är inte satt."
@@ -87,24 +87,16 @@ msgstr "Försöker lägga till dubblett:"
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "IM parameter saknas."
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Kunde inte lägga till egenskap för kontakt:"
+msgstr "Okänt IM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Fel uppstod när kontaktegenskap skulle tas bort."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "ID saknas"
@@ -125,10 +117,6 @@ msgstr "Informationen om vCard är fel. Ladda om sidan:"
 msgid "Something went FUBAR. "
 msgstr "Något gick fel."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Fel uppstod när kontaktegenskap skulle uppdateras."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -249,59 +237,71 @@ msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "Fel vid hämtning av profilbild."
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Välj typ"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "Vill du slå samman dessa adressböcker?"
 
@@ -335,51 +335,51 @@ msgstr "Kontakt kunde inte hittas."
 
 #: lib/app.php:116
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: lib/app.php:121
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: lib/app.php:126
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: lib/app.php:131
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/app.php:136
 msgid "GoogleTalk"
-msgstr ""
+msgstr "GoogleTalk"
 
 #: lib/app.php:141
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lib/app.php:146
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 #: lib/app.php:151
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: lib/app.php:156
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
 #: lib/app.php:161
 msgid "Skype"
-msgstr ""
+msgstr "Skype"
 
 #: lib/app.php:166
 msgid "QQ"
-msgstr ""
+msgstr "QQ"
 
 #: lib/app.php:171
 msgid "GaduGadu"
-msgstr ""
+msgstr "GaduGadu"
 
 #: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
 msgid "Work"
@@ -389,7 +389,7 @@ msgstr "Arbete"
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Annat"
 
@@ -486,6 +486,14 @@ msgstr "{name}'s födelsedag"
 msgid "Contact"
 msgstr "Kontakt"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
@@ -660,11 +668,11 @@ msgstr "Ta bort telefonnummer"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Radera IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -692,7 +700,7 @@ msgstr "E-post"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -877,10 +885,6 @@ msgstr "Du har inga kontakter i din adressbok."
 msgid "Add contact"
 msgstr "Lägg till en kontakt"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Anpassa adressböcker."
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Välj adressböcker"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 2dba8fbd98..c4d46ecc46 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 4181234bd7..e72d72e374 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"POT-Creation-Date: 2012-08-24 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 1b7986d9ec..9d10db08ba 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 64c1bfbc7a..64b4584db7 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:02+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 0f2d236e84..6b35ece6d7 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 8725bc18e0..2849d9d546 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 492f799bc4..3b44bf95e0 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 38ba359a36..11b30e234d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index a1a5bbbc70..bfc76cf3e8 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b28da22f16..9403fd1cb8 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 6b8ba22c84..f3d7fe95db 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index cefacba35d..974a3600c8 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 65698be223..9f10129eab 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 8e90e6ba95..628c493ff3 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 478e38ceeb..3ce71ef31c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index 6244d641a8..876cc1deab 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8a8e151d2d..815e4a59db 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index 608bfdc3aa..50810fb368 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 6f9b19d8c6..1fe92139e3 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 2ab911cc3a..978e20b066 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ยังไม่ได้กำหนดรหัส"
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ"
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง"
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "รหัสสูญหาย"
@@ -121,10 +113,6 @@ msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณา
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว"
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "เลือกชนิด"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?"
 
@@ -385,7 +385,7 @@ msgstr "ที่ทำงาน"
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "อื่นๆ"
 
@@ -482,6 +482,14 @@ msgstr "วันเกิดของ {name}"
 msgid "Contact"
 msgstr "ข้อมูลการติดต่อ"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "เพิ่มรายชื่อผู้ติดต่อใหม่"
@@ -873,10 +881,6 @@ msgstr "คุณยังไม่มีข้อมูลการติดต
 msgid "Add contact"
 msgstr "เพิ่มชื่อผู้ติดต่อ"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "เลือกสมุดบันทึกที่อยู่"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 4a13c3fd84..8feffd0706 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "Adres defteri etkisizleştirilirken hata oluştu."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id atanmamış."
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr "Kişi özelliği eklenirken hata oluştu."
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "Kişi özelliği silinirken hata oluştu."
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Eksik ID"
@@ -122,10 +114,6 @@ msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "Kişi özelliği güncellenirken hata oluştu."
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "Geçerli bir adres alınamadı."
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "Hata"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "Bu özellik boş bırakılmamalı."
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "İsmi düzenle"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "Tür seç"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "İş"
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr "Diğer"
 
@@ -483,6 +483,14 @@ msgstr "{name}'nin Doğumgünü"
 msgid "Contact"
 msgstr "Kişi"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kişi Ekle"
@@ -874,10 +882,6 @@ msgstr "Adres defterinizde hiç bağlantı yok."
 msgid "Add contact"
 msgstr "Bağlatı ekle"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "Adres defterini yapılandır"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr "Adres deftelerini seçiniz"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 44cbbb1329..f415e863cc 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додати контакт"
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 2191817259..924eb994b8 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id không được thiết lập."
@@ -88,18 +88,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "Missing ID"
@@ -120,10 +112,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -244,59 +232,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Công việc"
 msgid "Home"
 msgstr "Nhà"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -481,6 +481,14 @@ msgstr ""
 msgid "Contact"
 msgstr "Danh sách"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "Thêm liên lạc"
@@ -872,10 +880,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
index fe6cef016c..d4431695ae 100644
--- a/l10n/zh_CN.GB2312/contacts.po
+++ b/l10n/zh_CN.GB2312/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -87,18 +87,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr ""
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr ""
@@ -119,10 +111,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr ""
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -243,59 +231,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -480,6 +480,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
@@ -871,10 +879,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index a0c859909c..78d0fb242f 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "没有设置 id。"
@@ -90,18 +90,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信息不正确。请重新加载页面。"
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "删除联系人属性错误。"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "缺少 ID"
@@ -122,10 +114,6 @@ msgstr "vCard 信息不正确。请刷新页面: "
 msgid "Something went FUBAR. "
 msgstr "有一些信息无法被处理。"
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "更新联系人属性错误。"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -246,59 +234,71 @@ msgid "Couldn't get a valid address."
 msgstr "无法获取一个合法的地址。"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr "错误"
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr "这个属性必须是非空的"
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr "无法序列化元素"
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr "编辑名称"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr "选择类型"
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "工作"
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -483,6 +483,14 @@ msgstr "{name} 的生日"
 msgid "Contact"
 msgstr "联系人"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加联系人"
@@ -874,10 +882,6 @@ msgstr "您的地址簿中没有联系人。"
 msgid "Add contact"
 msgstr "添加联系人"
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr "配置地址簿"
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 35460873c8..4a52e2838c 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-23 12:13+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,96 +18,96 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "个人"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "设置"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "应用"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "管理"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP 下载已经关闭"
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "需要逐一下载文件"
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
-msgstr ""
+msgstr "回到文件"
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "选择的文件太大，无法生成 zip 文件。"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "不需要程序"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "认证错误"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token 过期，请刷新页面。"
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "几秒前"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1分钟前"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d 分钟前"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "今天"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "昨天"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d 天前"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "上月"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "几月前"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "上年"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "几年前"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 401a338532..254da03e8b 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:03+0000\n"
+"POT-Creation-Date: 2012-08-24 02:02+0200\n"
+"PO-Revision-Date: 2012-08-24 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Error (de)activating addressbook."
 msgstr "在啟用或關閉電話簿時發生錯誤"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
 #: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
@@ -89,18 +89,10 @@ msgstr ""
 msgid "Unknown IM: "
 msgstr ""
 
-#: ajax/contact/addproperty.php:158
-msgid "Error adding contact property: "
-msgstr ""
-
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "有關 vCard 的資訊不正確，請重新載入此頁。"
 
-#: ajax/contact/deleteproperty.php:44
-msgid "Error deleting contact property."
-msgstr "刪除通訊錄內容中發生錯誤"
-
 #: ajax/contact/details.php:31
 msgid "Missing ID"
 msgstr "遺失ID"
@@ -121,10 +113,6 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:166
-msgid "Error updating contact property."
-msgstr "更新通訊錄內容中發生錯誤"
-
 #: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
 #: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
@@ -245,59 +233,71 @@ msgid "Couldn't get a valid address."
 msgstr ""
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:676 js/contacts.js:716 js/contacts.js:742 js/contacts.js:859
-#: js/contacts.js:865 js/contacts.js:877 js/contacts.js:911
-#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
-#: js/contacts.js:1225 js/contacts.js:1258 js/contacts.js:1270
-#: js/contacts.js:1293 js/contacts.js:1523 js/contacts.js:1558
-#: js/contacts.js:1578 js/settings.js:26 js/settings.js:43 js/settings.js:68
+#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
+#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
+#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
+#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
+#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
+#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:716
+#: js/contacts.js:424
+msgid "You do not have permission to add contacts to "
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Please select one of your own address books."
+msgstr ""
+
+#: js/contacts.js:425
+msgid "Permission error"
+msgstr ""
+
+#: js/contacts.js:763
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:742
+#: js/contacts.js:789
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:859 js/contacts.js:877
+#: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:893
+#: js/contacts.js:958
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1250
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1181
+#: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1245
+#: js/contacts.js:1322
 msgid "Error loading profile picture."
 msgstr ""
 
-#: js/contacts.js:1371 js/contacts.js:1412 js/contacts.js:1431
-#: js/contacts.js:1474
+#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
+#: js/contacts.js:1560
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1492
+#: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:1563
+#: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "公司"
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:584
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr "{name}的生日"
 msgid "Contact"
 msgstr "通訊錄"
 
+#: lib/vcard.php:408
+msgid "You do not have the permissions to edit this contact."
+msgstr ""
+
+#: lib/vcard.php:483
+msgid "You do not have the permissions to delete this contact."
+msgstr ""
+
 #: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加通訊錄"
@@ -873,10 +881,6 @@ msgstr ""
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:6
-msgid "Configure addressbooks"
-msgstr ""
-
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
 msgstr ""
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index d3548c7a13..e77ec97df7 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -5,14 +5,14 @@
 "Users" => "Benutzer",
 "Apps" => "Apps",
 "Admin" => "Administrator",
-"ZIP download is turned off." => "ZIP-Download ist deaktiviert.",
+"ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
-"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine zip-Datei zu generieren.",
-"Application is not enabled" => "Anwendung ist nicht aktiviert",
+"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
+"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
-"Token expired. Please reload page." => "Token abgelaufen. Bitte Seite neuladen.",
-"seconds ago" => "vor wenigen Sekunden",
+"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
+"seconds ago" => "Vor wenigen Sekunden",
 "1 minute ago" => "Vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
 "today" => "Heute",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
new file mode 100644
index 0000000000..3579329820
--- /dev/null
+++ b/lib/l10n/fa.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"Help" => "راه‌نما",
+"Personal" => "شخصی",
+"Settings" => "تنظیمات",
+"Users" => "کاربران",
+"Admin" => "مدیر",
+"seconds ago" => "ثانیه‌ها پیش",
+"1 minute ago" => "1 دقیقه پیش",
+"%d minutes ago" => "%d دقیقه پیش",
+"today" => "امروز",
+"yesterday" => "دیروز",
+"last month" => "ماه قبل",
+"months ago" => "ماه‌های قبل",
+"last year" => "سال قبل",
+"years ago" => "سال‌های قبل"
+);
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
new file mode 100644
index 0000000000..af9503b7bf
--- /dev/null
+++ b/lib/l10n/nb_NO.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hjelp",
+"Personal" => "Personlig",
+"Settings" => "Innstillinger",
+"Users" => "Brukere",
+"Apps" => "Apper",
+"Admin" => "Admin",
+"ZIP download is turned off." => "ZIP-nedlasting av avslått",
+"Files need to be downloaded one by one." => "Filene må lastes ned en om gangen",
+"Back to Files" => "Tilbake til filer",
+"Selected files too large to generate zip file." => "De valgte filene er for store til å kunne generere ZIP-fil",
+"Application is not enabled" => "Applikasjon er ikke påslått",
+"Authentication error" => "Autentiseringsfeil",
+"seconds ago" => "sekunder siden",
+"1 minute ago" => "1 minuitt siden",
+"%d minutes ago" => "%d minutter siden",
+"today" => "i dag",
+"yesterday" => "i går",
+"%d days ago" => "%d dager siden",
+"last month" => "forrige måned",
+"months ago" => "måneder siden",
+"last year" => "i fjor",
+"years ago" => "år siden"
+);
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
new file mode 100644
index 0000000000..2d05ad3567
--- /dev/null
+++ b/lib/l10n/zh_CN.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "帮助",
+"Personal" => "个人",
+"Settings" => "设置",
+"Users" => "用户",
+"Apps" => "应用",
+"Admin" => "管理",
+"ZIP download is turned off." => "ZIP 下载已经关闭",
+"Files need to be downloaded one by one." => "需要逐一下载文件",
+"Back to Files" => "回到文件",
+"Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。",
+"Application is not enabled" => "不需要程序",
+"Authentication error" => "认证错误",
+"Token expired. Please reload page." => "Token 过期，请刷新页面。",
+"seconds ago" => "几秒前",
+"1 minute ago" => "1分钟前",
+"%d minutes ago" => "%d 分钟前",
+"today" => "今天",
+"yesterday" => "昨天",
+"%d days ago" => "%d 天前",
+"last month" => "上月",
+"months ago" => "几月前",
+"last year" => "上年",
+"years ago" => "几年前"
+);
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index be9704336f..791a75fd7c 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -18,7 +18,7 @@
 "use systems cron service" => "Nutze System-Cron-Service",
 "Log" => "Log",
 "More" => "Mehr",
-"Add your App" => "Füge deine App hinzu",
+"Add your App" => "Fügen Sie Ihre App hinzu",
 "Select an App" => "Wähle eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen auf apps.owncloud.com",
 "-licensed" => "-lizenziert",
@@ -29,11 +29,11 @@
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
-"You use" => "Du nutzt",
+"You use" => "Sie nutzen",
 "of the available" => "der verfügbaren",
 "Desktop and Mobile Syncing Clients" => "Desktop- und mobile Synchronierungs-Clients",
 "Download" => "Download",
-"Your password got changed" => "Dein Passwort wurde geändert.",
+"Your password got changed" => "Ihr Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
@@ -41,15 +41,15 @@
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung",
-"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
+"Help translate" => "Helfen Sie bei der Übersetzung",
+"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihr ownCloud mit deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
-"Default Quota" => "Standard Quota",
+"Default Quota" => "Standard-Quota",
 "Other" => "Andere",
 "Group Admin" => "Gruppenadministrator",
 "Quota" => "Quota",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 051783701c..d7333fab2c 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -51,6 +51,7 @@
 "Create" => "Δημιουργία",
 "Default Quota" => "Προεπιλεγμένο όριο",
 "Other" => "Άλλα",
+"Group Admin" => "Διαχειρηστής ομάδας",
 "Quota" => "Σύνολο χώρου",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 1f0a7965ec..8403b6d388 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Imposible cargar la lista desde App Store",
-"Email saved" => "Correo salvado",
-"Invalid email" => "Correo Incorrecto",
+"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Email saved" => "Correo guardado",
+"Invalid email" => "Correo no válido",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
 "Authentication error" => "Error de autenticación",
@@ -9,7 +9,7 @@
 "Error" => "Error",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
-"Saving..." => "Salvando..",
+"Saving..." => "Guardando...",
 "__language_name__" => "Castellano",
 "Security Warning" => "Advertencia de seguridad",
 "Cron" => "Cron",
@@ -20,7 +20,7 @@
 "More" => "Más",
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
-"See application page at apps.owncloud.com" => "Revisa la web de apps apps.owncloud.com",
+"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
 "-licensed" => "-autorizado",
 "by" => "por",
 "Documentation" => "Documentación",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 9cc36f4955..bfcf1a59dd 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -27,7 +27,7 @@
 "Go there manually." => "Ohje löytyy sieltä.",
 "Answer" => "Vastaus",
 "You use" => "Olet käyttänyt",
-"of the available" => "käytettävissäsi on yhteensä",
+"of the available" => ", käytettävissäsi on yhteensä",
 "Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
 "Download" => "Lataa",
 "Your password got changed" => "Salasanasi on vaihdettu",
@@ -38,7 +38,7 @@
 "Change password" => "Vaihda salasana",
 "Email" => "Sähköposti",
 "Your email address" => "Sähköpostiosoitteesi",
-"Fill in an email address to enable password recovery" => "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa",
+"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 409fa9517f..e8076e293b 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
+"Email saved" => "El. paštas išsaugotas",
 "Invalid email" => "Netinkamas el. paštas",
 "OpenID Changed" => "OpenID pakeistas",
 "Invalid request" => "Klaidinga užklausa",
 "Language changed" => "Kalba pakeista",
+"Error" => "Klaida",
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
 "Saving..." => "Saugoma..",
 "__language_name__" => "Kalba",
+"Security Warning" => "Saugumo įspėjimas",
+"Cron" => "Cron",
+"use systems cron service" => "naudoti sistemos cron servisą",
 "Log" => "Žurnalas",
 "More" => "Daugiau",
 "Add your App" => "Pridėti programėlę",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 159c3a7d07..af12c42de4 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Email saved" => "Email guardado",
 "Invalid email" => "Email inválido",
 "OpenID Changed" => "OpenID alterado",
 "Invalid request" => "Pedido inválido",
+"Authentication error" => "Erro de autenticação",
 "Language changed" => "Idioma alterado",
+"Error" => "Erro",
 "Disable" => "Desativar",
 "Enable" => "Ativar",
 "Saving..." => "A guardar...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Aviso de Segurança",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
+"cron.php is registered at a webcron service" => "cron.php está registado num serviço webcron",
+"use systems cron service" => "usar o serviço cron do sistema",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione a sua aplicação",
@@ -43,6 +51,7 @@
 "Create" => "Criar",
 "Default Quota" => "Quota por defeito",
 "Other" => "Outro",
+"Group Admin" => "Grupo Administrador",
 "Quota" => "Quota",
 "Delete" => "Apagar"
 );

From 953f9d95f803ec32f66301e4cc42ecc77d8dab50 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 24 Aug 2012 04:54:14 +0200
Subject: [PATCH 1534/1537] Implemented sharing api for CardDAV. Next step
 CalDAV.

---
 apps/contacts/appinfo/app.php                 |   8 +-
 apps/contacts/appinfo/remote.php              |  16 +--
 apps/contacts/lib/sabre/addressbook.php       | 125 ++++++++++++++++++
 apps/contacts/lib/sabre/addressbookroot.php   |  45 +++++++
 .../backend.php}                              |   1 +
 apps/contacts/lib/sabre/card.php              |  94 +++++++++++++
 apps/contacts/lib/sabre/useraddressbooks.php  |  45 +++++++
 .../vcfexportplugin.php}                      |   0
 apps/contacts/lib/vcard.php                   |   2 +-
 9 files changed, 325 insertions(+), 11 deletions(-)
 create mode 100644 apps/contacts/lib/sabre/addressbook.php
 create mode 100644 apps/contacts/lib/sabre/addressbookroot.php
 rename apps/contacts/lib/{connector_sabre.php => sabre/backend.php} (98%)
 create mode 100644 apps/contacts/lib/sabre/card.php
 create mode 100644 apps/contacts/lib/sabre/useraddressbooks.php
 rename apps/contacts/lib/{VCFExportPlugin.php => sabre/vcfexportplugin.php} (100%)

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 6816343018..102c04705a 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -5,8 +5,12 @@ OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
 OC::$CLASSPATH['OC_Share_Backend_Contact'] = 'apps/contacts/lib/share/contact.php';
 OC::$CLASSPATH['OC_Share_Backend_Addressbook'] = 'apps/contacts/lib/share/addressbook.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
-OC::$CLASSPATH['Sabre_CardDAV_VCFExportPlugin'] = 'apps/contacts/lib/VCFExportPlugin.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/sabre/backend.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_AddressBookRoot'] = 'apps/contacts/lib/sabre/addressbookroot.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_UserAddressBooks'] = 'apps/contacts/lib/sabre/useraddressbooks.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_AddressBook'] = 'apps/contacts/lib/sabre/addressbook.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_Card'] = 'apps/contacts/lib/sabre/card.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_VCFExportPlugin'] = 'apps/contacts/lib/sabre/vcfexportplugin.php';
 OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
 OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Contacts_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 6cb5b59525..00851037a6 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,15 +36,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
-$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+$principalCollection = new Sabre_CalDAV_Principal_Collection($principalBackend);
+$principalCollection->disableListing = true; // Disable listening
 
-$Sabre_CardDAV_AddressBookRoot = new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
-$Sabre_CardDAV_AddressBookRoot->disableListing = true; // Disable listening
+$addressBookRoot = new OC_Connector_Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
+$addressBookRoot->disableListing = true; // Disable listening
 
-$nodes = array( 
-	$Sabre_CalDAV_Principal_Collection, 
-	$Sabre_CardDAV_AddressBookRoot,
+$nodes = array(
+	$principalCollection,
+	$addressBookRoot,
 	);
 
 // Fire up server
@@ -55,7 +55,7 @@ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
-$server->addPlugin(new Sabre_CardDAV_VCFExportPlugin());
+//$server->addPlugin(new OC_Connector_Sabre_CardDAV_VCFExportPlugin());
 
 // And off we go!
 $server->exec();
diff --git a/apps/contacts/lib/sabre/addressbook.php b/apps/contacts/lib/sabre/addressbook.php
new file mode 100644
index 0000000000..daaaa94339
--- /dev/null
+++ b/apps/contacts/lib/sabre/addressbook.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides __construct to get access to $addressBookInfo and
+ * $carddavBackend, Sabre_CardDAV_AddressBook::getACL() to return read/write
+ * permissions based on user and shared state and it overrides
+ * Sabre_CardDAV_AddressBook::getChild() and Sabre_CardDAV_AddressBook::getChildren()
+ * to instantiate OC_Connector_Sabre_CardDAV_Cards.
+*/
+class OC_Connector_Sabre_CardDAV_AddressBook extends Sabre_CardDAV_AddressBook {
+
+    /**
+     * CardDAV backend
+     *
+     * @var Sabre_CardDAV_Backend_Abstract
+     */
+    private $carddavBackend;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param array $addressBookInfo
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+		parent::__construct($carddavBackend, $addressBookInfo);
+
+    }
+	/**
+	* Returns a list of ACE's for this node.
+	*
+	* Each ACE has the following properties:
+	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	*     currently the only supported privileges
+	*   * 'principal', a url to the principal who owns the node
+	*   * 'protected' (optional), indicating that this ACE is not allowed to
+	*      be updated.
+	*
+	* @return array
+	*/
+	public function getACL() {
+
+		$readprincipal = $this->getOwner();
+		$writeprincipal = $this->getOwner();
+		$uid = OC_Contacts_Addressbook::extractUserID($this->getOwner());
+
+		if($uid != OCP\USER::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $this->addressBookInfo['id']);
+			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) {
+				$readprincipal = 'principals/' . OCP\USER::getUser();
+			}
+			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				$writeprincipal = 'principals/' . OCP\USER::getUser();
+			}
+		}
+
+		return array(
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal,
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}write',
+				'principal' => $writeprincipal,
+				'protected' => true,
+			),
+
+		);
+
+	}
+
+    /**
+     * Returns a card
+     *
+     * @param string $name
+     * @return OC_Connector_Sabre_DAV_Card
+     */
+    public function getChild($name) {
+
+        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
+        return new OC_Connector_Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+
+    }
+
+	/**
+	* Returns the full list of cards
+	*
+	* @return array
+	*/
+	public function getChildren() {
+
+		$objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
+		$children = array();
+		foreach($objs as $obj) {
+			$children[] = new OC_Connector_Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+		}
+		return $children;
+
+	}
+}
\ No newline at end of file
diff --git a/apps/contacts/lib/sabre/addressbookroot.php b/apps/contacts/lib/sabre/addressbookroot.php
new file mode 100644
index 0000000000..69cd602128
--- /dev/null
+++ b/apps/contacts/lib/sabre/addressbookroot.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CardDAV_AddressBookRoot::getChildForPrincipal()
+ * to instantiate OC_Connector_CardDAV_UserAddressBooks.
+*/
+class OC_Connector_Sabre_CardDAV_AddressBookRoot extends Sabre_CardDAV_AddressBookRoot {
+
+	/**
+	* This method returns a node for a principal.
+	*
+	* The passed array contains principal information, and is guaranteed to
+	* at least contain a uri item. Other properties may or may not be
+	* supplied by the authentication backend.
+	*
+	* @param array $principal
+	* @return Sabre_DAV_INode
+	*/
+	public function getChildForPrincipal(array $principal) {
+
+		return new OC_Connector_Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
+
+	}
+
+}
\ No newline at end of file
diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/sabre/backend.php
similarity index 98%
rename from apps/contacts/lib/connector_sabre.php
rename to apps/contacts/lib/sabre/backend.php
index 2bc6c9a28c..04737eb3ab 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/sabre/backend.php
@@ -145,6 +145,7 @@ class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
 		$data = OC_Contacts_VCard::all($addressbookid);
 		$cards = array();
 		foreach($data as $i){
+			//OCP\Util::writeLog('contacts', __METHOD__.', uri: ' . $i['uri'], OCP\Util::DEBUG);
 			$cards[] = array(
 				'id' => $i['id'],
 				//'carddata' => $i['carddata'],
diff --git a/apps/contacts/lib/sabre/card.php b/apps/contacts/lib/sabre/card.php
new file mode 100644
index 0000000000..f4414a25f7
--- /dev/null
+++ b/apps/contacts/lib/sabre/card.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CardDAV_Card::getACL()
+ * to return read/write permissions based on user and shared state.
+*/
+class OC_Connector_Sabre_CardDAV_Card extends Sabre_CardDAV_Card {
+
+    /**
+     * Array with information about the containing addressbook
+     *
+     * @var array
+     */
+    private $addressBookInfo;
+
+    /**
+     * Constructor
+     *
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param array $addressBookInfo
+     * @param array $cardData
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo, array $cardData) {
+
+        $this->addressBookInfo = $addressBookInfo;
+		parent::__construct($carddavBackend, $addressBookInfo, $cardData);
+
+    }
+
+	/**
+	* Returns a list of ACE's for this node.
+	*
+	* Each ACE has the following properties:
+	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	*     currently the only supported privileges
+	*   * 'principal', a url to the principal who owns the node
+	*   * 'protected' (optional), indicating that this ACE is not allowed to
+	*      be updated.
+	*
+	* @return array
+	*/
+	public function getACL() {
+
+		$readprincipal = $this->getOwner();
+		$writeprincipal = $this->getOwner();
+		$uid = OC_Contacts_Addressbook::extractUserID($this->getOwner());
+
+		if($uid != OCP\USER::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $this->addressBookInfo['id']);
+			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) {
+				$readprincipal = 'principals/' . OCP\USER::getUser();
+			}
+			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				$writeprincipal = 'principals/' . OCP\USER::getUser();
+			}
+		}
+
+		return array(
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal,
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}write',
+				'principal' => $writeprincipal,
+				'protected' => true,
+			),
+
+		);
+
+	}
+
+}
\ No newline at end of file
diff --git a/apps/contacts/lib/sabre/useraddressbooks.php b/apps/contacts/lib/sabre/useraddressbooks.php
new file mode 100644
index 0000000000..328b433bd6
--- /dev/null
+++ b/apps/contacts/lib/sabre/useraddressbooks.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CardDAV_UserAddressBooks::getChildren()
+ * to instantiate OC_Connector_Sabre_CardDAV_AddressBooks.
+*/
+class OC_Connector_Sabre_CardDAV_UserAddressBooks extends Sabre_CardDAV_UserAddressBooks {
+
+	/**
+	* Returns a list of addressbooks
+	*
+	* @return array
+	*/
+	public function getChildren() {
+
+		$addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
+		$objs = array();
+		foreach($addressbooks as $addressbook) {
+			$objs[] = new OC_Connector_Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
+		}
+		return $objs;
+
+	}
+
+}
\ No newline at end of file
diff --git a/apps/contacts/lib/VCFExportPlugin.php b/apps/contacts/lib/sabre/vcfexportplugin.php
similarity index 100%
rename from apps/contacts/lib/VCFExportPlugin.php
rename to apps/contacts/lib/sabre/vcfexportplugin.php
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index cee9c640cf..4c66a538a2 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -38,7 +38,7 @@
 /**
  * This class manages our vCards
  */
-class OC_Contacts_VCard{
+class OC_Contacts_VCard {
 	/**
 	 * @brief Returns all cards of an address book
 	 * @param integer $id

From b716296203cd1ece8a455c2384ffed9c0d5f6f41 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 24 Aug 2012 05:04:45 +0200
Subject: [PATCH 1535/1537] Forgot to reenable the export plugin.

---
 apps/contacts/appinfo/remote.php            | 2 +-
 apps/contacts/lib/sabre/vcfexportplugin.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 00851037a6..d8677d7f73 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -55,7 +55,7 @@ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
-//$server->addPlugin(new OC_Connector_Sabre_CardDAV_VCFExportPlugin());
+$server->addPlugin(new OC_Connector_Sabre_CardDAV_VCFExportPlugin());
 
 // And off we go!
 $server->exec();
diff --git a/apps/contacts/lib/sabre/vcfexportplugin.php b/apps/contacts/lib/sabre/vcfexportplugin.php
index 9a64c964b0..f0ba60b303 100644
--- a/apps/contacts/lib/sabre/vcfexportplugin.php
+++ b/apps/contacts/lib/sabre/vcfexportplugin.php
@@ -13,7 +13,7 @@
  * @author Evert Pot (http://www.rooftopsolutions.nl/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
+class OC_Connector_Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
 
     /**
      * Reference to Server class

From d1421ca5ab089d211b594d868d711a6f03527f91 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 24 Aug 2012 13:49:56 +0200
Subject: [PATCH 1536/1537] White-space.

---
 apps/contacts/lib/sabre/addressbook.php | 57 +++++++++++++------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/apps/contacts/lib/sabre/addressbook.php b/apps/contacts/lib/sabre/addressbook.php
index daaaa94339..e9eb77472b 100644
--- a/apps/contacts/lib/sabre/addressbook.php
+++ b/apps/contacts/lib/sabre/addressbook.php
@@ -29,26 +29,29 @@
 */
 class OC_Connector_Sabre_CardDAV_AddressBook extends Sabre_CardDAV_AddressBook {
 
-    /**
-     * CardDAV backend
-     *
-     * @var Sabre_CardDAV_Backend_Abstract
-     */
-    private $carddavBackend;
+	/**
+	* CardDAV backend
+	*
+	* @var Sabre_CardDAV_Backend_Abstract
+	*/
+	private $carddavBackend;
 
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param array $addressBookInfo
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo) {
+	/**
+	* Constructor
+	*
+	* @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+	* @param array $addressBookInfo
+	*/
+	public function __construct(
+		Sabre_CardDAV_Backend_Abstract $carddavBackend,
+		array $addressBookInfo) {
 
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
+		$this->carddavBackend = $carddavBackend;
+		$this->addressBookInfo = $addressBookInfo;
 		parent::__construct($carddavBackend, $addressBookInfo);
 
-    }
+	}
+
 	/**
 	* Returns a list of ACE's for this node.
 	*
@@ -93,19 +96,19 @@ class OC_Connector_Sabre_CardDAV_AddressBook extends Sabre_CardDAV_AddressBook {
 
 	}
 
-    /**
-     * Returns a card
-     *
-     * @param string $name
-     * @return OC_Connector_Sabre_DAV_Card
-     */
-    public function getChild($name) {
+	/**
+	* Returns a card
+	*
+	* @param string $name
+	* @return OC_Connector_Sabre_DAV_Card
+	*/
+	public function getChild($name) {
 
-        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
-        return new OC_Connector_Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+		$obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
+		if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
+		return new OC_Connector_Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
 
-    }
+	}
 
 	/**
 	* Returns the full list of cards

From 46d6fd15e4cc02d45079ffc688be0684e61f1434 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 24 Aug 2012 14:26:06 +0200
Subject: [PATCH 1537/1537] Implemented sharing api for CalDAV.

---
 apps/calendar/appinfo/app.php                 |   6 +-
 apps/calendar/appinfo/remote.php              |  12 +-
 .../backend.php}                              |   0
 apps/calendar/lib/sabre/calendar.php          | 127 ++++++++++++++++++
 apps/calendar/lib/sabre/calendarroot.php      |  45 +++++++
 apps/calendar/lib/sabre/object.php            |  87 ++++++++++++
 apps/calendar/lib/sabre/usercalendars.php     |  46 +++++++
 7 files changed, 316 insertions(+), 7 deletions(-)
 rename apps/calendar/lib/{connector_sabre.php => sabre/backend.php} (100%)
 create mode 100644 apps/calendar/lib/sabre/calendar.php
 create mode 100644 apps/calendar/lib/sabre/calendarroot.php
 create mode 100644 apps/calendar/lib/sabre/object.php
 create mode 100644 apps/calendar/lib/sabre/usercalendars.php

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 9ae255853d..0078705578 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -4,7 +4,11 @@ OC::$CLASSPATH['OC_Calendar_App'] = 'apps/calendar/lib/app.php';
 OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
 OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/sabre/backend.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_CalendarRoot'] = 'apps/calendar/lib/sabre/calendarroot.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_UserCalendars'] = 'apps/calendar/lib/sabre/usercalendars.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_Calendar'] = 'apps/calendar/lib/sabre/calendar.php';
+OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_CalendarObject'] = 'apps/calendar/lib/sabre/object.php';
 OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
 OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
 OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index dd605072ce..f499d90966 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,15 +21,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
-$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
 $Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
 
-$Sabre_CalDAV_CalendarRootNode = new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend); 
-$Sabre_CalDAV_CalendarRootNode->disableListing = true; // Disable listening
+$calendarRoot = new OC_Connector_Sabre_CalDAV_CalendarRoot($principalBackend, $caldavBackend);
+$calendarRoot->disableListing = true; // Disable listening
 
-$nodes = array( 
-	$Sabre_CalDAV_Principal_Collection, 
-	$Sabre_CalDAV_CalendarRootNode,
+$nodes = array(
+	$Sabre_CalDAV_Principal_Collection,
+	$calendarRoot,
 	);
 
 // Fire up server
diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/sabre/backend.php
similarity index 100%
rename from apps/calendar/lib/connector_sabre.php
rename to apps/calendar/lib/sabre/backend.php
diff --git a/apps/calendar/lib/sabre/calendar.php b/apps/calendar/lib/sabre/calendar.php
new file mode 100644
index 0000000000..179be1b281
--- /dev/null
+++ b/apps/calendar/lib/sabre/calendar.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * ownCloud - OC_Connector_Sabre_Sabre_CalDAV_Calendar
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CalDAV_Calendar::getACL() to return read/write
+ * permissions based on user and shared state and it overrides
+ * Sabre_CalDAV_Calendar::getChild() and Sabre_CalDAV_Calendar::getChildren()
+ * to instantiate OC_Connector_Sabre_CalDAV_CalendarObjects.
+*/
+class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
+
+	/**
+	* Returns a list of ACE's for this node.
+	*
+	* Each ACE has the following properties:
+	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	*     currently the only supported privileges
+	*   * 'principal', a url to the principal who owns the node
+	*   * 'protected' (optional), indicating that this ACE is not allowed to
+	*      be updated.
+	*
+	* @return array
+	*/
+	public function getACL() {
+
+		$readprincipal = $this->getOwner();
+		$writeprincipal = $this->getOwner();
+		$uid = OC_Calendar_Calendar::extractUserID($this->getOwner());
+
+		if($uid != OCP\USER::getUser()) {
+			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']);
+			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
+				$readprincipal = 'principals/' . OCP\USER::getUser();
+			}
+			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				$writeprincipal = 'principals/' . OCP\USER::getUser();
+			}
+		}
+
+		return array(
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal,
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}write',
+				'principal' => $writeprincipal,
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal . '/calendar-proxy-write',
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}write',
+				'principal' => $writeprincipal . '/calendar-proxy-write',
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal . '/calendar-proxy-read',
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+				'principal' => '{DAV:}authenticated',
+				'protected' => true,
+			),
+
+		);
+
+	}
+
+	/**
+	* Returns a calendar object
+	*
+	* The contained calendar objects are for example Events or Todo's.
+	*
+	* @param string $name
+	* @return Sabre_DAV_ICalendarObject
+	*/
+	public function getChild($name) {
+
+		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+		if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
+		return new OC_Connector_Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+
+	}
+
+	/**
+	* Returns the full list of calendar objects
+	*
+	* @return array
+	*/
+	public function getChildren() {
+
+		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+		$children = array();
+		foreach($objs as $obj) {
+			$children[] = new OC_Connector_Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+		}
+		return $children;
+
+	}
+
+}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/calendarroot.php b/apps/calendar/lib/sabre/calendarroot.php
new file mode 100644
index 0000000000..e09731c95b
--- /dev/null
+++ b/apps/calendar/lib/sabre/calendarroot.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud - OC_Connector_Sabre_CalDAV_CalendarRoot
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CalDAV_CalendarRootNode::getChildForPrincipal()
+ * to instantiate OC_Connector_Sabre_CalDAV_UserCalendars.
+*/
+class OC_Connector_Sabre_CalDAV_CalendarRoot extends Sabre_CalDAV_CalendarRootNode {
+
+	/**
+	* This method returns a node for a principal.
+	*
+	* The passed array contains principal information, and is guaranteed to
+	* at least contain a uri item. Other properties may or may not be
+	* supplied by the authentication backend.
+	*
+	* @param array $principal
+	* @return Sabre_DAV_INode
+	*/
+	public function getChildForPrincipal(array $principal) {
+
+		return new OC_Connector_Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
+
+	}
+
+}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/object.php b/apps/calendar/lib/sabre/object.php
new file mode 100644
index 0000000000..25954e6ee5
--- /dev/null
+++ b/apps/calendar/lib/sabre/object.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * ownCloud - OC_Connector_Sabre_CalDAV_CalendarObject
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CalDAV_CalendarObject::getACL()
+ * to return read/write permissions based on user and shared state.
+*/
+class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObject {
+
+	/**
+	* Returns a list of ACE's for this node.
+	*
+	* Each ACE has the following properties:
+	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	*     currently the only supported privileges
+	*   * 'principal', a url to the principal who owns the node
+	*   * 'protected' (optional), indicating that this ACE is not allowed to
+	*      be updated.
+	*
+	* @return array
+	*/
+	public function getACL() {
+
+		$readprincipal = $this->getOwner();
+		$writeprincipal = $this->getOwner();
+		$uid = OC_Calendar_Calendar::extractUserID($this->getOwner());
+
+		if($uid != OCP\USER::getUser()) {
+			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']);
+			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) {
+				$readprincipal = 'principals/' . OCP\USER::getUser();
+			}
+			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+				$writeprincipal = 'principals/' . OCP\USER::getUser();
+			}
+		}
+
+		return array(
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal,
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}write',
+				'principal' => $writeprincipal,
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal . '/calendar-proxy-write',
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}write',
+				'principal' => $writeprincipal . '/calendar-proxy-write',
+				'protected' => true,
+			),
+			array(
+				'privilege' => '{DAV:}read',
+				'principal' => $readprincipal . '/calendar-proxy-read',
+				'protected' => true,
+			),
+		);
+
+	}
+
+}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/usercalendars.php b/apps/calendar/lib/sabre/usercalendars.php
new file mode 100644
index 0000000000..919f6b27e1
--- /dev/null
+++ b/apps/calendar/lib/sabre/usercalendars.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * ownCloud - OC_Connector_Sabre_CalDAV_UserCalendars
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * This class overrides Sabre_CalDAV_UserCalendars::getChildren()
+ * to instantiate OC_Connector_Sabre_CalDAV_Calendars.
+*/
+class OC_Connector_Sabre_CalDAV_UserCalendars extends Sabre_CalDAV_UserCalendars {
+
+	/**
+	* Returns a list of calendars
+	*
+	* @return array
+	*/
+	public function getChildren() {
+
+		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+		$objs = array();
+		foreach($calendars as $calendar) {
+			$objs[] = new OC_Connector_Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
+		}
+		$objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
+		return $objs;
+
+	}
+
+}
\ No newline at end of file